From 5c1667b41a7d31df6d405d272833895bf8472cf6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 29 Jan 2019 16:55:25 -0600 Subject: [PATCH 001/217] Define layout constants --- data/maps.s | 1 + .../AbandonedShip_CaptainsOffice/events.inc | 6 +- .../AbandonedShip_CaptainsOffice/header.inc | 4 +- .../AbandonedShip_Corridors_1F/events.inc | 6 +- .../AbandonedShip_Corridors_1F/header.inc | 4 +- .../AbandonedShip_Corridors_B1F/events.inc | 8 +- .../AbandonedShip_Corridors_B1F/header.inc | 4 +- data/maps/AbandonedShip_Deck/events.inc | 4 +- data/maps/AbandonedShip_Deck/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../AbandonedShip_HiddenFloorRooms/events.inc | 8 +- .../AbandonedShip_HiddenFloorRooms/header.inc | 4 +- data/maps/AbandonedShip_Room_B1F/events.inc | 6 +- data/maps/AbandonedShip_Room_B1F/header.inc | 4 +- data/maps/AbandonedShip_Rooms2_1F/events.inc | 6 +- data/maps/AbandonedShip_Rooms2_1F/header.inc | 4 +- data/maps/AbandonedShip_Rooms2_B1F/events.inc | 6 +- data/maps/AbandonedShip_Rooms2_B1F/header.inc | 4 +- data/maps/AbandonedShip_Rooms_1F/events.inc | 6 +- data/maps/AbandonedShip_Rooms_1F/header.inc | 4 +- data/maps/AbandonedShip_Rooms_B1F/events.inc | 6 +- data/maps/AbandonedShip_Rooms_B1F/header.inc | 4 +- .../maps/AbandonedShip_Underwater1/events.inc | 4 +- .../maps/AbandonedShip_Underwater1/header.inc | 4 +- .../maps/AbandonedShip_Underwater2/events.inc | 4 +- .../maps/AbandonedShip_Underwater2/header.inc | 4 +- data/maps/AlteringCave/events.inc | 4 +- data/maps/AlteringCave/header.inc | 4 +- data/maps/AncientTomb/events.inc | 8 +- data/maps/AncientTomb/header.inc | 4 +- data/maps/AquaHideout_1F/events.inc | 6 +- data/maps/AquaHideout_1F/header.inc | 4 +- data/maps/AquaHideout_B1F/events.inc | 6 +- data/maps/AquaHideout_B1F/header.inc | 4 +- data/maps/AquaHideout_B2F/events.inc | 8 +- data/maps/AquaHideout_B2F/header.inc | 4 +- .../AquaHideout_UnusedRubyMap1/events.inc | 2 +- .../AquaHideout_UnusedRubyMap1/header.inc | 4 +- .../AquaHideout_UnusedRubyMap2/events.inc | 2 +- .../AquaHideout_UnusedRubyMap2/header.inc | 4 +- .../AquaHideout_UnusedRubyMap3/events.inc | 2 +- .../AquaHideout_UnusedRubyMap3/header.inc | 4 +- data/maps/ArtisanCave_1F/events.inc | 6 +- data/maps/ArtisanCave_1F/header.inc | 4 +- data/maps/ArtisanCave_B1F/events.inc | 8 +- data/maps/ArtisanCave_B1F/header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../BattleFrontier_BattleDomeLobby/events.inc | 8 +- .../BattleFrontier_BattleDomeLobby/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../BattleFrontier_BattlePikeLobby/events.inc | 8 +- .../BattleFrontier_BattlePikeLobby/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- data/maps/BattleFrontier_Lounge1/events.inc | 6 +- data/maps/BattleFrontier_Lounge1/header.inc | 4 +- data/maps/BattleFrontier_Lounge2/events.inc | 6 +- data/maps/BattleFrontier_Lounge2/header.inc | 4 +- data/maps/BattleFrontier_Lounge3/events.inc | 6 +- data/maps/BattleFrontier_Lounge3/header.inc | 4 +- data/maps/BattleFrontier_Lounge4/events.inc | 6 +- data/maps/BattleFrontier_Lounge4/header.inc | 4 +- data/maps/BattleFrontier_Lounge5/events.inc | 6 +- data/maps/BattleFrontier_Lounge5/header.inc | 4 +- data/maps/BattleFrontier_Lounge6/events.inc | 6 +- data/maps/BattleFrontier_Lounge6/header.inc | 4 +- data/maps/BattleFrontier_Lounge7/events.inc | 6 +- data/maps/BattleFrontier_Lounge7/header.inc | 4 +- data/maps/BattleFrontier_Lounge8/events.inc | 6 +- data/maps/BattleFrontier_Lounge8/header.inc | 4 +- data/maps/BattleFrontier_Lounge9/events.inc | 6 +- data/maps/BattleFrontier_Lounge9/header.inc | 4 +- data/maps/BattleFrontier_Mart/events.inc | 6 +- data/maps/BattleFrontier_Mart/header.inc | 4 +- .../connections.inc | 6 +- .../BattleFrontier_OutsideEast/events.inc | 8 +- .../BattleFrontier_OutsideEast/header.inc | 4 +- .../connections.inc | 6 +- .../BattleFrontier_OutsideWest/events.inc | 8 +- .../BattleFrontier_OutsideWest/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../BattleFrontier_RankingHall/events.inc | 8 +- .../BattleFrontier_RankingHall/header.inc | 4 +- .../BattleFrontier_ReceptionGate/events.inc | 6 +- .../BattleFrontier_ReceptionGate/header.inc | 4 +- .../BattleFrontier_ScottsHouse/events.inc | 6 +- .../BattleFrontier_ScottsHouse/header.inc | 4 +- data/maps/BattlePyramidSquare01/events.inc | 4 +- data/maps/BattlePyramidSquare01/header.inc | 4 +- data/maps/BattlePyramidSquare02/events.inc | 4 +- data/maps/BattlePyramidSquare02/header.inc | 4 +- data/maps/BattlePyramidSquare03/events.inc | 4 +- data/maps/BattlePyramidSquare03/header.inc | 4 +- data/maps/BattlePyramidSquare04/events.inc | 4 +- data/maps/BattlePyramidSquare04/header.inc | 4 +- data/maps/BattlePyramidSquare05/events.inc | 4 +- data/maps/BattlePyramidSquare05/header.inc | 4 +- data/maps/BattlePyramidSquare06/events.inc | 4 +- data/maps/BattlePyramidSquare06/header.inc | 4 +- data/maps/BattlePyramidSquare07/events.inc | 4 +- data/maps/BattlePyramidSquare07/header.inc | 4 +- data/maps/BattlePyramidSquare08/events.inc | 4 +- data/maps/BattlePyramidSquare08/header.inc | 4 +- data/maps/BattlePyramidSquare09/events.inc | 4 +- data/maps/BattlePyramidSquare09/header.inc | 4 +- data/maps/BattlePyramidSquare10/events.inc | 4 +- data/maps/BattlePyramidSquare10/header.inc | 4 +- data/maps/BattlePyramidSquare11/events.inc | 4 +- data/maps/BattlePyramidSquare11/header.inc | 4 +- data/maps/BattlePyramidSquare12/events.inc | 4 +- data/maps/BattlePyramidSquare12/header.inc | 4 +- data/maps/BattlePyramidSquare13/events.inc | 4 +- data/maps/BattlePyramidSquare13/header.inc | 4 +- data/maps/BattlePyramidSquare14/events.inc | 4 +- data/maps/BattlePyramidSquare14/header.inc | 4 +- data/maps/BattlePyramidSquare15/events.inc | 4 +- data/maps/BattlePyramidSquare15/header.inc | 4 +- data/maps/BattlePyramidSquare16/events.inc | 4 +- data/maps/BattlePyramidSquare16/header.inc | 4 +- data/maps/BirthIsland_Exterior/events.inc | 6 +- data/maps/BirthIsland_Exterior/header.inc | 4 +- data/maps/BirthIsland_Harbor/events.inc | 6 +- data/maps/BirthIsland_Harbor/header.inc | 4 +- data/maps/CaveOfOrigin_1F/events.inc | 4 +- data/maps/CaveOfOrigin_1F/header.inc | 4 +- data/maps/CaveOfOrigin_B1F/events.inc | 6 +- data/maps/CaveOfOrigin_B1F/header.inc | 4 +- data/maps/CaveOfOrigin_Entrance/events.inc | 4 +- data/maps/CaveOfOrigin_Entrance/header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- data/maps/DesertRuins/events.inc | 8 +- data/maps/DesertRuins/header.inc | 4 +- data/maps/DesertUnderpass/events.inc | 6 +- data/maps/DesertUnderpass/header.inc | 4 +- data/maps/DewfordTown/connections.inc | 6 +- data/maps/DewfordTown/events.inc | 8 +- data/maps/DewfordTown/header.inc | 4 +- data/maps/DewfordTown_Gym/events.inc | 8 +- data/maps/DewfordTown_Gym/header.inc | 4 +- data/maps/DewfordTown_Hall/events.inc | 8 +- data/maps/DewfordTown_Hall/header.inc | 4 +- data/maps/DewfordTown_House1/events.inc | 6 +- data/maps/DewfordTown_House1/header.inc | 4 +- data/maps/DewfordTown_House2/events.inc | 6 +- data/maps/DewfordTown_House2/header.inc | 4 +- .../DewfordTown_PokemonCenter_1F/events.inc | 6 +- .../DewfordTown_PokemonCenter_1F/header.inc | 4 +- .../DewfordTown_PokemonCenter_2F/events.inc | 6 +- .../DewfordTown_PokemonCenter_2F/header.inc | 4 +- data/maps/DoubleBattleColosseum/events.inc | 6 +- data/maps/DoubleBattleColosseum/header.inc | 4 +- data/maps/EverGrandeCity/connections.inc | 6 +- data/maps/EverGrandeCity/events.inc | 8 +- data/maps/EverGrandeCity/header.inc | 4 +- .../EverGrandeCity_ChampionsRoom/events.inc | 6 +- .../EverGrandeCity_ChampionsRoom/header.inc | 4 +- .../maps/EverGrandeCity_DrakesRoom/events.inc | 6 +- .../maps/EverGrandeCity_DrakesRoom/header.inc | 4 +- .../EverGrandeCity_GlaciasRoom/events.inc | 6 +- .../EverGrandeCity_GlaciasRoom/header.inc | 4 +- data/maps/EverGrandeCity_Hall1/events.inc | 4 +- data/maps/EverGrandeCity_Hall1/header.inc | 4 +- data/maps/EverGrandeCity_Hall2/events.inc | 4 +- data/maps/EverGrandeCity_Hall2/header.inc | 4 +- data/maps/EverGrandeCity_Hall3/events.inc | 4 +- data/maps/EverGrandeCity_Hall3/header.inc | 4 +- data/maps/EverGrandeCity_Hall4/events.inc | 4 +- data/maps/EverGrandeCity_Hall4/header.inc | 4 +- data/maps/EverGrandeCity_Hall5/events.inc | 4 +- data/maps/EverGrandeCity_Hall5/header.inc | 4 +- .../maps/EverGrandeCity_HallOfFame/events.inc | 6 +- .../maps/EverGrandeCity_HallOfFame/header.inc | 4 +- .../EverGrandeCity_PhoebesRoom/events.inc | 6 +- .../EverGrandeCity_PhoebesRoom/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../EverGrandeCity_SidneysRoom/events.inc | 6 +- .../EverGrandeCity_SidneysRoom/header.inc | 4 +- data/maps/FallarborTown/connections.inc | 6 +- data/maps/FallarborTown/events.inc | 8 +- data/maps/FallarborTown/header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../FallarborTown_BattleTentLobby/events.inc | 8 +- .../FallarborTown_BattleTentLobby/header.inc | 4 +- data/maps/FallarborTown_House1/events.inc | 6 +- data/maps/FallarborTown_House1/header.inc | 4 +- data/maps/FallarborTown_House2/events.inc | 6 +- data/maps/FallarborTown_House2/header.inc | 4 +- data/maps/FallarborTown_Mart/events.inc | 6 +- data/maps/FallarborTown_Mart/header.inc | 4 +- .../FallarborTown_PokemonCenter_1F/events.inc | 6 +- .../FallarborTown_PokemonCenter_1F/header.inc | 4 +- .../FallarborTown_PokemonCenter_2F/events.inc | 6 +- .../FallarborTown_PokemonCenter_2F/header.inc | 4 +- data/maps/FarawayIsland_Entrance/events.inc | 10 +- data/maps/FarawayIsland_Entrance/header.inc | 4 +- data/maps/FarawayIsland_Interior/events.inc | 6 +- data/maps/FarawayIsland_Interior/header.inc | 4 +- data/maps/FieryPath/events.inc | 6 +- data/maps/FieryPath/header.inc | 4 +- data/maps/FortreeCity/connections.inc | 6 +- data/maps/FortreeCity/events.inc | 8 +- data/maps/FortreeCity/header.inc | 4 +- .../FortreeCity_DecorationShop/events.inc | 6 +- .../FortreeCity_DecorationShop/header.inc | 4 +- data/maps/FortreeCity_Gym/events.inc | 8 +- data/maps/FortreeCity_Gym/header.inc | 4 +- data/maps/FortreeCity_House1/events.inc | 6 +- data/maps/FortreeCity_House1/header.inc | 4 +- data/maps/FortreeCity_House2/events.inc | 6 +- data/maps/FortreeCity_House2/header.inc | 4 +- data/maps/FortreeCity_House3/events.inc | 6 +- data/maps/FortreeCity_House3/header.inc | 4 +- data/maps/FortreeCity_House4/events.inc | 6 +- data/maps/FortreeCity_House4/header.inc | 4 +- data/maps/FortreeCity_House5/events.inc | 6 +- data/maps/FortreeCity_House5/header.inc | 4 +- data/maps/FortreeCity_Mart/events.inc | 6 +- data/maps/FortreeCity_Mart/header.inc | 4 +- .../FortreeCity_PokemonCenter_1F/events.inc | 6 +- .../FortreeCity_PokemonCenter_1F/header.inc | 4 +- .../FortreeCity_PokemonCenter_2F/events.inc | 6 +- .../FortreeCity_PokemonCenter_2F/header.inc | 4 +- data/maps/GraniteCave_1F/events.inc | 6 +- data/maps/GraniteCave_1F/header.inc | 4 +- data/maps/GraniteCave_B1F/events.inc | 6 +- data/maps/GraniteCave_B1F/header.inc | 4 +- data/maps/GraniteCave_B2F/events.inc | 8 +- data/maps/GraniteCave_B2F/header.inc | 4 +- data/maps/GraniteCave_StevensRoom/events.inc | 6 +- data/maps/GraniteCave_StevensRoom/header.inc | 4 +- data/maps/InsideOfTruck/events.inc | 10 +- data/maps/InsideOfTruck/header.inc | 4 +- data/maps/IslandCave/events.inc | 8 +- data/maps/IslandCave/header.inc | 4 +- data/maps/JaggedPass/events.inc | 10 +- data/maps/JaggedPass/header.inc | 4 +- data/maps/LavaridgeTown/connections.inc | 6 +- data/maps/LavaridgeTown/events.inc | 10 +- data/maps/LavaridgeTown/header.inc | 4 +- data/maps/LavaridgeTown_Gym_1F/events.inc | 8 +- data/maps/LavaridgeTown_Gym_1F/header.inc | 4 +- data/maps/LavaridgeTown_Gym_B1F/events.inc | 6 +- data/maps/LavaridgeTown_Gym_B1F/header.inc | 4 +- data/maps/LavaridgeTown_HerbShop/events.inc | 6 +- data/maps/LavaridgeTown_HerbShop/header.inc | 4 +- data/maps/LavaridgeTown_House/events.inc | 6 +- data/maps/LavaridgeTown_House/header.inc | 4 +- data/maps/LavaridgeTown_Mart/events.inc | 6 +- data/maps/LavaridgeTown_Mart/header.inc | 4 +- .../LavaridgeTown_PokemonCenter_1F/events.inc | 6 +- .../LavaridgeTown_PokemonCenter_1F/header.inc | 4 +- .../LavaridgeTown_PokemonCenter_2F/events.inc | 6 +- .../LavaridgeTown_PokemonCenter_2F/header.inc | 4 +- data/maps/LilycoveCity/connections.inc | 6 +- data/maps/LilycoveCity/events.inc | 8 +- data/maps/LilycoveCity/header.inc | 4 +- data/maps/LilycoveCity_ContestHall/events.inc | 8 +- data/maps/LilycoveCity_ContestHall/header.inc | 4 +- .../maps/LilycoveCity_ContestLobby/events.inc | 8 +- .../maps/LilycoveCity_ContestLobby/header.inc | 4 +- .../LilycoveCity_CoveLilyMotel_1F/events.inc | 8 +- .../LilycoveCity_CoveLilyMotel_1F/header.inc | 4 +- .../LilycoveCity_CoveLilyMotel_2F/events.inc | 6 +- .../LilycoveCity_CoveLilyMotel_2F/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- data/maps/LilycoveCity_Harbor/events.inc | 6 +- data/maps/LilycoveCity_Harbor/header.inc | 4 +- data/maps/LilycoveCity_House1/events.inc | 6 +- data/maps/LilycoveCity_House1/header.inc | 4 +- data/maps/LilycoveCity_House2/events.inc | 6 +- data/maps/LilycoveCity_House2/header.inc | 4 +- data/maps/LilycoveCity_House3/events.inc | 6 +- data/maps/LilycoveCity_House3/header.inc | 4 +- data/maps/LilycoveCity_House4/events.inc | 6 +- data/maps/LilycoveCity_House4/header.inc | 4 +- .../LilycoveCity_LilycoveMuseum_1F/events.inc | 8 +- .../LilycoveCity_LilycoveMuseum_1F/header.inc | 4 +- .../LilycoveCity_LilycoveMuseum_2F/events.inc | 8 +- .../LilycoveCity_LilycoveMuseum_2F/header.inc | 4 +- .../LilycoveCity_MoveDeletersHouse/events.inc | 6 +- .../LilycoveCity_MoveDeletersHouse/header.inc | 4 +- .../LilycoveCity_PokemonCenter_1F/events.inc | 6 +- .../LilycoveCity_PokemonCenter_1F/header.inc | 4 +- .../LilycoveCity_PokemonCenter_2F/events.inc | 6 +- .../LilycoveCity_PokemonCenter_2F/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- data/maps/LilycoveCity_UnusedMart/events.inc | 4 +- data/maps/LilycoveCity_UnusedMart/header.inc | 4 +- data/maps/LinkContestRoom1/events.inc | 5 +- data/maps/LinkContestRoom1/header.inc | 4 +- data/maps/LinkContestRoom2/header.inc | 4 +- data/maps/LinkContestRoom3/header.inc | 4 +- data/maps/LinkContestRoom4/header.inc | 4 +- data/maps/LinkContestRoom5/header.inc | 4 +- data/maps/LinkContestRoom6/header.inc | 4 +- data/maps/LittlerootTown/connections.inc | 6 +- data/maps/LittlerootTown/events.inc | 10 +- data/maps/LittlerootTown/header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../LittlerootTown_MaysHouse_1F/events.inc | 8 +- .../LittlerootTown_MaysHouse_1F/header.inc | 4 +- .../LittlerootTown_MaysHouse_2F/events.inc | 8 +- .../LittlerootTown_MaysHouse_2F/header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- data/maps/MagmaHideout_1F/events.inc | 6 +- data/maps/MagmaHideout_1F/header.inc | 4 +- data/maps/MagmaHideout_2F_1R/events.inc | 6 +- data/maps/MagmaHideout_2F_1R/header.inc | 4 +- data/maps/MagmaHideout_2F_2R/events.inc | 6 +- data/maps/MagmaHideout_2F_2R/header.inc | 4 +- data/maps/MagmaHideout_2F_3R/events.inc | 4 +- data/maps/MagmaHideout_2F_3R/header.inc | 4 +- data/maps/MagmaHideout_3F_1R/events.inc | 6 +- data/maps/MagmaHideout_3F_1R/header.inc | 4 +- data/maps/MagmaHideout_3F_2R/events.inc | 6 +- data/maps/MagmaHideout_3F_2R/header.inc | 4 +- data/maps/MagmaHideout_3F_3R/events.inc | 6 +- data/maps/MagmaHideout_3F_3R/header.inc | 4 +- data/maps/MagmaHideout_4F/events.inc | 6 +- data/maps/MagmaHideout_4F/header.inc | 4 +- data/maps/MarineCave_End/events.inc | 8 +- data/maps/MarineCave_End/header.inc | 4 +- data/maps/MarineCave_Entrance/events.inc | 4 +- data/maps/MarineCave_Entrance/header.inc | 4 +- data/maps/MauvilleCity/connections.inc | 6 +- data/maps/MauvilleCity/events.inc | 8 +- data/maps/MauvilleCity/header.inc | 4 +- data/maps/MauvilleCity_BikeShop/events.inc | 8 +- data/maps/MauvilleCity_BikeShop/header.inc | 4 +- data/maps/MauvilleCity_GameCorner/events.inc | 8 +- data/maps/MauvilleCity_GameCorner/header.inc | 4 +- data/maps/MauvilleCity_Gym/events.inc | 10 +- data/maps/MauvilleCity_Gym/header.inc | 4 +- data/maps/MauvilleCity_House1/events.inc | 6 +- data/maps/MauvilleCity_House1/header.inc | 4 +- data/maps/MauvilleCity_House2/events.inc | 6 +- data/maps/MauvilleCity_House2/header.inc | 4 +- data/maps/MauvilleCity_Mart/events.inc | 6 +- data/maps/MauvilleCity_Mart/header.inc | 4 +- .../MauvilleCity_PokemonCenter_1F/events.inc | 6 +- .../MauvilleCity_PokemonCenter_1F/header.inc | 4 +- .../MauvilleCity_PokemonCenter_2F/events.inc | 6 +- .../MauvilleCity_PokemonCenter_2F/header.inc | 4 +- data/maps/MeteorFalls_1F_1R/events.inc | 10 +- data/maps/MeteorFalls_1F_1R/header.inc | 4 +- data/maps/MeteorFalls_1F_2R/events.inc | 8 +- data/maps/MeteorFalls_1F_2R/header.inc | 4 +- data/maps/MeteorFalls_B1F_1R/events.inc | 4 +- data/maps/MeteorFalls_B1F_1R/header.inc | 4 +- data/maps/MeteorFalls_B1F_2R/events.inc | 6 +- data/maps/MeteorFalls_B1F_2R/header.inc | 4 +- data/maps/MeteorFalls_StevensCave/events.inc | 6 +- data/maps/MeteorFalls_StevensCave/header.inc | 4 +- data/maps/MirageTower_1F/events.inc | 4 +- data/maps/MirageTower_1F/header.inc | 4 +- data/maps/MirageTower_2F/events.inc | 4 +- data/maps/MirageTower_2F/header.inc | 4 +- data/maps/MirageTower_3F/events.inc | 6 +- data/maps/MirageTower_3F/header.inc | 4 +- data/maps/MirageTower_4F/events.inc | 6 +- data/maps/MirageTower_4F/header.inc | 4 +- data/maps/MossdeepCity/connections.inc | 7 +- data/maps/MossdeepCity/events.inc | 10 +- data/maps/MossdeepCity/header.inc | 4 +- .../MossdeepCity_GameCorner_1F/events.inc | 8 +- .../MossdeepCity_GameCorner_1F/header.inc | 4 +- .../MossdeepCity_GameCorner_B1F/events.inc | 6 +- .../MossdeepCity_GameCorner_B1F/header.inc | 4 +- data/maps/MossdeepCity_Gym/events.inc | 10 +- data/maps/MossdeepCity_Gym/header.inc | 4 +- data/maps/MossdeepCity_House1/events.inc | 6 +- data/maps/MossdeepCity_House1/header.inc | 4 +- data/maps/MossdeepCity_House2/events.inc | 6 +- data/maps/MossdeepCity_House2/header.inc | 4 +- data/maps/MossdeepCity_House3/events.inc | 6 +- data/maps/MossdeepCity_House3/header.inc | 4 +- data/maps/MossdeepCity_House4/events.inc | 6 +- data/maps/MossdeepCity_House4/header.inc | 4 +- data/maps/MossdeepCity_Mart/events.inc | 6 +- data/maps/MossdeepCity_Mart/header.inc | 4 +- .../MossdeepCity_PokemonCenter_1F/events.inc | 6 +- .../MossdeepCity_PokemonCenter_1F/header.inc | 4 +- .../MossdeepCity_PokemonCenter_2F/events.inc | 6 +- .../MossdeepCity_PokemonCenter_2F/header.inc | 4 +- .../MossdeepCity_SpaceCenter_1F/events.inc | 6 +- .../MossdeepCity_SpaceCenter_1F/header.inc | 4 +- .../MossdeepCity_SpaceCenter_2F/events.inc | 6 +- .../MossdeepCity_SpaceCenter_2F/header.inc | 4 +- .../maps/MossdeepCity_StevensHouse/events.inc | 8 +- .../maps/MossdeepCity_StevensHouse/header.inc | 4 +- data/maps/MtChimney/events.inc | 8 +- data/maps/MtChimney/header.inc | 4 +- .../maps/MtChimney_CableCarStation/events.inc | 6 +- .../maps/MtChimney_CableCarStation/header.inc | 4 +- data/maps/MtPyre_1F/events.inc | 6 +- data/maps/MtPyre_1F/header.inc | 4 +- data/maps/MtPyre_2F/events.inc | 6 +- data/maps/MtPyre_2F/header.inc | 4 +- data/maps/MtPyre_3F/events.inc | 6 +- data/maps/MtPyre_3F/header.inc | 4 +- data/maps/MtPyre_4F/events.inc | 6 +- data/maps/MtPyre_4F/header.inc | 4 +- data/maps/MtPyre_5F/events.inc | 6 +- data/maps/MtPyre_5F/header.inc | 4 +- data/maps/MtPyre_6F/events.inc | 6 +- data/maps/MtPyre_6F/header.inc | 4 +- data/maps/MtPyre_Exterior/events.inc | 10 +- data/maps/MtPyre_Exterior/header.inc | 4 +- data/maps/MtPyre_Summit/events.inc | 10 +- data/maps/MtPyre_Summit/header.inc | 4 +- data/maps/NavelRock_B1F/events.inc | 4 +- data/maps/NavelRock_B1F/header.inc | 4 +- data/maps/NavelRock_Bottom/events.inc | 6 +- data/maps/NavelRock_Bottom/header.inc | 4 +- data/maps/NavelRock_Down01/events.inc | 4 +- data/maps/NavelRock_Down01/header.inc | 4 +- data/maps/NavelRock_Down02/events.inc | 4 +- data/maps/NavelRock_Down02/header.inc | 4 +- data/maps/NavelRock_Down03/events.inc | 4 +- data/maps/NavelRock_Down03/header.inc | 4 +- data/maps/NavelRock_Down04/events.inc | 4 +- data/maps/NavelRock_Down04/header.inc | 4 +- data/maps/NavelRock_Down05/events.inc | 4 +- data/maps/NavelRock_Down05/header.inc | 4 +- data/maps/NavelRock_Down06/events.inc | 4 +- data/maps/NavelRock_Down06/header.inc | 4 +- data/maps/NavelRock_Down07/events.inc | 4 +- data/maps/NavelRock_Down07/header.inc | 4 +- data/maps/NavelRock_Down08/events.inc | 4 +- data/maps/NavelRock_Down08/header.inc | 4 +- data/maps/NavelRock_Down09/events.inc | 4 +- data/maps/NavelRock_Down09/header.inc | 4 +- data/maps/NavelRock_Down10/events.inc | 4 +- data/maps/NavelRock_Down10/header.inc | 4 +- data/maps/NavelRock_Down11/events.inc | 4 +- data/maps/NavelRock_Down11/header.inc | 4 +- data/maps/NavelRock_Entrance/events.inc | 4 +- data/maps/NavelRock_Entrance/header.inc | 4 +- data/maps/NavelRock_Exterior/events.inc | 4 +- data/maps/NavelRock_Exterior/header.inc | 4 +- data/maps/NavelRock_Fork/events.inc | 4 +- data/maps/NavelRock_Fork/header.inc | 4 +- data/maps/NavelRock_Harbor/events.inc | 6 +- data/maps/NavelRock_Harbor/header.inc | 4 +- data/maps/NavelRock_Top/events.inc | 10 +- data/maps/NavelRock_Top/header.inc | 4 +- data/maps/NavelRock_Up1/events.inc | 4 +- data/maps/NavelRock_Up1/header.inc | 4 +- data/maps/NavelRock_Up2/events.inc | 4 +- data/maps/NavelRock_Up2/header.inc | 4 +- data/maps/NavelRock_Up3/events.inc | 4 +- data/maps/NavelRock_Up3/header.inc | 4 +- data/maps/NavelRock_Up4/events.inc | 4 +- data/maps/NavelRock_Up4/header.inc | 4 +- data/maps/NewMauville_Entrance/events.inc | 6 +- data/maps/NewMauville_Entrance/header.inc | 4 +- data/maps/NewMauville_Inside/events.inc | 10 +- data/maps/NewMauville_Inside/header.inc | 4 +- data/maps/OldaleTown/connections.inc | 6 +- data/maps/OldaleTown/events.inc | 10 +- data/maps/OldaleTown/header.inc | 4 +- data/maps/OldaleTown_House1/events.inc | 6 +- data/maps/OldaleTown_House1/header.inc | 4 +- data/maps/OldaleTown_House2/events.inc | 6 +- data/maps/OldaleTown_House2/header.inc | 4 +- data/maps/OldaleTown_Mart/events.inc | 6 +- data/maps/OldaleTown_Mart/header.inc | 4 +- .../OldaleTown_PokemonCenter_1F/events.inc | 6 +- .../OldaleTown_PokemonCenter_1F/header.inc | 4 +- .../OldaleTown_PokemonCenter_2F/events.inc | 6 +- .../OldaleTown_PokemonCenter_2F/header.inc | 4 +- data/maps/PacifidlogTown/connections.inc | 6 +- data/maps/PacifidlogTown/events.inc | 8 +- data/maps/PacifidlogTown/header.inc | 4 +- data/maps/PacifidlogTown_House1/events.inc | 6 +- data/maps/PacifidlogTown_House1/header.inc | 4 +- data/maps/PacifidlogTown_House2/events.inc | 6 +- data/maps/PacifidlogTown_House2/header.inc | 4 +- data/maps/PacifidlogTown_House3/events.inc | 6 +- data/maps/PacifidlogTown_House3/header.inc | 4 +- data/maps/PacifidlogTown_House4/events.inc | 6 +- data/maps/PacifidlogTown_House4/header.inc | 4 +- data/maps/PacifidlogTown_House5/events.inc | 6 +- data/maps/PacifidlogTown_House5/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- data/maps/PetalburgCity/connections.inc | 6 +- data/maps/PetalburgCity/events.inc | 10 +- data/maps/PetalburgCity/header.inc | 4 +- data/maps/PetalburgCity_Gym/events.inc | 8 +- data/maps/PetalburgCity_Gym/header.inc | 4 +- data/maps/PetalburgCity_House1/events.inc | 6 +- data/maps/PetalburgCity_House1/header.inc | 4 +- data/maps/PetalburgCity_House2/events.inc | 6 +- data/maps/PetalburgCity_House2/header.inc | 4 +- data/maps/PetalburgCity_Mart/events.inc | 6 +- data/maps/PetalburgCity_Mart/header.inc | 4 +- .../PetalburgCity_PokemonCenter_1F/events.inc | 6 +- .../PetalburgCity_PokemonCenter_1F/header.inc | 4 +- .../PetalburgCity_PokemonCenter_2F/events.inc | 6 +- .../PetalburgCity_PokemonCenter_2F/header.inc | 4 +- .../maps/PetalburgCity_WallysHouse/events.inc | 6 +- .../maps/PetalburgCity_WallysHouse/header.inc | 4 +- data/maps/PetalburgWoods/events.inc | 10 +- data/maps/PetalburgWoods/header.inc | 4 +- data/maps/RecordCorner/events.inc | 8 +- data/maps/RecordCorner/header.inc | 4 +- data/maps/Route101/connections.inc | 6 +- data/maps/Route101/events.inc | 8 +- data/maps/Route101/header.inc | 4 +- data/maps/Route102/connections.inc | 6 +- data/maps/Route102/events.inc | 6 +- data/maps/Route102/header.inc | 4 +- data/maps/Route103/connections.inc | 6 +- data/maps/Route103/events.inc | 8 +- data/maps/Route103/header.inc | 4 +- data/maps/Route104/connections.inc | 6 +- data/maps/Route104/events.inc | 10 +- data/maps/Route104/header.inc | 4 +- data/maps/Route104_MrBrineysHouse/events.inc | 6 +- data/maps/Route104_MrBrineysHouse/header.inc | 4 +- .../Route104_PrettyPetalFlowerShop/events.inc | 6 +- .../Route104_PrettyPetalFlowerShop/header.inc | 4 +- data/maps/Route104_Prototype/events.inc | 2 +- data/maps/Route104_Prototype/header.inc | 4 +- .../events.inc | 2 +- .../header.inc | 4 +- data/maps/Route105/connections.inc | 6 +- data/maps/Route105/events.inc | 8 +- data/maps/Route105/header.inc | 4 +- data/maps/Route106/connections.inc | 6 +- data/maps/Route106/events.inc | 8 +- data/maps/Route106/header.inc | 4 +- data/maps/Route107/connections.inc | 6 +- data/maps/Route107/events.inc | 4 +- data/maps/Route107/header.inc | 4 +- data/maps/Route108/connections.inc | 6 +- data/maps/Route108/events.inc | 8 +- data/maps/Route108/header.inc | 4 +- data/maps/Route109/connections.inc | 6 +- data/maps/Route109/events.inc | 9 +- data/maps/Route109/header.inc | 4 +- data/maps/Route109_SeashoreHouse/events.inc | 6 +- data/maps/Route109_SeashoreHouse/header.inc | 4 +- data/maps/Route110/connections.inc | 6 +- data/maps/Route110/events.inc | 10 +- data/maps/Route110/header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- .../Route110_TrickHouseCorridor/events.inc | 4 +- .../Route110_TrickHouseCorridor/header.inc | 4 +- data/maps/Route110_TrickHouseEnd/events.inc | 10 +- data/maps/Route110_TrickHouseEnd/header.inc | 4 +- .../Route110_TrickHouseEntrance/events.inc | 10 +- .../Route110_TrickHouseEntrance/header.inc | 4 +- .../Route110_TrickHousePuzzle1/events.inc | 8 +- .../Route110_TrickHousePuzzle1/header.inc | 4 +- .../Route110_TrickHousePuzzle2/events.inc | 10 +- .../Route110_TrickHousePuzzle2/header.inc | 4 +- .../Route110_TrickHousePuzzle3/events.inc | 10 +- .../Route110_TrickHousePuzzle3/header.inc | 4 +- .../Route110_TrickHousePuzzle4/events.inc | 8 +- .../Route110_TrickHousePuzzle4/header.inc | 4 +- .../Route110_TrickHousePuzzle5/events.inc | 10 +- .../Route110_TrickHousePuzzle5/header.inc | 4 +- .../Route110_TrickHousePuzzle6/events.inc | 8 +- .../Route110_TrickHousePuzzle6/header.inc | 4 +- .../Route110_TrickHousePuzzle7/events.inc | 10 +- .../Route110_TrickHousePuzzle7/header.inc | 4 +- .../Route110_TrickHousePuzzle8/events.inc | 8 +- .../Route110_TrickHousePuzzle8/header.inc | 4 +- data/maps/Route111/connections.inc | 6 +- data/maps/Route111/events.inc | 10 +- data/maps/Route111/header.inc | 4 +- .../maps/Route111_OldLadysRestStop/events.inc | 6 +- .../maps/Route111_OldLadysRestStop/header.inc | 4 +- .../Route111_WinstrateFamilysHouse/events.inc | 6 +- .../Route111_WinstrateFamilysHouse/header.inc | 4 +- data/maps/Route112/connections.inc | 6 +- data/maps/Route112/events.inc | 8 +- data/maps/Route112/header.inc | 4 +- data/maps/Route112_CableCarStation/events.inc | 6 +- data/maps/Route112_CableCarStation/header.inc | 4 +- data/maps/Route113/connections.inc | 6 +- data/maps/Route113/events.inc | 10 +- data/maps/Route113/header.inc | 4 +- data/maps/Route113_GlassWorkshop/events.inc | 6 +- data/maps/Route113_GlassWorkshop/header.inc | 4 +- data/maps/Route114/connections.inc | 6 +- data/maps/Route114/events.inc | 8 +- data/maps/Route114/header.inc | 4 +- .../Route114_FossilManiacsHouse/events.inc | 8 +- .../Route114_FossilManiacsHouse/header.inc | 4 +- .../Route114_FossilManiacsTunnel/events.inc | 8 +- .../Route114_FossilManiacsTunnel/header.inc | 4 +- data/maps/Route114_LanettesHouse/events.inc | 8 +- data/maps/Route114_LanettesHouse/header.inc | 4 +- data/maps/Route115/connections.inc | 6 +- data/maps/Route115/events.inc | 8 +- data/maps/Route115/header.inc | 4 +- data/maps/Route116/connections.inc | 6 +- data/maps/Route116/events.inc | 10 +- data/maps/Route116/header.inc | 4 +- .../Route116_TunnelersRestHouse/events.inc | 6 +- .../Route116_TunnelersRestHouse/header.inc | 4 +- data/maps/Route117/connections.inc | 6 +- data/maps/Route117/events.inc | 8 +- data/maps/Route117/header.inc | 4 +- data/maps/Route117_PokemonDayCare/events.inc | 6 +- data/maps/Route117_PokemonDayCare/header.inc | 4 +- data/maps/Route118/connections.inc | 6 +- data/maps/Route118/events.inc | 10 +- data/maps/Route118/header.inc | 4 +- data/maps/Route119/connections.inc | 6 +- data/maps/Route119/events.inc | 10 +- data/maps/Route119/header.inc | 4 +- data/maps/Route119_House/events.inc | 6 +- data/maps/Route119_House/header.inc | 4 +- .../Route119_WeatherInstitute_1F/events.inc | 8 +- .../Route119_WeatherInstitute_1F/header.inc | 4 +- .../Route119_WeatherInstitute_2F/events.inc | 6 +- .../Route119_WeatherInstitute_2F/header.inc | 4 +- data/maps/Route120/connections.inc | 6 +- data/maps/Route120/events.inc | 10 +- data/maps/Route120/header.inc | 4 +- data/maps/Route121/connections.inc | 6 +- data/maps/Route121/events.inc | 10 +- data/maps/Route121/header.inc | 4 +- .../Route121_SafariZoneEntrance/events.inc | 10 +- .../Route121_SafariZoneEntrance/header.inc | 4 +- data/maps/Route122/connections.inc | 6 +- data/maps/Route122/events.inc | 4 +- data/maps/Route122/header.inc | 4 +- data/maps/Route123/connections.inc | 6 +- data/maps/Route123/events.inc | 10 +- data/maps/Route123/header.inc | 4 +- .../Route123_BerryMastersHouse/events.inc | 6 +- .../Route123_BerryMastersHouse/header.inc | 4 +- data/maps/Route124/connections.inc | 6 +- data/maps/Route124/events.inc | 8 +- data/maps/Route124/header.inc | 4 +- .../events.inc | 9 +- .../header.inc | 4 +- data/maps/Route125/connections.inc | 6 +- data/maps/Route125/events.inc | 8 +- data/maps/Route125/header.inc | 4 +- data/maps/Route126/connections.inc | 6 +- data/maps/Route126/events.inc | 4 +- data/maps/Route126/header.inc | 4 +- data/maps/Route127/connections.inc | 6 +- data/maps/Route127/events.inc | 6 +- data/maps/Route127/header.inc | 4 +- data/maps/Route128/connections.inc | 6 +- data/maps/Route128/events.inc | 6 +- data/maps/Route128/header.inc | 4 +- data/maps/Route129/connections.inc | 6 +- data/maps/Route129/events.inc | 4 +- data/maps/Route129/header.inc | 4 +- data/maps/Route130/connections.inc | 6 +- data/maps/Route130/events.inc | 4 +- data/maps/Route130/header.inc | 4 +- data/maps/Route131/connections.inc | 6 +- data/maps/Route131/events.inc | 6 +- data/maps/Route131/header.inc | 4 +- data/maps/Route132/connections.inc | 6 +- data/maps/Route132/events.inc | 4 +- data/maps/Route132/header.inc | 4 +- data/maps/Route133/connections.inc | 6 +- data/maps/Route133/events.inc | 4 +- data/maps/Route133/header.inc | 4 +- data/maps/Route134/connections.inc | 6 +- data/maps/Route134/events.inc | 4 +- data/maps/Route134/header.inc | 4 +- data/maps/RustboroCity/connections.inc | 6 +- data/maps/RustboroCity/events.inc | 10 +- data/maps/RustboroCity/header.inc | 4 +- .../maps/RustboroCity_CuttersHouse/events.inc | 6 +- .../maps/RustboroCity_CuttersHouse/header.inc | 4 +- .../maps/RustboroCity_DevonCorp_1F/events.inc | 8 +- .../maps/RustboroCity_DevonCorp_1F/header.inc | 4 +- .../maps/RustboroCity_DevonCorp_2F/events.inc | 6 +- .../maps/RustboroCity_DevonCorp_2F/header.inc | 4 +- .../maps/RustboroCity_DevonCorp_3F/events.inc | 8 +- .../maps/RustboroCity_DevonCorp_3F/header.inc | 4 +- data/maps/RustboroCity_Flat1_1F/events.inc | 6 +- data/maps/RustboroCity_Flat1_1F/header.inc | 4 +- data/maps/RustboroCity_Flat1_2F/events.inc | 6 +- data/maps/RustboroCity_Flat1_2F/header.inc | 4 +- data/maps/RustboroCity_Flat2_1F/events.inc | 6 +- data/maps/RustboroCity_Flat2_1F/header.inc | 4 +- data/maps/RustboroCity_Flat2_2F/events.inc | 6 +- data/maps/RustboroCity_Flat2_2F/header.inc | 4 +- data/maps/RustboroCity_Flat2_3F/events.inc | 6 +- data/maps/RustboroCity_Flat2_3F/header.inc | 4 +- data/maps/RustboroCity_Gym/events.inc | 8 +- data/maps/RustboroCity_Gym/header.inc | 4 +- data/maps/RustboroCity_House1/events.inc | 6 +- data/maps/RustboroCity_House1/header.inc | 4 +- data/maps/RustboroCity_House2/events.inc | 6 +- data/maps/RustboroCity_House2/header.inc | 4 +- data/maps/RustboroCity_House3/events.inc | 6 +- data/maps/RustboroCity_House3/header.inc | 4 +- data/maps/RustboroCity_Mart/events.inc | 6 +- data/maps/RustboroCity_Mart/header.inc | 4 +- .../RustboroCity_PokemonCenter_1F/events.inc | 6 +- .../RustboroCity_PokemonCenter_1F/header.inc | 4 +- .../RustboroCity_PokemonCenter_2F/events.inc | 6 +- .../RustboroCity_PokemonCenter_2F/header.inc | 4 +- .../RustboroCity_PokemonSchool/events.inc | 8 +- .../RustboroCity_PokemonSchool/header.inc | 4 +- data/maps/RusturfTunnel/events.inc | 8 +- data/maps/RusturfTunnel/header.inc | 4 +- data/maps/SSTidalCorridor/events.inc | 8 +- data/maps/SSTidalCorridor/header.inc | 4 +- data/maps/SSTidalLowerDeck/events.inc | 8 +- data/maps/SSTidalLowerDeck/header.inc | 4 +- data/maps/SSTidalRooms/events.inc | 8 +- data/maps/SSTidalRooms/header.inc | 4 +- data/maps/SafariZone_North/connections.inc | 6 +- data/maps/SafariZone_North/events.inc | 4 +- data/maps/SafariZone_North/header.inc | 4 +- .../maps/SafariZone_Northeast/connections.inc | 6 +- data/maps/SafariZone_Northeast/events.inc | 6 +- data/maps/SafariZone_Northeast/header.inc | 4 +- .../maps/SafariZone_Northwest/connections.inc | 6 +- data/maps/SafariZone_Northwest/events.inc | 4 +- data/maps/SafariZone_Northwest/header.inc | 4 +- data/maps/SafariZone_RestHouse/events.inc | 6 +- data/maps/SafariZone_RestHouse/header.inc | 4 +- data/maps/SafariZone_South/connections.inc | 6 +- data/maps/SafariZone_South/events.inc | 6 +- data/maps/SafariZone_South/header.inc | 4 +- .../maps/SafariZone_Southeast/connections.inc | 6 +- data/maps/SafariZone_Southeast/events.inc | 6 +- data/maps/SafariZone_Southeast/header.inc | 4 +- .../maps/SafariZone_Southwest/connections.inc | 6 +- data/maps/SafariZone_Southwest/events.inc | 8 +- data/maps/SafariZone_Southwest/header.inc | 4 +- data/maps/ScorchedSlab/events.inc | 6 +- data/maps/ScorchedSlab/header.inc | 4 +- data/maps/SeafloorCavern_Entrance/events.inc | 6 +- data/maps/SeafloorCavern_Entrance/header.inc | 4 +- data/maps/SeafloorCavern_Room1/events.inc | 6 +- data/maps/SeafloorCavern_Room1/header.inc | 4 +- data/maps/SeafloorCavern_Room2/events.inc | 6 +- data/maps/SeafloorCavern_Room2/header.inc | 4 +- data/maps/SeafloorCavern_Room3/events.inc | 6 +- data/maps/SeafloorCavern_Room3/header.inc | 4 +- data/maps/SeafloorCavern_Room4/events.inc | 6 +- data/maps/SeafloorCavern_Room4/header.inc | 4 +- data/maps/SeafloorCavern_Room5/events.inc | 6 +- data/maps/SeafloorCavern_Room5/header.inc | 4 +- data/maps/SeafloorCavern_Room6/events.inc | 4 +- data/maps/SeafloorCavern_Room6/header.inc | 4 +- data/maps/SeafloorCavern_Room7/events.inc | 4 +- data/maps/SeafloorCavern_Room7/header.inc | 4 +- data/maps/SeafloorCavern_Room8/events.inc | 6 +- data/maps/SeafloorCavern_Room8/header.inc | 4 +- data/maps/SeafloorCavern_Room9/events.inc | 8 +- data/maps/SeafloorCavern_Room9/header.inc | 4 +- data/maps/SealedChamber_InnerRoom/events.inc | 6 +- data/maps/SealedChamber_InnerRoom/header.inc | 4 +- data/maps/SealedChamber_OuterRoom/events.inc | 6 +- data/maps/SealedChamber_OuterRoom/header.inc | 4 +- data/maps/SecretBase_BlueCave1/events.inc | 6 +- data/maps/SecretBase_BlueCave1/header.inc | 4 +- data/maps/SecretBase_BlueCave2/events.inc | 6 +- data/maps/SecretBase_BlueCave2/header.inc | 4 +- data/maps/SecretBase_BlueCave3/events.inc | 6 +- data/maps/SecretBase_BlueCave3/header.inc | 4 +- data/maps/SecretBase_BlueCave4/events.inc | 6 +- data/maps/SecretBase_BlueCave4/header.inc | 4 +- data/maps/SecretBase_BrownCave1/events.inc | 6 +- data/maps/SecretBase_BrownCave1/header.inc | 4 +- data/maps/SecretBase_BrownCave2/events.inc | 6 +- data/maps/SecretBase_BrownCave2/header.inc | 4 +- data/maps/SecretBase_BrownCave3/events.inc | 6 +- data/maps/SecretBase_BrownCave3/header.inc | 4 +- data/maps/SecretBase_BrownCave4/events.inc | 6 +- data/maps/SecretBase_BrownCave4/header.inc | 4 +- data/maps/SecretBase_RedCave1/events.inc | 6 +- data/maps/SecretBase_RedCave1/header.inc | 4 +- data/maps/SecretBase_RedCave2/events.inc | 6 +- data/maps/SecretBase_RedCave2/header.inc | 4 +- data/maps/SecretBase_RedCave3/events.inc | 6 +- data/maps/SecretBase_RedCave3/header.inc | 4 +- data/maps/SecretBase_RedCave4/events.inc | 6 +- data/maps/SecretBase_RedCave4/header.inc | 4 +- data/maps/SecretBase_Shrub1/events.inc | 6 +- data/maps/SecretBase_Shrub1/header.inc | 4 +- data/maps/SecretBase_Shrub2/events.inc | 6 +- data/maps/SecretBase_Shrub2/header.inc | 4 +- data/maps/SecretBase_Shrub3/events.inc | 6 +- data/maps/SecretBase_Shrub3/header.inc | 4 +- data/maps/SecretBase_Shrub4/events.inc | 6 +- data/maps/SecretBase_Shrub4/header.inc | 4 +- data/maps/SecretBase_Tree1/events.inc | 6 +- data/maps/SecretBase_Tree1/header.inc | 4 +- data/maps/SecretBase_Tree2/events.inc | 6 +- data/maps/SecretBase_Tree2/header.inc | 4 +- data/maps/SecretBase_Tree3/events.inc | 6 +- data/maps/SecretBase_Tree3/header.inc | 4 +- data/maps/SecretBase_Tree4/events.inc | 6 +- data/maps/SecretBase_Tree4/header.inc | 4 +- data/maps/SecretBase_YellowCave1/events.inc | 6 +- data/maps/SecretBase_YellowCave1/header.inc | 4 +- data/maps/SecretBase_YellowCave2/events.inc | 6 +- data/maps/SecretBase_YellowCave2/header.inc | 4 +- data/maps/SecretBase_YellowCave3/events.inc | 6 +- data/maps/SecretBase_YellowCave3/header.inc | 4 +- data/maps/SecretBase_YellowCave4/events.inc | 6 +- data/maps/SecretBase_YellowCave4/header.inc | 4 +- .../ShoalCave_HighTideEntranceRoom/events.inc | 2 +- .../ShoalCave_HighTideEntranceRoom/header.inc | 4 +- .../ShoalCave_HighTideInnerRoom/events.inc | 2 +- .../ShoalCave_HighTideInnerRoom/header.inc | 4 +- .../ShoalCave_LowTideEntranceRoom/events.inc | 6 +- .../ShoalCave_LowTideEntranceRoom/header.inc | 4 +- data/maps/ShoalCave_LowTideIceRoom/events.inc | 6 +- data/maps/ShoalCave_LowTideIceRoom/header.inc | 4 +- .../ShoalCave_LowTideInnerRoom/events.inc | 8 +- .../ShoalCave_LowTideInnerRoom/header.inc | 4 +- .../ShoalCave_LowTideLowerRoom/events.inc | 8 +- .../ShoalCave_LowTideLowerRoom/header.inc | 4 +- .../ShoalCave_LowTideStairsRoom/events.inc | 8 +- .../ShoalCave_LowTideStairsRoom/header.inc | 4 +- data/maps/SingleBattleColosseum/events.inc | 8 +- data/maps/SingleBattleColosseum/header.inc | 4 +- data/maps/SkyPillar_1F/events.inc | 4 +- data/maps/SkyPillar_1F/header.inc | 4 +- data/maps/SkyPillar_2F/events.inc | 4 +- data/maps/SkyPillar_2F/header.inc | 4 +- data/maps/SkyPillar_3F/events.inc | 4 +- data/maps/SkyPillar_3F/header.inc | 4 +- data/maps/SkyPillar_4F/events.inc | 4 +- data/maps/SkyPillar_4F/header.inc | 4 +- data/maps/SkyPillar_5F/events.inc | 4 +- data/maps/SkyPillar_5F/header.inc | 4 +- data/maps/SkyPillar_Entrance/events.inc | 4 +- data/maps/SkyPillar_Entrance/header.inc | 4 +- data/maps/SkyPillar_Outside/events.inc | 6 +- data/maps/SkyPillar_Outside/header.inc | 4 +- data/maps/SkyPillar_Top/events.inc | 8 +- data/maps/SkyPillar_Top/header.inc | 4 +- data/maps/SlateportCity/connections.inc | 6 +- data/maps/SlateportCity/events.inc | 10 +- data/maps/SlateportCity/header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../SlateportCity_BattleTentLobby/events.inc | 8 +- .../SlateportCity_BattleTentLobby/header.inc | 4 +- data/maps/SlateportCity_Harbor/events.inc | 8 +- data/maps/SlateportCity_Harbor/header.inc | 4 +- data/maps/SlateportCity_House1/events.inc | 6 +- data/maps/SlateportCity_House1/header.inc | 4 +- data/maps/SlateportCity_House2/events.inc | 6 +- data/maps/SlateportCity_House2/header.inc | 4 +- data/maps/SlateportCity_Mart/events.inc | 6 +- data/maps/SlateportCity_Mart/header.inc | 4 +- .../SlateportCity_OceanicMuseum_1F/events.inc | 10 +- .../SlateportCity_OceanicMuseum_1F/header.inc | 4 +- .../SlateportCity_OceanicMuseum_2F/events.inc | 8 +- .../SlateportCity_OceanicMuseum_2F/header.inc | 4 +- .../SlateportCity_PokemonCenter_1F/events.inc | 6 +- .../SlateportCity_PokemonCenter_1F/header.inc | 4 +- .../SlateportCity_PokemonCenter_2F/events.inc | 6 +- .../SlateportCity_PokemonCenter_2F/header.inc | 4 +- .../SlateportCity_PokemonFanClub/events.inc | 6 +- .../SlateportCity_PokemonFanClub/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- data/maps/SootopolisCity/events.inc | 8 +- data/maps/SootopolisCity/header.inc | 4 +- data/maps/SootopolisCity_Gym_1F/events.inc | 8 +- data/maps/SootopolisCity_Gym_1F/header.inc | 4 +- data/maps/SootopolisCity_Gym_B1F/events.inc | 6 +- data/maps/SootopolisCity_Gym_B1F/header.inc | 4 +- data/maps/SootopolisCity_House1/events.inc | 6 +- data/maps/SootopolisCity_House1/header.inc | 4 +- data/maps/SootopolisCity_House2/events.inc | 6 +- data/maps/SootopolisCity_House2/header.inc | 4 +- data/maps/SootopolisCity_House3/events.inc | 6 +- data/maps/SootopolisCity_House3/header.inc | 4 +- data/maps/SootopolisCity_House4/events.inc | 6 +- data/maps/SootopolisCity_House4/header.inc | 4 +- data/maps/SootopolisCity_House5/events.inc | 6 +- data/maps/SootopolisCity_House5/header.inc | 4 +- data/maps/SootopolisCity_House6/events.inc | 6 +- data/maps/SootopolisCity_House6/header.inc | 4 +- data/maps/SootopolisCity_House7/events.inc | 6 +- data/maps/SootopolisCity_House7/header.inc | 4 +- .../events.inc | 8 +- .../header.inc | 4 +- data/maps/SootopolisCity_Mart/events.inc | 6 +- data/maps/SootopolisCity_Mart/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- data/maps/SouthernIsland_Exterior/events.inc | 8 +- data/maps/SouthernIsland_Exterior/header.inc | 4 +- data/maps/SouthernIsland_Interior/events.inc | 8 +- data/maps/SouthernIsland_Interior/header.inc | 4 +- data/maps/TerraCave_End/events.inc | 8 +- data/maps/TerraCave_End/header.inc | 4 +- data/maps/TerraCave_Entrance/events.inc | 4 +- data/maps/TerraCave_Entrance/header.inc | 4 +- data/maps/TradeCenter/events.inc | 8 +- data/maps/TradeCenter/header.inc | 4 +- data/maps/TrainerHill_1F/events.inc | 4 +- data/maps/TrainerHill_1F/header.inc | 4 +- data/maps/TrainerHill_2F/events.inc | 4 +- data/maps/TrainerHill_2F/header.inc | 4 +- data/maps/TrainerHill_3F/events.inc | 4 +- data/maps/TrainerHill_3F/header.inc | 4 +- data/maps/TrainerHill_4F/events.inc | 4 +- data/maps/TrainerHill_4F/header.inc | 4 +- data/maps/TrainerHill_Elevator/events.inc | 6 +- data/maps/TrainerHill_Elevator/header.inc | 4 +- data/maps/TrainerHill_Entrance/events.inc | 10 +- data/maps/TrainerHill_Entrance/header.inc | 4 +- data/maps/TrainerHill_Roof/events.inc | 6 +- data/maps/TrainerHill_Roof/header.inc | 4 +- data/maps/Underwater1/connections.inc | 6 +- data/maps/Underwater1/events.inc | 4 +- data/maps/Underwater1/header.inc | 4 +- data/maps/Underwater2/connections.inc | 6 +- data/maps/Underwater2/events.inc | 6 +- data/maps/Underwater2/header.inc | 4 +- data/maps/Underwater3/connections.inc | 6 +- data/maps/Underwater3/events.inc | 6 +- data/maps/Underwater3/header.inc | 4 +- data/maps/Underwater4/connections.inc | 6 +- data/maps/Underwater4/events.inc | 6 +- data/maps/Underwater4/header.inc | 4 +- data/maps/Underwater5/connections.inc | 6 +- data/maps/Underwater5/events.inc | 4 +- data/maps/Underwater5/header.inc | 4 +- data/maps/Underwater6/connections.inc | 6 +- data/maps/Underwater6/events.inc | 4 +- data/maps/Underwater6/header.inc | 4 +- data/maps/Underwater7/connections.inc | 6 +- data/maps/Underwater7/events.inc | 4 +- data/maps/Underwater7/header.inc | 4 +- data/maps/Underwater_MarineCave/events.inc | 4 +- data/maps/Underwater_MarineCave/header.inc | 4 +- data/maps/Underwater_Route134/events.inc | 4 +- data/maps/Underwater_Route134/header.inc | 4 +- .../maps/Underwater_SeafloorCavern/events.inc | 6 +- .../maps/Underwater_SeafloorCavern/header.inc | 4 +- data/maps/Underwater_SealedChamber/events.inc | 6 +- data/maps/Underwater_SealedChamber/header.inc | 4 +- .../maps/Underwater_SootopolisCity/events.inc | 4 +- .../maps/Underwater_SootopolisCity/header.inc | 4 +- data/maps/UnionRoom/events.inc | 6 +- data/maps/UnionRoom/header.inc | 4 +- data/maps/UnknownMap_25_29/header.inc | 4 +- data/maps/UnknownMap_25_30/header.inc | 4 +- data/maps/UnknownMap_25_31/header.inc | 4 +- data/maps/UnknownMap_25_32/header.inc | 4 +- data/maps/UnknownMap_25_33/header.inc | 4 +- data/maps/UnknownMap_25_34/header.inc | 4 +- data/maps/VerdanturfTown/connections.inc | 6 +- data/maps/VerdanturfTown/events.inc | 8 +- data/maps/VerdanturfTown/header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../events.inc | 4 +- .../header.inc | 4 +- .../VerdanturfTown_BattleTentLobby/events.inc | 8 +- .../VerdanturfTown_BattleTentLobby/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- data/maps/VerdanturfTown_House/events.inc | 6 +- data/maps/VerdanturfTown_House/header.inc | 4 +- data/maps/VerdanturfTown_Mart/events.inc | 6 +- data/maps/VerdanturfTown_Mart/header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../events.inc | 6 +- .../header.inc | 4 +- .../VerdanturfTown_WandasHouse/events.inc | 6 +- .../VerdanturfTown_WandasHouse/header.inc | 4 +- data/maps/VictoryRoad_1F/events.inc | 10 +- data/maps/VictoryRoad_1F/header.inc | 4 +- data/maps/VictoryRoad_B1F/events.inc | 6 +- data/maps/VictoryRoad_B1F/header.inc | 4 +- data/maps/VictoryRoad_B2F/events.inc | 8 +- data/maps/VictoryRoad_B2F/header.inc | 4 +- include/constants/layouts.h | 446 ++++++++++++++++++ 1091 files changed, 3257 insertions(+), 2806 deletions(-) create mode 100755 include/constants/layouts.h diff --git a/data/maps.s b/data/maps.s index 56d9571396..6e6545fbce 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,3 +1,4 @@ +#include "constants/layouts.h" #include "constants/map_types.h" #include "constants/maps.h" #include "constants/weather.h" diff --git a/data/maps/AbandonedShip_CaptainsOffice/events.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc index b59eb456a5..aff922c97e 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/events.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/events.inc @@ -1,11 +1,11 @@ -AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C +AbandonedShip_CaptainsOffice_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY -AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C +AbandonedShip_CaptainsOffice_MapWarps: warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK -AbandonedShip_CaptainsOffice_MapEvents:: @ 8536A9C +AbandonedShip_CaptainsOffice_MapEvents:: map_events AbandonedShip_CaptainsOffice_EventObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 3102e0614d..a3fbacdc7e 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_CaptainsOffice: @ 84845A4 +AbandonedShip_CaptainsOffice: .4byte AbandonedShip_CaptainsOffice_Layout .4byte AbandonedShip_CaptainsOffice_MapEvents .4byte AbandonedShip_CaptainsOffice_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 195 + .2byte LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Corridors_1F/events.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc index 6653509157..e9efcc82ab 100644 --- a/data/maps/AbandonedShip_Corridors_1F/events.inc +++ b/data/maps/AbandonedShip_Corridors_1F/events.inc @@ -1,8 +1,8 @@ -AbandonedShip_Corridors_1F_EventObjects: @ 85366C0 +AbandonedShip_Corridors_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0 object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0 -AbandonedShip_Corridors_1F_MapWarps: @ 85366F0 +AbandonedShip_Corridors_1F_MapWarps: warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK warp_def 8, 11, 3, 2, MAP_ABANDONED_SHIP_DECK warp_def 0, 11, 3, 3, MAP_ABANDONED_SHIP_DECK @@ -16,6 +16,6 @@ AbandonedShip_Corridors_1F_MapWarps: @ 85366F0 warp_def 5, 2, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 3, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_1F -AbandonedShip_Corridors_1F_MapEvents:: @ 8536750 +AbandonedShip_Corridors_1F_MapEvents:: map_events AbandonedShip_Corridors_1F_EventObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index b9f5e809c0..fc296e7623 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Corridors_1F: @ 84844C4 +AbandonedShip_Corridors_1F: .4byte AbandonedShip_Corridors_1F_Layout .4byte AbandonedShip_Corridors_1F_MapEvents .4byte AbandonedShip_Corridors_1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 187 + .2byte LAYOUT_ABANDONED_SHIP_CORRIDORS_1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Corridors_B1F/events.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc index 34bc41cf05..bbe3153e09 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/events.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc @@ -1,8 +1,8 @@ -AbandonedShip_Corridors_B1F_EventObjects: @ 8536808 +AbandonedShip_Corridors_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0 -AbandonedShip_Corridors_B1F_MapWarps: @ 8536838 +AbandonedShip_Corridors_B1F_MapWarps: warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F warp_def 3, 4, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_B1F warp_def 5, 7, 3, 0, MAP_ABANDONED_SHIP_ROOMS_B1F @@ -12,9 +12,9 @@ AbandonedShip_Corridors_B1F_MapWarps: @ 8536838 warp_def 0, 2, 3, 10, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F -AbandonedShip_Corridors_B1F_MapBGEvents: @ 8536878 +AbandonedShip_Corridors_B1F_MapBGEvents: bg_event 11, 4, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_Corridors_B1F_EventScript_237DC8 -AbandonedShip_Corridors_B1F_MapEvents:: @ 8536884 +AbandonedShip_Corridors_B1F_MapEvents:: map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index 98f23c223a..7b03645fda 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Corridors_B1F: @ 84844FC +AbandonedShip_Corridors_B1F: .4byte AbandonedShip_Corridors_B1F_Layout .4byte AbandonedShip_Corridors_B1F_MapEvents .4byte AbandonedShip_Corridors_B1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 189 + .2byte LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Deck/events.inc b/data/maps/AbandonedShip_Deck/events.inc index 289f917af4..70fa72c4f7 100644 --- a/data/maps/AbandonedShip_Deck/events.inc +++ b/data/maps/AbandonedShip_Deck/events.inc @@ -1,10 +1,10 @@ -AbandonedShip_Deck_MapWarps: @ 8536684 +AbandonedShip_Deck_MapWarps: warp_def 13, 15, 3, 0, MAP_ROUTE108 warp_def 14, 15, 3, 0, MAP_ROUTE108 warp_def 13, 9, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 8, 9, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 12, 5, 3, 0, MAP_ABANDONED_SHIP_CAPTAINS_OFFICE -AbandonedShip_Deck_MapEvents:: @ 85366AC +AbandonedShip_Deck_MapEvents:: map_events 0x0, AbandonedShip_Deck_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index 394c93ec95..395f4404d6 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Deck: @ 84844A8 +AbandonedShip_Deck: .4byte AbandonedShip_Deck_Layout .4byte AbandonedShip_Deck_MapEvents .4byte AbandonedShip_Deck_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 186 + .2byte LAYOUT_ABANDONED_SHIP_DECK .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc index 54453b7290..5b0130c3ef 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc @@ -1,4 +1,4 @@ -AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC +AbandonedShip_HiddenFloorCorridors_MapWarps: warp_def 3, 8, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS warp_def 6, 8, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS warp_def 9, 8, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS @@ -6,12 +6,12 @@ AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC warp_def 6, 3, 3, 7, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS -AbandonedShip_HiddenFloorCorridors_MapBGEvents: @ 8536AFC +AbandonedShip_HiddenFloorCorridors_MapBGEvents: bg_event 3, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A19 bg_event 6, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A50 bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A87 bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE -AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 8536B2C +AbandonedShip_HiddenFloorCorridors_MapEvents:: map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index dcf42db40c..cc268ca6e0 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_HiddenFloorCorridors: @ 84845DC +AbandonedShip_HiddenFloorCorridors: .4byte AbandonedShip_HiddenFloorCorridors_Layout .4byte AbandonedShip_HiddenFloorCorridors_MapEvents .4byte AbandonedShip_HiddenFloorCorridors_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 289 + .2byte LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc index b2cf9b11bc..380e7f958b 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc @@ -1,10 +1,10 @@ -AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40 +AbandonedShip_HiddenFloorRooms_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE -AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 +AbandonedShip_HiddenFloorRooms_MapWarps: warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS warp_def 7, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS warp_def 21, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS @@ -15,7 +15,7 @@ AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 warp_def 21, 1, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS -AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8 +AbandonedShip_HiddenFloorRooms_MapBGEvents: bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY @@ -27,6 +27,6 @@ AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8 bg_event 25, 2, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 bg_event 24, 6, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 -AbandonedShip_HiddenFloorRooms_MapEvents:: @ 8536C60 +AbandonedShip_HiddenFloorRooms_MapEvents:: map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index f279a52ab7..24889acd1f 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_HiddenFloorRooms: @ 84845F8 +AbandonedShip_HiddenFloorRooms: .4byte AbandonedShip_HiddenFloorRooms_Layout .4byte AbandonedShip_HiddenFloorRooms_MapEvents .4byte AbandonedShip_HiddenFloorRooms_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 310 + .2byte LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Room_B1F/events.inc b/data/maps/AbandonedShip_Room_B1F/events.inc index bd882d6d85..d0cddd45b5 100644 --- a/data/maps/AbandonedShip_Room_B1F/events.inc +++ b/data/maps/AbandonedShip_Room_B1F/events.inc @@ -1,10 +1,10 @@ -AbandonedShip_Room_B1F_EventObjects: @ 853697C +AbandonedShip_Room_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13 -AbandonedShip_Room_B1F_MapWarps: @ 8536994 +AbandonedShip_Room_B1F_MapWarps: warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 5, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F -AbandonedShip_Room_B1F_MapEvents:: @ 85369A4 +AbandonedShip_Room_B1F_MapEvents:: map_events AbandonedShip_Room_B1F_EventObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index 3ac0c5f38a..c6dd8ee37d 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Room_B1F: @ 848456C +AbandonedShip_Room_B1F: .4byte AbandonedShip_Room_B1F_Layout .4byte AbandonedShip_Room_B1F_MapEvents .4byte AbandonedShip_Room_B1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 193 + .2byte LAYOUT_ABANDONED_SHIP_ROOM_B1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Rooms2_1F/events.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc index 6e4b9b2803..71b0416e37 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/events.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/events.inc @@ -1,15 +1,15 @@ -AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8 +AbandonedShip_Rooms2_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0 object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0 -AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30 +AbandonedShip_Rooms2_1F_MapWarps: warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 5, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 4, 1, 3, 11, MAP_ABANDONED_SHIP_CORRIDORS_1F -AbandonedShip_Rooms2_1F_MapEvents:: @ 8536A48 +AbandonedShip_Rooms2_1F_MapEvents:: map_events AbandonedShip_Rooms2_1F_EventObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index 71f856bc06..e9a55f93e2 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Rooms2_1F: @ 8484588 +AbandonedShip_Rooms2_1F: .4byte AbandonedShip_Rooms2_1F_Layout .4byte AbandonedShip_Rooms2_1F_MapEvents .4byte AbandonedShip_Rooms2_1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 194 + .2byte LAYOUT_ABANDONED_SHIP_ROOMS2_1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Rooms2_B1F/events.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc index 3bb29619aa..3c47ae3bb0 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/events.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/events.inc @@ -1,13 +1,13 @@ -AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4 +AbandonedShip_Rooms2_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL -AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924 +AbandonedShip_Rooms2_B1F_MapWarps: warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 5, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 13, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 14, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F -AbandonedShip_Rooms2_B1F_MapEvents:: @ 8536944 +AbandonedShip_Rooms2_B1F_MapEvents:: map_events AbandonedShip_Rooms2_B1F_EventObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index 943e57b77d..4afe519374 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Rooms2_B1F: @ 8484534 +AbandonedShip_Rooms2_B1F: .4byte AbandonedShip_Rooms2_B1F_Layout .4byte AbandonedShip_Rooms2_B1F_MapEvents .4byte AbandonedShip_Rooms2_B1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 191 + .2byte LAYOUT_ABANDONED_SHIP_ROOMS2_B1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Rooms_1F/events.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc index f0322558b0..b63f2bd72f 100644 --- a/data/maps/AbandonedShip_Rooms_1F/events.inc +++ b/data/maps/AbandonedShip_Rooms_1F/events.inc @@ -1,10 +1,10 @@ -AbandonedShip_Rooms_1F_EventObjects: @ 8536764 +AbandonedShip_Rooms_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0 object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0 -AbandonedShip_Rooms_1F_MapWarps: @ 85367C4 +AbandonedShip_Rooms_1F_MapWarps: warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 5, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 4, 1, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_1F @@ -12,6 +12,6 @@ AbandonedShip_Rooms_1F_MapWarps: @ 85367C4 warp_def 13, 1, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 14, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F -AbandonedShip_Rooms_1F_MapEvents:: @ 85367F4 +AbandonedShip_Rooms_1F_MapEvents:: map_events AbandonedShip_Rooms_1F_EventObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index b37456c281..60607565c3 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Rooms_1F: @ 84844E0 +AbandonedShip_Rooms_1F: .4byte AbandonedShip_Rooms_1F_Layout .4byte AbandonedShip_Rooms_1F_MapEvents .4byte AbandonedShip_Rooms_1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 188 + .2byte LAYOUT_ABANDONED_SHIP_ROOMS_1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Rooms_B1F/events.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc index 4af246e5c0..eda95460bd 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/events.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/events.inc @@ -1,12 +1,12 @@ -AbandonedShip_Rooms_B1F_EventObjects: @ 8536898 +AbandonedShip_Rooms_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE -AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8 +AbandonedShip_Rooms_B1F_MapWarps: warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 13, 1, 3, 3, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 22, 1, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_B1F -AbandonedShip_Rooms_B1F_MapEvents:: @ 85368E0 +AbandonedShip_Rooms_B1F_MapEvents:: map_events AbandonedShip_Rooms_B1F_EventObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index f5ec64f2b7..582123b345 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Rooms_B1F: @ 8484518 +AbandonedShip_Rooms_B1F: .4byte AbandonedShip_Rooms_B1F_Layout .4byte AbandonedShip_Rooms_B1F_MapEvents .4byte AbandonedShip_Rooms_B1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 190 + .2byte LAYOUT_ABANDONED_SHIP_ROOMS_B1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Underwater1/events.inc b/data/maps/AbandonedShip_Underwater1/events.inc index 5c9af3c107..c6c4e226fa 100644 --- a/data/maps/AbandonedShip_Underwater1/events.inc +++ b/data/maps/AbandonedShip_Underwater1/events.inc @@ -1,7 +1,7 @@ -AbandonedShip_Underwater1_MapWarps: @ 8536958 +AbandonedShip_Underwater1_MapWarps: warp_def 3, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 warp_def 4, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 -AbandonedShip_Underwater1_MapEvents:: @ 8536968 +AbandonedShip_Underwater1_MapEvents:: map_events 0x0, AbandonedShip_Underwater1_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index e5119887a7..d77b43cac4 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Underwater1: @ 8484550 +AbandonedShip_Underwater1: .4byte AbandonedShip_Underwater1_Layout .4byte AbandonedShip_Underwater1_MapEvents .4byte AbandonedShip_Underwater1_MapScripts .4byte 0x0 .2byte MUS_DEEPDEEP - .2byte 192 + .2byte LAYOUT_ABANDONED_SHIP_UNDERWATER1 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/AbandonedShip_Underwater2/events.inc b/data/maps/AbandonedShip_Underwater2/events.inc index f06c21b2a0..f4fadb1bae 100644 --- a/data/maps/AbandonedShip_Underwater2/events.inc +++ b/data/maps/AbandonedShip_Underwater2/events.inc @@ -1,6 +1,6 @@ -AbandonedShip_Underwater2_MapWarps: @ 8536AB0 +AbandonedShip_Underwater2_MapWarps: warp_def 3, 1, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER1 -AbandonedShip_Underwater2_MapEvents:: @ 8536AB8 +AbandonedShip_Underwater2_MapEvents:: map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index de7e871d0b..eb08a5f709 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Underwater2: @ 84845C0 +AbandonedShip_Underwater2: .4byte AbandonedShip_Underwater2_Layout .4byte AbandonedShip_Underwater2_MapEvents .4byte AbandonedShip_Underwater2_MapScripts .4byte 0x0 .2byte MUS_DEEPDEEP - .2byte 196 + .2byte LAYOUT_ABANDONED_SHIP_UNDERWATER2 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/AlteringCave/events.inc b/data/maps/AlteringCave/events.inc index 898038715d..0963e38015 100644 --- a/data/maps/AlteringCave/events.inc +++ b/data/maps/AlteringCave/events.inc @@ -1,6 +1,6 @@ -AlteringCave_MapWarps: @ 8537894 +AlteringCave_MapWarps: warp_def 18, 22, 0, 0, MAP_ROUTE103 -AlteringCave_MapEvents:: @ 853789C +AlteringCave_MapEvents:: map_events 0x0, AlteringCave_MapWarps, 0x0, 0x0 diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc index fe88dbca0c..551d704248 100644 --- a/data/maps/AlteringCave/header.inc +++ b/data/maps/AlteringCave/header.inc @@ -1,10 +1,10 @@ -AlteringCave: @ 8484A58 +AlteringCave: .4byte AlteringCave_Layout .4byte AlteringCave_MapEvents .4byte AlteringCave_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 420 + .2byte LAYOUT_ALTERING_CAVE .byte MAPSEC_ALTERING_CAVE_2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc index 3e784dea26..06dedb33ed 100644 --- a/data/maps/AncientTomb/events.inc +++ b/data/maps/AncientTomb/events.inc @@ -1,16 +1,16 @@ -AncientTomb_EventObjects: @ 8536CDC +AncientTomb_EventObjects: object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, FLAG_HIDE_REGISTEEL -AncientTomb_MapWarps: @ 8536CF4 +AncientTomb_MapWarps: warp_def 8, 29, 3, 0, MAP_ROUTE120 warp_def 8, 20, 0, 2, MAP_ANCIENT_TOMB warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB -AncientTomb_MapBGEvents: @ 8536D0C +AncientTomb_MapBGEvents: bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239033 bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050 bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050 -AncientTomb_MapEvents:: @ 8536D30 +AncientTomb_MapEvents:: map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index 5bfe546145..f1c3b4111d 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -1,10 +1,10 @@ -AncientTomb: @ 8484630 +AncientTomb: .4byte AncientTomb_Layout .4byte AncientTomb_MapEvents .4byte AncientTomb_MapScripts .4byte 0x0 .2byte MUS_MABOROSI - .2byte 281 + .2byte LAYOUT_ANCIENT_TOMB .byte MAPSEC_ANCIENT_TOMB .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AquaHideout_1F/events.inc b/data/maps/AquaHideout_1F/events.inc index 6a4f0972fa..663ae0ada0 100644 --- a/data/maps/AquaHideout_1F/events.inc +++ b/data/maps/AquaHideout_1F/events.inc @@ -1,13 +1,13 @@ -AquaHideout_1F_EventObjects: @ 8535304 +AquaHideout_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS -AquaHideout_1F_MapWarps: @ 853534C +AquaHideout_1F_MapWarps: warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY warp_def 14, 27, 1, 6, MAP_LILYCOVE_CITY warp_def 22, 1, 3, 0, MAP_AQUA_HIDEOUT_B1F -AquaHideout_1F_MapEvents:: @ 8535364 +AquaHideout_1F_MapEvents:: map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index dd4e120437..30e045f797 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -1,10 +1,10 @@ -AquaHideout_1F: @ 8484144 +AquaHideout_1F: .4byte AquaHideout_1F_Layout .4byte AquaHideout_1F_MapEvents .4byte AquaHideout_1F_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 143 + .2byte LAYOUT_AQUA_HIDEOUT_1F .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AquaHideout_B1F/events.inc b/data/maps/AquaHideout_B1F/events.inc index 6dd83aebf3..edc3df4c64 100644 --- a/data/maps/AquaHideout_B1F/events.inc +++ b/data/maps/AquaHideout_B1F/events.inc @@ -1,4 +1,4 @@ -AquaHideout_B1F_EventObjects: @ 8535378 +AquaHideout_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR @@ -9,7 +9,7 @@ AquaHideout_B1F_EventObjects: @ 8535378 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2 object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS -AquaHideout_B1F_MapWarps: @ 8535450 +AquaHideout_B1F_MapWarps: warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F warp_def 18, 1, 3, 0, MAP_AQUA_HIDEOUT_B2F warp_def 12, 1, 3, 1, MAP_AQUA_HIDEOUT_B2F @@ -36,6 +36,6 @@ AquaHideout_B1F_MapWarps: @ 8535450 warp_def 45, 17, 3, 17, MAP_AQUA_HIDEOUT_B1F warp_def 48, 17, 3, 19, MAP_AQUA_HIDEOUT_B1F -AquaHideout_B1F_MapEvents:: @ 8535518 +AquaHideout_B1F_MapEvents:: map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index bc65150d61..dfe453ddd4 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -1,10 +1,10 @@ -AquaHideout_B1F: @ 8484160 +AquaHideout_B1F: .4byte AquaHideout_B1F_Layout .4byte AquaHideout_B1F_MapEvents .4byte AquaHideout_B1F_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 144 + .2byte LAYOUT_AQUA_HIDEOUT_B1F .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc index 552a95ad44..f24115c324 100644 --- a/data/maps/AquaHideout_B2F/events.inc +++ b/data/maps/AquaHideout_B2F/events.inc @@ -1,4 +1,4 @@ -AquaHideout_B2F_EventObjects: @ 853552C +AquaHideout_B2F_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL @@ -6,7 +6,7 @@ AquaHideout_B2F_EventObjects: @ 853552C object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS -AquaHideout_B2F_MapWarps: @ 85355BC +AquaHideout_B2F_MapWarps: warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F warp_def 12, 1, 3, 2, MAP_AQUA_HIDEOUT_B1F warp_def 3, 3, 3, 3, MAP_AQUA_HIDEOUT_B1F @@ -18,10 +18,10 @@ AquaHideout_B2F_MapWarps: @ 85355BC warp_def 31, 17, 3, 4, MAP_AQUA_HIDEOUT_B2F warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F -AquaHideout_B2F_MapCoordEvents: @ 853560C +AquaHideout_B2F_MapCoordEvents: coord_event 28, 17, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5 coord_event 28, 16, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5 -AquaHideout_B2F_MapEvents:: @ 853562C +AquaHideout_B2F_MapEvents:: map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index d4bf343288..3d87c7ad3a 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -1,10 +1,10 @@ -AquaHideout_B2F: @ 848417C +AquaHideout_B2F: .4byte AquaHideout_B2F_Layout .4byte AquaHideout_B2F_MapEvents .4byte AquaHideout_B2F_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 145 + .2byte LAYOUT_AQUA_HIDEOUT_B2F .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AquaHideout_UnusedRubyMap1/events.inc b/data/maps/AquaHideout_UnusedRubyMap1/events.inc index 45663b68fe..f8107f4795 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/events.inc +++ b/data/maps/AquaHideout_UnusedRubyMap1/events.inc @@ -1,3 +1,3 @@ -AquaHideout_UnusedRubyMap1_MapEvents:: @ 8536FBC +AquaHideout_UnusedRubyMap1_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc index 90e59a51e1..30946c6f8d 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc @@ -1,10 +1,10 @@ -AquaHideout_UnusedRubyMap1: @ 84846D8 +AquaHideout_UnusedRubyMap1: .4byte AquaHideout_UnusedRubyMap1_Layout .4byte AquaHideout_UnusedRubyMap1_MapEvents .4byte AquaHideout_UnusedRubyMap1_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 316 + .2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AquaHideout_UnusedRubyMap2/events.inc b/data/maps/AquaHideout_UnusedRubyMap2/events.inc index 6f53de284a..569e13cb09 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/events.inc +++ b/data/maps/AquaHideout_UnusedRubyMap2/events.inc @@ -1,3 +1,3 @@ -AquaHideout_UnusedRubyMap2_MapEvents:: @ 8536FD0 +AquaHideout_UnusedRubyMap2_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc index 776465f16e..cd08fcc5e8 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc @@ -1,10 +1,10 @@ -AquaHideout_UnusedRubyMap2: @ 84846F4 +AquaHideout_UnusedRubyMap2: .4byte AquaHideout_UnusedRubyMap2_Layout .4byte AquaHideout_UnusedRubyMap2_MapEvents .4byte AquaHideout_UnusedRubyMap2_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 317 + .2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AquaHideout_UnusedRubyMap3/events.inc b/data/maps/AquaHideout_UnusedRubyMap3/events.inc index 8a23a37861..7618c0d58e 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/events.inc +++ b/data/maps/AquaHideout_UnusedRubyMap3/events.inc @@ -1,3 +1,3 @@ -AquaHideout_UnusedRubyMap3_MapEvents:: @ 8536FE4 +AquaHideout_UnusedRubyMap3_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc index ab97ae84d5..993f10aff9 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc @@ -1,10 +1,10 @@ -AquaHideout_UnusedRubyMap3: @ 8484710 +AquaHideout_UnusedRubyMap3: .4byte AquaHideout_UnusedRubyMap3_Layout .4byte AquaHideout_UnusedRubyMap3_MapEvents .4byte AquaHideout_UnusedRubyMap3_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 318 + .2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ArtisanCave_1F/events.inc b/data/maps/ArtisanCave_1F/events.inc index 30f920220a..f53e074b90 100644 --- a/data/maps/ArtisanCave_1F/events.inc +++ b/data/maps/ArtisanCave_1F/events.inc @@ -1,10 +1,10 @@ -ArtisanCave_1F_EventObjects: @ 8537774 +ArtisanCave_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS -ArtisanCave_1F_MapWarps: @ 853778C +ArtisanCave_1F_MapWarps: warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 6, 5, 0, 1, MAP_ARTISAN_CAVE_B1F -ArtisanCave_1F_MapEvents:: @ 853779C +ArtisanCave_1F_MapEvents:: map_events ArtisanCave_1F_EventObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc index c53a2851b4..670aa6845c 100644 --- a/data/maps/ArtisanCave_1F/header.inc +++ b/data/maps/ArtisanCave_1F/header.inc @@ -1,10 +1,10 @@ -ArtisanCave_1F: @ 84849B0 +ArtisanCave_1F: .4byte ArtisanCave_1F_Layout .4byte ArtisanCave_1F_MapEvents .4byte ArtisanCave_1F_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 401 + .2byte LAYOUT_ARTISAN_CAVE_1F .byte MAPSEC_ARTISAN_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ArtisanCave_B1F/events.inc b/data/maps/ArtisanCave_B1F/events.inc index 9df844aa37..7572aaa2ad 100644 --- a/data/maps/ArtisanCave_B1F/events.inc +++ b/data/maps/ArtisanCave_B1F/events.inc @@ -1,16 +1,16 @@ -ArtisanCave_B1F_EventObjects: @ 8537708 +ArtisanCave_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP -ArtisanCave_B1F_MapWarps: @ 8537720 +ArtisanCave_B1F_MapWarps: warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F -ArtisanCave_B1F_MapBGEvents: @ 8537730 +ArtisanCave_B1F_MapBGEvents: bg_hidden_item_event 32, 29, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN bg_hidden_item_event 19, 43, 0, ITEM_IRON, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON -ArtisanCave_B1F_MapEvents:: @ 8537760 +ArtisanCave_B1F_MapEvents:: map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc index f76fe69382..fd1adb32fc 100644 --- a/data/maps/ArtisanCave_B1F/header.inc +++ b/data/maps/ArtisanCave_B1F/header.inc @@ -1,10 +1,10 @@ -ArtisanCave_B1F: @ 8484994 +ArtisanCave_B1F: .4byte ArtisanCave_B1F_Layout .4byte ArtisanCave_B1F_MapEvents .4byte ArtisanCave_B1F_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 400 + .2byte LAYOUT_ARTISAN_CAVE_B1F .byte MAPSEC_ARTISAN_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc index 4731db9755..4d8b6ea2fc 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC +BattleFrontier_BattleArenaBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 @@ -9,6 +9,6 @@ BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4 +BattleFrontier_BattleArenaBattleRoom_MapEvents:: map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc index 12962e7dec..1c4cf3eb07 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleArenaBattleRoom: @ 8485484 +BattleFrontier_BattleArenaBattleRoom: .4byte BattleFrontier_BattleArenaBattleRoom_Layout .4byte BattleFrontier_BattleArenaBattleRoom_MapEvents .4byte BattleFrontier_BattleArenaBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_ARENA - .2byte 356 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc index bfe28c3393..5be3b04e6c 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0 +BattleFrontier_BattleArenaCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleArenaCorridor_MapEvents:: @ 853C8D8 +BattleFrontier_BattleArenaCorridor_MapEvents:: map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc index d4935ea9ef..17341a3e86 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleArenaCorridor: @ 8485468 +BattleFrontier_BattleArenaCorridor: .4byte BattleFrontier_BattleArenaCorridor_Layout .4byte BattleFrontier_BattleArenaCorridor_MapEvents .4byte BattleFrontier_BattleArenaCorridor_MapScripts .4byte 0x0 .2byte MUS_B_ARENA - .2byte 355 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleArenaLobby/events.inc b/data/maps/BattleFrontier_BattleArenaLobby/events.inc index e20bec9c33..a63202848b 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/events.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/events.inc @@ -1,17 +1,17 @@ -BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814 +BattleFrontier_BattleArenaLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0 object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0 object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0 object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0 -BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C +BattleFrontier_BattleArenaLobby_MapWarps: warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894 +BattleFrontier_BattleArenaLobby_MapBGEvents: bg_event 5, 9, 3, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleArenaLobby_EventScript_256092 bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleArenaLobby_EventScript_2560CA -BattleFrontier_BattleArenaLobby_MapEvents:: @ 853C8AC +BattleFrontier_BattleArenaLobby_MapEvents:: map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc index 3523eaf63f..db8f456ff3 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleArenaLobby: @ 848544C +BattleFrontier_BattleArenaLobby: .4byte BattleFrontier_BattleArenaLobby_Layout .4byte BattleFrontier_BattleArenaLobby_MapEvents .4byte BattleFrontier_BattleArenaLobby_MapScripts .4byte 0x0 .2byte MUS_B_ARENA - .2byte 354 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc index 9101606456..ce8f66f6bf 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4 +BattleFrontier_BattleDomeBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_TWIN, 0, 7, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 @@ -15,6 +15,6 @@ BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4 object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 14, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 15, EVENT_OBJ_GFX_VAR_0, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C +BattleFrontier_BattleDomeBattleRoom_MapEvents:: map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc index 7d2119ebee..593adeb6f3 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomeBattleRoom: @ 8485388 +BattleFrontier_BattleDomeBattleRoom: .4byte BattleFrontier_BattleDomeBattleRoom_Layout .4byte BattleFrontier_BattleDomeBattleRoom_MapEvents .4byte BattleFrontier_BattleDomeBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_DOME - .2byte 335 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc index 6bce917a01..3d3f5be4bd 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C +BattleFrontier_BattleDomeCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 23, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164 +BattleFrontier_BattleDomeCorridor_MapWarps: warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_BattleDomeCorridor_MapEvents:: @ 853C174 +BattleFrontier_BattleDomeCorridor_MapEvents:: map_events BattleFrontier_BattleDomeCorridor_EventObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc index 25883e9ed5..3ce5b2b5e0 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomeCorridor: @ 8485350 +BattleFrontier_BattleDomeCorridor: .4byte BattleFrontier_BattleDomeCorridor_Layout .4byte BattleFrontier_BattleDomeCorridor_MapEvents .4byte BattleFrontier_BattleDomeCorridor_MapScripts .4byte 0x0 .2byte MUS_B_DOME1 - .2byte 333 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleDomeLobby/events.inc b/data/maps/BattleFrontier_BattleDomeLobby/events.inc index cce01feda6..abf8671326 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/events.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068 +BattleFrontier_BattleDomeLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 1, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0 object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0 @@ -6,16 +6,16 @@ BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068 object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0 object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0 -BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8 +BattleFrontier_BattleDomeLobby_MapWarps: warp_def 11, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 12, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108 +BattleFrontier_BattleDomeLobby_MapBGEvents: bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D52 bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D84 bg_event 18, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D6B bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249E34 -BattleFrontier_BattleDomeLobby_MapEvents:: @ 853C138 +BattleFrontier_BattleDomeLobby_MapEvents:: map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc index 451192a452..cf0c576191 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomeLobby: @ 8485334 +BattleFrontier_BattleDomeLobby: .4byte BattleFrontier_BattleDomeLobby_Layout .4byte BattleFrontier_BattleDomeLobby_MapEvents .4byte BattleFrontier_BattleDomeLobby_MapScripts .4byte 0x0 .2byte MUS_B_DOME1 - .2byte 332 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc index 559199b292..0714b7b68d 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188 +BattleFrontier_BattleDomePreBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0 +BattleFrontier_BattleDomePreBattleRoom_MapWarps: warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_BattleDomePreBattleRoom_MapEvents:: @ 853C1B0 +BattleFrontier_BattleDomePreBattleRoom_MapEvents:: map_events BattleFrontier_BattleDomePreBattleRoom_EventObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc index 59b5b15e4a..84637906d8 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomePreBattleRoom: @ 848536C +BattleFrontier_BattleDomePreBattleRoom: .4byte BattleFrontier_BattleDomePreBattleRoom_Layout .4byte BattleFrontier_BattleDomePreBattleRoom_MapEvents .4byte BattleFrontier_BattleDomePreBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_DOME - .2byte 334 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc index bdaf4c51bb..5f3a6a218e 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC +BattleFrontier_BattleFactoryBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 @@ -8,6 +8,6 @@ BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 8, EVENT_OBJ_GFX_VAR_F, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C +BattleFrontier_BattleFactoryBattleRoom_MapEvents:: map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc index 960fef2eb4..cb20b3f1ee 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleFactoryBattleRoom: @ 84854D8 +BattleFrontier_BattleFactoryBattleRoom: .4byte BattleFrontier_BattleFactoryBattleRoom_Layout .4byte BattleFrontier_BattleFactoryBattleRoom_MapEvents .4byte BattleFrontier_BattleFactoryBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_FACTORY - .2byte 348 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc index 063f498131..7cfccd0ff5 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8 +BattleFrontier_BattleFactoryLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0 @@ -6,15 +6,15 @@ BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8 object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0 object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0 -BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68 +BattleFrontier_BattleFactoryLobby_MapWarps: warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 10, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78 +BattleFrontier_BattleFactoryLobby_MapBGEvents: bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587E1 bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587FA bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleFactoryLobby_EventScript_258839 -BattleFrontier_BattleFactoryLobby_MapEvents:: @ 853CA9C +BattleFrontier_BattleFactoryLobby_MapEvents:: map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc index 92329c6ef5..30bd38b686 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleFactoryLobby: @ 84854A0 +BattleFrontier_BattleFactoryLobby: .4byte BattleFrontier_BattleFactoryLobby_Layout .4byte BattleFrontier_BattleFactoryLobby_MapEvents .4byte BattleFrontier_BattleFactoryLobby_MapScripts .4byte 0x0 .2byte MUS_B_FACTORY - .2byte 346 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc index d341250dee..944ff81429 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0 +BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: @ 853CAC8 +BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc index 4cae9ed0c7..ecbfc37a97 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC +BattleFrontier_BattleFactoryPreBattleRoom: .4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapEvents .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_FACTORY - .2byte 347 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc index 8363f2bb57..95aacea959 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc @@ -1,14 +1,14 @@ -BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC +BattleFrontier_BattlePalaceBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574 +BattleFrontier_BattlePalaceBattleRoom_MapWarps: warp_def 0, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR warp_def 1, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR -BattleFrontier_BattlePalaceBattleRoom_MapEvents:: @ 853C584 +BattleFrontier_BattlePalaceBattleRoom_MapEvents:: map_events BattleFrontier_BattlePalaceBattleRoom_EventObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc index 2715ade5c7..035cd8758e 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePalaceBattleRoom: @ 84853DC +BattleFrontier_BattlePalaceBattleRoom: .4byte BattleFrontier_BattlePalaceBattleRoom_Layout .4byte BattleFrontier_BattlePalaceBattleRoom_MapEvents .4byte BattleFrontier_BattlePalaceBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_PALACE - .2byte 344 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc index 66e844665a..578c2cc436 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420 +BattleFrontier_BattlePalaceCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 0, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0 @@ -7,12 +7,12 @@ BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420 object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, 0x0, 0 object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, 0x0, 0 -BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8 +BattleFrontier_BattlePalaceCorridor_MapWarps: warp_def 8, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY warp_def 9, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY warp_def 6, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM warp_def 10, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM -BattleFrontier_BattlePalaceCorridor_MapEvents:: @ 853C4E8 +BattleFrontier_BattlePalaceCorridor_MapEvents:: map_events BattleFrontier_BattlePalaceCorridor_EventObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc index f2866b9b0d..6d2f8ffb05 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePalaceCorridor: @ 84853C0 +BattleFrontier_BattlePalaceCorridor: .4byte BattleFrontier_BattlePalaceCorridor_Layout .4byte BattleFrontier_BattlePalaceCorridor_MapEvents .4byte BattleFrontier_BattlePalaceCorridor_MapScripts .4byte 0x0 .2byte MUS_B_PALACE - .2byte 343 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc index 632bfdf107..4c2d924b2f 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340 +BattleFrontier_BattlePalaceLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0 object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0 object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0 @@ -6,16 +6,16 @@ BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340 object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0 object_event 6, EVENT_OBJ_GFX_EXPERT_M, 0, 19, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0 -BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0 +BattleFrontier_BattlePalaceLobby_MapWarps: warp_def 12, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 13, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 5, 4, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR -BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8 +BattleFrontier_BattlePalaceLobby_MapBGEvents: bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC50 bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC69 bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6 -BattleFrontier_BattlePalaceLobby_MapEvents:: @ 853C40C +BattleFrontier_BattlePalaceLobby_MapEvents:: map_events BattleFrontier_BattlePalaceLobby_EventObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc index 19d06e0be6..8846982cf4 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePalaceLobby: @ 84853A4 +BattleFrontier_BattlePalaceLobby: .4byte BattleFrontier_BattlePalaceLobby_Layout .4byte BattleFrontier_BattlePalaceLobby_MapEvents .4byte BattleFrontier_BattlePalaceLobby_MapScripts .4byte 0x0 .2byte MUS_B_PALACE - .2byte 342 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc index b34916f49e..ace2657bbc 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54 +BattleFrontier_BattlePikeCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C +BattleFrontier_BattlePikeCorridor_MapEvents:: map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc index 07d7305798..cecd6fba15 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeCorridor: @ 8485510 +BattleFrontier_BattlePikeCorridor: .4byte BattleFrontier_BattlePikeCorridor_Layout .4byte BattleFrontier_BattlePikeCorridor_MapEvents .4byte BattleFrontier_BattlePikeCorridor_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 350 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePikeLobby/events.inc b/data/maps/BattleFrontier_BattlePikeLobby/events.inc index 495d522579..b28d48d6ac 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/events.inc @@ -1,18 +1,18 @@ -BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0 +BattleFrontier_BattlePikeLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0 object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0 object_event 3, EVENT_OBJ_GFX_TWIN, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0 object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0 -BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10 +BattleFrontier_BattlePikeLobby_MapWarps: warp_def 5, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 4, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 6, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_BattlePikeLobby_MapBGEvents: @ 853CC28 +BattleFrontier_BattlePikeLobby_MapBGEvents: bg_event 8, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BA80 bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BAC6 -BattleFrontier_BattlePikeLobby_MapEvents:: @ 853CC40 +BattleFrontier_BattlePikeLobby_MapEvents:: map_events BattleFrontier_BattlePikeLobby_EventObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc index e591be668f..a3746c1143 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeLobby: @ 84854F4 +BattleFrontier_BattlePikeLobby: .4byte BattleFrontier_BattlePikeLobby_Layout .4byte BattleFrontier_BattlePikeLobby_MapEvents .4byte BattleFrontier_BattlePikeLobby_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 349 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc index 81dee29d15..34f802c916 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc @@ -1,8 +1,8 @@ -BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54 +BattleFrontier_BattlePikeRandomRoom1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0 object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0 -BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84 +BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2 coord_event 3, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 coord_event 3, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D @@ -11,6 +11,6 @@ BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84 coord_event 4, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D coord_event 5, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D -BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4 +BattleFrontier_BattlePikeRandomRoom1_MapEvents:: map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc index d49bb07d5d..ff61d12384 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeRandomRoom1: @ 8485548 +BattleFrontier_BattlePikeRandomRoom1: .4byte BattleFrontier_BattlePikeRandomRoom1_Layout .4byte BattleFrontier_BattlePikeRandomRoom1_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom1_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 352 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc index 41a58ad3b6..0d929a2ae3 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08 +BattleFrontier_BattlePikeRandomRoom2_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20 +BattleFrontier_BattlePikeRandomRoom2_MapEvents:: map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc index 506a31496b..6ab11ae02e 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeRandomRoom2: @ 8485564 +BattleFrontier_BattlePikeRandomRoom2: .4byte BattleFrontier_BattlePikeRandomRoom2_Layout .4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 353 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc index 61cb8ede48..9b3a6234e0 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34 +BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174 coord_event 3, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 coord_event 4, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 @@ -7,6 +7,6 @@ BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34 coord_event 4, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D coord_event 5, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D -BattleFrontier_BattlePikeRandomRoom3_MapEvents:: @ 853CEA4 +BattleFrontier_BattlePikeRandomRoom3_MapEvents:: map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc index 3f5607922d..fabb3a8ef7 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeRandomRoom3: @ 8485580 +BattleFrontier_BattlePikeRandomRoom3: .4byte BattleFrontier_BattlePikeRandomRoom3_Layout .4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 358 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc index 2fc9e9d6c9..59abdb9708 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc @@ -1,8 +1,8 @@ -BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80 +BattleFrontier_BattlePikeThreePathRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 4, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0 object_event 2, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0 -BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 +BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: coord_event 2, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E coord_event 6, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59 coord_event 10, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64 @@ -13,6 +13,6 @@ BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 coord_event 7, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 coord_event 7, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D -BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40 +BattleFrontier_BattlePikeThreePathRoom_MapEvents:: map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc index 9743a7c365..718d5d3e60 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeThreePathRoom: @ 848552C +BattleFrontier_BattlePikeThreePathRoom: .4byte BattleFrontier_BattlePikeThreePathRoom_Layout .4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents .4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 351 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc index 225961050f..3c8e0fda8f 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018 +BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0 object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0 @@ -9,11 +9,11 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018 object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0 object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0 -BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0 +BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: warp_def 7, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 6, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 8, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: @ 853D108 +BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: map_events BattleFrontier_BattlePointExchangeServiceCorner_EventObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc index 831a39d2a5..c60cf97f26 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4 +BattleFrontier_BattlePointExchangeServiceCorner: .4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapEvents .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 398 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc index f9604d8d16..793434de3e 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C +BattleFrontier_BattlePyramidEmptySquare_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 0, 0, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 @@ -16,6 +16,6 @@ BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC +BattleFrontier_BattlePyramidEmptySquare_MapEvents:: map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc index ef5c8409f8..46b22aa7aa 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePyramidEmptySquare: @ 8485414 +BattleFrontier_BattlePyramidEmptySquare: .4byte BattleFrontier_BattlePyramidEmptySquare_Layout .4byte BattleFrontier_BattlePyramidEmptySquare_MapEvents .4byte BattleFrontier_BattlePyramidEmptySquare_MapScripts .4byte 0x0 .2byte 65535 - .2byte 361 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc index b70958fecd..81a4203b5a 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc @@ -1,16 +1,16 @@ -BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598 +BattleFrontier_BattlePyramidLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0 object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 2, 15, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0 object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0 -BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8 +BattleFrontier_BattlePyramidLobby_MapWarps: warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600 +BattleFrontier_BattlePyramidLobby_MapBGEvents: bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePyramidLobby_EventScript_250D42 bg_event 1, 12, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePyramidLobby_EventScript_250E95 -BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618 +BattleFrontier_BattlePyramidLobby_MapEvents:: map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index 91d454fbe4..f8e7408a02 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePyramidLobby: @ 84853F8 +BattleFrontier_BattlePyramidLobby: .4byte BattleFrontier_BattlePyramidLobby_Layout .4byte BattleFrontier_BattlePyramidLobby_MapEvents .4byte BattleFrontier_BattlePyramidLobby_MapScripts .4byte 0x0 .2byte MUS_PYRAMID - .2byte 360 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePyramidTop/events.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc index fbf4941ca2..9e1cd9f4f5 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/events.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0 +BattleFrontier_BattlePyramidTop_EventObjects: object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0 object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0 +BattleFrontier_BattlePyramidTop_MapCoordEvents: coord_event 17, 9, 4, VAR_TEMP_2, 0, BattleFrontier_BattlePyramidTop_EventScript_255256 -BattleFrontier_BattlePyramidTop_MapEvents:: @ 853C800 +BattleFrontier_BattlePyramidTop_MapEvents:: map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc index d58e1fe81e..e2e8ec59a6 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePyramidTop: @ 8485430 +BattleFrontier_BattlePyramidTop: .4byte BattleFrontier_BattlePyramidTop_Layout .4byte BattleFrontier_BattlePyramidTop_MapEvents .4byte BattleFrontier_BattlePyramidTop_MapScripts .4byte 0x0 .2byte 65535 - .2byte 378 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc index 148e590af6..4de7382b23 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc @@ -1,12 +1,12 @@ -BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0 +BattleFrontier_BattleTowerBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 -BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818 +BattleFrontier_BattleTowerBattleRoom_MapWarps: warp_def 5, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY warp_def 6, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY -BattleFrontier_BattleTowerBattleRoom_MapEvents:: @ 853B828 +BattleFrontier_BattleTowerBattleRoom_MapEvents:: map_events BattleFrontier_BattleTowerBattleRoom_EventObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc index 5aa95a63e8..5f8b03ace3 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerBattleRoom: @ 848521C +BattleFrontier_BattleTowerBattleRoom: .4byte BattleFrontier_BattleTowerBattleRoom_Layout .4byte BattleFrontier_BattleTowerBattleRoom_MapEvents .4byte BattleFrontier_BattleTowerBattleRoom_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 268 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc index f83bee69de..97dc0c8570 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4 +BattleFrontier_BattleTowerBattleRoom2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 @@ -6,6 +6,6 @@ BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4 object_event 5, EVENT_OBJ_GFX_VAR_F, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 object_event 6, EVENT_OBJ_GFX_VAR_E, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 -BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054 +BattleFrontier_BattleTowerBattleRoom2_MapEvents:: map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc index 34a8fae84e..464ed85666 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerBattleRoom2: @ 8485318 +BattleFrontier_BattleTowerBattleRoom2: .4byte BattleFrontier_BattleTowerBattleRoom_Layout .4byte BattleFrontier_BattleTowerBattleRoom2_MapEvents .4byte BattleFrontier_BattleTowerBattleRoom2_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 268 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc index ae3ca25754..80b239fbcd 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleTowerCorridor_EventObjects: @ 853B7A4 +BattleFrontier_BattleTowerCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 -BattleFrontier_BattleTowerCorridor_MapEvents:: @ 853B7BC +BattleFrontier_BattleTowerCorridor_MapEvents:: map_events BattleFrontier_BattleTowerCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc index 8d920a8c8b..7774e0f3bd 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerCorridor: @ 8485200 +BattleFrontier_BattleTowerCorridor: .4byte BattleFrontier_BattleTowerCorridor_Layout .4byte BattleFrontier_BattleTowerCorridor_MapEvents .4byte BattleFrontier_BattleTowerCorridor_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 267 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc index f96f149162..726c4b58aa 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc @@ -1,9 +1,9 @@ -BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50 +BattleFrontier_BattleTowerCorridor2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 object_event 4, EVENT_OBJ_GFX_VAR_E, 0, 14, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0 +BattleFrontier_BattleTowerCorridor2_MapEvents:: map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc index 66255315f4..9a8676f937 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerCorridor2: @ 84852FC +BattleFrontier_BattleTowerCorridor2: .4byte BattleFrontier_BattleTowerCorridor2_Layout .4byte BattleFrontier_BattleTowerCorridor2_MapEvents .4byte BattleFrontier_BattleTowerCorridor2_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 391 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerElevator/events.inc b/data/maps/BattleFrontier_BattleTowerElevator/events.inc index 671d6d4342..a33f30c9e0 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/events.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/events.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleTowerElevator_EventObjects: @ 853B778 +BattleFrontier_BattleTowerElevator_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 -BattleFrontier_BattleTowerElevator_MapEvents:: @ 853B790 +BattleFrontier_BattleTowerElevator_MapEvents:: map_events BattleFrontier_BattleTowerElevator_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc index f8d9ff8538..3267daa20d 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerElevator: @ 84851E4 +BattleFrontier_BattleTowerElevator: .4byte BattleElevator_Layout .4byte BattleFrontier_BattleTowerElevator_MapEvents .4byte BattleFrontier_BattleTowerElevator_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 266 + .2byte LAYOUT_BATTLE_ELEVATOR .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerLobby/events.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc index 6a78eaee69..ddf573eb2d 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/events.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638 +BattleFrontier_BattleTowerLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0 @@ -9,18 +9,18 @@ BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638 object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0 object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0 -BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710 +BattleFrontier_BattleTowerLobby_MapWarps: warp_def 12, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 13, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 6, 1, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM -BattleFrontier_BattleTowerLobby_MapBGEvents: @ 853B728 +BattleFrontier_BattleTowerLobby_MapBGEvents: bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFC7 bg_event 8, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFE0 bg_event 12, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFF9 bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23F012 bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleTowerLobby_EventScript_23F4BE -BattleFrontier_BattleTowerLobby_MapEvents:: @ 853B764 +BattleFrontier_BattleTowerLobby_MapEvents:: map_events BattleFrontier_BattleTowerLobby_EventObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc index 989bffe9b6..b1ca3914a0 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerLobby: @ 84851C8 +BattleFrontier_BattleTowerLobby: .4byte BattleFrontier_BattleTowerLobby_Layout .4byte BattleFrontier_BattleTowerLobby_MapEvents .4byte BattleFrontier_BattleTowerLobby_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 264 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc index 9f3977075e..d7dfcd3ad2 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64 +BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2 @@ -9,6 +9,6 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64 object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1 object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2 -BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C +BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc index 23a792934b..d8fc1abb69 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0 +BattleFrontier_BattleTowerMultiBattleRoom: .4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapEvents .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 390 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge1/events.inc b/data/maps/BattleFrontier_Lounge1/events.inc index 78ef441098..7fb5e62565 100644 --- a/data/maps/BattleFrontier_Lounge1/events.inc +++ b/data/maps/BattleFrontier_Lounge1/events.inc @@ -1,11 +1,11 @@ -BattleFrontier_Lounge1_EventObjects: @ 853CFB4 +BattleFrontier_Lounge1_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0 object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 7, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0 object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0 -BattleFrontier_Lounge1_MapWarps: @ 853CFFC +BattleFrontier_Lounge1_MapWarps: warp_def 4, 9, 0, 5, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_Lounge1_MapEvents:: @ 853D004 +BattleFrontier_Lounge1_MapEvents:: map_events BattleFrontier_Lounge1_EventObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc index 58caac9039..69119443dd 100644 --- a/data/maps/BattleFrontier_Lounge1/header.inc +++ b/data/maps/BattleFrontier_Lounge1/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge1: @ 84855B8 +BattleFrontier_Lounge1: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge1_MapEvents .4byte BattleFrontier_Lounge1_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge2/events.inc b/data/maps/BattleFrontier_Lounge2/events.inc index cc32ddf425..faa0a5608b 100644 --- a/data/maps/BattleFrontier_Lounge2/events.inc +++ b/data/maps/BattleFrontier_Lounge2/events.inc @@ -1,14 +1,14 @@ -BattleFrontier_Lounge2_EventObjects: @ 853D11C +BattleFrontier_Lounge2_EventObjects: object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0 object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0 object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 10, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0 object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 4, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0 object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 10, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0 -BattleFrontier_Lounge2_MapWarps: @ 853D194 +BattleFrontier_Lounge2_MapWarps: warp_def 1, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 2, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_Lounge2_MapEvents:: @ 853D1A4 +BattleFrontier_Lounge2_MapEvents:: map_events BattleFrontier_Lounge2_EventObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc index effcc53bda..a74f85ca41 100644 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ b/data/maps/BattleFrontier_Lounge2/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge2: @ 84855F0 +BattleFrontier_Lounge2: .4byte BattleFrontier_Lounge1_Layout .4byte BattleFrontier_Lounge2_MapEvents .4byte BattleFrontier_Lounge2_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 397 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE1 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge3/events.inc b/data/maps/BattleFrontier_Lounge3/events.inc index bce1dfa35f..f8a26e4ddc 100644 --- a/data/maps/BattleFrontier_Lounge3/events.inc +++ b/data/maps/BattleFrontier_Lounge3/events.inc @@ -1,13 +1,13 @@ -BattleFrontier_Lounge3_EventObjects: @ 853D1B8 +BattleFrontier_Lounge3_EventObjects: object_event 1, EVENT_OBJ_GFX_HIKER, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0 object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0 object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0 object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 0, 3, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0 -BattleFrontier_Lounge3_MapWarps: @ 853D230 +BattleFrontier_Lounge3_MapWarps: warp_def 4, 9, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_Lounge3_MapEvents:: @ 853D238 +BattleFrontier_Lounge3_MapEvents:: map_events BattleFrontier_Lounge3_EventObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc index d6867551e8..fb27b1580c 100644 --- a/data/maps/BattleFrontier_Lounge3/header.inc +++ b/data/maps/BattleFrontier_Lounge3/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge3: @ 848560C +BattleFrontier_Lounge3: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge3_MapEvents .4byte BattleFrontier_Lounge3_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge4/events.inc b/data/maps/BattleFrontier_Lounge4/events.inc index 8b86bebc7f..c2e2f44a26 100644 --- a/data/maps/BattleFrontier_Lounge4/events.inc +++ b/data/maps/BattleFrontier_Lounge4/events.inc @@ -1,11 +1,11 @@ -BattleFrontier_Lounge4_EventObjects: @ 853D24C +BattleFrontier_Lounge4_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0 object_event 2, EVENT_OBJ_GFX_COOK, 0, 6, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 2, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0 -BattleFrontier_Lounge4_MapWarps: @ 853D294 +BattleFrontier_Lounge4_MapWarps: warp_def 4, 9, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_Lounge4_MapEvents:: @ 853D29C +BattleFrontier_Lounge4_MapEvents:: map_events BattleFrontier_Lounge4_EventObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc index 912cc41ff6..edb6171e79 100644 --- a/data/maps/BattleFrontier_Lounge4/header.inc +++ b/data/maps/BattleFrontier_Lounge4/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge4: @ 8485628 +BattleFrontier_Lounge4: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge4_MapEvents .4byte BattleFrontier_Lounge4_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge5/events.inc b/data/maps/BattleFrontier_Lounge5/events.inc index 216a72473e..e0a2ea3447 100644 --- a/data/maps/BattleFrontier_Lounge5/events.inc +++ b/data/maps/BattleFrontier_Lounge5/events.inc @@ -1,13 +1,13 @@ -BattleFrontier_Lounge5_EventObjects: @ 853D2EC +BattleFrontier_Lounge5_EventObjects: object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 12, 4, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0 object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0 object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 11, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0 -BattleFrontier_Lounge5_MapWarps: @ 853D34C +BattleFrontier_Lounge5_MapWarps: warp_def 1, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 2, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_Lounge5_MapEvents:: @ 853D35C +BattleFrontier_Lounge5_MapEvents:: map_events BattleFrontier_Lounge5_EventObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc index a6febc0c86..9c9de0e3b9 100644 --- a/data/maps/BattleFrontier_Lounge5/header.inc +++ b/data/maps/BattleFrontier_Lounge5/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge5: @ 8485660 +BattleFrontier_Lounge5: .4byte BattleFrontier_Lounge1_Layout .4byte BattleFrontier_Lounge5_MapEvents .4byte BattleFrontier_Lounge5_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 397 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE1 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge6/events.inc b/data/maps/BattleFrontier_Lounge6/events.inc index 24d7958ec4..8c3950d61a 100644 --- a/data/maps/BattleFrontier_Lounge6/events.inc +++ b/data/maps/BattleFrontier_Lounge6/events.inc @@ -1,9 +1,9 @@ -BattleFrontier_Lounge6_EventObjects: @ 853D370 +BattleFrontier_Lounge6_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0 -BattleFrontier_Lounge6_MapWarps: @ 853D388 +BattleFrontier_Lounge6_MapWarps: warp_def 4, 9, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_Lounge6_MapEvents:: @ 853D390 +BattleFrontier_Lounge6_MapEvents:: map_events BattleFrontier_Lounge6_EventObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc index 151890a147..2b5f8474f3 100644 --- a/data/maps/BattleFrontier_Lounge6/header.inc +++ b/data/maps/BattleFrontier_Lounge6/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge6: @ 848567C +BattleFrontier_Lounge6: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge6_MapEvents .4byte BattleFrontier_Lounge6_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge7/events.inc b/data/maps/BattleFrontier_Lounge7/events.inc index de4aef12aa..bc7f289adc 100644 --- a/data/maps/BattleFrontier_Lounge7/events.inc +++ b/data/maps/BattleFrontier_Lounge7/events.inc @@ -1,12 +1,12 @@ -BattleFrontier_Lounge7_EventObjects: @ 853D3A4 +BattleFrontier_Lounge7_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_F, 0, 2, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0 object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 8, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0 -BattleFrontier_Lounge7_MapWarps: @ 853D404 +BattleFrontier_Lounge7_MapWarps: warp_def 4, 9, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_Lounge7_MapEvents:: @ 853D40C +BattleFrontier_Lounge7_MapEvents:: map_events BattleFrontier_Lounge7_EventObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc index 061d2102c8..58b9dc3e5b 100644 --- a/data/maps/BattleFrontier_Lounge7/header.inc +++ b/data/maps/BattleFrontier_Lounge7/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge7: @ 8485698 +BattleFrontier_Lounge7: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge7_MapEvents .4byte BattleFrontier_Lounge7_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge8/events.inc b/data/maps/BattleFrontier_Lounge8/events.inc index c8edc68aad..47e8e51f1d 100644 --- a/data/maps/BattleFrontier_Lounge8/events.inc +++ b/data/maps/BattleFrontier_Lounge8/events.inc @@ -1,11 +1,11 @@ -BattleFrontier_Lounge8_EventObjects: @ 853D4BC +BattleFrontier_Lounge8_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 4, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 8, 7, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0 -BattleFrontier_Lounge8_MapWarps: @ 853D504 +BattleFrontier_Lounge8_MapWarps: warp_def 4, 9, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_Lounge8_MapEvents:: @ 853D50C +BattleFrontier_Lounge8_MapEvents:: map_events BattleFrontier_Lounge8_EventObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc index e1b319e1d5..578219cc4f 100644 --- a/data/maps/BattleFrontier_Lounge8/header.inc +++ b/data/maps/BattleFrontier_Lounge8/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge8: @ 84856D0 +BattleFrontier_Lounge8: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge8_MapEvents .4byte BattleFrontier_Lounge8_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge9/events.inc b/data/maps/BattleFrontier_Lounge9/events.inc index 6598e0229e..ce86367cf8 100644 --- a/data/maps/BattleFrontier_Lounge9/events.inc +++ b/data/maps/BattleFrontier_Lounge9/events.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge9_EventObjects: @ 853D520 +BattleFrontier_Lounge9_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 6, 3, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_Lounge9_MapWarps: @ 853D538 +BattleFrontier_Lounge9_MapWarps: warp_def 1, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 2, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_Lounge9_MapEvents:: @ 853D548 +BattleFrontier_Lounge9_MapEvents:: map_events BattleFrontier_Lounge9_EventObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc index 916feb5699..32b1512efd 100644 --- a/data/maps/BattleFrontier_Lounge9/header.inc +++ b/data/maps/BattleFrontier_Lounge9/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge9: @ 84856EC +BattleFrontier_Lounge9: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge9_MapEvents .4byte BattleFrontier_Lounge9_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Mart/events.inc b/data/maps/BattleFrontier_Mart/events.inc index 9e57319f07..e637b489b5 100644 --- a/data/maps/BattleFrontier_Mart/events.inc +++ b/data/maps/BattleFrontier_Mart/events.inc @@ -1,13 +1,13 @@ -BattleFrontier_Mart_EventObjects: @ 853D68C +BattleFrontier_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0 object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0 object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0 object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0 -BattleFrontier_Mart_MapWarps: @ 853D6EC +BattleFrontier_Mart_MapWarps: warp_def 3, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 4, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_Mart_MapEvents:: @ 853D6FC +BattleFrontier_Mart_MapEvents:: map_events BattleFrontier_Mart_EventObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc index 7dcfb9d33e..97251160fd 100644 --- a/data/maps/BattleFrontier_Mart/header.inc +++ b/data/maps/BattleFrontier_Mart/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Mart: @ 8485740 +BattleFrontier_Mart: .4byte Mart_Layout .4byte BattleFrontier_Mart_MapEvents .4byte BattleFrontier_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_OutsideEast/connections.inc b/data/maps/BattleFrontier_OutsideEast/connections.inc index 5a2d13f7f4..e042da23e8 100644 --- a/data/maps/BattleFrontier_OutsideEast/connections.inc +++ b/data/maps/BattleFrontier_OutsideEast/connections.inc @@ -1,7 +1,7 @@ -BattleFrontier_OutsideEast_MapConnectionsList: @ 8486EE4 +BattleFrontier_OutsideEast_MapConnectionsList: connection left, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_OutsideEast_MapConnections: @ 8486EF0 - .4byte 0x1 +BattleFrontier_OutsideEast_MapConnections: + .4byte 1 .4byte BattleFrontier_OutsideEast_MapConnectionsList diff --git a/data/maps/BattleFrontier_OutsideEast/events.inc b/data/maps/BattleFrontier_OutsideEast/events.inc index a16bca779d..b5ee58e49a 100644 --- a/data/maps/BattleFrontier_OutsideEast/events.inc +++ b/data/maps/BattleFrontier_OutsideEast/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_OutsideEast_EventObjects: @ 853BB10 +BattleFrontier_OutsideEast_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 20, 17, 0, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 42, 15, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0 object_event 3, EVENT_OBJ_GFX_HIKER, 0, 53, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0 @@ -26,7 +26,7 @@ BattleFrontier_OutsideEast_EventObjects: @ 853BB10 object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 48, 41, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0 object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 29, 14, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0 -BattleFrontier_OutsideEast_MapWarps: @ 853BD80 +BattleFrontier_OutsideEast_MapWarps: warp_def 16, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY warp_def 39, 29, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY warp_def 45, 56, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY @@ -42,7 +42,7 @@ BattleFrontier_OutsideEast_MapWarps: @ 853BD80 warp_def 3, 51, 0, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F warp_def 28, 7, 0, 0, MAP_ARTISAN_CAVE_1F -BattleFrontier_OutsideEast_MapBGEvents: @ 853BDF0 +BattleFrontier_OutsideEast_MapBGEvents: bg_event 13, 17, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C43 bg_event 43, 56, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C4C bg_event 36, 34, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C55 @@ -52,6 +52,6 @@ BattleFrontier_OutsideEast_MapBGEvents: @ 853BDF0 bg_event 4, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_271E73 bg_event 5, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_271E73 -BattleFrontier_OutsideEast_MapEvents:: @ 853BE50 +BattleFrontier_OutsideEast_MapEvents:: map_events BattleFrontier_OutsideEast_EventObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc index b67df4029b..72e10d0dd9 100644 --- a/data/maps/BattleFrontier_OutsideEast/header.inc +++ b/data/maps/BattleFrontier_OutsideEast/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_OutsideEast: @ 84852C4 +BattleFrontier_OutsideEast: .4byte BattleFrontier_OutsideEast_Layout .4byte BattleFrontier_OutsideEast_MapEvents .4byte BattleFrontier_OutsideEast_MapScripts .4byte BattleFrontier_OutsideEast_MapConnections .2byte MUS_B_FRONTIER - .2byte 345 + .2byte LAYOUT_BATTLE_FRONTIER_OUTSIDE_EAST .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_OutsideWest/connections.inc b/data/maps/BattleFrontier_OutsideWest/connections.inc index 1d20172f2b..0755b3c44c 100644 --- a/data/maps/BattleFrontier_OutsideWest/connections.inc +++ b/data/maps/BattleFrontier_OutsideWest/connections.inc @@ -1,7 +1,7 @@ -BattleFrontier_OutsideWest_MapConnectionsList: @ 8486ED0 +BattleFrontier_OutsideWest_MapConnectionsList: connection right, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_OutsideWest_MapConnections: @ 8486EDC - .4byte 0x1 +BattleFrontier_OutsideWest_MapConnections: + .4byte 1 .4byte BattleFrontier_OutsideWest_MapConnectionsList diff --git a/data/maps/BattleFrontier_OutsideWest/events.inc b/data/maps/BattleFrontier_OutsideWest/events.inc index de372832f9..87c0db7aab 100644 --- a/data/maps/BattleFrontier_OutsideWest/events.inc +++ b/data/maps/BattleFrontier_OutsideWest/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_OutsideWest_EventObjects: @ 853B350 +BattleFrontier_OutsideWest_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 26, 38, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 20, 70, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 19, 68, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0 @@ -24,7 +24,7 @@ BattleFrontier_OutsideWest_EventObjects: @ 853B350 object_event 23, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0 object_event 24, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 26, 0, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0 -BattleFrontier_OutsideWest_MapWarps: @ 853B590 +BattleFrontier_OutsideWest_MapWarps: warp_def 42, 27, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY warp_def 19, 17, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY warp_def 11, 38, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY @@ -37,13 +37,13 @@ BattleFrontier_OutsideWest_MapWarps: @ 853B590 warp_def 26, 61, 0, 1, MAP_BATTLE_FRONTIER_RECEPTION_GATE warp_def 39, 55, 0, 0, MAP_ARTISAN_CAVE_B1F -BattleFrontier_OutsideWest_MapBGEvents: @ 853B5E8 +BattleFrontier_OutsideWest_MapBGEvents: bg_event 15, 18, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4E2 bg_event 45, 30, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4F4 bg_event 16, 43, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4EB bg_event 52, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_271E6A bg_event 53, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_271E6A -BattleFrontier_OutsideWest_MapEvents:: @ 853B624 +BattleFrontier_OutsideWest_MapEvents:: map_events BattleFrontier_OutsideWest_EventObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc index 312c1961ab..40f26c1518 100644 --- a/data/maps/BattleFrontier_OutsideWest/header.inc +++ b/data/maps/BattleFrontier_OutsideWest/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_OutsideWest: @ 84851AC +BattleFrontier_OutsideWest: .4byte BattleFrontier_OutsideWest_Layout .4byte BattleFrontier_OutsideWest_MapEvents .4byte BattleFrontier_OutsideWest_MapScripts .4byte BattleFrontier_OutsideWest_MapConnections .2byte MUS_B_FRONTIER - .2byte 265 + .2byte LAYOUT_BATTLE_FRONTIER_OUTSIDE_WEST .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc index 5f2782f0f4..20bad9c6da 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc @@ -1,15 +1,15 @@ -BattleFrontier_PokemonCenter_1F_EventObjects: @ 853D55C +BattleFrontier_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0 object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0 object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0 -BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4 +BattleFrontier_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 6, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 1, 6, 4, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F -BattleFrontier_PokemonCenter_1F_MapEvents:: @ 853D5EC +BattleFrontier_PokemonCenter_1F_MapEvents:: map_events BattleFrontier_PokemonCenter_1F_EventObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc index dcf26742c0..65445c2a17 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_PokemonCenter_1F: @ 8485708 +BattleFrontier_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte BattleFrontier_PokemonCenter_1F_MapEvents .4byte BattleFrontier_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc index 75bd2ebbbb..d2f3730e89 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600 +BattleFrontier_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660 +BattleFrontier_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -BattleFrontier_PokemonCenter_2F_MapEvents:: @ 853D678 +BattleFrontier_PokemonCenter_2F_MapEvents:: map_events BattleFrontier_PokemonCenter_2F_EventObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc index 6bcff1234b..fbd39cde9e 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_PokemonCenter_2F: @ 8485724 +BattleFrontier_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte BattleFrontier_PokemonCenter_2F_MapEvents .4byte BattleFrontier_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_RankingHall/events.inc b/data/maps/BattleFrontier_RankingHall/events.inc index abec40c178..30a0e5ebb3 100644 --- a/data/maps/BattleFrontier_RankingHall/events.inc +++ b/data/maps/BattleFrontier_RankingHall/events.inc @@ -1,13 +1,13 @@ -BattleFrontier_RankingHall_EventObjects: @ 853CEB8 +BattleFrontier_RankingHall_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0 object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 4, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0 object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 44, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0 -BattleFrontier_RankingHall_MapWarps: @ 853CF00 +BattleFrontier_RankingHall_MapWarps: warp_def 26, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 27, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_RankingHall_MapBGEvents: @ 853CF10 +BattleFrontier_RankingHall_MapBGEvents: bg_event 26, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4AA bg_event 23, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4B6 bg_event 26, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4C2 @@ -21,6 +21,6 @@ BattleFrontier_RankingHall_MapBGEvents: @ 853CF10 bg_event 16, 8, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_RankingHall_EventScript_25E538 bg_event 36, 8, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_RankingHall_EventScript_25E541 -BattleFrontier_RankingHall_MapEvents:: @ 853CFA0 +BattleFrontier_RankingHall_MapEvents:: map_events BattleFrontier_RankingHall_EventObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc index 03d9e36222..0f001d5637 100644 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ b/data/maps/BattleFrontier_RankingHall/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_RankingHall: @ 848559C +BattleFrontier_RankingHall: .4byte BattleFrontier_RankingHall_Layout .4byte BattleFrontier_RankingHall_MapEvents .4byte BattleFrontier_RankingHall_MapScripts .4byte 0x0 .2byte MUS_BIJYUTU - .2byte 396 + .2byte LAYOUT_BATTLE_FRONTIER_RANKING_HALL .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_ReceptionGate/events.inc b/data/maps/BattleFrontier_ReceptionGate/events.inc index 551cb802ff..c1e55ad870 100644 --- a/data/maps/BattleFrontier_ReceptionGate/events.inc +++ b/data/maps/BattleFrontier_ReceptionGate/events.inc @@ -1,14 +1,14 @@ -BattleFrontier_ReceptionGate_EventObjects: @ 853D420 +BattleFrontier_ReceptionGate_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0 object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0 object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0 -BattleFrontier_ReceptionGate_MapWarps: @ 853D498 +BattleFrontier_ReceptionGate_MapWarps: warp_def 4, 13, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 4, 1, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_ReceptionGate_MapEvents:: @ 853D4A8 +BattleFrontier_ReceptionGate_MapEvents:: map_events BattleFrontier_ReceptionGate_EventObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc index 099ab38e14..46a55a6b1c 100644 --- a/data/maps/BattleFrontier_ReceptionGate/header.inc +++ b/data/maps/BattleFrontier_ReceptionGate/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_ReceptionGate: @ 84856B4 +BattleFrontier_ReceptionGate: .4byte BattleFrontier_ReceptionGate_Layout .4byte BattleFrontier_ReceptionGate_MapEvents .4byte BattleFrontier_ReceptionGate_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 399 + .2byte LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_ScottsHouse/events.inc b/data/maps/BattleFrontier_ScottsHouse/events.inc index 3f4dcff869..acb02c4d8f 100644 --- a/data/maps/BattleFrontier_ScottsHouse/events.inc +++ b/data/maps/BattleFrontier_ScottsHouse/events.inc @@ -1,10 +1,10 @@ -BattleFrontier_ScottsHouse_EventObjects: @ 853D2B0 +BattleFrontier_ScottsHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0 -BattleFrontier_ScottsHouse_MapWarps: @ 853D2C8 +BattleFrontier_ScottsHouse_MapWarps: warp_def 2, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 3, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_ScottsHouse_MapEvents:: @ 853D2D8 +BattleFrontier_ScottsHouse_MapEvents:: map_events BattleFrontier_ScottsHouse_EventObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc index fe55f82726..ff41a82e33 100644 --- a/data/maps/BattleFrontier_ScottsHouse/header.inc +++ b/data/maps/BattleFrontier_ScottsHouse/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_ScottsHouse: @ 8485644 +BattleFrontier_ScottsHouse: .4byte BattleFrontier_ScottsHouse_Layout .4byte BattleFrontier_ScottsHouse_MapEvents .4byte BattleFrontier_ScottsHouse_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 430 + .2byte LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare01/events.inc b/data/maps/BattlePyramidSquare01/events.inc index cf5cfc1af5..bcc81b36cc 100644 --- a/data/maps/BattlePyramidSquare01/events.inc +++ b/data/maps/BattlePyramidSquare01/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare01_EventObjects: @ 853A460 +BattlePyramidSquare01_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 5, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare01_EventObjects: @ 853A460 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare01_MapEvents:: @ 853A508 +BattlePyramidSquare01_MapEvents:: map_events BattlePyramidSquare01_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc index d9105ed4aa..e63919e43e 100644 --- a/data/maps/BattlePyramidSquare01/header.inc +++ b/data/maps/BattlePyramidSquare01/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare01: @ 8484F60 +BattlePyramidSquare01: .4byte BattlePyramidSquare01_Layout .4byte BattlePyramidSquare01_MapEvents .4byte BattlePyramidSquare01_MapScripts .4byte 0x0 .2byte 65535 - .2byte 362 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE01 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare02/events.inc b/data/maps/BattlePyramidSquare02/events.inc index ad621d684e..978c559825 100644 --- a/data/maps/BattlePyramidSquare02/events.inc +++ b/data/maps/BattlePyramidSquare02/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare02_EventObjects: @ 853A51C +BattlePyramidSquare02_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare02_EventObjects: @ 853A51C object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare02_MapEvents:: @ 853A5C4 +BattlePyramidSquare02_MapEvents:: map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc index cebb14906e..61a1272cf4 100644 --- a/data/maps/BattlePyramidSquare02/header.inc +++ b/data/maps/BattlePyramidSquare02/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare02: @ 8484F7C +BattlePyramidSquare02: .4byte BattlePyramidSquare02_Layout .4byte BattlePyramidSquare02_MapEvents .4byte BattlePyramidSquare02_MapScripts .4byte 0x0 .2byte 65535 - .2byte 363 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE02 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare03/events.inc b/data/maps/BattlePyramidSquare03/events.inc index 8eb81b96ad..339010e8a3 100644 --- a/data/maps/BattlePyramidSquare03/events.inc +++ b/data/maps/BattlePyramidSquare03/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare03_EventObjects: @ 853A5D8 +BattlePyramidSquare03_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 6, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare03_EventObjects: @ 853A5D8 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare03_MapEvents:: @ 853A680 +BattlePyramidSquare03_MapEvents:: map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc index 389cd65387..ef7663ed0c 100644 --- a/data/maps/BattlePyramidSquare03/header.inc +++ b/data/maps/BattlePyramidSquare03/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare03: @ 8484F98 +BattlePyramidSquare03: .4byte BattlePyramidSquare03_Layout .4byte BattlePyramidSquare03_MapEvents .4byte BattlePyramidSquare03_MapScripts .4byte 0x0 .2byte 65535 - .2byte 364 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE03 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare04/events.inc b/data/maps/BattlePyramidSquare04/events.inc index 79caf09ff5..4c4cf7df10 100644 --- a/data/maps/BattlePyramidSquare04/events.inc +++ b/data/maps/BattlePyramidSquare04/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare04_EventObjects: @ 853A694 +BattlePyramidSquare04_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 7, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 1, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare04_EventObjects: @ 853A694 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare04_MapEvents:: @ 853A73C +BattlePyramidSquare04_MapEvents:: map_events BattlePyramidSquare04_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc index 3b09fce2e6..7525f2b047 100644 --- a/data/maps/BattlePyramidSquare04/header.inc +++ b/data/maps/BattlePyramidSquare04/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare04: @ 8484FB4 +BattlePyramidSquare04: .4byte BattlePyramidSquare04_Layout .4byte BattlePyramidSquare04_MapEvents .4byte BattlePyramidSquare04_MapScripts .4byte 0x0 .2byte 65535 - .2byte 365 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE04 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare05/events.inc b/data/maps/BattlePyramidSquare05/events.inc index 472178c56b..fe794509b2 100644 --- a/data/maps/BattlePyramidSquare05/events.inc +++ b/data/maps/BattlePyramidSquare05/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare05_EventObjects: @ 853A750 +BattlePyramidSquare05_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 3, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 3, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare05_EventObjects: @ 853A750 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare05_MapEvents:: @ 853A7F8 +BattlePyramidSquare05_MapEvents:: map_events BattlePyramidSquare05_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc index ec6eff68c6..673d29e253 100644 --- a/data/maps/BattlePyramidSquare05/header.inc +++ b/data/maps/BattlePyramidSquare05/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare05: @ 8484FD0 +BattlePyramidSquare05: .4byte BattlePyramidSquare05_Layout .4byte BattlePyramidSquare05_MapEvents .4byte BattlePyramidSquare05_MapScripts .4byte 0x0 .2byte 65535 - .2byte 366 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE05 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare06/events.inc b/data/maps/BattlePyramidSquare06/events.inc index 3363f6d43d..a7a1776e74 100644 --- a/data/maps/BattlePyramidSquare06/events.inc +++ b/data/maps/BattlePyramidSquare06/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare06_EventObjects: @ 853A80C +BattlePyramidSquare06_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 5, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 5, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare06_EventObjects: @ 853A80C object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare06_MapEvents:: @ 853A8B4 +BattlePyramidSquare06_MapEvents:: map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc index 7890c30886..2487c4a94b 100644 --- a/data/maps/BattlePyramidSquare06/header.inc +++ b/data/maps/BattlePyramidSquare06/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare06: @ 8484FEC +BattlePyramidSquare06: .4byte BattlePyramidSquare06_Layout .4byte BattlePyramidSquare06_MapEvents .4byte BattlePyramidSquare06_MapScripts .4byte 0x0 .2byte 65535 - .2byte 367 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE06 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare07/events.inc b/data/maps/BattlePyramidSquare07/events.inc index 8d63fc4e13..85e9876264 100644 --- a/data/maps/BattlePyramidSquare07/events.inc +++ b/data/maps/BattlePyramidSquare07/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare07_EventObjects: @ 853A8C8 +BattlePyramidSquare07_EventObjects: object_event 1, EVENT_OBJ_GFX_LITTLE_BOY, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 4, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare07_EventObjects: @ 853A8C8 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare07_MapEvents:: @ 853A970 +BattlePyramidSquare07_MapEvents:: map_events BattlePyramidSquare07_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc index 7f1bb51f1e..aa31ddcb0a 100644 --- a/data/maps/BattlePyramidSquare07/header.inc +++ b/data/maps/BattlePyramidSquare07/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare07: @ 8485008 +BattlePyramidSquare07: .4byte BattlePyramidSquare07_Layout .4byte BattlePyramidSquare07_MapEvents .4byte BattlePyramidSquare07_MapScripts .4byte 0x0 .2byte 65535 - .2byte 368 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE07 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare08/events.inc b/data/maps/BattlePyramidSquare08/events.inc index 77ed5da6bd..dac62da218 100644 --- a/data/maps/BattlePyramidSquare08/events.inc +++ b/data/maps/BattlePyramidSquare08/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare08_EventObjects: @ 853A984 +BattlePyramidSquare08_EventObjects: object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare08_EventObjects: @ 853A984 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare08_MapEvents:: @ 853AA2C +BattlePyramidSquare08_MapEvents:: map_events BattlePyramidSquare08_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc index a5d6415198..f579f958ba 100644 --- a/data/maps/BattlePyramidSquare08/header.inc +++ b/data/maps/BattlePyramidSquare08/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare08: @ 8485024 +BattlePyramidSquare08: .4byte BattlePyramidSquare08_Layout .4byte BattlePyramidSquare08_MapEvents .4byte BattlePyramidSquare08_MapScripts .4byte 0x0 .2byte 65535 - .2byte 369 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE08 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare09/events.inc b/data/maps/BattlePyramidSquare09/events.inc index 0fd84a8c54..17a4a1e383 100644 --- a/data/maps/BattlePyramidSquare09/events.inc +++ b/data/maps/BattlePyramidSquare09/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare09_EventObjects: @ 853AA40 +BattlePyramidSquare09_EventObjects: object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare09_EventObjects: @ 853AA40 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare09_MapEvents:: @ 853AAE8 +BattlePyramidSquare09_MapEvents:: map_events BattlePyramidSquare09_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc index d396c65a66..6dac1b9fe9 100644 --- a/data/maps/BattlePyramidSquare09/header.inc +++ b/data/maps/BattlePyramidSquare09/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare09: @ 8485040 +BattlePyramidSquare09: .4byte BattlePyramidSquare09_Layout .4byte BattlePyramidSquare09_MapEvents .4byte BattlePyramidSquare09_MapScripts .4byte 0x0 .2byte 65535 - .2byte 370 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE09 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare10/events.inc b/data/maps/BattlePyramidSquare10/events.inc index b697a7d026..f172155f9f 100644 --- a/data/maps/BattlePyramidSquare10/events.inc +++ b/data/maps/BattlePyramidSquare10/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare10_EventObjects: @ 853AAFC +BattlePyramidSquare10_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare10_EventObjects: @ 853AAFC object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare10_MapEvents:: @ 853ABA4 +BattlePyramidSquare10_MapEvents:: map_events BattlePyramidSquare10_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc index 254c24708d..ac899c718b 100644 --- a/data/maps/BattlePyramidSquare10/header.inc +++ b/data/maps/BattlePyramidSquare10/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare10: @ 848505C +BattlePyramidSquare10: .4byte BattlePyramidSquare10_Layout .4byte BattlePyramidSquare10_MapEvents .4byte BattlePyramidSquare10_MapScripts .4byte 0x0 .2byte 65535 - .2byte 371 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE10 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare11/events.inc b/data/maps/BattlePyramidSquare11/events.inc index e90e691e53..60c5e0e2de 100644 --- a/data/maps/BattlePyramidSquare11/events.inc +++ b/data/maps/BattlePyramidSquare11/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare11_EventObjects: @ 853ABB8 +BattlePyramidSquare11_EventObjects: object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 2, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 6, 4, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare11_EventObjects: @ 853ABB8 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare11_MapEvents:: @ 853AC60 +BattlePyramidSquare11_MapEvents:: map_events BattlePyramidSquare11_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc index 765b74a0ad..ca560a4a70 100644 --- a/data/maps/BattlePyramidSquare11/header.inc +++ b/data/maps/BattlePyramidSquare11/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare11: @ 8485078 +BattlePyramidSquare11: .4byte BattlePyramidSquare11_Layout .4byte BattlePyramidSquare11_MapEvents .4byte BattlePyramidSquare11_MapScripts .4byte 0x0 .2byte 65535 - .2byte 372 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE11 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare12/events.inc b/data/maps/BattlePyramidSquare12/events.inc index cad871e8d2..7c650b972c 100644 --- a/data/maps/BattlePyramidSquare12/events.inc +++ b/data/maps/BattlePyramidSquare12/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare12_EventObjects: @ 853AC74 +BattlePyramidSquare12_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 7, 5, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare12_EventObjects: @ 853AC74 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare12_MapEvents:: @ 853AD1C +BattlePyramidSquare12_MapEvents:: map_events BattlePyramidSquare12_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc index e81801a353..59793abe7e 100644 --- a/data/maps/BattlePyramidSquare12/header.inc +++ b/data/maps/BattlePyramidSquare12/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare12: @ 8485094 +BattlePyramidSquare12: .4byte BattlePyramidSquare12_Layout .4byte BattlePyramidSquare12_MapEvents .4byte BattlePyramidSquare12_MapScripts .4byte 0x0 .2byte 65535 - .2byte 373 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE12 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare13/events.inc b/data/maps/BattlePyramidSquare13/events.inc index af56598c3f..90d427f2dc 100644 --- a/data/maps/BattlePyramidSquare13/events.inc +++ b/data/maps/BattlePyramidSquare13/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare13_EventObjects: @ 853AD30 +BattlePyramidSquare13_EventObjects: object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare13_EventObjects: @ 853AD30 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare13_MapEvents:: @ 853ADD8 +BattlePyramidSquare13_MapEvents:: map_events BattlePyramidSquare13_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc index 356063c357..d0012926c5 100644 --- a/data/maps/BattlePyramidSquare13/header.inc +++ b/data/maps/BattlePyramidSquare13/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare13: @ 84850B0 +BattlePyramidSquare13: .4byte BattlePyramidSquare13_Layout .4byte BattlePyramidSquare13_MapEvents .4byte BattlePyramidSquare13_MapScripts .4byte 0x0 .2byte 65535 - .2byte 374 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE13 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare14/events.inc b/data/maps/BattlePyramidSquare14/events.inc index f2d28d456c..80f28a83ab 100644 --- a/data/maps/BattlePyramidSquare14/events.inc +++ b/data/maps/BattlePyramidSquare14/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare14_EventObjects: @ 853ADEC +BattlePyramidSquare14_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare14_EventObjects: @ 853ADEC object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare14_MapEvents:: @ 853AE94 +BattlePyramidSquare14_MapEvents:: map_events BattlePyramidSquare14_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc index 76ae3925cd..049d9ec94d 100644 --- a/data/maps/BattlePyramidSquare14/header.inc +++ b/data/maps/BattlePyramidSquare14/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare14: @ 84850CC +BattlePyramidSquare14: .4byte BattlePyramidSquare14_Layout .4byte BattlePyramidSquare14_MapEvents .4byte BattlePyramidSquare14_MapScripts .4byte 0x0 .2byte 65535 - .2byte 375 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE14 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare15/events.inc b/data/maps/BattlePyramidSquare15/events.inc index 2556030e3b..3781ec3dbf 100644 --- a/data/maps/BattlePyramidSquare15/events.inc +++ b/data/maps/BattlePyramidSquare15/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare15_EventObjects: @ 853AEA8 +BattlePyramidSquare15_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare15_EventObjects: @ 853AEA8 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare15_MapEvents:: @ 853AF50 +BattlePyramidSquare15_MapEvents:: map_events BattlePyramidSquare15_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc index 57e45e1b2b..980402c21b 100644 --- a/data/maps/BattlePyramidSquare15/header.inc +++ b/data/maps/BattlePyramidSquare15/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare15: @ 84850E8 +BattlePyramidSquare15: .4byte BattlePyramidSquare15_Layout .4byte BattlePyramidSquare15_MapEvents .4byte BattlePyramidSquare15_MapScripts .4byte 0x0 .2byte 65535 - .2byte 376 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE15 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare16/events.inc b/data/maps/BattlePyramidSquare16/events.inc index e08cb110ec..973d7c0ef1 100644 --- a/data/maps/BattlePyramidSquare16/events.inc +++ b/data/maps/BattlePyramidSquare16/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare16_EventObjects: @ 853AF64 +BattlePyramidSquare16_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 0, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare16_EventObjects: @ 853AF64 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare16_MapEvents:: @ 853B00C +BattlePyramidSquare16_MapEvents:: map_events BattlePyramidSquare16_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc index 24aa3edcc2..b51e9692c1 100644 --- a/data/maps/BattlePyramidSquare16/header.inc +++ b/data/maps/BattlePyramidSquare16/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare16: @ 8485104 +BattlePyramidSquare16: .4byte BattlePyramidSquare16_Layout .4byte BattlePyramidSquare16_MapEvents .4byte BattlePyramidSquare16_MapScripts .4byte 0x0 .2byte 65535 - .2byte 377 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE16 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BirthIsland_Exterior/events.inc b/data/maps/BirthIsland_Exterior/events.inc index c5a485f9a7..daf780f739 100644 --- a/data/maps/BirthIsland_Exterior/events.inc +++ b/data/maps/BirthIsland_Exterior/events.inc @@ -1,10 +1,10 @@ -BirthIsland_Exterior_EventObjects: @ 853D7DC +BirthIsland_Exterior_EventObjects: object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_DEOXYS -BirthIsland_Exterior_MapWarps: @ 853D80C +BirthIsland_Exterior_MapWarps: warp_def 15, 24, 0, 0, MAP_BIRTH_ISLAND_HARBOR -BirthIsland_Exterior_MapEvents:: @ 853D814 +BirthIsland_Exterior_MapEvents:: map_events BirthIsland_Exterior_EventObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc index c6b02f600b..71af6d880e 100644 --- a/data/maps/BirthIsland_Exterior/header.inc +++ b/data/maps/BirthIsland_Exterior/header.inc @@ -1,10 +1,10 @@ -BirthIsland_Exterior: @ 8485794 +BirthIsland_Exterior: .4byte BirthIsland_Exterior_Layout .4byte BirthIsland_Exterior_MapEvents .4byte BirthIsland_Exterior_MapScripts .4byte 0x0 .2byte 65535 - .2byte 404 + .2byte LAYOUT_BIRTH_ISLAND_EXTERIOR .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BirthIsland_Harbor/events.inc b/data/maps/BirthIsland_Harbor/events.inc index 8b8fe46607..1cbef28746 100644 --- a/data/maps/BirthIsland_Harbor/events.inc +++ b/data/maps/BirthIsland_Harbor/events.inc @@ -1,10 +1,10 @@ -BirthIsland_Harbor_EventObjects: @ 853D828 +BirthIsland_Harbor_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 -BirthIsland_Harbor_MapWarps: @ 853D858 +BirthIsland_Harbor_MapWarps: warp_def 8, 2, 0, 0, MAP_BIRTH_ISLAND_EXTERIOR -BirthIsland_Harbor_MapEvents:: @ 853D860 +BirthIsland_Harbor_MapEvents:: map_events BirthIsland_Harbor_EventObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc index 82b752f90f..e3b3d53b29 100644 --- a/data/maps/BirthIsland_Harbor/header.inc +++ b/data/maps/BirthIsland_Harbor/header.inc @@ -1,10 +1,10 @@ -BirthIsland_Harbor: @ 84857B0 +BirthIsland_Harbor: .4byte IslandHarbor_Layout .4byte BirthIsland_Harbor_MapEvents .4byte BirthIsland_Harbor_MapScripts .4byte 0x0 .2byte 65535 - .2byte 405 + .2byte LAYOUT_ISLAND_HARBOR .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/CaveOfOrigin_1F/events.inc b/data/maps/CaveOfOrigin_1F/events.inc index bdc6298463..098938279f 100644 --- a/data/maps/CaveOfOrigin_1F/events.inc +++ b/data/maps/CaveOfOrigin_1F/events.inc @@ -1,7 +1,7 @@ -CaveOfOrigin_1F_MapWarps: @ 8535D40 +CaveOfOrigin_1F_MapWarps: warp_def 11, 17, 3, 1, MAP_CAVE_OF_ORIGIN_ENTRANCE warp_def 14, 5, 3, 0, MAP_CAVE_OF_ORIGIN_B1F -CaveOfOrigin_1F_MapEvents:: @ 8535D50 +CaveOfOrigin_1F_MapEvents:: map_events 0x0, CaveOfOrigin_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index f051c230cd..df0e323d09 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -1,10 +1,10 @@ -CaveOfOrigin_1F: @ 84842E8 +CaveOfOrigin_1F: .4byte CaveOfOrigin_1F_Layout .4byte CaveOfOrigin_1F_MapEvents .4byte CaveOfOrigin_1F_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 158 + .2byte LAYOUT_CAVE_OF_ORIGIN_1F .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/CaveOfOrigin_B1F/events.inc b/data/maps/CaveOfOrigin_B1F/events.inc index 94f30d2623..0028301c95 100644 --- a/data/maps/CaveOfOrigin_B1F/events.inc +++ b/data/maps/CaveOfOrigin_B1F/events.inc @@ -1,9 +1,9 @@ -CaveOfOrigin_B1F_EventObjects: @ 8535DD0 +CaveOfOrigin_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE -CaveOfOrigin_B1F_MapWarps: @ 8535DE8 +CaveOfOrigin_B1F_MapWarps: warp_def 9, 3, 3, 1, MAP_CAVE_OF_ORIGIN_1F -CaveOfOrigin_B1F_MapEvents:: @ 8535DF0 +CaveOfOrigin_B1F_MapEvents:: map_events CaveOfOrigin_B1F_EventObjects, CaveOfOrigin_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index 7b70ba43f2..200c90bfdc 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -1,10 +1,10 @@ -CaveOfOrigin_B1F: @ 8484358 +CaveOfOrigin_B1F: .4byte CaveOfOrigin_B1F_Layout .4byte CaveOfOrigin_B1F_MapEvents .4byte CaveOfOrigin_B1F_MapScripts .4byte 0x0 .2byte 65535 - .2byte 162 + .2byte LAYOUT_CAVE_OF_ORIGIN_B1F .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/CaveOfOrigin_Entrance/events.inc b/data/maps/CaveOfOrigin_Entrance/events.inc index 5a5ad59f7c..235e4afa0f 100644 --- a/data/maps/CaveOfOrigin_Entrance/events.inc +++ b/data/maps/CaveOfOrigin_Entrance/events.inc @@ -1,7 +1,7 @@ -CaveOfOrigin_Entrance_MapWarps: @ 8535D1C +CaveOfOrigin_Entrance_MapWarps: warp_def 9, 20, 3, 3, MAP_SOOTOPOLIS_CITY warp_def 9, 5, 3, 0, MAP_CAVE_OF_ORIGIN_1F -CaveOfOrigin_Entrance_MapEvents:: @ 8535D2C +CaveOfOrigin_Entrance_MapEvents:: map_events 0x0, CaveOfOrigin_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index af622019a2..afbbd0312e 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -1,10 +1,10 @@ -CaveOfOrigin_Entrance: @ 84842CC +CaveOfOrigin_Entrance: .4byte CaveOfOrigin_Entrance_Layout .4byte CaveOfOrigin_Entrance_MapEvents .4byte CaveOfOrigin_Entrance_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 157 + .2byte LAYOUT_CAVE_OF_ORIGIN_ENTRANCE .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc index 049c263da7..eeb07e63af 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc @@ -1,7 +1,7 @@ -CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: @ 8535D64 +CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 -CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: @ 8535D74 +CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap1_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc index 6b928bb3cc..e0fea7bd5e 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc @@ -1,10 +1,10 @@ -CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304 +CaveOfOrigin_UnusedRubySapphireMap1: .4byte CaveOfOrigin_UnusedRubySapphireMap1_Layout .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 159 + .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte WEATHER_NONE diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc index 5af05a4712..1a8e841b78 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc @@ -1,7 +1,7 @@ -CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: @ 8535D88 +CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 -CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: @ 8535D98 +CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap2_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc index 0088131dc8..e8e7c0c793 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc @@ -1,10 +1,10 @@ -CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320 +CaveOfOrigin_UnusedRubySapphireMap2: .4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 160 + .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte WEATHER_FOG_1 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc index a17416bd31..e1cacec432 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc @@ -1,7 +1,7 @@ -CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: @ 8535DAC +CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B1F -CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: @ 8535DBC +CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap3_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc index 75bd4189ea..ec55cb0ffb 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc @@ -1,10 +1,10 @@ -CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C +CaveOfOrigin_UnusedRubySapphireMap3: .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 161 + .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte WEATHER_FOG_1 diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc index e7a815ce01..88dad2c289 100644 --- a/data/maps/DesertRuins/events.inc +++ b/data/maps/DesertRuins/events.inc @@ -1,16 +1,16 @@ -DesertRuins_EventObjects: @ 8534354 +DesertRuins_EventObjects: object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, FLAG_HIDE_REGIROCK -DesertRuins_MapWarps: @ 853436C +DesertRuins_MapWarps: warp_def 8, 29, 3, 1, MAP_ROUTE111 warp_def 8, 20, 0, 2, MAP_DESERT_RUINS warp_def 8, 11, 3, 1, MAP_DESERT_RUINS -DesertRuins_MapBGEvents: @ 8534384 +DesertRuins_MapBGEvents: bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9DB bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9F8 bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9F8 -DesertRuins_MapEvents:: @ 85343A8 +DesertRuins_MapEvents:: map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index c717661f4d..f0af5f2e05 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -1,10 +1,10 @@ -DesertRuins: @ 8483F68 +DesertRuins: .4byte DesertRuins_Layout .4byte DesertRuins_MapEvents .4byte DesertRuins_MapScripts .4byte 0x0 .2byte MUS_MABOROSI - .2byte 131 + .2byte LAYOUT_DESERT_RUINS .byte MAPSEC_DESERT_RUINS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DesertUnderpass/events.inc b/data/maps/DesertUnderpass/events.inc index aec461c34a..25497be276 100644 --- a/data/maps/DesertUnderpass/events.inc +++ b/data/maps/DesertUnderpass/events.inc @@ -1,9 +1,9 @@ -DesertUnderpass_EventObjects: @ 85376D4 +DesertUnderpass_EventObjects: object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, FLAG_HIDE_DESERT_UNDERPASS_FOSSIL -DesertUnderpass_MapWarps: @ 85376EC +DesertUnderpass_MapWarps: warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL -DesertUnderpass_MapEvents:: @ 85376F4 +DesertUnderpass_MapEvents:: map_events DesertUnderpass_EventObjects, DesertUnderpass_MapWarps, 0x0, 0x0 diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc index 757d81e73e..ca7ab5254a 100644 --- a/data/maps/DesertUnderpass/header.inc +++ b/data/maps/DesertUnderpass/header.inc @@ -1,10 +1,10 @@ -DesertUnderpass: @ 8484978 +DesertUnderpass: .4byte DesertUnderpass_Layout .4byte DesertUnderpass_MapEvents .4byte DesertUnderpass_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 389 + .2byte LAYOUT_DESERT_UNDERPASS .byte MAPSEC_DESERT_UNDERPASS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DewfordTown/connections.inc b/data/maps/DewfordTown/connections.inc index d030049226..294bf9956a 100644 --- a/data/maps/DewfordTown/connections.inc +++ b/data/maps/DewfordTown/connections.inc @@ -1,8 +1,8 @@ -DewfordTown_MapConnectionsList: @ 8486640 +DewfordTown_MapConnectionsList: connection up, -60, MAP_ROUTE106 connection right, 0, MAP_ROUTE107 -DewfordTown_MapConnections: @ 8486658 - .4byte 0x2 +DewfordTown_MapConnections: + .4byte 2 .4byte DewfordTown_MapConnectionsList diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc index 3d2d0af4a2..0b9036029f 100644 --- a/data/maps/DewfordTown/events.inc +++ b/data/maps/DewfordTown/events.inc @@ -1,24 +1,24 @@ -DewfordTown_EventObjects: @ 8527964 +DewfordTown_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0 object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0 -DewfordTown_MapWarps: @ 85279DC +DewfordTown_MapWarps: warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL warp_def 2, 10, 0, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F warp_def 8, 17, 0, 0, MAP_DEWFORD_TOWN_GYM warp_def 17, 14, 0, 0, MAP_DEWFORD_TOWN_HOUSE1 warp_def 8, 8, 0, 0, MAP_DEWFORD_TOWN_HOUSE2 -DewfordTown_MapBGEvents: @ 8527A04 +DewfordTown_MapBGEvents: bg_event 10, 10, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95BA bg_event 11, 16, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95C3 bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_271E73 bg_event 3, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_271E73 bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95CC -DewfordTown_MapEvents:: @ 8527A40 +DewfordTown_MapEvents:: map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index 9314f753fb..03c5b689b4 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -1,10 +1,10 @@ -DewfordTown: @ 84825EC +DewfordTown: .4byte DewfordTown_Layout .4byte DewfordTown_MapEvents .4byte DewfordTown_MapScripts .4byte DewfordTown_MapConnections .2byte MUS_HIGHTOWN - .2byte 12 + .2byte LAYOUT_DEWFORD_TOWN .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/DewfordTown_Gym/events.inc b/data/maps/DewfordTown_Gym/events.inc index a4c45c2cba..c3b718f194 100644 --- a/data/maps/DewfordTown_Gym/events.inc +++ b/data/maps/DewfordTown_Gym/events.inc @@ -1,4 +1,4 @@ -DewfordTown_Gym_EventObjects: @ 852DB34 +DewfordTown_Gym_EventObjects: object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 4, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0 object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 18, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0 @@ -8,16 +8,16 @@ DewfordTown_Gym_EventObjects: @ 852DB34 object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 16, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0 object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 14, 12, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0 -DewfordTown_Gym_MapWarps: @ 852DBF4 +DewfordTown_Gym_MapWarps: warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN -DewfordTown_Gym_MapBGEvents: @ 852DC04 +DewfordTown_Gym_MapBGEvents: bg_event 4, 23, 3, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9A2 bg_event 7, 23, 3, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9B2 bg_event 4, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9A2 bg_event 7, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9B2 -DewfordTown_Gym_MapEvents:: @ 852DC34 +DewfordTown_Gym_MapEvents:: map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index 783a7eacc6..72b93573b7 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -1,10 +1,10 @@ -DewfordTown_Gym: @ 8482C60 +DewfordTown_Gym: .4byte DewfordTown_Gym_Layout .4byte DewfordTown_Gym_MapEvents .4byte DewfordTown_Gym_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 65 + .2byte LAYOUT_DEWFORD_TOWN_GYM .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc index 4f1881f923..7fc332f90a 100644 --- a/data/maps/DewfordTown_Hall/events.inc +++ b/data/maps/DewfordTown_Hall/events.inc @@ -1,4 +1,4 @@ -DewfordTown_Hall_EventObjects: @ 852DC48 +DewfordTown_Hall_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0 object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0 @@ -9,14 +9,14 @@ DewfordTown_Hall_EventObjects: @ 852DC48 object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0 object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN -DewfordTown_Hall_MapWarps: @ 852DD20 +DewfordTown_Hall_MapWarps: warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN -DewfordTown_Hall_MapBGEvents: @ 852DD30 +DewfordTown_Hall_MapBGEvents: bg_event 0, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_1FD590 bg_event 7, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_1FD5A0 -DewfordTown_Hall_MapEvents:: @ 852DD48 +DewfordTown_Hall_MapEvents:: map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 600b027631..4fc39cf215 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -1,10 +1,10 @@ -DewfordTown_Hall: @ 8482C7C +DewfordTown_Hall: .4byte DewfordTown_Hall_Layout .4byte DewfordTown_Hall_MapEvents .4byte DewfordTown_Hall_MapScripts .4byte 0x0 .2byte MUS_HIGHTOWN - .2byte 66 + .2byte LAYOUT_DEWFORD_TOWN_HALL .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DewfordTown_House1/events.inc b/data/maps/DewfordTown_House1/events.inc index 53d72959cd..a9c8b0ae5f 100644 --- a/data/maps/DewfordTown_House1/events.inc +++ b/data/maps/DewfordTown_House1/events.inc @@ -1,12 +1,12 @@ -DewfordTown_House1_EventObjects: @ 852D9C8 +DewfordTown_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0 object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 1, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0 -DewfordTown_House1_MapWarps: @ 852DA10 +DewfordTown_House1_MapWarps: warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN warp_def 4, 7, 0, 3, MAP_DEWFORD_TOWN -DewfordTown_House1_MapEvents:: @ 852DA20 +DewfordTown_House1_MapEvents:: map_events DewfordTown_House1_EventObjects, DewfordTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index cfaaaa698f..9f4eec0325 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -1,10 +1,10 @@ -DewfordTown_House1: @ 8482C0C +DewfordTown_House1: .4byte House3_Layout .4byte DewfordTown_House1_MapEvents .4byte DewfordTown_House1_MapScripts .4byte 0x0 .2byte MUS_HIGHTOWN - .2byte 64 + .2byte LAYOUT_HOUSE3 .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DewfordTown_House2/events.inc b/data/maps/DewfordTown_House2/events.inc index 039ebac7c7..9f3801afac 100644 --- a/data/maps/DewfordTown_House2/events.inc +++ b/data/maps/DewfordTown_House2/events.inc @@ -1,11 +1,11 @@ -DewfordTown_House2_EventObjects: @ 852DD5C +DewfordTown_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0 object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0 -DewfordTown_House2_MapWarps: @ 852DD8C +DewfordTown_House2_MapWarps: warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN warp_def 4, 8, 0, 4, MAP_DEWFORD_TOWN -DewfordTown_House2_MapEvents:: @ 852DD9C +DewfordTown_House2_MapEvents:: map_events DewfordTown_House2_EventObjects, DewfordTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 2f9a36cf8f..ec8359b68d 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -1,10 +1,10 @@ -DewfordTown_House2: @ 8482C98 +DewfordTown_House2: .4byte House4_Layout .4byte DewfordTown_House2_MapEvents .4byte DewfordTown_House2_MapScripts .4byte 0x0 .2byte MUS_HIGHTOWN - .2byte 67 + .2byte LAYOUT_HOUSE4 .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DewfordTown_PokemonCenter_1F/events.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc index 830b6fd9b1..86c42ffab3 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/events.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/events.inc @@ -1,13 +1,13 @@ -DewfordTown_PokemonCenter_1F_EventObjects: @ 852DA34 +DewfordTown_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0 -DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C +DewfordTown_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN warp_def 6, 8, 3, 1, MAP_DEWFORD_TOWN warp_def 1, 6, 4, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_2F -DewfordTown_PokemonCenter_1F_MapEvents:: @ 852DA94 +DewfordTown_PokemonCenter_1F_MapEvents:: map_events DewfordTown_PokemonCenter_1F_EventObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index ae98bd680b..b6aa6f7917 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -DewfordTown_PokemonCenter_1F: @ 8482C28 +DewfordTown_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte DewfordTown_PokemonCenter_1F_MapEvents .4byte DewfordTown_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DewfordTown_PokemonCenter_2F/events.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc index 4f37111a57..eccedade46 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/events.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -DewfordTown_PokemonCenter_2F_EventObjects: @ 852DAA8 +DewfordTown_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08 +DewfordTown_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -DewfordTown_PokemonCenter_2F_MapEvents:: @ 852DB20 +DewfordTown_PokemonCenter_2F_MapEvents:: map_events DewfordTown_PokemonCenter_2F_EventObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index bb46a43d04..8bb0d81d70 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -DewfordTown_PokemonCenter_2F: @ 8482C44 +DewfordTown_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte DewfordTown_PokemonCenter_2F_MapEvents .4byte DewfordTown_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DoubleBattleColosseum/events.inc b/data/maps/DoubleBattleColosseum/events.inc index ffea67228a..4ea0b7f614 100644 --- a/data/maps/DoubleBattleColosseum/events.inc +++ b/data/maps/DoubleBattleColosseum/events.inc @@ -1,15 +1,15 @@ -DoubleBattleColosseum_MapWarps: @ 8539E88 +DoubleBattleColosseum_MapWarps: warp_def 5, 8, 3, 127, MAP_NONE warp_def 6, 8, 3, 127, MAP_NONE warp_def 7, 8, 3, 127, MAP_NONE warp_def 8, 8, 3, 127, MAP_NONE -DoubleBattleColosseum_MapCoordEvents: @ 8539EA8 +DoubleBattleColosseum_MapCoordEvents: coord_event 3, 4, 3, VAR_TEMP_0, 0, gUnknown_08277388 coord_event 3, 6, 3, VAR_TEMP_0, 0, gUnknown_082773BE coord_event 10, 4, 3, VAR_TEMP_0, 0, gUnknown_082773A3 coord_event 10, 6, 3, VAR_TEMP_0, 0, gUnknown_082773D9 -DoubleBattleColosseum_MapEvents:: @ 8539EE8 +DoubleBattleColosseum_MapEvents:: map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index 032ef58ab3..df679a9180 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -1,10 +1,10 @@ -DoubleBattleColosseum: @ 8484D84 +DoubleBattleColosseum: .4byte DoubleBattleColosseum_Layout .4byte DoubleBattleColosseum_MapEvents .4byte DoubleBattleColosseum_MapScripts .4byte 0x0 .2byte MUS_RAINBOW - .2byte 224 + .2byte LAYOUT_DOUBLE_BATTLE_COLOSSEUM .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity/connections.inc b/data/maps/EverGrandeCity/connections.inc index 830240b078..78c3ba8d1b 100644 --- a/data/maps/EverGrandeCity/connections.inc +++ b/data/maps/EverGrandeCity/connections.inc @@ -1,7 +1,7 @@ -EverGrandeCity_MapConnectionsList: @ 84867F8 +EverGrandeCity_MapConnectionsList: connection left, 40, MAP_ROUTE128 -EverGrandeCity_MapConnections: @ 8486804 - .4byte 0x1 +EverGrandeCity_MapConnections: + .4byte 1 .4byte EverGrandeCity_MapConnectionsList diff --git a/data/maps/EverGrandeCity/events.inc b/data/maps/EverGrandeCity/events.inc index e6bc7a10ad..9c0cd79efe 100644 --- a/data/maps/EverGrandeCity/events.inc +++ b/data/maps/EverGrandeCity/events.inc @@ -1,10 +1,10 @@ -EverGrandeCity_MapWarps: @ 8527588 +EverGrandeCity_MapWarps: warp_def 18, 5, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F warp_def 27, 48, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F warp_def 18, 41, 0, 0, MAP_VICTORY_ROAD_1F warp_def 18, 27, 0, 1, MAP_VICTORY_ROAD_1F -EverGrandeCity_MapCoordEvents: @ 85275A8 +EverGrandeCity_MapCoordEvents: coord_event 17, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 coord_event 16, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 coord_event 18, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 @@ -17,13 +17,13 @@ EverGrandeCity_MapCoordEvents: @ 85275A8 coord_event 25, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 coord_event 26, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 -EverGrandeCity_MapBGEvents: @ 8527658 +EverGrandeCity_MapBGEvents: bg_event 19, 43, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D2B bg_event 29, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_271E73 bg_event 18, 52, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D34 bg_event 23, 15, 0, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D3D bg_event 28, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_271E73 -EverGrandeCity_MapEvents:: @ 8527694 +EverGrandeCity_MapEvents:: map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index b1ee8e3a43..7350945788 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity: @ 8482598 +EverGrandeCity: .4byte EverGrandeCity_Layout .4byte EverGrandeCity_MapEvents .4byte EverGrandeCity_MapScripts .4byte EverGrandeCity_MapConnections .2byte MUS_RAINBOW - .2byte 9 + .2byte LAYOUT_EVER_GRANDE_CITY .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/EverGrandeCity_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc index 9ce5831ba9..846e7f60eb 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/events.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc @@ -1,12 +1,12 @@ -EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700 +EverGrandeCity_ChampionsRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_RIVAL object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_BIRCH -EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748 +EverGrandeCity_ChampionsRoom_MapWarps: warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_HALL4 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME -EverGrandeCity_ChampionsRoom_MapEvents:: @ 8533758 +EverGrandeCity_ChampionsRoom_MapEvents:: map_events EverGrandeCity_ChampionsRoom_EventObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index bd2ab305f3..0b73346855 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_ChampionsRoom: @ 8483C3C +EverGrandeCity_ChampionsRoom: .4byte EverGrandeCity_ChampionsRoom_Layout .4byte EverGrandeCity_ChampionsRoom_MapEvents .4byte EverGrandeCity_ChampionsRoom_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 115 + .2byte LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_DrakesRoom/events.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc index 4f61f50ea2..997df50453 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/events.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/events.inc @@ -1,10 +1,10 @@ -EverGrandeCity_DrakesRoom_EventObjects: @ 85336C4 +EverGrandeCity_DrakesRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0 -EverGrandeCity_DrakesRoom_MapWarps: @ 85336DC +EverGrandeCity_DrakesRoom_MapWarps: warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL3 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL4 -EverGrandeCity_DrakesRoom_MapEvents:: @ 85336EC +EverGrandeCity_DrakesRoom_MapEvents:: map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index da5c8fa476..3c5b52b213 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_DrakesRoom: @ 8483C20 +EverGrandeCity_DrakesRoom: .4byte EverGrandeCity_DrakesRoom_Layout .4byte EverGrandeCity_DrakesRoom_MapEvents .4byte EverGrandeCity_DrakesRoom_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 114 + .2byte LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_GlaciasRoom/events.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc index 63dfbc0df2..abe7b85647 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/events.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/events.inc @@ -1,10 +1,10 @@ -EverGrandeCity_GlaciasRoom_EventObjects: @ 8533688 +EverGrandeCity_GlaciasRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0 -EverGrandeCity_GlaciasRoom_MapWarps: @ 85336A0 +EverGrandeCity_GlaciasRoom_MapWarps: warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL2 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL3 -EverGrandeCity_GlaciasRoom_MapEvents:: @ 85336B0 +EverGrandeCity_GlaciasRoom_MapEvents:: map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index 0773a613ec..f330a321fc 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_GlaciasRoom: @ 8483C04 +EverGrandeCity_GlaciasRoom: .4byte EverGrandeCity_GlaciasRoom_Layout .4byte EverGrandeCity_GlaciasRoom_MapEvents .4byte EverGrandeCity_GlaciasRoom_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 113 + .2byte LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_Hall1/events.inc b/data/maps/EverGrandeCity_Hall1/events.inc index 3351b42e04..fd3a5584d2 100644 --- a/data/maps/EverGrandeCity_Hall1/events.inc +++ b/data/maps/EverGrandeCity_Hall1/events.inc @@ -1,9 +1,9 @@ -EverGrandeCity_Hall1_MapWarps: @ 853376C +EverGrandeCity_Hall1_MapWarps: warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM -EverGrandeCity_Hall1_MapEvents:: @ 853378C +EverGrandeCity_Hall1_MapEvents:: map_events 0x0, EverGrandeCity_Hall1_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc index d554ff768b..1e2f0f8ebd 100644 --- a/data/maps/EverGrandeCity_Hall1/header.inc +++ b/data/maps/EverGrandeCity_Hall1/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_Hall1: @ 8483C58 +EverGrandeCity_Hall1: .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall1_MapEvents .4byte EverGrandeCity_Hall1_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 116 + .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_Hall2/events.inc b/data/maps/EverGrandeCity_Hall2/events.inc index e3eacab10f..e9b8ab0561 100644 --- a/data/maps/EverGrandeCity_Hall2/events.inc +++ b/data/maps/EverGrandeCity_Hall2/events.inc @@ -1,9 +1,9 @@ -EverGrandeCity_Hall2_MapWarps: @ 85337A0 +EverGrandeCity_Hall2_MapWarps: warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM -EverGrandeCity_Hall2_MapEvents:: @ 85337C0 +EverGrandeCity_Hall2_MapEvents:: map_events 0x0, EverGrandeCity_Hall2_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc index 646478a25d..2422915425 100644 --- a/data/maps/EverGrandeCity_Hall2/header.inc +++ b/data/maps/EverGrandeCity_Hall2/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_Hall2: @ 8483C74 +EverGrandeCity_Hall2: .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall2_MapEvents .4byte EverGrandeCity_Hall2_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 116 + .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_Hall3/events.inc b/data/maps/EverGrandeCity_Hall3/events.inc index e44182b4fc..3e792fd1b1 100644 --- a/data/maps/EverGrandeCity_Hall3/events.inc +++ b/data/maps/EverGrandeCity_Hall3/events.inc @@ -1,9 +1,9 @@ -EverGrandeCity_Hall3_MapWarps: @ 85337D4 +EverGrandeCity_Hall3_MapWarps: warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_DRAKES_ROOM warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM -EverGrandeCity_Hall3_MapEvents:: @ 85337F4 +EverGrandeCity_Hall3_MapEvents:: map_events 0x0, EverGrandeCity_Hall3_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc index d7beaf36e4..fd06433450 100644 --- a/data/maps/EverGrandeCity_Hall3/header.inc +++ b/data/maps/EverGrandeCity_Hall3/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_Hall3: @ 8483C90 +EverGrandeCity_Hall3: .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall3_MapEvents .4byte EverGrandeCity_Hall3_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 116 + .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_Hall4/events.inc b/data/maps/EverGrandeCity_Hall4/events.inc index b2d0112349..3f40698962 100644 --- a/data/maps/EverGrandeCity_Hall4/events.inc +++ b/data/maps/EverGrandeCity_Hall4/events.inc @@ -1,7 +1,7 @@ -EverGrandeCity_Hall4_MapWarps: @ 8533808 +EverGrandeCity_Hall4_MapWarps: warp_def 5, 33, 3, 1, MAP_EVER_GRANDE_CITY_DRAKES_ROOM warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM -EverGrandeCity_Hall4_MapEvents:: @ 8533818 +EverGrandeCity_Hall4_MapEvents:: map_events 0x0, EverGrandeCity_Hall4_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc index 8cf1eea6e9..b2a199823c 100644 --- a/data/maps/EverGrandeCity_Hall4/header.inc +++ b/data/maps/EverGrandeCity_Hall4/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_Hall4: @ 8483CAC +EverGrandeCity_Hall4: .4byte EverGrandeCity_Hall4_Layout .4byte EverGrandeCity_Hall4_MapEvents .4byte EverGrandeCity_Hall4_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 315 + .2byte LAYOUT_EVER_GRANDE_CITY_HALL4 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_Hall5/events.inc b/data/maps/EverGrandeCity_Hall5/events.inc index 687920b71b..655f4645e5 100644 --- a/data/maps/EverGrandeCity_Hall5/events.inc +++ b/data/maps/EverGrandeCity_Hall5/events.inc @@ -1,9 +1,9 @@ -EverGrandeCity_Hall5_MapWarps: @ 853382C +EverGrandeCity_Hall5_MapWarps: warp_def 5, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM warp_def 4, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F warp_def 6, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F -EverGrandeCity_Hall5_MapEvents:: @ 853384C +EverGrandeCity_Hall5_MapEvents:: map_events 0x0, EverGrandeCity_Hall5_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc index 38279720eb..f15639e5bf 100644 --- a/data/maps/EverGrandeCity_Hall5/header.inc +++ b/data/maps/EverGrandeCity_Hall5/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_Hall5: @ 8483CC8 +EverGrandeCity_Hall5: .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall5_MapEvents .4byte EverGrandeCity_Hall5_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 116 + .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_HallOfFame/events.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc index ad5f088c5a..7d91984377 100644 --- a/data/maps/EverGrandeCity_HallOfFame/events.inc +++ b/data/maps/EverGrandeCity_HallOfFame/events.inc @@ -1,9 +1,9 @@ -EverGrandeCity_HallOfFame_EventObjects: @ 85338FC +EverGrandeCity_HallOfFame_EventObjects: object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 -EverGrandeCity_HallOfFame_MapWarps: @ 8533914 +EverGrandeCity_HallOfFame_MapWarps: warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM -EverGrandeCity_HallOfFame_MapEvents:: @ 853391C +EverGrandeCity_HallOfFame_MapEvents:: map_events EverGrandeCity_HallOfFame_EventObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index 865f90b91a..7879c19bf6 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_HallOfFame: @ 8483D00 +EverGrandeCity_HallOfFame: .4byte EverGrandeCity_HallOfFame_Layout .4byte EverGrandeCity_HallOfFame_MapEvents .4byte EverGrandeCity_HallOfFame_MapScripts .4byte 0x0 .2byte MUS_EIKOU_R - .2byte 298 + .2byte LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_PhoebesRoom/events.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc index abaa816224..d6ad89bea4 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/events.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/events.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PhoebesRoom_EventObjects: @ 853364C +EverGrandeCity_PhoebesRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0 -EverGrandeCity_PhoebesRoom_MapWarps: @ 8533664 +EverGrandeCity_PhoebesRoom_MapWarps: warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL1 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL2 -EverGrandeCity_PhoebesRoom_MapEvents:: @ 8533674 +EverGrandeCity_PhoebesRoom_MapEvents:: map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index eb0d77d7bd..7869d60071 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PhoebesRoom: @ 8483BE8 +EverGrandeCity_PhoebesRoom: .4byte EverGrandeCity_PhoebesRoom_Layout .4byte EverGrandeCity_PhoebesRoom_MapEvents .4byte EverGrandeCity_PhoebesRoom_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 112 + .2byte LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc index 23e555622e..a879c3bf6c 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -EverGrandeCity_PokemonCenter_1F_EventObjects: @ 8533930 +EverGrandeCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0 object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT -EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990 +EverGrandeCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY warp_def 6, 8, 3, 1, MAP_EVER_GRANDE_CITY warp_def 1, 6, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F -EverGrandeCity_PokemonCenter_1F_MapEvents:: @ 85339A8 +EverGrandeCity_PokemonCenter_1F_MapEvents:: map_events EverGrandeCity_PokemonCenter_1F_EventObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index 2923564720..060c11d0b9 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PokemonCenter_1F: @ 8483D1C +EverGrandeCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte EverGrandeCity_PokemonCenter_1F_MapEvents .4byte EverGrandeCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc index 8553361469..5507659225 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -EverGrandeCity_PokemonCenter_2F_EventObjects: @ 85339BC +EverGrandeCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C +EverGrandeCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 8533A34 +EverGrandeCity_PokemonCenter_2F_MapEvents:: map_events EverGrandeCity_PokemonCenter_2F_EventObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index ec9f3e5425..ae70ad359d 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PokemonCenter_2F: @ 8483D38 +EverGrandeCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte EverGrandeCity_PokemonCenter_2F_MapEvents .4byte EverGrandeCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc index dcda8722c5..524540d9d9 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc @@ -1,16 +1,16 @@ -EverGrandeCity_PokemonLeague_1F_EventObjects: @ 8533860 +EverGrandeCity_PokemonLeague_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0 object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 -EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0 +EverGrandeCity_PokemonLeague_1F_MapWarps: warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY warp_def 10, 11, 3, 0, MAP_EVER_GRANDE_CITY warp_def 9, 1, 3, 0, MAP_EVER_GRANDE_CITY_HALL5 warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_HALL5 warp_def 1, 7, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F -EverGrandeCity_PokemonLeague_1F_MapEvents:: @ 85338E8 +EverGrandeCity_PokemonLeague_1F_MapEvents:: map_events EverGrandeCity_PokemonLeague_1F_EventObjects, EverGrandeCity_PokemonLeague_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc index 90a42edea2..497d81582c 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PokemonLeague_1F: @ 8483CE4 +EverGrandeCity_PokemonLeague_1F: .4byte EverGrandeCity_PokemonLeague_1F_Layout .4byte EverGrandeCity_PokemonLeague_1F_MapEvents .4byte EverGrandeCity_PokemonLeague_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 270 + .2byte LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc index b6497d8244..2f26346c81 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc @@ -1,14 +1,14 @@ -EverGrandeCity_PokemonLeague_2F_EventObjects: @ 8533A48 +EverGrandeCity_PokemonLeague_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8 +EverGrandeCity_PokemonLeague_2F_MapWarps: warp_def 1, 6, 4, 4, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -EverGrandeCity_PokemonLeague_2F_MapEvents:: @ 8533AC0 +EverGrandeCity_PokemonLeague_2F_MapEvents:: map_events EverGrandeCity_PokemonLeague_2F_EventObjects, EverGrandeCity_PokemonLeague_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc index 4d9ee7f460..c03c85120f 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PokemonLeague_2F: @ 8483D54 +EverGrandeCity_PokemonLeague_2F: .4byte PokemonCenter_2F_Layout .4byte EverGrandeCity_PokemonLeague_2F_MapEvents .4byte EverGrandeCity_PokemonLeague_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_SidneysRoom/events.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc index a1446aef82..ca7f7278dd 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/events.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/events.inc @@ -1,10 +1,10 @@ -EverGrandeCity_SidneysRoom_EventObjects: @ 8533610 +EverGrandeCity_SidneysRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0 -EverGrandeCity_SidneysRoom_MapWarps: @ 8533628 +EverGrandeCity_SidneysRoom_MapWarps: warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL5 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL1 -EverGrandeCity_SidneysRoom_MapEvents:: @ 8533638 +EverGrandeCity_SidneysRoom_MapEvents:: map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index b19db5fbb2..e7d7f08129 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_SidneysRoom: @ 8483BCC +EverGrandeCity_SidneysRoom: .4byte EverGrandeCity_SidneysRoom_Layout .4byte EverGrandeCity_SidneysRoom_MapEvents .4byte EverGrandeCity_SidneysRoom_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 111 + .2byte LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown/connections.inc b/data/maps/FallarborTown/connections.inc index 3808099d88..d5955c9e6a 100644 --- a/data/maps/FallarborTown/connections.inc +++ b/data/maps/FallarborTown/connections.inc @@ -1,8 +1,8 @@ -FallarborTown_MapConnectionsList: @ 8486674 +FallarborTown_MapConnectionsList: connection left, 0, MAP_ROUTE114 connection right, 0, MAP_ROUTE113 -FallarborTown_MapConnections: @ 848668C - .4byte 0x2 +FallarborTown_MapConnections: + .4byte 2 .4byte FallarborTown_MapConnectionsList diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc index 9b2f0a2de2..b3c451595f 100644 --- a/data/maps/FallarborTown/events.inc +++ b/data/maps/FallarborTown/events.inc @@ -1,17 +1,17 @@ -FallarborTown_EventObjects: @ 8527BE0 +FallarborTown_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0 object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0 object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, FLAG_HIDE_FALLARBOR_AZURILL -FallarborTown_MapWarps: @ 8527C40 +FallarborTown_MapWarps: warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY warp_def 14, 7, 0, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F warp_def 6, 17, 0, 0, MAP_FALLARBOR_TOWN_HOUSE1 warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2 -FallarborTown_MapBGEvents: @ 8527C68 +FallarborTown_MapBGEvents: bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73 bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB250 @@ -21,6 +21,6 @@ FallarborTown_MapBGEvents: @ 8527C68 bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB262 bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET -FallarborTown_MapEvents:: @ 8527CC8 +FallarborTown_MapEvents:: map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index f32f0c30b5..2e74cee388 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -1,10 +1,10 @@ -FallarborTown: @ 8482624 +FallarborTown: .4byte FallarborTown_Layout .4byte FallarborTown_MapEvents .4byte FallarborTown_MapScripts .4byte FallarborTown_MapConnections .2byte MUS_TONEKUSA - .2byte 14 + .2byte LAYOUT_FALLARBOR_TOWN .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc index 681f5b0285..d452752d7e 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc @@ -1,8 +1,8 @@ -FallarborTown_BattleTentBattleRoom_EventObjects: @ 852E444 +FallarborTown_BattleTentBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -FallarborTown_BattleTentBattleRoom_MapEvents:: @ 852E48C +FallarborTown_BattleTentBattleRoom_MapEvents:: map_events FallarborTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc index 3435512f25..615c0ed266 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc @@ -1,10 +1,10 @@ -FallarborTown_BattleTentBattleRoom: @ 8482DCC +FallarborTown_BattleTentBattleRoom: .4byte BattleTentBattleRoom_Layout .4byte FallarborTown_BattleTentBattleRoom_MapEvents .4byte FallarborTown_BattleTentBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 386 + .2byte LAYOUT_BATTLE_TENT_BATTLE_ROOM .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_BattleTentCorridor/events.inc b/data/maps/FallarborTown_BattleTentCorridor/events.inc index 4af82f3530..18c0dfb397 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/events.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/events.inc @@ -1,6 +1,6 @@ -FallarborTown_BattleTentCorridor_EventObjects: @ 852E418 +FallarborTown_BattleTentCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -FallarborTown_BattleTentCorridor_MapEvents:: @ 852E430 +FallarborTown_BattleTentCorridor_MapEvents:: map_events FallarborTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc index 4b45ea55dd..fd64a32662 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/header.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc @@ -1,10 +1,10 @@ -FallarborTown_BattleTentCorridor: @ 8482DB0 +FallarborTown_BattleTentCorridor: .4byte BattleTentCorridor_Layout .4byte FallarborTown_BattleTentCorridor_MapEvents .4byte FallarborTown_BattleTentCorridor_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 385 + .2byte LAYOUT_BATTLE_TENT_CORRIDOR .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_BattleTentLobby/events.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc index 6a9741c50a..2a9b758ca8 100644 --- a/data/maps/FallarborTown_BattleTentLobby/events.inc +++ b/data/maps/FallarborTown_BattleTentLobby/events.inc @@ -1,17 +1,17 @@ -FallarborTown_BattleTentLobby_EventObjects: @ 852E370 +FallarborTown_BattleTentLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0 object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0 object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 12, 6, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0 object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0 object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT -FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8 +FallarborTown_BattleTentLobby_MapWarps: warp_def 6, 9, 0, 1, MAP_FALLARBOR_TOWN warp_def 7, 9, 0, 1, MAP_FALLARBOR_TOWN -FallarborTown_BattleTentLobby_MapBGEvents: @ 852E3F8 +FallarborTown_BattleTentLobby_MapBGEvents: bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_BattleTentLobby_EventScript_20024F -FallarborTown_BattleTentLobby_MapEvents:: @ 852E404 +FallarborTown_BattleTentLobby_MapEvents:: map_events FallarborTown_BattleTentLobby_EventObjects, FallarborTown_BattleTentLobby_MapWarps, 0x0, FallarborTown_BattleTentLobby_MapBGEvents diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc index 2465f36c8b..4bdba3d514 100644 --- a/data/maps/FallarborTown_BattleTentLobby/header.inc +++ b/data/maps/FallarborTown_BattleTentLobby/header.inc @@ -1,10 +1,10 @@ -FallarborTown_BattleTentLobby: @ 8482D94 +FallarborTown_BattleTentLobby: .4byte BattleTentLobby_Layout .4byte FallarborTown_BattleTentLobby_MapEvents .4byte FallarborTown_BattleTentLobby_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 384 + .2byte LAYOUT_BATTLE_TENT_LOBBY .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_House1/events.inc b/data/maps/FallarborTown_House1/events.inc index da261afb42..9db77af03f 100644 --- a/data/maps/FallarborTown_House1/events.inc +++ b/data/maps/FallarborTown_House1/events.inc @@ -1,11 +1,11 @@ -FallarborTown_House1_EventObjects: @ 852E5B8 +FallarborTown_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0 -FallarborTown_House1_MapWarps: @ 852E5E8 +FallarborTown_House1_MapWarps: warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN warp_def 4, 8, 0, 3, MAP_FALLARBOR_TOWN -FallarborTown_House1_MapEvents:: @ 852E5F8 +FallarborTown_House1_MapEvents:: map_events FallarborTown_House1_EventObjects, FallarborTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index d5362b8c5c..a17a5e0aba 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -1,10 +1,10 @@ -FallarborTown_House1: @ 8482E20 +FallarborTown_House1: .4byte House1_Layout .4byte FallarborTown_House1_MapEvents .4byte FallarborTown_House1_MapScripts .4byte 0x0 .2byte MUS_TONEKUSA - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_House2/events.inc b/data/maps/FallarborTown_House2/events.inc index 1b4e1c96e6..117322b020 100644 --- a/data/maps/FallarborTown_House2/events.inc +++ b/data/maps/FallarborTown_House2/events.inc @@ -1,10 +1,10 @@ -FallarborTown_House2_EventObjects: @ 852E60C +FallarborTown_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0 -FallarborTown_House2_MapWarps: @ 852E624 +FallarborTown_House2_MapWarps: warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN warp_def 4, 7, 0, 4, MAP_FALLARBOR_TOWN -FallarborTown_House2_MapEvents:: @ 852E634 +FallarborTown_House2_MapEvents:: map_events FallarborTown_House2_EventObjects, FallarborTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index 7cb16bbf36..bdbf10fed6 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -1,10 +1,10 @@ -FallarborTown_House2: @ 8482E3C +FallarborTown_House2: .4byte House2_Layout .4byte FallarborTown_House2_MapEvents .4byte FallarborTown_House2_MapScripts .4byte 0x0 .2byte MUS_TONEKUSA - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_Mart/events.inc b/data/maps/FallarborTown_Mart/events.inc index 41bc31894e..b4870cf571 100644 --- a/data/maps/FallarborTown_Mart/events.inc +++ b/data/maps/FallarborTown_Mart/events.inc @@ -1,14 +1,14 @@ -FallarborTown_Mart_EventObjects: @ 852E2D4 +FallarborTown_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0 object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0 object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0 -FallarborTown_Mart_MapWarps: @ 852E34C +FallarborTown_Mart_MapWarps: warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN warp_def 4, 7, 0, 0, MAP_FALLARBOR_TOWN -FallarborTown_Mart_MapEvents:: @ 852E35C +FallarborTown_Mart_MapEvents:: map_events FallarborTown_Mart_EventObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index 65c5caaa60..be4e4ae9ed 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -1,10 +1,10 @@ -FallarborTown_Mart: @ 8482D78 +FallarborTown_Mart: .4byte Mart_Layout .4byte FallarborTown_Mart_MapEvents .4byte FallarborTown_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc index cb6243c6f2..f091ffce1e 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/events.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0 +FallarborTown_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE -FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500 +FallarborTown_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN warp_def 6, 8, 3, 2, MAP_FALLARBOR_TOWN warp_def 1, 6, 4, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F -FallarborTown_PokemonCenter_1F_MapEvents:: @ 852E518 +FallarborTown_PokemonCenter_1F_MapEvents:: map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index b30b4874f1..a03b385b51 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -FallarborTown_PokemonCenter_1F: @ 8482DE8 +FallarborTown_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte FallarborTown_PokemonCenter_1F_MapEvents .4byte FallarborTown_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_PokemonCenter_2F/events.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc index 233eab8d9a..bc3c01dd8e 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/events.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -FallarborTown_PokemonCenter_2F_EventObjects: @ 852E52C +FallarborTown_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C +FallarborTown_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -FallarborTown_PokemonCenter_2F_MapEvents:: @ 852E5A4 +FallarborTown_PokemonCenter_2F_MapEvents:: map_events FallarborTown_PokemonCenter_2F_EventObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index b818368bfa..f3a761312a 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -FallarborTown_PokemonCenter_2F: @ 8482E04 +FallarborTown_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte FallarborTown_PokemonCenter_2F_MapEvents .4byte FallarborTown_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FarawayIsland_Entrance/events.inc b/data/maps/FarawayIsland_Entrance/events.inc index 6c2a8ebe30..0ae752f936 100644 --- a/data/maps/FarawayIsland_Entrance/events.inc +++ b/data/maps/FarawayIsland_Entrance/events.inc @@ -1,19 +1,19 @@ -FarawayIsland_Entrance_EventObjects: @ 853D710 +FarawayIsland_Entrance_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 39, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 -FarawayIsland_Entrance_MapWarps: @ 853D740 +FarawayIsland_Entrance_MapWarps: warp_def 22, 7, 3, 0, MAP_FARAWAY_ISLAND_INTERIOR warp_def 23, 7, 3, 1, MAP_FARAWAY_ISLAND_INTERIOR -FarawayIsland_Entrance_MapCoordEvents: @ 853D750 +FarawayIsland_Entrance_MapCoordEvents: coord_event 9, 18, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C98 coord_event 10, 20, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C9D coord_event 22, 9, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C98 -FarawayIsland_Entrance_MapBGEvents: @ 853D780 +FarawayIsland_Entrance_MapBGEvents: bg_event 3, 32, 0, BG_EVENT_PLAYER_FACING_NORTH, FarawayIsland_Entrance_EventScript_267CF1 -FarawayIsland_Entrance_MapEvents:: @ 853D78C +FarawayIsland_Entrance_MapEvents:: map_events FarawayIsland_Entrance_EventObjects, FarawayIsland_Entrance_MapWarps, FarawayIsland_Entrance_MapCoordEvents, FarawayIsland_Entrance_MapBGEvents diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc index af762d8329..b76f97aef6 100644 --- a/data/maps/FarawayIsland_Entrance/header.inc +++ b/data/maps/FarawayIsland_Entrance/header.inc @@ -1,10 +1,10 @@ -FarawayIsland_Entrance: @ 848575C +FarawayIsland_Entrance: .4byte FarawayIsland_Entrance_Layout .4byte FarawayIsland_Entrance_MapEvents .4byte FarawayIsland_Entrance_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 402 + .2byte LAYOUT_FARAWAY_ISLAND_ENTRANCE .byte MAPSEC_FARAWAY_ISLAND .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FarawayIsland_Interior/events.inc b/data/maps/FarawayIsland_Interior/events.inc index fc8d99166c..a8611c0386 100644 --- a/data/maps/FarawayIsland_Interior/events.inc +++ b/data/maps/FarawayIsland_Interior/events.inc @@ -1,10 +1,10 @@ -FarawayIsland_Interior_EventObjects: @ 853D7A0 +FarawayIsland_Interior_EventObjects: object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 15, 15, 0, 1, FarawayIsland_Interior_EventScript_267DF2, FLAG_HIDE_MEW -FarawayIsland_Interior_MapWarps: @ 853D7B8 +FarawayIsland_Interior_MapWarps: warp_def 12, 19, 0, 0, MAP_FARAWAY_ISLAND_ENTRANCE warp_def 13, 19, 0, 1, MAP_FARAWAY_ISLAND_ENTRANCE -FarawayIsland_Interior_MapEvents:: @ 853D7C8 +FarawayIsland_Interior_MapEvents:: map_events FarawayIsland_Interior_EventObjects, FarawayIsland_Interior_MapWarps, 0x0, 0x0 diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc index c37bacece6..828202471d 100644 --- a/data/maps/FarawayIsland_Interior/header.inc +++ b/data/maps/FarawayIsland_Interior/header.inc @@ -1,10 +1,10 @@ -FarawayIsland_Interior: @ 8485778 +FarawayIsland_Interior: .4byte FarawayIsland_Interior_Layout .4byte FarawayIsland_Interior_MapEvents .4byte FarawayIsland_Interior_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 403 + .2byte LAYOUT_FARAWAY_ISLAND_INTERIOR .byte MAPSEC_FARAWAY_ISLAND .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc index 0ea132989b..7fd7e44adb 100644 --- a/data/maps/FieryPath/events.inc +++ b/data/maps/FieryPath/events.inc @@ -1,4 +1,4 @@ -FieryPath_EventObjects: @ 8534C80 +FieryPath_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_29119E, FLAG_ITEM_FIERY_PATH_TM06 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_11 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_12 @@ -8,10 +8,10 @@ FieryPath_EventObjects: @ 8534C80 object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_16 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_291191, FLAG_ITEM_FIERY_PATH_FIRE_STONE -FieryPath_MapWarps: @ 8534D40 +FieryPath_MapWarps: warp_def 26, 36, 3, 4, MAP_ROUTE112 warp_def 26, 4, 3, 5, MAP_ROUTE112 -FieryPath_MapEvents:: @ 8534D50 +FieryPath_MapEvents:: map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index 20278028f7..83e339adbd 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -1,10 +1,10 @@ -FieryPath: @ 8484048 +FieryPath: .4byte FieryPath_Layout .4byte FieryPath_MapEvents .4byte FieryPath_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 293 + .2byte LAYOUT_FIERY_PATH .byte MAPSEC_FIERY_PATH .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity/connections.inc b/data/maps/FortreeCity/connections.inc index 83b48c0ad3..5e48951c29 100644 --- a/data/maps/FortreeCity/connections.inc +++ b/data/maps/FortreeCity/connections.inc @@ -1,8 +1,8 @@ -FortreeCity_MapConnectionsList: @ 8486784 +FortreeCity_MapConnectionsList: connection left, 0, MAP_ROUTE119 connection right, 0, MAP_ROUTE120 -FortreeCity_MapConnections: @ 848679C - .4byte 0x2 +FortreeCity_MapConnections: + .4byte 2 .4byte FortreeCity_MapConnectionsList diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc index 4dc9f3e83a..8653934040 100644 --- a/data/maps/FortreeCity/events.inc +++ b/data/maps/FortreeCity/events.inc @@ -1,4 +1,4 @@ -FortreeCity_EventObjects: @ 8526B9C +FortreeCity_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0 object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_EventScript_1E25DE, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 32, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, FortreeCity_EventScript_1E25BF, 0 @@ -7,7 +7,7 @@ FortreeCity_EventObjects: @ 8526B9C object_event 6, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0 object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, FortreeCity_EventScript_1E2614, FLAG_HIDE_FORTREE_CITY_KECLEON -FortreeCity_MapWarps: @ 8526C44 +FortreeCity_MapWarps: warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F warp_def 10, 3, 0, 0, MAP_FORTREE_CITY_HOUSE1 warp_def 22, 11, 0, 0, MAP_FORTREE_CITY_GYM @@ -18,7 +18,7 @@ FortreeCity_MapWarps: @ 8526C44 warp_def 12, 13, 0, 0, MAP_FORTREE_CITY_HOUSE5 warp_def 37, 13, 0, 0, MAP_FORTREE_CITY_DECORATION_SHOP -FortreeCity_MapBGEvents: @ 8526C8C +FortreeCity_MapBGEvents: bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_1E2602 bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E73 bg_event 5, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E6A @@ -26,6 +26,6 @@ FortreeCity_MapBGEvents: @ 8526C8C bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E73 bg_event 6, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E6A -FortreeCity_MapEvents:: @ 8526CD4 +FortreeCity_MapEvents:: map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index 0bfccda3ce..9d7cd5aaea 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -1,10 +1,10 @@ -FortreeCity: @ 8482528 +FortreeCity: .4byte FortreeCity_Layout .4byte FortreeCity_MapEvents .4byte FortreeCity_MapScripts .4byte FortreeCity_MapConnections .2byte MUS_MACHI_S3 - .2byte 5 + .2byte LAYOUT_FORTREE_CITY .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/FortreeCity_DecorationShop/events.inc b/data/maps/FortreeCity_DecorationShop/events.inc index 2c5a0d21ef..604e3fda1a 100644 --- a/data/maps/FortreeCity_DecorationShop/events.inc +++ b/data/maps/FortreeCity_DecorationShop/events.inc @@ -1,13 +1,13 @@ -FortreeCity_DecorationShop_EventObjects: @ 85310B0 +FortreeCity_DecorationShop_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0 object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0 object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0 -FortreeCity_DecorationShop_MapWarps: @ 8531110 +FortreeCity_DecorationShop_MapWarps: warp_def 3, 5, 0, 8, MAP_FORTREE_CITY warp_def 4, 5, 0, 8, MAP_FORTREE_CITY -FortreeCity_DecorationShop_MapEvents:: @ 8531120 +FortreeCity_DecorationShop_MapEvents:: map_events FortreeCity_DecorationShop_EventObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index 4a640a8ada..b4e0c92051 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -1,10 +1,10 @@ -FortreeCity_DecorationShop: @ 848361C +FortreeCity_DecorationShop: .4byte FortreeCity_DecorationShop_Layout .4byte FortreeCity_DecorationShop_MapEvents .4byte FortreeCity_DecorationShop_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 255 + .2byte LAYOUT_FORTREE_CITY_DECORATION_SHOP .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc index 307d35cc70..e71b6ea4ec 100644 --- a/data/maps/FortreeCity_Gym/events.inc +++ b/data/maps/FortreeCity_Gym/events.inc @@ -1,4 +1,4 @@ -FortreeCity_Gym_EventObjects: @ 8530C98 +FortreeCity_Gym_EventObjects: object_event 1, EVENT_OBJ_GFX_WINONA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0 object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0 @@ -8,14 +8,14 @@ FortreeCity_Gym_EventObjects: @ 8530C98 object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, FortreeCity_Gym_EventScript_216704, 0 object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, FortreeCity_Gym_EventScript_21671B, 0 -FortreeCity_Gym_MapWarps: @ 8530D58 +FortreeCity_Gym_MapWarps: warp_def 15, 24, 0, 2, MAP_FORTREE_CITY warp_def 16, 24, 0, 2, MAP_FORTREE_CITY -FortreeCity_Gym_MapBGEvents: @ 8530D68 +FortreeCity_Gym_MapBGEvents: bg_event 14, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_216751 bg_event 17, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_216761 -FortreeCity_Gym_MapEvents:: @ 8530D80 +FortreeCity_Gym_MapEvents:: map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 68f02747fc..2bde54ddd5 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -1,10 +1,10 @@ -FortreeCity_Gym: @ 848353C +FortreeCity_Gym: .4byte FortreeCity_Gym_Layout .4byte FortreeCity_Gym_MapEvents .4byte FortreeCity_Gym_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 100 + .2byte LAYOUT_FORTREE_CITY_GYM .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_House1/events.inc b/data/maps/FortreeCity_House1/events.inc index 45b2a902af..5cf082d413 100644 --- a/data/maps/FortreeCity_House1/events.inc +++ b/data/maps/FortreeCity_House1/events.inc @@ -1,12 +1,12 @@ -FortreeCity_House1_EventObjects: @ 8530C2C +FortreeCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0 object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_House1_EventScript_21635F, 0 -FortreeCity_House1_MapWarps: @ 8530C74 +FortreeCity_House1_MapWarps: warp_def 3, 5, 0, 1, MAP_FORTREE_CITY warp_def 4, 5, 0, 1, MAP_FORTREE_CITY -FortreeCity_House1_MapEvents:: @ 8530C84 +FortreeCity_House1_MapEvents:: map_events FortreeCity_House1_EventObjects, FortreeCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 1b52dd7259..636a147f44 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -1,10 +1,10 @@ -FortreeCity_House1: @ 8483520 +FortreeCity_House1: .4byte FortreeCity_House1_Layout .4byte FortreeCity_House1_MapEvents .4byte FortreeCity_House1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 99 + .2byte LAYOUT_FORTREE_CITY_HOUSE1 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_House2/events.inc b/data/maps/FortreeCity_House2/events.inc index f9a5c11ab3..ca183c0055 100644 --- a/data/maps/FortreeCity_House2/events.inc +++ b/data/maps/FortreeCity_House2/events.inc @@ -1,11 +1,11 @@ -FortreeCity_House2_EventObjects: @ 8530F30 +FortreeCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0 -FortreeCity_House2_MapWarps: @ 8530F60 +FortreeCity_House2_MapWarps: warp_def 3, 5, 0, 4, MAP_FORTREE_CITY warp_def 4, 5, 0, 4, MAP_FORTREE_CITY -FortreeCity_House2_MapEvents:: @ 8530F70 +FortreeCity_House2_MapEvents:: map_events FortreeCity_House2_EventObjects, FortreeCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index 02b76c3941..e61c000f61 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -1,10 +1,10 @@ -FortreeCity_House2: @ 84835AC +FortreeCity_House2: .4byte FortreeCity_House2_Layout .4byte FortreeCity_House2_MapEvents .4byte FortreeCity_House2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 101 + .2byte LAYOUT_FORTREE_CITY_HOUSE2 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_House3/events.inc b/data/maps/FortreeCity_House3/events.inc index 23ae106883..8a158f8ff3 100644 --- a/data/maps/FortreeCity_House3/events.inc +++ b/data/maps/FortreeCity_House3/events.inc @@ -1,11 +1,11 @@ -FortreeCity_House3_EventObjects: @ 8530F84 +FortreeCity_House3_EventObjects: object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House3_EventScript_217AF1, 0 -FortreeCity_House3_MapWarps: @ 8530FB4 +FortreeCity_House3_MapWarps: warp_def 3, 5, 0, 5, MAP_FORTREE_CITY warp_def 4, 5, 0, 5, MAP_FORTREE_CITY -FortreeCity_House3_MapEvents:: @ 8530FC4 +FortreeCity_House3_MapEvents:: map_events FortreeCity_House3_EventObjects, FortreeCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index 1b039c24e8..db66e65d8a 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -1,10 +1,10 @@ -FortreeCity_House3: @ 84835C8 +FortreeCity_House3: .4byte FortreeCity_House1_Layout .4byte FortreeCity_House3_MapEvents .4byte FortreeCity_House3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 99 + .2byte LAYOUT_FORTREE_CITY_HOUSE1 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_House4/events.inc b/data/maps/FortreeCity_House4/events.inc index 8c7e03f765..bc6a4a39c9 100644 --- a/data/maps/FortreeCity_House4/events.inc +++ b/data/maps/FortreeCity_House4/events.inc @@ -1,12 +1,12 @@ -FortreeCity_House4_EventObjects: @ 8530FD8 +FortreeCity_House4_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House4_EventScript_217C81, 0 object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0 object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL -FortreeCity_House4_MapWarps: @ 8531020 +FortreeCity_House4_MapWarps: warp_def 3, 5, 0, 6, MAP_FORTREE_CITY warp_def 4, 5, 0, 6, MAP_FORTREE_CITY -FortreeCity_House4_MapEvents:: @ 8531030 +FortreeCity_House4_MapEvents:: map_events FortreeCity_House4_EventObjects, FortreeCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index e675e063b2..cd340c2940 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -1,10 +1,10 @@ -FortreeCity_House4: @ 84835E4 +FortreeCity_House4: .4byte FortreeCity_House2_Layout .4byte FortreeCity_House4_MapEvents .4byte FortreeCity_House4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 101 + .2byte LAYOUT_FORTREE_CITY_HOUSE2 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_House5/events.inc b/data/maps/FortreeCity_House5/events.inc index 8db01a8d02..bc090cb809 100644 --- a/data/maps/FortreeCity_House5/events.inc +++ b/data/maps/FortreeCity_House5/events.inc @@ -1,12 +1,12 @@ -FortreeCity_House5_EventObjects: @ 8531044 +FortreeCity_House5_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0 object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0 object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0 -FortreeCity_House5_MapWarps: @ 853108C +FortreeCity_House5_MapWarps: warp_def 3, 5, 0, 7, MAP_FORTREE_CITY warp_def 4, 5, 0, 7, MAP_FORTREE_CITY -FortreeCity_House5_MapEvents:: @ 853109C +FortreeCity_House5_MapEvents:: map_events FortreeCity_House5_EventObjects, FortreeCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index bac2fff5ba..a04e91eb31 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -1,10 +1,10 @@ -FortreeCity_House5: @ 8483600 +FortreeCity_House5: .4byte FortreeCity_House1_Layout .4byte FortreeCity_House5_MapEvents .4byte FortreeCity_House5_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 99 + .2byte LAYOUT_FORTREE_CITY_HOUSE1 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_Mart/events.inc b/data/maps/FortreeCity_Mart/events.inc index e41280e89c..ceb68f7ea1 100644 --- a/data/maps/FortreeCity_Mart/events.inc +++ b/data/maps/FortreeCity_Mart/events.inc @@ -1,13 +1,13 @@ -FortreeCity_Mart_EventObjects: @ 8530EAC +FortreeCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0 object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0 -FortreeCity_Mart_MapWarps: @ 8530F0C +FortreeCity_Mart_MapWarps: warp_def 3, 7, 0, 3, MAP_FORTREE_CITY warp_def 4, 7, 0, 3, MAP_FORTREE_CITY -FortreeCity_Mart_MapEvents:: @ 8530F1C +FortreeCity_Mart_MapEvents:: map_events FortreeCity_Mart_EventObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index 37af953ab8..f4aaf9ce17 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -1,10 +1,10 @@ -FortreeCity_Mart: @ 8483590 +FortreeCity_Mart: .4byte Mart_Layout .4byte FortreeCity_Mart_MapEvents .4byte FortreeCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_PokemonCenter_1F/events.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc index f43cb40635..af7b5f72ef 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/events.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -FortreeCity_PokemonCenter_1F_EventObjects: @ 8530D94 +FortreeCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 8, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0 object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0 -FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4 +FortreeCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 0, MAP_FORTREE_CITY warp_def 6, 8, 3, 0, MAP_FORTREE_CITY warp_def 1, 6, 4, 0, MAP_FORTREE_CITY_POKEMON_CENTER_2F -FortreeCity_PokemonCenter_1F_MapEvents:: @ 8530E0C +FortreeCity_PokemonCenter_1F_MapEvents:: map_events FortreeCity_PokemonCenter_1F_EventObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index f2fdf37695..543e672a2c 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -FortreeCity_PokemonCenter_1F: @ 8483558 +FortreeCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte FortreeCity_PokemonCenter_1F_MapEvents .4byte FortreeCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_PokemonCenter_2F/events.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc index 028b5cada7..7cdbc4a82e 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/events.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -FortreeCity_PokemonCenter_2F_EventObjects: @ 8530E20 +FortreeCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80 +FortreeCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -FortreeCity_PokemonCenter_2F_MapEvents:: @ 8530E98 +FortreeCity_PokemonCenter_2F_MapEvents:: map_events FortreeCity_PokemonCenter_2F_EventObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index 1ad4484d92..8dbfeed079 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -FortreeCity_PokemonCenter_2F: @ 8483574 +FortreeCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte FortreeCity_PokemonCenter_2F_MapEvents .4byte FortreeCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/GraniteCave_1F/events.inc b/data/maps/GraniteCave_1F/events.inc index 8228e16789..1885f3cf5d 100644 --- a/data/maps/GraniteCave_1F/events.inc +++ b/data/maps/GraniteCave_1F/events.inc @@ -1,13 +1,13 @@ -GraniteCave_1F_EventObjects: @ 85343BC +GraniteCave_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE -GraniteCave_1F_MapWarps: @ 85343EC +GraniteCave_1F_MapWarps: warp_def 37, 12, 3, 0, MAP_ROUTE106 warp_def 35, 3, 3, 0, MAP_GRANITE_CAVE_B1F warp_def 17, 11, 3, 1, MAP_GRANITE_CAVE_B1F warp_def 5, 10, 3, 0, MAP_GRANITE_CAVE_STEVENS_ROOM -GraniteCave_1F_MapEvents:: @ 853440C +GraniteCave_1F_MapEvents:: map_events GraniteCave_1F_EventObjects, GraniteCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index 7578523b26..2f834c7eb9 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -1,10 +1,10 @@ -GraniteCave_1F: @ 8483F84 +GraniteCave_1F: .4byte GraniteCave_1F_Layout .4byte GraniteCave_1F_MapEvents .4byte GraniteCave_1F_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 132 + .2byte LAYOUT_GRANITE_CAVE_1F .byte MAPSEC_GRANITE_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/GraniteCave_B1F/events.inc b/data/maps/GraniteCave_B1F/events.inc index b27a68f174..f3dcbcbafb 100644 --- a/data/maps/GraniteCave_B1F/events.inc +++ b/data/maps/GraniteCave_B1F/events.inc @@ -1,7 +1,7 @@ -GraniteCave_B1F_EventObjects: @ 8534420 +GraniteCave_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL -GraniteCave_B1F_MapWarps: @ 8534438 +GraniteCave_B1F_MapWarps: warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F warp_def 4, 21, 3, 2, MAP_GRANITE_CAVE_1F warp_def 29, 13, 3, 0, MAP_GRANITE_CAVE_B2F @@ -10,6 +10,6 @@ GraniteCave_B1F_MapWarps: @ 8534438 warp_def 12, 3, 3, 3, MAP_GRANITE_CAVE_B2F warp_def 29, 2, 3, 4, MAP_GRANITE_CAVE_B2F -GraniteCave_B1F_MapEvents:: @ 8534470 +GraniteCave_B1F_MapEvents:: map_events GraniteCave_B1F_EventObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 64187397c9..546c246580 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -1,10 +1,10 @@ -GraniteCave_B1F: @ 8483FA0 +GraniteCave_B1F: .4byte GraniteCave_B1F_Layout .4byte GraniteCave_B1F_MapEvents .4byte GraniteCave_B1F_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 133 + .2byte LAYOUT_GRANITE_CAVE_B1F .byte MAPSEC_GRANITE_CAVE .byte 1 .byte WEATHER_NONE diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc index 08ac73a5a9..fc321dfb0b 100644 --- a/data/maps/GraniteCave_B2F/events.inc +++ b/data/maps/GraniteCave_B2F/events.inc @@ -1,4 +1,4 @@ -GraniteCave_B2F_EventObjects: @ 8534484 +GraniteCave_B2F_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, FLAG_ITEM_GRANITE_CAVE_B2F_REPEL object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_11 @@ -9,17 +9,17 @@ GraniteCave_B2F_EventObjects: @ 8534484 object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_16 object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_17 -GraniteCave_B2F_MapWarps: @ 853455C +GraniteCave_B2F_MapWarps: warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F warp_def 28, 21, 3, 3, MAP_GRANITE_CAVE_B1F warp_def 8, 5, 3, 4, MAP_GRANITE_CAVE_B1F warp_def 12, 3, 3, 5, MAP_GRANITE_CAVE_B1F warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F -GraniteCave_B2F_MapBGEvents: @ 8534584 +GraniteCave_B2F_MapBGEvents: bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1 bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2 -GraniteCave_B2F_MapEvents:: @ 853459C +GraniteCave_B2F_MapEvents:: map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 4fd519156d..ce63017bef 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -1,10 +1,10 @@ -GraniteCave_B2F: @ 8483FBC +GraniteCave_B2F: .4byte GraniteCave_B2F_Layout .4byte GraniteCave_B2F_MapEvents .4byte GraniteCave_B2F_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 134 + .2byte LAYOUT_GRANITE_CAVE_B2F .byte MAPSEC_GRANITE_CAVE .byte 1 .byte WEATHER_NONE diff --git a/data/maps/GraniteCave_StevensRoom/events.inc b/data/maps/GraniteCave_StevensRoom/events.inc index 387770626a..747fe2cc3a 100644 --- a/data/maps/GraniteCave_StevensRoom/events.inc +++ b/data/maps/GraniteCave_StevensRoom/events.inc @@ -1,9 +1,9 @@ -GraniteCave_StevensRoom_EventObjects: @ 85345B0 +GraniteCave_StevensRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, FLAG_HIDE_GRANITE_CAVE_STEVEN -GraniteCave_StevensRoom_MapWarps: @ 85345C8 +GraniteCave_StevensRoom_MapWarps: warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F -GraniteCave_StevensRoom_MapEvents:: @ 85345D0 +GraniteCave_StevensRoom_MapEvents:: map_events GraniteCave_StevensRoom_EventObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index 0bd8e41b20..6d90fc6c8e 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -1,10 +1,10 @@ -GraniteCave_StevensRoom: @ 8483FD8 +GraniteCave_StevensRoom: .4byte GraniteCave_StevensRoom_Layout .4byte GraniteCave_StevensRoom_MapEvents .4byte GraniteCave_StevensRoom_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 288 + .2byte LAYOUT_GRANITE_CAVE_STEVENS_ROOM .byte MAPSEC_GRANITE_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc index f8dbe9ad70..c7888165fd 100644 --- a/data/maps/InsideOfTruck/events.inc +++ b/data/maps/InsideOfTruck/events.inc @@ -1,25 +1,25 @@ -InsideOfTruck_EventObjects: @ 853A078 +InsideOfTruck_EventObjects: object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 -InsideOfTruck_MapWarps: @ 853A0C0 +InsideOfTruck_MapWarps: warp_def 4, 1, 0, 127, MAP_NONE warp_def 4, 2, 0, 127, MAP_NONE warp_def 4, 3, 0, 127, MAP_NONE -InsideOfTruck_MapCoordEvents: @ 853A0D8 +InsideOfTruck_MapCoordEvents: coord_event 3, 1, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 coord_event 3, 2, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 coord_event 3, 3, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 -InsideOfTruck_MapBGEvents: @ 853A108 +InsideOfTruck_MapBGEvents: bg_event 1, 0, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C -InsideOfTruck_MapEvents:: @ 853A144 +InsideOfTruck_MapEvents:: map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index 52ea777a9d..7b1889e250 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -1,10 +1,10 @@ -InsideOfTruck: @ 8484EF0 +InsideOfTruck: .4byte InsideOfTruck_Layout .4byte InsideOfTruck_MapEvents .4byte InsideOfTruck_MapScripts .4byte 0x0 .2byte 65535 - .2byte 237 + .2byte LAYOUT_INSIDE_OF_TRUCK .byte MAPSEC_INSIDE_OF_TRUCK .byte 0 .byte WEATHER_NONE diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc index f6abd57a75..fa9c3deba3 100644 --- a/data/maps/IslandCave/events.inc +++ b/data/maps/IslandCave/events.inc @@ -1,16 +1,16 @@ -IslandCave_EventObjects: @ 8536C74 +IslandCave_EventObjects: object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, IslandCave_EventScript_238F58, FLAG_HIDE_REGICE -IslandCave_MapWarps: @ 8536C8C +IslandCave_MapWarps: warp_def 8, 29, 3, 0, MAP_ROUTE105 warp_def 8, 20, 0, 2, MAP_ISLAND_CAVE warp_def 8, 11, 3, 1, MAP_ISLAND_CAVE -IslandCave_MapBGEvents: @ 8536CA4 +IslandCave_MapBGEvents: bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238EEF bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238F1D bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238F1D -IslandCave_MapEvents:: @ 8536CC8 +IslandCave_MapEvents:: map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index 767df72f02..15eb2b3603 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -1,10 +1,10 @@ -IslandCave: @ 8484614 +IslandCave: .4byte IslandCave_Layout .4byte IslandCave_MapEvents .4byte IslandCave_MapScripts .4byte 0x0 .2byte MUS_MABOROSI - .2byte 280 + .2byte LAYOUT_ISLAND_CAVE .byte MAPSEC_ISLAND_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc index f9a82c89b1..5d33af93e7 100644 --- a/data/maps/JaggedPass/events.inc +++ b/data/maps/JaggedPass/events.inc @@ -1,4 +1,4 @@ -JaggedPass_EventObjects: @ 8534AE4 +JaggedPass_EventObjects: object_event 1, EVENT_OBJ_GFX_HIKER, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0 object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, JaggedPass_EventScript_291184, FLAG_ITEM_JAGGED_PASS_BURN_HEAL @@ -7,14 +7,14 @@ JaggedPass_EventObjects: @ 8534AE4 object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_230871, 0 object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, JaggedPass_EventScript_23085A, 0 -JaggedPass_MapWarps: @ 8534B8C +JaggedPass_MapWarps: warp_def 14, 40, 3, 2, MAP_ROUTE112 warp_def 15, 40, 3, 3, MAP_ROUTE112 warp_def 13, 5, 3, 2, MAP_MT_CHIMNEY warp_def 14, 5, 3, 3, MAP_MT_CHIMNEY warp_def 16, 18, 0, 0, MAP_MAGMA_HIDEOUT_1F -JaggedPass_MapCoordEvents: @ 8534BB4 +JaggedPass_MapCoordEvents: coord_weather_event 13, 15, 3, COORD_EVENT_WEATHER_SUNNY coord_weather_event 21, 12, 3, COORD_EVENT_WEATHER_ASH coord_weather_event 14, 15, 3, COORD_EVENT_WEATHER_SUNNY @@ -26,10 +26,10 @@ JaggedPass_MapCoordEvents: @ 8534BB4 coord_event 14, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB coord_event 13, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB -JaggedPass_MapBGEvents: @ 8534C54 +JaggedPass_MapBGEvents: bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL -JaggedPass_MapEvents:: @ 8534C6C +JaggedPass_MapEvents:: map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index f53bfbe652..870b817ec2 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -1,10 +1,10 @@ -JaggedPass: @ 848402C +JaggedPass: .4byte JaggedPass_Layout .4byte JaggedPass_MapEvents .4byte JaggedPass_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 292 + .2byte LAYOUT_JAGGED_PASS .byte MAPSEC_JAGGED_PASS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LavaridgeTown/connections.inc b/data/maps/LavaridgeTown/connections.inc index 0b8181615c..e3d4e1fb1d 100644 --- a/data/maps/LavaridgeTown/connections.inc +++ b/data/maps/LavaridgeTown/connections.inc @@ -1,7 +1,7 @@ -LavaridgeTown_MapConnectionsList: @ 8486660 +LavaridgeTown_MapConnectionsList: connection right, -40, MAP_ROUTE112 -LavaridgeTown_MapConnections: @ 848666C - .4byte 0x1 +LavaridgeTown_MapConnections: + .4byte 1 .4byte LavaridgeTown_MapConnectionsList diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc index 6d34ee5c80..aeb55249e8 100644 --- a/data/maps/LavaridgeTown/events.inc +++ b/data/maps/LavaridgeTown/events.inc @@ -1,4 +1,4 @@ -LavaridgeTown_EventObjects: @ 8527A54 +LavaridgeTown_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0 object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0 @@ -9,7 +9,7 @@ LavaridgeTown_EventObjects: @ 8527A54 object_event 8, EVENT_OBJ_GFX_VAR_0, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 object_event 9, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0 -LavaridgeTown_MapWarps: @ 8527B2C +LavaridgeTown_MapWarps: warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP warp_def 5, 15, 0, 0, MAP_LAVARIDGE_TOWN_GYM_1F warp_def 15, 5, 0, 0, MAP_LAVARIDGE_TOWN_MART @@ -17,10 +17,10 @@ LavaridgeTown_MapWarps: @ 8527B2C warp_def 16, 15, 0, 0, MAP_LAVARIDGE_TOWN_HOUSE warp_def 9, 2, 3, 3, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F -LavaridgeTown_MapCoordEvents: @ 8527B5C +LavaridgeTown_MapCoordEvents: coord_event 6, 3, 3, 0, 0, LavaridgeTown_EventScript_1EA6FA -LavaridgeTown_MapBGEvents: @ 8527B6C +LavaridgeTown_MapBGEvents: bg_event 14, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7B7 bg_event 7, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7AE bg_event 17, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A @@ -30,6 +30,6 @@ LavaridgeTown_MapBGEvents: @ 8527B6C bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73 bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL -LavaridgeTown_MapEvents:: @ 8527BCC +LavaridgeTown_MapEvents:: map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index 6ea1e048ce..5365e1a005 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown: @ 8482608 +LavaridgeTown: .4byte LavaridgeTown_Layout .4byte LavaridgeTown_MapEvents .4byte LavaridgeTown_MapScripts .4byte LavaridgeTown_MapConnections .2byte MUS_MACHI_S4 - .2byte 13 + .2byte LAYOUT_LAVARIDGE_TOWN .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc index ee1cf057f8..08d22737c1 100644 --- a/data/maps/LavaridgeTown_Gym_1F/events.inc +++ b/data/maps/LavaridgeTown_Gym_1F/events.inc @@ -1,4 +1,4 @@ -LavaridgeTown_Gym_1F_EventObjects: @ 852DE1C +LavaridgeTown_Gym_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 13, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0 object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 3, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0 @@ -6,7 +6,7 @@ LavaridgeTown_Gym_1F_EventObjects: @ 852DE1C object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0 object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0 -LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC +LavaridgeTown_Gym_1F_MapWarps: warp_def 13, 18, 3, 1, MAP_LAVARIDGE_TOWN warp_def 14, 18, 3, 1, MAP_LAVARIDGE_TOWN warp_def 10, 18, 3, 0, MAP_LAVARIDGE_TOWN_GYM_B1F @@ -34,10 +34,10 @@ LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC warp_def 13, 17, 3, 22, MAP_LAVARIDGE_TOWN_GYM_B1F warp_def 12, 12, 3, 23, MAP_LAVARIDGE_TOWN_GYM_B1F -LavaridgeTown_Gym_1F_MapBGEvents: @ 852DF7C +LavaridgeTown_Gym_1F_MapBGEvents: bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_1FE98B bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_1FE99B -LavaridgeTown_Gym_1F_MapEvents:: @ 852DF94 +LavaridgeTown_Gym_1F_MapEvents:: map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index 86882ed341..f71786ce0a 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_Gym_1F: @ 8482CD0 +LavaridgeTown_Gym_1F: .4byte LavaridgeTown_Gym_1F_Layout .4byte LavaridgeTown_Gym_1F_MapEvents .4byte LavaridgeTown_Gym_1F_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 69 + .2byte LAYOUT_LAVARIDGE_TOWN_GYM_1F .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/LavaridgeTown_Gym_B1F/events.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc index 337bfd7612..64512a994a 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/events.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/events.inc @@ -1,10 +1,10 @@ -LavaridgeTown_Gym_B1F_EventObjects: @ 852DFA8 +LavaridgeTown_Gym_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 4, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0 object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 3, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0 object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0 object_event 4, EVENT_OBJ_GFX_HIKER, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0 -LavaridgeTown_Gym_B1F_MapWarps: @ 852E008 +LavaridgeTown_Gym_B1F_MapWarps: warp_def 10, 18, 3, 2, MAP_LAVARIDGE_TOWN_GYM_1F warp_def 0, 17, 3, 6, MAP_LAVARIDGE_TOWN_GYM_1F warp_def 8, 9, 3, 3, MAP_LAVARIDGE_TOWN_GYM_1F @@ -30,6 +30,6 @@ LavaridgeTown_Gym_B1F_MapWarps: @ 852E008 warp_def 13, 17, 3, 24, MAP_LAVARIDGE_TOWN_GYM_1F warp_def 12, 12, 3, 25, MAP_LAVARIDGE_TOWN_GYM_1F -LavaridgeTown_Gym_B1F_MapEvents:: @ 852E0C8 +LavaridgeTown_Gym_B1F_MapEvents:: map_events LavaridgeTown_Gym_B1F_EventObjects, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index b393e3693c..fc1d6308aa 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_Gym_B1F: @ 8482CEC +LavaridgeTown_Gym_B1F: .4byte LavaridgeTown_Gym_B1F_Layout .4byte LavaridgeTown_Gym_B1F_MapEvents .4byte LavaridgeTown_Gym_B1F_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 70 + .2byte LAYOUT_LAVARIDGE_TOWN_GYM_B1F .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/LavaridgeTown_HerbShop/events.inc b/data/maps/LavaridgeTown_HerbShop/events.inc index f8602d8722..3cce9612fc 100644 --- a/data/maps/LavaridgeTown_HerbShop/events.inc +++ b/data/maps/LavaridgeTown_HerbShop/events.inc @@ -1,12 +1,12 @@ -LavaridgeTown_HerbShop_EventObjects: @ 852DDB0 +LavaridgeTown_HerbShop_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0 object_event 2, EVENT_OBJ_GFX_OLD_MAN, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0 -LavaridgeTown_HerbShop_MapWarps: @ 852DDF8 +LavaridgeTown_HerbShop_MapWarps: warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN warp_def 4, 7, 0, 0, MAP_LAVARIDGE_TOWN -LavaridgeTown_HerbShop_MapEvents:: @ 852DE08 +LavaridgeTown_HerbShop_MapEvents:: map_events LavaridgeTown_HerbShop_EventObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index 596d13482d..68fe70df70 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_HerbShop: @ 8482CB4 +LavaridgeTown_HerbShop: .4byte LavaridgeTown_HerbShop_Layout .4byte LavaridgeTown_HerbShop_MapEvents .4byte LavaridgeTown_HerbShop_MapScripts .4byte 0x0 .2byte MUS_MACHI_S4 - .2byte 68 + .2byte LAYOUT_LAVARIDGE_TOWN_HERB_SHOP .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LavaridgeTown_House/events.inc b/data/maps/LavaridgeTown_House/events.inc index 0a44e6e8de..77af1e7461 100644 --- a/data/maps/LavaridgeTown_House/events.inc +++ b/data/maps/LavaridgeTown_House/events.inc @@ -1,12 +1,12 @@ -LavaridgeTown_House_EventObjects: @ 852E0DC +LavaridgeTown_House_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0 object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0 object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0 -LavaridgeTown_House_MapWarps: @ 852E124 +LavaridgeTown_House_MapWarps: warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN warp_def 4, 7, 0, 4, MAP_LAVARIDGE_TOWN -LavaridgeTown_House_MapEvents:: @ 852E134 +LavaridgeTown_House_MapEvents:: map_events LavaridgeTown_House_EventObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index 11bb01e136..0815c6fb42 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_House: @ 8482D08 +LavaridgeTown_House: .4byte House3_Layout .4byte LavaridgeTown_House_MapEvents .4byte LavaridgeTown_House_MapScripts .4byte 0x0 .2byte MUS_MACHI_S4 - .2byte 64 + .2byte LAYOUT_HOUSE3 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LavaridgeTown_Mart/events.inc b/data/maps/LavaridgeTown_Mart/events.inc index 8534faa7bc..24923dc512 100644 --- a/data/maps/LavaridgeTown_Mart/events.inc +++ b/data/maps/LavaridgeTown_Mart/events.inc @@ -1,12 +1,12 @@ -LavaridgeTown_Mart_EventObjects: @ 852E148 +LavaridgeTown_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0 object_event 3, EVENT_OBJ_GFX_OLD_WOMAN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0 -LavaridgeTown_Mart_MapWarps: @ 852E190 +LavaridgeTown_Mart_MapWarps: warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN warp_def 4, 7, 0, 2, MAP_LAVARIDGE_TOWN -LavaridgeTown_Mart_MapEvents:: @ 852E1A0 +LavaridgeTown_Mart_MapEvents:: map_events LavaridgeTown_Mart_EventObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index 1c3ce0cafe..9c96370f98 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_Mart: @ 8482D24 +LavaridgeTown_Mart: .4byte Mart_Layout .4byte LavaridgeTown_Mart_MapEvents .4byte LavaridgeTown_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc index bf7246caab..01974866cb 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc @@ -1,15 +1,15 @@ -LavaridgeTown_PokemonCenter_1F_EventObjects: @ 852E1B4 +LavaridgeTown_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0 object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0 object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0 -LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214 +LavaridgeTown_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN warp_def 6, 8, 3, 3, MAP_LAVARIDGE_TOWN warp_def 1, 6, 4, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F warp_def 2, 1, 0, 5, MAP_LAVARIDGE_TOWN -LavaridgeTown_PokemonCenter_1F_MapEvents:: @ 852E234 +LavaridgeTown_PokemonCenter_1F_MapEvents:: map_events LavaridgeTown_PokemonCenter_1F_EventObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index 0f18f64e9e..4e17b5fd09 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_PokemonCenter_1F: @ 8482D40 +LavaridgeTown_PokemonCenter_1F: .4byte LavaridgeTown_PokemonCenter_1F_Layout .4byte LavaridgeTown_PokemonCenter_1F_MapEvents .4byte LavaridgeTown_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 71 + .2byte LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc index 6e1011dd87..4da5d3b1ff 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -LavaridgeTown_PokemonCenter_2F_EventObjects: @ 852E248 +LavaridgeTown_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8 +LavaridgeTown_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 852E2C0 +LavaridgeTown_PokemonCenter_2F_MapEvents:: map_events LavaridgeTown_PokemonCenter_2F_EventObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index d66d90b733..4a7226e29b 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_PokemonCenter_2F: @ 8482D5C +LavaridgeTown_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte LavaridgeTown_PokemonCenter_2F_MapEvents .4byte LavaridgeTown_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity/connections.inc b/data/maps/LilycoveCity/connections.inc index d5469e561b..6e0cdff931 100644 --- a/data/maps/LilycoveCity/connections.inc +++ b/data/maps/LilycoveCity/connections.inc @@ -1,8 +1,8 @@ -LilycoveCity_MapConnectionsList: @ 84867A4 +LilycoveCity_MapConnectionsList: connection left, 10, MAP_ROUTE121 connection right, -10, MAP_ROUTE124 -LilycoveCity_MapConnections: @ 84867BC - .4byte 0x2 +LilycoveCity_MapConnections: + .4byte 2 .4byte LilycoveCity_MapConnectionsList diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc index 68a7822120..71022af32f 100644 --- a/data/maps/LilycoveCity/events.inc +++ b/data/maps/LilycoveCity/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_EventObjects: @ 8526CE8 +LilycoveCity_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_EventScript_1E2C53, 0 object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C2B, 0 object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0 @@ -22,7 +22,7 @@ LilycoveCity_EventObjects: @ 8526CE8 object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 16, 34, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CCB, 0 object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CD4, 0 -LilycoveCity_MapWarps: @ 8526EF8 +LilycoveCity_MapWarps: warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F warp_def 37, 24, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F warp_def 24, 14, 0, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F @@ -38,7 +38,7 @@ LilycoveCity_MapWarps: @ 8526EF8 warp_def 12, 32, 0, 0, MAP_LILYCOVE_CITY_HARBOR warp_def 12, 5, 0, 1, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F -LilycoveCity_MapBGEvents: @ 8526F68 +LilycoveCity_MapBGEvents: bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D1A bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_271E73 bg_event 29, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D6B @@ -53,6 +53,6 @@ LilycoveCity_MapBGEvents: @ 8526F68 bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL -LilycoveCity_MapEvents:: @ 8527004 +LilycoveCity_MapEvents:: map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index cf3ebf2f5e..93120b8969 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -1,10 +1,10 @@ -LilycoveCity: @ 8482544 +LilycoveCity: .4byte LilycoveCity_Layout .4byte LilycoveCity_MapEvents .4byte LilycoveCity_MapScripts .4byte LilycoveCity_MapConnections .2byte MUS_MINAMO - .2byte 6 + .2byte LAYOUT_LILYCOVE_CITY .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc index 61d1cd63a1..838aec23b9 100644 --- a/data/maps/LilycoveCity_ContestHall/events.inc +++ b/data/maps/LilycoveCity_ContestHall/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_ContestHall_EventObjects: @ 8531850 +LilycoveCity_ContestHall_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0 object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0 @@ -32,13 +32,13 @@ LilycoveCity_ContestHall_EventObjects: @ 8531850 object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 42, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0 object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0 -LilycoveCity_ContestHall_MapWarps: @ 8531B50 +LilycoveCity_ContestHall_MapWarps: warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY warp_def 30, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY warp_def 20, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY warp_def 31, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY -LilycoveCity_ContestHall_MapBGEvents: @ 8531B70 +LilycoveCity_ContestHall_MapBGEvents: bg_event 27, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B733 bg_event 39, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B73C bg_event 11, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B745 @@ -46,6 +46,6 @@ LilycoveCity_ContestHall_MapBGEvents: @ 8531B70 bg_event 23, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B733 bg_event 35, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B73C -LilycoveCity_ContestHall_MapEvents:: @ 8531BB8 +LilycoveCity_ContestHall_MapEvents:: map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index eb07c7d59b..d450c564e8 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_ContestHall: @ 84836C4 +LilycoveCity_ContestHall: .4byte LilycoveCity_ContestHall_Layout .4byte LilycoveCity_ContestHall_MapEvents .4byte LilycoveCity_ContestHall_MapScripts .4byte 0x0 .2byte MUS_CONLOBBY - .2byte 106 + .2byte LAYOUT_LILYCOVE_CITY_CONTEST_HALL .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc index fa04b72e73..68c682a257 100644 --- a/data/maps/LilycoveCity_ContestLobby/events.inc +++ b/data/maps/LilycoveCity_ContestLobby/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_ContestLobby_EventObjects: @ 8531534 +LilycoveCity_ContestLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0 object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 26, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0 @@ -25,13 +25,13 @@ LilycoveCity_ContestLobby_EventObjects: @ 8531534 object_event 24, EVENT_OBJ_GFX_OLD_MAN, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0 -LilycoveCity_ContestLobby_MapWarps: @ 853178C +LilycoveCity_ContestLobby_MapWarps: warp_def 14, 11, 0, 4, MAP_LILYCOVE_CITY warp_def 15, 11, 0, 4, MAP_LILYCOVE_CITY warp_def 9, 1, 0, 0, MAP_LILYCOVE_CITY_CONTEST_HALL warp_def 21, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL -LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC +LilycoveCity_ContestLobby_MapBGEvents: bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_PblockLink bg_event 23, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293E1E bg_event 23, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A753 @@ -45,6 +45,6 @@ LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC bg_event 27, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293D4D bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A784 -LilycoveCity_ContestLobby_MapEvents:: @ 853183C +LilycoveCity_ContestLobby_MapEvents:: map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index 605d594d3c..d00e7190d6 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_ContestLobby: @ 84836A8 +LilycoveCity_ContestLobby: .4byte LilycoveCity_ContestLobby_Layout .4byte LilycoveCity_ContestLobby_MapEvents .4byte LilycoveCity_ContestLobby_MapScripts .4byte 0x0 .2byte MUS_CONLOBBY - .2byte 105 + .2byte LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc index 66fd112c4e..e769c3c9f1 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc @@ -1,14 +1,14 @@ -LilycoveCity_CoveLilyMotel_1F_EventObjects: @ 8531134 +LilycoveCity_CoveLilyMotel_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0 -LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C +LilycoveCity_CoveLilyMotel_1F_MapWarps: warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY warp_def 6, 8, 0, 1, MAP_LILYCOVE_CITY warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F -LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: @ 8531164 +LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: coord_event 10, 2, 3, VAR_TEMP_1, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211 -LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 8531174 +LilycoveCity_CoveLilyMotel_1F_MapEvents:: map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 0322b01e1e..ab7811a465 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_CoveLilyMotel_1F: @ 8483638 +LilycoveCity_CoveLilyMotel_1F: .4byte LilycoveCity_CoveLilyMotel_1F_Layout .4byte LilycoveCity_CoveLilyMotel_1F_MapEvents .4byte LilycoveCity_CoveLilyMotel_1F_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 299 + .2byte LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc index d7e508ec6e..b7f973a847 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188 +LilycoveCity_CoveLilyMotel_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS @@ -7,9 +7,9 @@ LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188 object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, FLAG_HIDE_LILCOVE_MOTEL_SCOTT -LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230 +LilycoveCity_CoveLilyMotel_2F_MapWarps: warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F -LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8531238 +LilycoveCity_CoveLilyMotel_2F_MapEvents:: map_events LilycoveCity_CoveLilyMotel_2F_EventObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index 92ccdc1b3b..769cd8b0dc 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_CoveLilyMotel_2F: @ 8483654 +LilycoveCity_CoveLilyMotel_2F: .4byte LilycoveCity_CoveLilyMotel_2F_Layout .4byte LilycoveCity_CoveLilyMotel_2F_MapEvents .4byte LilycoveCity_CoveLilyMotel_2F_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 300 + .2byte LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc index adafc5b61e..307cb2d58d 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStoreElevator_EventObjects: @ 85324B0 +LilycoveCity_DepartmentStoreElevator_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0 -LilycoveCity_DepartmentStoreElevator_MapWarps: @ 85324C8 +LilycoveCity_DepartmentStoreElevator_MapWarps: warp_def 1, 5, 3, 127, MAP_NONE warp_def 2, 5, 3, 127, MAP_NONE -LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 85324D8 +LilycoveCity_DepartmentStoreElevator_MapEvents:: map_events LilycoveCity_DepartmentStoreElevator_EventObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index eb728241b0..8576dcbf29 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStoreElevator: @ 84838A0 +LilycoveCity_DepartmentStoreElevator: .4byte LilycoveCity_DepartmentStoreElevator_Layout .4byte LilycoveCity_DepartmentStoreElevator_MapEvents .4byte LilycoveCity_DepartmentStoreElevator_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 273 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc index 594a439ce8..c44562b060 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc @@ -1,16 +1,16 @@ -LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C +LilycoveCity_DepartmentStoreRooftop_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0 object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0 -LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C +LilycoveCity_DepartmentStoreRooftop_MapWarps: warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F -LilycoveCity_DepartmentStoreRooftop_MapBGEvents: @ 8532484 +LilycoveCity_DepartmentStoreRooftop_MapBGEvents: bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 -LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 853249C +LilycoveCity_DepartmentStoreRooftop_MapEvents:: map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 73ba491c32..775260145a 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStoreRooftop: @ 8483884 +LilycoveCity_DepartmentStoreRooftop: .4byte LilycoveCity_DepartmentStoreRooftop_Layout .4byte LilycoveCity_DepartmentStoreRooftop_MapEvents .4byte LilycoveCity_DepartmentStoreRooftop_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 262 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc index dfd7cc46dd..12d4726fbe 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_DepartmentStore_1F_EventObjects: @ 853208C +LilycoveCity_DepartmentStore_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0 object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0 @@ -6,15 +6,15 @@ LilycoveCity_DepartmentStore_1F_EventObjects: @ 853208C object_event 5, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0 object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0 -LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C +LilycoveCity_DepartmentStore_1F_MapWarps: warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY warp_def 9, 7, 0, 0, MAP_LILYCOVE_CITY warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR -LilycoveCity_DepartmentStore_1F_MapBGEvents: @ 853213C +LilycoveCity_DepartmentStore_1F_MapBGEvents: bg_event 0, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_DepartmentStore_1F_EventScript_21F85D -LilycoveCity_DepartmentStore_1F_MapEvents:: @ 8532148 +LilycoveCity_DepartmentStore_1F_MapEvents:: map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index 949b23403b..27ae23d5f5 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStore_1F: @ 84837F8 +LilycoveCity_DepartmentStore_1F: .4byte LilycoveCity_DepartmentStore_1F_Layout .4byte LilycoveCity_DepartmentStore_1F_MapEvents .4byte LilycoveCity_DepartmentStore_1F_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 257 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc index 9e7d5514ea..4854c51e96 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc @@ -1,15 +1,15 @@ -LilycoveCity_DepartmentStore_2F_EventObjects: @ 853215C +LilycoveCity_DepartmentStore_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0 object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0 -LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4 +LilycoveCity_DepartmentStore_2F_MapWarps: warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR -LilycoveCity_DepartmentStore_2F_MapEvents:: @ 85321EC +LilycoveCity_DepartmentStore_2F_MapEvents:: map_events LilycoveCity_DepartmentStore_2F_EventObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index 01f94ac14e..62f5dcab3c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStore_2F: @ 8483814 +LilycoveCity_DepartmentStore_2F: .4byte LilycoveCity_DepartmentStore_2F_Layout .4byte LilycoveCity_DepartmentStore_2F_MapEvents .4byte LilycoveCity_DepartmentStore_2F_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 258 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc index 84796fad41..2eed8c39fb 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc @@ -1,15 +1,15 @@ -LilycoveCity_DepartmentStore_3F_EventObjects: @ 8532200 +LilycoveCity_DepartmentStore_3F_EventObjects: object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0 -LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278 +LilycoveCity_DepartmentStore_3F_MapWarps: warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR -LilycoveCity_DepartmentStore_3F_MapEvents:: @ 8532290 +LilycoveCity_DepartmentStore_3F_MapEvents:: map_events LilycoveCity_DepartmentStore_3F_EventObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index bc62df7d66..624671aea3 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStore_3F: @ 8483830 +LilycoveCity_DepartmentStore_3F: .4byte LilycoveCity_DepartmentStore_3F_Layout .4byte LilycoveCity_DepartmentStore_3F_MapEvents .4byte LilycoveCity_DepartmentStore_3F_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 259 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc index 7b39c9194c..77df01a38d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc @@ -1,15 +1,15 @@ -LilycoveCity_DepartmentStore_4F_EventObjects: @ 85322A4 +LilycoveCity_DepartmentStore_4F_EventObjects: object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0 object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0 -LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C +LilycoveCity_DepartmentStore_4F_MapWarps: warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR -LilycoveCity_DepartmentStore_4F_MapEvents:: @ 8532334 +LilycoveCity_DepartmentStore_4F_MapEvents:: map_events LilycoveCity_DepartmentStore_4F_EventObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index 94a8d29c64..df74e3c2f8 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStore_4F: @ 848384C +LilycoveCity_DepartmentStore_4F: .4byte LilycoveCity_DepartmentStore_4F_Layout .4byte LilycoveCity_DepartmentStore_4F_MapEvents .4byte LilycoveCity_DepartmentStore_4F_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 260 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc index 2118c33e81..d4492d7e98 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_DepartmentStore_5F_EventObjects: @ 8532348 +LilycoveCity_DepartmentStore_5F_EventObjects: object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0 @@ -7,11 +7,11 @@ LilycoveCity_DepartmentStore_5F_EventObjects: @ 8532348 object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 17, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0 object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0 -LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0 +LilycoveCity_DepartmentStore_5F_MapWarps: warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP -LilycoveCity_DepartmentStore_5F_MapEvents:: @ 8532408 +LilycoveCity_DepartmentStore_5F_MapEvents:: map_events LilycoveCity_DepartmentStore_5F_EventObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index 6c8070d803..938cfc7b8f 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStore_5F: @ 8483868 +LilycoveCity_DepartmentStore_5F: .4byte LilycoveCity_DepartmentStore_5F_Layout .4byte LilycoveCity_DepartmentStore_5F_MapEvents .4byte LilycoveCity_DepartmentStore_5F_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 261 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_Harbor/events.inc b/data/maps/LilycoveCity_Harbor/events.inc index 4f69e4fc6b..ad43f2bf1d 100644 --- a/data/maps/LilycoveCity_Harbor/events.inc +++ b/data/maps/LilycoveCity_Harbor/events.inc @@ -1,14 +1,14 @@ -LilycoveCity_Harbor_EventObjects: @ 8531E1C +LilycoveCity_Harbor_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0 object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER -LilycoveCity_Harbor_MapWarps: @ 8531E94 +LilycoveCity_Harbor_MapWarps: warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY warp_def 12, 14, 0, 12, MAP_LILYCOVE_CITY -LilycoveCity_Harbor_MapEvents:: @ 8531EA4 +LilycoveCity_Harbor_MapEvents:: map_events LilycoveCity_Harbor_EventObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index e818c894fa..b332f5df72 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_Harbor: @ 8483750 +LilycoveCity_Harbor: .4byte Harbor_Layout .4byte LilycoveCity_Harbor_MapEvents .4byte LilycoveCity_Harbor_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 88 + .2byte LAYOUT_HARBOR .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_House1/events.inc b/data/maps/LilycoveCity_House1/events.inc index 392336e022..31515dae93 100644 --- a/data/maps/LilycoveCity_House1/events.inc +++ b/data/maps/LilycoveCity_House1/events.inc @@ -1,11 +1,11 @@ -LilycoveCity_House1_EventObjects: @ 8531EF4 +LilycoveCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0 object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0 -LilycoveCity_House1_MapWarps: @ 8531F24 +LilycoveCity_House1_MapWarps: warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY warp_def 4, 8, 0, 8, MAP_LILYCOVE_CITY -LilycoveCity_House1_MapEvents:: @ 8531F34 +LilycoveCity_House1_MapEvents:: map_events LilycoveCity_House1_EventObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index ecae303728..68da92f8a0 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_House1: @ 8483788 +LilycoveCity_House1: .4byte House1_Layout .4byte LilycoveCity_House1_MapEvents .4byte LilycoveCity_House1_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_House2/events.inc b/data/maps/LilycoveCity_House2/events.inc index e4839eb5c5..e7c1b3cd7c 100644 --- a/data/maps/LilycoveCity_House2/events.inc +++ b/data/maps/LilycoveCity_House2/events.inc @@ -1,10 +1,10 @@ -LilycoveCity_House2_EventObjects: @ 8531F48 +LilycoveCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0 -LilycoveCity_House2_MapWarps: @ 8531F60 +LilycoveCity_House2_MapWarps: warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY warp_def 3, 7, 0, 9, MAP_LILYCOVE_CITY -LilycoveCity_House2_MapEvents:: @ 8531F70 +LilycoveCity_House2_MapEvents:: map_events LilycoveCity_House2_EventObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index f3b0098808..93ff11013c 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_House2: @ 84837A4 +LilycoveCity_House2: .4byte LilycoveCity_House2_Layout .4byte LilycoveCity_House2_MapEvents .4byte LilycoveCity_House2_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 74 + .2byte LAYOUT_LILYCOVE_CITY_HOUSE2 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_House3/events.inc b/data/maps/LilycoveCity_House3/events.inc index 363e62132c..4e577400b7 100644 --- a/data/maps/LilycoveCity_House3/events.inc +++ b/data/maps/LilycoveCity_House3/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_House3_EventObjects: @ 8531F84 +LilycoveCity_House3_EventObjects: object_event 1, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0 object_event 3, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0 @@ -6,10 +6,10 @@ LilycoveCity_House3_EventObjects: @ 8531F84 object_event 5, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0 object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0 -LilycoveCity_House3_MapWarps: @ 8532014 +LilycoveCity_House3_MapWarps: warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY warp_def 4, 7, 0, 10, MAP_LILYCOVE_CITY -LilycoveCity_House3_MapEvents:: @ 8532024 +LilycoveCity_House3_MapEvents:: map_events LilycoveCity_House3_EventObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index 9126bb8fc5..3788a2ee9c 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_House3: @ 84837C0 +LilycoveCity_House3: .4byte House2_Layout .4byte LilycoveCity_House3_MapEvents .4byte LilycoveCity_House3_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_House4/events.inc b/data/maps/LilycoveCity_House4/events.inc index d14a5c82b9..aa586c64fe 100644 --- a/data/maps/LilycoveCity_House4/events.inc +++ b/data/maps/LilycoveCity_House4/events.inc @@ -1,11 +1,11 @@ -LilycoveCity_House4_EventObjects: @ 8532038 +LilycoveCity_House4_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0 -LilycoveCity_House4_MapWarps: @ 8532068 +LilycoveCity_House4_MapWarps: warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY warp_def 4, 8, 0, 11, MAP_LILYCOVE_CITY -LilycoveCity_House4_MapEvents:: @ 8532078 +LilycoveCity_House4_MapEvents:: map_events LilycoveCity_House4_EventObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index 6ddb9a5f72..b0ee0ed360 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_House4: @ 84837DC +LilycoveCity_House4: .4byte House1_Layout .4byte LilycoveCity_House4_MapEvents .4byte LilycoveCity_House4_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc index 52f7a2f9ed..a41748c694 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C +LilycoveCity_LilycoveMuseum_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0 @@ -10,12 +10,12 @@ LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 -LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C +LilycoveCity_LilycoveMuseum_1F_MapWarps: warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY warp_def 10, 13, 0, 13, MAP_LILYCOVE_CITY warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F -LilycoveCity_LilycoveMuseum_1F_MapBGEvents: @ 8531354 +LilycoveCity_LilycoveMuseum_1F_MapBGEvents: bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1 @@ -33,6 +33,6 @@ LilycoveCity_LilycoveMuseum_1F_MapBGEvents: @ 8531354 bg_event 18, 11, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3 bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC -LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 8531414 +LilycoveCity_LilycoveMuseum_1F_MapEvents:: map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index b0aef9efae..7a50114fa0 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_LilycoveMuseum_1F: @ 8483670 +LilycoveCity_LilycoveMuseum_1F: .4byte LilycoveCity_LilycoveMuseum_1F_Layout .4byte LilycoveCity_LilycoveMuseum_1F_MapEvents .4byte LilycoveCity_LilycoveMuseum_1F_MapScripts .4byte 0x0 .2byte MUS_BIJYUTU - .2byte 103 + .2byte LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc index ecae340c0f..f6969462c4 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc @@ -1,13 +1,13 @@ -LilycoveCity_LilycoveMuseum_2F_EventObjects: @ 8531428 +LilycoveCity_LilycoveMuseum_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0 object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS -LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488 +LilycoveCity_LilycoveMuseum_2F_MapWarps: warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F -LilycoveCity_LilycoveMuseum_2F_MapBGEvents: @ 8531490 +LilycoveCity_LilycoveMuseum_2F_MapBGEvents: bg_event 14, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E @@ -21,6 +21,6 @@ LilycoveCity_LilycoveMuseum_2F_MapBGEvents: @ 8531490 bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA bg_event 15, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA -LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8531520 +LilycoveCity_LilycoveMuseum_2F_MapEvents:: map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index c58b692257..f1ba72c036 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_LilycoveMuseum_2F: @ 848368C +LilycoveCity_LilycoveMuseum_2F: .4byte LilycoveCity_LilycoveMuseum_2F_Layout .4byte LilycoveCity_LilycoveMuseum_2F_MapEvents .4byte LilycoveCity_LilycoveMuseum_2F_MapScripts .4byte 0x0 .2byte MUS_BIJYUTU - .2byte 104 + .2byte LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc index 100ee364cb..8a606ce7e0 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc @@ -1,10 +1,10 @@ -LilycoveCity_MoveDeletersHouse_EventObjects: @ 8531EB8 +LilycoveCity_MoveDeletersHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0 -LilycoveCity_MoveDeletersHouse_MapWarps: @ 8531ED0 +LilycoveCity_MoveDeletersHouse_MapWarps: warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY warp_def 4, 7, 0, 7, MAP_LILYCOVE_CITY -LilycoveCity_MoveDeletersHouse_MapEvents:: @ 8531EE0 +LilycoveCity_MoveDeletersHouse_MapEvents:: map_events LilycoveCity_MoveDeletersHouse_EventObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index cdd8668ad9..46a0f964eb 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_MoveDeletersHouse: @ 848376C +LilycoveCity_MoveDeletersHouse: .4byte House2_Layout .4byte LilycoveCity_MoveDeletersHouse_MapEvents .4byte LilycoveCity_MoveDeletersHouse_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc index 26b6955c0a..5a46fe756d 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc @@ -1,15 +1,15 @@ -LilycoveCity_PokemonCenter_1F_EventObjects: @ 8531BCC +LilycoveCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0 object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0 object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0 object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0 object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY -LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44 +LilycoveCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY warp_def 6, 8, 3, 2, MAP_LILYCOVE_CITY warp_def 1, 6, 4, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_2F -LilycoveCity_PokemonCenter_1F_MapEvents:: @ 8531C5C +LilycoveCity_PokemonCenter_1F_MapEvents:: map_events LilycoveCity_PokemonCenter_1F_EventObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index bcca0354dd..e264b0955f 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_PokemonCenter_1F: @ 84836E0 +LilycoveCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte LilycoveCity_PokemonCenter_1F_MapEvents .4byte LilycoveCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc index 1a7e9a6a2a..accbba24d8 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -LilycoveCity_PokemonCenter_2F_EventObjects: @ 8531C70 +LilycoveCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0 +LilycoveCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8531CE8 +LilycoveCity_PokemonCenter_2F_MapEvents:: map_events LilycoveCity_PokemonCenter_2F_EventObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index 26c0789d63..bd96ad98ba 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_PokemonCenter_2F: @ 84836FC +LilycoveCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte LilycoveCity_PokemonCenter_2F_MapEvents .4byte LilycoveCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc index 3d08ce647e..f5755f50f5 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20 +LilycoveCity_PokemonTrainerFanClub_EventObjects: object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0 @@ -9,10 +9,10 @@ LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20 object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, FLAG_HIDE_FANCLUB_OLD_LADY object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER -LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8 +LilycoveCity_PokemonTrainerFanClub_MapWarps: warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY warp_def 5, 13, 0, 5, MAP_LILYCOVE_CITY -LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8531E08 +LilycoveCity_PokemonTrainerFanClub_MapEvents:: map_events LilycoveCity_PokemonTrainerFanClub_EventObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index aba9dcb3cf..61f306b69e 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_PokemonTrainerFanClub: @ 8483734 +LilycoveCity_PokemonTrainerFanClub: .4byte LilycoveCity_PokemonTrainerFanClub_Layout .4byte LilycoveCity_PokemonTrainerFanClub_MapEvents .4byte LilycoveCity_PokemonTrainerFanClub_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 107 + .2byte LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_UnusedMart/events.inc b/data/maps/LilycoveCity_UnusedMart/events.inc index 0481a1c0b3..5a4eeaac9e 100644 --- a/data/maps/LilycoveCity_UnusedMart/events.inc +++ b/data/maps/LilycoveCity_UnusedMart/events.inc @@ -1,7 +1,7 @@ -LilycoveCity_UnusedMart_MapWarps: @ 8531CFC +LilycoveCity_UnusedMart_MapWarps: warp_def 3, 7, 0, 0, MAP_LILYCOVE_CITY warp_def 4, 7, 0, 0, MAP_LILYCOVE_CITY -LilycoveCity_UnusedMart_MapEvents:: @ 8531D0C +LilycoveCity_UnusedMart_MapEvents:: map_events 0x0, LilycoveCity_UnusedMart_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index f1cbaf5508..1885305313 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_UnusedMart: @ 8483718 +LilycoveCity_UnusedMart: .4byte Mart_Layout .4byte LilycoveCity_UnusedMart_MapEvents .4byte LilycoveCity_UnusedMart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc index 7b6b875c28..d8a0e93d37 100644 --- a/data/maps/LinkContestRoom1/events.inc +++ b/data/maps/LinkContestRoom1/events.inc @@ -1,4 +1,4 @@ -LinkContestRoom1_EventObjects: @ 8539EFC +LinkContestRoom1_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 @@ -15,5 +15,6 @@ LinkContestRoom1_EventObjects: @ 8539EFC object_event 14, EVENT_OBJ_GFX_VAR_3, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 -LinkContestRoom1_MapEvents:: @ 853A064 +LinkContestRoom1_MapEvents:: map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index 2465a86804..24a33fdfc9 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -1,10 +1,10 @@ -LinkContestRoom1: @ 8484DA0 +LinkContestRoom1: .4byte LinkContestRoom1_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 - .2byte 225 + .2byte LAYOUT_LINK_CONTEST_ROOM1 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index e37d65f86f..50d0a74255 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -1,10 +1,10 @@ -LinkContestRoom2: @ 8484E64 +LinkContestRoom2: .4byte LinkContestRoom2_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 - .2byte 232 + .2byte LAYOUT_LINK_CONTEST_ROOM2 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 90333ebd98..06f9ffd19b 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -1,10 +1,10 @@ -LinkContestRoom3: @ 8484E80 +LinkContestRoom3: .4byte LinkContestRoom3_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 - .2byte 233 + .2byte LAYOUT_LINK_CONTEST_ROOM3 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 781ebed0f9..eba4cb0bd0 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -1,10 +1,10 @@ -LinkContestRoom4: @ 8484E9C +LinkContestRoom4: .4byte LinkContestRoom4_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 - .2byte 234 + .2byte LAYOUT_LINK_CONTEST_ROOM4 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index 87253d0d6b..12ec2d40d7 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -1,10 +1,10 @@ -LinkContestRoom5: @ 8484EB8 +LinkContestRoom5: .4byte LinkContestRoom5_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 - .2byte 235 + .2byte LAYOUT_LINK_CONTEST_ROOM5 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index ade67e7e71..77f1c14c71 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -1,10 +1,10 @@ -LinkContestRoom6: @ 8484ED4 +LinkContestRoom6: .4byte LinkContestRoom6_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 - .2byte 236 + .2byte LAYOUT_LINK_CONTEST_ROOM6 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LittlerootTown/connections.inc b/data/maps/LittlerootTown/connections.inc index 0fed8d8e1c..bfd3b0ab78 100644 --- a/data/maps/LittlerootTown/connections.inc +++ b/data/maps/LittlerootTown/connections.inc @@ -1,7 +1,7 @@ -LittlerootTown_MapConnectionsList: @ 8486600 +LittlerootTown_MapConnectionsList: connection up, 0, MAP_ROUTE101 -LittlerootTown_MapConnections: @ 848660C - .4byte 0x1 +LittlerootTown_MapConnections: + .4byte 1 .4byte LittlerootTown_MapConnectionsList diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc index fc151a2205..3d81193b09 100644 --- a/data/maps/LittlerootTown/events.inc +++ b/data/maps/LittlerootTown/events.inc @@ -1,4 +1,4 @@ -LittlerootTown_EventObjects: @ 85276A8 +LittlerootTown_EventObjects: object_event 1, EVENT_OBJ_GFX_TWIN, 0, 16, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, LittlerootTown_EventScript_1E8034, 0 object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E8022, FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E802B, 0 @@ -8,12 +8,12 @@ LittlerootTown_EventObjects: @ 85276A8 object_event 7, EVENT_OBJ_GFX_VAR_0, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_RIVAL object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BIRCH -LittlerootTown_MapWarps: @ 8527768 +LittlerootTown_MapWarps: warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F warp_def 5, 8, 0, 1, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB -LittlerootTown_MapCoordEvents: @ 8527780 +LittlerootTown_MapCoordEvents: coord_event 10, 1, 3, VAR_0x4050, 0, LittlerootTown_EventScript_1E8091 coord_event 11, 1, 3, VAR_0x4050, 0, LittlerootTown_EventScript_1E80EF coord_event 11, 1, 3, VAR_0x4050, 1, LittlerootTown_EventScript_1E811F @@ -24,12 +24,12 @@ LittlerootTown_MapCoordEvents: @ 8527780 coord_event 10, 2, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81BB coord_event 11, 2, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81CE -LittlerootTown_MapBGEvents: @ 8527810 +LittlerootTown_MapBGEvents: bg_event 15, 13, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E8151 bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E815A bg_event 7, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E8163 bg_event 12, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E818F -LittlerootTown_MapEvents:: @ 8527840 +LittlerootTown_MapEvents:: map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index a94244f95e..c1565535c3 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -1,10 +1,10 @@ -LittlerootTown: @ 84825B4 +LittlerootTown: .4byte LittlerootTown_Layout .4byte LittlerootTown_MapEvents .4byte LittlerootTown_MapScripts .4byte LittlerootTown_MapConnections .2byte MUS_MISHIRO - .2byte 10 + .2byte LAYOUT_LITTLEROOT_TOWN .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc index 6f327d3305..ad4d1a4a67 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc @@ -1,4 +1,4 @@ -LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C +LittlerootTown_BrendansHouse_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM object_event 2, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 1, 3, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 object_event 3, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 4, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 @@ -7,17 +7,17 @@ LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN -LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134 +LittlerootTown_BrendansHouse_1F_MapWarps: warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN warp_def 8, 8, 0, 1, MAP_LITTLEROOT_TOWN warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F -LittlerootTown_BrendansHouse_1F_MapCoordEvents: @ 852D14C +LittlerootTown_BrendansHouse_1F_MapCoordEvents: coord_event 8, 8, 0, VAR_0x4092, 4, LittlerootTown_BrendansHouse_1F_EventScript_1F78A3 coord_event 7, 3, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78BE coord_event 8, 4, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78CA coord_event 9, 3, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78D6 -LittlerootTown_BrendansHouse_1F_MapEvents:: @ 852D18C +LittlerootTown_BrendansHouse_1F_MapEvents:: map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index edae81a87e..44b861056a 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -1,10 +1,10 @@ -LittlerootTown_BrendansHouse_1F: @ 8482AF4 +LittlerootTown_BrendansHouse_1F: .4byte LittlerootTown_BrendansHouse_1F_Layout .4byte LittlerootTown_BrendansHouse_1F_MapEvents .4byte LittlerootTown_BrendansHouse_1F_MapScripts .4byte 0x0 .2byte MUS_MISHIRO - .2byte 54 + .2byte LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc index 46a4fcfc22..29dddeb6a4 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc @@ -1,4 +1,4 @@ -LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0 +LittlerootTown_BrendansHouse_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -16,15 +16,15 @@ LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0 object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL -LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320 +LittlerootTown_BrendansHouse_2F_MapWarps: warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F -LittlerootTown_BrendansHouse_2F_MapBGEvents: @ 852D328 +LittlerootTown_BrendansHouse_2F_MapBGEvents: bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, EventScript_PlayerPCMale bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F8656 bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_292781 bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F865F -LittlerootTown_BrendansHouse_2F_MapEvents:: @ 852D358 +LittlerootTown_BrendansHouse_2F_MapEvents:: map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index 4c9e566d0f..5bf1113dd4 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -1,10 +1,10 @@ -LittlerootTown_BrendansHouse_2F: @ 8482B10 +LittlerootTown_BrendansHouse_2F: .4byte LittlerootTown_BrendansHouse_2F_Layout .4byte LittlerootTown_BrendansHouse_2F_MapEvents .4byte LittlerootTown_BrendansHouse_2F_MapScripts .4byte 0x0 .2byte MUS_MISHIRO - .2byte 55 + .2byte LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc index 3075945f1e..890a6a6240 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc @@ -1,4 +1,4 @@ -LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C +LittlerootTown_MaysHouse_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM object_event 2, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 6, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 object_event 3, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 9, 3, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 @@ -7,17 +7,17 @@ LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN -LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414 +LittlerootTown_MaysHouse_1F_MapWarps: warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN warp_def 2, 8, 0, 0, MAP_LITTLEROOT_TOWN warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F -LittlerootTown_MaysHouse_1F_MapCoordEvents: @ 852D42C +LittlerootTown_MaysHouse_1F_MapCoordEvents: coord_event 2, 8, 0, VAR_0x4092, 4, LittlerootTown_MaysHouse_1F_EventScript_1F8A4C coord_event 1, 3, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A67 coord_event 2, 4, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A73 coord_event 3, 3, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A7F -LittlerootTown_MaysHouse_1F_MapEvents:: @ 852D46C +LittlerootTown_MaysHouse_1F_MapEvents:: map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 768c7d1b43..9ab1d2f8b0 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -1,10 +1,10 @@ -LittlerootTown_MaysHouse_1F: @ 8482B2C +LittlerootTown_MaysHouse_1F: .4byte LittlerootTown_MaysHouse_1F_Layout .4byte LittlerootTown_MaysHouse_1F_MapEvents .4byte LittlerootTown_MaysHouse_1F_MapScripts .4byte 0x0 .2byte MUS_MISHIRO - .2byte 56 + .2byte LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc index 8f4c74737d..b845971ece 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc @@ -1,4 +1,4 @@ -LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480 +LittlerootTown_MaysHouse_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -16,15 +16,15 @@ LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480 object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL -LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600 +LittlerootTown_MaysHouse_2F_MapWarps: warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F -LittlerootTown_MaysHouse_2F_MapBGEvents: @ 852D608 +LittlerootTown_MaysHouse_2F_MapBGEvents: bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F865F bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F8656 bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_29278D bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_PlayerPCFemale -LittlerootTown_MaysHouse_2F_MapEvents:: @ 852D638 +LittlerootTown_MaysHouse_2F_MapEvents:: map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index 8729bedeb3..d68d04d0d9 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -1,10 +1,10 @@ -LittlerootTown_MaysHouse_2F: @ 8482B48 +LittlerootTown_MaysHouse_2F: .4byte LittlerootTown_MaysHouse_2F_Layout .4byte LittlerootTown_MaysHouse_2F_MapEvents .4byte LittlerootTown_MaysHouse_2F_MapScripts .4byte 0x0 .2byte MUS_MISHIRO - .2byte 57 + .2byte LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc index 7ab449ecda..94baaed20f 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc @@ -1,4 +1,4 @@ -LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C +LittlerootTown_ProfessorBirchsLab_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0 object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL @@ -6,11 +6,11 @@ LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA -LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC +LittlerootTown_ProfessorBirchsLab_MapWarps: warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN -LittlerootTown_ProfessorBirchsLab_MapBGEvents: @ 852D6EC +LittlerootTown_ProfessorBirchsLab_MapBGEvents: bg_event 10, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD @@ -27,6 +27,6 @@ LittlerootTown_ProfessorBirchsLab_MapBGEvents: @ 852D6EC bg_event 11, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB -LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 852D7A0 +LittlerootTown_ProfessorBirchsLab_MapEvents:: map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 49ab947271..3cbfbdca73 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -1,10 +1,10 @@ -LittlerootTown_ProfessorBirchsLab: @ 8482B64 +LittlerootTown_ProfessorBirchsLab: .4byte LittlerootTown_ProfessorBirchsLab_Layout .4byte LittlerootTown_ProfessorBirchsLab_MapEvents .4byte LittlerootTown_ProfessorBirchsLab_MapScripts .4byte 0x0 .2byte MUS_ODAMAKI - .2byte 58 + .2byte LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc index fd82f78e0e..4ee4905b6f 100644 --- a/data/maps/MagmaHideout_1F/events.inc +++ b/data/maps/MagmaHideout_1F/events.inc @@ -1,4 +1,4 @@ -MagmaHideout_1F_EventObjects: @ 85371CC +MagmaHideout_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_1F_EventScript_23988C, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_1F_EventScript_2398A3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS @@ -6,12 +6,12 @@ MagmaHideout_1F_EventObjects: @ 85371CC object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_12 object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_13 -MagmaHideout_1F_MapWarps: @ 853725C +MagmaHideout_1F_MapWarps: warp_def 10, 34, 3, 4, MAP_JAGGED_PASS warp_def 25, 34, 3, 1, MAP_MAGMA_HIDEOUT_2F_1R warp_def 31, 3, 0, 1, MAP_MAGMA_HIDEOUT_2F_2R warp_def 20, 22, 0, 0, MAP_MAGMA_HIDEOUT_2F_3R -MagmaHideout_1F_MapEvents:: @ 853727C +MagmaHideout_1F_MapEvents:: map_events MagmaHideout_1F_EventObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index 897f4f4fdf..2f509f088d 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_1F: @ 8484828 +MagmaHideout_1F: .4byte MagmaHideout_1F_Layout .4byte MagmaHideout_1F_MapEvents .4byte MagmaHideout_1F_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 336 + .2byte LAYOUT_MAGMA_HIDEOUT_1F .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_2F_1R/events.inc b/data/maps/MagmaHideout_2F_1R/events.inc index d808492315..e88bde8849 100644 --- a/data/maps/MagmaHideout_2F_1R/events.inc +++ b/data/maps/MagmaHideout_2F_1R/events.inc @@ -1,14 +1,14 @@ -MagmaHideout_2F_1R_EventObjects: @ 8537290 +MagmaHideout_2F_1R_EventObjects: object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 18, 19, 3, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 5, 4, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 14, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 7, 6, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS -MagmaHideout_2F_1R_MapWarps: @ 85372F0 +MagmaHideout_2F_1R_MapWarps: warp_def 11, 23, 0, 0, MAP_MAGMA_HIDEOUT_2F_2R warp_def 8, 2, 0, 1, MAP_MAGMA_HIDEOUT_1F warp_def 17, 33, 3, 2, MAP_MAGMA_HIDEOUT_3F_1R -MagmaHideout_2F_1R_MapEvents:: @ 8537308 +MagmaHideout_2F_1R_MapEvents:: map_events MagmaHideout_2F_1R_EventObjects, MagmaHideout_2F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc index cafe144d8d..29de6cac75 100644 --- a/data/maps/MagmaHideout_2F_1R/header.inc +++ b/data/maps/MagmaHideout_2F_1R/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_2F_1R: @ 8484844 +MagmaHideout_2F_1R: .4byte MagmaHideout_2F_1R_Layout .4byte MagmaHideout_2F_1R_MapEvents .4byte MagmaHideout_2F_1R_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 337 + .2byte LAYOUT_MAGMA_HIDEOUT_2F_1R .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_2F_2R/events.inc b/data/maps/MagmaHideout_2F_2R/events.inc index 8bc61def7f..70b234139d 100644 --- a/data/maps/MagmaHideout_2F_2R/events.inc +++ b/data/maps/MagmaHideout_2F_2R/events.inc @@ -1,4 +1,4 @@ -MagmaHideout_2F_2R_EventObjects: @ 853731C +MagmaHideout_2F_2R_EventObjects: object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 21, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR @@ -6,10 +6,10 @@ MagmaHideout_2F_2R_EventObjects: @ 853731C object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE -MagmaHideout_2F_2R_MapWarps: @ 85373AC +MagmaHideout_2F_2R_MapWarps: warp_def 10, 22, 3, 0, MAP_MAGMA_HIDEOUT_2F_1R warp_def 36, 4, 0, 2, MAP_MAGMA_HIDEOUT_1F -MagmaHideout_2F_2R_MapEvents:: @ 85373BC +MagmaHideout_2F_2R_MapEvents:: map_events MagmaHideout_2F_2R_EventObjects, MagmaHideout_2F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc index 1493ae0769..4606ef07b5 100644 --- a/data/maps/MagmaHideout_2F_2R/header.inc +++ b/data/maps/MagmaHideout_2F_2R/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_2F_2R: @ 8484860 +MagmaHideout_2F_2R: .4byte MagmaHideout_2F_2R_Layout .4byte MagmaHideout_2F_2R_MapEvents .4byte MagmaHideout_2F_2R_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 338 + .2byte LAYOUT_MAGMA_HIDEOUT_2F_2R .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_2F_3R/events.inc b/data/maps/MagmaHideout_2F_3R/events.inc index ca379a0c7e..5b12929d81 100644 --- a/data/maps/MagmaHideout_2F_3R/events.inc +++ b/data/maps/MagmaHideout_2F_3R/events.inc @@ -1,7 +1,7 @@ -MagmaHideout_2F_3R_MapWarps: @ 85375B0 +MagmaHideout_2F_3R_MapWarps: warp_def 16, 1, 0, 3, MAP_MAGMA_HIDEOUT_1F warp_def 16, 13, 0, 0, MAP_MAGMA_HIDEOUT_3F_3R -MagmaHideout_2F_3R_MapEvents:: @ 85375C0 +MagmaHideout_2F_3R_MapEvents:: map_events 0x0, MagmaHideout_2F_3R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc index 5e1ccdcda3..dd1d0d9e78 100644 --- a/data/maps/MagmaHideout_2F_3R/header.inc +++ b/data/maps/MagmaHideout_2F_3R/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_2F_3R: @ 84848EC +MagmaHideout_2F_3R: .4byte MagmaHideout_2F_3R_Layout .4byte MagmaHideout_2F_3R_MapEvents .4byte MagmaHideout_2F_3R_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 380 + .2byte LAYOUT_MAGMA_HIDEOUT_2F_3R .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_3F_1R/events.inc b/data/maps/MagmaHideout_3F_1R/events.inc index 1fbad5042d..166e88b275 100644 --- a/data/maps/MagmaHideout_3F_1R/events.inc +++ b/data/maps/MagmaHideout_3F_1R/events.inc @@ -1,13 +1,13 @@ -MagmaHideout_3F_1R_EventObjects: @ 85373D0 +MagmaHideout_3F_1R_EventObjects: object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 2, 7, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 21, 21, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 16, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_1R_EventScript_291505, FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET -MagmaHideout_3F_1R_MapWarps: @ 8537418 +MagmaHideout_3F_1R_MapWarps: warp_def 7, 21, 0, 0, MAP_MAGMA_HIDEOUT_4F warp_def 21, 9, 0, 0, MAP_MAGMA_HIDEOUT_3F_2R warp_def 23, 3, 0, 2, MAP_MAGMA_HIDEOUT_2F_1R -MagmaHideout_3F_1R_MapEvents:: @ 8537430 +MagmaHideout_3F_1R_MapEvents:: map_events MagmaHideout_3F_1R_EventObjects, MagmaHideout_3F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc index 492fb8a7e6..ac8d5d9b4a 100644 --- a/data/maps/MagmaHideout_3F_1R/header.inc +++ b/data/maps/MagmaHideout_3F_1R/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_3F_1R: @ 848487C +MagmaHideout_3F_1R: .4byte MagmaHideout_3F_1R_Layout .4byte MagmaHideout_3F_1R_MapEvents .4byte MagmaHideout_3F_1R_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 339 + .2byte LAYOUT_MAGMA_HIDEOUT_3F_1R .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_3F_2R/events.inc b/data/maps/MagmaHideout_3F_2R/events.inc index d00cbf423a..825e8985e9 100644 --- a/data/maps/MagmaHideout_3F_2R/events.inc +++ b/data/maps/MagmaHideout_3F_2R/events.inc @@ -1,10 +1,10 @@ -MagmaHideout_3F_2R_EventObjects: @ 8537444 +MagmaHideout_3F_2R_EventObjects: object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 3, 0, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_2R_EventScript_291512, FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX -MagmaHideout_3F_2R_MapWarps: @ 8537474 +MagmaHideout_3F_2R_MapWarps: warp_def 12, 15, 0, 1, MAP_MAGMA_HIDEOUT_3F_1R -MagmaHideout_3F_2R_MapEvents:: @ 853747C +MagmaHideout_3F_2R_MapEvents:: map_events MagmaHideout_3F_2R_EventObjects, MagmaHideout_3F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc index e1cd32f9ce..8fbb30b18a 100644 --- a/data/maps/MagmaHideout_3F_2R/header.inc +++ b/data/maps/MagmaHideout_3F_2R/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_3F_2R: @ 8484898 +MagmaHideout_3F_2R: .4byte MagmaHideout_3F_2R_Layout .4byte MagmaHideout_3F_2R_MapEvents .4byte MagmaHideout_3F_2R_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 340 + .2byte LAYOUT_MAGMA_HIDEOUT_3F_2R .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_3F_3R/events.inc b/data/maps/MagmaHideout_3F_3R/events.inc index 26ffa3dffb..d4346a1390 100644 --- a/data/maps/MagmaHideout_3F_3R/events.inc +++ b/data/maps/MagmaHideout_3F_3R/events.inc @@ -1,10 +1,10 @@ -MagmaHideout_3F_3R_EventObjects: @ 8537574 +MagmaHideout_3F_3R_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 19, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE -MagmaHideout_3F_3R_MapWarps: @ 853758C +MagmaHideout_3F_3R_MapWarps: warp_def 16, 1, 0, 1, MAP_MAGMA_HIDEOUT_2F_3R warp_def 16, 21, 0, 1, MAP_MAGMA_HIDEOUT_4F -MagmaHideout_3F_3R_MapEvents:: @ 853759C +MagmaHideout_3F_3R_MapEvents:: map_events MagmaHideout_3F_3R_EventObjects, MagmaHideout_3F_3R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc index b21df5e70d..c676fac3dd 100644 --- a/data/maps/MagmaHideout_3F_3R/header.inc +++ b/data/maps/MagmaHideout_3F_3R/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_3F_3R: @ 84848D0 +MagmaHideout_3F_3R: .4byte MagmaHideout_3F_3R_Layout .4byte MagmaHideout_3F_3R_MapEvents .4byte MagmaHideout_3F_3R_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 379 + .2byte LAYOUT_MAGMA_HIDEOUT_3F_3R .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_4F/events.inc b/data/maps/MagmaHideout_4F/events.inc index 09e0541097..2fd71b3db0 100644 --- a/data/maps/MagmaHideout_4F/events.inc +++ b/data/maps/MagmaHideout_4F/events.inc @@ -1,4 +1,4 @@ -MagmaHideout_4F_EventObjects: @ 8537490 +MagmaHideout_4F_EventObjects: object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A68C, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6A3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS @@ -8,10 +8,10 @@ MagmaHideout_4F_EventObjects: @ 8537490 object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_4F_EventScript_29151F, FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE -MagmaHideout_4F_MapWarps: @ 8537550 +MagmaHideout_4F_MapWarps: warp_def 46, 7, 0, 0, MAP_MAGMA_HIDEOUT_3F_1R warp_def 20, 21, 0, 1, MAP_MAGMA_HIDEOUT_3F_3R -MagmaHideout_4F_MapEvents:: @ 8537560 +MagmaHideout_4F_MapEvents:: map_events MagmaHideout_4F_EventObjects, MagmaHideout_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc index e10a780f7a..82a3e66bb8 100644 --- a/data/maps/MagmaHideout_4F/header.inc +++ b/data/maps/MagmaHideout_4F/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_4F: @ 84848B4 +MagmaHideout_4F: .4byte MagmaHideout_4F_Layout .4byte MagmaHideout_4F_MapEvents .4byte MagmaHideout_4F_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 341 + .2byte LAYOUT_MAGMA_HIDEOUT_4F .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MarineCave_End/events.inc b/data/maps/MarineCave_End/events.inc index 62d1cd37e4..4a97b9f15f 100644 --- a/data/maps/MarineCave_End/events.inc +++ b/data/maps/MarineCave_End/events.inc @@ -1,12 +1,12 @@ -MarineCave_End_EventObjects: @ 85377E8 +MarineCave_End_EventObjects: object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 9, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MARINE_CAVE_KYOGRE -MarineCave_End_MapWarps: @ 8537800 +MarineCave_End_MapWarps: warp_def 20, 4, 0, 0, MAP_MARINE_CAVE_ENTRANCE -MarineCave_End_MapCoordEvents: @ 8537808 +MarineCave_End_MapCoordEvents: coord_event 9, 26, 3, VAR_TEMP_1, 1, MarineCave_End_EventScript_23B01B -MarineCave_End_MapEvents:: @ 8537818 +MarineCave_End_MapEvents:: map_events MarineCave_End_EventObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0 diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc index 5a3c1106bd..e2377aa4b1 100644 --- a/data/maps/MarineCave_End/header.inc +++ b/data/maps/MarineCave_End/header.inc @@ -1,10 +1,10 @@ -MarineCave_End: @ 8484A04 +MarineCave_End: .4byte MarineCave_End_Layout .4byte MarineCave_End_MapEvents .4byte MarineCave_End_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 413 + .2byte LAYOUT_MARINE_CAVE_END .byte MAPSEC_MARINE_CAVE .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/MarineCave_Entrance/events.inc b/data/maps/MarineCave_Entrance/events.inc index 4db3e1ddcb..9e96bf2257 100644 --- a/data/maps/MarineCave_Entrance/events.inc +++ b/data/maps/MarineCave_Entrance/events.inc @@ -1,6 +1,6 @@ -MarineCave_Entrance_MapWarps: @ 85377CC +MarineCave_Entrance_MapWarps: warp_def 14, 1, 3, 0, MAP_MARINE_CAVE_END -MarineCave_Entrance_MapEvents:: @ 85377D4 +MarineCave_Entrance_MapEvents:: map_events 0x0, MarineCave_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc index 338da988ae..a1ce8ac617 100644 --- a/data/maps/MarineCave_Entrance/header.inc +++ b/data/maps/MarineCave_Entrance/header.inc @@ -1,10 +1,10 @@ -MarineCave_Entrance: @ 84849E8 +MarineCave_Entrance: .4byte MarineCave_Entrance_Layout .4byte MarineCave_Entrance_MapEvents .4byte MarineCave_Entrance_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 407 + .2byte LAYOUT_MARINE_CAVE_ENTRANCE .byte MAPSEC_MARINE_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity/connections.inc b/data/maps/MauvilleCity/connections.inc index ee1f4e72a0..97f97982c3 100644 --- a/data/maps/MauvilleCity/connections.inc +++ b/data/maps/MauvilleCity/connections.inc @@ -1,10 +1,10 @@ -MauvilleCity_MapConnectionsList: @ 8486720 +MauvilleCity_MapConnectionsList: connection up, 0, MAP_ROUTE111 connection down, 0, MAP_ROUTE110 connection left, 0, MAP_ROUTE117 connection right, 0, MAP_ROUTE118 -MauvilleCity_MapConnections: @ 8486750 - .4byte 0x4 +MauvilleCity_MapConnections: + .4byte 4 .4byte MauvilleCity_MapConnectionsList diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc index ebdc866f5d..961eb40053 100644 --- a/data/maps/MauvilleCity/events.inc +++ b/data/maps/MauvilleCity/events.inc @@ -1,4 +1,4 @@ -MauvilleCity_EventObjects: @ 852662C +MauvilleCity_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MauvilleCity_EventScript_1DF3B3, 0 object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 24, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0 object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0 @@ -11,7 +11,7 @@ MauvilleCity_EventObjects: @ 852662C object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0 object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 12, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MAUVILLE_CITY_SCOTT -MauvilleCity_MapWarps: @ 8526734 +MauvilleCity_MapWarps: warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM warp_def 22, 5, 0, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F warp_def 35, 5, 0, 0, MAP_MAUVILLE_CITY_BIKE_SHOP @@ -20,7 +20,7 @@ MauvilleCity_MapWarps: @ 8526734 warp_def 8, 13, 0, 0, MAP_MAUVILLE_CITY_GAME_CORNER warp_def 19, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE2 -MauvilleCity_MapBGEvents: @ 852676C +MauvilleCity_MapBGEvents: bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E73 bg_event 11, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3E0 bg_event 24, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E6A @@ -30,6 +30,6 @@ MauvilleCity_MapBGEvents: @ 852676C bg_event 33, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3E9 bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3F2 -MauvilleCity_MapEvents:: @ 85267CC +MauvilleCity_MapEvents:: map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index aa107e460b..566eb49e73 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -1,10 +1,10 @@ -MauvilleCity: @ 84824F0 +MauvilleCity: .4byte MauvilleCity_Layout .4byte MauvilleCity_MapEvents .4byte MauvilleCity_MapScripts .4byte MauvilleCity_MapConnections .2byte MUS_GOTOWN - .2byte 3 + .2byte LAYOUT_MAUVILLE_CITY .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc index bae1870034..ac9abae2a6 100644 --- a/data/maps/MauvilleCity_BikeShop/events.inc +++ b/data/maps/MauvilleCity_BikeShop/events.inc @@ -1,15 +1,15 @@ -MauvilleCity_BikeShop_EventObjects: @ 852FE80 +MauvilleCity_BikeShop_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0 object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0 -MauvilleCity_BikeShop_MapWarps: @ 852FEB0 +MauvilleCity_BikeShop_MapWarps: warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY -MauvilleCity_BikeShop_MapBGEvents: @ 852FEC0 +MauvilleCity_BikeShop_MapBGEvents: bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_20ED3A bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_20EDAE -MauvilleCity_BikeShop_MapEvents:: @ 852FED8 +MauvilleCity_BikeShop_MapEvents:: map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index d4434e8ba0..244439fed5 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_BikeShop: @ 8483280 +MauvilleCity_BikeShop: .4byte MauvilleCity_BikeShop_Layout .4byte MauvilleCity_BikeShop_MapEvents .4byte MauvilleCity_BikeShop_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 90 + .2byte LAYOUT_MAUVILLE_CITY_BIKE_SHOP .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc index 0fac26b5d4..c5ef3b7f6a 100644 --- a/data/maps/MauvilleCity_GameCorner/events.inc +++ b/data/maps/MauvilleCity_GameCorner/events.inc @@ -1,4 +1,4 @@ -MauvilleCity_GameCorner_EventObjects: @ 852FF28 +MauvilleCity_GameCorner_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0 object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0 @@ -12,11 +12,11 @@ MauvilleCity_GameCorner_EventObjects: @ 852FF28 object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0 object_event 12, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0 -MauvilleCity_GameCorner_MapWarps: @ 8530048 +MauvilleCity_GameCorner_MapWarps: warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY -MauvilleCity_GameCorner_MapBGEvents: @ 8530058 +MauvilleCity_GameCorner_MapBGEvents: bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2102D6 bg_event 2, 8, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2102F6 bg_event 2, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_210316 @@ -42,6 +42,6 @@ MauvilleCity_GameCorner_MapBGEvents: @ 8530058 bg_event 18, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF bg_event 19, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF -MauvilleCity_GameCorner_MapEvents:: @ 8530178 +MauvilleCity_GameCorner_MapEvents:: map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index 5c7399ae6e..f13c98c776 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_GameCorner: @ 84832B8 +MauvilleCity_GameCorner: .4byte MauvilleCity_GameCorner_Layout .4byte MauvilleCity_GameCorner_MapEvents .4byte MauvilleCity_GameCorner_MapScripts .4byte 0x0 .2byte MUS_CASINO - .2byte 91 + .2byte LAYOUT_MAUVILLE_CITY_GAME_CORNER .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc index 4a05acafb4..10c3c039d6 100644 --- a/data/maps/MauvilleCity_Gym/events.inc +++ b/data/maps/MauvilleCity_Gym/events.inc @@ -1,4 +1,4 @@ -MauvilleCity_Gym_EventObjects: @ 852FD5C +MauvilleCity_Gym_EventObjects: object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, FLAG_HIDE_MAUVILLE_GYM_WATTSON object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 16, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0 @@ -7,20 +7,20 @@ MauvilleCity_Gym_EventObjects: @ 852FD5C object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0 object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0 -MauvilleCity_Gym_MapWarps: @ 852FE04 +MauvilleCity_Gym_MapWarps: warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY -MauvilleCity_Gym_MapCoordEvents: @ 852FE14 +MauvilleCity_Gym_MapCoordEvents: coord_event 4, 12, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E01E coord_event 3, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E043 coord_event 0, 15, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20DFF9 coord_event 8, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E068 -MauvilleCity_Gym_MapBGEvents: @ 852FE54 +MauvilleCity_Gym_MapBGEvents: bg_event 3, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_20E14B bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_20E15B -MauvilleCity_Gym_MapEvents:: @ 852FE6C +MauvilleCity_Gym_MapEvents:: map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index cd38ec176e..5f9666eeba 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_Gym: @ 8483264 +MauvilleCity_Gym: .4byte MauvilleCity_Gym_Layout .4byte MauvilleCity_Gym_MapEvents .4byte MauvilleCity_Gym_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 89 + .2byte LAYOUT_MAUVILLE_CITY_GYM .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_House1/events.inc b/data/maps/MauvilleCity_House1/events.inc index 1d759b438f..19b88a97eb 100644 --- a/data/maps/MauvilleCity_House1/events.inc +++ b/data/maps/MauvilleCity_House1/events.inc @@ -1,10 +1,10 @@ -MauvilleCity_House1_EventObjects: @ 852FEEC +MauvilleCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0 -MauvilleCity_House1_MapWarps: @ 852FF04 +MauvilleCity_House1_MapWarps: warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY warp_def 4, 7, 0, 4, MAP_MAUVILLE_CITY -MauvilleCity_House1_MapEvents:: @ 852FF14 +MauvilleCity_House1_MapEvents:: map_events MauvilleCity_House1_EventObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index 261e0e45bb..c36670be5d 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_House1: @ 848329C +MauvilleCity_House1: .4byte House2_Layout .4byte MauvilleCity_House1_MapEvents .4byte MauvilleCity_House1_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_House2/events.inc b/data/maps/MauvilleCity_House2/events.inc index fae511bb33..a27fec0424 100644 --- a/data/maps/MauvilleCity_House2/events.inc +++ b/data/maps/MauvilleCity_House2/events.inc @@ -1,10 +1,10 @@ -MauvilleCity_House2_EventObjects: @ 853018C +MauvilleCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0 -MauvilleCity_House2_MapWarps: @ 85301A4 +MauvilleCity_House2_MapWarps: warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY warp_def 4, 8, 0, 6, MAP_MAUVILLE_CITY -MauvilleCity_House2_MapEvents:: @ 85301B4 +MauvilleCity_House2_MapEvents:: map_events MauvilleCity_House2_EventObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 3a584fe41c..60fc3ae22c 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_House2: @ 84832D4 +MauvilleCity_House2: .4byte House1_Layout .4byte MauvilleCity_House2_MapEvents .4byte MauvilleCity_House2_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_Mart/events.inc b/data/maps/MauvilleCity_Mart/events.inc index 0d32a0e2c1..1a5f9a3b75 100644 --- a/data/maps/MauvilleCity_Mart/events.inc +++ b/data/maps/MauvilleCity_Mart/events.inc @@ -1,12 +1,12 @@ -MauvilleCity_Mart_EventObjects: @ 8530310 +MauvilleCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0 -MauvilleCity_Mart_MapWarps: @ 8530358 +MauvilleCity_Mart_MapWarps: warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY warp_def 4, 7, 0, 3, MAP_MAUVILLE_CITY -MauvilleCity_Mart_MapEvents:: @ 8530368 +MauvilleCity_Mart_MapEvents:: map_events MauvilleCity_Mart_EventObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index b3d85a0c66..b986d7e3b5 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_Mart: @ 8483328 +MauvilleCity_Mart: .4byte Mart_Layout .4byte MauvilleCity_Mart_MapEvents .4byte MauvilleCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc index daf747e0d5..f97d611365 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc @@ -1,15 +1,15 @@ -MauvilleCity_PokemonCenter_1F_EventObjects: @ 85301C8 +MauvilleCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0 object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0 -MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240 +MauvilleCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY warp_def 6, 8, 3, 1, MAP_MAUVILLE_CITY warp_def 1, 6, 4, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_2F -MauvilleCity_PokemonCenter_1F_MapEvents:: @ 8530258 +MauvilleCity_PokemonCenter_1F_MapEvents:: map_events MauvilleCity_PokemonCenter_1F_EventObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index 207dfb5263..623cd61e6d 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_PokemonCenter_1F: @ 84832F0 +MauvilleCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte MauvilleCity_PokemonCenter_1F_MapEvents .4byte MauvilleCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc index 031dac2133..b4b2d15ba3 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc @@ -1,15 +1,15 @@ -MauvilleCity_PokemonCenter_2F_EventObjects: @ 853026C +MauvilleCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0 -MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4 +MauvilleCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -MauvilleCity_PokemonCenter_2F_MapEvents:: @ 85302FC +MauvilleCity_PokemonCenter_2F_MapEvents:: map_events MauvilleCity_PokemonCenter_2F_EventObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index 00bf23b830..bde4b43765 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_PokemonCenter_2F: @ 848330C +MauvilleCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte MauvilleCity_PokemonCenter_2F_MapEvents .4byte MauvilleCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc index 8f84327d2c..63c17fc0df 100644 --- a/data/maps/MeteorFalls_1F_1R/events.inc +++ b/data/maps/MeteorFalls_1F_1R/events.inc @@ -1,4 +1,4 @@ -MeteorFalls_1F_1R_EventObjects: @ 8533F74 +MeteorFalls_1F_1R_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL @@ -10,7 +10,7 @@ MeteorFalls_1F_1R_EventObjects: @ 8533F74 object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO -MeteorFalls_1F_1R_MapWarps: @ 8534064 +MeteorFalls_1F_1R_MapWarps: warp_def 27, 18, 4, 0, MAP_ROUTE114 warp_def 6, 39, 3, 0, MAP_ROUTE115 warp_def 10, 3, 3, 0, MAP_METEOR_FALLS_1F_2R @@ -18,12 +18,12 @@ MeteorFalls_1F_1R_MapWarps: @ 8534064 warp_def 26, 28, 3, 5, MAP_METEOR_FALLS_B1F_1R warp_def 4, 2, 0, 0, MAP_METEOR_FALLS_STEVENS_CAVE -MeteorFalls_1F_1R_MapCoordEvents: @ 8534094 +MeteorFalls_1F_1R_MapCoordEvents: coord_event 14, 18, 4, VAR_0x40BF, 0, MeteorFalls_1F_1R_EventScript_22BD5F -MeteorFalls_1F_1R_MapBGEvents: @ 85340A4 +MeteorFalls_1F_1R_MapBGEvents: bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 -MeteorFalls_1F_1R_MapEvents:: @ 85340B0 +MeteorFalls_1F_1R_MapEvents:: map_events MeteorFalls_1F_1R_EventObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index 85ba8dd6b2..5bffcd6bad 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -1,10 +1,10 @@ -MeteorFalls_1F_1R: @ 8483EC0 +MeteorFalls_1F_1R: .4byte MeteorFalls_1F_1R_Layout .4byte MeteorFalls_1F_1R_MapEvents .4byte MeteorFalls_1F_1R_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 125 + .2byte LAYOUT_METEOR_FALLS_1F_1R .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MeteorFalls_1F_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc index d9a15cbcbc..fe845ae674 100644 --- a/data/maps/MeteorFalls_1F_2R/events.inc +++ b/data/maps/MeteorFalls_1F_2R/events.inc @@ -1,17 +1,17 @@ -MeteorFalls_1F_2R_EventObjects: @ 85340C4 +MeteorFalls_1F_2R_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0 -MeteorFalls_1F_2R_MapWarps: @ 853410C +MeteorFalls_1F_2R_MapWarps: warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R warp_def 4, 14, 3, 0, MAP_METEOR_FALLS_B1F_1R warp_def 7, 20, 3, 1, MAP_METEOR_FALLS_B1F_1R warp_def 21, 23, 3, 2, MAP_METEOR_FALLS_B1F_1R -MeteorFalls_1F_2R_MapBGEvents: @ 853412C +MeteorFalls_1F_2R_MapBGEvents: bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 -MeteorFalls_1F_2R_MapEvents:: @ 8534138 +MeteorFalls_1F_2R_MapEvents:: map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index 79b56a254a..4ee1d78c96 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -1,10 +1,10 @@ -MeteorFalls_1F_2R: @ 8483EDC +MeteorFalls_1F_2R: .4byte MeteorFalls_1F_2R_Layout .4byte MeteorFalls_1F_2R_MapEvents .4byte MeteorFalls_1F_2R_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 126 + .2byte LAYOUT_METEOR_FALLS_1F_2R .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MeteorFalls_B1F_1R/events.inc b/data/maps/MeteorFalls_B1F_1R/events.inc index 039f316d97..1407f4e99a 100644 --- a/data/maps/MeteorFalls_B1F_1R/events.inc +++ b/data/maps/MeteorFalls_B1F_1R/events.inc @@ -1,4 +1,4 @@ -MeteorFalls_B1F_1R_MapWarps: @ 853414C +MeteorFalls_B1F_1R_MapWarps: warp_def 5, 6, 4, 1, MAP_METEOR_FALLS_1F_2R warp_def 7, 11, 5, 2, MAP_METEOR_FALLS_1F_2R warp_def 18, 15, 4, 3, MAP_METEOR_FALLS_1F_2R @@ -6,6 +6,6 @@ MeteorFalls_B1F_1R_MapWarps: @ 853414C warp_def 3, 23, 5, 3, MAP_METEOR_FALLS_1F_1R warp_def 20, 36, 3, 4, MAP_METEOR_FALLS_1F_1R -MeteorFalls_B1F_1R_MapEvents:: @ 853417C +MeteorFalls_B1F_1R_MapEvents:: map_events 0x0, MeteorFalls_B1F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index 0d1edf89e3..9ae4d6e684 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -1,10 +1,10 @@ -MeteorFalls_B1F_1R: @ 8483EF8 +MeteorFalls_B1F_1R: .4byte MeteorFalls_B1F_1R_Layout .4byte MeteorFalls_B1F_1R_MapEvents .4byte MeteorFalls_B1F_1R_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 127 + .2byte LAYOUT_METEOR_FALLS_B1F_1R .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MeteorFalls_B1F_2R/events.inc b/data/maps/MeteorFalls_B1F_2R/events.inc index 44b283d1e4..fb1826f6e6 100644 --- a/data/maps/MeteorFalls_B1F_2R/events.inc +++ b/data/maps/MeteorFalls_B1F_2R/events.inc @@ -1,9 +1,9 @@ -MeteorFalls_B1F_2R_EventObjects: @ 8534190 +MeteorFalls_B1F_2R_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02 -MeteorFalls_B1F_2R_MapWarps: @ 85341A8 +MeteorFalls_B1F_2R_MapWarps: warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R -MeteorFalls_B1F_2R_MapEvents:: @ 85341B0 +MeteorFalls_B1F_2R_MapEvents:: map_events MeteorFalls_B1F_2R_EventObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index ed9fe8bebb..d48c61b6d6 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -1,10 +1,10 @@ -MeteorFalls_B1F_2R: @ 8483F14 +MeteorFalls_B1F_2R: .4byte MeteorFalls_B1F_2R_Layout .4byte MeteorFalls_B1F_2R_MapEvents .4byte MeteorFalls_B1F_2R_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 128 + .2byte LAYOUT_METEOR_FALLS_B1F_2R .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MeteorFalls_StevensCave/events.inc b/data/maps/MeteorFalls_StevensCave/events.inc index 09225365d3..c9fcf8bd39 100644 --- a/data/maps/MeteorFalls_StevensCave/events.inc +++ b/data/maps/MeteorFalls_StevensCave/events.inc @@ -1,9 +1,9 @@ -MeteorFalls_StevensCave_EventObjects: @ 85378B0 +MeteorFalls_StevensCave_EventObjects: object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0 -MeteorFalls_StevensCave_MapWarps: @ 85378C8 +MeteorFalls_StevensCave_MapWarps: warp_def 10, 29, 3, 5, MAP_METEOR_FALLS_1F_1R -MeteorFalls_StevensCave_MapEvents:: @ 85378D0 +MeteorFalls_StevensCave_MapEvents:: map_events MeteorFalls_StevensCave_EventObjects, MeteorFalls_StevensCave_MapWarps, 0x0, 0x0 diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc index 28b265d446..c615b53dea 100644 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ b/data/maps/MeteorFalls_StevensCave/header.inc @@ -1,10 +1,10 @@ -MeteorFalls_StevensCave: @ 8484A74 +MeteorFalls_StevensCave: .4byte MeteorFalls_StevensCave_Layout .4byte MeteorFalls_StevensCave_MapEvents .4byte MeteorFalls_StevensCave_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 431 + .2byte LAYOUT_METEOR_FALLS_STEVENS_CAVE .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MirageTower_1F/events.inc b/data/maps/MirageTower_1F/events.inc index f35ce6d2a1..f797b84c88 100644 --- a/data/maps/MirageTower_1F/events.inc +++ b/data/maps/MirageTower_1F/events.inc @@ -1,7 +1,7 @@ -MirageTower_1F_MapWarps: @ 85375D4 +MirageTower_1F_MapWarps: warp_def 10, 14, 3, 3, MAP_ROUTE111 warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_2F -MirageTower_1F_MapEvents:: @ 85375E4 +MirageTower_1F_MapEvents:: map_events 0x0, MirageTower_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc index 59ce7edbf2..67035316ec 100644 --- a/data/maps/MirageTower_1F/header.inc +++ b/data/maps/MirageTower_1F/header.inc @@ -1,10 +1,10 @@ -MirageTower_1F: @ 8484908 +MirageTower_1F: .4byte MirageTower_1F_Layout .4byte MirageTower_1F_MapEvents .4byte MirageTower_1F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 381 + .2byte LAYOUT_MIRAGE_TOWER_1F .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MirageTower_2F/events.inc b/data/maps/MirageTower_2F/events.inc index fdbafbe068..6cbb1fb37e 100644 --- a/data/maps/MirageTower_2F/events.inc +++ b/data/maps/MirageTower_2F/events.inc @@ -1,7 +1,7 @@ -MirageTower_2F_MapWarps: @ 85375F8 +MirageTower_2F_MapWarps: warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_3F warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_1F -MirageTower_2F_MapEvents:: @ 8537608 +MirageTower_2F_MapEvents:: map_events 0x0, MirageTower_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc index efb9705383..65a5c46650 100644 --- a/data/maps/MirageTower_2F/header.inc +++ b/data/maps/MirageTower_2F/header.inc @@ -1,10 +1,10 @@ -MirageTower_2F: @ 8484924 +MirageTower_2F: .4byte MirageTower_2F_Layout .4byte MirageTower_2F_MapEvents .4byte MirageTower_2F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 382 + .2byte LAYOUT_MIRAGE_TOWER_2F .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MirageTower_3F/events.inc b/data/maps/MirageTower_3F/events.inc index 4f55d74852..9fbc189dd1 100644 --- a/data/maps/MirageTower_3F/events.inc +++ b/data/maps/MirageTower_3F/events.inc @@ -1,11 +1,11 @@ -MirageTower_3F_EventObjects: @ 853761C +MirageTower_3F_EventObjects: object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, FLAG_TEMP_11 object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, FLAG_TEMP_12 -MirageTower_3F_MapWarps: @ 853764C +MirageTower_3F_MapWarps: warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_2F warp_def 2, 4, 0, 0, MAP_MIRAGE_TOWER_4F -MirageTower_3F_MapEvents:: @ 853765C +MirageTower_3F_MapEvents:: map_events MirageTower_3F_EventObjects, MirageTower_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc index 7362c553e3..565ff1f6d4 100644 --- a/data/maps/MirageTower_3F/header.inc +++ b/data/maps/MirageTower_3F/header.inc @@ -1,10 +1,10 @@ -MirageTower_3F: @ 8484940 +MirageTower_3F: .4byte MirageTower_3F_Layout .4byte MirageTower_3F_MapEvents .4byte MirageTower_3F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 383 + .2byte LAYOUT_MIRAGE_TOWER_3F .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MirageTower_4F/events.inc b/data/maps/MirageTower_4F/events.inc index 61c536c612..a2b22cad19 100644 --- a/data/maps/MirageTower_4F/events.inc +++ b/data/maps/MirageTower_4F/events.inc @@ -1,11 +1,11 @@ -MirageTower_4F_EventObjects: @ 8537670 +MirageTower_4F_EventObjects: object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 5, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD48, FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD89, FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_4F_EventScript_2907A6, FLAG_TEMP_11 -MirageTower_4F_MapWarps: @ 85376B8 +MirageTower_4F_MapWarps: warp_def 1, 4, 3, 1, MAP_MIRAGE_TOWER_3F -MirageTower_4F_MapEvents:: @ 85376C0 +MirageTower_4F_MapEvents:: map_events MirageTower_4F_EventObjects, MirageTower_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc index 842b12bb68..b3bc8341a8 100644 --- a/data/maps/MirageTower_4F/header.inc +++ b/data/maps/MirageTower_4F/header.inc @@ -1,10 +1,10 @@ -MirageTower_4F: @ 848495C +MirageTower_4F: .4byte MirageTower_4F_Layout .4byte MirageTower_4F_MapEvents .4byte MirageTower_4F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 388 + .2byte LAYOUT_MIRAGE_TOWER_4F .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity/connections.inc b/data/maps/MossdeepCity/connections.inc index a1845c04c9..c22091fe7c 100644 --- a/data/maps/MossdeepCity/connections.inc +++ b/data/maps/MossdeepCity/connections.inc @@ -1,8 +1,9 @@ -MossdeepCity_MapConnectionsList: @ 84867C4 +MossdeepCity_MapConnectionsList: connection up, 0, MAP_ROUTE125 connection down, 0, MAP_ROUTE127 connection left, -40, MAP_ROUTE124 -MossdeepCity_MapConnections: @ 84867E8 - .4byte 0x3 +MossdeepCity_MapConnections: + .4byte 3 .4byte MossdeepCity_MapConnectionsList + diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc index 5a653bc229..a8284ae5dd 100644 --- a/data/maps/MossdeepCity/events.inc +++ b/data/maps/MossdeepCity/events.inc @@ -1,4 +1,4 @@ -MossdeepCity_EventObjects: @ 8527018 +MossdeepCity_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 38, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AD1, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 50, 34, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 32, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0 @@ -17,7 +17,7 @@ MossdeepCity_EventObjects: @ 8527018 object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, FLAG_HIDE_MOSSDEEP_CITY_SCOTT object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 31, 29, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_1E4C7C, 0 -MossdeepCity_MapWarps: @ 85271B0 +MossdeepCity_MapWarps: warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1 warp_def 38, 9, 0, 0, MAP_MOSSDEEP_CITY_GYM warp_def 28, 16, 0, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F @@ -29,7 +29,7 @@ MossdeepCity_MapWarps: @ 85271B0 warp_def 64, 15, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F -MossdeepCity_MapCoordEvents: @ 8527200 +MossdeepCity_MapCoordEvents: coord_event 25, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 coord_event 26, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 coord_event 32, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 @@ -41,7 +41,7 @@ MossdeepCity_MapCoordEvents: @ 8527200 coord_event 40, 25, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 coord_event 40, 26, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 -MossdeepCity_MapBGEvents: @ 85272A0 +MossdeepCity_MapBGEvents: bg_event 25, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B26 bg_event 34, 9, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B1D bg_event 29, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E73 @@ -51,6 +51,6 @@ MossdeepCity_MapBGEvents: @ 85272A0 bg_event 39, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E6A bg_event 57, 21, 7, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B14 -MossdeepCity_MapEvents:: @ 8527300 +MossdeepCity_MapEvents:: map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index 641faf0f79..5ac6ceeaa2 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -1,10 +1,10 @@ -MossdeepCity: @ 8482560 +MossdeepCity: .4byte MossdeepCity_Layout .4byte MossdeepCity_MapEvents .4byte MossdeepCity_MapScripts .4byte MossdeepCity_MapConnections .2byte MUS_GOTOWN - .2byte 7 + .2byte LAYOUT_MOSSDEEP_CITY .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc index 2f96c458fc..e9b491f4d7 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/events.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc @@ -1,17 +1,17 @@ -MossdeepCity_GameCorner_1F_EventObjects: @ 8532F40 +MossdeepCity_GameCorner_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0 -MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70 +MossdeepCity_GameCorner_1F_MapWarps: warp_def 5, 9, 0, 9, MAP_MOSSDEEP_CITY warp_def 6, 9, 0, 9, MAP_MOSSDEEP_CITY warp_def 2, 0, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F -MossdeepCity_GameCorner_1F_MapBGEvents: @ 8532F88 +MossdeepCity_GameCorner_1F_MapBGEvents: bg_event 3, 0, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_224B5D bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_277E9D bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_277E96 -MossdeepCity_GameCorner_1F_MapEvents:: @ 8532FAC +MossdeepCity_GameCorner_1F_MapEvents:: map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index d32f3a3062..572a5fbe92 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_GameCorner_1F: @ 84839F0 +MossdeepCity_GameCorner_1F: .4byte MossdeepCity_GameCorner_1F_Layout .4byte MossdeepCity_GameCorner_1F_MapEvents .4byte MossdeepCity_GameCorner_1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 305 + .2byte LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_GameCorner_B1F/events.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc index 0737cd7e01..d86974ae95 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/events.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/events.inc @@ -1,9 +1,9 @@ -MossdeepCity_GameCorner_B1F_EventObjects: @ 8532FC0 +MossdeepCity_GameCorner_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 -MossdeepCity_GameCorner_B1F_MapWarps: @ 8532FD8 +MossdeepCity_GameCorner_B1F_MapWarps: warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F -MossdeepCity_GameCorner_B1F_MapEvents:: @ 8532FE0 +MossdeepCity_GameCorner_B1F_MapEvents:: map_events MossdeepCity_GameCorner_B1F_EventObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index 856f76166e..ee2f557319 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_GameCorner_B1F: @ 8483A0C +MossdeepCity_GameCorner_B1F: .4byte MossdeepCity_GameCorner_B1F_Layout .4byte MossdeepCity_GameCorner_B1F_MapEvents .4byte MossdeepCity_GameCorner_B1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 306 + .2byte LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc index a6511d2c1f..bc18f4eb77 100644 --- a/data/maps/MossdeepCity_Gym/events.inc +++ b/data/maps/MossdeepCity_Gym/events.inc @@ -1,4 +1,4 @@ -MossdeepCity_Gym_EventObjects: @ 85324EC +MossdeepCity_Gym_EventObjects: object_event 1, EVENT_OBJ_GFX_TATE, 0, 23, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 30, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0 object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 20, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0 @@ -36,7 +36,7 @@ MossdeepCity_Gym_EventObjects: @ 85324EC object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 -MossdeepCity_Gym_MapWarps: @ 853284C +MossdeepCity_Gym_MapWarps: warp_def 6, 35, 3, 1, MAP_MOSSDEEP_CITY warp_def 7, 35, 3, 1, MAP_MOSSDEEP_CITY warp_def 3, 28, 0, 3, MAP_MOSSDEEP_CITY_GYM @@ -52,7 +52,7 @@ MossdeepCity_Gym_MapWarps: @ 853284C warp_def 13, 32, 0, 13, MAP_MOSSDEEP_CITY_GYM warp_def 21, 10, 0, 12, MAP_MOSSDEEP_CITY_GYM -MossdeepCity_Gym_MapCoordEvents: @ 85328BC +MossdeepCity_Gym_MapCoordEvents: coord_event 2, 21, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C67 coord_event 8, 10, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C7D coord_event 6, 7, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C7D @@ -63,10 +63,10 @@ MossdeepCity_Gym_MapCoordEvents: @ 85328BC coord_event 21, 6, 0, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220AF1 coord_event 3, 30, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C67 -MossdeepCity_Gym_MapBGEvents: @ 853294C +MossdeepCity_Gym_MapBGEvents: bg_event 4, 34, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_220C33 bg_event 8, 34, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_220C43 -MossdeepCity_Gym_MapEvents:: @ 8532964 +MossdeepCity_Gym_MapEvents:: map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index 12421b7872..e596d834be 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_Gym: @ 84838BC +MossdeepCity_Gym: .4byte MossdeepCity_Gym_Layout .4byte MossdeepCity_Gym_MapEvents .4byte MossdeepCity_Gym_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 108 + .2byte LAYOUT_MOSSDEEP_CITY_GYM .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_House1/events.inc b/data/maps/MossdeepCity_House1/events.inc index 4ccf90558d..c16a852dfa 100644 --- a/data/maps/MossdeepCity_House1/events.inc +++ b/data/maps/MossdeepCity_House1/events.inc @@ -1,11 +1,11 @@ -MossdeepCity_House1_EventObjects: @ 8532978 +MossdeepCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0 -MossdeepCity_House1_MapWarps: @ 85329A8 +MossdeepCity_House1_MapWarps: warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY warp_def 4, 7, 0, 0, MAP_MOSSDEEP_CITY -MossdeepCity_House1_MapEvents:: @ 85329B8 +MossdeepCity_House1_MapEvents:: map_events MossdeepCity_House1_EventObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 365120f528..c0a3de2c90 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_House1: @ 84838D8 +MossdeepCity_House1: .4byte House2_Layout .4byte MossdeepCity_House1_MapEvents .4byte MossdeepCity_House1_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_House2/events.inc b/data/maps/MossdeepCity_House2/events.inc index 8e169c3b0d..57d398ce90 100644 --- a/data/maps/MossdeepCity_House2/events.inc +++ b/data/maps/MossdeepCity_House2/events.inc @@ -1,12 +1,12 @@ -MossdeepCity_House2_EventObjects: @ 85329CC +MossdeepCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0 object_event 2, EVENT_OBJ_GFX_TWIN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0 object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL -MossdeepCity_House2_MapWarps: @ 8532A14 +MossdeepCity_House2_MapWarps: warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY warp_def 4, 8, 0, 3, MAP_MOSSDEEP_CITY -MossdeepCity_House2_MapEvents:: @ 8532A24 +MossdeepCity_House2_MapEvents:: map_events MossdeepCity_House2_EventObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index 76673969a0..ffa15e3271 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_House2: @ 84838F4 +MossdeepCity_House2: .4byte House1_Layout .4byte MossdeepCity_House2_MapEvents .4byte MossdeepCity_House2_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_House3/events.inc b/data/maps/MossdeepCity_House3/events.inc index 374808598d..7eb2c34161 100644 --- a/data/maps/MossdeepCity_House3/events.inc +++ b/data/maps/MossdeepCity_House3/events.inc @@ -1,10 +1,10 @@ -MossdeepCity_House3_EventObjects: @ 8532BD4 +MossdeepCity_House3_EventObjects: object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0 -MossdeepCity_House3_MapWarps: @ 8532BEC +MossdeepCity_House3_MapWarps: warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY warp_def 4, 7, 0, 5, MAP_MOSSDEEP_CITY -MossdeepCity_House3_MapEvents:: @ 8532BFC +MossdeepCity_House3_MapEvents:: map_events MossdeepCity_House3_EventObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index 0d5be2fede..b8caf392d1 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_House3: @ 8483964 +MossdeepCity_House3: .4byte House2_Layout .4byte MossdeepCity_House3_MapEvents .4byte MossdeepCity_House3_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_House4/events.inc b/data/maps/MossdeepCity_House4/events.inc index 5e33f871f3..71dd54a5e4 100644 --- a/data/maps/MossdeepCity_House4/events.inc +++ b/data/maps/MossdeepCity_House4/events.inc @@ -1,12 +1,12 @@ -MossdeepCity_House4_EventObjects: @ 8532CAC +MossdeepCity_House4_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0 object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0 object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0 -MossdeepCity_House4_MapWarps: @ 8532CF4 +MossdeepCity_House4_MapWarps: warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY warp_def 3, 7, 0, 7, MAP_MOSSDEEP_CITY -MossdeepCity_House4_MapEvents:: @ 8532D04 +MossdeepCity_House4_MapEvents:: map_events MossdeepCity_House4_EventObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index ba90597579..1e748b7b4b 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_House4: @ 848399C +MossdeepCity_House4: .4byte HouseWithBed_Layout .4byte MossdeepCity_House4_MapEvents .4byte MossdeepCity_House4_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 80 + .2byte LAYOUT_HOUSE_WITH_BED .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_Mart/events.inc b/data/maps/MossdeepCity_Mart/events.inc index d452187d1e..770cb7ee5c 100644 --- a/data/maps/MossdeepCity_Mart/events.inc +++ b/data/maps/MossdeepCity_Mart/events.inc @@ -1,13 +1,13 @@ -MossdeepCity_Mart_EventObjects: @ 8532B50 +MossdeepCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0 object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0 object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_222408, 0 -MossdeepCity_Mart_MapWarps: @ 8532BB0 +MossdeepCity_Mart_MapWarps: warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY -MossdeepCity_Mart_MapEvents:: @ 8532BC0 +MossdeepCity_Mart_MapEvents:: map_events MossdeepCity_Mart_EventObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index 7de6cb5de6..75ea708d1a 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_Mart: @ 8483948 +MossdeepCity_Mart: .4byte Mart_Layout .4byte MossdeepCity_Mart_MapEvents .4byte MossdeepCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc index 5e48096c9f..53aa694703 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc @@ -1,13 +1,13 @@ -MossdeepCity_PokemonCenter_1F_EventObjects: @ 8532A38 +MossdeepCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0 object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0 -MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80 +MossdeepCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY warp_def 6, 8, 3, 2, MAP_MOSSDEEP_CITY warp_def 1, 6, 4, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F -MossdeepCity_PokemonCenter_1F_MapEvents:: @ 8532A98 +MossdeepCity_PokemonCenter_1F_MapEvents:: map_events MossdeepCity_PokemonCenter_1F_EventObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index b97b7108d7..719394a941 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_PokemonCenter_1F: @ 8483910 +MossdeepCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte MossdeepCity_PokemonCenter_1F_MapEvents .4byte MossdeepCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc index c2158f4f47..ce27a0804b 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc @@ -1,15 +1,15 @@ -MossdeepCity_PokemonCenter_2F_EventObjects: @ 8532AAC +MossdeepCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0 -MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24 +MossdeepCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -MossdeepCity_PokemonCenter_2F_MapEvents:: @ 8532B3C +MossdeepCity_PokemonCenter_2F_MapEvents:: map_events MossdeepCity_PokemonCenter_2F_EventObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index 263511ce97..7bb1d541ca 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_PokemonCenter_2F: @ 848392C +MossdeepCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte MossdeepCity_PokemonCenter_2F_MapEvents .4byte MossdeepCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc index dbb5a47eb6..84466046f4 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc @@ -1,4 +1,4 @@ -MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18 +MossdeepCity_SpaceCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0 object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0 object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0 @@ -11,11 +11,11 @@ MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18 object_event 10, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 5, 0, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN -MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20 +MossdeepCity_SpaceCenter_1F_MapWarps: warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY warp_def 8, 9, 0, 8, MAP_MOSSDEEP_CITY warp_def 13, 1, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_2F -MossdeepCity_SpaceCenter_1F_MapEvents:: @ 8532E38 +MossdeepCity_SpaceCenter_1F_MapEvents:: map_events MossdeepCity_SpaceCenter_1F_EventObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index 5e99c584ad..5bce64c21b 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_SpaceCenter_1F: @ 84839B8 +MossdeepCity_SpaceCenter_1F: .4byte MossdeepCity_SpaceCenter_1F_Layout .4byte MossdeepCity_SpaceCenter_1F_MapEvents .4byte MossdeepCity_SpaceCenter_1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 275 + .2byte LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc index 6c271b5de4..624185dfc2 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc @@ -1,4 +1,4 @@ -MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C +MossdeepCity_SpaceCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0 object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0 @@ -9,9 +9,9 @@ MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA -MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24 +MossdeepCity_SpaceCenter_2F_MapWarps: warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F -MossdeepCity_SpaceCenter_2F_MapEvents:: @ 8532F2C +MossdeepCity_SpaceCenter_2F_MapEvents:: map_events MossdeepCity_SpaceCenter_2F_EventObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index 3f4eab34e5..1d6b5834f6 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_SpaceCenter_2F: @ 84839D4 +MossdeepCity_SpaceCenter_2F: .4byte MossdeepCity_SpaceCenter_2F_Layout .4byte MossdeepCity_SpaceCenter_2F_MapEvents .4byte MossdeepCity_SpaceCenter_2F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 276 + .2byte LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc index dd8b3d1b46..c9fa20d623 100644 --- a/data/maps/MossdeepCity_StevensHouse/events.inc +++ b/data/maps/MossdeepCity_StevensHouse/events.inc @@ -1,18 +1,18 @@ -MossdeepCity_StevensHouse_EventObjects: @ 8532C10 +MossdeepCity_StevensHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY -MossdeepCity_StevensHouse_MapWarps: @ 8532C58 +MossdeepCity_StevensHouse_MapWarps: warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY -MossdeepCity_StevensHouse_MapBGEvents: @ 8532C68 +MossdeepCity_StevensHouse_MapBGEvents: bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 bg_event 10, 4, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 bg_event 10, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 -MossdeepCity_StevensHouse_MapEvents:: @ 8532C98 +MossdeepCity_StevensHouse_MapEvents:: map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index 693801b86e..a6e197f204 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_StevensHouse: @ 8483980 +MossdeepCity_StevensHouse: .4byte MossdeepCity_StevensHouse_Layout .4byte MossdeepCity_StevensHouse_MapEvents .4byte MossdeepCity_StevensHouse_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 327 + .2byte LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc index d11ba584e9..e341872a70 100644 --- a/data/maps/MtChimney/events.inc +++ b/data/maps/MtChimney/events.inc @@ -1,4 +1,4 @@ -MtChimney_EventObjects: @ 85347C8 +MtChimney_EventObjects: object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 24, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MtChimney_EventScript_22F06E, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA @@ -30,16 +30,16 @@ MtChimney_EventObjects: @ 85347C8 object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1F1, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, MtChimney_EventScript_22F208, FLAG_HIDE_MT_CHIMNEY_TRAINERS -MtChimney_MapWarps: @ 8534A98 +MtChimney_MapWarps: warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION warp_def 18, 36, 0, 1, MAP_MT_CHIMNEY_CABLE_CAR_STATION warp_def 20, 41, 3, 2, MAP_JAGGED_PASS warp_def 21, 41, 3, 3, MAP_JAGGED_PASS -MtChimney_MapBGEvents: @ 8534AB8 +MtChimney_MapBGEvents: bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_22F0E4 bg_event 24, 37, 3, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_22F141 -MtChimney_MapEvents:: @ 8534AD0 +MtChimney_MapEvents:: map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index 9cd0659030..a7f03617e3 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -1,10 +1,10 @@ -MtChimney: @ 8484010 +MtChimney: .4byte MtChimney_Layout .4byte MtChimney_MapEvents .4byte MtChimney_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 136 + .2byte LAYOUT_MT_CHIMNEY .byte MAPSEC_MT_CHIMNEY .byte 0 .byte WEATHER_ASH diff --git a/data/maps/MtChimney_CableCarStation/events.inc b/data/maps/MtChimney_CableCarStation/events.inc index 491ca79977..24f64fbbb4 100644 --- a/data/maps/MtChimney_CableCarStation/events.inc +++ b/data/maps/MtChimney_CableCarStation/events.inc @@ -1,11 +1,11 @@ -MtChimney_CableCarStation_EventObjects: @ 8533CA8 +MtChimney_CableCarStation_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0 object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 -MtChimney_CableCarStation_MapWarps: @ 8533CD8 +MtChimney_CableCarStation_MapWarps: warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY warp_def 7, 11, 0, 1, MAP_MT_CHIMNEY -MtChimney_CableCarStation_MapEvents:: @ 8533CE8 +MtChimney_CableCarStation_MapEvents:: map_events MtChimney_CableCarStation_EventObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index 0f858f9c1e..7b3d628ccd 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -1,10 +1,10 @@ -MtChimney_CableCarStation: @ 8483DFC +MtChimney_CableCarStation: .4byte CableCarStation_Layout .4byte MtChimney_CableCarStation_MapEvents .4byte MtChimney_CableCarStation_MapScripts .4byte 0x0 .2byte MUS_DOORO_X1 - .2byte 118 + .2byte LAYOUT_CABLE_CAR_STATION .byte MAPSEC_MT_CHIMNEY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc index 5fd8215411..7b1d79e165 100644 --- a/data/maps/MtPyre_1F/events.inc +++ b/data/maps/MtPyre_1F/events.inc @@ -1,9 +1,9 @@ -MtPyre_1F_EventObjects: @ 8534D64 +MtPyre_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_WOMAN, 0, 21, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 17, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0 object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0 -MtPyre_1F_MapWarps: @ 8534DAC +MtPyre_1F_MapWarps: warp_def 17, 18, 3, 0, MAP_ROUTE122 warp_def 3, 6, 3, 0, MAP_MT_PYRE_EXTERIOR warp_def 18, 18, 3, 0, MAP_ROUTE122 @@ -11,6 +11,6 @@ MtPyre_1F_MapWarps: @ 8534DAC warp_def 11, 1, 3, 0, MAP_MT_PYRE_2F warp_def 20, 9, 3, 4, MAP_MT_PYRE_2F -MtPyre_1F_MapEvents:: @ 8534DDC +MtPyre_1F_MapEvents:: map_events MtPyre_1F_EventObjects, MtPyre_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index f60532fa2c..b4d6603df9 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -1,10 +1,10 @@ -MtPyre_1F: @ 8484064 +MtPyre_1F: .4byte MtPyre_1F_Layout .4byte MtPyre_1F_MapEvents .4byte MtPyre_1F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 137 + .2byte LAYOUT_MT_PYRE_1F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc index f9fad9f46f..f0ec0d0a34 100644 --- a/data/maps/MtPyre_2F/events.inc +++ b/data/maps/MtPyre_2F/events.inc @@ -1,4 +1,4 @@ -MtPyre_2F_EventObjects: @ 8534DF0 +MtPyre_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MtPyre_2F_EventScript_231128, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MtPyre_2F_EventScript_231116, 0 @@ -8,13 +8,13 @@ MtPyre_2F_EventObjects: @ 8534DF0 object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, MtPyre_2F_EventScript_23118C, 0 object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_2F_EventScript_231175, 0 -MtPyre_2F_MapWarps: @ 8534EB0 +MtPyre_2F_MapWarps: warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F warp_def 10, 1, 3, 0, MAP_MT_PYRE_3F warp_def 10, 12, 3, 4, MAP_MT_PYRE_3F warp_def 6, 12, 3, 5, MAP_MT_PYRE_3F warp_def 11, 9, 3, 5, MAP_MT_PYRE_1F -MtPyre_2F_MapEvents:: @ 8534ED8 +MtPyre_2F_MapEvents:: map_events MtPyre_2F_EventObjects, MtPyre_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index 1abca71436..b1906b82e6 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -1,10 +1,10 @@ -MtPyre_2F: @ 8484080 +MtPyre_2F: .4byte MtPyre_2F_Layout .4byte MtPyre_2F_MapEvents .4byte MtPyre_2F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 138 + .2byte LAYOUT_MT_PYRE_2F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc index f78373aca0..4d6f3c9eac 100644 --- a/data/maps/MtPyre_3F/events.inc +++ b/data/maps/MtPyre_3F/events.inc @@ -1,10 +1,10 @@ -MtPyre_3F_EventObjects: @ 8534EEC +MtPyre_3F_EventObjects: object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0 object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0 -MtPyre_3F_MapWarps: @ 8534F4C +MtPyre_3F_MapWarps: warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F warp_def 2, 1, 3, 1, MAP_MT_PYRE_4F warp_def 9, 10, 3, 4, MAP_MT_PYRE_4F @@ -12,6 +12,6 @@ MtPyre_3F_MapWarps: @ 8534F4C warp_def 10, 12, 3, 2, MAP_MT_PYRE_2F warp_def 6, 12, 3, 3, MAP_MT_PYRE_2F -MtPyre_3F_MapEvents:: @ 8534F7C +MtPyre_3F_MapEvents:: map_events MtPyre_3F_EventObjects, MtPyre_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 3f54a36701..96026c7d9f 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -1,10 +1,10 @@ -MtPyre_3F: @ 848409C +MtPyre_3F: .4byte MtPyre_3F_Layout .4byte MtPyre_3F_MapEvents .4byte MtPyre_3F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 139 + .2byte LAYOUT_MT_PYRE_3F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc index ffe5688801..030039d18b 100644 --- a/data/maps/MtPyre_4F/events.inc +++ b/data/maps/MtPyre_4F/events.inc @@ -1,8 +1,8 @@ -MtPyre_4F_EventObjects: @ 8534F90 +MtPyre_4F_EventObjects: object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, MtPyre_4F_EventScript_231C6E, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE -MtPyre_4F_MapWarps: @ 8534FC0 +MtPyre_4F_MapWarps: warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F warp_def 2, 5, 3, 1, MAP_MT_PYRE_3F warp_def 12, 10, 3, 3, MAP_MT_PYRE_5F @@ -10,6 +10,6 @@ MtPyre_4F_MapWarps: @ 8534FC0 warp_def 9, 10, 3, 2, MAP_MT_PYRE_3F warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F -MtPyre_4F_MapEvents:: @ 8534FF0 +MtPyre_4F_MapEvents:: map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 1c41c3a6d7..86edc3843c 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -1,10 +1,10 @@ -MtPyre_4F: @ 84840B8 +MtPyre_4F: .4byte MtPyre_4F_Layout .4byte MtPyre_4F_MapEvents .4byte MtPyre_4F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 140 + .2byte LAYOUT_MT_PYRE_4F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc index afd3801e3b..fd6261356f 100644 --- a/data/maps/MtPyre_5F/events.inc +++ b/data/maps/MtPyre_5F/events.inc @@ -1,14 +1,14 @@ -MtPyre_5F_EventObjects: @ 8535004 +MtPyre_5F_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_5F_EventScript_231BC9, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_5F_EventScript_291324, FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE -MtPyre_5F_MapWarps: @ 8535034 +MtPyre_5F_MapWarps: warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F warp_def 10, 5, 3, 0, MAP_MT_PYRE_4F warp_def 1, 10, 3, 1, MAP_MT_PYRE_6F warp_def 12, 10, 3, 2, MAP_MT_PYRE_4F warp_def 12, 12, 3, 3, MAP_MT_PYRE_4F -MtPyre_5F_MapEvents:: @ 853505C +MtPyre_5F_MapEvents:: map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index 17c8eddcd8..8296f03dcc 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -1,10 +1,10 @@ -MtPyre_5F: @ 84840D4 +MtPyre_5F: .4byte MtPyre_5F_Layout .4byte MtPyre_5F_MapEvents .4byte MtPyre_5F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 141 + .2byte LAYOUT_MT_PYRE_5F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc index 3ab5dcf705..df862d84e6 100644 --- a/data/maps/MtPyre_6F/events.inc +++ b/data/maps/MtPyre_6F/events.inc @@ -1,12 +1,12 @@ -MtPyre_6F_EventObjects: @ 8535070 +MtPyre_6F_EventObjects: object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, FLAG_ITEM_MT_PYRE_6F_TM_30 object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D9D, 0 -MtPyre_6F_MapWarps: @ 85350B8 +MtPyre_6F_MapWarps: warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F -MtPyre_6F_MapEvents:: @ 85350C8 +MtPyre_6F_MapEvents:: map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index 4e80828207..ca0e545aa9 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -1,10 +1,10 @@ -MtPyre_6F: @ 84840F0 +MtPyre_6F: .4byte MtPyre_6F_Layout .4byte MtPyre_6F_MapEvents .4byte MtPyre_6F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 142 + .2byte LAYOUT_MT_PYRE_6F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc index 75c9489e4b..1b8248e02c 100644 --- a/data/maps/MtPyre_Exterior/events.inc +++ b/data/maps/MtPyre_Exterior/events.inc @@ -1,23 +1,23 @@ -MtPyre_Exterior_EventObjects: @ 85350DC +MtPyre_Exterior_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48 -MtPyre_Exterior_MapWarps: @ 853510C +MtPyre_Exterior_MapWarps: warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F warp_def 19, 10, 3, 1, MAP_MT_PYRE_SUMMIT warp_def 20, 10, 3, 1, MAP_MT_PYRE_SUMMIT -MtPyre_Exterior_MapCoordEvents: @ 8535124 +MtPyre_Exterior_MapCoordEvents: coord_event 24, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED coord_event 25, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED coord_event 22, 27, 3, 0, 0, MtPyre_Exterior_EventScript_231FF2 coord_event 23, 28, 3, 0, 0, MtPyre_Exterior_EventScript_231FF2 coord_event 26, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED -MtPyre_Exterior_MapBGEvents: @ 8535174 +MtPyre_Exterior_MapBGEvents: bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER -MtPyre_Exterior_MapEvents:: @ 853518C +MtPyre_Exterior_MapEvents:: map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index 3b703a41e2..9b9dfe1fad 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -1,10 +1,10 @@ -MtPyre_Exterior: @ 848410C +MtPyre_Exterior: .4byte MtPyre_Exterior_Layout .4byte MtPyre_Exterior_MapEvents .4byte MtPyre_Exterior_MapScripts .4byte 0x0 .2byte MUS_MACHUPI - .2byte 302 + .2byte LAYOUT_MT_PYRE_EXTERIOR .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc index b112fbcfef..abe957f283 100644 --- a/data/maps/MtPyre_Summit/events.inc +++ b/data/maps/MtPyre_Summit/events.inc @@ -1,4 +1,4 @@ -MtPyre_Summit_EventObjects: @ 85351A0 +MtPyre_Summit_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0 object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0 @@ -8,12 +8,12 @@ MtPyre_Summit_EventObjects: @ 85351A0 object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE -MtPyre_Summit_MapWarps: @ 8535260 +MtPyre_Summit_MapWarps: warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR warp_def 23, 31, 3, 1, MAP_MT_PYRE_EXTERIOR warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR -MtPyre_Summit_MapCoordEvents: @ 8535278 +MtPyre_Summit_MapCoordEvents: coord_event 22, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232018 coord_event 23, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232024 coord_event 24, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232030 @@ -21,10 +21,10 @@ MtPyre_Summit_MapCoordEvents: @ 8535278 coord_event 23, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321F8 coord_event 24, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_232204 -MtPyre_Summit_MapBGEvents: @ 85352D8 +MtPyre_Summit_MapBGEvents: bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY -MtPyre_Summit_MapEvents:: @ 85352F0 +MtPyre_Summit_MapEvents:: map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 29a28e99b7..483afb9891 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -1,10 +1,10 @@ -MtPyre_Summit: @ 8484128 +MtPyre_Summit: .4byte MtPyre_Summit_Layout .4byte MtPyre_Summit_MapEvents .4byte MtPyre_Summit_MapScripts .4byte 0x0 .2byte MUS_MACHUPI - .2byte 303 + .2byte LAYOUT_MT_PYRE_SUMMIT .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/NavelRock_B1F/events.inc b/data/maps/NavelRock_B1F/events.inc index e83d221ddd..5142b09a20 100644 --- a/data/maps/NavelRock_B1F/events.inc +++ b/data/maps/NavelRock_B1F/events.inc @@ -1,7 +1,7 @@ -NavelRock_B1F_MapWarps: @ 853DA94 +NavelRock_B1F_MapWarps: warp_def 4, 3, 3, 0, MAP_NAVEL_ROCK_ENTRANCE warp_def 18, 9, 3, 1, MAP_NAVEL_ROCK_FORK -NavelRock_B1F_MapEvents:: @ 853DAA4 +NavelRock_B1F_MapEvents:: map_events 0x0, NavelRock_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc index cf56d8fb48..08842ade1d 100644 --- a/data/maps/NavelRock_B1F/header.inc +++ b/data/maps/NavelRock_B1F/header.inc @@ -1,10 +1,10 @@ -NavelRock_B1F: @ 84858C8 +NavelRock_B1F: .4byte NavelRock_B1F_Layout .4byte NavelRock_B1F_MapEvents .4byte NavelRock_B1F_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 427 + .2byte LAYOUT_NAVEL_ROCK_B1F .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Bottom/events.inc b/data/maps/NavelRock_Bottom/events.inc index d18565161c..16fa053ce9 100644 --- a/data/maps/NavelRock_Bottom/events.inc +++ b/data/maps/NavelRock_Bottom/events.inc @@ -1,9 +1,9 @@ -NavelRock_Bottom_EventObjects: @ 853DD50 +NavelRock_Bottom_EventObjects: object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 11, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, NavelRock_Bottom_EventScript_2692A2, FLAG_HIDE_LUGIA -NavelRock_Bottom_MapWarps: @ 853DD68 +NavelRock_Bottom_MapWarps: warp_def 14, 19, 0, 0, MAP_NAVEL_ROCK_DOWN11 -NavelRock_Bottom_MapEvents:: @ 853DD70 +NavelRock_Bottom_MapEvents:: map_events NavelRock_Bottom_EventObjects, NavelRock_Bottom_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc index d6f9b9d5a0..b768e916aa 100644 --- a/data/maps/NavelRock_Bottom/header.inc +++ b/data/maps/NavelRock_Bottom/header.inc @@ -1,10 +1,10 @@ -NavelRock_Bottom: @ 8485AC0 +NavelRock_Bottom: .4byte NavelRock_Bottom_Layout .4byte NavelRock_Bottom_MapEvents .4byte NavelRock_Bottom_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 424 + .2byte LAYOUT_NAVEL_ROCK_BOTTOM .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down01/events.inc b/data/maps/NavelRock_Down01/events.inc index 3a60452154..9874119a91 100644 --- a/data/maps/NavelRock_Down01/events.inc +++ b/data/maps/NavelRock_Down01/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down01_MapWarps: @ 853DBC4 +NavelRock_Down01_MapWarps: warp_def 3, 3, 3, 2, MAP_NAVEL_ROCK_FORK warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN02 -NavelRock_Down01_MapEvents:: @ 853DBD4 +NavelRock_Down01_MapEvents:: map_events 0x0, NavelRock_Down01_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc index 2dc18c232d..7cddeeae7b 100644 --- a/data/maps/NavelRock_Down01/header.inc +++ b/data/maps/NavelRock_Down01/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down01: @ 848598C +NavelRock_Down01: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down01_MapEvents .4byte NavelRock_Down01_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down02/events.inc b/data/maps/NavelRock_Down02/events.inc index 7441539c91..449085ea5d 100644 --- a/data/maps/NavelRock_Down02/events.inc +++ b/data/maps/NavelRock_Down02/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down02_MapWarps: @ 853DBE8 +NavelRock_Down02_MapWarps: warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN01 warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN03 -NavelRock_Down02_MapEvents:: @ 853DBF8 +NavelRock_Down02_MapEvents:: map_events 0x0, NavelRock_Down02_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc index 731e4e2fb7..03d45822b1 100644 --- a/data/maps/NavelRock_Down02/header.inc +++ b/data/maps/NavelRock_Down02/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down02: @ 84859A8 +NavelRock_Down02: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down02_MapEvents .4byte NavelRock_Down02_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down03/events.inc b/data/maps/NavelRock_Down03/events.inc index 20dabdfaf9..7b74ad4121 100644 --- a/data/maps/NavelRock_Down03/events.inc +++ b/data/maps/NavelRock_Down03/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down03_MapWarps: @ 853DC0C +NavelRock_Down03_MapWarps: warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN02 warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN04 -NavelRock_Down03_MapEvents:: @ 853DC1C +NavelRock_Down03_MapEvents:: map_events 0x0, NavelRock_Down03_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc index fdf22dbc3f..694f840e4d 100644 --- a/data/maps/NavelRock_Down03/header.inc +++ b/data/maps/NavelRock_Down03/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down03: @ 84859C4 +NavelRock_Down03: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down03_MapEvents .4byte NavelRock_Down03_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down04/events.inc b/data/maps/NavelRock_Down04/events.inc index e50f6fe230..5459b1d508 100644 --- a/data/maps/NavelRock_Down04/events.inc +++ b/data/maps/NavelRock_Down04/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down04_MapWarps: @ 853DC30 +NavelRock_Down04_MapWarps: warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN03 warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN05 -NavelRock_Down04_MapEvents:: @ 853DC40 +NavelRock_Down04_MapEvents:: map_events 0x0, NavelRock_Down04_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc index 7f93253b17..0275b6422d 100644 --- a/data/maps/NavelRock_Down04/header.inc +++ b/data/maps/NavelRock_Down04/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down04: @ 84859E0 +NavelRock_Down04: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down04_MapEvents .4byte NavelRock_Down04_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down05/events.inc b/data/maps/NavelRock_Down05/events.inc index 500d38e9bd..de52fa07f5 100644 --- a/data/maps/NavelRock_Down05/events.inc +++ b/data/maps/NavelRock_Down05/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down05_MapWarps: @ 853DC54 +NavelRock_Down05_MapWarps: warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN04 warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN06 -NavelRock_Down05_MapEvents:: @ 853DC64 +NavelRock_Down05_MapEvents:: map_events 0x0, NavelRock_Down05_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc index 602f440e0d..50e298b6e0 100644 --- a/data/maps/NavelRock_Down05/header.inc +++ b/data/maps/NavelRock_Down05/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down05: @ 84859FC +NavelRock_Down05: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down05_MapEvents .4byte NavelRock_Down05_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down06/events.inc b/data/maps/NavelRock_Down06/events.inc index 0773677477..54e5f229eb 100644 --- a/data/maps/NavelRock_Down06/events.inc +++ b/data/maps/NavelRock_Down06/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down06_MapWarps: @ 853DC78 +NavelRock_Down06_MapWarps: warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN05 warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN07 -NavelRock_Down06_MapEvents:: @ 853DC88 +NavelRock_Down06_MapEvents:: map_events 0x0, NavelRock_Down06_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc index c3ec1fe559..8e18db5b92 100644 --- a/data/maps/NavelRock_Down06/header.inc +++ b/data/maps/NavelRock_Down06/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down06: @ 8485A18 +NavelRock_Down06: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down06_MapEvents .4byte NavelRock_Down06_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down07/events.inc b/data/maps/NavelRock_Down07/events.inc index 83f7ce9a68..55b4dd10c4 100644 --- a/data/maps/NavelRock_Down07/events.inc +++ b/data/maps/NavelRock_Down07/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down07_MapWarps: @ 853DC9C +NavelRock_Down07_MapWarps: warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN06 warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN08 -NavelRock_Down07_MapEvents:: @ 853DCAC +NavelRock_Down07_MapEvents:: map_events 0x0, NavelRock_Down07_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc index f3a5ab3f34..75c41046e7 100644 --- a/data/maps/NavelRock_Down07/header.inc +++ b/data/maps/NavelRock_Down07/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down07: @ 8485A34 +NavelRock_Down07: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down07_MapEvents .4byte NavelRock_Down07_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down08/events.inc b/data/maps/NavelRock_Down08/events.inc index 38bef10e88..b1180ed83a 100644 --- a/data/maps/NavelRock_Down08/events.inc +++ b/data/maps/NavelRock_Down08/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down08_MapWarps: @ 853DCC0 +NavelRock_Down08_MapWarps: warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN07 warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN09 -NavelRock_Down08_MapEvents:: @ 853DCD0 +NavelRock_Down08_MapEvents:: map_events 0x0, NavelRock_Down08_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc index 3a6f28081a..bcb69b4128 100644 --- a/data/maps/NavelRock_Down08/header.inc +++ b/data/maps/NavelRock_Down08/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down08: @ 8485A50 +NavelRock_Down08: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down08_MapEvents .4byte NavelRock_Down08_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down09/events.inc b/data/maps/NavelRock_Down09/events.inc index e3843e7591..e7279c4d08 100644 --- a/data/maps/NavelRock_Down09/events.inc +++ b/data/maps/NavelRock_Down09/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down09_MapWarps: @ 853DCE4 +NavelRock_Down09_MapWarps: warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN08 warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN10 -NavelRock_Down09_MapEvents:: @ 853DCF4 +NavelRock_Down09_MapEvents:: map_events 0x0, NavelRock_Down09_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc index f132b9f669..cb80dd7fae 100644 --- a/data/maps/NavelRock_Down09/header.inc +++ b/data/maps/NavelRock_Down09/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down09: @ 8485A6C +NavelRock_Down09: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down09_MapEvents .4byte NavelRock_Down09_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down10/events.inc b/data/maps/NavelRock_Down10/events.inc index 805e399b48..b9eadabf1e 100644 --- a/data/maps/NavelRock_Down10/events.inc +++ b/data/maps/NavelRock_Down10/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down10_MapWarps: @ 853DD08 +NavelRock_Down10_MapWarps: warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN09 warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN11 -NavelRock_Down10_MapEvents:: @ 853DD18 +NavelRock_Down10_MapEvents:: map_events 0x0, NavelRock_Down10_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc index 3ee4d62cec..308a89e05c 100644 --- a/data/maps/NavelRock_Down10/header.inc +++ b/data/maps/NavelRock_Down10/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down10: @ 8485A88 +NavelRock_Down10: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down10_MapEvents .4byte NavelRock_Down10_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down11/events.inc b/data/maps/NavelRock_Down11/events.inc index 505a6ed6d4..9822ee8ff1 100644 --- a/data/maps/NavelRock_Down11/events.inc +++ b/data/maps/NavelRock_Down11/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down11_MapWarps: @ 853DD2C +NavelRock_Down11_MapWarps: warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_BOTTOM warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN10 -NavelRock_Down11_MapEvents:: @ 853DD3C +NavelRock_Down11_MapEvents:: map_events 0x0, NavelRock_Down11_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc index ef2ad00b7c..2c5a0862b9 100644 --- a/data/maps/NavelRock_Down11/header.inc +++ b/data/maps/NavelRock_Down11/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down11: @ 8485AA4 +NavelRock_Down11: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down11_MapEvents .4byte NavelRock_Down11_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Entrance/events.inc b/data/maps/NavelRock_Entrance/events.inc index ee45485a72..b063f08d8a 100644 --- a/data/maps/NavelRock_Entrance/events.inc +++ b/data/maps/NavelRock_Entrance/events.inc @@ -1,7 +1,7 @@ -NavelRock_Entrance_MapWarps: @ 853DA70 +NavelRock_Entrance_MapWarps: warp_def 10, 5, 3, 0, MAP_NAVEL_ROCK_B1F warp_def 10, 26, 3, 1, MAP_NAVEL_ROCK_EXTERIOR -NavelRock_Entrance_MapEvents:: @ 853DA80 +NavelRock_Entrance_MapEvents:: map_events 0x0, NavelRock_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc index dbc28a7816..793ab85cdf 100644 --- a/data/maps/NavelRock_Entrance/header.inc +++ b/data/maps/NavelRock_Entrance/header.inc @@ -1,10 +1,10 @@ -NavelRock_Entrance: @ 84858AC +NavelRock_Entrance: .4byte NavelRock_Entrance_Layout .4byte NavelRock_Entrance_MapEvents .4byte NavelRock_Entrance_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 422 + .2byte LAYOUT_NAVEL_ROCK_ENTRANCE .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Exterior/events.inc b/data/maps/NavelRock_Exterior/events.inc index 66bbf376f1..1ec151c8c2 100644 --- a/data/maps/NavelRock_Exterior/events.inc +++ b/data/maps/NavelRock_Exterior/events.inc @@ -1,7 +1,7 @@ -NavelRock_Exterior_MapWarps: @ 853DA00 +NavelRock_Exterior_MapWarps: warp_def 10, 18, 0, 0, MAP_NAVEL_ROCK_HARBOR warp_def 10, 10, 0, 1, MAP_NAVEL_ROCK_ENTRANCE -NavelRock_Exterior_MapEvents:: @ 853DA10 +NavelRock_Exterior_MapEvents:: map_events 0x0, NavelRock_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc index e13422c260..f355dbf559 100644 --- a/data/maps/NavelRock_Exterior/header.inc +++ b/data/maps/NavelRock_Exterior/header.inc @@ -1,10 +1,10 @@ -NavelRock_Exterior: @ 8485874 +NavelRock_Exterior: .4byte NavelRock_Exterior_Layout .4byte NavelRock_Exterior_MapEvents .4byte NavelRock_Exterior_MapScripts .4byte 0x0 .2byte MUS_RG_NANASHIMA - .2byte 421 + .2byte LAYOUT_NAVEL_ROCK_EXTERIOR .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Fork/events.inc b/data/maps/NavelRock_Fork/events.inc index 869dc0f089..fde5e5930e 100644 --- a/data/maps/NavelRock_Fork/events.inc +++ b/data/maps/NavelRock_Fork/events.inc @@ -1,8 +1,8 @@ -NavelRock_Fork_MapWarps: @ 853DAB8 +NavelRock_Fork_MapWarps: warp_def 4, 6, 3, 0, MAP_NAVEL_ROCK_UP1 warp_def 11, 79, 3, 1, MAP_NAVEL_ROCK_B1F warp_def 22, 6, 3, 0, MAP_NAVEL_ROCK_DOWN01 -NavelRock_Fork_MapEvents:: @ 853DAD0 +NavelRock_Fork_MapEvents:: map_events 0x0, NavelRock_Fork_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc index 49087db7e2..01e4f7bccd 100644 --- a/data/maps/NavelRock_Fork/header.inc +++ b/data/maps/NavelRock_Fork/header.inc @@ -1,10 +1,10 @@ -NavelRock_Fork: @ 84858E4 +NavelRock_Fork: .4byte NavelRock_Fork_Layout .4byte NavelRock_Fork_MapEvents .4byte NavelRock_Fork_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 428 + .2byte LAYOUT_NAVEL_ROCK_FORK .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Harbor/events.inc b/data/maps/NavelRock_Harbor/events.inc index b5a299572a..0c687f1fc0 100644 --- a/data/maps/NavelRock_Harbor/events.inc +++ b/data/maps/NavelRock_Harbor/events.inc @@ -1,10 +1,10 @@ -NavelRock_Harbor_EventObjects: @ 853DA24 +NavelRock_Harbor_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 -NavelRock_Harbor_MapWarps: @ 853DA54 +NavelRock_Harbor_MapWarps: warp_def 8, 2, 0, 0, MAP_NAVEL_ROCK_EXTERIOR -NavelRock_Harbor_MapEvents:: @ 853DA5C +NavelRock_Harbor_MapEvents:: map_events NavelRock_Harbor_EventObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc index 1df05a2bc3..2af7e6e35e 100644 --- a/data/maps/NavelRock_Harbor/header.inc +++ b/data/maps/NavelRock_Harbor/header.inc @@ -1,10 +1,10 @@ -NavelRock_Harbor: @ 8485890 +NavelRock_Harbor: .4byte IslandHarbor_Layout .4byte NavelRock_Harbor_MapEvents .4byte NavelRock_Harbor_MapScripts .4byte 0x0 .2byte MUS_RG_NANASHIMA - .2byte 405 + .2byte LAYOUT_ISLAND_HARBOR .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Top/events.inc b/data/maps/NavelRock_Top/events.inc index 0952b0f675..7ba534d027 100644 --- a/data/maps/NavelRock_Top/events.inc +++ b/data/maps/NavelRock_Top/events.inc @@ -1,15 +1,15 @@ -NavelRock_Top_EventObjects: @ 853DB74 +NavelRock_Top_EventObjects: object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_HO_OH -NavelRock_Top_MapWarps: @ 853DB8C +NavelRock_Top_MapWarps: warp_def 13, 20, 3, 1, MAP_NAVEL_ROCK_UP4 -NavelRock_Top_MapCoordEvents: @ 853DB94 +NavelRock_Top_MapCoordEvents: coord_event 12, 10, 3, VAR_TEMP_1, 0, NavelRock_Top_EventScript_26916F -NavelRock_Top_MapBGEvents: @ 853DBA4 +NavelRock_Top_MapBGEvents: bg_hidden_item_event 12, 9, 3, ITEM_SACRED_ASH, FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH -NavelRock_Top_MapEvents:: @ 853DBB0 +NavelRock_Top_MapEvents:: map_events NavelRock_Top_EventObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc index e99a64054e..6e8acfce85 100644 --- a/data/maps/NavelRock_Top/header.inc +++ b/data/maps/NavelRock_Top/header.inc @@ -1,10 +1,10 @@ -NavelRock_Top: @ 8485970 +NavelRock_Top: .4byte NavelRock_Top_Layout .4byte NavelRock_Top_MapEvents .4byte NavelRock_Top_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 423 + .2byte LAYOUT_NAVEL_ROCK_TOP .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/NavelRock_Up1/events.inc b/data/maps/NavelRock_Up1/events.inc index fd0741a6a9..c0dba5dd3a 100644 --- a/data/maps/NavelRock_Up1/events.inc +++ b/data/maps/NavelRock_Up1/events.inc @@ -1,7 +1,7 @@ -NavelRock_Up1_MapWarps: @ 853DAE4 +NavelRock_Up1_MapWarps: warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_FORK warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP2 -NavelRock_Up1_MapEvents:: @ 853DAF4 +NavelRock_Up1_MapEvents:: map_events 0x0, NavelRock_Up1_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc index 33266d8f0b..2ddaf1dcc6 100644 --- a/data/maps/NavelRock_Up1/header.inc +++ b/data/maps/NavelRock_Up1/header.inc @@ -1,10 +1,10 @@ -NavelRock_Up1: @ 8485900 +NavelRock_Up1: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Up1_MapEvents .4byte NavelRock_Up1_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Up2/events.inc b/data/maps/NavelRock_Up2/events.inc index bd142b9972..8d6f64dbc2 100644 --- a/data/maps/NavelRock_Up2/events.inc +++ b/data/maps/NavelRock_Up2/events.inc @@ -1,7 +1,7 @@ -NavelRock_Up2_MapWarps: @ 853DB08 +NavelRock_Up2_MapWarps: warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP1 warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_UP3 -NavelRock_Up2_MapEvents:: @ 853DB18 +NavelRock_Up2_MapEvents:: map_events 0x0, NavelRock_Up2_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc index f93dc31ed6..68fe366f2c 100644 --- a/data/maps/NavelRock_Up2/header.inc +++ b/data/maps/NavelRock_Up2/header.inc @@ -1,10 +1,10 @@ -NavelRock_Up2: @ 848591C +NavelRock_Up2: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Up2_MapEvents .4byte NavelRock_Up2_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Up3/events.inc b/data/maps/NavelRock_Up3/events.inc index 9491e5dac2..3853f75c7e 100644 --- a/data/maps/NavelRock_Up3/events.inc +++ b/data/maps/NavelRock_Up3/events.inc @@ -1,7 +1,7 @@ -NavelRock_Up3_MapWarps: @ 853DB2C +NavelRock_Up3_MapWarps: warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_UP2 warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP4 -NavelRock_Up3_MapEvents:: @ 853DB3C +NavelRock_Up3_MapEvents:: map_events 0x0, NavelRock_Up3_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc index d816e58f1a..b357349b7c 100644 --- a/data/maps/NavelRock_Up3/header.inc +++ b/data/maps/NavelRock_Up3/header.inc @@ -1,10 +1,10 @@ -NavelRock_Up3: @ 8485938 +NavelRock_Up3: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Up3_MapEvents .4byte NavelRock_Up3_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Up4/events.inc b/data/maps/NavelRock_Up4/events.inc index 3d81f15231..449e1f29da 100644 --- a/data/maps/NavelRock_Up4/events.inc +++ b/data/maps/NavelRock_Up4/events.inc @@ -1,7 +1,7 @@ -NavelRock_Up4_MapWarps: @ 853DB50 +NavelRock_Up4_MapWarps: warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP3 warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_TOP -NavelRock_Up4_MapEvents:: @ 853DB60 +NavelRock_Up4_MapEvents:: map_events 0x0, NavelRock_Up4_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc index 583c672b43..4c44746f06 100644 --- a/data/maps/NavelRock_Up4/header.inc +++ b/data/maps/NavelRock_Up4/header.inc @@ -1,10 +1,10 @@ -NavelRock_Up4: @ 8485954 +NavelRock_Up4: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Up4_MapEvents .4byte NavelRock_Up4_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NewMauville_Entrance/events.inc b/data/maps/NewMauville_Entrance/events.inc index 4c333f6b3f..d230fc4e99 100644 --- a/data/maps/NewMauville_Entrance/events.inc +++ b/data/maps/NewMauville_Entrance/events.inc @@ -1,10 +1,10 @@ -NewMauville_Entrance_MapWarps: @ 8536474 +NewMauville_Entrance_MapWarps: warp_def 4, 6, 3, 0, MAP_ROUTE110 warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE -NewMauville_Entrance_MapCoordEvents: @ 8536484 +NewMauville_Entrance_MapCoordEvents: coord_event 4, 2, 3, VAR_0x40BA, 0, NewMauville_Entrance_EventScript_2372FF -NewMauville_Entrance_MapEvents:: @ 8536494 +NewMauville_Entrance_MapEvents:: map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0 diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index a8a1df2968..c0b8938ca4 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -1,10 +1,10 @@ -NewMauville_Entrance: @ 8484470 +NewMauville_Entrance: .4byte NewMauville_Entrance_Layout .4byte NewMauville_Entrance_MapEvents .4byte NewMauville_Entrance_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 184 + .2byte LAYOUT_NEW_MAUVILLE_ENTRANCE .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc index 568f4b22ed..c366496f4d 100644 --- a/data/maps/NewMauville_Inside/events.inc +++ b/data/maps/NewMauville_Inside/events.inc @@ -1,4 +1,4 @@ -NewMauville_Inside_EventObjects: @ 85364A8 +NewMauville_Inside_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291206, FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE @@ -8,10 +8,10 @@ NewMauville_Inside_EventObjects: @ 85364A8 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377FC, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_237849, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3 -NewMauville_Inside_MapWarps: @ 8536568 +NewMauville_Inside_MapWarps: warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE -NewMauville_Inside_MapCoordEvents: @ 8536570 +NewMauville_Inside_MapCoordEvents: coord_event 30, 38, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 coord_event 18, 36, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 coord_event 4, 26, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 @@ -23,7 +23,7 @@ NewMauville_Inside_MapCoordEvents: @ 8536570 coord_event 17, 10, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 coord_event 33, 6, 3, VAR_0x40BA, 1, NewMauville_Inside_EventScript_237725 -NewMauville_Inside_MapBGEvents: @ 8536610 +NewMauville_Inside_MapBGEvents: bg_event 32, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F bg_event 32, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F bg_event 32, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F @@ -33,6 +33,6 @@ NewMauville_Inside_MapBGEvents: @ 8536610 bg_event 35, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F bg_event 35, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F -NewMauville_Inside_MapEvents:: @ 8536670 +NewMauville_Inside_MapEvents:: map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 57966d38fe..c4e7368859 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -1,10 +1,10 @@ -NewMauville_Inside: @ 848448C +NewMauville_Inside: .4byte NewMauville_Inside_Layout .4byte NewMauville_Inside_MapEvents .4byte NewMauville_Inside_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 185 + .2byte LAYOUT_NEW_MAUVILLE_INSIDE .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/OldaleTown/connections.inc b/data/maps/OldaleTown/connections.inc index db0232f834..a82523c9c0 100644 --- a/data/maps/OldaleTown/connections.inc +++ b/data/maps/OldaleTown/connections.inc @@ -1,9 +1,9 @@ -OldaleTown_MapConnectionsList: @ 8486614 +OldaleTown_MapConnectionsList: connection up, 0, MAP_ROUTE103 connection down, 0, MAP_ROUTE101 connection left, 0, MAP_ROUTE102 -OldaleTown_MapConnections: @ 8486638 - .4byte 0x3 +OldaleTown_MapConnections: + .4byte 3 .4byte OldaleTown_MapConnectionsList diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc index a3bc51483b..aa56e67f64 100644 --- a/data/maps/OldaleTown/events.inc +++ b/data/maps/OldaleTown/events.inc @@ -1,28 +1,28 @@ -OldaleTown_EventObjects: @ 8527854 +OldaleTown_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0 object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0 object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0 object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 11, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, FLAG_HIDE_OLDALE_TOWN_RIVAL -OldaleTown_MapWarps: @ 85278B4 +OldaleTown_MapWarps: warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 warp_def 15, 16, 0, 0, MAP_OLDALE_TOWN_HOUSE2 warp_def 6, 16, 0, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_1F warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART -OldaleTown_MapCoordEvents: @ 85278D4 +OldaleTown_MapCoordEvents: coord_event 0, 10, 3, VAR_0x4051, 0, OldaleTown_EventScript_1E903F coord_event 8, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E9086 coord_event 9, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E90A6 coord_event 10, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E90C6 -OldaleTown_MapBGEvents: @ 8527914 +OldaleTown_MapBGEvents: bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, OldaleTown_EventScript_1E8EEA bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E73 bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E6A bg_event 8, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E73 bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E6A -OldaleTown_MapEvents:: @ 8527950 +OldaleTown_MapEvents:: map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 83f3624dcc..30025e1f1d 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -1,10 +1,10 @@ -OldaleTown: @ 84825D0 +OldaleTown: .4byte OldaleTown_Layout .4byte OldaleTown_MapEvents .4byte OldaleTown_MapScripts .4byte OldaleTown_MapConnections .2byte MUS_MACHI_S4 - .2byte 11 + .2byte LAYOUT_OLDALE_TOWN .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/OldaleTown_House1/events.inc b/data/maps/OldaleTown_House1/events.inc index 7183f92934..8fc37079c7 100644 --- a/data/maps/OldaleTown_House1/events.inc +++ b/data/maps/OldaleTown_House1/events.inc @@ -1,10 +1,10 @@ -OldaleTown_House1_EventObjects: @ 852D7B4 +OldaleTown_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0 -OldaleTown_House1_MapWarps: @ 852D7CC +OldaleTown_House1_MapWarps: warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN warp_def 4, 8, 0, 0, MAP_OLDALE_TOWN -OldaleTown_House1_MapEvents:: @ 852D7DC +OldaleTown_House1_MapEvents:: map_events OldaleTown_House1_EventObjects, OldaleTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index 6444d83c48..7dc2d6b70a 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -1,10 +1,10 @@ -OldaleTown_House1: @ 8482B80 +OldaleTown_House1: .4byte House1_Layout .4byte OldaleTown_House1_MapEvents .4byte OldaleTown_House1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S4 - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/OldaleTown_House2/events.inc b/data/maps/OldaleTown_House2/events.inc index 7e94a2356d..45678ebb88 100644 --- a/data/maps/OldaleTown_House2/events.inc +++ b/data/maps/OldaleTown_House2/events.inc @@ -1,11 +1,11 @@ -OldaleTown_House2_EventObjects: @ 852D7F0 +OldaleTown_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0 -OldaleTown_House2_MapWarps: @ 852D820 +OldaleTown_House2_MapWarps: warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN warp_def 4, 7, 0, 1, MAP_OLDALE_TOWN -OldaleTown_House2_MapEvents:: @ 852D830 +OldaleTown_House2_MapEvents:: map_events OldaleTown_House2_EventObjects, OldaleTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index 0df8e3c0e3..4ae5e078ce 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -1,10 +1,10 @@ -OldaleTown_House2: @ 8482B9C +OldaleTown_House2: .4byte House2_Layout .4byte OldaleTown_House2_MapEvents .4byte OldaleTown_House2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S4 - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/OldaleTown_Mart/events.inc b/data/maps/OldaleTown_Mart/events.inc index 22b308364a..2d29aedba7 100644 --- a/data/maps/OldaleTown_Mart/events.inc +++ b/data/maps/OldaleTown_Mart/events.inc @@ -1,12 +1,12 @@ -OldaleTown_Mart_EventObjects: @ 852D95C +OldaleTown_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0 -OldaleTown_Mart_MapWarps: @ 852D9A4 +OldaleTown_Mart_MapWarps: warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN warp_def 4, 7, 0, 3, MAP_OLDALE_TOWN -OldaleTown_Mart_MapEvents:: @ 852D9B4 +OldaleTown_Mart_MapEvents:: map_events OldaleTown_Mart_EventObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index df506157b2..a371273bd8 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -1,10 +1,10 @@ -OldaleTown_Mart: @ 8482BF0 +OldaleTown_Mart: .4byte Mart_Layout .4byte OldaleTown_Mart_MapEvents .4byte OldaleTown_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/OldaleTown_PokemonCenter_1F/events.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc index ba50faea90..f05c854b4c 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/events.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -OldaleTown_PokemonCenter_1F_EventObjects: @ 852D844 +OldaleTown_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0 object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0 -OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4 +OldaleTown_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN warp_def 6, 8, 3, 2, MAP_OLDALE_TOWN warp_def 1, 6, 4, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_2F -OldaleTown_PokemonCenter_1F_MapEvents:: @ 852D8BC +OldaleTown_PokemonCenter_1F_MapEvents:: map_events OldaleTown_PokemonCenter_1F_EventObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index 250f5d1644..394ca49695 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -OldaleTown_PokemonCenter_1F: @ 8482BB8 +OldaleTown_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte OldaleTown_PokemonCenter_1F_MapEvents .4byte OldaleTown_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/OldaleTown_PokemonCenter_2F/events.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc index 34f343eb46..2f155ed57c 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/events.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -OldaleTown_PokemonCenter_2F_EventObjects: @ 852D8D0 +OldaleTown_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930 +OldaleTown_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -OldaleTown_PokemonCenter_2F_MapEvents:: @ 852D948 +OldaleTown_PokemonCenter_2F_MapEvents:: map_events OldaleTown_PokemonCenter_2F_EventObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 1562c900f8..33437b8637 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -OldaleTown_PokemonCenter_2F: @ 8482BD4 +OldaleTown_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte OldaleTown_PokemonCenter_2F_MapEvents .4byte OldaleTown_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown/connections.inc b/data/maps/PacifidlogTown/connections.inc index 5c84301bf5..bea3619dd0 100644 --- a/data/maps/PacifidlogTown/connections.inc +++ b/data/maps/PacifidlogTown/connections.inc @@ -1,8 +1,8 @@ -PacifidlogTown_MapConnectionsList: @ 84866B4 +PacifidlogTown_MapConnectionsList: connection left, 0, MAP_ROUTE132 connection right, 0, MAP_ROUTE131 -PacifidlogTown_MapConnections: @ 84866CC - .4byte 0x2 +PacifidlogTown_MapConnections: + .4byte 2 .4byte PacifidlogTown_MapConnectionsList diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc index f73c1d14a5..2754afc4d5 100644 --- a/data/maps/PacifidlogTown/events.inc +++ b/data/maps/PacifidlogTown/events.inc @@ -1,9 +1,9 @@ -PacifidlogTown_EventObjects: @ 8527DE8 +PacifidlogTown_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0 object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0 object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0 -PacifidlogTown_MapWarps: @ 8527E30 +PacifidlogTown_MapWarps: warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F warp_def 16, 13, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE1 warp_def 3, 22, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE2 @@ -11,11 +11,11 @@ PacifidlogTown_MapWarps: @ 8527E30 warp_def 2, 12, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE4 warp_def 17, 21, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE5 -PacifidlogTown_MapBGEvents: @ 8527E60 +PacifidlogTown_MapBGEvents: bg_event 9, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_271E73 bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PacifidlogTown_EventScript_1EBADE bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_271E73 -PacifidlogTown_MapEvents:: @ 8527E84 +PacifidlogTown_MapEvents:: map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index 786fa9d713..0232c06134 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown: @ 848265C +PacifidlogTown: .4byte PacifidlogTown_Layout .4byte PacifidlogTown_MapEvents .4byte PacifidlogTown_MapScripts .4byte PacifidlogTown_MapConnections .2byte MUS_MINAMO - .2byte 16 + .2byte LAYOUT_PACIFIDLOG_TOWN .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/PacifidlogTown_House1/events.inc b/data/maps/PacifidlogTown_House1/events.inc index ac082b74a3..3b5b06af7b 100644 --- a/data/maps/PacifidlogTown_House1/events.inc +++ b/data/maps/PacifidlogTown_House1/events.inc @@ -1,11 +1,11 @@ -PacifidlogTown_House1_EventObjects: @ 852EBA0 +PacifidlogTown_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0 -PacifidlogTown_House1_MapWarps: @ 852EBD0 +PacifidlogTown_House1_MapWarps: warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 1, MAP_PACIFIDLOG_TOWN -PacifidlogTown_House1_MapEvents:: @ 852EBE0 +PacifidlogTown_House1_MapEvents:: map_events PacifidlogTown_House1_EventObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index a4f350e069..53a3499ce9 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_House1: @ 8482F8C +PacifidlogTown_House1: .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House1_MapEvents .4byte PacifidlogTown_House1_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 77 + .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE1 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown_House2/events.inc b/data/maps/PacifidlogTown_House2/events.inc index fae916c735..5a521ab4b9 100644 --- a/data/maps/PacifidlogTown_House2/events.inc +++ b/data/maps/PacifidlogTown_House2/events.inc @@ -1,12 +1,12 @@ -PacifidlogTown_House2_EventObjects: @ 852EBF4 +PacifidlogTown_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203792, 0 object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203891, 0 object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0 -PacifidlogTown_House2_MapWarps: @ 852EC3C +PacifidlogTown_House2_MapWarps: warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 2, MAP_PACIFIDLOG_TOWN -PacifidlogTown_House2_MapEvents:: @ 852EC4C +PacifidlogTown_House2_MapEvents:: map_events PacifidlogTown_House2_EventObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index 8a3e0ada4e..f41349ba5b 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_House2: @ 8482FA8 +PacifidlogTown_House2: .4byte PacifidlogTown_House2_Layout .4byte PacifidlogTown_House2_MapEvents .4byte PacifidlogTown_House2_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 78 + .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE2 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown_House3/events.inc b/data/maps/PacifidlogTown_House3/events.inc index 30460329a2..7f18a831e5 100644 --- a/data/maps/PacifidlogTown_House3/events.inc +++ b/data/maps/PacifidlogTown_House3/events.inc @@ -1,11 +1,11 @@ -PacifidlogTown_House3_EventObjects: @ 852EC60 +PacifidlogTown_House3_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0 -PacifidlogTown_House3_MapWarps: @ 852EC90 +PacifidlogTown_House3_MapWarps: warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 3, MAP_PACIFIDLOG_TOWN -PacifidlogTown_House3_MapEvents:: @ 852ECA0 +PacifidlogTown_House3_MapEvents:: map_events PacifidlogTown_House3_EventObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index ed538fa8b0..9f6286b13a 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_House3: @ 8482FC4 +PacifidlogTown_House3: .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House3_MapEvents .4byte PacifidlogTown_House3_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 77 + .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE1 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown_House4/events.inc b/data/maps/PacifidlogTown_House4/events.inc index 740cc4ba34..ed736434f4 100644 --- a/data/maps/PacifidlogTown_House4/events.inc +++ b/data/maps/PacifidlogTown_House4/events.inc @@ -1,12 +1,12 @@ -PacifidlogTown_House4_EventObjects: @ 852ECB4 +PacifidlogTown_House4_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0 -PacifidlogTown_House4_MapWarps: @ 852ECFC +PacifidlogTown_House4_MapWarps: warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 4, MAP_PACIFIDLOG_TOWN -PacifidlogTown_House4_MapEvents:: @ 852ED0C +PacifidlogTown_House4_MapEvents:: map_events PacifidlogTown_House4_EventObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index 7108a0104d..ff9240d0d6 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_House4: @ 8482FE0 +PacifidlogTown_House4: .4byte PacifidlogTown_House2_Layout .4byte PacifidlogTown_House4_MapEvents .4byte PacifidlogTown_House4_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 78 + .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE2 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown_House5/events.inc b/data/maps/PacifidlogTown_House5/events.inc index 8d7f0b0c0c..d3e00938a8 100644 --- a/data/maps/PacifidlogTown_House5/events.inc +++ b/data/maps/PacifidlogTown_House5/events.inc @@ -1,11 +1,11 @@ -PacifidlogTown_House5_EventObjects: @ 852ED20 +PacifidlogTown_House5_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0 -PacifidlogTown_House5_MapWarps: @ 852ED50 +PacifidlogTown_House5_MapWarps: warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 5, MAP_PACIFIDLOG_TOWN -PacifidlogTown_House5_MapEvents:: @ 852ED60 +PacifidlogTown_House5_MapEvents:: map_events PacifidlogTown_House5_EventObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index 07da6a24dc..a70ac39920 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_House5: @ 8482FFC +PacifidlogTown_House5: .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House5_MapEvents .4byte PacifidlogTown_House5_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 77 + .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE1 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc index 80c8a8c712..edc6e916f7 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc @@ -1,15 +1,15 @@ -PacifidlogTown_PokemonCenter_1F_EventObjects: @ 852EA70 +PacifidlogTown_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0 object_event 2, EVENT_OBJ_GFX_OLD_MAN, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0 object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0 object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 12, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0 -PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8 +PacifidlogTown_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN warp_def 6, 8, 3, 0, MAP_PACIFIDLOG_TOWN warp_def 1, 6, 4, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F -PacifidlogTown_PokemonCenter_1F_MapEvents:: @ 852EB00 +PacifidlogTown_PokemonCenter_1F_MapEvents:: map_events PacifidlogTown_PokemonCenter_1F_EventObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index 9db47a72be..39135ef6ac 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_PokemonCenter_1F: @ 8482F54 +PacifidlogTown_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte PacifidlogTown_PokemonCenter_1F_MapEvents .4byte PacifidlogTown_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc index d41f1fa716..1d0e1a449c 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -PacifidlogTown_PokemonCenter_2F_EventObjects: @ 852EB14 +PacifidlogTown_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74 +PacifidlogTown_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 852EB8C +PacifidlogTown_PokemonCenter_2F_MapEvents:: map_events PacifidlogTown_PokemonCenter_2F_EventObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index e16d7b5e53..a6c1609d32 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_PokemonCenter_2F: @ 8482F70 +PacifidlogTown_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte PacifidlogTown_PokemonCenter_2F_MapEvents .4byte PacifidlogTown_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity/connections.inc b/data/maps/PetalburgCity/connections.inc index 96bd6cbce1..0c576c79f4 100644 --- a/data/maps/PetalburgCity/connections.inc +++ b/data/maps/PetalburgCity/connections.inc @@ -1,8 +1,8 @@ -PetalburgCity_MapConnectionsList: @ 84866D4 +PetalburgCity_MapConnectionsList: connection left, -50, MAP_ROUTE104 connection right, 10, MAP_ROUTE102 -PetalburgCity_MapConnections: @ 84866EC - .4byte 0x2 +PetalburgCity_MapConnections: + .4byte 2 .4byte PetalburgCity_MapConnectionsList diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc index 10d85c9392..83b3d227eb 100644 --- a/data/maps/PetalburgCity/events.inc +++ b/data/maps/PetalburgCity/events.inc @@ -1,4 +1,4 @@ -PetalburgCity_EventObjects: @ 8525FD0 +PetalburgCity_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 16, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_WALLY object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0 @@ -9,7 +9,7 @@ PetalburgCity_EventObjects: @ 8525FD0 object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0 object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_SCOTT -PetalburgCity_MapWarps: @ 85260A8 +PetalburgCity_MapWarps: warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1 warp_def 7, 5, 0, 0, MAP_PETALBURG_CITY_WALLYS_HOUSE warp_def 15, 8, 0, 0, MAP_PETALBURG_CITY_GYM @@ -17,7 +17,7 @@ PetalburgCity_MapWarps: @ 85260A8 warp_def 20, 24, 0, 0, MAP_PETALBURG_CITY_HOUSE2 warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART -PetalburgCity_MapCoordEvents: @ 85260D8 +PetalburgCity_MapCoordEvents: coord_event 8, 10, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC49A coord_event 8, 11, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4A6 coord_event 8, 12, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4B2 @@ -27,7 +27,7 @@ PetalburgCity_MapCoordEvents: @ 85260D8 coord_event 4, 12, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6BD coord_event 4, 13, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6D3 -PetalburgCity_MapBGEvents: @ 8526158 +PetalburgCity_MapBGEvents: bg_event 17, 10, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC476 bg_event 26, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A bg_event 21, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73 @@ -37,6 +37,6 @@ PetalburgCity_MapBGEvents: @ 8526158 bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC491 bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY -PetalburgCity_MapEvents:: @ 85261B8 +PetalburgCity_MapEvents:: map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index 5cf3cc6e15..4aafc87a60 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -1,10 +1,10 @@ -PetalburgCity: @ 84824B8 +PetalburgCity: .4byte PetalburgCity_Layout .4byte PetalburgCity_MapEvents .4byte PetalburgCity_MapScripts .4byte PetalburgCity_MapConnections .2byte MUS_MACHI_S2 - .2byte 1 + .2byte LAYOUT_PETALBURG_CITY .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc index 4c75dc7f67..81b244f2ec 100644 --- a/data/maps/PetalburgCity_Gym/events.inc +++ b/data/maps/PetalburgCity_Gym/events.inc @@ -1,4 +1,4 @@ -PetalburgCity_Gym_EventObjects: @ 852EDC8 +PetalburgCity_Gym_EventObjects: object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, FLAG_HIDE_PETALYBURG_GYM_NORMAN object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 94, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 4, 81, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0 @@ -11,7 +11,7 @@ PetalburgCity_Gym_EventObjects: @ 852EDC8 object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_GYM_WALLY object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE -PetalburgCity_Gym_MapWarps: @ 852EED0 +PetalburgCity_Gym_MapWarps: warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY warp_def 5, 111, 3, 2, MAP_PETALBURG_CITY warp_def 1, 105, 3, 3, MAP_PETALBURG_CITY_GYM @@ -51,7 +51,7 @@ PetalburgCity_Gym_MapWarps: @ 852EED0 warp_def 7, 7, 3, 33, MAP_PETALBURG_CITY_GYM warp_def 6, 7, 3, 33, MAP_PETALBURG_CITY_GYM -PetalburgCity_Gym_MapBGEvents: @ 852F000 +PetalburgCity_Gym_MapBGEvents: bg_event 1, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205137 bg_event 7, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205187 bg_event 1, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2051BC @@ -67,6 +67,6 @@ PetalburgCity_Gym_MapBGEvents: @ 852F000 bg_event 1, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_20576E bg_event 7, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_20577E -PetalburgCity_Gym_MapEvents:: @ 852F0A8 +PetalburgCity_Gym_MapEvents:: map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index 626f37c3d7..d58d30b909 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_Gym: @ 8483034 +PetalburgCity_Gym: .4byte PetalburgCity_Gym_Layout .4byte PetalburgCity_Gym_MapEvents .4byte PetalburgCity_Gym_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 79 + .2byte LAYOUT_PETALBURG_CITY_GYM .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity_House1/events.inc b/data/maps/PetalburgCity_House1/events.inc index bcb91e6370..9a22e581d6 100644 --- a/data/maps/PetalburgCity_House1/events.inc +++ b/data/maps/PetalburgCity_House1/events.inc @@ -1,11 +1,11 @@ -PetalburgCity_House1_EventObjects: @ 852F0BC +PetalburgCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0 -PetalburgCity_House1_MapWarps: @ 852F0EC +PetalburgCity_House1_MapWarps: warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY warp_def 4, 8, 0, 0, MAP_PETALBURG_CITY -PetalburgCity_House1_MapEvents:: @ 852F0FC +PetalburgCity_House1_MapEvents:: map_events PetalburgCity_House1_EventObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 058d2ae6b9..7582e63369 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_House1: @ 8483050 +PetalburgCity_House1: .4byte House1_Layout .4byte PetalburgCity_House1_MapEvents .4byte PetalburgCity_House1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S2 - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity_House2/events.inc b/data/maps/PetalburgCity_House2/events.inc index 660f1efe3f..cc964b56c9 100644 --- a/data/maps/PetalburgCity_House2/events.inc +++ b/data/maps/PetalburgCity_House2/events.inc @@ -1,11 +1,11 @@ -PetalburgCity_House2_EventObjects: @ 852F110 +PetalburgCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0 -PetalburgCity_House2_MapWarps: @ 852F140 +PetalburgCity_House2_MapWarps: warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY warp_def 4, 7, 0, 4, MAP_PETALBURG_CITY -PetalburgCity_House2_MapEvents:: @ 852F150 +PetalburgCity_House2_MapEvents:: map_events PetalburgCity_House2_EventObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index d8ceeafbe6..36eb663c0e 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_House2: @ 848306C +PetalburgCity_House2: .4byte HouseWithBed_Layout .4byte PetalburgCity_House2_MapEvents .4byte PetalburgCity_House2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S2 - .2byte 80 + .2byte LAYOUT_HOUSE_WITH_BED .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity_Mart/events.inc b/data/maps/PetalburgCity_Mart/events.inc index b79aa5cb09..9cb05df7d7 100644 --- a/data/maps/PetalburgCity_Mart/events.inc +++ b/data/maps/PetalburgCity_Mart/events.inc @@ -1,13 +1,13 @@ -PetalburgCity_Mart_EventObjects: @ 852F294 +PetalburgCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0 -PetalburgCity_Mart_MapWarps: @ 852F2F4 +PetalburgCity_Mart_MapWarps: warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY warp_def 4, 7, 0, 5, MAP_PETALBURG_CITY -PetalburgCity_Mart_MapEvents:: @ 852F304 +PetalburgCity_Mart_MapEvents:: map_events PetalburgCity_Mart_EventObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index 757430cab1..e95fb35537 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_Mart: @ 84830C0 +PetalburgCity_Mart: .4byte Mart_Layout .4byte PetalburgCity_Mart_MapEvents .4byte PetalburgCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc index 8a1de856d4..de02c8a8ee 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc @@ -1,15 +1,15 @@ -PetalburgCity_PokemonCenter_1F_EventObjects: @ 852F164 +PetalburgCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0 object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0 object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0 -PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC +PetalburgCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY warp_def 6, 8, 3, 3, MAP_PETALBURG_CITY warp_def 1, 6, 4, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_2F -PetalburgCity_PokemonCenter_1F_MapEvents:: @ 852F1F4 +PetalburgCity_PokemonCenter_1F_MapEvents:: map_events PetalburgCity_PokemonCenter_1F_EventObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index 61b328753f..08ec4783fb 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_PokemonCenter_1F: @ 8483088 +PetalburgCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte PetalburgCity_PokemonCenter_1F_MapEvents .4byte PetalburgCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc index 08bd8f5243..49514363b3 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -PetalburgCity_PokemonCenter_2F_EventObjects: @ 852F208 +PetalburgCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268 +PetalburgCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -PetalburgCity_PokemonCenter_2F_MapEvents:: @ 852F280 +PetalburgCity_PokemonCenter_2F_MapEvents:: map_events PetalburgCity_PokemonCenter_2F_EventObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index c6cacfc3a0..779a106b91 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_PokemonCenter_2F: @ 84830A4 +PetalburgCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte PetalburgCity_PokemonCenter_2F_MapEvents .4byte PetalburgCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity_WallysHouse/events.inc b/data/maps/PetalburgCity_WallysHouse/events.inc index e30f3a487b..98487bd2ce 100644 --- a/data/maps/PetalburgCity_WallysHouse/events.inc +++ b/data/maps/PetalburgCity_WallysHouse/events.inc @@ -1,11 +1,11 @@ -PetalburgCity_WallysHouse_EventObjects: @ 852ED74 +PetalburgCity_WallysHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0 -PetalburgCity_WallysHouse_MapWarps: @ 852EDA4 +PetalburgCity_WallysHouse_MapWarps: warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY warp_def 4, 7, 0, 1, MAP_PETALBURG_CITY -PetalburgCity_WallysHouse_MapEvents:: @ 852EDB4 +PetalburgCity_WallysHouse_MapEvents:: map_events PetalburgCity_WallysHouse_EventObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index 04b7236660..2c49b77f64 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_WallysHouse: @ 8483018 +PetalburgCity_WallysHouse: .4byte House2_Layout .4byte PetalburgCity_WallysHouse_MapEvents .4byte PetalburgCity_WallysHouse_MapScripts .4byte 0x0 .2byte MUS_MACHI_S2 - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc index b64e388854..95326cedfe 100644 --- a/data/maps/PetalburgWoods/events.inc +++ b/data/maps/PetalburgWoods/events.inc @@ -1,4 +1,4 @@ -PetalburgWoods_EventObjects: @ 85345E4 +PetalburgWoods_EventObjects: object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, FLAG_TEMP_11 object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, FLAG_TEMP_12 object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT @@ -13,7 +13,7 @@ PetalburgWoods_EventObjects: @ 85345E4 object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_291129, FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_22E222, 0 -PetalburgWoods_MapWarps: @ 853471C +PetalburgWoods_MapWarps: warp_def 14, 5, 0, 2, MAP_ROUTE104 warp_def 15, 5, 0, 3, MAP_ROUTE104 warp_def 16, 38, 0, 4, MAP_ROUTE104 @@ -21,11 +21,11 @@ PetalburgWoods_MapWarps: @ 853471C warp_def 36, 38, 0, 6, MAP_ROUTE104 warp_def 37, 38, 0, 7, MAP_ROUTE104 -PetalburgWoods_MapCoordEvents: @ 853474C +PetalburgWoods_MapCoordEvents: coord_event 26, 23, 3, VAR_0x4098, 0, PetalburgWoods_EventScript_22DFD7 coord_event 27, 23, 3, VAR_0x4098, 0, PetalburgWoods_EventScript_22E079 -PetalburgWoods_MapBGEvents: @ 853476C +PetalburgWoods_MapBGEvents: bg_event 14, 32, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E25B bg_hidden_item_event 39, 35, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1 @@ -33,6 +33,6 @@ PetalburgWoods_MapBGEvents: @ 853476C bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL bg_event 11, 8, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E264 -PetalburgWoods_MapEvents:: @ 85347B4 +PetalburgWoods_MapEvents:: map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index e25f6f7507..530c2f2aa4 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -1,10 +1,10 @@ -PetalburgWoods: @ 8483FF4 +PetalburgWoods: .4byte PetalburgWoods_Layout .4byte PetalburgWoods_MapEvents .4byte PetalburgWoods_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 135 + .2byte LAYOUT_PETALBURG_WOODS .byte MAPSEC_PETALBURG_WOODS .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc index 06c6588a94..44829f60d4 100644 --- a/data/maps/RecordCorner/events.inc +++ b/data/maps/RecordCorner/events.inc @@ -1,18 +1,18 @@ -RecordCorner_EventObjects: @ 8539DFC +RecordCorner_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0 -RecordCorner_MapWarps: @ 8539E14 +RecordCorner_MapWarps: warp_def 8, 9, 3, 127, MAP_NONE warp_def 9, 9, 3, 127, MAP_NONE warp_def 11, 9, 3, 127, MAP_NONE warp_def 10, 9, 3, 127, MAP_NONE -RecordCorner_MapCoordEvents: @ 8539E34 +RecordCorner_MapCoordEvents: coord_event 6, 4, 3, VAR_TEMP_0, 0, gUnknown_0827741D coord_event 6, 6, 3, VAR_TEMP_0, 0, gUnknown_08277447 coord_event 13, 4, 3, VAR_TEMP_0, 0, gUnknown_08277432 coord_event 13, 6, 3, VAR_TEMP_0, 0, gUnknown_0827745C -RecordCorner_MapEvents:: @ 8539E74 +RecordCorner_MapEvents:: map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index c0864092b9..0a3254abdb 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -1,10 +1,10 @@ -RecordCorner: @ 8484D68 +RecordCorner: .4byte RecordCorner_Layout .4byte RecordCorner_MapEvents .4byte RecordCorner_MapScripts .4byte 0x0 .2byte MUS_RAINBOW - .2byte 223 + .2byte LAYOUT_RECORD_CORNER .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route101/connections.inc b/data/maps/Route101/connections.inc index f5f35e974c..32ee511a8f 100644 --- a/data/maps/Route101/connections.inc +++ b/data/maps/Route101/connections.inc @@ -1,8 +1,8 @@ -Route101_MapConnectionsList: @ 848680C +Route101_MapConnectionsList: connection up, 0, MAP_OLDALE_TOWN connection down, 0, MAP_LITTLEROOT_TOWN -Route101_MapConnections: @ 8486824 - .4byte 0x2 +Route101_MapConnections: + .4byte 2 .4byte Route101_MapConnectionsList diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc index 77ee2848f7..b14649cc0f 100644 --- a/data/maps/Route101/events.inc +++ b/data/maps/Route101/events.inc @@ -1,4 +1,4 @@ -Route101_EventObjects: @ 8527E98 +Route101_EventObjects: object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0 object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBE16, FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG @@ -6,7 +6,7 @@ Route101_EventObjects: @ 8527E98 object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_272141, FLAG_HIDE_ROUTE_101_BIRCH object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_1EBE04, FLAG_HIDE_ROUTE_101_BOY -Route101_MapCoordEvents: @ 8527F28 +Route101_MapCoordEvents: coord_event 10, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE coord_event 11, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE coord_event 10, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD4E @@ -17,9 +17,9 @@ Route101_MapCoordEvents: @ 8527F28 coord_event 6, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 coord_event 7, 13, 3, VAR_0x4060, 2, Route101_EventScript_1EBD7A -Route101_MapBGEvents: @ 8527FB8 +Route101_MapBGEvents: bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route101_EventScript_1EBE0D -Route101_MapEvents:: @ 8527FC4 +Route101_MapEvents:: map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index 5a98f7e22f..b40de8df96 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -1,10 +1,10 @@ -Route101: @ 8482678 +Route101: .4byte Route101_Layout .4byte Route101_MapEvents .4byte Route101_MapScripts .4byte Route101_MapConnections .2byte MUS_DOORO1 - .2byte 17 + .2byte LAYOUT_ROUTE101 .byte MAPSEC_ROUTE_101 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route102/connections.inc b/data/maps/Route102/connections.inc index 419cfeec95..1b76d47f5f 100644 --- a/data/maps/Route102/connections.inc +++ b/data/maps/Route102/connections.inc @@ -1,8 +1,8 @@ -Route102_MapConnectionsList: @ 848682C +Route102_MapConnectionsList: connection left, -10, MAP_PETALBURG_CITY connection right, 0, MAP_OLDALE_TOWN -Route102_MapConnections: @ 8486844 - .4byte 0x2 +Route102_MapConnections: + .4byte 2 .4byte Route102_MapConnectionsList diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc index b2299feea9..65acbee41e 100644 --- a/data/maps/Route102/events.inc +++ b/data/maps/Route102/events.inc @@ -1,4 +1,4 @@ -Route102_EventObjects: @ 8527FD8 +Route102_EventObjects: object_event 1, EVENT_OBJ_GFX_LITTLE_BOY, 0, 18, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0 object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route102_EventScript_1EC105, 0 object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0 @@ -9,10 +9,10 @@ Route102_EventObjects: @ 8527FD8 object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 1, BerryTreeScript, 0 object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0 -Route102_MapBGEvents: @ 85280B0 +Route102_MapBGEvents: bg_event 17, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0F3 bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0EA -Route102_MapEvents:: @ 85280C8 +Route102_MapEvents:: map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 7a0fcacdab..6b5c24b0c6 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -1,10 +1,10 @@ -Route102: @ 8482694 +Route102: .4byte Route102_Layout .4byte Route102_MapEvents .4byte Route102_MapScripts .4byte Route102_MapConnections .2byte MUS_DOORO1 - .2byte 18 + .2byte LAYOUT_ROUTE102 .byte MAPSEC_ROUTE_102 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route103/connections.inc b/data/maps/Route103/connections.inc index 0759d872f4..cff488cf2e 100644 --- a/data/maps/Route103/connections.inc +++ b/data/maps/Route103/connections.inc @@ -1,8 +1,8 @@ -Route103_MapConnectionsList: @ 848684C +Route103_MapConnectionsList: connection down, 0, MAP_OLDALE_TOWN connection right, -60, MAP_ROUTE110 -Route103_MapConnections: @ 8486864 - .4byte 0x2 +Route103_MapConnections: + .4byte 2 .4byte Route103_MapConnectionsList diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc index 5a6cc8866c..8794121571 100644 --- a/data/maps/Route103/events.inc +++ b/data/maps/Route103/events.inc @@ -1,4 +1,4 @@ -Route103_EventObjects: @ 85280DC +Route103_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 49, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, FLAG_HIDE_ROUTE_103_RIVAL object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 71, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0 @@ -20,12 +20,12 @@ Route103_EventObjects: @ 85280DC object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route103_EventScript_1EC778, 0 object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CF2, FLAG_ITEM_ROUTE_103_PP_UP -Route103_MapWarps: @ 85282BC +Route103_MapWarps: warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE -Route103_MapBGEvents: @ 85282C4 +Route103_MapBGEvents: bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route103_EventScript_1EC5EB -Route103_MapEvents:: @ 85282D0 +Route103_MapEvents:: map_events Route103_EventObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index b614f32eb0..942ec632cb 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -1,10 +1,10 @@ -Route103: @ 84826B0 +Route103: .4byte Route103_Layout .4byte Route103_MapEvents .4byte Route103_MapScripts .4byte Route103_MapConnections .2byte MUS_DOORO1 - .2byte 19 + .2byte LAYOUT_ROUTE103 .byte MAPSEC_ROUTE_103 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route104/connections.inc b/data/maps/Route104/connections.inc index ce605c828f..193f898335 100644 --- a/data/maps/Route104/connections.inc +++ b/data/maps/Route104/connections.inc @@ -1,9 +1,9 @@ -Route104_MapConnectionsList: @ 848686C +Route104_MapConnectionsList: connection up, 0, MAP_RUSTBORO_CITY connection down, 0, MAP_ROUTE105 connection right, 50, MAP_PETALBURG_CITY -Route104_MapConnections: @ 8486890 - .4byte 0x3 +Route104_MapConnections: + .4byte 3 .4byte Route104_MapConnectionsList diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc index 53e868559d..8b67a0854a 100644 --- a/data/maps/Route104/events.inc +++ b/data/maps/Route104/events.inc @@ -1,4 +1,4 @@ -Route104_EventObjects: @ 85282E4 +Route104_EventObjects: object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0 object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED006, 0 object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0 @@ -34,7 +34,7 @@ Route104_EventObjects: @ 85282E4 object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0 object_event 34, EVENT_OBJ_GFX_VAR_0, 0, 17, 50, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ECC9E, FLAG_HIDE_ROUTE_104_RIVAL -Route104_MapWarps: @ 8528614 +Route104_MapWarps: warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE warp_def 5, 18, 0, 0, MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP warp_def 10, 30, 3, 0, MAP_PETALBURG_WOODS @@ -44,10 +44,10 @@ Route104_MapWarps: @ 8528614 warp_def 32, 42, 3, 4, MAP_PETALBURG_WOODS warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS -Route104_MapCoordEvents: @ 8528654 +Route104_MapCoordEvents: coord_event 17, 51, 3, VAR_0x4063, 1, Route104_EventScript_1ECCB3 -Route104_MapBGEvents: @ 8528664 +Route104_MapBGEvents: bg_event 20, 50, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED018 bg_event 27, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED021 bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED02A @@ -59,6 +59,6 @@ Route104_MapBGEvents: @ 8528664 bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE -Route104_MapEvents:: @ 85286DC +Route104_MapEvents:: map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index 101e690d5c..6f8e0776b7 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -1,10 +1,10 @@ -Route104: @ 84826CC +Route104: .4byte Route104_Layout .4byte Route104_MapEvents .4byte Route104_MapScripts .4byte Route104_MapConnections .2byte MUS_NEXTROAD - .2byte 20 + .2byte LAYOUT_ROUTE104 .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route104_MrBrineysHouse/events.inc b/data/maps/Route104_MrBrineysHouse/events.inc index daee7759a1..d1924756c3 100644 --- a/data/maps/Route104_MrBrineysHouse/events.inc +++ b/data/maps/Route104_MrBrineysHouse/events.inc @@ -1,11 +1,11 @@ -Route104_MrBrineysHouse_EventObjects: @ 8533AD4 +Route104_MrBrineysHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 3, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, FLAG_HIDE_BRINEYS_HOUSE_PEEKO -Route104_MrBrineysHouse_MapWarps: @ 8533B04 +Route104_MrBrineysHouse_MapWarps: warp_def 5, 8, 0, 0, MAP_ROUTE104 warp_def 6, 8, 0, 0, MAP_ROUTE104 -Route104_MrBrineysHouse_MapEvents:: @ 8533B14 +Route104_MrBrineysHouse_MapEvents:: map_events Route104_MrBrineysHouse_EventObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index c52a076de3..784db2d2da 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -1,10 +1,10 @@ -Route104_MrBrineysHouse: @ 8483D70 +Route104_MrBrineysHouse: .4byte Route104_MrBrineysHouse_Layout .4byte Route104_MrBrineysHouse_MapEvents .4byte Route104_MrBrineysHouse_MapScripts .4byte 0x0 .2byte MUS_MACHI_S2 - .2byte 102 + .2byte LAYOUT_ROUTE104_MR_BRINEYS_HOUSE .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route104_PrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc index 52e57efc77..c33268ff65 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/events.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/events.inc @@ -1,12 +1,12 @@ -Route104_PrettyPetalFlowerShop_EventObjects: @ 8533B28 +Route104_PrettyPetalFlowerShop_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0 object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0 -Route104_PrettyPetalFlowerShop_MapWarps: @ 8533B70 +Route104_PrettyPetalFlowerShop_MapWarps: warp_def 2, 8, 0, 1, MAP_ROUTE104 warp_def 3, 8, 0, 1, MAP_ROUTE104 -Route104_PrettyPetalFlowerShop_MapEvents:: @ 8533B80 +Route104_PrettyPetalFlowerShop_MapEvents:: map_events Route104_PrettyPetalFlowerShop_EventObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index eaf0735503..b201d0a3e5 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -1,10 +1,10 @@ -Route104_PrettyPetalFlowerShop: @ 8483D8C +Route104_PrettyPetalFlowerShop: .4byte Route104_PrettyPetalFlowerShop_Layout .4byte Route104_PrettyPetalFlowerShop_MapEvents .4byte Route104_PrettyPetalFlowerShop_MapScripts .4byte 0x0 .2byte MUS_MACHI_S2 - .2byte 117 + .2byte LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route104_Prototype/events.inc b/data/maps/Route104_Prototype/events.inc index 08976e5a89..4f1dfef12a 100644 --- a/data/maps/Route104_Prototype/events.inc +++ b/data/maps/Route104_Prototype/events.inc @@ -1,3 +1,3 @@ -Route104_Prototype_MapEvents:: @ 853DDC0 +Route104_Prototype_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 0de3a4b478..7bc8d0a876 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -1,10 +1,10 @@ -Route104_Prototype: @ 8485AF8 +Route104_Prototype: .4byte Route104_Prototype_Layout .4byte Route104_Prototype_MapEvents .4byte Route104_Prototype_MapScripts .4byte 0x0 .2byte MUS_NEXTROAD - .2byte 287 + .2byte LAYOUT_ROUTE104_PROTOTYPE .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc index e66b3c841c..76dd77e02a 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc @@ -1,3 +1,3 @@ -Route104_PrototypePrettyPetalFlowerShop_MapEvents:: @ 853DDD4 +Route104_PrototypePrettyPetalFlowerShop_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index e72f9a6060..53b543e4eb 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -1,10 +1,10 @@ -Route104_PrototypePrettyPetalFlowerShop: @ 8485B14 +Route104_PrototypePrettyPetalFlowerShop: .4byte Route104_PrettyPetalFlowerShop_Layout .4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents .4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts .4byte 0x0 .2byte MUS_NEXTROAD - .2byte 117 + .2byte LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route105/connections.inc b/data/maps/Route105/connections.inc index ac03944b76..89c412cc6a 100644 --- a/data/maps/Route105/connections.inc +++ b/data/maps/Route105/connections.inc @@ -1,9 +1,9 @@ -Route105_MapConnectionsList: @ 8486898 +Route105_MapConnectionsList: connection up, 0, MAP_ROUTE104 connection down, 0, MAP_ROUTE106 connection dive, 0, MAP_UNDERWATER6 -Route105_MapConnections: @ 84868BC - .4byte 0x3 +Route105_MapConnections: + .4byte 3 .4byte Route105_MapConnectionsList diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc index e22aa668cc..851a26fdc7 100644 --- a/data/maps/Route105/events.inc +++ b/data/maps/Route105/events.inc @@ -1,4 +1,4 @@ -Route105_EventObjects: @ 85286F0 +Route105_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 19, 60, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route105_EventScript_1EE261, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 7, 0, 1, 3, Route105_EventScript_1EE278, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 7, 1, 3, Route105_EventScript_1EE28F, 0 @@ -8,13 +8,13 @@ Route105_EventObjects: @ 85286F0 object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0 object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, MOVEMENT_TYPE_FACE_UP, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0 -Route105_MapWarps: @ 85287B0 +Route105_MapWarps: warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE -Route105_MapBGEvents: @ 85287B8 +Route105_MapBGEvents: bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL -Route105_MapEvents:: @ 85287D0 +Route105_MapEvents:: map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index 5c6b2fc153..ac3e766dd1 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -1,10 +1,10 @@ -Route105: @ 84826E8 +Route105: .4byte Route105_Layout .4byte Route105_MapEvents .4byte Route105_MapScripts .4byte Route105_MapConnections .2byte MUS_NEXTROAD - .2byte 21 + .2byte LAYOUT_ROUTE105 .byte MAPSEC_ROUTE_105 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route106/connections.inc b/data/maps/Route106/connections.inc index 18f181d2b2..f48a08bd80 100644 --- a/data/maps/Route106/connections.inc +++ b/data/maps/Route106/connections.inc @@ -1,8 +1,8 @@ -Route106_MapConnectionsList: @ 84868C4 +Route106_MapConnectionsList: connection up, 0, MAP_ROUTE105 connection down, 60, MAP_DEWFORD_TOWN -Route106_MapConnections: @ 84868DC - .4byte 0x2 +Route106_MapConnections: + .4byte 2 .4byte Route106_MapConnectionsList diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc index 9ff0f41dd7..6454fc188b 100644 --- a/data/maps/Route106/events.inc +++ b/data/maps/Route106/events.inc @@ -1,19 +1,19 @@ -Route106_EventObjects: @ 85287E4 +Route106_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 5, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 4, 0, 1, 3, Route106_EventScript_1EE493, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0 object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0 object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE523, 0 object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route106_EventScript_290D40, FLAG_ITEM_ROUTE_106_PROTEIN -Route106_MapWarps: @ 852885C +Route106_MapWarps: warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F -Route106_MapBGEvents: @ 8528864 +Route106_MapBGEvents: bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE bg_event 59, 13, 3, BG_EVENT_PLAYER_FACING_ANY, Route106_EventScript_1EE48A -Route106_MapEvents:: @ 8528894 +Route106_MapEvents:: map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index f0f032b8b5..01c7b9ae6d 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -1,10 +1,10 @@ -Route106: @ 8482704 +Route106: .4byte Route106_Layout .4byte Route106_MapEvents .4byte Route106_MapScripts .4byte Route106_MapConnections .2byte MUS_NEXTROAD - .2byte 22 + .2byte LAYOUT_ROUTE106 .byte MAPSEC_ROUTE_106 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route107/connections.inc b/data/maps/Route107/connections.inc index 04ad13b07a..d1bb18b873 100644 --- a/data/maps/Route107/connections.inc +++ b/data/maps/Route107/connections.inc @@ -1,8 +1,8 @@ -Route107_MapConnectionsList: @ 84868E4 +Route107_MapConnectionsList: connection left, 0, MAP_DEWFORD_TOWN connection right, 0, MAP_ROUTE108 -Route107_MapConnections: @ 84868FC - .4byte 0x2 +Route107_MapConnections: + .4byte 2 .4byte Route107_MapConnectionsList diff --git a/data/maps/Route107/events.inc b/data/maps/Route107/events.inc index b67e98384c..461d8cd86c 100644 --- a/data/maps/Route107/events.inc +++ b/data/maps/Route107/events.inc @@ -1,4 +1,4 @@ -Route107_EventObjects: @ 85288A8 +Route107_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 10, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, Route107_EventScript_1EE595, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 23, 11, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 6, 2, 1, 2, Route107_EventScript_1EE5AC, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 7, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0 @@ -7,6 +7,6 @@ Route107_EventObjects: @ 85288A8 object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route107_EventScript_1EE657, 0 object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route107_EventScript_1EE672, 0 -Route107_MapEvents:: @ 8528950 +Route107_MapEvents:: map_events Route107_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index a4ec264ead..db53b811dd 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -1,10 +1,10 @@ -Route107: @ 8482720 +Route107: .4byte Route107_Layout .4byte Route107_MapEvents .4byte Route107_MapScripts .4byte Route107_MapConnections .2byte MUS_NEXTROAD - .2byte 23 + .2byte LAYOUT_ROUTE107 .byte MAPSEC_ROUTE_107 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route108/connections.inc b/data/maps/Route108/connections.inc index f80d0ade2c..9b2d0f1f90 100644 --- a/data/maps/Route108/connections.inc +++ b/data/maps/Route108/connections.inc @@ -1,8 +1,8 @@ -Route108_MapConnectionsList: @ 8486904 +Route108_MapConnectionsList: connection left, 0, MAP_ROUTE107 connection right, -40, MAP_ROUTE109 -Route108_MapConnections: @ 848691C - .4byte 0x2 +Route108_MapConnections: + .4byte 2 .4byte Route108_MapConnectionsList diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc index 094eb0bc78..9e1a088c08 100644 --- a/data/maps/Route108/events.inc +++ b/data/maps/Route108/events.inc @@ -1,4 +1,4 @@ -Route108_EventObjects: @ 8528964 +Route108_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 3, Route108_EventScript_1EE68A, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 1, 1, 1, 3, Route108_EventScript_1EE6B8, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0 @@ -7,12 +7,12 @@ Route108_EventObjects: @ 8528964 object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route108_EventScript_290D4D, FLAG_ITEM_ROUTE_108_STAR_PIECE -Route108_MapWarps: @ 8528A0C +Route108_MapWarps: warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK -Route108_MapBGEvents: @ 8528A14 +Route108_MapBGEvents: bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY -Route108_MapEvents:: @ 8528A20 +Route108_MapEvents:: map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index 106fe3135e..97d4a879d1 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -1,10 +1,10 @@ -Route108: @ 848273C +Route108: .4byte Route108_Layout .4byte Route108_MapEvents .4byte Route108_MapScripts .4byte Route108_MapConnections .2byte MUS_NEXTROAD - .2byte 24 + .2byte LAYOUT_ROUTE108 .byte MAPSEC_ROUTE_108 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route109/connections.inc b/data/maps/Route109/connections.inc index 25a7a0e919..d74fc08ddf 100644 --- a/data/maps/Route109/connections.inc +++ b/data/maps/Route109/connections.inc @@ -1,8 +1,8 @@ -Route109_MapConnectionsList: @ 8486924 +Route109_MapConnectionsList: connection up, 0, MAP_SLATEPORT_CITY connection left, 40, MAP_ROUTE108 -Route109_MapConnections: @ 848693C - .4byte 0x2 +Route109_MapConnections: + .4byte 2 .4byte Route109_MapConnectionsList diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc index 89ee11bb3b..efd0e896fd 100644 --- a/data/maps/Route109/events.inc +++ b/data/maps/Route109/events.inc @@ -1,4 +1,4 @@ -Route109_EventObjects: @ 8528A34 +Route109_EventObjects: object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_1EE910, FLAG_HIDE_ROUTE_108_MR_BRINEY object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0 @@ -24,10 +24,10 @@ Route109_EventObjects: @ 8528A34 object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, FLAG_ITEM_ROUTE_109_POTION object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 17, 56, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0 -Route109_MapWarps: @ 8528C74 +Route109_MapWarps: warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE -Route109_MapBGEvents: @ 8528C7C +Route109_MapBGEvents: bg_event 15, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA2B bg_event 29, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA34 bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE @@ -37,5 +37,6 @@ Route109_MapBGEvents: @ 8528C7C bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2 bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3 -Route109_MapEvents:: @ 8528CDC +Route109_MapEvents:: map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents + diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index 045f422567..9de12f3e68 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -1,10 +1,10 @@ -Route109: @ 8482758 +Route109: .4byte Route109_Layout .4byte Route109_MapEvents .4byte Route109_MapScripts .4byte Route109_MapConnections .2byte MUS_NEXTROAD - .2byte 25 + .2byte LAYOUT_ROUTE109 .byte MAPSEC_ROUTE_109 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route109_SeashoreHouse/events.inc b/data/maps/Route109_SeashoreHouse/events.inc index 0632596a96..7ef23ad7f5 100644 --- a/data/maps/Route109_SeashoreHouse/events.inc +++ b/data/maps/Route109_SeashoreHouse/events.inc @@ -1,13 +1,13 @@ -Route109_SeashoreHouse_EventObjects: @ 853DDE8 +Route109_SeashoreHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0 object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0 object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0 -Route109_SeashoreHouse_MapWarps: @ 853DE48 +Route109_SeashoreHouse_MapWarps: warp_def 6, 9, 0, 0, MAP_ROUTE109 warp_def 7, 9, 0, 0, MAP_ROUTE109 -Route109_SeashoreHouse_MapEvents:: @ 853DE58 +Route109_SeashoreHouse_MapEvents:: map_events Route109_SeashoreHouse_EventObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index 68dc54b777..d8109deaca 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -1,10 +1,10 @@ -Route109_SeashoreHouse: @ 8485B30 +Route109_SeashoreHouse: .4byte Route109_SeashoreHouse_Layout .4byte Route109_SeashoreHouse_MapEvents .4byte Route109_SeashoreHouse_MapScripts .4byte 0x0 .2byte MUS_HIGHTOWN - .2byte 243 + .2byte LAYOUT_ROUTE109_SEASHORE_HOUSE .byte MAPSEC_ROUTE_109 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110/connections.inc b/data/maps/Route110/connections.inc index 22000354f5..d0334b8c5c 100644 --- a/data/maps/Route110/connections.inc +++ b/data/maps/Route110/connections.inc @@ -1,9 +1,9 @@ -Route110_MapConnectionsList: @ 8486944 +Route110_MapConnectionsList: connection up, 0, MAP_MAUVILLE_CITY connection down, 0, MAP_SLATEPORT_CITY connection left, 60, MAP_ROUTE103 -Route110_MapConnections: @ 8486968 - .4byte 0x3 +Route110_MapConnections: + .4byte 3 .4byte Route110_MapConnectionsList diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc index b50e5eec6d..349670c135 100644 --- a/data/maps/Route110/events.inc +++ b/data/maps/Route110/events.inc @@ -1,4 +1,4 @@ -Route110_EventObjects: @ 8528CF0 +Route110_EventObjects: object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF338, 0 object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 14, 69, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route110_EventScript_1EF326, 0 @@ -36,7 +36,7 @@ Route110_EventObjects: @ 8528CF0 object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_EventScript_290D8E, FLAG_ITEM_ROUTE_110_ELIXIR object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_BIRCH -Route110_MapWarps: @ 8529050 +Route110_MapWarps: warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE warp_def 11, 66, 0, 0, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 15, 16, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE @@ -44,7 +44,7 @@ Route110_MapWarps: @ 8529050 warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE -Route110_MapCoordEvents: @ 8529080 +Route110_MapCoordEvents: coord_event 28, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661 coord_event 29, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661 coord_event 33, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF74D @@ -55,7 +55,7 @@ Route110_MapCoordEvents: @ 8529080 coord_event 9, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9E1 coord_event 10, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9EC -Route110_MapBGEvents: @ 8529110 +Route110_MapBGEvents: bg_event 15, 25, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF353 bg_event 9, 51, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF365 bg_event 14, 88, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A @@ -74,6 +74,6 @@ Route110_MapBGEvents: @ 8529110 bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL bg_event 13, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A -Route110_MapEvents:: @ 85291DC +Route110_MapEvents:: map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index 14194cd37b..5edb81ec43 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -1,10 +1,10 @@ -Route110: @ 8482774 +Route110: .4byte Route110_Layout .4byte Route110_MapEvents .4byte Route110_MapScripts .4byte Route110_MapConnections .2byte MUS_DOORO_X1 - .2byte 26 + .2byte LAYOUT_ROUTE110 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc index ee7f5ef172..f9050259c1 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc @@ -1,16 +1,16 @@ -Route110_SeasideCyclingRoadNorthEntrance_EventObjects: @ 853E9A0 +Route110_SeasideCyclingRoadNorthEntrance_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78, 0 -Route110_SeasideCyclingRoadNorthEntrance_MapWarps: @ 853E9B8 +Route110_SeasideCyclingRoadNorthEntrance_MapWarps: warp_def 1, 5, 0, 4, MAP_ROUTE110 warp_def 2, 5, 0, 4, MAP_ROUTE110 warp_def 12, 5, 0, 5, MAP_ROUTE110 warp_def 13, 5, 0, 5, MAP_ROUTE110 -Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents: @ 853E9D8 +Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents: coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84 coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6 -Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 853E9F8 +Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: map_events Route110_SeasideCyclingRoadNorthEntrance_EventObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index 50f4b763ff..008df77af3 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -1,10 +1,10 @@ -Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80 +Route110_SeasideCyclingRoadNorthEntrance: .4byte Route110_SeasideCyclingRoadEntrance_Layout .4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents .4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 256 + .2byte LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc index 8d10ce4997..f64836526e 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc @@ -1,16 +1,16 @@ -Route110_SeasideCyclingRoadSouthEntrance_EventObjects: @ 853EA0C +Route110_SeasideCyclingRoadSouthEntrance_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4, 0 -Route110_SeasideCyclingRoadSouthEntrance_MapWarps: @ 853EA24 +Route110_SeasideCyclingRoadSouthEntrance_MapWarps: warp_def 1, 5, 0, 2, MAP_ROUTE110 warp_def 2, 5, 0, 2, MAP_ROUTE110 warp_def 12, 5, 0, 3, MAP_ROUTE110 warp_def 13, 5, 0, 3, MAP_ROUTE110 -Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents: @ 853EA44 +Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents: coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0 coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13 -Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 853EA64 +Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: map_events Route110_SeasideCyclingRoadSouthEntrance_EventObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index 4e09eeef32..be2646ee27 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -1,10 +1,10 @@ -Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C +Route110_SeasideCyclingRoadSouthEntrance: .4byte Route110_SeasideCyclingRoadEntrance_Layout .4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents .4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 256 + .2byte LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHouseCorridor/events.inc b/data/maps/Route110_TrickHouseCorridor/events.inc index e9d84d56bd..814e46cbe9 100644 --- a/data/maps/Route110_TrickHouseCorridor/events.inc +++ b/data/maps/Route110_TrickHouseCorridor/events.inc @@ -1,9 +1,9 @@ -Route110_TrickHouseCorridor_MapWarps: @ 853DF54 +Route110_TrickHouseCorridor_MapWarps: warp_def 13, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END warp_def 14, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END warp_def 4, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 5, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE -Route110_TrickHouseCorridor_MapEvents:: @ 853DF74 +Route110_TrickHouseCorridor_MapEvents:: map_events 0x0, Route110_TrickHouseCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index 6657162b76..2a60d20d8f 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHouseCorridor: @ 8485B84 +Route110_TrickHouseCorridor: .4byte Route110_TrickHouseCorridor_Layout .4byte Route110_TrickHouseCorridor_MapEvents .4byte Route110_TrickHouseCorridor_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 246 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc index 1e371bbbe1..82088646e1 100644 --- a/data/maps/Route110_TrickHouseEnd/events.inc +++ b/data/maps/Route110_TrickHouseEnd/events.inc @@ -1,16 +1,16 @@ -Route110_TrickHouseEnd_EventObjects: @ 853DEFC +Route110_TrickHouseEnd_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, FLAG_HIDE_TRICK_HOUSE_END_MAN -Route110_TrickHouseEnd_MapWarps: @ 853DF14 +Route110_TrickHouseEnd_MapWarps: warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 warp_def 2, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_CORRIDOR -Route110_TrickHouseEnd_MapCoordEvents: @ 853DF24 +Route110_TrickHouseEnd_MapCoordEvents: coord_event 2, 2, 3, VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26B041 -Route110_TrickHouseEnd_MapBGEvents: @ 853DF34 +Route110_TrickHouseEnd_MapBGEvents: bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET -Route110_TrickHouseEnd_MapEvents:: @ 853DF40 +Route110_TrickHouseEnd_MapEvents:: map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index 52a39914fe..0c2dfac3ad 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHouseEnd: @ 8485B68 +Route110_TrickHouseEnd: .4byte Route110_TrickHouseEnd_Layout .4byte Route110_TrickHouseEnd_MapEvents .4byte Route110_TrickHouseEnd_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 245 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_END .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc index ff83f0bdb5..791ecbbc54 100644 --- a/data/maps/Route110_TrickHouseEntrance/events.inc +++ b/data/maps/Route110_TrickHouseEntrance/events.inc @@ -1,20 +1,20 @@ -Route110_TrickHouseEntrance_EventObjects: @ 853DE6C +Route110_TrickHouseEntrance_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN -Route110_TrickHouseEntrance_MapWarps: @ 853DE84 +Route110_TrickHouseEntrance_MapWarps: warp_def 5, 7, 3, 1, MAP_ROUTE110 warp_def 6, 7, 3, 1, MAP_ROUTE110 warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 -Route110_TrickHouseEntrance_MapCoordEvents: @ 853DE9C +Route110_TrickHouseEntrance_MapCoordEvents: coord_event 4, 7, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 coord_event 5, 6, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 coord_event 6, 6, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 coord_event 7, 7, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 -Route110_TrickHouseEntrance_MapBGEvents: @ 853DEDC +Route110_TrickHouseEntrance_MapBGEvents: bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, Route110_TrickHouseEntrance_EventScript_26A0D3 -Route110_TrickHouseEntrance_MapEvents:: @ 853DEE8 +Route110_TrickHouseEntrance_MapEvents:: map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 4e651e5f97..0f5f0aad59 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHouseEntrance: @ 8485B4C +Route110_TrickHouseEntrance: .4byte Route110_TrickHouseEntrance_Layout .4byte Route110_TrickHouseEntrance_MapEvents .4byte Route110_TrickHouseEntrance_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 244 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc index 02dfa58bc7..3a2bb131c6 100644 --- a/data/maps/Route110_TrickHousePuzzle1/events.inc +++ b/data/maps/Route110_TrickHousePuzzle1/events.inc @@ -1,4 +1,4 @@ -Route110_TrickHousePuzzle1_EventObjects: @ 853DF88 +Route110_TrickHousePuzzle1_EventObjects: object_event 1, EVENT_OBJ_GFX_LASS, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0 object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0 object_event 3, EVENT_OBJ_GFX_LASS, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0 @@ -15,14 +15,14 @@ Route110_TrickHousePuzzle1_EventObjects: @ 853DF88 object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1C object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1E -Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0 +Route110_TrickHousePuzzle1_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle1_MapBGEvents: @ 853E108 +Route110_TrickHousePuzzle1_MapBGEvents: bg_event 3, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle1_EventScript_26B92B -Route110_TrickHousePuzzle1_MapEvents:: @ 853E114 +Route110_TrickHousePuzzle1_MapEvents:: map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index de4ff3ed2e..5835faa5fd 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle1: @ 8485BA0 +Route110_TrickHousePuzzle1: .4byte Route110_TrickHousePuzzle1_Layout .4byte Route110_TrickHousePuzzle1_MapEvents .4byte Route110_TrickHousePuzzle1_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 247 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc index e49d391e64..c56d53dea0 100644 --- a/data/maps/Route110_TrickHousePuzzle2/events.inc +++ b/data/maps/Route110_TrickHousePuzzle2/events.inc @@ -1,24 +1,24 @@ -Route110_TrickHousePuzzle2_EventObjects: @ 853E128 +Route110_TrickHousePuzzle2_EventObjects: object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 10, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL -Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0 +Route110_TrickHousePuzzle2_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle2_MapCoordEvents: @ 853E1B8 +Route110_TrickHousePuzzle2_MapCoordEvents: coord_event 11, 12, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle2_EventScript_26BBDD coord_event 0, 4, 0, VAR_TEMP_2, 0, Route110_TrickHousePuzzle2_EventScript_26BBF0 coord_event 14, 5, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle2_EventScript_26BC03 coord_event 7, 11, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle2_EventScript_26BC16 -Route110_TrickHousePuzzle2_MapBGEvents: @ 853E1F8 +Route110_TrickHousePuzzle2_MapBGEvents: bg_event 14, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle2_EventScript_26BBC0 -Route110_TrickHousePuzzle2_MapEvents:: @ 853E204 +Route110_TrickHousePuzzle2_MapEvents:: map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index 8a2b708ea4..b957dac781 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle2: @ 8485BBC +Route110_TrickHousePuzzle2: .4byte Route110_TrickHousePuzzle2_Layout .4byte Route110_TrickHousePuzzle2_MapEvents .4byte Route110_TrickHousePuzzle2_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 248 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc index 1186670763..6e3406753f 100644 --- a/data/maps/Route110_TrickHousePuzzle3/events.inc +++ b/data/maps/Route110_TrickHousePuzzle3/events.inc @@ -1,4 +1,4 @@ -Route110_TrickHousePuzzle3_EventObjects: @ 853E218 +Route110_TrickHousePuzzle3_EventObjects: object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 7, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0 object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0 object_event 3, EVENT_OBJ_GFX_HIKER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0 @@ -7,20 +7,20 @@ Route110_TrickHousePuzzle3_EventObjects: @ 853E218 object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, FLAG_TEMP_15 object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, FLAG_TEMP_16 -Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0 +Route110_TrickHousePuzzle3_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle3_MapCoordEvents: @ 853E2D8 +Route110_TrickHousePuzzle3_MapCoordEvents: coord_event 4, 14, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle3_EventScript_26C4CD coord_event 3, 11, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle3_EventScript_26C4D9 coord_event 12, 5, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle3_EventScript_26C4E5 coord_event 8, 2, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle3_EventScript_26C4F1 -Route110_TrickHousePuzzle3_MapBGEvents: @ 853E318 +Route110_TrickHousePuzzle3_MapBGEvents: bg_event 0, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle3_EventScript_26C5A7 -Route110_TrickHousePuzzle3_MapEvents:: @ 853E324 +Route110_TrickHousePuzzle3_MapEvents:: map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 37a517f72f..b367f850e3 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle3: @ 8485BD8 +Route110_TrickHousePuzzle3: .4byte Route110_TrickHousePuzzle3_Layout .4byte Route110_TrickHousePuzzle3_MapEvents .4byte Route110_TrickHousePuzzle3_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 249 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc index 4bad58814a..c2de17b66f 100644 --- a/data/maps/Route110_TrickHousePuzzle4/events.inc +++ b/data/maps/Route110_TrickHousePuzzle4/events.inc @@ -1,4 +1,4 @@ -Route110_TrickHousePuzzle4_EventObjects: @ 853E338 +Route110_TrickHousePuzzle4_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0 object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0 @@ -14,14 +14,14 @@ Route110_TrickHousePuzzle4_EventObjects: @ 853E338 object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_19 object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_1A -Route110_TrickHousePuzzle4_MapWarps: @ 853E488 +Route110_TrickHousePuzzle4_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle4_MapBGEvents: @ 853E4A0 +Route110_TrickHousePuzzle4_MapBGEvents: bg_event 14, 13, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle4_EventScript_26C861 -Route110_TrickHousePuzzle4_MapEvents:: @ 853E4AC +Route110_TrickHousePuzzle4_MapEvents:: map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index 993f002d70..9f3f637b9f 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle4: @ 8485BF4 +Route110_TrickHousePuzzle4: .4byte Route110_TrickHousePuzzle4_Layout .4byte Route110_TrickHousePuzzle4_MapEvents .4byte Route110_TrickHousePuzzle4_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 250 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc index f91d26f4db..88eebe092d 100644 --- a/data/maps/Route110_TrickHousePuzzle5/events.inc +++ b/data/maps/Route110_TrickHousePuzzle5/events.inc @@ -1,16 +1,16 @@ -Route110_TrickHousePuzzle5_EventObjects: @ 853E4C0 +Route110_TrickHousePuzzle5_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0 object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0 object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 14, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0 object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 10, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0 -Route110_TrickHousePuzzle5_MapWarps: @ 853E538 +Route110_TrickHousePuzzle5_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle5_MapCoordEvents: @ 853E550 +Route110_TrickHousePuzzle5_MapCoordEvents: coord_event 5, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBD7 coord_event 4, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBE3 coord_event 3, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBEF @@ -34,9 +34,9 @@ Route110_TrickHousePuzzle5_MapCoordEvents: @ 853E550 coord_event 10, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCBB coord_event 9, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCC7 -Route110_TrickHousePuzzle5_MapBGEvents: @ 853E6B0 +Route110_TrickHousePuzzle5_MapBGEvents: bg_event 11, 21, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle5_EventScript_26CB15 -Route110_TrickHousePuzzle5_MapEvents:: @ 853E6BC +Route110_TrickHousePuzzle5_MapEvents:: map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index b22b21bcef..e179a016a7 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle5: @ 8485C10 +Route110_TrickHousePuzzle5: .4byte Route110_TrickHousePuzzle5_Layout .4byte Route110_TrickHousePuzzle5_MapEvents .4byte Route110_TrickHousePuzzle5_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 251 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc index f172622eae..512164dba3 100644 --- a/data/maps/Route110_TrickHousePuzzle6/events.inc +++ b/data/maps/Route110_TrickHousePuzzle6/events.inc @@ -1,17 +1,17 @@ -Route110_TrickHousePuzzle6_EventObjects: @ 853E6D0 +Route110_TrickHousePuzzle6_EventObjects: object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 7, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0 object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL -Route110_TrickHousePuzzle6_MapWarps: @ 853E730 +Route110_TrickHousePuzzle6_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle6_MapBGEvents: @ 853E748 +Route110_TrickHousePuzzle6_MapBGEvents: bg_event 0, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle6_EventScript_26DDC4 -Route110_TrickHousePuzzle6_MapEvents:: @ 853E754 +Route110_TrickHousePuzzle6_MapEvents:: map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index e10fd78b23..ec7a42d200 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle6: @ 8485C2C +Route110_TrickHousePuzzle6: .4byte Route110_TrickHousePuzzle6_Layout .4byte Route110_TrickHousePuzzle6_MapEvents .4byte Route110_TrickHousePuzzle6_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 252 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc index d29c76263f..4dff66e1c9 100644 --- a/data/maps/Route110_TrickHousePuzzle7/events.inc +++ b/data/maps/Route110_TrickHousePuzzle7/events.inc @@ -1,4 +1,4 @@ -Route110_TrickHousePuzzle7_EventObjects: @ 853E768 +Route110_TrickHousePuzzle7_EventObjects: object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 20, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0 object_event 2, EVENT_OBJ_GFX_LASS, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0 object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 8, 17, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0 @@ -9,7 +9,7 @@ Route110_TrickHousePuzzle7_EventObjects: @ 853E768 object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 17, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 -Route110_TrickHousePuzzle7_MapWarps: @ 853E840 +Route110_TrickHousePuzzle7_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END @@ -24,15 +24,15 @@ Route110_TrickHousePuzzle7_MapWarps: @ 853E840 warp_def 1, 3, 0, 12, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 warp_def 8, 12, 0, 11, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 -Route110_TrickHousePuzzle7_MapCoordEvents: @ 853E8A8 +Route110_TrickHousePuzzle7_MapCoordEvents: coord_event 8, 19, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E31B coord_event 0, 14, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E331 coord_event 6, 6, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E347 coord_event 9, 7, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E35D -Route110_TrickHousePuzzle7_MapBGEvents: @ 853E8E8 +Route110_TrickHousePuzzle7_MapBGEvents: bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_26E1D0 -Route110_TrickHousePuzzle7_MapEvents:: @ 853E8F4 +Route110_TrickHousePuzzle7_MapEvents:: map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index 40f43f9d84..ca21629e35 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle7: @ 8485C48 +Route110_TrickHousePuzzle7: .4byte Route110_TrickHousePuzzle7_Layout .4byte Route110_TrickHousePuzzle7_MapEvents .4byte Route110_TrickHousePuzzle7_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 253 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc index 909c8cbfd7..2ccba5addd 100644 --- a/data/maps/Route110_TrickHousePuzzle8/events.inc +++ b/data/maps/Route110_TrickHousePuzzle8/events.inc @@ -1,17 +1,17 @@ -Route110_TrickHousePuzzle8_EventObjects: @ 853E908 +Route110_TrickHousePuzzle8_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL -Route110_TrickHousePuzzle8_MapWarps: @ 853E968 +Route110_TrickHousePuzzle8_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 0, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle8_MapBGEvents: @ 853E980 +Route110_TrickHousePuzzle8_MapBGEvents: bg_event 3, 21, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle8_EventScript_26E802 -Route110_TrickHousePuzzle8_MapEvents:: @ 853E98C +Route110_TrickHousePuzzle8_MapEvents:: map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index 1755152924..1bf3fbb1cb 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle8: @ 8485C64 +Route110_TrickHousePuzzle8: .4byte Route110_TrickHousePuzzle8_Layout .4byte Route110_TrickHousePuzzle8_MapEvents .4byte Route110_TrickHousePuzzle8_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 254 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route111/connections.inc b/data/maps/Route111/connections.inc index 6a57d275e3..25e4099761 100644 --- a/data/maps/Route111/connections.inc +++ b/data/maps/Route111/connections.inc @@ -1,9 +1,9 @@ -Route111_MapConnectionsList: @ 8486970 +Route111_MapConnectionsList: connection down, 0, MAP_MAUVILLE_CITY connection left, 0, MAP_ROUTE113 connection left, 20, MAP_ROUTE112 -Route111_MapConnections: @ 8486994 - .4byte 0x3 +Route111_MapConnections: + .4byte 3 .4byte Route111_MapConnectionsList diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc index 975141b73f..703c9a6627 100644 --- a/data/maps/Route111/events.inc +++ b/data/maps/Route111/events.inc @@ -1,4 +1,4 @@ -Route111_EventObjects: @ 85291F0 +Route111_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1F0FC5, FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE @@ -46,14 +46,14 @@ Route111_EventObjects: @ 85291F0 object_event 45, EVENT_OBJ_GFX_VAR_0, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_PLAYER_DESCENT object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_1F11E4, FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY -Route111_MapWarps: @ 8529640 +Route111_MapWarps: warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE warp_def 29, 87, 0, 0, MAP_DESERT_RUINS warp_def 26, 18, 0, 0, MAP_ROUTE111_OLD_LADYS_REST_STOP warp_def 19, 58, 0, 0, MAP_MIRAGE_TOWER_1F warp_def 31, 113, 0, 0, MAP_TRAINER_HILL_ENTRANCE -Route111_MapCoordEvents: @ 8529668 +Route111_MapCoordEvents: coord_event 12, 62, 3, 0, 0, Route111_EventScript_1F0FBD coord_event 11, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A coord_event 12, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A @@ -89,7 +89,7 @@ Route111_MapCoordEvents: @ 8529668 coord_event 12, 43, 3, 0, 0, Route111_EventScript_1F0FBD coord_event 11, 44, 3, 0, 0, Route111_EventScript_1F0FBD -Route111_MapBGEvents: @ 8529888 +Route111_MapBGEvents: bg_event 16, 114, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F115C bg_event 24, 126, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1153 bg_event 7, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1165 @@ -109,6 +109,6 @@ Route111_MapBGEvents: @ 8529888 bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY bg_event 24, 116, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F146C -Route111_MapEvents:: @ 8529960 +Route111_MapEvents:: map_events Route111_EventObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index cb975e74a3..2ec5fc6edf 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -1,10 +1,10 @@ -Route111: @ 8482790 +Route111: .4byte Route111_Layout .4byte Route111_MapEvents .4byte Route111_MapScripts .4byte Route111_MapConnections .2byte MUS_DOORO_X1 - .2byte 27 + .2byte LAYOUT_ROUTE111 .byte MAPSEC_ROUTE_111 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route111_OldLadysRestStop/events.inc b/data/maps/Route111_OldLadysRestStop/events.inc index 9738378710..fbdd2e5ddd 100644 --- a/data/maps/Route111_OldLadysRestStop/events.inc +++ b/data/maps/Route111_OldLadysRestStop/events.inc @@ -1,10 +1,10 @@ -Route111_OldLadysRestStop_EventObjects: @ 8533C18 +Route111_OldLadysRestStop_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0 -Route111_OldLadysRestStop_MapWarps: @ 8533C30 +Route111_OldLadysRestStop_MapWarps: warp_def 3, 7, 0, 2, MAP_ROUTE111 warp_def 4, 7, 0, 2, MAP_ROUTE111 -Route111_OldLadysRestStop_MapEvents:: @ 8533C40 +Route111_OldLadysRestStop_MapEvents:: map_events Route111_OldLadysRestStop_EventObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index a3c2a0161a..9b2633050c 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -1,10 +1,10 @@ -Route111_OldLadysRestStop: @ 8483DC4 +Route111_OldLadysRestStop: .4byte House3_Layout .4byte Route111_OldLadysRestStop_MapEvents .4byte Route111_OldLadysRestStop_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 64 + .2byte LAYOUT_HOUSE3 .byte MAPSEC_ROUTE_111 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route111_WinstrateFamilysHouse/events.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc index edaf85eb45..b433e1198e 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/events.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/events.inc @@ -1,13 +1,13 @@ -Route111_WinstrateFamilysHouse_EventObjects: @ 8533B94 +Route111_WinstrateFamilysHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0 object_event 4, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0 -Route111_WinstrateFamilysHouse_MapWarps: @ 8533BF4 +Route111_WinstrateFamilysHouse_MapWarps: warp_def 3, 7, 0, 0, MAP_ROUTE111 warp_def 4, 7, 0, 0, MAP_ROUTE111 -Route111_WinstrateFamilysHouse_MapEvents:: @ 8533C04 +Route111_WinstrateFamilysHouse_MapEvents:: map_events Route111_WinstrateFamilysHouse_EventObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 12e4080890..d37a62e00a 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -1,10 +1,10 @@ -Route111_WinstrateFamilysHouse: @ 8483DA8 +Route111_WinstrateFamilysHouse: .4byte House2_Layout .4byte Route111_WinstrateFamilysHouse_MapEvents .4byte Route111_WinstrateFamilysHouse_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_ROUTE_111 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route112/connections.inc b/data/maps/Route112/connections.inc index 132c4ff76e..0fc8da215d 100644 --- a/data/maps/Route112/connections.inc +++ b/data/maps/Route112/connections.inc @@ -1,9 +1,9 @@ -Route112_MapConnectionsList: @ 848699C +Route112_MapConnectionsList: connection up, -60, MAP_ROUTE113 connection left, 40, MAP_LAVARIDGE_TOWN connection right, -20, MAP_ROUTE111 -Route112_MapConnections: @ 84869C0 - .4byte 0x3 +Route112_MapConnections: + .4byte 3 .4byte Route112_MapConnectionsList diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc index cfa145e976..4d1b338c3a 100644 --- a/data/maps/Route112/events.inc +++ b/data/maps/Route112/events.inc @@ -1,4 +1,4 @@ -Route112_EventObjects: @ 8529974 +Route112_EventObjects: object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0 @@ -14,7 +14,7 @@ Route112_EventObjects: @ 8529974 object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0 object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 31, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0 -Route112_MapWarps: @ 8529AC4 +Route112_MapWarps: warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION warp_def 29, 27, 0, 1, MAP_ROUTE112_CABLE_CAR_STATION warp_def 6, 46, 3, 0, MAP_JAGGED_PASS @@ -22,11 +22,11 @@ Route112_MapWarps: @ 8529AC4 warp_def 11, 36, 0, 0, MAP_FIERY_PATH warp_def 22, 10, 0, 1, MAP_FIERY_PATH -Route112_MapBGEvents: @ 8529AF4 +Route112_MapBGEvents: bg_event 19, 44, 3, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E4F bg_event 22, 37, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E46 bg_event 4, 49, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E58 -Route112_MapEvents:: @ 8529B18 +Route112_MapEvents:: map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index 70e0f2d65a..1cc8583a5b 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -1,10 +1,10 @@ -Route112: @ 84827AC +Route112: .4byte Route112_Layout .4byte Route112_MapEvents .4byte Route112_MapScripts .4byte Route112_MapConnections .2byte MUS_DOORO_X1 - .2byte 28 + .2byte LAYOUT_ROUTE112 .byte MAPSEC_ROUTE_112 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route112_CableCarStation/events.inc b/data/maps/Route112_CableCarStation/events.inc index 2fe0846971..4b51decda7 100644 --- a/data/maps/Route112_CableCarStation/events.inc +++ b/data/maps/Route112_CableCarStation/events.inc @@ -1,11 +1,11 @@ -Route112_CableCarStation_EventObjects: @ 8533C54 +Route112_CableCarStation_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0 object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 -Route112_CableCarStation_MapWarps: @ 8533C84 +Route112_CableCarStation_MapWarps: warp_def 6, 11, 0, 0, MAP_ROUTE112 warp_def 7, 11, 0, 1, MAP_ROUTE112 -Route112_CableCarStation_MapEvents:: @ 8533C94 +Route112_CableCarStation_MapEvents:: map_events Route112_CableCarStation_EventObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index fd9038c12f..f1a00b968d 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -1,10 +1,10 @@ -Route112_CableCarStation: @ 8483DE0 +Route112_CableCarStation: .4byte CableCarStation_Layout .4byte Route112_CableCarStation_MapEvents .4byte Route112_CableCarStation_MapScripts .4byte 0x0 .2byte MUS_DOORO_X1 - .2byte 118 + .2byte LAYOUT_CABLE_CAR_STATION .byte MAPSEC_ROUTE_112 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route113/connections.inc b/data/maps/Route113/connections.inc index 3067ee23be..a4d583ce89 100644 --- a/data/maps/Route113/connections.inc +++ b/data/maps/Route113/connections.inc @@ -1,9 +1,9 @@ -Route113_MapConnectionsList: @ 84869C8 +Route113_MapConnectionsList: connection down, 60, MAP_ROUTE112 connection left, 0, MAP_FALLARBOR_TOWN connection right, 0, MAP_ROUTE111 -Route113_MapConnections: @ 84869EC - .4byte 0x3 +Route113_MapConnections: + .4byte 3 .4byte Route113_MapConnectionsList diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc index b2481d6ed1..bcf377e744 100644 --- a/data/maps/Route113/events.inc +++ b/data/maps/Route113/events.inc @@ -1,4 +1,4 @@ -Route113_EventObjects: @ 8529B2C +Route113_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 66, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route113_EventScript_1F2193, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route113_EventScript_1F218A, 0 object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0 @@ -16,12 +16,12 @@ Route113_EventObjects: @ 8529B2C object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0 object_event 16, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 6, Route113_EventScript_1F2316, 0 -Route113_MapWarps: @ 8529CAC +Route113_MapWarps: warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP warp_def 41, 12, 0, 0, MAP_TERRA_CAVE_ENTRANCE warp_def 88, 5, 0, 0, MAP_TERRA_CAVE_ENTRANCE -Route113_MapCoordEvents: @ 8529CC4 +Route113_MapCoordEvents: coord_weather_event 19, 11, 3, COORD_EVENT_WEATHER_ASH coord_weather_event 19, 10, 3, COORD_EVENT_WEATHER_ASH coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ASH @@ -42,7 +42,7 @@ Route113_MapCoordEvents: @ 8529CC4 coord_weather_event 87, 6, 3, COORD_EVENT_WEATHER_ASH coord_weather_event 87, 7, 3, COORD_EVENT_WEATHER_ASH -Route113_MapBGEvents: @ 8529DF4 +Route113_MapBGEvents: bg_event 85, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F219C bg_event 12, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21A5 bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21B7 @@ -52,6 +52,6 @@ Route113_MapBGEvents: @ 8529DF4 bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_ROUTE_113_TM_32 bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET -Route113_MapEvents:: @ 8529E54 +Route113_MapEvents:: map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index deaacca366..aae60a1002 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -1,10 +1,10 @@ -Route113: @ 84827C8 +Route113: .4byte Route113_Layout .4byte Route113_MapEvents .4byte Route113_MapScripts .4byte Route113_MapConnections .2byte MUS_KAZANBAI - .2byte 29 + .2byte LAYOUT_ROUTE113 .byte MAPSEC_ROUTE_113 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route113_GlassWorkshop/events.inc b/data/maps/Route113_GlassWorkshop/events.inc index d6f9c0d4bc..7c8fbe7178 100644 --- a/data/maps/Route113_GlassWorkshop/events.inc +++ b/data/maps/Route113_GlassWorkshop/events.inc @@ -1,11 +1,11 @@ -Route113_GlassWorkshop_EventObjects: @ 853EA78 +Route113_GlassWorkshop_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0 object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0 -Route113_GlassWorkshop_MapWarps: @ 853EAA8 +Route113_GlassWorkshop_MapWarps: warp_def 3, 8, 0, 0, MAP_ROUTE113 warp_def 4, 8, 0, 0, MAP_ROUTE113 -Route113_GlassWorkshop_MapEvents:: @ 853EAB8 +Route113_GlassWorkshop_MapEvents:: map_events Route113_GlassWorkshop_EventObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index 44a87e5efe..e77f3acc81 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -1,10 +1,10 @@ -Route113_GlassWorkshop: @ 8485CB8 +Route113_GlassWorkshop: .4byte House4_Layout .4byte Route113_GlassWorkshop_MapEvents .4byte Route113_GlassWorkshop_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 67 + .2byte LAYOUT_HOUSE4 .byte MAPSEC_ROUTE_113 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route114/connections.inc b/data/maps/Route114/connections.inc index 760c2ddc00..5c7671c7c0 100644 --- a/data/maps/Route114/connections.inc +++ b/data/maps/Route114/connections.inc @@ -1,8 +1,8 @@ -Route114_MapConnectionsList: @ 84869F4 +Route114_MapConnectionsList: connection left, 40, MAP_ROUTE115 connection right, 0, MAP_FALLARBOR_TOWN -Route114_MapConnections: @ 8486A0C - .4byte 0x2 +Route114_MapConnections: + .4byte 2 .4byte Route114_MapConnectionsList diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc index 55ea12195d..9f17b54c03 100644 --- a/data/maps/Route114/events.inc +++ b/data/maps/Route114/events.inc @@ -1,4 +1,4 @@ -Route114_EventObjects: @ 8529E68 +Route114_EventObjects: object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 77, BerryTreeScript, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 78, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route114_EventScript_1F2640, 0 @@ -27,14 +27,14 @@ Route114_EventObjects: @ 8529E68 object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_290E1D, FLAG_ITEM_ROUTE_114_ENERGY_POWDER object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route114_EventScript_1F27F2, 0 -Route114_MapWarps: @ 852A0F0 +Route114_MapWarps: warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R warp_def 29, 5, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE warp_def 27, 36, 0, 0, MAP_ROUTE114_LANETTES_HOUSE warp_def 6, 46, 0, 0, MAP_TERRA_CAVE_ENTRANCE warp_def 7, 4, 0, 0, MAP_TERRA_CAVE_ENTRANCE -Route114_MapBGEvents: @ 852A118 +Route114_MapBGEvents: bg_event 7, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2625 bg_event 31, 7, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F262E bg_secret_base_event 9, 47, 0, SECRET_BASE_BROWN_CAVE1_1 @@ -48,6 +48,6 @@ Route114_MapBGEvents: @ 852A118 bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3 bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE -Route114_MapEvents:: @ 852A1A8 +Route114_MapEvents:: map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index 318efdbaf9..7177662e61 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -1,10 +1,10 @@ -Route114: @ 84827E4 +Route114: .4byte Route114_Layout .4byte Route114_MapEvents .4byte Route114_MapScripts .4byte Route114_MapConnections .2byte MUS_DOORO_X1 - .2byte 30 + .2byte LAYOUT_ROUTE114 .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc index 9c4579c1d1..dd3be1a66a 100644 --- a/data/maps/Route114_FossilManiacsHouse/events.inc +++ b/data/maps/Route114_FossilManiacsHouse/events.inc @@ -1,17 +1,17 @@ -Route114_FossilManiacsHouse_EventObjects: @ 8533CFC +Route114_FossilManiacsHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0 -Route114_FossilManiacsHouse_MapWarps: @ 8533D14 +Route114_FossilManiacsHouse_MapWarps: warp_def 4, 7, 0, 1, MAP_ROUTE114 warp_def 5, 7, 0, 1, MAP_ROUTE114 warp_def 4, 1, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL -Route114_FossilManiacsHouse_MapBGEvents: @ 8533D2C +Route114_FossilManiacsHouse_MapBGEvents: bg_event 5, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD73 bg_event 6, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD73 bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD7C bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD7C -Route114_FossilManiacsHouse_MapEvents:: @ 8533D5C +Route114_FossilManiacsHouse_MapEvents:: map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index ca042d6b4e..648359c8fe 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -1,10 +1,10 @@ -Route114_FossilManiacsHouse: @ 8483E18 +Route114_FossilManiacsHouse: .4byte Route114_FossilManiacsHouse_Layout .4byte Route114_FossilManiacsHouse_MapEvents .4byte Route114_FossilManiacsHouse_MapScripts .4byte 0x0 .2byte MUS_TONEKUSA - .2byte 119 + .2byte LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route114_FossilManiacsTunnel/events.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc index ba3798f7b8..ec9551959c 100644 --- a/data/maps/Route114_FossilManiacsTunnel/events.inc +++ b/data/maps/Route114_FossilManiacsTunnel/events.inc @@ -1,15 +1,15 @@ -Route114_FossilManiacsTunnel_EventObjects: @ 8533D70 +Route114_FossilManiacsTunnel_EventObjects: object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0 -Route114_FossilManiacsTunnel_MapWarps: @ 8533D88 +Route114_FossilManiacsTunnel_MapWarps: warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE warp_def 7, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE warp_def 6, 2, 0, 0, MAP_DESERT_UNDERPASS -Route114_FossilManiacsTunnel_MapCoordEvents: @ 8533DA0 +Route114_FossilManiacsTunnel_MapCoordEvents: coord_event 5, 4, 3, VAR_0x40CC, 1, Route114_FossilManiacsTunnel_EventScript_22AF66 coord_event 6, 4, 3, VAR_0x40CC, 1, Route114_FossilManiacsTunnel_EventScript_22AF66 -Route114_FossilManiacsTunnel_MapEvents:: @ 8533DC0 +Route114_FossilManiacsTunnel_MapEvents:: map_events Route114_FossilManiacsTunnel_EventObjects, Route114_FossilManiacsTunnel_MapWarps, Route114_FossilManiacsTunnel_MapCoordEvents, 0x0 diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index be53b84cea..9012e1d402 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -1,10 +1,10 @@ -Route114_FossilManiacsTunnel: @ 8483E34 +Route114_FossilManiacsTunnel: .4byte Route114_FossilManiacsTunnel_Layout .4byte Route114_FossilManiacsTunnel_MapEvents .4byte Route114_FossilManiacsTunnel_MapScripts .4byte 0x0 .2byte MUS_TONEKUSA - .2byte 120 + .2byte LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc index 17030ddc19..ccd0828514 100644 --- a/data/maps/Route114_LanettesHouse/events.inc +++ b/data/maps/Route114_LanettesHouse/events.inc @@ -1,15 +1,15 @@ -Route114_LanettesHouse_EventObjects: @ 8533DD4 +Route114_LanettesHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, FLAG_HIDE_LANETTES_HOUSE_LANETTE -Route114_LanettesHouse_MapWarps: @ 8533DEC +Route114_LanettesHouse_MapWarps: warp_def 5, 7, 0, 2, MAP_ROUTE114 warp_def 6, 7, 0, 2, MAP_ROUTE114 -Route114_LanettesHouse_MapBGEvents: @ 8533DFC +Route114_LanettesHouse_MapBGEvents: bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B309 bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B345 bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B345 -Route114_LanettesHouse_MapEvents:: @ 8533E20 +Route114_LanettesHouse_MapEvents:: map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index 51023a8006..7b5b949636 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -1,10 +1,10 @@ -Route114_LanettesHouse: @ 8483E50 +Route114_LanettesHouse: .4byte Route114_LanettesHouse_Layout .4byte Route114_LanettesHouse_MapEvents .4byte Route114_LanettesHouse_MapScripts .4byte 0x0 .2byte MUS_TONEKUSA - .2byte 121 + .2byte LAYOUT_ROUTE114_LANETTES_HOUSE .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route115/connections.inc b/data/maps/Route115/connections.inc index 4518e31fab..a569fd0b57 100644 --- a/data/maps/Route115/connections.inc +++ b/data/maps/Route115/connections.inc @@ -1,8 +1,8 @@ -Route115_MapConnectionsList: @ 8486A14 +Route115_MapConnectionsList: connection down, 0, MAP_RUSTBORO_CITY connection right, -40, MAP_ROUTE114 -Route115_MapConnections: @ 8486A2C - .4byte 0x2 +Route115_MapConnections: + .4byte 2 .4byte Route115_MapConnectionsList diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc index 18179deb16..517711bd5f 100644 --- a/data/maps/Route115/events.inc +++ b/data/maps/Route115/events.inc @@ -1,4 +1,4 @@ -Route115_EventObjects: @ 852A1BC +Route115_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 18, 68, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route115_EventScript_1F2973, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route115_EventScript_1F298E, 0 object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2A07, 0 @@ -23,12 +23,12 @@ Route115_EventObjects: @ 852A1BC object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E6B, FLAG_ITEM_ROUTE_115_PP_UP object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E5E, FLAG_ITEM_ROUTE_115_HEAL_POWDER -Route115_MapWarps: @ 852A3E4 +Route115_MapWarps: warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R warp_def 21, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE warp_def 36, 10, 0, 0, MAP_TERRA_CAVE_ENTRANCE -Route115_MapBGEvents: @ 852A3FC +Route115_MapBGEvents: bg_secret_base_event 32, 6, 0, SECRET_BASE_BROWN_CAVE4_2 bg_secret_base_event 21, 18, 0, SECRET_BASE_BROWN_CAVE3_2 bg_event 16, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_1F297C @@ -44,6 +44,6 @@ Route115_MapBGEvents: @ 852A3FC bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3_1 bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE -Route115_MapEvents:: @ 852A4A4 +Route115_MapEvents:: map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index 70e831aeec..fd3f9b2fc5 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -1,10 +1,10 @@ -Route115: @ 8482800 +Route115: .4byte Route115_Layout .4byte Route115_MapEvents .4byte Route115_MapScripts .4byte Route115_MapConnections .2byte MUS_NEXTROAD - .2byte 31 + .2byte LAYOUT_ROUTE115 .byte MAPSEC_ROUTE_115 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route116/connections.inc b/data/maps/Route116/connections.inc index fef193c0fc..bbf03097c2 100644 --- a/data/maps/Route116/connections.inc +++ b/data/maps/Route116/connections.inc @@ -1,8 +1,8 @@ -Route116_MapConnectionsList: @ 8486A34 +Route116_MapConnectionsList: connection down, 80, MAP_VERDANTURF_TOWN connection left, 0, MAP_RUSTBORO_CITY -Route116_MapConnections: @ 8486A4C - .4byte 0x2 +Route116_MapConnections: + .4byte 2 .4byte Route116_MapConnectionsList diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc index 37c54eb7ed..29566f515c 100644 --- a/data/maps/Route116/events.inc +++ b/data/maps/Route116/events.inc @@ -1,4 +1,4 @@ -Route116_EventObjects: @ 852A4B8 +Route116_EventObjects: object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 25, BerryTreeScript, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 26, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0 @@ -28,17 +28,17 @@ Route116_EventObjects: @ 852A4B8 object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 36, 13, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, Route116_EventScript_1F3086, 0 object_event 28, EVENT_OBJ_GFX_HIKER, 0, 42, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route116_EventScript_1F306F, 0 -Route116_MapWarps: @ 852A758 +Route116_MapWarps: warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL warp_def 38, 8, 0, 0, MAP_ROUTE116_TUNNELERS_REST_HOUSE warp_def 65, 10, 0, 2, MAP_RUSTURF_TUNNEL warp_def 59, 13, 0, 0, MAP_TERRA_CAVE_ENTRANCE warp_def 79, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE -Route116_MapCoordEvents: @ 852A780 +Route116_MapCoordEvents: coord_event 47, 9, 3, VAR_0x406F, 1, Route116_EventScript_1F2D95 -Route116_MapBGEvents: @ 852A790 +Route116_MapBGEvents: bg_event 5, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D57 bg_event 48, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D60 bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D69 @@ -51,6 +51,6 @@ Route116_MapBGEvents: @ 852A790 bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES -Route116_MapEvents:: @ 852A814 +Route116_MapEvents:: map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index e97885bc78..d4688d63a9 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -1,10 +1,10 @@ -Route116: @ 848281C +Route116: .4byte Route116_Layout .4byte Route116_MapEvents .4byte Route116_MapScripts .4byte Route116_MapConnections .2byte MUS_NEXTROAD - .2byte 32 + .2byte LAYOUT_ROUTE116 .byte MAPSEC_ROUTE_116 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route116_TunnelersRestHouse/events.inc b/data/maps/Route116_TunnelersRestHouse/events.inc index 32a4dc0ea0..5ecd36317c 100644 --- a/data/maps/Route116_TunnelersRestHouse/events.inc +++ b/data/maps/Route116_TunnelersRestHouse/events.inc @@ -1,12 +1,12 @@ -Route116_TunnelersRestHouse_EventObjects: @ 8533E34 +Route116_TunnelersRestHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0 -Route116_TunnelersRestHouse_MapWarps: @ 8533E7C +Route116_TunnelersRestHouse_MapWarps: warp_def 4, 8, 0, 1, MAP_ROUTE116 warp_def 5, 8, 0, 1, MAP_ROUTE116 -Route116_TunnelersRestHouse_MapEvents:: @ 8533E8C +Route116_TunnelersRestHouse_MapEvents:: map_events Route116_TunnelersRestHouse_EventObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index 1c3abde780..f50a13c93d 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -1,10 +1,10 @@ -Route116_TunnelersRestHouse: @ 8483E6C +Route116_TunnelersRestHouse: .4byte Route116_TunnelersRestHouse_Layout .4byte Route116_TunnelersRestHouse_MapEvents .4byte Route116_TunnelersRestHouse_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 122 + .2byte LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE .byte MAPSEC_ROUTE_116 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route117/connections.inc b/data/maps/Route117/connections.inc index 2780eac5a4..101690881b 100644 --- a/data/maps/Route117/connections.inc +++ b/data/maps/Route117/connections.inc @@ -1,8 +1,8 @@ -Route117_MapConnectionsList: @ 8486A54 +Route117_MapConnectionsList: connection left, 0, MAP_VERDANTURF_TOWN connection right, 0, MAP_MAUVILLE_CITY -Route117_MapConnections: @ 8486A6C - .4byte 0x2 +Route117_MapConnections: + .4byte 2 .4byte Route117_MapConnectionsList diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc index 4cede4040c..217068cd39 100644 --- a/data/maps/Route117/events.inc +++ b/data/maps/Route117/events.inc @@ -1,4 +1,4 @@ -Route117_EventObjects: @ 852A828 +Route117_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_1F399A, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 25, 5, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP, 2, 2, 0, 0, Route117_EventScript_1F39A3, 0 object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 47, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_291C18, 0 @@ -24,15 +24,15 @@ Route117_EventObjects: @ 852A828 object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 21, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route117_EventScript_1F3C65, 0 object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 16, 4, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 4, 1, 1, 4, Route117_EventScript_1F3C37, 0 -Route117_MapWarps: @ 852AA68 +Route117_MapWarps: warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE -Route117_MapBGEvents: @ 852AA70 +Route117_MapBGEvents: bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39B5 bg_event 49, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39BE bg_event 49, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39C7 bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_ROUTE_117_REPEL -Route117_MapEvents:: @ 852AAA0 +Route117_MapEvents:: map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 1d5eda074a..4ae1b92e55 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -1,10 +1,10 @@ -Route117: @ 8482838 +Route117: .4byte Route117_Layout .4byte Route117_MapEvents .4byte Route117_MapScripts .4byte Route117_MapConnections .2byte MUS_DOORO_X1 - .2byte 33 + .2byte LAYOUT_ROUTE117 .byte MAPSEC_ROUTE_117 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route117_PokemonDayCare/events.inc b/data/maps/Route117_PokemonDayCare/events.inc index 37a9db0f2d..6b5d2cc7ae 100644 --- a/data/maps/Route117_PokemonDayCare/events.inc +++ b/data/maps/Route117_PokemonDayCare/events.inc @@ -1,10 +1,10 @@ -Route117_PokemonDayCare_EventObjects: @ 8533EA0 +Route117_PokemonDayCare_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_WOMAN, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0 -Route117_PokemonDayCare_MapWarps: @ 8533EB8 +Route117_PokemonDayCare_MapWarps: warp_def 2, 8, 0, 0, MAP_ROUTE117 warp_def 3, 8, 0, 0, MAP_ROUTE117 -Route117_PokemonDayCare_MapEvents:: @ 8533EC8 +Route117_PokemonDayCare_MapEvents:: map_events Route117_PokemonDayCare_EventObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index ba48de2288..827464a750 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -1,10 +1,10 @@ -Route117_PokemonDayCare: @ 8483E88 +Route117_PokemonDayCare: .4byte Route117_PokemonDayCare_Layout .4byte Route117_PokemonDayCare_MapEvents .4byte Route117_PokemonDayCare_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 123 + .2byte LAYOUT_ROUTE117_POKEMON_DAY_CARE .byte MAPSEC_ROUTE_117 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route118/connections.inc b/data/maps/Route118/connections.inc index 8069f036e1..54ecf15774 100644 --- a/data/maps/Route118/connections.inc +++ b/data/maps/Route118/connections.inc @@ -1,9 +1,9 @@ -Route118_MapConnectionsList: @ 8486A74 +Route118_MapConnectionsList: connection up, 40, MAP_ROUTE119 connection left, 0, MAP_MAUVILLE_CITY connection right, 0, MAP_ROUTE123 -Route118_MapConnections: @ 8486A98 - .4byte 0x3 +Route118_MapConnections: + .4byte 3 .4byte Route118_MapConnectionsList diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc index fe131549fe..3dea1c6f66 100644 --- a/data/maps/Route118/events.inc +++ b/data/maps/Route118/events.inc @@ -1,4 +1,4 @@ -Route118_EventObjects: @ 852AAB4 +Route118_EventObjects: object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 31, BerryTreeScript, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 32, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 33, BerryTreeScript, 0 @@ -21,16 +21,16 @@ Route118_EventObjects: @ 852AAB4 object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, FLAG_ITEM_ROUTE_118_HYPER_POTION object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route118_EventScript_1F40A7, 0 -Route118_MapWarps: @ 852ACAC +Route118_MapWarps: warp_def 42, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE warp_def 9, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE -Route118_MapCoordEvents: @ 852ACBC +Route118_MapCoordEvents: coord_event 43, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3E8E coord_event 44, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EAE coord_event 45, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EC4 -Route118_MapBGEvents: @ 852ACEC +Route118_MapBGEvents: bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1 bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E7C bg_event 56, 8, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E85 @@ -41,6 +41,6 @@ Route118_MapBGEvents: @ 852ACEC bg_hidden_item_event 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_ROUTE_118_IRON bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE -Route118_MapEvents:: @ 852AD58 +Route118_MapEvents:: map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index e0b5416432..d38319d965 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -1,10 +1,10 @@ -Route118: @ 8482854 +Route118: .4byte Route118_Layout .4byte Route118_MapEvents .4byte Route118_MapScripts .4byte Route118_MapConnections .2byte MUS_ROUTE_118 - .2byte 34 + .2byte LAYOUT_ROUTE118 .byte MAPSEC_ROUTE_118 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route119/connections.inc b/data/maps/Route119/connections.inc index 4987e049e2..067db34f13 100644 --- a/data/maps/Route119/connections.inc +++ b/data/maps/Route119/connections.inc @@ -1,8 +1,8 @@ -Route119_MapConnectionsList: @ 8486AA0 +Route119_MapConnectionsList: connection down, -40, MAP_ROUTE118 connection right, 0, MAP_FORTREE_CITY -Route119_MapConnections: @ 8486AB8 - .4byte 0x2 +Route119_MapConnections: + .4byte 2 .4byte Route119_MapConnectionsList diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc index 86ec2d2be3..9942a4c4f4 100644 --- a/data/maps/Route119/events.inc +++ b/data/maps/Route119/events.inc @@ -1,4 +1,4 @@ -Route119_EventObjects: @ 852AD6C +Route119_EventObjects: object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 34, BerryTreeScript, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 35, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 36, BerryTreeScript, 0 @@ -43,11 +43,11 @@ Route119_EventObjects: @ 852AD6C object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F3B, FLAG_ITEM_ROUTE_119_ELIXIR_2 object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_SCOTT -Route119_MapWarps: @ 852B174 +Route119_MapWarps: warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE -Route119_MapCoordEvents: @ 852B184 +Route119_MapCoordEvents: coord_event 25, 31, 0, VAR_0x4072, 0, Route119_EventScript_1F4472 coord_event 26, 31, 0, VAR_0x4072, 0, Route119_EventScript_1F447D coord_weather_event 29, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE @@ -72,7 +72,7 @@ Route119_MapCoordEvents: @ 852B184 coord_weather_event 20, 137, 3, COORD_EVENT_WEATHER_SUNNY coord_weather_event 34, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE -Route119_MapBGEvents: @ 852B2F4 +Route119_MapBGEvents: bg_event 9, 33, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F477D bg_event 27, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F4774 bg_secret_base_event 5, 2, 0, SECRET_BASE_SHRUB1_1 @@ -94,6 +94,6 @@ Route119_MapBGEvents: @ 852B2F4 bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER bg_event 28, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F49E3 -Route119_MapEvents:: @ 852B3E4 +Route119_MapEvents:: map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index 7181f6b0d5..0e3685b373 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -1,10 +1,10 @@ -Route119: @ 8482870 +Route119: .4byte Route119_Layout .4byte Route119_MapEvents .4byte Route119_MapScripts .4byte Route119_MapConnections .2byte MUS_GRANROAD - .2byte 35 + .2byte LAYOUT_ROUTE119 .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route119_House/events.inc b/data/maps/Route119_House/events.inc index aff8116a7a..152deabee0 100644 --- a/data/maps/Route119_House/events.inc +++ b/data/maps/Route119_House/events.inc @@ -1,4 +1,4 @@ -Route119_House_EventObjects: @ 853ECD0 +Route119_House_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_House_EventScript_270966, 0 object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 1, 0, 0, Route119_House_EventScript_27096F, 0 @@ -7,10 +7,10 @@ Route119_House_EventObjects: @ 853ECD0 object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route119_House_EventScript_27096F, 0 -Route119_House_MapWarps: @ 853ED78 +Route119_House_MapWarps: warp_def 3, 8, 0, 1, MAP_ROUTE119 warp_def 4, 8, 0, 1, MAP_ROUTE119 -Route119_House_MapEvents:: @ 853ED88 +Route119_House_MapEvents:: map_events Route119_House_EventObjects, Route119_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index 334b858ecc..d7bbbd5ffb 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -1,10 +1,10 @@ -Route119_House: @ 8485D28 +Route119_House: .4byte House1_Layout .4byte Route119_House_MapEvents .4byte Route119_House_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc index 6d72fea9ca..e8f3b93f80 100644 --- a/data/maps/Route119_WeatherInstitute_1F/events.inc +++ b/data/maps/Route119_WeatherInstitute_1F/events.inc @@ -1,21 +1,21 @@ -Route119_WeatherInstitute_1F_EventObjects: @ 853EB20 +Route119_WeatherInstitute_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, FLAG_HIDE_ROUTE_119_TEAM_AQUA object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, FLAG_HIDE_ROUTE_119_TEAM_AQUA object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 14, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0 -Route119_WeatherInstitute_1F_MapWarps: @ 853EB98 +Route119_WeatherInstitute_1F_MapWarps: warp_def 9, 12, 0, 0, MAP_ROUTE119 warp_def 10, 12, 0, 0, MAP_ROUTE119 warp_def 17, 1, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_2F -Route119_WeatherInstitute_1F_MapBGEvents: @ 853EBB0 +Route119_WeatherInstitute_1F_MapBGEvents: bg_event 1, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 bg_event 0, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 -Route119_WeatherInstitute_1F_MapEvents:: @ 853EBE0 +Route119_WeatherInstitute_1F_MapEvents:: map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index e5e7abbc98..be2fe1617c 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -1,10 +1,10 @@ -Route119_WeatherInstitute_1F: @ 8485CF0 +Route119_WeatherInstitute_1F: .4byte Route119_WeatherInstitute_1F_Layout .4byte Route119_WeatherInstitute_1F_MapEvents .4byte Route119_WeatherInstitute_1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 271 + .2byte LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc index d2cc64d402..7463848207 100644 --- a/data/maps/Route119_WeatherInstitute_2F/events.inc +++ b/data/maps/Route119_WeatherInstitute_2F/events.inc @@ -1,4 +1,4 @@ -Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4 +Route119_WeatherInstitute_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, FLAG_HIDE_ROUTE_119_TEAM_AQUA object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, FLAG_HIDE_ROUTE_119_TEAM_AQUA object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, FLAG_HIDE_ROUTE_119_TEAM_AQUA @@ -8,9 +8,9 @@ Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4 object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, FLAG_HIDE_ROUTE_119_TEAM_AQUA -Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4 +Route119_WeatherInstitute_2F_MapWarps: warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F -Route119_WeatherInstitute_2F_MapEvents:: @ 853ECBC +Route119_WeatherInstitute_2F_MapEvents:: map_events Route119_WeatherInstitute_2F_EventObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index c81f9731c7..8543b0ed8b 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -1,10 +1,10 @@ -Route119_WeatherInstitute_2F: @ 8485D0C +Route119_WeatherInstitute_2F: .4byte Route119_WeatherInstitute_2F_Layout .4byte Route119_WeatherInstitute_2F_MapEvents .4byte Route119_WeatherInstitute_2F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 272 + .2byte LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route120/connections.inc b/data/maps/Route120/connections.inc index c599e6a2cc..9dda2ecade 100644 --- a/data/maps/Route120/connections.inc +++ b/data/maps/Route120/connections.inc @@ -1,8 +1,8 @@ -Route120_MapConnectionsList: @ 8486AC0 +Route120_MapConnectionsList: connection left, 0, MAP_FORTREE_CITY connection right, 80, MAP_ROUTE121 -Route120_MapConnections: @ 8486AD8 - .4byte 0x2 +Route120_MapConnections: + .4byte 2 .4byte Route120_MapConnectionsList diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc index 24b2890606..d198dff3c7 100644 --- a/data/maps/Route120/events.inc +++ b/data/maps/Route120/events.inc @@ -1,4 +1,4 @@ -Route120_EventObjects: @ 852B3F8 +Route120_EventObjects: object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 46, BerryTreeScript, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 45, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 44, BerryTreeScript, 0 @@ -44,11 +44,11 @@ Route120_EventObjects: @ 852B3F8 object_event 43, EVENT_OBJ_GFX_MAN_3, 0, 14, 34, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route120_EventScript_1F596A, 0 object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F7C, FLAG_ITEM_ROUTE_120_REVIVE -Route120_MapWarps: @ 852B818 +Route120_MapWarps: warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB -Route120_MapCoordEvents: @ 852B828 +Route120_MapCoordEvents: coord_weather_event 7, 15, 0, COORD_EVENT_WEATHER_RAIN_LIGHT coord_weather_event 7, 16, 0, COORD_EVENT_WEATHER_RAIN_LIGHT coord_weather_event 22, 61, 3, COORD_EVENT_WEATHER_RAIN_LIGHT @@ -69,7 +69,7 @@ Route120_MapCoordEvents: @ 852B828 coord_weather_event 12, 75, 3, COORD_EVENT_WEATHER_CLOUDS coord_weather_event 13, 75, 3, COORD_EVENT_WEATHER_CLOUDS -Route120_MapBGEvents: @ 852B958 +Route120_MapBGEvents: bg_event 27, 3, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57C5 bg_event 38, 88, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57CE bg_secret_base_event 28, 62, 0, SECRET_BASE_BLUE_CAVE3_1 @@ -85,6 +85,6 @@ Route120_MapBGEvents: @ 852B958 bg_hidden_item_event 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_ROUTE_120_ZINC bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4 -Route120_MapEvents:: @ 852BA00 +Route120_MapEvents:: map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 626b57a94d..4d48d8b334 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -1,10 +1,10 @@ -Route120: @ 848288C +Route120: .4byte Route120_Layout .4byte Route120_MapEvents .4byte Route120_MapScripts .4byte Route120_MapConnections .2byte MUS_DOORO_X3 - .2byte 36 + .2byte LAYOUT_ROUTE120 .byte MAPSEC_ROUTE_120 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route121/connections.inc b/data/maps/Route121/connections.inc index 94116a03e0..6d9bd9ae4b 100644 --- a/data/maps/Route121/connections.inc +++ b/data/maps/Route121/connections.inc @@ -1,9 +1,9 @@ -Route121_MapConnectionsList: @ 8486AE0 +Route121_MapConnectionsList: connection down, 20, MAP_ROUTE122 connection left, -80, MAP_ROUTE120 connection right, -10, MAP_LILYCOVE_CITY -Route121_MapConnections: @ 8486B04 - .4byte 0x3 +Route121_MapConnections: + .4byte 3 .4byte Route121_MapConnectionsList diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index 432071ed1c..5e637bb7e7 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -1,4 +1,4 @@ -Route121_EventObjects: @ 852BA14 +Route121_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 29, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route121_EventScript_1F5DFD, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 47, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 48, BerryTreeScript, 0 @@ -29,16 +29,16 @@ Route121_EventObjects: @ 852BA14 object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, FLAG_ITEM_ROUTE_121_REVIVE object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, FLAG_ITEM_ROUTE_121_ZINC -Route121_MapWarps: @ 852BCCC +Route121_MapWarps: warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE -Route121_MapCoordEvents: @ 852BCD4 +Route121_MapCoordEvents: coord_event 25, 5, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 coord_event 25, 6, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 coord_event 25, 7, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 coord_event 25, 8, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 -Route121_MapBGEvents: @ 852BD14 +Route121_MapBGEvents: bg_event 32, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E06 bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2_2 bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3_2 @@ -50,6 +50,6 @@ Route121_MapBGEvents: @ 852BD14 bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE -Route121_MapEvents:: @ 852BD8C +Route121_MapEvents:: map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 3f070c2ec0..04cee69427 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -1,10 +1,10 @@ -Route121: @ 84828A8 +Route121: .4byte Route121_Layout .4byte Route121_MapEvents .4byte Route121_MapScripts .4byte Route121_MapConnections .2byte MUS_DOORO_X3 - .2byte 37 + .2byte LAYOUT_ROUTE121 .byte MAPSEC_ROUTE_121 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc index 658be476f8..73c836cff7 100644 --- a/data/maps/Route121_SafariZoneEntrance/events.inc +++ b/data/maps/Route121_SafariZoneEntrance/events.inc @@ -1,20 +1,20 @@ -Route121_SafariZoneEntrance_EventObjects: @ 8533EDC +Route121_SafariZoneEntrance_EventObjects: object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0 object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 -Route121_SafariZoneEntrance_MapWarps: @ 8533F24 +Route121_SafariZoneEntrance_MapWarps: warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH warp_def 3, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH warp_def 14, 13, 0, 0, MAP_ROUTE121 warp_def 15, 13, 0, 0, MAP_ROUTE121 -Route121_SafariZoneEntrance_MapCoordEvents: @ 8533F44 +Route121_SafariZoneEntrance_MapCoordEvents: coord_event 8, 4, 3, VAR_TEMP_1, 0, Route121_SafariZoneEntrance_EventScript_22BC18 -Route121_SafariZoneEntrance_MapBGEvents: @ 8533F54 +Route121_SafariZoneEntrance_MapBGEvents: bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_SafariZoneEntrance_EventScript_22BD21 -Route121_SafariZoneEntrance_MapEvents:: @ 8533F60 +Route121_SafariZoneEntrance_MapEvents:: map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index fa645a6934..b23cdecccc 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -1,10 +1,10 @@ -Route121_SafariZoneEntrance: @ 8483EA4 +Route121_SafariZoneEntrance: .4byte Route121_SafariZoneEntrance_Layout .4byte Route121_SafariZoneEntrance_MapEvents .4byte Route121_SafariZoneEntrance_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 124 + .2byte LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE .byte MAPSEC_ROUTE_121 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route122/connections.inc b/data/maps/Route122/connections.inc index 2a0442a05e..a5a9f4fd66 100644 --- a/data/maps/Route122/connections.inc +++ b/data/maps/Route122/connections.inc @@ -1,8 +1,8 @@ -Route122_MapConnectionsList: @ 8486B0C +Route122_MapConnectionsList: connection up, -20, MAP_ROUTE121 connection down, -100, MAP_ROUTE123 -Route122_MapConnections: @ 8486B24 - .4byte 0x2 +Route122_MapConnections: + .4byte 2 .4byte Route122_MapConnectionsList diff --git a/data/maps/Route122/events.inc b/data/maps/Route122/events.inc index 4c5b9b4647..8eb4dbb2c8 100644 --- a/data/maps/Route122/events.inc +++ b/data/maps/Route122/events.inc @@ -1,6 +1,6 @@ -Route122_MapWarps: @ 852BDA0 +Route122_MapWarps: warp_def 22, 29, 0, 0, MAP_MT_PYRE_1F -Route122_MapEvents:: @ 852BDA8 +Route122_MapEvents:: map_events 0x0, Route122_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index eddd1a2347..941fff7a36 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -1,10 +1,10 @@ -Route122: @ 84828C4 +Route122: .4byte Route122_Layout .4byte Route122_MapEvents .4byte Route122_MapScripts .4byte Route122_MapConnections .2byte MUS_DOORO_X4 - .2byte 38 + .2byte LAYOUT_ROUTE122 .byte MAPSEC_ROUTE_122 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route123/connections.inc b/data/maps/Route123/connections.inc index 616c365ef3..e2125c9117 100644 --- a/data/maps/Route123/connections.inc +++ b/data/maps/Route123/connections.inc @@ -1,8 +1,8 @@ -Route123_MapConnectionsList: @ 8486B2C +Route123_MapConnectionsList: connection up, 100, MAP_ROUTE122 connection left, 0, MAP_ROUTE118 -Route123_MapConnections: @ 8486B44 - .4byte 0x2 +Route123_MapConnections: + .4byte 2 .4byte Route123_MapConnectionsList diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc index d45ac0222f..2584ebbd36 100644 --- a/data/maps/Route123/events.inc +++ b/data/maps/Route123/events.inc @@ -1,4 +1,4 @@ -Route123_EventObjects: @ 852BDBC +Route123_EventObjects: object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 58, BerryTreeScript, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 59, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 60, BerryTreeScript, 0 @@ -43,10 +43,10 @@ Route123_EventObjects: @ 852BDBC object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 3, Route123_EventScript_1F63A5, 0 object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FE4, FLAG_ITEM_ROUTE_123_REVIVAL_HERB -Route123_MapWarps: @ 852C1C4 +Route123_MapWarps: warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE -Route123_MapCoordEvents: @ 852C1CC +Route123_MapCoordEvents: coord_weather_event 90, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE coord_weather_event 92, 9, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE coord_weather_event 93, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE @@ -70,7 +70,7 @@ Route123_MapCoordEvents: @ 852C1CC coord_weather_event 9, 16, 3, COORD_EVENT_WEATHER_SUNNY coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE -Route123_MapBGEvents: @ 852C32C +Route123_MapBGEvents: bg_event 117, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61B3 bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1_2 bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2_2 @@ -83,6 +83,6 @@ Route123_MapBGEvents: @ 852C32C bg_hidden_item_event 139, 15, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP bg_hidden_item_event 138, 18, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY -Route123_MapEvents:: @ 852C3B0 +Route123_MapEvents:: map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index a215c35923..2a0120cfd9 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -1,10 +1,10 @@ -Route123: @ 84828E0 +Route123: .4byte Route123_Layout .4byte Route123_MapEvents .4byte Route123_MapScripts .4byte Route123_MapConnections .2byte MUS_DOORO_X4 - .2byte 39 + .2byte LAYOUT_ROUTE123 .byte MAPSEC_ROUTE_123 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route123_BerryMastersHouse/events.inc b/data/maps/Route123_BerryMastersHouse/events.inc index 3462054cbe..4ad6c2b634 100644 --- a/data/maps/Route123_BerryMastersHouse/events.inc +++ b/data/maps/Route123_BerryMastersHouse/events.inc @@ -1,11 +1,11 @@ -Route123_BerryMastersHouse_EventObjects: @ 853EACC +Route123_BerryMastersHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0 object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0 -Route123_BerryMastersHouse_MapWarps: @ 853EAFC +Route123_BerryMastersHouse_MapWarps: warp_def 3, 7, 0, 0, MAP_ROUTE123 warp_def 4, 7, 0, 0, MAP_ROUTE123 -Route123_BerryMastersHouse_MapEvents:: @ 853EB0C +Route123_BerryMastersHouse_MapEvents:: map_events Route123_BerryMastersHouse_EventObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 163625aaed..158471eaab 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -1,10 +1,10 @@ -Route123_BerryMastersHouse: @ 8485CD4 +Route123_BerryMastersHouse: .4byte House2_Layout .4byte Route123_BerryMastersHouse_MapEvents .4byte Route123_BerryMastersHouse_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_ROUTE_123 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc index ed10daab9c..959719385c 100644 --- a/data/maps/Route124/connections.inc +++ b/data/maps/Route124/connections.inc @@ -1,11 +1,11 @@ -Route124_MapConnectionsList: @ 8486B4C +Route124_MapConnectionsList: connection down, 0, MAP_ROUTE126 connection left, 10, MAP_LILYCOVE_CITY connection right, 0, MAP_ROUTE125 connection right, 40, MAP_MOSSDEEP_CITY connection dive, 0, MAP_UNDERWATER1 -Route124_MapConnections: @ 8486B88 - .4byte 0x5 +Route124_MapConnections: + .4byte 5 .4byte Route124_MapConnectionsList diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc index 4b52615fc7..4096396e89 100644 --- a/data/maps/Route124/events.inc +++ b/data/maps/Route124/events.inc @@ -1,4 +1,4 @@ -Route124_EventObjects: @ 852C3C4 +Route124_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, MOVEMENT_TYPE_LOOK_AROUND, 5, 0, 1, 3, Route124_EventScript_1F6585, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 5, 3, 1, 7, Route124_EventScript_1F659C, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0 @@ -12,12 +12,12 @@ Route124_EventObjects: @ 852C3C4 object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route124_EventScript_1F670B, 0 object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route124_EventScript_1F6722, 0 -Route124_MapWarps: @ 852C4E4 +Route124_MapWarps: warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE -Route124_MapBGEvents: @ 852C4EC +Route124_MapBGEvents: bg_event 73, 48, 3, BG_EVENT_PLAYER_FACING_ANY, Route124_EventScript_1F657C -Route124_MapEvents:: @ 852C4F8 +Route124_MapEvents:: map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index c9ae442b7a..189d0dc516 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -1,10 +1,10 @@ -Route124: @ 84828FC +Route124: .4byte Route124_Layout .4byte Route124_MapEvents .4byte Route124_MapScripts .4byte Route124_MapConnections .2byte MUS_DOORO_X3 - .2byte 40 + .2byte LAYOUT_ROUTE124 .byte MAPSEC_ROUTE_124 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc index 30dffed32d..4cff6a1f3f 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc @@ -1,12 +1,13 @@ -Route124_DivingTreasureHuntersHouse_EventObjects: @ 853ED9C +Route124_DivingTreasureHuntersHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0 -Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4 +Route124_DivingTreasureHuntersHouse_MapWarps: warp_def 3, 8, 0, 0, MAP_ROUTE124 warp_def 4, 8, 0, 0, MAP_ROUTE124 -Route124_DivingTreasureHuntersHouse_MapBGEvents: @ 853EDC4 +Route124_DivingTreasureHuntersHouse_MapBGEvents: bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route124_DivingTreasureHuntersHouse_EventScript_270F63 -Route124_DivingTreasureHuntersHouse_MapEvents:: @ 853EDD0 +Route124_DivingTreasureHuntersHouse_MapEvents:: map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents + diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index db9097ce54..46358f3374 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -1,10 +1,10 @@ -Route124_DivingTreasureHuntersHouse: @ 8485D44 +Route124_DivingTreasureHuntersHouse: .4byte Route124_DivingTreasureHuntersHouse_Layout .4byte Route124_DivingTreasureHuntersHouse_MapEvents .4byte Route124_DivingTreasureHuntersHouse_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 301 + .2byte LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE .byte MAPSEC_ROUTE_124 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route125/connections.inc b/data/maps/Route125/connections.inc index 2b5f944c9a..61ea9f0296 100644 --- a/data/maps/Route125/connections.inc +++ b/data/maps/Route125/connections.inc @@ -1,9 +1,9 @@ -Route125_MapConnectionsList: @ 8486B90 +Route125_MapConnectionsList: connection down, 0, MAP_MOSSDEEP_CITY connection left, 0, MAP_ROUTE124 connection dive, 0, MAP_UNDERWATER7 -Route125_MapConnections: @ 8486BB4 - .4byte 0x3 +Route125_MapConnections: + .4byte 3 .4byte Route125_MapConnectionsList diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc index 256802406a..e278d6e241 100644 --- a/data/maps/Route125/events.inc +++ b/data/maps/Route125/events.inc @@ -1,4 +1,4 @@ -Route125_EventObjects: @ 852C50C +Route125_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 31, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 2, 5, 1, 2, Route125_EventScript_1F67BB, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 38, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0 @@ -10,15 +10,15 @@ Route125_EventObjects: @ 852C50C object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 48, 19, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0 object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route125_EventScript_291018, FLAG_ITEM_ROUTE_125_BIG_PEARL -Route125_MapWarps: @ 852C5FC +Route125_MapWarps: warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM -Route125_MapBGEvents: @ 852C604 +Route125_MapBGEvents: bg_secret_base_event 53, 10, 0, SECRET_BASE_RED_CAVE1_2 bg_secret_base_event 55, 11, 0, SECRET_BASE_RED_CAVE4_2 bg_secret_base_event 7, 25, 0, SECRET_BASE_YELLOW_CAVE2_2 bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4_2 -Route125_MapEvents:: @ 852C634 +Route125_MapEvents:: map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index 12ea805319..b3a7308f31 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -1,10 +1,10 @@ -Route125: @ 8482918 +Route125: .4byte Route125_Layout .4byte Route125_MapEvents .4byte Route125_MapScripts .4byte Route125_MapConnections .2byte MUS_DOORO_X3 - .2byte 41 + .2byte LAYOUT_ROUTE125 .byte MAPSEC_ROUTE_125 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route126/connections.inc b/data/maps/Route126/connections.inc index b1f0f6d819..5784faa258 100644 --- a/data/maps/Route126/connections.inc +++ b/data/maps/Route126/connections.inc @@ -1,9 +1,9 @@ -Route126_MapConnectionsList: @ 8486BBC +Route126_MapConnectionsList: connection up, 0, MAP_ROUTE124 connection right, 0, MAP_ROUTE127 connection dive, 0, MAP_UNDERWATER2 -Route126_MapConnections: @ 8486BE0 - .4byte 0x3 +Route126_MapConnections: + .4byte 3 .4byte Route126_MapConnectionsList diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc index 8754a0006d..04355d668f 100644 --- a/data/maps/Route126/events.inc +++ b/data/maps/Route126/events.inc @@ -1,4 +1,4 @@ -Route126_EventObjects: @ 852C648 +Route126_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 51, 65, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 3, 1, 3, Route126_EventScript_1F68D6, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route126_EventScript_1F6904, 0 @@ -9,6 +9,6 @@ Route126_EventObjects: @ 852C648 object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6949, 0 object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6932, 0 -Route126_MapEvents:: @ 852C720 +Route126_MapEvents:: map_events Route126_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index 86225727fa..f0eabeeba4 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -1,10 +1,10 @@ -Route126: @ 8482934 +Route126: .4byte Route126_Layout .4byte Route126_MapEvents .4byte Route126_MapScripts .4byte Route126_MapConnections .2byte MUS_DOORO_X3 - .2byte 42 + .2byte LAYOUT_ROUTE126 .byte MAPSEC_ROUTE_126 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route127/connections.inc b/data/maps/Route127/connections.inc index 3ad7057a3e..8dcdf7978a 100644 --- a/data/maps/Route127/connections.inc +++ b/data/maps/Route127/connections.inc @@ -1,10 +1,10 @@ -Route127_MapConnectionsList: @ 8486BE8 +Route127_MapConnectionsList: connection up, 0, MAP_MOSSDEEP_CITY connection down, 0, MAP_ROUTE128 connection left, 0, MAP_ROUTE126 connection dive, 0, MAP_UNDERWATER3 -Route127_MapConnections: @ 8486C18 - .4byte 0x4 +Route127_MapConnections: + .4byte 4 .4byte Route127_MapConnectionsList diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc index 78dc268997..7b9e040d30 100644 --- a/data/maps/Route127/events.inc +++ b/data/maps/Route127/events.inc @@ -1,4 +1,4 @@ -Route127_EventObjects: @ 852C734 +Route127_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_291032, FLAG_ITEM_ROUTE_127_ZINC @@ -11,13 +11,13 @@ Route127_EventObjects: @ 852C734 object_event 10, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0 object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, FLAG_ITEM_ROUTE_127_RARE_CANDY -Route127_MapBGEvents: @ 852C83C +Route127_MapBGEvents: bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1 bg_secret_base_event 59, 72, 0, SECRET_BASE_YELLOW_CAVE3_2 bg_secret_base_event 67, 63, 0, SECRET_BASE_YELLOW_CAVE4_1 bg_secret_base_event 61, 21, 0, SECRET_BASE_YELLOW_CAVE3_3 bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1_3 -Route127_MapEvents:: @ 852C878 +Route127_MapEvents:: map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index b237a42ab1..0a7055f1c5 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -1,10 +1,10 @@ -Route127: @ 8482950 +Route127: .4byte Route127_Layout .4byte Route127_MapEvents .4byte Route127_MapScripts .4byte Route127_MapConnections .2byte MUS_DOORO_X3 - .2byte 43 + .2byte LAYOUT_ROUTE127 .byte MAPSEC_ROUTE_127 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route128/connections.inc b/data/maps/Route128/connections.inc index 5b2f0665d4..b958dbd3b7 100644 --- a/data/maps/Route128/connections.inc +++ b/data/maps/Route128/connections.inc @@ -1,10 +1,10 @@ -Route128_MapConnectionsList: @ 8486C20 +Route128_MapConnectionsList: connection up, 0, MAP_ROUTE127 connection down, 0, MAP_ROUTE129 connection right, -40, MAP_EVER_GRANDE_CITY connection dive, 0, MAP_UNDERWATER4 -Route128_MapConnections: @ 8486C50 - .4byte 0x4 +Route128_MapConnections: + .4byte 4 .4byte Route128_MapConnectionsList diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc index 792ff5ca32..6a449b7614 100644 --- a/data/maps/Route128/events.inc +++ b/data/maps/Route128/events.inc @@ -1,4 +1,4 @@ -Route128_EventObjects: @ 852C88C +Route128_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 33, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN, 5, 5, 1, 3, Route128_EventScript_1F6CBE, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0 object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_STEVEN @@ -10,11 +10,11 @@ Route128_EventObjects: @ 852C88C object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 4, Route128_EventScript_1F6DDE, 0 object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0 -Route128_MapBGEvents: @ 852C97C +Route128_MapBGEvents: bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1 bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2 bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3 -Route128_MapEvents:: @ 852C9A0 +Route128_MapEvents:: map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 2875033e97..33894ba7c1 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -1,10 +1,10 @@ -Route128: @ 848296C +Route128: .4byte Route128_Layout .4byte Route128_MapEvents .4byte Route128_MapScripts .4byte Route128_MapConnections .2byte MUS_DOORO_X3 - .2byte 44 + .2byte LAYOUT_ROUTE128 .byte MAPSEC_ROUTE_128 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route129/connections.inc b/data/maps/Route129/connections.inc index 1293e82353..c486c13cb0 100644 --- a/data/maps/Route129/connections.inc +++ b/data/maps/Route129/connections.inc @@ -1,9 +1,9 @@ -Route129_MapConnectionsList: @ 8486C58 +Route129_MapConnectionsList: connection up, 0, MAP_ROUTE128 connection left, 0, MAP_ROUTE130 connection dive, 0, MAP_UNDERWATER5 -Route129_MapConnections: @ 8486C7C - .4byte 0x3 +Route129_MapConnections: + .4byte 3 .4byte Route129_MapConnectionsList diff --git a/data/maps/Route129/events.inc b/data/maps/Route129/events.inc index c127ec5e3b..3919274cd6 100644 --- a/data/maps/Route129/events.inc +++ b/data/maps/Route129/events.inc @@ -1,10 +1,10 @@ -Route129_EventObjects: @ 852C9B4 +Route129_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 4, 1, 3, Route129_EventScript_1F72EC, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 14, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 5, 2, 1, 2, Route129_EventScript_1F7303, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 22, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route129_EventScript_1F7331, 0 object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, Route129_EventScript_1F731A, 0 object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 27, 1, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 1, 1, 1, 5, Route129_EventScript_1F7348, 0 -Route129_MapEvents:: @ 852CA2C +Route129_MapEvents:: map_events Route129_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 645cc7d92e..fd3cae8014 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -1,10 +1,10 @@ -Route129: @ 8482988 +Route129: .4byte Route129_Layout .4byte Route129_MapEvents .4byte Route129_MapScripts .4byte Route129_MapConnections .2byte MUS_GRANROAD - .2byte 45 + .2byte LAYOUT_ROUTE129 .byte MAPSEC_ROUTE_129 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route130/connections.inc b/data/maps/Route130/connections.inc index b977d43bca..4300eaae4e 100644 --- a/data/maps/Route130/connections.inc +++ b/data/maps/Route130/connections.inc @@ -1,8 +1,8 @@ -Route130_MapConnectionsList: @ 8486C84 +Route130_MapConnectionsList: connection left, 0, MAP_ROUTE131 connection right, 0, MAP_ROUTE129 -Route130_MapConnections: @ 8486C9C - .4byte 0x2 +Route130_MapConnections: + .4byte 2 .4byte Route130_MapConnectionsList diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc index 97532e5769..b07cc10017 100644 --- a/data/maps/Route130/events.inc +++ b/data/maps/Route130/events.inc @@ -1,9 +1,9 @@ -Route130_EventObjects: @ 852CA40 +Route130_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, BerryTreeScript, FLAG_TEMP_11 object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 5, Route130_EventScript_1F73ED, 0 -Route130_MapEvents:: @ 852CAA0 +Route130_MapEvents:: map_events Route130_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index 4c03656acc..5afd25edaf 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -1,10 +1,10 @@ -Route130: @ 84829A4 +Route130: .4byte Route130_Layout .4byte Route130_MapEvents .4byte Route130_MapScripts .4byte Route130_MapConnections .2byte MUS_GRANROAD - .2byte 263 + .2byte LAYOUT_ROUTE130 .byte MAPSEC_ROUTE_130 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route131/connections.inc b/data/maps/Route131/connections.inc index 150ea7023c..9697ba1e0d 100644 --- a/data/maps/Route131/connections.inc +++ b/data/maps/Route131/connections.inc @@ -1,8 +1,8 @@ -Route131_MapConnectionsList: @ 8486CA4 +Route131_MapConnectionsList: connection left, 0, MAP_PACIFIDLOG_TOWN connection right, 0, MAP_ROUTE130 -Route131_MapConnections: @ 8486CBC - .4byte 0x2 +Route131_MapConnections: + .4byte 2 .4byte Route131_MapConnectionsList diff --git a/data/maps/Route131/events.inc b/data/maps/Route131/events.inc index 1c321a6cb3..4f57f7b1c6 100644 --- a/data/maps/Route131/events.inc +++ b/data/maps/Route131/events.inc @@ -1,4 +1,4 @@ -Route131_EventObjects: @ 852CAB4 +Route131_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 32, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN, 5, 7, 1, 3, Route131_EventScript_1F7429, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 19, 1, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 7, 1, 4, Route131_EventScript_1F7440, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 22, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 4, Route131_EventScript_1F7457, 0 @@ -8,9 +8,9 @@ Route131_EventObjects: @ 852CAB4 object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 20, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route131_EventScript_1F74D2, 0 object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 52, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route131_EventScript_1F74BB, 0 -Route131_MapWarps: @ 852CB74 +Route131_MapWarps: warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE -Route131_MapEvents:: @ 852CB7C +Route131_MapEvents:: map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index e84799fd4d..177dba5ab7 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -1,10 +1,10 @@ -Route131: @ 84829C0 +Route131: .4byte Route131_Layout .4byte Route131_MapEvents .4byte Route131_MapScripts .4byte Route131_MapConnections .2byte MUS_GRANROAD - .2byte 47 + .2byte LAYOUT_ROUTE131 .byte MAPSEC_ROUTE_131 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route132/connections.inc b/data/maps/Route132/connections.inc index 5a70e34717..48999eb5c9 100644 --- a/data/maps/Route132/connections.inc +++ b/data/maps/Route132/connections.inc @@ -1,8 +1,8 @@ -Route132_MapConnectionsList: @ 8486CC4 +Route132_MapConnectionsList: connection left, 0, MAP_ROUTE133 connection right, 0, MAP_PACIFIDLOG_TOWN -Route132_MapConnections: @ 8486CDC - .4byte 0x2 +Route132_MapConnections: + .4byte 2 .4byte Route132_MapConnectionsList diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc index da648b9256..8ced112056 100644 --- a/data/maps/Route132/events.inc +++ b/data/maps/Route132/events.inc @@ -1,4 +1,4 @@ -Route132_EventObjects: @ 852CB90 +Route132_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 40, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route132_EventScript_1F74EA, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 2, Route132_EventScript_1F7501, 0 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route132_EventScript_291059, FLAG_ITEM_ROUTE_132_RARE_CANDY @@ -10,6 +10,6 @@ Route132_EventObjects: @ 852CB90 object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 21, 25, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 4, Route132_EventScript_1F7574, 0 object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route132_EventScript_291066, FLAG_ITEM_ROUTE_132_PROTEIN -Route132_MapEvents:: @ 852CC80 +Route132_MapEvents:: map_events Route132_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index 50630af030..06e0ac05d1 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -1,10 +1,10 @@ -Route132: @ 84829DC +Route132: .4byte Route132_Layout .4byte Route132_MapEvents .4byte Route132_MapScripts .4byte Route132_MapConnections .2byte MUS_GRANROAD - .2byte 48 + .2byte LAYOUT_ROUTE132 .byte MAPSEC_ROUTE_132 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route133/connections.inc b/data/maps/Route133/connections.inc index 1f22ea9605..6a7777c4b2 100644 --- a/data/maps/Route133/connections.inc +++ b/data/maps/Route133/connections.inc @@ -1,8 +1,8 @@ -Route133_MapConnectionsList: @ 8486CE4 +Route133_MapConnectionsList: connection left, 0, MAP_ROUTE134 connection right, 0, MAP_ROUTE132 -Route133_MapConnections: @ 8486CFC - .4byte 0x2 +Route133_MapConnections: + .4byte 2 .4byte Route133_MapConnectionsList diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc index 36f8b747d3..641489016c 100644 --- a/data/maps/Route133/events.inc +++ b/data/maps/Route133/events.inc @@ -1,4 +1,4 @@ -Route133_EventObjects: @ 852CC94 +Route133_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0 @@ -10,6 +10,6 @@ Route133_EventObjects: @ 852CC94 object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 56, 15, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, Route133_EventScript_1F762D, 0 object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route133_EventScript_29108D, FLAG_ITEM_ROUTE_133_MAX_REVIVE -Route133_MapEvents:: @ 852CD84 +Route133_MapEvents:: map_events Route133_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index ed6b7d2cea..2d4cc8a664 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -1,10 +1,10 @@ -Route133: @ 84829F8 +Route133: .4byte Route133_Layout .4byte Route133_MapEvents .4byte Route133_MapScripts .4byte Route133_MapConnections .2byte MUS_GRANROAD - .2byte 49 + .2byte LAYOUT_ROUTE133 .byte MAPSEC_ROUTE_133 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route134/connections.inc b/data/maps/Route134/connections.inc index 861c82b4d1..30989b3741 100644 --- a/data/maps/Route134/connections.inc +++ b/data/maps/Route134/connections.inc @@ -1,8 +1,8 @@ -Route134_MapConnectionsList: @ 8486D04 +Route134_MapConnectionsList: connection left, 0, MAP_SLATEPORT_CITY connection right, 0, MAP_ROUTE133 -Route134_MapConnections: @ 8486D1C - .4byte 0x2 +Route134_MapConnections: + .4byte 2 .4byte Route134_MapConnectionsList diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc index 8caf4da1e8..83e693c267 100644 --- a/data/maps/Route134/events.inc +++ b/data/maps/Route134/events.inc @@ -1,4 +1,4 @@ -Route134_EventObjects: @ 852CD98 +Route134_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 3, 5, 1, 2, Route134_EventScript_1F7653, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route134_EventScript_1F766A, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 41, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route134_EventScript_1F7698, 0 @@ -11,6 +11,6 @@ Route134_EventObjects: @ 852CD98 object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, FLAG_ITEM_ROUTE_134_CARBOS object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, FLAG_ITEM_ROUTE_134_STAR_PIECE -Route134_MapEvents:: @ 852CEA0 +Route134_MapEvents:: map_events Route134_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 8204e2815d..87bddf5c75 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -1,10 +1,10 @@ -Route134: @ 8482A14 +Route134: .4byte Route134_Layout .4byte Route134_MapEvents .4byte Route134_MapScripts .4byte Route134_MapConnections .2byte MUS_GRANROAD - .2byte 50 + .2byte LAYOUT_ROUTE134 .byte MAPSEC_ROUTE_134 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/RustboroCity/connections.inc b/data/maps/RustboroCity/connections.inc index dbca1662d0..c2921111f3 100644 --- a/data/maps/RustboroCity/connections.inc +++ b/data/maps/RustboroCity/connections.inc @@ -1,9 +1,9 @@ -RustboroCity_MapConnectionsList: @ 8486758 +RustboroCity_MapConnectionsList: connection up, 0, MAP_ROUTE115 connection down, 0, MAP_ROUTE104 connection right, 0, MAP_ROUTE116 -RustboroCity_MapConnections: @ 848677C - .4byte 0x3 +RustboroCity_MapConnections: + .4byte 3 .4byte RustboroCity_MapConnectionsList diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc index b2bcfa7cac..ecf816f7d4 100644 --- a/data/maps/RustboroCity/events.inc +++ b/data/maps/RustboroCity/events.inc @@ -1,4 +1,4 @@ -RustboroCity_EventObjects: @ 85267E0 +RustboroCity_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E088A, 0 object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E085F, 0 object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 25, 37, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0 @@ -16,7 +16,7 @@ RustboroCity_EventObjects: @ 85267E0 object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_SCIENTIST object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, RustboroCity_EventScript_1E1236, 0 -RustboroCity_MapWarps: @ 8526960 +RustboroCity_MapWarps: warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM warp_def 13, 30, 0, 0, MAP_RUSTBORO_CITY_FLAT1_1F warp_def 16, 45, 0, 0, MAP_RUSTBORO_CITY_MART @@ -30,7 +30,7 @@ RustboroCity_MapWarps: @ 8526960 warp_def 5, 51, 0, 0, MAP_RUSTBORO_CITY_FLAT2_1F warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3 -RustboroCity_MapCoordEvents: @ 85269C0 +RustboroCity_MapCoordEvents: coord_event 23, 20, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E095A coord_event 23, 21, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0971 coord_event 23, 22, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0988 @@ -53,7 +53,7 @@ RustboroCity_MapCoordEvents: @ 85269C0 coord_event 18, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0F73 coord_event 19, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0FB3 -RustboroCity_MapBGEvents: @ 8526B10 +RustboroCity_MapBGEvents: bg_event 23, 19, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08F5 bg_event 25, 35, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0910 bg_event 17, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E6A @@ -65,6 +65,6 @@ RustboroCity_MapBGEvents: @ 8526B10 bg_event 30, 8, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08E3 bg_event 12, 38, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0919 -RustboroCity_MapEvents:: @ 8526B88 +RustboroCity_MapEvents:: map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index 0cbd55b24d..f1f4a3d8ce 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -1,10 +1,10 @@ -RustboroCity: @ 848250C +RustboroCity: .4byte RustboroCity_Layout .4byte RustboroCity_MapEvents .4byte RustboroCity_MapScripts .4byte RustboroCity_MapConnections .2byte MUS_GOTOWN - .2byte 4 + .2byte LAYOUT_RUSTBORO_CITY .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/RustboroCity_CuttersHouse/events.inc b/data/maps/RustboroCity_CuttersHouse/events.inc index 71e57a143e..4980d5b959 100644 --- a/data/maps/RustboroCity_CuttersHouse/events.inc +++ b/data/maps/RustboroCity_CuttersHouse/events.inc @@ -1,11 +1,11 @@ -RustboroCity_CuttersHouse_EventObjects: @ 8530A1C +RustboroCity_CuttersHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0 object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0 -RustboroCity_CuttersHouse_MapWarps: @ 8530A4C +RustboroCity_CuttersHouse_MapWarps: warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY warp_def 6, 8, 0, 8, MAP_RUSTBORO_CITY -RustboroCity_CuttersHouse_MapEvents:: @ 8530A5C +RustboroCity_CuttersHouse_MapEvents:: map_events RustboroCity_CuttersHouse_EventObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index 8ffdf2c7b6..434b27c3ef 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -1,10 +1,10 @@ -RustboroCity_CuttersHouse: @ 8483478 +RustboroCity_CuttersHouse: .4byte RustboroCity_CuttersHouse_Layout .4byte RustboroCity_CuttersHouse_MapEvents .4byte RustboroCity_CuttersHouse_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 98 + .2byte LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_DevonCorp_1F/events.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc index f0d54df774..a3ed4affbd 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/events.inc @@ -1,17 +1,17 @@ -RustboroCity_DevonCorp_1F_EventObjects: @ 853037C +RustboroCity_DevonCorp_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 2, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0 object_event 2, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 15, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0 -RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4 +RustboroCity_DevonCorp_1F_MapWarps: warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY warp_def 6, 8, 0, 6, MAP_RUSTBORO_CITY warp_def 14, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_2F -RustboroCity_DevonCorp_1F_MapBGEvents: @ 85303DC +RustboroCity_DevonCorp_1F_MapBGEvents: bg_event 3, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_1F_EventScript_211312 bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_1F_EventScript_211309 -RustboroCity_DevonCorp_1F_MapEvents:: @ 85303F4 +RustboroCity_DevonCorp_1F_MapEvents:: map_events RustboroCity_DevonCorp_1F_EventObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, RustboroCity_DevonCorp_1F_MapBGEvents diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index a6f55163bc..3515eacb5b 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_DevonCorp_1F: @ 8483344 +RustboroCity_DevonCorp_1F: .4byte RustboroCity_DevonCorp_1F_Layout .4byte RustboroCity_DevonCorp_1F_MapEvents .4byte RustboroCity_DevonCorp_1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 92 + .2byte LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_DevonCorp_2F/events.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc index f10c947805..fdf2e319ea 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/events.inc @@ -1,4 +1,4 @@ -RustboroCity_DevonCorp_2F_EventObjects: @ 8530408 +RustboroCity_DevonCorp_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0 object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0 object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0 @@ -6,10 +6,10 @@ RustboroCity_DevonCorp_2F_EventObjects: @ 8530408 object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0 object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0 -RustboroCity_DevonCorp_2F_MapWarps: @ 8530498 +RustboroCity_DevonCorp_2F_MapWarps: warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_3F -RustboroCity_DevonCorp_2F_MapEvents:: @ 85304A8 +RustboroCity_DevonCorp_2F_MapEvents:: map_events RustboroCity_DevonCorp_2F_EventObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index bb548c44e5..dea4bb1b4b 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_DevonCorp_2F: @ 8483360 +RustboroCity_DevonCorp_2F: .4byte RustboroCity_DevonCorp_2F_Layout .4byte RustboroCity_DevonCorp_2F_MapEvents .4byte RustboroCity_DevonCorp_2F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 93 + .2byte LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc index df8ba02937..e9bae97463 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc @@ -1,15 +1,15 @@ -RustboroCity_DevonCorp_3F_EventObjects: @ 85304BC +RustboroCity_DevonCorp_3F_EventObjects: object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 -RustboroCity_DevonCorp_3F_MapWarps: @ 8530504 +RustboroCity_DevonCorp_3F_MapWarps: warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F -RustboroCity_DevonCorp_3F_MapBGEvents: @ 853050C +RustboroCity_DevonCorp_3F_MapBGEvents: bg_event 1, 5, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_212600 bg_event 1, 7, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_212600 -RustboroCity_DevonCorp_3F_MapEvents:: @ 8530524 +RustboroCity_DevonCorp_3F_MapEvents:: map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index d37f055a51..f64fe62539 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_DevonCorp_3F: @ 848337C +RustboroCity_DevonCorp_3F: .4byte RustboroCity_DevonCorp_3F_Layout .4byte RustboroCity_DevonCorp_3F_MapEvents .4byte RustboroCity_DevonCorp_3F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 269 + .2byte LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Flat1_1F/events.inc b/data/maps/RustboroCity_Flat1_1F/events.inc index b606a30dbc..7f745cbfd8 100644 --- a/data/maps/RustboroCity_Flat1_1F/events.inc +++ b/data/maps/RustboroCity_Flat1_1F/events.inc @@ -1,12 +1,12 @@ -RustboroCity_Flat1_1F_EventObjects: @ 8530890 +RustboroCity_Flat1_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0 -RustboroCity_Flat1_1F_MapWarps: @ 85308C0 +RustboroCity_Flat1_1F_MapWarps: warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY warp_def 7, 7, 0, 1, MAP_RUSTBORO_CITY warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT1_2F -RustboroCity_Flat1_1F_MapEvents:: @ 85308D8 +RustboroCity_Flat1_1F_MapEvents:: map_events RustboroCity_Flat1_1F_EventObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index 9d3a63c8c6..ea268aed46 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat1_1F: @ 8483424 +RustboroCity_Flat1_1F: .4byte RustboroCity_Flat1_1F_Layout .4byte RustboroCity_Flat1_1F_MapEvents .4byte RustboroCity_Flat1_1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 313 + .2byte LAYOUT_RUSTBORO_CITY_FLAT1_1F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Flat1_2F/events.inc b/data/maps/RustboroCity_Flat1_2F/events.inc index 9d3aace61f..02c650f870 100644 --- a/data/maps/RustboroCity_Flat1_2F/events.inc +++ b/data/maps/RustboroCity_Flat1_2F/events.inc @@ -1,4 +1,4 @@ -RustboroCity_Flat1_2F_EventObjects: @ 85308EC +RustboroCity_Flat1_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0 object_event 2, EVENT_OBJ_GFX_TWIN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 @@ -8,9 +8,9 @@ RustboroCity_Flat1_2F_EventObjects: @ 85308EC object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 -RustboroCity_Flat1_2F_MapWarps: @ 85309AC +RustboroCity_Flat1_2F_MapWarps: warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F -RustboroCity_Flat1_2F_MapEvents:: @ 85309B4 +RustboroCity_Flat1_2F_MapEvents:: map_events RustboroCity_Flat1_2F_EventObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index ce47b6cb41..9f6d03649d 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat1_2F: @ 8483440 +RustboroCity_Flat1_2F: .4byte RustboroCity_Flat1_2F_Layout .4byte RustboroCity_Flat1_2F_MapEvents .4byte RustboroCity_Flat1_2F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 314 + .2byte LAYOUT_RUSTBORO_CITY_FLAT1_2F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Flat2_1F/events.inc b/data/maps/RustboroCity_Flat2_1F/events.inc index c355742618..82105a66a4 100644 --- a/data/maps/RustboroCity_Flat2_1F/events.inc +++ b/data/maps/RustboroCity_Flat2_1F/events.inc @@ -1,12 +1,12 @@ -RustboroCity_Flat2_1F_EventObjects: @ 8530AC4 +RustboroCity_Flat2_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0 object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0 -RustboroCity_Flat2_1F_MapWarps: @ 8530AF4 +RustboroCity_Flat2_1F_MapWarps: warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY warp_def 3, 8, 0, 10, MAP_RUSTBORO_CITY warp_def 3, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_2F -RustboroCity_Flat2_1F_MapEvents:: @ 8530B0C +RustboroCity_Flat2_1F_MapEvents:: map_events RustboroCity_Flat2_1F_EventObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index dc2a68edf5..73ae198856 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat2_1F: @ 84834B0 +RustboroCity_Flat2_1F: .4byte RustboroCity_Flat2_1F_Layout .4byte RustboroCity_Flat2_1F_MapEvents .4byte RustboroCity_Flat2_1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 294 + .2byte LAYOUT_RUSTBORO_CITY_FLAT2_1F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Flat2_2F/events.inc b/data/maps/RustboroCity_Flat2_2F/events.inc index 60423b5d6a..fd8fad1a48 100644 --- a/data/maps/RustboroCity_Flat2_2F/events.inc +++ b/data/maps/RustboroCity_Flat2_2F/events.inc @@ -1,11 +1,11 @@ -RustboroCity_Flat2_2F_EventObjects: @ 8530B20 +RustboroCity_Flat2_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0 object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0 -RustboroCity_Flat2_2F_MapWarps: @ 8530B50 +RustboroCity_Flat2_2F_MapWarps: warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F warp_def 1, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_3F -RustboroCity_Flat2_2F_MapEvents:: @ 8530B60 +RustboroCity_Flat2_2F_MapEvents:: map_events RustboroCity_Flat2_2F_EventObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index 1d117d3166..d002b54ae5 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat2_2F: @ 84834CC +RustboroCity_Flat2_2F: .4byte RustboroCity_Flat2_2F_Layout .4byte RustboroCity_Flat2_2F_MapEvents .4byte RustboroCity_Flat2_2F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 295 + .2byte LAYOUT_RUSTBORO_CITY_FLAT2_2F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Flat2_3F/events.inc b/data/maps/RustboroCity_Flat2_3F/events.inc index 9ab4727f3f..a33992eb26 100644 --- a/data/maps/RustboroCity_Flat2_3F/events.inc +++ b/data/maps/RustboroCity_Flat2_3F/events.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat2_3F_EventObjects: @ 8530B74 +RustboroCity_Flat2_3F_EventObjects: object_event 1, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0 -RustboroCity_Flat2_3F_MapWarps: @ 8530BA4 +RustboroCity_Flat2_3F_MapWarps: warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F -RustboroCity_Flat2_3F_MapEvents:: @ 8530BAC +RustboroCity_Flat2_3F_MapEvents:: map_events RustboroCity_Flat2_3F_EventObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index 037ca68211..1b7f52fcaf 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat2_3F: @ 84834E8 +RustboroCity_Flat2_3F: .4byte RustboroCity_Flat2_3F_Layout .4byte RustboroCity_Flat2_3F_MapEvents .4byte RustboroCity_Flat2_3F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 296 + .2byte LAYOUT_RUSTBORO_CITY_FLAT2_3F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc index 0d1f57cdd4..3fb1517998 100644 --- a/data/maps/RustboroCity_Gym/events.inc +++ b/data/maps/RustboroCity_Gym/events.inc @@ -1,18 +1,18 @@ -RustboroCity_Gym_EventObjects: @ 8530538 +RustboroCity_Gym_EventObjects: object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0 object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0 object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0 object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0 object_event 5, EVENT_OBJ_GFX_HIKER, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, RustboroCity_Gym_EventScript_213011, 0 -RustboroCity_Gym_MapWarps: @ 85305B0 +RustboroCity_Gym_MapWarps: warp_def 5, 19, 0, 0, MAP_RUSTBORO_CITY warp_def 6, 19, 0, 0, MAP_RUSTBORO_CITY -RustboroCity_Gym_MapBGEvents: @ 85305C0 +RustboroCity_Gym_MapBGEvents: bg_event 2, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_213047 bg_event 8, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_213057 -RustboroCity_Gym_MapEvents:: @ 85305D8 +RustboroCity_Gym_MapEvents:: map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index 72dc7ee47e..4f043ed982 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Gym: @ 8483398 +RustboroCity_Gym: .4byte RustboroCity_Gym_Layout .4byte RustboroCity_Gym_MapEvents .4byte RustboroCity_Gym_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 94 + .2byte LAYOUT_RUSTBORO_CITY_GYM .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_House1/events.inc b/data/maps/RustboroCity_House1/events.inc index 2fc0284a92..4278568e6e 100644 --- a/data/maps/RustboroCity_House1/events.inc +++ b/data/maps/RustboroCity_House1/events.inc @@ -1,11 +1,11 @@ -RustboroCity_House1_EventObjects: @ 85309C8 +RustboroCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0 object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0 -RustboroCity_House1_MapWarps: @ 85309F8 +RustboroCity_House1_MapWarps: warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY warp_def 6, 7, 0, 7, MAP_RUSTBORO_CITY -RustboroCity_House1_MapEvents:: @ 8530A08 +RustboroCity_House1_MapEvents:: map_events RustboroCity_House1_EventObjects, RustboroCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index cff9064e93..22c08344aa 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -1,10 +1,10 @@ -RustboroCity_House1: @ 848345C +RustboroCity_House1: .4byte RustboroCity_House1_Layout .4byte RustboroCity_House1_MapEvents .4byte RustboroCity_House1_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 97 + .2byte LAYOUT_RUSTBORO_CITY_HOUSE1 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_House2/events.inc b/data/maps/RustboroCity_House2/events.inc index 2f8d4b2bfc..87f324126c 100644 --- a/data/maps/RustboroCity_House2/events.inc +++ b/data/maps/RustboroCity_House2/events.inc @@ -1,11 +1,11 @@ -RustboroCity_House2_EventObjects: @ 8530A70 +RustboroCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0 -RustboroCity_House2_MapWarps: @ 8530AA0 +RustboroCity_House2_MapWarps: warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY warp_def 6, 8, 0, 9, MAP_RUSTBORO_CITY -RustboroCity_House2_MapEvents:: @ 8530AB0 +RustboroCity_House2_MapEvents:: map_events RustboroCity_House2_EventObjects, RustboroCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index d842f2e794..564b2aecc8 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -1,10 +1,10 @@ -RustboroCity_House2: @ 8483494 +RustboroCity_House2: .4byte RustboroCity_House_Layout .4byte RustboroCity_House2_MapEvents .4byte RustboroCity_House2_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 96 + .2byte LAYOUT_RUSTBORO_CITY_HOUSE .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_House3/events.inc b/data/maps/RustboroCity_House3/events.inc index 95198b27c2..3d32a9c731 100644 --- a/data/maps/RustboroCity_House3/events.inc +++ b/data/maps/RustboroCity_House3/events.inc @@ -1,12 +1,12 @@ -RustboroCity_House3_EventObjects: @ 8530BC0 +RustboroCity_House3_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0 object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0 object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0 -RustboroCity_House3_MapWarps: @ 8530C08 +RustboroCity_House3_MapWarps: warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY warp_def 6, 8, 0, 11, MAP_RUSTBORO_CITY -RustboroCity_House3_MapEvents:: @ 8530C18 +RustboroCity_House3_MapEvents:: map_events RustboroCity_House3_EventObjects, RustboroCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index 7f057cf156..eea35721ca 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -1,10 +1,10 @@ -RustboroCity_House3: @ 8483504 +RustboroCity_House3: .4byte RustboroCity_House_Layout .4byte RustboroCity_House3_MapEvents .4byte RustboroCity_House3_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 96 + .2byte LAYOUT_RUSTBORO_CITY_HOUSE .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Mart/events.inc b/data/maps/RustboroCity_Mart/events.inc index 8d65c367d0..131ffe24b2 100644 --- a/data/maps/RustboroCity_Mart/events.inc +++ b/data/maps/RustboroCity_Mart/events.inc @@ -1,13 +1,13 @@ -RustboroCity_Mart_EventObjects: @ 853080C +RustboroCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0 object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_Mart_EventScript_214F74, 0 object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_Mart_EventScript_214F86, 0 -RustboroCity_Mart_MapWarps: @ 853086C +RustboroCity_Mart_MapWarps: warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY warp_def 4, 7, 0, 2, MAP_RUSTBORO_CITY -RustboroCity_Mart_MapEvents:: @ 853087C +RustboroCity_Mart_MapEvents:: map_events RustboroCity_Mart_EventObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index bb41aab1dd..f6dbd60a58 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Mart: @ 8483408 +RustboroCity_Mart: .4byte Mart_Layout .4byte RustboroCity_Mart_MapEvents .4byte RustboroCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_PokemonCenter_1F/events.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc index 597eace15a..50b18e8823 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/events.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -RustboroCity_PokemonCenter_1F_EventObjects: @ 85306F4 +RustboroCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0 object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0 -RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754 +RustboroCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY warp_def 6, 8, 3, 3, MAP_RUSTBORO_CITY warp_def 1, 6, 4, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_2F -RustboroCity_PokemonCenter_1F_MapEvents:: @ 853076C +RustboroCity_PokemonCenter_1F_MapEvents:: map_events RustboroCity_PokemonCenter_1F_EventObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index 4c5c500740..71f0d8b258 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_PokemonCenter_1F: @ 84833D0 +RustboroCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte RustboroCity_PokemonCenter_1F_MapEvents .4byte RustboroCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_PokemonCenter_2F/events.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc index 346a4de16e..a565f259b4 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/events.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -RustboroCity_PokemonCenter_2F_EventObjects: @ 8530780 +RustboroCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0 +RustboroCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -RustboroCity_PokemonCenter_2F_MapEvents:: @ 85307F8 +RustboroCity_PokemonCenter_2F_MapEvents:: map_events RustboroCity_PokemonCenter_2F_EventObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 8e70f4c809..2ee6bdfd15 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_PokemonCenter_2F: @ 84833EC +RustboroCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte RustboroCity_PokemonCenter_2F_MapEvents .4byte RustboroCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc index 0c6ca19dce..0d230b178b 100644 --- a/data/maps/RustboroCity_PokemonSchool/events.inc +++ b/data/maps/RustboroCity_PokemonSchool/events.inc @@ -1,4 +1,4 @@ -RustboroCity_PokemonSchool_EventObjects: @ 85305EC +RustboroCity_PokemonSchool_EventObjects: object_event 1, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0 object_event 2, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0 object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0 @@ -7,17 +7,17 @@ RustboroCity_PokemonSchool_EventObjects: @ 85305EC object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0 object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT -RustboroCity_PokemonSchool_MapWarps: @ 8530694 +RustboroCity_PokemonSchool_MapWarps: warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY -RustboroCity_PokemonSchool_MapBGEvents: @ 85306A4 +RustboroCity_PokemonSchool_MapBGEvents: bg_event 5, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 bg_event 4, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 bg_event 6, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 bg_event 3, 5, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213F8C -RustboroCity_PokemonSchool_MapEvents:: @ 85306E0 +RustboroCity_PokemonSchool_MapEvents:: map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 9b14670424..e02d9c7110 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -1,10 +1,10 @@ -RustboroCity_PokemonSchool: @ 84833B4 +RustboroCity_PokemonSchool: .4byte RustboroCity_PokemonSchool_Layout .4byte RustboroCity_PokemonSchool_MapEvents .4byte RustboroCity_PokemonSchool_MapScripts .4byte 0x0 .2byte MUS_P_SCHOOL - .2byte 95 + .2byte LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc index 292bda57d3..ea48a4828a 100644 --- a/data/maps/RusturfTunnel/events.inc +++ b/data/maps/RusturfTunnel/events.inc @@ -1,4 +1,4 @@ -RusturfTunnel_EventObjects: @ 85341C4 +RusturfTunnel_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL @@ -10,18 +10,18 @@ RusturfTunnel_EventObjects: @ 85341C4 object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, RusturfTunnel_EventScript_22D1B1, 0 object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN -RusturfTunnel_MapWarps: @ 85342B4 +RusturfTunnel_MapWarps: warp_def 4, 10, 3, 0, MAP_ROUTE116 warp_def 29, 16, 3, 4, MAP_VERDANTURF_TOWN warp_def 18, 20, 3, 2, MAP_ROUTE116 -RusturfTunnel_MapCoordEvents: @ 85342CC +RusturfTunnel_MapCoordEvents: coord_event 23, 4, 3, 0, 0, RusturfTunnel_EventScript_22D071 coord_event 9, 4, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083 coord_event 9, 5, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083 coord_event 25, 4, 3, 0, 0, RusturfTunnel_EventScript_22D077 coord_event 25, 5, 3, 0, 0, RusturfTunnel_EventScript_22D07D -RusturfTunnel_MapEvents:: @ 853431C +RusturfTunnel_MapEvents:: map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index 70a4776816..8bb9fa94fa 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -1,10 +1,10 @@ -RusturfTunnel: @ 8483F30 +RusturfTunnel: .4byte RusturfTunnel_Layout .4byte RusturfTunnel_MapEvents .4byte RusturfTunnel_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 129 + .2byte LAYOUT_RUSTURF_TUNNEL .byte MAPSEC_RUSTURF_TUNNEL .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc index c36e38fda7..56a07b43e4 100644 --- a/data/maps/SSTidalCorridor/events.inc +++ b/data/maps/SSTidalCorridor/events.inc @@ -1,11 +1,11 @@ -SSTidalCorridor_EventObjects: @ 853A158 +SSTidalCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT -SSTidalCorridor_MapWarps: @ 853A1D0 +SSTidalCorridor_MapWarps: warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS warp_def 7, 9, 3, 2, MAP_SS_TIDAL_ROOMS warp_def 10, 9, 3, 4, MAP_SS_TIDAL_ROOMS @@ -16,7 +16,7 @@ SSTidalCorridor_MapWarps: @ 853A1D0 warp_def 13, 3, 3, 11, MAP_SS_TIDAL_ROOMS warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK -SSTidalCorridor_MapBGEvents: @ 853A218 +SSTidalCorridor_MapBGEvents: bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D @@ -30,6 +30,6 @@ SSTidalCorridor_MapBGEvents: @ 853A218 bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C107 bg_event 14, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C110 -SSTidalCorridor_MapEvents:: @ 853A2A8 +SSTidalCorridor_MapEvents:: map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 37128821c2..972fae2154 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -1,10 +1,10 @@ -SSTidalCorridor: @ 8484F0C +SSTidalCorridor: .4byte SSTidalCorridor_Layout .4byte SSTidalCorridor_MapEvents .4byte SSTidalCorridor_MapScripts .4byte 0x0 .2byte MUS_M_BOAT - .2byte 277 + .2byte LAYOUT_SS_TIDAL_CORRIDOR .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc index 65ced7c13c..73385dfc3a 100644 --- a/data/maps/SSTidalLowerDeck/events.inc +++ b/data/maps/SSTidalLowerDeck/events.inc @@ -1,13 +1,13 @@ -SSTidalLowerDeck_EventObjects: @ 853A2BC +SSTidalLowerDeck_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0 -SSTidalLowerDeck_MapWarps: @ 853A2EC +SSTidalLowerDeck_MapWarps: warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR -SSTidalLowerDeck_MapBGEvents: @ 853A2F4 +SSTidalLowerDeck_MapBGEvents: bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS -SSTidalLowerDeck_MapEvents:: @ 853A300 +SSTidalLowerDeck_MapEvents:: map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index f86d3ac06c..c14cf55130 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -1,10 +1,10 @@ -SSTidalLowerDeck: @ 8484F28 +SSTidalLowerDeck: .4byte SSTidalLowerDeck_Layout .4byte SSTidalLowerDeck_MapEvents .4byte SSTidalLowerDeck_MapScripts .4byte 0x0 .2byte MUS_M_BOAT - .2byte 278 + .2byte LAYOUT_SS_TIDAL_LOWER_DECK .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc index 99937ef75a..dc8a57164b 100644 --- a/data/maps/SSTidalRooms/events.inc +++ b/data/maps/SSTidalRooms/events.inc @@ -1,4 +1,4 @@ -SSTidalRooms_EventObjects: @ 853A314 +SSTidalRooms_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0 object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0 @@ -8,7 +8,7 @@ SSTidalRooms_EventObjects: @ 853A314 object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0 object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SSTidalRooms_EventScript_23C9F2, FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER -SSTidalRooms_MapWarps: @ 853A3D4 +SSTidalRooms_MapWarps: warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR warp_def 5, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR warp_def 13, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR @@ -22,10 +22,10 @@ SSTidalRooms_MapWarps: @ 853A3D4 warp_def 22, 1, 0, 6, MAP_SS_TIDAL_CORRIDOR warp_def 31, 1, 0, 7, MAP_SS_TIDAL_CORRIDOR -SSTidalRooms_MapBGEvents: @ 853A434 +SSTidalRooms_MapBGEvents: bg_event 15, 11, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_23CA33 bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_23CA33 -SSTidalRooms_MapEvents:: @ 853A44C +SSTidalRooms_MapEvents:: map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index 0d1f4db63f..951cd6ce13 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -1,10 +1,10 @@ -SSTidalRooms: @ 8484F44 +SSTidalRooms: .4byte SSTidalRooms_Layout .4byte SSTidalRooms_MapEvents .4byte SSTidalRooms_MapScripts .4byte 0x0 .2byte MUS_M_BOAT - .2byte 279 + .2byte LAYOUT_SS_TIDAL_ROOMS .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_North/connections.inc b/data/maps/SafariZone_North/connections.inc index d99826f0d3..131338df92 100644 --- a/data/maps/SafariZone_North/connections.inc +++ b/data/maps/SafariZone_North/connections.inc @@ -1,9 +1,9 @@ -SafariZone_North_MapConnectionsList: @ 8486E18 +SafariZone_North_MapConnectionsList: connection left, 0, MAP_SAFARI_ZONE_NORTHWEST connection down, 0, MAP_SAFARI_ZONE_SOUTH connection right, 0, MAP_SAFARI_ZONE_NORTHEAST -SafariZone_North_MapConnections: @ 8486E3C - .4byte 0x3 +SafariZone_North_MapConnections: + .4byte 3 .4byte SafariZone_North_MapConnectionsList diff --git a/data/maps/SafariZone_North/events.inc b/data/maps/SafariZone_North/events.inc index 152fa54c5a..1131cd7146 100644 --- a/data/maps/SafariZone_North/events.inc +++ b/data/maps/SafariZone_North/events.inc @@ -1,4 +1,4 @@ -SafariZone_North_EventObjects: @ 853B160 +SafariZone_North_EventObjects: object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D254, 0 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 6, 29, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D25D, 0 object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_11 @@ -9,6 +9,6 @@ SafariZone_North_EventObjects: @ 853B160 object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_16 object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2912C9, FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM -SafariZone_North_MapEvents:: @ 853B238 +SafariZone_North_MapEvents:: map_events SafariZone_North_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc index ebcb62f9a3..935a2c5a6e 100644 --- a/data/maps/SafariZone_North/header.inc +++ b/data/maps/SafariZone_North/header.inc @@ -1,10 +1,10 @@ -SafariZone_North: @ 8485158 +SafariZone_North: .4byte SafariZone_North_Layout .4byte SafariZone_North_MapEvents .4byte SafariZone_North_MapScripts .4byte SafariZone_North_MapConnections .2byte MUS_SAFARI - .2byte 239 + .2byte LAYOUT_SAFARI_ZONE_NORTH .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_Northeast/connections.inc b/data/maps/SafariZone_Northeast/connections.inc index c762c485ae..20595bd7af 100644 --- a/data/maps/SafariZone_Northeast/connections.inc +++ b/data/maps/SafariZone_Northeast/connections.inc @@ -1,8 +1,8 @@ -SafariZone_Northeast_MapConnectionsList: @ 8486E90 +SafariZone_Northeast_MapConnectionsList: connection left, 0, MAP_SAFARI_ZONE_NORTH connection down, 0, MAP_SAFARI_ZONE_SOUTHEAST -SafariZone_Northeast_MapConnections: @ 8486EA8 - .4byte 0x2 +SafariZone_Northeast_MapConnections: + .4byte 2 .4byte SafariZone_Northeast_MapConnectionsList diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc index dc0393b4d7..02bb2fc19b 100644 --- a/data/maps/SafariZone_Northeast/events.inc +++ b/data/maps/SafariZone_Northeast/events.inc @@ -1,4 +1,4 @@ -SafariZone_Northeast_EventObjects: @ 853B968 +SafariZone_Northeast_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 8, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 30, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0 object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_15 @@ -9,10 +9,10 @@ SafariZone_Northeast_EventObjects: @ 853B968 object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_12 object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET -SafariZone_Northeast_MapBGEvents: @ 853BA40 +SafariZone_Northeast_MapBGEvents: bg_hidden_item_event 31, 35, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY bg_hidden_item_event 21, 5, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC -SafariZone_Northeast_MapEvents:: @ 853BA58 +SafariZone_Northeast_MapEvents:: map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 9db5fd596f..8c68cd8c29 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -1,10 +1,10 @@ -SafariZone_Northeast: @ 848528C +SafariZone_Northeast: .4byte SafariZone_Northeast_Layout .4byte SafariZone_Northeast_MapEvents .4byte SafariZone_Northeast_MapScripts .4byte SafariZone_Northeast_MapConnections .2byte MUS_SAFARI - .2byte 394 + .2byte LAYOUT_SAFARI_ZONE_NORTHEAST .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_Northwest/connections.inc b/data/maps/SafariZone_Northwest/connections.inc index 010a13cc23..24ac78021e 100644 --- a/data/maps/SafariZone_Northwest/connections.inc +++ b/data/maps/SafariZone_Northwest/connections.inc @@ -1,8 +1,8 @@ -SafariZone_Northwest_MapConnectionsList: @ 8486DF8 +SafariZone_Northwest_MapConnectionsList: connection right, 0, MAP_SAFARI_ZONE_NORTH connection down, 0, MAP_SAFARI_ZONE_SOUTHWEST -SafariZone_Northwest_MapConnections: @ 8486E10 - .4byte 0x2 +SafariZone_Northwest_MapConnections: + .4byte 2 .4byte SafariZone_Northwest_MapConnectionsList diff --git a/data/maps/SafariZone_Northwest/events.inc b/data/maps/SafariZone_Northwest/events.inc index 95b6623acf..729e51734e 100644 --- a/data/maps/SafariZone_Northwest/events.inc +++ b/data/maps/SafariZone_Northwest/events.inc @@ -1,7 +1,7 @@ -SafariZone_Northwest_EventObjects: @ 853B11C +SafariZone_Northwest_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northwest_EventScript_2912BC, FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22 -SafariZone_Northwest_MapEvents:: @ 853B14C +SafariZone_Northwest_MapEvents:: map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index ca59f45e79..1218a65139 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -1,10 +1,10 @@ -SafariZone_Northwest: @ 848513C +SafariZone_Northwest: .4byte SafariZone_Northwest_Layout .4byte SafariZone_Northwest_MapEvents .4byte SafariZone_Northwest_MapScripts .4byte SafariZone_Northwest_MapConnections .2byte MUS_SAFARI - .2byte 238 + .2byte LAYOUT_SAFARI_ZONE_NORTHWEST .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_RestHouse/events.inc b/data/maps/SafariZone_RestHouse/events.inc index 5a54de9611..2d601b883a 100644 --- a/data/maps/SafariZone_RestHouse/events.inc +++ b/data/maps/SafariZone_RestHouse/events.inc @@ -1,12 +1,12 @@ -SafariZone_RestHouse_EventObjects: @ 853B8FC +SafariZone_RestHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0 object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0 object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0 -SafariZone_RestHouse_MapWarps: @ 853B944 +SafariZone_RestHouse_MapWarps: warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST warp_def 4, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST -SafariZone_RestHouse_MapEvents:: @ 853B954 +SafariZone_RestHouse_MapEvents:: map_events SafariZone_RestHouse_EventObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index fbb6f4d058..79d807c7fd 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -1,10 +1,10 @@ -SafariZone_RestHouse: @ 8485270 +SafariZone_RestHouse: .4byte SafariZone_RestHouse_Layout .4byte SafariZone_RestHouse_MapEvents .4byte SafariZone_RestHouse_MapScripts .4byte 0x0 .2byte MUS_SAFARI - .2byte 329 + .2byte LAYOUT_SAFARI_ZONE_REST_HOUSE .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_South/connections.inc b/data/maps/SafariZone_South/connections.inc index 856bb30aba..4c2e912ca4 100644 --- a/data/maps/SafariZone_South/connections.inc +++ b/data/maps/SafariZone_South/connections.inc @@ -1,9 +1,9 @@ -SafariZone_South_MapConnectionsList: @ 8486E64 +SafariZone_South_MapConnectionsList: connection up, 0, MAP_SAFARI_ZONE_NORTH connection left, 0, MAP_SAFARI_ZONE_SOUTHWEST connection right, 0, MAP_SAFARI_ZONE_SOUTHEAST -SafariZone_South_MapConnections: @ 8486E88 - .4byte 0x3 +SafariZone_South_MapConnections: + .4byte 3 .4byte SafariZone_South_MapConnectionsList diff --git a/data/maps/SafariZone_South/events.inc b/data/maps/SafariZone_South/events.inc index 6d8d84877f..8bc56885fe 100644 --- a/data/maps/SafariZone_South/events.inc +++ b/data/maps/SafariZone_South/events.inc @@ -1,4 +1,4 @@ -SafariZone_South_EventObjects: @ 853B2A4 +SafariZone_South_EventObjects: object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0 object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2CA, 0 object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 16, 6, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0 @@ -6,9 +6,9 @@ SafariZone_South_EventObjects: @ 853B2A4 object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D390, FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D3A2, FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS -SafariZone_South_MapWarps: @ 853B334 +SafariZone_South_MapWarps: warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE -SafariZone_South_MapEvents:: @ 853B33C +SafariZone_South_MapEvents:: map_events SafariZone_South_EventObjects, SafariZone_South_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc index 1567935d26..01fcac57f4 100644 --- a/data/maps/SafariZone_South/header.inc +++ b/data/maps/SafariZone_South/header.inc @@ -1,10 +1,10 @@ -SafariZone_South: @ 8485190 +SafariZone_South: .4byte SafariZone_South_Layout .4byte SafariZone_South_MapEvents .4byte SafariZone_South_MapScripts .4byte SafariZone_South_MapConnections .2byte MUS_SAFARI - .2byte 241 + .2byte LAYOUT_SAFARI_ZONE_SOUTH .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_Southeast/connections.inc b/data/maps/SafariZone_Southeast/connections.inc index 16b39e87b7..5a7b4140a2 100644 --- a/data/maps/SafariZone_Southeast/connections.inc +++ b/data/maps/SafariZone_Southeast/connections.inc @@ -1,8 +1,8 @@ -SafariZone_Southeast_MapConnectionsList: @ 8486EB0 +SafariZone_Southeast_MapConnectionsList: connection left, 0, MAP_SAFARI_ZONE_SOUTH connection up, 0, MAP_SAFARI_ZONE_NORTHEAST -SafariZone_Southeast_MapConnections: @ 8486EC8 - .4byte 0x2 +SafariZone_Southeast_MapConnections: + .4byte 2 .4byte SafariZone_Southeast_MapConnectionsList diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc index badaaefd4a..a35a8564d7 100644 --- a/data/maps/SafariZone_Southeast/events.inc +++ b/data/maps/SafariZone_Southeast/events.inc @@ -1,14 +1,14 @@ -SafariZone_Southeast_EventObjects: @ 853BA6C +SafariZone_Southeast_EventObjects: object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 7, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0 object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 20, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0 object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 8, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_2912F0, FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION -SafariZone_Southeast_MapBGEvents: @ 853BAE4 +SafariZone_Southeast_MapBGEvents: bg_hidden_item_event 19, 36, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP bg_hidden_item_event 32, 33, 0, ITEM_FULL_RESTORE, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE -SafariZone_Southeast_MapEvents:: @ 853BAFC +SafariZone_Southeast_MapEvents:: map_events SafariZone_Southeast_EventObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 55ff682323..b07747fd5c 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -1,10 +1,10 @@ -SafariZone_Southeast: @ 84852A8 +SafariZone_Southeast: .4byte SafariZone_Southeast_Layout .4byte SafariZone_Southeast_MapEvents .4byte SafariZone_Southeast_MapScripts .4byte SafariZone_Southeast_MapConnections .2byte MUS_SAFARI - .2byte 395 + .2byte LAYOUT_SAFARI_ZONE_SOUTHEAST .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_Southwest/connections.inc b/data/maps/SafariZone_Southwest/connections.inc index 83398e3a3d..34702a3c29 100644 --- a/data/maps/SafariZone_Southwest/connections.inc +++ b/data/maps/SafariZone_Southwest/connections.inc @@ -1,8 +1,8 @@ -SafariZone_Southwest_MapConnectionsList: @ 8486E44 +SafariZone_Southwest_MapConnectionsList: connection up, 0, MAP_SAFARI_ZONE_NORTHWEST connection right, 0, MAP_SAFARI_ZONE_SOUTH -SafariZone_Southwest_MapConnections: @ 8486E5C - .4byte 0x2 +SafariZone_Southwest_MapConnections: + .4byte 2 .4byte SafariZone_Southwest_MapConnectionsList diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc index 930d3c8ed5..6a6a488879 100644 --- a/data/maps/SafariZone_Southwest/events.inc +++ b/data/maps/SafariZone_Southwest/events.inc @@ -1,13 +1,13 @@ -SafariZone_Southwest_EventObjects: @ 853B24C +SafariZone_Southwest_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southwest_EventScript_2912D6, FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE -SafariZone_Southwest_MapWarps: @ 853B27C +SafariZone_Southwest_MapWarps: warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE -SafariZone_Southwest_MapBGEvents: @ 853B284 +SafariZone_Southwest_MapBGEvents: bg_event 32, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SafariZone_Southwest_EventScript_23D270 -SafariZone_Southwest_MapEvents:: @ 853B290 +SafariZone_Southwest_MapEvents:: map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 189fa09b87..f3cafdebb7 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -1,10 +1,10 @@ -SafariZone_Southwest: @ 8485174 +SafariZone_Southwest: .4byte SafariZone_Southwest_Layout .4byte SafariZone_Southwest_MapEvents .4byte SafariZone_Southwest_MapScripts .4byte SafariZone_Southwest_MapConnections .2byte MUS_SAFARI - .2byte 240 + .2byte LAYOUT_SAFARI_ZONE_SOUTHWEST .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc index 20a5fc145e..f43240a781 100644 --- a/data/maps/ScorchedSlab/events.inc +++ b/data/maps/ScorchedSlab/events.inc @@ -1,9 +1,9 @@ -ScorchedSlab_EventObjects: @ 8536F88 +ScorchedSlab_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, FLAG_ITEM_SCORCHED_SLAB_TM_11 -ScorchedSlab_MapWarps: @ 8536FA0 +ScorchedSlab_MapWarps: warp_def 7, 16, 1, 1, MAP_ROUTE120 -ScorchedSlab_MapEvents:: @ 8536FA8 +ScorchedSlab_MapEvents:: map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0 diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 84c09df3fa..ec09efb0fc 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -1,10 +1,10 @@ -ScorchedSlab: @ 84846BC +ScorchedSlab: .4byte ScorchedSlab_Layout .4byte ScorchedSlab_MapEvents .4byte ScorchedSlab_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 311 + .2byte LAYOUT_SCORCHED_SLAB .byte MAPSEC_SCORCHED_SLAB .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Entrance/events.inc b/data/maps/SeafloorCavern_Entrance/events.inc index b0574d14ec..ea20574178 100644 --- a/data/maps/SeafloorCavern_Entrance/events.inc +++ b/data/maps/SeafloorCavern_Entrance/events.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Entrance_EventObjects: @ 85356BC +SeafloorCavern_Entrance_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SeafloorCavern_Entrance_EventScript_234485, FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT -SeafloorCavern_Entrance_MapWarps: @ 85356D4 +SeafloorCavern_Entrance_MapWarps: warp_def 10, 18, 3, 0, MAP_UNDERWATER4 warp_def 10, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM1 -SeafloorCavern_Entrance_MapEvents:: @ 85356E4 +SeafloorCavern_Entrance_MapEvents:: map_events SeafloorCavern_Entrance_EventObjects, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index 8e62470ac1..b1b8ec30c9 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Entrance: @ 84841B4 +SeafloorCavern_Entrance: .4byte SeafloorCavern_Entrance_Layout .4byte SeafloorCavern_Entrance_MapEvents .4byte SeafloorCavern_Entrance_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 147 + .2byte LAYOUT_SEAFLOOR_CAVERN_ENTRANCE .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room1/events.inc b/data/maps/SeafloorCavern_Room1/events.inc index 2c507151b1..a5cb5ed3b1 100644 --- a/data/maps/SeafloorCavern_Room1/events.inc +++ b/data/maps/SeafloorCavern_Room1/events.inc @@ -1,15 +1,15 @@ -SeafloorCavern_Room1_EventObjects: @ 85356F8 +SeafloorCavern_Room1_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, FLAG_TEMP_11 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, FLAG_TEMP_12 object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, FLAG_TEMP_13 object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_234803, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS -SeafloorCavern_Room1_MapWarps: @ 8535770 +SeafloorCavern_Room1_MapWarps: warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE warp_def 17, 13, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM5 warp_def 6, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM2 -SeafloorCavern_Room1_MapEvents:: @ 8535788 +SeafloorCavern_Room1_MapEvents:: map_events SeafloorCavern_Room1_EventObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index 9b84e5d960..14ab5fbdeb 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room1: @ 84841D0 +SeafloorCavern_Room1: .4byte SeafloorCavern_Room1_Layout .4byte SeafloorCavern_Room1_MapEvents .4byte SeafloorCavern_Room1_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 148 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM1 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room2/events.inc b/data/maps/SeafloorCavern_Room2/events.inc index 1cc30957af..5e1af80276 100644 --- a/data/maps/SeafloorCavern_Room2/events.inc +++ b/data/maps/SeafloorCavern_Room2/events.inc @@ -1,4 +1,4 @@ -SeafloorCavern_Room2_EventObjects: @ 853579C +SeafloorCavern_Room2_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_12 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_13 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_11 @@ -8,12 +8,12 @@ SeafloorCavern_Room2_EventObjects: @ 853579C object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, FLAG_TEMP_19 object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_17 -SeafloorCavern_Room2_MapWarps: @ 853585C +SeafloorCavern_Room2_MapWarps: warp_def 10, 7, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 warp_def 4, 10, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM4 warp_def 6, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM6 warp_def 11, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM7 -SeafloorCavern_Room2_MapEvents:: @ 853587C +SeafloorCavern_Room2_MapEvents:: map_events SeafloorCavern_Room2_EventObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index b7d4e47d78..822c7f2b10 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room2: @ 84841EC +SeafloorCavern_Room2: .4byte SeafloorCavern_Room2_Layout .4byte SeafloorCavern_Room2_MapEvents .4byte SeafloorCavern_Room2_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 149 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM2 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room3/events.inc b/data/maps/SeafloorCavern_Room3/events.inc index e48782693e..168e9e96db 100644 --- a/data/maps/SeafloorCavern_Room3/events.inc +++ b/data/maps/SeafloorCavern_Room3/events.inc @@ -1,4 +1,4 @@ -SeafloorCavern_Room3_EventObjects: @ 8535890 +SeafloorCavern_Room3_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_12 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_14 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_15 @@ -9,11 +9,11 @@ SeafloorCavern_Room3_EventObjects: @ 8535890 object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, SeafloorCavern_Room3_EventScript_234938, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, SeafloorCavern_Room3_EventScript_23494F, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS -SeafloorCavern_Room3_MapWarps: @ 8535968 +SeafloorCavern_Room3_MapWarps: warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 warp_def 9, 13, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM7 warp_def 4, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM6 -SeafloorCavern_Room3_MapEvents:: @ 8535980 +SeafloorCavern_Room3_MapEvents:: map_events SeafloorCavern_Room3_EventObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index b5a032b603..f1cfa25681 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room3: @ 8484208 +SeafloorCavern_Room3: .4byte SeafloorCavern_Room3_Layout .4byte SeafloorCavern_Room3_MapEvents .4byte SeafloorCavern_Room3_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 150 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM3 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room4/events.inc b/data/maps/SeafloorCavern_Room4/events.inc index c4e96aee07..37f0c7b04c 100644 --- a/data/maps/SeafloorCavern_Room4/events.inc +++ b/data/maps/SeafloorCavern_Room4/events.inc @@ -1,13 +1,13 @@ -SeafloorCavern_Room4_EventObjects: @ 8535994 +SeafloorCavern_Room4_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS -SeafloorCavern_Room4_MapWarps: @ 85359C4 +SeafloorCavern_Room4_MapWarps: warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM5 warp_def 9, 10, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM5 warp_def 10, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE -SeafloorCavern_Room4_MapEvents:: @ 85359E4 +SeafloorCavern_Room4_MapEvents:: map_events SeafloorCavern_Room4_EventObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index 75b51c3436..22e6d27c75 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room4: @ 8484224 +SeafloorCavern_Room4: .4byte SeafloorCavern_Room4_Layout .4byte SeafloorCavern_Room4_MapEvents .4byte SeafloorCavern_Room4_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 151 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM4 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room5/events.inc b/data/maps/SeafloorCavern_Room5/events.inc index e4780db227..4f75732700 100644 --- a/data/maps/SeafloorCavern_Room5/events.inc +++ b/data/maps/SeafloorCavern_Room5/events.inc @@ -1,4 +1,4 @@ -SeafloorCavern_Room5_EventObjects: @ 85359F8 +SeafloorCavern_Room5_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_11 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_12 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_13 @@ -6,11 +6,11 @@ SeafloorCavern_Room5_EventObjects: @ 85359F8 object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, FLAG_TEMP_16 object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_14 -SeafloorCavern_Room5_MapWarps: @ 8535A88 +SeafloorCavern_Room5_MapWarps: warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1 warp_def 15, 12, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM4 warp_def 7, 17, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM4 -SeafloorCavern_Room5_MapEvents:: @ 8535AA0 +SeafloorCavern_Room5_MapEvents:: map_events SeafloorCavern_Room5_EventObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 6b053fc71c..42489c1dea 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room5: @ 8484240 +SeafloorCavern_Room5: .4byte SeafloorCavern_Room5_Layout .4byte SeafloorCavern_Room5_MapEvents .4byte SeafloorCavern_Room5_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 152 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM5 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room6/events.inc b/data/maps/SeafloorCavern_Room6/events.inc index 99c10d87eb..596daefe2f 100644 --- a/data/maps/SeafloorCavern_Room6/events.inc +++ b/data/maps/SeafloorCavern_Room6/events.inc @@ -1,8 +1,8 @@ -SeafloorCavern_Room6_MapWarps: @ 8535AB4 +SeafloorCavern_Room6_MapWarps: warp_def 11, 21, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM2 warp_def 4, 1, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM3 warp_def 14, 8, 1, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE -SeafloorCavern_Room6_MapEvents:: @ 8535ACC +SeafloorCavern_Room6_MapEvents:: map_events 0x0, SeafloorCavern_Room6_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index d1346acd86..f70a2d07e4 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room6: @ 848425C +SeafloorCavern_Room6: .4byte SeafloorCavern_Room6_Layout .4byte SeafloorCavern_Room6_MapEvents .4byte SeafloorCavern_Room6_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 153 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM6 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room7/events.inc b/data/maps/SeafloorCavern_Room7/events.inc index 2d8fca9995..fb3fcc1b6c 100644 --- a/data/maps/SeafloorCavern_Room7/events.inc +++ b/data/maps/SeafloorCavern_Room7/events.inc @@ -1,7 +1,7 @@ -SeafloorCavern_Room7_MapWarps: @ 8535AE0 +SeafloorCavern_Room7_MapWarps: warp_def 3, 23, 3, 3, MAP_SEAFLOOR_CAVERN_ROOM2 warp_def 5, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM3 -SeafloorCavern_Room7_MapEvents:: @ 8535AF0 +SeafloorCavern_Room7_MapEvents:: map_events 0x0, SeafloorCavern_Room7_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index b5b4aca03b..28433a0519 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room7: @ 8484278 +SeafloorCavern_Room7: .4byte SeafloorCavern_Room7_Layout .4byte SeafloorCavern_Room7_MapEvents .4byte SeafloorCavern_Room7_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 154 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM7 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room8/events.inc b/data/maps/SeafloorCavern_Room8/events.inc index c34ec76d31..673f303fe7 100644 --- a/data/maps/SeafloorCavern_Room8/events.inc +++ b/data/maps/SeafloorCavern_Room8/events.inc @@ -1,4 +1,4 @@ -SeafloorCavern_Room8_EventObjects: @ 8535B04 +SeafloorCavern_Room8_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_11 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_12 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_13 @@ -12,10 +12,10 @@ SeafloorCavern_Room8_EventObjects: @ 8535B04 object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1B object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1C -SeafloorCavern_Room8_MapWarps: @ 8535C24 +SeafloorCavern_Room8_MapWarps: warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 warp_def 5, 12, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM3 -SeafloorCavern_Room8_MapEvents:: @ 8535C34 +SeafloorCavern_Room8_MapEvents:: map_events SeafloorCavern_Room8_EventObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index 0ada4ab71a..bc6f7de4b6 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room8: @ 8484294 +SeafloorCavern_Room8: .4byte SeafloorCavern_Room8_Layout .4byte SeafloorCavern_Room8_MapEvents .4byte SeafloorCavern_Room8_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 155 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM8 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc index 6ca415e129..771f58b150 100644 --- a/data/maps/SeafloorCavern_Room9/events.inc +++ b/data/maps/SeafloorCavern_Room9/events.inc @@ -1,4 +1,4 @@ -SeafloorCavern_Room9_EventObjects: @ 8535C48 +SeafloorCavern_Room9_EventObjects: object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE @@ -7,12 +7,12 @@ SeafloorCavern_Room9_EventObjects: @ 8535C48 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_291401, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26 object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2 -SeafloorCavern_Room9_MapWarps: @ 8535CF0 +SeafloorCavern_Room9_MapWarps: warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 -SeafloorCavern_Room9_MapCoordEvents: @ 8535CF8 +SeafloorCavern_Room9_MapCoordEvents: coord_event 17, 42, 3, VAR_0x40A2, 0, SeafloorCavern_Room9_EventScript_234DC9 -SeafloorCavern_Room9_MapEvents:: @ 8535D08 +SeafloorCavern_Room9_MapEvents:: map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index 4d2be9474a..5748571be5 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room9: @ 84842B0 +SeafloorCavern_Room9: .4byte SeafloorCavern_Room9_Layout .4byte SeafloorCavern_Room9_MapEvents .4byte SeafloorCavern_Room9_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 156 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM9 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/SealedChamber_InnerRoom/events.inc b/data/maps/SealedChamber_InnerRoom/events.inc index ddd6c15ec9..96891324d0 100644 --- a/data/maps/SealedChamber_InnerRoom/events.inc +++ b/data/maps/SealedChamber_InnerRoom/events.inc @@ -1,7 +1,7 @@ -SealedChamber_InnerRoom_MapWarps: @ 8536F00 +SealedChamber_InnerRoom_MapWarps: warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM -SealedChamber_InnerRoom_MapBGEvents: @ 8536F08 +SealedChamber_InnerRoom_MapBGEvents: bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239255 bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_23925F @@ -12,6 +12,6 @@ SealedChamber_InnerRoom_MapBGEvents: @ 8536F08 bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 bg_event 11, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 -SealedChamber_InnerRoom_MapEvents:: @ 8536F74 +SealedChamber_InnerRoom_MapEvents:: map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index 5fa5dccc9c..6e2a2ff8b8 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -1,10 +1,10 @@ -SealedChamber_InnerRoom: @ 84846A0 +SealedChamber_InnerRoom: .4byte SealedChamber_InnerRoom_Layout .4byte SealedChamber_InnerRoom_MapEvents .4byte SealedChamber_InnerRoom_MapScripts .4byte 0x0 .2byte MUS_MABOROSI - .2byte 304 + .2byte LAYOUT_SEALED_CHAMBER_INNER_ROOM .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SealedChamber_OuterRoom/events.inc b/data/maps/SealedChamber_OuterRoom/events.inc index 3cd1b97143..530ff738c8 100644 --- a/data/maps/SealedChamber_OuterRoom/events.inc +++ b/data/maps/SealedChamber_OuterRoom/events.inc @@ -1,7 +1,7 @@ -SealedChamber_OuterRoom_MapWarps: @ 8536D88 +SealedChamber_OuterRoom_MapWarps: warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM -SealedChamber_OuterRoom_MapBGEvents: @ 8536D90 +SealedChamber_OuterRoom_MapBGEvents: bg_event 5, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176 bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180 @@ -32,6 +32,6 @@ SealedChamber_OuterRoom_MapBGEvents: @ 8536D90 bg_event 9, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391ED bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391ED -SealedChamber_OuterRoom_MapEvents:: @ 8536EEC +SealedChamber_OuterRoom_MapEvents:: map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index 3930e818dd..bdb40d153a 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -1,10 +1,10 @@ -SealedChamber_OuterRoom: @ 8484684 +SealedChamber_OuterRoom: .4byte SealedChamber_OuterRoom_Layout .4byte SealedChamber_OuterRoom_MapEvents .4byte SealedChamber_OuterRoom_MapScripts .4byte 0x0 .2byte MUS_MABOROSI - .2byte 284 + .2byte LAYOUT_SEALED_CHAMBER_OUTER_ROOM .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BlueCave1/events.inc b/data/maps/SecretBase_BlueCave1/events.inc index 95e52b889f..f0cfb017f7 100644 --- a/data/maps/SecretBase_BlueCave1/events.inc +++ b/data/maps/SecretBase_BlueCave1/events.inc @@ -1,4 +1,4 @@ -SecretBase_BlueCave1_EventObjects: @ 8537BEC +SecretBase_BlueCave1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BlueCave1_EventObjects: @ 8537BEC object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BlueCave1_MapWarps: @ 8537D54 +SecretBase_BlueCave1_MapWarps: warp_def 5, 7, 0, 126, MAP_NONE -SecretBase_BlueCave1_MapEvents:: @ 8537D5C +SecretBase_BlueCave1_MapEvents:: map_events SecretBase_BlueCave1_EventObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index 60eeeab322..5159eec532 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -1,10 +1,10 @@ -SecretBase_BlueCave1: @ 8484AC8 +SecretBase_BlueCave1: .4byte SecretBase_BlueCave1_Layout .4byte SecretBase_BlueCave1_MapEvents .4byte SecretBase_BlueCave1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 199 + .2byte LAYOUT_SECRET_BASE_BLUE_CAVE1 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BlueCave2/events.inc b/data/maps/SecretBase_BlueCave2/events.inc index 62c4b8dcda..9a2a82db6f 100644 --- a/data/maps/SecretBase_BlueCave2/events.inc +++ b/data/maps/SecretBase_BlueCave2/events.inc @@ -1,4 +1,4 @@ -SecretBase_BlueCave2_EventObjects: @ 8538504 +SecretBase_BlueCave2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BlueCave2_EventObjects: @ 8538504 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BlueCave2_MapWarps: @ 853866C +SecretBase_BlueCave2_MapWarps: warp_def 7, 5, 0, 126, MAP_NONE -SecretBase_BlueCave2_MapEvents:: @ 8538674 +SecretBase_BlueCave2_MapEvents:: map_events SecretBase_BlueCave2_EventObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index 348a5cd021..4d893835b5 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -1,10 +1,10 @@ -SecretBase_BlueCave2: @ 8484B70 +SecretBase_BlueCave2: .4byte SecretBase_BlueCave2_Layout .4byte SecretBase_BlueCave2_MapEvents .4byte SecretBase_BlueCave2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 205 + .2byte LAYOUT_SECRET_BASE_BLUE_CAVE2 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BlueCave3/events.inc b/data/maps/SecretBase_BlueCave3/events.inc index 14c7460adf..463c513e58 100644 --- a/data/maps/SecretBase_BlueCave3/events.inc +++ b/data/maps/SecretBase_BlueCave3/events.inc @@ -1,4 +1,4 @@ -SecretBase_BlueCave3_EventObjects: @ 8538E1C +SecretBase_BlueCave3_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BlueCave3_EventObjects: @ 8538E1C object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BlueCave3_MapWarps: @ 8538F84 +SecretBase_BlueCave3_MapWarps: warp_def 4, 15, 0, 126, MAP_NONE -SecretBase_BlueCave3_MapEvents:: @ 8538F8C +SecretBase_BlueCave3_MapEvents:: map_events SecretBase_BlueCave3_EventObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 26ab5ef93a..1e730552ed 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -1,10 +1,10 @@ -SecretBase_BlueCave3: @ 8484C18 +SecretBase_BlueCave3: .4byte SecretBase_BlueCave3_Layout .4byte SecretBase_BlueCave3_MapEvents .4byte SecretBase_BlueCave3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 211 + .2byte LAYOUT_SECRET_BASE_BLUE_CAVE3 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BlueCave4/events.inc b/data/maps/SecretBase_BlueCave4/events.inc index 1d047cd42f..fd121b5948 100644 --- a/data/maps/SecretBase_BlueCave4/events.inc +++ b/data/maps/SecretBase_BlueCave4/events.inc @@ -1,4 +1,4 @@ -SecretBase_BlueCave4_EventObjects: @ 8539734 +SecretBase_BlueCave4_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BlueCave4_EventObjects: @ 8539734 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BlueCave4_MapWarps: @ 853989C +SecretBase_BlueCave4_MapWarps: warp_def 4, 15, 0, 126, MAP_NONE -SecretBase_BlueCave4_MapEvents:: @ 85398A4 +SecretBase_BlueCave4_MapEvents:: map_events SecretBase_BlueCave4_EventObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 5e253d51e8..ff6cb64dc2 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -1,10 +1,10 @@ -SecretBase_BlueCave4: @ 8484CC0 +SecretBase_BlueCave4: .4byte SecretBase_BlueCave4_Layout .4byte SecretBase_BlueCave4_MapEvents .4byte SecretBase_BlueCave4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 217 + .2byte LAYOUT_SECRET_BASE_BLUE_CAVE4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BrownCave1/events.inc b/data/maps/SecretBase_BrownCave1/events.inc index 43d1445351..82e5232985 100644 --- a/data/maps/SecretBase_BrownCave1/events.inc +++ b/data/maps/SecretBase_BrownCave1/events.inc @@ -1,4 +1,4 @@ -SecretBase_BrownCave1_EventObjects: @ 8537A68 +SecretBase_BrownCave1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BrownCave1_EventObjects: @ 8537A68 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BrownCave1_MapWarps: @ 8537BD0 +SecretBase_BrownCave1_MapWarps: warp_def 5, 7, 0, 126, MAP_NONE -SecretBase_BrownCave1_MapEvents:: @ 8537BD8 +SecretBase_BrownCave1_MapEvents:: map_events SecretBase_BrownCave1_EventObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index ab531bf5cb..e20bdbce1f 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -1,10 +1,10 @@ -SecretBase_BrownCave1: @ 8484AAC +SecretBase_BrownCave1: .4byte SecretBase_BrownCave1_Layout .4byte SecretBase_BrownCave1_MapEvents .4byte SecretBase_BrownCave1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 198 + .2byte LAYOUT_SECRET_BASE_BROWN_CAVE1 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BrownCave2/events.inc b/data/maps/SecretBase_BrownCave2/events.inc index 09bb033277..86d18b5d9e 100644 --- a/data/maps/SecretBase_BrownCave2/events.inc +++ b/data/maps/SecretBase_BrownCave2/events.inc @@ -1,4 +1,4 @@ -SecretBase_BrownCave2_EventObjects: @ 8538380 +SecretBase_BrownCave2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BrownCave2_EventObjects: @ 8538380 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BrownCave2_MapWarps: @ 85384E8 +SecretBase_BrownCave2_MapWarps: warp_def 1, 7, 0, 126, MAP_NONE -SecretBase_BrownCave2_MapEvents:: @ 85384F0 +SecretBase_BrownCave2_MapEvents:: map_events SecretBase_BrownCave2_EventObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index 464bcd059a..93f2b59237 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -1,10 +1,10 @@ -SecretBase_BrownCave2: @ 8484B54 +SecretBase_BrownCave2: .4byte SecretBase_BrownCave2_Layout .4byte SecretBase_BrownCave2_MapEvents .4byte SecretBase_BrownCave2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 204 + .2byte LAYOUT_SECRET_BASE_BROWN_CAVE2 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BrownCave3/events.inc b/data/maps/SecretBase_BrownCave3/events.inc index 12ec865878..2ec6ed1b25 100644 --- a/data/maps/SecretBase_BrownCave3/events.inc +++ b/data/maps/SecretBase_BrownCave3/events.inc @@ -1,4 +1,4 @@ -SecretBase_BrownCave3_EventObjects: @ 8538C98 +SecretBase_BrownCave3_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BrownCave3_EventObjects: @ 8538C98 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BrownCave3_MapWarps: @ 8538E00 +SecretBase_BrownCave3_MapWarps: warp_def 11, 9, 0, 126, MAP_NONE -SecretBase_BrownCave3_MapEvents:: @ 8538E08 +SecretBase_BrownCave3_MapEvents:: map_events SecretBase_BrownCave3_EventObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 923b2c4be8..5c4fac1c0a 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -1,10 +1,10 @@ -SecretBase_BrownCave3: @ 8484BFC +SecretBase_BrownCave3: .4byte SecretBase_BrownCave3_Layout .4byte SecretBase_BrownCave3_MapEvents .4byte SecretBase_BrownCave3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 210 + .2byte LAYOUT_SECRET_BASE_BROWN_CAVE3 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BrownCave4/events.inc b/data/maps/SecretBase_BrownCave4/events.inc index 15fab00be7..58e71dc186 100644 --- a/data/maps/SecretBase_BrownCave4/events.inc +++ b/data/maps/SecretBase_BrownCave4/events.inc @@ -1,4 +1,4 @@ -SecretBase_BrownCave4_EventObjects: @ 85395B0 +SecretBase_BrownCave4_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BrownCave4_EventObjects: @ 85395B0 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BrownCave4_MapWarps: @ 8539718 +SecretBase_BrownCave4_MapWarps: warp_def 2, 8, 0, 126, MAP_NONE -SecretBase_BrownCave4_MapEvents:: @ 8539720 +SecretBase_BrownCave4_MapEvents:: map_events SecretBase_BrownCave4_EventObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index 6d61f06a72..b3123ee222 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -1,10 +1,10 @@ -SecretBase_BrownCave4: @ 8484CA4 +SecretBase_BrownCave4: .4byte SecretBase_BrownCave4_Layout .4byte SecretBase_BrownCave4_MapEvents .4byte SecretBase_BrownCave4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 216 + .2byte LAYOUT_SECRET_BASE_BROWN_CAVE4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_RedCave1/events.inc b/data/maps/SecretBase_RedCave1/events.inc index e0d7180681..015e2bde58 100644 --- a/data/maps/SecretBase_RedCave1/events.inc +++ b/data/maps/SecretBase_RedCave1/events.inc @@ -1,4 +1,4 @@ -SecretBase_RedCave1_EventObjects: @ 85378E4 +SecretBase_RedCave1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_RedCave1_EventObjects: @ 85378E4 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_RedCave1_MapWarps: @ 8537A4C +SecretBase_RedCave1_MapWarps: warp_def 5, 7, 0, 126, MAP_NONE -SecretBase_RedCave1_MapEvents:: @ 8537A54 +SecretBase_RedCave1_MapEvents:: map_events SecretBase_RedCave1_EventObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 82fc8c4e30..4ac30b1cb8 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -1,10 +1,10 @@ -SecretBase_RedCave1: @ 8484A90 +SecretBase_RedCave1: .4byte SecretBase_RedCave1_Layout .4byte SecretBase_RedCave1_MapEvents .4byte SecretBase_RedCave1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 197 + .2byte LAYOUT_SECRET_BASE_RED_CAVE1 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_RedCave2/events.inc b/data/maps/SecretBase_RedCave2/events.inc index 365e3f353d..70997288dc 100644 --- a/data/maps/SecretBase_RedCave2/events.inc +++ b/data/maps/SecretBase_RedCave2/events.inc @@ -1,4 +1,4 @@ -SecretBase_RedCave2_EventObjects: @ 85381FC +SecretBase_RedCave2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_RedCave2_EventObjects: @ 85381FC object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_RedCave2_MapWarps: @ 8538364 +SecretBase_RedCave2_MapWarps: warp_def 3, 14, 0, 126, MAP_NONE -SecretBase_RedCave2_MapEvents:: @ 853836C +SecretBase_RedCave2_MapEvents:: map_events SecretBase_RedCave2_EventObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index e4a2176d71..64ef711962 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -1,10 +1,10 @@ -SecretBase_RedCave2: @ 8484B38 +SecretBase_RedCave2: .4byte SecretBase_RedCave2_Layout .4byte SecretBase_RedCave2_MapEvents .4byte SecretBase_RedCave2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 203 + .2byte LAYOUT_SECRET_BASE_RED_CAVE2 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_RedCave3/events.inc b/data/maps/SecretBase_RedCave3/events.inc index 16e14d49fd..191aed927b 100644 --- a/data/maps/SecretBase_RedCave3/events.inc +++ b/data/maps/SecretBase_RedCave3/events.inc @@ -1,4 +1,4 @@ -SecretBase_RedCave3_EventObjects: @ 8538B14 +SecretBase_RedCave3_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 12, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_RedCave3_EventObjects: @ 8538B14 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_RedCave3_MapWarps: @ 8538C7C +SecretBase_RedCave3_MapWarps: warp_def 3, 6, 0, 126, MAP_NONE -SecretBase_RedCave3_MapEvents:: @ 8538C84 +SecretBase_RedCave3_MapEvents:: map_events SecretBase_RedCave3_EventObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index 9317921e20..880fa84e60 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -1,10 +1,10 @@ -SecretBase_RedCave3: @ 8484BE0 +SecretBase_RedCave3: .4byte SecretBase_RedCave3_Layout .4byte SecretBase_RedCave3_MapEvents .4byte SecretBase_RedCave3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 209 + .2byte LAYOUT_SECRET_BASE_RED_CAVE3 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_RedCave4/events.inc b/data/maps/SecretBase_RedCave4/events.inc index eaf2275067..9e29c6bcc0 100644 --- a/data/maps/SecretBase_RedCave4/events.inc +++ b/data/maps/SecretBase_RedCave4/events.inc @@ -1,4 +1,4 @@ -SecretBase_RedCave4_EventObjects: @ 853942C +SecretBase_RedCave4_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_RedCave4_EventObjects: @ 853942C object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_RedCave4_MapWarps: @ 8539594 +SecretBase_RedCave4_MapWarps: warp_def 2, 12, 0, 126, MAP_NONE -SecretBase_RedCave4_MapEvents:: @ 853959C +SecretBase_RedCave4_MapEvents:: map_events SecretBase_RedCave4_EventObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index 62fd094a45..7454f02511 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -1,10 +1,10 @@ -SecretBase_RedCave4: @ 8484C88 +SecretBase_RedCave4: .4byte SecretBase_RedCave4_Layout .4byte SecretBase_RedCave4_MapEvents .4byte SecretBase_RedCave4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 215 + .2byte LAYOUT_SECRET_BASE_RED_CAVE4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Shrub1/events.inc b/data/maps/SecretBase_Shrub1/events.inc index 07eb2e1bd0..89c8329692 100644 --- a/data/maps/SecretBase_Shrub1/events.inc +++ b/data/maps/SecretBase_Shrub1/events.inc @@ -1,4 +1,4 @@ -SecretBase_Shrub1_EventObjects: @ 8538078 +SecretBase_Shrub1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Shrub1_EventObjects: @ 8538078 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Shrub1_MapWarps: @ 85381E0 +SecretBase_Shrub1_MapWarps: warp_def 5, 7, 0, 126, MAP_NONE -SecretBase_Shrub1_MapEvents:: @ 85381E8 +SecretBase_Shrub1_MapEvents:: map_events SecretBase_Shrub1_EventObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index 4807cc4852..76bfd45069 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -1,10 +1,10 @@ -SecretBase_Shrub1: @ 8484B1C +SecretBase_Shrub1: .4byte SecretBase_Shrub1_Layout .4byte SecretBase_Shrub1_MapEvents .4byte SecretBase_Shrub1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 202 + .2byte LAYOUT_SECRET_BASE_SHRUB1 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Shrub2/events.inc b/data/maps/SecretBase_Shrub2/events.inc index 385500c5fd..6e1f4ee8c3 100644 --- a/data/maps/SecretBase_Shrub2/events.inc +++ b/data/maps/SecretBase_Shrub2/events.inc @@ -1,4 +1,4 @@ -SecretBase_Shrub2_EventObjects: @ 8538990 +SecretBase_Shrub2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Shrub2_EventObjects: @ 8538990 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Shrub2_MapWarps: @ 8538AF8 +SecretBase_Shrub2_MapWarps: warp_def 7, 5, 0, 126, MAP_NONE -SecretBase_Shrub2_MapEvents:: @ 8538B00 +SecretBase_Shrub2_MapEvents:: map_events SecretBase_Shrub2_EventObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 56df5fd2f2..53faf2d72d 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -1,10 +1,10 @@ -SecretBase_Shrub2: @ 8484BC4 +SecretBase_Shrub2: .4byte SecretBase_Shrub2_Layout .4byte SecretBase_Shrub2_MapEvents .4byte SecretBase_Shrub2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 208 + .2byte LAYOUT_SECRET_BASE_SHRUB2 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Shrub3/events.inc b/data/maps/SecretBase_Shrub3/events.inc index 8cc399fed5..38408df635 100644 --- a/data/maps/SecretBase_Shrub3/events.inc +++ b/data/maps/SecretBase_Shrub3/events.inc @@ -1,4 +1,4 @@ -SecretBase_Shrub3_EventObjects: @ 85392A8 +SecretBase_Shrub3_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Shrub3_EventObjects: @ 85392A8 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Shrub3_MapWarps: @ 8539410 +SecretBase_Shrub3_MapWarps: warp_def 6, 9, 0, 126, MAP_NONE -SecretBase_Shrub3_MapEvents:: @ 8539418 +SecretBase_Shrub3_MapEvents:: map_events SecretBase_Shrub3_EventObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index 3b5ade8f3b..4692a00608 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -1,10 +1,10 @@ -SecretBase_Shrub3: @ 8484C6C +SecretBase_Shrub3: .4byte SecretBase_Shrub3_Layout .4byte SecretBase_Shrub3_MapEvents .4byte SecretBase_Shrub3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 214 + .2byte LAYOUT_SECRET_BASE_SHRUB3 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc index 16dfd4ba12..1ebe8a0e82 100644 --- a/data/maps/SecretBase_Shrub4/events.inc +++ b/data/maps/SecretBase_Shrub4/events.inc @@ -1,4 +1,4 @@ -SecretBase_Shrub4_EventObjects: @ 8539BC0 +SecretBase_Shrub4_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Shrub4_EventObjects: @ 8539BC0 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Shrub4_MapWarps: @ 8539D28 +SecretBase_Shrub4_MapWarps: warp_def 11, 8, 0, 126, MAP_NONE -SecretBase_Shrub4_MapEvents:: @ 8539D30 +SecretBase_Shrub4_MapEvents:: map_events SecretBase_Shrub4_EventObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 816b963cb5..2b0186878a 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -1,10 +1,10 @@ -SecretBase_Shrub4: @ 8484D14 +SecretBase_Shrub4: .4byte SecretBase_Shrub4_Layout .4byte SecretBase_Shrub4_MapEvents .4byte SecretBase_Shrub4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 220 + .2byte LAYOUT_SECRET_BASE_SHRUB4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Tree1/events.inc b/data/maps/SecretBase_Tree1/events.inc index 8c7c05e6ea..6ed26cb27b 100644 --- a/data/maps/SecretBase_Tree1/events.inc +++ b/data/maps/SecretBase_Tree1/events.inc @@ -1,4 +1,4 @@ -SecretBase_Tree1_EventObjects: @ 8537EF4 +SecretBase_Tree1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Tree1_EventObjects: @ 8537EF4 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Tree1_MapWarps: @ 853805C +SecretBase_Tree1_MapWarps: warp_def 5, 7, 0, 126, MAP_NONE -SecretBase_Tree1_MapEvents:: @ 8538064 +SecretBase_Tree1_MapEvents:: map_events SecretBase_Tree1_EventObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index f1ed545a5a..8cace4cef6 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -1,10 +1,10 @@ -SecretBase_Tree1: @ 8484B00 +SecretBase_Tree1: .4byte SecretBase_Tree1_Layout .4byte SecretBase_Tree1_MapEvents .4byte SecretBase_Tree1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 201 + .2byte LAYOUT_SECRET_BASE_TREE1 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Tree2/events.inc b/data/maps/SecretBase_Tree2/events.inc index e6b5c627b6..46b268c372 100644 --- a/data/maps/SecretBase_Tree2/events.inc +++ b/data/maps/SecretBase_Tree2/events.inc @@ -1,4 +1,4 @@ -SecretBase_Tree2_EventObjects: @ 853880C +SecretBase_Tree2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Tree2_EventObjects: @ 853880C object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Tree2_MapWarps: @ 8538974 +SecretBase_Tree2_MapWarps: warp_def 3, 14, 0, 126, MAP_NONE -SecretBase_Tree2_MapEvents:: @ 853897C +SecretBase_Tree2_MapEvents:: map_events SecretBase_Tree2_EventObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index 2d8c2652cf..7f286a94f5 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -1,10 +1,10 @@ -SecretBase_Tree2: @ 8484BA8 +SecretBase_Tree2: .4byte SecretBase_Tree2_Layout .4byte SecretBase_Tree2_MapEvents .4byte SecretBase_Tree2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 207 + .2byte LAYOUT_SECRET_BASE_TREE2 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Tree3/events.inc b/data/maps/SecretBase_Tree3/events.inc index 921c4f1022..8512b4e317 100644 --- a/data/maps/SecretBase_Tree3/events.inc +++ b/data/maps/SecretBase_Tree3/events.inc @@ -1,4 +1,4 @@ -SecretBase_Tree3_EventObjects: @ 8539124 +SecretBase_Tree3_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Tree3_EventObjects: @ 8539124 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Tree3_MapWarps: @ 853928C +SecretBase_Tree3_MapWarps: warp_def 8, 6, 0, 126, MAP_NONE -SecretBase_Tree3_MapEvents:: @ 8539294 +SecretBase_Tree3_MapEvents:: map_events SecretBase_Tree3_EventObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index e4f703d211..6794908751 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -1,10 +1,10 @@ -SecretBase_Tree3: @ 8484C50 +SecretBase_Tree3: .4byte SecretBase_Tree3_Layout .4byte SecretBase_Tree3_MapEvents .4byte SecretBase_Tree3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 213 + .2byte LAYOUT_SECRET_BASE_TREE3 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Tree4/events.inc b/data/maps/SecretBase_Tree4/events.inc index ee2495e790..ed0f8b2360 100644 --- a/data/maps/SecretBase_Tree4/events.inc +++ b/data/maps/SecretBase_Tree4/events.inc @@ -1,4 +1,4 @@ -SecretBase_Tree4_EventObjects: @ 8539A3C +SecretBase_Tree4_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Tree4_EventObjects: @ 8539A3C object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Tree4_MapWarps: @ 8539BA4 +SecretBase_Tree4_MapWarps: warp_def 7, 12, 0, 126, MAP_NONE -SecretBase_Tree4_MapEvents:: @ 8539BAC +SecretBase_Tree4_MapEvents:: map_events SecretBase_Tree4_EventObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index 7cf8ef0249..ff2605f406 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -1,10 +1,10 @@ -SecretBase_Tree4: @ 8484CF8 +SecretBase_Tree4: .4byte SecretBase_Tree4_Layout .4byte SecretBase_Tree4_MapEvents .4byte SecretBase_Tree4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 219 + .2byte LAYOUT_SECRET_BASE_TREE4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_YellowCave1/events.inc b/data/maps/SecretBase_YellowCave1/events.inc index 6beae3454e..6464c48543 100644 --- a/data/maps/SecretBase_YellowCave1/events.inc +++ b/data/maps/SecretBase_YellowCave1/events.inc @@ -1,4 +1,4 @@ -SecretBase_YellowCave1_EventObjects: @ 8537D70 +SecretBase_YellowCave1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_YellowCave1_EventObjects: @ 8537D70 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_YellowCave1_MapWarps: @ 8537ED8 +SecretBase_YellowCave1_MapWarps: warp_def 5, 7, 0, 126, MAP_NONE -SecretBase_YellowCave1_MapEvents:: @ 8537EE0 +SecretBase_YellowCave1_MapEvents:: map_events SecretBase_YellowCave1_EventObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index 9bc1b071eb..642db55f51 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -1,10 +1,10 @@ -SecretBase_YellowCave1: @ 8484AE4 +SecretBase_YellowCave1: .4byte SecretBase_YellowCave1_Layout .4byte SecretBase_YellowCave1_MapEvents .4byte SecretBase_YellowCave1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 200 + .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE1 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_YellowCave2/events.inc b/data/maps/SecretBase_YellowCave2/events.inc index 9378718c4a..99bcee17dc 100644 --- a/data/maps/SecretBase_YellowCave2/events.inc +++ b/data/maps/SecretBase_YellowCave2/events.inc @@ -1,4 +1,4 @@ -SecretBase_YellowCave2_EventObjects: @ 8538688 +SecretBase_YellowCave2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_YellowCave2_EventObjects: @ 8538688 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_YellowCave2_MapWarps: @ 85387F0 +SecretBase_YellowCave2_MapWarps: warp_def 12, 7, 0, 126, MAP_NONE -SecretBase_YellowCave2_MapEvents:: @ 85387F8 +SecretBase_YellowCave2_MapEvents:: map_events SecretBase_YellowCave2_EventObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index 60c0f49f0f..ae0cd73bc4 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -1,10 +1,10 @@ -SecretBase_YellowCave2: @ 8484B8C +SecretBase_YellowCave2: .4byte SecretBase_YellowCave2_Layout .4byte SecretBase_YellowCave2_MapEvents .4byte SecretBase_YellowCave2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 206 + .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE2 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_YellowCave3/events.inc b/data/maps/SecretBase_YellowCave3/events.inc index 3a60b042b5..10bbfac8da 100644 --- a/data/maps/SecretBase_YellowCave3/events.inc +++ b/data/maps/SecretBase_YellowCave3/events.inc @@ -1,4 +1,4 @@ -SecretBase_YellowCave3_EventObjects: @ 8538FA0 +SecretBase_YellowCave3_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_YellowCave3_EventObjects: @ 8538FA0 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_YellowCave3_MapWarps: @ 8539108 +SecretBase_YellowCave3_MapWarps: warp_def 5, 9, 0, 126, MAP_NONE -SecretBase_YellowCave3_MapEvents:: @ 8539110 +SecretBase_YellowCave3_MapEvents:: map_events SecretBase_YellowCave3_EventObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index b82555cf42..39008b2b30 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -1,10 +1,10 @@ -SecretBase_YellowCave3: @ 8484C34 +SecretBase_YellowCave3: .4byte SecretBase_YellowCave3_Layout .4byte SecretBase_YellowCave3_MapEvents .4byte SecretBase_YellowCave3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 212 + .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE3 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_YellowCave4/events.inc b/data/maps/SecretBase_YellowCave4/events.inc index 13757dbef6..9afc932970 100644 --- a/data/maps/SecretBase_YellowCave4/events.inc +++ b/data/maps/SecretBase_YellowCave4/events.inc @@ -1,4 +1,4 @@ -SecretBase_YellowCave4_EventObjects: @ 85398B8 +SecretBase_YellowCave4_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_YellowCave4_EventObjects: @ 85398B8 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_YellowCave4_MapWarps: @ 8539A20 +SecretBase_YellowCave4_MapWarps: warp_def 6, 12, 0, 126, MAP_NONE -SecretBase_YellowCave4_MapEvents:: @ 8539A28 +SecretBase_YellowCave4_MapEvents:: map_events SecretBase_YellowCave4_EventObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index d7056f380c..24e10379b9 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -1,10 +1,10 @@ -SecretBase_YellowCave4: @ 8484CDC +SecretBase_YellowCave4: .4byte SecretBase_YellowCave4_Layout .4byte SecretBase_YellowCave4_MapEvents .4byte SecretBase_YellowCave4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 218 + .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/events.inc b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc index e04abe6938..8fa935974c 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/events.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc @@ -1,3 +1,3 @@ -ShoalCave_HighTideEntranceRoom_MapEvents:: @ 853644C +ShoalCave_HighTideEntranceRoom_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index c4d7d39e9f..12d853e7a9 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_HighTideEntranceRoom: @ 8484438 +ShoalCave_HighTideEntranceRoom: .4byte ShoalCave_HighTideEntranceRoom_Layout .4byte ShoalCave_HighTideEntranceRoom_MapEvents .4byte ShoalCave_HighTideEntranceRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 168 + .2byte LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_HighTideInnerRoom/events.inc b/data/maps/ShoalCave_HighTideInnerRoom/events.inc index 20d59a56f9..96d1e9d5e1 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/events.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/events.inc @@ -1,3 +1,3 @@ -ShoalCave_HighTideInnerRoom_MapEvents:: @ 8536460 +ShoalCave_HighTideInnerRoom_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index f9983a781e..cdee5935a6 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_HighTideInnerRoom: @ 8484454 +ShoalCave_HighTideInnerRoom: .4byte ShoalCave_HighTideInnerRoom_Layout .4byte ShoalCave_HighTideInnerRoom_MapEvents .4byte ShoalCave_HighTideInnerRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 169 + .2byte LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc index 899ad3eb84..39b462ba8b 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc @@ -1,13 +1,13 @@ -ShoalCave_LowTideEntranceRoom_EventObjects: @ 853627C +ShoalCave_LowTideEntranceRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 18, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0 -ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC +ShoalCave_LowTideEntranceRoom_MapWarps: warp_def 20, 30, 3, 0, MAP_ROUTE125 warp_def 19, 5, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM warp_def 6, 2, 3, 6, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM warp_def 27, 2, 3, 7, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM -ShoalCave_LowTideEntranceRoom_MapEvents:: @ 85362CC +ShoalCave_LowTideEntranceRoom_MapEvents:: map_events ShoalCave_LowTideEntranceRoom_EventObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index 656df81888..cf1600b531 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideEntranceRoom: @ 84843C8 +ShoalCave_LowTideEntranceRoom: .4byte ShoalCave_LowTideEntranceRoom_Layout .4byte ShoalCave_LowTideEntranceRoom_MapEvents .4byte ShoalCave_LowTideEntranceRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 164 + .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_LowTideIceRoom/events.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc index 99ab134751..57c4f580be 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/events.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/events.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideIceRoom_EventObjects: @ 8537100 +ShoalCave_LowTideIceRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE -ShoalCave_LowTideIceRoom_MapWarps: @ 8537130 +ShoalCave_LowTideIceRoom_MapWarps: warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM -ShoalCave_LowTideIceRoom_MapEvents:: @ 8537138 +ShoalCave_LowTideIceRoom_MapEvents:: map_events ShoalCave_LowTideIceRoom_EventObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index 58669c0c6a..a05edf096a 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideIceRoom: @ 84847D4 +ShoalCave_LowTideIceRoom: .4byte ShoalCave_LowTideIceRoom_Layout .4byte ShoalCave_LowTideIceRoom_MapEvents .4byte ShoalCave_LowTideIceRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 328 + .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc index 4f446148ea..8a4d0b7a98 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc @@ -1,7 +1,7 @@ -ShoalCave_LowTideInnerRoom_EventObjects: @ 85362E0 +ShoalCave_LowTideInnerRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY -ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8 +ShoalCave_LowTideInnerRoom_MapWarps: warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM warp_def 38, 15, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM warp_def 42, 4, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM @@ -11,7 +11,7 @@ ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8 warp_def 14, 33, 5, 2, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM warp_def 40, 33, 5, 3, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM -ShoalCave_LowTideInnerRoom_MapBGEvents: @ 8536338 +ShoalCave_LowTideInnerRoom_MapBGEvents: bg_event 31, 8, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_23708C bg_event 14, 26, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_2370C8 bg_event 41, 20, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_236FBA @@ -19,6 +19,6 @@ ShoalCave_LowTideInnerRoom_MapBGEvents: @ 8536338 bg_event 6, 9, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_237028 bg_event 16, 13, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_23705A -ShoalCave_LowTideInnerRoom_MapEvents:: @ 8536380 +ShoalCave_LowTideInnerRoom_MapEvents:: map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index 7f21d0a22d..431d599858 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideInnerRoom: @ 84843E4 +ShoalCave_LowTideInnerRoom: .4byte ShoalCave_LowTideInnerRoom_Layout .4byte ShoalCave_LowTideInnerRoom_MapEvents .4byte ShoalCave_LowTideInnerRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 165 + .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc index b487edcd7d..226f351e4c 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc @@ -1,16 +1,16 @@ -ShoalCave_LowTideLowerRoom_EventObjects: @ 85363DC +ShoalCave_LowTideLowerRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, FLAG_TEMP_11 object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0 -ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C +ShoalCave_LowTideLowerRoom_MapWarps: warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM warp_def 2, 6, 3, 4, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM warp_def 19, 11, 3, 5, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM warp_def 28, 11, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM -ShoalCave_LowTideLowerRoom_MapBGEvents: @ 853642C +ShoalCave_LowTideLowerRoom_MapBGEvents: bg_event 18, 2, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideLowerRoom_EventScript_237176 -ShoalCave_LowTideLowerRoom_MapEvents:: @ 8536438 +ShoalCave_LowTideLowerRoom_MapEvents:: map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 21ea185eaa..490825d06d 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideLowerRoom: @ 848441C +ShoalCave_LowTideLowerRoom: .4byte ShoalCave_LowTideLowerRoom_Layout .4byte ShoalCave_LowTideLowerRoom_MapEvents .4byte ShoalCave_LowTideLowerRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 167 + .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc index 6dbf50eb54..640d153f7a 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/events.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc @@ -1,13 +1,13 @@ -ShoalCave_LowTideStairsRoom_EventObjects: @ 8536394 +ShoalCave_LowTideStairsRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL -ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC +ShoalCave_LowTideStairsRoom_MapWarps: warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM warp_def 7, 4, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM -ShoalCave_LowTideStairsRoom_MapBGEvents: @ 85363BC +ShoalCave_LowTideStairsRoom_MapBGEvents: bg_event 11, 11, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideStairsRoom_EventScript_23711A -ShoalCave_LowTideStairsRoom_MapEvents:: @ 85363C8 +ShoalCave_LowTideStairsRoom_MapEvents:: map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index 7d7089f854..3454cf1f64 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideStairsRoom: @ 8484400 +ShoalCave_LowTideStairsRoom: .4byte ShoalCave_LowTideStairsRoom_Layout .4byte ShoalCave_LowTideStairsRoom_MapEvents .4byte ShoalCave_LowTideStairsRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 166 + .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc index b43b505bd5..cc422090e9 100644 --- a/data/maps/SingleBattleColosseum/events.inc +++ b/data/maps/SingleBattleColosseum/events.inc @@ -1,14 +1,14 @@ -SingleBattleColosseum_EventObjects: @ 8539D44 +SingleBattleColosseum_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0 -SingleBattleColosseum_MapWarps: @ 8539D5C +SingleBattleColosseum_MapWarps: warp_def 6, 8, 3, 127, MAP_NONE warp_def 7, 8, 3, 127, MAP_NONE -SingleBattleColosseum_MapCoordEvents: @ 8539D6C +SingleBattleColosseum_MapCoordEvents: coord_event 3, 5, 3, VAR_TEMP_0, 0, gUnknown_08277374 coord_event 10, 5, 3, VAR_TEMP_0, 0, gUnknown_0827737E -SingleBattleColosseum_MapEvents:: @ 8539D8C +SingleBattleColosseum_MapEvents:: map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index ac5f23b1e1..9bf35edca8 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -1,10 +1,10 @@ -SingleBattleColosseum: @ 8484D30 +SingleBattleColosseum: .4byte SingleBattleColosseum_Layout .4byte SingleBattleColosseum_MapEvents .4byte SingleBattleColosseum_MapScripts .4byte 0x0 .2byte MUS_RAINBOW - .2byte 221 + .2byte LAYOUT_SINGLE_BATTLE_COLOSSEUM .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_1F/events.inc b/data/maps/SkyPillar_1F/events.inc index 59ac1aac0d..eb6f98b7d0 100644 --- a/data/maps/SkyPillar_1F/events.inc +++ b/data/maps/SkyPillar_1F/events.inc @@ -1,8 +1,8 @@ -SkyPillar_1F_MapWarps: @ 8537058 +SkyPillar_1F_MapWarps: warp_def 6, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE warp_def 7, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_2F -SkyPillar_1F_MapEvents:: @ 8537070 +SkyPillar_1F_MapEvents:: map_events 0x0, SkyPillar_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index 9f76317d8d..83082ecc05 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -1,10 +1,10 @@ -SkyPillar_1F: @ 8484764 +SkyPillar_1F: .4byte SkyPillar_1F_Layout .4byte SkyPillar_1F_MapEvents .4byte SkyPillar_1F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 322 + .2byte LAYOUT_SKY_PILLAR_1F .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_2F/events.inc b/data/maps/SkyPillar_2F/events.inc index 780db9cccd..3b4b279152 100644 --- a/data/maps/SkyPillar_2F/events.inc +++ b/data/maps/SkyPillar_2F/events.inc @@ -1,7 +1,7 @@ -SkyPillar_2F_MapWarps: @ 8537084 +SkyPillar_2F_MapWarps: warp_def 10, 1, 3, 2, MAP_SKY_PILLAR_1F warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_3F -SkyPillar_2F_MapEvents:: @ 8537094 +SkyPillar_2F_MapEvents:: map_events 0x0, SkyPillar_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index 8335107025..46141edca1 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -1,10 +1,10 @@ -SkyPillar_2F: @ 8484780 +SkyPillar_2F: .4byte SkyPillar_2F_Layout .4byte SkyPillar_2F_MapEvents .4byte SkyPillar_2F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 323 + .2byte LAYOUT_SKY_PILLAR_2F .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_3F/events.inc b/data/maps/SkyPillar_3F/events.inc index 2e7697395a..8e3f498dc8 100644 --- a/data/maps/SkyPillar_3F/events.inc +++ b/data/maps/SkyPillar_3F/events.inc @@ -1,8 +1,8 @@ -SkyPillar_3F_MapWarps: @ 85370A8 +SkyPillar_3F_MapWarps: warp_def 3, 1, 3, 1, MAP_SKY_PILLAR_2F warp_def 11, 1, 3, 0, MAP_SKY_PILLAR_4F warp_def 7, 1, 3, 1, MAP_SKY_PILLAR_4F -SkyPillar_3F_MapEvents:: @ 85370C0 +SkyPillar_3F_MapEvents:: map_events 0x0, SkyPillar_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index 5381079f63..9b4ab53f02 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -1,10 +1,10 @@ -SkyPillar_3F: @ 848479C +SkyPillar_3F: .4byte SkyPillar_3F_Layout .4byte SkyPillar_3F_MapEvents .4byte SkyPillar_3F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 324 + .2byte LAYOUT_SKY_PILLAR_3F .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_4F/events.inc b/data/maps/SkyPillar_4F/events.inc index 248e36f958..ce0cdd2e37 100644 --- a/data/maps/SkyPillar_4F/events.inc +++ b/data/maps/SkyPillar_4F/events.inc @@ -1,8 +1,8 @@ -SkyPillar_4F_MapWarps: @ 85370D4 +SkyPillar_4F_MapWarps: warp_def 11, 1, 3, 1, MAP_SKY_PILLAR_3F warp_def 7, 1, 3, 2, MAP_SKY_PILLAR_3F warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_5F -SkyPillar_4F_MapEvents:: @ 85370EC +SkyPillar_4F_MapEvents:: map_events 0x0, SkyPillar_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index ff91215e06..be6e9e66ad 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -1,10 +1,10 @@ -SkyPillar_4F: @ 84847B8 +SkyPillar_4F: .4byte SkyPillar_4F_Layout .4byte SkyPillar_4F_MapEvents .4byte SkyPillar_4F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 325 + .2byte LAYOUT_SKY_PILLAR_4F .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_5F/events.inc b/data/maps/SkyPillar_5F/events.inc index c0acb14c08..b3ad7b0f79 100644 --- a/data/maps/SkyPillar_5F/events.inc +++ b/data/maps/SkyPillar_5F/events.inc @@ -1,7 +1,7 @@ -SkyPillar_5F_MapWarps: @ 853714C +SkyPillar_5F_MapWarps: warp_def 3, 1, 3, 2, MAP_SKY_PILLAR_4F warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_TOP -SkyPillar_5F_MapEvents:: @ 853715C +SkyPillar_5F_MapEvents:: map_events 0x0, SkyPillar_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index 06618c7667..8fa59173bb 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -1,10 +1,10 @@ -SkyPillar_5F: @ 84847F0 +SkyPillar_5F: .4byte SkyPillar_5F_Layout .4byte SkyPillar_5F_MapEvents .4byte SkyPillar_5F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 330 + .2byte LAYOUT_SKY_PILLAR_5F .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_Entrance/events.inc b/data/maps/SkyPillar_Entrance/events.inc index 92cf0da9bf..ca0647e3ff 100644 --- a/data/maps/SkyPillar_Entrance/events.inc +++ b/data/maps/SkyPillar_Entrance/events.inc @@ -1,7 +1,7 @@ -SkyPillar_Entrance_MapWarps: @ 8536FF8 +SkyPillar_Entrance_MapWarps: warp_def 6, 16, 3, 0, MAP_ROUTE131 warp_def 14, 4, 3, 0, MAP_SKY_PILLAR_OUTSIDE -SkyPillar_Entrance_MapEvents:: @ 8537008 +SkyPillar_Entrance_MapEvents:: map_events 0x0, SkyPillar_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 434b1f85a1..5326495a63 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -1,10 +1,10 @@ -SkyPillar_Entrance: @ 848472C +SkyPillar_Entrance: .4byte SkyPillar_Entrance_Layout .4byte SkyPillar_Entrance_MapEvents .4byte SkyPillar_Entrance_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 320 + .2byte LAYOUT_SKY_PILLAR_ENTRANCE .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_Outside/events.inc b/data/maps/SkyPillar_Outside/events.inc index 9519d12482..90de89d64a 100644 --- a/data/maps/SkyPillar_Outside/events.inc +++ b/data/maps/SkyPillar_Outside/events.inc @@ -1,10 +1,10 @@ -SkyPillar_Outside_EventObjects: @ 853701C +SkyPillar_Outside_EventObjects: object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Outside_EventScript_2393F8, FLAG_HIDE_SKY_PILLAR_WALLACE -SkyPillar_Outside_MapWarps: @ 8537034 +SkyPillar_Outside_MapWarps: warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE warp_def 14, 5, 0, 0, MAP_SKY_PILLAR_1F -SkyPillar_Outside_MapEvents:: @ 8537044 +SkyPillar_Outside_MapEvents:: map_events SkyPillar_Outside_EventObjects, SkyPillar_Outside_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 3ca072c808..3b60eaef2c 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -1,10 +1,10 @@ -SkyPillar_Outside: @ 8484748 +SkyPillar_Outside: .4byte SkyPillar_Outside_Layout .4byte SkyPillar_Outside_MapEvents .4byte SkyPillar_Outside_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 321 + .2byte LAYOUT_SKY_PILLAR_OUTSIDE .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc index a47e5e77f6..23edf5bb26 100644 --- a/data/maps/SkyPillar_Top/events.inc +++ b/data/maps/SkyPillar_Top/events.inc @@ -1,13 +1,13 @@ -SkyPillar_Top_EventObjects: @ 8537170 +SkyPillar_Top_EventObjects: object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2 object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Top_EventScript_239722, FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT -SkyPillar_Top_MapWarps: @ 85371A0 +SkyPillar_Top_MapWarps: warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F -SkyPillar_Top_MapCoordEvents: @ 85371A8 +SkyPillar_Top_MapCoordEvents: coord_event 14, 9, 3, VAR_0x40D7, 0, SkyPillar_Top_EventScript_23979A -SkyPillar_Top_MapEvents:: @ 85371B8 +SkyPillar_Top_MapEvents:: map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0 diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 07dbd38bb4..a4ab735e05 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -1,10 +1,10 @@ -SkyPillar_Top: @ 848480C +SkyPillar_Top: .4byte SkyPillar_Top_Layout .4byte SkyPillar_Top_MapEvents .4byte SkyPillar_Top_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 331 + .2byte LAYOUT_SKY_PILLAR_TOP .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity/connections.inc b/data/maps/SlateportCity/connections.inc index 1485b313b6..09e0b790aa 100644 --- a/data/maps/SlateportCity/connections.inc +++ b/data/maps/SlateportCity/connections.inc @@ -1,9 +1,9 @@ -SlateportCity_MapConnectionsList: @ 84866F4 +SlateportCity_MapConnectionsList: connection up, 0, MAP_ROUTE110 connection down, 0, MAP_ROUTE109 connection right, 0, MAP_ROUTE134 -SlateportCity_MapConnections: @ 8486718 - .4byte 0x3 +SlateportCity_MapConnections: + .4byte 3 .4byte SlateportCity_MapConnectionsList diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc index 2987c2020e..ce576927c9 100644 --- a/data/maps/SlateportCity/events.inc +++ b/data/maps/SlateportCity/events.inc @@ -1,4 +1,4 @@ -SlateportCity_EventObjects: @ 85261CC +SlateportCity_EventObjects: object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCED9, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 34, 29, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0 object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 5, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_EventScript_1DCEB8, 0 @@ -35,7 +35,7 @@ SlateportCity_EventObjects: @ 85261CC object_event 34, EVENT_OBJ_GFX_POKEFAN_F, 0, 11, 37, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 2, 0, 0, SlateportCity_EventScript_1DD36E, 0 object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 2, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_SCOTT -SlateportCity_MapWarps: @ 8526514 +SlateportCity_MapWarps: warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F warp_def 13, 26, 0, 0, MAP_SLATEPORT_CITY_MART warp_def 26, 38, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F @@ -48,10 +48,10 @@ SlateportCity_MapWarps: @ 8526514 warp_def 40, 7, 0, 2, MAP_SLATEPORT_CITY_HARBOR warp_def 21, 44, 0, 0, MAP_SLATEPORT_CITY_HOUSE2 -SlateportCity_MapCoordEvents: @ 852656C +SlateportCity_MapCoordEvents: coord_event 10, 13, 3, VAR_0x40D2, 2, SlateportCity_EventScript_1DD5DC -SlateportCity_MapBGEvents: @ 852657C +SlateportCity_MapBGEvents: bg_event 8, 19, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCFB2 bg_event 20, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E73 bg_event 21, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E73 @@ -66,6 +66,6 @@ SlateportCity_MapBGEvents: @ 852657C bg_event 23, 38, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF3F bg_event 10, 36, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1DD643 -SlateportCity_MapEvents:: @ 8526618 +SlateportCity_MapEvents:: map_events SlateportCity_EventObjects, SlateportCity_MapWarps, SlateportCity_MapCoordEvents, SlateportCity_MapBGEvents diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index b8454f6560..3a6e145342 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -1,10 +1,10 @@ -SlateportCity: @ 84824D4 +SlateportCity: .4byte SlateportCity_Layout .4byte SlateportCity_MapEvents .4byte SlateportCity_MapScripts .4byte SlateportCity_MapConnections .2byte MUS_FINECITY - .2byte 2 + .2byte LAYOUT_SLATEPORT_CITY .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc index 71e8d6d3a2..2dae031383 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc @@ -1,8 +1,8 @@ -SlateportCity_BattleTentBattleRoom_EventObjects: @ 852F4DC +SlateportCity_BattleTentBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -SlateportCity_BattleTentBattleRoom_MapEvents:: @ 852F524 +SlateportCity_BattleTentBattleRoom_MapEvents:: map_events SlateportCity_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc index e9044f1e9c..ff2970197c 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc @@ -1,10 +1,10 @@ -SlateportCity_BattleTentBattleRoom: @ 848314C +SlateportCity_BattleTentBattleRoom: .4byte BattleTentBattleRoom_Layout .4byte SlateportCity_BattleTentBattleRoom_MapEvents .4byte SlateportCity_BattleTentBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 386 + .2byte LAYOUT_BATTLE_TENT_BATTLE_ROOM .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_BattleTentCorridor/events.inc b/data/maps/SlateportCity_BattleTentCorridor/events.inc index 4fe072b505..f165ab2fa1 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/events.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/events.inc @@ -1,6 +1,6 @@ -SlateportCity_BattleTentCorridor_EventObjects: @ 852F4B0 +SlateportCity_BattleTentCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -SlateportCity_BattleTentCorridor_MapEvents:: @ 852F4C8 +SlateportCity_BattleTentCorridor_MapEvents:: map_events SlateportCity_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc index 0a273edef0..d1e0a8911b 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/header.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc @@ -1,10 +1,10 @@ -SlateportCity_BattleTentCorridor: @ 8483130 +SlateportCity_BattleTentCorridor: .4byte BattleTentCorridor_Layout .4byte SlateportCity_BattleTentCorridor_MapEvents .4byte SlateportCity_BattleTentCorridor_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 385 + .2byte LAYOUT_BATTLE_TENT_CORRIDOR .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_BattleTentLobby/events.inc b/data/maps/SlateportCity_BattleTentLobby/events.inc index 3eadecd272..81a3499ec4 100644 --- a/data/maps/SlateportCity_BattleTentLobby/events.inc +++ b/data/maps/SlateportCity_BattleTentLobby/events.inc @@ -1,17 +1,17 @@ -SlateportCity_BattleTentLobby_EventObjects: @ 852F408 +SlateportCity_BattleTentLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0 object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 1, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0 -SlateportCity_BattleTentLobby_MapWarps: @ 852F480 +SlateportCity_BattleTentLobby_MapWarps: warp_def 6, 9, 0, 3, MAP_SLATEPORT_CITY warp_def 7, 9, 0, 3, MAP_SLATEPORT_CITY -SlateportCity_BattleTentLobby_MapBGEvents: @ 852F490 +SlateportCity_BattleTentLobby_MapBGEvents: bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_BattleTentLobby_EventScript_208A99 -SlateportCity_BattleTentLobby_MapEvents:: @ 852F49C +SlateportCity_BattleTentLobby_MapEvents:: map_events SlateportCity_BattleTentLobby_EventObjects, SlateportCity_BattleTentLobby_MapWarps, 0x0, SlateportCity_BattleTentLobby_MapBGEvents diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc index 6bbbbf45fb..8b9df581e8 100644 --- a/data/maps/SlateportCity_BattleTentLobby/header.inc +++ b/data/maps/SlateportCity_BattleTentLobby/header.inc @@ -1,10 +1,10 @@ -SlateportCity_BattleTentLobby: @ 8483114 +SlateportCity_BattleTentLobby: .4byte BattleTentLobby_Layout .4byte SlateportCity_BattleTentLobby_MapEvents .4byte SlateportCity_BattleTentLobby_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 384 + .2byte LAYOUT_BATTLE_TENT_LOBBY .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc index e0781c2cb7..7984e29925 100644 --- a/data/maps/SlateportCity_Harbor/events.inc +++ b/data/maps/SlateportCity_Harbor/events.inc @@ -1,4 +1,4 @@ -SlateportCity_Harbor_EventObjects: @ 852FA68 +SlateportCity_Harbor_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS @@ -8,18 +8,18 @@ SlateportCity_Harbor_EventObjects: @ 852FA68 object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW -SlateportCity_Harbor_MapWarps: @ 852FB28 +SlateportCity_Harbor_MapWarps: warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY warp_def 12, 14, 0, 8, MAP_SLATEPORT_CITY warp_def 19, 15, 0, 9, MAP_SLATEPORT_CITY warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY -SlateportCity_Harbor_MapCoordEvents: @ 852FB48 +SlateportCity_Harbor_MapCoordEvents: coord_event 8, 11, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9BB coord_event 8, 12, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9C7 coord_event 8, 13, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9D3 coord_event 8, 14, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9DF -SlateportCity_Harbor_MapEvents:: @ 852FB88 +SlateportCity_Harbor_MapEvents:: map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index 922f84f1a7..24b39a88fb 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -1,10 +1,10 @@ -SlateportCity_Harbor: @ 84831D8 +SlateportCity_Harbor: .4byte Harbor_Layout .4byte SlateportCity_Harbor_MapEvents .4byte SlateportCity_Harbor_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 88 + .2byte LAYOUT_HARBOR .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_House1/events.inc b/data/maps/SlateportCity_House1/events.inc index 9917c0a246..a5fcfba7e8 100644 --- a/data/maps/SlateportCity_House1/events.inc +++ b/data/maps/SlateportCity_House1/events.inc @@ -1,10 +1,10 @@ -SlateportCity_House1_EventObjects: @ 852F538 +SlateportCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0 -SlateportCity_House1_MapWarps: @ 852F550 +SlateportCity_House1_MapWarps: warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY warp_def 4, 7, 0, 6, MAP_SLATEPORT_CITY -SlateportCity_House1_MapEvents:: @ 852F560 +SlateportCity_House1_MapEvents:: map_events SlateportCity_House1_EventObjects, SlateportCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 1e48dfb549..2673a37168 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -1,10 +1,10 @@ -SlateportCity_House1: @ 8483168 +SlateportCity_House1: .4byte HouseWithBed_Layout .4byte SlateportCity_House1_MapEvents .4byte SlateportCity_House1_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 80 + .2byte LAYOUT_HOUSE_WITH_BED .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_House2/events.inc b/data/maps/SlateportCity_House2/events.inc index 2dfffdaec3..eba48e548d 100644 --- a/data/maps/SlateportCity_House2/events.inc +++ b/data/maps/SlateportCity_House2/events.inc @@ -1,11 +1,11 @@ -SlateportCity_House2_EventObjects: @ 852FB9C +SlateportCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0 -SlateportCity_House2_MapWarps: @ 852FBCC +SlateportCity_House2_MapWarps: warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY -SlateportCity_House2_MapEvents:: @ 852FBDC +SlateportCity_House2_MapEvents:: map_events SlateportCity_House2_EventObjects, SlateportCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index 6028d12fba..0e756ee4a6 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -1,10 +1,10 @@ -SlateportCity_House2: @ 84831F4 +SlateportCity_House2: .4byte House2_Layout .4byte SlateportCity_House2_MapEvents .4byte SlateportCity_House2_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_Mart/events.inc b/data/maps/SlateportCity_Mart/events.inc index 9cc5b9829a..a6d872630c 100644 --- a/data/maps/SlateportCity_Mart/events.inc +++ b/data/maps/SlateportCity_Mart/events.inc @@ -1,12 +1,12 @@ -SlateportCity_Mart_EventObjects: @ 852FCF0 +SlateportCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0 object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0 -SlateportCity_Mart_MapWarps: @ 852FD38 +SlateportCity_Mart_MapWarps: warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY warp_def 4, 7, 0, 1, MAP_SLATEPORT_CITY -SlateportCity_Mart_MapEvents:: @ 852FD48 +SlateportCity_Mart_MapEvents:: map_events SlateportCity_Mart_EventObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index 2d53ac8c39..a98e7bb902 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -1,10 +1,10 @@ -SlateportCity_Mart: @ 8483248 +SlateportCity_Mart: .4byte Mart_Layout .4byte SlateportCity_Mart_MapEvents .4byte SlateportCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc index 8d727f4833..254506300f 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc @@ -1,4 +1,4 @@ -SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670 +SlateportCity_OceanicMuseum_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS @@ -14,16 +14,16 @@ SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670 object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION -SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0 +SlateportCity_OceanicMuseum_1F_MapWarps: warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY warp_def 10, 8, 0, 7, MAP_SLATEPORT_CITY warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F -SlateportCity_OceanicMuseum_1F_MapCoordEvents: @ 852F7D8 +SlateportCity_OceanicMuseum_1F_MapCoordEvents: coord_event 9, 7, 3, VAR_0x40AA, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD9F coord_event 10, 7, 3, VAR_0x40AA, 0, SlateportCity_OceanicMuseum_1F_EventScript_20ADB0 -SlateportCity_OceanicMuseum_1F_MapBGEvents: @ 852F7F8 +SlateportCity_OceanicMuseum_1F_MapBGEvents: bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE83 bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE8C bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE95 @@ -38,6 +38,6 @@ SlateportCity_OceanicMuseum_1F_MapBGEvents: @ 852F7F8 bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AECB bg_event 17, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AECB -SlateportCity_OceanicMuseum_1F_MapEvents:: @ 852F894 +SlateportCity_OceanicMuseum_1F_MapEvents:: map_events SlateportCity_OceanicMuseum_1F_EventObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index b75a12f600..0bf69b52a1 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -1,10 +1,10 @@ -SlateportCity_OceanicMuseum_1F: @ 84831A0 +SlateportCity_OceanicMuseum_1F: .4byte SlateportCity_OceanicMuseum_1F_Layout .4byte SlateportCity_OceanicMuseum_1F_MapEvents .4byte SlateportCity_OceanicMuseum_1F_MapScripts .4byte 0x0 .2byte MUS_FUNE_KAN - .2byte 86 + .2byte LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc index 14499f35bd..b1cd4477a8 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc @@ -1,4 +1,4 @@ -SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8 +SlateportCity_OceanicMuseum_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 @@ -7,10 +7,10 @@ SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8 object_event 6, EVENT_OBJ_GFX_POKEFAN_F, 0, 9, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION object_event 7, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION -SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950 +SlateportCity_OceanicMuseum_2F_MapWarps: warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F -SlateportCity_OceanicMuseum_2F_MapBGEvents: @ 852F958 +SlateportCity_OceanicMuseum_2F_MapBGEvents: bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD0A bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD13 bg_event 4, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD52 @@ -33,6 +33,6 @@ SlateportCity_OceanicMuseum_2F_MapBGEvents: @ 852F958 bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 bg_event 4, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 -SlateportCity_OceanicMuseum_2F_MapEvents:: @ 852FA54 +SlateportCity_OceanicMuseum_2F_MapEvents:: map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index a571c2372e..8212c6be59 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -1,10 +1,10 @@ -SlateportCity_OceanicMuseum_2F: @ 84831BC +SlateportCity_OceanicMuseum_2F: .4byte SlateportCity_OceanicMuseum_2F_Layout .4byte SlateportCity_OceanicMuseum_2F_MapEvents .4byte SlateportCity_OceanicMuseum_2F_MapScripts .4byte 0x0 .2byte MUS_FUNE_KAN - .2byte 87 + .2byte LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_PokemonCenter_1F/events.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc index f5409bdf09..79442b1aab 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/events.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/events.inc @@ -1,13 +1,13 @@ -SlateportCity_PokemonCenter_1F_EventObjects: @ 852FBF0 +SlateportCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0 -SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38 +SlateportCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY warp_def 6, 8, 3, 0, MAP_SLATEPORT_CITY warp_def 1, 6, 4, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_2F -SlateportCity_PokemonCenter_1F_MapEvents:: @ 852FC50 +SlateportCity_PokemonCenter_1F_MapEvents:: map_events SlateportCity_PokemonCenter_1F_EventObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index 37f19272d8..aee6e2e1cc 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -SlateportCity_PokemonCenter_1F: @ 8483210 +SlateportCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte SlateportCity_PokemonCenter_1F_MapEvents .4byte SlateportCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_PokemonCenter_2F/events.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc index c28c3111ac..34f7fe078d 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/events.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -SlateportCity_PokemonCenter_2F_EventObjects: @ 852FC64 +SlateportCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4 +SlateportCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -SlateportCity_PokemonCenter_2F_MapEvents:: @ 852FCDC +SlateportCity_PokemonCenter_2F_MapEvents:: map_events SlateportCity_PokemonCenter_2F_EventObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 1cac2f35ed..bc9640581f 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -SlateportCity_PokemonCenter_2F: @ 848322C +SlateportCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte SlateportCity_PokemonCenter_2F_MapEvents .4byte SlateportCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_PokemonFanClub/events.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc index 74b2a6acf3..861d9cb62a 100644 --- a/data/maps/SlateportCity_PokemonFanClub/events.inc +++ b/data/maps/SlateportCity_PokemonFanClub/events.inc @@ -1,4 +1,4 @@ -SlateportCity_PokemonFanClub_EventObjects: @ 852F574 +SlateportCity_PokemonFanClub_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0 object_event 2, EVENT_OBJ_GFX_TWIN, 0, 1, 5, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0 object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0 @@ -9,10 +9,10 @@ SlateportCity_PokemonFanClub_EventObjects: @ 852F574 object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0 object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 11, 8, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0 -SlateportCity_PokemonFanClub_MapWarps: @ 852F64C +SlateportCity_PokemonFanClub_MapWarps: warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY warp_def 7, 10, 0, 4, MAP_SLATEPORT_CITY -SlateportCity_PokemonFanClub_MapEvents:: @ 852F65C +SlateportCity_PokemonFanClub_MapEvents:: map_events SlateportCity_PokemonFanClub_EventObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index b3b0dc8995..29e6816a3e 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -1,10 +1,10 @@ -SlateportCity_PokemonFanClub: @ 8483184 +SlateportCity_PokemonFanClub: .4byte SlateportCity_PokemonFanClub_Layout .4byte SlateportCity_PokemonFanClub_MapEvents .4byte SlateportCity_PokemonFanClub_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 85 + .2byte LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_SternsShipyard_1F/events.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc index 5bad8c5e21..052ccd9659 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/events.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/events.inc @@ -1,14 +1,14 @@ -SlateportCity_SternsShipyard_1F_EventObjects: @ 852F318 +SlateportCity_SternsShipyard_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0 object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0 object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0 object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY -SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378 +SlateportCity_SternsShipyard_1F_MapWarps: warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY warp_def 3, 14, 0, 2, MAP_SLATEPORT_CITY warp_def 3, 1, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F -SlateportCity_SternsShipyard_1F_MapEvents:: @ 852F390 +SlateportCity_SternsShipyard_1F_MapEvents:: map_events SlateportCity_SternsShipyard_1F_EventObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index e702530ef6..3731923e2d 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -1,10 +1,10 @@ -SlateportCity_SternsShipyard_1F: @ 84830DC +SlateportCity_SternsShipyard_1F: .4byte SlateportCity_SternsShipyard_1F_Layout .4byte SlateportCity_SternsShipyard_1F_MapEvents .4byte SlateportCity_SternsShipyard_1F_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 81 + .2byte LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_SternsShipyard_2F/events.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc index f34a527264..2e48eb8b4d 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/events.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/events.inc @@ -1,11 +1,11 @@ -SlateportCity_SternsShipyard_2F_EventObjects: @ 852F3A4 +SlateportCity_SternsShipyard_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0 object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0 -SlateportCity_SternsShipyard_2F_MapWarps: @ 852F3EC +SlateportCity_SternsShipyard_2F_MapWarps: warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F -SlateportCity_SternsShipyard_2F_MapEvents:: @ 852F3F4 +SlateportCity_SternsShipyard_2F_MapEvents:: map_events SlateportCity_SternsShipyard_2F_EventObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index 8139d7604c..094f9fdec1 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -1,10 +1,10 @@ -SlateportCity_SternsShipyard_2F: @ 84830F8 +SlateportCity_SternsShipyard_2F: .4byte SlateportCity_SternsShipyard_2F_Layout .4byte SlateportCity_SternsShipyard_2F_MapEvents .4byte SlateportCity_SternsShipyard_2F_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 82 + .2byte LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc index 9ca0bb20d3..6592c293d9 100644 --- a/data/maps/SootopolisCity/events.inc +++ b/data/maps/SootopolisCity/events.inc @@ -1,4 +1,4 @@ -SootopolisCity_EventObjects: @ 8527314 +SootopolisCity_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 47, 33, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0 @@ -18,7 +18,7 @@ SootopolisCity_EventObjects: @ 8527314 object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E651F, FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6446, FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE -SootopolisCity_MapWarps: @ 85274C4 +SootopolisCity_MapWarps: warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F warp_def 17, 29, 0, 0, MAP_SOOTOPOLIS_CITY_MART warp_def 31, 32, 0, 0, MAP_SOOTOPOLIS_CITY_GYM_1F @@ -33,7 +33,7 @@ SootopolisCity_MapWarps: @ 85274C4 warp_def 48, 25, 0, 0, MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE warp_def 51, 36, 0, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F -SootopolisCity_MapBGEvents: @ 852752C +SootopolisCity_MapBGEvents: bg_event 33, 34, 3, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_1E614B bg_event 19, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E6A bg_event 44, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E73 @@ -41,6 +41,6 @@ SootopolisCity_MapBGEvents: @ 852752C bg_event 18, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E6A bg_event 41, 37, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_1E6154 -SootopolisCity_MapEvents:: @ 8527574 +SootopolisCity_MapEvents:: map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, 0x0, SootopolisCity_MapBGEvents diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index 1b6832fbe9..0d12af500a 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -1,10 +1,10 @@ -SootopolisCity: @ 848257C +SootopolisCity: .4byte SootopolisCity_Layout .4byte SootopolisCity_MapEvents .4byte SootopolisCity_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 8 + .2byte LAYOUT_SOOTOPOLIS_CITY .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/SootopolisCity_Gym_1F/events.inc b/data/maps/SootopolisCity_Gym_1F/events.inc index 36d8d7b274..288d78343a 100644 --- a/data/maps/SootopolisCity_Gym_1F/events.inc +++ b/data/maps/SootopolisCity_Gym_1F/events.inc @@ -1,16 +1,16 @@ -SootopolisCity_Gym_1F_EventObjects: @ 8532FF4 +SootopolisCity_Gym_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_JUAN, 0, 8, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0 object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0 -SootopolisCity_Gym_1F_MapWarps: @ 8533024 +SootopolisCity_Gym_1F_MapWarps: warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY warp_def 9, 25, 0, 2, MAP_SOOTOPOLIS_CITY warp_def 11, 22, 3, 0, MAP_SOOTOPOLIS_CITY_GYM_B1F -SootopolisCity_Gym_1F_MapBGEvents: @ 853303C +SootopolisCity_Gym_1F_MapBGEvents: bg_event 6, 24, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_Gym_1F_EventScript_22505F bg_event 10, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_Gym_1F_EventScript_22506F -SootopolisCity_Gym_1F_MapEvents:: @ 8533054 +SootopolisCity_Gym_1F_MapEvents:: map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index 1d71e09232..72e6fd2c81 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_Gym_1F: @ 8483A28 +SootopolisCity_Gym_1F: .4byte SootopolisCity_Gym_1F_Layout .4byte SootopolisCity_Gym_1F_MapEvents .4byte SootopolisCity_Gym_1F_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 109 + .2byte LAYOUT_SOOTOPOLIS_CITY_GYM_1F .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_Gym_B1F/events.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc index 0ca0287add..2ef2609e7e 100644 --- a/data/maps/SootopolisCity_Gym_B1F/events.inc +++ b/data/maps/SootopolisCity_Gym_B1F/events.inc @@ -1,4 +1,4 @@ -SootopolisCity_Gym_B1F_EventObjects: @ 8533068 +SootopolisCity_Gym_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0 object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0 @@ -10,9 +10,9 @@ SootopolisCity_Gym_B1F_EventObjects: @ 8533068 object_event 9, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0 object_event 10, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0 -SootopolisCity_Gym_B1F_MapWarps: @ 8533158 +SootopolisCity_Gym_B1F_MapWarps: warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F -SootopolisCity_Gym_B1F_MapEvents:: @ 8533160 +SootopolisCity_Gym_B1F_MapEvents:: map_events SootopolisCity_Gym_B1F_EventObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index c06afbc1b3..afa12fa9f2 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_Gym_B1F: @ 8483A44 +SootopolisCity_Gym_B1F: .4byte SootopolisCity_Gym_B1F_Layout .4byte SootopolisCity_Gym_B1F_MapEvents .4byte SootopolisCity_Gym_B1F_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 110 + .2byte LAYOUT_SOOTOPOLIS_CITY_GYM_B1F .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House1/events.inc b/data/maps/SootopolisCity_House1/events.inc index 38885d648a..64012784a7 100644 --- a/data/maps/SootopolisCity_House1/events.inc +++ b/data/maps/SootopolisCity_House1/events.inc @@ -1,11 +1,11 @@ -SootopolisCity_House1_EventObjects: @ 85332F8 +SootopolisCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0 object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0 -SootopolisCity_House1_MapWarps: @ 8533328 +SootopolisCity_House1_MapWarps: warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 4, MAP_SOOTOPOLIS_CITY -SootopolisCity_House1_MapEvents:: @ 8533338 +SootopolisCity_House1_MapEvents:: map_events SootopolisCity_House1_EventObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index f7621f917b..af4cf939c4 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House1: @ 8483AB4 +SootopolisCity_House1: .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House1_MapEvents .4byte SootopolisCity_House1_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 307 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE1 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House2/events.inc b/data/maps/SootopolisCity_House2/events.inc index 509eeb46fb..ea70cecb97 100644 --- a/data/maps/SootopolisCity_House2/events.inc +++ b/data/maps/SootopolisCity_House2/events.inc @@ -1,10 +1,10 @@ -SootopolisCity_House2_EventObjects: @ 853334C +SootopolisCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0 -SootopolisCity_House2_MapWarps: @ 8533364 +SootopolisCity_House2_MapWarps: warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 5, MAP_SOOTOPOLIS_CITY -SootopolisCity_House2_MapEvents:: @ 8533374 +SootopolisCity_House2_MapEvents:: map_events SootopolisCity_House2_EventObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index c329627185..42b7e14aa8 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House2: @ 8483AD0 +SootopolisCity_House2: .4byte SootopolisCity_House2_Layout .4byte SootopolisCity_House2_MapEvents .4byte SootopolisCity_House2_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 308 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE2 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House3/events.inc b/data/maps/SootopolisCity_House3/events.inc index 5a91765c5d..d078de8ecc 100644 --- a/data/maps/SootopolisCity_House3/events.inc +++ b/data/maps/SootopolisCity_House3/events.inc @@ -1,11 +1,11 @@ -SootopolisCity_House3_EventObjects: @ 8533388 +SootopolisCity_House3_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0 object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0 -SootopolisCity_House3_MapWarps: @ 85333B8 +SootopolisCity_House3_MapWarps: warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 6, MAP_SOOTOPOLIS_CITY -SootopolisCity_House3_MapEvents:: @ 85333C8 +SootopolisCity_House3_MapEvents:: map_events SootopolisCity_House3_EventObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index bd90fabc00..0913505e13 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House3: @ 8483AEC +SootopolisCity_House3: .4byte SootopolisCity_House3_Layout .4byte SootopolisCity_House3_MapEvents .4byte SootopolisCity_House3_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 309 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE3 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House4/events.inc b/data/maps/SootopolisCity_House4/events.inc index 3bd0aed0e8..ce669cd756 100644 --- a/data/maps/SootopolisCity_House4/events.inc +++ b/data/maps/SootopolisCity_House4/events.inc @@ -1,12 +1,12 @@ -SootopolisCity_House4_EventObjects: @ 85333DC +SootopolisCity_House4_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 2, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0 object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SootopolisCity_House4_EventScript_226D28, 0 -SootopolisCity_House4_MapWarps: @ 8533424 +SootopolisCity_House4_MapWarps: warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 7, MAP_SOOTOPOLIS_CITY -SootopolisCity_House4_MapEvents:: @ 8533434 +SootopolisCity_House4_MapEvents:: map_events SootopolisCity_House4_EventObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index f715682877..1266c68fec 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House4: @ 8483B08 +SootopolisCity_House4: .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House4_MapEvents .4byte SootopolisCity_House4_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 307 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE1 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House5/events.inc b/data/maps/SootopolisCity_House5/events.inc index 321de8b64a..fa6d0452dd 100644 --- a/data/maps/SootopolisCity_House5/events.inc +++ b/data/maps/SootopolisCity_House5/events.inc @@ -1,11 +1,11 @@ -SootopolisCity_House5_EventObjects: @ 8533448 +SootopolisCity_House5_EventObjects: object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0 -SootopolisCity_House5_MapWarps: @ 8533478 +SootopolisCity_House5_MapWarps: warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 8, MAP_SOOTOPOLIS_CITY -SootopolisCity_House5_MapEvents:: @ 8533488 +SootopolisCity_House5_MapEvents:: map_events SootopolisCity_House5_EventObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index d3d90fb055..0b1b3664ca 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House5: @ 8483B24 +SootopolisCity_House5: .4byte SootopolisCity_House2_Layout .4byte SootopolisCity_House5_MapEvents .4byte SootopolisCity_House5_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 308 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE2 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House6/events.inc b/data/maps/SootopolisCity_House6/events.inc index 40fd1d0a77..c89c135386 100644 --- a/data/maps/SootopolisCity_House6/events.inc +++ b/data/maps/SootopolisCity_House6/events.inc @@ -1,10 +1,10 @@ -SootopolisCity_House6_EventObjects: @ 853349C +SootopolisCity_House6_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0 -SootopolisCity_House6_MapWarps: @ 85334B4 +SootopolisCity_House6_MapWarps: warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 9, MAP_SOOTOPOLIS_CITY -SootopolisCity_House6_MapEvents:: @ 85334C4 +SootopolisCity_House6_MapEvents:: map_events SootopolisCity_House6_EventObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index e3daef4ed2..3268fbf09a 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House6: @ 8483B40 +SootopolisCity_House6: .4byte SootopolisCity_House3_Layout .4byte SootopolisCity_House6_MapEvents .4byte SootopolisCity_House6_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 309 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE3 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House7/events.inc b/data/maps/SootopolisCity_House7/events.inc index d2f4e1ff20..e978cb8d4f 100644 --- a/data/maps/SootopolisCity_House7/events.inc +++ b/data/maps/SootopolisCity_House7/events.inc @@ -1,11 +1,11 @@ -SootopolisCity_House7_EventObjects: @ 85334D8 +SootopolisCity_House7_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0 -SootopolisCity_House7_MapWarps: @ 8533508 +SootopolisCity_House7_MapWarps: warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 10, MAP_SOOTOPOLIS_CITY -SootopolisCity_House7_MapEvents:: @ 8533518 +SootopolisCity_House7_MapEvents:: map_events SootopolisCity_House7_EventObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index db988ed22c..0398f1cf77 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House7: @ 8483B5C +SootopolisCity_House7: .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House7_MapEvents .4byte SootopolisCity_House7_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 307 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE1 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc index 07c18bae5b..da5b123fe6 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc @@ -1,15 +1,15 @@ -SootopolisCity_LotadAndSeedotHouse_EventObjects: @ 853352C +SootopolisCity_LotadAndSeedotHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0 object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0 -SootopolisCity_LotadAndSeedotHouse_MapWarps: @ 853355C +SootopolisCity_LotadAndSeedotHouse_MapWarps: warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY -SootopolisCity_LotadAndSeedotHouse_MapBGEvents: @ 853356C +SootopolisCity_LotadAndSeedotHouse_MapBGEvents: bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_LotadAndSeedotHouse_EventScript_22734D bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_LotadAndSeedotHouse_EventScript_22735B -SootopolisCity_LotadAndSeedotHouse_MapEvents:: @ 8533584 +SootopolisCity_LotadAndSeedotHouse_MapEvents:: map_events SootopolisCity_LotadAndSeedotHouse_EventObjects, SootopolisCity_LotadAndSeedotHouse_MapWarps, 0x0, SootopolisCity_LotadAndSeedotHouse_MapBGEvents diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc index 47f68b58fe..35da7aa8bc 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_LotadAndSeedotHouse: @ 8483B78 +SootopolisCity_LotadAndSeedotHouse: .4byte SootopolisCity_LotadAndSeedotHouse_Layout .4byte SootopolisCity_LotadAndSeedotHouse_MapEvents .4byte SootopolisCity_LotadAndSeedotHouse_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 297 + .2byte LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_Mart/events.inc b/data/maps/SootopolisCity_Mart/events.inc index 32fc081d23..0fb940fd9f 100644 --- a/data/maps/SootopolisCity_Mart/events.inc +++ b/data/maps/SootopolisCity_Mart/events.inc @@ -1,12 +1,12 @@ -SootopolisCity_Mart_EventObjects: @ 853328C +SootopolisCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0 object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0 object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0 -SootopolisCity_Mart_MapWarps: @ 85332D4 +SootopolisCity_Mart_MapWarps: warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY warp_def 4, 7, 0, 1, MAP_SOOTOPOLIS_CITY -SootopolisCity_Mart_MapEvents:: @ 85332E4 +SootopolisCity_Mart_MapEvents:: map_events SootopolisCity_Mart_EventObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index 131540c7ac..5b5ad1a01a 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_Mart: @ 8483A98 +SootopolisCity_Mart: .4byte Mart_Layout .4byte SootopolisCity_Mart_MapEvents .4byte SootopolisCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc index 65a2655784..560e693cf7 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc @@ -1,11 +1,11 @@ -SootopolisCity_MysteryEventsHouse_1F_EventObjects: @ 8533598 +SootopolisCity_MysteryEventsHouse_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 6, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0 -SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0 +SootopolisCity_MysteryEventsHouse_1F_MapWarps: warp_def 3, 7, 0, 12, MAP_SOOTOPOLIS_CITY warp_def 4, 7, 0, 12, MAP_SOOTOPOLIS_CITY warp_def 3, 1, 3, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F -SootopolisCity_MysteryEventsHouse_1F_MapEvents:: @ 85335C8 +SootopolisCity_MysteryEventsHouse_1F_MapEvents:: map_events SootopolisCity_MysteryEventsHouse_1F_EventObjects, SootopolisCity_MysteryEventsHouse_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc index 153be53cba..bf7d813210 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_MysteryEventsHouse_1F: @ 8483B94 +SootopolisCity_MysteryEventsHouse_1F: .4byte SootopolisCity_MysteryEventsHouse_1F_Layout .4byte SootopolisCity_MysteryEventsHouse_1F_MapEvents .4byte SootopolisCity_MysteryEventsHouse_1F_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 439 + .2byte LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc index 5cdbf05590..816cbaecc9 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc @@ -1,9 +1,9 @@ -SootopolisCity_MysteryEventsHouse_B1F_EventObjects: @ 85335DC +SootopolisCity_MysteryEventsHouse_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 -SootopolisCity_MysteryEventsHouse_B1F_MapWarps: @ 85335F4 +SootopolisCity_MysteryEventsHouse_B1F_MapWarps: warp_def 3, 1, 0, 2, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F -SootopolisCity_MysteryEventsHouse_B1F_MapEvents:: @ 85335FC +SootopolisCity_MysteryEventsHouse_B1F_MapEvents:: map_events SootopolisCity_MysteryEventsHouse_B1F_EventObjects, SootopolisCity_MysteryEventsHouse_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc index e0355b0745..ee7def94c2 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0 +SootopolisCity_MysteryEventsHouse_B1F: .4byte SootopolisCity_MysteryEventsHouse_B1F_Layout .4byte SootopolisCity_MysteryEventsHouse_B1F_MapEvents .4byte SootopolisCity_MysteryEventsHouse_B1F_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 440 + .2byte LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc index b5a221dadd..743ba0ccbc 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -SootopolisCity_PokemonCenter_1F_EventObjects: @ 8533174 +SootopolisCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0 -SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4 +SootopolisCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY warp_def 6, 8, 3, 0, MAP_SOOTOPOLIS_CITY warp_def 1, 6, 4, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F -SootopolisCity_PokemonCenter_1F_MapEvents:: @ 85331EC +SootopolisCity_PokemonCenter_1F_MapEvents:: map_events SootopolisCity_PokemonCenter_1F_EventObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index 75da1fc474..972cf28e4c 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_PokemonCenter_1F: @ 8483A60 +SootopolisCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte SootopolisCity_PokemonCenter_1F_MapEvents .4byte SootopolisCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc index 0062c87e1f..e8fb6e09f1 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -SootopolisCity_PokemonCenter_2F_EventObjects: @ 8533200 +SootopolisCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260 +SootopolisCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -SootopolisCity_PokemonCenter_2F_MapEvents:: @ 8533278 +SootopolisCity_PokemonCenter_2F_MapEvents:: map_events SootopolisCity_PokemonCenter_2F_EventObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index f9e1c51896..03ab97ea5a 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_PokemonCenter_2F: @ 8483A7C +SootopolisCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte SootopolisCity_PokemonCenter_2F_MapEvents .4byte SootopolisCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SouthernIsland_Exterior/events.inc b/data/maps/SouthernIsland_Exterior/events.inc index 14dc7169bc..eeb21d3af4 100644 --- a/data/maps/SouthernIsland_Exterior/events.inc +++ b/data/maps/SouthernIsland_Exterior/events.inc @@ -1,14 +1,14 @@ -SouthernIsland_Exterior_EventObjects: @ 853B83C +SouthernIsland_Exterior_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 -SouthernIsland_Exterior_MapWarps: @ 853B86C +SouthernIsland_Exterior_MapWarps: warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR -SouthernIsland_Exterior_MapBGEvents: @ 853B87C +SouthernIsland_Exterior_MapBGEvents: bg_event 16, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SouthernIsland_Exterior_EventScript_242A3C -SouthernIsland_Exterior_MapEvents:: @ 853B888 +SouthernIsland_Exterior_MapEvents:: map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index 4aa0eff1a3..1288fbdf50 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -1,10 +1,10 @@ -SouthernIsland_Exterior: @ 8485238 +SouthernIsland_Exterior: .4byte SouthernIsland_Exterior_Layout .4byte SouthernIsland_Exterior_MapEvents .4byte SouthernIsland_Exterior_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 290 + .2byte LAYOUT_SOUTHERN_ISLAND_EXTERIOR .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc index 000386c337..190762f5ba 100644 --- a/data/maps/SouthernIsland_Interior/events.inc +++ b/data/maps/SouthernIsland_Interior/events.inc @@ -1,14 +1,14 @@ -SouthernIsland_Interior_EventObjects: @ 853B89C +SouthernIsland_Interior_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 13, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON -SouthernIsland_Interior_MapWarps: @ 853B8CC +SouthernIsland_Interior_MapWarps: warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR -SouthernIsland_Interior_MapBGEvents: @ 853B8DC +SouthernIsland_Interior_MapBGEvents: bg_event 13, 11, 3, BG_EVENT_PLAYER_FACING_NORTH, SouthernIsland_Interior_EventScript_242AC4 -SouthernIsland_Interior_MapEvents:: @ 853B8E8 +SouthernIsland_Interior_MapEvents:: map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index b1238c4f75..95eb61d7c3 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -1,10 +1,10 @@ -SouthernIsland_Interior: @ 8485254 +SouthernIsland_Interior: .4byte SouthernIsland_Interior_Layout .4byte SouthernIsland_Interior_MapEvents .4byte SouthernIsland_Interior_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 291 + .2byte LAYOUT_SOUTHERN_ISLAND_INTERIOR .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/TerraCave_End/events.inc b/data/maps/TerraCave_End/events.inc index 553b4151ab..f20abd8fd4 100644 --- a/data/maps/TerraCave_End/events.inc +++ b/data/maps/TerraCave_End/events.inc @@ -1,12 +1,12 @@ -TerraCave_End_EventObjects: @ 8537850 +TerraCave_End_EventObjects: object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 17, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_TERRA_CAVE_GROUDON -TerraCave_End_MapWarps: @ 8537868 +TerraCave_End_MapWarps: warp_def 5, 4, 3, 1, MAP_TERRA_CAVE_ENTRANCE -TerraCave_End_MapCoordEvents: @ 8537870 +TerraCave_End_MapCoordEvents: coord_event 17, 26, 3, VAR_TEMP_1, 1, TerraCave_End_EventScript_23B0EC -TerraCave_End_MapEvents:: @ 8537880 +TerraCave_End_MapEvents:: map_events TerraCave_End_EventObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0 diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc index 8ba9f7d456..f95ac38b8c 100644 --- a/data/maps/TerraCave_End/header.inc +++ b/data/maps/TerraCave_End/header.inc @@ -1,10 +1,10 @@ -TerraCave_End: @ 8484A3C +TerraCave_End: .4byte TerraCave_End_Layout .4byte TerraCave_End_MapEvents .4byte TerraCave_End_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 409 + .2byte LAYOUT_TERRA_CAVE_END .byte MAPSEC_TERRA_CAVE .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/TerraCave_Entrance/events.inc b/data/maps/TerraCave_Entrance/events.inc index a176c548db..bfa4092fdf 100644 --- a/data/maps/TerraCave_Entrance/events.inc +++ b/data/maps/TerraCave_Entrance/events.inc @@ -1,7 +1,7 @@ -TerraCave_Entrance_MapWarps: @ 853782C +TerraCave_Entrance_MapWarps: warp_def 8, 18, 0, 127, MAP_NONE warp_def 14, 1, 3, 0, MAP_TERRA_CAVE_END -TerraCave_Entrance_MapEvents:: @ 853783C +TerraCave_Entrance_MapEvents:: map_events 0x0, TerraCave_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc index b75c867993..5ede2a4487 100644 --- a/data/maps/TerraCave_Entrance/header.inc +++ b/data/maps/TerraCave_Entrance/header.inc @@ -1,10 +1,10 @@ -TerraCave_Entrance: @ 8484A20 +TerraCave_Entrance: .4byte TerraCave_Entrance_Layout .4byte TerraCave_Entrance_MapEvents .4byte TerraCave_Entrance_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 408 + .2byte LAYOUT_TERRA_CAVE_ENTRANCE .byte MAPSEC_TERRA_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc index 8991b6aab2..79faca7e65 100644 --- a/data/maps/TradeCenter/events.inc +++ b/data/maps/TradeCenter/events.inc @@ -1,14 +1,14 @@ -TradeCenter_EventObjects: @ 8539DA0 +TradeCenter_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0 -TradeCenter_MapWarps: @ 8539DB8 +TradeCenter_MapWarps: warp_def 5, 8, 3, 127, MAP_NONE warp_def 6, 8, 3, 127, MAP_NONE -TradeCenter_MapCoordEvents: @ 8539DC8 +TradeCenter_MapCoordEvents: coord_event 4, 5, 3, VAR_TEMP_0, 0, gUnknown_082773F5 coord_event 7, 5, 3, VAR_TEMP_0, 0, gUnknown_082773FF -TradeCenter_MapEvents:: @ 8539DE8 +TradeCenter_MapEvents:: map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 9b621cb026..80a11cd52f 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -1,10 +1,10 @@ -TradeCenter: @ 8484D4C +TradeCenter: .4byte TradeCenter_Layout .4byte TradeCenter_MapEvents .4byte TradeCenter_MapScripts .4byte 0x0 .2byte MUS_RAINBOW - .2byte 222 + .2byte LAYOUT_TRADE_CENTER .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_1F/events.inc b/data/maps/TrainerHill_1F/events.inc index 2a2428f57d..21e62b951f 100644 --- a/data/maps/TrainerHill_1F/events.inc +++ b/data/maps/TrainerHill_1F/events.inc @@ -1,7 +1,7 @@ -TrainerHill_1F_MapWarps: @ 853D934 +TrainerHill_1F_MapWarps: warp_def 2, 1, 3, 2, MAP_TRAINER_HILL_ENTRANCE warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_2F -TrainerHill_1F_MapEvents:: @ 853D944 +TrainerHill_1F_MapEvents:: map_events 0x0, TrainerHill_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index 3c6b581191..a3654edf2a 100644 --- a/data/maps/TrainerHill_1F/header.inc +++ b/data/maps/TrainerHill_1F/header.inc @@ -1,10 +1,10 @@ -TrainerHill_1F: @ 84857E8 +TrainerHill_1F: .4byte TrainerHill_1F_Layout .4byte TrainerHill_1F_MapEvents .4byte TrainerHill_1F_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 415 + .2byte LAYOUT_TRAINER_HILL_1F .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_2F/events.inc b/data/maps/TrainerHill_2F/events.inc index ca50380d5f..4752e33cdc 100644 --- a/data/maps/TrainerHill_2F/events.inc +++ b/data/maps/TrainerHill_2F/events.inc @@ -1,7 +1,7 @@ -TrainerHill_2F_MapWarps: @ 853D958 +TrainerHill_2F_MapWarps: warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_1F warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_3F -TrainerHill_2F_MapEvents:: @ 853D968 +TrainerHill_2F_MapEvents:: map_events 0x0, TrainerHill_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc index d8343060c7..2f607baff6 100644 --- a/data/maps/TrainerHill_2F/header.inc +++ b/data/maps/TrainerHill_2F/header.inc @@ -1,10 +1,10 @@ -TrainerHill_2F: @ 8485804 +TrainerHill_2F: .4byte TrainerHill_2F_Layout .4byte TrainerHill_2F_MapEvents .4byte TrainerHill_2F_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 416 + .2byte LAYOUT_TRAINER_HILL_2F .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_3F/events.inc b/data/maps/TrainerHill_3F/events.inc index e12394655b..5de009a47c 100644 --- a/data/maps/TrainerHill_3F/events.inc +++ b/data/maps/TrainerHill_3F/events.inc @@ -1,7 +1,7 @@ -TrainerHill_3F_MapWarps: @ 853D97C +TrainerHill_3F_MapWarps: warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_2F warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_4F -TrainerHill_3F_MapEvents:: @ 853D98C +TrainerHill_3F_MapEvents:: map_events 0x0, TrainerHill_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc index db82eb277f..4dd8e394fb 100644 --- a/data/maps/TrainerHill_3F/header.inc +++ b/data/maps/TrainerHill_3F/header.inc @@ -1,10 +1,10 @@ -TrainerHill_3F: @ 8485820 +TrainerHill_3F: .4byte TrainerHill_3F_Layout .4byte TrainerHill_3F_MapEvents .4byte TrainerHill_3F_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 417 + .2byte LAYOUT_TRAINER_HILL_3F .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_4F/events.inc b/data/maps/TrainerHill_4F/events.inc index e9696de151..05f6e89178 100644 --- a/data/maps/TrainerHill_4F/events.inc +++ b/data/maps/TrainerHill_4F/events.inc @@ -1,7 +1,7 @@ -TrainerHill_4F_MapWarps: @ 853D9A0 +TrainerHill_4F_MapWarps: warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_3F warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_ROOF -TrainerHill_4F_MapEvents:: @ 853D9B0 +TrainerHill_4F_MapEvents:: map_events 0x0, TrainerHill_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc index d699f53d57..4f370c5d98 100644 --- a/data/maps/TrainerHill_4F/header.inc +++ b/data/maps/TrainerHill_4F/header.inc @@ -1,10 +1,10 @@ -TrainerHill_4F: @ 848583C +TrainerHill_4F: .4byte TrainerHill_4F_Layout .4byte TrainerHill_4F_MapEvents .4byte TrainerHill_4F_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 418 + .2byte LAYOUT_TRAINER_HILL_4F .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_Elevator/events.inc b/data/maps/TrainerHill_Elevator/events.inc index 0125c99361..c0336a267a 100644 --- a/data/maps/TrainerHill_Elevator/events.inc +++ b/data/maps/TrainerHill_Elevator/events.inc @@ -1,10 +1,10 @@ -TrainerHill_Elevator_EventObjects: @ 853DD84 +TrainerHill_Elevator_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0 -TrainerHill_Elevator_MapWarps: @ 853DD9C +TrainerHill_Elevator_MapWarps: warp_def 1, 6, 3, 1, MAP_TRAINER_HILL_ROOF warp_def 2, 6, 3, 1, MAP_TRAINER_HILL_ROOF -TrainerHill_Elevator_MapEvents:: @ 853DDAC +TrainerHill_Elevator_MapEvents:: map_events TrainerHill_Elevator_EventObjects, TrainerHill_Elevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc index 936b7712dd..5eeaa994be 100644 --- a/data/maps/TrainerHill_Elevator/header.inc +++ b/data/maps/TrainerHill_Elevator/header.inc @@ -1,10 +1,10 @@ -TrainerHill_Elevator: @ 8485ADC +TrainerHill_Elevator: .4byte BattleElevator_Layout .4byte TrainerHill_Elevator_MapEvents .4byte TrainerHill_Elevator_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 266 + .2byte LAYOUT_BATTLE_ELEVATOR .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_Entrance/events.inc b/data/maps/TrainerHill_Entrance/events.inc index 30817defc3..ddc3f3f094 100644 --- a/data/maps/TrainerHill_Entrance/events.inc +++ b/data/maps/TrainerHill_Entrance/events.inc @@ -1,21 +1,21 @@ -TrainerHill_Entrance_EventObjects: @ 853D874 +TrainerHill_Entrance_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0 object_event 2, EVENT_OBJ_GFX_NURSE, 0, 4, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0 object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0 object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 5, 14, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0 object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 14, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_268391, 0 -TrainerHill_Entrance_MapWarps: @ 853D8EC +TrainerHill_Entrance_MapWarps: warp_def 9, 16, 3, 4, MAP_ROUTE111 warp_def 10, 16, 3, 4, MAP_ROUTE111 warp_def 9, 1, 3, 0, MAP_TRAINER_HILL_1F -TrainerHill_Entrance_MapCoordEvents: @ 853D904 +TrainerHill_Entrance_MapCoordEvents: coord_event 9, 6, 3, VAR_0x40D6, 0, TrainerHill_Entrance_EventScript_268229 -TrainerHill_Entrance_MapBGEvents: @ 853D914 +TrainerHill_Entrance_MapBGEvents: bg_event 8, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, TrainerHill_Entrance_EventScript_268388 -TrainerHill_Entrance_MapEvents:: @ 853D920 +TrainerHill_Entrance_MapEvents:: map_events TrainerHill_Entrance_EventObjects, TrainerHill_Entrance_MapWarps, TrainerHill_Entrance_MapCoordEvents, TrainerHill_Entrance_MapBGEvents diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc index 79d6c8b961..26e215a6e8 100644 --- a/data/maps/TrainerHill_Entrance/header.inc +++ b/data/maps/TrainerHill_Entrance/header.inc @@ -1,10 +1,10 @@ -TrainerHill_Entrance: @ 84857CC +TrainerHill_Entrance: .4byte TrainerHill_Entrance_Layout .4byte TrainerHill_Entrance_MapEvents .4byte TrainerHill_Entrance_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 414 + .2byte LAYOUT_TRAINER_HILL_ENTRANCE .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_Roof/events.inc b/data/maps/TrainerHill_Roof/events.inc index eeab57317c..0a3b361c4c 100644 --- a/data/maps/TrainerHill_Roof/events.inc +++ b/data/maps/TrainerHill_Roof/events.inc @@ -1,10 +1,10 @@ -TrainerHill_Roof_EventObjects: @ 853D9C4 +TrainerHill_Roof_EventObjects: object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0 -TrainerHill_Roof_MapWarps: @ 853D9DC +TrainerHill_Roof_MapWarps: warp_def 9, 5, 3, 1, MAP_TRAINER_HILL_4F warp_def 15, 5, 0, 1, MAP_TRAINER_HILL_ELEVATOR -TrainerHill_Roof_MapEvents:: @ 853D9EC +TrainerHill_Roof_MapEvents:: map_events TrainerHill_Roof_EventObjects, TrainerHill_Roof_MapWarps, 0x0, 0x0 diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc index 9f0b0dd3ba..c27cb3b5ac 100644 --- a/data/maps/TrainerHill_Roof/header.inc +++ b/data/maps/TrainerHill_Roof/header.inc @@ -1,10 +1,10 @@ -TrainerHill_Roof: @ 8485858 +TrainerHill_Roof: .4byte TrainerHill_Roof_Layout .4byte TrainerHill_Roof_MapEvents .4byte TrainerHill_Roof_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 419 + .2byte LAYOUT_TRAINER_HILL_ROOF .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Underwater1/connections.inc b/data/maps/Underwater1/connections.inc index b0b1aa108a..01c45b11b0 100644 --- a/data/maps/Underwater1/connections.inc +++ b/data/maps/Underwater1/connections.inc @@ -1,8 +1,8 @@ -Underwater1_MapConnectionsList: @ 8486D38 +Underwater1_MapConnectionsList: connection down, 0, MAP_UNDERWATER2 connection emerge, 0, MAP_ROUTE124 -Underwater1_MapConnections: @ 8486D50 - .4byte 0x2 +Underwater1_MapConnections: + .4byte 2 .4byte Underwater1_MapConnectionsList diff --git a/data/maps/Underwater1/events.inc b/data/maps/Underwater1/events.inc index 7d3866eb01..ef329306f8 100644 --- a/data/maps/Underwater1/events.inc +++ b/data/maps/Underwater1/events.inc @@ -1,4 +1,4 @@ -Underwater1_MapBGEvents: @ 852CEB4 +Underwater1_MapBGEvents: bg_hidden_item_event 42, 51, 0, ITEM_CARBOS, FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS bg_hidden_item_event 14, 40, 0, ITEM_GREEN_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD bg_hidden_item_event 66, 34, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL @@ -7,6 +7,6 @@ Underwater1_MapBGEvents: @ 852CEB4 bg_hidden_item_event 42, 5, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM bg_hidden_item_event 45, 36, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2 -Underwater1_MapEvents:: @ 852CF08 +Underwater1_MapEvents:: map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index 7cf9542992..06ab5f3832 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -1,10 +1,10 @@ -Underwater1: @ 8482A30 +Underwater1: .4byte Underwater1_Layout .4byte Underwater1_MapEvents .4byte Underwater1_MapScripts .4byte Underwater1_MapConnections .2byte MUS_DEEPDEEP - .2byte 274 + .2byte LAYOUT_UNDERWATER1 .byte MAPSEC_UNDERWATER_124 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater2/connections.inc b/data/maps/Underwater2/connections.inc index 11df3eaec0..74f11e5afc 100644 --- a/data/maps/Underwater2/connections.inc +++ b/data/maps/Underwater2/connections.inc @@ -1,9 +1,9 @@ -Underwater2_MapConnectionsList: @ 8486D6C +Underwater2_MapConnectionsList: connection up, 0, MAP_UNDERWATER1 connection right, 0, MAP_UNDERWATER3 connection emerge, 0, MAP_ROUTE126 -Underwater2_MapConnections: @ 8486D90 - .4byte 0x3 +Underwater2_MapConnections: + .4byte 3 .4byte Underwater2_MapConnectionsList diff --git a/data/maps/Underwater2/events.inc b/data/maps/Underwater2/events.inc index dd24215063..b4127fc15e 100644 --- a/data/maps/Underwater2/events.inc +++ b/data/maps/Underwater2/events.inc @@ -1,7 +1,7 @@ -Underwater2_MapWarps: @ 852CF1C +Underwater2_MapWarps: warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY -Underwater2_MapBGEvents: @ 852CF24 +Underwater2_MapBGEvents: bg_hidden_item_event 30, 17, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE bg_hidden_item_event 41, 19, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL bg_hidden_item_event 63, 19, 3, ITEM_STARDUST, FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST @@ -11,6 +11,6 @@ Underwater2_MapBGEvents: @ 852CF24 bg_hidden_item_event 65, 60, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL bg_hidden_item_event 9, 77, 3, ITEM_BLUE_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD -Underwater2_MapEvents:: @ 852CF84 +Underwater2_MapEvents:: map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index a4c14ab289..d1b11aa62d 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -1,10 +1,10 @@ -Underwater2: @ 8482A4C +Underwater2: .4byte Underwater2_Layout .4byte Underwater2_MapEvents .4byte Underwater2_MapScripts .4byte Underwater2_MapConnections .2byte MUS_DEEPDEEP - .2byte 51 + .2byte LAYOUT_UNDERWATER2 .byte MAPSEC_UNDERWATER_125 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater3/connections.inc b/data/maps/Underwater3/connections.inc index db8b0947b8..e0e6226def 100644 --- a/data/maps/Underwater3/connections.inc +++ b/data/maps/Underwater3/connections.inc @@ -1,9 +1,9 @@ -Underwater3_MapConnectionsList: @ 8486D98 +Underwater3_MapConnectionsList: connection emerge, 0, MAP_ROUTE127 connection left, 0, MAP_UNDERWATER2 connection down, 0, MAP_UNDERWATER4 -Underwater3_MapConnections: @ 8486DBC - .4byte 0x3 +Underwater3_MapConnections: + .4byte 3 .4byte Underwater3_MapConnectionsList diff --git a/data/maps/Underwater3/events.inc b/data/maps/Underwater3/events.inc index 02ac86aa12..92964db38d 100644 --- a/data/maps/Underwater3/events.inc +++ b/data/maps/Underwater3/events.inc @@ -1,13 +1,13 @@ -Underwater3_MapWarps: @ 852CF98 +Underwater3_MapWarps: warp_def 57, 5, 0, 0, MAP_UNDERWATER_MARINE_CAVE warp_def 67, 38, 0, 0, MAP_UNDERWATER_MARINE_CAVE -Underwater3_MapBGEvents: @ 852CFA8 +Underwater3_MapBGEvents: bg_hidden_item_event 12, 42, 3, ITEM_STAR_PIECE, FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE bg_hidden_item_event 50, 36, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP bg_hidden_item_event 34, 72, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE bg_hidden_item_event 72, 20, 3, ITEM_RED_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD -Underwater3_MapEvents:: @ 852CFD8 +Underwater3_MapEvents:: map_events 0x0, Underwater3_MapWarps, 0x0, Underwater3_MapBGEvents diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 4e91eb687d..1722cfdd83 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -1,10 +1,10 @@ -Underwater3: @ 8482A68 +Underwater3: .4byte Underwater3_Layout .4byte Underwater3_MapEvents .4byte Underwater3_MapScripts .4byte Underwater3_MapConnections .2byte MUS_DEEPDEEP - .2byte 52 + .2byte LAYOUT_UNDERWATER3 .byte MAPSEC_UNDERWATER_126 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater4/connections.inc b/data/maps/Underwater4/connections.inc index 8a63d54a46..c1701e1ddd 100644 --- a/data/maps/Underwater4/connections.inc +++ b/data/maps/Underwater4/connections.inc @@ -1,8 +1,8 @@ -Underwater4_MapConnectionsList: @ 8486DC4 +Underwater4_MapConnectionsList: connection up, 0, MAP_UNDERWATER3 connection emerge, 0, MAP_ROUTE128 -Underwater4_MapConnections: @ 8486DDC - .4byte 0x2 +Underwater4_MapConnections: + .4byte 2 .4byte Underwater4_MapConnectionsList diff --git a/data/maps/Underwater4/events.inc b/data/maps/Underwater4/events.inc index 5a08e82f95..4bdc98caf2 100644 --- a/data/maps/Underwater4/events.inc +++ b/data/maps/Underwater4/events.inc @@ -1,10 +1,10 @@ -Underwater4_MapWarps: @ 852CFEC +Underwater4_MapWarps: warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN -Underwater4_MapBGEvents: @ 852CFF4 +Underwater4_MapBGEvents: bg_hidden_item_event 38, 19, 3, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN bg_hidden_item_event 69, 18, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL -Underwater4_MapEvents:: @ 852D00C +Underwater4_MapEvents:: map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index 804fb1d14a..2b9975a907 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -1,10 +1,10 @@ -Underwater4: @ 8482A84 +Underwater4: .4byte Underwater4_Layout .4byte Underwater4_MapEvents .4byte Underwater4_MapScripts .4byte Underwater4_MapConnections .2byte MUS_DEEPDEEP - .2byte 53 + .2byte LAYOUT_UNDERWATER4 .byte MAPSEC_UNDERWATER_127 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater5/connections.inc b/data/maps/Underwater5/connections.inc index 15a3322edb..c082452d30 100644 --- a/data/maps/Underwater5/connections.inc +++ b/data/maps/Underwater5/connections.inc @@ -1,7 +1,7 @@ -Underwater5_MapConnectionsList: @ 8486DE4 +Underwater5_MapConnectionsList: connection emerge, 0, MAP_ROUTE129 -Underwater5_MapConnections: @ 8486DF0 - .4byte 0x1 +Underwater5_MapConnections: + .4byte 1 .4byte Underwater5_MapConnectionsList diff --git a/data/maps/Underwater5/events.inc b/data/maps/Underwater5/events.inc index 4b902cf963..5b5c58cf47 100644 --- a/data/maps/Underwater5/events.inc +++ b/data/maps/Underwater5/events.inc @@ -1,7 +1,7 @@ -Underwater5_MapWarps: @ 852D020 +Underwater5_MapWarps: warp_def 26, 3, 0, 0, MAP_UNDERWATER_MARINE_CAVE warp_def 32, 21, 0, 0, MAP_UNDERWATER_MARINE_CAVE -Underwater5_MapEvents:: @ 852D030 +Underwater5_MapEvents:: map_events 0x0, Underwater5_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc index 8ad3b5ba28..3466acdf62 100644 --- a/data/maps/Underwater5/header.inc +++ b/data/maps/Underwater5/header.inc @@ -1,10 +1,10 @@ -Underwater5: @ 8482AA0 +Underwater5: .4byte Underwater5_Layout .4byte Underwater5_MapEvents .4byte Underwater5_MapScripts .4byte Underwater5_MapConnections .2byte MUS_DEEPDEEP - .2byte 412 + .2byte LAYOUT_UNDERWATER5 .byte MAPSEC_UNDERWATER_129 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater6/connections.inc b/data/maps/Underwater6/connections.inc index 432ab625f9..8e051ea550 100644 --- a/data/maps/Underwater6/connections.inc +++ b/data/maps/Underwater6/connections.inc @@ -1,7 +1,7 @@ -Underwater6_MapConnectionsList: @ 8486D24 +Underwater6_MapConnectionsList: connection emerge, 0, MAP_ROUTE105 -Underwater6_MapConnections: @ 8486D30 - .4byte 0x1 +Underwater6_MapConnections: + .4byte 1 .4byte Underwater6_MapConnectionsList diff --git a/data/maps/Underwater6/events.inc b/data/maps/Underwater6/events.inc index a624efba39..067bc5561e 100644 --- a/data/maps/Underwater6/events.inc +++ b/data/maps/Underwater6/events.inc @@ -1,7 +1,7 @@ -Underwater6_MapWarps: @ 852D044 +Underwater6_MapWarps: warp_def 13, 4, 0, 0, MAP_UNDERWATER_MARINE_CAVE warp_def 17, 66, 0, 0, MAP_UNDERWATER_MARINE_CAVE -Underwater6_MapEvents:: @ 852D054 +Underwater6_MapEvents:: map_events 0x0, Underwater6_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc index 4e978a1e7f..5683868e27 100644 --- a/data/maps/Underwater6/header.inc +++ b/data/maps/Underwater6/header.inc @@ -1,10 +1,10 @@ -Underwater6: @ 8482ABC +Underwater6: .4byte Underwater6_Layout .4byte Underwater6_MapEvents .4byte Underwater6_MapScripts .4byte Underwater6_MapConnections .2byte MUS_DEEPDEEP - .2byte 410 + .2byte LAYOUT_UNDERWATER6 .byte MAPSEC_UNDERWATER_TERRA_CAVE .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater7/connections.inc b/data/maps/Underwater7/connections.inc index 82803997c1..7113f21e99 100644 --- a/data/maps/Underwater7/connections.inc +++ b/data/maps/Underwater7/connections.inc @@ -1,7 +1,7 @@ -Underwater7_MapConnectionsList: @ 8486D58 +Underwater7_MapConnectionsList: connection emerge, 0, MAP_ROUTE125 -Underwater7_MapConnections: @ 8486D64 - .4byte 0x1 +Underwater7_MapConnections: + .4byte 1 .4byte Underwater7_MapConnectionsList diff --git a/data/maps/Underwater7/events.inc b/data/maps/Underwater7/events.inc index fba9324f6e..d4c2a882a8 100644 --- a/data/maps/Underwater7/events.inc +++ b/data/maps/Underwater7/events.inc @@ -1,7 +1,7 @@ -Underwater7_MapWarps: @ 852D068 +Underwater7_MapWarps: warp_def 22, 10, 0, 0, MAP_UNDERWATER_MARINE_CAVE warp_def 45, 30, 0, 0, MAP_UNDERWATER_MARINE_CAVE -Underwater7_MapEvents:: @ 852D078 +Underwater7_MapEvents:: map_events 0x0, Underwater7_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc index 132eb867ee..a1fa2824c0 100644 --- a/data/maps/Underwater7/header.inc +++ b/data/maps/Underwater7/header.inc @@ -1,10 +1,10 @@ -Underwater7: @ 8482AD8 +Underwater7: .4byte Underwater7_Layout .4byte Underwater7_MapEvents .4byte Underwater7_MapScripts .4byte Underwater7_MapConnections .2byte MUS_DEEPDEEP - .2byte 411 + .2byte LAYOUT_UNDERWATER7 .byte MAPSEC_UNDERWATER_UNK1 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater_MarineCave/events.inc b/data/maps/Underwater_MarineCave/events.inc index 685abaa163..b0da76440e 100644 --- a/data/maps/Underwater_MarineCave/events.inc +++ b/data/maps/Underwater_MarineCave/events.inc @@ -1,6 +1,6 @@ -Underwater_MarineCave_MapWarps: @ 85377B0 +Underwater_MarineCave_MapWarps: warp_def 9, 8, 0, 127, MAP_NONE -Underwater_MarineCave_MapEvents:: @ 85377B8 +Underwater_MarineCave_MapEvents:: map_events 0x0, Underwater_MarineCave_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc index 88fe213abd..1cc75bd542 100644 --- a/data/maps/Underwater_MarineCave/header.inc +++ b/data/maps/Underwater_MarineCave/header.inc @@ -1,10 +1,10 @@ -Underwater_MarineCave: @ 84849CC +Underwater_MarineCave: .4byte Underwater_MarineCave_Layout .4byte Underwater_MarineCave_MapEvents .4byte Underwater_MarineCave_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 406 + .2byte LAYOUT_UNDERWATER_MARINE_CAVE .byte MAPSEC_UNDERWATER_MARINE_CAVE .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater_Route134/events.inc b/data/maps/Underwater_Route134/events.inc index 3a5219511c..a514ccf725 100644 --- a/data/maps/Underwater_Route134/events.inc +++ b/data/maps/Underwater_Route134/events.inc @@ -1,6 +1,6 @@ -Underwater_Route134_MapWarps: @ 8536D44 +Underwater_Route134_MapWarps: warp_def 8, 8, 0, 0, MAP_UNDERWATER_SEALED_CHAMBER -Underwater_Route134_MapEvents:: @ 8536D4C +Underwater_Route134_MapEvents:: map_events 0x0, Underwater_Route134_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index 591dffa534..07d1bcd8e7 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -1,10 +1,10 @@ -Underwater_Route134: @ 848464C +Underwater_Route134: .4byte Underwater_Route134_Layout .4byte Underwater_Route134_MapEvents .4byte Underwater_Route134_MapScripts .4byte 0x0 .2byte MUS_DEEPDEEP - .2byte 282 + .2byte LAYOUT_UNDERWATER_ROUTE134 .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater_SeafloorCavern/events.inc b/data/maps/Underwater_SeafloorCavern/events.inc index 468dedcd67..d4c212a19b 100644 --- a/data/maps/Underwater_SeafloorCavern/events.inc +++ b/data/maps/Underwater_SeafloorCavern/events.inc @@ -1,12 +1,12 @@ -Underwater_SeafloorCavern_EventObjects: @ 8535640 +Underwater_SeafloorCavern_EventObjects: object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE -Underwater_SeafloorCavern_MapWarps: @ 85356A0 +Underwater_SeafloorCavern_MapWarps: warp_def 6, 7, 0, 0, MAP_UNDERWATER4 -Underwater_SeafloorCavern_MapEvents:: @ 85356A8 +Underwater_SeafloorCavern_MapEvents:: map_events Underwater_SeafloorCavern_EventObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index 08eac747cf..0df694b901 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -1,10 +1,10 @@ -Underwater_SeafloorCavern: @ 8484198 +Underwater_SeafloorCavern: .4byte Underwater_SeafloorCavern_Layout .4byte Underwater_SeafloorCavern_MapEvents .4byte Underwater_SeafloorCavern_MapScripts .4byte 0x0 .2byte MUS_DEEPDEEP - .2byte 146 + .2byte LAYOUT_UNDERWATER_SEAFLOOR_CAVERN .byte MAPSEC_UNDERWATER_128 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater_SealedChamber/events.inc b/data/maps/Underwater_SealedChamber/events.inc index e0bb196429..e8b93885a5 100644 --- a/data/maps/Underwater_SealedChamber/events.inc +++ b/data/maps/Underwater_SealedChamber/events.inc @@ -1,9 +1,9 @@ -Underwater_SealedChamber_MapWarps: @ 8536D60 +Underwater_SealedChamber_MapWarps: warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134 -Underwater_SealedChamber_MapBGEvents: @ 8536D68 +Underwater_SealedChamber_MapBGEvents: bg_event 12, 43, 0, BG_EVENT_PLAYER_FACING_ANY, Underwater_SealedChamber_EventScript_2390FC -Underwater_SealedChamber_MapEvents:: @ 8536D74 +Underwater_SealedChamber_MapEvents:: map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index 94fcc6ba74..f7117f905d 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -1,10 +1,10 @@ -Underwater_SealedChamber: @ 8484668 +Underwater_SealedChamber: .4byte Underwater_SealedChamber_Layout .4byte Underwater_SealedChamber_MapEvents .4byte Underwater_SealedChamber_MapScripts .4byte 0x0 .2byte MUS_DEEPDEEP - .2byte 283 + .2byte LAYOUT_UNDERWATER_SEALED_CHAMBER .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater_SootopolisCity/events.inc b/data/maps/Underwater_SootopolisCity/events.inc index 78839e8a1c..3829ecb103 100644 --- a/data/maps/Underwater_SootopolisCity/events.inc +++ b/data/maps/Underwater_SootopolisCity/events.inc @@ -1,7 +1,7 @@ -Underwater_SootopolisCity_MapWarps: @ 8534330 +Underwater_SootopolisCity_MapWarps: warp_def 9, 8, 0, 0, MAP_UNDERWATER2 warp_def 10, 8, 0, 0, MAP_UNDERWATER2 -Underwater_SootopolisCity_MapEvents:: @ 8534340 +Underwater_SootopolisCity_MapEvents:: map_events 0x0, Underwater_SootopolisCity_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index 1611026e01..31caf4011f 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -1,10 +1,10 @@ -Underwater_SootopolisCity: @ 8483F4C +Underwater_SootopolisCity: .4byte Underwater_SootopolisCity_Layout .4byte Underwater_SootopolisCity_MapEvents .4byte Underwater_SootopolisCity_MapScripts .4byte 0x0 .2byte MUS_DEEPDEEP - .2byte 130 + .2byte LAYOUT_UNDERWATER_SOOTOPOLIS_CITY .byte MAPSEC_UNDERWATER_SOOTOPOLIS .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/UnionRoom/events.inc b/data/maps/UnionRoom/events.inc index 3ab6144685..c78b86eece 100644 --- a/data/maps/UnionRoom/events.inc +++ b/data/maps/UnionRoom/events.inc @@ -1,4 +1,4 @@ -UnionRoom_EventObjects: @ 853B020 +UnionRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0 object_event 2, EVENT_OBJ_GFX_VAR_3, 0, 1, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D204, FLAG_HIDE_UNION_ROOM_PLAYER_4 object_event 3, EVENT_OBJ_GFX_VAR_7, 0, 7, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, FLAG_HIDE_UNION_ROOM_PLAYER_8 @@ -9,10 +9,10 @@ UnionRoom_EventObjects: @ 853B020 object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 13, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, FLAG_HIDE_UNION_ROOM_PLAYER_2 object_event 9, EVENT_OBJ_GFX_VAR_0, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, FLAG_HIDE_UNION_ROOM_PLAYER_1 -UnionRoom_MapWarps: @ 853B0F8 +UnionRoom_MapWarps: warp_def 7, 11, 3, 127, MAP_NONE warp_def 8, 11, 3, 127, MAP_NONE -UnionRoom_MapEvents:: @ 853B108 +UnionRoom_MapEvents:: map_events UnionRoom_EventObjects, UnionRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc index 29fd3cc3fa..cc7e1c3d1d 100644 --- a/data/maps/UnionRoom/header.inc +++ b/data/maps/UnionRoom/header.inc @@ -1,10 +1,10 @@ -UnionRoom: @ 8485120 +UnionRoom: .4byte UnionRoom_Layout .4byte UnionRoom_MapEvents .4byte UnionRoom_MapScripts .4byte 0x0 .2byte MUS_RAINBOW - .2byte 393 + .2byte LAYOUT_UNION_ROOM .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index aa4ffc0cdc..0520cd58aa 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -1,10 +1,10 @@ -UnknownMap_25_29: @ 8484DBC +UnknownMap_25_29: .4byte UnknownMap_25_29_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI - .2byte 226 + .2byte LAYOUT_UNKNOWN_MAP_25_29 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 86e2d4f704..ed085f46e2 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -1,10 +1,10 @@ -UnknownMap_25_30: @ 8484DD8 +UnknownMap_25_30: .4byte UnknownMap_25_30_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI - .2byte 227 + .2byte LAYOUT_UNKNOWN_MAP_25_30 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index 78ede2d656..fde407fb83 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -1,10 +1,10 @@ -UnknownMap_25_31: @ 8484DF4 +UnknownMap_25_31: .4byte UnknownMap_25_31_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI - .2byte 228 + .2byte LAYOUT_UNKNOWN_MAP_25_31 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index 8265281193..1f0655d54c 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -1,10 +1,10 @@ -UnknownMap_25_32: @ 8484E10 +UnknownMap_25_32: .4byte UnknownMap_25_32_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI - .2byte 229 + .2byte LAYOUT_UNKNOWN_MAP_25_32 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index 99502bb0fe..71f5d3523a 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -1,10 +1,10 @@ -UnknownMap_25_33: @ 8484E2C +UnknownMap_25_33: .4byte UnknownMap_25_33_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI - .2byte 230 + .2byte LAYOUT_UNKNOWN_MAP_25_33 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index 6e95a82224..8fc47f9389 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -1,10 +1,10 @@ -UnknownMap_25_34: @ 8484E48 +UnknownMap_25_34: .4byte UnknownMap_25_34_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI - .2byte 231 + .2byte LAYOUT_UNKNOWN_MAP_25_34 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown/connections.inc b/data/maps/VerdanturfTown/connections.inc index de6fdface3..805bab59e6 100644 --- a/data/maps/VerdanturfTown/connections.inc +++ b/data/maps/VerdanturfTown/connections.inc @@ -1,8 +1,8 @@ -VerdanturfTown_MapConnectionsList: @ 8486694 +VerdanturfTown_MapConnectionsList: connection up, -80, MAP_ROUTE116 connection right, 0, MAP_ROUTE117 -VerdanturfTown_MapConnections: @ 84866AC - .4byte 0x2 +VerdanturfTown_MapConnections: + .4byte 2 .4byte VerdanturfTown_MapConnectionsList diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc index 971ad87c4c..d5e99eeceb 100644 --- a/data/maps/VerdanturfTown/events.inc +++ b/data/maps/VerdanturfTown/events.inc @@ -1,10 +1,10 @@ -VerdanturfTown_EventObjects: @ 8527CDC +VerdanturfTown_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0 object_event 2, EVENT_OBJ_GFX_TWIN, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 11, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0 object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0 -VerdanturfTown_MapWarps: @ 8527D3C +VerdanturfTown_MapWarps: warp_def 3, 7, 0, 0, MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY warp_def 12, 3, 0, 0, MAP_VERDANTURF_TOWN_MART warp_def 16, 3, 0, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F @@ -13,7 +13,7 @@ VerdanturfTown_MapWarps: @ 8527D3C warp_def 1, 14, 0, 0, MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE warp_def 17, 15, 0, 0, MAP_VERDANTURF_TOWN_HOUSE -VerdanturfTown_MapBGEvents: @ 8527D74 +VerdanturfTown_MapBGEvents: bg_event 14, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E6A bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5D9 bg_event 17, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E73 @@ -23,6 +23,6 @@ VerdanturfTown_MapBGEvents: @ 8527D74 bg_event 1, 8, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5EB bg_event 7, 3, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5F4 -VerdanturfTown_MapEvents:: @ 8527DD4 +VerdanturfTown_MapEvents:: map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index 053a587129..c2e0109f60 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown: @ 8482640 +VerdanturfTown: .4byte VerdanturfTown_Layout .4byte VerdanturfTown_MapEvents .4byte VerdanturfTown_MapScripts .4byte VerdanturfTown_MapConnections .2byte MUS_GOMACHI0 - .2byte 15 + .2byte LAYOUT_VERDANTURF_TOWN .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc index ee91fff2ca..fb424a0560 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc @@ -1,8 +1,8 @@ -VerdanturfTown_BattleTentBattleRoom_EventObjects: @ 852E734 +VerdanturfTown_BattleTentBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 11, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 -VerdanturfTown_BattleTentBattleRoom_MapEvents:: @ 852E77C +VerdanturfTown_BattleTentBattleRoom_MapEvents:: map_events VerdanturfTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc index 8a95c60a30..af844405ef 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_BattleTentBattleRoom: @ 8482E90 +VerdanturfTown_BattleTentBattleRoom: .4byte VerdanturfTown_BattleTentBattleRoom_Layout .4byte VerdanturfTown_BattleTentBattleRoom_MapEvents .4byte VerdanturfTown_BattleTentBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 387 + .2byte LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc index d0ca880efe..b5a8f71fb2 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc @@ -1,6 +1,6 @@ -VerdanturfTown_BattleTentCorridor_EventObjects: @ 852E708 +VerdanturfTown_BattleTentCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -VerdanturfTown_BattleTentCorridor_MapEvents:: @ 852E720 +VerdanturfTown_BattleTentCorridor_MapEvents:: map_events VerdanturfTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc index 5aa6fcc464..49e27d7f5f 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_BattleTentCorridor: @ 8482E74 +VerdanturfTown_BattleTentCorridor: .4byte BattleTentCorridor_Layout .4byte VerdanturfTown_BattleTentCorridor_MapEvents .4byte VerdanturfTown_BattleTentCorridor_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 385 + .2byte LAYOUT_BATTLE_TENT_CORRIDOR .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_BattleTentLobby/events.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc index 1dfb49dd92..68ee1322fa 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/events.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/events.inc @@ -1,4 +1,4 @@ -VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648 +VerdanturfTown_BattleTentLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0 object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0 object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 9, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0 @@ -6,13 +6,13 @@ VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648 object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, FLAG_HIDE_VERDANTURF_TOWN_SCOTT object_event 6, EVENT_OBJ_GFX_LITTLE_BOY, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0 -VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8 +VerdanturfTown_BattleTentLobby_MapWarps: warp_def 6, 9, 0, 0, MAP_VERDANTURF_TOWN warp_def 7, 9, 0, 0, MAP_VERDANTURF_TOWN -VerdanturfTown_BattleTentLobby_MapBGEvents: @ 852E6E8 +VerdanturfTown_BattleTentLobby_MapBGEvents: bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_BattleTentLobby_EventScript_201B02 -VerdanturfTown_BattleTentLobby_MapEvents:: @ 852E6F4 +VerdanturfTown_BattleTentLobby_MapEvents:: map_events VerdanturfTown_BattleTentLobby_EventObjects, VerdanturfTown_BattleTentLobby_MapWarps, 0x0, VerdanturfTown_BattleTentLobby_MapBGEvents diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc index 3f3eb1ae6f..012f55ec9b 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_BattleTentLobby: @ 8482E58 +VerdanturfTown_BattleTentLobby: .4byte BattleTentLobby_Layout .4byte VerdanturfTown_BattleTentLobby_MapEvents .4byte VerdanturfTown_BattleTentLobby_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 384 + .2byte LAYOUT_BATTLE_TENT_LOBBY .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc index 990bcd1f69..8d15647d63 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc @@ -1,11 +1,11 @@ -VerdanturfTown_FriendshipRatersHouse_EventObjects: @ 852E9C8 +VerdanturfTown_FriendshipRatersHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0 object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0 -VerdanturfTown_FriendshipRatersHouse_MapWarps: @ 852E9F8 +VerdanturfTown_FriendshipRatersHouse_MapWarps: warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN warp_def 4, 7, 0, 5, MAP_VERDANTURF_TOWN -VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 852EA08 +VerdanturfTown_FriendshipRatersHouse_MapEvents:: map_events VerdanturfTown_FriendshipRatersHouse_EventObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 43148f8efa..512004a3e0 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_FriendshipRatersHouse: @ 8482F1C +VerdanturfTown_FriendshipRatersHouse: .4byte House2_Layout .4byte VerdanturfTown_FriendshipRatersHouse_MapEvents .4byte VerdanturfTown_FriendshipRatersHouse_MapScripts .4byte 0x0 .2byte MUS_GOMACHI0 - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_House/events.inc b/data/maps/VerdanturfTown_House/events.inc index d714aa8a0c..a5f61b86f6 100644 --- a/data/maps/VerdanturfTown_House/events.inc +++ b/data/maps/VerdanturfTown_House/events.inc @@ -1,11 +1,11 @@ -VerdanturfTown_House_EventObjects: @ 852EA1C +VerdanturfTown_House_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0 -VerdanturfTown_House_MapWarps: @ 852EA4C +VerdanturfTown_House_MapWarps: warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN warp_def 4, 8, 0, 6, MAP_VERDANTURF_TOWN -VerdanturfTown_House_MapEvents:: @ 852EA5C +VerdanturfTown_House_MapEvents:: map_events VerdanturfTown_House_EventObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index 5c3e26d09c..910126e298 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_House: @ 8482F38 +VerdanturfTown_House: .4byte House1_Layout .4byte VerdanturfTown_House_MapEvents .4byte VerdanturfTown_House_MapScripts .4byte 0x0 .2byte MUS_GOMACHI0 - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_Mart/events.inc b/data/maps/VerdanturfTown_Mart/events.inc index 9ae237dc87..79e731fe4c 100644 --- a/data/maps/VerdanturfTown_Mart/events.inc +++ b/data/maps/VerdanturfTown_Mart/events.inc @@ -1,13 +1,13 @@ -VerdanturfTown_Mart_EventObjects: @ 852E790 +VerdanturfTown_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0 object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0 object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0 -VerdanturfTown_Mart_MapWarps: @ 852E7F0 +VerdanturfTown_Mart_MapWarps: warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN warp_def 4, 7, 0, 1, MAP_VERDANTURF_TOWN -VerdanturfTown_Mart_MapEvents:: @ 852E800 +VerdanturfTown_Mart_MapEvents:: map_events VerdanturfTown_Mart_EventObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index 0441f81477..e04be5fd60 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_Mart: @ 8482EAC +VerdanturfTown_Mart: .4byte Mart_Layout .4byte VerdanturfTown_Mart_MapEvents .4byte VerdanturfTown_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc index 246270361b..47449cd1b7 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -VerdanturfTown_PokemonCenter_1F_EventObjects: @ 852E814 +VerdanturfTown_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0 object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0 -VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874 +VerdanturfTown_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN warp_def 6, 8, 3, 2, MAP_VERDANTURF_TOWN warp_def 1, 6, 4, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F -VerdanturfTown_PokemonCenter_1F_MapEvents:: @ 852E88C +VerdanturfTown_PokemonCenter_1F_MapEvents:: map_events VerdanturfTown_PokemonCenter_1F_EventObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index e1d7d3fa8b..e2adc24a40 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_PokemonCenter_1F: @ 8482EC8 +VerdanturfTown_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte VerdanturfTown_PokemonCenter_1F_MapEvents .4byte VerdanturfTown_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc index e3e959838f..a4e13db36e 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -VerdanturfTown_PokemonCenter_2F_EventObjects: @ 852E8A0 +VerdanturfTown_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900 +VerdanturfTown_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 852E918 +VerdanturfTown_PokemonCenter_2F_MapEvents:: map_events VerdanturfTown_PokemonCenter_2F_EventObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index 933a3da18e..d64084b534 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_PokemonCenter_2F: @ 8482EE4 +VerdanturfTown_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte VerdanturfTown_PokemonCenter_2F_MapEvents .4byte VerdanturfTown_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_WandasHouse/events.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc index f8d6f4db51..940417c7a1 100644 --- a/data/maps/VerdanturfTown_WandasHouse/events.inc +++ b/data/maps/VerdanturfTown_WandasHouse/events.inc @@ -1,14 +1,14 @@ -VerdanturfTown_WandasHouse_EventObjects: @ 852E92C +VerdanturfTown_WandasHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN -VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4 +VerdanturfTown_WandasHouse_MapWarps: warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN warp_def 8, 7, 0, 3, MAP_VERDANTURF_TOWN -VerdanturfTown_WandasHouse_MapEvents:: @ 852E9B4 +VerdanturfTown_WandasHouse_MapEvents:: map_events VerdanturfTown_WandasHouse_EventObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index 573fe6f76e..bb285600f9 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_WandasHouse: @ 8482F00 +VerdanturfTown_WandasHouse: .4byte VerdanturfTown_WandasHouse_Layout .4byte VerdanturfTown_WandasHouse_MapEvents .4byte VerdanturfTown_WandasHouse_MapScripts .4byte 0x0 .2byte MUS_GOMACHI0 - .2byte 76 + .2byte LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc index 05cafcc48b..1e34108edf 100644 --- a/data/maps/VictoryRoad_1F/events.inc +++ b/data/maps/VictoryRoad_1F/events.inc @@ -1,4 +1,4 @@ -VictoryRoad_1F_EventObjects: @ 8535E04 +VictoryRoad_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 33, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 15, 4, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 27, 34, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0 @@ -9,20 +9,20 @@ VictoryRoad_1F_EventObjects: @ 8535E04 object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 29, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0 object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 32, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0 -VictoryRoad_1F_MapWarps: @ 8535EDC +VictoryRoad_1F_MapWarps: warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY warp_def 39, 5, 3, 3, MAP_EVER_GRANDE_CITY warp_def 21, 32, 3, 5, MAP_VICTORY_ROAD_B1F warp_def 42, 38, 4, 2, MAP_VICTORY_ROAD_B1F warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F -VictoryRoad_1F_MapCoordEvents: @ 8535F04 +VictoryRoad_1F_MapCoordEvents: coord_event 2, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DAF coord_event 3, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DC8 -VictoryRoad_1F_MapBGEvents: @ 8535F24 +VictoryRoad_1F_MapBGEvents: bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL -VictoryRoad_1F_MapEvents:: @ 8535F30 +VictoryRoad_1F_MapEvents:: map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 950f26aa5d..eb1e53c9b7 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -1,10 +1,10 @@ -VictoryRoad_1F: @ 8484374 +VictoryRoad_1F: .4byte VictoryRoad_1F_Layout .4byte VictoryRoad_1F_MapEvents .4byte VictoryRoad_1F_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 163 + .2byte LAYOUT_VICTORY_ROAD_1F .byte MAPSEC_VICTORY_ROAD .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VictoryRoad_B1F/events.inc b/data/maps/VictoryRoad_B1F/events.inc index 814d8a73db..35c4fe4285 100644 --- a/data/maps/VictoryRoad_B1F/events.inc +++ b/data/maps/VictoryRoad_B1F/events.inc @@ -1,4 +1,4 @@ -VictoryRoad_B1F_EventObjects: @ 8535F44 +VictoryRoad_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_13 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_14 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_11 @@ -21,7 +21,7 @@ VictoryRoad_B1F_EventObjects: @ 8535F44 object_event 20, EVENT_OBJ_GFX_MAN_3, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0 object_event 21, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, VictoryRoad_B1F_EventScript_236541, 0 -VictoryRoad_B1F_MapWarps: @ 853613C +VictoryRoad_B1F_MapWarps: warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F warp_def 17, 16, 3, 2, MAP_VICTORY_ROAD_B2F warp_def 42, 25, 3, 3, MAP_VICTORY_ROAD_1F @@ -30,6 +30,6 @@ VictoryRoad_B1F_MapWarps: @ 853613C warp_def 20, 21, 3, 2, MAP_VICTORY_ROAD_1F warp_def 5, 26, 3, 3, MAP_VICTORY_ROAD_B2F -VictoryRoad_B1F_MapEvents:: @ 8536174 +VictoryRoad_B1F_MapEvents:: map_events VictoryRoad_B1F_EventObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index d89408de9d..cc0064fd67 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -1,10 +1,10 @@ -VictoryRoad_B1F: @ 8484390 +VictoryRoad_B1F: .4byte VictoryRoad_B1F_Layout .4byte VictoryRoad_B1F_MapEvents .4byte VictoryRoad_B1F_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 285 + .2byte LAYOUT_VICTORY_ROAD_B1F .byte MAPSEC_VICTORY_ROAD .byte 1 .byte WEATHER_NONE diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc index 1ad4f3e503..0bc77cade5 100644 --- a/data/maps/VictoryRoad_B2F/events.inc +++ b/data/maps/VictoryRoad_B2F/events.inc @@ -1,4 +1,4 @@ -VictoryRoad_B2F_EventObjects: @ 8536188 +VictoryRoad_B2F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 43, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236903, 0 @@ -7,16 +7,16 @@ VictoryRoad_B2F_EventObjects: @ 8536188 object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 25, 18, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236948, 0 object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 25, 21, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236931, 0 -VictoryRoad_B2F_MapWarps: @ 8536230 +VictoryRoad_B2F_MapWarps: warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F warp_def 43, 2, 3, 3, MAP_VICTORY_ROAD_B1F warp_def 19, 12, 3, 1, MAP_VICTORY_ROAD_B1F warp_def 5, 26, 3, 6, MAP_VICTORY_ROAD_B1F -VictoryRoad_B2F_MapBGEvents: @ 8536250 +VictoryRoad_B2F_MapBGEvents: bg_hidden_item_event 28, 5, 3, ITEM_ELIXIR, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL -VictoryRoad_B2F_MapEvents:: @ 8536268 +VictoryRoad_B2F_MapEvents:: map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index 462898c2b3..0af51f9717 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -1,10 +1,10 @@ -VictoryRoad_B2F: @ 84843AC +VictoryRoad_B2F: .4byte VictoryRoad_B2F_Layout .4byte VictoryRoad_B2F_MapEvents .4byte VictoryRoad_B2F_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 286 + .2byte LAYOUT_VICTORY_ROAD_B2F .byte MAPSEC_VICTORY_ROAD .byte 1 .byte WEATHER_NONE diff --git a/include/constants/layouts.h b/include/constants/layouts.h new file mode 100755 index 0000000000..d12db9b33f --- /dev/null +++ b/include/constants/layouts.h @@ -0,0 +1,446 @@ +#ifndef GUARD_CONSTANTS_LAYOUTS_H +#define GUARD_CONSTANTS_LAYOUTS_H + +#define LAYOUT_PETALBURG_CITY 1 +#define LAYOUT_SLATEPORT_CITY 2 +#define LAYOUT_MAUVILLE_CITY 3 +#define LAYOUT_RUSTBORO_CITY 4 +#define LAYOUT_FORTREE_CITY 5 +#define LAYOUT_LILYCOVE_CITY 6 +#define LAYOUT_MOSSDEEP_CITY 7 +#define LAYOUT_SOOTOPOLIS_CITY 8 +#define LAYOUT_EVER_GRANDE_CITY 9 +#define LAYOUT_LITTLEROOT_TOWN 10 +#define LAYOUT_OLDALE_TOWN 11 +#define LAYOUT_DEWFORD_TOWN 12 +#define LAYOUT_LAVARIDGE_TOWN 13 +#define LAYOUT_FALLARBOR_TOWN 14 +#define LAYOUT_VERDANTURF_TOWN 15 +#define LAYOUT_PACIFIDLOG_TOWN 16 +#define LAYOUT_ROUTE101 17 +#define LAYOUT_ROUTE102 18 +#define LAYOUT_ROUTE103 19 +#define LAYOUT_ROUTE104 20 +#define LAYOUT_ROUTE105 21 +#define LAYOUT_ROUTE106 22 +#define LAYOUT_ROUTE107 23 +#define LAYOUT_ROUTE108 24 +#define LAYOUT_ROUTE109 25 +#define LAYOUT_ROUTE110 26 +#define LAYOUT_ROUTE111 27 +#define LAYOUT_ROUTE112 28 +#define LAYOUT_ROUTE113 29 +#define LAYOUT_ROUTE114 30 +#define LAYOUT_ROUTE115 31 +#define LAYOUT_ROUTE116 32 +#define LAYOUT_ROUTE117 33 +#define LAYOUT_ROUTE118 34 +#define LAYOUT_ROUTE119 35 +#define LAYOUT_ROUTE120 36 +#define LAYOUT_ROUTE121 37 +#define LAYOUT_ROUTE122 38 +#define LAYOUT_ROUTE123 39 +#define LAYOUT_ROUTE124 40 +#define LAYOUT_ROUTE125 41 +#define LAYOUT_ROUTE126 42 +#define LAYOUT_ROUTE127 43 +#define LAYOUT_ROUTE128 44 +#define LAYOUT_ROUTE129 45 +#define LAYOUT_UNKNOWN_MAP_08417FC4 46 +#define LAYOUT_ROUTE131 47 +#define LAYOUT_ROUTE132 48 +#define LAYOUT_ROUTE133 49 +#define LAYOUT_ROUTE134 50 +#define LAYOUT_UNDERWATER2 51 +#define LAYOUT_UNDERWATER3 52 +#define LAYOUT_UNDERWATER4 53 +#define LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F 54 +#define LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F 55 +#define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F 56 +#define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F 57 +#define LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB 58 +#define LAYOUT_HOUSE1 59 +#define LAYOUT_HOUSE2 60 +#define LAYOUT_POKEMON_CENTER_1F 61 +#define LAYOUT_POKEMON_CENTER_2F 62 +#define LAYOUT_MART 63 +#define LAYOUT_HOUSE3 64 +#define LAYOUT_DEWFORD_TOWN_GYM 65 +#define LAYOUT_DEWFORD_TOWN_HALL 66 +#define LAYOUT_HOUSE4 67 +#define LAYOUT_LAVARIDGE_TOWN_HERB_SHOP 68 +#define LAYOUT_LAVARIDGE_TOWN_GYM_1F 69 +#define LAYOUT_LAVARIDGE_TOWN_GYM_B1F 70 +#define LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F 71 +#define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_LOBBY 72 +#define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_HALL 73 +#define LAYOUT_LILYCOVE_CITY_HOUSE2 74 +#define LAYOUT_UNKNOWN_MAP_08428450 75 +#define LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE 76 +#define LAYOUT_PACIFIDLOG_TOWN_HOUSE1 77 +#define LAYOUT_PACIFIDLOG_TOWN_HOUSE2 78 +#define LAYOUT_PETALBURG_CITY_GYM 79 +#define LAYOUT_HOUSE_WITH_BED 80 +#define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F 81 +#define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F 82 +#define LAYOUT_UNKNOWN_MAP_084294C4 83 +#define LAYOUT_UNKNOWN_MAP_084294E8 84 +#define LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB 85 +#define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F 86 +#define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F 87 +#define LAYOUT_HARBOR 88 +#define LAYOUT_MAUVILLE_CITY_GYM 89 +#define LAYOUT_MAUVILLE_CITY_BIKE_SHOP 90 +#define LAYOUT_MAUVILLE_CITY_GAME_CORNER 91 +#define LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F 92 +#define LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F 93 +#define LAYOUT_RUSTBORO_CITY_GYM 94 +#define LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL 95 +#define LAYOUT_RUSTBORO_CITY_HOUSE 96 +#define LAYOUT_RUSTBORO_CITY_HOUSE1 97 +#define LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE 98 +#define LAYOUT_FORTREE_CITY_HOUSE1 99 +#define LAYOUT_FORTREE_CITY_GYM 100 +#define LAYOUT_FORTREE_CITY_HOUSE2 101 +#define LAYOUT_ROUTE104_MR_BRINEYS_HOUSE 102 +#define LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F 103 +#define LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F 104 +#define LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY 105 +#define LAYOUT_LILYCOVE_CITY_CONTEST_HALL 106 +#define LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB 107 +#define LAYOUT_MOSSDEEP_CITY_GYM 108 +#define LAYOUT_SOOTOPOLIS_CITY_GYM_1F 109 +#define LAYOUT_SOOTOPOLIS_CITY_GYM_B1F 110 +#define LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM 111 +#define LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM 112 +#define LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM 113 +#define LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM 114 +#define LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM 115 +#define LAYOUT_EVER_GRANDE_CITY_SHORT_HALL 116 +#define LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP 117 +#define LAYOUT_CABLE_CAR_STATION 118 +#define LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE 119 +#define LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL 120 +#define LAYOUT_ROUTE114_LANETTES_HOUSE 121 +#define LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE 122 +#define LAYOUT_ROUTE117_POKEMON_DAY_CARE 123 +#define LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE 124 +#define LAYOUT_METEOR_FALLS_1F_1R 125 +#define LAYOUT_METEOR_FALLS_1F_2R 126 +#define LAYOUT_METEOR_FALLS_B1F_1R 127 +#define LAYOUT_METEOR_FALLS_B1F_2R 128 +#define LAYOUT_RUSTURF_TUNNEL 129 +#define LAYOUT_UNDERWATER_SOOTOPOLIS_CITY 130 +#define LAYOUT_DESERT_RUINS 131 +#define LAYOUT_GRANITE_CAVE_1F 132 +#define LAYOUT_GRANITE_CAVE_B1F 133 +#define LAYOUT_GRANITE_CAVE_B2F 134 +#define LAYOUT_PETALBURG_WOODS 135 +#define LAYOUT_MT_CHIMNEY 136 +#define LAYOUT_MT_PYRE_1F 137 +#define LAYOUT_MT_PYRE_2F 138 +#define LAYOUT_MT_PYRE_3F 139 +#define LAYOUT_MT_PYRE_4F 140 +#define LAYOUT_MT_PYRE_5F 141 +#define LAYOUT_MT_PYRE_6F 142 +#define LAYOUT_AQUA_HIDEOUT_1F 143 +#define LAYOUT_AQUA_HIDEOUT_B1F 144 +#define LAYOUT_AQUA_HIDEOUT_B2F 145 +#define LAYOUT_UNDERWATER_SEAFLOOR_CAVERN 146 +#define LAYOUT_SEAFLOOR_CAVERN_ENTRANCE 147 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM1 148 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM2 149 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM3 150 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM4 151 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM5 152 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM6 153 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM7 154 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM8 155 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM9 156 +#define LAYOUT_CAVE_OF_ORIGIN_ENTRANCE 157 +#define LAYOUT_CAVE_OF_ORIGIN_1F 158 +#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 159 +#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 160 +#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 161 +#define LAYOUT_CAVE_OF_ORIGIN_B1F 162 +#define LAYOUT_VICTORY_ROAD_1F 163 +#define LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM 164 +#define LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM 165 +#define LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM 166 +#define LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM 167 +#define LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM 168 +#define LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM 169 +#define LAYOUT_UNKNOWN_MAP_0843E6C0 170 +#define LAYOUT_UNKNOWN_MAP_0843E6E4 171 +#define LAYOUT_UNKNOWN_MAP_0843E708 172 +#define LAYOUT_UNKNOWN_MAP_0843E72C 173 +#define LAYOUT_UNKNOWN_MAP_0843E750 174 +#define LAYOUT_UNKNOWN_MAP_0843E774 175 +#define LAYOUT_UNKNOWN_MAP_0843E798 176 +#define LAYOUT_UNKNOWN_MAP_0843E7BC 177 +#define LAYOUT_UNKNOWN_MAP_0843E7E0 178 +#define LAYOUT_UNKNOWN_MAP_0843E804 179 +#define LAYOUT_UNKNOWN_MAP_0843E828 180 +#define LAYOUT_UNKNOWN_MAP_0843E84C 181 +#define LAYOUT_UNKNOWN_MAP_0843E870 182 +#define LAYOUT_UNKNOWN_MAP_0843E894 183 +#define LAYOUT_NEW_MAUVILLE_ENTRANCE 184 +#define LAYOUT_NEW_MAUVILLE_INSIDE 185 +#define LAYOUT_ABANDONED_SHIP_DECK 186 +#define LAYOUT_ABANDONED_SHIP_CORRIDORS_1F 187 +#define LAYOUT_ABANDONED_SHIP_ROOMS_1F 188 +#define LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F 189 +#define LAYOUT_ABANDONED_SHIP_ROOMS_B1F 190 +#define LAYOUT_ABANDONED_SHIP_ROOMS2_B1F 191 +#define LAYOUT_ABANDONED_SHIP_UNDERWATER1 192 +#define LAYOUT_ABANDONED_SHIP_ROOM_B1F 193 +#define LAYOUT_ABANDONED_SHIP_ROOMS2_1F 194 +#define LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE 195 +#define LAYOUT_ABANDONED_SHIP_UNDERWATER2 196 +#define LAYOUT_SECRET_BASE_RED_CAVE1 197 +#define LAYOUT_SECRET_BASE_BROWN_CAVE1 198 +#define LAYOUT_SECRET_BASE_BLUE_CAVE1 199 +#define LAYOUT_SECRET_BASE_YELLOW_CAVE1 200 +#define LAYOUT_SECRET_BASE_TREE1 201 +#define LAYOUT_SECRET_BASE_SHRUB1 202 +#define LAYOUT_SECRET_BASE_RED_CAVE2 203 +#define LAYOUT_SECRET_BASE_BROWN_CAVE2 204 +#define LAYOUT_SECRET_BASE_BLUE_CAVE2 205 +#define LAYOUT_SECRET_BASE_YELLOW_CAVE2 206 +#define LAYOUT_SECRET_BASE_TREE2 207 +#define LAYOUT_SECRET_BASE_SHRUB2 208 +#define LAYOUT_SECRET_BASE_RED_CAVE3 209 +#define LAYOUT_SECRET_BASE_BROWN_CAVE3 210 +#define LAYOUT_SECRET_BASE_BLUE_CAVE3 211 +#define LAYOUT_SECRET_BASE_YELLOW_CAVE3 212 +#define LAYOUT_SECRET_BASE_TREE3 213 +#define LAYOUT_SECRET_BASE_SHRUB3 214 +#define LAYOUT_SECRET_BASE_RED_CAVE4 215 +#define LAYOUT_SECRET_BASE_BROWN_CAVE4 216 +#define LAYOUT_SECRET_BASE_BLUE_CAVE4 217 +#define LAYOUT_SECRET_BASE_YELLOW_CAVE4 218 +#define LAYOUT_SECRET_BASE_TREE4 219 +#define LAYOUT_SECRET_BASE_SHRUB4 220 +#define LAYOUT_SINGLE_BATTLE_COLOSSEUM 221 +#define LAYOUT_TRADE_CENTER 222 +#define LAYOUT_RECORD_CORNER 223 +#define LAYOUT_DOUBLE_BATTLE_COLOSSEUM 224 +#define LAYOUT_LINK_CONTEST_ROOM1 225 +#define LAYOUT_UNKNOWN_MAP_25_29 226 +#define LAYOUT_UNKNOWN_MAP_25_30 227 +#define LAYOUT_UNKNOWN_MAP_25_31 228 +#define LAYOUT_UNKNOWN_MAP_25_32 229 +#define LAYOUT_UNKNOWN_MAP_25_33 230 +#define LAYOUT_UNKNOWN_MAP_25_34 231 +#define LAYOUT_LINK_CONTEST_ROOM2 232 +#define LAYOUT_LINK_CONTEST_ROOM3 233 +#define LAYOUT_LINK_CONTEST_ROOM4 234 +#define LAYOUT_LINK_CONTEST_ROOM5 235 +#define LAYOUT_LINK_CONTEST_ROOM6 236 +#define LAYOUT_INSIDE_OF_TRUCK 237 +#define LAYOUT_SAFARI_ZONE_NORTHWEST 238 +#define LAYOUT_SAFARI_ZONE_NORTH 239 +#define LAYOUT_SAFARI_ZONE_SOUTHWEST 240 +#define LAYOUT_SAFARI_ZONE_SOUTH 241 +#define LAYOUT_UNKNOWN_MAP_08447028 242 +#define LAYOUT_ROUTE109_SEASHORE_HOUSE 243 +#define LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE 244 +#define LAYOUT_ROUTE110_TRICK_HOUSE_END 245 +#define LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR 246 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1 247 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2 248 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3 249 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4 250 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5 251 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6 252 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7 253 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8 254 +#define LAYOUT_FORTREE_CITY_DECORATION_SHOP 255 +#define LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE 256 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F 257 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F 258 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F 259 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F 260 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F 261 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP 262 +#define LAYOUT_ROUTE130 263 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY 264 +#define LAYOUT_BATTLE_FRONTIER_OUTSIDE_WEST 265 +#define LAYOUT_BATTLE_ELEVATOR 266 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR 267 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM 268 +#define LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F 269 +#define LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F 270 +#define LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F 271 +#define LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F 272 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR 273 +#define LAYOUT_UNDERWATER1 274 +#define LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F 275 +#define LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F 276 +#define LAYOUT_SS_TIDAL_CORRIDOR 277 +#define LAYOUT_SS_TIDAL_LOWER_DECK 278 +#define LAYOUT_SS_TIDAL_ROOMS 279 +#define LAYOUT_ISLAND_CAVE 280 +#define LAYOUT_ANCIENT_TOMB 281 +#define LAYOUT_UNDERWATER_ROUTE134 282 +#define LAYOUT_UNDERWATER_SEALED_CHAMBER 283 +#define LAYOUT_SEALED_CHAMBER_OUTER_ROOM 284 +#define LAYOUT_VICTORY_ROAD_B1F 285 +#define LAYOUT_VICTORY_ROAD_B2F 286 +#define LAYOUT_ROUTE104_PROTOTYPE 287 +#define LAYOUT_GRANITE_CAVE_STEVENS_ROOM 288 +#define LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS 289 +#define LAYOUT_SOUTHERN_ISLAND_EXTERIOR 290 +#define LAYOUT_SOUTHERN_ISLAND_INTERIOR 291 +#define LAYOUT_JAGGED_PASS 292 +#define LAYOUT_FIERY_PATH 293 +#define LAYOUT_RUSTBORO_CITY_FLAT2_1F 294 +#define LAYOUT_RUSTBORO_CITY_FLAT2_2F 295 +#define LAYOUT_RUSTBORO_CITY_FLAT2_3F 296 +#define LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE 297 +#define LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME 298 +#define LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F 299 +#define LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F 300 +#define LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE 301 +#define LAYOUT_MT_PYRE_EXTERIOR 302 +#define LAYOUT_MT_PYRE_SUMMIT 303 +#define LAYOUT_SEALED_CHAMBER_INNER_ROOM 304 +#define LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F 305 +#define LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F 306 +#define LAYOUT_SOOTOPOLIS_CITY_HOUSE1 307 +#define LAYOUT_SOOTOPOLIS_CITY_HOUSE2 308 +#define LAYOUT_SOOTOPOLIS_CITY_HOUSE3 309 +#define LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS 310 +#define LAYOUT_SCORCHED_SLAB 311 +#define LAYOUT_UNKNOWN_MAP_0845A394 312 +#define LAYOUT_RUSTBORO_CITY_FLAT1_1F 313 +#define LAYOUT_RUSTBORO_CITY_FLAT1_2F 314 +#define LAYOUT_EVER_GRANDE_CITY_HALL4 315 +#define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 316 +#define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 317 +#define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 318 +#define LAYOUT_UNKNOWN_MAP_0845D470 319 +#define LAYOUT_SKY_PILLAR_ENTRANCE 320 +#define LAYOUT_SKY_PILLAR_OUTSIDE 321 +#define LAYOUT_SKY_PILLAR_1F 322 +#define LAYOUT_SKY_PILLAR_2F 323 +#define LAYOUT_SKY_PILLAR_3F 324 +#define LAYOUT_SKY_PILLAR_4F 325 +#define LAYOUT_UNKNOWN_MAP_0845ECB4 326 +#define LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE 327 +#define LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM 328 +#define LAYOUT_SAFARI_ZONE_REST_HOUSE 329 +#define LAYOUT_SKY_PILLAR_5F 330 +#define LAYOUT_SKY_PILLAR_TOP 331 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY 332 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR 333 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM 334 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM 335 +#define LAYOUT_MAGMA_HIDEOUT_1F 336 +#define LAYOUT_MAGMA_HIDEOUT_2F_1R 337 +#define LAYOUT_MAGMA_HIDEOUT_2F_2R 338 +#define LAYOUT_MAGMA_HIDEOUT_3F_1R 339 +#define LAYOUT_MAGMA_HIDEOUT_3F_2R 340 +#define LAYOUT_MAGMA_HIDEOUT_4F 341 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY 342 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR 343 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM 344 +#define LAYOUT_BATTLE_FRONTIER_OUTSIDE_EAST 345 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY 346 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM 347 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM 348 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY 349 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR 350 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM 351 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 352 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 353 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY 354 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR 355 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM 356 +#define LAYOUT_UNKNOWN_MAP_08469200 357 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 358 +#define LAYOUT_UNKNOWN_MAP_084693AC 359 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY 360 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE 361 +#define LAYOUT_BATTLE_PYRAMID_SQUARE01 362 +#define LAYOUT_BATTLE_PYRAMID_SQUARE02 363 +#define LAYOUT_BATTLE_PYRAMID_SQUARE03 364 +#define LAYOUT_BATTLE_PYRAMID_SQUARE04 365 +#define LAYOUT_BATTLE_PYRAMID_SQUARE05 366 +#define LAYOUT_BATTLE_PYRAMID_SQUARE06 367 +#define LAYOUT_BATTLE_PYRAMID_SQUARE07 368 +#define LAYOUT_BATTLE_PYRAMID_SQUARE08 369 +#define LAYOUT_BATTLE_PYRAMID_SQUARE09 370 +#define LAYOUT_BATTLE_PYRAMID_SQUARE10 371 +#define LAYOUT_BATTLE_PYRAMID_SQUARE11 372 +#define LAYOUT_BATTLE_PYRAMID_SQUARE12 373 +#define LAYOUT_BATTLE_PYRAMID_SQUARE13 374 +#define LAYOUT_BATTLE_PYRAMID_SQUARE14 375 +#define LAYOUT_BATTLE_PYRAMID_SQUARE15 376 +#define LAYOUT_BATTLE_PYRAMID_SQUARE16 377 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP 378 +#define LAYOUT_MAGMA_HIDEOUT_3F_3R 379 +#define LAYOUT_MAGMA_HIDEOUT_2F_3R 380 +#define LAYOUT_MIRAGE_TOWER_1F 381 +#define LAYOUT_MIRAGE_TOWER_2F 382 +#define LAYOUT_MIRAGE_TOWER_3F 383 +#define LAYOUT_BATTLE_TENT_LOBBY 384 +#define LAYOUT_BATTLE_TENT_CORRIDOR 385 +#define LAYOUT_BATTLE_TENT_BATTLE_ROOM 386 +#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_ROUTE111_NO_MIRAGE_TOWER 392 +#define LAYOUT_UNION_ROOM 393 +#define LAYOUT_SAFARI_ZONE_NORTHEAST 394 +#define LAYOUT_SAFARI_ZONE_SOUTHEAST 395 +#define LAYOUT_BATTLE_FRONTIER_RANKING_HALL 396 +#define LAYOUT_BATTLE_FRONTIER_LOUNGE1 397 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER 398 +#define LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE 399 +#define LAYOUT_ARTISAN_CAVE_B1F 400 +#define LAYOUT_ARTISAN_CAVE_1F 401 +#define LAYOUT_FARAWAY_ISLAND_ENTRANCE 402 +#define LAYOUT_FARAWAY_ISLAND_INTERIOR 403 +#define LAYOUT_BIRTH_ISLAND_EXTERIOR 404 +#define LAYOUT_ISLAND_HARBOR 405 +#define LAYOUT_UNDERWATER_MARINE_CAVE 406 +#define LAYOUT_MARINE_CAVE_ENTRANCE 407 +#define LAYOUT_TERRA_CAVE_ENTRANCE 408 +#define LAYOUT_TERRA_CAVE_END 409 +#define LAYOUT_UNDERWATER6 410 +#define LAYOUT_UNDERWATER7 411 +#define LAYOUT_UNDERWATER5 412 +#define LAYOUT_MARINE_CAVE_END 413 +#define LAYOUT_TRAINER_HILL_ENTRANCE 414 +#define LAYOUT_TRAINER_HILL_1F 415 +#define LAYOUT_TRAINER_HILL_2F 416 +#define LAYOUT_TRAINER_HILL_3F 417 +#define LAYOUT_TRAINER_HILL_4F 418 +#define LAYOUT_TRAINER_HILL_ROOF 419 +#define LAYOUT_ALTERING_CAVE 420 +#define LAYOUT_NAVEL_ROCK_EXTERIOR 421 +#define LAYOUT_NAVEL_ROCK_ENTRANCE 422 +#define LAYOUT_NAVEL_ROCK_TOP 423 +#define LAYOUT_NAVEL_ROCK_BOTTOM 424 +#define LAYOUT_NAVEL_ROCK_LADDER_ROOM1 425 +#define LAYOUT_NAVEL_ROCK_LADDER_ROOM2 426 +#define LAYOUT_NAVEL_ROCK_B1F 427 +#define LAYOUT_NAVEL_ROCK_FORK 428 +#define LAYOUT_BATTLE_FRONTIER_LOUNGE2 429 +#define LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE 430 +#define LAYOUT_METEOR_FALLS_STEVENS_CAVE 431 +#define LAYOUT_UNKNOWN_MAP_08480DAC 432 +#define LAYOUT_UNKNOWN_MAP_08480F54 433 +#define LAYOUT_UNKNOWN_MAP_084810FC 434 +#define LAYOUT_UNKNOWN_MAP_084812A4 435 +#define LAYOUT_UNKNOWN_MAP_0848144C 436 +#define LAYOUT_UNKNOWN_MAP_084815F4 437 +#define LAYOUT_UNKNOWN_MAP_08481B24 438 +#define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F 439 +#define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F 440 +#define LAYOUT_UNKNOWN_MAP_08481DBC 441 + +#endif // GUARD_CONSTANTS_LAYOUTS_H From 3f1a7330dd344b97f4c11cc84573b099af42a611 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 30 Jan 2019 19:48:28 -0600 Subject: [PATCH 002/217] Document siirtc a bit more --- src/siirtc.c | 129 ++++++++++++++++++++++++++++----------------------- 1 file changed, 71 insertions(+), 58 deletions(-) diff --git a/src/siirtc.c b/src/siirtc.c index 965a068f13..f7e85ef4fa 100644 --- a/src/siirtc.c +++ b/src/siirtc.c @@ -46,6 +46,19 @@ #define CMD_TIME CMD(3) #define CMD_ALARM CMD(4) +#define SCK_HI 1 +#define SIO_HI 2 +#define CS_HI 4 + +#define DIR_0_IN 0 +#define DIR_0_OUT 1 +#define DIR_1_IN 0 +#define DIR_1_OUT 2 +#define DIR_2_IN 0 +#define DIR_2_OUT 4 +#define DIR_ALL_IN (DIR_0_IN | DIR_1_IN | DIR_2_IN) +#define DIR_ALL_OUT (DIR_0_OUT | DIR_1_OUT | DIR_2_OUT) + #define GPIO_PORT_DATA (*(vu16 *)0x80000C4) #define GPIO_PORT_DIRECTION (*(vu16 *)0x80000C6) #define GPIO_PORT_READ_ENABLE (*(vu16 *)0x80000C8) @@ -126,15 +139,15 @@ bool8 SiiRtcReset() sLocked = TRUE; - GPIO_PORT_DATA = 1; - GPIO_PORT_DATA = 5; + GPIO_PORT_DATA = SCK_HI; + GPIO_PORT_DATA = SCK_HI | CS_HI; - GPIO_PORT_DIRECTION = 7; + GPIO_PORT_DIRECTION = DIR_ALL_OUT; WriteCommand(CMD_RESET | WR); - GPIO_PORT_DATA = 1; - GPIO_PORT_DATA = 1; + GPIO_PORT_DATA = SCK_HI; + GPIO_PORT_DATA = SCK_HI; sLocked = FALSE; @@ -154,14 +167,14 @@ bool8 SiiRtcGetStatus(struct SiiRtcInfo *rtc) sLocked = TRUE; - GPIO_PORT_DATA = 1; - GPIO_PORT_DATA = 5; + GPIO_PORT_DATA = SCK_HI; + GPIO_PORT_DATA = SCK_HI | CS_HI; - GPIO_PORT_DIRECTION = 7; + GPIO_PORT_DIRECTION = DIR_ALL_OUT; WriteCommand(CMD_STATUS | RD); - GPIO_PORT_DIRECTION = 5; + GPIO_PORT_DIRECTION = DIR_0_OUT | DIR_1_IN | DIR_2_OUT; statusData = ReadData(); @@ -170,8 +183,8 @@ bool8 SiiRtcGetStatus(struct SiiRtcInfo *rtc) | ((statusData & STATUS_INTME) >> 2) | ((statusData & STATUS_INTFE) >> 1); - GPIO_PORT_DATA = 1; - GPIO_PORT_DATA = 1; + GPIO_PORT_DATA = SCK_HI; + GPIO_PORT_DATA = SCK_HI; sLocked = FALSE; @@ -187,22 +200,22 @@ bool8 SiiRtcSetStatus(struct SiiRtcInfo *rtc) sLocked = TRUE; - GPIO_PORT_DATA = 1; - GPIO_PORT_DATA = 5; + GPIO_PORT_DATA = SCK_HI; + GPIO_PORT_DATA = SCK_HI | CS_HI; statusData = STATUS_24HOUR | ((rtc->status & SIIRTCINFO_INTAE) << 3) | ((rtc->status & SIIRTCINFO_INTME) << 2) | ((rtc->status & SIIRTCINFO_INTFE) << 1); - GPIO_PORT_DIRECTION = 7; + GPIO_PORT_DIRECTION = DIR_ALL_OUT; WriteCommand(CMD_STATUS | WR); WriteData(statusData); - GPIO_PORT_DATA = 1; - GPIO_PORT_DATA = 1; + GPIO_PORT_DATA = SCK_HI; + GPIO_PORT_DATA = SCK_HI; sLocked = FALSE; @@ -218,22 +231,22 @@ bool8 SiiRtcGetDateTime(struct SiiRtcInfo *rtc) sLocked = TRUE; - GPIO_PORT_DATA = 1; - GPIO_PORT_DATA = 5; + GPIO_PORT_DATA = SCK_HI; + GPIO_PORT_DATA = SCK_HI | CS_HI; - GPIO_PORT_DIRECTION = 7; + GPIO_PORT_DIRECTION = DIR_ALL_OUT; WriteCommand(CMD_DATETIME | RD); - GPIO_PORT_DIRECTION = 5; + GPIO_PORT_DIRECTION = DIR_0_OUT | DIR_1_IN | DIR_2_OUT; for (i = 0; i < DATETIME_BUF_LEN; i++) DATETIME_BUF(rtc, i) = ReadData(); INFO_BUF(rtc, OFFSET_HOUR) &= 0x7F; - GPIO_PORT_DATA = 1; - GPIO_PORT_DATA = 1; + GPIO_PORT_DATA = SCK_HI; + GPIO_PORT_DATA = SCK_HI; sLocked = FALSE; @@ -249,18 +262,18 @@ bool8 SiiRtcSetDateTime(struct SiiRtcInfo *rtc) sLocked = TRUE; - GPIO_PORT_DATA = 1; - GPIO_PORT_DATA = 5; + GPIO_PORT_DATA = SCK_HI; + GPIO_PORT_DATA = SCK_HI | CS_HI; - GPIO_PORT_DIRECTION = 7; + GPIO_PORT_DIRECTION = DIR_ALL_OUT; WriteCommand(CMD_DATETIME | WR); for (i = 0; i < DATETIME_BUF_LEN; i++) WriteData(DATETIME_BUF(rtc, i)); - GPIO_PORT_DATA = 1; - GPIO_PORT_DATA = 1; + GPIO_PORT_DATA = SCK_HI; + GPIO_PORT_DATA = SCK_HI; sLocked = FALSE; @@ -276,22 +289,22 @@ bool8 SiiRtcGetTime(struct SiiRtcInfo *rtc) sLocked = TRUE; - GPIO_PORT_DATA = 1; - GPIO_PORT_DATA = 5; + GPIO_PORT_DATA = SCK_HI; + GPIO_PORT_DATA = SCK_HI | CS_HI; - GPIO_PORT_DIRECTION = 7; + GPIO_PORT_DIRECTION = DIR_ALL_OUT; WriteCommand(CMD_TIME | RD); - GPIO_PORT_DIRECTION = 5; + GPIO_PORT_DIRECTION = DIR_0_OUT | DIR_1_IN | DIR_2_OUT; for (i = 0; i < TIME_BUF_LEN; i++) TIME_BUF(rtc, i) = ReadData(); INFO_BUF(rtc, OFFSET_HOUR) &= 0x7F; - GPIO_PORT_DATA = 1; - GPIO_PORT_DATA = 1; + GPIO_PORT_DATA = SCK_HI; + GPIO_PORT_DATA = SCK_HI; sLocked = FALSE; @@ -307,18 +320,18 @@ bool8 SiiRtcSetTime(struct SiiRtcInfo *rtc) sLocked = TRUE; - GPIO_PORT_DATA = 1; - GPIO_PORT_DATA = 5; + GPIO_PORT_DATA = SCK_HI; + GPIO_PORT_DATA = SCK_HI | CS_HI; - GPIO_PORT_DIRECTION = 7; + GPIO_PORT_DIRECTION = DIR_ALL_OUT; WriteCommand(CMD_TIME | WR); for (i = 0; i < TIME_BUF_LEN; i++) WriteData(TIME_BUF(rtc, i)); - GPIO_PORT_DATA = 1; - GPIO_PORT_DATA = 1; + GPIO_PORT_DATA = SCK_HI; + GPIO_PORT_DATA = SCK_HI; sLocked = FALSE; @@ -347,18 +360,18 @@ bool8 SiiRtcSetAlarm(struct SiiRtcInfo *rtc) alarmData[1] = rtc->alarmMinute; - GPIO_PORT_DATA = 1; - GPIO_PORT_DATA = 5; + GPIO_PORT_DATA = SCK_HI; + GPIO_PORT_DATA = SCK_HI | CS_HI; - GPIOPortDirection = 7; // Why is this the only instance that uses a symbol? + GPIOPortDirection = DIR_ALL_OUT; // Why is this the only instance that uses a symbol? WriteCommand(CMD_ALARM | WR); for (i = 0; i < 2; i++) WriteData(alarmData[i]); - GPIO_PORT_DATA = 1; - GPIO_PORT_DATA = 1; + GPIO_PORT_DATA = SCK_HI; + GPIO_PORT_DATA = SCK_HI; sLocked = FALSE; @@ -373,10 +386,10 @@ static int WriteCommand(u8 value) for (i = 0; i < 8; i++) { temp = ((value >> (7 - i)) & 1); - GPIO_PORT_DATA = (temp << 1) | 4; - GPIO_PORT_DATA = (temp << 1) | 4; - GPIO_PORT_DATA = (temp << 1) | 4; - GPIO_PORT_DATA = (temp << 1) | 5; + GPIO_PORT_DATA = (temp << 1) | CS_HI; + GPIO_PORT_DATA = (temp << 1) | CS_HI; + GPIO_PORT_DATA = (temp << 1) | CS_HI; + GPIO_PORT_DATA = (temp << 1) | SCK_HI | CS_HI; } // control reaches end of non-void function @@ -390,10 +403,10 @@ static int WriteData(u8 value) for (i = 0; i < 8; i++) { temp = ((value >> i) & 1); - GPIO_PORT_DATA = (temp << 1) | 4; - GPIO_PORT_DATA = (temp << 1) | 4; - GPIO_PORT_DATA = (temp << 1) | 4; - GPIO_PORT_DATA = (temp << 1) | 5; + GPIO_PORT_DATA = (temp << 1) | CS_HI; + GPIO_PORT_DATA = (temp << 1) | CS_HI; + GPIO_PORT_DATA = (temp << 1) | CS_HI; + GPIO_PORT_DATA = (temp << 1) | SCK_HI | CS_HI; } // control reaches end of non-void function @@ -407,14 +420,14 @@ static u8 ReadData() for (i = 0; i < 8; i++) { - GPIO_PORT_DATA = 4; - GPIO_PORT_DATA = 4; - GPIO_PORT_DATA = 4; - GPIO_PORT_DATA = 4; - GPIO_PORT_DATA = 4; - GPIO_PORT_DATA = 5; + GPIO_PORT_DATA = CS_HI; + GPIO_PORT_DATA = CS_HI; + GPIO_PORT_DATA = CS_HI; + GPIO_PORT_DATA = CS_HI; + GPIO_PORT_DATA = CS_HI; + GPIO_PORT_DATA = SCK_HI | CS_HI; - temp = ((GPIO_PORT_DATA & 2) >> 1); + temp = ((GPIO_PORT_DATA & SIO_HI) >> 1); value = (value >> 1) | (temp << 7); // UB: accessing uninitialized var } From 29d6221935d3e8e01dc11b4023ba977ff433f3c9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 31 Jan 2019 15:51:20 -0600 Subject: [PATCH 003/217] Convert map data to JSON --- Makefile | 6 + data/event_scripts.s | 1 + data/layouts.inc | 441 -- data/layouts/.gitignore | 2 + .../AbandonedShip_CaptainsOffice/layout.inc | 15 - .../AbandonedShip_Corridors_1F/layout.inc | 15 - .../AbandonedShip_Corridors_B1F/layout.inc | 15 - data/layouts/AbandonedShip_Deck/layout.inc | 15 - .../layout.inc | 15 - .../AbandonedShip_HiddenFloorRooms/layout.inc | 15 - .../layouts/AbandonedShip_Room_B1F/layout.inc | 15 - .../AbandonedShip_Rooms2_1F/layout.inc | 15 - .../AbandonedShip_Rooms2_B1F/layout.inc | 15 - .../layouts/AbandonedShip_Rooms_1F/layout.inc | 15 - .../AbandonedShip_Rooms_B1F/layout.inc | 15 - .../AbandonedShip_Underwater1/layout.inc | 15 - .../AbandonedShip_Underwater2/layout.inc | 15 - data/layouts/AlteringCave/layout.inc | 15 - data/layouts/AncientTomb/layout.inc | 15 - data/layouts/AquaHideout_1F/layout.inc | 15 - data/layouts/AquaHideout_B1F/layout.inc | 15 - data/layouts/AquaHideout_B2F/layout.inc | 15 - .../AquaHideout_UnusedRubyMap1/layout.inc | 15 - .../AquaHideout_UnusedRubyMap2/layout.inc | 15 - .../AquaHideout_UnusedRubyMap3/layout.inc | 15 - data/layouts/ArtisanCave_1F/layout.inc | 15 - data/layouts/ArtisanCave_B1F/layout.inc | 15 - data/layouts/BattleElevator/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../BattleFrontier_BattleDomeLobby/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../BattleFrontier_BattlePikeLobby/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layouts/BattleFrontier_Lounge1/layout.inc | 15 - .../layouts/BattleFrontier_Lounge2/layout.inc | 15 - .../BattleFrontier_OutsideEast/layout.inc | 15 - .../BattleFrontier_OutsideWest/layout.inc | 15 - .../BattleFrontier_RankingHall/layout.inc | 15 - .../BattleFrontier_ReceptionGate/layout.inc | 15 - .../BattleFrontier_ScottsHouse/layout.inc | 15 - data/layouts/BattlePyramidSquare01/layout.inc | 15 - data/layouts/BattlePyramidSquare02/layout.inc | 15 - data/layouts/BattlePyramidSquare03/layout.inc | 15 - data/layouts/BattlePyramidSquare04/layout.inc | 15 - data/layouts/BattlePyramidSquare05/layout.inc | 15 - data/layouts/BattlePyramidSquare06/layout.inc | 15 - data/layouts/BattlePyramidSquare07/layout.inc | 15 - data/layouts/BattlePyramidSquare08/layout.inc | 15 - data/layouts/BattlePyramidSquare09/layout.inc | 15 - data/layouts/BattlePyramidSquare10/layout.inc | 15 - data/layouts/BattlePyramidSquare11/layout.inc | 15 - data/layouts/BattlePyramidSquare12/layout.inc | 15 - data/layouts/BattlePyramidSquare13/layout.inc | 15 - data/layouts/BattlePyramidSquare14/layout.inc | 15 - data/layouts/BattlePyramidSquare15/layout.inc | 15 - data/layouts/BattlePyramidSquare16/layout.inc | 15 - data/layouts/BattleTentBattleRoom/layout.inc | 15 - data/layouts/BattleTentCorridor/layout.inc | 15 - data/layouts/BattleTentLobby/layout.inc | 15 - data/layouts/BirthIsland_Exterior/layout.inc | 15 - data/layouts/CableCarStation/layout.inc | 15 - data/layouts/CaveOfOrigin_1F/layout.inc | 15 - data/layouts/CaveOfOrigin_B1F/layout.inc | 15 - data/layouts/CaveOfOrigin_Entrance/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - data/layouts/DesertRuins/layout.inc | 15 - data/layouts/DesertUnderpass/layout.inc | 15 - data/layouts/DewfordTown/layout.inc | 15 - data/layouts/DewfordTown_Gym/layout.inc | 15 - data/layouts/DewfordTown_Hall/layout.inc | 15 - data/layouts/DoubleBattleColosseum/layout.inc | 15 - data/layouts/EverGrandeCity/layout.inc | 15 - .../EverGrandeCity_ChampionsRoom/layout.inc | 15 - .../EverGrandeCity_DrakesRoom/layout.inc | 15 - .../EverGrandeCity_GlaciasRoom/layout.inc | 15 - data/layouts/EverGrandeCity_Hall4/layout.inc | 15 - .../EverGrandeCity_HallOfFame/layout.inc | 15 - .../EverGrandeCity_PhoebesRoom/layout.inc | 15 - .../layout.inc | 15 - .../EverGrandeCity_ShortHall/layout.inc | 15 - .../EverGrandeCity_SidneysRoom/layout.inc | 15 - data/layouts/FallarborTown/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layouts/FarawayIsland_Entrance/layout.inc | 15 - .../layouts/FarawayIsland_Interior/layout.inc | 15 - data/layouts/FieryPath/layout.inc | 15 - data/layouts/FortreeCity/layout.inc | 15 - .../FortreeCity_DecorationShop/layout.inc | 15 - data/layouts/FortreeCity_Gym/layout.inc | 15 - data/layouts/FortreeCity_House1/layout.inc | 15 - data/layouts/FortreeCity_House2/layout.inc | 15 - data/layouts/GraniteCave_1F/layout.inc | 15 - data/layouts/GraniteCave_B1F/layout.inc | 15 - data/layouts/GraniteCave_B2F/layout.inc | 15 - .../GraniteCave_StevensRoom/layout.inc | 15 - data/layouts/Harbor/layout.inc | 15 - data/layouts/House1/layout.inc | 15 - data/layouts/House2/layout.inc | 15 - data/layouts/House3/layout.inc | 15 - data/layouts/House4/layout.inc | 15 - data/layouts/HouseWithBed/layout.inc | 15 - data/layouts/InsideOfTruck/layout.inc | 15 - data/layouts/IslandCave/layout.inc | 15 - data/layouts/IslandHarbor/layout.inc | 15 - data/layouts/JaggedPass/layout.inc | 15 - data/layouts/LavaridgeTown/layout.inc | 15 - data/layouts/LavaridgeTown_Gym_1F/layout.inc | 15 - data/layouts/LavaridgeTown_Gym_B1F/layout.inc | 15 - .../layouts/LavaridgeTown_HerbShop/layout.inc | 15 - .../LavaridgeTown_PokemonCenter_1F/layout.inc | 15 - data/layouts/LilycoveCity/layout.inc | 15 - .../LilycoveCity_ContestHall/layout.inc | 15 - .../LilycoveCity_ContestLobby/layout.inc | 15 - .../LilycoveCity_CoveLilyMotel_1F/layout.inc | 15 - .../LilycoveCity_CoveLilyMotel_2F/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - data/layouts/LilycoveCity_House2/layout.inc | 15 - .../LilycoveCity_LilycoveMuseum_1F/layout.inc | 15 - .../LilycoveCity_LilycoveMuseum_2F/layout.inc | 15 - .../layout.inc | 15 - data/layouts/LinkContestRoom1/layout.inc | 15 - data/layouts/LinkContestRoom2/layout.inc | 15 - data/layouts/LinkContestRoom3/layout.inc | 15 - data/layouts/LinkContestRoom4/layout.inc | 15 - data/layouts/LinkContestRoom5/layout.inc | 15 - data/layouts/LinkContestRoom6/layout.inc | 15 - data/layouts/LittlerootTown/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../LittlerootTown_MaysHouse_1F/layout.inc | 15 - .../LittlerootTown_MaysHouse_2F/layout.inc | 15 - .../layout.inc | 15 - data/layouts/MagmaHideout_1F/layout.inc | 15 - data/layouts/MagmaHideout_2F_1R/layout.inc | 15 - data/layouts/MagmaHideout_2F_2R/layout.inc | 15 - data/layouts/MagmaHideout_2F_3R/layout.inc | 15 - data/layouts/MagmaHideout_3F_1R/layout.inc | 15 - data/layouts/MagmaHideout_3F_2R/layout.inc | 15 - data/layouts/MagmaHideout_3F_3R/layout.inc | 15 - data/layouts/MagmaHideout_4F/layout.inc | 15 - data/layouts/MarineCave_End/layout.inc | 15 - data/layouts/MarineCave_Entrance/layout.inc | 15 - data/layouts/Mart/layout.inc | 15 - data/layouts/MauvilleCity/layout.inc | 15 - data/layouts/MauvilleCity_BikeShop/layout.inc | 15 - .../MauvilleCity_GameCorner/layout.inc | 15 - data/layouts/MauvilleCity_Gym/layout.inc | 15 - data/layouts/MeteorFalls_1F_1R/layout.inc | 15 - data/layouts/MeteorFalls_1F_2R/layout.inc | 15 - data/layouts/MeteorFalls_B1F_1R/layout.inc | 15 - data/layouts/MeteorFalls_B1F_2R/layout.inc | 15 - .../MeteorFalls_StevensCave/layout.inc | 15 - data/layouts/MirageTower_1F/layout.inc | 15 - data/layouts/MirageTower_2F/layout.inc | 15 - data/layouts/MirageTower_3F/layout.inc | 15 - data/layouts/MirageTower_4F/layout.inc | 15 - data/layouts/MossdeepCity/layout.inc | 15 - .../MossdeepCity_GameCorner_1F/layout.inc | 15 - .../MossdeepCity_GameCorner_B1F/layout.inc | 15 - data/layouts/MossdeepCity_Gym/layout.inc | 15 - .../MossdeepCity_SpaceCenter_1F/layout.inc | 15 - .../MossdeepCity_SpaceCenter_2F/layout.inc | 15 - .../MossdeepCity_StevensHouse/layout.inc | 15 - data/layouts/MtChimney/layout.inc | 15 - data/layouts/MtPyre_1F/layout.inc | 15 - data/layouts/MtPyre_2F/layout.inc | 15 - data/layouts/MtPyre_3F/layout.inc | 15 - data/layouts/MtPyre_4F/layout.inc | 15 - data/layouts/MtPyre_5F/layout.inc | 15 - data/layouts/MtPyre_6F/layout.inc | 15 - data/layouts/MtPyre_Exterior/layout.inc | 15 - data/layouts/MtPyre_Summit/layout.inc | 15 - data/layouts/NavelRock_B1F/layout.inc | 15 - data/layouts/NavelRock_Bottom/layout.inc | 15 - data/layouts/NavelRock_Entrance/layout.inc | 15 - data/layouts/NavelRock_Exterior/layout.inc | 15 - data/layouts/NavelRock_Fork/layout.inc | 15 - data/layouts/NavelRock_LadderRoom1/layout.inc | 15 - data/layouts/NavelRock_LadderRoom2/layout.inc | 15 - data/layouts/NavelRock_Top/layout.inc | 15 - data/layouts/NewMauville_Entrance/layout.inc | 15 - data/layouts/NewMauville_Inside/layout.inc | 15 - data/layouts/OldaleTown/layout.inc | 15 - data/layouts/PacifidlogTown/layout.inc | 15 - data/layouts/PacifidlogTown_House1/layout.inc | 15 - data/layouts/PacifidlogTown_House2/layout.inc | 15 - data/layouts/PetalburgCity/layout.inc | 15 - data/layouts/PetalburgCity_Gym/layout.inc | 15 - data/layouts/PetalburgWoods/layout.inc | 15 - data/layouts/PokemonCenter_1F/layout.inc | 15 - data/layouts/PokemonCenter_2F/layout.inc | 15 - data/layouts/RecordCorner/layout.inc | 15 - data/layouts/Route101/layout.inc | 15 - data/layouts/Route102/layout.inc | 15 - data/layouts/Route103/layout.inc | 15 - data/layouts/Route104/layout.inc | 15 - .../Route104_MrBrineysHouse/layout.inc | 15 - .../Route104_PrettyPetalFlowerShop/layout.inc | 15 - data/layouts/Route104_Prototype/layout.inc | 15 - data/layouts/Route105/layout.inc | 15 - data/layouts/Route106/layout.inc | 15 - data/layouts/Route107/layout.inc | 15 - data/layouts/Route108/layout.inc | 15 - data/layouts/Route109/layout.inc | 15 - .../layouts/Route109_SeashoreHouse/layout.inc | 15 - data/layouts/Route110/layout.inc | 15 - .../layout.inc | 15 - .../Route110_TrickHouseCorridor/layout.inc | 15 - .../layouts/Route110_TrickHouseEnd/layout.inc | 15 - .../Route110_TrickHouseEntrance/layout.inc | 15 - .../Route110_TrickHousePuzzle1/layout.inc | 15 - .../Route110_TrickHousePuzzle2/layout.inc | 15 - .../Route110_TrickHousePuzzle3/layout.inc | 15 - .../Route110_TrickHousePuzzle4/layout.inc | 15 - .../Route110_TrickHousePuzzle5/layout.inc | 15 - .../Route110_TrickHousePuzzle6/layout.inc | 15 - .../Route110_TrickHousePuzzle7/layout.inc | 15 - .../Route110_TrickHousePuzzle8/layout.inc | 15 - data/layouts/Route111/layout.inc | 15 - .../layouts/Route111_NoMirageTower/layout.inc | 15 - data/layouts/Route112/layout.inc | 15 - data/layouts/Route113/layout.inc | 15 - data/layouts/Route114/layout.inc | 15 - .../Route114_FossilManiacsHouse/layout.inc | 15 - .../Route114_FossilManiacsTunnel/layout.inc | 15 - .../layouts/Route114_LanettesHouse/layout.inc | 15 - data/layouts/Route115/layout.inc | 15 - data/layouts/Route116/layout.inc | 15 - .../Route116_TunnelersRestHouse/layout.inc | 15 - data/layouts/Route117/layout.inc | 15 - .../Route117_PokemonDayCare/layout.inc | 15 - data/layouts/Route118/layout.inc | 15 - data/layouts/Route119/layout.inc | 15 - .../Route119_WeatherInstitute_1F/layout.inc | 15 - .../Route119_WeatherInstitute_2F/layout.inc | 15 - data/layouts/Route120/layout.inc | 15 - data/layouts/Route121/layout.inc | 15 - .../Route121_SafariZoneEntrance/layout.inc | 15 - data/layouts/Route122/layout.inc | 15 - data/layouts/Route123/layout.inc | 15 - data/layouts/Route124/layout.inc | 15 - .../layout.inc | 15 - data/layouts/Route125/layout.inc | 15 - data/layouts/Route126/layout.inc | 15 - data/layouts/Route127/layout.inc | 15 - data/layouts/Route128/layout.inc | 15 - data/layouts/Route129/layout.inc | 15 - data/layouts/Route130/layout.inc | 15 - data/layouts/Route131/layout.inc | 15 - data/layouts/Route132/layout.inc | 15 - data/layouts/Route133/layout.inc | 15 - data/layouts/Route134/layout.inc | 15 - data/layouts/RustboroCity/layout.inc | 15 - .../RustboroCity_CuttersHouse/layout.inc | 15 - .../RustboroCity_DevonCorp_1F/layout.inc | 15 - .../RustboroCity_DevonCorp_2F/layout.inc | 15 - .../RustboroCity_DevonCorp_3F/layout.inc | 15 - data/layouts/RustboroCity_Flat1_1F/layout.inc | 15 - data/layouts/RustboroCity_Flat1_2F/layout.inc | 15 - data/layouts/RustboroCity_Flat2_1F/layout.inc | 15 - data/layouts/RustboroCity_Flat2_2F/layout.inc | 15 - data/layouts/RustboroCity_Flat2_3F/layout.inc | 15 - data/layouts/RustboroCity_Gym/layout.inc | 15 - data/layouts/RustboroCity_House/layout.inc | 15 - data/layouts/RustboroCity_House1/layout.inc | 15 - .../RustboroCity_PokemonSchool/layout.inc | 15 - data/layouts/RusturfTunnel/layout.inc | 15 - data/layouts/SSTidalCorridor/layout.inc | 15 - data/layouts/SSTidalLowerDeck/layout.inc | 15 - data/layouts/SSTidalRooms/layout.inc | 15 - data/layouts/SafariZone_North/layout.inc | 15 - data/layouts/SafariZone_Northeast/layout.inc | 15 - data/layouts/SafariZone_Northwest/layout.inc | 15 - data/layouts/SafariZone_RestHouse/layout.inc | 15 - data/layouts/SafariZone_South/layout.inc | 15 - data/layouts/SafariZone_Southeast/layout.inc | 15 - data/layouts/SafariZone_Southwest/layout.inc | 15 - data/layouts/ScorchedSlab/layout.inc | 15 - .../SeafloorCavern_Entrance/layout.inc | 15 - data/layouts/SeafloorCavern_Room1/layout.inc | 15 - data/layouts/SeafloorCavern_Room2/layout.inc | 15 - data/layouts/SeafloorCavern_Room3/layout.inc | 15 - data/layouts/SeafloorCavern_Room4/layout.inc | 15 - data/layouts/SeafloorCavern_Room5/layout.inc | 15 - data/layouts/SeafloorCavern_Room6/layout.inc | 15 - data/layouts/SeafloorCavern_Room7/layout.inc | 15 - data/layouts/SeafloorCavern_Room8/layout.inc | 15 - data/layouts/SeafloorCavern_Room9/layout.inc | 15 - .../SealedChamber_InnerRoom/layout.inc | 15 - .../SealedChamber_OuterRoom/layout.inc | 15 - data/layouts/SecretBase_BlueCave1/layout.inc | 15 - data/layouts/SecretBase_BlueCave2/layout.inc | 15 - data/layouts/SecretBase_BlueCave3/layout.inc | 15 - data/layouts/SecretBase_BlueCave4/layout.inc | 15 - data/layouts/SecretBase_BrownCave1/layout.inc | 15 - data/layouts/SecretBase_BrownCave2/layout.inc | 15 - data/layouts/SecretBase_BrownCave3/layout.inc | 15 - data/layouts/SecretBase_BrownCave4/layout.inc | 15 - data/layouts/SecretBase_RedCave1/layout.inc | 15 - data/layouts/SecretBase_RedCave2/layout.inc | 15 - data/layouts/SecretBase_RedCave3/layout.inc | 15 - data/layouts/SecretBase_RedCave4/layout.inc | 15 - data/layouts/SecretBase_Shrub1/layout.inc | 15 - data/layouts/SecretBase_Shrub2/layout.inc | 15 - data/layouts/SecretBase_Shrub3/layout.inc | 15 - data/layouts/SecretBase_Shrub4/layout.inc | 15 - data/layouts/SecretBase_Tree1/layout.inc | 15 - data/layouts/SecretBase_Tree2/layout.inc | 15 - data/layouts/SecretBase_Tree3/layout.inc | 15 - data/layouts/SecretBase_Tree4/layout.inc | 15 - .../layouts/SecretBase_YellowCave1/layout.inc | 15 - .../layouts/SecretBase_YellowCave2/layout.inc | 15 - .../layouts/SecretBase_YellowCave3/layout.inc | 15 - .../layouts/SecretBase_YellowCave4/layout.inc | 15 - .../ShoalCave_HighTideEntranceRoom/layout.inc | 15 - .../ShoalCave_HighTideInnerRoom/layout.inc | 15 - .../ShoalCave_LowTideEntranceRoom/layout.inc | 15 - .../ShoalCave_LowTideIceRoom/layout.inc | 15 - .../ShoalCave_LowTideInnerRoom/layout.inc | 15 - .../ShoalCave_LowTideLowerRoom/layout.inc | 15 - .../ShoalCave_LowTideStairsRoom/layout.inc | 15 - data/layouts/SingleBattleColosseum/layout.inc | 15 - data/layouts/SkyPillar_1F/layout.inc | 15 - data/layouts/SkyPillar_2F/layout.inc | 15 - data/layouts/SkyPillar_3F/layout.inc | 15 - data/layouts/SkyPillar_4F/layout.inc | 15 - data/layouts/SkyPillar_5F/layout.inc | 15 - data/layouts/SkyPillar_Entrance/layout.inc | 15 - data/layouts/SkyPillar_Outside/layout.inc | 15 - data/layouts/SkyPillar_Top/layout.inc | 15 - data/layouts/SlateportCity/layout.inc | 15 - .../SlateportCity_OceanicMuseum_1F/layout.inc | 15 - .../SlateportCity_OceanicMuseum_2F/layout.inc | 15 - .../SlateportCity_PokemonFanClub/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - data/layouts/SootopolisCity/layout.inc | 15 - data/layouts/SootopolisCity_Gym_1F/layout.inc | 15 - .../layouts/SootopolisCity_Gym_B1F/layout.inc | 15 - data/layouts/SootopolisCity_House1/layout.inc | 15 - data/layouts/SootopolisCity_House2/layout.inc | 15 - data/layouts/SootopolisCity_House3/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../SouthernIsland_Exterior/layout.inc | 15 - .../SouthernIsland_Interior/layout.inc | 15 - data/layouts/TerraCave_End/layout.inc | 15 - data/layouts/TerraCave_Entrance/layout.inc | 15 - data/layouts/TradeCenter/layout.inc | 15 - data/layouts/TrainerHill_1F/layout.inc | 15 - data/layouts/TrainerHill_2F/layout.inc | 15 - data/layouts/TrainerHill_3F/layout.inc | 15 - data/layouts/TrainerHill_4F/layout.inc | 15 - data/layouts/TrainerHill_Entrance/layout.inc | 15 - data/layouts/TrainerHill_Roof/layout.inc | 15 - data/layouts/Underwater1/layout.inc | 15 - data/layouts/Underwater2/layout.inc | 15 - data/layouts/Underwater3/layout.inc | 15 - data/layouts/Underwater4/layout.inc | 15 - data/layouts/Underwater5/layout.inc | 15 - data/layouts/Underwater6/layout.inc | 15 - data/layouts/Underwater7/layout.inc | 15 - data/layouts/Underwater_MarineCave/layout.inc | 15 - data/layouts/Underwater_Route134/layout.inc | 15 - .../Underwater_SeafloorCavern/layout.inc | 15 - .../Underwater_SealedChamber/layout.inc | 15 - .../Underwater_SootopolisCity/layout.inc | 15 - data/layouts/UnionRoom/layout.inc | 15 - data/layouts/UnknownMap_08417FC4/layout.inc | 15 - data/layouts/UnknownMap_08428450/layout.inc | 15 - data/layouts/UnknownMap_084294C4/layout.inc | 15 - data/layouts/UnknownMap_084294E8/layout.inc | 15 - data/layouts/UnknownMap_0843E6C0/layout.inc | 15 - data/layouts/UnknownMap_0843E6E4/layout.inc | 15 - data/layouts/UnknownMap_0843E708/layout.inc | 15 - data/layouts/UnknownMap_0843E72C/layout.inc | 15 - data/layouts/UnknownMap_0843E750/layout.inc | 15 - data/layouts/UnknownMap_0843E774/layout.inc | 15 - data/layouts/UnknownMap_0843E798/layout.inc | 15 - data/layouts/UnknownMap_0843E7BC/layout.inc | 15 - data/layouts/UnknownMap_0843E7E0/layout.inc | 15 - data/layouts/UnknownMap_0843E804/layout.inc | 15 - data/layouts/UnknownMap_0843E828/layout.inc | 15 - data/layouts/UnknownMap_0843E84C/layout.inc | 15 - data/layouts/UnknownMap_0843E870/layout.inc | 15 - data/layouts/UnknownMap_0843E894/layout.inc | 15 - data/layouts/UnknownMap_08447028/layout.inc | 15 - data/layouts/UnknownMap_0845A394/layout.inc | 15 - data/layouts/UnknownMap_0845D470/layout.inc | 15 - data/layouts/UnknownMap_0845ECB4/layout.inc | 15 - data/layouts/UnknownMap_08469200/layout.inc | 15 - data/layouts/UnknownMap_084693AC/layout.inc | 15 - data/layouts/UnknownMap_08480DAC/layout.inc | 15 - data/layouts/UnknownMap_08480F54/layout.inc | 15 - data/layouts/UnknownMap_084810FC/layout.inc | 15 - data/layouts/UnknownMap_084812A4/layout.inc | 15 - data/layouts/UnknownMap_0848144C/layout.inc | 15 - data/layouts/UnknownMap_084815F4/layout.inc | 15 - data/layouts/UnknownMap_08481B24/layout.inc | 15 - data/layouts/UnknownMap_08481DBC/layout.inc | 15 - data/layouts/UnknownMap_25_29/layout.inc | 15 - data/layouts/UnknownMap_25_30/layout.inc | 15 - data/layouts/UnknownMap_25_31/layout.inc | 15 - data/layouts/UnknownMap_25_32/layout.inc | 15 - data/layouts/UnknownMap_25_33/layout.inc | 15 - data/layouts/UnknownMap_25_34/layout.inc | 15 - data/layouts/VerdanturfTown/layout.inc | 15 - .../layout.inc | 15 - .../VerdanturfTown_WandasHouse/layout.inc | 15 - data/layouts/VictoryRoad_1F/layout.inc | 15 - data/layouts/VictoryRoad_B1F/layout.inc | 15 - data/layouts/VictoryRoad_B2F/layout.inc | 15 - data/layouts/layouts.json | 4415 +++++++++++++++++ data/layouts_table.inc | 443 -- data/map_events.s | 519 +- data/maps.s | 4 +- data/maps/.gitignore | 7 + .../AbandonedShip_CaptainsOffice/events.inc | 11 - .../AbandonedShip_CaptainsOffice/header.inc | 15 - .../AbandonedShip_CaptainsOffice/map.json | 62 + .../AbandonedShip_Corridors_1F/events.inc | 21 - .../AbandonedShip_Corridors_1F/header.inc | 15 - data/maps/AbandonedShip_Corridors_1F/map.json | 132 + .../AbandonedShip_Corridors_B1F/events.inc | 20 - .../AbandonedShip_Corridors_B1F/header.inc | 15 - .../maps/AbandonedShip_Corridors_B1F/map.json | 113 + data/maps/AbandonedShip_Deck/events.inc | 10 - data/maps/AbandonedShip_Deck/header.inc | 15 - data/maps/AbandonedShip_Deck/map.json | 56 + .../events.inc | 17 - .../header.inc | 15 - .../map.json | 96 + .../AbandonedShip_HiddenFloorRooms/events.inc | 32 - .../AbandonedShip_HiddenFloorRooms/header.inc | 15 - .../AbandonedShip_HiddenFloorRooms/map.json | 218 + data/maps/AbandonedShip_Room_B1F/events.inc | 10 - data/maps/AbandonedShip_Room_B1F/header.inc | 15 - data/maps/AbandonedShip_Room_B1F/map.json | 49 + data/maps/AbandonedShip_Rooms2_1F/events.inc | 15 - data/maps/AbandonedShip_Rooms2_1F/header.inc | 15 - data/maps/AbandonedShip_Rooms2_1F/map.json | 108 + data/maps/AbandonedShip_Rooms2_B1F/events.inc | 13 - data/maps/AbandonedShip_Rooms2_B1F/header.inc | 15 - data/maps/AbandonedShip_Rooms2_B1F/map.json | 76 + data/maps/AbandonedShip_Rooms_1F/events.inc | 17 - data/maps/AbandonedShip_Rooms_1F/header.inc | 15 - data/maps/AbandonedShip_Rooms_1F/map.json | 116 + data/maps/AbandonedShip_Rooms_B1F/events.inc | 12 - data/maps/AbandonedShip_Rooms_B1F/header.inc | 15 - data/maps/AbandonedShip_Rooms_B1F/map.json | 69 + .../maps/AbandonedShip_Underwater1/events.inc | 7 - .../maps/AbandonedShip_Underwater1/header.inc | 15 - data/maps/AbandonedShip_Underwater1/map.json | 35 + .../maps/AbandonedShip_Underwater2/events.inc | 6 - .../maps/AbandonedShip_Underwater2/header.inc | 15 - data/maps/AbandonedShip_Underwater2/map.json | 28 + data/maps/AlteringCave/events.inc | 6 - data/maps/AlteringCave/header.inc | 15 - data/maps/AlteringCave/map.json | 28 + data/maps/AncientTomb/events.inc | 16 - data/maps/AncientTomb/header.inc | 15 - data/maps/AncientTomb/map.json | 81 + data/maps/AquaHideout_1F/events.inc | 13 - data/maps/AquaHideout_1F/header.inc | 15 - data/maps/AquaHideout_1F/map.json | 82 + data/maps/AquaHideout_B1F/events.inc | 41 - data/maps/AquaHideout_B1F/header.inc | 15 - data/maps/AquaHideout_B1F/map.json | 314 ++ data/maps/AquaHideout_B2F/events.inc | 27 - data/maps/AquaHideout_B2F/header.inc | 15 - data/maps/AquaHideout_B2F/map.json | 189 + .../AquaHideout_UnusedRubyMap1/events.inc | 3 - .../AquaHideout_UnusedRubyMap1/header.inc | 15 - data/maps/AquaHideout_UnusedRubyMap1/map.json | 20 + .../AquaHideout_UnusedRubyMap2/events.inc | 3 - .../AquaHideout_UnusedRubyMap2/header.inc | 15 - data/maps/AquaHideout_UnusedRubyMap2/map.json | 20 + .../AquaHideout_UnusedRubyMap3/events.inc | 3 - .../AquaHideout_UnusedRubyMap3/header.inc | 15 - data/maps/AquaHideout_UnusedRubyMap3/map.json | 20 + data/maps/ArtisanCave_1F/events.inc | 10 - data/maps/ArtisanCave_1F/header.inc | 15 - data/maps/ArtisanCave_1F/map.json | 49 + data/maps/ArtisanCave_B1F/events.inc | 16 - data/maps/ArtisanCave_B1F/header.inc | 15 - data/maps/ArtisanCave_B1F/map.json | 82 + .../events.inc | 14 - .../header.inc | 15 - .../map.json | 138 + .../events.inc | 6 - .../header.inc | 15 - .../map.json | 34 + .../events.inc | 17 - .../header.inc | 15 - .../BattleFrontier_BattleArenaLobby/map.json | 111 + .../events.inc | 20 - .../header.inc | 15 - .../map.json | 216 + .../events.inc | 10 - .../header.inc | 15 - .../map.json | 49 + .../BattleFrontier_BattleDomeLobby/events.inc | 21 - .../BattleFrontier_BattleDomeLobby/header.inc | 15 - .../BattleFrontier_BattleDomeLobby/map.json | 147 + .../events.inc | 10 - .../header.inc | 15 - .../map.json | 49 + .../events.inc | 13 - .../header.inc | 15 - .../map.json | 125 + .../events.inc | 20 - .../header.inc | 15 - .../map.json | 139 + .../events.inc | 6 - .../header.inc | 15 - .../map.json | 34 + .../events.inc | 14 - .../header.inc | 15 - .../map.json | 101 + .../events.inc | 18 - .../header.inc | 15 - .../map.json | 141 + .../events.inc | 21 - .../header.inc | 15 - .../BattleFrontier_BattlePalaceLobby/map.json | 146 + .../events.inc | 6 - .../header.inc | 15 - .../map.json | 34 + .../BattleFrontier_BattlePikeLobby/events.inc | 18 - .../BattleFrontier_BattlePikeLobby/header.inc | 15 - .../BattleFrontier_BattlePikeLobby/map.json | 112 + .../events.inc | 16 - .../header.inc | 15 - .../map.json | 111 + .../events.inc | 6 - .../header.inc | 15 - .../map.json | 34 + .../events.inc | 12 - .../header.inc | 15 - .../map.json | 84 + .../events.inc | 18 - .../header.inc | 15 - .../map.json | 129 + .../events.inc | 19 - .../header.inc | 15 - .../map.json | 160 + .../events.inc | 21 - .../header.inc | 15 - .../map.json | 229 + .../events.inc | 16 - .../header.inc | 15 - .../map.json | 98 + .../events.inc | 10 - .../header.inc | 15 - .../BattleFrontier_BattlePyramidTop/map.json | 57 + .../events.inc | 12 - .../header.inc | 15 - .../map.json | 75 + .../events.inc | 11 - .../header.inc | 15 - .../map.json | 99 + .../events.inc | 6 - .../header.inc | 15 - .../map.json | 34 + .../events.inc | 9 - .../header.inc | 15 - .../map.json | 73 + .../events.inc | 6 - .../header.inc | 15 - .../map.json | 34 + .../events.inc | 26 - .../header.inc | 15 - .../BattleFrontier_BattleTowerLobby/map.json | 201 + .../events.inc | 14 - .../header.inc | 15 - .../map.json | 138 + data/maps/BattleFrontier_Lounge1/events.inc | 11 - data/maps/BattleFrontier_Lounge1/header.inc | 15 - data/maps/BattleFrontier_Lounge1/map.json | 68 + data/maps/BattleFrontier_Lounge2/events.inc | 14 - data/maps/BattleFrontier_Lounge2/header.inc | 15 - data/maps/BattleFrontier_Lounge2/map.json | 101 + data/maps/BattleFrontier_Lounge3/events.inc | 13 - data/maps/BattleFrontier_Lounge3/header.inc | 15 - data/maps/BattleFrontier_Lounge3/map.json | 94 + data/maps/BattleFrontier_Lounge4/events.inc | 11 - data/maps/BattleFrontier_Lounge4/header.inc | 15 - data/maps/BattleFrontier_Lounge4/map.json | 68 + data/maps/BattleFrontier_Lounge5/events.inc | 13 - data/maps/BattleFrontier_Lounge5/header.inc | 15 - data/maps/BattleFrontier_Lounge5/map.json | 88 + data/maps/BattleFrontier_Lounge6/events.inc | 9 - data/maps/BattleFrontier_Lounge6/header.inc | 15 - data/maps/BattleFrontier_Lounge6/map.json | 42 + data/maps/BattleFrontier_Lounge7/events.inc | 12 - data/maps/BattleFrontier_Lounge7/header.inc | 15 - data/maps/BattleFrontier_Lounge7/map.json | 81 + data/maps/BattleFrontier_Lounge8/events.inc | 11 - data/maps/BattleFrontier_Lounge8/header.inc | 15 - data/maps/BattleFrontier_Lounge8/map.json | 68 + data/maps/BattleFrontier_Lounge9/events.inc | 10 - data/maps/BattleFrontier_Lounge9/header.inc | 15 - data/maps/BattleFrontier_Lounge9/map.json | 49 + data/maps/BattleFrontier_Mart/events.inc | 13 - data/maps/BattleFrontier_Mart/header.inc | 15 - data/maps/BattleFrontier_Mart/map.json | 88 + .../connections.inc | 7 - .../BattleFrontier_OutsideEast/events.inc | 57 - .../BattleFrontier_OutsideEast/header.inc | 15 - data/maps/BattleFrontier_OutsideEast/map.json | 529 ++ .../connections.inc | 7 - .../BattleFrontier_OutsideWest/events.inc | 49 - .../BattleFrontier_OutsideWest/header.inc | 15 - data/maps/BattleFrontier_OutsideWest/map.json | 458 ++ .../events.inc | 15 - .../header.inc | 15 - .../BattleFrontier_PokemonCenter_1F/map.json | 108 + .../events.inc | 14 - .../header.inc | 15 - .../BattleFrontier_PokemonCenter_2F/map.json | 95 + .../BattleFrontier_RankingHall/events.inc | 26 - .../BattleFrontier_RankingHall/header.inc | 15 - data/maps/BattleFrontier_RankingHall/map.json | 172 + .../BattleFrontier_ReceptionGate/events.inc | 14 - .../BattleFrontier_ReceptionGate/header.inc | 15 - .../BattleFrontier_ReceptionGate/map.json | 101 + .../BattleFrontier_ScottsHouse/events.inc | 10 - .../BattleFrontier_ScottsHouse/header.inc | 15 - data/maps/BattleFrontier_ScottsHouse/map.json | 49 + data/maps/BattlePyramidSquare01/events.inc | 12 - data/maps/BattlePyramidSquare01/header.inc | 15 - data/maps/BattlePyramidSquare01/map.json | 112 + data/maps/BattlePyramidSquare02/events.inc | 12 - data/maps/BattlePyramidSquare02/header.inc | 15 - data/maps/BattlePyramidSquare02/map.json | 112 + data/maps/BattlePyramidSquare03/events.inc | 12 - data/maps/BattlePyramidSquare03/header.inc | 15 - data/maps/BattlePyramidSquare03/map.json | 112 + data/maps/BattlePyramidSquare04/events.inc | 12 - data/maps/BattlePyramidSquare04/header.inc | 15 - data/maps/BattlePyramidSquare04/map.json | 112 + data/maps/BattlePyramidSquare05/events.inc | 12 - data/maps/BattlePyramidSquare05/header.inc | 15 - data/maps/BattlePyramidSquare05/map.json | 112 + data/maps/BattlePyramidSquare06/events.inc | 12 - data/maps/BattlePyramidSquare06/header.inc | 15 - data/maps/BattlePyramidSquare06/map.json | 112 + data/maps/BattlePyramidSquare07/events.inc | 12 - data/maps/BattlePyramidSquare07/header.inc | 15 - data/maps/BattlePyramidSquare07/map.json | 112 + data/maps/BattlePyramidSquare08/events.inc | 12 - data/maps/BattlePyramidSquare08/header.inc | 15 - data/maps/BattlePyramidSquare08/map.json | 112 + data/maps/BattlePyramidSquare09/events.inc | 12 - data/maps/BattlePyramidSquare09/header.inc | 15 - data/maps/BattlePyramidSquare09/map.json | 112 + data/maps/BattlePyramidSquare10/events.inc | 12 - data/maps/BattlePyramidSquare10/header.inc | 15 - data/maps/BattlePyramidSquare10/map.json | 112 + data/maps/BattlePyramidSquare11/events.inc | 12 - data/maps/BattlePyramidSquare11/header.inc | 15 - data/maps/BattlePyramidSquare11/map.json | 112 + data/maps/BattlePyramidSquare12/events.inc | 12 - data/maps/BattlePyramidSquare12/header.inc | 15 - data/maps/BattlePyramidSquare12/map.json | 112 + data/maps/BattlePyramidSquare13/events.inc | 12 - data/maps/BattlePyramidSquare13/header.inc | 15 - data/maps/BattlePyramidSquare13/map.json | 112 + data/maps/BattlePyramidSquare14/events.inc | 12 - data/maps/BattlePyramidSquare14/header.inc | 15 - data/maps/BattlePyramidSquare14/map.json | 112 + data/maps/BattlePyramidSquare15/events.inc | 12 - data/maps/BattlePyramidSquare15/header.inc | 15 - data/maps/BattlePyramidSquare15/map.json | 112 + data/maps/BattlePyramidSquare16/events.inc | 12 - data/maps/BattlePyramidSquare16/header.inc | 15 - data/maps/BattlePyramidSquare16/map.json | 112 + data/maps/BirthIsland_Exterior/events.inc | 10 - data/maps/BirthIsland_Exterior/header.inc | 15 - data/maps/BirthIsland_Exterior/map.json | 55 + data/maps/BirthIsland_Harbor/events.inc | 10 - data/maps/BirthIsland_Harbor/header.inc | 15 - data/maps/BirthIsland_Harbor/map.json | 55 + data/maps/CaveOfOrigin_1F/events.inc | 7 - data/maps/CaveOfOrigin_1F/header.inc | 15 - data/maps/CaveOfOrigin_1F/map.json | 35 + data/maps/CaveOfOrigin_B1F/events.inc | 9 - data/maps/CaveOfOrigin_B1F/header.inc | 15 - data/maps/CaveOfOrigin_B1F/map.json | 42 + data/maps/CaveOfOrigin_Entrance/events.inc | 7 - data/maps/CaveOfOrigin_Entrance/header.inc | 15 - data/maps/CaveOfOrigin_Entrance/map.json | 35 + .../events.inc | 7 - .../header.inc | 15 - .../map.json | 35 + .../events.inc | 7 - .../header.inc | 15 - .../map.json | 35 + .../events.inc | 7 - .../header.inc | 15 - .../map.json | 35 + data/maps/DesertRuins/events.inc | 16 - data/maps/DesertRuins/header.inc | 15 - data/maps/DesertRuins/map.json | 81 + data/maps/DesertUnderpass/events.inc | 9 - data/maps/DesertUnderpass/header.inc | 15 - data/maps/DesertUnderpass/map.json | 42 + data/maps/DewfordTown/connections.inc | 8 - data/maps/DewfordTown/events.inc | 24 - data/maps/DewfordTown/header.inc | 15 - data/maps/DewfordTown/map.json | 174 + data/maps/DewfordTown_Gym/events.inc | 23 - data/maps/DewfordTown_Gym/header.inc | 15 - data/maps/DewfordTown_Gym/map.json | 173 + data/maps/DewfordTown_Hall/events.inc | 22 - data/maps/DewfordTown_Hall/header.inc | 15 - data/maps/DewfordTown_Hall/map.json | 170 + data/maps/DewfordTown_House1/events.inc | 12 - data/maps/DewfordTown_House1/header.inc | 15 - data/maps/DewfordTown_House1/map.json | 75 + data/maps/DewfordTown_House2/events.inc | 11 - data/maps/DewfordTown_House2/header.inc | 15 - data/maps/DewfordTown_House2/map.json | 62 + .../DewfordTown_PokemonCenter_1F/events.inc | 13 - .../DewfordTown_PokemonCenter_1F/header.inc | 15 - .../DewfordTown_PokemonCenter_1F/map.json | 82 + .../DewfordTown_PokemonCenter_2F/events.inc | 14 - .../DewfordTown_PokemonCenter_2F/header.inc | 15 - .../DewfordTown_PokemonCenter_2F/map.json | 95 + data/maps/DoubleBattleColosseum/events.inc | 15 - data/maps/DoubleBattleColosseum/header.inc | 15 - data/maps/DoubleBattleColosseum/map.json | 86 + data/maps/EverGrandeCity/connections.inc | 7 - data/maps/EverGrandeCity/events.inc | 29 - data/maps/EverGrandeCity/header.inc | 15 - data/maps/EverGrandeCity/map.json | 196 + .../EverGrandeCity_ChampionsRoom/events.inc | 12 - .../EverGrandeCity_ChampionsRoom/header.inc | 15 - .../EverGrandeCity_ChampionsRoom/map.json | 75 + .../maps/EverGrandeCity_DrakesRoom/events.inc | 10 - .../maps/EverGrandeCity_DrakesRoom/header.inc | 15 - data/maps/EverGrandeCity_DrakesRoom/map.json | 49 + .../EverGrandeCity_GlaciasRoom/events.inc | 10 - .../EverGrandeCity_GlaciasRoom/header.inc | 15 - data/maps/EverGrandeCity_GlaciasRoom/map.json | 49 + data/maps/EverGrandeCity_Hall1/events.inc | 9 - data/maps/EverGrandeCity_Hall1/header.inc | 15 - data/maps/EverGrandeCity_Hall1/map.json | 49 + data/maps/EverGrandeCity_Hall2/events.inc | 9 - data/maps/EverGrandeCity_Hall2/header.inc | 15 - data/maps/EverGrandeCity_Hall2/map.json | 49 + data/maps/EverGrandeCity_Hall3/events.inc | 9 - data/maps/EverGrandeCity_Hall3/header.inc | 15 - data/maps/EverGrandeCity_Hall3/map.json | 49 + data/maps/EverGrandeCity_Hall4/events.inc | 7 - data/maps/EverGrandeCity_Hall4/header.inc | 15 - data/maps/EverGrandeCity_Hall4/map.json | 35 + data/maps/EverGrandeCity_Hall5/events.inc | 9 - data/maps/EverGrandeCity_Hall5/header.inc | 15 - data/maps/EverGrandeCity_Hall5/map.json | 49 + .../maps/EverGrandeCity_HallOfFame/events.inc | 9 - .../maps/EverGrandeCity_HallOfFame/header.inc | 15 - data/maps/EverGrandeCity_HallOfFame/map.json | 42 + .../EverGrandeCity_PhoebesRoom/events.inc | 10 - .../EverGrandeCity_PhoebesRoom/header.inc | 15 - data/maps/EverGrandeCity_PhoebesRoom/map.json | 49 + .../events.inc | 14 - .../header.inc | 15 - .../EverGrandeCity_PokemonCenter_1F/map.json | 95 + .../events.inc | 14 - .../header.inc | 15 - .../EverGrandeCity_PokemonCenter_2F/map.json | 95 + .../events.inc | 16 - .../header.inc | 15 - .../EverGrandeCity_PokemonLeague_1F/map.json | 109 + .../events.inc | 14 - .../header.inc | 15 - .../EverGrandeCity_PokemonLeague_2F/map.json | 95 + .../EverGrandeCity_SidneysRoom/events.inc | 10 - .../EverGrandeCity_SidneysRoom/header.inc | 15 - data/maps/EverGrandeCity_SidneysRoom/map.json | 49 + data/maps/FallarborTown/connections.inc | 8 - data/maps/FallarborTown/events.inc | 26 - data/maps/FallarborTown/header.inc | 15 - data/maps/FallarborTown/map.json | 185 + .../events.inc | 8 - .../header.inc | 15 - .../map.json | 60 + .../events.inc | 6 - .../header.inc | 15 - .../FallarborTown_BattleTentCorridor/map.json | 34 + .../FallarborTown_BattleTentLobby/events.inc | 17 - .../FallarborTown_BattleTentLobby/header.inc | 15 - .../FallarborTown_BattleTentLobby/map.json | 110 + data/maps/FallarborTown_House1/events.inc | 11 - data/maps/FallarborTown_House1/header.inc | 15 - data/maps/FallarborTown_House1/map.json | 62 + data/maps/FallarborTown_House2/events.inc | 10 - data/maps/FallarborTown_House2/header.inc | 15 - data/maps/FallarborTown_House2/map.json | 49 + data/maps/FallarborTown_Mart/events.inc | 14 - data/maps/FallarborTown_Mart/header.inc | 15 - data/maps/FallarborTown_Mart/map.json | 101 + .../FallarborTown_PokemonCenter_1F/events.inc | 14 - .../FallarborTown_PokemonCenter_1F/header.inc | 15 - .../FallarborTown_PokemonCenter_1F/map.json | 95 + .../FallarborTown_PokemonCenter_2F/events.inc | 14 - .../FallarborTown_PokemonCenter_2F/header.inc | 15 - .../FallarborTown_PokemonCenter_2F/map.json | 95 + data/maps/FarawayIsland_Entrance/events.inc | 19 - data/maps/FarawayIsland_Entrance/header.inc | 15 - data/maps/FarawayIsland_Entrance/map.json | 99 + data/maps/FarawayIsland_Interior/events.inc | 10 - data/maps/FarawayIsland_Interior/header.inc | 15 - data/maps/FarawayIsland_Interior/map.json | 49 + data/maps/FieryPath/events.inc | 17 - data/maps/FieryPath/header.inc | 15 - data/maps/FieryPath/map.json | 140 + data/maps/FortreeCity/connections.inc | 8 - data/maps/FortreeCity/events.inc | 31 - data/maps/FortreeCity/header.inc | 15 - data/maps/FortreeCity/map.json | 236 + .../FortreeCity_DecorationShop/events.inc | 13 - .../FortreeCity_DecorationShop/header.inc | 15 - data/maps/FortreeCity_DecorationShop/map.json | 88 + data/maps/FortreeCity_Gym/events.inc | 21 - data/maps/FortreeCity_Gym/header.inc | 15 - data/maps/FortreeCity_Gym/map.json | 157 + data/maps/FortreeCity_House1/events.inc | 12 - data/maps/FortreeCity_House1/header.inc | 15 - data/maps/FortreeCity_House1/map.json | 75 + data/maps/FortreeCity_House2/events.inc | 11 - data/maps/FortreeCity_House2/header.inc | 15 - data/maps/FortreeCity_House2/map.json | 62 + data/maps/FortreeCity_House3/events.inc | 11 - data/maps/FortreeCity_House3/header.inc | 15 - data/maps/FortreeCity_House3/map.json | 62 + data/maps/FortreeCity_House4/events.inc | 12 - data/maps/FortreeCity_House4/header.inc | 15 - data/maps/FortreeCity_House4/map.json | 75 + data/maps/FortreeCity_House5/events.inc | 12 - data/maps/FortreeCity_House5/header.inc | 15 - data/maps/FortreeCity_House5/map.json | 75 + data/maps/FortreeCity_Mart/events.inc | 13 - data/maps/FortreeCity_Mart/header.inc | 15 - data/maps/FortreeCity_Mart/map.json | 88 + .../FortreeCity_PokemonCenter_1F/events.inc | 14 - .../FortreeCity_PokemonCenter_1F/header.inc | 15 - .../FortreeCity_PokemonCenter_1F/map.json | 95 + .../FortreeCity_PokemonCenter_2F/events.inc | 14 - .../FortreeCity_PokemonCenter_2F/header.inc | 15 - .../FortreeCity_PokemonCenter_2F/map.json | 95 + data/maps/GraniteCave_1F/events.inc | 13 - data/maps/GraniteCave_1F/header.inc | 15 - data/maps/GraniteCave_1F/map.json | 76 + data/maps/GraniteCave_B1F/events.inc | 15 - data/maps/GraniteCave_B1F/header.inc | 15 - data/maps/GraniteCave_B1F/map.json | 84 + data/maps/GraniteCave_B2F/events.inc | 25 - data/maps/GraniteCave_B2F/header.inc | 15 - data/maps/GraniteCave_B2F/map.json | 191 + data/maps/GraniteCave_StevensRoom/events.inc | 9 - data/maps/GraniteCave_StevensRoom/header.inc | 15 - data/maps/GraniteCave_StevensRoom/map.json | 42 + data/maps/InsideOfTruck/events.inc | 25 - data/maps/InsideOfTruck/header.inc | 15 - data/maps/InsideOfTruck/map.json | 151 + data/maps/IslandCave/events.inc | 16 - data/maps/IslandCave/header.inc | 15 - data/maps/IslandCave/map.json | 81 + data/maps/JaggedPass/events.inc | 35 - data/maps/JaggedPass/header.inc | 15 - data/maps/JaggedPass/map.json | 246 + data/maps/LavaridgeTown/connections.inc | 7 - data/maps/LavaridgeTown/events.inc | 35 - data/maps/LavaridgeTown/header.inc | 15 - data/maps/LavaridgeTown/map.json | 262 + data/maps/LavaridgeTown_Gym_1F/events.inc | 43 - data/maps/LavaridgeTown_Gym_1F/header.inc | 15 - data/maps/LavaridgeTown_Gym_1F/map.json | 299 ++ data/maps/LavaridgeTown_Gym_B1F/events.inc | 35 - data/maps/LavaridgeTown_Gym_B1F/header.inc | 15 - data/maps/LavaridgeTown_Gym_B1F/map.json | 242 + data/maps/LavaridgeTown_HerbShop/events.inc | 12 - data/maps/LavaridgeTown_HerbShop/header.inc | 15 - data/maps/LavaridgeTown_HerbShop/map.json | 75 + data/maps/LavaridgeTown_House/events.inc | 12 - data/maps/LavaridgeTown_House/header.inc | 15 - data/maps/LavaridgeTown_House/map.json | 75 + data/maps/LavaridgeTown_Mart/events.inc | 12 - data/maps/LavaridgeTown_Mart/header.inc | 15 - data/maps/LavaridgeTown_Mart/map.json | 75 + .../LavaridgeTown_PokemonCenter_1F/events.inc | 15 - .../LavaridgeTown_PokemonCenter_1F/header.inc | 15 - .../LavaridgeTown_PokemonCenter_1F/map.json | 102 + .../LavaridgeTown_PokemonCenter_2F/events.inc | 14 - .../LavaridgeTown_PokemonCenter_2F/header.inc | 15 - .../LavaridgeTown_PokemonCenter_2F/map.json | 95 + data/maps/LilycoveCity/connections.inc | 8 - data/maps/LilycoveCity/events.inc | 58 - data/maps/LilycoveCity/header.inc | 15 - data/maps/LilycoveCity/map.json | 522 ++ data/maps/LilycoveCity_ContestHall/events.inc | 51 - data/maps/LilycoveCity_ContestHall/header.inc | 15 - data/maps/LilycoveCity_ContestHall/map.json | 515 ++ .../maps/LilycoveCity_ContestLobby/events.inc | 50 - .../maps/LilycoveCity_ContestLobby/header.inc | 15 - data/maps/LilycoveCity_ContestLobby/map.json | 472 ++ .../LilycoveCity_CoveLilyMotel_1F/events.inc | 14 - .../LilycoveCity_CoveLilyMotel_1F/header.inc | 15 - .../LilycoveCity_CoveLilyMotel_1F/map.json | 66 + .../LilycoveCity_CoveLilyMotel_2F/events.inc | 15 - .../LilycoveCity_CoveLilyMotel_2F/header.inc | 15 - .../LilycoveCity_CoveLilyMotel_2F/map.json | 120 + .../events.inc | 10 - .../header.inc | 15 - .../map.json | 49 + .../events.inc | 16 - .../header.inc | 15 - .../map.json | 98 + .../events.inc | 20 - .../header.inc | 15 - .../LilycoveCity_DepartmentStore_1F/map.json | 137 + .../events.inc | 15 - .../header.inc | 15 - .../LilycoveCity_DepartmentStore_2F/map.json | 108 + .../events.inc | 15 - .../header.inc | 15 - .../LilycoveCity_DepartmentStore_3F/map.json | 108 + .../events.inc | 15 - .../header.inc | 15 - .../LilycoveCity_DepartmentStore_4F/map.json | 108 + .../events.inc | 17 - .../header.inc | 15 - .../LilycoveCity_DepartmentStore_5F/map.json | 134 + data/maps/LilycoveCity_Harbor/events.inc | 14 - data/maps/LilycoveCity_Harbor/header.inc | 15 - data/maps/LilycoveCity_Harbor/map.json | 101 + data/maps/LilycoveCity_House1/events.inc | 11 - data/maps/LilycoveCity_House1/header.inc | 15 - data/maps/LilycoveCity_House1/map.json | 62 + data/maps/LilycoveCity_House2/events.inc | 10 - data/maps/LilycoveCity_House2/header.inc | 15 - data/maps/LilycoveCity_House2/map.json | 49 + data/maps/LilycoveCity_House3/events.inc | 15 - data/maps/LilycoveCity_House3/header.inc | 15 - data/maps/LilycoveCity_House3/map.json | 114 + data/maps/LilycoveCity_House4/events.inc | 11 - data/maps/LilycoveCity_House4/header.inc | 15 - data/maps/LilycoveCity_House4/map.json | 62 + .../LilycoveCity_LilycoveMuseum_1F/events.inc | 38 - .../LilycoveCity_LilycoveMuseum_1F/header.inc | 15 - .../LilycoveCity_LilycoveMuseum_1F/map.json | 302 ++ .../LilycoveCity_LilycoveMuseum_2F/events.inc | 26 - .../LilycoveCity_LilycoveMuseum_2F/header.inc | 15 - .../LilycoveCity_LilycoveMuseum_2F/map.json | 178 + .../LilycoveCity_MoveDeletersHouse/events.inc | 10 - .../LilycoveCity_MoveDeletersHouse/header.inc | 15 - .../LilycoveCity_MoveDeletersHouse/map.json | 49 + .../LilycoveCity_PokemonCenter_1F/events.inc | 15 - .../LilycoveCity_PokemonCenter_1F/header.inc | 15 - .../LilycoveCity_PokemonCenter_1F/map.json | 108 + .../LilycoveCity_PokemonCenter_2F/events.inc | 14 - .../LilycoveCity_PokemonCenter_2F/header.inc | 15 - .../LilycoveCity_PokemonCenter_2F/map.json | 95 + .../events.inc | 18 - .../header.inc | 15 - .../map.json | 153 + data/maps/LilycoveCity_UnusedMart/events.inc | 7 - data/maps/LilycoveCity_UnusedMart/header.inc | 15 - data/maps/LilycoveCity_UnusedMart/map.json | 35 + data/maps/LinkContestRoom1/events.inc | 20 - data/maps/LinkContestRoom1/header.inc | 15 - data/maps/LinkContestRoom1/map.json | 216 + data/maps/LinkContestRoom2/events.inc | 1 - data/maps/LinkContestRoom2/header.inc | 15 - data/maps/LinkContestRoom2/map.json | 18 + data/maps/LinkContestRoom3/events.inc | 1 - data/maps/LinkContestRoom3/header.inc | 15 - data/maps/LinkContestRoom3/map.json | 18 + data/maps/LinkContestRoom4/events.inc | 1 - data/maps/LinkContestRoom4/header.inc | 15 - data/maps/LinkContestRoom4/map.json | 18 + data/maps/LinkContestRoom5/events.inc | 1 - data/maps/LinkContestRoom5/header.inc | 15 - data/maps/LinkContestRoom5/map.json | 18 + data/maps/LinkContestRoom6/events.inc | 1 - data/maps/LinkContestRoom6/header.inc | 15 - data/maps/LinkContestRoom6/map.json | 18 + data/maps/LittlerootTown/connections.inc | 7 - data/maps/LittlerootTown/events.inc | 35 - data/maps/LittlerootTown/header.inc | 15 - data/maps/LittlerootTown/map.json | 268 + .../events.inc | 23 - .../header.inc | 15 - .../LittlerootTown_BrendansHouse_1F/map.json | 171 + .../events.inc | 30 - .../header.inc | 15 - .../LittlerootTown_BrendansHouse_2F/map.json | 270 + .../LittlerootTown_MaysHouse_1F/events.inc | 23 - .../LittlerootTown_MaysHouse_1F/header.inc | 15 - .../maps/LittlerootTown_MaysHouse_1F/map.json | 171 + .../LittlerootTown_MaysHouse_2F/events.inc | 30 - .../LittlerootTown_MaysHouse_2F/header.inc | 15 - .../maps/LittlerootTown_MaysHouse_2F/map.json | 270 + .../events.inc | 32 - .../header.inc | 15 - .../map.json | 235 + .../scripts.inc | 4 +- data/maps/MagmaHideout_1F/events.inc | 17 - data/maps/MagmaHideout_1F/header.inc | 15 - data/maps/MagmaHideout_1F/map.json | 128 + data/maps/MagmaHideout_2F_1R/events.inc | 14 - data/maps/MagmaHideout_2F_1R/header.inc | 15 - data/maps/MagmaHideout_2F_1R/map.json | 95 + data/maps/MagmaHideout_2F_2R/events.inc | 15 - data/maps/MagmaHideout_2F_2R/header.inc | 15 - data/maps/MagmaHideout_2F_2R/map.json | 114 + data/maps/MagmaHideout_2F_3R/events.inc | 7 - data/maps/MagmaHideout_2F_3R/header.inc | 15 - data/maps/MagmaHideout_2F_3R/map.json | 35 + data/maps/MagmaHideout_3F_1R/events.inc | 13 - data/maps/MagmaHideout_3F_1R/header.inc | 15 - data/maps/MagmaHideout_3F_1R/map.json | 82 + data/maps/MagmaHideout_3F_2R/events.inc | 10 - data/maps/MagmaHideout_3F_2R/header.inc | 15 - data/maps/MagmaHideout_3F_2R/map.json | 55 + data/maps/MagmaHideout_3F_3R/events.inc | 10 - data/maps/MagmaHideout_3F_3R/header.inc | 15 - data/maps/MagmaHideout_3F_3R/map.json | 49 + data/maps/MagmaHideout_4F/events.inc | 17 - data/maps/MagmaHideout_4F/header.inc | 15 - data/maps/MagmaHideout_4F/map.json | 140 + data/maps/MarineCave_End/events.inc | 12 - data/maps/MarineCave_End/header.inc | 15 - data/maps/MarineCave_End/map.json | 52 + data/maps/MarineCave_Entrance/events.inc | 6 - data/maps/MarineCave_Entrance/header.inc | 15 - data/maps/MarineCave_Entrance/map.json | 28 + data/maps/MauvilleCity/connections.inc | 10 - data/maps/MauvilleCity/events.inc | 35 - data/maps/MauvilleCity/header.inc | 15 - data/maps/MauvilleCity/map.json | 300 ++ data/maps/MauvilleCity_BikeShop/events.inc | 15 - data/maps/MauvilleCity_BikeShop/header.inc | 15 - data/maps/MauvilleCity_BikeShop/map.json | 79 + data/maps/MauvilleCity_GameCorner/events.inc | 47 - data/maps/MauvilleCity_GameCorner/header.inc | 15 - data/maps/MauvilleCity_GameCorner/map.json | 385 ++ data/maps/MauvilleCity_Gym/events.inc | 26 - data/maps/MauvilleCity_Gym/header.inc | 15 - data/maps/MauvilleCity_Gym/map.json | 181 + data/maps/MauvilleCity_House1/events.inc | 10 - data/maps/MauvilleCity_House1/header.inc | 15 - data/maps/MauvilleCity_House1/map.json | 49 + data/maps/MauvilleCity_House2/events.inc | 10 - data/maps/MauvilleCity_House2/header.inc | 15 - data/maps/MauvilleCity_House2/map.json | 49 + data/maps/MauvilleCity_Mart/events.inc | 12 - data/maps/MauvilleCity_Mart/header.inc | 15 - data/maps/MauvilleCity_Mart/map.json | 75 + .../MauvilleCity_PokemonCenter_1F/events.inc | 15 - .../MauvilleCity_PokemonCenter_1F/header.inc | 15 - .../MauvilleCity_PokemonCenter_1F/map.json | 108 + .../MauvilleCity_PokemonCenter_2F/events.inc | 15 - .../MauvilleCity_PokemonCenter_2F/header.inc | 15 - .../MauvilleCity_PokemonCenter_2F/map.json | 108 + data/maps/MeteorFalls_1F_1R/events.inc | 29 - data/maps/MeteorFalls_1F_1R/header.inc | 15 - data/maps/MeteorFalls_1F_1R/map.json | 213 + data/maps/MeteorFalls_1F_2R/events.inc | 17 - data/maps/MeteorFalls_1F_2R/header.inc | 15 - data/maps/MeteorFalls_1F_2R/map.json | 98 + data/maps/MeteorFalls_B1F_1R/events.inc | 11 - data/maps/MeteorFalls_B1F_1R/header.inc | 15 - data/maps/MeteorFalls_B1F_1R/map.json | 63 + data/maps/MeteorFalls_B1F_2R/events.inc | 9 - data/maps/MeteorFalls_B1F_2R/header.inc | 15 - data/maps/MeteorFalls_B1F_2R/map.json | 42 + data/maps/MeteorFalls_StevensCave/events.inc | 9 - data/maps/MeteorFalls_StevensCave/header.inc | 15 - data/maps/MeteorFalls_StevensCave/map.json | 42 + data/maps/MirageTower_1F/events.inc | 7 - data/maps/MirageTower_1F/header.inc | 15 - data/maps/MirageTower_1F/map.json | 35 + data/maps/MirageTower_2F/events.inc | 7 - data/maps/MirageTower_2F/header.inc | 15 - data/maps/MirageTower_2F/map.json | 35 + data/maps/MirageTower_3F/events.inc | 11 - data/maps/MirageTower_3F/header.inc | 15 - data/maps/MirageTower_3F/map.json | 62 + data/maps/MirageTower_4F/events.inc | 11 - data/maps/MirageTower_4F/header.inc | 15 - data/maps/MirageTower_4F/map.json | 68 + data/maps/MossdeepCity/connections.inc | 9 - data/maps/MossdeepCity/events.inc | 56 - data/maps/MossdeepCity/header.inc | 15 - data/maps/MossdeepCity/map.json | 485 ++ .../MossdeepCity_GameCorner_1F/events.inc | 17 - .../MossdeepCity_GameCorner_1F/header.inc | 15 - data/maps/MossdeepCity_GameCorner_1F/map.json | 94 + .../MossdeepCity_GameCorner_B1F/events.inc | 9 - .../MossdeepCity_GameCorner_B1F/header.inc | 15 - .../maps/MossdeepCity_GameCorner_B1F/map.json | 42 + data/maps/MossdeepCity_Gym/events.inc | 72 - data/maps/MossdeepCity_Gym/header.inc | 15 - data/maps/MossdeepCity_Gym/map.json | 687 +++ data/maps/MossdeepCity_House1/events.inc | 11 - data/maps/MossdeepCity_House1/header.inc | 15 - data/maps/MossdeepCity_House1/map.json | 62 + data/maps/MossdeepCity_House2/events.inc | 12 - data/maps/MossdeepCity_House2/header.inc | 15 - data/maps/MossdeepCity_House2/map.json | 75 + data/maps/MossdeepCity_House3/events.inc | 10 - data/maps/MossdeepCity_House3/header.inc | 15 - data/maps/MossdeepCity_House3/map.json | 49 + data/maps/MossdeepCity_House4/events.inc | 12 - data/maps/MossdeepCity_House4/header.inc | 15 - data/maps/MossdeepCity_House4/map.json | 75 + data/maps/MossdeepCity_Mart/events.inc | 13 - data/maps/MossdeepCity_Mart/header.inc | 15 - data/maps/MossdeepCity_Mart/map.json | 88 + .../MossdeepCity_PokemonCenter_1F/events.inc | 13 - .../MossdeepCity_PokemonCenter_1F/header.inc | 15 - .../MossdeepCity_PokemonCenter_1F/map.json | 82 + .../MossdeepCity_PokemonCenter_2F/events.inc | 15 - .../MossdeepCity_PokemonCenter_2F/header.inc | 15 - .../MossdeepCity_PokemonCenter_2F/map.json | 108 + .../MossdeepCity_SpaceCenter_1F/events.inc | 21 - .../MossdeepCity_SpaceCenter_1F/header.inc | 15 - .../maps/MossdeepCity_SpaceCenter_1F/map.json | 186 + .../MossdeepCity_SpaceCenter_2F/events.inc | 17 - .../MossdeepCity_SpaceCenter_2F/header.inc | 15 - .../maps/MossdeepCity_SpaceCenter_2F/map.json | 146 + .../maps/MossdeepCity_StevensHouse/events.inc | 18 - .../maps/MossdeepCity_StevensHouse/header.inc | 15 - data/maps/MossdeepCity_StevensHouse/map.json | 108 + data/maps/MtChimney/events.inc | 45 - data/maps/MtChimney/header.inc | 15 - data/maps/MtChimney/map.json | 457 ++ .../maps/MtChimney_CableCarStation/events.inc | 11 - .../maps/MtChimney_CableCarStation/header.inc | 15 - data/maps/MtChimney_CableCarStation/map.json | 62 + data/maps/MtPyre_1F/events.inc | 16 - data/maps/MtPyre_1F/header.inc | 15 - data/maps/MtPyre_1F/map.json | 103 + data/maps/MtPyre_2F/events.inc | 20 - data/maps/MtPyre_2F/header.inc | 15 - data/maps/MtPyre_2F/map.json | 161 + data/maps/MtPyre_3F/events.inc | 17 - data/maps/MtPyre_3F/header.inc | 15 - data/maps/MtPyre_3F/map.json | 116 + data/maps/MtPyre_4F/events.inc | 15 - data/maps/MtPyre_4F/header.inc | 15 - data/maps/MtPyre_4F/map.json | 90 + data/maps/MtPyre_5F/events.inc | 14 - data/maps/MtPyre_5F/header.inc | 15 - data/maps/MtPyre_5F/map.json | 83 + data/maps/MtPyre_6F/events.inc | 12 - data/maps/MtPyre_6F/header.inc | 15 - data/maps/MtPyre_6F/map.json | 75 + data/maps/MtPyre_Exterior/events.inc | 23 - data/maps/MtPyre_Exterior/header.inc | 15 - data/maps/MtPyre_Exterior/map.json | 132 + data/maps/MtPyre_Summit/events.inc | 30 - data/maps/MtPyre_Summit/header.inc | 15 - data/maps/MtPyre_Summit/map.json | 219 + data/maps/NavelRock_B1F/events.inc | 7 - data/maps/NavelRock_B1F/header.inc | 15 - data/maps/NavelRock_B1F/map.json | 35 + data/maps/NavelRock_Bottom/events.inc | 9 - data/maps/NavelRock_Bottom/header.inc | 15 - data/maps/NavelRock_Bottom/map.json | 42 + data/maps/NavelRock_Down01/events.inc | 7 - data/maps/NavelRock_Down01/header.inc | 15 - data/maps/NavelRock_Down01/map.json | 35 + data/maps/NavelRock_Down02/events.inc | 7 - data/maps/NavelRock_Down02/header.inc | 15 - data/maps/NavelRock_Down02/map.json | 35 + data/maps/NavelRock_Down03/events.inc | 7 - data/maps/NavelRock_Down03/header.inc | 15 - data/maps/NavelRock_Down03/map.json | 35 + data/maps/NavelRock_Down04/events.inc | 7 - data/maps/NavelRock_Down04/header.inc | 15 - data/maps/NavelRock_Down04/map.json | 35 + data/maps/NavelRock_Down05/events.inc | 7 - data/maps/NavelRock_Down05/header.inc | 15 - data/maps/NavelRock_Down05/map.json | 35 + data/maps/NavelRock_Down06/events.inc | 7 - data/maps/NavelRock_Down06/header.inc | 15 - data/maps/NavelRock_Down06/map.json | 35 + data/maps/NavelRock_Down07/events.inc | 7 - data/maps/NavelRock_Down07/header.inc | 15 - data/maps/NavelRock_Down07/map.json | 35 + data/maps/NavelRock_Down08/events.inc | 7 - data/maps/NavelRock_Down08/header.inc | 15 - data/maps/NavelRock_Down08/map.json | 35 + data/maps/NavelRock_Down09/events.inc | 7 - data/maps/NavelRock_Down09/header.inc | 15 - data/maps/NavelRock_Down09/map.json | 35 + data/maps/NavelRock_Down10/events.inc | 7 - data/maps/NavelRock_Down10/header.inc | 15 - data/maps/NavelRock_Down10/map.json | 35 + data/maps/NavelRock_Down11/events.inc | 7 - data/maps/NavelRock_Down11/header.inc | 15 - data/maps/NavelRock_Down11/map.json | 35 + data/maps/NavelRock_Entrance/events.inc | 7 - data/maps/NavelRock_Entrance/header.inc | 15 - data/maps/NavelRock_Entrance/map.json | 35 + data/maps/NavelRock_Exterior/events.inc | 7 - data/maps/NavelRock_Exterior/header.inc | 15 - data/maps/NavelRock_Exterior/map.json | 35 + data/maps/NavelRock_Fork/events.inc | 8 - data/maps/NavelRock_Fork/header.inc | 15 - data/maps/NavelRock_Fork/map.json | 42 + data/maps/NavelRock_Harbor/events.inc | 10 - data/maps/NavelRock_Harbor/header.inc | 15 - data/maps/NavelRock_Harbor/map.json | 55 + data/maps/NavelRock_Top/events.inc | 15 - data/maps/NavelRock_Top/header.inc | 15 - data/maps/NavelRock_Top/map.json | 61 + data/maps/NavelRock_Up1/events.inc | 7 - data/maps/NavelRock_Up1/header.inc | 15 - data/maps/NavelRock_Up1/map.json | 35 + data/maps/NavelRock_Up2/events.inc | 7 - data/maps/NavelRock_Up2/header.inc | 15 - data/maps/NavelRock_Up2/map.json | 35 + data/maps/NavelRock_Up3/events.inc | 7 - data/maps/NavelRock_Up3/header.inc | 15 - data/maps/NavelRock_Up3/map.json | 35 + data/maps/NavelRock_Up4/events.inc | 7 - data/maps/NavelRock_Up4/header.inc | 15 - data/maps/NavelRock_Up4/map.json | 35 + data/maps/NewMauville_Entrance/events.inc | 10 - data/maps/NewMauville_Entrance/header.inc | 15 - data/maps/NewMauville_Entrance/map.json | 45 + data/maps/NewMauville_Inside/events.inc | 38 - data/maps/NewMauville_Inside/header.inc | 15 - data/maps/NewMauville_Inside/map.json | 289 ++ data/maps/OldaleTown/connections.inc | 9 - data/maps/OldaleTown/events.inc | 28 - data/maps/OldaleTown/header.inc | 15 - data/maps/OldaleTown/map.json | 196 + data/maps/OldaleTown_House1/events.inc | 10 - data/maps/OldaleTown_House1/header.inc | 15 - data/maps/OldaleTown_House1/map.json | 49 + data/maps/OldaleTown_House2/events.inc | 11 - data/maps/OldaleTown_House2/header.inc | 15 - data/maps/OldaleTown_House2/map.json | 62 + data/maps/OldaleTown_Mart/events.inc | 12 - data/maps/OldaleTown_Mart/header.inc | 15 - data/maps/OldaleTown_Mart/map.json | 75 + .../OldaleTown_PokemonCenter_1F/events.inc | 14 - .../OldaleTown_PokemonCenter_1F/header.inc | 15 - .../maps/OldaleTown_PokemonCenter_1F/map.json | 95 + .../OldaleTown_PokemonCenter_2F/events.inc | 14 - .../OldaleTown_PokemonCenter_2F/header.inc | 15 - .../maps/OldaleTown_PokemonCenter_2F/map.json | 95 + data/maps/PacifidlogTown/connections.inc | 8 - data/maps/PacifidlogTown/events.inc | 21 - data/maps/PacifidlogTown/header.inc | 15 - data/maps/PacifidlogTown/map.json | 139 + data/maps/PacifidlogTown_House1/events.inc | 11 - data/maps/PacifidlogTown_House1/header.inc | 15 - data/maps/PacifidlogTown_House1/map.json | 62 + data/maps/PacifidlogTown_House2/events.inc | 12 - data/maps/PacifidlogTown_House2/header.inc | 15 - data/maps/PacifidlogTown_House2/map.json | 75 + data/maps/PacifidlogTown_House3/events.inc | 11 - data/maps/PacifidlogTown_House3/header.inc | 15 - data/maps/PacifidlogTown_House3/map.json | 62 + data/maps/PacifidlogTown_House4/events.inc | 12 - data/maps/PacifidlogTown_House4/header.inc | 15 - data/maps/PacifidlogTown_House4/map.json | 75 + data/maps/PacifidlogTown_House5/events.inc | 11 - data/maps/PacifidlogTown_House5/header.inc | 15 - data/maps/PacifidlogTown_House5/map.json | 62 + .../events.inc | 15 - .../header.inc | 15 - .../PacifidlogTown_PokemonCenter_1F/map.json | 108 + .../events.inc | 14 - .../header.inc | 15 - .../PacifidlogTown_PokemonCenter_2F/map.json | 95 + data/maps/PetalburgCity/connections.inc | 8 - data/maps/PetalburgCity/events.inc | 42 - data/maps/PetalburgCity/header.inc | 15 - data/maps/PetalburgCity/map.json | 330 ++ data/maps/PetalburgCity_Gym/events.inc | 72 - data/maps/PetalburgCity_Gym/header.inc | 15 - data/maps/PetalburgCity_Gym/map.json | 544 ++ data/maps/PetalburgCity_House1/events.inc | 11 - data/maps/PetalburgCity_House1/header.inc | 15 - data/maps/PetalburgCity_House1/map.json | 62 + data/maps/PetalburgCity_House2/events.inc | 11 - data/maps/PetalburgCity_House2/header.inc | 15 - data/maps/PetalburgCity_House2/map.json | 62 + data/maps/PetalburgCity_Mart/events.inc | 13 - data/maps/PetalburgCity_Mart/header.inc | 15 - data/maps/PetalburgCity_Mart/map.json | 88 + .../PetalburgCity_PokemonCenter_1F/events.inc | 15 - .../PetalburgCity_PokemonCenter_1F/header.inc | 15 - .../PetalburgCity_PokemonCenter_1F/map.json | 108 + .../PetalburgCity_PokemonCenter_2F/events.inc | 14 - .../PetalburgCity_PokemonCenter_2F/header.inc | 15 - .../PetalburgCity_PokemonCenter_2F/map.json | 95 + .../maps/PetalburgCity_WallysHouse/events.inc | 11 - .../maps/PetalburgCity_WallysHouse/header.inc | 15 - data/maps/PetalburgCity_WallysHouse/map.json | 62 + data/maps/PetalburgWoods/events.inc | 38 - data/maps/PetalburgWoods/header.inc | 15 - data/maps/PetalburgWoods/map.json | 301 ++ data/maps/RecordCorner/events.inc | 18 - data/maps/RecordCorner/header.inc | 15 - data/maps/RecordCorner/map.json | 100 + data/maps/Route101/connections.inc | 8 - data/maps/Route101/events.inc | 25 - data/maps/Route101/header.inc | 15 - data/maps/Route101/map.json | 201 + data/maps/Route102/connections.inc | 8 - data/maps/Route102/events.inc | 18 - data/maps/Route102/header.inc | 15 - data/maps/Route102/map.json | 166 + data/maps/Route103/connections.inc | 8 - data/maps/Route103/events.inc | 31 - data/maps/Route103/header.inc | 15 - data/maps/Route103/map.json | 309 ++ data/maps/Route104/connections.inc | 9 - data/maps/Route104/events.inc | 64 - data/maps/Route104/header.inc | 15 - data/maps/Route104/map.json | 627 +++ data/maps/Route104_MrBrineysHouse/events.inc | 11 - data/maps/Route104_MrBrineysHouse/header.inc | 15 - data/maps/Route104_MrBrineysHouse/map.json | 62 + .../Route104_PrettyPetalFlowerShop/events.inc | 12 - .../Route104_PrettyPetalFlowerShop/header.inc | 15 - .../Route104_PrettyPetalFlowerShop/map.json | 75 + data/maps/Route104_Prototype/events.inc | 3 - data/maps/Route104_Prototype/header.inc | 15 - data/maps/Route104_Prototype/map.json | 20 + .../events.inc | 3 - .../header.inc | 15 - .../map.json | 20 + data/maps/Route105/connections.inc | 9 - data/maps/Route105/events.inc | 20 - data/maps/Route105/header.inc | 15 - data/maps/Route105/map.json | 166 + data/maps/Route106/connections.inc | 8 - data/maps/Route106/events.inc | 19 - data/maps/Route106/header.inc | 15 - data/maps/Route106/map.json | 138 + data/maps/Route107/connections.inc | 8 - data/maps/Route107/events.inc | 12 - data/maps/Route107/header.inc | 15 - data/maps/Route107/map.json | 123 + data/maps/Route108/connections.inc | 8 - data/maps/Route108/events.inc | 18 - data/maps/Route108/header.inc | 15 - data/maps/Route108/map.json | 140 + data/maps/Route109/connections.inc | 8 - data/maps/Route109/events.inc | 42 - data/maps/Route109/header.inc | 15 - data/maps/Route109/map.json | 417 ++ data/maps/Route109_SeashoreHouse/events.inc | 13 - data/maps/Route109_SeashoreHouse/header.inc | 15 - data/maps/Route109_SeashoreHouse/map.json | 88 + data/maps/Route110/connections.inc | 9 - data/maps/Route110/events.inc | 79 - data/maps/Route110/header.inc | 15 - data/maps/Route110/map.json | 765 +++ .../events.inc | 16 - .../header.inc | 15 - .../map.json | 82 + .../events.inc | 16 - .../header.inc | 15 - .../map.json | 82 + .../Route110_TrickHouseCorridor/events.inc | 9 - .../Route110_TrickHouseCorridor/header.inc | 15 - .../maps/Route110_TrickHouseCorridor/map.json | 49 + data/maps/Route110_TrickHouseEnd/events.inc | 16 - data/maps/Route110_TrickHouseEnd/header.inc | 15 - data/maps/Route110_TrickHouseEnd/map.json | 68 + .../Route110_TrickHouseEntrance/events.inc | 20 - .../Route110_TrickHouseEntrance/header.inc | 15 - .../maps/Route110_TrickHouseEntrance/map.json | 102 + .../Route110_TrickHousePuzzle1/events.inc | 28 - .../Route110_TrickHousePuzzle1/header.inc | 15 - data/maps/Route110_TrickHousePuzzle1/map.json | 247 + .../Route110_TrickHousePuzzle2/events.inc | 24 - .../Route110_TrickHousePuzzle2/header.inc | 15 - data/maps/Route110_TrickHousePuzzle2/map.json | 154 + .../Route110_TrickHousePuzzle3/events.inc | 26 - .../Route110_TrickHousePuzzle3/header.inc | 15 - data/maps/Route110_TrickHousePuzzle3/map.json | 180 + .../Route110_TrickHousePuzzle4/events.inc | 27 - .../Route110_TrickHousePuzzle4/header.inc | 15 - data/maps/Route110_TrickHousePuzzle4/map.json | 234 + .../Route110_TrickHousePuzzle5/events.inc | 42 - .../Route110_TrickHousePuzzle5/header.inc | 15 - data/maps/Route110_TrickHousePuzzle5/map.json | 316 ++ .../Route110_TrickHousePuzzle6/events.inc | 17 - .../Route110_TrickHousePuzzle6/header.inc | 15 - data/maps/Route110_TrickHousePuzzle6/map.json | 104 + .../Route110_TrickHousePuzzle7/events.inc | 38 - .../Route110_TrickHousePuzzle7/header.inc | 15 - data/maps/Route110_TrickHousePuzzle7/map.json | 276 ++ .../Route110_TrickHousePuzzle8/events.inc | 17 - .../Route110_TrickHousePuzzle8/header.inc | 15 - data/maps/Route110_TrickHousePuzzle8/map.json | 104 + data/maps/Route111/connections.inc | 9 - data/maps/Route111/events.inc | 114 - data/maps/Route111/header.inc | 15 - data/maps/Route111/map.json | 1115 +++++ data/maps/Route111/scripts.inc | 2 +- .../maps/Route111_OldLadysRestStop/events.inc | 10 - .../maps/Route111_OldLadysRestStop/header.inc | 15 - data/maps/Route111_OldLadysRestStop/map.json | 49 + .../Route111_WinstrateFamilysHouse/events.inc | 13 - .../Route111_WinstrateFamilysHouse/header.inc | 15 - .../Route111_WinstrateFamilysHouse/map.json | 88 + data/maps/Route112/connections.inc | 9 - data/maps/Route112/events.inc | 32 - data/maps/Route112/header.inc | 15 - data/maps/Route112/map.json | 287 ++ data/maps/Route112_CableCarStation/events.inc | 11 - data/maps/Route112_CableCarStation/header.inc | 15 - data/maps/Route112_CableCarStation/map.json | 62 + data/maps/Route113/connections.inc | 9 - data/maps/Route113/events.inc | 57 - data/maps/Route113/header.inc | 15 - data/maps/Route113/map.json | 465 ++ data/maps/Route113_GlassWorkshop/events.inc | 11 - data/maps/Route113_GlassWorkshop/header.inc | 15 - data/maps/Route113_GlassWorkshop/map.json | 62 + data/maps/Route114/connections.inc | 8 - data/maps/Route114/events.inc | 53 - data/maps/Route114/header.inc | 15 - data/maps/Route114/map.json | 509 ++ .../Route114_FossilManiacsHouse/events.inc | 17 - .../Route114_FossilManiacsHouse/header.inc | 15 - .../maps/Route114_FossilManiacsHouse/map.json | 89 + .../Route114_FossilManiacsTunnel/events.inc | 15 - .../Route114_FossilManiacsTunnel/header.inc | 15 - .../Route114_FossilManiacsTunnel/map.json | 75 + data/maps/Route114_LanettesHouse/events.inc | 15 - data/maps/Route114_LanettesHouse/header.inc | 15 - data/maps/Route114_LanettesHouse/map.json | 74 + data/maps/Route115/connections.inc | 8 - data/maps/Route115/events.inc | 49 - data/maps/Route115/header.inc | 15 - data/maps/Route115/map.json | 455 ++ data/maps/Route116/connections.inc | 8 - data/maps/Route116/events.inc | 56 - data/maps/Route116/header.inc | 15 - data/maps/Route116/map.json | 527 ++ .../Route116_TunnelersRestHouse/events.inc | 12 - .../Route116_TunnelersRestHouse/header.inc | 15 - .../maps/Route116_TunnelersRestHouse/map.json | 75 + data/maps/Route117/connections.inc | 8 - data/maps/Route117/events.inc | 38 - data/maps/Route117/header.inc | 15 - data/maps/Route117/map.json | 385 ++ data/maps/Route117_PokemonDayCare/events.inc | 10 - data/maps/Route117_PokemonDayCare/header.inc | 15 - data/maps/Route117_PokemonDayCare/map.json | 49 + data/maps/Route118/connections.inc | 9 - data/maps/Route118/events.inc | 46 - data/maps/Route118/header.inc | 15 - data/maps/Route118/map.json | 421 ++ data/maps/Route119/connections.inc | 8 - data/maps/Route119/events.inc | 99 - data/maps/Route119/header.inc | 15 - data/maps/Route119/map.json | 920 ++++ data/maps/Route119_House/events.inc | 16 - data/maps/Route119_House/header.inc | 15 - data/maps/Route119_House/map.json | 127 + .../Route119_WeatherInstitute_1F/events.inc | 21 - .../Route119_WeatherInstitute_1F/header.inc | 15 - .../Route119_WeatherInstitute_1F/map.json | 141 + .../Route119_WeatherInstitute_2F/events.inc | 16 - .../Route119_WeatherInstitute_2F/header.inc | 15 - .../Route119_WeatherInstitute_2F/map.json | 133 + data/maps/Route120/connections.inc | 8 - data/maps/Route120/events.inc | 90 - data/maps/Route120/header.inc | 15 - data/maps/Route120/map.json | 858 ++++ data/maps/Route121/connections.inc | 9 - data/maps/Route121/events.inc | 55 - data/maps/Route121/header.inc | 15 - data/maps/Route121/map.json | 536 ++ .../Route121_SafariZoneEntrance/events.inc | 20 - .../Route121_SafariZoneEntrance/header.inc | 15 - .../maps/Route121_SafariZoneEntrance/map.json | 108 + data/maps/Route122/connections.inc | 8 - data/maps/Route122/events.inc | 6 - data/maps/Route122/header.inc | 15 - data/maps/Route122/map.json | 39 + data/maps/Route123/connections.inc | 8 - data/maps/Route123/events.inc | 88 - data/maps/Route123/header.inc | 15 - data/maps/Route123/map.json | 840 ++++ .../Route123_BerryMastersHouse/events.inc | 11 - .../Route123_BerryMastersHouse/header.inc | 15 - data/maps/Route123_BerryMastersHouse/map.json | 62 + data/maps/Route124/connections.inc | 11 - data/maps/Route124/events.inc | 23 - data/maps/Route124/header.inc | 15 - data/maps/Route124/map.json | 220 + .../events.inc | 13 - .../header.inc | 15 - .../map.json | 58 + data/maps/Route125/connections.inc | 9 - data/maps/Route125/events.inc | 24 - data/maps/Route125/header.inc | 15 - data/maps/Route125/map.json | 204 + data/maps/Route126/connections.inc | 9 - data/maps/Route126/events.inc | 14 - data/maps/Route126/header.inc | 15 - data/maps/Route126/map.json | 154 + data/maps/Route127/connections.inc | 10 - data/maps/Route127/events.inc | 23 - data/maps/Route127/header.inc | 15 - data/maps/Route127/map.json | 221 + data/maps/Route128/connections.inc | 10 - data/maps/Route128/events.inc | 20 - data/maps/Route128/header.inc | 15 - data/maps/Route128/map.json | 197 + data/maps/Route129/connections.inc | 9 - data/maps/Route129/events.inc | 10 - data/maps/Route129/header.inc | 15 - data/maps/Route129/map.json | 102 + data/maps/Route130/connections.inc | 8 - data/maps/Route130/events.inc | 9 - data/maps/Route130/header.inc | 15 - data/maps/Route130/map.json | 84 + data/maps/Route130/scripts.inc | 4 +- data/maps/Route131/connections.inc | 8 - data/maps/Route131/events.inc | 16 - data/maps/Route131/header.inc | 15 - data/maps/Route131/map.json | 144 + data/maps/Route131/scripts.inc | 2 +- data/maps/Route132/connections.inc | 8 - data/maps/Route132/events.inc | 15 - data/maps/Route132/header.inc | 15 - data/maps/Route132/map.json | 162 + data/maps/Route133/connections.inc | 8 - data/maps/Route133/events.inc | 15 - data/maps/Route133/header.inc | 15 - data/maps/Route133/map.json | 162 + data/maps/Route134/connections.inc | 8 - data/maps/Route134/events.inc | 16 - data/maps/Route134/header.inc | 15 - data/maps/Route134/map.json | 175 + data/maps/RustboroCity/connections.inc | 9 - data/maps/RustboroCity/events.inc | 70 - data/maps/RustboroCity/header.inc | 15 - data/maps/RustboroCity/map.json | 601 +++ .../maps/RustboroCity_CuttersHouse/events.inc | 11 - .../maps/RustboroCity_CuttersHouse/header.inc | 15 - data/maps/RustboroCity_CuttersHouse/map.json | 62 + .../maps/RustboroCity_DevonCorp_1F/events.inc | 17 - .../maps/RustboroCity_DevonCorp_1F/header.inc | 15 - data/maps/RustboroCity_DevonCorp_1F/map.json | 99 + .../maps/RustboroCity_DevonCorp_2F/events.inc | 15 - .../maps/RustboroCity_DevonCorp_2F/header.inc | 15 - data/maps/RustboroCity_DevonCorp_2F/map.json | 114 + .../maps/RustboroCity_DevonCorp_3F/events.inc | 15 - .../maps/RustboroCity_DevonCorp_3F/header.inc | 15 - data/maps/RustboroCity_DevonCorp_3F/map.json | 85 + data/maps/RustboroCity_Flat1_1F/events.inc | 12 - data/maps/RustboroCity_Flat1_1F/header.inc | 15 - data/maps/RustboroCity_Flat1_1F/map.json | 69 + data/maps/RustboroCity_Flat1_2F/events.inc | 16 - data/maps/RustboroCity_Flat1_2F/header.inc | 15 - data/maps/RustboroCity_Flat1_2F/map.json | 133 + data/maps/RustboroCity_Flat2_1F/events.inc | 12 - data/maps/RustboroCity_Flat2_1F/header.inc | 15 - data/maps/RustboroCity_Flat2_1F/map.json | 69 + data/maps/RustboroCity_Flat2_2F/events.inc | 11 - data/maps/RustboroCity_Flat2_2F/header.inc | 15 - data/maps/RustboroCity_Flat2_2F/map.json | 62 + data/maps/RustboroCity_Flat2_3F/events.inc | 10 - data/maps/RustboroCity_Flat2_3F/header.inc | 15 - data/maps/RustboroCity_Flat2_3F/map.json | 55 + data/maps/RustboroCity_Gym/events.inc | 18 - data/maps/RustboroCity_Gym/header.inc | 15 - data/maps/RustboroCity_Gym/map.json | 118 + data/maps/RustboroCity_House1/events.inc | 11 - data/maps/RustboroCity_House1/header.inc | 15 - data/maps/RustboroCity_House1/map.json | 62 + data/maps/RustboroCity_House2/events.inc | 11 - data/maps/RustboroCity_House2/header.inc | 15 - data/maps/RustboroCity_House2/map.json | 62 + data/maps/RustboroCity_House3/events.inc | 12 - data/maps/RustboroCity_House3/header.inc | 15 - data/maps/RustboroCity_House3/map.json | 75 + data/maps/RustboroCity_Mart/events.inc | 13 - data/maps/RustboroCity_Mart/header.inc | 15 - data/maps/RustboroCity_Mart/map.json | 88 + .../RustboroCity_PokemonCenter_1F/events.inc | 14 - .../RustboroCity_PokemonCenter_1F/header.inc | 15 - .../RustboroCity_PokemonCenter_1F/map.json | 95 + .../RustboroCity_PokemonCenter_2F/events.inc | 14 - .../RustboroCity_PokemonCenter_2F/header.inc | 15 - .../RustboroCity_PokemonCenter_2F/map.json | 95 + .../RustboroCity_PokemonSchool/events.inc | 23 - .../RustboroCity_PokemonSchool/header.inc | 15 - data/maps/RustboroCity_PokemonSchool/map.json | 168 + data/maps/RusturfTunnel/events.inc | 27 - data/maps/RusturfTunnel/header.inc | 15 - data/maps/RusturfTunnel/map.json | 219 + data/maps/SSTidalCorridor/events.inc | 35 - data/maps/SSTidalCorridor/header.inc | 15 - data/maps/SSTidalCorridor/map.json | 247 + data/maps/SSTidalLowerDeck/events.inc | 13 - data/maps/SSTidalLowerDeck/header.inc | 15 - data/maps/SSTidalLowerDeck/map.json | 64 + data/maps/SSTidalRooms/events.inc | 31 - data/maps/SSTidalRooms/header.inc | 15 - data/maps/SSTidalRooms/map.json | 227 + data/maps/SafariZone_North/connections.inc | 9 - data/maps/SafariZone_North/events.inc | 14 - data/maps/SafariZone_North/header.inc | 15 - data/maps/SafariZone_North/map.json | 154 + .../maps/SafariZone_Northeast/connections.inc | 8 - data/maps/SafariZone_Northeast/events.inc | 18 - data/maps/SafariZone_Northeast/header.inc | 15 - data/maps/SafariZone_Northeast/map.json | 166 + .../maps/SafariZone_Northwest/connections.inc | 8 - data/maps/SafariZone_Northwest/events.inc | 7 - data/maps/SafariZone_Northwest/header.inc | 15 - data/maps/SafariZone_Northwest/map.json | 58 + data/maps/SafariZone_RestHouse/events.inc | 12 - data/maps/SafariZone_RestHouse/header.inc | 15 - data/maps/SafariZone_RestHouse/map.json | 75 + data/maps/SafariZone_South/connections.inc | 9 - data/maps/SafariZone_South/events.inc | 14 - data/maps/SafariZone_South/header.inc | 15 - data/maps/SafariZone_South/map.json | 123 + .../maps/SafariZone_Southeast/connections.inc | 8 - data/maps/SafariZone_Southeast/events.inc | 14 - data/maps/SafariZone_Southeast/header.inc | 15 - data/maps/SafariZone_Southeast/map.json | 114 + .../maps/SafariZone_Southwest/connections.inc | 8 - data/maps/SafariZone_Southwest/events.inc | 13 - data/maps/SafariZone_Southwest/header.inc | 15 - data/maps/SafariZone_Southwest/map.json | 75 + data/maps/ScorchedSlab/events.inc | 9 - data/maps/ScorchedSlab/header.inc | 15 - data/maps/ScorchedSlab/map.json | 42 + data/maps/SeafloorCavern_Entrance/events.inc | 10 - data/maps/SeafloorCavern_Entrance/header.inc | 15 - data/maps/SeafloorCavern_Entrance/map.json | 49 + data/maps/SeafloorCavern_Room1/events.inc | 15 - data/maps/SeafloorCavern_Room1/header.inc | 15 - data/maps/SeafloorCavern_Room1/map.json | 108 + data/maps/SeafloorCavern_Room2/events.inc | 19 - data/maps/SeafloorCavern_Room2/header.inc | 15 - data/maps/SeafloorCavern_Room2/map.json | 154 + data/maps/SeafloorCavern_Room3/events.inc | 19 - data/maps/SeafloorCavern_Room3/header.inc | 15 - data/maps/SeafloorCavern_Room3/map.json | 160 + data/maps/SeafloorCavern_Room4/events.inc | 13 - data/maps/SeafloorCavern_Room4/header.inc | 15 - data/maps/SeafloorCavern_Room4/map.json | 76 + data/maps/SeafloorCavern_Room5/events.inc | 16 - data/maps/SeafloorCavern_Room5/header.inc | 15 - data/maps/SeafloorCavern_Room5/map.json | 121 + data/maps/SeafloorCavern_Room6/events.inc | 8 - data/maps/SeafloorCavern_Room6/header.inc | 15 - data/maps/SeafloorCavern_Room6/map.json | 42 + data/maps/SeafloorCavern_Room7/events.inc | 7 - data/maps/SeafloorCavern_Room7/header.inc | 15 - data/maps/SeafloorCavern_Room7/map.json | 35 + data/maps/SeafloorCavern_Room8/events.inc | 21 - data/maps/SeafloorCavern_Room8/header.inc | 15 - data/maps/SeafloorCavern_Room8/map.json | 192 + data/maps/SeafloorCavern_Room9/events.inc | 18 - data/maps/SeafloorCavern_Room9/header.inc | 15 - data/maps/SeafloorCavern_Room9/map.json | 130 + data/maps/SealedChamber_InnerRoom/events.inc | 17 - data/maps/SealedChamber_InnerRoom/header.inc | 15 - data/maps/SealedChamber_InnerRoom/map.json | 101 + data/maps/SealedChamber_OuterRoom/events.inc | 37 - data/maps/SealedChamber_OuterRoom/header.inc | 15 - data/maps/SealedChamber_OuterRoom/map.json | 261 + data/maps/SecretBase_BlueCave1/events.inc | 23 - data/maps/SecretBase_BlueCave1/header.inc | 15 - data/maps/SecretBase_BlueCave1/map.json | 224 + data/maps/SecretBase_BlueCave2/events.inc | 23 - data/maps/SecretBase_BlueCave2/header.inc | 15 - data/maps/SecretBase_BlueCave2/map.json | 224 + data/maps/SecretBase_BlueCave3/events.inc | 23 - data/maps/SecretBase_BlueCave3/header.inc | 15 - data/maps/SecretBase_BlueCave3/map.json | 224 + data/maps/SecretBase_BlueCave4/events.inc | 23 - data/maps/SecretBase_BlueCave4/header.inc | 15 - data/maps/SecretBase_BlueCave4/map.json | 224 + data/maps/SecretBase_BrownCave1/events.inc | 23 - data/maps/SecretBase_BrownCave1/header.inc | 15 - data/maps/SecretBase_BrownCave1/map.json | 224 + data/maps/SecretBase_BrownCave2/events.inc | 23 - data/maps/SecretBase_BrownCave2/header.inc | 15 - data/maps/SecretBase_BrownCave2/map.json | 224 + data/maps/SecretBase_BrownCave3/events.inc | 23 - data/maps/SecretBase_BrownCave3/header.inc | 15 - data/maps/SecretBase_BrownCave3/map.json | 224 + data/maps/SecretBase_BrownCave4/events.inc | 23 - data/maps/SecretBase_BrownCave4/header.inc | 15 - data/maps/SecretBase_BrownCave4/map.json | 224 + data/maps/SecretBase_RedCave1/events.inc | 23 - data/maps/SecretBase_RedCave1/header.inc | 15 - data/maps/SecretBase_RedCave1/map.json | 224 + data/maps/SecretBase_RedCave2/events.inc | 23 - data/maps/SecretBase_RedCave2/header.inc | 15 - data/maps/SecretBase_RedCave2/map.json | 224 + data/maps/SecretBase_RedCave3/events.inc | 23 - data/maps/SecretBase_RedCave3/header.inc | 15 - data/maps/SecretBase_RedCave3/map.json | 224 + data/maps/SecretBase_RedCave4/events.inc | 23 - data/maps/SecretBase_RedCave4/header.inc | 15 - data/maps/SecretBase_RedCave4/map.json | 224 + data/maps/SecretBase_Shrub1/events.inc | 23 - data/maps/SecretBase_Shrub1/header.inc | 15 - data/maps/SecretBase_Shrub1/map.json | 224 + data/maps/SecretBase_Shrub2/events.inc | 23 - data/maps/SecretBase_Shrub2/header.inc | 15 - data/maps/SecretBase_Shrub2/map.json | 224 + data/maps/SecretBase_Shrub3/events.inc | 23 - data/maps/SecretBase_Shrub3/header.inc | 15 - data/maps/SecretBase_Shrub3/map.json | 224 + data/maps/SecretBase_Shrub4/events.inc | 23 - data/maps/SecretBase_Shrub4/header.inc | 15 - data/maps/SecretBase_Shrub4/map.json | 224 + data/maps/SecretBase_Tree1/events.inc | 23 - data/maps/SecretBase_Tree1/header.inc | 15 - data/maps/SecretBase_Tree1/map.json | 224 + data/maps/SecretBase_Tree2/events.inc | 23 - data/maps/SecretBase_Tree2/header.inc | 15 - data/maps/SecretBase_Tree2/map.json | 224 + data/maps/SecretBase_Tree3/events.inc | 23 - data/maps/SecretBase_Tree3/header.inc | 15 - data/maps/SecretBase_Tree3/map.json | 224 + data/maps/SecretBase_Tree4/events.inc | 23 - data/maps/SecretBase_Tree4/header.inc | 15 - data/maps/SecretBase_Tree4/map.json | 224 + data/maps/SecretBase_YellowCave1/events.inc | 23 - data/maps/SecretBase_YellowCave1/header.inc | 15 - data/maps/SecretBase_YellowCave1/map.json | 224 + data/maps/SecretBase_YellowCave2/events.inc | 23 - data/maps/SecretBase_YellowCave2/header.inc | 15 - data/maps/SecretBase_YellowCave2/map.json | 224 + data/maps/SecretBase_YellowCave3/events.inc | 23 - data/maps/SecretBase_YellowCave3/header.inc | 15 - data/maps/SecretBase_YellowCave3/map.json | 224 + data/maps/SecretBase_YellowCave4/events.inc | 23 - data/maps/SecretBase_YellowCave4/header.inc | 15 - data/maps/SecretBase_YellowCave4/map.json | 224 + .../ShoalCave_HighTideEntranceRoom/events.inc | 3 - .../ShoalCave_HighTideEntranceRoom/header.inc | 15 - .../ShoalCave_HighTideEntranceRoom/map.json | 20 + .../ShoalCave_HighTideInnerRoom/events.inc | 3 - .../ShoalCave_HighTideInnerRoom/header.inc | 15 - .../maps/ShoalCave_HighTideInnerRoom/map.json | 20 + .../ShoalCave_LowTideEntranceRoom/events.inc | 13 - .../ShoalCave_LowTideEntranceRoom/header.inc | 15 - .../ShoalCave_LowTideEntranceRoom/map.json | 76 + .../ShoalCave_LowTideEntranceRoom/scripts.inc | 4 +- data/maps/ShoalCave_LowTideIceRoom/events.inc | 10 - data/maps/ShoalCave_LowTideIceRoom/header.inc | 15 - data/maps/ShoalCave_LowTideIceRoom/map.json | 55 + .../ShoalCave_LowTideInnerRoom/events.inc | 24 - .../ShoalCave_LowTideInnerRoom/header.inc | 15 - data/maps/ShoalCave_LowTideInnerRoom/map.json | 140 + .../ShoalCave_LowTideInnerRoom/scripts.inc | 4 +- .../ShoalCave_LowTideLowerRoom/events.inc | 16 - .../ShoalCave_LowTideLowerRoom/header.inc | 15 - data/maps/ShoalCave_LowTideLowerRoom/map.json | 85 + .../ShoalCave_LowTideStairsRoom/events.inc | 13 - .../ShoalCave_LowTideStairsRoom/header.inc | 15 - .../maps/ShoalCave_LowTideStairsRoom/map.json | 58 + data/maps/SingleBattleColosseum/events.inc | 14 - data/maps/SingleBattleColosseum/header.inc | 15 - data/maps/SingleBattleColosseum/map.json | 68 + data/maps/SkyPillar_1F/events.inc | 8 - data/maps/SkyPillar_1F/header.inc | 15 - data/maps/SkyPillar_1F/map.json | 42 + data/maps/SkyPillar_1F/scripts.inc | 2 +- data/maps/SkyPillar_2F/events.inc | 7 - data/maps/SkyPillar_2F/header.inc | 15 - data/maps/SkyPillar_2F/map.json | 35 + data/maps/SkyPillar_2F/scripts.inc | 2 +- data/maps/SkyPillar_3F/events.inc | 8 - data/maps/SkyPillar_3F/header.inc | 15 - data/maps/SkyPillar_3F/map.json | 42 + data/maps/SkyPillar_3F/scripts.inc | 2 +- data/maps/SkyPillar_4F/events.inc | 8 - data/maps/SkyPillar_4F/header.inc | 15 - data/maps/SkyPillar_4F/map.json | 42 + data/maps/SkyPillar_4F/scripts.inc | 2 +- data/maps/SkyPillar_5F/events.inc | 7 - data/maps/SkyPillar_5F/header.inc | 15 - data/maps/SkyPillar_5F/map.json | 35 + data/maps/SkyPillar_5F/scripts.inc | 2 +- data/maps/SkyPillar_Entrance/events.inc | 7 - data/maps/SkyPillar_Entrance/header.inc | 15 - data/maps/SkyPillar_Entrance/map.json | 35 + data/maps/SkyPillar_Outside/events.inc | 10 - data/maps/SkyPillar_Outside/header.inc | 15 - data/maps/SkyPillar_Outside/map.json | 49 + data/maps/SkyPillar_Top/events.inc | 13 - data/maps/SkyPillar_Top/header.inc | 15 - data/maps/SkyPillar_Top/map.json | 65 + data/maps/SkyPillar_Top/scripts.inc | 2 +- data/maps/SlateportCity/connections.inc | 9 - data/maps/SlateportCity/events.inc | 71 - data/maps/SlateportCity/header.inc | 15 - data/maps/SlateportCity/map.json | 685 +++ .../events.inc | 8 - .../header.inc | 15 - .../map.json | 60 + .../events.inc | 6 - .../header.inc | 15 - .../SlateportCity_BattleTentCorridor/map.json | 34 + .../SlateportCity_BattleTentLobby/events.inc | 17 - .../SlateportCity_BattleTentLobby/header.inc | 15 - .../SlateportCity_BattleTentLobby/map.json | 110 + data/maps/SlateportCity_Harbor/events.inc | 25 - data/maps/SlateportCity_Harbor/header.inc | 15 - data/maps/SlateportCity_Harbor/map.json | 191 + data/maps/SlateportCity_House1/events.inc | 10 - data/maps/SlateportCity_House1/header.inc | 15 - data/maps/SlateportCity_House1/map.json | 49 + data/maps/SlateportCity_House2/events.inc | 11 - data/maps/SlateportCity_House2/header.inc | 15 - data/maps/SlateportCity_House2/map.json | 62 + data/maps/SlateportCity_Mart/events.inc | 12 - data/maps/SlateportCity_Mart/header.inc | 15 - data/maps/SlateportCity_Mart/map.json | 75 + .../SlateportCity_OceanicMuseum_1F/events.inc | 43 - .../SlateportCity_OceanicMuseum_1F/header.inc | 15 - .../SlateportCity_OceanicMuseum_1F/map.json | 349 ++ .../SlateportCity_OceanicMuseum_2F/events.inc | 38 - .../SlateportCity_OceanicMuseum_2F/header.inc | 15 - .../SlateportCity_OceanicMuseum_2F/map.json | 289 ++ .../SlateportCity_PokemonCenter_1F/events.inc | 13 - .../SlateportCity_PokemonCenter_1F/header.inc | 15 - .../SlateportCity_PokemonCenter_1F/map.json | 82 + .../SlateportCity_PokemonCenter_2F/events.inc | 14 - .../SlateportCity_PokemonCenter_2F/header.inc | 15 - .../SlateportCity_PokemonCenter_2F/map.json | 95 + .../SlateportCity_PokemonFanClub/events.inc | 18 - .../SlateportCity_PokemonFanClub/header.inc | 15 - .../SlateportCity_PokemonFanClub/map.json | 153 + .../events.inc | 14 - .../header.inc | 15 - .../SlateportCity_SternsShipyard_1F/map.json | 95 + .../events.inc | 11 - .../header.inc | 15 - .../SlateportCity_SternsShipyard_2F/map.json | 68 + data/maps/SootopolisCity/connections.inc | 6 - data/maps/SootopolisCity/events.inc | 46 - data/maps/SootopolisCity/header.inc | 15 - data/maps/SootopolisCity/map.json | 396 ++ data/maps/SootopolisCity/scripts.inc | 2 +- data/maps/SootopolisCity_Gym_1F/events.inc | 16 - data/maps/SootopolisCity_Gym_1F/header.inc | 15 - data/maps/SootopolisCity_Gym_1F/map.json | 86 + data/maps/SootopolisCity_Gym_B1F/events.inc | 18 - data/maps/SootopolisCity_Gym_B1F/header.inc | 15 - data/maps/SootopolisCity_Gym_B1F/map.json | 159 + data/maps/SootopolisCity_House1/events.inc | 11 - data/maps/SootopolisCity_House1/header.inc | 15 - data/maps/SootopolisCity_House1/map.json | 62 + data/maps/SootopolisCity_House2/events.inc | 10 - data/maps/SootopolisCity_House2/header.inc | 15 - data/maps/SootopolisCity_House2/map.json | 49 + data/maps/SootopolisCity_House3/events.inc | 11 - data/maps/SootopolisCity_House3/header.inc | 15 - data/maps/SootopolisCity_House3/map.json | 62 + data/maps/SootopolisCity_House4/events.inc | 12 - data/maps/SootopolisCity_House4/header.inc | 15 - data/maps/SootopolisCity_House4/map.json | 75 + data/maps/SootopolisCity_House5/events.inc | 11 - data/maps/SootopolisCity_House5/header.inc | 15 - data/maps/SootopolisCity_House5/map.json | 62 + data/maps/SootopolisCity_House6/events.inc | 10 - data/maps/SootopolisCity_House6/header.inc | 15 - data/maps/SootopolisCity_House6/map.json | 49 + data/maps/SootopolisCity_House7/events.inc | 11 - data/maps/SootopolisCity_House7/header.inc | 15 - data/maps/SootopolisCity_House7/map.json | 62 + .../events.inc | 15 - .../header.inc | 15 - .../map.json | 79 + data/maps/SootopolisCity_Mart/events.inc | 12 - data/maps/SootopolisCity_Mart/header.inc | 15 - data/maps/SootopolisCity_Mart/map.json | 75 + .../events.inc | 11 - .../header.inc | 15 - .../map.json | 56 + .../scripts.inc | 2 +- .../events.inc | 9 - .../header.inc | 15 - .../map.json | 42 + .../events.inc | 14 - .../header.inc | 15 - .../SootopolisCity_PokemonCenter_1F/map.json | 95 + .../events.inc | 14 - .../header.inc | 15 - .../SootopolisCity_PokemonCenter_2F/map.json | 95 + data/maps/SouthernIsland_Exterior/events.inc | 14 - data/maps/SouthernIsland_Exterior/header.inc | 15 - data/maps/SouthernIsland_Exterior/map.json | 71 + data/maps/SouthernIsland_Interior/events.inc | 14 - data/maps/SouthernIsland_Interior/header.inc | 15 - data/maps/SouthernIsland_Interior/map.json | 71 + data/maps/TerraCave_End/events.inc | 12 - data/maps/TerraCave_End/header.inc | 15 - data/maps/TerraCave_End/map.json | 52 + data/maps/TerraCave_Entrance/events.inc | 7 - data/maps/TerraCave_Entrance/header.inc | 15 - data/maps/TerraCave_Entrance/map.json | 35 + data/maps/TradeCenter/events.inc | 14 - data/maps/TradeCenter/header.inc | 15 - data/maps/TradeCenter/map.json | 68 + data/maps/TrainerHill_1F/events.inc | 7 - data/maps/TrainerHill_1F/header.inc | 15 - data/maps/TrainerHill_1F/map.json | 35 + data/maps/TrainerHill_2F/events.inc | 7 - data/maps/TrainerHill_2F/header.inc | 15 - data/maps/TrainerHill_2F/map.json | 35 + data/maps/TrainerHill_3F/events.inc | 7 - data/maps/TrainerHill_3F/header.inc | 15 - data/maps/TrainerHill_3F/map.json | 35 + data/maps/TrainerHill_4F/events.inc | 7 - data/maps/TrainerHill_4F/header.inc | 15 - data/maps/TrainerHill_4F/map.json | 35 + data/maps/TrainerHill_Elevator/events.inc | 10 - data/maps/TrainerHill_Elevator/header.inc | 15 - data/maps/TrainerHill_Elevator/map.json | 49 + data/maps/TrainerHill_Entrance/events.inc | 21 - data/maps/TrainerHill_Entrance/header.inc | 15 - data/maps/TrainerHill_Entrance/map.json | 127 + data/maps/TrainerHill_Roof/events.inc | 10 - data/maps/TrainerHill_Roof/header.inc | 15 - data/maps/TrainerHill_Roof/map.json | 49 + data/maps/Underwater1/connections.inc | 8 - data/maps/Underwater1/events.inc | 12 - data/maps/Underwater1/header.inc | 15 - data/maps/Underwater1/map.json | 88 + data/maps/Underwater2/connections.inc | 9 - data/maps/Underwater2/events.inc | 16 - data/maps/Underwater2/header.inc | 15 - data/maps/Underwater2/map.json | 109 + data/maps/Underwater3/connections.inc | 9 - data/maps/Underwater3/events.inc | 13 - data/maps/Underwater3/header.inc | 15 - data/maps/Underwater3/map.json | 84 + data/maps/Underwater4/connections.inc | 8 - data/maps/Underwater4/events.inc | 10 - data/maps/Underwater4/header.inc | 15 - data/maps/Underwater4/map.json | 56 + data/maps/Underwater5/connections.inc | 7 - data/maps/Underwater5/events.inc | 7 - data/maps/Underwater5/header.inc | 15 - data/maps/Underwater5/map.json | 41 + data/maps/Underwater6/connections.inc | 7 - data/maps/Underwater6/events.inc | 7 - data/maps/Underwater6/header.inc | 15 - data/maps/Underwater6/map.json | 41 + data/maps/Underwater7/connections.inc | 7 - data/maps/Underwater7/events.inc | 7 - data/maps/Underwater7/header.inc | 15 - data/maps/Underwater7/map.json | 41 + data/maps/Underwater_MarineCave/events.inc | 6 - data/maps/Underwater_MarineCave/header.inc | 15 - data/maps/Underwater_MarineCave/map.json | 28 + data/maps/Underwater_Route134/events.inc | 6 - data/maps/Underwater_Route134/header.inc | 15 - data/maps/Underwater_Route134/map.json | 28 + .../maps/Underwater_SeafloorCavern/events.inc | 12 - .../maps/Underwater_SeafloorCavern/header.inc | 15 - data/maps/Underwater_SeafloorCavern/map.json | 81 + data/maps/Underwater_SealedChamber/events.inc | 9 - data/maps/Underwater_SealedChamber/header.inc | 15 - data/maps/Underwater_SealedChamber/map.json | 37 + .../maps/Underwater_SootopolisCity/events.inc | 7 - .../maps/Underwater_SootopolisCity/header.inc | 15 - data/maps/Underwater_SootopolisCity/map.json | 35 + data/maps/UnionRoom/events.inc | 18 - data/maps/UnionRoom/header.inc | 15 - data/maps/UnionRoom/map.json | 153 + data/maps/UnknownMap_25_29/events.inc | 1 - data/maps/UnknownMap_25_29/header.inc | 15 - data/maps/UnknownMap_25_29/map.json | 18 + data/maps/UnknownMap_25_30/events.inc | 1 - data/maps/UnknownMap_25_30/header.inc | 15 - data/maps/UnknownMap_25_30/map.json | 18 + data/maps/UnknownMap_25_31/events.inc | 1 - data/maps/UnknownMap_25_31/header.inc | 15 - data/maps/UnknownMap_25_31/map.json | 18 + data/maps/UnknownMap_25_32/events.inc | 1 - data/maps/UnknownMap_25_32/header.inc | 15 - data/maps/UnknownMap_25_32/map.json | 18 + data/maps/UnknownMap_25_33/events.inc | 1 - data/maps/UnknownMap_25_33/header.inc | 15 - data/maps/UnknownMap_25_33/map.json | 18 + data/maps/UnknownMap_25_34/events.inc | 1 - data/maps/UnknownMap_25_34/header.inc | 15 - data/maps/UnknownMap_25_34/map.json | 18 + data/maps/VerdanturfTown/connections.inc | 8 - data/maps/VerdanturfTown/events.inc | 28 - data/maps/VerdanturfTown/header.inc | 15 - data/maps/VerdanturfTown/map.json | 199 + .../events.inc | 8 - .../header.inc | 15 - .../map.json | 60 + .../events.inc | 6 - .../header.inc | 15 - .../map.json | 34 + .../VerdanturfTown_BattleTentLobby/events.inc | 18 - .../VerdanturfTown_BattleTentLobby/header.inc | 15 - .../VerdanturfTown_BattleTentLobby/map.json | 123 + .../events.inc | 11 - .../header.inc | 15 - .../map.json | 62 + data/maps/VerdanturfTown_House/events.inc | 11 - data/maps/VerdanturfTown_House/header.inc | 15 - data/maps/VerdanturfTown_House/map.json | 62 + data/maps/VerdanturfTown_Mart/events.inc | 13 - data/maps/VerdanturfTown_Mart/header.inc | 15 - data/maps/VerdanturfTown_Mart/map.json | 88 + .../events.inc | 14 - .../header.inc | 15 - .../VerdanturfTown_PokemonCenter_1F/map.json | 95 + .../events.inc | 14 - .../header.inc | 15 - .../VerdanturfTown_PokemonCenter_2F/map.json | 95 + .../VerdanturfTown_WandasHouse/events.inc | 14 - .../VerdanturfTown_WandasHouse/header.inc | 15 - data/maps/VerdanturfTown_WandasHouse/map.json | 101 + data/maps/VictoryRoad_1F/events.inc | 28 - data/maps/VictoryRoad_1F/header.inc | 15 - data/maps/VictoryRoad_1F/map.json | 202 + data/maps/VictoryRoad_B1F/events.inc | 35 - data/maps/VictoryRoad_B1F/header.inc | 15 - data/maps/VictoryRoad_B1F/map.json | 344 ++ data/maps/VictoryRoad_B2F/events.inc | 22 - data/maps/VictoryRoad_B2F/header.inc | 15 - data/maps/VictoryRoad_B2F/map.json | 158 + data/maps/connections.inc | 65 - data/maps/groups.inc | 623 --- data/maps/headers.inc | 518 -- data/maps/map_groups.json | 691 +++ include/constants/layouts.h | 2 +- include/constants/map_groups.h | 592 +++ include/constants/maps.h | 589 +-- map_data_rules.mk | 31 + src/battle_factory.c | 4 +- src/battle_pike.c | 7 +- src/battle_pyramid.c | 8 +- src/battle_tent.c | 5 +- src/map_name_popup.c | 7 +- src/overworld.c | 9 +- src/pokemon.c | 3 +- src/trainer_hill.c | 27 +- src/tv.c | 9 +- src/wild_encounter.c | 20 +- tools/mapjson/mapjson.py | 389 ++ 2102 files changed, 72595 insertions(+), 27039 deletions(-) delete mode 100755 data/layouts.inc create mode 100755 data/layouts/.gitignore delete mode 100644 data/layouts/AbandonedShip_CaptainsOffice/layout.inc delete mode 100644 data/layouts/AbandonedShip_Corridors_1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Corridors_B1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Deck/layout.inc delete mode 100644 data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc delete mode 100644 data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc delete mode 100644 data/layouts/AbandonedShip_Room_B1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Rooms2_1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Rooms2_B1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Rooms_1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Rooms_B1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Underwater1/layout.inc delete mode 100644 data/layouts/AbandonedShip_Underwater2/layout.inc delete mode 100644 data/layouts/AlteringCave/layout.inc delete mode 100644 data/layouts/AncientTomb/layout.inc delete mode 100644 data/layouts/AquaHideout_1F/layout.inc delete mode 100644 data/layouts/AquaHideout_B1F/layout.inc delete mode 100644 data/layouts/AquaHideout_B2F/layout.inc delete mode 100644 data/layouts/AquaHideout_UnusedRubyMap1/layout.inc delete mode 100644 data/layouts/AquaHideout_UnusedRubyMap2/layout.inc delete mode 100644 data/layouts/AquaHideout_UnusedRubyMap3/layout.inc delete mode 100644 data/layouts/ArtisanCave_1F/layout.inc delete mode 100644 data/layouts/ArtisanCave_B1F/layout.inc delete mode 100644 data/layouts/BattleElevator/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleArenaLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleDomeLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePikeLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePyramidTop/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleTowerLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_Lounge1/layout.inc delete mode 100644 data/layouts/BattleFrontier_Lounge2/layout.inc delete mode 100644 data/layouts/BattleFrontier_OutsideEast/layout.inc delete mode 100644 data/layouts/BattleFrontier_OutsideWest/layout.inc delete mode 100644 data/layouts/BattleFrontier_RankingHall/layout.inc delete mode 100644 data/layouts/BattleFrontier_ReceptionGate/layout.inc delete mode 100644 data/layouts/BattleFrontier_ScottsHouse/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare01/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare02/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare03/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare04/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare05/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare06/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare07/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare08/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare09/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare10/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare11/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare12/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare13/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare14/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare15/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare16/layout.inc delete mode 100644 data/layouts/BattleTentBattleRoom/layout.inc delete mode 100644 data/layouts/BattleTentCorridor/layout.inc delete mode 100644 data/layouts/BattleTentLobby/layout.inc delete mode 100644 data/layouts/BirthIsland_Exterior/layout.inc delete mode 100644 data/layouts/CableCarStation/layout.inc delete mode 100644 data/layouts/CaveOfOrigin_1F/layout.inc delete mode 100644 data/layouts/CaveOfOrigin_B1F/layout.inc delete mode 100644 data/layouts/CaveOfOrigin_Entrance/layout.inc delete mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc delete mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc delete mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc delete mode 100644 data/layouts/DesertRuins/layout.inc delete mode 100644 data/layouts/DesertUnderpass/layout.inc delete mode 100644 data/layouts/DewfordTown/layout.inc delete mode 100644 data/layouts/DewfordTown_Gym/layout.inc delete mode 100644 data/layouts/DewfordTown_Hall/layout.inc delete mode 100644 data/layouts/DoubleBattleColosseum/layout.inc delete mode 100644 data/layouts/EverGrandeCity/layout.inc delete mode 100644 data/layouts/EverGrandeCity_ChampionsRoom/layout.inc delete mode 100644 data/layouts/EverGrandeCity_DrakesRoom/layout.inc delete mode 100644 data/layouts/EverGrandeCity_GlaciasRoom/layout.inc delete mode 100644 data/layouts/EverGrandeCity_Hall4/layout.inc delete mode 100644 data/layouts/EverGrandeCity_HallOfFame/layout.inc delete mode 100644 data/layouts/EverGrandeCity_PhoebesRoom/layout.inc delete mode 100644 data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc delete mode 100644 data/layouts/EverGrandeCity_ShortHall/layout.inc delete mode 100644 data/layouts/EverGrandeCity_SidneysRoom/layout.inc delete mode 100644 data/layouts/FallarborTown/layout.inc delete mode 100644 data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc delete mode 100644 data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc delete mode 100644 data/layouts/FarawayIsland_Entrance/layout.inc delete mode 100644 data/layouts/FarawayIsland_Interior/layout.inc delete mode 100644 data/layouts/FieryPath/layout.inc delete mode 100644 data/layouts/FortreeCity/layout.inc delete mode 100644 data/layouts/FortreeCity_DecorationShop/layout.inc delete mode 100644 data/layouts/FortreeCity_Gym/layout.inc delete mode 100644 data/layouts/FortreeCity_House1/layout.inc delete mode 100644 data/layouts/FortreeCity_House2/layout.inc delete mode 100644 data/layouts/GraniteCave_1F/layout.inc delete mode 100644 data/layouts/GraniteCave_B1F/layout.inc delete mode 100644 data/layouts/GraniteCave_B2F/layout.inc delete mode 100644 data/layouts/GraniteCave_StevensRoom/layout.inc delete mode 100644 data/layouts/Harbor/layout.inc delete mode 100644 data/layouts/House1/layout.inc delete mode 100644 data/layouts/House2/layout.inc delete mode 100644 data/layouts/House3/layout.inc delete mode 100644 data/layouts/House4/layout.inc delete mode 100644 data/layouts/HouseWithBed/layout.inc delete mode 100644 data/layouts/InsideOfTruck/layout.inc delete mode 100644 data/layouts/IslandCave/layout.inc delete mode 100644 data/layouts/IslandHarbor/layout.inc delete mode 100644 data/layouts/JaggedPass/layout.inc delete mode 100644 data/layouts/LavaridgeTown/layout.inc delete mode 100644 data/layouts/LavaridgeTown_Gym_1F/layout.inc delete mode 100644 data/layouts/LavaridgeTown_Gym_B1F/layout.inc delete mode 100644 data/layouts/LavaridgeTown_HerbShop/layout.inc delete mode 100644 data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc delete mode 100644 data/layouts/LilycoveCity/layout.inc delete mode 100644 data/layouts/LilycoveCity_ContestHall/layout.inc delete mode 100644 data/layouts/LilycoveCity_ContestLobby/layout.inc delete mode 100644 data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc delete mode 100644 data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc delete mode 100644 data/layouts/LilycoveCity_House2/layout.inc delete mode 100644 data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc delete mode 100644 data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc delete mode 100644 data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc delete mode 100644 data/layouts/LinkContestRoom1/layout.inc delete mode 100644 data/layouts/LinkContestRoom2/layout.inc delete mode 100644 data/layouts/LinkContestRoom3/layout.inc delete mode 100644 data/layouts/LinkContestRoom4/layout.inc delete mode 100644 data/layouts/LinkContestRoom5/layout.inc delete mode 100644 data/layouts/LinkContestRoom6/layout.inc delete mode 100644 data/layouts/LittlerootTown/layout.inc delete mode 100644 data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc delete mode 100644 data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc delete mode 100644 data/layouts/LittlerootTown_MaysHouse_1F/layout.inc delete mode 100644 data/layouts/LittlerootTown_MaysHouse_2F/layout.inc delete mode 100644 data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc delete mode 100644 data/layouts/MagmaHideout_1F/layout.inc delete mode 100644 data/layouts/MagmaHideout_2F_1R/layout.inc delete mode 100644 data/layouts/MagmaHideout_2F_2R/layout.inc delete mode 100644 data/layouts/MagmaHideout_2F_3R/layout.inc delete mode 100644 data/layouts/MagmaHideout_3F_1R/layout.inc delete mode 100644 data/layouts/MagmaHideout_3F_2R/layout.inc delete mode 100644 data/layouts/MagmaHideout_3F_3R/layout.inc delete mode 100644 data/layouts/MagmaHideout_4F/layout.inc delete mode 100644 data/layouts/MarineCave_End/layout.inc delete mode 100644 data/layouts/MarineCave_Entrance/layout.inc delete mode 100644 data/layouts/Mart/layout.inc delete mode 100644 data/layouts/MauvilleCity/layout.inc delete mode 100644 data/layouts/MauvilleCity_BikeShop/layout.inc delete mode 100644 data/layouts/MauvilleCity_GameCorner/layout.inc delete mode 100644 data/layouts/MauvilleCity_Gym/layout.inc delete mode 100644 data/layouts/MeteorFalls_1F_1R/layout.inc delete mode 100644 data/layouts/MeteorFalls_1F_2R/layout.inc delete mode 100644 data/layouts/MeteorFalls_B1F_1R/layout.inc delete mode 100644 data/layouts/MeteorFalls_B1F_2R/layout.inc delete mode 100644 data/layouts/MeteorFalls_StevensCave/layout.inc delete mode 100644 data/layouts/MirageTower_1F/layout.inc delete mode 100644 data/layouts/MirageTower_2F/layout.inc delete mode 100644 data/layouts/MirageTower_3F/layout.inc delete mode 100644 data/layouts/MirageTower_4F/layout.inc delete mode 100644 data/layouts/MossdeepCity/layout.inc delete mode 100644 data/layouts/MossdeepCity_GameCorner_1F/layout.inc delete mode 100644 data/layouts/MossdeepCity_GameCorner_B1F/layout.inc delete mode 100644 data/layouts/MossdeepCity_Gym/layout.inc delete mode 100644 data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc delete mode 100644 data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc delete mode 100644 data/layouts/MossdeepCity_StevensHouse/layout.inc delete mode 100644 data/layouts/MtChimney/layout.inc delete mode 100644 data/layouts/MtPyre_1F/layout.inc delete mode 100644 data/layouts/MtPyre_2F/layout.inc delete mode 100644 data/layouts/MtPyre_3F/layout.inc delete mode 100644 data/layouts/MtPyre_4F/layout.inc delete mode 100644 data/layouts/MtPyre_5F/layout.inc delete mode 100644 data/layouts/MtPyre_6F/layout.inc delete mode 100644 data/layouts/MtPyre_Exterior/layout.inc delete mode 100644 data/layouts/MtPyre_Summit/layout.inc delete mode 100644 data/layouts/NavelRock_B1F/layout.inc delete mode 100644 data/layouts/NavelRock_Bottom/layout.inc delete mode 100644 data/layouts/NavelRock_Entrance/layout.inc delete mode 100644 data/layouts/NavelRock_Exterior/layout.inc delete mode 100644 data/layouts/NavelRock_Fork/layout.inc delete mode 100644 data/layouts/NavelRock_LadderRoom1/layout.inc delete mode 100644 data/layouts/NavelRock_LadderRoom2/layout.inc delete mode 100644 data/layouts/NavelRock_Top/layout.inc delete mode 100644 data/layouts/NewMauville_Entrance/layout.inc delete mode 100644 data/layouts/NewMauville_Inside/layout.inc delete mode 100644 data/layouts/OldaleTown/layout.inc delete mode 100644 data/layouts/PacifidlogTown/layout.inc delete mode 100644 data/layouts/PacifidlogTown_House1/layout.inc delete mode 100644 data/layouts/PacifidlogTown_House2/layout.inc delete mode 100644 data/layouts/PetalburgCity/layout.inc delete mode 100644 data/layouts/PetalburgCity_Gym/layout.inc delete mode 100644 data/layouts/PetalburgWoods/layout.inc delete mode 100644 data/layouts/PokemonCenter_1F/layout.inc delete mode 100644 data/layouts/PokemonCenter_2F/layout.inc delete mode 100644 data/layouts/RecordCorner/layout.inc delete mode 100644 data/layouts/Route101/layout.inc delete mode 100644 data/layouts/Route102/layout.inc delete mode 100644 data/layouts/Route103/layout.inc delete mode 100644 data/layouts/Route104/layout.inc delete mode 100644 data/layouts/Route104_MrBrineysHouse/layout.inc delete mode 100644 data/layouts/Route104_PrettyPetalFlowerShop/layout.inc delete mode 100644 data/layouts/Route104_Prototype/layout.inc delete mode 100644 data/layouts/Route105/layout.inc delete mode 100644 data/layouts/Route106/layout.inc delete mode 100644 data/layouts/Route107/layout.inc delete mode 100644 data/layouts/Route108/layout.inc delete mode 100644 data/layouts/Route109/layout.inc delete mode 100644 data/layouts/Route109_SeashoreHouse/layout.inc delete mode 100644 data/layouts/Route110/layout.inc delete mode 100644 data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc delete mode 100644 data/layouts/Route110_TrickHouseCorridor/layout.inc delete mode 100644 data/layouts/Route110_TrickHouseEnd/layout.inc delete mode 100644 data/layouts/Route110_TrickHouseEntrance/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle1/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle2/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle3/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle4/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle5/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle6/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle7/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle8/layout.inc delete mode 100644 data/layouts/Route111/layout.inc delete mode 100644 data/layouts/Route111_NoMirageTower/layout.inc delete mode 100644 data/layouts/Route112/layout.inc delete mode 100644 data/layouts/Route113/layout.inc delete mode 100644 data/layouts/Route114/layout.inc delete mode 100644 data/layouts/Route114_FossilManiacsHouse/layout.inc delete mode 100644 data/layouts/Route114_FossilManiacsTunnel/layout.inc delete mode 100644 data/layouts/Route114_LanettesHouse/layout.inc delete mode 100644 data/layouts/Route115/layout.inc delete mode 100644 data/layouts/Route116/layout.inc delete mode 100644 data/layouts/Route116_TunnelersRestHouse/layout.inc delete mode 100644 data/layouts/Route117/layout.inc delete mode 100644 data/layouts/Route117_PokemonDayCare/layout.inc delete mode 100644 data/layouts/Route118/layout.inc delete mode 100644 data/layouts/Route119/layout.inc delete mode 100644 data/layouts/Route119_WeatherInstitute_1F/layout.inc delete mode 100644 data/layouts/Route119_WeatherInstitute_2F/layout.inc delete mode 100644 data/layouts/Route120/layout.inc delete mode 100644 data/layouts/Route121/layout.inc delete mode 100644 data/layouts/Route121_SafariZoneEntrance/layout.inc delete mode 100644 data/layouts/Route122/layout.inc delete mode 100644 data/layouts/Route123/layout.inc delete mode 100644 data/layouts/Route124/layout.inc delete mode 100644 data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc delete mode 100644 data/layouts/Route125/layout.inc delete mode 100644 data/layouts/Route126/layout.inc delete mode 100644 data/layouts/Route127/layout.inc delete mode 100644 data/layouts/Route128/layout.inc delete mode 100644 data/layouts/Route129/layout.inc delete mode 100644 data/layouts/Route130/layout.inc delete mode 100644 data/layouts/Route131/layout.inc delete mode 100644 data/layouts/Route132/layout.inc delete mode 100644 data/layouts/Route133/layout.inc delete mode 100644 data/layouts/Route134/layout.inc delete mode 100644 data/layouts/RustboroCity/layout.inc delete mode 100644 data/layouts/RustboroCity_CuttersHouse/layout.inc delete mode 100644 data/layouts/RustboroCity_DevonCorp_1F/layout.inc delete mode 100644 data/layouts/RustboroCity_DevonCorp_2F/layout.inc delete mode 100644 data/layouts/RustboroCity_DevonCorp_3F/layout.inc delete mode 100644 data/layouts/RustboroCity_Flat1_1F/layout.inc delete mode 100644 data/layouts/RustboroCity_Flat1_2F/layout.inc delete mode 100644 data/layouts/RustboroCity_Flat2_1F/layout.inc delete mode 100644 data/layouts/RustboroCity_Flat2_2F/layout.inc delete mode 100644 data/layouts/RustboroCity_Flat2_3F/layout.inc delete mode 100644 data/layouts/RustboroCity_Gym/layout.inc delete mode 100644 data/layouts/RustboroCity_House/layout.inc delete mode 100644 data/layouts/RustboroCity_House1/layout.inc delete mode 100644 data/layouts/RustboroCity_PokemonSchool/layout.inc delete mode 100644 data/layouts/RusturfTunnel/layout.inc delete mode 100644 data/layouts/SSTidalCorridor/layout.inc delete mode 100644 data/layouts/SSTidalLowerDeck/layout.inc delete mode 100644 data/layouts/SSTidalRooms/layout.inc delete mode 100644 data/layouts/SafariZone_North/layout.inc delete mode 100644 data/layouts/SafariZone_Northeast/layout.inc delete mode 100644 data/layouts/SafariZone_Northwest/layout.inc delete mode 100644 data/layouts/SafariZone_RestHouse/layout.inc delete mode 100644 data/layouts/SafariZone_South/layout.inc delete mode 100644 data/layouts/SafariZone_Southeast/layout.inc delete mode 100644 data/layouts/SafariZone_Southwest/layout.inc delete mode 100644 data/layouts/ScorchedSlab/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Entrance/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room1/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room2/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room3/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room4/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room5/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room6/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room7/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room8/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room9/layout.inc delete mode 100644 data/layouts/SealedChamber_InnerRoom/layout.inc delete mode 100644 data/layouts/SealedChamber_OuterRoom/layout.inc delete mode 100644 data/layouts/SecretBase_BlueCave1/layout.inc delete mode 100644 data/layouts/SecretBase_BlueCave2/layout.inc delete mode 100644 data/layouts/SecretBase_BlueCave3/layout.inc delete mode 100644 data/layouts/SecretBase_BlueCave4/layout.inc delete mode 100644 data/layouts/SecretBase_BrownCave1/layout.inc delete mode 100644 data/layouts/SecretBase_BrownCave2/layout.inc delete mode 100644 data/layouts/SecretBase_BrownCave3/layout.inc delete mode 100644 data/layouts/SecretBase_BrownCave4/layout.inc delete mode 100644 data/layouts/SecretBase_RedCave1/layout.inc delete mode 100644 data/layouts/SecretBase_RedCave2/layout.inc delete mode 100644 data/layouts/SecretBase_RedCave3/layout.inc delete mode 100644 data/layouts/SecretBase_RedCave4/layout.inc delete mode 100644 data/layouts/SecretBase_Shrub1/layout.inc delete mode 100644 data/layouts/SecretBase_Shrub2/layout.inc delete mode 100644 data/layouts/SecretBase_Shrub3/layout.inc delete mode 100644 data/layouts/SecretBase_Shrub4/layout.inc delete mode 100644 data/layouts/SecretBase_Tree1/layout.inc delete mode 100644 data/layouts/SecretBase_Tree2/layout.inc delete mode 100644 data/layouts/SecretBase_Tree3/layout.inc delete mode 100644 data/layouts/SecretBase_Tree4/layout.inc delete mode 100644 data/layouts/SecretBase_YellowCave1/layout.inc delete mode 100644 data/layouts/SecretBase_YellowCave2/layout.inc delete mode 100644 data/layouts/SecretBase_YellowCave3/layout.inc delete mode 100644 data/layouts/SecretBase_YellowCave4/layout.inc delete mode 100644 data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc delete mode 100644 data/layouts/ShoalCave_HighTideInnerRoom/layout.inc delete mode 100644 data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc delete mode 100644 data/layouts/ShoalCave_LowTideIceRoom/layout.inc delete mode 100644 data/layouts/ShoalCave_LowTideInnerRoom/layout.inc delete mode 100644 data/layouts/ShoalCave_LowTideLowerRoom/layout.inc delete mode 100644 data/layouts/ShoalCave_LowTideStairsRoom/layout.inc delete mode 100644 data/layouts/SingleBattleColosseum/layout.inc delete mode 100644 data/layouts/SkyPillar_1F/layout.inc delete mode 100644 data/layouts/SkyPillar_2F/layout.inc delete mode 100644 data/layouts/SkyPillar_3F/layout.inc delete mode 100644 data/layouts/SkyPillar_4F/layout.inc delete mode 100644 data/layouts/SkyPillar_5F/layout.inc delete mode 100644 data/layouts/SkyPillar_Entrance/layout.inc delete mode 100644 data/layouts/SkyPillar_Outside/layout.inc delete mode 100644 data/layouts/SkyPillar_Top/layout.inc delete mode 100644 data/layouts/SlateportCity/layout.inc delete mode 100644 data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc delete mode 100644 data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc delete mode 100644 data/layouts/SlateportCity_PokemonFanClub/layout.inc delete mode 100644 data/layouts/SlateportCity_SternsShipyard_1F/layout.inc delete mode 100644 data/layouts/SlateportCity_SternsShipyard_2F/layout.inc delete mode 100644 data/layouts/SootopolisCity/layout.inc delete mode 100644 data/layouts/SootopolisCity_Gym_1F/layout.inc delete mode 100644 data/layouts/SootopolisCity_Gym_B1F/layout.inc delete mode 100644 data/layouts/SootopolisCity_House1/layout.inc delete mode 100644 data/layouts/SootopolisCity_House2/layout.inc delete mode 100644 data/layouts/SootopolisCity_House3/layout.inc delete mode 100644 data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc delete mode 100644 data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc delete mode 100644 data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc delete mode 100644 data/layouts/SouthernIsland_Exterior/layout.inc delete mode 100644 data/layouts/SouthernIsland_Interior/layout.inc delete mode 100644 data/layouts/TerraCave_End/layout.inc delete mode 100644 data/layouts/TerraCave_Entrance/layout.inc delete mode 100644 data/layouts/TradeCenter/layout.inc delete mode 100644 data/layouts/TrainerHill_1F/layout.inc delete mode 100644 data/layouts/TrainerHill_2F/layout.inc delete mode 100644 data/layouts/TrainerHill_3F/layout.inc delete mode 100644 data/layouts/TrainerHill_4F/layout.inc delete mode 100644 data/layouts/TrainerHill_Entrance/layout.inc delete mode 100644 data/layouts/TrainerHill_Roof/layout.inc delete mode 100644 data/layouts/Underwater1/layout.inc delete mode 100644 data/layouts/Underwater2/layout.inc delete mode 100644 data/layouts/Underwater3/layout.inc delete mode 100644 data/layouts/Underwater4/layout.inc delete mode 100644 data/layouts/Underwater5/layout.inc delete mode 100644 data/layouts/Underwater6/layout.inc delete mode 100644 data/layouts/Underwater7/layout.inc delete mode 100644 data/layouts/Underwater_MarineCave/layout.inc delete mode 100644 data/layouts/Underwater_Route134/layout.inc delete mode 100644 data/layouts/Underwater_SeafloorCavern/layout.inc delete mode 100644 data/layouts/Underwater_SealedChamber/layout.inc delete mode 100644 data/layouts/Underwater_SootopolisCity/layout.inc delete mode 100644 data/layouts/UnionRoom/layout.inc delete mode 100644 data/layouts/UnknownMap_08417FC4/layout.inc delete mode 100644 data/layouts/UnknownMap_08428450/layout.inc delete mode 100644 data/layouts/UnknownMap_084294C4/layout.inc delete mode 100644 data/layouts/UnknownMap_084294E8/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E6C0/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E6E4/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E708/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E72C/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E750/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E774/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E798/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E7BC/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E7E0/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E804/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E828/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E84C/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E870/layout.inc delete mode 100755 data/layouts/UnknownMap_0843E894/layout.inc delete mode 100644 data/layouts/UnknownMap_08447028/layout.inc delete mode 100644 data/layouts/UnknownMap_0845A394/layout.inc delete mode 100644 data/layouts/UnknownMap_0845D470/layout.inc delete mode 100644 data/layouts/UnknownMap_0845ECB4/layout.inc delete mode 100644 data/layouts/UnknownMap_08469200/layout.inc delete mode 100644 data/layouts/UnknownMap_084693AC/layout.inc delete mode 100644 data/layouts/UnknownMap_08480DAC/layout.inc delete mode 100644 data/layouts/UnknownMap_08480F54/layout.inc delete mode 100644 data/layouts/UnknownMap_084810FC/layout.inc delete mode 100644 data/layouts/UnknownMap_084812A4/layout.inc delete mode 100644 data/layouts/UnknownMap_0848144C/layout.inc delete mode 100644 data/layouts/UnknownMap_084815F4/layout.inc delete mode 100644 data/layouts/UnknownMap_08481B24/layout.inc delete mode 100644 data/layouts/UnknownMap_08481DBC/layout.inc delete mode 100644 data/layouts/UnknownMap_25_29/layout.inc delete mode 100644 data/layouts/UnknownMap_25_30/layout.inc delete mode 100644 data/layouts/UnknownMap_25_31/layout.inc delete mode 100644 data/layouts/UnknownMap_25_32/layout.inc delete mode 100644 data/layouts/UnknownMap_25_33/layout.inc delete mode 100644 data/layouts/UnknownMap_25_34/layout.inc delete mode 100644 data/layouts/VerdanturfTown/layout.inc delete mode 100644 data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc delete mode 100644 data/layouts/VerdanturfTown_WandasHouse/layout.inc delete mode 100644 data/layouts/VictoryRoad_1F/layout.inc delete mode 100644 data/layouts/VictoryRoad_B1F/layout.inc delete mode 100644 data/layouts/VictoryRoad_B2F/layout.inc create mode 100644 data/layouts/layouts.json delete mode 100644 data/layouts_table.inc create mode 100755 data/maps/.gitignore delete mode 100644 data/maps/AbandonedShip_CaptainsOffice/events.inc delete mode 100644 data/maps/AbandonedShip_CaptainsOffice/header.inc create mode 100644 data/maps/AbandonedShip_CaptainsOffice/map.json delete mode 100644 data/maps/AbandonedShip_Corridors_1F/events.inc delete mode 100644 data/maps/AbandonedShip_Corridors_1F/header.inc create mode 100644 data/maps/AbandonedShip_Corridors_1F/map.json delete mode 100644 data/maps/AbandonedShip_Corridors_B1F/events.inc delete mode 100644 data/maps/AbandonedShip_Corridors_B1F/header.inc create mode 100644 data/maps/AbandonedShip_Corridors_B1F/map.json delete mode 100644 data/maps/AbandonedShip_Deck/events.inc delete mode 100644 data/maps/AbandonedShip_Deck/header.inc create mode 100644 data/maps/AbandonedShip_Deck/map.json delete mode 100644 data/maps/AbandonedShip_HiddenFloorCorridors/events.inc delete mode 100644 data/maps/AbandonedShip_HiddenFloorCorridors/header.inc create mode 100644 data/maps/AbandonedShip_HiddenFloorCorridors/map.json delete mode 100644 data/maps/AbandonedShip_HiddenFloorRooms/events.inc delete mode 100644 data/maps/AbandonedShip_HiddenFloorRooms/header.inc create mode 100644 data/maps/AbandonedShip_HiddenFloorRooms/map.json delete mode 100644 data/maps/AbandonedShip_Room_B1F/events.inc delete mode 100644 data/maps/AbandonedShip_Room_B1F/header.inc create mode 100644 data/maps/AbandonedShip_Room_B1F/map.json delete mode 100644 data/maps/AbandonedShip_Rooms2_1F/events.inc delete mode 100644 data/maps/AbandonedShip_Rooms2_1F/header.inc create mode 100644 data/maps/AbandonedShip_Rooms2_1F/map.json delete mode 100644 data/maps/AbandonedShip_Rooms2_B1F/events.inc delete mode 100644 data/maps/AbandonedShip_Rooms2_B1F/header.inc create mode 100644 data/maps/AbandonedShip_Rooms2_B1F/map.json delete mode 100644 data/maps/AbandonedShip_Rooms_1F/events.inc delete mode 100644 data/maps/AbandonedShip_Rooms_1F/header.inc create mode 100644 data/maps/AbandonedShip_Rooms_1F/map.json delete mode 100644 data/maps/AbandonedShip_Rooms_B1F/events.inc delete mode 100644 data/maps/AbandonedShip_Rooms_B1F/header.inc create mode 100644 data/maps/AbandonedShip_Rooms_B1F/map.json delete mode 100644 data/maps/AbandonedShip_Underwater1/events.inc delete mode 100644 data/maps/AbandonedShip_Underwater1/header.inc create mode 100644 data/maps/AbandonedShip_Underwater1/map.json delete mode 100644 data/maps/AbandonedShip_Underwater2/events.inc delete mode 100644 data/maps/AbandonedShip_Underwater2/header.inc create mode 100644 data/maps/AbandonedShip_Underwater2/map.json delete mode 100644 data/maps/AlteringCave/events.inc delete mode 100644 data/maps/AlteringCave/header.inc create mode 100644 data/maps/AlteringCave/map.json delete mode 100644 data/maps/AncientTomb/events.inc delete mode 100644 data/maps/AncientTomb/header.inc create mode 100644 data/maps/AncientTomb/map.json delete mode 100644 data/maps/AquaHideout_1F/events.inc delete mode 100644 data/maps/AquaHideout_1F/header.inc create mode 100644 data/maps/AquaHideout_1F/map.json delete mode 100644 data/maps/AquaHideout_B1F/events.inc delete mode 100644 data/maps/AquaHideout_B1F/header.inc create mode 100644 data/maps/AquaHideout_B1F/map.json delete mode 100644 data/maps/AquaHideout_B2F/events.inc delete mode 100644 data/maps/AquaHideout_B2F/header.inc create mode 100644 data/maps/AquaHideout_B2F/map.json delete mode 100644 data/maps/AquaHideout_UnusedRubyMap1/events.inc delete mode 100644 data/maps/AquaHideout_UnusedRubyMap1/header.inc create mode 100644 data/maps/AquaHideout_UnusedRubyMap1/map.json delete mode 100644 data/maps/AquaHideout_UnusedRubyMap2/events.inc delete mode 100644 data/maps/AquaHideout_UnusedRubyMap2/header.inc create mode 100644 data/maps/AquaHideout_UnusedRubyMap2/map.json delete mode 100644 data/maps/AquaHideout_UnusedRubyMap3/events.inc delete mode 100644 data/maps/AquaHideout_UnusedRubyMap3/header.inc create mode 100644 data/maps/AquaHideout_UnusedRubyMap3/map.json delete mode 100644 data/maps/ArtisanCave_1F/events.inc delete mode 100644 data/maps/ArtisanCave_1F/header.inc create mode 100644 data/maps/ArtisanCave_1F/map.json delete mode 100644 data/maps/ArtisanCave_B1F/events.inc delete mode 100644 data/maps/ArtisanCave_B1F/header.inc create mode 100644 data/maps/ArtisanCave_B1F/map.json delete mode 100644 data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleArenaBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattleArenaCorridor/events.inc delete mode 100644 data/maps/BattleFrontier_BattleArenaCorridor/header.inc create mode 100644 data/maps/BattleFrontier_BattleArenaCorridor/map.json delete mode 100644 data/maps/BattleFrontier_BattleArenaLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattleArenaLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattleArenaLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleDomeBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattleDomeCorridor/events.inc delete mode 100644 data/maps/BattleFrontier_BattleDomeCorridor/header.inc create mode 100644 data/maps/BattleFrontier_BattleDomeCorridor/map.json delete mode 100644 data/maps/BattleFrontier_BattleDomeLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattleDomeLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattleDomeLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattleFactoryLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattleFactoryLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattleFactoryLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattlePalaceCorridor/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePalaceCorridor/header.inc create mode 100644 data/maps/BattleFrontier_BattlePalaceCorridor/map.json delete mode 100644 data/maps/BattleFrontier_BattlePalaceLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePalaceLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattlePalaceLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattlePikeCorridor/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeCorridor/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeCorridor/map.json delete mode 100644 data/maps/BattleFrontier_BattlePikeLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json delete mode 100644 data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc create mode 100644 data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json delete mode 100644 data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc create mode 100644 data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json delete mode 100644 data/maps/BattleFrontier_BattlePyramidLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePyramidLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattlePyramidLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattlePyramidTop/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePyramidTop/header.inc create mode 100644 data/maps/BattleFrontier_BattlePyramidTop/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerCorridor/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerCorridor/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerCorridor/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerCorridor2/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerCorridor2/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerCorridor2/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerElevator/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerElevator/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerElevator/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_Lounge1/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge1/header.inc create mode 100644 data/maps/BattleFrontier_Lounge1/map.json delete mode 100644 data/maps/BattleFrontier_Lounge2/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge2/header.inc create mode 100644 data/maps/BattleFrontier_Lounge2/map.json delete mode 100644 data/maps/BattleFrontier_Lounge3/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge3/header.inc create mode 100644 data/maps/BattleFrontier_Lounge3/map.json delete mode 100644 data/maps/BattleFrontier_Lounge4/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge4/header.inc create mode 100644 data/maps/BattleFrontier_Lounge4/map.json delete mode 100644 data/maps/BattleFrontier_Lounge5/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge5/header.inc create mode 100644 data/maps/BattleFrontier_Lounge5/map.json delete mode 100644 data/maps/BattleFrontier_Lounge6/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge6/header.inc create mode 100644 data/maps/BattleFrontier_Lounge6/map.json delete mode 100644 data/maps/BattleFrontier_Lounge7/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge7/header.inc create mode 100644 data/maps/BattleFrontier_Lounge7/map.json delete mode 100644 data/maps/BattleFrontier_Lounge8/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge8/header.inc create mode 100644 data/maps/BattleFrontier_Lounge8/map.json delete mode 100644 data/maps/BattleFrontier_Lounge9/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge9/header.inc create mode 100644 data/maps/BattleFrontier_Lounge9/map.json delete mode 100644 data/maps/BattleFrontier_Mart/events.inc delete mode 100644 data/maps/BattleFrontier_Mart/header.inc create mode 100644 data/maps/BattleFrontier_Mart/map.json delete mode 100644 data/maps/BattleFrontier_OutsideEast/connections.inc delete mode 100644 data/maps/BattleFrontier_OutsideEast/events.inc delete mode 100644 data/maps/BattleFrontier_OutsideEast/header.inc create mode 100644 data/maps/BattleFrontier_OutsideEast/map.json delete mode 100644 data/maps/BattleFrontier_OutsideWest/connections.inc delete mode 100644 data/maps/BattleFrontier_OutsideWest/events.inc delete mode 100644 data/maps/BattleFrontier_OutsideWest/header.inc create mode 100644 data/maps/BattleFrontier_OutsideWest/map.json delete mode 100644 data/maps/BattleFrontier_PokemonCenter_1F/events.inc delete mode 100644 data/maps/BattleFrontier_PokemonCenter_1F/header.inc create mode 100644 data/maps/BattleFrontier_PokemonCenter_1F/map.json delete mode 100644 data/maps/BattleFrontier_PokemonCenter_2F/events.inc delete mode 100644 data/maps/BattleFrontier_PokemonCenter_2F/header.inc create mode 100644 data/maps/BattleFrontier_PokemonCenter_2F/map.json delete mode 100644 data/maps/BattleFrontier_RankingHall/events.inc delete mode 100644 data/maps/BattleFrontier_RankingHall/header.inc create mode 100644 data/maps/BattleFrontier_RankingHall/map.json delete mode 100644 data/maps/BattleFrontier_ReceptionGate/events.inc delete mode 100644 data/maps/BattleFrontier_ReceptionGate/header.inc create mode 100644 data/maps/BattleFrontier_ReceptionGate/map.json delete mode 100644 data/maps/BattleFrontier_ScottsHouse/events.inc delete mode 100644 data/maps/BattleFrontier_ScottsHouse/header.inc create mode 100644 data/maps/BattleFrontier_ScottsHouse/map.json delete mode 100644 data/maps/BattlePyramidSquare01/events.inc delete mode 100644 data/maps/BattlePyramidSquare01/header.inc create mode 100644 data/maps/BattlePyramidSquare01/map.json delete mode 100644 data/maps/BattlePyramidSquare02/events.inc delete mode 100644 data/maps/BattlePyramidSquare02/header.inc create mode 100644 data/maps/BattlePyramidSquare02/map.json delete mode 100644 data/maps/BattlePyramidSquare03/events.inc delete mode 100644 data/maps/BattlePyramidSquare03/header.inc create mode 100644 data/maps/BattlePyramidSquare03/map.json delete mode 100644 data/maps/BattlePyramidSquare04/events.inc delete mode 100644 data/maps/BattlePyramidSquare04/header.inc create mode 100644 data/maps/BattlePyramidSquare04/map.json delete mode 100644 data/maps/BattlePyramidSquare05/events.inc delete mode 100644 data/maps/BattlePyramidSquare05/header.inc create mode 100644 data/maps/BattlePyramidSquare05/map.json delete mode 100644 data/maps/BattlePyramidSquare06/events.inc delete mode 100644 data/maps/BattlePyramidSquare06/header.inc create mode 100644 data/maps/BattlePyramidSquare06/map.json delete mode 100644 data/maps/BattlePyramidSquare07/events.inc delete mode 100644 data/maps/BattlePyramidSquare07/header.inc create mode 100644 data/maps/BattlePyramidSquare07/map.json delete mode 100644 data/maps/BattlePyramidSquare08/events.inc delete mode 100644 data/maps/BattlePyramidSquare08/header.inc create mode 100644 data/maps/BattlePyramidSquare08/map.json delete mode 100644 data/maps/BattlePyramidSquare09/events.inc delete mode 100644 data/maps/BattlePyramidSquare09/header.inc create mode 100644 data/maps/BattlePyramidSquare09/map.json delete mode 100644 data/maps/BattlePyramidSquare10/events.inc delete mode 100644 data/maps/BattlePyramidSquare10/header.inc create mode 100644 data/maps/BattlePyramidSquare10/map.json delete mode 100644 data/maps/BattlePyramidSquare11/events.inc delete mode 100644 data/maps/BattlePyramidSquare11/header.inc create mode 100644 data/maps/BattlePyramidSquare11/map.json delete mode 100644 data/maps/BattlePyramidSquare12/events.inc delete mode 100644 data/maps/BattlePyramidSquare12/header.inc create mode 100644 data/maps/BattlePyramidSquare12/map.json delete mode 100644 data/maps/BattlePyramidSquare13/events.inc delete mode 100644 data/maps/BattlePyramidSquare13/header.inc create mode 100644 data/maps/BattlePyramidSquare13/map.json delete mode 100644 data/maps/BattlePyramidSquare14/events.inc delete mode 100644 data/maps/BattlePyramidSquare14/header.inc create mode 100644 data/maps/BattlePyramidSquare14/map.json delete mode 100644 data/maps/BattlePyramidSquare15/events.inc delete mode 100644 data/maps/BattlePyramidSquare15/header.inc create mode 100644 data/maps/BattlePyramidSquare15/map.json delete mode 100644 data/maps/BattlePyramidSquare16/events.inc delete mode 100644 data/maps/BattlePyramidSquare16/header.inc create mode 100644 data/maps/BattlePyramidSquare16/map.json delete mode 100644 data/maps/BirthIsland_Exterior/events.inc delete mode 100644 data/maps/BirthIsland_Exterior/header.inc create mode 100644 data/maps/BirthIsland_Exterior/map.json delete mode 100644 data/maps/BirthIsland_Harbor/events.inc delete mode 100644 data/maps/BirthIsland_Harbor/header.inc create mode 100644 data/maps/BirthIsland_Harbor/map.json delete mode 100644 data/maps/CaveOfOrigin_1F/events.inc delete mode 100644 data/maps/CaveOfOrigin_1F/header.inc create mode 100644 data/maps/CaveOfOrigin_1F/map.json delete mode 100644 data/maps/CaveOfOrigin_B1F/events.inc delete mode 100644 data/maps/CaveOfOrigin_B1F/header.inc create mode 100644 data/maps/CaveOfOrigin_B1F/map.json delete mode 100644 data/maps/CaveOfOrigin_Entrance/events.inc delete mode 100644 data/maps/CaveOfOrigin_Entrance/header.inc create mode 100644 data/maps/CaveOfOrigin_Entrance/map.json delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json delete mode 100644 data/maps/DesertRuins/events.inc delete mode 100644 data/maps/DesertRuins/header.inc create mode 100644 data/maps/DesertRuins/map.json delete mode 100644 data/maps/DesertUnderpass/events.inc delete mode 100644 data/maps/DesertUnderpass/header.inc create mode 100644 data/maps/DesertUnderpass/map.json delete mode 100644 data/maps/DewfordTown/connections.inc delete mode 100644 data/maps/DewfordTown/events.inc delete mode 100644 data/maps/DewfordTown/header.inc create mode 100644 data/maps/DewfordTown/map.json delete mode 100644 data/maps/DewfordTown_Gym/events.inc delete mode 100644 data/maps/DewfordTown_Gym/header.inc create mode 100644 data/maps/DewfordTown_Gym/map.json delete mode 100644 data/maps/DewfordTown_Hall/events.inc delete mode 100644 data/maps/DewfordTown_Hall/header.inc create mode 100644 data/maps/DewfordTown_Hall/map.json delete mode 100644 data/maps/DewfordTown_House1/events.inc delete mode 100644 data/maps/DewfordTown_House1/header.inc create mode 100644 data/maps/DewfordTown_House1/map.json delete mode 100644 data/maps/DewfordTown_House2/events.inc delete mode 100644 data/maps/DewfordTown_House2/header.inc create mode 100644 data/maps/DewfordTown_House2/map.json delete mode 100644 data/maps/DewfordTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/DewfordTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/DewfordTown_PokemonCenter_1F/map.json delete mode 100644 data/maps/DewfordTown_PokemonCenter_2F/events.inc delete mode 100644 data/maps/DewfordTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/DewfordTown_PokemonCenter_2F/map.json delete mode 100644 data/maps/DoubleBattleColosseum/events.inc delete mode 100644 data/maps/DoubleBattleColosseum/header.inc create mode 100644 data/maps/DoubleBattleColosseum/map.json delete mode 100644 data/maps/EverGrandeCity/connections.inc delete mode 100644 data/maps/EverGrandeCity/events.inc delete mode 100644 data/maps/EverGrandeCity/header.inc create mode 100644 data/maps/EverGrandeCity/map.json delete mode 100644 data/maps/EverGrandeCity_ChampionsRoom/events.inc delete mode 100644 data/maps/EverGrandeCity_ChampionsRoom/header.inc create mode 100644 data/maps/EverGrandeCity_ChampionsRoom/map.json delete mode 100644 data/maps/EverGrandeCity_DrakesRoom/events.inc delete mode 100644 data/maps/EverGrandeCity_DrakesRoom/header.inc create mode 100644 data/maps/EverGrandeCity_DrakesRoom/map.json delete mode 100644 data/maps/EverGrandeCity_GlaciasRoom/events.inc delete mode 100644 data/maps/EverGrandeCity_GlaciasRoom/header.inc create mode 100644 data/maps/EverGrandeCity_GlaciasRoom/map.json delete mode 100644 data/maps/EverGrandeCity_Hall1/events.inc delete mode 100644 data/maps/EverGrandeCity_Hall1/header.inc create mode 100644 data/maps/EverGrandeCity_Hall1/map.json delete mode 100644 data/maps/EverGrandeCity_Hall2/events.inc delete mode 100644 data/maps/EverGrandeCity_Hall2/header.inc create mode 100644 data/maps/EverGrandeCity_Hall2/map.json delete mode 100644 data/maps/EverGrandeCity_Hall3/events.inc delete mode 100644 data/maps/EverGrandeCity_Hall3/header.inc create mode 100644 data/maps/EverGrandeCity_Hall3/map.json delete mode 100644 data/maps/EverGrandeCity_Hall4/events.inc delete mode 100644 data/maps/EverGrandeCity_Hall4/header.inc create mode 100644 data/maps/EverGrandeCity_Hall4/map.json delete mode 100644 data/maps/EverGrandeCity_Hall5/events.inc delete mode 100644 data/maps/EverGrandeCity_Hall5/header.inc create mode 100644 data/maps/EverGrandeCity_Hall5/map.json delete mode 100644 data/maps/EverGrandeCity_HallOfFame/events.inc delete mode 100644 data/maps/EverGrandeCity_HallOfFame/header.inc create mode 100644 data/maps/EverGrandeCity_HallOfFame/map.json delete mode 100644 data/maps/EverGrandeCity_PhoebesRoom/events.inc delete mode 100644 data/maps/EverGrandeCity_PhoebesRoom/header.inc create mode 100644 data/maps/EverGrandeCity_PhoebesRoom/map.json delete mode 100644 data/maps/EverGrandeCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/EverGrandeCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/EverGrandeCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/EverGrandeCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/EverGrandeCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/EverGrandeCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/EverGrandeCity_PokemonLeague_1F/events.inc delete mode 100644 data/maps/EverGrandeCity_PokemonLeague_1F/header.inc create mode 100644 data/maps/EverGrandeCity_PokemonLeague_1F/map.json delete mode 100644 data/maps/EverGrandeCity_PokemonLeague_2F/events.inc delete mode 100644 data/maps/EverGrandeCity_PokemonLeague_2F/header.inc create mode 100644 data/maps/EverGrandeCity_PokemonLeague_2F/map.json delete mode 100644 data/maps/EverGrandeCity_SidneysRoom/events.inc delete mode 100644 data/maps/EverGrandeCity_SidneysRoom/header.inc create mode 100644 data/maps/EverGrandeCity_SidneysRoom/map.json delete mode 100644 data/maps/FallarborTown/connections.inc delete mode 100644 data/maps/FallarborTown/events.inc delete mode 100644 data/maps/FallarborTown/header.inc create mode 100644 data/maps/FallarborTown/map.json delete mode 100644 data/maps/FallarborTown_BattleTentBattleRoom/events.inc delete mode 100644 data/maps/FallarborTown_BattleTentBattleRoom/header.inc create mode 100644 data/maps/FallarborTown_BattleTentBattleRoom/map.json delete mode 100644 data/maps/FallarborTown_BattleTentCorridor/events.inc delete mode 100644 data/maps/FallarborTown_BattleTentCorridor/header.inc create mode 100644 data/maps/FallarborTown_BattleTentCorridor/map.json delete mode 100644 data/maps/FallarborTown_BattleTentLobby/events.inc delete mode 100644 data/maps/FallarborTown_BattleTentLobby/header.inc create mode 100644 data/maps/FallarborTown_BattleTentLobby/map.json delete mode 100644 data/maps/FallarborTown_House1/events.inc delete mode 100644 data/maps/FallarborTown_House1/header.inc create mode 100644 data/maps/FallarborTown_House1/map.json delete mode 100644 data/maps/FallarborTown_House2/events.inc delete mode 100644 data/maps/FallarborTown_House2/header.inc create mode 100644 data/maps/FallarborTown_House2/map.json delete mode 100644 data/maps/FallarborTown_Mart/events.inc delete mode 100644 data/maps/FallarborTown_Mart/header.inc create mode 100644 data/maps/FallarborTown_Mart/map.json delete mode 100644 data/maps/FallarborTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/FallarborTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/FallarborTown_PokemonCenter_1F/map.json delete mode 100644 data/maps/FallarborTown_PokemonCenter_2F/events.inc delete mode 100644 data/maps/FallarborTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/FallarborTown_PokemonCenter_2F/map.json delete mode 100644 data/maps/FarawayIsland_Entrance/events.inc delete mode 100644 data/maps/FarawayIsland_Entrance/header.inc create mode 100644 data/maps/FarawayIsland_Entrance/map.json delete mode 100644 data/maps/FarawayIsland_Interior/events.inc delete mode 100644 data/maps/FarawayIsland_Interior/header.inc create mode 100644 data/maps/FarawayIsland_Interior/map.json delete mode 100644 data/maps/FieryPath/events.inc delete mode 100644 data/maps/FieryPath/header.inc create mode 100644 data/maps/FieryPath/map.json delete mode 100644 data/maps/FortreeCity/connections.inc delete mode 100644 data/maps/FortreeCity/events.inc delete mode 100644 data/maps/FortreeCity/header.inc create mode 100644 data/maps/FortreeCity/map.json delete mode 100644 data/maps/FortreeCity_DecorationShop/events.inc delete mode 100644 data/maps/FortreeCity_DecorationShop/header.inc create mode 100644 data/maps/FortreeCity_DecorationShop/map.json delete mode 100644 data/maps/FortreeCity_Gym/events.inc delete mode 100644 data/maps/FortreeCity_Gym/header.inc create mode 100644 data/maps/FortreeCity_Gym/map.json delete mode 100644 data/maps/FortreeCity_House1/events.inc delete mode 100644 data/maps/FortreeCity_House1/header.inc create mode 100644 data/maps/FortreeCity_House1/map.json delete mode 100644 data/maps/FortreeCity_House2/events.inc delete mode 100644 data/maps/FortreeCity_House2/header.inc create mode 100644 data/maps/FortreeCity_House2/map.json delete mode 100644 data/maps/FortreeCity_House3/events.inc delete mode 100644 data/maps/FortreeCity_House3/header.inc create mode 100644 data/maps/FortreeCity_House3/map.json delete mode 100644 data/maps/FortreeCity_House4/events.inc delete mode 100644 data/maps/FortreeCity_House4/header.inc create mode 100644 data/maps/FortreeCity_House4/map.json delete mode 100644 data/maps/FortreeCity_House5/events.inc delete mode 100644 data/maps/FortreeCity_House5/header.inc create mode 100644 data/maps/FortreeCity_House5/map.json delete mode 100644 data/maps/FortreeCity_Mart/events.inc delete mode 100644 data/maps/FortreeCity_Mart/header.inc create mode 100644 data/maps/FortreeCity_Mart/map.json delete mode 100644 data/maps/FortreeCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/FortreeCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/FortreeCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/FortreeCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/FortreeCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/FortreeCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/GraniteCave_1F/events.inc delete mode 100644 data/maps/GraniteCave_1F/header.inc create mode 100644 data/maps/GraniteCave_1F/map.json delete mode 100644 data/maps/GraniteCave_B1F/events.inc delete mode 100644 data/maps/GraniteCave_B1F/header.inc create mode 100644 data/maps/GraniteCave_B1F/map.json delete mode 100644 data/maps/GraniteCave_B2F/events.inc delete mode 100644 data/maps/GraniteCave_B2F/header.inc create mode 100644 data/maps/GraniteCave_B2F/map.json delete mode 100644 data/maps/GraniteCave_StevensRoom/events.inc delete mode 100644 data/maps/GraniteCave_StevensRoom/header.inc create mode 100644 data/maps/GraniteCave_StevensRoom/map.json delete mode 100644 data/maps/InsideOfTruck/events.inc delete mode 100644 data/maps/InsideOfTruck/header.inc create mode 100644 data/maps/InsideOfTruck/map.json delete mode 100644 data/maps/IslandCave/events.inc delete mode 100644 data/maps/IslandCave/header.inc create mode 100644 data/maps/IslandCave/map.json delete mode 100644 data/maps/JaggedPass/events.inc delete mode 100644 data/maps/JaggedPass/header.inc create mode 100644 data/maps/JaggedPass/map.json delete mode 100644 data/maps/LavaridgeTown/connections.inc delete mode 100644 data/maps/LavaridgeTown/events.inc delete mode 100644 data/maps/LavaridgeTown/header.inc create mode 100644 data/maps/LavaridgeTown/map.json delete mode 100644 data/maps/LavaridgeTown_Gym_1F/events.inc delete mode 100644 data/maps/LavaridgeTown_Gym_1F/header.inc create mode 100644 data/maps/LavaridgeTown_Gym_1F/map.json delete mode 100644 data/maps/LavaridgeTown_Gym_B1F/events.inc delete mode 100644 data/maps/LavaridgeTown_Gym_B1F/header.inc create mode 100644 data/maps/LavaridgeTown_Gym_B1F/map.json delete mode 100644 data/maps/LavaridgeTown_HerbShop/events.inc delete mode 100644 data/maps/LavaridgeTown_HerbShop/header.inc create mode 100644 data/maps/LavaridgeTown_HerbShop/map.json delete mode 100644 data/maps/LavaridgeTown_House/events.inc delete mode 100644 data/maps/LavaridgeTown_House/header.inc create mode 100644 data/maps/LavaridgeTown_House/map.json delete mode 100644 data/maps/LavaridgeTown_Mart/events.inc delete mode 100644 data/maps/LavaridgeTown_Mart/header.inc create mode 100644 data/maps/LavaridgeTown_Mart/map.json delete mode 100644 data/maps/LavaridgeTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/LavaridgeTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/LavaridgeTown_PokemonCenter_1F/map.json delete mode 100644 data/maps/LavaridgeTown_PokemonCenter_2F/events.inc delete mode 100644 data/maps/LavaridgeTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/LavaridgeTown_PokemonCenter_2F/map.json delete mode 100644 data/maps/LilycoveCity/connections.inc delete mode 100644 data/maps/LilycoveCity/events.inc delete mode 100644 data/maps/LilycoveCity/header.inc create mode 100644 data/maps/LilycoveCity/map.json delete mode 100644 data/maps/LilycoveCity_ContestHall/events.inc delete mode 100644 data/maps/LilycoveCity_ContestHall/header.inc create mode 100644 data/maps/LilycoveCity_ContestHall/map.json delete mode 100644 data/maps/LilycoveCity_ContestLobby/events.inc delete mode 100644 data/maps/LilycoveCity_ContestLobby/header.inc create mode 100644 data/maps/LilycoveCity_ContestLobby/map.json delete mode 100644 data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc delete mode 100644 data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc create mode 100644 data/maps/LilycoveCity_CoveLilyMotel_1F/map.json delete mode 100644 data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc delete mode 100644 data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc create mode 100644 data/maps/LilycoveCity_CoveLilyMotel_2F/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStoreElevator/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStoreElevator/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStoreElevator/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStoreRooftop/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStore_1F/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_1F/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_1F/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStore_2F/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_2F/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_2F/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStore_3F/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_3F/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_3F/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStore_4F/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_4F/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_4F/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStore_5F/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_5F/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_5F/map.json delete mode 100644 data/maps/LilycoveCity_Harbor/events.inc delete mode 100644 data/maps/LilycoveCity_Harbor/header.inc create mode 100644 data/maps/LilycoveCity_Harbor/map.json delete mode 100644 data/maps/LilycoveCity_House1/events.inc delete mode 100644 data/maps/LilycoveCity_House1/header.inc create mode 100644 data/maps/LilycoveCity_House1/map.json delete mode 100644 data/maps/LilycoveCity_House2/events.inc delete mode 100644 data/maps/LilycoveCity_House2/header.inc create mode 100644 data/maps/LilycoveCity_House2/map.json delete mode 100644 data/maps/LilycoveCity_House3/events.inc delete mode 100644 data/maps/LilycoveCity_House3/header.inc create mode 100644 data/maps/LilycoveCity_House3/map.json delete mode 100644 data/maps/LilycoveCity_House4/events.inc delete mode 100644 data/maps/LilycoveCity_House4/header.inc create mode 100644 data/maps/LilycoveCity_House4/map.json delete mode 100644 data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc delete mode 100644 data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc create mode 100644 data/maps/LilycoveCity_LilycoveMuseum_1F/map.json delete mode 100644 data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc delete mode 100644 data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc create mode 100644 data/maps/LilycoveCity_LilycoveMuseum_2F/map.json delete mode 100644 data/maps/LilycoveCity_MoveDeletersHouse/events.inc delete mode 100644 data/maps/LilycoveCity_MoveDeletersHouse/header.inc create mode 100644 data/maps/LilycoveCity_MoveDeletersHouse/map.json delete mode 100644 data/maps/LilycoveCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/LilycoveCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/LilycoveCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/LilycoveCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/LilycoveCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/LilycoveCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc delete mode 100644 data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc create mode 100644 data/maps/LilycoveCity_PokemonTrainerFanClub/map.json delete mode 100644 data/maps/LilycoveCity_UnusedMart/events.inc delete mode 100644 data/maps/LilycoveCity_UnusedMart/header.inc create mode 100644 data/maps/LilycoveCity_UnusedMart/map.json delete mode 100644 data/maps/LinkContestRoom1/events.inc delete mode 100644 data/maps/LinkContestRoom1/header.inc create mode 100644 data/maps/LinkContestRoom1/map.json delete mode 100644 data/maps/LinkContestRoom2/events.inc delete mode 100644 data/maps/LinkContestRoom2/header.inc create mode 100644 data/maps/LinkContestRoom2/map.json delete mode 100644 data/maps/LinkContestRoom3/events.inc delete mode 100644 data/maps/LinkContestRoom3/header.inc create mode 100644 data/maps/LinkContestRoom3/map.json delete mode 100644 data/maps/LinkContestRoom4/events.inc delete mode 100644 data/maps/LinkContestRoom4/header.inc create mode 100644 data/maps/LinkContestRoom4/map.json delete mode 100644 data/maps/LinkContestRoom5/events.inc delete mode 100644 data/maps/LinkContestRoom5/header.inc create mode 100644 data/maps/LinkContestRoom5/map.json delete mode 100644 data/maps/LinkContestRoom6/events.inc delete mode 100644 data/maps/LinkContestRoom6/header.inc create mode 100644 data/maps/LinkContestRoom6/map.json delete mode 100644 data/maps/LittlerootTown/connections.inc delete mode 100644 data/maps/LittlerootTown/events.inc delete mode 100644 data/maps/LittlerootTown/header.inc create mode 100644 data/maps/LittlerootTown/map.json delete mode 100644 data/maps/LittlerootTown_BrendansHouse_1F/events.inc delete mode 100644 data/maps/LittlerootTown_BrendansHouse_1F/header.inc create mode 100644 data/maps/LittlerootTown_BrendansHouse_1F/map.json delete mode 100644 data/maps/LittlerootTown_BrendansHouse_2F/events.inc delete mode 100644 data/maps/LittlerootTown_BrendansHouse_2F/header.inc create mode 100644 data/maps/LittlerootTown_BrendansHouse_2F/map.json delete mode 100644 data/maps/LittlerootTown_MaysHouse_1F/events.inc delete mode 100644 data/maps/LittlerootTown_MaysHouse_1F/header.inc create mode 100644 data/maps/LittlerootTown_MaysHouse_1F/map.json delete mode 100644 data/maps/LittlerootTown_MaysHouse_2F/events.inc delete mode 100644 data/maps/LittlerootTown_MaysHouse_2F/header.inc create mode 100644 data/maps/LittlerootTown_MaysHouse_2F/map.json delete mode 100644 data/maps/LittlerootTown_ProfessorBirchsLab/events.inc delete mode 100644 data/maps/LittlerootTown_ProfessorBirchsLab/header.inc create mode 100644 data/maps/LittlerootTown_ProfessorBirchsLab/map.json delete mode 100644 data/maps/MagmaHideout_1F/events.inc delete mode 100644 data/maps/MagmaHideout_1F/header.inc create mode 100644 data/maps/MagmaHideout_1F/map.json delete mode 100644 data/maps/MagmaHideout_2F_1R/events.inc delete mode 100644 data/maps/MagmaHideout_2F_1R/header.inc create mode 100644 data/maps/MagmaHideout_2F_1R/map.json delete mode 100644 data/maps/MagmaHideout_2F_2R/events.inc delete mode 100644 data/maps/MagmaHideout_2F_2R/header.inc create mode 100644 data/maps/MagmaHideout_2F_2R/map.json delete mode 100644 data/maps/MagmaHideout_2F_3R/events.inc delete mode 100644 data/maps/MagmaHideout_2F_3R/header.inc create mode 100644 data/maps/MagmaHideout_2F_3R/map.json delete mode 100644 data/maps/MagmaHideout_3F_1R/events.inc delete mode 100644 data/maps/MagmaHideout_3F_1R/header.inc create mode 100644 data/maps/MagmaHideout_3F_1R/map.json delete mode 100644 data/maps/MagmaHideout_3F_2R/events.inc delete mode 100644 data/maps/MagmaHideout_3F_2R/header.inc create mode 100644 data/maps/MagmaHideout_3F_2R/map.json delete mode 100644 data/maps/MagmaHideout_3F_3R/events.inc delete mode 100644 data/maps/MagmaHideout_3F_3R/header.inc create mode 100644 data/maps/MagmaHideout_3F_3R/map.json delete mode 100644 data/maps/MagmaHideout_4F/events.inc delete mode 100644 data/maps/MagmaHideout_4F/header.inc create mode 100644 data/maps/MagmaHideout_4F/map.json delete mode 100644 data/maps/MarineCave_End/events.inc delete mode 100644 data/maps/MarineCave_End/header.inc create mode 100644 data/maps/MarineCave_End/map.json delete mode 100644 data/maps/MarineCave_Entrance/events.inc delete mode 100644 data/maps/MarineCave_Entrance/header.inc create mode 100644 data/maps/MarineCave_Entrance/map.json delete mode 100644 data/maps/MauvilleCity/connections.inc delete mode 100644 data/maps/MauvilleCity/events.inc delete mode 100644 data/maps/MauvilleCity/header.inc create mode 100644 data/maps/MauvilleCity/map.json delete mode 100644 data/maps/MauvilleCity_BikeShop/events.inc delete mode 100644 data/maps/MauvilleCity_BikeShop/header.inc create mode 100644 data/maps/MauvilleCity_BikeShop/map.json delete mode 100644 data/maps/MauvilleCity_GameCorner/events.inc delete mode 100644 data/maps/MauvilleCity_GameCorner/header.inc create mode 100644 data/maps/MauvilleCity_GameCorner/map.json delete mode 100644 data/maps/MauvilleCity_Gym/events.inc delete mode 100644 data/maps/MauvilleCity_Gym/header.inc create mode 100644 data/maps/MauvilleCity_Gym/map.json delete mode 100644 data/maps/MauvilleCity_House1/events.inc delete mode 100644 data/maps/MauvilleCity_House1/header.inc create mode 100644 data/maps/MauvilleCity_House1/map.json delete mode 100644 data/maps/MauvilleCity_House2/events.inc delete mode 100644 data/maps/MauvilleCity_House2/header.inc create mode 100644 data/maps/MauvilleCity_House2/map.json delete mode 100644 data/maps/MauvilleCity_Mart/events.inc delete mode 100644 data/maps/MauvilleCity_Mart/header.inc create mode 100644 data/maps/MauvilleCity_Mart/map.json delete mode 100644 data/maps/MauvilleCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/MauvilleCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/MauvilleCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/MauvilleCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/MauvilleCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/MauvilleCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/MeteorFalls_1F_1R/events.inc delete mode 100644 data/maps/MeteorFalls_1F_1R/header.inc create mode 100644 data/maps/MeteorFalls_1F_1R/map.json delete mode 100644 data/maps/MeteorFalls_1F_2R/events.inc delete mode 100644 data/maps/MeteorFalls_1F_2R/header.inc create mode 100644 data/maps/MeteorFalls_1F_2R/map.json delete mode 100644 data/maps/MeteorFalls_B1F_1R/events.inc delete mode 100644 data/maps/MeteorFalls_B1F_1R/header.inc create mode 100644 data/maps/MeteorFalls_B1F_1R/map.json delete mode 100644 data/maps/MeteorFalls_B1F_2R/events.inc delete mode 100644 data/maps/MeteorFalls_B1F_2R/header.inc create mode 100644 data/maps/MeteorFalls_B1F_2R/map.json delete mode 100644 data/maps/MeteorFalls_StevensCave/events.inc delete mode 100644 data/maps/MeteorFalls_StevensCave/header.inc create mode 100644 data/maps/MeteorFalls_StevensCave/map.json delete mode 100644 data/maps/MirageTower_1F/events.inc delete mode 100644 data/maps/MirageTower_1F/header.inc create mode 100644 data/maps/MirageTower_1F/map.json delete mode 100644 data/maps/MirageTower_2F/events.inc delete mode 100644 data/maps/MirageTower_2F/header.inc create mode 100644 data/maps/MirageTower_2F/map.json delete mode 100644 data/maps/MirageTower_3F/events.inc delete mode 100644 data/maps/MirageTower_3F/header.inc create mode 100644 data/maps/MirageTower_3F/map.json delete mode 100644 data/maps/MirageTower_4F/events.inc delete mode 100644 data/maps/MirageTower_4F/header.inc create mode 100644 data/maps/MirageTower_4F/map.json delete mode 100644 data/maps/MossdeepCity/connections.inc delete mode 100644 data/maps/MossdeepCity/events.inc delete mode 100644 data/maps/MossdeepCity/header.inc create mode 100644 data/maps/MossdeepCity/map.json delete mode 100644 data/maps/MossdeepCity_GameCorner_1F/events.inc delete mode 100644 data/maps/MossdeepCity_GameCorner_1F/header.inc create mode 100644 data/maps/MossdeepCity_GameCorner_1F/map.json delete mode 100644 data/maps/MossdeepCity_GameCorner_B1F/events.inc delete mode 100644 data/maps/MossdeepCity_GameCorner_B1F/header.inc create mode 100644 data/maps/MossdeepCity_GameCorner_B1F/map.json delete mode 100644 data/maps/MossdeepCity_Gym/events.inc delete mode 100644 data/maps/MossdeepCity_Gym/header.inc create mode 100644 data/maps/MossdeepCity_Gym/map.json delete mode 100644 data/maps/MossdeepCity_House1/events.inc delete mode 100644 data/maps/MossdeepCity_House1/header.inc create mode 100644 data/maps/MossdeepCity_House1/map.json delete mode 100644 data/maps/MossdeepCity_House2/events.inc delete mode 100644 data/maps/MossdeepCity_House2/header.inc create mode 100644 data/maps/MossdeepCity_House2/map.json delete mode 100644 data/maps/MossdeepCity_House3/events.inc delete mode 100644 data/maps/MossdeepCity_House3/header.inc create mode 100644 data/maps/MossdeepCity_House3/map.json delete mode 100644 data/maps/MossdeepCity_House4/events.inc delete mode 100644 data/maps/MossdeepCity_House4/header.inc create mode 100644 data/maps/MossdeepCity_House4/map.json delete mode 100644 data/maps/MossdeepCity_Mart/events.inc delete mode 100644 data/maps/MossdeepCity_Mart/header.inc create mode 100644 data/maps/MossdeepCity_Mart/map.json delete mode 100644 data/maps/MossdeepCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/MossdeepCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/MossdeepCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/MossdeepCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/MossdeepCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/MossdeepCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/MossdeepCity_SpaceCenter_1F/events.inc delete mode 100644 data/maps/MossdeepCity_SpaceCenter_1F/header.inc create mode 100644 data/maps/MossdeepCity_SpaceCenter_1F/map.json delete mode 100644 data/maps/MossdeepCity_SpaceCenter_2F/events.inc delete mode 100644 data/maps/MossdeepCity_SpaceCenter_2F/header.inc create mode 100644 data/maps/MossdeepCity_SpaceCenter_2F/map.json delete mode 100644 data/maps/MossdeepCity_StevensHouse/events.inc delete mode 100644 data/maps/MossdeepCity_StevensHouse/header.inc create mode 100644 data/maps/MossdeepCity_StevensHouse/map.json delete mode 100644 data/maps/MtChimney/events.inc delete mode 100644 data/maps/MtChimney/header.inc create mode 100644 data/maps/MtChimney/map.json delete mode 100644 data/maps/MtChimney_CableCarStation/events.inc delete mode 100644 data/maps/MtChimney_CableCarStation/header.inc create mode 100644 data/maps/MtChimney_CableCarStation/map.json delete mode 100644 data/maps/MtPyre_1F/events.inc delete mode 100644 data/maps/MtPyre_1F/header.inc create mode 100644 data/maps/MtPyre_1F/map.json delete mode 100644 data/maps/MtPyre_2F/events.inc delete mode 100644 data/maps/MtPyre_2F/header.inc create mode 100644 data/maps/MtPyre_2F/map.json delete mode 100644 data/maps/MtPyre_3F/events.inc delete mode 100644 data/maps/MtPyre_3F/header.inc create mode 100644 data/maps/MtPyre_3F/map.json delete mode 100644 data/maps/MtPyre_4F/events.inc delete mode 100644 data/maps/MtPyre_4F/header.inc create mode 100644 data/maps/MtPyre_4F/map.json delete mode 100644 data/maps/MtPyre_5F/events.inc delete mode 100644 data/maps/MtPyre_5F/header.inc create mode 100644 data/maps/MtPyre_5F/map.json delete mode 100644 data/maps/MtPyre_6F/events.inc delete mode 100644 data/maps/MtPyre_6F/header.inc create mode 100644 data/maps/MtPyre_6F/map.json delete mode 100644 data/maps/MtPyre_Exterior/events.inc delete mode 100644 data/maps/MtPyre_Exterior/header.inc create mode 100644 data/maps/MtPyre_Exterior/map.json delete mode 100644 data/maps/MtPyre_Summit/events.inc delete mode 100644 data/maps/MtPyre_Summit/header.inc create mode 100644 data/maps/MtPyre_Summit/map.json delete mode 100644 data/maps/NavelRock_B1F/events.inc delete mode 100644 data/maps/NavelRock_B1F/header.inc create mode 100644 data/maps/NavelRock_B1F/map.json delete mode 100644 data/maps/NavelRock_Bottom/events.inc delete mode 100644 data/maps/NavelRock_Bottom/header.inc create mode 100644 data/maps/NavelRock_Bottom/map.json delete mode 100644 data/maps/NavelRock_Down01/events.inc delete mode 100644 data/maps/NavelRock_Down01/header.inc create mode 100644 data/maps/NavelRock_Down01/map.json delete mode 100644 data/maps/NavelRock_Down02/events.inc delete mode 100644 data/maps/NavelRock_Down02/header.inc create mode 100644 data/maps/NavelRock_Down02/map.json delete mode 100644 data/maps/NavelRock_Down03/events.inc delete mode 100644 data/maps/NavelRock_Down03/header.inc create mode 100644 data/maps/NavelRock_Down03/map.json delete mode 100644 data/maps/NavelRock_Down04/events.inc delete mode 100644 data/maps/NavelRock_Down04/header.inc create mode 100644 data/maps/NavelRock_Down04/map.json delete mode 100644 data/maps/NavelRock_Down05/events.inc delete mode 100644 data/maps/NavelRock_Down05/header.inc create mode 100644 data/maps/NavelRock_Down05/map.json delete mode 100644 data/maps/NavelRock_Down06/events.inc delete mode 100644 data/maps/NavelRock_Down06/header.inc create mode 100644 data/maps/NavelRock_Down06/map.json delete mode 100644 data/maps/NavelRock_Down07/events.inc delete mode 100644 data/maps/NavelRock_Down07/header.inc create mode 100644 data/maps/NavelRock_Down07/map.json delete mode 100644 data/maps/NavelRock_Down08/events.inc delete mode 100644 data/maps/NavelRock_Down08/header.inc create mode 100644 data/maps/NavelRock_Down08/map.json delete mode 100644 data/maps/NavelRock_Down09/events.inc delete mode 100644 data/maps/NavelRock_Down09/header.inc create mode 100644 data/maps/NavelRock_Down09/map.json delete mode 100644 data/maps/NavelRock_Down10/events.inc delete mode 100644 data/maps/NavelRock_Down10/header.inc create mode 100644 data/maps/NavelRock_Down10/map.json delete mode 100644 data/maps/NavelRock_Down11/events.inc delete mode 100644 data/maps/NavelRock_Down11/header.inc create mode 100644 data/maps/NavelRock_Down11/map.json delete mode 100644 data/maps/NavelRock_Entrance/events.inc delete mode 100644 data/maps/NavelRock_Entrance/header.inc create mode 100644 data/maps/NavelRock_Entrance/map.json delete mode 100644 data/maps/NavelRock_Exterior/events.inc delete mode 100644 data/maps/NavelRock_Exterior/header.inc create mode 100644 data/maps/NavelRock_Exterior/map.json delete mode 100644 data/maps/NavelRock_Fork/events.inc delete mode 100644 data/maps/NavelRock_Fork/header.inc create mode 100644 data/maps/NavelRock_Fork/map.json delete mode 100644 data/maps/NavelRock_Harbor/events.inc delete mode 100644 data/maps/NavelRock_Harbor/header.inc create mode 100644 data/maps/NavelRock_Harbor/map.json delete mode 100644 data/maps/NavelRock_Top/events.inc delete mode 100644 data/maps/NavelRock_Top/header.inc create mode 100644 data/maps/NavelRock_Top/map.json delete mode 100644 data/maps/NavelRock_Up1/events.inc delete mode 100644 data/maps/NavelRock_Up1/header.inc create mode 100644 data/maps/NavelRock_Up1/map.json delete mode 100644 data/maps/NavelRock_Up2/events.inc delete mode 100644 data/maps/NavelRock_Up2/header.inc create mode 100644 data/maps/NavelRock_Up2/map.json delete mode 100644 data/maps/NavelRock_Up3/events.inc delete mode 100644 data/maps/NavelRock_Up3/header.inc create mode 100644 data/maps/NavelRock_Up3/map.json delete mode 100644 data/maps/NavelRock_Up4/events.inc delete mode 100644 data/maps/NavelRock_Up4/header.inc create mode 100644 data/maps/NavelRock_Up4/map.json delete mode 100644 data/maps/NewMauville_Entrance/events.inc delete mode 100644 data/maps/NewMauville_Entrance/header.inc create mode 100644 data/maps/NewMauville_Entrance/map.json delete mode 100644 data/maps/NewMauville_Inside/events.inc delete mode 100644 data/maps/NewMauville_Inside/header.inc create mode 100644 data/maps/NewMauville_Inside/map.json delete mode 100644 data/maps/OldaleTown/connections.inc delete mode 100644 data/maps/OldaleTown/events.inc delete mode 100644 data/maps/OldaleTown/header.inc create mode 100644 data/maps/OldaleTown/map.json delete mode 100644 data/maps/OldaleTown_House1/events.inc delete mode 100644 data/maps/OldaleTown_House1/header.inc create mode 100644 data/maps/OldaleTown_House1/map.json delete mode 100644 data/maps/OldaleTown_House2/events.inc delete mode 100644 data/maps/OldaleTown_House2/header.inc create mode 100644 data/maps/OldaleTown_House2/map.json delete mode 100644 data/maps/OldaleTown_Mart/events.inc delete mode 100644 data/maps/OldaleTown_Mart/header.inc create mode 100644 data/maps/OldaleTown_Mart/map.json delete mode 100644 data/maps/OldaleTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/OldaleTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/OldaleTown_PokemonCenter_1F/map.json delete mode 100644 data/maps/OldaleTown_PokemonCenter_2F/events.inc delete mode 100644 data/maps/OldaleTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/OldaleTown_PokemonCenter_2F/map.json delete mode 100644 data/maps/PacifidlogTown/connections.inc delete mode 100644 data/maps/PacifidlogTown/events.inc delete mode 100644 data/maps/PacifidlogTown/header.inc create mode 100644 data/maps/PacifidlogTown/map.json delete mode 100644 data/maps/PacifidlogTown_House1/events.inc delete mode 100644 data/maps/PacifidlogTown_House1/header.inc create mode 100644 data/maps/PacifidlogTown_House1/map.json delete mode 100644 data/maps/PacifidlogTown_House2/events.inc delete mode 100644 data/maps/PacifidlogTown_House2/header.inc create mode 100644 data/maps/PacifidlogTown_House2/map.json delete mode 100644 data/maps/PacifidlogTown_House3/events.inc delete mode 100644 data/maps/PacifidlogTown_House3/header.inc create mode 100644 data/maps/PacifidlogTown_House3/map.json delete mode 100644 data/maps/PacifidlogTown_House4/events.inc delete mode 100644 data/maps/PacifidlogTown_House4/header.inc create mode 100644 data/maps/PacifidlogTown_House4/map.json delete mode 100644 data/maps/PacifidlogTown_House5/events.inc delete mode 100644 data/maps/PacifidlogTown_House5/header.inc create mode 100644 data/maps/PacifidlogTown_House5/map.json delete mode 100644 data/maps/PacifidlogTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/PacifidlogTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/PacifidlogTown_PokemonCenter_1F/map.json delete mode 100644 data/maps/PacifidlogTown_PokemonCenter_2F/events.inc delete mode 100644 data/maps/PacifidlogTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/PacifidlogTown_PokemonCenter_2F/map.json delete mode 100644 data/maps/PetalburgCity/connections.inc delete mode 100644 data/maps/PetalburgCity/events.inc delete mode 100644 data/maps/PetalburgCity/header.inc create mode 100644 data/maps/PetalburgCity/map.json delete mode 100644 data/maps/PetalburgCity_Gym/events.inc delete mode 100644 data/maps/PetalburgCity_Gym/header.inc create mode 100644 data/maps/PetalburgCity_Gym/map.json delete mode 100644 data/maps/PetalburgCity_House1/events.inc delete mode 100644 data/maps/PetalburgCity_House1/header.inc create mode 100644 data/maps/PetalburgCity_House1/map.json delete mode 100644 data/maps/PetalburgCity_House2/events.inc delete mode 100644 data/maps/PetalburgCity_House2/header.inc create mode 100644 data/maps/PetalburgCity_House2/map.json delete mode 100644 data/maps/PetalburgCity_Mart/events.inc delete mode 100644 data/maps/PetalburgCity_Mart/header.inc create mode 100644 data/maps/PetalburgCity_Mart/map.json delete mode 100644 data/maps/PetalburgCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/PetalburgCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/PetalburgCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/PetalburgCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/PetalburgCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/PetalburgCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/PetalburgCity_WallysHouse/events.inc delete mode 100644 data/maps/PetalburgCity_WallysHouse/header.inc create mode 100644 data/maps/PetalburgCity_WallysHouse/map.json delete mode 100644 data/maps/PetalburgWoods/events.inc delete mode 100644 data/maps/PetalburgWoods/header.inc create mode 100644 data/maps/PetalburgWoods/map.json delete mode 100644 data/maps/RecordCorner/events.inc delete mode 100644 data/maps/RecordCorner/header.inc create mode 100644 data/maps/RecordCorner/map.json delete mode 100644 data/maps/Route101/connections.inc delete mode 100644 data/maps/Route101/events.inc delete mode 100644 data/maps/Route101/header.inc create mode 100644 data/maps/Route101/map.json delete mode 100644 data/maps/Route102/connections.inc delete mode 100644 data/maps/Route102/events.inc delete mode 100644 data/maps/Route102/header.inc create mode 100644 data/maps/Route102/map.json delete mode 100644 data/maps/Route103/connections.inc delete mode 100644 data/maps/Route103/events.inc delete mode 100644 data/maps/Route103/header.inc create mode 100644 data/maps/Route103/map.json delete mode 100644 data/maps/Route104/connections.inc delete mode 100644 data/maps/Route104/events.inc delete mode 100644 data/maps/Route104/header.inc create mode 100644 data/maps/Route104/map.json delete mode 100644 data/maps/Route104_MrBrineysHouse/events.inc delete mode 100644 data/maps/Route104_MrBrineysHouse/header.inc create mode 100644 data/maps/Route104_MrBrineysHouse/map.json delete mode 100644 data/maps/Route104_PrettyPetalFlowerShop/events.inc delete mode 100644 data/maps/Route104_PrettyPetalFlowerShop/header.inc create mode 100644 data/maps/Route104_PrettyPetalFlowerShop/map.json delete mode 100644 data/maps/Route104_Prototype/events.inc delete mode 100644 data/maps/Route104_Prototype/header.inc create mode 100644 data/maps/Route104_Prototype/map.json delete mode 100644 data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc delete mode 100644 data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc create mode 100644 data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json delete mode 100644 data/maps/Route105/connections.inc delete mode 100644 data/maps/Route105/events.inc delete mode 100644 data/maps/Route105/header.inc create mode 100644 data/maps/Route105/map.json delete mode 100644 data/maps/Route106/connections.inc delete mode 100644 data/maps/Route106/events.inc delete mode 100644 data/maps/Route106/header.inc create mode 100644 data/maps/Route106/map.json delete mode 100644 data/maps/Route107/connections.inc delete mode 100644 data/maps/Route107/events.inc delete mode 100644 data/maps/Route107/header.inc create mode 100644 data/maps/Route107/map.json delete mode 100644 data/maps/Route108/connections.inc delete mode 100644 data/maps/Route108/events.inc delete mode 100644 data/maps/Route108/header.inc create mode 100644 data/maps/Route108/map.json delete mode 100644 data/maps/Route109/connections.inc delete mode 100644 data/maps/Route109/events.inc delete mode 100644 data/maps/Route109/header.inc create mode 100644 data/maps/Route109/map.json delete mode 100644 data/maps/Route109_SeashoreHouse/events.inc delete mode 100644 data/maps/Route109_SeashoreHouse/header.inc create mode 100644 data/maps/Route109_SeashoreHouse/map.json delete mode 100644 data/maps/Route110/connections.inc delete mode 100644 data/maps/Route110/events.inc delete mode 100644 data/maps/Route110/header.inc create mode 100644 data/maps/Route110/map.json delete mode 100644 data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc delete mode 100644 data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json delete mode 100644 data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc delete mode 100644 data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json delete mode 100644 data/maps/Route110_TrickHouseCorridor/events.inc delete mode 100644 data/maps/Route110_TrickHouseCorridor/header.inc create mode 100644 data/maps/Route110_TrickHouseCorridor/map.json delete mode 100644 data/maps/Route110_TrickHouseEnd/events.inc delete mode 100644 data/maps/Route110_TrickHouseEnd/header.inc create mode 100644 data/maps/Route110_TrickHouseEnd/map.json delete mode 100644 data/maps/Route110_TrickHouseEntrance/events.inc delete mode 100644 data/maps/Route110_TrickHouseEntrance/header.inc create mode 100644 data/maps/Route110_TrickHouseEntrance/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle1/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle1/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle1/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle2/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle2/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle2/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle3/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle3/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle3/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle4/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle4/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle4/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle5/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle5/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle5/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle6/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle6/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle6/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle7/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle7/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle7/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle8/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle8/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle8/map.json delete mode 100644 data/maps/Route111/connections.inc delete mode 100644 data/maps/Route111/events.inc delete mode 100644 data/maps/Route111/header.inc create mode 100644 data/maps/Route111/map.json delete mode 100644 data/maps/Route111_OldLadysRestStop/events.inc delete mode 100644 data/maps/Route111_OldLadysRestStop/header.inc create mode 100644 data/maps/Route111_OldLadysRestStop/map.json delete mode 100644 data/maps/Route111_WinstrateFamilysHouse/events.inc delete mode 100644 data/maps/Route111_WinstrateFamilysHouse/header.inc create mode 100644 data/maps/Route111_WinstrateFamilysHouse/map.json delete mode 100644 data/maps/Route112/connections.inc delete mode 100644 data/maps/Route112/events.inc delete mode 100644 data/maps/Route112/header.inc create mode 100644 data/maps/Route112/map.json delete mode 100644 data/maps/Route112_CableCarStation/events.inc delete mode 100644 data/maps/Route112_CableCarStation/header.inc create mode 100644 data/maps/Route112_CableCarStation/map.json delete mode 100644 data/maps/Route113/connections.inc delete mode 100644 data/maps/Route113/events.inc delete mode 100644 data/maps/Route113/header.inc create mode 100644 data/maps/Route113/map.json delete mode 100644 data/maps/Route113_GlassWorkshop/events.inc delete mode 100644 data/maps/Route113_GlassWorkshop/header.inc create mode 100644 data/maps/Route113_GlassWorkshop/map.json delete mode 100644 data/maps/Route114/connections.inc delete mode 100644 data/maps/Route114/events.inc delete mode 100644 data/maps/Route114/header.inc create mode 100644 data/maps/Route114/map.json delete mode 100644 data/maps/Route114_FossilManiacsHouse/events.inc delete mode 100644 data/maps/Route114_FossilManiacsHouse/header.inc create mode 100644 data/maps/Route114_FossilManiacsHouse/map.json delete mode 100644 data/maps/Route114_FossilManiacsTunnel/events.inc delete mode 100644 data/maps/Route114_FossilManiacsTunnel/header.inc create mode 100644 data/maps/Route114_FossilManiacsTunnel/map.json delete mode 100644 data/maps/Route114_LanettesHouse/events.inc delete mode 100644 data/maps/Route114_LanettesHouse/header.inc create mode 100644 data/maps/Route114_LanettesHouse/map.json delete mode 100644 data/maps/Route115/connections.inc delete mode 100644 data/maps/Route115/events.inc delete mode 100644 data/maps/Route115/header.inc create mode 100644 data/maps/Route115/map.json delete mode 100644 data/maps/Route116/connections.inc delete mode 100644 data/maps/Route116/events.inc delete mode 100644 data/maps/Route116/header.inc create mode 100644 data/maps/Route116/map.json delete mode 100644 data/maps/Route116_TunnelersRestHouse/events.inc delete mode 100644 data/maps/Route116_TunnelersRestHouse/header.inc create mode 100644 data/maps/Route116_TunnelersRestHouse/map.json delete mode 100644 data/maps/Route117/connections.inc delete mode 100644 data/maps/Route117/events.inc delete mode 100644 data/maps/Route117/header.inc create mode 100644 data/maps/Route117/map.json delete mode 100644 data/maps/Route117_PokemonDayCare/events.inc delete mode 100644 data/maps/Route117_PokemonDayCare/header.inc create mode 100644 data/maps/Route117_PokemonDayCare/map.json delete mode 100644 data/maps/Route118/connections.inc delete mode 100644 data/maps/Route118/events.inc delete mode 100644 data/maps/Route118/header.inc create mode 100644 data/maps/Route118/map.json delete mode 100644 data/maps/Route119/connections.inc delete mode 100644 data/maps/Route119/events.inc delete mode 100644 data/maps/Route119/header.inc create mode 100644 data/maps/Route119/map.json delete mode 100644 data/maps/Route119_House/events.inc delete mode 100644 data/maps/Route119_House/header.inc create mode 100644 data/maps/Route119_House/map.json delete mode 100644 data/maps/Route119_WeatherInstitute_1F/events.inc delete mode 100644 data/maps/Route119_WeatherInstitute_1F/header.inc create mode 100644 data/maps/Route119_WeatherInstitute_1F/map.json delete mode 100644 data/maps/Route119_WeatherInstitute_2F/events.inc delete mode 100644 data/maps/Route119_WeatherInstitute_2F/header.inc create mode 100644 data/maps/Route119_WeatherInstitute_2F/map.json delete mode 100644 data/maps/Route120/connections.inc delete mode 100644 data/maps/Route120/events.inc delete mode 100644 data/maps/Route120/header.inc create mode 100644 data/maps/Route120/map.json delete mode 100644 data/maps/Route121/connections.inc delete mode 100644 data/maps/Route121/events.inc delete mode 100644 data/maps/Route121/header.inc create mode 100644 data/maps/Route121/map.json delete mode 100644 data/maps/Route121_SafariZoneEntrance/events.inc delete mode 100644 data/maps/Route121_SafariZoneEntrance/header.inc create mode 100644 data/maps/Route121_SafariZoneEntrance/map.json delete mode 100644 data/maps/Route122/connections.inc delete mode 100644 data/maps/Route122/events.inc delete mode 100644 data/maps/Route122/header.inc create mode 100644 data/maps/Route122/map.json delete mode 100644 data/maps/Route123/connections.inc delete mode 100644 data/maps/Route123/events.inc delete mode 100644 data/maps/Route123/header.inc create mode 100644 data/maps/Route123/map.json delete mode 100644 data/maps/Route123_BerryMastersHouse/events.inc delete mode 100644 data/maps/Route123_BerryMastersHouse/header.inc create mode 100644 data/maps/Route123_BerryMastersHouse/map.json delete mode 100644 data/maps/Route124/connections.inc delete mode 100644 data/maps/Route124/events.inc delete mode 100644 data/maps/Route124/header.inc create mode 100644 data/maps/Route124/map.json delete mode 100644 data/maps/Route124_DivingTreasureHuntersHouse/events.inc delete mode 100644 data/maps/Route124_DivingTreasureHuntersHouse/header.inc create mode 100644 data/maps/Route124_DivingTreasureHuntersHouse/map.json delete mode 100644 data/maps/Route125/connections.inc delete mode 100644 data/maps/Route125/events.inc delete mode 100644 data/maps/Route125/header.inc create mode 100644 data/maps/Route125/map.json delete mode 100644 data/maps/Route126/connections.inc delete mode 100644 data/maps/Route126/events.inc delete mode 100644 data/maps/Route126/header.inc create mode 100644 data/maps/Route126/map.json delete mode 100644 data/maps/Route127/connections.inc delete mode 100644 data/maps/Route127/events.inc delete mode 100644 data/maps/Route127/header.inc create mode 100644 data/maps/Route127/map.json delete mode 100644 data/maps/Route128/connections.inc delete mode 100644 data/maps/Route128/events.inc delete mode 100644 data/maps/Route128/header.inc create mode 100644 data/maps/Route128/map.json delete mode 100644 data/maps/Route129/connections.inc delete mode 100644 data/maps/Route129/events.inc delete mode 100644 data/maps/Route129/header.inc create mode 100644 data/maps/Route129/map.json delete mode 100644 data/maps/Route130/connections.inc delete mode 100644 data/maps/Route130/events.inc delete mode 100644 data/maps/Route130/header.inc create mode 100644 data/maps/Route130/map.json delete mode 100644 data/maps/Route131/connections.inc delete mode 100644 data/maps/Route131/events.inc delete mode 100644 data/maps/Route131/header.inc create mode 100644 data/maps/Route131/map.json delete mode 100644 data/maps/Route132/connections.inc delete mode 100644 data/maps/Route132/events.inc delete mode 100644 data/maps/Route132/header.inc create mode 100644 data/maps/Route132/map.json delete mode 100644 data/maps/Route133/connections.inc delete mode 100644 data/maps/Route133/events.inc delete mode 100644 data/maps/Route133/header.inc create mode 100644 data/maps/Route133/map.json delete mode 100644 data/maps/Route134/connections.inc delete mode 100644 data/maps/Route134/events.inc delete mode 100644 data/maps/Route134/header.inc create mode 100644 data/maps/Route134/map.json delete mode 100644 data/maps/RustboroCity/connections.inc delete mode 100644 data/maps/RustboroCity/events.inc delete mode 100644 data/maps/RustboroCity/header.inc create mode 100644 data/maps/RustboroCity/map.json delete mode 100644 data/maps/RustboroCity_CuttersHouse/events.inc delete mode 100644 data/maps/RustboroCity_CuttersHouse/header.inc create mode 100644 data/maps/RustboroCity_CuttersHouse/map.json delete mode 100644 data/maps/RustboroCity_DevonCorp_1F/events.inc delete mode 100644 data/maps/RustboroCity_DevonCorp_1F/header.inc create mode 100644 data/maps/RustboroCity_DevonCorp_1F/map.json delete mode 100644 data/maps/RustboroCity_DevonCorp_2F/events.inc delete mode 100644 data/maps/RustboroCity_DevonCorp_2F/header.inc create mode 100644 data/maps/RustboroCity_DevonCorp_2F/map.json delete mode 100644 data/maps/RustboroCity_DevonCorp_3F/events.inc delete mode 100644 data/maps/RustboroCity_DevonCorp_3F/header.inc create mode 100644 data/maps/RustboroCity_DevonCorp_3F/map.json delete mode 100644 data/maps/RustboroCity_Flat1_1F/events.inc delete mode 100644 data/maps/RustboroCity_Flat1_1F/header.inc create mode 100644 data/maps/RustboroCity_Flat1_1F/map.json delete mode 100644 data/maps/RustboroCity_Flat1_2F/events.inc delete mode 100644 data/maps/RustboroCity_Flat1_2F/header.inc create mode 100644 data/maps/RustboroCity_Flat1_2F/map.json delete mode 100644 data/maps/RustboroCity_Flat2_1F/events.inc delete mode 100644 data/maps/RustboroCity_Flat2_1F/header.inc create mode 100644 data/maps/RustboroCity_Flat2_1F/map.json delete mode 100644 data/maps/RustboroCity_Flat2_2F/events.inc delete mode 100644 data/maps/RustboroCity_Flat2_2F/header.inc create mode 100644 data/maps/RustboroCity_Flat2_2F/map.json delete mode 100644 data/maps/RustboroCity_Flat2_3F/events.inc delete mode 100644 data/maps/RustboroCity_Flat2_3F/header.inc create mode 100644 data/maps/RustboroCity_Flat2_3F/map.json delete mode 100644 data/maps/RustboroCity_Gym/events.inc delete mode 100644 data/maps/RustboroCity_Gym/header.inc create mode 100644 data/maps/RustboroCity_Gym/map.json delete mode 100644 data/maps/RustboroCity_House1/events.inc delete mode 100644 data/maps/RustboroCity_House1/header.inc create mode 100644 data/maps/RustboroCity_House1/map.json delete mode 100644 data/maps/RustboroCity_House2/events.inc delete mode 100644 data/maps/RustboroCity_House2/header.inc create mode 100644 data/maps/RustboroCity_House2/map.json delete mode 100644 data/maps/RustboroCity_House3/events.inc delete mode 100644 data/maps/RustboroCity_House3/header.inc create mode 100644 data/maps/RustboroCity_House3/map.json delete mode 100644 data/maps/RustboroCity_Mart/events.inc delete mode 100644 data/maps/RustboroCity_Mart/header.inc create mode 100644 data/maps/RustboroCity_Mart/map.json delete mode 100644 data/maps/RustboroCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/RustboroCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/RustboroCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/RustboroCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/RustboroCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/RustboroCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/RustboroCity_PokemonSchool/events.inc delete mode 100644 data/maps/RustboroCity_PokemonSchool/header.inc create mode 100644 data/maps/RustboroCity_PokemonSchool/map.json delete mode 100644 data/maps/RusturfTunnel/events.inc delete mode 100644 data/maps/RusturfTunnel/header.inc create mode 100644 data/maps/RusturfTunnel/map.json delete mode 100644 data/maps/SSTidalCorridor/events.inc delete mode 100644 data/maps/SSTidalCorridor/header.inc create mode 100644 data/maps/SSTidalCorridor/map.json delete mode 100644 data/maps/SSTidalLowerDeck/events.inc delete mode 100644 data/maps/SSTidalLowerDeck/header.inc create mode 100644 data/maps/SSTidalLowerDeck/map.json delete mode 100644 data/maps/SSTidalRooms/events.inc delete mode 100644 data/maps/SSTidalRooms/header.inc create mode 100644 data/maps/SSTidalRooms/map.json delete mode 100644 data/maps/SafariZone_North/connections.inc delete mode 100644 data/maps/SafariZone_North/events.inc delete mode 100644 data/maps/SafariZone_North/header.inc create mode 100644 data/maps/SafariZone_North/map.json delete mode 100644 data/maps/SafariZone_Northeast/connections.inc delete mode 100644 data/maps/SafariZone_Northeast/events.inc delete mode 100644 data/maps/SafariZone_Northeast/header.inc create mode 100644 data/maps/SafariZone_Northeast/map.json delete mode 100644 data/maps/SafariZone_Northwest/connections.inc delete mode 100644 data/maps/SafariZone_Northwest/events.inc delete mode 100644 data/maps/SafariZone_Northwest/header.inc create mode 100644 data/maps/SafariZone_Northwest/map.json delete mode 100644 data/maps/SafariZone_RestHouse/events.inc delete mode 100644 data/maps/SafariZone_RestHouse/header.inc create mode 100644 data/maps/SafariZone_RestHouse/map.json delete mode 100644 data/maps/SafariZone_South/connections.inc delete mode 100644 data/maps/SafariZone_South/events.inc delete mode 100644 data/maps/SafariZone_South/header.inc create mode 100644 data/maps/SafariZone_South/map.json delete mode 100644 data/maps/SafariZone_Southeast/connections.inc delete mode 100644 data/maps/SafariZone_Southeast/events.inc delete mode 100644 data/maps/SafariZone_Southeast/header.inc create mode 100644 data/maps/SafariZone_Southeast/map.json delete mode 100644 data/maps/SafariZone_Southwest/connections.inc delete mode 100644 data/maps/SafariZone_Southwest/events.inc delete mode 100644 data/maps/SafariZone_Southwest/header.inc create mode 100644 data/maps/SafariZone_Southwest/map.json delete mode 100644 data/maps/ScorchedSlab/events.inc delete mode 100644 data/maps/ScorchedSlab/header.inc create mode 100644 data/maps/ScorchedSlab/map.json delete mode 100644 data/maps/SeafloorCavern_Entrance/events.inc delete mode 100644 data/maps/SeafloorCavern_Entrance/header.inc create mode 100644 data/maps/SeafloorCavern_Entrance/map.json delete mode 100644 data/maps/SeafloorCavern_Room1/events.inc delete mode 100644 data/maps/SeafloorCavern_Room1/header.inc create mode 100644 data/maps/SeafloorCavern_Room1/map.json delete mode 100644 data/maps/SeafloorCavern_Room2/events.inc delete mode 100644 data/maps/SeafloorCavern_Room2/header.inc create mode 100644 data/maps/SeafloorCavern_Room2/map.json delete mode 100644 data/maps/SeafloorCavern_Room3/events.inc delete mode 100644 data/maps/SeafloorCavern_Room3/header.inc create mode 100644 data/maps/SeafloorCavern_Room3/map.json delete mode 100644 data/maps/SeafloorCavern_Room4/events.inc delete mode 100644 data/maps/SeafloorCavern_Room4/header.inc create mode 100644 data/maps/SeafloorCavern_Room4/map.json delete mode 100644 data/maps/SeafloorCavern_Room5/events.inc delete mode 100644 data/maps/SeafloorCavern_Room5/header.inc create mode 100644 data/maps/SeafloorCavern_Room5/map.json delete mode 100644 data/maps/SeafloorCavern_Room6/events.inc delete mode 100644 data/maps/SeafloorCavern_Room6/header.inc create mode 100644 data/maps/SeafloorCavern_Room6/map.json delete mode 100644 data/maps/SeafloorCavern_Room7/events.inc delete mode 100644 data/maps/SeafloorCavern_Room7/header.inc create mode 100644 data/maps/SeafloorCavern_Room7/map.json delete mode 100644 data/maps/SeafloorCavern_Room8/events.inc delete mode 100644 data/maps/SeafloorCavern_Room8/header.inc create mode 100644 data/maps/SeafloorCavern_Room8/map.json delete mode 100644 data/maps/SeafloorCavern_Room9/events.inc delete mode 100644 data/maps/SeafloorCavern_Room9/header.inc create mode 100644 data/maps/SeafloorCavern_Room9/map.json delete mode 100644 data/maps/SealedChamber_InnerRoom/events.inc delete mode 100644 data/maps/SealedChamber_InnerRoom/header.inc create mode 100644 data/maps/SealedChamber_InnerRoom/map.json delete mode 100644 data/maps/SealedChamber_OuterRoom/events.inc delete mode 100644 data/maps/SealedChamber_OuterRoom/header.inc create mode 100644 data/maps/SealedChamber_OuterRoom/map.json delete mode 100644 data/maps/SecretBase_BlueCave1/events.inc delete mode 100644 data/maps/SecretBase_BlueCave1/header.inc create mode 100644 data/maps/SecretBase_BlueCave1/map.json delete mode 100644 data/maps/SecretBase_BlueCave2/events.inc delete mode 100644 data/maps/SecretBase_BlueCave2/header.inc create mode 100644 data/maps/SecretBase_BlueCave2/map.json delete mode 100644 data/maps/SecretBase_BlueCave3/events.inc delete mode 100644 data/maps/SecretBase_BlueCave3/header.inc create mode 100644 data/maps/SecretBase_BlueCave3/map.json delete mode 100644 data/maps/SecretBase_BlueCave4/events.inc delete mode 100644 data/maps/SecretBase_BlueCave4/header.inc create mode 100644 data/maps/SecretBase_BlueCave4/map.json delete mode 100644 data/maps/SecretBase_BrownCave1/events.inc delete mode 100644 data/maps/SecretBase_BrownCave1/header.inc create mode 100644 data/maps/SecretBase_BrownCave1/map.json delete mode 100644 data/maps/SecretBase_BrownCave2/events.inc delete mode 100644 data/maps/SecretBase_BrownCave2/header.inc create mode 100644 data/maps/SecretBase_BrownCave2/map.json delete mode 100644 data/maps/SecretBase_BrownCave3/events.inc delete mode 100644 data/maps/SecretBase_BrownCave3/header.inc create mode 100644 data/maps/SecretBase_BrownCave3/map.json delete mode 100644 data/maps/SecretBase_BrownCave4/events.inc delete mode 100644 data/maps/SecretBase_BrownCave4/header.inc create mode 100644 data/maps/SecretBase_BrownCave4/map.json delete mode 100644 data/maps/SecretBase_RedCave1/events.inc delete mode 100644 data/maps/SecretBase_RedCave1/header.inc create mode 100644 data/maps/SecretBase_RedCave1/map.json delete mode 100644 data/maps/SecretBase_RedCave2/events.inc delete mode 100644 data/maps/SecretBase_RedCave2/header.inc create mode 100644 data/maps/SecretBase_RedCave2/map.json delete mode 100644 data/maps/SecretBase_RedCave3/events.inc delete mode 100644 data/maps/SecretBase_RedCave3/header.inc create mode 100644 data/maps/SecretBase_RedCave3/map.json delete mode 100644 data/maps/SecretBase_RedCave4/events.inc delete mode 100644 data/maps/SecretBase_RedCave4/header.inc create mode 100644 data/maps/SecretBase_RedCave4/map.json delete mode 100644 data/maps/SecretBase_Shrub1/events.inc delete mode 100644 data/maps/SecretBase_Shrub1/header.inc create mode 100644 data/maps/SecretBase_Shrub1/map.json delete mode 100644 data/maps/SecretBase_Shrub2/events.inc delete mode 100644 data/maps/SecretBase_Shrub2/header.inc create mode 100644 data/maps/SecretBase_Shrub2/map.json delete mode 100644 data/maps/SecretBase_Shrub3/events.inc delete mode 100644 data/maps/SecretBase_Shrub3/header.inc create mode 100644 data/maps/SecretBase_Shrub3/map.json delete mode 100644 data/maps/SecretBase_Shrub4/events.inc delete mode 100644 data/maps/SecretBase_Shrub4/header.inc create mode 100644 data/maps/SecretBase_Shrub4/map.json delete mode 100644 data/maps/SecretBase_Tree1/events.inc delete mode 100644 data/maps/SecretBase_Tree1/header.inc create mode 100644 data/maps/SecretBase_Tree1/map.json delete mode 100644 data/maps/SecretBase_Tree2/events.inc delete mode 100644 data/maps/SecretBase_Tree2/header.inc create mode 100644 data/maps/SecretBase_Tree2/map.json delete mode 100644 data/maps/SecretBase_Tree3/events.inc delete mode 100644 data/maps/SecretBase_Tree3/header.inc create mode 100644 data/maps/SecretBase_Tree3/map.json delete mode 100644 data/maps/SecretBase_Tree4/events.inc delete mode 100644 data/maps/SecretBase_Tree4/header.inc create mode 100644 data/maps/SecretBase_Tree4/map.json delete mode 100644 data/maps/SecretBase_YellowCave1/events.inc delete mode 100644 data/maps/SecretBase_YellowCave1/header.inc create mode 100644 data/maps/SecretBase_YellowCave1/map.json delete mode 100644 data/maps/SecretBase_YellowCave2/events.inc delete mode 100644 data/maps/SecretBase_YellowCave2/header.inc create mode 100644 data/maps/SecretBase_YellowCave2/map.json delete mode 100644 data/maps/SecretBase_YellowCave3/events.inc delete mode 100644 data/maps/SecretBase_YellowCave3/header.inc create mode 100644 data/maps/SecretBase_YellowCave3/map.json delete mode 100644 data/maps/SecretBase_YellowCave4/events.inc delete mode 100644 data/maps/SecretBase_YellowCave4/header.inc create mode 100644 data/maps/SecretBase_YellowCave4/map.json delete mode 100644 data/maps/ShoalCave_HighTideEntranceRoom/events.inc delete mode 100644 data/maps/ShoalCave_HighTideEntranceRoom/header.inc create mode 100644 data/maps/ShoalCave_HighTideEntranceRoom/map.json delete mode 100644 data/maps/ShoalCave_HighTideInnerRoom/events.inc delete mode 100644 data/maps/ShoalCave_HighTideInnerRoom/header.inc create mode 100644 data/maps/ShoalCave_HighTideInnerRoom/map.json delete mode 100644 data/maps/ShoalCave_LowTideEntranceRoom/events.inc delete mode 100644 data/maps/ShoalCave_LowTideEntranceRoom/header.inc create mode 100644 data/maps/ShoalCave_LowTideEntranceRoom/map.json delete mode 100644 data/maps/ShoalCave_LowTideIceRoom/events.inc delete mode 100644 data/maps/ShoalCave_LowTideIceRoom/header.inc create mode 100644 data/maps/ShoalCave_LowTideIceRoom/map.json delete mode 100644 data/maps/ShoalCave_LowTideInnerRoom/events.inc delete mode 100644 data/maps/ShoalCave_LowTideInnerRoom/header.inc create mode 100644 data/maps/ShoalCave_LowTideInnerRoom/map.json delete mode 100644 data/maps/ShoalCave_LowTideLowerRoom/events.inc delete mode 100644 data/maps/ShoalCave_LowTideLowerRoom/header.inc create mode 100644 data/maps/ShoalCave_LowTideLowerRoom/map.json delete mode 100644 data/maps/ShoalCave_LowTideStairsRoom/events.inc delete mode 100644 data/maps/ShoalCave_LowTideStairsRoom/header.inc create mode 100644 data/maps/ShoalCave_LowTideStairsRoom/map.json delete mode 100644 data/maps/SingleBattleColosseum/events.inc delete mode 100644 data/maps/SingleBattleColosseum/header.inc create mode 100644 data/maps/SingleBattleColosseum/map.json delete mode 100644 data/maps/SkyPillar_1F/events.inc delete mode 100644 data/maps/SkyPillar_1F/header.inc create mode 100644 data/maps/SkyPillar_1F/map.json delete mode 100644 data/maps/SkyPillar_2F/events.inc delete mode 100644 data/maps/SkyPillar_2F/header.inc create mode 100644 data/maps/SkyPillar_2F/map.json delete mode 100644 data/maps/SkyPillar_3F/events.inc delete mode 100644 data/maps/SkyPillar_3F/header.inc create mode 100644 data/maps/SkyPillar_3F/map.json delete mode 100644 data/maps/SkyPillar_4F/events.inc delete mode 100644 data/maps/SkyPillar_4F/header.inc create mode 100644 data/maps/SkyPillar_4F/map.json delete mode 100644 data/maps/SkyPillar_5F/events.inc delete mode 100644 data/maps/SkyPillar_5F/header.inc create mode 100644 data/maps/SkyPillar_5F/map.json delete mode 100644 data/maps/SkyPillar_Entrance/events.inc delete mode 100644 data/maps/SkyPillar_Entrance/header.inc create mode 100644 data/maps/SkyPillar_Entrance/map.json delete mode 100644 data/maps/SkyPillar_Outside/events.inc delete mode 100644 data/maps/SkyPillar_Outside/header.inc create mode 100644 data/maps/SkyPillar_Outside/map.json delete mode 100644 data/maps/SkyPillar_Top/events.inc delete mode 100644 data/maps/SkyPillar_Top/header.inc create mode 100644 data/maps/SkyPillar_Top/map.json delete mode 100644 data/maps/SlateportCity/connections.inc delete mode 100644 data/maps/SlateportCity/events.inc delete mode 100644 data/maps/SlateportCity/header.inc create mode 100644 data/maps/SlateportCity/map.json delete mode 100644 data/maps/SlateportCity_BattleTentBattleRoom/events.inc delete mode 100644 data/maps/SlateportCity_BattleTentBattleRoom/header.inc create mode 100644 data/maps/SlateportCity_BattleTentBattleRoom/map.json delete mode 100644 data/maps/SlateportCity_BattleTentCorridor/events.inc delete mode 100644 data/maps/SlateportCity_BattleTentCorridor/header.inc create mode 100644 data/maps/SlateportCity_BattleTentCorridor/map.json delete mode 100644 data/maps/SlateportCity_BattleTentLobby/events.inc delete mode 100644 data/maps/SlateportCity_BattleTentLobby/header.inc create mode 100644 data/maps/SlateportCity_BattleTentLobby/map.json delete mode 100644 data/maps/SlateportCity_Harbor/events.inc delete mode 100644 data/maps/SlateportCity_Harbor/header.inc create mode 100644 data/maps/SlateportCity_Harbor/map.json delete mode 100644 data/maps/SlateportCity_House1/events.inc delete mode 100644 data/maps/SlateportCity_House1/header.inc create mode 100644 data/maps/SlateportCity_House1/map.json delete mode 100644 data/maps/SlateportCity_House2/events.inc delete mode 100644 data/maps/SlateportCity_House2/header.inc create mode 100644 data/maps/SlateportCity_House2/map.json delete mode 100644 data/maps/SlateportCity_Mart/events.inc delete mode 100644 data/maps/SlateportCity_Mart/header.inc create mode 100644 data/maps/SlateportCity_Mart/map.json delete mode 100644 data/maps/SlateportCity_OceanicMuseum_1F/events.inc delete mode 100644 data/maps/SlateportCity_OceanicMuseum_1F/header.inc create mode 100644 data/maps/SlateportCity_OceanicMuseum_1F/map.json delete mode 100644 data/maps/SlateportCity_OceanicMuseum_2F/events.inc delete mode 100644 data/maps/SlateportCity_OceanicMuseum_2F/header.inc create mode 100644 data/maps/SlateportCity_OceanicMuseum_2F/map.json delete mode 100644 data/maps/SlateportCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/SlateportCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/SlateportCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/SlateportCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/SlateportCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/SlateportCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/SlateportCity_PokemonFanClub/events.inc delete mode 100644 data/maps/SlateportCity_PokemonFanClub/header.inc create mode 100644 data/maps/SlateportCity_PokemonFanClub/map.json delete mode 100644 data/maps/SlateportCity_SternsShipyard_1F/events.inc delete mode 100644 data/maps/SlateportCity_SternsShipyard_1F/header.inc create mode 100644 data/maps/SlateportCity_SternsShipyard_1F/map.json delete mode 100644 data/maps/SlateportCity_SternsShipyard_2F/events.inc delete mode 100644 data/maps/SlateportCity_SternsShipyard_2F/header.inc create mode 100644 data/maps/SlateportCity_SternsShipyard_2F/map.json delete mode 100644 data/maps/SootopolisCity/connections.inc delete mode 100644 data/maps/SootopolisCity/events.inc delete mode 100644 data/maps/SootopolisCity/header.inc create mode 100644 data/maps/SootopolisCity/map.json delete mode 100644 data/maps/SootopolisCity_Gym_1F/events.inc delete mode 100644 data/maps/SootopolisCity_Gym_1F/header.inc create mode 100644 data/maps/SootopolisCity_Gym_1F/map.json delete mode 100644 data/maps/SootopolisCity_Gym_B1F/events.inc delete mode 100644 data/maps/SootopolisCity_Gym_B1F/header.inc create mode 100644 data/maps/SootopolisCity_Gym_B1F/map.json delete mode 100644 data/maps/SootopolisCity_House1/events.inc delete mode 100644 data/maps/SootopolisCity_House1/header.inc create mode 100644 data/maps/SootopolisCity_House1/map.json delete mode 100644 data/maps/SootopolisCity_House2/events.inc delete mode 100644 data/maps/SootopolisCity_House2/header.inc create mode 100644 data/maps/SootopolisCity_House2/map.json delete mode 100644 data/maps/SootopolisCity_House3/events.inc delete mode 100644 data/maps/SootopolisCity_House3/header.inc create mode 100644 data/maps/SootopolisCity_House3/map.json delete mode 100644 data/maps/SootopolisCity_House4/events.inc delete mode 100644 data/maps/SootopolisCity_House4/header.inc create mode 100644 data/maps/SootopolisCity_House4/map.json delete mode 100644 data/maps/SootopolisCity_House5/events.inc delete mode 100644 data/maps/SootopolisCity_House5/header.inc create mode 100644 data/maps/SootopolisCity_House5/map.json delete mode 100644 data/maps/SootopolisCity_House6/events.inc delete mode 100644 data/maps/SootopolisCity_House6/header.inc create mode 100644 data/maps/SootopolisCity_House6/map.json delete mode 100644 data/maps/SootopolisCity_House7/events.inc delete mode 100644 data/maps/SootopolisCity_House7/header.inc create mode 100644 data/maps/SootopolisCity_House7/map.json delete mode 100644 data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc delete mode 100644 data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc create mode 100644 data/maps/SootopolisCity_LotadAndSeedotHouse/map.json delete mode 100644 data/maps/SootopolisCity_Mart/events.inc delete mode 100644 data/maps/SootopolisCity_Mart/header.inc create mode 100644 data/maps/SootopolisCity_Mart/map.json delete mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc delete mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc create mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json delete mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc delete mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc create mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json delete mode 100644 data/maps/SootopolisCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/SootopolisCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/SootopolisCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/SootopolisCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/SootopolisCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/SootopolisCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/SouthernIsland_Exterior/events.inc delete mode 100644 data/maps/SouthernIsland_Exterior/header.inc create mode 100644 data/maps/SouthernIsland_Exterior/map.json delete mode 100644 data/maps/SouthernIsland_Interior/events.inc delete mode 100644 data/maps/SouthernIsland_Interior/header.inc create mode 100644 data/maps/SouthernIsland_Interior/map.json delete mode 100644 data/maps/TerraCave_End/events.inc delete mode 100644 data/maps/TerraCave_End/header.inc create mode 100644 data/maps/TerraCave_End/map.json delete mode 100644 data/maps/TerraCave_Entrance/events.inc delete mode 100644 data/maps/TerraCave_Entrance/header.inc create mode 100644 data/maps/TerraCave_Entrance/map.json delete mode 100644 data/maps/TradeCenter/events.inc delete mode 100644 data/maps/TradeCenter/header.inc create mode 100644 data/maps/TradeCenter/map.json delete mode 100644 data/maps/TrainerHill_1F/events.inc delete mode 100644 data/maps/TrainerHill_1F/header.inc create mode 100644 data/maps/TrainerHill_1F/map.json delete mode 100644 data/maps/TrainerHill_2F/events.inc delete mode 100644 data/maps/TrainerHill_2F/header.inc create mode 100644 data/maps/TrainerHill_2F/map.json delete mode 100644 data/maps/TrainerHill_3F/events.inc delete mode 100644 data/maps/TrainerHill_3F/header.inc create mode 100644 data/maps/TrainerHill_3F/map.json delete mode 100644 data/maps/TrainerHill_4F/events.inc delete mode 100644 data/maps/TrainerHill_4F/header.inc create mode 100644 data/maps/TrainerHill_4F/map.json delete mode 100644 data/maps/TrainerHill_Elevator/events.inc delete mode 100644 data/maps/TrainerHill_Elevator/header.inc create mode 100644 data/maps/TrainerHill_Elevator/map.json delete mode 100644 data/maps/TrainerHill_Entrance/events.inc delete mode 100644 data/maps/TrainerHill_Entrance/header.inc create mode 100644 data/maps/TrainerHill_Entrance/map.json delete mode 100644 data/maps/TrainerHill_Roof/events.inc delete mode 100644 data/maps/TrainerHill_Roof/header.inc create mode 100644 data/maps/TrainerHill_Roof/map.json delete mode 100644 data/maps/Underwater1/connections.inc delete mode 100644 data/maps/Underwater1/events.inc delete mode 100644 data/maps/Underwater1/header.inc create mode 100644 data/maps/Underwater1/map.json delete mode 100644 data/maps/Underwater2/connections.inc delete mode 100644 data/maps/Underwater2/events.inc delete mode 100644 data/maps/Underwater2/header.inc create mode 100644 data/maps/Underwater2/map.json delete mode 100644 data/maps/Underwater3/connections.inc delete mode 100644 data/maps/Underwater3/events.inc delete mode 100644 data/maps/Underwater3/header.inc create mode 100644 data/maps/Underwater3/map.json delete mode 100644 data/maps/Underwater4/connections.inc delete mode 100644 data/maps/Underwater4/events.inc delete mode 100644 data/maps/Underwater4/header.inc create mode 100644 data/maps/Underwater4/map.json delete mode 100644 data/maps/Underwater5/connections.inc delete mode 100644 data/maps/Underwater5/events.inc delete mode 100644 data/maps/Underwater5/header.inc create mode 100644 data/maps/Underwater5/map.json delete mode 100644 data/maps/Underwater6/connections.inc delete mode 100644 data/maps/Underwater6/events.inc delete mode 100644 data/maps/Underwater6/header.inc create mode 100644 data/maps/Underwater6/map.json delete mode 100644 data/maps/Underwater7/connections.inc delete mode 100644 data/maps/Underwater7/events.inc delete mode 100644 data/maps/Underwater7/header.inc create mode 100644 data/maps/Underwater7/map.json delete mode 100644 data/maps/Underwater_MarineCave/events.inc delete mode 100644 data/maps/Underwater_MarineCave/header.inc create mode 100644 data/maps/Underwater_MarineCave/map.json delete mode 100644 data/maps/Underwater_Route134/events.inc delete mode 100644 data/maps/Underwater_Route134/header.inc create mode 100644 data/maps/Underwater_Route134/map.json delete mode 100644 data/maps/Underwater_SeafloorCavern/events.inc delete mode 100644 data/maps/Underwater_SeafloorCavern/header.inc create mode 100644 data/maps/Underwater_SeafloorCavern/map.json delete mode 100644 data/maps/Underwater_SealedChamber/events.inc delete mode 100644 data/maps/Underwater_SealedChamber/header.inc create mode 100644 data/maps/Underwater_SealedChamber/map.json delete mode 100644 data/maps/Underwater_SootopolisCity/events.inc delete mode 100644 data/maps/Underwater_SootopolisCity/header.inc create mode 100644 data/maps/Underwater_SootopolisCity/map.json delete mode 100644 data/maps/UnionRoom/events.inc delete mode 100644 data/maps/UnionRoom/header.inc create mode 100644 data/maps/UnionRoom/map.json delete mode 100644 data/maps/UnknownMap_25_29/events.inc delete mode 100644 data/maps/UnknownMap_25_29/header.inc create mode 100644 data/maps/UnknownMap_25_29/map.json delete mode 100644 data/maps/UnknownMap_25_30/events.inc delete mode 100644 data/maps/UnknownMap_25_30/header.inc create mode 100644 data/maps/UnknownMap_25_30/map.json delete mode 100644 data/maps/UnknownMap_25_31/events.inc delete mode 100644 data/maps/UnknownMap_25_31/header.inc create mode 100644 data/maps/UnknownMap_25_31/map.json delete mode 100644 data/maps/UnknownMap_25_32/events.inc delete mode 100644 data/maps/UnknownMap_25_32/header.inc create mode 100644 data/maps/UnknownMap_25_32/map.json delete mode 100644 data/maps/UnknownMap_25_33/events.inc delete mode 100644 data/maps/UnknownMap_25_33/header.inc create mode 100644 data/maps/UnknownMap_25_33/map.json delete mode 100644 data/maps/UnknownMap_25_34/events.inc delete mode 100644 data/maps/UnknownMap_25_34/header.inc create mode 100644 data/maps/UnknownMap_25_34/map.json delete mode 100644 data/maps/VerdanturfTown/connections.inc delete mode 100644 data/maps/VerdanturfTown/events.inc delete mode 100644 data/maps/VerdanturfTown/header.inc create mode 100644 data/maps/VerdanturfTown/map.json delete mode 100644 data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc delete mode 100644 data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc create mode 100644 data/maps/VerdanturfTown_BattleTentBattleRoom/map.json delete mode 100644 data/maps/VerdanturfTown_BattleTentCorridor/events.inc delete mode 100644 data/maps/VerdanturfTown_BattleTentCorridor/header.inc create mode 100644 data/maps/VerdanturfTown_BattleTentCorridor/map.json delete mode 100644 data/maps/VerdanturfTown_BattleTentLobby/events.inc delete mode 100644 data/maps/VerdanturfTown_BattleTentLobby/header.inc create mode 100644 data/maps/VerdanturfTown_BattleTentLobby/map.json delete mode 100644 data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc delete mode 100644 data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc create mode 100644 data/maps/VerdanturfTown_FriendshipRatersHouse/map.json delete mode 100644 data/maps/VerdanturfTown_House/events.inc delete mode 100644 data/maps/VerdanturfTown_House/header.inc create mode 100644 data/maps/VerdanturfTown_House/map.json delete mode 100644 data/maps/VerdanturfTown_Mart/events.inc delete mode 100644 data/maps/VerdanturfTown_Mart/header.inc create mode 100644 data/maps/VerdanturfTown_Mart/map.json delete mode 100644 data/maps/VerdanturfTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/VerdanturfTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/VerdanturfTown_PokemonCenter_1F/map.json delete mode 100644 data/maps/VerdanturfTown_PokemonCenter_2F/events.inc delete mode 100644 data/maps/VerdanturfTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/VerdanturfTown_PokemonCenter_2F/map.json delete mode 100644 data/maps/VerdanturfTown_WandasHouse/events.inc delete mode 100644 data/maps/VerdanturfTown_WandasHouse/header.inc create mode 100644 data/maps/VerdanturfTown_WandasHouse/map.json delete mode 100644 data/maps/VictoryRoad_1F/events.inc delete mode 100644 data/maps/VictoryRoad_1F/header.inc create mode 100644 data/maps/VictoryRoad_1F/map.json delete mode 100644 data/maps/VictoryRoad_B1F/events.inc delete mode 100644 data/maps/VictoryRoad_B1F/header.inc create mode 100644 data/maps/VictoryRoad_B1F/map.json delete mode 100644 data/maps/VictoryRoad_B2F/events.inc delete mode 100644 data/maps/VictoryRoad_B2F/header.inc create mode 100644 data/maps/VictoryRoad_B2F/map.json delete mode 100644 data/maps/connections.inc delete mode 100644 data/maps/groups.inc delete mode 100644 data/maps/headers.inc create mode 100644 data/maps/map_groups.json create mode 100755 include/constants/map_groups.h create mode 100755 map_data_rules.mk create mode 100755 tools/mapjson/mapjson.py diff --git a/Makefile b/Makefile index 32cc9df73e..cb9ce27bb9 100644 --- a/Makefile +++ b/Makefile @@ -52,6 +52,7 @@ SCANINC := tools/scaninc/scaninc$(EXE) PREPROC := tools/preproc/preproc$(EXE) RAMSCRGEN := tools/ramscrgen/ramscrgen$(EXE) FIX := tools/gbafix/gbafix$(EXE) +MAPJSON := python tools/mapjson/mapjson.py # Clear the default suffixes .SUFFIXES: @@ -97,12 +98,16 @@ clean: tidy rm -f sound/direct_sound_samples/*.bin rm -f $(SONG_OBJS) $(MID_OBJS) $(MID_SUBDIR)/*.s find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} + + rm -f $(DATA_ASM_SUBDIR)/layouts/layouts.inc $(DATA_ASM_SUBDIR)/layouts/layouts_table.inc + rm -f $(DATA_ASM_SUBDIR)/maps/connections.inc $(DATA_ASM_SUBDIR)/maps/events.inc $(DATA_ASM_SUBDIR)/maps/groups.inc $(DATA_ASM_SUBDIR)/maps/headers.inc + find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} + tidy: rm -f $(ROM) $(ELF) $(MAP) rm -r build/* include graphics_file_rules.mk +include map_data_rules.mk include spritesheet_rules.mk include songs.mk @@ -121,6 +126,7 @@ include songs.mk sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(AIF) $< $@ --compress sound/%.bin: sound/%.aif ; $(AIF) $< $@ + $(C_BUILDDIR)/libc.o: CC1 := tools/agbcc/bin/old_agbcc $(C_BUILDDIR)/libc.o: CFLAGS := -O2 diff --git a/data/event_scripts.s b/data/event_scripts.s index 3c3c38eb9b..fbee3987c7 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -7,6 +7,7 @@ #include "constants/flags.h" #include "constants/items.h" #include "constants/heal_locations.h" +#include "constants/layouts.h" #include "constants/maps.h" #include "constants/moves.h" #include "constants/songs.h" diff --git a/data/layouts.inc b/data/layouts.inc deleted file mode 100755 index 97b3b97c8e..0000000000 --- a/data/layouts.inc +++ /dev/null @@ -1,441 +0,0 @@ - .include "data/layouts/PetalburgCity/layout.inc" - .include "data/layouts/SlateportCity/layout.inc" - .include "data/layouts/MauvilleCity/layout.inc" - .include "data/layouts/RustboroCity/layout.inc" - .include "data/layouts/FortreeCity/layout.inc" - .include "data/layouts/LilycoveCity/layout.inc" - .include "data/layouts/MossdeepCity/layout.inc" - .include "data/layouts/SootopolisCity/layout.inc" - .include "data/layouts/EverGrandeCity/layout.inc" - .include "data/layouts/LittlerootTown/layout.inc" - .include "data/layouts/OldaleTown/layout.inc" - .include "data/layouts/DewfordTown/layout.inc" - .include "data/layouts/LavaridgeTown/layout.inc" - .include "data/layouts/FallarborTown/layout.inc" - .include "data/layouts/VerdanturfTown/layout.inc" - .include "data/layouts/PacifidlogTown/layout.inc" - .include "data/layouts/Route101/layout.inc" - .include "data/layouts/Route102/layout.inc" - .include "data/layouts/Route103/layout.inc" - .include "data/layouts/Route104/layout.inc" - .include "data/layouts/Route105/layout.inc" - .include "data/layouts/Route106/layout.inc" - .include "data/layouts/Route107/layout.inc" - .include "data/layouts/Route108/layout.inc" - .include "data/layouts/Route109/layout.inc" - .include "data/layouts/Route110/layout.inc" - .include "data/layouts/Route111/layout.inc" - .include "data/layouts/Route112/layout.inc" - .include "data/layouts/Route113/layout.inc" - .include "data/layouts/Route114/layout.inc" - .include "data/layouts/Route115/layout.inc" - .include "data/layouts/Route116/layout.inc" - .include "data/layouts/Route117/layout.inc" - .include "data/layouts/Route118/layout.inc" - .include "data/layouts/Route119/layout.inc" - .include "data/layouts/Route120/layout.inc" - .include "data/layouts/Route121/layout.inc" - .include "data/layouts/Route122/layout.inc" - .include "data/layouts/Route123/layout.inc" - .include "data/layouts/Route124/layout.inc" - .include "data/layouts/Route125/layout.inc" - .include "data/layouts/Route126/layout.inc" - .include "data/layouts/Route127/layout.inc" - .include "data/layouts/Route128/layout.inc" - .include "data/layouts/Route129/layout.inc" - .include "data/layouts/UnknownMap_08417FC4/layout.inc" - .include "data/layouts/Route131/layout.inc" - .include "data/layouts/Route132/layout.inc" - .include "data/layouts/Route133/layout.inc" - .include "data/layouts/Route134/layout.inc" - .include "data/layouts/Underwater2/layout.inc" - .include "data/layouts/Underwater3/layout.inc" - .include "data/layouts/Underwater4/layout.inc" - .include "data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc" - .include "data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc" - .include "data/layouts/LittlerootTown_MaysHouse_1F/layout.inc" - .include "data/layouts/LittlerootTown_MaysHouse_2F/layout.inc" - .include "data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc" - .include "data/layouts/House1/layout.inc" - .include "data/layouts/House2/layout.inc" - .include "data/layouts/PokemonCenter_1F/layout.inc" - .include "data/layouts/PokemonCenter_2F/layout.inc" - .include "data/layouts/Mart/layout.inc" - .include "data/layouts/House3/layout.inc" - .include "data/layouts/DewfordTown_Gym/layout.inc" - .include "data/layouts/DewfordTown_Hall/layout.inc" - .include "data/layouts/House4/layout.inc" - .include "data/layouts/LavaridgeTown_HerbShop/layout.inc" - .include "data/layouts/LavaridgeTown_Gym_1F/layout.inc" - .include "data/layouts/LavaridgeTown_Gym_B1F/layout.inc" - .include "data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc" - .include "data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc" - .include "data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc" - .include "data/layouts/LilycoveCity_House2/layout.inc" - .include "data/layouts/UnknownMap_08428450/layout.inc" - .include "data/layouts/VerdanturfTown_WandasHouse/layout.inc" - .include "data/layouts/PacifidlogTown_House1/layout.inc" - .include "data/layouts/PacifidlogTown_House2/layout.inc" - .include "data/layouts/PetalburgCity_Gym/layout.inc" - .include "data/layouts/HouseWithBed/layout.inc" - .include "data/layouts/SlateportCity_SternsShipyard_1F/layout.inc" - .include "data/layouts/SlateportCity_SternsShipyard_2F/layout.inc" - .include "data/layouts/UnknownMap_084294C4/layout.inc" - .include "data/layouts/UnknownMap_084294E8/layout.inc" - .include "data/layouts/SlateportCity_PokemonFanClub/layout.inc" - .include "data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc" - .include "data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc" - .include "data/layouts/Harbor/layout.inc" - .include "data/layouts/MauvilleCity_Gym/layout.inc" - .include "data/layouts/MauvilleCity_BikeShop/layout.inc" - .include "data/layouts/MauvilleCity_GameCorner/layout.inc" - .include "data/layouts/RustboroCity_DevonCorp_1F/layout.inc" - .include "data/layouts/RustboroCity_DevonCorp_2F/layout.inc" - .include "data/layouts/RustboroCity_Gym/layout.inc" - .include "data/layouts/RustboroCity_PokemonSchool/layout.inc" - .include "data/layouts/RustboroCity_House/layout.inc" - .include "data/layouts/RustboroCity_House1/layout.inc" - .include "data/layouts/RustboroCity_CuttersHouse/layout.inc" - .include "data/layouts/FortreeCity_House1/layout.inc" - .include "data/layouts/FortreeCity_Gym/layout.inc" - .include "data/layouts/FortreeCity_House2/layout.inc" - .include "data/layouts/Route104_MrBrineysHouse/layout.inc" - .include "data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc" - .include "data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc" - .include "data/layouts/LilycoveCity_ContestLobby/layout.inc" - .include "data/layouts/LilycoveCity_ContestHall/layout.inc" - .include "data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc" - .include "data/layouts/MossdeepCity_Gym/layout.inc" - .include "data/layouts/SootopolisCity_Gym_1F/layout.inc" - .include "data/layouts/SootopolisCity_Gym_B1F/layout.inc" - .include "data/layouts/EverGrandeCity_SidneysRoom/layout.inc" - .include "data/layouts/EverGrandeCity_PhoebesRoom/layout.inc" - .include "data/layouts/EverGrandeCity_GlaciasRoom/layout.inc" - .include "data/layouts/EverGrandeCity_DrakesRoom/layout.inc" - .include "data/layouts/EverGrandeCity_ChampionsRoom/layout.inc" - .include "data/layouts/EverGrandeCity_ShortHall/layout.inc" - .include "data/layouts/Route104_PrettyPetalFlowerShop/layout.inc" - .include "data/layouts/CableCarStation/layout.inc" - .include "data/layouts/Route114_FossilManiacsHouse/layout.inc" - .include "data/layouts/Route114_FossilManiacsTunnel/layout.inc" - .include "data/layouts/Route114_LanettesHouse/layout.inc" - .include "data/layouts/Route116_TunnelersRestHouse/layout.inc" - .include "data/layouts/Route117_PokemonDayCare/layout.inc" - .include "data/layouts/Route121_SafariZoneEntrance/layout.inc" - .include "data/layouts/MeteorFalls_1F_1R/layout.inc" - .include "data/layouts/MeteorFalls_1F_2R/layout.inc" - .include "data/layouts/MeteorFalls_B1F_1R/layout.inc" - .include "data/layouts/MeteorFalls_B1F_2R/layout.inc" - .include "data/layouts/RusturfTunnel/layout.inc" - .include "data/layouts/Underwater_SootopolisCity/layout.inc" - .include "data/layouts/DesertRuins/layout.inc" - .include "data/layouts/GraniteCave_1F/layout.inc" - .include "data/layouts/GraniteCave_B1F/layout.inc" - .include "data/layouts/GraniteCave_B2F/layout.inc" - .include "data/layouts/PetalburgWoods/layout.inc" - .include "data/layouts/MtChimney/layout.inc" - .include "data/layouts/MtPyre_1F/layout.inc" - .include "data/layouts/MtPyre_2F/layout.inc" - .include "data/layouts/MtPyre_3F/layout.inc" - .include "data/layouts/MtPyre_4F/layout.inc" - .include "data/layouts/MtPyre_5F/layout.inc" - .include "data/layouts/MtPyre_6F/layout.inc" - .include "data/layouts/AquaHideout_1F/layout.inc" - .include "data/layouts/AquaHideout_B1F/layout.inc" - .include "data/layouts/AquaHideout_B2F/layout.inc" - .include "data/layouts/Underwater_SeafloorCavern/layout.inc" - .include "data/layouts/SeafloorCavern_Entrance/layout.inc" - .include "data/layouts/SeafloorCavern_Room1/layout.inc" - .include "data/layouts/SeafloorCavern_Room2/layout.inc" - .include "data/layouts/SeafloorCavern_Room3/layout.inc" - .include "data/layouts/SeafloorCavern_Room4/layout.inc" - .include "data/layouts/SeafloorCavern_Room5/layout.inc" - .include "data/layouts/SeafloorCavern_Room6/layout.inc" - .include "data/layouts/SeafloorCavern_Room7/layout.inc" - .include "data/layouts/SeafloorCavern_Room8/layout.inc" - .include "data/layouts/SeafloorCavern_Room9/layout.inc" - .include "data/layouts/CaveOfOrigin_Entrance/layout.inc" - .include "data/layouts/CaveOfOrigin_1F/layout.inc" - .include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc" - .include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc" - .include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc" - .include "data/layouts/CaveOfOrigin_B1F/layout.inc" - .include "data/layouts/VictoryRoad_1F/layout.inc" - .include "data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc" - .include "data/layouts/ShoalCave_LowTideInnerRoom/layout.inc" - .include "data/layouts/ShoalCave_LowTideStairsRoom/layout.inc" - .include "data/layouts/ShoalCave_LowTideLowerRoom/layout.inc" - .include "data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc" - .include "data/layouts/ShoalCave_HighTideInnerRoom/layout.inc" - .include "data/layouts/UnknownMap_0843E6C0/layout.inc" - .include "data/layouts/UnknownMap_0843E6E4/layout.inc" - .include "data/layouts/UnknownMap_0843E708/layout.inc" - .include "data/layouts/UnknownMap_0843E72C/layout.inc" - .include "data/layouts/UnknownMap_0843E750/layout.inc" - .include "data/layouts/UnknownMap_0843E774/layout.inc" - .include "data/layouts/UnknownMap_0843E798/layout.inc" - .include "data/layouts/UnknownMap_0843E7BC/layout.inc" - .include "data/layouts/UnknownMap_0843E7E0/layout.inc" - .include "data/layouts/UnknownMap_0843E804/layout.inc" - .include "data/layouts/UnknownMap_0843E828/layout.inc" - .include "data/layouts/UnknownMap_0843E84C/layout.inc" - .include "data/layouts/UnknownMap_0843E870/layout.inc" - .include "data/layouts/UnknownMap_0843E894/layout.inc" - .include "data/layouts/NewMauville_Entrance/layout.inc" - .include "data/layouts/NewMauville_Inside/layout.inc" - .include "data/layouts/AbandonedShip_Deck/layout.inc" - .include "data/layouts/AbandonedShip_Corridors_1F/layout.inc" - .include "data/layouts/AbandonedShip_Rooms_1F/layout.inc" - .include "data/layouts/AbandonedShip_Corridors_B1F/layout.inc" - .include "data/layouts/AbandonedShip_Rooms_B1F/layout.inc" - .include "data/layouts/AbandonedShip_Rooms2_B1F/layout.inc" - .include "data/layouts/AbandonedShip_Underwater1/layout.inc" - .include "data/layouts/AbandonedShip_Room_B1F/layout.inc" - .include "data/layouts/AbandonedShip_Rooms2_1F/layout.inc" - .include "data/layouts/AbandonedShip_CaptainsOffice/layout.inc" - .include "data/layouts/AbandonedShip_Underwater2/layout.inc" - .include "data/layouts/SecretBase_RedCave1/layout.inc" - .include "data/layouts/SecretBase_BrownCave1/layout.inc" - .include "data/layouts/SecretBase_BlueCave1/layout.inc" - .include "data/layouts/SecretBase_YellowCave1/layout.inc" - .include "data/layouts/SecretBase_Tree1/layout.inc" - .include "data/layouts/SecretBase_Shrub1/layout.inc" - .include "data/layouts/SecretBase_RedCave2/layout.inc" - .include "data/layouts/SecretBase_BrownCave2/layout.inc" - .include "data/layouts/SecretBase_BlueCave2/layout.inc" - .include "data/layouts/SecretBase_YellowCave2/layout.inc" - .include "data/layouts/SecretBase_Tree2/layout.inc" - .include "data/layouts/SecretBase_Shrub2/layout.inc" - .include "data/layouts/SecretBase_RedCave3/layout.inc" - .include "data/layouts/SecretBase_BrownCave3/layout.inc" - .include "data/layouts/SecretBase_BlueCave3/layout.inc" - .include "data/layouts/SecretBase_YellowCave3/layout.inc" - .include "data/layouts/SecretBase_Tree3/layout.inc" - .include "data/layouts/SecretBase_Shrub3/layout.inc" - .include "data/layouts/SecretBase_RedCave4/layout.inc" - .include "data/layouts/SecretBase_BrownCave4/layout.inc" - .include "data/layouts/SecretBase_BlueCave4/layout.inc" - .include "data/layouts/SecretBase_YellowCave4/layout.inc" - .include "data/layouts/SecretBase_Tree4/layout.inc" - .include "data/layouts/SecretBase_Shrub4/layout.inc" - .include "data/layouts/SingleBattleColosseum/layout.inc" - .include "data/layouts/TradeCenter/layout.inc" - .include "data/layouts/RecordCorner/layout.inc" - .include "data/layouts/DoubleBattleColosseum/layout.inc" - .include "data/layouts/LinkContestRoom1/layout.inc" - .include "data/layouts/UnknownMap_25_29/layout.inc" - .include "data/layouts/UnknownMap_25_30/layout.inc" - .include "data/layouts/UnknownMap_25_31/layout.inc" - .include "data/layouts/UnknownMap_25_32/layout.inc" - .include "data/layouts/UnknownMap_25_33/layout.inc" - .include "data/layouts/UnknownMap_25_34/layout.inc" - .include "data/layouts/LinkContestRoom2/layout.inc" - .include "data/layouts/LinkContestRoom3/layout.inc" - .include "data/layouts/LinkContestRoom4/layout.inc" - .include "data/layouts/LinkContestRoom5/layout.inc" - .include "data/layouts/LinkContestRoom6/layout.inc" - .include "data/layouts/InsideOfTruck/layout.inc" - .include "data/layouts/SafariZone_Northwest/layout.inc" - .include "data/layouts/SafariZone_North/layout.inc" - .include "data/layouts/SafariZone_Southwest/layout.inc" - .include "data/layouts/SafariZone_South/layout.inc" - .include "data/layouts/UnknownMap_08447028/layout.inc" - .include "data/layouts/Route109_SeashoreHouse/layout.inc" - .include "data/layouts/Route110_TrickHouseEntrance/layout.inc" - .include "data/layouts/Route110_TrickHouseEnd/layout.inc" - .include "data/layouts/Route110_TrickHouseCorridor/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle1/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle2/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle3/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle4/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle5/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle6/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle7/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle8/layout.inc" - .include "data/layouts/FortreeCity_DecorationShop/layout.inc" - .include "data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc" - .include "data/layouts/Route130/layout.inc" - .include "data/layouts/BattleFrontier_BattleTowerLobby/layout.inc" - .include "data/layouts/BattleFrontier_OutsideWest/layout.inc" - .include "data/layouts/BattleElevator/layout.inc" - .include "data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc" - .include "data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc" - .include "data/layouts/RustboroCity_DevonCorp_3F/layout.inc" - .include "data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc" - .include "data/layouts/Route119_WeatherInstitute_1F/layout.inc" - .include "data/layouts/Route119_WeatherInstitute_2F/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc" - .include "data/layouts/Underwater1/layout.inc" - .include "data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc" - .include "data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc" - .include "data/layouts/SSTidalCorridor/layout.inc" - .include "data/layouts/SSTidalLowerDeck/layout.inc" - .include "data/layouts/SSTidalRooms/layout.inc" - .include "data/layouts/IslandCave/layout.inc" - .include "data/layouts/AncientTomb/layout.inc" - .include "data/layouts/Underwater_Route134/layout.inc" - .include "data/layouts/Underwater_SealedChamber/layout.inc" - .include "data/layouts/SealedChamber_OuterRoom/layout.inc" - .include "data/layouts/VictoryRoad_B1F/layout.inc" - .include "data/layouts/VictoryRoad_B2F/layout.inc" - .include "data/layouts/Route104_Prototype/layout.inc" - .include "data/layouts/GraniteCave_StevensRoom/layout.inc" - .include "data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc" - .include "data/layouts/SouthernIsland_Exterior/layout.inc" - .include "data/layouts/SouthernIsland_Interior/layout.inc" - .include "data/layouts/JaggedPass/layout.inc" - .include "data/layouts/FieryPath/layout.inc" - .include "data/layouts/RustboroCity_Flat2_1F/layout.inc" - .include "data/layouts/RustboroCity_Flat2_2F/layout.inc" - .include "data/layouts/RustboroCity_Flat2_3F/layout.inc" - .include "data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc" - .include "data/layouts/EverGrandeCity_HallOfFame/layout.inc" - .include "data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc" - .include "data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc" - .include "data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc" - .include "data/layouts/MtPyre_Exterior/layout.inc" - .include "data/layouts/MtPyre_Summit/layout.inc" - .include "data/layouts/SealedChamber_InnerRoom/layout.inc" - .include "data/layouts/MossdeepCity_GameCorner_1F/layout.inc" - .include "data/layouts/MossdeepCity_GameCorner_B1F/layout.inc" - .include "data/layouts/SootopolisCity_House1/layout.inc" - .include "data/layouts/SootopolisCity_House2/layout.inc" - .include "data/layouts/SootopolisCity_House3/layout.inc" - .include "data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc" - .include "data/layouts/ScorchedSlab/layout.inc" - .include "data/layouts/UnknownMap_0845A394/layout.inc" - .include "data/layouts/RustboroCity_Flat1_1F/layout.inc" - .include "data/layouts/RustboroCity_Flat1_2F/layout.inc" - .include "data/layouts/EverGrandeCity_Hall4/layout.inc" - .include "data/layouts/AquaHideout_UnusedRubyMap1/layout.inc" - .include "data/layouts/AquaHideout_UnusedRubyMap2/layout.inc" - .include "data/layouts/AquaHideout_UnusedRubyMap3/layout.inc" - .include "data/layouts/UnknownMap_0845D470/layout.inc" - .include "data/layouts/SkyPillar_Entrance/layout.inc" - .include "data/layouts/SkyPillar_Outside/layout.inc" - .include "data/layouts/SkyPillar_1F/layout.inc" - .include "data/layouts/SkyPillar_2F/layout.inc" - .include "data/layouts/SkyPillar_3F/layout.inc" - .include "data/layouts/SkyPillar_4F/layout.inc" - .include "data/layouts/UnknownMap_0845ECB4/layout.inc" - .include "data/layouts/MossdeepCity_StevensHouse/layout.inc" - .include "data/layouts/ShoalCave_LowTideIceRoom/layout.inc" - .include "data/layouts/SafariZone_RestHouse/layout.inc" - .include "data/layouts/SkyPillar_5F/layout.inc" - .include "data/layouts/SkyPillar_Top/layout.inc" - .include "data/layouts/BattleFrontier_BattleDomeLobby/layout.inc" - .include "data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc" - .include "data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc" - .include "data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc" - .include "data/layouts/MagmaHideout_1F/layout.inc" - .include "data/layouts/MagmaHideout_2F_1R/layout.inc" - .include "data/layouts/MagmaHideout_2F_2R/layout.inc" - .include "data/layouts/MagmaHideout_3F_1R/layout.inc" - .include "data/layouts/MagmaHideout_3F_2R/layout.inc" - .include "data/layouts/MagmaHideout_4F/layout.inc" - .include "data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc" - .include "data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc" - .include "data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc" - .include "data/layouts/BattleFrontier_OutsideEast/layout.inc" - .include "data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc" - .include "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc" - .include "data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc" - .include "data/layouts/BattleFrontier_BattlePikeLobby/layout.inc" - .include "data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc" - .include "data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc" - .include "data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc" - .include "data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc" - .include "data/layouts/BattleFrontier_BattleArenaLobby/layout.inc" - .include "data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc" - .include "data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc" - .include "data/layouts/UnknownMap_08469200/layout.inc" - .include "data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc" - .include "data/layouts/UnknownMap_084693AC/layout.inc" - .include "data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc" - .include "data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc" - .include "data/layouts/BattlePyramidSquare01/layout.inc" - .include "data/layouts/BattlePyramidSquare02/layout.inc" - .include "data/layouts/BattlePyramidSquare03/layout.inc" - .include "data/layouts/BattlePyramidSquare04/layout.inc" - .include "data/layouts/BattlePyramidSquare05/layout.inc" - .include "data/layouts/BattlePyramidSquare06/layout.inc" - .include "data/layouts/BattlePyramidSquare07/layout.inc" - .include "data/layouts/BattlePyramidSquare08/layout.inc" - .include "data/layouts/BattlePyramidSquare09/layout.inc" - .include "data/layouts/BattlePyramidSquare10/layout.inc" - .include "data/layouts/BattlePyramidSquare11/layout.inc" - .include "data/layouts/BattlePyramidSquare12/layout.inc" - .include "data/layouts/BattlePyramidSquare13/layout.inc" - .include "data/layouts/BattlePyramidSquare14/layout.inc" - .include "data/layouts/BattlePyramidSquare15/layout.inc" - .include "data/layouts/BattlePyramidSquare16/layout.inc" - .include "data/layouts/BattleFrontier_BattlePyramidTop/layout.inc" - .include "data/layouts/MagmaHideout_3F_3R/layout.inc" - .include "data/layouts/MagmaHideout_2F_3R/layout.inc" - .include "data/layouts/MirageTower_1F/layout.inc" - .include "data/layouts/MirageTower_2F/layout.inc" - .include "data/layouts/MirageTower_3F/layout.inc" - .include "data/layouts/BattleTentLobby/layout.inc" - .include "data/layouts/BattleTentCorridor/layout.inc" - .include "data/layouts/BattleTentBattleRoom/layout.inc" - .include "data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc" - .include "data/layouts/MirageTower_4F/layout.inc" - .include "data/layouts/DesertUnderpass/layout.inc" - .include "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc" - .include "data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc" - .include "data/layouts/Route111_NoMirageTower/layout.inc" - .include "data/layouts/UnionRoom/layout.inc" - .include "data/layouts/SafariZone_Northeast/layout.inc" - .include "data/layouts/SafariZone_Southeast/layout.inc" - .include "data/layouts/BattleFrontier_RankingHall/layout.inc" - .include "data/layouts/BattleFrontier_Lounge1/layout.inc" - .include "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc" - .include "data/layouts/BattleFrontier_ReceptionGate/layout.inc" - .include "data/layouts/ArtisanCave_B1F/layout.inc" - .include "data/layouts/ArtisanCave_1F/layout.inc" - .include "data/layouts/FarawayIsland_Entrance/layout.inc" - .include "data/layouts/FarawayIsland_Interior/layout.inc" - .include "data/layouts/BirthIsland_Exterior/layout.inc" - .include "data/layouts/IslandHarbor/layout.inc" - .include "data/layouts/Underwater_MarineCave/layout.inc" - .include "data/layouts/MarineCave_Entrance/layout.inc" - .include "data/layouts/TerraCave_Entrance/layout.inc" - .include "data/layouts/TerraCave_End/layout.inc" - .include "data/layouts/Underwater6/layout.inc" - .include "data/layouts/Underwater7/layout.inc" - .include "data/layouts/Underwater5/layout.inc" - .include "data/layouts/MarineCave_End/layout.inc" - .include "data/layouts/TrainerHill_Entrance/layout.inc" - .include "data/layouts/TrainerHill_1F/layout.inc" - .include "data/layouts/TrainerHill_2F/layout.inc" - .include "data/layouts/TrainerHill_3F/layout.inc" - .include "data/layouts/TrainerHill_4F/layout.inc" - .include "data/layouts/TrainerHill_Roof/layout.inc" - .include "data/layouts/AlteringCave/layout.inc" - .include "data/layouts/NavelRock_Exterior/layout.inc" - .include "data/layouts/NavelRock_Entrance/layout.inc" - .include "data/layouts/NavelRock_Top/layout.inc" - .include "data/layouts/NavelRock_Bottom/layout.inc" - .include "data/layouts/NavelRock_LadderRoom1/layout.inc" - .include "data/layouts/NavelRock_LadderRoom2/layout.inc" - .include "data/layouts/NavelRock_B1F/layout.inc" - .include "data/layouts/NavelRock_Fork/layout.inc" - .include "data/layouts/BattleFrontier_Lounge2/layout.inc" - .include "data/layouts/BattleFrontier_ScottsHouse/layout.inc" - .include "data/layouts/MeteorFalls_StevensCave/layout.inc" - .include "data/layouts/UnknownMap_08480DAC/layout.inc" - .include "data/layouts/UnknownMap_08480F54/layout.inc" - .include "data/layouts/UnknownMap_084810FC/layout.inc" - .include "data/layouts/UnknownMap_084812A4/layout.inc" - .include "data/layouts/UnknownMap_0848144C/layout.inc" - .include "data/layouts/UnknownMap_084815F4/layout.inc" - .include "data/layouts/UnknownMap_08481B24/layout.inc" - .include "data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc" - .include "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc" - .include "data/layouts/UnknownMap_08481DBC/layout.inc" diff --git a/data/layouts/.gitignore b/data/layouts/.gitignore new file mode 100755 index 0000000000..eaa83a6f18 --- /dev/null +++ b/data/layouts/.gitignore @@ -0,0 +1,2 @@ +layouts.inc +layouts_table.inc diff --git a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc deleted file mode 100644 index d9e122ef20..0000000000 --- a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_CaptainsOffice_MapBorder:: - .incbin "data/layouts/AbandonedShip_CaptainsOffice/border.bin" - -AbandonedShip_CaptainsOffice_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_CaptainsOffice/map.bin" - - .align 2 -AbandonedShip_CaptainsOffice_Layout:: - .4byte 0x9 - .4byte 0x7 - .4byte AbandonedShip_CaptainsOffice_MapBorder - .4byte AbandonedShip_CaptainsOffice_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/AbandonedShip_Corridors_1F/layout.inc b/data/layouts/AbandonedShip_Corridors_1F/layout.inc deleted file mode 100644 index d5fd225782..0000000000 --- a/data/layouts/AbandonedShip_Corridors_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Corridors_1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Corridors_1F/border.bin" - -AbandonedShip_Corridors_1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Corridors_1F/map.bin" - - .align 2 -AbandonedShip_Corridors_1F_Layout:: - .4byte 0x12 - .4byte 0xc - .4byte AbandonedShip_Corridors_1F_MapBorder - .4byte AbandonedShip_Corridors_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_Corridors_B1F/layout.inc b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc deleted file mode 100644 index 7299aa6f89..0000000000 --- a/data/layouts/AbandonedShip_Corridors_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Corridors_B1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Corridors_B1F/border.bin" - -AbandonedShip_Corridors_B1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Corridors_B1F/map.bin" - - .align 2 -AbandonedShip_Corridors_B1F_Layout:: - .4byte 0xd - .4byte 0xa - .4byte AbandonedShip_Corridors_B1F_MapBorder - .4byte AbandonedShip_Corridors_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_Deck/layout.inc b/data/layouts/AbandonedShip_Deck/layout.inc deleted file mode 100644 index 7f0baaaec2..0000000000 --- a/data/layouts/AbandonedShip_Deck/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Deck_MapBorder:: - .incbin "data/layouts/AbandonedShip_Deck/border.bin" - -AbandonedShip_Deck_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Deck/map.bin" - - .align 2 -AbandonedShip_Deck_Layout:: - .4byte 0x17 - .4byte 0x15 - .4byte AbandonedShip_Deck_MapBorder - .4byte AbandonedShip_Deck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc deleted file mode 100644 index 0ee7aa7556..0000000000 --- a/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_HiddenFloorCorridors_MapBorder:: - .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin" - -AbandonedShip_HiddenFloorCorridors_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin" - - .align 2 -AbandonedShip_HiddenFloorCorridors_Layout:: - .4byte 0xd - .4byte 0xb - .4byte AbandonedShip_HiddenFloorCorridors_MapBorder - .4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc deleted file mode 100644 index bf2f758d7a..0000000000 --- a/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_HiddenFloorRooms_MapBorder:: - .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin" - -AbandonedShip_HiddenFloorRooms_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin" - - .align 2 -AbandonedShip_HiddenFloorRooms_Layout:: - .4byte 0x2c - .4byte 0xf - .4byte AbandonedShip_HiddenFloorRooms_MapBorder - .4byte AbandonedShip_HiddenFloorRooms_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_Room_B1F/layout.inc b/data/layouts/AbandonedShip_Room_B1F/layout.inc deleted file mode 100644 index fdd5b395d4..0000000000 --- a/data/layouts/AbandonedShip_Room_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Room_B1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Room_B1F/border.bin" - -AbandonedShip_Room_B1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Room_B1F/map.bin" - - .align 2 -AbandonedShip_Room_B1F_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte AbandonedShip_Room_B1F_MapBorder - .4byte AbandonedShip_Room_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc deleted file mode 100644 index d15652cc07..0000000000 --- a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms2_1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Rooms2_1F/border.bin" - -AbandonedShip_Rooms2_1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Rooms2_1F/map.bin" - - .align 2 -AbandonedShip_Rooms2_1F_Layout:: - .4byte 0x9 - .4byte 0x11 - .4byte AbandonedShip_Rooms2_1F_MapBorder - .4byte AbandonedShip_Rooms2_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc deleted file mode 100644 index d99e43f473..0000000000 --- a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms2_B1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Rooms2_B1F/border.bin" - -AbandonedShip_Rooms2_B1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Rooms2_B1F/map.bin" - - .align 2 -AbandonedShip_Rooms2_B1F_Layout:: - .4byte 0x12 - .4byte 0x8 - .4byte AbandonedShip_Rooms2_B1F_MapBorder - .4byte AbandonedShip_Rooms2_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_Rooms_1F/layout.inc b/data/layouts/AbandonedShip_Rooms_1F/layout.inc deleted file mode 100644 index 63e4a716a3..0000000000 --- a/data/layouts/AbandonedShip_Rooms_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms_1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Rooms_1F/border.bin" - -AbandonedShip_Rooms_1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Rooms_1F/map.bin" - - .align 2 -AbandonedShip_Rooms_1F_Layout:: - .4byte 0x12 - .4byte 0x11 - .4byte AbandonedShip_Rooms_1F_MapBorder - .4byte AbandonedShip_Rooms_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc deleted file mode 100644 index ab688d668a..0000000000 --- a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms_B1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Rooms_B1F/border.bin" - -AbandonedShip_Rooms_B1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Rooms_B1F/map.bin" - - .align 2 -AbandonedShip_Rooms_B1F_Layout:: - .4byte 0x1b - .4byte 0x8 - .4byte AbandonedShip_Rooms_B1F_MapBorder - .4byte AbandonedShip_Rooms_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_Underwater1/layout.inc b/data/layouts/AbandonedShip_Underwater1/layout.inc deleted file mode 100644 index 8fa1b14859..0000000000 --- a/data/layouts/AbandonedShip_Underwater1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Underwater1_MapBorder:: - .incbin "data/layouts/AbandonedShip_Underwater1/border.bin" - -AbandonedShip_Underwater1_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Underwater1/map.bin" - - .align 2 -AbandonedShip_Underwater1_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte AbandonedShip_Underwater1_MapBorder - .4byte AbandonedShip_Underwater1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_Underwater2/layout.inc b/data/layouts/AbandonedShip_Underwater2/layout.inc deleted file mode 100644 index feea82d163..0000000000 --- a/data/layouts/AbandonedShip_Underwater2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Underwater2_MapBorder:: - .incbin "data/layouts/AbandonedShip_Underwater2/border.bin" - -AbandonedShip_Underwater2_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Underwater2/map.bin" - - .align 2 -AbandonedShip_Underwater2_Layout:: - .4byte 0x15 - .4byte 0x7 - .4byte AbandonedShip_Underwater2_MapBorder - .4byte AbandonedShip_Underwater2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AlteringCave/layout.inc b/data/layouts/AlteringCave/layout.inc deleted file mode 100644 index 9f03e7d871..0000000000 --- a/data/layouts/AlteringCave/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AlteringCave_MapBorder:: - .incbin "data/layouts/AlteringCave/border.bin" - -AlteringCave_MapBlockdata:: - .incbin "data/layouts/AlteringCave/map.bin" - - .align 2 -AlteringCave_Layout:: - .4byte 0x20 - .4byte 0x18 - .4byte AlteringCave_MapBorder - .4byte AlteringCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/AncientTomb/layout.inc b/data/layouts/AncientTomb/layout.inc deleted file mode 100644 index ad173f9360..0000000000 --- a/data/layouts/AncientTomb/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AncientTomb_MapBorder:: - .incbin "data/layouts/AncientTomb/border.bin" - -AncientTomb_MapBlockdata:: - .incbin "data/layouts/AncientTomb/map.bin" - - .align 2 -AncientTomb_Layout:: - .4byte 0x11 - .4byte 0x21 - .4byte AncientTomb_MapBorder - .4byte AncientTomb_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/AquaHideout_1F/layout.inc b/data/layouts/AquaHideout_1F/layout.inc deleted file mode 100644 index 5508a668b4..0000000000 --- a/data/layouts/AquaHideout_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_1F_MapBorder:: - .incbin "data/layouts/AquaHideout_1F/border.bin" - -AquaHideout_1F_MapBlockdata:: - .incbin "data/layouts/AquaHideout_1F/map.bin" - - .align 2 -AquaHideout_1F_Layout:: - .4byte 0x1c - .4byte 0x1e - .4byte AquaHideout_1F_MapBorder - .4byte AquaHideout_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/AquaHideout_B1F/layout.inc b/data/layouts/AquaHideout_B1F/layout.inc deleted file mode 100644 index 0889e548a8..0000000000 --- a/data/layouts/AquaHideout_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_B1F_MapBorder:: - .incbin "data/layouts/AquaHideout_B1F/border.bin" - -AquaHideout_B1F_MapBlockdata:: - .incbin "data/layouts/AquaHideout_B1F/map.bin" - - .align 2 -AquaHideout_B1F_Layout:: - .4byte 0x33 - .4byte 0x18 - .4byte AquaHideout_B1F_MapBorder - .4byte AquaHideout_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/AquaHideout_B2F/layout.inc b/data/layouts/AquaHideout_B2F/layout.inc deleted file mode 100644 index 9e335e5d92..0000000000 --- a/data/layouts/AquaHideout_B2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_B2F_MapBorder:: - .incbin "data/layouts/AquaHideout_B2F/border.bin" - -AquaHideout_B2F_MapBlockdata:: - .incbin "data/layouts/AquaHideout_B2F/map.bin" - - .align 2 -AquaHideout_B2F_Layout:: - .4byte 0x22 - .4byte 0x18 - .4byte AquaHideout_B2F_MapBorder - .4byte AquaHideout_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc deleted file mode 100644 index 05862b275b..0000000000 --- a/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_UnusedRubyMap1_MapBorder:: - .incbin "data/layouts/AquaHideout_UnusedRubyMap1/border.bin" - -AquaHideout_UnusedRubyMap1_MapBlockdata:: - .incbin "data/layouts/AquaHideout_UnusedRubyMap1/map.bin" - - .align 2 -AquaHideout_UnusedRubyMap1_Layout:: - .4byte 0x1c - .4byte 0x1e - .4byte AquaHideout_UnusedRubyMap1_MapBorder - .4byte AquaHideout_UnusedRubyMap1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc deleted file mode 100644 index e9e08ab97f..0000000000 --- a/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_UnusedRubyMap2_MapBorder:: - .incbin "data/layouts/AquaHideout_UnusedRubyMap2/border.bin" - -AquaHideout_UnusedRubyMap2_MapBlockdata:: - .incbin "data/layouts/AquaHideout_UnusedRubyMap2/map.bin" - - .align 2 -AquaHideout_UnusedRubyMap2_Layout:: - .4byte 0x3e - .4byte 0x18 - .4byte AquaHideout_UnusedRubyMap2_MapBorder - .4byte AquaHideout_UnusedRubyMap2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc deleted file mode 100644 index 44b35666f0..0000000000 --- a/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_UnusedRubyMap3_MapBorder:: - .incbin "data/layouts/AquaHideout_UnusedRubyMap3/border.bin" - -AquaHideout_UnusedRubyMap3_MapBlockdata:: - .incbin "data/layouts/AquaHideout_UnusedRubyMap3/map.bin" - - .align 2 -AquaHideout_UnusedRubyMap3_Layout:: - .4byte 0x22 - .4byte 0x18 - .4byte AquaHideout_UnusedRubyMap3_MapBorder - .4byte AquaHideout_UnusedRubyMap3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/ArtisanCave_1F/layout.inc b/data/layouts/ArtisanCave_1F/layout.inc deleted file mode 100644 index b32eef4221..0000000000 --- a/data/layouts/ArtisanCave_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ArtisanCave_1F_MapBorder:: - .incbin "data/layouts/ArtisanCave_1F/border.bin" - -ArtisanCave_1F_MapBlockdata:: - .incbin "data/layouts/ArtisanCave_1F/map.bin" - - .align 2 -ArtisanCave_1F_Layout:: - .4byte 0x15 - .4byte 0x16 - .4byte ArtisanCave_1F_MapBorder - .4byte ArtisanCave_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/ArtisanCave_B1F/layout.inc b/data/layouts/ArtisanCave_B1F/layout.inc deleted file mode 100644 index 2640303e34..0000000000 --- a/data/layouts/ArtisanCave_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ArtisanCave_B1F_MapBorder:: - .incbin "data/layouts/ArtisanCave_B1F/border.bin" - -ArtisanCave_B1F_MapBlockdata:: - .incbin "data/layouts/ArtisanCave_B1F/map.bin" - - .align 2 -ArtisanCave_B1F_Layout:: - .4byte 0x2e - .4byte 0x36 - .4byte ArtisanCave_B1F_MapBorder - .4byte ArtisanCave_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/BattleElevator/layout.inc b/data/layouts/BattleElevator/layout.inc deleted file mode 100644 index 374af9ffad..0000000000 --- a/data/layouts/BattleElevator/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleElevator_MapBorder:: - .incbin "data/layouts/BattleElevator/border.bin" - -BattleElevator_MapBlockdata:: - .incbin "data/layouts/BattleElevator/map.bin" - - .align 2 -BattleElevator_Layout:: - .4byte 0x5 - .4byte 0x7 - .4byte BattleElevator_MapBorder - .4byte BattleElevator_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc deleted file mode 100644 index 89f799d84f..0000000000 --- a/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleArenaBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin" - -BattleFrontier_BattleArenaBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleArenaBattleRoom_Layout:: - .4byte 0x10 - .4byte 0xb - .4byte BattleFrontier_BattleArenaBattleRoom_MapBorder - .4byte BattleFrontier_BattleArenaBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleArena - diff --git a/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc b/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc deleted file mode 100644 index 8961ed7785..0000000000 --- a/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleArenaCorridor_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleArenaCorridor/border.bin" - -BattleFrontier_BattleArenaCorridor_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleArenaCorridor/map.bin" - - .align 2 -BattleFrontier_BattleArenaCorridor_Layout:: - .4byte 0x12 - .4byte 0xe - .4byte BattleFrontier_BattleArenaCorridor_MapBorder - .4byte BattleFrontier_BattleArenaCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleArena - diff --git a/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc b/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc deleted file mode 100644 index 305fcc0d97..0000000000 --- a/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleArenaLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleArenaLobby/border.bin" - -BattleFrontier_BattleArenaLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleArenaLobby/map.bin" - - .align 2 -BattleFrontier_BattleArenaLobby_Layout:: - .4byte 0x10 - .4byte 0xd - .4byte BattleFrontier_BattleArenaLobby_MapBorder - .4byte BattleFrontier_BattleArenaLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleArena - diff --git a/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc deleted file mode 100644 index a4991ae0c0..0000000000 --- a/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomeBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin" - -BattleFrontier_BattleDomeBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleDomeBattleRoom_Layout:: - .4byte 0x14 - .4byte 0xa - .4byte BattleFrontier_BattleDomeBattleRoom_MapBorder - .4byte BattleFrontier_BattleDomeBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleDome - diff --git a/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc b/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc deleted file mode 100644 index 7f3c93b827..0000000000 --- a/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomeCorridor_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleDomeCorridor/border.bin" - -BattleFrontier_BattleDomeCorridor_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleDomeCorridor/map.bin" - - .align 2 -BattleFrontier_BattleDomeCorridor_Layout:: - .4byte 0x30 - .4byte 0x7 - .4byte BattleFrontier_BattleDomeCorridor_MapBorder - .4byte BattleFrontier_BattleDomeCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleDome - diff --git a/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc b/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc deleted file mode 100644 index 2553e70987..0000000000 --- a/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomeLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleDomeLobby/border.bin" - -BattleFrontier_BattleDomeLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleDomeLobby/map.bin" - - .align 2 -BattleFrontier_BattleDomeLobby_Layout:: - .4byte 0x17 - .4byte 0x11 - .4byte BattleFrontier_BattleDomeLobby_MapBorder - .4byte BattleFrontier_BattleDomeLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleDome - diff --git a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc deleted file mode 100644 index 8c0fe2ce5c..0000000000 --- a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomePreBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin" - -BattleFrontier_BattleDomePreBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleDomePreBattleRoom_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte BattleFrontier_BattleDomePreBattleRoom_MapBorder - .4byte BattleFrontier_BattleDomePreBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleDome - diff --git a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc deleted file mode 100644 index 21ba6a0156..0000000000 --- a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleFactoryBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin" - -BattleFrontier_BattleFactoryBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleFactoryBattleRoom_Layout:: - .4byte 0xd - .4byte 0xc - .4byte BattleFrontier_BattleFactoryBattleRoom_MapBorder - .4byte BattleFrontier_BattleFactoryBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFactory - diff --git a/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc b/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc deleted file mode 100644 index cc0a336110..0000000000 --- a/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleFactoryLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleFactoryLobby/border.bin" - -BattleFrontier_BattleFactoryLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleFactoryLobby/map.bin" - - .align 2 -BattleFrontier_BattleFactoryLobby_Layout:: - .4byte 0x13 - .4byte 0xc - .4byte BattleFrontier_BattleFactoryLobby_MapBorder - .4byte BattleFrontier_BattleFactoryLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFactory - diff --git a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc deleted file mode 100644 index fc4fc49bcc..0000000000 --- a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleFactoryPreBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin" - -BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleFactoryPreBattleRoom_Layout:: - .4byte 0x11 - .4byte 0xe - .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBorder - .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFactory - diff --git a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc deleted file mode 100644 index 3d9acc3c49..0000000000 --- a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePalaceBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin" - -BattleFrontier_BattlePalaceBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattlePalaceBattleRoom_Layout:: - .4byte 0xf - .4byte 0xa - .4byte BattleFrontier_BattlePalaceBattleRoom_MapBorder - .4byte BattleFrontier_BattlePalaceBattleRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattlePalace - diff --git a/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc deleted file mode 100644 index 2d16216c52..0000000000 --- a/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePalaceCorridor_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin" - -BattleFrontier_BattlePalaceCorridor_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin" - - .align 2 -BattleFrontier_BattlePalaceCorridor_Layout:: - .4byte 0x11 - .4byte 0xe - .4byte BattleFrontier_BattlePalaceCorridor_MapBorder - .4byte BattleFrontier_BattlePalaceCorridor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattlePalace - diff --git a/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc b/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc deleted file mode 100644 index f9a1dad7b5..0000000000 --- a/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePalaceLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePalaceLobby/border.bin" - -BattleFrontier_BattlePalaceLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePalaceLobby/map.bin" - - .align 2 -BattleFrontier_BattlePalaceLobby_Layout:: - .4byte 0x19 - .4byte 0xc - .4byte BattleFrontier_BattlePalaceLobby_MapBorder - .4byte BattleFrontier_BattlePalaceLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePalace - diff --git a/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc deleted file mode 100644 index 1d6d21778c..0000000000 --- a/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeCorridor_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePikeCorridor/border.bin" - -BattleFrontier_BattlePikeCorridor_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePikeCorridor/map.bin" - - .align 2 -BattleFrontier_BattlePikeCorridor_Layout:: - .4byte 0xe - .4byte 0x8 - .4byte BattleFrontier_BattlePikeCorridor_MapBorder - .4byte BattleFrontier_BattlePikeCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - diff --git a/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc b/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc deleted file mode 100644 index 3a5cd35380..0000000000 --- a/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePikeLobby/border.bin" - -BattleFrontier_BattlePikeLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePikeLobby/map.bin" - - .align 2 -BattleFrontier_BattlePikeLobby_Layout:: - .4byte 0xb - .4byte 0xd - .4byte BattleFrontier_BattlePikeLobby_MapBorder - .4byte BattleFrontier_BattlePikeLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc deleted file mode 100644 index 466ad0ff4e..0000000000 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom1_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin" - -BattleFrontier_BattlePikeRandomRoom1_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom1_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte BattleFrontier_BattlePikeRandomRoom1_MapBorder - .4byte BattleFrontier_BattlePikeRandomRoom1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc deleted file mode 100644 index 1c7fb35d45..0000000000 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom2_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin" - -BattleFrontier_BattlePikeRandomRoom2_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom2_Layout:: - .4byte 0x5 - .4byte 0x8 - .4byte BattleFrontier_BattlePikeRandomRoom2_MapBorder - .4byte BattleFrontier_BattlePikeRandomRoom2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc deleted file mode 100644 index ce17a0bf68..0000000000 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom3_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin" - -BattleFrontier_BattlePikeRandomRoom3_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom3_Layout:: - .4byte 0x9 - .4byte 0x14 - .4byte BattleFrontier_BattlePikeRandomRoom3_MapBorder - .4byte BattleFrontier_BattlePikeRandomRoom3_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - diff --git a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc deleted file mode 100644 index d7a082d13b..0000000000 --- a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeThreePathRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin" - -BattleFrontier_BattlePikeThreePathRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin" - - .align 2 -BattleFrontier_BattlePikeThreePathRoom_Layout:: - .4byte 0xd - .4byte 0xb - .4byte BattleFrontier_BattlePikeThreePathRoom_MapBorder - .4byte BattleFrontier_BattlePikeThreePathRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc deleted file mode 100644 index a65e7928b1..0000000000 --- a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePointExchangeServiceCorner_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin" - -BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin" - - .align 2 -BattleFrontier_BattlePointExchangeServiceCorner_Layout:: - .4byte 0xf - .4byte 0xb - .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBorder - .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc deleted file mode 100644 index a9e779ddbe..0000000000 --- a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidEmptySquare_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin" - -BattleFrontier_BattlePyramidEmptySquare_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin" - - .align 2 -BattleFrontier_BattlePyramidEmptySquare_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattleFrontier_BattlePyramidEmptySquare_MapBorder - .4byte BattleFrontier_BattlePyramidEmptySquare_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc b/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc deleted file mode 100644 index 28575776ac..0000000000 --- a/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePyramidLobby/border.bin" - -BattleFrontier_BattlePyramidLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin" - - .align 2 -BattleFrontier_BattlePyramidLobby_Layout:: - .4byte 0xf - .4byte 0x12 - .4byte BattleFrontier_BattlePyramidLobby_MapBorder - .4byte BattleFrontier_BattlePyramidLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc b/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc deleted file mode 100644 index 4657c37a36..0000000000 --- a/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidTop_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePyramidTop/border.bin" - -BattleFrontier_BattlePyramidTop_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePyramidTop/map.bin" - - .align 2 -BattleFrontier_BattlePyramidTop_Layout:: - .4byte 0x22 - .4byte 0x17 - .4byte BattleFrontier_BattlePyramidTop_MapBorder - .4byte BattleFrontier_BattlePyramidTop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc deleted file mode 100644 index 3d498239ae..0000000000 --- a/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin" - -BattleFrontier_BattleTowerBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleTowerBattleRoom_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte BattleFrontier_BattleTowerBattleRoom_MapBorder - .4byte BattleFrontier_BattleTowerBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc deleted file mode 100644 index 56335aa234..0000000000 --- a/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerCorridor_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleTowerCorridor/border.bin" - -BattleFrontier_BattleTowerCorridor_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleTowerCorridor/map.bin" - - .align 2 -BattleFrontier_BattleTowerCorridor_Layout:: - .4byte 0x11 - .4byte 0x5 - .4byte BattleFrontier_BattleTowerCorridor_MapBorder - .4byte BattleFrontier_BattleTowerCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc deleted file mode 100644 index 7dba3777cd..0000000000 --- a/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerCorridor2_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin" - -BattleFrontier_BattleTowerCorridor2_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin" - - .align 2 -BattleFrontier_BattleTowerCorridor2_Layout:: - .4byte 0x11 - .4byte 0x5 - .4byte BattleFrontier_BattleTowerCorridor2_MapBorder - .4byte BattleFrontier_BattleTowerCorridor2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc b/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc deleted file mode 100644 index 790ff3bcd7..0000000000 --- a/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleTowerLobby/border.bin" - -BattleFrontier_BattleTowerLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleTowerLobby/map.bin" - - .align 2 -BattleFrontier_BattleTowerLobby_Layout:: - .4byte 0x19 - .4byte 0xa - .4byte BattleFrontier_BattleTowerLobby_MapBorder - .4byte BattleFrontier_BattleTowerLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc deleted file mode 100644 index df5615873f..0000000000 --- a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerMultiBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin" - -BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleTowerMultiBattleRoom_Layout:: - .4byte 0x15 - .4byte 0xf - .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBorder - .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_Lounge1/layout.inc b/data/layouts/BattleFrontier_Lounge1/layout.inc deleted file mode 100644 index c25b3b2a0f..0000000000 --- a/data/layouts/BattleFrontier_Lounge1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge1_MapBorder:: - .incbin "data/layouts/BattleFrontier_Lounge1/border.bin" - -BattleFrontier_Lounge1_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_Lounge1/map.bin" - - .align 2 -BattleFrontier_Lounge1_Layout:: - .4byte 0xd - .4byte 0x8 - .4byte BattleFrontier_Lounge1_MapBorder - .4byte BattleFrontier_Lounge1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_Lounge2/layout.inc b/data/layouts/BattleFrontier_Lounge2/layout.inc deleted file mode 100644 index b735b4994e..0000000000 --- a/data/layouts/BattleFrontier_Lounge2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge2_MapBorder:: - .incbin "data/layouts/BattleFrontier_Lounge2/border.bin" - -BattleFrontier_Lounge2_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_Lounge2/map.bin" - - .align 2 -BattleFrontier_Lounge2_Layout:: - .4byte 0x9 - .4byte 0xa - .4byte BattleFrontier_Lounge2_MapBorder - .4byte BattleFrontier_Lounge2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_OutsideEast/layout.inc b/data/layouts/BattleFrontier_OutsideEast/layout.inc deleted file mode 100644 index ddaf204465..0000000000 --- a/data/layouts/BattleFrontier_OutsideEast/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_OutsideEast_MapBorder:: - .incbin "data/layouts/BattleFrontier_OutsideEast/border.bin" - -BattleFrontier_OutsideEast_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_OutsideEast/map.bin" - - .align 2 -BattleFrontier_OutsideEast_Layout:: - .4byte 0x48 - .4byte 0x48 - .4byte BattleFrontier_OutsideEast_MapBorder - .4byte BattleFrontier_OutsideEast_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattleFrontierOutsideEast - diff --git a/data/layouts/BattleFrontier_OutsideWest/layout.inc b/data/layouts/BattleFrontier_OutsideWest/layout.inc deleted file mode 100644 index a506e554fb..0000000000 --- a/data/layouts/BattleFrontier_OutsideWest/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_OutsideWest_MapBorder:: - .incbin "data/layouts/BattleFrontier_OutsideWest/border.bin" - -BattleFrontier_OutsideWest_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_OutsideWest/map.bin" - - .align 2 -BattleFrontier_OutsideWest_Layout:: - .4byte 0x38 - .4byte 0x48 - .4byte BattleFrontier_OutsideWest_MapBorder - .4byte BattleFrontier_OutsideWest_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattleFrontierOutsideWest - diff --git a/data/layouts/BattleFrontier_RankingHall/layout.inc b/data/layouts/BattleFrontier_RankingHall/layout.inc deleted file mode 100644 index d7615e693d..0000000000 --- a/data/layouts/BattleFrontier_RankingHall/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_RankingHall_MapBorder:: - .incbin "data/layouts/BattleFrontier_RankingHall/border.bin" - -BattleFrontier_RankingHall_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_RankingHall/map.bin" - - .align 2 -BattleFrontier_RankingHall_Layout:: - .4byte 0x35 - .4byte 0xf - .4byte BattleFrontier_RankingHall_MapBorder - .4byte BattleFrontier_RankingHall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontierRankingHall - diff --git a/data/layouts/BattleFrontier_ReceptionGate/layout.inc b/data/layouts/BattleFrontier_ReceptionGate/layout.inc deleted file mode 100644 index 3dd4aeaa53..0000000000 --- a/data/layouts/BattleFrontier_ReceptionGate/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_ReceptionGate_MapBorder:: - .incbin "data/layouts/BattleFrontier_ReceptionGate/border.bin" - -BattleFrontier_ReceptionGate_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_ReceptionGate/map.bin" - - .align 2 -BattleFrontier_ReceptionGate_Layout:: - .4byte 0x9 - .4byte 0xe - .4byte BattleFrontier_ReceptionGate_MapBorder - .4byte BattleFrontier_ReceptionGate_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_ScottsHouse/layout.inc b/data/layouts/BattleFrontier_ScottsHouse/layout.inc deleted file mode 100644 index f087371096..0000000000 --- a/data/layouts/BattleFrontier_ScottsHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_ScottsHouse_MapBorder:: - .incbin "data/layouts/BattleFrontier_ScottsHouse/border.bin" - -BattleFrontier_ScottsHouse_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_ScottsHouse/map.bin" - - .align 2 -BattleFrontier_ScottsHouse_Layout:: - .4byte 0x6 - .4byte 0x8 - .4byte BattleFrontier_ScottsHouse_MapBorder - .4byte BattleFrontier_ScottsHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattlePyramidSquare01/layout.inc b/data/layouts/BattlePyramidSquare01/layout.inc deleted file mode 100644 index fe710cc404..0000000000 --- a/data/layouts/BattlePyramidSquare01/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare01_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare01/border.bin" - -BattlePyramidSquare01_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare01/map.bin" - - .align 2 -BattlePyramidSquare01_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare01_MapBorder - .4byte BattlePyramidSquare01_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare02/layout.inc b/data/layouts/BattlePyramidSquare02/layout.inc deleted file mode 100644 index 6aa5b7aa98..0000000000 --- a/data/layouts/BattlePyramidSquare02/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare02_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare02/border.bin" - -BattlePyramidSquare02_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare02/map.bin" - - .align 2 -BattlePyramidSquare02_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare02_MapBorder - .4byte BattlePyramidSquare02_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare03/layout.inc b/data/layouts/BattlePyramidSquare03/layout.inc deleted file mode 100644 index 4da41f9e9b..0000000000 --- a/data/layouts/BattlePyramidSquare03/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare03_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare03/border.bin" - -BattlePyramidSquare03_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare03/map.bin" - - .align 2 -BattlePyramidSquare03_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare03_MapBorder - .4byte BattlePyramidSquare03_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare04/layout.inc b/data/layouts/BattlePyramidSquare04/layout.inc deleted file mode 100644 index c298ee6f4e..0000000000 --- a/data/layouts/BattlePyramidSquare04/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare04_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare04/border.bin" - -BattlePyramidSquare04_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare04/map.bin" - - .align 2 -BattlePyramidSquare04_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare04_MapBorder - .4byte BattlePyramidSquare04_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare05/layout.inc b/data/layouts/BattlePyramidSquare05/layout.inc deleted file mode 100644 index 87ce532740..0000000000 --- a/data/layouts/BattlePyramidSquare05/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare05_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare05/border.bin" - -BattlePyramidSquare05_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare05/map.bin" - - .align 2 -BattlePyramidSquare05_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare05_MapBorder - .4byte BattlePyramidSquare05_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare06/layout.inc b/data/layouts/BattlePyramidSquare06/layout.inc deleted file mode 100644 index bcaeb89b01..0000000000 --- a/data/layouts/BattlePyramidSquare06/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare06_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare06/border.bin" - -BattlePyramidSquare06_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare06/map.bin" - - .align 2 -BattlePyramidSquare06_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare06_MapBorder - .4byte BattlePyramidSquare06_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare07/layout.inc b/data/layouts/BattlePyramidSquare07/layout.inc deleted file mode 100644 index bb469b3c81..0000000000 --- a/data/layouts/BattlePyramidSquare07/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare07_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare07/border.bin" - -BattlePyramidSquare07_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare07/map.bin" - - .align 2 -BattlePyramidSquare07_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare07_MapBorder - .4byte BattlePyramidSquare07_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare08/layout.inc b/data/layouts/BattlePyramidSquare08/layout.inc deleted file mode 100644 index df88b710fd..0000000000 --- a/data/layouts/BattlePyramidSquare08/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare08_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare08/border.bin" - -BattlePyramidSquare08_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare08/map.bin" - - .align 2 -BattlePyramidSquare08_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare08_MapBorder - .4byte BattlePyramidSquare08_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare09/layout.inc b/data/layouts/BattlePyramidSquare09/layout.inc deleted file mode 100644 index 2869d9ac25..0000000000 --- a/data/layouts/BattlePyramidSquare09/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare09_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare09/border.bin" - -BattlePyramidSquare09_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare09/map.bin" - - .align 2 -BattlePyramidSquare09_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare09_MapBorder - .4byte BattlePyramidSquare09_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare10/layout.inc b/data/layouts/BattlePyramidSquare10/layout.inc deleted file mode 100644 index 2ba8e8124d..0000000000 --- a/data/layouts/BattlePyramidSquare10/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare10_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare10/border.bin" - -BattlePyramidSquare10_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare10/map.bin" - - .align 2 -BattlePyramidSquare10_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare10_MapBorder - .4byte BattlePyramidSquare10_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare11/layout.inc b/data/layouts/BattlePyramidSquare11/layout.inc deleted file mode 100644 index 190bddf10b..0000000000 --- a/data/layouts/BattlePyramidSquare11/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare11_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare11/border.bin" - -BattlePyramidSquare11_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare11/map.bin" - - .align 2 -BattlePyramidSquare11_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare11_MapBorder - .4byte BattlePyramidSquare11_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare12/layout.inc b/data/layouts/BattlePyramidSquare12/layout.inc deleted file mode 100644 index 199f66aceb..0000000000 --- a/data/layouts/BattlePyramidSquare12/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare12_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare12/border.bin" - -BattlePyramidSquare12_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare12/map.bin" - - .align 2 -BattlePyramidSquare12_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare12_MapBorder - .4byte BattlePyramidSquare12_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare13/layout.inc b/data/layouts/BattlePyramidSquare13/layout.inc deleted file mode 100644 index 351b04227c..0000000000 --- a/data/layouts/BattlePyramidSquare13/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare13_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare13/border.bin" - -BattlePyramidSquare13_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare13/map.bin" - - .align 2 -BattlePyramidSquare13_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare13_MapBorder - .4byte BattlePyramidSquare13_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare14/layout.inc b/data/layouts/BattlePyramidSquare14/layout.inc deleted file mode 100644 index 653ad161b5..0000000000 --- a/data/layouts/BattlePyramidSquare14/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare14_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare14/border.bin" - -BattlePyramidSquare14_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare14/map.bin" - - .align 2 -BattlePyramidSquare14_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare14_MapBorder - .4byte BattlePyramidSquare14_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare15/layout.inc b/data/layouts/BattlePyramidSquare15/layout.inc deleted file mode 100644 index 24090c671e..0000000000 --- a/data/layouts/BattlePyramidSquare15/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare15_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare15/border.bin" - -BattlePyramidSquare15_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare15/map.bin" - - .align 2 -BattlePyramidSquare15_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare15_MapBorder - .4byte BattlePyramidSquare15_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare16/layout.inc b/data/layouts/BattlePyramidSquare16/layout.inc deleted file mode 100644 index 67187b9bf6..0000000000 --- a/data/layouts/BattlePyramidSquare16/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare16_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare16/border.bin" - -BattlePyramidSquare16_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare16/map.bin" - - .align 2 -BattlePyramidSquare16_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare16_MapBorder - .4byte BattlePyramidSquare16_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattleTentBattleRoom/layout.inc b/data/layouts/BattleTentBattleRoom/layout.inc deleted file mode 100644 index 4f9a8e6261..0000000000 --- a/data/layouts/BattleTentBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleTentBattleRoom_MapBorder:: - .incbin "data/layouts/BattleTentBattleRoom/border.bin" - -BattleTentBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleTentBattleRoom/map.bin" - - .align 2 -BattleTentBattleRoom_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte BattleTentBattleRoom_MapBorder - .4byte BattleTentBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTent - diff --git a/data/layouts/BattleTentCorridor/layout.inc b/data/layouts/BattleTentCorridor/layout.inc deleted file mode 100644 index 9abcdefa43..0000000000 --- a/data/layouts/BattleTentCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleTentCorridor_MapBorder:: - .incbin "data/layouts/BattleTentCorridor/border.bin" - -BattleTentCorridor_MapBlockdata:: - .incbin "data/layouts/BattleTentCorridor/map.bin" - - .align 2 -BattleTentCorridor_Layout:: - .4byte 0x5 - .4byte 0x8 - .4byte BattleTentCorridor_MapBorder - .4byte BattleTentCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTent - diff --git a/data/layouts/BattleTentLobby/layout.inc b/data/layouts/BattleTentLobby/layout.inc deleted file mode 100644 index a3216370f0..0000000000 --- a/data/layouts/BattleTentLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleTentLobby_MapBorder:: - .incbin "data/layouts/BattleTentLobby/border.bin" - -BattleTentLobby_MapBlockdata:: - .incbin "data/layouts/BattleTentLobby/map.bin" - - .align 2 -BattleTentLobby_Layout:: - .4byte 0xd - .4byte 0xa - .4byte BattleTentLobby_MapBorder - .4byte BattleTentLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTent - diff --git a/data/layouts/BirthIsland_Exterior/layout.inc b/data/layouts/BirthIsland_Exterior/layout.inc deleted file mode 100644 index 17dc4f0fbd..0000000000 --- a/data/layouts/BirthIsland_Exterior/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BirthIsland_Exterior_MapBorder:: - .incbin "data/layouts/BirthIsland_Exterior/border.bin" - -BirthIsland_Exterior_MapBlockdata:: - .incbin "data/layouts/BirthIsland_Exterior/map.bin" - - .align 2 -BirthIsland_Exterior_Layout:: - .4byte 0x1e - .4byte 0x1e - .4byte BirthIsland_Exterior_MapBorder - .4byte BirthIsland_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - diff --git a/data/layouts/CableCarStation/layout.inc b/data/layouts/CableCarStation/layout.inc deleted file mode 100644 index 1113f89f2e..0000000000 --- a/data/layouts/CableCarStation/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CableCarStation_MapBorder:: - .incbin "data/layouts/CableCarStation/border.bin" - -CableCarStation_MapBlockdata:: - .incbin "data/layouts/CableCarStation/map.bin" - - .align 2 -CableCarStation_Layout:: - .4byte 0xd - .4byte 0xc - .4byte CableCarStation_MapBorder - .4byte CableCarStation_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/CaveOfOrigin_1F/layout.inc b/data/layouts/CaveOfOrigin_1F/layout.inc deleted file mode 100644 index 616af16558..0000000000 --- a/data/layouts/CaveOfOrigin_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_1F_MapBorder:: - .incbin "data/layouts/CaveOfOrigin_1F/border.bin" - -CaveOfOrigin_1F_MapBlockdata:: - .incbin "data/layouts/CaveOfOrigin_1F/map.bin" - - .align 2 -CaveOfOrigin_1F_Layout:: - .4byte 0x17 - .4byte 0x17 - .4byte CaveOfOrigin_1F_MapBorder - .4byte CaveOfOrigin_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/CaveOfOrigin_B1F/layout.inc b/data/layouts/CaveOfOrigin_B1F/layout.inc deleted file mode 100644 index 5850f15c90..0000000000 --- a/data/layouts/CaveOfOrigin_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_B1F_MapBorder:: - .incbin "data/layouts/CaveOfOrigin_B1F/border.bin" - -CaveOfOrigin_B1F_MapBlockdata:: - .incbin "data/layouts/CaveOfOrigin_B1F/map.bin" - - .align 2 -CaveOfOrigin_B1F_Layout:: - .4byte 0x13 - .4byte 0x13 - .4byte CaveOfOrigin_B1F_MapBorder - .4byte CaveOfOrigin_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/CaveOfOrigin_Entrance/layout.inc b/data/layouts/CaveOfOrigin_Entrance/layout.inc deleted file mode 100644 index 11e230ce36..0000000000 --- a/data/layouts/CaveOfOrigin_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_Entrance_MapBorder:: - .incbin "data/layouts/CaveOfOrigin_Entrance/border.bin" - -CaveOfOrigin_Entrance_MapBlockdata:: - .incbin "data/layouts/CaveOfOrigin_Entrance/map.bin" - - .align 2 -CaveOfOrigin_Entrance_Layout:: - .4byte 0x13 - .4byte 0x1a - .4byte CaveOfOrigin_Entrance_MapBorder - .4byte CaveOfOrigin_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc deleted file mode 100644 index 294bf786a2..0000000000 --- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap1_MapBorder:: - .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin" - -CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata:: - .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap1_Layout:: - .4byte 0x17 - .4byte 0x17 - .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBorder - .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc deleted file mode 100644 index c3a05f75f7..0000000000 --- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap2_MapBorder:: - .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin" - -CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata:: - .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap2_Layout:: - .4byte 0x15 - .4byte 0x15 - .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBorder - .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc deleted file mode 100644 index cbc5c052a7..0000000000 --- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap3_MapBorder:: - .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin" - -CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata:: - .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap3_Layout:: - .4byte 0x13 - .4byte 0x15 - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBorder - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/DesertRuins/layout.inc b/data/layouts/DesertRuins/layout.inc deleted file mode 100644 index 4d6e7571ab..0000000000 --- a/data/layouts/DesertRuins/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -DesertRuins_MapBorder:: - .incbin "data/layouts/DesertRuins/border.bin" - -DesertRuins_MapBlockdata:: - .incbin "data/layouts/DesertRuins/map.bin" - - .align 2 -DesertRuins_Layout:: - .4byte 0x11 - .4byte 0x21 - .4byte DesertRuins_MapBorder - .4byte DesertRuins_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/DesertUnderpass/layout.inc b/data/layouts/DesertUnderpass/layout.inc deleted file mode 100644 index 9a17a128e0..0000000000 --- a/data/layouts/DesertUnderpass/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -DesertUnderpass_MapBorder:: - .incbin "data/layouts/DesertUnderpass/border.bin" - -DesertUnderpass_MapBlockdata:: - .incbin "data/layouts/DesertUnderpass/map.bin" - - .align 2 -DesertUnderpass_Layout:: - .4byte 0x8b - .4byte 0x17 - .4byte DesertUnderpass_MapBorder - .4byte DesertUnderpass_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/DewfordTown/layout.inc b/data/layouts/DewfordTown/layout.inc deleted file mode 100644 index 28ccdc43c5..0000000000 --- a/data/layouts/DewfordTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_MapBorder:: - .incbin "data/layouts/DewfordTown/border.bin" - -DewfordTown_MapBlockdata:: - .incbin "data/layouts/DewfordTown/map.bin" - - .align 2 -DewfordTown_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte DewfordTown_MapBorder - .4byte DewfordTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - diff --git a/data/layouts/DewfordTown_Gym/layout.inc b/data/layouts/DewfordTown_Gym/layout.inc deleted file mode 100644 index bbada5bdc0..0000000000 --- a/data/layouts/DewfordTown_Gym/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_Gym_MapBorder:: - .incbin "data/layouts/DewfordTown_Gym/border.bin" - -DewfordTown_Gym_MapBlockdata:: - .incbin "data/layouts/DewfordTown_Gym/map.bin" - - .align 2 -DewfordTown_Gym_Layout:: - .4byte 0x12 - .4byte 0x1c - .4byte DewfordTown_Gym_MapBorder - .4byte DewfordTown_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_DewfordGym - diff --git a/data/layouts/DewfordTown_Hall/layout.inc b/data/layouts/DewfordTown_Hall/layout.inc deleted file mode 100644 index bd9cd03aec..0000000000 --- a/data/layouts/DewfordTown_Hall/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_Hall_MapBorder:: - .incbin "data/layouts/DewfordTown_Hall/border.bin" - -DewfordTown_Hall_MapBlockdata:: - .incbin "data/layouts/DewfordTown_Hall/map.bin" - - .align 2 -DewfordTown_Hall_Layout:: - .4byte 0x11 - .4byte 0x9 - .4byte DewfordTown_Hall_MapBorder - .4byte DewfordTown_Hall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/DoubleBattleColosseum/layout.inc b/data/layouts/DoubleBattleColosseum/layout.inc deleted file mode 100644 index 61d112c1e9..0000000000 --- a/data/layouts/DoubleBattleColosseum/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -DoubleBattleColosseum_MapBorder:: - .incbin "data/layouts/DoubleBattleColosseum/border.bin" - -DoubleBattleColosseum_MapBlockdata:: - .incbin "data/layouts/DoubleBattleColosseum/map.bin" - - .align 2 -DoubleBattleColosseum_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte DoubleBattleColosseum_MapBorder - .4byte DoubleBattleColosseum_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - diff --git a/data/layouts/EverGrandeCity/layout.inc b/data/layouts/EverGrandeCity/layout.inc deleted file mode 100644 index 16c02fbaac..0000000000 --- a/data/layouts/EverGrandeCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_MapBorder:: - .incbin "data/layouts/EverGrandeCity/border.bin" - -EverGrandeCity_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity/map.bin" - - .align 2 -EverGrandeCity_Layout:: - .4byte 0x28 - .4byte 0x50 - .4byte EverGrandeCity_MapBorder - .4byte EverGrandeCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_EverGrande - diff --git a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc deleted file mode 100644 index dad4c7ef35..0000000000 --- a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_ChampionsRoom_MapBorder:: - .incbin "data/layouts/EverGrandeCity_ChampionsRoom/border.bin" - -EverGrandeCity_ChampionsRoom_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_ChampionsRoom/map.bin" - - .align 2 -EverGrandeCity_ChampionsRoom_Layout:: - .4byte 0xd - .4byte 0xd - .4byte EverGrandeCity_ChampionsRoom_MapBorder - .4byte EverGrandeCity_ChampionsRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - diff --git a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc deleted file mode 100644 index 9c140d49d3..0000000000 --- a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_DrakesRoom_MapBorder:: - .incbin "data/layouts/EverGrandeCity_DrakesRoom/border.bin" - -EverGrandeCity_DrakesRoom_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_DrakesRoom/map.bin" - - .align 2 -EverGrandeCity_DrakesRoom_Layout:: - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_DrakesRoom_MapBorder - .4byte EverGrandeCity_DrakesRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - diff --git a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc deleted file mode 100644 index bcd610d8c8..0000000000 --- a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_GlaciasRoom_MapBorder:: - .incbin "data/layouts/EverGrandeCity_GlaciasRoom/border.bin" - -EverGrandeCity_GlaciasRoom_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_GlaciasRoom/map.bin" - - .align 2 -EverGrandeCity_GlaciasRoom_Layout:: - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_GlaciasRoom_MapBorder - .4byte EverGrandeCity_GlaciasRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - diff --git a/data/layouts/EverGrandeCity_Hall4/layout.inc b/data/layouts/EverGrandeCity_Hall4/layout.inc deleted file mode 100644 index 464fc8998f..0000000000 --- a/data/layouts/EverGrandeCity_Hall4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_Hall4_MapBorder:: - .incbin "data/layouts/EverGrandeCity_Hall4/border.bin" - -EverGrandeCity_Hall4_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_Hall4/map.bin" - - .align 2 -EverGrandeCity_Hall4_Layout:: - .4byte 0xb - .4byte 0x22 - .4byte EverGrandeCity_Hall4_MapBorder - .4byte EverGrandeCity_Hall4_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - diff --git a/data/layouts/EverGrandeCity_HallOfFame/layout.inc b/data/layouts/EverGrandeCity_HallOfFame/layout.inc deleted file mode 100644 index deaa4429d1..0000000000 --- a/data/layouts/EverGrandeCity_HallOfFame/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_HallOfFame_MapBorder:: - .incbin "data/layouts/EverGrandeCity_HallOfFame/border.bin" - -EverGrandeCity_HallOfFame_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_HallOfFame/map.bin" - - .align 2 -EverGrandeCity_HallOfFame_Layout:: - .4byte 0xf - .4byte 0x11 - .4byte EverGrandeCity_HallOfFame_MapBorder - .4byte EverGrandeCity_HallOfFame_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - diff --git a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc deleted file mode 100644 index b02d5c312c..0000000000 --- a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PhoebesRoom_MapBorder:: - .incbin "data/layouts/EverGrandeCity_PhoebesRoom/border.bin" - -EverGrandeCity_PhoebesRoom_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_PhoebesRoom/map.bin" - - .align 2 -EverGrandeCity_PhoebesRoom_Layout:: - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_PhoebesRoom_MapBorder - .4byte EverGrandeCity_PhoebesRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - diff --git a/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc b/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc deleted file mode 100644 index d84e6449f7..0000000000 --- a/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PokemonLeague_1F_MapBorder:: - .incbin "data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin" - -EverGrandeCity_PokemonLeague_1F_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin" - - .align 2 -EverGrandeCity_PokemonLeague_1F_Layout:: - .4byte 0x13 - .4byte 0xc - .4byte EverGrandeCity_PokemonLeague_1F_MapBorder - .4byte EverGrandeCity_PokemonLeague_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - diff --git a/data/layouts/EverGrandeCity_ShortHall/layout.inc b/data/layouts/EverGrandeCity_ShortHall/layout.inc deleted file mode 100644 index 2159c894d3..0000000000 --- a/data/layouts/EverGrandeCity_ShortHall/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_ShortHall_MapBorder:: - .incbin "data/layouts/EverGrandeCity_ShortHall/border.bin" - -EverGrandeCity_ShortHall_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_ShortHall/map.bin" - - .align 2 -EverGrandeCity_ShortHall_Layout:: - .4byte 0xb - .4byte 0xd - .4byte EverGrandeCity_ShortHall_MapBorder - .4byte EverGrandeCity_ShortHall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - diff --git a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc deleted file mode 100644 index 86ffa16a15..0000000000 --- a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_SidneysRoom_MapBorder:: - .incbin "data/layouts/EverGrandeCity_SidneysRoom/border.bin" - -EverGrandeCity_SidneysRoom_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_SidneysRoom/map.bin" - - .align 2 -EverGrandeCity_SidneysRoom_Layout:: - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_SidneysRoom_MapBorder - .4byte EverGrandeCity_SidneysRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - diff --git a/data/layouts/FallarborTown/layout.inc b/data/layouts/FallarborTown/layout.inc deleted file mode 100644 index 7f08949032..0000000000 --- a/data/layouts/FallarborTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_MapBorder:: - .incbin "data/layouts/FallarborTown/border.bin" - -FallarborTown_MapBlockdata:: - .incbin "data/layouts/FallarborTown/map.bin" - - .align 2 -FallarborTown_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte FallarborTown_MapBorder - .4byte FallarborTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - diff --git a/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc deleted file mode 100644 index 66acc546b4..0000000000 --- a/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_LeftoverRSContestHall_MapBorder:: - .incbin "data/layouts/FallarborTown_LeftoverRSContestHall/border.bin" - -FallarborTown_LeftoverRSContestHall_MapBlockdata:: - .incbin "data/layouts/FallarborTown_LeftoverRSContestHall/map.bin" - - .align 2 -FallarborTown_LeftoverRSContestHall_Layout:: - .4byte 0x15 - .4byte 0x12 - .4byte FallarborTown_LeftoverRSContestHall_MapBorder - .4byte FallarborTown_LeftoverRSContestHall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc deleted file mode 100644 index 3ad232728e..0000000000 --- a/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_LeftoverRSContestLobby_MapBorder:: - .incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin" - -FallarborTown_LeftoverRSContestLobby_MapBlockdata:: - .incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin" - - .align 2 -FallarborTown_LeftoverRSContestLobby_Layout:: - .4byte 0xf - .4byte 0x7 - .4byte FallarborTown_LeftoverRSContestLobby_MapBorder - .4byte FallarborTown_LeftoverRSContestLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/FarawayIsland_Entrance/layout.inc b/data/layouts/FarawayIsland_Entrance/layout.inc deleted file mode 100644 index c7d6bef917..0000000000 --- a/data/layouts/FarawayIsland_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FarawayIsland_Entrance_MapBorder:: - .incbin "data/layouts/FarawayIsland_Entrance/border.bin" - -FarawayIsland_Entrance_MapBlockdata:: - .incbin "data/layouts/FarawayIsland_Entrance/map.bin" - - .align 2 -FarawayIsland_Entrance_Layout:: - .4byte 0x22 - .4byte 0x2e - .4byte FarawayIsland_Entrance_MapBorder - .4byte FarawayIsland_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - diff --git a/data/layouts/FarawayIsland_Interior/layout.inc b/data/layouts/FarawayIsland_Interior/layout.inc deleted file mode 100644 index 787dd53c9e..0000000000 --- a/data/layouts/FarawayIsland_Interior/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FarawayIsland_Interior_MapBorder:: - .incbin "data/layouts/FarawayIsland_Interior/border.bin" - -FarawayIsland_Interior_MapBlockdata:: - .incbin "data/layouts/FarawayIsland_Interior/map.bin" - - .align 2 -FarawayIsland_Interior_Layout:: - .4byte 0x1d - .4byte 0x1a - .4byte FarawayIsland_Interior_MapBorder - .4byte FarawayIsland_Interior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - diff --git a/data/layouts/FieryPath/layout.inc b/data/layouts/FieryPath/layout.inc deleted file mode 100644 index c129ae7150..0000000000 --- a/data/layouts/FieryPath/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FieryPath_MapBorder:: - .incbin "data/layouts/FieryPath/border.bin" - -FieryPath_MapBlockdata:: - .incbin "data/layouts/FieryPath/map.bin" - - .align 2 -FieryPath_Layout:: - .4byte 0x23 - .4byte 0x26 - .4byte FieryPath_MapBorder - .4byte FieryPath_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/FortreeCity/layout.inc b/data/layouts/FortreeCity/layout.inc deleted file mode 100644 index 02564b36ad..0000000000 --- a/data/layouts/FortreeCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_MapBorder:: - .incbin "data/layouts/FortreeCity/border.bin" - -FortreeCity_MapBlockdata:: - .incbin "data/layouts/FortreeCity/map.bin" - - .align 2 -FortreeCity_Layout:: - .4byte 0x28 - .4byte 0x14 - .4byte FortreeCity_MapBorder - .4byte FortreeCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - diff --git a/data/layouts/FortreeCity_DecorationShop/layout.inc b/data/layouts/FortreeCity_DecorationShop/layout.inc deleted file mode 100644 index 6460a35b54..0000000000 --- a/data/layouts/FortreeCity_DecorationShop/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_DecorationShop_MapBorder:: - .incbin "data/layouts/FortreeCity_DecorationShop/border.bin" - -FortreeCity_DecorationShop_MapBlockdata:: - .incbin "data/layouts/FortreeCity_DecorationShop/map.bin" - - .align 2 -FortreeCity_DecorationShop_Layout:: - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_DecorationShop_MapBorder - .4byte FortreeCity_DecorationShop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/FortreeCity_Gym/layout.inc b/data/layouts/FortreeCity_Gym/layout.inc deleted file mode 100644 index da7f1e73e9..0000000000 --- a/data/layouts/FortreeCity_Gym/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_Gym_MapBorder:: - .incbin "data/layouts/FortreeCity_Gym/border.bin" - -FortreeCity_Gym_MapBlockdata:: - .incbin "data/layouts/FortreeCity_Gym/map.bin" - - .align 2 -FortreeCity_Gym_Layout:: - .4byte 0x14 - .4byte 0x19 - .4byte FortreeCity_Gym_MapBorder - .4byte FortreeCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_FortreeGym - diff --git a/data/layouts/FortreeCity_House1/layout.inc b/data/layouts/FortreeCity_House1/layout.inc deleted file mode 100644 index 214846c228..0000000000 --- a/data/layouts/FortreeCity_House1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House1_MapBorder:: - .incbin "data/layouts/FortreeCity_House1/border.bin" - -FortreeCity_House1_MapBlockdata:: - .incbin "data/layouts/FortreeCity_House1/map.bin" - - .align 2 -FortreeCity_House1_Layout:: - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_House1_MapBorder - .4byte FortreeCity_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/FortreeCity_House2/layout.inc b/data/layouts/FortreeCity_House2/layout.inc deleted file mode 100644 index 3aa0898bfe..0000000000 --- a/data/layouts/FortreeCity_House2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House2_MapBorder:: - .incbin "data/layouts/FortreeCity_House2/border.bin" - -FortreeCity_House2_MapBlockdata:: - .incbin "data/layouts/FortreeCity_House2/map.bin" - - .align 2 -FortreeCity_House2_Layout:: - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_House2_MapBorder - .4byte FortreeCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/GraniteCave_1F/layout.inc b/data/layouts/GraniteCave_1F/layout.inc deleted file mode 100644 index 009fd12f5c..0000000000 --- a/data/layouts/GraniteCave_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_1F_MapBorder:: - .incbin "data/layouts/GraniteCave_1F/border.bin" - -GraniteCave_1F_MapBlockdata:: - .incbin "data/layouts/GraniteCave_1F/map.bin" - - .align 2 -GraniteCave_1F_Layout:: - .4byte 0x2a - .4byte 0xf - .4byte GraniteCave_1F_MapBorder - .4byte GraniteCave_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/GraniteCave_B1F/layout.inc b/data/layouts/GraniteCave_B1F/layout.inc deleted file mode 100644 index a57b238be1..0000000000 --- a/data/layouts/GraniteCave_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_B1F_MapBorder:: - .incbin "data/layouts/GraniteCave_B1F/border.bin" - -GraniteCave_B1F_MapBlockdata:: - .incbin "data/layouts/GraniteCave_B1F/map.bin" - - .align 2 -GraniteCave_B1F_Layout:: - .4byte 0x20 - .4byte 0x1a - .4byte GraniteCave_B1F_MapBorder - .4byte GraniteCave_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/GraniteCave_B2F/layout.inc b/data/layouts/GraniteCave_B2F/layout.inc deleted file mode 100644 index 7ffd04b001..0000000000 --- a/data/layouts/GraniteCave_B2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_B2F_MapBorder:: - .incbin "data/layouts/GraniteCave_B2F/border.bin" - -GraniteCave_B2F_MapBlockdata:: - .incbin "data/layouts/GraniteCave_B2F/map.bin" - - .align 2 -GraniteCave_B2F_Layout:: - .4byte 0x20 - .4byte 0x1a - .4byte GraniteCave_B2F_MapBorder - .4byte GraniteCave_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/GraniteCave_StevensRoom/layout.inc b/data/layouts/GraniteCave_StevensRoom/layout.inc deleted file mode 100644 index 5ee4fade44..0000000000 --- a/data/layouts/GraniteCave_StevensRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_StevensRoom_MapBorder:: - .incbin "data/layouts/GraniteCave_StevensRoom/border.bin" - -GraniteCave_StevensRoom_MapBlockdata:: - .incbin "data/layouts/GraniteCave_StevensRoom/map.bin" - - .align 2 -GraniteCave_StevensRoom_Layout:: - .4byte 0xf - .4byte 0xe - .4byte GraniteCave_StevensRoom_MapBorder - .4byte GraniteCave_StevensRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/Harbor/layout.inc b/data/layouts/Harbor/layout.inc deleted file mode 100644 index e95b8ec9d7..0000000000 --- a/data/layouts/Harbor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Harbor_MapBorder:: - .incbin "data/layouts/Harbor/border.bin" - -Harbor_MapBlockdata:: - .incbin "data/layouts/Harbor/map.bin" - - .align 2 -Harbor_Layout:: - .4byte 0x18 - .4byte 0xf - .4byte Harbor_MapBorder - .4byte Harbor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/House1/layout.inc b/data/layouts/House1/layout.inc deleted file mode 100644 index b93f24df4f..0000000000 --- a/data/layouts/House1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -House1_MapBorder:: - .incbin "data/layouts/House1/border.bin" - -House1_MapBlockdata:: - .incbin "data/layouts/House1/map.bin" - - .align 2 -House1_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte House1_MapBorder - .4byte House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/House2/layout.inc b/data/layouts/House2/layout.inc deleted file mode 100644 index 35566d8d12..0000000000 --- a/data/layouts/House2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -House2_MapBorder:: - .incbin "data/layouts/House2/border.bin" - -House2_MapBlockdata:: - .incbin "data/layouts/House2/map.bin" - - .align 2 -House2_Layout:: - .4byte 0xb - .4byte 0x8 - .4byte House2_MapBorder - .4byte House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/House3/layout.inc b/data/layouts/House3/layout.inc deleted file mode 100644 index 6e2de11f48..0000000000 --- a/data/layouts/House3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -House3_MapBorder:: - .incbin "data/layouts/House3/border.bin" - -House3_MapBlockdata:: - .incbin "data/layouts/House3/map.bin" - - .align 2 -House3_Layout:: - .4byte 0xa - .4byte 0x8 - .4byte House3_MapBorder - .4byte House3_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/House4/layout.inc b/data/layouts/House4/layout.inc deleted file mode 100644 index b06b3d4273..0000000000 --- a/data/layouts/House4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -House4_MapBorder:: - .incbin "data/layouts/House4/border.bin" - -House4_MapBlockdata:: - .incbin "data/layouts/House4/map.bin" - - .align 2 -House4_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte House4_MapBorder - .4byte House4_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/HouseWithBed/layout.inc b/data/layouts/HouseWithBed/layout.inc deleted file mode 100644 index 7fb8d2c9bd..0000000000 --- a/data/layouts/HouseWithBed/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -HouseWithBed_MapBorder:: - .incbin "data/layouts/HouseWithBed/border.bin" - -HouseWithBed_MapBlockdata:: - .incbin "data/layouts/HouseWithBed/map.bin" - - .align 2 -HouseWithBed_Layout:: - .4byte 0xa - .4byte 0x8 - .4byte HouseWithBed_MapBorder - .4byte HouseWithBed_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/InsideOfTruck/layout.inc b/data/layouts/InsideOfTruck/layout.inc deleted file mode 100644 index d1ddf86865..0000000000 --- a/data/layouts/InsideOfTruck/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -InsideOfTruck_MapBorder:: - .incbin "data/layouts/InsideOfTruck/border.bin" - -InsideOfTruck_MapBlockdata:: - .incbin "data/layouts/InsideOfTruck/map.bin" - - .align 2 -InsideOfTruck_Layout:: - .4byte 0x5 - .4byte 0x5 - .4byte InsideOfTruck_MapBorder - .4byte InsideOfTruck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideOfTruck - diff --git a/data/layouts/IslandCave/layout.inc b/data/layouts/IslandCave/layout.inc deleted file mode 100644 index 5a3035b721..0000000000 --- a/data/layouts/IslandCave/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -IslandCave_MapBorder:: - .incbin "data/layouts/IslandCave/border.bin" - -IslandCave_MapBlockdata:: - .incbin "data/layouts/IslandCave/map.bin" - - .align 2 -IslandCave_Layout:: - .4byte 0x11 - .4byte 0x21 - .4byte IslandCave_MapBorder - .4byte IslandCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/IslandHarbor/layout.inc b/data/layouts/IslandHarbor/layout.inc deleted file mode 100644 index 7fc86dca44..0000000000 --- a/data/layouts/IslandHarbor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -IslandHarbor_MapBorder:: - .incbin "data/layouts/IslandHarbor/border.bin" - -IslandHarbor_MapBlockdata:: - .incbin "data/layouts/IslandHarbor/map.bin" - - .align 2 -IslandHarbor_Layout:: - .4byte 0x11 - .4byte 0xd - .4byte IslandHarbor_MapBorder - .4byte IslandHarbor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_IslandHarbor - diff --git a/data/layouts/JaggedPass/layout.inc b/data/layouts/JaggedPass/layout.inc deleted file mode 100644 index 5620551b8a..0000000000 --- a/data/layouts/JaggedPass/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -JaggedPass_MapBorder:: - .incbin "data/layouts/JaggedPass/border.bin" - -JaggedPass_MapBlockdata:: - .incbin "data/layouts/JaggedPass/map.bin" - - .align 2 -JaggedPass_Layout:: - .4byte 0x1e - .4byte 0x2e - .4byte JaggedPass_MapBorder - .4byte JaggedPass_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/LavaridgeTown/layout.inc b/data/layouts/LavaridgeTown/layout.inc deleted file mode 100644 index 6629554306..0000000000 --- a/data/layouts/LavaridgeTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_MapBorder:: - .incbin "data/layouts/LavaridgeTown/border.bin" - -LavaridgeTown_MapBlockdata:: - .incbin "data/layouts/LavaridgeTown/map.bin" - - .align 2 -LavaridgeTown_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte LavaridgeTown_MapBorder - .4byte LavaridgeTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/LavaridgeTown_Gym_1F/layout.inc b/data/layouts/LavaridgeTown_Gym_1F/layout.inc deleted file mode 100644 index 36f4cb826a..0000000000 --- a/data/layouts/LavaridgeTown_Gym_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_Gym_1F_MapBorder:: - .incbin "data/layouts/LavaridgeTown_Gym_1F/border.bin" - -LavaridgeTown_Gym_1F_MapBlockdata:: - .incbin "data/layouts/LavaridgeTown_Gym_1F/map.bin" - - .align 2 -LavaridgeTown_Gym_1F_Layout:: - .4byte 0x11 - .4byte 0x13 - .4byte LavaridgeTown_Gym_1F_MapBorder - .4byte LavaridgeTown_Gym_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LavaridgeGym - diff --git a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc deleted file mode 100644 index 9b80d7f90f..0000000000 --- a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_Gym_B1F_MapBorder:: - .incbin "data/layouts/LavaridgeTown_Gym_B1F/border.bin" - -LavaridgeTown_Gym_B1F_MapBlockdata:: - .incbin "data/layouts/LavaridgeTown_Gym_B1F/map.bin" - - .align 2 -LavaridgeTown_Gym_B1F_Layout:: - .4byte 0x11 - .4byte 0x13 - .4byte LavaridgeTown_Gym_B1F_MapBorder - .4byte LavaridgeTown_Gym_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LavaridgeGym - diff --git a/data/layouts/LavaridgeTown_HerbShop/layout.inc b/data/layouts/LavaridgeTown_HerbShop/layout.inc deleted file mode 100644 index c59e12e49c..0000000000 --- a/data/layouts/LavaridgeTown_HerbShop/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_HerbShop_MapBorder:: - .incbin "data/layouts/LavaridgeTown_HerbShop/border.bin" - -LavaridgeTown_HerbShop_MapBlockdata:: - .incbin "data/layouts/LavaridgeTown_HerbShop/map.bin" - - .align 2 -LavaridgeTown_HerbShop_Layout:: - .4byte 0xb - .4byte 0x8 - .4byte LavaridgeTown_HerbShop_MapBorder - .4byte LavaridgeTown_HerbShop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc deleted file mode 100644 index e38d63815f..0000000000 --- a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_PokemonCenter_1F_MapBorder:: - .incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin" - -LavaridgeTown_PokemonCenter_1F_MapBlockdata:: - .incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin" - - .align 2 -LavaridgeTown_PokemonCenter_1F_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte LavaridgeTown_PokemonCenter_1F_MapBorder - .4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - diff --git a/data/layouts/LilycoveCity/layout.inc b/data/layouts/LilycoveCity/layout.inc deleted file mode 100644 index ed4bd81e4a..0000000000 --- a/data/layouts/LilycoveCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_MapBorder:: - .incbin "data/layouts/LilycoveCity/border.bin" - -LilycoveCity_MapBlockdata:: - .incbin "data/layouts/LilycoveCity/map.bin" - - .align 2 -LilycoveCity_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte LilycoveCity_MapBorder - .4byte LilycoveCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/LilycoveCity_ContestHall/layout.inc b/data/layouts/LilycoveCity_ContestHall/layout.inc deleted file mode 100644 index 61e6e27ee5..0000000000 --- a/data/layouts/LilycoveCity_ContestHall/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_ContestHall_MapBorder:: - .incbin "data/layouts/LilycoveCity_ContestHall/border.bin" - -LilycoveCity_ContestHall_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_ContestHall/map.bin" - - .align 2 -LilycoveCity_ContestHall_Layout:: - .4byte 0x33 - .4byte 0x21 - .4byte LilycoveCity_ContestHall_MapBorder - .4byte LilycoveCity_ContestHall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/LilycoveCity_ContestLobby/layout.inc b/data/layouts/LilycoveCity_ContestLobby/layout.inc deleted file mode 100644 index 20cf4389fb..0000000000 --- a/data/layouts/LilycoveCity_ContestLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_ContestLobby_MapBorder:: - .incbin "data/layouts/LilycoveCity_ContestLobby/border.bin" - -LilycoveCity_ContestLobby_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_ContestLobby/map.bin" - - .align 2 -LilycoveCity_ContestLobby_Layout:: - .4byte 0x1f - .4byte 0xc - .4byte LilycoveCity_ContestLobby_MapBorder - .4byte LilycoveCity_ContestLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc deleted file mode 100644 index b275834f7e..0000000000 --- a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_CoveLilyMotel_1F_MapBorder:: - .incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin" - -LilycoveCity_CoveLilyMotel_1F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin" - - .align 2 -LilycoveCity_CoveLilyMotel_1F_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte LilycoveCity_CoveLilyMotel_1F_MapBorder - .4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc deleted file mode 100644 index 82a294c48f..0000000000 --- a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_CoveLilyMotel_2F_MapBorder:: - .incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin" - -LilycoveCity_CoveLilyMotel_2F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin" - - .align 2 -LilycoveCity_CoveLilyMotel_2F_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte LilycoveCity_CoveLilyMotel_2F_MapBorder - .4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc deleted file mode 100644 index 899e934bdb..0000000000 --- a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStoreElevator_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin" - -LilycoveCity_DepartmentStoreElevator_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin" - - .align 2 -LilycoveCity_DepartmentStoreElevator_Layout:: - .4byte 0x5 - .4byte 0x6 - .4byte LilycoveCity_DepartmentStoreElevator_MapBorder - .4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc deleted file mode 100644 index d404833086..0000000000 --- a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStoreRooftop_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin" - -LilycoveCity_DepartmentStoreRooftop_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin" - - .align 2 -LilycoveCity_DepartmentStoreRooftop_Layout:: - .4byte 0x12 - .4byte 0xc - .4byte LilycoveCity_DepartmentStoreRooftop_MapBorder - .4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc deleted file mode 100644 index d3b5d94207..0000000000 --- a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_1F_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_1F/border.bin" - -LilycoveCity_DepartmentStore_1F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_1F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_1F_Layout:: - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_1F_MapBorder - .4byte LilycoveCity_DepartmentStore_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc deleted file mode 100644 index e5b01c8fd7..0000000000 --- a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_2F_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_2F/border.bin" - -LilycoveCity_DepartmentStore_2F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_2F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_2F_Layout:: - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_2F_MapBorder - .4byte LilycoveCity_DepartmentStore_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc deleted file mode 100644 index 5d7aa93ebe..0000000000 --- a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_3F_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_3F/border.bin" - -LilycoveCity_DepartmentStore_3F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_3F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_3F_Layout:: - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_3F_MapBorder - .4byte LilycoveCity_DepartmentStore_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc deleted file mode 100644 index b4585ca031..0000000000 --- a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_4F_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_4F/border.bin" - -LilycoveCity_DepartmentStore_4F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_4F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_4F_Layout:: - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_4F_MapBorder - .4byte LilycoveCity_DepartmentStore_4F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc deleted file mode 100644 index ade5e4bf51..0000000000 --- a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_5F_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_5F/border.bin" - -LilycoveCity_DepartmentStore_5F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_5F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_5F_Layout:: - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_5F_MapBorder - .4byte LilycoveCity_DepartmentStore_5F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/LilycoveCity_House2/layout.inc b/data/layouts/LilycoveCity_House2/layout.inc deleted file mode 100644 index de51e7fd61..0000000000 --- a/data/layouts/LilycoveCity_House2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_House2_MapBorder:: - .incbin "data/layouts/LilycoveCity_House2/border.bin" - -LilycoveCity_House2_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_House2/map.bin" - - .align 2 -LilycoveCity_House2_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte LilycoveCity_House2_MapBorder - .4byte LilycoveCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc deleted file mode 100644 index 0dab4095ce..0000000000 --- a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_LilycoveMuseum_1F_MapBorder:: - .incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin" - -LilycoveCity_LilycoveMuseum_1F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin" - - .align 2 -LilycoveCity_LilycoveMuseum_1F_Layout:: - .4byte 0x15 - .4byte 0xe - .4byte LilycoveCity_LilycoveMuseum_1F_MapBorder - .4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LilycoveMuseum - diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc deleted file mode 100644 index aea4464109..0000000000 --- a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_LilycoveMuseum_2F_MapBorder:: - .incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin" - -LilycoveCity_LilycoveMuseum_2F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin" - - .align 2 -LilycoveCity_LilycoveMuseum_2F_Layout:: - .4byte 0x16 - .4byte 0xd - .4byte LilycoveCity_LilycoveMuseum_2F_MapBorder - .4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LilycoveMuseum - diff --git a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc deleted file mode 100644 index 9b30c7c08e..0000000000 --- a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_PokemonTrainerFanClub_MapBorder:: - .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin" - -LilycoveCity_PokemonTrainerFanClub_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin" - - .align 2 -LilycoveCity_PokemonTrainerFanClub_Layout:: - .4byte 0xc - .4byte 0xe - .4byte LilycoveCity_PokemonTrainerFanClub_MapBorder - .4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/LinkContestRoom1/layout.inc b/data/layouts/LinkContestRoom1/layout.inc deleted file mode 100644 index e71fe2df32..0000000000 --- a/data/layouts/LinkContestRoom1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom1_MapBorder:: - .incbin "data/layouts/LinkContestRoom1/border.bin" - -LinkContestRoom1_MapBlockdata:: - .incbin "data/layouts/LinkContestRoom1/map.bin" - - .align 2 -LinkContestRoom1_Layout:: - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom1_MapBorder - .4byte LinkContestRoom1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - diff --git a/data/layouts/LinkContestRoom2/layout.inc b/data/layouts/LinkContestRoom2/layout.inc deleted file mode 100644 index 2dd66ab962..0000000000 --- a/data/layouts/LinkContestRoom2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom2_MapBorder:: - .incbin "data/layouts/LinkContestRoom2/border.bin" - -LinkContestRoom2_MapBlockdata:: - .incbin "data/layouts/LinkContestRoom2/map.bin" - - .align 2 -LinkContestRoom2_Layout:: - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom2_MapBorder - .4byte LinkContestRoom2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - diff --git a/data/layouts/LinkContestRoom3/layout.inc b/data/layouts/LinkContestRoom3/layout.inc deleted file mode 100644 index c53cad7230..0000000000 --- a/data/layouts/LinkContestRoom3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom3_MapBorder:: - .incbin "data/layouts/LinkContestRoom3/border.bin" - -LinkContestRoom3_MapBlockdata:: - .incbin "data/layouts/LinkContestRoom3/map.bin" - - .align 2 -LinkContestRoom3_Layout:: - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom3_MapBorder - .4byte LinkContestRoom3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - diff --git a/data/layouts/LinkContestRoom4/layout.inc b/data/layouts/LinkContestRoom4/layout.inc deleted file mode 100644 index 883918f377..0000000000 --- a/data/layouts/LinkContestRoom4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom4_MapBorder:: - .incbin "data/layouts/LinkContestRoom4/border.bin" - -LinkContestRoom4_MapBlockdata:: - .incbin "data/layouts/LinkContestRoom4/map.bin" - - .align 2 -LinkContestRoom4_Layout:: - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom4_MapBorder - .4byte LinkContestRoom4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - diff --git a/data/layouts/LinkContestRoom5/layout.inc b/data/layouts/LinkContestRoom5/layout.inc deleted file mode 100644 index 72a9d9f4ed..0000000000 --- a/data/layouts/LinkContestRoom5/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom5_MapBorder:: - .incbin "data/layouts/LinkContestRoom5/border.bin" - -LinkContestRoom5_MapBlockdata:: - .incbin "data/layouts/LinkContestRoom5/map.bin" - - .align 2 -LinkContestRoom5_Layout:: - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom5_MapBorder - .4byte LinkContestRoom5_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - diff --git a/data/layouts/LinkContestRoom6/layout.inc b/data/layouts/LinkContestRoom6/layout.inc deleted file mode 100644 index 33db4b56dc..0000000000 --- a/data/layouts/LinkContestRoom6/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom6_MapBorder:: - .incbin "data/layouts/LinkContestRoom6/border.bin" - -LinkContestRoom6_MapBlockdata:: - .incbin "data/layouts/LinkContestRoom6/map.bin" - - .align 2 -LinkContestRoom6_Layout:: - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom6_MapBorder - .4byte LinkContestRoom6_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - diff --git a/data/layouts/LittlerootTown/layout.inc b/data/layouts/LittlerootTown/layout.inc deleted file mode 100644 index 8193ac6956..0000000000 --- a/data/layouts/LittlerootTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_MapBorder:: - .incbin "data/layouts/LittlerootTown/border.bin" - -LittlerootTown_MapBlockdata:: - .incbin "data/layouts/LittlerootTown/map.bin" - - .align 2 -LittlerootTown_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte LittlerootTown_MapBorder - .4byte LittlerootTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - diff --git a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc deleted file mode 100644 index 092c7d20b3..0000000000 --- a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_BrendansHouse_1F_MapBorder:: - .incbin "data/layouts/LittlerootTown_BrendansHouse_1F/border.bin" - -LittlerootTown_BrendansHouse_1F_MapBlockdata:: - .incbin "data/layouts/LittlerootTown_BrendansHouse_1F/map.bin" - - .align 2 -LittlerootTown_BrendansHouse_1F_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte LittlerootTown_BrendansHouse_1F_MapBorder - .4byte LittlerootTown_BrendansHouse_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - diff --git a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc deleted file mode 100644 index 5235f4d986..0000000000 --- a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_BrendansHouse_2F_MapBorder:: - .incbin "data/layouts/LittlerootTown_BrendansHouse_2F/border.bin" - -LittlerootTown_BrendansHouse_2F_MapBlockdata:: - .incbin "data/layouts/LittlerootTown_BrendansHouse_2F/map.bin" - - .align 2 -LittlerootTown_BrendansHouse_2F_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte LittlerootTown_BrendansHouse_2F_MapBorder - .4byte LittlerootTown_BrendansHouse_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - diff --git a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc deleted file mode 100644 index 88b81a289a..0000000000 --- a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_MaysHouse_1F_MapBorder:: - .incbin "data/layouts/LittlerootTown_MaysHouse_1F/border.bin" - -LittlerootTown_MaysHouse_1F_MapBlockdata:: - .incbin "data/layouts/LittlerootTown_MaysHouse_1F/map.bin" - - .align 2 -LittlerootTown_MaysHouse_1F_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte LittlerootTown_MaysHouse_1F_MapBorder - .4byte LittlerootTown_MaysHouse_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - diff --git a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc deleted file mode 100644 index 0b6134dbd9..0000000000 --- a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_MaysHouse_2F_MapBorder:: - .incbin "data/layouts/LittlerootTown_MaysHouse_2F/border.bin" - -LittlerootTown_MaysHouse_2F_MapBlockdata:: - .incbin "data/layouts/LittlerootTown_MaysHouse_2F/map.bin" - - .align 2 -LittlerootTown_MaysHouse_2F_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte LittlerootTown_MaysHouse_2F_MapBorder - .4byte LittlerootTown_MaysHouse_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - diff --git a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc deleted file mode 100644 index d0be539a0f..0000000000 --- a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_ProfessorBirchsLab_MapBorder:: - .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin" - -LittlerootTown_ProfessorBirchsLab_MapBlockdata:: - .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin" - - .align 2 -LittlerootTown_ProfessorBirchsLab_Layout:: - .4byte 0xd - .4byte 0xd - .4byte LittlerootTown_ProfessorBirchsLab_MapBorder - .4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - diff --git a/data/layouts/MagmaHideout_1F/layout.inc b/data/layouts/MagmaHideout_1F/layout.inc deleted file mode 100644 index b50c7f015f..0000000000 --- a/data/layouts/MagmaHideout_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_1F_MapBorder:: - .incbin "data/layouts/MagmaHideout_1F/border.bin" - -MagmaHideout_1F_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_1F/map.bin" - - .align 2 -MagmaHideout_1F_Layout:: - .4byte 0x25 - .4byte 0x26 - .4byte MagmaHideout_1F_MapBorder - .4byte MagmaHideout_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/MagmaHideout_2F_1R/layout.inc b/data/layouts/MagmaHideout_2F_1R/layout.inc deleted file mode 100644 index b9f0d27d7e..0000000000 --- a/data/layouts/MagmaHideout_2F_1R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_1R_MapBorder:: - .incbin "data/layouts/MagmaHideout_2F_1R/border.bin" - -MagmaHideout_2F_1R_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_2F_1R/map.bin" - - .align 2 -MagmaHideout_2F_1R_Layout:: - .4byte 0x21 - .4byte 0x27 - .4byte MagmaHideout_2F_1R_MapBorder - .4byte MagmaHideout_2F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/MagmaHideout_2F_2R/layout.inc b/data/layouts/MagmaHideout_2F_2R/layout.inc deleted file mode 100644 index 01507909c1..0000000000 --- a/data/layouts/MagmaHideout_2F_2R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_2R_MapBorder:: - .incbin "data/layouts/MagmaHideout_2F_2R/border.bin" - -MagmaHideout_2F_2R_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_2F_2R/map.bin" - - .align 2 -MagmaHideout_2F_2R_Layout:: - .4byte 0x31 - .4byte 0x1c - .4byte MagmaHideout_2F_2R_MapBorder - .4byte MagmaHideout_2F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/MagmaHideout_2F_3R/layout.inc b/data/layouts/MagmaHideout_2F_3R/layout.inc deleted file mode 100644 index d88fb50fd0..0000000000 --- a/data/layouts/MagmaHideout_2F_3R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_3R_MapBorder:: - .incbin "data/layouts/MagmaHideout_2F_3R/border.bin" - -MagmaHideout_2F_3R_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_2F_3R/map.bin" - - .align 2 -MagmaHideout_2F_3R_Layout:: - .4byte 0x3c - .4byte 0x13 - .4byte MagmaHideout_2F_3R_MapBorder - .4byte MagmaHideout_2F_3R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/MagmaHideout_3F_1R/layout.inc b/data/layouts/MagmaHideout_3F_1R/layout.inc deleted file mode 100644 index c2199b2f2e..0000000000 --- a/data/layouts/MagmaHideout_3F_1R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_3F_1R_MapBorder:: - .incbin "data/layouts/MagmaHideout_3F_1R/border.bin" - -MagmaHideout_3F_1R_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_3F_1R/map.bin" - - .align 2 -MagmaHideout_3F_1R_Layout:: - .4byte 0x1c - .4byte 0x18 - .4byte MagmaHideout_3F_1R_MapBorder - .4byte MagmaHideout_3F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/MagmaHideout_3F_2R/layout.inc b/data/layouts/MagmaHideout_3F_2R/layout.inc deleted file mode 100644 index 2c4662a49d..0000000000 --- a/data/layouts/MagmaHideout_3F_2R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_3F_2R_MapBorder:: - .incbin "data/layouts/MagmaHideout_3F_2R/border.bin" - -MagmaHideout_3F_2R_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_3F_2R/map.bin" - - .align 2 -MagmaHideout_3F_2R_Layout:: - .4byte 0x18 - .4byte 0x11 - .4byte MagmaHideout_3F_2R_MapBorder - .4byte MagmaHideout_3F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/MagmaHideout_3F_3R/layout.inc b/data/layouts/MagmaHideout_3F_3R/layout.inc deleted file mode 100644 index 4042b9653b..0000000000 --- a/data/layouts/MagmaHideout_3F_3R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_3F_3R_MapBorder:: - .incbin "data/layouts/MagmaHideout_3F_3R/border.bin" - -MagmaHideout_3F_3R_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_3F_3R/map.bin" - - .align 2 -MagmaHideout_3F_3R_Layout:: - .4byte 0x21 - .4byte 0x18 - .4byte MagmaHideout_3F_3R_MapBorder - .4byte MagmaHideout_3F_3R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/MagmaHideout_4F/layout.inc b/data/layouts/MagmaHideout_4F/layout.inc deleted file mode 100644 index d7f8c547ca..0000000000 --- a/data/layouts/MagmaHideout_4F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_4F_MapBorder:: - .incbin "data/layouts/MagmaHideout_4F/border.bin" - -MagmaHideout_4F_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_4F/map.bin" - - .align 2 -MagmaHideout_4F_Layout:: - .4byte 0x3b - .4byte 0x1c - .4byte MagmaHideout_4F_MapBorder - .4byte MagmaHideout_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/MarineCave_End/layout.inc b/data/layouts/MarineCave_End/layout.inc deleted file mode 100644 index 256338b897..0000000000 --- a/data/layouts/MarineCave_End/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MarineCave_End_MapBorder:: - .incbin "data/layouts/MarineCave_End/border.bin" - -MarineCave_End_MapBlockdata:: - .incbin "data/layouts/MarineCave_End/map.bin" - - .align 2 -MarineCave_End_Layout:: - .4byte 0x1b - .4byte 0x1e - .4byte MarineCave_End_MapBorder - .4byte MarineCave_End_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/MarineCave_Entrance/layout.inc b/data/layouts/MarineCave_Entrance/layout.inc deleted file mode 100644 index 219c182d79..0000000000 --- a/data/layouts/MarineCave_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MarineCave_Entrance_MapBorder:: - .incbin "data/layouts/MarineCave_Entrance/border.bin" - -MarineCave_Entrance_MapBlockdata:: - .incbin "data/layouts/MarineCave_Entrance/map.bin" - - .align 2 -MarineCave_Entrance_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte MarineCave_Entrance_MapBorder - .4byte MarineCave_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/Mart/layout.inc b/data/layouts/Mart/layout.inc deleted file mode 100644 index 5233e09ab0..0000000000 --- a/data/layouts/Mart/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Mart_MapBorder:: - .incbin "data/layouts/Mart/border.bin" - -Mart_MapBlockdata:: - .incbin "data/layouts/Mart/map.bin" - - .align 2 -Mart_Layout:: - .4byte 0xb - .4byte 0x8 - .4byte Mart_MapBorder - .4byte Mart_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/MauvilleCity/layout.inc b/data/layouts/MauvilleCity/layout.inc deleted file mode 100644 index 7a8c17da2e..0000000000 --- a/data/layouts/MauvilleCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_MapBorder:: - .incbin "data/layouts/MauvilleCity/border.bin" - -MauvilleCity_MapBlockdata:: - .incbin "data/layouts/MauvilleCity/map.bin" - - .align 2 -MauvilleCity_Layout:: - .4byte 0x28 - .4byte 0x14 - .4byte MauvilleCity_MapBorder - .4byte MauvilleCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - diff --git a/data/layouts/MauvilleCity_BikeShop/layout.inc b/data/layouts/MauvilleCity_BikeShop/layout.inc deleted file mode 100644 index f0d358a354..0000000000 --- a/data/layouts/MauvilleCity_BikeShop/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_BikeShop_MapBorder:: - .incbin "data/layouts/MauvilleCity_BikeShop/border.bin" - -MauvilleCity_BikeShop_MapBlockdata:: - .incbin "data/layouts/MauvilleCity_BikeShop/map.bin" - - .align 2 -MauvilleCity_BikeShop_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte MauvilleCity_BikeShop_MapBorder - .4byte MauvilleCity_BikeShop_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BikeShop - diff --git a/data/layouts/MauvilleCity_GameCorner/layout.inc b/data/layouts/MauvilleCity_GameCorner/layout.inc deleted file mode 100644 index 307f7205e7..0000000000 --- a/data/layouts/MauvilleCity_GameCorner/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_GameCorner_MapBorder:: - .incbin "data/layouts/MauvilleCity_GameCorner/border.bin" - -MauvilleCity_GameCorner_MapBlockdata:: - .incbin "data/layouts/MauvilleCity_GameCorner/map.bin" - - .align 2 -MauvilleCity_GameCorner_Layout:: - .4byte 0x16 - .4byte 0xb - .4byte MauvilleCity_GameCorner_MapBorder - .4byte MauvilleCity_GameCorner_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MauvilleGameCorner - diff --git a/data/layouts/MauvilleCity_Gym/layout.inc b/data/layouts/MauvilleCity_Gym/layout.inc deleted file mode 100644 index 290fca78e0..0000000000 --- a/data/layouts/MauvilleCity_Gym/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_Gym_MapBorder:: - .incbin "data/layouts/MauvilleCity_Gym/border.bin" - -MauvilleCity_Gym_MapBlockdata:: - .incbin "data/layouts/MauvilleCity_Gym/map.bin" - - .align 2 -MauvilleCity_Gym_Layout:: - .4byte 0xa - .4byte 0x15 - .4byte MauvilleCity_Gym_MapBorder - .4byte MauvilleCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MauvilleGym - diff --git a/data/layouts/MeteorFalls_1F_1R/layout.inc b/data/layouts/MeteorFalls_1F_1R/layout.inc deleted file mode 100644 index ba7a0e487b..0000000000 --- a/data/layouts/MeteorFalls_1F_1R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_1F_1R_MapBorder:: - .incbin "data/layouts/MeteorFalls_1F_1R/border.bin" - -MeteorFalls_1F_1R_MapBlockdata:: - .incbin "data/layouts/MeteorFalls_1F_1R/map.bin" - - .align 2 -MeteorFalls_1F_1R_Layout:: - .4byte 0x1e - .4byte 0x2a - .4byte MeteorFalls_1F_1R_MapBorder - .4byte MeteorFalls_1F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - diff --git a/data/layouts/MeteorFalls_1F_2R/layout.inc b/data/layouts/MeteorFalls_1F_2R/layout.inc deleted file mode 100644 index 2e3fcaf2e1..0000000000 --- a/data/layouts/MeteorFalls_1F_2R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_1F_2R_MapBorder:: - .incbin "data/layouts/MeteorFalls_1F_2R/border.bin" - -MeteorFalls_1F_2R_MapBlockdata:: - .incbin "data/layouts/MeteorFalls_1F_2R/map.bin" - - .align 2 -MeteorFalls_1F_2R_Layout:: - .4byte 0x1e - .4byte 0x20 - .4byte MeteorFalls_1F_2R_MapBorder - .4byte MeteorFalls_1F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - diff --git a/data/layouts/MeteorFalls_B1F_1R/layout.inc b/data/layouts/MeteorFalls_B1F_1R/layout.inc deleted file mode 100644 index a4f385d8f4..0000000000 --- a/data/layouts/MeteorFalls_B1F_1R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_B1F_1R_MapBorder:: - .incbin "data/layouts/MeteorFalls_B1F_1R/border.bin" - -MeteorFalls_B1F_1R_MapBlockdata:: - .incbin "data/layouts/MeteorFalls_B1F_1R/map.bin" - - .align 2 -MeteorFalls_B1F_1R_Layout:: - .4byte 0x1d - .4byte 0x26 - .4byte MeteorFalls_B1F_1R_MapBorder - .4byte MeteorFalls_B1F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - diff --git a/data/layouts/MeteorFalls_B1F_2R/layout.inc b/data/layouts/MeteorFalls_B1F_2R/layout.inc deleted file mode 100644 index 982edc975e..0000000000 --- a/data/layouts/MeteorFalls_B1F_2R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_B1F_2R_MapBorder:: - .incbin "data/layouts/MeteorFalls_B1F_2R/border.bin" - -MeteorFalls_B1F_2R_MapBlockdata:: - .incbin "data/layouts/MeteorFalls_B1F_2R/map.bin" - - .align 2 -MeteorFalls_B1F_2R_Layout:: - .4byte 0xb - .4byte 0x12 - .4byte MeteorFalls_B1F_2R_MapBorder - .4byte MeteorFalls_B1F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - diff --git a/data/layouts/MeteorFalls_StevensCave/layout.inc b/data/layouts/MeteorFalls_StevensCave/layout.inc deleted file mode 100644 index 1baf70a097..0000000000 --- a/data/layouts/MeteorFalls_StevensCave/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_StevensCave_MapBorder:: - .incbin "data/layouts/MeteorFalls_StevensCave/border.bin" - -MeteorFalls_StevensCave_MapBlockdata:: - .incbin "data/layouts/MeteorFalls_StevensCave/map.bin" - - .align 2 -MeteorFalls_StevensCave_Layout:: - .4byte 0x1e - .4byte 0x20 - .4byte MeteorFalls_StevensCave_MapBorder - .4byte MeteorFalls_StevensCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - diff --git a/data/layouts/MirageTower_1F/layout.inc b/data/layouts/MirageTower_1F/layout.inc deleted file mode 100644 index be36cc758b..0000000000 --- a/data/layouts/MirageTower_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_1F_MapBorder:: - .incbin "data/layouts/MirageTower_1F/border.bin" - -MirageTower_1F_MapBlockdata:: - .incbin "data/layouts/MirageTower_1F/map.bin" - - .align 2 -MirageTower_1F_Layout:: - .4byte 0x15 - .4byte 0x11 - .4byte MirageTower_1F_MapBorder - .4byte MirageTower_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MirageTower - diff --git a/data/layouts/MirageTower_2F/layout.inc b/data/layouts/MirageTower_2F/layout.inc deleted file mode 100644 index ec4971bc41..0000000000 --- a/data/layouts/MirageTower_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_2F_MapBorder:: - .incbin "data/layouts/MirageTower_2F/border.bin" - -MirageTower_2F_MapBlockdata:: - .incbin "data/layouts/MirageTower_2F/map.bin" - - .align 2 -MirageTower_2F_Layout:: - .4byte 0x15 - .4byte 0x11 - .4byte MirageTower_2F_MapBorder - .4byte MirageTower_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MirageTower - diff --git a/data/layouts/MirageTower_3F/layout.inc b/data/layouts/MirageTower_3F/layout.inc deleted file mode 100644 index c12de3a150..0000000000 --- a/data/layouts/MirageTower_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_3F_MapBorder:: - .incbin "data/layouts/MirageTower_3F/border.bin" - -MirageTower_3F_MapBlockdata:: - .incbin "data/layouts/MirageTower_3F/map.bin" - - .align 2 -MirageTower_3F_Layout:: - .4byte 0x15 - .4byte 0x11 - .4byte MirageTower_3F_MapBorder - .4byte MirageTower_3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MirageTower - diff --git a/data/layouts/MirageTower_4F/layout.inc b/data/layouts/MirageTower_4F/layout.inc deleted file mode 100644 index 518f7c9435..0000000000 --- a/data/layouts/MirageTower_4F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_4F_MapBorder:: - .incbin "data/layouts/MirageTower_4F/border.bin" - -MirageTower_4F_MapBlockdata:: - .incbin "data/layouts/MirageTower_4F/map.bin" - - .align 2 -MirageTower_4F_Layout:: - .4byte 0xd - .4byte 0xa - .4byte MirageTower_4F_MapBorder - .4byte MirageTower_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MirageTower - diff --git a/data/layouts/MossdeepCity/layout.inc b/data/layouts/MossdeepCity/layout.inc deleted file mode 100644 index 881cf9498d..0000000000 --- a/data/layouts/MossdeepCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_MapBorder:: - .incbin "data/layouts/MossdeepCity/border.bin" - -MossdeepCity_MapBlockdata:: - .incbin "data/layouts/MossdeepCity/map.bin" - - .align 2 -MossdeepCity_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte MossdeepCity_MapBorder - .4byte MossdeepCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - diff --git a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc deleted file mode 100644 index 2c2fb717da..0000000000 --- a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_GameCorner_1F_MapBorder:: - .incbin "data/layouts/MossdeepCity_GameCorner_1F/border.bin" - -MossdeepCity_GameCorner_1F_MapBlockdata:: - .incbin "data/layouts/MossdeepCity_GameCorner_1F/map.bin" - - .align 2 -MossdeepCity_GameCorner_1F_Layout:: - .4byte 0xc - .4byte 0xa - .4byte MossdeepCity_GameCorner_1F_MapBorder - .4byte MossdeepCity_GameCorner_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MossdeepGameCorner - diff --git a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc deleted file mode 100644 index ec5dd2a574..0000000000 --- a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_GameCorner_B1F_MapBorder:: - .incbin "data/layouts/MossdeepCity_GameCorner_B1F/border.bin" - -MossdeepCity_GameCorner_B1F_MapBlockdata:: - .incbin "data/layouts/MossdeepCity_GameCorner_B1F/map.bin" - - .align 2 -MossdeepCity_GameCorner_B1F_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte MossdeepCity_GameCorner_B1F_MapBorder - .4byte MossdeepCity_GameCorner_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/MossdeepCity_Gym/layout.inc b/data/layouts/MossdeepCity_Gym/layout.inc deleted file mode 100644 index a65212a40c..0000000000 --- a/data/layouts/MossdeepCity_Gym/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_Gym_MapBorder:: - .incbin "data/layouts/MossdeepCity_Gym/border.bin" - -MossdeepCity_Gym_MapBlockdata:: - .incbin "data/layouts/MossdeepCity_Gym/map.bin" - - .align 2 -MossdeepCity_Gym_Layout:: - .4byte 0x1a - .4byte 0x24 - .4byte MossdeepCity_Gym_MapBorder - .4byte MossdeepCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MossdeepGym - diff --git a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc deleted file mode 100644 index 759e688912..0000000000 --- a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_SpaceCenter_1F_MapBorder:: - .incbin "data/layouts/MossdeepCity_SpaceCenter_1F/border.bin" - -MossdeepCity_SpaceCenter_1F_MapBlockdata:: - .incbin "data/layouts/MossdeepCity_SpaceCenter_1F/map.bin" - - .align 2 -MossdeepCity_SpaceCenter_1F_Layout:: - .4byte 0x10 - .4byte 0xa - .4byte MossdeepCity_SpaceCenter_1F_MapBorder - .4byte MossdeepCity_SpaceCenter_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc deleted file mode 100644 index 6e370a7fac..0000000000 --- a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_SpaceCenter_2F_MapBorder:: - .incbin "data/layouts/MossdeepCity_SpaceCenter_2F/border.bin" - -MossdeepCity_SpaceCenter_2F_MapBlockdata:: - .incbin "data/layouts/MossdeepCity_SpaceCenter_2F/map.bin" - - .align 2 -MossdeepCity_SpaceCenter_2F_Layout:: - .4byte 0x10 - .4byte 0xa - .4byte MossdeepCity_SpaceCenter_2F_MapBorder - .4byte MossdeepCity_SpaceCenter_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/MossdeepCity_StevensHouse/layout.inc b/data/layouts/MossdeepCity_StevensHouse/layout.inc deleted file mode 100644 index 0db92aee9f..0000000000 --- a/data/layouts/MossdeepCity_StevensHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_StevensHouse_MapBorder:: - .incbin "data/layouts/MossdeepCity_StevensHouse/border.bin" - -MossdeepCity_StevensHouse_MapBlockdata:: - .incbin "data/layouts/MossdeepCity_StevensHouse/map.bin" - - .align 2 -MossdeepCity_StevensHouse_Layout:: - .4byte 0xb - .4byte 0x8 - .4byte MossdeepCity_StevensHouse_MapBorder - .4byte MossdeepCity_StevensHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/MtChimney/layout.inc b/data/layouts/MtChimney/layout.inc deleted file mode 100644 index 29a3b1ad7e..0000000000 --- a/data/layouts/MtChimney/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtChimney_MapBorder:: - .incbin "data/layouts/MtChimney/border.bin" - -MtChimney_MapBlockdata:: - .incbin "data/layouts/MtChimney/map.bin" - - .align 2 -MtChimney_Layout:: - .4byte 0x28 - .4byte 0x2f - .4byte MtChimney_MapBorder - .4byte MtChimney_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/MtPyre_1F/layout.inc b/data/layouts/MtPyre_1F/layout.inc deleted file mode 100644 index 2402e815c4..0000000000 --- a/data/layouts/MtPyre_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_1F_MapBorder:: - .incbin "data/layouts/MtPyre_1F/border.bin" - -MtPyre_1F_MapBlockdata:: - .incbin "data/layouts/MtPyre_1F/map.bin" - - .align 2 -MtPyre_1F_Layout:: - .4byte 0x16 - .4byte 0x13 - .4byte MtPyre_1F_MapBorder - .4byte MtPyre_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/MtPyre_2F/layout.inc b/data/layouts/MtPyre_2F/layout.inc deleted file mode 100644 index 8d6ca12003..0000000000 --- a/data/layouts/MtPyre_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_2F_MapBorder:: - .incbin "data/layouts/MtPyre_2F/border.bin" - -MtPyre_2F_MapBlockdata:: - .incbin "data/layouts/MtPyre_2F/map.bin" - - .align 2 -MtPyre_2F_Layout:: - .4byte 0xd - .4byte 0xd - .4byte MtPyre_2F_MapBorder - .4byte MtPyre_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/MtPyre_3F/layout.inc b/data/layouts/MtPyre_3F/layout.inc deleted file mode 100644 index 24ed0f7b12..0000000000 --- a/data/layouts/MtPyre_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_3F_MapBorder:: - .incbin "data/layouts/MtPyre_3F/border.bin" - -MtPyre_3F_MapBlockdata:: - .incbin "data/layouts/MtPyre_3F/map.bin" - - .align 2 -MtPyre_3F_Layout:: - .4byte 0xd - .4byte 0xd - .4byte MtPyre_3F_MapBorder - .4byte MtPyre_3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/MtPyre_4F/layout.inc b/data/layouts/MtPyre_4F/layout.inc deleted file mode 100644 index 65a8fcf598..0000000000 --- a/data/layouts/MtPyre_4F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_4F_MapBorder:: - .incbin "data/layouts/MtPyre_4F/border.bin" - -MtPyre_4F_MapBlockdata:: - .incbin "data/layouts/MtPyre_4F/map.bin" - - .align 2 -MtPyre_4F_Layout:: - .4byte 0xd - .4byte 0xd - .4byte MtPyre_4F_MapBorder - .4byte MtPyre_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/MtPyre_5F/layout.inc b/data/layouts/MtPyre_5F/layout.inc deleted file mode 100644 index 222c6eb804..0000000000 --- a/data/layouts/MtPyre_5F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_5F_MapBorder:: - .incbin "data/layouts/MtPyre_5F/border.bin" - -MtPyre_5F_MapBlockdata:: - .incbin "data/layouts/MtPyre_5F/map.bin" - - .align 2 -MtPyre_5F_Layout:: - .4byte 0xd - .4byte 0xd - .4byte MtPyre_5F_MapBorder - .4byte MtPyre_5F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/MtPyre_6F/layout.inc b/data/layouts/MtPyre_6F/layout.inc deleted file mode 100644 index 31b5288d5b..0000000000 --- a/data/layouts/MtPyre_6F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_6F_MapBorder:: - .incbin "data/layouts/MtPyre_6F/border.bin" - -MtPyre_6F_MapBlockdata:: - .incbin "data/layouts/MtPyre_6F/map.bin" - - .align 2 -MtPyre_6F_Layout:: - .4byte 0xd - .4byte 0xd - .4byte MtPyre_6F_MapBorder - .4byte MtPyre_6F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/MtPyre_Exterior/layout.inc b/data/layouts/MtPyre_Exterior/layout.inc deleted file mode 100644 index 1b5997dbae..0000000000 --- a/data/layouts/MtPyre_Exterior/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_Exterior_MapBorder:: - .incbin "data/layouts/MtPyre_Exterior/border.bin" - -MtPyre_Exterior_MapBlockdata:: - .incbin "data/layouts/MtPyre_Exterior/map.bin" - - .align 2 -MtPyre_Exterior_Layout:: - .4byte 0x26 - .4byte 0x33 - .4byte MtPyre_Exterior_MapBorder - .4byte MtPyre_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/MtPyre_Summit/layout.inc b/data/layouts/MtPyre_Summit/layout.inc deleted file mode 100644 index 58e932eb7a..0000000000 --- a/data/layouts/MtPyre_Summit/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_Summit_MapBorder:: - .incbin "data/layouts/MtPyre_Summit/border.bin" - -MtPyre_Summit_MapBlockdata:: - .incbin "data/layouts/MtPyre_Summit/map.bin" - - .align 2 -MtPyre_Summit_Layout:: - .4byte 0x32 - .4byte 0x25 - .4byte MtPyre_Summit_MapBorder - .4byte MtPyre_Summit_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/NavelRock_B1F/layout.inc b/data/layouts/NavelRock_B1F/layout.inc deleted file mode 100644 index 6f15bd2766..0000000000 --- a/data/layouts/NavelRock_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_B1F_MapBorder:: - .incbin "data/layouts/NavelRock_B1F/border.bin" - -NavelRock_B1F_MapBlockdata:: - .incbin "data/layouts/NavelRock_B1F/map.bin" - - .align 2 -NavelRock_B1F_Layout:: - .4byte 0x17 - .4byte 0xb - .4byte NavelRock_B1F_MapBorder - .4byte NavelRock_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - diff --git a/data/layouts/NavelRock_Bottom/layout.inc b/data/layouts/NavelRock_Bottom/layout.inc deleted file mode 100644 index 5c96a8cef2..0000000000 --- a/data/layouts/NavelRock_Bottom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Bottom_MapBorder:: - .incbin "data/layouts/NavelRock_Bottom/border.bin" - -NavelRock_Bottom_MapBlockdata:: - .incbin "data/layouts/NavelRock_Bottom/map.bin" - - .align 2 -NavelRock_Bottom_Layout:: - .4byte 0x16 - .4byte 0x16 - .4byte NavelRock_Bottom_MapBorder - .4byte NavelRock_Bottom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - diff --git a/data/layouts/NavelRock_Entrance/layout.inc b/data/layouts/NavelRock_Entrance/layout.inc deleted file mode 100644 index 6dcedcb208..0000000000 --- a/data/layouts/NavelRock_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Entrance_MapBorder:: - .incbin "data/layouts/NavelRock_Entrance/border.bin" - -NavelRock_Entrance_MapBlockdata:: - .incbin "data/layouts/NavelRock_Entrance/map.bin" - - .align 2 -NavelRock_Entrance_Layout:: - .4byte 0x15 - .4byte 0x20 - .4byte NavelRock_Entrance_MapBorder - .4byte NavelRock_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - diff --git a/data/layouts/NavelRock_Exterior/layout.inc b/data/layouts/NavelRock_Exterior/layout.inc deleted file mode 100644 index c2c4fa95e5..0000000000 --- a/data/layouts/NavelRock_Exterior/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Exterior_MapBorder:: - .incbin "data/layouts/NavelRock_Exterior/border.bin" - -NavelRock_Exterior_MapBlockdata:: - .incbin "data/layouts/NavelRock_Exterior/map.bin" - - .align 2 -NavelRock_Exterior_Layout:: - .4byte 0x15 - .4byte 0x18 - .4byte NavelRock_Exterior_MapBorder - .4byte NavelRock_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - diff --git a/data/layouts/NavelRock_Fork/layout.inc b/data/layouts/NavelRock_Fork/layout.inc deleted file mode 100644 index ab5d9c8673..0000000000 --- a/data/layouts/NavelRock_Fork/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Fork_MapBorder:: - .incbin "data/layouts/NavelRock_Fork/border.bin" - -NavelRock_Fork_MapBlockdata:: - .incbin "data/layouts/NavelRock_Fork/map.bin" - - .align 2 -NavelRock_Fork_Layout:: - .4byte 0x1b - .4byte 0x56 - .4byte NavelRock_Fork_MapBorder - .4byte NavelRock_Fork_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - diff --git a/data/layouts/NavelRock_LadderRoom1/layout.inc b/data/layouts/NavelRock_LadderRoom1/layout.inc deleted file mode 100644 index a7fc73d220..0000000000 --- a/data/layouts/NavelRock_LadderRoom1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_LadderRoom1_MapBorder:: - .incbin "data/layouts/NavelRock_LadderRoom1/border.bin" - -NavelRock_LadderRoom1_MapBlockdata:: - .incbin "data/layouts/NavelRock_LadderRoom1/map.bin" - - .align 2 -NavelRock_LadderRoom1_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte NavelRock_LadderRoom1_MapBorder - .4byte NavelRock_LadderRoom1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - diff --git a/data/layouts/NavelRock_LadderRoom2/layout.inc b/data/layouts/NavelRock_LadderRoom2/layout.inc deleted file mode 100644 index 8fbd6e51ff..0000000000 --- a/data/layouts/NavelRock_LadderRoom2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_LadderRoom2_MapBorder:: - .incbin "data/layouts/NavelRock_LadderRoom2/border.bin" - -NavelRock_LadderRoom2_MapBlockdata:: - .incbin "data/layouts/NavelRock_LadderRoom2/map.bin" - - .align 2 -NavelRock_LadderRoom2_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte NavelRock_LadderRoom2_MapBorder - .4byte NavelRock_LadderRoom2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - diff --git a/data/layouts/NavelRock_Top/layout.inc b/data/layouts/NavelRock_Top/layout.inc deleted file mode 100644 index 50698cc768..0000000000 --- a/data/layouts/NavelRock_Top/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Top_MapBorder:: - .incbin "data/layouts/NavelRock_Top/border.bin" - -NavelRock_Top_MapBlockdata:: - .incbin "data/layouts/NavelRock_Top/map.bin" - - .align 2 -NavelRock_Top_Layout:: - .4byte 0x19 - .4byte 0x1c - .4byte NavelRock_Top_MapBorder - .4byte NavelRock_Top_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - diff --git a/data/layouts/NewMauville_Entrance/layout.inc b/data/layouts/NewMauville_Entrance/layout.inc deleted file mode 100644 index bbd81cac7d..0000000000 --- a/data/layouts/NewMauville_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NewMauville_Entrance_MapBorder:: - .incbin "data/layouts/NewMauville_Entrance/border.bin" - -NewMauville_Entrance_MapBlockdata:: - .incbin "data/layouts/NewMauville_Entrance/map.bin" - - .align 2 -NewMauville_Entrance_Layout:: - .4byte 0x9 - .4byte 0x9 - .4byte NewMauville_Entrance_MapBorder - .4byte NewMauville_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/NewMauville_Inside/layout.inc b/data/layouts/NewMauville_Inside/layout.inc deleted file mode 100644 index 096142c6de..0000000000 --- a/data/layouts/NewMauville_Inside/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NewMauville_Inside_MapBorder:: - .incbin "data/layouts/NewMauville_Inside/border.bin" - -NewMauville_Inside_MapBlockdata:: - .incbin "data/layouts/NewMauville_Inside/map.bin" - - .align 2 -NewMauville_Inside_Layout:: - .4byte 0x29 - .4byte 0x29 - .4byte NewMauville_Inside_MapBorder - .4byte NewMauville_Inside_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BikeShop - diff --git a/data/layouts/OldaleTown/layout.inc b/data/layouts/OldaleTown/layout.inc deleted file mode 100644 index 9709ca1ea0..0000000000 --- a/data/layouts/OldaleTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown_MapBorder:: - .incbin "data/layouts/OldaleTown/border.bin" - -OldaleTown_MapBlockdata:: - .incbin "data/layouts/OldaleTown/map.bin" - - .align 2 -OldaleTown_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte OldaleTown_MapBorder - .4byte OldaleTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - diff --git a/data/layouts/PacifidlogTown/layout.inc b/data/layouts/PacifidlogTown/layout.inc deleted file mode 100644 index 4ba791f231..0000000000 --- a/data/layouts/PacifidlogTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_MapBorder:: - .incbin "data/layouts/PacifidlogTown/border.bin" - -PacifidlogTown_MapBlockdata:: - .incbin "data/layouts/PacifidlogTown/map.bin" - - .align 2 -PacifidlogTown_Layout:: - .4byte 0x14 - .4byte 0x28 - .4byte PacifidlogTown_MapBorder - .4byte PacifidlogTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/PacifidlogTown_House1/layout.inc b/data/layouts/PacifidlogTown_House1/layout.inc deleted file mode 100644 index b5dcf58b23..0000000000 --- a/data/layouts/PacifidlogTown_House1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House1_MapBorder:: - .incbin "data/layouts/PacifidlogTown_House1/border.bin" - -PacifidlogTown_House1_MapBlockdata:: - .incbin "data/layouts/PacifidlogTown_House1/map.bin" - - .align 2 -PacifidlogTown_House1_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte PacifidlogTown_House1_MapBorder - .4byte PacifidlogTown_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/PacifidlogTown_House2/layout.inc b/data/layouts/PacifidlogTown_House2/layout.inc deleted file mode 100644 index a10daa3cd6..0000000000 --- a/data/layouts/PacifidlogTown_House2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House2_MapBorder:: - .incbin "data/layouts/PacifidlogTown_House2/border.bin" - -PacifidlogTown_House2_MapBlockdata:: - .incbin "data/layouts/PacifidlogTown_House2/map.bin" - - .align 2 -PacifidlogTown_House2_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte PacifidlogTown_House2_MapBorder - .4byte PacifidlogTown_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/PetalburgCity/layout.inc b/data/layouts/PetalburgCity/layout.inc deleted file mode 100644 index bae16b88f3..0000000000 --- a/data/layouts/PetalburgCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_MapBorder:: - .incbin "data/layouts/PetalburgCity/border.bin" - -PetalburgCity_MapBlockdata:: - .incbin "data/layouts/PetalburgCity/map.bin" - - .align 2 -PetalburgCity_Layout:: - .4byte 0x1e - .4byte 0x1e - .4byte PetalburgCity_MapBorder - .4byte PetalburgCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - diff --git a/data/layouts/PetalburgCity_Gym/layout.inc b/data/layouts/PetalburgCity_Gym/layout.inc deleted file mode 100644 index 36fe1002ff..0000000000 --- a/data/layouts/PetalburgCity_Gym/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_Gym_MapBorder:: - .incbin "data/layouts/PetalburgCity_Gym/border.bin" - -PetalburgCity_Gym_MapBlockdata:: - .incbin "data/layouts/PetalburgCity_Gym/map.bin" - - .align 2 -PetalburgCity_Gym_Layout:: - .4byte 0x9 - .4byte 0x70 - .4byte PetalburgCity_Gym_MapBorder - .4byte PetalburgCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PetalburgGym - diff --git a/data/layouts/PetalburgWoods/layout.inc b/data/layouts/PetalburgWoods/layout.inc deleted file mode 100644 index 840e17f7e8..0000000000 --- a/data/layouts/PetalburgWoods/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgWoods_MapBorder:: - .incbin "data/layouts/PetalburgWoods/border.bin" - -PetalburgWoods_MapBlockdata:: - .incbin "data/layouts/PetalburgWoods/map.bin" - - .align 2 -PetalburgWoods_Layout:: - .4byte 0x30 - .4byte 0x2c - .4byte PetalburgWoods_MapBorder - .4byte PetalburgWoods_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - diff --git a/data/layouts/PokemonCenter_1F/layout.inc b/data/layouts/PokemonCenter_1F/layout.inc deleted file mode 100644 index bf1335f844..0000000000 --- a/data/layouts/PokemonCenter_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PokemonCenter_1F_MapBorder:: - .incbin "data/layouts/PokemonCenter_1F/border.bin" - -PokemonCenter_1F_MapBlockdata:: - .incbin "data/layouts/PokemonCenter_1F/map.bin" - - .align 2 -PokemonCenter_1F_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte PokemonCenter_1F_MapBorder - .4byte PokemonCenter_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - diff --git a/data/layouts/PokemonCenter_2F/layout.inc b/data/layouts/PokemonCenter_2F/layout.inc deleted file mode 100644 index 3cb812de77..0000000000 --- a/data/layouts/PokemonCenter_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PokemonCenter_2F_MapBorder:: - .incbin "data/layouts/PokemonCenter_2F/border.bin" - -PokemonCenter_2F_MapBlockdata:: - .incbin "data/layouts/PokemonCenter_2F/map.bin" - - .align 2 -PokemonCenter_2F_Layout:: - .4byte 0xe - .4byte 0xa - .4byte PokemonCenter_2F_MapBorder - .4byte PokemonCenter_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - diff --git a/data/layouts/RecordCorner/layout.inc b/data/layouts/RecordCorner/layout.inc deleted file mode 100644 index ed258b2a7f..0000000000 --- a/data/layouts/RecordCorner/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RecordCorner_MapBorder:: - .incbin "data/layouts/RecordCorner/border.bin" - -RecordCorner_MapBlockdata:: - .incbin "data/layouts/RecordCorner/map.bin" - - .align 2 -RecordCorner_Layout:: - .4byte 0x14 - .4byte 0xa - .4byte RecordCorner_MapBorder - .4byte RecordCorner_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - diff --git a/data/layouts/Route101/layout.inc b/data/layouts/Route101/layout.inc deleted file mode 100644 index e42ecf340e..0000000000 --- a/data/layouts/Route101/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route101_MapBorder:: - .incbin "data/layouts/Route101/border.bin" - -Route101_MapBlockdata:: - .incbin "data/layouts/Route101/map.bin" - - .align 2 -Route101_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte Route101_MapBorder - .4byte Route101_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - diff --git a/data/layouts/Route102/layout.inc b/data/layouts/Route102/layout.inc deleted file mode 100644 index 194d44fce7..0000000000 --- a/data/layouts/Route102/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route102_MapBorder:: - .incbin "data/layouts/Route102/border.bin" - -Route102_MapBlockdata:: - .incbin "data/layouts/Route102/map.bin" - - .align 2 -Route102_Layout:: - .4byte 0x32 - .4byte 0x14 - .4byte Route102_MapBorder - .4byte Route102_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - diff --git a/data/layouts/Route103/layout.inc b/data/layouts/Route103/layout.inc deleted file mode 100644 index fe3bac0668..0000000000 --- a/data/layouts/Route103/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route103_MapBorder:: - .incbin "data/layouts/Route103/border.bin" - -Route103_MapBlockdata:: - .incbin "data/layouts/Route103/map.bin" - - .align 2 -Route103_Layout:: - .4byte 0x50 - .4byte 0x16 - .4byte Route103_MapBorder - .4byte Route103_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - diff --git a/data/layouts/Route104/layout.inc b/data/layouts/Route104/layout.inc deleted file mode 100644 index 9a9418e461..0000000000 --- a/data/layouts/Route104/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_MapBorder:: - .incbin "data/layouts/Route104/border.bin" - -Route104_MapBlockdata:: - .incbin "data/layouts/Route104/map.bin" - - .align 2 -Route104_Layout:: - .4byte 0x28 - .4byte 0x50 - .4byte Route104_MapBorder - .4byte Route104_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - diff --git a/data/layouts/Route104_MrBrineysHouse/layout.inc b/data/layouts/Route104_MrBrineysHouse/layout.inc deleted file mode 100644 index 3474f33351..0000000000 --- a/data/layouts/Route104_MrBrineysHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_MrBrineysHouse_MapBorder:: - .incbin "data/layouts/Route104_MrBrineysHouse/border.bin" - -Route104_MrBrineysHouse_MapBlockdata:: - .incbin "data/layouts/Route104_MrBrineysHouse/map.bin" - - .align 2 -Route104_MrBrineysHouse_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte Route104_MrBrineysHouse_MapBorder - .4byte Route104_MrBrineysHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc deleted file mode 100644 index a46ffc18c8..0000000000 --- a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_PrettyPetalFlowerShop_MapBorder:: - .incbin "data/layouts/Route104_PrettyPetalFlowerShop/border.bin" - -Route104_PrettyPetalFlowerShop_MapBlockdata:: - .incbin "data/layouts/Route104_PrettyPetalFlowerShop/map.bin" - - .align 2 -Route104_PrettyPetalFlowerShop_Layout:: - .4byte 0xf - .4byte 0x9 - .4byte Route104_PrettyPetalFlowerShop_MapBorder - .4byte Route104_PrettyPetalFlowerShop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PrettyPetalFlowerShop - diff --git a/data/layouts/Route104_Prototype/layout.inc b/data/layouts/Route104_Prototype/layout.inc deleted file mode 100644 index b2b2c4f194..0000000000 --- a/data/layouts/Route104_Prototype/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_Prototype_MapBorder:: - .incbin "data/layouts/Route104_Prototype/border.bin" - -Route104_Prototype_MapBlockdata:: - .incbin "data/layouts/Route104_Prototype/map.bin" - - .align 2 -Route104_Prototype_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte Route104_Prototype_MapBorder - .4byte Route104_Prototype_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - diff --git a/data/layouts/Route105/layout.inc b/data/layouts/Route105/layout.inc deleted file mode 100644 index ce78ef9cc2..0000000000 --- a/data/layouts/Route105/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route105_MapBorder:: - .incbin "data/layouts/Route105/border.bin" - -Route105_MapBlockdata:: - .incbin "data/layouts/Route105/map.bin" - - .align 2 -Route105_Layout:: - .4byte 0x28 - .4byte 0x50 - .4byte Route105_MapBorder - .4byte Route105_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - diff --git a/data/layouts/Route106/layout.inc b/data/layouts/Route106/layout.inc deleted file mode 100644 index ea255b383b..0000000000 --- a/data/layouts/Route106/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route106_MapBorder:: - .incbin "data/layouts/Route106/border.bin" - -Route106_MapBlockdata:: - .incbin "data/layouts/Route106/map.bin" - - .align 2 -Route106_Layout:: - .4byte 0x50 - .4byte 0x14 - .4byte Route106_MapBorder - .4byte Route106_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - diff --git a/data/layouts/Route107/layout.inc b/data/layouts/Route107/layout.inc deleted file mode 100644 index ea305b2a76..0000000000 --- a/data/layouts/Route107/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route107_MapBorder:: - .incbin "data/layouts/Route107/border.bin" - -Route107_MapBlockdata:: - .incbin "data/layouts/Route107/map.bin" - - .align 2 -Route107_Layout:: - .4byte 0x3c - .4byte 0x14 - .4byte Route107_MapBorder - .4byte Route107_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - diff --git a/data/layouts/Route108/layout.inc b/data/layouts/Route108/layout.inc deleted file mode 100644 index 1ec7171cf0..0000000000 --- a/data/layouts/Route108/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route108_MapBorder:: - .incbin "data/layouts/Route108/border.bin" - -Route108_MapBlockdata:: - .incbin "data/layouts/Route108/map.bin" - - .align 2 -Route108_Layout:: - .4byte 0x3c - .4byte 0x14 - .4byte Route108_MapBorder - .4byte Route108_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Slateport - diff --git a/data/layouts/Route109/layout.inc b/data/layouts/Route109/layout.inc deleted file mode 100644 index fa41585e93..0000000000 --- a/data/layouts/Route109/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route109_MapBorder:: - .incbin "data/layouts/Route109/border.bin" - -Route109_MapBlockdata:: - .incbin "data/layouts/Route109/map.bin" - - .align 2 -Route109_Layout:: - .4byte 0x28 - .4byte 0x3f - .4byte Route109_MapBorder - .4byte Route109_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Slateport - diff --git a/data/layouts/Route109_SeashoreHouse/layout.inc b/data/layouts/Route109_SeashoreHouse/layout.inc deleted file mode 100644 index 9ec997b484..0000000000 --- a/data/layouts/Route109_SeashoreHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route109_SeashoreHouse_MapBorder:: - .incbin "data/layouts/Route109_SeashoreHouse/border.bin" - -Route109_SeashoreHouse_MapBlockdata:: - .incbin "data/layouts/Route109_SeashoreHouse/map.bin" - - .align 2 -Route109_SeashoreHouse_Layout:: - .4byte 0xf - .4byte 0xa - .4byte Route109_SeashoreHouse_MapBorder - .4byte Route109_SeashoreHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_SeashoreHouse - diff --git a/data/layouts/Route110/layout.inc b/data/layouts/Route110/layout.inc deleted file mode 100644 index 24e5a93210..0000000000 --- a/data/layouts/Route110/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_MapBorder:: - .incbin "data/layouts/Route110/border.bin" - -Route110_MapBlockdata:: - .incbin "data/layouts/Route110/map.bin" - - .align 2 -Route110_Layout:: - .4byte 0x28 - .4byte 0x64 - .4byte Route110_MapBorder - .4byte Route110_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc b/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc deleted file mode 100644 index abf78f62dd..0000000000 --- a/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_SeasideCyclingRoadEntrance_MapBorder:: - .incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin" - -Route110_SeasideCyclingRoadEntrance_MapBlockdata:: - .incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin" - - .align 2 -Route110_SeasideCyclingRoadEntrance_Layout:: - .4byte 0xf - .4byte 0x6 - .4byte Route110_SeasideCyclingRoadEntrance_MapBorder - .4byte Route110_SeasideCyclingRoadEntrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/Route110_TrickHouseCorridor/layout.inc b/data/layouts/Route110_TrickHouseCorridor/layout.inc deleted file mode 100644 index fe6ee4d26b..0000000000 --- a/data/layouts/Route110_TrickHouseCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHouseCorridor_MapBorder:: - .incbin "data/layouts/Route110_TrickHouseCorridor/border.bin" - -Route110_TrickHouseCorridor_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHouseCorridor/map.bin" - - .align 2 -Route110_TrickHouseCorridor_Layout:: - .4byte 0xf - .4byte 0x18 - .4byte Route110_TrickHouseCorridor_MapBorder - .4byte Route110_TrickHouseCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/Route110_TrickHouseEnd/layout.inc b/data/layouts/Route110_TrickHouseEnd/layout.inc deleted file mode 100644 index dd9474aeef..0000000000 --- a/data/layouts/Route110_TrickHouseEnd/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHouseEnd_MapBorder:: - .incbin "data/layouts/Route110_TrickHouseEnd/border.bin" - -Route110_TrickHouseEnd_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHouseEnd/map.bin" - - .align 2 -Route110_TrickHouseEnd_Layout:: - .4byte 0xc - .4byte 0x8 - .4byte Route110_TrickHouseEnd_MapBorder - .4byte Route110_TrickHouseEnd_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/Route110_TrickHouseEntrance/layout.inc b/data/layouts/Route110_TrickHouseEntrance/layout.inc deleted file mode 100644 index 97f3abe24c..0000000000 --- a/data/layouts/Route110_TrickHouseEntrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHouseEntrance_MapBorder:: - .incbin "data/layouts/Route110_TrickHouseEntrance/border.bin" - -Route110_TrickHouseEntrance_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHouseEntrance/map.bin" - - .align 2 -Route110_TrickHouseEntrance_Layout:: - .4byte 0xc - .4byte 0x8 - .4byte Route110_TrickHouseEntrance_MapBorder - .4byte Route110_TrickHouseEntrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/Route110_TrickHousePuzzle1/layout.inc b/data/layouts/Route110_TrickHousePuzzle1/layout.inc deleted file mode 100644 index 546876ab00..0000000000 --- a/data/layouts/Route110_TrickHousePuzzle1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle1_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle1/border.bin" - -Route110_TrickHousePuzzle1_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle1/map.bin" - - .align 2 -Route110_TrickHousePuzzle1_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle1_MapBorder - .4byte Route110_TrickHousePuzzle1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - diff --git a/data/layouts/Route110_TrickHousePuzzle2/layout.inc b/data/layouts/Route110_TrickHousePuzzle2/layout.inc deleted file mode 100644 index 65caaa7341..0000000000 --- a/data/layouts/Route110_TrickHousePuzzle2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle2_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle2/border.bin" - -Route110_TrickHousePuzzle2_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle2/map.bin" - - .align 2 -Route110_TrickHousePuzzle2_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle2_MapBorder - .4byte Route110_TrickHousePuzzle2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - diff --git a/data/layouts/Route110_TrickHousePuzzle3/layout.inc b/data/layouts/Route110_TrickHousePuzzle3/layout.inc deleted file mode 100644 index a03cf9a719..0000000000 --- a/data/layouts/Route110_TrickHousePuzzle3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle3_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle3/border.bin" - -Route110_TrickHousePuzzle3_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle3/map.bin" - - .align 2 -Route110_TrickHousePuzzle3_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle3_MapBorder - .4byte Route110_TrickHousePuzzle3_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - diff --git a/data/layouts/Route110_TrickHousePuzzle4/layout.inc b/data/layouts/Route110_TrickHousePuzzle4/layout.inc deleted file mode 100644 index 581b41a43b..0000000000 --- a/data/layouts/Route110_TrickHousePuzzle4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle4_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle4/border.bin" - -Route110_TrickHousePuzzle4_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle4/map.bin" - - .align 2 -Route110_TrickHousePuzzle4_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle4_MapBorder - .4byte Route110_TrickHousePuzzle4_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - diff --git a/data/layouts/Route110_TrickHousePuzzle5/layout.inc b/data/layouts/Route110_TrickHousePuzzle5/layout.inc deleted file mode 100644 index 5e06ac31e4..0000000000 --- a/data/layouts/Route110_TrickHousePuzzle5/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle5_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle5/border.bin" - -Route110_TrickHousePuzzle5_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle5/map.bin" - - .align 2 -Route110_TrickHousePuzzle5_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle5_MapBorder - .4byte Route110_TrickHousePuzzle5_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - diff --git a/data/layouts/Route110_TrickHousePuzzle6/layout.inc b/data/layouts/Route110_TrickHousePuzzle6/layout.inc deleted file mode 100644 index 398c179516..0000000000 --- a/data/layouts/Route110_TrickHousePuzzle6/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle6_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle6/border.bin" - -Route110_TrickHousePuzzle6_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle6/map.bin" - - .align 2 -Route110_TrickHousePuzzle6_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle6_MapBorder - .4byte Route110_TrickHousePuzzle6_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - diff --git a/data/layouts/Route110_TrickHousePuzzle7/layout.inc b/data/layouts/Route110_TrickHousePuzzle7/layout.inc deleted file mode 100644 index 1612ec41b5..0000000000 --- a/data/layouts/Route110_TrickHousePuzzle7/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle7_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle7/border.bin" - -Route110_TrickHousePuzzle7_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle7/map.bin" - - .align 2 -Route110_TrickHousePuzzle7_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle7_MapBorder - .4byte Route110_TrickHousePuzzle7_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - diff --git a/data/layouts/Route110_TrickHousePuzzle8/layout.inc b/data/layouts/Route110_TrickHousePuzzle8/layout.inc deleted file mode 100644 index 3520b503f7..0000000000 --- a/data/layouts/Route110_TrickHousePuzzle8/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle8_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle8/border.bin" - -Route110_TrickHousePuzzle8_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle8/map.bin" - - .align 2 -Route110_TrickHousePuzzle8_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle8_MapBorder - .4byte Route110_TrickHousePuzzle8_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - diff --git a/data/layouts/Route111/layout.inc b/data/layouts/Route111/layout.inc deleted file mode 100644 index 2966c06c54..0000000000 --- a/data/layouts/Route111/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route111_MapBorder:: - .incbin "data/layouts/Route111/border.bin" - -Route111_MapBlockdata:: - .incbin "data/layouts/Route111/map.bin" - - .align 2 -Route111_Layout:: - .4byte 0x28 - .4byte 0x8c - .4byte Route111_MapBorder - .4byte Route111_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - diff --git a/data/layouts/Route111_NoMirageTower/layout.inc b/data/layouts/Route111_NoMirageTower/layout.inc deleted file mode 100644 index bf6a188ccf..0000000000 --- a/data/layouts/Route111_NoMirageTower/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route111_NoMirageTower_MapBorder:: - .incbin "data/layouts/Route111_NoMirageTower/border.bin" - -Route111_NoMirageTower_MapBlockdata:: - .incbin "data/layouts/Route111_NoMirageTower/map.bin" - - .align 2 -Route111_NoMirageTower_Layout:: - .4byte 0x28 - .4byte 0x8C - .4byte Route111_NoMirageTower_MapBorder - .4byte Route111_NoMirageTower_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - diff --git a/data/layouts/Route112/layout.inc b/data/layouts/Route112/layout.inc deleted file mode 100644 index 72a0c428c4..0000000000 --- a/data/layouts/Route112/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route112_MapBorder:: - .incbin "data/layouts/Route112/border.bin" - -Route112_MapBlockdata:: - .incbin "data/layouts/Route112/map.bin" - - .align 2 -Route112_Layout:: - .4byte 0x28 - .4byte 0x3c - .4byte Route112_MapBorder - .4byte Route112_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/Route113/layout.inc b/data/layouts/Route113/layout.inc deleted file mode 100644 index 0c1d76b585..0000000000 --- a/data/layouts/Route113/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route113_MapBorder:: - .incbin "data/layouts/Route113/border.bin" - -Route113_MapBlockdata:: - .incbin "data/layouts/Route113/map.bin" - - .align 2 -Route113_Layout:: - .4byte 0x64 - .4byte 0x14 - .4byte Route113_MapBorder - .4byte Route113_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - diff --git a/data/layouts/Route114/layout.inc b/data/layouts/Route114/layout.inc deleted file mode 100644 index 071f9e1b66..0000000000 --- a/data/layouts/Route114/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_MapBorder:: - .incbin "data/layouts/Route114/border.bin" - -Route114_MapBlockdata:: - .incbin "data/layouts/Route114/map.bin" - - .align 2 -Route114_Layout:: - .4byte 0x28 - .4byte 0x50 - .4byte Route114_MapBorder - .4byte Route114_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - diff --git a/data/layouts/Route114_FossilManiacsHouse/layout.inc b/data/layouts/Route114_FossilManiacsHouse/layout.inc deleted file mode 100644 index f915e572a9..0000000000 --- a/data/layouts/Route114_FossilManiacsHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_FossilManiacsHouse_MapBorder:: - .incbin "data/layouts/Route114_FossilManiacsHouse/border.bin" - -Route114_FossilManiacsHouse_MapBlockdata:: - .incbin "data/layouts/Route114_FossilManiacsHouse/map.bin" - - .align 2 -Route114_FossilManiacsHouse_Layout:: - .4byte 0xa - .4byte 0x8 - .4byte Route114_FossilManiacsHouse_MapBorder - .4byte Route114_FossilManiacsHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/Route114_FossilManiacsTunnel/layout.inc b/data/layouts/Route114_FossilManiacsTunnel/layout.inc deleted file mode 100644 index c2392ff01c..0000000000 --- a/data/layouts/Route114_FossilManiacsTunnel/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_FossilManiacsTunnel_MapBorder:: - .incbin "data/layouts/Route114_FossilManiacsTunnel/border.bin" - -Route114_FossilManiacsTunnel_MapBlockdata:: - .incbin "data/layouts/Route114_FossilManiacsTunnel/map.bin" - - .align 2 -Route114_FossilManiacsTunnel_Layout:: - .4byte 0xd - .4byte 0x1a - .4byte Route114_FossilManiacsTunnel_MapBorder - .4byte Route114_FossilManiacsTunnel_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - diff --git a/data/layouts/Route114_LanettesHouse/layout.inc b/data/layouts/Route114_LanettesHouse/layout.inc deleted file mode 100644 index be9689ae30..0000000000 --- a/data/layouts/Route114_LanettesHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_LanettesHouse_MapBorder:: - .incbin "data/layouts/Route114_LanettesHouse/border.bin" - -Route114_LanettesHouse_MapBlockdata:: - .incbin "data/layouts/Route114_LanettesHouse/map.bin" - - .align 2 -Route114_LanettesHouse_Layout:: - .4byte 0xb - .4byte 0x8 - .4byte Route114_LanettesHouse_MapBorder - .4byte Route114_LanettesHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - diff --git a/data/layouts/Route115/layout.inc b/data/layouts/Route115/layout.inc deleted file mode 100644 index 9d6c3c969b..0000000000 --- a/data/layouts/Route115/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route115_MapBorder:: - .incbin "data/layouts/Route115/border.bin" - -Route115_MapBlockdata:: - .incbin "data/layouts/Route115/map.bin" - - .align 2 -Route115_Layout:: - .4byte 0x28 - .4byte 0x50 - .4byte Route115_MapBorder - .4byte Route115_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - diff --git a/data/layouts/Route116/layout.inc b/data/layouts/Route116/layout.inc deleted file mode 100644 index 232cc41f8a..0000000000 --- a/data/layouts/Route116/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route116_MapBorder:: - .incbin "data/layouts/Route116/border.bin" - -Route116_MapBlockdata:: - .incbin "data/layouts/Route116/map.bin" - - .align 2 -Route116_Layout:: - .4byte 0x64 - .4byte 0x14 - .4byte Route116_MapBorder - .4byte Route116_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - diff --git a/data/layouts/Route116_TunnelersRestHouse/layout.inc b/data/layouts/Route116_TunnelersRestHouse/layout.inc deleted file mode 100644 index 1bd42eafca..0000000000 --- a/data/layouts/Route116_TunnelersRestHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route116_TunnelersRestHouse_MapBorder:: - .incbin "data/layouts/Route116_TunnelersRestHouse/border.bin" - -Route116_TunnelersRestHouse_MapBlockdata:: - .incbin "data/layouts/Route116_TunnelersRestHouse/map.bin" - - .align 2 -Route116_TunnelersRestHouse_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte Route116_TunnelersRestHouse_MapBorder - .4byte Route116_TunnelersRestHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/Route117/layout.inc b/data/layouts/Route117/layout.inc deleted file mode 100644 index 25e133f28e..0000000000 --- a/data/layouts/Route117/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route117_MapBorder:: - .incbin "data/layouts/Route117/border.bin" - -Route117_MapBlockdata:: - .incbin "data/layouts/Route117/map.bin" - - .align 2 -Route117_Layout:: - .4byte 0x3c - .4byte 0x14 - .4byte Route117_MapBorder - .4byte Route117_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - diff --git a/data/layouts/Route117_PokemonDayCare/layout.inc b/data/layouts/Route117_PokemonDayCare/layout.inc deleted file mode 100644 index 403881bfea..0000000000 --- a/data/layouts/Route117_PokemonDayCare/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route117_PokemonDayCare_MapBorder:: - .incbin "data/layouts/Route117_PokemonDayCare/border.bin" - -Route117_PokemonDayCare_MapBlockdata:: - .incbin "data/layouts/Route117_PokemonDayCare/map.bin" - - .align 2 -Route117_PokemonDayCare_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte Route117_PokemonDayCare_MapBorder - .4byte Route117_PokemonDayCare_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonDayCare - diff --git a/data/layouts/Route118/layout.inc b/data/layouts/Route118/layout.inc deleted file mode 100644 index cb87f8414e..0000000000 --- a/data/layouts/Route118/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route118_MapBorder:: - .incbin "data/layouts/Route118/border.bin" - -Route118_MapBlockdata:: - .incbin "data/layouts/Route118/map.bin" - - .align 2 -Route118_Layout:: - .4byte 0x50 - .4byte 0x14 - .4byte Route118_MapBorder - .4byte Route118_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - diff --git a/data/layouts/Route119/layout.inc b/data/layouts/Route119/layout.inc deleted file mode 100644 index 66502fb15f..0000000000 --- a/data/layouts/Route119/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119_MapBorder:: - .incbin "data/layouts/Route119/border.bin" - -Route119_MapBlockdata:: - .incbin "data/layouts/Route119/map.bin" - - .align 2 -Route119_Layout:: - .4byte 0x28 - .4byte 0x8c - .4byte Route119_MapBorder - .4byte Route119_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - diff --git a/data/layouts/Route119_WeatherInstitute_1F/layout.inc b/data/layouts/Route119_WeatherInstitute_1F/layout.inc deleted file mode 100644 index 9637beea5c..0000000000 --- a/data/layouts/Route119_WeatherInstitute_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119_WeatherInstitute_1F_MapBorder:: - .incbin "data/layouts/Route119_WeatherInstitute_1F/border.bin" - -Route119_WeatherInstitute_1F_MapBlockdata:: - .incbin "data/layouts/Route119_WeatherInstitute_1F/map.bin" - - .align 2 -Route119_WeatherInstitute_1F_Layout:: - .4byte 0x14 - .4byte 0xd - .4byte Route119_WeatherInstitute_1F_MapBorder - .4byte Route119_WeatherInstitute_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - diff --git a/data/layouts/Route119_WeatherInstitute_2F/layout.inc b/data/layouts/Route119_WeatherInstitute_2F/layout.inc deleted file mode 100644 index 4f0948f7be..0000000000 --- a/data/layouts/Route119_WeatherInstitute_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119_WeatherInstitute_2F_MapBorder:: - .incbin "data/layouts/Route119_WeatherInstitute_2F/border.bin" - -Route119_WeatherInstitute_2F_MapBlockdata:: - .incbin "data/layouts/Route119_WeatherInstitute_2F/map.bin" - - .align 2 -Route119_WeatherInstitute_2F_Layout:: - .4byte 0x14 - .4byte 0xb - .4byte Route119_WeatherInstitute_2F_MapBorder - .4byte Route119_WeatherInstitute_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - diff --git a/data/layouts/Route120/layout.inc b/data/layouts/Route120/layout.inc deleted file mode 100644 index f9e9255a0f..0000000000 --- a/data/layouts/Route120/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route120_MapBorder:: - .incbin "data/layouts/Route120/border.bin" - -Route120_MapBlockdata:: - .incbin "data/layouts/Route120/map.bin" - - .align 2 -Route120_Layout:: - .4byte 0x28 - .4byte 0x64 - .4byte Route120_MapBorder - .4byte Route120_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - diff --git a/data/layouts/Route121/layout.inc b/data/layouts/Route121/layout.inc deleted file mode 100644 index 4d2c9744a4..0000000000 --- a/data/layouts/Route121/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route121_MapBorder:: - .incbin "data/layouts/Route121/border.bin" - -Route121_MapBlockdata:: - .incbin "data/layouts/Route121/map.bin" - - .align 2 -Route121_Layout:: - .4byte 0x50 - .4byte 0x14 - .4byte Route121_MapBorder - .4byte Route121_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/Route121_SafariZoneEntrance/layout.inc b/data/layouts/Route121_SafariZoneEntrance/layout.inc deleted file mode 100644 index 38ad9e97ed..0000000000 --- a/data/layouts/Route121_SafariZoneEntrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route121_SafariZoneEntrance_MapBorder:: - .incbin "data/layouts/Route121_SafariZoneEntrance/border.bin" - -Route121_SafariZoneEntrance_MapBlockdata:: - .incbin "data/layouts/Route121_SafariZoneEntrance/map.bin" - - .align 2 -Route121_SafariZoneEntrance_Layout:: - .4byte 0x12 - .4byte 0xe - .4byte Route121_SafariZoneEntrance_MapBorder - .4byte Route121_SafariZoneEntrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/Route122/layout.inc b/data/layouts/Route122/layout.inc deleted file mode 100644 index 7f0baac20e..0000000000 --- a/data/layouts/Route122/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route122_MapBorder:: - .incbin "data/layouts/Route122/border.bin" - -Route122_MapBlockdata:: - .incbin "data/layouts/Route122/map.bin" - - .align 2 -Route122_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte Route122_MapBorder - .4byte Route122_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/Route123/layout.inc b/data/layouts/Route123/layout.inc deleted file mode 100644 index 0c76c2b7b6..0000000000 --- a/data/layouts/Route123/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route123_MapBorder:: - .incbin "data/layouts/Route123/border.bin" - -Route123_MapBlockdata:: - .incbin "data/layouts/Route123/map.bin" - - .align 2 -Route123_Layout:: - .4byte 0x8c - .4byte 0x14 - .4byte Route123_MapBorder - .4byte Route123_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/Route124/layout.inc b/data/layouts/Route124/layout.inc deleted file mode 100644 index d27ed902a5..0000000000 --- a/data/layouts/Route124/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route124_MapBorder:: - .incbin "data/layouts/Route124/border.bin" - -Route124_MapBlockdata:: - .incbin "data/layouts/Route124/map.bin" - - .align 2 -Route124_Layout:: - .4byte 0x50 - .4byte 0x50 - .4byte Route124_MapBorder - .4byte Route124_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - diff --git a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc deleted file mode 100644 index 2635712359..0000000000 --- a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route124_DivingTreasureHuntersHouse_MapBorder:: - .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/border.bin" - -Route124_DivingTreasureHuntersHouse_MapBlockdata:: - .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/map.bin" - - .align 2 -Route124_DivingTreasureHuntersHouse_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte Route124_DivingTreasureHuntersHouse_MapBorder - .4byte Route124_DivingTreasureHuntersHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/Route125/layout.inc b/data/layouts/Route125/layout.inc deleted file mode 100644 index f0d4e13b73..0000000000 --- a/data/layouts/Route125/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route125_MapBorder:: - .incbin "data/layouts/Route125/border.bin" - -Route125_MapBlockdata:: - .incbin "data/layouts/Route125/map.bin" - - .align 2 -Route125_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Route125_MapBorder - .4byte Route125_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - diff --git a/data/layouts/Route126/layout.inc b/data/layouts/Route126/layout.inc deleted file mode 100644 index 859d025a5d..0000000000 --- a/data/layouts/Route126/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route126_MapBorder:: - .incbin "data/layouts/Route126/border.bin" - -Route126_MapBlockdata:: - .incbin "data/layouts/Route126/map.bin" - - .align 2 -Route126_Layout:: - .4byte 0x50 - .4byte 0x50 - .4byte Route126_MapBorder - .4byte Route126_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - diff --git a/data/layouts/Route127/layout.inc b/data/layouts/Route127/layout.inc deleted file mode 100644 index 767330aff8..0000000000 --- a/data/layouts/Route127/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route127_MapBorder:: - .incbin "data/layouts/Route127/border.bin" - -Route127_MapBlockdata:: - .incbin "data/layouts/Route127/map.bin" - - .align 2 -Route127_Layout:: - .4byte 0x50 - .4byte 0x50 - .4byte Route127_MapBorder - .4byte Route127_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - diff --git a/data/layouts/Route128/layout.inc b/data/layouts/Route128/layout.inc deleted file mode 100644 index 16624fa023..0000000000 --- a/data/layouts/Route128/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route128_MapBorder:: - .incbin "data/layouts/Route128/border.bin" - -Route128_MapBlockdata:: - .incbin "data/layouts/Route128/map.bin" - - .align 2 -Route128_Layout:: - .4byte 0x78 - .4byte 0x28 - .4byte Route128_MapBorder - .4byte Route128_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - diff --git a/data/layouts/Route129/layout.inc b/data/layouts/Route129/layout.inc deleted file mode 100644 index 9b7d6af1de..0000000000 --- a/data/layouts/Route129/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route129_MapBorder:: - .incbin "data/layouts/Route129/border.bin" - -Route129_MapBlockdata:: - .incbin "data/layouts/Route129/map.bin" - - .align 2 -Route129_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Route129_MapBorder - .4byte Route129_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - diff --git a/data/layouts/Route130/layout.inc b/data/layouts/Route130/layout.inc deleted file mode 100644 index 41db11cb41..0000000000 --- a/data/layouts/Route130/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route130_MapBorder:: - .incbin "data/layouts/Route130/border.bin" - -Route130_MapBlockdata:: - .incbin "data/layouts/Route130/map.bin" - - .align 2 -Route130_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Route130_MapBorder - .4byte Route130_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/Route131/layout.inc b/data/layouts/Route131/layout.inc deleted file mode 100644 index 7fae261cc8..0000000000 --- a/data/layouts/Route131/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route131_MapBorder:: - .incbin "data/layouts/Route131/border.bin" - -Route131_MapBlockdata:: - .incbin "data/layouts/Route131/map.bin" - - .align 2 -Route131_Layout:: - .4byte 0x3c - .4byte 0x28 - .4byte Route131_MapBorder - .4byte Route131_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/Route132/layout.inc b/data/layouts/Route132/layout.inc deleted file mode 100644 index afaa7fb58b..0000000000 --- a/data/layouts/Route132/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route132_MapBorder:: - .incbin "data/layouts/Route132/border.bin" - -Route132_MapBlockdata:: - .incbin "data/layouts/Route132/map.bin" - - .align 2 -Route132_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Route132_MapBorder - .4byte Route132_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/Route133/layout.inc b/data/layouts/Route133/layout.inc deleted file mode 100644 index 5ff11108b9..0000000000 --- a/data/layouts/Route133/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route133_MapBorder:: - .incbin "data/layouts/Route133/border.bin" - -Route133_MapBlockdata:: - .incbin "data/layouts/Route133/map.bin" - - .align 2 -Route133_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Route133_MapBorder - .4byte Route133_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/Route134/layout.inc b/data/layouts/Route134/layout.inc deleted file mode 100644 index 9eeca6cc9a..0000000000 --- a/data/layouts/Route134/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route134_MapBorder:: - .incbin "data/layouts/Route134/border.bin" - -Route134_MapBlockdata:: - .incbin "data/layouts/Route134/map.bin" - - .align 2 -Route134_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Route134_MapBorder - .4byte Route134_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/RustboroCity/layout.inc b/data/layouts/RustboroCity/layout.inc deleted file mode 100644 index 00c45dcc25..0000000000 --- a/data/layouts/RustboroCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_MapBorder:: - .incbin "data/layouts/RustboroCity/border.bin" - -RustboroCity_MapBlockdata:: - .incbin "data/layouts/RustboroCity/map.bin" - - .align 2 -RustboroCity_Layout:: - .4byte 0x28 - .4byte 0x3c - .4byte RustboroCity_MapBorder - .4byte RustboroCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - diff --git a/data/layouts/RustboroCity_CuttersHouse/layout.inc b/data/layouts/RustboroCity_CuttersHouse/layout.inc deleted file mode 100644 index 0c86dede9a..0000000000 --- a/data/layouts/RustboroCity_CuttersHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_CuttersHouse_MapBorder:: - .incbin "data/layouts/RustboroCity_CuttersHouse/border.bin" - -RustboroCity_CuttersHouse_MapBlockdata:: - .incbin "data/layouts/RustboroCity_CuttersHouse/map.bin" - - .align 2 -RustboroCity_CuttersHouse_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte RustboroCity_CuttersHouse_MapBorder - .4byte RustboroCity_CuttersHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc deleted file mode 100644 index dbf6b388e1..0000000000 --- a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_1F_MapBorder:: - .incbin "data/layouts/RustboroCity_DevonCorp_1F/border.bin" - -RustboroCity_DevonCorp_1F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_DevonCorp_1F/map.bin" - - .align 2 -RustboroCity_DevonCorp_1F_Layout:: - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_1F_MapBorder - .4byte RustboroCity_DevonCorp_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Facility - diff --git a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc deleted file mode 100644 index 34d581ae54..0000000000 --- a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_2F_MapBorder:: - .incbin "data/layouts/RustboroCity_DevonCorp_2F/border.bin" - -RustboroCity_DevonCorp_2F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_DevonCorp_2F/map.bin" - - .align 2 -RustboroCity_DevonCorp_2F_Layout:: - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_2F_MapBorder - .4byte RustboroCity_DevonCorp_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc deleted file mode 100644 index 64c555be55..0000000000 --- a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_3F_MapBorder:: - .incbin "data/layouts/RustboroCity_DevonCorp_3F/border.bin" - -RustboroCity_DevonCorp_3F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_DevonCorp_3F/map.bin" - - .align 2 -RustboroCity_DevonCorp_3F_Layout:: - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_3F_MapBorder - .4byte RustboroCity_DevonCorp_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Facility - diff --git a/data/layouts/RustboroCity_Flat1_1F/layout.inc b/data/layouts/RustboroCity_Flat1_1F/layout.inc deleted file mode 100644 index b904524a6f..0000000000 --- a/data/layouts/RustboroCity_Flat1_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat1_1F_MapBorder:: - .incbin "data/layouts/RustboroCity_Flat1_1F/border.bin" - -RustboroCity_Flat1_1F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_Flat1_1F/map.bin" - - .align 2 -RustboroCity_Flat1_1F_Layout:: - .4byte 0xe - .4byte 0x8 - .4byte RustboroCity_Flat1_1F_MapBorder - .4byte RustboroCity_Flat1_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/RustboroCity_Flat1_2F/layout.inc b/data/layouts/RustboroCity_Flat1_2F/layout.inc deleted file mode 100644 index aa6e3ebdf9..0000000000 --- a/data/layouts/RustboroCity_Flat1_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat1_2F_MapBorder:: - .incbin "data/layouts/RustboroCity_Flat1_2F/border.bin" - -RustboroCity_Flat1_2F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_Flat1_2F/map.bin" - - .align 2 -RustboroCity_Flat1_2F_Layout:: - .4byte 0xe - .4byte 0x8 - .4byte RustboroCity_Flat1_2F_MapBorder - .4byte RustboroCity_Flat1_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/RustboroCity_Flat2_1F/layout.inc b/data/layouts/RustboroCity_Flat2_1F/layout.inc deleted file mode 100644 index 8e44c97b70..0000000000 --- a/data/layouts/RustboroCity_Flat2_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat2_1F_MapBorder:: - .incbin "data/layouts/RustboroCity_Flat2_1F/border.bin" - -RustboroCity_Flat2_1F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_Flat2_1F/map.bin" - - .align 2 -RustboroCity_Flat2_1F_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_1F_MapBorder - .4byte RustboroCity_Flat2_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/RustboroCity_Flat2_2F/layout.inc b/data/layouts/RustboroCity_Flat2_2F/layout.inc deleted file mode 100644 index ffcba8d17e..0000000000 --- a/data/layouts/RustboroCity_Flat2_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat2_2F_MapBorder:: - .incbin "data/layouts/RustboroCity_Flat2_2F/border.bin" - -RustboroCity_Flat2_2F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_Flat2_2F/map.bin" - - .align 2 -RustboroCity_Flat2_2F_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_2F_MapBorder - .4byte RustboroCity_Flat2_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/RustboroCity_Flat2_3F/layout.inc b/data/layouts/RustboroCity_Flat2_3F/layout.inc deleted file mode 100644 index 77775b4e02..0000000000 --- a/data/layouts/RustboroCity_Flat2_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat2_3F_MapBorder:: - .incbin "data/layouts/RustboroCity_Flat2_3F/border.bin" - -RustboroCity_Flat2_3F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_Flat2_3F/map.bin" - - .align 2 -RustboroCity_Flat2_3F_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_3F_MapBorder - .4byte RustboroCity_Flat2_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/RustboroCity_Gym/layout.inc b/data/layouts/RustboroCity_Gym/layout.inc deleted file mode 100644 index 8c064171bf..0000000000 --- a/data/layouts/RustboroCity_Gym/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Gym_MapBorder:: - .incbin "data/layouts/RustboroCity_Gym/border.bin" - -RustboroCity_Gym_MapBlockdata:: - .incbin "data/layouts/RustboroCity_Gym/map.bin" - - .align 2 -RustboroCity_Gym_Layout:: - .4byte 0xb - .4byte 0x14 - .4byte RustboroCity_Gym_MapBorder - .4byte RustboroCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_RustboroGym - diff --git a/data/layouts/RustboroCity_House/layout.inc b/data/layouts/RustboroCity_House/layout.inc deleted file mode 100644 index 0c8a2075e5..0000000000 --- a/data/layouts/RustboroCity_House/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_House_MapBorder:: - .incbin "data/layouts/RustboroCity_House/border.bin" - -RustboroCity_House_MapBlockdata:: - .incbin "data/layouts/RustboroCity_House/map.bin" - - .align 2 -RustboroCity_House_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte RustboroCity_House_MapBorder - .4byte RustboroCity_House_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/RustboroCity_House1/layout.inc b/data/layouts/RustboroCity_House1/layout.inc deleted file mode 100644 index 27893f2fb0..0000000000 --- a/data/layouts/RustboroCity_House1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_House1_MapBorder:: - .incbin "data/layouts/RustboroCity_House1/border.bin" - -RustboroCity_House1_MapBlockdata:: - .incbin "data/layouts/RustboroCity_House1/map.bin" - - .align 2 -RustboroCity_House1_Layout:: - .4byte 0xd - .4byte 0x8 - .4byte RustboroCity_House1_MapBorder - .4byte RustboroCity_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/RustboroCity_PokemonSchool/layout.inc b/data/layouts/RustboroCity_PokemonSchool/layout.inc deleted file mode 100644 index 2c4eb3977c..0000000000 --- a/data/layouts/RustboroCity_PokemonSchool/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_PokemonSchool_MapBorder:: - .incbin "data/layouts/RustboroCity_PokemonSchool/border.bin" - -RustboroCity_PokemonSchool_MapBlockdata:: - .incbin "data/layouts/RustboroCity_PokemonSchool/map.bin" - - .align 2 -RustboroCity_PokemonSchool_Layout:: - .4byte 0xc - .4byte 0xb - .4byte RustboroCity_PokemonSchool_MapBorder - .4byte RustboroCity_PokemonSchool_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonSchool - diff --git a/data/layouts/RusturfTunnel/layout.inc b/data/layouts/RusturfTunnel/layout.inc deleted file mode 100644 index 7a063b922c..0000000000 --- a/data/layouts/RusturfTunnel/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RusturfTunnel_MapBorder:: - .incbin "data/layouts/RusturfTunnel/border.bin" - -RusturfTunnel_MapBlockdata:: - .incbin "data/layouts/RusturfTunnel/map.bin" - - .align 2 -RusturfTunnel_Layout:: - .4byte 0x24 - .4byte 0x18 - .4byte RusturfTunnel_MapBorder - .4byte RusturfTunnel_MapBlockdata - .4byte gTileset_General - .4byte gTileset_RusturfTunnel - diff --git a/data/layouts/SSTidalCorridor/layout.inc b/data/layouts/SSTidalCorridor/layout.inc deleted file mode 100644 index bcc034ecd9..0000000000 --- a/data/layouts/SSTidalCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSTidalCorridor_MapBorder:: - .incbin "data/layouts/SSTidalCorridor/border.bin" - -SSTidalCorridor_MapBlockdata:: - .incbin "data/layouts/SSTidalCorridor/map.bin" - - .align 2 -SSTidalCorridor_Layout:: - .4byte 0x12 - .4byte 0xd - .4byte SSTidalCorridor_MapBorder - .4byte SSTidalCorridor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/SSTidalLowerDeck/layout.inc b/data/layouts/SSTidalLowerDeck/layout.inc deleted file mode 100644 index 807da09a18..0000000000 --- a/data/layouts/SSTidalLowerDeck/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSTidalLowerDeck_MapBorder:: - .incbin "data/layouts/SSTidalLowerDeck/border.bin" - -SSTidalLowerDeck_MapBlockdata:: - .incbin "data/layouts/SSTidalLowerDeck/map.bin" - - .align 2 -SSTidalLowerDeck_Layout:: - .4byte 0x11 - .4byte 0xd - .4byte SSTidalLowerDeck_MapBorder - .4byte SSTidalLowerDeck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/SSTidalRooms/layout.inc b/data/layouts/SSTidalRooms/layout.inc deleted file mode 100644 index e44aac53c9..0000000000 --- a/data/layouts/SSTidalRooms/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSTidalRooms_MapBorder:: - .incbin "data/layouts/SSTidalRooms/border.bin" - -SSTidalRooms_MapBlockdata:: - .incbin "data/layouts/SSTidalRooms/map.bin" - - .align 2 -SSTidalRooms_Layout:: - .4byte 0x24 - .4byte 0x12 - .4byte SSTidalRooms_MapBorder - .4byte SSTidalRooms_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/SafariZone_North/layout.inc b/data/layouts/SafariZone_North/layout.inc deleted file mode 100644 index c6986540fe..0000000000 --- a/data/layouts/SafariZone_North/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_North_MapBorder:: - .incbin "data/layouts/SafariZone_North/border.bin" - -SafariZone_North_MapBlockdata:: - .incbin "data/layouts/SafariZone_North/map.bin" - - .align 2 -SafariZone_North_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_North_MapBorder - .4byte SafariZone_North_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/SafariZone_Northeast/layout.inc b/data/layouts/SafariZone_Northeast/layout.inc deleted file mode 100644 index 026e4a7c76..0000000000 --- a/data/layouts/SafariZone_Northeast/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Northeast_MapBorder:: - .incbin "data/layouts/SafariZone_Northeast/border.bin" - -SafariZone_Northeast_MapBlockdata:: - .incbin "data/layouts/SafariZone_Northeast/map.bin" - - .align 2 -SafariZone_Northeast_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Northeast_MapBorder - .4byte SafariZone_Northeast_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/SafariZone_Northwest/layout.inc b/data/layouts/SafariZone_Northwest/layout.inc deleted file mode 100644 index 09d8bd4829..0000000000 --- a/data/layouts/SafariZone_Northwest/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Northwest_MapBorder:: - .incbin "data/layouts/SafariZone_Northwest/border.bin" - -SafariZone_Northwest_MapBlockdata:: - .incbin "data/layouts/SafariZone_Northwest/map.bin" - - .align 2 -SafariZone_Northwest_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Northwest_MapBorder - .4byte SafariZone_Northwest_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/SafariZone_RestHouse/layout.inc b/data/layouts/SafariZone_RestHouse/layout.inc deleted file mode 100644 index 4176cb370f..0000000000 --- a/data/layouts/SafariZone_RestHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_RestHouse_MapBorder:: - .incbin "data/layouts/SafariZone_RestHouse/border.bin" - -SafariZone_RestHouse_MapBlockdata:: - .incbin "data/layouts/SafariZone_RestHouse/map.bin" - - .align 2 -SafariZone_RestHouse_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte SafariZone_RestHouse_MapBorder - .4byte SafariZone_RestHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/SafariZone_South/layout.inc b/data/layouts/SafariZone_South/layout.inc deleted file mode 100644 index ec83ba5b01..0000000000 --- a/data/layouts/SafariZone_South/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_South_MapBorder:: - .incbin "data/layouts/SafariZone_South/border.bin" - -SafariZone_South_MapBlockdata:: - .incbin "data/layouts/SafariZone_South/map.bin" - - .align 2 -SafariZone_South_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_South_MapBorder - .4byte SafariZone_South_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/SafariZone_Southeast/layout.inc b/data/layouts/SafariZone_Southeast/layout.inc deleted file mode 100644 index e55309b46a..0000000000 --- a/data/layouts/SafariZone_Southeast/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Southeast_MapBorder:: - .incbin "data/layouts/SafariZone_Southeast/border.bin" - -SafariZone_Southeast_MapBlockdata:: - .incbin "data/layouts/SafariZone_Southeast/map.bin" - - .align 2 -SafariZone_Southeast_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Southeast_MapBorder - .4byte SafariZone_Southeast_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/SafariZone_Southwest/layout.inc b/data/layouts/SafariZone_Southwest/layout.inc deleted file mode 100644 index 1236d4d4bf..0000000000 --- a/data/layouts/SafariZone_Southwest/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Southwest_MapBorder:: - .incbin "data/layouts/SafariZone_Southwest/border.bin" - -SafariZone_Southwest_MapBlockdata:: - .incbin "data/layouts/SafariZone_Southwest/map.bin" - - .align 2 -SafariZone_Southwest_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Southwest_MapBorder - .4byte SafariZone_Southwest_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/ScorchedSlab/layout.inc b/data/layouts/ScorchedSlab/layout.inc deleted file mode 100644 index 897d873abe..0000000000 --- a/data/layouts/ScorchedSlab/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ScorchedSlab_MapBorder:: - .incbin "data/layouts/ScorchedSlab/border.bin" - -ScorchedSlab_MapBlockdata:: - .incbin "data/layouts/ScorchedSlab/map.bin" - - .align 2 -ScorchedSlab_Layout:: - .4byte 0xf - .4byte 0x14 - .4byte ScorchedSlab_MapBorder - .4byte ScorchedSlab_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SeafloorCavern_Entrance/layout.inc b/data/layouts/SeafloorCavern_Entrance/layout.inc deleted file mode 100644 index 1d6ce495b6..0000000000 --- a/data/layouts/SeafloorCavern_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Entrance_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Entrance/border.bin" - -SeafloorCavern_Entrance_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Entrance/map.bin" - - .align 2 -SeafloorCavern_Entrance_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte SeafloorCavern_Entrance_MapBorder - .4byte SeafloorCavern_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SeafloorCavern_Room1/layout.inc b/data/layouts/SeafloorCavern_Room1/layout.inc deleted file mode 100644 index 7f7cf0570d..0000000000 --- a/data/layouts/SeafloorCavern_Room1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room1_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room1/border.bin" - -SeafloorCavern_Room1_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room1/map.bin" - - .align 2 -SeafloorCavern_Room1_Layout:: - .4byte 0x14 - .4byte 0x15 - .4byte SeafloorCavern_Room1_MapBorder - .4byte SeafloorCavern_Room1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SeafloorCavern_Room2/layout.inc b/data/layouts/SeafloorCavern_Room2/layout.inc deleted file mode 100644 index 89f4e6a792..0000000000 --- a/data/layouts/SeafloorCavern_Room2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room2_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room2/border.bin" - -SeafloorCavern_Room2_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room2/map.bin" - - .align 2 -SeafloorCavern_Room2_Layout:: - .4byte 0x12 - .4byte 0xc - .4byte SeafloorCavern_Room2_MapBorder - .4byte SeafloorCavern_Room2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SeafloorCavern_Room3/layout.inc b/data/layouts/SeafloorCavern_Room3/layout.inc deleted file mode 100644 index 070842a9f5..0000000000 --- a/data/layouts/SeafloorCavern_Room3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room3_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room3/border.bin" - -SeafloorCavern_Room3_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room3/map.bin" - - .align 2 -SeafloorCavern_Room3_Layout:: - .4byte 0x10 - .4byte 0x11 - .4byte SeafloorCavern_Room3_MapBorder - .4byte SeafloorCavern_Room3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SeafloorCavern_Room4/layout.inc b/data/layouts/SeafloorCavern_Room4/layout.inc deleted file mode 100644 index 6c984109df..0000000000 --- a/data/layouts/SeafloorCavern_Room4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room4_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room4/border.bin" - -SeafloorCavern_Room4_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room4/map.bin" - - .align 2 -SeafloorCavern_Room4_Layout:: - .4byte 0x12 - .4byte 0x13 - .4byte SeafloorCavern_Room4_MapBorder - .4byte SeafloorCavern_Room4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SeafloorCavern_Room5/layout.inc b/data/layouts/SeafloorCavern_Room5/layout.inc deleted file mode 100644 index c48b00dbaa..0000000000 --- a/data/layouts/SeafloorCavern_Room5/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room5_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room5/border.bin" - -SeafloorCavern_Room5_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room5/map.bin" - - .align 2 -SeafloorCavern_Room5_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte SeafloorCavern_Room5_MapBorder - .4byte SeafloorCavern_Room5_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SeafloorCavern_Room6/layout.inc b/data/layouts/SeafloorCavern_Room6/layout.inc deleted file mode 100644 index f729d0b1b2..0000000000 --- a/data/layouts/SeafloorCavern_Room6/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room6_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room6/border.bin" - -SeafloorCavern_Room6_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room6/map.bin" - - .align 2 -SeafloorCavern_Room6_Layout:: - .4byte 0x18 - .4byte 0x17 - .4byte SeafloorCavern_Room6_MapBorder - .4byte SeafloorCavern_Room6_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/SeafloorCavern_Room7/layout.inc b/data/layouts/SeafloorCavern_Room7/layout.inc deleted file mode 100644 index 784b9bbb95..0000000000 --- a/data/layouts/SeafloorCavern_Room7/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room7_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room7/border.bin" - -SeafloorCavern_Room7_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room7/map.bin" - - .align 2 -SeafloorCavern_Room7_Layout:: - .4byte 0x17 - .4byte 0x19 - .4byte SeafloorCavern_Room7_MapBorder - .4byte SeafloorCavern_Room7_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/SeafloorCavern_Room8/layout.inc b/data/layouts/SeafloorCavern_Room8/layout.inc deleted file mode 100644 index 8f3d826c77..0000000000 --- a/data/layouts/SeafloorCavern_Room8/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room8_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room8/border.bin" - -SeafloorCavern_Room8_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room8/map.bin" - - .align 2 -SeafloorCavern_Room8_Layout:: - .4byte 0xb - .4byte 0xe - .4byte SeafloorCavern_Room8_MapBorder - .4byte SeafloorCavern_Room8_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SeafloorCavern_Room9/layout.inc b/data/layouts/SeafloorCavern_Room9/layout.inc deleted file mode 100644 index a5039da8f3..0000000000 --- a/data/layouts/SeafloorCavern_Room9/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room9_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room9/border.bin" - -SeafloorCavern_Room9_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room9/map.bin" - - .align 2 -SeafloorCavern_Room9_Layout:: - .4byte 0x1b - .4byte 0x2e - .4byte SeafloorCavern_Room9_MapBorder - .4byte SeafloorCavern_Room9_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SealedChamber_InnerRoom/layout.inc b/data/layouts/SealedChamber_InnerRoom/layout.inc deleted file mode 100644 index 7a064d5f0c..0000000000 --- a/data/layouts/SealedChamber_InnerRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SealedChamber_InnerRoom_MapBorder:: - .incbin "data/layouts/SealedChamber_InnerRoom/border.bin" - -SealedChamber_InnerRoom_MapBlockdata:: - .incbin "data/layouts/SealedChamber_InnerRoom/map.bin" - - .align 2 -SealedChamber_InnerRoom_Layout:: - .4byte 0x15 - .4byte 0x17 - .4byte SealedChamber_InnerRoom_MapBorder - .4byte SealedChamber_InnerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SealedChamber_OuterRoom/layout.inc b/data/layouts/SealedChamber_OuterRoom/layout.inc deleted file mode 100644 index bc6afaf291..0000000000 --- a/data/layouts/SealedChamber_OuterRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SealedChamber_OuterRoom_MapBorder:: - .incbin "data/layouts/SealedChamber_OuterRoom/border.bin" - -SealedChamber_OuterRoom_MapBlockdata:: - .incbin "data/layouts/SealedChamber_OuterRoom/map.bin" - - .align 2 -SealedChamber_OuterRoom_Layout:: - .4byte 0x15 - .4byte 0x17 - .4byte SealedChamber_OuterRoom_MapBorder - .4byte SealedChamber_OuterRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SecretBase_BlueCave1/layout.inc b/data/layouts/SecretBase_BlueCave1/layout.inc deleted file mode 100644 index ec138440a4..0000000000 --- a/data/layouts/SecretBase_BlueCave1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave1_MapBorder:: - .incbin "data/layouts/SecretBase_BlueCave1/border.bin" - -SecretBase_BlueCave1_MapBlockdata:: - .incbin "data/layouts/SecretBase_BlueCave1/map.bin" - - .align 2 -SecretBase_BlueCave1_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_BlueCave1_MapBorder - .4byte SecretBase_BlueCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - diff --git a/data/layouts/SecretBase_BlueCave2/layout.inc b/data/layouts/SecretBase_BlueCave2/layout.inc deleted file mode 100644 index 8c2b48661e..0000000000 --- a/data/layouts/SecretBase_BlueCave2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave2_MapBorder:: - .incbin "data/layouts/SecretBase_BlueCave2/border.bin" - -SecretBase_BlueCave2_MapBlockdata:: - .incbin "data/layouts/SecretBase_BlueCave2/map.bin" - - .align 2 -SecretBase_BlueCave2_Layout:: - .4byte 0xf - .4byte 0x7 - .4byte SecretBase_BlueCave2_MapBorder - .4byte SecretBase_BlueCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - diff --git a/data/layouts/SecretBase_BlueCave3/layout.inc b/data/layouts/SecretBase_BlueCave3/layout.inc deleted file mode 100644 index 0ac8bee1be..0000000000 --- a/data/layouts/SecretBase_BlueCave3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave3_MapBorder:: - .incbin "data/layouts/SecretBase_BlueCave3/border.bin" - -SecretBase_BlueCave3_MapBlockdata:: - .incbin "data/layouts/SecretBase_BlueCave3/map.bin" - - .align 2 -SecretBase_BlueCave3_Layout:: - .4byte 0xa - .4byte 0x11 - .4byte SecretBase_BlueCave3_MapBorder - .4byte SecretBase_BlueCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - diff --git a/data/layouts/SecretBase_BlueCave4/layout.inc b/data/layouts/SecretBase_BlueCave4/layout.inc deleted file mode 100644 index d0e5ed45fa..0000000000 --- a/data/layouts/SecretBase_BlueCave4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave4_MapBorder:: - .incbin "data/layouts/SecretBase_BlueCave4/border.bin" - -SecretBase_BlueCave4_MapBlockdata:: - .incbin "data/layouts/SecretBase_BlueCave4/map.bin" - - .align 2 -SecretBase_BlueCave4_Layout:: - .4byte 0x9 - .4byte 0x11 - .4byte SecretBase_BlueCave4_MapBorder - .4byte SecretBase_BlueCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - diff --git a/data/layouts/SecretBase_BrownCave1/layout.inc b/data/layouts/SecretBase_BrownCave1/layout.inc deleted file mode 100644 index 9044fd6d1e..0000000000 --- a/data/layouts/SecretBase_BrownCave1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave1_MapBorder:: - .incbin "data/layouts/SecretBase_BrownCave1/border.bin" - -SecretBase_BrownCave1_MapBlockdata:: - .incbin "data/layouts/SecretBase_BrownCave1/map.bin" - - .align 2 -SecretBase_BrownCave1_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_BrownCave1_MapBorder - .4byte SecretBase_BrownCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - diff --git a/data/layouts/SecretBase_BrownCave2/layout.inc b/data/layouts/SecretBase_BrownCave2/layout.inc deleted file mode 100644 index 7cfb9573ba..0000000000 --- a/data/layouts/SecretBase_BrownCave2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave2_MapBorder:: - .incbin "data/layouts/SecretBase_BrownCave2/border.bin" - -SecretBase_BrownCave2_MapBlockdata:: - .incbin "data/layouts/SecretBase_BrownCave2/map.bin" - - .align 2 -SecretBase_BrownCave2_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte SecretBase_BrownCave2_MapBorder - .4byte SecretBase_BrownCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - diff --git a/data/layouts/SecretBase_BrownCave3/layout.inc b/data/layouts/SecretBase_BrownCave3/layout.inc deleted file mode 100644 index 5ad1bf5269..0000000000 --- a/data/layouts/SecretBase_BrownCave3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave3_MapBorder:: - .incbin "data/layouts/SecretBase_BrownCave3/border.bin" - -SecretBase_BrownCave3_MapBlockdata:: - .incbin "data/layouts/SecretBase_BrownCave3/map.bin" - - .align 2 -SecretBase_BrownCave3_Layout:: - .4byte 0xf - .4byte 0xb - .4byte SecretBase_BrownCave3_MapBorder - .4byte SecretBase_BrownCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - diff --git a/data/layouts/SecretBase_BrownCave4/layout.inc b/data/layouts/SecretBase_BrownCave4/layout.inc deleted file mode 100644 index 6094a38322..0000000000 --- a/data/layouts/SecretBase_BrownCave4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave4_MapBorder:: - .incbin "data/layouts/SecretBase_BrownCave4/border.bin" - -SecretBase_BrownCave4_MapBlockdata:: - .incbin "data/layouts/SecretBase_BrownCave4/map.bin" - - .align 2 -SecretBase_BrownCave4_Layout:: - .4byte 0xe - .4byte 0xc - .4byte SecretBase_BrownCave4_MapBorder - .4byte SecretBase_BrownCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - diff --git a/data/layouts/SecretBase_RedCave1/layout.inc b/data/layouts/SecretBase_RedCave1/layout.inc deleted file mode 100644 index a4664d5098..0000000000 --- a/data/layouts/SecretBase_RedCave1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave1_MapBorder:: - .incbin "data/layouts/SecretBase_RedCave1/border.bin" - -SecretBase_RedCave1_MapBlockdata:: - .incbin "data/layouts/SecretBase_RedCave1/map.bin" - - .align 2 -SecretBase_RedCave1_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_RedCave1_MapBorder - .4byte SecretBase_RedCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - diff --git a/data/layouts/SecretBase_RedCave2/layout.inc b/data/layouts/SecretBase_RedCave2/layout.inc deleted file mode 100644 index 7999395d85..0000000000 --- a/data/layouts/SecretBase_RedCave2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave2_MapBorder:: - .incbin "data/layouts/SecretBase_RedCave2/border.bin" - -SecretBase_RedCave2_MapBlockdata:: - .incbin "data/layouts/SecretBase_RedCave2/map.bin" - - .align 2 -SecretBase_RedCave2_Layout:: - .4byte 0x7 - .4byte 0x10 - .4byte SecretBase_RedCave2_MapBorder - .4byte SecretBase_RedCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - diff --git a/data/layouts/SecretBase_RedCave3/layout.inc b/data/layouts/SecretBase_RedCave3/layout.inc deleted file mode 100644 index 6a3cc123b6..0000000000 --- a/data/layouts/SecretBase_RedCave3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave3_MapBorder:: - .incbin "data/layouts/SecretBase_RedCave3/border.bin" - -SecretBase_RedCave3_MapBlockdata:: - .incbin "data/layouts/SecretBase_RedCave3/map.bin" - - .align 2 -SecretBase_RedCave3_Layout:: - .4byte 0xf - .4byte 0x8 - .4byte SecretBase_RedCave3_MapBorder - .4byte SecretBase_RedCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - diff --git a/data/layouts/SecretBase_RedCave4/layout.inc b/data/layouts/SecretBase_RedCave4/layout.inc deleted file mode 100644 index 665f44709c..0000000000 --- a/data/layouts/SecretBase_RedCave4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave4_MapBorder:: - .incbin "data/layouts/SecretBase_RedCave4/border.bin" - -SecretBase_RedCave4_MapBlockdata:: - .incbin "data/layouts/SecretBase_RedCave4/map.bin" - - .align 2 -SecretBase_RedCave4_Layout:: - .4byte 0x9 - .4byte 0xf - .4byte SecretBase_RedCave4_MapBorder - .4byte SecretBase_RedCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - diff --git a/data/layouts/SecretBase_Shrub1/layout.inc b/data/layouts/SecretBase_Shrub1/layout.inc deleted file mode 100644 index 2bcc9f58a5..0000000000 --- a/data/layouts/SecretBase_Shrub1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub1_MapBorder:: - .incbin "data/layouts/SecretBase_Shrub1/border.bin" - -SecretBase_Shrub1_MapBlockdata:: - .incbin "data/layouts/SecretBase_Shrub1/map.bin" - - .align 2 -SecretBase_Shrub1_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_Shrub1_MapBorder - .4byte SecretBase_Shrub1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - diff --git a/data/layouts/SecretBase_Shrub2/layout.inc b/data/layouts/SecretBase_Shrub2/layout.inc deleted file mode 100644 index e94376c3b9..0000000000 --- a/data/layouts/SecretBase_Shrub2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub2_MapBorder:: - .incbin "data/layouts/SecretBase_Shrub2/border.bin" - -SecretBase_Shrub2_MapBlockdata:: - .incbin "data/layouts/SecretBase_Shrub2/map.bin" - - .align 2 -SecretBase_Shrub2_Layout:: - .4byte 0xf - .4byte 0x7 - .4byte SecretBase_Shrub2_MapBorder - .4byte SecretBase_Shrub2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - diff --git a/data/layouts/SecretBase_Shrub3/layout.inc b/data/layouts/SecretBase_Shrub3/layout.inc deleted file mode 100644 index 449f1a11f0..0000000000 --- a/data/layouts/SecretBase_Shrub3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub3_MapBorder:: - .incbin "data/layouts/SecretBase_Shrub3/border.bin" - -SecretBase_Shrub3_MapBlockdata:: - .incbin "data/layouts/SecretBase_Shrub3/map.bin" - - .align 2 -SecretBase_Shrub3_Layout:: - .4byte 0xd - .4byte 0xb - .4byte SecretBase_Shrub3_MapBorder - .4byte SecretBase_Shrub3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - diff --git a/data/layouts/SecretBase_Shrub4/layout.inc b/data/layouts/SecretBase_Shrub4/layout.inc deleted file mode 100644 index 139a820503..0000000000 --- a/data/layouts/SecretBase_Shrub4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub4_MapBorder:: - .incbin "data/layouts/SecretBase_Shrub4/border.bin" - -SecretBase_Shrub4_MapBlockdata:: - .incbin "data/layouts/SecretBase_Shrub4/map.bin" - - .align 2 -SecretBase_Shrub4_Layout:: - .4byte 0xe - .4byte 0xb - .4byte SecretBase_Shrub4_MapBorder - .4byte SecretBase_Shrub4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - diff --git a/data/layouts/SecretBase_Tree1/layout.inc b/data/layouts/SecretBase_Tree1/layout.inc deleted file mode 100644 index 73e6e41a61..0000000000 --- a/data/layouts/SecretBase_Tree1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree1_MapBorder:: - .incbin "data/layouts/SecretBase_Tree1/border.bin" - -SecretBase_Tree1_MapBlockdata:: - .incbin "data/layouts/SecretBase_Tree1/map.bin" - - .align 2 -SecretBase_Tree1_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_Tree1_MapBorder - .4byte SecretBase_Tree1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - diff --git a/data/layouts/SecretBase_Tree2/layout.inc b/data/layouts/SecretBase_Tree2/layout.inc deleted file mode 100644 index 95b122220d..0000000000 --- a/data/layouts/SecretBase_Tree2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree2_MapBorder:: - .incbin "data/layouts/SecretBase_Tree2/border.bin" - -SecretBase_Tree2_MapBlockdata:: - .incbin "data/layouts/SecretBase_Tree2/map.bin" - - .align 2 -SecretBase_Tree2_Layout:: - .4byte 0x7 - .4byte 0x10 - .4byte SecretBase_Tree2_MapBorder - .4byte SecretBase_Tree2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - diff --git a/data/layouts/SecretBase_Tree3/layout.inc b/data/layouts/SecretBase_Tree3/layout.inc deleted file mode 100644 index 66716a4045..0000000000 --- a/data/layouts/SecretBase_Tree3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree3_MapBorder:: - .incbin "data/layouts/SecretBase_Tree3/border.bin" - -SecretBase_Tree3_MapBlockdata:: - .incbin "data/layouts/SecretBase_Tree3/map.bin" - - .align 2 -SecretBase_Tree3_Layout:: - .4byte 0x11 - .4byte 0x8 - .4byte SecretBase_Tree3_MapBorder - .4byte SecretBase_Tree3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - diff --git a/data/layouts/SecretBase_Tree4/layout.inc b/data/layouts/SecretBase_Tree4/layout.inc deleted file mode 100644 index 20d4c3e018..0000000000 --- a/data/layouts/SecretBase_Tree4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree4_MapBorder:: - .incbin "data/layouts/SecretBase_Tree4/border.bin" - -SecretBase_Tree4_MapBlockdata:: - .incbin "data/layouts/SecretBase_Tree4/map.bin" - - .align 2 -SecretBase_Tree4_Layout:: - .4byte 0xe - .4byte 0xe - .4byte SecretBase_Tree4_MapBorder - .4byte SecretBase_Tree4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - diff --git a/data/layouts/SecretBase_YellowCave1/layout.inc b/data/layouts/SecretBase_YellowCave1/layout.inc deleted file mode 100644 index 7fa3aa8237..0000000000 --- a/data/layouts/SecretBase_YellowCave1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave1_MapBorder:: - .incbin "data/layouts/SecretBase_YellowCave1/border.bin" - -SecretBase_YellowCave1_MapBlockdata:: - .incbin "data/layouts/SecretBase_YellowCave1/map.bin" - - .align 2 -SecretBase_YellowCave1_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_YellowCave1_MapBorder - .4byte SecretBase_YellowCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - diff --git a/data/layouts/SecretBase_YellowCave2/layout.inc b/data/layouts/SecretBase_YellowCave2/layout.inc deleted file mode 100644 index 0ae872e081..0000000000 --- a/data/layouts/SecretBase_YellowCave2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave2_MapBorder:: - .incbin "data/layouts/SecretBase_YellowCave2/border.bin" - -SecretBase_YellowCave2_MapBlockdata:: - .incbin "data/layouts/SecretBase_YellowCave2/map.bin" - - .align 2 -SecretBase_YellowCave2_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte SecretBase_YellowCave2_MapBorder - .4byte SecretBase_YellowCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - diff --git a/data/layouts/SecretBase_YellowCave3/layout.inc b/data/layouts/SecretBase_YellowCave3/layout.inc deleted file mode 100644 index f42d889208..0000000000 --- a/data/layouts/SecretBase_YellowCave3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave3_MapBorder:: - .incbin "data/layouts/SecretBase_YellowCave3/border.bin" - -SecretBase_YellowCave3_MapBlockdata:: - .incbin "data/layouts/SecretBase_YellowCave3/map.bin" - - .align 2 -SecretBase_YellowCave3_Layout:: - .4byte 0xc - .4byte 0xb - .4byte SecretBase_YellowCave3_MapBorder - .4byte SecretBase_YellowCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - diff --git a/data/layouts/SecretBase_YellowCave4/layout.inc b/data/layouts/SecretBase_YellowCave4/layout.inc deleted file mode 100644 index b7a11df5a3..0000000000 --- a/data/layouts/SecretBase_YellowCave4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave4_MapBorder:: - .incbin "data/layouts/SecretBase_YellowCave4/border.bin" - -SecretBase_YellowCave4_MapBlockdata:: - .incbin "data/layouts/SecretBase_YellowCave4/map.bin" - - .align 2 -SecretBase_YellowCave4_Layout:: - .4byte 0xd - .4byte 0xe - .4byte SecretBase_YellowCave4_MapBorder - .4byte SecretBase_YellowCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - diff --git a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc deleted file mode 100644 index a52425e15c..0000000000 --- a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_HighTideEntranceRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/border.bin" - -ShoalCave_HighTideEntranceRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/map.bin" - - .align 2 -ShoalCave_HighTideEntranceRoom_Layout:: - .4byte 0x23 - .4byte 0x23 - .4byte ShoalCave_HighTideEntranceRoom_MapBorder - .4byte ShoalCave_HighTideEntranceRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc deleted file mode 100644 index 2d323b9e07..0000000000 --- a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_HighTideInnerRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_HighTideInnerRoom/border.bin" - -ShoalCave_HighTideInnerRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_HighTideInnerRoom/map.bin" - - .align 2 -ShoalCave_HighTideInnerRoom_Layout:: - .4byte 0x2e - .4byte 0x26 - .4byte ShoalCave_HighTideInnerRoom_MapBorder - .4byte ShoalCave_HighTideInnerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc deleted file mode 100644 index 0a1eee113e..0000000000 --- a/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideEntranceRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/border.bin" - -ShoalCave_LowTideEntranceRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/map.bin" - - .align 2 -ShoalCave_LowTideEntranceRoom_Layout:: - .4byte 0x23 - .4byte 0x23 - .4byte ShoalCave_LowTideEntranceRoom_MapBorder - .4byte ShoalCave_LowTideEntranceRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/ShoalCave_LowTideIceRoom/layout.inc b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc deleted file mode 100644 index 6d7a515750..0000000000 --- a/data/layouts/ShoalCave_LowTideIceRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideIceRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_LowTideIceRoom/border.bin" - -ShoalCave_LowTideIceRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_LowTideIceRoom/map.bin" - - .align 2 -ShoalCave_LowTideIceRoom_Layout:: - .4byte 0x14 - .4byte 0x1e - .4byte ShoalCave_LowTideIceRoom_MapBorder - .4byte ShoalCave_LowTideIceRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc deleted file mode 100644 index f66fc97239..0000000000 --- a/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideInnerRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_LowTideInnerRoom/border.bin" - -ShoalCave_LowTideInnerRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_LowTideInnerRoom/map.bin" - - .align 2 -ShoalCave_LowTideInnerRoom_Layout:: - .4byte 0x2e - .4byte 0x26 - .4byte ShoalCave_LowTideInnerRoom_MapBorder - .4byte ShoalCave_LowTideInnerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc deleted file mode 100644 index 79cc82e8c8..0000000000 --- a/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideLowerRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_LowTideLowerRoom/border.bin" - -ShoalCave_LowTideLowerRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_LowTideLowerRoom/map.bin" - - .align 2 -ShoalCave_LowTideLowerRoom_Layout:: - .4byte 0x1f - .4byte 0xe - .4byte ShoalCave_LowTideLowerRoom_MapBorder - .4byte ShoalCave_LowTideLowerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc deleted file mode 100644 index 62dbff40ee..0000000000 --- a/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideStairsRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_LowTideStairsRoom/border.bin" - -ShoalCave_LowTideStairsRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_LowTideStairsRoom/map.bin" - - .align 2 -ShoalCave_LowTideStairsRoom_Layout:: - .4byte 0x15 - .4byte 0xf - .4byte ShoalCave_LowTideStairsRoom_MapBorder - .4byte ShoalCave_LowTideStairsRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SingleBattleColosseum/layout.inc b/data/layouts/SingleBattleColosseum/layout.inc deleted file mode 100644 index f42855de8a..0000000000 --- a/data/layouts/SingleBattleColosseum/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SingleBattleColosseum_MapBorder:: - .incbin "data/layouts/SingleBattleColosseum/border.bin" - -SingleBattleColosseum_MapBlockdata:: - .incbin "data/layouts/SingleBattleColosseum/map.bin" - - .align 2 -SingleBattleColosseum_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte SingleBattleColosseum_MapBorder - .4byte SingleBattleColosseum_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - diff --git a/data/layouts/SkyPillar_1F/layout.inc b/data/layouts/SkyPillar_1F/layout.inc deleted file mode 100644 index 235f049352..0000000000 --- a/data/layouts/SkyPillar_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_1F_MapBorder:: - .incbin "data/layouts/SkyPillar_1F/border.bin" - -SkyPillar_1F_MapBlockdata:: - .incbin "data/layouts/SkyPillar_1F/map.bin" - - .align 2 -SkyPillar_1F_Layout:: - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_1F_MapBorder - .4byte SkyPillar_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/SkyPillar_2F/layout.inc b/data/layouts/SkyPillar_2F/layout.inc deleted file mode 100644 index 368fcd518e..0000000000 --- a/data/layouts/SkyPillar_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_2F_MapBorder:: - .incbin "data/layouts/SkyPillar_2F/border.bin" - -SkyPillar_2F_MapBlockdata:: - .incbin "data/layouts/SkyPillar_2F/map.bin" - - .align 2 -SkyPillar_2F_Layout:: - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_2F_MapBorder - .4byte SkyPillar_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/SkyPillar_3F/layout.inc b/data/layouts/SkyPillar_3F/layout.inc deleted file mode 100644 index 32ac95143a..0000000000 --- a/data/layouts/SkyPillar_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_3F_MapBorder:: - .incbin "data/layouts/SkyPillar_3F/border.bin" - -SkyPillar_3F_MapBlockdata:: - .incbin "data/layouts/SkyPillar_3F/map.bin" - - .align 2 -SkyPillar_3F_Layout:: - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_3F_MapBorder - .4byte SkyPillar_3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/SkyPillar_4F/layout.inc b/data/layouts/SkyPillar_4F/layout.inc deleted file mode 100644 index 055abf133c..0000000000 --- a/data/layouts/SkyPillar_4F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_4F_MapBorder:: - .incbin "data/layouts/SkyPillar_4F/border.bin" - -SkyPillar_4F_MapBlockdata:: - .incbin "data/layouts/SkyPillar_4F/map.bin" - - .align 2 -SkyPillar_4F_Layout:: - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_4F_MapBorder - .4byte SkyPillar_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/SkyPillar_5F/layout.inc b/data/layouts/SkyPillar_5F/layout.inc deleted file mode 100644 index 3f3bb5bc10..0000000000 --- a/data/layouts/SkyPillar_5F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_5F_MapBorder:: - .incbin "data/layouts/SkyPillar_5F/border.bin" - -SkyPillar_5F_MapBlockdata:: - .incbin "data/layouts/SkyPillar_5F/map.bin" - - .align 2 -SkyPillar_5F_Layout:: - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_5F_MapBorder - .4byte SkyPillar_5F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/SkyPillar_Entrance/layout.inc b/data/layouts/SkyPillar_Entrance/layout.inc deleted file mode 100644 index 1313bd196f..0000000000 --- a/data/layouts/SkyPillar_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_Entrance_MapBorder:: - .incbin "data/layouts/SkyPillar_Entrance/border.bin" - -SkyPillar_Entrance_MapBlockdata:: - .incbin "data/layouts/SkyPillar_Entrance/map.bin" - - .align 2 -SkyPillar_Entrance_Layout:: - .4byte 0x12 - .4byte 0x12 - .4byte SkyPillar_Entrance_MapBorder - .4byte SkyPillar_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SkyPillar_Outside/layout.inc b/data/layouts/SkyPillar_Outside/layout.inc deleted file mode 100644 index 5eb9df563b..0000000000 --- a/data/layouts/SkyPillar_Outside/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_Outside_MapBorder:: - .incbin "data/layouts/SkyPillar_Outside/border.bin" - -SkyPillar_Outside_MapBlockdata:: - .incbin "data/layouts/SkyPillar_Outside/map.bin" - - .align 2 -SkyPillar_Outside_Layout:: - .4byte 0x1c - .4byte 0x17 - .4byte SkyPillar_Outside_MapBorder - .4byte SkyPillar_Outside_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/SkyPillar_Top/layout.inc b/data/layouts/SkyPillar_Top/layout.inc deleted file mode 100644 index 646c6f95f8..0000000000 --- a/data/layouts/SkyPillar_Top/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_Top_MapBorder:: - .incbin "data/layouts/SkyPillar_Top/border.bin" - -SkyPillar_Top_MapBlockdata:: - .incbin "data/layouts/SkyPillar_Top/map.bin" - - .align 2 -SkyPillar_Top_Layout:: - .4byte 0x1b - .4byte 0x18 - .4byte SkyPillar_Top_MapBorder - .4byte SkyPillar_Top_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/SlateportCity/layout.inc b/data/layouts/SlateportCity/layout.inc deleted file mode 100644 index dfa184764d..0000000000 --- a/data/layouts/SlateportCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_MapBorder:: - .incbin "data/layouts/SlateportCity/border.bin" - -SlateportCity_MapBlockdata:: - .incbin "data/layouts/SlateportCity/map.bin" - - .align 2 -SlateportCity_Layout:: - .4byte 0x28 - .4byte 0x3c - .4byte SlateportCity_MapBorder - .4byte SlateportCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Slateport - diff --git a/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc deleted file mode 100644 index f921eb5fcc..0000000000 --- a/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_OceanicMuseum_1F_MapBorder:: - .incbin "data/layouts/SlateportCity_OceanicMuseum_1F/border.bin" - -SlateportCity_OceanicMuseum_1F_MapBlockdata:: - .incbin "data/layouts/SlateportCity_OceanicMuseum_1F/map.bin" - - .align 2 -SlateportCity_OceanicMuseum_1F_Layout:: - .4byte 0x14 - .4byte 0x9 - .4byte SlateportCity_OceanicMuseum_1F_MapBorder - .4byte SlateportCity_OceanicMuseum_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_OceanicMuseum - diff --git a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc deleted file mode 100644 index 7a69989875..0000000000 --- a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_OceanicMuseum_2F_MapBorder:: - .incbin "data/layouts/SlateportCity_OceanicMuseum_2F/border.bin" - -SlateportCity_OceanicMuseum_2F_MapBlockdata:: - .incbin "data/layouts/SlateportCity_OceanicMuseum_2F/map.bin" - - .align 2 -SlateportCity_OceanicMuseum_2F_Layout:: - .4byte 0x14 - .4byte 0x9 - .4byte SlateportCity_OceanicMuseum_2F_MapBorder - .4byte SlateportCity_OceanicMuseum_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_OceanicMuseum - diff --git a/data/layouts/SlateportCity_PokemonFanClub/layout.inc b/data/layouts/SlateportCity_PokemonFanClub/layout.inc deleted file mode 100644 index 44f9a559f0..0000000000 --- a/data/layouts/SlateportCity_PokemonFanClub/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_PokemonFanClub_MapBorder:: - .incbin "data/layouts/SlateportCity_PokemonFanClub/border.bin" - -SlateportCity_PokemonFanClub_MapBlockdata:: - .incbin "data/layouts/SlateportCity_PokemonFanClub/map.bin" - - .align 2 -SlateportCity_PokemonFanClub_Layout:: - .4byte 0xe - .4byte 0xb - .4byte SlateportCity_PokemonFanClub_MapBorder - .4byte SlateportCity_PokemonFanClub_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonFanClub - diff --git a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc deleted file mode 100644 index 00d5840c67..0000000000 --- a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_SternsShipyard_1F_MapBorder:: - .incbin "data/layouts/SlateportCity_SternsShipyard_1F/border.bin" - -SlateportCity_SternsShipyard_1F_MapBlockdata:: - .incbin "data/layouts/SlateportCity_SternsShipyard_1F/map.bin" - - .align 2 -SlateportCity_SternsShipyard_1F_Layout:: - .4byte 0x15 - .4byte 0xf - .4byte SlateportCity_SternsShipyard_1F_MapBorder - .4byte SlateportCity_SternsShipyard_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc deleted file mode 100644 index 01a969a3a2..0000000000 --- a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_SternsShipyard_2F_MapBorder:: - .incbin "data/layouts/SlateportCity_SternsShipyard_2F/border.bin" - -SlateportCity_SternsShipyard_2F_MapBlockdata:: - .incbin "data/layouts/SlateportCity_SternsShipyard_2F/map.bin" - - .align 2 -SlateportCity_SternsShipyard_2F_Layout:: - .4byte 0x11 - .4byte 0xf - .4byte SlateportCity_SternsShipyard_2F_MapBorder - .4byte SlateportCity_SternsShipyard_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/SootopolisCity/layout.inc b/data/layouts/SootopolisCity/layout.inc deleted file mode 100644 index 400a29cbd5..0000000000 --- a/data/layouts/SootopolisCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_MapBorder:: - .incbin "data/layouts/SootopolisCity/border.bin" - -SootopolisCity_MapBlockdata:: - .incbin "data/layouts/SootopolisCity/map.bin" - - .align 2 -SootopolisCity_Layout:: - .4byte 0x3c - .4byte 0x3c - .4byte SootopolisCity_MapBorder - .4byte SootopolisCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Sootopolis - diff --git a/data/layouts/SootopolisCity_Gym_1F/layout.inc b/data/layouts/SootopolisCity_Gym_1F/layout.inc deleted file mode 100644 index 4c6a6eeef9..0000000000 --- a/data/layouts/SootopolisCity_Gym_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_Gym_1F_MapBorder:: - .incbin "data/layouts/SootopolisCity_Gym_1F/border.bin" - -SootopolisCity_Gym_1F_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_Gym_1F/map.bin" - - .align 2 -SootopolisCity_Gym_1F_Layout:: - .4byte 0x11 - .4byte 0x1a - .4byte SootopolisCity_Gym_1F_MapBorder - .4byte SootopolisCity_Gym_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_SootopolisGym - diff --git a/data/layouts/SootopolisCity_Gym_B1F/layout.inc b/data/layouts/SootopolisCity_Gym_B1F/layout.inc deleted file mode 100644 index 7eb90fb71e..0000000000 --- a/data/layouts/SootopolisCity_Gym_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_Gym_B1F_MapBorder:: - .incbin "data/layouts/SootopolisCity_Gym_B1F/border.bin" - -SootopolisCity_Gym_B1F_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_Gym_B1F/map.bin" - - .align 2 -SootopolisCity_Gym_B1F_Layout:: - .4byte 0x11 - .4byte 0x1a - .4byte SootopolisCity_Gym_B1F_MapBorder - .4byte SootopolisCity_Gym_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_SootopolisGym - diff --git a/data/layouts/SootopolisCity_House1/layout.inc b/data/layouts/SootopolisCity_House1/layout.inc deleted file mode 100644 index 1ad9cc41c9..0000000000 --- a/data/layouts/SootopolisCity_House1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House1_MapBorder:: - .incbin "data/layouts/SootopolisCity_House1/border.bin" - -SootopolisCity_House1_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_House1/map.bin" - - .align 2 -SootopolisCity_House1_Layout:: - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House1_MapBorder - .4byte SootopolisCity_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/SootopolisCity_House2/layout.inc b/data/layouts/SootopolisCity_House2/layout.inc deleted file mode 100644 index 9007d584bc..0000000000 --- a/data/layouts/SootopolisCity_House2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House2_MapBorder:: - .incbin "data/layouts/SootopolisCity_House2/border.bin" - -SootopolisCity_House2_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_House2/map.bin" - - .align 2 -SootopolisCity_House2_Layout:: - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House2_MapBorder - .4byte SootopolisCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/SootopolisCity_House3/layout.inc b/data/layouts/SootopolisCity_House3/layout.inc deleted file mode 100644 index 540f4306cd..0000000000 --- a/data/layouts/SootopolisCity_House3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House3_MapBorder:: - .incbin "data/layouts/SootopolisCity_House3/border.bin" - -SootopolisCity_House3_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_House3/map.bin" - - .align 2 -SootopolisCity_House3_Layout:: - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House3_MapBorder - .4byte SootopolisCity_House3_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc b/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc deleted file mode 100644 index 152563eb60..0000000000 --- a/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_LotadAndSeedotHouse_MapBorder:: - .incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin" - -SootopolisCity_LotadAndSeedotHouse_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin" - - .align 2 -SootopolisCity_LotadAndSeedotHouse_Layout:: - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_LotadAndSeedotHouse_MapBorder - .4byte SootopolisCity_LotadAndSeedotHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc deleted file mode 100644 index 0b846950ed..0000000000 --- a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_MysteryEventsHouse_1F_MapBorder:: - .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin" - -SootopolisCity_MysteryEventsHouse_1F_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin" - - .align 2 -SootopolisCity_MysteryEventsHouse_1F_Layout:: - .4byte 0xb - .4byte 0x8 - .4byte SootopolisCity_MysteryEventsHouse_1F_MapBorder - .4byte SootopolisCity_MysteryEventsHouse_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MysteryEventsHouse - diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc deleted file mode 100644 index 1bb92b9339..0000000000 --- a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_MysteryEventsHouse_B1F_MapBorder:: - .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin" - -SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin" - - .align 2 -SootopolisCity_MysteryEventsHouse_B1F_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBorder - .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MysteryEventsHouse - diff --git a/data/layouts/SouthernIsland_Exterior/layout.inc b/data/layouts/SouthernIsland_Exterior/layout.inc deleted file mode 100644 index 4a62cd3f5d..0000000000 --- a/data/layouts/SouthernIsland_Exterior/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SouthernIsland_Exterior_MapBorder:: - .incbin "data/layouts/SouthernIsland_Exterior/border.bin" - -SouthernIsland_Exterior_MapBlockdata:: - .incbin "data/layouts/SouthernIsland_Exterior/map.bin" - - .align 2 -SouthernIsland_Exterior_Layout:: - .4byte 0x21 - .4byte 0x1e - .4byte SouthernIsland_Exterior_MapBorder - .4byte SouthernIsland_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - diff --git a/data/layouts/SouthernIsland_Interior/layout.inc b/data/layouts/SouthernIsland_Interior/layout.inc deleted file mode 100644 index b4d9a35d29..0000000000 --- a/data/layouts/SouthernIsland_Interior/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SouthernIsland_Interior_MapBorder:: - .incbin "data/layouts/SouthernIsland_Interior/border.bin" - -SouthernIsland_Interior_MapBlockdata:: - .incbin "data/layouts/SouthernIsland_Interior/map.bin" - - .align 2 -SouthernIsland_Interior_Layout:: - .4byte 0x1b - .4byte 0x18 - .4byte SouthernIsland_Interior_MapBorder - .4byte SouthernIsland_Interior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - diff --git a/data/layouts/TerraCave_End/layout.inc b/data/layouts/TerraCave_End/layout.inc deleted file mode 100644 index 0865a8e5bb..0000000000 --- a/data/layouts/TerraCave_End/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TerraCave_End_MapBorder:: - .incbin "data/layouts/TerraCave_End/border.bin" - -TerraCave_End_MapBlockdata:: - .incbin "data/layouts/TerraCave_End/map.bin" - - .align 2 -TerraCave_End_Layout:: - .4byte 0x1b - .4byte 0x1e - .4byte TerraCave_End_MapBorder - .4byte TerraCave_End_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/TerraCave_Entrance/layout.inc b/data/layouts/TerraCave_Entrance/layout.inc deleted file mode 100644 index 19d50ef442..0000000000 --- a/data/layouts/TerraCave_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TerraCave_Entrance_MapBorder:: - .incbin "data/layouts/TerraCave_Entrance/border.bin" - -TerraCave_Entrance_MapBlockdata:: - .incbin "data/layouts/TerraCave_Entrance/map.bin" - - .align 2 -TerraCave_Entrance_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte TerraCave_Entrance_MapBorder - .4byte TerraCave_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/TradeCenter/layout.inc b/data/layouts/TradeCenter/layout.inc deleted file mode 100644 index 5e0297e7ad..0000000000 --- a/data/layouts/TradeCenter/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TradeCenter_MapBorder:: - .incbin "data/layouts/TradeCenter/border.bin" - -TradeCenter_MapBlockdata:: - .incbin "data/layouts/TradeCenter/map.bin" - - .align 2 -TradeCenter_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte TradeCenter_MapBorder - .4byte TradeCenter_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - diff --git a/data/layouts/TrainerHill_1F/layout.inc b/data/layouts/TrainerHill_1F/layout.inc deleted file mode 100644 index 2009cd49e5..0000000000 --- a/data/layouts/TrainerHill_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_1F_MapBorder:: - .incbin "data/layouts/TrainerHill_1F/border.bin" - -TrainerHill_1F_MapBlockdata:: - .incbin "data/layouts/TrainerHill_1F/map.bin" - - .align 2 -TrainerHill_1F_Layout:: - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_1F_MapBorder - .4byte TrainerHill_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - diff --git a/data/layouts/TrainerHill_2F/layout.inc b/data/layouts/TrainerHill_2F/layout.inc deleted file mode 100644 index f67b54bf1d..0000000000 --- a/data/layouts/TrainerHill_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_2F_MapBorder:: - .incbin "data/layouts/TrainerHill_2F/border.bin" - -TrainerHill_2F_MapBlockdata:: - .incbin "data/layouts/TrainerHill_2F/map.bin" - - .align 2 -TrainerHill_2F_Layout:: - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_2F_MapBorder - .4byte TrainerHill_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - diff --git a/data/layouts/TrainerHill_3F/layout.inc b/data/layouts/TrainerHill_3F/layout.inc deleted file mode 100644 index 280517f410..0000000000 --- a/data/layouts/TrainerHill_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_3F_MapBorder:: - .incbin "data/layouts/TrainerHill_3F/border.bin" - -TrainerHill_3F_MapBlockdata:: - .incbin "data/layouts/TrainerHill_3F/map.bin" - - .align 2 -TrainerHill_3F_Layout:: - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_3F_MapBorder - .4byte TrainerHill_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - diff --git a/data/layouts/TrainerHill_4F/layout.inc b/data/layouts/TrainerHill_4F/layout.inc deleted file mode 100644 index eed0b01209..0000000000 --- a/data/layouts/TrainerHill_4F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_4F_MapBorder:: - .incbin "data/layouts/TrainerHill_4F/border.bin" - -TrainerHill_4F_MapBlockdata:: - .incbin "data/layouts/TrainerHill_4F/map.bin" - - .align 2 -TrainerHill_4F_Layout:: - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_4F_MapBorder - .4byte TrainerHill_4F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - diff --git a/data/layouts/TrainerHill_Entrance/layout.inc b/data/layouts/TrainerHill_Entrance/layout.inc deleted file mode 100644 index 896f43e0d4..0000000000 --- a/data/layouts/TrainerHill_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_Entrance_MapBorder:: - .incbin "data/layouts/TrainerHill_Entrance/border.bin" - -TrainerHill_Entrance_MapBlockdata:: - .incbin "data/layouts/TrainerHill_Entrance/map.bin" - - .align 2 -TrainerHill_Entrance_Layout:: - .4byte 0x13 - .4byte 0x11 - .4byte TrainerHill_Entrance_MapBorder - .4byte TrainerHill_Entrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - diff --git a/data/layouts/TrainerHill_Roof/layout.inc b/data/layouts/TrainerHill_Roof/layout.inc deleted file mode 100644 index 9477dceda9..0000000000 --- a/data/layouts/TrainerHill_Roof/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_Roof_MapBorder:: - .incbin "data/layouts/TrainerHill_Roof/border.bin" - -TrainerHill_Roof_MapBlockdata:: - .incbin "data/layouts/TrainerHill_Roof/map.bin" - - .align 2 -TrainerHill_Roof_Layout:: - .4byte 0x19 - .4byte 0x10 - .4byte TrainerHill_Roof_MapBorder - .4byte TrainerHill_Roof_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - diff --git a/data/layouts/Underwater1/layout.inc b/data/layouts/Underwater1/layout.inc deleted file mode 100644 index 8e027bbd28..0000000000 --- a/data/layouts/Underwater1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater1_MapBorder:: - .incbin "data/layouts/Underwater1/border.bin" - -Underwater1_MapBlockdata:: - .incbin "data/layouts/Underwater1/map.bin" - - .align 2 -Underwater1_Layout:: - .4byte 0x50 - .4byte 0x50 - .4byte Underwater1_MapBorder - .4byte Underwater1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater2/layout.inc b/data/layouts/Underwater2/layout.inc deleted file mode 100644 index ac6350d474..0000000000 --- a/data/layouts/Underwater2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater2_MapBorder:: - .incbin "data/layouts/Underwater2/border.bin" - -Underwater2_MapBlockdata:: - .incbin "data/layouts/Underwater2/map.bin" - - .align 2 -Underwater2_Layout:: - .4byte 0x50 - .4byte 0x50 - .4byte Underwater2_MapBorder - .4byte Underwater2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater3/layout.inc b/data/layouts/Underwater3/layout.inc deleted file mode 100644 index c365b6b8f5..0000000000 --- a/data/layouts/Underwater3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater3_MapBorder:: - .incbin "data/layouts/Underwater3/border.bin" - -Underwater3_MapBlockdata:: - .incbin "data/layouts/Underwater3/map.bin" - - .align 2 -Underwater3_Layout:: - .4byte 0x50 - .4byte 0x50 - .4byte Underwater3_MapBorder - .4byte Underwater3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater4/layout.inc b/data/layouts/Underwater4/layout.inc deleted file mode 100644 index 9e22e4e409..0000000000 --- a/data/layouts/Underwater4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater4_MapBorder:: - .incbin "data/layouts/Underwater4/border.bin" - -Underwater4_MapBlockdata:: - .incbin "data/layouts/Underwater4/map.bin" - - .align 2 -Underwater4_Layout:: - .4byte 0x78 - .4byte 0x28 - .4byte Underwater4_MapBorder - .4byte Underwater4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater5/layout.inc b/data/layouts/Underwater5/layout.inc deleted file mode 100644 index 6394eec544..0000000000 --- a/data/layouts/Underwater5/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater5_MapBorder:: - .incbin "data/layouts/Underwater5/border.bin" - -Underwater5_MapBlockdata:: - .incbin "data/layouts/Underwater5/map.bin" - - .align 2 -Underwater5_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Underwater5_MapBorder - .4byte Underwater5_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater6/layout.inc b/data/layouts/Underwater6/layout.inc deleted file mode 100644 index 247af44bdb..0000000000 --- a/data/layouts/Underwater6/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater6_MapBorder:: - .incbin "data/layouts/Underwater6/border.bin" - -Underwater6_MapBlockdata:: - .incbin "data/layouts/Underwater6/map.bin" - - .align 2 -Underwater6_Layout:: - .4byte 0x28 - .4byte 0x50 - .4byte Underwater6_MapBorder - .4byte Underwater6_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater7/layout.inc b/data/layouts/Underwater7/layout.inc deleted file mode 100644 index 5c2670b111..0000000000 --- a/data/layouts/Underwater7/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater7_MapBorder:: - .incbin "data/layouts/Underwater7/border.bin" - -Underwater7_MapBlockdata:: - .incbin "data/layouts/Underwater7/map.bin" - - .align 2 -Underwater7_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Underwater7_MapBorder - .4byte Underwater7_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater_MarineCave/layout.inc b/data/layouts/Underwater_MarineCave/layout.inc deleted file mode 100644 index 52a3a7851c..0000000000 --- a/data/layouts/Underwater_MarineCave/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_MarineCave_MapBorder:: - .incbin "data/layouts/Underwater_MarineCave/border.bin" - -Underwater_MarineCave_MapBlockdata:: - .incbin "data/layouts/Underwater_MarineCave/map.bin" - - .align 2 -Underwater_MarineCave_Layout:: - .4byte 0x14 - .4byte 0xa - .4byte Underwater_MarineCave_MapBorder - .4byte Underwater_MarineCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater_Route134/layout.inc b/data/layouts/Underwater_Route134/layout.inc deleted file mode 100644 index 1534564a46..0000000000 --- a/data/layouts/Underwater_Route134/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_Route134_MapBorder:: - .incbin "data/layouts/Underwater_Route134/border.bin" - -Underwater_Route134_MapBlockdata:: - .incbin "data/layouts/Underwater_Route134/map.bin" - - .align 2 -Underwater_Route134_Layout:: - .4byte 0x12 - .4byte 0xa - .4byte Underwater_Route134_MapBorder - .4byte Underwater_Route134_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater_SeafloorCavern/layout.inc b/data/layouts/Underwater_SeafloorCavern/layout.inc deleted file mode 100644 index 5bce06a6b1..0000000000 --- a/data/layouts/Underwater_SeafloorCavern/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_SeafloorCavern_MapBorder:: - .incbin "data/layouts/Underwater_SeafloorCavern/border.bin" - -Underwater_SeafloorCavern_MapBlockdata:: - .incbin "data/layouts/Underwater_SeafloorCavern/map.bin" - - .align 2 -Underwater_SeafloorCavern_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte Underwater_SeafloorCavern_MapBorder - .4byte Underwater_SeafloorCavern_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater_SealedChamber/layout.inc b/data/layouts/Underwater_SealedChamber/layout.inc deleted file mode 100644 index 5baf5dde85..0000000000 --- a/data/layouts/Underwater_SealedChamber/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_SealedChamber_MapBorder:: - .incbin "data/layouts/Underwater_SealedChamber/border.bin" - -Underwater_SealedChamber_MapBlockdata:: - .incbin "data/layouts/Underwater_SealedChamber/map.bin" - - .align 2 -Underwater_SealedChamber_Layout:: - .4byte 0x16 - .4byte 0x30 - .4byte Underwater_SealedChamber_MapBorder - .4byte Underwater_SealedChamber_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater_SootopolisCity/layout.inc b/data/layouts/Underwater_SootopolisCity/layout.inc deleted file mode 100644 index 4a1b0aa026..0000000000 --- a/data/layouts/Underwater_SootopolisCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_SootopolisCity_MapBorder:: - .incbin "data/layouts/Underwater_SootopolisCity/border.bin" - -Underwater_SootopolisCity_MapBlockdata:: - .incbin "data/layouts/Underwater_SootopolisCity/map.bin" - - .align 2 -Underwater_SootopolisCity_Layout:: - .4byte 0x14 - .4byte 0xa - .4byte Underwater_SootopolisCity_MapBorder - .4byte Underwater_SootopolisCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/UnionRoom/layout.inc b/data/layouts/UnionRoom/layout.inc deleted file mode 100644 index 0c2a065a55..0000000000 --- a/data/layouts/UnionRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnionRoom_MapBorder:: - .incbin "data/layouts/UnionRoom/border.bin" - -UnionRoom_MapBlockdata:: - .incbin "data/layouts/UnionRoom/map.bin" - - .align 2 -UnionRoom_Layout:: - .4byte 0xf - .4byte 0xc - .4byte UnionRoom_MapBorder - .4byte UnionRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_UnionRoom - diff --git a/data/layouts/UnknownMap_08417FC4/layout.inc b/data/layouts/UnknownMap_08417FC4/layout.inc deleted file mode 100644 index 41e954b4ed..0000000000 --- a/data/layouts/UnknownMap_08417FC4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08417FC4_MapBorder:: - .incbin "data/layouts/UnknownMap_08417FC4/border.bin" - -UnknownMap_08417FC4_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08417FC4/map.bin" - - .align 2 -UnknownMap_08417FC4_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte UnknownMap_08417FC4_MapBorder - .4byte UnknownMap_08417FC4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_08428450/layout.inc b/data/layouts/UnknownMap_08428450/layout.inc deleted file mode 100644 index f1695ec66b..0000000000 --- a/data/layouts/UnknownMap_08428450/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08428450_MapBorder:: - .incbin "data/layouts/UnknownMap_08428450/border.bin" - -UnknownMap_08428450_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08428450/map.bin" - - .align 2 -UnknownMap_08428450_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_08428450_MapBorder - .4byte UnknownMap_08428450_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/UnknownMap_084294C4/layout.inc b/data/layouts/UnknownMap_084294C4/layout.inc deleted file mode 100644 index f19bd682d7..0000000000 --- a/data/layouts/UnknownMap_084294C4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_084294C4_MapBorder:: - .incbin "data/layouts/UnknownMap_084294C4/border.bin" - -UnknownMap_084294C4_MapBlockdata:: - .incbin "data/layouts/UnknownMap_084294C4/map.bin" - - .align 2 -UnknownMap_084294C4_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_084294C4_MapBorder - .4byte UnknownMap_084294C4_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/UnknownMap_084294E8/layout.inc b/data/layouts/UnknownMap_084294E8/layout.inc deleted file mode 100644 index e351524e16..0000000000 --- a/data/layouts/UnknownMap_084294E8/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_084294E8_MapBorder:: - .incbin "data/layouts/UnknownMap_084294E8/border.bin" - -UnknownMap_084294E8_MapBlockdata:: - .incbin "data/layouts/UnknownMap_084294E8/map.bin" - - .align 2 -UnknownMap_084294E8_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_084294E8_MapBorder - .4byte UnknownMap_084294E8_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/UnknownMap_0843E6C0/layout.inc b/data/layouts/UnknownMap_0843E6C0/layout.inc deleted file mode 100644 index fd01ddc105..0000000000 --- a/data/layouts/UnknownMap_0843E6C0/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E6C0_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E6C0/border.bin" - -UnknownMap_0843E6C0_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E6C0/map.bin" - - .align 2 -UnknownMap_0843E6C0_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E6C0_MapBorder - .4byte UnknownMap_0843E6C0_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E6E4/layout.inc b/data/layouts/UnknownMap_0843E6E4/layout.inc deleted file mode 100644 index 80ad931275..0000000000 --- a/data/layouts/UnknownMap_0843E6E4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E6E4_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E6E4/border.bin" - -UnknownMap_0843E6E4_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E6E4/map.bin" - - .align 2 -UnknownMap_0843E6E4_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E6E4_MapBorder - .4byte UnknownMap_0843E6E4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E708/layout.inc b/data/layouts/UnknownMap_0843E708/layout.inc deleted file mode 100644 index 16d4e400ca..0000000000 --- a/data/layouts/UnknownMap_0843E708/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E708_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E708/border.bin" - -UnknownMap_0843E708_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E708/map.bin" - - .align 2 -UnknownMap_0843E708_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E708_MapBorder - .4byte UnknownMap_0843E708_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E72C/layout.inc b/data/layouts/UnknownMap_0843E72C/layout.inc deleted file mode 100644 index c6541b3ea9..0000000000 --- a/data/layouts/UnknownMap_0843E72C/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E72C_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E72C/border.bin" - -UnknownMap_0843E72C_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E72C/map.bin" - - .align 2 -UnknownMap_0843E72C_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E72C_MapBorder - .4byte UnknownMap_0843E72C_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E750/layout.inc b/data/layouts/UnknownMap_0843E750/layout.inc deleted file mode 100644 index e566a93b71..0000000000 --- a/data/layouts/UnknownMap_0843E750/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E750_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E750/border.bin" - -UnknownMap_0843E750_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E750/map.bin" - - .align 2 -UnknownMap_0843E750_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E750_MapBorder - .4byte UnknownMap_0843E750_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E774/layout.inc b/data/layouts/UnknownMap_0843E774/layout.inc deleted file mode 100644 index ce1a438eb0..0000000000 --- a/data/layouts/UnknownMap_0843E774/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E774_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E774/border.bin" - -UnknownMap_0843E774_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E774/map.bin" - - .align 2 -UnknownMap_0843E774_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E774_MapBorder - .4byte UnknownMap_0843E774_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E798/layout.inc b/data/layouts/UnknownMap_0843E798/layout.inc deleted file mode 100644 index 179e0d881d..0000000000 --- a/data/layouts/UnknownMap_0843E798/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E798_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E798/border.bin" - -UnknownMap_0843E798_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E798/map.bin" - - .align 2 -UnknownMap_0843E798_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E798_MapBorder - .4byte UnknownMap_0843E798_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E7BC/layout.inc b/data/layouts/UnknownMap_0843E7BC/layout.inc deleted file mode 100644 index 907ec6266d..0000000000 --- a/data/layouts/UnknownMap_0843E7BC/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E7BC_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E7BC/border.bin" - -UnknownMap_0843E7BC_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E7BC/map.bin" - - .align 2 -UnknownMap_0843E7BC_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E7BC_MapBorder - .4byte UnknownMap_0843E7BC_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E7E0/layout.inc b/data/layouts/UnknownMap_0843E7E0/layout.inc deleted file mode 100644 index c56046ef18..0000000000 --- a/data/layouts/UnknownMap_0843E7E0/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E7E0_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E7E0/border.bin" - -UnknownMap_0843E7E0_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E7E0/map.bin" - - .align 2 -UnknownMap_0843E7E0_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E7E0_MapBorder - .4byte UnknownMap_0843E7E0_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E804/layout.inc b/data/layouts/UnknownMap_0843E804/layout.inc deleted file mode 100644 index 49e32dbc76..0000000000 --- a/data/layouts/UnknownMap_0843E804/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E804_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E804/border.bin" - -UnknownMap_0843E804_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E804/map.bin" - - .align 2 -UnknownMap_0843E804_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E804_MapBorder - .4byte UnknownMap_0843E804_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E828/layout.inc b/data/layouts/UnknownMap_0843E828/layout.inc deleted file mode 100644 index 3cbe672998..0000000000 --- a/data/layouts/UnknownMap_0843E828/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E828_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E828/border.bin" - -UnknownMap_0843E828_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E828/map.bin" - - .align 2 -UnknownMap_0843E828_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E828_MapBorder - .4byte UnknownMap_0843E828_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E84C/layout.inc b/data/layouts/UnknownMap_0843E84C/layout.inc deleted file mode 100644 index 7449536bf7..0000000000 --- a/data/layouts/UnknownMap_0843E84C/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E84C_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E84C/border.bin" - -UnknownMap_0843E84C_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E84C/map.bin" - - .align 2 -UnknownMap_0843E84C_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E84C_MapBorder - .4byte UnknownMap_0843E84C_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E870/layout.inc b/data/layouts/UnknownMap_0843E870/layout.inc deleted file mode 100644 index 23880a79c7..0000000000 --- a/data/layouts/UnknownMap_0843E870/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E870_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E870/border.bin" - -UnknownMap_0843E870_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E870/map.bin" - - .align 2 -UnknownMap_0843E870_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E870_MapBorder - .4byte UnknownMap_0843E870_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E894/layout.inc b/data/layouts/UnknownMap_0843E894/layout.inc deleted file mode 100755 index e42bfcdd96..0000000000 --- a/data/layouts/UnknownMap_0843E894/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E894_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E894/border.bin" - -UnknownMap_0843E894_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E894/map.bin" - - .align 2 -UnknownMap_0843E894_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E894_MapBorder - .4byte UnknownMap_0843E894_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_08447028/layout.inc b/data/layouts/UnknownMap_08447028/layout.inc deleted file mode 100644 index 39d7bb18ab..0000000000 --- a/data/layouts/UnknownMap_08447028/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08447028_MapBorder:: - .incbin "data/layouts/UnknownMap_08447028/border.bin" - -UnknownMap_08447028_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08447028/map.bin" - - .align 2 -UnknownMap_08447028_Layout:: - .4byte 0x3A - .4byte 0x1A - .4byte UnknownMap_08447028_MapBorder - .4byte UnknownMap_08447028_MapBlockdata - .4byte gTileset_General - .4byte 0 - diff --git a/data/layouts/UnknownMap_0845A394/layout.inc b/data/layouts/UnknownMap_0845A394/layout.inc deleted file mode 100644 index a180340f8b..0000000000 --- a/data/layouts/UnknownMap_0845A394/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0845A394_MapBorder:: - .incbin "data/layouts/UnknownMap_0845A394/border.bin" - -UnknownMap_0845A394_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0845A394/map.bin" - - .align 2 -UnknownMap_0845A394_Layout:: - .4byte 0x13 - .4byte 0x13 - .4byte UnknownMap_0845A394_MapBorder - .4byte UnknownMap_0845A394_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0845D470/layout.inc b/data/layouts/UnknownMap_0845D470/layout.inc deleted file mode 100644 index ce6a4c819a..0000000000 --- a/data/layouts/UnknownMap_0845D470/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0845D470_MapBorder:: - .incbin "data/layouts/UnknownMap_0845D470/border.bin" - -UnknownMap_0845D470_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0845D470/map.bin" - - .align 2 -UnknownMap_0845D470_Layout:: - .4byte 0x3C - .4byte 0x28 - .4byte UnknownMap_0845D470_MapBorder - .4byte UnknownMap_0845D470_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/UnknownMap_0845ECB4/layout.inc b/data/layouts/UnknownMap_0845ECB4/layout.inc deleted file mode 100644 index 535c4a6e9a..0000000000 --- a/data/layouts/UnknownMap_0845ECB4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0845ECB4_MapBorder:: - .incbin "data/layouts/UnknownMap_0845ECB4/border.bin" - -UnknownMap_0845ECB4_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0845ECB4/map.bin" - - .align 2 -UnknownMap_0845ECB4_Layout:: - .4byte 0x1B - .4byte 0x2E - .4byte UnknownMap_0845ECB4_MapBorder - .4byte UnknownMap_0845ECB4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_08469200/layout.inc b/data/layouts/UnknownMap_08469200/layout.inc deleted file mode 100644 index 22191c61cf..0000000000 --- a/data/layouts/UnknownMap_08469200/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08469200_MapBorder:: - .incbin "data/layouts/UnknownMap_08469200/border.bin" - -UnknownMap_08469200_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08469200/map.bin" - - .align 2 -UnknownMap_08469200_Layout:: - .4byte 0x3C - .4byte 0x3C - .4byte UnknownMap_08469200_MapBorder - .4byte UnknownMap_08469200_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Sootopolis - diff --git a/data/layouts/UnknownMap_084693AC/layout.inc b/data/layouts/UnknownMap_084693AC/layout.inc deleted file mode 100644 index 0106c666a5..0000000000 --- a/data/layouts/UnknownMap_084693AC/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_084693AC_MapBorder:: - .incbin "data/layouts/UnknownMap_084693AC/border.bin" - -UnknownMap_084693AC_MapBlockdata:: - .incbin "data/layouts/UnknownMap_084693AC/map.bin" - - .align 2 -UnknownMap_084693AC_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_084693AC_MapBorder - .4byte UnknownMap_084693AC_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - diff --git a/data/layouts/UnknownMap_08480DAC/layout.inc b/data/layouts/UnknownMap_08480DAC/layout.inc deleted file mode 100644 index b440362392..0000000000 --- a/data/layouts/UnknownMap_08480DAC/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08480DAC_MapBorder:: - .incbin "data/layouts/UnknownMap_08480DAC/border.bin" - -UnknownMap_08480DAC_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08480DAC/map.bin" - - .align 2 -UnknownMap_08480DAC_Layout:: - .4byte 0xD - .4byte 0xD - .4byte UnknownMap_08480DAC_MapBorder - .4byte UnknownMap_08480DAC_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - diff --git a/data/layouts/UnknownMap_08480F54/layout.inc b/data/layouts/UnknownMap_08480F54/layout.inc deleted file mode 100644 index 4593a8ba47..0000000000 --- a/data/layouts/UnknownMap_08480F54/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08480F54_MapBorder:: - .incbin "data/layouts/UnknownMap_08480F54/border.bin" - -UnknownMap_08480F54_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08480F54/map.bin" - - .align 2 -UnknownMap_08480F54_Layout:: - .4byte 0xE - .4byte 0xE - .4byte UnknownMap_08480F54_MapBorder - .4byte UnknownMap_08480F54_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/UnknownMap_084810FC/layout.inc b/data/layouts/UnknownMap_084810FC/layout.inc deleted file mode 100644 index 6b73bfdcee..0000000000 --- a/data/layouts/UnknownMap_084810FC/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_084810FC_MapBorder:: - .incbin "data/layouts/UnknownMap_084810FC/border.bin" - -UnknownMap_084810FC_MapBlockdata:: - .incbin "data/layouts/UnknownMap_084810FC/map.bin" - - .align 2 -UnknownMap_084810FC_Layout:: - .4byte 0xE - .4byte 0xE - .4byte UnknownMap_084810FC_MapBorder - .4byte UnknownMap_084810FC_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/UnknownMap_084812A4/layout.inc b/data/layouts/UnknownMap_084812A4/layout.inc deleted file mode 100644 index a394c8ef3f..0000000000 --- a/data/layouts/UnknownMap_084812A4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_084812A4_MapBorder:: - .incbin "data/layouts/UnknownMap_084812A4/border.bin" - -UnknownMap_084812A4_MapBlockdata:: - .incbin "data/layouts/UnknownMap_084812A4/map.bin" - - .align 2 -UnknownMap_084812A4_Layout:: - .4byte 0xE - .4byte 0xE - .4byte UnknownMap_084812A4_MapBorder - .4byte UnknownMap_084812A4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/UnknownMap_0848144C/layout.inc b/data/layouts/UnknownMap_0848144C/layout.inc deleted file mode 100644 index cabe0b25b2..0000000000 --- a/data/layouts/UnknownMap_0848144C/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0848144C_MapBorder:: - .incbin "data/layouts/UnknownMap_0848144C/border.bin" - -UnknownMap_0848144C_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0848144C/map.bin" - - .align 2 -UnknownMap_0848144C_Layout:: - .4byte 0xE - .4byte 0xE - .4byte UnknownMap_0848144C_MapBorder - .4byte UnknownMap_0848144C_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/UnknownMap_084815F4/layout.inc b/data/layouts/UnknownMap_084815F4/layout.inc deleted file mode 100644 index 73ed49c79a..0000000000 --- a/data/layouts/UnknownMap_084815F4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_084815F4_MapBorder:: - .incbin "data/layouts/UnknownMap_084815F4/border.bin" - -UnknownMap_084815F4_MapBlockdata:: - .incbin "data/layouts/UnknownMap_084815F4/map.bin" - - .align 2 -UnknownMap_084815F4_Layout:: - .4byte 0xE - .4byte 0xE - .4byte UnknownMap_084815F4_MapBorder - .4byte UnknownMap_084815F4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/UnknownMap_08481B24/layout.inc b/data/layouts/UnknownMap_08481B24/layout.inc deleted file mode 100644 index 250528be04..0000000000 --- a/data/layouts/UnknownMap_08481B24/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08481B24_MapBorder:: - .incbin "data/layouts/UnknownMap_08481B24/border.bin" - -UnknownMap_08481B24_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08481B24/map.bin" - - .align 2 -UnknownMap_08481B24_Layout:: - .4byte 0x1B - .4byte 0x18 - .4byte UnknownMap_08481B24_MapBorder - .4byte UnknownMap_08481B24_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/UnknownMap_08481DBC/layout.inc b/data/layouts/UnknownMap_08481DBC/layout.inc deleted file mode 100644 index 465b92dc82..0000000000 --- a/data/layouts/UnknownMap_08481DBC/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08481DBC_MapBorder:: - .incbin "data/layouts/UnknownMap_08481DBC/border.bin" - -UnknownMap_08481DBC_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08481DBC/map.bin" - - .align 2 -UnknownMap_08481DBC_Layout:: - .4byte 0xB - .4byte 0x8 - .4byte UnknownMap_08481DBC_MapBorder - .4byte UnknownMap_08481DBC_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MysteryEventsHouse - diff --git a/data/layouts/UnknownMap_25_29/layout.inc b/data/layouts/UnknownMap_25_29/layout.inc deleted file mode 100644 index bb7002a20e..0000000000 --- a/data/layouts/UnknownMap_25_29/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_29_MapBorder:: - .incbin "data/layouts/UnknownMap_25_29/border.bin" - -UnknownMap_25_29_MapBlockdata:: - .incbin "data/layouts/UnknownMap_25_29/map.bin" - - .align 2 -UnknownMap_25_29_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_29_MapBorder - .4byte UnknownMap_25_29_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/UnknownMap_25_30/layout.inc b/data/layouts/UnknownMap_25_30/layout.inc deleted file mode 100644 index 5937a21952..0000000000 --- a/data/layouts/UnknownMap_25_30/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_30_MapBorder:: - .incbin "data/layouts/UnknownMap_25_30/border.bin" - -UnknownMap_25_30_MapBlockdata:: - .incbin "data/layouts/UnknownMap_25_30/map.bin" - - .align 2 -UnknownMap_25_30_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_30_MapBorder - .4byte UnknownMap_25_30_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/UnknownMap_25_31/layout.inc b/data/layouts/UnknownMap_25_31/layout.inc deleted file mode 100644 index 3dcbc7986a..0000000000 --- a/data/layouts/UnknownMap_25_31/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_31_MapBorder:: - .incbin "data/layouts/UnknownMap_25_31/border.bin" - -UnknownMap_25_31_MapBlockdata:: - .incbin "data/layouts/UnknownMap_25_31/map.bin" - - .align 2 -UnknownMap_25_31_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_31_MapBorder - .4byte UnknownMap_25_31_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/UnknownMap_25_32/layout.inc b/data/layouts/UnknownMap_25_32/layout.inc deleted file mode 100644 index 0ffe4c0b7c..0000000000 --- a/data/layouts/UnknownMap_25_32/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_32_MapBorder:: - .incbin "data/layouts/UnknownMap_25_32/border.bin" - -UnknownMap_25_32_MapBlockdata:: - .incbin "data/layouts/UnknownMap_25_32/map.bin" - - .align 2 -UnknownMap_25_32_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_32_MapBorder - .4byte UnknownMap_25_32_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/UnknownMap_25_33/layout.inc b/data/layouts/UnknownMap_25_33/layout.inc deleted file mode 100644 index 3f8113a6fb..0000000000 --- a/data/layouts/UnknownMap_25_33/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_33_MapBorder:: - .incbin "data/layouts/UnknownMap_25_33/border.bin" - -UnknownMap_25_33_MapBlockdata:: - .incbin "data/layouts/UnknownMap_25_33/map.bin" - - .align 2 -UnknownMap_25_33_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_33_MapBorder - .4byte UnknownMap_25_33_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/UnknownMap_25_34/layout.inc b/data/layouts/UnknownMap_25_34/layout.inc deleted file mode 100644 index 6001d8fe79..0000000000 --- a/data/layouts/UnknownMap_25_34/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_34_MapBorder:: - .incbin "data/layouts/UnknownMap_25_34/border.bin" - -UnknownMap_25_34_MapBlockdata:: - .incbin "data/layouts/UnknownMap_25_34/map.bin" - - .align 2 -UnknownMap_25_34_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_34_MapBorder - .4byte UnknownMap_25_34_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/VerdanturfTown/layout.inc b/data/layouts/VerdanturfTown/layout.inc deleted file mode 100644 index ce58c0798e..0000000000 --- a/data/layouts/VerdanturfTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_MapBorder:: - .incbin "data/layouts/VerdanturfTown/border.bin" - -VerdanturfTown_MapBlockdata:: - .incbin "data/layouts/VerdanturfTown/map.bin" - - .align 2 -VerdanturfTown_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte VerdanturfTown_MapBorder - .4byte VerdanturfTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - diff --git a/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc b/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc deleted file mode 100644 index 21fca69535..0000000000 --- a/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_BattleTentBattleRoom_MapBorder:: - .incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin" - -VerdanturfTown_BattleTentBattleRoom_MapBlockdata:: - .incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin" - - .align 2 -VerdanturfTown_BattleTentBattleRoom_Layout:: - .4byte 0xd - .4byte 0x9 - .4byte VerdanturfTown_BattleTentBattleRoom_MapBorder - .4byte VerdanturfTown_BattleTentBattleRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattleTent - diff --git a/data/layouts/VerdanturfTown_WandasHouse/layout.inc b/data/layouts/VerdanturfTown_WandasHouse/layout.inc deleted file mode 100644 index ae5d1a7cf6..0000000000 --- a/data/layouts/VerdanturfTown_WandasHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_WandasHouse_MapBorder:: - .incbin "data/layouts/VerdanturfTown_WandasHouse/border.bin" - -VerdanturfTown_WandasHouse_MapBlockdata:: - .incbin "data/layouts/VerdanturfTown_WandasHouse/map.bin" - - .align 2 -VerdanturfTown_WandasHouse_Layout:: - .4byte 0x11 - .4byte 0x8 - .4byte VerdanturfTown_WandasHouse_MapBorder - .4byte VerdanturfTown_WandasHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/VictoryRoad_1F/layout.inc b/data/layouts/VictoryRoad_1F/layout.inc deleted file mode 100644 index 31e0fede38..0000000000 --- a/data/layouts/VictoryRoad_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -VictoryRoad_1F_MapBorder:: - .incbin "data/layouts/VictoryRoad_1F/border.bin" - -VictoryRoad_1F_MapBlockdata:: - .incbin "data/layouts/VictoryRoad_1F/map.bin" - - .align 2 -VictoryRoad_1F_Layout:: - .4byte 0x2e - .4byte 0x2d - .4byte VictoryRoad_1F_MapBorder - .4byte VictoryRoad_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/VictoryRoad_B1F/layout.inc b/data/layouts/VictoryRoad_B1F/layout.inc deleted file mode 100644 index 9ce7223e1e..0000000000 --- a/data/layouts/VictoryRoad_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -VictoryRoad_B1F_MapBorder:: - .incbin "data/layouts/VictoryRoad_B1F/border.bin" - -VictoryRoad_B1F_MapBlockdata:: - .incbin "data/layouts/VictoryRoad_B1F/map.bin" - - .align 2 -VictoryRoad_B1F_Layout:: - .4byte 0x2e - .4byte 0x1f - .4byte VictoryRoad_B1F_MapBorder - .4byte VictoryRoad_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/VictoryRoad_B2F/layout.inc b/data/layouts/VictoryRoad_B2F/layout.inc deleted file mode 100644 index 23c500cbe4..0000000000 --- a/data/layouts/VictoryRoad_B2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -VictoryRoad_B2F_MapBorder:: - .incbin "data/layouts/VictoryRoad_B2F/border.bin" - -VictoryRoad_B2F_MapBlockdata:: - .incbin "data/layouts/VictoryRoad_B2F/map.bin" - - .align 2 -VictoryRoad_B2F_Layout:: - .4byte 0x2e - .4byte 0x1f - .4byte VictoryRoad_B2F_MapBorder - .4byte VictoryRoad_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json new file mode 100644 index 0000000000..b6e31981d9 --- /dev/null +++ b/data/layouts/layouts.json @@ -0,0 +1,4415 @@ +{ + "layouts_table_label": "gMapLayouts", + "layouts": [ + { + "id": "LAYOUT_PETALBURG_CITY", + "name": "PetalburgCity_Layout", + "width": 30, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Petalburg", + "border_filepath": "data/layouts/PetalburgCity/border.bin", + "blockdata_filepath": "data/layouts/PetalburgCity/map.bin" + }, + { + "id": "LAYOUT_SLATEPORT_CITY", + "name": "SlateportCity_Layout", + "width": 40, + "height": 60, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Slateport", + "border_filepath": "data/layouts/SlateportCity/border.bin", + "blockdata_filepath": "data/layouts/SlateportCity/map.bin" + }, + { + "id": "LAYOUT_MAUVILLE_CITY", + "name": "MauvilleCity_Layout", + "width": 40, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/MauvilleCity/border.bin", + "blockdata_filepath": "data/layouts/MauvilleCity/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY", + "name": "RustboroCity_Layout", + "width": 40, + "height": 60, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/RustboroCity/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity/map.bin" + }, + { + "id": "LAYOUT_FORTREE_CITY", + "name": "FortreeCity_Layout", + "width": 40, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fortree", + "border_filepath": "data/layouts/FortreeCity/border.bin", + "blockdata_filepath": "data/layouts/FortreeCity/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY", + "name": "LilycoveCity_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/LilycoveCity/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY", + "name": "MossdeepCity_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/MossdeepCity/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY", + "name": "SootopolisCity_Layout", + "width": 60, + "height": 60, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Sootopolis", + "border_filepath": "data/layouts/SootopolisCity/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY", + "name": "EverGrandeCity_Layout", + "width": 40, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_EverGrande", + "border_filepath": "data/layouts/EverGrandeCity/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity/map.bin" + }, + { + "id": "LAYOUT_LITTLEROOT_TOWN", + "name": "LittlerootTown_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Petalburg", + "border_filepath": "data/layouts/LittlerootTown/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown/map.bin" + }, + { + "id": "LAYOUT_OLDALE_TOWN", + "name": "OldaleTown_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Petalburg", + "border_filepath": "data/layouts/OldaleTown/border.bin", + "blockdata_filepath": "data/layouts/OldaleTown/map.bin" + }, + { + "id": "LAYOUT_DEWFORD_TOWN", + "name": "DewfordTown_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Dewford", + "border_filepath": "data/layouts/DewfordTown/border.bin", + "blockdata_filepath": "data/layouts/DewfordTown/map.bin" + }, + { + "id": "LAYOUT_LAVARIDGE_TOWN", + "name": "LavaridgeTown_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/LavaridgeTown/border.bin", + "blockdata_filepath": "data/layouts/LavaridgeTown/map.bin" + }, + { + "id": "LAYOUT_FALLARBOR_TOWN", + "name": "FallarborTown_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fallarbor", + "border_filepath": "data/layouts/FallarborTown/border.bin", + "blockdata_filepath": "data/layouts/FallarborTown/map.bin" + }, + { + "id": "LAYOUT_VERDANTURF_TOWN", + "name": "VerdanturfTown_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/VerdanturfTown/border.bin", + "blockdata_filepath": "data/layouts/VerdanturfTown/map.bin" + }, + { + "id": "LAYOUT_PACIFIDLOG_TOWN", + "name": "PacifidlogTown_Layout", + "width": 20, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/PacifidlogTown/border.bin", + "blockdata_filepath": "data/layouts/PacifidlogTown/map.bin" + }, + { + "id": "LAYOUT_ROUTE101", + "name": "Route101_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Petalburg", + "border_filepath": "data/layouts/Route101/border.bin", + "blockdata_filepath": "data/layouts/Route101/map.bin" + }, + { + "id": "LAYOUT_ROUTE102", + "name": "Route102_Layout", + "width": 50, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Petalburg", + "border_filepath": "data/layouts/Route102/border.bin", + "blockdata_filepath": "data/layouts/Route102/map.bin" + }, + { + "id": "LAYOUT_ROUTE103", + "name": "Route103_Layout", + "width": 80, + "height": 22, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Petalburg", + "border_filepath": "data/layouts/Route103/border.bin", + "blockdata_filepath": "data/layouts/Route103/map.bin" + }, + { + "id": "LAYOUT_ROUTE104", + "name": "Route104_Layout", + "width": 40, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/Route104/border.bin", + "blockdata_filepath": "data/layouts/Route104/map.bin" + }, + { + "id": "LAYOUT_ROUTE105", + "name": "Route105_Layout", + "width": 40, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Dewford", + "border_filepath": "data/layouts/Route105/border.bin", + "blockdata_filepath": "data/layouts/Route105/map.bin" + }, + { + "id": "LAYOUT_ROUTE106", + "name": "Route106_Layout", + "width": 80, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Dewford", + "border_filepath": "data/layouts/Route106/border.bin", + "blockdata_filepath": "data/layouts/Route106/map.bin" + }, + { + "id": "LAYOUT_ROUTE107", + "name": "Route107_Layout", + "width": 60, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Dewford", + "border_filepath": "data/layouts/Route107/border.bin", + "blockdata_filepath": "data/layouts/Route107/map.bin" + }, + { + "id": "LAYOUT_ROUTE108", + "name": "Route108_Layout", + "width": 60, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Slateport", + "border_filepath": "data/layouts/Route108/border.bin", + "blockdata_filepath": "data/layouts/Route108/map.bin" + }, + { + "id": "LAYOUT_ROUTE109", + "name": "Route109_Layout", + "width": 40, + "height": 63, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Slateport", + "border_filepath": "data/layouts/Route109/border.bin", + "blockdata_filepath": "data/layouts/Route109/map.bin" + }, + { + "id": "LAYOUT_ROUTE110", + "name": "Route110_Layout", + "width": 40, + "height": 100, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/Route110/border.bin", + "blockdata_filepath": "data/layouts/Route110/map.bin" + }, + { + "id": "LAYOUT_ROUTE111", + "name": "Route111_Layout", + "width": 40, + "height": 140, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/Route111/border.bin", + "blockdata_filepath": "data/layouts/Route111/map.bin" + }, + { + "id": "LAYOUT_ROUTE112", + "name": "Route112_Layout", + "width": 40, + "height": 60, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/Route112/border.bin", + "blockdata_filepath": "data/layouts/Route112/map.bin" + }, + { + "id": "LAYOUT_ROUTE113", + "name": "Route113_Layout", + "width": 100, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fallarbor", + "border_filepath": "data/layouts/Route113/border.bin", + "blockdata_filepath": "data/layouts/Route113/map.bin" + }, + { + "id": "LAYOUT_ROUTE114", + "name": "Route114_Layout", + "width": 40, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fallarbor", + "border_filepath": "data/layouts/Route114/border.bin", + "blockdata_filepath": "data/layouts/Route114/map.bin" + }, + { + "id": "LAYOUT_ROUTE115", + "name": "Route115_Layout", + "width": 40, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fallarbor", + "border_filepath": "data/layouts/Route115/border.bin", + "blockdata_filepath": "data/layouts/Route115/map.bin" + }, + { + "id": "LAYOUT_ROUTE116", + "name": "Route116_Layout", + "width": 100, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/Route116/border.bin", + "blockdata_filepath": "data/layouts/Route116/map.bin" + }, + { + "id": "LAYOUT_ROUTE117", + "name": "Route117_Layout", + "width": 60, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/Route117/border.bin", + "blockdata_filepath": "data/layouts/Route117/map.bin" + }, + { + "id": "LAYOUT_ROUTE118", + "name": "Route118_Layout", + "width": 80, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/Route118/border.bin", + "blockdata_filepath": "data/layouts/Route118/map.bin" + }, + { + "id": "LAYOUT_ROUTE119", + "name": "Route119_Layout", + "width": 40, + "height": 140, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fortree", + "border_filepath": "data/layouts/Route119/border.bin", + "blockdata_filepath": "data/layouts/Route119/map.bin" + }, + { + "id": "LAYOUT_ROUTE120", + "name": "Route120_Layout", + "width": 40, + "height": 100, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fortree", + "border_filepath": "data/layouts/Route120/border.bin", + "blockdata_filepath": "data/layouts/Route120/map.bin" + }, + { + "id": "LAYOUT_ROUTE121", + "name": "Route121_Layout", + "width": 80, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/Route121/border.bin", + "blockdata_filepath": "data/layouts/Route121/map.bin" + }, + { + "id": "LAYOUT_ROUTE122", + "name": "Route122_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/Route122/border.bin", + "blockdata_filepath": "data/layouts/Route122/map.bin" + }, + { + "id": "LAYOUT_ROUTE123", + "name": "Route123_Layout", + "width": 140, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/Route123/border.bin", + "blockdata_filepath": "data/layouts/Route123/map.bin" + }, + { + "id": "LAYOUT_ROUTE124", + "name": "Route124_Layout", + "width": 80, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/Route124/border.bin", + "blockdata_filepath": "data/layouts/Route124/map.bin" + }, + { + "id": "LAYOUT_ROUTE125", + "name": "Route125_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/Route125/border.bin", + "blockdata_filepath": "data/layouts/Route125/map.bin" + }, + { + "id": "LAYOUT_ROUTE126", + "name": "Route126_Layout", + "width": 80, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/Route126/border.bin", + "blockdata_filepath": "data/layouts/Route126/map.bin" + }, + { + "id": "LAYOUT_ROUTE127", + "name": "Route127_Layout", + "width": 80, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/Route127/border.bin", + "blockdata_filepath": "data/layouts/Route127/map.bin" + }, + { + "id": "LAYOUT_ROUTE128", + "name": "Route128_Layout", + "width": 120, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/Route128/border.bin", + "blockdata_filepath": "data/layouts/Route128/map.bin" + }, + { + "id": "LAYOUT_ROUTE129", + "name": "Route129_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/Route129/border.bin", + "blockdata_filepath": "data/layouts/Route129/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08417FC4", + "name": "UnknownMap_08417FC4_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_08417FC4/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08417FC4/map.bin" + }, + { + "id": "LAYOUT_ROUTE131", + "name": "Route131_Layout", + "width": 60, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/Route131/border.bin", + "blockdata_filepath": "data/layouts/Route131/map.bin" + }, + { + "id": "LAYOUT_ROUTE132", + "name": "Route132_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/Route132/border.bin", + "blockdata_filepath": "data/layouts/Route132/map.bin" + }, + { + "id": "LAYOUT_ROUTE133", + "name": "Route133_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/Route133/border.bin", + "blockdata_filepath": "data/layouts/Route133/map.bin" + }, + { + "id": "LAYOUT_ROUTE134", + "name": "Route134_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/Route134/border.bin", + "blockdata_filepath": "data/layouts/Route134/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER2", + "name": "Underwater2_Layout", + "width": 80, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater2/border.bin", + "blockdata_filepath": "data/layouts/Underwater2/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER3", + "name": "Underwater3_Layout", + "width": 80, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater3/border.bin", + "blockdata_filepath": "data/layouts/Underwater3/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER4", + "name": "Underwater4_Layout", + "width": 120, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater4/border.bin", + "blockdata_filepath": "data/layouts/Underwater4/map.bin" + }, + { + "id": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", + "name": "LittlerootTown_BrendansHouse_1F_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BrendansMaysHouse", + "border_filepath": "data/layouts/LittlerootTown_BrendansHouse_1F/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown_BrendansHouse_1F/map.bin" + }, + { + "id": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", + "name": "LittlerootTown_BrendansHouse_2F_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BrendansMaysHouse", + "border_filepath": "data/layouts/LittlerootTown_BrendansHouse_2F/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown_BrendansHouse_2F/map.bin" + }, + { + "id": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F", + "name": "LittlerootTown_MaysHouse_1F_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BrendansMaysHouse", + "border_filepath": "data/layouts/LittlerootTown_MaysHouse_1F/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown_MaysHouse_1F/map.bin" + }, + { + "id": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F", + "name": "LittlerootTown_MaysHouse_2F_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BrendansMaysHouse", + "border_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/map.bin" + }, + { + "id": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", + "name": "LittlerootTown_ProfessorBirchsLab_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", + "border_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin" + }, + { + "id": "LAYOUT_HOUSE1", + "name": "House1_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/House1/border.bin", + "blockdata_filepath": "data/layouts/House1/map.bin" + }, + { + "id": "LAYOUT_HOUSE2", + "name": "House2_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/House2/border.bin", + "blockdata_filepath": "data/layouts/House2/map.bin" + }, + { + "id": "LAYOUT_POKEMON_CENTER_1F", + "name": "PokemonCenter_1F_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonCenter", + "border_filepath": "data/layouts/PokemonCenter_1F/border.bin", + "blockdata_filepath": "data/layouts/PokemonCenter_1F/map.bin" + }, + { + "id": "LAYOUT_POKEMON_CENTER_2F", + "name": "PokemonCenter_2F_Layout", + "width": 14, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonCenter", + "border_filepath": "data/layouts/PokemonCenter_2F/border.bin", + "blockdata_filepath": "data/layouts/PokemonCenter_2F/map.bin" + }, + { + "id": "LAYOUT_MART", + "name": "Mart_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/Mart/border.bin", + "blockdata_filepath": "data/layouts/Mart/map.bin" + }, + { + "id": "LAYOUT_HOUSE3", + "name": "House3_Layout", + "width": 10, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/House3/border.bin", + "blockdata_filepath": "data/layouts/House3/map.bin" + }, + { + "id": "LAYOUT_DEWFORD_TOWN_GYM", + "name": "DewfordTown_Gym_Layout", + "width": 18, + "height": 28, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_DewfordGym", + "border_filepath": "data/layouts/DewfordTown_Gym/border.bin", + "blockdata_filepath": "data/layouts/DewfordTown_Gym/map.bin" + }, + { + "id": "LAYOUT_DEWFORD_TOWN_HALL", + "name": "DewfordTown_Hall_Layout", + "width": 17, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/DewfordTown_Hall/border.bin", + "blockdata_filepath": "data/layouts/DewfordTown_Hall/map.bin" + }, + { + "id": "LAYOUT_HOUSE4", + "name": "House4_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/House4/border.bin", + "blockdata_filepath": "data/layouts/House4/map.bin" + }, + { + "id": "LAYOUT_LAVARIDGE_TOWN_HERB_SHOP", + "name": "LavaridgeTown_HerbShop_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LavaridgeTown_HerbShop/border.bin", + "blockdata_filepath": "data/layouts/LavaridgeTown_HerbShop/map.bin" + }, + { + "id": "LAYOUT_LAVARIDGE_TOWN_GYM_1F", + "name": "LavaridgeTown_Gym_1F_Layout", + "width": 17, + "height": 19, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_LavaridgeGym", + "border_filepath": "data/layouts/LavaridgeTown_Gym_1F/border.bin", + "blockdata_filepath": "data/layouts/LavaridgeTown_Gym_1F/map.bin" + }, + { + "id": "LAYOUT_LAVARIDGE_TOWN_GYM_B1F", + "name": "LavaridgeTown_Gym_B1F_Layout", + "width": 17, + "height": 19, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_LavaridgeGym", + "border_filepath": "data/layouts/LavaridgeTown_Gym_B1F/border.bin", + "blockdata_filepath": "data/layouts/LavaridgeTown_Gym_B1F/map.bin" + }, + { + "id": "LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F", + "name": "LavaridgeTown_PokemonCenter_1F_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonCenter", + "border_filepath": "data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin", + "blockdata_filepath": "data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin" + }, + { + "id": "LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_LOBBY", + "name": "FallarborTown_LeftoverRSContestLobby_Layout", + "width": 15, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin", + "blockdata_filepath": "data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin" + }, + { + "id": "LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_HALL", + "name": "FallarborTown_LeftoverRSContestHall_Layout", + "width": 21, + "height": 18, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/FallarborTown_LeftoverRSContestHall/border.bin", + "blockdata_filepath": "data/layouts/FallarborTown_LeftoverRSContestHall/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_HOUSE2", + "name": "LilycoveCity_House2_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/LilycoveCity_House2/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_House2/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08428450", + "name": "UnknownMap_08428450_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_08428450/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08428450/map.bin" + }, + { + "id": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE", + "name": "VerdanturfTown_WandasHouse_Layout", + "width": 17, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/VerdanturfTown_WandasHouse/border.bin", + "blockdata_filepath": "data/layouts/VerdanturfTown_WandasHouse/map.bin" + }, + { + "id": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", + "name": "PacifidlogTown_House1_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/PacifidlogTown_House1/border.bin", + "blockdata_filepath": "data/layouts/PacifidlogTown_House1/map.bin" + }, + { + "id": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", + "name": "PacifidlogTown_House2_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/PacifidlogTown_House2/border.bin", + "blockdata_filepath": "data/layouts/PacifidlogTown_House2/map.bin" + }, + { + "id": "LAYOUT_PETALBURG_CITY_GYM", + "name": "PetalburgCity_Gym_Layout", + "width": 9, + "height": 112, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PetalburgGym", + "border_filepath": "data/layouts/PetalburgCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/PetalburgCity_Gym/map.bin" + }, + { + "id": "LAYOUT_HOUSE_WITH_BED", + "name": "HouseWithBed_Layout", + "width": 10, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/HouseWithBed/border.bin", + "blockdata_filepath": "data/layouts/HouseWithBed/map.bin" + }, + { + "id": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F", + "name": "SlateportCity_SternsShipyard_1F_Layout", + "width": 21, + "height": 15, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/SlateportCity_SternsShipyard_1F/border.bin", + "blockdata_filepath": "data/layouts/SlateportCity_SternsShipyard_1F/map.bin" + }, + { + "id": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F", + "name": "SlateportCity_SternsShipyard_2F_Layout", + "width": 17, + "height": 15, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/SlateportCity_SternsShipyard_2F/border.bin", + "blockdata_filepath": "data/layouts/SlateportCity_SternsShipyard_2F/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_084294C4", + "name": "UnknownMap_084294C4_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_084294C4/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_084294C4/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_084294E8", + "name": "UnknownMap_084294E8_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_084294E8/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_084294E8/map.bin" + }, + { + "id": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB", + "name": "SlateportCity_PokemonFanClub_Layout", + "width": 14, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonFanClub", + "border_filepath": "data/layouts/SlateportCity_PokemonFanClub/border.bin", + "blockdata_filepath": "data/layouts/SlateportCity_PokemonFanClub/map.bin" + }, + { + "id": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", + "name": "SlateportCity_OceanicMuseum_1F_Layout", + "width": 20, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_OceanicMuseum", + "border_filepath": "data/layouts/SlateportCity_OceanicMuseum_1F/border.bin", + "blockdata_filepath": "data/layouts/SlateportCity_OceanicMuseum_1F/map.bin" + }, + { + "id": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", + "name": "SlateportCity_OceanicMuseum_2F_Layout", + "width": 20, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_OceanicMuseum", + "border_filepath": "data/layouts/SlateportCity_OceanicMuseum_2F/border.bin", + "blockdata_filepath": "data/layouts/SlateportCity_OceanicMuseum_2F/map.bin" + }, + { + "id": "LAYOUT_HARBOR", + "name": "Harbor_Layout", + "width": 24, + "height": 15, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/Harbor/border.bin", + "blockdata_filepath": "data/layouts/Harbor/map.bin" + }, + { + "id": "LAYOUT_MAUVILLE_CITY_GYM", + "name": "MauvilleCity_Gym_Layout", + "width": 10, + "height": 21, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MauvilleGym", + "border_filepath": "data/layouts/MauvilleCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/MauvilleCity_Gym/map.bin" + }, + { + "id": "LAYOUT_MAUVILLE_CITY_BIKE_SHOP", + "name": "MauvilleCity_BikeShop_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BikeShop", + "border_filepath": "data/layouts/MauvilleCity_BikeShop/border.bin", + "blockdata_filepath": "data/layouts/MauvilleCity_BikeShop/map.bin" + }, + { + "id": "LAYOUT_MAUVILLE_CITY_GAME_CORNER", + "name": "MauvilleCity_GameCorner_Layout", + "width": 22, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MauvilleGameCorner", + "border_filepath": "data/layouts/MauvilleCity_GameCorner/border.bin", + "blockdata_filepath": "data/layouts/MauvilleCity_GameCorner/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F", + "name": "RustboroCity_DevonCorp_1F_Layout", + "width": 19, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/RustboroCity_DevonCorp_1F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_DevonCorp_1F/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F", + "name": "RustboroCity_DevonCorp_2F_Layout", + "width": 19, + "height": 9, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/RustboroCity_DevonCorp_2F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_DevonCorp_2F/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_GYM", + "name": "RustboroCity_Gym_Layout", + "width": 11, + "height": 20, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_RustboroGym", + "border_filepath": "data/layouts/RustboroCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Gym/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL", + "name": "RustboroCity_PokemonSchool_Layout", + "width": 12, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonSchool", + "border_filepath": "data/layouts/RustboroCity_PokemonSchool/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_PokemonSchool/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_HOUSE", + "name": "RustboroCity_House_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_House/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_House/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_HOUSE1", + "name": "RustboroCity_House1_Layout", + "width": 13, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_House1/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_House1/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE", + "name": "RustboroCity_CuttersHouse_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_CuttersHouse/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_CuttersHouse/map.bin" + }, + { + "id": "LAYOUT_FORTREE_CITY_HOUSE1", + "name": "FortreeCity_House1_Layout", + "width": 8, + "height": 6, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/FortreeCity_House1/border.bin", + "blockdata_filepath": "data/layouts/FortreeCity_House1/map.bin" + }, + { + "id": "LAYOUT_FORTREE_CITY_GYM", + "name": "FortreeCity_Gym_Layout", + "width": 20, + "height": 25, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_FortreeGym", + "border_filepath": "data/layouts/FortreeCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/FortreeCity_Gym/map.bin" + }, + { + "id": "LAYOUT_FORTREE_CITY_HOUSE2", + "name": "FortreeCity_House2_Layout", + "width": 8, + "height": 6, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/FortreeCity_House2/border.bin", + "blockdata_filepath": "data/layouts/FortreeCity_House2/map.bin" + }, + { + "id": "LAYOUT_ROUTE104_MR_BRINEYS_HOUSE", + "name": "Route104_MrBrineysHouse_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route104_MrBrineysHouse/border.bin", + "blockdata_filepath": "data/layouts/Route104_MrBrineysHouse/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", + "name": "LilycoveCity_LilycoveMuseum_1F_Layout", + "width": 21, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_LilycoveMuseum", + "border_filepath": "data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", + "name": "LilycoveCity_LilycoveMuseum_2F_Layout", + "width": 22, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_LilycoveMuseum", + "border_filepath": "data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY", + "name": "LilycoveCity_ContestLobby_Layout", + "width": 31, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LilycoveCity_ContestLobby/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_ContestLobby/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_CONTEST_HALL", + "name": "LilycoveCity_ContestHall_Layout", + "width": 51, + "height": 33, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LilycoveCity_ContestHall/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_ContestHall/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", + "name": "LilycoveCity_PokemonTrainerFanClub_Layout", + "width": 12, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY_GYM", + "name": "MossdeepCity_Gym_Layout", + "width": 26, + "height": 36, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MossdeepGym", + "border_filepath": "data/layouts/MossdeepCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_Gym/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_GYM_1F", + "name": "SootopolisCity_Gym_1F_Layout", + "width": 17, + "height": 26, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SootopolisGym", + "border_filepath": "data/layouts/SootopolisCity_Gym_1F/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_Gym_1F/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_GYM_B1F", + "name": "SootopolisCity_Gym_B1F_Layout", + "width": 17, + "height": 26, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SootopolisGym", + "border_filepath": "data/layouts/SootopolisCity_Gym_B1F/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_Gym_B1F/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "name": "EverGrandeCity_SidneysRoom_Layout", + "width": 13, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_SidneysRoom/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_SidneysRoom/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM", + "name": "EverGrandeCity_PhoebesRoom_Layout", + "width": 13, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_PhoebesRoom/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_PhoebesRoom/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM", + "name": "EverGrandeCity_GlaciasRoom_Layout", + "width": 13, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_GlaciasRoom/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_GlaciasRoom/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM", + "name": "EverGrandeCity_DrakesRoom_Layout", + "width": 13, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_DrakesRoom/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_DrakesRoom/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM", + "name": "EverGrandeCity_ChampionsRoom_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_ChampionsRoom/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_ChampionsRoom/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", + "name": "EverGrandeCity_ShortHall_Layout", + "width": 11, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_ShortHall/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_ShortHall/map.bin" + }, + { + "id": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", + "name": "Route104_PrettyPetalFlowerShop_Layout", + "width": 15, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PrettyPetalFlowerShop", + "border_filepath": "data/layouts/Route104_PrettyPetalFlowerShop/border.bin", + "blockdata_filepath": "data/layouts/Route104_PrettyPetalFlowerShop/map.bin" + }, + { + "id": "LAYOUT_CABLE_CAR_STATION", + "name": "CableCarStation_Layout", + "width": 13, + "height": 12, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/CableCarStation/border.bin", + "blockdata_filepath": "data/layouts/CableCarStation/map.bin" + }, + { + "id": "LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE", + "name": "Route114_FossilManiacsHouse_Layout", + "width": 10, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route114_FossilManiacsHouse/border.bin", + "blockdata_filepath": "data/layouts/Route114_FossilManiacsHouse/map.bin" + }, + { + "id": "LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL", + "name": "Route114_FossilManiacsTunnel_Layout", + "width": 13, + "height": 26, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fallarbor", + "border_filepath": "data/layouts/Route114_FossilManiacsTunnel/border.bin", + "blockdata_filepath": "data/layouts/Route114_FossilManiacsTunnel/map.bin" + }, + { + "id": "LAYOUT_ROUTE114_LANETTES_HOUSE", + "name": "Route114_LanettesHouse_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", + "border_filepath": "data/layouts/Route114_LanettesHouse/border.bin", + "blockdata_filepath": "data/layouts/Route114_LanettesHouse/map.bin" + }, + { + "id": "LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE", + "name": "Route116_TunnelersRestHouse_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route116_TunnelersRestHouse/border.bin", + "blockdata_filepath": "data/layouts/Route116_TunnelersRestHouse/map.bin" + }, + { + "id": "LAYOUT_ROUTE117_POKEMON_DAY_CARE", + "name": "Route117_PokemonDayCare_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonDayCare", + "border_filepath": "data/layouts/Route117_PokemonDayCare/border.bin", + "blockdata_filepath": "data/layouts/Route117_PokemonDayCare/map.bin" + }, + { + "id": "LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE", + "name": "Route121_SafariZoneEntrance_Layout", + "width": 18, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/Route121_SafariZoneEntrance/border.bin", + "blockdata_filepath": "data/layouts/Route121_SafariZoneEntrance/map.bin" + }, + { + "id": "LAYOUT_METEOR_FALLS_1F_1R", + "name": "MeteorFalls_1F_1R_Layout", + "width": 30, + "height": 42, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MeteorFalls", + "border_filepath": "data/layouts/MeteorFalls_1F_1R/border.bin", + "blockdata_filepath": "data/layouts/MeteorFalls_1F_1R/map.bin" + }, + { + "id": "LAYOUT_METEOR_FALLS_1F_2R", + "name": "MeteorFalls_1F_2R_Layout", + "width": 30, + "height": 32, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MeteorFalls", + "border_filepath": "data/layouts/MeteorFalls_1F_2R/border.bin", + "blockdata_filepath": "data/layouts/MeteorFalls_1F_2R/map.bin" + }, + { + "id": "LAYOUT_METEOR_FALLS_B1F_1R", + "name": "MeteorFalls_B1F_1R_Layout", + "width": 29, + "height": 38, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MeteorFalls", + "border_filepath": "data/layouts/MeteorFalls_B1F_1R/border.bin", + "blockdata_filepath": "data/layouts/MeteorFalls_B1F_1R/map.bin" + }, + { + "id": "LAYOUT_METEOR_FALLS_B1F_2R", + "name": "MeteorFalls_B1F_2R_Layout", + "width": 11, + "height": 18, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MeteorFalls", + "border_filepath": "data/layouts/MeteorFalls_B1F_2R/border.bin", + "blockdata_filepath": "data/layouts/MeteorFalls_B1F_2R/map.bin" + }, + { + "id": "LAYOUT_RUSTURF_TUNNEL", + "name": "RusturfTunnel_Layout", + "width": 36, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_RusturfTunnel", + "border_filepath": "data/layouts/RusturfTunnel/border.bin", + "blockdata_filepath": "data/layouts/RusturfTunnel/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER_SOOTOPOLIS_CITY", + "name": "Underwater_SootopolisCity_Layout", + "width": 20, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater_SootopolisCity/border.bin", + "blockdata_filepath": "data/layouts/Underwater_SootopolisCity/map.bin" + }, + { + "id": "LAYOUT_DESERT_RUINS", + "name": "DesertRuins_Layout", + "width": 17, + "height": 33, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/DesertRuins/border.bin", + "blockdata_filepath": "data/layouts/DesertRuins/map.bin" + }, + { + "id": "LAYOUT_GRANITE_CAVE_1F", + "name": "GraniteCave_1F_Layout", + "width": 42, + "height": 15, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/GraniteCave_1F/border.bin", + "blockdata_filepath": "data/layouts/GraniteCave_1F/map.bin" + }, + { + "id": "LAYOUT_GRANITE_CAVE_B1F", + "name": "GraniteCave_B1F_Layout", + "width": 32, + "height": 26, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/GraniteCave_B1F/border.bin", + "blockdata_filepath": "data/layouts/GraniteCave_B1F/map.bin" + }, + { + "id": "LAYOUT_GRANITE_CAVE_B2F", + "name": "GraniteCave_B2F_Layout", + "width": 32, + "height": 26, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/GraniteCave_B2F/border.bin", + "blockdata_filepath": "data/layouts/GraniteCave_B2F/map.bin" + }, + { + "id": "LAYOUT_PETALBURG_WOODS", + "name": "PetalburgWoods_Layout", + "width": 48, + "height": 44, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/PetalburgWoods/border.bin", + "blockdata_filepath": "data/layouts/PetalburgWoods/map.bin" + }, + { + "id": "LAYOUT_MT_CHIMNEY", + "name": "MtChimney_Layout", + "width": 40, + "height": 47, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MtChimney/border.bin", + "blockdata_filepath": "data/layouts/MtChimney/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_1F", + "name": "MtPyre_1F_Layout", + "width": 22, + "height": 19, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_1F/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_1F/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_2F", + "name": "MtPyre_2F_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_2F/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_2F/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_3F", + "name": "MtPyre_3F_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_3F/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_3F/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_4F", + "name": "MtPyre_4F_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_4F/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_4F/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_5F", + "name": "MtPyre_5F_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_5F/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_5F/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_6F", + "name": "MtPyre_6F_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_6F/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_6F/map.bin" + }, + { + "id": "LAYOUT_AQUA_HIDEOUT_1F", + "name": "AquaHideout_1F_Layout", + "width": 28, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AquaHideout_1F/border.bin", + "blockdata_filepath": "data/layouts/AquaHideout_1F/map.bin" + }, + { + "id": "LAYOUT_AQUA_HIDEOUT_B1F", + "name": "AquaHideout_B1F_Layout", + "width": 51, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AquaHideout_B1F/border.bin", + "blockdata_filepath": "data/layouts/AquaHideout_B1F/map.bin" + }, + { + "id": "LAYOUT_AQUA_HIDEOUT_B2F", + "name": "AquaHideout_B2F_Layout", + "width": 34, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AquaHideout_B2F/border.bin", + "blockdata_filepath": "data/layouts/AquaHideout_B2F/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER_SEAFLOOR_CAVERN", + "name": "Underwater_SeafloorCavern_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater_SeafloorCavern/border.bin", + "blockdata_filepath": "data/layouts/Underwater_SeafloorCavern/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ENTRANCE", + "name": "SeafloorCavern_Entrance_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Entrance/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Entrance/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM1", + "name": "SeafloorCavern_Room1_Layout", + "width": 20, + "height": 21, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room1/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room1/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM2", + "name": "SeafloorCavern_Room2_Layout", + "width": 18, + "height": 12, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room2/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room2/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM3", + "name": "SeafloorCavern_Room3_Layout", + "width": 16, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room3/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room3/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM4", + "name": "SeafloorCavern_Room4_Layout", + "width": 18, + "height": 19, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room4/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room4/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM5", + "name": "SeafloorCavern_Room5_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room5/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room5/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM6", + "name": "SeafloorCavern_Room6_Layout", + "width": 24, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SeafloorCavern_Room6/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room6/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM7", + "name": "SeafloorCavern_Room7_Layout", + "width": 23, + "height": 25, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SeafloorCavern_Room7/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room7/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM8", + "name": "SeafloorCavern_Room8_Layout", + "width": 11, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room8/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room8/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM9", + "name": "SeafloorCavern_Room9_Layout", + "width": 27, + "height": 46, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room9/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room9/map.bin" + }, + { + "id": "LAYOUT_CAVE_OF_ORIGIN_ENTRANCE", + "name": "CaveOfOrigin_Entrance_Layout", + "width": 19, + "height": 26, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/CaveOfOrigin_Entrance/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_Entrance/map.bin" + }, + { + "id": "LAYOUT_CAVE_OF_ORIGIN_1F", + "name": "CaveOfOrigin_1F_Layout", + "width": 23, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/CaveOfOrigin_1F/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_1F/map.bin" + }, + { + "id": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1", + "name": "CaveOfOrigin_UnusedRubySapphireMap1_Layout", + "width": 23, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin" + }, + { + "id": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", + "name": "CaveOfOrigin_UnusedRubySapphireMap2_Layout", + "width": 21, + "height": 21, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin" + }, + { + "id": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3", + "name": "CaveOfOrigin_UnusedRubySapphireMap3_Layout", + "width": 19, + "height": 21, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin" + }, + { + "id": "LAYOUT_CAVE_OF_ORIGIN_B1F", + "name": "CaveOfOrigin_B1F_Layout", + "width": 19, + "height": 19, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/CaveOfOrigin_B1F/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_B1F/map.bin" + }, + { + "id": "LAYOUT_VICTORY_ROAD_1F", + "name": "VictoryRoad_1F_Layout", + "width": 46, + "height": 45, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/VictoryRoad_1F/border.bin", + "blockdata_filepath": "data/layouts/VictoryRoad_1F/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "name": "ShoalCave_LowTideEntranceRoom_Layout", + "width": 35, + "height": 35, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_LowTideEntranceRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_LowTideEntranceRoom/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "name": "ShoalCave_LowTideInnerRoom_Layout", + "width": 46, + "height": 38, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_LowTideInnerRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_LowTideInnerRoom/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", + "name": "ShoalCave_LowTideStairsRoom_Layout", + "width": 21, + "height": 15, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_LowTideStairsRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_LowTideStairsRoom/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "name": "ShoalCave_LowTideLowerRoom_Layout", + "width": 31, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_LowTideLowerRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_LowTideLowerRoom/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM", + "name": "ShoalCave_HighTideEntranceRoom_Layout", + "width": 35, + "height": 35, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_HighTideEntranceRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_HighTideEntranceRoom/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM", + "name": "ShoalCave_HighTideInnerRoom_Layout", + "width": 46, + "height": 38, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_HighTideInnerRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_HighTideInnerRoom/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E6C0", + "name": "UnknownMap_0843E6C0_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E6C0/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E6C0/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E6E4", + "name": "UnknownMap_0843E6E4_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E6E4/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E6E4/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E708", + "name": "UnknownMap_0843E708_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E708/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E708/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E72C", + "name": "UnknownMap_0843E72C_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E72C/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E72C/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E750", + "name": "UnknownMap_0843E750_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E750/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E750/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E774", + "name": "UnknownMap_0843E774_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E774/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E774/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E798", + "name": "UnknownMap_0843E798_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E798/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E798/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E7BC", + "name": "UnknownMap_0843E7BC_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E7BC/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E7BC/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E7E0", + "name": "UnknownMap_0843E7E0_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E7E0/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E7E0/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E804", + "name": "UnknownMap_0843E804_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E804/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E804/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E828", + "name": "UnknownMap_0843E828_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E828/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E828/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E84C", + "name": "UnknownMap_0843E84C_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E84C/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E84C/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E870", + "name": "UnknownMap_0843E870_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E870/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E870/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E894", + "name": "UnknownMap_0843E894_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E894/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E894/map.bin" + }, + { + "id": "LAYOUT_NEW_MAUVILLE_ENTRANCE", + "name": "NewMauville_Entrance_Layout", + "width": 9, + "height": 9, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/NewMauville_Entrance/border.bin", + "blockdata_filepath": "data/layouts/NewMauville_Entrance/map.bin" + }, + { + "id": "LAYOUT_NEW_MAUVILLE_INSIDE", + "name": "NewMauville_Inside_Layout", + "width": 41, + "height": 41, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BikeShop", + "border_filepath": "data/layouts/NewMauville_Inside/border.bin", + "blockdata_filepath": "data/layouts/NewMauville_Inside/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_DECK", + "name": "AbandonedShip_Deck_Layout", + "width": 23, + "height": 21, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AbandonedShip_Deck/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Deck/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_CORRIDORS_1F", + "name": "AbandonedShip_Corridors_1F_Layout", + "width": 18, + "height": 12, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Corridors_1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Corridors_1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_ROOMS_1F", + "name": "AbandonedShip_Rooms_1F_Layout", + "width": 18, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Rooms_1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Rooms_1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F", + "name": "AbandonedShip_Corridors_B1F_Layout", + "width": 13, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Corridors_B1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Corridors_B1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_ROOMS_B1F", + "name": "AbandonedShip_Rooms_B1F_Layout", + "width": 27, + "height": 8, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Rooms_B1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Rooms_B1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_ROOMS2_B1F", + "name": "AbandonedShip_Rooms2_B1F_Layout", + "width": 18, + "height": 8, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Rooms2_B1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Rooms2_B1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_UNDERWATER1", + "name": "AbandonedShip_Underwater1_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Underwater1/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Underwater1/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_ROOM_B1F", + "name": "AbandonedShip_Room_B1F_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Room_B1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Room_B1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_ROOMS2_1F", + "name": "AbandonedShip_Rooms2_1F_Layout", + "width": 9, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Rooms2_1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Rooms2_1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE", + "name": "AbandonedShip_CaptainsOffice_Layout", + "width": 9, + "height": 7, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AbandonedShip_CaptainsOffice/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_CaptainsOffice/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_UNDERWATER2", + "name": "AbandonedShip_Underwater2_Layout", + "width": 21, + "height": 7, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Underwater2/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Underwater2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_RED_CAVE1", + "name": "SecretBase_RedCave1_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseRedCave", + "border_filepath": "data/layouts/SecretBase_RedCave1/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_RedCave1/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BROWN_CAVE1", + "name": "SecretBase_BrownCave1_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBrownCave", + "border_filepath": "data/layouts/SecretBase_BrownCave1/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BrownCave1/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BLUE_CAVE1", + "name": "SecretBase_BlueCave1_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBlueCave", + "border_filepath": "data/layouts/SecretBase_BlueCave1/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BlueCave1/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_YELLOW_CAVE1", + "name": "SecretBase_YellowCave1_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseYellowCave", + "border_filepath": "data/layouts/SecretBase_YellowCave1/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_YellowCave1/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_TREE1", + "name": "SecretBase_Tree1_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseTree", + "border_filepath": "data/layouts/SecretBase_Tree1/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Tree1/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_SHRUB1", + "name": "SecretBase_Shrub1_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseShrub", + "border_filepath": "data/layouts/SecretBase_Shrub1/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Shrub1/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_RED_CAVE2", + "name": "SecretBase_RedCave2_Layout", + "width": 7, + "height": 16, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseRedCave", + "border_filepath": "data/layouts/SecretBase_RedCave2/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_RedCave2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BROWN_CAVE2", + "name": "SecretBase_BrownCave2_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBrownCave", + "border_filepath": "data/layouts/SecretBase_BrownCave2/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BrownCave2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BLUE_CAVE2", + "name": "SecretBase_BlueCave2_Layout", + "width": 15, + "height": 7, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBlueCave", + "border_filepath": "data/layouts/SecretBase_BlueCave2/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BlueCave2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_YELLOW_CAVE2", + "name": "SecretBase_YellowCave2_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseYellowCave", + "border_filepath": "data/layouts/SecretBase_YellowCave2/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_YellowCave2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_TREE2", + "name": "SecretBase_Tree2_Layout", + "width": 7, + "height": 16, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseTree", + "border_filepath": "data/layouts/SecretBase_Tree2/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Tree2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_SHRUB2", + "name": "SecretBase_Shrub2_Layout", + "width": 15, + "height": 7, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseShrub", + "border_filepath": "data/layouts/SecretBase_Shrub2/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Shrub2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_RED_CAVE3", + "name": "SecretBase_RedCave3_Layout", + "width": 15, + "height": 8, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseRedCave", + "border_filepath": "data/layouts/SecretBase_RedCave3/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_RedCave3/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BROWN_CAVE3", + "name": "SecretBase_BrownCave3_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBrownCave", + "border_filepath": "data/layouts/SecretBase_BrownCave3/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BrownCave3/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BLUE_CAVE3", + "name": "SecretBase_BlueCave3_Layout", + "width": 10, + "height": 17, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBlueCave", + "border_filepath": "data/layouts/SecretBase_BlueCave3/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BlueCave3/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_YELLOW_CAVE3", + "name": "SecretBase_YellowCave3_Layout", + "width": 12, + "height": 11, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseYellowCave", + "border_filepath": "data/layouts/SecretBase_YellowCave3/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_YellowCave3/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_TREE3", + "name": "SecretBase_Tree3_Layout", + "width": 17, + "height": 8, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseTree", + "border_filepath": "data/layouts/SecretBase_Tree3/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Tree3/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_SHRUB3", + "name": "SecretBase_Shrub3_Layout", + "width": 13, + "height": 11, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseShrub", + "border_filepath": "data/layouts/SecretBase_Shrub3/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Shrub3/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_RED_CAVE4", + "name": "SecretBase_RedCave4_Layout", + "width": 9, + "height": 15, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseRedCave", + "border_filepath": "data/layouts/SecretBase_RedCave4/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_RedCave4/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BROWN_CAVE4", + "name": "SecretBase_BrownCave4_Layout", + "width": 14, + "height": 12, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBrownCave", + "border_filepath": "data/layouts/SecretBase_BrownCave4/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BrownCave4/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BLUE_CAVE4", + "name": "SecretBase_BlueCave4_Layout", + "width": 9, + "height": 17, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBlueCave", + "border_filepath": "data/layouts/SecretBase_BlueCave4/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BlueCave4/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_YELLOW_CAVE4", + "name": "SecretBase_YellowCave4_Layout", + "width": 13, + "height": 14, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseYellowCave", + "border_filepath": "data/layouts/SecretBase_YellowCave4/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_YellowCave4/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_TREE4", + "name": "SecretBase_Tree4_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseTree", + "border_filepath": "data/layouts/SecretBase_Tree4/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Tree4/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_SHRUB4", + "name": "SecretBase_Shrub4_Layout", + "width": 14, + "height": 11, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseShrub", + "border_filepath": "data/layouts/SecretBase_Shrub4/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Shrub4/map.bin" + }, + { + "id": "LAYOUT_SINGLE_BATTLE_COLOSSEUM", + "name": "SingleBattleColosseum_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", + "border_filepath": "data/layouts/SingleBattleColosseum/border.bin", + "blockdata_filepath": "data/layouts/SingleBattleColosseum/map.bin" + }, + { + "id": "LAYOUT_TRADE_CENTER", + "name": "TradeCenter_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", + "border_filepath": "data/layouts/TradeCenter/border.bin", + "blockdata_filepath": "data/layouts/TradeCenter/map.bin" + }, + { + "id": "LAYOUT_RECORD_CORNER", + "name": "RecordCorner_Layout", + "width": 20, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", + "border_filepath": "data/layouts/RecordCorner/border.bin", + "blockdata_filepath": "data/layouts/RecordCorner/map.bin" + }, + { + "id": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM", + "name": "DoubleBattleColosseum_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", + "border_filepath": "data/layouts/DoubleBattleColosseum/border.bin", + "blockdata_filepath": "data/layouts/DoubleBattleColosseum/map.bin" + }, + { + "id": "LAYOUT_LINK_CONTEST_ROOM1", + "name": "LinkContestRoom1_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LinkContestRoom1/border.bin", + "blockdata_filepath": "data/layouts/LinkContestRoom1/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_25_29", + "name": "UnknownMap_25_29_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_25_29/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_25_29/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_25_30", + "name": "UnknownMap_25_30_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_25_30/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_25_30/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_25_31", + "name": "UnknownMap_25_31_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_25_31/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_25_31/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_25_32", + "name": "UnknownMap_25_32_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_25_32/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_25_32/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_25_33", + "name": "UnknownMap_25_33_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_25_33/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_25_33/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_25_34", + "name": "UnknownMap_25_34_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_25_34/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_25_34/map.bin" + }, + { + "id": "LAYOUT_LINK_CONTEST_ROOM2", + "name": "LinkContestRoom2_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LinkContestRoom2/border.bin", + "blockdata_filepath": "data/layouts/LinkContestRoom2/map.bin" + }, + { + "id": "LAYOUT_LINK_CONTEST_ROOM3", + "name": "LinkContestRoom3_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LinkContestRoom3/border.bin", + "blockdata_filepath": "data/layouts/LinkContestRoom3/map.bin" + }, + { + "id": "LAYOUT_LINK_CONTEST_ROOM4", + "name": "LinkContestRoom4_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LinkContestRoom4/border.bin", + "blockdata_filepath": "data/layouts/LinkContestRoom4/map.bin" + }, + { + "id": "LAYOUT_LINK_CONTEST_ROOM5", + "name": "LinkContestRoom5_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LinkContestRoom5/border.bin", + "blockdata_filepath": "data/layouts/LinkContestRoom5/map.bin" + }, + { + "id": "LAYOUT_LINK_CONTEST_ROOM6", + "name": "LinkContestRoom6_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LinkContestRoom6/border.bin", + "blockdata_filepath": "data/layouts/LinkContestRoom6/map.bin" + }, + { + "id": "LAYOUT_INSIDE_OF_TRUCK", + "name": "InsideOfTruck_Layout", + "width": 5, + "height": 5, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideOfTruck", + "border_filepath": "data/layouts/InsideOfTruck/border.bin", + "blockdata_filepath": "data/layouts/InsideOfTruck/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_NORTHWEST", + "name": "SafariZone_Northwest_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/SafariZone_Northwest/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_Northwest/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_NORTH", + "name": "SafariZone_North_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/SafariZone_North/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_North/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_SOUTHWEST", + "name": "SafariZone_Southwest_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/SafariZone_Southwest/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_Southwest/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_SOUTH", + "name": "SafariZone_South_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/SafariZone_South/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_South/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08447028", + "name": "UnknownMap_08447028_Layout", + "width": 58, + "height": 26, + "primary_tileset": "gTileset_General", + "secondary_tileset": "0", + "border_filepath": "data/layouts/UnknownMap_08447028/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08447028/map.bin" + }, + { + "id": "LAYOUT_ROUTE109_SEASHORE_HOUSE", + "name": "Route109_SeashoreHouse_Layout", + "width": 15, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SeashoreHouse", + "border_filepath": "data/layouts/Route109_SeashoreHouse/border.bin", + "blockdata_filepath": "data/layouts/Route109_SeashoreHouse/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE", + "name": "Route110_TrickHouseEntrance_Layout", + "width": 12, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route110_TrickHouseEntrance/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHouseEntrance/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_END", + "name": "Route110_TrickHouseEnd_Layout", + "width": 12, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route110_TrickHouseEnd/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHouseEnd/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR", + "name": "Route110_TrickHouseCorridor_Layout", + "width": 15, + "height": 24, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route110_TrickHouseCorridor/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHouseCorridor/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1", + "name": "Route110_TrickHousePuzzle1_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle1/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle1/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2", + "name": "Route110_TrickHousePuzzle2_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle2/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle2/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3", + "name": "Route110_TrickHousePuzzle3_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle3/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle3/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4", + "name": "Route110_TrickHousePuzzle4_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle4/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle4/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5", + "name": "Route110_TrickHousePuzzle5_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle5/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle5/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6", + "name": "Route110_TrickHousePuzzle6_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle6/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle6/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7", + "name": "Route110_TrickHousePuzzle7_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle7/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle7/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8", + "name": "Route110_TrickHousePuzzle8_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle8/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle8/map.bin" + }, + { + "id": "LAYOUT_FORTREE_CITY_DECORATION_SHOP", + "name": "FortreeCity_DecorationShop_Layout", + "width": 8, + "height": 6, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/FortreeCity_DecorationShop/border.bin", + "blockdata_filepath": "data/layouts/FortreeCity_DecorationShop/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE", + "name": "Route110_SeasideCyclingRoadEntrance_Layout", + "width": 15, + "height": 6, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin", + "blockdata_filepath": "data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F", + "name": "LilycoveCity_DepartmentStore_1F_Layout", + "width": 18, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_1F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_1F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F", + "name": "LilycoveCity_DepartmentStore_2F_Layout", + "width": 18, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_2F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_2F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F", + "name": "LilycoveCity_DepartmentStore_3F_Layout", + "width": 18, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_3F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_3F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F", + "name": "LilycoveCity_DepartmentStore_4F_Layout", + "width": 18, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_4F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_4F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F", + "name": "LilycoveCity_DepartmentStore_5F_Layout", + "width": 18, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_5F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_5F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", + "name": "LilycoveCity_DepartmentStoreRooftop_Layout", + "width": 18, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin" + }, + { + "id": "LAYOUT_ROUTE130", + "name": "Route130_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/Route130/border.bin", + "blockdata_filepath": "data/layouts/Route130/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", + "name": "BattleFrontier_BattleTowerLobby_Layout", + "width": 25, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_BattleTowerLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_OUTSIDE_WEST", + "name": "BattleFrontier_OutsideWest_Layout", + "width": 56, + "height": 72, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BattleFrontierOutsideWest", + "border_filepath": "data/layouts/BattleFrontier_OutsideWest/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_OutsideWest/map.bin" + }, + { + "id": "LAYOUT_BATTLE_ELEVATOR", + "name": "BattleElevator_Layout", + "width": 5, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleElevator/border.bin", + "blockdata_filepath": "data/layouts/BattleElevator/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR", + "name": "BattleFrontier_BattleTowerCorridor_Layout", + "width": 17, + "height": 5, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", + "name": "BattleFrontier_BattleTowerBattleRoom_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F", + "name": "RustboroCity_DevonCorp_3F_Layout", + "width": 19, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/RustboroCity_DevonCorp_3F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_DevonCorp_3F/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "name": "EverGrandeCity_PokemonLeague_1F_Layout", + "width": 19, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonCenter", + "border_filepath": "data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin" + }, + { + "id": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F", + "name": "Route119_WeatherInstitute_1F_Layout", + "width": 20, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", + "border_filepath": "data/layouts/Route119_WeatherInstitute_1F/border.bin", + "blockdata_filepath": "data/layouts/Route119_WeatherInstitute_1F/map.bin" + }, + { + "id": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F", + "name": "Route119_WeatherInstitute_2F_Layout", + "width": 20, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", + "border_filepath": "data/layouts/Route119_WeatherInstitute_2F/border.bin", + "blockdata_filepath": "data/layouts/Route119_WeatherInstitute_2F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "name": "LilycoveCity_DepartmentStoreElevator_Layout", + "width": 5, + "height": 6, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER1", + "name": "Underwater1_Layout", + "width": 80, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater1/border.bin", + "blockdata_filepath": "data/layouts/Underwater1/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F", + "name": "MossdeepCity_SpaceCenter_1F_Layout", + "width": 16, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MossdeepCity_SpaceCenter_1F/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_SpaceCenter_1F/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F", + "name": "MossdeepCity_SpaceCenter_2F_Layout", + "width": 16, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MossdeepCity_SpaceCenter_2F/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_SpaceCenter_2F/map.bin" + }, + { + "id": "LAYOUT_SS_TIDAL_CORRIDOR", + "name": "SSTidalCorridor_Layout", + "width": 18, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/SSTidalCorridor/border.bin", + "blockdata_filepath": "data/layouts/SSTidalCorridor/map.bin" + }, + { + "id": "LAYOUT_SS_TIDAL_LOWER_DECK", + "name": "SSTidalLowerDeck_Layout", + "width": 17, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/SSTidalLowerDeck/border.bin", + "blockdata_filepath": "data/layouts/SSTidalLowerDeck/map.bin" + }, + { + "id": "LAYOUT_SS_TIDAL_ROOMS", + "name": "SSTidalRooms_Layout", + "width": 36, + "height": 18, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/SSTidalRooms/border.bin", + "blockdata_filepath": "data/layouts/SSTidalRooms/map.bin" + }, + { + "id": "LAYOUT_ISLAND_CAVE", + "name": "IslandCave_Layout", + "width": 17, + "height": 33, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/IslandCave/border.bin", + "blockdata_filepath": "data/layouts/IslandCave/map.bin" + }, + { + "id": "LAYOUT_ANCIENT_TOMB", + "name": "AncientTomb_Layout", + "width": 17, + "height": 33, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/AncientTomb/border.bin", + "blockdata_filepath": "data/layouts/AncientTomb/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER_ROUTE134", + "name": "Underwater_Route134_Layout", + "width": 18, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater_Route134/border.bin", + "blockdata_filepath": "data/layouts/Underwater_Route134/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER_SEALED_CHAMBER", + "name": "Underwater_SealedChamber_Layout", + "width": 22, + "height": 48, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater_SealedChamber/border.bin", + "blockdata_filepath": "data/layouts/Underwater_SealedChamber/map.bin" + }, + { + "id": "LAYOUT_SEALED_CHAMBER_OUTER_ROOM", + "name": "SealedChamber_OuterRoom_Layout", + "width": 21, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SealedChamber_OuterRoom/border.bin", + "blockdata_filepath": "data/layouts/SealedChamber_OuterRoom/map.bin" + }, + { + "id": "LAYOUT_VICTORY_ROAD_B1F", + "name": "VictoryRoad_B1F_Layout", + "width": 46, + "height": 31, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/VictoryRoad_B1F/border.bin", + "blockdata_filepath": "data/layouts/VictoryRoad_B1F/map.bin" + }, + { + "id": "LAYOUT_VICTORY_ROAD_B2F", + "name": "VictoryRoad_B2F_Layout", + "width": 46, + "height": 31, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/VictoryRoad_B2F/border.bin", + "blockdata_filepath": "data/layouts/VictoryRoad_B2F/map.bin" + }, + { + "id": "LAYOUT_ROUTE104_PROTOTYPE", + "name": "Route104_Prototype_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/Route104_Prototype/border.bin", + "blockdata_filepath": "data/layouts/Route104_Prototype/map.bin" + }, + { + "id": "LAYOUT_GRANITE_CAVE_STEVENS_ROOM", + "name": "GraniteCave_StevensRoom_Layout", + "width": 15, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/GraniteCave_StevensRoom/border.bin", + "blockdata_filepath": "data/layouts/GraniteCave_StevensRoom/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "name": "AbandonedShip_HiddenFloorCorridors_Layout", + "width": 13, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin" + }, + { + "id": "LAYOUT_SOUTHERN_ISLAND_EXTERIOR", + "name": "SouthernIsland_Exterior_Layout", + "width": 33, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/SouthernIsland_Exterior/border.bin", + "blockdata_filepath": "data/layouts/SouthernIsland_Exterior/map.bin" + }, + { + "id": "LAYOUT_SOUTHERN_ISLAND_INTERIOR", + "name": "SouthernIsland_Interior_Layout", + "width": 27, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/SouthernIsland_Interior/border.bin", + "blockdata_filepath": "data/layouts/SouthernIsland_Interior/map.bin" + }, + { + "id": "LAYOUT_JAGGED_PASS", + "name": "JaggedPass_Layout", + "width": 30, + "height": 46, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/JaggedPass/border.bin", + "blockdata_filepath": "data/layouts/JaggedPass/map.bin" + }, + { + "id": "LAYOUT_FIERY_PATH", + "name": "FieryPath_Layout", + "width": 35, + "height": 38, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/FieryPath/border.bin", + "blockdata_filepath": "data/layouts/FieryPath/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_FLAT2_1F", + "name": "RustboroCity_Flat2_1F_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat2_1F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat2_1F/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_FLAT2_2F", + "name": "RustboroCity_Flat2_2F_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat2_2F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat2_2F/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_FLAT2_3F", + "name": "RustboroCity_Flat2_3F_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat2_3F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat2_3F/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE", + "name": "SootopolisCity_LotadAndSeedotHouse_Layout", + "width": 8, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME", + "name": "EverGrandeCity_HallOfFame_Layout", + "width": 15, + "height": 17, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", + "border_filepath": "data/layouts/EverGrandeCity_HallOfFame/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_HallOfFame/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", + "name": "LilycoveCity_CoveLilyMotel_1F_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", + "name": "LilycoveCity_CoveLilyMotel_2F_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin" + }, + { + "id": "LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", + "name": "Route124_DivingTreasureHuntersHouse_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route124_DivingTreasureHuntersHouse/border.bin", + "blockdata_filepath": "data/layouts/Route124_DivingTreasureHuntersHouse/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_EXTERIOR", + "name": "MtPyre_Exterior_Layout", + "width": 38, + "height": 51, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_Exterior/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_Exterior/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_SUMMIT", + "name": "MtPyre_Summit_Layout", + "width": 50, + "height": 37, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_Summit/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_Summit/map.bin" + }, + { + "id": "LAYOUT_SEALED_CHAMBER_INNER_ROOM", + "name": "SealedChamber_InnerRoom_Layout", + "width": 21, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SealedChamber_InnerRoom/border.bin", + "blockdata_filepath": "data/layouts/SealedChamber_InnerRoom/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F", + "name": "MossdeepCity_GameCorner_1F_Layout", + "width": 12, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MossdeepGameCorner", + "border_filepath": "data/layouts/MossdeepCity_GameCorner_1F/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_GameCorner_1F/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F", + "name": "MossdeepCity_GameCorner_B1F_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/MossdeepCity_GameCorner_B1F/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_GameCorner_B1F/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", + "name": "SootopolisCity_House1_Layout", + "width": 8, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/SootopolisCity_House1/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_House1/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", + "name": "SootopolisCity_House2_Layout", + "width": 8, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/SootopolisCity_House2/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_House2/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", + "name": "SootopolisCity_House3_Layout", + "width": 8, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/SootopolisCity_House3/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_House3/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "name": "AbandonedShip_HiddenFloorRooms_Layout", + "width": 44, + "height": 15, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin" + }, + { + "id": "LAYOUT_SCORCHED_SLAB", + "name": "ScorchedSlab_Layout", + "width": 15, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ScorchedSlab/border.bin", + "blockdata_filepath": "data/layouts/ScorchedSlab/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0845A394", + "name": "UnknownMap_0845A394_Layout", + "width": 19, + "height": 19, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0845A394/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0845A394/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_FLAT1_1F", + "name": "RustboroCity_Flat1_1F_Layout", + "width": 14, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat1_1F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat1_1F/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_FLAT1_2F", + "name": "RustboroCity_Flat1_2F_Layout", + "width": 14, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat1_2F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat1_2F/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_HALL4", + "name": "EverGrandeCity_Hall4_Layout", + "width": 11, + "height": 34, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_Hall4/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_Hall4/map.bin" + }, + { + "id": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1", + "name": "AquaHideout_UnusedRubyMap1_Layout", + "width": 28, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AquaHideout_UnusedRubyMap1/border.bin", + "blockdata_filepath": "data/layouts/AquaHideout_UnusedRubyMap1/map.bin" + }, + { + "id": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2", + "name": "AquaHideout_UnusedRubyMap2_Layout", + "width": 62, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AquaHideout_UnusedRubyMap2/border.bin", + "blockdata_filepath": "data/layouts/AquaHideout_UnusedRubyMap2/map.bin" + }, + { + "id": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3", + "name": "AquaHideout_UnusedRubyMap3_Layout", + "width": 34, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AquaHideout_UnusedRubyMap3/border.bin", + "blockdata_filepath": "data/layouts/AquaHideout_UnusedRubyMap3/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0845D470", + "name": "UnknownMap_0845D470_Layout", + "width": 60, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_0845D470/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0845D470/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_ENTRANCE", + "name": "SkyPillar_Entrance_Layout", + "width": 18, + "height": 18, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SkyPillar_Entrance/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_Entrance/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_OUTSIDE", + "name": "SkyPillar_Outside_Layout", + "width": 28, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_Outside/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_Outside/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_1F", + "name": "SkyPillar_1F_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_1F/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_1F/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_2F", + "name": "SkyPillar_2F_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_2F/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_2F/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_3F", + "name": "SkyPillar_3F_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_3F/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_3F/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_4F", + "name": "SkyPillar_4F_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_4F/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_4F/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0845ECB4", + "name": "UnknownMap_0845ECB4_Layout", + "width": 27, + "height": 46, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0845ECB4/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0845ECB4/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE", + "name": "MossdeepCity_StevensHouse_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/MossdeepCity_StevensHouse/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_StevensHouse/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", + "name": "ShoalCave_LowTideIceRoom_Layout", + "width": 20, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_LowTideIceRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_LowTideIceRoom/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_REST_HOUSE", + "name": "SafariZone_RestHouse_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/SafariZone_RestHouse/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_RestHouse/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_5F", + "name": "SkyPillar_5F_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_5F/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_5F/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_TOP", + "name": "SkyPillar_Top_Layout", + "width": 27, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_Top/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_Top/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY", + "name": "BattleFrontier_BattleDomeLobby_Layout", + "width": 23, + "height": 17, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleDome", + "border_filepath": "data/layouts/BattleFrontier_BattleDomeLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleDomeLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR", + "name": "BattleFrontier_BattleDomeCorridor_Layout", + "width": 48, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleDome", + "border_filepath": "data/layouts/BattleFrontier_BattleDomeCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleDomeCorridor/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM", + "name": "BattleFrontier_BattleDomePreBattleRoom_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleDome", + "border_filepath": "data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM", + "name": "BattleFrontier_BattleDomeBattleRoom_Layout", + "width": 20, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleDome", + "border_filepath": "data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_1F", + "name": "MagmaHideout_1F_Layout", + "width": 37, + "height": 38, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_1F/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_1F/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_2F_1R", + "name": "MagmaHideout_2F_1R_Layout", + "width": 33, + "height": 39, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_2F_1R/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_2F_1R/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_2F_2R", + "name": "MagmaHideout_2F_2R_Layout", + "width": 49, + "height": 28, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_2F_2R/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_2F_2R/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_3F_1R", + "name": "MagmaHideout_3F_1R_Layout", + "width": 28, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_3F_1R/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_3F_1R/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_3F_2R", + "name": "MagmaHideout_3F_2R_Layout", + "width": 24, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_3F_2R/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_3F_2R/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_4F", + "name": "MagmaHideout_4F_Layout", + "width": 59, + "height": 28, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_4F/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_4F/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", + "name": "BattleFrontier_BattlePalaceLobby_Layout", + "width": 25, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePalace", + "border_filepath": "data/layouts/BattleFrontier_BattlePalaceLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePalaceLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", + "name": "BattleFrontier_BattlePalaceCorridor_Layout", + "width": 17, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BattlePalace", + "border_filepath": "data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM", + "name": "BattleFrontier_BattlePalaceBattleRoom_Layout", + "width": 15, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BattlePalace", + "border_filepath": "data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_OUTSIDE_EAST", + "name": "BattleFrontier_OutsideEast_Layout", + "width": 72, + "height": 72, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BattleFrontierOutsideEast", + "border_filepath": "data/layouts/BattleFrontier_OutsideEast/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_OutsideEast/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY", + "name": "BattleFrontier_BattleFactoryLobby_Layout", + "width": 19, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFactory", + "border_filepath": "data/layouts/BattleFrontier_BattleFactoryLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleFactoryLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM", + "name": "BattleFrontier_BattleFactoryPreBattleRoom_Layout", + "width": 17, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFactory", + "border_filepath": "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM", + "name": "BattleFrontier_BattleFactoryBattleRoom_Layout", + "width": 13, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFactory", + "border_filepath": "data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY", + "name": "BattleFrontier_BattlePikeLobby_Layout", + "width": 11, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/BattleFrontier_BattlePikeLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR", + "name": "BattleFrontier_BattlePikeCorridor_Layout", + "width": 14, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/BattleFrontier_BattlePikeCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeCorridor/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM", + "name": "BattleFrontier_BattlePikeThreePathRoom_Layout", + "width": 13, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1", + "name": "BattleFrontier_BattlePikeRandomRoom1_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2", + "name": "BattleFrontier_BattlePikeRandomRoom2_Layout", + "width": 5, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY", + "name": "BattleFrontier_BattleArenaLobby_Layout", + "width": 16, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleArena", + "border_filepath": "data/layouts/BattleFrontier_BattleArenaLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleArenaLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR", + "name": "BattleFrontier_BattleArenaCorridor_Layout", + "width": 18, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleArena", + "border_filepath": "data/layouts/BattleFrontier_BattleArenaCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleArenaCorridor/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM", + "name": "BattleFrontier_BattleArenaBattleRoom_Layout", + "width": 16, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleArena", + "border_filepath": "data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08469200", + "name": "UnknownMap_08469200_Layout", + "width": 60, + "height": 60, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Sootopolis", + "border_filepath": "data/layouts/UnknownMap_08469200/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08469200/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3", + "name": "BattleFrontier_BattlePikeRandomRoom3_Layout", + "width": 9, + "height": 20, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_084693AC", + "name": "UnknownMap_084693AC_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/UnknownMap_084693AC/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_084693AC/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", + "name": "BattleFrontier_BattlePyramidLobby_Layout", + "width": 15, + "height": 18, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattleFrontier_BattlePyramidLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", + "name": "BattleFrontier_BattlePyramidEmptySquare_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE01", + "name": "BattlePyramidSquare01_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare01/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare01/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE02", + "name": "BattlePyramidSquare02_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare02/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare02/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE03", + "name": "BattlePyramidSquare03_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare03/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare03/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE04", + "name": "BattlePyramidSquare04_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare04/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare04/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE05", + "name": "BattlePyramidSquare05_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare05/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare05/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE06", + "name": "BattlePyramidSquare06_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare06/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare06/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE07", + "name": "BattlePyramidSquare07_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare07/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare07/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE08", + "name": "BattlePyramidSquare08_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare08/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare08/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE09", + "name": "BattlePyramidSquare09_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare09/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare09/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE10", + "name": "BattlePyramidSquare10_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare10/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare10/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE11", + "name": "BattlePyramidSquare11_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare11/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare11/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE12", + "name": "BattlePyramidSquare12_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare12/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare12/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE13", + "name": "BattlePyramidSquare13_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare13/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare13/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE14", + "name": "BattlePyramidSquare14_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare14/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare14/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE15", + "name": "BattlePyramidSquare15_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare15/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare15/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE16", + "name": "BattlePyramidSquare16_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare16/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare16/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP", + "name": "BattleFrontier_BattlePyramidTop_Layout", + "width": 34, + "height": 23, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattleFrontier_BattlePyramidTop/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidTop/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_3F_3R", + "name": "MagmaHideout_3F_3R_Layout", + "width": 33, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_3F_3R/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_3F_3R/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_2F_3R", + "name": "MagmaHideout_2F_3R_Layout", + "width": 60, + "height": 19, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_2F_3R/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_2F_3R/map.bin" + }, + { + "id": "LAYOUT_MIRAGE_TOWER_1F", + "name": "MirageTower_1F_Layout", + "width": 21, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MirageTower", + "border_filepath": "data/layouts/MirageTower_1F/border.bin", + "blockdata_filepath": "data/layouts/MirageTower_1F/map.bin" + }, + { + "id": "LAYOUT_MIRAGE_TOWER_2F", + "name": "MirageTower_2F_Layout", + "width": 21, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MirageTower", + "border_filepath": "data/layouts/MirageTower_2F/border.bin", + "blockdata_filepath": "data/layouts/MirageTower_2F/map.bin" + }, + { + "id": "LAYOUT_MIRAGE_TOWER_3F", + "name": "MirageTower_3F_Layout", + "width": 21, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MirageTower", + "border_filepath": "data/layouts/MirageTower_3F/border.bin", + "blockdata_filepath": "data/layouts/MirageTower_3F/map.bin" + }, + { + "id": "LAYOUT_BATTLE_TENT_LOBBY", + "name": "BattleTentLobby_Layout", + "width": 13, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleTent", + "border_filepath": "data/layouts/BattleTentLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleTentLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_TENT_CORRIDOR", + "name": "BattleTentCorridor_Layout", + "width": 5, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleTent", + "border_filepath": "data/layouts/BattleTentCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleTentCorridor/map.bin" + }, + { + "id": "LAYOUT_BATTLE_TENT_BATTLE_ROOM", + "name": "BattleTentBattleRoom_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleTent", + "border_filepath": "data/layouts/BattleTentBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleTentBattleRoom/map.bin" + }, + { + "id": "LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM", + "name": "VerdanturfTown_BattleTentBattleRoom_Layout", + "width": 13, + "height": 9, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BattleTent", + "border_filepath": "data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin" + }, + { + "id": "LAYOUT_MIRAGE_TOWER_4F", + "name": "MirageTower_4F_Layout", + "width": 13, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MirageTower", + "border_filepath": "data/layouts/MirageTower_4F/border.bin", + "blockdata_filepath": "data/layouts/MirageTower_4F/map.bin" + }, + { + "id": "LAYOUT_DESERT_UNDERPASS", + "name": "DesertUnderpass_Layout", + "width": 139, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/DesertUnderpass/border.bin", + "blockdata_filepath": "data/layouts/DesertUnderpass/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM", + "name": "BattleFrontier_BattleTowerMultiBattleRoom_Layout", + "width": 21, + "height": 15, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2", + "name": "BattleFrontier_BattleTowerCorridor2_Layout", + "width": 17, + "height": 5, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin" + }, + { + "id": "LAYOUT_ROUTE111_NO_MIRAGE_TOWER", + "name": "Route111_NoMirageTower_Layout", + "width": 40, + "height": 140, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/Route111_NoMirageTower/border.bin", + "blockdata_filepath": "data/layouts/Route111_NoMirageTower/map.bin" + }, + { + "id": "LAYOUT_UNION_ROOM", + "name": "UnionRoom_Layout", + "width": 15, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_UnionRoom", + "border_filepath": "data/layouts/UnionRoom/border.bin", + "blockdata_filepath": "data/layouts/UnionRoom/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_NORTHEAST", + "name": "SafariZone_Northeast_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/SafariZone_Northeast/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_Northeast/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_SOUTHEAST", + "name": "SafariZone_Southeast_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/SafariZone_Southeast/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_Southeast/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_RANKING_HALL", + "name": "BattleFrontier_RankingHall_Layout", + "width": 53, + "height": 15, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontierRankingHall", + "border_filepath": "data/layouts/BattleFrontier_RankingHall/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_RankingHall/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_LOUNGE1", + "name": "BattleFrontier_Lounge1_Layout", + "width": 13, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_Lounge1/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_Lounge1/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER", + "name": "BattleFrontier_BattlePointExchangeServiceCorner_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE", + "name": "BattleFrontier_ReceptionGate_Layout", + "width": 9, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_ReceptionGate/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_ReceptionGate/map.bin" + }, + { + "id": "LAYOUT_ARTISAN_CAVE_B1F", + "name": "ArtisanCave_B1F_Layout", + "width": 46, + "height": 54, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ArtisanCave_B1F/border.bin", + "blockdata_filepath": "data/layouts/ArtisanCave_B1F/map.bin" + }, + { + "id": "LAYOUT_ARTISAN_CAVE_1F", + "name": "ArtisanCave_1F_Layout", + "width": 21, + "height": 22, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ArtisanCave_1F/border.bin", + "blockdata_filepath": "data/layouts/ArtisanCave_1F/map.bin" + }, + { + "id": "LAYOUT_FARAWAY_ISLAND_ENTRANCE", + "name": "FarawayIsland_Entrance_Layout", + "width": 34, + "height": 46, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/FarawayIsland_Entrance/border.bin", + "blockdata_filepath": "data/layouts/FarawayIsland_Entrance/map.bin" + }, + { + "id": "LAYOUT_FARAWAY_ISLAND_INTERIOR", + "name": "FarawayIsland_Interior_Layout", + "width": 29, + "height": 26, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fortree", + "border_filepath": "data/layouts/FarawayIsland_Interior/border.bin", + "blockdata_filepath": "data/layouts/FarawayIsland_Interior/map.bin" + }, + { + "id": "LAYOUT_BIRTH_ISLAND_EXTERIOR", + "name": "BirthIsland_Exterior_Layout", + "width": 30, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Dewford", + "border_filepath": "data/layouts/BirthIsland_Exterior/border.bin", + "blockdata_filepath": "data/layouts/BirthIsland_Exterior/map.bin" + }, + { + "id": "LAYOUT_ISLAND_HARBOR", + "name": "IslandHarbor_Layout", + "width": 17, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_IslandHarbor", + "border_filepath": "data/layouts/IslandHarbor/border.bin", + "blockdata_filepath": "data/layouts/IslandHarbor/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER_MARINE_CAVE", + "name": "Underwater_MarineCave_Layout", + "width": 20, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater_MarineCave/border.bin", + "blockdata_filepath": "data/layouts/Underwater_MarineCave/map.bin" + }, + { + "id": "LAYOUT_MARINE_CAVE_ENTRANCE", + "name": "MarineCave_Entrance_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/MarineCave_Entrance/border.bin", + "blockdata_filepath": "data/layouts/MarineCave_Entrance/map.bin" + }, + { + "id": "LAYOUT_TERRA_CAVE_ENTRANCE", + "name": "TerraCave_Entrance_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/TerraCave_Entrance/border.bin", + "blockdata_filepath": "data/layouts/TerraCave_Entrance/map.bin" + }, + { + "id": "LAYOUT_TERRA_CAVE_END", + "name": "TerraCave_End_Layout", + "width": 27, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/TerraCave_End/border.bin", + "blockdata_filepath": "data/layouts/TerraCave_End/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER6", + "name": "Underwater6_Layout", + "width": 40, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater6/border.bin", + "blockdata_filepath": "data/layouts/Underwater6/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER7", + "name": "Underwater7_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater7/border.bin", + "blockdata_filepath": "data/layouts/Underwater7/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER5", + "name": "Underwater5_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater5/border.bin", + "blockdata_filepath": "data/layouts/Underwater5/map.bin" + }, + { + "id": "LAYOUT_MARINE_CAVE_END", + "name": "MarineCave_End_Layout", + "width": 27, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/MarineCave_End/border.bin", + "blockdata_filepath": "data/layouts/MarineCave_End/map.bin" + }, + { + "id": "LAYOUT_TRAINER_HILL_ENTRANCE", + "name": "TrainerHill_Entrance_Layout", + "width": 19, + "height": 17, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerHill", + "border_filepath": "data/layouts/TrainerHill_Entrance/border.bin", + "blockdata_filepath": "data/layouts/TrainerHill_Entrance/map.bin" + }, + { + "id": "LAYOUT_TRAINER_HILL_1F", + "name": "TrainerHill_1F_Layout", + "width": 16, + "height": 21, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerHill", + "border_filepath": "data/layouts/TrainerHill_1F/border.bin", + "blockdata_filepath": "data/layouts/TrainerHill_1F/map.bin" + }, + { + "id": "LAYOUT_TRAINER_HILL_2F", + "name": "TrainerHill_2F_Layout", + "width": 16, + "height": 21, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerHill", + "border_filepath": "data/layouts/TrainerHill_2F/border.bin", + "blockdata_filepath": "data/layouts/TrainerHill_2F/map.bin" + }, + { + "id": "LAYOUT_TRAINER_HILL_3F", + "name": "TrainerHill_3F_Layout", + "width": 16, + "height": 21, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerHill", + "border_filepath": "data/layouts/TrainerHill_3F/border.bin", + "blockdata_filepath": "data/layouts/TrainerHill_3F/map.bin" + }, + { + "id": "LAYOUT_TRAINER_HILL_4F", + "name": "TrainerHill_4F_Layout", + "width": 16, + "height": 21, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerHill", + "border_filepath": "data/layouts/TrainerHill_4F/border.bin", + "blockdata_filepath": "data/layouts/TrainerHill_4F/map.bin" + }, + { + "id": "LAYOUT_TRAINER_HILL_ROOF", + "name": "TrainerHill_Roof_Layout", + "width": 25, + "height": 16, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerHill", + "border_filepath": "data/layouts/TrainerHill_Roof/border.bin", + "blockdata_filepath": "data/layouts/TrainerHill_Roof/map.bin" + }, + { + "id": "LAYOUT_ALTERING_CAVE", + "name": "AlteringCave_Layout", + "width": 32, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/AlteringCave/border.bin", + "blockdata_filepath": "data/layouts/AlteringCave/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_EXTERIOR", + "name": "NavelRock_Exterior_Layout", + "width": 21, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Dewford", + "border_filepath": "data/layouts/NavelRock_Exterior/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_Exterior/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_ENTRANCE", + "name": "NavelRock_Entrance_Layout", + "width": 21, + "height": 32, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_Entrance/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_Entrance/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_TOP", + "name": "NavelRock_Top_Layout", + "width": 25, + "height": 28, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_Top/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_Top/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_BOTTOM", + "name": "NavelRock_Bottom_Layout", + "width": 22, + "height": 22, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_Bottom/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_Bottom/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "name": "NavelRock_LadderRoom1_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_LadderRoom1/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_LadderRoom1/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "name": "NavelRock_LadderRoom2_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_LadderRoom2/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_LadderRoom2/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_B1F", + "name": "NavelRock_B1F_Layout", + "width": 23, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_B1F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_B1F/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_FORK", + "name": "NavelRock_Fork_Layout", + "width": 27, + "height": 86, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_Fork/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_Fork/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "name": "BattleFrontier_Lounge2_Layout", + "width": 9, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_Lounge2/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_Lounge2/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE", + "name": "BattleFrontier_ScottsHouse_Layout", + "width": 6, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_ScottsHouse/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_ScottsHouse/map.bin" + }, + { + "id": "LAYOUT_METEOR_FALLS_STEVENS_CAVE", + "name": "MeteorFalls_StevensCave_Layout", + "width": 30, + "height": 32, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MeteorFalls", + "border_filepath": "data/layouts/MeteorFalls_StevensCave/border.bin", + "blockdata_filepath": "data/layouts/MeteorFalls_StevensCave/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08480DAC", + "name": "UnknownMap_08480DAC_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", + "border_filepath": "data/layouts/UnknownMap_08480DAC/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08480DAC/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08480F54", + "name": "UnknownMap_08480F54_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_08480F54/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08480F54/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_084810FC", + "name": "UnknownMap_084810FC_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_084810FC/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_084810FC/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_084812A4", + "name": "UnknownMap_084812A4_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_084812A4/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_084812A4/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0848144C", + "name": "UnknownMap_0848144C_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_0848144C/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0848144C/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_084815F4", + "name": "UnknownMap_084815F4_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_084815F4/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_084815F4/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08481B24", + "name": "UnknownMap_08481B24_Layout", + "width": 27, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_08481B24/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08481B24/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", + "name": "SootopolisCity_MysteryEventsHouse_1F_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MysteryEventsHouse", + "border_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F", + "name": "SootopolisCity_MysteryEventsHouse_B1F_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MysteryEventsHouse", + "border_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08481DBC", + "name": "UnknownMap_08481DBC_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MysteryEventsHouse", + "border_filepath": "data/layouts/UnknownMap_08481DBC/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08481DBC/map.bin" + } + ] +} \ No newline at end of file diff --git a/data/layouts_table.inc b/data/layouts_table.inc deleted file mode 100644 index fb1385bdb6..0000000000 --- a/data/layouts_table.inc +++ /dev/null @@ -1,443 +0,0 @@ - .align 2 -gMapLayouts:: - .4byte PetalburgCity_Layout - .4byte SlateportCity_Layout - .4byte MauvilleCity_Layout - .4byte RustboroCity_Layout - .4byte FortreeCity_Layout - .4byte LilycoveCity_Layout - .4byte MossdeepCity_Layout - .4byte SootopolisCity_Layout - .4byte EverGrandeCity_Layout - .4byte LittlerootTown_Layout - .4byte OldaleTown_Layout - .4byte DewfordTown_Layout - .4byte LavaridgeTown_Layout - .4byte FallarborTown_Layout - .4byte VerdanturfTown_Layout - .4byte PacifidlogTown_Layout - .4byte Route101_Layout - .4byte Route102_Layout - .4byte Route103_Layout - .4byte Route104_Layout - .4byte Route105_Layout - .4byte Route106_Layout - .4byte Route107_Layout - .4byte Route108_Layout - .4byte Route109_Layout - .4byte Route110_Layout - .4byte Route111_Layout - .4byte Route112_Layout - .4byte Route113_Layout - .4byte Route114_Layout - .4byte Route115_Layout - .4byte Route116_Layout - .4byte Route117_Layout - .4byte Route118_Layout - .4byte Route119_Layout - .4byte Route120_Layout - .4byte Route121_Layout - .4byte Route122_Layout - .4byte Route123_Layout - .4byte Route124_Layout - .4byte Route125_Layout - .4byte Route126_Layout - .4byte Route127_Layout - .4byte Route128_Layout - .4byte Route129_Layout - .4byte UnknownMap_08417FC4_Layout - .4byte Route131_Layout - .4byte Route132_Layout - .4byte Route133_Layout - .4byte Route134_Layout - .4byte Underwater2_Layout - .4byte Underwater3_Layout - .4byte Underwater4_Layout - .4byte LittlerootTown_BrendansHouse_1F_Layout - .4byte LittlerootTown_BrendansHouse_2F_Layout - .4byte LittlerootTown_MaysHouse_1F_Layout - .4byte LittlerootTown_MaysHouse_2F_Layout - .4byte LittlerootTown_ProfessorBirchsLab_Layout - .4byte House1_Layout - .4byte House2_Layout - .4byte PokemonCenter_1F_Layout - .4byte PokemonCenter_2F_Layout - .4byte Mart_Layout - .4byte House3_Layout - .4byte DewfordTown_Gym_Layout - .4byte DewfordTown_Hall_Layout - .4byte House4_Layout - .4byte LavaridgeTown_HerbShop_Layout - .4byte LavaridgeTown_Gym_1F_Layout - .4byte LavaridgeTown_Gym_B1F_Layout - .4byte LavaridgeTown_PokemonCenter_1F_Layout - .4byte FallarborTown_LeftoverRSContestLobby_Layout - .4byte FallarborTown_LeftoverRSContestHall_Layout - .4byte LilycoveCity_House2_Layout - .4byte UnknownMap_08428450_Layout - .4byte VerdanturfTown_WandasHouse_Layout - .4byte PacifidlogTown_House1_Layout - .4byte PacifidlogTown_House2_Layout - .4byte PetalburgCity_Gym_Layout - .4byte HouseWithBed_Layout - .4byte SlateportCity_SternsShipyard_1F_Layout - .4byte SlateportCity_SternsShipyard_2F_Layout - .4byte UnknownMap_084294C4_Layout - .4byte UnknownMap_084294E8_Layout - .4byte SlateportCity_PokemonFanClub_Layout - .4byte SlateportCity_OceanicMuseum_1F_Layout - .4byte SlateportCity_OceanicMuseum_2F_Layout - .4byte Harbor_Layout - .4byte MauvilleCity_Gym_Layout - .4byte MauvilleCity_BikeShop_Layout - .4byte MauvilleCity_GameCorner_Layout - .4byte RustboroCity_DevonCorp_1F_Layout - .4byte RustboroCity_DevonCorp_2F_Layout - .4byte RustboroCity_Gym_Layout - .4byte RustboroCity_PokemonSchool_Layout - .4byte RustboroCity_House_Layout - .4byte RustboroCity_House1_Layout - .4byte RustboroCity_CuttersHouse_Layout - .4byte FortreeCity_House1_Layout - .4byte FortreeCity_Gym_Layout - .4byte FortreeCity_House2_Layout - .4byte Route104_MrBrineysHouse_Layout - .4byte LilycoveCity_LilycoveMuseum_1F_Layout - .4byte LilycoveCity_LilycoveMuseum_2F_Layout - .4byte LilycoveCity_ContestLobby_Layout - .4byte LilycoveCity_ContestHall_Layout - .4byte LilycoveCity_PokemonTrainerFanClub_Layout - .4byte MossdeepCity_Gym_Layout - .4byte SootopolisCity_Gym_1F_Layout - .4byte SootopolisCity_Gym_B1F_Layout - .4byte EverGrandeCity_SidneysRoom_Layout - .4byte EverGrandeCity_PhoebesRoom_Layout - .4byte EverGrandeCity_GlaciasRoom_Layout - .4byte EverGrandeCity_DrakesRoom_Layout - .4byte EverGrandeCity_ChampionsRoom_Layout - .4byte EverGrandeCity_ShortHall_Layout - .4byte Route104_PrettyPetalFlowerShop_Layout - .4byte CableCarStation_Layout - .4byte Route114_FossilManiacsHouse_Layout - .4byte Route114_FossilManiacsTunnel_Layout - .4byte Route114_LanettesHouse_Layout - .4byte Route116_TunnelersRestHouse_Layout - .4byte Route117_PokemonDayCare_Layout - .4byte Route121_SafariZoneEntrance_Layout - .4byte MeteorFalls_1F_1R_Layout - .4byte MeteorFalls_1F_2R_Layout - .4byte MeteorFalls_B1F_1R_Layout - .4byte MeteorFalls_B1F_2R_Layout - .4byte RusturfTunnel_Layout - .4byte Underwater_SootopolisCity_Layout - .4byte DesertRuins_Layout - .4byte GraniteCave_1F_Layout - .4byte GraniteCave_B1F_Layout - .4byte GraniteCave_B2F_Layout - .4byte PetalburgWoods_Layout - .4byte MtChimney_Layout - .4byte MtPyre_1F_Layout - .4byte MtPyre_2F_Layout - .4byte MtPyre_3F_Layout - .4byte MtPyre_4F_Layout - .4byte MtPyre_5F_Layout - .4byte MtPyre_6F_Layout - .4byte AquaHideout_1F_Layout - .4byte AquaHideout_B1F_Layout - .4byte AquaHideout_B2F_Layout - .4byte Underwater_SeafloorCavern_Layout - .4byte SeafloorCavern_Entrance_Layout - .4byte SeafloorCavern_Room1_Layout - .4byte SeafloorCavern_Room2_Layout - .4byte SeafloorCavern_Room3_Layout - .4byte SeafloorCavern_Room4_Layout - .4byte SeafloorCavern_Room5_Layout - .4byte SeafloorCavern_Room6_Layout - .4byte SeafloorCavern_Room7_Layout - .4byte SeafloorCavern_Room8_Layout - .4byte SeafloorCavern_Room9_Layout - .4byte CaveOfOrigin_Entrance_Layout - .4byte CaveOfOrigin_1F_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap1_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout - .4byte CaveOfOrigin_B1F_Layout - .4byte VictoryRoad_1F_Layout - .4byte ShoalCave_LowTideEntranceRoom_Layout - .4byte ShoalCave_LowTideInnerRoom_Layout - .4byte ShoalCave_LowTideStairsRoom_Layout - .4byte ShoalCave_LowTideLowerRoom_Layout - .4byte ShoalCave_HighTideEntranceRoom_Layout - .4byte ShoalCave_HighTideInnerRoom_Layout - .4byte UnknownMap_0843E6C0_Layout - .4byte UnknownMap_0843E6E4_Layout - .4byte UnknownMap_0843E708_Layout - .4byte UnknownMap_0843E72C_Layout - .4byte UnknownMap_0843E750_Layout - .4byte UnknownMap_0843E774_Layout - .4byte UnknownMap_0843E798_Layout - .4byte UnknownMap_0843E7BC_Layout - .4byte UnknownMap_0843E7E0_Layout - .4byte UnknownMap_0843E804_Layout - .4byte UnknownMap_0843E828_Layout - .4byte UnknownMap_0843E84C_Layout - .4byte UnknownMap_0843E870_Layout - .4byte UnknownMap_0843E894_Layout - .4byte NewMauville_Entrance_Layout - .4byte NewMauville_Inside_Layout - .4byte AbandonedShip_Deck_Layout - .4byte AbandonedShip_Corridors_1F_Layout - .4byte AbandonedShip_Rooms_1F_Layout - .4byte AbandonedShip_Corridors_B1F_Layout - .4byte AbandonedShip_Rooms_B1F_Layout - .4byte AbandonedShip_Rooms2_B1F_Layout - .4byte AbandonedShip_Underwater1_Layout - .4byte AbandonedShip_Room_B1F_Layout - .4byte AbandonedShip_Rooms2_1F_Layout - .4byte AbandonedShip_CaptainsOffice_Layout - .4byte AbandonedShip_Underwater2_Layout - .4byte SecretBase_RedCave1_Layout - .4byte SecretBase_BrownCave1_Layout - .4byte SecretBase_BlueCave1_Layout - .4byte SecretBase_YellowCave1_Layout - .4byte SecretBase_Tree1_Layout - .4byte SecretBase_Shrub1_Layout - .4byte SecretBase_RedCave2_Layout - .4byte SecretBase_BrownCave2_Layout - .4byte SecretBase_BlueCave2_Layout - .4byte SecretBase_YellowCave2_Layout - .4byte SecretBase_Tree2_Layout - .4byte SecretBase_Shrub2_Layout - .4byte SecretBase_RedCave3_Layout - .4byte SecretBase_BrownCave3_Layout - .4byte SecretBase_BlueCave3_Layout - .4byte SecretBase_YellowCave3_Layout - .4byte SecretBase_Tree3_Layout - .4byte SecretBase_Shrub3_Layout - .4byte SecretBase_RedCave4_Layout - .4byte SecretBase_BrownCave4_Layout - .4byte SecretBase_BlueCave4_Layout - .4byte SecretBase_YellowCave4_Layout - .4byte SecretBase_Tree4_Layout - .4byte SecretBase_Shrub4_Layout - .4byte SingleBattleColosseum_Layout - .4byte TradeCenter_Layout - .4byte RecordCorner_Layout - .4byte DoubleBattleColosseum_Layout - .4byte LinkContestRoom1_Layout - .4byte UnknownMap_25_29_Layout - .4byte UnknownMap_25_30_Layout - .4byte UnknownMap_25_31_Layout - .4byte UnknownMap_25_32_Layout - .4byte UnknownMap_25_33_Layout - .4byte UnknownMap_25_34_Layout - .4byte LinkContestRoom2_Layout - .4byte LinkContestRoom3_Layout - .4byte LinkContestRoom4_Layout - .4byte LinkContestRoom5_Layout - .4byte LinkContestRoom6_Layout - .4byte InsideOfTruck_Layout - .4byte SafariZone_Northwest_Layout - .4byte SafariZone_North_Layout - .4byte SafariZone_Southwest_Layout - .4byte SafariZone_South_Layout - .4byte UnknownMap_08447028_Layout - .4byte Route109_SeashoreHouse_Layout - .4byte Route110_TrickHouseEntrance_Layout - .4byte Route110_TrickHouseEnd_Layout - .4byte Route110_TrickHouseCorridor_Layout - .4byte Route110_TrickHousePuzzle1_Layout - .4byte Route110_TrickHousePuzzle2_Layout - .4byte Route110_TrickHousePuzzle3_Layout - .4byte Route110_TrickHousePuzzle4_Layout - .4byte Route110_TrickHousePuzzle5_Layout - .4byte Route110_TrickHousePuzzle6_Layout - .4byte Route110_TrickHousePuzzle7_Layout - .4byte Route110_TrickHousePuzzle8_Layout - .4byte FortreeCity_DecorationShop_Layout - .4byte Route110_SeasideCyclingRoadEntrance_Layout - .4byte LilycoveCity_DepartmentStore_1F_Layout - .4byte LilycoveCity_DepartmentStore_2F_Layout - .4byte LilycoveCity_DepartmentStore_3F_Layout - .4byte LilycoveCity_DepartmentStore_4F_Layout - .4byte LilycoveCity_DepartmentStore_5F_Layout - .4byte LilycoveCity_DepartmentStoreRooftop_Layout - .4byte Route130_Layout - .4byte BattleFrontier_BattleTowerLobby_Layout - .4byte BattleFrontier_OutsideWest_Layout - .4byte BattleElevator_Layout - .4byte BattleFrontier_BattleTowerCorridor_Layout - .4byte BattleFrontier_BattleTowerBattleRoom_Layout - .4byte RustboroCity_DevonCorp_3F_Layout - .4byte EverGrandeCity_PokemonLeague_1F_Layout - .4byte Route119_WeatherInstitute_1F_Layout - .4byte Route119_WeatherInstitute_2F_Layout - .4byte LilycoveCity_DepartmentStoreElevator_Layout - .4byte Underwater1_Layout - .4byte MossdeepCity_SpaceCenter_1F_Layout - .4byte MossdeepCity_SpaceCenter_2F_Layout - .4byte SSTidalCorridor_Layout - .4byte SSTidalLowerDeck_Layout - .4byte SSTidalRooms_Layout - .4byte IslandCave_Layout - .4byte AncientTomb_Layout - .4byte Underwater_Route134_Layout - .4byte Underwater_SealedChamber_Layout - .4byte SealedChamber_OuterRoom_Layout - .4byte VictoryRoad_B1F_Layout - .4byte VictoryRoad_B2F_Layout - .4byte Route104_Prototype_Layout - .4byte GraniteCave_StevensRoom_Layout - .4byte AbandonedShip_HiddenFloorCorridors_Layout - .4byte SouthernIsland_Exterior_Layout - .4byte SouthernIsland_Interior_Layout - .4byte JaggedPass_Layout - .4byte FieryPath_Layout - .4byte RustboroCity_Flat2_1F_Layout - .4byte RustboroCity_Flat2_2F_Layout - .4byte RustboroCity_Flat2_3F_Layout - .4byte SootopolisCity_LotadAndSeedotHouse_Layout - .4byte EverGrandeCity_HallOfFame_Layout - .4byte LilycoveCity_CoveLilyMotel_1F_Layout - .4byte LilycoveCity_CoveLilyMotel_2F_Layout - .4byte Route124_DivingTreasureHuntersHouse_Layout - .4byte MtPyre_Exterior_Layout - .4byte MtPyre_Summit_Layout - .4byte SealedChamber_InnerRoom_Layout - .4byte MossdeepCity_GameCorner_1F_Layout - .4byte MossdeepCity_GameCorner_B1F_Layout - .4byte SootopolisCity_House1_Layout - .4byte SootopolisCity_House2_Layout - .4byte SootopolisCity_House3_Layout - .4byte AbandonedShip_HiddenFloorRooms_Layout - .4byte ScorchedSlab_Layout - .4byte UnknownMap_0845A394_Layout - .4byte RustboroCity_Flat1_1F_Layout - .4byte RustboroCity_Flat1_2F_Layout - .4byte EverGrandeCity_Hall4_Layout - .4byte AquaHideout_UnusedRubyMap1_Layout - .4byte AquaHideout_UnusedRubyMap2_Layout - .4byte AquaHideout_UnusedRubyMap3_Layout - .4byte UnknownMap_0845D470_Layout - .4byte SkyPillar_Entrance_Layout - .4byte SkyPillar_Outside_Layout - .4byte SkyPillar_1F_Layout - .4byte SkyPillar_2F_Layout - .4byte SkyPillar_3F_Layout - .4byte SkyPillar_4F_Layout - .4byte UnknownMap_0845ECB4_Layout - .4byte MossdeepCity_StevensHouse_Layout - .4byte ShoalCave_LowTideIceRoom_Layout - .4byte SafariZone_RestHouse_Layout - .4byte SkyPillar_5F_Layout - .4byte SkyPillar_Top_Layout - .4byte BattleFrontier_BattleDomeLobby_Layout - .4byte BattleFrontier_BattleDomeCorridor_Layout - .4byte BattleFrontier_BattleDomePreBattleRoom_Layout - .4byte BattleFrontier_BattleDomeBattleRoom_Layout - .4byte MagmaHideout_1F_Layout - .4byte MagmaHideout_2F_1R_Layout - .4byte MagmaHideout_2F_2R_Layout - .4byte MagmaHideout_3F_1R_Layout - .4byte MagmaHideout_3F_2R_Layout - .4byte MagmaHideout_4F_Layout - .4byte BattleFrontier_BattlePalaceLobby_Layout - .4byte BattleFrontier_BattlePalaceCorridor_Layout - .4byte BattleFrontier_BattlePalaceBattleRoom_Layout - .4byte BattleFrontier_OutsideEast_Layout - .4byte BattleFrontier_BattleFactoryLobby_Layout - .4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout - .4byte BattleFrontier_BattleFactoryBattleRoom_Layout - .4byte BattleFrontier_BattlePikeLobby_Layout - .4byte BattleFrontier_BattlePikeCorridor_Layout - .4byte BattleFrontier_BattlePikeThreePathRoom_Layout - .4byte BattleFrontier_BattlePikeRandomRoom1_Layout - .4byte BattleFrontier_BattlePikeRandomRoom2_Layout - .4byte BattleFrontier_BattleArenaLobby_Layout - .4byte BattleFrontier_BattleArenaCorridor_Layout - .4byte BattleFrontier_BattleArenaBattleRoom_Layout - .4byte UnknownMap_08469200_Layout - .4byte BattleFrontier_BattlePikeRandomRoom3_Layout - .4byte UnknownMap_084693AC_Layout - .4byte BattleFrontier_BattlePyramidLobby_Layout - .4byte BattleFrontier_BattlePyramidEmptySquare_Layout - .4byte BattlePyramidSquare01_Layout - .4byte BattlePyramidSquare02_Layout - .4byte BattlePyramidSquare03_Layout - .4byte BattlePyramidSquare04_Layout - .4byte BattlePyramidSquare05_Layout - .4byte BattlePyramidSquare06_Layout - .4byte BattlePyramidSquare07_Layout - .4byte BattlePyramidSquare08_Layout - .4byte BattlePyramidSquare09_Layout - .4byte BattlePyramidSquare10_Layout - .4byte BattlePyramidSquare11_Layout - .4byte BattlePyramidSquare12_Layout - .4byte BattlePyramidSquare13_Layout - .4byte BattlePyramidSquare14_Layout - .4byte BattlePyramidSquare15_Layout - .4byte BattlePyramidSquare16_Layout - .4byte BattleFrontier_BattlePyramidTop_Layout - .4byte MagmaHideout_3F_3R_Layout - .4byte MagmaHideout_2F_3R_Layout - .4byte MirageTower_1F_Layout - .4byte MirageTower_2F_Layout - .4byte MirageTower_3F_Layout - .4byte BattleTentLobby_Layout - .4byte BattleTentCorridor_Layout - .4byte BattleTentBattleRoom_Layout - .4byte VerdanturfTown_BattleTentBattleRoom_Layout - .4byte MirageTower_4F_Layout - .4byte DesertUnderpass_Layout - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout - .4byte BattleFrontier_BattleTowerCorridor2_Layout - .4byte Route111_NoMirageTower_Layout - .4byte UnionRoom_Layout - .4byte SafariZone_Northeast_Layout - .4byte SafariZone_Southeast_Layout - .4byte BattleFrontier_RankingHall_Layout - .4byte BattleFrontier_Lounge1_Layout - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout - .4byte BattleFrontier_ReceptionGate_Layout - .4byte ArtisanCave_B1F_Layout - .4byte ArtisanCave_1F_Layout - .4byte FarawayIsland_Entrance_Layout - .4byte FarawayIsland_Interior_Layout - .4byte BirthIsland_Exterior_Layout - .4byte IslandHarbor_Layout - .4byte Underwater_MarineCave_Layout - .4byte MarineCave_Entrance_Layout - .4byte TerraCave_Entrance_Layout - .4byte TerraCave_End_Layout - .4byte Underwater6_Layout - .4byte Underwater7_Layout - .4byte Underwater5_Layout - .4byte MarineCave_End_Layout - .4byte TrainerHill_Entrance_Layout - .4byte TrainerHill_1F_Layout - .4byte TrainerHill_2F_Layout - .4byte TrainerHill_3F_Layout - .4byte TrainerHill_4F_Layout - .4byte TrainerHill_Roof_Layout - .4byte AlteringCave_Layout - .4byte NavelRock_Exterior_Layout - .4byte NavelRock_Entrance_Layout - .4byte NavelRock_Top_Layout - .4byte NavelRock_Bottom_Layout - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_B1F_Layout - .4byte NavelRock_Fork_Layout - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_ScottsHouse_Layout - .4byte MeteorFalls_StevensCave_Layout - .4byte UnknownMap_08480DAC_Layout - .4byte UnknownMap_08480F54_Layout - .4byte UnknownMap_084810FC_Layout - .4byte UnknownMap_084812A4_Layout - .4byte UnknownMap_0848144C_Layout - .4byte UnknownMap_084815F4_Layout - .4byte UnknownMap_08481B24_Layout - .4byte SootopolisCity_MysteryEventsHouse_1F_Layout - .4byte SootopolisCity_MysteryEventsHouse_B1F_Layout - .4byte UnknownMap_08481DBC_Layout diff --git a/data/map_events.s b/data/map_events.s index 6b20620764..c6f88d305c 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -12,522 +12,5 @@ .section .rodata - .include "data/maps/PetalburgCity/events.inc" - .include "data/maps/SlateportCity/events.inc" - .include "data/maps/MauvilleCity/events.inc" - .include "data/maps/RustboroCity/events.inc" - .include "data/maps/FortreeCity/events.inc" - .include "data/maps/LilycoveCity/events.inc" - .include "data/maps/MossdeepCity/events.inc" - .include "data/maps/SootopolisCity/events.inc" - .include "data/maps/EverGrandeCity/events.inc" - .include "data/maps/LittlerootTown/events.inc" - .include "data/maps/OldaleTown/events.inc" - .include "data/maps/DewfordTown/events.inc" - .include "data/maps/LavaridgeTown/events.inc" - .include "data/maps/FallarborTown/events.inc" - .include "data/maps/VerdanturfTown/events.inc" - .include "data/maps/PacifidlogTown/events.inc" - .include "data/maps/Route101/events.inc" - .include "data/maps/Route102/events.inc" - .include "data/maps/Route103/events.inc" - .include "data/maps/Route104/events.inc" - .include "data/maps/Route105/events.inc" - .include "data/maps/Route106/events.inc" - .include "data/maps/Route107/events.inc" - .include "data/maps/Route108/events.inc" - .include "data/maps/Route109/events.inc" - .include "data/maps/Route110/events.inc" - .include "data/maps/Route111/events.inc" - .include "data/maps/Route112/events.inc" - .include "data/maps/Route113/events.inc" - .include "data/maps/Route114/events.inc" - .include "data/maps/Route115/events.inc" - .include "data/maps/Route116/events.inc" - .include "data/maps/Route117/events.inc" - .include "data/maps/Route118/events.inc" - .include "data/maps/Route119/events.inc" - .include "data/maps/Route120/events.inc" - .include "data/maps/Route121/events.inc" - .include "data/maps/Route122/events.inc" - .include "data/maps/Route123/events.inc" - .include "data/maps/Route124/events.inc" - .include "data/maps/Route125/events.inc" - .include "data/maps/Route126/events.inc" - .include "data/maps/Route127/events.inc" - .include "data/maps/Route128/events.inc" - .include "data/maps/Route129/events.inc" - .include "data/maps/Route130/events.inc" - .include "data/maps/Route131/events.inc" - .include "data/maps/Route132/events.inc" - .include "data/maps/Route133/events.inc" - .include "data/maps/Route134/events.inc" - .include "data/maps/Underwater1/events.inc" - .include "data/maps/Underwater2/events.inc" - .include "data/maps/Underwater3/events.inc" - .include "data/maps/Underwater4/events.inc" - .include "data/maps/Underwater5/events.inc" - .include "data/maps/Underwater6/events.inc" - .include "data/maps/Underwater7/events.inc" - .include "data/maps/LittlerootTown_BrendansHouse_1F/events.inc" - .include "data/maps/LittlerootTown_BrendansHouse_2F/events.inc" - .include "data/maps/LittlerootTown_MaysHouse_1F/events.inc" - .include "data/maps/LittlerootTown_MaysHouse_2F/events.inc" - .include "data/maps/LittlerootTown_ProfessorBirchsLab/events.inc" - .include "data/maps/OldaleTown_House1/events.inc" - .include "data/maps/OldaleTown_House2/events.inc" - .include "data/maps/OldaleTown_PokemonCenter_1F/events.inc" - .include "data/maps/OldaleTown_PokemonCenter_2F/events.inc" - .include "data/maps/OldaleTown_Mart/events.inc" - .include "data/maps/DewfordTown_House1/events.inc" - .include "data/maps/DewfordTown_PokemonCenter_1F/events.inc" - .include "data/maps/DewfordTown_PokemonCenter_2F/events.inc" - .include "data/maps/DewfordTown_Gym/events.inc" - .include "data/maps/DewfordTown_Hall/events.inc" - .include "data/maps/DewfordTown_House2/events.inc" - .include "data/maps/LavaridgeTown_HerbShop/events.inc" - .include "data/maps/LavaridgeTown_Gym_1F/events.inc" - .include "data/maps/LavaridgeTown_Gym_B1F/events.inc" - .include "data/maps/LavaridgeTown_House/events.inc" - .include "data/maps/LavaridgeTown_Mart/events.inc" - .include "data/maps/LavaridgeTown_PokemonCenter_1F/events.inc" - .include "data/maps/LavaridgeTown_PokemonCenter_2F/events.inc" - .include "data/maps/FallarborTown_Mart/events.inc" - .include "data/maps/FallarborTown_BattleTentLobby/events.inc" - .include "data/maps/FallarborTown_BattleTentCorridor/events.inc" - .include "data/maps/FallarborTown_BattleTentBattleRoom/events.inc" - .include "data/maps/FallarborTown_PokemonCenter_1F/events.inc" - .include "data/maps/FallarborTown_PokemonCenter_2F/events.inc" - .include "data/maps/FallarborTown_House1/events.inc" - .include "data/maps/FallarborTown_House2/events.inc" - .include "data/maps/VerdanturfTown_BattleTentLobby/events.inc" - .include "data/maps/VerdanturfTown_BattleTentCorridor/events.inc" - .include "data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc" - .include "data/maps/VerdanturfTown_Mart/events.inc" - .include "data/maps/VerdanturfTown_PokemonCenter_1F/events.inc" - .include "data/maps/VerdanturfTown_PokemonCenter_2F/events.inc" - .include "data/maps/VerdanturfTown_WandasHouse/events.inc" - .include "data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc" - .include "data/maps/VerdanturfTown_House/events.inc" - .include "data/maps/PacifidlogTown_PokemonCenter_1F/events.inc" - .include "data/maps/PacifidlogTown_PokemonCenter_2F/events.inc" - .include "data/maps/PacifidlogTown_House1/events.inc" - .include "data/maps/PacifidlogTown_House2/events.inc" - .include "data/maps/PacifidlogTown_House3/events.inc" - .include "data/maps/PacifidlogTown_House4/events.inc" - .include "data/maps/PacifidlogTown_House5/events.inc" - .include "data/maps/PetalburgCity_WallysHouse/events.inc" - .include "data/maps/PetalburgCity_Gym/events.inc" - .include "data/maps/PetalburgCity_House1/events.inc" - .include "data/maps/PetalburgCity_House2/events.inc" - .include "data/maps/PetalburgCity_PokemonCenter_1F/events.inc" - .include "data/maps/PetalburgCity_PokemonCenter_2F/events.inc" - .include "data/maps/PetalburgCity_Mart/events.inc" - .include "data/maps/SlateportCity_SternsShipyard_1F/events.inc" - .include "data/maps/SlateportCity_SternsShipyard_2F/events.inc" - .include "data/maps/SlateportCity_BattleTentLobby/events.inc" - .include "data/maps/SlateportCity_BattleTentCorridor/events.inc" - .include "data/maps/SlateportCity_BattleTentBattleRoom/events.inc" - .include "data/maps/SlateportCity_House1/events.inc" - .include "data/maps/SlateportCity_PokemonFanClub/events.inc" - .include "data/maps/SlateportCity_OceanicMuseum_1F/events.inc" - .include "data/maps/SlateportCity_OceanicMuseum_2F/events.inc" - .include "data/maps/SlateportCity_Harbor/events.inc" - .include "data/maps/SlateportCity_House2/events.inc" - .include "data/maps/SlateportCity_PokemonCenter_1F/events.inc" - .include "data/maps/SlateportCity_PokemonCenter_2F/events.inc" - .include "data/maps/SlateportCity_Mart/events.inc" - .include "data/maps/MauvilleCity_Gym/events.inc" - .include "data/maps/MauvilleCity_BikeShop/events.inc" - .include "data/maps/MauvilleCity_House1/events.inc" - .include "data/maps/MauvilleCity_GameCorner/events.inc" - .include "data/maps/MauvilleCity_House2/events.inc" - .include "data/maps/MauvilleCity_PokemonCenter_1F/events.inc" - .include "data/maps/MauvilleCity_PokemonCenter_2F/events.inc" - .include "data/maps/MauvilleCity_Mart/events.inc" - .include "data/maps/RustboroCity_DevonCorp_1F/events.inc" - .include "data/maps/RustboroCity_DevonCorp_2F/events.inc" - .include "data/maps/RustboroCity_DevonCorp_3F/events.inc" - .include "data/maps/RustboroCity_Gym/events.inc" - .include "data/maps/RustboroCity_PokemonSchool/events.inc" - .include "data/maps/RustboroCity_PokemonCenter_1F/events.inc" - .include "data/maps/RustboroCity_PokemonCenter_2F/events.inc" - .include "data/maps/RustboroCity_Mart/events.inc" - .include "data/maps/RustboroCity_Flat1_1F/events.inc" - .include "data/maps/RustboroCity_Flat1_2F/events.inc" - .include "data/maps/RustboroCity_House1/events.inc" - .include "data/maps/RustboroCity_CuttersHouse/events.inc" - .include "data/maps/RustboroCity_House2/events.inc" - .include "data/maps/RustboroCity_Flat2_1F/events.inc" - .include "data/maps/RustboroCity_Flat2_2F/events.inc" - .include "data/maps/RustboroCity_Flat2_3F/events.inc" - .include "data/maps/RustboroCity_House3/events.inc" - .include "data/maps/FortreeCity_House1/events.inc" - .include "data/maps/FortreeCity_Gym/events.inc" - .include "data/maps/FortreeCity_PokemonCenter_1F/events.inc" - .include "data/maps/FortreeCity_PokemonCenter_2F/events.inc" - .include "data/maps/FortreeCity_Mart/events.inc" - .include "data/maps/FortreeCity_House2/events.inc" - .include "data/maps/FortreeCity_House3/events.inc" - .include "data/maps/FortreeCity_House4/events.inc" - .include "data/maps/FortreeCity_House5/events.inc" - .include "data/maps/FortreeCity_DecorationShop/events.inc" - .include "data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc" - .include "data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc" - .include "data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc" - .include "data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc" - .include "data/maps/LilycoveCity_ContestLobby/events.inc" - .include "data/maps/LilycoveCity_ContestHall/events.inc" - .include "data/maps/LilycoveCity_PokemonCenter_1F/events.inc" - .include "data/maps/LilycoveCity_PokemonCenter_2F/events.inc" - .include "data/maps/LilycoveCity_UnusedMart/events.inc" - .include "data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc" - .include "data/maps/LilycoveCity_Harbor/events.inc" - .include "data/maps/LilycoveCity_MoveDeletersHouse/events.inc" - .include "data/maps/LilycoveCity_House1/events.inc" - .include "data/maps/LilycoveCity_House2/events.inc" - .include "data/maps/LilycoveCity_House3/events.inc" - .include "data/maps/LilycoveCity_House4/events.inc" - .include "data/maps/LilycoveCity_DepartmentStore_1F/events.inc" - .include "data/maps/LilycoveCity_DepartmentStore_2F/events.inc" - .include "data/maps/LilycoveCity_DepartmentStore_3F/events.inc" - .include "data/maps/LilycoveCity_DepartmentStore_4F/events.inc" - .include "data/maps/LilycoveCity_DepartmentStore_5F/events.inc" - .include "data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc" - .include "data/maps/LilycoveCity_DepartmentStoreElevator/events.inc" - .include "data/maps/MossdeepCity_Gym/events.inc" - .include "data/maps/MossdeepCity_House1/events.inc" - .include "data/maps/MossdeepCity_House2/events.inc" - .include "data/maps/MossdeepCity_PokemonCenter_1F/events.inc" - .include "data/maps/MossdeepCity_PokemonCenter_2F/events.inc" - .include "data/maps/MossdeepCity_Mart/events.inc" - .include "data/maps/MossdeepCity_House3/events.inc" - .include "data/maps/MossdeepCity_StevensHouse/events.inc" - .include "data/maps/MossdeepCity_House4/events.inc" - .include "data/maps/MossdeepCity_SpaceCenter_1F/events.inc" - .include "data/maps/MossdeepCity_SpaceCenter_2F/events.inc" - .include "data/maps/MossdeepCity_GameCorner_1F/events.inc" - .include "data/maps/MossdeepCity_GameCorner_B1F/events.inc" - .include "data/maps/SootopolisCity_Gym_1F/events.inc" - .include "data/maps/SootopolisCity_Gym_B1F/events.inc" - .include "data/maps/SootopolisCity_PokemonCenter_1F/events.inc" - .include "data/maps/SootopolisCity_PokemonCenter_2F/events.inc" - .include "data/maps/SootopolisCity_Mart/events.inc" - .include "data/maps/SootopolisCity_House1/events.inc" - .include "data/maps/SootopolisCity_House2/events.inc" - .include "data/maps/SootopolisCity_House3/events.inc" - .include "data/maps/SootopolisCity_House4/events.inc" - .include "data/maps/SootopolisCity_House5/events.inc" - .include "data/maps/SootopolisCity_House6/events.inc" - .include "data/maps/SootopolisCity_House7/events.inc" - .include "data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc" - .include "data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc" - .include "data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc" - .include "data/maps/EverGrandeCity_SidneysRoom/events.inc" - .include "data/maps/EverGrandeCity_PhoebesRoom/events.inc" - .include "data/maps/EverGrandeCity_GlaciasRoom/events.inc" - .include "data/maps/EverGrandeCity_DrakesRoom/events.inc" - .include "data/maps/EverGrandeCity_ChampionsRoom/events.inc" - .include "data/maps/EverGrandeCity_Hall1/events.inc" - .include "data/maps/EverGrandeCity_Hall2/events.inc" - .include "data/maps/EverGrandeCity_Hall3/events.inc" - .include "data/maps/EverGrandeCity_Hall4/events.inc" - .include "data/maps/EverGrandeCity_Hall5/events.inc" - .include "data/maps/EverGrandeCity_PokemonLeague_1F/events.inc" - .include "data/maps/EverGrandeCity_HallOfFame/events.inc" - .include "data/maps/EverGrandeCity_PokemonCenter_1F/events.inc" - .include "data/maps/EverGrandeCity_PokemonCenter_2F/events.inc" - .include "data/maps/EverGrandeCity_PokemonLeague_2F/events.inc" - .include "data/maps/Route104_MrBrineysHouse/events.inc" - .include "data/maps/Route104_PrettyPetalFlowerShop/events.inc" - .include "data/maps/Route111_WinstrateFamilysHouse/events.inc" - .include "data/maps/Route111_OldLadysRestStop/events.inc" - .include "data/maps/Route112_CableCarStation/events.inc" - .include "data/maps/MtChimney_CableCarStation/events.inc" - .include "data/maps/Route114_FossilManiacsHouse/events.inc" - .include "data/maps/Route114_FossilManiacsTunnel/events.inc" - .include "data/maps/Route114_LanettesHouse/events.inc" - .include "data/maps/Route116_TunnelersRestHouse/events.inc" - .include "data/maps/Route117_PokemonDayCare/events.inc" - .include "data/maps/Route121_SafariZoneEntrance/events.inc" - .include "data/maps/MeteorFalls_1F_1R/events.inc" - .include "data/maps/MeteorFalls_1F_2R/events.inc" - .include "data/maps/MeteorFalls_B1F_1R/events.inc" - .include "data/maps/MeteorFalls_B1F_2R/events.inc" - .include "data/maps/RusturfTunnel/events.inc" - .include "data/maps/Underwater_SootopolisCity/events.inc" - .include "data/maps/DesertRuins/events.inc" - .include "data/maps/GraniteCave_1F/events.inc" - .include "data/maps/GraniteCave_B1F/events.inc" - .include "data/maps/GraniteCave_B2F/events.inc" - .include "data/maps/GraniteCave_StevensRoom/events.inc" - .include "data/maps/PetalburgWoods/events.inc" - .include "data/maps/MtChimney/events.inc" - .include "data/maps/JaggedPass/events.inc" - .include "data/maps/FieryPath/events.inc" - .include "data/maps/MtPyre_1F/events.inc" - .include "data/maps/MtPyre_2F/events.inc" - .include "data/maps/MtPyre_3F/events.inc" - .include "data/maps/MtPyre_4F/events.inc" - .include "data/maps/MtPyre_5F/events.inc" - .include "data/maps/MtPyre_6F/events.inc" - .include "data/maps/MtPyre_Exterior/events.inc" - .include "data/maps/MtPyre_Summit/events.inc" - .include "data/maps/AquaHideout_1F/events.inc" - .include "data/maps/AquaHideout_B1F/events.inc" - .include "data/maps/AquaHideout_B2F/events.inc" - .include "data/maps/Underwater_SeafloorCavern/events.inc" - .include "data/maps/SeafloorCavern_Entrance/events.inc" - .include "data/maps/SeafloorCavern_Room1/events.inc" - .include "data/maps/SeafloorCavern_Room2/events.inc" - .include "data/maps/SeafloorCavern_Room3/events.inc" - .include "data/maps/SeafloorCavern_Room4/events.inc" - .include "data/maps/SeafloorCavern_Room5/events.inc" - .include "data/maps/SeafloorCavern_Room6/events.inc" - .include "data/maps/SeafloorCavern_Room7/events.inc" - .include "data/maps/SeafloorCavern_Room8/events.inc" - .include "data/maps/SeafloorCavern_Room9/events.inc" - .include "data/maps/CaveOfOrigin_Entrance/events.inc" - .include "data/maps/CaveOfOrigin_1F/events.inc" - .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc" - .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc" - .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc" - .include "data/maps/CaveOfOrigin_B1F/events.inc" - .include "data/maps/VictoryRoad_1F/events.inc" - .include "data/maps/VictoryRoad_B1F/events.inc" - .include "data/maps/VictoryRoad_B2F/events.inc" - .include "data/maps/ShoalCave_LowTideEntranceRoom/events.inc" - .include "data/maps/ShoalCave_LowTideInnerRoom/events.inc" - .include "data/maps/ShoalCave_LowTideStairsRoom/events.inc" - .include "data/maps/ShoalCave_LowTideLowerRoom/events.inc" - .include "data/maps/ShoalCave_HighTideEntranceRoom/events.inc" - .include "data/maps/ShoalCave_HighTideInnerRoom/events.inc" - .include "data/maps/NewMauville_Entrance/events.inc" - .include "data/maps/NewMauville_Inside/events.inc" - .include "data/maps/AbandonedShip_Deck/events.inc" - .include "data/maps/AbandonedShip_Corridors_1F/events.inc" - .include "data/maps/AbandonedShip_Rooms_1F/events.inc" - .include "data/maps/AbandonedShip_Corridors_B1F/events.inc" - .include "data/maps/AbandonedShip_Rooms_B1F/events.inc" - .include "data/maps/AbandonedShip_Rooms2_B1F/events.inc" - .include "data/maps/AbandonedShip_Underwater1/events.inc" - .include "data/maps/AbandonedShip_Room_B1F/events.inc" - .include "data/maps/AbandonedShip_Rooms2_1F/events.inc" - .include "data/maps/AbandonedShip_CaptainsOffice/events.inc" - .include "data/maps/AbandonedShip_Underwater2/events.inc" - .include "data/maps/AbandonedShip_HiddenFloorCorridors/events.inc" - .include "data/maps/AbandonedShip_HiddenFloorRooms/events.inc" - .include "data/maps/IslandCave/events.inc" - .include "data/maps/AncientTomb/events.inc" - .include "data/maps/Underwater_Route134/events.inc" - .include "data/maps/Underwater_SealedChamber/events.inc" - .include "data/maps/SealedChamber_OuterRoom/events.inc" - .include "data/maps/SealedChamber_InnerRoom/events.inc" - .include "data/maps/ScorchedSlab/events.inc" - .include "data/maps/AquaHideout_UnusedRubyMap1/events.inc" - .include "data/maps/AquaHideout_UnusedRubyMap2/events.inc" - .include "data/maps/AquaHideout_UnusedRubyMap3/events.inc" - .include "data/maps/SkyPillar_Entrance/events.inc" - .include "data/maps/SkyPillar_Outside/events.inc" - .include "data/maps/SkyPillar_1F/events.inc" - .include "data/maps/SkyPillar_2F/events.inc" - .include "data/maps/SkyPillar_3F/events.inc" - .include "data/maps/SkyPillar_4F/events.inc" - .include "data/maps/ShoalCave_LowTideIceRoom/events.inc" - .include "data/maps/SkyPillar_5F/events.inc" - .include "data/maps/SkyPillar_Top/events.inc" - .include "data/maps/MagmaHideout_1F/events.inc" - .include "data/maps/MagmaHideout_2F_1R/events.inc" - .include "data/maps/MagmaHideout_2F_2R/events.inc" - .include "data/maps/MagmaHideout_3F_1R/events.inc" - .include "data/maps/MagmaHideout_3F_2R/events.inc" - .include "data/maps/MagmaHideout_4F/events.inc" - .include "data/maps/MagmaHideout_3F_3R/events.inc" - .include "data/maps/MagmaHideout_2F_3R/events.inc" - .include "data/maps/MirageTower_1F/events.inc" - .include "data/maps/MirageTower_2F/events.inc" - .include "data/maps/MirageTower_3F/events.inc" - .include "data/maps/MirageTower_4F/events.inc" - .include "data/maps/DesertUnderpass/events.inc" - .include "data/maps/ArtisanCave_B1F/events.inc" - .include "data/maps/ArtisanCave_1F/events.inc" - .include "data/maps/Underwater_MarineCave/events.inc" - .include "data/maps/MarineCave_Entrance/events.inc" - .include "data/maps/MarineCave_End/events.inc" - .include "data/maps/TerraCave_Entrance/events.inc" - .include "data/maps/TerraCave_End/events.inc" - .include "data/maps/AlteringCave/events.inc" - .include "data/maps/MeteorFalls_StevensCave/events.inc" - .include "data/maps/SecretBase_RedCave1/events.inc" - .include "data/maps/SecretBase_BrownCave1/events.inc" - .include "data/maps/SecretBase_BlueCave1/events.inc" - .include "data/maps/SecretBase_YellowCave1/events.inc" - .include "data/maps/SecretBase_Tree1/events.inc" - .include "data/maps/SecretBase_Shrub1/events.inc" - .include "data/maps/SecretBase_RedCave2/events.inc" - .include "data/maps/SecretBase_BrownCave2/events.inc" - .include "data/maps/SecretBase_BlueCave2/events.inc" - .include "data/maps/SecretBase_YellowCave2/events.inc" - .include "data/maps/SecretBase_Tree2/events.inc" - .include "data/maps/SecretBase_Shrub2/events.inc" - .include "data/maps/SecretBase_RedCave3/events.inc" - .include "data/maps/SecretBase_BrownCave3/events.inc" - .include "data/maps/SecretBase_BlueCave3/events.inc" - .include "data/maps/SecretBase_YellowCave3/events.inc" - .include "data/maps/SecretBase_Tree3/events.inc" - .include "data/maps/SecretBase_Shrub3/events.inc" - .include "data/maps/SecretBase_RedCave4/events.inc" - .include "data/maps/SecretBase_BrownCave4/events.inc" - .include "data/maps/SecretBase_BlueCave4/events.inc" - .include "data/maps/SecretBase_YellowCave4/events.inc" - .include "data/maps/SecretBase_Tree4/events.inc" - .include "data/maps/SecretBase_Shrub4/events.inc" - .include "data/maps/SingleBattleColosseum/events.inc" - .include "data/maps/TradeCenter/events.inc" - .include "data/maps/RecordCorner/events.inc" - .include "data/maps/DoubleBattleColosseum/events.inc" - .include "data/maps/LinkContestRoom1/events.inc" - .include "data/maps/UnknownMap_25_29/events.inc" - .include "data/maps/UnknownMap_25_30/events.inc" - .include "data/maps/UnknownMap_25_31/events.inc" - .include "data/maps/UnknownMap_25_32/events.inc" - .include "data/maps/UnknownMap_25_33/events.inc" - .include "data/maps/UnknownMap_25_34/events.inc" - .include "data/maps/LinkContestRoom2/events.inc" - .include "data/maps/LinkContestRoom3/events.inc" - .include "data/maps/LinkContestRoom4/events.inc" - .include "data/maps/LinkContestRoom5/events.inc" - .include "data/maps/LinkContestRoom6/events.inc" - .include "data/maps/InsideOfTruck/events.inc" - .include "data/maps/SSTidalCorridor/events.inc" - .include "data/maps/SSTidalLowerDeck/events.inc" - .include "data/maps/SSTidalRooms/events.inc" - .include "data/maps/BattlePyramidSquare01/events.inc" - .include "data/maps/BattlePyramidSquare02/events.inc" - .include "data/maps/BattlePyramidSquare03/events.inc" - .include "data/maps/BattlePyramidSquare04/events.inc" - .include "data/maps/BattlePyramidSquare05/events.inc" - .include "data/maps/BattlePyramidSquare06/events.inc" - .include "data/maps/BattlePyramidSquare07/events.inc" - .include "data/maps/BattlePyramidSquare08/events.inc" - .include "data/maps/BattlePyramidSquare09/events.inc" - .include "data/maps/BattlePyramidSquare10/events.inc" - .include "data/maps/BattlePyramidSquare11/events.inc" - .include "data/maps/BattlePyramidSquare12/events.inc" - .include "data/maps/BattlePyramidSquare13/events.inc" - .include "data/maps/BattlePyramidSquare14/events.inc" - .include "data/maps/BattlePyramidSquare15/events.inc" - .include "data/maps/BattlePyramidSquare16/events.inc" - .include "data/maps/UnionRoom/events.inc" - .include "data/maps/SafariZone_Northwest/events.inc" - .include "data/maps/SafariZone_North/events.inc" - .include "data/maps/SafariZone_Southwest/events.inc" - .include "data/maps/SafariZone_South/events.inc" - .include "data/maps/BattleFrontier_OutsideWest/events.inc" - .include "data/maps/BattleFrontier_BattleTowerLobby/events.inc" - .include "data/maps/BattleFrontier_BattleTowerElevator/events.inc" - .include "data/maps/BattleFrontier_BattleTowerCorridor/events.inc" - .include "data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc" - .include "data/maps/SouthernIsland_Exterior/events.inc" - .include "data/maps/SouthernIsland_Interior/events.inc" - .include "data/maps/SafariZone_RestHouse/events.inc" - .include "data/maps/SafariZone_Northeast/events.inc" - .include "data/maps/SafariZone_Southeast/events.inc" - .include "data/maps/BattleFrontier_OutsideEast/events.inc" - .include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc" - .include "data/maps/BattleFrontier_BattleTowerCorridor2/events.inc" - .include "data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc" - .include "data/maps/BattleFrontier_BattleDomeLobby/events.inc" - .include "data/maps/BattleFrontier_BattleDomeCorridor/events.inc" - .include "data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc" - .include "data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc" - .include "data/maps/BattleFrontier_BattlePalaceLobby/events.inc" - .include "data/maps/BattleFrontier_BattlePalaceCorridor/events.inc" - .include "data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc" - .include "data/maps/BattleFrontier_BattlePyramidLobby/events.inc" - .include "data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc" - .include "data/maps/BattleFrontier_BattlePyramidTop/events.inc" - .include "data/maps/BattleFrontier_BattleArenaLobby/events.inc" - .include "data/maps/BattleFrontier_BattleArenaCorridor/events.inc" - .include "data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc" - .include "data/maps/BattleFrontier_BattleFactoryLobby/events.inc" - .include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc" - .include "data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc" - .include "data/maps/BattleFrontier_BattlePikeLobby/events.inc" - .include "data/maps/BattleFrontier_BattlePikeCorridor/events.inc" - .include "data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc" - .include "data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc" - .include "data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc" - .include "data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc" - .include "data/maps/BattleFrontier_RankingHall/events.inc" - .include "data/maps/BattleFrontier_Lounge1/events.inc" - .include "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc" - .include "data/maps/BattleFrontier_Lounge2/events.inc" - .include "data/maps/BattleFrontier_Lounge3/events.inc" - .include "data/maps/BattleFrontier_Lounge4/events.inc" - .include "data/maps/BattleFrontier_ScottsHouse/events.inc" - .include "data/maps/BattleFrontier_Lounge5/events.inc" - .include "data/maps/BattleFrontier_Lounge6/events.inc" - .include "data/maps/BattleFrontier_Lounge7/events.inc" - .include "data/maps/BattleFrontier_ReceptionGate/events.inc" - .include "data/maps/BattleFrontier_Lounge8/events.inc" - .include "data/maps/BattleFrontier_Lounge9/events.inc" - .include "data/maps/BattleFrontier_PokemonCenter_1F/events.inc" - .include "data/maps/BattleFrontier_PokemonCenter_2F/events.inc" - .include "data/maps/BattleFrontier_Mart/events.inc" - .include "data/maps/FarawayIsland_Entrance/events.inc" - .include "data/maps/FarawayIsland_Interior/events.inc" - .include "data/maps/BirthIsland_Exterior/events.inc" - .include "data/maps/BirthIsland_Harbor/events.inc" - .include "data/maps/TrainerHill_Entrance/events.inc" - .include "data/maps/TrainerHill_1F/events.inc" - .include "data/maps/TrainerHill_2F/events.inc" - .include "data/maps/TrainerHill_3F/events.inc" - .include "data/maps/TrainerHill_4F/events.inc" - .include "data/maps/TrainerHill_Roof/events.inc" - .include "data/maps/NavelRock_Exterior/events.inc" - .include "data/maps/NavelRock_Harbor/events.inc" - .include "data/maps/NavelRock_Entrance/events.inc" - .include "data/maps/NavelRock_B1F/events.inc" - .include "data/maps/NavelRock_Fork/events.inc" - .include "data/maps/NavelRock_Up1/events.inc" - .include "data/maps/NavelRock_Up2/events.inc" - .include "data/maps/NavelRock_Up3/events.inc" - .include "data/maps/NavelRock_Up4/events.inc" - .include "data/maps/NavelRock_Top/events.inc" - .include "data/maps/NavelRock_Down01/events.inc" - .include "data/maps/NavelRock_Down02/events.inc" - .include "data/maps/NavelRock_Down03/events.inc" - .include "data/maps/NavelRock_Down04/events.inc" - .include "data/maps/NavelRock_Down05/events.inc" - .include "data/maps/NavelRock_Down06/events.inc" - .include "data/maps/NavelRock_Down07/events.inc" - .include "data/maps/NavelRock_Down08/events.inc" - .include "data/maps/NavelRock_Down09/events.inc" - .include "data/maps/NavelRock_Down10/events.inc" - .include "data/maps/NavelRock_Down11/events.inc" - .include "data/maps/NavelRock_Bottom/events.inc" - .include "data/maps/TrainerHill_Elevator/events.inc" - .include "data/maps/Route104_Prototype/events.inc" - .include "data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc" - .include "data/maps/Route109_SeashoreHouse/events.inc" - .include "data/maps/Route110_TrickHouseEntrance/events.inc" - .include "data/maps/Route110_TrickHouseEnd/events.inc" - .include "data/maps/Route110_TrickHouseCorridor/events.inc" - .include "data/maps/Route110_TrickHousePuzzle1/events.inc" - .include "data/maps/Route110_TrickHousePuzzle2/events.inc" - .include "data/maps/Route110_TrickHousePuzzle3/events.inc" - .include "data/maps/Route110_TrickHousePuzzle4/events.inc" - .include "data/maps/Route110_TrickHousePuzzle5/events.inc" - .include "data/maps/Route110_TrickHousePuzzle6/events.inc" - .include "data/maps/Route110_TrickHousePuzzle7/events.inc" - .include "data/maps/Route110_TrickHousePuzzle8/events.inc" - .include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc" - .include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc" - .include "data/maps/Route113_GlassWorkshop/events.inc" - .include "data/maps/Route123_BerryMastersHouse/events.inc" - .include "data/maps/Route119_WeatherInstitute_1F/events.inc" - .include "data/maps/Route119_WeatherInstitute_2F/events.inc" - .include "data/maps/Route119_House/events.inc" - .include "data/maps/Route124_DivingTreasureHuntersHouse/events.inc" + .include "data/maps/events.inc" diff --git a/data/maps.s b/data/maps.s index 6e6545fbce..3334fd103a 100644 --- a/data/maps.s +++ b/data/maps.s @@ -10,8 +10,8 @@ .section .rodata - .include "data/layouts.inc" - .include "data/layouts_table.inc" + .include "data/layouts/layouts.inc" + .include "data/layouts/layouts_table.inc" .include "data/maps/headers.inc" .include "data/maps/groups.inc" .include "data/maps/connections.inc" diff --git a/data/maps/.gitignore b/data/maps/.gitignore new file mode 100755 index 0000000000..c07d4e03a6 --- /dev/null +++ b/data/maps/.gitignore @@ -0,0 +1,7 @@ +connections.in +events.inc +groups.inc +headers.inc +**/connections.inc +**/events.inc +**/header.inc diff --git a/data/maps/AbandonedShip_CaptainsOffice/events.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc deleted file mode 100644 index aff922c97e..0000000000 --- a/data/maps/AbandonedShip_CaptainsOffice/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -AbandonedShip_CaptainsOffice_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY - -AbandonedShip_CaptainsOffice_MapWarps: - warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK - warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK - -AbandonedShip_CaptainsOffice_MapEvents:: - map_events AbandonedShip_CaptainsOffice_EventObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc deleted file mode 100644 index a3fbacdc7e..0000000000 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_CaptainsOffice: - .4byte AbandonedShip_CaptainsOffice_Layout - .4byte AbandonedShip_CaptainsOffice_MapEvents - .4byte AbandonedShip_CaptainsOffice_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json new file mode 100644 index 0000000000..69a8b31cb4 --- /dev/null +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE", + "name": "AbandonedShip_CaptainsOffice", + "layout": "LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_CaptainsOffice_EventScript_2387E2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_CaptainsOffice_EventScript_29126E", + "flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY" + } + ], + "warp_events": [ + { + "x": 7, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 4 + }, + { + "x": 8, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Corridors_1F/events.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc deleted file mode 100644 index e9efcc82ab..0000000000 --- a/data/maps/AbandonedShip_Corridors_1F/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -AbandonedShip_Corridors_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0 - object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0 - -AbandonedShip_Corridors_1F_MapWarps: - warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK - warp_def 8, 11, 3, 2, MAP_ABANDONED_SHIP_DECK - warp_def 0, 11, 3, 3, MAP_ABANDONED_SHIP_DECK - warp_def 1, 11, 3, 3, MAP_ABANDONED_SHIP_DECK - warp_def 11, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS_1F - warp_def 14, 9, 3, 3, MAP_ABANDONED_SHIP_ROOMS_1F - warp_def 11, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS_1F - warp_def 14, 3, 3, 4, MAP_ABANDONED_SHIP_ROOMS_1F - warp_def 3, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_1F - warp_def 16, 2, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 5, 2, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 3, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_1F - -AbandonedShip_Corridors_1F_MapEvents:: - map_events AbandonedShip_Corridors_1F_EventObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc deleted file mode 100644 index fc296e7623..0000000000 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Corridors_1F: - .4byte AbandonedShip_Corridors_1F_Layout - .4byte AbandonedShip_Corridors_1F_MapEvents - .4byte AbandonedShip_Corridors_1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_CORRIDORS_1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json new file mode 100644 index 0000000000..d2f65aee41 --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -0,0 +1,132 @@ +{ + "id": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "name": "AbandonedShip_Corridors_1F", + "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 17, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Corridors_1F_EventScript_2379A5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "x": 5, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", + "movement_range_x": 4, + "movement_range_y": 7, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "AbandonedShip_Corridors_1F_EventScript_2379AE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 2 + }, + { + "x": 0, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 3 + }, + { + "x": 11, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F", + "dest_warp_id": 3 + }, + { + "x": 11, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F", + "dest_warp_id": 2 + }, + { + "x": 14, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F", + "dest_warp_id": 4 + }, + { + "x": 3, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_1F", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 7 + }, + { + "x": 5, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 6 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Corridors_B1F/events.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc deleted file mode 100644 index bbe3153e09..0000000000 --- a/data/maps/AbandonedShip_Corridors_B1F/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -AbandonedShip_Corridors_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0 - -AbandonedShip_Corridors_B1F_MapWarps: - warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F - warp_def 3, 4, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_B1F - warp_def 5, 7, 3, 0, MAP_ABANDONED_SHIP_ROOMS_B1F - warp_def 8, 7, 3, 1, MAP_ABANDONED_SHIP_ROOMS_B1F - warp_def 11, 7, 3, 2, MAP_ABANDONED_SHIP_ROOMS_B1F - warp_def 11, 4, 3, 0, MAP_ABANDONED_SHIP_ROOM_B1F - warp_def 0, 2, 3, 10, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F - -AbandonedShip_Corridors_B1F_MapBGEvents: - bg_event 11, 4, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_Corridors_B1F_EventScript_237DC8 - -AbandonedShip_Corridors_B1F_MapEvents:: - map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents - diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc deleted file mode 100644 index 7b03645fda..0000000000 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Corridors_B1F: - .4byte AbandonedShip_Corridors_B1F_Layout - .4byte AbandonedShip_Corridors_B1F_MapEvents - .4byte AbandonedShip_Corridors_B1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json new file mode 100644 index 0000000000..7e27751b12 --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -0,0 +1,113 @@ +{ + "id": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "name": "AbandonedShip_Corridors_B1F", + "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Corridors_B1F_EventScript_237DBF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "AbandonedShip_Corridors_B1F_EventScript_237E13", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 4, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_B1F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 4, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_B1F", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F", + "dest_warp_id": 2 + }, + { + "x": 11, + "y": 4, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOM_B1F", + "dest_warp_id": 0 + }, + { + "x": 0, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 10 + }, + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 11, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_Corridors_B1F_EventScript_237DC8" + } + ] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Deck/events.inc b/data/maps/AbandonedShip_Deck/events.inc deleted file mode 100644 index 70fa72c4f7..0000000000 --- a/data/maps/AbandonedShip_Deck/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -AbandonedShip_Deck_MapWarps: - warp_def 13, 15, 3, 0, MAP_ROUTE108 - warp_def 14, 15, 3, 0, MAP_ROUTE108 - warp_def 13, 9, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 8, 9, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 12, 5, 3, 0, MAP_ABANDONED_SHIP_CAPTAINS_OFFICE - -AbandonedShip_Deck_MapEvents:: - map_events 0x0, AbandonedShip_Deck_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc deleted file mode 100644 index 395f4404d6..0000000000 --- a/data/maps/AbandonedShip_Deck/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Deck: - .4byte AbandonedShip_Deck_Layout - .4byte AbandonedShip_Deck_MapEvents - .4byte AbandonedShip_Deck_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_DECK - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Deck/map.json b/data/maps/AbandonedShip_Deck/map.json new file mode 100644 index 0000000000..b12ff40575 --- /dev/null +++ b/data/maps/AbandonedShip_Deck/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_ABANDONED_SHIP_DECK", + "name": "AbandonedShip_Deck", + "layout": "LAYOUT_ABANDONED_SHIP_DECK", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 13, + "y": 15, + "elevation": 3, + "dest_map": "MAP_ROUTE108", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 15, + "elevation": 3, + "dest_map": "MAP_ROUTE108", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 5, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc deleted file mode 100644 index 5b0130c3ef..0000000000 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -AbandonedShip_HiddenFloorCorridors_MapWarps: - warp_def 3, 8, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 6, 8, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 9, 8, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 3, 3, 3, 6, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 6, 3, 3, 7, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - -AbandonedShip_HiddenFloorCorridors_MapBGEvents: - bg_event 3, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A19 - bg_event 6, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A50 - bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A87 - bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE - -AbandonedShip_HiddenFloorCorridors_MapEvents:: - map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents - diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc deleted file mode 100644 index cc268ca6e0..0000000000 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_HiddenFloorCorridors: - .4byte AbandonedShip_HiddenFloorCorridors_Layout - .4byte AbandonedShip_HiddenFloorCorridors_MapEvents - .4byte AbandonedShip_HiddenFloorCorridors_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json new file mode 100644 index 0000000000..1b1466fe1e --- /dev/null +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json @@ -0,0 +1,96 @@ +{ + "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "name": "AbandonedShip_HiddenFloorCorridors", + "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "dest_warp_id": 4 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "dest_warp_id": 6 + }, + { + "x": 6, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "dest_warp_id": 7 + }, + { + "x": 9, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 8, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A19" + }, + { + "type": "sign", + "x": 6, + "y": 8, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A50" + }, + { + "type": "sign", + "x": 3, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A87" + }, + { + "type": "sign", + "x": 9, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238ABE" + } + ] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc deleted file mode 100644 index 380e7f958b..0000000000 --- a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc +++ /dev/null @@ -1,32 +0,0 @@ -AbandonedShip_HiddenFloorRooms_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE - -AbandonedShip_HiddenFloorRooms_MapWarps: - warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 7, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 21, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 22, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 36, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 37, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 6, 1, 3, 3, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 21, 1, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - -AbandonedShip_HiddenFloorRooms_MapBGEvents: - bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY - bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY - bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY - bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY - bg_event 8, 5, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 11, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 10, 10, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 16, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 25, 2, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 24, 6, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - -AbandonedShip_HiddenFloorRooms_MapEvents:: - map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents - diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc deleted file mode 100644 index 24889acd1f..0000000000 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_HiddenFloorRooms: - .4byte AbandonedShip_HiddenFloorRooms_Layout - .4byte AbandonedShip_HiddenFloorRooms_MapEvents - .4byte AbandonedShip_HiddenFloorRooms_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json new file mode 100644 index 0000000000..51fc0f2603 --- /dev/null +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -0,0 +1,218 @@ +{ + "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "name": "AbandonedShip_HiddenFloorRooms", + "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 41, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_HiddenFloorRooms_EventScript_29127B", + "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 16, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_HiddenFloorRooms_EventScript_291288", + "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_HiddenFloorRooms_EventScript_2912A2", + "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_HiddenFloorRooms_EventScript_291295", + "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE" + } + ], + "warp_events": [ + { + "x": 6, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 0 + }, + { + "x": 21, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 1 + }, + { + "x": 22, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 1 + }, + { + "x": 36, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 2 + }, + { + "x": 37, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 3 + }, + { + "x": 21, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 4 + }, + { + "x": 36, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 42, + "y": 10, + "elevation": 3, + "item": "ITEM_ROOM_1_KEY", + "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY" + }, + { + "type": "hidden_item", + "x": 20, + "y": 5, + "elevation": 3, + "item": "ITEM_ROOM_2_KEY", + "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY" + }, + { + "type": "hidden_item", + "x": 1, + "y": 12, + "elevation": 3, + "item": "ITEM_ROOM_4_KEY", + "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY" + }, + { + "type": "hidden_item", + "x": 1, + "y": 2, + "elevation": 0, + "item": "ITEM_ROOM_6_KEY", + "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY" + }, + { + "type": "sign", + "x": 8, + "y": 5, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + }, + { + "type": "sign", + "x": 11, + "y": 3, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + }, + { + "type": "sign", + "x": 10, + "y": 10, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + }, + { + "type": "sign", + "x": 16, + "y": 3, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + }, + { + "type": "sign", + "x": 25, + "y": 2, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + }, + { + "type": "sign", + "x": 24, + "y": 6, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + } + ] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Room_B1F/events.inc b/data/maps/AbandonedShip_Room_B1F/events.inc deleted file mode 100644 index d0cddd45b5..0000000000 --- a/data/maps/AbandonedShip_Room_B1F/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -AbandonedShip_Room_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13 - -AbandonedShip_Room_B1F_MapWarps: - warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 5, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F - -AbandonedShip_Room_B1F_MapEvents:: - map_events AbandonedShip_Room_B1F_EventObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc deleted file mode 100644 index c6dd8ee37d..0000000000 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Room_B1F: - .4byte AbandonedShip_Room_B1F_Layout - .4byte AbandonedShip_Room_B1F_MapEvents - .4byte AbandonedShip_Room_B1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_ROOM_B1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json new file mode 100644 index 0000000000..f762b08f9c --- /dev/null +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_ABANDONED_SHIP_ROOM_B1F", + "name": "AbandonedShip_Room_B1F", + "layout": "LAYOUT_ABANDONED_SHIP_ROOM_B1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Room_B1F_EventScript_291254", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms2_1F/events.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc deleted file mode 100644 index 71b0416e37..0000000000 --- a/data/maps/AbandonedShip_Rooms2_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms2_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0 - object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0 - -AbandonedShip_Rooms2_1F_MapWarps: - warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 5, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 4, 1, 3, 11, MAP_ABANDONED_SHIP_CORRIDORS_1F - -AbandonedShip_Rooms2_1F_MapEvents:: - map_events AbandonedShip_Rooms2_1F_EventObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc deleted file mode 100644 index e9a55f93e2..0000000000 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms2_1F: - .4byte AbandonedShip_Rooms2_1F_Layout - .4byte AbandonedShip_Rooms2_1F_MapEvents - .4byte AbandonedShip_Rooms2_1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_ROOMS2_1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json new file mode 100644 index 0000000000..84ccb93dcf --- /dev/null +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_ABANDONED_SHIP_ROOMS2_1F", + "name": "AbandonedShip_Rooms2_1F", + "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 7, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "AbandonedShip_Rooms2_1F_EventScript_2380A7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 6, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "AbandonedShip_Rooms2_1F_EventScript_23810B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms2_1F_EventScript_291261", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "AbandonedShip_Rooms2_1F_EventScript_238186", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "AbandonedShip_Rooms2_1F_EventScript_23816F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 8 + }, + { + "x": 5, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 8 + }, + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 11 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms2_B1F/events.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc deleted file mode 100644 index 3c47ae3bb0..0000000000 --- a/data/maps/AbandonedShip_Rooms2_B1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -AbandonedShip_Rooms2_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL - -AbandonedShip_Rooms2_B1F_MapWarps: - warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 5, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 13, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 14, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F - -AbandonedShip_Rooms2_B1F_MapEvents:: - map_events AbandonedShip_Rooms2_B1F_EventObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc deleted file mode 100644 index 4afe519374..0000000000 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms2_B1F: - .4byte AbandonedShip_Rooms2_B1F_Layout - .4byte AbandonedShip_Rooms2_B1F_MapEvents - .4byte AbandonedShip_Rooms2_B1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_ROOMS2_B1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json new file mode 100644 index 0000000000..2e8256331a --- /dev/null +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -0,0 +1,76 @@ +{ + "id": "MAP_ABANDONED_SHIP_ROOMS2_B1F", + "name": "AbandonedShip_Rooms2_B1F", + "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_B1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms2_B1F_EventScript_238025", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 13, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms2_B1F_EventScript_291247", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 1 + }, + { + "x": 13, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms_1F/events.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc deleted file mode 100644 index b63f2bd72f..0000000000 --- a/data/maps/AbandonedShip_Rooms_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -AbandonedShip_Rooms_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0 - -AbandonedShip_Rooms_1F_MapWarps: - warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 5, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 4, 1, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 13, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 13, 1, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 14, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F - -AbandonedShip_Rooms_1F_MapEvents:: - map_events AbandonedShip_Rooms_1F_EventObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc deleted file mode 100644 index 60607565c3..0000000000 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms_1F: - .4byte AbandonedShip_Rooms_1F_Layout - .4byte AbandonedShip_Rooms_1F_MapEvents - .4byte AbandonedShip_Rooms_1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_ROOMS_1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json new file mode 100644 index 0000000000..789b4edb51 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -0,0 +1,116 @@ +{ + "id": "MAP_ABANDONED_SHIP_ROOMS_1F", + "name": "AbandonedShip_Rooms_1F", + "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms_1F_EventScript_237A93", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms_1F_EventScript_29122D", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 10, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "AbandonedShip_Rooms_1F_EventScript_237AB3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "AbandonedShip_Rooms_1F_EventScript_237A9C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 6 + }, + { + "x": 13, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 5 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 7 + }, + { + "x": 14, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms_B1F/events.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc deleted file mode 100644 index eda95460bd..0000000000 --- a/data/maps/AbandonedShip_Rooms_B1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -AbandonedShip_Rooms_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE - -AbandonedShip_Rooms_B1F_MapWarps: - warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 13, 1, 3, 3, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 22, 1, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_B1F - -AbandonedShip_Rooms_B1F_MapEvents:: - map_events AbandonedShip_Rooms_B1F_EventObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc deleted file mode 100644 index 582123b345..0000000000 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms_B1F: - .4byte AbandonedShip_Rooms_B1F_Layout - .4byte AbandonedShip_Rooms_B1F_MapEvents - .4byte AbandonedShip_Rooms_B1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_ROOMS_B1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json new file mode 100644 index 0000000000..224b25165b --- /dev/null +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_ABANDONED_SHIP_ROOMS_B1F", + "name": "AbandonedShip_Rooms_B1F", + "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_B1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 25, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms_B1F_EventScript_237FC6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms_B1F_EventScript_29123A", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE" + } + ], + "warp_events": [ + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 3 + }, + { + "x": 22, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Underwater1/events.inc b/data/maps/AbandonedShip_Underwater1/events.inc deleted file mode 100644 index c6c4e226fa..0000000000 --- a/data/maps/AbandonedShip_Underwater1/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -AbandonedShip_Underwater1_MapWarps: - warp_def 3, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 - warp_def 4, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 - -AbandonedShip_Underwater1_MapEvents:: - map_events 0x0, AbandonedShip_Underwater1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc deleted file mode 100644 index d77b43cac4..0000000000 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Underwater1: - .4byte AbandonedShip_Underwater1_Layout - .4byte AbandonedShip_Underwater1_MapEvents - .4byte AbandonedShip_Underwater1_MapScripts - .4byte 0x0 - .2byte MUS_DEEPDEEP - .2byte LAYOUT_ABANDONED_SHIP_UNDERWATER1 - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Underwater1/map.json b/data/maps/AbandonedShip_Underwater1/map.json new file mode 100644 index 0000000000..de9c778159 --- /dev/null +++ b/data/maps/AbandonedShip_Underwater1/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_ABANDONED_SHIP_UNDERWATER1", + "name": "AbandonedShip_Underwater1", + "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER1", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_UNDERWATER2", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_UNDERWATER2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Underwater2/events.inc b/data/maps/AbandonedShip_Underwater2/events.inc deleted file mode 100644 index f4fadb1bae..0000000000 --- a/data/maps/AbandonedShip_Underwater2/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -AbandonedShip_Underwater2_MapWarps: - warp_def 3, 1, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER1 - -AbandonedShip_Underwater2_MapEvents:: - map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc deleted file mode 100644 index eb08a5f709..0000000000 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Underwater2: - .4byte AbandonedShip_Underwater2_Layout - .4byte AbandonedShip_Underwater2_MapEvents - .4byte AbandonedShip_Underwater2_MapScripts - .4byte 0x0 - .2byte MUS_DEEPDEEP - .2byte LAYOUT_ABANDONED_SHIP_UNDERWATER2 - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Underwater2/map.json b/data/maps/AbandonedShip_Underwater2/map.json new file mode 100644 index 0000000000..c1c9f24d36 --- /dev/null +++ b/data/maps/AbandonedShip_Underwater2/map.json @@ -0,0 +1,28 @@ +{ + "id": "MAP_ABANDONED_SHIP_UNDERWATER2", + "name": "AbandonedShip_Underwater2", + "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER2", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_UNDERWATER1", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AlteringCave/events.inc b/data/maps/AlteringCave/events.inc deleted file mode 100644 index 0963e38015..0000000000 --- a/data/maps/AlteringCave/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -AlteringCave_MapWarps: - warp_def 18, 22, 0, 0, MAP_ROUTE103 - -AlteringCave_MapEvents:: - map_events 0x0, AlteringCave_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc deleted file mode 100644 index 551d704248..0000000000 --- a/data/maps/AlteringCave/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AlteringCave: - .4byte AlteringCave_Layout - .4byte AlteringCave_MapEvents - .4byte AlteringCave_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_ALTERING_CAVE - .byte MAPSEC_ALTERING_CAVE_2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AlteringCave/map.json b/data/maps/AlteringCave/map.json new file mode 100644 index 0000000000..848eb95c19 --- /dev/null +++ b/data/maps/AlteringCave/map.json @@ -0,0 +1,28 @@ +{ + "id": "MAP_ALTERING_CAVE", + "name": "AlteringCave", + "layout": "LAYOUT_ALTERING_CAVE", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_ALTERING_CAVE_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 18, + "y": 22, + "elevation": 0, + "dest_map": "MAP_ROUTE103", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc deleted file mode 100644 index 06dedb33ed..0000000000 --- a/data/maps/AncientTomb/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -AncientTomb_EventObjects: - object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, FLAG_HIDE_REGISTEEL - -AncientTomb_MapWarps: - warp_def 8, 29, 3, 0, MAP_ROUTE120 - warp_def 8, 20, 0, 2, MAP_ANCIENT_TOMB - warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB - -AncientTomb_MapBGEvents: - bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239033 - bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050 - bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050 - -AncientTomb_MapEvents:: - map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents - diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc deleted file mode 100644 index f1c3b4111d..0000000000 --- a/data/maps/AncientTomb/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AncientTomb: - .4byte AncientTomb_Layout - .4byte AncientTomb_MapEvents - .4byte AncientTomb_MapScripts - .4byte 0x0 - .2byte MUS_MABOROSI - .2byte LAYOUT_ANCIENT_TOMB - .byte MAPSEC_ANCIENT_TOMB - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json new file mode 100644 index 0000000000..327e7eded5 --- /dev/null +++ b/data/maps/AncientTomb/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_ANCIENT_TOMB", + "name": "AncientTomb", + "layout": "LAYOUT_ANCIENT_TOMB", + "music": "MUS_MABOROSI", + "region_map_section": "MAPSEC_ANCIENT_TOMB", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_REGISTEEL", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AncientTomb_EventScript_23905A", + "flag": "FLAG_HIDE_REGISTEEL" + } + ], + "warp_events": [ + { + "x": 8, + "y": 29, + "elevation": 3, + "dest_map": "MAP_ROUTE120", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 20, + "elevation": 0, + "dest_map": "MAP_ANCIENT_TOMB", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ANCIENT_TOMB", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AncientTomb_EventScript_239033" + }, + { + "type": "sign", + "x": 7, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AncientTomb_EventScript_239050" + }, + { + "type": "sign", + "x": 9, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AncientTomb_EventScript_239050" + } + ] +} \ No newline at end of file diff --git a/data/maps/AquaHideout_1F/events.inc b/data/maps/AquaHideout_1F/events.inc deleted file mode 100644 index 663ae0ada0..0000000000 --- a/data/maps/AquaHideout_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -AquaHideout_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - -AquaHideout_1F_MapWarps: - warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY - warp_def 14, 27, 1, 6, MAP_LILYCOVE_CITY - warp_def 22, 1, 3, 0, MAP_AQUA_HIDEOUT_B1F - -AquaHideout_1F_MapEvents:: - map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc deleted file mode 100644 index 30e045f797..0000000000 --- a/data/maps/AquaHideout_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_1F: - .4byte AquaHideout_1F_Layout - .4byte AquaHideout_1F_MapEvents - .4byte AquaHideout_1F_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_AQUA_HIDEOUT_1F - .byte MAPSEC_AQUA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_AQUA - diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json new file mode 100644 index 0000000000..278bc5894d --- /dev/null +++ b/data/maps/AquaHideout_1F/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_AQUA_HIDEOUT_1F", + "name": "AquaHideout_1F", + "layout": "LAYOUT_AQUA_HIDEOUT_1F", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_AQUA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_AQUA", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 13, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_1F_EventScript_233494", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 14, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_1F_EventScript_2334C6", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 20, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", + "movement_range_x": 13, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "AquaHideout_1F_EventScript_2334F8", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + } + ], + "warp_events": [ + { + "x": 13, + "y": 27, + "elevation": 1, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 6 + }, + { + "x": 14, + "y": 27, + "elevation": 1, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 6 + }, + { + "x": 22, + "y": 1, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AquaHideout_B1F/events.inc b/data/maps/AquaHideout_B1F/events.inc deleted file mode 100644 index edc3df4c64..0000000000 --- a/data/maps/AquaHideout_B1F/events.inc +++ /dev/null @@ -1,41 +0,0 @@ -AquaHideout_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2 - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - -AquaHideout_B1F_MapWarps: - warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F - warp_def 18, 1, 3, 0, MAP_AQUA_HIDEOUT_B2F - warp_def 12, 1, 3, 1, MAP_AQUA_HIDEOUT_B2F - warp_def 3, 3, 3, 2, MAP_AQUA_HIDEOUT_B2F - warp_def 31, 4, 3, 7, MAP_AQUA_HIDEOUT_B1F - warp_def 27, 4, 3, 8, MAP_AQUA_HIDEOUT_B1F - warp_def 20, 4, 3, 10, MAP_AQUA_HIDEOUT_B1F - warp_def 27, 12, 3, 4, MAP_AQUA_HIDEOUT_B1F - warp_def 3, 15, 3, 5, MAP_AQUA_HIDEOUT_B1F - warp_def 3, 20, 3, 12, MAP_AQUA_HIDEOUT_B1F - warp_def 32, 19, 3, 6, MAP_AQUA_HIDEOUT_B1F - warp_def 23, 10, 3, 22, MAP_AQUA_HIDEOUT_B1F - warp_def 45, 3, 3, 9, MAP_AQUA_HIDEOUT_B1F - warp_def 42, 5, 3, 18, MAP_AQUA_HIDEOUT_B1F - warp_def 45, 5, 3, 12, MAP_AQUA_HIDEOUT_B1F - warp_def 48, 5, 3, 16, MAP_AQUA_HIDEOUT_B1F - warp_def 42, 9, 3, 15, MAP_AQUA_HIDEOUT_B1F - warp_def 45, 9, 3, 20, MAP_AQUA_HIDEOUT_B1F - warp_def 48, 9, 3, 13, MAP_AQUA_HIDEOUT_B1F - warp_def 42, 13, 3, 24, MAP_AQUA_HIDEOUT_B1F - warp_def 45, 13, 3, 17, MAP_AQUA_HIDEOUT_B1F - warp_def 48, 13, 3, 12, MAP_AQUA_HIDEOUT_B1F - warp_def 42, 17, 3, 11, MAP_AQUA_HIDEOUT_B1F - warp_def 45, 17, 3, 17, MAP_AQUA_HIDEOUT_B1F - warp_def 48, 17, 3, 19, MAP_AQUA_HIDEOUT_B1F - -AquaHideout_B1F_MapEvents:: - map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc deleted file mode 100644 index dfe453ddd4..0000000000 --- a/data/maps/AquaHideout_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_B1F: - .4byte AquaHideout_B1F_Layout - .4byte AquaHideout_B1F_MapEvents - .4byte AquaHideout_B1F_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_AQUA_HIDEOUT_B1F - .byte MAPSEC_AQUA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_AQUA - diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json new file mode 100644 index 0000000000..80c4af8efd --- /dev/null +++ b/data/maps/AquaHideout_B1F/map.json @@ -0,0 +1,314 @@ +{ + "id": "MAP_AQUA_HIDEOUT_B1F", + "name": "AquaHideout_B1F", + "layout": "LAYOUT_AQUA_HIDEOUT_B1F", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_AQUA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_AQUA", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 28, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "AquaHideout_B1F_EventScript_233A85", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "AquaHideout_B1F_EventScript_233AB0", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 29, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B1F_EventScript_291372", + "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 20, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 4, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "AquaHideout_B1F_EventScript_233AD5", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 15, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B1F_EventScript_291358", + "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 16, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B1F_EventScript_2339EB", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 15, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B1F_EventScript_291365", + "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 16, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B1F_EventScript_233A38", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 28, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "AquaHideout_B1F_EventScript_233AEC", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + } + ], + "warp_events": [ + { + "x": 29, + "y": 1, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_1F", + "dest_warp_id": 2 + }, + { + "x": 18, + "y": 1, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 1, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 2 + }, + { + "x": 31, + "y": 4, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 7 + }, + { + "x": 27, + "y": 4, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 8 + }, + { + "x": 20, + "y": 4, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 10 + }, + { + "x": 27, + "y": 12, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 4 + }, + { + "x": 3, + "y": 15, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 5 + }, + { + "x": 3, + "y": 20, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 12 + }, + { + "x": 32, + "y": 19, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 6 + }, + { + "x": 23, + "y": 10, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 22 + }, + { + "x": 45, + "y": 3, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 9 + }, + { + "x": 42, + "y": 5, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 18 + }, + { + "x": 45, + "y": 5, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 12 + }, + { + "x": 48, + "y": 5, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 16 + }, + { + "x": 42, + "y": 9, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 15 + }, + { + "x": 45, + "y": 9, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 20 + }, + { + "x": 48, + "y": 9, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 13 + }, + { + "x": 42, + "y": 13, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 24 + }, + { + "x": 45, + "y": 13, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 17 + }, + { + "x": 48, + "y": 13, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 12 + }, + { + "x": 42, + "y": 17, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 11 + }, + { + "x": 45, + "y": 17, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 17 + }, + { + "x": 48, + "y": 17, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 19 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc deleted file mode 100644 index f24115c324..0000000000 --- a/data/maps/AquaHideout_B2F/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -AquaHideout_B2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL - object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - -AquaHideout_B2F_MapWarps: - warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F - warp_def 12, 1, 3, 2, MAP_AQUA_HIDEOUT_B1F - warp_def 3, 3, 3, 3, MAP_AQUA_HIDEOUT_B1F - warp_def 31, 8, 3, 5, MAP_AQUA_HIDEOUT_B2F - warp_def 8, 8, 3, 8, MAP_AQUA_HIDEOUT_B2F - warp_def 5, 8, 3, 3, MAP_AQUA_HIDEOUT_B2F - warp_def 18, 13, 3, 7, MAP_AQUA_HIDEOUT_B2F - warp_def 12, 13, 3, 6, MAP_AQUA_HIDEOUT_B2F - warp_def 31, 17, 3, 4, MAP_AQUA_HIDEOUT_B2F - warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F - -AquaHideout_B2F_MapCoordEvents: - coord_event 28, 17, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5 - coord_event 28, 16, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5 - -AquaHideout_B2F_MapEvents:: - map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 - diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc deleted file mode 100644 index 3d87c7ad3a..0000000000 --- a/data/maps/AquaHideout_B2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_B2F: - .4byte AquaHideout_B2F_Layout - .4byte AquaHideout_B2F_MapEvents - .4byte AquaHideout_B2F_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_AQUA_HIDEOUT_B2F - .byte MAPSEC_AQUA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_AQUA - diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json new file mode 100644 index 0000000000..56bbaab304 --- /dev/null +++ b/data/maps/AquaHideout_B2F/map.json @@ -0,0 +1,189 @@ +{ + "id": "MAP_AQUA_HIDEOUT_B2F", + "name": "AquaHideout_B2F", + "layout": "LAYOUT_AQUA_HIDEOUT_B2F", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_AQUA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_AQUA", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 23, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B2F_EventScript_233E09", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 23, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", + "movement_range_x": 4, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "AquaHideout_B2F_EventScript_233E8A", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B2F_EventScript_29137F", + "flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", + "x": 19, + "y": 20, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "AquaHideout_B2F_EventScript_233EAF", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 13, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "AquaHideout_B2F_EventScript_233EC6", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + } + ], + "warp_events": [ + { + "x": 18, + "y": 1, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 1, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 3 + }, + { + "x": 31, + "y": 8, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 5 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 8 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 3 + }, + { + "x": 18, + "y": 13, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 7 + }, + { + "x": 12, + "y": 13, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 6 + }, + { + "x": 31, + "y": 17, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 4 + }, + { + "x": 32, + "y": 20, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 4 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 28, + "y": 17, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "AquaHideout_B2F_EventScript_233DE5" + }, + { + "type": "trigger", + "x": 28, + "y": 16, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "AquaHideout_B2F_EventScript_233DE5" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AquaHideout_UnusedRubyMap1/events.inc b/data/maps/AquaHideout_UnusedRubyMap1/events.inc deleted file mode 100644 index f8107f4795..0000000000 --- a/data/maps/AquaHideout_UnusedRubyMap1/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -AquaHideout_UnusedRubyMap1_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc deleted file mode 100644 index 30946c6f8d..0000000000 --- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_UnusedRubyMap1: - .4byte AquaHideout_UnusedRubyMap1_Layout - .4byte AquaHideout_UnusedRubyMap1_MapEvents - .4byte AquaHideout_UnusedRubyMap1_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 - .byte MAPSEC_AQUA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_MAGMA - diff --git a/data/maps/AquaHideout_UnusedRubyMap1/map.json b/data/maps/AquaHideout_UnusedRubyMap1/map.json new file mode 100644 index 0000000000..22b6454134 --- /dev/null +++ b/data/maps/AquaHideout_UnusedRubyMap1/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP1", + "name": "AquaHideout_UnusedRubyMap1", + "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_AQUA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_MAGMA", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AquaHideout_UnusedRubyMap2/events.inc b/data/maps/AquaHideout_UnusedRubyMap2/events.inc deleted file mode 100644 index 569e13cb09..0000000000 --- a/data/maps/AquaHideout_UnusedRubyMap2/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -AquaHideout_UnusedRubyMap2_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc deleted file mode 100644 index cd08fcc5e8..0000000000 --- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_UnusedRubyMap2: - .4byte AquaHideout_UnusedRubyMap2_Layout - .4byte AquaHideout_UnusedRubyMap2_MapEvents - .4byte AquaHideout_UnusedRubyMap2_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 - .byte MAPSEC_AQUA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_MAGMA - diff --git a/data/maps/AquaHideout_UnusedRubyMap2/map.json b/data/maps/AquaHideout_UnusedRubyMap2/map.json new file mode 100644 index 0000000000..5bee651589 --- /dev/null +++ b/data/maps/AquaHideout_UnusedRubyMap2/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP2", + "name": "AquaHideout_UnusedRubyMap2", + "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_AQUA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_MAGMA", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AquaHideout_UnusedRubyMap3/events.inc b/data/maps/AquaHideout_UnusedRubyMap3/events.inc deleted file mode 100644 index 7618c0d58e..0000000000 --- a/data/maps/AquaHideout_UnusedRubyMap3/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -AquaHideout_UnusedRubyMap3_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc deleted file mode 100644 index 993f10aff9..0000000000 --- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_UnusedRubyMap3: - .4byte AquaHideout_UnusedRubyMap3_Layout - .4byte AquaHideout_UnusedRubyMap3_MapEvents - .4byte AquaHideout_UnusedRubyMap3_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 - .byte MAPSEC_AQUA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_MAGMA - diff --git a/data/maps/AquaHideout_UnusedRubyMap3/map.json b/data/maps/AquaHideout_UnusedRubyMap3/map.json new file mode 100644 index 0000000000..03cafd7dc0 --- /dev/null +++ b/data/maps/AquaHideout_UnusedRubyMap3/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP3", + "name": "AquaHideout_UnusedRubyMap3", + "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_AQUA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_MAGMA", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ArtisanCave_1F/events.inc b/data/maps/ArtisanCave_1F/events.inc deleted file mode 100644 index f53e074b90..0000000000 --- a/data/maps/ArtisanCave_1F/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -ArtisanCave_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS - -ArtisanCave_1F_MapWarps: - warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 5, 0, 1, MAP_ARTISAN_CAVE_B1F - -ArtisanCave_1F_MapEvents:: - map_events ArtisanCave_1F_EventObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc deleted file mode 100644 index 670aa6845c..0000000000 --- a/data/maps/ArtisanCave_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ArtisanCave_1F: - .4byte ArtisanCave_1F_Layout - .4byte ArtisanCave_1F_MapEvents - .4byte ArtisanCave_1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_ARTISAN_CAVE_1F - .byte MAPSEC_ARTISAN_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ArtisanCave_1F/map.json b/data/maps/ArtisanCave_1F/map.json new file mode 100644 index 0000000000..a0792d7335 --- /dev/null +++ b/data/maps/ArtisanCave_1F/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_ARTISAN_CAVE_1F", + "name": "ArtisanCave_1F", + "layout": "LAYOUT_ARTISAN_CAVE_1F", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_ARTISAN_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ArtisanCave_1F_EventScript_2914D1", + "flag": "FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS" + } + ], + "warp_events": [ + { + "x": 10, + "y": 17, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 13 + }, + { + "x": 6, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ARTISAN_CAVE_B1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ArtisanCave_B1F/events.inc b/data/maps/ArtisanCave_B1F/events.inc deleted file mode 100644 index 7572aaa2ad..0000000000 --- a/data/maps/ArtisanCave_B1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -ArtisanCave_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP - -ArtisanCave_B1F_MapWarps: - warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F - -ArtisanCave_B1F_MapBGEvents: - bg_hidden_item_event 32, 29, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC - bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM - bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN - bg_hidden_item_event 19, 43, 0, ITEM_IRON, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON - -ArtisanCave_B1F_MapEvents:: - map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents - diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc deleted file mode 100644 index fd1adb32fc..0000000000 --- a/data/maps/ArtisanCave_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ArtisanCave_B1F: - .4byte ArtisanCave_B1F_Layout - .4byte ArtisanCave_B1F_MapEvents - .4byte ArtisanCave_B1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_ARTISAN_CAVE_B1F - .byte MAPSEC_ARTISAN_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ArtisanCave_B1F/map.json b/data/maps/ArtisanCave_B1F/map.json new file mode 100644 index 0000000000..d47609dc88 --- /dev/null +++ b/data/maps/ArtisanCave_B1F/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_ARTISAN_CAVE_B1F", + "name": "ArtisanCave_B1F", + "layout": "LAYOUT_ARTISAN_CAVE_B1F", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_ARTISAN_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 32, + "y": 38, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ArtisanCave_B1F_EventScript_2914C4", + "flag": "FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP" + } + ], + "warp_events": [ + { + "x": 8, + "y": 48, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 10 + }, + { + "x": 38, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ARTISAN_CAVE_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 32, + "y": 29, + "elevation": 0, + "item": "ITEM_ZINC", + "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC" + }, + { + "type": "hidden_item", + "x": 27, + "y": 8, + "elevation": 0, + "item": "ITEM_CALCIUM", + "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM" + }, + { + "type": "hidden_item", + "x": 7, + "y": 5, + "elevation": 0, + "item": "ITEM_PROTEIN", + "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN" + }, + { + "type": "hidden_item", + "x": 19, + "y": 43, + "elevation": 0, + "item": "ITEM_IRON", + "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc deleted file mode 100644 index 4d8b6ea2fc..0000000000 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -BattleFrontier_BattleArenaBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_VAR_0, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleArenaBattleRoom_MapEvents:: - map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc deleted file mode 100644 index 1c4cf3eb07..0000000000 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleArenaBattleRoom: - .4byte BattleFrontier_BattleArenaBattleRoom_Layout - .4byte BattleFrontier_BattleArenaBattleRoom_MapEvents - .4byte BattleFrontier_BattleArenaBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_ARENA - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json new file mode 100644 index 0000000000..5b1a51ad52 --- /dev/null +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json @@ -0,0 +1,138 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM", + "name": "BattleFrontier_BattleArenaBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM", + "music": "MUS_B_ARENA", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 5, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 10, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 15, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc deleted file mode 100644 index 5be3b04e6c..0000000000 --- a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattleArenaCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleArenaCorridor_MapEvents:: - map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc deleted file mode 100644 index 17341a3e86..0000000000 --- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleArenaCorridor: - .4byte BattleFrontier_BattleArenaCorridor_Layout - .4byte BattleFrontier_BattleArenaCorridor_MapEvents - .4byte BattleFrontier_BattleArenaCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_ARENA - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/map.json b/data/maps/BattleFrontier_BattleArenaCorridor/map.json new file mode 100644 index 0000000000..2cacf66215 --- /dev/null +++ b/data/maps/BattleFrontier_BattleArenaCorridor/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR", + "name": "BattleFrontier_BattleArenaCorridor", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR", + "music": "MUS_B_ARENA", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 9, + "y": 12, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleArenaLobby/events.inc b/data/maps/BattleFrontier_BattleArenaLobby/events.inc deleted file mode 100644 index a63202848b..0000000000 --- a/data/maps/BattleFrontier_BattleArenaLobby/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -BattleFrontier_BattleArenaLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0 - object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0 - -BattleFrontier_BattleArenaLobby_MapWarps: - warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_BattleArenaLobby_MapBGEvents: - bg_event 5, 9, 3, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleArenaLobby_EventScript_256092 - bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleArenaLobby_EventScript_2560CA - -BattleFrontier_BattleArenaLobby_MapEvents:: - map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc deleted file mode 100644 index db8f456ff3..0000000000 --- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleArenaLobby: - .4byte BattleFrontier_BattleArenaLobby_Layout - .4byte BattleFrontier_BattleArenaLobby_MapEvents - .4byte BattleFrontier_BattleArenaLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_ARENA - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleArenaLobby/map.json b/data/maps/BattleFrontier_BattleArenaLobby/map.json new file mode 100644 index 0000000000..fc8e5bd373 --- /dev/null +++ b/data/maps/BattleFrontier_BattleArenaLobby/map.json @@ -0,0 +1,111 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY", + "name": "BattleFrontier_BattleArenaLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY", + "music": "MUS_B_ARENA", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 7, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleArenaLobby_EventScript_255DF4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 2, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleArenaLobby_EventScript_2560C1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 14, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleArenaLobby_EventScript_2560AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 14, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleArenaLobby_EventScript_2560B8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 14, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleArenaLobby_EventScript_2560A6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 12, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 9, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleArenaLobby_EventScript_256092" + }, + { + "type": "sign", + "x": 1, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleArenaLobby_EventScript_2560CA" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc deleted file mode 100644 index ce8f66f6bf..0000000000 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -BattleFrontier_BattleDomeBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_TWIN, 0, 7, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 11, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 16, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 16, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 8, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 4, 9, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 14, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_VAR_0, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleDomeBattleRoom_MapEvents:: - map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc deleted file mode 100644 index 593adeb6f3..0000000000 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomeBattleRoom: - .4byte BattleFrontier_BattleDomeBattleRoom_Layout - .4byte BattleFrontier_BattleDomeBattleRoom_MapEvents - .4byte BattleFrontier_BattleDomeBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_DOME - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json new file mode 100644 index 0000000000..e897866d4f --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json @@ -0,0 +1,216 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM", + "name": "BattleFrontier_BattleDomeBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM", + "music": "MUS_B_DOME", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "x": 5, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 7, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 9, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 11, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 16, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 4, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 16, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 8, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 0, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 12, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 13, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 4, + "y": 9, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 14, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 11, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc deleted file mode 100644 index 3d3f5be4bd..0000000000 --- a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BattleFrontier_BattleDomeCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 23, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleDomeCorridor_MapWarps: - warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_BattleDomeCorridor_MapEvents:: - map_events BattleFrontier_BattleDomeCorridor_EventObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc deleted file mode 100644 index 3ce5b2b5e0..0000000000 --- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomeCorridor: - .4byte BattleFrontier_BattleDomeCorridor_Layout - .4byte BattleFrontier_BattleDomeCorridor_MapEvents - .4byte BattleFrontier_BattleDomeCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_DOME1 - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/map.json b/data/maps/BattleFrontier_BattleDomeCorridor/map.json new file mode 100644 index 0000000000..3f7dc3bdae --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomeCorridor/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR", + "name": "BattleFrontier_BattleDomeCorridor", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR", + "music": "MUS_B_DOME1", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 23, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleDomeLobby/events.inc b/data/maps/BattleFrontier_BattleDomeLobby/events.inc deleted file mode 100644 index abf8671326..0000000000 --- a/data/maps/BattleFrontier_BattleDomeLobby/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -BattleFrontier_BattleDomeLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 1, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 18, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0 - object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0 - -BattleFrontier_BattleDomeLobby_MapWarps: - warp_def 11, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 12, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_BattleDomeLobby_MapBGEvents: - bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D52 - bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D84 - bg_event 18, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D6B - bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249E34 - -BattleFrontier_BattleDomeLobby_MapEvents:: - map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc deleted file mode 100644 index cf0c576191..0000000000 --- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomeLobby: - .4byte BattleFrontier_BattleDomeLobby_Layout - .4byte BattleFrontier_BattleDomeLobby_MapEvents - .4byte BattleFrontier_BattleDomeLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_DOME1 - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleDomeLobby/map.json b/data/maps/BattleFrontier_BattleDomeLobby/map.json new file mode 100644 index 0000000000..c94d1e1c7b --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomeLobby/map.json @@ -0,0 +1,147 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY", + "name": "BattleFrontier_BattleDomeLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY", + "music": "MUS_B_DOME1", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 5, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleDomeLobby_EventScript_249A35", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 1, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleDomeLobby_EventScript_249E10", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 14, + "y": 14, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleDomeLobby_EventScript_249DFE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 18, + "y": 14, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleDomeLobby_EventScript_249E07", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 8, + "y": 14, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleDomeLobby_EventScript_249DED", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 17, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleDomeLobby_EventScript_249A47", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 11, + "y": 16, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 16, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleDomeLobby_EventScript_249D52" + }, + { + "type": "sign", + "x": 7, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleDomeLobby_EventScript_249D84" + }, + { + "type": "sign", + "x": 18, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleDomeLobby_EventScript_249D6B" + }, + { + "type": "sign", + "x": 15, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleDomeLobby_EventScript_249E34" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc deleted file mode 100644 index 0714b7b68d..0000000000 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BattleFrontier_BattleDomePreBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleDomePreBattleRoom_MapWarps: - warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_BattleDomePreBattleRoom_MapEvents:: - map_events BattleFrontier_BattleDomePreBattleRoom_EventObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc deleted file mode 100644 index 84637906d8..0000000000 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomePreBattleRoom: - .4byte BattleFrontier_BattleDomePreBattleRoom_Layout - .4byte BattleFrontier_BattleDomePreBattleRoom_MapEvents - .4byte BattleFrontier_BattleDomePreBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_DOME - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json new file mode 100644 index 0000000000..0e96decdfd --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM", + "name": "BattleFrontier_BattleDomePreBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM", + "music": "MUS_B_DOME", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc deleted file mode 100644 index 5f3a6a218e..0000000000 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -BattleFrontier_BattleFactoryBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_VAR_F, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleFactoryBattleRoom_MapEvents:: - map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc deleted file mode 100644 index cb20b3f1ee..0000000000 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleFactoryBattleRoom: - .4byte BattleFrontier_BattleFactoryBattleRoom_Layout - .4byte BattleFrontier_BattleFactoryBattleRoom_MapEvents - .4byte BattleFrontier_BattleFactoryBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_FACTORY - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json new file mode 100644 index 0000000000..de1cdd2ff1 --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json @@ -0,0 +1,125 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM", + "name": "BattleFrontier_BattleFactoryBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM", + "music": "MUS_B_FACTORY", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 0, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 7, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 0, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 0, + "y": 8, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 12, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 12, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 12, + "y": 8, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc deleted file mode 100644 index 7cfccd0ff5..0000000000 --- a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -BattleFrontier_BattleFactoryLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0 - object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0 - -BattleFrontier_BattleFactoryLobby_MapWarps: - warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 10, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_BattleFactoryLobby_MapBGEvents: - bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587E1 - bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587FA - bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleFactoryLobby_EventScript_258839 - -BattleFrontier_BattleFactoryLobby_MapEvents:: - map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc deleted file mode 100644 index 30bd38b686..0000000000 --- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleFactoryLobby: - .4byte BattleFrontier_BattleFactoryLobby_Layout - .4byte BattleFrontier_BattleFactoryLobby_MapEvents - .4byte BattleFrontier_BattleFactoryLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_FACTORY - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/map.json b/data/maps/BattleFrontier_BattleFactoryLobby/map.json new file mode 100644 index 0000000000..87ad1077ab --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryLobby/map.json @@ -0,0 +1,139 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY", + "name": "BattleFrontier_BattleFactoryLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY", + "music": "MUS_B_FACTORY", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 4, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleFactoryLobby_EventScript_2585CB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 3, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleFactoryLobby_EventScript_258813", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 14, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleFactoryLobby_EventScript_25881C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 13, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleFactoryLobby_EventScript_258825", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 6, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleFactoryLobby_EventScript_258830", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 14, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleFactoryLobby_EventScript_2585DD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 11, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 2 + }, + { + "x": 10, + "y": 11, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 2, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleFactoryLobby_EventScript_2587E1" + }, + { + "type": "sign", + "x": 11, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleFactoryLobby_EventScript_2587FA" + }, + { + "type": "sign", + "x": 9, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleFactoryLobby_EventScript_258839" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc deleted file mode 100644 index 944ff81429..0000000000 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: - map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc deleted file mode 100644 index ecbfc37a97..0000000000 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleFactoryPreBattleRoom: - .4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout - .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapEvents - .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_FACTORY - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json new file mode 100644 index 0000000000..4d9d792f7a --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM", + "name": "BattleFrontier_BattleFactoryPreBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM", + "music": "MUS_B_FACTORY", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 8, + "y": 12, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc deleted file mode 100644 index 95aacea959..0000000000 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -BattleFrontier_BattlePalaceBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattlePalaceBattleRoom_MapWarps: - warp_def 0, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR - warp_def 1, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR - -BattleFrontier_BattlePalaceBattleRoom_MapEvents:: - map_events BattleFrontier_BattlePalaceBattleRoom_EventObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc deleted file mode 100644 index 035cd8758e..0000000000 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePalaceBattleRoom: - .4byte BattleFrontier_BattlePalaceBattleRoom_Layout - .4byte BattleFrontier_BattlePalaceBattleRoom_MapEvents - .4byte BattleFrontier_BattlePalaceBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_PALACE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json new file mode 100644 index 0000000000..b0405cff03 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM", + "name": "BattleFrontier_BattlePalaceBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM", + "music": "MUS_B_PALACE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 1, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 13, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_DUSCLOPS", + "x": 13, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "x": 13, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 0, + "y": 9, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 9, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc deleted file mode 100644 index 578c2cc436..0000000000 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -BattleFrontier_BattlePalaceCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 15, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 9, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, 0x0, 0 - -BattleFrontier_BattlePalaceCorridor_MapWarps: - warp_def 8, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY - warp_def 9, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY - warp_def 6, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM - warp_def 10, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM - -BattleFrontier_BattlePalaceCorridor_MapEvents:: - map_events BattleFrontier_BattlePalaceCorridor_EventObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc deleted file mode 100644 index 6d2f8ffb05..0000000000 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePalaceCorridor: - .4byte BattleFrontier_BattlePalaceCorridor_Layout - .4byte BattleFrontier_BattlePalaceCorridor_MapEvents - .4byte BattleFrontier_BattlePalaceCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_PALACE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/map.json b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json new file mode 100644 index 0000000000..34378700eb --- /dev/null +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json @@ -0,0 +1,141 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", + "name": "BattleFrontier_BattlePalaceCorridor", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", + "music": "MUS_B_PALACE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 8, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "x": 3, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KIRLIA", + "x": 12, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "x": 15, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 4, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "x": 13, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 3, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 13, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 13, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 3, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 3, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc deleted file mode 100644 index 4c2d924b2f..0000000000 --- a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -BattleFrontier_BattlePalaceLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0 - object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 18, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0 - object_event 6, EVENT_OBJ_GFX_EXPERT_M, 0, 19, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0 - -BattleFrontier_BattlePalaceLobby_MapWarps: - warp_def 12, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 13, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 5, 4, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR - -BattleFrontier_BattlePalaceLobby_MapBGEvents: - bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC50 - bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC69 - bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6 - -BattleFrontier_BattlePalaceLobby_MapEvents:: - map_events BattleFrontier_BattlePalaceLobby_EventObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc deleted file mode 100644 index 8846982cf4..0000000000 --- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePalaceLobby: - .4byte BattleFrontier_BattlePalaceLobby_Layout - .4byte BattleFrontier_BattlePalaceLobby_MapEvents - .4byte BattleFrontier_BattlePalaceLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_PALACE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/map.json b/data/maps/BattleFrontier_BattlePalaceLobby/map.json new file mode 100644 index 0000000000..ccdbe327ae --- /dev/null +++ b/data/maps/BattleFrontier_BattlePalaceLobby/map.json @@ -0,0 +1,146 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", + "name": "BattleFrontier_BattlePalaceLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", + "music": "MUS_B_PALACE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 5, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24D944", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 11, + "y": 8, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC82", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 24, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC9D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 18, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC8B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 2, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC94", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 19, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24D956", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 12, + "y": 11, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 11, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 4, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 2, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC50" + }, + { + "type": "sign", + "x": 16, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC69" + }, + { + "type": "sign", + "x": 10, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DCA6" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc deleted file mode 100644 index ace2657bbc..0000000000 --- a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattlePikeCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattlePikeCorridor_MapEvents:: - map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc deleted file mode 100644 index cecd6fba15..0000000000 --- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeCorridor: - .4byte BattleFrontier_BattlePikeCorridor_Layout - .4byte BattleFrontier_BattlePikeCorridor_MapEvents - .4byte BattleFrontier_BattlePikeCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/map.json b/data/maps/BattleFrontier_BattlePikeCorridor/map.json new file mode 100644 index 0000000000..e35831a6d3 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeCorridor/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR", + "name": "BattleFrontier_BattlePikeCorridor", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeLobby/events.inc b/data/maps/BattleFrontier_BattlePikeLobby/events.inc deleted file mode 100644 index b28d48d6ac..0000000000 --- a/data/maps/BattleFrontier_BattlePikeLobby/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -BattleFrontier_BattlePikeLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0 - object_event 3, EVENT_OBJ_GFX_TWIN, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0 - -BattleFrontier_BattlePikeLobby_MapWarps: - warp_def 5, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 4, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 6, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_BattlePikeLobby_MapBGEvents: - bg_event 8, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BA80 - bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BAC6 - -BattleFrontier_BattlePikeLobby_MapEvents:: - map_events BattleFrontier_BattlePikeLobby_EventObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc deleted file mode 100644 index a3746c1143..0000000000 --- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeLobby: - .4byte BattleFrontier_BattlePikeLobby_Layout - .4byte BattleFrontier_BattlePikeLobby_MapEvents - .4byte BattleFrontier_BattlePikeLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.json b/data/maps/BattleFrontier_BattlePikeLobby/map.json new file mode 100644 index 0000000000..938e4da3f3 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeLobby/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY", + "name": "BattleFrontier_BattlePikeLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeLobby_EventScript_25B868", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 10, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAAB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAB4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 8, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeLobby_EventScript_25BABD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 12, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 12, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 12, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattlePikeLobby_EventScript_25BA80" + }, + { + "type": "sign", + "x": 1, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAC6" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc deleted file mode 100644 index 34f802c916..0000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0 - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0 - -BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: - coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2 - coord_event 3, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 - coord_event 3, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D - coord_event 4, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 - coord_event 5, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 - coord_event 4, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D - coord_event 5, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D - -BattleFrontier_BattlePikeRandomRoom1_MapEvents:: - map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc deleted file mode 100644 index ff61d12384..0000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom1: - .4byte BattleFrontier_BattlePikeRandomRoom1_Layout - .4byte BattleFrontier_BattlePikeRandomRoom1_MapEvents - .4byte BattleFrontier_BattlePikeRandomRoom1_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json new file mode 100644 index 0000000000..9ed644d798 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json @@ -0,0 +1,111 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1", + "name": "BattleFrontier_BattlePikeRandomRoom1", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 3, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2" + }, + { + "type": "trigger", + "x": 3, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082" + }, + { + "type": "trigger", + "x": 3, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D" + }, + { + "type": "trigger", + "x": 4, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082" + }, + { + "type": "trigger", + "x": 5, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082" + }, + { + "type": "trigger", + "x": 4, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D" + }, + { + "type": "trigger", + "x": 5, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc deleted file mode 100644 index 0d929a2ae3..0000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom2_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattlePikeRandomRoom2_MapEvents:: - map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc deleted file mode 100644 index 6ab11ae02e..0000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom2: - .4byte BattleFrontier_BattlePikeRandomRoom2_Layout - .4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents - .4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json new file mode 100644 index 0000000000..437e7fcfd2 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2", + "name": "BattleFrontier_BattlePikeRandomRoom2", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc deleted file mode 100644 index 9b3a6234e0..0000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: - coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174 - coord_event 3, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 4, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 5, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 3, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D - coord_event 4, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D - coord_event 5, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D - -BattleFrontier_BattlePikeRandomRoom3_MapEvents:: - map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc deleted file mode 100644 index fabb3a8ef7..0000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom3: - .4byte BattleFrontier_BattlePikeRandomRoom3_Layout - .4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents - .4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json new file mode 100644 index 0000000000..60aeee81cc --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json @@ -0,0 +1,84 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3", + "name": "BattleFrontier_BattlePikeRandomRoom3", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 3, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174" + }, + { + "type": "trigger", + "x": 3, + "y": 18, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202" + }, + { + "type": "trigger", + "x": 4, + "y": 18, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202" + }, + { + "type": "trigger", + "x": 5, + "y": 18, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202" + }, + { + "type": "trigger", + "x": 3, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D" + }, + { + "type": "trigger", + "x": 4, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D" + }, + { + "type": "trigger", + "x": 5, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc deleted file mode 100644 index 59abdb9708..0000000000 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -BattleFrontier_BattlePikeThreePathRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 4, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0 - object_event 2, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0 - -BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: - coord_event 2, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E - coord_event 6, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59 - coord_event 10, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64 - coord_event 5, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D - coord_event 6, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D - coord_event 6, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 5, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 7, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 7, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D - -BattleFrontier_BattlePikeThreePathRoom_MapEvents:: - map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc deleted file mode 100644 index 718d5d3e60..0000000000 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeThreePathRoom: - .4byte BattleFrontier_BattlePikeThreePathRoom_Layout - .4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents - .4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json new file mode 100644 index 0000000000..e2d0645cb0 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json @@ -0,0 +1,129 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM", + "name": "BattleFrontier_BattlePikeThreePathRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 4, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 3, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E" + }, + { + "type": "trigger", + "x": 6, + "y": 3, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59" + }, + { + "type": "trigger", + "x": 10, + "y": 3, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64" + }, + { + "type": "trigger", + "x": 5, + "y": 10, + "elevation": 0, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" + }, + { + "type": "trigger", + "x": 6, + "y": 10, + "elevation": 0, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" + }, + { + "type": "trigger", + "x": 6, + "y": 9, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" + }, + { + "type": "trigger", + "x": 5, + "y": 9, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" + }, + { + "type": "trigger", + "x": 7, + "y": 9, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" + }, + { + "type": "trigger", + "x": 7, + "y": 10, + "elevation": 0, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc deleted file mode 100644 index 3c8e0fda8f..0000000000 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0 - object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 14, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0 - object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 1, 9, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0 - object_event 6, EVENT_OBJ_GFX_TEALA, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0 - object_event 7, EVENT_OBJ_GFX_TEALA, 0, 9, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0 - object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0 - object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0 - -BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: - warp_def 7, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 8, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: - map_events BattleFrontier_BattlePointExchangeServiceCorner_EventObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc deleted file mode 100644 index c60cf97f26..0000000000 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePointExchangeServiceCorner: - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout - .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapEvents - .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json new file mode 100644 index 0000000000..2184971eb0 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json @@ -0,0 +1,160 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER", + "name": "BattleFrontier_BattlePointExchangeServiceCorner", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 4, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 0, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 0, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 14, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 1, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 5, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 9, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 12, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 10, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 6 + }, + { + "x": 6, + "y": 10, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 6 + }, + { + "x": 8, + "y": 10, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc deleted file mode 100644 index 793434de3e..0000000000 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -BattleFrontier_BattlePyramidEmptySquare_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 0, 0, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattlePyramidEmptySquare_MapEvents:: - map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc deleted file mode 100644 index 46b22aa7aa..0000000000 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidEmptySquare: - .4byte BattleFrontier_BattlePyramidEmptySquare_Layout - .4byte BattleFrontier_BattlePyramidEmptySquare_MapEvents - .4byte BattleFrontier_BattlePyramidEmptySquare_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json new file mode 100644 index 0000000000..aab03982fd --- /dev/null +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json @@ -0,0 +1,229 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", + "name": "BattleFrontier_BattlePyramidEmptySquare", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", + "music": "65535", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 0, + "y": 0, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 2, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 3, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 4, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 5, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 6, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 7, + "y": 0, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 3, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 4, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 5, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 6, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 7, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 2, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc deleted file mode 100644 index 81a4203b5a..0000000000 --- a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -BattleFrontier_BattlePyramidLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0 - object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 2, 15, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0 - -BattleFrontier_BattlePyramidLobby_MapWarps: - warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_BattlePyramidLobby_MapBGEvents: - bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePyramidLobby_EventScript_250D42 - bg_event 1, 12, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePyramidLobby_EventScript_250E95 - -BattleFrontier_BattlePyramidLobby_MapEvents:: - map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc deleted file mode 100644 index f8e7408a02..0000000000 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidLobby: - .4byte BattleFrontier_BattlePyramidLobby_Layout - .4byte BattleFrontier_BattlePyramidLobby_MapEvents - .4byte BattleFrontier_BattlePyramidLobby_MapScripts - .4byte 0x0 - .2byte MUS_PYRAMID - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.json b/data/maps/BattleFrontier_BattlePyramidLobby/map.json new file mode 100644 index 0000000000..7ffd80dcf4 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePyramidLobby/map.json @@ -0,0 +1,98 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", + "name": "BattleFrontier_BattlePyramidLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", + "music": "MUS_PYRAMID", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 7, + "y": 12, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidLobby_EventScript_2508B1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 14, + "y": 13, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250ACE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 2, + "y": 15, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E83", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 12, + "y": 16, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E8C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 17, + "elevation": 4, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250D42" + }, + { + "type": "sign", + "x": 1, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E95" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePyramidTop/events.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc deleted file mode 100644 index 9e1cd9f4f5..0000000000 --- a/data/maps/BattleFrontier_BattlePyramidTop/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BattleFrontier_BattlePyramidTop_EventObjects: - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0 - object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattlePyramidTop_MapCoordEvents: - coord_event 17, 9, 4, VAR_TEMP_2, 0, BattleFrontier_BattlePyramidTop_EventScript_255256 - -BattleFrontier_BattlePyramidTop_MapEvents:: - map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc deleted file mode 100644 index e2e8ec59a6..0000000000 --- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidTop: - .4byte BattleFrontier_BattlePyramidTop_Layout - .4byte BattleFrontier_BattlePyramidTop_MapEvents - .4byte BattleFrontier_BattlePyramidTop_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.json b/data/maps/BattleFrontier_BattlePyramidTop/map.json new file mode 100644 index 0000000000..09fe56ef1a --- /dev/null +++ b/data/maps/BattleFrontier_BattlePyramidTop/map.json @@ -0,0 +1,57 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP", + "name": "BattleFrontier_BattlePyramidTop", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP", + "music": "65535", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 17, + "y": 11, + "elevation": 6, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidTop_EventScript_2551D0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BRANDON", + "x": 17, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [ + { + "type": "trigger", + "x": 17, + "y": 9, + "elevation": 4, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePyramidTop_EventScript_255256" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc deleted file mode 100644 index 4de7382b23..0000000000 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattleFrontier_BattleTowerBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - -BattleFrontier_BattleTowerBattleRoom_MapWarps: - warp_def 5, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY - warp_def 6, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY - -BattleFrontier_BattleTowerBattleRoom_MapEvents:: - map_events BattleFrontier_BattleTowerBattleRoom_EventObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc deleted file mode 100644 index 5f8b03ace3..0000000000 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerBattleRoom: - .4byte BattleFrontier_BattleTowerBattleRoom_Layout - .4byte BattleFrontier_BattleTowerBattleRoom_MapEvents - .4byte BattleFrontier_BattleTowerBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json new file mode 100644 index 0000000000..736fd55c83 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", + "name": "BattleFrontier_BattleTowerBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc deleted file mode 100644 index 97dc0c8570..0000000000 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -BattleFrontier_BattleTowerBattleRoom2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT - object_event 5, EVENT_OBJ_GFX_VAR_F, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_VAR_E, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - -BattleFrontier_BattleTowerBattleRoom2_MapEvents:: - map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc deleted file mode 100644 index 464ed85666..0000000000 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerBattleRoom2: - .4byte BattleFrontier_BattleTowerBattleRoom_Layout - .4byte BattleFrontier_BattleTowerBattleRoom2_MapEvents - .4byte BattleFrontier_BattleTowerBattleRoom2_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json new file mode 100644 index 0000000000..60d7bc73ac --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json @@ -0,0 +1,99 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2", + "name": "BattleFrontier_BattleTowerBattleRoom2", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 4, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_E", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc deleted file mode 100644 index 80b239fbcd..0000000000 --- a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattleTowerCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 - -BattleFrontier_BattleTowerCorridor_MapEvents:: - map_events BattleFrontier_BattleTowerCorridor_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc deleted file mode 100644 index 7774e0f3bd..0000000000 --- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerCorridor: - .4byte BattleFrontier_BattleTowerCorridor_Layout - .4byte BattleFrontier_BattleTowerCorridor_MapEvents - .4byte BattleFrontier_BattleTowerCorridor_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/map.json b/data/maps/BattleFrontier_BattleTowerCorridor/map.json new file mode 100644 index 0000000000..c99dcac09f --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerCorridor/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR", + "name": "BattleFrontier_BattleTowerCorridor", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc deleted file mode 100644 index 726c4b58aa..0000000000 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -BattleFrontier_BattleTowerCorridor2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_VAR_E, 0, 14, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleTowerCorridor2_MapEvents:: - map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc deleted file mode 100644 index 9a8676f937..0000000000 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerCorridor2: - .4byte BattleFrontier_BattleTowerCorridor2_Layout - .4byte BattleFrontier_BattleTowerCorridor2_MapEvents - .4byte BattleFrontier_BattleTowerCorridor2_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/map.json b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json new file mode 100644 index 0000000000..a15882e77d --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json @@ -0,0 +1,73 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2", + "name": "BattleFrontier_BattleTowerCorridor2", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 1, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 14, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_E", + "x": 14, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerElevator/events.inc b/data/maps/BattleFrontier_BattleTowerElevator/events.inc deleted file mode 100644 index a33f30c9e0..0000000000 --- a/data/maps/BattleFrontier_BattleTowerElevator/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattleTowerElevator_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - -BattleFrontier_BattleTowerElevator_MapEvents:: - map_events BattleFrontier_BattleTowerElevator_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc deleted file mode 100644 index 3267daa20d..0000000000 --- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerElevator: - .4byte BattleElevator_Layout - .4byte BattleFrontier_BattleTowerElevator_MapEvents - .4byte BattleFrontier_BattleTowerElevator_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_ELEVATOR - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.json b/data/maps/BattleFrontier_BattleTowerElevator/map.json new file mode 100644 index 0000000000..6af03f7f9e --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerElevator/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR", + "name": "BattleFrontier_BattleTowerElevator", + "layout": "LAYOUT_BATTLE_ELEVATOR", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerLobby/events.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc deleted file mode 100644 index ddf573eb2d..0000000000 --- a/data/maps/BattleFrontier_BattleTowerLobby/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -BattleFrontier_BattleTowerLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, FLAG_HIDE_BATTLE_TOWER_REPORTER - object_event 6, EVENT_OBJ_GFX_VAR_0, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, FLAG_HIDE_APPRENTICE - object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0 - object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0 - object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0 - -BattleFrontier_BattleTowerLobby_MapWarps: - warp_def 12, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 13, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 1, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM - -BattleFrontier_BattleTowerLobby_MapBGEvents: - bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFC7 - bg_event 8, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFE0 - bg_event 12, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFF9 - bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23F012 - bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleTowerLobby_EventScript_23F4BE - -BattleFrontier_BattleTowerLobby_MapEvents:: - map_events BattleFrontier_BattleTowerLobby_EventObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc deleted file mode 100644 index b1ca3914a0..0000000000 --- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerLobby: - .4byte BattleFrontier_BattleTowerLobby_Layout - .4byte BattleFrontier_BattleTowerLobby_MapEvents - .4byte BattleFrontier_BattleTowerLobby_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json new file mode 100644 index 0000000000..4773d78ed5 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json @@ -0,0 +1,201 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", + "name": "BattleFrontier_BattleTowerLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23E936", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 23, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EEE7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 17, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFB5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 15, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFBE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 11, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_28CB96", + "flag": "FLAG_HIDE_BATTLE_TOWER_REPORTER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EventScript_Apprentice", + "flag": "FLAG_HIDE_APPRENTICE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EA9F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EC08", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 18, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23ED74", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 12, + "y": 9, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 9, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFC7" + }, + { + "type": "sign", + "x": 8, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFE0" + }, + { + "type": "sign", + "x": 12, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFF9" + }, + { + "type": "sign", + "x": 16, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleTowerLobby_EventScript_23F012" + }, + { + "type": "sign", + "x": 2, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleTowerLobby_EventScript_23F4BE" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc deleted file mode 100644 index d7dfcd3ad2..0000000000 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2 - -BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: - map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc deleted file mode 100644 index d8fc1abb69..0000000000 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerMultiBattleRoom: - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout - .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapEvents - .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json new file mode 100644 index 0000000000..2a9726fc0d --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json @@ -0,0 +1,138 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM", + "name": "BattleFrontier_BattleTowerMultiBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 2, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 17, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 6, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 8, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 10, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 4, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge1/events.inc b/data/maps/BattleFrontier_Lounge1/events.inc deleted file mode 100644 index 7fb5e62565..0000000000 --- a/data/maps/BattleFrontier_Lounge1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -BattleFrontier_Lounge1_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 7, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0 - -BattleFrontier_Lounge1_MapWarps: - warp_def 4, 9, 0, 5, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_Lounge1_MapEvents:: - map_events BattleFrontier_Lounge1_EventObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc deleted file mode 100644 index 69119443dd..0000000000 --- a/data/maps/BattleFrontier_Lounge1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge1: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge1_MapEvents - .4byte BattleFrontier_Lounge1_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge1/map.json b/data/maps/BattleFrontier_Lounge1/map.json new file mode 100644 index 0000000000..3f6b1681ee --- /dev/null +++ b/data/maps/BattleFrontier_Lounge1/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE1", + "name": "BattleFrontier_Lounge1", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 0, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge1_EventScript_25E775", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 7, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge1_EventScript_25E94D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 5, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge1_EventScript_25E956", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge2/events.inc b/data/maps/BattleFrontier_Lounge2/events.inc deleted file mode 100644 index faa0a5608b..0000000000 --- a/data/maps/BattleFrontier_Lounge2/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -BattleFrontier_Lounge2_EventObjects: - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0 - object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 10, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0 - object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 4, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 10, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0 - -BattleFrontier_Lounge2_MapWarps: - warp_def 1, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 2, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_Lounge2_MapEvents:: - map_events BattleFrontier_Lounge2_EventObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc deleted file mode 100644 index a74f85ca41..0000000000 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge2: - .4byte BattleFrontier_Lounge1_Layout - .4byte BattleFrontier_Lounge2_MapEvents - .4byte BattleFrontier_Lounge2_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE1 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge2/map.json b/data/maps/BattleFrontier_Lounge2/map.json new file mode 100644 index 0000000000..bade814621 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge2/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE2", + "name": "BattleFrontier_Lounge2", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE1", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 8, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge2_EventScript_260643", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 10, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge2_EventScript_26073C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 10, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge2_EventScript_260747", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "x": 4, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge2_EventScript_26075D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 10, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge2_EventScript_260752", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 7, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 3 + }, + { + "x": 2, + "y": 7, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge3/events.inc b/data/maps/BattleFrontier_Lounge3/events.inc deleted file mode 100644 index f8a26e4ddc..0000000000 --- a/data/maps/BattleFrontier_Lounge3/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -BattleFrontier_Lounge3_EventObjects: - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0 - object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 0, 3, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0 - -BattleFrontier_Lounge3_MapWarps: - warp_def 4, 9, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_Lounge3_MapEvents:: - map_events BattleFrontier_Lounge3_EventObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc deleted file mode 100644 index fb27b1580c..0000000000 --- a/data/maps/BattleFrontier_Lounge3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge3: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge3_MapEvents - .4byte BattleFrontier_Lounge3_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge3/map.json b/data/maps/BattleFrontier_Lounge3/map.json new file mode 100644 index 0000000000..592f65a7b0 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge3/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE3", + "name": "BattleFrontier_Lounge3", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 4, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge3_EventScript_261D83", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 4, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge3_EventScript_261FE1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 3, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge3_EventScript_261FC1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 5, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge3_EventScript_261FD1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 0, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 0, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge3_EventScript_261FB8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge4/events.inc b/data/maps/BattleFrontier_Lounge4/events.inc deleted file mode 100644 index c2e2f44a26..0000000000 --- a/data/maps/BattleFrontier_Lounge4/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -BattleFrontier_Lounge4_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0 - object_event 2, EVENT_OBJ_GFX_COOK, 0, 6, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 2, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0 - -BattleFrontier_Lounge4_MapWarps: - warp_def 4, 9, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_Lounge4_MapEvents:: - map_events BattleFrontier_Lounge4_EventObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc deleted file mode 100644 index edb6171e79..0000000000 --- a/data/maps/BattleFrontier_Lounge4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge4: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge4_MapEvents - .4byte BattleFrontier_Lounge4_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge4/map.json b/data/maps/BattleFrontier_Lounge4/map.json new file mode 100644 index 0000000000..9165d21fbb --- /dev/null +++ b/data/maps/BattleFrontier_Lounge4/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE4", + "name": "BattleFrontier_Lounge4", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 4, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge4_EventScript_26358D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_COOK", + "x": 6, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge4_EventScript_263596", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 0, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge4_EventScript_26359F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge5/events.inc b/data/maps/BattleFrontier_Lounge5/events.inc deleted file mode 100644 index e0a2ea3447..0000000000 --- a/data/maps/BattleFrontier_Lounge5/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -BattleFrontier_Lounge5_EventObjects: - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 12, 4, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 11, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0 - -BattleFrontier_Lounge5_MapWarps: - warp_def 1, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 2, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_Lounge5_MapEvents:: - map_events BattleFrontier_Lounge5_EventObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc deleted file mode 100644 index 9c9de0e3b9..0000000000 --- a/data/maps/BattleFrontier_Lounge5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge5: - .4byte BattleFrontier_Lounge1_Layout - .4byte BattleFrontier_Lounge5_MapEvents - .4byte BattleFrontier_Lounge5_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE1 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge5/map.json b/data/maps/BattleFrontier_Lounge5/map.json new file mode 100644 index 0000000000..500b0fb717 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge5/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE5", + "name": "BattleFrontier_Lounge5", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE1", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 12, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge5_EventScript_2645C6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge5_EventScript_264617", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 6, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge5_EventScript_264620", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 11, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge5_EventScript_264629", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 7, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 7 + }, + { + "x": 2, + "y": 7, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge6/events.inc b/data/maps/BattleFrontier_Lounge6/events.inc deleted file mode 100644 index 8c3950d61a..0000000000 --- a/data/maps/BattleFrontier_Lounge6/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -BattleFrontier_Lounge6_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0 - -BattleFrontier_Lounge6_MapWarps: - warp_def 4, 9, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_Lounge6_MapEvents:: - map_events BattleFrontier_Lounge6_EventObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc deleted file mode 100644 index 2b5f8474f3..0000000000 --- a/data/maps/BattleFrontier_Lounge6/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge6: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge6_MapEvents - .4byte BattleFrontier_Lounge6_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge6/map.json b/data/maps/BattleFrontier_Lounge6/map.json new file mode 100644 index 0000000000..0b48dbbcfd --- /dev/null +++ b/data/maps/BattleFrontier_Lounge6/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE6", + "name": "BattleFrontier_Lounge6", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 2, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge6_EventScript_264FED", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge7/events.inc b/data/maps/BattleFrontier_Lounge7/events.inc deleted file mode 100644 index bc7f289adc..0000000000 --- a/data/maps/BattleFrontier_Lounge7/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattleFrontier_Lounge7_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_F, 0, 2, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 8, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0 - -BattleFrontier_Lounge7_MapWarps: - warp_def 4, 9, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_Lounge7_MapEvents:: - map_events BattleFrontier_Lounge7_EventObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc deleted file mode 100644 index 58b9dc3e5b..0000000000 --- a/data/maps/BattleFrontier_Lounge7/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge7: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge7_MapEvents - .4byte BattleFrontier_Lounge7_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge7/map.json b/data/maps/BattleFrontier_Lounge7/map.json new file mode 100644 index 0000000000..28fd390f7d --- /dev/null +++ b/data/maps/BattleFrontier_Lounge7/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE7", + "name": "BattleFrontier_Lounge7", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 0, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge7_EventScript_2656DB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 2, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge7_EventScript_265255", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 6, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge7_EventScript_265445", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 8, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge7_EventScript_2656E4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge8/events.inc b/data/maps/BattleFrontier_Lounge8/events.inc deleted file mode 100644 index 47e8e51f1d..0000000000 --- a/data/maps/BattleFrontier_Lounge8/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -BattleFrontier_Lounge8_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 4, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 8, 7, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0 - -BattleFrontier_Lounge8_MapWarps: - warp_def 4, 9, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_Lounge8_MapEvents:: - map_events BattleFrontier_Lounge8_EventObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc deleted file mode 100644 index 578219cc4f..0000000000 --- a/data/maps/BattleFrontier_Lounge8/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge8: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge8_MapEvents - .4byte BattleFrontier_Lounge8_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge8/map.json b/data/maps/BattleFrontier_Lounge8/map.json new file mode 100644 index 0000000000..13cf5e2546 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge8/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE8", + "name": "BattleFrontier_Lounge8", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 4, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge8_EventScript_2676DC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 8, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge8_EventScript_2676CA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 8, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge8_EventScript_2676D3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge9/events.inc b/data/maps/BattleFrontier_Lounge9/events.inc deleted file mode 100644 index ce86367cf8..0000000000 --- a/data/maps/BattleFrontier_Lounge9/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BattleFrontier_Lounge9_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 6, 3, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_Lounge9_MapWarps: - warp_def 1, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 2, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_Lounge9_MapEvents:: - map_events BattleFrontier_Lounge9_EventObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc deleted file mode 100644 index 32b1512efd..0000000000 --- a/data/maps/BattleFrontier_Lounge9/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge9: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge9_MapEvents - .4byte BattleFrontier_Lounge9_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge9/map.json b/data/maps/BattleFrontier_Lounge9/map.json new file mode 100644 index 0000000000..3d4faf383c --- /dev/null +++ b/data/maps/BattleFrontier_Lounge9/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE9", + "name": "BattleFrontier_Lounge9", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 6, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 11 + }, + { + "x": 2, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 11 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Mart/events.inc b/data/maps/BattleFrontier_Mart/events.inc deleted file mode 100644 index e637b489b5..0000000000 --- a/data/maps/BattleFrontier_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -BattleFrontier_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0 - -BattleFrontier_Mart_MapWarps: - warp_def 3, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 4, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_Mart_MapEvents:: - map_events BattleFrontier_Mart_EventObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc deleted file mode 100644 index 97251160fd..0000000000 --- a/data/maps/BattleFrontier_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Mart: - .4byte Mart_Layout - .4byte BattleFrontier_Mart_MapEvents - .4byte BattleFrontier_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Mart/map.json b/data/maps/BattleFrontier_Mart/map.json new file mode 100644 index 0000000000..068a46b727 --- /dev/null +++ b/data/maps/BattleFrontier_Mart/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_BATTLE_FRONTIER_MART", + "name": "BattleFrontier_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Mart_EventScript_267ACC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Mart_EventScript_267B0B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Mart_EventScript_267B02", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Mart_EventScript_267B20", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_OutsideEast/connections.inc b/data/maps/BattleFrontier_OutsideEast/connections.inc deleted file mode 100644 index e042da23e8..0000000000 --- a/data/maps/BattleFrontier_OutsideEast/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -BattleFrontier_OutsideEast_MapConnectionsList: - connection left, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_OutsideEast_MapConnections: - .4byte 1 - .4byte BattleFrontier_OutsideEast_MapConnectionsList - diff --git a/data/maps/BattleFrontier_OutsideEast/events.inc b/data/maps/BattleFrontier_OutsideEast/events.inc deleted file mode 100644 index b5ee58e49a..0000000000 --- a/data/maps/BattleFrontier_OutsideEast/events.inc +++ /dev/null @@ -1,57 +0,0 @@ -BattleFrontier_OutsideEast_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 20, 17, 0, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 42, 15, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 53, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0 - object_event 4, EVENT_OBJ_GFX_HEX_MANIAC, 0, 54, 16, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 37, 32, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0 - object_event 6, EVENT_OBJ_GFX_COOK, 0, 41, 56, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0 - object_event 7, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 46, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0 - object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 34, 41, 0, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0 - object_event 9, EVENT_OBJ_GFX_RICH_BOY, 0, 45, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0 - object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 59, 35, 0, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0 - object_event 11, EVENT_OBJ_GFX_TWIN, 0, 18, 40, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0 - object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 17, 40, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0 - object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 40, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0 - object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO - object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 42, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0 - object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 51, 53, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0 - object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 62, 18, 0, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 2, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0 - object_event 18, EVENT_OBJ_GFX_MAN_3, 0, 11, 21, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_5, 0, 10, 21, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 30, 0, MOVEMENT_TYPE_WANDER_AROUND, 3, 2, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0 - object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 33, 14, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0 - object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 54, 31, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 54, 32, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0 - object_event 24, EVENT_OBJ_GFX_OLD_WOMAN, 0, 58, 55, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0 - object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 48, 41, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0 - object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 29, 14, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0 - -BattleFrontier_OutsideEast_MapWarps: - warp_def 16, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY - warp_def 39, 29, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY - warp_def 45, 56, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY - warp_def 58, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY - warp_def 35, 12, 3, 0, MAP_BATTLE_FRONTIER_RANKING_HALL - warp_def 4, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE1 - warp_def 10, 28, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER - warp_def 22, 51, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE5 - warp_def 5, 8, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE6 - warp_def 65, 31, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE3 - warp_def 14, 51, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE8 - warp_def 21, 45, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE9 - warp_def 3, 51, 0, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F - warp_def 28, 7, 0, 0, MAP_ARTISAN_CAVE_1F - -BattleFrontier_OutsideEast_MapBGEvents: - bg_event 13, 17, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C43 - bg_event 43, 56, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C4C - bg_event 36, 34, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C55 - bg_event 62, 15, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C5E - bg_event 7, 29, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242DD7 - bg_event 32, 13, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242DCE - bg_event 4, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_271E73 - bg_event 5, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_271E73 - -BattleFrontier_OutsideEast_MapEvents:: - map_events BattleFrontier_OutsideEast_EventObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents - diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc deleted file mode 100644 index 72e10d0dd9..0000000000 --- a/data/maps/BattleFrontier_OutsideEast/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_OutsideEast: - .4byte BattleFrontier_OutsideEast_Layout - .4byte BattleFrontier_OutsideEast_MapEvents - .4byte BattleFrontier_OutsideEast_MapScripts - .4byte BattleFrontier_OutsideEast_MapConnections - .2byte MUS_B_FRONTIER - .2byte LAYOUT_BATTLE_FRONTIER_OUTSIDE_EAST - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json new file mode 100644 index 0000000000..700c24aff9 --- /dev/null +++ b/data/maps/BattleFrontier_OutsideEast/map.json @@ -0,0 +1,529 @@ +{ + "id": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "name": "BattleFrontier_OutsideEast", + "layout": "LAYOUT_BATTLE_FRONTIER_OUTSIDE_EAST", + "music": "MUS_B_FRONTIER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 20, + "y": 17, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C67", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 42, + "y": 15, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C70", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 53, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 2, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C79", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 54, + "y": 16, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C82", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 37, + "y": 32, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C8B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_COOK", + "x": 41, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C94", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 8, + "y": 46, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CBB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "x": 34, + "y": 41, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CE1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 45, + "y": 47, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CB2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "x": 59, + "y": 35, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 6, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CC4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 18, + "y": 40, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CCD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 17, + "y": 40, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CD6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 40, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C9F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SUDOWOODO", + "x": 54, + "y": 62, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CEA", + "flag": "FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 42, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242D79", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 51, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242D82", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 62, + "y": 18, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 2, + "movement_range_y": 6, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242D8B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 11, + "y": 21, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242D94", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 10, + "y": 21, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242D9D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 16, + "y": 30, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 3, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242DA6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 33, + "y": 14, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242DAF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 54, + "y": 31, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242DB8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 54, + "y": 32, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242DC3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 58, + "y": 55, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242DE9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 48, + "y": 41, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242DE0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 29, + "y": 14, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242E08", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 16, + "y": 14, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 39, + "y": 29, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 45, + "y": 56, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 58, + "y": 14, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 35, + "y": 12, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_RANKING_HALL", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 44, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE1", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 28, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 51, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE5", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE6", + "dest_warp_id": 0 + }, + { + "x": 65, + "y": 31, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE3", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 51, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE8", + "dest_warp_id": 0 + }, + { + "x": 21, + "y": 45, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE9", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 51, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 28, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ARTISAN_CAVE_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 13, + "y": 17, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_242C43" + }, + { + "type": "sign", + "x": 43, + "y": 56, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_242C4C" + }, + { + "type": "sign", + "x": 36, + "y": 34, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_242C55" + }, + { + "type": "sign", + "x": 62, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_242C5E" + }, + { + "type": "sign", + "x": 7, + "y": 29, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_242DD7" + }, + { + "type": "sign", + "x": 32, + "y": 13, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_242DCE" + }, + { + "type": "sign", + "x": 4, + "y": 51, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_271E73" + }, + { + "type": "sign", + "x": 5, + "y": 51, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_271E73" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_OutsideWest/connections.inc b/data/maps/BattleFrontier_OutsideWest/connections.inc deleted file mode 100644 index 0755b3c44c..0000000000 --- a/data/maps/BattleFrontier_OutsideWest/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -BattleFrontier_OutsideWest_MapConnectionsList: - connection right, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_OutsideWest_MapConnections: - .4byte 1 - .4byte BattleFrontier_OutsideWest_MapConnectionsList - diff --git a/data/maps/BattleFrontier_OutsideWest/events.inc b/data/maps/BattleFrontier_OutsideWest/events.inc deleted file mode 100644 index 87c0db7aab..0000000000 --- a/data/maps/BattleFrontier_OutsideWest/events.inc +++ /dev/null @@ -1,49 +0,0 @@ -BattleFrontier_OutsideWest_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 26, 38, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 20, 70, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 19, 68, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0 - object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 26, 20, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 27, 30, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 33, 41, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0 - object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 28, 43, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0 - object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 20, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 13, 44, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0 - object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 14, 44, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0 - object_event 11, EVENT_OBJ_GFX_MAN_5, 0, 23, 47, 0, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0 - object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 38, 27, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0 - object_event 13, EVENT_OBJ_GFX_WOMAN_3, 0, 45, 18, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0 - object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 9, 47, 0, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0 - object_event 15, EVENT_OBJ_GFX_LASS, 0, 35, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0 - object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 11, 66, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0 - object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 31, 31, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0 - object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 48, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0 - object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 38, 22, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 9, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0 - object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 12, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0 - object_event 22, EVENT_OBJ_GFX_OLD_MAN, 0, 11, 10, 0, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0 - object_event 23, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0 - object_event 24, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 26, 0, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0 - -BattleFrontier_OutsideWest_MapWarps: - warp_def 42, 27, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY - warp_def 19, 17, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY - warp_def 11, 38, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY - warp_def 45, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE2 - warp_def 51, 51, 0, 0, MAP_BATTLE_FRONTIER_MART - warp_def 44, 5, 0, 0, MAP_BATTLE_FRONTIER_SCOTTS_HOUSE - warp_def 53, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE4 - warp_def 5, 20, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE7 - warp_def 26, 65, 0, 0, MAP_BATTLE_FRONTIER_RECEPTION_GATE - warp_def 26, 61, 0, 1, MAP_BATTLE_FRONTIER_RECEPTION_GATE - warp_def 39, 55, 0, 0, MAP_ARTISAN_CAVE_B1F - -BattleFrontier_OutsideWest_MapBGEvents: - bg_event 15, 18, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4E2 - bg_event 45, 30, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4F4 - bg_event 16, 43, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4EB - bg_event 52, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_271E6A - bg_event 53, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_271E6A - -BattleFrontier_OutsideWest_MapEvents:: - map_events BattleFrontier_OutsideWest_EventObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents - diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc deleted file mode 100644 index 40f26c1518..0000000000 --- a/data/maps/BattleFrontier_OutsideWest/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_OutsideWest: - .4byte BattleFrontier_OutsideWest_Layout - .4byte BattleFrontier_OutsideWest_MapEvents - .4byte BattleFrontier_OutsideWest_MapScripts - .4byte BattleFrontier_OutsideWest_MapConnections - .2byte MUS_B_FRONTIER - .2byte LAYOUT_BATTLE_FRONTIER_OUTSIDE_WEST - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_OutsideWest/map.json b/data/maps/BattleFrontier_OutsideWest/map.json new file mode 100644 index 0000000000..43298e6635 --- /dev/null +++ b/data/maps/BattleFrontier_OutsideWest/map.json @@ -0,0 +1,458 @@ +{ + "id": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "name": "BattleFrontier_OutsideWest", + "layout": "LAYOUT_BATTLE_FRONTIER_OUTSIDE_WEST", + "music": "MUS_B_FRONTIER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "right", + "offset": 0, + "map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 26, + "y": 38, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D50F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 20, + "y": 70, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 19, + "y": 68, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D3F0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 26, + "y": 20, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 8, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D68B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 27, + "y": 30, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D52D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 33, + "y": 41, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D69D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 28, + "y": 43, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6A6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 17, + "y": 20, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D679", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 13, + "y": 44, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D536", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 14, + "y": 44, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D53D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 23, + "y": 47, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D694", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 38, + "y": 27, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D5C6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 45, + "y": 18, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D635", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 9, + "y": 47, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D57F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 35, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D682", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 11, + "y": 66, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_249E19", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 31, + "y": 31, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D667", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 42, + "y": 48, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D518", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 38, + "y": 22, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 12, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6B8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 12, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6C3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 11, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 8, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6D7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 4, + "y": 26, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6EE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 42, + "y": 27, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 17, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 38, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 45, + "y": 44, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE2", + "dest_warp_id": 0 + }, + { + "x": 51, + "y": 51, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_MART", + "dest_warp_id": 0 + }, + { + "x": 44, + "y": 5, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_SCOTTS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 53, + "y": 44, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE4", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 20, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE7", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 65, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_RECEPTION_GATE", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 61, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_RECEPTION_GATE", + "dest_warp_id": 1 + }, + { + "x": 39, + "y": 55, + "elevation": 0, + "dest_map": "MAP_ARTISAN_CAVE_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 15, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideWest_EventScript_23D4E2" + }, + { + "type": "sign", + "x": 45, + "y": 30, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideWest_EventScript_23D4F4" + }, + { + "type": "sign", + "x": 16, + "y": 43, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideWest_EventScript_23D4EB" + }, + { + "type": "sign", + "x": 52, + "y": 51, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideWest_EventScript_271E6A" + }, + { + "type": "sign", + "x": 53, + "y": 51, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideWest_EventScript_271E6A" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc deleted file mode 100644 index 20bad9c6da..0000000000 --- a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0 - object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0 - -BattleFrontier_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 1, 6, 4, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F - -BattleFrontier_PokemonCenter_1F_MapEvents:: - map_events BattleFrontier_PokemonCenter_1F_EventObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc deleted file mode 100644 index 65445c2a17..0000000000 --- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte BattleFrontier_PokemonCenter_1F_MapEvents - .4byte BattleFrontier_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/map.json b/data/maps/BattleFrontier_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..4a78ec120d --- /dev/null +++ b/data/maps/BattleFrontier_PokemonCenter_1F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F", + "name": "BattleFrontier_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_1F_EventScript_267908", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_1F_EventScript_267916", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_1F_EventScript_26791F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_1F_EventScript_267928", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_1F_EventScript_267931", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 12 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 12 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc deleted file mode 100644 index d2f3730e89..0000000000 --- a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -BattleFrontier_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -BattleFrontier_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -BattleFrontier_PokemonCenter_2F_MapEvents:: - map_events BattleFrontier_PokemonCenter_2F_EventObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc deleted file mode 100644 index fbd39cde9e..0000000000 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte BattleFrontier_PokemonCenter_2F_MapEvents - .4byte BattleFrontier_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/map.json b/data/maps/BattleFrontier_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..1f3babd48d --- /dev/null +++ b/data/maps/BattleFrontier_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F", + "name": "BattleFrontier_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_RankingHall/events.inc b/data/maps/BattleFrontier_RankingHall/events.inc deleted file mode 100644 index 30a0e5ebb3..0000000000 --- a/data/maps/BattleFrontier_RankingHall/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -BattleFrontier_RankingHall_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0 - object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 4, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0 - object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 44, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0 - -BattleFrontier_RankingHall_MapWarps: - warp_def 26, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 27, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_RankingHall_MapBGEvents: - bg_event 26, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4AA - bg_event 23, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4B6 - bg_event 26, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4C2 - bg_event 29, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4CE - bg_event 42, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4DA - bg_event 46, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4E6 - bg_event 10, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4F2 - bg_event 8, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4FE - bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E50A - bg_event 44, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E516 - bg_event 16, 8, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_RankingHall_EventScript_25E538 - bg_event 36, 8, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_RankingHall_EventScript_25E541 - -BattleFrontier_RankingHall_MapEvents:: - map_events BattleFrontier_RankingHall_EventObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents - diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc deleted file mode 100644 index 0f001d5637..0000000000 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_RankingHall: - .4byte BattleFrontier_RankingHall_Layout - .4byte BattleFrontier_RankingHall_MapEvents - .4byte BattleFrontier_RankingHall_MapScripts - .4byte 0x0 - .2byte MUS_BIJYUTU - .2byte LAYOUT_BATTLE_FRONTIER_RANKING_HALL - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_RankingHall/map.json b/data/maps/BattleFrontier_RankingHall/map.json new file mode 100644 index 0000000000..64fa727d72 --- /dev/null +++ b/data/maps/BattleFrontier_RankingHall/map.json @@ -0,0 +1,172 @@ +{ + "id": "MAP_BATTLE_FRONTIER_RANKING_HALL", + "name": "BattleFrontier_RankingHall", + "layout": "LAYOUT_BATTLE_FRONTIER_RANKING_HALL", + "music": "MUS_BIJYUTU", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 24, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_RankingHall_EventScript_25E52F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 4, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_RankingHall_EventScript_25E54A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 44, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_RankingHall_EventScript_25E573", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 26, + "y": 14, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 4 + }, + { + "x": 27, + "y": 14, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 26, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4AA" + }, + { + "type": "sign", + "x": 23, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4B6" + }, + { + "type": "sign", + "x": 26, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4C2" + }, + { + "type": "sign", + "x": 29, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4CE" + }, + { + "type": "sign", + "x": 42, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4DA" + }, + { + "type": "sign", + "x": 46, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4E6" + }, + { + "type": "sign", + "x": 10, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4F2" + }, + { + "type": "sign", + "x": 8, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4FE" + }, + { + "type": "sign", + "x": 6, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E50A" + }, + { + "type": "sign", + "x": 44, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E516" + }, + { + "type": "sign", + "x": 16, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_RankingHall_EventScript_25E538" + }, + { + "type": "sign", + "x": 36, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_RankingHall_EventScript_25E541" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_ReceptionGate/events.inc b/data/maps/BattleFrontier_ReceptionGate/events.inc deleted file mode 100644 index c1e55ad870..0000000000 --- a/data/maps/BattleFrontier_ReceptionGate/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -BattleFrontier_ReceptionGate_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0 - object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0 - object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0 - -BattleFrontier_ReceptionGate_MapWarps: - warp_def 4, 13, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 4, 1, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_ReceptionGate_MapEvents:: - map_events BattleFrontier_ReceptionGate_EventObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc deleted file mode 100644 index 46a55a6b1c..0000000000 --- a/data/maps/BattleFrontier_ReceptionGate/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_ReceptionGate: - .4byte BattleFrontier_ReceptionGate_Layout - .4byte BattleFrontier_ReceptionGate_MapEvents - .4byte BattleFrontier_ReceptionGate_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_ReceptionGate/map.json b/data/maps/BattleFrontier_ReceptionGate/map.json new file mode 100644 index 0000000000..ffde653f74 --- /dev/null +++ b/data/maps/BattleFrontier_ReceptionGate/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_BATTLE_FRONTIER_RECEPTION_GATE", + "name": "BattleFrontier_ReceptionGate", + "layout": "LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 0, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_ReceptionGate_EventScript_2662FC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 8, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_ReceptionGate_EventScript_266310", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 8, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_ReceptionGate_EventScript_266436", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 0, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_ReceptionGate_EventScript_2664F4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 13, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 8 + }, + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_ScottsHouse/events.inc b/data/maps/BattleFrontier_ScottsHouse/events.inc deleted file mode 100644 index acb02c4d8f..0000000000 --- a/data/maps/BattleFrontier_ScottsHouse/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BattleFrontier_ScottsHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0 - -BattleFrontier_ScottsHouse_MapWarps: - warp_def 2, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 3, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_ScottsHouse_MapEvents:: - map_events BattleFrontier_ScottsHouse_EventObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc deleted file mode 100644 index ff41a82e33..0000000000 --- a/data/maps/BattleFrontier_ScottsHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_ScottsHouse: - .4byte BattleFrontier_ScottsHouse_Layout - .4byte BattleFrontier_ScottsHouse_MapEvents - .4byte BattleFrontier_ScottsHouse_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_ScottsHouse/map.json b/data/maps/BattleFrontier_ScottsHouse/map.json new file mode 100644 index 0000000000..aa6003a862 --- /dev/null +++ b/data/maps/BattleFrontier_ScottsHouse/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_BATTLE_FRONTIER_SCOTTS_HOUSE", + "name": "BattleFrontier_ScottsHouse", + "layout": "LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_ScottsHouse_EventScript_2636A8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 7, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 5 + }, + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare01/events.inc b/data/maps/BattlePyramidSquare01/events.inc deleted file mode 100644 index bcc81b36cc..0000000000 --- a/data/maps/BattlePyramidSquare01/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare01_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 5, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 6, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare01_MapEvents:: - map_events BattlePyramidSquare01_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc deleted file mode 100644 index e63919e43e..0000000000 --- a/data/maps/BattlePyramidSquare01/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare01: - .4byte BattlePyramidSquare01_Layout - .4byte BattlePyramidSquare01_MapEvents - .4byte BattlePyramidSquare01_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE01 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare01/map.json b/data/maps/BattlePyramidSquare01/map.json new file mode 100644 index 0000000000..38320ece64 --- /dev/null +++ b/data/maps/BattlePyramidSquare01/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE01", + "name": "BattlePyramidSquare01", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE01", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 2, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 5, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 2, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 6, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare02/events.inc b/data/maps/BattlePyramidSquare02/events.inc deleted file mode 100644 index 978c559825..0000000000 --- a/data/maps/BattlePyramidSquare02/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare02_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_TWIN, 0, 5, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare02_MapEvents:: - map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc deleted file mode 100644 index 61a1272cf4..0000000000 --- a/data/maps/BattlePyramidSquare02/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare02: - .4byte BattlePyramidSquare02_Layout - .4byte BattlePyramidSquare02_MapEvents - .4byte BattlePyramidSquare02_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE02 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare02/map.json b/data/maps/BattlePyramidSquare02/map.json new file mode 100644 index 0000000000..0dc6f713a0 --- /dev/null +++ b/data/maps/BattlePyramidSquare02/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE02", + "name": "BattlePyramidSquare02", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE02", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 2, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 5, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 2, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 5, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare03/events.inc b/data/maps/BattlePyramidSquare03/events.inc deleted file mode 100644 index 339010e8a3..0000000000 --- a/data/maps/BattlePyramidSquare03/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare03_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 6, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare03_MapEvents:: - map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc deleted file mode 100644 index ef7663ed0c..0000000000 --- a/data/maps/BattlePyramidSquare03/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare03: - .4byte BattlePyramidSquare03_Layout - .4byte BattlePyramidSquare03_MapEvents - .4byte BattlePyramidSquare03_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE03 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare03/map.json b/data/maps/BattlePyramidSquare03/map.json new file mode 100644 index 0000000000..4e446e24b9 --- /dev/null +++ b/data/maps/BattlePyramidSquare03/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE03", + "name": "BattlePyramidSquare03", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE03", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 2, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 6, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 3, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare04/events.inc b/data/maps/BattlePyramidSquare04/events.inc deleted file mode 100644 index 4c4cf7df10..0000000000 --- a/data/maps/BattlePyramidSquare04/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare04_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 7, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 1, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare04_MapEvents:: - map_events BattlePyramidSquare04_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc deleted file mode 100644 index 7525f2b047..0000000000 --- a/data/maps/BattlePyramidSquare04/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare04: - .4byte BattlePyramidSquare04_Layout - .4byte BattlePyramidSquare04_MapEvents - .4byte BattlePyramidSquare04_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE04 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare04/map.json b/data/maps/BattlePyramidSquare04/map.json new file mode 100644 index 0000000000..67dfdaa11c --- /dev/null +++ b/data/maps/BattlePyramidSquare04/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE04", + "name": "BattlePyramidSquare04", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE04", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 7, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 7, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 1, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare05/events.inc b/data/maps/BattlePyramidSquare05/events.inc deleted file mode 100644 index fe794509b2..0000000000 --- a/data/maps/BattlePyramidSquare05/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare05_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 3, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 3, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare05_MapEvents:: - map_events BattlePyramidSquare05_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc deleted file mode 100644 index 673d29e253..0000000000 --- a/data/maps/BattlePyramidSquare05/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare05: - .4byte BattlePyramidSquare05_Layout - .4byte BattlePyramidSquare05_MapEvents - .4byte BattlePyramidSquare05_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE05 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare05/map.json b/data/maps/BattlePyramidSquare05/map.json new file mode 100644 index 0000000000..ac8bd5d7d5 --- /dev/null +++ b/data/maps/BattlePyramidSquare05/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE05", + "name": "BattlePyramidSquare05", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE05", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 3, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 3, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 6, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare06/events.inc b/data/maps/BattlePyramidSquare06/events.inc deleted file mode 100644 index a7a1776e74..0000000000 --- a/data/maps/BattlePyramidSquare06/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare06_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 5, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 5, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare06_MapEvents:: - map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc deleted file mode 100644 index 2487c4a94b..0000000000 --- a/data/maps/BattlePyramidSquare06/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare06: - .4byte BattlePyramidSquare06_Layout - .4byte BattlePyramidSquare06_MapEvents - .4byte BattlePyramidSquare06_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE06 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare06/map.json b/data/maps/BattlePyramidSquare06/map.json new file mode 100644 index 0000000000..d9fa40ccd0 --- /dev/null +++ b/data/maps/BattlePyramidSquare06/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE06", + "name": "BattlePyramidSquare06", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE06", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 5, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 2, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 5, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 2, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare07/events.inc b/data/maps/BattlePyramidSquare07/events.inc deleted file mode 100644 index 85e9876264..0000000000 --- a/data/maps/BattlePyramidSquare07/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare07_EventObjects: - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 4, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 4, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare07_MapEvents:: - map_events BattlePyramidSquare07_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc deleted file mode 100644 index aa31ddcb0a..0000000000 --- a/data/maps/BattlePyramidSquare07/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare07: - .4byte BattlePyramidSquare07_Layout - .4byte BattlePyramidSquare07_MapEvents - .4byte BattlePyramidSquare07_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE07 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare07/map.json b/data/maps/BattlePyramidSquare07/map.json new file mode 100644 index 0000000000..a097f60ba2 --- /dev/null +++ b/data/maps/BattlePyramidSquare07/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE07", + "name": "BattlePyramidSquare07", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE07", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 0, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 4, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 6, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 4, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare08/events.inc b/data/maps/BattlePyramidSquare08/events.inc deleted file mode 100644 index dac62da218..0000000000 --- a/data/maps/BattlePyramidSquare08/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare08_EventObjects: - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 2, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare08_MapEvents:: - map_events BattlePyramidSquare08_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc deleted file mode 100644 index f579f958ba..0000000000 --- a/data/maps/BattlePyramidSquare08/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare08: - .4byte BattlePyramidSquare08_Layout - .4byte BattlePyramidSquare08_MapEvents - .4byte BattlePyramidSquare08_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE08 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare08/map.json b/data/maps/BattlePyramidSquare08/map.json new file mode 100644 index 0000000000..6939b8a7e4 --- /dev/null +++ b/data/maps/BattlePyramidSquare08/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE08", + "name": "BattlePyramidSquare08", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE08", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 1, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 6, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 1, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 6, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare09/events.inc b/data/maps/BattlePyramidSquare09/events.inc deleted file mode 100644 index 17a4a1e383..0000000000 --- a/data/maps/BattlePyramidSquare09/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare09_EventObjects: - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 3, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare09_MapEvents:: - map_events BattlePyramidSquare09_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc deleted file mode 100644 index 6dac1b9fe9..0000000000 --- a/data/maps/BattlePyramidSquare09/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare09: - .4byte BattlePyramidSquare09_Layout - .4byte BattlePyramidSquare09_MapEvents - .4byte BattlePyramidSquare09_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE09 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare09/map.json b/data/maps/BattlePyramidSquare09/map.json new file mode 100644 index 0000000000..56380e9914 --- /dev/null +++ b/data/maps/BattlePyramidSquare09/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE09", + "name": "BattlePyramidSquare09", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE09", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 3, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 6, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 3, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare10/events.inc b/data/maps/BattlePyramidSquare10/events.inc deleted file mode 100644 index f172155f9f..0000000000 --- a/data/maps/BattlePyramidSquare10/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare10_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare10_MapEvents:: - map_events BattlePyramidSquare10_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc deleted file mode 100644 index ac899c718b..0000000000 --- a/data/maps/BattlePyramidSquare10/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare10: - .4byte BattlePyramidSquare10_Layout - .4byte BattlePyramidSquare10_MapEvents - .4byte BattlePyramidSquare10_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE10 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare10/map.json b/data/maps/BattlePyramidSquare10/map.json new file mode 100644 index 0000000000..33534391bf --- /dev/null +++ b/data/maps/BattlePyramidSquare10/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE10", + "name": "BattlePyramidSquare10", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE10", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 3, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 0, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 6, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 0, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare11/events.inc b/data/maps/BattlePyramidSquare11/events.inc deleted file mode 100644 index 60c5e0e2de..0000000000 --- a/data/maps/BattlePyramidSquare11/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare11_EventObjects: - object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 2, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 6, 4, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare11_MapEvents:: - map_events BattlePyramidSquare11_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc deleted file mode 100644 index ca560a4a70..0000000000 --- a/data/maps/BattlePyramidSquare11/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare11: - .4byte BattlePyramidSquare11_Layout - .4byte BattlePyramidSquare11_MapEvents - .4byte BattlePyramidSquare11_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE11 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare11/map.json b/data/maps/BattlePyramidSquare11/map.json new file mode 100644 index 0000000000..f22855aa24 --- /dev/null +++ b/data/maps/BattlePyramidSquare11/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE11", + "name": "BattlePyramidSquare11", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE11", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 3, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 3, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 6, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare12/events.inc b/data/maps/BattlePyramidSquare12/events.inc deleted file mode 100644 index 7c650b972c..0000000000 --- a/data/maps/BattlePyramidSquare12/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare12_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 7, 5, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 3, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare12_MapEvents:: - map_events BattlePyramidSquare12_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc deleted file mode 100644 index 59793abe7e..0000000000 --- a/data/maps/BattlePyramidSquare12/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare12: - .4byte BattlePyramidSquare12_Layout - .4byte BattlePyramidSquare12_MapEvents - .4byte BattlePyramidSquare12_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE12 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare12/map.json b/data/maps/BattlePyramidSquare12/map.json new file mode 100644 index 0000000000..d8e0d45a9c --- /dev/null +++ b/data/maps/BattlePyramidSquare12/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE12", + "name": "BattlePyramidSquare12", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE12", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 7, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 0, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 3, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 3, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare13/events.inc b/data/maps/BattlePyramidSquare13/events.inc deleted file mode 100644 index 90d427f2dc..0000000000 --- a/data/maps/BattlePyramidSquare13/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare13_EventObjects: - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 6, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare13_MapEvents:: - map_events BattlePyramidSquare13_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc deleted file mode 100644 index d0012926c5..0000000000 --- a/data/maps/BattlePyramidSquare13/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare13: - .4byte BattlePyramidSquare13_Layout - .4byte BattlePyramidSquare13_MapEvents - .4byte BattlePyramidSquare13_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE13 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare13/map.json b/data/maps/BattlePyramidSquare13/map.json new file mode 100644 index 0000000000..880178e0e3 --- /dev/null +++ b/data/maps/BattlePyramidSquare13/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE13", + "name": "BattlePyramidSquare13", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE13", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 5, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 5, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 1, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 1, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare14/events.inc b/data/maps/BattlePyramidSquare14/events.inc deleted file mode 100644 index 80f28a83ab..0000000000 --- a/data/maps/BattlePyramidSquare14/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare14_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare14_MapEvents:: - map_events BattlePyramidSquare14_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc deleted file mode 100644 index 049d9ec94d..0000000000 --- a/data/maps/BattlePyramidSquare14/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare14: - .4byte BattlePyramidSquare14_Layout - .4byte BattlePyramidSquare14_MapEvents - .4byte BattlePyramidSquare14_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE14 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare14/map.json b/data/maps/BattlePyramidSquare14/map.json new file mode 100644 index 0000000000..423346532a --- /dev/null +++ b/data/maps/BattlePyramidSquare14/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE14", + "name": "BattlePyramidSquare14", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE14", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 7, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 1, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 6, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 0, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare15/events.inc b/data/maps/BattlePyramidSquare15/events.inc deleted file mode 100644 index 3781ec3dbf..0000000000 --- a/data/maps/BattlePyramidSquare15/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare15_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare15_MapEvents:: - map_events BattlePyramidSquare15_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc deleted file mode 100644 index 980402c21b..0000000000 --- a/data/maps/BattlePyramidSquare15/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare15: - .4byte BattlePyramidSquare15_Layout - .4byte BattlePyramidSquare15_MapEvents - .4byte BattlePyramidSquare15_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE15 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare15/map.json b/data/maps/BattlePyramidSquare15/map.json new file mode 100644 index 0000000000..12b1f4cb8c --- /dev/null +++ b/data/maps/BattlePyramidSquare15/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE15", + "name": "BattlePyramidSquare15", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE15", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 2, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 2, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 6, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare16/events.inc b/data/maps/BattlePyramidSquare16/events.inc deleted file mode 100644 index 973d7c0ef1..0000000000 --- a/data/maps/BattlePyramidSquare16/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare16_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 0, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare16_MapEvents:: - map_events BattlePyramidSquare16_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc deleted file mode 100644 index b51e9692c1..0000000000 --- a/data/maps/BattlePyramidSquare16/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare16: - .4byte BattlePyramidSquare16_Layout - .4byte BattlePyramidSquare16_MapEvents - .4byte BattlePyramidSquare16_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE16 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare16/map.json b/data/maps/BattlePyramidSquare16/map.json new file mode 100644 index 0000000000..65fa0a361d --- /dev/null +++ b/data/maps/BattlePyramidSquare16/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE16", + "name": "BattlePyramidSquare16", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE16", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 0, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 1, + "y": 0, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 6, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 6, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BirthIsland_Exterior/events.inc b/data/maps/BirthIsland_Exterior/events.inc deleted file mode 100644 index daf780f739..0000000000 --- a/data/maps/BirthIsland_Exterior/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BirthIsland_Exterior_EventObjects: - object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE - object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_DEOXYS - -BirthIsland_Exterior_MapWarps: - warp_def 15, 24, 0, 0, MAP_BIRTH_ISLAND_HARBOR - -BirthIsland_Exterior_MapEvents:: - map_events BirthIsland_Exterior_EventObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc deleted file mode 100644 index 71af6d880e..0000000000 --- a/data/maps/BirthIsland_Exterior/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BirthIsland_Exterior: - .4byte BirthIsland_Exterior_Layout - .4byte BirthIsland_Exterior_MapEvents - .4byte BirthIsland_Exterior_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BIRTH_ISLAND_EXTERIOR - .byte MAPSEC_BIRTH_ISLAND_2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json new file mode 100644 index 0000000000..43ffc5d44f --- /dev/null +++ b/data/maps/BirthIsland_Exterior/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_BIRTH_ISLAND_EXTERIOR", + "name": "BirthIsland_Exterior", + "layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR", + "music": "65535", + "region_map_section": "MAPSEC_BIRTH_ISLAND_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_DEOXYS_TRIANGLE", + "x": 15, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BirthIsland_Exterior_EventScript_267F83", + "flag": "FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_DEOXYS", + "x": 15, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_DEOXYS" + } + ], + "warp_events": [ + { + "x": 15, + "y": 24, + "elevation": 0, + "dest_map": "MAP_BIRTH_ISLAND_HARBOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BirthIsland_Harbor/events.inc b/data/maps/BirthIsland_Harbor/events.inc deleted file mode 100644 index 1cbef28746..0000000000 --- a/data/maps/BirthIsland_Harbor/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BirthIsland_Harbor_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - -BirthIsland_Harbor_MapWarps: - warp_def 8, 2, 0, 0, MAP_BIRTH_ISLAND_EXTERIOR - -BirthIsland_Harbor_MapEvents:: - map_events BirthIsland_Harbor_EventObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc deleted file mode 100644 index e3b3d53b29..0000000000 --- a/data/maps/BirthIsland_Harbor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BirthIsland_Harbor: - .4byte IslandHarbor_Layout - .4byte BirthIsland_Harbor_MapEvents - .4byte BirthIsland_Harbor_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_ISLAND_HARBOR - .byte MAPSEC_BIRTH_ISLAND_2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json new file mode 100644 index 0000000000..f55cf8e930 --- /dev/null +++ b/data/maps/BirthIsland_Harbor/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_BIRTH_ISLAND_HARBOR", + "name": "BirthIsland_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "65535", + "region_map_section": "MAPSEC_BIRTH_ISLAND_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 8, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BirthIsland_Harbor_EventScript_26805D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 8, + "y": 7, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 0, + "dest_map": "MAP_BIRTH_ISLAND_EXTERIOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_1F/events.inc b/data/maps/CaveOfOrigin_1F/events.inc deleted file mode 100644 index 098938279f..0000000000 --- a/data/maps/CaveOfOrigin_1F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -CaveOfOrigin_1F_MapWarps: - warp_def 11, 17, 3, 1, MAP_CAVE_OF_ORIGIN_ENTRANCE - warp_def 14, 5, 3, 0, MAP_CAVE_OF_ORIGIN_B1F - -CaveOfOrigin_1F_MapEvents:: - map_events 0x0, CaveOfOrigin_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc deleted file mode 100644 index df0e323d09..0000000000 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_1F: - .4byte CaveOfOrigin_1F_Layout - .4byte CaveOfOrigin_1F_MapEvents - .4byte CaveOfOrigin_1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_CAVE_OF_ORIGIN_1F - .byte MAPSEC_CAVE_OF_ORIGIN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json new file mode 100644 index 0000000000..989b1cf305 --- /dev/null +++ b/data/maps/CaveOfOrigin_1F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_CAVE_OF_ORIGIN_1F", + "name": "CaveOfOrigin_1F", + "layout": "LAYOUT_CAVE_OF_ORIGIN_1F", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 17, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 5, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_B1F/events.inc b/data/maps/CaveOfOrigin_B1F/events.inc deleted file mode 100644 index 0028301c95..0000000000 --- a/data/maps/CaveOfOrigin_B1F/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -CaveOfOrigin_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE - -CaveOfOrigin_B1F_MapWarps: - warp_def 9, 3, 3, 1, MAP_CAVE_OF_ORIGIN_1F - -CaveOfOrigin_B1F_MapEvents:: - map_events CaveOfOrigin_B1F_EventObjects, CaveOfOrigin_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc deleted file mode 100644 index 200c90bfdc..0000000000 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_B1F: - .4byte CaveOfOrigin_B1F_Layout - .4byte CaveOfOrigin_B1F_MapEvents - .4byte CaveOfOrigin_B1F_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_CAVE_OF_ORIGIN_B1F - .byte MAPSEC_CAVE_OF_ORIGIN - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json new file mode 100644 index 0000000000..f8c5848454 --- /dev/null +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_CAVE_OF_ORIGIN_B1F", + "name": "CaveOfOrigin_B1F", + "layout": "LAYOUT_CAVE_OF_ORIGIN_B1F", + "music": "65535", + "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "x": 9, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CaveOfOrigin_B1F_EventScript_2357A9", + "flag": "FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE" + } + ], + "warp_events": [ + { + "x": 9, + "y": 3, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_Entrance/events.inc b/data/maps/CaveOfOrigin_Entrance/events.inc deleted file mode 100644 index 235e4afa0f..0000000000 --- a/data/maps/CaveOfOrigin_Entrance/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -CaveOfOrigin_Entrance_MapWarps: - warp_def 9, 20, 3, 3, MAP_SOOTOPOLIS_CITY - warp_def 9, 5, 3, 0, MAP_CAVE_OF_ORIGIN_1F - -CaveOfOrigin_Entrance_MapEvents:: - map_events 0x0, CaveOfOrigin_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc deleted file mode 100644 index afbbd0312e..0000000000 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_Entrance: - .4byte CaveOfOrigin_Entrance_Layout - .4byte CaveOfOrigin_Entrance_MapEvents - .4byte CaveOfOrigin_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_CAVE_OF_ORIGIN_ENTRANCE - .byte MAPSEC_CAVE_OF_ORIGIN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/CaveOfOrigin_Entrance/map.json b/data/maps/CaveOfOrigin_Entrance/map.json new file mode 100644 index 0000000000..07c7af816d --- /dev/null +++ b/data/maps/CaveOfOrigin_Entrance/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_CAVE_OF_ORIGIN_ENTRANCE", + "name": "CaveOfOrigin_Entrance", + "layout": "LAYOUT_CAVE_OF_ORIGIN_ENTRANCE", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 9, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 3 + }, + { + "x": 9, + "y": 5, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc deleted file mode 100644 index eeb07e63af..0000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: - warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F - warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 - -CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: - map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc deleted file mode 100644 index e0fea7bd5e..0000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap1: - .4byte CaveOfOrigin_UnusedRubySapphireMap1_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapEvents - .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 - .byte MAPSEC_CAVE_OF_ORIGIN - .byte 1 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json new file mode 100644 index 0000000000..e131e4f0c7 --- /dev/null +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1", + "name": "CaveOfOrigin_UnusedRubySapphireMap1", + "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", + "requires_flash": true, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 13, + "y": 5, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 11, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc deleted file mode 100644 index 1a8e841b78..0000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: - warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 - warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 - -CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: - map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc deleted file mode 100644 index e8e7c0c793..0000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap2: - .4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapEvents - .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 - .byte MAPSEC_CAVE_OF_ORIGIN - .byte 1 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json new file mode 100644 index 0000000000..8b83029e3a --- /dev/null +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", + "name": "CaveOfOrigin_UnusedRubySapphireMap2", + "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", + "requires_flash": true, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 10, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 14, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc deleted file mode 100644 index e1cacec432..0000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: - warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 - warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B1F - -CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: - map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc deleted file mode 100644 index ec55cb0ffb..0000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap3: - .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapEvents - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 - .byte MAPSEC_CAVE_OF_ORIGIN - .byte 1 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json new file mode 100644 index 0000000000..2b7c6db194 --- /dev/null +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3", + "name": "CaveOfOrigin_UnusedRubySapphireMap3", + "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", + "requires_flash": true, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 7, + "y": 14, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 6, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc deleted file mode 100644 index 88dad2c289..0000000000 --- a/data/maps/DesertRuins/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -DesertRuins_EventObjects: - object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, FLAG_HIDE_REGIROCK - -DesertRuins_MapWarps: - warp_def 8, 29, 3, 1, MAP_ROUTE111 - warp_def 8, 20, 0, 2, MAP_DESERT_RUINS - warp_def 8, 11, 3, 1, MAP_DESERT_RUINS - -DesertRuins_MapBGEvents: - bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9DB - bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9F8 - bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9F8 - -DesertRuins_MapEvents:: - map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents - diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc deleted file mode 100644 index f0af5f2e05..0000000000 --- a/data/maps/DesertRuins/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DesertRuins: - .4byte DesertRuins_Layout - .4byte DesertRuins_MapEvents - .4byte DesertRuins_MapScripts - .4byte 0x0 - .2byte MUS_MABOROSI - .2byte LAYOUT_DESERT_RUINS - .byte MAPSEC_DESERT_RUINS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json new file mode 100644 index 0000000000..439611a39b --- /dev/null +++ b/data/maps/DesertRuins/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_DESERT_RUINS", + "name": "DesertRuins", + "layout": "LAYOUT_DESERT_RUINS", + "music": "MUS_MABOROSI", + "region_map_section": "MAPSEC_DESERT_RUINS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_REGIROCK", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DesertRuins_EventScript_22DA02", + "flag": "FLAG_HIDE_REGIROCK" + } + ], + "warp_events": [ + { + "x": 8, + "y": 29, + "elevation": 3, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 20, + "elevation": 0, + "dest_map": "MAP_DESERT_RUINS", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 11, + "elevation": 3, + "dest_map": "MAP_DESERT_RUINS", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DesertRuins_EventScript_22D9DB" + }, + { + "type": "sign", + "x": 7, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DesertRuins_EventScript_22D9F8" + }, + { + "type": "sign", + "x": 9, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DesertRuins_EventScript_22D9F8" + } + ] +} \ No newline at end of file diff --git a/data/maps/DesertUnderpass/events.inc b/data/maps/DesertUnderpass/events.inc deleted file mode 100644 index 25497be276..0000000000 --- a/data/maps/DesertUnderpass/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -DesertUnderpass_EventObjects: - object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, FLAG_HIDE_DESERT_UNDERPASS_FOSSIL - -DesertUnderpass_MapWarps: - warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL - -DesertUnderpass_MapEvents:: - map_events DesertUnderpass_EventObjects, DesertUnderpass_MapWarps, 0x0, 0x0 - diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc deleted file mode 100644 index ca7ab5254a..0000000000 --- a/data/maps/DesertUnderpass/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DesertUnderpass: - .4byte DesertUnderpass_Layout - .4byte DesertUnderpass_MapEvents - .4byte DesertUnderpass_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_DESERT_UNDERPASS - .byte MAPSEC_DESERT_UNDERPASS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json new file mode 100644 index 0000000000..3a16f2c5d1 --- /dev/null +++ b/data/maps/DesertUnderpass/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_DESERT_UNDERPASS", + "name": "DesertUnderpass", + "layout": "LAYOUT_DESERT_UNDERPASS", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_DESERT_UNDERPASS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "x": 132, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DesertUnderpass_EventScript_23AF41", + "flag": "FLAG_HIDE_DESERT_UNDERPASS_FOSSIL" + } + ], + "warp_events": [ + { + "x": 10, + "y": 12, + "elevation": 0, + "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DewfordTown/connections.inc b/data/maps/DewfordTown/connections.inc deleted file mode 100644 index 294bf9956a..0000000000 --- a/data/maps/DewfordTown/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -DewfordTown_MapConnectionsList: - connection up, -60, MAP_ROUTE106 - connection right, 0, MAP_ROUTE107 - -DewfordTown_MapConnections: - .4byte 2 - .4byte DewfordTown_MapConnectionsList - diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc deleted file mode 100644 index 0b9036029f..0000000000 --- a/data/maps/DewfordTown/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -DewfordTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0 - object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0 - -DewfordTown_MapWarps: - warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL - warp_def 2, 10, 0, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F - warp_def 8, 17, 0, 0, MAP_DEWFORD_TOWN_GYM - warp_def 17, 14, 0, 0, MAP_DEWFORD_TOWN_HOUSE1 - warp_def 8, 8, 0, 0, MAP_DEWFORD_TOWN_HOUSE2 - -DewfordTown_MapBGEvents: - bg_event 10, 10, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95BA - bg_event 11, 16, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95C3 - bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_271E73 - bg_event 3, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_271E73 - bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95CC - -DewfordTown_MapEvents:: - map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents - diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc deleted file mode 100644 index 03c5b689b4..0000000000 --- a/data/maps/DewfordTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown: - .4byte DewfordTown_Layout - .4byte DewfordTown_MapEvents - .4byte DewfordTown_MapScripts - .4byte DewfordTown_MapConnections - .2byte MUS_HIGHTOWN - .2byte LAYOUT_DEWFORD_TOWN - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json new file mode 100644 index 0000000000..64e70fe7fd --- /dev/null +++ b/data/maps/DewfordTown/map.json @@ -0,0 +1,174 @@ +{ + "id": "MAP_DEWFORD_TOWN", + "name": "DewfordTown", + "layout": "LAYOUT_DEWFORD_TOWN", + "music": "MUS_HIGHTOWN", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": -60, + "map": "MAP_ROUTE106" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE107" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_EventScript_1E95B1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 12, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 3, + "script": "DewfordTown_EventScript_1E9511", + "flag": "FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 12, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_EventScript_1E95D5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "x": 12, + "y": 8, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_EventScript_1E9922", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN_HALL", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 10, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 17, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN_GYM", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 14, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 8, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN_HOUSE2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 10, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DewfordTown_EventScript_1E95BA" + }, + { + "type": "sign", + "x": 11, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DewfordTown_EventScript_1E95C3" + }, + { + "type": "sign", + "x": 4, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "DewfordTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 3, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "DewfordTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 2, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DewfordTown_EventScript_1E95CC" + } + ] +} \ No newline at end of file diff --git a/data/maps/DewfordTown_Gym/events.inc b/data/maps/DewfordTown_Gym/events.inc deleted file mode 100644 index c3b718f194..0000000000 --- a/data/maps/DewfordTown_Gym/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -DewfordTown_Gym_EventObjects: - object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 4, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 18, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 24, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 8, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0 - object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 16, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0 - object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 14, 12, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0 - -DewfordTown_Gym_MapWarps: - warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN - warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN - -DewfordTown_Gym_MapBGEvents: - bg_event 4, 23, 3, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9A2 - bg_event 7, 23, 3, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9B2 - bg_event 4, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9A2 - bg_event 7, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9B2 - -DewfordTown_Gym_MapEvents:: - map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents - diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc deleted file mode 100644 index 72b93573b7..0000000000 --- a/data/maps/DewfordTown_Gym/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_Gym: - .4byte DewfordTown_Gym_Layout - .4byte DewfordTown_Gym_MapEvents - .4byte DewfordTown_Gym_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_DEWFORD_TOWN_GYM - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json new file mode 100644 index 0000000000..e42e4ffe8b --- /dev/null +++ b/data/maps/DewfordTown_Gym/map.json @@ -0,0 +1,173 @@ +{ + "id": "MAP_DEWFORD_TOWN_GYM", + "name": "DewfordTown_Gym", + "layout": "LAYOUT_DEWFORD_TOWN_GYM", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BRAWLY", + "x": 4, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Gym_EventScript_1FC7C2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 2, + "y": 18, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "DewfordTown_Gym_EventScript_1FC8B7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 15, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "DewfordTown_Gym_EventScript_1FC8D9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 12, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "DewfordTown_Gym_EventScript_1FC8FB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 5, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Gym_EventScript_1FC983", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 7, + "y": 8, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "DewfordTown_Gym_EventScript_1FC93F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 16, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "DewfordTown_Gym_EventScript_1FC961", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 14, + "y": 12, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "DewfordTown_Gym_EventScript_1FC91D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 27, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 27, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 23, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "DewfordTown_Gym_EventScript_1FC9A2" + }, + { + "type": "sign", + "x": 7, + "y": 23, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "DewfordTown_Gym_EventScript_1FC9B2" + }, + { + "type": "sign", + "x": 4, + "y": 24, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "DewfordTown_Gym_EventScript_1FC9A2" + }, + { + "type": "sign", + "x": 7, + "y": 24, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "DewfordTown_Gym_EventScript_1FC9B2" + } + ] +} \ No newline at end of file diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc deleted file mode 100644 index 7fc332f90a..0000000000 --- a/data/maps/DewfordTown_Hall/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -DewfordTown_Hall_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0 - object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 3, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0 - object_event 5, EVENT_OBJ_GFX_TWIN, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY, 0, 14, 7, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0 - object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0 - object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN - -DewfordTown_Hall_MapWarps: - warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN - warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN - -DewfordTown_Hall_MapBGEvents: - bg_event 0, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_1FD590 - bg_event 7, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_1FD5A0 - -DewfordTown_Hall_MapEvents:: - map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents - diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc deleted file mode 100644 index 4fc39cf215..0000000000 --- a/data/maps/DewfordTown_Hall/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_Hall: - .4byte DewfordTown_Hall_Layout - .4byte DewfordTown_Hall_MapEvents - .4byte DewfordTown_Hall_MapScripts - .4byte 0x0 - .2byte MUS_HIGHTOWN - .2byte LAYOUT_DEWFORD_TOWN_HALL - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json new file mode 100644 index 0000000000..f6a8dac7ba --- /dev/null +++ b/data/maps/DewfordTown_Hall/map.json @@ -0,0 +1,170 @@ +{ + "id": "MAP_DEWFORD_TOWN_HALL", + "name": "DewfordTown_Hall", + "layout": "LAYOUT_DEWFORD_TOWN_HALL", + "music": "MUS_HIGHTOWN", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 4, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD4D0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 1, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD4F9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 5, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD50A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 9, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD547", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD563", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 14, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD57F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 12, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD62F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 15, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD63B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD7DA", + "flag": "FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 0, + "y": 1, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DewfordTown_Hall_EventScript_1FD590" + }, + { + "type": "sign", + "x": 7, + "y": 1, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DewfordTown_Hall_EventScript_1FD5A0" + } + ] +} \ No newline at end of file diff --git a/data/maps/DewfordTown_House1/events.inc b/data/maps/DewfordTown_House1/events.inc deleted file mode 100644 index a9c8b0ae5f..0000000000 --- a/data/maps/DewfordTown_House1/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -DewfordTown_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0 - object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 1, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0 - -DewfordTown_House1_MapWarps: - warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN - warp_def 4, 7, 0, 3, MAP_DEWFORD_TOWN - -DewfordTown_House1_MapEvents:: - map_events DewfordTown_House1_EventObjects, DewfordTown_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc deleted file mode 100644 index 9f4eec0325..0000000000 --- a/data/maps/DewfordTown_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_House1: - .4byte House3_Layout - .4byte DewfordTown_House1_MapEvents - .4byte DewfordTown_House1_MapScripts - .4byte 0x0 - .2byte MUS_HIGHTOWN - .2byte LAYOUT_HOUSE3 - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json new file mode 100644 index 0000000000..fbc3e02ed1 --- /dev/null +++ b/data/maps/DewfordTown_House1/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_DEWFORD_TOWN_HOUSE1", + "name": "DewfordTown_House1", + "layout": "LAYOUT_HOUSE3", + "music": "MUS_HIGHTOWN", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_House1_EventScript_1FC3D7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_House1_EventScript_1FC3CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_House1_EventScript_1FC3E0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DewfordTown_House2/events.inc b/data/maps/DewfordTown_House2/events.inc deleted file mode 100644 index 9f3801afac..0000000000 --- a/data/maps/DewfordTown_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -DewfordTown_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0 - -DewfordTown_House2_MapWarps: - warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN - warp_def 4, 8, 0, 4, MAP_DEWFORD_TOWN - -DewfordTown_House2_MapEvents:: - map_events DewfordTown_House2_EventObjects, DewfordTown_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc deleted file mode 100644 index ec8359b68d..0000000000 --- a/data/maps/DewfordTown_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_House2: - .4byte House4_Layout - .4byte DewfordTown_House2_MapEvents - .4byte DewfordTown_House2_MapScripts - .4byte 0x0 - .2byte MUS_HIGHTOWN - .2byte LAYOUT_HOUSE4 - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json new file mode 100644 index 0000000000..742fde7064 --- /dev/null +++ b/data/maps/DewfordTown_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_DEWFORD_TOWN_HOUSE2", + "name": "DewfordTown_House2", + "layout": "LAYOUT_HOUSE4", + "music": "MUS_HIGHTOWN", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_House2_EventScript_1FE22E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_House2_EventScript_1FE271", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DewfordTown_PokemonCenter_1F/events.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc deleted file mode 100644 index 86c42ffab3..0000000000 --- a/data/maps/DewfordTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -DewfordTown_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0 - -DewfordTown_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN - warp_def 6, 8, 3, 1, MAP_DEWFORD_TOWN - warp_def 1, 6, 4, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_2F - -DewfordTown_PokemonCenter_1F_MapEvents:: - map_events DewfordTown_PokemonCenter_1F_EventObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc deleted file mode 100644 index b6aa6f7917..0000000000 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte DewfordTown_PokemonCenter_1F_MapEvents - .4byte DewfordTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..137b9f5e9a --- /dev/null +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F", + "name": "DewfordTown_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC537", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC545", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 5, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC54E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DewfordTown_PokemonCenter_2F/events.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc deleted file mode 100644 index eccedade46..0000000000 --- a/data/maps/DewfordTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -DewfordTown_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -DewfordTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -DewfordTown_PokemonCenter_2F_MapEvents:: - map_events DewfordTown_PokemonCenter_2F_EventObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc deleted file mode 100644 index 8bb0d81d70..0000000000 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte DewfordTown_PokemonCenter_2F_MapEvents - .4byte DewfordTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..e4f298d73f --- /dev/null +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F", + "name": "DewfordTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DoubleBattleColosseum/events.inc b/data/maps/DoubleBattleColosseum/events.inc deleted file mode 100644 index 4ea0b7f614..0000000000 --- a/data/maps/DoubleBattleColosseum/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -DoubleBattleColosseum_MapWarps: - warp_def 5, 8, 3, 127, MAP_NONE - warp_def 6, 8, 3, 127, MAP_NONE - warp_def 7, 8, 3, 127, MAP_NONE - warp_def 8, 8, 3, 127, MAP_NONE - -DoubleBattleColosseum_MapCoordEvents: - coord_event 3, 4, 3, VAR_TEMP_0, 0, gUnknown_08277388 - coord_event 3, 6, 3, VAR_TEMP_0, 0, gUnknown_082773BE - coord_event 10, 4, 3, VAR_TEMP_0, 0, gUnknown_082773A3 - coord_event 10, 6, 3, VAR_TEMP_0, 0, gUnknown_082773D9 - -DoubleBattleColosseum_MapEvents:: - map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 - diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc deleted file mode 100644 index df679a9180..0000000000 --- a/data/maps/DoubleBattleColosseum/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DoubleBattleColosseum: - .4byte DoubleBattleColosseum_Layout - .4byte DoubleBattleColosseum_MapEvents - .4byte DoubleBattleColosseum_MapScripts - .4byte 0x0 - .2byte MUS_RAINBOW - .2byte LAYOUT_DOUBLE_BATTLE_COLOSSEUM - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/DoubleBattleColosseum/map.json new file mode 100644 index 0000000000..c0cd887613 --- /dev/null +++ b/data/maps/DoubleBattleColosseum/map.json @@ -0,0 +1,86 @@ +{ + "id": "MAP_DOUBLE_BATTLE_COLOSSEUM", + "name": "DoubleBattleColosseum", + "layout": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_08277388" + }, + { + "type": "trigger", + "x": 3, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_082773BE" + }, + { + "type": "trigger", + "x": 10, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_082773A3" + }, + { + "type": "trigger", + "x": 10, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_082773D9" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity/connections.inc b/data/maps/EverGrandeCity/connections.inc deleted file mode 100644 index 78c3ba8d1b..0000000000 --- a/data/maps/EverGrandeCity/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -EverGrandeCity_MapConnectionsList: - connection left, 40, MAP_ROUTE128 - -EverGrandeCity_MapConnections: - .4byte 1 - .4byte EverGrandeCity_MapConnectionsList - diff --git a/data/maps/EverGrandeCity/events.inc b/data/maps/EverGrandeCity/events.inc deleted file mode 100644 index 9c0cd79efe..0000000000 --- a/data/maps/EverGrandeCity/events.inc +++ /dev/null @@ -1,29 +0,0 @@ -EverGrandeCity_MapWarps: - warp_def 18, 5, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 27, 48, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F - warp_def 18, 41, 0, 0, MAP_VICTORY_ROAD_1F - warp_def 18, 27, 0, 1, MAP_VICTORY_ROAD_1F - -EverGrandeCity_MapCoordEvents: - coord_event 17, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 16, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 18, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 19, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 20, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 21, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 22, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 23, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 24, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 25, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 26, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - -EverGrandeCity_MapBGEvents: - bg_event 19, 43, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D2B - bg_event 29, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_271E73 - bg_event 18, 52, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D34 - bg_event 23, 15, 0, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D3D - bg_event 28, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_271E73 - -EverGrandeCity_MapEvents:: - map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents - diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc deleted file mode 100644 index 7350945788..0000000000 --- a/data/maps/EverGrandeCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity: - .4byte EverGrandeCity_Layout - .4byte EverGrandeCity_MapEvents - .4byte EverGrandeCity_MapScripts - .4byte EverGrandeCity_MapConnections - .2byte MUS_RAINBOW - .2byte LAYOUT_EVER_GRANDE_CITY - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json new file mode 100644 index 0000000000..4812461f7c --- /dev/null +++ b/data/maps/EverGrandeCity/map.json @@ -0,0 +1,196 @@ +{ + "id": "MAP_EVER_GRANDE_CITY", + "name": "EverGrandeCity", + "layout": "LAYOUT_EVER_GRANDE_CITY", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 40, + "map": "MAP_ROUTE128" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 18, + "y": 5, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "dest_warp_id": 0 + }, + { + "x": 27, + "y": 48, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 41, + "elevation": 0, + "dest_map": "MAP_VICTORY_ROAD_1F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 27, + "elevation": 0, + "dest_map": "MAP_VICTORY_ROAD_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 17, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 16, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 18, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 19, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 20, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 21, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 22, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 23, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 24, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 25, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 26, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 19, + "y": 43, + "elevation": 5, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "EverGrandeCity_EventScript_1E7D2B" + }, + { + "type": "sign", + "x": 29, + "y": 48, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "EverGrandeCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 18, + "y": 52, + "elevation": 5, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "EverGrandeCity_EventScript_1E7D34" + }, + { + "type": "sign", + "x": 23, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "EverGrandeCity_EventScript_1E7D3D" + }, + { + "type": "sign", + "x": 28, + "y": 48, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "EverGrandeCity_EventScript_271E73" + } + ] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc deleted file mode 100644 index 846e7f60eb..0000000000 --- a/data/maps/EverGrandeCity_ChampionsRoom/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -EverGrandeCity_ChampionsRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_RIVAL - object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_BIRCH - -EverGrandeCity_ChampionsRoom_MapWarps: - warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_HALL4 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME - -EverGrandeCity_ChampionsRoom_MapEvents:: - map_events EverGrandeCity_ChampionsRoom_EventObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc deleted file mode 100644 index 0b73346855..0000000000 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_ChampionsRoom: - .4byte EverGrandeCity_ChampionsRoom_Layout - .4byte EverGrandeCity_ChampionsRoom_MapEvents - .4byte EverGrandeCity_ChampionsRoom_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json new file mode 100644 index 0000000000..0281bebc55 --- /dev/null +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM", + "name": "EverGrandeCity_ChampionsRoom", + "layout": "LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 6, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_CHAMPIONS_ROOM_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 6, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_CHAMPIONS_ROOM_BIRCH" + } + ], + "warp_events": [ + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL4", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL_OF_FAME", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_DrakesRoom/events.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc deleted file mode 100644 index 997df50453..0000000000 --- a/data/maps/EverGrandeCity_DrakesRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -EverGrandeCity_DrakesRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0 - -EverGrandeCity_DrakesRoom_MapWarps: - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL3 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL4 - -EverGrandeCity_DrakesRoom_MapEvents:: - map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc deleted file mode 100644 index 3c5b52b213..0000000000 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_DrakesRoom: - .4byte EverGrandeCity_DrakesRoom_Layout - .4byte EverGrandeCity_DrakesRoom_MapEvents - .4byte EverGrandeCity_DrakesRoom_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_DRAKE - diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json new file mode 100644 index 0000000000..92e1651e55 --- /dev/null +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM", + "name": "EverGrandeCity_DrakesRoom", + "layout": "LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_DRAKE", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_DRAKE", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_DrakesRoom_EventScript_2286F3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 13, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL3", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL4", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_GlaciasRoom/events.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc deleted file mode 100644 index abe7b85647..0000000000 --- a/data/maps/EverGrandeCity_GlaciasRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -EverGrandeCity_GlaciasRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0 - -EverGrandeCity_GlaciasRoom_MapWarps: - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL2 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL3 - -EverGrandeCity_GlaciasRoom_MapEvents:: - map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc deleted file mode 100644 index f330a321fc..0000000000 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_GlaciasRoom: - .4byte EverGrandeCity_GlaciasRoom_Layout - .4byte EverGrandeCity_GlaciasRoom_MapEvents - .4byte EverGrandeCity_GlaciasRoom_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GLACIA - diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json new file mode 100644 index 0000000000..7744894159 --- /dev/null +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", + "name": "EverGrandeCity_GlaciasRoom", + "layout": "LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GLACIA", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GLACIA", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_GlaciasRoom_EventScript_228469", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 13, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL2", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL3", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_Hall1/events.inc b/data/maps/EverGrandeCity_Hall1/events.inc deleted file mode 100644 index fd3a5584d2..0000000000 --- a/data/maps/EverGrandeCity_Hall1/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_Hall1_MapWarps: - warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM - warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM - warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM - warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM - -EverGrandeCity_Hall1_MapEvents:: - map_events 0x0, EverGrandeCity_Hall1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc deleted file mode 100644 index 1e2f0f8ebd..0000000000 --- a/data/maps/EverGrandeCity_Hall1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_Hall1: - .4byte EverGrandeCity_ShortHall_Layout - .4byte EverGrandeCity_Hall1_MapEvents - .4byte EverGrandeCity_Hall1_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_Hall1/map.json b/data/maps/EverGrandeCity_Hall1/map.json new file mode 100644 index 0000000000..1ebb9c9251 --- /dev/null +++ b/data/maps/EverGrandeCity_Hall1/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_HALL1", + "name": "EverGrandeCity_Hall1", + "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_Hall2/events.inc b/data/maps/EverGrandeCity_Hall2/events.inc deleted file mode 100644 index e9b8ab0561..0000000000 --- a/data/maps/EverGrandeCity_Hall2/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_Hall2_MapWarps: - warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM - warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM - warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM - warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM - -EverGrandeCity_Hall2_MapEvents:: - map_events 0x0, EverGrandeCity_Hall2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc deleted file mode 100644 index 2422915425..0000000000 --- a/data/maps/EverGrandeCity_Hall2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_Hall2: - .4byte EverGrandeCity_ShortHall_Layout - .4byte EverGrandeCity_Hall2_MapEvents - .4byte EverGrandeCity_Hall2_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_Hall2/map.json b/data/maps/EverGrandeCity_Hall2/map.json new file mode 100644 index 0000000000..0631c14f0f --- /dev/null +++ b/data/maps/EverGrandeCity_Hall2/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_HALL2", + "name": "EverGrandeCity_Hall2", + "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_Hall3/events.inc b/data/maps/EverGrandeCity_Hall3/events.inc deleted file mode 100644 index 3e792fd1b1..0000000000 --- a/data/maps/EverGrandeCity_Hall3/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_Hall3_MapWarps: - warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM - warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_DRAKES_ROOM - warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM - warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM - -EverGrandeCity_Hall3_MapEvents:: - map_events 0x0, EverGrandeCity_Hall3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc deleted file mode 100644 index fd06433450..0000000000 --- a/data/maps/EverGrandeCity_Hall3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_Hall3: - .4byte EverGrandeCity_ShortHall_Layout - .4byte EverGrandeCity_Hall3_MapEvents - .4byte EverGrandeCity_Hall3_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_Hall3/map.json b/data/maps/EverGrandeCity_Hall3/map.json new file mode 100644 index 0000000000..f181843bf6 --- /dev/null +++ b/data/maps/EverGrandeCity_Hall3/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_HALL3", + "name": "EverGrandeCity_Hall3", + "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_Hall4/events.inc b/data/maps/EverGrandeCity_Hall4/events.inc deleted file mode 100644 index 3f40698962..0000000000 --- a/data/maps/EverGrandeCity_Hall4/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -EverGrandeCity_Hall4_MapWarps: - warp_def 5, 33, 3, 1, MAP_EVER_GRANDE_CITY_DRAKES_ROOM - warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM - -EverGrandeCity_Hall4_MapEvents:: - map_events 0x0, EverGrandeCity_Hall4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc deleted file mode 100644 index b2a199823c..0000000000 --- a/data/maps/EverGrandeCity_Hall4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_Hall4: - .4byte EverGrandeCity_Hall4_Layout - .4byte EverGrandeCity_Hall4_MapEvents - .4byte EverGrandeCity_Hall4_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_HALL4 - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_Hall4/map.json b/data/maps/EverGrandeCity_Hall4/map.json new file mode 100644 index 0000000000..b2c095e77f --- /dev/null +++ b/data/maps/EverGrandeCity_Hall4/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_HALL4", + "name": "EverGrandeCity_Hall4", + "layout": "LAYOUT_EVER_GRANDE_CITY_HALL4", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 33, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_Hall5/events.inc b/data/maps/EverGrandeCity_Hall5/events.inc deleted file mode 100644 index 655f4645e5..0000000000 --- a/data/maps/EverGrandeCity_Hall5/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_Hall5_MapWarps: - warp_def 5, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM - warp_def 4, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 6, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - -EverGrandeCity_Hall5_MapEvents:: - map_events 0x0, EverGrandeCity_Hall5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc deleted file mode 100644 index f15639e5bf..0000000000 --- a/data/maps/EverGrandeCity_Hall5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_Hall5: - .4byte EverGrandeCity_ShortHall_Layout - .4byte EverGrandeCity_Hall5_MapEvents - .4byte EverGrandeCity_Hall5_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_Hall5/map.json b/data/maps/EverGrandeCity_Hall5/map.json new file mode 100644 index 0000000000..04597cf656 --- /dev/null +++ b/data/maps/EverGrandeCity_Hall5/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_HALL5", + "name": "EverGrandeCity_Hall5", + "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_HallOfFame/events.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc deleted file mode 100644 index 7d91984377..0000000000 --- a/data/maps/EverGrandeCity_HallOfFame/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_HallOfFame_EventObjects: - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - -EverGrandeCity_HallOfFame_MapWarps: - warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM - -EverGrandeCity_HallOfFame_MapEvents:: - map_events EverGrandeCity_HallOfFame_EventObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc deleted file mode 100644 index 7879c19bf6..0000000000 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_HallOfFame: - .4byte EverGrandeCity_HallOfFame_Layout - .4byte EverGrandeCity_HallOfFame_MapEvents - .4byte EverGrandeCity_HallOfFame_MapScripts - .4byte 0x0 - .2byte MUS_EIKOU_R - .2byte LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json new file mode 100644 index 0000000000..c7440cf989 --- /dev/null +++ b/data/maps/EverGrandeCity_HallOfFame/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_HALL_OF_FAME", + "name": "EverGrandeCity_HallOfFame", + "layout": "LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME", + "music": "MUS_EIKOU_R", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "x": 6, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 11, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_PhoebesRoom/events.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc deleted file mode 100644 index d6ad89bea4..0000000000 --- a/data/maps/EverGrandeCity_PhoebesRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -EverGrandeCity_PhoebesRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0 - -EverGrandeCity_PhoebesRoom_MapWarps: - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL1 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL2 - -EverGrandeCity_PhoebesRoom_MapEvents:: - map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc deleted file mode 100644 index 7869d60071..0000000000 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PhoebesRoom: - .4byte EverGrandeCity_PhoebesRoom_Layout - .4byte EverGrandeCity_PhoebesRoom_MapEvents - .4byte EverGrandeCity_PhoebesRoom_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_PHOEBE - diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json new file mode 100644 index 0000000000..36bf11a134 --- /dev/null +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", + "name": "EverGrandeCity_PhoebesRoom", + "layout": "LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_PHOEBE", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PHOEBE", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PhoebesRoom_EventScript_2281CB", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 13, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL1", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc deleted file mode 100644 index a879c3bf6c..0000000000 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0 - object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT - -EverGrandeCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY - warp_def 6, 8, 3, 1, MAP_EVER_GRANDE_CITY - warp_def 1, 6, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F - -EverGrandeCity_PokemonCenter_1F_MapEvents:: - map_events EverGrandeCity_PokemonCenter_1F_EventObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 060c11d0b9..0000000000 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte EverGrandeCity_PokemonCenter_1F_MapEvents - .4byte EverGrandeCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..7263f67cb2 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F", + "name": "EverGrandeCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A59", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A67", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A70", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A79", + "flag": "FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 5507659225..0000000000 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -EverGrandeCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -EverGrandeCity_PokemonCenter_2F_MapEvents:: - map_events EverGrandeCity_PokemonCenter_2F_EventObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc deleted file mode 100644 index ae70ad359d..0000000000 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte EverGrandeCity_PokemonCenter_2F_MapEvents - .4byte EverGrandeCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..195197b562 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F", + "name": "EverGrandeCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc deleted file mode 100644 index 524540d9d9..0000000000 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -EverGrandeCity_PokemonLeague_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 - object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 - -EverGrandeCity_PokemonLeague_1F_MapWarps: - warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY - warp_def 10, 11, 3, 0, MAP_EVER_GRANDE_CITY - warp_def 9, 1, 3, 0, MAP_EVER_GRANDE_CITY_HALL5 - warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_HALL5 - warp_def 1, 7, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F - -EverGrandeCity_PokemonLeague_1F_MapEvents:: - map_events EverGrandeCity_PokemonLeague_1F_EventObjects, EverGrandeCity_PokemonLeague_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc deleted file mode 100644 index 497d81582c..0000000000 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PokemonLeague_1F: - .4byte EverGrandeCity_PokemonLeague_1F_Layout - .4byte EverGrandeCity_PokemonLeague_1F_MapEvents - .4byte EverGrandeCity_PokemonLeague_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json new file mode 100644 index 0000000000..5fe580001b --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json @@ -0,0 +1,109 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "name": "EverGrandeCity_PokemonLeague_1F", + "layout": "LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_2295FC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 16, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_22960A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_229636", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_229636", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 11, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 11, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL5", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL5", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 7, + "elevation": 4, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc deleted file mode 100644 index 2f26346c81..0000000000 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_PokemonLeague_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -EverGrandeCity_PokemonLeague_2F_MapWarps: - warp_def 1, 6, 4, 4, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -EverGrandeCity_PokemonLeague_2F_MapEvents:: - map_events EverGrandeCity_PokemonLeague_2F_EventObjects, EverGrandeCity_PokemonLeague_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc deleted file mode 100644 index c03c85120f..0000000000 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PokemonLeague_2F: - .4byte PokemonCenter_2F_Layout - .4byte EverGrandeCity_PokemonLeague_2F_MapEvents - .4byte EverGrandeCity_PokemonLeague_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json new file mode 100644 index 0000000000..43d777f358 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F", + "name": "EverGrandeCity_PokemonLeague_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_SidneysRoom/events.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc deleted file mode 100644 index ca7f7278dd..0000000000 --- a/data/maps/EverGrandeCity_SidneysRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -EverGrandeCity_SidneysRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0 - -EverGrandeCity_SidneysRoom_MapWarps: - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL5 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL1 - -EverGrandeCity_SidneysRoom_MapEvents:: - map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc deleted file mode 100644 index e7d7f08129..0000000000 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_SidneysRoom: - .4byte EverGrandeCity_SidneysRoom_Layout - .4byte EverGrandeCity_SidneysRoom_MapEvents - .4byte EverGrandeCity_SidneysRoom_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_SIDNEY - diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json new file mode 100644 index 0000000000..2eceb30aea --- /dev/null +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "name": "EverGrandeCity_SidneysRoom", + "layout": "LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_SIDNEY", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SIDNEY", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_SidneysRoom_EventScript_227F64", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 13, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL5", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL1", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown/connections.inc b/data/maps/FallarborTown/connections.inc deleted file mode 100644 index d5955c9e6a..0000000000 --- a/data/maps/FallarborTown/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -FallarborTown_MapConnectionsList: - connection left, 0, MAP_ROUTE114 - connection right, 0, MAP_ROUTE113 - -FallarborTown_MapConnections: - .4byte 2 - .4byte FallarborTown_MapConnectionsList - diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc deleted file mode 100644 index b3c451595f..0000000000 --- a/data/maps/FallarborTown/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -FallarborTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0 - object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, FLAG_HIDE_FALLARBOR_AZURILL - -FallarborTown_MapWarps: - warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART - warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY - warp_def 14, 7, 0, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F - warp_def 6, 17, 0, 0, MAP_FALLARBOR_TOWN_HOUSE1 - warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2 - -FallarborTown_MapBGEvents: - bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A - bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73 - bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB250 - bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73 - bg_event 10, 11, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB259 - bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A - bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB262 - bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET - -FallarborTown_MapEvents:: - map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents - diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc deleted file mode 100644 index 2e74cee388..0000000000 --- a/data/maps/FallarborTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown: - .4byte FallarborTown_Layout - .4byte FallarborTown_MapEvents - .4byte FallarborTown_MapScripts - .4byte FallarborTown_MapConnections - .2byte MUS_TONEKUSA - .2byte LAYOUT_FALLARBOR_TOWN - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json new file mode 100644 index 0000000000..e2519f8804 --- /dev/null +++ b/data/maps/FallarborTown/map.json @@ -0,0 +1,185 @@ +{ + "id": "MAP_FALLARBOR_TOWN", + "name": "FallarborTown", + "layout": "LAYOUT_FALLARBOR_TOWN", + "music": "MUS_TONEKUSA", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE114" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE113" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 8, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_EventScript_1EB22B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 11, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_EventScript_1EB20C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 11, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_EventScript_1EB234", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "x": 8, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_EventScript_1EB23D", + "flag": "FLAG_HIDE_FALLARBOR_AZURILL" + } + ], + "warp_events": [ + { + "x": 15, + "y": 15, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN_MART", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 17, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 6, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN_HOUSE2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 16, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FallarborTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 15, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FallarborTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 6, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "FallarborTown_EventScript_1EB250" + }, + { + "type": "sign", + "x": 16, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FallarborTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 10, + "y": 11, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "FallarborTown_EventScript_1EB259" + }, + { + "type": "sign", + "x": 17, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FallarborTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 3, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "FallarborTown_EventScript_1EB262" + }, + { + "type": "hidden_item", + "x": 2, + "y": 15, + "elevation": 3, + "item": "ITEM_NUGGET", + "flag": "FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET" + } + ] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc deleted file mode 100644 index d452752d7e..0000000000 --- a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FallarborTown_BattleTentBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -FallarborTown_BattleTentBattleRoom_MapEvents:: - map_events FallarborTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc deleted file mode 100644 index 615c0ed266..0000000000 --- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_BattleTentBattleRoom: - .4byte BattleTentBattleRoom_Layout - .4byte FallarborTown_BattleTentBattleRoom_MapEvents - .4byte FallarborTown_BattleTentBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_BATTLE_ROOM - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/map.json b/data/maps/FallarborTown_BattleTentBattleRoom/map.json new file mode 100644 index 0000000000..53a2801962 --- /dev/null +++ b/data/maps/FallarborTown_BattleTentBattleRoom/map.json @@ -0,0 +1,60 @@ +{ + "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM", + "name": "FallarborTown_BattleTentBattleRoom", + "layout": "LAYOUT_BATTLE_TENT_BATTLE_ROOM", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 3, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_BattleTentCorridor/events.inc b/data/maps/FallarborTown_BattleTentCorridor/events.inc deleted file mode 100644 index 18c0dfb397..0000000000 --- a/data/maps/FallarborTown_BattleTentCorridor/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -FallarborTown_BattleTentCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -FallarborTown_BattleTentCorridor_MapEvents:: - map_events FallarborTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc deleted file mode 100644 index fd64a32662..0000000000 --- a/data/maps/FallarborTown_BattleTentCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_BattleTentCorridor: - .4byte BattleTentCorridor_Layout - .4byte FallarborTown_BattleTentCorridor_MapEvents - .4byte FallarborTown_BattleTentCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_CORRIDOR - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_BattleTentCorridor/map.json b/data/maps/FallarborTown_BattleTentCorridor/map.json new file mode 100644 index 0000000000..51d69dc932 --- /dev/null +++ b/data/maps/FallarborTown_BattleTentCorridor/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR", + "name": "FallarborTown_BattleTentCorridor", + "layout": "LAYOUT_BATTLE_TENT_CORRIDOR", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_BattleTentLobby/events.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc deleted file mode 100644 index 2a9b758ca8..0000000000 --- a/data/maps/FallarborTown_BattleTentLobby/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -FallarborTown_BattleTentLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 12, 6, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT - -FallarborTown_BattleTentLobby_MapWarps: - warp_def 6, 9, 0, 1, MAP_FALLARBOR_TOWN - warp_def 7, 9, 0, 1, MAP_FALLARBOR_TOWN - -FallarborTown_BattleTentLobby_MapBGEvents: - bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_BattleTentLobby_EventScript_20024F - -FallarborTown_BattleTentLobby_MapEvents:: - map_events FallarborTown_BattleTentLobby_EventObjects, FallarborTown_BattleTentLobby_MapWarps, 0x0, FallarborTown_BattleTentLobby_MapBGEvents - diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc deleted file mode 100644 index 4bdba3d514..0000000000 --- a/data/maps/FallarborTown_BattleTentLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_BattleTentLobby: - .4byte BattleTentLobby_Layout - .4byte FallarborTown_BattleTentLobby_MapEvents - .4byte FallarborTown_BattleTentLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_LOBBY - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_BattleTentLobby/map.json b/data/maps/FallarborTown_BattleTentLobby/map.json new file mode 100644 index 0000000000..5c36cf3d93 --- /dev/null +++ b/data/maps/FallarborTown_BattleTentLobby/map.json @@ -0,0 +1,110 @@ +{ + "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY", + "name": "FallarborTown_BattleTentLobby", + "layout": "LAYOUT_BATTLE_TENT_LOBBY", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_BattleTentLobby_EventScript_200001", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_BattleTentLobby_EventScript_20020D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 12, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_BattleTentLobby_EventScript_200216", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 10, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_BattleTentLobby_EventScript_20021F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 0, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_BattleTentLobby_EventScript_200228", + "flag": "FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT" + } + ], + "warp_events": [ + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 9, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "FallarborTown_BattleTentLobby_EventScript_20024F" + } + ] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_House1/events.inc b/data/maps/FallarborTown_House1/events.inc deleted file mode 100644 index 9db77af03f..0000000000 --- a/data/maps/FallarborTown_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -FallarborTown_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0 - -FallarborTown_House1_MapWarps: - warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN - warp_def 4, 8, 0, 3, MAP_FALLARBOR_TOWN - -FallarborTown_House1_MapEvents:: - map_events FallarborTown_House1_EventObjects, FallarborTown_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc deleted file mode 100644 index a17a5e0aba..0000000000 --- a/data/maps/FallarborTown_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_House1: - .4byte House1_Layout - .4byte FallarborTown_House1_MapEvents - .4byte FallarborTown_House1_MapScripts - .4byte 0x0 - .2byte MUS_TONEKUSA - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_House1/map.json b/data/maps/FallarborTown_House1/map.json new file mode 100644 index 0000000000..fb66ad1de5 --- /dev/null +++ b/data/maps/FallarborTown_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_FALLARBOR_TOWN_HOUSE1", + "name": "FallarborTown_House1", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_TONEKUSA", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_House1_EventScript_200F13", + "flag": "FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_House1_EventScript_200FBC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_House2/events.inc b/data/maps/FallarborTown_House2/events.inc deleted file mode 100644 index 117322b020..0000000000 --- a/data/maps/FallarborTown_House2/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -FallarborTown_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0 - -FallarborTown_House2_MapWarps: - warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN - warp_def 4, 7, 0, 4, MAP_FALLARBOR_TOWN - -FallarborTown_House2_MapEvents:: - map_events FallarborTown_House2_EventObjects, FallarborTown_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc deleted file mode 100644 index bdbf10fed6..0000000000 --- a/data/maps/FallarborTown_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_House2: - .4byte House2_Layout - .4byte FallarborTown_House2_MapEvents - .4byte FallarborTown_House2_MapScripts - .4byte 0x0 - .2byte MUS_TONEKUSA - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_House2/map.json b/data/maps/FallarborTown_House2/map.json new file mode 100644 index 0000000000..2b5ea52147 --- /dev/null +++ b/data/maps/FallarborTown_House2/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_FALLARBOR_TOWN_HOUSE2", + "name": "FallarborTown_House2", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_TONEKUSA", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_House2_EventScript_201383", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_Mart/events.inc b/data/maps/FallarborTown_Mart/events.inc deleted file mode 100644 index b4870cf571..0000000000 --- a/data/maps/FallarborTown_Mart/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FallarborTown_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0 - object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0 - -FallarborTown_Mart_MapWarps: - warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN - warp_def 4, 7, 0, 0, MAP_FALLARBOR_TOWN - -FallarborTown_Mart_MapEvents:: - map_events FallarborTown_Mart_EventObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc deleted file mode 100644 index be4e4ae9ed..0000000000 --- a/data/maps/FallarborTown_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_Mart: - .4byte Mart_Layout - .4byte FallarborTown_Mart_MapEvents - .4byte FallarborTown_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json new file mode 100644 index 0000000000..9416efe011 --- /dev/null +++ b/data/maps/FallarborTown_Mart/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_FALLARBOR_TOWN_MART", + "name": "FallarborTown_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_Mart_EventScript_1FFCBF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_Mart_EventScript_1FFCF4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_Mart_EventScript_1FFCFD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_Mart_EventScript_1FFD06", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_Mart_EventScript_2C80B6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc deleted file mode 100644 index f091ffce1e..0000000000 --- a/data/maps/FallarborTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FallarborTown_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE - -FallarborTown_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN - warp_def 6, 8, 3, 2, MAP_FALLARBOR_TOWN - warp_def 1, 6, 4, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F - -FallarborTown_PokemonCenter_1F_MapEvents:: - map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc deleted file mode 100644 index a03b385b51..0000000000 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte FallarborTown_PokemonCenter_1F_MapEvents - .4byte FallarborTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..a432b8a1ab --- /dev/null +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F", + "name": "FallarborTown_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_1F_EventScript_200BE1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_1F_EventScript_200BEF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_1F_EventScript_200BF8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_1F_EventScript_200C01", + "flag": "FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_PokemonCenter_2F/events.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc deleted file mode 100644 index bc3c01dd8e..0000000000 --- a/data/maps/FallarborTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FallarborTown_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -FallarborTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -FallarborTown_PokemonCenter_2F_MapEvents:: - map_events FallarborTown_PokemonCenter_2F_EventObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc deleted file mode 100644 index f3a761312a..0000000000 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte FallarborTown_PokemonCenter_2F_MapEvents - .4byte FallarborTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..be694d2572 --- /dev/null +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F", + "name": "FallarborTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FarawayIsland_Entrance/events.inc b/data/maps/FarawayIsland_Entrance/events.inc deleted file mode 100644 index 0ae752f936..0000000000 --- a/data/maps/FarawayIsland_Entrance/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -FarawayIsland_Entrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 39, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - -FarawayIsland_Entrance_MapWarps: - warp_def 22, 7, 3, 0, MAP_FARAWAY_ISLAND_INTERIOR - warp_def 23, 7, 3, 1, MAP_FARAWAY_ISLAND_INTERIOR - -FarawayIsland_Entrance_MapCoordEvents: - coord_event 9, 18, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C98 - coord_event 10, 20, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C9D - coord_event 22, 9, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C98 - -FarawayIsland_Entrance_MapBGEvents: - bg_event 3, 32, 0, BG_EVENT_PLAYER_FACING_NORTH, FarawayIsland_Entrance_EventScript_267CF1 - -FarawayIsland_Entrance_MapEvents:: - map_events FarawayIsland_Entrance_EventObjects, FarawayIsland_Entrance_MapWarps, FarawayIsland_Entrance_MapCoordEvents, FarawayIsland_Entrance_MapBGEvents - diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc deleted file mode 100644 index b76f97aef6..0000000000 --- a/data/maps/FarawayIsland_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FarawayIsland_Entrance: - .4byte FarawayIsland_Entrance_Layout - .4byte FarawayIsland_Entrance_MapEvents - .4byte FarawayIsland_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_FARAWAY_ISLAND_ENTRANCE - .byte MAPSEC_FARAWAY_ISLAND - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FarawayIsland_Entrance/map.json b/data/maps/FarawayIsland_Entrance/map.json new file mode 100644 index 0000000000..683010e127 --- /dev/null +++ b/data/maps/FarawayIsland_Entrance/map.json @@ -0,0 +1,99 @@ +{ + "id": "MAP_FARAWAY_ISLAND_ENTRANCE", + "name": "FarawayIsland_Entrance", + "layout": "LAYOUT_FARAWAY_ISLAND_ENTRANCE", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_FARAWAY_ISLAND", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 13, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FarawayIsland_Entrance_EventScript_267CA2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 13, + "y": 41, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 22, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FARAWAY_ISLAND_INTERIOR", + "dest_warp_id": 0 + }, + { + "x": 23, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FARAWAY_ISLAND_INTERIOR", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 9, + "y": 18, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "FarawayIsland_Entrance_EventScript_267C98" + }, + { + "type": "trigger", + "x": 10, + "y": 20, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "FarawayIsland_Entrance_EventScript_267C9D" + }, + { + "type": "trigger", + "x": 22, + "y": 9, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "FarawayIsland_Entrance_EventScript_267C98" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 32, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FarawayIsland_Entrance_EventScript_267CF1" + } + ] +} \ No newline at end of file diff --git a/data/maps/FarawayIsland_Interior/events.inc b/data/maps/FarawayIsland_Interior/events.inc deleted file mode 100644 index a8611c0386..0000000000 --- a/data/maps/FarawayIsland_Interior/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -FarawayIsland_Interior_EventObjects: - object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 15, 15, 0, 1, FarawayIsland_Interior_EventScript_267DF2, FLAG_HIDE_MEW - -FarawayIsland_Interior_MapWarps: - warp_def 12, 19, 0, 0, MAP_FARAWAY_ISLAND_ENTRANCE - warp_def 13, 19, 0, 1, MAP_FARAWAY_ISLAND_ENTRANCE - -FarawayIsland_Interior_MapEvents:: - map_events FarawayIsland_Interior_EventObjects, FarawayIsland_Interior_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc deleted file mode 100644 index 828202471d..0000000000 --- a/data/maps/FarawayIsland_Interior/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FarawayIsland_Interior: - .4byte FarawayIsland_Interior_Layout - .4byte FarawayIsland_Interior_MapEvents - .4byte FarawayIsland_Interior_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_FARAWAY_ISLAND_INTERIOR - .byte MAPSEC_FARAWAY_ISLAND - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FarawayIsland_Interior/map.json b/data/maps/FarawayIsland_Interior/map.json new file mode 100644 index 0000000000..d6531d043a --- /dev/null +++ b/data/maps/FarawayIsland_Interior/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_FARAWAY_ISLAND_INTERIOR", + "name": "FarawayIsland_Interior", + "layout": "LAYOUT_FARAWAY_ISLAND_INTERIOR", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_FARAWAY_ISLAND", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MEW", + "x": 13, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS", + "movement_range_x": 15, + "movement_range_y": 15, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 1, + "script": "FarawayIsland_Interior_EventScript_267DF2", + "flag": "FLAG_HIDE_MEW" + } + ], + "warp_events": [ + { + "x": 12, + "y": 19, + "elevation": 0, + "dest_map": "MAP_FARAWAY_ISLAND_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 19, + "elevation": 0, + "dest_map": "MAP_FARAWAY_ISLAND_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc deleted file mode 100644 index 7fd7e44adb..0000000000 --- a/data/maps/FieryPath/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -FieryPath_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_29119E, FLAG_ITEM_FIERY_PATH_TM06 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_11 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_12 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_13 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_14 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_15 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_16 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_291191, FLAG_ITEM_FIERY_PATH_FIRE_STONE - -FieryPath_MapWarps: - warp_def 26, 36, 3, 4, MAP_ROUTE112 - warp_def 26, 4, 3, 5, MAP_ROUTE112 - -FieryPath_MapEvents:: - map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc deleted file mode 100644 index 83e339adbd..0000000000 --- a/data/maps/FieryPath/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FieryPath: - .4byte FieryPath_Layout - .4byte FieryPath_MapEvents - .4byte FieryPath_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_FIERY_PATH - .byte MAPSEC_FIERY_PATH - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json new file mode 100644 index 0000000000..26c609e05d --- /dev/null +++ b/data/maps/FieryPath/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_FIERY_PATH", + "name": "FieryPath", + "layout": "LAYOUT_FIERY_PATH", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_FIERY_PATH", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 8, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_29119E", + "flag": "FLAG_ITEM_FIERY_PATH_TM06" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 10, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 17, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 8, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 3, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_2908BA", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 6, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_2908BA", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_2908BA", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_291191", + "flag": "FLAG_ITEM_FIERY_PATH_FIRE_STONE" + } + ], + "warp_events": [ + { + "x": 26, + "y": 36, + "elevation": 3, + "dest_map": "MAP_ROUTE112", + "dest_warp_id": 4 + }, + { + "x": 26, + "y": 4, + "elevation": 3, + "dest_map": "MAP_ROUTE112", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity/connections.inc b/data/maps/FortreeCity/connections.inc deleted file mode 100644 index 5e48951c29..0000000000 --- a/data/maps/FortreeCity/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -FortreeCity_MapConnectionsList: - connection left, 0, MAP_ROUTE119 - connection right, 0, MAP_ROUTE120 - -FortreeCity_MapConnections: - .4byte 2 - .4byte FortreeCity_MapConnectionsList - diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc deleted file mode 100644 index 8653934040..0000000000 --- a/data/maps/FortreeCity/events.inc +++ /dev/null @@ -1,31 +0,0 @@ -FortreeCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_EventScript_1E25DE, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 32, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, FortreeCity_EventScript_1E25BF, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0 - object_event 6, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0 - object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, FortreeCity_EventScript_1E2614, FLAG_HIDE_FORTREE_CITY_KECLEON - -FortreeCity_MapWarps: - warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F - warp_def 10, 3, 0, 0, MAP_FORTREE_CITY_HOUSE1 - warp_def 22, 11, 0, 0, MAP_FORTREE_CITY_GYM - warp_def 4, 14, 0, 0, MAP_FORTREE_CITY_MART - warp_def 17, 3, 0, 0, MAP_FORTREE_CITY_HOUSE2 - warp_def 25, 3, 0, 0, MAP_FORTREE_CITY_HOUSE3 - warp_def 32, 2, 0, 0, MAP_FORTREE_CITY_HOUSE4 - warp_def 12, 13, 0, 0, MAP_FORTREE_CITY_HOUSE5 - warp_def 37, 13, 0, 0, MAP_FORTREE_CITY_DECORATION_SHOP - -FortreeCity_MapBGEvents: - bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_1E2602 - bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E73 - bg_event 5, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E6A - bg_event 26, 10, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_1E260B - bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E73 - bg_event 6, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E6A - -FortreeCity_MapEvents:: - map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents - diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc deleted file mode 100644 index 9d7cd5aaea..0000000000 --- a/data/maps/FortreeCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity: - .4byte FortreeCity_Layout - .4byte FortreeCity_MapEvents - .4byte FortreeCity_MapScripts - .4byte FortreeCity_MapConnections - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json new file mode 100644 index 0000000000..0aec65572d --- /dev/null +++ b/data/maps/FortreeCity/map.json @@ -0,0 +1,236 @@ +{ + "id": "MAP_FORTREE_CITY", + "name": "FortreeCity", + "layout": "LAYOUT_FORTREE_CITY", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE119" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE120" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 31, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E25B6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 32, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E25DE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 32, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E25BF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 11, + "y": 14, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E25F0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E25E7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 9, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E25F9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 25, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E2614", + "flag": "FLAG_HIDE_FORTREE_CITY_KECLEON" + } + ], + "warp_events": [ + { + "x": 5, + "y": 6, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 3, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 11, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_GYM", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 14, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_MART", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 3, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 25, + "y": 3, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_HOUSE3", + "dest_warp_id": 0 + }, + { + "x": 32, + "y": 2, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_HOUSE4", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 13, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_HOUSE5", + "dest_warp_id": 0 + }, + { + "x": 37, + "y": 13, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_DECORATION_SHOP", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 6, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "FortreeCity_EventScript_1E2602" + }, + { + "type": "sign", + "x": 7, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FortreeCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 5, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FortreeCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 26, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "FortreeCity_EventScript_1E260B" + }, + { + "type": "sign", + "x": 6, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FortreeCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 6, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FortreeCity_EventScript_271E6A" + } + ] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_DecorationShop/events.inc b/data/maps/FortreeCity_DecorationShop/events.inc deleted file mode 100644 index 604e3fda1a..0000000000 --- a/data/maps/FortreeCity_DecorationShop/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -FortreeCity_DecorationShop_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0 - object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0 - object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0 - -FortreeCity_DecorationShop_MapWarps: - warp_def 3, 5, 0, 8, MAP_FORTREE_CITY - warp_def 4, 5, 0, 8, MAP_FORTREE_CITY - -FortreeCity_DecorationShop_MapEvents:: - map_events FortreeCity_DecorationShop_EventObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc deleted file mode 100644 index b4e0c92051..0000000000 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_DecorationShop: - .4byte FortreeCity_DecorationShop_Layout - .4byte FortreeCity_DecorationShop_MapEvents - .4byte FortreeCity_DecorationShop_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY_DECORATION_SHOP - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json new file mode 100644 index 0000000000..6a8d9fdabd --- /dev/null +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_FORTREE_CITY_DECORATION_SHOP", + "name": "FortreeCity_DecorationShop", + "layout": "LAYOUT_FORTREE_CITY_DECORATION_SHOP", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_DecorationShop_EventScript_21800E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_DecorationShop_EventScript_218017", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_DecorationShop_EventScript_218020", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_DecorationShop_EventScript_21804C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 8 + }, + { + "x": 4, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc deleted file mode 100644 index e71b6ea4ec..0000000000 --- a/data/maps/FortreeCity_Gym/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -FortreeCity_Gym_EventObjects: - object_event 1, EVENT_OBJ_GFX_WINONA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 5, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0 - object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 15, 21, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0 - object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, FortreeCity_Gym_EventScript_216704, 0 - object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, FortreeCity_Gym_EventScript_21671B, 0 - -FortreeCity_Gym_MapWarps: - warp_def 15, 24, 0, 2, MAP_FORTREE_CITY - warp_def 16, 24, 0, 2, MAP_FORTREE_CITY - -FortreeCity_Gym_MapBGEvents: - bg_event 14, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_216751 - bg_event 17, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_216761 - -FortreeCity_Gym_MapEvents:: - map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents - diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc deleted file mode 100644 index 2bde54ddd5..0000000000 --- a/data/maps/FortreeCity_Gym/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_Gym: - .4byte FortreeCity_Gym_Layout - .4byte FortreeCity_Gym_MapEvents - .4byte FortreeCity_Gym_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_FORTREE_CITY_GYM - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json new file mode 100644 index 0000000000..ad6b7c6b91 --- /dev/null +++ b/data/maps/FortreeCity_Gym/map.json @@ -0,0 +1,157 @@ +{ + "id": "MAP_FORTREE_CITY_GYM", + "name": "FortreeCity_Gym", + "layout": "LAYOUT_FORTREE_CITY_GYM", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WINONA", + "x": 15, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_Gym_EventScript_2165C8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 4, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "FortreeCity_Gym_EventScript_2166A8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "FortreeCity_Gym_EventScript_2166D6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 5, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FortreeCity_Gym_EventScript_2166ED", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 9, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "FortreeCity_Gym_EventScript_2166BF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 15, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_Gym_EventScript_216732", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 4, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FortreeCity_Gym_EventScript_216704", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 1, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "FortreeCity_Gym_EventScript_21671B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 15, + "y": 24, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 2 + }, + { + "x": 16, + "y": 24, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 21, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FortreeCity_Gym_EventScript_216751" + }, + { + "type": "sign", + "x": 17, + "y": 21, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FortreeCity_Gym_EventScript_216761" + } + ] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_House1/events.inc b/data/maps/FortreeCity_House1/events.inc deleted file mode 100644 index 5cf082d413..0000000000 --- a/data/maps/FortreeCity_House1/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -FortreeCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_House1_EventScript_21635F, 0 - -FortreeCity_House1_MapWarps: - warp_def 3, 5, 0, 1, MAP_FORTREE_CITY - warp_def 4, 5, 0, 1, MAP_FORTREE_CITY - -FortreeCity_House1_MapEvents:: - map_events FortreeCity_House1_EventObjects, FortreeCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc deleted file mode 100644 index 636a147f44..0000000000 --- a/data/maps/FortreeCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House1: - .4byte FortreeCity_House1_Layout - .4byte FortreeCity_House1_MapEvents - .4byte FortreeCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY_HOUSE1 - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json new file mode 100644 index 0000000000..8f349e6403 --- /dev/null +++ b/data/maps/FortreeCity_House1/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_FORTREE_CITY_HOUSE1", + "name": "FortreeCity_House1", + "layout": "LAYOUT_FORTREE_CITY_HOUSE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House1_EventScript_2162BB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House1_EventScript_216368", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House1_EventScript_21635F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_House2/events.inc b/data/maps/FortreeCity_House2/events.inc deleted file mode 100644 index ca183c0055..0000000000 --- a/data/maps/FortreeCity_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -FortreeCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0 - -FortreeCity_House2_MapWarps: - warp_def 3, 5, 0, 4, MAP_FORTREE_CITY - warp_def 4, 5, 0, 4, MAP_FORTREE_CITY - -FortreeCity_House2_MapEvents:: - map_events FortreeCity_House2_EventObjects, FortreeCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc deleted file mode 100644 index e61c000f61..0000000000 --- a/data/maps/FortreeCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House2: - .4byte FortreeCity_House2_Layout - .4byte FortreeCity_House2_MapEvents - .4byte FortreeCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY_HOUSE2 - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json new file mode 100644 index 0000000000..7b9a67ab6b --- /dev/null +++ b/data/maps/FortreeCity_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_FORTREE_CITY_HOUSE2", + "name": "FortreeCity_House2", + "layout": "LAYOUT_FORTREE_CITY_HOUSE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House2_EventScript_2177CB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House2_EventScript_2C811E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_House3/events.inc b/data/maps/FortreeCity_House3/events.inc deleted file mode 100644 index 8a158f8ff3..0000000000 --- a/data/maps/FortreeCity_House3/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -FortreeCity_House3_EventObjects: - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House3_EventScript_217AF1, 0 - -FortreeCity_House3_MapWarps: - warp_def 3, 5, 0, 5, MAP_FORTREE_CITY - warp_def 4, 5, 0, 5, MAP_FORTREE_CITY - -FortreeCity_House3_MapEvents:: - map_events FortreeCity_House3_EventObjects, FortreeCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc deleted file mode 100644 index db66e65d8a..0000000000 --- a/data/maps/FortreeCity_House3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House3: - .4byte FortreeCity_House1_Layout - .4byte FortreeCity_House3_MapEvents - .4byte FortreeCity_House3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY_HOUSE1 - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json new file mode 100644 index 0000000000..d886e0cdb0 --- /dev/null +++ b/data/maps/FortreeCity_House3/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_FORTREE_CITY_HOUSE3", + "name": "FortreeCity_House3", + "layout": "LAYOUT_FORTREE_CITY_HOUSE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House3_EventScript_217AE8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House3_EventScript_217AF1", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_House4/events.inc b/data/maps/FortreeCity_House4/events.inc deleted file mode 100644 index bc6a4a39c9..0000000000 --- a/data/maps/FortreeCity_House4/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -FortreeCity_House4_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House4_EventScript_217C81, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL - -FortreeCity_House4_MapWarps: - warp_def 3, 5, 0, 6, MAP_FORTREE_CITY - warp_def 4, 5, 0, 6, MAP_FORTREE_CITY - -FortreeCity_House4_MapEvents:: - map_events FortreeCity_House4_EventObjects, FortreeCity_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc deleted file mode 100644 index cd340c2940..0000000000 --- a/data/maps/FortreeCity_House4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House4: - .4byte FortreeCity_House2_Layout - .4byte FortreeCity_House4_MapEvents - .4byte FortreeCity_House4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY_HOUSE2 - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json new file mode 100644 index 0000000000..11fd05bf5e --- /dev/null +++ b/data/maps/FortreeCity_House4/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_FORTREE_CITY_HOUSE4", + "name": "FortreeCity_House4", + "layout": "LAYOUT_FORTREE_CITY_HOUSE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House4_EventScript_217C81", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House4_EventScript_217C8A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House4_EventScript_217D20", + "flag": "FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL" + } + ], + "warp_events": [ + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_House5/events.inc b/data/maps/FortreeCity_House5/events.inc deleted file mode 100644 index bc090cb809..0000000000 --- a/data/maps/FortreeCity_House5/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -FortreeCity_House5_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0 - -FortreeCity_House5_MapWarps: - warp_def 3, 5, 0, 7, MAP_FORTREE_CITY - warp_def 4, 5, 0, 7, MAP_FORTREE_CITY - -FortreeCity_House5_MapEvents:: - map_events FortreeCity_House5_EventObjects, FortreeCity_House5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc deleted file mode 100644 index a04e91eb31..0000000000 --- a/data/maps/FortreeCity_House5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House5: - .4byte FortreeCity_House1_Layout - .4byte FortreeCity_House5_MapEvents - .4byte FortreeCity_House5_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY_HOUSE1 - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json new file mode 100644 index 0000000000..37e23502b6 --- /dev/null +++ b/data/maps/FortreeCity_House5/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_FORTREE_CITY_HOUSE5", + "name": "FortreeCity_House5", + "layout": "LAYOUT_FORTREE_CITY_HOUSE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House5_EventScript_217EF2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House5_EventScript_217F04", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House5_EventScript_217EFB", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 7 + }, + { + "x": 4, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_Mart/events.inc b/data/maps/FortreeCity_Mart/events.inc deleted file mode 100644 index ceb68f7ea1..0000000000 --- a/data/maps/FortreeCity_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -FortreeCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0 - -FortreeCity_Mart_MapWarps: - warp_def 3, 7, 0, 3, MAP_FORTREE_CITY - warp_def 4, 7, 0, 3, MAP_FORTREE_CITY - -FortreeCity_Mart_MapEvents:: - map_events FortreeCity_Mart_EventObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc deleted file mode 100644 index f4aaf9ce17..0000000000 --- a/data/maps/FortreeCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_Mart: - .4byte Mart_Layout - .4byte FortreeCity_Mart_MapEvents - .4byte FortreeCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json new file mode 100644 index 0000000000..3b7e0723b4 --- /dev/null +++ b/data/maps/FortreeCity_Mart/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_FORTREE_CITY_MART", + "name": "FortreeCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_Mart_EventScript_217666", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_Mart_EventScript_217698", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_Mart_EventScript_2176A1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_Mart_EventScript_2176AA", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_PokemonCenter_1F/events.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc deleted file mode 100644 index af7b5f72ef..0000000000 --- a/data/maps/FortreeCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FortreeCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 8, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0 - object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0 - -FortreeCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 0, MAP_FORTREE_CITY - warp_def 6, 8, 3, 0, MAP_FORTREE_CITY - warp_def 1, 6, 4, 0, MAP_FORTREE_CITY_POKEMON_CENTER_2F - -FortreeCity_PokemonCenter_1F_MapEvents:: - map_events FortreeCity_PokemonCenter_1F_EventObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 543e672a2c..0000000000 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte FortreeCity_PokemonCenter_1F_MapEvents - .4byte FortreeCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..f51926d3be --- /dev/null +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_FORTREE_CITY_POKEMON_CENTER_1F", + "name": "FortreeCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_1F_EventScript_2173E7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_1F_EventScript_2173F5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_1F_EventScript_2173FE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_1F_EventScript_217407", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FORTREE_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_PokemonCenter_2F/events.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 7cdbc4a82e..0000000000 --- a/data/maps/FortreeCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FortreeCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -FortreeCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -FortreeCity_PokemonCenter_2F_MapEvents:: - map_events FortreeCity_PokemonCenter_2F_EventObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 8dbfeed079..0000000000 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte FortreeCity_PokemonCenter_2F_MapEvents - .4byte FortreeCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..4984b76926 --- /dev/null +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_FORTREE_CITY_POKEMON_CENTER_2F", + "name": "FortreeCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FORTREE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/GraniteCave_1F/events.inc b/data/maps/GraniteCave_1F/events.inc deleted file mode 100644 index 1885f3cf5d..0000000000 --- a/data/maps/GraniteCave_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -GraniteCave_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE - -GraniteCave_1F_MapWarps: - warp_def 37, 12, 3, 0, MAP_ROUTE106 - warp_def 35, 3, 3, 0, MAP_GRANITE_CAVE_B1F - warp_def 17, 11, 3, 1, MAP_GRANITE_CAVE_B1F - warp_def 5, 10, 3, 0, MAP_GRANITE_CAVE_STEVENS_ROOM - -GraniteCave_1F_MapEvents:: - map_events GraniteCave_1F_EventObjects, GraniteCave_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc deleted file mode 100644 index 2f834c7eb9..0000000000 --- a/data/maps/GraniteCave_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_1F: - .4byte GraniteCave_1F_Layout - .4byte GraniteCave_1F_MapEvents - .4byte GraniteCave_1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_GRANITE_CAVE_1F - .byte MAPSEC_GRANITE_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json new file mode 100644 index 0000000000..3f720a5692 --- /dev/null +++ b/data/maps/GraniteCave_1F/map.json @@ -0,0 +1,76 @@ +{ + "id": "MAP_GRANITE_CAVE_1F", + "name": "GraniteCave_1F", + "layout": "LAYOUT_GRANITE_CAVE_1F", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_GRANITE_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 36, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_1F_EventScript_22DA5E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 17, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_1F_EventScript_291150", + "flag": "FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE" + } + ], + "warp_events": [ + { + "x": 37, + "y": 12, + "elevation": 3, + "dest_map": "MAP_ROUTE106", + "dest_warp_id": 0 + }, + { + "x": 35, + "y": 3, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 11, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 10, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_STEVENS_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/GraniteCave_B1F/events.inc b/data/maps/GraniteCave_B1F/events.inc deleted file mode 100644 index f3dcbcbafb..0000000000 --- a/data/maps/GraniteCave_B1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL - -GraniteCave_B1F_MapWarps: - warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F - warp_def 4, 21, 3, 2, MAP_GRANITE_CAVE_1F - warp_def 29, 13, 3, 0, MAP_GRANITE_CAVE_B2F - warp_def 28, 21, 3, 1, MAP_GRANITE_CAVE_B2F - warp_def 8, 5, 3, 2, MAP_GRANITE_CAVE_B2F - warp_def 12, 3, 3, 3, MAP_GRANITE_CAVE_B2F - warp_def 29, 2, 3, 4, MAP_GRANITE_CAVE_B2F - -GraniteCave_B1F_MapEvents:: - map_events GraniteCave_B1F_EventObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc deleted file mode 100644 index 546c246580..0000000000 --- a/data/maps/GraniteCave_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_B1F: - .4byte GraniteCave_B1F_Layout - .4byte GraniteCave_B1F_MapEvents - .4byte GraniteCave_B1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_GRANITE_CAVE_B1F - .byte MAPSEC_GRANITE_CAVE - .byte 1 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json new file mode 100644 index 0000000000..6e3a144036 --- /dev/null +++ b/data/maps/GraniteCave_B1F/map.json @@ -0,0 +1,84 @@ +{ + "id": "MAP_GRANITE_CAVE_B1F", + "name": "GraniteCave_B1F", + "layout": "LAYOUT_GRANITE_CAVE_B1F", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_GRANITE_CAVE", + "requires_flash": true, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 15, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B1F_EventScript_29115D", + "flag": "FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL" + } + ], + "warp_events": [ + { + "x": 25, + "y": 13, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_1F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 21, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_1F", + "dest_warp_id": 2 + }, + { + "x": 29, + "y": 13, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B2F", + "dest_warp_id": 0 + }, + { + "x": 28, + "y": 21, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B2F", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B2F", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 3, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B2F", + "dest_warp_id": 3 + }, + { + "x": 29, + "y": 2, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B2F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc deleted file mode 100644 index fc321dfb0b..0000000000 --- a/data/maps/GraniteCave_B2F/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -GraniteCave_B2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, FLAG_ITEM_GRANITE_CAVE_B2F_REPEL - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_12 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_13 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_14 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_15 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_16 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_17 - -GraniteCave_B2F_MapWarps: - warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F - warp_def 28, 21, 3, 3, MAP_GRANITE_CAVE_B1F - warp_def 8, 5, 3, 4, MAP_GRANITE_CAVE_B1F - warp_def 12, 3, 3, 5, MAP_GRANITE_CAVE_B1F - warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F - -GraniteCave_B2F_MapBGEvents: - bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1 - bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2 - -GraniteCave_B2F_MapEvents:: - map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents - diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc deleted file mode 100644 index ce63017bef..0000000000 --- a/data/maps/GraniteCave_B2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_B2F: - .4byte GraniteCave_B2F_Layout - .4byte GraniteCave_B2F_MapEvents - .4byte GraniteCave_B2F_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_GRANITE_CAVE_B2F - .byte MAPSEC_GRANITE_CAVE - .byte 1 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json new file mode 100644 index 0000000000..18b5ca9d42 --- /dev/null +++ b/data/maps/GraniteCave_B2F/map.json @@ -0,0 +1,191 @@ +{ + "id": "MAP_GRANITE_CAVE_B2F", + "name": "GraniteCave_B2F", + "layout": "LAYOUT_GRANITE_CAVE_B2F", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_GRANITE_CAVE", + "requires_flash": true, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_29116A", + "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_REPEL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 29, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_291177", + "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 5, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 3, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 2, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 4, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 6, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 3, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_17" + } + ], + "warp_events": [ + { + "x": 29, + "y": 13, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 2 + }, + { + "x": 28, + "y": 21, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 4 + }, + { + "x": 12, + "y": 3, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 5 + }, + { + "x": 29, + "y": 2, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 28, + "y": 6, + "elevation": 3, + "item": "ITEM_EVERSTONE", + "flag": "FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1" + }, + { + "type": "hidden_item", + "x": 15, + "y": 11, + "elevation": 3, + "item": "ITEM_EVERSTONE", + "flag": "FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2" + } + ] +} \ No newline at end of file diff --git a/data/maps/GraniteCave_StevensRoom/events.inc b/data/maps/GraniteCave_StevensRoom/events.inc deleted file mode 100644 index 747fe2cc3a..0000000000 --- a/data/maps/GraniteCave_StevensRoom/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -GraniteCave_StevensRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, FLAG_HIDE_GRANITE_CAVE_STEVEN - -GraniteCave_StevensRoom_MapWarps: - warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F - -GraniteCave_StevensRoom_MapEvents:: - map_events GraniteCave_StevensRoom_EventObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc deleted file mode 100644 index 6d90fc6c8e..0000000000 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_StevensRoom: - .4byte GraniteCave_StevensRoom_Layout - .4byte GraniteCave_StevensRoom_MapEvents - .4byte GraniteCave_StevensRoom_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_GRANITE_CAVE_STEVENS_ROOM - .byte MAPSEC_GRANITE_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json new file mode 100644 index 0000000000..22a6207c27 --- /dev/null +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_GRANITE_CAVE_STEVENS_ROOM", + "name": "GraniteCave_StevensRoom", + "layout": "LAYOUT_GRANITE_CAVE_STEVENS_ROOM", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_GRANITE_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_StevensRoom_EventScript_22DC7B", + "flag": "FLAG_HIDE_GRANITE_CAVE_STEVEN" + } + ], + "warp_events": [ + { + "x": 7, + "y": 3, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc deleted file mode 100644 index c7888165fd..0000000000 --- a/data/maps/InsideOfTruck/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -InsideOfTruck_EventObjects: - object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 - object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 - object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 - -InsideOfTruck_MapWarps: - warp_def 4, 1, 0, 127, MAP_NONE - warp_def 4, 2, 0, 127, MAP_NONE - warp_def 4, 3, 0, 127, MAP_NONE - -InsideOfTruck_MapCoordEvents: - coord_event 3, 1, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 - coord_event 3, 2, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 - coord_event 3, 3, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 - -InsideOfTruck_MapBGEvents: - bg_event 1, 0, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C - bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C - bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C - bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C - bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C - -InsideOfTruck_MapEvents:: - map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents - diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc deleted file mode 100644 index 7b1889e250..0000000000 --- a/data/maps/InsideOfTruck/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -InsideOfTruck: - .4byte InsideOfTruck_Layout - .4byte InsideOfTruck_MapEvents - .4byte InsideOfTruck_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_INSIDE_OF_TRUCK - .byte MAPSEC_INSIDE_OF_TRUCK - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json new file mode 100644 index 0000000000..4978d841ca --- /dev/null +++ b/data/maps/InsideOfTruck/map.json @@ -0,0 +1,151 @@ +{ + "id": "MAP_INSIDE_OF_TRUCK", + "name": "InsideOfTruck", + "layout": "LAYOUT_INSIDE_OF_TRUCK", + "music": "65535", + "region_map_section": "MAPSEC_INSIDE_OF_TRUCK", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "x": 0, + "y": 0, + "elevation": 8, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "InsideOfTruck_EventScript_23BF6C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "x": 0, + "y": 3, + "elevation": 8, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "InsideOfTruck_EventScript_23BF6C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "x": 2, + "y": 3, + "elevation": 8, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "InsideOfTruck_EventScript_23BF6C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 4, + "y": 2, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 4, + "y": 3, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 1, + "elevation": 3, + "var": "VAR_0x4092", + "var_value": 0, + "script": "InsideOfTruck_EventScript_23BF04" + }, + { + "type": "trigger", + "x": 3, + "y": 2, + "elevation": 3, + "var": "VAR_0x4092", + "var_value": 0, + "script": "InsideOfTruck_EventScript_23BF04" + }, + { + "type": "trigger", + "x": 3, + "y": 3, + "elevation": 3, + "var": "VAR_0x4092", + "var_value": 0, + "script": "InsideOfTruck_EventScript_23BF04" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 1, + "y": 0, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "InsideOfTruck_EventScript_23BF6C" + }, + { + "type": "sign", + "x": 3, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "InsideOfTruck_EventScript_23BF6C" + }, + { + "type": "sign", + "x": 2, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "InsideOfTruck_EventScript_23BF6C" + }, + { + "type": "sign", + "x": 0, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "InsideOfTruck_EventScript_23BF6C" + }, + { + "type": "sign", + "x": 0, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "InsideOfTruck_EventScript_23BF6C" + } + ] +} \ No newline at end of file diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc deleted file mode 100644 index fa9c3deba3..0000000000 --- a/data/maps/IslandCave/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -IslandCave_EventObjects: - object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, IslandCave_EventScript_238F58, FLAG_HIDE_REGICE - -IslandCave_MapWarps: - warp_def 8, 29, 3, 0, MAP_ROUTE105 - warp_def 8, 20, 0, 2, MAP_ISLAND_CAVE - warp_def 8, 11, 3, 1, MAP_ISLAND_CAVE - -IslandCave_MapBGEvents: - bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238EEF - bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238F1D - bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238F1D - -IslandCave_MapEvents:: - map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents - diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc deleted file mode 100644 index 15eb2b3603..0000000000 --- a/data/maps/IslandCave/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -IslandCave: - .4byte IslandCave_Layout - .4byte IslandCave_MapEvents - .4byte IslandCave_MapScripts - .4byte 0x0 - .2byte MUS_MABOROSI - .2byte LAYOUT_ISLAND_CAVE - .byte MAPSEC_ISLAND_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json new file mode 100644 index 0000000000..c6365025b2 --- /dev/null +++ b/data/maps/IslandCave/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_ISLAND_CAVE", + "name": "IslandCave", + "layout": "LAYOUT_ISLAND_CAVE", + "music": "MUS_MABOROSI", + "region_map_section": "MAPSEC_ISLAND_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_REGICE", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IslandCave_EventScript_238F58", + "flag": "FLAG_HIDE_REGICE" + } + ], + "warp_events": [ + { + "x": 8, + "y": 29, + "elevation": 3, + "dest_map": "MAP_ROUTE105", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 20, + "elevation": 0, + "dest_map": "MAP_ISLAND_CAVE", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ISLAND_CAVE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "IslandCave_EventScript_238EEF" + }, + { + "type": "sign", + "x": 7, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "IslandCave_EventScript_238F1D" + }, + { + "type": "sign", + "x": 9, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "IslandCave_EventScript_238F1D" + } + ] +} \ No newline at end of file diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc deleted file mode 100644 index 5d33af93e7..0000000000 --- a/data/maps/JaggedPass/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -JaggedPass_EventObjects: - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, JaggedPass_EventScript_291184, FLAG_ITEM_JAGGED_PASS_BURN_HEAL - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 9, 21, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_23079C, 0 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, JaggedPass_EventScript_230718, FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD - object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_230871, 0 - object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, JaggedPass_EventScript_23085A, 0 - -JaggedPass_MapWarps: - warp_def 14, 40, 3, 2, MAP_ROUTE112 - warp_def 15, 40, 3, 3, MAP_ROUTE112 - warp_def 13, 5, 3, 2, MAP_MT_CHIMNEY - warp_def 14, 5, 3, 3, MAP_MT_CHIMNEY - warp_def 16, 18, 0, 0, MAP_MAGMA_HIDEOUT_1F - -JaggedPass_MapCoordEvents: - coord_weather_event 13, 15, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 21, 12, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 14, 15, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 18, 17, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 22, 19, 3, COORD_EVENT_WEATHER_SUNNY - coord_event 21, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB - coord_event 22, 20, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB - coord_event 21, 20, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB - coord_event 14, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB - coord_event 13, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB - -JaggedPass_MapBGEvents: - bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL - bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL - -JaggedPass_MapEvents:: - map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents - diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc deleted file mode 100644 index 870b817ec2..0000000000 --- a/data/maps/JaggedPass/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -JaggedPass: - .4byte JaggedPass_Layout - .4byte JaggedPass_MapEvents - .4byte JaggedPass_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_JAGGED_PASS - .byte MAPSEC_JAGGED_PASS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json new file mode 100644 index 0000000000..748fc99149 --- /dev/null +++ b/data/maps/JaggedPass/map.json @@ -0,0 +1,246 @@ +{ + "id": "MAP_JAGGED_PASS", + "name": "JaggedPass", + "layout": "LAYOUT_JAGGED_PASS", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_JAGGED_PASS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "JaggedPass_EventScript_230785", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 16, + "y": 35, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "JaggedPass_EventScript_2307FB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 23, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "JaggedPass_EventScript_291184", + "flag": "FLAG_ITEM_JAGGED_PASS_BURN_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 9, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "JaggedPass_EventScript_23079C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 16, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "JaggedPass_EventScript_230718", + "flag": "FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 14, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "JaggedPass_EventScript_230871", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 18, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "JaggedPass_EventScript_23085A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 14, + "y": 40, + "elevation": 3, + "dest_map": "MAP_ROUTE112", + "dest_warp_id": 2 + }, + { + "x": 15, + "y": 40, + "elevation": 3, + "dest_map": "MAP_ROUTE112", + "dest_warp_id": 3 + }, + { + "x": 13, + "y": 5, + "elevation": 3, + "dest_map": "MAP_MT_CHIMNEY", + "dest_warp_id": 2 + }, + { + "x": 14, + "y": 5, + "elevation": 3, + "dest_map": "MAP_MT_CHIMNEY", + "dest_warp_id": 3 + }, + { + "x": 16, + "y": 18, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "weather", + "x": 13, + "y": 15, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 21, + "y": 12, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 14, + "y": 15, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 18, + "y": 17, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 22, + "y": 19, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "trigger", + "x": 21, + "y": 15, + "elevation": 3, + "var": "VAR_0x40C8", + "var_value": 1, + "script": "JaggedPass_EventScript_2306BB" + }, + { + "type": "trigger", + "x": 22, + "y": 20, + "elevation": 3, + "var": "VAR_0x40C8", + "var_value": 1, + "script": "JaggedPass_EventScript_2306BB" + }, + { + "type": "trigger", + "x": 21, + "y": 20, + "elevation": 3, + "var": "VAR_0x40C8", + "var_value": 1, + "script": "JaggedPass_EventScript_2306BB" + }, + { + "type": "trigger", + "x": 14, + "y": 15, + "elevation": 3, + "var": "VAR_0x40C8", + "var_value": 1, + "script": "JaggedPass_EventScript_2306BB" + }, + { + "type": "trigger", + "x": 13, + "y": 15, + "elevation": 3, + "var": "VAR_0x40C8", + "var_value": 1, + "script": "JaggedPass_EventScript_2306BB" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 8, + "y": 10, + "elevation": 3, + "item": "ITEM_FULL_HEAL", + "flag": "FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL" + }, + { + "type": "hidden_item", + "x": 7, + "y": 29, + "elevation": 3, + "item": "ITEM_GREAT_BALL", + "flag": "FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL" + } + ] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown/connections.inc b/data/maps/LavaridgeTown/connections.inc deleted file mode 100644 index e3d4e1fb1d..0000000000 --- a/data/maps/LavaridgeTown/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -LavaridgeTown_MapConnectionsList: - connection right, -40, MAP_ROUTE112 - -LavaridgeTown_MapConnections: - .4byte 1 - .4byte LavaridgeTown_MapConnectionsList - diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc deleted file mode 100644 index aeb55249e8..0000000000 --- a/data/maps/LavaridgeTown/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -LavaridgeTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0 - object_event 4, EVENT_OBJ_GFX_TWIN, 0, 10, 13, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, LavaridgeTown_EventScript_1EA720, 0 - object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0 - object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0 - object_event 7, EVENT_OBJ_GFX_VAR_3, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 - object_event 8, EVENT_OBJ_GFX_VAR_0, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 - object_event 9, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0 - -LavaridgeTown_MapWarps: - warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP - warp_def 5, 15, 0, 0, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 15, 5, 0, 0, MAP_LAVARIDGE_TOWN_MART - warp_def 9, 6, 0, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F - warp_def 16, 15, 0, 0, MAP_LAVARIDGE_TOWN_HOUSE - warp_def 9, 2, 3, 3, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F - -LavaridgeTown_MapCoordEvents: - coord_event 6, 3, 3, 0, 0, LavaridgeTown_EventScript_1EA6FA - -LavaridgeTown_MapBGEvents: - bg_event 14, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7B7 - bg_event 7, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7AE - bg_event 17, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A - bg_event 13, 8, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7A5 - bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73 - bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A - bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73 - bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL - -LavaridgeTown_MapEvents:: - map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents - diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc deleted file mode 100644 index 5365e1a005..0000000000 --- a/data/maps/LavaridgeTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown: - .4byte LavaridgeTown_Layout - .4byte LavaridgeTown_MapEvents - .4byte LavaridgeTown_MapScripts - .4byte LavaridgeTown_MapConnections - .2byte MUS_MACHI_S4 - .2byte LAYOUT_LAVARIDGE_TOWN - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json new file mode 100644 index 0000000000..6bf3162c8e --- /dev/null +++ b/data/maps/LavaridgeTown/map.json @@ -0,0 +1,262 @@ +{ + "id": "MAP_LAVARIDGE_TOWN", + "name": "LavaridgeTown", + "layout": "LAYOUT_LAVARIDGE_TOWN", + "music": "MUS_MACHI_S4", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "right", + "offset": -40, + "map": "MAP_ROUTE112" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA73B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA70E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA717", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 10, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA720", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA729", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA732", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 6, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 12, + "y": 15, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA744", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 12, + "y": 15, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN_HERB_SHOP", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 15, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 5, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN_MART", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 6, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 15, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 2, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 6, + "y": 3, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "LavaridgeTown_EventScript_1EA6FA" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LavaridgeTown_EventScript_1EA7B7" + }, + { + "type": "sign", + "x": 7, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LavaridgeTown_EventScript_1EA7AE" + }, + { + "type": "sign", + "x": 17, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LavaridgeTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 13, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LavaridgeTown_EventScript_1EA7A5" + }, + { + "type": "sign", + "x": 10, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LavaridgeTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 16, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LavaridgeTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 11, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LavaridgeTown_EventScript_271E73" + }, + { + "type": "hidden_item", + "x": 4, + "y": 5, + "elevation": 3, + "item": "ITEM_ICE_HEAL", + "flag": "FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL" + } + ] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc deleted file mode 100644 index 08d22737c1..0000000000 --- a/data/maps/LavaridgeTown_Gym_1F/events.inc +++ /dev/null @@ -1,43 +0,0 @@ -LavaridgeTown_Gym_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 13, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 3, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0 - -LavaridgeTown_Gym_1F_MapWarps: - warp_def 13, 18, 3, 1, MAP_LAVARIDGE_TOWN - warp_def 14, 18, 3, 1, MAP_LAVARIDGE_TOWN - warp_def 10, 18, 3, 0, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 8, 9, 3, 2, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 4, 18, 3, 4, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 14, 3, 3, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 0, 17, 3, 1, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 9, 3, 5, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 2, 15, 3, 6, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 3, 14, 3, 7, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 1, 14, 3, 8, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 0, 10, 3, 9, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 3, 10, 3, 10, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 0, 6, 3, 11, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 3, 6, 3, 12, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 2, 3, 3, 14, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 2, 3, 15, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 7, 2, 3, 16, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 8, 6, 3, 17, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 10, 6, 3, 18, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 4, 16, 0, 20, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 12, 3, 3, 19, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 14, 6, 3, 21, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 13, 17, 3, 22, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 12, 12, 3, 23, MAP_LAVARIDGE_TOWN_GYM_B1F - -LavaridgeTown_Gym_1F_MapBGEvents: - bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_1FE98B - bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_1FE99B - -LavaridgeTown_Gym_1F_MapEvents:: - map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents - diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc deleted file mode 100644 index f71786ce0a..0000000000 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_Gym_1F: - .4byte LavaridgeTown_Gym_1F_Layout - .4byte LavaridgeTown_Gym_1F_MapEvents - .4byte LavaridgeTown_Gym_1F_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_LAVARIDGE_TOWN_GYM_1F - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json new file mode 100644 index 0000000000..dac9467f06 --- /dev/null +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -0,0 +1,299 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_GYM_1F", + "name": "LavaridgeTown_Gym_1F", + "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_1F", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FLANNERY", + "x": 13, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_Gym_1F_EventScript_1FE78C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 3, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_1F_EventScript_1FE87F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 2, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_1F_EventScript_1FE900", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 3, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_1F_EventScript_1FE8AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_1F_EventScript_1FE8E5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 12, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_Gym_1F_EventScript_1FE96C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 14, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 3 + }, + { + "x": 0, + "y": 17, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 5 + }, + { + "x": 2, + "y": 15, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 6 + }, + { + "x": 3, + "y": 14, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 7 + }, + { + "x": 1, + "y": 14, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 8 + }, + { + "x": 0, + "y": 10, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 9 + }, + { + "x": 3, + "y": 10, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 10 + }, + { + "x": 0, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 11 + }, + { + "x": 3, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 12 + }, + { + "x": 5, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 13 + }, + { + "x": 2, + "y": 3, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 14 + }, + { + "x": 5, + "y": 2, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 15 + }, + { + "x": 7, + "y": 2, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 16 + }, + { + "x": 8, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 17 + }, + { + "x": 10, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 18 + }, + { + "x": 4, + "y": 16, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 20 + }, + { + "x": 12, + "y": 3, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 19 + }, + { + "x": 14, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 21 + }, + { + "x": 13, + "y": 17, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 22 + }, + { + "x": 12, + "y": 12, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 23 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 10, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LavaridgeTown_Gym_1F_EventScript_1FE98B" + }, + { + "type": "sign", + "x": 16, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LavaridgeTown_Gym_1F_EventScript_1FE99B" + } + ] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_Gym_B1F/events.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc deleted file mode 100644 index 64512a994a..0000000000 --- a/data/maps/LavaridgeTown_Gym_B1F/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -LavaridgeTown_Gym_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 4, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 3, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0 - -LavaridgeTown_Gym_B1F_MapWarps: - warp_def 10, 18, 3, 2, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 0, 17, 3, 6, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 8, 9, 3, 3, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 5, 14, 3, 5, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 4, 18, 3, 4, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 5, 9, 3, 7, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 2, 15, 3, 8, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 3, 14, 3, 9, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 1, 14, 3, 10, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 0, 10, 3, 11, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 3, 10, 3, 12, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 0, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 3, 6, 3, 14, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 5, 6, 3, 15, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 2, 3, 3, 16, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 5, 2, 3, 17, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 7, 2, 3, 18, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 8, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 10, 6, 3, 20, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 12, 3, 3, 22, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 4, 16, 3, 21, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 14, 6, 3, 23, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 13, 17, 3, 24, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 12, 12, 3, 25, MAP_LAVARIDGE_TOWN_GYM_1F - -LavaridgeTown_Gym_B1F_MapEvents:: - map_events LavaridgeTown_Gym_B1F_EventObjects, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc deleted file mode 100644 index fc1d6308aa..0000000000 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_Gym_B1F: - .4byte LavaridgeTown_Gym_B1F_Layout - .4byte LavaridgeTown_Gym_B1F_MapEvents - .4byte LavaridgeTown_Gym_B1F_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_LAVARIDGE_TOWN_GYM_B1F - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json new file mode 100644 index 0000000000..c81e42dc23 --- /dev/null +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -0,0 +1,242 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "name": "LavaridgeTown_Gym_B1F", + "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_B1F", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 4, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_B1F_EventScript_1FE91B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 3, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_B1F_EventScript_1FE8CA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 13, + "y": 17, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_B1F_EventScript_1FE936", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 4, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_B1F_EventScript_1FE951", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 2 + }, + { + "x": 0, + "y": 17, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 6 + }, + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 14, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 7 + }, + { + "x": 2, + "y": 15, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 8 + }, + { + "x": 3, + "y": 14, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 9 + }, + { + "x": 1, + "y": 14, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 10 + }, + { + "x": 0, + "y": 10, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 11 + }, + { + "x": 3, + "y": 10, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 12 + }, + { + "x": 0, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 13 + }, + { + "x": 3, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 14 + }, + { + "x": 5, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 15 + }, + { + "x": 2, + "y": 3, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 16 + }, + { + "x": 5, + "y": 2, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 17 + }, + { + "x": 7, + "y": 2, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 18 + }, + { + "x": 8, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 19 + }, + { + "x": 10, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 20 + }, + { + "x": 12, + "y": 3, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 22 + }, + { + "x": 4, + "y": 16, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 21 + }, + { + "x": 14, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 23 + }, + { + "x": 13, + "y": 17, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 24 + }, + { + "x": 12, + "y": 12, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 25 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_HerbShop/events.inc b/data/maps/LavaridgeTown_HerbShop/events.inc deleted file mode 100644 index 3cce9612fc..0000000000 --- a/data/maps/LavaridgeTown_HerbShop/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -LavaridgeTown_HerbShop_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0 - -LavaridgeTown_HerbShop_MapWarps: - warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN - warp_def 4, 7, 0, 0, MAP_LAVARIDGE_TOWN - -LavaridgeTown_HerbShop_MapEvents:: - map_events LavaridgeTown_HerbShop_EventObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc deleted file mode 100644 index 68fe70df70..0000000000 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_HerbShop: - .4byte LavaridgeTown_HerbShop_Layout - .4byte LavaridgeTown_HerbShop_MapEvents - .4byte LavaridgeTown_HerbShop_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S4 - .2byte LAYOUT_LAVARIDGE_TOWN_HERB_SHOP - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json new file mode 100644 index 0000000000..c8091527c5 --- /dev/null +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_HERB_SHOP", + "name": "LavaridgeTown_HerbShop", + "layout": "LAYOUT_LAVARIDGE_TOWN_HERB_SHOP", + "music": "MUS_MACHI_S4", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_HerbShop_EventScript_1FE4D7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_HerbShop_EventScript_1FE505", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_HerbShop_EventScript_1FE4FC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_House/events.inc b/data/maps/LavaridgeTown_House/events.inc deleted file mode 100644 index 77af1e7461..0000000000 --- a/data/maps/LavaridgeTown_House/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -LavaridgeTown_House_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0 - object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0 - -LavaridgeTown_House_MapWarps: - warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN - warp_def 4, 7, 0, 4, MAP_LAVARIDGE_TOWN - -LavaridgeTown_House_MapEvents:: - map_events LavaridgeTown_House_EventObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc deleted file mode 100644 index 0815c6fb42..0000000000 --- a/data/maps/LavaridgeTown_House/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_House: - .4byte House3_Layout - .4byte LavaridgeTown_House_MapEvents - .4byte LavaridgeTown_House_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S4 - .2byte LAYOUT_HOUSE3 - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json new file mode 100644 index 0000000000..5465c81f84 --- /dev/null +++ b/data/maps/LavaridgeTown_House/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_HOUSE", + "name": "LavaridgeTown_House", + "layout": "LAYOUT_HOUSE3", + "music": "MUS_MACHI_S4", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_House_EventScript_1FF912", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_House_EventScript_1FF91B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_House_EventScript_2C804E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_Mart/events.inc b/data/maps/LavaridgeTown_Mart/events.inc deleted file mode 100644 index 24923dc512..0000000000 --- a/data/maps/LavaridgeTown_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -LavaridgeTown_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0 - -LavaridgeTown_Mart_MapWarps: - warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN - warp_def 4, 7, 0, 2, MAP_LAVARIDGE_TOWN - -LavaridgeTown_Mart_MapEvents:: - map_events LavaridgeTown_Mart_EventObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc deleted file mode 100644 index 9c96370f98..0000000000 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_Mart: - .4byte Mart_Layout - .4byte LavaridgeTown_Mart_MapEvents - .4byte LavaridgeTown_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json new file mode 100644 index 0000000000..1208d3e536 --- /dev/null +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_MART", + "name": "LavaridgeTown_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_Mart_EventScript_1FF9CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_Mart_EventScript_1FF9FE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_Mart_EventScript_1FFA07", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc deleted file mode 100644 index 01974866cb..0000000000 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0 - -LavaridgeTown_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN - warp_def 6, 8, 3, 3, MAP_LAVARIDGE_TOWN - warp_def 1, 6, 4, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F - warp_def 2, 1, 0, 5, MAP_LAVARIDGE_TOWN - -LavaridgeTown_PokemonCenter_1F_MapEvents:: - map_events LavaridgeTown_PokemonCenter_1F_EventObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc deleted file mode 100644 index 4e17b5fd09..0000000000 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_PokemonCenter_1F: - .4byte LavaridgeTown_PokemonCenter_1F_Layout - .4byte LavaridgeTown_PokemonCenter_1F_MapEvents - .4byte LavaridgeTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..18980fb3cb --- /dev/null +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F", + "name": "LavaridgeTown_PokemonCenter_1F", + "layout": "LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 10, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc deleted file mode 100644 index 4da5d3b1ff..0000000000 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -LavaridgeTown_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -LavaridgeTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -LavaridgeTown_PokemonCenter_2F_MapEvents:: - map_events LavaridgeTown_PokemonCenter_2F_EventObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc deleted file mode 100644 index 4a7226e29b..0000000000 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte LavaridgeTown_PokemonCenter_2F_MapEvents - .4byte LavaridgeTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..a8c2ef9a32 --- /dev/null +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F", + "name": "LavaridgeTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity/connections.inc b/data/maps/LilycoveCity/connections.inc deleted file mode 100644 index 6e0cdff931..0000000000 --- a/data/maps/LilycoveCity/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -LilycoveCity_MapConnectionsList: - connection left, 10, MAP_ROUTE121 - connection right, -10, MAP_ROUTE124 - -LilycoveCity_MapConnections: - .4byte 2 - .4byte LilycoveCity_MapConnectionsList - diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc deleted file mode 100644 index 71022af32f..0000000000 --- a/data/maps/LilycoveCity/events.inc +++ /dev/null @@ -1,58 +0,0 @@ -LilycoveCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_EventScript_1E2C53, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C2B, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0 - object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 21, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C4A, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 35, 27, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C72, 0 - object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 35, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0 - object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 34, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0 - object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 57, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0 - object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL - object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS - object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS - object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS - object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2BD8, 0 - object_event 17, EVENT_OBJ_GFX_VAR_0, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, FLAG_HIDE_LILYCOVE_CITY_RIVAL - object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 16, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E302D, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 41, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CEE, 0 - object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CDD, 0 - object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 16, 34, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CCB, 0 - object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CD4, 0 - -LilycoveCity_MapWarps: - warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F - warp_def 37, 24, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F - warp_def 24, 14, 0, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F - warp_def 11, 5, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F - warp_def 23, 24, 0, 0, MAP_LILYCOVE_CITY_CONTEST_LOBBY - warp_def 39, 14, 0, 1, MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB - warp_def 70, 5, 1, 0, MAP_AQUA_HIDEOUT_1F - warp_def 36, 6, 0, 0, MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE - warp_def 42, 6, 0, 0, MAP_LILYCOVE_CITY_HOUSE1 - warp_def 55, 15, 0, 0, MAP_LILYCOVE_CITY_HOUSE2 - warp_def 11, 22, 0, 0, MAP_LILYCOVE_CITY_HOUSE3 - warp_def 12, 14, 0, 0, MAP_LILYCOVE_CITY_HOUSE4 - warp_def 12, 32, 0, 0, MAP_LILYCOVE_CITY_HARBOR - warp_def 12, 5, 0, 1, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F - -LilycoveCity_MapBGEvents: - bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D1A - bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_271E73 - bg_event 29, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D6B - bg_event 26, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_271E73 - bg_event 6, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2CFF - bg_event 29, 24, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D08 - bg_event 35, 24, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D11 - bg_event 6, 30, 3, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D44 - bg_event 36, 14, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D62 - bg_event 34, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D74 - bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE - bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP - bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL - -LilycoveCity_MapEvents:: - map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents - diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc deleted file mode 100644 index 93120b8969..0000000000 --- a/data/maps/LilycoveCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity: - .4byte LilycoveCity_Layout - .4byte LilycoveCity_MapEvents - .4byte LilycoveCity_MapScripts - .4byte LilycoveCity_MapConnections - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json new file mode 100644 index 0000000000..d10f00260b --- /dev/null +++ b/data/maps/LilycoveCity/map.json @@ -0,0 +1,522 @@ +{ + "id": "MAP_LILYCOVE_CITY", + "name": "LilycoveCity", + "layout": "LAYOUT_LILYCOVE_CITY", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 10, + "map": "MAP_ROUTE121" + }, + { + "direction": "right", + "offset": -10, + "map": "MAP_ROUTE124" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 32, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C53", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 15, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C2B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 28, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C22", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 21, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C4A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 16, + "y": 9, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C91", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 35, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C72", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 35, + "y": 37, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C9A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 34, + "y": 37, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2CA3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 57, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2CAC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 73, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2D7D", + "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 61, + "y": 36, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_2910E8", + "flag": "FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 43, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2DD5", + "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 46, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2DBA", + "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 45, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2DC3", + "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 38, + "y": 9, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2DCC", + "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 50, + "y": 7, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2BD8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 27, + "y": 7, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2DDE", + "flag": "FLAG_HIDE_LILYCOVE_CITY_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 16, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E302D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 41, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2CEE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 40, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2CDD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 16, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2CCB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 16, + "y": 35, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2CD4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 27, + "y": 6, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F", + "dest_warp_id": 0 + }, + { + "x": 37, + "y": 24, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", + "dest_warp_id": 0 + }, + { + "x": 24, + "y": 14, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 5, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", + "dest_warp_id": 0 + }, + { + "x": 23, + "y": 24, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 39, + "y": 14, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", + "dest_warp_id": 1 + }, + { + "x": 70, + "y": 5, + "elevation": 1, + "dest_map": "MAP_AQUA_HIDEOUT_1F", + "dest_warp_id": 0 + }, + { + "x": 36, + "y": 6, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 42, + "y": 6, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 55, + "y": 15, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 22, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_HOUSE3", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 14, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_HOUSE4", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 32, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_HARBOR", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 5, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 19, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D1A" + }, + { + "type": "sign", + "x": 25, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LilycoveCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 29, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D6B" + }, + { + "type": "sign", + "x": 26, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LilycoveCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 6, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2CFF" + }, + { + "type": "sign", + "x": 29, + "y": 24, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D08" + }, + { + "type": "sign", + "x": 35, + "y": 24, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D11" + }, + { + "type": "sign", + "x": 6, + "y": 30, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D44" + }, + { + "type": "sign", + "x": 36, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D62" + }, + { + "type": "sign", + "x": 34, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D74" + }, + { + "type": "hidden_item", + "x": 36, + "y": 31, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE" + }, + { + "type": "hidden_item", + "x": 61, + "y": 7, + "elevation": 0, + "item": "ITEM_PP_UP", + "flag": "FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP" + }, + { + "type": "hidden_item", + "x": 64, + "y": 31, + "elevation": 0, + "item": "ITEM_POKE_BALL", + "flag": "FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc deleted file mode 100644 index 838aec23b9..0000000000 --- a/data/maps/LilycoveCity_ContestHall/events.inc +++ /dev/null @@ -1,51 +0,0 @@ -LilycoveCity_ContestHall_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0 - object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0 - object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0 - object_event 9, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 16, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0 - object_event 10, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 24, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0 - object_event 11, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0 - object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0 - object_event 13, EVENT_OBJ_GFX_WOMAN_3, 0, 24, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0 - object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_4, 0, 22, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0 - object_event 16, EVENT_OBJ_GFX_TWIN, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0 - object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0 - object_event 18, EVENT_OBJ_GFX_POKEFAN_F, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_2, 0, 20, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0 - object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0 - object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_3, 0, 36, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0 - object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0 - object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0 - object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0 - object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0 - object_event 28, EVENT_OBJ_GFX_EXPERT_F, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0 - object_event 29, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0 - object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0 - object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 42, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0 - object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0 - -LilycoveCity_ContestHall_MapWarps: - warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY - warp_def 30, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY - warp_def 20, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY - warp_def 31, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY - -LilycoveCity_ContestHall_MapBGEvents: - bg_event 27, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B733 - bg_event 39, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B73C - bg_event 11, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B745 - bg_event 15, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B745 - bg_event 23, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B733 - bg_event 35, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B73C - -LilycoveCity_ContestHall_MapEvents:: - map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents - diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc deleted file mode 100644 index d450c564e8..0000000000 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_ContestHall: - .4byte LilycoveCity_ContestHall_Layout - .4byte LilycoveCity_ContestHall_MapEvents - .4byte LilycoveCity_ContestHall_MapScripts - .4byte 0x0 - .2byte MUS_CONLOBBY - .2byte LAYOUT_LILYCOVE_CITY_CONTEST_HALL - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json new file mode 100644 index 0000000000..644ec55ee3 --- /dev/null +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -0,0 +1,515 @@ +{ + "id": "MAP_LILYCOVE_CITY_CONTEST_HALL", + "name": "LilycoveCity_ContestHall", + "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_HALL", + "music": "MUS_CONLOBBY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 30, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 4, + "movement_range_y": 4, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B485", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 11, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B48E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 40, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B497", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 12, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B4A9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "x": 15, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B4C0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 10, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B4D7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 12, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B4EE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 14, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B505", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 16, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B51C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 8, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B533", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 18, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B56A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 8, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B53C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 24, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B581", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "x": 27, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B598", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 22, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B5AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 24, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B5C6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 26, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B5DD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 28, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B5F4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 20, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B60B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 30, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B639", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 26, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B622", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 13, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B553", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 36, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B650", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "x": 39, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B667", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 34, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B67E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 36, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B695", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 38, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B6AC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 40, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B6C3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 32, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B6DA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 37, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B71C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 42, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B705", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 23, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B4A0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 19, + "y": 32, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", + "dest_warp_id": 2 + }, + { + "x": 30, + "y": 32, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", + "dest_warp_id": 3 + }, + { + "x": 20, + "y": 32, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", + "dest_warp_id": 2 + }, + { + "x": 31, + "y": 32, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 27, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestHall_EventScript_21B733" + }, + { + "type": "sign", + "x": 39, + "y": 28, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestHall_EventScript_21B73C" + }, + { + "type": "sign", + "x": 11, + "y": 28, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestHall_EventScript_21B745" + }, + { + "type": "sign", + "x": 15, + "y": 28, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestHall_EventScript_21B745" + }, + { + "type": "sign", + "x": 23, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestHall_EventScript_21B733" + }, + { + "type": "sign", + "x": 35, + "y": 28, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestHall_EventScript_21B73C" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc deleted file mode 100644 index 68c682a257..0000000000 --- a/data/maps/LilycoveCity_ContestLobby/events.inc +++ /dev/null @@ -1,50 +0,0 @@ -LilycoveCity_ContestLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 26, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 9, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 4, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0 - object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER - object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 23, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0 - object_event 10, EVENT_OBJ_GFX_TWIN, 0, 28, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0 - object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 21, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2 - object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0 - object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0 - object_event 14, EVENT_OBJ_GFX_NINJA_BOY, 0, 8, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0 - object_event 15, EVENT_OBJ_GFX_POKEFAN_F, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0 - object_event 16, EVENT_OBJ_GFX_EXPERT_M, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT - object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 24, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0 - object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 27, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 28, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 23, EVENT_OBJ_GFX_NINJA_BOY, 0, 26, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 24, EVENT_OBJ_GFX_OLD_MAN, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0 - -LilycoveCity_ContestLobby_MapWarps: - warp_def 14, 11, 0, 4, MAP_LILYCOVE_CITY - warp_def 15, 11, 0, 4, MAP_LILYCOVE_CITY - warp_def 9, 1, 0, 0, MAP_LILYCOVE_CITY_CONTEST_HALL - warp_def 21, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL - -LilycoveCity_ContestLobby_MapBGEvents: - bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_PblockLink - bg_event 23, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293E1E - bg_event 23, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A753 - bg_event 25, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A75A - bg_event 27, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A761 - bg_event 30, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A77A - bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A73E - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A745 - bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A74C - bg_event 27, 5, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_Pblock1_Ask - bg_event 27, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293D4D - bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A784 - -LilycoveCity_ContestLobby_MapEvents:: - map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents - diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc deleted file mode 100644 index d00e7190d6..0000000000 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_ContestLobby: - .4byte LilycoveCity_ContestLobby_Layout - .4byte LilycoveCity_ContestLobby_MapEvents - .4byte LilycoveCity_ContestLobby_MapScripts - .4byte 0x0 - .2byte MUS_CONLOBBY - .2byte LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json new file mode 100644 index 0000000000..65571d71ca --- /dev/null +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -0,0 +1,472 @@ +{ + "id": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", + "name": "LilycoveCity_ContestLobby", + "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY", + "music": "MUS_CONLOBBY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 14, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A554", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 15, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A806", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 26, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_293FA2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "x": 9, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 18, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A708", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 4, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A711", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A71A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_28CA59", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 23, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A768", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 28, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_293FB4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "x": 21, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A72C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 0, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A723", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A735", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 22, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_293FAB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 26, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_293FBD", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 24, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A771", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 27, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A7B3", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 28, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A7BE", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 28, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A7C9", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_2", + "x": 26, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A7D9", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 27, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A7E9", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 26, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A7A8", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 26, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A798", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 9, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21ACF1", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 14, + "y": 11, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 4 + }, + { + "x": 15, + "y": 11, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 4 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_HALL", + "dest_warp_id": 0 + }, + { + "x": 21, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_HALL", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 23, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "EventScript_PblockLink" + }, + { + "type": "sign", + "x": 23, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_293E1E" + }, + { + "type": "sign", + "x": 23, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A753" + }, + { + "type": "sign", + "x": 25, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A75A" + }, + { + "type": "sign", + "x": 27, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A761" + }, + { + "type": "sign", + "x": 30, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A77A" + }, + { + "type": "sign", + "x": 3, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A73E" + }, + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A745" + }, + { + "type": "sign", + "x": 7, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A74C" + }, + { + "type": "sign", + "x": 27, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "EventScript_Pblock1_Ask" + }, + { + "type": "sign", + "x": 27, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_293D4D" + }, + { + "type": "sign", + "x": 18, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A784" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc deleted file mode 100644 index e769c3c9f1..0000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_CoveLilyMotel_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0 - -LilycoveCity_CoveLilyMotel_1F_MapWarps: - warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY - warp_def 6, 8, 0, 1, MAP_LILYCOVE_CITY - warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F - -LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: - coord_event 10, 2, 3, VAR_TEMP_1, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211 - -LilycoveCity_CoveLilyMotel_1F_MapEvents:: - map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 - diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc deleted file mode 100644 index ab7811a465..0000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_CoveLilyMotel_1F: - .4byte LilycoveCity_CoveLilyMotel_1F_Layout - .4byte LilycoveCity_CoveLilyMotel_1F_MapEvents - .4byte LilycoveCity_CoveLilyMotel_1F_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json new file mode 100644 index 0000000000..f00b407c70 --- /dev/null +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -0,0 +1,66 @@ +{ + "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", + "name": "LilycoveCity_CoveLilyMotel_1F", + "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_218189", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 2, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_218211" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc deleted file mode 100644 index b7f973a847..0000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_CoveLilyMotel_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - object_event 5, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, FLAG_HIDE_LILCOVE_MOTEL_SCOTT - -LilycoveCity_CoveLilyMotel_2F_MapWarps: - warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F - -LilycoveCity_CoveLilyMotel_2F_MapEvents:: - map_events LilycoveCity_CoveLilyMotel_2F_EventObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc deleted file mode 100644 index 769cd8b0dc..0000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_CoveLilyMotel_2F: - .4byte LilycoveCity_CoveLilyMotel_2F_Layout - .4byte LilycoveCity_CoveLilyMotel_2F_MapEvents - .4byte LilycoveCity_CoveLilyMotel_2F_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json new file mode 100644 index 0000000000..94ae040698 --- /dev/null +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -0,0 +1,120 @@ +{ + "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", + "name": "LilycoveCity_CoveLilyMotel_2F", + "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218729", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218732", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218720", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218744", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_21873B", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_21874D", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_SCOTT" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc deleted file mode 100644 index 307cb2d58d..0000000000 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -LilycoveCity_DepartmentStoreElevator_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0 - -LilycoveCity_DepartmentStoreElevator_MapWarps: - warp_def 1, 5, 3, 127, MAP_NONE - warp_def 2, 5, 3, 127, MAP_NONE - -LilycoveCity_DepartmentStoreElevator_MapEvents:: - map_events LilycoveCity_DepartmentStoreElevator_EventObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc deleted file mode 100644 index 8576dcbf29..0000000000 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStoreElevator: - .4byte LilycoveCity_DepartmentStoreElevator_Layout - .4byte LilycoveCity_DepartmentStoreElevator_MapEvents - .4byte LilycoveCity_DepartmentStoreElevator_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json new file mode 100644 index 0000000000..2c22272ac3 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "name": "LilycoveCity_DepartmentStoreElevator", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStoreElevator_EventScript_220624", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc deleted file mode 100644 index c44562b060..0000000000 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -LilycoveCity_DepartmentStoreRooftop_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0 - object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0 - -LilycoveCity_DepartmentStoreRooftop_MapWarps: - warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F - -LilycoveCity_DepartmentStoreRooftop_MapBGEvents: - bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 - bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 - -LilycoveCity_DepartmentStoreRooftop_MapEvents:: - map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents - diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc deleted file mode 100644 index 775260145a..0000000000 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStoreRooftop: - .4byte LilycoveCity_DepartmentStoreRooftop_Layout - .4byte LilycoveCity_DepartmentStoreRooftop_MapEvents - .4byte LilycoveCity_DepartmentStoreRooftop_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json new file mode 100644 index 0000000000..784660e368 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -0,0 +1,98 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", + "name": "LilycoveCity_DepartmentStoreRooftop", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220268", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_22028C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN", + "x": 6, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_22022F", + "flag": "FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 15, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 3, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 9, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220295" + }, + { + "type": "sign", + "x": 10, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220295" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc deleted file mode 100644 index 12d4726fbe..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -LilycoveCity_DepartmentStore_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 4, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0 - object_event 5, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0 - -LilycoveCity_DepartmentStore_1F_MapWarps: - warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY - warp_def 9, 7, 0, 0, MAP_LILYCOVE_CITY - warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F - warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - -LilycoveCity_DepartmentStore_1F_MapBGEvents: - bg_event 0, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_DepartmentStore_1F_EventScript_21F85D - -LilycoveCity_DepartmentStore_1F_MapEvents:: - map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents - diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc deleted file mode 100644 index 27ae23d5f5..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_1F: - .4byte LilycoveCity_DepartmentStore_1F_Layout - .4byte LilycoveCity_DepartmentStore_1F_MapEvents - .4byte LilycoveCity_DepartmentStore_1F_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json new file mode 100644 index 0000000000..58e400ff46 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -0,0 +1,137 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F", + "name": "LilycoveCity_DepartmentStore_1F", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F693", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F69C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F82F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F838", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F841", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F84A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 0, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F85D" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc deleted file mode 100644 index 4854c51e96..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0 - -LilycoveCity_DepartmentStore_2F_MapWarps: - warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F - warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F - warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - -LilycoveCity_DepartmentStore_2F_MapEvents:: - map_events LilycoveCity_DepartmentStore_2F_EventObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc deleted file mode 100644 index 62f5dcab3c..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_2F: - .4byte LilycoveCity_DepartmentStore_2F_Layout - .4byte LilycoveCity_DepartmentStore_2F_MapEvents - .4byte LilycoveCity_DepartmentStore_2F_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json new file mode 100644 index 0000000000..b3fd03f005 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F", + "name": "LilycoveCity_DepartmentStore_2F", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_COOK", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB2D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB36", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 13, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB3F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB7A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB48", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc deleted file mode 100644 index 2eed8c39fb..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_3F_EventObjects: - object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0 - -LilycoveCity_DepartmentStore_3F_MapWarps: - warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F - warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F - warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - -LilycoveCity_DepartmentStore_3F_MapEvents:: - map_events LilycoveCity_DepartmentStore_3F_EventObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc deleted file mode 100644 index 624671aea3..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_3F: - .4byte LilycoveCity_DepartmentStore_3F_Layout - .4byte LilycoveCity_DepartmentStore_3F_MapEvents - .4byte LilycoveCity_DepartmentStore_3F_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json new file mode 100644 index 0000000000..e9d5785e63 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F", + "name": "LilycoveCity_DepartmentStore_3F", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCB6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCBF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 13, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCC8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FC65", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FC8C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F", + "dest_warp_id": 1 + }, + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc deleted file mode 100644 index 77df01a38d..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_4F_EventObjects: - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0 - -LilycoveCity_DepartmentStore_4F_MapWarps: - warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F - warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F - warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - -LilycoveCity_DepartmentStore_4F_MapEvents:: - map_events LilycoveCity_DepartmentStore_4F_EventObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc deleted file mode 100644 index df74e3c2f8..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_4F: - .4byte LilycoveCity_DepartmentStore_4F_Layout - .4byte LilycoveCity_DepartmentStore_4F_MapEvents - .4byte LilycoveCity_DepartmentStore_4F_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json new file mode 100644 index 0000000000..b41eecd31f --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F", + "name": "LilycoveCity_DepartmentStore_4F", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDEB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDF4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 13, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDFD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FE06", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FE2C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F", + "dest_warp_id": 1 + }, + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc deleted file mode 100644 index d4492d7e98..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -LilycoveCity_DepartmentStore_5F_EventObjects: - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 17, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0 - -LilycoveCity_DepartmentStore_5F_MapWarps: - warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F - warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP - -LilycoveCity_DepartmentStore_5F_MapEvents:: - map_events LilycoveCity_DepartmentStore_5F_EventObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc deleted file mode 100644 index 938cfc7b8f..0000000000 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_5F: - .4byte LilycoveCity_DepartmentStore_5F_Layout - .4byte LilycoveCity_DepartmentStore_5F_MapEvents - .4byte LilycoveCity_DepartmentStore_5F_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json new file mode 100644 index 0000000000..6ea8bbbf27 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -0,0 +1,134 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F", + "name": "LilycoveCity_DepartmentStore_5F", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_2200BC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_22006C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_21FFA6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_21FFDC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 15, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_22000A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 17, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_22003A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_220075", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_Harbor/events.inc b/data/maps/LilycoveCity_Harbor/events.inc deleted file mode 100644 index ad43f2bf1d..0000000000 --- a/data/maps/LilycoveCity_Harbor/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_Harbor_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR - object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER - -LilycoveCity_Harbor_MapWarps: - warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY - warp_def 12, 14, 0, 12, MAP_LILYCOVE_CITY - -LilycoveCity_Harbor_MapEvents:: - map_events LilycoveCity_Harbor_EventObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc deleted file mode 100644 index b332f5df72..0000000000 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_Harbor: - .4byte Harbor_Layout - .4byte LilycoveCity_Harbor_MapEvents - .4byte LilycoveCity_Harbor_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_HARBOR - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json new file mode 100644 index 0000000000..1eb68641ac --- /dev/null +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_LILYCOVE_CITY_HARBOR", + "name": "LilycoveCity_Harbor", + "layout": "LAYOUT_HARBOR", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_Harbor_EventScript_21E00F", + "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 8, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 3, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_Harbor_EventScript_21E637", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER" + } + ], + "warp_events": [ + { + "x": 11, + "y": 14, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 12 + }, + { + "x": 12, + "y": 14, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 12 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_House1/events.inc b/data/maps/LilycoveCity_House1/events.inc deleted file mode 100644 index 31515dae93..0000000000 --- a/data/maps/LilycoveCity_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -LilycoveCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0 - -LilycoveCity_House1_MapWarps: - warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY - warp_def 4, 8, 0, 8, MAP_LILYCOVE_CITY - -LilycoveCity_House1_MapEvents:: - map_events LilycoveCity_House1_EventObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc deleted file mode 100644 index 68da92f8a0..0000000000 --- a/data/maps/LilycoveCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_House1: - .4byte House1_Layout - .4byte LilycoveCity_House1_MapEvents - .4byte LilycoveCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json new file mode 100644 index 0000000000..b8d59e9531 --- /dev/null +++ b/data/maps/LilycoveCity_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_LILYCOVE_CITY_HOUSE1", + "name": "LilycoveCity_House1", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House1_EventScript_21ECCE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House1_EventScript_21ECD7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 8 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_House2/events.inc b/data/maps/LilycoveCity_House2/events.inc deleted file mode 100644 index e7c1b3cd7c..0000000000 --- a/data/maps/LilycoveCity_House2/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -LilycoveCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0 - -LilycoveCity_House2_MapWarps: - warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY - warp_def 3, 7, 0, 9, MAP_LILYCOVE_CITY - -LilycoveCity_House2_MapEvents:: - map_events LilycoveCity_House2_EventObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc deleted file mode 100644 index 93ff11013c..0000000000 --- a/data/maps/LilycoveCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_House2: - .4byte LilycoveCity_House2_Layout - .4byte LilycoveCity_House2_MapEvents - .4byte LilycoveCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_HOUSE2 - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json new file mode 100644 index 0000000000..87f5a52d9d --- /dev/null +++ b/data/maps/LilycoveCity_House2/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_LILYCOVE_CITY_HOUSE2", + "name": "LilycoveCity_House2", + "layout": "LAYOUT_LILYCOVE_CITY_HOUSE2", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House2_EventScript_21ED75", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 9 + }, + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_House3/events.inc b/data/maps/LilycoveCity_House3/events.inc deleted file mode 100644 index 4e577400b7..0000000000 --- a/data/maps/LilycoveCity_House3/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_House3_EventObjects: - object_event 1, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0 - object_event 3, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0 - object_event 4, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0 - object_event 5, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0 - -LilycoveCity_House3_MapWarps: - warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY - warp_def 4, 7, 0, 10, MAP_LILYCOVE_CITY - -LilycoveCity_House3_MapEvents:: - map_events LilycoveCity_House3_EventObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc deleted file mode 100644 index 3788a2ee9c..0000000000 --- a/data/maps/LilycoveCity_House3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_House3: - .4byte House2_Layout - .4byte LilycoveCity_House3_MapEvents - .4byte LilycoveCity_House3_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json new file mode 100644 index 0000000000..78dffc5f0b --- /dev/null +++ b/data/maps/LilycoveCity_House3/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_LILYCOVE_CITY_HOUSE3", + "name": "LilycoveCity_House3", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House3_EventScript_21EF3D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House3_EventScript_21EE4B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House3_EventScript_21EED5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House3_EventScript_21EF09", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House3_EventScript_21EEA1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House3_EventScript_21EE8A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 10 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_House4/events.inc b/data/maps/LilycoveCity_House4/events.inc deleted file mode 100644 index aa586c64fe..0000000000 --- a/data/maps/LilycoveCity_House4/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -LilycoveCity_House4_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0 - -LilycoveCity_House4_MapWarps: - warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY - warp_def 4, 8, 0, 11, MAP_LILYCOVE_CITY - -LilycoveCity_House4_MapEvents:: - map_events LilycoveCity_House4_EventObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc deleted file mode 100644 index b0ee0ed360..0000000000 --- a/data/maps/LilycoveCity_House4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_House4: - .4byte House1_Layout - .4byte LilycoveCity_House4_MapEvents - .4byte LilycoveCity_House4_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json new file mode 100644 index 0000000000..72cd396f02 --- /dev/null +++ b/data/maps/LilycoveCity_House4/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_LILYCOVE_CITY_HOUSE4", + "name": "LilycoveCity_House4", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House4_EventScript_21F5B5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House4_EventScript_21F5BE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 11 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 11 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc deleted file mode 100644 index a41748c694..0000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -LilycoveCity_LilycoveMuseum_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0 - object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 - object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 - object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS - object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 - -LilycoveCity_LilycoveMuseum_1F_MapWarps: - warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY - warp_def 10, 13, 0, 13, MAP_LILYCOVE_CITY - warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F - -LilycoveCity_LilycoveMuseum_1F_MapBGEvents: - bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD - bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1 - bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1 - bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4 - bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6 - bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6 - bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA - bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4 - bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8 - bg_event 17, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC - bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF - bg_event 20, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF - bg_event 18, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC - bg_event 18, 11, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3 - bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC - -LilycoveCity_LilycoveMuseum_1F_MapEvents:: - map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents - diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc deleted file mode 100644 index 7a50114fa0..0000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_LilycoveMuseum_1F: - .4byte LilycoveCity_LilycoveMuseum_1F_Layout - .4byte LilycoveCity_LilycoveMuseum_1F_MapEvents - .4byte LilycoveCity_LilycoveMuseum_1F_MapScripts - .4byte 0x0 - .2byte MUS_BIJYUTU - .2byte LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json new file mode 100644 index 0000000000..72f376e23e --- /dev/null +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -0,0 +1,302 @@ +{ + "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", + "name": "LilycoveCity_LilycoveMuseum_1F", + "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", + "music": "MUS_BIJYUTU", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 5, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 16, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 2, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E07", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 3, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E10", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 11, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E19", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "x": 19, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E42", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E22", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3" + } + ], + "warp_events": [ + { + "x": 9, + "y": 13, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 3 + }, + { + "x": 10, + "y": 13, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 13 + }, + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 1, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD" + }, + { + "type": "sign", + "x": 2, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD" + }, + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1" + }, + { + "type": "sign", + "x": 6, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1" + }, + { + "type": "sign", + "x": 9, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4" + }, + { + "type": "sign", + "x": 3, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6" + }, + { + "type": "sign", + "x": 2, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6" + }, + { + "type": "sign", + "x": 15, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA" + }, + { + "type": "sign", + "x": 11, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4" + }, + { + "type": "sign", + "x": 6, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8" + }, + { + "type": "sign", + "x": 17, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC" + }, + { + "type": "sign", + "x": 19, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF" + }, + { + "type": "sign", + "x": 20, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF" + }, + { + "type": "sign", + "x": 18, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC" + }, + { + "type": "sign", + "x": 18, + "y": 11, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3" + }, + { + "type": "sign", + "x": 16, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc deleted file mode 100644 index f6969462c4..0000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -LilycoveCity_LilycoveMuseum_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS - object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS - -LilycoveCity_LilycoveMuseum_2F_MapWarps: - warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F - -LilycoveCity_LilycoveMuseum_2F_MapBGEvents: - bg_event 14, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B - bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B - bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E - bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E - bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219951 - bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219951 - bg_event 19, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219964 - bg_event 18, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219964 - bg_event 6, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219977 - bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219977 - bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA - bg_event 15, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA - -LilycoveCity_LilycoveMuseum_2F_MapEvents:: - map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents - diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc deleted file mode 100644 index f1ba72c036..0000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_LilycoveMuseum_2F: - .4byte LilycoveCity_LilycoveMuseum_2F_Layout - .4byte LilycoveCity_LilycoveMuseum_2F_MapEvents - .4byte LilycoveCity_LilycoveMuseum_2F_MapScripts - .4byte 0x0 - .2byte MUS_BIJYUTU - .2byte LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json new file mode 100644 index 0000000000..ab2ae56fb2 --- /dev/null +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -0,0 +1,178 @@ +{ + "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", + "name": "LilycoveCity_LilycoveMuseum_2F", + "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", + "music": "MUS_BIJYUTU", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219866", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 19, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21998A", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219993", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21999C", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" + } + ], + "warp_events": [ + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21992B" + }, + { + "type": "sign", + "x": 15, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21992B" + }, + { + "type": "sign", + "x": 3, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21993E" + }, + { + "type": "sign", + "x": 2, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21993E" + }, + { + "type": "sign", + "x": 10, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219951" + }, + { + "type": "sign", + "x": 11, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219951" + }, + { + "type": "sign", + "x": 19, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219964" + }, + { + "type": "sign", + "x": 18, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219964" + }, + { + "type": "sign", + "x": 6, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219977" + }, + { + "type": "sign", + "x": 7, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219977" + }, + { + "type": "sign", + "x": 11, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA" + }, + { + "type": "sign", + "x": 15, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc deleted file mode 100644 index 8a606ce7e0..0000000000 --- a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -LilycoveCity_MoveDeletersHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0 - -LilycoveCity_MoveDeletersHouse_MapWarps: - warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY - warp_def 4, 7, 0, 7, MAP_LILYCOVE_CITY - -LilycoveCity_MoveDeletersHouse_MapEvents:: - map_events LilycoveCity_MoveDeletersHouse_EventObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc deleted file mode 100644 index 46a0f964eb..0000000000 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_MoveDeletersHouse: - .4byte House2_Layout - .4byte LilycoveCity_MoveDeletersHouse_MapEvents - .4byte LilycoveCity_MoveDeletersHouse_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json new file mode 100644 index 0000000000..d200fad221 --- /dev/null +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE", + "name": "LilycoveCity_MoveDeletersHouse", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_MoveDeletersHouse_EventScript_21EA0B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 7 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 5a46fe756d..0000000000 --- a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0 - object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0 - object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY - -LilycoveCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY - warp_def 6, 8, 3, 2, MAP_LILYCOVE_CITY - warp_def 1, 6, 4, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_2F - -LilycoveCity_PokemonCenter_1F_MapEvents:: - map_events LilycoveCity_PokemonCenter_1F_EventObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc deleted file mode 100644 index e264b0955f..0000000000 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte LilycoveCity_PokemonCenter_1F_MapEvents - .4byte LilycoveCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..b58418edd9 --- /dev/null +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F", + "name": "LilycoveCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5F6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5FF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_1F_EventScript_2A836B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_1F_EventScript_2A89C7", + "flag": "FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_LILYCOVE_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc deleted file mode 100644 index accbba24d8..0000000000 --- a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -LilycoveCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -LilycoveCity_PokemonCenter_2F_MapEvents:: - map_events LilycoveCity_PokemonCenter_2F_EventObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc deleted file mode 100644 index bd96ad98ba..0000000000 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte LilycoveCity_PokemonCenter_2F_MapEvents - .4byte LilycoveCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..346a911732 --- /dev/null +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_2F", + "name": "LilycoveCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc deleted file mode 100644 index f5755f50f5..0000000000 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -LilycoveCity_PokemonTrainerFanClub_EventObjects: - object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0 - object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, FLAG_HIDE_FANCLUB_LITTLE_BOY - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, FLAG_HIDE_FANCLUB_BOY - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, FLAG_HIDE_FANCLUB_LADY - object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, FLAG_HIDE_FANCLUB_OLD_LADY - object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER - -LilycoveCity_PokemonTrainerFanClub_MapWarps: - warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY - warp_def 5, 13, 0, 5, MAP_LILYCOVE_CITY - -LilycoveCity_PokemonTrainerFanClub_MapEvents:: - map_events LilycoveCity_PokemonTrainerFanClub_EventObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc deleted file mode 100644 index 61f306b69e..0000000000 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_PokemonTrainerFanClub: - .4byte LilycoveCity_PokemonTrainerFanClub_Layout - .4byte LilycoveCity_PokemonTrainerFanClub_MapEvents - .4byte LilycoveCity_PokemonTrainerFanClub_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json new file mode 100644 index 0000000000..b48876cce0 --- /dev/null +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -0,0 +1,153 @@ +{ + "id": "MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", + "name": "LilycoveCity_PokemonTrainerFanClub", + "layout": "LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 6, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 7, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3", + "flag": "FLAG_HIDE_FANCLUB_LITTLE_BOY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 1, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55", + "flag": "FLAG_HIDE_FANCLUB_BOY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 3, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7", + "flag": "FLAG_HIDE_FANCLUB_LADY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19", + "flag": "FLAG_HIDE_FANCLUB_OLD_LADY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B", + "flag": "FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER" + } + ], + "warp_events": [ + { + "x": 6, + "y": 13, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 13, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_UnusedMart/events.inc b/data/maps/LilycoveCity_UnusedMart/events.inc deleted file mode 100644 index 5a4eeaac9e..0000000000 --- a/data/maps/LilycoveCity_UnusedMart/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -LilycoveCity_UnusedMart_MapWarps: - warp_def 3, 7, 0, 0, MAP_LILYCOVE_CITY - warp_def 4, 7, 0, 0, MAP_LILYCOVE_CITY - -LilycoveCity_UnusedMart_MapEvents:: - map_events 0x0, LilycoveCity_UnusedMart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc deleted file mode 100644 index 1885305313..0000000000 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_UnusedMart: - .4byte Mart_Layout - .4byte LilycoveCity_UnusedMart_MapEvents - .4byte LilycoveCity_UnusedMart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_UnusedMart/map.json b/data/maps/LilycoveCity_UnusedMart/map.json new file mode 100644 index 0000000000..44cd20815a --- /dev/null +++ b/data/maps/LilycoveCity_UnusedMart/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_LILYCOVE_CITY_UNUSED_MART", + "name": "LilycoveCity_UnusedMart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc deleted file mode 100644 index d8a0e93d37..0000000000 --- a/data/maps/LinkContestRoom1/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -LinkContestRoom1_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_VAR_7, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_VAR_8, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 10, EVENT_OBJ_GFX_VAR_9, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_VAR_A, 0, 12, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_VAR_5, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_POKE_BALL - object_event 14, EVENT_OBJ_GFX_VAR_3, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 - -LinkContestRoom1_MapEvents:: - map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc deleted file mode 100644 index 24a33fdfc9..0000000000 --- a/data/maps/LinkContestRoom1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom1: - .4byte LinkContestRoom1_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_CONTEST0 - .2byte LAYOUT_LINK_CONTEST_ROOM1 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LinkContestRoom1/map.json b/data/maps/LinkContestRoom1/map.json new file mode 100644 index 0000000000..538b0af697 --- /dev/null +++ b/data/maps/LinkContestRoom1/map.json @@ -0,0 +1,216 @@ +{ + "id": "MAP_LINK_CONTEST_ROOM1", + "name": "LinkContestRoom1", + "layout": "LAYOUT_LINK_CONTEST_ROOM1", + "music": "MUS_CONTEST0", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 6, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_LINK_CONTEST_POKE_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "x": 12, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LinkContestRoom2/events.inc b/data/maps/LinkContestRoom2/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/LinkContestRoom2/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc deleted file mode 100644 index 50d0a74255..0000000000 --- a/data/maps/LinkContestRoom2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom2: - .4byte LinkContestRoom2_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_CONTEST0 - .2byte LAYOUT_LINK_CONTEST_ROOM2 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LinkContestRoom2/map.json b/data/maps/LinkContestRoom2/map.json new file mode 100644 index 0000000000..b02da178f2 --- /dev/null +++ b/data/maps/LinkContestRoom2/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_LINK_CONTEST_ROOM2", + "name": "LinkContestRoom2", + "layout": "LAYOUT_LINK_CONTEST_ROOM2", + "music": "MUS_CONTEST0", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/LinkContestRoom3/events.inc b/data/maps/LinkContestRoom3/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/LinkContestRoom3/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc deleted file mode 100644 index 06f9ffd19b..0000000000 --- a/data/maps/LinkContestRoom3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom3: - .4byte LinkContestRoom3_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_CONTEST0 - .2byte LAYOUT_LINK_CONTEST_ROOM3 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LinkContestRoom3/map.json b/data/maps/LinkContestRoom3/map.json new file mode 100644 index 0000000000..fb0bf29e03 --- /dev/null +++ b/data/maps/LinkContestRoom3/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_LINK_CONTEST_ROOM3", + "name": "LinkContestRoom3", + "layout": "LAYOUT_LINK_CONTEST_ROOM3", + "music": "MUS_CONTEST0", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/LinkContestRoom4/events.inc b/data/maps/LinkContestRoom4/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/LinkContestRoom4/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc deleted file mode 100644 index eba4cb0bd0..0000000000 --- a/data/maps/LinkContestRoom4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom4: - .4byte LinkContestRoom4_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_CONTEST0 - .2byte LAYOUT_LINK_CONTEST_ROOM4 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LinkContestRoom4/map.json b/data/maps/LinkContestRoom4/map.json new file mode 100644 index 0000000000..85d12ece4e --- /dev/null +++ b/data/maps/LinkContestRoom4/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_LINK_CONTEST_ROOM4", + "name": "LinkContestRoom4", + "layout": "LAYOUT_LINK_CONTEST_ROOM4", + "music": "MUS_CONTEST0", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/LinkContestRoom5/events.inc b/data/maps/LinkContestRoom5/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/LinkContestRoom5/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc deleted file mode 100644 index 12ec2d40d7..0000000000 --- a/data/maps/LinkContestRoom5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom5: - .4byte LinkContestRoom5_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_CONTEST0 - .2byte LAYOUT_LINK_CONTEST_ROOM5 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LinkContestRoom5/map.json b/data/maps/LinkContestRoom5/map.json new file mode 100644 index 0000000000..f312d4c2b3 --- /dev/null +++ b/data/maps/LinkContestRoom5/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_LINK_CONTEST_ROOM5", + "name": "LinkContestRoom5", + "layout": "LAYOUT_LINK_CONTEST_ROOM5", + "music": "MUS_CONTEST0", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/LinkContestRoom6/events.inc b/data/maps/LinkContestRoom6/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/LinkContestRoom6/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc deleted file mode 100644 index 77f1c14c71..0000000000 --- a/data/maps/LinkContestRoom6/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom6: - .4byte LinkContestRoom6_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_CONTEST0 - .2byte LAYOUT_LINK_CONTEST_ROOM6 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LinkContestRoom6/map.json b/data/maps/LinkContestRoom6/map.json new file mode 100644 index 0000000000..38bfcd9798 --- /dev/null +++ b/data/maps/LinkContestRoom6/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_LINK_CONTEST_ROOM6", + "name": "LinkContestRoom6", + "layout": "LAYOUT_LINK_CONTEST_ROOM6", + "music": "MUS_CONTEST0", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/LittlerootTown/connections.inc b/data/maps/LittlerootTown/connections.inc deleted file mode 100644 index bfd3b0ab78..0000000000 --- a/data/maps/LittlerootTown/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -LittlerootTown_MapConnectionsList: - connection up, 0, MAP_ROUTE101 - -LittlerootTown_MapConnections: - .4byte 1 - .4byte LittlerootTown_MapConnectionsList - diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc deleted file mode 100644 index 3d81193b09..0000000000 --- a/data/maps/LittlerootTown/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -LittlerootTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_TWIN, 0, 16, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, LittlerootTown_EventScript_1E8034, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E8022, FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E802B, 0 - object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE - object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK - object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK - object_event 7, EVENT_OBJ_GFX_VAR_0, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_RIVAL - object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BIRCH - -LittlerootTown_MapWarps: - warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F - warp_def 5, 8, 0, 1, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F - warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB - -LittlerootTown_MapCoordEvents: - coord_event 10, 1, 3, VAR_0x4050, 0, LittlerootTown_EventScript_1E8091 - coord_event 11, 1, 3, VAR_0x4050, 0, LittlerootTown_EventScript_1E80EF - coord_event 11, 1, 3, VAR_0x4050, 1, LittlerootTown_EventScript_1E811F - coord_event 8, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81F9 - coord_event 9, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E8205 - coord_event 10, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81E1 - coord_event 11, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81ED - coord_event 10, 2, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81BB - coord_event 11, 2, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81CE - -LittlerootTown_MapBGEvents: - bg_event 15, 13, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E8151 - bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E815A - bg_event 7, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E8163 - bg_event 12, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E818F - -LittlerootTown_MapEvents:: - map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents - diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc deleted file mode 100644 index c1565535c3..0000000000 --- a/data/maps/LittlerootTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown: - .4byte LittlerootTown_Layout - .4byte LittlerootTown_MapEvents - .4byte LittlerootTown_MapScripts - .4byte LittlerootTown_MapConnections - .2byte MUS_MISHIRO - .2byte LAYOUT_LITTLEROOT_TOWN - .byte MAPSEC_LITTLEROOT_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json new file mode 100644 index 0000000000..28decfc87f --- /dev/null +++ b/data/maps/LittlerootTown/map.json @@ -0,0 +1,268 @@ +{ + "id": "MAP_LITTLEROOT_TOWN", + "name": "LittlerootTown", + "layout": "LAYOUT_LITTLEROOT_TOWN", + "music": "MUS_MISHIRO", + "region_map_section": "MAPSEC_LITTLEROOT_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE101" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 16, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_EventScript_1E8034", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 12, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_EventScript_1E8022", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 14, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_EventScript_1E802B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MOM", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_EventScript_1E863D", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRUCK", + "x": 2, + "y": 10, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRUCK", + "x": 11, + "y": 10, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 14, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCH" + } + ], + "warp_events": [ + { + "x": 14, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 16, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 1, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 0, + "script": "LittlerootTown_EventScript_1E8091" + }, + { + "type": "trigger", + "x": 11, + "y": 1, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 0, + "script": "LittlerootTown_EventScript_1E80EF" + }, + { + "type": "trigger", + "x": 11, + "y": 1, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 1, + "script": "LittlerootTown_EventScript_1E811F" + }, + { + "type": "trigger", + "x": 8, + "y": 9, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 3, + "script": "LittlerootTown_EventScript_1E81F9" + }, + { + "type": "trigger", + "x": 9, + "y": 9, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 3, + "script": "LittlerootTown_EventScript_1E8205" + }, + { + "type": "trigger", + "x": 10, + "y": 9, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 3, + "script": "LittlerootTown_EventScript_1E81E1" + }, + { + "type": "trigger", + "x": 11, + "y": 9, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 3, + "script": "LittlerootTown_EventScript_1E81ED" + }, + { + "type": "trigger", + "x": 10, + "y": 2, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 3, + "script": "LittlerootTown_EventScript_1E81BB" + }, + { + "type": "trigger", + "x": 11, + "y": 2, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 3, + "script": "LittlerootTown_EventScript_1E81CE" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 15, + "y": 13, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_EventScript_1E8151" + }, + { + "type": "sign", + "x": 6, + "y": 17, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_EventScript_1E815A" + }, + { + "type": "sign", + "x": 7, + "y": 8, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_EventScript_1E8163" + }, + { + "type": "sign", + "x": 12, + "y": 8, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_EventScript_1E818F" + } + ] +} \ No newline at end of file diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc deleted file mode 100644 index ad4d1a4a67..0000000000 --- a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -LittlerootTown_BrendansHouse_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM - object_event 2, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 1, 3, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 - object_event 3, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 4, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_PLAYERS_HOUSE_DAD - object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING - object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN - -LittlerootTown_BrendansHouse_1F_MapWarps: - warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN - warp_def 8, 8, 0, 1, MAP_LITTLEROOT_TOWN - warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F - -LittlerootTown_BrendansHouse_1F_MapCoordEvents: - coord_event 8, 8, 0, VAR_0x4092, 4, LittlerootTown_BrendansHouse_1F_EventScript_1F78A3 - coord_event 7, 3, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78BE - coord_event 8, 4, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78CA - coord_event 9, 3, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78D6 - -LittlerootTown_BrendansHouse_1F_MapEvents:: - map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 - diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc deleted file mode 100644 index 44b861056a..0000000000 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_BrendansHouse_1F: - .4byte LittlerootTown_BrendansHouse_1F_Layout - .4byte LittlerootTown_BrendansHouse_1F_MapEvents - .4byte LittlerootTown_BrendansHouse_1F_MapScripts - .4byte 0x0 - .2byte MUS_MISHIRO - .2byte LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F - .byte MAPSEC_LITTLEROOT_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json new file mode 100644 index 0000000000..79f3c75a8d --- /dev/null +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -0,0 +1,171 @@ +{ + "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", + "name": "LittlerootTown_BrendansHouse_1F", + "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", + "music": "MUS_MISHIRO", + "region_map_section": "MAPSEC_LITTLEROOT_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MOM", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_2929C5", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 3, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_292ACD", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_292ABA", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 2, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F89F3", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PLAYERS_HOUSE_DAD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 8, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN" + } + ], + "warp_events": [ + { + "x": 9, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 2, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 8, + "y": 8, + "elevation": 0, + "var": "VAR_0x4092", + "var_value": 4, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78A3" + }, + { + "type": "trigger", + "x": 7, + "y": 3, + "elevation": 0, + "var": "VAR_0x408D", + "var_value": 2, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78BE" + }, + { + "type": "trigger", + "x": 8, + "y": 4, + "elevation": 0, + "var": "VAR_0x408D", + "var_value": 2, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78CA" + }, + { + "type": "trigger", + "x": 9, + "y": 3, + "elevation": 0, + "var": "VAR_0x408D", + "var_value": 2, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78D6" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc deleted file mode 100644 index 29dddeb6a4..0000000000 --- a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc +++ /dev/null @@ -1,30 +0,0 @@ -LittlerootTown_BrendansHouse_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 1, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM - object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL - object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL - -LittlerootTown_BrendansHouse_2F_MapWarps: - warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F - -LittlerootTown_BrendansHouse_2F_MapBGEvents: - bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, EventScript_PlayerPCMale - bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F8656 - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_292781 - bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F865F - -LittlerootTown_BrendansHouse_2F_MapEvents:: - map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents - diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc deleted file mode 100644 index 5bf1113dd4..0000000000 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_BrendansHouse_2F: - .4byte LittlerootTown_BrendansHouse_2F_Layout - .4byte LittlerootTown_BrendansHouse_2F_MapEvents - .4byte LittlerootTown_BrendansHouse_2F_MapScripts - .4byte 0x0 - .2byte MUS_MISHIRO - .2byte LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F - .byte MAPSEC_LITTLEROOT_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json new file mode 100644 index 0000000000..4adc283881 --- /dev/null +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -0,0 +1,270 @@ +{ + "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", + "name": "LittlerootTown_BrendansHouse_2F", + "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", + "music": "MUS_MISHIRO", + "region_map_section": "MAPSEC_LITTLEROOT_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 7, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F94C1", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 1, + "y": 0, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MOM", + "x": 7, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F8481", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWABLU_DOLL", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL" + } + ], + "warp_events": [ + { + "x": 7, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 0, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "EventScript_PlayerPCMale" + }, + { + "type": "sign", + "x": 1, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F8656" + }, + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_BrendansHouse_2F_EventScript_292781" + }, + { + "type": "sign", + "x": 3, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F865F" + } + ] +} \ No newline at end of file diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc deleted file mode 100644 index 890a6a6240..0000000000 --- a/data/maps/LittlerootTown_MaysHouse_1F/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -LittlerootTown_MaysHouse_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM - object_event 2, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 6, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 - object_event 3, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 9, 3, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_PLAYERS_HOUSE_DAD - object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING - object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN - -LittlerootTown_MaysHouse_1F_MapWarps: - warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN - warp_def 2, 8, 0, 0, MAP_LITTLEROOT_TOWN - warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F - -LittlerootTown_MaysHouse_1F_MapCoordEvents: - coord_event 2, 8, 0, VAR_0x4092, 4, LittlerootTown_MaysHouse_1F_EventScript_1F8A4C - coord_event 1, 3, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A67 - coord_event 2, 4, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A73 - coord_event 3, 3, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A7F - -LittlerootTown_MaysHouse_1F_MapEvents:: - map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 - diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc deleted file mode 100644 index 9ab1d2f8b0..0000000000 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_MaysHouse_1F: - .4byte LittlerootTown_MaysHouse_1F_Layout - .4byte LittlerootTown_MaysHouse_1F_MapEvents - .4byte LittlerootTown_MaysHouse_1F_MapScripts - .4byte 0x0 - .2byte MUS_MISHIRO - .2byte LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F - .byte MAPSEC_LITTLEROOT_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json new file mode 100644 index 0000000000..817def8b2a --- /dev/null +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -0,0 +1,171 @@ +{ + "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F", + "name": "LittlerootTown_MaysHouse_1F", + "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F", + "music": "MUS_MISHIRO", + "region_map_section": "MAPSEC_LITTLEROOT_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MOM", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_1F_EventScript_2929C5", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_1F_EventScript_292ABA", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 3, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_1F_EventScript_292ACD", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_1F_EventScript_1F89F3", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PLAYERS_HOUSE_DAD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A3D", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_MAY_NORMAL", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 2, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 8, + "elevation": 0, + "var": "VAR_0x4092", + "var_value": 4, + "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A4C" + }, + { + "type": "trigger", + "x": 1, + "y": 3, + "elevation": 0, + "var": "VAR_0x408D", + "var_value": 2, + "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A67" + }, + { + "type": "trigger", + "x": 2, + "y": 4, + "elevation": 0, + "var": "VAR_0x408D", + "var_value": 2, + "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A73" + }, + { + "type": "trigger", + "x": 3, + "y": 3, + "elevation": 0, + "var": "VAR_0x408D", + "var_value": 2, + "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A7F" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc deleted file mode 100644 index b845971ece..0000000000 --- a/data/maps/LittlerootTown_MaysHouse_2F/events.inc +++ /dev/null @@ -1,30 +0,0 @@ -LittlerootTown_MaysHouse_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 2, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 5, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 2, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM - object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL - -LittlerootTown_MaysHouse_2F_MapWarps: - warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F - -LittlerootTown_MaysHouse_2F_MapBGEvents: - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F865F - bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F8656 - bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_29278D - bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_PlayerPCFemale - -LittlerootTown_MaysHouse_2F_MapEvents:: - map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents - diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc deleted file mode 100644 index d68d04d0d9..0000000000 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_MaysHouse_2F: - .4byte LittlerootTown_MaysHouse_2F_Layout - .4byte LittlerootTown_MaysHouse_2F_MapEvents - .4byte LittlerootTown_MaysHouse_2F_MapScripts - .4byte 0x0 - .2byte MUS_MISHIRO - .2byte LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F - .byte MAPSEC_LITTLEROOT_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json new file mode 100644 index 0000000000..be1329fbdd --- /dev/null +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -0,0 +1,270 @@ +{ + "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F", + "name": "LittlerootTown_MaysHouse_2F", + "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F", + "music": "MUS_MISHIRO", + "region_map_section": "MAPSEC_LITTLEROOT_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_MAY_NORMAL", + "x": 1, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_2F_EventScript_1F94C1", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 2, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 2, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 5, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MOM", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICHU_DOLL", + "x": 3, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_2F_EventScript_1F9334", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL" + } + ], + "warp_events": [ + { + "x": 1, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_MaysHouse_2F_EventScript_1F865F" + }, + { + "type": "sign", + "x": 7, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_MaysHouse_2F_EventScript_1F8656" + }, + { + "type": "sign", + "x": 3, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_MaysHouse_2F_EventScript_29278D" + }, + { + "type": "sign", + "x": 8, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "EventScript_PlayerPCFemale" + } + ] +} \ No newline at end of file diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc deleted file mode 100644 index 94baaed20f..0000000000 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc +++ /dev/null @@ -1,32 +0,0 @@ -LittlerootTown_ProfessorBirchsLab_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA - -LittlerootTown_ProfessorBirchsLab_MapWarps: - warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN - warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN - -LittlerootTown_ProfessorBirchsLab_MapBGEvents: - bg_event 10, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 - bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 - bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD - bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD - bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 0, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 1, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 1, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 11, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - -LittlerootTown_ProfessorBirchsLab_MapEvents:: - map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents - diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc deleted file mode 100644 index 3cbfbdca73..0000000000 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_ProfessorBirchsLab: - .4byte LittlerootTown_ProfessorBirchsLab_Layout - .4byte LittlerootTown_ProfessorBirchsLab_MapEvents - .4byte LittlerootTown_ProfessorBirchsLab_MapScripts - .4byte 0x0 - .2byte MUS_ODAMAKI - .2byte LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB - .byte MAPSEC_LITTLEROOT_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json new file mode 100644 index 0000000000..2b29f99c1f --- /dev/null +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -0,0 +1,235 @@ +{ + "id": "MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", + "name": "LittlerootTown_ProfessorBirchsLab", + "layout": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", + "music": "MUS_ODAMAKI", + "region_map_section": "MAPSEC_LITTLEROOT_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 9, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA023", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA" + } + ], + "warp_events": [ + { + "x": 6, + "y": 12, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 12, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 10, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3" + }, + { + "type": "sign", + "x": 11, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3" + }, + { + "type": "sign", + "x": 7, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD" + }, + { + "type": "sign", + "x": 8, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD" + }, + { + "type": "sign", + "x": 1, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + }, + { + "type": "sign", + "x": 0, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + }, + { + "type": "sign", + "x": 1, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + }, + { + "type": "sign", + "x": 2, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + }, + { + "type": "sign", + "x": 3, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + }, + { + "type": "sign", + "x": 4, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + }, + { + "type": "sign", + "x": 3, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + }, + { + "type": "sign", + "x": 1, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + }, + { + "type": "sign", + "x": 1, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + }, + { + "type": "sign", + "x": 11, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + }, + { + "type": "sign", + "x": 11, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + } + ] +} \ No newline at end of file diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index ee7e1730b5..b47df74b8a 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -28,11 +28,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9:: @ 81F9CE9 goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3 - setmaplayoutindex 432 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480DAC end LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7 - setmaplayoutindex 432 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480DAC setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN setobjectxyperm 3, 5, 10 end diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc deleted file mode 100644 index 4ee4905b6f..0000000000 --- a/data/maps/MagmaHideout_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MagmaHideout_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_1F_EventScript_23988C, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_1F_EventScript_2398A3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_11 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_12 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_13 - -MagmaHideout_1F_MapWarps: - warp_def 10, 34, 3, 4, MAP_JAGGED_PASS - warp_def 25, 34, 3, 1, MAP_MAGMA_HIDEOUT_2F_1R - warp_def 31, 3, 0, 1, MAP_MAGMA_HIDEOUT_2F_2R - warp_def 20, 22, 0, 0, MAP_MAGMA_HIDEOUT_2F_3R - -MagmaHideout_1F_MapEvents:: - map_events MagmaHideout_1F_EventObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc deleted file mode 100644 index 2f509f088d..0000000000 --- a/data/maps/MagmaHideout_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_1F: - .4byte MagmaHideout_1F_Layout - .4byte MagmaHideout_1F_MapEvents - .4byte MagmaHideout_1F_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_1F - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json new file mode 100644 index 0000000000..2d07a723a7 --- /dev/null +++ b/data/maps/MagmaHideout_1F/map.json @@ -0,0 +1,128 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_1F", + "name": "MagmaHideout_1F", + "layout": "LAYOUT_MAGMA_HIDEOUT_1F", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 4, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MagmaHideout_1F_EventScript_23988C", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 20, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_1F_EventScript_2914DE", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 30, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MagmaHideout_1F_EventScript_2398A3", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_1F_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 7, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_1F_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 6, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_1F_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + } + ], + "warp_events": [ + { + "x": 10, + "y": 34, + "elevation": 3, + "dest_map": "MAP_JAGGED_PASS", + "dest_warp_id": 4 + }, + { + "x": 25, + "y": 34, + "elevation": 3, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_1R", + "dest_warp_id": 1 + }, + { + "x": 31, + "y": 3, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_2R", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 22, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_3R", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_2F_1R/events.inc b/data/maps/MagmaHideout_2F_1R/events.inc deleted file mode 100644 index e88bde8849..0000000000 --- a/data/maps/MagmaHideout_2F_1R/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -MagmaHideout_2F_1R_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 18, 19, 3, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 5, 4, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 14, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 7, 6, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - -MagmaHideout_2F_1R_MapWarps: - warp_def 11, 23, 0, 0, MAP_MAGMA_HIDEOUT_2F_2R - warp_def 8, 2, 0, 1, MAP_MAGMA_HIDEOUT_1F - warp_def 17, 33, 3, 2, MAP_MAGMA_HIDEOUT_3F_1R - -MagmaHideout_2F_1R_MapEvents:: - map_events MagmaHideout_2F_1R_EventObjects, MagmaHideout_2F_1R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc deleted file mode 100644 index 29de6cac75..0000000000 --- a/data/maps/MagmaHideout_2F_1R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_1R: - .4byte MagmaHideout_2F_1R_Layout - .4byte MagmaHideout_2F_1R_MapEvents - .4byte MagmaHideout_2F_1R_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_2F_1R - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_2F_1R/map.json b/data/maps/MagmaHideout_2F_1R/map.json new file mode 100644 index 0000000000..75db41221a --- /dev/null +++ b/data/maps/MagmaHideout_2F_1R/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_2F_1R", + "name": "MagmaHideout_2F_1R", + "layout": "LAYOUT_MAGMA_HIDEOUT_2F_1R", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 18, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", + "movement_range_x": 5, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MagmaHideout_2F_1R_EventScript_239B7F", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 12, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 7, + "movement_range_y": 6, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MagmaHideout_2F_1R_EventScript_239B96", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "x": 8, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "MagmaHideout_2F_1R_EventScript_239B51", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 21, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MagmaHideout_2F_1R_EventScript_239B68", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + } + ], + "warp_events": [ + { + "x": 11, + "y": 23, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_2R", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 2, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_1F", + "dest_warp_id": 1 + }, + { + "x": 17, + "y": 33, + "elevation": 3, + "dest_map": "MAP_MAGMA_HIDEOUT_3F_1R", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_2F_2R/events.inc b/data/maps/MagmaHideout_2F_2R/events.inc deleted file mode 100644 index 70b234139d..0000000000 --- a/data/maps/MagmaHideout_2F_2R/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_2R_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 21, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE - -MagmaHideout_2F_2R_MapWarps: - warp_def 10, 22, 3, 0, MAP_MAGMA_HIDEOUT_2F_1R - warp_def 36, 4, 0, 2, MAP_MAGMA_HIDEOUT_1F - -MagmaHideout_2F_2R_MapEvents:: - map_events MagmaHideout_2F_2R_EventObjects, MagmaHideout_2F_2R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc deleted file mode 100644 index 4606ef07b5..0000000000 --- a/data/maps/MagmaHideout_2F_2R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_2R: - .4byte MagmaHideout_2F_2R_Layout - .4byte MagmaHideout_2F_2R_MapEvents - .4byte MagmaHideout_2F_2R_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_2F_2R - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json new file mode 100644 index 0000000000..af80ea8ff7 --- /dev/null +++ b/data/maps/MagmaHideout_2F_2R/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_2F_2R", + "name": "MagmaHideout_2F_2R", + "layout": "LAYOUT_MAGMA_HIDEOUT_2F_2R", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 29, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "MagmaHideout_2F_2R_EventScript_239E4D", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 25, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MagmaHideout_2F_2R_EventScript_239E36", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 21, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_2F_2R_EventScript_2914EB", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 8, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MagmaHideout_2F_2R_EventScript_239E1F", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "x": 7, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MagmaHideout_2F_2R_EventScript_239E08", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_2F_2R_EventScript_2914F8", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE" + } + ], + "warp_events": [ + { + "x": 10, + "y": 22, + "elevation": 3, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_1R", + "dest_warp_id": 0 + }, + { + "x": 36, + "y": 4, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_2F_3R/events.inc b/data/maps/MagmaHideout_2F_3R/events.inc deleted file mode 100644 index 5b12929d81..0000000000 --- a/data/maps/MagmaHideout_2F_3R/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -MagmaHideout_2F_3R_MapWarps: - warp_def 16, 1, 0, 3, MAP_MAGMA_HIDEOUT_1F - warp_def 16, 13, 0, 0, MAP_MAGMA_HIDEOUT_3F_3R - -MagmaHideout_2F_3R_MapEvents:: - map_events 0x0, MagmaHideout_2F_3R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc deleted file mode 100644 index dd1d0d9e78..0000000000 --- a/data/maps/MagmaHideout_2F_3R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_3R: - .4byte MagmaHideout_2F_3R_Layout - .4byte MagmaHideout_2F_3R_MapEvents - .4byte MagmaHideout_2F_3R_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_2F_3R - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_2F_3R/map.json b/data/maps/MagmaHideout_2F_3R/map.json new file mode 100644 index 0000000000..186fa9dd82 --- /dev/null +++ b/data/maps/MagmaHideout_2F_3R/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_2F_3R", + "name": "MagmaHideout_2F_3R", + "layout": "LAYOUT_MAGMA_HIDEOUT_2F_3R", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_1F", + "dest_warp_id": 3 + }, + { + "x": 16, + "y": 13, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_3F_3R", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_3F_1R/events.inc b/data/maps/MagmaHideout_3F_1R/events.inc deleted file mode 100644 index 166e88b275..0000000000 --- a/data/maps/MagmaHideout_3F_1R/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -MagmaHideout_3F_1R_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 2, 7, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 21, 21, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 16, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_1R_EventScript_291505, FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET - -MagmaHideout_3F_1R_MapWarps: - warp_def 7, 21, 0, 0, MAP_MAGMA_HIDEOUT_4F - warp_def 21, 9, 0, 0, MAP_MAGMA_HIDEOUT_3F_2R - warp_def 23, 3, 0, 2, MAP_MAGMA_HIDEOUT_2F_1R - -MagmaHideout_3F_1R_MapEvents:: - map_events MagmaHideout_3F_1R_EventObjects, MagmaHideout_3F_1R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc deleted file mode 100644 index ac8d5d9b4a..0000000000 --- a/data/maps/MagmaHideout_3F_1R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_3F_1R: - .4byte MagmaHideout_3F_1R_Layout - .4byte MagmaHideout_3F_1R_MapEvents - .4byte MagmaHideout_3F_1R_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_3F_1R - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_3F_1R/map.json b/data/maps/MagmaHideout_3F_1R/map.json new file mode 100644 index 0000000000..ec61d27591 --- /dev/null +++ b/data/maps/MagmaHideout_3F_1R/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_3F_1R", + "name": "MagmaHideout_3F_1R", + "layout": "LAYOUT_MAGMA_HIDEOUT_3F_1R", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 2, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "MagmaHideout_3F_1R_EventScript_23A1B3", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "x": 21, + "y": 21, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MagmaHideout_3F_1R_EventScript_23A1CA", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 9, + "y": 16, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_3F_1R_EventScript_291505", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET" + } + ], + "warp_events": [ + { + "x": 7, + "y": 21, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_4F", + "dest_warp_id": 0 + }, + { + "x": 21, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_3F_2R", + "dest_warp_id": 0 + }, + { + "x": 23, + "y": 3, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_1R", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_3F_2R/events.inc b/data/maps/MagmaHideout_3F_2R/events.inc deleted file mode 100644 index 825e8985e9..0000000000 --- a/data/maps/MagmaHideout_3F_2R/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -MagmaHideout_3F_2R_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 3, 0, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_2R_EventScript_291512, FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX - -MagmaHideout_3F_2R_MapWarps: - warp_def 12, 15, 0, 1, MAP_MAGMA_HIDEOUT_3F_1R - -MagmaHideout_3F_2R_MapEvents:: - map_events MagmaHideout_3F_2R_EventObjects, MagmaHideout_3F_2R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc deleted file mode 100644 index 8fbb30b18a..0000000000 --- a/data/maps/MagmaHideout_3F_2R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_3F_2R: - .4byte MagmaHideout_3F_2R_Layout - .4byte MagmaHideout_3F_2R_MapEvents - .4byte MagmaHideout_3F_2R_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_3F_2R - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_3F_2R/map.json b/data/maps/MagmaHideout_3F_2R/map.json new file mode 100644 index 0000000000..23e8d0b8ca --- /dev/null +++ b/data/maps/MagmaHideout_3F_2R/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_3F_2R", + "name": "MagmaHideout_3F_2R", + "layout": "LAYOUT_MAGMA_HIDEOUT_3F_2R", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 16, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MagmaHideout_3F_2R_EventScript_23A3D5", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_3F_2R_EventScript_291512", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX" + } + ], + "warp_events": [ + { + "x": 12, + "y": 15, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_3F_1R", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_3F_3R/events.inc b/data/maps/MagmaHideout_3F_3R/events.inc deleted file mode 100644 index d4346a1390..0000000000 --- a/data/maps/MagmaHideout_3F_3R/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -MagmaHideout_3F_3R_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 19, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE - -MagmaHideout_3F_3R_MapWarps: - warp_def 16, 1, 0, 1, MAP_MAGMA_HIDEOUT_2F_3R - warp_def 16, 21, 0, 1, MAP_MAGMA_HIDEOUT_4F - -MagmaHideout_3F_3R_MapEvents:: - map_events MagmaHideout_3F_3R_EventObjects, MagmaHideout_3F_3R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc deleted file mode 100644 index c676fac3dd..0000000000 --- a/data/maps/MagmaHideout_3F_3R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_3F_3R: - .4byte MagmaHideout_3F_3R_Layout - .4byte MagmaHideout_3F_3R_MapEvents - .4byte MagmaHideout_3F_3R_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_3F_3R - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_3F_3R/map.json b/data/maps/MagmaHideout_3F_3R/map.json new file mode 100644 index 0000000000..40921b8ca9 --- /dev/null +++ b/data/maps/MagmaHideout_3F_3R/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_3F_3R", + "name": "MagmaHideout_3F_3R", + "layout": "LAYOUT_MAGMA_HIDEOUT_3F_3R", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 9, + "y": 19, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_3F_3R_EventScript_29152C", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE" + } + ], + "warp_events": [ + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_3R", + "dest_warp_id": 1 + }, + { + "x": 16, + "y": 21, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_4F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_4F/events.inc b/data/maps/MagmaHideout_4F/events.inc deleted file mode 100644 index 2fd71b3db0..0000000000 --- a/data/maps/MagmaHideout_4F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MagmaHideout_4F_EventObjects: - object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A68C, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6A3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 13, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6BA, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_4F_EventScript_23A6D1, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 16, 21, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MagmaHideout_4F_EventScript_23A560, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_4F_EventScript_29151F, FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE - -MagmaHideout_4F_MapWarps: - warp_def 46, 7, 0, 0, MAP_MAGMA_HIDEOUT_3F_1R - warp_def 20, 21, 0, 1, MAP_MAGMA_HIDEOUT_3F_3R - -MagmaHideout_4F_MapEvents:: - map_events MagmaHideout_4F_EventObjects, MagmaHideout_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc deleted file mode 100644 index 82a3e66bb8..0000000000 --- a/data/maps/MagmaHideout_4F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_4F: - .4byte MagmaHideout_4F_Layout - .4byte MagmaHideout_4F_MapEvents - .4byte MagmaHideout_4F_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_4F - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json new file mode 100644 index 0000000000..dcec4fdb9f --- /dev/null +++ b/data/maps/MagmaHideout_4F/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_4F", + "name": "MagmaHideout_4F", + "layout": "LAYOUT_MAGMA_HIDEOUT_4F", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GROUDON_1", + "x": 16, + "y": 17, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 31, + "y": 22, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MagmaHideout_4F_EventScript_23A68C", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 30, + "y": 13, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MagmaHideout_4F_EventScript_23A6A3", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 26, + "y": 13, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MagmaHideout_4F_EventScript_23A6BA", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 22, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MagmaHideout_4F_EventScript_23A6D1", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 16, + "y": 21, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_4F_EventScript_23A560", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GROUDON_2", + "x": 16, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_4F_EventScript_29151F", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE" + } + ], + "warp_events": [ + { + "x": 46, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_3F_1R", + "dest_warp_id": 0 + }, + { + "x": 20, + "y": 21, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_3F_3R", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MarineCave_End/events.inc b/data/maps/MarineCave_End/events.inc deleted file mode 100644 index 4a97b9f15f..0000000000 --- a/data/maps/MarineCave_End/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MarineCave_End_EventObjects: - object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 9, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MARINE_CAVE_KYOGRE - -MarineCave_End_MapWarps: - warp_def 20, 4, 0, 0, MAP_MARINE_CAVE_ENTRANCE - -MarineCave_End_MapCoordEvents: - coord_event 9, 26, 3, VAR_TEMP_1, 1, MarineCave_End_EventScript_23B01B - -MarineCave_End_MapEvents:: - map_events MarineCave_End_EventObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0 - diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc deleted file mode 100644 index e2377aa4b1..0000000000 --- a/data/maps/MarineCave_End/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MarineCave_End: - .4byte MarineCave_End_Layout - .4byte MarineCave_End_MapEvents - .4byte MarineCave_End_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_MARINE_CAVE_END - .byte MAPSEC_MARINE_CAVE - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MarineCave_End/map.json b/data/maps/MarineCave_End/map.json new file mode 100644 index 0000000000..017adcc9a3 --- /dev/null +++ b/data/maps/MarineCave_End/map.json @@ -0,0 +1,52 @@ +{ + "id": "MAP_MARINE_CAVE_END", + "name": "MarineCave_End", + "layout": "LAYOUT_MARINE_CAVE_END", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_MARINE_CAVE", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_KYOGRE_1", + "x": 9, + "y": 22, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MARINE_CAVE_KYOGRE" + } + ], + "warp_events": [ + { + "x": 20, + "y": 4, + "elevation": 0, + "dest_map": "MAP_MARINE_CAVE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 9, + "y": 26, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 1, + "script": "MarineCave_End_EventScript_23B01B" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MarineCave_Entrance/events.inc b/data/maps/MarineCave_Entrance/events.inc deleted file mode 100644 index 9e96bf2257..0000000000 --- a/data/maps/MarineCave_Entrance/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -MarineCave_Entrance_MapWarps: - warp_def 14, 1, 3, 0, MAP_MARINE_CAVE_END - -MarineCave_Entrance_MapEvents:: - map_events 0x0, MarineCave_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc deleted file mode 100644 index a1ce8ac617..0000000000 --- a/data/maps/MarineCave_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MarineCave_Entrance: - .4byte MarineCave_Entrance_Layout - .4byte MarineCave_Entrance_MapEvents - .4byte MarineCave_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_MARINE_CAVE_ENTRANCE - .byte MAPSEC_MARINE_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MarineCave_Entrance/map.json b/data/maps/MarineCave_Entrance/map.json new file mode 100644 index 0000000000..545fe1c9bd --- /dev/null +++ b/data/maps/MarineCave_Entrance/map.json @@ -0,0 +1,28 @@ +{ + "id": "MAP_MARINE_CAVE_ENTRANCE", + "name": "MarineCave_Entrance", + "layout": "LAYOUT_MARINE_CAVE_ENTRANCE", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_MARINE_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 14, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MARINE_CAVE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity/connections.inc b/data/maps/MauvilleCity/connections.inc deleted file mode 100644 index 97f97982c3..0000000000 --- a/data/maps/MauvilleCity/connections.inc +++ /dev/null @@ -1,10 +0,0 @@ -MauvilleCity_MapConnectionsList: - connection up, 0, MAP_ROUTE111 - connection down, 0, MAP_ROUTE110 - connection left, 0, MAP_ROUTE117 - connection right, 0, MAP_ROUTE118 - -MauvilleCity_MapConnections: - .4byte 4 - .4byte MauvilleCity_MapConnectionsList - diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc deleted file mode 100644 index 961eb40053..0000000000 --- a/data/maps/MauvilleCity/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -MauvilleCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MauvilleCity_EventScript_1DF3B3, 0 - object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 24, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0 - object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, FLAG_HIDE_MAUVILLE_CITY_WALLY - object_event 7, EVENT_OBJ_GFX_POKEFAN_M, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE - object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, FLAG_HIDE_MAUVILLE_CITY_WATTSON - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_EventScript_2910CE, FLAG_ITEM_MAUVILLE_CITY_X_SPEED - object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0 - object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 12, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MAUVILLE_CITY_SCOTT - -MauvilleCity_MapWarps: - warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM - warp_def 22, 5, 0, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F - warp_def 35, 5, 0, 0, MAP_MAUVILLE_CITY_BIKE_SHOP - warp_def 23, 14, 0, 0, MAP_MAUVILLE_CITY_MART - warp_def 32, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE1 - warp_def 8, 13, 0, 0, MAP_MAUVILLE_CITY_GAME_CORNER - warp_def 19, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE2 - -MauvilleCity_MapBGEvents: - bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E73 - bg_event 11, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3E0 - bg_event 24, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E6A - bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E6A - bg_event 24, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E73 - bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3D7 - bg_event 33, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3E9 - bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3F2 - -MauvilleCity_MapEvents:: - map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents - diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc deleted file mode 100644 index 566eb49e73..0000000000 --- a/data/maps/MauvilleCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity: - .4byte MauvilleCity_Layout - .4byte MauvilleCity_MapEvents - .4byte MauvilleCity_MapScripts - .4byte MauvilleCity_MapConnections - .2byte MUS_GOTOWN - .2byte LAYOUT_MAUVILLE_CITY - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json new file mode 100644 index 0000000000..4ee667f2b1 --- /dev/null +++ b/data/maps/MauvilleCity/map.json @@ -0,0 +1,300 @@ +{ + "id": "MAP_MAUVILLE_CITY", + "name": "MauvilleCity", + "layout": "LAYOUT_MAUVILLE_CITY", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE111" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE110" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE117" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE118" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 29, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF3B3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 24, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF3CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 14, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF3BC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 18, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF3C5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 17, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF3FB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WALLY", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF452", + "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF41D", + "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WATTSON", + "x": 29, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF73A", + "flag": "FLAG_HIDE_MAUVILLE_CITY_WATTSON" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 28, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_2910CE", + "flag": "FLAG_ITEM_MAUVILLE_CITY_X_SPEED" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_2C7F7E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 12, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MAUVILLE_CITY_SCOTT" + } + ], + "warp_events": [ + { + "x": 8, + "y": 5, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_GYM", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 5, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 35, + "y": 5, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_BIKE_SHOP", + "dest_warp_id": 0 + }, + { + "x": 23, + "y": 14, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_MART", + "dest_warp_id": 0 + }, + { + "x": 32, + "y": 14, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 13, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_GAME_CORNER", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 14, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_HOUSE2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 23, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MauvilleCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 11, + "y": 6, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_EventScript_1DF3E0" + }, + { + "type": "sign", + "x": 24, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MauvilleCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 25, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MauvilleCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 24, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MauvilleCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 19, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_EventScript_1DF3D7" + }, + { + "type": "sign", + "x": 33, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_EventScript_1DF3E9" + }, + { + "type": "sign", + "x": 11, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_EventScript_1DF3F2" + } + ] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc deleted file mode 100644 index ac9abae2a6..0000000000 --- a/data/maps/MauvilleCity_BikeShop/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_BikeShop_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0 - -MauvilleCity_BikeShop_MapWarps: - warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY - warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY - -MauvilleCity_BikeShop_MapBGEvents: - bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_20ED3A - bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_20EDAE - -MauvilleCity_BikeShop_MapEvents:: - map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents - diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc deleted file mode 100644 index 244439fed5..0000000000 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_BikeShop: - .4byte MauvilleCity_BikeShop_Layout - .4byte MauvilleCity_BikeShop_MapEvents - .4byte MauvilleCity_BikeShop_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_MAUVILLE_CITY_BIKE_SHOP - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json new file mode 100644 index 0000000000..c774718f04 --- /dev/null +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -0,0 +1,79 @@ +{ + "id": "MAP_MAUVILLE_CITY_BIKE_SHOP", + "name": "MauvilleCity_BikeShop", + "layout": "LAYOUT_MAUVILLE_CITY_BIKE_SHOP", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_BikeShop_EventScript_20EBBC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_BikeShop_EventScript_20ED31", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_BikeShop_EventScript_20ED3A" + }, + { + "type": "sign", + "x": 11, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_BikeShop_EventScript_20EDAE" + } + ] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc deleted file mode 100644 index c5ef3b7f6a..0000000000 --- a/data/maps/MauvilleCity_GameCorner/events.inc +++ /dev/null @@ -1,47 +0,0 @@ -MauvilleCity_GameCorner_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0 - object_event 6, EVENT_OBJ_GFX_POKEFAN_M, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN, 0, 20, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0 - object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0 - object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0 - object_event 10, EVENT_OBJ_GFX_MAN_3, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0 - object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0 - object_event 12, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0 - -MauvilleCity_GameCorner_MapWarps: - warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY - warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY - -MauvilleCity_GameCorner_MapBGEvents: - bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2102D6 - bg_event 2, 8, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2102F6 - bg_event 2, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_210316 - bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210336 - bg_event 3, 8, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210356 - bg_event 3, 9, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210376 - bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_210396 - bg_event 7, 7, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2103B6 - bg_event 7, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2103D6 - bg_event 8, 6, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_2103F6 - bg_event 8, 7, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210416 - bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210436 - bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 14, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 15, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 18, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 19, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 18, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 19, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF - -MauvilleCity_GameCorner_MapEvents:: - map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents - diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc deleted file mode 100644 index f13c98c776..0000000000 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_GameCorner: - .4byte MauvilleCity_GameCorner_Layout - .4byte MauvilleCity_GameCorner_MapEvents - .4byte MauvilleCity_GameCorner_MapScripts - .4byte 0x0 - .2byte MUS_CASINO - .2byte LAYOUT_MAUVILLE_CITY_GAME_CORNER - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json new file mode 100644 index 0000000000..696694a6bc --- /dev/null +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -0,0 +1,385 @@ +{ + "id": "MAP_MAUVILLE_CITY_GAME_CORNER", + "name": "MauvilleCity_GameCorner", + "layout": "LAYOUT_MAUVILLE_CITY_GAME_CORNER", + "music": "MUS_CASINO", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_210125", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 16, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_21012E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_20FBB9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 14, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_20FCF1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_210137", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 19, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_21021D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 20, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_210279", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_COOK", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_210289", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 13, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_20FE9F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_210299", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 9, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_2102B6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_2102C6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 11, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 5 + }, + { + "x": 12, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 2, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", + "script": "MauvilleCity_GameCorner_EventScript_2102D6" + }, + { + "type": "sign", + "x": 2, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", + "script": "MauvilleCity_GameCorner_EventScript_2102F6" + }, + { + "type": "sign", + "x": 2, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", + "script": "MauvilleCity_GameCorner_EventScript_210316" + }, + { + "type": "sign", + "x": 3, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", + "script": "MauvilleCity_GameCorner_EventScript_210336" + }, + { + "type": "sign", + "x": 3, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", + "script": "MauvilleCity_GameCorner_EventScript_210356" + }, + { + "type": "sign", + "x": 3, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", + "script": "MauvilleCity_GameCorner_EventScript_210376" + }, + { + "type": "sign", + "x": 7, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", + "script": "MauvilleCity_GameCorner_EventScript_210396" + }, + { + "type": "sign", + "x": 7, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", + "script": "MauvilleCity_GameCorner_EventScript_2103B6" + }, + { + "type": "sign", + "x": 7, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", + "script": "MauvilleCity_GameCorner_EventScript_2103D6" + }, + { + "type": "sign", + "x": 8, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", + "script": "MauvilleCity_GameCorner_EventScript_2103F6" + }, + { + "type": "sign", + "x": 8, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", + "script": "MauvilleCity_GameCorner_EventScript_210416" + }, + { + "type": "sign", + "x": 8, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", + "script": "MauvilleCity_GameCorner_EventScript_210436" + }, + { + "type": "sign", + "x": 14, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + }, + { + "type": "sign", + "x": 15, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + }, + { + "type": "sign", + "x": 14, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + }, + { + "type": "sign", + "x": 15, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + }, + { + "type": "sign", + "x": 14, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + }, + { + "type": "sign", + "x": 15, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + }, + { + "type": "sign", + "x": 18, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + }, + { + "type": "sign", + "x": 19, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + }, + { + "type": "sign", + "x": 18, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + }, + { + "type": "sign", + "x": 19, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + }, + { + "type": "sign", + "x": 18, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + }, + { + "type": "sign", + "x": 19, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + } + ] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc deleted file mode 100644 index 10c3c039d6..0000000000 --- a/data/maps/MauvilleCity_Gym/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -MauvilleCity_Gym_EventObjects: - object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, FLAG_HIDE_MAUVILLE_GYM_WATTSON - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 16, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0 - object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 1, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0 - object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0 - -MauvilleCity_Gym_MapWarps: - warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY - warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY - -MauvilleCity_Gym_MapCoordEvents: - coord_event 4, 12, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E01E - coord_event 3, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E043 - coord_event 0, 15, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20DFF9 - coord_event 8, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E068 - -MauvilleCity_Gym_MapBGEvents: - bg_event 3, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_20E14B - bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_20E15B - -MauvilleCity_Gym_MapEvents:: - map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents - diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc deleted file mode 100644 index 5f9666eeba..0000000000 --- a/data/maps/MauvilleCity_Gym/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_Gym: - .4byte MauvilleCity_Gym_Layout - .4byte MauvilleCity_Gym_MapEvents - .4byte MauvilleCity_Gym_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_MAUVILLE_CITY_GYM - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json new file mode 100644 index 0000000000..2ae4cb474e --- /dev/null +++ b/data/maps/MauvilleCity_Gym/map.json @@ -0,0 +1,181 @@ +{ + "id": "MAP_MAUVILLE_CITY_GYM", + "name": "MauvilleCity_Gym", + "layout": "LAYOUT_MAUVILLE_CITY_GYM", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WATTSON", + "x": 5, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_Gym_EventScript_20DEEB", + "flag": "FLAG_HIDE_MAUVILLE_GYM_WATTSON" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MauvilleCity_Gym_EventScript_20E0D0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 1, + "y": 16, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MauvilleCity_Gym_EventScript_20E0FE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 5, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MauvilleCity_Gym_EventScript_20E0E7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 1, + "y": 13, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MauvilleCity_Gym_EventScript_20E0B9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 7, + "y": 20, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_Gym_EventScript_20E12C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 7, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MauvilleCity_Gym_EventScript_20E115", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 20, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 20, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "MauvilleCity_Gym_EventScript_20E01E" + }, + { + "type": "trigger", + "x": 3, + "y": 9, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "MauvilleCity_Gym_EventScript_20E043" + }, + { + "type": "trigger", + "x": 0, + "y": 15, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "MauvilleCity_Gym_EventScript_20DFF9" + }, + { + "type": "trigger", + "x": 8, + "y": 9, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "MauvilleCity_Gym_EventScript_20E068" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MauvilleCity_Gym_EventScript_20E14B" + }, + { + "type": "sign", + "x": 6, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MauvilleCity_Gym_EventScript_20E15B" + } + ] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_House1/events.inc b/data/maps/MauvilleCity_House1/events.inc deleted file mode 100644 index 19b88a97eb..0000000000 --- a/data/maps/MauvilleCity_House1/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -MauvilleCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0 - -MauvilleCity_House1_MapWarps: - warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY - warp_def 4, 7, 0, 4, MAP_MAUVILLE_CITY - -MauvilleCity_House1_MapEvents:: - map_events MauvilleCity_House1_EventObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc deleted file mode 100644 index c36670be5d..0000000000 --- a/data/maps/MauvilleCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_House1: - .4byte House2_Layout - .4byte MauvilleCity_House1_MapEvents - .4byte MauvilleCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json new file mode 100644 index 0000000000..ec2d63cf91 --- /dev/null +++ b/data/maps/MauvilleCity_House1/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_MAUVILLE_CITY_HOUSE1", + "name": "MauvilleCity_House1", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_House1_EventScript_20F976", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_House2/events.inc b/data/maps/MauvilleCity_House2/events.inc deleted file mode 100644 index a27fec0424..0000000000 --- a/data/maps/MauvilleCity_House2/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -MauvilleCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0 - -MauvilleCity_House2_MapWarps: - warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY - warp_def 4, 8, 0, 6, MAP_MAUVILLE_CITY - -MauvilleCity_House2_MapEvents:: - map_events MauvilleCity_House2_EventObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc deleted file mode 100644 index 60fc3ae22c..0000000000 --- a/data/maps/MauvilleCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_House2: - .4byte House1_Layout - .4byte MauvilleCity_House2_MapEvents - .4byte MauvilleCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json new file mode 100644 index 0000000000..f29a2a34c2 --- /dev/null +++ b/data/maps/MauvilleCity_House2/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_MAUVILLE_CITY_HOUSE2", + "name": "MauvilleCity_House2", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_House2_EventScript_210C5D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_Mart/events.inc b/data/maps/MauvilleCity_Mart/events.inc deleted file mode 100644 index 1a5f9a3b75..0000000000 --- a/data/maps/MauvilleCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MauvilleCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0 - -MauvilleCity_Mart_MapWarps: - warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY - warp_def 4, 7, 0, 3, MAP_MAUVILLE_CITY - -MauvilleCity_Mart_MapEvents:: - map_events MauvilleCity_Mart_EventObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc deleted file mode 100644 index b986d7e3b5..0000000000 --- a/data/maps/MauvilleCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_Mart: - .4byte Mart_Layout - .4byte MauvilleCity_Mart_MapEvents - .4byte MauvilleCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json new file mode 100644 index 0000000000..23b451ae26 --- /dev/null +++ b/data/maps/MauvilleCity_Mart/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_MAUVILLE_CITY_MART", + "name": "MauvilleCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_Mart_EventScript_2110E6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_Mart_EventScript_21111C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_Mart_EventScript_211125", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc deleted file mode 100644 index f97d611365..0000000000 --- a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0 - -MauvilleCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY - warp_def 6, 8, 3, 1, MAP_MAUVILLE_CITY - warp_def 1, 6, 4, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_2F - -MauvilleCity_PokemonCenter_1F_MapEvents:: - map_events MauvilleCity_PokemonCenter_1F_EventObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 623cd61e6d..0000000000 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte MauvilleCity_PokemonCenter_1F_MapEvents - .4byte MauvilleCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..3e63670aba --- /dev/null +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F", + "name": "MauvilleCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E78", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_1F_EventScript_28E066", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E86", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E8F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E98", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_MAUVILLE_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc deleted file mode 100644 index b4b2d15ba3..0000000000 --- a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0 - -MauvilleCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -MauvilleCity_PokemonCenter_2F_MapEvents:: - map_events MauvilleCity_PokemonCenter_2F_EventObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc deleted file mode 100644 index bde4b43765..0000000000 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte MauvilleCity_PokemonCenter_2F_MapEvents - .4byte MauvilleCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..956868d684 --- /dev/null +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_2F", + "name": "MauvilleCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 8, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_2F_EventScript_21102F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc deleted file mode 100644 index 63c17fc0df..0000000000 --- a/data/maps/MeteorFalls_1F_1R/events.inc +++ /dev/null @@ -1,29 +0,0 @@ -MeteorFalls_1F_1R_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA - object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA - object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO - -MeteorFalls_1F_1R_MapWarps: - warp_def 27, 18, 4, 0, MAP_ROUTE114 - warp_def 6, 39, 3, 0, MAP_ROUTE115 - warp_def 10, 3, 3, 0, MAP_METEOR_FALLS_1F_2R - warp_def 5, 4, 3, 4, MAP_METEOR_FALLS_B1F_1R - warp_def 26, 28, 3, 5, MAP_METEOR_FALLS_B1F_1R - warp_def 4, 2, 0, 0, MAP_METEOR_FALLS_STEVENS_CAVE - -MeteorFalls_1F_1R_MapCoordEvents: - coord_event 14, 18, 4, VAR_0x40BF, 0, MeteorFalls_1F_1R_EventScript_22BD5F - -MeteorFalls_1F_1R_MapBGEvents: - bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 - -MeteorFalls_1F_1R_MapEvents:: - map_events MeteorFalls_1F_1R_EventObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents - diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc deleted file mode 100644 index 5bffcd6bad..0000000000 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_1F_1R: - .4byte MeteorFalls_1F_1R_Layout - .4byte MeteorFalls_1F_1R_MapEvents - .4byte MeteorFalls_1F_1R_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_METEOR_FALLS_1F_1R - .byte MAPSEC_METEOR_FALLS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json new file mode 100644 index 0000000000..c7611f2fd4 --- /dev/null +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -0,0 +1,213 @@ +{ + "id": "MAP_METEOR_FALLS_1F_1R", + "name": "MeteorFalls_1F_1R", + "layout": "LAYOUT_METEOR_FALLS_1F_1R", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_METEOR_FALLS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_1F_1R_EventScript_2911AB", + "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_1F_1R_EventScript_2911C5", + "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 27, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_1F_1R_EventScript_2911B8", + "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 26, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_1F_1R_EventScript_2911D2", + "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 12, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 14, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 6, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 6, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 6, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 13, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_1F_1R_EventScript_22BF25", + "flag": "FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO" + } + ], + "warp_events": [ + { + "x": 27, + "y": 18, + "elevation": 4, + "dest_map": "MAP_ROUTE114", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 39, + "elevation": 3, + "dest_map": "MAP_ROUTE115", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 3, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_1F_2R", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 4, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_1R", + "dest_warp_id": 4 + }, + { + "x": 26, + "y": 28, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_1R", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 2, + "elevation": 0, + "dest_map": "MAP_METEOR_FALLS_STEVENS_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 14, + "y": 18, + "elevation": 4, + "var": "VAR_0x40BF", + "var_value": 0, + "script": "MeteorFalls_1F_1R_EventScript_22BD5F" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 9, + "y": 58, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "0x0" + } + ] +} \ No newline at end of file diff --git a/data/maps/MeteorFalls_1F_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc deleted file mode 100644 index fe845ae674..0000000000 --- a/data/maps/MeteorFalls_1F_2R/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MeteorFalls_1F_2R_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0 - -MeteorFalls_1F_2R_MapWarps: - warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R - warp_def 4, 14, 3, 0, MAP_METEOR_FALLS_B1F_1R - warp_def 7, 20, 3, 1, MAP_METEOR_FALLS_B1F_1R - warp_def 21, 23, 3, 2, MAP_METEOR_FALLS_B1F_1R - -MeteorFalls_1F_2R_MapBGEvents: - bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 - -MeteorFalls_1F_2R_MapEvents:: - map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents - diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc deleted file mode 100644 index 4ee1d78c96..0000000000 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_1F_2R: - .4byte MeteorFalls_1F_2R_Layout - .4byte MeteorFalls_1F_2R_MapEvents - .4byte MeteorFalls_1F_2R_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_METEOR_FALLS_1F_2R - .byte MAPSEC_METEOR_FALLS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json new file mode 100644 index 0000000000..f1e47c9868 --- /dev/null +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -0,0 +1,98 @@ +{ + "id": "MAP_METEOR_FALLS_1F_2R", + "name": "MeteorFalls_1F_2R", + "layout": "LAYOUT_METEOR_FALLS_1F_2R", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_METEOR_FALLS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 13, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MeteorFalls_1F_2R_EventScript_22C4DE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 6, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MeteorFalls_1F_2R_EventScript_22C540", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MeteorFalls_1F_2R_EventScript_22C5A4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 29, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_1F_1R", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 14, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_1R", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 20, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_1R", + "dest_warp_id": 1 + }, + { + "x": 21, + "y": 23, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_1R", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 9, + "y": 58, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "0x0" + } + ] +} \ No newline at end of file diff --git a/data/maps/MeteorFalls_B1F_1R/events.inc b/data/maps/MeteorFalls_B1F_1R/events.inc deleted file mode 100644 index 1407f4e99a..0000000000 --- a/data/maps/MeteorFalls_B1F_1R/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -MeteorFalls_B1F_1R_MapWarps: - warp_def 5, 6, 4, 1, MAP_METEOR_FALLS_1F_2R - warp_def 7, 11, 5, 2, MAP_METEOR_FALLS_1F_2R - warp_def 18, 15, 4, 3, MAP_METEOR_FALLS_1F_2R - warp_def 17, 3, 3, 0, MAP_METEOR_FALLS_B1F_2R - warp_def 3, 23, 5, 3, MAP_METEOR_FALLS_1F_1R - warp_def 20, 36, 3, 4, MAP_METEOR_FALLS_1F_1R - -MeteorFalls_B1F_1R_MapEvents:: - map_events 0x0, MeteorFalls_B1F_1R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc deleted file mode 100644 index 9ae4d6e684..0000000000 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_B1F_1R: - .4byte MeteorFalls_B1F_1R_Layout - .4byte MeteorFalls_B1F_1R_MapEvents - .4byte MeteorFalls_B1F_1R_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_METEOR_FALLS_B1F_1R - .byte MAPSEC_METEOR_FALLS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MeteorFalls_B1F_1R/map.json b/data/maps/MeteorFalls_B1F_1R/map.json new file mode 100644 index 0000000000..c234bd8b8d --- /dev/null +++ b/data/maps/MeteorFalls_B1F_1R/map.json @@ -0,0 +1,63 @@ +{ + "id": "MAP_METEOR_FALLS_B1F_1R", + "name": "MeteorFalls_B1F_1R", + "layout": "LAYOUT_METEOR_FALLS_B1F_1R", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_METEOR_FALLS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 6, + "elevation": 4, + "dest_map": "MAP_METEOR_FALLS_1F_2R", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 11, + "elevation": 5, + "dest_map": "MAP_METEOR_FALLS_1F_2R", + "dest_warp_id": 2 + }, + { + "x": 18, + "y": 15, + "elevation": 4, + "dest_map": "MAP_METEOR_FALLS_1F_2R", + "dest_warp_id": 3 + }, + { + "x": 17, + "y": 3, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_2R", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 23, + "elevation": 5, + "dest_map": "MAP_METEOR_FALLS_1F_1R", + "dest_warp_id": 3 + }, + { + "x": 20, + "y": 36, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_1F_1R", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MeteorFalls_B1F_2R/events.inc b/data/maps/MeteorFalls_B1F_2R/events.inc deleted file mode 100644 index fb1826f6e6..0000000000 --- a/data/maps/MeteorFalls_B1F_2R/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -MeteorFalls_B1F_2R_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02 - -MeteorFalls_B1F_2R_MapWarps: - warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R - -MeteorFalls_B1F_2R_MapEvents:: - map_events MeteorFalls_B1F_2R_EventObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc deleted file mode 100644 index d48c61b6d6..0000000000 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_B1F_2R: - .4byte MeteorFalls_B1F_2R_Layout - .4byte MeteorFalls_B1F_2R_MapEvents - .4byte MeteorFalls_B1F_2R_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_METEOR_FALLS_B1F_2R - .byte MAPSEC_METEOR_FALLS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json new file mode 100644 index 0000000000..527813efb3 --- /dev/null +++ b/data/maps/MeteorFalls_B1F_2R/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_METEOR_FALLS_B1F_2R", + "name": "MeteorFalls_B1F_2R", + "layout": "LAYOUT_METEOR_FALLS_B1F_2R", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_METEOR_FALLS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_B1F_2R_EventScript_2911DF", + "flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02" + } + ], + "warp_events": [ + { + "x": 5, + "y": 15, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_1R", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MeteorFalls_StevensCave/events.inc b/data/maps/MeteorFalls_StevensCave/events.inc deleted file mode 100644 index c9fcf8bd39..0000000000 --- a/data/maps/MeteorFalls_StevensCave/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -MeteorFalls_StevensCave_EventObjects: - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0 - -MeteorFalls_StevensCave_MapWarps: - warp_def 10, 29, 3, 5, MAP_METEOR_FALLS_1F_1R - -MeteorFalls_StevensCave_MapEvents:: - map_events MeteorFalls_StevensCave_EventObjects, MeteorFalls_StevensCave_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc deleted file mode 100644 index c615b53dea..0000000000 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_StevensCave: - .4byte MeteorFalls_StevensCave_Layout - .4byte MeteorFalls_StevensCave_MapEvents - .4byte MeteorFalls_StevensCave_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_METEOR_FALLS_STEVENS_CAVE - .byte MAPSEC_METEOR_FALLS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MeteorFalls_StevensCave/map.json b/data/maps/MeteorFalls_StevensCave/map.json new file mode 100644 index 0000000000..b3d696c8e4 --- /dev/null +++ b/data/maps/MeteorFalls_StevensCave/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_METEOR_FALLS_STEVENS_CAVE", + "name": "MeteorFalls_StevensCave", + "layout": "LAYOUT_METEOR_FALLS_STEVENS_CAVE", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_METEOR_FALLS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 19, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_StevensCave_EventScript_23B182", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 29, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_1F_1R", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MirageTower_1F/events.inc b/data/maps/MirageTower_1F/events.inc deleted file mode 100644 index f797b84c88..0000000000 --- a/data/maps/MirageTower_1F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -MirageTower_1F_MapWarps: - warp_def 10, 14, 3, 3, MAP_ROUTE111 - warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_2F - -MirageTower_1F_MapEvents:: - map_events 0x0, MirageTower_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc deleted file mode 100644 index 67035316ec..0000000000 --- a/data/maps/MirageTower_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_1F: - .4byte MirageTower_1F_Layout - .4byte MirageTower_1F_MapEvents - .4byte MirageTower_1F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_MIRAGE_TOWER_1F - .byte MAPSEC_MIRAGE_TOWER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MirageTower_1F/map.json b/data/maps/MirageTower_1F/map.json new file mode 100644 index 0000000000..886e0bf88a --- /dev/null +++ b/data/maps/MirageTower_1F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_MIRAGE_TOWER_1F", + "name": "MirageTower_1F", + "layout": "LAYOUT_MIRAGE_TOWER_1F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_MIRAGE_TOWER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 3 + }, + { + "x": 15, + "y": 2, + "elevation": 3, + "dest_map": "MAP_MIRAGE_TOWER_2F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MirageTower_2F/events.inc b/data/maps/MirageTower_2F/events.inc deleted file mode 100644 index 6cbb1fb37e..0000000000 --- a/data/maps/MirageTower_2F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -MirageTower_2F_MapWarps: - warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_3F - warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_1F - -MirageTower_2F_MapEvents:: - map_events 0x0, MirageTower_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc deleted file mode 100644 index 65a5c46650..0000000000 --- a/data/maps/MirageTower_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_2F: - .4byte MirageTower_2F_Layout - .4byte MirageTower_2F_MapEvents - .4byte MirageTower_2F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_MIRAGE_TOWER_2F - .byte MAPSEC_MIRAGE_TOWER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MirageTower_2F/map.json b/data/maps/MirageTower_2F/map.json new file mode 100644 index 0000000000..d8953d3da3 --- /dev/null +++ b/data/maps/MirageTower_2F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_MIRAGE_TOWER_2F", + "name": "MirageTower_2F", + "layout": "LAYOUT_MIRAGE_TOWER_2F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_MIRAGE_TOWER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 18, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MIRAGE_TOWER_3F", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 2, + "elevation": 3, + "dest_map": "MAP_MIRAGE_TOWER_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MirageTower_3F/events.inc b/data/maps/MirageTower_3F/events.inc deleted file mode 100644 index 9fbc189dd1..0000000000 --- a/data/maps/MirageTower_3F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -MirageTower_3F_EventObjects: - object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, FLAG_TEMP_12 - -MirageTower_3F_MapWarps: - warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_2F - warp_def 2, 4, 0, 0, MAP_MIRAGE_TOWER_4F - -MirageTower_3F_MapEvents:: - map_events MirageTower_3F_EventObjects, MirageTower_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc deleted file mode 100644 index 565ff1f6d4..0000000000 --- a/data/maps/MirageTower_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_3F: - .4byte MirageTower_3F_Layout - .4byte MirageTower_3F_MapEvents - .4byte MirageTower_3F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_MIRAGE_TOWER_3F - .byte MAPSEC_MIRAGE_TOWER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MirageTower_3F/map.json b/data/maps/MirageTower_3F/map.json new file mode 100644 index 0000000000..7ba9772da9 --- /dev/null +++ b/data/maps/MirageTower_3F/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_MIRAGE_TOWER_3F", + "name": "MirageTower_3F", + "layout": "LAYOUT_MIRAGE_TOWER_3F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_MIRAGE_TOWER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MirageTower_3F_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MirageTower_3F_EventScript_2907A6", + "flag": "FLAG_TEMP_12" + } + ], + "warp_events": [ + { + "x": 18, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MIRAGE_TOWER_2F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 4, + "elevation": 0, + "dest_map": "MAP_MIRAGE_TOWER_4F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MirageTower_4F/events.inc b/data/maps/MirageTower_4F/events.inc deleted file mode 100644 index a2b22cad19..0000000000 --- a/data/maps/MirageTower_4F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -MirageTower_4F_EventObjects: - object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 5, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD48, FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL - object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD89, FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_4F_EventScript_2907A6, FLAG_TEMP_11 - -MirageTower_4F_MapWarps: - warp_def 1, 4, 3, 1, MAP_MIRAGE_TOWER_3F - -MirageTower_4F_MapEvents:: - map_events MirageTower_4F_EventObjects, MirageTower_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc deleted file mode 100644 index b3bc8341a8..0000000000 --- a/data/maps/MirageTower_4F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_4F: - .4byte MirageTower_4F_Layout - .4byte MirageTower_4F_MapEvents - .4byte MirageTower_4F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_MIRAGE_TOWER_4F - .byte MAPSEC_MIRAGE_TOWER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json new file mode 100644 index 0000000000..a39ed14a95 --- /dev/null +++ b/data/maps/MirageTower_4F/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_MIRAGE_TOWER_4F", + "name": "MirageTower_4F", + "layout": "LAYOUT_MIRAGE_TOWER_4F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_MIRAGE_TOWER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "x": 5, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MirageTower_4F_EventScript_23AD48", + "flag": "FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "x": 7, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MirageTower_4F_EventScript_23AD89", + "flag": "FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 6, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MirageTower_4F_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + } + ], + "warp_events": [ + { + "x": 1, + "y": 4, + "elevation": 3, + "dest_map": "MAP_MIRAGE_TOWER_3F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity/connections.inc b/data/maps/MossdeepCity/connections.inc deleted file mode 100644 index c22091fe7c..0000000000 --- a/data/maps/MossdeepCity/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -MossdeepCity_MapConnectionsList: - connection up, 0, MAP_ROUTE125 - connection down, 0, MAP_ROUTE127 - connection left, -40, MAP_ROUTE124 - -MossdeepCity_MapConnections: - .4byte 3 - .4byte MossdeepCity_MapConnectionsList - diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc deleted file mode 100644 index a8284ae5dd..0000000000 --- a/data/maps/MossdeepCity/events.inc +++ /dev/null @@ -1,56 +0,0 @@ -MossdeepCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 38, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AD1, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 50, 34, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 32, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0 - object_event 4, EVENT_OBJ_GFX_NINJA_BOY, 0, 26, 21, 5, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_EventScript_1E4AF0, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, FLAG_ITEM_MOSSDEEP_CITY_NET_BALL - object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 55, 5, 7, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 56, 21, 7, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_EventScript_1E4B0B, 0 - object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4C26, 0 - object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 23, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA - object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 24, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA - object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 25, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA - object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 26, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA - object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 45, 25, 5, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA - object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 25, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_2C81EE, 0 - object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, FLAG_HIDE_MOSSDEEP_CITY_SCOTT - object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 31, 29, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_1E4C7C, 0 - -MossdeepCity_MapWarps: - warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1 - warp_def 38, 9, 0, 0, MAP_MOSSDEEP_CITY_GYM - warp_def 28, 16, 0, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F - warp_def 67, 25, 0, 0, MAP_MOSSDEEP_CITY_HOUSE2 - warp_def 37, 18, 0, 0, MAP_MOSSDEEP_CITY_MART - warp_def 49, 6, 0, 0, MAP_MOSSDEEP_CITY_HOUSE3 - warp_def 19, 10, 0, 0, MAP_MOSSDEEP_CITY_STEVENS_HOUSE - warp_def 18, 16, 0, 1, MAP_MOSSDEEP_CITY_HOUSE4 - warp_def 64, 15, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F - warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F - -MossdeepCity_MapCoordEvents: - coord_event 25, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 - coord_event 26, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 - coord_event 32, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 - coord_event 33, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 - coord_event 42, 21, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 - coord_event 41, 22, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 - coord_event 41, 23, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 - coord_event 41, 24, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 - coord_event 40, 25, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 - coord_event 40, 26, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 - -MossdeepCity_MapBGEvents: - bg_event 25, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B26 - bg_event 34, 9, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B1D - bg_event 29, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E73 - bg_event 38, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E6A - bg_event 66, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B2F - bg_event 30, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E73 - bg_event 39, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E6A - bg_event 57, 21, 7, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B14 - -MossdeepCity_MapEvents:: - map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents - diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc deleted file mode 100644 index 5ac6ceeaa2..0000000000 --- a/data/maps/MossdeepCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity: - .4byte MossdeepCity_Layout - .4byte MossdeepCity_MapEvents - .4byte MossdeepCity_MapScripts - .4byte MossdeepCity_MapConnections - .2byte MUS_GOTOWN - .2byte LAYOUT_MOSSDEEP_CITY - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json new file mode 100644 index 0000000000..66d4267807 --- /dev/null +++ b/data/maps/MossdeepCity/map.json @@ -0,0 +1,485 @@ +{ + "id": "MAP_MOSSDEEP_CITY", + "name": "MossdeepCity", + "layout": "LAYOUT_MOSSDEEP_CITY", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE125" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE127" + }, + { + "direction": "left", + "offset": -40, + "map": "MAP_ROUTE124" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 38, + "y": 12, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4AD1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 50, + "y": 34, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4AF9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 32, + "y": 12, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4AB2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 26, + "y": 21, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4AF0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 45, + "y": 18, + "elevation": 7, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4B02", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 62, + "y": 35, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_2910F5", + "flag": "FLAG_ITEM_MOSSDEEP_CITY_NET_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 55, + "y": 5, + "elevation": 7, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4C10", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 56, + "y": 21, + "elevation": 7, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4B0B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 23, + "y": 13, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4C26", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 44, + "y": 23, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 44, + "y": 24, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 44, + "y": 25, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 44, + "y": 26, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 45, + "y": 25, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 19, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_2C81EE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 61, + "y": 29, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4C85", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SCOTT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 31, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4C7C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 28, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 38, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 0 + }, + { + "x": 28, + "y": 16, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 67, + "y": 25, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 37, + "y": 18, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_MART", + "dest_warp_id": 0 + }, + { + "x": 49, + "y": 6, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_HOUSE3", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 10, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_STEVENS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 16, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_HOUSE4", + "dest_warp_id": 1 + }, + { + "x": 64, + "y": 15, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 36, + "y": 24, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GAME_CORNER_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 25, + "y": 25, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_EventScript_1E4B38" + }, + { + "type": "trigger", + "x": 26, + "y": 25, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_EventScript_1E4B38" + }, + { + "type": "trigger", + "x": 32, + "y": 27, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_EventScript_1E4B38" + }, + { + "type": "trigger", + "x": 33, + "y": 27, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_EventScript_1E4B38" + }, + { + "type": "trigger", + "x": 42, + "y": 21, + "elevation": 5, + "var": "VAR_0x405D", + "var_value": 1, + "script": "MossdeepCity_EventScript_1E4B41" + }, + { + "type": "trigger", + "x": 41, + "y": 22, + "elevation": 5, + "var": "VAR_0x405D", + "var_value": 1, + "script": "MossdeepCity_EventScript_1E4B41" + }, + { + "type": "trigger", + "x": 41, + "y": 23, + "elevation": 5, + "var": "VAR_0x405D", + "var_value": 1, + "script": "MossdeepCity_EventScript_1E4B41" + }, + { + "type": "trigger", + "x": 41, + "y": 24, + "elevation": 5, + "var": "VAR_0x405D", + "var_value": 1, + "script": "MossdeepCity_EventScript_1E4B41" + }, + { + "type": "trigger", + "x": 40, + "y": 25, + "elevation": 5, + "var": "VAR_0x405D", + "var_value": 1, + "script": "MossdeepCity_EventScript_1E4B41" + }, + { + "type": "trigger", + "x": 40, + "y": 26, + "elevation": 5, + "var": "VAR_0x405D", + "var_value": 1, + "script": "MossdeepCity_EventScript_1E4B41" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 25, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_EventScript_1E4B26" + }, + { + "type": "sign", + "x": 34, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_EventScript_1E4B1D" + }, + { + "type": "sign", + "x": 29, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MossdeepCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 38, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MossdeepCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 66, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_EventScript_1E4B2F" + }, + { + "type": "sign", + "x": 30, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MossdeepCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 39, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MossdeepCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 57, + "y": 21, + "elevation": 7, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_EventScript_1E4B14" + } + ] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc deleted file mode 100644 index e9b491f4d7..0000000000 --- a/data/maps/MossdeepCity_GameCorner_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MossdeepCity_GameCorner_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0 - -MossdeepCity_GameCorner_1F_MapWarps: - warp_def 5, 9, 0, 9, MAP_MOSSDEEP_CITY - warp_def 6, 9, 0, 9, MAP_MOSSDEEP_CITY - warp_def 2, 0, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F - -MossdeepCity_GameCorner_1F_MapBGEvents: - bg_event 3, 0, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_224B5D - bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_277E9D - bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_277E96 - -MossdeepCity_GameCorner_1F_MapEvents:: - map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents - diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc deleted file mode 100644 index 572a5fbe92..0000000000 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_GameCorner_1F: - .4byte MossdeepCity_GameCorner_1F_Layout - .4byte MossdeepCity_GameCorner_1F_MapEvents - .4byte MossdeepCity_GameCorner_1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json new file mode 100644 index 0000000000..ffb52896e2 --- /dev/null +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_1F", + "name": "MossdeepCity_GameCorner_1F", + "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_GameCorner_1F_EventScript_224B54", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 4, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_GameCorner_1F_EventScript_224B4B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 9 + }, + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 9 + }, + { + "x": 2, + "y": 0, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GAME_CORNER_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 0, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_GameCorner_1F_EventScript_224B5D" + }, + { + "type": "sign", + "x": 0, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_GameCorner_1F_EventScript_277E9D" + }, + { + "type": "sign", + "x": 1, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_GameCorner_1F_EventScript_277E96" + } + ] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_GameCorner_B1F/events.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc deleted file mode 100644 index d86974ae95..0000000000 --- a/data/maps/MossdeepCity_GameCorner_B1F/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -MossdeepCity_GameCorner_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 - -MossdeepCity_GameCorner_B1F_MapWarps: - warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F - -MossdeepCity_GameCorner_B1F_MapEvents:: - map_events MossdeepCity_GameCorner_B1F_EventObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc deleted file mode 100644 index ee2f557319..0000000000 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_GameCorner_B1F: - .4byte MossdeepCity_GameCorner_B1F_Layout - .4byte MossdeepCity_GameCorner_B1F_MapEvents - .4byte MossdeepCity_GameCorner_B1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json new file mode 100644 index 0000000000..4469b2642c --- /dev/null +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_B1F", + "name": "MossdeepCity_GameCorner_B1F", + "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GAME_CORNER_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc deleted file mode 100644 index bc18f4eb77..0000000000 --- a/data/maps/MossdeepCity_Gym/events.inc +++ /dev/null @@ -1,72 +0,0 @@ -MossdeepCity_Gym_EventObjects: - object_event 1, EVENT_OBJ_GFX_TATE, 0, 23, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 30, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0 - object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 20, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 4, 29, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0 - object_event 5, EVENT_OBJ_GFX_LASS, 0, 4, 23, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0 - object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 6, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0 - object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 5, 33, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0 - object_event 9, EVENT_OBJ_GFX_LIZA, 0, 24, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 - object_event 10, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 2, 30, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 1, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 30, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 14, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 7, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 16, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 10, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 17, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0 - object_event 18, EVENT_OBJ_GFX_HEX_MANIAC, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0 - object_event 19, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 20, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 21, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 22, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 23, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 24, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 22, 25, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0 - object_event 26, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 27, EVENT_OBJ_GFX_LASS, 0, 25, 25, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0 - object_event 28, EVENT_OBJ_GFX_HEX_MANIAC, 0, 22, 23, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0 - object_event 29, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 30, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 31, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 22, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 32, EVENT_OBJ_GFX_PSYCHIC_M, 0, 25, 22, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0 - object_event 33, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 34, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - -MossdeepCity_Gym_MapWarps: - warp_def 6, 35, 3, 1, MAP_MOSSDEEP_CITY - warp_def 7, 35, 3, 1, MAP_MOSSDEEP_CITY - warp_def 3, 28, 0, 3, MAP_MOSSDEEP_CITY_GYM - warp_def 1, 23, 3, 2, MAP_MOSSDEEP_CITY_GYM - warp_def 7, 18, 0, 5, MAP_MOSSDEEP_CITY_GYM - warp_def 8, 12, 0, 4, MAP_MOSSDEEP_CITY_GYM - warp_def 9, 18, 0, 7, MAP_MOSSDEEP_CITY_GYM - warp_def 23, 20, 0, 6, MAP_MOSSDEEP_CITY_GYM - warp_def 1, 33, 3, 9, MAP_MOSSDEEP_CITY_GYM - warp_def 20, 24, 0, 8, MAP_MOSSDEEP_CITY_GYM - warp_def 11, 3, 0, 11, MAP_MOSSDEEP_CITY_GYM - warp_def 11, 35, 3, 10, MAP_MOSSDEEP_CITY_GYM - warp_def 13, 32, 0, 13, MAP_MOSSDEEP_CITY_GYM - warp_def 21, 10, 0, 12, MAP_MOSSDEEP_CITY_GYM - -MossdeepCity_Gym_MapCoordEvents: - coord_event 2, 21, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C67 - coord_event 8, 10, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C7D - coord_event 6, 7, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C7D - coord_event 15, 34, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C93 - coord_event 23, 24, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220CA9 - coord_event 23, 21, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220CA9 - coord_event 8, 6, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220CBF - coord_event 21, 6, 0, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220AF1 - coord_event 3, 30, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C67 - -MossdeepCity_Gym_MapBGEvents: - bg_event 4, 34, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_220C33 - bg_event 8, 34, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_220C43 - -MossdeepCity_Gym_MapEvents:: - map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents - diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc deleted file mode 100644 index e596d834be..0000000000 --- a/data/maps/MossdeepCity_Gym/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_Gym: - .4byte MossdeepCity_Gym_Layout - .4byte MossdeepCity_Gym_MapEvents - .4byte MossdeepCity_Gym_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_MOSSDEEP_CITY_GYM - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json new file mode 100644 index 0000000000..37c41435b0 --- /dev/null +++ b/data/maps/MossdeepCity_Gym/map.json @@ -0,0 +1,687 @@ +{ + "id": "MAP_MOSSDEEP_CITY_GYM", + "name": "MossdeepCity_Gym", + "layout": "LAYOUT_MOSSDEEP_CITY_GYM", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TATE", + "x": 23, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Gym_EventScript_220898", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 1, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220AFD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 5, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B2B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 4, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B70", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 4, + "y": 23, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B59", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 6, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B14", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 6, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B42", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 5, + "y": 33, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Gym_EventScript_220C11", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LIZA", + "x": 24, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Gym_EventScript_220898", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 2, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 1, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 4, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 5, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 5, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 7, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 9, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B9E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B87", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 11, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 12, + "y": 33, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 12, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 22, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220BCC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 23, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 25, + "y": 25, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220BB5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 22, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220BFA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 21, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 21, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 22, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 25, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220BE3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 24, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 24, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 23, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 35, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 35, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 28, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 23, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 18, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 5 + }, + { + "x": 8, + "y": 12, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 4 + }, + { + "x": 9, + "y": 18, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 7 + }, + { + "x": 23, + "y": 20, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 6 + }, + { + "x": 1, + "y": 33, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 9 + }, + { + "x": 20, + "y": 24, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 8 + }, + { + "x": 11, + "y": 3, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 11 + }, + { + "x": 11, + "y": 35, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 10 + }, + { + "x": 13, + "y": 32, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 13 + }, + { + "x": 21, + "y": 10, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 12 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 21, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220C67" + }, + { + "type": "trigger", + "x": 8, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220C7D" + }, + { + "type": "trigger", + "x": 6, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220C7D" + }, + { + "type": "trigger", + "x": 15, + "y": 34, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220C93" + }, + { + "type": "trigger", + "x": 23, + "y": 24, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220CA9" + }, + { + "type": "trigger", + "x": 23, + "y": 21, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220CA9" + }, + { + "type": "trigger", + "x": 8, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220CBF" + }, + { + "type": "trigger", + "x": 21, + "y": 6, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220AF1" + }, + { + "type": "trigger", + "x": 3, + "y": 30, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220C67" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 34, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MossdeepCity_Gym_EventScript_220C33" + }, + { + "type": "sign", + "x": 8, + "y": 34, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MossdeepCity_Gym_EventScript_220C43" + } + ] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_House1/events.inc b/data/maps/MossdeepCity_House1/events.inc deleted file mode 100644 index c16a852dfa..0000000000 --- a/data/maps/MossdeepCity_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -MossdeepCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0 - -MossdeepCity_House1_MapWarps: - warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY - warp_def 4, 7, 0, 0, MAP_MOSSDEEP_CITY - -MossdeepCity_House1_MapEvents:: - map_events MossdeepCity_House1_EventObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc deleted file mode 100644 index c0a3de2c90..0000000000 --- a/data/maps/MossdeepCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_House1: - .4byte House2_Layout - .4byte MossdeepCity_House1_MapEvents - .4byte MossdeepCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json new file mode 100644 index 0000000000..55e573f694 --- /dev/null +++ b/data/maps/MossdeepCity_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_MOSSDEEP_CITY_HOUSE1", + "name": "MossdeepCity_House1", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House1_EventScript_221FD6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House1_EventScript_222006", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_House2/events.inc b/data/maps/MossdeepCity_House2/events.inc deleted file mode 100644 index 57d398ce90..0000000000 --- a/data/maps/MossdeepCity_House2/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MossdeepCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0 - object_event 2, EVENT_OBJ_GFX_TWIN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL - -MossdeepCity_House2_MapWarps: - warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY - warp_def 4, 8, 0, 3, MAP_MOSSDEEP_CITY - -MossdeepCity_House2_MapEvents:: - map_events MossdeepCity_House2_EventObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc deleted file mode 100644 index ffa15e3271..0000000000 --- a/data/maps/MossdeepCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_House2: - .4byte House1_Layout - .4byte MossdeepCity_House2_MapEvents - .4byte MossdeepCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json new file mode 100644 index 0000000000..7f2121b7f1 --- /dev/null +++ b/data/maps/MossdeepCity_House2/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_MOSSDEEP_CITY_HOUSE2", + "name": "MossdeepCity_House2", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House2_EventScript_2220DF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House2_EventScript_2220E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House2_EventScript_2220F1", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_House3/events.inc b/data/maps/MossdeepCity_House3/events.inc deleted file mode 100644 index 7eb2c34161..0000000000 --- a/data/maps/MossdeepCity_House3/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -MossdeepCity_House3_EventObjects: - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0 - -MossdeepCity_House3_MapWarps: - warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY - warp_def 4, 7, 0, 5, MAP_MOSSDEEP_CITY - -MossdeepCity_House3_MapEvents:: - map_events MossdeepCity_House3_EventObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc deleted file mode 100644 index b8caf392d1..0000000000 --- a/data/maps/MossdeepCity_House3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_House3: - .4byte House2_Layout - .4byte MossdeepCity_House3_MapEvents - .4byte MossdeepCity_House3_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json new file mode 100644 index 0000000000..1f28d4d222 --- /dev/null +++ b/data/maps/MossdeepCity_House3/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_MOSSDEEP_CITY_HOUSE3", + "name": "MossdeepCity_House3", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House3_EventScript_2225C3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_House4/events.inc b/data/maps/MossdeepCity_House4/events.inc deleted file mode 100644 index 71dd54a5e4..0000000000 --- a/data/maps/MossdeepCity_House4/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MossdeepCity_House4_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0 - object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0 - object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0 - -MossdeepCity_House4_MapWarps: - warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY - warp_def 3, 7, 0, 7, MAP_MOSSDEEP_CITY - -MossdeepCity_House4_MapEvents:: - map_events MossdeepCity_House4_EventObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc deleted file mode 100644 index 1e748b7b4b..0000000000 --- a/data/maps/MossdeepCity_House4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_House4: - .4byte HouseWithBed_Layout - .4byte MossdeepCity_House4_MapEvents - .4byte MossdeepCity_House4_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE_WITH_BED - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json new file mode 100644 index 0000000000..9f9f01ebd1 --- /dev/null +++ b/data/maps/MossdeepCity_House4/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_MOSSDEEP_CITY_HOUSE4", + "name": "MossdeepCity_House4", + "layout": "LAYOUT_HOUSE_WITH_BED", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House4_EventScript_222DD8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House4_EventScript_222DF7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House4_EventScript_222E1E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 7 + }, + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_Mart/events.inc b/data/maps/MossdeepCity_Mart/events.inc deleted file mode 100644 index 770cb7ee5c..0000000000 --- a/data/maps/MossdeepCity_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -MossdeepCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_222408, 0 - -MossdeepCity_Mart_MapWarps: - warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY - warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY - -MossdeepCity_Mart_MapEvents:: - map_events MossdeepCity_Mart_EventObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc deleted file mode 100644 index 75ea708d1a..0000000000 --- a/data/maps/MossdeepCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_Mart: - .4byte Mart_Layout - .4byte MossdeepCity_Mart_MapEvents - .4byte MossdeepCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json new file mode 100644 index 0000000000..6b739a2d2f --- /dev/null +++ b/data/maps/MossdeepCity_Mart/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_MOSSDEEP_CITY_MART", + "name": "MossdeepCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Mart_EventScript_2223C8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Mart_EventScript_2223F6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 8, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Mart_EventScript_2223FF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Mart_EventScript_222408", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 53aa694703..0000000000 --- a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -MossdeepCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0 - -MossdeepCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY - warp_def 6, 8, 3, 2, MAP_MOSSDEEP_CITY - warp_def 1, 6, 4, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F - -MossdeepCity_PokemonCenter_1F_MapEvents:: - map_events MossdeepCity_PokemonCenter_1F_EventObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 719394a941..0000000000 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte MossdeepCity_PokemonCenter_1F_MapEvents - .4byte MossdeepCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..6f1f3f774f --- /dev/null +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F", + "name": "MossdeepCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_1F_EventScript_22224E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_1F_EventScript_22225C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_1F_EventScript_222265", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc deleted file mode 100644 index ce27a0804b..0000000000 --- a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0 - -MossdeepCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -MossdeepCity_PokemonCenter_2F_MapEvents:: - map_events MossdeepCity_PokemonCenter_2F_EventObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 7bb1d541ca..0000000000 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte MossdeepCity_PokemonCenter_2F_MapEvents - .4byte MossdeepCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..7aa2e7ccb3 --- /dev/null +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F", + "name": "MossdeepCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 11, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_2F_EventScript_22235B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc deleted file mode 100644 index 84466046f4..0000000000 --- a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -MossdeepCity_SpaceCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA - object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA - object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA - object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA - object_event 10, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 5, 0, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY - object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN - -MossdeepCity_SpaceCenter_1F_MapWarps: - warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY - warp_def 8, 9, 0, 8, MAP_MOSSDEEP_CITY - warp_def 13, 1, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_2F - -MossdeepCity_SpaceCenter_1F_MapEvents:: - map_events MossdeepCity_SpaceCenter_1F_EventObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc deleted file mode 100644 index 5bce64c21b..0000000000 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_SpaceCenter_1F: - .4byte MossdeepCity_SpaceCenter_1F_Layout - .4byte MossdeepCity_SpaceCenter_1F_MapEvents - .4byte MossdeepCity_SpaceCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json new file mode 100644 index 0000000000..f53950394f --- /dev/null +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -0,0 +1,186 @@ +{ + "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F", + "name": "MossdeepCity_SpaceCenter_1F", + "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_222FD8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_223063", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_22308E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_223168", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 14, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_22312D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "x": 12, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231DA", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231F1", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_223208", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 13, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_22321F", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 2, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231CF", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231B9", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN" + } + ], + "warp_events": [ + { + "x": 7, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 8 + }, + { + "x": 8, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 8 + }, + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_SPACE_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc deleted file mode 100644 index 624185dfc2..0000000000 --- a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MossdeepCity_SpaceCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0 - object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA - object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA - object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA - object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA - -MossdeepCity_SpaceCenter_2F_MapWarps: - warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F - -MossdeepCity_SpaceCenter_2F_MapEvents:: - map_events MossdeepCity_SpaceCenter_2F_EventObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc deleted file mode 100644 index 1d6b5834f6..0000000000 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_SpaceCenter_2F: - .4byte MossdeepCity_SpaceCenter_2F_Layout - .4byte MossdeepCity_SpaceCenter_2F_MapEvents - .4byte MossdeepCity_SpaceCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json new file mode 100644 index 0000000000..a40f6ca9d7 --- /dev/null +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -0,0 +1,146 @@ +{ + "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_2F", + "name": "MossdeepCity_SpaceCenter_2F", + "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F03", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223EC8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223E8D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F7A", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 12, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F3E", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 13, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F50", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 14, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F47", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 0, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F59", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 1, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F6F", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" + } + ], + "warp_events": [ + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc deleted file mode 100644 index c9fa20d623..0000000000 --- a/data/maps/MossdeepCity_StevensHouse/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -MossdeepCity_StevensHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL - object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY - -MossdeepCity_StevensHouse_MapWarps: - warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY - warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY - -MossdeepCity_StevensHouse_MapBGEvents: - bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 - bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 - bg_event 10, 4, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 - bg_event 10, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 - -MossdeepCity_StevensHouse_MapEvents:: - map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents - diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc deleted file mode 100644 index a6e197f204..0000000000 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_StevensHouse: - .4byte MossdeepCity_StevensHouse_Layout - .4byte MossdeepCity_StevensHouse_MapEvents - .4byte MossdeepCity_StevensHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json new file mode 100644 index 0000000000..beedbd75ae --- /dev/null +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_MOSSDEEP_CITY_STEVENS_HOUSE", + "name": "MossdeepCity_StevensHouse", + "layout": "LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_StevensHouse_EventScript_222912", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_StevensHouse_EventScript_222841", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_StevensHouse_EventScript_22291B", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 0, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_StevensHouse_EventScript_222909" + }, + { + "type": "sign", + "x": 1, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_StevensHouse_EventScript_222909" + }, + { + "type": "sign", + "x": 10, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_StevensHouse_EventScript_222909" + }, + { + "type": "sign", + "x": 10, + "y": 6, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_StevensHouse_EventScript_222909" + } + ] +} \ No newline at end of file diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc deleted file mode 100644 index e341872a70..0000000000 --- a/data/maps/MtChimney/events.inc +++ /dev/null @@ -1,45 +0,0 @@ -MtChimney_EventObjects: - object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 24, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MtChimney_EventScript_22F06E, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 32, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 28, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F05C, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F053, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F065, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 9, EVENT_OBJ_GFX_OLD_WOMAN, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY - object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, MOVEMENT_TYPE_RUN_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 21, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F09C, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtChimney_EventScript_22F085, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 25, EVENT_OBJ_GFX_EXPERT_F, 0, 16, 18, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, MtChimney_EventScript_22F14A, FLAG_HIDE_MT_CHIMNEY_TRAINERS - object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, FLAG_HIDE_MT_CHIMNEY_TRAINERS - object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1C3, FLAG_HIDE_MT_CHIMNEY_TRAINERS - object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, MtChimney_EventScript_22F1DA, FLAG_HIDE_MT_CHIMNEY_TRAINERS - object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1F1, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, MtChimney_EventScript_22F208, FLAG_HIDE_MT_CHIMNEY_TRAINERS - -MtChimney_MapWarps: - warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION - warp_def 18, 36, 0, 1, MAP_MT_CHIMNEY_CABLE_CAR_STATION - warp_def 20, 41, 3, 2, MAP_JAGGED_PASS - warp_def 21, 41, 3, 3, MAP_JAGGED_PASS - -MtChimney_MapBGEvents: - bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_22F0E4 - bg_event 24, 37, 3, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_22F141 - -MtChimney_MapEvents:: - map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents - diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc deleted file mode 100644 index a7f03617e3..0000000000 --- a/data/maps/MtChimney/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtChimney: - .4byte MtChimney_Layout - .4byte MtChimney_MapEvents - .4byte MtChimney_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_MT_CHIMNEY - .byte MAPSEC_MT_CHIMNEY - .byte 0 - .byte WEATHER_ASH - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json new file mode 100644 index 0000000000..b8dd7bb09c --- /dev/null +++ b/data/maps/MtChimney/map.json @@ -0,0 +1,457 @@ +{ + "id": "MAP_MT_CHIMNEY", + "name": "MtChimney", + "layout": "LAYOUT_MT_CHIMNEY", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_MT_CHIMNEY", + "requires_flash": false, + "weather": "WEATHER_ASH", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 24, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22EDD5", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 13, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22EE0B", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 12, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtChimney_EventScript_22F06E", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 32, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0C0", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 28, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0B7", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 19, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F05C", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 29, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F053", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 31, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F065", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 19, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22EEF3", + "flag": "FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 22, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0C9", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 23, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_RUN_IN_PLACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0DB", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 23, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0D2", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 23, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0A5", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 23, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0D2", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 22, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0D2", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 23, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0AE", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 21, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F09C", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 30, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0DB", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 29, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0D2", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 30, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0DB", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 31, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0D2", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 9, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtChimney_EventScript_22F085", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 20, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0DB", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 21, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0D2", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 16, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtChimney_EventScript_22F14A", + "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 14, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "MtChimney_EventScript_22F1AC", + "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 29, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtChimney_EventScript_22F1C3", + "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 27, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtChimney_EventScript_22F1DA", + "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "x": 13, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtChimney_EventScript_22F1F1", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "MtChimney_EventScript_22F208", + "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" + } + ], + "warp_events": [ + { + "x": 17, + "y": 36, + "elevation": 0, + "dest_map": "MAP_MT_CHIMNEY_CABLE_CAR_STATION", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 36, + "elevation": 0, + "dest_map": "MAP_MT_CHIMNEY_CABLE_CAR_STATION", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 41, + "elevation": 3, + "dest_map": "MAP_JAGGED_PASS", + "dest_warp_id": 2 + }, + { + "x": 21, + "y": 41, + "elevation": 3, + "dest_map": "MAP_JAGGED_PASS", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MtChimney_EventScript_22F0E4" + }, + { + "type": "sign", + "x": 24, + "y": 37, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MtChimney_EventScript_22F141" + } + ] +} \ No newline at end of file diff --git a/data/maps/MtChimney_CableCarStation/events.inc b/data/maps/MtChimney_CableCarStation/events.inc deleted file mode 100644 index 24f64fbbb4..0000000000 --- a/data/maps/MtChimney_CableCarStation/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -MtChimney_CableCarStation_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 - -MtChimney_CableCarStation_MapWarps: - warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY - warp_def 7, 11, 0, 1, MAP_MT_CHIMNEY - -MtChimney_CableCarStation_MapEvents:: - map_events MtChimney_CableCarStation_EventObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc deleted file mode 100644 index 7b3d628ccd..0000000000 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtChimney_CableCarStation: - .4byte CableCarStation_Layout - .4byte MtChimney_CableCarStation_MapEvents - .4byte MtChimney_CableCarStation_MapScripts - .4byte 0x0 - .2byte MUS_DOORO_X1 - .2byte LAYOUT_CABLE_CAR_STATION - .byte MAPSEC_MT_CHIMNEY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json new file mode 100644 index 0000000000..155686bbb5 --- /dev/null +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_MT_CHIMNEY_CABLE_CAR_STATION", + "name": "MtChimney_CableCarStation", + "layout": "LAYOUT_CABLE_CAR_STATION", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_MT_CHIMNEY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_CableCarStation_EventScript_22AC4B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CABLE_CAR", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 11, + "elevation": 0, + "dest_map": "MAP_MT_CHIMNEY", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 11, + "elevation": 0, + "dest_map": "MAP_MT_CHIMNEY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc deleted file mode 100644 index 7b1d79e165..0000000000 --- a/data/maps/MtPyre_1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -MtPyre_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN, 0, 21, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 17, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0 - -MtPyre_1F_MapWarps: - warp_def 17, 18, 3, 0, MAP_ROUTE122 - warp_def 3, 6, 3, 0, MAP_MT_PYRE_EXTERIOR - warp_def 18, 18, 3, 0, MAP_ROUTE122 - warp_def 4, 6, 3, 0, MAP_MT_PYRE_EXTERIOR - warp_def 11, 1, 3, 0, MAP_MT_PYRE_2F - warp_def 20, 9, 3, 4, MAP_MT_PYRE_2F - -MtPyre_1F_MapEvents:: - map_events MtPyre_1F_EventObjects, MtPyre_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc deleted file mode 100644 index b4d6603df9..0000000000 --- a/data/maps/MtPyre_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_1F: - .4byte MtPyre_1F_Layout - .4byte MtPyre_1F_MapEvents - .4byte MtPyre_1F_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_MT_PYRE_1F - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json new file mode 100644 index 0000000000..1969ba9cdc --- /dev/null +++ b/data/maps/MtPyre_1F/map.json @@ -0,0 +1,103 @@ +{ + "id": "MAP_MT_PYRE_1F", + "name": "MtPyre_1F", + "layout": "LAYOUT_MT_PYRE_1F", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 21, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_1F_EventScript_230F3F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 17, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_1F_EventScript_230F78", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_1F_EventScript_230F81", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 17, + "y": 18, + "elevation": 3, + "dest_map": "MAP_ROUTE122", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 6, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_EXTERIOR", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 18, + "elevation": 3, + "dest_map": "MAP_ROUTE122", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_EXTERIOR", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_2F", + "dest_warp_id": 0 + }, + { + "x": 20, + "y": 9, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_2F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc deleted file mode 100644 index f0ec0d0a34..0000000000 --- a/data/maps/MtPyre_2F/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -MtPyre_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MtPyre_2F_EventScript_231128, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MtPyre_2F_EventScript_231116, 0 - object_event 4, EVENT_OBJ_GFX_POKEFAN_M, 0, 12, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_2F_EventScript_23111F, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23115A, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23113F, 0 - object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, MtPyre_2F_EventScript_23118C, 0 - object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_2F_EventScript_231175, 0 - -MtPyre_2F_MapWarps: - warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F - warp_def 10, 1, 3, 0, MAP_MT_PYRE_3F - warp_def 10, 12, 3, 4, MAP_MT_PYRE_3F - warp_def 6, 12, 3, 5, MAP_MT_PYRE_3F - warp_def 11, 9, 3, 5, MAP_MT_PYRE_1F - -MtPyre_2F_MapEvents:: - map_events MtPyre_2F_EventObjects, MtPyre_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc deleted file mode 100644 index b1906b82e6..0000000000 --- a/data/maps/MtPyre_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_2F: - .4byte MtPyre_2F_Layout - .4byte MtPyre_2F_MapEvents - .4byte MtPyre_2F_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_MT_PYRE_2F - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json new file mode 100644 index 0000000000..07b20b3b38 --- /dev/null +++ b/data/maps/MtPyre_2F/map.json @@ -0,0 +1,161 @@ +{ + "id": "MAP_MT_PYRE_2F", + "name": "MtPyre_2F", + "layout": "LAYOUT_MT_PYRE_2F", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtPyre_2F_EventScript_231128", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_2F_EventScript_2912FD", + "flag": "FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_2F_EventScript_231116", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 12, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_2F_EventScript_23111F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 2, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MtPyre_2F_EventScript_23115A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 3, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MtPyre_2F_EventScript_23113F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 6, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtPyre_2F_EventScript_23118C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtPyre_2F_EventScript_231175", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_1F", + "dest_warp_id": 4 + }, + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 4 + }, + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 5 + }, + { + "x": 11, + "y": 9, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_1F", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc deleted file mode 100644 index 4d6f3c9eac..0000000000 --- a/data/maps/MtPyre_3F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MtPyre_3F_EventObjects: - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0 - -MtPyre_3F_MapWarps: - warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F - warp_def 2, 1, 3, 1, MAP_MT_PYRE_4F - warp_def 9, 10, 3, 4, MAP_MT_PYRE_4F - warp_def 1, 12, 3, 5, MAP_MT_PYRE_4F - warp_def 10, 12, 3, 2, MAP_MT_PYRE_2F - warp_def 6, 12, 3, 3, MAP_MT_PYRE_2F - -MtPyre_3F_MapEvents:: - map_events MtPyre_3F_EventObjects, MtPyre_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc deleted file mode 100644 index 96026c7d9f..0000000000 --- a/data/maps/MtPyre_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_3F: - .4byte MtPyre_3F_Layout - .4byte MtPyre_3F_MapEvents - .4byte MtPyre_3F_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_MT_PYRE_3F - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json new file mode 100644 index 0000000000..a1b39048e4 --- /dev/null +++ b/data/maps/MtPyre_3F/map.json @@ -0,0 +1,116 @@ +{ + "id": "MAP_MT_PYRE_3F", + "name": "MtPyre_3F", + "layout": "LAYOUT_MT_PYRE_3F", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MtPyre_3F_EventScript_231753", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MtPyre_3F_EventScript_23176A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_3F_EventScript_29130A", + "flag": "FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MtPyre_3F_EventScript_231781", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_2F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_4F", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_4F", + "dest_warp_id": 4 + }, + { + "x": 1, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_4F", + "dest_warp_id": 5 + }, + { + "x": 10, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_2F", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_2F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc deleted file mode 100644 index 030039d18b..0000000000 --- a/data/maps/MtPyre_4F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_4F_EventObjects: - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, MtPyre_4F_EventScript_231C6E, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE - -MtPyre_4F_MapWarps: - warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F - warp_def 2, 5, 3, 1, MAP_MT_PYRE_3F - warp_def 12, 10, 3, 3, MAP_MT_PYRE_5F - warp_def 12, 12, 3, 4, MAP_MT_PYRE_5F - warp_def 9, 10, 3, 2, MAP_MT_PYRE_3F - warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F - -MtPyre_4F_MapEvents:: - map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc deleted file mode 100644 index 86edc3843c..0000000000 --- a/data/maps/MtPyre_4F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_4F: - .4byte MtPyre_4F_Layout - .4byte MtPyre_4F_MapEvents - .4byte MtPyre_4F_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_MT_PYRE_4F - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json new file mode 100644 index 0000000000..a7bf954e71 --- /dev/null +++ b/data/maps/MtPyre_4F/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_MT_PYRE_4F", + "name": "MtPyre_4F", + "layout": "LAYOUT_MT_PYRE_4F", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 11, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtPyre_4F_EventScript_231C6E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_4F_EventScript_291317", + "flag": "FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE" + } + ], + "warp_events": [ + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_5F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_5F", + "dest_warp_id": 3 + }, + { + "x": 12, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_5F", + "dest_warp_id": 4 + }, + { + "x": 9, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 2 + }, + { + "x": 2, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc deleted file mode 100644 index fd6261356f..0000000000 --- a/data/maps/MtPyre_5F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -MtPyre_5F_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_5F_EventScript_231BC9, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_5F_EventScript_291324, FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE - -MtPyre_5F_MapWarps: - warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F - warp_def 10, 5, 3, 0, MAP_MT_PYRE_4F - warp_def 1, 10, 3, 1, MAP_MT_PYRE_6F - warp_def 12, 10, 3, 2, MAP_MT_PYRE_4F - warp_def 12, 12, 3, 3, MAP_MT_PYRE_4F - -MtPyre_5F_MapEvents:: - map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc deleted file mode 100644 index 8296f03dcc..0000000000 --- a/data/maps/MtPyre_5F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_5F: - .4byte MtPyre_5F_Layout - .4byte MtPyre_5F_MapEvents - .4byte MtPyre_5F_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_MT_PYRE_5F - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json new file mode 100644 index 0000000000..b27d426ac5 --- /dev/null +++ b/data/maps/MtPyre_5F/map.json @@ -0,0 +1,83 @@ +{ + "id": "MAP_MT_PYRE_5F", + "name": "MtPyre_5F", + "layout": "LAYOUT_MT_PYRE_5F", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtPyre_5F_EventScript_231BC9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_5F_EventScript_291324", + "flag": "FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_6F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 5, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_4F", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_6F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_4F", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_4F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc deleted file mode 100644 index df862d84e6..0000000000 --- a/data/maps/MtPyre_6F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MtPyre_6F_EventObjects: - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, FLAG_ITEM_MT_PYRE_6F_TM_30 - object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D9D, 0 - -MtPyre_6F_MapWarps: - warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F - warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F - -MtPyre_6F_MapEvents:: - map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc deleted file mode 100644 index ca0e545aa9..0000000000 --- a/data/maps/MtPyre_6F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_6F: - .4byte MtPyre_6F_Layout - .4byte MtPyre_6F_MapEvents - .4byte MtPyre_6F_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_MT_PYRE_6F - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json new file mode 100644 index 0000000000..a169953f23 --- /dev/null +++ b/data/maps/MtPyre_6F/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_MT_PYRE_6F", + "name": "MtPyre_6F", + "layout": "LAYOUT_MT_PYRE_6F", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_6F_EventScript_231D3B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_6F_EventScript_291331", + "flag": "FLAG_ITEM_MT_PYRE_6F_TM_30" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_6F_EventScript_231D9D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_5F", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_5F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc deleted file mode 100644 index 1b8248e02c..0000000000 --- a/data/maps/MtPyre_Exterior/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -MtPyre_Exterior_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48 - -MtPyre_Exterior_MapWarps: - warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F - warp_def 19, 10, 3, 1, MAP_MT_PYRE_SUMMIT - warp_def 20, 10, 3, 1, MAP_MT_PYRE_SUMMIT - -MtPyre_Exterior_MapCoordEvents: - coord_event 24, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED - coord_event 25, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED - coord_event 22, 27, 3, 0, 0, MtPyre_Exterior_EventScript_231FF2 - coord_event 23, 28, 3, 0, 0, MtPyre_Exterior_EventScript_231FF2 - coord_event 26, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED - -MtPyre_Exterior_MapBGEvents: - bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL - bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER - -MtPyre_Exterior_MapEvents:: - map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents - diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc deleted file mode 100644 index 9b9dfe1fad..0000000000 --- a/data/maps/MtPyre_Exterior/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_Exterior: - .4byte MtPyre_Exterior_Layout - .4byte MtPyre_Exterior_MapEvents - .4byte MtPyre_Exterior_MapScripts - .4byte 0x0 - .2byte MUS_MACHUPI - .2byte LAYOUT_MT_PYRE_EXTERIOR - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json new file mode 100644 index 0000000000..2075fed62c --- /dev/null +++ b/data/maps/MtPyre_Exterior/map.json @@ -0,0 +1,132 @@ +{ + "id": "MAP_MT_PYRE_EXTERIOR", + "name": "MtPyre_Exterior", + "layout": "LAYOUT_MT_PYRE_EXTERIOR", + "music": "MUS_MACHUPI", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 27, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_Exterior_EventScript_29133E", + "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 19, + "y": 40, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_Exterior_EventScript_29134B", + "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48" + } + ], + "warp_events": [ + { + "x": 10, + "y": 42, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_1F", + "dest_warp_id": 1 + }, + { + "x": 19, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_SUMMIT", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_SUMMIT", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 24, + "y": 21, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "MtPyre_Exterior_EventScript_231FED" + }, + { + "type": "trigger", + "x": 25, + "y": 21, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "MtPyre_Exterior_EventScript_231FED" + }, + { + "type": "trigger", + "x": 22, + "y": 27, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "MtPyre_Exterior_EventScript_231FF2" + }, + { + "type": "trigger", + "x": 23, + "y": 28, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "MtPyre_Exterior_EventScript_231FF2" + }, + { + "type": "trigger", + "x": 26, + "y": 21, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "MtPyre_Exterior_EventScript_231FED" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 9, + "y": 8, + "elevation": 0, + "item": "ITEM_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL" + }, + { + "type": "hidden_item", + "x": 16, + "y": 22, + "elevation": 0, + "item": "ITEM_MAX_ETHER", + "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER" + } + ] +} \ No newline at end of file diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc deleted file mode 100644 index abe957f283..0000000000 --- a/data/maps/MtPyre_Summit/events.inc +++ /dev/null @@ -1,30 +0,0 @@ -MtPyre_Summit_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE - object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA - object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE - -MtPyre_Summit_MapWarps: - warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR - warp_def 23, 31, 3, 1, MAP_MT_PYRE_EXTERIOR - warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR - -MtPyre_Summit_MapCoordEvents: - coord_event 22, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232018 - coord_event 23, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232024 - coord_event 24, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232030 - coord_event 22, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321EC - coord_event 23, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321F8 - coord_event 24, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_232204 - -MtPyre_Summit_MapBGEvents: - bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC - bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY - -MtPyre_Summit_MapEvents:: - map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents - diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc deleted file mode 100644 index 483afb9891..0000000000 --- a/data/maps/MtPyre_Summit/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_Summit: - .4byte MtPyre_Summit_Layout - .4byte MtPyre_Summit_MapEvents - .4byte MtPyre_Summit_MapScripts - .4byte 0x0 - .2byte MUS_MACHUPI - .2byte LAYOUT_MT_PYRE_SUMMIT - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json new file mode 100644 index 0000000000..cc9efce093 --- /dev/null +++ b/data/maps/MtPyre_Summit/map.json @@ -0,0 +1,219 @@ +{ + "id": "MAP_MT_PYRE_SUMMIT", + "name": "MtPyre_Summit", + "layout": "LAYOUT_MT_PYRE_SUMMIT", + "music": "MUS_MACHUPI", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 22, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_Summit_EventScript_23213C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 23, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 23, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_Summit_EventScript_2321A2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 21, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_Summit_EventScript_2323FD", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 25, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_Summit_EventScript_232414", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 21, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_Summit_EventScript_23242B", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 25, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_Summit_EventScript_232442", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 23, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE" + } + ], + "warp_events": [ + { + "x": 22, + "y": 31, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_EXTERIOR", + "dest_warp_id": 1 + }, + { + "x": 23, + "y": 31, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_EXTERIOR", + "dest_warp_id": 1 + }, + { + "x": 24, + "y": 31, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_EXTERIOR", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 22, + "y": 7, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 0, + "script": "MtPyre_Summit_EventScript_232018" + }, + { + "type": "trigger", + "x": 23, + "y": 7, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 0, + "script": "MtPyre_Summit_EventScript_232024" + }, + { + "type": "trigger", + "x": 24, + "y": 7, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 0, + "script": "MtPyre_Summit_EventScript_232030" + }, + { + "type": "trigger", + "x": 22, + "y": 9, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 2, + "script": "MtPyre_Summit_EventScript_2321EC" + }, + { + "type": "trigger", + "x": 23, + "y": 9, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 2, + "script": "MtPyre_Summit_EventScript_2321F8" + }, + { + "type": "trigger", + "x": 24, + "y": 9, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 2, + "script": "MtPyre_Summit_EventScript_232204" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 9, + "y": 25, + "elevation": 0, + "item": "ITEM_ZINC", + "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC" + }, + { + "type": "hidden_item", + "x": 37, + "y": 7, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY" + } + ] +} \ No newline at end of file diff --git a/data/maps/NavelRock_B1F/events.inc b/data/maps/NavelRock_B1F/events.inc deleted file mode 100644 index 5142b09a20..0000000000 --- a/data/maps/NavelRock_B1F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_B1F_MapWarps: - warp_def 4, 3, 3, 0, MAP_NAVEL_ROCK_ENTRANCE - warp_def 18, 9, 3, 1, MAP_NAVEL_ROCK_FORK - -NavelRock_B1F_MapEvents:: - map_events 0x0, NavelRock_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc deleted file mode 100644 index 08842ade1d..0000000000 --- a/data/maps/NavelRock_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_B1F: - .4byte NavelRock_B1F_Layout - .4byte NavelRock_B1F_MapEvents - .4byte NavelRock_B1F_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_B1F - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json new file mode 100644 index 0000000000..6b5cd00893 --- /dev/null +++ b/data/maps/NavelRock_B1F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_B1F", + "name": "NavelRock_B1F", + "layout": "LAYOUT_NAVEL_ROCK_B1F", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_FORK", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Bottom/events.inc b/data/maps/NavelRock_Bottom/events.inc deleted file mode 100644 index 16fa053ce9..0000000000 --- a/data/maps/NavelRock_Bottom/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -NavelRock_Bottom_EventObjects: - object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 11, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, NavelRock_Bottom_EventScript_2692A2, FLAG_HIDE_LUGIA - -NavelRock_Bottom_MapWarps: - warp_def 14, 19, 0, 0, MAP_NAVEL_ROCK_DOWN11 - -NavelRock_Bottom_MapEvents:: - map_events NavelRock_Bottom_EventObjects, NavelRock_Bottom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc deleted file mode 100644 index b768e916aa..0000000000 --- a/data/maps/NavelRock_Bottom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Bottom: - .4byte NavelRock_Bottom_Layout - .4byte NavelRock_Bottom_MapEvents - .4byte NavelRock_Bottom_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_BOTTOM - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Bottom/map.json b/data/maps/NavelRock_Bottom/map.json new file mode 100644 index 0000000000..e4fb5a2fee --- /dev/null +++ b/data/maps/NavelRock_Bottom/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_NAVEL_ROCK_BOTTOM", + "name": "NavelRock_Bottom", + "layout": "LAYOUT_NAVEL_ROCK_BOTTOM", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LUGIA", + "x": 11, + "y": 13, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NavelRock_Bottom_EventScript_2692A2", + "flag": "FLAG_HIDE_LUGIA" + } + ], + "warp_events": [ + { + "x": 14, + "y": 19, + "elevation": 0, + "dest_map": "MAP_NAVEL_ROCK_DOWN11", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down01/events.inc b/data/maps/NavelRock_Down01/events.inc deleted file mode 100644 index 9874119a91..0000000000 --- a/data/maps/NavelRock_Down01/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down01_MapWarps: - warp_def 3, 3, 3, 2, MAP_NAVEL_ROCK_FORK - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN02 - -NavelRock_Down01_MapEvents:: - map_events 0x0, NavelRock_Down01_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc deleted file mode 100644 index 7cddeeae7b..0000000000 --- a/data/maps/NavelRock_Down01/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down01: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Down01_MapEvents - .4byte NavelRock_Down01_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down01/map.json b/data/maps/NavelRock_Down01/map.json new file mode 100644 index 0000000000..50f60b52e5 --- /dev/null +++ b/data/maps/NavelRock_Down01/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN01", + "name": "NavelRock_Down01", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_FORK", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN02", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down02/events.inc b/data/maps/NavelRock_Down02/events.inc deleted file mode 100644 index 449085ea5d..0000000000 --- a/data/maps/NavelRock_Down02/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down02_MapWarps: - warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN01 - warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN03 - -NavelRock_Down02_MapEvents:: - map_events 0x0, NavelRock_Down02_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc deleted file mode 100644 index 03d45822b1..0000000000 --- a/data/maps/NavelRock_Down02/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down02: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Down02_MapEvents - .4byte NavelRock_Down02_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down02/map.json b/data/maps/NavelRock_Down02/map.json new file mode 100644 index 0000000000..fb2d151457 --- /dev/null +++ b/data/maps/NavelRock_Down02/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN02", + "name": "NavelRock_Down02", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN01", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN03", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down03/events.inc b/data/maps/NavelRock_Down03/events.inc deleted file mode 100644 index 7b74ad4121..0000000000 --- a/data/maps/NavelRock_Down03/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down03_MapWarps: - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN02 - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN04 - -NavelRock_Down03_MapEvents:: - map_events 0x0, NavelRock_Down03_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc deleted file mode 100644 index 694f840e4d..0000000000 --- a/data/maps/NavelRock_Down03/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down03: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Down03_MapEvents - .4byte NavelRock_Down03_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down03/map.json b/data/maps/NavelRock_Down03/map.json new file mode 100644 index 0000000000..a82e036101 --- /dev/null +++ b/data/maps/NavelRock_Down03/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN03", + "name": "NavelRock_Down03", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN02", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN04", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down04/events.inc b/data/maps/NavelRock_Down04/events.inc deleted file mode 100644 index 5459b1d508..0000000000 --- a/data/maps/NavelRock_Down04/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down04_MapWarps: - warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN03 - warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN05 - -NavelRock_Down04_MapEvents:: - map_events 0x0, NavelRock_Down04_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc deleted file mode 100644 index 0275b6422d..0000000000 --- a/data/maps/NavelRock_Down04/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down04: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Down04_MapEvents - .4byte NavelRock_Down04_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down04/map.json b/data/maps/NavelRock_Down04/map.json new file mode 100644 index 0000000000..58e81b709e --- /dev/null +++ b/data/maps/NavelRock_Down04/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN04", + "name": "NavelRock_Down04", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN03", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN05", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down05/events.inc b/data/maps/NavelRock_Down05/events.inc deleted file mode 100644 index de52fa07f5..0000000000 --- a/data/maps/NavelRock_Down05/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down05_MapWarps: - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN04 - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN06 - -NavelRock_Down05_MapEvents:: - map_events 0x0, NavelRock_Down05_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc deleted file mode 100644 index 50e298b6e0..0000000000 --- a/data/maps/NavelRock_Down05/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down05: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Down05_MapEvents - .4byte NavelRock_Down05_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down05/map.json b/data/maps/NavelRock_Down05/map.json new file mode 100644 index 0000000000..a1fcef804b --- /dev/null +++ b/data/maps/NavelRock_Down05/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN05", + "name": "NavelRock_Down05", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN04", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN06", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down06/events.inc b/data/maps/NavelRock_Down06/events.inc deleted file mode 100644 index 54e5f229eb..0000000000 --- a/data/maps/NavelRock_Down06/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down06_MapWarps: - warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN05 - warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN07 - -NavelRock_Down06_MapEvents:: - map_events 0x0, NavelRock_Down06_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc deleted file mode 100644 index 8e18db5b92..0000000000 --- a/data/maps/NavelRock_Down06/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down06: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Down06_MapEvents - .4byte NavelRock_Down06_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down06/map.json b/data/maps/NavelRock_Down06/map.json new file mode 100644 index 0000000000..204a2a2cfe --- /dev/null +++ b/data/maps/NavelRock_Down06/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN06", + "name": "NavelRock_Down06", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN05", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN07", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down07/events.inc b/data/maps/NavelRock_Down07/events.inc deleted file mode 100644 index 55b4dd10c4..0000000000 --- a/data/maps/NavelRock_Down07/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down07_MapWarps: - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN06 - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN08 - -NavelRock_Down07_MapEvents:: - map_events 0x0, NavelRock_Down07_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc deleted file mode 100644 index 75c41046e7..0000000000 --- a/data/maps/NavelRock_Down07/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down07: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Down07_MapEvents - .4byte NavelRock_Down07_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down07/map.json b/data/maps/NavelRock_Down07/map.json new file mode 100644 index 0000000000..f48063d8a0 --- /dev/null +++ b/data/maps/NavelRock_Down07/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN07", + "name": "NavelRock_Down07", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN06", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN08", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down08/events.inc b/data/maps/NavelRock_Down08/events.inc deleted file mode 100644 index b1180ed83a..0000000000 --- a/data/maps/NavelRock_Down08/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down08_MapWarps: - warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN07 - warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN09 - -NavelRock_Down08_MapEvents:: - map_events 0x0, NavelRock_Down08_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc deleted file mode 100644 index bcb69b4128..0000000000 --- a/data/maps/NavelRock_Down08/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down08: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Down08_MapEvents - .4byte NavelRock_Down08_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down08/map.json b/data/maps/NavelRock_Down08/map.json new file mode 100644 index 0000000000..d5f7ea8fea --- /dev/null +++ b/data/maps/NavelRock_Down08/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN08", + "name": "NavelRock_Down08", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN07", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN09", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down09/events.inc b/data/maps/NavelRock_Down09/events.inc deleted file mode 100644 index e7279c4d08..0000000000 --- a/data/maps/NavelRock_Down09/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down09_MapWarps: - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN08 - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN10 - -NavelRock_Down09_MapEvents:: - map_events 0x0, NavelRock_Down09_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc deleted file mode 100644 index cb80dd7fae..0000000000 --- a/data/maps/NavelRock_Down09/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down09: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Down09_MapEvents - .4byte NavelRock_Down09_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down09/map.json b/data/maps/NavelRock_Down09/map.json new file mode 100644 index 0000000000..348739b31b --- /dev/null +++ b/data/maps/NavelRock_Down09/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN09", + "name": "NavelRock_Down09", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN08", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN10", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down10/events.inc b/data/maps/NavelRock_Down10/events.inc deleted file mode 100644 index b9eadabf1e..0000000000 --- a/data/maps/NavelRock_Down10/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down10_MapWarps: - warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN09 - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN11 - -NavelRock_Down10_MapEvents:: - map_events 0x0, NavelRock_Down10_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc deleted file mode 100644 index 308a89e05c..0000000000 --- a/data/maps/NavelRock_Down10/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down10: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Down10_MapEvents - .4byte NavelRock_Down10_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down10/map.json b/data/maps/NavelRock_Down10/map.json new file mode 100644 index 0000000000..3aa128fa0b --- /dev/null +++ b/data/maps/NavelRock_Down10/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN10", + "name": "NavelRock_Down10", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN09", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN11", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down11/events.inc b/data/maps/NavelRock_Down11/events.inc deleted file mode 100644 index 9822ee8ff1..0000000000 --- a/data/maps/NavelRock_Down11/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down11_MapWarps: - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_BOTTOM - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN10 - -NavelRock_Down11_MapEvents:: - map_events 0x0, NavelRock_Down11_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc deleted file mode 100644 index 2c5a0862b9..0000000000 --- a/data/maps/NavelRock_Down11/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down11: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Down11_MapEvents - .4byte NavelRock_Down11_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down11/map.json b/data/maps/NavelRock_Down11/map.json new file mode 100644 index 0000000000..0ed44f0fcd --- /dev/null +++ b/data/maps/NavelRock_Down11/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN11", + "name": "NavelRock_Down11", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BOTTOM", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN10", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Entrance/events.inc b/data/maps/NavelRock_Entrance/events.inc deleted file mode 100644 index b063f08d8a..0000000000 --- a/data/maps/NavelRock_Entrance/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Entrance_MapWarps: - warp_def 10, 5, 3, 0, MAP_NAVEL_ROCK_B1F - warp_def 10, 26, 3, 1, MAP_NAVEL_ROCK_EXTERIOR - -NavelRock_Entrance_MapEvents:: - map_events 0x0, NavelRock_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc deleted file mode 100644 index 793ab85cdf..0000000000 --- a/data/maps/NavelRock_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Entrance: - .4byte NavelRock_Entrance_Layout - .4byte NavelRock_Entrance_MapEvents - .4byte NavelRock_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_ENTRANCE - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Entrance/map.json b/data/maps/NavelRock_Entrance/map.json new file mode 100644 index 0000000000..983df45df5 --- /dev/null +++ b/data/maps/NavelRock_Entrance/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_ENTRANCE", + "name": "NavelRock_Entrance", + "layout": "LAYOUT_NAVEL_ROCK_ENTRANCE", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_B1F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 26, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_EXTERIOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Exterior/events.inc b/data/maps/NavelRock_Exterior/events.inc deleted file mode 100644 index 1ec151c8c2..0000000000 --- a/data/maps/NavelRock_Exterior/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Exterior_MapWarps: - warp_def 10, 18, 0, 0, MAP_NAVEL_ROCK_HARBOR - warp_def 10, 10, 0, 1, MAP_NAVEL_ROCK_ENTRANCE - -NavelRock_Exterior_MapEvents:: - map_events 0x0, NavelRock_Exterior_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc deleted file mode 100644 index f355dbf559..0000000000 --- a/data/maps/NavelRock_Exterior/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Exterior: - .4byte NavelRock_Exterior_Layout - .4byte NavelRock_Exterior_MapEvents - .4byte NavelRock_Exterior_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANASHIMA - .2byte LAYOUT_NAVEL_ROCK_EXTERIOR - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json new file mode 100644 index 0000000000..b98f08d4e4 --- /dev/null +++ b/data/maps/NavelRock_Exterior/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_EXTERIOR", + "name": "NavelRock_Exterior", + "layout": "LAYOUT_NAVEL_ROCK_EXTERIOR", + "music": "MUS_RG_NANASHIMA", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 18, + "elevation": 0, + "dest_map": "MAP_NAVEL_ROCK_HARBOR", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 10, + "elevation": 0, + "dest_map": "MAP_NAVEL_ROCK_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Fork/events.inc b/data/maps/NavelRock_Fork/events.inc deleted file mode 100644 index fde5e5930e..0000000000 --- a/data/maps/NavelRock_Fork/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_Fork_MapWarps: - warp_def 4, 6, 3, 0, MAP_NAVEL_ROCK_UP1 - warp_def 11, 79, 3, 1, MAP_NAVEL_ROCK_B1F - warp_def 22, 6, 3, 0, MAP_NAVEL_ROCK_DOWN01 - -NavelRock_Fork_MapEvents:: - map_events 0x0, NavelRock_Fork_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc deleted file mode 100644 index 01e4f7bccd..0000000000 --- a/data/maps/NavelRock_Fork/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Fork: - .4byte NavelRock_Fork_Layout - .4byte NavelRock_Fork_MapEvents - .4byte NavelRock_Fork_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_FORK - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json new file mode 100644 index 0000000000..728b8a7aa4 --- /dev/null +++ b/data/maps/NavelRock_Fork/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_NAVEL_ROCK_FORK", + "name": "NavelRock_Fork", + "layout": "LAYOUT_NAVEL_ROCK_FORK", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP1", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 79, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_B1F", + "dest_warp_id": 1 + }, + { + "x": 22, + "y": 6, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Harbor/events.inc b/data/maps/NavelRock_Harbor/events.inc deleted file mode 100644 index 0c687f1fc0..0000000000 --- a/data/maps/NavelRock_Harbor/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -NavelRock_Harbor_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - -NavelRock_Harbor_MapWarps: - warp_def 8, 2, 0, 0, MAP_NAVEL_ROCK_EXTERIOR - -NavelRock_Harbor_MapEvents:: - map_events NavelRock_Harbor_EventObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc deleted file mode 100644 index 2af7e6e35e..0000000000 --- a/data/maps/NavelRock_Harbor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Harbor: - .4byte IslandHarbor_Layout - .4byte NavelRock_Harbor_MapEvents - .4byte NavelRock_Harbor_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANASHIMA - .2byte LAYOUT_ISLAND_HARBOR - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json new file mode 100644 index 0000000000..39c8d9f0f6 --- /dev/null +++ b/data/maps/NavelRock_Harbor/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_NAVEL_ROCK_HARBOR", + "name": "NavelRock_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "MUS_RG_NANASHIMA", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 8, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NavelRock_Harbor_EventScript_2690BD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 8, + "y": 7, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 0, + "dest_map": "MAP_NAVEL_ROCK_EXTERIOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Top/events.inc b/data/maps/NavelRock_Top/events.inc deleted file mode 100644 index 7ba534d027..0000000000 --- a/data/maps/NavelRock_Top/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Top_EventObjects: - object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_HO_OH - -NavelRock_Top_MapWarps: - warp_def 13, 20, 3, 1, MAP_NAVEL_ROCK_UP4 - -NavelRock_Top_MapCoordEvents: - coord_event 12, 10, 3, VAR_TEMP_1, 0, NavelRock_Top_EventScript_26916F - -NavelRock_Top_MapBGEvents: - bg_hidden_item_event 12, 9, 3, ITEM_SACRED_ASH, FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH - -NavelRock_Top_MapEvents:: - map_events NavelRock_Top_EventObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents - diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc deleted file mode 100644 index 6e8acfce85..0000000000 --- a/data/maps/NavelRock_Top/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Top: - .4byte NavelRock_Top_Layout - .4byte NavelRock_Top_MapEvents - .4byte NavelRock_Top_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_TOP - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Top/map.json b/data/maps/NavelRock_Top/map.json new file mode 100644 index 0000000000..cc2070e7e3 --- /dev/null +++ b/data/maps/NavelRock_Top/map.json @@ -0,0 +1,61 @@ +{ + "id": "MAP_NAVEL_ROCK_TOP", + "name": "NavelRock_Top", + "layout": "LAYOUT_NAVEL_ROCK_TOP", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HOOH", + "x": 12, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_HO_OH" + } + ], + "warp_events": [ + { + "x": 13, + "y": 20, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP4", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 12, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "NavelRock_Top_EventScript_26916F" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 12, + "y": 9, + "elevation": 3, + "item": "ITEM_SACRED_ASH", + "flag": "FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH" + } + ] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Up1/events.inc b/data/maps/NavelRock_Up1/events.inc deleted file mode 100644 index c0dba5dd3a..0000000000 --- a/data/maps/NavelRock_Up1/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Up1_MapWarps: - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_FORK - warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP2 - -NavelRock_Up1_MapEvents:: - map_events 0x0, NavelRock_Up1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc deleted file mode 100644 index 2ddaf1dcc6..0000000000 --- a/data/maps/NavelRock_Up1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Up1: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Up1_MapEvents - .4byte NavelRock_Up1_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Up1/map.json b/data/maps/NavelRock_Up1/map.json new file mode 100644 index 0000000000..24d1b5a323 --- /dev/null +++ b/data/maps/NavelRock_Up1/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_UP1", + "name": "NavelRock_Up1", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_FORK", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Up2/events.inc b/data/maps/NavelRock_Up2/events.inc deleted file mode 100644 index 8d6f64dbc2..0000000000 --- a/data/maps/NavelRock_Up2/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Up2_MapWarps: - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP1 - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_UP3 - -NavelRock_Up2_MapEvents:: - map_events 0x0, NavelRock_Up2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc deleted file mode 100644 index 68fe366f2c..0000000000 --- a/data/maps/NavelRock_Up2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Up2: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Up2_MapEvents - .4byte NavelRock_Up2_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Up2/map.json b/data/maps/NavelRock_Up2/map.json new file mode 100644 index 0000000000..2d16e798c6 --- /dev/null +++ b/data/maps/NavelRock_Up2/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_UP2", + "name": "NavelRock_Up2", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP1", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP3", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Up3/events.inc b/data/maps/NavelRock_Up3/events.inc deleted file mode 100644 index 3853f75c7e..0000000000 --- a/data/maps/NavelRock_Up3/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Up3_MapWarps: - warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_UP2 - warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP4 - -NavelRock_Up3_MapEvents:: - map_events 0x0, NavelRock_Up3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc deleted file mode 100644 index b357349b7c..0000000000 --- a/data/maps/NavelRock_Up3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Up3: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Up3_MapEvents - .4byte NavelRock_Up3_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Up3/map.json b/data/maps/NavelRock_Up3/map.json new file mode 100644 index 0000000000..2e984b3792 --- /dev/null +++ b/data/maps/NavelRock_Up3/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_UP3", + "name": "NavelRock_Up3", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP2", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP4", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Up4/events.inc b/data/maps/NavelRock_Up4/events.inc deleted file mode 100644 index 449e1f29da..0000000000 --- a/data/maps/NavelRock_Up4/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Up4_MapWarps: - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP3 - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_TOP - -NavelRock_Up4_MapEvents:: - map_events 0x0, NavelRock_Up4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc deleted file mode 100644 index 4c44746f06..0000000000 --- a/data/maps/NavelRock_Up4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Up4: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Up4_MapEvents - .4byte NavelRock_Up4_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Up4/map.json b/data/maps/NavelRock_Up4/map.json new file mode 100644 index 0000000000..e448e6a9a0 --- /dev/null +++ b/data/maps/NavelRock_Up4/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_UP4", + "name": "NavelRock_Up4", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP3", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_TOP", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NewMauville_Entrance/events.inc b/data/maps/NewMauville_Entrance/events.inc deleted file mode 100644 index d230fc4e99..0000000000 --- a/data/maps/NewMauville_Entrance/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -NewMauville_Entrance_MapWarps: - warp_def 4, 6, 3, 0, MAP_ROUTE110 - warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE - -NewMauville_Entrance_MapCoordEvents: - coord_event 4, 2, 3, VAR_0x40BA, 0, NewMauville_Entrance_EventScript_2372FF - -NewMauville_Entrance_MapEvents:: - map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0 - diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc deleted file mode 100644 index c0b8938ca4..0000000000 --- a/data/maps/NewMauville_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NewMauville_Entrance: - .4byte NewMauville_Entrance_Layout - .4byte NewMauville_Entrance_MapEvents - .4byte NewMauville_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_NEW_MAUVILLE_ENTRANCE - .byte MAPSEC_NEW_MAUVILLE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json new file mode 100644 index 0000000000..bfc15c8a06 --- /dev/null +++ b/data/maps/NewMauville_Entrance/map.json @@ -0,0 +1,45 @@ +{ + "id": "MAP_NEW_MAUVILLE_ENTRANCE", + "name": "NewMauville_Entrance", + "layout": "LAYOUT_NEW_MAUVILLE_ENTRANCE", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_NEW_MAUVILLE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_NEW_MAUVILLE_INSIDE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 2, + "elevation": 3, + "var": "VAR_0x40BA", + "var_value": 0, + "script": "NewMauville_Entrance_EventScript_2372FF" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc deleted file mode 100644 index c366496f4d..0000000000 --- a/data/maps/NewMauville_Inside/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -NewMauville_Inside_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291206, FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291213, FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291220, FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377AF, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377FC, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_237849, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3 - -NewMauville_Inside_MapWarps: - warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE - -NewMauville_Inside_MapCoordEvents: - coord_event 30, 38, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 - coord_event 18, 36, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 - coord_event 4, 26, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 - coord_event 16, 22, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 - coord_event 25, 18, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 - coord_event 2, 11, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 - coord_event 6, 11, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 - coord_event 13, 10, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 - coord_event 17, 10, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 - coord_event 33, 6, 3, VAR_0x40BA, 1, NewMauville_Inside_EventScript_237725 - -NewMauville_Inside_MapBGEvents: - bg_event 32, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 32, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 32, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 33, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 34, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 35, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 35, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 35, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - -NewMauville_Inside_MapEvents:: - map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents - diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc deleted file mode 100644 index c4e7368859..0000000000 --- a/data/maps/NewMauville_Inside/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NewMauville_Inside: - .4byte NewMauville_Inside_Layout - .4byte NewMauville_Inside_MapEvents - .4byte NewMauville_Inside_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_NEW_MAUVILLE_INSIDE - .byte MAPSEC_NEW_MAUVILLE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json new file mode 100644 index 0000000000..223faec2d9 --- /dev/null +++ b/data/maps/NewMauville_Inside/map.json @@ -0,0 +1,289 @@ +{ + "id": "MAP_NEW_MAUVILLE_INSIDE", + "name": "NewMauville_Inside", + "layout": "LAYOUT_NEW_MAUVILLE_INSIDE", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_NEW_MAUVILLE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 32, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_2911EC", + "flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 16, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_2911F9", + "flag": "FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 39, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_291206", + "flag": "FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 17, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_291213", + "flag": "FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_291220", + "flag": "FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 25, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_2377AF", + "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_2377FC", + "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_237849", + "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3" + } + ], + "warp_events": [ + { + "x": 32, + "y": 33, + "elevation": 3, + "dest_map": "MAP_NEW_MAUVILLE_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 30, + "y": 38, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237459" + }, + { + "type": "trigger", + "x": 18, + "y": 36, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237471" + }, + { + "type": "trigger", + "x": 4, + "y": 26, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237459" + }, + { + "type": "trigger", + "x": 16, + "y": 22, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237459" + }, + { + "type": "trigger", + "x": 25, + "y": 18, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237471" + }, + { + "type": "trigger", + "x": 2, + "y": 11, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237471" + }, + { + "type": "trigger", + "x": 6, + "y": 11, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237459" + }, + { + "type": "trigger", + "x": 13, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237459" + }, + { + "type": "trigger", + "x": 17, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237471" + }, + { + "type": "trigger", + "x": 33, + "y": 6, + "elevation": 3, + "var": "VAR_0x40BA", + "var_value": 1, + "script": "NewMauville_Inside_EventScript_237725" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 32, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 32, + "y": 3, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 32, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 33, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 34, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 35, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 35, + "y": 3, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 35, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + } + ] +} \ No newline at end of file diff --git a/data/maps/OldaleTown/connections.inc b/data/maps/OldaleTown/connections.inc deleted file mode 100644 index a82523c9c0..0000000000 --- a/data/maps/OldaleTown/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -OldaleTown_MapConnectionsList: - connection up, 0, MAP_ROUTE103 - connection down, 0, MAP_ROUTE101 - connection left, 0, MAP_ROUTE102 - -OldaleTown_MapConnections: - .4byte 3 - .4byte OldaleTown_MapConnectionsList - diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc deleted file mode 100644 index aa56e67f64..0000000000 --- a/data/maps/OldaleTown/events.inc +++ /dev/null @@ -1,28 +0,0 @@ -OldaleTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0 - object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 11, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, FLAG_HIDE_OLDALE_TOWN_RIVAL - -OldaleTown_MapWarps: - warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 - warp_def 15, 16, 0, 0, MAP_OLDALE_TOWN_HOUSE2 - warp_def 6, 16, 0, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_1F - warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART - -OldaleTown_MapCoordEvents: - coord_event 0, 10, 3, VAR_0x4051, 0, OldaleTown_EventScript_1E903F - coord_event 8, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E9086 - coord_event 9, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E90A6 - coord_event 10, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E90C6 - -OldaleTown_MapBGEvents: - bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, OldaleTown_EventScript_1E8EEA - bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E73 - bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E6A - bg_event 8, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E73 - bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E6A - -OldaleTown_MapEvents:: - map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents - diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc deleted file mode 100644 index 30025e1f1d..0000000000 --- a/data/maps/OldaleTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown: - .4byte OldaleTown_Layout - .4byte OldaleTown_MapEvents - .4byte OldaleTown_MapScripts - .4byte OldaleTown_MapConnections - .2byte MUS_MACHI_S4 - .2byte LAYOUT_OLDALE_TOWN - .byte MAPSEC_OLDALE_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json new file mode 100644 index 0000000000..378d108e27 --- /dev/null +++ b/data/maps/OldaleTown/map.json @@ -0,0 +1,196 @@ +{ + "id": "MAP_OLDALE_TOWN", + "name": "OldaleTown", + "layout": "LAYOUT_OLDALE_TOWN", + "music": "MUS_MACHI_S4", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE103" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE101" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE102" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 16, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_EventScript_1E8EF3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_EventScript_1E8EFC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 8, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_EventScript_1E901F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 11, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_EventScript_1E9070", + "flag": "FLAG_HIDE_OLDALE_TOWN_RIVAL" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 16, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 16, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 6, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN_MART", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 0, + "y": 10, + "elevation": 3, + "var": "VAR_0x4051", + "var_value": 0, + "script": "OldaleTown_EventScript_1E903F" + }, + { + "type": "trigger", + "x": 8, + "y": 19, + "elevation": 3, + "var": "VAR_0x40C7", + "var_value": 1, + "script": "OldaleTown_EventScript_1E9086" + }, + { + "type": "trigger", + "x": 9, + "y": 19, + "elevation": 3, + "var": "VAR_0x40C7", + "var_value": 1, + "script": "OldaleTown_EventScript_1E90A6" + }, + { + "type": "trigger", + "x": 10, + "y": 19, + "elevation": 3, + "var": "VAR_0x40C7", + "var_value": 1, + "script": "OldaleTown_EventScript_1E90C6" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 11, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "OldaleTown_EventScript_1E8EEA" + }, + { + "type": "sign", + "x": 7, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "OldaleTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 15, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "OldaleTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 8, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "OldaleTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 16, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "OldaleTown_EventScript_271E6A" + } + ] +} \ No newline at end of file diff --git a/data/maps/OldaleTown_House1/events.inc b/data/maps/OldaleTown_House1/events.inc deleted file mode 100644 index 8fc37079c7..0000000000 --- a/data/maps/OldaleTown_House1/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -OldaleTown_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0 - -OldaleTown_House1_MapWarps: - warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN - warp_def 4, 8, 0, 0, MAP_OLDALE_TOWN - -OldaleTown_House1_MapEvents:: - map_events OldaleTown_House1_EventObjects, OldaleTown_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc deleted file mode 100644 index 7dc2d6b70a..0000000000 --- a/data/maps/OldaleTown_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown_House1: - .4byte House1_Layout - .4byte OldaleTown_House1_MapEvents - .4byte OldaleTown_House1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S4 - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_OLDALE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json new file mode 100644 index 0000000000..fe0ac7b6aa --- /dev/null +++ b/data/maps/OldaleTown_House1/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_OLDALE_TOWN_HOUSE1", + "name": "OldaleTown_House1", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_MACHI_S4", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_House1_EventScript_1FBE86", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/OldaleTown_House2/events.inc b/data/maps/OldaleTown_House2/events.inc deleted file mode 100644 index 45678ebb88..0000000000 --- a/data/maps/OldaleTown_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -OldaleTown_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0 - -OldaleTown_House2_MapWarps: - warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN - warp_def 4, 7, 0, 1, MAP_OLDALE_TOWN - -OldaleTown_House2_MapEvents:: - map_events OldaleTown_House2_EventObjects, OldaleTown_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc deleted file mode 100644 index 4ae5e078ce..0000000000 --- a/data/maps/OldaleTown_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown_House2: - .4byte House2_Layout - .4byte OldaleTown_House2_MapEvents - .4byte OldaleTown_House2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S4 - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_OLDALE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json new file mode 100644 index 0000000000..2de7632fd3 --- /dev/null +++ b/data/maps/OldaleTown_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_OLDALE_TOWN_HOUSE2", + "name": "OldaleTown_House2", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_MACHI_S4", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_House2_EventScript_1FBF5B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_House2_EventScript_1FBF64", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/OldaleTown_Mart/events.inc b/data/maps/OldaleTown_Mart/events.inc deleted file mode 100644 index 2d29aedba7..0000000000 --- a/data/maps/OldaleTown_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -OldaleTown_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0 - -OldaleTown_Mart_MapWarps: - warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN - warp_def 4, 7, 0, 3, MAP_OLDALE_TOWN - -OldaleTown_Mart_MapEvents:: - map_events OldaleTown_Mart_EventObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc deleted file mode 100644 index a371273bd8..0000000000 --- a/data/maps/OldaleTown_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown_Mart: - .4byte Mart_Layout - .4byte OldaleTown_Mart_MapEvents - .4byte OldaleTown_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_OLDALE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json new file mode 100644 index 0000000000..1226dd17fa --- /dev/null +++ b/data/maps/OldaleTown_Mart/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_OLDALE_TOWN_MART", + "name": "OldaleTown_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_Mart_EventScript_1FC240", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_Mart_EventScript_1FC28A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_Mart_EventScript_1FC2A9", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/OldaleTown_PokemonCenter_1F/events.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc deleted file mode 100644 index f05c854b4c..0000000000 --- a/data/maps/OldaleTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -OldaleTown_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0 - -OldaleTown_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN - warp_def 6, 8, 3, 2, MAP_OLDALE_TOWN - warp_def 1, 6, 4, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_2F - -OldaleTown_PokemonCenter_1F_MapEvents:: - map_events OldaleTown_PokemonCenter_1F_EventObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc deleted file mode 100644 index 394ca49695..0000000000 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte OldaleTown_PokemonCenter_1F_MapEvents - .4byte OldaleTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_OLDALE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..94cbe1627d --- /dev/null +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_1F", + "name": "OldaleTown_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC01A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC028", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC031", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC03A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_OLDALE_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/OldaleTown_PokemonCenter_2F/events.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc deleted file mode 100644 index 2f155ed57c..0000000000 --- a/data/maps/OldaleTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -OldaleTown_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -OldaleTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -OldaleTown_PokemonCenter_2F_MapEvents:: - map_events OldaleTown_PokemonCenter_2F_EventObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc deleted file mode 100644 index 33437b8637..0000000000 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte OldaleTown_PokemonCenter_2F_MapEvents - .4byte OldaleTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_OLDALE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..7a899e4a91 --- /dev/null +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_2F", + "name": "OldaleTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_OLDALE_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown/connections.inc b/data/maps/PacifidlogTown/connections.inc deleted file mode 100644 index bea3619dd0..0000000000 --- a/data/maps/PacifidlogTown/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -PacifidlogTown_MapConnectionsList: - connection left, 0, MAP_ROUTE132 - connection right, 0, MAP_ROUTE131 - -PacifidlogTown_MapConnections: - .4byte 2 - .4byte PacifidlogTown_MapConnectionsList - diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc deleted file mode 100644 index 2754afc4d5..0000000000 --- a/data/maps/PacifidlogTown/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -PacifidlogTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0 - object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0 - object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0 - -PacifidlogTown_MapWarps: - warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F - warp_def 16, 13, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE1 - warp_def 3, 22, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE2 - warp_def 12, 24, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE3 - warp_def 2, 12, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE4 - warp_def 17, 21, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE5 - -PacifidlogTown_MapBGEvents: - bg_event 9, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_271E73 - bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PacifidlogTown_EventScript_1EBADE - bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_271E73 - -PacifidlogTown_MapEvents:: - map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents - diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc deleted file mode 100644 index 0232c06134..0000000000 --- a/data/maps/PacifidlogTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown: - .4byte PacifidlogTown_Layout - .4byte PacifidlogTown_MapEvents - .4byte PacifidlogTown_MapScripts - .4byte PacifidlogTown_MapConnections - .2byte MUS_MINAMO - .2byte LAYOUT_PACIFIDLOG_TOWN - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json new file mode 100644 index 0000000000..1219eabadf --- /dev/null +++ b/data/maps/PacifidlogTown/map.json @@ -0,0 +1,139 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN", + "name": "PacifidlogTown", + "layout": "LAYOUT_PACIFIDLOG_TOWN", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE132" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE131" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 10, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_EventScript_1EBACC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 11, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_EventScript_1EBAD5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 9, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_EventScript_1EBAC3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 15, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 13, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 22, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 24, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE3", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 12, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE4", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 21, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE5", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 9, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PacifidlogTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 7, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PacifidlogTown_EventScript_1EBADE" + }, + { + "type": "sign", + "x": 10, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PacifidlogTown_EventScript_271E73" + } + ] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House1/events.inc b/data/maps/PacifidlogTown_House1/events.inc deleted file mode 100644 index 3b5b06af7b..0000000000 --- a/data/maps/PacifidlogTown_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PacifidlogTown_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0 - -PacifidlogTown_House1_MapWarps: - warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 1, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House1_MapEvents:: - map_events PacifidlogTown_House1_EventObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc deleted file mode 100644 index 53a3499ce9..0000000000 --- a/data/maps/PacifidlogTown_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House1: - .4byte PacifidlogTown_House1_Layout - .4byte PacifidlogTown_House1_MapEvents - .4byte PacifidlogTown_House1_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE1 - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json new file mode 100644 index 0000000000..19f592374e --- /dev/null +++ b/data/maps/PacifidlogTown_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_HOUSE1", + "name": "PacifidlogTown_House1", + "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House1_EventScript_20365D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House1_EventScript_203666", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House2/events.inc b/data/maps/PacifidlogTown_House2/events.inc deleted file mode 100644 index 5a521ab4b9..0000000000 --- a/data/maps/PacifidlogTown_House2/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -PacifidlogTown_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203792, 0 - object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203891, 0 - object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0 - -PacifidlogTown_House2_MapWarps: - warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 2, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House2_MapEvents:: - map_events PacifidlogTown_House2_EventObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc deleted file mode 100644 index f41349ba5b..0000000000 --- a/data/maps/PacifidlogTown_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House2: - .4byte PacifidlogTown_House2_Layout - .4byte PacifidlogTown_House2_MapEvents - .4byte PacifidlogTown_House2_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE2 - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json new file mode 100644 index 0000000000..370b37d736 --- /dev/null +++ b/data/maps/PacifidlogTown_House2/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_HOUSE2", + "name": "PacifidlogTown_House2", + "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House2_EventScript_203792", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House2_EventScript_203891", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House2_EventScript_2038AC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House3/events.inc b/data/maps/PacifidlogTown_House3/events.inc deleted file mode 100644 index 7f18a831e5..0000000000 --- a/data/maps/PacifidlogTown_House3/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PacifidlogTown_House3_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0 - -PacifidlogTown_House3_MapWarps: - warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 3, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House3_MapEvents:: - map_events PacifidlogTown_House3_EventObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc deleted file mode 100644 index 9f6286b13a..0000000000 --- a/data/maps/PacifidlogTown_House3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House3: - .4byte PacifidlogTown_House1_Layout - .4byte PacifidlogTown_House3_MapEvents - .4byte PacifidlogTown_House3_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE1 - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json new file mode 100644 index 0000000000..5788245257 --- /dev/null +++ b/data/maps/PacifidlogTown_House3/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_HOUSE3", + "name": "PacifidlogTown_House3", + "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House3_EventScript_203CB5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House3_EventScript_203C11", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House4/events.inc b/data/maps/PacifidlogTown_House4/events.inc deleted file mode 100644 index ed736434f4..0000000000 --- a/data/maps/PacifidlogTown_House4/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -PacifidlogTown_House4_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0 - -PacifidlogTown_House4_MapWarps: - warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 4, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House4_MapEvents:: - map_events PacifidlogTown_House4_EventObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc deleted file mode 100644 index ff9240d0d6..0000000000 --- a/data/maps/PacifidlogTown_House4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House4: - .4byte PacifidlogTown_House2_Layout - .4byte PacifidlogTown_House4_MapEvents - .4byte PacifidlogTown_House4_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE2 - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json new file mode 100644 index 0000000000..2db52fe9b2 --- /dev/null +++ b/data/maps/PacifidlogTown_House4/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_HOUSE4", + "name": "PacifidlogTown_House4", + "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House4_EventScript_203F55", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House4_EventScript_203F4C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House4_EventScript_203F5E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House5/events.inc b/data/maps/PacifidlogTown_House5/events.inc deleted file mode 100644 index d3e00938a8..0000000000 --- a/data/maps/PacifidlogTown_House5/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PacifidlogTown_House5_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0 - -PacifidlogTown_House5_MapWarps: - warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 5, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House5_MapEvents:: - map_events PacifidlogTown_House5_EventObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc deleted file mode 100644 index a70ac39920..0000000000 --- a/data/maps/PacifidlogTown_House5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House5: - .4byte PacifidlogTown_House1_Layout - .4byte PacifidlogTown_House5_MapEvents - .4byte PacifidlogTown_House5_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE1 - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json new file mode 100644 index 0000000000..b8c4a03523 --- /dev/null +++ b/data/maps/PacifidlogTown_House5/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_HOUSE5", + "name": "PacifidlogTown_House5", + "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House5_EventScript_204111", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House5_EventScript_204137", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc deleted file mode 100644 index edc6e916f7..0000000000 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0 - object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 12, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0 - -PacifidlogTown_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN - warp_def 6, 8, 3, 0, MAP_PACIFIDLOG_TOWN - warp_def 1, 6, 4, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F - -PacifidlogTown_PokemonCenter_1F_MapEvents:: - map_events PacifidlogTown_PokemonCenter_1F_EventObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc deleted file mode 100644 index 39135ef6ac..0000000000 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte PacifidlogTown_PokemonCenter_1F_MapEvents - .4byte PacifidlogTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..1f141dec57 --- /dev/null +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F", + "name": "PacifidlogTown_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034B6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034D6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034C4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034CD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 12, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc deleted file mode 100644 index 1d0e1a449c..0000000000 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -PacifidlogTown_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -PacifidlogTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -PacifidlogTown_PokemonCenter_2F_MapEvents:: - map_events PacifidlogTown_PokemonCenter_2F_EventObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc deleted file mode 100644 index a6c1609d32..0000000000 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte PacifidlogTown_PokemonCenter_2F_MapEvents - .4byte PacifidlogTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..2b6a43ce0f --- /dev/null +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F", + "name": "PacifidlogTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity/connections.inc b/data/maps/PetalburgCity/connections.inc deleted file mode 100644 index 0c576c79f4..0000000000 --- a/data/maps/PetalburgCity/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -PetalburgCity_MapConnectionsList: - connection left, -50, MAP_ROUTE104 - connection right, 10, MAP_ROUTE102 - -PetalburgCity_MapConnections: - .4byte 2 - .4byte PetalburgCity_MapConnectionsList - diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc deleted file mode 100644 index 83b3d227eb..0000000000 --- a/data/maps/PetalburgCity/events.inc +++ /dev/null @@ -1,42 +0,0 @@ -PetalburgCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 16, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT - object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_WALLY - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, PetalburgCity_EventScript_1DC488, 0 - object_event 5, EVENT_OBJ_GFX_POKEFAN_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, FLAG_ITEM_PETALBURG_CITY_ETHER - object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0 - object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_SCOTT - -PetalburgCity_MapWarps: - warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1 - warp_def 7, 5, 0, 0, MAP_PETALBURG_CITY_WALLYS_HOUSE - warp_def 15, 8, 0, 0, MAP_PETALBURG_CITY_GYM - warp_def 20, 16, 0, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_1F - warp_def 20, 24, 0, 0, MAP_PETALBURG_CITY_HOUSE2 - warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART - -PetalburgCity_MapCoordEvents: - coord_event 8, 10, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC49A - coord_event 8, 11, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4A6 - coord_event 8, 12, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4B2 - coord_event 8, 13, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4BE - coord_event 4, 10, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC691 - coord_event 4, 11, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6A7 - coord_event 4, 12, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6BD - coord_event 4, 13, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6D3 - -PetalburgCity_MapBGEvents: - bg_event 17, 10, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC476 - bg_event 26, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A - bg_event 21, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73 - bg_event 17, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC47F - bg_event 22, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73 - bg_event 27, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A - bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC491 - bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY - -PetalburgCity_MapEvents:: - map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents - diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc deleted file mode 100644 index 4aafc87a60..0000000000 --- a/data/maps/PetalburgCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity: - .4byte PetalburgCity_Layout - .4byte PetalburgCity_MapEvents - .4byte PetalburgCity_MapScripts - .4byte PetalburgCity_MapConnections - .2byte MUS_MACHI_S2 - .2byte LAYOUT_PETALBURG_CITY - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json new file mode 100644 index 0000000000..e62590b814 --- /dev/null +++ b/data/maps/PetalburgCity/map.json @@ -0,0 +1,330 @@ +{ + "id": "MAP_PETALBURG_CITY", + "name": "PetalburgCity", + "layout": "LAYOUT_PETALBURG_CITY", + "music": "MUS_MACHI_S2", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": -50, + "map": "MAP_ROUTE104" + }, + { + "direction": "right", + "offset": 10, + "map": "MAP_ROUTE102" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 16, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_EventScript_1DC3FD", + "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WALLY", + "x": 15, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_CITY_WALLY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 8, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_EventScript_1DC3E6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 20, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_EventScript_1DC488", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 15, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 19, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_EventScript_2910B4", + "flag": "FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_EventScript_2910C1", + "flag": "FLAG_ITEM_PETALBURG_CITY_ETHER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 12, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_EventScript_1DC82E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 13, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_CITY_SCOTT" + } + ], + "warp_events": [ + { + "x": 10, + "y": 19, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 5, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY_WALLYS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 0 + }, + { + "x": 20, + "y": 16, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 20, + "y": 24, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 25, + "y": 12, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY_MART", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 8, + "y": 10, + "elevation": 3, + "var": "VAR_0x4057", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC49A" + }, + { + "type": "trigger", + "x": 8, + "y": 11, + "elevation": 3, + "var": "VAR_0x4057", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC4A6" + }, + { + "type": "trigger", + "x": 8, + "y": 12, + "elevation": 3, + "var": "VAR_0x4057", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC4B2" + }, + { + "type": "trigger", + "x": 8, + "y": 13, + "elevation": 3, + "var": "VAR_0x4057", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC4BE" + }, + { + "type": "trigger", + "x": 4, + "y": 10, + "elevation": 3, + "var": "VAR_0x40C9", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC691" + }, + { + "type": "trigger", + "x": 4, + "y": 11, + "elevation": 3, + "var": "VAR_0x40C9", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC6A7" + }, + { + "type": "trigger", + "x": 4, + "y": 12, + "elevation": 3, + "var": "VAR_0x40C9", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC6BD" + }, + { + "type": "trigger", + "x": 4, + "y": 13, + "elevation": 3, + "var": "VAR_0x40C9", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC6D3" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 17, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_EventScript_1DC476" + }, + { + "type": "sign", + "x": 26, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PetalburgCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 21, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PetalburgCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 17, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_EventScript_1DC47F" + }, + { + "type": "sign", + "x": 22, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PetalburgCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 27, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PetalburgCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 8, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_EventScript_1DC491" + }, + { + "type": "hidden_item", + "x": 11, + "y": 29, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY" + } + ] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc deleted file mode 100644 index 81b244f2ec..0000000000 --- a/data/maps/PetalburgCity_Gym/events.inc +++ /dev/null @@ -1,72 +0,0 @@ -PetalburgCity_Gym_EventObjects: - object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, FLAG_HIDE_PETALYBURG_GYM_NORMAN - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 94, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 4, 81, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0 - object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 4, 42, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 55, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0 - object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 4, 68, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0 - object_event 8, EVENT_OBJ_GFX_MAN_3, 0, 4, 29, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, FLAG_HIDE_PETALBURG_GYM_GREETER - object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_GYM_WALLY - object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE - -PetalburgCity_Gym_MapWarps: - warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY - warp_def 5, 111, 3, 2, MAP_PETALBURG_CITY - warp_def 1, 105, 3, 3, MAP_PETALBURG_CITY_GYM - warp_def 7, 85, 3, 2, MAP_PETALBURG_CITY_GYM - warp_def 6, 85, 3, 2, MAP_PETALBURG_CITY_GYM - warp_def 7, 105, 3, 6, MAP_PETALBURG_CITY_GYM - warp_def 1, 98, 3, 5, MAP_PETALBURG_CITY_GYM - warp_def 2, 98, 3, 5, MAP_PETALBURG_CITY_GYM - warp_def 1, 79, 3, 10, MAP_PETALBURG_CITY_GYM - warp_def 7, 79, 3, 12, MAP_PETALBURG_CITY_GYM - warp_def 7, 46, 3, 8, MAP_PETALBURG_CITY_GYM - warp_def 6, 46, 3, 8, MAP_PETALBURG_CITY_GYM - warp_def 1, 59, 3, 9, MAP_PETALBURG_CITY_GYM - warp_def 2, 59, 3, 9, MAP_PETALBURG_CITY_GYM - warp_def 1, 92, 3, 16, MAP_PETALBURG_CITY_GYM - warp_def 7, 92, 3, 18, MAP_PETALBURG_CITY_GYM - warp_def 7, 59, 3, 14, MAP_PETALBURG_CITY_GYM - warp_def 6, 59, 3, 14, MAP_PETALBURG_CITY_GYM - warp_def 1, 72, 3, 15, MAP_PETALBURG_CITY_GYM - warp_def 2, 72, 3, 15, MAP_PETALBURG_CITY_GYM - warp_def 7, 40, 3, 24, MAP_PETALBURG_CITY_GYM - warp_def 1, 53, 3, 26, MAP_PETALBURG_CITY_GYM - warp_def 7, 53, 3, 28, MAP_PETALBURG_CITY_GYM - warp_def 1, 66, 3, 30, MAP_PETALBURG_CITY_GYM - warp_def 1, 20, 3, 20, MAP_PETALBURG_CITY_GYM - warp_def 2, 20, 3, 20, MAP_PETALBURG_CITY_GYM - warp_def 7, 20, 3, 21, MAP_PETALBURG_CITY_GYM - warp_def 6, 20, 3, 21, MAP_PETALBURG_CITY_GYM - warp_def 1, 33, 3, 22, MAP_PETALBURG_CITY_GYM - warp_def 2, 33, 3, 22, MAP_PETALBURG_CITY_GYM - warp_def 7, 33, 3, 23, MAP_PETALBURG_CITY_GYM - warp_def 6, 33, 3, 23, MAP_PETALBURG_CITY_GYM - warp_def 7, 14, 3, 34, MAP_PETALBURG_CITY_GYM - warp_def 1, 27, 3, 36, MAP_PETALBURG_CITY_GYM - warp_def 1, 7, 3, 32, MAP_PETALBURG_CITY_GYM - warp_def 2, 7, 3, 32, MAP_PETALBURG_CITY_GYM - warp_def 7, 7, 3, 33, MAP_PETALBURG_CITY_GYM - warp_def 6, 7, 3, 33, MAP_PETALBURG_CITY_GYM - -PetalburgCity_Gym_MapBGEvents: - bg_event 1, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205137 - bg_event 7, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205187 - bg_event 1, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2051BC - bg_event 7, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2051EF - bg_event 1, 92, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205222 - bg_event 7, 92, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205255 - bg_event 7, 40, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205288 - bg_event 1, 53, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2052BB - bg_event 7, 53, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2052EE - bg_event 1, 66, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205321 - bg_event 7, 14, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205354 - bg_event 1, 27, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205387 - bg_event 1, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_20576E - bg_event 7, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_20577E - -PetalburgCity_Gym_MapEvents:: - map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents - diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc deleted file mode 100644 index d58d30b909..0000000000 --- a/data/maps/PetalburgCity_Gym/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_Gym: - .4byte PetalburgCity_Gym_Layout - .4byte PetalburgCity_Gym_MapEvents - .4byte PetalburgCity_Gym_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_PETALBURG_CITY_GYM - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json new file mode 100644 index 0000000000..6f133a979a --- /dev/null +++ b/data/maps/PetalburgCity_Gym/map.json @@ -0,0 +1,544 @@ +{ + "id": "MAP_PETALBURG_CITY_GYM", + "name": "PetalburgCity_Gym", + "layout": "LAYOUT_PETALBURG_CITY_GYM", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "x": 4, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_2049F1", + "flag": "FLAG_HIDE_PETALYBURG_GYM_NORMAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 94, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_2054AA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 81, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_2053BA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_2053F6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 55, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_2054E6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 68, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_205432", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_205522", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_20546E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 3, + "y": 109, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_20574F", + "flag": "FLAG_HIDE_PETALBURG_GYM_GREETER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WALLY", + "x": 4, + "y": 111, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_GYM_WALLY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE" + } + ], + "warp_events": [ + { + "x": 4, + "y": 111, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 111, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 105, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 3 + }, + { + "x": 7, + "y": 85, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 85, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 105, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 6 + }, + { + "x": 1, + "y": 98, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 5 + }, + { + "x": 2, + "y": 98, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 5 + }, + { + "x": 1, + "y": 79, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 10 + }, + { + "x": 7, + "y": 79, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 12 + }, + { + "x": 7, + "y": 46, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 8 + }, + { + "x": 6, + "y": 46, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 8 + }, + { + "x": 1, + "y": 59, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 9 + }, + { + "x": 2, + "y": 59, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 9 + }, + { + "x": 1, + "y": 92, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 16 + }, + { + "x": 7, + "y": 92, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 18 + }, + { + "x": 7, + "y": 59, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 14 + }, + { + "x": 6, + "y": 59, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 14 + }, + { + "x": 1, + "y": 72, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 15 + }, + { + "x": 2, + "y": 72, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 15 + }, + { + "x": 7, + "y": 40, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 24 + }, + { + "x": 1, + "y": 53, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 26 + }, + { + "x": 7, + "y": 53, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 28 + }, + { + "x": 1, + "y": 66, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 30 + }, + { + "x": 1, + "y": 20, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 20 + }, + { + "x": 2, + "y": 20, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 20 + }, + { + "x": 7, + "y": 20, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 21 + }, + { + "x": 6, + "y": 20, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 21 + }, + { + "x": 1, + "y": 33, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 22 + }, + { + "x": 2, + "y": 33, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 22 + }, + { + "x": 7, + "y": 33, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 23 + }, + { + "x": 6, + "y": 33, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 23 + }, + { + "x": 7, + "y": 14, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 34 + }, + { + "x": 1, + "y": 27, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 36 + }, + { + "x": 1, + "y": 7, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 32 + }, + { + "x": 2, + "y": 7, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 32 + }, + { + "x": 7, + "y": 7, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 33 + }, + { + "x": 6, + "y": 7, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 33 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 1, + "y": 105, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205137" + }, + { + "type": "sign", + "x": 7, + "y": 105, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205187" + }, + { + "type": "sign", + "x": 1, + "y": 79, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_2051BC" + }, + { + "type": "sign", + "x": 7, + "y": 79, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_2051EF" + }, + { + "type": "sign", + "x": 1, + "y": 92, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205222" + }, + { + "type": "sign", + "x": 7, + "y": 92, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205255" + }, + { + "type": "sign", + "x": 7, + "y": 40, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205288" + }, + { + "type": "sign", + "x": 1, + "y": 53, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_2052BB" + }, + { + "type": "sign", + "x": 7, + "y": 53, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_2052EE" + }, + { + "type": "sign", + "x": 1, + "y": 66, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205321" + }, + { + "type": "sign", + "x": 7, + "y": 14, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205354" + }, + { + "type": "sign", + "x": 1, + "y": 27, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205387" + }, + { + "type": "sign", + "x": 1, + "y": 110, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PetalburgCity_Gym_EventScript_20576E" + }, + { + "type": "sign", + "x": 7, + "y": 110, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PetalburgCity_Gym_EventScript_20577E" + } + ] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_House1/events.inc b/data/maps/PetalburgCity_House1/events.inc deleted file mode 100644 index 9a22e581d6..0000000000 --- a/data/maps/PetalburgCity_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PetalburgCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0 - -PetalburgCity_House1_MapWarps: - warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY - warp_def 4, 8, 0, 0, MAP_PETALBURG_CITY - -PetalburgCity_House1_MapEvents:: - map_events PetalburgCity_House1_EventObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc deleted file mode 100644 index 7582e63369..0000000000 --- a/data/maps/PetalburgCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_House1: - .4byte House1_Layout - .4byte PetalburgCity_House1_MapEvents - .4byte PetalburgCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S2 - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json new file mode 100644 index 0000000000..1345f8d6be --- /dev/null +++ b/data/maps/PetalburgCity_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_PETALBURG_CITY_HOUSE1", + "name": "PetalburgCity_House1", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_MACHI_S2", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_House1_EventScript_2077A3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_House1_EventScript_20779A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_House2/events.inc b/data/maps/PetalburgCity_House2/events.inc deleted file mode 100644 index cc964b56c9..0000000000 --- a/data/maps/PetalburgCity_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PetalburgCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0 - -PetalburgCity_House2_MapWarps: - warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY - warp_def 4, 7, 0, 4, MAP_PETALBURG_CITY - -PetalburgCity_House2_MapEvents:: - map_events PetalburgCity_House2_EventObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc deleted file mode 100644 index 36eb663c0e..0000000000 --- a/data/maps/PetalburgCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_House2: - .4byte HouseWithBed_Layout - .4byte PetalburgCity_House2_MapEvents - .4byte PetalburgCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S2 - .2byte LAYOUT_HOUSE_WITH_BED - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json new file mode 100644 index 0000000000..cc193445ee --- /dev/null +++ b/data/maps/PetalburgCity_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_PETALBURG_CITY_HOUSE2", + "name": "PetalburgCity_House2", + "layout": "LAYOUT_HOUSE_WITH_BED", + "music": "MUS_MACHI_S2", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_House2_EventScript_2078F3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_House2_EventScript_2078FC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_Mart/events.inc b/data/maps/PetalburgCity_Mart/events.inc deleted file mode 100644 index 9cb05df7d7..0000000000 --- a/data/maps/PetalburgCity_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -PetalburgCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0 - -PetalburgCity_Mart_MapWarps: - warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY - warp_def 4, 7, 0, 5, MAP_PETALBURG_CITY - -PetalburgCity_Mart_MapEvents:: - map_events PetalburgCity_Mart_EventObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc deleted file mode 100644 index e95fb35537..0000000000 --- a/data/maps/PetalburgCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_Mart: - .4byte Mart_Layout - .4byte PetalburgCity_Mart_MapEvents - .4byte PetalburgCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json new file mode 100644 index 0000000000..c811ece3c0 --- /dev/null +++ b/data/maps/PetalburgCity_Mart/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_PETALBURG_CITY_MART", + "name": "PetalburgCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Mart_EventScript_207D69", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Mart_EventScript_207DE8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Mart_EventScript_207DDF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Mart_EventScript_207DD6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc deleted file mode 100644 index de02c8a8ee..0000000000 --- a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0 - -PetalburgCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY - warp_def 6, 8, 3, 3, MAP_PETALBURG_CITY - warp_def 1, 6, 4, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_2F - -PetalburgCity_PokemonCenter_1F_MapEvents:: - map_events PetalburgCity_PokemonCenter_1F_EventObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 08ec4783fb..0000000000 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte PetalburgCity_PokemonCenter_1F_MapEvents - .4byte PetalburgCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..a82cbb85aa --- /dev/null +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_1F", + "name": "PetalburgCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_1F_EventScript_2079FC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_1F_EventScript_291539", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A0A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A13", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A1C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_PETALBURG_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 49514363b3..0000000000 --- a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -PetalburgCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -PetalburgCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -PetalburgCity_PokemonCenter_2F_MapEvents:: - map_events PetalburgCity_PokemonCenter_2F_EventObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 779a106b91..0000000000 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte PetalburgCity_PokemonCenter_2F_MapEvents - .4byte PetalburgCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..49f2942b35 --- /dev/null +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_2F", + "name": "PetalburgCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_PETALBURG_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_WallysHouse/events.inc b/data/maps/PetalburgCity_WallysHouse/events.inc deleted file mode 100644 index 98487bd2ce..0000000000 --- a/data/maps/PetalburgCity_WallysHouse/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PetalburgCity_WallysHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0 - -PetalburgCity_WallysHouse_MapWarps: - warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY - warp_def 4, 7, 0, 1, MAP_PETALBURG_CITY - -PetalburgCity_WallysHouse_MapEvents:: - map_events PetalburgCity_WallysHouse_EventObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc deleted file mode 100644 index 2c49b77f64..0000000000 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_WallysHouse: - .4byte House2_Layout - .4byte PetalburgCity_WallysHouse_MapEvents - .4byte PetalburgCity_WallysHouse_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S2 - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json new file mode 100644 index 0000000000..b6a152be29 --- /dev/null +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_PETALBURG_CITY_WALLYS_HOUSE", + "name": "PetalburgCity_WallysHouse", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_MACHI_S2", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_WallysHouse_EventScript_204278", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_WallysHouse_EventScript_2042C0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc deleted file mode 100644 index 95326cedfe..0000000000 --- a/data/maps/PetalburgWoods/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -PetalburgWoods_EventObjects: - object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, FLAG_ITEM_PETALBURG_WOODS_X_ATTACK - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, FLAG_ITEM_PETALBURG_WOODS_ETHER - object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 2, 0, 0, PetalburgWoods_EventScript_22E210, 0 - object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0 - object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, PetalburgWoods_EventScript_22E219, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_291129, FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL - object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_22E222, 0 - -PetalburgWoods_MapWarps: - warp_def 14, 5, 0, 2, MAP_ROUTE104 - warp_def 15, 5, 0, 3, MAP_ROUTE104 - warp_def 16, 38, 0, 4, MAP_ROUTE104 - warp_def 17, 38, 0, 5, MAP_ROUTE104 - warp_def 36, 38, 0, 6, MAP_ROUTE104 - warp_def 37, 38, 0, 7, MAP_ROUTE104 - -PetalburgWoods_MapCoordEvents: - coord_event 26, 23, 3, VAR_0x4098, 0, PetalburgWoods_EventScript_22DFD7 - coord_event 27, 23, 3, VAR_0x4098, 0, PetalburgWoods_EventScript_22E079 - -PetalburgWoods_MapBGEvents: - bg_event 14, 32, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E25B - bg_hidden_item_event 39, 35, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION - bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1 - bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2 - bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL - bg_event 11, 8, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E264 - -PetalburgWoods_MapEvents:: - map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents - diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc deleted file mode 100644 index 530c2f2aa4..0000000000 --- a/data/maps/PetalburgWoods/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgWoods: - .4byte PetalburgWoods_Layout - .4byte PetalburgWoods_MapEvents - .4byte PetalburgWoods_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_PETALBURG_WOODS - .byte MAPSEC_PETALBURG_WOODS - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json new file mode 100644 index 0000000000..9a5f051b39 --- /dev/null +++ b/data/maps/PetalburgWoods/map.json @@ -0,0 +1,301 @@ +{ + "id": "MAP_PETALBURG_WOODS", + "name": "PetalburgWoods", + "layout": "LAYOUT_PETALBURG_WOODS", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_PETALBURG_WOODS", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 19, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 19, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 26, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 26, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 45, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_29110F", + "flag": "FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 35, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_291102", + "flag": "FLAG_ITEM_PETALBURG_WOODS_X_ATTACK" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_29111C", + "flag": "FLAG_ITEM_PETALBURG_WOODS_ETHER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 15, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_22E210", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 7, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PetalburgWoods_EventScript_22E26D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 4, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PetalburgWoods_EventScript_22E284", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 30, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_22E219", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_291129", + "flag": "FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 33, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_22E222", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 14, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 2 + }, + { + "x": 15, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 3 + }, + { + "x": 16, + "y": 38, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 4 + }, + { + "x": 17, + "y": 38, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 5 + }, + { + "x": 36, + "y": 38, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 6 + }, + { + "x": 37, + "y": 38, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 7 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 26, + "y": 23, + "elevation": 3, + "var": "VAR_0x4098", + "var_value": 0, + "script": "PetalburgWoods_EventScript_22DFD7" + }, + { + "type": "trigger", + "x": 27, + "y": 23, + "elevation": 3, + "var": "VAR_0x4098", + "var_value": 0, + "script": "PetalburgWoods_EventScript_22E079" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 32, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgWoods_EventScript_22E25B" + }, + { + "type": "hidden_item", + "x": 39, + "y": 35, + "elevation": 3, + "item": "ITEM_POTION", + "flag": "FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION" + }, + { + "type": "hidden_item", + "x": 26, + "y": 6, + "elevation": 3, + "item": "ITEM_TINY_MUSHROOM", + "flag": "FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1" + }, + { + "type": "hidden_item", + "x": 40, + "y": 29, + "elevation": 3, + "item": "ITEM_TINY_MUSHROOM", + "flag": "FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2" + }, + { + "type": "hidden_item", + "x": 4, + "y": 19, + "elevation": 3, + "item": "ITEM_POKE_BALL", + "flag": "FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL" + }, + { + "type": "sign", + "x": 11, + "y": 8, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgWoods_EventScript_22E264" + } + ] +} \ No newline at end of file diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc deleted file mode 100644 index 44829f60d4..0000000000 --- a/data/maps/RecordCorner/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -RecordCorner_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0 - -RecordCorner_MapWarps: - warp_def 8, 9, 3, 127, MAP_NONE - warp_def 9, 9, 3, 127, MAP_NONE - warp_def 11, 9, 3, 127, MAP_NONE - warp_def 10, 9, 3, 127, MAP_NONE - -RecordCorner_MapCoordEvents: - coord_event 6, 4, 3, VAR_TEMP_0, 0, gUnknown_0827741D - coord_event 6, 6, 3, VAR_TEMP_0, 0, gUnknown_08277447 - coord_event 13, 4, 3, VAR_TEMP_0, 0, gUnknown_08277432 - coord_event 13, 6, 3, VAR_TEMP_0, 0, gUnknown_0827745C - -RecordCorner_MapEvents:: - map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 - diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc deleted file mode 100644 index 0a3254abdb..0000000000 --- a/data/maps/RecordCorner/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RecordCorner: - .4byte RecordCorner_Layout - .4byte RecordCorner_MapEvents - .4byte RecordCorner_MapScripts - .4byte 0x0 - .2byte MUS_RAINBOW - .2byte LAYOUT_RECORD_CORNER - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json new file mode 100644 index 0000000000..98bcc02012 --- /dev/null +++ b/data/maps/RecordCorner/map.json @@ -0,0 +1,100 @@ +{ + "id": "MAP_RECORD_CORNER", + "name": "RecordCorner", + "layout": "LAYOUT_RECORD_CORNER", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RecordCorner_EventScript_2774C6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 9, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 11, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 6, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_0827741D" + }, + { + "type": "trigger", + "x": 6, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_08277447" + }, + { + "type": "trigger", + "x": 13, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_08277432" + }, + { + "type": "trigger", + "x": 13, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_0827745C" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route101/connections.inc b/data/maps/Route101/connections.inc deleted file mode 100644 index 32ee511a8f..0000000000 --- a/data/maps/Route101/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route101_MapConnectionsList: - connection up, 0, MAP_OLDALE_TOWN - connection down, 0, MAP_LITTLEROOT_TOWN - -Route101_MapConnections: - .4byte 2 - .4byte Route101_MapConnectionsList - diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc deleted file mode 100644 index b14649cc0f..0000000000 --- a/data/maps/Route101/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -Route101_EventObjects: - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE - object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBE16, FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG - object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_ZIGZAGOON - object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_272141, FLAG_HIDE_ROUTE_101_BIRCH - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_1EBE04, FLAG_HIDE_ROUTE_101_BOY - -Route101_MapCoordEvents: - coord_event 10, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE - coord_event 11, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE - coord_event 10, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD4E - coord_event 11, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD4E - coord_event 6, 16, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 - coord_event 6, 15, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 - coord_event 6, 17, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 - coord_event 6, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 - coord_event 7, 13, 3, VAR_0x4060, 2, Route101_EventScript_1EBD7A - -Route101_MapBGEvents: - bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route101_EventScript_1EBE0D - -Route101_MapEvents:: - map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents - diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc deleted file mode 100644 index b40de8df96..0000000000 --- a/data/maps/Route101/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route101: - .4byte Route101_Layout - .4byte Route101_MapEvents - .4byte Route101_MapScripts - .4byte Route101_MapConnections - .2byte MUS_DOORO1 - .2byte LAYOUT_ROUTE101 - .byte MAPSEC_ROUTE_101 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json new file mode 100644 index 0000000000..673db80eab --- /dev/null +++ b/data/maps/Route101/map.json @@ -0,0 +1,201 @@ +{ + "id": "MAP_ROUTE101", + "name": "Route101", + "layout": "LAYOUT_ROUTE101", + "music": "MUS_DOORO1", + "region_map_section": "MAPSEC_ROUTE_101", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_OLDALE_TOWN" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_LITTLEROOT_TOWN" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 16, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route101_EventScript_1EBDFB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 9, + "y": 13, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BIRCHS_BAG", + "x": 7, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route101_EventScript_1EBE16", + "flag": "FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_1", + "x": 10, + "y": 13, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_101_ZIGZAGOON" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route101_EventScript_272141", + "flag": "FLAG_HIDE_ROUTE_101_BIRCH" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 2, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route101_EventScript_1EBE04", + "flag": "FLAG_HIDE_ROUTE_101_BOY" + } + ], + "warp_events": [], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 19, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 1, + "script": "Route101_EventScript_1EBCDE" + }, + { + "type": "trigger", + "x": 11, + "y": 19, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 1, + "script": "Route101_EventScript_1EBCDE" + }, + { + "type": "trigger", + "x": 10, + "y": 18, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD4E" + }, + { + "type": "trigger", + "x": 11, + "y": 18, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD4E" + }, + { + "type": "trigger", + "x": 6, + "y": 16, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD64" + }, + { + "type": "trigger", + "x": 6, + "y": 15, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD64" + }, + { + "type": "trigger", + "x": 6, + "y": 17, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD64" + }, + { + "type": "trigger", + "x": 6, + "y": 18, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD64" + }, + { + "type": "trigger", + "x": 7, + "y": 13, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD7A" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route101_EventScript_1EBE0D" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route102/connections.inc b/data/maps/Route102/connections.inc deleted file mode 100644 index 1b76d47f5f..0000000000 --- a/data/maps/Route102/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route102_MapConnectionsList: - connection left, -10, MAP_PETALBURG_CITY - connection right, 0, MAP_OLDALE_TOWN - -Route102_MapConnections: - .4byte 2 - .4byte Route102_MapConnectionsList - diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc deleted file mode 100644 index 65acbee41e..0000000000 --- a/data/maps/Route102/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -Route102_EventObjects: - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY, 0, 18, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route102_EventScript_1EC105, 0 - object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route102_EventScript_1EC0FC, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route102_EventScript_290CD8, FLAG_ITEM_ROUTE_102_POTION - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 2, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 1, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0 - -Route102_MapBGEvents: - bg_event 17, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0F3 - bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0EA - -Route102_MapEvents:: - map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents - diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc deleted file mode 100644 index 6b5c24b0c6..0000000000 --- a/data/maps/Route102/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route102: - .4byte Route102_Layout - .4byte Route102_MapEvents - .4byte Route102_MapScripts - .4byte Route102_MapConnections - .2byte MUS_DOORO1 - .2byte LAYOUT_ROUTE102 - .byte MAPSEC_ROUTE_102 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json new file mode 100644 index 0000000000..e6418c42c2 --- /dev/null +++ b/data/maps/Route102/map.json @@ -0,0 +1,166 @@ +{ + "id": "MAP_ROUTE102", + "name": "Route102", + "layout": "LAYOUT_ROUTE102", + "music": "MUS_DOORO1", + "region_map_section": "MAPSEC_ROUTE_102", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": -10, + "map": "MAP_PETALBURG_CITY" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_OLDALE_TOWN" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 18, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route102_EventScript_1EC0E1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 33, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route102_EventScript_1EC105", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 25, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route102_EventScript_1EC1B3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route102_EventScript_1EC1CA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 37, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route102_EventScript_1EC0FC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 11, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route102_EventScript_290CD8", + "flag": "FLAG_ITEM_ROUTE_102_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 24, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 2, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 25, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 1, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 19, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route102_EventScript_1EC1E1", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 17, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route102_EventScript_1EC0F3" + }, + { + "type": "sign", + "x": 40, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route102_EventScript_1EC0EA" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route103/connections.inc b/data/maps/Route103/connections.inc deleted file mode 100644 index cff488cf2e..0000000000 --- a/data/maps/Route103/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route103_MapConnectionsList: - connection down, 0, MAP_OLDALE_TOWN - connection right, -60, MAP_ROUTE110 - -Route103_MapConnections: - .4byte 2 - .4byte Route103_MapConnectionsList - diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc deleted file mode 100644 index 8794121571..0000000000 --- a/data/maps/Route103/events.inc +++ /dev/null @@ -1,31 +0,0 @@ -Route103_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 49, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, FLAG_HIDE_ROUTE_103_RIVAL - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 71, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0 - object_event 4, EVENT_OBJ_GFX_TWIN, 0, 65, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0 - object_event 5, EVENT_OBJ_GFX_TWIN, 0, 64, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 1, 1, 3, Route103_EventScript_1EC6D1, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 5, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 6, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 7, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, Route103_EventScript_1EC5D9, 0 - object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route103_EventScript_272141, FLAG_HIDE_ROUTE_103_BIRCH - object_event 12, EVENT_OBJ_GFX_POKEFAN_M, 0, 56, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CE5, FLAG_ITEM_ROUTE_103_GUARD_SPEC - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, FLAG_TEMP_12 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, FLAG_TEMP_13 - object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 67, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route103_EventScript_1EC761, 0 - object_event 17, EVENT_OBJ_GFX_MAN_5, 0, 67, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route103_EventScript_1EC74A, 0 - object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 6, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route103_EventScript_1EC78F, 0 - object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route103_EventScript_1EC778, 0 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CF2, FLAG_ITEM_ROUTE_103_PP_UP - -Route103_MapWarps: - warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE - -Route103_MapBGEvents: - bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route103_EventScript_1EC5EB - -Route103_MapEvents:: - map_events Route103_EventObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents - diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc deleted file mode 100644 index 942ec632cb..0000000000 --- a/data/maps/Route103/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route103: - .4byte Route103_Layout - .4byte Route103_MapEvents - .4byte Route103_MapScripts - .4byte Route103_MapConnections - .2byte MUS_DOORO1 - .2byte LAYOUT_ROUTE103 - .byte MAPSEC_ROUTE_103 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json new file mode 100644 index 0000000000..516c4ed8fc --- /dev/null +++ b/data/maps/Route103/map.json @@ -0,0 +1,309 @@ +{ + "id": "MAP_ROUTE103", + "name": "Route103", + "layout": "LAYOUT_ROUTE103", + "music": "MUS_DOORO1", + "region_map_section": "MAPSEC_ROUTE_103", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_OLDALE_TOWN" + }, + { + "direction": "right", + "offset": -60, + "map": "MAP_ROUTE110" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 49, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_1EC5E2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_1EC3C1", + "flag": "FLAG_HIDE_ROUTE_103_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 71, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route103_EventScript_1EC5F4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 65, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route103_EventScript_1EC66E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 64, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route103_EventScript_1EC60B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 50, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route103_EventScript_1EC6D1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 58, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 5, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 59, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 6, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 60, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 7, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 20, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_1EC5D9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_272141", + "flag": "FLAG_HIDE_ROUTE_103_BIRCH" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 56, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route103_EventScript_1EC6E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 50, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_290CE5", + "flag": "FLAG_ITEM_ROUTE_103_GUARD_SPEC" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 67, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 72, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_2906BB", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 67, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route103_EventScript_1EC761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 67, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route103_EventScript_1EC74A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 36, + "y": 6, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route103_EventScript_1EC78F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 36, + "y": 13, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route103_EventScript_1EC778", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 64, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_290CF2", + "flag": "FLAG_ITEM_ROUTE_103_PP_UP" + } + ], + "warp_events": [ + { + "x": 45, + "y": 6, + "elevation": 0, + "dest_map": "MAP_ALTERING_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 11, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route103_EventScript_1EC5EB" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route104/connections.inc b/data/maps/Route104/connections.inc deleted file mode 100644 index 193f898335..0000000000 --- a/data/maps/Route104/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route104_MapConnectionsList: - connection up, 0, MAP_RUSTBORO_CITY - connection down, 0, MAP_ROUTE105 - connection right, 50, MAP_PETALBURG_CITY - -Route104_MapConnections: - .4byte 3 - .4byte Route104_MapConnectionsList - diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc deleted file mode 100644 index 8b67a0854a..0000000000 --- a/data/maps/Route104/events.inc +++ /dev/null @@ -1,64 +0,0 @@ -Route104_EventObjects: - object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED006, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route104_EventScript_1ED045, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 50, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED04E, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route104_EventScript_1ED090, 0 - object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT - object_event 8, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 51, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_104_MR_BRINEY - object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 8, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 9, BerryTreeScript, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 10, BerryTreeScript, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 11, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 12, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 13, BerryTreeScript, 0 - object_event 16, EVENT_OBJ_GFX_EXPERT_F, 0, 37, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route104_EventScript_1ECF8C, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 3, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 4, BerryTreeScript, 0 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 75, BerryTreeScript, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 76, BerryTreeScript, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route104_EventScript_290CFF, FLAG_ITEM_ROUTE_104_PP_UP - object_event 22, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 19, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_EventScript_1ECFCD, FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST - object_event 23, EVENT_OBJ_GFX_TWIN, 0, 27, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED597, 0 - object_event 24, EVENT_OBJ_GFX_TWIN, 0, 28, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0 - object_event 25, EVENT_OBJ_GFX_RICH_BOY, 0, 21, 25, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 44, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0 - object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D0C, FLAG_ITEM_ROUTE_104_POKE_BALL - object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 5, 6, 1, 2, Route104_EventScript_1ED376, 0 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D19, FLAG_ITEM_ROUTE_104_X_ACCURACY - object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_2906BB, FLAG_TEMP_11 - object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D26, FLAG_ITEM_ROUTE_104_POTION - object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED057, 0 - object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0 - object_event 34, EVENT_OBJ_GFX_VAR_0, 0, 17, 50, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ECC9E, FLAG_HIDE_ROUTE_104_RIVAL - -Route104_MapWarps: - warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE - warp_def 5, 18, 0, 0, MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP - warp_def 10, 30, 3, 0, MAP_PETALBURG_WOODS - warp_def 11, 30, 3, 1, MAP_PETALBURG_WOODS - warp_def 10, 38, 3, 2, MAP_PETALBURG_WOODS - warp_def 11, 38, 3, 3, MAP_PETALBURG_WOODS - warp_def 32, 42, 3, 4, MAP_PETALBURG_WOODS - warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS - -Route104_MapCoordEvents: - coord_event 17, 51, 3, VAR_0x4063, 1, Route104_EventScript_1ECCB3 - -Route104_MapBGEvents: - bg_event 20, 50, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED018 - bg_event 27, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED021 - bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED02A - bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED033 - bg_event 17, 23, 3, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED03C - bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION - bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL - bg_hidden_item_event 14, 55, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_ROUTE_104_POTION - bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE - bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE - -Route104_MapEvents:: - map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents - diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc deleted file mode 100644 index 6f8e0776b7..0000000000 --- a/data/maps/Route104/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104: - .4byte Route104_Layout - .4byte Route104_MapEvents - .4byte Route104_MapScripts - .4byte Route104_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE104 - .byte MAPSEC_ROUTE_104 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json new file mode 100644 index 0000000000..733ad49899 --- /dev/null +++ b/data/maps/Route104/map.json @@ -0,0 +1,627 @@ +{ + "id": "MAP_ROUTE104", + "name": "Route104", + "layout": "LAYOUT_ROUTE104", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_104", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_RUSTBORO_CITY" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE105" + }, + { + "direction": "right", + "offset": 50, + "map": "MAP_PETALBURG_CITY" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 15, + "y": 60, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED00F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 25, + "y": 49, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED006", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 31, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route104_EventScript_1ED38D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 27, + "y": 63, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED045", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 30, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED04E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 28, + "y": 74, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED090", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "x": 12, + "y": 54, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 12, + "y": 51, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 29, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED35F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 34, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 8, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 35, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 9, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 36, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 10, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 22, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 11, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 23, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 12, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 24, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 13, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 37, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ECF8C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 3, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 3, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 3, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 4, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 3, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 75, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 3, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 76, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 39, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_290CFF", + "flag": "FLAG_ITEM_ROUTE_104_PP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 8, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ECFCD", + "flag": "FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 27, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route104_EventScript_1ED597", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 28, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route104_EventScript_1ED5B6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 21, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route104_EventScript_1ED43B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 11, + "y": 44, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route104_EventScript_1ED4E9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 29, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_290D0C", + "flag": "FLAG_ITEM_ROUTE_104_POKE_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 18, + "y": 67, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 5, + "movement_range_y": 6, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route104_EventScript_1ED376", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 37, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_290D19", + "flag": "FLAG_ITEM_ROUTE_104_X_ACCURACY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 35, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_290D26", + "flag": "FLAG_ITEM_ROUTE_104_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 5, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED057", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 15, + "y": 59, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED5D5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 17, + "y": 50, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ECC9E", + "flag": "FLAG_HIDE_ROUTE_104_RIVAL" + } + ], + "warp_events": [ + { + "x": 17, + "y": 50, + "elevation": 0, + "dest_map": "MAP_ROUTE104_MR_BRINEYS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 18, + "elevation": 0, + "dest_map": "MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 30, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 30, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 38, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 2 + }, + { + "x": 11, + "y": 38, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 3 + }, + { + "x": 32, + "y": 42, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 4 + }, + { + "x": 33, + "y": 42, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 5 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 17, + "y": 51, + "elevation": 3, + "var": "VAR_0x4063", + "var_value": 1, + "script": "Route104_EventScript_1ECCB3" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 20, + "y": 50, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED018" + }, + { + "type": "sign", + "x": 27, + "y": 66, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED021" + }, + { + "type": "sign", + "x": 23, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED02A" + }, + { + "type": "sign", + "x": 7, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED033" + }, + { + "type": "sign", + "x": 17, + "y": 23, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED03C" + }, + { + "type": "hidden_item", + "x": 7, + "y": 6, + "elevation": 3, + "item": "ITEM_SUPER_POTION", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION" + }, + { + "type": "hidden_item", + "x": 3, + "y": 9, + "elevation": 3, + "item": "ITEM_POKE_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL" + }, + { + "type": "hidden_item", + "x": 14, + "y": 55, + "elevation": 3, + "item": "ITEM_POTION", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_POTION" + }, + { + "type": "hidden_item", + "x": 16, + "y": 72, + "elevation": 3, + "item": "ITEM_ANTIDOTE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE" + }, + { + "type": "hidden_item", + "x": 16, + "y": 64, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route104_MrBrineysHouse/events.inc b/data/maps/Route104_MrBrineysHouse/events.inc deleted file mode 100644 index d1924756c3..0000000000 --- a/data/maps/Route104_MrBrineysHouse/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route104_MrBrineysHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 3, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, FLAG_HIDE_BRINEYS_HOUSE_PEEKO - -Route104_MrBrineysHouse_MapWarps: - warp_def 5, 8, 0, 0, MAP_ROUTE104 - warp_def 6, 8, 0, 0, MAP_ROUTE104 - -Route104_MrBrineysHouse_MapEvents:: - map_events Route104_MrBrineysHouse_EventObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc deleted file mode 100644 index 784db2d2da..0000000000 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_MrBrineysHouse: - .4byte Route104_MrBrineysHouse_Layout - .4byte Route104_MrBrineysHouse_MapEvents - .4byte Route104_MrBrineysHouse_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S2 - .2byte LAYOUT_ROUTE104_MR_BRINEYS_HOUSE - .byte MAPSEC_ROUTE_104 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json new file mode 100644 index 0000000000..bdd2361e06 --- /dev/null +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_ROUTE104_MR_BRINEYS_HOUSE", + "name": "Route104_MrBrineysHouse", + "layout": "LAYOUT_ROUTE104_MR_BRINEYS_HOUSE", + "music": "MUS_MACHI_S2", + "region_map_section": "MAPSEC_ROUTE_104", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_MrBrineysHouse_EventScript_229D67", + "flag": "FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_MrBrineysHouse_EventScript_229E5D", + "flag": "FLAG_HIDE_BRINEYS_HOUSE_PEEKO" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route104_PrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc deleted file mode 100644 index c33268ff65..0000000000 --- a/data/maps/Route104_PrettyPetalFlowerShop/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route104_PrettyPetalFlowerShop_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0 - -Route104_PrettyPetalFlowerShop_MapWarps: - warp_def 2, 8, 0, 1, MAP_ROUTE104 - warp_def 3, 8, 0, 1, MAP_ROUTE104 - -Route104_PrettyPetalFlowerShop_MapEvents:: - map_events Route104_PrettyPetalFlowerShop_EventObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc deleted file mode 100644 index b201d0a3e5..0000000000 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_PrettyPetalFlowerShop: - .4byte Route104_PrettyPetalFlowerShop_Layout - .4byte Route104_PrettyPetalFlowerShop_MapEvents - .4byte Route104_PrettyPetalFlowerShop_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S2 - .2byte LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP - .byte MAPSEC_ROUTE_104 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json new file mode 100644 index 0000000000..cd00d18e1c --- /dev/null +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", + "name": "Route104_PrettyPetalFlowerShop", + "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", + "music": "MUS_MACHI_S2", + "region_map_section": "MAPSEC_ROUTE_104", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_PrettyPetalFlowerShop_EventScript_22A373", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_PrettyPetalFlowerShop_EventScript_22A40C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 11, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_PrettyPetalFlowerShop_EventScript_22A442", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route104_Prototype/events.inc b/data/maps/Route104_Prototype/events.inc deleted file mode 100644 index 4f1dfef12a..0000000000 --- a/data/maps/Route104_Prototype/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -Route104_Prototype_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc deleted file mode 100644 index 7bc8d0a876..0000000000 --- a/data/maps/Route104_Prototype/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_Prototype: - .4byte Route104_Prototype_Layout - .4byte Route104_Prototype_MapEvents - .4byte Route104_Prototype_MapScripts - .4byte 0x0 - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE104_PROTOTYPE - .byte MAPSEC_ROUTE_104 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json new file mode 100644 index 0000000000..168cee142c --- /dev/null +++ b/data/maps/Route104_Prototype/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_ROUTE104_PROTOTYPE", + "name": "Route104_Prototype", + "layout": "LAYOUT_ROUTE104_PROTOTYPE", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_104", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc deleted file mode 100644 index 76dd77e02a..0000000000 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -Route104_PrototypePrettyPetalFlowerShop_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc deleted file mode 100644 index 53b543e4eb..0000000000 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_PrototypePrettyPetalFlowerShop: - .4byte Route104_PrettyPetalFlowerShop_Layout - .4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents - .4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts - .4byte 0x0 - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP - .byte MAPSEC_ROUTE_104 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json new file mode 100644 index 0000000000..f50dced01e --- /dev/null +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP", + "name": "Route104_PrototypePrettyPetalFlowerShop", + "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_104", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route105/connections.inc b/data/maps/Route105/connections.inc deleted file mode 100644 index 89c412cc6a..0000000000 --- a/data/maps/Route105/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route105_MapConnectionsList: - connection up, 0, MAP_ROUTE104 - connection down, 0, MAP_ROUTE106 - connection dive, 0, MAP_UNDERWATER6 - -Route105_MapConnections: - .4byte 3 - .4byte Route105_MapConnectionsList - diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc deleted file mode 100644 index 851a26fdc7..0000000000 --- a/data/maps/Route105/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route105_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 19, 60, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route105_EventScript_1EE261, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 7, 0, 1, 3, Route105_EventScript_1EE278, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 7, 1, 3, Route105_EventScript_1EE28F, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 5, 1, 3, Route105_EventScript_1EE2A6, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route105_EventScript_290D33, FLAG_ITEM_ROUTE_105_IRON - object_event 6, EVENT_OBJ_GFX_HIKER, 0, 17, 48, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 7, 1, 3, Route105_EventScript_1EE24A, 0 - object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0 - object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, MOVEMENT_TYPE_FACE_UP, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0 - -Route105_MapWarps: - warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE - -Route105_MapBGEvents: - bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE - bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL - -Route105_MapEvents:: - map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents - diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc deleted file mode 100644 index ac3e766dd1..0000000000 --- a/data/maps/Route105/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route105: - .4byte Route105_Layout - .4byte Route105_MapEvents - .4byte Route105_MapScripts - .4byte Route105_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE105 - .byte MAPSEC_ROUTE_105 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json new file mode 100644 index 0000000000..937582affe --- /dev/null +++ b/data/maps/Route105/map.json @@ -0,0 +1,166 @@ +{ + "id": "MAP_ROUTE105", + "name": "Route105", + "layout": "LAYOUT_ROUTE105", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_105", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE104" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE106" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER6" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 19, + "y": 60, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route105_EventScript_1EE261", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 27, + "y": 36, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 7, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route105_EventScript_1EE278", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 8, + "y": 45, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 7, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route105_EventScript_1EE28F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 19, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route105_EventScript_1EE2A6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 8, + "y": 73, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route105_EventScript_290D33", + "flag": "FLAG_ITEM_ROUTE_105_IRON" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 17, + "y": 48, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 7, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route105_EventScript_1EE24A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 4, + "y": 54, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route105_EventScript_1EE2BD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 4, + "y": 58, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route105_EventScript_1EE2D4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 20, + "elevation": 0, + "dest_map": "MAP_ISLAND_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 15, + "y": 68, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE" + }, + { + "type": "hidden_item", + "x": 5, + "y": 56, + "elevation": 3, + "item": "ITEM_BIG_PEARL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route106/connections.inc b/data/maps/Route106/connections.inc deleted file mode 100644 index f48a08bd80..0000000000 --- a/data/maps/Route106/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route106_MapConnectionsList: - connection up, 0, MAP_ROUTE105 - connection down, 60, MAP_DEWFORD_TOWN - -Route106_MapConnections: - .4byte 2 - .4byte Route106_MapConnectionsList - diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc deleted file mode 100644 index 6454fc188b..0000000000 --- a/data/maps/Route106/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -Route106_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 5, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 4, 0, 1, 3, Route106_EventScript_1EE493, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0 - object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE523, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route106_EventScript_290D40, FLAG_ITEM_ROUTE_106_PROTEIN - -Route106_MapWarps: - warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F - -Route106_MapBGEvents: - bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL - bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST - bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE - bg_event 59, 13, 3, BG_EVENT_PLAYER_FACING_ANY, Route106_EventScript_1EE48A - -Route106_MapEvents:: - map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents - diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc deleted file mode 100644 index 01c7b9ae6d..0000000000 --- a/data/maps/Route106/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route106: - .4byte Route106_Layout - .4byte Route106_MapEvents - .4byte Route106_MapScripts - .4byte Route106_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE106 - .byte MAPSEC_ROUTE_106 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json new file mode 100644 index 0000000000..fd86567e96 --- /dev/null +++ b/data/maps/Route106/map.json @@ -0,0 +1,138 @@ +{ + "id": "MAP_ROUTE106", + "name": "Route106", + "layout": "LAYOUT_ROUTE106", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_106", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE105" + }, + { + "direction": "down", + "offset": 60, + "map": "MAP_DEWFORD_TOWN" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 18, + "y": 5, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 4, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route106_EventScript_1EE493", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 29, + "y": 10, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route106_EventScript_1EE4AA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 51, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route106_EventScript_1EE4C1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 65, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route106_EventScript_1EE523", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 29, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route106_EventScript_290D40", + "flag": "FLAG_ITEM_ROUTE_106_PROTEIN" + } + ], + "warp_events": [ + { + "x": 48, + "y": 16, + "elevation": 0, + "dest_map": "MAP_GRANITE_CAVE_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 41, + "y": 11, + "elevation": 3, + "item": "ITEM_POKE_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL" + }, + { + "type": "hidden_item", + "x": 53, + "y": 12, + "elevation": 0, + "item": "ITEM_STARDUST", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST" + }, + { + "type": "hidden_item", + "x": 68, + "y": 15, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE" + }, + { + "type": "sign", + "x": 59, + "y": 13, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route106_EventScript_1EE48A" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route107/connections.inc b/data/maps/Route107/connections.inc deleted file mode 100644 index d1bb18b873..0000000000 --- a/data/maps/Route107/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route107_MapConnectionsList: - connection left, 0, MAP_DEWFORD_TOWN - connection right, 0, MAP_ROUTE108 - -Route107_MapConnections: - .4byte 2 - .4byte Route107_MapConnectionsList - diff --git a/data/maps/Route107/events.inc b/data/maps/Route107/events.inc deleted file mode 100644 index 461d8cd86c..0000000000 --- a/data/maps/Route107/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route107_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 10, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, Route107_EventScript_1EE595, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 23, 11, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 6, 2, 1, 2, Route107_EventScript_1EE5AC, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 7, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 11, 1, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 1, 1, 1, 5, Route107_EventScript_1EE625, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route107_EventScript_1EE63C, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route107_EventScript_1EE657, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route107_EventScript_1EE672, 0 - -Route107_MapEvents:: - map_events Route107_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc deleted file mode 100644 index db53b811dd..0000000000 --- a/data/maps/Route107/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route107: - .4byte Route107_Layout - .4byte Route107_MapEvents - .4byte Route107_MapScripts - .4byte Route107_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE107 - .byte MAPSEC_ROUTE_107 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json new file mode 100644 index 0000000000..dcb17ed8c7 --- /dev/null +++ b/data/maps/Route107/map.json @@ -0,0 +1,123 @@ +{ + "id": "MAP_ROUTE107", + "name": "Route107", + "layout": "LAYOUT_ROUTE107", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_107", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_DEWFORD_TOWN" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE108" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 41, + "y": 10, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route107_EventScript_1EE595", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 23, + "y": 11, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", + "movement_range_x": 6, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route107_EventScript_1EE5AC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 16, + "y": 7, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route107_EventScript_1EE60E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 50, + "y": 11, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route107_EventScript_1EE625", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 33, + "y": 4, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route107_EventScript_1EE63C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "x": 32, + "y": 4, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route107_EventScript_1EE657", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 50, + "y": 5, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route107_EventScript_1EE672", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route108/connections.inc b/data/maps/Route108/connections.inc deleted file mode 100644 index 9b2d0f1f90..0000000000 --- a/data/maps/Route108/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route108_MapConnectionsList: - connection left, 0, MAP_ROUTE107 - connection right, -40, MAP_ROUTE109 - -Route108_MapConnections: - .4byte 2 - .4byte Route108_MapConnectionsList - diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc deleted file mode 100644 index 9e1a088c08..0000000000 --- a/data/maps/Route108/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -Route108_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 3, Route108_EventScript_1EE68A, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 1, 1, 1, 3, Route108_EventScript_1EE6B8, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 41, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0 - object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route108_EventScript_290D4D, FLAG_ITEM_ROUTE_108_STAR_PIECE - -Route108_MapWarps: - warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK - -Route108_MapBGEvents: - bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY - -Route108_MapEvents:: - map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents - diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc deleted file mode 100644 index 97d4a879d1..0000000000 --- a/data/maps/Route108/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route108: - .4byte Route108_Layout - .4byte Route108_MapEvents - .4byte Route108_MapScripts - .4byte Route108_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE108 - .byte MAPSEC_ROUTE_108 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json new file mode 100644 index 0000000000..daa9dab75a --- /dev/null +++ b/data/maps/Route108/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_ROUTE108", + "name": "Route108", + "layout": "LAYOUT_ROUTE108", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_108", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE107" + }, + { + "direction": "right", + "offset": -40, + "map": "MAP_ROUTE109" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 52, + "y": 13, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route108_EventScript_1EE68A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 35, + "y": 12, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route108_EventScript_1EE6B8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 13, + "y": 13, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route108_EventScript_1EE6A1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 8, + "y": 7, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", + "movement_range_x": 6, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route108_EventScript_1EE6CF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 41, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route108_EventScript_1EE6E6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 43, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route108_EventScript_1EE6FD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 42, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route108_EventScript_290D4D", + "flag": "FLAG_ITEM_ROUTE_108_STAR_PIECE" + } + ], + "warp_events": [ + { + "x": 29, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 38, + "y": 14, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route109/connections.inc b/data/maps/Route109/connections.inc deleted file mode 100644 index d74fc08ddf..0000000000 --- a/data/maps/Route109/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route109_MapConnectionsList: - connection up, 0, MAP_SLATEPORT_CITY - connection left, 40, MAP_ROUTE108 - -Route109_MapConnections: - .4byte 2 - .4byte Route109_MapConnectionsList - diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc deleted file mode 100644 index efd0e896fd..0000000000 --- a/data/maps/Route109/events.inc +++ /dev/null @@ -1,42 +0,0 @@ -Route109_EventObjects: - object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_1EE910, FLAG_HIDE_ROUTE_108_MR_BRINEY - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 39, 1, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 15, 17, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0 - object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0 - object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 19, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0 - object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 22, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_EventScript_1EE995, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 46, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route109_EventScript_290D5A, FLAG_ITEM_ROUTE_109_PP_UP - object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0 - object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 21, 56, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0 - object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 18, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route109_EventScript_1EE99E, 0 - object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route109_EventScript_1EE9B5, 0 - object_event 16, EVENT_OBJ_GFX_POKEFAN_F, 0, 30, 32, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route109_EventScript_1EEA06, 0 - object_event 17, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route109_EventScript_1EEBBD, 0 - object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 9, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route109_EventScript_1EEBA2, 0 - object_event 19, EVENT_OBJ_GFX_OLD_MAN, 0, 33, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA0F, 0 - object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 32, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA18, 0 - object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 17, 13, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 6, Route109_EventScript_1EEBEF, 0 - object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 27, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 1, 4, Route109_EventScript_1EEBD8, 0 - object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, FLAG_ITEM_ROUTE_109_POTION - object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 17, 56, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0 - -Route109_MapWarps: - warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE - -Route109_MapBGEvents: - bg_event 15, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA2B - bg_event 29, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA34 - bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE - bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1 - bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL - bg_hidden_item_event 28, 20, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_109_ETHER - bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2 - bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3 - -Route109_MapEvents:: - map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents - diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc deleted file mode 100644 index 9de12f3e68..0000000000 --- a/data/maps/Route109/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route109: - .4byte Route109_Layout - .4byte Route109_MapEvents - .4byte Route109_MapScripts - .4byte Route109_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE109 - .byte MAPSEC_ROUTE_109 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json new file mode 100644 index 0000000000..b3bd9f507e --- /dev/null +++ b/data/maps/Route109/map.json @@ -0,0 +1,417 @@ +{ + "id": "MAP_ROUTE109", + "name": "Route109", + "layout": "LAYOUT_ROUTE109", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_109", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_SLATEPORT_CITY" + }, + { + "direction": "left", + "offset": 40, + "map": "MAP_ROUTE108" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "x": 21, + "y": 26, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 21, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EE910", + "flag": "FLAG_HIDE_ROUTE_108_MR_BRINEY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 12, + "y": 36, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route109_EventScript_1EEA3D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 25, + "y": 39, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route109_EventScript_1EEA54", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 15, + "y": 17, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route109_EventScript_1EEA6B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 24, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route109_EventScript_1EEA82", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "x": 19, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route109_EventScript_1EEA99", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "x": 22, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route109_EventScript_1EEAFB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EE995", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 27, + "y": 46, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_290D5A", + "flag": "FLAG_ITEM_ROUTE_109_PP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "x": 29, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route109_EventScript_1EEB74", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "x": 28, + "y": 31, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route109_EventScript_1EEB5D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 21, + "y": 56, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route109_EventScript_1EEB8B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "x": 24, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EE99E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "x": 25, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EE9B5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 30, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EEA06", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 8, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route109_EventScript_1EEBBD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 9, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route109_EventScript_1EEBA2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 33, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EEA0F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 32, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EEA18", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "x": 17, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route109_EventScript_1EEBEF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "x": 27, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route109_EventScript_1EEBD8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 25, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_290D67", + "flag": "FLAG_ITEM_ROUTE_109_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 17, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route109_EventScript_1EEC06", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 12, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE109_SEASHORE_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 15, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route109_EventScript_1EEA2B" + }, + { + "type": "sign", + "x": 29, + "y": 10, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route109_EventScript_1EEA34" + }, + { + "type": "hidden_item", + "x": 16, + "y": 23, + "elevation": 3, + "item": "ITEM_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE" + }, + { + "type": "hidden_item", + "x": 33, + "y": 5, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1" + }, + { + "type": "hidden_item", + "x": 9, + "y": 10, + "elevation": 3, + "item": "ITEM_GREAT_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL" + }, + { + "type": "hidden_item", + "x": 28, + "y": 20, + "elevation": 3, + "item": "ITEM_ETHER", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_ETHER" + }, + { + "type": "hidden_item", + "x": 13, + "y": 16, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2" + }, + { + "type": "hidden_item", + "x": 8, + "y": 42, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route109_SeashoreHouse/events.inc b/data/maps/Route109_SeashoreHouse/events.inc deleted file mode 100644 index 7ef23ad7f5..0000000000 --- a/data/maps/Route109_SeashoreHouse/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route109_SeashoreHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0 - object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0 - -Route109_SeashoreHouse_MapWarps: - warp_def 6, 9, 0, 0, MAP_ROUTE109 - warp_def 7, 9, 0, 0, MAP_ROUTE109 - -Route109_SeashoreHouse_MapEvents:: - map_events Route109_SeashoreHouse_EventObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc deleted file mode 100644 index d8109deaca..0000000000 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route109_SeashoreHouse: - .4byte Route109_SeashoreHouse_Layout - .4byte Route109_SeashoreHouse_MapEvents - .4byte Route109_SeashoreHouse_MapScripts - .4byte 0x0 - .2byte MUS_HIGHTOWN - .2byte LAYOUT_ROUTE109_SEASHORE_HOUSE - .byte MAPSEC_ROUTE_109 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json new file mode 100644 index 0000000000..e30fcc078e --- /dev/null +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_ROUTE109_SEASHORE_HOUSE", + "name": "Route109_SeashoreHouse", + "layout": "LAYOUT_ROUTE109_SEASHORE_HOUSE", + "music": "MUS_HIGHTOWN", + "region_map_section": "MAPSEC_ROUTE_109", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_SeashoreHouse_EventScript_2693FE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route109_SeashoreHouse_EventScript_2694E2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "x": 14, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route109_SeashoreHouse_EventScript_269518", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route109_SeashoreHouse_EventScript_2694FD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_ROUTE109", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 9, + "elevation": 0, + "dest_map": "MAP_ROUTE109", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route110/connections.inc b/data/maps/Route110/connections.inc deleted file mode 100644 index d0334b8c5c..0000000000 --- a/data/maps/Route110/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route110_MapConnectionsList: - connection up, 0, MAP_MAUVILLE_CITY - connection down, 0, MAP_SLATEPORT_CITY - connection left, 60, MAP_ROUTE103 - -Route110_MapConnections: - .4byte 3 - .4byte Route110_MapConnectionsList - diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc deleted file mode 100644 index 349670c135..0000000000 --- a/data/maps/Route110/events.inc +++ /dev/null @@ -1,79 +0,0 @@ -Route110_EventObjects: - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF338, 0 - object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 14, 69, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route110_EventScript_1EF326, 0 - object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF314, 0 - object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 10, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF31D, 0 - object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route110_EventScript_1EF30B, 0 - object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF302, 0 - object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 2, 14, 1, 3, Route110_EventScript_1EF529, 0 - object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 31, 4, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 1, 1, 3, Route110_EventScript_1EF4B0, 0 - object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 31, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route110_EventScript_1EF540, 0 - object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 55, 4, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 4, 1, 3, Route110_EventScript_1EF4C7, 0 - object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 3, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0 - object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_EventScript_1EF409, 0 - object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 34, 40, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 1, 4, Route110_EventScript_1EF420, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_EventScript_1EF482, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 16, BerryTreeScript, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 17, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 18, BerryTreeScript, 0 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D81, FLAG_ITEM_ROUTE_110_DIRE_HIT - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D74, FLAG_ITEM_ROUTE_109_RARE_CANDY - object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0 - object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2AA, FLAG_HIDE_ROUTE_110_TEAM_AQUA - object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2C0, FLAG_HIDE_ROUTE_110_TEAM_AQUA - object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2D6, FLAG_HIDE_ROUTE_110_TEAM_AQUA - object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2EC, FLAG_HIDE_ROUTE_110_TEAM_AQUA - object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 82, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_TEAM_AQUA - object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 7, 1, 1, 2, Route110_EventScript_1EF499, 0 - object_event 28, EVENT_OBJ_GFX_VAR_0, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_RIVAL_1 - object_event 29, EVENT_OBJ_GFX_VAR_3, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_RIVAL_2 - object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route110_EventScript_1EF604, 0 - object_event 31, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 76, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0 - object_event 32, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 76, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route110_EventScript_1EF61C, 0 - object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 10, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, Route110_EventScript_1EF64A, 0 - object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 36, 40, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 3, Route110_EventScript_1EF633, 0 - object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_EventScript_290D8E, FLAG_ITEM_ROUTE_110_ELIXIR - object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_BIRCH - -Route110_MapWarps: - warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE - warp_def 11, 66, 0, 0, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 15, 16, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE - warp_def 18, 16, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE - warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE - warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE - -Route110_MapCoordEvents: - coord_event 28, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661 - coord_event 29, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661 - coord_event 33, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF74D - coord_event 34, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF758 - coord_event 35, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF763 - coord_event 7, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9CB - coord_event 8, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9D6 - coord_event 9, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9E1 - coord_event 10, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9EC - -Route110_MapBGEvents: - bg_event 15, 25, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF353 - bg_event 9, 51, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF365 - bg_event 14, 88, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A - bg_event 20, 94, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF341 - bg_event 7, 79, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF35C - bg_event 3, 17, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF36E - bg_secret_base_event 16, 25, 0, SECRET_BASE_TREE3_1 - bg_secret_base_event 17, 25, 0, SECRET_BASE_TREE4_1 - bg_event 33, 39, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF377 - bg_event 37, 70, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF380 - bg_event 8, 67, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF389 - bg_event 32, 93, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF392 - bg_hidden_item_event 35, 39, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE - bg_hidden_item_event 33, 45, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_ROUTE_110_GREAT_BALL - bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL - bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL - bg_event 13, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A - -Route110_MapEvents:: - map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents - diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc deleted file mode 100644 index 5edb81ec43..0000000000 --- a/data/maps/Route110/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110: - .4byte Route110_Layout - .4byte Route110_MapEvents - .4byte Route110_MapScripts - .4byte Route110_MapConnections - .2byte MUS_DOORO_X1 - .2byte LAYOUT_ROUTE110 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json new file mode 100644 index 0000000000..1891b89f78 --- /dev/null +++ b/data/maps/Route110/map.json @@ -0,0 +1,765 @@ +{ + "id": "MAP_ROUTE110", + "name": "Route110", + "layout": "LAYOUT_ROUTE110", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_MAUVILLE_CITY" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_SLATEPORT_CITY" + }, + { + "direction": "left", + "offset": 60, + "map": "MAP_ROUTE103" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 17, + "y": 90, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF338", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 29, + "y": 79, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF32F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 14, + "y": 69, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF326", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 9, + "y": 57, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF314", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 10, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF31D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "x": 27, + "y": 24, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF30B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 15, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF302", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "x": 16, + "y": 73, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT", + "movement_range_x": 2, + "movement_range_y": 14, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route110_EventScript_1EF529", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 19, + "y": 31, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", + "movement_range_x": 10, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route110_EventScript_1EF4B0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "x": 30, + "y": 31, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route110_EventScript_1EF540", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 16, + "y": 55, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", + "movement_range_x": 4, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route110_EventScript_1EF4C7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 3, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route110_EventScript_1EF3F2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 33, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_EventScript_1EF409", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 34, + "y": 40, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route110_EventScript_1EF420", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 10, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_EventScript_1EF482", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 16, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 6, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 17, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 7, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 18, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 30, + "y": 69, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_290D81", + "flag": "FLAG_ITEM_ROUTE_110_DIRE_HIT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 26, + "y": 47, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_290D74", + "flag": "FLAG_ITEM_ROUTE_109_RARE_CANDY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 27, + "y": 92, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF3B7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 7, + "y": 83, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF2AA", + "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 8, + "y": 83, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF2C0", + "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 9, + "y": 83, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF2D6", + "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 10, + "y": 83, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF2EC", + "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 8, + "y": 82, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 21, + "y": 78, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", + "movement_range_x": 7, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_EventScript_1EF499", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 34, + "y": 54, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_110_RIVAL_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 34, + "y": 54, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_110_RIVAL_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 33, + "y": 69, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route110_EventScript_1EF604", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 10, + "y": 76, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_EventScript_1EF5A2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 7, + "y": 76, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_EventScript_1EF61C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "x": 10, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route110_EventScript_1EF64A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 36, + "y": 40, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route110_EventScript_1EF633", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 38, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_290D8E", + "flag": "FLAG_ITEM_ROUTE_110_ELIXIR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 9, + "y": 79, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_110_BIRCH" + } + ], + "warp_events": [ + { + "x": 35, + "y": 24, + "elevation": 3, + "dest_map": "MAP_NEW_MAUVILLE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 66, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 16, + "elevation": 0, + "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 16, + "elevation": 0, + "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 16, + "y": 88, + "elevation": 0, + "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 88, + "elevation": 0, + "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE", + "dest_warp_id": 2 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 28, + "y": 92, + "elevation": 3, + "var": "VAR_CYCLING_CHALLENGE_STATE", + "var_value": 2, + "script": "Route110_EventScript_1EF661" + }, + { + "type": "trigger", + "x": 29, + "y": 92, + "elevation": 3, + "var": "VAR_CYCLING_CHALLENGE_STATE", + "var_value": 2, + "script": "Route110_EventScript_1EF661" + }, + { + "type": "trigger", + "x": 33, + "y": 56, + "elevation": 3, + "var": "VAR_0x4069", + "var_value": 0, + "script": "Route110_EventScript_1EF74D" + }, + { + "type": "trigger", + "x": 34, + "y": 56, + "elevation": 3, + "var": "VAR_0x4069", + "var_value": 0, + "script": "Route110_EventScript_1EF758" + }, + { + "type": "trigger", + "x": 35, + "y": 56, + "elevation": 3, + "var": "VAR_0x4069", + "var_value": 0, + "script": "Route110_EventScript_1EF763" + }, + { + "type": "trigger", + "x": 7, + "y": 85, + "elevation": 3, + "var": "VAR_0x40DA", + "var_value": 1, + "script": "Route110_EventScript_1EF9CB" + }, + { + "type": "trigger", + "x": 8, + "y": 85, + "elevation": 3, + "var": "VAR_0x40DA", + "var_value": 1, + "script": "Route110_EventScript_1EF9D6" + }, + { + "type": "trigger", + "x": 9, + "y": 85, + "elevation": 3, + "var": "VAR_0x40DA", + "var_value": 1, + "script": "Route110_EventScript_1EF9E1" + }, + { + "type": "trigger", + "x": 10, + "y": 85, + "elevation": 3, + "var": "VAR_0x40DA", + "var_value": 1, + "script": "Route110_EventScript_1EF9EC" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 15, + "y": 25, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF353" + }, + { + "type": "sign", + "x": 9, + "y": 51, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF365" + }, + { + "type": "sign", + "x": 14, + "y": 88, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF34A" + }, + { + "type": "sign", + "x": 20, + "y": 94, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF341" + }, + { + "type": "sign", + "x": 7, + "y": 79, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF35C" + }, + { + "type": "sign", + "x": 3, + "y": 17, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF36E" + }, + { + "type": "secret_base", + "x": 16, + "y": 25, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE3_1" + }, + { + "type": "secret_base", + "x": 17, + "y": 25, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE4_1" + }, + { + "type": "sign", + "x": 33, + "y": 39, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF377" + }, + { + "type": "sign", + "x": 37, + "y": 70, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF380" + }, + { + "type": "sign", + "x": 8, + "y": 67, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF389" + }, + { + "type": "sign", + "x": 32, + "y": 93, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF392" + }, + { + "type": "hidden_item", + "x": 35, + "y": 39, + "elevation": 3, + "item": "ITEM_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE" + }, + { + "type": "hidden_item", + "x": 33, + "y": 45, + "elevation": 3, + "item": "ITEM_GREAT_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_110_GREAT_BALL" + }, + { + "type": "hidden_item", + "x": 4, + "y": 35, + "elevation": 3, + "item": "ITEM_POKE_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL" + }, + { + "type": "hidden_item", + "x": 37, + "y": 67, + "elevation": 3, + "item": "ITEM_FULL_HEAL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL" + }, + { + "type": "sign", + "x": 13, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF34A" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc deleted file mode 100644 index f9050259c1..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route110_SeasideCyclingRoadNorthEntrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78, 0 - -Route110_SeasideCyclingRoadNorthEntrance_MapWarps: - warp_def 1, 5, 0, 4, MAP_ROUTE110 - warp_def 2, 5, 0, 4, MAP_ROUTE110 - warp_def 12, 5, 0, 5, MAP_ROUTE110 - warp_def 13, 5, 0, 5, MAP_ROUTE110 - -Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents: - coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84 - coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6 - -Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: - map_events Route110_SeasideCyclingRoadNorthEntrance_EventObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0 - diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc deleted file mode 100644 index 008df77af3..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_SeasideCyclingRoadNorthEntrance: - .4byte Route110_SeasideCyclingRoadEntrance_Layout - .4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents - .4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json new file mode 100644 index 0000000000..119d5b55cb --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE", + "name": "Route110_SeasideCyclingRoadNorthEntrance", + "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 4 + }, + { + "x": 2, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 4 + }, + { + "x": 12, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 5 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 5 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 7, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84" + }, + { + "type": "trigger", + "x": 5, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 1, + "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc deleted file mode 100644 index f64836526e..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route110_SeasideCyclingRoadSouthEntrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4, 0 - -Route110_SeasideCyclingRoadSouthEntrance_MapWarps: - warp_def 1, 5, 0, 2, MAP_ROUTE110 - warp_def 2, 5, 0, 2, MAP_ROUTE110 - warp_def 12, 5, 0, 3, MAP_ROUTE110 - warp_def 13, 5, 0, 3, MAP_ROUTE110 - -Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents: - coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0 - coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13 - -Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: - map_events Route110_SeasideCyclingRoadSouthEntrance_EventObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0 - diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc deleted file mode 100644 index be2646ee27..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_SeasideCyclingRoadSouthEntrance: - .4byte Route110_SeasideCyclingRoadEntrance_Layout - .4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents - .4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json new file mode 100644 index 0000000000..c5c63def13 --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE", + "name": "Route110_SeasideCyclingRoadSouthEntrance", + "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 2 + }, + { + "x": 2, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 3 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 3 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 7, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0" + }, + { + "type": "trigger", + "x": 5, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 1, + "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHouseCorridor/events.inc b/data/maps/Route110_TrickHouseCorridor/events.inc deleted file mode 100644 index 814e46cbe9..0000000000 --- a/data/maps/Route110_TrickHouseCorridor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route110_TrickHouseCorridor_MapWarps: - warp_def 13, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END - warp_def 14, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END - warp_def 4, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 5, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - -Route110_TrickHouseCorridor_MapEvents:: - map_events 0x0, Route110_TrickHouseCorridor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc deleted file mode 100644 index 2a60d20d8f..0000000000 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHouseCorridor: - .4byte Route110_TrickHouseCorridor_Layout - .4byte Route110_TrickHouseCorridor_MapEvents - .4byte Route110_TrickHouseCorridor_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHouseCorridor/map.json b/data/maps/Route110_TrickHouseCorridor/map.json new file mode 100644 index 0000000000..a488e96613 --- /dev/null +++ b/data/maps/Route110_TrickHouseCorridor/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_CORRIDOR", + "name": "Route110_TrickHouseCorridor", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 13, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 23, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 23, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc deleted file mode 100644 index 82088646e1..0000000000 --- a/data/maps/Route110_TrickHouseEnd/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route110_TrickHouseEnd_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, FLAG_HIDE_TRICK_HOUSE_END_MAN - -Route110_TrickHouseEnd_MapWarps: - warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 - warp_def 2, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_CORRIDOR - -Route110_TrickHouseEnd_MapCoordEvents: - coord_event 2, 2, 3, VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26B041 - -Route110_TrickHouseEnd_MapBGEvents: - bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET - -Route110_TrickHouseEnd_MapEvents:: - map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents - diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc deleted file mode 100644 index 0c2dfac3ad..0000000000 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHouseEnd: - .4byte Route110_TrickHouseEnd_Layout - .4byte Route110_TrickHouseEnd_MapEvents - .4byte Route110_TrickHouseEnd_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_END - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json new file mode 100644 index 0000000000..dafcec8a67 --- /dev/null +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_END", + "name": "Route110_TrickHouseEnd", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_END", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHouseEnd_EventScript_26AD17", + "flag": "FLAG_HIDE_TRICK_HOUSE_END_MAN" + } + ], + "warp_events": [ + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1", + "dest_warp_id": 2 + }, + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_CORRIDOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 2, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHouseEnd_EventScript_26B041" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 4, + "y": 5, + "elevation": 3, + "item": "ITEM_NUGGET", + "flag": "FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc deleted file mode 100644 index 791ecbbc54..0000000000 --- a/data/maps/Route110_TrickHouseEntrance/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route110_TrickHouseEntrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN - -Route110_TrickHouseEntrance_MapWarps: - warp_def 5, 7, 3, 1, MAP_ROUTE110 - warp_def 6, 7, 3, 1, MAP_ROUTE110 - warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 - -Route110_TrickHouseEntrance_MapCoordEvents: - coord_event 4, 7, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 - coord_event 5, 6, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 - coord_event 6, 6, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 - coord_event 7, 7, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 - -Route110_TrickHouseEntrance_MapBGEvents: - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, Route110_TrickHouseEntrance_EventScript_26A0D3 - -Route110_TrickHouseEntrance_MapEvents:: - map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents - diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc deleted file mode 100644 index 0f5f0aad59..0000000000 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHouseEntrance: - .4byte Route110_TrickHouseEntrance_Layout - .4byte Route110_TrickHouseEntrance_MapEvents - .4byte Route110_TrickHouseEntrance_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json new file mode 100644 index 0000000000..2f85d66c59 --- /dev/null +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "name": "Route110_TrickHouseEntrance", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHouseEntrance_EventScript_269D3B", + "flag": "FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 7, + "elevation": 3, + "var": "VAR_0x40A5", + "var_value": 0, + "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" + }, + { + "type": "trigger", + "x": 5, + "y": 6, + "elevation": 3, + "var": "VAR_0x40A5", + "var_value": 0, + "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" + }, + { + "type": "trigger", + "x": 6, + "y": 6, + "elevation": 3, + "var": "VAR_0x40A5", + "var_value": 0, + "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" + }, + { + "type": "trigger", + "x": 7, + "y": 7, + "elevation": 3, + "var": "VAR_0x40A5", + "var_value": 0, + "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "Route110_TrickHouseEntrance_EventScript_26A0D3" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc deleted file mode 100644 index 3a2bb131c6..0000000000 --- a/data/maps/Route110_TrickHousePuzzle1/events.inc +++ /dev/null @@ -1,28 +0,0 @@ -Route110_TrickHousePuzzle1_EventObjects: - object_event 1, EVENT_OBJ_GFX_LASS, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_13 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_12 - object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_14 - object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_17 - object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_16 - object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_15 - object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_19 - object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_18 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1B - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1C - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1E - -Route110_TrickHousePuzzle1_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle1_MapBGEvents: - bg_event 3, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle1_EventScript_26B92B - -Route110_TrickHousePuzzle1_MapEvents:: - map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc deleted file mode 100644 index 5835faa5fd..0000000000 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle1: - .4byte Route110_TrickHousePuzzle1_Layout - .4byte Route110_TrickHousePuzzle1_MapEvents - .4byte Route110_TrickHousePuzzle1_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json new file mode 100644 index 0000000000..283e867939 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -0,0 +1,247 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1", + "name": "Route110_TrickHousePuzzle1", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 14, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route110_TrickHousePuzzle1_EventScript_26B948", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 14, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_TrickHousePuzzle1_EventScript_26B95F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 2, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_TrickHousePuzzle1_EventScript_26B976", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 11, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 13, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 14, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_17" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 11, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_19" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 13, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_18" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_1B" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_29140E", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_1C" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 2, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_1E" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle1_EventScript_26B92B" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc deleted file mode 100644 index c56d53dea0..0000000000 --- a/data/maps/Route110_TrickHousePuzzle2/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -Route110_TrickHousePuzzle2_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 10, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL - -Route110_TrickHousePuzzle2_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle2_MapCoordEvents: - coord_event 11, 12, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle2_EventScript_26BBDD - coord_event 0, 4, 0, VAR_TEMP_2, 0, Route110_TrickHousePuzzle2_EventScript_26BBF0 - coord_event 14, 5, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle2_EventScript_26BC03 - coord_event 7, 11, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle2_EventScript_26BC16 - -Route110_TrickHousePuzzle2_MapBGEvents: - bg_event 14, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle2_EventScript_26BBC0 - -Route110_TrickHousePuzzle2_MapEvents:: - map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc deleted file mode 100644 index b957dac781..0000000000 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle2: - .4byte Route110_TrickHousePuzzle2_Layout - .4byte Route110_TrickHousePuzzle2_MapEvents - .4byte Route110_TrickHousePuzzle2_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json new file mode 100644 index 0000000000..0c49c00f27 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -0,0 +1,154 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE2", + "name": "Route110_TrickHousePuzzle2", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle2_EventScript_26BC75", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 10, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route110_TrickHousePuzzle2_EventScript_26BC8C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 11, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_TrickHousePuzzle2_EventScript_26BCA3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 8, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle2_EventScript_291428", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle2_EventScript_29141B", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 11, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle2_EventScript_26BBDD" + }, + { + "type": "trigger", + "x": 0, + "y": 4, + "elevation": 0, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle2_EventScript_26BBF0" + }, + { + "type": "trigger", + "x": 14, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle2_EventScript_26BC03" + }, + { + "type": "trigger", + "x": 7, + "y": 11, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle2_EventScript_26BC16" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle2_EventScript_26BBC0" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc deleted file mode 100644 index 6e3406753f..0000000000 --- a/data/maps/Route110_TrickHousePuzzle3/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -Route110_TrickHousePuzzle3_EventObjects: - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 7, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0 - object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, FLAG_TEMP_15 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, FLAG_TEMP_16 - -Route110_TrickHousePuzzle3_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle3_MapCoordEvents: - coord_event 4, 14, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle3_EventScript_26C4CD - coord_event 3, 11, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle3_EventScript_26C4D9 - coord_event 12, 5, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle3_EventScript_26C4E5 - coord_event 8, 2, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle3_EventScript_26C4F1 - -Route110_TrickHousePuzzle3_MapBGEvents: - bg_event 0, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle3_EventScript_26C5A7 - -Route110_TrickHousePuzzle3_MapEvents:: - map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc deleted file mode 100644 index b367f850e3..0000000000 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle3: - .4byte Route110_TrickHousePuzzle3_Layout - .4byte Route110_TrickHousePuzzle3_MapEvents - .4byte Route110_TrickHousePuzzle3_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json new file mode 100644 index 0000000000..8a60428d26 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -0,0 +1,180 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE3", + "name": "Route110_TrickHousePuzzle3", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 7, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_TrickHousePuzzle3_EventScript_26C5C4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle3_EventScript_26C5DB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle3_EventScript_26C5F2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_291442", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_291435", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 1, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 2, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_2907A6", + "flag": "FLAG_TEMP_16" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 14, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_26C4CD" + }, + { + "type": "trigger", + "x": 3, + "y": 11, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_26C4D9" + }, + { + "type": "trigger", + "x": 12, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_26C4E5" + }, + { + "type": "trigger", + "x": 8, + "y": 2, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_26C4F1" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 0, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle3_EventScript_26C5A7" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc deleted file mode 100644 index c2de17b66f..0000000000 --- a/data/maps/Route110_TrickHousePuzzle4/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -Route110_TrickHousePuzzle4_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_11 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_12 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_13 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_14 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_15 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_16 - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_17 - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_18 - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_19 - object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_1A - -Route110_TrickHousePuzzle4_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle4_MapBGEvents: - bg_event 14, 13, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle4_EventScript_26C861 - -Route110_TrickHousePuzzle4_MapEvents:: - map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc deleted file mode 100644 index 9f3f637b9f..0000000000 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle4: - .4byte Route110_TrickHousePuzzle4_Layout - .4byte Route110_TrickHousePuzzle4_MapEvents - .4byte Route110_TrickHousePuzzle4_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json new file mode 100644 index 0000000000..03a953310d --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -0,0 +1,234 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE4", + "name": "Route110_TrickHousePuzzle4", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle4_EventScript_26C87E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 14, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_TrickHousePuzzle4_EventScript_26C8AC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 2, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_TrickHousePuzzle4_EventScript_26C895", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_29144F", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 13, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_17" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 10, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_18" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 14, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_19" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 10, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_1A" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 13, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle4_EventScript_26C861" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc deleted file mode 100644 index 88eebe092d..0000000000 --- a/data/maps/Route110_TrickHousePuzzle5/events.inc +++ /dev/null @@ -1,42 +0,0 @@ -Route110_TrickHousePuzzle5_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0 - object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 14, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0 - object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 10, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0 - -Route110_TrickHousePuzzle5_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle5_MapCoordEvents: - coord_event 5, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBD7 - coord_event 4, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBE3 - coord_event 3, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBEF - coord_event 2, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBFB - coord_event 1, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC13 - coord_event 2, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC1F - coord_event 13, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC5B - coord_event 12, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC67 - coord_event 11, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC73 - coord_event 13, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CC97 - coord_event 12, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCA3 - coord_event 11, 4, 3, VAR_TEMP_5, 0, Route110_TrickHousePuzzle5_EventScript_26CCDF - coord_event 1, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CC07 - coord_event 3, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC2B - coord_event 4, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC37 - coord_event 5, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC43 - coord_event 6, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC4F - coord_event 10, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC7F - coord_event 9, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC8B - coord_event 11, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCAF - coord_event 10, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCBB - coord_event 9, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCC7 - -Route110_TrickHousePuzzle5_MapBGEvents: - bg_event 11, 21, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle5_EventScript_26CB15 - -Route110_TrickHousePuzzle5_MapEvents:: - map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc deleted file mode 100644 index e179a016a7..0000000000 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle5: - .4byte Route110_TrickHousePuzzle5_Layout - .4byte Route110_TrickHousePuzzle5_MapEvents - .4byte Route110_TrickHousePuzzle5_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json new file mode 100644 index 0000000000..6f995d5e9f --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -0,0 +1,316 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE5", + "name": "Route110_TrickHousePuzzle5", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 6, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CB32", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 0, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CB53", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 14, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CB74", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 14, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CB95", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 10, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CBB6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 5, + "y": 17, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CBD7" + }, + { + "type": "trigger", + "x": 4, + "y": 17, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CBE3" + }, + { + "type": "trigger", + "x": 3, + "y": 17, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CBEF" + }, + { + "type": "trigger", + "x": 2, + "y": 17, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CBFB" + }, + { + "type": "trigger", + "x": 1, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC13" + }, + { + "type": "trigger", + "x": 2, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC1F" + }, + { + "type": "trigger", + "x": 13, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC5B" + }, + { + "type": "trigger", + "x": 12, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC67" + }, + { + "type": "trigger", + "x": 11, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC73" + }, + { + "type": "trigger", + "x": 13, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC97" + }, + { + "type": "trigger", + "x": 12, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CCA3" + }, + { + "type": "trigger", + "x": 11, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_5", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CCDF" + }, + { + "type": "trigger", + "x": 1, + "y": 17, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC07" + }, + { + "type": "trigger", + "x": 3, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC2B" + }, + { + "type": "trigger", + "x": 4, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC37" + }, + { + "type": "trigger", + "x": 5, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC43" + }, + { + "type": "trigger", + "x": 6, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC4F" + }, + { + "type": "trigger", + "x": 10, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC7F" + }, + { + "type": "trigger", + "x": 9, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC8B" + }, + { + "type": "trigger", + "x": 11, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CCAF" + }, + { + "type": "trigger", + "x": 10, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CCBB" + }, + { + "type": "trigger", + "x": 9, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CCC7" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 11, + "y": 21, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle5_EventScript_26CB15" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc deleted file mode 100644 index 512164dba3..0000000000 --- a/data/maps/Route110_TrickHousePuzzle6/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -Route110_TrickHousePuzzle6_EventObjects: - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 7, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL - -Route110_TrickHousePuzzle6_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle6_MapBGEvents: - bg_event 0, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle6_EventScript_26DDC4 - -Route110_TrickHousePuzzle6_MapEvents:: - map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc deleted file mode 100644 index ec7a42d200..0000000000 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle6: - .4byte Route110_TrickHousePuzzle6_Layout - .4byte Route110_TrickHousePuzzle6_MapEvents - .4byte Route110_TrickHousePuzzle6_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json new file mode 100644 index 0000000000..b468e59be0 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -0,0 +1,104 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE6", + "name": "Route110_TrickHousePuzzle6", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 7, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle6_EventScript_26DDE1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route110_TrickHousePuzzle6_EventScript_26DDF8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle6_EventScript_26DE0F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 11, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle6_EventScript_29145C", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 0, + "y": 10, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle6_EventScript_26DDC4" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc deleted file mode 100644 index 4dff66e1c9..0000000000 --- a/data/maps/Route110_TrickHousePuzzle7/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -Route110_TrickHousePuzzle7_EventObjects: - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 20, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0 - object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 8, 17, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL - object_event 5, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0 - object_event 6, EVENT_OBJ_GFX_LASS, 0, 8, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0 - object_event 7, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0 - object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 17, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - -Route110_TrickHousePuzzle7_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - warp_def 13, 4, 0, 4, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 7, 3, 0, 3, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 13, 11, 0, 6, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 4, 3, 0, 5, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 1, 17, 0, 8, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 0, 11, 0, 7, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 2, 3, 0, 10, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 4, 13, 0, 9, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 1, 3, 0, 12, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 8, 12, 0, 11, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - -Route110_TrickHousePuzzle7_MapCoordEvents: - coord_event 8, 19, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E31B - coord_event 0, 14, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E331 - coord_event 6, 6, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E347 - coord_event 9, 7, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E35D - -Route110_TrickHousePuzzle7_MapBGEvents: - bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_26E1D0 - -Route110_TrickHousePuzzle7_MapEvents:: - map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc deleted file mode 100644 index ca21629e35..0000000000 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle7: - .4byte Route110_TrickHousePuzzle7_Layout - .4byte Route110_TrickHousePuzzle7_MapEvents - .4byte Route110_TrickHousePuzzle7_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json new file mode 100644 index 0000000000..e21657b67c --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -0,0 +1,276 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "name": "Route110_TrickHousePuzzle7", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 9, + "y": 20, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle7_EventScript_26E389", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle7_EventScript_26E3B7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 8, + "y": 17, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle7_EventScript_26E3A0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle7_EventScript_291469", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle7_EventScript_26E3E5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 8, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle7_EventScript_26E3CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 9, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle7_EventScript_26E3FC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 4, + "y": 17, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 4, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 4, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 4 + }, + { + "x": 7, + "y": 3, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 3 + }, + { + "x": 13, + "y": 11, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 3, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 5 + }, + { + "x": 1, + "y": 17, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 8 + }, + { + "x": 0, + "y": 11, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 7 + }, + { + "x": 2, + "y": 3, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 10 + }, + { + "x": 4, + "y": 13, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 9 + }, + { + "x": 1, + "y": 3, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 12 + }, + { + "x": 8, + "y": 12, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 11 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 8, + "y": 19, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle7_EventScript_26E31B" + }, + { + "type": "trigger", + "x": 0, + "y": 14, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle7_EventScript_26E331" + }, + { + "type": "trigger", + "x": 6, + "y": 6, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle7_EventScript_26E347" + }, + { + "type": "trigger", + "x": 9, + "y": 7, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle7_EventScript_26E35D" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 6, + "y": 17, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle7_EventScript_26E1D0" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc deleted file mode 100644 index 2ccba5addd..0000000000 --- a/data/maps/Route110_TrickHousePuzzle8/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -Route110_TrickHousePuzzle8_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL - -Route110_TrickHousePuzzle8_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 0, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle8_MapBGEvents: - bg_event 3, 21, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle8_EventScript_26E802 - -Route110_TrickHousePuzzle8_MapEvents:: - map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc deleted file mode 100644 index 1bf3fbb1cb..0000000000 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle8: - .4byte Route110_TrickHousePuzzle8_Layout - .4byte Route110_TrickHousePuzzle8_MapEvents - .4byte Route110_TrickHousePuzzle8_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json new file mode 100644 index 0000000000..0232237404 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -0,0 +1,104 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE8", + "name": "Route110_TrickHousePuzzle8", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 1, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle8_EventScript_26E81F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle8_EventScript_26E84D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 8, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle8_EventScript_26E836", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle8_EventScript_291476", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 21, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle8_EventScript_26E802" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route111/connections.inc b/data/maps/Route111/connections.inc deleted file mode 100644 index 25e4099761..0000000000 --- a/data/maps/Route111/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route111_MapConnectionsList: - connection down, 0, MAP_MAUVILLE_CITY - connection left, 0, MAP_ROUTE113 - connection left, 20, MAP_ROUTE112 - -Route111_MapConnections: - .4byte 3 - .4byte Route111_MapConnectionsList - diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc deleted file mode 100644 index 703c9a6627..0000000000 --- a/data/maps/Route111/events.inc +++ /dev/null @@ -1,114 +0,0 @@ -Route111_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1F0FC5, FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE - object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE - object_event 4, EVENT_OBJ_GFX_EXPERT_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE - object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F121B, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 19, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 20, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_MAN_3, 0, 8, 91, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_1F1189, 0 - object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 29, 37, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F1204, 0 - object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 2, 2, 1, 2, Route111_EventScript_1F1260, 0 - object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route111_EventScript_1F1232, 0 - object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 66, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route111_EventScript_1F1249, 0 - object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDF6, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 - object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDD6, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, FLAG_TEMP_12 - object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 104, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290D9B, FLAG_ITEM_ROUTE_111_TM_37 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 80, BerryTreeScript, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 81, BerryTreeScript, 0 - object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CE96, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 - object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CEB6, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 - object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF16, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 - object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF36, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 - object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DA8, FLAG_ITEM_ROUTE_111_STARDUST - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DB5, FLAG_ITEM_ROUTE_111_HP_UP - object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2906BB, FLAG_TEMP_13 - object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0 - object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0 - object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0 - object_event 31, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 4, 0, 1, 4, Route111_EventScript_1F1369, 0 - object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 9, 27, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F1307, 0 - object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_2765FF, FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN - object_event 34, EVENT_OBJ_GFX_MAN_4, 0, 20, 114, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_1F1192, 0 - object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 26, 132, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route111_EventScript_1F13F9, 0 - object_event 36, EVENT_OBJ_GFX_WOMAN_2, 0, 20, 132, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, Route111_EventScript_1F1410, 0 - object_event 37, EVENT_OBJ_GFX_PICNICKER, 0, 19, 121, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route111_EventScript_1F13E2, 0 - object_event 38, EVENT_OBJ_GFX_MAN_5, 0, 16, 119, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route111_EventScript_1F13CB, 0 - object_event 39, EVENT_OBJ_GFX_HIKER, 0, 29, 77, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 7, Route111_EventScript_1F143E, 0 - object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 22, 77, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, Route111_EventScript_1F1427, 0 - object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 37, 77, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, Route111_EventScript_1F1455, 0 - object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 118, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route111_EventScript_290DC2, FLAG_ITEM_ROUTE_111_ELIXIR - object_event 43, EVENT_OBJ_GFX_HIKER, 0, 14, 56, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 0, 0, Route111_EventScript_1F119B, 0 - object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 20, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_DESERT_FOSSIL - object_event 45, EVENT_OBJ_GFX_VAR_0, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_PLAYER_DESCENT - object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_1F11E4, FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY - -Route111_MapWarps: - warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE - warp_def 29, 87, 0, 0, MAP_DESERT_RUINS - warp_def 26, 18, 0, 0, MAP_ROUTE111_OLD_LADYS_REST_STOP - warp_def 19, 58, 0, 0, MAP_MIRAGE_TOWER_1F - warp_def 31, 113, 0, 0, MAP_TRAINER_HILL_ENTRANCE - -Route111_MapCoordEvents: - coord_event 12, 62, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 11, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A - coord_event 12, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A - coord_event 13, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A - coord_event 7, 63, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 12, 44, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 - coord_event 13, 43, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 - coord_event 14, 42, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 - coord_event 16, 40, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 - coord_event 14, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A - coord_event 18, 32, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 17, 31, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 9, 37, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 10, 36, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 17, 39, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 - coord_event 18, 38, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 - coord_event 8, 64, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 9, 65, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 10, 65, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 11, 66, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 12, 67, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 13, 68, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 14, 69, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 10, 61, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 11, 62, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 13, 62, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 14, 62, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 17, 38, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 16, 39, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 15, 40, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 14, 41, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 13, 42, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 12, 43, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 11, 44, 3, 0, 0, Route111_EventScript_1F0FBD - -Route111_MapBGEvents: - bg_event 16, 114, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F115C - bg_event 24, 126, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1153 - bg_event 7, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1165 - bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F116E - bg_secret_base_event 24, 36, 0, SECRET_BASE_YELLOW_CAVE2_1 - bg_secret_base_event 34, 50, 0, SECRET_BASE_YELLOW_CAVE3_1 - bg_secret_base_event 33, 34, 0, SECRET_BASE_YELLOW_CAVE1_1 - bg_event 25, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1177 - bg_secret_base_event 35, 1, 0, SECRET_BASE_RED_CAVE2_3 - bg_secret_base_event 35, 31, 0, SECRET_BASE_YELLOW_CAVE4_3 - bg_hidden_item_event 26, 70, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST - bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4_3 - bg_event 7, 84, 3, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1180 - bg_secret_base_event 14, 19, 0, SECRET_BASE_TREE1_4 - bg_secret_base_event 13, 19, 0, SECRET_BASE_TREE1_1 - bg_hidden_item_event 19, 55, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ROUTE_111_PROTEIN - bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY - bg_event 24, 116, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F146C - -Route111_MapEvents:: - map_events Route111_EventObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents - diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc deleted file mode 100644 index 2ec5fc6edf..0000000000 --- a/data/maps/Route111/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route111: - .4byte Route111_Layout - .4byte Route111_MapEvents - .4byte Route111_MapScripts - .4byte Route111_MapConnections - .2byte MUS_DOORO_X1 - .2byte LAYOUT_ROUTE111 - .byte MAPSEC_ROUTE_111 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json new file mode 100644 index 0000000000..6e2bdf18a0 --- /dev/null +++ b/data/maps/Route111/map.json @@ -0,0 +1,1115 @@ +{ + "id": "MAP_ROUTE111", + "name": "Route111", + "layout": "LAYOUT_ROUTE111", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_111", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_MAUVILLE_CITY" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE113" + }, + { + "direction": "left", + "offset": 20, + "map": "MAP_ROUTE112" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 13, + "y": 114, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_1F0FC5", + "flag": "FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 13, + "y": 113, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 13, + "y": 113, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 13, + "y": 113, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 28, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route111_EventScript_1F121B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 22, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 19, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 23, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 20, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 8, + "y": 91, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_1F1189", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 29, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route111_EventScript_1F1204", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 27, + "y": 69, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route111_EventScript_1F1260", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 21, + "y": 47, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route111_EventScript_1F1232", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 32, + "y": 66, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route111_EventScript_1F1249", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 14, + "y": 86, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_28CDF6", + "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 13, + "y": 86, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_28CDD6", + "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 18, + "y": 101, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 19, + "y": 100, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_2907A6", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 23, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_1F0EB9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 33, + "y": 104, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_290D9B", + "flag": "FLAG_ITEM_ROUTE_111_TM_37" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 18, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 80, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 19, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 81, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 13, + "y": 86, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_28CE96", + "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 14, + "y": 86, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_28CEB6", + "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 13, + "y": 86, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_28CF16", + "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 14, + "y": 86, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_28CF36", + "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 12, + "y": 54, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_290DA8", + "flag": "FLAG_ITEM_ROUTE_111_STARDUST" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 114, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_290DB5", + "flag": "FLAG_ITEM_ROUTE_111_HP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 22, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_2906BB", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 10, + "y": 82, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route111_EventScript_1F12D9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 11, + "y": 71, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route111_EventScript_1F12C2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 32, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route111_EventScript_1F12F0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 11, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 4, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route111_EventScript_1F1369", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 9, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route111_EventScript_1F1307", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 13, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_2765FF", + "flag": "FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 20, + "y": 114, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_1F1192", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 26, + "y": 132, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route111_EventScript_1F13F9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 20, + "y": 132, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route111_EventScript_1F1410", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 19, + "y": 121, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route111_EventScript_1F13E2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 16, + "y": 119, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route111_EventScript_1F13CB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 29, + "y": 77, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route111_EventScript_1F143E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 22, + "y": 77, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route111_EventScript_1F1427", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 37, + "y": 77, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route111_EventScript_1F1455", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 19, + "y": 118, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_290DC2", + "flag": "FLAG_ITEM_ROUTE_111_ELIXIR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 14, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_1F119B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "x": 20, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_111_DESERT_FOSSIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 19, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_111_PLAYER_DESCENT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 19, + "y": 101, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_1F11E4", + "flag": "FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY" + } + ], + "warp_events": [ + { + "x": 13, + "y": 113, + "elevation": 0, + "dest_map": "MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 87, + "elevation": 0, + "dest_map": "MAP_DESERT_RUINS", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 18, + "elevation": 0, + "dest_map": "MAP_ROUTE111_OLD_LADYS_REST_STOP", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 58, + "elevation": 0, + "dest_map": "MAP_MIRAGE_TOWER_1F", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 113, + "elevation": 0, + "dest_map": "MAP_TRAINER_HILL_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 12, + "y": 62, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 11, + "y": 61, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F0A" + }, + { + "type": "trigger", + "x": 12, + "y": 61, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F0A" + }, + { + "type": "trigger", + "x": 13, + "y": 61, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F0A" + }, + { + "type": "trigger", + "x": 7, + "y": 63, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 12, + "y": 44, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F16" + }, + { + "type": "trigger", + "x": 13, + "y": 43, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F16" + }, + { + "type": "trigger", + "x": 14, + "y": 42, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F16" + }, + { + "type": "trigger", + "x": 16, + "y": 40, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F16" + }, + { + "type": "trigger", + "x": 14, + "y": 61, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F0A" + }, + { + "type": "trigger", + "x": 18, + "y": 32, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 17, + "y": 31, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 9, + "y": 37, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 10, + "y": 36, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 17, + "y": 39, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F16" + }, + { + "type": "trigger", + "x": 18, + "y": 38, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F16" + }, + { + "type": "trigger", + "x": 8, + "y": 64, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 9, + "y": 65, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 10, + "y": 65, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 11, + "y": 66, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 12, + "y": 67, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 13, + "y": 68, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 14, + "y": 69, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 10, + "y": 61, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 11, + "y": 62, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 13, + "y": 62, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 14, + "y": 62, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 17, + "y": 38, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 16, + "y": 39, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 15, + "y": 40, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 14, + "y": 41, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 13, + "y": 42, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 12, + "y": 43, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 11, + "y": 44, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 16, + "y": 114, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F115C" + }, + { + "type": "sign", + "x": 24, + "y": 126, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F1153" + }, + { + "type": "sign", + "x": 7, + "y": 66, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F1165" + }, + { + "type": "sign", + "x": 13, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F116E" + }, + { + "type": "secret_base", + "x": 24, + "y": 36, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE2_1" + }, + { + "type": "secret_base", + "x": 34, + "y": 50, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE3_1" + }, + { + "type": "secret_base", + "x": 33, + "y": 34, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE1_1" + }, + { + "type": "sign", + "x": 25, + "y": 19, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F1177" + }, + { + "type": "secret_base", + "x": 35, + "y": 1, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE2_3" + }, + { + "type": "secret_base", + "x": 35, + "y": 31, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE4_3" + }, + { + "type": "hidden_item", + "x": 26, + "y": 70, + "elevation": 0, + "item": "ITEM_STARDUST", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST" + }, + { + "type": "secret_base", + "x": 27, + "y": 27, + "elevation": 3, + "secret_base_id": "SECRET_BASE_RED_CAVE4_3" + }, + { + "type": "sign", + "x": 7, + "y": 84, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F1180" + }, + { + "type": "secret_base", + "x": 14, + "y": 19, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE1_4" + }, + { + "type": "secret_base", + "x": 13, + "y": 19, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE1_1" + }, + { + "type": "hidden_item", + "x": 19, + "y": 55, + "elevation": 0, + "item": "ITEM_PROTEIN", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_111_PROTEIN" + }, + { + "type": "hidden_item", + "x": 35, + "y": 66, + "elevation": 0, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY" + }, + { + "type": "sign", + "x": 24, + "y": 116, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F146C" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index c89fcb3dc3..75de7dce74 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -97,7 +97,7 @@ Route111_EventScript_1F0E26:: @ 81F0E26 end Route111_EventScript_1F0E3C:: @ 81F0E3C - setmaplayoutindex 392 + setmaplayoutindex LAYOUT_ROUTE111_NO_MIRAGE_TOWER return Route111_EventScript_1F0E40:: @ 81F0E40 diff --git a/data/maps/Route111_OldLadysRestStop/events.inc b/data/maps/Route111_OldLadysRestStop/events.inc deleted file mode 100644 index fbdd2e5ddd..0000000000 --- a/data/maps/Route111_OldLadysRestStop/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route111_OldLadysRestStop_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0 - -Route111_OldLadysRestStop_MapWarps: - warp_def 3, 7, 0, 2, MAP_ROUTE111 - warp_def 4, 7, 0, 2, MAP_ROUTE111 - -Route111_OldLadysRestStop_MapEvents:: - map_events Route111_OldLadysRestStop_EventObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc deleted file mode 100644 index 9b2633050c..0000000000 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route111_OldLadysRestStop: - .4byte House3_Layout - .4byte Route111_OldLadysRestStop_MapEvents - .4byte Route111_OldLadysRestStop_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE3 - .byte MAPSEC_ROUTE_111 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json new file mode 100644 index 0000000000..d4e77fddac --- /dev/null +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_ROUTE111_OLD_LADYS_REST_STOP", + "name": "Route111_OldLadysRestStop", + "layout": "LAYOUT_HOUSE3", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_111", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_OldLadysRestStop_EventScript_22A920", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route111_WinstrateFamilysHouse/events.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc deleted file mode 100644 index b433e1198e..0000000000 --- a/data/maps/Route111_WinstrateFamilysHouse/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route111_WinstrateFamilysHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0 - object_event 4, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0 - -Route111_WinstrateFamilysHouse_MapWarps: - warp_def 3, 7, 0, 0, MAP_ROUTE111 - warp_def 4, 7, 0, 0, MAP_ROUTE111 - -Route111_WinstrateFamilysHouse_MapEvents:: - map_events Route111_WinstrateFamilysHouse_EventObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc deleted file mode 100644 index d37a62e00a..0000000000 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route111_WinstrateFamilysHouse: - .4byte House2_Layout - .4byte Route111_WinstrateFamilysHouse_MapEvents - .4byte Route111_WinstrateFamilysHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_ROUTE_111 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json new file mode 100644 index 0000000000..d41cc1214a --- /dev/null +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE", + "name": "Route111_WinstrateFamilysHouse", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_111", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_WinstrateFamilysHouse_EventScript_22A4E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_WinstrateFamilysHouse_EventScript_22A48D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_WinstrateFamilysHouse_EventScript_22A4A2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_WinstrateFamilysHouse_EventScript_22A4FD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route112/connections.inc b/data/maps/Route112/connections.inc deleted file mode 100644 index 0fc8da215d..0000000000 --- a/data/maps/Route112/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route112_MapConnectionsList: - connection up, -60, MAP_ROUTE113 - connection left, 40, MAP_LAVARIDGE_TOWN - connection right, -20, MAP_ROUTE111 - -Route112_MapConnections: - .4byte 3 - .4byte Route112_MapConnectionsList - diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc deleted file mode 100644 index 4d1b338c3a..0000000000 --- a/data/maps/Route112/events.inc +++ /dev/null @@ -1,32 +0,0 @@ -Route112_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0 - object_event 5, EVENT_OBJ_GFX_HIKER, 0, 15, 40, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 24, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 23, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 22, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 21, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 0, 0, Route112_EventScript_1F1E61, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route112_EventScript_290DCF, FLAG_ITEM_ROUTE_112_NUGGET - object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 31, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0 - -Route112_MapWarps: - warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION - warp_def 29, 27, 0, 1, MAP_ROUTE112_CABLE_CAR_STATION - warp_def 6, 46, 3, 0, MAP_JAGGED_PASS - warp_def 7, 46, 3, 1, MAP_JAGGED_PASS - warp_def 11, 36, 0, 0, MAP_FIERY_PATH - warp_def 22, 10, 0, 1, MAP_FIERY_PATH - -Route112_MapBGEvents: - bg_event 19, 44, 3, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E4F - bg_event 22, 37, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E46 - bg_event 4, 49, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E58 - -Route112_MapEvents:: - map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents - diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc deleted file mode 100644 index 1cc8583a5b..0000000000 --- a/data/maps/Route112/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route112: - .4byte Route112_Layout - .4byte Route112_MapEvents - .4byte Route112_MapScripts - .4byte Route112_MapConnections - .2byte MUS_DOORO_X1 - .2byte LAYOUT_ROUTE112 - .byte MAPSEC_ROUTE_112 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json new file mode 100644 index 0000000000..937719abff --- /dev/null +++ b/data/maps/Route112/map.json @@ -0,0 +1,287 @@ +{ + "id": "MAP_ROUTE112", + "name": "Route112", + "layout": "LAYOUT_ROUTE112", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_112", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": -60, + "map": "MAP_ROUTE113" + }, + { + "direction": "left", + "offset": 40, + "map": "MAP_LAVARIDGE_TOWN" + }, + { + "direction": "right", + "offset": -20, + "map": "MAP_ROUTE111" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 26, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route112_EventScript_1F1DB7", + "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 24, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route112_EventScript_1F1E6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 29, + "y": 49, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1EE3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 22, + "y": 46, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1EFA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 15, + "y": 40, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1E81", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 27, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route112_EventScript_1F1DB7", + "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 27, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 24, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 28, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 23, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 29, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 22, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 30, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 21, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 8, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route112_EventScript_1F1E61", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 14, + "y": 43, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route112_EventScript_290DCF", + "flag": "FLAG_ITEM_ROUTE_112_NUGGET" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 31, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1F11", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 31, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1F28", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 28, + "y": 27, + "elevation": 0, + "dest_map": "MAP_ROUTE112_CABLE_CAR_STATION", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 27, + "elevation": 0, + "dest_map": "MAP_ROUTE112_CABLE_CAR_STATION", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 46, + "elevation": 3, + "dest_map": "MAP_JAGGED_PASS", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 46, + "elevation": 3, + "dest_map": "MAP_JAGGED_PASS", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 36, + "elevation": 0, + "dest_map": "MAP_FIERY_PATH", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 10, + "elevation": 0, + "dest_map": "MAP_FIERY_PATH", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 19, + "y": 44, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route112_EventScript_1F1E4F" + }, + { + "type": "sign", + "x": 22, + "y": 37, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route112_EventScript_1F1E46" + }, + { + "type": "sign", + "x": 4, + "y": 49, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route112_EventScript_1F1E58" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route112_CableCarStation/events.inc b/data/maps/Route112_CableCarStation/events.inc deleted file mode 100644 index 4b51decda7..0000000000 --- a/data/maps/Route112_CableCarStation/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route112_CableCarStation_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 - -Route112_CableCarStation_MapWarps: - warp_def 6, 11, 0, 0, MAP_ROUTE112 - warp_def 7, 11, 0, 1, MAP_ROUTE112 - -Route112_CableCarStation_MapEvents:: - map_events Route112_CableCarStation_EventObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc deleted file mode 100644 index f1a00b968d..0000000000 --- a/data/maps/Route112_CableCarStation/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route112_CableCarStation: - .4byte CableCarStation_Layout - .4byte Route112_CableCarStation_MapEvents - .4byte Route112_CableCarStation_MapScripts - .4byte 0x0 - .2byte MUS_DOORO_X1 - .2byte LAYOUT_CABLE_CAR_STATION - .byte MAPSEC_ROUTE_112 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json new file mode 100644 index 0000000000..8552ec139a --- /dev/null +++ b/data/maps/Route112_CableCarStation/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_ROUTE112_CABLE_CAR_STATION", + "name": "Route112_CableCarStation", + "layout": "LAYOUT_CABLE_CAR_STATION", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_112", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route112_CableCarStation_EventScript_22AB17", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CABLE_CAR", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 11, + "elevation": 0, + "dest_map": "MAP_ROUTE112", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 11, + "elevation": 0, + "dest_map": "MAP_ROUTE112", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route113/connections.inc b/data/maps/Route113/connections.inc deleted file mode 100644 index a4d583ce89..0000000000 --- a/data/maps/Route113/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route113_MapConnectionsList: - connection down, 60, MAP_ROUTE112 - connection left, 0, MAP_FALLARBOR_TOWN - connection right, 0, MAP_ROUTE111 - -Route113_MapConnections: - .4byte 3 - .4byte Route113_MapConnectionsList - diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc deleted file mode 100644 index bcf377e744..0000000000 --- a/data/maps/Route113/events.inc +++ /dev/null @@ -1,57 +0,0 @@ -Route113_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 66, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route113_EventScript_1F2193, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route113_EventScript_1F218A, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 51, 11, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DDC, FLAG_ITEM_ROUTE_113_MAX_ETHER - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DE9, FLAG_ITEM_ROUTE_113_SUPER_REPEL - object_event 8, EVENT_OBJ_GFX_NINJA_BOY, 0, 29, 6, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F2250, 0 - object_event 9, EVENT_OBJ_GFX_NINJA_BOY, 0, 71, 2, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0 - object_event 10, EVENT_OBJ_GFX_TWIN, 0, 45, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22C9, 0 - object_event 11, EVENT_OBJ_GFX_TWIN, 0, 46, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22E4, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route113_EventScript_290DF6, FLAG_ITEM_ROUTE_113_HYPER_POTION - object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 75, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route113_EventScript_1F2344, 0 - object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 71, 4, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route113_EventScript_1F232D, 0 - object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0 - object_event 16, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 6, Route113_EventScript_1F2316, 0 - -Route113_MapWarps: - warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP - warp_def 41, 12, 0, 0, MAP_TERRA_CAVE_ENTRANCE - warp_def 88, 5, 0, 0, MAP_TERRA_CAVE_ENTRANCE - -Route113_MapCoordEvents: - coord_weather_event 19, 11, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 19, 10, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 19, 13, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 86, 9, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 85, 10, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 85, 11, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 14, 10, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 14, 11, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 14, 12, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 14, 13, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 94, 8, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 94, 9, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 94, 11, 0, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 19, 14, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 87, 8, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 87, 6, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 87, 7, 3, COORD_EVENT_WEATHER_ASH - -Route113_MapBGEvents: - bg_event 85, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F219C - bg_event 12, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21A5 - bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21B7 - bg_event 31, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21AE - bg_secret_base_event 49, 8, 3, SECRET_BASE_RED_CAVE1_3 - bg_hidden_item_event 66, 3, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_113_ETHER - bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_ROUTE_113_TM_32 - bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET - -Route113_MapEvents:: - map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents - diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc deleted file mode 100644 index aae60a1002..0000000000 --- a/data/maps/Route113/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route113: - .4byte Route113_Layout - .4byte Route113_MapEvents - .4byte Route113_MapScripts - .4byte Route113_MapConnections - .2byte MUS_KAZANBAI - .2byte LAYOUT_ROUTE113 - .byte MAPSEC_ROUTE_113 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json new file mode 100644 index 0000000000..7dc18e5724 --- /dev/null +++ b/data/maps/Route113/map.json @@ -0,0 +1,465 @@ +{ + "id": "MAP_ROUTE113", + "name": "Route113", + "layout": "LAYOUT_ROUTE113", + "music": "MUS_KAZANBAI", + "region_map_section": "MAPSEC_ROUTE_113", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 60, + "map": "MAP_ROUTE112" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_FALLARBOR_TOWN" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE111" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 66, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_EventScript_1F2193", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 36, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_EventScript_1F218A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 62, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route113_EventScript_1F21C0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 21, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route113_EventScript_1F21D7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 51, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route113_EventScript_1F21EE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 53, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_EventScript_290DDC", + "flag": "FLAG_ITEM_ROUTE_113_MAX_ETHER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 79, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_EventScript_290DE9", + "flag": "FLAG_ITEM_ROUTE_113_SUPER_REPEL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 29, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_HIDDEN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route113_EventScript_1F2250", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 71, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_HIDDEN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route113_EventScript_1F22B2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 45, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route113_EventScript_1F22C9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 46, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route113_EventScript_1F22E4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 15, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_EventScript_290DF6", + "flag": "FLAG_ITEM_ROUTE_113_HYPER_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 75, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route113_EventScript_1F2344", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 71, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route113_EventScript_1F232D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route113_EventScript_1F22FF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 7, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route113_EventScript_1F2316", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 33, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE113_GLASS_WORKSHOP", + "dest_warp_id": 0 + }, + { + "x": 41, + "y": 12, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 88, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "weather", + "x": 19, + "y": 11, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 19, + "y": 10, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 19, + "y": 12, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 19, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 86, + "y": 9, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 85, + "y": 10, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 85, + "y": 11, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 14, + "y": 10, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 14, + "y": 11, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 14, + "y": 12, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 14, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 94, + "y": 8, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 94, + "y": 9, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 94, + "y": 10, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 94, + "y": 11, + "elevation": 0, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 19, + "y": 14, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 87, + "y": 8, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 87, + "y": 6, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 87, + "y": 7, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 85, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route113_EventScript_1F219C" + }, + { + "type": "sign", + "x": 12, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route113_EventScript_1F21A5" + }, + { + "type": "sign", + "x": 58, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route113_EventScript_1F21B7" + }, + { + "type": "sign", + "x": 31, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route113_EventScript_1F21AE" + }, + { + "type": "secret_base", + "x": 49, + "y": 8, + "elevation": 3, + "secret_base_id": "SECRET_BASE_RED_CAVE1_3" + }, + { + "type": "hidden_item", + "x": 66, + "y": 3, + "elevation": 3, + "item": "ITEM_ETHER", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_ETHER" + }, + { + "type": "hidden_item", + "x": 22, + "y": 5, + "elevation": 3, + "item": "ITEM_TM32", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_TM_32" + }, + { + "type": "hidden_item", + "x": 73, + "y": 3, + "elevation": 3, + "item": "ITEM_NUGGET", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route113_GlassWorkshop/events.inc b/data/maps/Route113_GlassWorkshop/events.inc deleted file mode 100644 index 7c8fbe7178..0000000000 --- a/data/maps/Route113_GlassWorkshop/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route113_GlassWorkshop_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0 - object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0 - -Route113_GlassWorkshop_MapWarps: - warp_def 3, 8, 0, 0, MAP_ROUTE113 - warp_def 4, 8, 0, 0, MAP_ROUTE113 - -Route113_GlassWorkshop_MapEvents:: - map_events Route113_GlassWorkshop_EventObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc deleted file mode 100644 index e77f3acc81..0000000000 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route113_GlassWorkshop: - .4byte House4_Layout - .4byte Route113_GlassWorkshop_MapEvents - .4byte Route113_GlassWorkshop_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE4 - .byte MAPSEC_ROUTE_113 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json new file mode 100644 index 0000000000..185461fdb5 --- /dev/null +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_ROUTE113_GLASS_WORKSHOP", + "name": "Route113_GlassWorkshop", + "layout": "LAYOUT_HOUSE4", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_113", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_GlassWorkshop_EventScript_26ED1E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_GlassWorkshop_EventScript_26F194", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE113", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE113", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route114/connections.inc b/data/maps/Route114/connections.inc deleted file mode 100644 index 5c7671c7c0..0000000000 --- a/data/maps/Route114/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route114_MapConnectionsList: - connection left, 40, MAP_ROUTE115 - connection right, 0, MAP_FALLARBOR_TOWN - -Route114_MapConnections: - .4byte 2 - .4byte Route114_MapConnectionsList - diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc deleted file mode 100644 index 9f17b54c03..0000000000 --- a/data/maps/Route114/events.inc +++ /dev/null @@ -1,53 +0,0 @@ -Route114_EventObjects: - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 77, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 78, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route114_EventScript_1F2640, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route114_EventScript_1F2657, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route114_EventScript_1F266E, 0 - object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route114_EventScript_1F2685, 0 - object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route114_EventScript_1F269C, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 68, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E03, FLAG_ITEM_ROUTE_114_RARE_CANDY - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E10, FLAG_ITEM_ROUTE_114_PROTEIN - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_11 - object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0 - object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F2612, 0 - object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 27, 42, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route114_EventScript_1F2582, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route114_EventScript_1F2777, 0 - object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route114_EventScript_1F2760, 0 - object_event 17, EVENT_OBJ_GFX_MAN_5, 0, 30, 58, 5, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0 - object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_12 - object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_13 - object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_14 - object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_15 - object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route114_EventScript_1F27A9, 0 - object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route114_EventScript_1F278E, 0 - object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 28, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route114_EventScript_1F27DB, 0 - object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 26, 72, 5, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, Route114_EventScript_1F27C4, 0 - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_290E1D, FLAG_ITEM_ROUTE_114_ENERGY_POWDER - object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route114_EventScript_1F27F2, 0 - -Route114_MapWarps: - warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R - warp_def 29, 5, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE - warp_def 27, 36, 0, 0, MAP_ROUTE114_LANETTES_HOUSE - warp_def 6, 46, 0, 0, MAP_TERRA_CAVE_ENTRANCE - warp_def 7, 4, 0, 0, MAP_TERRA_CAVE_ENTRANCE - -Route114_MapBGEvents: - bg_event 7, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2625 - bg_event 31, 7, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F262E - bg_secret_base_event 9, 47, 0, SECRET_BASE_BROWN_CAVE1_1 - bg_secret_base_event 30, 51, 0, SECRET_BASE_BROWN_CAVE2_1 - bg_secret_base_event 11, 62, 0, SECRET_BASE_BROWN_CAVE3_1 - bg_secret_base_event 19, 70, 0, SECRET_BASE_BROWN_CAVE4_1 - bg_secret_base_event 11, 27, 0, SECRET_BASE_TREE3_2 - bg_secret_base_event 12, 27, 0, SECRET_BASE_TREE4_2 - bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2637 - bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS - bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3 - bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE - -Route114_MapEvents:: - map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents - diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc deleted file mode 100644 index 7177662e61..0000000000 --- a/data/maps/Route114/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114: - .4byte Route114_Layout - .4byte Route114_MapEvents - .4byte Route114_MapScripts - .4byte Route114_MapConnections - .2byte MUS_DOORO_X1 - .2byte LAYOUT_ROUTE114 - .byte MAPSEC_ROUTE_114 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json new file mode 100644 index 0000000000..75f975eb69 --- /dev/null +++ b/data/maps/Route114/map.json @@ -0,0 +1,509 @@ +{ + "id": "MAP_ROUTE114", + "name": "Route114", + "layout": "LAYOUT_ROUTE114", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_114", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 40, + "map": "MAP_ROUTE115" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_FALLARBOR_TOWN" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 31, + "y": 43, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 77, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 31, + "y": 44, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 78, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 15, + "y": 65, + "elevation": 7, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route114_EventScript_1F2640", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 30, + "y": 72, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route114_EventScript_1F2657", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 22, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route114_EventScript_1F266E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 19, + "y": 35, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route114_EventScript_1F2685", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 20, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route114_EventScript_1F269C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 31, + "y": 45, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 68, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_290E03", + "flag": "FLAG_ITEM_ROUTE_114_RARE_CANDY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 11, + "y": 37, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_290E10", + "flag": "FLAG_ITEM_ROUTE_114_PROTEIN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 12, + "y": 43, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 19, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_1F25D1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 19, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_1F2612", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 27, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_1F2582", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 25, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_1F2777", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 19, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_1F2760", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 30, + "y": 58, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route114_EventScript_1F26FE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 29, + "y": 53, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 30, + "y": 54, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 22, + "y": 69, + "elevation": 7, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 11, + "y": 64, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 24, + "y": 44, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route114_EventScript_1F27A9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 23, + "y": 44, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route114_EventScript_1F278E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 28, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route114_EventScript_1F27DB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 26, + "y": 72, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route114_EventScript_1F27C4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_290E1D", + "flag": "FLAG_ITEM_ROUTE_114_ENERGY_POWDER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 28, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route114_EventScript_1F27F2", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 63, + "elevation": 0, + "dest_map": "MAP_METEOR_FALLS_1F_1R", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 27, + "y": 36, + "elevation": 0, + "dest_map": "MAP_ROUTE114_LANETTES_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 46, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 4, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 7, + "y": 64, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_EventScript_1F2625" + }, + { + "type": "sign", + "x": 31, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_EventScript_1F262E" + }, + { + "type": "secret_base", + "x": 9, + "y": 47, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE1_1" + }, + { + "type": "secret_base", + "x": 30, + "y": 51, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE2_1" + }, + { + "type": "secret_base", + "x": 11, + "y": 62, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE3_1" + }, + { + "type": "secret_base", + "x": 19, + "y": 70, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE4_1" + }, + { + "type": "secret_base", + "x": 11, + "y": 27, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE3_2" + }, + { + "type": "secret_base", + "x": 12, + "y": 27, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE4_2" + }, + { + "type": "sign", + "x": 25, + "y": 38, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_EventScript_1F2637" + }, + { + "type": "hidden_item", + "x": 20, + "y": 57, + "elevation": 3, + "item": "ITEM_CARBOS", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS" + }, + { + "type": "secret_base", + "x": 32, + "y": 57, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE4_3" + }, + { + "type": "hidden_item", + "x": 7, + "y": 30, + "elevation": 3, + "item": "ITEM_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc deleted file mode 100644 index dd3be1a66a..0000000000 --- a/data/maps/Route114_FossilManiacsHouse/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -Route114_FossilManiacsHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0 - -Route114_FossilManiacsHouse_MapWarps: - warp_def 4, 7, 0, 1, MAP_ROUTE114 - warp_def 5, 7, 0, 1, MAP_ROUTE114 - warp_def 4, 1, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL - -Route114_FossilManiacsHouse_MapBGEvents: - bg_event 5, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD73 - bg_event 6, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD73 - bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD7C - bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD7C - -Route114_FossilManiacsHouse_MapEvents:: - map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents - diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc deleted file mode 100644 index 648359c8fe..0000000000 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_FossilManiacsHouse: - .4byte Route114_FossilManiacsHouse_Layout - .4byte Route114_FossilManiacsHouse_MapEvents - .4byte Route114_FossilManiacsHouse_MapScripts - .4byte 0x0 - .2byte MUS_TONEKUSA - .2byte LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE - .byte MAPSEC_ROUTE_114 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json new file mode 100644 index 0000000000..c3c29bdd99 --- /dev/null +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -0,0 +1,89 @@ +{ + "id": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE", + "name": "Route114_FossilManiacsHouse", + "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE", + "music": "MUS_TONEKUSA", + "region_map_section": "MAPSEC_ROUTE_114", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_FossilManiacsHouse_EventScript_22AD3A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE114", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE114", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "Route114_FossilManiacsHouse_EventScript_22AD73" + }, + { + "type": "sign", + "x": 6, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "Route114_FossilManiacsHouse_EventScript_22AD73" + }, + { + "type": "sign", + "x": 7, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "Route114_FossilManiacsHouse_EventScript_22AD7C" + }, + { + "type": "sign", + "x": 8, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "Route114_FossilManiacsHouse_EventScript_22AD7C" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route114_FossilManiacsTunnel/events.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc deleted file mode 100644 index ec9551959c..0000000000 --- a/data/maps/Route114_FossilManiacsTunnel/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_FossilManiacsTunnel_EventObjects: - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0 - -Route114_FossilManiacsTunnel_MapWarps: - warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE - warp_def 7, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE - warp_def 6, 2, 0, 0, MAP_DESERT_UNDERPASS - -Route114_FossilManiacsTunnel_MapCoordEvents: - coord_event 5, 4, 3, VAR_0x40CC, 1, Route114_FossilManiacsTunnel_EventScript_22AF66 - coord_event 6, 4, 3, VAR_0x40CC, 1, Route114_FossilManiacsTunnel_EventScript_22AF66 - -Route114_FossilManiacsTunnel_MapEvents:: - map_events Route114_FossilManiacsTunnel_EventObjects, Route114_FossilManiacsTunnel_MapWarps, Route114_FossilManiacsTunnel_MapCoordEvents, 0x0 - diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc deleted file mode 100644 index 9012e1d402..0000000000 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_FossilManiacsTunnel: - .4byte Route114_FossilManiacsTunnel_Layout - .4byte Route114_FossilManiacsTunnel_MapEvents - .4byte Route114_FossilManiacsTunnel_MapScripts - .4byte 0x0 - .2byte MUS_TONEKUSA - .2byte LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL - .byte MAPSEC_ROUTE_114 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json new file mode 100644 index 0000000000..48b3ca7f49 --- /dev/null +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL", + "name": "Route114_FossilManiacsTunnel", + "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL", + "music": "MUS_TONEKUSA", + "region_map_section": "MAPSEC_ROUTE_114", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_FossilManiacsTunnel_EventScript_22AF87", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 25, + "elevation": 3, + "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 25, + "elevation": 3, + "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_DESERT_UNDERPASS", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 5, + "y": 4, + "elevation": 3, + "var": "VAR_0x40CC", + "var_value": 1, + "script": "Route114_FossilManiacsTunnel_EventScript_22AF66" + }, + { + "type": "trigger", + "x": 6, + "y": 4, + "elevation": 3, + "var": "VAR_0x40CC", + "var_value": 1, + "script": "Route114_FossilManiacsTunnel_EventScript_22AF66" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc deleted file mode 100644 index ccd0828514..0000000000 --- a/data/maps/Route114_LanettesHouse/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_LanettesHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, FLAG_HIDE_LANETTES_HOUSE_LANETTE - -Route114_LanettesHouse_MapWarps: - warp_def 5, 7, 0, 2, MAP_ROUTE114 - warp_def 6, 7, 0, 2, MAP_ROUTE114 - -Route114_LanettesHouse_MapBGEvents: - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B309 - bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B345 - bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B345 - -Route114_LanettesHouse_MapEvents:: - map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents - diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc deleted file mode 100644 index 7b5b949636..0000000000 --- a/data/maps/Route114_LanettesHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_LanettesHouse: - .4byte Route114_LanettesHouse_Layout - .4byte Route114_LanettesHouse_MapEvents - .4byte Route114_LanettesHouse_MapScripts - .4byte 0x0 - .2byte MUS_TONEKUSA - .2byte LAYOUT_ROUTE114_LANETTES_HOUSE - .byte MAPSEC_ROUTE_114 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json new file mode 100644 index 0000000000..5dbe09a09e --- /dev/null +++ b/data/maps/Route114_LanettesHouse/map.json @@ -0,0 +1,74 @@ +{ + "id": "MAP_ROUTE114_LANETTES_HOUSE", + "name": "Route114_LanettesHouse", + "layout": "LAYOUT_ROUTE114_LANETTES_HOUSE", + "music": "MUS_TONEKUSA", + "region_map_section": "MAPSEC_ROUTE_114", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_LanettesHouse_EventScript_22B2D2", + "flag": "FLAG_HIDE_LANETTES_HOUSE_LANETTE" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE114", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE114", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_LanettesHouse_EventScript_22B309" + }, + { + "type": "sign", + "x": 8, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_LanettesHouse_EventScript_22B345" + }, + { + "type": "sign", + "x": 7, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_LanettesHouse_EventScript_22B345" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route115/connections.inc b/data/maps/Route115/connections.inc deleted file mode 100644 index a569fd0b57..0000000000 --- a/data/maps/Route115/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route115_MapConnectionsList: - connection down, 0, MAP_RUSTBORO_CITY - connection right, -40, MAP_ROUTE114 - -Route115_MapConnections: - .4byte 2 - .4byte Route115_MapConnectionsList - diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc deleted file mode 100644 index 517711bd5f..0000000000 --- a/data/maps/Route115/events.inc +++ /dev/null @@ -1,49 +0,0 @@ -Route115_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 18, 68, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route115_EventScript_1F2973, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route115_EventScript_1F298E, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2A07, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 69, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 70, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 71, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0 - object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 15, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 24, 62, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E2A, FLAG_ITEM_ROUTE_115_SUPER_POTION - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E37, FLAG_ITEM_ROUTE_115_TM_01 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E44, FLAG_ITEM_ROUTE_115_IRON - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 55, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 56, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_2907A6, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E51, FLAG_ITEM_ROUTE_115_GREAT_BALL - object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 10, 15, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route115_EventScript_1F2AE2, 0 - object_event 18, EVENT_OBJ_GFX_NINJA_BOY, 0, 11, 12, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route115_EventScript_1F2AF9, 0 - object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 15, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B27, 0 - object_event 20, EVENT_OBJ_GFX_LASS, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, Route115_EventScript_1F2B10, 0 - object_event 21, EVENT_OBJ_GFX_LASS, 0, 28, 62, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B3E, 0 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E6B, FLAG_ITEM_ROUTE_115_PP_UP - object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E5E, FLAG_ITEM_ROUTE_115_HEAL_POWDER - -Route115_MapWarps: - warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R - warp_def 21, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE - warp_def 36, 10, 0, 0, MAP_TERRA_CAVE_ENTRANCE - -Route115_MapBGEvents: - bg_secret_base_event 32, 6, 0, SECRET_BASE_BROWN_CAVE4_2 - bg_secret_base_event 21, 18, 0, SECRET_BASE_BROWN_CAVE3_2 - bg_event 16, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_1F297C - bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_1F2985 - bg_secret_base_event 8, 30, 0, SECRET_BASE_YELLOW_CAVE2_3 - bg_secret_base_event 32, 39, 0, SECRET_BASE_BROWN_CAVE1_2 - bg_secret_base_event 26, 15, 0, SECRET_BASE_BROWN_CAVE2_2 - bg_secret_base_event 23, 8, 0, SECRET_BASE_BROWN_CAVE1_3 - bg_secret_base_event 32, 46, 0, SECRET_BASE_BROWN_CAVE2_3 - bg_secret_base_event 7, 20, 0, SECRET_BASE_TREE2_4 - bg_secret_base_event 8, 20, 0, SECRET_BASE_TREE3_3 - bg_secret_base_event 25, 24, 0, SECRET_BASE_BROWN_CAVE3_3 - bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3_1 - bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE - -Route115_MapEvents:: - map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents - diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc deleted file mode 100644 index fd3f9b2fc5..0000000000 --- a/data/maps/Route115/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route115: - .4byte Route115_Layout - .4byte Route115_MapEvents - .4byte Route115_MapScripts - .4byte Route115_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE115 - .byte MAPSEC_ROUTE_115 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json new file mode 100644 index 0000000000..58e5a602be --- /dev/null +++ b/data/maps/Route115/map.json @@ -0,0 +1,455 @@ +{ + "id": "MAP_ROUTE115", + "name": "Route115", + "layout": "LAYOUT_ROUTE115", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_115", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_RUSTBORO_CITY" + }, + { + "direction": "right", + "offset": -40, + "map": "MAP_ROUTE114" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 18, + "y": 68, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_1F2973", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 5, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route115_EventScript_1F298E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 27, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route115_EventScript_1F2A07", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 69, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 13, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 70, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 71, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 15, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route115_EventScript_1F2A69", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 19, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 5, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route115_EventScript_1F29F0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 24, + "y": 62, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route115_EventScript_1F2ACB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 20, + "y": 60, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_290E2A", + "flag": "FLAG_ITEM_ROUTE_115_SUPER_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 18, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_290E37", + "flag": "FLAG_ITEM_ROUTE_115_TM_01" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 23, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_290E44", + "flag": "FLAG_ITEM_ROUTE_115_IRON" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 31, + "y": 64, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 55, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 31, + "y": 65, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 56, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 29, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_290E51", + "flag": "FLAG_ITEM_ROUTE_115_GREAT_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "x": 10, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route115_EventScript_1F2AE2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 11, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route115_EventScript_1F2AF9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 15, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route115_EventScript_1F2B27", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route115_EventScript_1F2B10", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 28, + "y": 62, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route115_EventScript_1F2B3E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 26, + "y": 67, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_290E6B", + "flag": "FLAG_ITEM_ROUTE_115_PP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 12, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_290E5E", + "flag": "FLAG_ITEM_ROUTE_115_HEAL_POWDER" + } + ], + "warp_events": [ + { + "x": 27, + "y": 37, + "elevation": 0, + "dest_map": "MAP_METEOR_FALLS_1F_1R", + "dest_warp_id": 1 + }, + { + "x": 21, + "y": 6, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 36, + "y": 10, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "secret_base", + "x": 32, + "y": 6, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE4_2" + }, + { + "type": "secret_base", + "x": 21, + "y": 18, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE3_2" + }, + { + "type": "sign", + "x": 16, + "y": 64, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route115_EventScript_1F297C" + }, + { + "type": "sign", + "x": 25, + "y": 38, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route115_EventScript_1F2985" + }, + { + "type": "secret_base", + "x": 8, + "y": 30, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE2_3" + }, + { + "type": "secret_base", + "x": 32, + "y": 39, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE1_2" + }, + { + "type": "secret_base", + "x": 26, + "y": 15, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE2_2" + }, + { + "type": "secret_base", + "x": 23, + "y": 8, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE1_3" + }, + { + "type": "secret_base", + "x": 32, + "y": 46, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE2_3" + }, + { + "type": "secret_base", + "x": 7, + "y": 20, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE2_4" + }, + { + "type": "secret_base", + "x": 8, + "y": 20, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE3_3" + }, + { + "type": "secret_base", + "x": 25, + "y": 24, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE3_3" + }, + { + "type": "secret_base", + "x": 20, + "y": 53, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE3_1" + }, + { + "type": "hidden_item", + "x": 15, + "y": 49, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route116/connections.inc b/data/maps/Route116/connections.inc deleted file mode 100644 index bbf03097c2..0000000000 --- a/data/maps/Route116/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route116_MapConnectionsList: - connection down, 80, MAP_VERDANTURF_TOWN - connection left, 0, MAP_RUSTBORO_CITY - -Route116_MapConnections: - .4byte 2 - .4byte Route116_MapConnectionsList - diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc deleted file mode 100644 index 29566f515c..0000000000 --- a/data/maps/Route116/events.inc +++ /dev/null @@ -1,56 +0,0 @@ -Route116_EventObjects: - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 25, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 26, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_11 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_12 - object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E85, FLAG_ITEM_ROUTE_116_ETHER - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E92, FLAG_ITEM_ROUTE_116_REPEL - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 66, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 67, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_EXPERT_M, 0, 46, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1F2D84, FLAG_HIDE_ROUTE_116_MR_BRINEY - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_13 - object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_14 - object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E9F, FLAG_ITEM_ROUTE_116_HP_UP - object_event 16, EVENT_OBJ_GFX_LASS, 0, 26, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0 - object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 22, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0 - object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0 - object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2CA2, FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290E78, FLAG_ITEM_ROUTE_116_X_SPECIAL - object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route116_EventScript_1F2C70, FLAG_HIDE_ROUTE_116_TUNNELER - object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2DB6, FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN - object_event 23, EVENT_OBJ_GFX_WOMAN_2, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route116_EventScript_1F3041, 0 - object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 33, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route116_EventScript_1F3058, 0 - object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 34, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290EAC, FLAG_ITEM_ROUTE_116_POTION - object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_15 - object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 36, 13, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, Route116_EventScript_1F3086, 0 - object_event 28, EVENT_OBJ_GFX_HIKER, 0, 42, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route116_EventScript_1F306F, 0 - -Route116_MapWarps: - warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL - warp_def 38, 8, 0, 0, MAP_ROUTE116_TUNNELERS_REST_HOUSE - warp_def 65, 10, 0, 2, MAP_RUSTURF_TUNNEL - warp_def 59, 13, 0, 0, MAP_TERRA_CAVE_ENTRANCE - warp_def 79, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE - -Route116_MapCoordEvents: - coord_event 47, 9, 3, VAR_0x406F, 1, Route116_EventScript_1F2D95 - -Route116_MapBGEvents: - bg_event 5, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D57 - bg_event 48, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D60 - bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D69 - bg_secret_base_event 71, 4, 0, SECRET_BASE_BLUE_CAVE1_1 - bg_secret_base_event 79, 11, 0, SECRET_BASE_BLUE_CAVE2_1 - bg_event 16, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D72 - bg_event 29, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D7B - bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3_2 - bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4_2 - bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION - bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES - -Route116_MapEvents:: - map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents - diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc deleted file mode 100644 index d4688d63a9..0000000000 --- a/data/maps/Route116/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route116: - .4byte Route116_Layout - .4byte Route116_MapEvents - .4byte Route116_MapScripts - .4byte Route116_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE116 - .byte MAPSEC_ROUTE_116 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json new file mode 100644 index 0000000000..7e76a9e638 --- /dev/null +++ b/data/maps/Route116/map.json @@ -0,0 +1,527 @@ +{ + "id": "MAP_ROUTE116", + "name": "Route116", + "layout": "LAYOUT_ROUTE116", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_116", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 80, + "map": "MAP_VERDANTURF_TOWN" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_RUSTBORO_CITY" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 18, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 25, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 19, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 26, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route116_EventScript_1F2E89", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 21, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 32, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 13, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route116_EventScript_1F2EA0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 19, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_290E85", + "flag": "FLAG_ITEM_ROUTE_116_ETHER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 10, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_290E92", + "flag": "FLAG_ITEM_ROUTE_116_REPEL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 20, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 66, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 21, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 67, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 46, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_1F2D84", + "flag": "FLAG_HIDE_ROUTE_116_MR_BRINEY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 28, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_2906BB", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 36, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route116_EventScript_1F2F65", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 24, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_2906BB", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 80, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_290E9F", + "flag": "FLAG_ITEM_ROUTE_116_HP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 26, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route116_EventScript_1F2F7C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 22, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route116_EventScript_1F2F93", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 28, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route116_EventScript_1F2EB7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 46, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_1F2CA2", + "flag": "FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 55, + "y": 12, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_290E78", + "flag": "FLAG_ITEM_ROUTE_116_X_SPECIAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 38, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_1F2C70", + "flag": "FLAG_HIDE_ROUTE_116_TUNNELER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 74, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_1F2DB6", + "flag": "FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 33, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route116_EventScript_1F3041", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 33, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route116_EventScript_1F3058", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 34, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_290EAC", + "flag": "FLAG_ITEM_ROUTE_116_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 30, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_2906BB", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 36, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route116_EventScript_1F3086", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 42, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route116_EventScript_1F306F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 47, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTURF_TUNNEL", + "dest_warp_id": 0 + }, + { + "x": 38, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE116_TUNNELERS_REST_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 65, + "y": 10, + "elevation": 0, + "dest_map": "MAP_RUSTURF_TUNNEL", + "dest_warp_id": 2 + }, + { + "x": 59, + "y": 13, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 79, + "y": 6, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 47, + "y": 9, + "elevation": 3, + "var": "VAR_0x406F", + "var_value": 1, + "script": "Route116_EventScript_1F2D95" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route116_EventScript_1F2D57" + }, + { + "type": "sign", + "x": 48, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route116_EventScript_1F2D60" + }, + { + "type": "sign", + "x": 40, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route116_EventScript_1F2D69" + }, + { + "type": "secret_base", + "x": 71, + "y": 4, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE1_1" + }, + { + "type": "secret_base", + "x": 79, + "y": 11, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE2_1" + }, + { + "type": "sign", + "x": 16, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route116_EventScript_1F2D72" + }, + { + "type": "sign", + "x": 29, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route116_EventScript_1F2D7B" + }, + { + "type": "secret_base", + "x": 56, + "y": 6, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE3_2" + }, + { + "type": "secret_base", + "x": 55, + "y": 15, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE4_2" + }, + { + "type": "hidden_item", + "x": 22, + "y": 9, + "elevation": 3, + "item": "ITEM_SUPER_POTION", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION" + }, + { + "type": "hidden_item", + "x": 70, + "y": 13, + "elevation": 3, + "item": "ITEM_BLACK_GLASSES", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route116_TunnelersRestHouse/events.inc b/data/maps/Route116_TunnelersRestHouse/events.inc deleted file mode 100644 index 5ecd36317c..0000000000 --- a/data/maps/Route116_TunnelersRestHouse/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route116_TunnelersRestHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0 - -Route116_TunnelersRestHouse_MapWarps: - warp_def 4, 8, 0, 1, MAP_ROUTE116 - warp_def 5, 8, 0, 1, MAP_ROUTE116 - -Route116_TunnelersRestHouse_MapEvents:: - map_events Route116_TunnelersRestHouse_EventObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc deleted file mode 100644 index f50a13c93d..0000000000 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route116_TunnelersRestHouse: - .4byte Route116_TunnelersRestHouse_Layout - .4byte Route116_TunnelersRestHouse_MapEvents - .4byte Route116_TunnelersRestHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE - .byte MAPSEC_ROUTE_116 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json new file mode 100644 index 0000000000..0301a32eec --- /dev/null +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_ROUTE116_TUNNELERS_REST_HOUSE", + "name": "Route116_TunnelersRestHouse", + "layout": "LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_116", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_TunnelersRestHouse_EventScript_22B85A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_TunnelersRestHouse_EventScript_22B86C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_TunnelersRestHouse_EventScript_22B863", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE116", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE116", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route117/connections.inc b/data/maps/Route117/connections.inc deleted file mode 100644 index 101690881b..0000000000 --- a/data/maps/Route117/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route117_MapConnectionsList: - connection left, 0, MAP_VERDANTURF_TOWN - connection right, 0, MAP_MAUVILLE_CITY - -Route117_MapConnections: - .4byte 2 - .4byte Route117_MapConnectionsList - diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc deleted file mode 100644 index 217068cd39..0000000000 --- a/data/maps/Route117/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -Route117_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_1F399A, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 25, 5, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP, 2, 2, 0, 0, Route117_EventScript_1F39A3, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 47, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_291C18, 0 - object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 33, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 38, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 10, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0 - object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 33, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 29, BerryTreeScript, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 28, BerryTreeScript, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 27, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EB9, FLAG_ITEM_ROUTE_117_GREAT_BALL - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_2906BB, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EC6, FLAG_ITEM_ROUTE_117_REVIVE - object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 26, 13, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN, 2, 2, 1, 5, Route117_EventScript_1F3AF6, 0 - object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route117_EventScript_1F3B58, 0 - object_event 19, EVENT_OBJ_GFX_LASS, 0, 43, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0 - object_event 20, EVENT_OBJ_GFX_LASS, 0, 42, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0 - object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route117_EventScript_1F39AC, 0 - object_event 22, EVENT_OBJ_GFX_LASS, 0, 15, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, Route117_EventScript_1F3C4E, 0 - object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 21, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route117_EventScript_1F3C65, 0 - object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 16, 4, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 4, 1, 1, 4, Route117_EventScript_1F3C37, 0 - -Route117_MapWarps: - warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE - -Route117_MapBGEvents: - bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39B5 - bg_event 49, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39BE - bg_event 49, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39C7 - bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_ROUTE_117_REPEL - -Route117_MapEvents:: - map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents - diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc deleted file mode 100644 index 4ae1b92e55..0000000000 --- a/data/maps/Route117/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route117: - .4byte Route117_Layout - .4byte Route117_MapEvents - .4byte Route117_MapScripts - .4byte Route117_MapConnections - .2byte MUS_DOORO_X1 - .2byte LAYOUT_ROUTE117 - .byte MAPSEC_ROUTE_117 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json new file mode 100644 index 0000000000..ab9aa7b24a --- /dev/null +++ b/data/maps/Route117/map.json @@ -0,0 +1,385 @@ +{ + "id": "MAP_ROUTE117", + "name": "Route117", + "layout": "LAYOUT_ROUTE117", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_117", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_VERDANTURF_TOWN" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_MAUVILLE_CITY" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 13, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_1F399A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 25, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_1F39A3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 47, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_291C18", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 33, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 39, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "x": 42, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "x": 49, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "x": 38, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 8, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route117_EventScript_1F3A94", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route117_EventScript_1F3A32", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 33, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route117_EventScript_1F39D0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 41, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 29, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 42, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 28, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 43, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 27, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 16, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_290EB9", + "flag": "FLAG_ITEM_ROUTE_117_GREAT_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 15, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 9, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_290EC6", + "flag": "FLAG_ITEM_ROUTE_117_REVIVE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "x": 26, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route117_EventScript_1F3AF6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 17, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route117_EventScript_1F3B58", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 43, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route117_EventScript_1F3BD3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 42, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route117_EventScript_1F3B6F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 48, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_1F39AC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 15, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route117_EventScript_1F3C4E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 21, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route117_EventScript_1F3C65", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "x": 16, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route117_EventScript_1F3C37", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 51, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE117_POKEMON_DAY_CARE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 16, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route117_EventScript_1F39B5" + }, + { + "type": "sign", + "x": 49, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route117_EventScript_1F39BE" + }, + { + "type": "sign", + "x": 49, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route117_EventScript_1F39C7" + }, + { + "type": "hidden_item", + "x": 3, + "y": 18, + "elevation": 3, + "item": "ITEM_REPEL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_117_REPEL" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route117_PokemonDayCare/events.inc b/data/maps/Route117_PokemonDayCare/events.inc deleted file mode 100644 index 6b5d2cc7ae..0000000000 --- a/data/maps/Route117_PokemonDayCare/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route117_PokemonDayCare_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0 - -Route117_PokemonDayCare_MapWarps: - warp_def 2, 8, 0, 0, MAP_ROUTE117 - warp_def 3, 8, 0, 0, MAP_ROUTE117 - -Route117_PokemonDayCare_MapEvents:: - map_events Route117_PokemonDayCare_EventObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc deleted file mode 100644 index 827464a750..0000000000 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route117_PokemonDayCare: - .4byte Route117_PokemonDayCare_Layout - .4byte Route117_PokemonDayCare_MapEvents - .4byte Route117_PokemonDayCare_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_ROUTE117_POKEMON_DAY_CARE - .byte MAPSEC_ROUTE_117 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json new file mode 100644 index 0000000000..a62485c74d --- /dev/null +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_ROUTE117_POKEMON_DAY_CARE", + "name": "Route117_PokemonDayCare", + "layout": "LAYOUT_ROUTE117_POKEMON_DAY_CARE", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_117", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_PokemonDayCare_EventScript_291D11", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE117", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE117", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route118/connections.inc b/data/maps/Route118/connections.inc deleted file mode 100644 index 54ecf15774..0000000000 --- a/data/maps/Route118/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route118_MapConnectionsList: - connection up, 40, MAP_ROUTE119 - connection left, 0, MAP_MAUVILLE_CITY - connection right, 0, MAP_ROUTE123 - -Route118_MapConnections: - .4byte 3 - .4byte Route118_MapConnectionsList - diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc deleted file mode 100644 index 3dea1c6f66..0000000000 --- a/data/maps/Route118/events.inc +++ /dev/null @@ -1,46 +0,0 @@ -Route118_EventObjects: - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 31, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 32, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 33, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 64, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route118_EventScript_1F4079, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE16, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 - object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE36, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 - object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route118_EventScript_1F3E73, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CED6, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CEF6, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF16, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 - object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF36, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route118_EventScript_2906BB, FLAG_TEMP_11 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route118_EventScript_1F4000, 0 - object_event 16, EVENT_OBJ_GFX_MAN_5, 0, 56, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route118_EventScript_1F4090, 0 - object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0 - object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route118_EventScript_1F4017, 0 - object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_118_STEVEN - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, FLAG_ITEM_ROUTE_118_HYPER_POTION - object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route118_EventScript_1F40A7, 0 - -Route118_MapWarps: - warp_def 42, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE - warp_def 9, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE - -Route118_MapCoordEvents: - coord_event 43, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3E8E - coord_event 44, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EAE - coord_event 45, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EC4 - -Route118_MapBGEvents: - bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1 - bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E7C - bg_event 56, 8, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E85 - bg_secret_base_event 67, 6, 0, SECRET_BASE_RED_CAVE2_1 - bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2 - bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3 - bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2_1 - bg_hidden_item_event 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_ROUTE_118_IRON - bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE - -Route118_MapEvents:: - map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents - diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc deleted file mode 100644 index d38319d965..0000000000 --- a/data/maps/Route118/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route118: - .4byte Route118_Layout - .4byte Route118_MapEvents - .4byte Route118_MapScripts - .4byte Route118_MapConnections - .2byte MUS_ROUTE_118 - .2byte LAYOUT_ROUTE118 - .byte MAPSEC_ROUTE_118 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json new file mode 100644 index 0000000000..135e7eb742 --- /dev/null +++ b/data/maps/Route118/map.json @@ -0,0 +1,421 @@ +{ + "id": "MAP_ROUTE118", + "name": "Route118", + "layout": "LAYOUT_ROUTE118", + "music": "MUS_ROUTE_118", + "region_map_section": "MAPSEC_ROUTE_118", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 40, + "map": "MAP_ROUTE119" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_MAUVILLE_CITY" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE123" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 35, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 31, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 36, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 32, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 37, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 33, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 64, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route118_EventScript_1F4079", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 33, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_28CE16", + "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 34, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_28CE36", + "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 12, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_1F3E73", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 33, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_28CED6", + "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 34, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_28CEF6", + "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 33, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_28CF16", + "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 34, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_28CF36", + "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 38, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 28, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_1F3E14", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route118_EventScript_1F3F87", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 14, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_1F4000", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 56, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route118_EventScript_1F4090", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 39, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route118_EventScript_1F3FE9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 17, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route118_EventScript_1F4017", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 44, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_118_STEVEN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 69, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_290ED3", + "flag": "FLAG_ITEM_ROUTE_118_HYPER_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route118_EventScript_1F40A7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 42, + "y": 6, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 6, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 43, + "y": 11, + "elevation": 3, + "var": "VAR_0x4071", + "var_value": 0, + "script": "Route118_EventScript_1F3E8E" + }, + { + "type": "trigger", + "x": 44, + "y": 11, + "elevation": 3, + "var": "VAR_0x4071", + "var_value": 0, + "script": "Route118_EventScript_1F3EAE" + }, + { + "type": "trigger", + "x": 45, + "y": 11, + "elevation": 3, + "var": "VAR_0x4071", + "var_value": 0, + "script": "Route118_EventScript_1F3EC4" + } + ], + "bg_events": [ + { + "type": "secret_base", + "x": 47, + "y": 14, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE1_1" + }, + { + "type": "sign", + "x": 13, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route118_EventScript_1F3E7C" + }, + { + "type": "sign", + "x": 56, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route118_EventScript_1F3E85" + }, + { + "type": "secret_base", + "x": 67, + "y": 6, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE2_1" + }, + { + "type": "secret_base", + "x": 29, + "y": 5, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE1_2" + }, + { + "type": "secret_base", + "x": 47, + "y": 5, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE1_3" + }, + { + "type": "secret_base", + "x": 46, + "y": 5, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE2_1" + }, + { + "type": "hidden_item", + "x": 31, + "y": 13, + "elevation": 3, + "item": "ITEM_IRON", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_118_IRON" + }, + { + "type": "hidden_item", + "x": 12, + "y": 14, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route119/connections.inc b/data/maps/Route119/connections.inc deleted file mode 100644 index 067db34f13..0000000000 --- a/data/maps/Route119/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route119_MapConnectionsList: - connection down, -40, MAP_ROUTE118 - connection right, 0, MAP_FORTREE_CITY - -Route119_MapConnections: - .4byte 2 - .4byte Route119_MapConnectionsList - diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc deleted file mode 100644 index 9942a4c4f4..0000000000 --- a/data/maps/Route119/events.inc +++ /dev/null @@ -1,99 +0,0 @@ -Route119_EventObjects: - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 34, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 35, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 36, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 123, 3, MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 123, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0 - object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 125, 3, MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F479D, 0 - object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 74, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route119_EventScript_1F4810, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 116, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F4786, 0 - object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_EventScript_1F4872, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0 - object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0 - object_event 12, EVENT_OBJ_GFX_NINJA_BOY, 0, 28, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 0, 0, 1, 1, Route119_EventScript_1F4902, 0 - object_event 13, EVENT_OBJ_GFX_NINJA_BOY, 0, 19, 49, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 0, 0, 1, 3, Route119_EventScript_1F4919, 0 - object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 10, 50, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0 - object_event 15, EVENT_OBJ_GFX_MAN_5, 0, 8, 63, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0 - object_event 16, EVENT_OBJ_GFX_VAR_0, 0, 25, 32, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_RIVAL - object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EE0, FLAG_ITEM_ROUTE_119_SUPER_REPEL - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EED, FLAG_ITEM_ROUTE_119_ZINC - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EFA, FLAG_ITEM_ROUTE_119_ELIXIR_1 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F07, FLAG_ITEM_ROUTE_119_LEAF_STONE - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F14, FLAG_ITEM_ROUTE_119_RARE_CANDY - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F21, FLAG_ITEM_ROUTE_119_HYPER_POTION_1 - object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 33, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49A3, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 34, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49BA, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 25, EVENT_OBJ_GFX_VAR_3, 0, 17, 33, 4, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE - object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route119_EventScript_1F49D1, 0 - object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 83, BerryTreeScript, 0 - object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 84, BerryTreeScript, 0 - object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 85, BerryTreeScript, 0 - object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 86, BerryTreeScript, 0 - object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, Route119_EventScript_1F476B, 0 - object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F2E, FLAG_ITEM_ROUTE_119_HYPER_POTION_2 - object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_EventScript_1F49DA, 0 - object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 29, 6, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route119_EventScript_1F4930, 0 - object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_27231C, FLAG_HIDE_ROUTE_119_KECLEON_1 - object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_272329, FLAG_HIDE_ROUTE_119_KECLEON_2 - object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route119_EventScript_1F4947, 0 - object_event 38, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 68, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route119_EventScript_1F498C, 0 - object_event 39, EVENT_OBJ_GFX_MAN_5, 0, 16, 52, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route119_EventScript_1F4975, 0 - object_event 40, EVENT_OBJ_GFX_MAN_5, 0, 32, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route119_EventScript_1F495E, 0 - object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_291399, FLAG_ITEM_ROUTE_119_NUGGET - object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F3B, FLAG_ITEM_ROUTE_119_ELIXIR_2 - object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_SCOTT - -Route119_MapWarps: - warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F - warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE - -Route119_MapCoordEvents: - coord_event 25, 31, 0, VAR_0x4072, 0, Route119_EventScript_1F4472 - coord_event 26, 31, 0, VAR_0x4072, 0, Route119_EventScript_1F447D - coord_weather_event 29, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 30, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 31, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 32, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 15, 133, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 16, 132, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 17, 131, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 18, 130, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 19, 131, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 20, 132, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 21, 133, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 36, 6, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 36, 7, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 35, 8, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 35, 9, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 16, 137, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 17, 137, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 18, 137, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 19, 137, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 20, 137, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 34, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - -Route119_MapBGEvents: - bg_event 9, 33, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F477D - bg_event 27, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F4774 - bg_secret_base_event 5, 2, 0, SECRET_BASE_SHRUB1_1 - bg_secret_base_event 4, 89, 0, SECRET_BASE_SHRUB1_2 - bg_secret_base_event 5, 15, 0, SECRET_BASE_SHRUB2_1 - bg_secret_base_event 7, 101, 3, SECRET_BASE_SHRUB2_2 - bg_secret_base_event 34, 24, 3, SECRET_BASE_SHRUB3_1 - bg_secret_base_event 31, 73, 3, SECRET_BASE_SHRUB4_1 - bg_secret_base_event 16, 81, 0, SECRET_BASE_BLUE_CAVE3_3 - bg_secret_base_event 16, 28, 0, SECRET_BASE_BLUE_CAVE4_3 - bg_hidden_item_event 17, 82, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM - bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL - bg_secret_base_event 26, 81, 0, SECRET_BASE_RED_CAVE3_3 - bg_secret_base_event 19, 76, 0, SECRET_BASE_TREE2_3 - bg_secret_base_event 18, 76, 0, SECRET_BASE_TREE4_3 - bg_secret_base_event 4, 15, 0, SECRET_BASE_SHRUB3_3 - bg_secret_base_event 6, 2, 0, SECRET_BASE_SHRUB4_3 - bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL - bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER - bg_event 28, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F49E3 - -Route119_MapEvents:: - map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents - diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc deleted file mode 100644 index 0e3685b373..0000000000 --- a/data/maps/Route119/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119: - .4byte Route119_Layout - .4byte Route119_MapEvents - .4byte Route119_MapScripts - .4byte Route119_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE119 - .byte MAPSEC_ROUTE_119 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json new file mode 100644 index 0000000000..fd6c836b70 --- /dev/null +++ b/data/maps/Route119/map.json @@ -0,0 +1,920 @@ +{ + "id": "MAP_ROUTE119", + "name": "Route119", + "layout": "LAYOUT_ROUTE119", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_119", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": -40, + "map": "MAP_ROUTE118" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_FORTREE_CITY" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 24, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 34, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 25, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 35, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 26, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 36, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 12, + "y": 123, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F47E2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 26, + "y": 123, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F47B4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 5, + "y": 125, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F479D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 7, + "y": 74, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_EventScript_1F4810", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 28, + "y": 116, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F4786", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 35, + "y": 83, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route119_EventScript_1F4872", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 34, + "y": 122, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F47CB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 17, + "y": 128, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F47F9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 28, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F4902", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 19, + "y": 49, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_MOUNTAIN_DISGUISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_EventScript_1F4919", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 10, + "y": 50, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_EventScript_1F48D4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 8, + "y": 63, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route119_EventScript_1F48EB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 25, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_119_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 12, + "y": 121, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290EE0", + "flag": "FLAG_ITEM_ROUTE_119_SUPER_REPEL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 96, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290EED", + "flag": "FLAG_ITEM_ROUTE_119_ZINC" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 29, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290EFA", + "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 25, + "y": 76, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290F07", + "flag": "FLAG_ITEM_ROUTE_119_LEAF_STONE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 8, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290F14", + "flag": "FLAG_ITEM_ROUTE_119_RARE_CANDY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 33, + "y": 117, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290F21", + "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 13, + "y": 33, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_1F49A3", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 13, + "y": 34, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_1F49BA", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 17, + "y": 33, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 31, + "y": 109, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_1F49D1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 8, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 83, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 9, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 84, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 29, + "y": 90, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 85, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 30, + "y": 90, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 86, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 19, + "y": 133, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_1F476B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290F2E", + "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 35, + "y": 93, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_1F49DA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 29, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_EventScript_1F4930", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 31, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_27231C", + "flag": "FLAG_HIDE_ROUTE_119_KECLEON_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 25, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_272329", + "flag": "FLAG_HIDE_ROUTE_119_KECLEON_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 13, + "y": 104, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_1F4947", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 8, + "y": 68, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route119_EventScript_1F498C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 16, + "y": 52, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_EventScript_1F4975", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 32, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route119_EventScript_1F495E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 19, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_291399", + "flag": "FLAG_ITEM_ROUTE_119_NUGGET" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 24, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290F3B", + "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 28, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_119_SCOTT" + } + ], + "warp_events": [ + { + "x": 6, + "y": 32, + "elevation": 0, + "dest_map": "MAP_ROUTE119_WEATHER_INSTITUTE_1F", + "dest_warp_id": 0 + }, + { + "x": 33, + "y": 109, + "elevation": 0, + "dest_map": "MAP_ROUTE119_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 25, + "y": 31, + "elevation": 0, + "var": "VAR_0x4072", + "var_value": 0, + "script": "Route119_EventScript_1F4472" + }, + { + "type": "trigger", + "x": 26, + "y": 31, + "elevation": 0, + "var": "VAR_0x4072", + "var_value": 0, + "script": "Route119_EventScript_1F447D" + }, + { + "type": "weather", + "x": 29, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 30, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 31, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 32, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 15, + "y": 133, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 16, + "y": 132, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 17, + "y": 131, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 18, + "y": 130, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 19, + "y": 131, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 20, + "y": 132, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 21, + "y": 133, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 36, + "y": 6, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 36, + "y": 7, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 35, + "y": 8, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 35, + "y": 9, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 16, + "y": 137, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 17, + "y": 137, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 18, + "y": 137, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 19, + "y": 137, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 20, + "y": 137, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 34, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 9, + "y": 33, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_EventScript_1F477D" + }, + { + "type": "sign", + "x": 27, + "y": 19, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_EventScript_1F4774" + }, + { + "type": "secret_base", + "x": 5, + "y": 2, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB1_1" + }, + { + "type": "secret_base", + "x": 4, + "y": 89, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB1_2" + }, + { + "type": "secret_base", + "x": 5, + "y": 15, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB2_1" + }, + { + "type": "secret_base", + "x": 7, + "y": 101, + "elevation": 3, + "secret_base_id": "SECRET_BASE_SHRUB2_2" + }, + { + "type": "secret_base", + "x": 34, + "y": 24, + "elevation": 3, + "secret_base_id": "SECRET_BASE_SHRUB3_1" + }, + { + "type": "secret_base", + "x": 31, + "y": 73, + "elevation": 3, + "secret_base_id": "SECRET_BASE_SHRUB4_1" + }, + { + "type": "secret_base", + "x": 16, + "y": 81, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE3_3" + }, + { + "type": "secret_base", + "x": 16, + "y": 28, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE4_3" + }, + { + "type": "hidden_item", + "x": 17, + "y": 82, + "elevation": 3, + "item": "ITEM_CALCIUM", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM" + }, + { + "type": "hidden_item", + "x": 38, + "y": 63, + "elevation": 3, + "item": "ITEM_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL" + }, + { + "type": "secret_base", + "x": 26, + "y": 81, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE3_3" + }, + { + "type": "secret_base", + "x": 19, + "y": 76, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE2_3" + }, + { + "type": "secret_base", + "x": 18, + "y": 76, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE4_3" + }, + { + "type": "secret_base", + "x": 4, + "y": 15, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB3_3" + }, + { + "type": "secret_base", + "x": 6, + "y": 2, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB4_3" + }, + { + "type": "hidden_item", + "x": 26, + "y": 120, + "elevation": 3, + "item": "ITEM_FULL_HEAL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL" + }, + { + "type": "hidden_item", + "x": 20, + "y": 29, + "elevation": 3, + "item": "ITEM_MAX_ETHER", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER" + }, + { + "type": "sign", + "x": 28, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_EventScript_1F49E3" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route119_House/events.inc b/data/maps/Route119_House/events.inc deleted file mode 100644 index 152deabee0..0000000000 --- a/data/maps/Route119_House/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route119_House_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_House_EventScript_270966, 0 - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 1, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 2, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route119_House_EventScript_27096F, 0 - -Route119_House_MapWarps: - warp_def 3, 8, 0, 1, MAP_ROUTE119 - warp_def 4, 8, 0, 1, MAP_ROUTE119 - -Route119_House_MapEvents:: - map_events Route119_House_EventObjects, Route119_House_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc deleted file mode 100644 index d7bbbd5ffb..0000000000 --- a/data/maps/Route119_House/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119_House: - .4byte House1_Layout - .4byte Route119_House_MapEvents - .4byte Route119_House_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_ROUTE_119 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json new file mode 100644 index 0000000000..fdfd19f78d --- /dev/null +++ b/data/maps/Route119_House/map.json @@ -0,0 +1,127 @@ +{ + "id": "MAP_ROUTE119_HOUSE", + "name": "Route119_House", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_119", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_270966", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_27096F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_27096F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_27096F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 3, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_27096F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_27096F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_27096F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE119", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE119", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc deleted file mode 100644 index e8f3b93f80..0000000000 --- a/data/maps/Route119_WeatherInstitute_1F/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -Route119_WeatherInstitute_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS - object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 14, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0 - -Route119_WeatherInstitute_1F_MapWarps: - warp_def 9, 12, 0, 0, MAP_ROUTE119 - warp_def 10, 12, 0, 0, MAP_ROUTE119 - warp_def 17, 1, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_2F - -Route119_WeatherInstitute_1F_MapBGEvents: - bg_event 1, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 - bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 - bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 - bg_event 0, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 - -Route119_WeatherInstitute_1F_MapEvents:: - map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents - diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc deleted file mode 100644 index be2fe1617c..0000000000 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119_WeatherInstitute_1F: - .4byte Route119_WeatherInstitute_1F_Layout - .4byte Route119_WeatherInstitute_1F_MapEvents - .4byte Route119_WeatherInstitute_1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F - .byte MAPSEC_ROUTE_119 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json new file mode 100644 index 0000000000..9101e24951 --- /dev/null +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -0,0 +1,141 @@ +{ + "id": "MAP_ROUTE119_WEATHER_INSTITUTE_1F", + "name": "Route119_WeatherInstitute_1F", + "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_119", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 15, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_WeatherInstitute_1F_EventScript_26FB29", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route119_WeatherInstitute_1F_EventScript_26FB40", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_WeatherInstitute_1F_EventScript_26FB0F", + "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 2, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_WeatherInstitute_1F_EventScript_26FAC8", + "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 14, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_WeatherInstitute_1F_EventScript_26FAA4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 12, + "elevation": 0, + "dest_map": "MAP_ROUTE119", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 12, + "elevation": 0, + "dest_map": "MAP_ROUTE119", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 1, + "elevation": 0, + "dest_map": "MAP_ROUTE119_WEATHER_INSTITUTE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 1, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + }, + { + "type": "sign", + "x": 1, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + }, + { + "type": "sign", + "x": 0, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + }, + { + "type": "sign", + "x": 0, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc deleted file mode 100644 index 7463848207..0000000000 --- a/data/maps/Route119_WeatherInstitute_2F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route119_WeatherInstitute_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, FLAG_HIDE_ROUTE_119_TEAM_AQUA - -Route119_WeatherInstitute_2F_MapWarps: - warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F - -Route119_WeatherInstitute_2F_MapEvents:: - map_events Route119_WeatherInstitute_2F_EventObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc deleted file mode 100644 index 8543b0ed8b..0000000000 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119_WeatherInstitute_2F: - .4byte Route119_WeatherInstitute_2F_Layout - .4byte Route119_WeatherInstitute_2F_MapEvents - .4byte Route119_WeatherInstitute_2F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F - .byte MAPSEC_ROUTE_119 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json new file mode 100644 index 0000000000..a8a1ebf62f --- /dev/null +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -0,0 +1,133 @@ +{ + "id": "MAP_ROUTE119_WEATHER_INSTITUTE_2F", + "name": "Route119_WeatherInstitute_2F", + "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_119", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 15, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route119_WeatherInstitute_2F_EventScript_26FF7F", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route119_WeatherInstitute_2F_EventScript_26FF96", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_WeatherInstitute_2F_EventScript_26FFAD", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 18, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_WeatherInstitute_2F_EventScript_27018B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 16, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 19, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_WeatherInstitute_2F_EventScript_26FF68", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + } + ], + "warp_events": [ + { + "x": 17, + "y": 1, + "elevation": 0, + "dest_map": "MAP_ROUTE119_WEATHER_INSTITUTE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route120/connections.inc b/data/maps/Route120/connections.inc deleted file mode 100644 index 9dda2ecade..0000000000 --- a/data/maps/Route120/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route120_MapConnectionsList: - connection left, 0, MAP_FORTREE_CITY - connection right, 80, MAP_ROUTE121 - -Route120_MapConnections: - .4byte 2 - .4byte Route120_MapConnectionsList - diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc deleted file mode 100644 index d198dff3c7..0000000000 --- a/data/maps/Route120/events.inc +++ /dev/null @@ -1,90 +0,0 @@ -Route120_EventObjects: - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 46, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 45, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 44, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 43, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 37, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 38, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 39, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 40, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 41, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 42, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_MAN_5, 0, 5, 22, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0 - object_event 12, EVENT_OBJ_GFX_MAN_5, 0, 32, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0 - object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route120_EventScript_1F5850, 0 - object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route120_EventScript_1F5867, 0 - object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route120_EventScript_1F587E, 0 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F48, FLAG_ITEM_ROUTE_120_NUGGET - object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE76, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 - object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE56, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 - object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF16, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 - object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF36, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 - object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_11 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F55, FLAG_ITEM_ROUTE_120_FULL_HEAL - object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route120_EventScript_1F5527, 0 - object_event 24, EVENT_OBJ_GFX_WOMAN_5, 0, 31, 37, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0 - object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 6, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 4, Route120_EventScript_1F590E, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 34, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route120_EventScript_1F5925, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F6F, FLAG_ITEM_ROUTE_120_NEST_BALL - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F62, FLAG_ITEM_ROUTE_120_HYPER_POTION - object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1F57BC, FLAG_HIDE_ROUTE_120_KECLEON_1 - object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route120_EventScript_1F5641, FLAG_HIDE_ROUTE_120_STEVEN - object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_14 - object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_12 - object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 10, 72, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F593C, 0 - object_event 35, EVENT_OBJ_GFX_NINJA_BOY, 0, 19, 28, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F5953, 0 - object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE - object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722DB, FLAG_HIDE_ROUTE_120_KECLEON_2 - object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722E8, FLAG_HIDE_ROUTE_120_KECLEON_3 - object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722F5, FLAG_HIDE_ROUTE_120_KECLEON_4 - object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_27230F, FLAG_HIDE_ROUTE_120_KECLEON_6 - object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_272302, FLAG_HIDE_ROUTE_120_KECLEON_5 - object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 19, 32, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route120_EventScript_1F5981, 0 - object_event 43, EVENT_OBJ_GFX_MAN_3, 0, 14, 34, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route120_EventScript_1F596A, 0 - object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F7C, FLAG_ITEM_ROUTE_120_REVIVE - -Route120_MapWarps: - warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB - warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB - -Route120_MapCoordEvents: - coord_weather_event 7, 15, 0, COORD_EVENT_WEATHER_RAIN_LIGHT - coord_weather_event 7, 16, 0, COORD_EVENT_WEATHER_RAIN_LIGHT - coord_weather_event 22, 61, 3, COORD_EVENT_WEATHER_RAIN_LIGHT - coord_weather_event 12, 64, 3, COORD_EVENT_WEATHER_RAIN_LIGHT - coord_weather_event 35, 63, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 36, 63, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 37, 63, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 38, 63, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 32, 88, 5, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 28, 15, 0, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 28, 16, 0, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 28, 17, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 32, 89, 5, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 32, 90, 5, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 32, 91, 5, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 10, 75, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 11, 75, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 12, 75, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 13, 75, 3, COORD_EVENT_WEATHER_CLOUDS - -Route120_MapBGEvents: - bg_event 27, 3, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57C5 - bg_event 38, 88, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57CE - bg_secret_base_event 28, 62, 0, SECRET_BASE_BLUE_CAVE3_1 - bg_secret_base_event 30, 62, 0, SECRET_BASE_BLUE_CAVE4_1 - bg_secret_base_event 26, 10, 0, SECRET_BASE_SHRUB3_2 - bg_secret_base_event 29, 85, 5, SECRET_BASE_SHRUB4_2 - bg_secret_base_event 18, 12, 0, SECRET_BASE_BLUE_CAVE2_3 - bg_secret_base_event 38, 54, 0, SECRET_BASE_SHRUB1_3 - bg_secret_base_event 31, 23, 0, SECRET_BASE_SHRUB2_3 - bg_hidden_item_event 9, 1, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1 - bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE - bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2 - bg_hidden_item_event 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_ROUTE_120_ZINC - bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4 - -Route120_MapEvents:: - map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents - diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc deleted file mode 100644 index 4d48d8b334..0000000000 --- a/data/maps/Route120/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route120: - .4byte Route120_Layout - .4byte Route120_MapEvents - .4byte Route120_MapScripts - .4byte Route120_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE120 - .byte MAPSEC_ROUTE_120 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json new file mode 100644 index 0000000000..db93042de7 --- /dev/null +++ b/data/maps/Route120/map.json @@ -0,0 +1,858 @@ +{ + "id": "MAP_ROUTE120", + "name": "Route120", + "layout": "LAYOUT_ROUTE120", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_120", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_FORTREE_CITY" + }, + { + "direction": "right", + "offset": 80, + "map": "MAP_ROUTE121" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 4, + "y": 79, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 46, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 5, + "y": 79, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 45, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 6, + "y": 79, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 44, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 7, + "y": 79, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 43, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 34, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 37, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 35, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 38, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 36, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 39, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 9, + "y": 92, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 40, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 10, + "y": 92, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 41, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 11, + "y": 92, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 42, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 5, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F57D7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 32, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F57EE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 27, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route120_EventScript_1F5850", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 36, + "y": 45, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route120_EventScript_1F5867", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 19, + "y": 80, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F587E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 20, + "y": 55, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_290F48", + "flag": "FLAG_ITEM_ROUTE_120_NUGGET" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 37, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_28CE76", + "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 36, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_28CE56", + "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 36, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_28CF16", + "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 37, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_28CF36", + "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 35, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 89, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_290F55", + "flag": "FLAG_ITEM_ROUTE_120_FULL_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 14, + "y": 92, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_1F5527", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 31, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route120_EventScript_1F58E0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 9, + "y": 60, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route120_EventScript_1F58F7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 16, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route120_EventScript_1F590E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 18, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F5925", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 22, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_290F6F", + "flag": "FLAG_ITEM_ROUTE_120_NEST_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 23, + "y": 82, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_290F62", + "flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 12, + "y": 16, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_1F57BC", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 13, + "y": 15, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_1F5641", + "flag": "FLAG_HIDE_ROUTE_120_STEVEN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 20, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_2906BB", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 15, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 10, + "y": 72, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_MOUNTAIN_DISGUISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F593C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 19, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F5953", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_2", + "x": 12, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 20, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_2722DB", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 27, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_2722E8", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 4, + "y": 77, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_2722F5", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 7, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_27230F", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 19, + "y": 48, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_272302", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 19, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F5981", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 14, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F596A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 24, + "y": 33, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_290F7C", + "flag": "FLAG_ITEM_ROUTE_120_REVIVE" + } + ], + "warp_events": [ + { + "x": 7, + "y": 55, + "elevation": 0, + "dest_map": "MAP_ANCIENT_TOMB", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 23, + "elevation": 1, + "dest_map": "MAP_SCORCHED_SLAB", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "weather", + "x": 7, + "y": 15, + "elevation": 0, + "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" + }, + { + "type": "weather", + "x": 7, + "y": 16, + "elevation": 0, + "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" + }, + { + "type": "weather", + "x": 22, + "y": 61, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" + }, + { + "type": "weather", + "x": 12, + "y": 64, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" + }, + { + "type": "weather", + "x": 35, + "y": 63, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 36, + "y": 63, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 37, + "y": 63, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 38, + "y": 63, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 32, + "y": 88, + "elevation": 5, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 28, + "y": 15, + "elevation": 0, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 28, + "y": 16, + "elevation": 0, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 28, + "y": 17, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 32, + "y": 89, + "elevation": 5, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 32, + "y": 90, + "elevation": 5, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 32, + "y": 91, + "elevation": 5, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 10, + "y": 75, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 11, + "y": 75, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 12, + "y": 75, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 13, + "y": 75, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 27, + "y": 3, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route120_EventScript_1F57C5" + }, + { + "type": "sign", + "x": 38, + "y": 88, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route120_EventScript_1F57CE" + }, + { + "type": "secret_base", + "x": 28, + "y": 62, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE3_1" + }, + { + "type": "secret_base", + "x": 30, + "y": 62, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE4_1" + }, + { + "type": "secret_base", + "x": 26, + "y": 10, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB3_2" + }, + { + "type": "secret_base", + "x": 29, + "y": 85, + "elevation": 5, + "secret_base_id": "SECRET_BASE_SHRUB4_2" + }, + { + "type": "secret_base", + "x": 18, + "y": 12, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE2_3" + }, + { + "type": "secret_base", + "x": 38, + "y": 54, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB1_3" + }, + { + "type": "secret_base", + "x": 31, + "y": 23, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB2_3" + }, + { + "type": "hidden_item", + "x": 9, + "y": 1, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1" + }, + { + "type": "hidden_item", + "x": 31, + "y": 11, + "elevation": 3, + "item": "ITEM_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE" + }, + { + "type": "hidden_item", + "x": 0, + "y": 86, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2" + }, + { + "type": "hidden_item", + "x": 24, + "y": 42, + "elevation": 3, + "item": "ITEM_ZINC", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_120_ZINC" + }, + { + "type": "secret_base", + "x": 5, + "y": 76, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB1_4" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route121/connections.inc b/data/maps/Route121/connections.inc deleted file mode 100644 index 6d9bd9ae4b..0000000000 --- a/data/maps/Route121/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route121_MapConnectionsList: - connection down, 20, MAP_ROUTE122 - connection left, -80, MAP_ROUTE120 - connection right, -10, MAP_LILYCOVE_CITY - -Route121_MapConnections: - .4byte 3 - .4byte Route121_MapConnectionsList - diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc deleted file mode 100644 index 5e637bb7e7..0000000000 --- a/data/maps/Route121/events.inc +++ /dev/null @@ -1,55 +0,0 @@ -Route121_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 29, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route121_EventScript_1F5DFD, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 47, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 48, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 49, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 50, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 51, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 52, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 53, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 54, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0 - object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0 - object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS - object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_12 - object_event 17, EVENT_OBJ_GFX_POKEFAN_F, 0, 63, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0 - object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0 - object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0 - object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F89, FLAG_ITEM_ROUTE_121_CARBOS - object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_13 - object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 3, Route121_EventScript_1F5F9C, 0 - object_event 24, EVENT_OBJ_GFX_MAN_4, 0, 59, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0 - object_event 25, EVENT_OBJ_GFX_WOMAN_2, 0, 59, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 0 - object_event 26, EVENT_OBJ_GFX_MAN_3, 0, 65, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, Route121_EventScript_1F5FE1, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_5, 0, 72, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, Route121_EventScript_1F5FF8, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, FLAG_ITEM_ROUTE_121_REVIVE - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, FLAG_ITEM_ROUTE_121_ZINC - -Route121_MapWarps: - warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE - -Route121_MapCoordEvents: - coord_event 25, 5, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 - coord_event 25, 6, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 - coord_event 25, 7, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 - coord_event 25, 8, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 - -Route121_MapBGEvents: - bg_event 32, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E06 - bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2_2 - bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3_2 - bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1_2 - bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2_2 - bg_event 39, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E0F - bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP - bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET - bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL - bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE - -Route121_MapEvents:: - map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents - diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc deleted file mode 100644 index 04cee69427..0000000000 --- a/data/maps/Route121/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route121: - .4byte Route121_Layout - .4byte Route121_MapEvents - .4byte Route121_MapScripts - .4byte Route121_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE121 - .byte MAPSEC_ROUTE_121 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json new file mode 100644 index 0000000000..82b7139a3b --- /dev/null +++ b/data/maps/Route121/map.json @@ -0,0 +1,536 @@ +{ + "id": "MAP_ROUTE121", + "name": "Route121", + "layout": "LAYOUT_ROUTE121", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_121", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 20, + "map": "MAP_ROUTE122" + }, + { + "direction": "left", + "offset": -80, + "map": "MAP_ROUTE120" + }, + { + "direction": "right", + "offset": -10, + "map": "MAP_LILYCOVE_CITY" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 29, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_1F5DFD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 14, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 47, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 15, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 48, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 16, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 49, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 17, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 50, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 64, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 51, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 65, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 52, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 66, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 53, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 67, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 54, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 39, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route121_EventScript_1F5F04", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 40, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route121_EventScript_1F5F1F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 30, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 30, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 31, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 32, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 65, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 63, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route121_EventScript_1F5E74", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 55, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route121_EventScript_1F5E8B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 11, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route121_EventScript_1F5EED", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 22, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route121_EventScript_1F5F3A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 55, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_290F89", + "flag": "FLAG_ITEM_ROUTE_121_CARBOS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 26, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_2906BB", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route121_EventScript_1F5F9C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 59, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route121_EventScript_1F5FB3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 59, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route121_EventScript_1F5FCA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 65, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route121_EventScript_1F5FE1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 72, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route121_EventScript_1F5FF8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 60, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_290F96", + "flag": "FLAG_ITEM_ROUTE_121_REVIVE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 38, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_290FA3", + "flag": "FLAG_ITEM_ROUTE_121_ZINC" + } + ], + "warp_events": [ + { + "x": 37, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE", + "dest_warp_id": 2 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 25, + "y": 5, + "elevation": 3, + "var": "VAR_0x4074", + "var_value": 0, + "script": "Route121_EventScript_1F5E18" + }, + { + "type": "trigger", + "x": 25, + "y": 6, + "elevation": 3, + "var": "VAR_0x4074", + "var_value": 0, + "script": "Route121_EventScript_1F5E18" + }, + { + "type": "trigger", + "x": 25, + "y": 7, + "elevation": 3, + "var": "VAR_0x4074", + "var_value": 0, + "script": "Route121_EventScript_1F5E18" + }, + { + "type": "trigger", + "x": 25, + "y": 8, + "elevation": 3, + "var": "VAR_0x4074", + "var_value": 0, + "script": "Route121_EventScript_1F5E18" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 32, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route121_EventScript_1F5E06" + }, + { + "type": "secret_base", + "x": 40, + "y": 11, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE2_2" + }, + { + "type": "secret_base", + "x": 18, + "y": 13, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE3_2" + }, + { + "type": "secret_base", + "x": 43, + "y": 7, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE1_2" + }, + { + "type": "secret_base", + "x": 42, + "y": 7, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE2_2" + }, + { + "type": "sign", + "x": 39, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route121_EventScript_1F5E0F" + }, + { + "type": "hidden_item", + "x": 23, + "y": 10, + "elevation": 3, + "item": "ITEM_HP_UP", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP" + }, + { + "type": "hidden_item", + "x": 58, + "y": 3, + "elevation": 3, + "item": "ITEM_NUGGET", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET" + }, + { + "type": "hidden_item", + "x": 72, + "y": 5, + "elevation": 3, + "item": "ITEM_FULL_HEAL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL" + }, + { + "type": "hidden_item", + "x": 68, + "y": 8, + "elevation": 3, + "item": "ITEM_MAX_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc deleted file mode 100644 index 73c836cff7..0000000000 --- a/data/maps/Route121_SafariZoneEntrance/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route121_SafariZoneEntrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - -Route121_SafariZoneEntrance_MapWarps: - warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH - warp_def 3, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH - warp_def 14, 13, 0, 0, MAP_ROUTE121 - warp_def 15, 13, 0, 0, MAP_ROUTE121 - -Route121_SafariZoneEntrance_MapCoordEvents: - coord_event 8, 4, 3, VAR_TEMP_1, 0, Route121_SafariZoneEntrance_EventScript_22BC18 - -Route121_SafariZoneEntrance_MapBGEvents: - bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_SafariZoneEntrance_EventScript_22BD21 - -Route121_SafariZoneEntrance_MapEvents:: - map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents - diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc deleted file mode 100644 index b23cdecccc..0000000000 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route121_SafariZoneEntrance: - .4byte Route121_SafariZoneEntrance_Layout - .4byte Route121_SafariZoneEntrance_MapEvents - .4byte Route121_SafariZoneEntrance_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE - .byte MAPSEC_ROUTE_121 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json new file mode 100644 index 0000000000..878798477e --- /dev/null +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE", + "name": "Route121_SafariZoneEntrance", + "layout": "LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_ROUTE_121", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 17, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_SafariZoneEntrance_EventScript_22BBE6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_SafariZoneEntrance_EventScript_22BBEF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_SOUTH", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_SOUTH", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 13, + "elevation": 0, + "dest_map": "MAP_ROUTE121", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 13, + "elevation": 0, + "dest_map": "MAP_ROUTE121", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 8, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route121_SafariZoneEntrance_EventScript_22BC18" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 15, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route121_SafariZoneEntrance_EventScript_22BD21" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route122/connections.inc b/data/maps/Route122/connections.inc deleted file mode 100644 index a5a9f4fd66..0000000000 --- a/data/maps/Route122/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route122_MapConnectionsList: - connection up, -20, MAP_ROUTE121 - connection down, -100, MAP_ROUTE123 - -Route122_MapConnections: - .4byte 2 - .4byte Route122_MapConnectionsList - diff --git a/data/maps/Route122/events.inc b/data/maps/Route122/events.inc deleted file mode 100644 index 8eb4dbb2c8..0000000000 --- a/data/maps/Route122/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -Route122_MapWarps: - warp_def 22, 29, 0, 0, MAP_MT_PYRE_1F - -Route122_MapEvents:: - map_events 0x0, Route122_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc deleted file mode 100644 index 941fff7a36..0000000000 --- a/data/maps/Route122/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route122: - .4byte Route122_Layout - .4byte Route122_MapEvents - .4byte Route122_MapScripts - .4byte Route122_MapConnections - .2byte MUS_DOORO_X4 - .2byte LAYOUT_ROUTE122 - .byte MAPSEC_ROUTE_122 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json new file mode 100644 index 0000000000..9dee984d92 --- /dev/null +++ b/data/maps/Route122/map.json @@ -0,0 +1,39 @@ +{ + "id": "MAP_ROUTE122", + "name": "Route122", + "layout": "LAYOUT_ROUTE122", + "music": "MUS_DOORO_X4", + "region_map_section": "MAPSEC_ROUTE_122", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": -20, + "map": "MAP_ROUTE121" + }, + { + "direction": "down", + "offset": -100, + "map": "MAP_ROUTE123" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 22, + "y": 29, + "elevation": 0, + "dest_map": "MAP_MT_PYRE_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route123/connections.inc b/data/maps/Route123/connections.inc deleted file mode 100644 index e2125c9117..0000000000 --- a/data/maps/Route123/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route123_MapConnectionsList: - connection up, 100, MAP_ROUTE122 - connection left, 0, MAP_ROUTE118 - -Route123_MapConnections: - .4byte 2 - .4byte Route123_MapConnectionsList - diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc deleted file mode 100644 index 2584ebbd36..0000000000 --- a/data/maps/Route123/events.inc +++ /dev/null @@ -1,88 +0,0 @@ -Route123_EventObjects: - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 58, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 59, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 60, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 61, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 62, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 63, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 64, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 70, 12, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0 - object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 58, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 65, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 72, BerryTreeScript, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 73, BerryTreeScript, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 74, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 79, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 14, BerryTreeScript, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 15, BerryTreeScript, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 30, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, FLAG_TEMP_11 - object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, FLAG_TEMP_12 - object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, FLAG_TEMP_13 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_290FB0, FLAG_ITEM_ROUTE_123_CALCIUM - object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, Route123_EventScript_1F6151, 0 - object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 87, BerryTreeScript, 0 - object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 88, BerryTreeScript, 0 - object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 89, BerryTreeScript, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_2, 0, 18, 9, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0 - object_event 27, EVENT_OBJ_GFX_TWIN, 0, 38, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0 - object_event 28, EVENT_OBJ_GFX_TWIN, 0, 37, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0 - object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route123_EventScript_1F620A, 0 - object_event 30, EVENT_OBJ_GFX_LASS, 0, 49, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F626C, 0 - object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route123_EventScript_1F6304, 0 - object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FBD, FLAG_ITEM_ROUTE_123_ULTRA_BALL - object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FCA, FLAG_ITEM_ROUTE_123_ELIXIR - object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 138, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 1, Route123_EventScript_1F6377, 0 - object_event 35, EVENT_OBJ_GFX_WOMAN_2, 0, 138, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route123_EventScript_1F6360, 0 - object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 87, 17, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route123_EventScript_1F6349, 0 - object_event 37, EVENT_OBJ_GFX_MAN_5, 0, 66, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route123_EventScript_1F63BC, 0 - object_event 38, EVENT_OBJ_GFX_MAN_5, 0, 66, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F6332, 0 - object_event 39, EVENT_OBJ_GFX_EXPERT_M, 0, 49, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F631B, 0 - object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 43, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FD7, FLAG_ITEM_ROUTE_123_PP_UP - object_event 41, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route123_EventScript_1F638E, 0 - object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 3, Route123_EventScript_1F63A5, 0 - object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FE4, FLAG_ITEM_ROUTE_123_REVIVAL_HERB - -Route123_MapWarps: - warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE - -Route123_MapCoordEvents: - coord_weather_event 90, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 92, 9, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 93, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 92, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 91, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 19, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 34, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 19, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 19, 15, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 19, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 108, 14, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 109, 15, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 110, 16, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 111, 17, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 112, 18, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 9, 12, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 9, 13, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 9, 14, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 9, 15, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 9, 16, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - -Route123_MapBGEvents: - bg_event 117, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61B3 - bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1_2 - bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2_2 - bg_event 10, 12, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61AA - bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL - bg_event 20, 7, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61BC - bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1_3 - bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE - bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION - bg_hidden_item_event 139, 15, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP - bg_hidden_item_event 138, 18, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY - -Route123_MapEvents:: - map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents - diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc deleted file mode 100644 index 2a0120cfd9..0000000000 --- a/data/maps/Route123/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route123: - .4byte Route123_Layout - .4byte Route123_MapEvents - .4byte Route123_MapScripts - .4byte Route123_MapConnections - .2byte MUS_DOORO_X4 - .2byte LAYOUT_ROUTE123 - .byte MAPSEC_ROUTE_123 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json new file mode 100644 index 0000000000..d5a99b75c5 --- /dev/null +++ b/data/maps/Route123/map.json @@ -0,0 +1,840 @@ +{ + "id": "MAP_ROUTE123", + "name": "Route123", + "layout": "LAYOUT_ROUTE123", + "music": "MUS_DOORO_X4", + "region_map_section": "MAPSEC_ROUTE_123", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 100, + "map": "MAP_ROUTE122" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE118" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 11, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 58, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 12, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 59, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 14, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 60, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 15, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 61, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 81, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 62, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 82, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 63, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 83, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 64, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 70, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route123_EventScript_1F61C5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 58, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route123_EventScript_1F61DC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 65, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 15, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 72, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 17, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 73, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 18, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 74, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 17, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 79, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 18, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 14, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 15, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 30, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 101, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 129, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 92, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_2906BB", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_290FB0", + "flag": "FLAG_ITEM_ROUTE_123_CALCIUM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 108, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_1F6151", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 109, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 87, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 110, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 88, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 111, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 89, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 18, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route123_EventScript_1F61F3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 38, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route123_EventScript_1F62E9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 37, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route123_EventScript_1F62CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 138, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route123_EventScript_1F620A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 49, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route123_EventScript_1F626C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 87, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route123_EventScript_1F6304", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 27, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_290FBD", + "flag": "FLAG_ITEM_ROUTE_123_ULTRA_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 75, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_290FCA", + "flag": "FLAG_ITEM_ROUTE_123_ELIXIR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 138, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route123_EventScript_1F6377", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 138, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route123_EventScript_1F6360", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 87, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route123_EventScript_1F6349", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 66, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route123_EventScript_1F63BC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 66, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route123_EventScript_1F6332", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 49, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route123_EventScript_1F631B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 43, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_290FD7", + "flag": "FLAG_ITEM_ROUTE_123_PP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 14, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route123_EventScript_1F638E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 14, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route123_EventScript_1F63A5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 57, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_290FE4", + "flag": "FLAG_ITEM_ROUTE_123_REVIVAL_HERB" + } + ], + "warp_events": [ + { + "x": 22, + "y": 6, + "elevation": 0, + "dest_map": "MAP_ROUTE123_BERRY_MASTERS_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "weather", + "x": 90, + "y": 16, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 92, + "y": 9, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 93, + "y": 12, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 92, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 91, + "y": 14, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 19, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 19, + "y": 12, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 34, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 19, + "y": 14, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 19, + "y": 15, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 19, + "y": 16, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 108, + "y": 14, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 109, + "y": 15, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 110, + "y": 16, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 111, + "y": 17, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 112, + "y": 18, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 9, + "y": 12, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 9, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 9, + "y": 14, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 9, + "y": 15, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 9, + "y": 16, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 94, + "y": 10, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 117, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route123_EventScript_1F61B3" + }, + { + "type": "secret_base", + "x": 47, + "y": 3, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE1_2" + }, + { + "type": "secret_base", + "x": 49, + "y": 3, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE2_2" + }, + { + "type": "sign", + "x": 10, + "y": 12, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route123_EventScript_1F61AA" + }, + { + "type": "hidden_item", + "x": 75, + "y": 1, + "elevation": 3, + "item": "ITEM_SUPER_REPEL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL" + }, + { + "type": "sign", + "x": 20, + "y": 7, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route123_EventScript_1F61BC" + }, + { + "type": "secret_base", + "x": 57, + "y": 5, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE1_3" + }, + { + "type": "hidden_item", + "x": 12, + "y": 1, + "elevation": 3, + "item": "ITEM_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE" + }, + { + "type": "hidden_item", + "x": 91, + "y": 15, + "elevation": 3, + "item": "ITEM_HYPER_POTION", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION" + }, + { + "type": "hidden_item", + "x": 139, + "y": 15, + "elevation": 3, + "item": "ITEM_PP_UP", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP" + }, + { + "type": "hidden_item", + "x": 138, + "y": 18, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route123_BerryMastersHouse/events.inc b/data/maps/Route123_BerryMastersHouse/events.inc deleted file mode 100644 index 4ad6c2b634..0000000000 --- a/data/maps/Route123_BerryMastersHouse/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route123_BerryMastersHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0 - -Route123_BerryMastersHouse_MapWarps: - warp_def 3, 7, 0, 0, MAP_ROUTE123 - warp_def 4, 7, 0, 0, MAP_ROUTE123 - -Route123_BerryMastersHouse_MapEvents:: - map_events Route123_BerryMastersHouse_EventObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc deleted file mode 100644 index 158471eaab..0000000000 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route123_BerryMastersHouse: - .4byte House2_Layout - .4byte Route123_BerryMastersHouse_MapEvents - .4byte Route123_BerryMastersHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_ROUTE_123 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json new file mode 100644 index 0000000000..47ad26314b --- /dev/null +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_ROUTE123_BERRY_MASTERS_HOUSE", + "name": "Route123_BerryMastersHouse", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_123", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_BerryMastersHouse_EventScript_26F845", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_BerryMastersHouse_EventScript_26F8C0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE123", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE123", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc deleted file mode 100644 index 959719385c..0000000000 --- a/data/maps/Route124/connections.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route124_MapConnectionsList: - connection down, 0, MAP_ROUTE126 - connection left, 10, MAP_LILYCOVE_CITY - connection right, 0, MAP_ROUTE125 - connection right, 40, MAP_MOSSDEEP_CITY - connection dive, 0, MAP_UNDERWATER1 - -Route124_MapConnections: - .4byte 5 - .4byte Route124_MapConnectionsList - diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc deleted file mode 100644 index 4096396e89..0000000000 --- a/data/maps/Route124/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -Route124_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, MOVEMENT_TYPE_LOOK_AROUND, 5, 0, 1, 3, Route124_EventScript_1F6585, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 5, 3, 1, 7, Route124_EventScript_1F659C, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 6, 8, 1, 5, Route124_EventScript_1F6615, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 7, 0, 1, 2, Route124_EventScript_1F662C, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FF1, FLAG_ITEM_ROUTE_124_RED_SHARD - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FFE, FLAG_ITEM_ROUTE_124_BLUE_SHARD - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_29100B, FLAG_ITEM_ROUTE_124_YELLOW_SHARD - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F6643, 0 - object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F66A7, 0 - object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route124_EventScript_1F670B, 0 - object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route124_EventScript_1F6722, 0 - -Route124_MapWarps: - warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE - -Route124_MapBGEvents: - bg_event 73, 48, 3, BG_EVENT_PLAYER_FACING_ANY, Route124_EventScript_1F657C - -Route124_MapEvents:: - map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents - diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc deleted file mode 100644 index 189d0dc516..0000000000 --- a/data/maps/Route124/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route124: - .4byte Route124_Layout - .4byte Route124_MapEvents - .4byte Route124_MapScripts - .4byte Route124_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE124 - .byte MAPSEC_ROUTE_124 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json new file mode 100644 index 0000000000..1f3ef4f6c2 --- /dev/null +++ b/data/maps/Route124/map.json @@ -0,0 +1,220 @@ +{ + "id": "MAP_ROUTE124", + "name": "Route124", + "layout": "LAYOUT_ROUTE124", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_124", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE126" + }, + { + "direction": "left", + "offset": 10, + "map": "MAP_LILYCOVE_CITY" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE125" + }, + { + "direction": "right", + "offset": 40, + "map": "MAP_MOSSDEEP_CITY" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER1" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 34, + "y": 25, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 5, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route124_EventScript_1F6585", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 61, + "y": 74, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 5, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route124_EventScript_1F659C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 49, + "y": 45, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route124_EventScript_1F65B3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 7, + "y": 23, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 6, + "movement_range_y": 8, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route124_EventScript_1F6615", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 58, + "y": 58, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 7, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route124_EventScript_1F662C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 28, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route124_EventScript_290FF1", + "flag": "FLAG_ITEM_ROUTE_124_RED_SHARD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route124_EventScript_290FFE", + "flag": "FLAG_ITEM_ROUTE_124_BLUE_SHARD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 58, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route124_EventScript_29100B", + "flag": "FLAG_ITEM_ROUTE_124_YELLOW_SHARD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 18, + "y": 44, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route124_EventScript_1F6643", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "x": 17, + "y": 44, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route124_EventScript_1F66A7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 7, + "y": 29, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route124_EventScript_1F670B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 69, + "y": 74, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route124_EventScript_1F6722", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 70, + "y": 48, + "elevation": 3, + "dest_map": "MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 73, + "y": 48, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route124_EventScript_1F657C" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc deleted file mode 100644 index 4cff6a1f3f..0000000000 --- a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route124_DivingTreasureHuntersHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0 - -Route124_DivingTreasureHuntersHouse_MapWarps: - warp_def 3, 8, 0, 0, MAP_ROUTE124 - warp_def 4, 8, 0, 0, MAP_ROUTE124 - -Route124_DivingTreasureHuntersHouse_MapBGEvents: - bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route124_DivingTreasureHuntersHouse_EventScript_270F63 - -Route124_DivingTreasureHuntersHouse_MapEvents:: - map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents - diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc deleted file mode 100644 index 46358f3374..0000000000 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route124_DivingTreasureHuntersHouse: - .4byte Route124_DivingTreasureHuntersHouse_Layout - .4byte Route124_DivingTreasureHuntersHouse_MapEvents - .4byte Route124_DivingTreasureHuntersHouse_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE - .byte MAPSEC_ROUTE_124 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json new file mode 100644 index 0000000000..ed159e565b --- /dev/null +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -0,0 +1,58 @@ +{ + "id": "MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", + "name": "Route124_DivingTreasureHuntersHouse", + "layout": "LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_ROUTE_124", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 5, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route124_DivingTreasureHuntersHouse_EventScript_270A32", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE124", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE124", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 7, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route124_DivingTreasureHuntersHouse_EventScript_270F63" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route125/connections.inc b/data/maps/Route125/connections.inc deleted file mode 100644 index 61ea9f0296..0000000000 --- a/data/maps/Route125/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route125_MapConnectionsList: - connection down, 0, MAP_MOSSDEEP_CITY - connection left, 0, MAP_ROUTE124 - connection dive, 0, MAP_UNDERWATER7 - -Route125_MapConnections: - .4byte 3 - .4byte Route125_MapConnectionsList - diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc deleted file mode 100644 index e278d6e241..0000000000 --- a/data/maps/Route125/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -Route125_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 31, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 2, 5, 1, 2, Route125_EventScript_1F67BB, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 38, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 30, 28, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 9, 9, 1, 3, Route125_EventScript_1F67E9, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route125_EventScript_1F6800, 0 - object_event 6, EVENT_OBJ_GFX_LASS, 0, 17, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route125_EventScript_1F6862, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 18, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route125_EventScript_1F687D, 0 - object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 43, 19, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 2, 1, 1, 3, Route125_EventScript_1F6898, 0 - object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 48, 19, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route125_EventScript_291018, FLAG_ITEM_ROUTE_125_BIG_PEARL - -Route125_MapWarps: - warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - -Route125_MapBGEvents: - bg_secret_base_event 53, 10, 0, SECRET_BASE_RED_CAVE1_2 - bg_secret_base_event 55, 11, 0, SECRET_BASE_RED_CAVE4_2 - bg_secret_base_event 7, 25, 0, SECRET_BASE_YELLOW_CAVE2_2 - bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4_2 - -Route125_MapEvents:: - map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents - diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc deleted file mode 100644 index b3a7308f31..0000000000 --- a/data/maps/Route125/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route125: - .4byte Route125_Layout - .4byte Route125_MapEvents - .4byte Route125_MapScripts - .4byte Route125_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE125 - .byte MAPSEC_ROUTE_125 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json new file mode 100644 index 0000000000..55f9b692dc --- /dev/null +++ b/data/maps/Route125/map.json @@ -0,0 +1,204 @@ +{ + "id": "MAP_ROUTE125", + "name": "Route125", + "layout": "LAYOUT_ROUTE125", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_125", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_MOSSDEEP_CITY" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE124" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER7" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 7, + "y": 31, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route125_EventScript_1F67A4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 45, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 2, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route125_EventScript_1F67BB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 38, + "y": 24, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 6, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route125_EventScript_1F67D2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 30, + "y": 28, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", + "movement_range_x": 9, + "movement_range_y": 9, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route125_EventScript_1F67E9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 21, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route125_EventScript_1F6800", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 17, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route125_EventScript_1F6862", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 18, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route125_EventScript_1F687D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 43, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route125_EventScript_1F6898", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 48, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route125_EventScript_1F68AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 46, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route125_EventScript_291018", + "flag": "FLAG_ITEM_ROUTE_125_BIG_PEARL" + } + ], + "warp_events": [ + { + "x": 22, + "y": 19, + "elevation": 0, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "secret_base", + "x": 53, + "y": 10, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE1_2" + }, + { + "type": "secret_base", + "x": 55, + "y": 11, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE4_2" + }, + { + "type": "secret_base", + "x": 7, + "y": 25, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE2_2" + }, + { + "type": "secret_base", + "x": 24, + "y": 32, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE4_2" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route126/connections.inc b/data/maps/Route126/connections.inc deleted file mode 100644 index 5784faa258..0000000000 --- a/data/maps/Route126/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route126_MapConnectionsList: - connection up, 0, MAP_ROUTE124 - connection right, 0, MAP_ROUTE127 - connection dive, 0, MAP_UNDERWATER2 - -Route126_MapConnections: - .4byte 3 - .4byte Route126_MapConnectionsList - diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc deleted file mode 100644 index 04355d668f..0000000000 --- a/data/maps/Route126/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -Route126_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 51, 65, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 3, 1, 3, Route126_EventScript_1F68D6, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route126_EventScript_1F6904, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 48, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route126_EventScript_1F691B, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route126_EventScript_291025, FLAG_ITEM_ROUTE_126_GREEN_SHARD - object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 15, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6960, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6977, 0 - object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6949, 0 - object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6932, 0 - -Route126_MapEvents:: - map_events Route126_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc deleted file mode 100644 index f0eabeeba4..0000000000 --- a/data/maps/Route126/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route126: - .4byte Route126_Layout - .4byte Route126_MapEvents - .4byte Route126_MapScripts - .4byte Route126_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE126 - .byte MAPSEC_ROUTE_126 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json new file mode 100644 index 0000000000..8ccd3c3658 --- /dev/null +++ b/data/maps/Route126/map.json @@ -0,0 +1,154 @@ +{ + "id": "MAP_ROUTE126", + "name": "Route126", + "layout": "LAYOUT_ROUTE126", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_126", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE124" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE127" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER2" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 51, + "y": 65, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", + "movement_range_x": 10, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route126_EventScript_1F68D6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 56, + "y": 22, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 9, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route126_EventScript_1F68ED", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 63, + "y": 43, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route126_EventScript_1F6904", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 9, + "y": 48, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route126_EventScript_1F691B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 14, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route126_EventScript_291025", + "flag": "FLAG_ITEM_ROUTE_126_GREEN_SHARD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 15, + "y": 66, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route126_EventScript_1F6960", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 7, + "y": 66, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route126_EventScript_1F6977", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 64, + "y": 5, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route126_EventScript_1F6949", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 56, + "y": 5, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route126_EventScript_1F6932", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route127/connections.inc b/data/maps/Route127/connections.inc deleted file mode 100644 index 8dcdf7978a..0000000000 --- a/data/maps/Route127/connections.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route127_MapConnectionsList: - connection up, 0, MAP_MOSSDEEP_CITY - connection down, 0, MAP_ROUTE128 - connection left, 0, MAP_ROUTE126 - connection dive, 0, MAP_UNDERWATER3 - -Route127_MapConnections: - .4byte 4 - .4byte Route127_MapConnectionsList - diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc deleted file mode 100644 index 7b9e040d30..0000000000 --- a/data/maps/Route127/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -Route127_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_291032, FLAG_ITEM_ROUTE_127_ZINC - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29103F, FLAG_ITEM_ROUTE_127_CARBOS - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 0, Route127_EventScript_1F6A63, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route127_EventScript_1F6A91, 0 - object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 54, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route127_EventScript_1F6A7A, 0 - object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 15, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route127_EventScript_1F6AA8, 0 - object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 3, Route127_EventScript_1F6AD6, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, FLAG_ITEM_ROUTE_127_RARE_CANDY - -Route127_MapBGEvents: - bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1 - bg_secret_base_event 59, 72, 0, SECRET_BASE_YELLOW_CAVE3_2 - bg_secret_base_event 67, 63, 0, SECRET_BASE_YELLOW_CAVE4_1 - bg_secret_base_event 61, 21, 0, SECRET_BASE_YELLOW_CAVE3_3 - bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1_3 - -Route127_MapEvents:: - map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents - diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc deleted file mode 100644 index 0a7055f1c5..0000000000 --- a/data/maps/Route127/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route127: - .4byte Route127_Layout - .4byte Route127_MapEvents - .4byte Route127_MapScripts - .4byte Route127_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE127 - .byte MAPSEC_ROUTE_127 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json new file mode 100644 index 0000000000..06fd540d20 --- /dev/null +++ b/data/maps/Route127/map.json @@ -0,0 +1,221 @@ +{ + "id": "MAP_ROUTE127", + "name": "Route127", + "layout": "LAYOUT_ROUTE127", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_127", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_MOSSDEEP_CITY" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE128" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE126" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER3" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 45, + "y": 42, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route127_EventScript_1F6A35", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 18, + "y": 68, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route127_EventScript_1F6A4C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route127_EventScript_291032", + "flag": "FLAG_ITEM_ROUTE_127_ZINC" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 64, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route127_EventScript_29103F", + "flag": "FLAG_ITEM_ROUTE_127_CARBOS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 42, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route127_EventScript_1F6A63", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 64, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route127_EventScript_1F6A91", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 54, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route127_EventScript_1F6A7A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 15, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route127_EventScript_1F6AA8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 63, + "y": 63, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route127_EventScript_1F6AD6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 12, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route127_EventScript_1F6ABF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 13, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route127_EventScript_29104C", + "flag": "FLAG_ITEM_ROUTE_127_RARE_CANDY" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "secret_base", + "x": 59, + "y": 67, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE4_1" + }, + { + "type": "secret_base", + "x": 59, + "y": 72, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE3_2" + }, + { + "type": "secret_base", + "x": 67, + "y": 63, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE4_1" + }, + { + "type": "secret_base", + "x": 61, + "y": 21, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE3_3" + }, + { + "type": "secret_base", + "x": 45, + "y": 24, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE1_3" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route128/connections.inc b/data/maps/Route128/connections.inc deleted file mode 100644 index b958dbd3b7..0000000000 --- a/data/maps/Route128/connections.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route128_MapConnectionsList: - connection up, 0, MAP_ROUTE127 - connection down, 0, MAP_ROUTE129 - connection right, -40, MAP_EVER_GRANDE_CITY - connection dive, 0, MAP_UNDERWATER4 - -Route128_MapConnections: - .4byte 4 - .4byte Route128_MapConnectionsList - diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc deleted file mode 100644 index 6a449b7614..0000000000 --- a/data/maps/Route128/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route128_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 33, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN, 5, 5, 1, 3, Route128_EventScript_1F6CBE, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0 - object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_STEVEN - object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_ARCHIE - object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_MAXIE - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route128_EventScript_1F6DB0, 0 - object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 47, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 24, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route128_EventScript_1F6D82, 0 - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 4, Route128_EventScript_1F6DDE, 0 - object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0 - -Route128_MapBGEvents: - bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1 - bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2 - bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3 - -Route128_MapEvents:: - map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents - diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc deleted file mode 100644 index 33894ba7c1..0000000000 --- a/data/maps/Route128/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route128: - .4byte Route128_Layout - .4byte Route128_MapEvents - .4byte Route128_MapScripts - .4byte Route128_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE128 - .byte MAPSEC_ROUTE_128 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json new file mode 100644 index 0000000000..b1d63ef636 --- /dev/null +++ b/data/maps/Route128/map.json @@ -0,0 +1,197 @@ +{ + "id": "MAP_ROUTE128", + "name": "Route128", + "layout": "LAYOUT_ROUTE128", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_128", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE127" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE129" + }, + { + "direction": "right", + "offset": -40, + "map": "MAP_EVER_GRANDE_CITY" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER4" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 35, + "y": 33, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN", + "movement_range_x": 5, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route128_EventScript_1F6CBE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 78, + "y": 24, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 5, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route128_EventScript_1F6D20", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 40, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_128_STEVEN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 37, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_128_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 38, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_128_MAXIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 63, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route128_EventScript_1F6DB0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 47, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route128_EventScript_1F6D99", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 24, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route128_EventScript_1F6D82", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 101, + "y": 29, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route128_EventScript_1F6DDE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 101, + "y": 22, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route128_EventScript_1F6DC7", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 49, + "y": 9, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1" + }, + { + "type": "hidden_item", + "x": 57, + "y": 21, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2" + }, + { + "type": "hidden_item", + "x": 31, + "y": 33, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route129/connections.inc b/data/maps/Route129/connections.inc deleted file mode 100644 index c486c13cb0..0000000000 --- a/data/maps/Route129/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route129_MapConnectionsList: - connection up, 0, MAP_ROUTE128 - connection left, 0, MAP_ROUTE130 - connection dive, 0, MAP_UNDERWATER5 - -Route129_MapConnections: - .4byte 3 - .4byte Route129_MapConnectionsList - diff --git a/data/maps/Route129/events.inc b/data/maps/Route129/events.inc deleted file mode 100644 index 3919274cd6..0000000000 --- a/data/maps/Route129/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route129_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 4, 1, 3, Route129_EventScript_1F72EC, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 14, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 5, 2, 1, 2, Route129_EventScript_1F7303, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 22, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route129_EventScript_1F7331, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, Route129_EventScript_1F731A, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 27, 1, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 1, 1, 1, 5, Route129_EventScript_1F7348, 0 - -Route129_MapEvents:: - map_events Route129_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc deleted file mode 100644 index fd3cae8014..0000000000 --- a/data/maps/Route129/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route129: - .4byte Route129_Layout - .4byte Route129_MapEvents - .4byte Route129_MapScripts - .4byte Route129_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE129 - .byte MAPSEC_ROUTE_129 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json new file mode 100644 index 0000000000..310a3e06a8 --- /dev/null +++ b/data/maps/Route129/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_ROUTE129", + "name": "Route129", + "layout": "LAYOUT_ROUTE129", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_129", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE128" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE130" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER5" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 28, + "y": 16, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", + "movement_range_x": 3, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route129_EventScript_1F72EC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 10, + "y": 14, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", + "movement_range_x": 5, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route129_EventScript_1F7303", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 13, + "y": 22, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route129_EventScript_1F7331", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 35, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route129_EventScript_1F731A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 13, + "y": 27, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route129_EventScript_1F7348", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route130/connections.inc b/data/maps/Route130/connections.inc deleted file mode 100644 index 4300eaae4e..0000000000 --- a/data/maps/Route130/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route130_MapConnectionsList: - connection left, 0, MAP_ROUTE131 - connection right, 0, MAP_ROUTE129 - -Route130_MapConnections: - .4byte 2 - .4byte Route130_MapConnectionsList - diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc deleted file mode 100644 index b07cc10017..0000000000 --- a/data/maps/Route130/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route130_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, BerryTreeScript, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 5, Route130_EventScript_1F73ED, 0 - -Route130_MapEvents:: - map_events Route130_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc deleted file mode 100644 index 5afd25edaf..0000000000 --- a/data/maps/Route130/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route130: - .4byte Route130_Layout - .4byte Route130_MapEvents - .4byte Route130_MapScripts - .4byte Route130_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE130 - .byte MAPSEC_ROUTE_130 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json new file mode 100644 index 0000000000..d9797e5cc1 --- /dev/null +++ b/data/maps/Route130/map.json @@ -0,0 +1,84 @@ +{ + "id": "MAP_ROUTE130", + "name": "Route130", + "layout": "LAYOUT_ROUTE130", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_130", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE131" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE129" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 70, + "y": 21, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", + "movement_range_x": 3, + "movement_range_y": 6, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route130_EventScript_1F73BF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 7, + "y": 21, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route130_EventScript_1F73D6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 52, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 82, + "script": "BerryTreeScript", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 7, + "y": 30, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route130_EventScript_1F73ED", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 5c7696eb78..819d9e4f3c 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -23,11 +23,11 @@ Route130_MapScript1_1F7365: @ 81F7365 setflag FLAG_TEMP_1D setflag FLAG_TEMP_1E setflag FLAG_TEMP_1F - setmaplayoutindex 263 + setmaplayoutindex LAYOUT_ROUTE130 end Route130_EventScript_1F73B1:: @ 81F73B1 - setmaplayoutindex 46 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08417FC4 end Route130_EventScript_1F73B5:: @ 81F73B5 diff --git a/data/maps/Route131/connections.inc b/data/maps/Route131/connections.inc deleted file mode 100644 index 9697ba1e0d..0000000000 --- a/data/maps/Route131/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route131_MapConnectionsList: - connection left, 0, MAP_PACIFIDLOG_TOWN - connection right, 0, MAP_ROUTE130 - -Route131_MapConnections: - .4byte 2 - .4byte Route131_MapConnectionsList - diff --git a/data/maps/Route131/events.inc b/data/maps/Route131/events.inc deleted file mode 100644 index 4f57f7b1c6..0000000000 --- a/data/maps/Route131/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route131_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 32, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN, 5, 7, 1, 3, Route131_EventScript_1F7429, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 19, 1, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 7, 1, 4, Route131_EventScript_1F7440, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 22, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 4, Route131_EventScript_1F7457, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 25, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP, 3, 5, 1, 3, Route131_EventScript_1F746E, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route131_EventScript_1F7485, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route131_EventScript_1F74A0, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 20, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route131_EventScript_1F74D2, 0 - object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 52, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route131_EventScript_1F74BB, 0 - -Route131_MapWarps: - warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE - -Route131_MapEvents:: - map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc deleted file mode 100644 index 177dba5ab7..0000000000 --- a/data/maps/Route131/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route131: - .4byte Route131_Layout - .4byte Route131_MapEvents - .4byte Route131_MapScripts - .4byte Route131_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE131 - .byte MAPSEC_ROUTE_131 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json new file mode 100644 index 0000000000..f8d56cc35b --- /dev/null +++ b/data/maps/Route131/map.json @@ -0,0 +1,144 @@ +{ + "id": "MAP_ROUTE131", + "name": "Route131", + "layout": "LAYOUT_ROUTE131", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_131", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_PACIFIDLOG_TOWN" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE130" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 41, + "y": 32, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN", + "movement_range_x": 5, + "movement_range_y": 7, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route131_EventScript_1F7429", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 18, + "y": 19, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 7, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route131_EventScript_1F7440", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 10, + "y": 22, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", + "movement_range_x": 6, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route131_EventScript_1F7457", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 31, + "y": 25, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP", + "movement_range_x": 3, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route131_EventScript_1F746E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 9, + "y": 16, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route131_EventScript_1F7485", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "x": 8, + "y": 16, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route131_EventScript_1F74A0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 52, + "y": 20, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route131_EventScript_1F74D2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 52, + "y": 27, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route131_EventScript_1F74BB", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 36, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index da36f4001d..700ac25f6a 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -9,7 +9,7 @@ Route131_MapScript1_1F740A: @ 81F740A end Route131_EventScript_1F741B:: @ 81F741B - setmaplayoutindex 319 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_0845D470 return Route131_EventScript_1F741F:: @ 81F741F diff --git a/data/maps/Route132/connections.inc b/data/maps/Route132/connections.inc deleted file mode 100644 index 48999eb5c9..0000000000 --- a/data/maps/Route132/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route132_MapConnectionsList: - connection left, 0, MAP_ROUTE133 - connection right, 0, MAP_PACIFIDLOG_TOWN - -Route132_MapConnections: - .4byte 2 - .4byte Route132_MapConnectionsList - diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc deleted file mode 100644 index 8ced112056..0000000000 --- a/data/maps/Route132/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route132_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 40, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route132_EventScript_1F74EA, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 2, Route132_EventScript_1F7501, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route132_EventScript_291059, FLAG_ITEM_ROUTE_132_RARE_CANDY - object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route132_EventScript_1F752F, 0 - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 49, 28, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route132_EventScript_1F7518, 0 - object_event 6, EVENT_OBJ_GFX_EXPERT_M, 0, 33, 26, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route132_EventScript_1F7546, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_5, 0, 33, 31, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 4, Route132_EventScript_1F755D, 0 - object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route132_EventScript_1F758B, 0 - object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 21, 25, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 4, Route132_EventScript_1F7574, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route132_EventScript_291066, FLAG_ITEM_ROUTE_132_PROTEIN - -Route132_MapEvents:: - map_events Route132_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc deleted file mode 100644 index 06e0ac05d1..0000000000 --- a/data/maps/Route132/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route132: - .4byte Route132_Layout - .4byte Route132_MapEvents - .4byte Route132_MapScripts - .4byte Route132_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE132 - .byte MAPSEC_ROUTE_132 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json new file mode 100644 index 0000000000..719863d2b2 --- /dev/null +++ b/data/maps/Route132/map.json @@ -0,0 +1,162 @@ +{ + "id": "MAP_ROUTE132", + "name": "Route132", + "layout": "LAYOUT_ROUTE132", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_132", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE133" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_PACIFIDLOG_TOWN" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 40, + "y": 13, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route132_EventScript_1F74EA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 10, + "y": 6, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route132_EventScript_1F7501", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 10, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route132_EventScript_291059", + "flag": "FLAG_ITEM_ROUTE_132_RARE_CANDY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 9, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route132_EventScript_1F752F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 49, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route132_EventScript_1F7518", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 33, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route132_EventScript_1F7546", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 33, + "y": 31, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route132_EventScript_1F755D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 21, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route132_EventScript_1F758B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 21, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route132_EventScript_1F7574", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 20, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route132_EventScript_291066", + "flag": "FLAG_ITEM_ROUTE_132_PROTEIN" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route133/connections.inc b/data/maps/Route133/connections.inc deleted file mode 100644 index 6a7777c4b2..0000000000 --- a/data/maps/Route133/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route133_MapConnectionsList: - connection left, 0, MAP_ROUTE134 - connection right, 0, MAP_ROUTE132 - -Route133_MapConnections: - .4byte 2 - .4byte Route133_MapConnectionsList - diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc deleted file mode 100644 index 641489016c..0000000000 --- a/data/maps/Route133/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route133_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291073, FLAG_ITEM_ROUTE_133_BIG_PEARL - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291080, FLAG_ITEM_ROUTE_133_STAR_PIECE - object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 7, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 2, Route133_EventScript_1F75FF, 0 - object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 37, 15, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0 - object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 56, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route133_EventScript_1F7616, 0 - object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 56, 15, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, Route133_EventScript_1F762D, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route133_EventScript_29108D, FLAG_ITEM_ROUTE_133_MAX_REVIVE - -Route133_MapEvents:: - map_events Route133_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc deleted file mode 100644 index 2d4cc8a664..0000000000 --- a/data/maps/Route133/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route133: - .4byte Route133_Layout - .4byte Route133_MapEvents - .4byte Route133_MapScripts - .4byte Route133_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE133 - .byte MAPSEC_ROUTE_133 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json new file mode 100644 index 0000000000..36e7380f73 --- /dev/null +++ b/data/maps/Route133/map.json @@ -0,0 +1,162 @@ +{ + "id": "MAP_ROUTE133", + "name": "Route133", + "layout": "LAYOUT_ROUTE133", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_133", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE134" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE132" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 68, + "y": 27, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route133_EventScript_1F75A3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 13, + "y": 3, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route133_EventScript_1F75D1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 68, + "y": 28, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route133_EventScript_1F75BA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 53, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route133_EventScript_291073", + "flag": "FLAG_ITEM_ROUTE_133_BIG_PEARL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route133_EventScript_291080", + "flag": "FLAG_ITEM_ROUTE_133_STAR_PIECE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 7, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route133_EventScript_1F75FF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 37, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route133_EventScript_1F75E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 56, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route133_EventScript_1F7616", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 56, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route133_EventScript_1F762D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 48, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route133_EventScript_29108D", + "flag": "FLAG_ITEM_ROUTE_133_MAX_REVIVE" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route134/connections.inc b/data/maps/Route134/connections.inc deleted file mode 100644 index 30989b3741..0000000000 --- a/data/maps/Route134/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route134_MapConnectionsList: - connection left, 0, MAP_SLATEPORT_CITY - connection right, 0, MAP_ROUTE133 - -Route134_MapConnections: - .4byte 2 - .4byte Route134_MapConnectionsList - diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc deleted file mode 100644 index 83e693c267..0000000000 --- a/data/maps/Route134/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route134_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 3, 5, 1, 2, Route134_EventScript_1F7653, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route134_EventScript_1F766A, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 41, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route134_EventScript_1F7698, 0 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 24, 23, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 1, 6, Route134_EventScript_1F7681, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 49, 16, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 43, 23, 1, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route134_EventScript_1F76F4, 0 - object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 3, 1, 6, Route134_EventScript_1F770B, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0 - object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, FLAG_ITEM_ROUTE_134_CARBOS - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, FLAG_ITEM_ROUTE_134_STAR_PIECE - -Route134_MapEvents:: - map_events Route134_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc deleted file mode 100644 index 87bddf5c75..0000000000 --- a/data/maps/Route134/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route134: - .4byte Route134_Layout - .4byte Route134_MapEvents - .4byte Route134_MapScripts - .4byte Route134_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE134 - .byte MAPSEC_ROUTE_134 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json new file mode 100644 index 0000000000..350db1e051 --- /dev/null +++ b/data/maps/Route134/map.json @@ -0,0 +1,175 @@ +{ + "id": "MAP_ROUTE134", + "name": "Route134", + "layout": "LAYOUT_ROUTE134", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_134", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_SLATEPORT_CITY" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE133" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 49, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT", + "movement_range_x": 3, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route134_EventScript_1F7653", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 58, + "y": 7, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route134_EventScript_1F766A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 41, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route134_EventScript_1F7698", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 24, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route134_EventScript_1F7681", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 49, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 6, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route134_EventScript_1F76AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 43, + "y": 23, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route134_EventScript_1F76F4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 24, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route134_EventScript_1F770B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 50, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 6, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route134_EventScript_1F76DD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 63, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route134_EventScript_1F76C6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 50, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route134_EventScript_29109A", + "flag": "FLAG_ITEM_ROUTE_134_CARBOS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 22, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route134_EventScript_2910A7", + "flag": "FLAG_ITEM_ROUTE_134_STAR_PIECE" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity/connections.inc b/data/maps/RustboroCity/connections.inc deleted file mode 100644 index c2921111f3..0000000000 --- a/data/maps/RustboroCity/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -RustboroCity_MapConnectionsList: - connection up, 0, MAP_ROUTE115 - connection down, 0, MAP_ROUTE104 - connection right, 0, MAP_ROUTE116 - -RustboroCity_MapConnections: - .4byte 3 - .4byte RustboroCity_MapConnectionsList - diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc deleted file mode 100644 index ecf816f7d4..0000000000 --- a/data/maps/RustboroCity/events.inc +++ /dev/null @@ -1,70 +0,0 @@ -RustboroCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E088A, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E085F, 0 - object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 25, 37, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0 - object_event 4, EVENT_OBJ_GFX_TWIN, 0, 21, 46, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E08D1, 0 - object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0 - object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 26, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0893, 0 - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY, 0, 24, 51, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0 - object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 25, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 - object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT - object_event 11, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 13, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E087E, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, FLAG_ITEM_RUSTBORO_CITY_X_DEFEND - object_event 13, EVENT_OBJ_GFX_MAN_4, 0, 19, 27, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E094E, 0 - object_event 14, EVENT_OBJ_GFX_VAR_0, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, FLAG_HIDE_RUSBORO_CITY_RIVAL - object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_SCIENTIST - object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, RustboroCity_EventScript_1E1236, 0 - -RustboroCity_MapWarps: - warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM - warp_def 13, 30, 0, 0, MAP_RUSTBORO_CITY_FLAT1_1F - warp_def 16, 45, 0, 0, MAP_RUSTBORO_CITY_MART - warp_def 16, 38, 0, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F - warp_def 27, 34, 0, 0, MAP_RUSTBORO_CITY_POKEMON_SCHOOL - warp_def 11, 15, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_1F - warp_def 12, 15, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_1F - warp_def 33, 19, 0, 0, MAP_RUSTBORO_CITY_HOUSE1 - warp_def 9, 38, 0, 0, MAP_RUSTBORO_CITY_CUTTERS_HOUSE - warp_def 30, 28, 0, 0, MAP_RUSTBORO_CITY_HOUSE2 - warp_def 5, 51, 0, 0, MAP_RUSTBORO_CITY_FLAT2_1F - warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3 - -RustboroCity_MapCoordEvents: - coord_event 23, 20, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E095A - coord_event 23, 21, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0971 - coord_event 23, 22, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0988 - coord_event 23, 23, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E099F - coord_event 23, 24, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E09B6 - coord_event 30, 9, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0AFE - coord_event 29, 10, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B0A - coord_event 30, 11, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B16 - coord_event 30, 12, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B22 - coord_event 30, 9, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C2B - coord_event 31, 10, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C37 - coord_event 30, 11, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C43 - coord_event 30, 12, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C4F - coord_event 12, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0DF3 - coord_event 13, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0E33 - coord_event 14, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0E73 - coord_event 15, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0EB3 - coord_event 16, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0EF3 - coord_event 17, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0F33 - coord_event 18, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0F73 - coord_event 19, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0FB3 - -RustboroCity_MapBGEvents: - bg_event 23, 19, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08F5 - bg_event 25, 35, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0910 - bg_event 17, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E6A - bg_event 18, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E73 - bg_event 19, 49, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0907 - bg_event 18, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E6A - bg_event 17, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E73 - bg_event 17, 20, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08EC - bg_event 30, 8, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08E3 - bg_event 12, 38, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0919 - -RustboroCity_MapEvents:: - map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents - diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc deleted file mode 100644 index f1f4a3d8ce..0000000000 --- a/data/maps/RustboroCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity: - .4byte RustboroCity_Layout - .4byte RustboroCity_MapEvents - .4byte RustboroCity_MapScripts - .4byte RustboroCity_MapConnections - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json new file mode 100644 index 0000000000..7d09f0cdcb --- /dev/null +++ b/data/maps/RustboroCity/map.json @@ -0,0 +1,601 @@ +{ + "id": "MAP_RUSTBORO_CITY", + "name": "RustboroCity", + "layout": "LAYOUT_RUSTBORO_CITY", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE115" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE104" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE116" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 22, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E088A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 19, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E085F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 25, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E08DA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 21, + "y": 46, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E08D1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 12, + "y": 45, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E08B2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 26, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E0893", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 24, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E0922", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 25, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E0938", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 30, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E0ADD", + "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 13, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "x": 13, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E087E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 36, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_2910DB", + "flag": "FLAG_ITEM_RUSTBORO_CITY_X_DEFEND" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 19, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E094E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 16, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E0DB8", + "flag": "FLAG_HIDE_RUSBORO_CITY_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 11, + "y": 15, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_RUSTBORO_CITY_SCIENTIST" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 31, + "y": 36, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E1236", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 27, + "y": 19, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_GYM", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 30, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT1_1F", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 45, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_MART", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 38, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 27, + "y": 34, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_POKEMON_SCHOOL", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 15, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_1F", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 15, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_1F", + "dest_warp_id": 1 + }, + { + "x": 33, + "y": 19, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 38, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_CUTTERS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 30, + "y": 28, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 51, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT2_1F", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 46, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_HOUSE3", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 23, + "y": 20, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 1, + "script": "RustboroCity_EventScript_1E095A" + }, + { + "type": "trigger", + "x": 23, + "y": 21, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 1, + "script": "RustboroCity_EventScript_1E0971" + }, + { + "type": "trigger", + "x": 23, + "y": 22, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 1, + "script": "RustboroCity_EventScript_1E0988" + }, + { + "type": "trigger", + "x": 23, + "y": 23, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 1, + "script": "RustboroCity_EventScript_1E099F" + }, + { + "type": "trigger", + "x": 23, + "y": 24, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 1, + "script": "RustboroCity_EventScript_1E09B6" + }, + { + "type": "trigger", + "x": 30, + "y": 9, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 2, + "script": "RustboroCity_EventScript_1E0AFE" + }, + { + "type": "trigger", + "x": 29, + "y": 10, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 2, + "script": "RustboroCity_EventScript_1E0B0A" + }, + { + "type": "trigger", + "x": 30, + "y": 11, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 2, + "script": "RustboroCity_EventScript_1E0B16" + }, + { + "type": "trigger", + "x": 30, + "y": 12, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 2, + "script": "RustboroCity_EventScript_1E0B22" + }, + { + "type": "trigger", + "x": 30, + "y": 9, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 4, + "script": "RustboroCity_EventScript_1E0C2B" + }, + { + "type": "trigger", + "x": 31, + "y": 10, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 4, + "script": "RustboroCity_EventScript_1E0C37" + }, + { + "type": "trigger", + "x": 30, + "y": 11, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 4, + "script": "RustboroCity_EventScript_1E0C43" + }, + { + "type": "trigger", + "x": 30, + "y": 12, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 4, + "script": "RustboroCity_EventScript_1E0C4F" + }, + { + "type": "trigger", + "x": 12, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0DF3" + }, + { + "type": "trigger", + "x": 13, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0E33" + }, + { + "type": "trigger", + "x": 14, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0E73" + }, + { + "type": "trigger", + "x": 15, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0EB3" + }, + { + "type": "trigger", + "x": 16, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0EF3" + }, + { + "type": "trigger", + "x": 17, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0F33" + }, + { + "type": "trigger", + "x": 18, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0F73" + }, + { + "type": "trigger", + "x": 19, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0FB3" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 23, + "y": 19, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_EventScript_1E08F5" + }, + { + "type": "sign", + "x": 25, + "y": 35, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_EventScript_1E0910" + }, + { + "type": "sign", + "x": 17, + "y": 45, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "RustboroCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 18, + "y": 38, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "RustboroCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 19, + "y": 49, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_EventScript_1E0907" + }, + { + "type": "sign", + "x": 18, + "y": 45, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "RustboroCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 17, + "y": 38, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "RustboroCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 17, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_EventScript_1E08EC" + }, + { + "type": "sign", + "x": 30, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_EventScript_1E08E3" + }, + { + "type": "sign", + "x": 12, + "y": 38, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_EventScript_1E0919" + } + ] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_CuttersHouse/events.inc b/data/maps/RustboroCity_CuttersHouse/events.inc deleted file mode 100644 index 4980d5b959..0000000000 --- a/data/maps/RustboroCity_CuttersHouse/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -RustboroCity_CuttersHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0 - -RustboroCity_CuttersHouse_MapWarps: - warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY - warp_def 6, 8, 0, 8, MAP_RUSTBORO_CITY - -RustboroCity_CuttersHouse_MapEvents:: - map_events RustboroCity_CuttersHouse_EventObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc deleted file mode 100644 index 434b27c3ef..0000000000 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_CuttersHouse: - .4byte RustboroCity_CuttersHouse_Layout - .4byte RustboroCity_CuttersHouse_MapEvents - .4byte RustboroCity_CuttersHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json new file mode 100644 index 0000000000..f2490588a6 --- /dev/null +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_RUSTBORO_CITY_CUTTERS_HOUSE", + "name": "RustboroCity_CuttersHouse", + "layout": "LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_CuttersHouse_EventScript_215BD4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_CuttersHouse_EventScript_215C0A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 8 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_1F/events.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc deleted file mode 100644 index a3ed4affbd..0000000000 --- a/data/maps/RustboroCity_DevonCorp_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -RustboroCity_DevonCorp_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 2, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0 - object_event 2, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 15, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0 - -RustboroCity_DevonCorp_1F_MapWarps: - warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY - warp_def 6, 8, 0, 6, MAP_RUSTBORO_CITY - warp_def 14, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_2F - -RustboroCity_DevonCorp_1F_MapBGEvents: - bg_event 3, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_1F_EventScript_211312 - bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_1F_EventScript_211309 - -RustboroCity_DevonCorp_1F_MapEvents:: - map_events RustboroCity_DevonCorp_1F_EventObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, RustboroCity_DevonCorp_1F_MapBGEvents - diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc deleted file mode 100644 index 3515eacb5b..0000000000 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_1F: - .4byte RustboroCity_DevonCorp_1F_Layout - .4byte RustboroCity_DevonCorp_1F_MapEvents - .4byte RustboroCity_DevonCorp_1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json new file mode 100644 index 0000000000..8bb9a2e2f9 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -0,0 +1,99 @@ +{ + "id": "MAP_RUSTBORO_CITY_DEVON_CORP_1F", + "name": "RustboroCity_DevonCorp_1F", + "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_1F_EventScript_211261", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "x": 15, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_1F_EventScript_211293", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_1F_EventScript_2112CE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 5 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 6 + }, + { + "x": 14, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_DevonCorp_1F_EventScript_211312" + }, + { + "type": "sign", + "x": 8, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_DevonCorp_1F_EventScript_211309" + } + ] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_2F/events.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc deleted file mode 100644 index fdf2e319ea..0000000000 --- a/data/maps/RustboroCity_DevonCorp_2F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 10, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0 - -RustboroCity_DevonCorp_2F_MapWarps: - warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F - warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_3F - -RustboroCity_DevonCorp_2F_MapEvents:: - map_events RustboroCity_DevonCorp_2F_EventObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc deleted file mode 100644 index dea4bb1b4b..0000000000 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_2F: - .4byte RustboroCity_DevonCorp_2F_Layout - .4byte RustboroCity_DevonCorp_2F_MapEvents - .4byte RustboroCity_DevonCorp_2F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json new file mode 100644 index 0000000000..01da7a9383 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_RUSTBORO_CITY_DEVON_CORP_2F", + "name": "RustboroCity_DevonCorp_2F", + "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_2F_EventScript_21186F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_2F_EventScript_211886", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_2F_EventScript_2118B0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 10, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_2F_EventScript_2118DA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 14, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_2F_EventScript_2118F1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_2F_EventScript_211BCF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 14, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_1F", + "dest_warp_id": 2 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc deleted file mode 100644 index e9bae97463..0000000000 --- a/data/maps/RustboroCity_DevonCorp_3F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_3F_EventObjects: - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 - -RustboroCity_DevonCorp_3F_MapWarps: - warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F - -RustboroCity_DevonCorp_3F_MapBGEvents: - bg_event 1, 5, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_212600 - bg_event 1, 7, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_212600 - -RustboroCity_DevonCorp_3F_MapEvents:: - map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents - diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc deleted file mode 100644 index f64fe62539..0000000000 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_3F: - .4byte RustboroCity_DevonCorp_3F_Layout - .4byte RustboroCity_DevonCorp_3F_MapEvents - .4byte RustboroCity_DevonCorp_3F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json new file mode 100644 index 0000000000..91e8e53fc1 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -0,0 +1,85 @@ +{ + "id": "MAP_RUSTBORO_CITY_DEVON_CORP_3F", + "name": "RustboroCity_DevonCorp_3F", + "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 17, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_3F_EventScript_21256C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_3F_EventScript_2125E1", + "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 15, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_3F_EventScript_21256C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_2F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 1, + "y": 5, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_DevonCorp_3F_EventScript_212600" + }, + { + "type": "sign", + "x": 1, + "y": 7, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_DevonCorp_3F_EventScript_212600" + } + ] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat1_1F/events.inc b/data/maps/RustboroCity_Flat1_1F/events.inc deleted file mode 100644 index 7f745cbfd8..0000000000 --- a/data/maps/RustboroCity_Flat1_1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -RustboroCity_Flat1_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0 - -RustboroCity_Flat1_1F_MapWarps: - warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY - warp_def 7, 7, 0, 1, MAP_RUSTBORO_CITY - warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT1_2F - -RustboroCity_Flat1_1F_MapEvents:: - map_events RustboroCity_Flat1_1F_EventObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc deleted file mode 100644 index ea268aed46..0000000000 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat1_1F: - .4byte RustboroCity_Flat1_1F_Layout - .4byte RustboroCity_Flat1_1F_MapEvents - .4byte RustboroCity_Flat1_1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_FLAT1_1F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json new file mode 100644 index 0000000000..d0a4e56159 --- /dev/null +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_RUSTBORO_CITY_FLAT1_1F", + "name": "RustboroCity_Flat1_1F", + "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_1F_EventScript_2150CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 12, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_1F_EventScript_2150D7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 7, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 7, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT1_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat1_2F/events.inc b/data/maps/RustboroCity_Flat1_2F/events.inc deleted file mode 100644 index 02c650f870..0000000000 --- a/data/maps/RustboroCity_Flat1_2F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -RustboroCity_Flat1_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0 - object_event 2, EVENT_OBJ_GFX_TWIN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 4, EVENT_OBJ_GFX_TREECKO_DOLL, 0, 10, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 5, EVENT_OBJ_GFX_TORCHIC_DOLL, 0, 10, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0 - object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - -RustboroCity_Flat1_2F_MapWarps: - warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F - -RustboroCity_Flat1_2F_MapEvents:: - map_events RustboroCity_Flat1_2F_EventObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc deleted file mode 100644 index 9f6d03649d..0000000000 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat1_2F: - .4byte RustboroCity_Flat1_2F_Layout - .4byte RustboroCity_Flat1_2F_MapEvents - .4byte RustboroCity_Flat1_2F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_FLAT1_2F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json new file mode 100644 index 0000000000..0f2de8d538 --- /dev/null +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -0,0 +1,133 @@ +{ + "id": "MAP_RUSTBORO_CITY_FLAT1_2F", + "name": "RustboroCity_Flat1_2F", + "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_2F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_21523D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SKITTY_DOLL", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_215246", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TREECKO_DOLL", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_215246", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TORCHIC_DOLL", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_215246", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_21513A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MUDKIP_DOLL", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_215246", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PIKACHU_DOLL", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_215246", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT1_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat2_1F/events.inc b/data/maps/RustboroCity_Flat2_1F/events.inc deleted file mode 100644 index 82105a66a4..0000000000 --- a/data/maps/RustboroCity_Flat2_1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -RustboroCity_Flat2_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0 - -RustboroCity_Flat2_1F_MapWarps: - warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY - warp_def 3, 8, 0, 10, MAP_RUSTBORO_CITY - warp_def 3, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_2F - -RustboroCity_Flat2_1F_MapEvents:: - map_events RustboroCity_Flat2_1F_EventObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc deleted file mode 100644 index 73ae198856..0000000000 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat2_1F: - .4byte RustboroCity_Flat2_1F_Layout - .4byte RustboroCity_Flat2_1F_MapEvents - .4byte RustboroCity_Flat2_1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_FLAT2_1F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json new file mode 100644 index 0000000000..9fab521c7a --- /dev/null +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_RUSTBORO_CITY_FLAT2_1F", + "name": "RustboroCity_Flat2_1F", + "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat2_1F_EventScript_215F80", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat2_1F_EventScript_215F77", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 10 + }, + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 10 + }, + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT2_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat2_2F/events.inc b/data/maps/RustboroCity_Flat2_2F/events.inc deleted file mode 100644 index fd8fad1a48..0000000000 --- a/data/maps/RustboroCity_Flat2_2F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -RustboroCity_Flat2_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0 - object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0 - -RustboroCity_Flat2_2F_MapWarps: - warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F - warp_def 1, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_3F - -RustboroCity_Flat2_2F_MapEvents:: - map_events RustboroCity_Flat2_2F_EventObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc deleted file mode 100644 index d002b54ae5..0000000000 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat2_2F: - .4byte RustboroCity_Flat2_2F_Layout - .4byte RustboroCity_Flat2_2F_MapEvents - .4byte RustboroCity_Flat2_2F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_FLAT2_2F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json new file mode 100644 index 0000000000..20ed3c9d45 --- /dev/null +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_RUSTBORO_CITY_FLAT2_2F", + "name": "RustboroCity_Flat2_2F", + "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_2F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat2_2F_EventScript_215FD8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 2, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat2_2F_EventScript_215FE1", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT2_1F", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT2_3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat2_3F/events.inc b/data/maps/RustboroCity_Flat2_3F/events.inc deleted file mode 100644 index a33992eb26..0000000000 --- a/data/maps/RustboroCity_Flat2_3F/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -RustboroCity_Flat2_3F_EventObjects: - object_event 1, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0 - -RustboroCity_Flat2_3F_MapWarps: - warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F - -RustboroCity_Flat2_3F_MapEvents:: - map_events RustboroCity_Flat2_3F_EventObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc deleted file mode 100644 index 1b7f52fcaf..0000000000 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat2_3F: - .4byte RustboroCity_Flat2_3F_Layout - .4byte RustboroCity_Flat2_3F_MapEvents - .4byte RustboroCity_Flat2_3F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_FLAT2_3F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json new file mode 100644 index 0000000000..8ad2605112 --- /dev/null +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_RUSTBORO_CITY_FLAT2_3F", + "name": "RustboroCity_Flat2_3F", + "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_3F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 2, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat2_3F_EventScript_216117", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 12, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat2_3F_EventScript_216120", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT2_2F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc deleted file mode 100644 index 3fb1517998..0000000000 --- a/data/maps/RustboroCity_Gym/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -RustboroCity_Gym_EventObjects: - object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0 - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0 - object_event 5, EVENT_OBJ_GFX_HIKER, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, RustboroCity_Gym_EventScript_213011, 0 - -RustboroCity_Gym_MapWarps: - warp_def 5, 19, 0, 0, MAP_RUSTBORO_CITY - warp_def 6, 19, 0, 0, MAP_RUSTBORO_CITY - -RustboroCity_Gym_MapBGEvents: - bg_event 2, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_213047 - bg_event 8, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_213057 - -RustboroCity_Gym_MapEvents:: - map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents - diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc deleted file mode 100644 index 4f043ed982..0000000000 --- a/data/maps/RustboroCity_Gym/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Gym: - .4byte RustboroCity_Gym_Layout - .4byte RustboroCity_Gym_MapEvents - .4byte RustboroCity_Gym_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_RUSTBORO_CITY_GYM - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json new file mode 100644 index 0000000000..ace68d0577 --- /dev/null +++ b/data/maps/RustboroCity_Gym/map.json @@ -0,0 +1,118 @@ +{ + "id": "MAP_RUSTBORO_CITY_GYM", + "name": "RustboroCity_Gym", + "layout": "LAYOUT_RUSTBORO_CITY_GYM", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ROXANNE", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Gym_EventScript_212F31", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 5, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "RustboroCity_Gym_EventScript_212FE3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 3, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RustboroCity_Gym_EventScript_212FFA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 3, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Gym_EventScript_213028", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RustboroCity_Gym_EventScript_213011", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 19, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 19, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 2, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "RustboroCity_Gym_EventScript_213047" + }, + { + "type": "sign", + "x": 8, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "RustboroCity_Gym_EventScript_213057" + } + ] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_House1/events.inc b/data/maps/RustboroCity_House1/events.inc deleted file mode 100644 index 4278568e6e..0000000000 --- a/data/maps/RustboroCity_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -RustboroCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0 - -RustboroCity_House1_MapWarps: - warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY - warp_def 6, 7, 0, 7, MAP_RUSTBORO_CITY - -RustboroCity_House1_MapEvents:: - map_events RustboroCity_House1_EventObjects, RustboroCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc deleted file mode 100644 index 22c08344aa..0000000000 --- a/data/maps/RustboroCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_House1: - .4byte RustboroCity_House1_Layout - .4byte RustboroCity_House1_MapEvents - .4byte RustboroCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_HOUSE1 - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json new file mode 100644 index 0000000000..598429b227 --- /dev/null +++ b/data/maps/RustboroCity_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_RUSTBORO_CITY_HOUSE1", + "name": "RustboroCity_House1", + "layout": "LAYOUT_RUSTBORO_CITY_HOUSE1", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House1_EventScript_21593F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House1_EventScript_2159DF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 7 + }, + { + "x": 6, + "y": 7, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_House2/events.inc b/data/maps/RustboroCity_House2/events.inc deleted file mode 100644 index 87f324126c..0000000000 --- a/data/maps/RustboroCity_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -RustboroCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0 - -RustboroCity_House2_MapWarps: - warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY - warp_def 6, 8, 0, 9, MAP_RUSTBORO_CITY - -RustboroCity_House2_MapEvents:: - map_events RustboroCity_House2_EventObjects, RustboroCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc deleted file mode 100644 index 564b2aecc8..0000000000 --- a/data/maps/RustboroCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_House2: - .4byte RustboroCity_House_Layout - .4byte RustboroCity_House2_MapEvents - .4byte RustboroCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_HOUSE - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json new file mode 100644 index 0000000000..7533e995b9 --- /dev/null +++ b/data/maps/RustboroCity_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_RUSTBORO_CITY_HOUSE2", + "name": "RustboroCity_House2", + "layout": "LAYOUT_RUSTBORO_CITY_HOUSE", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House2_EventScript_215EB4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House2_EventScript_215EBD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 9 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_House3/events.inc b/data/maps/RustboroCity_House3/events.inc deleted file mode 100644 index 3d32a9c731..0000000000 --- a/data/maps/RustboroCity_House3/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -RustboroCity_House3_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0 - object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0 - -RustboroCity_House3_MapWarps: - warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY - warp_def 6, 8, 0, 11, MAP_RUSTBORO_CITY - -RustboroCity_House3_MapEvents:: - map_events RustboroCity_House3_EventObjects, RustboroCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc deleted file mode 100644 index eea35721ca..0000000000 --- a/data/maps/RustboroCity_House3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_House3: - .4byte RustboroCity_House_Layout - .4byte RustboroCity_House3_MapEvents - .4byte RustboroCity_House3_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_HOUSE - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json new file mode 100644 index 0000000000..c11aa89e38 --- /dev/null +++ b/data/maps/RustboroCity_House3/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_RUSTBORO_CITY_HOUSE3", + "name": "RustboroCity_House3", + "layout": "LAYOUT_RUSTBORO_CITY_HOUSE", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House3_EventScript_216191", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House3_EventScript_21619A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House3_EventScript_2161A3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 11 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 11 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Mart/events.inc b/data/maps/RustboroCity_Mart/events.inc deleted file mode 100644 index 131ffe24b2..0000000000 --- a/data/maps/RustboroCity_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -RustboroCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_Mart_EventScript_214F74, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_Mart_EventScript_214F86, 0 - -RustboroCity_Mart_MapWarps: - warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY - warp_def 4, 7, 0, 2, MAP_RUSTBORO_CITY - -RustboroCity_Mart_MapEvents:: - map_events RustboroCity_Mart_EventObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc deleted file mode 100644 index f6dbd60a58..0000000000 --- a/data/maps/RustboroCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Mart: - .4byte Mart_Layout - .4byte RustboroCity_Mart_MapEvents - .4byte RustboroCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json new file mode 100644 index 0000000000..714edcd584 --- /dev/null +++ b/data/maps/RustboroCity_Mart/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_RUSTBORO_CITY_MART", + "name": "RustboroCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Mart_EventScript_214F06", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Mart_EventScript_214F7D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Mart_EventScript_214F74", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Mart_EventScript_214F86", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_PokemonCenter_1F/events.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 50b18e8823..0000000000 --- a/data/maps/RustboroCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0 - -RustboroCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY - warp_def 6, 8, 3, 3, MAP_RUSTBORO_CITY - warp_def 1, 6, 4, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_2F - -RustboroCity_PokemonCenter_1F_MapEvents:: - map_events RustboroCity_PokemonCenter_1F_EventObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 71f0d8b258..0000000000 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte RustboroCity_PokemonCenter_1F_MapEvents - .4byte RustboroCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..aabe2785fe --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F", + "name": "RustboroCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_1F_EventScript_214D76", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_1F_EventScript_214D84", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_1F_EventScript_214D8D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_1F_EventScript_214D96", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_RUSTBORO_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_PokemonCenter_2F/events.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc deleted file mode 100644 index a565f259b4..0000000000 --- a/data/maps/RustboroCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -RustboroCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -RustboroCity_PokemonCenter_2F_MapEvents:: - map_events RustboroCity_PokemonCenter_2F_EventObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 2ee6bdfd15..0000000000 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte RustboroCity_PokemonCenter_2F_MapEvents - .4byte RustboroCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..9c63421e36 --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_2F", + "name": "RustboroCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc deleted file mode 100644 index 0d230b178b..0000000000 --- a/data/maps/RustboroCity_PokemonSchool/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -RustboroCity_PokemonSchool_EventObjects: - object_event 1, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0 - object_event 2, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0 - object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0 - object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0 - object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT - -RustboroCity_PokemonSchool_MapWarps: - warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY - warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY - -RustboroCity_PokemonSchool_MapBGEvents: - bg_event 5, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 4, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 6, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 3, 5, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213F8C - -RustboroCity_PokemonSchool_MapEvents:: - map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents - diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc deleted file mode 100644 index e02d9c7110..0000000000 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_PokemonSchool: - .4byte RustboroCity_PokemonSchool_Layout - .4byte RustboroCity_PokemonSchool_MapEvents - .4byte RustboroCity_PokemonSchool_MapScripts - .4byte 0x0 - .2byte MUS_P_SCHOOL - .2byte LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json new file mode 100644 index 0000000000..fb6944f400 --- /dev/null +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -0,0 +1,168 @@ +{ + "id": "MAP_RUSTBORO_CITY_POKEMON_SCHOOL", + "name": "RustboroCity_PokemonSchool", + "layout": "LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL", + "music": "MUS_P_SCHOOL", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_213F5F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_213F68", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 3, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_213F71", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_213F7A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_213F83", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_213F95", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 0, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_214040", + "flag": "FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT" + } + ], + "warp_events": [ + { + "x": 5, + "y": 10, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 4 + }, + { + "x": 6, + "y": 10, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + }, + { + "type": "sign", + "x": 4, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + }, + { + "type": "sign", + "x": 6, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + }, + { + "type": "sign", + "x": 7, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + }, + { + "type": "sign", + "x": 3, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_PokemonSchool_EventScript_213F8C" + } + ] +} \ No newline at end of file diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc deleted file mode 100644 index ea48a4828a..0000000000 --- a/data/maps/RusturfTunnel/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -RusturfTunnel_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN - object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER - object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, FLAG_HIDE_RUSTURF_TUNNEL_PEEKO - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 - object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, RusturfTunnel_EventScript_22D1B1, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN - -RusturfTunnel_MapWarps: - warp_def 4, 10, 3, 0, MAP_ROUTE116 - warp_def 29, 16, 3, 4, MAP_VERDANTURF_TOWN - warp_def 18, 20, 3, 2, MAP_ROUTE116 - -RusturfTunnel_MapCoordEvents: - coord_event 23, 4, 3, 0, 0, RusturfTunnel_EventScript_22D071 - coord_event 9, 4, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083 - coord_event 9, 5, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083 - coord_event 25, 4, 3, 0, 0, RusturfTunnel_EventScript_22D077 - coord_event 25, 5, 3, 0, 0, RusturfTunnel_EventScript_22D07D - -RusturfTunnel_MapEvents:: - map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 - diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc deleted file mode 100644 index 8bb9fa94fa..0000000000 --- a/data/maps/RusturfTunnel/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RusturfTunnel: - .4byte RusturfTunnel_Layout - .4byte RusturfTunnel_MapEvents - .4byte RusturfTunnel_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_RUSTURF_TUNNEL - .byte MAPSEC_RUSTURF_TUNNEL - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json new file mode 100644 index 0000000000..424dd4789c --- /dev/null +++ b/data/maps/RusturfTunnel/map.json @@ -0,0 +1,219 @@ +{ + "id": "MAP_RUSTURF_TUNNEL", + "name": "RusturfTunnel", + "layout": "LAYOUT_RUSTURF_TUNNEL", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_RUSTURF_TUNNEL", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 23, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_22CE76", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 24, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_2907A6", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_291136", + "flag": "FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 30, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_291143", + "flag": "FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_22D0C2", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 14, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_22D0AF", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_PEEKO" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 24, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_2907A6", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 32, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RusturfTunnel_EventScript_22D1B1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 25, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_22CE5F", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN" + } + ], + "warp_events": [ + { + "x": 4, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE116", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 16, + "elevation": 3, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 4 + }, + { + "x": 18, + "y": 20, + "elevation": 3, + "dest_map": "MAP_ROUTE116", + "dest_warp_id": 2 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 23, + "y": 4, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "RusturfTunnel_EventScript_22D071" + }, + { + "type": "trigger", + "x": 9, + "y": 4, + "elevation": 3, + "var": "VAR_RUSTURF_TUNNEL_STATE", + "var_value": 2, + "script": "RusturfTunnel_EventScript_22D083" + }, + { + "type": "trigger", + "x": 9, + "y": 5, + "elevation": 3, + "var": "VAR_RUSTURF_TUNNEL_STATE", + "var_value": 2, + "script": "RusturfTunnel_EventScript_22D083" + }, + { + "type": "trigger", + "x": 25, + "y": 4, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "RusturfTunnel_EventScript_22D077" + }, + { + "type": "trigger", + "x": 25, + "y": 5, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "RusturfTunnel_EventScript_22D07D" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc deleted file mode 100644 index 56a07b43e4..0000000000 --- a/data/maps/SSTidalCorridor/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -SSTidalCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT - -SSTidalCorridor_MapWarps: - warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS - warp_def 7, 9, 3, 2, MAP_SS_TIDAL_ROOMS - warp_def 10, 9, 3, 4, MAP_SS_TIDAL_ROOMS - warp_def 13, 9, 3, 6, MAP_SS_TIDAL_ROOMS - warp_def 4, 3, 3, 8, MAP_SS_TIDAL_ROOMS - warp_def 7, 3, 3, 9, MAP_SS_TIDAL_ROOMS - warp_def 10, 3, 3, 10, MAP_SS_TIDAL_ROOMS - warp_def 13, 3, 3, 11, MAP_SS_TIDAL_ROOMS - warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK - -SSTidalCorridor_MapBGEvents: - bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 14, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C0F5 - bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C0FE - bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C107 - bg_event 14, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C110 - -SSTidalCorridor_MapEvents:: - map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents - diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc deleted file mode 100644 index 972fae2154..0000000000 --- a/data/maps/SSTidalCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSTidalCorridor: - .4byte SSTidalCorridor_Layout - .4byte SSTidalCorridor_MapEvents - .4byte SSTidalCorridor_MapScripts - .4byte 0x0 - .2byte MUS_M_BOAT - .2byte LAYOUT_SS_TIDAL_CORRIDOR - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json new file mode 100644 index 0000000000..c8192aaa84 --- /dev/null +++ b/data/maps/SSTidalCorridor/map.json @@ -0,0 +1,247 @@ +{ + "id": "MAP_SS_TIDAL_CORRIDOR", + "name": "SSTidalCorridor", + "layout": "LAYOUT_SS_TIDAL_CORRIDOR", + "music": "MUS_M_BOAT", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 1, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalCorridor_EventScript_23C119", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 16, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalCorridor_EventScript_23C1A3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalCorridor_EventScript_23C0D9", + "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalCorridor_EventScript_23C0E2", + "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 9, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 2 + }, + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 4 + }, + { + "x": 13, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 3, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 8 + }, + { + "x": 7, + "y": 3, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 9 + }, + { + "x": 10, + "y": 3, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 10 + }, + { + "x": 13, + "y": 3, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 11 + }, + { + "x": 16, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_LOWER_DECK", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 2, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 4, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 6, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 8, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 10, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 12, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 14, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 16, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 5, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SSTidalCorridor_EventScript_23C0F5" + }, + { + "type": "sign", + "x": 8, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SSTidalCorridor_EventScript_23C0FE" + }, + { + "type": "sign", + "x": 11, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SSTidalCorridor_EventScript_23C107" + }, + { + "type": "sign", + "x": 14, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SSTidalCorridor_EventScript_23C110" + } + ] +} \ No newline at end of file diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc deleted file mode 100644 index 73385dfc3a..0000000000 --- a/data/maps/SSTidalLowerDeck/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SSTidalLowerDeck_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0 - -SSTidalLowerDeck_MapWarps: - warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR - -SSTidalLowerDeck_MapBGEvents: - bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS - -SSTidalLowerDeck_MapEvents:: - map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents - diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc deleted file mode 100644 index c14cf55130..0000000000 --- a/data/maps/SSTidalLowerDeck/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSTidalLowerDeck: - .4byte SSTidalLowerDeck_Layout - .4byte SSTidalLowerDeck_MapEvents - .4byte SSTidalLowerDeck_MapScripts - .4byte 0x0 - .2byte MUS_M_BOAT - .2byte LAYOUT_SS_TIDAL_LOWER_DECK - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json new file mode 100644 index 0000000000..1a7b1fde0f --- /dev/null +++ b/data/maps/SSTidalLowerDeck/map.json @@ -0,0 +1,64 @@ +{ + "id": "MAP_SS_TIDAL_LOWER_DECK", + "name": "SSTidalLowerDeck", + "layout": "LAYOUT_SS_TIDAL_LOWER_DECK", + "music": "MUS_M_BOAT", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 10, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 4, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSTidalLowerDeck_EventScript_23C819", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", + "movement_range_x": 7, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSTidalLowerDeck_EventScript_23C830", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 15, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 0, + "y": 2, + "elevation": 0, + "item": "ITEM_LEFTOVERS", + "flag": "FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS" + } + ] +} \ No newline at end of file diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc deleted file mode 100644 index dc8a57164b..0000000000 --- a/data/maps/SSTidalRooms/events.inc +++ /dev/null @@ -1,31 +0,0 @@ -SSTidalRooms_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 5, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0 - object_event 6, EVENT_OBJ_GFX_RICH_BOY, 0, 22, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, SSTidalRooms_EventScript_23CAC4, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SSTidalRooms_EventScript_23C9F2, FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER - -SSTidalRooms_MapWarps: - warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR - warp_def 5, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR - warp_def 13, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR - warp_def 14, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR - warp_def 22, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR - warp_def 23, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR - warp_def 31, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR - warp_def 32, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR - warp_def 4, 1, 0, 4, MAP_SS_TIDAL_CORRIDOR - warp_def 13, 1, 0, 5, MAP_SS_TIDAL_CORRIDOR - warp_def 22, 1, 0, 6, MAP_SS_TIDAL_CORRIDOR - warp_def 31, 1, 0, 7, MAP_SS_TIDAL_CORRIDOR - -SSTidalRooms_MapBGEvents: - bg_event 15, 11, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_23CA33 - bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_23CA33 - -SSTidalRooms_MapEvents:: - map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents - diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc deleted file mode 100644 index 951cd6ce13..0000000000 --- a/data/maps/SSTidalRooms/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSTidalRooms: - .4byte SSTidalRooms_Layout - .4byte SSTidalRooms_MapEvents - .4byte SSTidalRooms_MapScripts - .4byte 0x0 - .2byte MUS_M_BOAT - .2byte LAYOUT_SS_TIDAL_ROOMS - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json new file mode 100644 index 0000000000..935c5c33d3 --- /dev/null +++ b/data/maps/SSTidalRooms/map.json @@ -0,0 +1,227 @@ +{ + "id": "MAP_SS_TIDAL_ROOMS", + "name": "SSTidalRooms", + "layout": "LAYOUT_SS_TIDAL_ROOMS", + "music": "MUS_M_BOAT", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalRooms_EventScript_23CA49", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 34, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSTidalRooms_EventScript_23CA60", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 21, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalRooms_EventScript_23CA77", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 5, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSTidalRooms_EventScript_23CA8E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 4, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSTidalRooms_EventScript_23CAA9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 22, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSTidalRooms_EventScript_23CAC4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 15, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalRooms_EventScript_23CADB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 28, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalRooms_EventScript_23C9F2", + "flag": "FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER" + } + ], + "warp_events": [ + { + "x": 4, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 1 + }, + { + "x": 22, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 2 + }, + { + "x": 23, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 2 + }, + { + "x": 31, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 3 + }, + { + "x": 32, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 4 + }, + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 5 + }, + { + "x": 22, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 6 + }, + { + "x": 31, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 15, + "y": 11, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalRooms_EventScript_23CA33" + }, + { + "type": "sign", + "x": 15, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalRooms_EventScript_23CA33" + } + ] +} \ No newline at end of file diff --git a/data/maps/SafariZone_North/connections.inc b/data/maps/SafariZone_North/connections.inc deleted file mode 100644 index 131338df92..0000000000 --- a/data/maps/SafariZone_North/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -SafariZone_North_MapConnectionsList: - connection left, 0, MAP_SAFARI_ZONE_NORTHWEST - connection down, 0, MAP_SAFARI_ZONE_SOUTH - connection right, 0, MAP_SAFARI_ZONE_NORTHEAST - -SafariZone_North_MapConnections: - .4byte 3 - .4byte SafariZone_North_MapConnectionsList - diff --git a/data/maps/SafariZone_North/events.inc b/data/maps/SafariZone_North/events.inc deleted file mode 100644 index 1131cd7146..0000000000 --- a/data/maps/SafariZone_North/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SafariZone_North_EventObjects: - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D254, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 6, 29, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D25D, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_12 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_13 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_14 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_15 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_16 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2912C9, FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM - -SafariZone_North_MapEvents:: - map_events SafariZone_North_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc deleted file mode 100644 index 935a2c5a6e..0000000000 --- a/data/maps/SafariZone_North/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_North: - .4byte SafariZone_North_Layout - .4byte SafariZone_North_MapEvents - .4byte SafariZone_North_MapScripts - .4byte SafariZone_North_MapConnections - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_NORTH - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json new file mode 100644 index 0000000000..e0202beb9a --- /dev/null +++ b/data/maps/SafariZone_North/map.json @@ -0,0 +1,154 @@ +{ + "id": "MAP_SAFARI_ZONE_NORTH", + "name": "SafariZone_North", + "layout": "LAYOUT_SAFARI_ZONE_NORTH", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTHWEST" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTH" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTHEAST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 22, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_23D254", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 6, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_23D25D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 25, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 25, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2907A6", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 28, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2907A6", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 23, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2907A6", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 20, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 27, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2907A6", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2912C9", + "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SafariZone_Northeast/connections.inc b/data/maps/SafariZone_Northeast/connections.inc deleted file mode 100644 index 20595bd7af..0000000000 --- a/data/maps/SafariZone_Northeast/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Northeast_MapConnectionsList: - connection left, 0, MAP_SAFARI_ZONE_NORTH - connection down, 0, MAP_SAFARI_ZONE_SOUTHEAST - -SafariZone_Northeast_MapConnections: - .4byte 2 - .4byte SafariZone_Northeast_MapConnectionsList - diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc deleted file mode 100644 index 02bb2fc19b..0000000000 --- a/data/maps/SafariZone_Northeast/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -SafariZone_Northeast_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 8, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 30, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_15 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 35, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_13 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_11 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_14 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_12 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET - -SafariZone_Northeast_MapBGEvents: - bg_hidden_item_event 31, 35, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY - bg_hidden_item_event 21, 5, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC - -SafariZone_Northeast_MapEvents:: - map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents - diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc deleted file mode 100644 index 8c68cd8c29..0000000000 --- a/data/maps/SafariZone_Northeast/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Northeast: - .4byte SafariZone_Northeast_Layout - .4byte SafariZone_Northeast_MapEvents - .4byte SafariZone_Northeast_MapScripts - .4byte SafariZone_Northeast_MapConnections - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_NORTHEAST - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json new file mode 100644 index 0000000000..6ce7c4d019 --- /dev/null +++ b/data/maps/SafariZone_Northeast/map.json @@ -0,0 +1,166 @@ +{ + "id": "MAP_SAFARI_ZONE_NORTHEAST", + "name": "SafariZone_Northeast", + "layout": "LAYOUT_SAFARI_ZONE_NORTHEAST", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTH" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTHEAST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 8, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_23D3C6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 30, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_23D3D8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 11, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 13, + "y": 35, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_23D3CF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 8, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_2907A6", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_2907A6", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 12, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_2907A6", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 8, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_2912E3", + "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 31, + "y": 35, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY" + }, + { + "type": "hidden_item", + "x": 21, + "y": 5, + "elevation": 3, + "item": "ITEM_ZINC", + "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC" + } + ] +} \ No newline at end of file diff --git a/data/maps/SafariZone_Northwest/connections.inc b/data/maps/SafariZone_Northwest/connections.inc deleted file mode 100644 index 24ac78021e..0000000000 --- a/data/maps/SafariZone_Northwest/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Northwest_MapConnectionsList: - connection right, 0, MAP_SAFARI_ZONE_NORTH - connection down, 0, MAP_SAFARI_ZONE_SOUTHWEST - -SafariZone_Northwest_MapConnections: - .4byte 2 - .4byte SafariZone_Northwest_MapConnectionsList - diff --git a/data/maps/SafariZone_Northwest/events.inc b/data/maps/SafariZone_Northwest/events.inc deleted file mode 100644 index 729e51734e..0000000000 --- a/data/maps/SafariZone_Northwest/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -SafariZone_Northwest_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northwest_EventScript_2912BC, FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22 - -SafariZone_Northwest_MapEvents:: - map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc deleted file mode 100644 index 1218a65139..0000000000 --- a/data/maps/SafariZone_Northwest/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Northwest: - .4byte SafariZone_Northwest_Layout - .4byte SafariZone_Northwest_MapEvents - .4byte SafariZone_Northwest_MapScripts - .4byte SafariZone_Northwest_MapConnections - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_NORTHWEST - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json new file mode 100644 index 0000000000..910c7cf3c1 --- /dev/null +++ b/data/maps/SafariZone_Northwest/map.json @@ -0,0 +1,58 @@ +{ + "id": "MAP_SAFARI_ZONE_NORTHWEST", + "name": "SafariZone_Northwest", + "layout": "LAYOUT_SAFARI_ZONE_NORTHWEST", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "right", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTH" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTHWEST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 8, + "y": 8, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northwest_EventScript_23D24A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 33, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northwest_EventScript_2912BC", + "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SafariZone_RestHouse/events.inc b/data/maps/SafariZone_RestHouse/events.inc deleted file mode 100644 index 2d601b883a..0000000000 --- a/data/maps/SafariZone_RestHouse/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SafariZone_RestHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0 - -SafariZone_RestHouse_MapWarps: - warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST - warp_def 4, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST - -SafariZone_RestHouse_MapEvents:: - map_events SafariZone_RestHouse_EventObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc deleted file mode 100644 index 79d807c7fd..0000000000 --- a/data/maps/SafariZone_RestHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_RestHouse: - .4byte SafariZone_RestHouse_Layout - .4byte SafariZone_RestHouse_MapEvents - .4byte SafariZone_RestHouse_MapScripts - .4byte 0x0 - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_REST_HOUSE - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json new file mode 100644 index 0000000000..16acff6dd8 --- /dev/null +++ b/data/maps/SafariZone_RestHouse/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_SAFARI_ZONE_REST_HOUSE", + "name": "SafariZone_RestHouse", + "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 7, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_RestHouse_EventScript_242BE7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 8, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_RestHouse_EventScript_242BF0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_RestHouse_EventScript_242BF9", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_SOUTHWEST", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_SOUTHWEST", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SafariZone_South/connections.inc b/data/maps/SafariZone_South/connections.inc deleted file mode 100644 index 4c2e912ca4..0000000000 --- a/data/maps/SafariZone_South/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -SafariZone_South_MapConnectionsList: - connection up, 0, MAP_SAFARI_ZONE_NORTH - connection left, 0, MAP_SAFARI_ZONE_SOUTHWEST - connection right, 0, MAP_SAFARI_ZONE_SOUTHEAST - -SafariZone_South_MapConnections: - .4byte 3 - .4byte SafariZone_South_MapConnectionsList - diff --git a/data/maps/SafariZone_South/events.inc b/data/maps/SafariZone_South/events.inc deleted file mode 100644 index 8bc56885fe..0000000000 --- a/data/maps/SafariZone_South/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SafariZone_South_EventObjects: - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2CA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 16, 6, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2DC, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D390, FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS - object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D3A2, FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS - -SafariZone_South_MapWarps: - warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE - -SafariZone_South_MapEvents:: - map_events SafariZone_South_EventObjects, SafariZone_South_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc deleted file mode 100644 index 01fcac57f4..0000000000 --- a/data/maps/SafariZone_South/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_South: - .4byte SafariZone_South_Layout - .4byte SafariZone_South_MapEvents - .4byte SafariZone_South_MapScripts - .4byte SafariZone_South_MapConnections - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_SOUTH - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_South/map.json b/data/maps/SafariZone_South/map.json new file mode 100644 index 0000000000..c958a1a944 --- /dev/null +++ b/data/maps/SafariZone_South/map.json @@ -0,0 +1,123 @@ +{ + "id": "MAP_SAFARI_ZONE_SOUTH", + "name": "SafariZone_South", + "layout": "LAYOUT_SAFARI_ZONE_SOUTH", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTH" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTHWEST" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTHEAST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 32, + "y": 34, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_South_EventScript_23D2E5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 26, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_South_EventScript_23D2CA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 16, + "y": 6, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_South_EventScript_23D2D3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 15, + "y": 31, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_South_EventScript_23D2DC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 36, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_South_EventScript_23D390", + "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 36, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_South_EventScript_23D3A2", + "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS" + } + ], + "warp_events": [ + { + "x": 32, + "y": 33, + "elevation": 0, + "dest_map": "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SafariZone_Southeast/connections.inc b/data/maps/SafariZone_Southeast/connections.inc deleted file mode 100644 index 5a7b4140a2..0000000000 --- a/data/maps/SafariZone_Southeast/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Southeast_MapConnectionsList: - connection left, 0, MAP_SAFARI_ZONE_SOUTH - connection up, 0, MAP_SAFARI_ZONE_NORTHEAST - -SafariZone_Southeast_MapConnections: - .4byte 2 - .4byte SafariZone_Southeast_MapConnectionsList - diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc deleted file mode 100644 index a35a8564d7..0000000000 --- a/data/maps/SafariZone_Southeast/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SafariZone_Southeast_EventObjects: - object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 7, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 20, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 8, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_2912F0, FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION - -SafariZone_Southeast_MapBGEvents: - bg_hidden_item_event 19, 36, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP - bg_hidden_item_event 32, 33, 0, ITEM_FULL_RESTORE, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE - -SafariZone_Southeast_MapEvents:: - map_events SafariZone_Southeast_EventObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents - diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc deleted file mode 100644 index b07747fd5c..0000000000 --- a/data/maps/SafariZone_Southeast/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Southeast: - .4byte SafariZone_Southeast_Layout - .4byte SafariZone_Southeast_MapEvents - .4byte SafariZone_Southeast_MapScripts - .4byte SafariZone_Southeast_MapConnections - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_SOUTHEAST - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json new file mode 100644 index 0000000000..d2e3d7140a --- /dev/null +++ b/data/maps/SafariZone_Southeast/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_SAFARI_ZONE_SOUTHEAST", + "name": "SafariZone_Southeast", + "layout": "LAYOUT_SAFARI_ZONE_SOUTHEAST", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTH" + }, + { + "direction": "up", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTHEAST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southeast_EventScript_23D3BD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 20, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southeast_EventScript_23D3B4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 8, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southeast_EventScript_23D3AB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southeast_EventScript_2912F0", + "flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 12, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southeast_EventScript_23D399", + "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 19, + "y": 36, + "elevation": 3, + "item": "ITEM_PP_UP", + "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP" + }, + { + "type": "hidden_item", + "x": 32, + "y": 33, + "elevation": 0, + "item": "ITEM_FULL_RESTORE", + "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE" + } + ] +} \ No newline at end of file diff --git a/data/maps/SafariZone_Southwest/connections.inc b/data/maps/SafariZone_Southwest/connections.inc deleted file mode 100644 index 34702a3c29..0000000000 --- a/data/maps/SafariZone_Southwest/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Southwest_MapConnectionsList: - connection up, 0, MAP_SAFARI_ZONE_NORTHWEST - connection right, 0, MAP_SAFARI_ZONE_SOUTH - -SafariZone_Southwest_MapConnections: - .4byte 2 - .4byte SafariZone_Southwest_MapConnectionsList - diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc deleted file mode 100644 index 6a6a488879..0000000000 --- a/data/maps/SafariZone_Southwest/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SafariZone_Southwest_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southwest_EventScript_2912D6, FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE - -SafariZone_Southwest_MapWarps: - warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE - -SafariZone_Southwest_MapBGEvents: - bg_event 32, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SafariZone_Southwest_EventScript_23D270 - -SafariZone_Southwest_MapEvents:: - map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents - diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc deleted file mode 100644 index f3cafdebb7..0000000000 --- a/data/maps/SafariZone_Southwest/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Southwest: - .4byte SafariZone_Southwest_Layout - .4byte SafariZone_Southwest_MapEvents - .4byte SafariZone_Southwest_MapScripts - .4byte SafariZone_Southwest_MapConnections - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_SOUTHWEST - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json new file mode 100644 index 0000000000..41cce9e80b --- /dev/null +++ b/data/maps/SafariZone_Southwest/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_SAFARI_ZONE_SOUTHWEST", + "name": "SafariZone_Southwest", + "layout": "LAYOUT_SAFARI_ZONE_SOUTHWEST", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTHWEST" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTH" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 22, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southwest_EventScript_23D267", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southwest_EventScript_2912D6", + "flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE" + } + ], + "warp_events": [ + { + "x": 29, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_REST_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 32, + "y": 7, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SafariZone_Southwest_EventScript_23D270" + } + ] +} \ No newline at end of file diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc deleted file mode 100644 index f43240a781..0000000000 --- a/data/maps/ScorchedSlab/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -ScorchedSlab_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, FLAG_ITEM_SCORCHED_SLAB_TM_11 - -ScorchedSlab_MapWarps: - warp_def 7, 16, 1, 1, MAP_ROUTE120 - -ScorchedSlab_MapEvents:: - map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0 - diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc deleted file mode 100644 index ec09efb0fc..0000000000 --- a/data/maps/ScorchedSlab/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ScorchedSlab: - .4byte ScorchedSlab_Layout - .4byte ScorchedSlab_MapEvents - .4byte ScorchedSlab_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_SCORCHED_SLAB - .byte MAPSEC_SCORCHED_SLAB - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json new file mode 100644 index 0000000000..f24aa0ebac --- /dev/null +++ b/data/maps/ScorchedSlab/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_SCORCHED_SLAB", + "name": "ScorchedSlab", + "layout": "LAYOUT_SCORCHED_SLAB", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_SCORCHED_SLAB", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ScorchedSlab_EventScript_2912AF", + "flag": "FLAG_ITEM_SCORCHED_SLAB_TM_11" + } + ], + "warp_events": [ + { + "x": 7, + "y": 16, + "elevation": 1, + "dest_map": "MAP_ROUTE120", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Entrance/events.inc b/data/maps/SeafloorCavern_Entrance/events.inc deleted file mode 100644 index ea20574178..0000000000 --- a/data/maps/SeafloorCavern_Entrance/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SeafloorCavern_Entrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SeafloorCavern_Entrance_EventScript_234485, FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT - -SeafloorCavern_Entrance_MapWarps: - warp_def 10, 18, 3, 0, MAP_UNDERWATER4 - warp_def 10, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM1 - -SeafloorCavern_Entrance_MapEvents:: - map_events SeafloorCavern_Entrance_EventObjects, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc deleted file mode 100644 index b1b8ec30c9..0000000000 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Entrance: - .4byte SeafloorCavern_Entrance_Layout - .4byte SeafloorCavern_Entrance_MapEvents - .4byte SeafloorCavern_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ENTRANCE - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json new file mode 100644 index 0000000000..c1f45f1bf1 --- /dev/null +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ENTRANCE", + "name": "SeafloorCavern_Entrance", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ENTRANCE", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Entrance_EventScript_234485", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT" + } + ], + "warp_events": [ + { + "x": 10, + "y": 18, + "elevation": 3, + "dest_map": "MAP_UNDERWATER4", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM1", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room1/events.inc b/data/maps/SeafloorCavern_Room1/events.inc deleted file mode 100644 index a5cb5ed3b1..0000000000 --- a/data/maps/SeafloorCavern_Room1/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room1_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_234803, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS - -SeafloorCavern_Room1_MapWarps: - warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE - warp_def 17, 13, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM5 - warp_def 6, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM2 - -SeafloorCavern_Room1_MapEvents:: - map_events SeafloorCavern_Room1_EventObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc deleted file mode 100644 index 14ab5fbdeb..0000000000 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room1: - .4byte SeafloorCavern_Room1_Layout - .4byte SeafloorCavern_Room1_MapEvents - .4byte SeafloorCavern_Room1_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM1 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json new file mode 100644 index 0000000000..3976ff46a1 --- /dev/null +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM1", + "name": "SeafloorCavern_Room1", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM1", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room1_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room1_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 5, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room1_EventScript_2907A6", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SeafloorCavern_Room1_EventScript_2347EC", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 15, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SeafloorCavern_Room1_EventScript_234803", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" + } + ], + "warp_events": [ + { + "x": 5, + "y": 18, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 17, + "y": 13, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM5", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room2/events.inc b/data/maps/SeafloorCavern_Room2/events.inc deleted file mode 100644 index 5e1af80276..0000000000 --- a/data/maps/SeafloorCavern_Room2/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SeafloorCavern_Room2_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_12 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_13 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_15 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_16 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, FLAG_TEMP_18 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, FLAG_TEMP_19 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_17 - -SeafloorCavern_Room2_MapWarps: - warp_def 10, 7, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 - warp_def 4, 10, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM4 - warp_def 6, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM6 - warp_def 11, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM7 - -SeafloorCavern_Room2_MapEvents:: - map_events SeafloorCavern_Room2_EventObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc deleted file mode 100644 index 822c7f2b10..0000000000 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room2: - .4byte SeafloorCavern_Room2_Layout - .4byte SeafloorCavern_Room2_MapEvents - .4byte SeafloorCavern_Room2_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM2 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json new file mode 100644 index 0000000000..19b8b05736 --- /dev/null +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -0,0 +1,154 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM2", + "name": "SeafloorCavern_Room2", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM2", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 13, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 13, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2908BA", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2908BA", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2907A6", + "flag": "FLAG_TEMP_18" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2907A6", + "flag": "FLAG_TEMP_19" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2908BA", + "flag": "FLAG_TEMP_17" + } + ], + "warp_events": [ + { + "x": 10, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM1", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM4", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM6", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM7", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room3/events.inc b/data/maps/SeafloorCavern_Room3/events.inc deleted file mode 100644 index 168e9e96db..0000000000 --- a/data/maps/SeafloorCavern_Room3/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SeafloorCavern_Room3_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_12 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_14 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_15 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_16 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_17 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_18 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_19 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, SeafloorCavern_Room3_EventScript_234938, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, SeafloorCavern_Room3_EventScript_23494F, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS - -SeafloorCavern_Room3_MapWarps: - warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 - warp_def 9, 13, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM7 - warp_def 4, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM6 - -SeafloorCavern_Room3_MapEvents:: - map_events SeafloorCavern_Room3_EventObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc deleted file mode 100644 index f1cfa25681..0000000000 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room3: - .4byte SeafloorCavern_Room3_Layout - .4byte SeafloorCavern_Room3_MapEvents - .4byte SeafloorCavern_Room3_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM3 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json new file mode 100644 index 0000000000..b7e46a87f1 --- /dev/null +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -0,0 +1,160 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM3", + "name": "SeafloorCavern_Room3", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM3", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_17" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_18" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 13, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_19" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "SeafloorCavern_Room3_EventScript_234938", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SeafloorCavern_Room3_EventScript_23494F", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" + } + ], + "warp_events": [ + { + "x": 8, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM8", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 13, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM7", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM6", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room4/events.inc b/data/maps/SeafloorCavern_Room4/events.inc deleted file mode 100644 index 37f0c7b04c..0000000000 --- a/data/maps/SeafloorCavern_Room4/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SeafloorCavern_Room4_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS - -SeafloorCavern_Room4_MapWarps: - warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 - warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM5 - warp_def 9, 10, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM5 - warp_def 10, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE - -SeafloorCavern_Room4_MapEvents:: - map_events SeafloorCavern_Room4_EventObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc deleted file mode 100644 index 22e6d27c75..0000000000 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room4: - .4byte SeafloorCavern_Room4_Layout - .4byte SeafloorCavern_Room4_MapEvents - .4byte SeafloorCavern_Room4_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM4 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json new file mode 100644 index 0000000000..02662f0177 --- /dev/null +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -0,0 +1,76 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM4", + "name": "SeafloorCavern_Room4", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM4", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SeafloorCavern_Room4_EventScript_234C9C", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 5, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SeafloorCavern_Room4_EventScript_234CB3", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" + } + ], + "warp_events": [ + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM2", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM5", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM5", + "dest_warp_id": 2 + }, + { + "x": 10, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room5/events.inc b/data/maps/SeafloorCavern_Room5/events.inc deleted file mode 100644 index 4f75732700..0000000000 --- a/data/maps/SeafloorCavern_Room5/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SeafloorCavern_Room5_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, FLAG_TEMP_15 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, FLAG_TEMP_16 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_14 - -SeafloorCavern_Room5_MapWarps: - warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1 - warp_def 15, 12, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM4 - warp_def 7, 17, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM4 - -SeafloorCavern_Room5_MapEvents:: - map_events SeafloorCavern_Room5_EventObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc deleted file mode 100644 index 42489c1dea..0000000000 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room5: - .4byte SeafloorCavern_Room5_Layout - .4byte SeafloorCavern_Room5_MapEvents - .4byte SeafloorCavern_Room5_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM5 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json new file mode 100644 index 0000000000..cfdbd64efe --- /dev/null +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -0,0 +1,121 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM5", + "name": "SeafloorCavern_Room5", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM5", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room5_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room5_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 11, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room5_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 3, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room5_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 13, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room5_EventScript_2907A6", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room5_EventScript_2908BA", + "flag": "FLAG_TEMP_14" + } + ], + "warp_events": [ + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM1", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM4", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 17, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM4", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room6/events.inc b/data/maps/SeafloorCavern_Room6/events.inc deleted file mode 100644 index 596daefe2f..0000000000 --- a/data/maps/SeafloorCavern_Room6/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SeafloorCavern_Room6_MapWarps: - warp_def 11, 21, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM2 - warp_def 4, 1, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM3 - warp_def 14, 8, 1, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE - -SeafloorCavern_Room6_MapEvents:: - map_events 0x0, SeafloorCavern_Room6_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc deleted file mode 100644 index f70a2d07e4..0000000000 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room6: - .4byte SeafloorCavern_Room6_Layout - .4byte SeafloorCavern_Room6_MapEvents - .4byte SeafloorCavern_Room6_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM6 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room6/map.json b/data/maps/SeafloorCavern_Room6/map.json new file mode 100644 index 0000000000..69c5330ead --- /dev/null +++ b/data/maps/SeafloorCavern_Room6/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM6", + "name": "SeafloorCavern_Room6", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM6", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 21, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM2", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM3", + "dest_warp_id": 2 + }, + { + "x": 14, + "y": 8, + "elevation": 1, + "dest_map": "MAP_SEAFLOOR_CAVERN_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room7/events.inc b/data/maps/SeafloorCavern_Room7/events.inc deleted file mode 100644 index fb3fcc1b6c..0000000000 --- a/data/maps/SeafloorCavern_Room7/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -SeafloorCavern_Room7_MapWarps: - warp_def 3, 23, 3, 3, MAP_SEAFLOOR_CAVERN_ROOM2 - warp_def 5, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM3 - -SeafloorCavern_Room7_MapEvents:: - map_events 0x0, SeafloorCavern_Room7_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc deleted file mode 100644 index 28433a0519..0000000000 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room7: - .4byte SeafloorCavern_Room7_Layout - .4byte SeafloorCavern_Room7_MapEvents - .4byte SeafloorCavern_Room7_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM7 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room7/map.json b/data/maps/SeafloorCavern_Room7/map.json new file mode 100644 index 0000000000..65c103aafb --- /dev/null +++ b/data/maps/SeafloorCavern_Room7/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM7", + "name": "SeafloorCavern_Room7", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM7", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 23, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM2", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM3", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room8/events.inc b/data/maps/SeafloorCavern_Room8/events.inc deleted file mode 100644 index 673f303fe7..0000000000 --- a/data/maps/SeafloorCavern_Room8/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -SeafloorCavern_Room8_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_14 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_15 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_16 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_17 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_18 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_19 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1A - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1B - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1C - -SeafloorCavern_Room8_MapWarps: - warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 - warp_def 5, 12, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM3 - -SeafloorCavern_Room8_MapEvents:: - map_events SeafloorCavern_Room8_EventObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc deleted file mode 100644 index bc6f7de4b6..0000000000 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room8: - .4byte SeafloorCavern_Room8_Layout - .4byte SeafloorCavern_Room8_MapEvents - .4byte SeafloorCavern_Room8_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM8 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json new file mode 100644 index 0000000000..f556c23334 --- /dev/null +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -0,0 +1,192 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM8", + "name": "SeafloorCavern_Room8", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM8", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 6, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_17" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_18" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_19" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_1A" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_1B" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_1C" + } + ], + "warp_events": [ + { + "x": 5, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM9", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM3", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc deleted file mode 100644 index 771f58b150..0000000000 --- a/data/maps/SeafloorCavern_Room9/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -SeafloorCavern_Room9_EventObjects: - object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE - object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_291401, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26 - object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2 - -SeafloorCavern_Room9_MapWarps: - warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 - -SeafloorCavern_Room9_MapCoordEvents: - coord_event 17, 42, 3, VAR_0x40A2, 0, SeafloorCavern_Room9_EventScript_234DC9 - -SeafloorCavern_Room9_MapEvents:: - map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 - diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc deleted file mode 100644 index 5748571be5..0000000000 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room9: - .4byte SeafloorCavern_Room9_Layout - .4byte SeafloorCavern_Room9_MapEvents - .4byte SeafloorCavern_Room9_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM9 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json new file mode 100644 index 0000000000..c2d8b8870d --- /dev/null +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -0,0 +1,130 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM9", + "name": "SeafloorCavern_Room9", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM9", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_KYOGRE_1", + "x": 17, + "y": 38, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 9, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 9, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 8, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "x": 8, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room9_EventScript_291401", + "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KYOGRE_2", + "x": 17, + "y": 38, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2" + } + ], + "warp_events": [ + { + "x": 5, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM8", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 17, + "y": 42, + "elevation": 3, + "var": "VAR_0x40A2", + "var_value": 0, + "script": "SeafloorCavern_Room9_EventScript_234DC9" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SealedChamber_InnerRoom/events.inc b/data/maps/SealedChamber_InnerRoom/events.inc deleted file mode 100644 index 96891324d0..0000000000 --- a/data/maps/SealedChamber_InnerRoom/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -SealedChamber_InnerRoom_MapWarps: - warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM - -SealedChamber_InnerRoom_MapBGEvents: - bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 - bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239255 - bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_23925F - bg_event 4, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239269 - bg_event 16, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239273 - bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_23927D - bg_event 14, 18, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239287 - bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 - bg_event 11, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 - -SealedChamber_InnerRoom_MapEvents:: - map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents - diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc deleted file mode 100644 index 6e2a2ff8b8..0000000000 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SealedChamber_InnerRoom: - .4byte SealedChamber_InnerRoom_Layout - .4byte SealedChamber_InnerRoom_MapEvents - .4byte SealedChamber_InnerRoom_MapScripts - .4byte 0x0 - .2byte MUS_MABOROSI - .2byte LAYOUT_SEALED_CHAMBER_INNER_ROOM - .byte MAPSEC_SEALED_CHAMBER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SealedChamber_InnerRoom/map.json b/data/maps/SealedChamber_InnerRoom/map.json new file mode 100644 index 0000000000..e0e6097ec3 --- /dev/null +++ b/data/maps/SealedChamber_InnerRoom/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_SEALED_CHAMBER_INNER_ROOM", + "name": "SealedChamber_InnerRoom", + "layout": "LAYOUT_SEALED_CHAMBER_INNER_ROOM", + "music": "MUS_MABOROSI", + "region_map_section": "MAPSEC_SEALED_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 19, + "elevation": 3, + "dest_map": "MAP_SEALED_CHAMBER_OUTER_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 10, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_2391F8" + }, + { + "type": "sign", + "x": 6, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_239255" + }, + { + "type": "sign", + "x": 14, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_23925F" + }, + { + "type": "sign", + "x": 4, + "y": 13, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_239269" + }, + { + "type": "sign", + "x": 16, + "y": 13, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_239273" + }, + { + "type": "sign", + "x": 6, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_23927D" + }, + { + "type": "sign", + "x": 14, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_239287" + }, + { + "type": "sign", + "x": 9, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_2391F8" + }, + { + "type": "sign", + "x": 11, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_2391F8" + } + ] +} \ No newline at end of file diff --git a/data/maps/SealedChamber_OuterRoom/events.inc b/data/maps/SealedChamber_OuterRoom/events.inc deleted file mode 100644 index 530ff738c8..0000000000 --- a/data/maps/SealedChamber_OuterRoom/events.inc +++ /dev/null @@ -1,37 +0,0 @@ -SealedChamber_OuterRoom_MapWarps: - warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM - -SealedChamber_OuterRoom_MapBGEvents: - bg_event 5, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C - bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176 - bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180 - bg_event 5, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23918A - bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239194 - bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23919E - bg_event 11, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391A8 - bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391BC - bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391B2 - bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391C6 - bg_event 10, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391D0 - bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C - bg_event 4, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C - bg_event 4, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176 - bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176 - bg_event 4, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180 - bg_event 6, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180 - bg_event 4, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23918A - bg_event 6, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23918A - bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239194 - bg_event 12, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239194 - bg_event 10, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23919E - bg_event 12, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23919E - bg_event 10, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391A8 - bg_event 12, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391A8 - bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391BC - bg_event 12, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391BC - bg_event 9, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391ED - bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391ED - -SealedChamber_OuterRoom_MapEvents:: - map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents - diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc deleted file mode 100644 index bdb40d153a..0000000000 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SealedChamber_OuterRoom: - .4byte SealedChamber_OuterRoom_Layout - .4byte SealedChamber_OuterRoom_MapEvents - .4byte SealedChamber_OuterRoom_MapScripts - .4byte 0x0 - .2byte MUS_MABOROSI - .2byte LAYOUT_SEALED_CHAMBER_OUTER_ROOM - .byte MAPSEC_SEALED_CHAMBER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json new file mode 100644 index 0000000000..cc9c32272d --- /dev/null +++ b/data/maps/SealedChamber_OuterRoom/map.json @@ -0,0 +1,261 @@ +{ + "id": "MAP_SEALED_CHAMBER_OUTER_ROOM", + "name": "SealedChamber_OuterRoom", + "layout": "LAYOUT_SEALED_CHAMBER_OUTER_ROOM", + "music": "MUS_MABOROSI", + "region_map_section": "MAPSEC_SEALED_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SEALED_CHAMBER_INNER_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23916C" + }, + { + "type": "sign", + "x": 5, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239176" + }, + { + "type": "sign", + "x": 5, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239180" + }, + { + "type": "sign", + "x": 5, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23918A" + }, + { + "type": "sign", + "x": 11, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239194" + }, + { + "type": "sign", + "x": 11, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23919E" + }, + { + "type": "sign", + "x": 11, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391A8" + }, + { + "type": "sign", + "x": 11, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391BC" + }, + { + "type": "sign", + "x": 16, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391B2" + }, + { + "type": "sign", + "x": 16, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391C6" + }, + { + "type": "sign", + "x": 10, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391D0" + }, + { + "type": "sign", + "x": 6, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23916C" + }, + { + "type": "sign", + "x": 4, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23916C" + }, + { + "type": "sign", + "x": 4, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239176" + }, + { + "type": "sign", + "x": 6, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239176" + }, + { + "type": "sign", + "x": 4, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239180" + }, + { + "type": "sign", + "x": 6, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239180" + }, + { + "type": "sign", + "x": 4, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23918A" + }, + { + "type": "sign", + "x": 6, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23918A" + }, + { + "type": "sign", + "x": 10, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239194" + }, + { + "type": "sign", + "x": 12, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239194" + }, + { + "type": "sign", + "x": 10, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23919E" + }, + { + "type": "sign", + "x": 12, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23919E" + }, + { + "type": "sign", + "x": 10, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391A8" + }, + { + "type": "sign", + "x": 12, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391A8" + }, + { + "type": "sign", + "x": 10, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391BC" + }, + { + "type": "sign", + "x": 12, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391BC" + }, + { + "type": "sign", + "x": 9, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391ED" + }, + { + "type": "sign", + "x": 11, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391ED" + } + ] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave1/events.inc b/data/maps/SecretBase_BlueCave1/events.inc deleted file mode 100644 index f0cfb017f7..0000000000 --- a/data/maps/SecretBase_BlueCave1/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BlueCave1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BlueCave1_MapWarps: - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_BlueCave1_MapEvents:: - map_events SecretBase_BlueCave1_EventObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc deleted file mode 100644 index 5159eec532..0000000000 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave1: - .4byte SecretBase_BlueCave1_Layout - .4byte SecretBase_BlueCave1_MapEvents - .4byte SecretBase_BlueCave1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BLUE_CAVE1 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json new file mode 100644 index 0000000000..ee7806e57c --- /dev/null +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BLUE_CAVE1", + "name": "SecretBase_BlueCave1", + "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BlueCave1_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave2/events.inc b/data/maps/SecretBase_BlueCave2/events.inc deleted file mode 100644 index 9a2a82db6f..0000000000 --- a/data/maps/SecretBase_BlueCave2/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BlueCave2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BlueCave2_MapWarps: - warp_def 7, 5, 0, 126, MAP_NONE - -SecretBase_BlueCave2_MapEvents:: - map_events SecretBase_BlueCave2_EventObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc deleted file mode 100644 index 4d893835b5..0000000000 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave2: - .4byte SecretBase_BlueCave2_Layout - .4byte SecretBase_BlueCave2_MapEvents - .4byte SecretBase_BlueCave2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BLUE_CAVE2 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json new file mode 100644 index 0000000000..cdba6e817f --- /dev/null +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BLUE_CAVE2", + "name": "SecretBase_BlueCave2", + "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 2, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BlueCave2_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 7, + "y": 5, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave3/events.inc b/data/maps/SecretBase_BlueCave3/events.inc deleted file mode 100644 index 463c513e58..0000000000 --- a/data/maps/SecretBase_BlueCave3/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BlueCave3_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BlueCave3_MapWarps: - warp_def 4, 15, 0, 126, MAP_NONE - -SecretBase_BlueCave3_MapEvents:: - map_events SecretBase_BlueCave3_EventObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc deleted file mode 100644 index 1e730552ed..0000000000 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave3: - .4byte SecretBase_BlueCave3_Layout - .4byte SecretBase_BlueCave3_MapEvents - .4byte SecretBase_BlueCave3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BLUE_CAVE3 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json new file mode 100644 index 0000000000..5dc78c8915 --- /dev/null +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BLUE_CAVE3", + "name": "SecretBase_BlueCave3", + "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE3", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BlueCave3_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 4, + "y": 15, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave4/events.inc b/data/maps/SecretBase_BlueCave4/events.inc deleted file mode 100644 index fd121b5948..0000000000 --- a/data/maps/SecretBase_BlueCave4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BlueCave4_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BlueCave4_MapWarps: - warp_def 4, 15, 0, 126, MAP_NONE - -SecretBase_BlueCave4_MapEvents:: - map_events SecretBase_BlueCave4_EventObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc deleted file mode 100644 index ff6cb64dc2..0000000000 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave4: - .4byte SecretBase_BlueCave4_Layout - .4byte SecretBase_BlueCave4_MapEvents - .4byte SecretBase_BlueCave4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BLUE_CAVE4 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json new file mode 100644 index 0000000000..dfc9c67a82 --- /dev/null +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BLUE_CAVE4", + "name": "SecretBase_BlueCave4", + "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE4", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BlueCave4_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 4, + "y": 15, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave1/events.inc b/data/maps/SecretBase_BrownCave1/events.inc deleted file mode 100644 index 82e5232985..0000000000 --- a/data/maps/SecretBase_BrownCave1/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BrownCave1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BrownCave1_MapWarps: - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_BrownCave1_MapEvents:: - map_events SecretBase_BrownCave1_EventObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc deleted file mode 100644 index e20bdbce1f..0000000000 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave1: - .4byte SecretBase_BrownCave1_Layout - .4byte SecretBase_BrownCave1_MapEvents - .4byte SecretBase_BrownCave1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BROWN_CAVE1 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json new file mode 100644 index 0000000000..20411331f9 --- /dev/null +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BROWN_CAVE1", + "name": "SecretBase_BrownCave1", + "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BrownCave1_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave2/events.inc b/data/maps/SecretBase_BrownCave2/events.inc deleted file mode 100644 index 86d18b5d9e..0000000000 --- a/data/maps/SecretBase_BrownCave2/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BrownCave2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BrownCave2_MapWarps: - warp_def 1, 7, 0, 126, MAP_NONE - -SecretBase_BrownCave2_MapEvents:: - map_events SecretBase_BrownCave2_EventObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc deleted file mode 100644 index 93f2b59237..0000000000 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave2: - .4byte SecretBase_BrownCave2_Layout - .4byte SecretBase_BrownCave2_MapEvents - .4byte SecretBase_BrownCave2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BROWN_CAVE2 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json new file mode 100644 index 0000000000..8001492235 --- /dev/null +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BROWN_CAVE2", + "name": "SecretBase_BrownCave2", + "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BrownCave2_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 1, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave3/events.inc b/data/maps/SecretBase_BrownCave3/events.inc deleted file mode 100644 index 2ec6ed1b25..0000000000 --- a/data/maps/SecretBase_BrownCave3/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BrownCave3_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BrownCave3_MapWarps: - warp_def 11, 9, 0, 126, MAP_NONE - -SecretBase_BrownCave3_MapEvents:: - map_events SecretBase_BrownCave3_EventObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc deleted file mode 100644 index 5c4fac1c0a..0000000000 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave3: - .4byte SecretBase_BrownCave3_Layout - .4byte SecretBase_BrownCave3_MapEvents - .4byte SecretBase_BrownCave3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BROWN_CAVE3 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json new file mode 100644 index 0000000000..08ccc8c323 --- /dev/null +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BROWN_CAVE3", + "name": "SecretBase_BrownCave3", + "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE3", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BrownCave3_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 11, + "y": 9, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave4/events.inc b/data/maps/SecretBase_BrownCave4/events.inc deleted file mode 100644 index 58e71dc186..0000000000 --- a/data/maps/SecretBase_BrownCave4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BrownCave4_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BrownCave4_MapWarps: - warp_def 2, 8, 0, 126, MAP_NONE - -SecretBase_BrownCave4_MapEvents:: - map_events SecretBase_BrownCave4_EventObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc deleted file mode 100644 index b3123ee222..0000000000 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave4: - .4byte SecretBase_BrownCave4_Layout - .4byte SecretBase_BrownCave4_MapEvents - .4byte SecretBase_BrownCave4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BROWN_CAVE4 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json new file mode 100644 index 0000000000..f6184cee21 --- /dev/null +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BROWN_CAVE4", + "name": "SecretBase_BrownCave4", + "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE4", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 2, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BrownCave4_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 2, + "y": 8, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave1/events.inc b/data/maps/SecretBase_RedCave1/events.inc deleted file mode 100644 index 015e2bde58..0000000000 --- a/data/maps/SecretBase_RedCave1/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_RedCave1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_RedCave1_MapWarps: - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_RedCave1_MapEvents:: - map_events SecretBase_RedCave1_EventObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc deleted file mode 100644 index 4ac30b1cb8..0000000000 --- a/data/maps/SecretBase_RedCave1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave1: - .4byte SecretBase_RedCave1_Layout - .4byte SecretBase_RedCave1_MapEvents - .4byte SecretBase_RedCave1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_RED_CAVE1 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json new file mode 100644 index 0000000000..309dd3de09 --- /dev/null +++ b/data/maps/SecretBase_RedCave1/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_RED_CAVE1", + "name": "SecretBase_RedCave1", + "layout": "LAYOUT_SECRET_BASE_RED_CAVE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_RedCave1_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave2/events.inc b/data/maps/SecretBase_RedCave2/events.inc deleted file mode 100644 index 70997288dc..0000000000 --- a/data/maps/SecretBase_RedCave2/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_RedCave2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_RedCave2_MapWarps: - warp_def 3, 14, 0, 126, MAP_NONE - -SecretBase_RedCave2_MapEvents:: - map_events SecretBase_RedCave2_EventObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc deleted file mode 100644 index 64ef711962..0000000000 --- a/data/maps/SecretBase_RedCave2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave2: - .4byte SecretBase_RedCave2_Layout - .4byte SecretBase_RedCave2_MapEvents - .4byte SecretBase_RedCave2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_RED_CAVE2 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json new file mode 100644 index 0000000000..0c2162856a --- /dev/null +++ b/data/maps/SecretBase_RedCave2/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_RED_CAVE2", + "name": "SecretBase_RedCave2", + "layout": "LAYOUT_SECRET_BASE_RED_CAVE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 3, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_RedCave2_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 3, + "y": 14, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave3/events.inc b/data/maps/SecretBase_RedCave3/events.inc deleted file mode 100644 index 191aed927b..0000000000 --- a/data/maps/SecretBase_RedCave3/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_RedCave3_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 12, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_RedCave3_MapWarps: - warp_def 3, 6, 0, 126, MAP_NONE - -SecretBase_RedCave3_MapEvents:: - map_events SecretBase_RedCave3_EventObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc deleted file mode 100644 index 880fa84e60..0000000000 --- a/data/maps/SecretBase_RedCave3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave3: - .4byte SecretBase_RedCave3_Layout - .4byte SecretBase_RedCave3_MapEvents - .4byte SecretBase_RedCave3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_RED_CAVE3 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json new file mode 100644 index 0000000000..ca5f00d6aa --- /dev/null +++ b/data/maps/SecretBase_RedCave3/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_RED_CAVE3", + "name": "SecretBase_RedCave3", + "layout": "LAYOUT_SECRET_BASE_RED_CAVE3", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 12, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_RedCave3_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave4/events.inc b/data/maps/SecretBase_RedCave4/events.inc deleted file mode 100644 index 9e29c6bcc0..0000000000 --- a/data/maps/SecretBase_RedCave4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_RedCave4_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_RedCave4_MapWarps: - warp_def 2, 12, 0, 126, MAP_NONE - -SecretBase_RedCave4_MapEvents:: - map_events SecretBase_RedCave4_EventObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc deleted file mode 100644 index 7454f02511..0000000000 --- a/data/maps/SecretBase_RedCave4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave4: - .4byte SecretBase_RedCave4_Layout - .4byte SecretBase_RedCave4_MapEvents - .4byte SecretBase_RedCave4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_RED_CAVE4 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json new file mode 100644 index 0000000000..6fe94e6bb6 --- /dev/null +++ b/data/maps/SecretBase_RedCave4/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_RED_CAVE4", + "name": "SecretBase_RedCave4", + "layout": "LAYOUT_SECRET_BASE_RED_CAVE4", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_RedCave4_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 2, + "y": 12, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub1/events.inc b/data/maps/SecretBase_Shrub1/events.inc deleted file mode 100644 index 89c8329692..0000000000 --- a/data/maps/SecretBase_Shrub1/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Shrub1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Shrub1_MapWarps: - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_Shrub1_MapEvents:: - map_events SecretBase_Shrub1_EventObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc deleted file mode 100644 index 76bfd45069..0000000000 --- a/data/maps/SecretBase_Shrub1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub1: - .4byte SecretBase_Shrub1_Layout - .4byte SecretBase_Shrub1_MapEvents - .4byte SecretBase_Shrub1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_SHRUB1 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json new file mode 100644 index 0000000000..7f7dedc1cc --- /dev/null +++ b/data/maps/SecretBase_Shrub1/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_SHRUB1", + "name": "SecretBase_Shrub1", + "layout": "LAYOUT_SECRET_BASE_SHRUB1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Shrub1_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub2/events.inc b/data/maps/SecretBase_Shrub2/events.inc deleted file mode 100644 index 6e1f4ee8c3..0000000000 --- a/data/maps/SecretBase_Shrub2/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Shrub2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Shrub2_MapWarps: - warp_def 7, 5, 0, 126, MAP_NONE - -SecretBase_Shrub2_MapEvents:: - map_events SecretBase_Shrub2_EventObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc deleted file mode 100644 index 53faf2d72d..0000000000 --- a/data/maps/SecretBase_Shrub2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub2: - .4byte SecretBase_Shrub2_Layout - .4byte SecretBase_Shrub2_MapEvents - .4byte SecretBase_Shrub2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_SHRUB2 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json new file mode 100644 index 0000000000..0be1b06f1e --- /dev/null +++ b/data/maps/SecretBase_Shrub2/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_SHRUB2", + "name": "SecretBase_Shrub2", + "layout": "LAYOUT_SECRET_BASE_SHRUB2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 13, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Shrub2_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 7, + "y": 5, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub3/events.inc b/data/maps/SecretBase_Shrub3/events.inc deleted file mode 100644 index 38408df635..0000000000 --- a/data/maps/SecretBase_Shrub3/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Shrub3_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Shrub3_MapWarps: - warp_def 6, 9, 0, 126, MAP_NONE - -SecretBase_Shrub3_MapEvents:: - map_events SecretBase_Shrub3_EventObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc deleted file mode 100644 index 4692a00608..0000000000 --- a/data/maps/SecretBase_Shrub3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub3: - .4byte SecretBase_Shrub3_Layout - .4byte SecretBase_Shrub3_MapEvents - .4byte SecretBase_Shrub3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_SHRUB3 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json new file mode 100644 index 0000000000..7104bf5a2e --- /dev/null +++ b/data/maps/SecretBase_Shrub3/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_SHRUB3", + "name": "SecretBase_Shrub3", + "layout": "LAYOUT_SECRET_BASE_SHRUB3", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Shrub3_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc deleted file mode 100644 index 1ebe8a0e82..0000000000 --- a/data/maps/SecretBase_Shrub4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Shrub4_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Shrub4_MapWarps: - warp_def 11, 8, 0, 126, MAP_NONE - -SecretBase_Shrub4_MapEvents:: - map_events SecretBase_Shrub4_EventObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc deleted file mode 100644 index 2b0186878a..0000000000 --- a/data/maps/SecretBase_Shrub4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub4: - .4byte SecretBase_Shrub4_Layout - .4byte SecretBase_Shrub4_MapEvents - .4byte SecretBase_Shrub4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_SHRUB4 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json new file mode 100644 index 0000000000..15b39293d9 --- /dev/null +++ b/data/maps/SecretBase_Shrub4/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_SHRUB4", + "name": "SecretBase_Shrub4", + "layout": "LAYOUT_SECRET_BASE_SHRUB4", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Shrub4_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 11, + "y": 8, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Tree1/events.inc b/data/maps/SecretBase_Tree1/events.inc deleted file mode 100644 index 6ed26cb27b..0000000000 --- a/data/maps/SecretBase_Tree1/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Tree1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Tree1_MapWarps: - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_Tree1_MapEvents:: - map_events SecretBase_Tree1_EventObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc deleted file mode 100644 index 8cace4cef6..0000000000 --- a/data/maps/SecretBase_Tree1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree1: - .4byte SecretBase_Tree1_Layout - .4byte SecretBase_Tree1_MapEvents - .4byte SecretBase_Tree1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_TREE1 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json new file mode 100644 index 0000000000..a03a38cde3 --- /dev/null +++ b/data/maps/SecretBase_Tree1/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_TREE1", + "name": "SecretBase_Tree1", + "layout": "LAYOUT_SECRET_BASE_TREE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Tree1_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Tree2/events.inc b/data/maps/SecretBase_Tree2/events.inc deleted file mode 100644 index 46b268c372..0000000000 --- a/data/maps/SecretBase_Tree2/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Tree2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Tree2_MapWarps: - warp_def 3, 14, 0, 126, MAP_NONE - -SecretBase_Tree2_MapEvents:: - map_events SecretBase_Tree2_EventObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc deleted file mode 100644 index 7f286a94f5..0000000000 --- a/data/maps/SecretBase_Tree2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree2: - .4byte SecretBase_Tree2_Layout - .4byte SecretBase_Tree2_MapEvents - .4byte SecretBase_Tree2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_TREE2 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json new file mode 100644 index 0000000000..484096be1a --- /dev/null +++ b/data/maps/SecretBase_Tree2/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_TREE2", + "name": "SecretBase_Tree2", + "layout": "LAYOUT_SECRET_BASE_TREE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 3, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Tree2_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 3, + "y": 14, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Tree3/events.inc b/data/maps/SecretBase_Tree3/events.inc deleted file mode 100644 index 8512b4e317..0000000000 --- a/data/maps/SecretBase_Tree3/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Tree3_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Tree3_MapWarps: - warp_def 8, 6, 0, 126, MAP_NONE - -SecretBase_Tree3_MapEvents:: - map_events SecretBase_Tree3_EventObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc deleted file mode 100644 index 6794908751..0000000000 --- a/data/maps/SecretBase_Tree3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree3: - .4byte SecretBase_Tree3_Layout - .4byte SecretBase_Tree3_MapEvents - .4byte SecretBase_Tree3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_TREE3 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json new file mode 100644 index 0000000000..c1015dd9c0 --- /dev/null +++ b/data/maps/SecretBase_Tree3/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_TREE3", + "name": "SecretBase_Tree3", + "layout": "LAYOUT_SECRET_BASE_TREE3", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Tree3_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 8, + "y": 6, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Tree4/events.inc b/data/maps/SecretBase_Tree4/events.inc deleted file mode 100644 index ed0f8b2360..0000000000 --- a/data/maps/SecretBase_Tree4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Tree4_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Tree4_MapWarps: - warp_def 7, 12, 0, 126, MAP_NONE - -SecretBase_Tree4_MapEvents:: - map_events SecretBase_Tree4_EventObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc deleted file mode 100644 index ff2605f406..0000000000 --- a/data/maps/SecretBase_Tree4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree4: - .4byte SecretBase_Tree4_Layout - .4byte SecretBase_Tree4_MapEvents - .4byte SecretBase_Tree4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_TREE4 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json new file mode 100644 index 0000000000..297834653a --- /dev/null +++ b/data/maps/SecretBase_Tree4/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_TREE4", + "name": "SecretBase_Tree4", + "layout": "LAYOUT_SECRET_BASE_TREE4", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 10, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Tree4_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 7, + "y": 12, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave1/events.inc b/data/maps/SecretBase_YellowCave1/events.inc deleted file mode 100644 index 6464c48543..0000000000 --- a/data/maps/SecretBase_YellowCave1/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_YellowCave1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_YellowCave1_MapWarps: - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_YellowCave1_MapEvents:: - map_events SecretBase_YellowCave1_EventObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc deleted file mode 100644 index 642db55f51..0000000000 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave1: - .4byte SecretBase_YellowCave1_Layout - .4byte SecretBase_YellowCave1_MapEvents - .4byte SecretBase_YellowCave1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE1 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json new file mode 100644 index 0000000000..0cc46d97e6 --- /dev/null +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_YELLOW_CAVE1", + "name": "SecretBase_YellowCave1", + "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 3, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_YellowCave1_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave2/events.inc b/data/maps/SecretBase_YellowCave2/events.inc deleted file mode 100644 index 99bcee17dc..0000000000 --- a/data/maps/SecretBase_YellowCave2/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_YellowCave2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_YellowCave2_MapWarps: - warp_def 12, 7, 0, 126, MAP_NONE - -SecretBase_YellowCave2_MapEvents:: - map_events SecretBase_YellowCave2_EventObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc deleted file mode 100644 index ae0cd73bc4..0000000000 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave2: - .4byte SecretBase_YellowCave2_Layout - .4byte SecretBase_YellowCave2_MapEvents - .4byte SecretBase_YellowCave2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE2 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json new file mode 100644 index 0000000000..9660114afc --- /dev/null +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_YELLOW_CAVE2", + "name": "SecretBase_YellowCave2", + "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_YellowCave2_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 12, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave3/events.inc b/data/maps/SecretBase_YellowCave3/events.inc deleted file mode 100644 index 10bbfac8da..0000000000 --- a/data/maps/SecretBase_YellowCave3/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_YellowCave3_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_YellowCave3_MapWarps: - warp_def 5, 9, 0, 126, MAP_NONE - -SecretBase_YellowCave3_MapEvents:: - map_events SecretBase_YellowCave3_EventObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc deleted file mode 100644 index 39008b2b30..0000000000 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave3: - .4byte SecretBase_YellowCave3_Layout - .4byte SecretBase_YellowCave3_MapEvents - .4byte SecretBase_YellowCave3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE3 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json new file mode 100644 index 0000000000..fbc6d6217d --- /dev/null +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_YELLOW_CAVE3", + "name": "SecretBase_YellowCave3", + "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE3", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_YellowCave3_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 9, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave4/events.inc b/data/maps/SecretBase_YellowCave4/events.inc deleted file mode 100644 index 9afc932970..0000000000 --- a/data/maps/SecretBase_YellowCave4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_YellowCave4_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_YellowCave4_MapWarps: - warp_def 6, 12, 0, 126, MAP_NONE - -SecretBase_YellowCave4_MapEvents:: - map_events SecretBase_YellowCave4_EventObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc deleted file mode 100644 index 24e10379b9..0000000000 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave4: - .4byte SecretBase_YellowCave4_Layout - .4byte SecretBase_YellowCave4_MapEvents - .4byte SecretBase_YellowCave4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE4 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json new file mode 100644 index 0000000000..d91c2f9a3a --- /dev/null +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_YELLOW_CAVE4", + "name": "SecretBase_YellowCave4", + "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE4", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 9, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_YellowCave4_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 6, + "y": 12, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/events.inc b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc deleted file mode 100644 index 8fa935974c..0000000000 --- a/data/maps/ShoalCave_HighTideEntranceRoom/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -ShoalCave_HighTideEntranceRoom_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc deleted file mode 100644 index 12d853e7a9..0000000000 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_HighTideEntranceRoom: - .4byte ShoalCave_HighTideEntranceRoom_Layout - .4byte ShoalCave_HighTideEntranceRoom_MapEvents - .4byte ShoalCave_HighTideEntranceRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.json b/data/maps/ShoalCave_HighTideEntranceRoom/map.json new file mode 100644 index 0000000000..046fe49668 --- /dev/null +++ b/data/maps/ShoalCave_HighTideEntranceRoom/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM", + "name": "ShoalCave_HighTideEntranceRoom", + "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_HighTideInnerRoom/events.inc b/data/maps/ShoalCave_HighTideInnerRoom/events.inc deleted file mode 100644 index 96d1e9d5e1..0000000000 --- a/data/maps/ShoalCave_HighTideInnerRoom/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -ShoalCave_HighTideInnerRoom_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc deleted file mode 100644 index cdee5935a6..0000000000 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_HighTideInnerRoom: - .4byte ShoalCave_HighTideInnerRoom_Layout - .4byte ShoalCave_HighTideInnerRoom_MapEvents - .4byte ShoalCave_HighTideInnerRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.json b/data/maps/ShoalCave_HighTideInnerRoom/map.json new file mode 100644 index 0000000000..ff2231d67c --- /dev/null +++ b/data/maps/ShoalCave_HighTideInnerRoom/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM", + "name": "ShoalCave_HighTideInnerRoom", + "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc deleted file mode 100644 index 39b462ba8b..0000000000 --- a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -ShoalCave_LowTideEntranceRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 18, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0 - -ShoalCave_LowTideEntranceRoom_MapWarps: - warp_def 20, 30, 3, 0, MAP_ROUTE125 - warp_def 19, 5, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 6, 2, 3, 6, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 27, 2, 3, 7, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - -ShoalCave_LowTideEntranceRoom_MapEvents:: - map_events ShoalCave_LowTideEntranceRoom_EventObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc deleted file mode 100644 index cf1600b531..0000000000 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideEntranceRoom: - .4byte ShoalCave_LowTideEntranceRoom_Layout - .4byte ShoalCave_LowTideEntranceRoom_MapEvents - .4byte ShoalCave_LowTideEntranceRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json new file mode 100644 index 0000000000..477c1c5007 --- /dev/null +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -0,0 +1,76 @@ +{ + "id": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "name": "ShoalCave_LowTideEntranceRoom", + "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 30, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideEntranceRoom_EventScript_2913C0", + "flag": "FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 18, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideEntranceRoom_EventScript_236DD9", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 20, + "y": 30, + "elevation": 3, + "dest_map": "MAP_ROUTE125", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 6 + }, + { + "x": 27, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index c596ba6875..6e0f4eddb2 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -8,11 +8,11 @@ ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0 goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5 ShoalCave_LowTideEntranceRoom_EventScript_236DD1:: @ 8236DD1 - setmaplayoutindex 168 + setmaplayoutindex LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM end ShoalCave_LowTideEntranceRoom_EventScript_236DD5:: @ 8236DD5 - setmaplayoutindex 164 + setmaplayoutindex LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM end ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 diff --git a/data/maps/ShoalCave_LowTideIceRoom/events.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc deleted file mode 100644 index 57c4f580be..0000000000 --- a/data/maps/ShoalCave_LowTideIceRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -ShoalCave_LowTideIceRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE - -ShoalCave_LowTideIceRoom_MapWarps: - warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - -ShoalCave_LowTideIceRoom_MapEvents:: - map_events ShoalCave_LowTideIceRoom_EventObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc deleted file mode 100644 index a05edf096a..0000000000 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideIceRoom: - .4byte ShoalCave_LowTideIceRoom_Layout - .4byte ShoalCave_LowTideIceRoom_MapEvents - .4byte ShoalCave_LowTideIceRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json new file mode 100644 index 0000000000..fd2e726801 --- /dev/null +++ b/data/maps/ShoalCave_LowTideIceRoom/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", + "name": "ShoalCave_LowTideIceRoom", + "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 12, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideIceRoom_EventScript_2913E7", + "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 12, + "y": 21, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideIceRoom_EventScript_2913F4", + "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE" + } + ], + "warp_events": [ + { + "x": 17, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc deleted file mode 100644 index 8a4d0b7a98..0000000000 --- a/data/maps/ShoalCave_LowTideInnerRoom/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -ShoalCave_LowTideInnerRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY - -ShoalCave_LowTideInnerRoom_MapWarps: - warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - warp_def 38, 15, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM - warp_def 42, 4, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM - warp_def 19, 14, 4, 0, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - warp_def 15, 19, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - warp_def 30, 25, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - warp_def 14, 33, 5, 2, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - warp_def 40, 33, 5, 3, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - -ShoalCave_LowTideInnerRoom_MapBGEvents: - bg_event 31, 8, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_23708C - bg_event 14, 26, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_2370C8 - bg_event 41, 20, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_236FBA - bg_event 41, 10, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_236FF6 - bg_event 6, 9, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_237028 - bg_event 16, 13, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_23705A - -ShoalCave_LowTideInnerRoom_MapEvents:: - map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents - diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc deleted file mode 100644 index 431d599858..0000000000 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideInnerRoom: - .4byte ShoalCave_LowTideInnerRoom_Layout - .4byte ShoalCave_LowTideInnerRoom_MapEvents - .4byte ShoalCave_LowTideInnerRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json new file mode 100644 index 0000000000..a7c276aa48 --- /dev/null +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "name": "ShoalCave_LowTideInnerRoom", + "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 26, + "y": 14, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideInnerRoom_EventScript_2913CD", + "flag": "FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY" + } + ], + "warp_events": [ + { + "x": 34, + "y": 29, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "dest_warp_id": 1 + }, + { + "x": 38, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", + "dest_warp_id": 0 + }, + { + "x": 42, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 19, + "y": 14, + "elevation": 4, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 19, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "dest_warp_id": 1 + }, + { + "x": 30, + "y": 25, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "dest_warp_id": 2 + }, + { + "x": 14, + "y": 33, + "elevation": 5, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "dest_warp_id": 2 + }, + { + "x": 40, + "y": 33, + "elevation": 5, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 31, + "y": 8, + "elevation": 5, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideInnerRoom_EventScript_23708C" + }, + { + "type": "sign", + "x": 14, + "y": 26, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideInnerRoom_EventScript_2370C8" + }, + { + "type": "sign", + "x": 41, + "y": 20, + "elevation": 5, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideInnerRoom_EventScript_236FBA" + }, + { + "type": "sign", + "x": 41, + "y": 10, + "elevation": 5, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideInnerRoom_EventScript_236FF6" + }, + { + "type": "sign", + "x": 6, + "y": 9, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideInnerRoom_EventScript_237028" + }, + { + "type": "sign", + "x": 16, + "y": 13, + "elevation": 5, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideInnerRoom_EventScript_23705A" + } + ] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index 65bdd73b83..c54aa1d4ff 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -8,11 +8,11 @@ ShoalCave_LowTideInnerRoom_MapScript1_236F00: @ 8236F00 goto ShoalCave_LowTideInnerRoom_EventScript_236F12 ShoalCave_LowTideInnerRoom_EventScript_236F0E:: @ 8236F0E - setmaplayoutindex 169 + setmaplayoutindex LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM end ShoalCave_LowTideInnerRoom_EventScript_236F12:: @ 8236F12 - setmaplayoutindex 165 + setmaplayoutindex LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM end ShoalCave_LowTideInnerRoom_MapScript1_236F16: @ 8236F16 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc deleted file mode 100644 index 226f351e4c..0000000000 --- a/data/maps/ShoalCave_LowTideLowerRoom/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -ShoalCave_LowTideLowerRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0 - -ShoalCave_LowTideLowerRoom_MapWarps: - warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 2, 6, 3, 4, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 19, 11, 3, 5, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 28, 11, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM - -ShoalCave_LowTideLowerRoom_MapBGEvents: - bg_event 18, 2, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideLowerRoom_EventScript_237176 - -ShoalCave_LowTideLowerRoom_MapEvents:: - map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents - diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc deleted file mode 100644 index 490825d06d..0000000000 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideLowerRoom: - .4byte ShoalCave_LowTideLowerRoom_Layout - .4byte ShoalCave_LowTideLowerRoom_MapEvents - .4byte ShoalCave_LowTideLowerRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json new file mode 100644 index 0000000000..5c399ed538 --- /dev/null +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -0,0 +1,85 @@ +{ + "id": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "name": "ShoalCave_LowTideLowerRoom", + "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 25, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideLowerRoom_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideLowerRoom_EventScript_2371B2", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 3 + }, + { + "x": 2, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 4 + }, + { + "x": 19, + "y": 11, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 5 + }, + { + "x": 28, + "y": 11, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 18, + "y": 2, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideLowerRoom_EventScript_237176" + } + ] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc deleted file mode 100644 index 640d153f7a..0000000000 --- a/data/maps/ShoalCave_LowTideStairsRoom/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -ShoalCave_LowTideStairsRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL - -ShoalCave_LowTideStairsRoom_MapWarps: - warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 7, 4, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - -ShoalCave_LowTideStairsRoom_MapBGEvents: - bg_event 11, 11, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideStairsRoom_EventScript_23711A - -ShoalCave_LowTideStairsRoom_MapEvents:: - map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents - diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc deleted file mode 100644 index 3454cf1f64..0000000000 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideStairsRoom: - .4byte ShoalCave_LowTideStairsRoom_Layout - .4byte ShoalCave_LowTideStairsRoom_MapEvents - .4byte ShoalCave_LowTideStairsRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json new file mode 100644 index 0000000000..e4ad65f52d --- /dev/null +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -0,0 +1,58 @@ +{ + "id": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", + "name": "ShoalCave_LowTideStairsRoom", + "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 13, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideStairsRoom_EventScript_2913DA", + "flag": "FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL" + } + ], + "warp_events": [ + { + "x": 3, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 11, + "y": 11, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideStairsRoom_EventScript_23711A" + } + ] +} \ No newline at end of file diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc deleted file mode 100644 index cc422090e9..0000000000 --- a/data/maps/SingleBattleColosseum/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SingleBattleColosseum_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0 - -SingleBattleColosseum_MapWarps: - warp_def 6, 8, 3, 127, MAP_NONE - warp_def 7, 8, 3, 127, MAP_NONE - -SingleBattleColosseum_MapCoordEvents: - coord_event 3, 5, 3, VAR_TEMP_0, 0, gUnknown_08277374 - coord_event 10, 5, 3, VAR_TEMP_0, 0, gUnknown_0827737E - -SingleBattleColosseum_MapEvents:: - map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 - diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc deleted file mode 100644 index 9bf35edca8..0000000000 --- a/data/maps/SingleBattleColosseum/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SingleBattleColosseum: - .4byte SingleBattleColosseum_Layout - .4byte SingleBattleColosseum_MapEvents - .4byte SingleBattleColosseum_MapScripts - .4byte 0x0 - .2byte MUS_RAINBOW - .2byte LAYOUT_SINGLE_BATTLE_COLOSSEUM - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json new file mode 100644 index 0000000000..a2cc78b2f2 --- /dev/null +++ b/data/maps/SingleBattleColosseum/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_SINGLE_BATTLE_COLOSSEUM", + "name": "SingleBattleColosseum", + "layout": "LAYOUT_SINGLE_BATTLE_COLOSSEUM", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SingleBattleColosseum_EventScript_2774A6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_08277374" + }, + { + "type": "trigger", + "x": 10, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_0827737E" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_1F/events.inc b/data/maps/SkyPillar_1F/events.inc deleted file mode 100644 index eb6f98b7d0..0000000000 --- a/data/maps/SkyPillar_1F/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SkyPillar_1F_MapWarps: - warp_def 6, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE - warp_def 7, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE - warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_2F - -SkyPillar_1F_MapEvents:: - map_events 0x0, SkyPillar_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc deleted file mode 100644 index 83082ecc05..0000000000 --- a/data/maps/SkyPillar_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_1F: - .4byte SkyPillar_1F_Layout - .4byte SkyPillar_1F_MapEvents - .4byte SkyPillar_1F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_1F - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_1F/map.json b/data/maps/SkyPillar_1F/map.json new file mode 100644 index 0000000000..3d1fbf51ad --- /dev/null +++ b/data/maps/SkyPillar_1F/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_SKY_PILLAR_1F", + "name": "SkyPillar_1F", + "layout": "LAYOUT_SKY_PILLAR_1F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 6, + "y": 13, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_OUTSIDE", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 13, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_OUTSIDE", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc index 3d76a9fe22..2230dad8d2 100644 --- a/data/maps/SkyPillar_1F/scripts.inc +++ b/data/maps/SkyPillar_1F/scripts.inc @@ -8,6 +8,6 @@ SkyPillar_1F_MapScript1_23961B: @ 823961B end SkyPillar_1F_EventScript_239627:: @ 8239627 - setmaplayoutindex 433 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480F54 return diff --git a/data/maps/SkyPillar_2F/events.inc b/data/maps/SkyPillar_2F/events.inc deleted file mode 100644 index 3b4b279152..0000000000 --- a/data/maps/SkyPillar_2F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -SkyPillar_2F_MapWarps: - warp_def 10, 1, 3, 2, MAP_SKY_PILLAR_1F - warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_3F - -SkyPillar_2F_MapEvents:: - map_events 0x0, SkyPillar_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc deleted file mode 100644 index 46141edca1..0000000000 --- a/data/maps/SkyPillar_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_2F: - .4byte SkyPillar_2F_Layout - .4byte SkyPillar_2F_MapEvents - .4byte SkyPillar_2F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_2F - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_2F/map.json b/data/maps/SkyPillar_2F/map.json new file mode 100644 index 0000000000..1e543db403 --- /dev/null +++ b/data/maps/SkyPillar_2F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_SKY_PILLAR_2F", + "name": "SkyPillar_2F", + "layout": "LAYOUT_SKY_PILLAR_2F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_1F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index 0474a829c3..fa89f3893c 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -11,7 +11,7 @@ SkyPillar_2F_MapScript1_23963B: @ 823963B end SkyPillar_2F_EventScript_23964C:: @ 823964C - setmaplayoutindex 434 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_084810FC return SkyPillar_2F_MapScript1_239650: @ 8239650 diff --git a/data/maps/SkyPillar_3F/events.inc b/data/maps/SkyPillar_3F/events.inc deleted file mode 100644 index 8e3f498dc8..0000000000 --- a/data/maps/SkyPillar_3F/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SkyPillar_3F_MapWarps: - warp_def 3, 1, 3, 1, MAP_SKY_PILLAR_2F - warp_def 11, 1, 3, 0, MAP_SKY_PILLAR_4F - warp_def 7, 1, 3, 1, MAP_SKY_PILLAR_4F - -SkyPillar_3F_MapEvents:: - map_events 0x0, SkyPillar_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc deleted file mode 100644 index 9b4ab53f02..0000000000 --- a/data/maps/SkyPillar_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_3F: - .4byte SkyPillar_3F_Layout - .4byte SkyPillar_3F_MapEvents - .4byte SkyPillar_3F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_3F - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_3F/map.json b/data/maps/SkyPillar_3F/map.json new file mode 100644 index 0000000000..56a85256f9 --- /dev/null +++ b/data/maps/SkyPillar_3F/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_SKY_PILLAR_3F", + "name": "SkyPillar_3F", + "layout": "LAYOUT_SKY_PILLAR_3F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_2F", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_4F", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_4F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc index 777d53b628..015d754eb8 100644 --- a/data/maps/SkyPillar_3F/scripts.inc +++ b/data/maps/SkyPillar_3F/scripts.inc @@ -8,6 +8,6 @@ SkyPillar_3F_MapScript1_239661: @ 8239661 end SkyPillar_3F_EventScript_23966D:: @ 823966D - setmaplayoutindex 435 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_084812A4 return diff --git a/data/maps/SkyPillar_4F/events.inc b/data/maps/SkyPillar_4F/events.inc deleted file mode 100644 index ce0cdd2e37..0000000000 --- a/data/maps/SkyPillar_4F/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SkyPillar_4F_MapWarps: - warp_def 11, 1, 3, 1, MAP_SKY_PILLAR_3F - warp_def 7, 1, 3, 2, MAP_SKY_PILLAR_3F - warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_5F - -SkyPillar_4F_MapEvents:: - map_events 0x0, SkyPillar_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc deleted file mode 100644 index be6e9e66ad..0000000000 --- a/data/maps/SkyPillar_4F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_4F: - .4byte SkyPillar_4F_Layout - .4byte SkyPillar_4F_MapEvents - .4byte SkyPillar_4F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_4F - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_4F/map.json b/data/maps/SkyPillar_4F/map.json new file mode 100644 index 0000000000..babc00f6c6 --- /dev/null +++ b/data/maps/SkyPillar_4F/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_SKY_PILLAR_4F", + "name": "SkyPillar_4F", + "layout": "LAYOUT_SKY_PILLAR_4F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_3F", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_3F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_5F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index 2624921695..ccab2453c8 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -11,7 +11,7 @@ SkyPillar_4F_MapScript1_239681: @ 8239681 end SkyPillar_4F_EventScript_239692:: @ 8239692 - setmaplayoutindex 436 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_0848144C return SkyPillar_4F_MapScript1_239696: @ 8239696 diff --git a/data/maps/SkyPillar_5F/events.inc b/data/maps/SkyPillar_5F/events.inc deleted file mode 100644 index b3ad7b0f79..0000000000 --- a/data/maps/SkyPillar_5F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -SkyPillar_5F_MapWarps: - warp_def 3, 1, 3, 2, MAP_SKY_PILLAR_4F - warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_TOP - -SkyPillar_5F_MapEvents:: - map_events 0x0, SkyPillar_5F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc deleted file mode 100644 index 8fa59173bb..0000000000 --- a/data/maps/SkyPillar_5F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_5F: - .4byte SkyPillar_5F_Layout - .4byte SkyPillar_5F_MapEvents - .4byte SkyPillar_5F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_5F - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_5F/map.json b/data/maps/SkyPillar_5F/map.json new file mode 100644 index 0000000000..233e86dfee --- /dev/null +++ b/data/maps/SkyPillar_5F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_SKY_PILLAR_5F", + "name": "SkyPillar_5F", + "layout": "LAYOUT_SKY_PILLAR_5F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_4F", + "dest_warp_id": 2 + }, + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_TOP", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc index 41546899f8..b3e3f6605f 100644 --- a/data/maps/SkyPillar_5F/scripts.inc +++ b/data/maps/SkyPillar_5F/scripts.inc @@ -8,6 +8,6 @@ SkyPillar_5F_MapScript1_2396A8: @ 82396A8 return SkyPillar_5F_EventScript_2396B4:: @ 82396B4 - setmaplayoutindex 437 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_084815F4 return diff --git a/data/maps/SkyPillar_Entrance/events.inc b/data/maps/SkyPillar_Entrance/events.inc deleted file mode 100644 index ca0647e3ff..0000000000 --- a/data/maps/SkyPillar_Entrance/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -SkyPillar_Entrance_MapWarps: - warp_def 6, 16, 3, 0, MAP_ROUTE131 - warp_def 14, 4, 3, 0, MAP_SKY_PILLAR_OUTSIDE - -SkyPillar_Entrance_MapEvents:: - map_events 0x0, SkyPillar_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc deleted file mode 100644 index 5326495a63..0000000000 --- a/data/maps/SkyPillar_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_Entrance: - .4byte SkyPillar_Entrance_Layout - .4byte SkyPillar_Entrance_MapEvents - .4byte SkyPillar_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_ENTRANCE - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_Entrance/map.json b/data/maps/SkyPillar_Entrance/map.json new file mode 100644 index 0000000000..379d6fcfb3 --- /dev/null +++ b/data/maps/SkyPillar_Entrance/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_SKY_PILLAR_ENTRANCE", + "name": "SkyPillar_Entrance", + "layout": "LAYOUT_SKY_PILLAR_ENTRANCE", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 6, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ROUTE131", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_OUTSIDE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_Outside/events.inc b/data/maps/SkyPillar_Outside/events.inc deleted file mode 100644 index 90de89d64a..0000000000 --- a/data/maps/SkyPillar_Outside/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SkyPillar_Outside_EventObjects: - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Outside_EventScript_2393F8, FLAG_HIDE_SKY_PILLAR_WALLACE - -SkyPillar_Outside_MapWarps: - warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE - warp_def 14, 5, 0, 0, MAP_SKY_PILLAR_1F - -SkyPillar_Outside_MapEvents:: - map_events SkyPillar_Outside_EventObjects, SkyPillar_Outside_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc deleted file mode 100644 index 3b60eaef2c..0000000000 --- a/data/maps/SkyPillar_Outside/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_Outside: - .4byte SkyPillar_Outside_Layout - .4byte SkyPillar_Outside_MapEvents - .4byte SkyPillar_Outside_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_OUTSIDE - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json new file mode 100644 index 0000000000..dd76c1d32f --- /dev/null +++ b/data/maps/SkyPillar_Outside/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_SKY_PILLAR_OUTSIDE", + "name": "SkyPillar_Outside", + "layout": "LAYOUT_SKY_PILLAR_OUTSIDE", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SkyPillar_Outside_EventScript_2393F8", + "flag": "FLAG_HIDE_SKY_PILLAR_WALLACE" + } + ], + "warp_events": [ + { + "x": 17, + "y": 13, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SKY_PILLAR_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc deleted file mode 100644 index 23edf5bb26..0000000000 --- a/data/maps/SkyPillar_Top/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SkyPillar_Top_EventObjects: - object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2 - object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Top_EventScript_239722, FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT - -SkyPillar_Top_MapWarps: - warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F - -SkyPillar_Top_MapCoordEvents: - coord_event 14, 9, 3, VAR_0x40D7, 0, SkyPillar_Top_EventScript_23979A - -SkyPillar_Top_MapEvents:: - map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0 - diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc deleted file mode 100644 index a4ab735e05..0000000000 --- a/data/maps/SkyPillar_Top/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_Top: - .4byte SkyPillar_Top_Layout - .4byte SkyPillar_Top_MapEvents - .4byte SkyPillar_Top_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_TOP - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json new file mode 100644 index 0000000000..0d53a80be5 --- /dev/null +++ b/data/maps/SkyPillar_Top/map.json @@ -0,0 +1,65 @@ +{ + "id": "MAP_SKY_PILLAR_TOP", + "name": "SkyPillar_Top", + "layout": "LAYOUT_SKY_PILLAR_TOP", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_2", + "x": 14, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_1", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SkyPillar_Top_EventScript_239722", + "flag": "FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT" + } + ], + "warp_events": [ + { + "x": 16, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_5F", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 14, + "y": 9, + "elevation": 3, + "var": "VAR_0x40D7", + "var_value": 0, + "script": "SkyPillar_Top_EventScript_23979A" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index c091991a32..f764ea79c1 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -23,7 +23,7 @@ SkyPillar_Top_MapScript1_2396E6: @ 82396E6 end SkyPillar_Top_EventScript_2396FD:: @ 82396FD - setmaplayoutindex 438 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481B24 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return diff --git a/data/maps/SlateportCity/connections.inc b/data/maps/SlateportCity/connections.inc deleted file mode 100644 index 09e0b790aa..0000000000 --- a/data/maps/SlateportCity/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -SlateportCity_MapConnectionsList: - connection up, 0, MAP_ROUTE110 - connection down, 0, MAP_ROUTE109 - connection right, 0, MAP_ROUTE134 - -SlateportCity_MapConnections: - .4byte 3 - .4byte SlateportCity_MapConnectionsList - diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc deleted file mode 100644 index ce576927c9..0000000000 --- a/data/maps/SlateportCity/events.inc +++ /dev/null @@ -1,71 +0,0 @@ -SlateportCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCED9, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 34, 29, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0 - object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 5, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_EventScript_1DCEB8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 26, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 31, 27, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0 - object_event 7, EVENT_OBJ_GFX_OLD_WOMAN, 0, 20, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCE63, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCE84, 0 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY - object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN - object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 37, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0 - object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0 - object_event 14, EVENT_OBJ_GFX_POKEFAN_F, 0, 9, 50, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_1DCFF7, 0 - object_event 15, EVENT_OBJ_GFX_MAN_3, 0, 16, 46, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DD000, 0 - object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_1DCFBB, 0 - object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 15, 31, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0 - object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0 - object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0 - object_event 22, EVENT_OBJ_GFX_MAN_5, 0, 34, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0 - object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DD1D8, FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN - object_event 25, EVENT_OBJ_GFX_POKEFAN_M, 0, 5, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DCDBD, 0 - object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 22, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD04E, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD065, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 24, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD07C, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD093, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD0AA, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD0C1, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD14A, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD153, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 34, EVENT_OBJ_GFX_POKEFAN_F, 0, 11, 37, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 2, 0, 0, SlateportCity_EventScript_1DD36E, 0 - object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 2, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_SCOTT - -SlateportCity_MapWarps: - warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F - warp_def 13, 26, 0, 0, MAP_SLATEPORT_CITY_MART - warp_def 26, 38, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F - warp_def 10, 12, 0, 0, MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY - warp_def 4, 26, 0, 0, MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB - warp_def 30, 26, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F - warp_def 5, 19, 0, 0, MAP_SLATEPORT_CITY_HOUSE1 - warp_def 31, 26, 0, 1, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F - warp_def 28, 12, 0, 0, MAP_SLATEPORT_CITY_HARBOR - warp_def 40, 7, 0, 2, MAP_SLATEPORT_CITY_HARBOR - warp_def 21, 44, 0, 0, MAP_SLATEPORT_CITY_HOUSE2 - -SlateportCity_MapCoordEvents: - coord_event 10, 13, 3, VAR_0x40D2, 2, SlateportCity_EventScript_1DD5DC - -SlateportCity_MapBGEvents: - bg_event 8, 19, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCFB2 - bg_event 20, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E73 - bg_event 21, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E73 - bg_event 14, 26, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E6A - bg_event 24, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF94 - bg_event 15, 26, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E6A - bg_event 14, 51, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF8B - bg_event 26, 26, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF79 - bg_event 16, 22, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF82 - bg_event 8, 26, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF70 - bg_event 7, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF36 - bg_event 23, 38, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF3F - bg_event 10, 36, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1DD643 - -SlateportCity_MapEvents:: - map_events SlateportCity_EventObjects, SlateportCity_MapWarps, SlateportCity_MapCoordEvents, SlateportCity_MapBGEvents - diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc deleted file mode 100644 index 3a6e145342..0000000000 --- a/data/maps/SlateportCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity: - .4byte SlateportCity_Layout - .4byte SlateportCity_MapEvents - .4byte SlateportCity_MapScripts - .4byte SlateportCity_MapConnections - .2byte MUS_FINECITY - .2byte LAYOUT_SLATEPORT_CITY - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json new file mode 100644 index 0000000000..52f2f64127 --- /dev/null +++ b/data/maps/SlateportCity/map.json @@ -0,0 +1,685 @@ +{ + "id": "MAP_SLATEPORT_CITY", + "name": "SlateportCity", + "layout": "LAYOUT_SLATEPORT_CITY", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE110" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE109" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE134" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 21, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCED9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 34, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCEF6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 5, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCEB8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 26, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCF17", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 31, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD009", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_COOK", + "x": 5, + "y": 43, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCE42", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 20, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCE63", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 8, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCE84", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 29, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD353", + "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 28, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD35C", + "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 28, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD1F8", + "flag": "FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 37, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCFE5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 28, + "y": 46, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCFEE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 9, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCFF7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 16, + "y": 46, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD000", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 8, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCFBB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 15, + "y": 31, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCFDC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 30, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD020", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 29, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD037", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 6, + "y": 38, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD198", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 5, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD16A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 34, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD365", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 47, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCDE4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 11, + "y": 47, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD1D8", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 5, + "y": 47, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCDBD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 22, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD04E", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 23, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD065", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 24, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD07C", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 21, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD093", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 20, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD0AA", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 26, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD0C1", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 28, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD14A", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 25, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD153", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 11, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD36E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 10, + "y": 12, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_SCOTT" + } + ], + "warp_events": [ + { + "x": 19, + "y": 19, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 26, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_MART", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 38, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 12, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 26, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB", + "dest_warp_id": 0 + }, + { + "x": 30, + "y": 26, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 19, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 26, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", + "dest_warp_id": 1 + }, + { + "x": 28, + "y": 12, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_HARBOR", + "dest_warp_id": 0 + }, + { + "x": 40, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_HARBOR", + "dest_warp_id": 2 + }, + { + "x": 21, + "y": 44, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_HOUSE2", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_0x40D2", + "var_value": 2, + "script": "SlateportCity_EventScript_1DD5DC" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 19, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCFB2" + }, + { + "type": "sign", + "x": 20, + "y": 19, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SlateportCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 21, + "y": 19, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SlateportCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 14, + "y": 26, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SlateportCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 24, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF94" + }, + { + "type": "sign", + "x": 15, + "y": 26, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SlateportCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 14, + "y": 51, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF8B" + }, + { + "type": "sign", + "x": 26, + "y": 26, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF79" + }, + { + "type": "sign", + "x": 16, + "y": 22, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF82" + }, + { + "type": "sign", + "x": 8, + "y": 26, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF70" + }, + { + "type": "sign", + "x": 7, + "y": 13, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF36" + }, + { + "type": "sign", + "x": 23, + "y": 38, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF3F" + }, + { + "type": "sign", + "x": 10, + "y": 36, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SlateportCity_EventScript_1DD643" + } + ] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc deleted file mode 100644 index 2dae031383..0000000000 --- a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SlateportCity_BattleTentBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -SlateportCity_BattleTentBattleRoom_MapEvents:: - map_events SlateportCity_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc deleted file mode 100644 index ff2970197c..0000000000 --- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_BattleTentBattleRoom: - .4byte BattleTentBattleRoom_Layout - .4byte SlateportCity_BattleTentBattleRoom_MapEvents - .4byte SlateportCity_BattleTentBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_BATTLE_ROOM - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/map.json b/data/maps/SlateportCity_BattleTentBattleRoom/map.json new file mode 100644 index 0000000000..ed9a8866c3 --- /dev/null +++ b/data/maps/SlateportCity_BattleTentBattleRoom/map.json @@ -0,0 +1,60 @@ +{ + "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM", + "name": "SlateportCity_BattleTentBattleRoom", + "layout": "LAYOUT_BATTLE_TENT_BATTLE_ROOM", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 1, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_BattleTentCorridor/events.inc b/data/maps/SlateportCity_BattleTentCorridor/events.inc deleted file mode 100644 index f165ab2fa1..0000000000 --- a/data/maps/SlateportCity_BattleTentCorridor/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -SlateportCity_BattleTentCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -SlateportCity_BattleTentCorridor_MapEvents:: - map_events SlateportCity_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc deleted file mode 100644 index d1e0a8911b..0000000000 --- a/data/maps/SlateportCity_BattleTentCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_BattleTentCorridor: - .4byte BattleTentCorridor_Layout - .4byte SlateportCity_BattleTentCorridor_MapEvents - .4byte SlateportCity_BattleTentCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_CORRIDOR - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_BattleTentCorridor/map.json b/data/maps/SlateportCity_BattleTentCorridor/map.json new file mode 100644 index 0000000000..d5e2d5e379 --- /dev/null +++ b/data/maps/SlateportCity_BattleTentCorridor/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR", + "name": "SlateportCity_BattleTentCorridor", + "layout": "LAYOUT_BATTLE_TENT_CORRIDOR", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_BattleTentLobby/events.inc b/data/maps/SlateportCity_BattleTentLobby/events.inc deleted file mode 100644 index 81a3499ec4..0000000000 --- a/data/maps/SlateportCity_BattleTentLobby/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -SlateportCity_BattleTentLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 1, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0 - -SlateportCity_BattleTentLobby_MapWarps: - warp_def 6, 9, 0, 3, MAP_SLATEPORT_CITY - warp_def 7, 9, 0, 3, MAP_SLATEPORT_CITY - -SlateportCity_BattleTentLobby_MapBGEvents: - bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_BattleTentLobby_EventScript_208A99 - -SlateportCity_BattleTentLobby_MapEvents:: - map_events SlateportCity_BattleTentLobby_EventObjects, SlateportCity_BattleTentLobby_MapWarps, 0x0, SlateportCity_BattleTentLobby_MapBGEvents - diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc deleted file mode 100644 index 8b9df581e8..0000000000 --- a/data/maps/SlateportCity_BattleTentLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_BattleTentLobby: - .4byte BattleTentLobby_Layout - .4byte SlateportCity_BattleTentLobby_MapEvents - .4byte SlateportCity_BattleTentLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_LOBBY - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_BattleTentLobby/map.json b/data/maps/SlateportCity_BattleTentLobby/map.json new file mode 100644 index 0000000000..07af8ad738 --- /dev/null +++ b/data/maps/SlateportCity_BattleTentLobby/map.json @@ -0,0 +1,110 @@ +{ + "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY", + "name": "SlateportCity_BattleTentLobby", + "layout": "LAYOUT_BATTLE_TENT_LOBBY", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_BattleTentLobby_EventScript_2088AA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_BattleTentLobby_EventScript_208A3D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_BattleTentLobby_EventScript_208A7E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_BattleTentLobby_EventScript_208A87", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_BattleTentLobby_EventScript_208A90", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 3 + }, + { + "x": 7, + "y": 9, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_BattleTentLobby_EventScript_208A99" + } + ] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc deleted file mode 100644 index 7984e29925..0000000000 --- a/data/maps/SlateportCity_Harbor/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -SlateportCity_Harbor_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN - object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT - object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE - object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW - -SlateportCity_Harbor_MapWarps: - warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY - warp_def 12, 14, 0, 8, MAP_SLATEPORT_CITY - warp_def 19, 15, 0, 9, MAP_SLATEPORT_CITY - warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY - -SlateportCity_Harbor_MapCoordEvents: - coord_event 8, 11, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9BB - coord_event 8, 12, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9C7 - coord_event 8, 13, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9D3 - coord_event 8, 14, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9DF - -SlateportCity_Harbor_MapEvents:: - map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 - diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc deleted file mode 100644 index 24b39a88fb..0000000000 --- a/data/maps/SlateportCity_Harbor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_Harbor: - .4byte Harbor_Layout - .4byte SlateportCity_Harbor_MapEvents - .4byte SlateportCity_Harbor_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_HARBOR - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json new file mode 100644 index 0000000000..a48b6a82f2 --- /dev/null +++ b/data/maps/SlateportCity_Harbor/map.json @@ -0,0 +1,191 @@ +{ + "id": "MAP_SLATEPORT_CITY_HARBOR", + "name": "SlateportCity_Harbor", + "layout": "LAYOUT_HARBOR", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Harbor_EventScript_20CAF1", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 4, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Harbor_EventScript_20CC52", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 1, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Harbor_EventScript_20CC99", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 6, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Harbor_EventScript_20CCA2", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 8, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 7, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", + "x": 7, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW" + } + ], + "warp_events": [ + { + "x": 11, + "y": 14, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 8 + }, + { + "x": 12, + "y": 14, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 8 + }, + { + "x": 19, + "y": 15, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 9 + }, + { + "x": 20, + "y": 15, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 9 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 8, + "y": 11, + "elevation": 3, + "var": "VAR_0x40A0", + "var_value": 1, + "script": "SlateportCity_Harbor_EventScript_20C9BB" + }, + { + "type": "trigger", + "x": 8, + "y": 12, + "elevation": 3, + "var": "VAR_0x40A0", + "var_value": 1, + "script": "SlateportCity_Harbor_EventScript_20C9C7" + }, + { + "type": "trigger", + "x": 8, + "y": 13, + "elevation": 3, + "var": "VAR_0x40A0", + "var_value": 1, + "script": "SlateportCity_Harbor_EventScript_20C9D3" + }, + { + "type": "trigger", + "x": 8, + "y": 14, + "elevation": 3, + "var": "VAR_0x40A0", + "var_value": 1, + "script": "SlateportCity_Harbor_EventScript_20C9DF" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_House1/events.inc b/data/maps/SlateportCity_House1/events.inc deleted file mode 100644 index a5fcfba7e8..0000000000 --- a/data/maps/SlateportCity_House1/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SlateportCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0 - -SlateportCity_House1_MapWarps: - warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY - warp_def 4, 7, 0, 6, MAP_SLATEPORT_CITY - -SlateportCity_House1_MapEvents:: - map_events SlateportCity_House1_EventObjects, SlateportCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc deleted file mode 100644 index 2673a37168..0000000000 --- a/data/maps/SlateportCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_House1: - .4byte HouseWithBed_Layout - .4byte SlateportCity_House1_MapEvents - .4byte SlateportCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_HOUSE_WITH_BED - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_House1/map.json b/data/maps/SlateportCity_House1/map.json new file mode 100644 index 0000000000..b1eed10274 --- /dev/null +++ b/data/maps/SlateportCity_House1/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_SLATEPORT_CITY_HOUSE1", + "name": "SlateportCity_House1", + "layout": "LAYOUT_HOUSE_WITH_BED", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_House1_EventScript_209AA5", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_House2/events.inc b/data/maps/SlateportCity_House2/events.inc deleted file mode 100644 index eba48e548d..0000000000 --- a/data/maps/SlateportCity_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SlateportCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0 - -SlateportCity_House2_MapWarps: - warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY - warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY - -SlateportCity_House2_MapEvents:: - map_events SlateportCity_House2_EventObjects, SlateportCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc deleted file mode 100644 index 0e756ee4a6..0000000000 --- a/data/maps/SlateportCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_House2: - .4byte House2_Layout - .4byte SlateportCity_House2_MapEvents - .4byte SlateportCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_House2/map.json b/data/maps/SlateportCity_House2/map.json new file mode 100644 index 0000000000..24ae6e67d0 --- /dev/null +++ b/data/maps/SlateportCity_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_SLATEPORT_CITY_HOUSE2", + "name": "SlateportCity_House2", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_House2_EventScript_20D9AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_House2_EventScript_20D9B8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 10 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_Mart/events.inc b/data/maps/SlateportCity_Mart/events.inc deleted file mode 100644 index a6d872630c..0000000000 --- a/data/maps/SlateportCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SlateportCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0 - -SlateportCity_Mart_MapWarps: - warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY - warp_def 4, 7, 0, 1, MAP_SLATEPORT_CITY - -SlateportCity_Mart_MapEvents:: - map_events SlateportCity_Mart_EventObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc deleted file mode 100644 index a98e7bb902..0000000000 --- a/data/maps/SlateportCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_Mart: - .4byte Mart_Layout - .4byte SlateportCity_Mart_MapEvents - .4byte SlateportCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json new file mode 100644 index 0000000000..cec96e59ff --- /dev/null +++ b/data/maps/SlateportCity_Mart/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_SLATEPORT_CITY_MART", + "name": "SlateportCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Mart_EventScript_20DC49", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Mart_EventScript_20DC76", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Mart_EventScript_20DC7F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc deleted file mode 100644 index 254506300f..0000000000 --- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc +++ /dev/null @@ -1,43 +0,0 @@ -SlateportCity_OceanicMuseum_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - object_event 9, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 18, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT - object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - -SlateportCity_OceanicMuseum_1F_MapWarps: - warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY - warp_def 10, 8, 0, 7, MAP_SLATEPORT_CITY - warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F - -SlateportCity_OceanicMuseum_1F_MapCoordEvents: - coord_event 9, 7, 3, VAR_0x40AA, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD9F - coord_event 10, 7, 3, VAR_0x40AA, 0, SlateportCity_OceanicMuseum_1F_EventScript_20ADB0 - -SlateportCity_OceanicMuseum_1F_MapBGEvents: - bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE83 - bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE8C - bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE95 - bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E - bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE95 - bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E - bg_event 15, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEA7 - bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEB0 - bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEB9 - bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2 - bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2 - bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AECB - bg_event 17, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AECB - -SlateportCity_OceanicMuseum_1F_MapEvents:: - map_events SlateportCity_OceanicMuseum_1F_EventObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents - diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc deleted file mode 100644 index 0bf69b52a1..0000000000 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_OceanicMuseum_1F: - .4byte SlateportCity_OceanicMuseum_1F_Layout - .4byte SlateportCity_OceanicMuseum_1F_MapEvents - .4byte SlateportCity_OceanicMuseum_1F_MapScripts - .4byte 0x0 - .2byte MUS_FUNE_KAN - .2byte LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json new file mode 100644 index 0000000000..7202fc35ae --- /dev/null +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -0,0 +1,349 @@ +{ + "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", + "name": "SlateportCity_OceanicMuseum_1F", + "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", + "music": "MUS_FUNE_KAN", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD96", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 18, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE5F", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 12, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE68", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE56", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE4D", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 14, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE71", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD96", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 8, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE7A", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AED4", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEDD", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 17, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEE6", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 18, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEEF", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEF8", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_28C883", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + } + ], + "warp_events": [ + { + "x": 9, + "y": 8, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 5 + }, + { + "x": 10, + "y": 8, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 7 + }, + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 9, + "y": 7, + "elevation": 3, + "var": "VAR_0x40AA", + "var_value": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD9F" + }, + { + "type": "trigger", + "x": 10, + "y": 7, + "elevation": 3, + "var": "VAR_0x40AA", + "var_value": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20ADB0" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 2, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE83" + }, + { + "type": "sign", + "x": 2, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE8C" + }, + { + "type": "sign", + "x": 9, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE95" + }, + { + "type": "sign", + "x": 12, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE9E" + }, + { + "type": "sign", + "x": 10, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE95" + }, + { + "type": "sign", + "x": 13, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE9E" + }, + { + "type": "sign", + "x": 15, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEA7" + }, + { + "type": "sign", + "x": 18, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEB0" + }, + { + "type": "sign", + "x": 18, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEB9" + }, + { + "type": "sign", + "x": 2, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEC2" + }, + { + "type": "sign", + "x": 3, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEC2" + }, + { + "type": "sign", + "x": 16, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AECB" + }, + { + "type": "sign", + "x": 17, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AECB" + } + ] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc deleted file mode 100644 index b1cd4477a8..0000000000 --- a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -SlateportCity_OceanicMuseum_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2 - object_event 5, EVENT_OBJ_GFX_OLD_MAN, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - object_event 6, EVENT_OBJ_GFX_POKEFAN_F, 0, 9, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - object_event 7, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - -SlateportCity_OceanicMuseum_2F_MapWarps: - warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F - -SlateportCity_OceanicMuseum_2F_MapBGEvents: - bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD0A - bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD13 - bg_event 4, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD52 - bg_event 4, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD52 - bg_event 3, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD49 - bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD49 - bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD49 - bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 - bg_event 4, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 - bg_event 13, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B - bg_event 14, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B - bg_event 18, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD37 - bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD37 - bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E - bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E - bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD25 - bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD25 - bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C - bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C - bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 - bg_event 4, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 - -SlateportCity_OceanicMuseum_2F_MapEvents:: - map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents - diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc deleted file mode 100644 index 8212c6be59..0000000000 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_OceanicMuseum_2F: - .4byte SlateportCity_OceanicMuseum_2F_Layout - .4byte SlateportCity_OceanicMuseum_2F_MapEvents - .4byte SlateportCity_OceanicMuseum_2F_MapScripts - .4byte 0x0 - .2byte MUS_FUNE_KAN - .2byte LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json new file mode 100644 index 0000000000..dbb46dbfce --- /dev/null +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -0,0 +1,289 @@ +{ + "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", + "name": "SlateportCity_OceanicMuseum_2F", + "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", + "music": "MUS_FUNE_KAN", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 13, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BB00", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 6, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 6, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 6, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD64", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD6D", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD76", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + } + ], + "warp_events": [ + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 18, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD0A" + }, + { + "type": "sign", + "x": 18, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD13" + }, + { + "type": "sign", + "x": 4, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD52" + }, + { + "type": "sign", + "x": 4, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD52" + }, + { + "type": "sign", + "x": 3, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49" + }, + { + "type": "sign", + "x": 2, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49" + }, + { + "type": "sign", + "x": 3, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49" + }, + { + "type": "sign", + "x": 3, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + }, + { + "type": "sign", + "x": 4, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + }, + { + "type": "sign", + "x": 13, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD5B" + }, + { + "type": "sign", + "x": 14, + "y": 7, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD5B" + }, + { + "type": "sign", + "x": 18, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD37" + }, + { + "type": "sign", + "x": 19, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD37" + }, + { + "type": "sign", + "x": 15, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD2E" + }, + { + "type": "sign", + "x": 16, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD2E" + }, + { + "type": "sign", + "x": 8, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD25" + }, + { + "type": "sign", + "x": 9, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD25" + }, + { + "type": "sign", + "x": 12, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD1C" + }, + { + "type": "sign", + "x": 13, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD1C" + }, + { + "type": "sign", + "x": 3, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + }, + { + "type": "sign", + "x": 4, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + } + ] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_PokemonCenter_1F/events.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 79442b1aab..0000000000 --- a/data/maps/SlateportCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SlateportCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0 - -SlateportCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY - warp_def 6, 8, 3, 0, MAP_SLATEPORT_CITY - warp_def 1, 6, 4, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_2F - -SlateportCity_PokemonCenter_1F_MapEvents:: - map_events SlateportCity_PokemonCenter_1F_EventObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc deleted file mode 100644 index aee6e2e1cc..0000000000 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte SlateportCity_PokemonCenter_1F_MapEvents - .4byte SlateportCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..eecc722481 --- /dev/null +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F", + "name": "SlateportCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAD3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAE1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAEA", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SLATEPORT_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_PokemonCenter_2F/events.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 34f7fe078d..0000000000 --- a/data/maps/SlateportCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -SlateportCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -SlateportCity_PokemonCenter_2F_MapEvents:: - map_events SlateportCity_PokemonCenter_2F_EventObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc deleted file mode 100644 index bc9640581f..0000000000 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte SlateportCity_PokemonCenter_2F_MapEvents - .4byte SlateportCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..e12efc0f07 --- /dev/null +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_2F", + "name": "SlateportCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_PokemonFanClub/events.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc deleted file mode 100644 index 861d9cb62a..0000000000 --- a/data/maps/SlateportCity_PokemonFanClub/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -SlateportCity_PokemonFanClub_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0 - object_event 2, EVENT_OBJ_GFX_TWIN, 0, 1, 5, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0 - object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0 - object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0 - object_event 6, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 3, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0 - object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0 - object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0 - object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 11, 8, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0 - -SlateportCity_PokemonFanClub_MapWarps: - warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY - warp_def 7, 10, 0, 4, MAP_SLATEPORT_CITY - -SlateportCity_PokemonFanClub_MapEvents:: - map_events SlateportCity_PokemonFanClub_EventObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc deleted file mode 100644 index 29e6816a3e..0000000000 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_PokemonFanClub: - .4byte SlateportCity_PokemonFanClub_Layout - .4byte SlateportCity_PokemonFanClub_MapEvents - .4byte SlateportCity_PokemonFanClub_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json new file mode 100644 index 0000000000..e41bee0fdb --- /dev/null +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -0,0 +1,153 @@ +{ + "id": "MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB", + "name": "SlateportCity_PokemonFanClub", + "layout": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 11, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_20A1E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 1, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_20A1F1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 11, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_28C943", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_20A17E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 6, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_209E96", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 3, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_20A20D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "x": 8, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_20A1FA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_20A220", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 11, + "y": 8, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_2C7F16", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 10, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 4 + }, + { + "x": 7, + "y": 10, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_SternsShipyard_1F/events.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc deleted file mode 100644 index 052ccd9659..0000000000 --- a/data/maps/SlateportCity_SternsShipyard_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_SternsShipyard_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0 - object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY - -SlateportCity_SternsShipyard_1F_MapWarps: - warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY - warp_def 3, 14, 0, 2, MAP_SLATEPORT_CITY - warp_def 3, 1, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F - -SlateportCity_SternsShipyard_1F_MapEvents:: - map_events SlateportCity_SternsShipyard_1F_EventObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc deleted file mode 100644 index 3731923e2d..0000000000 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_SternsShipyard_1F: - .4byte SlateportCity_SternsShipyard_1F_Layout - .4byte SlateportCity_SternsShipyard_1F_MapEvents - .4byte SlateportCity_SternsShipyard_1F_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json new file mode 100644 index 0000000000..8497f4212a --- /dev/null +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F", + "name": "SlateportCity_SternsShipyard_1F", + "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_SternsShipyard_1F_EventScript_207F40", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_SternsShipyard_1F_EventScript_207FED", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 18, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_SternsShipyard_1F_EventScript_207FF6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 12, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_SternsShipyard_1F_EventScript_207FFF", + "flag": "FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY" + } + ], + "warp_events": [ + { + "x": 2, + "y": 14, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 14, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_SternsShipyard_2F/events.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc deleted file mode 100644 index 2e48eb8b4d..0000000000 --- a/data/maps/SlateportCity_SternsShipyard_2F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SlateportCity_SternsShipyard_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0 - -SlateportCity_SternsShipyard_2F_MapWarps: - warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F - -SlateportCity_SternsShipyard_2F_MapEvents:: - map_events SlateportCity_SternsShipyard_2F_EventObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc deleted file mode 100644 index 094f9fdec1..0000000000 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_SternsShipyard_2F: - .4byte SlateportCity_SternsShipyard_2F_Layout - .4byte SlateportCity_SternsShipyard_2F_MapEvents - .4byte SlateportCity_SternsShipyard_2F_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json new file mode 100644 index 0000000000..025d97f9a0 --- /dev/null +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F", + "name": "SlateportCity_SternsShipyard_2F", + "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_SternsShipyard_2F_EventScript_20863E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 0, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_SternsShipyard_2F_EventScript_208647", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity/connections.inc b/data/maps/SootopolisCity/connections.inc deleted file mode 100644 index 230f56b2ef..0000000000 --- a/data/maps/SootopolisCity/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -SootopolisCity_MapConnectionsList:: @ 84867F0 - @ empty - -SootopolisCity_MapConnections:: @ 84867F0 - .4byte 0 - .4byte SootopolisCity_MapConnectionsList diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc deleted file mode 100644 index 6592c293d9..0000000000 --- a/data/maps/SootopolisCity/events.inc +++ /dev/null @@ -1,46 +0,0 @@ -SootopolisCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 47, 33, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0 - object_event 4, EVENT_OBJ_GFX_NINJA_BOY, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1 - object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 20, 36, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6166, FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN - object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 49, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6038, 0 - object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 28, 44, 0, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON - object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 34, 44, 1, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE - object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 31, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA - object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 17, 44, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6411, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS - object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 14, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E63DB, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS - object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 40, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6393, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS - object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 19, 37, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E635D, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS - object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 29, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E64F2, FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE - object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E651F, FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE - object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6446, FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE - -SootopolisCity_MapWarps: - warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F - warp_def 17, 29, 0, 0, MAP_SOOTOPOLIS_CITY_MART - warp_def 31, 32, 0, 0, MAP_SOOTOPOLIS_CITY_GYM_1F - warp_def 31, 16, 3, 0, MAP_CAVE_OF_ORIGIN_ENTRANCE - warp_def 9, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE1 - warp_def 45, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE2 - warp_def 9, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE3 - warp_def 44, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE4 - warp_def 9, 26, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE5 - warp_def 53, 28, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE6 - warp_def 8, 35, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE7 - warp_def 48, 25, 0, 0, MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE - warp_def 51, 36, 0, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F - -SootopolisCity_MapBGEvents: - bg_event 33, 34, 3, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_1E614B - bg_event 19, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E6A - bg_event 44, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E73 - bg_event 45, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E73 - bg_event 18, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E6A - bg_event 41, 37, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_1E6154 - -SootopolisCity_MapEvents:: - map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, 0x0, SootopolisCity_MapBGEvents - diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc deleted file mode 100644 index 0d12af500a..0000000000 --- a/data/maps/SootopolisCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity: - .4byte SootopolisCity_Layout - .4byte SootopolisCity_MapEvents - .4byte SootopolisCity_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json new file mode 100644 index 0000000000..88ca51ff74 --- /dev/null +++ b/data/maps/SootopolisCity/map.json @@ -0,0 +1,396 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY", + "name": "SootopolisCity", + "layout": "LAYOUT_SOOTOPOLIS_CITY", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 31, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E5E8D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 47, + "y": 33, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E5FE2", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 9, + "y": 43, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E5ED8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 51, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E608E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 43, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E60E3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 26, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E6017", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 20, + "y": 36, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E6166", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 49, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E6038", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GROUDON_3", + "x": 28, + "y": 44, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KYOGRE_3", + "x": 34, + "y": 44, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_2", + "x": 31, + "y": 41, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 17, + "y": 44, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E6411", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 14, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E63DB", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 17, + "y": 40, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E6393", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 19, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E635D", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 29, + "y": 33, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E64F2", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 31, + "y": 33, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E651F", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "x": 31, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E6446", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE" + } + ], + "warp_events": [ + { + "x": 43, + "y": 31, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 29, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_MART", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 32, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_GYM_1F", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 16, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 45, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 17, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE3", + "dest_warp_id": 0 + }, + { + "x": 44, + "y": 17, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE4", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 26, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE5", + "dest_warp_id": 0 + }, + { + "x": 53, + "y": 28, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE6", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 35, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE7", + "dest_warp_id": 0 + }, + { + "x": 48, + "y": 25, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 51, + "y": 36, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 33, + "y": 34, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SootopolisCity_EventScript_1E614B" + }, + { + "type": "sign", + "x": 19, + "y": 29, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SootopolisCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 44, + "y": 31, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SootopolisCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 45, + "y": 31, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SootopolisCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 18, + "y": 29, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SootopolisCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 41, + "y": 37, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SootopolisCity_EventScript_1E6154" + } + ] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index a116aeb568..5e212ddfe4 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -97,7 +97,7 @@ SootopolisCity_EventScript_1E5800:: @ 81E5800 return SootopolisCity_EventScript_1E5801:: @ 81E5801 - setmaplayoutindex 357 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08469200 return SootopolisCity_EventScript_1E5805:: @ 81E5805 diff --git a/data/maps/SootopolisCity_Gym_1F/events.inc b/data/maps/SootopolisCity_Gym_1F/events.inc deleted file mode 100644 index 288d78343a..0000000000 --- a/data/maps/SootopolisCity_Gym_1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SootopolisCity_Gym_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_JUAN, 0, 8, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0 - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0 - -SootopolisCity_Gym_1F_MapWarps: - warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY - warp_def 9, 25, 0, 2, MAP_SOOTOPOLIS_CITY - warp_def 11, 22, 3, 0, MAP_SOOTOPOLIS_CITY_GYM_B1F - -SootopolisCity_Gym_1F_MapBGEvents: - bg_event 6, 24, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_Gym_1F_EventScript_22505F - bg_event 10, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_Gym_1F_EventScript_22506F - -SootopolisCity_Gym_1F_MapEvents:: - map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents - diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc deleted file mode 100644 index 72e6fd2c81..0000000000 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_Gym_1F: - .4byte SootopolisCity_Gym_1F_Layout - .4byte SootopolisCity_Gym_1F_MapEvents - .4byte SootopolisCity_Gym_1F_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_SOOTOPOLIS_CITY_GYM_1F - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json new file mode 100644 index 0000000000..6c1e4374d2 --- /dev/null +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -0,0 +1,86 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_GYM_1F", + "name": "SootopolisCity_Gym_1F", + "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_1F", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_JUAN", + "x": 8, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_Gym_1F_EventScript_224F44", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 7, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_Gym_1F_EventScript_225040", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 25, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 25, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 2 + }, + { + "x": 11, + "y": 22, + "elevation": 3, + "dest_map": "MAP_SOOTOPOLIS_CITY_GYM_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 6, + "y": 24, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SootopolisCity_Gym_1F_EventScript_22505F" + }, + { + "type": "sign", + "x": 10, + "y": 24, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SootopolisCity_Gym_1F_EventScript_22506F" + } + ] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_Gym_B1F/events.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc deleted file mode 100644 index 2ef2609e7e..0000000000 --- a/data/maps/SootopolisCity_Gym_B1F/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -SootopolisCity_Gym_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 11, 9, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0 - object_event 6, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0 - object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0 - object_event 10, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0 - -SootopolisCity_Gym_B1F_MapWarps: - warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F - -SootopolisCity_Gym_B1F_MapEvents:: - map_events SootopolisCity_Gym_B1F_EventObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc deleted file mode 100644 index afa12fa9f2..0000000000 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_Gym_B1F: - .4byte SootopolisCity_Gym_B1F_Layout - .4byte SootopolisCity_Gym_B1F_MapEvents - .4byte SootopolisCity_Gym_B1F_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_SOOTOPOLIS_CITY_GYM_B1F - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json new file mode 100644 index 0000000000..663d7db847 --- /dev/null +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -0,0 +1,159 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_GYM_B1F", + "name": "SootopolisCity_Gym_B1F", + "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_B1F", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 7, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SootopolisCity_Gym_B1F_EventScript_225C8B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 9, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SootopolisCity_Gym_B1F_EventScript_225CD0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SootopolisCity_Gym_B1F_EventScript_225CB9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 11, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "SootopolisCity_Gym_B1F_EventScript_225CE7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SootopolisCity_Gym_B1F_EventScript_225D15", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SootopolisCity_Gym_B1F_EventScript_225D2C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SootopolisCity_Gym_B1F_EventScript_225CA2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SootopolisCity_Gym_B1F_EventScript_225CFE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 6, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SootopolisCity_Gym_B1F_EventScript_225D5A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 10, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SootopolisCity_Gym_B1F_EventScript_225D43", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 11, + "y": 22, + "elevation": 3, + "dest_map": "MAP_SOOTOPOLIS_CITY_GYM_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House1/events.inc b/data/maps/SootopolisCity_House1/events.inc deleted file mode 100644 index 64012784a7..0000000000 --- a/data/maps/SootopolisCity_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SootopolisCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0 - -SootopolisCity_House1_MapWarps: - warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 4, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House1_MapEvents:: - map_events SootopolisCity_House1_EventObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc deleted file mode 100644 index af4cf939c4..0000000000 --- a/data/maps/SootopolisCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House1: - .4byte SootopolisCity_House1_Layout - .4byte SootopolisCity_House1_MapEvents - .4byte SootopolisCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE1 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json new file mode 100644 index 0000000000..b5ecf4e411 --- /dev/null +++ b/data/maps/SootopolisCity_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE1", + "name": "SootopolisCity_House1", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House1_EventScript_22694D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House1_EventScript_22698E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House2/events.inc b/data/maps/SootopolisCity_House2/events.inc deleted file mode 100644 index ea70cecb97..0000000000 --- a/data/maps/SootopolisCity_House2/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SootopolisCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0 - -SootopolisCity_House2_MapWarps: - warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 5, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House2_MapEvents:: - map_events SootopolisCity_House2_EventObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc deleted file mode 100644 index 42b7e14aa8..0000000000 --- a/data/maps/SootopolisCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House2: - .4byte SootopolisCity_House2_Layout - .4byte SootopolisCity_House2_MapEvents - .4byte SootopolisCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE2 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json new file mode 100644 index 0000000000..ea9d582848 --- /dev/null +++ b/data/maps/SootopolisCity_House2/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE2", + "name": "SootopolisCity_House2", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House2_EventScript_226A77", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House3/events.inc b/data/maps/SootopolisCity_House3/events.inc deleted file mode 100644 index d078de8ecc..0000000000 --- a/data/maps/SootopolisCity_House3/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SootopolisCity_House3_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0 - -SootopolisCity_House3_MapWarps: - warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 6, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House3_MapEvents:: - map_events SootopolisCity_House3_EventObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc deleted file mode 100644 index 0913505e13..0000000000 --- a/data/maps/SootopolisCity_House3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House3: - .4byte SootopolisCity_House3_Layout - .4byte SootopolisCity_House3_MapEvents - .4byte SootopolisCity_House3_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE3 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json new file mode 100644 index 0000000000..765803e8a7 --- /dev/null +++ b/data/maps/SootopolisCity_House3/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE3", + "name": "SootopolisCity_House3", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House3_EventScript_226B72", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House3_EventScript_226B9B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House4/events.inc b/data/maps/SootopolisCity_House4/events.inc deleted file mode 100644 index ce669cd756..0000000000 --- a/data/maps/SootopolisCity_House4/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SootopolisCity_House4_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 2, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0 - object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SootopolisCity_House4_EventScript_226D28, 0 - -SootopolisCity_House4_MapWarps: - warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 7, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House4_MapEvents:: - map_events SootopolisCity_House4_EventObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc deleted file mode 100644 index 1266c68fec..0000000000 --- a/data/maps/SootopolisCity_House4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House4: - .4byte SootopolisCity_House1_Layout - .4byte SootopolisCity_House4_MapEvents - .4byte SootopolisCity_House4_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE1 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json new file mode 100644 index 0000000000..492aac1343 --- /dev/null +++ b/data/maps/SootopolisCity_House4/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE4", + "name": "SootopolisCity_House4", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House4_EventScript_226D16", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House4_EventScript_226D1F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House4_EventScript_226D28", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 7 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House5/events.inc b/data/maps/SootopolisCity_House5/events.inc deleted file mode 100644 index fa6d0452dd..0000000000 --- a/data/maps/SootopolisCity_House5/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SootopolisCity_House5_EventObjects: - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0 - -SootopolisCity_House5_MapWarps: - warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 8, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House5_MapEvents:: - map_events SootopolisCity_House5_EventObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc deleted file mode 100644 index 0b1b3664ca..0000000000 --- a/data/maps/SootopolisCity_House5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House5: - .4byte SootopolisCity_House2_Layout - .4byte SootopolisCity_House5_MapEvents - .4byte SootopolisCity_House5_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE2 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json new file mode 100644 index 0000000000..24cdafe8bd --- /dev/null +++ b/data/maps/SootopolisCity_House5/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE5", + "name": "SootopolisCity_House5", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House5_EventScript_226E94", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House5_EventScript_226E9D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 8 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House6/events.inc b/data/maps/SootopolisCity_House6/events.inc deleted file mode 100644 index c89c135386..0000000000 --- a/data/maps/SootopolisCity_House6/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SootopolisCity_House6_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0 - -SootopolisCity_House6_MapWarps: - warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 9, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House6_MapEvents:: - map_events SootopolisCity_House6_EventObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc deleted file mode 100644 index 3268fbf09a..0000000000 --- a/data/maps/SootopolisCity_House6/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House6: - .4byte SootopolisCity_House3_Layout - .4byte SootopolisCity_House6_MapEvents - .4byte SootopolisCity_House6_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE3 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json new file mode 100644 index 0000000000..d787c3e67d --- /dev/null +++ b/data/maps/SootopolisCity_House6/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE6", + "name": "SootopolisCity_House6", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 4, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House6_EventScript_226F5C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 9 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House7/events.inc b/data/maps/SootopolisCity_House7/events.inc deleted file mode 100644 index e978cb8d4f..0000000000 --- a/data/maps/SootopolisCity_House7/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SootopolisCity_House7_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0 - -SootopolisCity_House7_MapWarps: - warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 10, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House7_MapEvents:: - map_events SootopolisCity_House7_EventObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc deleted file mode 100644 index 0398f1cf77..0000000000 --- a/data/maps/SootopolisCity_House7/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House7: - .4byte SootopolisCity_House1_Layout - .4byte SootopolisCity_House7_MapEvents - .4byte SootopolisCity_House7_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE1 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json new file mode 100644 index 0000000000..de04646828 --- /dev/null +++ b/data/maps/SootopolisCity_House7/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE7", + "name": "SootopolisCity_House7", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House7_EventScript_2270CC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House7_EventScript_2270D5", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 10 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc deleted file mode 100644 index da5b123fe6..0000000000 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_LotadAndSeedotHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0 - -SootopolisCity_LotadAndSeedotHouse_MapWarps: - warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY - -SootopolisCity_LotadAndSeedotHouse_MapBGEvents: - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_LotadAndSeedotHouse_EventScript_22734D - bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_LotadAndSeedotHouse_EventScript_22735B - -SootopolisCity_LotadAndSeedotHouse_MapEvents:: - map_events SootopolisCity_LotadAndSeedotHouse_EventObjects, SootopolisCity_LotadAndSeedotHouse_MapWarps, 0x0, SootopolisCity_LotadAndSeedotHouse_MapBGEvents - diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc deleted file mode 100644 index 35da7aa8bc..0000000000 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_LotadAndSeedotHouse: - .4byte SootopolisCity_LotadAndSeedotHouse_Layout - .4byte SootopolisCity_LotadAndSeedotHouse_MapEvents - .4byte SootopolisCity_LotadAndSeedotHouse_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json new file mode 100644 index 0000000000..5f8acc9bb5 --- /dev/null +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json @@ -0,0 +1,79 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE", + "name": "SootopolisCity_LotadAndSeedotHouse", + "layout": "LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22722B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 11 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 11 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22734D" + }, + { + "type": "sign", + "x": 2, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22735B" + } + ] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_Mart/events.inc b/data/maps/SootopolisCity_Mart/events.inc deleted file mode 100644 index 0fb940fd9f..0000000000 --- a/data/maps/SootopolisCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SootopolisCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0 - -SootopolisCity_Mart_MapWarps: - warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY - warp_def 4, 7, 0, 1, MAP_SOOTOPOLIS_CITY - -SootopolisCity_Mart_MapEvents:: - map_events SootopolisCity_Mart_EventObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc deleted file mode 100644 index 5b5ad1a01a..0000000000 --- a/data/maps/SootopolisCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_Mart: - .4byte Mart_Layout - .4byte SootopolisCity_Mart_MapEvents - .4byte SootopolisCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json new file mode 100644 index 0000000000..bb031b2af7 --- /dev/null +++ b/data/maps/SootopolisCity_Mart/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_MART", + "name": "SootopolisCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_Mart_EventScript_226795", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_Mart_EventScript_2267C2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_Mart_EventScript_2267EC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc deleted file mode 100644 index 560e693cf7..0000000000 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SootopolisCity_MysteryEventsHouse_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 6, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0 - -SootopolisCity_MysteryEventsHouse_1F_MapWarps: - warp_def 3, 7, 0, 12, MAP_SOOTOPOLIS_CITY - warp_def 4, 7, 0, 12, MAP_SOOTOPOLIS_CITY - warp_def 3, 1, 3, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F - -SootopolisCity_MysteryEventsHouse_1F_MapEvents:: - map_events SootopolisCity_MysteryEventsHouse_1F_EventObjects, SootopolisCity_MysteryEventsHouse_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc deleted file mode 100644 index bf7d813210..0000000000 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_MysteryEventsHouse_1F: - .4byte SootopolisCity_MysteryEventsHouse_1F_Layout - .4byte SootopolisCity_MysteryEventsHouse_1F_MapEvents - .4byte SootopolisCity_MysteryEventsHouse_1F_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json new file mode 100644 index 0000000000..b57eae35c6 --- /dev/null +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", + "name": "SootopolisCity_MysteryEventsHouse_1F", + "layout": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 6, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 12 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 12 + }, + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 0493cb05ff..252bd12010 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -16,7 +16,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D setvar VAR_TEMP_1, 1 setobjectxyperm 1, 3, 2 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN - setmaplayoutindex 441 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481DBC return SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc deleted file mode 100644 index 816cbaecc9..0000000000 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SootopolisCity_MysteryEventsHouse_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 - -SootopolisCity_MysteryEventsHouse_B1F_MapWarps: - warp_def 3, 1, 0, 2, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F - -SootopolisCity_MysteryEventsHouse_B1F_MapEvents:: - map_events SootopolisCity_MysteryEventsHouse_B1F_EventObjects, SootopolisCity_MysteryEventsHouse_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc deleted file mode 100644 index ee7def94c2..0000000000 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_MysteryEventsHouse_B1F: - .4byte SootopolisCity_MysteryEventsHouse_B1F_Layout - .4byte SootopolisCity_MysteryEventsHouse_B1F_MapEvents - .4byte SootopolisCity_MysteryEventsHouse_B1F_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json new file mode 100644 index 0000000000..fcc77a3311 --- /dev/null +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F", + "name": "SootopolisCity_MysteryEventsHouse_B1F", + "layout": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 6, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 743ba0ccbc..0000000000 --- a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0 - -SootopolisCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY - warp_def 6, 8, 3, 0, MAP_SOOTOPOLIS_CITY - warp_def 1, 6, 4, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F - -SootopolisCity_PokemonCenter_1F_MapEvents:: - map_events SootopolisCity_PokemonCenter_1F_EventObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 972cf28e4c..0000000000 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte SootopolisCity_PokemonCenter_1F_MapEvents - .4byte SootopolisCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..bce2e52bd6 --- /dev/null +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F", + "name": "SootopolisCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_1F_EventScript_226500", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 12, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_1F_EventScript_22650E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_1F_EventScript_226538", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_1F_EventScript_2C8256", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc deleted file mode 100644 index e8fb6e09f1..0000000000 --- a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -SootopolisCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -SootopolisCity_PokemonCenter_2F_MapEvents:: - map_events SootopolisCity_PokemonCenter_2F_EventObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 03ab97ea5a..0000000000 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte SootopolisCity_PokemonCenter_2F_MapEvents - .4byte SootopolisCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..32e27dbdf2 --- /dev/null +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F", + "name": "SootopolisCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SouthernIsland_Exterior/events.inc b/data/maps/SouthernIsland_Exterior/events.inc deleted file mode 100644 index eeb21d3af4..0000000000 --- a/data/maps/SouthernIsland_Exterior/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SouthernIsland_Exterior_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - -SouthernIsland_Exterior_MapWarps: - warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR - warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR - -SouthernIsland_Exterior_MapBGEvents: - bg_event 16, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SouthernIsland_Exterior_EventScript_242A3C - -SouthernIsland_Exterior_MapEvents:: - map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents - diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc deleted file mode 100644 index 1288fbdf50..0000000000 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SouthernIsland_Exterior: - .4byte SouthernIsland_Exterior_Layout - .4byte SouthernIsland_Exterior_MapEvents - .4byte SouthernIsland_Exterior_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_SOUTHERN_ISLAND_EXTERIOR - .byte MAPSEC_SOUTHERN_ISLAND - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json new file mode 100644 index 0000000000..a747a48b8d --- /dev/null +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -0,0 +1,71 @@ +{ + "id": "MAP_SOUTHERN_ISLAND_EXTERIOR", + "name": "SouthernIsland_Exterior", + "layout": "LAYOUT_SOUTHERN_ISLAND_EXTERIOR", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_SOUTHERN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 13, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SouthernIsland_Exterior_EventScript_2429D2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 13, + "y": 25, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 14, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SOUTHERN_ISLAND_INTERIOR", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SOUTHERN_ISLAND_INTERIOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 16, + "y": 7, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SouthernIsland_Exterior_EventScript_242A3C" + } + ] +} \ No newline at end of file diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc deleted file mode 100644 index 190762f5ba..0000000000 --- a/data/maps/SouthernIsland_Interior/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SouthernIsland_Interior_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 13, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON - -SouthernIsland_Interior_MapWarps: - warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR - warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR - -SouthernIsland_Interior_MapBGEvents: - bg_event 13, 11, 3, BG_EVENT_PLAYER_FACING_NORTH, SouthernIsland_Interior_EventScript_242AC4 - -SouthernIsland_Interior_MapEvents:: - map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents - diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc deleted file mode 100644 index 95eb61d7c3..0000000000 --- a/data/maps/SouthernIsland_Interior/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SouthernIsland_Interior: - .4byte SouthernIsland_Interior_Layout - .4byte SouthernIsland_Interior_MapEvents - .4byte SouthernIsland_Interior_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_SOUTHERN_ISLAND_INTERIOR - .byte MAPSEC_SOUTHERN_ISLAND - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json new file mode 100644 index 0000000000..6d099763a7 --- /dev/null +++ b/data/maps/SouthernIsland_Interior/map.json @@ -0,0 +1,71 @@ +{ + "id": "MAP_SOUTHERN_ISLAND_INTERIOR", + "name": "SouthernIsland_Interior", + "layout": "LAYOUT_SOUTHERN_ISLAND_INTERIOR", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_SOUTHERN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 13, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 13, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON" + } + ], + "warp_events": [ + { + "x": 13, + "y": 18, + "elevation": 3, + "dest_map": "MAP_SOUTHERN_ISLAND_EXTERIOR", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 18, + "elevation": 3, + "dest_map": "MAP_SOUTHERN_ISLAND_EXTERIOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 13, + "y": 11, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SouthernIsland_Interior_EventScript_242AC4" + } + ] +} \ No newline at end of file diff --git a/data/maps/TerraCave_End/events.inc b/data/maps/TerraCave_End/events.inc deleted file mode 100644 index f20abd8fd4..0000000000 --- a/data/maps/TerraCave_End/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -TerraCave_End_EventObjects: - object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 17, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_TERRA_CAVE_GROUDON - -TerraCave_End_MapWarps: - warp_def 5, 4, 3, 1, MAP_TERRA_CAVE_ENTRANCE - -TerraCave_End_MapCoordEvents: - coord_event 17, 26, 3, VAR_TEMP_1, 1, TerraCave_End_EventScript_23B0EC - -TerraCave_End_MapEvents:: - map_events TerraCave_End_EventObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0 - diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc deleted file mode 100644 index f95ac38b8c..0000000000 --- a/data/maps/TerraCave_End/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TerraCave_End: - .4byte TerraCave_End_Layout - .4byte TerraCave_End_MapEvents - .4byte TerraCave_End_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_TERRA_CAVE_END - .byte MAPSEC_TERRA_CAVE - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TerraCave_End/map.json b/data/maps/TerraCave_End/map.json new file mode 100644 index 0000000000..9b5ab9f32f --- /dev/null +++ b/data/maps/TerraCave_End/map.json @@ -0,0 +1,52 @@ +{ + "id": "MAP_TERRA_CAVE_END", + "name": "TerraCave_End", + "layout": "LAYOUT_TERRA_CAVE_END", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_TERRA_CAVE", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GROUDON_1", + "x": 17, + "y": 22, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_TERRA_CAVE_GROUDON" + } + ], + "warp_events": [ + { + "x": 5, + "y": 4, + "elevation": 3, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 17, + "y": 26, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 1, + "script": "TerraCave_End_EventScript_23B0EC" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TerraCave_Entrance/events.inc b/data/maps/TerraCave_Entrance/events.inc deleted file mode 100644 index bfa4092fdf..0000000000 --- a/data/maps/TerraCave_Entrance/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -TerraCave_Entrance_MapWarps: - warp_def 8, 18, 0, 127, MAP_NONE - warp_def 14, 1, 3, 0, MAP_TERRA_CAVE_END - -TerraCave_Entrance_MapEvents:: - map_events 0x0, TerraCave_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc deleted file mode 100644 index 5ede2a4487..0000000000 --- a/data/maps/TerraCave_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TerraCave_Entrance: - .4byte TerraCave_Entrance_Layout - .4byte TerraCave_Entrance_MapEvents - .4byte TerraCave_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_TERRA_CAVE_ENTRANCE - .byte MAPSEC_TERRA_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TerraCave_Entrance/map.json b/data/maps/TerraCave_Entrance/map.json new file mode 100644 index 0000000000..8ca5c69dff --- /dev/null +++ b/data/maps/TerraCave_Entrance/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_TERRA_CAVE_ENTRANCE", + "name": "TerraCave_Entrance", + "layout": "LAYOUT_TERRA_CAVE_ENTRANCE", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_TERRA_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 8, + "y": 18, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 14, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TERRA_CAVE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc deleted file mode 100644 index 79faca7e65..0000000000 --- a/data/maps/TradeCenter/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -TradeCenter_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0 - -TradeCenter_MapWarps: - warp_def 5, 8, 3, 127, MAP_NONE - warp_def 6, 8, 3, 127, MAP_NONE - -TradeCenter_MapCoordEvents: - coord_event 4, 5, 3, VAR_TEMP_0, 0, gUnknown_082773F5 - coord_event 7, 5, 3, VAR_TEMP_0, 0, gUnknown_082773FF - -TradeCenter_MapEvents:: - map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 - diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc deleted file mode 100644 index 80a11cd52f..0000000000 --- a/data/maps/TradeCenter/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TradeCenter: - .4byte TradeCenter_Layout - .4byte TradeCenter_MapEvents - .4byte TradeCenter_MapScripts - .4byte 0x0 - .2byte MUS_RAINBOW - .2byte LAYOUT_TRADE_CENTER - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json new file mode 100644 index 0000000000..f7511a7537 --- /dev/null +++ b/data/maps/TradeCenter/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_TRADE_CENTER", + "name": "TradeCenter", + "layout": "LAYOUT_TRADE_CENTER", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TradeCenter_EventScript_2774B6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_082773F5" + }, + { + "type": "trigger", + "x": 7, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_082773FF" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_1F/events.inc b/data/maps/TrainerHill_1F/events.inc deleted file mode 100644 index 21e62b951f..0000000000 --- a/data/maps/TrainerHill_1F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -TrainerHill_1F_MapWarps: - warp_def 2, 1, 3, 2, MAP_TRAINER_HILL_ENTRANCE - warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_2F - -TrainerHill_1F_MapEvents:: - map_events 0x0, TrainerHill_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc deleted file mode 100644 index a3654edf2a..0000000000 --- a/data/maps/TrainerHill_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_1F: - .4byte TrainerHill_1F_Layout - .4byte TrainerHill_1F_MapEvents - .4byte TrainerHill_1F_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_TRAINER_HILL_1F - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_1F/map.json b/data/maps/TrainerHill_1F/map.json new file mode 100644 index 0000000000..77c8ee094f --- /dev/null +++ b/data/maps/TrainerHill_1F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_TRAINER_HILL_1F", + "name": "TrainerHill_1F", + "layout": "LAYOUT_TRAINER_HILL_1F", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_2F/events.inc b/data/maps/TrainerHill_2F/events.inc deleted file mode 100644 index 4752e33cdc..0000000000 --- a/data/maps/TrainerHill_2F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -TrainerHill_2F_MapWarps: - warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_1F - warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_3F - -TrainerHill_2F_MapEvents:: - map_events 0x0, TrainerHill_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc deleted file mode 100644 index 2f607baff6..0000000000 --- a/data/maps/TrainerHill_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_2F: - .4byte TrainerHill_2F_Layout - .4byte TrainerHill_2F_MapEvents - .4byte TrainerHill_2F_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_TRAINER_HILL_2F - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_2F/map.json b/data/maps/TrainerHill_2F/map.json new file mode 100644 index 0000000000..a10f68baf4 --- /dev/null +++ b/data/maps/TrainerHill_2F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_TRAINER_HILL_2F", + "name": "TrainerHill_2F", + "layout": "LAYOUT_TRAINER_HILL_2F", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_1F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_3F/events.inc b/data/maps/TrainerHill_3F/events.inc deleted file mode 100644 index 5de009a47c..0000000000 --- a/data/maps/TrainerHill_3F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -TrainerHill_3F_MapWarps: - warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_2F - warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_4F - -TrainerHill_3F_MapEvents:: - map_events 0x0, TrainerHill_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc deleted file mode 100644 index 4dd8e394fb..0000000000 --- a/data/maps/TrainerHill_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_3F: - .4byte TrainerHill_3F_Layout - .4byte TrainerHill_3F_MapEvents - .4byte TrainerHill_3F_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_TRAINER_HILL_3F - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_3F/map.json b/data/maps/TrainerHill_3F/map.json new file mode 100644 index 0000000000..dfaa57f59d --- /dev/null +++ b/data/maps/TrainerHill_3F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_TRAINER_HILL_3F", + "name": "TrainerHill_3F", + "layout": "LAYOUT_TRAINER_HILL_3F", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_2F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_4F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_4F/events.inc b/data/maps/TrainerHill_4F/events.inc deleted file mode 100644 index 05f6e89178..0000000000 --- a/data/maps/TrainerHill_4F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -TrainerHill_4F_MapWarps: - warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_3F - warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_ROOF - -TrainerHill_4F_MapEvents:: - map_events 0x0, TrainerHill_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc deleted file mode 100644 index 4f370c5d98..0000000000 --- a/data/maps/TrainerHill_4F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_4F: - .4byte TrainerHill_4F_Layout - .4byte TrainerHill_4F_MapEvents - .4byte TrainerHill_4F_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_TRAINER_HILL_4F - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_4F/map.json b/data/maps/TrainerHill_4F/map.json new file mode 100644 index 0000000000..01f20a8f7f --- /dev/null +++ b/data/maps/TrainerHill_4F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_TRAINER_HILL_4F", + "name": "TrainerHill_4F", + "layout": "LAYOUT_TRAINER_HILL_4F", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_3F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_ROOF", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_Elevator/events.inc b/data/maps/TrainerHill_Elevator/events.inc deleted file mode 100644 index c0336a267a..0000000000 --- a/data/maps/TrainerHill_Elevator/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -TrainerHill_Elevator_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0 - -TrainerHill_Elevator_MapWarps: - warp_def 1, 6, 3, 1, MAP_TRAINER_HILL_ROOF - warp_def 2, 6, 3, 1, MAP_TRAINER_HILL_ROOF - -TrainerHill_Elevator_MapEvents:: - map_events TrainerHill_Elevator_EventObjects, TrainerHill_Elevator_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc deleted file mode 100644 index 5eeaa994be..0000000000 --- a/data/maps/TrainerHill_Elevator/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_Elevator: - .4byte BattleElevator_Layout - .4byte TrainerHill_Elevator_MapEvents - .4byte TrainerHill_Elevator_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_ELEVATOR - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_Elevator/map.json b/data/maps/TrainerHill_Elevator/map.json new file mode 100644 index 0000000000..731bcf44a0 --- /dev/null +++ b/data/maps/TrainerHill_Elevator/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_TRAINER_HILL_ELEVATOR", + "name": "TrainerHill_Elevator", + "layout": "LAYOUT_BATTLE_ELEVATOR", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Elevator_EventScript_26935F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_ROOF", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_ROOF", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_Entrance/events.inc b/data/maps/TrainerHill_Entrance/events.inc deleted file mode 100644 index ddc3f3f094..0000000000 --- a/data/maps/TrainerHill_Entrance/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -TrainerHill_Entrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0 - object_event 2, EVENT_OBJ_GFX_NURSE, 0, 4, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0 - object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 5, 14, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 14, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_268391, 0 - -TrainerHill_Entrance_MapWarps: - warp_def 9, 16, 3, 4, MAP_ROUTE111 - warp_def 10, 16, 3, 4, MAP_ROUTE111 - warp_def 9, 1, 3, 0, MAP_TRAINER_HILL_1F - -TrainerHill_Entrance_MapCoordEvents: - coord_event 9, 6, 3, VAR_0x40D6, 0, TrainerHill_Entrance_EventScript_268229 - -TrainerHill_Entrance_MapBGEvents: - bg_event 8, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, TrainerHill_Entrance_EventScript_268388 - -TrainerHill_Entrance_MapEvents:: - map_events TrainerHill_Entrance_EventObjects, TrainerHill_Entrance_MapWarps, TrainerHill_Entrance_MapCoordEvents, TrainerHill_Entrance_MapBGEvents - diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc deleted file mode 100644 index 26e215a6e8..0000000000 --- a/data/maps/TrainerHill_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_Entrance: - .4byte TrainerHill_Entrance_Layout - .4byte TrainerHill_Entrance_MapEvents - .4byte TrainerHill_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_TRAINER_HILL_ENTRANCE - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json new file mode 100644 index 0000000000..32f6cee379 --- /dev/null +++ b/data/maps/TrainerHill_Entrance/map.json @@ -0,0 +1,127 @@ +{ + "id": "MAP_TRAINER_HILL_ENTRANCE", + "name": "TrainerHill_Entrance", + "layout": "LAYOUT_TRAINER_HILL_ENTRANCE", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Entrance_EventScript_2681FD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 4, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Entrance_EventScript_2681EF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 14, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Entrance_EventScript_2683C7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 5, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Entrance_EventScript_2683AC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 14, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Entrance_EventScript_268391", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 4 + }, + { + "x": 10, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 4 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 9, + "y": 6, + "elevation": 3, + "var": "VAR_0x40D6", + "var_value": 0, + "script": "TrainerHill_Entrance_EventScript_268229" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "TrainerHill_Entrance_EventScript_268388" + } + ] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_Roof/events.inc b/data/maps/TrainerHill_Roof/events.inc deleted file mode 100644 index 0a3b361c4c..0000000000 --- a/data/maps/TrainerHill_Roof/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -TrainerHill_Roof_EventObjects: - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0 - -TrainerHill_Roof_MapWarps: - warp_def 9, 5, 3, 1, MAP_TRAINER_HILL_4F - warp_def 15, 5, 0, 1, MAP_TRAINER_HILL_ELEVATOR - -TrainerHill_Roof_MapEvents:: - map_events TrainerHill_Roof_EventObjects, TrainerHill_Roof_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc deleted file mode 100644 index c27cb3b5ac..0000000000 --- a/data/maps/TrainerHill_Roof/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_Roof: - .4byte TrainerHill_Roof_Layout - .4byte TrainerHill_Roof_MapEvents - .4byte TrainerHill_Roof_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_TRAINER_HILL_ROOF - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_Roof/map.json b/data/maps/TrainerHill_Roof/map.json new file mode 100644 index 0000000000..d54779a8eb --- /dev/null +++ b/data/maps/TrainerHill_Roof/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_TRAINER_HILL_ROOF", + "name": "TrainerHill_Roof", + "layout": "LAYOUT_TRAINER_HILL_ROOF", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Roof_EventScript_268FB2", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 5, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_4F", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_HILL_ELEVATOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater1/connections.inc b/data/maps/Underwater1/connections.inc deleted file mode 100644 index 01c45b11b0..0000000000 --- a/data/maps/Underwater1/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater1_MapConnectionsList: - connection down, 0, MAP_UNDERWATER2 - connection emerge, 0, MAP_ROUTE124 - -Underwater1_MapConnections: - .4byte 2 - .4byte Underwater1_MapConnectionsList - diff --git a/data/maps/Underwater1/events.inc b/data/maps/Underwater1/events.inc deleted file mode 100644 index ef329306f8..0000000000 --- a/data/maps/Underwater1/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Underwater1_MapBGEvents: - bg_hidden_item_event 42, 51, 0, ITEM_CARBOS, FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS - bg_hidden_item_event 14, 40, 0, ITEM_GREEN_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD - bg_hidden_item_event 66, 34, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL - bg_hidden_item_event 64, 54, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL - bg_hidden_item_event 70, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1 - bg_hidden_item_event 42, 5, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM - bg_hidden_item_event 45, 36, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2 - -Underwater1_MapEvents:: - map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents - diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc deleted file mode 100644 index 06ab5f3832..0000000000 --- a/data/maps/Underwater1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater1: - .4byte Underwater1_Layout - .4byte Underwater1_MapEvents - .4byte Underwater1_MapScripts - .4byte Underwater1_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER1 - .byte MAPSEC_UNDERWATER_124 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater1/map.json new file mode 100644 index 0000000000..7fd45b45f3 --- /dev/null +++ b/data/maps/Underwater1/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_UNDERWATER1", + "name": "Underwater1", + "layout": "LAYOUT_UNDERWATER1", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_124", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_UNDERWATER2" + }, + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE124" + } + ], + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 42, + "y": 51, + "elevation": 0, + "item": "ITEM_CARBOS", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS" + }, + { + "type": "hidden_item", + "x": 14, + "y": 40, + "elevation": 0, + "item": "ITEM_GREEN_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD" + }, + { + "type": "hidden_item", + "x": 66, + "y": 34, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL" + }, + { + "type": "hidden_item", + "x": 64, + "y": 54, + "elevation": 3, + "item": "ITEM_BIG_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL" + }, + { + "type": "hidden_item", + "x": 70, + "y": 64, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1" + }, + { + "type": "hidden_item", + "x": 42, + "y": 5, + "elevation": 3, + "item": "ITEM_CALCIUM", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM" + }, + { + "type": "hidden_item", + "x": 45, + "y": 36, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2" + } + ] +} \ No newline at end of file diff --git a/data/maps/Underwater2/connections.inc b/data/maps/Underwater2/connections.inc deleted file mode 100644 index 74f11e5afc..0000000000 --- a/data/maps/Underwater2/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Underwater2_MapConnectionsList: - connection up, 0, MAP_UNDERWATER1 - connection right, 0, MAP_UNDERWATER3 - connection emerge, 0, MAP_ROUTE126 - -Underwater2_MapConnections: - .4byte 3 - .4byte Underwater2_MapConnectionsList - diff --git a/data/maps/Underwater2/events.inc b/data/maps/Underwater2/events.inc deleted file mode 100644 index b4127fc15e..0000000000 --- a/data/maps/Underwater2/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Underwater2_MapWarps: - warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY - -Underwater2_MapBGEvents: - bg_hidden_item_event 30, 17, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE - bg_hidden_item_event 41, 19, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL - bg_hidden_item_event 63, 19, 3, ITEM_STARDUST, FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST - bg_hidden_item_event 10, 36, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL - bg_hidden_item_event 11, 39, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON - bg_hidden_item_event 12, 35, 3, ITEM_YELLOW_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD - bg_hidden_item_event 65, 60, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL - bg_hidden_item_event 9, 77, 3, ITEM_BLUE_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD - -Underwater2_MapEvents:: - map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents - diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc deleted file mode 100644 index d1b11aa62d..0000000000 --- a/data/maps/Underwater2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater2: - .4byte Underwater2_Layout - .4byte Underwater2_MapEvents - .4byte Underwater2_MapScripts - .4byte Underwater2_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER2 - .byte MAPSEC_UNDERWATER_125 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater2/map.json new file mode 100644 index 0000000000..7977faa4f0 --- /dev/null +++ b/data/maps/Underwater2/map.json @@ -0,0 +1,109 @@ +{ + "id": "MAP_UNDERWATER2", + "name": "Underwater2", + "layout": "LAYOUT_UNDERWATER2", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_125", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_UNDERWATER1" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_UNDERWATER3" + }, + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE126" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 45, + "y": 65, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_SOOTOPOLIS_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 30, + "y": 17, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE" + }, + { + "type": "hidden_item", + "x": 41, + "y": 19, + "elevation": 3, + "item": "ITEM_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL" + }, + { + "type": "hidden_item", + "x": 63, + "y": 19, + "elevation": 3, + "item": "ITEM_STARDUST", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST" + }, + { + "type": "hidden_item", + "x": 10, + "y": 36, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL" + }, + { + "type": "hidden_item", + "x": 11, + "y": 39, + "elevation": 3, + "item": "ITEM_IRON", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON" + }, + { + "type": "hidden_item", + "x": 12, + "y": 35, + "elevation": 3, + "item": "ITEM_YELLOW_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD" + }, + { + "type": "hidden_item", + "x": 65, + "y": 60, + "elevation": 3, + "item": "ITEM_BIG_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL" + }, + { + "type": "hidden_item", + "x": 9, + "y": 77, + "elevation": 3, + "item": "ITEM_BLUE_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD" + } + ] +} \ No newline at end of file diff --git a/data/maps/Underwater3/connections.inc b/data/maps/Underwater3/connections.inc deleted file mode 100644 index e0e6226def..0000000000 --- a/data/maps/Underwater3/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Underwater3_MapConnectionsList: - connection emerge, 0, MAP_ROUTE127 - connection left, 0, MAP_UNDERWATER2 - connection down, 0, MAP_UNDERWATER4 - -Underwater3_MapConnections: - .4byte 3 - .4byte Underwater3_MapConnectionsList - diff --git a/data/maps/Underwater3/events.inc b/data/maps/Underwater3/events.inc deleted file mode 100644 index 92964db38d..0000000000 --- a/data/maps/Underwater3/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Underwater3_MapWarps: - warp_def 57, 5, 0, 0, MAP_UNDERWATER_MARINE_CAVE - warp_def 67, 38, 0, 0, MAP_UNDERWATER_MARINE_CAVE - -Underwater3_MapBGEvents: - bg_hidden_item_event 12, 42, 3, ITEM_STAR_PIECE, FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE - bg_hidden_item_event 50, 36, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP - bg_hidden_item_event 34, 72, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE - bg_hidden_item_event 72, 20, 3, ITEM_RED_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD - -Underwater3_MapEvents:: - map_events 0x0, Underwater3_MapWarps, 0x0, Underwater3_MapBGEvents - diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc deleted file mode 100644 index 1722cfdd83..0000000000 --- a/data/maps/Underwater3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater3: - .4byte Underwater3_Layout - .4byte Underwater3_MapEvents - .4byte Underwater3_MapScripts - .4byte Underwater3_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER3 - .byte MAPSEC_UNDERWATER_126 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater3/map.json new file mode 100644 index 0000000000..ea87b52354 --- /dev/null +++ b/data/maps/Underwater3/map.json @@ -0,0 +1,84 @@ +{ + "id": "MAP_UNDERWATER3", + "name": "Underwater3", + "layout": "LAYOUT_UNDERWATER3", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_126", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE127" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_UNDERWATER2" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_UNDERWATER4" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 57, + "y": 5, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 67, + "y": 38, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 12, + "y": 42, + "elevation": 3, + "item": "ITEM_STAR_PIECE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE" + }, + { + "type": "hidden_item", + "x": 50, + "y": 36, + "elevation": 3, + "item": "ITEM_HP_UP", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP" + }, + { + "type": "hidden_item", + "x": 34, + "y": 72, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE" + }, + { + "type": "hidden_item", + "x": 72, + "y": 20, + "elevation": 3, + "item": "ITEM_RED_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD" + } + ] +} \ No newline at end of file diff --git a/data/maps/Underwater4/connections.inc b/data/maps/Underwater4/connections.inc deleted file mode 100644 index c1701e1ddd..0000000000 --- a/data/maps/Underwater4/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater4_MapConnectionsList: - connection up, 0, MAP_UNDERWATER3 - connection emerge, 0, MAP_ROUTE128 - -Underwater4_MapConnections: - .4byte 2 - .4byte Underwater4_MapConnectionsList - diff --git a/data/maps/Underwater4/events.inc b/data/maps/Underwater4/events.inc deleted file mode 100644 index 4bdc98caf2..0000000000 --- a/data/maps/Underwater4/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -Underwater4_MapWarps: - warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN - -Underwater4_MapBGEvents: - bg_hidden_item_event 38, 19, 3, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN - bg_hidden_item_event 69, 18, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL - -Underwater4_MapEvents:: - map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents - diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc deleted file mode 100644 index 2b9975a907..0000000000 --- a/data/maps/Underwater4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater4: - .4byte Underwater4_Layout - .4byte Underwater4_MapEvents - .4byte Underwater4_MapScripts - .4byte Underwater4_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER4 - .byte MAPSEC_UNDERWATER_127 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater4/map.json new file mode 100644 index 0000000000..9226717c34 --- /dev/null +++ b/data/maps/Underwater4/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_UNDERWATER4", + "name": "Underwater4", + "layout": "LAYOUT_UNDERWATER4", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_127", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_UNDERWATER3" + }, + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE128" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 38, + "y": 26, + "elevation": 3, + "dest_map": "MAP_UNDERWATER_SEAFLOOR_CAVERN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 38, + "y": 19, + "elevation": 3, + "item": "ITEM_PROTEIN", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN" + }, + { + "type": "hidden_item", + "x": 69, + "y": 18, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL" + } + ] +} \ No newline at end of file diff --git a/data/maps/Underwater5/connections.inc b/data/maps/Underwater5/connections.inc deleted file mode 100644 index c082452d30..0000000000 --- a/data/maps/Underwater5/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater5_MapConnectionsList: - connection emerge, 0, MAP_ROUTE129 - -Underwater5_MapConnections: - .4byte 1 - .4byte Underwater5_MapConnectionsList - diff --git a/data/maps/Underwater5/events.inc b/data/maps/Underwater5/events.inc deleted file mode 100644 index 5b5c58cf47..0000000000 --- a/data/maps/Underwater5/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater5_MapWarps: - warp_def 26, 3, 0, 0, MAP_UNDERWATER_MARINE_CAVE - warp_def 32, 21, 0, 0, MAP_UNDERWATER_MARINE_CAVE - -Underwater5_MapEvents:: - map_events 0x0, Underwater5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc deleted file mode 100644 index 3466acdf62..0000000000 --- a/data/maps/Underwater5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater5: - .4byte Underwater5_Layout - .4byte Underwater5_MapEvents - .4byte Underwater5_MapScripts - .4byte Underwater5_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER5 - .byte MAPSEC_UNDERWATER_129 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater5/map.json b/data/maps/Underwater5/map.json new file mode 100644 index 0000000000..abd13a187a --- /dev/null +++ b/data/maps/Underwater5/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_UNDERWATER5", + "name": "Underwater5", + "layout": "LAYOUT_UNDERWATER5", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_129", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE129" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 26, + "y": 3, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 32, + "y": 21, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater6/connections.inc b/data/maps/Underwater6/connections.inc deleted file mode 100644 index 8e051ea550..0000000000 --- a/data/maps/Underwater6/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater6_MapConnectionsList: - connection emerge, 0, MAP_ROUTE105 - -Underwater6_MapConnections: - .4byte 1 - .4byte Underwater6_MapConnectionsList - diff --git a/data/maps/Underwater6/events.inc b/data/maps/Underwater6/events.inc deleted file mode 100644 index 067bc5561e..0000000000 --- a/data/maps/Underwater6/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater6_MapWarps: - warp_def 13, 4, 0, 0, MAP_UNDERWATER_MARINE_CAVE - warp_def 17, 66, 0, 0, MAP_UNDERWATER_MARINE_CAVE - -Underwater6_MapEvents:: - map_events 0x0, Underwater6_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc deleted file mode 100644 index 5683868e27..0000000000 --- a/data/maps/Underwater6/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater6: - .4byte Underwater6_Layout - .4byte Underwater6_MapEvents - .4byte Underwater6_MapScripts - .4byte Underwater6_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER6 - .byte MAPSEC_UNDERWATER_TERRA_CAVE - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater6/map.json b/data/maps/Underwater6/map.json new file mode 100644 index 0000000000..9b19a1fe79 --- /dev/null +++ b/data/maps/Underwater6/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_UNDERWATER6", + "name": "Underwater6", + "layout": "LAYOUT_UNDERWATER6", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_TERRA_CAVE", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE105" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 13, + "y": 4, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 66, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater7/connections.inc b/data/maps/Underwater7/connections.inc deleted file mode 100644 index 7113f21e99..0000000000 --- a/data/maps/Underwater7/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater7_MapConnectionsList: - connection emerge, 0, MAP_ROUTE125 - -Underwater7_MapConnections: - .4byte 1 - .4byte Underwater7_MapConnectionsList - diff --git a/data/maps/Underwater7/events.inc b/data/maps/Underwater7/events.inc deleted file mode 100644 index d4c2a882a8..0000000000 --- a/data/maps/Underwater7/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater7_MapWarps: - warp_def 22, 10, 0, 0, MAP_UNDERWATER_MARINE_CAVE - warp_def 45, 30, 0, 0, MAP_UNDERWATER_MARINE_CAVE - -Underwater7_MapEvents:: - map_events 0x0, Underwater7_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc deleted file mode 100644 index a1fa2824c0..0000000000 --- a/data/maps/Underwater7/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater7: - .4byte Underwater7_Layout - .4byte Underwater7_MapEvents - .4byte Underwater7_MapScripts - .4byte Underwater7_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER7 - .byte MAPSEC_UNDERWATER_UNK1 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater7/map.json b/data/maps/Underwater7/map.json new file mode 100644 index 0000000000..afabfeeecf --- /dev/null +++ b/data/maps/Underwater7/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_UNDERWATER7", + "name": "Underwater7", + "layout": "LAYOUT_UNDERWATER7", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_UNK1", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE125" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 22, + "y": 10, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 45, + "y": 30, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater_MarineCave/events.inc b/data/maps/Underwater_MarineCave/events.inc deleted file mode 100644 index b0da76440e..0000000000 --- a/data/maps/Underwater_MarineCave/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -Underwater_MarineCave_MapWarps: - warp_def 9, 8, 0, 127, MAP_NONE - -Underwater_MarineCave_MapEvents:: - map_events 0x0, Underwater_MarineCave_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc deleted file mode 100644 index 1cc75bd542..0000000000 --- a/data/maps/Underwater_MarineCave/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_MarineCave: - .4byte Underwater_MarineCave_Layout - .4byte Underwater_MarineCave_MapEvents - .4byte Underwater_MarineCave_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_UNDERWATER_MARINE_CAVE - .byte MAPSEC_UNDERWATER_MARINE_CAVE - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater_MarineCave/map.json b/data/maps/Underwater_MarineCave/map.json new file mode 100644 index 0000000000..c969239c5a --- /dev/null +++ b/data/maps/Underwater_MarineCave/map.json @@ -0,0 +1,28 @@ +{ + "id": "MAP_UNDERWATER_MARINE_CAVE", + "name": "Underwater_MarineCave", + "layout": "LAYOUT_UNDERWATER_MARINE_CAVE", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_UNDERWATER_MARINE_CAVE", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 9, + "y": 8, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater_Route134/events.inc b/data/maps/Underwater_Route134/events.inc deleted file mode 100644 index a514ccf725..0000000000 --- a/data/maps/Underwater_Route134/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -Underwater_Route134_MapWarps: - warp_def 8, 8, 0, 0, MAP_UNDERWATER_SEALED_CHAMBER - -Underwater_Route134_MapEvents:: - map_events 0x0, Underwater_Route134_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc deleted file mode 100644 index 07d1bcd8e7..0000000000 --- a/data/maps/Underwater_Route134/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_Route134: - .4byte Underwater_Route134_Layout - .4byte Underwater_Route134_MapEvents - .4byte Underwater_Route134_MapScripts - .4byte 0x0 - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER_ROUTE134 - .byte MAPSEC_UNDERWATER_SEALED_CHAMBER - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater_Route134/map.json b/data/maps/Underwater_Route134/map.json new file mode 100644 index 0000000000..f94f110e11 --- /dev/null +++ b/data/maps/Underwater_Route134/map.json @@ -0,0 +1,28 @@ +{ + "id": "MAP_UNDERWATER_ROUTE134", + "name": "Underwater_Route134", + "layout": "LAYOUT_UNDERWATER_ROUTE134", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 8, + "y": 8, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_SEALED_CHAMBER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater_SeafloorCavern/events.inc b/data/maps/Underwater_SeafloorCavern/events.inc deleted file mode 100644 index d4c212a19b..0000000000 --- a/data/maps/Underwater_SeafloorCavern/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Underwater_SeafloorCavern_EventObjects: - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE - object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE - object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE - object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE - -Underwater_SeafloorCavern_MapWarps: - warp_def 6, 7, 0, 0, MAP_UNDERWATER4 - -Underwater_SeafloorCavern_MapEvents:: - map_events Underwater_SeafloorCavern_EventObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc deleted file mode 100644 index 0df694b901..0000000000 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_SeafloorCavern: - .4byte Underwater_SeafloorCavern_Layout - .4byte Underwater_SeafloorCavern_MapEvents - .4byte Underwater_SeafloorCavern_MapScripts - .4byte 0x0 - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER_SEAFLOOR_CAVERN - .byte MAPSEC_UNDERWATER_128 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json new file mode 100644 index 0000000000..5497a7ba39 --- /dev/null +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_UNDERWATER_SEAFLOOR_CAVERN", + "name": "Underwater_SeafloorCavern", + "layout": "LAYOUT_UNDERWATER_SEAFLOOR_CAVERN", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_128", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Underwater_SeafloorCavern_EventScript_2343DC", + "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Underwater_SeafloorCavern_EventScript_2343DC", + "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Underwater_SeafloorCavern_EventScript_2343DC", + "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Underwater_SeafloorCavern_EventScript_2343DC", + "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" + } + ], + "warp_events": [ + { + "x": 6, + "y": 7, + "elevation": 0, + "dest_map": "MAP_UNDERWATER4", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater_SealedChamber/events.inc b/data/maps/Underwater_SealedChamber/events.inc deleted file mode 100644 index e8b93885a5..0000000000 --- a/data/maps/Underwater_SealedChamber/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -Underwater_SealedChamber_MapWarps: - warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134 - -Underwater_SealedChamber_MapBGEvents: - bg_event 12, 43, 0, BG_EVENT_PLAYER_FACING_ANY, Underwater_SealedChamber_EventScript_2390FC - -Underwater_SealedChamber_MapEvents:: - map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents - diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc deleted file mode 100644 index f7117f905d..0000000000 --- a/data/maps/Underwater_SealedChamber/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_SealedChamber: - .4byte Underwater_SealedChamber_Layout - .4byte Underwater_SealedChamber_MapEvents - .4byte Underwater_SealedChamber_MapScripts - .4byte 0x0 - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER_SEALED_CHAMBER - .byte MAPSEC_UNDERWATER_SEALED_CHAMBER - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json new file mode 100644 index 0000000000..2256ee670e --- /dev/null +++ b/data/maps/Underwater_SealedChamber/map.json @@ -0,0 +1,37 @@ +{ + "id": "MAP_UNDERWATER_SEALED_CHAMBER", + "name": "Underwater_SealedChamber", + "layout": "LAYOUT_UNDERWATER_SEALED_CHAMBER", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 7, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_ROUTE134", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 12, + "y": 43, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Underwater_SealedChamber_EventScript_2390FC" + } + ] +} \ No newline at end of file diff --git a/data/maps/Underwater_SootopolisCity/events.inc b/data/maps/Underwater_SootopolisCity/events.inc deleted file mode 100644 index 3829ecb103..0000000000 --- a/data/maps/Underwater_SootopolisCity/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater_SootopolisCity_MapWarps: - warp_def 9, 8, 0, 0, MAP_UNDERWATER2 - warp_def 10, 8, 0, 0, MAP_UNDERWATER2 - -Underwater_SootopolisCity_MapEvents:: - map_events 0x0, Underwater_SootopolisCity_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc deleted file mode 100644 index 31caf4011f..0000000000 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_SootopolisCity: - .4byte Underwater_SootopolisCity_Layout - .4byte Underwater_SootopolisCity_MapEvents - .4byte Underwater_SootopolisCity_MapScripts - .4byte 0x0 - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER_SOOTOPOLIS_CITY - .byte MAPSEC_UNDERWATER_SOOTOPOLIS - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json new file mode 100644 index 0000000000..a3b0a1290d --- /dev/null +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_UNDERWATER_SOOTOPOLIS_CITY", + "name": "Underwater_SootopolisCity", + "layout": "LAYOUT_UNDERWATER_SOOTOPOLIS_CITY", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_SOOTOPOLIS", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 9, + "y": 8, + "elevation": 0, + "dest_map": "MAP_UNDERWATER2", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 8, + "elevation": 0, + "dest_map": "MAP_UNDERWATER2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UnionRoom/events.inc b/data/maps/UnionRoom/events.inc deleted file mode 100644 index c78b86eece..0000000000 --- a/data/maps/UnionRoom/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -UnionRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0 - object_event 2, EVENT_OBJ_GFX_VAR_3, 0, 1, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D204, FLAG_HIDE_UNION_ROOM_PLAYER_4 - object_event 3, EVENT_OBJ_GFX_VAR_7, 0, 7, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, FLAG_HIDE_UNION_ROOM_PLAYER_8 - object_event 4, EVENT_OBJ_GFX_VAR_6, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D222, FLAG_HIDE_UNION_ROOM_PLAYER_7 - object_event 5, EVENT_OBJ_GFX_VAR_5, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D218, FLAG_HIDE_UNION_ROOM_PLAYER_6 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D20E, FLAG_HIDE_UNION_ROOM_PLAYER_5 - object_event 7, EVENT_OBJ_GFX_VAR_2, 0, 10, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1FA, FLAG_HIDE_UNION_ROOM_PLAYER_3 - object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 13, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, FLAG_HIDE_UNION_ROOM_PLAYER_2 - object_event 9, EVENT_OBJ_GFX_VAR_0, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, FLAG_HIDE_UNION_ROOM_PLAYER_1 - -UnionRoom_MapWarps: - warp_def 7, 11, 3, 127, MAP_NONE - warp_def 8, 11, 3, 127, MAP_NONE - -UnionRoom_MapEvents:: - map_events UnionRoom_EventObjects, UnionRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc deleted file mode 100644 index cc7e1c3d1d..0000000000 --- a/data/maps/UnionRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnionRoom: - .4byte UnionRoom_Layout - .4byte UnionRoom_MapEvents - .4byte UnionRoom_MapScripts - .4byte 0x0 - .2byte MUS_RAINBOW - .2byte LAYOUT_UNION_ROOM - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json new file mode 100644 index 0000000000..175ec3ad79 --- /dev/null +++ b/data/maps/UnionRoom/map.json @@ -0,0 +1,153 @@ +{ + "id": "MAP_UNION_ROOM", + "name": "UnionRoom", + "layout": "LAYOUT_UNION_ROOM", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_UNION_ROOM_NURSE", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D236", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D204", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D22C", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D222", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D218", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 13, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D20E", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D1FA", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 13, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D1F0", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D1E6", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_1" + } + ], + "warp_events": [ + { + "x": 7, + "y": 11, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 8, + "y": 11, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_29/events.inc b/data/maps/UnknownMap_25_29/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/UnknownMap_25_29/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc deleted file mode 100644 index 0520cd58aa..0000000000 --- a/data/maps/UnknownMap_25_29/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_29: - .4byte UnknownMap_25_29_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_NIBI - .2byte LAYOUT_UNKNOWN_MAP_25_29 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/UnknownMap_25_29/map.json b/data/maps/UnknownMap_25_29/map.json new file mode 100644 index 0000000000..8f7ac02268 --- /dev/null +++ b/data/maps/UnknownMap_25_29/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_29", + "name": "UnknownMap_25_29", + "layout": "LAYOUT_UNKNOWN_MAP_25_29", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_30/events.inc b/data/maps/UnknownMap_25_30/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/UnknownMap_25_30/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc deleted file mode 100644 index ed085f46e2..0000000000 --- a/data/maps/UnknownMap_25_30/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_30: - .4byte UnknownMap_25_30_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_NIBI - .2byte LAYOUT_UNKNOWN_MAP_25_30 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/UnknownMap_25_30/map.json b/data/maps/UnknownMap_25_30/map.json new file mode 100644 index 0000000000..5f321e6b53 --- /dev/null +++ b/data/maps/UnknownMap_25_30/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_30", + "name": "UnknownMap_25_30", + "layout": "LAYOUT_UNKNOWN_MAP_25_30", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_31/events.inc b/data/maps/UnknownMap_25_31/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/UnknownMap_25_31/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc deleted file mode 100644 index fde407fb83..0000000000 --- a/data/maps/UnknownMap_25_31/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_31: - .4byte UnknownMap_25_31_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_NIBI - .2byte LAYOUT_UNKNOWN_MAP_25_31 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/UnknownMap_25_31/map.json b/data/maps/UnknownMap_25_31/map.json new file mode 100644 index 0000000000..f7b06ac426 --- /dev/null +++ b/data/maps/UnknownMap_25_31/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_31", + "name": "UnknownMap_25_31", + "layout": "LAYOUT_UNKNOWN_MAP_25_31", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_32/events.inc b/data/maps/UnknownMap_25_32/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/UnknownMap_25_32/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc deleted file mode 100644 index 1f0655d54c..0000000000 --- a/data/maps/UnknownMap_25_32/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_32: - .4byte UnknownMap_25_32_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_NIBI - .2byte LAYOUT_UNKNOWN_MAP_25_32 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/UnknownMap_25_32/map.json b/data/maps/UnknownMap_25_32/map.json new file mode 100644 index 0000000000..c963d0129a --- /dev/null +++ b/data/maps/UnknownMap_25_32/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_32", + "name": "UnknownMap_25_32", + "layout": "LAYOUT_UNKNOWN_MAP_25_32", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_33/events.inc b/data/maps/UnknownMap_25_33/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/UnknownMap_25_33/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc deleted file mode 100644 index 71f5d3523a..0000000000 --- a/data/maps/UnknownMap_25_33/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_33: - .4byte UnknownMap_25_33_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_NIBI - .2byte LAYOUT_UNKNOWN_MAP_25_33 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/UnknownMap_25_33/map.json b/data/maps/UnknownMap_25_33/map.json new file mode 100644 index 0000000000..441f767b6b --- /dev/null +++ b/data/maps/UnknownMap_25_33/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_33", + "name": "UnknownMap_25_33", + "layout": "LAYOUT_UNKNOWN_MAP_25_33", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_34/events.inc b/data/maps/UnknownMap_25_34/events.inc deleted file mode 100644 index 8b13789179..0000000000 --- a/data/maps/UnknownMap_25_34/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc deleted file mode 100644 index 8fc47f9389..0000000000 --- a/data/maps/UnknownMap_25_34/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_34: - .4byte UnknownMap_25_34_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_NIBI - .2byte LAYOUT_UNKNOWN_MAP_25_34 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/UnknownMap_25_34/map.json b/data/maps/UnknownMap_25_34/map.json new file mode 100644 index 0000000000..7bdf1d2266 --- /dev/null +++ b/data/maps/UnknownMap_25_34/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_34", + "name": "UnknownMap_25_34", + "layout": "LAYOUT_UNKNOWN_MAP_25_34", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown/connections.inc b/data/maps/VerdanturfTown/connections.inc deleted file mode 100644 index 805bab59e6..0000000000 --- a/data/maps/VerdanturfTown/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -VerdanturfTown_MapConnectionsList: - connection up, -80, MAP_ROUTE116 - connection right, 0, MAP_ROUTE117 - -VerdanturfTown_MapConnections: - .4byte 2 - .4byte VerdanturfTown_MapConnectionsList - diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc deleted file mode 100644 index d5e99eeceb..0000000000 --- a/data/maps/VerdanturfTown/events.inc +++ /dev/null @@ -1,28 +0,0 @@ -VerdanturfTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0 - object_event 2, EVENT_OBJ_GFX_TWIN, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 11, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0 - object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0 - -VerdanturfTown_MapWarps: - warp_def 3, 7, 0, 0, MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY - warp_def 12, 3, 0, 0, MAP_VERDANTURF_TOWN_MART - warp_def 16, 3, 0, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F - warp_def 10, 14, 0, 0, MAP_VERDANTURF_TOWN_WANDAS_HOUSE - warp_def 8, 1, 0, 1, MAP_RUSTURF_TUNNEL - warp_def 1, 14, 0, 0, MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE - warp_def 17, 15, 0, 0, MAP_VERDANTURF_TOWN_HOUSE - -VerdanturfTown_MapBGEvents: - bg_event 14, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E6A - bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5D9 - bg_event 17, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E73 - bg_event 7, 14, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5E2 - bg_event 13, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E6A - bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E73 - bg_event 1, 8, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5EB - bg_event 7, 3, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5F4 - -VerdanturfTown_MapEvents:: - map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents - diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc deleted file mode 100644 index c2e0109f60..0000000000 --- a/data/maps/VerdanturfTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown: - .4byte VerdanturfTown_Layout - .4byte VerdanturfTown_MapEvents - .4byte VerdanturfTown_MapScripts - .4byte VerdanturfTown_MapConnections - .2byte MUS_GOMACHI0 - .2byte LAYOUT_VERDANTURF_TOWN - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json new file mode 100644 index 0000000000..06e6cc959a --- /dev/null +++ b/data/maps/VerdanturfTown/map.json @@ -0,0 +1,199 @@ +{ + "id": "MAP_VERDANTURF_TOWN", + "name": "VerdanturfTown", + "layout": "LAYOUT_VERDANTURF_TOWN", + "music": "MUS_GOMACHI0", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": -80, + "map": "MAP_ROUTE116" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE117" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 4, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_EventScript_1EB5A8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_EventScript_1EB575", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 7, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_EventScript_1EB5BA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_EventScript_1EB5B1", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 3, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN_MART", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 3, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 14, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN_WANDAS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTURF_TUNNEL", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 14, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 15, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "VerdanturfTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 14, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "VerdanturfTown_EventScript_1EB5D9" + }, + { + "type": "sign", + "x": 17, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "VerdanturfTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 7, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "VerdanturfTown_EventScript_1EB5E2" + }, + { + "type": "sign", + "x": 13, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "VerdanturfTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 18, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "VerdanturfTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 1, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "VerdanturfTown_EventScript_1EB5EB" + }, + { + "type": "sign", + "x": 7, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "VerdanturfTown_EventScript_1EB5F4" + } + ] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc deleted file mode 100644 index fb424a0560..0000000000 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -VerdanturfTown_BattleTentBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 11, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - -VerdanturfTown_BattleTentBattleRoom_MapEvents:: - map_events VerdanturfTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc deleted file mode 100644 index af844405ef..0000000000 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_BattleTentBattleRoom: - .4byte VerdanturfTown_BattleTentBattleRoom_Layout - .4byte VerdanturfTown_BattleTentBattleRoom_MapEvents - .4byte VerdanturfTown_BattleTentBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json new file mode 100644 index 0000000000..e08187b61d --- /dev/null +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json @@ -0,0 +1,60 @@ +{ + "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM", + "name": "VerdanturfTown_BattleTentBattleRoom", + "layout": "LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 11, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 2, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc deleted file mode 100644 index b5a8f71fb2..0000000000 --- a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -VerdanturfTown_BattleTentCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -VerdanturfTown_BattleTentCorridor_MapEvents:: - map_events VerdanturfTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc deleted file mode 100644 index 49e27d7f5f..0000000000 --- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_BattleTentCorridor: - .4byte BattleTentCorridor_Layout - .4byte VerdanturfTown_BattleTentCorridor_MapEvents - .4byte VerdanturfTown_BattleTentCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_CORRIDOR - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/map.json b/data/maps/VerdanturfTown_BattleTentCorridor/map.json new file mode 100644 index 0000000000..2e3b9aed1f --- /dev/null +++ b/data/maps/VerdanturfTown_BattleTentCorridor/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR", + "name": "VerdanturfTown_BattleTentCorridor", + "layout": "LAYOUT_BATTLE_TENT_CORRIDOR", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_BattleTentLobby/events.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc deleted file mode 100644 index 68ee1322fa..0000000000 --- a/data/maps/VerdanturfTown_BattleTentLobby/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -VerdanturfTown_BattleTentLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0 - object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 9, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, FLAG_HIDE_VERDANTURF_TOWN_SCOTT - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0 - -VerdanturfTown_BattleTentLobby_MapWarps: - warp_def 6, 9, 0, 0, MAP_VERDANTURF_TOWN - warp_def 7, 9, 0, 0, MAP_VERDANTURF_TOWN - -VerdanturfTown_BattleTentLobby_MapBGEvents: - bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_BattleTentLobby_EventScript_201B02 - -VerdanturfTown_BattleTentLobby_MapEvents:: - map_events VerdanturfTown_BattleTentLobby_EventObjects, VerdanturfTown_BattleTentLobby_MapWarps, 0x0, VerdanturfTown_BattleTentLobby_MapBGEvents - diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc deleted file mode 100644 index 012f55ec9b..0000000000 --- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_BattleTentLobby: - .4byte BattleTentLobby_Layout - .4byte VerdanturfTown_BattleTentLobby_MapEvents - .4byte VerdanturfTown_BattleTentLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_LOBBY - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_BattleTentLobby/map.json b/data/maps/VerdanturfTown_BattleTentLobby/map.json new file mode 100644 index 0000000000..2f5190f61c --- /dev/null +++ b/data/maps/VerdanturfTown_BattleTentLobby/map.json @@ -0,0 +1,123 @@ +{ + "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY", + "name": "VerdanturfTown_BattleTentLobby", + "layout": "LAYOUT_BATTLE_TENT_LOBBY", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_BattleTentLobby_EventScript_201873", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_BattleTentLobby_EventScript_201A7B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_BattleTentLobby_EventScript_201ABC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_BattleTentLobby_EventScript_201AC5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 12, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_BattleTentLobby_EventScript_201AD0", + "flag": "FLAG_HIDE_VERDANTURF_TOWN_SCOTT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_BattleTentLobby_EventScript_201AF7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 9, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "VerdanturfTown_BattleTentLobby_EventScript_201B02" + } + ] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc deleted file mode 100644 index 8d15647d63..0000000000 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -VerdanturfTown_FriendshipRatersHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0 - object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0 - -VerdanturfTown_FriendshipRatersHouse_MapWarps: - warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN - warp_def 4, 7, 0, 5, MAP_VERDANTURF_TOWN - -VerdanturfTown_FriendshipRatersHouse_MapEvents:: - map_events VerdanturfTown_FriendshipRatersHouse_EventObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc deleted file mode 100644 index 512004a3e0..0000000000 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_FriendshipRatersHouse: - .4byte House2_Layout - .4byte VerdanturfTown_FriendshipRatersHouse_MapEvents - .4byte VerdanturfTown_FriendshipRatersHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOMACHI0 - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json new file mode 100644 index 0000000000..3a67851369 --- /dev/null +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE", + "name": "VerdanturfTown_FriendshipRatersHouse", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_GOMACHI0", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_203031", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_House/events.inc b/data/maps/VerdanturfTown_House/events.inc deleted file mode 100644 index a5f61b86f6..0000000000 --- a/data/maps/VerdanturfTown_House/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -VerdanturfTown_House_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0 - -VerdanturfTown_House_MapWarps: - warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN - warp_def 4, 8, 0, 6, MAP_VERDANTURF_TOWN - -VerdanturfTown_House_MapEvents:: - map_events VerdanturfTown_House_EventObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc deleted file mode 100644 index 910126e298..0000000000 --- a/data/maps/VerdanturfTown_House/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_House: - .4byte House1_Layout - .4byte VerdanturfTown_House_MapEvents - .4byte VerdanturfTown_House_MapScripts - .4byte 0x0 - .2byte MUS_GOMACHI0 - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json new file mode 100644 index 0000000000..cf6170e8af --- /dev/null +++ b/data/maps/VerdanturfTown_House/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_VERDANTURF_TOWN_HOUSE", + "name": "VerdanturfTown_House", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_GOMACHI0", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_House_EventScript_20335F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_House_EventScript_203368", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_Mart/events.inc b/data/maps/VerdanturfTown_Mart/events.inc deleted file mode 100644 index 79e731fe4c..0000000000 --- a/data/maps/VerdanturfTown_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -VerdanturfTown_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0 - -VerdanturfTown_Mart_MapWarps: - warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN - warp_def 4, 7, 0, 1, MAP_VERDANTURF_TOWN - -VerdanturfTown_Mart_MapEvents:: - map_events VerdanturfTown_Mart_EventObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc deleted file mode 100644 index e04be5fd60..0000000000 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_Mart: - .4byte Mart_Layout - .4byte VerdanturfTown_Mart_MapEvents - .4byte VerdanturfTown_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json new file mode 100644 index 0000000000..8ea0e1bf59 --- /dev/null +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_VERDANTURF_TOWN_MART", + "name": "VerdanturfTown_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_Mart_EventScript_202587", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_Mart_EventScript_2025BA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_Mart_EventScript_2025C3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_Mart_EventScript_2025CC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc deleted file mode 100644 index 47449cd1b7..0000000000 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -VerdanturfTown_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0 - -VerdanturfTown_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN - warp_def 6, 8, 3, 2, MAP_VERDANTURF_TOWN - warp_def 1, 6, 4, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F - -VerdanturfTown_PokemonCenter_1F_MapEvents:: - map_events VerdanturfTown_PokemonCenter_1F_EventObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc deleted file mode 100644 index e2adc24a40..0000000000 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte VerdanturfTown_PokemonCenter_1F_MapEvents - .4byte VerdanturfTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json new file mode 100644 index 0000000000..1c1145565d --- /dev/null +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F", + "name": "VerdanturfTown_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_20273A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_202748", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 12, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_202751", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc deleted file mode 100644 index a4e13db36e..0000000000 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -VerdanturfTown_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -VerdanturfTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -VerdanturfTown_PokemonCenter_2F_MapEvents:: - map_events VerdanturfTown_PokemonCenter_2F_EventObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc deleted file mode 100644 index d64084b534..0000000000 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte VerdanturfTown_PokemonCenter_2F_MapEvents - .4byte VerdanturfTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json new file mode 100644 index 0000000000..ad2df3d36f --- /dev/null +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F", + "name": "VerdanturfTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_WandasHouse/events.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc deleted file mode 100644 index 940417c7a1..0000000000 --- a/data/maps/VerdanturfTown_WandasHouse/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -VerdanturfTown_WandasHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN - object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE - object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN - -VerdanturfTown_WandasHouse_MapWarps: - warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN - warp_def 8, 7, 0, 3, MAP_VERDANTURF_TOWN - -VerdanturfTown_WandasHouse_MapEvents:: - map_events VerdanturfTown_WandasHouse_EventObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc deleted file mode 100644 index bb285600f9..0000000000 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_WandasHouse: - .4byte VerdanturfTown_WandasHouse_Layout - .4byte VerdanturfTown_WandasHouse_MapEvents - .4byte VerdanturfTown_WandasHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOMACHI0 - .2byte LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json new file mode 100644 index 0000000000..10a3996fdb --- /dev/null +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_VERDANTURF_TOWN_WANDAS_HOUSE", + "name": "VerdanturfTown_WandasHouse", + "layout": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE", + "music": "MUS_GOMACHI0", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WALLY", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_WandasHouse_EventScript_2028BF", + "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_WandasHouse_EventScript_202913", + "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_WandasHouse_EventScript_2028E1", + "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_WandasHouse_EventScript_20294E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_WandasHouse_EventScript_20291C", + "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN" + } + ], + "warp_events": [ + { + "x": 7, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc deleted file mode 100644 index 1e34108edf..0000000000 --- a/data/maps/VictoryRoad_1F/events.inc +++ /dev/null @@ -1,28 +0,0 @@ -VictoryRoad_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 33, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 15, 4, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 27, 34, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0 - object_event 4, EVENT_OBJ_GFX_WALLY, 0, 12, 25, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E2C, FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291483, FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291490, FLAG_ITEM_VICTORY_ROAD_1F_PP_UP - object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E35, FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY - object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 29, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0 - object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 32, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0 - -VictoryRoad_1F_MapWarps: - warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY - warp_def 39, 5, 3, 3, MAP_EVER_GRANDE_CITY - warp_def 21, 32, 3, 5, MAP_VICTORY_ROAD_B1F - warp_def 42, 38, 4, 2, MAP_VICTORY_ROAD_B1F - warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F - -VictoryRoad_1F_MapCoordEvents: - coord_event 2, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DAF - coord_event 3, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DC8 - -VictoryRoad_1F_MapBGEvents: - bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL - -VictoryRoad_1F_MapEvents:: - map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents - diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc deleted file mode 100644 index eb1e53c9b7..0000000000 --- a/data/maps/VictoryRoad_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VictoryRoad_1F: - .4byte VictoryRoad_1F_Layout - .4byte VictoryRoad_1F_MapEvents - .4byte VictoryRoad_1F_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_VICTORY_ROAD_1F - .byte MAPSEC_VICTORY_ROAD - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json new file mode 100644 index 0000000000..b459815872 --- /dev/null +++ b/data/maps/VictoryRoad_1F/map.json @@ -0,0 +1,202 @@ +{ + "id": "MAP_VICTORY_ROAD_1F", + "name": "VictoryRoad_1F", + "layout": "LAYOUT_VICTORY_ROAD_1F", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_VICTORY_ROAD", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 33, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VictoryRoad_1F_EventScript_235E73", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 6, + "y": 15, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_1F_EventScript_235EA1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 27, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VictoryRoad_1F_EventScript_235E8A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WALLY", + "x": 12, + "y": 25, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_235E2C", + "flag": "FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 40, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_291483", + "flag": "FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 37, + "y": 39, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_291490", + "flag": "FLAG_ITEM_VICTORY_ROAD_1F_PP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WALLY", + "x": 31, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_235E35", + "flag": "FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 29, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_1F_EventScript_235ECF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 32, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_1F_EventScript_235EB8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 15, + "y": 40, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY", + "dest_warp_id": 2 + }, + { + "x": 39, + "y": 5, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY", + "dest_warp_id": 3 + }, + { + "x": 21, + "y": 32, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 5 + }, + { + "x": 42, + "y": 38, + "elevation": 4, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 14, + "elevation": 4, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 4 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 23, + "elevation": 4, + "var": "VAR_0x40C3", + "var_value": 0, + "script": "VictoryRoad_1F_EventScript_235DAF" + }, + { + "type": "trigger", + "x": 3, + "y": 23, + "elevation": 4, + "var": "VAR_0x40C3", + "var_value": 0, + "script": "VictoryRoad_1F_EventScript_235DC8" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 30, + "y": 39, + "elevation": 4, + "item": "ITEM_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL" + } + ] +} \ No newline at end of file diff --git a/data/maps/VictoryRoad_B1F/events.inc b/data/maps/VictoryRoad_B1F/events.inc deleted file mode 100644 index 35c4fe4285..0000000000 --- a/data/maps/VictoryRoad_B1F/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -VictoryRoad_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_13 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_14 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_12 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_17 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_16 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_1E - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_19 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1A - object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1B - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1C - object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1D - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_1F - object_event 14, EVENT_OBJ_GFX_MAN_3, 0, 37, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0 - object_event 16, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0 - object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_15 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_29149D, FLAG_ITEM_VICTORY_ROAD_B1F_TM_29 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2914AA, FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE - object_event 20, EVENT_OBJ_GFX_MAN_3, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0 - object_event 21, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, VictoryRoad_B1F_EventScript_236541, 0 - -VictoryRoad_B1F_MapWarps: - warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F - warp_def 17, 16, 3, 2, MAP_VICTORY_ROAD_B2F - warp_def 42, 25, 3, 3, MAP_VICTORY_ROAD_1F - warp_def 42, 2, 4, 1, MAP_VICTORY_ROAD_B2F - warp_def 8, 3, 3, 4, MAP_VICTORY_ROAD_1F - warp_def 20, 21, 3, 2, MAP_VICTORY_ROAD_1F - warp_def 5, 26, 3, 3, MAP_VICTORY_ROAD_B2F - -VictoryRoad_B1F_MapEvents:: - map_events VictoryRoad_B1F_EventObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc deleted file mode 100644 index cc0064fd67..0000000000 --- a/data/maps/VictoryRoad_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VictoryRoad_B1F: - .4byte VictoryRoad_B1F_Layout - .4byte VictoryRoad_B1F_MapEvents - .4byte VictoryRoad_B1F_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_VICTORY_ROAD_B1F - .byte MAPSEC_VICTORY_ROAD - .byte 1 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json new file mode 100644 index 0000000000..523eddc063 --- /dev/null +++ b/data/maps/VictoryRoad_B1F/map.json @@ -0,0 +1,344 @@ +{ + "id": "MAP_VICTORY_ROAD_B1F", + "name": "VictoryRoad_B1F", + "layout": "LAYOUT_VICTORY_ROAD_B1F", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_VICTORY_ROAD", + "requires_flash": true, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 20, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 21, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 9, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 20, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_17" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 21, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 35, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_1E" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 19, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2907A6", + "flag": "FLAG_TEMP_19" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 20, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2907A6", + "flag": "FLAG_TEMP_1A" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 18, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2907A6", + "flag": "FLAG_TEMP_1B" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 20, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2907A6", + "flag": "FLAG_TEMP_1C" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 21, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2907A6", + "flag": "FLAG_TEMP_1D" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 34, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_1F" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 37, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VictoryRoad_B1F_EventScript_2364E5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 26, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_B1F_EventScript_2364FC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 5, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_B1F_EventScript_236513", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 34, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 42, + "y": 8, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_29149D", + "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_TM_29" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 32, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2914AA", + "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 14, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_B1F_EventScript_23652A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 14, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VictoryRoad_B1F_EventScript_236541", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 30, + "y": 25, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B2F", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 16, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B2F", + "dest_warp_id": 2 + }, + { + "x": 42, + "y": 25, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_1F", + "dest_warp_id": 3 + }, + { + "x": 42, + "y": 2, + "elevation": 4, + "dest_map": "MAP_VICTORY_ROAD_B2F", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 3, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_1F", + "dest_warp_id": 4 + }, + { + "x": 20, + "y": 21, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 26, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B2F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc deleted file mode 100644 index 0bc77cade5..0000000000 --- a/data/maps/VictoryRoad_B2F/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -VictoryRoad_B2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 43, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236903, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 35, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_2914B7, FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL - object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 25, 18, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236948, 0 - object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 25, 21, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236931, 0 - -VictoryRoad_B2F_MapWarps: - warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F - warp_def 43, 2, 3, 3, MAP_VICTORY_ROAD_B1F - warp_def 19, 12, 3, 1, MAP_VICTORY_ROAD_B1F - warp_def 5, 26, 3, 6, MAP_VICTORY_ROAD_B1F - -VictoryRoad_B2F_MapBGEvents: - bg_hidden_item_event 28, 5, 3, ITEM_ELIXIR, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR - bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL - -VictoryRoad_B2F_MapEvents:: - map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents - diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc deleted file mode 100644 index 0af51f9717..0000000000 --- a/data/maps/VictoryRoad_B2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VictoryRoad_B2F: - .4byte VictoryRoad_B2F_Layout - .4byte VictoryRoad_B2F_MapEvents - .4byte VictoryRoad_B2F_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_VICTORY_ROAD_B2F - .byte MAPSEC_VICTORY_ROAD - .byte 1 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json new file mode 100644 index 0000000000..2667155a92 --- /dev/null +++ b/data/maps/VictoryRoad_B2F/map.json @@ -0,0 +1,158 @@ +{ + "id": "MAP_VICTORY_ROAD_B2F", + "name": "VictoryRoad_B2F", + "layout": "LAYOUT_VICTORY_ROAD_B2F", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_VICTORY_ROAD", + "requires_flash": true, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 15, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_B2F_EventScript_2368D5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 43, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_B2F_EventScript_2368EC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 2, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_B2F_EventScript_236903", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 35, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_B2F_EventScript_23691A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 13, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B2F_EventScript_2914B7", + "flag": "FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 25, + "y": 18, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_B2F_EventScript_236948", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 25, + "y": 21, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_B2F_EventScript_236931", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 30, + "y": 25, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 0 + }, + { + "x": 43, + "y": 2, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 3 + }, + { + "x": 19, + "y": 12, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 26, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 28, + "y": 5, + "elevation": 3, + "item": "ITEM_ELIXIR", + "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR" + }, + { + "type": "hidden_item", + "x": 37, + "y": 1, + "elevation": 3, + "item": "ITEM_MAX_REPEL", + "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL" + } + ] +} \ No newline at end of file diff --git a/data/maps/connections.inc b/data/maps/connections.inc deleted file mode 100644 index a950249210..0000000000 --- a/data/maps/connections.inc +++ /dev/null @@ -1,65 +0,0 @@ - .include "data/maps/LittlerootTown/connections.inc" - .include "data/maps/OldaleTown/connections.inc" - .include "data/maps/DewfordTown/connections.inc" - .include "data/maps/LavaridgeTown/connections.inc" - .include "data/maps/FallarborTown/connections.inc" - .include "data/maps/VerdanturfTown/connections.inc" - .include "data/maps/PacifidlogTown/connections.inc" - .include "data/maps/PetalburgCity/connections.inc" - .include "data/maps/SlateportCity/connections.inc" - .include "data/maps/MauvilleCity/connections.inc" - .include "data/maps/RustboroCity/connections.inc" - .include "data/maps/FortreeCity/connections.inc" - .include "data/maps/LilycoveCity/connections.inc" - .include "data/maps/MossdeepCity/connections.inc" - .include "data/maps/SootopolisCity/connections.inc" - .include "data/maps/EverGrandeCity/connections.inc" - .include "data/maps/Route101/connections.inc" - .include "data/maps/Route102/connections.inc" - .include "data/maps/Route103/connections.inc" - .include "data/maps/Route104/connections.inc" - .include "data/maps/Route105/connections.inc" - .include "data/maps/Route106/connections.inc" - .include "data/maps/Route107/connections.inc" - .include "data/maps/Route108/connections.inc" - .include "data/maps/Route109/connections.inc" - .include "data/maps/Route110/connections.inc" - .include "data/maps/Route111/connections.inc" - .include "data/maps/Route112/connections.inc" - .include "data/maps/Route113/connections.inc" - .include "data/maps/Route114/connections.inc" - .include "data/maps/Route115/connections.inc" - .include "data/maps/Route116/connections.inc" - .include "data/maps/Route117/connections.inc" - .include "data/maps/Route118/connections.inc" - .include "data/maps/Route119/connections.inc" - .include "data/maps/Route120/connections.inc" - .include "data/maps/Route121/connections.inc" - .include "data/maps/Route122/connections.inc" - .include "data/maps/Route123/connections.inc" - .include "data/maps/Route124/connections.inc" - .include "data/maps/Route125/connections.inc" - .include "data/maps/Route126/connections.inc" - .include "data/maps/Route127/connections.inc" - .include "data/maps/Route128/connections.inc" - .include "data/maps/Route129/connections.inc" - .include "data/maps/Route130/connections.inc" - .include "data/maps/Route131/connections.inc" - .include "data/maps/Route132/connections.inc" - .include "data/maps/Route133/connections.inc" - .include "data/maps/Route134/connections.inc" - .include "data/maps/Underwater6/connections.inc" - .include "data/maps/Underwater1/connections.inc" - .include "data/maps/Underwater7/connections.inc" - .include "data/maps/Underwater2/connections.inc" - .include "data/maps/Underwater3/connections.inc" - .include "data/maps/Underwater4/connections.inc" - .include "data/maps/Underwater5/connections.inc" - .include "data/maps/SafariZone_Northwest/connections.inc" - .include "data/maps/SafariZone_North/connections.inc" - .include "data/maps/SafariZone_Southwest/connections.inc" - .include "data/maps/SafariZone_South/connections.inc" - .include "data/maps/SafariZone_Northeast/connections.inc" - .include "data/maps/SafariZone_Southeast/connections.inc" - .include "data/maps/BattleFrontier_OutsideWest/connections.inc" - .include "data/maps/BattleFrontier_OutsideEast/connections.inc" diff --git a/data/maps/groups.inc b/data/maps/groups.inc deleted file mode 100644 index 77f9c4441b..0000000000 --- a/data/maps/groups.inc +++ /dev/null @@ -1,623 +0,0 @@ -gMapGroup0: @ 8485D60 - .4byte PetalburgCity - .4byte SlateportCity - .4byte MauvilleCity - .4byte RustboroCity - .4byte FortreeCity - .4byte LilycoveCity - .4byte MossdeepCity - .4byte SootopolisCity - .4byte EverGrandeCity - .4byte LittlerootTown - .4byte OldaleTown - .4byte DewfordTown - .4byte LavaridgeTown - .4byte FallarborTown - .4byte VerdanturfTown - .4byte PacifidlogTown - .4byte Route101 - .4byte Route102 - .4byte Route103 - .4byte Route104 - .4byte Route105 - .4byte Route106 - .4byte Route107 - .4byte Route108 - .4byte Route109 - .4byte Route110 - .4byte Route111 - .4byte Route112 - .4byte Route113 - .4byte Route114 - .4byte Route115 - .4byte Route116 - .4byte Route117 - .4byte Route118 - .4byte Route119 - .4byte Route120 - .4byte Route121 - .4byte Route122 - .4byte Route123 - .4byte Route124 - .4byte Route125 - .4byte Route126 - .4byte Route127 - .4byte Route128 - .4byte Route129 - .4byte Route130 - .4byte Route131 - .4byte Route132 - .4byte Route133 - .4byte Route134 - .4byte Underwater1 - .4byte Underwater2 - .4byte Underwater3 - .4byte Underwater4 - .4byte Underwater5 - .4byte Underwater6 - .4byte Underwater7 - -gMapGroup1: @ 8485E44 - .4byte LittlerootTown_BrendansHouse_1F - .4byte LittlerootTown_BrendansHouse_2F - .4byte LittlerootTown_MaysHouse_1F - .4byte LittlerootTown_MaysHouse_2F - .4byte LittlerootTown_ProfessorBirchsLab - -gMapGroup2: @ 8485E58 - .4byte OldaleTown_House1 - .4byte OldaleTown_House2 - .4byte OldaleTown_PokemonCenter_1F - .4byte OldaleTown_PokemonCenter_2F - .4byte OldaleTown_Mart - -gMapGroup3: @ 8485E6C - .4byte DewfordTown_House1 - .4byte DewfordTown_PokemonCenter_1F - .4byte DewfordTown_PokemonCenter_2F - .4byte DewfordTown_Gym - .4byte DewfordTown_Hall - .4byte DewfordTown_House2 - -gMapGroup4: @ 8485E84 - .4byte LavaridgeTown_HerbShop - .4byte LavaridgeTown_Gym_1F - .4byte LavaridgeTown_Gym_B1F - .4byte LavaridgeTown_House - .4byte LavaridgeTown_Mart - .4byte LavaridgeTown_PokemonCenter_1F - .4byte LavaridgeTown_PokemonCenter_2F - -gMapGroup5: @ 8485EA0 - .4byte FallarborTown_Mart - .4byte FallarborTown_BattleTentLobby - .4byte FallarborTown_BattleTentCorridor - .4byte FallarborTown_BattleTentBattleRoom - .4byte FallarborTown_PokemonCenter_1F - .4byte FallarborTown_PokemonCenter_2F - .4byte FallarborTown_House1 - .4byte FallarborTown_House2 - -gMapGroup6: @ 8485EC0 - .4byte VerdanturfTown_BattleTentLobby - .4byte VerdanturfTown_BattleTentCorridor - .4byte VerdanturfTown_BattleTentBattleRoom - .4byte VerdanturfTown_Mart - .4byte VerdanturfTown_PokemonCenter_1F - .4byte VerdanturfTown_PokemonCenter_2F - .4byte VerdanturfTown_WandasHouse - .4byte VerdanturfTown_FriendshipRatersHouse - .4byte VerdanturfTown_House - -gMapGroup7: @ 8485EE4 - .4byte PacifidlogTown_PokemonCenter_1F - .4byte PacifidlogTown_PokemonCenter_2F - .4byte PacifidlogTown_House1 - .4byte PacifidlogTown_House2 - .4byte PacifidlogTown_House3 - .4byte PacifidlogTown_House4 - .4byte PacifidlogTown_House5 - -gMapGroup8: @ 8485F00 - .4byte PetalburgCity_WallysHouse - .4byte PetalburgCity_Gym - .4byte PetalburgCity_House1 - .4byte PetalburgCity_House2 - .4byte PetalburgCity_PokemonCenter_1F - .4byte PetalburgCity_PokemonCenter_2F - .4byte PetalburgCity_Mart - -gMapGroup9: @ 8485F1C - .4byte SlateportCity_SternsShipyard_1F - .4byte SlateportCity_SternsShipyard_2F - .4byte SlateportCity_BattleTentLobby - .4byte SlateportCity_BattleTentCorridor - .4byte SlateportCity_BattleTentBattleRoom - .4byte SlateportCity_House1 - .4byte SlateportCity_PokemonFanClub - .4byte SlateportCity_OceanicMuseum_1F - .4byte SlateportCity_OceanicMuseum_2F - .4byte SlateportCity_Harbor - .4byte SlateportCity_House2 - .4byte SlateportCity_PokemonCenter_1F - .4byte SlateportCity_PokemonCenter_2F - .4byte SlateportCity_Mart - -gMapGroup10: @ 8485F54 - .4byte MauvilleCity_Gym - .4byte MauvilleCity_BikeShop - .4byte MauvilleCity_House1 - .4byte MauvilleCity_GameCorner - .4byte MauvilleCity_House2 - .4byte MauvilleCity_PokemonCenter_1F - .4byte MauvilleCity_PokemonCenter_2F - .4byte MauvilleCity_Mart - -gMapGroup11: @ 8485F74 - .4byte RustboroCity_DevonCorp_1F - .4byte RustboroCity_DevonCorp_2F - .4byte RustboroCity_DevonCorp_3F - .4byte RustboroCity_Gym - .4byte RustboroCity_PokemonSchool - .4byte RustboroCity_PokemonCenter_1F - .4byte RustboroCity_PokemonCenter_2F - .4byte RustboroCity_Mart - .4byte RustboroCity_Flat1_1F - .4byte RustboroCity_Flat1_2F - .4byte RustboroCity_House1 - .4byte RustboroCity_CuttersHouse - .4byte RustboroCity_House2 - .4byte RustboroCity_Flat2_1F - .4byte RustboroCity_Flat2_2F - .4byte RustboroCity_Flat2_3F - .4byte RustboroCity_House3 - -gMapGroup12: @ 8485FB8 - .4byte FortreeCity_House1 - .4byte FortreeCity_Gym - .4byte FortreeCity_PokemonCenter_1F - .4byte FortreeCity_PokemonCenter_2F - .4byte FortreeCity_Mart - .4byte FortreeCity_House2 - .4byte FortreeCity_House3 - .4byte FortreeCity_House4 - .4byte FortreeCity_House5 - .4byte FortreeCity_DecorationShop - -gMapGroup13: @ 8485FE0 - .4byte LilycoveCity_CoveLilyMotel_1F - .4byte LilycoveCity_CoveLilyMotel_2F - .4byte LilycoveCity_LilycoveMuseum_1F - .4byte LilycoveCity_LilycoveMuseum_2F - .4byte LilycoveCity_ContestLobby - .4byte LilycoveCity_ContestHall - .4byte LilycoveCity_PokemonCenter_1F - .4byte LilycoveCity_PokemonCenter_2F - .4byte LilycoveCity_UnusedMart - .4byte LilycoveCity_PokemonTrainerFanClub - .4byte LilycoveCity_Harbor - .4byte LilycoveCity_MoveDeletersHouse - .4byte LilycoveCity_House1 - .4byte LilycoveCity_House2 - .4byte LilycoveCity_House3 - .4byte LilycoveCity_House4 - .4byte LilycoveCity_DepartmentStore_1F - .4byte LilycoveCity_DepartmentStore_2F - .4byte LilycoveCity_DepartmentStore_3F - .4byte LilycoveCity_DepartmentStore_4F - .4byte LilycoveCity_DepartmentStore_5F - .4byte LilycoveCity_DepartmentStoreRooftop - .4byte LilycoveCity_DepartmentStoreElevator - -gMapGroup14: @ 848603C - .4byte MossdeepCity_Gym - .4byte MossdeepCity_House1 - .4byte MossdeepCity_House2 - .4byte MossdeepCity_PokemonCenter_1F - .4byte MossdeepCity_PokemonCenter_2F - .4byte MossdeepCity_Mart - .4byte MossdeepCity_House3 - .4byte MossdeepCity_StevensHouse - .4byte MossdeepCity_House4 - .4byte MossdeepCity_SpaceCenter_1F - .4byte MossdeepCity_SpaceCenter_2F - .4byte MossdeepCity_GameCorner_1F - .4byte MossdeepCity_GameCorner_B1F - -gMapGroup15: @ 8486070 - .4byte SootopolisCity_Gym_1F - .4byte SootopolisCity_Gym_B1F - .4byte SootopolisCity_PokemonCenter_1F - .4byte SootopolisCity_PokemonCenter_2F - .4byte SootopolisCity_Mart - .4byte SootopolisCity_House1 - .4byte SootopolisCity_House2 - .4byte SootopolisCity_House3 - .4byte SootopolisCity_House4 - .4byte SootopolisCity_House5 - .4byte SootopolisCity_House6 - .4byte SootopolisCity_House7 - .4byte SootopolisCity_LotadAndSeedotHouse - .4byte SootopolisCity_MysteryEventsHouse_1F - .4byte SootopolisCity_MysteryEventsHouse_B1F - -gMapGroup16: @ 84860AC - .4byte EverGrandeCity_SidneysRoom - .4byte EverGrandeCity_PhoebesRoom - .4byte EverGrandeCity_GlaciasRoom - .4byte EverGrandeCity_DrakesRoom - .4byte EverGrandeCity_ChampionsRoom - .4byte EverGrandeCity_Hall1 - .4byte EverGrandeCity_Hall2 - .4byte EverGrandeCity_Hall3 - .4byte EverGrandeCity_Hall4 - .4byte EverGrandeCity_Hall5 - .4byte EverGrandeCity_PokemonLeague_1F - .4byte EverGrandeCity_HallOfFame - .4byte EverGrandeCity_PokemonCenter_1F - .4byte EverGrandeCity_PokemonCenter_2F - .4byte EverGrandeCity_PokemonLeague_2F - -gMapGroup17: @ 84860E8 - .4byte Route104_MrBrineysHouse - .4byte Route104_PrettyPetalFlowerShop - -gMapGroup18: @ 84860F0 - .4byte Route111_WinstrateFamilysHouse - .4byte Route111_OldLadysRestStop - -gMapGroup19: @ 84860F8 - .4byte Route112_CableCarStation - .4byte MtChimney_CableCarStation - -gMapGroup20: @ 8486100 - .4byte Route114_FossilManiacsHouse - .4byte Route114_FossilManiacsTunnel - .4byte Route114_LanettesHouse - -gMapGroup21: @ 848610C - .4byte Route116_TunnelersRestHouse - -gMapGroup22: @ 8486110 - .4byte Route117_PokemonDayCare - -gMapGroup23: @ 8486114 - .4byte Route121_SafariZoneEntrance - -gMapGroup24: @ 8486118 - .4byte MeteorFalls_1F_1R - .4byte MeteorFalls_1F_2R - .4byte MeteorFalls_B1F_1R - .4byte MeteorFalls_B1F_2R - .4byte RusturfTunnel - .4byte Underwater_SootopolisCity - .4byte DesertRuins - .4byte GraniteCave_1F - .4byte GraniteCave_B1F - .4byte GraniteCave_B2F - .4byte GraniteCave_StevensRoom - .4byte PetalburgWoods - .4byte MtChimney - .4byte JaggedPass - .4byte FieryPath - .4byte MtPyre_1F - .4byte MtPyre_2F - .4byte MtPyre_3F - .4byte MtPyre_4F - .4byte MtPyre_5F - .4byte MtPyre_6F - .4byte MtPyre_Exterior - .4byte MtPyre_Summit - .4byte AquaHideout_1F - .4byte AquaHideout_B1F - .4byte AquaHideout_B2F - .4byte Underwater_SeafloorCavern - .4byte SeafloorCavern_Entrance - .4byte SeafloorCavern_Room1 - .4byte SeafloorCavern_Room2 - .4byte SeafloorCavern_Room3 - .4byte SeafloorCavern_Room4 - .4byte SeafloorCavern_Room5 - .4byte SeafloorCavern_Room6 - .4byte SeafloorCavern_Room7 - .4byte SeafloorCavern_Room8 - .4byte SeafloorCavern_Room9 - .4byte CaveOfOrigin_Entrance - .4byte CaveOfOrigin_1F - .4byte CaveOfOrigin_UnusedRubySapphireMap1 - .4byte CaveOfOrigin_UnusedRubySapphireMap2 - .4byte CaveOfOrigin_UnusedRubySapphireMap3 - .4byte CaveOfOrigin_B1F - .4byte VictoryRoad_1F - .4byte VictoryRoad_B1F - .4byte VictoryRoad_B2F - .4byte ShoalCave_LowTideEntranceRoom - .4byte ShoalCave_LowTideInnerRoom - .4byte ShoalCave_LowTideStairsRoom - .4byte ShoalCave_LowTideLowerRoom - .4byte ShoalCave_HighTideEntranceRoom - .4byte ShoalCave_HighTideInnerRoom - .4byte NewMauville_Entrance - .4byte NewMauville_Inside - .4byte AbandonedShip_Deck - .4byte AbandonedShip_Corridors_1F - .4byte AbandonedShip_Rooms_1F - .4byte AbandonedShip_Corridors_B1F - .4byte AbandonedShip_Rooms_B1F - .4byte AbandonedShip_Rooms2_B1F - .4byte AbandonedShip_Underwater1 - .4byte AbandonedShip_Room_B1F - .4byte AbandonedShip_Rooms2_1F - .4byte AbandonedShip_CaptainsOffice - .4byte AbandonedShip_Underwater2 - .4byte AbandonedShip_HiddenFloorCorridors - .4byte AbandonedShip_HiddenFloorRooms - .4byte IslandCave - .4byte AncientTomb - .4byte Underwater_Route134 - .4byte Underwater_SealedChamber - .4byte SealedChamber_OuterRoom - .4byte SealedChamber_InnerRoom - .4byte ScorchedSlab - .4byte AquaHideout_UnusedRubyMap1 - .4byte AquaHideout_UnusedRubyMap2 - .4byte AquaHideout_UnusedRubyMap3 - .4byte SkyPillar_Entrance - .4byte SkyPillar_Outside - .4byte SkyPillar_1F - .4byte SkyPillar_2F - .4byte SkyPillar_3F - .4byte SkyPillar_4F - .4byte ShoalCave_LowTideIceRoom - .4byte SkyPillar_5F - .4byte SkyPillar_Top - .4byte MagmaHideout_1F - .4byte MagmaHideout_2F_1R - .4byte MagmaHideout_2F_2R - .4byte MagmaHideout_3F_1R - .4byte MagmaHideout_3F_2R - .4byte MagmaHideout_4F - .4byte MagmaHideout_3F_3R - .4byte MagmaHideout_2F_3R - .4byte MirageTower_1F - .4byte MirageTower_2F - .4byte MirageTower_3F - .4byte MirageTower_4F - .4byte DesertUnderpass - .4byte ArtisanCave_B1F - .4byte ArtisanCave_1F - .4byte Underwater_MarineCave - .4byte MarineCave_Entrance - .4byte MarineCave_End - .4byte TerraCave_Entrance - .4byte TerraCave_End - .4byte AlteringCave - .4byte MeteorFalls_StevensCave - -gMapGroup25: @ 84862C8 - .4byte SecretBase_RedCave1 - .4byte SecretBase_BrownCave1 - .4byte SecretBase_BlueCave1 - .4byte SecretBase_YellowCave1 - .4byte SecretBase_Tree1 - .4byte SecretBase_Shrub1 - .4byte SecretBase_RedCave2 - .4byte SecretBase_BrownCave2 - .4byte SecretBase_BlueCave2 - .4byte SecretBase_YellowCave2 - .4byte SecretBase_Tree2 - .4byte SecretBase_Shrub2 - .4byte SecretBase_RedCave3 - .4byte SecretBase_BrownCave3 - .4byte SecretBase_BlueCave3 - .4byte SecretBase_YellowCave3 - .4byte SecretBase_Tree3 - .4byte SecretBase_Shrub3 - .4byte SecretBase_RedCave4 - .4byte SecretBase_BrownCave4 - .4byte SecretBase_BlueCave4 - .4byte SecretBase_YellowCave4 - .4byte SecretBase_Tree4 - .4byte SecretBase_Shrub4 - .4byte SingleBattleColosseum - .4byte TradeCenter - .4byte RecordCorner - .4byte DoubleBattleColosseum - .4byte LinkContestRoom1 - .4byte UnknownMap_25_29 - .4byte UnknownMap_25_30 - .4byte UnknownMap_25_31 - .4byte UnknownMap_25_32 - .4byte UnknownMap_25_33 - .4byte UnknownMap_25_34 - .4byte LinkContestRoom2 - .4byte LinkContestRoom3 - .4byte LinkContestRoom4 - .4byte LinkContestRoom5 - .4byte LinkContestRoom6 - .4byte InsideOfTruck - .4byte SSTidalCorridor - .4byte SSTidalLowerDeck - .4byte SSTidalRooms - .4byte BattlePyramidSquare01 - .4byte BattlePyramidSquare02 - .4byte BattlePyramidSquare03 - .4byte BattlePyramidSquare04 - .4byte BattlePyramidSquare05 - .4byte BattlePyramidSquare06 - .4byte BattlePyramidSquare07 - .4byte BattlePyramidSquare08 - .4byte BattlePyramidSquare09 - .4byte BattlePyramidSquare10 - .4byte BattlePyramidSquare11 - .4byte BattlePyramidSquare12 - .4byte BattlePyramidSquare13 - .4byte BattlePyramidSquare14 - .4byte BattlePyramidSquare15 - .4byte BattlePyramidSquare16 - .4byte UnionRoom - -gMapGroup26: @ 84863BC - .4byte SafariZone_Northwest - .4byte SafariZone_North - .4byte SafariZone_Southwest - .4byte SafariZone_South - .4byte BattleFrontier_OutsideWest - .4byte BattleFrontier_BattleTowerLobby - .4byte BattleFrontier_BattleTowerElevator - .4byte BattleFrontier_BattleTowerCorridor - .4byte BattleFrontier_BattleTowerBattleRoom - .4byte SouthernIsland_Exterior - .4byte SouthernIsland_Interior - .4byte SafariZone_RestHouse - .4byte SafariZone_Northeast - .4byte SafariZone_Southeast - .4byte BattleFrontier_OutsideEast - .4byte BattleFrontier_BattleTowerMultiBattleRoom - .4byte BattleFrontier_BattleTowerCorridor2 - .4byte BattleFrontier_BattleTowerBattleRoom2 - .4byte BattleFrontier_BattleDomeLobby - .4byte BattleFrontier_BattleDomeCorridor - .4byte BattleFrontier_BattleDomePreBattleRoom - .4byte BattleFrontier_BattleDomeBattleRoom - .4byte BattleFrontier_BattlePalaceLobby - .4byte BattleFrontier_BattlePalaceCorridor - .4byte BattleFrontier_BattlePalaceBattleRoom - .4byte BattleFrontier_BattlePyramidLobby - .4byte BattleFrontier_BattlePyramidEmptySquare - .4byte BattleFrontier_BattlePyramidTop - .4byte BattleFrontier_BattleArenaLobby - .4byte BattleFrontier_BattleArenaCorridor - .4byte BattleFrontier_BattleArenaBattleRoom - .4byte BattleFrontier_BattleFactoryLobby - .4byte BattleFrontier_BattleFactoryPreBattleRoom - .4byte BattleFrontier_BattleFactoryBattleRoom - .4byte BattleFrontier_BattlePikeLobby - .4byte BattleFrontier_BattlePikeCorridor - .4byte BattleFrontier_BattlePikeThreePathRoom - .4byte BattleFrontier_BattlePikeRandomRoom1 - .4byte BattleFrontier_BattlePikeRandomRoom2 - .4byte BattleFrontier_BattlePikeRandomRoom3 - .4byte BattleFrontier_RankingHall - .4byte BattleFrontier_Lounge1 - .4byte BattleFrontier_BattlePointExchangeServiceCorner - .4byte BattleFrontier_Lounge2 - .4byte BattleFrontier_Lounge3 - .4byte BattleFrontier_Lounge4 - .4byte BattleFrontier_ScottsHouse - .4byte BattleFrontier_Lounge5 - .4byte BattleFrontier_Lounge6 - .4byte BattleFrontier_Lounge7 - .4byte BattleFrontier_ReceptionGate - .4byte BattleFrontier_Lounge8 - .4byte BattleFrontier_Lounge9 - .4byte BattleFrontier_PokemonCenter_1F - .4byte BattleFrontier_PokemonCenter_2F - .4byte BattleFrontier_Mart - .4byte FarawayIsland_Entrance - .4byte FarawayIsland_Interior - .4byte BirthIsland_Exterior - .4byte BirthIsland_Harbor - .4byte TrainerHill_Entrance - .4byte TrainerHill_1F - .4byte TrainerHill_2F - .4byte TrainerHill_3F - .4byte TrainerHill_4F - .4byte TrainerHill_Roof - .4byte NavelRock_Exterior - .4byte NavelRock_Harbor - .4byte NavelRock_Entrance - .4byte NavelRock_B1F - .4byte NavelRock_Fork - .4byte NavelRock_Up1 - .4byte NavelRock_Up2 - .4byte NavelRock_Up3 - .4byte NavelRock_Up4 - .4byte NavelRock_Top - .4byte NavelRock_Down01 - .4byte NavelRock_Down02 - .4byte NavelRock_Down03 - .4byte NavelRock_Down04 - .4byte NavelRock_Down05 - .4byte NavelRock_Down06 - .4byte NavelRock_Down07 - .4byte NavelRock_Down08 - .4byte NavelRock_Down09 - .4byte NavelRock_Down10 - .4byte NavelRock_Down11 - .4byte NavelRock_Bottom - .4byte TrainerHill_Elevator - -gMapGroup27: @ 8486520 - .4byte Route104_Prototype - .4byte Route104_PrototypePrettyPetalFlowerShop - -gMapGroup28: @ 8486528 - .4byte Route109_SeashoreHouse - -gMapGroup29: @ 848652C - .4byte Route110_TrickHouseEntrance - .4byte Route110_TrickHouseEnd - .4byte Route110_TrickHouseCorridor - .4byte Route110_TrickHousePuzzle1 - .4byte Route110_TrickHousePuzzle2 - .4byte Route110_TrickHousePuzzle3 - .4byte Route110_TrickHousePuzzle4 - .4byte Route110_TrickHousePuzzle5 - .4byte Route110_TrickHousePuzzle6 - .4byte Route110_TrickHousePuzzle7 - .4byte Route110_TrickHousePuzzle8 - .4byte Route110_SeasideCyclingRoadNorthEntrance - .4byte Route110_SeasideCyclingRoadSouthEntrance - -gMapGroup30: @ 8486560 - .4byte Route113_GlassWorkshop - -gMapGroup31: @ 8486564 - .4byte Route123_BerryMastersHouse - -gMapGroup32: @ 8486568 - .4byte Route119_WeatherInstitute_1F - .4byte Route119_WeatherInstitute_2F - .4byte Route119_House - -gMapGroup33: @ 8486574 - .4byte Route124_DivingTreasureHuntersHouse - - .align 2 -gMapGroups:: @ 8486578 - .4byte gMapGroup0 - .4byte gMapGroup1 - .4byte gMapGroup2 - .4byte gMapGroup3 - .4byte gMapGroup4 - .4byte gMapGroup5 - .4byte gMapGroup6 - .4byte gMapGroup7 - .4byte gMapGroup8 - .4byte gMapGroup9 - .4byte gMapGroup10 - .4byte gMapGroup11 - .4byte gMapGroup12 - .4byte gMapGroup13 - .4byte gMapGroup14 - .4byte gMapGroup15 - .4byte gMapGroup16 - .4byte gMapGroup17 - .4byte gMapGroup18 - .4byte gMapGroup19 - .4byte gMapGroup20 - .4byte gMapGroup21 - .4byte gMapGroup22 - .4byte gMapGroup23 - .4byte gMapGroup24 - .4byte gMapGroup25 - .4byte gMapGroup26 - .4byte gMapGroup27 - .4byte gMapGroup28 - .4byte gMapGroup29 - .4byte gMapGroup30 - .4byte gMapGroup31 - .4byte gMapGroup32 - .4byte gMapGroup33 - diff --git a/data/maps/headers.inc b/data/maps/headers.inc deleted file mode 100644 index b4be3ab0c2..0000000000 --- a/data/maps/headers.inc +++ /dev/null @@ -1,518 +0,0 @@ - .include "data/maps/PetalburgCity/header.inc" - .include "data/maps/SlateportCity/header.inc" - .include "data/maps/MauvilleCity/header.inc" - .include "data/maps/RustboroCity/header.inc" - .include "data/maps/FortreeCity/header.inc" - .include "data/maps/LilycoveCity/header.inc" - .include "data/maps/MossdeepCity/header.inc" - .include "data/maps/SootopolisCity/header.inc" - .include "data/maps/EverGrandeCity/header.inc" - .include "data/maps/LittlerootTown/header.inc" - .include "data/maps/OldaleTown/header.inc" - .include "data/maps/DewfordTown/header.inc" - .include "data/maps/LavaridgeTown/header.inc" - .include "data/maps/FallarborTown/header.inc" - .include "data/maps/VerdanturfTown/header.inc" - .include "data/maps/PacifidlogTown/header.inc" - .include "data/maps/Route101/header.inc" - .include "data/maps/Route102/header.inc" - .include "data/maps/Route103/header.inc" - .include "data/maps/Route104/header.inc" - .include "data/maps/Route105/header.inc" - .include "data/maps/Route106/header.inc" - .include "data/maps/Route107/header.inc" - .include "data/maps/Route108/header.inc" - .include "data/maps/Route109/header.inc" - .include "data/maps/Route110/header.inc" - .include "data/maps/Route111/header.inc" - .include "data/maps/Route112/header.inc" - .include "data/maps/Route113/header.inc" - .include "data/maps/Route114/header.inc" - .include "data/maps/Route115/header.inc" - .include "data/maps/Route116/header.inc" - .include "data/maps/Route117/header.inc" - .include "data/maps/Route118/header.inc" - .include "data/maps/Route119/header.inc" - .include "data/maps/Route120/header.inc" - .include "data/maps/Route121/header.inc" - .include "data/maps/Route122/header.inc" - .include "data/maps/Route123/header.inc" - .include "data/maps/Route124/header.inc" - .include "data/maps/Route125/header.inc" - .include "data/maps/Route126/header.inc" - .include "data/maps/Route127/header.inc" - .include "data/maps/Route128/header.inc" - .include "data/maps/Route129/header.inc" - .include "data/maps/Route130/header.inc" - .include "data/maps/Route131/header.inc" - .include "data/maps/Route132/header.inc" - .include "data/maps/Route133/header.inc" - .include "data/maps/Route134/header.inc" - .include "data/maps/Underwater1/header.inc" - .include "data/maps/Underwater2/header.inc" - .include "data/maps/Underwater3/header.inc" - .include "data/maps/Underwater4/header.inc" - .include "data/maps/Underwater5/header.inc" - .include "data/maps/Underwater6/header.inc" - .include "data/maps/Underwater7/header.inc" - .include "data/maps/LittlerootTown_BrendansHouse_1F/header.inc" - .include "data/maps/LittlerootTown_BrendansHouse_2F/header.inc" - .include "data/maps/LittlerootTown_MaysHouse_1F/header.inc" - .include "data/maps/LittlerootTown_MaysHouse_2F/header.inc" - .include "data/maps/LittlerootTown_ProfessorBirchsLab/header.inc" - .include "data/maps/OldaleTown_House1/header.inc" - .include "data/maps/OldaleTown_House2/header.inc" - .include "data/maps/OldaleTown_PokemonCenter_1F/header.inc" - .include "data/maps/OldaleTown_PokemonCenter_2F/header.inc" - .include "data/maps/OldaleTown_Mart/header.inc" - .include "data/maps/DewfordTown_House1/header.inc" - .include "data/maps/DewfordTown_PokemonCenter_1F/header.inc" - .include "data/maps/DewfordTown_PokemonCenter_2F/header.inc" - .include "data/maps/DewfordTown_Gym/header.inc" - .include "data/maps/DewfordTown_Hall/header.inc" - .include "data/maps/DewfordTown_House2/header.inc" - .include "data/maps/LavaridgeTown_HerbShop/header.inc" - .include "data/maps/LavaridgeTown_Gym_1F/header.inc" - .include "data/maps/LavaridgeTown_Gym_B1F/header.inc" - .include "data/maps/LavaridgeTown_House/header.inc" - .include "data/maps/LavaridgeTown_Mart/header.inc" - .include "data/maps/LavaridgeTown_PokemonCenter_1F/header.inc" - .include "data/maps/LavaridgeTown_PokemonCenter_2F/header.inc" - .include "data/maps/FallarborTown_Mart/header.inc" - .include "data/maps/FallarborTown_BattleTentLobby/header.inc" - .include "data/maps/FallarborTown_BattleTentCorridor/header.inc" - .include "data/maps/FallarborTown_BattleTentBattleRoom/header.inc" - .include "data/maps/FallarborTown_PokemonCenter_1F/header.inc" - .include "data/maps/FallarborTown_PokemonCenter_2F/header.inc" - .include "data/maps/FallarborTown_House1/header.inc" - .include "data/maps/FallarborTown_House2/header.inc" - .include "data/maps/VerdanturfTown_BattleTentLobby/header.inc" - .include "data/maps/VerdanturfTown_BattleTentCorridor/header.inc" - .include "data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc" - .include "data/maps/VerdanturfTown_Mart/header.inc" - .include "data/maps/VerdanturfTown_PokemonCenter_1F/header.inc" - .include "data/maps/VerdanturfTown_PokemonCenter_2F/header.inc" - .include "data/maps/VerdanturfTown_WandasHouse/header.inc" - .include "data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc" - .include "data/maps/VerdanturfTown_House/header.inc" - .include "data/maps/PacifidlogTown_PokemonCenter_1F/header.inc" - .include "data/maps/PacifidlogTown_PokemonCenter_2F/header.inc" - .include "data/maps/PacifidlogTown_House1/header.inc" - .include "data/maps/PacifidlogTown_House2/header.inc" - .include "data/maps/PacifidlogTown_House3/header.inc" - .include "data/maps/PacifidlogTown_House4/header.inc" - .include "data/maps/PacifidlogTown_House5/header.inc" - .include "data/maps/PetalburgCity_WallysHouse/header.inc" - .include "data/maps/PetalburgCity_Gym/header.inc" - .include "data/maps/PetalburgCity_House1/header.inc" - .include "data/maps/PetalburgCity_House2/header.inc" - .include "data/maps/PetalburgCity_PokemonCenter_1F/header.inc" - .include "data/maps/PetalburgCity_PokemonCenter_2F/header.inc" - .include "data/maps/PetalburgCity_Mart/header.inc" - .include "data/maps/SlateportCity_SternsShipyard_1F/header.inc" - .include "data/maps/SlateportCity_SternsShipyard_2F/header.inc" - .include "data/maps/SlateportCity_BattleTentLobby/header.inc" - .include "data/maps/SlateportCity_BattleTentCorridor/header.inc" - .include "data/maps/SlateportCity_BattleTentBattleRoom/header.inc" - .include "data/maps/SlateportCity_House1/header.inc" - .include "data/maps/SlateportCity_PokemonFanClub/header.inc" - .include "data/maps/SlateportCity_OceanicMuseum_1F/header.inc" - .include "data/maps/SlateportCity_OceanicMuseum_2F/header.inc" - .include "data/maps/SlateportCity_Harbor/header.inc" - .include "data/maps/SlateportCity_House2/header.inc" - .include "data/maps/SlateportCity_PokemonCenter_1F/header.inc" - .include "data/maps/SlateportCity_PokemonCenter_2F/header.inc" - .include "data/maps/SlateportCity_Mart/header.inc" - .include "data/maps/MauvilleCity_Gym/header.inc" - .include "data/maps/MauvilleCity_BikeShop/header.inc" - .include "data/maps/MauvilleCity_House1/header.inc" - .include "data/maps/MauvilleCity_GameCorner/header.inc" - .include "data/maps/MauvilleCity_House2/header.inc" - .include "data/maps/MauvilleCity_PokemonCenter_1F/header.inc" - .include "data/maps/MauvilleCity_PokemonCenter_2F/header.inc" - .include "data/maps/MauvilleCity_Mart/header.inc" - .include "data/maps/RustboroCity_DevonCorp_1F/header.inc" - .include "data/maps/RustboroCity_DevonCorp_2F/header.inc" - .include "data/maps/RustboroCity_DevonCorp_3F/header.inc" - .include "data/maps/RustboroCity_Gym/header.inc" - .include "data/maps/RustboroCity_PokemonSchool/header.inc" - .include "data/maps/RustboroCity_PokemonCenter_1F/header.inc" - .include "data/maps/RustboroCity_PokemonCenter_2F/header.inc" - .include "data/maps/RustboroCity_Mart/header.inc" - .include "data/maps/RustboroCity_Flat1_1F/header.inc" - .include "data/maps/RustboroCity_Flat1_2F/header.inc" - .include "data/maps/RustboroCity_House1/header.inc" - .include "data/maps/RustboroCity_CuttersHouse/header.inc" - .include "data/maps/RustboroCity_House2/header.inc" - .include "data/maps/RustboroCity_Flat2_1F/header.inc" - .include "data/maps/RustboroCity_Flat2_2F/header.inc" - .include "data/maps/RustboroCity_Flat2_3F/header.inc" - .include "data/maps/RustboroCity_House3/header.inc" - .include "data/maps/FortreeCity_House1/header.inc" - .include "data/maps/FortreeCity_Gym/header.inc" - .include "data/maps/FortreeCity_PokemonCenter_1F/header.inc" - .include "data/maps/FortreeCity_PokemonCenter_2F/header.inc" - .include "data/maps/FortreeCity_Mart/header.inc" - .include "data/maps/FortreeCity_House2/header.inc" - .include "data/maps/FortreeCity_House3/header.inc" - .include "data/maps/FortreeCity_House4/header.inc" - .include "data/maps/FortreeCity_House5/header.inc" - .include "data/maps/FortreeCity_DecorationShop/header.inc" - .include "data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc" - .include "data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc" - .include "data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc" - .include "data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc" - .include "data/maps/LilycoveCity_ContestLobby/header.inc" - .include "data/maps/LilycoveCity_ContestHall/header.inc" - .include "data/maps/LilycoveCity_PokemonCenter_1F/header.inc" - .include "data/maps/LilycoveCity_PokemonCenter_2F/header.inc" - .include "data/maps/LilycoveCity_UnusedMart/header.inc" - .include "data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc" - .include "data/maps/LilycoveCity_Harbor/header.inc" - .include "data/maps/LilycoveCity_MoveDeletersHouse/header.inc" - .include "data/maps/LilycoveCity_House1/header.inc" - .include "data/maps/LilycoveCity_House2/header.inc" - .include "data/maps/LilycoveCity_House3/header.inc" - .include "data/maps/LilycoveCity_House4/header.inc" - .include "data/maps/LilycoveCity_DepartmentStore_1F/header.inc" - .include "data/maps/LilycoveCity_DepartmentStore_2F/header.inc" - .include "data/maps/LilycoveCity_DepartmentStore_3F/header.inc" - .include "data/maps/LilycoveCity_DepartmentStore_4F/header.inc" - .include "data/maps/LilycoveCity_DepartmentStore_5F/header.inc" - .include "data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc" - .include "data/maps/LilycoveCity_DepartmentStoreElevator/header.inc" - .include "data/maps/MossdeepCity_Gym/header.inc" - .include "data/maps/MossdeepCity_House1/header.inc" - .include "data/maps/MossdeepCity_House2/header.inc" - .include "data/maps/MossdeepCity_PokemonCenter_1F/header.inc" - .include "data/maps/MossdeepCity_PokemonCenter_2F/header.inc" - .include "data/maps/MossdeepCity_Mart/header.inc" - .include "data/maps/MossdeepCity_House3/header.inc" - .include "data/maps/MossdeepCity_StevensHouse/header.inc" - .include "data/maps/MossdeepCity_House4/header.inc" - .include "data/maps/MossdeepCity_SpaceCenter_1F/header.inc" - .include "data/maps/MossdeepCity_SpaceCenter_2F/header.inc" - .include "data/maps/MossdeepCity_GameCorner_1F/header.inc" - .include "data/maps/MossdeepCity_GameCorner_B1F/header.inc" - .include "data/maps/SootopolisCity_Gym_1F/header.inc" - .include "data/maps/SootopolisCity_Gym_B1F/header.inc" - .include "data/maps/SootopolisCity_PokemonCenter_1F/header.inc" - .include "data/maps/SootopolisCity_PokemonCenter_2F/header.inc" - .include "data/maps/SootopolisCity_Mart/header.inc" - .include "data/maps/SootopolisCity_House1/header.inc" - .include "data/maps/SootopolisCity_House2/header.inc" - .include "data/maps/SootopolisCity_House3/header.inc" - .include "data/maps/SootopolisCity_House4/header.inc" - .include "data/maps/SootopolisCity_House5/header.inc" - .include "data/maps/SootopolisCity_House6/header.inc" - .include "data/maps/SootopolisCity_House7/header.inc" - .include "data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc" - .include "data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc" - .include "data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc" - .include "data/maps/EverGrandeCity_SidneysRoom/header.inc" - .include "data/maps/EverGrandeCity_PhoebesRoom/header.inc" - .include "data/maps/EverGrandeCity_GlaciasRoom/header.inc" - .include "data/maps/EverGrandeCity_DrakesRoom/header.inc" - .include "data/maps/EverGrandeCity_ChampionsRoom/header.inc" - .include "data/maps/EverGrandeCity_Hall1/header.inc" - .include "data/maps/EverGrandeCity_Hall2/header.inc" - .include "data/maps/EverGrandeCity_Hall3/header.inc" - .include "data/maps/EverGrandeCity_Hall4/header.inc" - .include "data/maps/EverGrandeCity_Hall5/header.inc" - .include "data/maps/EverGrandeCity_PokemonLeague_1F/header.inc" - .include "data/maps/EverGrandeCity_HallOfFame/header.inc" - .include "data/maps/EverGrandeCity_PokemonCenter_1F/header.inc" - .include "data/maps/EverGrandeCity_PokemonCenter_2F/header.inc" - .include "data/maps/EverGrandeCity_PokemonLeague_2F/header.inc" - .include "data/maps/Route104_MrBrineysHouse/header.inc" - .include "data/maps/Route104_PrettyPetalFlowerShop/header.inc" - .include "data/maps/Route111_WinstrateFamilysHouse/header.inc" - .include "data/maps/Route111_OldLadysRestStop/header.inc" - .include "data/maps/Route112_CableCarStation/header.inc" - .include "data/maps/MtChimney_CableCarStation/header.inc" - .include "data/maps/Route114_FossilManiacsHouse/header.inc" - .include "data/maps/Route114_FossilManiacsTunnel/header.inc" - .include "data/maps/Route114_LanettesHouse/header.inc" - .include "data/maps/Route116_TunnelersRestHouse/header.inc" - .include "data/maps/Route117_PokemonDayCare/header.inc" - .include "data/maps/Route121_SafariZoneEntrance/header.inc" - .include "data/maps/MeteorFalls_1F_1R/header.inc" - .include "data/maps/MeteorFalls_1F_2R/header.inc" - .include "data/maps/MeteorFalls_B1F_1R/header.inc" - .include "data/maps/MeteorFalls_B1F_2R/header.inc" - .include "data/maps/RusturfTunnel/header.inc" - .include "data/maps/Underwater_SootopolisCity/header.inc" - .include "data/maps/DesertRuins/header.inc" - .include "data/maps/GraniteCave_1F/header.inc" - .include "data/maps/GraniteCave_B1F/header.inc" - .include "data/maps/GraniteCave_B2F/header.inc" - .include "data/maps/GraniteCave_StevensRoom/header.inc" - .include "data/maps/PetalburgWoods/header.inc" - .include "data/maps/MtChimney/header.inc" - .include "data/maps/JaggedPass/header.inc" - .include "data/maps/FieryPath/header.inc" - .include "data/maps/MtPyre_1F/header.inc" - .include "data/maps/MtPyre_2F/header.inc" - .include "data/maps/MtPyre_3F/header.inc" - .include "data/maps/MtPyre_4F/header.inc" - .include "data/maps/MtPyre_5F/header.inc" - .include "data/maps/MtPyre_6F/header.inc" - .include "data/maps/MtPyre_Exterior/header.inc" - .include "data/maps/MtPyre_Summit/header.inc" - .include "data/maps/AquaHideout_1F/header.inc" - .include "data/maps/AquaHideout_B1F/header.inc" - .include "data/maps/AquaHideout_B2F/header.inc" - .include "data/maps/Underwater_SeafloorCavern/header.inc" - .include "data/maps/SeafloorCavern_Entrance/header.inc" - .include "data/maps/SeafloorCavern_Room1/header.inc" - .include "data/maps/SeafloorCavern_Room2/header.inc" - .include "data/maps/SeafloorCavern_Room3/header.inc" - .include "data/maps/SeafloorCavern_Room4/header.inc" - .include "data/maps/SeafloorCavern_Room5/header.inc" - .include "data/maps/SeafloorCavern_Room6/header.inc" - .include "data/maps/SeafloorCavern_Room7/header.inc" - .include "data/maps/SeafloorCavern_Room8/header.inc" - .include "data/maps/SeafloorCavern_Room9/header.inc" - .include "data/maps/CaveOfOrigin_Entrance/header.inc" - .include "data/maps/CaveOfOrigin_1F/header.inc" - .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc" - .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc" - .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc" - .include "data/maps/CaveOfOrigin_B1F/header.inc" - .include "data/maps/VictoryRoad_1F/header.inc" - .include "data/maps/VictoryRoad_B1F/header.inc" - .include "data/maps/VictoryRoad_B2F/header.inc" - .include "data/maps/ShoalCave_LowTideEntranceRoom/header.inc" - .include "data/maps/ShoalCave_LowTideInnerRoom/header.inc" - .include "data/maps/ShoalCave_LowTideStairsRoom/header.inc" - .include "data/maps/ShoalCave_LowTideLowerRoom/header.inc" - .include "data/maps/ShoalCave_HighTideEntranceRoom/header.inc" - .include "data/maps/ShoalCave_HighTideInnerRoom/header.inc" - .include "data/maps/NewMauville_Entrance/header.inc" - .include "data/maps/NewMauville_Inside/header.inc" - .include "data/maps/AbandonedShip_Deck/header.inc" - .include "data/maps/AbandonedShip_Corridors_1F/header.inc" - .include "data/maps/AbandonedShip_Rooms_1F/header.inc" - .include "data/maps/AbandonedShip_Corridors_B1F/header.inc" - .include "data/maps/AbandonedShip_Rooms_B1F/header.inc" - .include "data/maps/AbandonedShip_Rooms2_B1F/header.inc" - .include "data/maps/AbandonedShip_Underwater1/header.inc" - .include "data/maps/AbandonedShip_Room_B1F/header.inc" - .include "data/maps/AbandonedShip_Rooms2_1F/header.inc" - .include "data/maps/AbandonedShip_CaptainsOffice/header.inc" - .include "data/maps/AbandonedShip_Underwater2/header.inc" - .include "data/maps/AbandonedShip_HiddenFloorCorridors/header.inc" - .include "data/maps/AbandonedShip_HiddenFloorRooms/header.inc" - .include "data/maps/IslandCave/header.inc" - .include "data/maps/AncientTomb/header.inc" - .include "data/maps/Underwater_Route134/header.inc" - .include "data/maps/Underwater_SealedChamber/header.inc" - .include "data/maps/SealedChamber_OuterRoom/header.inc" - .include "data/maps/SealedChamber_InnerRoom/header.inc" - .include "data/maps/ScorchedSlab/header.inc" - .include "data/maps/AquaHideout_UnusedRubyMap1/header.inc" - .include "data/maps/AquaHideout_UnusedRubyMap2/header.inc" - .include "data/maps/AquaHideout_UnusedRubyMap3/header.inc" - .include "data/maps/SkyPillar_Entrance/header.inc" - .include "data/maps/SkyPillar_Outside/header.inc" - .include "data/maps/SkyPillar_1F/header.inc" - .include "data/maps/SkyPillar_2F/header.inc" - .include "data/maps/SkyPillar_3F/header.inc" - .include "data/maps/SkyPillar_4F/header.inc" - .include "data/maps/ShoalCave_LowTideIceRoom/header.inc" - .include "data/maps/SkyPillar_5F/header.inc" - .include "data/maps/SkyPillar_Top/header.inc" - .include "data/maps/MagmaHideout_1F/header.inc" - .include "data/maps/MagmaHideout_2F_1R/header.inc" - .include "data/maps/MagmaHideout_2F_2R/header.inc" - .include "data/maps/MagmaHideout_3F_1R/header.inc" - .include "data/maps/MagmaHideout_3F_2R/header.inc" - .include "data/maps/MagmaHideout_4F/header.inc" - .include "data/maps/MagmaHideout_3F_3R/header.inc" - .include "data/maps/MagmaHideout_2F_3R/header.inc" - .include "data/maps/MirageTower_1F/header.inc" - .include "data/maps/MirageTower_2F/header.inc" - .include "data/maps/MirageTower_3F/header.inc" - .include "data/maps/MirageTower_4F/header.inc" - .include "data/maps/DesertUnderpass/header.inc" - .include "data/maps/ArtisanCave_B1F/header.inc" - .include "data/maps/ArtisanCave_1F/header.inc" - .include "data/maps/Underwater_MarineCave/header.inc" - .include "data/maps/MarineCave_Entrance/header.inc" - .include "data/maps/MarineCave_End/header.inc" - .include "data/maps/TerraCave_Entrance/header.inc" - .include "data/maps/TerraCave_End/header.inc" - .include "data/maps/AlteringCave/header.inc" - .include "data/maps/MeteorFalls_StevensCave/header.inc" - .include "data/maps/SecretBase_RedCave1/header.inc" - .include "data/maps/SecretBase_BrownCave1/header.inc" - .include "data/maps/SecretBase_BlueCave1/header.inc" - .include "data/maps/SecretBase_YellowCave1/header.inc" - .include "data/maps/SecretBase_Tree1/header.inc" - .include "data/maps/SecretBase_Shrub1/header.inc" - .include "data/maps/SecretBase_RedCave2/header.inc" - .include "data/maps/SecretBase_BrownCave2/header.inc" - .include "data/maps/SecretBase_BlueCave2/header.inc" - .include "data/maps/SecretBase_YellowCave2/header.inc" - .include "data/maps/SecretBase_Tree2/header.inc" - .include "data/maps/SecretBase_Shrub2/header.inc" - .include "data/maps/SecretBase_RedCave3/header.inc" - .include "data/maps/SecretBase_BrownCave3/header.inc" - .include "data/maps/SecretBase_BlueCave3/header.inc" - .include "data/maps/SecretBase_YellowCave3/header.inc" - .include "data/maps/SecretBase_Tree3/header.inc" - .include "data/maps/SecretBase_Shrub3/header.inc" - .include "data/maps/SecretBase_RedCave4/header.inc" - .include "data/maps/SecretBase_BrownCave4/header.inc" - .include "data/maps/SecretBase_BlueCave4/header.inc" - .include "data/maps/SecretBase_YellowCave4/header.inc" - .include "data/maps/SecretBase_Tree4/header.inc" - .include "data/maps/SecretBase_Shrub4/header.inc" - .include "data/maps/SingleBattleColosseum/header.inc" - .include "data/maps/TradeCenter/header.inc" - .include "data/maps/RecordCorner/header.inc" - .include "data/maps/DoubleBattleColosseum/header.inc" - .include "data/maps/LinkContestRoom1/header.inc" - .include "data/maps/UnknownMap_25_29/header.inc" - .include "data/maps/UnknownMap_25_30/header.inc" - .include "data/maps/UnknownMap_25_31/header.inc" - .include "data/maps/UnknownMap_25_32/header.inc" - .include "data/maps/UnknownMap_25_33/header.inc" - .include "data/maps/UnknownMap_25_34/header.inc" - .include "data/maps/LinkContestRoom2/header.inc" - .include "data/maps/LinkContestRoom3/header.inc" - .include "data/maps/LinkContestRoom4/header.inc" - .include "data/maps/LinkContestRoom5/header.inc" - .include "data/maps/LinkContestRoom6/header.inc" - .include "data/maps/InsideOfTruck/header.inc" - .include "data/maps/SSTidalCorridor/header.inc" - .include "data/maps/SSTidalLowerDeck/header.inc" - .include "data/maps/SSTidalRooms/header.inc" - .include "data/maps/BattlePyramidSquare01/header.inc" - .include "data/maps/BattlePyramidSquare02/header.inc" - .include "data/maps/BattlePyramidSquare03/header.inc" - .include "data/maps/BattlePyramidSquare04/header.inc" - .include "data/maps/BattlePyramidSquare05/header.inc" - .include "data/maps/BattlePyramidSquare06/header.inc" - .include "data/maps/BattlePyramidSquare07/header.inc" - .include "data/maps/BattlePyramidSquare08/header.inc" - .include "data/maps/BattlePyramidSquare09/header.inc" - .include "data/maps/BattlePyramidSquare10/header.inc" - .include "data/maps/BattlePyramidSquare11/header.inc" - .include "data/maps/BattlePyramidSquare12/header.inc" - .include "data/maps/BattlePyramidSquare13/header.inc" - .include "data/maps/BattlePyramidSquare14/header.inc" - .include "data/maps/BattlePyramidSquare15/header.inc" - .include "data/maps/BattlePyramidSquare16/header.inc" - .include "data/maps/UnionRoom/header.inc" - .include "data/maps/SafariZone_Northwest/header.inc" - .include "data/maps/SafariZone_North/header.inc" - .include "data/maps/SafariZone_Southwest/header.inc" - .include "data/maps/SafariZone_South/header.inc" - .include "data/maps/BattleFrontier_OutsideWest/header.inc" - .include "data/maps/BattleFrontier_BattleTowerLobby/header.inc" - .include "data/maps/BattleFrontier_BattleTowerElevator/header.inc" - .include "data/maps/BattleFrontier_BattleTowerCorridor/header.inc" - .include "data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc" - .include "data/maps/SouthernIsland_Exterior/header.inc" - .include "data/maps/SouthernIsland_Interior/header.inc" - .include "data/maps/SafariZone_RestHouse/header.inc" - .include "data/maps/SafariZone_Northeast/header.inc" - .include "data/maps/SafariZone_Southeast/header.inc" - .include "data/maps/BattleFrontier_OutsideEast/header.inc" - .include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattleTowerCorridor2/header.inc" - .include "data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc" - .include "data/maps/BattleFrontier_BattleDomeLobby/header.inc" - .include "data/maps/BattleFrontier_BattleDomeCorridor/header.inc" - .include "data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattlePalaceLobby/header.inc" - .include "data/maps/BattleFrontier_BattlePalaceCorridor/header.inc" - .include "data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattlePyramidLobby/header.inc" - .include "data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc" - .include "data/maps/BattleFrontier_BattlePyramidTop/header.inc" - .include "data/maps/BattleFrontier_BattleArenaLobby/header.inc" - .include "data/maps/BattleFrontier_BattleArenaCorridor/header.inc" - .include "data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattleFactoryLobby/header.inc" - .include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattlePikeLobby/header.inc" - .include "data/maps/BattleFrontier_BattlePikeCorridor/header.inc" - .include "data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc" - .include "data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc" - .include "data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc" - .include "data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc" - .include "data/maps/BattleFrontier_RankingHall/header.inc" - .include "data/maps/BattleFrontier_Lounge1/header.inc" - .include "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc" - .include "data/maps/BattleFrontier_Lounge2/header.inc" - .include "data/maps/BattleFrontier_Lounge3/header.inc" - .include "data/maps/BattleFrontier_Lounge4/header.inc" - .include "data/maps/BattleFrontier_ScottsHouse/header.inc" - .include "data/maps/BattleFrontier_Lounge5/header.inc" - .include "data/maps/BattleFrontier_Lounge6/header.inc" - .include "data/maps/BattleFrontier_Lounge7/header.inc" - .include "data/maps/BattleFrontier_ReceptionGate/header.inc" - .include "data/maps/BattleFrontier_Lounge8/header.inc" - .include "data/maps/BattleFrontier_Lounge9/header.inc" - .include "data/maps/BattleFrontier_PokemonCenter_1F/header.inc" - .include "data/maps/BattleFrontier_PokemonCenter_2F/header.inc" - .include "data/maps/BattleFrontier_Mart/header.inc" - .include "data/maps/FarawayIsland_Entrance/header.inc" - .include "data/maps/FarawayIsland_Interior/header.inc" - .include "data/maps/BirthIsland_Exterior/header.inc" - .include "data/maps/BirthIsland_Harbor/header.inc" - .include "data/maps/TrainerHill_Entrance/header.inc" - .include "data/maps/TrainerHill_1F/header.inc" - .include "data/maps/TrainerHill_2F/header.inc" - .include "data/maps/TrainerHill_3F/header.inc" - .include "data/maps/TrainerHill_4F/header.inc" - .include "data/maps/TrainerHill_Roof/header.inc" - .include "data/maps/NavelRock_Exterior/header.inc" - .include "data/maps/NavelRock_Harbor/header.inc" - .include "data/maps/NavelRock_Entrance/header.inc" - .include "data/maps/NavelRock_B1F/header.inc" - .include "data/maps/NavelRock_Fork/header.inc" - .include "data/maps/NavelRock_Up1/header.inc" - .include "data/maps/NavelRock_Up2/header.inc" - .include "data/maps/NavelRock_Up3/header.inc" - .include "data/maps/NavelRock_Up4/header.inc" - .include "data/maps/NavelRock_Top/header.inc" - .include "data/maps/NavelRock_Down01/header.inc" - .include "data/maps/NavelRock_Down02/header.inc" - .include "data/maps/NavelRock_Down03/header.inc" - .include "data/maps/NavelRock_Down04/header.inc" - .include "data/maps/NavelRock_Down05/header.inc" - .include "data/maps/NavelRock_Down06/header.inc" - .include "data/maps/NavelRock_Down07/header.inc" - .include "data/maps/NavelRock_Down08/header.inc" - .include "data/maps/NavelRock_Down09/header.inc" - .include "data/maps/NavelRock_Down10/header.inc" - .include "data/maps/NavelRock_Down11/header.inc" - .include "data/maps/NavelRock_Bottom/header.inc" - .include "data/maps/TrainerHill_Elevator/header.inc" - .include "data/maps/Route104_Prototype/header.inc" - .include "data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc" - .include "data/maps/Route109_SeashoreHouse/header.inc" - .include "data/maps/Route110_TrickHouseEntrance/header.inc" - .include "data/maps/Route110_TrickHouseEnd/header.inc" - .include "data/maps/Route110_TrickHouseCorridor/header.inc" - .include "data/maps/Route110_TrickHousePuzzle1/header.inc" - .include "data/maps/Route110_TrickHousePuzzle2/header.inc" - .include "data/maps/Route110_TrickHousePuzzle3/header.inc" - .include "data/maps/Route110_TrickHousePuzzle4/header.inc" - .include "data/maps/Route110_TrickHousePuzzle5/header.inc" - .include "data/maps/Route110_TrickHousePuzzle6/header.inc" - .include "data/maps/Route110_TrickHousePuzzle7/header.inc" - .include "data/maps/Route110_TrickHousePuzzle8/header.inc" - .include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc" - .include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc" - .include "data/maps/Route113_GlassWorkshop/header.inc" - .include "data/maps/Route123_BerryMastersHouse/header.inc" - .include "data/maps/Route119_WeatherInstitute_1F/header.inc" - .include "data/maps/Route119_WeatherInstitute_2F/header.inc" - .include "data/maps/Route119_House/header.inc" - .include "data/maps/Route124_DivingTreasureHuntersHouse/header.inc" diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json new file mode 100644 index 0000000000..e20d1adf24 --- /dev/null +++ b/data/maps/map_groups.json @@ -0,0 +1,691 @@ +{ + "group_order": [ + "gMapGroup0", + "gMapGroup1", + "gMapGroup2", + "gMapGroup3", + "gMapGroup4", + "gMapGroup5", + "gMapGroup6", + "gMapGroup7", + "gMapGroup8", + "gMapGroup9", + "gMapGroup10", + "gMapGroup11", + "gMapGroup12", + "gMapGroup13", + "gMapGroup14", + "gMapGroup15", + "gMapGroup16", + "gMapGroup17", + "gMapGroup18", + "gMapGroup19", + "gMapGroup20", + "gMapGroup21", + "gMapGroup22", + "gMapGroup23", + "gMapGroup24", + "gMapGroup25", + "gMapGroup26", + "gMapGroup27", + "gMapGroup28", + "gMapGroup29", + "gMapGroup30", + "gMapGroup31", + "gMapGroup32", + "gMapGroup33" + ], + "gMapGroup0": [ + "PetalburgCity", + "SlateportCity", + "MauvilleCity", + "RustboroCity", + "FortreeCity", + "LilycoveCity", + "MossdeepCity", + "SootopolisCity", + "EverGrandeCity", + "LittlerootTown", + "OldaleTown", + "DewfordTown", + "LavaridgeTown", + "FallarborTown", + "VerdanturfTown", + "PacifidlogTown", + "Route101", + "Route102", + "Route103", + "Route104", + "Route105", + "Route106", + "Route107", + "Route108", + "Route109", + "Route110", + "Route111", + "Route112", + "Route113", + "Route114", + "Route115", + "Route116", + "Route117", + "Route118", + "Route119", + "Route120", + "Route121", + "Route122", + "Route123", + "Route124", + "Route125", + "Route126", + "Route127", + "Route128", + "Route129", + "Route130", + "Route131", + "Route132", + "Route133", + "Route134", + "Underwater1", + "Underwater2", + "Underwater3", + "Underwater4", + "Underwater5", + "Underwater6", + "Underwater7" + ], + "gMapGroup1": [ + "LittlerootTown_BrendansHouse_1F", + "LittlerootTown_BrendansHouse_2F", + "LittlerootTown_MaysHouse_1F", + "LittlerootTown_MaysHouse_2F", + "LittlerootTown_ProfessorBirchsLab" + ], + "gMapGroup2": [ + "OldaleTown_House1", + "OldaleTown_House2", + "OldaleTown_PokemonCenter_1F", + "OldaleTown_PokemonCenter_2F", + "OldaleTown_Mart" + ], + "gMapGroup3": [ + "DewfordTown_House1", + "DewfordTown_PokemonCenter_1F", + "DewfordTown_PokemonCenter_2F", + "DewfordTown_Gym", + "DewfordTown_Hall", + "DewfordTown_House2" + ], + "gMapGroup4": [ + "LavaridgeTown_HerbShop", + "LavaridgeTown_Gym_1F", + "LavaridgeTown_Gym_B1F", + "LavaridgeTown_House", + "LavaridgeTown_Mart", + "LavaridgeTown_PokemonCenter_1F", + "LavaridgeTown_PokemonCenter_2F" + ], + "gMapGroup5": [ + "FallarborTown_Mart", + "FallarborTown_BattleTentLobby", + "FallarborTown_BattleTentCorridor", + "FallarborTown_BattleTentBattleRoom", + "FallarborTown_PokemonCenter_1F", + "FallarborTown_PokemonCenter_2F", + "FallarborTown_House1", + "FallarborTown_House2" + ], + "gMapGroup6": [ + "VerdanturfTown_BattleTentLobby", + "VerdanturfTown_BattleTentCorridor", + "VerdanturfTown_BattleTentBattleRoom", + "VerdanturfTown_Mart", + "VerdanturfTown_PokemonCenter_1F", + "VerdanturfTown_PokemonCenter_2F", + "VerdanturfTown_WandasHouse", + "VerdanturfTown_FriendshipRatersHouse", + "VerdanturfTown_House" + ], + "gMapGroup7": [ + "PacifidlogTown_PokemonCenter_1F", + "PacifidlogTown_PokemonCenter_2F", + "PacifidlogTown_House1", + "PacifidlogTown_House2", + "PacifidlogTown_House3", + "PacifidlogTown_House4", + "PacifidlogTown_House5" + ], + "gMapGroup8": [ + "PetalburgCity_WallysHouse", + "PetalburgCity_Gym", + "PetalburgCity_House1", + "PetalburgCity_House2", + "PetalburgCity_PokemonCenter_1F", + "PetalburgCity_PokemonCenter_2F", + "PetalburgCity_Mart" + ], + "gMapGroup9": [ + "SlateportCity_SternsShipyard_1F", + "SlateportCity_SternsShipyard_2F", + "SlateportCity_BattleTentLobby", + "SlateportCity_BattleTentCorridor", + "SlateportCity_BattleTentBattleRoom", + "SlateportCity_House1", + "SlateportCity_PokemonFanClub", + "SlateportCity_OceanicMuseum_1F", + "SlateportCity_OceanicMuseum_2F", + "SlateportCity_Harbor", + "SlateportCity_House2", + "SlateportCity_PokemonCenter_1F", + "SlateportCity_PokemonCenter_2F", + "SlateportCity_Mart" + ], + "gMapGroup10": [ + "MauvilleCity_Gym", + "MauvilleCity_BikeShop", + "MauvilleCity_House1", + "MauvilleCity_GameCorner", + "MauvilleCity_House2", + "MauvilleCity_PokemonCenter_1F", + "MauvilleCity_PokemonCenter_2F", + "MauvilleCity_Mart" + ], + "gMapGroup11": [ + "RustboroCity_DevonCorp_1F", + "RustboroCity_DevonCorp_2F", + "RustboroCity_DevonCorp_3F", + "RustboroCity_Gym", + "RustboroCity_PokemonSchool", + "RustboroCity_PokemonCenter_1F", + "RustboroCity_PokemonCenter_2F", + "RustboroCity_Mart", + "RustboroCity_Flat1_1F", + "RustboroCity_Flat1_2F", + "RustboroCity_House1", + "RustboroCity_CuttersHouse", + "RustboroCity_House2", + "RustboroCity_Flat2_1F", + "RustboroCity_Flat2_2F", + "RustboroCity_Flat2_3F", + "RustboroCity_House3" + ], + "gMapGroup12": [ + "FortreeCity_House1", + "FortreeCity_Gym", + "FortreeCity_PokemonCenter_1F", + "FortreeCity_PokemonCenter_2F", + "FortreeCity_Mart", + "FortreeCity_House2", + "FortreeCity_House3", + "FortreeCity_House4", + "FortreeCity_House5", + "FortreeCity_DecorationShop" + ], + "gMapGroup13": [ + "LilycoveCity_CoveLilyMotel_1F", + "LilycoveCity_CoveLilyMotel_2F", + "LilycoveCity_LilycoveMuseum_1F", + "LilycoveCity_LilycoveMuseum_2F", + "LilycoveCity_ContestLobby", + "LilycoveCity_ContestHall", + "LilycoveCity_PokemonCenter_1F", + "LilycoveCity_PokemonCenter_2F", + "LilycoveCity_UnusedMart", + "LilycoveCity_PokemonTrainerFanClub", + "LilycoveCity_Harbor", + "LilycoveCity_MoveDeletersHouse", + "LilycoveCity_House1", + "LilycoveCity_House2", + "LilycoveCity_House3", + "LilycoveCity_House4", + "LilycoveCity_DepartmentStore_1F", + "LilycoveCity_DepartmentStore_2F", + "LilycoveCity_DepartmentStore_3F", + "LilycoveCity_DepartmentStore_4F", + "LilycoveCity_DepartmentStore_5F", + "LilycoveCity_DepartmentStoreRooftop", + "LilycoveCity_DepartmentStoreElevator" + ], + "gMapGroup14": [ + "MossdeepCity_Gym", + "MossdeepCity_House1", + "MossdeepCity_House2", + "MossdeepCity_PokemonCenter_1F", + "MossdeepCity_PokemonCenter_2F", + "MossdeepCity_Mart", + "MossdeepCity_House3", + "MossdeepCity_StevensHouse", + "MossdeepCity_House4", + "MossdeepCity_SpaceCenter_1F", + "MossdeepCity_SpaceCenter_2F", + "MossdeepCity_GameCorner_1F", + "MossdeepCity_GameCorner_B1F" + ], + "gMapGroup15": [ + "SootopolisCity_Gym_1F", + "SootopolisCity_Gym_B1F", + "SootopolisCity_PokemonCenter_1F", + "SootopolisCity_PokemonCenter_2F", + "SootopolisCity_Mart", + "SootopolisCity_House1", + "SootopolisCity_House2", + "SootopolisCity_House3", + "SootopolisCity_House4", + "SootopolisCity_House5", + "SootopolisCity_House6", + "SootopolisCity_House7", + "SootopolisCity_LotadAndSeedotHouse", + "SootopolisCity_MysteryEventsHouse_1F", + "SootopolisCity_MysteryEventsHouse_B1F" + ], + "gMapGroup16": [ + "EverGrandeCity_SidneysRoom", + "EverGrandeCity_PhoebesRoom", + "EverGrandeCity_GlaciasRoom", + "EverGrandeCity_DrakesRoom", + "EverGrandeCity_ChampionsRoom", + "EverGrandeCity_Hall1", + "EverGrandeCity_Hall2", + "EverGrandeCity_Hall3", + "EverGrandeCity_Hall4", + "EverGrandeCity_Hall5", + "EverGrandeCity_PokemonLeague_1F", + "EverGrandeCity_HallOfFame", + "EverGrandeCity_PokemonCenter_1F", + "EverGrandeCity_PokemonCenter_2F", + "EverGrandeCity_PokemonLeague_2F" + ], + "gMapGroup17": [ + "Route104_MrBrineysHouse", + "Route104_PrettyPetalFlowerShop" + ], + "gMapGroup18": [ + "Route111_WinstrateFamilysHouse", + "Route111_OldLadysRestStop" + ], + "gMapGroup19": [ + "Route112_CableCarStation", + "MtChimney_CableCarStation" + ], + "gMapGroup20": [ + "Route114_FossilManiacsHouse", + "Route114_FossilManiacsTunnel", + "Route114_LanettesHouse" + ], + "gMapGroup21": [ + "Route116_TunnelersRestHouse" + ], + "gMapGroup22": [ + "Route117_PokemonDayCare" + ], + "gMapGroup23": [ + "Route121_SafariZoneEntrance" + ], + "gMapGroup24": [ + "MeteorFalls_1F_1R", + "MeteorFalls_1F_2R", + "MeteorFalls_B1F_1R", + "MeteorFalls_B1F_2R", + "RusturfTunnel", + "Underwater_SootopolisCity", + "DesertRuins", + "GraniteCave_1F", + "GraniteCave_B1F", + "GraniteCave_B2F", + "GraniteCave_StevensRoom", + "PetalburgWoods", + "MtChimney", + "JaggedPass", + "FieryPath", + "MtPyre_1F", + "MtPyre_2F", + "MtPyre_3F", + "MtPyre_4F", + "MtPyre_5F", + "MtPyre_6F", + "MtPyre_Exterior", + "MtPyre_Summit", + "AquaHideout_1F", + "AquaHideout_B1F", + "AquaHideout_B2F", + "Underwater_SeafloorCavern", + "SeafloorCavern_Entrance", + "SeafloorCavern_Room1", + "SeafloorCavern_Room2", + "SeafloorCavern_Room3", + "SeafloorCavern_Room4", + "SeafloorCavern_Room5", + "SeafloorCavern_Room6", + "SeafloorCavern_Room7", + "SeafloorCavern_Room8", + "SeafloorCavern_Room9", + "CaveOfOrigin_Entrance", + "CaveOfOrigin_1F", + "CaveOfOrigin_UnusedRubySapphireMap1", + "CaveOfOrigin_UnusedRubySapphireMap2", + "CaveOfOrigin_UnusedRubySapphireMap3", + "CaveOfOrigin_B1F", + "VictoryRoad_1F", + "VictoryRoad_B1F", + "VictoryRoad_B2F", + "ShoalCave_LowTideEntranceRoom", + "ShoalCave_LowTideInnerRoom", + "ShoalCave_LowTideStairsRoom", + "ShoalCave_LowTideLowerRoom", + "ShoalCave_HighTideEntranceRoom", + "ShoalCave_HighTideInnerRoom", + "NewMauville_Entrance", + "NewMauville_Inside", + "AbandonedShip_Deck", + "AbandonedShip_Corridors_1F", + "AbandonedShip_Rooms_1F", + "AbandonedShip_Corridors_B1F", + "AbandonedShip_Rooms_B1F", + "AbandonedShip_Rooms2_B1F", + "AbandonedShip_Underwater1", + "AbandonedShip_Room_B1F", + "AbandonedShip_Rooms2_1F", + "AbandonedShip_CaptainsOffice", + "AbandonedShip_Underwater2", + "AbandonedShip_HiddenFloorCorridors", + "AbandonedShip_HiddenFloorRooms", + "IslandCave", + "AncientTomb", + "Underwater_Route134", + "Underwater_SealedChamber", + "SealedChamber_OuterRoom", + "SealedChamber_InnerRoom", + "ScorchedSlab", + "AquaHideout_UnusedRubyMap1", + "AquaHideout_UnusedRubyMap2", + "AquaHideout_UnusedRubyMap3", + "SkyPillar_Entrance", + "SkyPillar_Outside", + "SkyPillar_1F", + "SkyPillar_2F", + "SkyPillar_3F", + "SkyPillar_4F", + "ShoalCave_LowTideIceRoom", + "SkyPillar_5F", + "SkyPillar_Top", + "MagmaHideout_1F", + "MagmaHideout_2F_1R", + "MagmaHideout_2F_2R", + "MagmaHideout_3F_1R", + "MagmaHideout_3F_2R", + "MagmaHideout_4F", + "MagmaHideout_3F_3R", + "MagmaHideout_2F_3R", + "MirageTower_1F", + "MirageTower_2F", + "MirageTower_3F", + "MirageTower_4F", + "DesertUnderpass", + "ArtisanCave_B1F", + "ArtisanCave_1F", + "Underwater_MarineCave", + "MarineCave_Entrance", + "MarineCave_End", + "TerraCave_Entrance", + "TerraCave_End", + "AlteringCave", + "MeteorFalls_StevensCave" + ], + "gMapGroup25": [ + "SecretBase_RedCave1", + "SecretBase_BrownCave1", + "SecretBase_BlueCave1", + "SecretBase_YellowCave1", + "SecretBase_Tree1", + "SecretBase_Shrub1", + "SecretBase_RedCave2", + "SecretBase_BrownCave2", + "SecretBase_BlueCave2", + "SecretBase_YellowCave2", + "SecretBase_Tree2", + "SecretBase_Shrub2", + "SecretBase_RedCave3", + "SecretBase_BrownCave3", + "SecretBase_BlueCave3", + "SecretBase_YellowCave3", + "SecretBase_Tree3", + "SecretBase_Shrub3", + "SecretBase_RedCave4", + "SecretBase_BrownCave4", + "SecretBase_BlueCave4", + "SecretBase_YellowCave4", + "SecretBase_Tree4", + "SecretBase_Shrub4", + "SingleBattleColosseum", + "TradeCenter", + "RecordCorner", + "DoubleBattleColosseum", + "LinkContestRoom1", + "UnknownMap_25_29", + "UnknownMap_25_30", + "UnknownMap_25_31", + "UnknownMap_25_32", + "UnknownMap_25_33", + "UnknownMap_25_34", + "LinkContestRoom2", + "LinkContestRoom3", + "LinkContestRoom4", + "LinkContestRoom5", + "LinkContestRoom6", + "InsideOfTruck", + "SSTidalCorridor", + "SSTidalLowerDeck", + "SSTidalRooms", + "BattlePyramidSquare01", + "BattlePyramidSquare02", + "BattlePyramidSquare03", + "BattlePyramidSquare04", + "BattlePyramidSquare05", + "BattlePyramidSquare06", + "BattlePyramidSquare07", + "BattlePyramidSquare08", + "BattlePyramidSquare09", + "BattlePyramidSquare10", + "BattlePyramidSquare11", + "BattlePyramidSquare12", + "BattlePyramidSquare13", + "BattlePyramidSquare14", + "BattlePyramidSquare15", + "BattlePyramidSquare16", + "UnionRoom" + ], + "gMapGroup26": [ + "SafariZone_Northwest", + "SafariZone_North", + "SafariZone_Southwest", + "SafariZone_South", + "BattleFrontier_OutsideWest", + "BattleFrontier_BattleTowerLobby", + "BattleFrontier_BattleTowerElevator", + "BattleFrontier_BattleTowerCorridor", + "BattleFrontier_BattleTowerBattleRoom", + "SouthernIsland_Exterior", + "SouthernIsland_Interior", + "SafariZone_RestHouse", + "SafariZone_Northeast", + "SafariZone_Southeast", + "BattleFrontier_OutsideEast", + "BattleFrontier_BattleTowerMultiBattleRoom", + "BattleFrontier_BattleTowerCorridor2", + "BattleFrontier_BattleTowerBattleRoom2", + "BattleFrontier_BattleDomeLobby", + "BattleFrontier_BattleDomeCorridor", + "BattleFrontier_BattleDomePreBattleRoom", + "BattleFrontier_BattleDomeBattleRoom", + "BattleFrontier_BattlePalaceLobby", + "BattleFrontier_BattlePalaceCorridor", + "BattleFrontier_BattlePalaceBattleRoom", + "BattleFrontier_BattlePyramidLobby", + "BattleFrontier_BattlePyramidEmptySquare", + "BattleFrontier_BattlePyramidTop", + "BattleFrontier_BattleArenaLobby", + "BattleFrontier_BattleArenaCorridor", + "BattleFrontier_BattleArenaBattleRoom", + "BattleFrontier_BattleFactoryLobby", + "BattleFrontier_BattleFactoryPreBattleRoom", + "BattleFrontier_BattleFactoryBattleRoom", + "BattleFrontier_BattlePikeLobby", + "BattleFrontier_BattlePikeCorridor", + "BattleFrontier_BattlePikeThreePathRoom", + "BattleFrontier_BattlePikeRandomRoom1", + "BattleFrontier_BattlePikeRandomRoom2", + "BattleFrontier_BattlePikeRandomRoom3", + "BattleFrontier_RankingHall", + "BattleFrontier_Lounge1", + "BattleFrontier_BattlePointExchangeServiceCorner", + "BattleFrontier_Lounge2", + "BattleFrontier_Lounge3", + "BattleFrontier_Lounge4", + "BattleFrontier_ScottsHouse", + "BattleFrontier_Lounge5", + "BattleFrontier_Lounge6", + "BattleFrontier_Lounge7", + "BattleFrontier_ReceptionGate", + "BattleFrontier_Lounge8", + "BattleFrontier_Lounge9", + "BattleFrontier_PokemonCenter_1F", + "BattleFrontier_PokemonCenter_2F", + "BattleFrontier_Mart", + "FarawayIsland_Entrance", + "FarawayIsland_Interior", + "BirthIsland_Exterior", + "BirthIsland_Harbor", + "TrainerHill_Entrance", + "TrainerHill_1F", + "TrainerHill_2F", + "TrainerHill_3F", + "TrainerHill_4F", + "TrainerHill_Roof", + "NavelRock_Exterior", + "NavelRock_Harbor", + "NavelRock_Entrance", + "NavelRock_B1F", + "NavelRock_Fork", + "NavelRock_Up1", + "NavelRock_Up2", + "NavelRock_Up3", + "NavelRock_Up4", + "NavelRock_Top", + "NavelRock_Down01", + "NavelRock_Down02", + "NavelRock_Down03", + "NavelRock_Down04", + "NavelRock_Down05", + "NavelRock_Down06", + "NavelRock_Down07", + "NavelRock_Down08", + "NavelRock_Down09", + "NavelRock_Down10", + "NavelRock_Down11", + "NavelRock_Bottom", + "TrainerHill_Elevator" + ], + "gMapGroup27": [ + "Route104_Prototype", + "Route104_PrototypePrettyPetalFlowerShop" + ], + "gMapGroup28": [ + "Route109_SeashoreHouse" + ], + "gMapGroup29": [ + "Route110_TrickHouseEntrance", + "Route110_TrickHouseEnd", + "Route110_TrickHouseCorridor", + "Route110_TrickHousePuzzle1", + "Route110_TrickHousePuzzle2", + "Route110_TrickHousePuzzle3", + "Route110_TrickHousePuzzle4", + "Route110_TrickHousePuzzle5", + "Route110_TrickHousePuzzle6", + "Route110_TrickHousePuzzle7", + "Route110_TrickHousePuzzle8", + "Route110_SeasideCyclingRoadNorthEntrance", + "Route110_SeasideCyclingRoadSouthEntrance" + ], + "gMapGroup30": [ + "Route113_GlassWorkshop" + ], + "gMapGroup31": [ + "Route123_BerryMastersHouse" + ], + "gMapGroup32": [ + "Route119_WeatherInstitute_1F", + "Route119_WeatherInstitute_2F", + "Route119_House" + ], + "gMapGroup33": [ + "Route124_DivingTreasureHuntersHouse" + ], + "connections_include_order": [ + "LittlerootTown", + "OldaleTown", + "DewfordTown", + "LavaridgeTown", + "FallarborTown", + "VerdanturfTown", + "PacifidlogTown", + "PetalburgCity", + "SlateportCity", + "MauvilleCity", + "RustboroCity", + "FortreeCity", + "LilycoveCity", + "MossdeepCity", + "SootopolisCity", + "EverGrandeCity", + "Route101", + "Route102", + "Route103", + "Route104", + "Route105", + "Route106", + "Route107", + "Route108", + "Route109", + "Route110", + "Route111", + "Route112", + "Route113", + "Route114", + "Route115", + "Route116", + "Route117", + "Route118", + "Route119", + "Route120", + "Route121", + "Route122", + "Route123", + "Route124", + "Route125", + "Route126", + "Route127", + "Route128", + "Route129", + "Route130", + "Route131", + "Route132", + "Route133", + "Route134", + "Underwater6", + "Underwater1", + "Underwater7", + "Underwater2", + "Underwater3", + "Underwater4", + "Underwater5", + "SafariZone_Northwest", + "SafariZone_North", + "SafariZone_Southwest", + "SafariZone_South", + "SafariZone_Northeast", + "SafariZone_Southeast", + "BattleFrontier_OutsideWest", + "BattleFrontier_OutsideEast" + ] +} \ No newline at end of file diff --git a/include/constants/layouts.h b/include/constants/layouts.h index d12db9b33f..45b37ff8bf 100755 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -443,4 +443,4 @@ #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F 440 #define LAYOUT_UNKNOWN_MAP_08481DBC 441 -#endif // GUARD_CONSTANTS_LAYOUTS_H +#endif // GUARD_CONSTANTS_LAYOUTS_H diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h new file mode 100755 index 0000000000..003b8c6ce6 --- /dev/null +++ b/include/constants/map_groups.h @@ -0,0 +1,592 @@ +#ifndef GUARD_CONSTANTS_MAP_GROUPS_H +#define GUARD_CONSTANTS_MAP_GROUPS_H + +// Map Group 0 +#define MAP_PETALBURG_CITY (0 | (0 << 8)) +#define MAP_SLATEPORT_CITY (1 | (0 << 8)) +#define MAP_MAUVILLE_CITY (2 | (0 << 8)) +#define MAP_RUSTBORO_CITY (3 | (0 << 8)) +#define MAP_FORTREE_CITY (4 | (0 << 8)) +#define MAP_LILYCOVE_CITY (5 | (0 << 8)) +#define MAP_MOSSDEEP_CITY (6 | (0 << 8)) +#define MAP_SOOTOPOLIS_CITY (7 | (0 << 8)) +#define MAP_EVER_GRANDE_CITY (8 | (0 << 8)) +#define MAP_LITTLEROOT_TOWN (9 | (0 << 8)) +#define MAP_OLDALE_TOWN (10 | (0 << 8)) +#define MAP_DEWFORD_TOWN (11 | (0 << 8)) +#define MAP_LAVARIDGE_TOWN (12 | (0 << 8)) +#define MAP_FALLARBOR_TOWN (13 | (0 << 8)) +#define MAP_VERDANTURF_TOWN (14 | (0 << 8)) +#define MAP_PACIFIDLOG_TOWN (15 | (0 << 8)) +#define MAP_ROUTE101 (16 | (0 << 8)) +#define MAP_ROUTE102 (17 | (0 << 8)) +#define MAP_ROUTE103 (18 | (0 << 8)) +#define MAP_ROUTE104 (19 | (0 << 8)) +#define MAP_ROUTE105 (20 | (0 << 8)) +#define MAP_ROUTE106 (21 | (0 << 8)) +#define MAP_ROUTE107 (22 | (0 << 8)) +#define MAP_ROUTE108 (23 | (0 << 8)) +#define MAP_ROUTE109 (24 | (0 << 8)) +#define MAP_ROUTE110 (25 | (0 << 8)) +#define MAP_ROUTE111 (26 | (0 << 8)) +#define MAP_ROUTE112 (27 | (0 << 8)) +#define MAP_ROUTE113 (28 | (0 << 8)) +#define MAP_ROUTE114 (29 | (0 << 8)) +#define MAP_ROUTE115 (30 | (0 << 8)) +#define MAP_ROUTE116 (31 | (0 << 8)) +#define MAP_ROUTE117 (32 | (0 << 8)) +#define MAP_ROUTE118 (33 | (0 << 8)) +#define MAP_ROUTE119 (34 | (0 << 8)) +#define MAP_ROUTE120 (35 | (0 << 8)) +#define MAP_ROUTE121 (36 | (0 << 8)) +#define MAP_ROUTE122 (37 | (0 << 8)) +#define MAP_ROUTE123 (38 | (0 << 8)) +#define MAP_ROUTE124 (39 | (0 << 8)) +#define MAP_ROUTE125 (40 | (0 << 8)) +#define MAP_ROUTE126 (41 | (0 << 8)) +#define MAP_ROUTE127 (42 | (0 << 8)) +#define MAP_ROUTE128 (43 | (0 << 8)) +#define MAP_ROUTE129 (44 | (0 << 8)) +#define MAP_ROUTE130 (45 | (0 << 8)) +#define MAP_ROUTE131 (46 | (0 << 8)) +#define MAP_ROUTE132 (47 | (0 << 8)) +#define MAP_ROUTE133 (48 | (0 << 8)) +#define MAP_ROUTE134 (49 | (0 << 8)) +#define MAP_UNDERWATER1 (50 | (0 << 8)) +#define MAP_UNDERWATER2 (51 | (0 << 8)) +#define MAP_UNDERWATER3 (52 | (0 << 8)) +#define MAP_UNDERWATER4 (53 | (0 << 8)) +#define MAP_UNDERWATER5 (54 | (0 << 8)) +#define MAP_UNDERWATER6 (55 | (0 << 8)) +#define MAP_UNDERWATER7 (56 | (0 << 8)) + +// Map Group 1 +#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F (0 | (1 << 8)) +#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F (1 | (1 << 8)) +#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F (2 | (1 << 8)) +#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F (3 | (1 << 8)) +#define MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB (4 | (1 << 8)) + +// Map Group 2 +#define MAP_OLDALE_TOWN_HOUSE1 (0 | (2 << 8)) +#define MAP_OLDALE_TOWN_HOUSE2 (1 | (2 << 8)) +#define MAP_OLDALE_TOWN_POKEMON_CENTER_1F (2 | (2 << 8)) +#define MAP_OLDALE_TOWN_POKEMON_CENTER_2F (3 | (2 << 8)) +#define MAP_OLDALE_TOWN_MART (4 | (2 << 8)) + +// Map Group 3 +#define MAP_DEWFORD_TOWN_HOUSE1 (0 | (3 << 8)) +#define MAP_DEWFORD_TOWN_POKEMON_CENTER_1F (1 | (3 << 8)) +#define MAP_DEWFORD_TOWN_POKEMON_CENTER_2F (2 | (3 << 8)) +#define MAP_DEWFORD_TOWN_GYM (3 | (3 << 8)) +#define MAP_DEWFORD_TOWN_HALL (4 | (3 << 8)) +#define MAP_DEWFORD_TOWN_HOUSE2 (5 | (3 << 8)) + +// Map Group 4 +#define MAP_LAVARIDGE_TOWN_HERB_SHOP (0 | (4 << 8)) +#define MAP_LAVARIDGE_TOWN_GYM_1F (1 | (4 << 8)) +#define MAP_LAVARIDGE_TOWN_GYM_B1F (2 | (4 << 8)) +#define MAP_LAVARIDGE_TOWN_HOUSE (3 | (4 << 8)) +#define MAP_LAVARIDGE_TOWN_MART (4 | (4 << 8)) +#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F (5 | (4 << 8)) +#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F (6 | (4 << 8)) + +// Map Group 5 +#define MAP_FALLARBOR_TOWN_MART (0 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY (1 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR (2 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM (3 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F (4 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F (5 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_HOUSE1 (6 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_HOUSE2 (7 | (5 << 8)) + +// Map Group 6 +#define MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY (0 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR (1 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM (2 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_MART (3 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F (4 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F (5 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_WANDAS_HOUSE (6 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE (7 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_HOUSE (8 | (6 << 8)) + +// Map Group 7 +#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F (0 | (7 << 8)) +#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F (1 | (7 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE1 (2 | (7 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE2 (3 | (7 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE3 (4 | (7 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE4 (5 | (7 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE5 (6 | (7 << 8)) + +// Map Group 8 +#define MAP_PETALBURG_CITY_WALLYS_HOUSE (0 | (8 << 8)) +#define MAP_PETALBURG_CITY_GYM (1 | (8 << 8)) +#define MAP_PETALBURG_CITY_HOUSE1 (2 | (8 << 8)) +#define MAP_PETALBURG_CITY_HOUSE2 (3 | (8 << 8)) +#define MAP_PETALBURG_CITY_POKEMON_CENTER_1F (4 | (8 << 8)) +#define MAP_PETALBURG_CITY_POKEMON_CENTER_2F (5 | (8 << 8)) +#define MAP_PETALBURG_CITY_MART (6 | (8 << 8)) + +// Map Group 9 +#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F (0 | (9 << 8)) +#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F (1 | (9 << 8)) +#define MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY (2 | (9 << 8)) +#define MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR (3 | (9 << 8)) +#define MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM (4 | (9 << 8)) +#define MAP_SLATEPORT_CITY_HOUSE1 (5 | (9 << 8)) +#define MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB (6 | (9 << 8)) +#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F (7 | (9 << 8)) +#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F (8 | (9 << 8)) +#define MAP_SLATEPORT_CITY_HARBOR (9 | (9 << 8)) +#define MAP_SLATEPORT_CITY_HOUSE2 (10 | (9 << 8)) +#define MAP_SLATEPORT_CITY_POKEMON_CENTER_1F (11 | (9 << 8)) +#define MAP_SLATEPORT_CITY_POKEMON_CENTER_2F (12 | (9 << 8)) +#define MAP_SLATEPORT_CITY_MART (13 | (9 << 8)) + +// Map Group 10 +#define MAP_MAUVILLE_CITY_GYM (0 | (10 << 8)) +#define MAP_MAUVILLE_CITY_BIKE_SHOP (1 | (10 << 8)) +#define MAP_MAUVILLE_CITY_HOUSE1 (2 | (10 << 8)) +#define MAP_MAUVILLE_CITY_GAME_CORNER (3 | (10 << 8)) +#define MAP_MAUVILLE_CITY_HOUSE2 (4 | (10 << 8)) +#define MAP_MAUVILLE_CITY_POKEMON_CENTER_1F (5 | (10 << 8)) +#define MAP_MAUVILLE_CITY_POKEMON_CENTER_2F (6 | (10 << 8)) +#define MAP_MAUVILLE_CITY_MART (7 | (10 << 8)) + +// Map Group 11 +#define MAP_RUSTBORO_CITY_DEVON_CORP_1F (0 | (11 << 8)) +#define MAP_RUSTBORO_CITY_DEVON_CORP_2F (1 | (11 << 8)) +#define MAP_RUSTBORO_CITY_DEVON_CORP_3F (2 | (11 << 8)) +#define MAP_RUSTBORO_CITY_GYM (3 | (11 << 8)) +#define MAP_RUSTBORO_CITY_POKEMON_SCHOOL (4 | (11 << 8)) +#define MAP_RUSTBORO_CITY_POKEMON_CENTER_1F (5 | (11 << 8)) +#define MAP_RUSTBORO_CITY_POKEMON_CENTER_2F (6 | (11 << 8)) +#define MAP_RUSTBORO_CITY_MART (7 | (11 << 8)) +#define MAP_RUSTBORO_CITY_FLAT1_1F (8 | (11 << 8)) +#define MAP_RUSTBORO_CITY_FLAT1_2F (9 | (11 << 8)) +#define MAP_RUSTBORO_CITY_HOUSE1 (10 | (11 << 8)) +#define MAP_RUSTBORO_CITY_CUTTERS_HOUSE (11 | (11 << 8)) +#define MAP_RUSTBORO_CITY_HOUSE2 (12 | (11 << 8)) +#define MAP_RUSTBORO_CITY_FLAT2_1F (13 | (11 << 8)) +#define MAP_RUSTBORO_CITY_FLAT2_2F (14 | (11 << 8)) +#define MAP_RUSTBORO_CITY_FLAT2_3F (15 | (11 << 8)) +#define MAP_RUSTBORO_CITY_HOUSE3 (16 | (11 << 8)) + +// Map Group 12 +#define MAP_FORTREE_CITY_HOUSE1 (0 | (12 << 8)) +#define MAP_FORTREE_CITY_GYM (1 | (12 << 8)) +#define MAP_FORTREE_CITY_POKEMON_CENTER_1F (2 | (12 << 8)) +#define MAP_FORTREE_CITY_POKEMON_CENTER_2F (3 | (12 << 8)) +#define MAP_FORTREE_CITY_MART (4 | (12 << 8)) +#define MAP_FORTREE_CITY_HOUSE2 (5 | (12 << 8)) +#define MAP_FORTREE_CITY_HOUSE3 (6 | (12 << 8)) +#define MAP_FORTREE_CITY_HOUSE4 (7 | (12 << 8)) +#define MAP_FORTREE_CITY_HOUSE5 (8 | (12 << 8)) +#define MAP_FORTREE_CITY_DECORATION_SHOP (9 | (12 << 8)) + +// Map Group 13 +#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F (0 | (13 << 8)) +#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F (1 | (13 << 8)) +#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F (2 | (13 << 8)) +#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F (3 | (13 << 8)) +#define MAP_LILYCOVE_CITY_CONTEST_LOBBY (4 | (13 << 8)) +#define MAP_LILYCOVE_CITY_CONTEST_HALL (5 | (13 << 8)) +#define MAP_LILYCOVE_CITY_POKEMON_CENTER_1F (6 | (13 << 8)) +#define MAP_LILYCOVE_CITY_POKEMON_CENTER_2F (7 | (13 << 8)) +#define MAP_LILYCOVE_CITY_UNUSED_MART (8 | (13 << 8)) +#define MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (13 << 8)) +#define MAP_LILYCOVE_CITY_HARBOR (10 | (13 << 8)) +#define MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE (11 | (13 << 8)) +#define MAP_LILYCOVE_CITY_HOUSE1 (12 | (13 << 8)) +#define MAP_LILYCOVE_CITY_HOUSE2 (13 | (13 << 8)) +#define MAP_LILYCOVE_CITY_HOUSE3 (14 | (13 << 8)) +#define MAP_LILYCOVE_CITY_HOUSE4 (15 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F (16 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F (17 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F (18 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F (19 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F (20 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP (21 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR (22 | (13 << 8)) + +// Map Group 14 +#define MAP_MOSSDEEP_CITY_GYM (0 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_HOUSE1 (1 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_HOUSE2 (2 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F (3 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F (4 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_MART (5 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_HOUSE3 (6 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_STEVENS_HOUSE (7 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_HOUSE4 (8 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_SPACE_CENTER_1F (9 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_SPACE_CENTER_2F (10 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_GAME_CORNER_1F (11 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_GAME_CORNER_B1F (12 | (14 << 8)) + +// Map Group 15 +#define MAP_SOOTOPOLIS_CITY_GYM_1F (0 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_GYM_B1F (1 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F (2 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F (3 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_MART (4 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE1 (5 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE2 (6 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE3 (7 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE4 (8 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE5 (9 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE6 (10 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE7 (11 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE (12 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F (13 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F (14 | (15 << 8)) + +// Map Group 16 +#define MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM (0 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_PHOEBES_ROOM (1 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_GLACIAS_ROOM (2 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_DRAKES_ROOM (3 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM (4 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL1 (5 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL2 (6 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL3 (7 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL4 (8 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL5 (9 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F (10 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL_OF_FAME (11 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F (12 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F (13 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F (14 | (16 << 8)) + +// Map Group 17 +#define MAP_ROUTE104_MR_BRINEYS_HOUSE (0 | (17 << 8)) +#define MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP (1 | (17 << 8)) + +// Map Group 18 +#define MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE (0 | (18 << 8)) +#define MAP_ROUTE111_OLD_LADYS_REST_STOP (1 | (18 << 8)) + +// Map Group 19 +#define MAP_ROUTE112_CABLE_CAR_STATION (0 | (19 << 8)) +#define MAP_MT_CHIMNEY_CABLE_CAR_STATION (1 | (19 << 8)) + +// Map Group 20 +#define MAP_ROUTE114_FOSSIL_MANIACS_HOUSE (0 | (20 << 8)) +#define MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL (1 | (20 << 8)) +#define MAP_ROUTE114_LANETTES_HOUSE (2 | (20 << 8)) + +// Map Group 21 +#define MAP_ROUTE116_TUNNELERS_REST_HOUSE (0 | (21 << 8)) + +// Map Group 22 +#define MAP_ROUTE117_POKEMON_DAY_CARE (0 | (22 << 8)) + +// Map Group 23 +#define MAP_ROUTE121_SAFARI_ZONE_ENTRANCE (0 | (23 << 8)) + +// Map Group 24 +#define MAP_METEOR_FALLS_1F_1R (0 | (24 << 8)) +#define MAP_METEOR_FALLS_1F_2R (1 | (24 << 8)) +#define MAP_METEOR_FALLS_B1F_1R (2 | (24 << 8)) +#define MAP_METEOR_FALLS_B1F_2R (3 | (24 << 8)) +#define MAP_RUSTURF_TUNNEL (4 | (24 << 8)) +#define MAP_UNDERWATER_SOOTOPOLIS_CITY (5 | (24 << 8)) +#define MAP_DESERT_RUINS (6 | (24 << 8)) +#define MAP_GRANITE_CAVE_1F (7 | (24 << 8)) +#define MAP_GRANITE_CAVE_B1F (8 | (24 << 8)) +#define MAP_GRANITE_CAVE_B2F (9 | (24 << 8)) +#define MAP_GRANITE_CAVE_STEVENS_ROOM (10 | (24 << 8)) +#define MAP_PETALBURG_WOODS (11 | (24 << 8)) +#define MAP_MT_CHIMNEY (12 | (24 << 8)) +#define MAP_JAGGED_PASS (13 | (24 << 8)) +#define MAP_FIERY_PATH (14 | (24 << 8)) +#define MAP_MT_PYRE_1F (15 | (24 << 8)) +#define MAP_MT_PYRE_2F (16 | (24 << 8)) +#define MAP_MT_PYRE_3F (17 | (24 << 8)) +#define MAP_MT_PYRE_4F (18 | (24 << 8)) +#define MAP_MT_PYRE_5F (19 | (24 << 8)) +#define MAP_MT_PYRE_6F (20 | (24 << 8)) +#define MAP_MT_PYRE_EXTERIOR (21 | (24 << 8)) +#define MAP_MT_PYRE_SUMMIT (22 | (24 << 8)) +#define MAP_AQUA_HIDEOUT_1F (23 | (24 << 8)) +#define MAP_AQUA_HIDEOUT_B1F (24 | (24 << 8)) +#define MAP_AQUA_HIDEOUT_B2F (25 | (24 << 8)) +#define MAP_UNDERWATER_SEAFLOOR_CAVERN (26 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ENTRANCE (27 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM1 (28 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM2 (29 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM3 (30 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM4 (31 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM5 (32 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM6 (33 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM7 (34 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM8 (35 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM9 (36 | (24 << 8)) +#define MAP_CAVE_OF_ORIGIN_ENTRANCE (37 | (24 << 8)) +#define MAP_CAVE_OF_ORIGIN_1F (38 | (24 << 8)) +#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 (39 | (24 << 8)) +#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 (40 | (24 << 8)) +#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 (41 | (24 << 8)) +#define MAP_CAVE_OF_ORIGIN_B1F (42 | (24 << 8)) +#define MAP_VICTORY_ROAD_1F (43 | (24 << 8)) +#define MAP_VICTORY_ROAD_B1F (44 | (24 << 8)) +#define MAP_VICTORY_ROAD_B2F (45 | (24 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM (46 | (24 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM (47 | (24 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM (48 | (24 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM (49 | (24 << 8)) +#define MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM (50 | (24 << 8)) +#define MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM (51 | (24 << 8)) +#define MAP_NEW_MAUVILLE_ENTRANCE (52 | (24 << 8)) +#define MAP_NEW_MAUVILLE_INSIDE (53 | (24 << 8)) +#define MAP_ABANDONED_SHIP_DECK (54 | (24 << 8)) +#define MAP_ABANDONED_SHIP_CORRIDORS_1F (55 | (24 << 8)) +#define MAP_ABANDONED_SHIP_ROOMS_1F (56 | (24 << 8)) +#define MAP_ABANDONED_SHIP_CORRIDORS_B1F (57 | (24 << 8)) +#define MAP_ABANDONED_SHIP_ROOMS_B1F (58 | (24 << 8)) +#define MAP_ABANDONED_SHIP_ROOMS2_B1F (59 | (24 << 8)) +#define MAP_ABANDONED_SHIP_UNDERWATER1 (60 | (24 << 8)) +#define MAP_ABANDONED_SHIP_ROOM_B1F (61 | (24 << 8)) +#define MAP_ABANDONED_SHIP_ROOMS2_1F (62 | (24 << 8)) +#define MAP_ABANDONED_SHIP_CAPTAINS_OFFICE (63 | (24 << 8)) +#define MAP_ABANDONED_SHIP_UNDERWATER2 (64 | (24 << 8)) +#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS (65 | (24 << 8)) +#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS (66 | (24 << 8)) +#define MAP_ISLAND_CAVE (67 | (24 << 8)) +#define MAP_ANCIENT_TOMB (68 | (24 << 8)) +#define MAP_UNDERWATER_ROUTE134 (69 | (24 << 8)) +#define MAP_UNDERWATER_SEALED_CHAMBER (70 | (24 << 8)) +#define MAP_SEALED_CHAMBER_OUTER_ROOM (71 | (24 << 8)) +#define MAP_SEALED_CHAMBER_INNER_ROOM (72 | (24 << 8)) +#define MAP_SCORCHED_SLAB (73 | (24 << 8)) +#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 (74 | (24 << 8)) +#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 (75 | (24 << 8)) +#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 (76 | (24 << 8)) +#define MAP_SKY_PILLAR_ENTRANCE (77 | (24 << 8)) +#define MAP_SKY_PILLAR_OUTSIDE (78 | (24 << 8)) +#define MAP_SKY_PILLAR_1F (79 | (24 << 8)) +#define MAP_SKY_PILLAR_2F (80 | (24 << 8)) +#define MAP_SKY_PILLAR_3F (81 | (24 << 8)) +#define MAP_SKY_PILLAR_4F (82 | (24 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM (83 | (24 << 8)) +#define MAP_SKY_PILLAR_5F (84 | (24 << 8)) +#define MAP_SKY_PILLAR_TOP (85 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_1F (86 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_2F_1R (87 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_2F_2R (88 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_3F_1R (89 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_3F_2R (90 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_4F (91 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_3F_3R (92 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_2F_3R (93 | (24 << 8)) +#define MAP_MIRAGE_TOWER_1F (94 | (24 << 8)) +#define MAP_MIRAGE_TOWER_2F (95 | (24 << 8)) +#define MAP_MIRAGE_TOWER_3F (96 | (24 << 8)) +#define MAP_MIRAGE_TOWER_4F (97 | (24 << 8)) +#define MAP_DESERT_UNDERPASS (98 | (24 << 8)) +#define MAP_ARTISAN_CAVE_B1F (99 | (24 << 8)) +#define MAP_ARTISAN_CAVE_1F (100 | (24 << 8)) +#define MAP_UNDERWATER_MARINE_CAVE (101 | (24 << 8)) +#define MAP_MARINE_CAVE_ENTRANCE (102 | (24 << 8)) +#define MAP_MARINE_CAVE_END (103 | (24 << 8)) +#define MAP_TERRA_CAVE_ENTRANCE (104 | (24 << 8)) +#define MAP_TERRA_CAVE_END (105 | (24 << 8)) +#define MAP_ALTERING_CAVE (106 | (24 << 8)) +#define MAP_METEOR_FALLS_STEVENS_CAVE (107 | (24 << 8)) + +// Map Group 25 +#define MAP_SECRET_BASE_RED_CAVE1 (0 | (25 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE1 (1 | (25 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE1 (2 | (25 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (25 << 8)) +#define MAP_SECRET_BASE_TREE1 (4 | (25 << 8)) +#define MAP_SECRET_BASE_SHRUB1 (5 | (25 << 8)) +#define MAP_SECRET_BASE_RED_CAVE2 (6 | (25 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE2 (7 | (25 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE2 (8 | (25 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (25 << 8)) +#define MAP_SECRET_BASE_TREE2 (10 | (25 << 8)) +#define MAP_SECRET_BASE_SHRUB2 (11 | (25 << 8)) +#define MAP_SECRET_BASE_RED_CAVE3 (12 | (25 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE3 (13 | (25 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE3 (14 | (25 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (25 << 8)) +#define MAP_SECRET_BASE_TREE3 (16 | (25 << 8)) +#define MAP_SECRET_BASE_SHRUB3 (17 | (25 << 8)) +#define MAP_SECRET_BASE_RED_CAVE4 (18 | (25 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE4 (19 | (25 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE4 (20 | (25 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8)) +#define MAP_SECRET_BASE_TREE4 (22 | (25 << 8)) +#define MAP_SECRET_BASE_SHRUB4 (23 | (25 << 8)) +#define MAP_SINGLE_BATTLE_COLOSSEUM (24 | (25 << 8)) +#define MAP_TRADE_CENTER (25 | (25 << 8)) +#define MAP_RECORD_CORNER (26 | (25 << 8)) +#define MAP_DOUBLE_BATTLE_COLOSSEUM (27 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM1 (28 | (25 << 8)) +#define MAP_UNKNOWN_MAP_25_29 (29 | (25 << 8)) +#define MAP_UNKNOWN_MAP_25_30 (30 | (25 << 8)) +#define MAP_UNKNOWN_MAP_25_31 (31 | (25 << 8)) +#define MAP_UNKNOWN_MAP_25_32 (32 | (25 << 8)) +#define MAP_UNKNOWN_MAP_25_33 (33 | (25 << 8)) +#define MAP_UNKNOWN_MAP_25_34 (34 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM2 (35 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM3 (36 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM4 (37 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM5 (38 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM6 (39 | (25 << 8)) +#define MAP_INSIDE_OF_TRUCK (40 | (25 << 8)) +#define MAP_SS_TIDAL_CORRIDOR (41 | (25 << 8)) +#define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8)) +#define MAP_SS_TIDAL_ROOMS (43 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE01 (44 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE02 (45 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE03 (46 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE04 (47 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE05 (48 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE06 (49 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE07 (50 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE08 (51 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE09 (52 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE10 (53 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE11 (54 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE12 (55 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE13 (56 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE14 (57 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE15 (58 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE16 (59 | (25 << 8)) +#define MAP_UNION_ROOM (60 | (25 << 8)) + +// Map Group 26 +#define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8)) +#define MAP_SAFARI_ZONE_NORTH (1 | (26 << 8)) +#define MAP_SAFARI_ZONE_SOUTHWEST (2 | (26 << 8)) +#define MAP_SAFARI_ZONE_SOUTH (3 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_OUTSIDE_WEST (4 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY (5 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR (6 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR (7 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM (8 | (26 << 8)) +#define MAP_SOUTHERN_ISLAND_EXTERIOR (9 | (26 << 8)) +#define MAP_SOUTHERN_ISLAND_INTERIOR (10 | (26 << 8)) +#define MAP_SAFARI_ZONE_REST_HOUSE (11 | (26 << 8)) +#define MAP_SAFARI_ZONE_NORTHEAST (12 | (26 << 8)) +#define MAP_SAFARI_ZONE_SOUTHEAST (13 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_OUTSIDE_EAST (14 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM (15 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 (16 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 (17 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY (18 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR (19 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM (20 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM (21 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY (22 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR (23 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM (24 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY (25 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE (26 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP (27 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY (28 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR (29 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM (30 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY (31 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM (32 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM (33 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY (34 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR (35 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM (36 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 (37 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 (38 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 (39 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_RANKING_HALL (40 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE1 (41 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER (42 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE2 (43 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE3 (44 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE4 (45 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE (46 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE5 (47 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE6 (48 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE7 (49 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_RECEPTION_GATE (50 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE8 (51 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE9 (52 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F (53 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F (54 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_MART (55 | (26 << 8)) +#define MAP_FARAWAY_ISLAND_ENTRANCE (56 | (26 << 8)) +#define MAP_FARAWAY_ISLAND_INTERIOR (57 | (26 << 8)) +#define MAP_BIRTH_ISLAND_EXTERIOR (58 | (26 << 8)) +#define MAP_BIRTH_ISLAND_HARBOR (59 | (26 << 8)) +#define MAP_TRAINER_HILL_ENTRANCE (60 | (26 << 8)) +#define MAP_TRAINER_HILL_1F (61 | (26 << 8)) +#define MAP_TRAINER_HILL_2F (62 | (26 << 8)) +#define MAP_TRAINER_HILL_3F (63 | (26 << 8)) +#define MAP_TRAINER_HILL_4F (64 | (26 << 8)) +#define MAP_TRAINER_HILL_ROOF (65 | (26 << 8)) +#define MAP_NAVEL_ROCK_EXTERIOR (66 | (26 << 8)) +#define MAP_NAVEL_ROCK_HARBOR (67 | (26 << 8)) +#define MAP_NAVEL_ROCK_ENTRANCE (68 | (26 << 8)) +#define MAP_NAVEL_ROCK_B1F (69 | (26 << 8)) +#define MAP_NAVEL_ROCK_FORK (70 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP1 (71 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP2 (72 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP3 (73 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP4 (74 | (26 << 8)) +#define MAP_NAVEL_ROCK_TOP (75 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN01 (76 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN02 (77 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN03 (78 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN04 (79 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN05 (80 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN06 (81 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN07 (82 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN08 (83 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN09 (84 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN10 (85 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN11 (86 | (26 << 8)) +#define MAP_NAVEL_ROCK_BOTTOM (87 | (26 << 8)) +#define MAP_TRAINER_HILL_ELEVATOR (88 | (26 << 8)) + +// Map Group 27 +#define MAP_ROUTE104_PROTOTYPE (0 | (27 << 8)) +#define MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP (1 | (27 << 8)) + +// Map Group 28 +#define MAP_ROUTE109_SEASHORE_HOUSE (0 | (28 << 8)) + +// Map Group 29 +#define MAP_ROUTE110_TRICK_HOUSE_ENTRANCE (0 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_END (1 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_CORRIDOR (2 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 (3 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE2 (4 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE3 (5 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE4 (6 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE5 (7 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE6 (8 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 (9 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE8 (10 | (29 << 8)) +#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (11 | (29 << 8)) +#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (12 | (29 << 8)) + +// Map Group 30 +#define MAP_ROUTE113_GLASS_WORKSHOP (0 | (30 << 8)) + +// Map Group 31 +#define MAP_ROUTE123_BERRY_MASTERS_HOUSE (0 | (31 << 8)) + +// Map Group 32 +#define MAP_ROUTE119_WEATHER_INSTITUTE_1F (0 | (32 << 8)) +#define MAP_ROUTE119_WEATHER_INSTITUTE_2F (1 | (32 << 8)) +#define MAP_ROUTE119_HOUSE (2 | (32 << 8)) + +// Map Group 33 +#define MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE (0 | (33 << 8)) + +#define MAP_GROUPS_COUNT 34 + +#endif // GUARD_CONSTANTS_MAP_GROUPS_H diff --git a/include/constants/maps.h b/include/constants/maps.h index c65f373afd..e1e2da9923 100644 --- a/include/constants/maps.h +++ b/include/constants/maps.h @@ -1,598 +1,11 @@ #ifndef GUARD_CONSTANTS_MAPS_H #define GUARD_CONSTANTS_MAPS_H -// Map Group 0 -#define MAP_PETALBURG_CITY (0 | (0 << 8)) -#define MAP_SLATEPORT_CITY (1 | (0 << 8)) -#define MAP_MAUVILLE_CITY (2 | (0 << 8)) -#define MAP_RUSTBORO_CITY (3 | (0 << 8)) -#define MAP_FORTREE_CITY (4 | (0 << 8)) -#define MAP_LILYCOVE_CITY (5 | (0 << 8)) -#define MAP_MOSSDEEP_CITY (6 | (0 << 8)) -#define MAP_SOOTOPOLIS_CITY (7 | (0 << 8)) -#define MAP_EVER_GRANDE_CITY (8 | (0 << 8)) -#define MAP_LITTLEROOT_TOWN (9 | (0 << 8)) -#define MAP_OLDALE_TOWN (10 | (0 << 8)) -#define MAP_DEWFORD_TOWN (11 | (0 << 8)) -#define MAP_LAVARIDGE_TOWN (12 | (0 << 8)) -#define MAP_FALLARBOR_TOWN (13 | (0 << 8)) -#define MAP_VERDANTURF_TOWN (14 | (0 << 8)) -#define MAP_PACIFIDLOG_TOWN (15 | (0 << 8)) -#define MAP_ROUTE101 (16 | (0 << 8)) -#define MAP_ROUTE102 (17 | (0 << 8)) -#define MAP_ROUTE103 (18 | (0 << 8)) -#define MAP_ROUTE104 (19 | (0 << 8)) -#define MAP_ROUTE105 (20 | (0 << 8)) -#define MAP_ROUTE106 (21 | (0 << 8)) -#define MAP_ROUTE107 (22 | (0 << 8)) -#define MAP_ROUTE108 (23 | (0 << 8)) -#define MAP_ROUTE109 (24 | (0 << 8)) -#define MAP_ROUTE110 (25 | (0 << 8)) -#define MAP_ROUTE111 (26 | (0 << 8)) -#define MAP_ROUTE112 (27 | (0 << 8)) -#define MAP_ROUTE113 (28 | (0 << 8)) -#define MAP_ROUTE114 (29 | (0 << 8)) -#define MAP_ROUTE115 (30 | (0 << 8)) -#define MAP_ROUTE116 (31 | (0 << 8)) -#define MAP_ROUTE117 (32 | (0 << 8)) -#define MAP_ROUTE118 (33 | (0 << 8)) -#define MAP_ROUTE119 (34 | (0 << 8)) -#define MAP_ROUTE120 (35 | (0 << 8)) -#define MAP_ROUTE121 (36 | (0 << 8)) -#define MAP_ROUTE122 (37 | (0 << 8)) -#define MAP_ROUTE123 (38 | (0 << 8)) -#define MAP_ROUTE124 (39 | (0 << 8)) -#define MAP_ROUTE125 (40 | (0 << 8)) -#define MAP_ROUTE126 (41 | (0 << 8)) -#define MAP_ROUTE127 (42 | (0 << 8)) -#define MAP_ROUTE128 (43 | (0 << 8)) -#define MAP_ROUTE129 (44 | (0 << 8)) -#define MAP_ROUTE130 (45 | (0 << 8)) -#define MAP_ROUTE131 (46 | (0 << 8)) -#define MAP_ROUTE132 (47 | (0 << 8)) -#define MAP_ROUTE133 (48 | (0 << 8)) -#define MAP_ROUTE134 (49 | (0 << 8)) -#define MAP_UNDERWATER1 (50 | (0 << 8)) -#define MAP_UNDERWATER2 (51 | (0 << 8)) -#define MAP_UNDERWATER3 (52 | (0 << 8)) -#define MAP_UNDERWATER4 (53 | (0 << 8)) -#define MAP_UNDERWATER5 (54 | (0 << 8)) -#define MAP_UNDERWATER6 (55 | (0 << 8)) -#define MAP_UNDERWATER7 (56 | (0 << 8)) - -// Map Group 1 -#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F (0 | (1 << 8)) -#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F (1 | (1 << 8)) -#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F (2 | (1 << 8)) -#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F (3 | (1 << 8)) -#define MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB (4 | (1 << 8)) - -// Map Group 2 -#define MAP_OLDALE_TOWN_HOUSE1 (0 | (2 << 8)) -#define MAP_OLDALE_TOWN_HOUSE2 (1 | (2 << 8)) -#define MAP_OLDALE_TOWN_POKEMON_CENTER_1F (2 | (2 << 8)) -#define MAP_OLDALE_TOWN_POKEMON_CENTER_2F (3 | (2 << 8)) -#define MAP_OLDALE_TOWN_MART (4 | (2 << 8)) - -// Map Group 3 -#define MAP_DEWFORD_TOWN_HOUSE1 (0 | (3 << 8)) -#define MAP_DEWFORD_TOWN_POKEMON_CENTER_1F (1 | (3 << 8)) -#define MAP_DEWFORD_TOWN_POKEMON_CENTER_2F (2 | (3 << 8)) -#define MAP_DEWFORD_TOWN_GYM (3 | (3 << 8)) -#define MAP_DEWFORD_TOWN_HALL (4 | (3 << 8)) -#define MAP_DEWFORD_TOWN_HOUSE2 (5 | (3 << 8)) - -// Map Group 4 -#define MAP_LAVARIDGE_TOWN_HERB_SHOP (0 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_GYM_1F (1 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_GYM_B1F (2 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_HOUSE (3 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_MART (4 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F (5 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F (6 | (4 << 8)) - -// Map Group 5 -#define MAP_FALLARBOR_TOWN_MART (0 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY (1 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR (2 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM (3 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F (4 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F (5 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_HOUSE1 (6 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_HOUSE2 (7 | (5 << 8)) - -// Map Group 6 -#define MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY (0 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR (1 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM (2 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_MART (3 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F (4 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F (5 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_WANDAS_HOUSE (6 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE (7 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_HOUSE (8 | (6 << 8)) - -// Map Group 7 -#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F (0 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F (1 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE1 (2 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE2 (3 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE3 (4 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE4 (5 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE5 (6 | (7 << 8)) - -// Map Group 8 -#define MAP_PETALBURG_CITY_WALLYS_HOUSE (0 | (8 << 8)) -#define MAP_PETALBURG_CITY_GYM (1 | (8 << 8)) -#define MAP_PETALBURG_CITY_HOUSE1 (2 | (8 << 8)) -#define MAP_PETALBURG_CITY_HOUSE2 (3 | (8 << 8)) -#define MAP_PETALBURG_CITY_POKEMON_CENTER_1F (4 | (8 << 8)) -#define MAP_PETALBURG_CITY_POKEMON_CENTER_2F (5 | (8 << 8)) -#define MAP_PETALBURG_CITY_MART (6 | (8 << 8)) - -// Map Group 9 -#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F (0 | (9 << 8)) -#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F (1 | (9 << 8)) -#define MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY (2 | (9 << 8)) -#define MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR (3 | (9 << 8)) -#define MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM (4 | (9 << 8)) -#define MAP_SLATEPORT_CITY_HOUSE1 (5 | (9 << 8)) -#define MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB (6 | (9 << 8)) -#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F (7 | (9 << 8)) -#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F (8 | (9 << 8)) -#define MAP_SLATEPORT_CITY_HARBOR (9 | (9 << 8)) -#define MAP_SLATEPORT_CITY_HOUSE2 (10 | (9 << 8)) -#define MAP_SLATEPORT_CITY_POKEMON_CENTER_1F (11 | (9 << 8)) -#define MAP_SLATEPORT_CITY_POKEMON_CENTER_2F (12 | (9 << 8)) -#define MAP_SLATEPORT_CITY_MART (13 | (9 << 8)) - -// Map Group 10 -#define MAP_MAUVILLE_CITY_GYM (0 | (10 << 8)) -#define MAP_MAUVILLE_CITY_BIKE_SHOP (1 | (10 << 8)) -#define MAP_MAUVILLE_CITY_HOUSE1 (2 | (10 << 8)) -#define MAP_MAUVILLE_CITY_GAME_CORNER (3 | (10 << 8)) -#define MAP_MAUVILLE_CITY_HOUSE2 (4 | (10 << 8)) -#define MAP_MAUVILLE_CITY_POKEMON_CENTER_1F (5 | (10 << 8)) -#define MAP_MAUVILLE_CITY_POKEMON_CENTER_2F (6 | (10 << 8)) -#define MAP_MAUVILLE_CITY_MART (7 | (10 << 8)) - -// Map Group 11 -#define MAP_RUSTBORO_CITY_DEVON_CORP_1F (0 | (11 << 8)) -#define MAP_RUSTBORO_CITY_DEVON_CORP_2F (1 | (11 << 8)) -#define MAP_RUSTBORO_CITY_DEVON_CORP_3F (2 | (11 << 8)) -#define MAP_RUSTBORO_CITY_GYM (3 | (11 << 8)) -#define MAP_RUSTBORO_CITY_POKEMON_SCHOOL (4 | (11 << 8)) -#define MAP_RUSTBORO_CITY_POKEMON_CENTER_1F (5 | (11 << 8)) -#define MAP_RUSTBORO_CITY_POKEMON_CENTER_2F (6 | (11 << 8)) -#define MAP_RUSTBORO_CITY_MART (7 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT1_1F (8 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT1_2F (9 | (11 << 8)) -#define MAP_RUSTBORO_CITY_HOUSE1 (10 | (11 << 8)) -#define MAP_RUSTBORO_CITY_CUTTERS_HOUSE (11 | (11 << 8)) -#define MAP_RUSTBORO_CITY_HOUSE2 (12 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT2_1F (13 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT2_2F (14 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT2_3F (15 | (11 << 8)) -#define MAP_RUSTBORO_CITY_HOUSE3 (16 | (11 << 8)) - -// Map Group 12 -#define MAP_FORTREE_CITY_HOUSE1 (0 | (12 << 8)) -#define MAP_FORTREE_CITY_GYM (1 | (12 << 8)) -#define MAP_FORTREE_CITY_POKEMON_CENTER_1F (2 | (12 << 8)) -#define MAP_FORTREE_CITY_POKEMON_CENTER_2F (3 | (12 << 8)) -#define MAP_FORTREE_CITY_MART (4 | (12 << 8)) -#define MAP_FORTREE_CITY_HOUSE2 (5 | (12 << 8)) -#define MAP_FORTREE_CITY_HOUSE3 (6 | (12 << 8)) -#define MAP_FORTREE_CITY_HOUSE4 (7 | (12 << 8)) -#define MAP_FORTREE_CITY_HOUSE5 (8 | (12 << 8)) -#define MAP_FORTREE_CITY_DECORATION_SHOP (9 | (12 << 8)) - -// Map Group 13 -#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F (0 | (13 << 8)) -#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F (1 | (13 << 8)) -#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F (2 | (13 << 8)) -#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F (3 | (13 << 8)) -#define MAP_LILYCOVE_CITY_CONTEST_LOBBY (4 | (13 << 8)) -#define MAP_LILYCOVE_CITY_CONTEST_HALL (5 | (13 << 8)) -#define MAP_LILYCOVE_CITY_POKEMON_CENTER_1F (6 | (13 << 8)) -#define MAP_LILYCOVE_CITY_POKEMON_CENTER_2F (7 | (13 << 8)) -#define MAP_LILYCOVE_CITY_UNUSED_MART (8 | (13 << 8)) -#define MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HARBOR (10 | (13 << 8)) -#define MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE (11 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HOUSE1 (12 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HOUSE2 (13 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HOUSE3 (14 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HOUSE4 (15 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F (16 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F (17 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F (18 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F (19 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F (20 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP (21 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR (22 | (13 << 8)) - -// Map Group 14 -#define MAP_MOSSDEEP_CITY_GYM (0 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_HOUSE1 (1 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_HOUSE2 (2 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F (3 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F (4 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_MART (5 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_HOUSE3 (6 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_STEVENS_HOUSE (7 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_HOUSE4 (8 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_SPACE_CENTER_1F (9 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_SPACE_CENTER_2F (10 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_GAME_CORNER_1F (11 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_GAME_CORNER_B1F (12 | (14 << 8)) - -// Map Group 15 -#define MAP_SOOTOPOLIS_CITY_GYM_1F (0 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_GYM_B1F (1 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F (2 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F (3 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_MART (4 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE1 (5 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE2 (6 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE3 (7 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE4 (8 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE5 (9 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE6 (10 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE7 (11 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE (12 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F (13 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F (14 | (15 << 8)) - -// Map Group 16 -#define MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM (0 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_PHOEBES_ROOM (1 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_GLACIAS_ROOM (2 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_DRAKES_ROOM (3 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM (4 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_HALL1 (5 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_HALL2 (6 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_HALL3 (7 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_HALL4 (8 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_HALL5 (9 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F (10 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_HALL_OF_FAME (11 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F (12 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F (13 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F (14 | (16 << 8)) - -// Map Group 17 -#define MAP_ROUTE104_MR_BRINEYS_HOUSE (0 | (17 << 8)) -#define MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP (1 | (17 << 8)) - -// Map Group 18 -#define MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE (0 | (18 << 8)) -#define MAP_ROUTE111_OLD_LADYS_REST_STOP (1 | (18 << 8)) - -// Map Group 19 -#define MAP_ROUTE112_CABLE_CAR_STATION (0 | (19 << 8)) -#define MAP_MT_CHIMNEY_CABLE_CAR_STATION (1 | (19 << 8)) - -// Map Group 20 -#define MAP_ROUTE114_FOSSIL_MANIACS_HOUSE (0 | (20 << 8)) -#define MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL (1 | (20 << 8)) -#define MAP_ROUTE114_LANETTES_HOUSE (2 | (20 << 8)) - -// Map Group 21 -#define MAP_ROUTE116_TUNNELERS_REST_HOUSE (0 | (21 << 8)) - -// Map Group 22 -#define MAP_ROUTE117_POKEMON_DAY_CARE (0 | (22 << 8)) - -// Map Group 23 -#define MAP_ROUTE121_SAFARI_ZONE_ENTRANCE (0 | (23 << 8)) - -// Map Group 24 -#define MAP_METEOR_FALLS_1F_1R (0 | (24 << 8)) -#define MAP_METEOR_FALLS_1F_2R (1 | (24 << 8)) -#define MAP_METEOR_FALLS_B1F_1R (2 | (24 << 8)) -#define MAP_METEOR_FALLS_B1F_2R (3 | (24 << 8)) -#define MAP_RUSTURF_TUNNEL (4 | (24 << 8)) -#define MAP_UNDERWATER_SOOTOPOLIS_CITY (5 | (24 << 8)) -#define MAP_DESERT_RUINS (6 | (24 << 8)) -#define MAP_GRANITE_CAVE_1F (7 | (24 << 8)) -#define MAP_GRANITE_CAVE_B1F (8 | (24 << 8)) -#define MAP_GRANITE_CAVE_B2F (9 | (24 << 8)) -#define MAP_GRANITE_CAVE_STEVENS_ROOM (10 | (24 << 8)) -#define MAP_PETALBURG_WOODS (11 | (24 << 8)) -#define MAP_MT_CHIMNEY (12 | (24 << 8)) -#define MAP_JAGGED_PASS (13 | (24 << 8)) -#define MAP_FIERY_PATH (14 | (24 << 8)) -#define MAP_MT_PYRE_1F (15 | (24 << 8)) -#define MAP_MT_PYRE_2F (16 | (24 << 8)) -#define MAP_MT_PYRE_3F (17 | (24 << 8)) -#define MAP_MT_PYRE_4F (18 | (24 << 8)) -#define MAP_MT_PYRE_5F (19 | (24 << 8)) -#define MAP_MT_PYRE_6F (20 | (24 << 8)) -#define MAP_MT_PYRE_EXTERIOR (21 | (24 << 8)) -#define MAP_MT_PYRE_SUMMIT (22 | (24 << 8)) -#define MAP_AQUA_HIDEOUT_1F (23 | (24 << 8)) -#define MAP_AQUA_HIDEOUT_B1F (24 | (24 << 8)) -#define MAP_AQUA_HIDEOUT_B2F (25 | (24 << 8)) -#define MAP_UNDERWATER_SEAFLOOR_CAVERN (26 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ENTRANCE (27 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM1 (28 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM2 (29 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM3 (30 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM4 (31 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM5 (32 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM6 (33 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM7 (34 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM8 (35 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM9 (36 | (24 << 8)) -#define MAP_CAVE_OF_ORIGIN_ENTRANCE (37 | (24 << 8)) -#define MAP_CAVE_OF_ORIGIN_1F (38 | (24 << 8)) -#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 (39 | (24 << 8)) // -#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 (40 | (24 << 8)) // Ruby/Sapphire leftovers -#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 (41 | (24 << 8)) // -#define MAP_CAVE_OF_ORIGIN_B1F (42 | (24 << 8)) -#define MAP_VICTORY_ROAD_1F (43 | (24 << 8)) -#define MAP_VICTORY_ROAD_B1F (44 | (24 << 8)) -#define MAP_VICTORY_ROAD_B2F (45 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM (46 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM (47 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM (48 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM (49 | (24 << 8)) -#define MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM (50 | (24 << 8)) -#define MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM (51 | (24 << 8)) -#define MAP_NEW_MAUVILLE_ENTRANCE (52 | (24 << 8)) -#define MAP_NEW_MAUVILLE_INSIDE (53 | (24 << 8)) -#define MAP_ABANDONED_SHIP_DECK (54 | (24 << 8)) -#define MAP_ABANDONED_SHIP_CORRIDORS_1F (55 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOMS_1F (56 | (24 << 8)) -#define MAP_ABANDONED_SHIP_CORRIDORS_B1F (57 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOMS_B1F (58 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOMS2_B1F (59 | (24 << 8)) -#define MAP_ABANDONED_SHIP_UNDERWATER1 (60 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOM_B1F (61 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOMS2_1F (62 | (24 << 8)) -#define MAP_ABANDONED_SHIP_CAPTAINS_OFFICE (63 | (24 << 8)) -#define MAP_ABANDONED_SHIP_UNDERWATER2 (64 | (24 << 8)) -#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS (65 | (24 << 8)) -#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS (66 | (24 << 8)) -#define MAP_ISLAND_CAVE (67 | (24 << 8)) -#define MAP_ANCIENT_TOMB (68 | (24 << 8)) -#define MAP_UNDERWATER_ROUTE134 (69 | (24 << 8)) -#define MAP_UNDERWATER_SEALED_CHAMBER (70 | (24 << 8)) -#define MAP_SEALED_CHAMBER_OUTER_ROOM (71 | (24 << 8)) -#define MAP_SEALED_CHAMBER_INNER_ROOM (72 | (24 << 8)) -#define MAP_SCORCHED_SLAB (73 | (24 << 8)) -#define MAP_UNUSED_RUBY_MAGMA_HIDEOUT_1F (74 | (24 << 8)) // -#define MAP_UNUSED_RUBY_MAGMA_HIDEOUT_B1F (75 | (24 << 8)) // Ruby/Sapphire leftovers -#define MAP_UNUSED_RUBY_MAGMA_HIDEOUT_B2F (76 | (24 << 8)) // -#define MAP_SKY_PILLAR_ENTRANCE (77 | (24 << 8)) -#define MAP_SKY_PILLAR_OUTSIDE (78 | (24 << 8)) -#define MAP_SKY_PILLAR_1F (79 | (24 << 8)) -#define MAP_SKY_PILLAR_2F (80 | (24 << 8)) -#define MAP_SKY_PILLAR_3F (81 | (24 << 8)) -#define MAP_SKY_PILLAR_4F (82 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM (83 | (24 << 8)) -#define MAP_SKY_PILLAR_5F (84 | (24 << 8)) -#define MAP_SKY_PILLAR_TOP (85 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_1F (86 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_2F_1R (87 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_2F_2R (88 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_3F_1R (89 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_3F_2R (90 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_4F (91 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_3F_3R (92 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_2F_3R (93 | (24 << 8)) -#define MAP_MIRAGE_TOWER_1F (94 | (24 << 8)) -#define MAP_MIRAGE_TOWER_2F (95 | (24 << 8)) -#define MAP_MIRAGE_TOWER_3F (96 | (24 << 8)) -#define MAP_MIRAGE_TOWER_4F (97 | (24 << 8)) -#define MAP_DESERT_UNDERPASS (98 | (24 << 8)) -#define MAP_ARTISAN_CAVE_B1F (99 | (24 << 8)) -#define MAP_ARTISAN_CAVE_1F (100 | (24 << 8)) -#define MAP_UNDERWATER_MARINE_CAVE (101 | (24 << 8)) -#define MAP_MARINE_CAVE_ENTRANCE (102 | (24 << 8)) -#define MAP_MARINE_CAVE_END (103 | (24 << 8)) -#define MAP_TERRA_CAVE_ENTRANCE (104 | (24 << 8)) -#define MAP_TERRA_CAVE_END (105 | (24 << 8)) -#define MAP_ALTERING_CAVE (106 | (24 << 8)) -#define MAP_METEOR_FALLS_STEVENS_CAVE (107 | (24 << 8)) - -// Map Group 25 -#define MAP_SECRET_BASE_RED_CAVE1 (0 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE1 (1 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE1 (2 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (25 << 8)) -#define MAP_SECRET_BASE_TREE1 (4 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB1 (5 | (25 << 8)) -#define MAP_SECRET_BASE_RED_CAVE2 (6 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE2 (7 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE2 (8 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (25 << 8)) -#define MAP_SECRET_BASE_TREE2 (10 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB2 (11 | (25 << 8)) -#define MAP_SECRET_BASE_RED_CAVE3 (12 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE3 (13 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE3 (14 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (25 << 8)) -#define MAP_SECRET_BASE_TREE3 (16 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB3 (17 | (25 << 8)) -#define MAP_SECRET_BASE_RED_CAVE4 (18 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE4 (19 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE4 (20 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8)) -#define MAP_SECRET_BASE_TREE4 (22 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB4 (23 | (25 << 8)) -#define MAP_SINGLE_BATTLE_COLOSSEUM (24 | (25 << 8)) -#define MAP_TRADE_CENTER (25 | (25 << 8)) -#define MAP_RECORD_CORNER (26 | (25 << 8)) -#define MAP_DOUBLE_BATTLE_COLOSSEUM (27 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM1 (28 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_29 (29 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_30 (30 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_31 (31 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_32 (32 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_33 (33 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_34 (34 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM2 (35 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM3 (36 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM4 (37 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM5 (38 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM6 (39 | (25 << 8)) -#define MAP_INSIDE_OF_TRUCK (40 | (25 << 8)) -#define MAP_SS_TIDAL_CORRIDOR (41 | (25 << 8)) -#define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8)) -#define MAP_SS_TIDAL_ROOMS (43 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE01 (44 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE02 (45 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE03 (46 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE04 (47 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE05 (48 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE06 (49 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE07 (50 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE08 (51 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE09 (52 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE10 (53 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE11 (54 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE12 (55 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE13 (56 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE14 (57 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE15 (58 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE16 (59 | (25 << 8)) -#define MAP_UNION_ROOM (60 | (25 << 8)) - -// Map Group 26 -#define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8)) -#define MAP_SAFARI_ZONE_NORTH (1 | (26 << 8)) -#define MAP_SAFARI_ZONE_SOUTHWEST (2 | (26 << 8)) -#define MAP_SAFARI_ZONE_SOUTH (3 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_OUTSIDE_WEST (4 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY (5 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR (6 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR (7 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM (8 | (26 << 8)) -#define MAP_SOUTHERN_ISLAND_EXTERIOR (9 | (26 << 8)) -#define MAP_SOUTHERN_ISLAND_INTERIOR (10 | (26 << 8)) -#define MAP_SAFARI_ZONE_REST_HOUSE (11 | (26 << 8)) -#define MAP_SAFARI_ZONE_NORTHEAST (12 | (26 << 8)) -#define MAP_SAFARI_ZONE_SOUTHEAST (13 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_OUTSIDE_EAST (14 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM (15 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 (16 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 (17 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY (18 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR (19 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM (20 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM (21 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY (22 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR (23 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM (24 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY (25 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE (26 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP (27 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY (28 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR (29 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM (30 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY (31 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM (32 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM (33 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY (34 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR (35 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM (36 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 (37 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 (38 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 (39 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_RANKING_HALL (40 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE1 (41 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER (42 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE2 (43 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE3 (44 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE4 (45 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE (46 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE5 (47 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE6 (48 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE7 (49 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_RECEPTION_GATE (50 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE8 (51 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE9 (52 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F (53 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F (54 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_MART (55 | (26 << 8)) -#define MAP_FARAWAY_ISLAND_ENTRANCE (56 | (26 << 8)) -#define MAP_FARAWAY_ISLAND_INTERIOR (57 | (26 << 8)) -#define MAP_BIRTH_ISLAND_EXTERIOR (58 | (26 << 8)) -#define MAP_BIRTH_ISLAND_HARBOR (59 | (26 << 8)) -#define MAP_TRAINER_HILL_ENTRANCE (60 | (26 << 8)) -#define MAP_TRAINER_HILL_1F (61 | (26 << 8)) -#define MAP_TRAINER_HILL_2F (62 | (26 << 8)) -#define MAP_TRAINER_HILL_3F (63 | (26 << 8)) -#define MAP_TRAINER_HILL_4F (64 | (26 << 8)) -#define MAP_TRAINER_HILL_ROOF (65 | (26 << 8)) -#define MAP_NAVEL_ROCK_EXTERIOR (66 | (26 << 8)) -#define MAP_NAVEL_ROCK_HARBOR (67 | (26 << 8)) -#define MAP_NAVEL_ROCK_ENTRANCE (68 | (26 << 8)) -#define MAP_NAVEL_ROCK_B1F (69 | (26 << 8)) -#define MAP_NAVEL_ROCK_FORK (70 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP1 (71 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP2 (72 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP3 (73 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP4 (74 | (26 << 8)) -#define MAP_NAVEL_ROCK_TOP (75 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN01 (76 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN02 (77 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN03 (78 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN04 (79 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN05 (80 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN06 (81 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN07 (82 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN08 (83 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN09 (84 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN10 (85 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN11 (86 | (26 << 8)) -#define MAP_NAVEL_ROCK_BOTTOM (87 | (26 << 8)) -#define MAP_TRAINER_HILL_ELEVATOR (88 | (26 << 8)) - -// Map Group 27 -#define MAP_ROUTE104_PROTOTYPE (0 | (27 << 8)) -#define MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP (1 | (27 << 8)) - -// Map Group 28 -#define MAP_ROUTE109_SEASHORE_HOUSE (0 | (28 << 8)) - -// Map Group 29 -#define MAP_ROUTE110_TRICK_HOUSE_ENTRANCE (0 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_END (1 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_CORRIDOR (2 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 (3 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE2 (4 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE3 (5 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE4 (6 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE5 (7 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE6 (8 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 (9 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE8 (10 | (29 << 8)) -#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (11 | (29 << 8)) -#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (12 | (29 << 8)) - -// Map Group 30 -#define MAP_ROUTE113_GLASS_WORKSHOP (0 | (30 << 8)) - -// Map Group 31 -#define MAP_ROUTE123_BERRY_MASTERS_HOUSE (0 | (31 << 8)) - -// Map Group 32 -#define MAP_ROUTE119_WEATHER_INSTITUTE_1F (0 | (32 << 8)) -#define MAP_ROUTE119_WEATHER_INSTITUTE_2F (1 | (32 << 8)) -#define MAP_ROUTE119_HOUSE (2 | (32 << 8)) - -// Map Group 33 -#define MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE (0 | (33 << 8)) - -#define MAP_GROUPS_COUNT 34 +#include "map_groups.h" #define MAP_NONE (0x7F | (0x7F << 8)) #define MAP_UNDEFINED (0xFF | (0xFF << 8)) - #define MAP_GROUP(map) (MAP_##map >> 8) #define MAP_NUM(map) (MAP_##map & 0xFF) diff --git a/map_data_rules.mk b/map_data_rules.mk new file mode 100755 index 0000000000..6d133eb504 --- /dev/null +++ b/map_data_rules.mk @@ -0,0 +1,31 @@ +# Map JSON data + +MAPS_DIR = $(DATA_ASM_SUBDIR)/maps +LAYOUTS_DIR = $(DATA_ASM_SUBDIR)/layouts + +MAP_DIRS := $(dir $(wildcard $(MAPS_DIR)/*/)) +MAP_CONNECTIONS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/connections.inc,$(MAP_DIRS)) +MAP_EVENTS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/events.inc,$(MAP_DIRS)) +MAP_HEADERS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/header.inc,$(MAP_DIRS)) + +$(DATA_ASM_BUILDDIR)/maps.o: $(DATA_ASM_SUBDIR)/maps.s $(LAYOUTS_DIR)/layouts.inc $(LAYOUTS_DIR)/layouts_table.inc $(MAPS_DIR)/headers.inc $(MAPS_DIR)/groups.inc $(MAPS_DIR)/connections.inc $(MAP_CONNECTIONS) $(MAP_HEADERS) + $(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@ +$(DATA_ASM_BUILDDIR)/map_events.o: $(DATA_ASM_SUBDIR)/map_events.s $(MAPS_DIR)/events.inc $(MAP_EVENTS) + $(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@ + +$(MAPS_DIR)/%/header.inc: $(MAPS_DIR)/%/map.json + $(MAPJSON) map $< $(LAYOUTS_DIR)/layouts.json +$(MAPS_DIR)/%/events.inc: $(MAPS_DIR)/%/header.inc ; +$(MAPS_DIR)/%/connections.inc: $(MAPS_DIR)/%/events.inc ; + +$(MAPS_DIR)/groups.inc: $(MAPS_DIR)/map_groups.json + $(MAPJSON) groups $< +$(MAPS_DIR)/connections.inc: $(MAPS_DIR)/groups.inc ; +$(MAPS_DIR)/events.inc: $(MAPS_DIR)/connections.inc ; +$(MAPS_DIR)/headers.inc: $(MAPS_DIR)/events.inc ; +include/constants/map_groups.h: $(MAPS_DIR)/headers.inc ; + +$(LAYOUTS_DIR)/layouts.inc: $(LAYOUTS_DIR)/layouts.json + $(MAPJSON) layouts $< +$(LAYOUTS_DIR)/layouts_table.inc: $(LAYOUTS_DIR)/layouts.inc ; +include/constants/layouts.h: $(LAYOUTS_DIR)/layouts_table.inc ; diff --git a/src/battle_factory.c b/src/battle_factory.c index 5793c78e9f..c025dc139c 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -11,6 +11,7 @@ #include "constants/species.h" #include "constants/battle_ai.h" #include "constants/battle_frontier.h" +#include "constants/layouts.h" #include "constants/trainers.h" #include "constants/moves.h" @@ -662,7 +663,8 @@ static u8 GetStyleForMove(u16 move) bool8 sub_81A6BF4(void) { - return (gMapHeader.mapLayoutId == 347 || gMapHeader.mapLayoutId == 348); + return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM + || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM; } static void sub_81A6C1C(void) diff --git a/src/battle_pike.c b/src/battle_pike.c index c12038efb3..bdf6e80278 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -16,6 +16,7 @@ #include "constants/event_objects.h" #include "constants/battle_frontier.h" #include "constants/abilities.h" +#include "constants/layouts.h" #include "constants/rgb.h" #include "constants/trainers.h" #include "constants/species.h" @@ -1314,8 +1315,10 @@ static void sub_81A8090(void) bool8 InBattlePike(void) { - return (gMapHeader.mapLayoutId == 351 || gMapHeader.mapLayoutId == 352 - || gMapHeader.mapLayoutId == 358 || gMapHeader.mapLayoutId == 359); + return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM + || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 + || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 + || gMapHeader.mapLayoutId == LAYOUT_UNKNOWN_MAP_084693AC; } static void sub_81A80DC(void) diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index c0ff1ecf58..ed911d8d96 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -30,6 +30,7 @@ #include "constants/event_objects.h" #include "constants/event_object_movement_constants.h" #include "constants/items.h" +#include "constants/layouts.h" #include "constants/maps.h" #include "constants/moves.h" #include "constants/species.h" @@ -1380,9 +1381,9 @@ u8 GetPyramidRunMultiplier(void) u8 InBattlePyramid(void) { - if (gMapHeader.mapLayoutId == 361) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) return 1; - else if (gMapHeader.mapLayoutId == 378) + else if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP) return 2; else return FALSE; @@ -1390,7 +1391,8 @@ u8 InBattlePyramid(void) bool8 InBattlePyramid_(void) { - return (gMapHeader.mapLayoutId == 361 || gMapHeader.mapLayoutId == 378); + return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE + || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP; } void sub_81A9E90(void) diff --git a/src/battle_tent.c b/src/battle_tent.c index de4d9d374a..cb8149253f 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -12,6 +12,7 @@ #include "frontier_util.h" #include "string_util.h" #include "constants/items.h" +#include "constants/layouts.h" #include "constants/region_map_sections.h" #include "constants/species.h" @@ -270,8 +271,8 @@ static void sub_81B9E88(void) bool8 sub_81B9E94(void) { - return (gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY - && ((gMapHeader.mapLayoutId == 385) | (gMapHeader.mapLayoutId == 386))); + return gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY + && (gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_CORRIDOR || gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_BATTLE_ROOM); } static void sub_81B9EC0(void) diff --git a/src/map_name_popup.c b/src/map_name_popup.c index c137470066..0d88815c00 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -1,6 +1,4 @@ #include "global.h" -#include "constants/region_map_sections.h" -#include "constants/weather.h" #include "bg.h" #include "event_data.h" #include "gpu_regs.h" @@ -14,6 +12,9 @@ #include "string_util.h" #include "task.h" #include "text.h" +#include "constants/layouts.h" +#include "constants/region_map_sections.h" +#include "constants/weather.h" // enums enum MapPopUp_Themes @@ -305,7 +306,7 @@ static void ShowMapNamePopUpWindow(void) if (InBattlePyramid()) { - if (gMapHeader.mapLayoutId == 0x17A) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP) { withoutPrefixPtr = &(mapDisplayHeader[3]); mapDisplayHeaderSource = gBattlePyramid_MapHeaderStrings[7]; diff --git a/src/overworld.c b/src/overworld.c index a67b4b68f6..8d4c24ff6f 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -55,6 +55,7 @@ #include "wild_encounter.h" #include "frontier_util.h" #include "constants/abilities.h" +#include "constants/layouts.h" #include "constants/map_types.h" #include "constants/maps.h" #include "constants/region_map_sections.h" @@ -886,7 +887,7 @@ static void mli0_load_map(u32 a1) LoadCurrentMapData(); if (!(sUnknown_020322D8 & 1)) { - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) sub_81AA1D8(); else if (InTrainerHill()) sub_81D5DF8(); @@ -914,7 +915,7 @@ static void mli0_load_map(u32 a1) mapheader_run_script_with_tag_x3(); UpdateLocationHistoryForRoamer(); RoamerMoveToOtherLocationSet(); - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) InitBattlePyramidMap(0); else if (InTrainerHill()) InitTrainerHillMap(); @@ -1753,7 +1754,7 @@ void CB2_ContinueSavedGame(void) LoadSaveblockMapHeader(); ClearDiveAndHoleWarps(); trainerHillMapId = GetCurrentTrainerHillMapId(); - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) sub_81AA2F8(); else if (trainerHillMapId != 0 && trainerHillMapId != 6) sub_81D5F48(); @@ -1763,7 +1764,7 @@ void CB2_ContinueSavedGame(void) UnfreezeEventObjects(); DoTimeBasedEvents(); sub_8084788(); - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) InitBattlePyramidMap(1); else if (trainerHillMapId != 0) InitTrainerHillMap(); diff --git a/src/pokemon.c b/src/pokemon.c index cdb87f464f..7f80e8d4ef 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -37,6 +37,7 @@ #include "constants/battle_move_effects.h" #include "constants/hold_effects.h" #include "constants/items.h" +#include "constants/layouts.h" #include "constants/moves.h" #include "constants/songs.h" #include "constants/species.h" @@ -6848,7 +6849,7 @@ void SetWildMonHeldItem(void) var1 = 20; var2 = 80; } - if (gMapHeader.mapLayoutId == 0x1A4) + if (gMapHeader.mapLayoutId == LAYOUT_ALTERING_CAVE) { s32 alteringCaveId = GetWildMonTableIdInAlteringCave(species); if (alteringCaveId != 0) diff --git a/src/trainer_hill.c b/src/trainer_hill.c index e0a236286e..309ffdb1d7 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -24,6 +24,7 @@ #include "constants/event_object_movement_constants.h" #include "constants/event_objects.h" #include "constants/items.h" +#include "constants/layouts.h" #include "constants/moves.h" #include "constants/maps.h" #include "constants/species.h" @@ -324,7 +325,7 @@ void ResetTrainerHillResults(void) static u8 GetFloorId(void) { - return gMapHeader.mapLayoutId - 159; + return gMapHeader.mapLayoutId - LAYOUT_TRAINER_HILL_1F; } u8 GetTrainerHillOpponentClass(u16 trainerId) @@ -385,7 +386,7 @@ static void SetUpDataStruct(void) if (sHillData == NULL) { sHillData = AllocZeroed(sizeof(*sHillData)); - sHillData->floorId = gMapHeader.mapLayoutId - 159; + sHillData->floorId = gMapHeader.mapLayoutId - LAYOUT_TRAINER_HILL_1F; CpuCopy32(sDataPerTag[gSaveBlock1Ptr->trainerHill.tag], &sHillData->tag, sizeof(sHillData->tag)); nullsub_2(); } @@ -803,10 +804,10 @@ bool32 InTrainerHill(void) { bool32 ret; - if (gMapHeader.mapLayoutId == 0x19F - || gMapHeader.mapLayoutId == 0x1A0 - || gMapHeader.mapLayoutId == 0x1A1 - || gMapHeader.mapLayoutId == 0x1A2) + if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_1F + || gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_2F + || gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_3F + || gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_4F) ret = TRUE; else ret = FALSE; @@ -818,17 +819,17 @@ u8 GetCurrentTrainerHillMapId(void) { u8 ret; - if (gMapHeader.mapLayoutId == 0x19F) + if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_1F) ret = 1; - else if (gMapHeader.mapLayoutId == 0x1A0) + else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_2F) ret = 2; - else if (gMapHeader.mapLayoutId == 0x1A1) + else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_3F) ret = 3; - else if (gMapHeader.mapLayoutId == 0x1A2) + else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_4F) ret = 4; - else if (gMapHeader.mapLayoutId == 0x1A3) + else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_ROOF) ret = 5; - else if (gMapHeader.mapLayoutId == 0x19E) + else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_ENTRANCE) ret = 6; else ret = 0; @@ -840,7 +841,7 @@ static bool32 sub_81D6100(void) { bool32 ret; - if (gMapHeader.mapLayoutId == 0x1A3) + if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_ROOF) ret = TRUE; else ret = FALSE; diff --git a/src/tv.c b/src/tv.c index 5b640836f1..ec3a3d0cb4 100644 --- a/src/tv.c +++ b/src/tv.c @@ -38,6 +38,7 @@ #include "secret_base.h" #include "tv.h" #include "data2.h" +#include "constants/layouts.h" // Static type declarations @@ -6264,7 +6265,9 @@ static void DoTVShowTodaysRivalTrainer(void) case MAPSEC_DYNAMIC: switch (show->rivalTrainer.mapLayoutId) { - case 0x115 ... 0x117: + case LAYOUT_SS_TIDAL_CORRIDOR: + case LAYOUT_SS_TIDAL_LOWER_DECK: + case LAYOUT_SS_TIDAL_ROOMS: sTVShowState = 10; break; default: @@ -6463,7 +6466,9 @@ static void DoTVShowHoennTreasureInvestigators(void) { switch (show->treasureInvestigators.mapLayoutId) { - case 0x115 ... 0x117: + case LAYOUT_SS_TIDAL_CORRIDOR: + case LAYOUT_SS_TIDAL_LOWER_DECK: + case LAYOUT_SS_TIDAL_ROOMS: sTVShowState = 2; break; default: diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 2e6f1642a8..e42bf8a232 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -1,27 +1,27 @@ #include "global.h" #include "wild_encounter.h" #include "pokemon.h" -#include "constants/species.h" #include "metatile_behavior.h" #include "fieldmap.h" #include "random.h" -#include "constants/maps.h" #include "field_player_avatar.h" -#include "constants/abilities.h" #include "event_data.h" #include "safari_zone.h" #include "overworld.h" #include "pokeblock.h" #include "battle_setup.h" #include "roamer.h" -#include "constants/game_stat.h" #include "tv.h" #include "link.h" #include "script.h" #include "battle_pike.h" #include "battle_pyramid.h" +#include "constants/abilities.h" +#include "constants/game_stat.h" #include "constants/items.h" +#include "constants/layouts.h" #include "constants/maps.h" +#include "constants/species.h" extern const u8 EventScript_RepelWoreOff[]; @@ -413,7 +413,7 @@ static bool8 TryGenerateWildMon(const struct WildPokemonInfo *wildMonInfo, u8 ar level = ChooseWildMonLevel(&wildMonInfo->wildPokemon[wildMonIndex]); if (flags & WILD_CHECK_REPEL && !IsWildLevelAllowedByRepel(level)) return FALSE; - if (gMapHeader.mapLayoutId != 0x166 && flags & WILD_CHECK_KEEN_EYE && !IsAbilityAllowingEncounter(level)) + if (gMapHeader.mapLayoutId != LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 && flags & WILD_CHECK_KEEN_EYE && !IsAbilityAllowingEncounter(level)) return FALSE; CreateWildMon(wildMonInfo->wildPokemon[wildMonIndex].species, level); @@ -474,7 +474,7 @@ static bool8 DoWildEncounterRateTest(u32 encounterRate, bool8 ignoreAbility) { u32 ability = GetMonAbility(&gPlayerParty[0]); - if (ability == ABILITY_STENCH && gMapHeader.mapLayoutId == 0x169) + if (ability == ABILITY_STENCH && gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) encounterRate = encounterRate * 3 / 4; else if (ability == ABILITY_STENCH) encounterRate /= 2; @@ -522,7 +522,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi headerId = GetCurrentMapWildMonHeaderId(); if (headerId == 0xFFFF) { - if (gMapHeader.mapLayoutId == 0x166) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3) { headerId = GetBattlePikeWildMonHeaderId(); if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll()) @@ -537,7 +537,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi BattleSetup_StartBattlePikeWildBattle(); return TRUE; } - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) { headerId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll()) @@ -665,7 +665,7 @@ bool8 SweetScentWildEncounter(void) headerId = GetCurrentMapWildMonHeaderId(); if (headerId == 0xFFFF) { - if (gMapHeader.mapLayoutId == 0x166) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3) { headerId = GetBattlePikeWildMonHeaderId(); if (TryGenerateWildMon(gBattlePikeWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE) @@ -675,7 +675,7 @@ bool8 SweetScentWildEncounter(void) BattleSetup_StartBattlePikeWildBattle(); return TRUE; } - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) { headerId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; if (TryGenerateWildMon(gBattlePyramidWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE) diff --git a/tools/mapjson/mapjson.py b/tools/mapjson/mapjson.py new file mode 100755 index 0000000000..28322a2de2 --- /dev/null +++ b/tools/mapjson/mapjson.py @@ -0,0 +1,389 @@ +# mapjson.py + +import os +import re +import sys +import json + + +def abort(message): + print message + sys.exit() + + +def write_text_file(filepath, text): + with open(filepath, 'w') as f: + f.write(text) + + +def generate_map_header_text(map_data, layouts_data): + matched_layouts = filter(lambda layout: layout['id'] == map_data['layout'], layouts_data['layouts']) + if len(matched_layouts) != 1: + abort('Failed to find matching layout for "%s"' % (map_data['layout'])) + layout = matched_layouts[0] + text = '%s:\n' % (map_data['name']) + text += '\t.4byte %s\n' % (layout['name']) + + if 'shared_events_map' in map_data: + text += '\t.4byte %s\n' % (map_data['shared_events_map'] + '_MapEvents') + else: + text += '\t.4byte %s\n' % (map_data['name'] + '_MapEvents') + + if 'shared_scripts_map' in map_data: + text += '\t.4byte %s\n' % (map_data['shared_scripts_map'] + '_MapScripts') + else: + text += '\t.4byte %s\n' % (map_data['name'] + '_MapScripts') + + if map_data['connections'] is not None and len(map_data['connections']) > 0: + text += '\t.4byte %s\n' % (map_data['name'] + '_MapConnections') + else: + text += '\t.4byte 0x0\n' + + text += '\t.2byte %s\n' % (map_data['music']) + text += '\t.2byte %s\n' % (layout['id']) + text += '\t.byte %s\n' % (map_data['region_map_section']) + text += '\t.byte %s\n' % (int(map_data['requires_flash'])) + text += '\t.byte %s\n' % (map_data['weather']) + text += '\t.byte %s\n' % (map_data['map_type']) + text += '\t.2byte 0\n' + text += '\tmap_header_flags allow_bike=%s, allow_escape_rope=%s, allow_run=%s, show_map_name=%s\n' % (int(map_data['allow_bike']), int(map_data['allow_escape_rope']), int(map_data['allow_running']), int(map_data['show_map_name'])) + text += '\t.byte %s\n\n' % (map_data['battle_scene']) + return text + + +def generate_map_connections_text(map_data): + if map_data['connections'] is None: + return '\n' + + label = '%s_MapConnectionsList' % (map_data['name']) + text = '%s:\n' % (label) + for connection in map_data['connections']: + text += '\tconnection %s, %s, %s\n' % (connection['direction'], connection['offset'], connection['map']) + + text += '\n%s_MapConnections:\n' % (map_data['name']) + text += '\t.4byte %s\n' % (len(map_data['connections'])) + text += '\t.4byte %s\n\n' % (label) + return text + + +def generate_map_events_text(map_data): + if 'shared_events_map' in map_data: + return '\n' + + text = '' + if len(map_data['object_events']) > 0: + objects_label = '%s_EventObjects' % (map_data['name']) + text += '%s:\n' % (objects_label) + for i, obj in enumerate(map_data['object_events']): + text += '\tobject_event %s, %s, 0, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s\n' % ( + i + 1, + obj['graphics_id'], + obj['x'], + obj['y'], + obj['elevation'], + obj['movement_type'], + obj['movement_range_x'], + obj['movement_range_y'], + obj['trainer_type'], + obj['trainer_sight_or_berry_tree_id'], + obj['script'], + obj['flag']) + text += '\n' + else: + objects_label = '0x0' + + if len(map_data['warp_events']) > 0: + warps_label = '%s_MapWarps' % (map_data['name']) + text += '%s:\n' % (warps_label) + for i, warp in enumerate(map_data['warp_events']): + text += '\twarp_def %s, %s, %s, %s, %s\n' % ( + warp['x'], + warp['y'], + warp['elevation'], + warp['dest_warp_id'], + warp['dest_map']) + text += '\n' + else: + warps_label = '0x0' + + if len(map_data['coord_events']) > 0: + coords_label = '%s_MapCoordEvents' % (map_data['name']) + text += '%s:\n' % (coords_label) + for i, event in enumerate(map_data['coord_events']): + if event['type'] == 'trigger': + text += '\tcoord_event %s, %s, %s, %s, %s, %s\n' % ( + event['x'], + event['y'], + event['elevation'], + event['var'], + event['var_value'], + event['script']) + elif event['type'] == 'weather': + text += '\tcoord_weather_event %s, %s, %s, %s\n' % ( + event['x'], + event['y'], + event['elevation'], + event['weather']) + text += '\n' + else: + coords_label = '0x0' + + if len(map_data['bg_events']) > 0: + bgs_label = '%s_MapBGEvents' % (map_data['name']) + text += '%s:\n' % (bgs_label) + for i, event in enumerate(map_data['bg_events']): + if event['type'] == 'sign': + text += '\tbg_event %s, %s, %s, %s, %s\n' % ( + event['x'], + event['y'], + event['elevation'], + event['player_facing_dir'], + event['script']) + elif event['type'] == 'hidden_item': + text += '\tbg_hidden_item_event %s, %s, %s, %s, %s\n' % ( + event['x'], + event['y'], + event['elevation'], + event['item'], + event['flag']) + elif event['type'] == 'secret_base': + text += '\tbg_secret_base_event %s, %s, %s, %s\n' % ( + event['x'], + event['y'], + event['elevation'], + event['secret_base_id']) + text += '\n' + else: + bgs_label = '0x0' + + text += '%s_MapEvents::\n' % (map_data['name']) + text += '\tmap_events %s, %s, %s, %s\n\n' % (objects_label, warps_label, coords_label, bgs_label) + return text + + +def process_map(map_filepath, layouts_filepath): + with open(map_filepath) as f: + map_data = json.load(f) + with open(layouts_filepath) as f: + layouts_data = json.load(f) + + header_text = generate_map_header_text(map_data, layouts_data) + events_text = generate_map_events_text(map_data) + connections_text = generate_map_connections_text(map_data) + + files_dir = os.path.dirname(map_filepath) + write_text_file(os.path.join(files_dir, 'header.inc'), header_text) + write_text_file(os.path.join(files_dir, 'events.inc'), events_text) + write_text_file(os.path.join(files_dir, 'connections.inc'), connections_text) + + +def generate_groups_text(groups_data): + text = '' + for group in groups_data['group_order']: + text += '%s::\n' % (group) + maps = groups_data[group] + for map_name in maps: + text += '\t.4byte %s\n' % (map_name) + text += '\n' + + text += '\t.align 2\n' + text += 'gMapGroups::\n' + for group in groups_data['group_order']: + text += '\t.4byte %s\n' % (group) + text += '\n' + return text + + +def index_of(in_list, value): + try: + index_value = in_list.index(value) + except ValueError: + index_value = sys.maxint + return index_value + + +def generate_connections_text(groups_data): + map_names = [] + for group in groups_data['group_order']: + for map_name in groups_data[group]: + map_names.append(map_name) + + if 'connections_include_order' in groups_data: + map_names.sort(key=lambda x: index_of(groups_data['connections_include_order'], x)) + + text = '' + for map_name in map_names: + text += '\t.include "data/maps/%s/connections.inc"\n' % (map_name) + + return text + + +def generate_headers_text(groups_data): + map_names = [] + for group in groups_data['group_order']: + for map_name in groups_data[group]: + map_names.append(map_name) + + text = '' + for map_name in map_names: + text += '\t.include "data/maps/%s/header.inc"\n' % (map_name) + + return text + + +def generate_events_text(groups_data): + map_names = [] + for group in groups_data['group_order']: + for map_name in groups_data[group]: + map_names.append(map_name) + + text = '' + for map_name in map_names: + text += '\t.include "data/maps/%s/events.inc"\n' % (map_name) + + return text + + +def generate_map_constants_text(groups_filepath, groups_data): + file_dir = os.path.dirname(groups_filepath) + text = '#ifndef GUARD_CONSTANTS_MAP_GROUPS_H\n' + text += '#define GUARD_CONSTANTS_MAP_GROUPS_H\n\n' + + for i, group in enumerate(groups_data['group_order']): + text += '// Map Group %s\n' % (i) + map_ids = [] + max_length = 0 + for map_name in groups_data[group]: + header_filepath = os.path.join(file_dir, map_name, 'map.json') + with open(header_filepath) as f: + map_data = json.load(f) + map_ids.append(map_data['id']) + if len(map_data['id']) > max_length: + max_length = len(map_data['id']) + + for j, map_id in enumerate(map_ids): + text += '#define %s%s(%s | (%s << 8))\n' % (map_id, " " * (max_length - len(map_id) + 1), j, i) + + text += '\n' + + text += '#define MAP_GROUPS_COUNT %s\n\n' % (len(groups_data['group_order'])) + text += '#endif // GUARD_CONSTANTS_MAP_GROUPS_H\n' + + return text + + +def process_groups(groups_filepath): + with open(groups_filepath) as f: + groups_data = json.load(f) + + groups_text = generate_groups_text(groups_data) + connections_text = generate_connections_text(groups_data) + headers_text = generate_headers_text(groups_data) + events_text = generate_events_text(groups_data) + map_header_text = generate_map_constants_text(groups_filepath, groups_data) + + file_dir = os.path.dirname(groups_filepath) + write_text_file(os.path.join(file_dir, 'groups.inc'), groups_text) + write_text_file(os.path.join(file_dir, 'connections.inc'), connections_text) + write_text_file(os.path.join(file_dir, 'headers.inc'), headers_text) + write_text_file(os.path.join(file_dir, 'events.inc'), events_text) + write_text_file(os.path.join(file_dir, '../../include/constants/map_groups.h'), map_header_text) + + +def generate_layout_headers_text(layouts_data): + text = '' + for layout in layouts_data['layouts']: + border_label = layout['name'] + '_Border' + blockdata_label = layout['name'] + '_Blockdata' + text += '%s::\n' % (border_label) + text += '\t.incbin "%s"\n\n' % (layout['border_filepath']) + text += '%s::\n' % (blockdata_label) + text += '\t.incbin "%s"\n\n' % (layout['blockdata_filepath']) + text += '\t.align 2\n' + text += '%s::\n' % (layout['name']) + text += '\t.4byte %s\n' % (layout['width']) + text += '\t.4byte %s\n' % (layout['height']) + text += '\t.4byte %s\n' % (border_label) + text += '\t.4byte %s\n' % (blockdata_label) + text += '\t.4byte %s\n' % (layout['primary_tileset']) + text += '\t.4byte %s\n\n' % (layout['secondary_tileset']) + + return text + + +def generate_layouts_table_text(layouts_data): + text = '\t.align 2\n' + text += '%s::\n' % (layouts_data['layouts_table_label']) + for layout in layouts_data['layouts']: + text += '\t.4byte %s\n' % (layout['name']) + + return text + + +def generate_layouts_constants_text(layouts_data): + text = '#ifndef GUARD_CONSTANTS_LAYOUTS_H\n' + text += '#define GUARD_CONSTANTS_LAYOUTS_H\n\n' + for i, layout in enumerate(layouts_data['layouts']): + text += '#define %s %s\n' % (layout['id'], i + 1) + text += '\n' + text += '#endif // GUARD_CONSTANTS_LAYOUTS_H\n' + return text + + +def process_layouts(layouts_filepath): + with open(layouts_filepath) as f: + layouts_data = json.load(f) + + layout_headers_text = generate_layout_headers_text(layouts_data) + layouts_table_text = generate_layouts_table_text(layouts_data) + layouts_constants_text = generate_layouts_constants_text(layouts_data) + + file_dir = os.path.dirname(layouts_filepath) + write_text_file(os.path.join(file_dir, 'layouts.inc'), layout_headers_text) + write_text_file(os.path.join(file_dir, 'layouts_table.inc'), layouts_table_text) + write_text_file(os.path.join(file_dir, '../../include/constants/layouts.h'), layouts_constants_text) + + +def main(): + if len(sys.argv) < 2: + abort('USAGE: python mapjson.py [options]') + + mode = sys.argv[1] + if mode not in ['layouts', 'map', 'groups']: + abort("ERROR: must be 'layouts', 'map', or 'groups'.") + + if mode == 'map': + if len(sys.argv) != 4: + abort('USAGE: python mapjson.py map ') + + filepath = sys.argv[2] + if not os.path.exists(filepath): + abort('ERROR: Map file "%s" does not exist' % (filepath)) + + layouts_filepath = sys.argv[3] + if not os.path.exists(layouts_filepath): + abort('ERROR: Layouts file "%s" does not exist' % (layouts_filepath)) + + process_map(filepath, layouts_filepath) + elif mode == 'groups': + if len(sys.argv) != 3: + abort('USAGE: python mapjson.py groups ') + + filepath = sys.argv[2] + if not os.path.exists(filepath): + abort('ERROR: Map file "%s" does not exist' % (filepath)) + + process_groups(filepath) + elif mode == 'layouts': + if len(sys.argv) != 3: + abort('USAGE: python mapjson.py layouts ') + + filepath = sys.argv[2] + if not os.path.exists(filepath): + abort('ERROR: Layouts file "%s" does not exist' % (filepath)) + + process_layouts(filepath) + + +if __name__ == '__main__': + main() From 46a3969f69994e092b3ecc48fd46036b9625763d Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 2 Feb 2019 00:25:43 -0600 Subject: [PATCH 004/217] Add constants for flags and vars --- src/berry_blender.c | 2 +- src/braille_puzzles.c | 16 ++++++++-------- src/decoration.c | 8 ++++---- src/field_special_scene.c | 10 +++++----- src/tv.c | 10 +++++----- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/berry_blender.c b/src/berry_blender.c index ea9c6c4ff0..f2e3c7d14a 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -1438,7 +1438,7 @@ static void Blender_SetOpponentsBerryData(u16 playerBerryItemId, u8 playersNum, { opponentBerryId = sOpponentBerrySets[opponentSetId][i]; var = playerBerryItemId - 163; - if (!FlagGet(0x340) && gSpecialVar_0x8004 == 1) + if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS) && gSpecialVar_0x8004 == 1) { opponentSetId %= 5; opponentBerryId = sSpecialOpponentBerrySets[opponentSetId]; diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index b17ffad33c..6be8ba4a44 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -447,25 +447,25 @@ bool8 ShouldDoBrailleRegicePuzzle(void) if (i < 16) { - u16 val = VarGet(0x403B); + u16 val = VarGet(VAR_0x403B); val |= 1 << i; - VarSet(0x403B, val); + VarSet(VAR_0x403B, val); } else if (i < 32) { - u16 val = VarGet(0x403C); + u16 val = VarGet(VAR_0x403C); val |= 1 << (i - 16); - VarSet(0x403C, val); + VarSet(VAR_0x403C, val); } else { - u16 val = VarGet(0x403D); + u16 val = VarGet(VAR_0x403D); val |= 1 << (i - 32); - VarSet(0x403D, val); + VarSet(VAR_0x403D, val); } - varValue = VarGet(0x403B); - if (varValue != 0xFFFF || VarGet(0x403C) != varValue || VarGet(0x403D) != 0xF) + varValue = VarGet(VAR_0x403B); + if (varValue != 0xFFFF || VarGet(VAR_0x403C) != varValue || VarGet(VAR_0x403D) != 0xF) return FALSE; if (gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 21) diff --git a/src/decoration.c b/src/decoration.c index c4c3d61713..36d9ba5f9a 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1244,17 +1244,17 @@ void sub_8127E18(void) for (i = 0; i < 14; i ++) { - if (FlagGet(0xAE + i) == TRUE) + if (FlagGet(FLAG_DECORATION_1 + i) == TRUE) { - FlagClear(0xAE + i); + FlagClear(FLAG_DECORATION_1 + i); for (j = 0; j < gMapHeader.events->eventObjectCount; j ++) { - if (gMapHeader.events->eventObjects[j].flagId == 0xAE + i) + if (gMapHeader.events->eventObjects[j].flagId == FLAG_DECORATION_1 + i) { break; } } - VarSet(0x3F20 + gMapHeader.events->eventObjects[j].graphicsId, sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]); + VarSet(VAR_0x3F20 + gMapHeader.events->eventObjects[j].graphicsId, sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]); gSpecialVar_0x8005 = gMapHeader.events->eventObjects[j].localId; gSpecialVar_0x8006 = sCurDecorMapX; gSpecialVar_0x8007 = sCurDecorMapY; diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 579188f369..2b518808b0 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -300,8 +300,8 @@ void Task_HandlePorthole(u8 taskId) } break; case EXIT_PORTHOLE: // exit porthole. - FlagClear(0x4001); - FlagClear(0x4000); + FlagClear(FLAG_SPECIAL_FLAG_0x4001); + FlagClear(FLAG_SPECIAL_FLAG_0x4000); SetWarpDestinationToDynamicWarp(0); DoDiveWarp(); DestroyTask(taskId); @@ -315,7 +315,7 @@ void sub_80FB6EC(void) gSprites[spriteId].coordOffsetEnabled = FALSE; - if (VarGet(0x40B4) == 2) + if (VarGet(VAR_PORTHOLE_STATE) == 2) { StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(4)); } @@ -337,8 +337,8 @@ void sub_80FB768(void) void sub_80FB7A4(void) { FlagSet(FLAG_SYS_CRUISE_MODE); - FlagSet(0x4001); - FlagSet(0x4000); + FlagSet(FLAG_SPECIAL_FLAG_0x4001); + FlagSet(FLAG_SPECIAL_FLAG_0x4000); SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); sub_80FB59C(); sub_80AF8B8(); diff --git a/src/tv.c b/src/tv.c index dfb4a3a64b..f46bfa0c4a 100644 --- a/src/tv.c +++ b/src/tv.c @@ -972,7 +972,7 @@ void GabbyAndTyBeforeInterview(void) TakeTVShowInSearchOfTrainersOffTheAir(); if (gSaveBlock1Ptr->gabbyAndTyData.lastMove == MOVE_NONE) { - FlagSet(0x0001); + FlagSet(FLAG_TEMP_1); } } @@ -2564,13 +2564,13 @@ void sub_80EEA70(void) show->secretBaseSecrets.kind = TVSHOW_SECRET_BASE_SECRETS; show->secretBaseSecrets.active = FALSE; StringCopy(show->secretBaseSecrets.playerName, gSaveBlock2Ptr->playerName); - show->secretBaseSecrets.stepsInBase = VarGet(0x40ec); + show->secretBaseSecrets.stepsInBase = VarGet(VAR_0x40EC); sub_80E980C(); StringCopy(strbuf, gStringVar1); StripExtCtrlCodes(strbuf); StringCopy(show->secretBaseSecrets.baseOwnersName, strbuf); - show->secretBaseSecrets.item = VarGet(0x40ed); - show->secretBaseSecrets.flags = VarGet(0x40ee) + (VarGet(0x40ef) << 16); + show->secretBaseSecrets.item = VarGet(VAR_0x40ED); + show->secretBaseSecrets.flags = VarGet(VAR_0x40EE) + (VarGet(VAR_0x40EF) << 16); tv_store_id_3x(show); show->secretBaseSecrets.language = gGameLanguage; if (show->secretBaseSecrets.language == LANGUAGE_JAPANESE || gSaveBlock1Ptr->secretBases[VarGet(VAR_CURRENT_SECRET_BASE)].language == LANGUAGE_JAPANESE) @@ -3604,7 +3604,7 @@ void sub_80F01B8(void) { VarSet(VAR_0x40BC, 0); RemoveEventObjectByLocalIdAndMap(5, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - FlagSet(0x396); + FlagSet(FLAG_HIDE_BATTLE_TOWER_REPORTER); } void ReceiveTvShowsData(void *src, u32 size, u8 masterIdx) From 23b240ab658e0be6b114c36864fea19ff23eb61b Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 2 Feb 2019 11:04:38 +0100 Subject: [PATCH 005/217] Fix Menu and List Menu input defines --- asm/rom_8011DC0.s | 4 ++-- include/list_menu.h | 2 +- src/battle_pyramid_bag.c | 8 ++++---- src/daycare.c | 6 +++--- src/decoration.c | 14 +++++++------- src/field_specials.c | 8 ++++---- src/item_menu.c | 16 ++++++++-------- src/learn_move.c | 2 +- src/list_menu.c | 4 ++-- src/mauville_old_man.c | 4 ++-- src/player_pc.c | 36 +++++++++++++++++++----------------- src/pokeblock.c | 4 ++-- src/pokemon_storage_system.c | 4 ++-- src/rom_8011DC0.c | 6 +++--- src/script_menu.c | 4 ++-- src/secret_base.c | 10 +++++----- src/shop.c | 6 +++--- src/trader.c | 4 ++-- 18 files changed, 72 insertions(+), 70 deletions(-) diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index 64c0210018..af7fdbf3df 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -731,7 +731,7 @@ _080171DC: _08017228: mov r3, r9 ldrb r0, [r3] - bl ListMenuHandleInputGetItemId + bl ListMenu_ProcessInput mov r8, r0 ldr r0, =gMain ldrh r1, [r0, 0x2E] @@ -847,7 +847,7 @@ _08017314: _0801731C: mov r3, r10 ldrb r0, [r3] - bl ListMenuHandleInputGetItemId + bl ListMenu_ProcessInput adds r1, r0, 0 ldr r0, =gMain ldrh r2, [r0, 0x2E] diff --git a/include/list_menu.h b/include/list_menu.h index 84c38306b6..ef23688d85 100644 --- a/include/list_menu.h +++ b/include/list_menu.h @@ -101,7 +101,7 @@ extern struct ListMenuTemplate gMultiuseListMenuTemplate; s32 DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum); u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow); u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenuWindowRect *arg1, u16 scrollOffset, u16 selectedRow); -s32 ListMenuHandleInputGetItemId(u8 listTaskId); +s32 ListMenu_ProcessInput(u8 listTaskId); void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow); void RedrawListMenu(u8 listTaskId); void ChangeListMenuPals(u8 listTaskId, u8 cursorPal, u8 fillValue, u8 cursorShadowPal); diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index 50baf48fd2..9bed2ab438 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -853,7 +853,7 @@ static void Task_HandlePyramidBagInput(u8 taskId) } else { - s32 listId = ListMenuHandleInputGetItemId(data[0]); + s32 listId = ListMenu_ProcessInput(data[0]); ListMenuGetScrollAndRow(data[0], &gPyramidBagCursorData.scrollPosition, &gPyramidBagCursorData.cursorPosition); switch (listId) { @@ -945,9 +945,9 @@ static void HandleFewMenuActionsInput(u8 taskId) s32 id = Menu_ProcessInputNoWrap(); switch (id) { - case -2: + case MENU_NOTHING_CHOSEN: break; - case -1: + case MENU_B_PRESSED: PlaySE(SE_SELECT); sMenuActions[ACTION_CANCEL].func.void_u8(taskId); break; @@ -1285,7 +1285,7 @@ static void Task_ItemSwapHandleInput(u8 taskId) } else { - s32 id = ListMenuHandleInputGetItemId(data[0]); + s32 id = ListMenu_ProcessInput(data[0]); ListMenuGetScrollAndRow(data[0], &gPyramidBagCursorData.scrollPosition, &gPyramidBagCursorData.cursorPosition); sub_81C7028(FALSE); sub_81C704C(gPyramidBagCursorData.cursorPosition); diff --git a/src/daycare.c b/src/daycare.c index 6bdbd987e0..b75fab2924 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1244,15 +1244,15 @@ static void DaycarePrintMonInfo(u8 windowId, s32 daycareSlotId, u8 y) static void Task_HandleDaycareLevelMenuInput(u8 taskId) { - u32 var = ListMenuHandleInputGetItemId(gTasks[taskId].tMenuListTaskId); + u32 input = ListMenu_ProcessInput(gTasks[taskId].tMenuListTaskId); if (gMain.newKeys & A_BUTTON) { - switch (var) + switch (input) { case 0: case 1: - gSpecialVar_Result = var; + gSpecialVar_Result = input; break; case 5: gSpecialVar_Result = 2; diff --git a/src/decoration.c b/src/decoration.c index c4c3d61713..5a688704f0 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -526,14 +526,14 @@ void sub_8126B80(u8 taskId) PlaySE(SE_SELECT); sSecretBasePCMenuActions[sSecretBasePCMenuCursorPos].func.void_u8(taskId); break; - case -2: + case MENU_NOTHING_CHOSEN: sSecretBasePCMenuCursorPos = Menu_GetCursorPos(); if ((s8)menuPos != sSecretBasePCMenuCursorPos) { sub_8126C08(); } break; - case -1: + case MENU_B_PRESSED: PlaySE(SE_SELECT); SecretBasePC_Cancel(taskId); break; @@ -713,12 +713,12 @@ void sub_8127088(u8 taskId) input = Menu_ProcessInput(); switch (input) { - case -1: + case MENU_B_PRESSED: case 8: PlaySE(SE_SELECT); sub_812719C(taskId); break; - case -2: + case MENU_NOTHING_CHOSEN: break; default: PlaySE(SE_SELECT); @@ -933,13 +933,13 @@ void sub_812764C(u8 taskId) data = gTasks[taskId].data; if (!gPaletteFade.active) { - input = ListMenuHandleInputGetItemId(data[13]); + input = ListMenu_ProcessInput(data[13]); ListMenuGetScrollAndRow(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo); switch (input) { - case -1: + case LIST_NOTHING_CHOSEN: break; - case -2: + case LIST_B_PRESSED: PlaySE(SE_SELECT); SecretBasePC_SelectedDecorActions[data[11]][1](taskId); break; diff --git a/src/field_specials.c b/src/field_specials.c index 0dc1bf18b1..f2ebf2b8e2 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -2603,9 +2603,9 @@ static void sub_813A46C(s32 itemIndex, bool8 onInit, struct ListMenu *list) static void sub_813A4EC(u8 taskId) { struct Task *task = &gTasks[taskId]; - s32 itemId = ListMenuHandleInputGetItemId(task->data[14]); + s32 input = ListMenu_ProcessInput(task->data[14]); - switch (itemId) + switch (input) { case LIST_NOTHING_CHOSEN: break; @@ -2615,13 +2615,13 @@ static void sub_813A4EC(u8 taskId) sub_813A570(taskId); break; default: - gSpecialVar_Result = itemId; + gSpecialVar_Result = input; PlaySE(SE_SELECT); if (!task->data[6]) { sub_813A570(taskId); } - else if (itemId == task->data[1] - 1) + else if (input == task->data[1] - 1) { sub_813A570(taskId); } diff --git a/src/item_menu.c b/src/item_menu.c index a220f02efc..24a50aa9a0 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -1102,7 +1102,7 @@ void Task_BagMenu(u8 taskId) } else { - int listPosition = ListMenuHandleInputGetItemId(data[0]); + int listPosition = ListMenu_ProcessInput(data[0]); ListMenuGetScrollAndRow(data[0], scrollPos, cursorPos); switch (listPosition) { @@ -1304,7 +1304,7 @@ void bag_menu_swap_items(u8 taskId) void sub_81AC3C0(u8 taskId) { s16* data = gTasks[taskId].data; - int r7; + int input; if (sub_81221EC() != TRUE) { @@ -1316,15 +1316,15 @@ void sub_81AC3C0(u8 taskId) } else { - r7 = ListMenuHandleInputGetItemId(data[0]); + input = ListMenu_ProcessInput(data[0]); ListMenuGetScrollAndRow(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]); sub_80D4FC8(0); sub_80D4FEC(gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]); - switch (r7) + switch (input) { - case -1: + case LIST_NOTHING_CHOSEN: break; - case -2: + case LIST_B_PRESSED: PlaySE(SE_SELECT); if (gMain.newKeys & A_BUTTON) sub_81AC498(taskId); @@ -1546,9 +1546,9 @@ void Task_HandleInBattleItemMenuInput(u8 taskId) s8 r4 = Menu_ProcessInputNoWrap(); switch (r4) { - case -2: + case MENU_NOTHING_CHOSEN: break; - case -1: + case MENU_B_PRESSED: PlaySE(SE_SELECT); gUnknown_08613FB4[4].func.void_u8(taskId); break; diff --git a/src/learn_move.c b/src/learn_move.c index 4db83861e9..7a6916013a 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -638,7 +638,7 @@ static void HideSpritesAndPrintTeachText(bool8 a) static void HandleInput(bool8 showContest) { - s32 itemId = ListMenuHandleInputGetItemId(sLearnMoveStruct->listMenuTask); + s32 itemId = ListMenu_ProcessInput(sLearnMoveStruct->listMenuTask); ListMenuGetScrollAndRow(sLearnMoveStruct->listMenuTask, &sLearnMoveStruct2.listOffset, &sLearnMoveStruct2.listRow); switch (itemId) diff --git a/src/list_menu.c b/src/list_menu.c index 2476fae265..7a95476614 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -334,7 +334,7 @@ s32 DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenu sMysteryGiftLinkMenu.state = 1; break; case 1: - sMysteryGiftLinkMenu.currItemId = ListMenuHandleInputGetItemId(sMysteryGiftLinkMenu.listTaskId); + sMysteryGiftLinkMenu.currItemId = ListMenu_ProcessInput(sMysteryGiftLinkMenu.listTaskId); if (gMain.newKeys & A_BUTTON) { sMysteryGiftLinkMenu.state = 2; @@ -406,7 +406,7 @@ u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenu return taskId; } -s32 ListMenuHandleInputGetItemId(u8 listTaskId) +s32 ListMenu_ProcessInput(u8 listTaskId) { struct ListMenu *list = (void*) gTasks[listTaskId].data; diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 1b4a252179..fd8e74c0a7 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -1182,9 +1182,9 @@ static void Task_StoryListMenu(u8 taskId) // Task_StoryListMenu break; case 1: selection = Menu_ProcessInput(); - if (selection == -2) + if (selection == MENU_NOTHING_CHOSEN) break; - if (selection == -1 || selection == GetFreeStorySlot()) + if (selection == MENU_B_PRESSED || selection == GetFreeStorySlot()) { gSpecialVar_Result = 0; } diff --git a/src/player_pc.c b/src/player_pc.c index 474cecaf53..cff47ebc62 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -355,11 +355,11 @@ static void PlayerPCProcessMenuInput(u8 taskId) else inputOptionId = Menu_ProcessInputNoWrap(); - switch(inputOptionId) + switch (inputOptionId) { - case -2: + case MENU_NOTHING_CHOSEN: break; - case -1: + case MENU_B_PRESSED: PlaySE(SE_SELECT); sub_8198070(data[4], FALSE); ClearWindowTilemap(data[4]); @@ -464,13 +464,13 @@ static void ItemStorageMenuProcessInput(u8 taskId) r5 = Menu_GetCursorPos(); inputOptionId = Menu_ProcessInput(); r2 = Menu_GetCursorPos(); - switch(inputOptionId) + switch (inputOptionId) { - case -2: + case MENU_NOTHING_CHOSEN: if (r5 != r2) ItemStorageMenuPrint(gPCText_OptionDescList[r2]); break; - case -1: + case MENU_B_PRESSED: PlaySE(SE_SELECT); ItemStorage_Exit(taskId); break; @@ -638,14 +638,14 @@ static void Mailbox_ProcessInput(u8 taskId) if (!gPaletteFade.active) { - inputOptionId = ListMenuHandleInputGetItemId(data[5]); + inputOptionId = ListMenu_ProcessInput(data[5]); ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos)); - switch(inputOptionId) + switch (inputOptionId) { - case -1: + case LIST_NOTHING_CHOSEN: break; - case -2: + case LIST_B_PRESSED: PlaySE(SE_SELECT); RemoveScrollIndicatorArrowPair(playerPCItemPageInfo.scrollIndicatorId); Mailbox_ReturnToPlayerPC(taskId); @@ -1145,13 +1145,13 @@ static void ItemStorage_ProcessInput(u8 taskId) } else { - id = ListMenuHandleInputGetItemId(data[5]); + id = ListMenu_ProcessInput(data[5]); ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos)); switch(id) { - case -1: + case LIST_NOTHING_CHOSEN: break; - case -2: + case LIST_B_PRESSED: PlaySE(SE_SELECT); ItemStorage_GoBackToPlayerPCMenu(taskId); break; @@ -1218,21 +1218,23 @@ static void sub_816C4FC(u8 taskId) ItemStorage_DoItemSwap(taskId, FALSE); return; } - id = ListMenuHandleInputGetItemId(data[5]); + id = ListMenu_ProcessInput(data[5]); ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos)); sub_81223FC(gUnknown_0203BCC4->spriteIds, 7, 0); sub_816C690(playerPCItemPageInfo.cursorPos); switch(id) { - case -1: + case LIST_NOTHING_CHOSEN: break; - case -2: + case LIST_B_PRESSED: if (gMain.newKeys & A_BUTTON) { ItemStorage_DoItemSwap(taskId, FALSE); } else - ItemStorage_DoItemSwap(taskId, TRUE); + { + ItemStorage_DoItemSwap(taskId, TRUE); + } break; default: ItemStorage_DoItemSwap(taskId, FALSE); diff --git a/src/pokeblock.c b/src/pokeblock.c index 7c07f96559..3fd4f34df4 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -998,7 +998,7 @@ static void Task_HandlePokeblockMenuInput(u8 taskId) else { u16 oldPosition = sSavedPokeblockData.lastItemPos; - s32 itemId = ListMenuHandleInputGetItemId(data[0]); + s32 itemId = ListMenu_ProcessInput(data[0]); ListMenuGetScrollAndRow(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos); if (oldPosition != sSavedPokeblockData.lastItemPos) @@ -1044,7 +1044,7 @@ static void Task_HandlePokeblocksSwapInput(u8 taskId) { u16 i = sSavedPokeblockData.lastItemPage; u16 var = sSavedPokeblockData.lastItemPos; - s32 itemId = ListMenuHandleInputGetItemId(data[0]); + s32 itemId = ListMenu_ProcessInput(data[0]); ListMenuGetScrollAndRow(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos); if (i != sSavedPokeblockData.lastItemPage || var != sSavedPokeblockData.lastItemPos) diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 78fec2fc5f..c0aec4dddd 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -1753,7 +1753,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) task->data[2] = Menu_ProcessInput(); switch(task->data[2]) { - case -2: + case MENU_NOTHING_CHOSEN: task->data[3] = task->data[1]; if (gMain.newKeys & DPAD_UP && --task->data[3] < 0) task->data[3] = 4; @@ -1767,7 +1767,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3); } break; - case -1: + case MENU_B_PRESSED: case 4: sub_819746C(task->data[15], TRUE); ScriptContext2_Disable(); diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 41f7eeee74..c5ad67fbcd 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -1105,7 +1105,7 @@ void sub_80134E8(u8 taskId) RedrawListMenu(data->listTaskId); break; case 0: - id = ListMenuHandleInputGetItemId(data->listTaskId); + id = ListMenu_ProcessInput(data->listTaskId); if (gMain.newKeys & A_BUTTON && id != -1) { // this unused variable along with the assignment is needed to match @@ -2176,7 +2176,7 @@ void sub_8014F48(u8 taskId) RedrawListMenu(data->listTaskId); break; case 0: - id = ListMenuHandleInputGetItemId(data->listTaskId); + id = ListMenu_ProcessInput(data->listTaskId); if (gMain.newKeys & A_BUTTON && id != -1) { // this unused variable along with the assignment is needed to match @@ -2340,7 +2340,7 @@ void sub_80152F4(u8 taskId) break; case 0: if (data->field_13 != 0) - id = ListMenuHandleInputGetItemId(data->listTaskId); + id = ListMenu_ProcessInput(data->listTaskId); if (data->field_14 > 120) { if (data->field_0->arr[0].field_1A_0 == 1 && !data->field_0->arr[0].unk.field_0.unk_0a_7) diff --git a/src/script_menu.c b/src/script_menu.c index a4f4c6086c..7180bfc607 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1170,9 +1170,9 @@ static void Task_HandleMultichoiceInput(u8 taskId) sub_80E2A94(tMultichoiceId); } - if (selection != -2) + if (selection != MENU_NOTHING_CHOSEN) { - if (selection == -1) + if (selection == MENU_B_PRESSED) { if (tIgnoreBPress) return; diff --git a/src/secret_base.c b/src/secret_base.c index de5fae0777..adcab9cbc3 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -953,13 +953,13 @@ void sub_80E9E90(u8 taskId) s32 input; data = gTasks[taskId].data; - input = ListMenuHandleInputGetItemId(data[5]); + input = ListMenu_ProcessInput(data[5]); ListMenuGetScrollAndRow(data[5], &data[2], &data[1]); switch (input) { - case -1: + case LIST_NOTHING_CHOSEN: break; - case -2: + case LIST_B_PRESSED: PlaySE(SE_SELECT); DestroyListMenuTask(data[5], NULL, NULL); RemoveScrollIndicatorArrowPair(data[8]); @@ -1002,11 +1002,11 @@ void sub_80E9FB0(u8 taskId) input = Menu_ProcessInputNoWrap(); switch (input) { - case -1: + case MENU_B_PRESSED: PlaySE(SE_SELECT); sub_80EA18C(taskId); break; - case -2: + case MENU_NOTHING_CHOSEN: break; default: PlaySE(SE_SELECT); diff --git a/src/shop.c b/src/shop.c index c44cbca12e..8eefd5e97f 100755 --- a/src/shop.c +++ b/src/shop.c @@ -328,9 +328,9 @@ static void Task_ShopMenu(u8 taskId) s8 inputCode = Menu_ProcessInputNoWrap(); switch (inputCode) { - case LIST_B_PRESSED: + case MENU_NOTHING_CHOSEN: break; - case LIST_NOTHING_CHOSEN: + case MENU_B_PRESSED: PlaySE(SE_SELECT); Task_HandleShopMenuQuit(taskId); break; @@ -911,7 +911,7 @@ static void Task_BuyMenu(u8 taskId) if (!gPaletteFade.active) { - s32 itemId = ListMenuHandleInputGetItemId(tListTaskId); + s32 itemId = ListMenu_ProcessInput(tListTaskId); ListMenuGetScrollAndRow(tListTaskId, &gShopDataPtr->scrollOffset, &gShopDataPtr->selectedRow); switch (itemId) diff --git a/src/trader.c b/src/trader.c index e23efb4ce5..b5c159fb96 100644 --- a/src/trader.c +++ b/src/trader.c @@ -113,9 +113,9 @@ void Task_HandleGetDecorationMenuInput(u8 taskId) switch (input) { - case -2: + case MENU_NOTHING_CHOSEN: break; - case -1: + case MENU_B_PRESSED: case 4: PlaySE(SE_SELECT); sub_8133BE4(taskId, 0); From a740bc719037612da65941482e4a0dab4837c629 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 2 Feb 2019 11:32:00 +0100 Subject: [PATCH 006/217] Name action 11 --- include/battle.h | 7 ++++--- src/battle_main.c | 6 +++--- src/battle_script_commands.c | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/battle.h b/include/battle.h index 9295a35481..94596c75ea 100644 --- a/include/battle.h +++ b/include/battle.h @@ -28,10 +28,11 @@ #define B_ACTION_SAFARI_GO_NEAR 7 #define B_ACTION_SAFARI_RUN 8 #define B_ACTION_WALLY_THROW 9 -// The exact purposes of these are unclear -#define B_ACTION_EXEC_SCRIPT 10 // when executing an action +#define B_ACTION_EXEC_SCRIPT 10 +#define B_ACTION_TRY_FINISH 11 +#define B_ACTION_FINISHED 12 + #define B_ACTION_CANCEL_PARTNER 12 // when choosing an action -#define B_ACTION_FINISHED 12 // when executing an action #define B_ACTION_NOTHING_FAINTED 13 // when choosing an action #define B_ACTION_NONE 0xFF diff --git a/src/battle_main.c b/src/battle_main.c index 09ea3dfc9a..043e758087 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -139,7 +139,7 @@ static void HandleAction_ThrowPokeblock(void); static void HandleAction_GoNear(void); static void HandleAction_SafariZoneRun(void); static void HandleAction_WallyBallThrow(void); -static void HandleAction_Action11(void); +static void HandleAction_TryFinish(void); static void HandleAction_NothingIsFainted(void); static void HandleAction_ActionFinished(void); @@ -553,7 +553,7 @@ static void (* const sTurnActionsFuncsTable[])(void) = [B_ACTION_SAFARI_RUN] = HandleAction_SafariZoneRun, [B_ACTION_WALLY_THROW] = HandleAction_WallyBallThrow, [B_ACTION_EXEC_SCRIPT] = HandleAction_RunBattleScript, - [11] = HandleAction_Action11, // not sure about this one + [B_ACTION_TRY_FINISH] = HandleAction_TryFinish, [B_ACTION_FINISHED] = HandleAction_ActionFinished, [B_ACTION_NOTHING_FAINTED] = HandleAction_NothingIsFainted, }; @@ -5845,7 +5845,7 @@ static void HandleAction_WallyBallThrow(void) gActionsByTurnOrder[1] = B_ACTION_FINISHED; } -static void HandleAction_Action11(void) +static void HandleAction_TryFinish(void) { if (!HandleFaintedMonActions()) { diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 6bbee842ea..6023b2c1b6 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -4233,13 +4233,13 @@ static void atk3D_end(void) gMoveResultFlags = 0; gActiveBattler = 0; - gCurrentActionFuncId = 0xB; + gCurrentActionFuncId = B_ACTION_TRY_FINISH; } static void atk3E_end2(void) { gActiveBattler = 0; - gCurrentActionFuncId = 0xB; + gCurrentActionFuncId = B_ACTION_TRY_FINISH; } static void atk3F_end3(void) // pops the main function stack From a7f94bbeeaaee3ef6c1f192c9010ca39d3262884 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 2 Feb 2019 11:55:11 +0100 Subject: [PATCH 007/217] Dump last battle anim file --- data/battle_anim_80A9C70.s | 89 ------------------- include/battle_anim.h | 4 + ld_script.txt | 1 - src/battle_anim_80A9C70.c | 176 +++++++++++++++++++++++++++++++++++++ 4 files changed, 180 insertions(+), 90 deletions(-) delete mode 100644 data/battle_anim_80A9C70.s diff --git a/data/battle_anim_80A9C70.s b/data/battle_anim_80A9C70.s deleted file mode 100644 index f82a657b91..0000000000 --- a/data/battle_anim_80A9C70.s +++ /dev/null @@ -1,89 +0,0 @@ -#include "constants/battle_anim.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_0853EDE4:: @ 853EDE4 - .2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x000c, 0x0003, 0xfffe, 0x0000 - - .align 2 -gUnknown_0853EDF8:: @ 853EDF8 - .4byte gUnknown_0853EDE4 - - .align 2 -gUnknown_0853EDFC:: @ 853EDFC - spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC - spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8A6C - - .align 2 -gUnknown_0853EE2C:: @ 853EE2C - .2byte 0x0000, 0x0003, 0xfffe, 0x0000 - - .align 2 -gUnknown_0853EE34:: @ 853EE34 - .4byte gUnknown_0853EE2C - - .align 2 -gUnknown_0853EE38:: @ 853EE38 - spr_template ANIM_TAG_WEATHER_BALL, ANIM_TAG_WEATHER_BALL, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8E30 - - .align 2 -gUnknown_0853EE50:: @ 853EE50 - spr_template ANIM_TAG_WEATHER_BALL, ANIM_TAG_WEATHER_BALL, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8EE4 - - .align 2 -gUnknown_0853EE68:: @ 853EE68 - .2byte 0x0000, 0x0003, 0x0010, 0x0003, 0x0020, 0x0003, 0x0030, 0x0003, 0x0040, 0x0003, 0xffff, 0x0000 - - .align 2 -gUnknown_0853EE80:: @ 853EE80 - .4byte gUnknown_0853EE68 - - .align 2 -gUnknown_0853EE84:: @ 853EE84 - spr_template ANIM_TAG_SPARKLE_4, ANIM_TAG_SPARKLE_4, gUnknown_08524914, gUnknown_0853EE80, NULL, gDummySpriteAffineAnimTable, sub_80A8B64 - spr_template ANIM_TAG_UNUSED_MONSTER_FOOT, ANIM_TAG_UNUSED_MONSTER_FOOT, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC - - .align 2 -gUnknown_0853EEB4:: @ 853EEB4 - .2byte 0x0000, 0x0005, 0xfffe, 0x0000 - - .align 2 -gUnknown_0853EEBC:: @ 853EEBC - .2byte 0x0000, 0x0005, 0xfffe, 0x0000 - - .align 2 -gUnknown_0853EEC4:: @ 853EEC4 - .2byte 0x0000, 0x0005, 0xfffe, 0x0000 - - .align 2 -gUnknown_0853EECC:: @ 853EECC - .4byte gUnknown_0853EEB4 - .4byte gUnknown_0853EEBC - .4byte gUnknown_0853EEC4 - - .align 2 -gUnknown_0853EED8:: @ 853EED8 - spr_template ANIM_TAG_IMPACT, ANIM_TAG_IMPACT, gUnknown_08524914, gUnknown_0853EECC, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC - - .align 2 -gUnknown_0853EEF0:: @ 853EEF0 - .2byte 0x0000, 0x000f, 0xfffe, 0x0000 - - .align 2 -gUnknown_0853EEF8:: @ 853EEF8 - .4byte gUnknown_0853EEF0 - - .align 2 -gUnknown_0853EEFC:: @ 853EEFC - .2byte 0x0060, 0x0060, 0x0000, 0x0000, 0x0002, 0x0002, 0x0100, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_0853EF14:: @ 853EF14 - .4byte gUnknown_0853EEFC - - .align 2 -gUnknown_0853EF18:: @ 853EF18 - spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_085249CC, gUnknown_0853EEF8, NULL, gUnknown_0853EF14, sub_80A8A6C diff --git a/include/battle_anim.h b/include/battle_anim.h index fc0f603eb0..8e8a176753 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -75,6 +75,10 @@ int GetAnimBgAttribute(u8 bgId, u8 attributeId); // battle_anim_80A5C6C.s void sub_80A6450(struct Sprite *sprite); +void sub_80A8AEC(struct Sprite *sprite); +void sub_80A8A6C(struct Sprite *sprite); +void sub_80A8E30(struct Sprite *sprite); +void sub_80A8B64(struct Sprite *sprite); void SetAverageBattlerPositions(u8 battlerId, bool8 respectMonPicOffsets, s16 *x, s16 *y); void DestroySpriteAndMatrix(struct Sprite *sprite); void AnimTranslateLinearSimple(struct Sprite *sprite); diff --git a/ld_script.txt b/ld_script.txt index bf8d4bde94..306a1f4b07 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -441,7 +441,6 @@ SECTIONS { src/battle_anim.o(.rodata); src/battle_anim_80A5C6C.o(.rodata); data/map_events.o(.rodata); - data/battle_anim_80A9C70.o(.rodata); src/battle_anim_80A9C70.o(.rodata); src/title_screen.o(.rodata); src/field_weather.o(.rodata); diff --git a/src/battle_anim_80A9C70.c b/src/battle_anim_80A9C70.c index 001f99d7fa..1271680e02 100644 --- a/src/battle_anim_80A9C70.c +++ b/src/battle_anim_80A9C70.c @@ -28,6 +28,182 @@ static void sub_80A9E44(struct Sprite *sprite); static void sub_80A9E78(struct Sprite *sprite); // const rom data +static const union AnimCmd sSpriteAnim_853EDE4[] = +{ + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(4, 3), + ANIMCMD_FRAME(8, 3), + ANIMCMD_FRAME(12, 3), + ANIMCMD_JUMP(0) +}; + +static const union AnimCmd *const sSpriteAnimTable_853EDF8[] = +{ + sSpriteAnim_853EDE4 +}; + +const struct SpriteTemplate gUnknown_0853EDFC = +{ + .tileTag = ANIM_TAG_UNUSED_ORB, + .paletteTag = ANIM_TAG_UNUSED_ORB, + .oam = &gUnknown_0852490C, + .anims = sSpriteAnimTable_853EDF8, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8AEC, +}; + +const struct SpriteTemplate gUnknown_0853EE14 = +{ + .tileTag = ANIM_TAG_UNUSED_ORB, + .paletteTag = ANIM_TAG_UNUSED_ORB, + .oam = &gUnknown_0852490C, + .anims = sSpriteAnimTable_853EDF8, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8A6C, +}; + +static const union AnimCmd sSpriteAnim_853EE2C[] = +{ + ANIMCMD_FRAME(0, 3), + ANIMCMD_JUMP(0) +}; + +static const union AnimCmd *const sSpriteAnimTable_853EE34[] = +{ + sSpriteAnim_853EE2C +}; + +const struct SpriteTemplate gUnknown_0853EE38 = +{ + .tileTag = ANIM_TAG_WEATHER_BALL, + .paletteTag = ANIM_TAG_WEATHER_BALL, + .oam = &gUnknown_08524914, + .anims = sSpriteAnimTable_853EE34, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8E30, +}; + +const struct SpriteTemplate gUnknown_0853EE50 = +{ + .tileTag = ANIM_TAG_WEATHER_BALL, + .paletteTag = ANIM_TAG_WEATHER_BALL, + .oam = &gUnknown_08524914, + .anims = sSpriteAnimTable_853EE34, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8EE4, +}; + +static const union AnimCmd sSpriteAnim_853EE68[] = +{ + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(16, 3), + ANIMCMD_FRAME(32, 3), + ANIMCMD_FRAME(48, 3), + ANIMCMD_FRAME(64, 3), + ANIMCMD_END +}; + +static const union AnimCmd *const sSpriteAnimTable_853EE80[] = +{ + sSpriteAnim_853EE68 +}; + +const struct SpriteTemplate gUnknown_0853EE84 = +{ + .tileTag = ANIM_TAG_SPARKLE_4, + .paletteTag = ANIM_TAG_SPARKLE_4, + .oam = &gUnknown_08524914, + .anims = sSpriteAnimTable_853EE80, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8B64, +}; + +const struct SpriteTemplate gUnknown_0853EE9C = +{ + .tileTag = ANIM_TAG_UNUSED_MONSTER_FOOT, + .paletteTag = ANIM_TAG_UNUSED_MONSTER_FOOT, + .oam = &gUnknown_08524914, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8AEC, +}; + +static const union AnimCmd sSpriteAnim_853EEB4[] = +{ + ANIMCMD_FRAME(0, 5), + ANIMCMD_JUMP(0) +}; + +static const union AnimCmd sSpriteAnim_853EEBC[] = +{ + ANIMCMD_FRAME(0, 5), + ANIMCMD_JUMP(0) +}; + +static const union AnimCmd sSpriteAnim_853EEC4[] = +{ + ANIMCMD_FRAME(0, 5), + ANIMCMD_JUMP(0) +}; + +static const union AnimCmd *const sSpriteAnimTable_853EECC[] = +{ + sSpriteAnim_853EEB4, + sSpriteAnim_853EEBC, + sSpriteAnim_853EEC4 +}; + +const struct SpriteTemplate gUnknown_0853EED8 = +{ + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, + .oam = &gUnknown_08524914, + .anims = sSpriteAnimTable_853EECC, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8AEC, +}; + +static const union AnimCmd sSpriteAnim_853EEF0[] = +{ + ANIMCMD_FRAME(0, 15), + ANIMCMD_JUMP(0) +}; + +static const union AnimCmd *const sSpriteAnimTable_853EEF8[] = +{ + sSpriteAnim_853EEF0 +}; + +static const union AffineAnimCmd sSpriteAffineAnim_853EEFC[] = +{ + AFFINEANIMCMD_FRAME(96, 96, 0, 0), + AFFINEANIMCMD_FRAME(2, 2, 0, 1), + AFFINEANIMCMD_JUMP(1) +}; + +static const union AffineAnimCmd *const sSpriteAffineAnimTable_853EEF8[] = +{ + sSpriteAffineAnim_853EEFC +}; + +const struct SpriteTemplate gUnknown_0853EF18 = +{ + .tileTag = ANIM_TAG_UNUSED_ORB, + .paletteTag = ANIM_TAG_UNUSED_ORB, + .oam = &gUnknown_085249CC, + .anims = sSpriteAnimTable_853EEF8, + .images = NULL, + .affineAnims = sSpriteAffineAnimTable_853EEF8, + .callback = sub_80A8A6C, +}; + static const struct Subsprite gUnknown_0853EF30[] = { {.x = -16, .y = -16, .shape = ST_OAM_SQUARE, .size = 3, .tileOffset = 0, .priority = 2}, From 363fa9bed25ad58e0b43bf3941903f5e83359f29 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 2 Feb 2019 12:44:00 +0100 Subject: [PATCH 008/217] Clean up ram vars --- common_syms/contest_painting.txt | 4 ++ common_syms/contest_painting_effects.txt | 10 ++++ common_syms/evolution_scene.txt | 1 + common_syms/party_menu.txt | 1 + common_syms/pokedex_cry_screen.txt | 1 + include/contest.h | 2 + include/contest_painting.h | 3 -- include/party_menu.h | 2 + include/pokedex_cry_screen.h | 2 + include/trade.h | 3 ++ src/cable_club.c | 4 +- src/contest.c | 2 + src/contest_link_80F57C4.c | 16 +++---- src/contest_painting.c | 13 ++--- src/contest_painting_effects.c | 19 ++++---- src/dragon.c | 4 +- src/evolution_scene.c | 15 +++--- src/item_use.c | 5 +- src/party_menu.c | 4 +- src/pokedex.c | 2 - src/pokedex_cry_screen.c | 5 +- src/rom_8011DC0.c | 2 - src/trainer_card.c | 1 + sym_common.txt | 61 ++++-------------------- sym_ewram.txt | 36 ++------------ 25 files changed, 86 insertions(+), 132 deletions(-) create mode 100644 common_syms/contest_painting.txt create mode 100644 common_syms/contest_painting_effects.txt create mode 100644 common_syms/evolution_scene.txt create mode 100644 common_syms/party_menu.txt create mode 100644 common_syms/pokedex_cry_screen.txt diff --git a/common_syms/contest_painting.txt b/common_syms/contest_painting.txt new file mode 100644 index 0000000000..1fba37a59d --- /dev/null +++ b/common_syms/contest_painting.txt @@ -0,0 +1,4 @@ +gUnknown_03006190 +gUnknown_030061A0 +gUnknown_030061C0 +gContestPaintingMonPalette diff --git a/common_syms/contest_painting_effects.txt b/common_syms/contest_painting_effects.txt new file mode 100644 index 0000000000..2f3d792196 --- /dev/null +++ b/common_syms/contest_painting_effects.txt @@ -0,0 +1,10 @@ +gUnknown_03006164 +gUnknown_03006168 +gUnknown_0300616C +gUnknown_03006170 +gUnknown_03006174 +gUnknown_03006178 +gUnknown_0300617C +gUnknown_03006180 +gUnknown_03006184 +gUnknown_03006188 diff --git a/common_syms/evolution_scene.txt b/common_syms/evolution_scene.txt new file mode 100644 index 0000000000..137cd3e05d --- /dev/null +++ b/common_syms/evolution_scene.txt @@ -0,0 +1 @@ +gCB2_AfterEvolution diff --git a/common_syms/party_menu.txt b/common_syms/party_menu.txt new file mode 100644 index 0000000000..53e72fa531 --- /dev/null +++ b/common_syms/party_menu.txt @@ -0,0 +1 @@ +gUnknown_03006328 diff --git a/common_syms/pokedex_cry_screen.txt b/common_syms/pokedex_cry_screen.txt new file mode 100644 index 0000000000..d16ec36d64 --- /dev/null +++ b/common_syms/pokedex_cry_screen.txt @@ -0,0 +1 @@ +gDexCryScreenState diff --git a/include/contest.h b/include/contest.h index 35b88698e3..e4391a3273 100644 --- a/include/contest.h +++ b/include/contest.h @@ -437,6 +437,8 @@ extern u8 gHighestRibbonRank; extern struct ContestResources *gContestResources; extern u8 sContestBgCopyFlags; extern struct ContestWinner gUnknown_02039F3C; +extern u8 gUnknown_02039F5C; +extern u8 gUnknown_02039F5D; extern u32 gContestRngValue; diff --git a/include/contest_painting.h b/include/contest_painting.h index ca03a72b5b..c633c50ccc 100644 --- a/include/contest_painting.h +++ b/include/contest_painting.h @@ -13,7 +13,4 @@ enum void sub_812FDA8(int); void CB2_ContestPainting(void); -extern u8 gUnknown_02039F5C; -extern u8 gUnknown_02039F5D; - #endif diff --git a/include/party_menu.h b/include/party_menu.h index ae7c414a8e..702b4fde17 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -48,6 +48,8 @@ extern MainCallback gPostMenuFieldCallback; extern u8 gSelectedOrderFromParty[4]; extern u8 gUnknown_0203CF00[3]; +extern void (*gUnknown_03006328)(u8, TaskFunc); + extern const u16 gTutorMoves[]; void sub_81B0FCC(u8 slot, u8 b); diff --git a/include/pokedex_cry_screen.h b/include/pokedex_cry_screen.h index 392e80a6d3..93f1b02a5c 100755 --- a/include/pokedex_cry_screen.h +++ b/include/pokedex_cry_screen.h @@ -10,6 +10,8 @@ struct CryRelatedStruct u8 yPos; }; +extern u8 gDexCryScreenState; + bool8 sub_8145354(struct CryRelatedStruct*, u8); void sub_814545C(u8); void sub_8145534(u16); diff --git a/include/trade.h b/include/trade.h index 95a10cacf5..0c95e1e81f 100644 --- a/include/trade.h +++ b/include/trade.h @@ -6,8 +6,11 @@ // Exported type declarations // Exported RAM declarations +extern struct MailStruct gUnknown_020321C0[PARTY_SIZE]; +extern u8 gUnknown_02032298[2]; // Exported ROM declarations +extern const struct WindowTemplate gUnknown_0833900C; s32 sub_807A728(void); void sub_80773AC(void); diff --git a/src/cable_club.c b/src/cable_club.c index ce9b9db058..303b0d016c 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -27,12 +27,10 @@ #include "task.h" #include "trade.h" #include "trainer_card.h" +#include "party_menu.h" #include "window.h" #include "constants/songs.h" -extern u8 gUnknown_02032298[2]; -extern u8 gSelectedOrderFromParty[]; - static const struct WindowTemplate gUnknown_08550594 = { .bg = 0, .tilemapLeft = 16, diff --git a/src/contest.c b/src/contest.c index b24036f39b..cf084e35e4 100644 --- a/src/contest.c +++ b/src/contest.c @@ -214,6 +214,8 @@ EWRAM_DATA u8 gHighestRibbonRank = 0; EWRAM_DATA struct ContestResources *gContestResources = NULL; EWRAM_DATA u8 sContestBgCopyFlags = 0; EWRAM_DATA struct ContestWinner gUnknown_02039F3C = {0}; +EWRAM_DATA u8 gUnknown_02039F5C = 0; +EWRAM_DATA u8 gUnknown_02039F5D = 0; // IWRAM common vars. u32 gContestRngValue; diff --git a/src/contest_link_80F57C4.c b/src/contest_link_80F57C4.c index 721a4f8706..381fb34fab 100644 --- a/src/contest_link_80F57C4.c +++ b/src/contest_link_80F57C4.c @@ -3,7 +3,6 @@ #include "bg.h" #include "contest.h" #include "contest_link_80F57C4.h" -#include "contest_painting.h" #include "decompress.h" #include "dma3.h" #include "event_data.h" @@ -67,10 +66,9 @@ struct ContestLink80F57C4 u8 *unkC[4]; }; +EWRAM_DATA struct ContestLink80F57C4 *gUnknown_0203A034 = NULL; + extern const struct CompressedSpriteSheet gMonFrontPicTable[]; - -extern struct ContestLink80F57C4 *gUnknown_0203A034; - extern const struct BgTemplate gUnknown_0858D888[4]; extern const struct WindowTemplate gUnknown_0858D898[]; extern const struct CompressedSpriteSheet gUnknown_0858D878[]; @@ -138,7 +136,7 @@ void sub_80F57C4(void) InitBgsFromTemplates(0, gUnknown_0858D888, ARRAY_COUNT(gUnknown_0858D888)); for (i = 0; i < 4; i++) SetBgTilemapBuffer(i, gUnknown_0203A034->unkC[i]); - + InitWindows(gUnknown_0858D898); DeactivateAllTextPrinters(); SetGpuReg(REG_OFFSET_MOSAIC, 0); @@ -720,7 +718,7 @@ static void sub_80F66B4(u8 taskId) { nationalDexNum = SpeciesToNationalPokedexNum(gContestMons[i].species); GetSetPokedexFlag(nationalDexNum, FLAG_SET_SEEN); - } + } } gTasks[taskId].data[10] = 0; @@ -761,7 +759,7 @@ static void sub_80F67C4(u8 taskId) { if (!(gIsLinkContest & 0x1)) BravoTrainerPokemonProfile_BeforeInterview2(gContestFinalStandings[gContestPlayerMonIndex]); - + BeginHardwarePaletteFade(0xFF, 0, 0, 16, 0); gTasks[taskId].func = sub_80F6820; } @@ -1282,7 +1280,7 @@ static void sub_80F6F68(struct Sprite *sprite) struct Sprite *sprite2 = &gSprites[sprite->data[i]]; sprite2->pos1.x = sprite->pos1.x + sprite->pos2.x + (i + 1) * 64; } - + if (sprite->pos1.x == sprite->data[4]) sprite->callback = sub_80F6FDC; } @@ -1348,7 +1346,7 @@ static void sub_80F7144(void) sprite->invisible = 1; for (i = 0; i < 3; i++) gSprites[sprite->data[i]].invisible = 1; - + gBattle_WIN0H = 0; gBattle_WIN0V = 0; SetGpuReg(REG_OFFSET_WIN0H, gBattle_WIN0H); diff --git a/src/contest_painting.c b/src/contest_painting.c index 0ed169a774..71a110aa84 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -20,10 +20,11 @@ #include "window.h" #include "constants/rgb.h" -extern u16 (*gUnknown_03006190)[][32]; -extern struct ContestWinner *gUnknown_030061C0; -extern u16 *gContestPaintingMonPalette; -extern struct Unk030061A0 gUnknown_030061A0; +// IWRAM common +u16 (*gUnknown_03006190)[][32]; +struct Unk030061A0 gUnknown_030061A0; +struct ContestWinner *gUnknown_030061C0; +u16 *gContestPaintingMonPalette; // IWRAM bss IWRAM_DATA u8 gContestPaintingState; @@ -103,7 +104,7 @@ const u8 *const gContestRankTextPointers[] = gContestLink, }; -const struct BgTemplate gUnknown_085B07E8[] = +const struct BgTemplate gUnknown_085B07E8[] = { { .bg = 1, @@ -116,7 +117,7 @@ const struct BgTemplate gUnknown_085B07E8[] = }, }; -const struct WindowTemplate gUnknown_085B07EC = +const struct WindowTemplate gUnknown_085B07EC = { .bg = 1, .tilemapLeft = 2, diff --git a/src/contest_painting_effects.c b/src/contest_painting_effects.c index 187a0f1968..142ad7bc91 100644 --- a/src/contest_painting_effects.c +++ b/src/contest_painting_effects.c @@ -3,14 +3,17 @@ #include "contest_painting.h" #include "constants/rgb.h" -extern u8 gUnknown_03006164; -extern u16 (*gUnknown_03006168)[][32]; -extern u8 gUnknown_0300616C; -extern u8 gUnknown_03006170; -extern u8 gUnknown_03006174; -extern u8 gUnknown_03006178; -extern u8 gUnknown_0300617C; -extern u8 gUnknown_03006180; +// IWRAM common +u8 gUnknown_03006164; +u16 (*gUnknown_03006168)[][32]; +u8 gUnknown_0300616C; +u8 gUnknown_03006170; +u8 gUnknown_03006174; +u8 gUnknown_03006178; +u8 gUnknown_0300617C; +u8 gUnknown_03006180; +u16 gUnknown_03006184; +u16 gUnknown_03006188; // this file's functions void sub_8125230(void); diff --git a/src/dragon.c b/src/dragon.c index 4a2ac1c515..9b39a8a30e 100644 --- a/src/dragon.c +++ b/src/dragon.c @@ -5,8 +5,6 @@ #include "trig.h" #include "constants/rgb.h" -extern u16 gUnknown_0203A100[]; - void sub_8113064(struct Sprite *); void sub_81131B4(struct Sprite *); void sub_8113224(struct Sprite *); @@ -17,6 +15,8 @@ static void sub_81134B8(u8); static void sub_8113574(struct Task *); static void sub_811369C(struct Sprite *); +EWRAM_DATA static u16 gUnknown_0203A100[7] = {0}; + const union AnimCmd gUnknown_08596E60[] = { ANIMCMD_FRAME(0, 4), diff --git a/src/evolution_scene.c b/src/evolution_scene.c index c97e2d10fc..4bf7701be9 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -9,6 +9,7 @@ #include "evolution_graphics.h" #include "gpu_regs.h" #include "link.h" +#include "link_rfu.h" #include "m4a.h" #include "main.h" #include "menu.h" @@ -16,10 +17,12 @@ #include "palette.h" #include "pokedex.h" #include "pokemon.h" +#include "pokemon_summary_screen.h" #include "scanline_effect.h" #include "sound.h" #include "sprite.h" #include "string_util.h" +#include "strings.h" #include "task.h" #include "text.h" #include "text_window.h" @@ -39,22 +42,18 @@ struct EvoInfo u16 savedPalette[48]; }; +// EWRAM vars static EWRAM_DATA struct EvoInfo *sEvoStructPtr = NULL; static EWRAM_DATA u16 *sEvoMovingBgPtr = NULL; +// IWRAM common +void (*gCB2_AfterEvolution)(void); + #define sEvoCursorPos gBattleCommunication[1] // when learning a new move #define sEvoGraphicsTaskID gBattleCommunication[2] -extern const struct WindowTemplate gUnknown_0833900C; extern const struct CompressedSpriteSheet gMonFrontPicTable[]; -// strings -extern const u8 gText_CommunicationStandby5[]; - -extern void ShowSelectMovePokemonSummaryScreen(struct Pokemon *party, u8 monId, u8 partyCount, void *CB2_ptr, u16 move); -extern u8 sub_81C1B94(void); -extern void sub_800E084(void); - // this file's functions static void Task_EvolutionScene(u8 taskID); static void Task_TradeEvolutionScene(u8 taskID); diff --git a/src/item_use.c b/src/item_use.c index 6a7f6cec05..0ea5f6acf7 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -38,8 +38,6 @@ #include "constants/songs.h" #include "constants/vars.h" -extern void(*gUnknown_0203A0F4)(u8 taskId); -extern void (*gUnknown_03006328)(u8, TaskFunc); extern void unknown_ItemMenu_Confirm(u8 taskId); extern void sub_81C5B14(u8 taskId); extern void ScriptUnfreezeEventObjects(void); @@ -100,6 +98,9 @@ void sub_80FDBEC(void); bool8 sub_80FDE2C(void); void ItemUseOutOfBattle_CannotUse(u8 taskId); +// EWRAM variables +EWRAM_DATA static void(*gUnknown_0203A0F4)(u8 taskId) = NULL; + // .rodata static const MainCallback gUnknown_085920D8[] = diff --git a/src/party_menu.c b/src/party_menu.c index 8193fcf31a..15b5d24d8e 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -119,6 +119,7 @@ struct Struct203CEDC u8 unkC; }; +// EWRAM vars static EWRAM_DATA struct Struct203CEC4 *gUnknown_0203CEC4 = NULL; EWRAM_DATA struct Struct203CEC8 gUnknown_0203CEC8 = {0}; static EWRAM_DATA struct Struct203CEDC *gUnknown_0203CEDC = NULL; @@ -134,7 +135,8 @@ static EWRAM_DATA u16 gUnknown_0203CEFC = 0; static EWRAM_DATA u16 gUnknown_0203CEFE = 0; // unused EWRAM_DATA u8 gUnknown_0203CF00[3] = {0}; -extern void (*gUnknown_03006328)(u8, TaskFunc); +// IWRAM common +void (*gUnknown_03006328)(u8, TaskFunc); static void reset_brm(void); static void PartyMenuInitCallback(void); diff --git a/src/pokedex.c b/src/pokedex.c index f99a8226a8..c47ada5b8b 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -30,8 +30,6 @@ #include "constants/songs.h" #include "constants/species.h" -extern u8 gDexCryScreenState; - // EWRAM static EWRAM_DATA struct PokedexView *sPokedexView = NULL; static EWRAM_DATA u16 gUnknown_02039B50 = 0; diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c index 4a9227b996..c385141d53 100755 --- a/src/pokedex_cry_screen.c +++ b/src/pokedex_cry_screen.c @@ -39,7 +39,10 @@ static void sub_8145824(u8, s16, u8); static void sub_814596C(struct Sprite *); static void sub_8145B24(s8); -extern u8 gDexCryScreenState; +// IWRAM common +u8 gDexCryScreenState; + +// EWRAM vars static EWRAM_DATA struct PokedexCryScreen *sDexCryScreen = NULL; static EWRAM_DATA u8 *sCryWaveformWindowTiledata = NULL; static EWRAM_DATA struct PokedexCryVolumeMeter *sCryVolumeMeter = NULL; diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 41f7eeee74..3b679e1d98 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -189,8 +189,6 @@ extern u16 gUnknown_02022C3C; extern u8 gUnknown_02022C20[]; extern u8 gFieldLinkPlayerCount; extern u8 gUnknown_03005DB4; -extern struct MailStruct gUnknown_020321C0[PARTY_SIZE]; -extern u8 gUnknown_02032298[2]; // IWRAM vars IWRAM_DATA struct UnkStruct_Leader *gUnknown_03000DA0; diff --git a/src/trainer_card.c b/src/trainer_card.c index b7bd5cc1dd..49a62284f9 100755 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -93,6 +93,7 @@ struct TrainerCardData extern u8 sub_80D30A0(u16); // EWRAM +EWRAM_DATA struct TrainerCard gTrainerCards[4] = {0}; EWRAM_DATA static struct TrainerCardData *sData = NULL; //this file's functions diff --git a/sym_common.txt b/sym_common.txt index 7ec936a934..414d223e96 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -23,57 +23,14 @@ .include "contest.o" .include "tv.o" .include "mauville_old_man.o" - -gUnknown_03006164: @ 3006164 + .include "contest_painting_effects.o" + .space 0x4 - -gUnknown_03006168: @ 3006168 - .space 0x4 - -gUnknown_0300616C: @ 300616C - .space 0x4 - -gUnknown_03006170: @ 3006170 - .space 0x4 - -gUnknown_03006174: @ 3006174 - .space 0x4 - -gUnknown_03006178: @ 3006178 - .space 0x4 - -gUnknown_0300617C: @ 300617C - .space 0x4 - -gUnknown_03006180: @ 3006180 - .space 0x4 - -gUnknown_03006184: @ 3006184 - .space 0x4 - -gUnknown_03006188: @ 3006188 - .space 0x8 - -gUnknown_03006190: @ 3006190 - .space 0x10 - -gUnknown_030061A0: @ 30061A0 - .space 0x20 - -gUnknown_030061C0: @ 30061C0 - .space 0x4 - -gContestPaintingMonPalette: @ 30061C4 - .space 0xC - + + .include "contest_painting.o" .include "field_specials.o" - -gCB2_AfterEvolution: @ 30061E8 - .space 0x4 - -gDexCryScreenState: @ 30061EC - .space 0x4 - + .include "evolution_scene.o" + .include "pokedex_cry_screen.o" .include "save.o" .include "battle_tower.o" .include "intro.o" @@ -84,9 +41,9 @@ gDexCryScreenState: @ 30061EC .space 0x8 .include "list_menu.o" - -gUnknown_03006328: @ 3006328 - .space 0x48 + .include "party_menu.o" + + .space 0x44 gUnknown_03006370: @ 3006370 .space 0x10 diff --git a/sym_ewram.txt b/sym_ewram.txt index 9e836d0fea..361c0921f6 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -140,19 +140,6 @@ gUnknown_02022D00: @ 2022D00 .include "src/scanline_effect.o" .include "src/option_menu.o" .include "src/pokedex.o" - -gTrainerCards: @ 2039B58 - .space 0x14 - -gUnknown_02039B6C: @ 2039B6C - .space 0x2 - -gUnknown_02039B6E: @ 2039B6E - .space 0x1A - -gUnknown_02039B88: @ 2039B88 - .space 0x160 - .include "src/trainer_card.o" .include "src/frontier_pass.o" .include "src/pokemon_storage_system.o" @@ -161,14 +148,6 @@ gUnknown_02039B88: @ 2039B88 .include "src/map_name_popup.o" .include "src/item.o" .include "src/contest.o" - - .align 2 -gUnknown_02039F5C: @ 2039F5C - .space 0x1 - -gUnknown_02039F5D: @ 2039F5D - .space 0x3 - .include "src/shop.o" .include "src/fldeff_escalator.o" .include "src/script_menu.o" @@ -177,21 +156,12 @@ gUnknown_02039F5D: @ 2039F5D .include "src/record_mixing.o" .include "src/secret_base.o" .include "src/tv.o" - -gUnknown_0203A034: @ 203A034 - .space 0x4 - + .include "src/contest_link_80F57C4.o" .include "src/rotating_gate.o" .include "src/safari_zone.o" - -gUnknown_0203A0F4: @ 203A0F4 - .space 0x4 - + .include "src/item_use.o" .include "src/battle_anim_effects_1.o" - -gUnknown_0203A100: @ 203A100 - .space 0x10 - + .include "src/dragon.o" .include "src/battle_anim_utility_funcs.o" .include "src/battle_intro.o" .include "src/easy_chat.o" From ea79f1c8f6803d69fad9b5cb64b4e9767b7c1903 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 2 Feb 2019 19:41:34 +0100 Subject: [PATCH 009/217] tabs --- src/player_pc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/player_pc.c b/src/player_pc.c index cff47ebc62..0d08a5e7b2 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -1232,9 +1232,9 @@ static void sub_816C4FC(u8 taskId) ItemStorage_DoItemSwap(taskId, FALSE); } else - { - ItemStorage_DoItemSwap(taskId, TRUE); - } + { + ItemStorage_DoItemSwap(taskId, TRUE); + } break; default: ItemStorage_DoItemSwap(taskId, FALSE); From d64a905d65d638b7c76e86a2326f5077c3352b11 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 2 Feb 2019 15:53:47 -0600 Subject: [PATCH 010/217] Document trainer backsprites --- src/battle_controller_link_opponent.c | 4 +-- src/data/pokemon/trainer_class_lookups.h | 4 +-- src/data/trainer_graphics/back_pic_anims.h | 12 +++---- src/data/trainer_graphics/back_pic_tables.h | 32 +++++++++--------- src/data2b.c | 18 +++++------ src/pokemon.c | 36 ++++++++++----------- 6 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index a7b08a9742..d69e05b9e8 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -1278,7 +1278,7 @@ static void LinkOpponentHandleDrawTrainerPic(void) else if ((gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_FIRE_RED || (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_LEAF_GREEN) { - if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0) + if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != MALE) trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_LEAF]; else trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RED]; @@ -1286,7 +1286,7 @@ static void LinkOpponentHandleDrawTrainerPic(void) else if ((gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_RUBY || (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_SAPPHIRE) { - if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0) + if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != MALE) trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_MAY]; else trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_BRENDAN]; diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h index 6e8474c12e..04c7ab3c41 100644 --- a/src/data/pokemon/trainer_class_lookups.h +++ b/src/data/pokemon/trainer_class_lookups.h @@ -146,10 +146,10 @@ const u8 gFacilityClassToTrainerClass[] = [FACILITY_CLASS_TWINS] = TRAINER_CLASS_TWINS, [FACILITY_CLASS_SAILOR] = TRAINER_CLASS_SAILOR, [FACILITY_CLASS_WALLY] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_MAY] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_3, [FACILITY_CLASS_BRENDAN_2] = TRAINER_CLASS_PKMN_TRAINER_3, [FACILITY_CLASS_BRENDAN_3] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_MAY] = TRAINER_CLASS_PKMN_TRAINER_3, [FACILITY_CLASS_MAY_2] = TRAINER_CLASS_PKMN_TRAINER_3, [FACILITY_CLASS_MAY_3] = TRAINER_CLASS_PKMN_TRAINER_3, [FACILITY_CLASS_PKMN_BREEDER_M] = TRAINER_CLASS_PKMN_BREEDER, diff --git a/src/data/trainer_graphics/back_pic_anims.h b/src/data/trainer_graphics/back_pic_anims.h index 21dbda5978..0cc4bb2035 100644 --- a/src/data/trainer_graphics/back_pic_anims.h +++ b/src/data/trainer_graphics/back_pic_anims.h @@ -70,13 +70,13 @@ const union AnimCmd gAnimCmd_RubySapphireMay_1[] = const union AnimCmd *const gTrainerBackAnims_Brendan[] = { - AnimCmd_82FF540, + gAnimCmd_General_Frame3, gAnimCmd_Brendan_1, }; const union AnimCmd *const gTrainerBackAnims_May[] = { - AnimCmd_82FF540, + gAnimCmd_General_Frame3, gAnimCmd_May_Steven_1, }; @@ -94,25 +94,25 @@ const union AnimCmd *const gTrainerBackAnims_Leaf[] = const union AnimCmd *const gTrainerBackAnims_RubySapphireBrendan[] = { - AnimCmd_82FF540, + gAnimCmd_General_Frame3, gAnimCmd_RubySapphireBrendan_1, }; const union AnimCmd *const gTrainerBackAnims_RubySapphireMay[] = { - AnimCmd_82FF540, + gAnimCmd_General_Frame3, gAnimCmd_RubySapphireMay_1, }; const union AnimCmd *const gTrainerBackAnims_Wally[] = { - AnimCmd_82FF540, + gAnimCmd_General_Frame3, gAnimCmd_Wally_1, }; const union AnimCmd *const gTrainerBackAnims_Steven[] = { - AnimCmd_82FF540, + gAnimCmd_General_Frame3, gAnimCmd_May_Steven_1, }; diff --git a/src/data/trainer_graphics/back_pic_tables.h b/src/data/trainer_graphics/back_pic_tables.h index 920ecbb394..0f6b0cb918 100644 --- a/src/data/trainer_graphics/back_pic_tables.h +++ b/src/data/trainer_graphics/back_pic_tables.h @@ -15,24 +15,24 @@ const struct MonCoords gTrainerBackPicCoords[] = // the casts are so they'll play nice with the strict struct definition const struct CompressedSpriteSheet gTrainerBackPicTable[] = { - (const u32 *)gTrainerBackPic_Brendan, 0x2000, 0, - (const u32 *)gTrainerBackPic_May, 0x2000, 1, - (const u32 *)gTrainerBackPic_Red, 0x2800, 2, - (const u32 *)gTrainerBackPic_Leaf, 0x2800, 3, - (const u32 *)gTrainerBackPic_RubySapphireBrendan, 0x2000, 4, - (const u32 *)gTrainerBackPic_RubySapphireMay, 0x2000, 5, - (const u32 *)gTrainerBackPic_Wally, 0x2000, 6, - (const u32 *)gTrainerBackPic_Steven, 0x2000, 7, + (const u32 *)gTrainerBackPic_Brendan, 0x2000, TRAINER_BACK_PIC_BRENDAN, + (const u32 *)gTrainerBackPic_May, 0x2000, TRAINER_BACK_PIC_MAY, + (const u32 *)gTrainerBackPic_Red, 0x2800, TRAINER_BACK_PIC_RED, + (const u32 *)gTrainerBackPic_Leaf, 0x2800, TRAINER_BACK_PIC_LEAF, + (const u32 *)gTrainerBackPic_RubySapphireBrendan, 0x2000, TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN, + (const u32 *)gTrainerBackPic_RubySapphireMay, 0x2000, TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY, + (const u32 *)gTrainerBackPic_Wally, 0x2000, TRAINER_BACK_PIC_WALLY, + (const u32 *)gTrainerBackPic_Steven, 0x2000, TRAINER_BACK_PIC_STEVEN, }; const struct CompressedSpritePalette gTrainerBackPicPaletteTable[] = { - gTrainerPalette_Brendan, 0, - gTrainerPalette_May, 1, - gTrainerBackPicPalette_Red, 2, - gTrainerBackPicPalette_Leaf, 3, - gTrainerPalette_RubySapphireBrendan, 4, - gTrainerPalette_RubySapphireMay, 5, - gTrainerPalette_Wally, 6, - gTrainerPalette_Steven, 7, + gTrainerPalette_Brendan, TRAINER_BACK_PIC_BRENDAN, + gTrainerPalette_May, TRAINER_BACK_PIC_MAY, + gTrainerBackPicPalette_Red, TRAINER_BACK_PIC_RED, + gTrainerBackPicPalette_Leaf, TRAINER_BACK_PIC_LEAF, + gTrainerPalette_RubySapphireBrendan, TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN, + gTrainerPalette_RubySapphireMay, TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY, + gTrainerPalette_Wally, TRAINER_BACK_PIC_WALLY, + gTrainerPalette_Steven, TRAINER_BACK_PIC_STEVEN, }; diff --git a/src/data2b.c b/src/data2b.c index bb1baa2661..af76390a4e 100644 --- a/src/data2b.c +++ b/src/data2b.c @@ -40,7 +40,7 @@ const struct SpriteFrameImage gUnknown_082FF408[] = gHeap + 0xF800, 0x800, }; -const struct SpriteFrameImage gUnknown_082FF428[] = +const struct SpriteFrameImage gTrainerBackPicTable_Brendan[] = { gTrainerBackPic_Brendan, 0x0800, gTrainerBackPic_Brendan + 0x0800, 0x0800, @@ -48,7 +48,7 @@ const struct SpriteFrameImage gUnknown_082FF428[] = gTrainerBackPic_Brendan + 0x1800, 0x0800, }; -const struct SpriteFrameImage gUnknown_082FF448[] = +const struct SpriteFrameImage gTrainerBackPicTable_May[] = { gTrainerBackPic_May, 0x0800, gTrainerBackPic_May + 0x0800, 0x0800, @@ -56,7 +56,7 @@ const struct SpriteFrameImage gUnknown_082FF448[] = gTrainerBackPic_May + 0x1800, 0x0800, }; -const struct SpriteFrameImage gUnknown_082FF468[] = +const struct SpriteFrameImage gTrainerBackPicTable_Red[] = { gTrainerBackPic_Red, 0x0800, gTrainerBackPic_Red + 0x0800, 0x0800, @@ -65,7 +65,7 @@ const struct SpriteFrameImage gUnknown_082FF468[] = gTrainerBackPic_Red + 0x2000, 0x0800, }; -const struct SpriteFrameImage gUnknown_082FF490[] = +const struct SpriteFrameImage gTrainerBackPicTable_Leaf[] = { gTrainerBackPic_Leaf, 0x0800, gTrainerBackPic_Leaf + 0x0800, 0x0800, @@ -74,7 +74,7 @@ const struct SpriteFrameImage gUnknown_082FF490[] = gTrainerBackPic_Leaf + 0x2000, 0x0800, }; -const struct SpriteFrameImage gUnknown_082FF4B8[] = +const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireBrendan[] = { gTrainerBackPic_RubySapphireBrendan, 0x0800, gTrainerBackPic_RubySapphireBrendan + 0x0800, 0x0800, @@ -82,7 +82,7 @@ const struct SpriteFrameImage gUnknown_082FF4B8[] = gTrainerBackPic_RubySapphireBrendan + 0x1800, 0x0800, }; -const struct SpriteFrameImage gUnknown_082FF4D8[] = +const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireMay[] = { gTrainerBackPic_RubySapphireMay, 0x0800, gTrainerBackPic_RubySapphireMay + 0x0800, 0x0800, @@ -90,7 +90,7 @@ const struct SpriteFrameImage gUnknown_082FF4D8[] = gTrainerBackPic_RubySapphireMay + 0x1800, 0x0800, }; -const struct SpriteFrameImage gUnknown_082FF4F8[] = +const struct SpriteFrameImage gTrainerBackPicTable_Wally[] = { gTrainerBackPic_Wally, 0x0800, gTrainerBackPic_Wally + 0x0800, 0x0800, @@ -98,7 +98,7 @@ const struct SpriteFrameImage gUnknown_082FF4F8[] = gTrainerBackPic_Wally + 0x1800, 0x0800, }; -const struct SpriteFrameImage gUnknown_082FF518[] = +const struct SpriteFrameImage gTrainerBackPicTable_Steven[] = { gTrainerBackPic_Steven, 0x0800, gTrainerBackPic_Steven + 0x0800, 0x0800, @@ -112,7 +112,7 @@ const union AnimCmd gAnimCmd_General_Frame0[] = ANIMCMD_END, }; -const union AnimCmd AnimCmd_82FF540[] = +const union AnimCmd gAnimCmd_General_Frame3[] = { ANIMCMD_FRAME(3, 0), ANIMCMD_END, diff --git a/src/pokemon.c b/src/pokemon.c index 174f7ae662..1e07ee168e 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -52,14 +52,14 @@ extern const struct SpriteFrameImage gUnknown_082FF3A8[]; extern const struct SpriteFrameImage gUnknown_082FF3C8[]; extern const struct SpriteFrameImage gUnknown_082FF3E8[]; extern const struct SpriteFrameImage gUnknown_082FF408[]; -extern const struct SpriteFrameImage gUnknown_082FF428[]; -extern const struct SpriteFrameImage gUnknown_082FF448[]; -extern const struct SpriteFrameImage gUnknown_082FF468[]; -extern const struct SpriteFrameImage gUnknown_082FF490[]; -extern const struct SpriteFrameImage gUnknown_082FF4B8[]; -extern const struct SpriteFrameImage gUnknown_082FF4D8[]; -extern const struct SpriteFrameImage gUnknown_082FF4F8[]; -extern const struct SpriteFrameImage gUnknown_082FF518[]; +extern const struct SpriteFrameImage gTrainerBackPicTable_Brendan[]; +extern const struct SpriteFrameImage gTrainerBackPicTable_May[]; +extern const struct SpriteFrameImage gTrainerBackPicTable_Red[]; +extern const struct SpriteFrameImage gTrainerBackPicTable_Leaf[]; +extern const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireBrendan[]; +extern const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireMay[]; +extern const struct SpriteFrameImage gTrainerBackPicTable_Wally[]; +extern const struct SpriteFrameImage gTrainerBackPicTable_Steven[]; extern const union AffineAnimCmd *const gUnknown_082FF618[]; extern const union AffineAnimCmd *const gUnknown_082FF694[]; extern const union AnimCmd *gPlayerMonSpriteAnimsTable[]; @@ -2328,14 +2328,14 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = }, }; -static const struct SpriteTemplate gUnknown_08329DF8[] = +static const struct SpriteTemplate gSpriteTemplateTable_TrainerBackSprites[] = { { .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gOamData_831ACB0, .anims = NULL, - .images = gUnknown_082FF428, + .images = gTrainerBackPicTable_Brendan, .affineAnims = gUnknown_082FF618, .callback = sub_8039BB4, }, @@ -2344,7 +2344,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .paletteTag = 0, .oam = &gOamData_831ACB0, .anims = NULL, - .images = gUnknown_082FF448, + .images = gTrainerBackPicTable_May, .affineAnims = gUnknown_082FF618, .callback = sub_8039BB4, }, @@ -2353,7 +2353,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .paletteTag = 0, .oam = &gOamData_831ACB0, .anims = NULL, - .images = gUnknown_082FF468, + .images = gTrainerBackPicTable_Red, .affineAnims = gUnknown_082FF618, .callback = sub_8039BB4, }, @@ -2362,7 +2362,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .paletteTag = 0, .oam = &gOamData_831ACB0, .anims = NULL, - .images = gUnknown_082FF490, + .images = gTrainerBackPicTable_Leaf, .affineAnims = gUnknown_082FF618, .callback = sub_8039BB4, }, @@ -2371,7 +2371,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .paletteTag = 0, .oam = &gOamData_831ACB0, .anims = NULL, - .images = gUnknown_082FF4B8, + .images = gTrainerBackPicTable_RubySapphireBrendan, .affineAnims = gUnknown_082FF618, .callback = sub_8039BB4, }, @@ -2380,7 +2380,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .paletteTag = 0, .oam = &gOamData_831ACB0, .anims = NULL, - .images = gUnknown_082FF4D8, + .images = gTrainerBackPicTable_RubySapphireMay, .affineAnims = gUnknown_082FF618, .callback = sub_8039BB4, }, @@ -2389,7 +2389,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .paletteTag = 0, .oam = &gOamData_831ACB0, .anims = NULL, - .images = gUnknown_082FF4F8, + .images = gTrainerBackPicTable_Wally, .affineAnims = gUnknown_082FF618, .callback = sub_8039BB4, }, @@ -2398,7 +2398,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .paletteTag = 0, .oam = &gOamData_831ACB0, .anims = NULL, - .images = gUnknown_082FF518, + .images = gTrainerBackPicTable_Steven, .affineAnims = gUnknown_082FF618, .callback = sub_8039BB4, }, @@ -3817,7 +3817,7 @@ void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosit gMultiuseSpriteTemplate.paletteTag = trainerSpriteId; if (battlerPosition == B_POSITION_PLAYER_LEFT || battlerPosition == B_POSITION_PLAYER_RIGHT) { - gMultiuseSpriteTemplate = gUnknown_08329DF8[trainerSpriteId]; + gMultiuseSpriteTemplate = gSpriteTemplateTable_TrainerBackSprites[trainerSpriteId]; gMultiuseSpriteTemplate.anims = gTrainerBackAnimsPtrTable[trainerSpriteId]; } else From 031fd663939b6d6bf2d29a21ac3f155f1d593457 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Sat, 2 Feb 2019 22:14:04 +0000 Subject: [PATCH 011/217] Label some summary screen functions --- src/pokemon_summary_screen.c | 123 ++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 61 deletions(-) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 14bfba4adb..b05f3129b5 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -173,7 +173,7 @@ static void sub_81C20F0(u8 taskId); static void sub_81C2194(u16 *a, u16 b, u8 c); static void sub_81C2228(struct Pokemon* mon); static void DrawExperienceProgressBar(struct Pokemon* mon); -static void sub_81C240C(u16 a); +static void DrawContestMoveHearts(u16 move); static void sub_81C2524(void); static void sub_81C2554(void); static void sub_81C25E8(void); @@ -223,17 +223,17 @@ static void PrintNewMoveDetailsOrCancelText(void); static void sub_81C4064(void); static void sub_81C40A0(u8 a, u8 b); static void PrintHMMovesCantBeForgotten(void); -static void sub_81C4190(void); -static void sub_81C4204(u8 a, u8 b); -static void sub_81C424C(void); -static void sub_81C4280(void); -static void sub_81C42C8(void); -static void sub_81C43A0(void); -static void sub_81C4420(void); -static void sub_81C4484(void); -static void sub_81C44F0(void); +static void ResetPssSpriteIds(void); +static void SetSpriteInvisibility(u8 spriteArrayId, bool8 invisible); +static void HidePageSpecificSprites(void); +static void SetTypeIcons(void); +static void CreateMoveTypeIcons(void); +static void SetMonTypeIcons(void); +static void SetMoveTypeIcons(void); +static void SetContestMoveTypeIcons(void); +static void SetNewMoveTypeIcon(void); static void sub_81C4568(u8 a, u8 b); -static u8 sub_81C45F4(struct Pokemon *a, s16 *b); +static u8 CreatePokemonSprite(struct Pokemon *a, s16 *b); static u8 sub_81C47B4(struct Pokemon *unused); static void sub_81C4844(struct Sprite *); static void sub_81C48F0(void); @@ -968,13 +968,13 @@ static const union AnimCmd *const sSpriteAnimTable_StatusCondition[] = { sSpriteAnim_StatusPokerus, sSpriteAnim_StatusFaint, }; -static const struct CompressedSpriteSheet gUnknown_0861D0F8 = +static const struct CompressedSpriteSheet sStatusIconsSpriteSheet = { .data = gStatusGfx_Icons, .size = 0x380, .tag = 30001 }; -static const struct CompressedSpritePalette gUnknown_0861D100 = +static const struct CompressedSpritePalette sStatusIconsSpritePalette = { .data = gStatusPal_Icons, .tag = 30001 @@ -1141,13 +1141,13 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 16: - sub_81C4190(); - sub_81C42C8(); + ResetPssSpriteIds(); + CreateMoveTypeIcons(); pssData->unk40F0 = 0; gMain.state++; break; case 17: - pssData->spriteIds[0] = sub_81C45F4(&pssData->currentMon, &pssData->unk40F0); + pssData->spriteIds[0] = CreatePokemonSprite(&pssData->currentMon, &pssData->unk40F0); if (pssData->spriteIds[0] != 0xFF) { pssData->unk40F0 = 0; @@ -1167,7 +1167,7 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 21: - sub_81C4280(); + SetTypeIcons(); gMain.state++; break; case 22: @@ -1259,11 +1259,11 @@ static bool8 SummaryScreen_DecompressGraphics(void) pssData->unk40F0++; break; case 9: - LoadCompressedSpriteSheet(&gUnknown_0861D0F8); + LoadCompressedSpriteSheet(&sStatusIconsSpriteSheet); pssData->unk40F0++; break; case 10: - LoadCompressedSpritePalette(&gUnknown_0861D100); + LoadCompressedSpritePalette(&sStatusIconsSpritePalette); pssData->unk40F0++; break; case 11: @@ -1374,7 +1374,7 @@ static void sub_81C0348(void) } else { - sub_81C240C(pssData->summary.moves[pssData->firstMoveIndex]); + DrawContestMoveHearts(pssData->summary.moves[pssData->firstMoveIndex]); sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 0); sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 0); SetBgTilemapBuffer(1, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0]); @@ -1510,7 +1510,7 @@ static void sub_81C0604(u8 taskId, s8 a) PlaySE(SE_SELECT); if (pssData->summary.unk7 != 0) { - sub_81C4204(2, 1); + SetSpriteInvisibility(2, 1); ClearWindowTilemap(13); schedule_bg_copy_tilemap_to_vram(0); sub_81C2074(0, 2); @@ -1559,7 +1559,7 @@ static void sub_81C0704(u8 taskId) data[1] = 0; break; case 8: - pssData->spriteIds[0] = sub_81C45F4(&pssData->currentMon, &data[1]); + pssData->spriteIds[0] = CreatePokemonSprite(&pssData->currentMon, &data[1]); if (pssData->spriteIds[0] == 0xFF) return; gSprites[pssData->spriteIds[0]].data[2] = 1; @@ -1567,7 +1567,7 @@ static void sub_81C0704(u8 taskId) data[1] = 0; break; case 9: - sub_81C4280(); + SetTypeIcons(); break; case 10: sub_81C25E8(); @@ -1677,7 +1677,7 @@ static void sub_81C0A8C(u8 taskId, s8 b) else SetTaskFuncWithFollowupFunc(taskId, sub_81C0CC4, gTasks[taskId].func); sub_81C2DE4(pssData->currPageIndex); - sub_81C424C(); + HidePageSpecificSprites(); } static void sub_81C0B8C(u8 taskId) @@ -1718,7 +1718,7 @@ static void sub_81C0C68(u8 taskId) data[0] = 0; sub_81C1BA0(); sub_81C2AFC(pssData->currPageIndex); - sub_81C4280(); + SetTypeIcons(); sub_81C0E24(); SwitchTaskToFollowupFunc(taskId); } @@ -1767,7 +1767,7 @@ static void sub_81C0D44(u8 taskId) data[0] = 0; sub_81C1BA0(); sub_81C2AFC(pssData->currPageIndex); - sub_81C4280(); + SetTypeIcons(); sub_81C0E24(); SwitchTaskToFollowupFunc(taskId); } @@ -1797,7 +1797,7 @@ static void sub_81C0E48(u8 taskId) sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 0); PrintMoveDetails(move); PrintNewMoveDetailsOrCancelText(); - sub_81C44F0(); + SetNewMoveTypeIcon(); schedule_bg_copy_tilemap_to_vram(0); schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(2); @@ -1883,7 +1883,7 @@ static void sub_81C1070(s16 *a, s8 b, u8 *c) if (move != 0) break; } - sub_81C240C(move); + DrawContestMoveHearts(move); schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(2); PrintMoveDetails(move); @@ -2003,7 +2003,7 @@ static void sub_81C13B0(u8 taskId, bool8 b) move = pssData->summary.moves[pssData->firstMoveIndex]; PrintMoveDetails(move); - sub_81C240C(move); + DrawContestMoveHearts(move); schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(2); gTasks[taskId].func = sub_81C0F44; @@ -2081,7 +2081,7 @@ static void SwapBoxMonMoves(struct BoxPokemon *mon, u8 moveIndex1, u8 moveIndex2 static void sub_81C171C(u8 taskId) { - sub_81C44F0(); + SetNewMoveTypeIcon(); sub_81C4AF8(8); gTasks[taskId].func = sub_81C174C; } @@ -2415,7 +2415,7 @@ static void sub_81C1F80(u8 taskId) { if (pssData->currPageIndex == 3 && FuncIsActiveTask(sub_81C0B8C) == 0) PutWindowTilemap(15); - sub_81C240C(data[2]); + DrawContestMoveHearts(data[2]); } else { @@ -2566,7 +2566,7 @@ static void DrawExperienceProgressBar(struct Pokemon *unused) schedule_bg_copy_tilemap_to_vram(2); } -static void sub_81C240C(u16 move) +static void DrawContestMoveHearts(u16 move) { u16 *tilemap = pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1]; u8 i; @@ -3641,7 +3641,7 @@ static void PrintHMMovesCantBeForgotten(void) SummaryScreen_PrintTextOnWindow(windowId, gText_HMMovesCantBeForgotten2, 6, 1, 0, 0); } -static void sub_81C4190(void) +static void ResetPssSpriteIds(void) { u8 i; @@ -3660,41 +3660,42 @@ static void DestroySpriteInArray(u8 spriteArrayId) } } -static void sub_81C4204(u8 spriteArrayId, bool8 invisible) +static void SetSpriteInvisibility(u8 spriteArrayId, bool8 invisible) { gSprites[pssData->spriteIds[spriteArrayId]].invisible = invisible; } -static void sub_81C424C(void) +static void HidePageSpecificSprites(void) { +// Keeps Pokémon, caught ball and status sprites visible. u8 i; for (i = 3; i < 28; i++) { if (pssData->spriteIds[i] != 0xFF) - sub_81C4204(i, TRUE); + SetSpriteInvisibility(i, TRUE); } } -static void sub_81C4280(void) +static void SetTypeIcons(void) { switch (pssData->currPageIndex) { - case 0: - sub_81C43A0(); + case PSS_PAGE_INFO: + SetMonTypeIcons(); break; - case 2: - sub_81C4420(); - sub_81C44F0(); + case PSS_PAGE_BATTLE_MOVES: + SetMoveTypeIcons(); + SetNewMoveTypeIcon(); break; - case 3: - sub_81C4484(); - sub_81C44F0(); + case PSS_PAGE_CONTEST_MOVES: + SetContestMoveTypeIcons(); + SetNewMoveTypeIcon(); break; } } -static void sub_81C42C8(void) +static void CreateMoveTypeIcons(void) { u8 i; @@ -3703,7 +3704,7 @@ static void sub_81C42C8(void) if (pssData->spriteIds[i] == 0xFF) pssData->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2); - sub_81C4204(i, TRUE); + SetSpriteInvisibility(i, TRUE); } } @@ -3714,16 +3715,16 @@ static void SetMoveTypeSpritePosAndType(u8 typeId, u8 x, u8 y, u8 spriteArrayId) sprite->oam.paletteNum = sMoveTypeToOamPaletteNum[typeId]; sprite->pos1.x = x + 16; sprite->pos1.y = y + 8; - sub_81C4204(spriteArrayId, FALSE); + SetSpriteInvisibility(spriteArrayId, FALSE); } -static void sub_81C43A0(void) +static void SetMonTypeIcons(void) { struct PokeSummary *summary = &pssData->summary; if (summary->isEgg) { SetMoveTypeSpritePosAndType(TYPE_MYSTERY, 120, 48, 3); - sub_81C4204(4, TRUE); + SetSpriteInvisibility(4, TRUE); } else { @@ -3731,16 +3732,16 @@ static void sub_81C43A0(void) if (gBaseStats[summary->species].type1 != gBaseStats[summary->species].type2) { SetMoveTypeSpritePosAndType(gBaseStats[summary->species].type2, 0xA0, 0x30, 4); - sub_81C4204(4, FALSE); + SetSpriteInvisibility(4, FALSE); } else { - sub_81C4204(4, TRUE); + SetSpriteInvisibility(4, TRUE); } } } -static void sub_81C4420(void) +static void SetMoveTypeIcons(void) { u8 i; struct PokeSummary *summary = &pssData->summary; @@ -3749,11 +3750,11 @@ static void sub_81C4420(void) if (summary->moves[i] != MOVE_NONE) SetMoveTypeSpritePosAndType(gBattleMoves[summary->moves[i]].type, 0x55, 0x20 + (i * 0x10), i + 3); else - sub_81C4204(i + 3, TRUE); + SetSpriteInvisibility(i + 3, TRUE); } } -static void sub_81C4484(void) +static void SetContestMoveTypeIcons(void) { u8 i; struct PokeSummary *summary = &pssData->summary; @@ -3762,15 +3763,15 @@ static void sub_81C4484(void) if (summary->moves[i] != MOVE_NONE) SetMoveTypeSpritePosAndType(NUMBER_OF_MON_TYPES + gContestMoves[summary->moves[i]].contestCategory, 0x55, 0x20 + (i * 0x10), i + 3); else - sub_81C4204(i + 3, TRUE); + SetSpriteInvisibility(i + 3, TRUE); } } -static void sub_81C44F0(void) +static void SetNewMoveTypeIcon(void) { if (pssData->newMove == MOVE_NONE) { - sub_81C4204(7, TRUE); + SetSpriteInvisibility(7, TRUE); } else { @@ -3800,7 +3801,7 @@ static void sub_81C4568(u8 a0, u8 a1) sprite2->animEnded = FALSE; } -static u8 sub_81C45F4(struct Pokemon *mon, s16 *a1) +static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1) { const struct CompressedSpritePalette *pal; struct PokeSummary *summary = &pssData->summary; @@ -4000,11 +4001,11 @@ static void CreateSetStatusSprite(void) if (anim != 0) { StartSpriteAnim(&gSprites[*spriteId], anim - 1); - sub_81C4204(2, FALSE); + SetSpriteInvisibility(2, FALSE); } else { - sub_81C4204(2, TRUE); + SetSpriteInvisibility(2, TRUE); } } From 82abc164dc9f6a74fdf0c535cc1621b7ed05318b Mon Sep 17 00:00:00 2001 From: garak Date: Sat, 2 Feb 2019 14:22:41 -0500 Subject: [PATCH 012/217] convert mapjson.py to mapjson.cpp --- Makefile | 2 +- build_tools.sh | 1 + tools/mapjson/Makefile | 15 + tools/mapjson/json11.cpp | 786 ++++++++++++++++++++++++++++++++++++++ tools/mapjson/json11.h | 230 +++++++++++ tools/mapjson/mapjson.cpp | 528 +++++++++++++++++++++++++ tools/mapjson/mapjson.h | 31 ++ tools/mapjson/mapjson.py | 389 ------------------- 8 files changed, 1592 insertions(+), 390 deletions(-) create mode 100644 tools/mapjson/Makefile create mode 100644 tools/mapjson/json11.cpp create mode 100644 tools/mapjson/json11.h create mode 100644 tools/mapjson/mapjson.cpp create mode 100644 tools/mapjson/mapjson.h delete mode 100755 tools/mapjson/mapjson.py diff --git a/Makefile b/Makefile index cb9ce27bb9..70e1ceca32 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ SCANINC := tools/scaninc/scaninc$(EXE) PREPROC := tools/preproc/preproc$(EXE) RAMSCRGEN := tools/ramscrgen/ramscrgen$(EXE) FIX := tools/gbafix/gbafix$(EXE) -MAPJSON := python tools/mapjson/mapjson.py +MAPJSON := tools/mapjson/mapjson$(EXE) # Clear the default suffixes .SUFFIXES: diff --git a/build_tools.sh b/build_tools.sh index d9eebf05c6..429a9cef00 100755 --- a/build_tools.sh +++ b/build_tools.sh @@ -8,3 +8,4 @@ make -C tools/aif2pcm CXX=${1:-g++} make -C tools/ramscrgen CXX=${1:-g++} make -C tools/gbafix CXX=${1:-g++} make -C tools/mid2agb CXX=${1:-g++} +make -C tools/mapjson CXX=${1:-g++} diff --git a/tools/mapjson/Makefile b/tools/mapjson/Makefile new file mode 100644 index 0000000000..d09acad502 --- /dev/null +++ b/tools/mapjson/Makefile @@ -0,0 +1,15 @@ +CXX := g++ + +CXXFLAGS := -Wall -std=c++11 -O2 + +SRCS := json11.cpp mapjson.cpp + +HEADERS := mapjson.h + +.PHONY: clean + +mapjson: $(SRCS) $(HEADERS) + $(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS) + +clean: + $(RM) mapjson mapjson.exe diff --git a/tools/mapjson/json11.cpp b/tools/mapjson/json11.cpp new file mode 100644 index 0000000000..1da530206b --- /dev/null +++ b/tools/mapjson/json11.cpp @@ -0,0 +1,786 @@ +/* Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "json11.h" +#include +#include +#include +#include +#include + +namespace json11 { + +static const int max_depth = 200; + +using std::string; +using std::vector; +using std::map; +using std::make_shared; +using std::initializer_list; +using std::move; + +/* Helper for representing null - just a do-nothing struct, plus comparison + * operators so the helpers in JsonValue work. We can't use nullptr_t because + * it may not be orderable. + */ +struct NullStruct { + bool operator==(NullStruct) const { return true; } + bool operator<(NullStruct) const { return false; } +}; + +/* * * * * * * * * * * * * * * * * * * * + * Serialization + */ + +static void dump(NullStruct, string &out) { + out += "null"; +} + +static void dump(double value, string &out) { + if (std::isfinite(value)) { + char buf[32]; + snprintf(buf, sizeof buf, "%.17g", value); + out += buf; + } else { + out += "null"; + } +} + +static void dump(int value, string &out) { + char buf[32]; + snprintf(buf, sizeof buf, "%d", value); + out += buf; +} + +static void dump(bool value, string &out) { + out += value ? "true" : "false"; +} + +static void dump(const string &value, string &out) { + out += '"'; + for (size_t i = 0; i < value.length(); i++) { + const char ch = value[i]; + if (ch == '\\') { + out += "\\\\"; + } else if (ch == '"') { + out += "\\\""; + } else if (ch == '\b') { + out += "\\b"; + } else if (ch == '\f') { + out += "\\f"; + } else if (ch == '\n') { + out += "\\n"; + } else if (ch == '\r') { + out += "\\r"; + } else if (ch == '\t') { + out += "\\t"; + } else if (static_cast(ch) <= 0x1f) { + char buf[8]; + snprintf(buf, sizeof buf, "\\u%04x", ch); + out += buf; + } else if (static_cast(ch) == 0xe2 && static_cast(value[i+1]) == 0x80 + && static_cast(value[i+2]) == 0xa8) { + out += "\\u2028"; + i += 2; + } else if (static_cast(ch) == 0xe2 && static_cast(value[i+1]) == 0x80 + && static_cast(value[i+2]) == 0xa9) { + out += "\\u2029"; + i += 2; + } else { + out += ch; + } + } + out += '"'; +} + +static void dump(const Json::array &values, string &out) { + bool first = true; + out += "["; + for (const auto &value : values) { + if (!first) + out += ", "; + value.dump(out); + first = false; + } + out += "]"; +} + +static void dump(const Json::object &values, string &out) { + bool first = true; + out += "{"; + for (const auto &kv : values) { + if (!first) + out += ", "; + dump(kv.first, out); + out += ": "; + kv.second.dump(out); + first = false; + } + out += "}"; +} + +void Json::dump(string &out) const { + m_ptr->dump(out); +} + +/* * * * * * * * * * * * * * * * * * * * + * Value wrappers + */ + +template +class Value : public JsonValue { +protected: + + // Constructors + explicit Value(const T &value) : m_value(value) {} + explicit Value(T &&value) : m_value(move(value)) {} + + // Get type tag + Json::Type type() const override { + return tag; + } + + // Comparisons + bool equals(const JsonValue * other) const override { + return m_value == static_cast *>(other)->m_value; + } + bool less(const JsonValue * other) const override { + return m_value < static_cast *>(other)->m_value; + } + + const T m_value; + void dump(string &out) const override { json11::dump(m_value, out); } +}; + +class JsonDouble final : public Value { + double number_value() const override { return m_value; } + int int_value() const override { return static_cast(m_value); } + bool equals(const JsonValue * other) const override { return m_value == other->number_value(); } + bool less(const JsonValue * other) const override { return m_value < other->number_value(); } +public: + explicit JsonDouble(double value) : Value(value) {} +}; + +class JsonInt final : public Value { + double number_value() const override { return m_value; } + int int_value() const override { return m_value; } + bool equals(const JsonValue * other) const override { return m_value == other->number_value(); } + bool less(const JsonValue * other) const override { return m_value < other->number_value(); } +public: + explicit JsonInt(int value) : Value(value) {} +}; + +class JsonBoolean final : public Value { + bool bool_value() const override { return m_value; } +public: + explicit JsonBoolean(bool value) : Value(value) {} +}; + +class JsonString final : public Value { + const string &string_value() const override { return m_value; } +public: + explicit JsonString(const string &value) : Value(value) {} + explicit JsonString(string &&value) : Value(move(value)) {} +}; + +class JsonArray final : public Value { + const Json::array &array_items() const override { return m_value; } + const Json & operator[](size_t i) const override; +public: + explicit JsonArray(const Json::array &value) : Value(value) {} + explicit JsonArray(Json::array &&value) : Value(move(value)) {} +}; + +class JsonObject final : public Value { + const Json::object &object_items() const override { return m_value; } + const Json & operator[](const string &key) const override; +public: + explicit JsonObject(const Json::object &value) : Value(value) {} + explicit JsonObject(Json::object &&value) : Value(move(value)) {} +}; + +class JsonNull final : public Value { +public: + JsonNull() : Value({}) {} +}; + +/* * * * * * * * * * * * * * * * * * * * + * Static globals - static-init-safe + */ +struct Statics { + const std::shared_ptr null = make_shared(); + const std::shared_ptr t = make_shared(true); + const std::shared_ptr f = make_shared(false); + const string empty_string; + const vector empty_vector; + const map empty_map; + Statics() {} +}; + +static const Statics & statics() { + static const Statics s {}; + return s; +} + +static const Json & static_null() { + // This has to be separate, not in Statics, because Json() accesses statics().null. + static const Json json_null; + return json_null; +} + +/* * * * * * * * * * * * * * * * * * * * + * Constructors + */ + +Json::Json() noexcept : m_ptr(statics().null) {} +Json::Json(std::nullptr_t) noexcept : m_ptr(statics().null) {} +Json::Json(double value) : m_ptr(make_shared(value)) {} +Json::Json(int value) : m_ptr(make_shared(value)) {} +Json::Json(bool value) : m_ptr(value ? statics().t : statics().f) {} +Json::Json(const string &value) : m_ptr(make_shared(value)) {} +Json::Json(string &&value) : m_ptr(make_shared(move(value))) {} +Json::Json(const char * value) : m_ptr(make_shared(value)) {} +Json::Json(const Json::array &values) : m_ptr(make_shared(values)) {} +Json::Json(Json::array &&values) : m_ptr(make_shared(move(values))) {} +Json::Json(const Json::object &values) : m_ptr(make_shared(values)) {} +Json::Json(Json::object &&values) : m_ptr(make_shared(move(values))) {} + +/* * * * * * * * * * * * * * * * * * * * + * Accessors + */ + +Json::Type Json::type() const { return m_ptr->type(); } +double Json::number_value() const { return m_ptr->number_value(); } +int Json::int_value() const { return m_ptr->int_value(); } +bool Json::bool_value() const { return m_ptr->bool_value(); } +const string & Json::string_value() const { return m_ptr->string_value(); } +const vector & Json::array_items() const { return m_ptr->array_items(); } +const map & Json::object_items() const { return m_ptr->object_items(); } +const Json & Json::operator[] (size_t i) const { return (*m_ptr)[i]; } +const Json & Json::operator[] (const string &key) const { return (*m_ptr)[key]; } + +double JsonValue::number_value() const { return 0; } +int JsonValue::int_value() const { return 0; } +bool JsonValue::bool_value() const { return false; } +const string & JsonValue::string_value() const { return statics().empty_string; } +const vector & JsonValue::array_items() const { return statics().empty_vector; } +const map & JsonValue::object_items() const { return statics().empty_map; } +const Json & JsonValue::operator[] (size_t) const { return static_null(); } +const Json & JsonValue::operator[] (const string &) const { return static_null(); } + +const Json & JsonObject::operator[] (const string &key) const { + auto iter = m_value.find(key); + return (iter == m_value.end()) ? static_null() : iter->second; +} +const Json & JsonArray::operator[] (size_t i) const { + if (i >= m_value.size()) return static_null(); + else return m_value[i]; +} + +/* * * * * * * * * * * * * * * * * * * * + * Comparison + */ + +bool Json::operator== (const Json &other) const { + if (m_ptr == other.m_ptr) + return true; + if (m_ptr->type() != other.m_ptr->type()) + return false; + + return m_ptr->equals(other.m_ptr.get()); +} + +bool Json::operator< (const Json &other) const { + if (m_ptr == other.m_ptr) + return false; + if (m_ptr->type() != other.m_ptr->type()) + return m_ptr->type() < other.m_ptr->type(); + + return m_ptr->less(other.m_ptr.get()); +} + +/* * * * * * * * * * * * * * * * * * * * + * Parsing + */ + +/* esc(c) + * + * Format char c suitable for printing in an error message. + */ +static inline string esc(char c) { + char buf[12]; + if (static_cast(c) >= 0x20 && static_cast(c) <= 0x7f) { + snprintf(buf, sizeof buf, "'%c' (%d)", c, c); + } else { + snprintf(buf, sizeof buf, "(%d)", c); + } + return string(buf); +} + +static inline bool in_range(long x, long lower, long upper) { + return (x >= lower && x <= upper); +} + +namespace { +/* JsonParser + * + * Object that tracks all state of an in-progress parse. + */ +struct JsonParser final { + + /* State + */ + const string &str; + size_t i; + string &err; + bool failed; + const JsonParse strategy; + + /* fail(msg, err_ret = Json()) + * + * Mark this parse as failed. + */ + Json fail(string &&msg) { + return fail(move(msg), Json()); + } + + template + T fail(string &&msg, const T err_ret) { + if (!failed) + err = std::move(msg); + failed = true; + return err_ret; + } + + /* consume_whitespace() + * + * Advance until the current character is non-whitespace. + */ + void consume_whitespace() { + while (str[i] == ' ' || str[i] == '\r' || str[i] == '\n' || str[i] == '\t') + i++; + } + + /* consume_comment() + * + * Advance comments (c-style inline and multiline). + */ + bool consume_comment() { + bool comment_found = false; + if (str[i] == '/') { + i++; + if (i == str.size()) + return fail("unexpected end of input after start of comment", false); + if (str[i] == '/') { // inline comment + i++; + // advance until next line, or end of input + while (i < str.size() && str[i] != '\n') { + i++; + } + comment_found = true; + } + else if (str[i] == '*') { // multiline comment + i++; + if (i > str.size()-2) + return fail("unexpected end of input inside multi-line comment", false); + // advance until closing tokens + while (!(str[i] == '*' && str[i+1] == '/')) { + i++; + if (i > str.size()-2) + return fail( + "unexpected end of input inside multi-line comment", false); + } + i += 2; + comment_found = true; + } + else + return fail("malformed comment", false); + } + return comment_found; + } + + /* consume_garbage() + * + * Advance until the current character is non-whitespace and non-comment. + */ + void consume_garbage() { + consume_whitespace(); + if(strategy == JsonParse::COMMENTS) { + bool comment_found = false; + do { + comment_found = consume_comment(); + if (failed) return; + consume_whitespace(); + } + while(comment_found); + } + } + + /* get_next_token() + * + * Return the next non-whitespace character. If the end of the input is reached, + * flag an error and return 0. + */ + char get_next_token() { + consume_garbage(); + if (failed) return static_cast(0); + if (i == str.size()) + return fail("unexpected end of input", static_cast(0)); + + return str[i++]; + } + + /* encode_utf8(pt, out) + * + * Encode pt as UTF-8 and add it to out. + */ + void encode_utf8(long pt, string & out) { + if (pt < 0) + return; + + if (pt < 0x80) { + out += static_cast(pt); + } else if (pt < 0x800) { + out += static_cast((pt >> 6) | 0xC0); + out += static_cast((pt & 0x3F) | 0x80); + } else if (pt < 0x10000) { + out += static_cast((pt >> 12) | 0xE0); + out += static_cast(((pt >> 6) & 0x3F) | 0x80); + out += static_cast((pt & 0x3F) | 0x80); + } else { + out += static_cast((pt >> 18) | 0xF0); + out += static_cast(((pt >> 12) & 0x3F) | 0x80); + out += static_cast(((pt >> 6) & 0x3F) | 0x80); + out += static_cast((pt & 0x3F) | 0x80); + } + } + + /* parse_string() + * + * Parse a string, starting at the current position. + */ + string parse_string() { + string out; + long last_escaped_codepoint = -1; + while (true) { + if (i == str.size()) + return fail("unexpected end of input in string", ""); + + char ch = str[i++]; + + if (ch == '"') { + encode_utf8(last_escaped_codepoint, out); + return out; + } + + if (in_range(ch, 0, 0x1f)) + return fail("unescaped " + esc(ch) + " in string", ""); + + // The usual case: non-escaped characters + if (ch != '\\') { + encode_utf8(last_escaped_codepoint, out); + last_escaped_codepoint = -1; + out += ch; + continue; + } + + // Handle escapes + if (i == str.size()) + return fail("unexpected end of input in string", ""); + + ch = str[i++]; + + if (ch == 'u') { + // Extract 4-byte escape sequence + string esc = str.substr(i, 4); + // Explicitly check length of the substring. The following loop + // relies on std::string returning the terminating NUL when + // accessing str[length]. Checking here reduces brittleness. + if (esc.length() < 4) { + return fail("bad \\u escape: " + esc, ""); + } + for (size_t j = 0; j < 4; j++) { + if (!in_range(esc[j], 'a', 'f') && !in_range(esc[j], 'A', 'F') + && !in_range(esc[j], '0', '9')) + return fail("bad \\u escape: " + esc, ""); + } + + long codepoint = strtol(esc.data(), nullptr, 16); + + // JSON specifies that characters outside the BMP shall be encoded as a pair + // of 4-hex-digit \u escapes encoding their surrogate pair components. Check + // whether we're in the middle of such a beast: the previous codepoint was an + // escaped lead (high) surrogate, and this is a trail (low) surrogate. + if (in_range(last_escaped_codepoint, 0xD800, 0xDBFF) + && in_range(codepoint, 0xDC00, 0xDFFF)) { + // Reassemble the two surrogate pairs into one astral-plane character, per + // the UTF-16 algorithm. + encode_utf8((((last_escaped_codepoint - 0xD800) << 10) + | (codepoint - 0xDC00)) + 0x10000, out); + last_escaped_codepoint = -1; + } else { + encode_utf8(last_escaped_codepoint, out); + last_escaped_codepoint = codepoint; + } + + i += 4; + continue; + } + + encode_utf8(last_escaped_codepoint, out); + last_escaped_codepoint = -1; + + if (ch == 'b') { + out += '\b'; + } else if (ch == 'f') { + out += '\f'; + } else if (ch == 'n') { + out += '\n'; + } else if (ch == 'r') { + out += '\r'; + } else if (ch == 't') { + out += '\t'; + } else if (ch == '"' || ch == '\\' || ch == '/') { + out += ch; + } else { + return fail("invalid escape character " + esc(ch), ""); + } + } + } + + /* parse_number() + * + * Parse a double. + */ + Json parse_number() { + size_t start_pos = i; + + if (str[i] == '-') + i++; + + // Integer part + if (str[i] == '0') { + i++; + if (in_range(str[i], '0', '9')) + return fail("leading 0s not permitted in numbers"); + } else if (in_range(str[i], '1', '9')) { + i++; + while (in_range(str[i], '0', '9')) + i++; + } else { + return fail("invalid " + esc(str[i]) + " in number"); + } + + if (str[i] != '.' && str[i] != 'e' && str[i] != 'E' + && (i - start_pos) <= static_cast(std::numeric_limits::digits10)) { + return std::atoi(str.c_str() + start_pos); + } + + // Decimal part + if (str[i] == '.') { + i++; + if (!in_range(str[i], '0', '9')) + return fail("at least one digit required in fractional part"); + + while (in_range(str[i], '0', '9')) + i++; + } + + // Exponent part + if (str[i] == 'e' || str[i] == 'E') { + i++; + + if (str[i] == '+' || str[i] == '-') + i++; + + if (!in_range(str[i], '0', '9')) + return fail("at least one digit required in exponent"); + + while (in_range(str[i], '0', '9')) + i++; + } + + return std::strtod(str.c_str() + start_pos, nullptr); + } + + /* expect(str, res) + * + * Expect that 'str' starts at the character that was just read. If it does, advance + * the input and return res. If not, flag an error. + */ + Json expect(const string &expected, Json res) { + assert(i != 0); + i--; + if (str.compare(i, expected.length(), expected) == 0) { + i += expected.length(); + return res; + } else { + return fail("parse error: expected " + expected + ", got " + str.substr(i, expected.length())); + } + } + + /* parse_json() + * + * Parse a JSON object. + */ + Json parse_json(int depth) { + if (depth > max_depth) { + return fail("exceeded maximum nesting depth"); + } + + char ch = get_next_token(); + if (failed) + return Json(); + + if (ch == '-' || (ch >= '0' && ch <= '9')) { + i--; + return parse_number(); + } + + if (ch == 't') + return expect("true", true); + + if (ch == 'f') + return expect("false", false); + + if (ch == 'n') + return expect("null", Json()); + + if (ch == '"') + return parse_string(); + + if (ch == '{') { + map data; + ch = get_next_token(); + if (ch == '}') + return data; + + while (1) { + if (ch != '"') + return fail("expected '\"' in object, got " + esc(ch)); + + string key = parse_string(); + if (failed) + return Json(); + + ch = get_next_token(); + if (ch != ':') + return fail("expected ':' in object, got " + esc(ch)); + + data[std::move(key)] = parse_json(depth + 1); + if (failed) + return Json(); + + ch = get_next_token(); + if (ch == '}') + break; + if (ch != ',') + return fail("expected ',' in object, got " + esc(ch)); + + ch = get_next_token(); + } + return data; + } + + if (ch == '[') { + vector data; + ch = get_next_token(); + if (ch == ']') + return data; + + while (1) { + i--; + data.push_back(parse_json(depth + 1)); + if (failed) + return Json(); + + ch = get_next_token(); + if (ch == ']') + break; + if (ch != ',') + return fail("expected ',' in list, got " + esc(ch)); + + ch = get_next_token(); + (void)ch; + } + return data; + } + + return fail("expected value, got " + esc(ch)); + } +}; +}//namespace { + +Json Json::parse(const string &in, string &err, JsonParse strategy) { + JsonParser parser { in, 0, err, false, strategy }; + Json result = parser.parse_json(0); + + // Check for any trailing garbage + parser.consume_garbage(); + if (parser.failed) + return Json(); + if (parser.i != in.size()) + return parser.fail("unexpected trailing " + esc(in[parser.i])); + + return result; +} + +// Documented in json11.hpp +vector Json::parse_multi(const string &in, + std::string::size_type &parser_stop_pos, + string &err, + JsonParse strategy) { + JsonParser parser { in, 0, err, false, strategy }; + parser_stop_pos = 0; + vector json_vec; + while (parser.i != in.size() && !parser.failed) { + json_vec.push_back(parser.parse_json(0)); + if (parser.failed) + break; + + // Check for another object + parser.consume_garbage(); + if (parser.failed) + break; + parser_stop_pos = parser.i; + } + return json_vec; +} + +/* * * * * * * * * * * * * * * * * * * * + * Shape-checking + */ + +bool Json::has_shape(const shape & types, string & err) const { + if (!is_object()) { + err = "expected JSON object, got " + dump(); + return false; + } + + for (auto & item : types) { + if ((*this)[item.first].type() != item.second) { + err = "bad type for " + item.first + " in " + dump(); + return false; + } + } + + return true; +} + +} // namespace json11 diff --git a/tools/mapjson/json11.h b/tools/mapjson/json11.h new file mode 100644 index 0000000000..c04c4362f9 --- /dev/null +++ b/tools/mapjson/json11.h @@ -0,0 +1,230 @@ +/* json11 + * + * json11 is a tiny JSON library for C++11, providing JSON parsing and serialization. + * + * The core object provided by the library is json11::Json. A Json object represents any JSON + * value: null, bool, number (int or double), string (std::string), array (std::vector), or + * object (std::map). + * + * Json objects act like values: they can be assigned, copied, moved, compared for equality or + * order, etc. There are also helper methods Json::dump, to serialize a Json to a string, and + * Json::parse (static) to parse a std::string as a Json object. + * + * Internally, the various types of Json object are represented by the JsonValue class + * hierarchy. + * + * A note on numbers - JSON specifies the syntax of number formatting but not its semantics, + * so some JSON implementations distinguish between integers and floating-point numbers, while + * some don't. In json11, we choose the latter. Because some JSON implementations (namely + * Javascript itself) treat all numbers as the same type, distinguishing the two leads + * to JSON that will be *silently* changed by a round-trip through those implementations. + * Dangerous! To avoid that risk, json11 stores all numbers as double internally, but also + * provides integer helpers. + * + * Fortunately, double-precision IEEE754 ('double') can precisely store any integer in the + * range +/-2^53, which includes every 'int' on most systems. (Timestamps often use int64 + * or long long to avoid the Y2038K problem; a double storing microseconds since some epoch + * will be exact for +/- 275 years.) + */ + +/* Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#pragma once + +#include +#include +#include +#include +#include + +#ifdef _MSC_VER + #if _MSC_VER <= 1800 // VS 2013 + #ifndef noexcept + #define noexcept throw() + #endif + + #ifndef snprintf + #define snprintf _snprintf_s + #endif + #endif +#endif + +namespace json11 { + +enum JsonParse { + STANDARD, COMMENTS +}; + +class JsonValue; + +class Json final { +public: + // Types + enum Type { + NUL, NUMBER, BOOL, STRING, ARRAY, OBJECT + }; + + // Array and object typedefs + typedef std::vector array; + typedef std::map object; + + // Constructors for the various types of JSON value. + Json() noexcept; // NUL + Json(std::nullptr_t) noexcept; // NUL + Json(double value); // NUMBER + Json(int value); // NUMBER + Json(bool value); // BOOL + Json(const std::string &value); // STRING + Json(std::string &&value); // STRING + Json(const char * value); // STRING + Json(const array &values); // ARRAY + Json(array &&values); // ARRAY + Json(const object &values); // OBJECT + Json(object &&values); // OBJECT + + // Implicit constructor: anything with a to_json() function. + template + Json(const T & t) : Json(t.to_json()) {} + + // Implicit constructor: map-like objects (std::map, std::unordered_map, etc) + template ().begin()->first)>::value + && std::is_constructible().begin()->second)>::value, + int>::type = 0> + Json(const M & m) : Json(object(m.begin(), m.end())) {} + + // Implicit constructor: vector-like objects (std::list, std::vector, std::set, etc) + template ().begin())>::value, + int>::type = 0> + Json(const V & v) : Json(array(v.begin(), v.end())) {} + + // This prevents Json(some_pointer) from accidentally producing a bool. Use + // Json(bool(some_pointer)) if that behavior is desired. + Json(void *) = delete; + + // Accessors + Type type() const; + + bool is_null() const { return type() == NUL; } + bool is_number() const { return type() == NUMBER; } + bool is_bool() const { return type() == BOOL; } + bool is_string() const { return type() == STRING; } + bool is_array() const { return type() == ARRAY; } + bool is_object() const { return type() == OBJECT; } + + // Return the enclosed value if this is a number, 0 otherwise. Note that json11 does not + // distinguish between integer and non-integer numbers - number_value() and int_value() + // can both be applied to a NUMBER-typed object. + double number_value() const; + int int_value() const; + + // Return the enclosed value if this is a boolean, false otherwise. + bool bool_value() const; + // Return the enclosed string if this is a string, "" otherwise. + const std::string &string_value() const; + // Return the enclosed std::vector if this is an array, or an empty vector otherwise. + const array &array_items() const; + // Return the enclosed std::map if this is an object, or an empty map otherwise. + const object &object_items() const; + + // Return a reference to arr[i] if this is an array, Json() otherwise. + const Json & operator[](size_t i) const; + // Return a reference to obj[key] if this is an object, Json() otherwise. + const Json & operator[](const std::string &key) const; + + // Serialize. + void dump(std::string &out) const; + std::string dump() const { + std::string out; + dump(out); + return out; + } + + // Parse. If parse fails, return Json() and assign an error message to err. + static Json parse(const std::string & in, + std::string & err, + JsonParse strategy = JsonParse::STANDARD); + static Json parse(const char * in, + std::string & err, + JsonParse strategy = JsonParse::STANDARD) { + if (in) { + return parse(std::string(in), err, strategy); + } else { + err = "null input"; + return nullptr; + } + } + // Parse multiple objects, concatenated or separated by whitespace + static std::vector parse_multi( + const std::string & in, + std::string::size_type & parser_stop_pos, + std::string & err, + JsonParse strategy = JsonParse::STANDARD); + + static inline std::vector parse_multi( + const std::string & in, + std::string & err, + JsonParse strategy = JsonParse::STANDARD) { + std::string::size_type parser_stop_pos; + return parse_multi(in, parser_stop_pos, err, strategy); + } + + bool operator== (const Json &rhs) const; + bool operator< (const Json &rhs) const; + bool operator!= (const Json &rhs) const { return !(*this == rhs); } + bool operator<= (const Json &rhs) const { return !(rhs < *this); } + bool operator> (const Json &rhs) const { return (rhs < *this); } + bool operator>= (const Json &rhs) const { return !(*this < rhs); } + + /* has_shape(types, err) + * + * Return true if this is a JSON object and, for each item in types, has a field of + * the given type. If not, return false and set err to a descriptive message. + */ + typedef std::initializer_list> shape; + bool has_shape(const shape & types, std::string & err) const; + +private: + std::shared_ptr m_ptr; +}; + +// Internal class hierarchy - JsonValue objects are not exposed to users of this API. +class JsonValue { +protected: + friend class Json; + friend class JsonInt; + friend class JsonDouble; + virtual Json::Type type() const = 0; + virtual bool equals(const JsonValue * other) const = 0; + virtual bool less(const JsonValue * other) const = 0; + virtual void dump(std::string &out) const = 0; + virtual double number_value() const; + virtual int int_value() const; + virtual bool bool_value() const; + virtual const std::string &string_value() const; + virtual const Json::array &array_items() const; + virtual const Json &operator[](size_t i) const; + virtual const Json::object &object_items() const; + virtual const Json &operator[](const std::string &key) const; + virtual ~JsonValue() {} +}; + +} // namespace json11 diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp new file mode 100644 index 0000000000..e1e86b5c5f --- /dev/null +++ b/tools/mapjson/mapjson.cpp @@ -0,0 +1,528 @@ +// mapjson.cpp + +#include +using std::cout; using std::endl; + +#include +using std::string; + +#include +using std::vector; + +#include +using std::sort; using std::find; + +#include +using std::map; + +#include +using std::ofstream; using std::ifstream; + +#include +using std::ostringstream; + +#include +using std::numeric_limits; + +#include "json11.h" +using json11::Json; + +#include "mapjson.h" + + +string read_text_file(string filepath) { + ifstream in_file(filepath); + + if (!in_file.is_open()) + FATAL_ERROR("Cannot open file %s for reading.\n", filepath.c_str()); + + string text; + + in_file.seekg(0, std::ios::end); + text.resize(in_file.tellg()); + + in_file.seekg(0, std::ios::beg); + in_file.read(&text[0], text.size()); + + in_file.close(); + + return text; +} + +void write_text_file(string filepath, string text) { + ofstream out_file(filepath); + + if (!out_file.is_open()) + FATAL_ERROR("Cannot open file %s for writing.\n", filepath.c_str()); + + out_file << text; + + out_file.close(); +} + +string generate_map_header_text(Json map_data, Json layouts_data) { + string map_layout_id = map_data["layout"].string_value(); + + vector matched; + + for (auto &field : layouts_data["layouts"].array_items()) { + if (map_layout_id == field["id"].string_value()) + matched.push_back(field); + } + + if (matched.size() != 1) + FATAL_ERROR("Failed to find matching layout for %s.\n", map_layout_id.c_str()); + + Json layout = matched[0]; + + ostringstream text; + + text << map_data["name"].string_value() << ":\n" + << "\t.4byte " << layout["name"].string_value() << "\n"; + + if (map_data.object_items().find("shared_events_map") != map_data.object_items().end()) + text << "\t.4byte " << map_data["shared_events_map"].string_value() << "_MapEvents\n"; + else + text << "\t.4byte " << map_data["name"].string_value() << "_MapEvents\n"; + + if (map_data.object_items().find("shared_scripts_map") != map_data.object_items().end()) + text << "\t.4byte " << map_data["shared_scripts_map"].string_value() << "_MapScripts\n"; + else + text << "\t.4byte " << map_data["name"].string_value() << "_MapScripts\n"; + + if (map_data.object_items().find("connections") != map_data.object_items().end() + && map_data["connections"].array_items().size() > 0) + text << "\t.4byte " << map_data["name"].string_value() << "_MapConnections\n"; + else + text << "\t.4byte 0x0\n"; + + text << "\t.2byte " << map_data["music"].string_value() << "\n" + << "\t.2byte " << layout["id"].string_value() << "\n" + << "\t.byte " << map_data["region_map_section"].string_value() << "\n" + << "\t.byte " << map_data["requires_flash"].bool_value() << "\n" + << "\t.byte " << map_data["weather"].string_value() << "\n" + << "\t.byte " << map_data["map_type"].string_value() << "\n" + << "\t.2byte 0\n\t" + << "map_header_flags " + << "allow_bike=" << map_data["allow_bike"].bool_value() << ", " + << "allow_escape_rope=" << map_data["allow_escape_rope"].bool_value() << ", " + << "allow_run=" << map_data["allow_running"].bool_value() << ", " + << "show_map_name=" << map_data["show_map_name"].bool_value() << "\n" + << "\t.byte " << map_data["battle_scene"].string_value() << "\n\n"; + + return text.str(); +} + +string generate_map_connections_text(Json map_data) { + if (map_data["connections"] == Json()) + return string("\n"); + + ostringstream text; + + text << map_data["name"].string_value() << "_MapConnectionsList:\n"; + + for (auto &connection : map_data["connections"].array_items()) { + text << "\tconnection " + << connection["direction"].string_value() << ", " + << connection["offset"].int_value() << ", " + << connection["map"].string_value() << "\n"; + } + + text << "\n" << map_data["name"].string_value() << "_MapConnections:\n" + << "\t.4byte " << map_data["connections"].array_items().size() << "\n" + << "\t.4byte " << map_data["name"].string_value() << "_MapConnectionsList\n\n"; + + return text.str(); +} + +string generate_map_events_text(Json map_data) { + if (map_data.object_items().find("shared_events_map") != map_data.object_items().end()) + return string("\n"); + + ostringstream text; + + 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"; + text << objects_label << ":\n"; + for (int i = 0; i < map_data["object_events"].array_items().size(); i++) { + auto obj_event = map_data["object_events"].array_items()[i]; + text << "\tobject_event " << i + 1 << ", " + << obj_event["graphics_id"].string_value() << ", 0, " + << obj_event["x"].int_value() << ", " + << obj_event["y"].int_value() << ", " + << obj_event["elevation"].int_value() << ", " + << obj_event["movement_type"].string_value() << ", " + << obj_event["movement_range_x"].int_value() << ", " + << obj_event["movement_range_y"].int_value() << ", " + << obj_event["trainer_type"].int_value() << ", " + << obj_event["trainer_sight_or_berry_tree_id"].int_value() << ", " + << obj_event["script"].string_value() << ", " + << obj_event["flag"].string_value() << "\n"; + } + text << "\n"; + } else { + objects_label = "0x0"; + } + + if (map_data["warp_events"].array_items().size() > 0) { + warps_label = map_data["name"].string_value() + "_MapWarps"; + text << warps_label << ":\n"; + for (auto &warp_event : map_data["warp_events"].array_items()) { + text << "\twarp_def " + << warp_event["x"].int_value() << ", " + << warp_event["y"].int_value() << ", " + << warp_event["elevation"].int_value() << ", " + << warp_event["dest_warp_id"].int_value() << ", " + << warp_event["dest_map"].string_value() << "\n"; + } + text << "\n"; + } else { + warps_label = "0x0"; + } + + if (map_data["coord_events"].array_items().size() > 0) { + coords_label = map_data["name"].string_value() + "_MapCoordEvents"; + text << coords_label << ":\n"; + for (auto &coord_event : map_data["coord_events"].array_items()) { + if (coord_event["type"].string_value() == "trigger") { + text << "\tcoord_event " + << coord_event["x"].int_value() << ", " + << coord_event["y"].int_value() << ", " + << coord_event["elevation"].int_value() << ", " + << coord_event["var"].string_value() << ", " + << coord_event["var_value"].int_value() << ", " + << coord_event["script"].string_value() << "\n"; + } + else if (coord_event["type"] == "weather") { + text << "\tcoord_weather_event " + << coord_event["x"].int_value() << ", " + << coord_event["y"].int_value() << ", " + << coord_event["elevation"].int_value() << ", " + << coord_event["weather"].string_value() << "\n"; + } + } + text << "\n"; + } else { + coords_label = "0x0"; + } + + if (map_data["bg_events"].array_items().size() > 0) { + bgs_label = map_data["name"].string_value() + "_MapBGEvents"; + text << bgs_label << ":\n"; + for (auto &bg_event : map_data["bg_events"].array_items()) { + if (bg_event["type"] == "sign") { + text << "\tbg_event " + << bg_event["x"].int_value() << ", " + << bg_event["y"].int_value() << ", " + << bg_event["elevation"].int_value() << ", " + << bg_event["player_facing_dir"].string_value() << ", " + << bg_event["script"].string_value() << "\n"; + } + else if (bg_event["type"] == "hidden_item") { + text << "\tbg_hidden_item_event " + << bg_event["x"].int_value() << ", " + << bg_event["y"].int_value() << ", " + << bg_event["elevation"].int_value() << ", " + << bg_event["item"].string_value() << ", " + << bg_event["flag"].string_value() << "\n"; + } + else if (bg_event["type"] == "secret_base") { + text << "\tbg_secret_base_event " + << bg_event["x"].int_value() << ", " + << bg_event["y"].int_value() << ", " + << bg_event["elevation"].int_value() << ", " + << bg_event["secret_base_id"].string_value() << "\n"; + } + } + text << "\n"; + } else { + bgs_label = "0x0"; + } + + text << map_data["name"].string_value() << "_MapEvents::\n" + << "\tmap_events " << objects_label << ", " << warps_label << ", " + << coords_label << ", " << bgs_label << "\n\n"; + + return text.str(); +} + +string get_directory_name(string filename) { + size_t dir_pos = filename.find_last_of("/\\"); + + return filename.substr(0, dir_pos + 1); +} + +void process_map(string map_filepath, string layouts_filepath) { + string mapdata_err, layouts_err; + + string mapdata_json_text = read_text_file(map_filepath); + string layouts_json_text = read_text_file(layouts_filepath); + + Json map_data = Json::parse(mapdata_json_text, mapdata_err); + if (map_data == Json()) + FATAL_ERROR("%s\n", mapdata_err.c_str()); + + Json layouts_data = Json::parse(layouts_json_text, layouts_err); + if (layouts_data == Json()) + FATAL_ERROR("%s\n", layouts_err.c_str()); + + string header_text = generate_map_header_text(map_data, layouts_data); + string events_text = generate_map_events_text(map_data); + string connections_text = generate_map_connections_text(map_data); + + string files_dir = get_directory_name(map_filepath); + write_text_file(files_dir + "header.inc", header_text); + write_text_file(files_dir + "events.inc", events_text); + write_text_file(files_dir + "connections.inc", connections_text); +} + +string generate_groups_text(Json groups_data) { + ostringstream text; + + for (auto &key : groups_data["group_order"].array_items()) { + string group = key.string_value(); + text << group << "::\n"; + auto maps = groups_data[group].array_items(); + for (Json &map_name : maps) + text << "\t.4byte " << map_name.string_value() << "\n"; + text << "\n"; + } + + text << "\t.align 2\n" << "gMapGroups::\n"; + for (auto &group : groups_data["group_order"].array_items()) + text << "\t.4byte " << group.string_value() << "\n"; + text << "\n"; + + return text.str(); +} + +string generate_connections_text(Json groups_data) { + vector map_names; + + for (auto &group : groups_data["group_order"].array_items()) + for (auto map_name : groups_data[group.string_value()].array_items()) + map_names.push_back(map_name); + + vector connections_include_order = groups_data["connections_include_order"].array_items(); + + if (connections_include_order.size() > 0) + sort(map_names.begin(), map_names.end(), [connections_include_order](const Json &a, const Json &b) { + auto iter_a = find(connections_include_order.begin(), connections_include_order.end(), a); + if (iter_a == connections_include_order.end()) + iter_a = connections_include_order.begin() + numeric_limits::max(); + auto iter_b = find(connections_include_order.begin(), connections_include_order.end(), b); + if (iter_b == connections_include_order.end()) + iter_b = connections_include_order.begin() + numeric_limits::max(); + return iter_a < iter_b; + }); + + ostringstream text; + + for (Json map_name : map_names) + text << "\t.include \"data/maps/" << map_name.string_value() << "/connections.inc\"\n"; + + return text.str(); +} + +string generate_headers_text(Json groups_data) { + vector map_names; + + for (auto &group : groups_data["group_order"].array_items()) + for (auto map_name : groups_data[group.string_value()].array_items()) + map_names.push_back(map_name.string_value()); + + ostringstream text; + + for (string map_name : map_names) + text << "\t.include \"data/maps/" << map_name << "/header.inc\"\n"; + + return text.str(); +} + +string generate_events_text(Json groups_data) { + vector map_names; + + for (auto &group : groups_data["group_order"].array_items()) + for (auto map_name : groups_data[group.string_value()].array_items()) + map_names.push_back(map_name.string_value()); + + ostringstream text; + + for (string map_name : map_names) + text << "\t.include \"data/maps/" << map_name << "/events.inc\"\n"; + + return text.str(); +} + +string generate_map_constants_text(string groups_filepath, Json groups_data) { + string file_dir = get_directory_name(groups_filepath); + char dir_separator = file_dir.back(); + + ostringstream text; + + text << "#ifndef GUARD_CONSTANTS_MAP_GROUPS_H\n" + << "#define GUARD_CONSTANTS_MAP_GROUPS_H\n\n"; + + int group_num = 0; + + for (auto &group : groups_data["group_order"].array_items()) { + text << "// Map Group " << group_num << "\n"; + vector map_ids; + size_t max_length = 0; + + for (auto &map_name : groups_data[group.string_value()].array_items()) { + string header_filepath = file_dir + map_name.string_value() + dir_separator + "map.json"; + string err_str; + Json map_data = Json::parse(read_text_file(header_filepath), err_str); + map_ids.push_back(map_data["id"]); + if (map_data["id"].string_value().length() > max_length) + max_length = map_data["id"].string_value().length(); + } + + int map_id_num = 0; + for (Json map_id : map_ids) { + text << "#define " << map_id.string_value() << string((max_length - map_id.string_value().length() + 1), ' ') + << "(" << map_id_num++ << " | (" << group_num << " << 8))\n"; + } + text << "\n"; + + group_num++; + } + + text << "#define MAP_GROUPS_COUNT " << group_num << "\n\n"; + text << "#endif // GUARD_CONSTANTS_MAP_GROUPS_H\n"; + + return text.str(); +} + +void process_groups(string groups_filepath) { + string err; + Json groups_data = Json::parse(read_text_file(groups_filepath), err); + + if (groups_data == Json()) + FATAL_ERROR("%s\n", err.c_str()); + + string groups_text = generate_groups_text(groups_data); + string connections_text = generate_connections_text(groups_data); + string headers_text = generate_headers_text(groups_data); + string events_text = generate_events_text(groups_data); + string map_header_text = generate_map_constants_text(groups_filepath, groups_data); + + string file_dir = get_directory_name(groups_filepath); + char s = file_dir.back(); + + write_text_file(file_dir + "groups.inc", groups_text); + write_text_file(file_dir + "connections.inc", connections_text); + write_text_file(file_dir + "headers.inc", headers_text); + write_text_file(file_dir + "events.inc", events_text); + write_text_file(file_dir + ".." + s + ".." + s + "include" + s + "constants" + s + "map_groups.h", map_header_text); +} + +string generate_layout_headers_text(Json layouts_data) { + ostringstream text; + + for (auto &layout : layouts_data["layouts"].array_items()) { + string border_label = layout["name"].string_value() + "_Border"; + string blockdata_label = layout["name"].string_value() + "_Blockdata"; + text << border_label << "::\n" + << "\t.incbin \"" << layout["border_filepath"].string_value() << "\"\n\n" + << blockdata_label << "::\n" + << "\t.incbin \"" << layout["blockdata_filepath"].string_value() << "\"\n\n" + << "\t.align 2\n" + << layout["name"].string_value() << "::\n" + << "\t.4byte " << layout["width"].int_value() << "\n" + << "\t.4byte " << layout["height"].int_value() << "\n" + << "\t.4byte " << border_label << "\n" + << "\t.4byte " << blockdata_label << "\n" + << "\t.4byte " << layout["primary_tileset"].string_value() << "\n" + << "\t.4byte " << layout["secondary_tileset"].string_value() << "\n\n"; + } + + return text.str(); +} + +string generate_layouts_table_text(Json layouts_data) { + ostringstream text; + + text << "\t.align 2\n" + << layouts_data["layouts_table_label"].string_value() << "::\n"; + + for (auto &layout : layouts_data["layouts"].array_items()) + text << "\t.4byte " << layout["name"].string_value() << "\n"; + + return text.str(); +} + +string generate_layouts_constants_text(Json layouts_data) { + ostringstream text; + + text << "#ifndef GUARD_CONSTANTS_LAYOUTS_H\n" + << "#define GUARD_CONSTANTS_LAYOUTS_H\n\n"; + + int i = 0; + for (auto &layout : layouts_data["layouts"].array_items()) + text << "#define " << layout["id"].string_value() << " " << ++i << "\n"; + + text << "\n#endif // GUARD_CONSTANTS_LAYOUTS_H\n"; + + return text.str(); +} + +void process_layouts(string layouts_filepath) { + string err; + Json layouts_data = Json::parse(read_text_file(layouts_filepath), err); + + if (layouts_data == Json()) + FATAL_ERROR("%s\n", err.c_str()); + + string layout_headers_text = generate_layout_headers_text(layouts_data); + string layouts_table_text = generate_layouts_table_text(layouts_data); + string layouts_constants_text = generate_layouts_constants_text(layouts_data); + + string file_dir = get_directory_name(layouts_filepath); + char s = file_dir.back(); + + write_text_file(file_dir + "layouts.inc", layout_headers_text); + write_text_file(file_dir + "layouts_table.inc", layouts_table_text); + write_text_file(file_dir + ".." + s + ".." + s + "include" + s + "constants" + s + "layouts.h", layouts_constants_text); +} + +int main(int argc, char *argv[]) { + if (argc < 2) + FATAL_ERROR("USAGE: mapjson [options]\n"); + + char *mode_arg = argv[1]; + string mode(mode_arg); + if (mode != "layouts" && mode != "map" && mode != "groups") + FATAL_ERROR("ERROR: must be 'layouts', 'map', or 'groups'.\n"); + + if (mode == "map") { + if (argc != 4) + FATAL_ERROR("USAGE: mapjson map \n"); + + string filepath(argv[2]); + string layouts_filepath(argv[3]); + + process_map(filepath, layouts_filepath); + } + else if (mode == "groups") { + if (argc != 3) + FATAL_ERROR("USAGE: mapjson groups \n"); + + string filepath(argv[2]); + + process_groups(filepath); + } + else if (mode == "layouts") { + if (argc != 3) + FATAL_ERROR("USAGE: mapjson layouts \n"); + + string filepath(argv[2]); + + process_layouts(filepath); + } + + return 0; +} diff --git a/tools/mapjson/mapjson.h b/tools/mapjson/mapjson.h new file mode 100644 index 0000000000..6e961a28ec --- /dev/null +++ b/tools/mapjson/mapjson.h @@ -0,0 +1,31 @@ +// mapjson.h + +#ifndef MAPJSON_H +#define MAPJSON_H + +#include +using std::fprintf; using std::exit; + +#include + +#ifdef _MSC_VER + +#define FATAL_ERROR(format, ...) \ +do \ +{ \ + fprintf(stderr, format, __VA_ARGS__); \ + exit(1); \ +} while (0) + +#else + +#define FATAL_ERROR(format, ...) \ +do \ +{ \ + fprintf(stderr, format, ##__VA_ARGS__); \ + exit(1); \ +} while (0) + +#endif // _MSC_VER + +#endif // MAPJSON_H diff --git a/tools/mapjson/mapjson.py b/tools/mapjson/mapjson.py deleted file mode 100755 index 28322a2de2..0000000000 --- a/tools/mapjson/mapjson.py +++ /dev/null @@ -1,389 +0,0 @@ -# mapjson.py - -import os -import re -import sys -import json - - -def abort(message): - print message - sys.exit() - - -def write_text_file(filepath, text): - with open(filepath, 'w') as f: - f.write(text) - - -def generate_map_header_text(map_data, layouts_data): - matched_layouts = filter(lambda layout: layout['id'] == map_data['layout'], layouts_data['layouts']) - if len(matched_layouts) != 1: - abort('Failed to find matching layout for "%s"' % (map_data['layout'])) - layout = matched_layouts[0] - text = '%s:\n' % (map_data['name']) - text += '\t.4byte %s\n' % (layout['name']) - - if 'shared_events_map' in map_data: - text += '\t.4byte %s\n' % (map_data['shared_events_map'] + '_MapEvents') - else: - text += '\t.4byte %s\n' % (map_data['name'] + '_MapEvents') - - if 'shared_scripts_map' in map_data: - text += '\t.4byte %s\n' % (map_data['shared_scripts_map'] + '_MapScripts') - else: - text += '\t.4byte %s\n' % (map_data['name'] + '_MapScripts') - - if map_data['connections'] is not None and len(map_data['connections']) > 0: - text += '\t.4byte %s\n' % (map_data['name'] + '_MapConnections') - else: - text += '\t.4byte 0x0\n' - - text += '\t.2byte %s\n' % (map_data['music']) - text += '\t.2byte %s\n' % (layout['id']) - text += '\t.byte %s\n' % (map_data['region_map_section']) - text += '\t.byte %s\n' % (int(map_data['requires_flash'])) - text += '\t.byte %s\n' % (map_data['weather']) - text += '\t.byte %s\n' % (map_data['map_type']) - text += '\t.2byte 0\n' - text += '\tmap_header_flags allow_bike=%s, allow_escape_rope=%s, allow_run=%s, show_map_name=%s\n' % (int(map_data['allow_bike']), int(map_data['allow_escape_rope']), int(map_data['allow_running']), int(map_data['show_map_name'])) - text += '\t.byte %s\n\n' % (map_data['battle_scene']) - return text - - -def generate_map_connections_text(map_data): - if map_data['connections'] is None: - return '\n' - - label = '%s_MapConnectionsList' % (map_data['name']) - text = '%s:\n' % (label) - for connection in map_data['connections']: - text += '\tconnection %s, %s, %s\n' % (connection['direction'], connection['offset'], connection['map']) - - text += '\n%s_MapConnections:\n' % (map_data['name']) - text += '\t.4byte %s\n' % (len(map_data['connections'])) - text += '\t.4byte %s\n\n' % (label) - return text - - -def generate_map_events_text(map_data): - if 'shared_events_map' in map_data: - return '\n' - - text = '' - if len(map_data['object_events']) > 0: - objects_label = '%s_EventObjects' % (map_data['name']) - text += '%s:\n' % (objects_label) - for i, obj in enumerate(map_data['object_events']): - text += '\tobject_event %s, %s, 0, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s\n' % ( - i + 1, - obj['graphics_id'], - obj['x'], - obj['y'], - obj['elevation'], - obj['movement_type'], - obj['movement_range_x'], - obj['movement_range_y'], - obj['trainer_type'], - obj['trainer_sight_or_berry_tree_id'], - obj['script'], - obj['flag']) - text += '\n' - else: - objects_label = '0x0' - - if len(map_data['warp_events']) > 0: - warps_label = '%s_MapWarps' % (map_data['name']) - text += '%s:\n' % (warps_label) - for i, warp in enumerate(map_data['warp_events']): - text += '\twarp_def %s, %s, %s, %s, %s\n' % ( - warp['x'], - warp['y'], - warp['elevation'], - warp['dest_warp_id'], - warp['dest_map']) - text += '\n' - else: - warps_label = '0x0' - - if len(map_data['coord_events']) > 0: - coords_label = '%s_MapCoordEvents' % (map_data['name']) - text += '%s:\n' % (coords_label) - for i, event in enumerate(map_data['coord_events']): - if event['type'] == 'trigger': - text += '\tcoord_event %s, %s, %s, %s, %s, %s\n' % ( - event['x'], - event['y'], - event['elevation'], - event['var'], - event['var_value'], - event['script']) - elif event['type'] == 'weather': - text += '\tcoord_weather_event %s, %s, %s, %s\n' % ( - event['x'], - event['y'], - event['elevation'], - event['weather']) - text += '\n' - else: - coords_label = '0x0' - - if len(map_data['bg_events']) > 0: - bgs_label = '%s_MapBGEvents' % (map_data['name']) - text += '%s:\n' % (bgs_label) - for i, event in enumerate(map_data['bg_events']): - if event['type'] == 'sign': - text += '\tbg_event %s, %s, %s, %s, %s\n' % ( - event['x'], - event['y'], - event['elevation'], - event['player_facing_dir'], - event['script']) - elif event['type'] == 'hidden_item': - text += '\tbg_hidden_item_event %s, %s, %s, %s, %s\n' % ( - event['x'], - event['y'], - event['elevation'], - event['item'], - event['flag']) - elif event['type'] == 'secret_base': - text += '\tbg_secret_base_event %s, %s, %s, %s\n' % ( - event['x'], - event['y'], - event['elevation'], - event['secret_base_id']) - text += '\n' - else: - bgs_label = '0x0' - - text += '%s_MapEvents::\n' % (map_data['name']) - text += '\tmap_events %s, %s, %s, %s\n\n' % (objects_label, warps_label, coords_label, bgs_label) - return text - - -def process_map(map_filepath, layouts_filepath): - with open(map_filepath) as f: - map_data = json.load(f) - with open(layouts_filepath) as f: - layouts_data = json.load(f) - - header_text = generate_map_header_text(map_data, layouts_data) - events_text = generate_map_events_text(map_data) - connections_text = generate_map_connections_text(map_data) - - files_dir = os.path.dirname(map_filepath) - write_text_file(os.path.join(files_dir, 'header.inc'), header_text) - write_text_file(os.path.join(files_dir, 'events.inc'), events_text) - write_text_file(os.path.join(files_dir, 'connections.inc'), connections_text) - - -def generate_groups_text(groups_data): - text = '' - for group in groups_data['group_order']: - text += '%s::\n' % (group) - maps = groups_data[group] - for map_name in maps: - text += '\t.4byte %s\n' % (map_name) - text += '\n' - - text += '\t.align 2\n' - text += 'gMapGroups::\n' - for group in groups_data['group_order']: - text += '\t.4byte %s\n' % (group) - text += '\n' - return text - - -def index_of(in_list, value): - try: - index_value = in_list.index(value) - except ValueError: - index_value = sys.maxint - return index_value - - -def generate_connections_text(groups_data): - map_names = [] - for group in groups_data['group_order']: - for map_name in groups_data[group]: - map_names.append(map_name) - - if 'connections_include_order' in groups_data: - map_names.sort(key=lambda x: index_of(groups_data['connections_include_order'], x)) - - text = '' - for map_name in map_names: - text += '\t.include "data/maps/%s/connections.inc"\n' % (map_name) - - return text - - -def generate_headers_text(groups_data): - map_names = [] - for group in groups_data['group_order']: - for map_name in groups_data[group]: - map_names.append(map_name) - - text = '' - for map_name in map_names: - text += '\t.include "data/maps/%s/header.inc"\n' % (map_name) - - return text - - -def generate_events_text(groups_data): - map_names = [] - for group in groups_data['group_order']: - for map_name in groups_data[group]: - map_names.append(map_name) - - text = '' - for map_name in map_names: - text += '\t.include "data/maps/%s/events.inc"\n' % (map_name) - - return text - - -def generate_map_constants_text(groups_filepath, groups_data): - file_dir = os.path.dirname(groups_filepath) - text = '#ifndef GUARD_CONSTANTS_MAP_GROUPS_H\n' - text += '#define GUARD_CONSTANTS_MAP_GROUPS_H\n\n' - - for i, group in enumerate(groups_data['group_order']): - text += '// Map Group %s\n' % (i) - map_ids = [] - max_length = 0 - for map_name in groups_data[group]: - header_filepath = os.path.join(file_dir, map_name, 'map.json') - with open(header_filepath) as f: - map_data = json.load(f) - map_ids.append(map_data['id']) - if len(map_data['id']) > max_length: - max_length = len(map_data['id']) - - for j, map_id in enumerate(map_ids): - text += '#define %s%s(%s | (%s << 8))\n' % (map_id, " " * (max_length - len(map_id) + 1), j, i) - - text += '\n' - - text += '#define MAP_GROUPS_COUNT %s\n\n' % (len(groups_data['group_order'])) - text += '#endif // GUARD_CONSTANTS_MAP_GROUPS_H\n' - - return text - - -def process_groups(groups_filepath): - with open(groups_filepath) as f: - groups_data = json.load(f) - - groups_text = generate_groups_text(groups_data) - connections_text = generate_connections_text(groups_data) - headers_text = generate_headers_text(groups_data) - events_text = generate_events_text(groups_data) - map_header_text = generate_map_constants_text(groups_filepath, groups_data) - - file_dir = os.path.dirname(groups_filepath) - write_text_file(os.path.join(file_dir, 'groups.inc'), groups_text) - write_text_file(os.path.join(file_dir, 'connections.inc'), connections_text) - write_text_file(os.path.join(file_dir, 'headers.inc'), headers_text) - write_text_file(os.path.join(file_dir, 'events.inc'), events_text) - write_text_file(os.path.join(file_dir, '../../include/constants/map_groups.h'), map_header_text) - - -def generate_layout_headers_text(layouts_data): - text = '' - for layout in layouts_data['layouts']: - border_label = layout['name'] + '_Border' - blockdata_label = layout['name'] + '_Blockdata' - text += '%s::\n' % (border_label) - text += '\t.incbin "%s"\n\n' % (layout['border_filepath']) - text += '%s::\n' % (blockdata_label) - text += '\t.incbin "%s"\n\n' % (layout['blockdata_filepath']) - text += '\t.align 2\n' - text += '%s::\n' % (layout['name']) - text += '\t.4byte %s\n' % (layout['width']) - text += '\t.4byte %s\n' % (layout['height']) - text += '\t.4byte %s\n' % (border_label) - text += '\t.4byte %s\n' % (blockdata_label) - text += '\t.4byte %s\n' % (layout['primary_tileset']) - text += '\t.4byte %s\n\n' % (layout['secondary_tileset']) - - return text - - -def generate_layouts_table_text(layouts_data): - text = '\t.align 2\n' - text += '%s::\n' % (layouts_data['layouts_table_label']) - for layout in layouts_data['layouts']: - text += '\t.4byte %s\n' % (layout['name']) - - return text - - -def generate_layouts_constants_text(layouts_data): - text = '#ifndef GUARD_CONSTANTS_LAYOUTS_H\n' - text += '#define GUARD_CONSTANTS_LAYOUTS_H\n\n' - for i, layout in enumerate(layouts_data['layouts']): - text += '#define %s %s\n' % (layout['id'], i + 1) - text += '\n' - text += '#endif // GUARD_CONSTANTS_LAYOUTS_H\n' - return text - - -def process_layouts(layouts_filepath): - with open(layouts_filepath) as f: - layouts_data = json.load(f) - - layout_headers_text = generate_layout_headers_text(layouts_data) - layouts_table_text = generate_layouts_table_text(layouts_data) - layouts_constants_text = generate_layouts_constants_text(layouts_data) - - file_dir = os.path.dirname(layouts_filepath) - write_text_file(os.path.join(file_dir, 'layouts.inc'), layout_headers_text) - write_text_file(os.path.join(file_dir, 'layouts_table.inc'), layouts_table_text) - write_text_file(os.path.join(file_dir, '../../include/constants/layouts.h'), layouts_constants_text) - - -def main(): - if len(sys.argv) < 2: - abort('USAGE: python mapjson.py [options]') - - mode = sys.argv[1] - if mode not in ['layouts', 'map', 'groups']: - abort("ERROR: must be 'layouts', 'map', or 'groups'.") - - if mode == 'map': - if len(sys.argv) != 4: - abort('USAGE: python mapjson.py map ') - - filepath = sys.argv[2] - if not os.path.exists(filepath): - abort('ERROR: Map file "%s" does not exist' % (filepath)) - - layouts_filepath = sys.argv[3] - if not os.path.exists(layouts_filepath): - abort('ERROR: Layouts file "%s" does not exist' % (layouts_filepath)) - - process_map(filepath, layouts_filepath) - elif mode == 'groups': - if len(sys.argv) != 3: - abort('USAGE: python mapjson.py groups ') - - filepath = sys.argv[2] - if not os.path.exists(filepath): - abort('ERROR: Map file "%s" does not exist' % (filepath)) - - process_groups(filepath) - elif mode == 'layouts': - if len(sys.argv) != 3: - abort('USAGE: python mapjson.py layouts ') - - filepath = sys.argv[2] - if not os.path.exists(filepath): - abort('ERROR: Layouts file "%s" does not exist' % (filepath)) - - process_layouts(filepath) - - -if __name__ == '__main__': - main() From 804e955c8d3c57b7ee8ed90ca59ab732f8eeeae1 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Mon, 4 Feb 2019 11:38:44 +0000 Subject: [PATCH 013/217] Label some more functions --- src/pokemon_summary_screen.c | 84 +++++++++++++++++++----------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index b05f3129b5..f88a2470a4 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -184,10 +184,10 @@ static void PrintPageNamesAndStatsPageToWindows(void); static void sub_81C2AFC(u8 a); static void sub_81C2C38(u8 a); static void SummaryScreen_RemoveWindowByIndex(u8 a); -static void sub_81C2D9C(u8 a); -static void sub_81C2DE4(u8 a); -static void sub_81C2E00(void); -static void sub_81C2E40(u8 taskId); +static void PrintPageSpecificText(u8 a); +static void CreateTextPrinterTask(u8 a); +static void PrintInfoPageText(void); +static void sTask_PrintInfoPage(u8 taskId); static void PrintMonOTName(void); static void PrintMonOTID(void); static void PrintMonAbilityName(void); @@ -203,27 +203,27 @@ static void PrintEggOTName(void); static void PrintEggOTID(void); static void PrintEggState(void); static void PrintEggMemo(void); -static void sub_81C3554(u8 taskId); +static void sTask_PrintSkillsPage(u8 taskId); static void PrintHeldItemName(void); -static void sub_81C3530(void); +static void PrintSkillsPageText(void); static void PrintRibbonCount(void); static void BufferLeftColumnStats(void); static void PrintLeftColumnStats(void); static void BufferRightColumnStats(void); static void PrintRightColumnStats(void); static void PrintExpPointsNextLevel(void); -static void sub_81C3984(void); -static void sub_81C39F0(u8 taskId); +static void PrintBattleMoves(void); +static void sTask_PrintBattleMoves(u8 taskId); static void PrintMoveNameAndPP(u8 a); -static void sub_81C3D08(void); -static void sub_81C3D54(u8 taskId); +static void PrintContestMoves(void); +static void sTask_PrintContestMoves(u8 taskId); static void PrintContestMoveDescription(u8 a); static void PrintMoveDetails(u16 a); static void PrintNewMoveDetailsOrCancelText(void); static void sub_81C4064(void); static void sub_81C40A0(u8 a, u8 b); static void PrintHMMovesCantBeForgotten(void); -static void ResetPssSpriteIds(void); +static void ResetSpriteIds(void); static void SetSpriteInvisibility(u8 spriteArrayId, bool8 invisible); static void HidePageSpecificSprites(void); static void SetTypeIcons(void); @@ -626,22 +626,26 @@ static const u8 sTextColors_861CD2C[][3] = {0, 5, 6}, {0, 7, 8} }; + static const u8 gUnknown_0861CD53[] = INCBIN_U8("graphics/interface/summary_a_button.4bpp"); static const u8 gUnknown_0861CDD3[] = INCBIN_U8("graphics/interface/summary_b_button.4bpp"); -static void (*const gUnknown_0861CE54[])(void) = + +static void (*const sTextPrinterFunctions[])(void) = { - sub_81C2E00, - sub_81C3530, - sub_81C3984, - sub_81C3D08 + PrintInfoPageText, + PrintSkillsPageText, + PrintBattleMoves, + PrintContestMoves }; -static void (*const gUnknown_0861CE64[])(u8 taskId) = + +static void (*const sTextPrinterTasks[])(u8 taskId) = { - sub_81C2E40, - sub_81C3554, - sub_81C39F0, - sub_81C3D54 + sTask_PrintInfoPage, + sTask_PrintSkillsPage, + sTask_PrintBattleMoves, + sTask_PrintContestMoves }; + static const u8 gUnknown_0861CE74[] = _("{COLOR LIGHT_RED}{SHADOW GREEN}"); static const u8 gUnknown_0861CE7B[] = _("{COLOR WHITE}{SHADOW DARK_GREY}"); static const u8 gUnknown_0861CE82[] = _("{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}\n{SPECIAL_F7 0x02}\n{SPECIAL_F7 0x03}"); @@ -1129,7 +1133,7 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 13: - sub_81C2D9C(pssData->currPageIndex); + PrintPageSpecificText(pssData->currPageIndex); gMain.state++; break; case 14: @@ -1141,7 +1145,7 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 16: - ResetPssSpriteIds(); + ResetSpriteIds(); CreateMoveTypeIcons(); pssData->unk40F0 = 0; gMain.state++; @@ -1573,7 +1577,7 @@ static void sub_81C0704(u8 taskId) sub_81C25E8(); break; case 11: - sub_81C2D9C(pssData->currPageIndex); + PrintPageSpecificText(pssData->currPageIndex); sub_81C2524(); break; case 12: @@ -1676,7 +1680,7 @@ static void sub_81C0A8C(u8 taskId, s8 b) SetTaskFuncWithFollowupFunc(taskId, sub_81C0B8C, gTasks[taskId].func); else SetTaskFuncWithFollowupFunc(taskId, sub_81C0CC4, gTasks[taskId].func); - sub_81C2DE4(pssData->currPageIndex); + CreateTextPrinterTask(pssData->currPageIndex); HidePageSpecificSprites(); } @@ -2910,7 +2914,7 @@ static void SummaryScreen_RemoveWindowByIndex(u8 windowIndex) } } -static void sub_81C2D9C(u8 pageIndex) +static void PrintPageSpecificText(u8 pageIndex) { u16 i; for (i = 0; i < 8; i++) @@ -2918,15 +2922,15 @@ static void sub_81C2D9C(u8 pageIndex) if (pssData->windowIds[i] != 0xFF) FillWindowPixelBuffer(pssData->windowIds[i], 0); } - gUnknown_0861CE54[pageIndex](); + sTextPrinterFunctions[pageIndex](); } -static void sub_81C2DE4(u8 pageIndex) +static void CreateTextPrinterTask(u8 pageIndex) { - CreateTask(gUnknown_0861CE64[pageIndex], 16); + CreateTask(sTextPrinterTasks[pageIndex], 16); } -static void sub_81C2E00(void) +static void PrintInfoPageText(void) { if (pssData->summary.isEgg) { @@ -2946,7 +2950,7 @@ static void sub_81C2E00(void) } } -static void sub_81C2E40(u8 taskId) +static void sTask_PrintInfoPage(u8 taskId) { s16 *data = gTasks[taskId].data; switch (data[0]) @@ -3200,7 +3204,7 @@ static void PrintEggMemo(void) SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCCC, 3), text, 0, 1, 0, 0); } -static void sub_81C3530(void) +static void PrintSkillsPageText(void) { PrintHeldItemName(); PrintRibbonCount(); @@ -3211,7 +3215,7 @@ static void sub_81C3530(void) PrintExpPointsNextLevel(); } -static void sub_81C3554(u8 taskId) +static void sTask_PrintSkillsPage(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -3357,7 +3361,7 @@ static void PrintExpPointsNextLevel(void) SummaryScreen_PrintTextOnWindow(windowId, gStringVar1, offset, 17, 0, 0); } -static void sub_81C3984(void) +static void PrintBattleMoves(void) { PrintMoveNameAndPP(0); PrintMoveNameAndPP(1); @@ -3379,7 +3383,7 @@ static void sub_81C3984(void) } } -static void sub_81C39F0(u8 taskId) +static void sTask_PrintBattleMoves(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -3493,7 +3497,7 @@ static void PrintMovePowerAndAccuracy(u16 moveIndex) } } -static void sub_81C3D08(void) +static void PrintContestMoves(void) { PrintMoveNameAndPP(0); PrintMoveNameAndPP(1); @@ -3507,7 +3511,7 @@ static void sub_81C3D08(void) } } -static void sub_81C3D54(u8 taskId) +static void sTask_PrintContestMoves(u8 taskId) { s16 *data = gTasks[taskId].data; s16 dataa = data[0] - 1; @@ -3641,11 +3645,11 @@ static void PrintHMMovesCantBeForgotten(void) SummaryScreen_PrintTextOnWindow(windowId, gText_HMMovesCantBeForgotten2, 6, 1, 0, 0); } -static void ResetPssSpriteIds(void) +static void ResetSpriteIds(void) { u8 i; - for (i = 0; i < 28; i++) + for (i = 0; i < ARRAY_COUNT(pssData->spriteIds); i++) { pssData->spriteIds[i] = 0xFF; } @@ -3670,7 +3674,7 @@ static void HidePageSpecificSprites(void) // Keeps Pokémon, caught ball and status sprites visible. u8 i; - for (i = 3; i < 28; i++) + for (i = 3; i < ARRAY_COUNT(pssData->spriteIds); i++) { if (pssData->spriteIds[i] != 0xFF) SetSpriteInvisibility(i, TRUE); From 3d79aeb9da19a0488c87400100056ad04d9c165a Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Mon, 4 Feb 2019 12:44:09 +0000 Subject: [PATCH 014/217] More documentation --- src/pokemon_summary_screen.c | 143 ++++++++++++++++++----------------- 1 file changed, 72 insertions(+), 71 deletions(-) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index f88a2470a4..2a241620f7 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -43,10 +43,11 @@ #include "constants/items.h" #include "constants/moves.h" #include "constants/region_map_sections.h" +#include "constants/rgb.h" #include "constants/songs.h" #include "constants/species.h" -static EWRAM_DATA struct UnkSummaryStruct +static EWRAM_DATA struct PssData { /*0x00*/ union { struct Pokemon *mons; @@ -135,21 +136,21 @@ static bool8 SummaryScreen_DecompressGraphics(void); static void CopyMonToSummaryStruct(struct Pokemon* a); static bool8 ExtractMonDataToSummaryStruct(struct Pokemon* a); static void sub_81C0348(void); -static void sub_81C0484(u8 taskId); -static void sub_81C0510(u8 taskId); -static void sub_81C0604(u8 taskId, s8 a); +static void CloseSummaryScreen(u8 taskId); +static void HandleInput(u8 taskId); +static void ChangePokemon(u8 taskId, s8 a); static void sub_81C0704(u8 taskId); static s8 sub_81C08F8(s8 a); static s8 sub_81C09B4(s8 a); static bool8 sub_81C0A50(struct Pokemon* mon); -static void sub_81C0A8C(u8 taskId, s8 a); +static void ChangePage(u8 taskId, s8 a); static void sub_81C0B8C(u8 taskId); static void sub_81C0C68(u8 taskId); static void sub_81C0CC4(u8 taskId); static void sub_81C0D44(u8 taskId); static void sub_81C0E24(void); static void sub_81C0E48(u8 taskId); -static void sub_81C0F44(u8 taskId); +static void HandleInput_MoveSelect(u8 taskId); static bool8 sub_81C1040(void); static void sub_81C1070(s16* a, s8 b, u8* c); static void sub_81C11F4(u8 a); @@ -175,19 +176,19 @@ static void sub_81C2228(struct Pokemon* mon); static void DrawExperienceProgressBar(struct Pokemon* mon); static void DrawContestMoveHearts(u16 move); static void sub_81C2524(void); -static void sub_81C2554(void); +static void ResetWindows(void); static void sub_81C25E8(void); static void sub_81C2628(void); static void sub_81C2794(void); static void sub_81C27DC(struct Pokemon *mon, u16 a); static void PrintPageNamesAndStatsPageToWindows(void); -static void sub_81C2AFC(u8 a); -static void sub_81C2C38(u8 a); +static void CreatePageWindowTilemaps(u8 a); +static void ClearPageWindowTilemaps(u8 a); static void SummaryScreen_RemoveWindowByIndex(u8 a); static void PrintPageSpecificText(u8 a); static void CreateTextPrinterTask(u8 a); static void PrintInfoPageText(void); -static void sTask_PrintInfoPage(u8 taskId); +static void Task_PrintInfoPage(u8 taskId); static void PrintMonOTName(void); static void PrintMonOTID(void); static void PrintMonAbilityName(void); @@ -203,7 +204,7 @@ static void PrintEggOTName(void); static void PrintEggOTID(void); static void PrintEggState(void); static void PrintEggMemo(void); -static void sTask_PrintSkillsPage(u8 taskId); +static void Task_PrintSkillsPage(u8 taskId); static void PrintHeldItemName(void); static void PrintSkillsPageText(void); static void PrintRibbonCount(void); @@ -213,10 +214,10 @@ static void BufferRightColumnStats(void); static void PrintRightColumnStats(void); static void PrintExpPointsNextLevel(void); static void PrintBattleMoves(void); -static void sTask_PrintBattleMoves(u8 taskId); +static void Task_PrintBattleMoves(u8 taskId); static void PrintMoveNameAndPP(u8 a); static void PrintContestMoves(void); -static void sTask_PrintContestMoves(u8 taskId); +static void Task_PrintContestMoves(u8 taskId); static void PrintContestMoveDescription(u8 a); static void PrintMoveDetails(u16 a); static void PrintNewMoveDetailsOrCancelText(void); @@ -640,10 +641,10 @@ static void (*const sTextPrinterFunctions[])(void) = static void (*const sTextPrinterTasks[])(u8 taskId) = { - sTask_PrintInfoPage, - sTask_PrintSkillsPage, - sTask_PrintBattleMoves, - sTask_PrintContestMoves + Task_PrintInfoPage, + Task_PrintSkillsPage, + Task_PrintBattleMoves, + Task_PrintContestMoves }; static const u8 gUnknown_0861CE74[] = _("{COLOR LIGHT_RED}{SHADOW GREEN}"); @@ -1108,7 +1109,7 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 7: - sub_81C2554(); + ResetWindows(); gMain.state++; break; case 8: @@ -1141,7 +1142,7 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 15: - sub_81C2AFC(pssData->currPageIndex); + CreatePageWindowTilemaps(pssData->currPageIndex); gMain.state++; break; case 16: @@ -1176,7 +1177,7 @@ static bool8 SummaryScreen_LoadGraphics(void) break; case 22: if (pssData->mode != PSS_MODE_SELECT_MOVE) - CreateTask(sub_81C0510, 0); + CreateTask(HandleInput, 0); else CreateTask(sub_81C171C, 0); gMain.state++; @@ -1186,7 +1187,7 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 24: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); gPaletteFade.bufferTransferDisabled = 0; gMain.state++; break; @@ -1406,13 +1407,13 @@ static void sub_81C0434(void) Free(pssData); } -static void sub_81C044C(u8 taskId) +static void BeginCloseSummaryScreen(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); - gTasks[taskId].func = sub_81C0484; + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + gTasks[taskId].func = CloseSummaryScreen; } -static void sub_81C0484(u8 taskId) +static void CloseSummaryScreen(u8 taskId) { if (sub_81221EC() != TRUE && !gPaletteFade.active) { @@ -1430,25 +1431,25 @@ static void sub_81C0484(u8 taskId) } } -static void sub_81C0510(u8 taskId) +static void HandleInput(u8 taskId) { if (sub_81221EC() != TRUE && !gPaletteFade.active) { if (gMain.newKeys & DPAD_UP) { - sub_81C0604(taskId, -1); + ChangePokemon(taskId, -1); } else if (gMain.newKeys & DPAD_DOWN) { - sub_81C0604(taskId, 1); + ChangePokemon(taskId, 1); } else if ((gMain.newKeys & DPAD_LEFT) || GetLRKeysState() == 1) { - sub_81C0A8C(taskId, -1); + ChangePage(taskId, -1); } else if ((gMain.newKeys & DPAD_RIGHT) || GetLRKeysState() == 2) { - sub_81C0A8C(taskId, 1); + ChangePage(taskId, 1); } else if (gMain.newKeys & A_BUTTON) { @@ -1458,7 +1459,7 @@ static void sub_81C0510(u8 taskId) { sub_81C48F0(); PlaySE(SE_SELECT); - sub_81C044C(taskId); + BeginCloseSummaryScreen(taskId); } else { @@ -1471,12 +1472,12 @@ static void sub_81C0510(u8 taskId) { sub_81C48F0(); PlaySE(SE_SELECT); - sub_81C044C(taskId); + BeginCloseSummaryScreen(taskId); } } } -static void sub_81C0604(u8 taskId, s8 a) +static void ChangePokemon(u8 taskId, s8 a) { s8 r4_2; @@ -1587,7 +1588,7 @@ static void sub_81C0704(u8 taskId) if (sub_81221EC() == 0 && FuncIsActiveTask(sub_81C20F0) == 0) { data[0] = 0; - gTasks[taskId].func = sub_81C0510; + gTasks[taskId].func = HandleInput; } return; } @@ -1660,7 +1661,7 @@ static bool8 sub_81C0A50(struct Pokemon* mon) return FALSE; } -static void sub_81C0A8C(u8 taskId, s8 b) +static void ChangePage(u8 taskId, s8 b) { struct PokeSummary *summary = &pssData->summary; s16 *data = gTasks[taskId].data; @@ -1673,7 +1674,7 @@ static void sub_81C0A8C(u8 taskId, s8 b) return; PlaySE(SE_SELECT); - sub_81C2C38(pssData->currPageIndex); + ClearPageWindowTilemaps(pssData->currPageIndex); pssData->currPageIndex += b; data[0] = 0; if (b == 1) @@ -1721,7 +1722,7 @@ static void sub_81C0C68(u8 taskId) data[1] = 0; data[0] = 0; sub_81C1BA0(); - sub_81C2AFC(pssData->currPageIndex); + CreatePageWindowTilemaps(pssData->currPageIndex); SetTypeIcons(); sub_81C0E24(); SwitchTaskToFollowupFunc(taskId); @@ -1770,7 +1771,7 @@ static void sub_81C0D44(u8 taskId) data[1] = 0; data[0] = 0; sub_81C1BA0(); - sub_81C2AFC(pssData->currPageIndex); + CreatePageWindowTilemaps(pssData->currPageIndex); SetTypeIcons(); sub_81C0E24(); SwitchTaskToFollowupFunc(taskId); @@ -1806,10 +1807,10 @@ static void sub_81C0E48(u8 taskId) schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(2); sub_81C4AF8(8); - gTasks[taskId].func = sub_81C0F44; + gTasks[taskId].func = HandleInput_MoveSelect; } -static void sub_81C0F44(u8 taskId) +static void HandleInput_MoveSelect(u8 taskId) { u8 id = taskId; s16 *data = gTasks[taskId].data; @@ -1934,7 +1935,7 @@ static void sub_81C11F4(u8 taskId) schedule_bg_copy_tilemap_to_vram(0); schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(2); - gTasks[taskId].func = sub_81C0510; + gTasks[taskId].func = HandleInput; } static void sub_81C129C(u8 taskId) @@ -2010,7 +2011,7 @@ static void sub_81C13B0(u8 taskId, bool8 b) DrawContestMoveHearts(move); schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(2); - gTasks[taskId].func = sub_81C0F44; + gTasks[taskId].func = HandleInput_MoveSelect; } static void SwapMonMoves(struct Pokemon *mon, u8 moveIndex1, u8 moveIndex2) @@ -2110,11 +2111,11 @@ static void sub_81C174C(u8 taskId) } else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1) { - sub_81C0A8C(taskId, -1); + ChangePage(taskId, -1); } else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysState() == 2) { - sub_81C0A8C(taskId, 1); + ChangePage(taskId, 1); } else if (gMain.newKeys & A_BUTTON) { @@ -2124,7 +2125,7 @@ static void sub_81C174C(u8 taskId) PlaySE(SE_SELECT); gUnknown_0203CF21 = pssData->firstMoveIndex; gSpecialVar_0x8005 = gUnknown_0203CF21; - sub_81C044C(taskId); + BeginCloseSummaryScreen(taskId); } else { @@ -2139,7 +2140,7 @@ static void sub_81C174C(u8 taskId) PlaySE(SE_SELECT); gUnknown_0203CF21 = 4; gSpecialVar_0x8005 = 4; - sub_81C044C(taskId); + BeginCloseSummaryScreen(taskId); } } } @@ -2195,7 +2196,7 @@ static void sub_81C1940(u8 taskId) ClearWindowTilemap(13); move = pssData->summary.moves[pssData->firstMoveIndex]; gTasks[taskId].func = sub_81C174C; - sub_81C0A8C(taskId, -1); + ChangePage(taskId, -1); sub_81C1DA4(9, -2); sub_81C1EFC(9, -2, move); } @@ -2209,7 +2210,7 @@ static void sub_81C1940(u8 taskId) ClearWindowTilemap(13); move = pssData->summary.moves[pssData->firstMoveIndex]; gTasks[taskId].func = sub_81C174C; - sub_81C0A8C(taskId, 1); + ChangePage(taskId, 1); sub_81C1DA4(9, -2); sub_81C1EFC(9, -2, move); } @@ -2622,7 +2623,7 @@ static void sub_81C2524(void) ChangeBgX(3, 0, 0); } -static void sub_81C2554(void) +static void ResetWindows(void) { u8 i; InitWindows(gUnknown_0861CC24); @@ -2632,7 +2633,7 @@ static void sub_81C2554(void) { FillWindowPixelBuffer(i, 0); } - for (i = 0; i < 8; i++) + for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++) { pssData->windowIds[i] = 0xFF; } @@ -2786,7 +2787,7 @@ static void PrintPageNamesAndStatsPageToWindows(void) SummaryScreen_PrintTextOnWindow(15, gText_Jam, 0, 17, 0, 1); } -static void sub_81C2AFC(u8 a) +static void CreatePageWindowTilemaps(u8 page) { u8 i; @@ -2795,22 +2796,22 @@ static void sub_81C2AFC(u8 a) ClearWindowTilemap(2); ClearWindowTilemap(3); - switch (a) + switch (page) { - case 0: + case PSS_PAGE_INFO: PutWindowTilemap(0); PutWindowTilemap(4); if (sub_81A6BF4() == TRUE || sub_81B9E94() == TRUE) PutWindowTilemap(8); PutWindowTilemap(9); break; - case 1: + case PSS_PAGE_SKILLS: PutWindowTilemap(1); PutWindowTilemap(10); PutWindowTilemap(11); PutWindowTilemap(12); break; - case 2: + case PSS_PAGE_BATTLE_MOVES: PutWindowTilemap(2); if (pssData->mode == PSS_MODE_SELECT_MOVE) { @@ -2822,7 +2823,7 @@ static void sub_81C2AFC(u8 a) PutWindowTilemap(5); } break; - case 3: + case PSS_PAGE_CONTEST_MOVES: PutWindowTilemap(3); if (pssData->mode == PSS_MODE_SELECT_MOVE) { @@ -2836,7 +2837,7 @@ static void sub_81C2AFC(u8 a) break; } - for (i = 0; i < 8; i++) + for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++) { PutWindowTilemap(pssData->windowIds[i]); } @@ -2844,23 +2845,23 @@ static void sub_81C2AFC(u8 a) schedule_bg_copy_tilemap_to_vram(0); } -static void sub_81C2C38(u8 a) +static void ClearPageWindowTilemaps(u8 page) { u8 i; - switch (a) + switch (page) { - case 0: + case PSS_PAGE_INFO: ClearWindowTilemap(4); if (sub_81A6BF4() == TRUE || sub_81B9E94() == TRUE) ClearWindowTilemap(8); ClearWindowTilemap(9); break; - case 1: + case PSS_PAGE_SKILLS: ClearWindowTilemap(10); ClearWindowTilemap(11); ClearWindowTilemap(12); break; - case 2: + case PSS_PAGE_BATTLE_MOVES: if (pssData->mode == PSS_MODE_SELECT_MOVE) { if (pssData->newMove != MOVE_NONE || pssData->firstMoveIndex != MAX_MON_MOVES) @@ -2871,7 +2872,7 @@ static void sub_81C2C38(u8 a) ClearWindowTilemap(5); } break; - case 3: + case PSS_PAGE_CONTEST_MOVES: if (pssData->mode == PSS_MODE_SELECT_MOVE) { if (pssData->newMove != MOVE_NONE || pssData->firstMoveIndex != MAX_MON_MOVES) @@ -2884,7 +2885,7 @@ static void sub_81C2C38(u8 a) break; } - for (i = 0; i < 8; i++) + for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++) { SummaryScreen_RemoveWindowByIndex(i); } @@ -2917,7 +2918,7 @@ static void SummaryScreen_RemoveWindowByIndex(u8 windowIndex) static void PrintPageSpecificText(u8 pageIndex) { u16 i; - for (i = 0; i < 8; i++) + for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++) { if (pssData->windowIds[i] != 0xFF) FillWindowPixelBuffer(pssData->windowIds[i], 0); @@ -2950,7 +2951,7 @@ static void PrintInfoPageText(void) } } -static void sTask_PrintInfoPage(u8 taskId) +static void Task_PrintInfoPage(u8 taskId) { s16 *data = gTasks[taskId].data; switch (data[0]) @@ -3078,7 +3079,7 @@ static void PrintMonTrainerMemo(void) static void BufferNatureString(void) { - struct UnkSummaryStruct *sumStruct = pssData; + struct PssData *sumStruct = pssData; DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gNatureNamePointers[sumStruct->summary.nature]); DynamicPlaceholderTextUtil_SetPlaceholderPtr(5, gText_EmptyString5); } @@ -3215,7 +3216,7 @@ static void PrintSkillsPageText(void) PrintExpPointsNextLevel(); } -static void sTask_PrintSkillsPage(u8 taskId) +static void Task_PrintSkillsPage(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -3383,7 +3384,7 @@ static void PrintBattleMoves(void) } } -static void sTask_PrintBattleMoves(u8 taskId) +static void Task_PrintBattleMoves(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -3434,7 +3435,7 @@ static void PrintMoveNameAndPP(u8 moveIndex) u32 ppState; const u8 *text; u32 offset; - struct UnkSummaryStruct *summaryStruct = pssData; + struct PssData *summaryStruct = pssData; u8 moveNameWindowId = AddWindowFromTemplateList(gUnknown_0861CD14, 0); u8 ppValueWindowId = AddWindowFromTemplateList(gUnknown_0861CD14, 1); u16 move = summaryStruct->summary.moves[moveIndex]; @@ -3511,7 +3512,7 @@ static void PrintContestMoves(void) } } -static void sTask_PrintContestMoves(u8 taskId) +static void Task_PrintContestMoves(u8 taskId) { s16 *data = gTasks[taskId].data; s16 dataa = data[0] - 1; From fa352cfda350dddf42e2cf5673b72069d63bbc32 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Mon, 4 Feb 2019 14:35:49 +0000 Subject: [PATCH 015/217] Some more labelling --- src/pokemon_summary_screen.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 2a241620f7..d878d2c9e9 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -236,7 +236,7 @@ static void SetNewMoveTypeIcon(void); static void sub_81C4568(u8 a, u8 b); static u8 CreatePokemonSprite(struct Pokemon *a, s16 *b); static u8 sub_81C47B4(struct Pokemon *unused); -static void sub_81C4844(struct Sprite *); +static void SpriteCB_Pokemon(struct Sprite *); static void sub_81C48F0(void); static void CreateMonMarkingsSprite(struct Pokemon *mon); static void RemoveAndCreateMonMarkingsSprite(struct Pokemon *mon); @@ -3853,17 +3853,17 @@ static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1) } } (*a1)++; - return -1; + return 0xFF; case 1: pal = GetMonSpritePalStructFromOtIdPersonality(summary->species2, summary->OTID, summary->pid); LoadCompressedSpritePalette(pal); SetMultiuseSpriteTemplateToPokemon(pal->tag, 1); (*a1)++; - return -1; + return 0xFF; } } -static void sub_81C4778(void) +static void PlayMonCry(void) { struct PokeSummary *summary = &pssData->summary; if (!summary->isEgg) @@ -3889,7 +3889,7 @@ static u8 sub_81C47B4(struct Pokemon *unused) sprite->data[0] = summary->species2; sprite->data[2] = 0; - gSprites[spriteId].callback = sub_81C4844; + gSprites[spriteId].callback = SpriteCB_Pokemon; sprite->oam.priority = 0; if (!IsMonSpriteNotFlipped(summary->species2)) @@ -3904,14 +3904,14 @@ static u8 sub_81C47B4(struct Pokemon *unused) return spriteId; } -static void sub_81C4844(struct Sprite *sprite) +static void SpriteCB_Pokemon(struct Sprite *sprite) { struct PokeSummary *summary = &pssData->summary; if (!gPaletteFade.active && sprite->data[2] != 1) { sprite->data[1] = IsMonSpriteNotFlipped(sprite->data[0]); - sub_81C4778(); + PlayMonCry(); PokemonSummaryDoMonAnimation(sprite, sprite->data[0], summary->isEgg); } } From d4125fef9bc9adb95c7a5fb5b8be903b34adc510 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 4 Feb 2019 17:28:45 -0600 Subject: [PATCH 016/217] Cleanup and add game version flag to mapjson tool --- data/maps/.gitignore | 2 +- include/constants/layouts.h | 2 +- include/constants/map_groups.h | 2 +- map_data_rules.mk | 6 ++-- tools/mapjson/.gitignore | 1 + tools/mapjson/mapjson.cpp | 60 ++++++++++++++++++++-------------- 6 files changed, 42 insertions(+), 31 deletions(-) create mode 100755 tools/mapjson/.gitignore diff --git a/data/maps/.gitignore b/data/maps/.gitignore index c07d4e03a6..59405b1767 100755 --- a/data/maps/.gitignore +++ b/data/maps/.gitignore @@ -1,4 +1,4 @@ -connections.in +connections.inc events.inc groups.inc headers.inc diff --git a/include/constants/layouts.h b/include/constants/layouts.h index 45b37ff8bf..d12db9b33f 100755 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -443,4 +443,4 @@ #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F 440 #define LAYOUT_UNKNOWN_MAP_08481DBC 441 -#endif // GUARD_CONSTANTS_LAYOUTS_H +#endif // GUARD_CONSTANTS_LAYOUTS_H diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index 003b8c6ce6..dc2ac2f32e 100755 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -589,4 +589,4 @@ #define MAP_GROUPS_COUNT 34 -#endif // GUARD_CONSTANTS_MAP_GROUPS_H +#endif // GUARD_CONSTANTS_MAP_GROUPS_H diff --git a/map_data_rules.mk b/map_data_rules.mk index 6d133eb504..5a7d9dd842 100755 --- a/map_data_rules.mk +++ b/map_data_rules.mk @@ -14,18 +14,18 @@ $(DATA_ASM_BUILDDIR)/map_events.o: $(DATA_ASM_SUBDIR)/map_events.s $(MAPS_DIR)/e $(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@ $(MAPS_DIR)/%/header.inc: $(MAPS_DIR)/%/map.json - $(MAPJSON) map $< $(LAYOUTS_DIR)/layouts.json + $(MAPJSON) map emerald $< $(LAYOUTS_DIR)/layouts.json $(MAPS_DIR)/%/events.inc: $(MAPS_DIR)/%/header.inc ; $(MAPS_DIR)/%/connections.inc: $(MAPS_DIR)/%/events.inc ; $(MAPS_DIR)/groups.inc: $(MAPS_DIR)/map_groups.json - $(MAPJSON) groups $< + $(MAPJSON) groups emerald $< $(MAPS_DIR)/connections.inc: $(MAPS_DIR)/groups.inc ; $(MAPS_DIR)/events.inc: $(MAPS_DIR)/connections.inc ; $(MAPS_DIR)/headers.inc: $(MAPS_DIR)/events.inc ; include/constants/map_groups.h: $(MAPS_DIR)/headers.inc ; $(LAYOUTS_DIR)/layouts.inc: $(LAYOUTS_DIR)/layouts.json - $(MAPJSON) layouts $< + $(MAPJSON) layouts emerald $< $(LAYOUTS_DIR)/layouts_table.inc: $(LAYOUTS_DIR)/layouts.inc ; include/constants/layouts.h: $(LAYOUTS_DIR)/layouts_table.inc ; diff --git a/tools/mapjson/.gitignore b/tools/mapjson/.gitignore new file mode 100755 index 0000000000..a5d5684797 --- /dev/null +++ b/tools/mapjson/.gitignore @@ -0,0 +1 @@ +mapjson diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index e1e86b5c5f..2dd6e5b315 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -50,7 +50,7 @@ string read_text_file(string filepath) { } void write_text_file(string filepath, string text) { - ofstream out_file(filepath); + ofstream out_file(filepath, std::ofstream::binary); if (!out_file.is_open()) FATAL_ERROR("Cannot open file %s for writing.\n", filepath.c_str()); @@ -60,7 +60,7 @@ void write_text_file(string filepath, string text) { out_file.close(); } -string generate_map_header_text(Json map_data, Json layouts_data) { +string generate_map_header_text(Json map_data, Json layouts_data, string version) { string map_layout_id = map_data["layout"].string_value(); vector matched; @@ -102,13 +102,18 @@ string generate_map_header_text(Json map_data, Json layouts_data) { << "\t.byte " << map_data["requires_flash"].bool_value() << "\n" << "\t.byte " << map_data["weather"].string_value() << "\n" << "\t.byte " << map_data["map_type"].string_value() << "\n" - << "\t.2byte 0\n\t" - << "map_header_flags " - << "allow_bike=" << map_data["allow_bike"].bool_value() << ", " - << "allow_escape_rope=" << map_data["allow_escape_rope"].bool_value() << ", " - << "allow_run=" << map_data["allow_running"].bool_value() << ", " - << "show_map_name=" << map_data["show_map_name"].bool_value() << "\n" - << "\t.byte " << map_data["battle_scene"].string_value() << "\n\n"; + << "\t.2byte 0\n"; + + if (version == "ruby") + text << "\t.byte " << map_data["show_map_name"].bool_value() << "\n"; + else if (version == "emerald") + text << "\tmap_header_flags " + << "allow_bike=" << map_data["allow_bike"].bool_value() << ", " + << "allow_escape_rope=" << map_data["allow_escape_rope"].bool_value() << ", " + << "allow_run=" << map_data["allow_running"].bool_value() << ", " + << "show_map_name=" << map_data["show_map_name"].bool_value() << "\n"; + + text << "\t.byte " << map_data["battle_scene"].string_value() << "\n\n"; return text.str(); } @@ -146,7 +151,7 @@ string generate_map_events_text(Json map_data) { if (map_data["object_events"].array_items().size() > 0) { objects_label = map_data["name"].string_value() + "_EventObjects"; text << objects_label << ":\n"; - for (int i = 0; i < map_data["object_events"].array_items().size(); i++) { + for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) { auto obj_event = map_data["object_events"].array_items()[i]; text << "\tobject_event " << i + 1 << ", " << obj_event["graphics_id"].string_value() << ", 0, " @@ -254,7 +259,7 @@ string get_directory_name(string filename) { return filename.substr(0, dir_pos + 1); } -void process_map(string map_filepath, string layouts_filepath) { +void process_map(string map_filepath, string layouts_filepath, string version) { string mapdata_err, layouts_err; string mapdata_json_text = read_text_file(map_filepath); @@ -268,7 +273,7 @@ void process_map(string map_filepath, string layouts_filepath) { if (layouts_data == Json()) FATAL_ERROR("%s\n", layouts_err.c_str()); - string header_text = generate_map_header_text(map_data, layouts_data); + string header_text = generate_map_header_text(map_data, layouts_data, version); string events_text = generate_map_events_text(map_data); string connections_text = generate_map_connections_text(map_data); @@ -490,8 +495,13 @@ void process_layouts(string layouts_filepath) { } int main(int argc, char *argv[]) { - if (argc < 2) - FATAL_ERROR("USAGE: mapjson [options]\n"); + if (argc < 3) + FATAL_ERROR("USAGE: mapjson [options]\n"); + + char *version_arg = argv[2]; + string version(version_arg); + if (version != "emerald" && version != "ruby") + FATAL_ERROR("ERROR: must be 'emerald' or 'ruby'.\n"); char *mode_arg = argv[1]; string mode(mode_arg); @@ -499,27 +509,27 @@ int main(int argc, char *argv[]) { FATAL_ERROR("ERROR: must be 'layouts', 'map', or 'groups'.\n"); if (mode == "map") { - if (argc != 4) - FATAL_ERROR("USAGE: mapjson map \n"); + if (argc != 5) + FATAL_ERROR("USAGE: mapjson map \n"); - string filepath(argv[2]); - string layouts_filepath(argv[3]); + string filepath(argv[3]); + string layouts_filepath(argv[4]); - process_map(filepath, layouts_filepath); + process_map(filepath, layouts_filepath, version); } else if (mode == "groups") { - if (argc != 3) - FATAL_ERROR("USAGE: mapjson groups \n"); + if (argc != 4) + FATAL_ERROR("USAGE: mapjson groups \n"); - string filepath(argv[2]); + string filepath(argv[3]); process_groups(filepath); } else if (mode == "layouts") { - if (argc != 3) - FATAL_ERROR("USAGE: mapjson layouts \n"); + if (argc != 4) + FATAL_ERROR("USAGE: mapjson layouts \n"); - string filepath(argv[2]); + string filepath(argv[3]); process_layouts(filepath); } From 37e86d75788f4ed364db19aabce11e6e054a1084 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 5 Feb 2019 14:35:31 -0600 Subject: [PATCH 017/217] Add json to list of LF line-end files --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 96c1c1231c..b095aa2cdb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,6 +9,7 @@ Makefile text eol=lf *.pl text eol=lf *.inc text eol=lf *.sha1 text eol=lf +*.json text eol=lf *.png binary *.bin binary From 1253cbf5f6780386acda0cfab8f201bf5a70570e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 6 Feb 2019 13:17:09 -0600 Subject: [PATCH 018/217] Document some battle anim things --- include/battle_anim.h | 38 ++-- include/graphics.h | 6 +- src/battle_anim.c | 38 ++-- src/battle_anim_80A5C6C.c | 227 +++++++++++----------- src/battle_anim_80D51AC.c | 12 +- src/battle_anim_8170478.c | 14 +- src/battle_anim_effects_1.c | 34 ++-- src/battle_anim_effects_2.c | 40 ++-- src/battle_anim_effects_3.c | 54 ++--- src/battle_anim_utility_funcs.c | 34 ++-- src/battle_controller_link_opponent.c | 4 +- src/battle_controller_link_partner.c | 4 +- src/battle_controller_opponent.c | 4 +- src/battle_controller_player.c | 4 +- src/battle_controller_player_partner.c | 4 +- src/battle_controller_recorded_opponent.c | 4 +- src/battle_controller_recorded_player.c | 4 +- src/battle_controller_wally.c | 2 +- src/bug.c | 4 +- src/dark.c | 32 +-- src/dragon.c | 2 +- src/fire.c | 10 +- src/ghost.c | 4 +- src/graphics.c | 6 +- src/ground.c | 6 +- src/ice.c | 30 +-- src/normal.c | 12 +- src/poison.c | 6 +- src/pokeball.c | 4 +- src/psychic.c | 2 +- src/rock.c | 24 +-- src/water.c | 36 ++-- 32 files changed, 351 insertions(+), 354 deletions(-) diff --git a/include/battle_anim.h b/include/battle_anim.h index 8e8a176753..d0d3232160 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -16,14 +16,14 @@ enum BG_ANIM_SCREEN_BASE_BLOCK, }; -struct UnknownAnimStruct2 +struct BattleAnimBgData { u8 *bgTiles; - u16 *unk4; - u8 unk8; + u16 *bgTilemap; + u8 paletteId; u8 bgId; u16 tilesOffset; - u16 unkC; + u16 unused; }; struct BattleAnimBackground @@ -74,14 +74,14 @@ void HandleIntroSlide(u8 terrainId); int GetAnimBgAttribute(u8 bgId, u8 attributeId); // battle_anim_80A5C6C.s -void sub_80A6450(struct Sprite *sprite); +void TranslateSpriteInEllipseOverDuration(struct Sprite *sprite); void sub_80A8AEC(struct Sprite *sprite); void sub_80A8A6C(struct Sprite *sprite); void sub_80A8E30(struct Sprite *sprite); void sub_80A8B64(struct Sprite *sprite); void SetAverageBattlerPositions(u8 battlerId, bool8 respectMonPicOffsets, s16 *x, s16 *y); void DestroySpriteAndMatrix(struct Sprite *sprite); -void AnimTranslateLinearSimple(struct Sprite *sprite); +void TranslateSpriteLinearFixedPoint(struct Sprite *sprite); void InitSpritePosToAnimAttacker(struct Sprite *sprite, bool8 respectMonPicOffsets); void InitSpritePosToAnimTarget(struct Sprite *sprite, bool8 respectMonPicOffsets); void StartAnimLinearTranslation(struct Sprite *sprite); @@ -94,7 +94,7 @@ void sub_80A6FD4(struct Sprite *sprite); u16 ArcTan2Neg(s16 a, s16 b); void TrySetSpriteRotScale(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation); void RunStoredCallbackWhenAffineAnimEnds(struct Sprite *sprite); -void sub_80A66DC(struct Sprite *sprite); +void TranslateSpriteLinearAndFlicker(struct Sprite *sprite); void SetSpriteCoordsToAnimAttackerCoords(struct Sprite *sprite); void RunStoredCallbackWhenAnimEnds(struct Sprite *sprite); void SetAnimSpriteInitialXOffset(struct Sprite *sprite, s16 a2); @@ -108,12 +108,12 @@ u8 GetBattlerSpriteBGPriority(u8 battlerId); void *LoadPointerFromVars(s16 bottom, s16 top); void StorePointerInVars(s16 *bottom, s16 *top, const void *ptr); void sub_80A8278(void); -void sub_80A6B30(struct UnknownAnimStruct2*); -void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1); +void sub_80A6B30(struct BattleAnimBgData*); +void sub_80A6B90(struct BattleAnimBgData*, u32 arg1); u8 GetBattlerSpriteSubpriority(u8 battlerId); -bool8 TranslateAnimArc(struct Sprite *sprite); +bool8 TranslateAnimHorizontalArc(struct Sprite *sprite); void sub_80A6630(struct Sprite *sprite); -void sub_80A6680(struct Sprite *sprite); +void TranslateMonSpriteLinearFixedPoint(struct Sprite *sprite); void ResetSpriteRotScale(u8 spriteId); void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation); void InitSpriteDataForLinearTranslation(struct Sprite *sprite); @@ -125,8 +125,8 @@ u8 sub_80A77AC(u8 a1); s16 CloneBattlerSpriteWithBlend(u8); void obj_delete_but_dont_free_vram(struct Sprite*); u8 sub_80A89C8(int, u8, int); -void sub_80A6D60(struct UnknownAnimStruct2*, const void*, u32); -void sub_80A6CC0(u32, const u32*, u32); +void sub_80A6D60(struct BattleAnimBgData*, const void*, u32); +void AnimLoadCompressedBgGfx(u32, const u32*, u32); void sub_80A6DAC(bool8); void TranslateSpriteInGrowingCircleOverDuration(struct Sprite *); void sub_80A653C(struct Sprite *); @@ -134,13 +134,13 @@ void SetBattlerSpriteYOffsetFromYScale(u8 spriteId); void sub_80A805C(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7); u8 sub_80A80C8(struct Task *task); void sub_80A8EE4(struct Sprite *); -void sub_80A67F4(struct Sprite *); -void sub_80A6D48(u32 bgId, const void *src); +void DestroyAnimSpriteAndDisableBlend(struct Sprite *); +void AnimLoadCompressedBgTilemap(u32 bgId, const void *src); void InitAnimFastLinearTranslationWithSpeed(struct Sprite *sprite); bool8 AnimFastTranslateLinear(struct Sprite *sprite); void InitAndRunAnimFastLinearTranslation(struct Sprite *sprite); -void TranslateMonBGUntil(struct Sprite *sprite); -void TranslateSpriteOverDuration(struct Sprite *sprite); +void TranslateMonSpriteLinear(struct Sprite *sprite); +void TranslateSpriteLinear(struct Sprite *sprite); void sub_80A77C8(struct Sprite *sprite); void sub_80A7000(struct Sprite *sprite); void TranslateSpriteInCircleOverDuration(struct Sprite *sprite); @@ -148,7 +148,7 @@ void SetGreyscaleOrOriginalPalette(u16 a1, bool8 a2); void PrepareAffineAnimInTaskData(struct Task *task, u8 spriteId, const union AffineAnimCmd *affineAnimCmds); bool8 RunAffineAnimFromTaskData(struct Task *task); void sub_80A78AC(struct Sprite *sprite); -void sub_80A6BFC(struct UnknownAnimStruct2 *unk, u8 unused); +void sub_80A6BFC(struct BattleAnimBgData *unk, u8 unused); u8 sub_80A8394(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, u32 a10); void sub_80A749C(struct Sprite *sprite); void sub_80A6DEC(struct Sprite *sprite); @@ -185,7 +185,7 @@ bool8 IsDoubleBattle(void); u8 sub_80A6D94(void); u8 GetBattlerSpriteBGPriorityRank(u8 battlerId); void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite*)); -void oamt_add_pos2_onto_pos1(struct Sprite *sprite); +void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite); u8 GetBattlerSpriteDefault_Y(u8 battlerId); u8 GetSubstituteSpriteDefault_Y(u8 battlerId); diff --git a/include/graphics.h b/include/graphics.h index f7eaa394d1..0f7c604e79 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4724,9 +4724,9 @@ extern const u32 gBattleAnimBackgroundTilemap_17[]; extern const u32 gBattleAnimBackgroundTilemap_20[]; extern const u32 gBattleAnimBackgroundTilemap_21[]; -extern const u32 gUnknown_08C1D0AC[]; -extern const u32 gUnknown_08C1D1E8[]; -extern const u32 gUnknown_08C1D210[]; +extern const u32 gMetalShineGfx[]; +extern const u32 gMetalShinePalette[]; +extern const u32 gMetalShineTilemap[]; extern const u32 gUnknown_08C20668[]; extern const u32 gUnknown_08C20684[]; diff --git a/src/battle_anim.c b/src/battle_anim.c index 1f4831c541..f086b1c336 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1924,7 +1924,7 @@ bool8 IsBattlerSpriteVisible(u8 battlerId) void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible) { - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; u8 battlerSpriteId; if (!toBG_2) @@ -1942,9 +1942,9 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible) RequestDma3Fill(0xFF, (void*)(VRAM + 0xe000), 0x1000, 0); } - sub_80A6B30(&unknownStruct); - CpuFill16(0, unknownStruct.bgTiles, 0x1000); - CpuFill16(0xFF, unknownStruct.unk4, 0x800); + sub_80A6B30(&animBg); + CpuFill16(0, animBg.bgTiles, 0x1000); + CpuFill16(0xFF, animBg.bgTilemap, 0x800); SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 2); SetAnimBgAttribute(1, BG_ANIM_SCREEN_SIZE, 1); @@ -1963,15 +1963,15 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible) SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X); SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y); - LoadPalette(&gPlttBufferUnfaded[0x100 + battlerId * 16], unknownStruct.unk8 * 16, 0x20); - CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void*)(BG_PLTT + unknownStruct.unk8 * 32), 0x20); + LoadPalette(&gPlttBufferUnfaded[0x100 + battlerId * 16], animBg.paletteId * 16, 0x20); + CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void*)(BG_PLTT + animBg.paletteId * 32), 0x20); if (IsContest()) battlerPosition = 0; else battlerPosition = GetBattlerPosition(battlerId); - sub_8118FBC(1, 0, 0, battlerPosition, unknownStruct.unk8, unknownStruct.bgTiles, unknownStruct.unk4, unknownStruct.tilesOffset); + sub_8118FBC(1, 0, 0, battlerPosition, animBg.paletteId, animBg.bgTiles, animBg.bgTilemap, animBg.tilesOffset); if (IsContest()) sub_80A46A0(); @@ -1980,9 +1980,9 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible) { RequestDma3Fill(0, (void*)(VRAM + 0x6000), 0x2000, 1); RequestDma3Fill(0, (void*)(VRAM + 0xF000), 0x1000, 1); - sub_80A6B90(&unknownStruct, 2); - CpuFill16(0, unknownStruct.bgTiles + 0x1000, 0x1000); - CpuFill16(0, unknownStruct.unk4 + 0x400, 0x800); + sub_80A6B90(&animBg, 2); + CpuFill16(0, animBg.bgTiles + 0x1000, 0x1000); + CpuFill16(0, animBg.bgTilemap + 0x400, 0x800); SetAnimBgAttribute(2, BG_ANIM_PRIORITY, 2); SetAnimBgAttribute(2, BG_ANIM_SCREEN_SIZE, 1); SetAnimBgAttribute(2, BG_ANIM_AREA_OVERFLOW_MODE, 0); @@ -2001,20 +2001,20 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible) LoadPalette(&gPlttBufferUnfaded[0x100 + battlerId * 16], 0x90, 0x20); CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void*)(BG_PLTT + 0x120), 0x20); - sub_8118FBC(2, 0, 0, GetBattlerPosition(battlerId), unknownStruct.unk8, unknownStruct.bgTiles + 0x1000, unknownStruct.unk4 + 0x400, unknownStruct.tilesOffset); + sub_8118FBC(2, 0, 0, GetBattlerPosition(battlerId), animBg.paletteId, animBg.bgTiles + 0x1000, animBg.bgTilemap + 0x400, animBg.tilesOffset); } } static void sub_80A46A0(void) { s32 i, j; - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; u16 *ptr; if (IsSpeciesNotUnown(gContestResources->field_18->species)) { - sub_80A6B30(&unknownStruct); - ptr = unknownStruct.unk4; + sub_80A6B30(&animBg); + ptr = animBg.bgTilemap; for (i = 0; i < 8; i++) { for (j = 0; j < 4; j++) @@ -2052,8 +2052,8 @@ void sub_80A4720(u16 a, u16 *b, u32 c, u8 d) void sub_80A477C(bool8 to_BG2) { - struct UnknownAnimStruct2 unknownStruct; - sub_80A6B30(&unknownStruct); + struct BattleAnimBgData animBg; + sub_80A6B30(&animBg); if (!to_BG2 || IsContest()) { @@ -2073,11 +2073,11 @@ static void task_pA_ma0A_obj_to_bg_pal(u8 taskId) { u8 spriteId, palIndex; s16 x, y; - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; spriteId = gTasks[taskId].data[0]; palIndex = gTasks[taskId].data[6]; - sub_80A6B30(&unknownStruct); + sub_80A6B30(&animBg); x = gTasks[taskId].data[1] - (gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x); y = gTasks[taskId].data[2] - (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y); @@ -2089,7 +2089,7 @@ static void task_pA_ma0A_obj_to_bg_pal(u8 taskId) gBattle_BG1_X = x + gTasks[taskId].data[3]; gBattle_BG1_Y = y + gTasks[taskId].data[4]; src = gPlttBufferFaded + 0x100 + palIndex * 16; - dst = gPlttBufferFaded + 0x100 + unknownStruct.unk8 * 16 - 256; + dst = gPlttBufferFaded + 0x100 + animBg.paletteId * 16 - 256; CpuCopy32(src, dst, 0x20); } else diff --git a/src/battle_anim_80A5C6C.c b/src/battle_anim_80A5C6C.c index 3efc86bf82..372377a0cf 100644 --- a/src/battle_anim_80A5C6C.c +++ b/src/battle_anim_80A5C6C.c @@ -33,21 +33,18 @@ extern const u8 gEnemyMonElevation[]; extern const struct CompressedSpriteSheet gMonFrontPicTable[]; extern const union AffineAnimCmd *gUnknown_082FF6C0[]; -// This file's functions. -void sub_80A64EC(struct Sprite *sprite); -void sub_80A6FB4(struct Sprite *sprite); -void sub_80A7144(struct Sprite *sprite); -void sub_80A791C(struct Sprite *sprite); -void sub_80A8DFC(struct Sprite *sprite); -void sub_80A8E88(struct Sprite *sprite); -void SetBattlerSpriteYOffsetFromYScale(u8 spriteId); -u16 GetBattlerYDeltaFromSpriteId(u8 spriteId); -void AnimTask_BlendMonInAndOutSetup(struct Task *task); -void sub_80A7AFC(u8 taskId); -void sub_80A8CAC(u8 taskId); -void AnimTask_BlendMonInAndOutStep(u8 taskId); -bool8 sub_80A7238(void); -void sub_80A8D78(struct Task *task, u8 taskId); +static void sub_80A6FB4(struct Sprite *sprite); +static void sub_80A7144(struct Sprite *sprite); +static void sub_80A791C(struct Sprite *sprite); +static void sub_80A8DFC(struct Sprite *sprite); +static void sub_80A8E88(struct Sprite *sprite); +static u16 GetBattlerYDeltaFromSpriteId(u8 spriteId); +static void AnimTask_BlendMonInAndOutSetup(struct Task *task); +static void sub_80A7AFC(u8 taskId); +static void sub_80A8CAC(u8 taskId); +static void AnimTask_BlendMonInAndOutStep(u8 taskId); +static bool8 sub_80A7238(void); +static void sub_80A8D78(struct Task *task, u8 taskId); // EWRAM vars EWRAM_DATA static union AffineAnimCmd *gAnimTaskAffineAnim = NULL; @@ -503,7 +500,7 @@ void sub_80A63C8(struct Sprite *sprite) } } -void sub_80A6450(struct Sprite *sprite) +void TranslateSpriteInEllipseOverDuration(struct Sprite *sprite) { if (sprite->data[3]) { @@ -533,28 +530,28 @@ void WaitAnimForDuration(struct Sprite *sprite) SetCallbackToStoredInData6(sprite); } -void sub_80A64D0(struct Sprite *sprite) +static void sub_80A64D0(struct Sprite *sprite) { sub_80A64EC(sprite); - sprite->callback = TranslateSpriteOverDuration; + sprite->callback = TranslateSpriteLinear; sprite->callback(sprite); } void sub_80A64EC(struct Sprite *sprite) { s16 old; - int v1; + int xDiff; if (sprite->data[1] > sprite->data[2]) sprite->data[0] = -sprite->data[0]; - v1 = sprite->data[2] - sprite->data[1]; + xDiff = sprite->data[2] - sprite->data[1]; old = sprite->data[0]; - sprite->data[0] = abs(v1 / sprite->data[0]); + sprite->data[0] = abs(xDiff / sprite->data[0]); sprite->data[2] = (sprite->data[4] - sprite->data[3]) / sprite->data[0]; sprite->data[1] = old; } -void TranslateSpriteOverDuration(struct Sprite *sprite) +void TranslateSpriteLinear(struct Sprite *sprite) { if (sprite->data[0] > 0) { @@ -568,7 +565,7 @@ void TranslateSpriteOverDuration(struct Sprite *sprite) } } -void AnimTranslateLinearSimple(struct Sprite *sprite) +void TranslateSpriteLinearFixedPoint(struct Sprite *sprite) { if (sprite->data[0] > 0) { @@ -584,7 +581,7 @@ void AnimTranslateLinearSimple(struct Sprite *sprite) } } -void sub_80A65A8(struct Sprite *sprite) +static void TranslateSpriteLinearFixedPointIconFrame(struct Sprite *sprite) { if (sprite->data[0] > 0) { @@ -598,6 +595,7 @@ void sub_80A65A8(struct Sprite *sprite) { SetCallbackToStoredInData6(sprite); } + UpdateMonIconFrame(sprite); } @@ -605,12 +603,12 @@ void sub_80A65EC(struct Sprite *sprite) { sprite->data[1] = sprite->pos1.x + sprite->pos2.x; sprite->data[3] = sprite->pos1.y + sprite->pos2.y; - sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); - sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); sprite->callback = sub_80A64D0; } -void TranslateMonBGUntil(struct Sprite *sprite) +void TranslateMonSpriteLinear(struct Sprite *sprite) { if (sprite->data[0] > 0) { @@ -624,9 +622,7 @@ void TranslateMonBGUntil(struct Sprite *sprite) } } -// Same as TranslateMonBGUntil, but it operates on sub-pixel values -// to handle slower translations. -void sub_80A6680(struct Sprite *sprite) +void TranslateMonSpriteLinearFixedPoint(struct Sprite *sprite) { if (sprite->data[0] > 0) { @@ -642,7 +638,7 @@ void sub_80A6680(struct Sprite *sprite) } } -void sub_80A66DC(struct Sprite *sprite) +void TranslateSpriteLinearAndFlicker(struct Sprite *sprite) { if (sprite->data[0] > 0) { @@ -673,8 +669,8 @@ void sub_80A6760(struct Sprite *sprite) { sprite->data[1] = sprite->pos1.x + sprite->pos2.x; sprite->data[3] = sprite->pos1.y + sprite->pos2.y; - sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); sprite->callback = sub_80A64D0; } @@ -696,7 +692,7 @@ void RunStoredCallbackWhenAnimEnds(struct Sprite *sprite) SetCallbackToStoredInData6(sprite); } -void sub_80A67F4(struct Sprite *sprite) +void DestroyAnimSpriteAndDisableBlend(struct Sprite *sprite) { SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); @@ -749,7 +745,7 @@ void InitAnimArcTranslation(struct Sprite *sprite) sprite->data[7] = 0; } -bool8 TranslateAnimArc(struct Sprite *sprite) +bool8 TranslateAnimHorizontalArc(struct Sprite *sprite) { if (AnimTranslateLinear(sprite)) return TRUE; @@ -758,7 +754,7 @@ bool8 TranslateAnimArc(struct Sprite *sprite) return FALSE; } -bool8 sub_80A6934(struct Sprite *sprite) +bool8 TranslateAnimVerticalArc(struct Sprite *sprite) { if (AnimTranslateLinear(sprite)) return TRUE; @@ -767,7 +763,7 @@ bool8 sub_80A6934(struct Sprite *sprite) return FALSE; } -void oamt_add_pos2_onto_pos1(struct Sprite *sprite) +void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite) { sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; @@ -862,38 +858,38 @@ bool8 IsDoubleBattle(void) return IS_DOUBLE_BATTLE(); } -void sub_80A6B30(struct UnknownAnimStruct2 *unk) +void sub_80A6B30(struct BattleAnimBgData *unk) { if (IsContest()) { unk->bgTiles = gUnknown_0202305C; - unk->unk4 = (u16 *)gUnknown_02023060; - unk->unk8 = 0xe; + unk->bgTilemap = (u16 *)gUnknown_02023060; + unk->paletteId = 14; unk->bgId = 1; unk->tilesOffset = 0; - unk->unkC = 0; + unk->unused = 0; } else { unk->bgTiles = gUnknown_0202305C; - unk->unk4 = (u16 *)gUnknown_02023060; - unk->unk8 = 0x8; + unk->bgTilemap = (u16 *)gUnknown_02023060; + unk->paletteId = 8; unk->bgId = 1; unk->tilesOffset = 0x200; - unk->unkC = 0; + unk->unused = 0; } } -void sub_80A6B90(struct UnknownAnimStruct2 *unk, u32 arg1) +void sub_80A6B90(struct BattleAnimBgData *unk, u32 arg1) { if (IsContest()) { unk->bgTiles = gUnknown_0202305C; - unk->unk4 = (u16 *)gUnknown_02023060; - unk->unk8 = 0xe; + unk->bgTilemap = (u16 *)gUnknown_02023060; + unk->paletteId = 14; unk->bgId = 1; unk->tilesOffset = 0; - unk->unkC = 0; + unk->unused = 0; } else if (arg1 == 1) { @@ -902,76 +898,76 @@ void sub_80A6B90(struct UnknownAnimStruct2 *unk, u32 arg1) else { unk->bgTiles = gUnknown_0202305C; - unk->unk4 = (u16 *)gUnknown_02023060; - unk->unk8 = 0x9; + unk->bgTilemap = (u16 *)gUnknown_02023060; + unk->paletteId = 9; unk->bgId = 2; unk->tilesOffset = 0x300; - unk->unkC = 0; + unk->unused = 0; } } -void sub_80A6BFC(struct UnknownAnimStruct2 *unk, u8 unused) +void sub_80A6BFC(struct BattleAnimBgData *unk, u8 unused) { unk->bgTiles = gUnknown_0202305C; - unk->unk4 = (u16 *)gUnknown_02023060; + unk->bgTilemap = (u16 *)gUnknown_02023060; if (IsContest()) { - unk->unk8 = 0xe; + unk->paletteId = 14; unk->bgId = 1; unk->tilesOffset = 0; - unk->unkC = 0; + unk->unused = 0; } else if (GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) == 1) { - unk->unk8 = 8; + unk->paletteId = 8; unk->bgId = 1; unk->tilesOffset = 0x200; - unk->unkC = 0; + unk->unused = 0; } else { - unk->unk8 = 0x9; + unk->paletteId = 9; unk->bgId = 2; unk->tilesOffset = 0x300; - unk->unkC = 0; + unk->unused = 0; } } void sub_80A6C68(u32 bgId) { - struct UnknownAnimStruct2 unkStruct; + struct BattleAnimBgData unkStruct; sub_80A6B90(&unkStruct, bgId); CpuFill32(0, unkStruct.bgTiles, 0x2000); LoadBgTiles(unkStruct.bgId, unkStruct.bgTiles, 0x2000, unkStruct.tilesOffset); - FillBgTilemapBufferRect(unkStruct.bgId, 0, 0, 0, 0x20, 0x40, 0x11); + FillBgTilemapBufferRect(unkStruct.bgId, 0, 0, 0, 32, 64, 17); CopyBgTilemapBufferToVram(unkStruct.bgId); } -void sub_80A6CC0(u32 bgId, const u32 *src, u32 tilesOffset) +void AnimLoadCompressedBgGfx(u32 bgId, const u32 *src, u32 tilesOffset) { CpuFill32(0, gUnknown_0202305C, 0x2000); LZDecompressWram(src, gUnknown_0202305C); LoadBgTiles(bgId, gUnknown_0202305C, 0x2000, tilesOffset); } -void sub_80A6D10(u32 bgId, const void *src) +static void InitAnimBgTilemapBuffer(u32 bgId, const void *src) { - FillBgTilemapBufferRect(bgId, 0, 0, 0, 0x20, 0x40, 0x11); + FillBgTilemapBufferRect(bgId, 0, 0, 0, 32, 64, 17); CopyToBgTilemapBuffer(bgId, src, 0, 0); } -void sub_80A6D48(u32 bgId, const void *src) +void AnimLoadCompressedBgTilemap(u32 bgId, const void *src) { - sub_80A6D10(bgId, src); + InitAnimBgTilemapBuffer(bgId, src); CopyBgTilemapBufferToVram(bgId); } -void sub_80A6D60(struct UnknownAnimStruct2 *unk, const void *src, u32 arg2) +void sub_80A6D60(struct BattleAnimBgData *unk, const void *src, u32 arg2) { - sub_80A6D10(unk->bgId, src); + InitAnimBgTilemapBuffer(unk->bgId, src); if (IsContest() == TRUE) - sub_80A4720(unk->unk8, unk->unk4, 0, arg2); + sub_80A4720(unk->paletteId, unk->bgTilemap, 0, arg2); CopyBgTilemapBufferToVram(unk->bgId); } @@ -1002,7 +998,7 @@ void sub_80A6DEC(struct Sprite *sprite) sprite->data[1] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; InitSpriteDataForLinearTranslation(sprite); - sprite->callback = sub_80A65A8; + sprite->callback = TranslateSpriteLinearFixedPointIconFrame; sprite->callback(sprite); } @@ -1098,7 +1094,7 @@ void sub_80A6F98(struct Sprite *sprite) SetCallbackToStoredInData6(sprite); } -void sub_80A6FB4(struct Sprite *sprite) +static void sub_80A6FB4(struct Sprite *sprite) { sub_8039E9C(sprite); if (AnimTranslateLinear(sprite)) @@ -1188,7 +1184,7 @@ bool8 AnimFastTranslateLinear(struct Sprite *sprite) return FALSE; } -void sub_80A7144(struct Sprite *sprite) +static void sub_80A7144(struct Sprite *sprite) { if (AnimFastTranslateLinear(sprite)) SetCallbackToStoredInData6(sprite); @@ -1229,7 +1225,7 @@ void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation) gOamMatrices[i].d = matrix.d; } -bool8 sub_80A7238(void) +static bool8 sub_80A7238(void) { if (IsContest()) { @@ -1352,56 +1348,57 @@ void SetGreyscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor) } } -u32 sub_80A75AC(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) +u32 sub_80A75AC(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner, u8 targetPartner, u8 a6, u8 a7) { - u32 var = 0; + u32 selectedPalettes = 0; u32 shift; - if (a1) + if (battleBackground) { if (!IsContest()) - var = 0xe; + selectedPalettes = 0xe; else - var = 1 << sub_80A6D94(); + selectedPalettes = 1 << sub_80A6D94(); } - if (a2) + if (attacker) { shift = gBattleAnimAttacker + 16; - var |= 1 << shift; + selectedPalettes |= 1 << shift; } - if (a3) { - shift = gBattleAnimTarget + 16; - var |= 1 << shift; - } - if (a4) + if (target) { - if (IsBattlerSpriteVisible(gBattleAnimAttacker ^ 2)) + shift = gBattleAnimTarget + 16; + selectedPalettes |= 1 << shift; + } + if (attackerPartner) + { + if (IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker))) { - shift = (gBattleAnimAttacker ^ 2) + 16; - var |= 1 << shift; + shift = BATTLE_PARTNER(gBattleAnimAttacker) + 16; + selectedPalettes |= 1 << shift; } } - if (a5) + if (targetPartner) { - if (IsBattlerSpriteVisible(gBattleAnimTarget ^ 2)) + if (IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimTarget))) { - shift = (gBattleAnimTarget ^ 2) + 16; - var |= 1 << shift; + shift = BATTLE_PARTNER(gBattleAnimTarget) + 16; + selectedPalettes |= 1 << shift; } } if (a6) { if (!IsContest()) - var |= 0x100; + selectedPalettes |= 0x100; else - var |= 0x4000; + selectedPalettes |= 0x4000; } if (a7) { if (!IsContest()) - var |= 0x200; + selectedPalettes |= 0x200; } - return var; + return selectedPalettes; } u32 sub_80A76C4(u8 a1, u8 a2, u8 a3, u8 a4) @@ -1459,7 +1456,7 @@ u8 sub_80A77AC(u8 a1) return a1; } -u8 sub_80A77B4(u8 position) +static u8 GetBattlerAtPosition_(u8 position) { return GetBattlerAtPosition(position); } @@ -1527,33 +1524,33 @@ void sub_80A78AC(struct Sprite *sprite) if (GetBattlerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[5]; InitAnimArcTranslation(sprite); sprite->callback = sub_80A791C; } -void sub_80A791C(struct Sprite *sprite) +static void sub_80A791C(struct Sprite *sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) DestroyAnimSprite(sprite); } void sub_80A7938(struct Sprite *sprite) { bool8 r4; - u8 battlerId, attributeId; + u8 battlerId, coordType; if (!gBattleAnimArgs[6]) { r4 = TRUE; - attributeId = BATTLER_COORD_Y_PIC_OFFSET; + coordType = BATTLER_COORD_Y_PIC_OFFSET; } else { r4 = FALSE; - attributeId = BATTLER_COORD_Y; + coordType = BATTLER_COORD_Y; } if (!gBattleAnimArgs[5]) { @@ -1570,7 +1567,7 @@ void sub_80A7938(struct Sprite *sprite) InitSpritePosToAnimTarget(sprite, r4); sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = GetBattlerSpriteCoord(battlerId, BATTLER_COORD_X_2) + gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(battlerId, attributeId) + gBattleAnimArgs[3]; + sprite->data[4] = GetBattlerSpriteCoord(battlerId, coordType) + gBattleAnimArgs[3]; sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); } @@ -1629,7 +1626,7 @@ void sub_80A7A74(u8 taskId) gTasks[taskId].func = sub_80A7AFC; } -void sub_80A7AFC(u8 taskId) +static void sub_80A7AFC(u8 taskId) { struct Task *task = &gTasks[taskId]; @@ -1674,7 +1671,7 @@ void AnimTask_BlendMonInAndOut(u8 task) AnimTask_BlendMonInAndOutSetup(&gTasks[task]); } -void AnimTask_BlendMonInAndOutSetup(struct Task *task) +static void AnimTask_BlendMonInAndOutSetup(struct Task *task) { task->data[1] = gBattleAnimArgs[1]; task->data[2] = 0; @@ -1686,7 +1683,7 @@ void AnimTask_BlendMonInAndOutSetup(struct Task *task) task->func = AnimTask_BlendMonInAndOutStep; } -void AnimTask_BlendMonInAndOutStep(u8 taskId) +static void AnimTask_BlendMonInAndOutStep(u8 taskId) { struct Task *task = &gTasks[taskId]; @@ -1844,7 +1841,7 @@ void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId) gSprites[spriteId].pos2.y = (var - var2) / 2; } -u16 GetBattlerYDeltaFromSpriteId(u8 spriteId) +static u16 GetBattlerYDeltaFromSpriteId(u8 spriteId) { struct BattleSpriteInfo *spriteInfo; u8 battlerId = gSprites[spriteId].data[0]; @@ -2300,7 +2297,7 @@ void sub_80A8A6C(struct Sprite *sprite) sprite->data[3] = gBattleAnimArgs[4]; sprite->data[5] = gBattleAnimArgs[5]; StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix); - sprite->callback = sub_80A66DC; + sprite->callback = TranslateSpriteLinearAndFlicker; } void sub_80A8AEC(struct Sprite *sprite) @@ -2321,7 +2318,7 @@ void sub_80A8AEC(struct Sprite *sprite) sprite->data[5] = gBattleAnimArgs[5]; StartSpriteAnim(sprite, gBattleAnimArgs[6]); StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix); - sprite->callback = sub_80A66DC; + sprite->callback = TranslateSpriteLinearAndFlicker; } void sub_80A8B64(struct Sprite *sprite) @@ -2362,7 +2359,7 @@ void sub_80A8BC4(u8 taskId) task->func = sub_80A8CAC; } -void sub_80A8CAC(u8 taskId) +static void sub_80A8CAC(u8 taskId) { struct Task *task = &gTasks[taskId]; switch (task->data[2]) @@ -2395,7 +2392,7 @@ void sub_80A8CAC(u8 taskId) } } -void sub_80A8D78(struct Task *task, u8 taskId) +static void sub_80A8D78(struct Task *task, u8 taskId) { s16 spriteId = CloneBattlerSpriteWithBlend(0); if (spriteId >= 0) @@ -2411,7 +2408,7 @@ void sub_80A8D78(struct Task *task, u8 taskId) } } -void sub_80A8DFC(struct Sprite *sprite) +static void sub_80A8DFC(struct Sprite *sprite) { if (--sprite->data[0] == 0) { @@ -2432,7 +2429,7 @@ void sub_80A8E30(struct Sprite *sprite) sprite->callback = sub_80A8E88; } -void sub_80A8E88(struct Sprite *sprite) +static void sub_80A8E88(struct Sprite *sprite) { sprite->data[2] += sprite->data[0]; sprite->data[3] += sprite->data[1]; diff --git a/src/battle_anim_80D51AC.c b/src/battle_anim_80D51AC.c index 34eee73765..250a0459fe 100644 --- a/src/battle_anim_80D51AC.c +++ b/src/battle_anim_80D51AC.c @@ -441,14 +441,14 @@ static void DoHorizontalLunge(struct Sprite *sprite) sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker]; sprite->data[4] = gBattleAnimArgs[0]; StoreSpriteCallbackInData6(sprite, ReverseHorizontalLungeDirection); - sprite->callback = TranslateMonBGUntil; + sprite->callback = TranslateMonSpriteLinear; } static void ReverseHorizontalLungeDirection(struct Sprite *sprite) { sprite->data[0] = sprite->data[4]; sprite->data[1] = -sprite->data[1]; - sprite->callback = TranslateMonBGUntil; + sprite->callback = TranslateMonSpriteLinear; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); } @@ -468,14 +468,14 @@ static void DoVerticalDip(struct Sprite *sprite) sprite->data[3] = spriteId; sprite->data[4] = gBattleAnimArgs[0]; StoreSpriteCallbackInData6(sprite, ReverseVerticalDipDirection); - sprite->callback = TranslateMonBGUntil; + sprite->callback = TranslateMonSpriteLinear; } static void ReverseVerticalDipDirection(struct Sprite *sprite) { sprite->data[0] = sprite->data[4]; sprite->data[2] = -sprite->data[2]; - sprite->callback = TranslateMonBGUntil; + sprite->callback = TranslateMonSpriteLinear; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); } @@ -581,7 +581,7 @@ static void SlideMonToOffset(struct Sprite *sprite) sprite->data[5] = monSpriteId; sprite->invisible = TRUE; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); - sprite->callback = sub_80A6680; + sprite->callback = TranslateMonSpriteLinearFixedPoint; } static void sub_80D5B48(struct Sprite *sprite) @@ -624,7 +624,7 @@ static void sub_80D5B48(struct Sprite *sprite) { StoreSpriteCallbackInData6(sprite, sub_80D5C20); } - sprite->callback = sub_80A6680; + sprite->callback = TranslateMonSpriteLinearFixedPoint; } diff --git a/src/battle_anim_8170478.c b/src/battle_anim_8170478.c index 7d899fb09d..92874fe092 100755 --- a/src/battle_anim_8170478.c +++ b/src/battle_anim_8170478.c @@ -392,7 +392,7 @@ extern const struct SpriteTemplate gMiniTwinklingStarSpriteTemplate; void unref_sub_8170478(u8 taskId) { - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData unknownStruct; u8 healthBoxSpriteId; u8 battler; u8 spriteId1, spriteId2, spriteId3, spriteId4; @@ -426,9 +426,9 @@ void unref_sub_8170478(u8 taskId) gSprites[spriteId4].callback = SpriteCallbackDummy; sub_80A6B30(&unknownStruct); - sub_80A6D48(unknownStruct.bgId, gUnknown_08C2EA9C); - sub_80A6CC0(unknownStruct.bgId, gUnknown_08C2EA50, unknownStruct.tilesOffset); - LoadCompressedPalette(gCureBubblesPal, unknownStruct.unk8 << 4, 32); + AnimLoadCompressedBgTilemap(unknownStruct.bgId, gUnknown_08C2EA9C); + AnimLoadCompressedBgGfx(unknownStruct.bgId, gUnknown_08C2EA50, unknownStruct.tilesOffset); + LoadCompressedPalette(gCureBubblesPal, unknownStruct.paletteId << 4, 32); gBattle_BG1_X = -gSprites[spriteId3].pos1.x + 32; gBattle_BG1_Y = -gSprites[spriteId3].pos1.y - 32; @@ -806,7 +806,7 @@ static void sub_8171134(struct Sprite *sprite) u8 ballId; int ballId2; // extra var needed to match - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { if (gBattleSpritesDataPtr->animationData->ballThrowCaseId == BALL_TRAINER_BLOCK) { @@ -1276,7 +1276,7 @@ static void sub_81719EC(struct Sprite *sprite) static void sub_8171AAC(struct Sprite *sprite) { sprite->invisible = !sprite->invisible; - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) DestroySprite(sprite); } @@ -2206,7 +2206,7 @@ static void sub_817339C(struct Sprite *sprite) static void sub_81733D4(struct Sprite *sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { sprite->data[0] = 0; sprite->invisible = 1; diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 25eb14637b..f14e502f33 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -2326,7 +2326,7 @@ void AnimAbsorptionOrb(struct Sprite* sprite) static void AnimAbsorptionOrbStep(struct Sprite* sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) DestroyAnimSprite(sprite); } @@ -2401,7 +2401,7 @@ void AnimLeechSeed(struct Sprite* sprite) static void AnimLeechSeedStep(struct Sprite* sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { sprite->invisible = 1; sprite->data[0] = 10; @@ -2662,7 +2662,7 @@ static void AnimTranslateLinearSingleSineWaveStep(struct Sprite* sprite) s16 r0; sprite->data[0] = 1; - TranslateAnimArc(sprite); + TranslateAnimHorizontalArc(sprite); r0 = sprite->data[7]; sprite->data[0] = a; if (b > 200 && r0 < 56 && sprite->oam.affineParam == 0) @@ -3325,7 +3325,7 @@ static void sub_8100128(u8 taskId) { case 4: sub_8100524(task, taskId); - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { task->data[15] = 5; task->data[0] = 0xFF; @@ -3333,7 +3333,7 @@ static void sub_8100128(u8 taskId) break; case 8: sub_8100524(task, taskId); - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { task->data[15] = 9; task->data[0] = 0xFF; @@ -3341,7 +3341,7 @@ static void sub_8100128(u8 taskId) break; case 0: sub_8100524(task, taskId); - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { task->data[15] = 1; task->data[0] = 0xFF; @@ -3367,7 +3367,7 @@ static void sub_8100128(u8 taskId) break; case 2: sub_8100524(task, taskId); - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { task->data[15] = 3; task->data[0] = 0xFF; @@ -3410,7 +3410,7 @@ static void sub_8100128(u8 taskId) break; case 6: sub_8100524(task, taskId); - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { task->data[15] = 7; task->data[0] = 0xFF; @@ -3453,7 +3453,7 @@ static void sub_8100128(u8 taskId) break; case 10: sub_8100524(task, taskId); - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { task->data[15] = 11; task->data[0] = 0xFF; @@ -3481,7 +3481,7 @@ static void sub_8100128(u8 taskId) } case 12: sub_8100524(task, taskId); - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { DestroySprite(sprite); task->data[0]++; @@ -3766,7 +3766,7 @@ void sub_8100A94(struct Sprite* sprite) sprite->data[5] = gBattleAnimArgs[5]; StartSpriteAffineAnim(sprite, gBattleAnimArgs[6]); StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix); - sprite->callback = sub_80A66DC; + sprite->callback = TranslateSpriteLinearAndFlicker; } // Moves the sprite in a diagonally slashing motion across the target mon. @@ -3995,7 +3995,7 @@ static void sub_8100FD4(struct Sprite *sprite) if (sprite->data[7] == 16) { sprite->invisible = 1; - sprite->callback = sub_80A67F4; + sprite->callback = DestroyAnimSpriteAndDisableBlend; } } } @@ -4121,7 +4121,7 @@ void sub_810130C(struct Sprite* sprite) sprite->data[1] = gBattleAnimArgs[3]; sprite->data[2] = gBattleAnimArgs[4]; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); - sprite->callback = AnimTranslateLinearSimple; + sprite->callback = TranslateSpriteLinearFixedPoint; } void sub_810135C(struct Sprite* sprite) @@ -4158,7 +4158,7 @@ void sub_810135C(struct Sprite* sprite) sprite->data[1] = gBattleAnimArgs[3]; sprite->data[2] = gBattleAnimArgs[4]; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); - sprite->callback = AnimTranslateLinearSimple; + sprite->callback = TranslateSpriteLinearFixedPoint; } void sub_8101440(struct Sprite* sprite) @@ -4428,7 +4428,7 @@ static void sub_8101998(struct Sprite* sprite) sprite->data[2] = 0; sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker]; StoreSpriteCallbackInData6(sprite, sub_81019E8); - sprite->callback = TranslateMonBGUntil; + sprite->callback = TranslateMonSpriteLinear; } static void sub_81019E8(struct Sprite* sprite) @@ -4458,7 +4458,7 @@ static void sub_8101A74(struct Sprite* sprite) sprite->data[2] = 0; sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker]; StoreSpriteCallbackInData6(sprite, sub_8101B84); - sprite->callback = TranslateMonBGUntil; + sprite->callback = TranslateMonSpriteLinear; } static void sub_8101AC4(struct Sprite* sprite) @@ -4737,7 +4737,7 @@ static void sub_8102044(struct Sprite* sprite) sprite->data[1] = 8; sprite->data[2] = 0; StoreSpriteCallbackInData6(sprite, sub_810207C); - sprite->callback = TranslateSpriteOverDuration; + sprite->callback = TranslateSpriteLinear; } } diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index 8306ada1c4..0c6f2ef111 100755 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -1264,7 +1264,7 @@ void sub_8103448(struct Sprite *sprite) sprite->data[3] = gBattleAnimArgs[5]; sprite->data[4] = gBattleAnimArgs[3]; StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix); - sprite->callback = sub_80A6450; + sprite->callback = TranslateSpriteInEllipseOverDuration; sprite->callback(sprite); } @@ -2318,7 +2318,7 @@ void Anim_BreathPuff(struct Sprite *sprite) sprite->data[3] = 0; sprite->data[4] = 0; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); - sprite->callback = AnimTranslateLinearSimple; + sprite->callback = TranslateSpriteLinearFixedPoint; } // Animates an "angry" mark above a mon's head. @@ -3291,7 +3291,7 @@ static void sub_810627C(struct Sprite *sprite) void sub_81062E8(u8 taskId) { - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16)); @@ -3304,16 +3304,16 @@ void sub_81062E8(u8 taskId) gBattle_BG1_Y = 0; SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X); SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y); - sub_80A6B30(&unknownStruct); - sub_80A6CC0(unknownStruct.bgId, &gUnknown_08C232E0, unknownStruct.tilesOffset); - sub_80A6D60(&unknownStruct, &gUnknown_08C23D78, 0); - LoadCompressedPalette(&gUnknown_08C23D50, unknownStruct.unk8 << 4, 32); + sub_80A6B30(&animBg); + AnimLoadCompressedBgGfx(animBg.bgId, &gUnknown_08C232E0, animBg.tilesOffset); + sub_80A6D60(&animBg, &gUnknown_08C23D78, 0); + LoadCompressedPalette(&gUnknown_08C23D50, animBg.paletteId * 16, 32); gTasks[taskId].func = sub_81063A8; } static void sub_81063A8(u8 taskId) { - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; switch (gTasks[taskId].data[12]) { @@ -3351,8 +3351,8 @@ static void sub_81063A8(u8 taskId) } break; case 3: - sub_80A6B30(&unknownStruct); - sub_80A6C68(unknownStruct.bgId); + sub_80A6B30(&animBg); + sub_80A6C68(animBg.bgId); gTasks[taskId].data[12]++; break; case 4: @@ -3369,7 +3369,7 @@ static void sub_81063A8(u8 taskId) void sub_81064F8(u8 taskId) { - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16)); @@ -3382,22 +3382,22 @@ void sub_81064F8(u8 taskId) gBattle_BG1_Y = 0; SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X); SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y); - sub_80A6B30(&unknownStruct); + sub_80A6B30(&animBg); if (IsContest()) - sub_80A6D60(&unknownStruct, &gBattleAnimBackgroundTilemap_ScaryFaceContest, 0); + sub_80A6D60(&animBg, &gBattleAnimBackgroundTilemap_ScaryFaceContest, 0); else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT) - sub_80A6D60(&unknownStruct, &gBattleAnimBackgroundTilemap_ScaryFacePlayer, 0); + sub_80A6D60(&animBg, &gBattleAnimBackgroundTilemap_ScaryFacePlayer, 0); else - sub_80A6D60(&unknownStruct, &gBattleAnimBackgroundTilemap_ScaryFaceOpponent, 0); + sub_80A6D60(&animBg, &gBattleAnimBackgroundTilemap_ScaryFaceOpponent, 0); - sub_80A6CC0(unknownStruct.bgId, gUnknown_08C249F8, unknownStruct.tilesOffset); - LoadCompressedPalette(gUnknown_08C249D0, unknownStruct.unk8 << 4, 32); + AnimLoadCompressedBgGfx(animBg.bgId, gUnknown_08C249F8, animBg.tilesOffset); + LoadCompressedPalette(gUnknown_08C249D0, animBg.paletteId * 16, 32); gTasks[taskId].func = sub_81065EC; } static void sub_81065EC(u8 taskId) { - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; switch (gTasks[taskId].data[12]) { @@ -3435,7 +3435,7 @@ static void sub_81065EC(u8 taskId) } break; case 3: - sub_80A6B30(&unknownStruct); + sub_80A6B30(&animBg); sub_80A6C68(1); sub_80A6C68(2); gTasks[taskId].data[12]++; @@ -3804,7 +3804,7 @@ void sub_8106F60(struct Sprite *sprite) sprite->callback = sub_8107018; sprite->data[0] = 0; - oamt_add_pos2_onto_pos1(sprite); + SetSpritePrimaryCoordsFromSecondaryCoords(sprite); sprite->data[2] = 5; sprite->data[4] = 0; sprite->data[3] = 0; diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index a8b7d6d6a2..49fb693421 100755 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -1453,7 +1453,7 @@ void sub_815A6C4(struct Sprite *sprite) static void sub_815A73C(struct Sprite *sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { sprite->data[0] = 30; sprite->data[1] = 0; @@ -2257,10 +2257,10 @@ void sub_815B7D0(u8 taskId) { int i, j; u8 position; - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; u8 *dest; u8 *src; - u16 *unk4; + u16 *bgTilemap; u16 stretch; switch (gTasks[taskId].data[0]) @@ -2288,7 +2288,7 @@ void sub_815B7D0(u8 taskId) break; case 2: HandleSpeciesGfxDataChange(gBattleAnimAttacker, gBattleAnimTarget, gTasks[taskId].data[10]); - sub_80A6BFC(&unknownStruct, gBattleAnimAttacker); + sub_80A6BFC(&animBg, gBattleAnimAttacker); if (IsContest()) position = 0; @@ -2296,21 +2296,21 @@ void sub_815B7D0(u8 taskId) position = GetBattlerPosition(gBattleAnimAttacker); src = gMonSpritesGfxPtr->sprites[position] + (gBattleMonForms[gBattleAnimAttacker] << 11); - dest = unknownStruct.bgTiles; + dest = animBg.bgTiles; CpuCopy32(src, dest, 0x800); - LoadBgTiles(1, unknownStruct.bgTiles, 0x800, unknownStruct.tilesOffset); + LoadBgTiles(1, animBg.bgTiles, 0x800, animBg.tilesOffset); if (IsContest()) { if (IsSpeciesNotUnown(gContestResources->field_18->species) != IsSpeciesNotUnown(gContestResources->field_18->unk2)) { - unk4 = (u16 *)unknownStruct.unk4; + bgTilemap = (u16 *)animBg.bgTilemap; for (i = 0; i < 8; i++) { for (j = 0; j < 4; j++) { - u16 temp = unk4[j + i * 0x20]; - unk4[j + i * 0x20] = unk4[(7 - j) + i * 0x20]; - unk4[(7 - j) + i * 0x20] = temp; + u16 temp = bgTilemap[j + i * 0x20]; + bgTilemap[j + i * 0x20] = bgTilemap[(7 - j) + i * 0x20]; + bgTilemap[(7 - j) + i * 0x20] = temp; } } @@ -2318,7 +2318,7 @@ void sub_815B7D0(u8 taskId) { for (j = 0; j < 8; j++) { - unk4[j + i * 0x20] ^= 0x400; + bgTilemap[j + i * 0x20] ^= 0x400; } } } @@ -2380,7 +2380,7 @@ void sub_815BB58(u8 taskId) void sub_815BB84(u8 taskId) { - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; switch (gTasks[taskId].data[0]) { @@ -2392,8 +2392,8 @@ void sub_815BB84(u8 taskId) if (!IsContest()) SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 1); - sub_80A6B30(&unknownStruct); - sub_80A6D60(&unknownStruct, &gUnknown_08C2A6EC, 0); + sub_80A6B30(&animBg); + sub_80A6D60(&animBg, &gUnknown_08C2A6EC, 0); if (IsContest()) { gBattle_BG1_X = -56; @@ -2409,8 +2409,8 @@ void sub_815BB84(u8 taskId) gBattle_BG1_Y = 0; } - sub_80A6CC0(unknownStruct.bgId, gUnknown_08C2A634, unknownStruct.tilesOffset); - LoadCompressedPalette(gUnknown_08C2A6D4, unknownStruct.unk8 << 4, 32); + AnimLoadCompressedBgGfx(animBg.bgId, gUnknown_08C2A634, animBg.tilesOffset); + LoadCompressedPalette(gUnknown_08C2A6D4, animBg.paletteId * 16, 32); gTasks[taskId].data[10] = gBattle_BG1_X; gTasks[taskId].data[11] = gBattle_BG1_Y; @@ -2455,8 +2455,8 @@ void sub_815BB84(u8 taskId) } break; case 4: - sub_80A6B30(&unknownStruct); - sub_80A6C68(unknownStruct.bgId); + sub_80A6B30(&animBg); + sub_80A6C68(animBg.bgId); if (!IsContest()) SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0); @@ -2571,7 +2571,7 @@ static void sub_815C050(struct Sprite *sprite) void sub_815C0A4(u8 taskId) { - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; switch (gTasks[taskId].data[0]) { @@ -2583,8 +2583,8 @@ void sub_815C0A4(u8 taskId) if (!IsContest()) SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 1); - sub_80A6B30(&unknownStruct); - sub_80A6D60(&unknownStruct, &gUnknown_08C2A6EC, 0); + sub_80A6B30(&animBg); + sub_80A6D60(&animBg, &gUnknown_08C2A6EC, 0); if (IsContest()) { gBattle_BG1_X = -56; @@ -2615,8 +2615,8 @@ void sub_815C0A4(u8 taskId) gBattle_BG1_Y = 0; } - sub_80A6CC0(unknownStruct.bgId, gUnknown_08C2A634, unknownStruct.tilesOffset); - LoadCompressedPalette(gUnknown_08C2A6D4, unknownStruct.unk8 << 4, 32); + AnimLoadCompressedBgGfx(animBg.bgId, gUnknown_08C2A634, animBg.tilesOffset); + LoadCompressedPalette(gUnknown_08C2A6D4, animBg.paletteId * 16, 32); gTasks[taskId].data[10] = gBattle_BG1_X; gTasks[taskId].data[11] = gBattle_BG1_Y; gTasks[taskId].data[0]++; @@ -2654,8 +2654,8 @@ void sub_815C0A4(u8 taskId) gTasks[taskId].data[0] = 1; break; case 5: - sub_80A6B30(&unknownStruct); - sub_80A6C68(unknownStruct.bgId); + sub_80A6B30(&animBg); + sub_80A6C68(animBg.bgId); if (!IsContest()) SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0); @@ -4130,13 +4130,13 @@ static void AnimTask_BarrageBallStep(u8 taskId) if (++task->data[1] > 1) { task->data[1] = 0; - TranslateAnimArc(&gSprites[task->data[15]]); + TranslateAnimHorizontalArc(&gSprites[task->data[15]]); if (++task->data[2] > 7) task->data[0]++; } break; case 1: - if (TranslateAnimArc(&gSprites[task->data[15]])) + if (TranslateAnimHorizontalArc(&gSprites[task->data[15]])) { task->data[1] = 0; task->data[2] = 0; diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index ba7cbd3aaf..efe35e1b4c 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -276,7 +276,7 @@ void sub_8116B14(u8 taskId) int spriteId, newSpriteId; u16 var0; u16 bg1Cnt; - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData unknownStruct; var0 = 0; gBattle_WIN0H = 0; @@ -330,8 +330,8 @@ void sub_8116B14(u8 taskId) newSpriteId = sub_80A89C8(gBattleAnimAttacker, spriteId, species); sub_80A6B30(&unknownStruct); sub_80A6D60(&unknownStruct, gUnknown_08C20684, 0); - sub_80A6CC0(unknownStruct.bgId, gUnknown_08C20668, unknownStruct.tilesOffset); - LoadPalette(&gUnknown_08597418, unknownStruct.unk8 * 16 + 1, 2); + AnimLoadCompressedBgGfx(unknownStruct.bgId, gUnknown_08C20668, unknownStruct.tilesOffset); + LoadPalette(&gUnknown_08597418, unknownStruct.paletteId * 16 + 1, 2); gBattle_BG1_X = -gSprites[spriteId].pos1.x + 32; gBattle_BG1_Y = -gSprites[spriteId].pos1.y + 32; @@ -342,7 +342,7 @@ void sub_8116B14(u8 taskId) static void sub_8116D64(u8 taskId) { - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData unknownStruct; struct Sprite *sprite; u16 bg1Cnt; @@ -453,7 +453,7 @@ static void sub_8116F04(u8 taskId) static void sub_81170EC(u8 taskId) { - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData unknownStruct; u8 spriteId, spriteId2; u8 battlerSpriteId; @@ -472,32 +472,32 @@ static void sub_81170EC(u8 taskId) else sub_80A6D60(&unknownStruct, gBattleStatMask2_Tilemap, 0); - sub_80A6CC0(unknownStruct.bgId, gBattleStatMask_Gfx, unknownStruct.tilesOffset); + AnimLoadCompressedBgGfx(unknownStruct.bgId, gBattleStatMask_Gfx, unknownStruct.tilesOffset); switch (sAnimStatsChangeData->data[1]) { case 0: - LoadCompressedPalette(gBattleStatMask2_Pal, unknownStruct.unk8 << 4, 32); + LoadCompressedPalette(gBattleStatMask2_Pal, unknownStruct.paletteId * 16, 32); break; case 1: - LoadCompressedPalette(gBattleStatMask1_Pal, unknownStruct.unk8 << 4, 32); + LoadCompressedPalette(gBattleStatMask1_Pal, unknownStruct.paletteId * 16, 32); break; case 2: - LoadCompressedPalette(gBattleStatMask3_Pal, unknownStruct.unk8 << 4, 32); + LoadCompressedPalette(gBattleStatMask3_Pal, unknownStruct.paletteId * 16, 32); break; case 3: - LoadCompressedPalette(gBattleStatMask4_Pal, unknownStruct.unk8 << 4, 32); + LoadCompressedPalette(gBattleStatMask4_Pal, unknownStruct.paletteId * 16, 32); break; case 4: - LoadCompressedPalette(gBattleStatMask6_Pal, unknownStruct.unk8 << 4, 32); + LoadCompressedPalette(gBattleStatMask6_Pal, unknownStruct.paletteId * 16, 32); break; case 5: - LoadCompressedPalette(gBattleStatMask7_Pal, unknownStruct.unk8 << 4, 32); + LoadCompressedPalette(gBattleStatMask7_Pal, unknownStruct.paletteId * 16, 32); break; case 6: - LoadCompressedPalette(gBattleStatMask8_Pal, unknownStruct.unk8 << 4, 32); + LoadCompressedPalette(gBattleStatMask8_Pal, unknownStruct.paletteId * 16, 32); break; default: - LoadCompressedPalette(gBattleStatMask5_Pal, unknownStruct.unk8 << 4, 32); + LoadCompressedPalette(gBattleStatMask5_Pal, unknownStruct.paletteId * 16, 32); break; } @@ -773,7 +773,7 @@ void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u16 species; u8 spriteId, spriteId2; u16 bg1Cnt; - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData unknownStruct; u8 battler2; spriteId2 = 0; @@ -820,8 +820,8 @@ void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, sub_80A6B30(&unknownStruct); sub_80A6D60(&unknownStruct, tilemap, 0); - sub_80A6CC0(unknownStruct.bgId, gfx, unknownStruct.tilesOffset); - LoadCompressedPalette(palette, unknownStruct.unk8 << 4, 32); + AnimLoadCompressedBgGfx(unknownStruct.bgId, gfx, unknownStruct.tilesOffset); + LoadCompressedPalette(palette, unknownStruct.paletteId * 16, 32); gBattle_BG1_X = 0; gBattle_BG1_Y = 0; diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index d69e05b9e8..05da72e16a 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -1339,7 +1339,7 @@ static void LinkOpponentHandleTrainerSlide(void) static void LinkOpponentHandleTrainerSlideBack(void) { - oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); + SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280; gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; @@ -1700,7 +1700,7 @@ static void LinkOpponentHandleIntroTrainerBallThrow(void) u8 paletteNum; u8 taskId; - oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); + SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280; diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 5c9a92744a..19d39609fb 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -1160,7 +1160,7 @@ static void LinkPartnerHandleTrainerSlide(void) static void LinkPartnerHandleTrainerSlideBack(void) { - oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); + SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40; gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; @@ -1525,7 +1525,7 @@ static void LinkPartnerHandleIntroTrainerBallThrow(void) u8 taskId; u32 trainerPicId; - oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); + SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40; diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index d8a0127d09..99bb0c5887 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -1376,7 +1376,7 @@ static void OpponentHandleTrainerSlide(void) static void OpponentHandleTrainerSlideBack(void) { - oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); + SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280; gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; @@ -1849,7 +1849,7 @@ static void OpponentHandleIntroTrainerBallThrow(void) u8 paletteNum; u8 taskId; - oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); + SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280; diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 70b0a61608..6bcc97c68d 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -2377,7 +2377,7 @@ static void PlayerHandleTrainerSlide(void) static void PlayerHandleTrainerSlideBack(void) { - oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); + SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40; gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; @@ -2921,7 +2921,7 @@ static void PlayerHandleIntroTrainerBallThrow(void) u8 paletteNum; u8 taskId; - oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); + SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40; diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 3cfc94977b..a9b0f376be 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -1354,7 +1354,7 @@ static void PlayerPartnerHandleTrainerSlide(void) static void PlayerPartnerHandleTrainerSlideBack(void) { - oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); + SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40; gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; @@ -1777,7 +1777,7 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(void) u8 paletteNum; u8 taskId; - oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); + SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40; diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 03c3c88b26..911eb6ce58 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -1267,7 +1267,7 @@ static void RecordedOpponentHandleTrainerSlide(void) static void RecordedOpponentHandleTrainerSlideBack(void) { - oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); + SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280; gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; @@ -1640,7 +1640,7 @@ static void RecordedOpponentHandleIntroTrainerBallThrow(void) u8 paletteNum; u8 taskId; - oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); + SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280; diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 9055fc16bf..b2dfca6a07 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -1268,7 +1268,7 @@ static void RecordedPlayerHandleTrainerSlide(void) static void RecordedPlayerHandleTrainerSlideBack(void) { - oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); + SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40; gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; @@ -1662,7 +1662,7 @@ static void RecordedPlayerHandleIntroTrainerBallThrow(void) u8 taskId; u32 trainerPicId; - oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); + SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40; diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 9a97733163..d891b96b67 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -1427,7 +1427,7 @@ static void WallyHandleIntroTrainerBallThrow(void) u8 paletteNum; u8 taskId; - oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); + SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40; diff --git a/src/bug.c b/src/bug.c index 31d1a97405..88f93a3d57 100644 --- a/src/bug.c +++ b/src/bug.c @@ -433,7 +433,7 @@ static void AnimMissileArcStep(struct Sprite *sprite) { sprite->invisible = FALSE; - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { DestroyAnimSprite(sprite); } @@ -453,7 +453,7 @@ static void AnimMissileArcStep(struct Sprite *sprite) x2 += x1; y2 += y1; - if (!TranslateAnimArc(sprite)) + if (!TranslateAnimHorizontalArc(sprite)) { u16 rotation = ArcTan2Neg(sprite->pos1.x + sprite->pos2.x - x2, sprite->pos1.y + sprite->pos2.y - y2); diff --git a/src/dark.c b/src/dark.c index ecd466da8c..80ce618008 100644 --- a/src/dark.c +++ b/src/dark.c @@ -389,14 +389,14 @@ void sub_8113A90(struct Sprite *sprite) static void sub_8113B90(struct Sprite *sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) DestroySpriteAndMatrix(sprite); } void sub_8113BAC(u8 taskId) { struct ScanlineEffectParams scanlineParams; - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; u16 i; u8 pos; int var0; @@ -420,10 +420,10 @@ void sub_8113BAC(u8 taskId) task->data[3] = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker); if (task->data[3] == 1) { - sub_80A6B30(&unknownStruct); + sub_80A6B30(&animBg); task->data[10] = gBattle_BG1_Y; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG1); - FillPalette(0, unknownStruct.unk8 << 4, 32); + FillPalette(0, animBg.paletteId * 16, 32); scanlineParams.dmaDest = ®_BG1VOFS; var0 = WINOUT_WIN01_BG1; if (!IsContest()) @@ -524,7 +524,7 @@ static void sub_8113D60(u8 taskId) void sub_8113E78(u8 taskId) { - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; struct ScanlineEffectParams scanlineParams; u8 x; u16 i; @@ -561,14 +561,14 @@ void sub_8113E78(u8 taskId) case 1: if (task->data[3] == 1) { - sub_80A6B30(&unknownStruct); + sub_80A6B30(&animBg); task->data[10] = gBattle_BG1_Y; - FillPalette(0, unknownStruct.unk8 << 4, 32); + FillPalette(0, animBg.paletteId * 16, 32); } else { task->data[10] = gBattle_BG2_Y; - FillPalette(0, 144, 32); + FillPalette(0, 9 * 16, 32); } sub_8114374(3); @@ -809,7 +809,7 @@ void sub_81144F8(u8 taskId) u8 spriteId; u8 newSpriteId; u16 paletteNum; - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; int var0 = 0; gBattle_WIN0H = var0; @@ -852,10 +852,10 @@ void sub_81144F8(u8 taskId) spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); newSpriteId = sub_80A89C8(gBattleAnimAttacker, spriteId, species); - sub_80A6B30(&unknownStruct); - sub_80A6D48(unknownStruct.bgId, gUnknown_08C1D210); - sub_80A6CC0(unknownStruct.bgId, gUnknown_08C1D0AC, unknownStruct.tilesOffset); - LoadCompressedPalette(gUnknown_08C1D1E8, unknownStruct.unk8 << 4, 32); + sub_80A6B30(&animBg); + AnimLoadCompressedBgTilemap(animBg.bgId, gMetalShineTilemap); + AnimLoadCompressedBgGfx(animBg.bgId, gMetalShineGfx, animBg.tilesOffset); + LoadCompressedPalette(gMetalShinePalette, animBg.paletteId * 16, 32); gBattle_BG1_X = -gSprites[spriteId].pos1.x + 96; gBattle_BG1_Y = -gSprites[spriteId].pos1.y + 32; @@ -876,7 +876,7 @@ void sub_81144F8(u8 taskId) static void sub_8114748(u8 taskId) { - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; u16 paletteNum; u8 spriteId; u8 taskIdCopy = taskId; @@ -896,8 +896,8 @@ static void sub_8114748(u8 taskId) SetGreyscaleOrOriginalPalette(paletteNum, 1); DestroySprite(&gSprites[gTasks[taskIdCopy].data[0]]); - sub_80A6B30(&unknownStruct); - sub_80A6C68(unknownStruct.bgId); + sub_80A6B30(&animBg); + sub_80A6C68(animBg.bgId); if (gTasks[taskIdCopy].data[6] == 1) gSprites[gBattlerSpriteIds[BATTLE_PARTNER(gBattleAnimAttacker)]].oam.priority++; } diff --git a/src/dragon.c b/src/dragon.c index 9b39a8a30e..befaf52e7d 100644 --- a/src/dragon.c +++ b/src/dragon.c @@ -209,7 +209,7 @@ void sub_8113064(struct Sprite *sprite) sprite->data[5] = gBattleAnimArgs[5]; sprite->invisible = 1; StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix); - sprite->callback = sub_80A66DC; + sprite->callback = TranslateSpriteLinearAndFlicker; } static void sub_8113100(struct Sprite *sprite) diff --git a/src/fire.c b/src/fire.c index 5f501a3402..d428dc13be 100644 --- a/src/fire.c +++ b/src/fire.c @@ -479,7 +479,7 @@ static void sub_8108F08(struct Sprite *sprite) sprite->data[1] = gBattleAnimArgs[2]; sprite->data[2] = gBattleAnimArgs[3]; - sprite->callback = AnimTranslateLinearSimple; + sprite->callback = TranslateSpriteLinearFixedPoint; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); } @@ -726,7 +726,7 @@ static void AnimFireCross(struct Sprite *sprite) StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); - sprite->callback = TranslateSpriteOverDuration; + sprite->callback = TranslateSpriteLinear; } static void sub_81093A4(struct Sprite *sprite) @@ -1280,9 +1280,9 @@ static void sub_8109E2C(u8 taskId) // arg 1: color code void AnimTask_BlendBackground(u8 taskId) { - struct UnknownAnimStruct2 unk; - sub_80A6B30(&unk); - BlendPalette(unk.unk8 << 4, 16, gBattleAnimArgs[0], gBattleAnimArgs[1]); // u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor + struct BattleAnimBgData animBg; + sub_80A6B30(&animBg); + BlendPalette(animBg.paletteId * 16, 16, gBattleAnimArgs[0], gBattleAnimArgs[1]); // u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor DestroyAnimVisualTask(taskId); } diff --git a/src/ghost.c b/src/ghost.c index d26a4d1cb9..998be0caa5 100644 --- a/src/ghost.c +++ b/src/ghost.c @@ -275,7 +275,7 @@ static void sub_81116E8(struct Sprite *sprite) if (sprite->data[6] == 0) { sprite->invisible = TRUE; - sprite->callback = sub_80A67F4; + sprite->callback = DestroyAnimSpriteAndDisableBlend; } else sub_8111764(sprite); @@ -536,7 +536,7 @@ void sub_8111C50(u8 taskId) gSprites[task->data[0]].data[3] = 0; gSprites[task->data[0]].data[4] = 0; StoreSpriteCallbackInData6(&gSprites[task->data[0]], SpriteCallbackDummy); - gSprites[task->data[0]].callback = AnimTranslateLinearSimple; + gSprites[task->data[0]].callback = TranslateSpriteLinearFixedPoint; task->func = sub_8111D78; } diff --git a/src/graphics.c b/src/graphics.c index 90b705d2fb..1fc106dcc5 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -592,9 +592,9 @@ const u32 gBattleAnimBackgroundImage_00[] = INCBIN_U32("graphics/battle_anims/ba const u32 gBattleAnimBackgroundPalette_00[] = INCBIN_U32("graphics/battle_anims/backgrounds/00.gbapal.lz"); const u32 gBattleAnimBackgroundTilemap_00[] = INCBIN_U32("graphics/battle_anims/backgrounds/00.bin.lz"); -const u32 gUnknown_08C1D0AC[] = INCBIN_U32("graphics/battle_anims/masks/metal_shine.4bpp.lz"); -const u32 gUnknown_08C1D1E8[] = INCBIN_U32("graphics/battle_anims/masks/metal_shine.gbapal.lz"); -const u32 gUnknown_08C1D210[] = INCBIN_U32("graphics/battle_anims/masks/metal_shine.bin.lz"); +const u32 gMetalShineGfx[] = INCBIN_U32("graphics/battle_anims/masks/metal_shine.4bpp.lz"); +const u32 gMetalShinePalette[] = INCBIN_U32("graphics/battle_anims/masks/metal_shine.gbapal.lz"); +const u32 gMetalShineTilemap[] = INCBIN_U32("graphics/battle_anims/masks/metal_shine.bin.lz"); const u32 gUnusedGfx_Goosuto[] = INCBIN_U32("graphics/unused/goosuto.4bpp.lz"); // ghost const u32 gUnusedPal_Goosuto[] = INCBIN_U32("graphics/unused/goosuto.gbapal.lz"); diff --git a/src/ground.c b/src/ground.c index 807205ad82..ae3cf6c3e0 100644 --- a/src/ground.c +++ b/src/ground.c @@ -153,7 +153,7 @@ void AnimBonemerangProjectile(struct Sprite *sprite) static void AnimBonemerangProjectileStep(struct Sprite *sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; @@ -170,7 +170,7 @@ static void AnimBonemerangProjectileStep(struct Sprite *sprite) static void AnimBonemerangProjectileEnd(struct Sprite *sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) DestroyAnimSprite(sprite); } @@ -530,7 +530,7 @@ void AnimFissureDirtPlumeParticle(struct Sprite *sprite) static void AnimFissureDirtPlumeParticleStep(struct Sprite *sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) DestroyAnimSprite(sprite); } diff --git a/src/ice.c b/src/ice.c index d354fce7e1..34ad572e8f 100644 --- a/src/ice.c +++ b/src/ice.c @@ -1176,7 +1176,7 @@ void AnimSwirlingFogAnim(struct Sprite *sprite) // Fades mons to black and places foggy overlay in Haze. void AnimTask_Haze1(u8 taskId) { - struct UnknownAnimStruct2 subStruct; + struct BattleAnimBgData animBg; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16)); @@ -1191,17 +1191,17 @@ void AnimTask_Haze1(u8 taskId) SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X); SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y); - sub_80A6B30(&subStruct); - LoadBgTiles(subStruct.bgId, gWeatherFog1Tiles, 0x800, subStruct.tilesOffset); - sub_80A6D60(&subStruct, gBattleAnimFogTilemap, 0); - LoadPalette(&gUnknown_083970E8, subStruct.unk8 * 16, 32); + sub_80A6B30(&animBg); + LoadBgTiles(animBg.bgId, gWeatherFog1Tiles, 0x800, animBg.tilesOffset); + sub_80A6D60(&animBg, gBattleAnimFogTilemap, 0); + LoadPalette(&gUnknown_083970E8, animBg.paletteId * 16, 32); gTasks[taskId].func = AnimTask_Haze2; } void AnimTask_Haze2(u8 taskId) { - struct UnknownAnimStruct2 subStruct; + struct BattleAnimBgData animBg; gBattle_BG1_X += -1; gBattle_BG1_Y += 0; @@ -1245,7 +1245,7 @@ void AnimTask_Haze2(u8 taskId) } break; case 3: - sub_80A6B30(&subStruct); + sub_80A6B30(&animBg); sub_80A6C68(1); sub_80A6C68(2); @@ -1283,7 +1283,7 @@ void AnimThrowMistBall(struct Sprite *sprite) // Displays misty background in Mist Ball. void AnimTask_LoadMistTiles(u8 taskId) { - struct UnknownAnimStruct2 subStruct; + struct BattleAnimBgData animBg; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16)); @@ -1298,10 +1298,10 @@ void AnimTask_LoadMistTiles(u8 taskId) SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X); SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y); - sub_80A6B30(&subStruct); - LoadBgTiles(subStruct.bgId, gWeatherFog1Tiles, 0x800, subStruct.tilesOffset); - sub_80A6D60(&subStruct, gBattleAnimFogTilemap, 0); - LoadPalette(&gUnknown_083970E8, subStruct.unk8 * 16, 32); + sub_80A6B30(&animBg); + LoadBgTiles(animBg.bgId, gWeatherFog1Tiles, 0x800, animBg.tilesOffset); + sub_80A6D60(&animBg, gBattleAnimFogTilemap, 0); + LoadPalette(&gUnknown_083970E8, animBg.paletteId * 16, 32); gTasks[taskId].data[15] = -1; gTasks[taskId].func = AnimTask_OverlayFogTiles; @@ -1309,7 +1309,7 @@ void AnimTask_LoadMistTiles(u8 taskId) void AnimTask_OverlayFogTiles(u8 taskId) { - struct UnknownAnimStruct2 subStruct; + struct BattleAnimBgData animBg; gBattle_BG1_X += gTasks[taskId].data[15]; gBattle_BG1_Y += 0; @@ -1347,7 +1347,7 @@ void AnimTask_OverlayFogTiles(u8 taskId) } break; case 3: - sub_80A6B30(&subStruct); + sub_80A6B30(&animBg); sub_80A6C68(1); sub_80A6C68(2); @@ -1887,7 +1887,7 @@ void InitIceBallAnim(struct Sprite *sprite) // Throws the ball of ice in Ice Ball. void AnimThrowIceBall(struct Sprite *sprite) { - if (!TranslateAnimArc(sprite)) + if (!TranslateAnimHorizontalArc(sprite)) return; StartSpriteAnim(sprite, 1); diff --git a/src/normal.c b/src/normal.c index 95c99d29e8..87c8792f14 100644 --- a/src/normal.c +++ b/src/normal.c @@ -323,14 +323,14 @@ void AnimSimplePaletteBlend(struct Sprite *sprite) // 6: BG palette 5 u32 UnpackSelectedBattleAnimPalettes(s16 selector) { - u8 arg0 = selector & 1; - u8 arg1 = (selector >> 1) & 1; - u8 arg2 = (selector >> 2) & 1; - u8 arg3 = (selector >> 3) & 1; - u8 arg4 = (selector >> 4) & 1; + u8 battleBackground = selector & 1; + u8 attacker = (selector >> 1) & 1; + u8 target = (selector >> 2) & 1; + u8 attackerPartner = (selector >> 3) & 1; + u8 targetPartner = (selector >> 4) & 1; u8 arg5 = (selector >> 5) & 1; u8 arg6 = (selector >> 6) & 1; - return sub_80A75AC(arg0, arg1, arg2, arg3, arg4, arg5, arg6); + return sub_80A75AC(battleBackground, attacker, target, attackerPartner, targetPartner, arg5, arg6); } static void AnimSimplePaletteBlendStep(struct Sprite *sprite) diff --git a/src/poison.c b/src/poison.c index a72aab1116..c86ec2cd82 100644 --- a/src/poison.c +++ b/src/poison.c @@ -208,7 +208,7 @@ void sub_810DBAC(struct Sprite *sprite) static void sub_810DC10(struct Sprite *sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) DestroyAnimSprite(sprite); } @@ -236,7 +236,7 @@ void sub_810DC2C(struct Sprite *sprite) static void sub_810DCB4(struct Sprite *sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) DestroyAnimSprite(sprite); } @@ -258,7 +258,7 @@ void sub_810DCD0(struct Sprite *sprite) static void sub_810DD24(struct Sprite *sprite) { - AnimTranslateLinearSimple(sprite); + TranslateSpriteLinearFixedPoint(sprite); sprite->data[1] -= sprite->data[5]; sprite->data[2] -= sprite->data[6]; diff --git a/src/pokeball.c b/src/pokeball.c index 1938d888de..d4605ccd83 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -411,7 +411,7 @@ static void Task_DoPokeballSendOutAnim(u8 taskId) static void SpriteCB_TestBallThrow(struct Sprite *sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { u16 ballId; u8 taskId = sprite->oam.affineParam; @@ -940,7 +940,7 @@ static void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite) } else { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; diff --git a/src/psychic.c b/src/psychic.c index 5756fe97f9..6f808b5471 100644 --- a/src/psychic.c +++ b/src/psychic.c @@ -939,7 +939,7 @@ static void sub_810FD3C(u8 taskId) void sub_810FDF0(struct Sprite *sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { FreeOamMatrix(sprite->oam.matrixNum); DestroySprite(sprite); diff --git a/src/rock.c b/src/rock.c index ebf477ec11..14ffc63e01 100644 --- a/src/rock.c +++ b/src/rock.c @@ -326,7 +326,7 @@ void sub_81109F0(struct Sprite *sprite) sprite->data[5] = gBattleAnimArgs[2]; StoreSpriteCallbackInData6(sprite, sub_8110A70); - sprite->callback = sub_80A6450; + sprite->callback = TranslateSpriteInEllipseOverDuration; sprite->callback(sprite); } @@ -341,7 +341,7 @@ static void sub_8110A70(struct Sprite *sprite) sprite->data[4] = -24; StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix); - sprite->callback = sub_80A6450; + sprite->callback = TranslateSpriteInEllipseOverDuration; sprite->callback(sprite); } @@ -367,7 +367,7 @@ void sub_8110AB4(struct Sprite *sprite) sprite->data[3] = 0; sprite->data[4] = 0; - sprite->callback = AnimTranslateLinearSimple; + sprite->callback = TranslateSpriteLinearFixedPoint; StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix); } @@ -402,7 +402,7 @@ static void sub_8110B80(struct Sprite *sprite) void AnimTask_LoadSandstormBackground(u8 taskId) { int var0; - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; var0 = 0; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND); @@ -418,10 +418,10 @@ void AnimTask_LoadSandstormBackground(u8 taskId) SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X); SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y); - sub_80A6B30(&unknownStruct); - sub_80A6CC0(unknownStruct.bgId, gUnknown_08D8D58C, unknownStruct.tilesOffset); - sub_80A6D60(&unknownStruct, gUnknown_08D8D410, 0); - LoadCompressedPalette(gBattleAnimSpritePalette_261, unknownStruct.unk8 * 16, 32); + sub_80A6B30(&animBg); + AnimLoadCompressedBgGfx(animBg.bgId, gUnknown_08D8D58C, animBg.tilesOffset); + sub_80A6D60(&animBg, gUnknown_08D8D410, 0); + LoadCompressedPalette(gBattleAnimSpritePalette_261, animBg.paletteId * 16, 32); if (gBattleAnimArgs[0] && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) var0 = 1; @@ -432,7 +432,7 @@ void AnimTask_LoadSandstormBackground(u8 taskId) static void sub_8110CB0(u8 taskId) { - struct UnknownAnimStruct2 unknownStruct; + struct BattleAnimBgData animBg; if (gTasks[taskId].data[0] == 0) gBattle_BG1_X += -6; @@ -477,8 +477,8 @@ static void sub_8110CB0(u8 taskId) } break; case 3: - sub_80A6B30(&unknownStruct); - sub_80A6C68(unknownStruct.bgId); + sub_80A6B30(&animBg); + sub_80A6C68(animBg.bgId); gTasks[taskId].data[12]++; break; case 4: @@ -735,7 +735,7 @@ static void sub_8111214(struct Task *task) void sub_811131C(struct Sprite *sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { u8 taskId = FindTaskIdByFunc(sub_81110A4); if (taskId != 0xFF) diff --git a/src/water.c b/src/water.c index 42ab1d67fe..d13b1378e8 100644 --- a/src/water.c +++ b/src/water.c @@ -876,31 +876,31 @@ void sub_810790C(struct Sprite *sprite) #ifdef NONMATCHING void AnimTask_CreateSurfWave(u8 taskId) { - struct UnknownAnimStruct2 unk; + struct BattleAnimBgData animBg; u8 taskId2; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16)); SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1); SetAnimBgAttribute(1, BG_ANIM_SCREEN_SIZE, 1); - sub_80A6B30(&unk); + sub_80A6B30(&animBg); if (!IsContest()) { SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 1); if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) - sub_80A6D48(unk.bgId, gUnknown_08D95E00); + AnimLoadCompressedBgTilemap(animBg.bgId, gUnknown_08D95E00); else - sub_80A6D48(unk.bgId, gUnknown_08D960D0); + AnimLoadCompressedBgTilemap(animBg.bgId, gUnknown_08D960D0); } else { - sub_80A6D60(&unk, gUnknown_08D963A4, 1); + sub_80A6D60(&animBg, gUnknown_08D963A4, 1); } - sub_80A6CC0(unk.bgId, gBattleAnimBackgroundImage_Surf, unk.tilesOffset); + AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBackgroundImage_Surf, animBg.tilesOffset); if (gBattleAnimArgs[0] == 0) - LoadCompressedPalette(gBattleAnimBackgroundPalette_Surf, unk.unk8 * 16, 32); + LoadCompressedPalette(gBattleAnimBackgroundPalette_Surf, animBg.paletteId * 16, 32); else - LoadCompressedPalette(gBattleAnimBackgroundImageMuddyWater_Pal, unk.unk8 * 16, 32); + LoadCompressedPalette(gBattleAnimBackgroundImageMuddyWater_Pal, animBg.paletteId * 16, 32); taskId2 = CreateTask(sub_8107D58, gTasks[taskId].priority + 1); gTasks[taskId].data[15] = taskId2; gTasks[taskId2].data[0] = 0; @@ -993,14 +993,14 @@ void AnimTask_CreateSurfWave(u8 taskId) mov r0, sp\n\ ldrb r0, [r0, 0x9]\n\ ldr r1, =gUnknown_08D95E00\n\ - bl sub_80A6D48\n\ + bl AnimLoadCompressedBgTilemap\n\ b _081079EA\n\ .pool\n\ _081079D0:\n\ mov r0, sp\n\ ldrb r0, [r0, 0x9]\n\ ldr r1, =gUnknown_08D960D0\n\ - bl sub_80A6D48\n\ + bl AnimLoadCompressedBgTilemap\n\ b _081079EA\n\ .pool\n\ _081079E0:\n\ @@ -1014,7 +1014,7 @@ _081079EA:\n\ ldr r1, =gBattleAnimBackgroundImage_Surf\n\ mov r2, sp\n\ ldrh r2, [r2, 0xA]\n\ - bl sub_80A6CC0\n\ + bl AnimLoadCompressedBgGfx\n\ ldr r0, =gBattleAnimArgs\n\ movs r1, 0\n\ ldrsh r0, [r0, r1]\n\ @@ -1176,7 +1176,7 @@ _08107B58:\n\ #ifdef NONMATCHING void sub_8107B84(u8 taskId) { - struct UnknownAnimStruct2 unk; + struct BattleAnimBgData animBg; u8 i; u16 rgbBuffer; u16 *BGptrX = &gBattle_BG1_X; @@ -1187,18 +1187,18 @@ void sub_8107B84(u8 taskId) *BGptrX += gTasks[taskId].data[0]; *BGptrY += gTasks[taskId].data[1]; - sub_80A6B30(&unk); + sub_80A6B30(&animBg); gTasks[taskId].data[2] += gTasks[taskId].data[1]; if (++gTasks[taskId].data[5] == 4) { - rgbBuffer = gPlttBufferFaded[unk.unk8 * 16 + 7]; + rgbBuffer = gPlttBufferFaded[animBg.paletteId * 16 + 7]; for (i = 6; i != 0; i--) { - palNum = unk.unk8 * 16; + palNum = animBg.paletteId * 16; palOffset = 1 + i; gPlttBufferFaded[palNum + palOffset] = gPlttBufferFaded[palNum + palOffset - 1]; } - gPlttBufferFaded[unk.unk8 * 16 + 1] = rgbBuffer; + gPlttBufferFaded[animBg.paletteId * 16 + 1] = rgbBuffer; gTasks[taskId].data[5] = 0; } if (++gTasks[taskId].data[6] > 1) @@ -2320,7 +2320,7 @@ void sub_8108AC0(struct Task *task) void sub_8108B2C(struct Sprite *sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; @@ -2337,7 +2337,7 @@ void sub_8108B94(struct Sprite *sprite) { u16 i; - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { for (i = 0; i < NUM_TASKS; i++) { From a1ad1bad3a96222e8575bb2ce4625864593daa73 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 6 Feb 2019 20:01:29 -0600 Subject: [PATCH 019/217] Document a bunch of battle pyramid --- .../scripts.inc | 252 +-- include/battle_pyramid.h | 4 +- include/battle_pyramid_bag.h | 2 +- include/field_screen_effect.h | 2 +- include/fieldmap.h | 2 +- include/global.h | 8 +- include/rom_818CFC8.h | 2 +- include/strings.h | 252 +-- src/battle_pyramid.c | 1594 +++++++++-------- src/battle_pyramid_bag.c | 2 +- src/event_object_movement.c | 4 +- src/field_screen_effect.c | 4 +- src/fieldmap.c | 7 +- src/overworld.c | 8 +- src/start_menu.c | 2 +- 15 files changed, 1094 insertions(+), 1051 deletions(-) diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index 558f6e416d..459d2adadf 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -189,595 +189,595 @@ gText_BattlePyramidConfirmRetire:: @ 8252CFB .string "Are you sure you want to quit your\n" .string "PYRAMID quest?$" -BattleFrontier_BattlePyramidEmptySquare_Text_252D2D:: @ 8252D2D +BattlePyramid_ExitHintUp_Text1:: @ 8252D2D .string "This floor's exit is in\n" .string "that direction: {UP_ARROW}$" -BattleFrontier_BattlePyramidEmptySquare_Text_252D57:: @ 8252D57 +BattlePyramid_ExitHintLeft_Text1:: @ 8252D57 .string "This floor's exit is in\n" .string "that direction: {LEFT_ARROW}$" -BattleFrontier_BattlePyramidEmptySquare_Text_252D81:: @ 8252D81 +BattlePyramid_ExitHintRight_Text1:: @ 8252D81 .string "This floor's exit is in\n" .string "that direction: {RIGHT_ARROW}$" -BattleFrontier_BattlePyramidEmptySquare_Text_252DAB:: @ 8252DAB +BattlePyramid_ExitHintDown_Text1:: @ 8252DAB .string "This floor's exit is in\n" .string "that direction: {DOWN_ARROW}$" -BattleFrontier_BattlePyramidEmptySquare_Text_252DD5:: @ 8252DD5 +BattlePyramid_ExitHintUp_Text2:: @ 8252DD5 .string "The exit on this floor is in\n" .string "the {UP_ARROW} direction.$" -BattleFrontier_BattlePyramidEmptySquare_Text_252E03:: @ 8252E03 +BattlePyramid_ExitHintLeft_Text2:: @ 8252E03 .string "The exit on this floor is in\n" .string "the {LEFT_ARROW} direction.$" -BattleFrontier_BattlePyramidEmptySquare_Text_252E31:: @ 8252E31 +BattlePyramid_ExitHintRight_Text2:: @ 8252E31 .string "The exit on this floor is in\n" .string "the {RIGHT_ARROW} direction.$" -BattleFrontier_BattlePyramidEmptySquare_Text_252E5F:: @ 8252E5F +BattlePyramid_ExitHintDown_Text2:: @ 8252E5F .string "The exit on this floor is in\n" .string "the {DOWN_ARROW} direction.$" -BattleFrontier_BattlePyramidEmptySquare_Text_252E8D:: @ 8252E8D +BattlePyramid_ExitHintUp_Text3:: @ 8252E8D .string "The exit is over\n" .string "that {UP_ARROW} way.$" -BattleFrontier_BattlePyramidEmptySquare_Text_252EAA:: @ 8252EAA +BattlePyramid_ExitHintLeft_Text3:: @ 8252EAA .string "The exit is over\n" .string "that {LEFT_ARROW} way.$" -BattleFrontier_BattlePyramidEmptySquare_Text_252EC7:: @ 8252EC7 +BattlePyramid_ExitHintRight_Text3:: @ 8252EC7 .string "The exit is over\n" .string "that {RIGHT_ARROW} way.$" -BattleFrontier_BattlePyramidEmptySquare_Text_252EE4:: @ 8252EE4 +BattlePyramid_ExitHintDown_Text3:: @ 8252EE4 .string "The exit is over\n" .string "that {DOWN_ARROW} way.$" -BattleFrontier_BattlePyramidEmptySquare_Text_252F01:: @ 8252F01 +BattlePyramid_ExitHintUp_Text4:: @ 8252F01 .string "On this floor, the exit is somewhere\n" .string "in the {UP_ARROW} direction.$" -BattleFrontier_BattlePyramidEmptySquare_Text_252F3A:: @ 8252F3A +BattlePyramid_ExitHintLeft_Text4:: @ 8252F3A .string "On this floor, the exit is somewhere\n" .string "in the {LEFT_ARROW} direction.$" -BattleFrontier_BattlePyramidEmptySquare_Text_252F73:: @ 8252F73 +BattlePyramid_ExitHintRight_Text4:: @ 8252F73 .string "On this floor, the exit is somewhere\n" .string "in the {RIGHT_ARROW} direction.$" -BattleFrontier_BattlePyramidEmptySquare_Text_252FAC:: @ 8252FAC +BattlePyramid_ExitHintDown_Text4:: @ 8252FAC .string "On this floor, the exit is somewhere\n" .string "in the {DOWN_ARROW} direction.$" -BattleFrontier_BattlePyramidEmptySquare_Text_252FE5:: @ 8252FE5 +BattlePyramid_ExitHintUp_Text5:: @ 8252FE5 .string "The exit?\n" .string "It's that {UP_ARROW} way.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253000:: @ 8253000 +BattlePyramid_ExitHintLeft_Text5:: @ 8253000 .string "The exit?\n" .string "It's that {LEFT_ARROW} way.$" -BattleFrontier_BattlePyramidEmptySquare_Text_25301B:: @ 825301B +BattlePyramid_ExitHintRight_Text5:: @ 825301B .string "The exit?\n" .string "It's that {RIGHT_ARROW} way.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253036:: @ 8253036 +BattlePyramid_ExitHintDown_Text5:: @ 8253036 .string "The exit?\n" .string "It's that {DOWN_ARROW} way.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253051:: @ 8253051 +BattlePyramid_ExitHintUp_Text6:: @ 8253051 .string "The exit happens to be in\n" .string "the {UP_ARROW} direction.$" -BattleFrontier_BattlePyramidEmptySquare_Text_25307C:: @ 825307C +BattlePyramid_ExitHintLeft_Text6:: @ 825307C .string "The exit happens to be in\n" .string "the {LEFT_ARROW} direction.$" -BattleFrontier_BattlePyramidEmptySquare_Text_2530A7:: @ 82530A7 +BattlePyramid_ExitHintRight_Text6:: @ 82530A7 .string "The exit happens to be in\n" .string "the {RIGHT_ARROW} direction.$" -BattleFrontier_BattlePyramidEmptySquare_Text_2530D2:: @ 82530D2 +BattlePyramid_ExitHintDown_Text6:: @ 82530D2 .string "The exit happens to be in\n" .string "the {DOWN_ARROW} direction.$" -BattleFrontier_BattlePyramidEmptySquare_Text_2530FD:: @ 82530FD +BattlePyramid_EightItemsRemaining_Text1:: @ 82530FD .string "Are you looking for items?\p" .string "There are eight items left to\n" .string "be found.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253140:: @ 8253140 +BattlePyramid_SevenItemsRemaining_Text1:: @ 8253140 .string "Are you looking for items?\p" .string "There are seven items left to\n" .string "be found.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253183:: @ 8253183 +BattlePyramid_SixItemsRemaining_Text1:: @ 8253183 .string "Are you looking for items?\p" .string "There are six items left to\n" .string "be found.$" -BattleFrontier_BattlePyramidEmptySquare_Text_2531C4:: @ 82531C4 +BattlePyramid_FiveItemsRemaining_Text1:: @ 82531C4 .string "Are you looking for items?\p" .string "There are five items left to\n" .string "be found.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253206:: @ 8253206 +BattlePyramid_FourItemsRemaining_Text1:: @ 8253206 .string "Are you looking for items?\p" .string "There are four items left to\n" .string "be found.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253248:: @ 8253248 +BattlePyramid_ThreeItemsRemaining_Text1:: @ 8253248 .string "Are you looking for items?\p" .string "There are three items left to\n" .string "be found.$" -BattleFrontier_BattlePyramidEmptySquare_Text_25328B:: @ 825328B +BattlePyramid_TwoItemsRemaining_Text1:: @ 825328B .string "Are you looking for items?\p" .string "There are two items left to\n" .string "be found.$" -BattleFrontier_BattlePyramidEmptySquare_Text_2532CC:: @ 82532CC +BattlePyramid_OneItemRemaining_Text1:: @ 82532CC .string "Are you looking for items?\p" .string "There is one item left to\n" .string "be found.$" -BattleFrontier_BattlePyramidEmptySquare_Text_25330B:: @ 825330B +BattlePyramid_ZeroItemsRemaining_Text1:: @ 825330B .string "Are you looking for items?\p" .string "There isn't anything left to\n" .string "be found!$" -BattleFrontier_BattlePyramidEmptySquare_Text_25334D:: @ 825334D +BattlePyramid_EightItemsRemaining_Text2:: @ 825334D .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are eight items\n" .string "lying around here.$" -BattleFrontier_BattlePyramidEmptySquare_Text_2533A6:: @ 82533A6 +BattlePyramid_SevenItemsRemaining_Text2:: @ 82533A6 .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are seven items left\n" .string "lying around here.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253404:: @ 8253404 +BattlePyramid_SixItemsRemaining_Text2:: @ 8253404 .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are six items left\n" .string "lying around here.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253460:: @ 8253460 +BattlePyramid_FiveItemsRemaining_Text2:: @ 8253460 .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are five items left\n" .string "lying around here.$" -BattleFrontier_BattlePyramidEmptySquare_Text_2534BD:: @ 82534BD +BattlePyramid_FourItemsRemaining_Text2:: @ 82534BD .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are four items left\n" .string "lying around here.$" -BattleFrontier_BattlePyramidEmptySquare_Text_25351A:: @ 825351A +BattlePyramid_ThreeItemsRemaining_Text2:: @ 825351A .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are three items left\n" .string "lying around here.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253578:: @ 8253578 +BattlePyramid_TwoItemsRemaining_Text2:: @ 8253578 .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are two items left\n" .string "lying around here.$" -BattleFrontier_BattlePyramidEmptySquare_Text_2535D4:: @ 82535D4 +BattlePyramid_OneItemRemaining_Text2:: @ 82535D4 .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There is just one item\n" .string "lying around here.$" -BattleFrontier_BattlePyramidEmptySquare_Text_25362E:: @ 825362E +BattlePyramid_ZeroItemsRemaining_Text2:: @ 825362E .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There isn't anything left\n" .string "lying around here.$" -BattleFrontier_BattlePyramidEmptySquare_Text_25368B:: @ 825368B +BattlePyramid_EightItemsRemaining_Text3:: @ 825368B .string "How's your stock of items holding up?\p" .string "I reckon there are eight items left\n" .string "waiting to be found on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_2536F8:: @ 82536F8 +BattlePyramid_SevenItemsRemaining_Text3:: @ 82536F8 .string "How's your stock of items holding up?\p" .string "I reckon there are seven items left\n" .string "waiting to be found on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253765:: @ 8253765 +BattlePyramid_SixItemsRemaining_Text3:: @ 8253765 .string "How's your stock of items holding up?\p" .string "I reckon there are six items left\n" .string "waiting to be found on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_2537D0:: @ 82537D0 +BattlePyramid_FiveItemsRemaining_Text3:: @ 82537D0 .string "How's your stock of items holding up?\p" .string "I reckon there are five items left\n" .string "waiting to be found on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_25383C:: @ 825383C +BattlePyramid_FourItemsRemaining_Text3:: @ 825383C .string "How's your stock of items holding up?\p" .string "I reckon there are four items left\n" .string "waiting to be found on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_2538A8:: @ 82538A8 +BattlePyramid_ThreeItemsRemaining_Text3:: @ 82538A8 .string "How's your stock of items holding up?\p" .string "I reckon there are three items left\n" .string "waiting to be found on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253915:: @ 8253915 +BattlePyramid_TwoItemsRemaining_Text3:: @ 8253915 .string "How's your stock of items holding up?\p" .string "I reckon there are two items left\n" .string "waiting to be found on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253980:: @ 8253980 +BattlePyramid_OneItemRemaining_Text3:: @ 8253980 .string "How's your stock of items holding up?\p" .string "I reckon there's but one item left\n" .string "waiting to be found on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_2539EC:: @ 82539EC +BattlePyramid_ZeroItemsRemaining_Text3:: @ 82539EC .string "How's your stock of items holding up?\p" .string "I reckon there are no more items\n" .string "waiting to be found on this floor.\l" .string "You take care now!$" -BattleFrontier_BattlePyramidEmptySquare_Text_253A69:: @ 8253A69 +BattlePyramid_EightItemsRemaining_Text4:: @ 8253A69 .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be eight more\n" .string "items on the ground.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253AC4:: @ 8253AC4 +BattlePyramid_SevenItemsRemaining_Text4:: @ 8253AC4 .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be seven more\n" .string "items on the ground.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253B1F:: @ 8253B1F +BattlePyramid_SixItemsRemaining_Text4:: @ 8253B1F .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be six more\n" .string "items on the ground.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253B78:: @ 8253B78 +BattlePyramid_FiveItemsRemaining_Text4:: @ 8253B78 .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be five more\n" .string "items on the ground.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253BD2:: @ 8253BD2 +BattlePyramid_FourItemsRemaining_Text4:: @ 8253BD2 .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be four more\n" .string "items on the ground.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253C2C:: @ 8253C2C +BattlePyramid_ThreeItemsRemaining_Text4:: @ 8253C2C .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be three more\n" .string "items on the ground.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253C87:: @ 8253C87 +BattlePyramid_TwoItemsRemaining_Text4:: @ 8253C87 .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be two more\n" .string "items on the ground.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253CE0:: @ 8253CE0 +BattlePyramid_OneItemRemaining_Text4:: @ 8253CE0 .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appears to be only one more\n" .string "item on the ground.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253D3E:: @ 8253D3E +BattlePyramid_ZeroItemsRemaining_Text4:: @ 8253D3E .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be no more\n" .string "items on the ground.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253D96:: @ 8253D96 +BattlePyramid_EightItemsRemaining_Text5:: @ 8253D96 .string "On this floor of the PYRAMID,\n" .string "I hear there are eight items…$" -BattleFrontier_BattlePyramidEmptySquare_Text_253DD2:: @ 8253DD2 +BattlePyramid_SevenItemsRemaining_Text5:: @ 8253DD2 .string "On this floor of the PYRAMID,\n" .string "I hear there are seven items…$" -BattleFrontier_BattlePyramidEmptySquare_Text_253E0E:: @ 8253E0E +BattlePyramid_SixItemsRemaining_Text5:: @ 8253E0E .string "On this floor of the PYRAMID,\n" .string "I hear there are six items…$" -BattleFrontier_BattlePyramidEmptySquare_Text_253E48:: @ 8253E48 +BattlePyramid_FiveItemsRemaining_Text5:: @ 8253E48 .string "On this floor of the PYRAMID,\n" .string "I hear there are five items…$" -BattleFrontier_BattlePyramidEmptySquare_Text_253E83:: @ 8253E83 +BattlePyramid_FourItemsRemaining_Text5:: @ 8253E83 .string "On this floor of the PYRAMID,\n" .string "I hear there are four items…$" -BattleFrontier_BattlePyramidEmptySquare_Text_253EBE:: @ 8253EBE +BattlePyramid_ThreeItemsRemaining_Text5:: @ 8253EBE .string "On this floor of the PYRAMID,\n" .string "I hear there are three items…$" -BattleFrontier_BattlePyramidEmptySquare_Text_253EFA:: @ 8253EFA +BattlePyramid_TwoItemsRemaining_Text5:: @ 8253EFA .string "On this floor of the PYRAMID,\n" .string "I hear there are two items…$" -BattleFrontier_BattlePyramidEmptySquare_Text_253F34:: @ 8253F34 +BattlePyramid_OneItemRemaining_Text5:: @ 8253F34 .string "On this floor of the PYRAMID,\n" .string "I hear there is one item…$" -BattleFrontier_BattlePyramidEmptySquare_Text_253F6C:: @ 8253F6C +BattlePyramid_ZeroItemsRemaining_Text5:: @ 8253F6C .string "On this floor of the PYRAMID,\n" .string "I hear there are no items…$" -BattleFrontier_BattlePyramidEmptySquare_Text_253FA5:: @ 8253FA5 +BattlePyramid_EightItemsRemaining_Text6:: @ 8253FA5 .string "Have you collected any items?\p" .string "I believe there are eight more\n" .string "items on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_253FF7:: @ 8253FF7 +BattlePyramid_SevenItemsRemaining_Text6:: @ 8253FF7 .string "Have you collected any items?\p" .string "I believe there are seven more\n" .string "items on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_254049:: @ 8254049 +BattlePyramid_SixItemsRemaining_Text6:: @ 8254049 .string "Have you collected any items?\p" .string "I believe there are six more\n" .string "items on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_254099:: @ 8254099 +BattlePyramid_FiveItemsRemaining_Text6:: @ 8254099 .string "Have you collected any items?\p" .string "I believe there are five more\n" .string "items on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_2540EA:: @ 82540EA +BattlePyramid_FourItemsRemaining_Text6:: @ 82540EA .string "Have you collected any items?\p" .string "I believe there are four more\n" .string "items on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_25413B:: @ 825413B +BattlePyramid_ThreeItemsRemaining_Text6:: @ 825413B .string "Have you collected any items?\p" .string "I believe there are three more\n" .string "items on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_25418D:: @ 825418D +BattlePyramid_TwoItemsRemaining_Text6:: @ 825418D .string "Have you collected any items?\p" .string "I believe there are two more\n" .string "items on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_2541DD:: @ 82541DD +BattlePyramid_OneItemRemaining_Text6:: @ 82541DD .string "Have you collected any items?\p" .string "I believe there is one more\n" .string "item on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_25422B:: @ 825422B +BattlePyramid_ZeroItemsRemaining_Text6:: @ 825422B .string "Have you collected any items?\p" .string "I believe there are no more\n" .string "items on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_25427A:: @ 825427A +BattlePyramid_SevenTrainersRemaining_Text1:: @ 825427A .string "You were really awesome!\p" .string "But there are still seven tough\n" .string "TRAINERS other than me!$" -BattleFrontier_BattlePyramidEmptySquare_Text_2542CB:: @ 82542CB +BattlePyramid_SixTrainersRemaining_Text1:: @ 82542CB .string "You were really awesome!\p" .string "But there are still six tough\n" .string "TRAINERS other than me!$" -BattleFrontier_BattlePyramidEmptySquare_Text_25431A:: @ 825431A +BattlePyramid_FiveTrainersRemaining_Text1:: @ 825431A .string "You were really awesome!\p" .string "But there are still five tough\n" .string "TRAINERS other than me!$" -BattleFrontier_BattlePyramidEmptySquare_Text_25436A:: @ 825436A +BattlePyramid_FourTrainersRemaining_Text1:: @ 825436A .string "You were really awesome!\p" .string "But there are still four tough\n" .string "TRAINERS other than me!$" -BattleFrontier_BattlePyramidEmptySquare_Text_2543BA:: @ 82543BA +BattlePyramid_ThreeTrainersRemaining_Text1:: @ 82543BA .string "You were really awesome!\p" .string "But there are still three tough\n" .string "TRAINERS other than me!$" -BattleFrontier_BattlePyramidEmptySquare_Text_25440B:: @ 825440B +BattlePyramid_TwoTrainersRemaining_Text1:: @ 825440B .string "You were really awesome!\p" .string "But there are still two tough\n" .string "TRAINERS other than me!$" -BattleFrontier_BattlePyramidEmptySquare_Text_25445A:: @ 825445A +BattlePyramid_OneTrainersRemaining_Text1:: @ 825445A .string "You were really awesome!\p" .string "But there's still one tough\n" .string "TRAINER other than me!$" -BattleFrontier_BattlePyramidEmptySquare_Text_2544A6:: @ 82544A6 +BattlePyramid_ZeroTrainersRemaining_Text1:: @ 82544A6 .string "You were really awesome!\p" .string "There's no one left that\n" .string "can beat you!$" -BattleFrontier_BattlePyramidEmptySquare_Text_2544E6:: @ 82544E6 +BattlePyramid_SevenTrainersRemaining_Text2:: @ 82544E6 .string "This is so upsetting!\p" .string "But there are seven TRAINERS left!\n" .string "Someone will humble you!$" -BattleFrontier_BattlePyramidEmptySquare_Text_254538:: @ 8254538 +BattlePyramid_SixTrainersRemaining_Text2:: @ 8254538 .string "This is so upsetting!\p" .string "But there are six TRAINERS left!\n" .string "Someone will humble you!$" -BattleFrontier_BattlePyramidEmptySquare_Text_254588:: @ 8254588 +BattlePyramid_FiveTrainersRemaining_Text2:: @ 8254588 .string "This is so upsetting!\p" .string "But there are five TRAINERS left!\n" .string "Someone will humble you!$" -BattleFrontier_BattlePyramidEmptySquare_Text_2545D9:: @ 82545D9 +BattlePyramid_FourTrainersRemaining_Text2:: @ 82545D9 .string "This is so upsetting!\p" .string "But there are four TRAINERS left!\n" .string "Someone will humble you!$" -BattleFrontier_BattlePyramidEmptySquare_Text_25462A:: @ 825462A +BattlePyramid_ThreeTrainersRemaining_Text2:: @ 825462A .string "This is so upsetting!\p" .string "But there are three TRAINERS left!\n" .string "Someone will humble you!$" -BattleFrontier_BattlePyramidEmptySquare_Text_25467C:: @ 825467C +BattlePyramid_TwoTrainersRemaining_Text2:: @ 825467C .string "This is so upsetting!\p" .string "But there are two TRAINERS left!\n" .string "Someone will humble you!$" -BattleFrontier_BattlePyramidEmptySquare_Text_2546CC:: @ 82546CC +BattlePyramid_OneTrainersRemaining_Text2:: @ 82546CC .string "This is so upsetting!\p" .string "But there's one TRAINER left!\n" .string "I'm sure you will be humbled!$" -BattleFrontier_BattlePyramidEmptySquare_Text_25471E:: @ 825471E +BattlePyramid_ZeroTrainersRemaining_Text2:: @ 825471E .string "This is so upsetting!\p" .string "But there are no more TRAINERS\n" .string "who can engage you!$" -BattleFrontier_BattlePyramidEmptySquare_Text_254767:: @ 8254767 +BattlePyramid_SevenTrainersRemaining_Text3:: @ 8254767 .string "That's pretty impressive!\p" .string "But there are seven more TRAINERS\n" .string "on this floor. Can you beat them all?$" -BattleFrontier_BattlePyramidEmptySquare_Text_2547C9:: @ 82547C9 +BattlePyramid_SixTrainersRemaining_Text3:: @ 82547C9 .string "That's pretty impressive!\p" .string "But there are six more TRAINERS\n" .string "on this floor. Can you beat them all?$" -BattleFrontier_BattlePyramidEmptySquare_Text_254829:: @ 8254829 +BattlePyramid_FiveTrainersRemaining_Text3:: @ 8254829 .string "That's pretty impressive!\p" .string "But there are five more TRAINERS\n" .string "on this floor. Can you beat them all?$" -BattleFrontier_BattlePyramidEmptySquare_Text_25488A:: @ 825488A +BattlePyramid_FourTrainersRemaining_Text3:: @ 825488A .string "That's pretty impressive!\p" .string "But there are four more TRAINERS\n" .string "on this floor. Can you beat them all?$" -BattleFrontier_BattlePyramidEmptySquare_Text_2548EB:: @ 82548EB +BattlePyramid_ThreeTrainersRemaining_Text3:: @ 82548EB .string "That's pretty impressive!\p" .string "But there are three more TRAINERS\n" .string "on this floor. Can you beat them all?$" -BattleFrontier_BattlePyramidEmptySquare_Text_25494D:: @ 825494D +BattlePyramid_TwoTrainersRemaining_Text3:: @ 825494D .string "That's pretty impressive!\p" .string "But there are two more TRAINERS\n" .string "on this floor. Can you beat them both?$" -BattleFrontier_BattlePyramidEmptySquare_Text_2549AE:: @ 82549AE +BattlePyramid_OneTrainersRemaining_Text3:: @ 82549AE .string "That's pretty impressive!\p" .string "But there's still one more TRAINER\n" .string "on this floor. Can you prevail?$" -BattleFrontier_BattlePyramidEmptySquare_Text_254A0B:: @ 8254A0B +BattlePyramid_ZeroTrainersRemaining_Text3:: @ 8254A0B .string "That's pretty impressive!\p" .string "You've gone through all the TRAINERS\n" .string "on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_254A59:: @ 8254A59 +BattlePyramid_SevenTrainersRemaining_Text4:: @ 8254A59 .string "Maybe you could sweep through\n" .string "the seven TRAINERS left on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_254A9E:: @ 8254A9E +BattlePyramid_SixTrainersRemaining_Text4:: @ 8254A9E .string "Maybe you could sweep through\n" .string "the six TRAINERS left on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_254AE1:: @ 8254AE1 +BattlePyramid_FiveTrainersRemaining_Text4:: @ 8254AE1 .string "Maybe you could sweep through\n" .string "the five TRAINERS left on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_254B25:: @ 8254B25 +BattlePyramid_FourTrainersRemaining_Text4:: @ 8254B25 .string "Maybe you could sweep through\n" .string "the four TRAINERS left on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_254B69:: @ 8254B69 +BattlePyramid_ThreeTrainersRemaining_Text4:: @ 8254B69 .string "Maybe you could sweep through\n" .string "the three TRAINERS left on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_254BAE:: @ 8254BAE +BattlePyramid_TwoTrainersRemaining_Text4:: @ 8254BAE .string "Maybe you could sweep through\n" .string "the two TRAINERS left on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_254BF1:: @ 8254BF1 +BattlePyramid_OneTrainersRemaining_Text4:: @ 8254BF1 .string "Maybe you could complete your sweep\n" .string "with the one TRAINER left on this floor.$" -BattleFrontier_BattlePyramidEmptySquare_Text_254C3E:: @ 8254C3E +BattlePyramid_ZeroTrainersRemaining_Text4:: @ 8254C3E .string "There isn't a single person left who\n" .string "can defeat you now…$" -BattleFrontier_BattlePyramidEmptySquare_Text_254C77:: @ 8254C77 +BattlePyramid_SevenTrainersRemaining_Text5:: @ 8254C77 .string "You may have what it takes to beat\n" .string "the seven expert TRAINERS who remain.$" -BattleFrontier_BattlePyramidEmptySquare_Text_254CC0:: @ 8254CC0 +BattlePyramid_SixTrainersRemaining_Text5:: @ 8254CC0 .string "You may have what it takes to beat\n" .string "the six expert TRAINERS who remain.$" -BattleFrontier_BattlePyramidEmptySquare_Text_254D07:: @ 8254D07 +BattlePyramid_FiveTrainersRemaining_Text5:: @ 8254D07 .string "You may have what it takes to beat\n" .string "the five expert TRAINERS who remain.$" -BattleFrontier_BattlePyramidEmptySquare_Text_254D4F:: @ 8254D4F +BattlePyramid_FourTrainersRemaining_Text5:: @ 8254D4F .string "You may have what it takes to beat\n" .string "the four expert TRAINERS who remain.$" -BattleFrontier_BattlePyramidEmptySquare_Text_254D97:: @ 8254D97 +BattlePyramid_ThreeTrainersRemaining_Text5:: @ 8254D97 .string "You may have what it takes to beat\n" .string "the three expert TRAINERS who remain.$" -BattleFrontier_BattlePyramidEmptySquare_Text_254DE0:: @ 8254DE0 +BattlePyramid_TwoTrainersRemaining_Text5:: @ 8254DE0 .string "You may have what it takes to beat\n" .string "the two expert TRAINERS who remain.$" -BattleFrontier_BattlePyramidEmptySquare_Text_254E27:: @ 8254E27 +BattlePyramid_OneTrainersRemaining_Text5:: @ 8254E27 .string "You may have what it takes to beat\n" .string "the one expert TRAINER who remains.$" -BattleFrontier_BattlePyramidEmptySquare_Text_254E6E:: @ 8254E6E +BattlePyramid_ZeroTrainersRemaining_Text5:: @ 8254E6E .string "Your skills are beyond reproach.\p" .string "There are no more TRAINERS here\n" .string "who have any chance of beating you.$" -BattleFrontier_BattlePyramidEmptySquare_Text_254ED3:: @ 8254ED3 +BattlePyramid_SevenTrainersRemaining_Text6:: @ 8254ED3 .string "Can you keep winning against\n" .string "the seven remaining TRAINERS?$" -BattleFrontier_BattlePyramidEmptySquare_Text_254F0E:: @ 8254F0E +BattlePyramid_SixTrainersRemaining_Text6:: @ 8254F0E .string "Can you keep winning against\n" .string "the six remaining TRAINERS?$" -BattleFrontier_BattlePyramidEmptySquare_Text_254F47:: @ 8254F47 +BattlePyramid_FiveTrainersRemaining_Text6:: @ 8254F47 .string "Can you keep winning against\n" .string "the five remaining TRAINERS?$" -BattleFrontier_BattlePyramidEmptySquare_Text_254F81:: @ 8254F81 +BattlePyramid_FourTrainersRemaining_Text6:: @ 8254F81 .string "Can you keep winning against\n" .string "the four remaining TRAINERS?$" -BattleFrontier_BattlePyramidEmptySquare_Text_254FBB:: @ 8254FBB +BattlePyramid_ThreeTrainersRemaining_Text6:: @ 8254FBB .string "Can you keep winning against\n" .string "the three remaining TRAINERS?$" -BattleFrontier_BattlePyramidEmptySquare_Text_254FF6:: @ 8254FF6 +BattlePyramid_TwoTrainersRemaining_Text6:: @ 8254FF6 .string "Can you keep winning against\n" .string "the two remaining TRAINERS?$" -BattleFrontier_BattlePyramidEmptySquare_Text_25502F:: @ 825502F +BattlePyramid_OneTrainersRemaining_Text6:: @ 825502F .string "Can you keep winning against\n" .string "the last remaining TRAINER?$" -BattleFrontier_BattlePyramidEmptySquare_Text_255068:: @ 8255068 +BattlePyramid_ZeroTrainersRemaining_Text6:: @ 8255068 .string "There aren't any TRAINERS left that\n" .string "can take you on now…$" diff --git a/include/battle_pyramid.h b/include/battle_pyramid.h index 5d38e9f358..6936cfd42a 100644 --- a/include/battle_pyramid.h +++ b/include/battle_pyramid.h @@ -15,10 +15,10 @@ void CopyPyramidTrainerSpeechBefore(u16 trainerId); void CopyPyramidTrainerWinSpeech(u16 trainerId); void CopyPyramidTrainerLoseSpeech(u16 trainerId); u8 GetTrainerEncounterMusicIdInBattlePyramind(u16 trainerId); -void sub_81AA078(u16 *mapArg, u8 arg1); +void GenerateBattlePyramidFloorLayout(u16 *mapArg, bool8 setPlayerPosition); void sub_81AA1D8(void); void sub_81AA2F8(void); -u8 sub_81AAA40(void); +u8 GetNumBattlePyramidEventObjects(void); u16 GetBattlePyramidPickupItemId(void); #endif // GUARD_BATTLE_PYRAMID_H diff --git a/include/battle_pyramid_bag.h b/include/battle_pyramid_bag.h index 48f8de3c07..c3b799a4d0 100644 --- a/include/battle_pyramid_bag.h +++ b/include/battle_pyramid_bag.h @@ -34,7 +34,7 @@ struct PyramidBagCursorData extern struct PyramidBagResources *gPyramidBagResources; extern struct PyramidBagCursorData gPyramidBagCursorData; -void sub_81C4EEC(void); +void InitBattlePyramidBagCursorPosition(void); void CB2_PyramidBagMenuFromStartMenu(void); void sub_81C4F84(void); void sub_81C5924(void); diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index 3daf8d892d..7f12bcd369 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -34,7 +34,7 @@ void sub_80AF948(void); void sub_80AF9F8(void); void sub_80AFC60(void); void sub_80B009C(u8 flashLevel); -void door_upload_tiles(void); +void WriteBattlePyramidViewScanlineEffectBuffer(void); void sub_80B0244(void); void sub_80B0268(void); void sub_80B0534(void); diff --git a/include/fieldmap.h b/include/fieldmap.h index 3f5cc5ec8a..3c7b7536de 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -32,7 +32,7 @@ void sub_8088B3C(u16 x, u16 y); void InitMap(void); void InitMapFromSavedGame(void); void InitTrainerHillMap(void); -void InitBattlePyramidMap(u8 a0); +void InitBattlePyramidMap(bool8 setPlayerPosition); void SpriteCB_PokeballGlow(struct Sprite *); void SpriteCB_PokecenterMonitor(struct Sprite *); diff --git a/include/global.h b/include/global.h index f45d36f684..903dbe63a2 100644 --- a/include/global.h +++ b/include/global.h @@ -360,13 +360,13 @@ struct BattleFrontier /*0xE10*/ u8 field_E10_2:4; /*0xE10*/ u8 field_E10_3:1; /*0xE12*/ u16 field_E12[3]; - /*0xE18*/ u16 field_E18; + /*0xE18*/ u16 pyramidRewardItem; /*0xE1A*/ u16 pyramidWinStreaks[2]; /*0xE1E*/ u16 pyramidRecordStreaks[2]; - /*0xE22*/ u16 field_E22[4]; - /*0xE2A*/ u8 field_E2A; + /*0xE22*/ u16 pyramidRandoms[4]; + /*0xE2A*/ u8 pyramidTrainerFlags; /*0xE2C*/ struct PyramidBag pyramidBag; - /*0xE68*/ u8 field_E68; + /*0xE68*/ u8 pyramidLightRadius; /*0xE6A*/ u16 field_E6A; /*0xE6C*/ u16 field_E6C; /*0xE6E*/ u16 field_E6E; diff --git a/include/rom_818CFC8.h b/include/rom_818CFC8.h index 1d0626b2b9..c1fc78e1e4 100644 --- a/include/rom_818CFC8.h +++ b/include/rom_818CFC8.h @@ -6,6 +6,6 @@ #define GUARD_ROM_818CFC8_H bool8 InBattlePyramid(void); -u8 sub_81AAA40(void); +u8 GetNumBattlePyramidEventObjects(void); #endif //GUARD_ROM_818CFC8_H diff --git a/include/strings.h b/include/strings.h index 74f3ca7275..15acde0f7b 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1688,132 +1688,132 @@ extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF[]; extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D[]; // Battle Pyramid. -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D2D[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D57[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D81[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252DAB[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25330B[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2532CC[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25328B[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253248[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253206[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2531C4[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253183[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253140[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530FD[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2544A6[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25445A[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25440B[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2543BA[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25436A[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25431A[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2542CB[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25427A[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252DD5[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E03[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E31[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E5F[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25362E[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2535D4[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253578[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25351A[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2534BD[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253460[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253404[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2533A6[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25334D[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25471E[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2546CC[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25467C[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25462A[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2545D9[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254588[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254538[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2544E6[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E8D[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EAA[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EC7[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EE4[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2539EC[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253980[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253915[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2538A8[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25383C[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2537D0[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253765[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2536F8[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25368B[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A0B[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2549AE[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25494D[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2548EB[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25488A[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254829[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2547C9[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254767[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F01[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F3A[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F73[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252FAC[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253D3E[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253CE0[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253C87[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253C2C[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253BD2[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253B78[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253B1F[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253AC4[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253A69[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254C3E[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254BF1[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254BAE[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254B69[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254B25[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254AE1[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A9E[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A59[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252FE5[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253000[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25301B[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253036[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253F6C[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253F34[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253EFA[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253EBE[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E83[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E48[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E0E[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253DD2[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253D96[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254E6E[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254E27[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254DE0[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D97[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D4F[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D07[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254CC0[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254C77[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253051[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25307C[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530A7[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530D2[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25422B[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2541DD[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25418D[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25413B[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2540EA[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254099[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254049[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253FF7[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253FA5[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_255068[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25502F[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254FF6[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254FBB[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F81[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F47[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F0E[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254ED3[]; +extern const u8 BattlePyramid_ExitHintUp_Text1[]; +extern const u8 BattlePyramid_ExitHintLeft_Text1[]; +extern const u8 BattlePyramid_ExitHintRight_Text1[]; +extern const u8 BattlePyramid_ExitHintDown_Text1[]; +extern const u8 BattlePyramid_ZeroItemsRemaining_Text1[]; +extern const u8 BattlePyramid_OneItemRemaining_Text1[]; +extern const u8 BattlePyramid_TwoItemsRemaining_Text1[]; +extern const u8 BattlePyramid_ThreeItemsRemaining_Text1[]; +extern const u8 BattlePyramid_FourItemsRemaining_Text1[]; +extern const u8 BattlePyramid_FiveItemsRemaining_Text1[]; +extern const u8 BattlePyramid_SixItemsRemaining_Text1[]; +extern const u8 BattlePyramid_SevenItemsRemaining_Text1[]; +extern const u8 BattlePyramid_EightItemsRemaining_Text1[]; +extern const u8 BattlePyramid_ZeroTrainersRemaining_Text1[]; +extern const u8 BattlePyramid_OneTrainersRemaining_Text1[]; +extern const u8 BattlePyramid_TwoTrainersRemaining_Text1[]; +extern const u8 BattlePyramid_ThreeTrainersRemaining_Text1[]; +extern const u8 BattlePyramid_FourTrainersRemaining_Text1[]; +extern const u8 BattlePyramid_FiveTrainersRemaining_Text1[]; +extern const u8 BattlePyramid_SixTrainersRemaining_Text1[]; +extern const u8 BattlePyramid_SevenTrainersRemaining_Text1[]; +extern const u8 BattlePyramid_ExitHintUp_Text2[]; +extern const u8 BattlePyramid_ExitHintLeft_Text2[]; +extern const u8 BattlePyramid_ExitHintRight_Text2[]; +extern const u8 BattlePyramid_ExitHintDown_Text2[]; +extern const u8 BattlePyramid_ZeroItemsRemaining_Text2[]; +extern const u8 BattlePyramid_OneItemRemaining_Text2[]; +extern const u8 BattlePyramid_TwoItemsRemaining_Text2[]; +extern const u8 BattlePyramid_ThreeItemsRemaining_Text2[]; +extern const u8 BattlePyramid_FourItemsRemaining_Text2[]; +extern const u8 BattlePyramid_FiveItemsRemaining_Text2[]; +extern const u8 BattlePyramid_SixItemsRemaining_Text2[]; +extern const u8 BattlePyramid_SevenItemsRemaining_Text2[]; +extern const u8 BattlePyramid_EightItemsRemaining_Text2[]; +extern const u8 BattlePyramid_ZeroTrainersRemaining_Text2[]; +extern const u8 BattlePyramid_OneTrainersRemaining_Text2[]; +extern const u8 BattlePyramid_TwoTrainersRemaining_Text2[]; +extern const u8 BattlePyramid_ThreeTrainersRemaining_Text2[]; +extern const u8 BattlePyramid_FourTrainersRemaining_Text2[]; +extern const u8 BattlePyramid_FiveTrainersRemaining_Text2[]; +extern const u8 BattlePyramid_SixTrainersRemaining_Text2[]; +extern const u8 BattlePyramid_SevenTrainersRemaining_Text2[]; +extern const u8 BattlePyramid_ExitHintUp_Text3[]; +extern const u8 BattlePyramid_ExitHintLeft_Text3[]; +extern const u8 BattlePyramid_ExitHintRight_Text3[]; +extern const u8 BattlePyramid_ExitHintDown_Text3[]; +extern const u8 BattlePyramid_ZeroItemsRemaining_Text3[]; +extern const u8 BattlePyramid_OneItemRemaining_Text3[]; +extern const u8 BattlePyramid_TwoItemsRemaining_Text3[]; +extern const u8 BattlePyramid_ThreeItemsRemaining_Text3[]; +extern const u8 BattlePyramid_FourItemsRemaining_Text3[]; +extern const u8 BattlePyramid_FiveItemsRemaining_Text3[]; +extern const u8 BattlePyramid_SixItemsRemaining_Text3[]; +extern const u8 BattlePyramid_SevenItemsRemaining_Text3[]; +extern const u8 BattlePyramid_EightItemsRemaining_Text3[]; +extern const u8 BattlePyramid_ZeroTrainersRemaining_Text3[]; +extern const u8 BattlePyramid_OneTrainersRemaining_Text3[]; +extern const u8 BattlePyramid_TwoTrainersRemaining_Text3[]; +extern const u8 BattlePyramid_ThreeTrainersRemaining_Text3[]; +extern const u8 BattlePyramid_FourTrainersRemaining_Text3[]; +extern const u8 BattlePyramid_FiveTrainersRemaining_Text3[]; +extern const u8 BattlePyramid_SixTrainersRemaining_Text3[]; +extern const u8 BattlePyramid_SevenTrainersRemaining_Text3[]; +extern const u8 BattlePyramid_ExitHintUp_Text4[]; +extern const u8 BattlePyramid_ExitHintLeft_Text4[]; +extern const u8 BattlePyramid_ExitHintRight_Text4[]; +extern const u8 BattlePyramid_ExitHintDown_Text4[]; +extern const u8 BattlePyramid_ZeroItemsRemaining_Text4[]; +extern const u8 BattlePyramid_OneItemRemaining_Text4[]; +extern const u8 BattlePyramid_TwoItemsRemaining_Text4[]; +extern const u8 BattlePyramid_ThreeItemsRemaining_Text4[]; +extern const u8 BattlePyramid_FourItemsRemaining_Text4[]; +extern const u8 BattlePyramid_FiveItemsRemaining_Text4[]; +extern const u8 BattlePyramid_SixItemsRemaining_Text4[]; +extern const u8 BattlePyramid_SevenItemsRemaining_Text4[]; +extern const u8 BattlePyramid_EightItemsRemaining_Text4[]; +extern const u8 BattlePyramid_ZeroTrainersRemaining_Text4[]; +extern const u8 BattlePyramid_OneTrainersRemaining_Text4[]; +extern const u8 BattlePyramid_TwoTrainersRemaining_Text4[]; +extern const u8 BattlePyramid_ThreeTrainersRemaining_Text4[]; +extern const u8 BattlePyramid_FourTrainersRemaining_Text4[]; +extern const u8 BattlePyramid_FiveTrainersRemaining_Text4[]; +extern const u8 BattlePyramid_SixTrainersRemaining_Text4[]; +extern const u8 BattlePyramid_SevenTrainersRemaining_Text4[]; +extern const u8 BattlePyramid_ExitHintUp_Text5[]; +extern const u8 BattlePyramid_ExitHintLeft_Text5[]; +extern const u8 BattlePyramid_ExitHintRight_Text5[]; +extern const u8 BattlePyramid_ExitHintDown_Text5[]; +extern const u8 BattlePyramid_ZeroItemsRemaining_Text5[]; +extern const u8 BattlePyramid_OneItemRemaining_Text5[]; +extern const u8 BattlePyramid_TwoItemsRemaining_Text5[]; +extern const u8 BattlePyramid_ThreeItemsRemaining_Text5[]; +extern const u8 BattlePyramid_FourItemsRemaining_Text5[]; +extern const u8 BattlePyramid_FiveItemsRemaining_Text5[]; +extern const u8 BattlePyramid_SixItemsRemaining_Text5[]; +extern const u8 BattlePyramid_SevenItemsRemaining_Text5[]; +extern const u8 BattlePyramid_EightItemsRemaining_Text5[]; +extern const u8 BattlePyramid_ZeroTrainersRemaining_Text5[]; +extern const u8 BattlePyramid_OneTrainersRemaining_Text5[]; +extern const u8 BattlePyramid_TwoTrainersRemaining_Text5[]; +extern const u8 BattlePyramid_ThreeTrainersRemaining_Text5[]; +extern const u8 BattlePyramid_FourTrainersRemaining_Text5[]; +extern const u8 BattlePyramid_FiveTrainersRemaining_Text5[]; +extern const u8 BattlePyramid_SixTrainersRemaining_Text5[]; +extern const u8 BattlePyramid_SevenTrainersRemaining_Text5[]; +extern const u8 BattlePyramid_ExitHintUp_Text6[]; +extern const u8 BattlePyramid_ExitHintLeft_Text6[]; +extern const u8 BattlePyramid_ExitHintRight_Text6[]; +extern const u8 BattlePyramid_ExitHintDown_Text6[]; +extern const u8 BattlePyramid_ZeroItemsRemaining_Text6[]; +extern const u8 BattlePyramid_OneItemRemaining_Text6[]; +extern const u8 BattlePyramid_TwoItemsRemaining_Text6[]; +extern const u8 BattlePyramid_ThreeItemsRemaining_Text6[]; +extern const u8 BattlePyramid_FourItemsRemaining_Text6[]; +extern const u8 BattlePyramid_FiveItemsRemaining_Text6[]; +extern const u8 BattlePyramid_SixItemsRemaining_Text6[]; +extern const u8 BattlePyramid_SevenItemsRemaining_Text6[]; +extern const u8 BattlePyramid_EightItemsRemaining_Text6[]; +extern const u8 BattlePyramid_ZeroTrainersRemaining_Text6[]; +extern const u8 BattlePyramid_OneTrainersRemaining_Text6[]; +extern const u8 BattlePyramid_TwoTrainersRemaining_Text6[]; +extern const u8 BattlePyramid_ThreeTrainersRemaining_Text6[]; +extern const u8 BattlePyramid_FourTrainersRemaining_Text6[]; +extern const u8 BattlePyramid_FiveTrainersRemaining_Text6[]; +extern const u8 BattlePyramid_SixTrainersRemaining_Text6[]; +extern const u8 BattlePyramid_SevenTrainersRemaining_Text6[]; // PC strings extern const u8 gText_ExitFromBox[]; diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index ed911d8d96..9aa006985b 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -34,12 +34,28 @@ #include "constants/maps.h" #include "constants/moves.h" #include "constants/species.h" +#include "constants/trainers.h" extern const struct MapLayout *const gMapLayouts[]; extern const u16 gUnknown_08D856C8[][16]; #define TOTAL_ROUNDS 20 #define PICKUP_ITEMS_PER_ROUND 10 +#define FLOOR_WALKABLE_METATILE 0x28D +#define FLOOR_EXIT_METATILE 0x28E + +enum +{ + HINT_EXIT_DIRECTION, + HINT_REMAINING_ITEMS, + HINT_REMAINING_TRAINERS, + HINT_EXIT_SHORT_REMAINING_TRAINERS, + HINT_EXIT_SHORT_REMAINING_ITEMS, + HINT_EXIT_MEDIUM_REMAINING_TRAINERS, + HINT_EXIT_MEDIUM_REMAINING_ITEMS, + HINT_EXIT_FAR_REMAINING_TRAINERS, + HINT_EXIT_FAR_REMAINING_ITEMS, +}; struct PyramidWildMon { @@ -49,231 +65,238 @@ struct PyramidWildMon u16 moves[4]; }; -struct Struct_08613650 +struct PyramidFloorTemplate { - u8 unk0; - u8 unk1; + u8 numItems; + u8 numTrainers; u8 unk2; u8 unk3; u8 runMultiplier; - u8 unk5[8]; + u8 layoutOffsets[8]; }; -struct ClassMusic +struct PyramidTrainerEncounterMusic { - u8 class; - u8 music; + u8 trainerClass; + u8 trainerEncounterMusic; }; // This file's functions. -static void sub_81A8E9C(void); -static void sub_81A8F38(void); -static void sub_81A9048(void); +static void InitPyramidBag(void); +static void GetBattlePyramidData(void); +static void SetBattlePyramidData(void); static void sub_81A9134(void); -static void sub_81A917C(void); -static void sub_81A91FC(void); -static void sub_81A9254(void); -static void sub_81A9290(void); -static void sub_81A93C8(void); -static void sub_81A9414(void); -static void sub_81A9424(void); -static void sub_81A9618(void); -static void sub_81A966C(void); -static void sub_81A9684(void); -static void sub_81A975C(void); -static void sub_81A97C8(void); +static void SetBattlePyramidRewardItem(void); +static void GiveBattlePyramidRewardItem(void); +static void SeedPyramidFloor(void); +static void SetPickupItem(void); +static void HidePyramidItem(void); +static void InitPyramidFacilityTrainers(void); +static void ShowPostBattleHintText(void); +static void UpdatePyramidWinStreak(void); +static void GetInBattlePyramid(void); +static void UpdatePyramidLightRadius(void); +static void ClearPyramidPartyHeldItems(void); +static void SetPyramidFloorPalette(void); static void sub_81A9828(void); -static void sub_81A9834(void); -static void InitBagItems(u8 lvlMode); -static u8 sub_81AA9E4(void); -static u8 sub_81A9998(s32 *, u8, u8); -static void sub_81A97DC(u8 taskId); +static void RestorePlayerPartyAfterPyramid(void); +static void InitPyramidBagItems(u8 lvlMode); +static u8 GetPyramidFloorTemplateId(void); +static u8 GetPostBattleDirectionHintTextIndex(int *, u8, u8); +static void Task_SetPyramidFloorPalette(u8 taskId); static void sub_81A9B44(u16 trainerId); -static void sub_81AA96C(u8 *mapNums); -static void sub_81AA33C(u8 *, u8 *); +static void SetPyramidFloorLayoutOffsets(u8 *layoutOffsets); +static void SetPyramidEntranceAndExitSquareIds(u8 *, u8 *); static void sub_81AA398(u8); static bool8 sub_81AA4D8(u8, u8); static bool8 sub_81AA648(u8, u8); -static bool8 sub_81AA760(u8 arg0, u8 *mapNums, u8 whichMap, u8 id); -static bool8 sub_81AA810(u8 arg0, u8 x, u8 y, u8 *mapNums, u8 whichMap, u8 id); +static bool8 sub_81AA760(u8 arg0, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId); +static bool8 sub_81AA810(u8 arg0, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId); // Const rom data. #include "data/battle_frontier/battle_pyramid_level_50_wild_mons.h" #include "data/battle_frontier/battle_pyramid_open_level_wild_mons.h" -static const struct Struct_08613650 gUnknown_08613650[] = +static const struct PyramidFloorTemplate sPyramidFloorTemplates[] = { { - .unk0 = 0x07, - .unk1 = 0x03, + .numItems = 7, + .numTrainers = 3, .unk2 = 0x00, .unk3 = 0x00, .runMultiplier = 0x80, - .unk5 = {0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03} + .layoutOffsets = {0, 0, 1, 1, 2, 2, 3, 3}, }, { - .unk0 = 0x06, - .unk1 = 0x03, + .numItems = 6, + .numTrainers = 3, .unk2 = 0x00, .unk3 = 0x00, .runMultiplier = 0x80, - .unk5 = {0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04} + .layoutOffsets = {1, 1, 2, 2, 3, 3, 4, 4}, }, { - .unk0 = 0x05, - .unk1 = 0x03, + .numItems = 5, + .numTrainers = 3, .unk2 = 0x00, .unk3 = 0x00, .runMultiplier = 0x78, - .unk5 = {0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05} + .layoutOffsets = {2, 2, 3, 3, 4, 4, 5, 5}, }, { - .unk0 = 0x04, - .unk1 = 0x04, + .numItems = 4, + .numTrainers = 4, .unk2 = 0x00, .unk3 = 0x00, .runMultiplier = 0x78, - .unk5 = {0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06} + .layoutOffsets = {3, 3, 4, 4, 5, 5, 6, 6}, }, { - .unk0 = 0x04, - .unk1 = 0x04, + .numItems = 4, + .numTrainers = 4, .unk2 = 0x00, .unk3 = 0x01, .runMultiplier = 0x70, - .unk5 = {0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07} + .layoutOffsets = {4, 4, 5, 5, 6, 6, 7, 7}, }, { - .unk0 = 0x03, - .unk1 = 0x05, + .numItems = 3, + .numTrainers = 5, .unk2 = 0x00, .unk3 = 0x02, .runMultiplier = 0x70, - .unk5 = {0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c} + .layoutOffsets = {5, 6, 7, 8, 9, 10, 11, 12}, }, { - .unk0 = 0x03, - .unk1 = 0x05, + .numItems = 3, + .numTrainers = 5, .unk2 = 0x00, .unk3 = 0x00, .runMultiplier = 0x68, - .unk5 = {0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d} + .layoutOffsets = {6, 7, 8, 9, 10, 11, 12, 13}, }, { - .unk0 = 0x02, - .unk1 = 0x04, + .numItems = 2, + .numTrainers = 4, .unk2 = 0x00, .unk3 = 0x01, .runMultiplier = 0x68, - .unk5 = {0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e} + .layoutOffsets = {7, 8, 9, 10, 11, 12, 13, 14}, }, { - .unk0 = 0x04, - .unk1 = 0x05, + .numItems = 4, + .numTrainers = 5, .unk2 = 0x00, .unk3 = 0x02, .runMultiplier = 0x60, - .unk5 = {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f} + .layoutOffsets = {8, 9, 10, 11, 12, 13, 14, 15}, }, { - .unk0 = 0x03, - .unk1 = 0x06, + .numItems = 3, + .numTrainers = 6, .unk2 = 0x00, .unk3 = 0x04, .runMultiplier = 0x60, - .unk5 = {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f} + .layoutOffsets = {8, 9, 10, 11, 12, 13, 14, 15}, }, { - .unk0 = 0x02, - .unk1 = 0x03, + .numItems = 2, + .numTrainers = 3, .unk2 = 0x00, .unk3 = 0x00, .runMultiplier = 0x58, - .unk5 = {0x0c, 0x0d, 0x0e, 0x0c, 0x0d, 0x0e, 0x0c, 0x0d} + .layoutOffsets = {12, 13, 14, 12, 13, 14, 12, 13}, }, { - .unk0 = 0x04, - .unk1 = 0x05, + .numItems = 4, + .numTrainers = 5, .unk2 = 0x00, .unk3 = 0x00, .runMultiplier = 0x58, - .unk5 = {0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b} + .layoutOffsets = {11, 11, 11, 11, 11, 11, 11, 11}, }, { - .unk0 = 0x03, - .unk1 = 0x07, + .numItems = 3, + .numTrainers = 7, .unk2 = 0x00, .unk3 = 0x00, .runMultiplier = 0x50, - .unk5 = {0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c} + .layoutOffsets = {12, 12, 12, 12, 12, 12, 12, 12}, }, { - .unk0 = 0x02, - .unk1 = 0x04, + .numItems = 2, + .numTrainers = 4, .unk2 = 0x00, .unk3 = 0x00, .runMultiplier = 0x50, - .unk5 = {0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d} + .layoutOffsets = {13, 13, 13, 13, 13, 13, 13, 13}, }, { - .unk0 = 0x03, - .unk1 = 0x06, + .numItems = 3, + .numTrainers = 6, .unk2 = 0x00, .unk3 = 0x00, .runMultiplier = 0x50, - .unk5 = {0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e} + .layoutOffsets = {14, 14, 14, 14, 14, 14, 14, 14}, }, { - .unk0 = 0x03, - .unk1 = 0x08, + .numItems = 3, + .numTrainers = 8, .unk2 = 0x00, .unk3 = 0x00, .runMultiplier = 0x50, - .unk5 = {0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f} + .layoutOffsets = {15, 15, 15, 15, 15, 15, 15, 15}, } }; -static const u8 gUnknown_08613750[34][2] = +static const u8 sPyramidFloorTemplateOptions[][2] = { - {0x28, 0x00}, - {0x46, 0x01}, - {0x5a, 0x02}, - {0x64, 0x03}, - {0x23, 0x01}, - {0x37, 0x02}, - {0x4b, 0x03}, - {0x5a, 0x04}, - {0x64, 0x0a}, - {0x23, 0x02}, - {0x37, 0x03}, - {0x4b, 0x04}, - {0x5a, 0x05}, - {0x64, 0x0b}, - {0x23, 0x03}, - {0x37, 0x04}, - {0x4b, 0x05}, - {0x5a, 0x06}, - {0x64, 0x0c}, - {0x23, 0x04}, - {0x37, 0x05}, - {0x4b, 0x06}, - {0x5a, 0x07}, - {0x64, 0x0d}, - {0x23, 0x05}, - {0x37, 0x06}, - {0x4b, 0x07}, - {0x5a, 0x08}, - {0x64, 0x0e}, - {0x23, 0x06}, - {0x37, 0x07}, - {0x4b, 0x08}, - {0x5a, 0x09}, - {0x64, 0x0f} + // Floor 0 + {40, 0}, + {70, 1}, + {90, 2}, + {100, 3}, + // Floor 1 + {35, 1}, + {55, 2}, + {75, 3}, + {90, 4}, + {100, 10}, + // Floor 2 + {35, 2}, + {55, 3}, + {75, 4}, + {90, 5}, + {100, 11}, + // Floor 3 + {35, 3}, + {55, 4}, + {75, 5}, + {90, 6}, + {100, 12}, + // Floor 4 + {35, 4}, + {55, 5}, + {75, 6}, + {90, 7}, + {100, 13}, + // Floor 5 + {35, 5}, + {55, 6}, + {75, 7}, + {90, 8}, + {100, 14}, + // Floor 6 + {35, 6}, + {55, 7}, + {75, 8}, + {90, 9}, + {100, 15} }; -static const u8 gUnknown_08613794[] = +static const u8 sFloorTemplateOffsets[] = { - 0x00, 0x04, 0x09, 0x0e, 0x13, 0x18, 0x1d, 0x00 + 0, 4, 9, 14, 19, 24, 29, 0 }; static const u16 sPickupItemsLvl50[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] = @@ -324,482 +347,499 @@ static const u16 sPickupItemsLvlOpen[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] = {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, }; -static const u8 gUnknown_08613ABC[63][2] = +static const u8 sPickupItemSlots[][2] = { - {0x1f, 0x00}, - {0x2e, 0x01}, - {0x3d, 0x02}, - {0x47, 0x03}, - {0x51, 0x04}, - {0x5b, 0x05}, - {0x5e, 0x06}, - {0x61, 0x07}, - {0x64, 0x08}, - {0x0f, 0x00}, - {0x2e, 0x01}, - {0x3d, 0x02}, - {0x47, 0x03}, - {0x51, 0x04}, - {0x5b, 0x05}, - {0x5e, 0x06}, - {0x61, 0x08}, - {0x64, 0x09}, - {0x0f, 0x00}, - {0x1e, 0x01}, - {0x3d, 0x02}, - {0x47, 0x03}, - {0x51, 0x04}, - {0x5b, 0x05}, - {0x5e, 0x06}, - {0x61, 0x07}, - {0x64, 0x08}, - {0x1c, 0x00}, - {0x2b, 0x01}, - {0x3a, 0x02}, - {0x44, 0x03}, - {0x4e, 0x04}, - {0x58, 0x05}, - {0x5c, 0x07}, - {0x60, 0x08}, - {0x64, 0x09}, - {0x0f, 0x00}, - {0x2b, 0x01}, - {0x3a, 0x02}, - {0x44, 0x03}, - {0x4e, 0x04}, - {0x58, 0x05}, - {0x5c, 0x06}, - {0x60, 0x07}, - {0x64, 0x09}, - {0x0f, 0x00}, - {0x1e, 0x01}, - {0x3a, 0x02}, - {0x44, 0x03}, - {0x4e, 0x04}, - {0x58, 0x05}, - {0x5c, 0x06}, - {0x60, 0x07}, - {0x64, 0x08}, - {0x1c, 0x00}, - {0x2b, 0x01}, - {0x3a, 0x02}, - {0x44, 0x03}, - {0x4e, 0x04}, - {0x58, 0x05}, - {0x5c, 0x06}, - {0x60, 0x08}, - {0x64, 0x09}, + // Floor 0 + { 31, 0}, + { 46, 1}, + { 61, 2}, + { 71, 3}, + { 81, 4}, + { 91, 5}, + { 94, 6}, + { 97, 7}, + {100, 8}, + // Floor 1 + { 15, 0}, + { 46, 1}, + { 61, 2}, + { 71, 3}, + { 81, 4}, + { 91, 5}, + { 94, 6}, + { 97, 8}, + {100, 9}, + // Floor 2 + { 15, 0}, + { 30, 1}, + { 61, 2}, + { 71, 3}, + { 81, 4}, + { 91, 5}, + { 94, 6}, + { 97, 7}, + {100, 8}, + // Floor 3 + { 28, 0}, + { 43, 1}, + { 58, 2}, + { 68, 3}, + { 78, 4}, + { 88, 5}, + { 92, 7}, + { 96, 8}, + {100, 9}, + // Floor 4 + { 15, 0}, + { 43, 1}, + { 58, 2}, + { 68, 3}, + { 78, 4}, + { 88, 5}, + { 92, 6}, + { 96, 7}, + {100, 9}, + // Floor 5 + { 15, 0}, + { 30, 1}, + { 58, 2}, + { 68, 3}, + { 78, 4}, + { 88, 5}, + { 92, 6}, + { 96, 7}, + {100, 8}, + // Floor 6 + { 28, 0}, + { 43, 1}, + { 58, 2}, + { 68, 3}, + { 78, 4}, + { 88, 5}, + { 92, 6}, + { 96, 8}, + {100, 9}, }; -static const u8 gUnknown_08613B3A[] = {0x00, 0x09, 0x12, 0x1b, 0x24, 0x2d, 0x36}; +static const u8 sPickupItemOffsets[] = {0, 9, 18, 27, 36, 45, 54}; -static const struct ClassMusic gUnknown_08613B44[54] = +static const struct PyramidTrainerEncounterMusic sTrainerClassEncounterMusic[54] = { - {0x03, 0x06}, - {0x0b, 0x06}, - {0x0d, 0x06}, - {0x0f, 0x01}, - {0x2b, 0x04}, - {0x2d, 0x01}, - {0x24, 0x09}, - {0x29, 0x04}, - {0x05, 0x05}, - {0x18, 0x04}, - {0x2f, 0x00}, - {0x2e, 0x09}, - {0x11, 0x0c}, - {0x10, 0x0b}, - {0x1e, 0x0d}, - {0x08, 0x01}, - {0x17, 0x03}, - {0x0c, 0x04}, - {0x38, 0x04}, - {0x1c, 0x03}, - {0x1a, 0x00}, - {0x19, 0x0b}, - {0x09, 0x07}, - {0x31, 0x07}, - {0x35, 0x07}, - {0x36, 0x01}, - {0x33, 0x00}, - {0x2a, 0x03}, - {0x16, 0x0d}, - {0x0e, 0x03}, - {0x15, 0x01}, - {0x14, 0x01}, - {0x2c, 0x01}, - {0x1b, 0x02}, - {0x04, 0x01}, - {0x07, 0x03}, - {0x34, 0x05}, - {0x32, 0x00}, - {0x37, 0x02}, - {0x1d, 0x04}, - {0x22, 0x09}, - {0x1f, 0x01}, - {0x25, 0x00}, - {0x0a, 0x04}, - {0x28, 0x00}, - {0x06, 0x05}, - {0x27, 0x0b}, - {0x26, 0x00}, - {0x13, 0x00}, - {0x12, 0x02}, - {0x39, 0x08}, - {0x02, 0x0b}, - {0x20, 0x01}, - {0x21, 0x00}, + {TRAINER_CLASS_TEAM_AQUA, TRAINER_ENCOUNTER_MUSIC_AQUA}, + {TRAINER_CLASS_AQUA_ADMIN, TRAINER_ENCOUNTER_MUSIC_AQUA}, + {TRAINER_CLASS_AQUA_LEADER, TRAINER_ENCOUNTER_MUSIC_AQUA}, + {TRAINER_CLASS_AROMA_LADY, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {TRAINER_CLASS_BATTLE_GIRL, TRAINER_ENCOUNTER_MUSIC_INTENSE}, + {TRAINER_CLASS_SWIMMER_F, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {TRAINER_CLASS_POKEFAN, TRAINER_ENCOUNTER_MUSIC_TWINS}, + {TRAINER_CLASS_DRAGON_TAMER, TRAINER_ENCOUNTER_MUSIC_INTENSE}, + {TRAINER_CLASS_COOLTRAINER, TRAINER_ENCOUNTER_MUSIC_COOL}, + {TRAINER_CLASS_GUITARIST, TRAINER_ENCOUNTER_MUSIC_INTENSE}, + {TRAINER_CLASS_SAILOR, TRAINER_ENCOUNTER_MUSIC_MALE}, + {TRAINER_CLASS_TWINS, TRAINER_ENCOUNTER_MUSIC_TWINS}, + {TRAINER_CLASS_INTERVIEWER, TRAINER_ENCOUNTER_MUSIC_INTERVIEWER}, + {TRAINER_CLASS_RUIN_MANIAC, TRAINER_ENCOUNTER_MUSIC_HIKER}, + {TRAINER_CLASS_GENTLEMAN, TRAINER_ENCOUNTER_MUSIC_RICH}, + {TRAINER_CLASS_SWIMMER_M, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {TRAINER_CLASS_POKEMANIAC, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {TRAINER_CLASS_BLACK_BELT, TRAINER_ENCOUNTER_MUSIC_INTENSE}, + {TRAINER_CLASS_OLD_COUPLE, TRAINER_ENCOUNTER_MUSIC_INTENSE}, + {TRAINER_CLASS_BUG_MANIAC, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {TRAINER_CLASS_CAMPER, TRAINER_ENCOUNTER_MUSIC_MALE}, + {TRAINER_CLASS_KINDLER, TRAINER_ENCOUNTER_MUSIC_HIKER}, + {TRAINER_CLASS_TEAM_MAGMA, TRAINER_ENCOUNTER_MUSIC_MAGMA}, + {TRAINER_CLASS_MAGMA_ADMIN, TRAINER_ENCOUNTER_MUSIC_MAGMA}, + {TRAINER_CLASS_MAGMA_LEADER, TRAINER_ENCOUNTER_MUSIC_MAGMA}, + {TRAINER_CLASS_LASS, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {TRAINER_CLASS_BUG_CATCHER, TRAINER_ENCOUNTER_MUSIC_MALE}, + {TRAINER_CLASS_NINJA_BOY, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {TRAINER_CLASS_RICH_BOY, TRAINER_ENCOUNTER_MUSIC_RICH}, + {TRAINER_CLASS_HEX_MANIAC, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {TRAINER_CLASS_BEAUTY, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {TRAINER_CLASS_LADY, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {TRAINER_CLASS_PARASOL_LADY, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {TRAINER_CLASS_PICNICKER, TRAINER_ENCOUNTER_MUSIC_GIRL}, + {TRAINER_CLASS_PKMN_BREEDER, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {TRAINER_CLASS_COLLECTOR, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS}, + {TRAINER_CLASS_PKMN_RANGER, TRAINER_ENCOUNTER_MUSIC_COOL}, + {TRAINER_CLASS_PKMN_TRAINER_3, TRAINER_ENCOUNTER_MUSIC_MALE}, + {TRAINER_CLASS_YOUNG_COUPLE, TRAINER_ENCOUNTER_MUSIC_GIRL}, + {TRAINER_CLASS_PSYCHIC, TRAINER_ENCOUNTER_MUSIC_INTENSE}, + {TRAINER_CLASS_SR_AND_JR, TRAINER_ENCOUNTER_MUSIC_TWINS}, + {TRAINER_CLASS_ELITE_FOUR, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {TRAINER_CLASS_YOUNGSTER, TRAINER_ENCOUNTER_MUSIC_MALE}, + {TRAINER_CLASS_EXPERT, TRAINER_ENCOUNTER_MUSIC_INTENSE}, + {TRAINER_CLASS_TRIATHLETE, TRAINER_ENCOUNTER_MUSIC_MALE}, + {TRAINER_CLASS_BIRD_KEEPER, TRAINER_ENCOUNTER_MUSIC_COOL}, + {TRAINER_CLASS_FISHERMAN, TRAINER_ENCOUNTER_MUSIC_HIKER}, + {TRAINER_CLASS_CHAMPION, TRAINER_ENCOUNTER_MUSIC_MALE}, + {TRAINER_CLASS_TUBER_M, TRAINER_ENCOUNTER_MUSIC_MALE}, + {TRAINER_CLASS_TUBER_F, TRAINER_ENCOUNTER_MUSIC_GIRL}, + {TRAINER_CLASS_SIS_AND_BRO, TRAINER_ENCOUNTER_MUSIC_SWIMMER}, + {TRAINER_CLASS_HIKER, TRAINER_ENCOUNTER_MUSIC_HIKER}, + {TRAINER_CLASS_LEADER, TRAINER_ENCOUNTER_MUSIC_FEMALE}, + {TRAINER_CLASS_SCHOOL_KID, TRAINER_ENCOUNTER_MUSIC_MALE}, }; -static const u8 gUnknown_08613C1C[50][2] = +static const u8 sTrainerTextGroups[50][2] = { - {0x0d, 0x03}, - {0x0e, 0x04}, - {0x10, 0x01}, - {0x11, 0x00}, - {0x03, 0x02}, - {0x12, 0x03}, - {0x0c, 0x03}, - {0x13, 0x03}, - {0x14, 0x03}, - {0x15, 0x02}, - {0x17, 0x02}, - {0x07, 0x02}, - {0x0a, 0x04}, - {0x19, 0x02}, - {0x1a, 0x02}, - {0x1b, 0x00}, - {0x1d, 0x02}, - {0x1e, 0x02}, - {0x1f, 0x03}, - {0x20, 0x04}, - {0x26, 0x00}, - {0x27, 0x01}, - {0x29, 0x04}, - {0x2a, 0x05}, - {0x09, 0x04}, - {0x16, 0x05}, - {0x2b, 0x00}, - {0x2d, 0x04}, - {0x2e, 0x02}, - {0x30, 0x02}, - {0x32, 0x02}, - {0x31, 0x03}, - {0x2f, 0x03}, - {0x33, 0x03}, - {0x34, 0x02}, - {0x04, 0x02}, - {0x35, 0x00}, - {0x36, 0x03}, - {0x37, 0x03}, - {0x38, 0x03}, - {0x1c, 0x01}, - {0x3a, 0x02}, - {0x05, 0x02}, - {0x42, 0x02}, - {0x02, 0x03}, - {0x44, 0x02}, - {0x45, 0x03}, - {0x47, 0x03}, - {0x43, 0x00}, - {0x00, 0x04}, + {FACILITY_CLASS_AROMA_LADY, 3}, + {FACILITY_CLASS_RUIN_MANIAC, 4}, + {FACILITY_CLASS_TUBER_F, 1}, + {FACILITY_CLASS_TUBER_M, 0}, + {FACILITY_CLASS_COOLTRAINER_M, 2}, + {FACILITY_CLASS_COOLTRAINER_F, 3}, + {FACILITY_CLASS_HEX_MANIAC, 3}, + {FACILITY_CLASS_LADY, 3}, + {FACILITY_CLASS_BEAUTY, 3}, + {FACILITY_CLASS_RICH_BOY, 2}, + {FACILITY_CLASS_POKEMANIAC, 2}, + {FACILITY_CLASS_SWIMMER_M, 2}, + {FACILITY_CLASS_BLACK_BELT, 4}, + {FACILITY_CLASS_GUITARIST, 2}, + {FACILITY_CLASS_KINDLER, 2}, + {FACILITY_CLASS_CAMPER, 0}, + {FACILITY_CLASS_BUG_MANIAC, 2}, + {FACILITY_CLASS_PSYCHIC_M, 2}, + {FACILITY_CLASS_PSYCHIC_F, 3}, + {FACILITY_CLASS_GENTLEMAN, 4}, + {FACILITY_CLASS_SCHOOL_KID_M, 0}, + {FACILITY_CLASS_SCHOOL_KID_F, 1}, + {FACILITY_CLASS_POKEFAN_M, 4}, + {FACILITY_CLASS_POKEFAN_F, 5}, + {FACILITY_CLASS_EXPERT_M, 4}, + {FACILITY_CLASS_EXPERT_F, 5}, + {FACILITY_CLASS_YOUNGSTER, 0}, + {FACILITY_CLASS_FISHERMAN, 4}, + {FACILITY_CLASS_CYCLING_TRIATHLETE_M, 2}, + {FACILITY_CLASS_RUNNING_TRIATHLETE_M, 2}, + {FACILITY_CLASS_SWIMMING_TRIATHLETE_M, 2}, + {FACILITY_CLASS_RUNNING_TRIATHLETE_F, 3}, + {FACILITY_CLASS_CYCLING_TRIATHLETE_F, 3}, + {FACILITY_CLASS_SWIMMING_TRIATHLETE_F, 3}, + {FACILITY_CLASS_DRAGON_TAMER, 2}, + {FACILITY_CLASS_BIRD_KEEPER, 2}, + {FACILITY_CLASS_NINJA_BOY, 0}, + {FACILITY_CLASS_BATTLE_GIRL, 3}, + {FACILITY_CLASS_PARASOL_LADY, 3}, + {FACILITY_CLASS_SWIMMER_F, 3}, + {FACILITY_CLASS_PICNICKER, 1}, + {FACILITY_CLASS_SAILOR, 2}, + {FACILITY_CLASS_COLLECTOR, 2}, + {FACILITY_CLASS_PKMN_BREEDER_M, 2}, + {FACILITY_CLASS_POKEMON_BREEDER_F, 3}, + {FACILITY_CLASS_PKMN_RANGER_M, 2}, + {FACILITY_CLASS_PKMN_RANGER_F, 3}, + {FACILITY_CLASS_LASS, 3}, + {FACILITY_CLASS_BUG_CATCHER, 0}, + {FACILITY_CLASS_HIKER, 4}, }; -static const u8 *const gUnknown_08613C80[] = +static const u8 *const sExitDirectionHintTexts1[] = { - BattleFrontier_BattlePyramidEmptySquare_Text_252D2D, - BattleFrontier_BattlePyramidEmptySquare_Text_252D57, - BattleFrontier_BattlePyramidEmptySquare_Text_252D81, - BattleFrontier_BattlePyramidEmptySquare_Text_252DAB, + BattlePyramid_ExitHintUp_Text1, + BattlePyramid_ExitHintLeft_Text1, + BattlePyramid_ExitHintRight_Text1, + BattlePyramid_ExitHintDown_Text1, }; -static const u8 *const gUnknown_08613C90[] = +static const u8 *const sRemainingItemsHintTexts1[] = { - BattleFrontier_BattlePyramidEmptySquare_Text_25330B, - BattleFrontier_BattlePyramidEmptySquare_Text_2532CC, - BattleFrontier_BattlePyramidEmptySquare_Text_25328B, - BattleFrontier_BattlePyramidEmptySquare_Text_253248, - BattleFrontier_BattlePyramidEmptySquare_Text_253206, - BattleFrontier_BattlePyramidEmptySquare_Text_2531C4, - BattleFrontier_BattlePyramidEmptySquare_Text_253183, - BattleFrontier_BattlePyramidEmptySquare_Text_253140, - BattleFrontier_BattlePyramidEmptySquare_Text_2530FD, + BattlePyramid_ZeroItemsRemaining_Text1, + BattlePyramid_OneItemRemaining_Text1, + BattlePyramid_TwoItemsRemaining_Text1, + BattlePyramid_ThreeItemsRemaining_Text1, + BattlePyramid_FourItemsRemaining_Text1, + BattlePyramid_FiveItemsRemaining_Text1, + BattlePyramid_SixItemsRemaining_Text1, + BattlePyramid_SevenItemsRemaining_Text1, + BattlePyramid_EightItemsRemaining_Text1, }; -static const u8 *const gUnknown_08613CB4[] = +static const u8 *const sRemainingTrainersHintTexts1[] = { - BattleFrontier_BattlePyramidEmptySquare_Text_2544A6, - BattleFrontier_BattlePyramidEmptySquare_Text_25445A, - BattleFrontier_BattlePyramidEmptySquare_Text_25440B, - BattleFrontier_BattlePyramidEmptySquare_Text_2543BA, - BattleFrontier_BattlePyramidEmptySquare_Text_25436A, - BattleFrontier_BattlePyramidEmptySquare_Text_25431A, - BattleFrontier_BattlePyramidEmptySquare_Text_2542CB, - BattleFrontier_BattlePyramidEmptySquare_Text_25427A, + BattlePyramid_ZeroTrainersRemaining_Text1, + BattlePyramid_OneTrainersRemaining_Text1, + BattlePyramid_TwoTrainersRemaining_Text1, + BattlePyramid_ThreeTrainersRemaining_Text1, + BattlePyramid_FourTrainersRemaining_Text1, + BattlePyramid_FiveTrainersRemaining_Text1, + BattlePyramid_SixTrainersRemaining_Text1, + BattlePyramid_SevenTrainersRemaining_Text1, }; -static const u8 *const gUnknown_08613CD4[] = +static const u8 *const sExitDirectionHintTexts2[] = { - BattleFrontier_BattlePyramidEmptySquare_Text_252DD5, - BattleFrontier_BattlePyramidEmptySquare_Text_252E03, - BattleFrontier_BattlePyramidEmptySquare_Text_252E31, - BattleFrontier_BattlePyramidEmptySquare_Text_252E5F, + BattlePyramid_ExitHintUp_Text2, + BattlePyramid_ExitHintLeft_Text2, + BattlePyramid_ExitHintRight_Text2, + BattlePyramid_ExitHintDown_Text2, }; -static const u8 *const gUnknown_08613CE4[] = +static const u8 *const sRemainingItemsHintTexts2[] = { - BattleFrontier_BattlePyramidEmptySquare_Text_25362E, - BattleFrontier_BattlePyramidEmptySquare_Text_2535D4, - BattleFrontier_BattlePyramidEmptySquare_Text_253578, - BattleFrontier_BattlePyramidEmptySquare_Text_25351A, - BattleFrontier_BattlePyramidEmptySquare_Text_2534BD, - BattleFrontier_BattlePyramidEmptySquare_Text_253460, - BattleFrontier_BattlePyramidEmptySquare_Text_253404, - BattleFrontier_BattlePyramidEmptySquare_Text_2533A6, - BattleFrontier_BattlePyramidEmptySquare_Text_25334D, + BattlePyramid_ZeroItemsRemaining_Text2, + BattlePyramid_OneItemRemaining_Text2, + BattlePyramid_TwoItemsRemaining_Text2, + BattlePyramid_ThreeItemsRemaining_Text2, + BattlePyramid_FourItemsRemaining_Text2, + BattlePyramid_FiveItemsRemaining_Text2, + BattlePyramid_SixItemsRemaining_Text2, + BattlePyramid_SevenItemsRemaining_Text2, + BattlePyramid_EightItemsRemaining_Text2, }; -static const u8 *const gUnknown_08613D08[] = +static const u8 *const sRemainingTrainersHintTexts2[] = { - BattleFrontier_BattlePyramidEmptySquare_Text_25471E, - BattleFrontier_BattlePyramidEmptySquare_Text_2546CC, - BattleFrontier_BattlePyramidEmptySquare_Text_25467C, - BattleFrontier_BattlePyramidEmptySquare_Text_25462A, - BattleFrontier_BattlePyramidEmptySquare_Text_2545D9, - BattleFrontier_BattlePyramidEmptySquare_Text_254588, - BattleFrontier_BattlePyramidEmptySquare_Text_254538, - BattleFrontier_BattlePyramidEmptySquare_Text_2544E6, + BattlePyramid_ZeroTrainersRemaining_Text2, + BattlePyramid_OneTrainersRemaining_Text2, + BattlePyramid_TwoTrainersRemaining_Text2, + BattlePyramid_ThreeTrainersRemaining_Text2, + BattlePyramid_FourTrainersRemaining_Text2, + BattlePyramid_FiveTrainersRemaining_Text2, + BattlePyramid_SixTrainersRemaining_Text2, + BattlePyramid_SevenTrainersRemaining_Text2, }; -static const u8 *const gUnknown_08613D28[] = +static const u8 *const sExitDirectionHintTexts3[] = { - BattleFrontier_BattlePyramidEmptySquare_Text_252E8D, - BattleFrontier_BattlePyramidEmptySquare_Text_252EAA, - BattleFrontier_BattlePyramidEmptySquare_Text_252EC7, - BattleFrontier_BattlePyramidEmptySquare_Text_252EE4, + BattlePyramid_ExitHintUp_Text3, + BattlePyramid_ExitHintLeft_Text3, + BattlePyramid_ExitHintRight_Text3, + BattlePyramid_ExitHintDown_Text3, }; -static const u8 *const gUnknown_08613D38[] = +static const u8 *const sRemainingItemsHintTexts3[] = { - BattleFrontier_BattlePyramidEmptySquare_Text_2539EC, - BattleFrontier_BattlePyramidEmptySquare_Text_253980, - BattleFrontier_BattlePyramidEmptySquare_Text_253915, - BattleFrontier_BattlePyramidEmptySquare_Text_2538A8, - BattleFrontier_BattlePyramidEmptySquare_Text_25383C, - BattleFrontier_BattlePyramidEmptySquare_Text_2537D0, - BattleFrontier_BattlePyramidEmptySquare_Text_253765, - BattleFrontier_BattlePyramidEmptySquare_Text_2536F8, - BattleFrontier_BattlePyramidEmptySquare_Text_25368B, + BattlePyramid_ZeroItemsRemaining_Text3, + BattlePyramid_OneItemRemaining_Text3, + BattlePyramid_TwoItemsRemaining_Text3, + BattlePyramid_ThreeItemsRemaining_Text3, + BattlePyramid_FourItemsRemaining_Text3, + BattlePyramid_FiveItemsRemaining_Text3, + BattlePyramid_SixItemsRemaining_Text3, + BattlePyramid_SevenItemsRemaining_Text3, + BattlePyramid_EightItemsRemaining_Text3, }; -static const u8 *const gUnknown_08613D5C[] = +static const u8 *const sRemainingTrainersHintTexts3[] = { - BattleFrontier_BattlePyramidEmptySquare_Text_254A0B, - BattleFrontier_BattlePyramidEmptySquare_Text_2549AE, - BattleFrontier_BattlePyramidEmptySquare_Text_25494D, - BattleFrontier_BattlePyramidEmptySquare_Text_2548EB, - BattleFrontier_BattlePyramidEmptySquare_Text_25488A, - BattleFrontier_BattlePyramidEmptySquare_Text_254829, - BattleFrontier_BattlePyramidEmptySquare_Text_2547C9, - BattleFrontier_BattlePyramidEmptySquare_Text_254767, + BattlePyramid_ZeroTrainersRemaining_Text3, + BattlePyramid_OneTrainersRemaining_Text3, + BattlePyramid_TwoTrainersRemaining_Text3, + BattlePyramid_ThreeTrainersRemaining_Text3, + BattlePyramid_FourTrainersRemaining_Text3, + BattlePyramid_FiveTrainersRemaining_Text3, + BattlePyramid_SixTrainersRemaining_Text3, + BattlePyramid_SevenTrainersRemaining_Text3, }; -static const u8 *const gUnknown_08613D7C[] = +static const u8 *const sExitDirectionHintTexts4[] = { - BattleFrontier_BattlePyramidEmptySquare_Text_252F01, - BattleFrontier_BattlePyramidEmptySquare_Text_252F3A, - BattleFrontier_BattlePyramidEmptySquare_Text_252F73, - BattleFrontier_BattlePyramidEmptySquare_Text_252FAC, + BattlePyramid_ExitHintUp_Text4, + BattlePyramid_ExitHintLeft_Text4, + BattlePyramid_ExitHintRight_Text4, + BattlePyramid_ExitHintDown_Text4, }; -static const u8 *const gUnknown_08613D8C[] = +static const u8 *const sRemainingItemsHintTexts4[] = { - BattleFrontier_BattlePyramidEmptySquare_Text_253D3E, - BattleFrontier_BattlePyramidEmptySquare_Text_253CE0, - BattleFrontier_BattlePyramidEmptySquare_Text_253C87, - BattleFrontier_BattlePyramidEmptySquare_Text_253C2C, - BattleFrontier_BattlePyramidEmptySquare_Text_253BD2, - BattleFrontier_BattlePyramidEmptySquare_Text_253B78, - BattleFrontier_BattlePyramidEmptySquare_Text_253B1F, - BattleFrontier_BattlePyramidEmptySquare_Text_253AC4, - BattleFrontier_BattlePyramidEmptySquare_Text_253A69, + BattlePyramid_ZeroItemsRemaining_Text4, + BattlePyramid_OneItemRemaining_Text4, + BattlePyramid_TwoItemsRemaining_Text4, + BattlePyramid_ThreeItemsRemaining_Text4, + BattlePyramid_FourItemsRemaining_Text4, + BattlePyramid_FiveItemsRemaining_Text4, + BattlePyramid_SixItemsRemaining_Text4, + BattlePyramid_SevenItemsRemaining_Text4, + BattlePyramid_EightItemsRemaining_Text4, }; -static const u8 *const gUnknown_08613DB0[] = +static const u8 *const sRemainingTrainersHintTexts4[] = { - BattleFrontier_BattlePyramidEmptySquare_Text_254C3E, - BattleFrontier_BattlePyramidEmptySquare_Text_254BF1, - BattleFrontier_BattlePyramidEmptySquare_Text_254BAE, - BattleFrontier_BattlePyramidEmptySquare_Text_254B69, - BattleFrontier_BattlePyramidEmptySquare_Text_254B25, - BattleFrontier_BattlePyramidEmptySquare_Text_254AE1, - BattleFrontier_BattlePyramidEmptySquare_Text_254A9E, - BattleFrontier_BattlePyramidEmptySquare_Text_254A59, + BattlePyramid_ZeroTrainersRemaining_Text4, + BattlePyramid_OneTrainersRemaining_Text4, + BattlePyramid_TwoTrainersRemaining_Text4, + BattlePyramid_ThreeTrainersRemaining_Text4, + BattlePyramid_FourTrainersRemaining_Text4, + BattlePyramid_FiveTrainersRemaining_Text4, + BattlePyramid_SixTrainersRemaining_Text4, + BattlePyramid_SevenTrainersRemaining_Text4, }; -static const u8 *const gUnknown_08613DD0[] = +static const u8 *const sExitDirectionHintTexts5[] = { - BattleFrontier_BattlePyramidEmptySquare_Text_252FE5, - BattleFrontier_BattlePyramidEmptySquare_Text_253000, - BattleFrontier_BattlePyramidEmptySquare_Text_25301B, - BattleFrontier_BattlePyramidEmptySquare_Text_253036, + BattlePyramid_ExitHintUp_Text5, + BattlePyramid_ExitHintLeft_Text5, + BattlePyramid_ExitHintRight_Text5, + BattlePyramid_ExitHintDown_Text5, }; -static const u8 *const gUnknown_08613DE0[] = +static const u8 *const sRemainingItemsHintTexts5[] = { - BattleFrontier_BattlePyramidEmptySquare_Text_253F6C, - BattleFrontier_BattlePyramidEmptySquare_Text_253F34, - BattleFrontier_BattlePyramidEmptySquare_Text_253EFA, - BattleFrontier_BattlePyramidEmptySquare_Text_253EBE, - BattleFrontier_BattlePyramidEmptySquare_Text_253E83, - BattleFrontier_BattlePyramidEmptySquare_Text_253E48, - BattleFrontier_BattlePyramidEmptySquare_Text_253E0E, - BattleFrontier_BattlePyramidEmptySquare_Text_253DD2, - BattleFrontier_BattlePyramidEmptySquare_Text_253D96, + BattlePyramid_ZeroItemsRemaining_Text5, + BattlePyramid_OneItemRemaining_Text5, + BattlePyramid_TwoItemsRemaining_Text5, + BattlePyramid_ThreeItemsRemaining_Text5, + BattlePyramid_FourItemsRemaining_Text5, + BattlePyramid_FiveItemsRemaining_Text5, + BattlePyramid_SixItemsRemaining_Text5, + BattlePyramid_SevenItemsRemaining_Text5, + BattlePyramid_EightItemsRemaining_Text5, }; -static const u8 *const gUnknown_08613E04[] = +static const u8 *const sRemainingTrainersHintTexts5[] = { - BattleFrontier_BattlePyramidEmptySquare_Text_254E6E, - BattleFrontier_BattlePyramidEmptySquare_Text_254E27, - BattleFrontier_BattlePyramidEmptySquare_Text_254DE0, - BattleFrontier_BattlePyramidEmptySquare_Text_254D97, - BattleFrontier_BattlePyramidEmptySquare_Text_254D4F, - BattleFrontier_BattlePyramidEmptySquare_Text_254D07, - BattleFrontier_BattlePyramidEmptySquare_Text_254CC0, - BattleFrontier_BattlePyramidEmptySquare_Text_254C77, + BattlePyramid_ZeroTrainersRemaining_Text5, + BattlePyramid_OneTrainersRemaining_Text5, + BattlePyramid_TwoTrainersRemaining_Text5, + BattlePyramid_ThreeTrainersRemaining_Text5, + BattlePyramid_FourTrainersRemaining_Text5, + BattlePyramid_FiveTrainersRemaining_Text5, + BattlePyramid_SixTrainersRemaining_Text5, + BattlePyramid_SevenTrainersRemaining_Text5, }; -static const u8 *const gUnknown_08613E24[] = +static const u8 *const sExitDirectionHintTexts6[] = { - BattleFrontier_BattlePyramidEmptySquare_Text_253051, - BattleFrontier_BattlePyramidEmptySquare_Text_25307C, - BattleFrontier_BattlePyramidEmptySquare_Text_2530A7, - BattleFrontier_BattlePyramidEmptySquare_Text_2530D2, + BattlePyramid_ExitHintUp_Text6, + BattlePyramid_ExitHintLeft_Text6, + BattlePyramid_ExitHintRight_Text6, + BattlePyramid_ExitHintDown_Text6, }; -static const u8 *const gUnknown_08613E34[] = +static const u8 *const sRemainingItemsHintTexts6[] = { - BattleFrontier_BattlePyramidEmptySquare_Text_25422B, - BattleFrontier_BattlePyramidEmptySquare_Text_2541DD, - BattleFrontier_BattlePyramidEmptySquare_Text_25418D, - BattleFrontier_BattlePyramidEmptySquare_Text_25413B, - BattleFrontier_BattlePyramidEmptySquare_Text_2540EA, - BattleFrontier_BattlePyramidEmptySquare_Text_254099, - BattleFrontier_BattlePyramidEmptySquare_Text_254049, - BattleFrontier_BattlePyramidEmptySquare_Text_253FF7, - BattleFrontier_BattlePyramidEmptySquare_Text_253FA5, + BattlePyramid_ZeroItemsRemaining_Text6, + BattlePyramid_OneItemRemaining_Text6, + BattlePyramid_TwoItemsRemaining_Text6, + BattlePyramid_ThreeItemsRemaining_Text6, + BattlePyramid_FourItemsRemaining_Text6, + BattlePyramid_FiveItemsRemaining_Text6, + BattlePyramid_SixItemsRemaining_Text6, + BattlePyramid_SevenItemsRemaining_Text6, + BattlePyramid_EightItemsRemaining_Text6, }; -static const u8 *const gUnknown_08613E58[] = +static const u8 *const sRemainingTrainersHintTexts6[] = { - BattleFrontier_BattlePyramidEmptySquare_Text_255068, - BattleFrontier_BattlePyramidEmptySquare_Text_25502F, - BattleFrontier_BattlePyramidEmptySquare_Text_254FF6, - BattleFrontier_BattlePyramidEmptySquare_Text_254FBB, - BattleFrontier_BattlePyramidEmptySquare_Text_254F81, - BattleFrontier_BattlePyramidEmptySquare_Text_254F47, - BattleFrontier_BattlePyramidEmptySquare_Text_254F0E, - BattleFrontier_BattlePyramidEmptySquare_Text_254ED3, + BattlePyramid_ZeroTrainersRemaining_Text6, + BattlePyramid_OneTrainersRemaining_Text6, + BattlePyramid_TwoTrainersRemaining_Text6, + BattlePyramid_ThreeTrainersRemaining_Text6, + BattlePyramid_FourTrainersRemaining_Text6, + BattlePyramid_FiveTrainersRemaining_Text6, + BattlePyramid_SixTrainersRemaining_Text6, + BattlePyramid_SevenTrainersRemaining_Text6, }; -static const u8 *const *const gUnknown_08613E78[] = +static const u8 *const *const sPostBattleHintTexts1[] = { - gUnknown_08613C80, - gUnknown_08613C90, - gUnknown_08613CB4, + sExitDirectionHintTexts1, + sRemainingItemsHintTexts1, + sRemainingTrainersHintTexts1, }; -static const u8 *const *const gUnknown_08613E84[] = +static const u8 *const *const sPostBattleHintTexts2[] = { - gUnknown_08613CD4, - gUnknown_08613CE4, - gUnknown_08613D08, + sExitDirectionHintTexts2, + sRemainingItemsHintTexts2, + sRemainingTrainersHintTexts2, }; -static const u8 *const *const gUnknown_08613E90[] = +static const u8 *const *const sPostBattleHintTexts3[] = { - gUnknown_08613D28, - gUnknown_08613D38, - gUnknown_08613D5C, + sExitDirectionHintTexts3, + sRemainingItemsHintTexts3, + sRemainingTrainersHintTexts3, }; -static const u8 *const *const gUnknown_08613E9C[] = +static const u8 *const *const sPostBattleHintTexts4[] = { - gUnknown_08613D7C, - gUnknown_08613D8C, - gUnknown_08613DB0, + sExitDirectionHintTexts4, + sRemainingItemsHintTexts4, + sRemainingTrainersHintTexts4, }; -static const u8 *const *const gUnknown_08613EA8[] = +static const u8 *const *const sPostBattleHintTexts5[] = { - gUnknown_08613DD0, - gUnknown_08613DE0, - gUnknown_08613E04, + sExitDirectionHintTexts5, + sRemainingItemsHintTexts5, + sRemainingTrainersHintTexts5, }; -static const u8 *const *const gUnknown_08613EB4[] = +static const u8 *const *const sPostBattleHintTexts6[] = { - gUnknown_08613E24, - gUnknown_08613E34, - gUnknown_08613E58, + sExitDirectionHintTexts6, + sRemainingItemsHintTexts6, + sRemainingTrainersHintTexts6, }; -static const u8 *const *const *const gUnknown_08613EC0[] = +static const u8 *const *const *const sPostBattleTexts[] = { - gUnknown_08613E78, - gUnknown_08613E84, - gUnknown_08613E90, - gUnknown_08613E9C, - gUnknown_08613EA8, - gUnknown_08613EB4, + sPostBattleHintTexts1, + sPostBattleHintTexts2, + sPostBattleHintTexts3, + sPostBattleHintTexts4, + sPostBattleHintTexts5, + sPostBattleHintTexts6, }; -static const u8 gUnknown_08613ED8[] = {3, 4, 5, 6, 7, 8, 3, 4}; +static const u8 sHintTextTypes[] = +{ + HINT_EXIT_SHORT_REMAINING_TRAINERS, + HINT_EXIT_SHORT_REMAINING_ITEMS, + HINT_EXIT_MEDIUM_REMAINING_TRAINERS, + HINT_EXIT_MEDIUM_REMAINING_ITEMS, + HINT_EXIT_FAR_REMAINING_TRAINERS, + HINT_EXIT_FAR_REMAINING_ITEMS, + HINT_EXIT_SHORT_REMAINING_TRAINERS, + HINT_EXIT_SHORT_REMAINING_ITEMS, +}; static void (* const sBattlePyramidFunctions[])(void) = { - sub_81A8E9C, - sub_81A8F38, - sub_81A9048, + InitPyramidBag, + GetBattlePyramidData, + SetBattlePyramidData, sub_81A9134, - sub_81A917C, - sub_81A91FC, - sub_81A9254, - sub_81A9290, - sub_81A93C8, - sub_81A9414, - sub_81A9424, - sub_81A9618, - sub_81A966C, - sub_81A9684, - sub_81A975C, - sub_81A97C8, + SetBattlePyramidRewardItem, + GiveBattlePyramidRewardItem, + SeedPyramidFloor, + SetPickupItem, + HidePyramidItem, + InitPyramidFacilityTrainers, + ShowPostBattleHintText, + UpdatePyramidWinStreak, + GetInBattlePyramid, + UpdatePyramidLightRadius, + ClearPyramidPartyHeldItems, + SetPyramidFloorPalette, sub_81A9828, - sub_81A9834, + RestorePlayerPartyAfterPyramid, }; -static const u16 gUnknown_08613F28[] = {ITEM_HP_UP, ITEM_PROTEIN, ITEM_IRON, ITEM_CALCIUM, ITEM_CARBOS, ITEM_ZINC}; -static const u16 gUnknown_08613F34[] = {ITEM_BRIGHT_POWDER, ITEM_WHITE_HERB, ITEM_QUICK_CLAW, ITEM_LEFTOVERS, ITEM_MENTAL_HERB, ITEM_KINGS_ROCK, ITEM_FOCUS_BAND, ITEM_SCOPE_LENS, ITEM_CHOICE_BAND}; +static const u16 sShortStreakRewardItems[] = {ITEM_HP_UP, ITEM_PROTEIN, ITEM_IRON, ITEM_CALCIUM, ITEM_CARBOS, ITEM_ZINC}; +static const u16 sLongStreakRewardItems[] = {ITEM_BRIGHT_POWDER, ITEM_WHITE_HERB, ITEM_QUICK_CLAW, ITEM_LEFTOVERS, ITEM_MENTAL_HERB, ITEM_KINGS_ROCK, ITEM_FOCUS_BAND, ITEM_SCOPE_LENS, ITEM_CHOICE_BAND}; -static const u8 gUnknown_08613F46[][4] = +static const u8 sBorderedSquareIds[][4] = { - {0x01, 0x04, 0xff, 0xff}, - {0x00, 0x02, 0x05, 0xff}, - {0x01, 0x03, 0x06, 0xff}, - {0x02, 0x07, 0xff, 0xff}, - {0x00, 0x05, 0x08, 0xff}, - {0x01, 0x04, 0x06, 0x09}, - {0x02, 0x05, 0x07, 0x0a}, - {0x03, 0x06, 0x0b, 0xff}, - {0x04, 0x09, 0x0c, 0xff}, - {0x05, 0x08, 0x0a, 0x0d}, - {0x06, 0x09, 0x0b, 0x0e}, - {0x07, 0x0a, 0x0f, 0xff}, - {0x08, 0x0d, 0xff, 0xff}, - {0x09, 0x0c, 0x0e, 0xff}, - {0x0a, 0x0d, 0x0f, 0xff}, - {0x0b, 0x0e, 0xff, 0xff}, + {1, 4, -1, -1}, + {0, 2, 5, -1}, + {1, 3, 6, -1}, + {2, 7, -1, -1}, + {0, 5, 8, -1}, + {1, 4, 6, 9}, + {2, 5, 7, 10}, + {3, 6, 11, -1}, + {4, 9, 12, -1}, + {5, 8, 10, 13}, + {6, 9, 11, 14}, + {7, 10, 15, -1}, + {8, 13, -1, -1}, + {9, 12, 14, -1}, + {10, 13, 15, -1}, + {11, 14, -1, -1}, }; static const u8 sPickupPercentages[PICKUP_ITEMS_PER_ROUND] = {30, 40, 50, 60, 70, 80, 85, 90, 95, 100}; @@ -810,7 +850,7 @@ void CallBattlePyramidFunction(void) sBattlePyramidFunctions[gSpecialVar_0x8004](); } -static void sub_81A8E9C(void) +static void InitPyramidBag(void) { bool32 isCurrent; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; @@ -826,22 +866,22 @@ static void sub_81A8E9C(void) if (!isCurrent) { gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode] = 0; - InitBagItems(lvlMode); + InitPyramidBagItems(lvlMode); } - sub_81C4EEC(); + InitBattlePyramidBagCursorPosition(); gTrainerBattleOpponent_A = 0; gBattleOutcome = 0; } -static void sub_81A8F38(void) +static void GetBattlePyramidData(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; switch (gSpecialVar_0x8005) { case 0: - gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_E18; + gSpecialVar_Result = gSaveBlock2Ptr->frontier.pyramidRewardItem; break; case 1: gSpecialVar_Result = gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode]; @@ -867,14 +907,14 @@ static void sub_81A8F38(void) } } -static void sub_81A9048(void) +static void SetBattlePyramidData(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; switch (gSpecialVar_0x8005) { case 0: - gSaveBlock2Ptr->frontier.field_E18 = gSpecialVar_0x8006; + gSaveBlock2Ptr->frontier.pyramidRewardItem = gSpecialVar_0x8006; break; case 1: gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode] = gSpecialVar_0x8006; @@ -896,7 +936,7 @@ static void sub_81A9048(void) } break; case 7: - gSaveBlock2Ptr->frontier.field_E2A = gSpecialVar_0x8006; + gSaveBlock2Ptr->frontier.pyramidTrainerFlags = gSpecialVar_0x8006; break; } } @@ -910,22 +950,22 @@ static void sub_81A9134(void) TrySavingData(SAVE_LINK); } -static void sub_81A917C(void) +static void SetBattlePyramidRewardItem(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; if (gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode] > 41) - gSaveBlock2Ptr->frontier.field_E18 = gUnknown_08613F34[Random() % ARRAY_COUNT(gUnknown_08613F34)]; + gSaveBlock2Ptr->frontier.pyramidRewardItem = sLongStreakRewardItems[Random() % ARRAY_COUNT(sLongStreakRewardItems)]; else - gSaveBlock2Ptr->frontier.field_E18 = gUnknown_08613F28[Random() % ARRAY_COUNT(gUnknown_08613F28)]; + gSaveBlock2Ptr->frontier.pyramidRewardItem = sShortStreakRewardItems[Random() % ARRAY_COUNT(sShortStreakRewardItems)]; } -static void sub_81A91FC(void) +static void GiveBattlePyramidRewardItem(void) { - if (AddBagItem(gSaveBlock2Ptr->frontier.field_E18, 1) == TRUE) + if (AddBagItem(gSaveBlock2Ptr->frontier.pyramidRewardItem, 1) == TRUE) { - CopyItemName(gSaveBlock2Ptr->frontier.field_E18, gStringVar1); - gSaveBlock2Ptr->frontier.field_E18 = 0; + CopyItemName(gSaveBlock2Ptr->frontier.pyramidRewardItem, gStringVar1); + gSaveBlock2Ptr->frontier.pyramidRewardItem = 0; gSpecialVar_Result = TRUE; } else @@ -934,21 +974,21 @@ static void sub_81A91FC(void) } } -static void sub_81A9254(void) +static void SeedPyramidFloor(void) { - s32 i; + int i; for (i = 0; i < 4; i++) - gSaveBlock2Ptr->frontier.field_E22[i] = Random(); + gSaveBlock2Ptr->frontier.pyramidRandoms[i] = Random(); - gSaveBlock2Ptr->frontier.field_E2A = 0; + gSaveBlock2Ptr->frontier.pyramidTrainerFlags = 0; } -static void sub_81A9290(void) +static void SetPickupItem(void) { - s32 i; - s32 r7; - s32 rand; + int i; + int itemIndex; + int rand; u8 id; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 floor = gSaveBlock2Ptr->frontier.curChallengeBattleNum; @@ -957,37 +997,39 @@ static void sub_81A9290(void) if (round >= TOTAL_ROUNDS) round = TOTAL_ROUNDS - 1; - id = sub_81AA9E4(); - r7 = (gSpecialVar_LastTalked - gUnknown_08613650[id].unk1) - 1; - rand = gSaveBlock2Ptr->frontier.field_E22[r7 / 2]; + id = GetPyramidFloorTemplateId(); + itemIndex = (gSpecialVar_LastTalked - sPyramidFloorTemplates[id].numTrainers) - 1; + rand = gSaveBlock2Ptr->frontier.pyramidRandoms[itemIndex / 2]; SeedRng2(rand); - for (i = 0; i < r7 + 1; i++) + for (i = 0; i < itemIndex + 1; i++) rand = Random2() % 100; - for (i = gUnknown_08613B3A[floor]; i < ARRAY_COUNT(gUnknown_08613ABC); i++) + for (i = sPickupItemOffsets[floor]; i < ARRAY_COUNT(sPickupItemSlots); i++) { - if (rand < gUnknown_08613ABC[i][0]) + if (rand < sPickupItemSlots[i][0]) break; } if (lvlMode != FRONTIER_LVL_50) - gSpecialVar_0x8000 = sPickupItemsLvlOpen[round][gUnknown_08613ABC[i][1]]; + gSpecialVar_0x8000 = sPickupItemsLvlOpen[round][sPickupItemSlots[i][1]]; else - gSpecialVar_0x8000 = sPickupItemsLvl50[round][gUnknown_08613ABC[i][1]]; + gSpecialVar_0x8000 = sPickupItemsLvl50[round][sPickupItemSlots[i][1]]; gSpecialVar_0x8001 = 1; } -static void sub_81A93C8(void) +static void HidePyramidItem(void) { struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; - s32 i = 0; + int i = 0; for (;;) { if (events[i].localId == gSpecialVar_LastTalked) { + // Rather than using event flags to hide the item event object, + // it moves them far off the map bounds. events[i].x = 0x7FFF; events[i].y = 0x7FFF; break; @@ -998,82 +1040,82 @@ static void sub_81A93C8(void) } } -static void sub_81A9414(void) +static void InitPyramidFacilityTrainers(void) { gFacilityTrainers = gBattleFrontierTrainers; } -static void sub_81A9424(void) +static void ShowPostBattleHintText(void) { - s32 i; - s32 var_24; + int i; + int hintType; u8 id; - s32 class = 0; - s32 r7 = 0; + int textGroup = 0; + int textIndex = 0; struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; u16 trainerId = LocalIdToPyramidTrainerId(gEventObjects[gSelectedEventObject].localId); - for (i = 0; i < ARRAY_COUNT(gUnknown_08613C1C); i++) + for (i = 0; i < ARRAY_COUNT(sTrainerTextGroups); i++) { - if (gUnknown_08613C1C[i][0] == gFacilityTrainers[trainerId].facilityClass) + if (sTrainerTextGroups[i][0] == gFacilityTrainers[trainerId].facilityClass) { - class = gUnknown_08613C1C[i][1]; + textGroup = sTrainerTextGroups[i][1]; break; } } - var_24 = gUnknown_08613ED8[gEventObjects[gSelectedEventObject].localId - 1]; + hintType = sHintTextTypes[gEventObjects[gSelectedEventObject].localId - 1]; i = 0; while (!i) { - switch (var_24) + switch (hintType) { - case 0: - r7 = sub_81A9998(&var_24, 8, 0); + case HINT_EXIT_DIRECTION: + textIndex = GetPostBattleDirectionHintTextIndex(&hintType, 8, HINT_EXIT_DIRECTION); i = 1; break; - case 1: - for (i = 0; i < sub_81AAA40(); i++) + case HINT_REMAINING_ITEMS: + for (i = 0; i < GetNumBattlePyramidEventObjects(); i++) { if (events[i].graphicsId == EVENT_OBJ_GFX_ITEM_BALL && events[i].x != 0x7FFF && events[i].y != 0x7FFF) - r7++; + textIndex++; } i = 1; break; - case 2: - id = sub_81AA9E4(); - r7 = gUnknown_08613650[id].unk1; + case HINT_REMAINING_TRAINERS: + id = GetPyramidFloorTemplateId(); + textIndex = sPyramidFloorTemplates[id].numTrainers; for (i = 0; i < 8; i++) { - if (gBitTable[i] & gSaveBlock2Ptr->frontier.field_E2A) - r7--; + if (gBitTable[i] & gSaveBlock2Ptr->frontier.pyramidTrainerFlags) + textIndex--; } i = 1; break; - case 3: - sub_81A9998(&var_24, 8, 2); + case HINT_EXIT_SHORT_REMAINING_TRAINERS: + GetPostBattleDirectionHintTextIndex(&hintType, 8, HINT_REMAINING_TRAINERS); break; - case 4: - sub_81A9998(&var_24, 8, 1); + case HINT_EXIT_SHORT_REMAINING_ITEMS: + GetPostBattleDirectionHintTextIndex(&hintType, 8, HINT_REMAINING_ITEMS); break; - case 5: - sub_81A9998(&var_24, 16, 2); + case HINT_EXIT_MEDIUM_REMAINING_TRAINERS: + GetPostBattleDirectionHintTextIndex(&hintType, 16, HINT_REMAINING_TRAINERS); break; - case 6: - sub_81A9998(&var_24, 16, 1); + case HINT_EXIT_MEDIUM_REMAINING_ITEMS: + GetPostBattleDirectionHintTextIndex(&hintType, 16, HINT_REMAINING_ITEMS); break; - case 7: - sub_81A9998(&var_24, 24, 2); + case HINT_EXIT_FAR_REMAINING_TRAINERS: + GetPostBattleDirectionHintTextIndex(&hintType, 24, HINT_REMAINING_TRAINERS); break; - case 8: - sub_81A9998(&var_24, 24, 1); + case HINT_EXIT_FAR_REMAINING_ITEMS: + GetPostBattleDirectionHintTextIndex(&hintType, 24, HINT_REMAINING_ITEMS); break; } } - ShowFieldMessage(gUnknown_08613EC0[class][var_24][r7]); + ShowFieldMessage(sPostBattleTexts[textGroup][hintType][textIndex]); } -static void sub_81A9618(void) +static void UpdatePyramidWinStreak(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; @@ -1083,17 +1125,17 @@ static void sub_81A9618(void) gSaveBlock2Ptr->frontier.pyramidRecordStreaks[lvlMode] = gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode]; } -static void sub_81A966C(void) +static void GetInBattlePyramid(void) { gSpecialVar_Result = InBattlePyramid(); } -static void sub_81A9684(void) +static void UpdatePyramidLightRadius(void) { switch (gSpecialVar_0x8006) { case 0: - gSaveBlock2Ptr->frontier.field_E68 = gSpecialVar_0x8005; + gSaveBlock2Ptr->frontier.pyramidLightRadius = gSpecialVar_0x8005; break; case 1: switch (gSpecialVar_Result) @@ -1101,8 +1143,8 @@ static void sub_81A9684(void) case 0: if (!gPaletteFade.active) { - if (gSaveBlock2Ptr->frontier.field_E68 >= 120) - gSaveBlock2Ptr->frontier.field_E68 = 120; + if (gSaveBlock2Ptr->frontier.pyramidLightRadius >= 120) + gSaveBlock2Ptr->frontier.pyramidLightRadius = 120; else PlaySE(gSpecialVar_0x8007); gSpecialVar_Result++; @@ -1112,13 +1154,13 @@ static void sub_81A9684(void) if (gSpecialVar_0x8005 != 0) { gSpecialVar_0x8005--; - gSaveBlock2Ptr->frontier.field_E68++; - if (gSaveBlock2Ptr->frontier.field_E68 > 120) + gSaveBlock2Ptr->frontier.pyramidLightRadius++; + if (gSaveBlock2Ptr->frontier.pyramidLightRadius > 120) { - gSaveBlock2Ptr->frontier.field_E68 = 120; + gSaveBlock2Ptr->frontier.pyramidLightRadius = 120; gSpecialVar_Result++; } - door_upload_tiles(); + WriteBattlePyramidViewScanlineEffectBuffer(); } else { @@ -1133,9 +1175,9 @@ static void sub_81A9684(void) } } -static void sub_81A975C(void) +static void ClearPyramidPartyHeldItems(void) { - s32 i, j; + int i, j; u16 item = 0; for (i = 0; i < PARTY_SIZE; i++) @@ -1148,12 +1190,12 @@ static void sub_81A975C(void) } } -static void sub_81A97C8(void) +static void SetPyramidFloorPalette(void) { - CreateTask(sub_81A97DC, 0); + CreateTask(Task_SetPyramidFloorPalette, 0); } -static void sub_81A97DC(u8 taskId) +static void Task_SetPyramidFloorPalette(u8 taskId) { if (gPaletteFade.active) { @@ -1167,29 +1209,29 @@ static void sub_81A9828(void) sub_809FDD4(); } -static void sub_81A9834(void) +static void RestorePlayerPartyAfterPyramid(void) { - s32 i, j, k, l; + int i, j, k, l; for (i = 0; i < 3; i++) { - s32 id = gSaveBlock2Ptr->frontier.selectedPartyMons[i] - 1; + int partyIndex = gSaveBlock2Ptr->frontier.selectedPartyMons[i] - 1; for (j = 0; j < 3; j++) { - if (GetMonData(&gSaveBlock1Ptr->playerParty[id], MON_DATA_SPECIES, NULL) == GetMonData(&gPlayerParty[j], MON_DATA_SPECIES, NULL)) + if (GetMonData(&gSaveBlock1Ptr->playerParty[partyIndex], MON_DATA_SPECIES, NULL) == GetMonData(&gPlayerParty[j], MON_DATA_SPECIES, NULL)) { for (k = 0; k < MAX_MON_MOVES; k++) { for (l = 0; l < MAX_MON_MOVES; l++) { - if (GetMonData(&gSaveBlock1Ptr->playerParty[id], MON_DATA_MOVE1 + l, NULL) == GetMonData(&gPlayerParty[j], MON_DATA_MOVE1 + k, NULL)) + if (GetMonData(&gSaveBlock1Ptr->playerParty[partyIndex], MON_DATA_MOVE1 + l, NULL) == GetMonData(&gPlayerParty[j], MON_DATA_MOVE1 + k, NULL)) break; } if (l == MAX_MON_MOVES) SetMonMoveSlot(&gPlayerParty[j], MOVE_SKETCH, k); } - gSaveBlock1Ptr->playerParty[id] = gPlayerParty[j]; - gSelectedOrderFromParty[j] = id + 1; + gSaveBlock1Ptr->playerParty[partyIndex] = gPlayerParty[j]; + gSelectedOrderFromParty[j] = partyIndex + 1; break; } } @@ -1199,74 +1241,78 @@ static void sub_81A9834(void) gSaveBlock2Ptr->frontier.selectedPartyMons[i] = gSelectedOrderFromParty[i]; } -static u8 sub_81A9998(s32 *arg0, u8 arg1, u8 arg2) +static u8 GetPostBattleDirectionHintTextIndex(int *hintType, u8 minDistanceForExitHint, u8 defaultHintType) { - s32 i, j; - u8 ret = 0; + int x, y; + u8 textIndex = 0; u16 *map = gBackupMapLayout.map; map += gBackupMapLayout.width * 7 + 7; - for (i = 0; i < 32; map += 47, i++) + for (y = 0; y < 32; map += 47, y++) { - for (j = 0; j < 32; j++) + for (x = 0; x < 32; x++) { - if ((map[j] & 0x3FF) == 0x28E) + if ((map[x] & 0x3FF) == FLOOR_EXIT_METATILE) { - j += 7 - gEventObjects[gSelectedEventObject].initialCoords.x; - i += 7 - gEventObjects[gSelectedEventObject].initialCoords.y; - if (j >= arg1 || j <= -arg1 || i >= arg1 || i <= -arg1 || arg2 == 0) + x += 7 - gEventObjects[gSelectedEventObject].initialCoords.x; + y += 7 - gEventObjects[gSelectedEventObject].initialCoords.y; + if (x >= minDistanceForExitHint + || x <= -minDistanceForExitHint + || y >= minDistanceForExitHint + || y <= -minDistanceForExitHint + || defaultHintType == HINT_EXIT_DIRECTION) { - if (j > 0 && i > 0) + if (x > 0 && y > 0) { - if (j >= i) - ret = 2; + if (x >= y) + textIndex = 2; else - ret = 3; + textIndex = 3; } - else if (j < 0 && i < 0) + else if (x < 0 && y < 0) { - if (j > i) - ret = 0; + if (x > y) + textIndex = 0; else - ret = 1; + textIndex = 1; } - else if (j == 0) + else if (x == 0) { - if (i > 0) - ret = 3; + if (y > 0) + textIndex = 3; else - ret = 0; + textIndex = 0; } - else if (i == 0) + else if (y == 0) { - if (j > 0) - ret = 2; + if (x > 0) + textIndex = 2; else - ret = 1; + textIndex = 1; } - else if (j < 0) + else if (x < 0) { - if (j + i > 0) - ret = 3; + if (x + y > 0) + textIndex = 3; else - ret = 1; + textIndex = 1; } else { - ret = (~(j + i) >= 0) ? 0 : 2; + textIndex = (~(x + y) >= 0) ? 0 : 2; } - *arg0 = 0; + *hintType = HINT_EXIT_DIRECTION; } else { - *arg0 = arg2; + *hintType = defaultHintType; } - return ret; + return textIndex; } } } - return ret; + return textIndex; } u16 LocalIdToPyramidTrainerId(u8 localId) @@ -1276,7 +1322,7 @@ u16 LocalIdToPyramidTrainerId(u8 localId) bool8 GetBattlePyramidTrainerFlag(u8 eventId) { - return gSaveBlock2Ptr->frontier.field_E2A & gBitTable[gEventObjects[eventId].localId - 1]; + return gSaveBlock2Ptr->frontier.pyramidTrainerFlags & gBitTable[gEventObjects[eventId].localId - 1]; } void sub_81A9B04(void) @@ -1296,7 +1342,7 @@ static void sub_81A9B44(u16 trainerId) for (i = 0; i < 8; i++) { if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId) - gSaveBlock2Ptr->frontier.field_E2A |= gBitTable[i]; + gSaveBlock2Ptr->frontier.pyramidTrainerFlags |= gBitTable[i]; } gEventObjects[gSelectedEventObject].movementType = MOVEMENT_TYPE_WANDER_AROUND; @@ -1375,8 +1421,8 @@ void GenerateBattlePyramidWildMon(void) u8 GetPyramidRunMultiplier(void) { - u8 id = sub_81AA9E4(); - return gUnknown_08613650[id].runMultiplier; + u8 id = GetPyramidFloorTemplateId(); + return sPyramidFloorTemplates[id].runMultiplier; } u8 InBattlePyramid(void) @@ -1399,7 +1445,7 @@ void sub_81A9E90(void) { if (InBattlePyramid()) { - sub_81A9834(); + RestorePlayerPartyAfterPyramid(); gSaveBlock2Ptr->frontier.field_CA8 = 2; VarSet(VAR_TEMP_E, 0); LoadPlayerParty(); @@ -1429,14 +1475,14 @@ void CopyPyramidTrainerLoseSpeech(u16 trainerId) u8 GetTrainerEncounterMusicIdInBattlePyramind(u16 trainerId) { - s32 i; + int i; - for (i = 0; i < ARRAY_COUNT(gUnknown_08613B44); i++) + for (i = 0; i < ARRAY_COUNT(sTrainerClassEncounterMusic); i++) { - if (gUnknown_08613B44[i].class == gFacilityClassToTrainerClass[gFacilityTrainers[trainerId].facilityClass]) - return gUnknown_08613B44[i].music; + if (sTrainerClassEncounterMusic[i].trainerClass == gFacilityClassToTrainerClass[gFacilityTrainers[trainerId].facilityClass]) + return sTrainerClassEncounterMusic[i].trainerEncounterMusic; } - return 0; + return TRAINER_ENCOUNTER_MUSIC_MALE; } static void sub_81A9F80(void) @@ -1446,7 +1492,7 @@ static void sub_81A9F80(void) static u16 sub_81A9F90(u8 count) { - s32 i; + int i; u16 trainerId; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 challengeNum = gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode] / 7; @@ -1479,49 +1525,49 @@ static u16 sub_81A9F90(u8 count) return trainerId; } -void sub_81AA078(u16 *mapArg, u8 arg1) +void GenerateBattlePyramidFloorLayout(u16 *backupMapData, bool8 setPlayerPosition) { - s32 j, k; - s32 i; - u8 var0, var1; - u8 *allocated = AllocZeroed(0x10); + int y, x; + int i; + u8 entranceSquareId, exitSquareId; + u8 *floorLayoutOffsets = AllocZeroed(16); - sub_81AA96C(allocated); - sub_81AA33C(&var0, &var1); + SetPyramidFloorLayoutOffsets(floorLayoutOffsets); + SetPyramidEntranceAndExitSquareIds(&entranceSquareId, &exitSquareId); for (i = 0; i < 16; i++) { u16 *map; - s32 heightAdd, widthAdd; - const struct MapLayout *mapLayout = gMapLayouts[allocated[i] + 0x169]; + int yOffset, xOffset; + const struct MapLayout *mapLayout = gMapLayouts[floorLayoutOffsets[i] + LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE]; const u16 *layoutMap = mapLayout->map; - gBackupMapLayout.map = mapArg; + gBackupMapLayout.map = backupMapData; gBackupMapLayout.width = mapLayout->width * 4 + 15; gBackupMapLayout.height = mapLayout->height * 4 + 14; - map = mapArg; - heightAdd = (((i / 4 * mapLayout->height) + 7) * (gBackupMapLayout.width)); - widthAdd = ((i % 4 * mapLayout->width) + 7); - map += heightAdd + widthAdd; - for (j = 0; j < mapLayout->height; j++) + map = backupMapData; + yOffset = ((i / 4 * mapLayout->height) + 7) * gBackupMapLayout.width; + xOffset = (i % 4 * mapLayout->width) + 7; + map += yOffset + xOffset; + for (y = 0; y < mapLayout->height; y++) { - for (k = 0; k < mapLayout->width; k++) + for (x = 0; x < mapLayout->width; x++) { - if ((layoutMap[k] & 0x3FF) != 0x28E) + if ((layoutMap[x] & 0x3FF) != FLOOR_EXIT_METATILE) { - map[k] = layoutMap[k]; + map[x] = layoutMap[x]; } - else if (i != var1) + else if (i != exitSquareId) { - if (i == var0 && arg1 == 0) + if (i == entranceSquareId && setPlayerPosition == FALSE) { - gSaveBlock1Ptr->pos.x = (mapLayout->width * (i % 4)) + k; - gSaveBlock1Ptr->pos.y = (mapLayout->height * (i / 4)) + j; + gSaveBlock1Ptr->pos.x = (mapLayout->width * (i % 4)) + x; + gSaveBlock1Ptr->pos.y = (mapLayout->height * (i / 4)) + y; } - map[k] = (layoutMap[k] & 0xFC00) | 0x28D; + map[x] = (layoutMap[x] & 0xFC00) | FLOOR_WALKABLE_METATILE; } else { - map[k] = layoutMap[k]; + map[x] = layoutMap[x]; } } map += 15 + (mapLayout->width * 4); @@ -1529,29 +1575,29 @@ void sub_81AA078(u16 *mapArg, u8 arg1) } } mapheader_run_script_with_tag_x1(); - free(allocated); + free(floorLayoutOffsets); } void sub_81AA1D8(void) { - s32 i; + int i; u8 id; - u8 var0, var1; + u8 entranceSquareId, exitSquareId; for (i = 0; i < 8; i++) gSaveBlock2Ptr->frontier.field_CB4[i] = 0xFFFF; - id = sub_81AA9E4(); - sub_81AA33C(&var0, &var1); + id = GetPyramidFloorTemplateId(); + SetPyramidEntranceAndExitSquareIds(&entranceSquareId, &exitSquareId); CpuFill32(0, gSaveBlock1Ptr->eventObjectTemplates, sizeof(gSaveBlock1Ptr->eventObjectTemplates)); for (i = 0; i < 2; i++) { u8 value; if (i == 0) - value = gUnknown_08613650[id].unk3; + value = sPyramidFloorTemplates[id].unk3; else - value = gUnknown_08613650[id].unk2; + value = sPyramidFloorTemplates[id].unk2; switch (value) { @@ -1559,19 +1605,19 @@ void sub_81AA1D8(void) sub_81AA398(i); break; case 1: - if (sub_81AA4D8(i, var0)) + if (sub_81AA4D8(i, entranceSquareId)) sub_81AA398(i); break; case 2: - if (sub_81AA4D8(i, var1)) + if (sub_81AA4D8(i, exitSquareId)) sub_81AA398(i); break; case 3: - if (sub_81AA648(i, var0)) + if (sub_81AA648(i, entranceSquareId)) sub_81AA398(i); break; case 4: - if (sub_81AA648(i, var1)) + if (sub_81AA648(i, exitSquareId)) sub_81AA398(i); break; } @@ -1592,39 +1638,39 @@ void sub_81AA2F8(void) } } -static void sub_81AA33C(u8 *var0, u8 *var1) +static void SetPyramidEntranceAndExitSquareIds(u8 *entranceSquareId, u8 *exitSquareId) { - *var0 = gSaveBlock2Ptr->frontier.field_E22[3] % 16; - *var1 = gSaveBlock2Ptr->frontier.field_E22[0] % 16; + *entranceSquareId = gSaveBlock2Ptr->frontier.pyramidRandoms[3] % 16; + *exitSquareId = gSaveBlock2Ptr->frontier.pyramidRandoms[0] % 16; - if (*var0 == *var1) + if (*entranceSquareId == *exitSquareId) { - *var0 = (gSaveBlock2Ptr->frontier.field_E22[3] + 1 ) % 16; - *var1 = (gSaveBlock2Ptr->frontier.field_E22[0] + 15) % 16; + *entranceSquareId = (gSaveBlock2Ptr->frontier.pyramidRandoms[3] + 1 ) % 16; + *exitSquareId = (gSaveBlock2Ptr->frontier.pyramidRandoms[0] + 15) % 16; } } static void sub_81AA398(u8 arg0) { - s32 i; - s32 count; - s32 var_28; - s32 r4; + int i; + int count; + int var_28; + int squareId; u32 bits = 0; - u8 id = sub_81AA9E4(); - u8 *allocated = AllocZeroed(0x10); + u8 id = GetPyramidFloorTemplateId(); + u8 *floorLayoutOffsets = AllocZeroed(16); - sub_81AA96C(allocated); - r4 = gSaveBlock2Ptr->frontier.field_E22[2] % 16; + SetPyramidFloorLayoutOffsets(floorLayoutOffsets); + squareId = gSaveBlock2Ptr->frontier.pyramidRandoms[2] % 16; if (arg0 == 0) { - count = gUnknown_08613650[id].unk1; + count = sPyramidFloorTemplates[id].numTrainers; var_28 = 0; } else { - count = gUnknown_08613650[id].unk0; - var_28 = gUnknown_08613650[id].unk1; + count = sPyramidFloorTemplates[id].numItems; + var_28 = sPyramidFloorTemplates[id].numTrainers; } for (i = 0; i < count; i++) @@ -1635,18 +1681,18 @@ static void sub_81AA398(u8 arg0) { if (bits & 1) { - if (!(gBitTable[r4] & gSaveBlock2Ptr->frontier.field_E22[3])) + if (!(gBitTable[squareId] & gSaveBlock2Ptr->frontier.pyramidRandoms[3])) bits |= 2; } else { - if (gBitTable[r4] & gSaveBlock2Ptr->frontier.field_E22[3]) + if (gBitTable[squareId] & gSaveBlock2Ptr->frontier.pyramidRandoms[3]) bits |= 2; } - if (++r4 >= 16) - r4 = 0; + if (++squareId >= 16) + squareId = 0; - if (r4 == gSaveBlock2Ptr->frontier.field_E22[2] % 16) + if (squareId == gSaveBlock2Ptr->frontier.pyramidRandoms[2] % 16) { if (bits & 1) bits |= 6; @@ -1655,62 +1701,62 @@ static void sub_81AA398(u8 arg0) } } while (!(bits & 2)); - } while (!(bits & 4) && sub_81AA760(arg0, allocated, r4, var_28 + i)); + } while (!(bits & 4) && sub_81AA760(arg0, floorLayoutOffsets, squareId, var_28 + i)); bits &= 1; } - free(allocated); + free(floorLayoutOffsets); } -static bool8 sub_81AA4D8(u8 arg0, u8 arg1) +static bool8 sub_81AA4D8(u8 arg0, u8 squareId) { - s32 i; - s32 var_28; - s32 r6 = 0; - s32 r7 = 0; - s32 var_34 = 0; - s32 count; - u8 id = sub_81AA9E4(); - u8 *allocated = AllocZeroed(0x10); + int i; + int var_28; + int borderedIndex = 0; + int r7 = 0; + int var_34 = 0; + int count; + u8 id = GetPyramidFloorTemplateId(); + u8 *floorLayoutOffsets = AllocZeroed(16); - sub_81AA96C(allocated); + SetPyramidFloorLayoutOffsets(floorLayoutOffsets); if (arg0 == 0) { - count = gUnknown_08613650[id].unk1; + count = sPyramidFloorTemplates[id].numTrainers; var_28 = 0; } else { - count = gUnknown_08613650[id].unk0; - var_28 = gUnknown_08613650[id].unk1; + count = sPyramidFloorTemplates[id].numItems; + var_28 = sPyramidFloorTemplates[id].numTrainers; } for (i = 0; i < count; i++) { if (r7 == 0) { - if (sub_81AA760(arg0, allocated, arg1, var_28 + i)) + if (sub_81AA760(arg0, floorLayoutOffsets, squareId, var_28 + i)) r7 = 1; else var_34++; } if (r7 & 1) { - if (sub_81AA760(arg0, allocated, gUnknown_08613F46[arg1][r6], var_28 + i)) + if (sub_81AA760(arg0, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], var_28 + i)) { do { - r6++; - if (gUnknown_08613F46[arg1][r6] == 0xFF || r6 >= 4) - r6 = 0; + borderedIndex++; + if (sBorderedSquareIds[squareId][borderedIndex] == 0xFF || borderedIndex >= 4) + borderedIndex = 0; r7 += 2; - } while (r7 >> 1 != 4 && sub_81AA760(arg0, allocated, gUnknown_08613F46[arg1][r6], var_28 + i)); + } while (r7 >> 1 != 4 && sub_81AA760(arg0, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], var_28 + i)); var_34++; } else { - r6++; - if (gUnknown_08613F46[arg1][r6] == 0xFF || r6 >= 4) - r6 = 0; + borderedIndex++; + if (sBorderedSquareIds[squareId][borderedIndex] == 0xFF || borderedIndex >= 4) + borderedIndex = 0; var_34++; } } @@ -1720,51 +1766,51 @@ static bool8 sub_81AA4D8(u8 arg0, u8 arg1) r7 &= 1; } - // free(allocated); BUG: allocated memory not freed + // free(floorLayoutOffsets); BUG: floorLayoutOffsets memory not freed return (count / 2 > var_34); } -static bool8 sub_81AA648(u8 arg0, u8 arg1) +static bool8 sub_81AA648(u8 arg0, u8 squareId) { - s32 i; - s32 var_28; - s32 r4 = 0; - s32 r7 = 0; - s32 r8 = 0; - s32 count; - u8 id = sub_81AA9E4(); - u8 *allocated = AllocZeroed(0x10); + int i; + int var_28; + int r4 = 0; + int r7 = 0; + int r8 = 0; + int count; + u8 id = GetPyramidFloorTemplateId(); + u8 *floorLayoutOffsets = AllocZeroed(16); - sub_81AA96C(allocated); + SetPyramidFloorLayoutOffsets(floorLayoutOffsets); if (arg0 == 0) { - count = gUnknown_08613650[id].unk1; + count = sPyramidFloorTemplates[id].numTrainers; var_28 = 0; } else { - count = gUnknown_08613650[id].unk0; - var_28 = gUnknown_08613650[id].unk1; + count = sPyramidFloorTemplates[id].numItems; + var_28 = sPyramidFloorTemplates[id].numTrainers; } for (i = 0; i < count; i++) { - if (sub_81AA760(arg0, allocated, gUnknown_08613F46[arg1][r4], var_28 + i)) + if (sub_81AA760(arg0, floorLayoutOffsets, sBorderedSquareIds[squareId][r4], var_28 + i)) { do { r4++; - if (gUnknown_08613F46[arg1][r4] == 0xFF || r4 >= 4) + if (sBorderedSquareIds[squareId][r4] == 0xFF || r4 >= 4) r4 = 0; r8++; - } while (r8 != 4 && sub_81AA760(arg0, allocated, gUnknown_08613F46[arg1][r4], var_28 + i)); + } while (r8 != 4 && sub_81AA760(arg0, floorLayoutOffsets, sBorderedSquareIds[squareId][r4], var_28 + i)); r7++; } else { r4++; - if (gUnknown_08613F46[arg1][r4] == 0xFF || r4 >= 4) + if (sBorderedSquareIds[squareId][r4] == 0xFF || r4 >= 4) r4 = 0; r7++; } @@ -1772,23 +1818,23 @@ static bool8 sub_81AA648(u8 arg0, u8 arg1) if (r8 == 4) break; } - // free(allocated); BUG: allocated memory not freed + // free(floorLayoutOffsets); BUG: floorLayoutOffsets memory not freed return (count / 2 > r7); } -static bool8 sub_81AA760(u8 arg0, u8 *mapNums, u8 whichMap, u8 id) +static bool8 sub_81AA760(u8 arg0, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId) { - s32 i, j; + int i, j; - if (gSaveBlock2Ptr->frontier.field_E22[0] & 1) + if (gSaveBlock2Ptr->frontier.pyramidRandoms[0] & 1) { - s32 minus1 = -1; + int minus1 = -1; for (i = 7; i > minus1; i--) { for (j = 7; j >= 0; j--) { - if (!sub_81AA810(arg0, j, i, mapNums, whichMap, id)) + if (!sub_81AA810(arg0, j, i, floorLayoutOffsets, squareId, eventObjectId)) return FALSE; } } @@ -1799,7 +1845,7 @@ static bool8 sub_81AA760(u8 arg0, u8 *mapNums, u8 whichMap, u8 id) { for (j = 0; j < 8; j++) { - if (!sub_81AA810(arg0, j, i, mapNums, whichMap, id)) + if (!sub_81AA810(arg0, j, i, floorLayoutOffsets, squareId, eventObjectId)) return FALSE; } } @@ -1808,13 +1854,13 @@ static bool8 sub_81AA760(u8 arg0, u8 *mapNums, u8 whichMap, u8 id) return TRUE; } -static bool8 sub_81AA810(u8 arg0, u8 x, u8 y, u8 *mapNums, u8 whichMap, u8 id) +static bool8 sub_81AA810(u8 arg0, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId) { - s32 i, j; + int i, j; const struct MapHeader *mapHeader; struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; - mapHeader = Overworld_GetMapHeaderByGroupAndId(MAP_GROUP(BATTLE_PYRAMID_SQUARE01), mapNums[whichMap] + MAP_NUM(BATTLE_PYRAMID_SQUARE01)); + mapHeader = Overworld_GetMapHeaderByGroupAndId(MAP_GROUP(BATTLE_PYRAMID_SQUARE01), floorLayoutOffsets[squareId] + MAP_NUM(BATTLE_PYRAMID_SQUARE01)); for (i = 0; i < mapHeader->events->eventObjectCount; i++) { if (mapHeader->events->eventObjects[i].x != x || mapHeader->events->eventObjects[i].y != y) @@ -1826,23 +1872,23 @@ static bool8 sub_81AA810(u8 arg0, u8 x, u8 y, u8 *mapNums, u8 whichMap, u8 id) continue; } - for (j = 0; j < id; j++) + for (j = 0; j < eventObjectId; j++) { - if (events[j].x == x + ((whichMap % 4) * 8) && events[j].y == y + ((whichMap / 4) * 8)) + if (events[j].x == x + ((squareId % 4) * 8) && events[j].y == y + ((squareId / 4) * 8)) break; } - if (j != id) + if (j != eventObjectId) continue; - events[id] = mapHeader->events->eventObjects[i]; - events[id].x += ((whichMap % 4) * 8); - events[id].y += ((whichMap / 4) * 8); - events[id].localId = id + 1; - if (events[id].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) + events[eventObjectId] = mapHeader->events->eventObjects[i]; + events[eventObjectId].x += ((squareId % 4) * 8); + events[eventObjectId].y += ((squareId / 4) * 8); + events[eventObjectId].localId = eventObjectId + 1; + if (events[eventObjectId].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) { - i = sub_81A9F90(id); - events[id].graphicsId = GetBattleFacilityTrainerGfxId(i); - gSaveBlock2Ptr->frontier.field_CB4[id] = i; + i = sub_81A9F90(eventObjectId); + events[eventObjectId].graphicsId = GetBattleFacilityTrainerGfxId(i); + gSaveBlock2Ptr->frontier.field_CB4[eventObjectId] = i; } return FALSE; } @@ -1850,39 +1896,39 @@ static bool8 sub_81AA810(u8 arg0, u8 x, u8 y, u8 *mapNums, u8 whichMap, u8 id) return TRUE; } -static void sub_81AA96C(u8 *mapNums) +static void SetPyramidFloorLayoutOffsets(u8 *layoutOffsets) { - s32 i; - s32 bits = (gSaveBlock2Ptr->frontier.field_E22[0]) | (gSaveBlock2Ptr->frontier.field_E22[1] << 16); - u8 id = sub_81AA9E4(); + int i; + int rand = (gSaveBlock2Ptr->frontier.pyramidRandoms[0]) | (gSaveBlock2Ptr->frontier.pyramidRandoms[1] << 16); + u8 id = GetPyramidFloorTemplateId(); for (i = 0; i < 16; i++) { - mapNums[i] = gUnknown_08613650[id].unk5[bits & 7]; - bits >>= 3; + layoutOffsets[i] = sPyramidFloorTemplates[id].layoutOffsets[rand & 0x7]; + rand >>= 3; if (i == 7) { - bits = (gSaveBlock2Ptr->frontier.field_E22[2]) | (gSaveBlock2Ptr->frontier.field_E22[3] << 16); - bits >>= 8; + rand = (gSaveBlock2Ptr->frontier.pyramidRandoms[2]) | (gSaveBlock2Ptr->frontier.pyramidRandoms[3] << 16); + rand >>= 8; } } } -static u8 sub_81AA9E4(void) +static u8 GetPyramidFloorTemplateId(void) { - s32 i; - s32 var = gSaveBlock2Ptr->frontier.field_E22[3] % 100; - s32 battleNum = gSaveBlock2Ptr->frontier.curChallengeBattleNum; + int i; + int rand = gSaveBlock2Ptr->frontier.pyramidRandoms[3] % 100; + int floor = gSaveBlock2Ptr->frontier.curChallengeBattleNum; - for (i = gUnknown_08613794[battleNum]; i < ARRAY_COUNT(gUnknown_08613750); i++) + for (i = sFloorTemplateOffsets[floor]; i < ARRAY_COUNT(sPyramidFloorTemplateOptions); i++) { - if (var < gUnknown_08613750[i][0]) - return gUnknown_08613750[i][1]; + if (rand < sPyramidFloorTemplateOptions[i][0]) + return sPyramidFloorTemplateOptions[i][1]; } return 0; } -u8 sub_81AAA40(void) +u8 GetNumBattlePyramidEventObjects(void) { u8 i; struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; @@ -1896,14 +1942,14 @@ u8 sub_81AAA40(void) return i; } -static void InitBagItems(u8 lvlMode) +static void InitPyramidBagItems(u8 lvlMode) { s32 i; for (i = 0; i < PYRAMID_BAG_ITEMS_COUNT; i++) { - gSaveBlock2Ptr->frontier.pyramidBag.itemId[lvlMode][i] = 0; - gSaveBlock2Ptr->frontier.pyramidBag.quantity[lvlMode][i] = 0; + gSaveBlock2Ptr->frontier.pyramidBag.itemId[lvlMode][i] = ITEM_NONE; + gSaveBlock2Ptr->frontier.pyramidBag.quantity[lvlMode][i] = ITEM_NONE; } AddPyramidBagItem(ITEM_HYPER_POTION, 1); @@ -1912,10 +1958,10 @@ static void InitBagItems(u8 lvlMode) u16 GetBattlePyramidPickupItemId(void) { - s32 rand; + int rand; u32 i; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; - s32 round = (gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode] / 7); + int round = (gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode] / 7); if (round >= TOTAL_ROUNDS) round = TOTAL_ROUNDS - 1; diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index 9bed2ab438..1f0672dcb1 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -338,7 +338,7 @@ static const struct SpriteTemplate gUnknown_0861F3D4 = }; // code -void sub_81C4EEC(void) +void InitBattlePyramidBagCursorPosition(void) { gPyramidBagCursorData.cursorPosition = 0; gPyramidBagCursorData.scrollPosition = 0; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 6e1bae31e1..845e41dadf 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1420,7 +1420,7 @@ u8 Unref_TryInitLocalEventObject(u8 localId) { if (InBattlePyramid()) { - eventObjectCount = sub_81AAA40(); + eventObjectCount = GetNumBattlePyramidEventObjects(); } else if (InTrainerHill()) { @@ -1746,7 +1746,7 @@ void TrySpawnEventObjects(s16 cameraX, s16 cameraY) if (InBattlePyramid()) { - objectCount = sub_81AAA40(); + objectCount = GetNumBattlePyramidEventObjects(); } else if (InTrainerHill()) { diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index b9e9272d4f..93017f1251 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -1004,9 +1004,9 @@ void WriteFlashScanlineEffectBuffer(u8 flashLevel) } } -void door_upload_tiles(void) +void WriteBattlePyramidViewScanlineEffectBuffer(void) { - SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], 120, 80, gSaveBlock2Ptr->frontier.field_E68); + SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], 120, 80, gSaveBlock2Ptr->frontier.pyramidLightRadius); CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); } diff --git a/src/fieldmap.c b/src/fieldmap.c index f67f61edeb..7d9d079fc3 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -1,4 +1,5 @@ #include "global.h" +#include "battle_pyramid.h" #include "bg.h" #include "fieldmap.h" #include "fldeff.h" @@ -15,8 +16,6 @@ #include "tv.h" #include "constants/rgb.h" -extern void sub_81AA078(u16*, u8); - struct ConnectionFlags { u8 south:1; @@ -67,10 +66,10 @@ void InitMapFromSavedGame(void) UpdateTVScreensOnMap(gBackupMapLayout.width, gBackupMapLayout.height); } -void InitBattlePyramidMap(u8 a0) +void InitBattlePyramidMap(bool8 setPlayerPosition) { CpuFastFill(0x03ff03ff, gBackupMapData, sizeof(gBackupMapData)); - sub_81AA078(gBackupMapData, a0); + GenerateBattlePyramidFloorLayout(gBackupMapData, setPlayerPosition); } void InitTrainerHillMap(void) diff --git a/src/overworld.c b/src/overworld.c index 8d4c24ff6f..8119204f29 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -110,7 +110,6 @@ extern void ShowMapNamePopup(void); extern bool32 sub_808651C(void); extern bool8 sub_80AF6A4(void); extern bool8 sub_80E909C(void); -extern void sub_81AA1D8(void); extern void c2_change_map(void); extern void sub_81D5DF8(void); extern void sub_80EB218(void); @@ -119,7 +118,6 @@ extern void sub_808B578(void); extern void sub_80AF314(void); extern void sub_80AF214(void); extern void sub_80AF188(void); -extern void door_upload_tiles(void); extern void RotatingGate_InitPuzzleAndGraphics(void); extern void sub_80AF168(void); extern void sub_80AF3C8(void); @@ -916,7 +914,7 @@ static void mli0_load_map(u32 a1) UpdateLocationHistoryForRoamer(); RoamerMoveToOtherLocationSet(); if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) - InitBattlePyramidMap(0); + InitBattlePyramidMap(FALSE); else if (InTrainerHill()) InitTrainerHillMap(); else @@ -1765,7 +1763,7 @@ void CB2_ContinueSavedGame(void) DoTimeBasedEvents(); sub_8084788(); if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) - InitBattlePyramidMap(1); + InitBattlePyramidMap(TRUE); else if (trainerHillMapId != 0) InitTrainerHillMap(); else @@ -1836,7 +1834,7 @@ static void InitCurrentFlashLevelScanlineEffect(void) if (InBattlePyramid_()) { - door_upload_tiles(); + WriteBattlePyramidViewScanlineEffectBuffer(); ScanlineEffect_SetParams(sFlashEffectParams); } else if ((flashLevel = Overworld_GetFlashLevel())) diff --git a/src/start_menu.c b/src/start_menu.c index 5c7e5365de..d932e1d6b3 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -751,7 +751,7 @@ static bool8 StartMenuBattlePyramidRetireCallback(void) return FALSE; } -void sub_809FDD4(void) // Called from battle_frontier_2.s +void sub_809FDD4(void) { sub_8197DF8(0, FALSE); ScriptUnfreezeEventObjects(); From 3a88ab831d2fb57e1f3e0908aeb79395700867d4 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 7 Feb 2019 11:37:28 -0600 Subject: [PATCH 020/217] Document more battle pyramid --- data/event_scripts.s | 2 +- .../scripts.inc | 12 +- 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 +- include/battle_pyramid.h | 10 +- include/event_scripts.h | 4 +- include/global.h | 2 +- porymap.project.cfg | 1 + src/battle_factory.c | 4 +- src/battle_pike.c | 14 +- src/battle_pyramid.c | 403 +++++++++--------- src/battle_setup.c | 6 +- src/battle_tent.c | 4 +- src/battle_tower.c | 86 ++-- src/frontier_util.c | 2 +- src/overworld.c | 5 +- src/pokemon.c | 2 +- src/start_menu.c | 5 +- src/trainer_hill.c | 10 +- 33 files changed, 406 insertions(+), 390 deletions(-) create mode 100755 porymap.project.cfg diff --git a/data/event_scripts.s b/data/event_scripts.s index fbee3987c7..c6ebcd6955 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -7498,7 +7498,7 @@ TrainerHill_1F_Movement_2C83EE:: @ 82C83EE step_end EventScript_2C83F0:: @ 82C83F0 - trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D + trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText setvar VAR_0x8004, 11 special CallTrainerHillFunction waitmessage diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index 459d2adadf..43586bba0d 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -152,8 +152,8 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45 waitstate end -BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F - trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D +BattlePyramid_TrainerBattle:: @ 8252C4F + trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText setvar VAR_0x8004, 10 special CallBattlePyramidFunction waitmessage @@ -162,22 +162,22 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F releaseall end -BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A +BattlePyramid_FindItemBall:: @ 8252C6A setvar VAR_0x8004, 7 special CallBattlePyramidFunction callstd STD_FIND_ITEM compare VAR_0x8007, 0 - goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87 + goto_if_eq BattlePyramid_FindItemBall_End setvar VAR_0x8004, 8 special CallBattlePyramidFunction -BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87:: @ 8252C87 +BattlePyramid_FindItemBall_End:: @ 8252C87 end BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88:: @ 8252C88 goto BattleFrontier_BattlePyramidTop_EventScript_252B42 -BattleFrontier_BattlePyramidEmptySquare_Text_252C8D: @ 8252C8D +BattleFacility_TrainerBattle_PlaceholderText: @ 8252C8D .string "This is a sample message.$" gText_BattlePyramidConfirmRest:: @ 8252CA7 diff --git a/data/maps/BattlePyramidSquare01/map.json b/data/maps/BattlePyramidSquare01/map.json index 38320ece64..57e51307bf 100644 --- a/data/maps/BattlePyramidSquare01/map.json +++ b/data/maps/BattlePyramidSquare01/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" } ], diff --git a/data/maps/BattlePyramidSquare02/map.json b/data/maps/BattlePyramidSquare02/map.json index 0dc6f713a0..3f3d6ca93e 100644 --- a/data/maps/BattlePyramidSquare02/map.json +++ b/data/maps/BattlePyramidSquare02/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" } ], diff --git a/data/maps/BattlePyramidSquare03/map.json b/data/maps/BattlePyramidSquare03/map.json index 4e446e24b9..1045795531 100644 --- a/data/maps/BattlePyramidSquare03/map.json +++ b/data/maps/BattlePyramidSquare03/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" } ], diff --git a/data/maps/BattlePyramidSquare04/map.json b/data/maps/BattlePyramidSquare04/map.json index 67dfdaa11c..1531309994 100644 --- a/data/maps/BattlePyramidSquare04/map.json +++ b/data/maps/BattlePyramidSquare04/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" } ], diff --git a/data/maps/BattlePyramidSquare05/map.json b/data/maps/BattlePyramidSquare05/map.json index ac8bd5d7d5..d08cc103b0 100644 --- a/data/maps/BattlePyramidSquare05/map.json +++ b/data/maps/BattlePyramidSquare05/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" } ], diff --git a/data/maps/BattlePyramidSquare06/map.json b/data/maps/BattlePyramidSquare06/map.json index d9fa40ccd0..0528d33bd6 100644 --- a/data/maps/BattlePyramidSquare06/map.json +++ b/data/maps/BattlePyramidSquare06/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" } ], diff --git a/data/maps/BattlePyramidSquare07/map.json b/data/maps/BattlePyramidSquare07/map.json index a097f60ba2..23a4874eac 100644 --- a/data/maps/BattlePyramidSquare07/map.json +++ b/data/maps/BattlePyramidSquare07/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" } ], diff --git a/data/maps/BattlePyramidSquare08/map.json b/data/maps/BattlePyramidSquare08/map.json index 6939b8a7e4..ab7be039c2 100644 --- a/data/maps/BattlePyramidSquare08/map.json +++ b/data/maps/BattlePyramidSquare08/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" } ], diff --git a/data/maps/BattlePyramidSquare09/map.json b/data/maps/BattlePyramidSquare09/map.json index 56380e9914..1add766dcb 100644 --- a/data/maps/BattlePyramidSquare09/map.json +++ b/data/maps/BattlePyramidSquare09/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" } ], diff --git a/data/maps/BattlePyramidSquare10/map.json b/data/maps/BattlePyramidSquare10/map.json index 33534391bf..1450e644ca 100644 --- a/data/maps/BattlePyramidSquare10/map.json +++ b/data/maps/BattlePyramidSquare10/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 7, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" } ], diff --git a/data/maps/BattlePyramidSquare11/map.json b/data/maps/BattlePyramidSquare11/map.json index f22855aa24..d4ebaaa2d6 100644 --- a/data/maps/BattlePyramidSquare11/map.json +++ b/data/maps/BattlePyramidSquare11/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" } ], diff --git a/data/maps/BattlePyramidSquare12/map.json b/data/maps/BattlePyramidSquare12/map.json index d8e0d45a9c..29063c9503 100644 --- a/data/maps/BattlePyramidSquare12/map.json +++ b/data/maps/BattlePyramidSquare12/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 7, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 7, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" } ], diff --git a/data/maps/BattlePyramidSquare13/map.json b/data/maps/BattlePyramidSquare13/map.json index 880178e0e3..71fb71e5de 100644 --- a/data/maps/BattlePyramidSquare13/map.json +++ b/data/maps/BattlePyramidSquare13/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" } ], diff --git a/data/maps/BattlePyramidSquare14/map.json b/data/maps/BattlePyramidSquare14/map.json index 423346532a..3398dcd474 100644 --- a/data/maps/BattlePyramidSquare14/map.json +++ b/data/maps/BattlePyramidSquare14/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 7, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 7, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" } ], diff --git a/data/maps/BattlePyramidSquare15/map.json b/data/maps/BattlePyramidSquare15/map.json index 12b1f4cb8c..0eb433ae1e 100644 --- a/data/maps/BattlePyramidSquare15/map.json +++ b/data/maps/BattlePyramidSquare15/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" } ], diff --git a/data/maps/BattlePyramidSquare16/map.json b/data/maps/BattlePyramidSquare16/map.json index 65fa0a361d..e6827e1a3e 100644 --- a/data/maps/BattlePyramidSquare16/map.json +++ b/data/maps/BattlePyramidSquare16/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "script": "BattlePyramid_TrainerBattle", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "script": "BattlePyramid_FindItemBall", "flag": "0" } ], diff --git a/include/battle_pyramid.h b/include/battle_pyramid.h index 6936cfd42a..d77172d0bc 100644 --- a/include/battle_pyramid.h +++ b/include/battle_pyramid.h @@ -4,20 +4,20 @@ void CallBattlePyramidFunction(void); u16 LocalIdToPyramidTrainerId(u8 localId); bool8 GetBattlePyramidTrainerFlag(u8 eventId); -void sub_81A9B04(void); +void MarkApproachingPyramidTrainersAsBattled(void); void GenerateBattlePyramidWildMon(void); u8 GetPyramidRunMultiplier(void); u8 InBattlePyramid(void); bool8 InBattlePyramid_(void); void sub_81A9E90(void); -void sub_81A9EC8(void); +void SoftResetInBattlePyramid(void); void CopyPyramidTrainerSpeechBefore(u16 trainerId); void CopyPyramidTrainerWinSpeech(u16 trainerId); void CopyPyramidTrainerLoseSpeech(u16 trainerId); -u8 GetTrainerEncounterMusicIdInBattlePyramind(u16 trainerId); +u8 GetBattlePyramindTrainerEncounterMusicId(u16 trainerId); void GenerateBattlePyramidFloorLayout(u16 *mapArg, bool8 setPlayerPosition); -void sub_81AA1D8(void); -void sub_81AA2F8(void); +void LoadBattlePyramidEventObjectTemplates(void); +void LoadBattlePyramidFloorEventObjectScripts(void); u8 GetNumBattlePyramidEventObjects(void); u16 GetBattlePyramidPickupItemId(void); diff --git a/include/event_scripts.h b/include/event_scripts.h index afeac66282..65e2c74b74 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -576,8 +576,8 @@ extern const u8 gUnknown_082A8350[]; // Battle Pyramid. extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A[]; +extern const u8 BattlePyramid_TrainerBattle[]; +extern const u8 BattlePyramid_FindItemBall[]; // fldeff misc extern const u8 EventScript_275A86[]; diff --git a/include/global.h b/include/global.h index 903dbe63a2..6c1b7c5bb5 100644 --- a/include/global.h +++ b/include/global.h @@ -316,7 +316,7 @@ struct BattleFrontier /*0xCAA*/ u16 selectedPartyMons[3]; /*0xCB0*/ u16 field_CB0; /*0xCB2*/ u16 curChallengeBattleNum; // In case of battle pyramid, the floor. - /*0xCB4*/ u16 field_CB4[20]; + /*0xCB4*/ u16 trainerIds[20]; /*0xCDC*/ u32 field_CDC; /*0xCE0*/ u16 towerWinStreaks[4][2]; /*0xCF0*/ u16 towerRecordWinStreaks[4][2]; diff --git a/porymap.project.cfg b/porymap.project.cfg new file mode 100755 index 0000000000..c6ba8781eb --- /dev/null +++ b/porymap.project.cfg @@ -0,0 +1 @@ +base_game_version=pokeemerald diff --git a/src/battle_factory.c b/src/battle_factory.c index c025dc139c..db67b0b13b 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -304,14 +304,14 @@ static void sub_81A61B0(void) trainerId = sub_8162548(challengeNum, gSaveBlock2Ptr->frontier.curChallengeBattleNum); for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++) { - if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId) + if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) break; } } while (i != gSaveBlock2Ptr->frontier.curChallengeBattleNum); gTrainerBattleOpponent_A = trainerId; if (gSaveBlock2Ptr->frontier.curChallengeBattleNum < 6) - gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = trainerId; + gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = trainerId; i = 0; while (i != 3) diff --git a/src/battle_pike.c b/src/battle_pike.c index bdf6e80278..a93a5725d1 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -1393,7 +1393,7 @@ static void PrepareOneTrainer(bool8 difficult) trainerId = sub_8162548(challengeNum, battleNum); for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum - 1; i++) { - if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId) + if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) break; } } while (i != gSaveBlock2Ptr->frontier.curChallengeBattleNum - 1); @@ -1402,7 +1402,7 @@ static void PrepareOneTrainer(bool8 difficult) gFacilityTrainers = gBattleFrontierTrainers; SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0); if (gSaveBlock2Ptr->frontier.curChallengeBattleNum < 14) - gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum - 1] = gTrainerBattleOpponent_A; + gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum - 1] = gTrainerBattleOpponent_A; } static void PrepareTwoTrainers(void) @@ -1418,7 +1418,7 @@ static void PrepareTwoTrainers(void) trainerId = sub_8162548(challengeNum, 1); for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum - 1; i++) { - if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId) + if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) break; } } while (i != gSaveBlock2Ptr->frontier.curChallengeBattleNum - 1); @@ -1426,14 +1426,14 @@ static void PrepareTwoTrainers(void) gTrainerBattleOpponent_A = trainerId; SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0); if (gSaveBlock2Ptr->frontier.curChallengeBattleNum <= 14) - gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum - 1] = gTrainerBattleOpponent_A; + gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum - 1] = gTrainerBattleOpponent_A; do { trainerId = sub_8162548(challengeNum, 1); for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++) { - if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId) + if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) break; } } while (i != gSaveBlock2Ptr->frontier.curChallengeBattleNum); @@ -1441,7 +1441,7 @@ static void PrepareTwoTrainers(void) gTrainerBattleOpponent_B = trainerId; SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_B, 1); if (gSaveBlock2Ptr->frontier.curChallengeBattleNum < 14) - gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum - 2] = gTrainerBattleOpponent_B; + gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum - 2] = gTrainerBattleOpponent_B; } static void sub_81A84B4(void) @@ -1449,7 +1449,7 @@ static void sub_81A84B4(void) u8 i; for (i = 0; i < 14; i++) - gSaveBlock2Ptr->frontier.field_CB4[i] = 0xFFFF; + gSaveBlock2Ptr->frontier.trainerIds[i] = 0xFFFF; } static void sub_81A84EC(void) diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 9aa006985b..aa088e6c68 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -57,6 +57,21 @@ enum HINT_EXIT_FAR_REMAINING_ITEMS, }; +enum +{ + OBJ_TRAINERS, + OBJ_ITEMS, +}; + +enum +{ + OBJ_POSITIONS_UNIFORM, + OBJ_POSITIONS_IN_AND_NEAR_ENTRANCE, + OBJ_POSITIONS_IN_AND_NEAR_EXIT, + OBJ_POSITIONS_NEAR_NEAR_ENTRANCE, + OBJ_POSITIONS_NEAR_NEAR_EXIT, +}; + struct PyramidWildMon { u16 species; @@ -69,8 +84,8 @@ struct PyramidFloorTemplate { u8 numItems; u8 numTrainers; - u8 unk2; - u8 unk3; + u8 itemPositions; + u8 trainerPositions; u8 runMultiplier; u8 layoutOffsets[8]; }; @@ -99,19 +114,19 @@ static void UpdatePyramidLightRadius(void); static void ClearPyramidPartyHeldItems(void); static void SetPyramidFloorPalette(void); static void sub_81A9828(void); -static void RestorePlayerPartyAfterPyramid(void); +static void RestorePyramidPlayerParty(void); static void InitPyramidBagItems(u8 lvlMode); static u8 GetPyramidFloorTemplateId(void); static u8 GetPostBattleDirectionHintTextIndex(int *, u8, u8); static void Task_SetPyramidFloorPalette(u8 taskId); -static void sub_81A9B44(u16 trainerId); -static void SetPyramidFloorLayoutOffsets(u8 *layoutOffsets); -static void SetPyramidEntranceAndExitSquareIds(u8 *, u8 *); -static void sub_81AA398(u8); -static bool8 sub_81AA4D8(u8, u8); -static bool8 sub_81AA648(u8, u8); -static bool8 sub_81AA760(u8 arg0, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId); -static bool8 sub_81AA810(u8 arg0, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId); +static void MarkPyramidTrainerAsBattled(u16 trainerId); +static void GetPyramidFloorLayoutOffsets(u8 *layoutOffsets); +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); // Const rom data. #include "data/battle_frontier/battle_pyramid_level_50_wild_mons.h" @@ -122,129 +137,129 @@ static const struct PyramidFloorTemplate sPyramidFloorTemplates[] = { .numItems = 7, .numTrainers = 3, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x80, + .itemPositions = OBJ_POSITIONS_UNIFORM, + .trainerPositions = OBJ_POSITIONS_UNIFORM, + .runMultiplier = 128, .layoutOffsets = {0, 0, 1, 1, 2, 2, 3, 3}, }, { .numItems = 6, .numTrainers = 3, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x80, + .itemPositions = OBJ_POSITIONS_UNIFORM, + .trainerPositions = OBJ_POSITIONS_UNIFORM, + .runMultiplier = 128, .layoutOffsets = {1, 1, 2, 2, 3, 3, 4, 4}, }, { .numItems = 5, .numTrainers = 3, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x78, + .itemPositions = OBJ_POSITIONS_UNIFORM, + .trainerPositions = OBJ_POSITIONS_UNIFORM, + .runMultiplier = 120, .layoutOffsets = {2, 2, 3, 3, 4, 4, 5, 5}, }, { .numItems = 4, .numTrainers = 4, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x78, + .itemPositions = OBJ_POSITIONS_UNIFORM, + .trainerPositions = OBJ_POSITIONS_UNIFORM, + .runMultiplier = 120, .layoutOffsets = {3, 3, 4, 4, 5, 5, 6, 6}, }, { .numItems = 4, .numTrainers = 4, - .unk2 = 0x00, - .unk3 = 0x01, - .runMultiplier = 0x70, + .itemPositions = OBJ_POSITIONS_UNIFORM, + .trainerPositions = OBJ_POSITIONS_IN_AND_NEAR_ENTRANCE, + .runMultiplier = 112, .layoutOffsets = {4, 4, 5, 5, 6, 6, 7, 7}, }, { .numItems = 3, .numTrainers = 5, - .unk2 = 0x00, - .unk3 = 0x02, - .runMultiplier = 0x70, + .itemPositions = OBJ_POSITIONS_UNIFORM, + .trainerPositions = OBJ_POSITIONS_IN_AND_NEAR_EXIT, + .runMultiplier = 112, .layoutOffsets = {5, 6, 7, 8, 9, 10, 11, 12}, }, { .numItems = 3, .numTrainers = 5, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x68, + .itemPositions = OBJ_POSITIONS_UNIFORM, + .trainerPositions = OBJ_POSITIONS_UNIFORM, + .runMultiplier = 104, .layoutOffsets = {6, 7, 8, 9, 10, 11, 12, 13}, }, { .numItems = 2, .numTrainers = 4, - .unk2 = 0x00, - .unk3 = 0x01, - .runMultiplier = 0x68, + .itemPositions = OBJ_POSITIONS_UNIFORM, + .trainerPositions = OBJ_POSITIONS_IN_AND_NEAR_ENTRANCE, + .runMultiplier = 104, .layoutOffsets = {7, 8, 9, 10, 11, 12, 13, 14}, }, { .numItems = 4, .numTrainers = 5, - .unk2 = 0x00, - .unk3 = 0x02, - .runMultiplier = 0x60, + .itemPositions = OBJ_POSITIONS_UNIFORM, + .trainerPositions = OBJ_POSITIONS_IN_AND_NEAR_EXIT, + .runMultiplier = 96, .layoutOffsets = {8, 9, 10, 11, 12, 13, 14, 15}, }, { .numItems = 3, .numTrainers = 6, - .unk2 = 0x00, - .unk3 = 0x04, - .runMultiplier = 0x60, + .itemPositions = OBJ_POSITIONS_UNIFORM, + .trainerPositions = OBJ_POSITIONS_NEAR_NEAR_EXIT, + .runMultiplier = 96, .layoutOffsets = {8, 9, 10, 11, 12, 13, 14, 15}, }, { .numItems = 2, .numTrainers = 3, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x58, + .itemPositions = OBJ_POSITIONS_UNIFORM, + .trainerPositions = OBJ_POSITIONS_UNIFORM, + .runMultiplier = 88, .layoutOffsets = {12, 13, 14, 12, 13, 14, 12, 13}, }, { .numItems = 4, .numTrainers = 5, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x58, + .itemPositions = OBJ_POSITIONS_UNIFORM, + .trainerPositions = OBJ_POSITIONS_UNIFORM, + .runMultiplier = 88, .layoutOffsets = {11, 11, 11, 11, 11, 11, 11, 11}, }, { .numItems = 3, .numTrainers = 7, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x50, + .itemPositions = OBJ_POSITIONS_UNIFORM, + .trainerPositions = OBJ_POSITIONS_UNIFORM, + .runMultiplier = 80, .layoutOffsets = {12, 12, 12, 12, 12, 12, 12, 12}, }, { .numItems = 2, .numTrainers = 4, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x50, + .itemPositions = OBJ_POSITIONS_UNIFORM, + .trainerPositions = OBJ_POSITIONS_UNIFORM, + .runMultiplier = 80, .layoutOffsets = {13, 13, 13, 13, 13, 13, 13, 13}, }, { .numItems = 3, .numTrainers = 6, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x50, + .itemPositions = OBJ_POSITIONS_UNIFORM, + .trainerPositions = OBJ_POSITIONS_UNIFORM, + .runMultiplier = 80, .layoutOffsets = {14, 14, 14, 14, 14, 14, 14, 14}, }, { .numItems = 3, .numTrainers = 8, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x50, + .itemPositions = OBJ_POSITIONS_UNIFORM, + .trainerPositions = OBJ_POSITIONS_UNIFORM, + .runMultiplier = 80, .layoutOffsets = {15, 15, 15, 15, 15, 15, 15, 15}, } }; @@ -816,7 +831,7 @@ static void (* const sBattlePyramidFunctions[])(void) = ClearPyramidPartyHeldItems, SetPyramidFloorPalette, sub_81A9828, - RestorePlayerPartyAfterPyramid, + RestorePyramidPlayerParty, }; static const u16 sShortStreakRewardItems[] = {ITEM_HP_UP, ITEM_PROTEIN, ITEM_IRON, ITEM_CALCIUM, ITEM_CARBOS, ITEM_ZINC}; @@ -1209,7 +1224,7 @@ static void sub_81A9828(void) sub_809FDD4(); } -static void RestorePlayerPartyAfterPyramid(void) +static void RestorePyramidPlayerParty(void) { int i, j, k, l; @@ -1317,7 +1332,7 @@ static u8 GetPostBattleDirectionHintTextIndex(int *hintType, u8 minDistanceForEx u16 LocalIdToPyramidTrainerId(u8 localId) { - return gSaveBlock2Ptr->frontier.field_CB4[localId - 1]; + return gSaveBlock2Ptr->frontier.trainerIds[localId - 1]; } bool8 GetBattlePyramidTrainerFlag(u8 eventId) @@ -1325,23 +1340,23 @@ bool8 GetBattlePyramidTrainerFlag(u8 eventId) return gSaveBlock2Ptr->frontier.pyramidTrainerFlags & gBitTable[gEventObjects[eventId].localId - 1]; } -void sub_81A9B04(void) +void MarkApproachingPyramidTrainersAsBattled(void) { - sub_81A9B44(gTrainerBattleOpponent_A); + MarkPyramidTrainerAsBattled(gTrainerBattleOpponent_A); if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) { gSelectedEventObject = GetChosenApproachingTrainerEventObjectId(1); - sub_81A9B44(gTrainerBattleOpponent_B); + MarkPyramidTrainerAsBattled(gTrainerBattleOpponent_B); } } -static void sub_81A9B44(u16 trainerId) +static void MarkPyramidTrainerAsBattled(u16 trainerId) { - s32 i; + int i; for (i = 0; i < 8; i++) { - if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId) + if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) gSaveBlock2Ptr->frontier.pyramidTrainerFlags |= gBitTable[i]; } @@ -1354,7 +1369,7 @@ static void sub_81A9B44(u16 trainerId) void GenerateBattlePyramidWildMon(void) { u8 name[POKEMON_NAME_LENGTH + 1]; - s32 i; + int i; const struct PyramidWildMon *wildMons; u32 id; u32 lvl = gSaveBlock2Ptr->frontier.lvlMode; @@ -1410,7 +1425,8 @@ void GenerateBattlePyramidWildMon(void) for (i = 0; i < MAX_MON_MOVES; i++) SetMonMoveSlot(&gEnemyParty[0], wildMons[id].moves[i], i); - if (gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvl] >= 140) // BUG: Reading outside the array as lvl was used for mon level instead of frontier lvl mode. + // BUG: Reading outside the array as lvl was used for mon level instead of frontier lvl mode. + if (gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvl] >= 140) { id = (Random() % 17) + 15; for (i = 0; i < NUM_STATS; i++) @@ -1445,14 +1461,14 @@ void sub_81A9E90(void) { if (InBattlePyramid()) { - RestorePlayerPartyAfterPyramid(); + RestorePyramidPlayerParty(); gSaveBlock2Ptr->frontier.field_CA8 = 2; VarSet(VAR_TEMP_E, 0); LoadPlayerParty(); } } -void sub_81A9EC8(void) +void SoftResetInBattlePyramid(void) { if (InBattlePyramid()) DoSoftReset(); @@ -1473,7 +1489,7 @@ void CopyPyramidTrainerLoseSpeech(u16 trainerId) FrontierSpeechToString(gFacilityTrainers[trainerId].speechLose); } -u8 GetTrainerEncounterMusicIdInBattlePyramind(u16 trainerId) +u8 GetBattlePyramindTrainerEncounterMusicId(u16 trainerId) { int i; @@ -1485,12 +1501,12 @@ u8 GetTrainerEncounterMusicIdInBattlePyramind(u16 trainerId) return TRAINER_ENCOUNTER_MUSIC_MALE; } -static void sub_81A9F80(void) +void sub_81A9F80(void) { ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88); } -static u16 sub_81A9F90(u8 count) +static u16 GetUniqueTrainerId(u8 eventObjectId) { int i; u16 trainerId; @@ -1502,24 +1518,24 @@ static u16 sub_81A9F90(u8 count) do { trainerId = sub_8162548(challengeNum + 1, battleNum); - for (i = 0; i < count; i++) + for (i = 0; i < eventObjectId; i++) { - if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId) + if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) break; } - } while (i != count); + } while (i != eventObjectId); } else { do { trainerId = sub_8162548(challengeNum, battleNum); - for (i = 0; i < count; i++) + for (i = 0; i < eventObjectId; i++) { - if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId) + if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) break; } - } while (i != count); + } while (i != eventObjectId); } return trainerId; @@ -1532,8 +1548,8 @@ void GenerateBattlePyramidFloorLayout(u16 *backupMapData, bool8 setPlayerPositio u8 entranceSquareId, exitSquareId; u8 *floorLayoutOffsets = AllocZeroed(16); - SetPyramidFloorLayoutOffsets(floorLayoutOffsets); - SetPyramidEntranceAndExitSquareIds(&entranceSquareId, &exitSquareId); + GetPyramidFloorLayoutOffsets(floorLayoutOffsets); + GetPyramidEntranceAndExitSquareIds(&entranceSquareId, &exitSquareId); for (i = 0; i < 16; i++) { u16 *map; @@ -1578,67 +1594,67 @@ void GenerateBattlePyramidFloorLayout(u16 *backupMapData, bool8 setPlayerPositio free(floorLayoutOffsets); } -void sub_81AA1D8(void) +void LoadBattlePyramidEventObjectTemplates(void) { int i; u8 id; u8 entranceSquareId, exitSquareId; for (i = 0; i < 8; i++) - gSaveBlock2Ptr->frontier.field_CB4[i] = 0xFFFF; + gSaveBlock2Ptr->frontier.trainerIds[i] = 0xFFFF; id = GetPyramidFloorTemplateId(); - SetPyramidEntranceAndExitSquareIds(&entranceSquareId, &exitSquareId); + GetPyramidEntranceAndExitSquareIds(&entranceSquareId, &exitSquareId); CpuFill32(0, gSaveBlock1Ptr->eventObjectTemplates, sizeof(gSaveBlock1Ptr->eventObjectTemplates)); for (i = 0; i < 2; i++) { - u8 value; + u8 objectPositionsType; - if (i == 0) - value = sPyramidFloorTemplates[id].unk3; - else - value = sPyramidFloorTemplates[id].unk2; + if (i == OBJ_TRAINERS) + objectPositionsType = sPyramidFloorTemplates[id].trainerPositions; + else // OBJ_ITEMS + objectPositionsType = sPyramidFloorTemplates[id].itemPositions; - switch (value) + switch (objectPositionsType) { - case 0: - sub_81AA398(i); + case OBJ_POSITIONS_UNIFORM: + SetPyramidObjectPositionsUniformly(i); break; - case 1: - if (sub_81AA4D8(i, entranceSquareId)) - sub_81AA398(i); + case OBJ_POSITIONS_IN_AND_NEAR_ENTRANCE: + if (SetPyramidObjectPositionsInAndNearSquare(i, entranceSquareId)) + SetPyramidObjectPositionsUniformly(i); break; - case 2: - if (sub_81AA4D8(i, exitSquareId)) - sub_81AA398(i); + case OBJ_POSITIONS_IN_AND_NEAR_EXIT: + if (SetPyramidObjectPositionsInAndNearSquare(i, exitSquareId)) + SetPyramidObjectPositionsUniformly(i); break; - case 3: - if (sub_81AA648(i, entranceSquareId)) - sub_81AA398(i); + case OBJ_POSITIONS_NEAR_NEAR_ENTRANCE: + if (SetPyramidObjectPositionsNearSquare(i, entranceSquareId)) + SetPyramidObjectPositionsUniformly(i); break; - case 4: - if (sub_81AA648(i, exitSquareId)) - sub_81AA398(i); + case OBJ_POSITIONS_NEAR_NEAR_EXIT: + if (SetPyramidObjectPositionsNearSquare(i, exitSquareId)) + SetPyramidObjectPositionsUniformly(i); break; } } } -void sub_81AA2F8(void) +void LoadBattlePyramidFloorEventObjectScripts(void) { - s32 i; + int i; struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) { if (events[i].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) - events[i].script = BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F; + events[i].script = BattlePyramid_TrainerBattle; else - events[i].script = BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A; + events[i].script = BattlePyramid_FindItemBall; } } -static void SetPyramidEntranceAndExitSquareIds(u8 *entranceSquareId, u8 *exitSquareId) +static void GetPyramidEntranceAndExitSquareIds(u8 *entranceSquareId, u8 *exitSquareId) { *entranceSquareId = gSaveBlock2Ptr->frontier.pyramidRandoms[3] % 16; *exitSquareId = gSaveBlock2Ptr->frontier.pyramidRandoms[0] % 16; @@ -1650,30 +1666,30 @@ static void SetPyramidEntranceAndExitSquareIds(u8 *entranceSquareId, u8 *exitSqu } } -static void sub_81AA398(u8 arg0) +static void SetPyramidObjectPositionsUniformly(u8 objType) { int i; - int count; - int var_28; + int numObjects; + int objectStartIndex; int squareId; u32 bits = 0; u8 id = GetPyramidFloorTemplateId(); u8 *floorLayoutOffsets = AllocZeroed(16); - SetPyramidFloorLayoutOffsets(floorLayoutOffsets); + GetPyramidFloorLayoutOffsets(floorLayoutOffsets); squareId = gSaveBlock2Ptr->frontier.pyramidRandoms[2] % 16; - if (arg0 == 0) + if (objType == OBJ_TRAINERS) { - count = sPyramidFloorTemplates[id].numTrainers; - var_28 = 0; + numObjects = sPyramidFloorTemplates[id].numTrainers; + objectStartIndex = 0; } - else + else // OBJ_ITEMS { - count = sPyramidFloorTemplates[id].numItems; - var_28 = sPyramidFloorTemplates[id].numTrainers; + numObjects = sPyramidFloorTemplates[id].numItems; + objectStartIndex = sPyramidFloorTemplates[id].numTrainers; } - for (i = 0; i < count; i++) + for (i = 0; i < numObjects; i++) { do { @@ -1701,47 +1717,47 @@ static void sub_81AA398(u8 arg0) } } while (!(bits & 2)); - } while (!(bits & 4) && sub_81AA760(arg0, floorLayoutOffsets, squareId, var_28 + i)); + } while (!(bits & 4) && TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, squareId, objectStartIndex + i)); bits &= 1; } free(floorLayoutOffsets); } -static bool8 sub_81AA4D8(u8 arg0, u8 squareId) +static bool8 SetPyramidObjectPositionsInAndNearSquare(u8 objType, u8 squareId) { int i; - int var_28; + int objectStartIndex; int borderedIndex = 0; int r7 = 0; - int var_34 = 0; - int count; + int numPlacedObjects = 0; + int numObjects; u8 id = GetPyramidFloorTemplateId(); u8 *floorLayoutOffsets = AllocZeroed(16); - SetPyramidFloorLayoutOffsets(floorLayoutOffsets); - if (arg0 == 0) + GetPyramidFloorLayoutOffsets(floorLayoutOffsets); + if (objType == OBJ_TRAINERS) { - count = sPyramidFloorTemplates[id].numTrainers; - var_28 = 0; + numObjects = sPyramidFloorTemplates[id].numTrainers; + objectStartIndex = 0; } - else + else // OBJ_ITEMS { - count = sPyramidFloorTemplates[id].numItems; - var_28 = sPyramidFloorTemplates[id].numTrainers; + numObjects = sPyramidFloorTemplates[id].numItems; + objectStartIndex = sPyramidFloorTemplates[id].numTrainers; } - for (i = 0; i < count; i++) + for (i = 0; i < numObjects; i++) { if (r7 == 0) { - if (sub_81AA760(arg0, floorLayoutOffsets, squareId, var_28 + i)) + if (TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, squareId, objectStartIndex + i)) r7 = 1; else - var_34++; + numPlacedObjects++; } if (r7 & 1) { - if (sub_81AA760(arg0, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], var_28 + i)) + if (TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], objectStartIndex + i)) { do { @@ -1749,15 +1765,15 @@ static bool8 sub_81AA4D8(u8 arg0, u8 squareId) if (sBorderedSquareIds[squareId][borderedIndex] == 0xFF || borderedIndex >= 4) borderedIndex = 0; r7 += 2; - } while (r7 >> 1 != 4 && sub_81AA760(arg0, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], var_28 + i)); - var_34++; + } while (r7 >> 1 != 4 && TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], objectStartIndex + i)); + numPlacedObjects++; } else { borderedIndex++; if (sBorderedSquareIds[squareId][borderedIndex] == 0xFF || borderedIndex >= 4) borderedIndex = 0; - var_34++; + numPlacedObjects++; } } @@ -1768,51 +1784,51 @@ static bool8 sub_81AA4D8(u8 arg0, u8 squareId) } // free(floorLayoutOffsets); BUG: floorLayoutOffsets memory not freed - return (count / 2 > var_34); + return (numObjects / 2) > numPlacedObjects; } -static bool8 sub_81AA648(u8 arg0, u8 squareId) +static bool8 SetPyramidObjectPositionsNearSquare(u8 objType, u8 squareId) { int i; - int var_28; - int r4 = 0; - int r7 = 0; + int objectStartIndex; + int borderOffset = 0; + int numPlacedObjects = 0; int r8 = 0; - int count; + int numObjects; u8 id = GetPyramidFloorTemplateId(); u8 *floorLayoutOffsets = AllocZeroed(16); - SetPyramidFloorLayoutOffsets(floorLayoutOffsets); - if (arg0 == 0) + GetPyramidFloorLayoutOffsets(floorLayoutOffsets); + if (objType == OBJ_TRAINERS) { - count = sPyramidFloorTemplates[id].numTrainers; - var_28 = 0; + numObjects = sPyramidFloorTemplates[id].numTrainers; + objectStartIndex = 0; } - else + else // OBJ_ITEMS { - count = sPyramidFloorTemplates[id].numItems; - var_28 = sPyramidFloorTemplates[id].numTrainers; + numObjects = sPyramidFloorTemplates[id].numItems; + objectStartIndex = sPyramidFloorTemplates[id].numTrainers; } - for (i = 0; i < count; i++) + for (i = 0; i < numObjects; i++) { - if (sub_81AA760(arg0, floorLayoutOffsets, sBorderedSquareIds[squareId][r4], var_28 + i)) + if (TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderOffset], objectStartIndex + i)) { do { - r4++; - if (sBorderedSquareIds[squareId][r4] == 0xFF || r4 >= 4) - r4 = 0; + borderOffset++; + if (sBorderedSquareIds[squareId][borderOffset] == 0xFF || borderOffset >= 4) + borderOffset = 0; r8++; - } while (r8 != 4 && sub_81AA760(arg0, floorLayoutOffsets, sBorderedSquareIds[squareId][r4], var_28 + i)); - r7++; + } while (r8 != 4 && TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderOffset], objectStartIndex + i)); + numPlacedObjects++; } else { - r4++; - if (sBorderedSquareIds[squareId][r4] == 0xFF || r4 >= 4) - r4 = 0; - r7++; + borderOffset++; + if (sBorderedSquareIds[squareId][borderOffset] == 0xFF || borderOffset >= 4) + borderOffset = 0; + numPlacedObjects++; } if (r8 == 4) @@ -1820,32 +1836,31 @@ static bool8 sub_81AA648(u8 arg0, u8 squareId) } // free(floorLayoutOffsets); BUG: floorLayoutOffsets memory not freed - return (count / 2 > r7); + return (numObjects / 2) > numPlacedObjects; } -static bool8 sub_81AA760(u8 arg0, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId) +static bool8 TrySetPyramidEventObjectPositionInSquare(u8 objType, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId) { - int i, j; + int x, y; if (gSaveBlock2Ptr->frontier.pyramidRandoms[0] & 1) { - int minus1 = -1; - for (i = 7; i > minus1; i--) + for (y = 7; y > -1; y--) { - for (j = 7; j >= 0; j--) + for (x = 7; x > -1; x--) { - if (!sub_81AA810(arg0, j, i, floorLayoutOffsets, squareId, eventObjectId)) + if (!TrySetPyramidEventObjectPositionAtCoords(objType, x, y, floorLayoutOffsets, squareId, eventObjectId)) return FALSE; } } } else { - for (i = 0; i < 8; i++) + for (y = 0; y < 8; y++) { - for (j = 0; j < 8; j++) + for (x = 0; x < 8; x++) { - if (!sub_81AA810(arg0, j, i, floorLayoutOffsets, squareId, eventObjectId)) + if (!TrySetPyramidEventObjectPositionAtCoords(objType, x, y, floorLayoutOffsets, squareId, eventObjectId)) return FALSE; } } @@ -1854,11 +1869,11 @@ static bool8 sub_81AA760(u8 arg0, u8 *floorLayoutOffsets, u8 squareId, u8 eventO return TRUE; } -static bool8 sub_81AA810(u8 arg0, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId) +static bool8 TrySetPyramidEventObjectPositionAtCoords(u8 objType, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId) { int i, j; const struct MapHeader *mapHeader; - struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; + struct EventObjectTemplate *floorEvents = gSaveBlock1Ptr->eventObjectTemplates; mapHeader = Overworld_GetMapHeaderByGroupAndId(MAP_GROUP(BATTLE_PYRAMID_SQUARE01), floorLayoutOffsets[squareId] + MAP_NUM(BATTLE_PYRAMID_SQUARE01)); for (i = 0; i < mapHeader->events->eventObjectCount; i++) @@ -1866,37 +1881,39 @@ static bool8 sub_81AA810(u8 arg0, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareI if (mapHeader->events->eventObjects[i].x != x || mapHeader->events->eventObjects[i].y != y) continue; - if (arg0 != 0 || mapHeader->events->eventObjects[i].graphicsId == EVENT_OBJ_GFX_ITEM_BALL) + if (objType != OBJ_TRAINERS || mapHeader->events->eventObjects[i].graphicsId == EVENT_OBJ_GFX_ITEM_BALL) { - if (arg0 != 1 || mapHeader->events->eventObjects[i].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) + if (objType != OBJ_ITEMS || mapHeader->events->eventObjects[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++) { - if (events[j].x == x + ((squareId % 4) * 8) && events[j].y == y + ((squareId / 4) * 8)) + if (floorEvents[j].x == x + ((squareId % 4) * 8) && floorEvents[j].y == y + ((squareId / 4) * 8)) break; } - if (j != eventObjectId) - continue; - events[eventObjectId] = mapHeader->events->eventObjects[i]; - events[eventObjectId].x += ((squareId % 4) * 8); - events[eventObjectId].y += ((squareId / 4) * 8); - events[eventObjectId].localId = eventObjectId + 1; - if (events[eventObjectId].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) + if (j == eventObjectId) { - i = sub_81A9F90(eventObjectId); - events[eventObjectId].graphicsId = GetBattleFacilityTrainerGfxId(i); - gSaveBlock2Ptr->frontier.field_CB4[eventObjectId] = i; + 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) + { + i = GetUniqueTrainerId(eventObjectId); + floorEvents[eventObjectId].graphicsId = GetBattleFacilityTrainerGfxId(i); + gSaveBlock2Ptr->frontier.trainerIds[eventObjectId] = i; + } + return FALSE; } - return FALSE; } return TRUE; } -static void SetPyramidFloorLayoutOffsets(u8 *layoutOffsets) +static void GetPyramidFloorLayoutOffsets(u8 *layoutOffsets) { int i; int rand = (gSaveBlock2Ptr->frontier.pyramidRandoms[0]) | (gSaveBlock2Ptr->frontier.pyramidRandoms[1] << 16); @@ -1944,7 +1961,7 @@ u8 GetNumBattlePyramidEventObjects(void) static void InitPyramidBagItems(u8 lvlMode) { - s32 i; + int i; for (i = 0; i < PYRAMID_BAG_ITEMS_COUNT; i++) { diff --git a/src/battle_setup.c b/src/battle_setup.c index f5e9e3e9e9..7626420e92 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -874,8 +874,8 @@ u8 sub_80B100C(s32 arg0) return sUnknown_0854FE98[Random() % ARRAY_COUNT(sUnknown_0854FE98)]; } - var = gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum * 2 + 0] - + gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum * 2 + 1]; + var = gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum * 2 + 0] + + gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum * 2 + 1]; return sUnknown_0854FE98[var % ARRAY_COUNT(sUnknown_0854FE98)]; } @@ -1266,7 +1266,7 @@ void BattleSetup_StartTrainerBattle(void) ZeroMonData(&gEnemyParty[2]); } - sub_81A9B04(); + MarkApproachingPyramidTrainersAsBattled(); } else if (sub_81D5C18()) { diff --git a/src/battle_tent.c b/src/battle_tent.c index cb8149253f..d85883cd58 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -356,7 +356,7 @@ static void sub_81BA040(void) trainerId = Random() % 30; for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++) { - if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId) + if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) break; } } while (i != gSaveBlock2Ptr->frontier.curChallengeBattleNum); @@ -370,7 +370,7 @@ static void sub_81BA040(void) } if (gSaveBlock2Ptr->frontier.curChallengeBattleNum < 2) - gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A; + gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A; monSets = gFacilityTrainers[gTrainerBattleOpponent_A].monSets; i = 0; diff --git a/src/battle_tower.c b/src/battle_tower.c index 088ef79723..fbb77789e0 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -1311,15 +1311,15 @@ static void ChooseNextBattleTowerTrainer(void) if (battleMode == FRONTIER_MODE_MULTIS || battleMode == FRONTIER_MODE_LINK_MULTIS) { id = gSaveBlock2Ptr->frontier.curChallengeBattleNum; - gTrainerBattleOpponent_A = gSaveBlock2Ptr->frontier.field_CB4[id * 2]; - gTrainerBattleOpponent_B = gSaveBlock2Ptr->frontier.field_CB4[id * 2 + 1]; + gTrainerBattleOpponent_A = gSaveBlock2Ptr->frontier.trainerIds[id * 2]; + gTrainerBattleOpponent_B = gSaveBlock2Ptr->frontier.trainerIds[id * 2 + 1]; SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0); SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_B, 1); } else if (ChooseSpecialBattleTowerTrainer()) { SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0); - gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A; + gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A; } else { @@ -1331,7 +1331,7 @@ static void ChooseNextBattleTowerTrainer(void) // Ensure trainer wasn't previously fought in this challenge. for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++) { - if (gSaveBlock2Ptr->frontier.field_CB4[i] == id) + if (gSaveBlock2Ptr->frontier.trainerIds[i] == id) break; } if (i == gSaveBlock2Ptr->frontier.curChallengeBattleNum) @@ -1341,7 +1341,7 @@ static void ChooseNextBattleTowerTrainer(void) gTrainerBattleOpponent_A = id; SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0); if (gSaveBlock2Ptr->frontier.curChallengeBattleNum + 1 < 7) - gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A; + gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A; } } } @@ -2250,7 +2250,7 @@ void DoSpecialTrainerBattle(void) break; case FRONTIER_MODE_MULTIS: FillFrontierTrainersParties(2); - gPartnerTrainerId = gSaveBlock2Ptr->frontier.field_CB4[17]; + gPartnerTrainerId = gSaveBlock2Ptr->frontier.trainerIds[17]; FillPartnerParty(gPartnerTrainerId); gBattleTypeFlags |= BATTLE_TYPE_DOUBLE | BATTLE_TYPE_INGAME_PARTNER | BATTLE_TYPE_MULTI | BATTLE_TYPE_TWO_OPPONENTS; break; @@ -2524,32 +2524,32 @@ static void sub_81642A0(void) trainerId = sub_8162548(challengeNum, 0); for (i = 0; i < j; i++) { - if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId) + if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) break; - if (gFacilityTrainers[gSaveBlock2Ptr->frontier.field_CB4[i]].facilityClass == gFacilityTrainers[trainerId].facilityClass) + if (gFacilityTrainers[gSaveBlock2Ptr->frontier.trainerIds[i]].facilityClass == gFacilityTrainers[trainerId].facilityClass) break; } } while (i != j); - gSaveBlock2Ptr->frontier.field_CB4[j] = trainerId; + gSaveBlock2Ptr->frontier.trainerIds[j] = trainerId; j++; } while (j < 6); r10 = 8; for (i = 0; i < 6; i++) { - trainerId = gSaveBlock2Ptr->frontier.field_CB4[i]; + trainerId = gSaveBlock2Ptr->frontier.trainerIds[i]; eventObjTemplates[i + 1].graphicsId = GetBattleFacilityTrainerGfxId(trainerId); for (j = 0; j < 2; j++) { while (1) { monSetId = RandomizeFacilityTrainerMonSet(trainerId); - if (j % 2 != 0 && gFacilityTrainerMons[gSaveBlock2Ptr->frontier.field_CB4[r10 - 1]].itemTableId == gFacilityTrainerMons[monSetId].itemTableId) + if (j % 2 != 0 && gFacilityTrainerMons[gSaveBlock2Ptr->frontier.trainerIds[r10 - 1]].itemTableId == gFacilityTrainerMons[monSetId].itemTableId) continue; for (k = 8; k < r10; k++) { - if (gFacilityTrainerMons[gSaveBlock2Ptr->frontier.field_CB4[k]].species == gFacilityTrainerMons[monSetId].species) + if (gFacilityTrainerMons[gSaveBlock2Ptr->frontier.trainerIds[k]].species == gFacilityTrainerMons[monSetId].species) break; if (species1 == gFacilityTrainerMons[monSetId].species) break; @@ -2560,7 +2560,7 @@ static void sub_81642A0(void) break; } - gSaveBlock2Ptr->frontier.field_CB4[r10] = monSetId; + gSaveBlock2Ptr->frontier.trainerIds[r10] = monSetId; r10++; } } @@ -2591,10 +2591,10 @@ static void sub_81642A0(void) } if (r10 != 0) { - gSaveBlock2Ptr->frontier.field_CB4[6] = spArray[Random() % r10]; - eventObjTemplates[7].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.field_CB4[6]); + gSaveBlock2Ptr->frontier.trainerIds[6] = spArray[Random() % r10]; + eventObjTemplates[7].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[6]); FlagClear(FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1); - sub_81640E0(gSaveBlock2Ptr->frontier.field_CB4[6]); + sub_81640E0(gSaveBlock2Ptr->frontier.trainerIds[6]); } r10 = 0; @@ -2634,10 +2634,10 @@ static void sub_81642A0(void) } if (r10 != 0) { - gSaveBlock2Ptr->frontier.field_CB4[7] = spArray[Random() % r10]; - eventObjTemplates[8].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.field_CB4[7]); + gSaveBlock2Ptr->frontier.trainerIds[7] = spArray[Random() % r10]; + eventObjTemplates[8].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[7]); FlagClear(FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2); - sub_8164188(gSaveBlock2Ptr->frontier.field_CB4[7]); + sub_8164188(gSaveBlock2Ptr->frontier.trainerIds[7]); } } @@ -2684,7 +2684,7 @@ static void sub_8164828(void) u16 winStreak = GetCurrentFacilityWinStreak(); s32 challengeNum = winStreak / 7; s32 k = gSpecialVar_LastTalked - 2; - s32 trainerId = gSaveBlock2Ptr->frontier.field_CB4[k]; + s32 trainerId = gSaveBlock2Ptr->frontier.trainerIds[k]; for (arrId = 0; arrId < ARRAY_COUNT(gUnknown_085DD500); arrId++) { @@ -2717,29 +2717,29 @@ static void sub_8164828(void) } break; case 1: - monSetId = gSaveBlock2Ptr->frontier.field_CB4[8 + k * 2]; + monSetId = gSaveBlock2Ptr->frontier.trainerIds[8 + k * 2]; sub_81646BC(trainerId, monSetId); break; case 2: - monSetId = gSaveBlock2Ptr->frontier.field_CB4[9 + k * 2]; + monSetId = gSaveBlock2Ptr->frontier.trainerIds[9 + k * 2]; sub_81646BC(trainerId, monSetId); break; case 3: gPartnerTrainerId = trainerId; if (trainerId < TRAINER_RECORD_MIXING_FRIEND) { - gSaveBlock2Ptr->frontier.field_CB4[18] = gSaveBlock2Ptr->frontier.field_CB4[8 + k * 2]; - gSaveBlock2Ptr->frontier.field_CB4[19] = gSaveBlock2Ptr->frontier.field_CB4[9 + k * 2]; + gSaveBlock2Ptr->frontier.trainerIds[18] = gSaveBlock2Ptr->frontier.trainerIds[8 + k * 2]; + gSaveBlock2Ptr->frontier.trainerIds[19] = gSaveBlock2Ptr->frontier.trainerIds[9 + k * 2]; } else if (trainerId < TRAINER_RECORD_MIXING_APPRENTICE) { - gSaveBlock2Ptr->frontier.field_CB4[18] = gUnknown_03006298[2]; - gSaveBlock2Ptr->frontier.field_CB4[19] = gUnknown_03006298[3]; + gSaveBlock2Ptr->frontier.trainerIds[18] = gUnknown_03006298[2]; + gSaveBlock2Ptr->frontier.trainerIds[19] = gUnknown_03006298[3]; } else { - gSaveBlock2Ptr->frontier.field_CB4[18] = gUnknown_03006298[0]; - gSaveBlock2Ptr->frontier.field_CB4[19] = gUnknown_03006298[1]; + gSaveBlock2Ptr->frontier.trainerIds[18] = gUnknown_03006298[0]; + gSaveBlock2Ptr->frontier.trainerIds[19] = gUnknown_03006298[1]; } for (k = 0; k < 14; k++) { @@ -2751,15 +2751,15 @@ static void sub_8164828(void) for (j = 0; j < k; j++) { - if (gSaveBlock2Ptr->frontier.field_CB4[j] == i) + if (gSaveBlock2Ptr->frontier.trainerIds[j] == i) break; } if (j == k) break; } - gSaveBlock2Ptr->frontier.field_CB4[k] = i; + gSaveBlock2Ptr->frontier.trainerIds[k] = i; } - gSaveBlock2Ptr->frontier.field_CB4[17] = trainerId; + gSaveBlock2Ptr->frontier.trainerIds[17] = trainerId; break; case 4: break; @@ -2825,12 +2825,12 @@ static void sub_8164B74(void) trainerId = sub_8162548(challengeNum, i / 2); for (j = 0; j < i; j++) { - if (gSaveBlock2Ptr->frontier.field_CB4[j] == trainerId) + if (gSaveBlock2Ptr->frontier.trainerIds[j] == trainerId) break; } } while (i != j); if (i == j) // This condition is always true, because of the loop above. - gSaveBlock2Ptr->frontier.field_CB4[i] = trainerId; + gSaveBlock2Ptr->frontier.trainerIds[i] = trainerId; } gSpecialVar_Result = 2; } @@ -2838,7 +2838,7 @@ static void sub_8164B74(void) case 2: if (IsLinkTaskFinished()) { - SendBlock(bitmask_all_link_players_but_self(), &gSaveBlock2Ptr->frontier.field_CB4, sizeof(gSaveBlock2Ptr->frontier.field_CB4)); + SendBlock(bitmask_all_link_players_but_self(), &gSaveBlock2Ptr->frontier.trainerIds, sizeof(gSaveBlock2Ptr->frontier.trainerIds)); gSpecialVar_Result = 3; } break; @@ -2846,9 +2846,9 @@ static void sub_8164B74(void) if ((GetBlockReceivedStatus() & 3) == 3) { ResetBlockReceivedFlags(); - memcpy(&gSaveBlock2Ptr->frontier.field_CB4, gBlockRecvBuffer, sizeof(gSaveBlock2Ptr->frontier.field_CB4)); - gTrainerBattleOpponent_A = gSaveBlock2Ptr->frontier.field_CB4[battleNum * 2]; - gTrainerBattleOpponent_B = gSaveBlock2Ptr->frontier.field_CB4[battleNum * 2 + 1]; + memcpy(&gSaveBlock2Ptr->frontier.trainerIds, gBlockRecvBuffer, sizeof(gSaveBlock2Ptr->frontier.trainerIds)); + gTrainerBattleOpponent_A = gSaveBlock2Ptr->frontier.trainerIds[battleNum * 2]; + gTrainerBattleOpponent_B = gSaveBlock2Ptr->frontier.trainerIds[battleNum * 2 + 1]; SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0); SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_B, 1); if (gReceivedRemoteLinkPlayers != 0 && gWirelessCommType == 0) @@ -2880,7 +2880,7 @@ static void sub_8164DCC(void) static void sub_8164DE4(void) { - SetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.field_CB4[17], 0xF); + SetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[17], 0xF); } static void sub_8164E04(void) @@ -3213,7 +3213,7 @@ static void FillPartnerParty(u16 trainerId) otID = Random32(); for (i = 0; i < 2; i++) { - monSetId = gSaveBlock2Ptr->frontier.field_CB4[i + 18]; + monSetId = gSaveBlock2Ptr->frontier.trainerIds[i + 18]; CreateMonWithEVSpreadNatureOTID(&gPlayerParty[3 + i], gFacilityTrainerMons[monSetId].species, level, @@ -3243,7 +3243,7 @@ static void FillPartnerParty(u16 trainerId) for (i = 0; i < 2; i++) { struct EmeraldBattleTowerRecord *record = &gSaveBlock2Ptr->frontier.towerRecords[trainerId]; - struct BattleTowerPokemon monData = record->party[gSaveBlock2Ptr->frontier.field_CB4[18 + i]]; + struct BattleTowerPokemon monData = record->party[gSaveBlock2Ptr->frontier.trainerIds[18 + i]]; StringCopy(trainerName, record->name); if (record->language == LANGUAGE_JAPANESE) { @@ -3269,7 +3269,7 @@ static void FillPartnerParty(u16 trainerId) trainerId -= TRAINER_RECORD_MIXING_APPRENTICE; for (i = 0; i < 2; i++) { - CreateApprenticeMon(&gPlayerParty[3 + i], &gSaveBlock2Ptr->apprentices[trainerId], gSaveBlock2Ptr->frontier.field_CB4[18 + i]); + CreateApprenticeMon(&gPlayerParty[3 + i], &gSaveBlock2Ptr->apprentices[trainerId], gSaveBlock2Ptr->frontier.trainerIds[18 + i]); j = IsFrontierTrainerFemale(trainerId + TRAINER_RECORD_MIXING_APPRENTICE); SetMonData(&gPlayerParty[3 + i], MON_DATA_OT_GENDER, &j); } @@ -3564,7 +3564,7 @@ static void sub_8165E18(void) trainerId = sub_8165D40(); for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++) { - if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId) + if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) break; } } while (i != gSaveBlock2Ptr->frontier.curChallengeBattleNum); @@ -3572,7 +3572,7 @@ static void sub_8165E18(void) gTrainerBattleOpponent_A = trainerId; SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0); if (gSaveBlock2Ptr->frontier.curChallengeBattleNum + 1 < 3) - gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A; + gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A; } static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount) diff --git a/src/frontier_util.c b/src/frontier_util.c index 742b738588..e6954c3560 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -1827,7 +1827,7 @@ void sub_81A3ACC(void) s32 i; for (i = 0; i < 20; i++) - gSaveBlock2Ptr->frontier.field_CB4[i] = 0xFFFF; + gSaveBlock2Ptr->frontier.trainerIds[i] = 0xFFFF; } static void sub_81A3B00(void) diff --git a/src/overworld.c b/src/overworld.c index 8119204f29..2bc4f96d56 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -124,7 +124,6 @@ extern void sub_80AF3C8(void); extern void ExecuteTruckSequence(void); extern void sub_80A0A38(void); extern void WriteFlashScanlineEffectBuffer(u8); -extern void sub_81AA2F8(void); extern void InitMatchCallCounters(void); extern void sub_80EDB44(void); extern void InitFieldMessageBox(void); @@ -886,7 +885,7 @@ static void mli0_load_map(u32 a1) if (!(sUnknown_020322D8 & 1)) { if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) - sub_81AA1D8(); + LoadBattlePyramidEventObjectTemplates(); else if (InTrainerHill()) sub_81D5DF8(); else @@ -1753,7 +1752,7 @@ void CB2_ContinueSavedGame(void) ClearDiveAndHoleWarps(); trainerHillMapId = GetCurrentTrainerHillMapId(); if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) - sub_81AA2F8(); + LoadBattlePyramidFloorEventObjectScripts(); else if (trainerHillMapId != 0 && trainerHillMapId != 6) sub_81D5F48(); else diff --git a/src/pokemon.c b/src/pokemon.c index 5f16644501..9553fdf17f 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6081,7 +6081,7 @@ s32 GetBattlerMultiplayerId(u16 a1) u8 GetTrainerEncounterMusicId(u16 trainerOpponentId) { if (InBattlePyramid()) - return GetTrainerEncounterMusicIdInBattlePyramind(trainerOpponentId); + return GetBattlePyramindTrainerEncounterMusicId(trainerOpponentId); else if (sub_81D5C18()) return GetTrainerEncounterMusicIdInTrainerHill(trainerOpponentId); else diff --git a/src/start_menu.c b/src/start_menu.c index d932e1d6b3..334330b672 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -36,6 +36,7 @@ #include "international_string_util.h" #include "constants/songs.h" #include "field_player_avatar.h" +#include "battle_pyramid.h" #include "battle_pyramid_bag.h" #include "battle_pike.h" #include "new_game.h" @@ -94,9 +95,7 @@ extern void CB2_Pokedex(void); extern void PlayRainSoundEffect(void); extern void CB2_PokeNav(void); extern void ScriptUnfreezeEventObjects(void); -extern void sub_81A9EC8(void); extern void save_serialize_map(void); -extern void sub_81A9E90(void); // Menu action callbacks static bool8 StartMenuPokedexCallback(void); @@ -798,7 +797,7 @@ static bool8 SaveCallback(void) sub_8197DF8(0, TRUE); ScriptUnfreezeEventObjects(); ScriptContext2_Disable(); - sub_81A9EC8(); + SoftResetInBattlePyramid(); return TRUE; } diff --git a/src/trainer_hill.c b/src/trainer_hill.c index 309ffdb1d7..efe11b0c7d 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -660,7 +660,7 @@ void sub_81D5DF8(void) SetUpDataStruct(); for (i = 0; i < 2; i++) - gSaveBlock2Ptr->frontier.field_CB4[i] = 0xFFFF; + gSaveBlock2Ptr->frontier.trainerIds[i] = 0xFFFF; CpuFill32(0, gSaveBlock1Ptr->eventObjectTemplates, sizeof(gSaveBlock1Ptr->eventObjectTemplates)); floorId = GetFloorId(); @@ -677,7 +677,7 @@ void sub_81D5DF8(void) eventTemplates[i].movementType = ((sHillData->tag.floors[floorId].direction >> bits) & 0xF) + MOVEMENT_TYPE_FACE_UP; eventTemplates[i].trainerRange_berryTreeId = (sHillData->tag.floors[floorId].range >> bits) & 0xF; eventTemplates[i].script = EventScript_2C83F0; - gSaveBlock2Ptr->frontier.field_CB4[i] = i + 1; + gSaveBlock2Ptr->frontier.trainerIds[i] = i + 1; } FreeDataStruct(); @@ -874,7 +874,7 @@ const struct WarpEvent* sub_81D6134(u8 warpEventId) u16 LocalIdToHillTrainerId(u8 localId) { - return gSaveBlock2Ptr->frontier.field_CB4[localId - 1]; + return gSaveBlock2Ptr->frontier.trainerIds[localId - 1]; } bool8 GetHillTrainerFlag(u8 eventObjectId) @@ -892,7 +892,7 @@ void SetHillTrainerFlag(void) for (i = 0; i < 2; i++) { - if (gSaveBlock2Ptr->frontier.field_CB4[i] == gTrainerBattleOpponent_A) + if (gSaveBlock2Ptr->frontier.trainerIds[i] == gTrainerBattleOpponent_A) { gSaveBlock2Ptr->frontier.field_EE0 |= gBitTable[floorId + i]; break; @@ -903,7 +903,7 @@ void SetHillTrainerFlag(void) { for (i = 0; i < 2; i++) { - if (gSaveBlock2Ptr->frontier.field_CB4[i] == gTrainerBattleOpponent_B) + if (gSaveBlock2Ptr->frontier.trainerIds[i] == gTrainerBattleOpponent_B) { gSaveBlock2Ptr->frontier.field_EE0 |= gBitTable[floorId + i]; break; From b52871433a49c33a27d480e358b7cd695f65e214 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 7 Feb 2019 11:54:51 -0600 Subject: [PATCH 021/217] Fix typo --- src/battle_pyramid.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index aa088e6c68..824a2946d8 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -68,8 +68,8 @@ enum OBJ_POSITIONS_UNIFORM, OBJ_POSITIONS_IN_AND_NEAR_ENTRANCE, OBJ_POSITIONS_IN_AND_NEAR_EXIT, - OBJ_POSITIONS_NEAR_NEAR_ENTRANCE, - OBJ_POSITIONS_NEAR_NEAR_EXIT, + OBJ_POSITIONS_NEAR_ENTRANCE, + OBJ_POSITIONS_NEAR_EXIT, }; struct PyramidWildMon @@ -210,7 +210,7 @@ static const struct PyramidFloorTemplate sPyramidFloorTemplates[] = .numItems = 3, .numTrainers = 6, .itemPositions = OBJ_POSITIONS_UNIFORM, - .trainerPositions = OBJ_POSITIONS_NEAR_NEAR_EXIT, + .trainerPositions = OBJ_POSITIONS_NEAR_EXIT, .runMultiplier = 96, .layoutOffsets = {8, 9, 10, 11, 12, 13, 14, 15}, }, @@ -1628,11 +1628,11 @@ void LoadBattlePyramidEventObjectTemplates(void) if (SetPyramidObjectPositionsInAndNearSquare(i, exitSquareId)) SetPyramidObjectPositionsUniformly(i); break; - case OBJ_POSITIONS_NEAR_NEAR_ENTRANCE: + case OBJ_POSITIONS_NEAR_ENTRANCE: if (SetPyramidObjectPositionsNearSquare(i, entranceSquareId)) SetPyramidObjectPositionsUniformly(i); break; - case OBJ_POSITIONS_NEAR_NEAR_EXIT: + case OBJ_POSITIONS_NEAR_EXIT: if (SetPyramidObjectPositionsNearSquare(i, exitSquareId)) SetPyramidObjectPositionsUniformly(i); break; From 4785a07acd8d27372f12eebca84b5a67e0591f3c Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 7 Feb 2019 12:58:09 -0600 Subject: [PATCH 022/217] Document battle factory functions --- include/battle_factory.h | 4 +- include/global.h | 4 +- src/battle_factory.c | 194 ++++++++++++++++++----------------- src/battle_factory_screen.c | 22 ++-- src/battle_tent.c | 4 +- src/pokemon_summary_screen.c | 10 +- 6 files changed, 121 insertions(+), 117 deletions(-) diff --git a/include/battle_factory.h b/include/battle_factory.h index 2db041b064..5606d60d1e 100644 --- a/include/battle_factory.h +++ b/include/battle_factory.h @@ -2,10 +2,10 @@ #define GUARD_BATTLE_FACTORY_H void CallBattleFactoryFunction(void); -bool8 sub_81A6BF4(void); +bool8 InBattleFactory(void); u8 GetFactoryMonFixedIV(u8 arg0, u8 arg1); void FillFactoryBrainParty(void); -u8 sub_81A6F70(u8 battleMode, u8 lvlMode); +u8 GetNumPastRentalsRank(u8 battleMode, u8 lvlMode); u32 GetAiScriptsInBattleFactory(void); void SetMonMoveAvoidReturn(struct Pokemon *mon, u16 moveArg, u8 moveSlot); diff --git a/include/global.h b/include/global.h index 6c1b7c5bb5..831b830425 100644 --- a/include/global.h +++ b/include/global.h @@ -277,7 +277,7 @@ struct FrontierMonData u8 nature; }; -struct Struct_field_E70 +struct RentalMon { u16 monId; u32 personality; @@ -370,7 +370,7 @@ struct BattleFrontier /*0xE6A*/ u16 field_E6A; /*0xE6C*/ u16 field_E6C; /*0xE6E*/ u16 field_E6E; - /*0xE70*/ struct Struct_field_E70 field_E70[6]; + /*0xE70*/ struct RentalMon rentalMons[6]; /*0xEB8*/ u16 battlePoints; /*0xEBA*/ u16 field_EBA; /*0xEBC*/ u32 battlesCount; diff --git a/src/battle_factory.c b/src/battle_factory.c index db67b0b13b..170a1b91ec 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -16,28 +16,28 @@ #include "constants/moves.h" // IWRAM bss -static IWRAM_DATA bool8 gUnknown_03001288; +static IWRAM_DATA bool8 sPerformedRentalSwap; // This file's functions. -static void sub_81A5E94(void); -static void sub_81A5FA8(void); -static void sub_81A6054(void); +static void InitFactoryChallenge(void); +static void GetBattleFactoryData(void); +static void SetBattleFactoryData(void); static void sub_81A613C(void); static void nullsub_75(void); static void nullsub_123(void); -static void sub_81A6188(void); -static void sub_81A6198(void); -static void sub_81A61A4(void); -static void sub_81A63CC(void); -static void sub_81A64C4(void); -static void sub_81A63B8(void); -static void sub_81A61B0(void); -static void sub_81A67EC(void); -static void sub_81A6A08(void); -static void sub_81A6AEC(void); -static void sub_81A6C1C(void); +static void SelectInitialRentalMons(void); +static void SwapRentalMons(void); +static void SetPerformedRentalSwap(void); +static void SetRentalsToOpponentParty(void); +static void SetPlayerAndOpponentParties(void); +static void SetOpponentGfxVar(void); +static void GenerateOpponentMons(void); +static void GenerateInitialRentalMons(void); +static void GetOpponentMostCommonMonType(void); +static void GetOpponentBattleStyle(void); +static void RestorePlayerPartyHeldItems(void); static u16 GetMonSetId(u8 lvlMode, u8 challengeNum, bool8 arg2); -static u8 GetStyleForMove(u16 move); +static u8 GetMoveBattleStyle(u16 move); // Const rom data. static const u8 sRequiredMoveCounts[] = {3, 3, 3, 2, 2, 2, 2}; @@ -110,25 +110,25 @@ static const u16 *const sMoveStyles[] = sMoves_DependsOnTheBattlesFlow, }; -static void (* const gUnknown_08612120[])(void) = +static void (* const sBattleFactoryFunctions[])(void) = { - sub_81A5E94, - sub_81A5FA8, - sub_81A6054, + InitFactoryChallenge, + GetBattleFactoryData, + SetBattleFactoryData, sub_81A613C, nullsub_75, nullsub_123, - sub_81A6188, - sub_81A6198, - sub_81A61A4, - sub_81A63CC, - sub_81A64C4, - sub_81A63B8, - sub_81A61B0, - sub_81A67EC, - sub_81A6A08, - sub_81A6AEC, - sub_81A6C1C, + SelectInitialRentalMons, + SwapRentalMons, + SetPerformedRentalSwap, + SetRentalsToOpponentParty, + SetPlayerAndOpponentParties, + SetOpponentGfxVar, + GenerateOpponentMons, + GenerateInitialRentalMons, + GetOpponentMostCommonMonType, + GetOpponentBattleStyle, + RestorePlayerPartyHeldItems, }; static const u32 gUnknown_08612164[][2] = @@ -178,10 +178,10 @@ static const u16 sMonsToChooseFrom[][2] = // code void CallBattleFactoryFunction(void) { - gUnknown_08612120[gSpecialVar_0x8004](); + sBattleFactoryFunctions[gSpecialVar_0x8004](); } -static void sub_81A5E94(void) +static void InitFactoryChallenge(void) { u8 i; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; @@ -197,9 +197,9 @@ static void sub_81A5E94(void) gSaveBlock2Ptr->frontier.factoryRentsCount[battleMode][lvlMode] = 0; } - gUnknown_03001288 = FALSE; + sPerformedRentalSwap = FALSE; for (i = 0; i < 6; i++) - gSaveBlock2Ptr->frontier.field_E70[i].monId = 0xFFFF; + gSaveBlock2Ptr->frontier.rentalMons[i].monId = 0xFFFF; for (i = 0; i < 3; i++) gUnknown_03006298[i] = 0xFFFF; @@ -207,10 +207,10 @@ static void sub_81A5E94(void) gTrainerBattleOpponent_A = 0; } -static void sub_81A5FA8(void) +static void GetBattleFactoryData(void) { - u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; - u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); + int lvlMode = gSaveBlock2Ptr->frontier.lvlMode; + int battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); switch (gSpecialVar_0x8005) { @@ -226,10 +226,10 @@ static void sub_81A5FA8(void) } } -static void sub_81A6054(void) +static void SetBattleFactoryData(void) { - u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; - u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); + int lvlMode = gSaveBlock2Ptr->frontier.lvlMode; + int battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); switch (gSpecialVar_0x8005) { @@ -243,10 +243,10 @@ static void sub_81A6054(void) gSaveBlock2Ptr->frontier.field_CDC &= gUnknown_08612174[battleMode][lvlMode]; break; case 3: - if (gUnknown_03001288 == TRUE) + if (sPerformedRentalSwap == TRUE) { gSaveBlock2Ptr->frontier.factoryRentsCount[battleMode][lvlMode] = gSpecialVar_0x8006; - gUnknown_03001288 = FALSE; + sPerformedRentalSwap = FALSE; } break; } @@ -270,28 +270,28 @@ static void nullsub_123(void) } -static void sub_81A6188(void) +static void SelectInitialRentalMons(void) { ZeroPlayerPartyMons(); DoBattleFactorySelectScreen(); } -static void sub_81A6198(void) +static void SwapRentalMons(void) { DoBattleFactorySwapScreen(); } -static void sub_81A61A4(void) +static void SetPerformedRentalSwap(void) { - gUnknown_03001288 = TRUE; + sPerformedRentalSwap = TRUE; } -static void sub_81A61B0(void) +static void GenerateOpponentMons(void) { - s32 i, j, k; + int i, j, k; u16 species[3]; u16 heldItems[3]; - s32 firstMonId = 0; + int firstMonId = 0; u16 trainerId = 0; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); @@ -322,7 +322,7 @@ static void sub_81A61B0(void) for (j = 0; j < 6; j++) { - if (gFacilityTrainerMons[monSetId].species == gFacilityTrainerMons[gSaveBlock2Ptr->frontier.field_E70[j].monId].species) + if (gFacilityTrainerMons[monSetId].species == gFacilityTrainerMons[gSaveBlock2Ptr->frontier.rentalMons[j].monId].species) break; } if (j != 6) @@ -333,6 +333,7 @@ static void sub_81A61B0(void) for (k = firstMonId; k < firstMonId + i; k++) { + // BUG: Small undefined behavior bug, since species array values were not initialized. if (species[k] == gFacilityTrainerMons[monSetId].species) break; } @@ -341,6 +342,7 @@ static void sub_81A61B0(void) for (k = firstMonId; k < firstMonId + i; k++) { + // BUG: Small undefined behavior bug, since heldItems array values were not initialized. if (heldItems[k] != 0 && heldItems[k] == gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]) break; } @@ -354,12 +356,12 @@ static void sub_81A61B0(void) } } -static void sub_81A63B8(void) +static void SetOpponentGfxVar(void) { SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0); } -static void sub_81A63CC(void) +static void SetRentalsToOpponentParty(void) { u8 i; @@ -370,18 +372,18 @@ static void sub_81A63CC(void) for (i = 0; i < 3; i++) { - gSaveBlock2Ptr->frontier.field_E70[i + 3].monId = gUnknown_03006298[i]; - gSaveBlock2Ptr->frontier.field_E70[i + 3].ivs = GetBoxMonData(&gEnemyParty[i].box, MON_DATA_ATK_IV, NULL); - gSaveBlock2Ptr->frontier.field_E70[i + 3].personality = GetMonData(&gEnemyParty[i], MON_DATA_PERSONALITY, NULL); - gSaveBlock2Ptr->frontier.field_E70[i + 3].abilityBit = GetBoxMonData(&gEnemyParty[i].box, MON_DATA_ALT_ABILITY, NULL); + gSaveBlock2Ptr->frontier.rentalMons[i + 3].monId = gUnknown_03006298[i]; + gSaveBlock2Ptr->frontier.rentalMons[i + 3].ivs = GetBoxMonData(&gEnemyParty[i].box, MON_DATA_ATK_IV, NULL); + gSaveBlock2Ptr->frontier.rentalMons[i + 3].personality = GetMonData(&gEnemyParty[i], MON_DATA_PERSONALITY, NULL); + gSaveBlock2Ptr->frontier.rentalMons[i + 3].abilityBit = GetBoxMonData(&gEnemyParty[i].box, MON_DATA_ALT_ABILITY, NULL); SetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[gUnknown_03006298[i]].itemTableId]); } } -static void sub_81A64C4(void) +static void SetPlayerAndOpponentParties(void) { - s32 i, j, k; - s32 count = 0; + int i, j, k; + int count = 0; u8 bits = 0; u8 monLevel; u16 monSetId; @@ -408,13 +410,13 @@ static void sub_81A64C4(void) ZeroPlayerPartyMons(); for (i = 0; i < 3; i++) { - monSetId = gSaveBlock2Ptr->frontier.field_E70[i].monId; - ivs = gSaveBlock2Ptr->frontier.field_E70[i].ivs; + monSetId = gSaveBlock2Ptr->frontier.rentalMons[i].monId; + ivs = gSaveBlock2Ptr->frontier.rentalMons[i].ivs; CreateMon(&gPlayerParty[i], gFacilityTrainerMons[monSetId].species, monLevel, ivs, - TRUE, gSaveBlock2Ptr->frontier.field_E70[i].personality, + TRUE, gSaveBlock2Ptr->frontier.rentalMons[i].personality, 0, 0); count = 0; @@ -439,7 +441,7 @@ static void sub_81A64C4(void) SetMonMoveAvoidReturn(&gPlayerParty[i], gFacilityTrainerMons[monSetId].moves[k], k); SetMonData(&gPlayerParty[i], MON_DATA_FRIENDSHIP, &friendship); SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]); - SetMonData(&gPlayerParty[i], MON_DATA_ALT_ABILITY, &gSaveBlock2Ptr->frontier.field_E70[i].abilityBit); + SetMonData(&gPlayerParty[i], MON_DATA_ALT_ABILITY, &gSaveBlock2Ptr->frontier.rentalMons[i].abilityBit); } } @@ -449,13 +451,13 @@ static void sub_81A64C4(void) case 2: for (i = 0; i < 3; i++) { - monSetId = gSaveBlock2Ptr->frontier.field_E70[i + 3].monId; - ivs = gSaveBlock2Ptr->frontier.field_E70[i + 3].ivs; + monSetId = gSaveBlock2Ptr->frontier.rentalMons[i + 3].monId; + ivs = gSaveBlock2Ptr->frontier.rentalMons[i + 3].ivs; CreateMon(&gEnemyParty[i], gFacilityTrainerMons[monSetId].species, monLevel, ivs, - TRUE, gSaveBlock2Ptr->frontier.field_E70[i + 3].personality, + TRUE, gSaveBlock2Ptr->frontier.rentalMons[i + 3].personality, 0, 0); count = 0; @@ -478,15 +480,15 @@ static void sub_81A64C4(void) for (k = 0; k < MAX_MON_MOVES; k++) SetMonMoveAvoidReturn(&gEnemyParty[i], gFacilityTrainerMons[monSetId].moves[k], k); SetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]); - SetMonData(&gEnemyParty[i], MON_DATA_ALT_ABILITY, &gSaveBlock2Ptr->frontier.field_E70[i + 3].abilityBit); + SetMonData(&gEnemyParty[i], MON_DATA_ALT_ABILITY, &gSaveBlock2Ptr->frontier.rentalMons[i + 3].abilityBit); } break; } } -static void sub_81A67EC(void) +static void GenerateInitialRentalMons(void) { - s32 i, j; + int i, j; u8 firstMonId; u8 battleMode; u8 lvlMode; @@ -526,7 +528,7 @@ static void sub_81A67EC(void) factoryLvlMode = FRONTIER_LVL_50; firstMonId = 0; } - var_40 = sub_81A6F70(factoryBattleMode, factoryLvlMode); + var_40 = GetNumPastRentalsRank(factoryBattleMode, factoryLvlMode); currSpecies = SPECIES_NONE; i = 0; @@ -570,7 +572,7 @@ static void sub_81A67EC(void) if (j != firstMonId + i) continue; - gSaveBlock2Ptr->frontier.field_E70[i].monId = monSetId; + gSaveBlock2Ptr->frontier.rentalMons[i].monId = monSetId; species[i] = gFacilityTrainerMons[monSetId].species; heldItems[i] = gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]; monIds[i] = monSetId; @@ -578,7 +580,7 @@ static void sub_81A67EC(void) } } -static void sub_81A6A08(void) +static void GetOpponentMostCommonMonType(void) { u8 i; u8 typesCount[NUMBER_OF_MON_TYPES]; @@ -613,7 +615,7 @@ static void sub_81A6A08(void) gSpecialVar_Result = NUMBER_OF_MON_TYPES; } -static void sub_81A6AEC(void) +static void GetOpponentBattleStyle(void) { u8 i, j, count; u8 stylePoints[8]; @@ -622,13 +624,14 @@ static void sub_81A6AEC(void) gFacilityTrainerMons = gBattleFrontierMons; for (i = 0; i < 8; i++) stylePoints[i] = 0; + for (i = 0; i < 3; i++) { u16 monSetId = gUnknown_03006298[i]; for (j = 0; j < MAX_MON_MOVES; j++) { - u8 id = GetStyleForMove(gFacilityTrainerMons[monSetId].moves[j]); - stylePoints[id]++; + u8 battleStyle = GetMoveBattleStyle(gFacilityTrainerMons[monSetId].moves[j]); + stylePoints[battleStyle]++; } } @@ -641,11 +644,12 @@ static void sub_81A6AEC(void) count++; } } + if (count > 2) gSpecialVar_Result = 8; } -static u8 GetStyleForMove(u16 move) +static u8 GetMoveBattleStyle(u16 move) { const u16 *moves; u8 i, j; @@ -661,13 +665,13 @@ static u8 GetStyleForMove(u16 move) return 0; } -bool8 sub_81A6BF4(void) +bool8 InBattleFactory(void) { return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM; } -static void sub_81A6C1C(void) +static void RestorePlayerPartyHeldItems(void) { u8 i; @@ -680,7 +684,7 @@ static void sub_81A6C1C(void) { SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, - &gBattleFrontierHeldItems[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.field_E70[i].monId].itemTableId]); + &gBattleFrontierHeldItems[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.rentalMons[i].monId].itemTableId]); } } @@ -699,11 +703,11 @@ u8 GetFactoryMonFixedIV(u8 arg0, u8 arg1) void FillFactoryBrainParty(void) { - s32 i, j, k; + int i, j, k; u16 species[3]; u16 heldItems[3]; u8 friendship; - s32 monLevel; + int monLevel; u8 fixedIV; u32 otId; @@ -726,7 +730,7 @@ void FillFactoryBrainParty(void) for (j = 0; j < 6; j++) { - if (monSetId == gSaveBlock2Ptr->frontier.field_E70[j].monId) + if (monSetId == gSaveBlock2Ptr->frontier.rentalMons[j].monId) break; } if (j != 6) @@ -769,7 +773,7 @@ void FillFactoryBrainParty(void) static u16 GetMonSetId(u8 lvlMode, u8 challengeNum, bool8 arg2) { - u16 range, ret; + u16 range, monSetId; u16 adder; if (lvlMode == FRONTIER_LVL_50) @@ -782,14 +786,14 @@ static u16 GetMonSetId(u8 lvlMode, u8 challengeNum, bool8 arg2) if (arg2) { range = (sMonsToChooseFrom[adder + challengeNum + 1][1] - sMonsToChooseFrom[adder + challengeNum + 1][0]) + 1; - ret = Random() % range; - ret += sMonsToChooseFrom[adder + challengeNum + 1][0]; + monSetId = Random() % range; + monSetId += sMonsToChooseFrom[adder + challengeNum + 1][0]; } else { range = (sMonsToChooseFrom[adder + challengeNum][1] - sMonsToChooseFrom[adder + challengeNum][0]) + 1; - ret = Random() % range; - ret += sMonsToChooseFrom[adder + challengeNum][0]; + monSetId = Random() % range; + monSetId += sMonsToChooseFrom[adder + challengeNum][0]; } } else @@ -798,14 +802,14 @@ static u16 GetMonSetId(u8 lvlMode, u8 challengeNum, bool8 arg2) if (num != 7) num = 7; range = (sMonsToChooseFrom[adder + num][1] - sMonsToChooseFrom[adder + num][0]) + 1; - ret = Random() % range; - ret += sMonsToChooseFrom[adder + num][0]; + monSetId = Random() % range; + monSetId += sMonsToChooseFrom[adder + num][0]; } - return ret; + return monSetId; } -u8 sub_81A6F70(u8 battleMode, u8 lvlMode) +u8 GetNumPastRentalsRank(u8 battleMode, u8 lvlMode) { u8 ret; u8 rents = gSaveBlock2Ptr->frontier.factoryRentsCount[battleMode][lvlMode]; @@ -828,7 +832,7 @@ u8 sub_81A6F70(u8 battleMode, u8 lvlMode) u32 GetAiScriptsInBattleFactory(void) { - s32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; + int lvlMode = gSaveBlock2Ptr->frontier.lvlMode; if (lvlMode == FRONTIER_LVL_TENT) { @@ -836,8 +840,8 @@ u32 GetAiScriptsInBattleFactory(void) } else { - s32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); - s32 challengeNum = gSaveBlock2Ptr->frontier.factoryWinStreaks[battleMode][lvlMode] / 7; + int battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); + int challengeNum = gSaveBlock2Ptr->frontier.factoryWinStreaks[battleMode][lvlMode] / 7; if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) return AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY; diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 7831ef7505..bb9fe8e280 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -1673,12 +1673,12 @@ static void CreateFrontierFactorySelectableMons(u8 firstMonId) else level = 50; - var_28 = sub_81A6F70(battleMode, lvlMode); + var_28 = GetNumPastRentalsRank(battleMode, lvlMode); otId = T1_READ_32(gSaveBlock2Ptr->playerTrainerId); for (i = 0; i < SELECTABLE_MONS_COUNT; i++) { - u16 monSetId = gSaveBlock2Ptr->frontier.field_E70[i].monId; + u16 monSetId = gSaveBlock2Ptr->frontier.rentalMons[i].monId; sFactorySelectScreen->mons[i + firstMonId].monSetId = monSetId; if (i < var_28) ivs = GetFactoryMonFixedIV(challengeNum + 1, 0); @@ -1712,7 +1712,7 @@ static void CreateTentFactorySelectableMons(u8 firstMonId) for (i = 0; i < SELECTABLE_MONS_COUNT; i++) { - u16 monSetId = gSaveBlock2Ptr->frontier.field_E70[i].monId; + u16 monSetId = gSaveBlock2Ptr->frontier.rentalMons[i].monId; sFactorySelectScreen->mons[i + firstMonId].monSetId = monSetId; CreateMonWithEVSpreadNatureOTID(&sFactorySelectScreen->mons[i + firstMonId].monData, gFacilityTrainerMons[monSetId].species, @@ -1740,10 +1740,10 @@ static void Select_CopyMonsToPlayerParty(void) if (sFactorySelectScreen->mons[j].selectedId == i + 1) { gPlayerParty[i] = sFactorySelectScreen->mons[j].monData; - gSaveBlock2Ptr->frontier.field_E70[i].monId = sFactorySelectScreen->mons[j].monSetId; - gSaveBlock2Ptr->frontier.field_E70[i].personality = GetMonData(&gPlayerParty[i].box, MON_DATA_PERSONALITY, NULL); - gSaveBlock2Ptr->frontier.field_E70[i].abilityBit = GetBoxMonData(&gPlayerParty[i].box, MON_DATA_ALT_ABILITY, NULL); - gSaveBlock2Ptr->frontier.field_E70[i].ivs = GetBoxMonData(&gPlayerParty[i].box, MON_DATA_ATK_IV, NULL); + gSaveBlock2Ptr->frontier.rentalMons[i].monId = sFactorySelectScreen->mons[j].monSetId; + gSaveBlock2Ptr->frontier.rentalMons[i].personality = GetMonData(&gPlayerParty[i].box, MON_DATA_PERSONALITY, NULL); + gSaveBlock2Ptr->frontier.rentalMons[i].abilityBit = GetBoxMonData(&gPlayerParty[i].box, MON_DATA_ALT_ABILITY, NULL); + gSaveBlock2Ptr->frontier.rentalMons[i].ivs = GetBoxMonData(&gPlayerParty[i].box, MON_DATA_ATK_IV, NULL); break; } } @@ -2263,10 +2263,10 @@ static void CopySwappedMonData(void) gPlayerParty[sFactorySwapScreen->playerMonId] = gEnemyParty[sFactorySwapScreen->enemyMonId]; happiness = 0; SetMonData(&gPlayerParty[sFactorySwapScreen->playerMonId], MON_DATA_FRIENDSHIP, &happiness); - gSaveBlock2Ptr->frontier.field_E70[sFactorySwapScreen->playerMonId].monId = gSaveBlock2Ptr->frontier.field_E70[sFactorySwapScreen->enemyMonId + 3].monId; - gSaveBlock2Ptr->frontier.field_E70[sFactorySwapScreen->playerMonId].ivs = gSaveBlock2Ptr->frontier.field_E70[sFactorySwapScreen->enemyMonId + 3].ivs; - gSaveBlock2Ptr->frontier.field_E70[sFactorySwapScreen->playerMonId].personality = GetMonData(&gEnemyParty[sFactorySwapScreen->enemyMonId], MON_DATA_PERSONALITY, NULL); - gSaveBlock2Ptr->frontier.field_E70[sFactorySwapScreen->playerMonId].abilityBit = GetBoxMonData(&gEnemyParty[sFactorySwapScreen->enemyMonId].box, MON_DATA_ALT_ABILITY, NULL); + gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->playerMonId].monId = gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->enemyMonId + 3].monId; + gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->playerMonId].ivs = gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->enemyMonId + 3].ivs; + gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->playerMonId].personality = GetMonData(&gEnemyParty[sFactorySwapScreen->enemyMonId], MON_DATA_PERSONALITY, NULL); + gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->playerMonId].abilityBit = GetBoxMonData(&gEnemyParty[sFactorySwapScreen->enemyMonId].box, MON_DATA_ALT_ABILITY, NULL); } static void Task_FromSwapScreenToSummaryScreen(u8 taskId) diff --git a/src/battle_tent.c b/src/battle_tent.c index d85883cd58..b07020822e 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -329,7 +329,7 @@ static void sub_81B9EC0(void) if (j != i + firstMonId) continue; - gSaveBlock2Ptr->frontier.field_E70[i].monId = monSetId; + gSaveBlock2Ptr->frontier.rentalMons[i].monId = monSetId; species[i] = gFacilityTrainerMons[monSetId].species; heldItems[i] = gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]; monIds[i] = monSetId; @@ -379,7 +379,7 @@ static void sub_81BA040(void) sRandMonSetId = monSets[Random() % setsCount]; for (j = 0; j < 6; j++) { - if (gFacilityTrainerMons[sRandMonSetId].species == gFacilityTrainerMons[gSaveBlock2Ptr->frontier.field_E70[j].monId].species) + if (gFacilityTrainerMons[sRandMonSetId].species == gFacilityTrainerMons[gSaveBlock2Ptr->frontier.rentalMons[j].monId].species) break; } if (j != 6) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index d878d2c9e9..46bdc9ef36 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -2801,7 +2801,7 @@ static void CreatePageWindowTilemaps(u8 page) case PSS_PAGE_INFO: PutWindowTilemap(0); PutWindowTilemap(4); - if (sub_81A6BF4() == TRUE || sub_81B9E94() == TRUE) + if (InBattleFactory() == TRUE || sub_81B9E94() == TRUE) PutWindowTilemap(8); PutWindowTilemap(9); break; @@ -2852,7 +2852,7 @@ static void ClearPageWindowTilemaps(u8 page) { case PSS_PAGE_INFO: ClearWindowTilemap(4); - if (sub_81A6BF4() == TRUE || sub_81B9E94() == TRUE) + if (InBattleFactory() == TRUE || sub_81B9E94() == TRUE) ClearWindowTilemap(8); ClearWindowTilemap(9); break; @@ -2985,7 +2985,7 @@ static void PrintMonOTName(void) { u8 windowId; int x; - if (sub_81A6BF4() != TRUE && sub_81B9E94() != TRUE) + if (InBattleFactory() != TRUE && sub_81B9E94() != TRUE) { windowId = AddWindowFromTemplateList(gUnknown_0861CCCC, 0); SummaryScreen_PrintTextOnWindow(windowId, gText_OTSlash, 0, 1, 0, 1); @@ -3000,7 +3000,7 @@ static void PrintMonOTName(void) static void PrintMonOTID(void) { int xPos; - if (sub_81A6BF4() != TRUE && sub_81B9E94() != TRUE) + if (InBattleFactory() != TRUE && sub_81B9E94() != TRUE) { ConvertIntToDecimalStringN(StringCopy(gStringVar1, gText_UnkCtrlF907F908), (u16)pssData->summary.OTID, 2, 5); xPos = GetStringRightAlignXOffset(1, gStringVar1, 56); @@ -3030,7 +3030,7 @@ static void BufferMonTrainerMemo(void) DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gUnknown_0861CE7B); BufferNatureString(); - if (sub_81A6BF4() == TRUE || sub_81B9E94() == TRUE || IsInGamePartnerMon() == TRUE) + if (InBattleFactory() == TRUE || sub_81B9E94() == TRUE || IsInGamePartnerMon() == TRUE) { DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_XNature); } From 85040e26fd82003e69aad6caac9d512319871877 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 7 Feb 2019 17:37:41 -0600 Subject: [PATCH 023/217] Document battle pike --- include/global.h | 8 +- src/battle_factory.c | 2 - src/battle_pike.c | 759 ++++++++++++++++++++++--------------------- src/battle_pyramid.c | 6 +- 4 files changed, 398 insertions(+), 377 deletions(-) diff --git a/include/global.h b/include/global.h index 831b830425..bbf5d5e0aa 100644 --- a/include/global.h +++ b/include/global.h @@ -356,10 +356,10 @@ struct BattleFrontier /*0xE04*/ u16 pikeWinStreaks[2]; /*0xE08*/ u16 pikeRecordStreaks[2]; /*0xE0C*/ u16 pikeTotalStreaks[2]; - /*0xE10*/ u8 field_E10_1:3; - /*0xE10*/ u8 field_E10_2:4; - /*0xE10*/ u8 field_E10_3:1; - /*0xE12*/ u16 field_E12[3]; + /*0xE10*/ u8 pikeHintedRoomIndex:3; + /*0xE10*/ u8 pikeHintedRoomType:4; + /*0xE10*/ u8 pikeHealingRoomsDisabled:1; + /*0xE12*/ u16 pikeHeldItemsBackup[3]; /*0xE18*/ u16 pyramidRewardItem; /*0xE1A*/ u16 pyramidWinStreaks[2]; /*0xE1E*/ u16 pyramidRecordStreaks[2]; diff --git a/src/battle_factory.c b/src/battle_factory.c index 170a1b91ec..d08ffe6e69 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -333,7 +333,6 @@ static void GenerateOpponentMons(void) for (k = firstMonId; k < firstMonId + i; k++) { - // BUG: Small undefined behavior bug, since species array values were not initialized. if (species[k] == gFacilityTrainerMons[monSetId].species) break; } @@ -342,7 +341,6 @@ static void GenerateOpponentMons(void) for (k = firstMonId; k < firstMonId + i; k++) { - // BUG: Small undefined behavior bug, since heldItems array values were not initialized. if (heldItems[k] != 0 && heldItems[k] == gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]) break; } diff --git a/src/battle_pike.c b/src/battle_pike.c index a93a5725d1..f2f2025d7f 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -16,6 +16,7 @@ #include "constants/event_objects.h" #include "constants/battle_frontier.h" #include "constants/abilities.h" +#include "constants/easy_chat.h" #include "constants/layouts.h" #include "constants/rgb.h" #include "constants/trainers.h" @@ -36,12 +37,12 @@ #define PIKE_STATUS_KIRLIA 0 #define PIKE_STATUS_DUSCLOPS 1 -struct Unk0861231C +struct PikeRoomNPC { - u16 unk0; - u8 unk2; - u8 unk3; - u8 unk4; + u16 graphicsId; + u8 speechId1; + u8 speechId2; + u8 speechId3; }; struct PikeWildMon @@ -56,50 +57,50 @@ static IWRAM_DATA u8 sRoomType; static IWRAM_DATA u8 sStatusMon; static IWRAM_DATA bool8 sUnknown_0300128E; static IWRAM_DATA u32 sStatusFlags; -static IWRAM_DATA u8 sUnknown_03001294; +static IWRAM_DATA u8 sNpcId; // This file's functions. -static void sub_81A705C(void); -static void sub_81A7140(void); -static void sub_81A7248(void); -static void sub_81A73B8(void); -static void sub_81A7070(void); -static void sub_81A73EC(void); +static void SetRoomType(void); +static void GetBattlePikeData(void); +static void SetBattlePikeData(void); +static void GetInFinalRoom(void); +static void SetupRoomEventObjects(void); +static void GetRoomType(void); static void sub_81A7400(void); static void sub_81A740C(void); static void sub_81A7418(void); static void nullsub_76(void); static void nullsub_124(void); -static void sub_81A7468(void); -static void sub_81A74CC(void); -static void sub_81A74E0(void); -static void sub_81A7508(void); -static void sub_81A7580(void); -static void sub_81A8090(void); -static void sub_81A80DC(void); -static void sub_81A825C(void); -static void sub_81A827C(void); -static void sub_81A84B4(void); -static void sub_81A84EC(void); -static void sub_81A863C(void); -static void sub_81A8658(void); -static void sub_81A869C(void); -static void sub_81A86C0(void); -static void sub_81A8794(void); -static void sub_81A87E8(void); -static void sub_81A8830(void); +static void GetRoomInflictedStatus(void); +static void GetRoomInflictedStatusMon(void); +static void HealOneOrTwoMons(void); +static void BufferNPCMessage(void); +static void StatusInflictionScreenFade(void); +static void GetInBattlePike(void); +static void SetHintedRoom(void); +static void GetHintedRoomIndex(void); +static void GetRoomTypeHint(void); +static void ClearPikeTrainerIds(void); +static void BufferRecordMixingTrainerMessage(void); +static void GetCurrentRoomPikeQueenFightType(void); +static void HealSomeMonsBeforePikeQueen(void); +static void SetHealingRoomsDisabled(void); +static void CanAnyPartyMonsBeHealed(void); +static void BackupMonHeldItems(void); +static void RestoreMonHeldItems(void); +static void InitPikeChallenge(void); static u8 GetNextRoomType(void); static void PrepareOneTrainer(bool8 difficult); -static u16 sub_81A7B58(void); +static u16 GetNPCRoomGraphicsId(void); static void PrepareTwoTrainers(void); static void TryHealMons(u8 healCount); -static void sub_81A7EE4(u8 taskId); +static void Task_DoStatusInflictionScreenFade(u8 taskId); static bool8 AtLeastTwoAliveMons(void); static u8 SpeciesToPikeMonId(u16 species); static bool8 CanEncounterWildMon(u8 monLevel); -static u8 sub_81A8590(u8); -static bool8 sub_81A7D8C(struct Task *task); -static bool8 sub_81A7DE8(struct Task *task); +static u8 GetPikeQueenFightType(u8); +static bool8 StatusInflictionFadeOut(struct Task *task); +static bool8 StatusInflictionFadeIn(struct Task *task); // Const rom data. static const struct PikeWildMon sLvl50_Mons1[] = @@ -276,253 +277,264 @@ static const struct PikeWildMon *const *const sWildMons[2] = [FRONTIER_LVL_OPEN] = sLvlOpenMons }; -static const struct Unk0861231C gUnknown_0861231C[] = +static const struct PikeRoomNPC sNPCTable[] = { { - .unk0 = 0x0012, - .unk2 = 0x03, - .unk3 = 0x05, - .unk4 = 0x06 + .graphicsId = EVENT_OBJ_GFX_POKEFAN_F, + .speechId1 = 3, + .speechId2 = 5, + .speechId3 = 6 }, { - .unk0 = 0x0005, - .unk2 = 0x0d, - .unk3 = 0x20, - .unk4 = 0x25 + .graphicsId = EVENT_OBJ_GFX_NINJA_BOY, + .speechId1 = 13, + .speechId2 = 32, + .speechId3 = 37 }, { - .unk0 = 0x0011, - .unk2 = 0x08, - .unk3 = 0x0b, - .unk4 = 0x0c + .graphicsId = EVENT_OBJ_GFX_FAT_MAN, + .speechId1 = 8, + .speechId2 = 11, + .speechId3 = 12 }, { - .unk0 = 0x0024, - .unk2 = 0x22, - .unk3 = 0x1e, - .unk4 = 0x21 + .graphicsId = EVENT_OBJ_GFX_BUG_CATCHER, + .speechId1 = 34, + .speechId2 = 30, + .speechId3 = 33 }, { - .unk0 = 0x0015, - .unk2 = 0x00, - .unk3 = 0x00, - .unk4 = 0x00 + .graphicsId = EVENT_OBJ_GFX_EXPERT_M, + .speechId1 = 0, + .speechId2 = 0, + .speechId3 = 0 }, { - .unk0 = 0x001e, - .unk2 = 0x01, - .unk3 = 0x01, - .unk4 = 0x01 + .graphicsId = EVENT_OBJ_GFX_OLD_WOMAN, + .speechId1 = 1, + .speechId2 = 1, + .speechId3 = 1 }, { - .unk0 = 0x002c, - .unk2 = 0x16, - .unk3 = 0x17, - .unk4 = 0x1b + .graphicsId = EVENT_OBJ_GFX_BLACK_BELT, + .speechId1 = 22, + .speechId2 = 23, + .speechId3 = 27 }, { - .unk0 = 0x0037, - .unk2 = 0x08, - .unk3 = 0x16, - .unk4 = 0x1f + .graphicsId = EVENT_OBJ_GFX_HIKER, + .speechId1 = 8, + .speechId2 = 22, + .speechId3 = 31 }, { - .unk0 = 0x000e, - .unk2 = 0x0d, - .unk3 = 0x27, - .unk4 = 0x15 + .graphicsId = EVENT_OBJ_GFX_GIRL_3, + .speechId1 = 13, + .speechId2 = 39, + .speechId3 = 21 }, { - .unk0 = 0x0014, - .unk2 = 0x02, - .unk3 = 0x04, - .unk4 = 0x11 + .graphicsId = EVENT_OBJ_GFX_WOMAN_2, + .speechId1 = 2, + .speechId2 = 4, + .speechId3 = 17 }, { - .unk0 = 0x0038, - .unk2 = 0x1e, - .unk3 = 0x14, - .unk4 = 0x24 + .graphicsId = EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, + .speechId1 = 30, + .speechId2 = 20, + .speechId3 = 36 }, { - .unk0 = 0x0042, - .unk2 = 0x1c, - .unk3 = 0x22, - .unk4 = 0x19 + .graphicsId = EVENT_OBJ_GFX_MAN_5, + .speechId1 = 28, + .speechId2 = 34, + .speechId3 = 25 }, { - .unk0 = 0x0026, - .unk2 = 0x17, - .unk3 = 0x26, - .unk4 = 0x1a + .graphicsId = EVENT_OBJ_GFX_SCHOOL_KID_M, + .speechId1 = 23, + .speechId2 = 38, + .speechId3 = 26 }, { - .unk0 = 0x0032, - .unk2 = 0x17, - .unk3 = 0x1e, - .unk4 = 0x0b + .graphicsId = EVENT_OBJ_GFX_FISHERMAN, + .speechId1 = 23, + .speechId2 = 30, + .speechId3 = 11 }, { - .unk0 = 0x002f, - .unk2 = 0x0f, - .unk3 = 0x13, - .unk4 = 0x0e + .graphicsId = EVENT_OBJ_GFX_LASS, + .speechId1 = 15, + .speechId2 = 19, + .speechId3 = 14 }, { - .unk0 = 0x0027, - .unk2 = 0x02, - .unk3 = 0x1d, - .unk4 = 0x1a + .graphicsId = EVENT_OBJ_GFX_MANIAC, + .speechId1 = 2, + .speechId2 = 29, + .speechId3 = 26 }, { - .unk0 = 0x0033, - .unk2 = 0x25, - .unk3 = 0x0c, - .unk4 = 0x20 + .graphicsId = EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, + .speechId1 = 37, + .speechId2 = 12, + .speechId3 = 32 }, { - .unk0 = 0x0021, - .unk2 = 0x18, - .unk3 = 0x17, - .unk4 = 0x26 + .graphicsId = EVENT_OBJ_GFX_MAN_3, + .speechId1 = 24, + .speechId2 = 23, + .speechId3 = 38 }, { - .unk0 = 0x0018, - .unk2 = 0x05, - .unk3 = 0x16, - .unk4 = 0x04 + .graphicsId = EVENT_OBJ_GFX_WOMAN_3, + .speechId1 = 5, + .speechId2 = 22, + .speechId3 = 4 }, { - .unk0 = 0x000b, - .unk2 = 0x29, - .unk3 = 0x25, - .unk4 = 0x23 + .graphicsId = EVENT_OBJ_GFX_LITTLE_BOY, + .speechId1 = 41, + .speechId2 = 37, + .speechId3 = 35 }, { - .unk0 = 0x0035, - .unk2 = 0x27, - .unk3 = 0x0e, - .unk4 = 0x0d + .graphicsId = EVENT_OBJ_GFX_TUBER_F, + .speechId1 = 39, + .speechId2 = 14, + .speechId3 = 13 }, { - .unk0 = 0x0030, - .unk2 = 0x0a, - .unk3 = 0x07, - .unk4 = 0x09 + .graphicsId = EVENT_OBJ_GFX_GENTLEMAN, + .speechId1 = 10, + .speechId2 = 7, + .speechId3 = 9 }, { - .unk0 = 0x000c, - .unk2 = 0x28, - .unk3 = 0x14, - .unk4 = 0x10 + .graphicsId = EVENT_OBJ_GFX_LITTLE_GIRL, + .speechId1 = 40, + .speechId2 = 20, + .speechId3 = 16 }, { - .unk0 = 0x0034, - .unk2 = 0x12, - .unk3 = 0x0d, - .unk4 = 0x15 + .graphicsId = EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, + .speechId1 = 18, + .speechId2 = 13, + .speechId3 = 21 }, { - .unk0 = 0x0013, - .unk2 = 0x16, - .unk3 = 0x1f, - .unk4 = 0x1b + .graphicsId = EVENT_OBJ_GFX_MAN_1, + .speechId1 = 22, + .speechId2 = 31, + .speechId3 = 27 } }; -static const u16 gUnknown_086123E4[][6] = +static const u16 sNPCSpeeches[][6] = { - {0x0a29, 0x0630, 0x0a01, 0x140f, 0x1020, 0x270e}, - {0x0a2a, 0x081d, 0x061b, 0x1034, 0x1e20, 0x0a29}, - {0x1e22, 0x1231, 0x0a01, 0x1018, 0x1c1a, 0x0c03}, - {0x1e0f, 0x100b, 0x1039, 0x200f, 0x102b, 0x0a14}, - {0x103b, 0x0a02, 0x161e, 0x1020, 0x143e, 0x0c03}, - {0x0a31, 0x0e02, 0x0e15, 0x1436, 0x1037, 0x1e0a}, - {0x0a29, 0x1025, 0x142a, 0x1034, 0x1e0f, 0x0a1b}, - {0x0a01, 0x0e07, 0x122a, 0x1e0f, 0x061f, 0xffff}, - {0x1a35, 0x1036, 0x0e0f, 0x0a01, 0x2621, 0x1e0f}, - {0x0e25, 0x102f, 0x062d, 0x201e, 0x0c03, 0xffff}, - {0x0c1d, 0x081d, 0x0a2b, 0x100f, 0x0a02, 0x0c03}, - {0x0a2a, 0x0a3e, 0x2000, 0x1027, 0x1c08, 0x0c04}, - {0x0a01, 0x1212, 0x0a01, 0x1000, 0x062d, 0xffff}, - {0x1e22, 0x1231, 0x0a01, 0x1018, 0x1c1c, 0x0c03}, - {0x0a01, 0x060b, 0x1030, 0x0a28, 0x2549, 0x0624}, - {0x1014, 0x0a2c, 0x0415, 0x1642, 0x1e1b, 0x0c03}, - {0x0628, 0x1a0f, 0x100b, 0x2017, 0x0c00, 0xffff}, - {0x0a01, 0x1015, 0x1647, 0x1e0f, 0x0e39, 0x0e36}, - {0x0a01, 0x1017, 0x1620, 0x0e19, 0x0a31, 0x0c38}, - {0x0c1d, 0x081d, 0x0c00, 0x1022, 0x1c12, 0x020b}, - {0x1029, 0x1404, 0x102f, 0x1006, 0x1e28, 0x1c1c}, - {0x1029, 0x0e20, 0x1028, 0x1c16, 0x1e29, 0x0c03}, - {0x1e0f, 0x100b, 0x0e2f, 0x0638, 0x100c, 0xffff}, - {0x0a29, 0x1408, 0x102f, 0x061e, 0x102c, 0xffff}, - {0x1023, 0x100b, 0x081d, 0x062d, 0x1037, 0x0a14}, - {0x0a29, 0x1022, 0x1408, 0x102f, 0x161e, 0x1029}, - {0x0601, 0x102c, 0x0a01, 0x1015, 0x0e39, 0x0e36}, - {0x1020, 0x020b, 0x103f, 0x1c12, 0x0c04, 0xffff}, - {0x1018, 0x0a02, 0x103a, 0x0446, 0x020e, 0x0c03}, - {0x1e10, 0x020b, 0x1e0a, 0x100b, 0x063a, 0xffff}, - {0x0a02, 0x1212, 0x1e0f, 0x100b, 0x0638, 0x0c03}, - {0x1e22, 0x1000, 0x161b, 0x103f, 0x1e0f, 0x0c03}, - {0x0a29, 0x0e1e, 0x1025, 0x1e26, 0x0c00, 0xffff}, - {0x0a01, 0x0e1e, 0x1236, 0x102f, 0x120b, 0x0c04}, - {0x2805, 0x1e0f, 0x0a1b, 0x100b, 0x1020, 0x063b}, - {0x0a01, 0x101f, 0x0a3e, 0x1037, 0x1020, 0x0628}, - {0x1026, 0x0a31, 0x1e29, 0x1c1c, 0x0a01, 0x1212}, - {0x0c0a, 0x0c00, 0x1029, 0x101c, 0x1e0f, 0x0c23}, - {0x0a28, 0x020e, 0x100f, 0x1039, 0x142a, 0x0c04}, - {0x0a28, 0x020e, 0x100f, 0x0620, 0x102f, 0x043c}, - {0x0c39, 0x0c39, 0x0c00, 0x0a29, 0x2017, 0x0c39}, - {0x265c, 0x100b, 0x1020, 0x1230, 0x1e05, 0x100c}, + {EC_WORD_I_AM, EC_WORD_LOST, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_MOVE2(HELPING_HAND)}, + {EC_WORD_I_VE, EC_WORD_NO, EC_WORD_SENSE, EC_WORD_OF, EC_WORD_WHERE, EC_WORD_I_AM}, + {EC_WORD_WHAT, EC_WORD_SHOULD, EC_WORD_I, EC_WORD_DO, EC_WORD_NOW, EC_WORD_QUES}, + {EC_WORD_THIS, EC_WORD_IS, EC_WORD_TOO, EC_WORD_EXCITING, EC_WORD_FOR, EC_WORD_ME}, + {EC_WORD_DID, EC_WORD_YOU, EC_WORD_MAKE, EC_WORD_A, EC_WORD_MISTAKE, EC_WORD_QUES}, + {EC_WORD_IT_S, EC_WORD_MEAN, EC_WORD_AND, EC_WORD_AWFUL, EC_WORD_IN, EC_WORD_HERE}, + {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_TIRED, EC_WORD_OF, EC_WORD_THIS, EC_WORD_PLACE}, + {EC_WORD_I, EC_WORD_QUITE, EC_WORD_ENJOY, EC_WORD_THIS, EC_WORD_CHALLENGE, 0xFFFF}, + {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_HOW, EC_WORD_I, EC_MOVE2(TACKLE), EC_WORD_THIS}, + {EC_WORD_READY, EC_WORD_TO, EC_WORD_GIVE_UP, EC_WORD_YET, EC_WORD_QUES, 0xFFFF}, + {EC_WORD_OH, EC_WORD_NO, EC_WORD_WHO, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_QUES}, + {EC_WORD_I_VE, EC_WORD_BEEN, EC_WORD_WANDERING, EC_WORD_ABOUT, EC_WORD_FOREVER, EC_WORD_ELLIPSIS}, + {EC_WORD_I, EC_WORD_THINK, EC_WORD_I, EC_WORD_WILL, EC_WORD_GIVE_UP, 0xFFFF}, + {EC_WORD_WHAT, EC_WORD_SHOULD, EC_WORD_I, EC_WORD_DO, EC_WORD_NEXT, EC_WORD_QUES}, + {EC_WORD_I, EC_WORD_CAN_WIN, EC_WORD_WITH, EC_WORD_MY, EC_MOVE(SHEER_COLD), EC_WORD_GENIUS}, + {EC_WORD_WON_T, EC_WORD_SOMEONE, EC_WORD_COOL, EC_WORD_SHOW, EC_WORD_UP, EC_WORD_QUES}, + {EC_WORD_BATTLE, EC_WORD_GAME, EC_WORD_IS, EC_WORD_AWESOME, EC_WORD_EXCL, 0xFFFF}, + {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_TAKE, EC_WORD_THIS, EC_WORD_ANY, EC_WORD_MORE}, + {EC_WORD_I, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_IF, EC_WORD_IT_S, EC_WORD_OKAY}, + {EC_WORD_OH, EC_WORD_NO, EC_WORD_EXCL, EC_WORD_NOT, EC_WORD_ANOTHER, EC_WORD_TRAINER}, + {EC_WORD_IT, EC_WORD_HAS, EC_WORD_TO, EC_WORD_BE, EC_WORD_LEFT, EC_WORD_NEXT}, + {EC_WORD_IT, EC_WORD_MUST_BE, EC_WORD_OVER, EC_WORD_SOON, EC_WORD_RIGHT, EC_WORD_QUES}, + {EC_WORD_THIS, EC_WORD_IS, EC_WORD_TOTALLY, EC_WORD_EASY, EC_WORD_ISN_T_IT_QUES, 0xFFFF}, + {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_POWER, EC_WORD_ON, 0xFFFF}, + {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NO, EC_WORD_GIVE_UP, EC_WORD_IN, EC_WORD_ME}, + {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_GOING, EC_WORD_TO, EC_WORD_MAKE, EC_WORD_IT}, + {EC_WORD_GO, EC_WORD_ON, EC_WORD_I, EC_WORD_CAN_T, EC_WORD_ANY, EC_WORD_MORE}, + {EC_WORD_A, EC_WORD_TRAINER, EC_WORD_AFTER, EC_WORD_ANOTHER, EC_WORD_ELLIPSIS, 0xFFFF}, + {EC_WORD_DO, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_STEEL, EC_WORD_POKEMON, EC_WORD_QUES}, + {EC_WORD_EVERY, EC_WORD_TRAINER, EC_WORD_HERE, EC_WORD_IS, EC_WORD_TOO_WEAK, 0xFFFF}, + {EC_WORD_YOU, EC_WORD_THINK, EC_WORD_THIS, EC_WORD_IS, EC_WORD_EASY, EC_WORD_QUES}, + {EC_WORD_WHAT, EC_WORD_WILL, EC_WORD_COME, EC_WORD_AFTER, EC_WORD_THIS, EC_WORD_QUES}, + {EC_WORD_I_AM, EC_WORD_JUST, EC_WORD_SO, EC_WORD_CONFUSED, EC_WORD_EXCL, 0xFFFF}, + {EC_WORD_I, EC_WORD_JUST, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO_HOME, EC_WORD_ELLIPSIS}, + {EC_WORD_YEEHAW_EXCL, EC_WORD_THIS, EC_WORD_PLACE, EC_WORD_IS, EC_WORD_A, EC_WORD_PUSHOVER}, + {EC_WORD_I, EC_WORD_HAVEN_T, EC_WORD_BEEN, EC_WORD_IN, EC_WORD_A, EC_WORD_BATTLE}, + {EC_WORD_MAYBE, EC_WORD_IT_S, EC_WORD_RIGHT, EC_WORD_NEXT, EC_WORD_I, EC_WORD_THINK}, + {EC_WORD_WAAAH, EC_WORD_EXCL, EC_WORD_IT, EC_WORD_WASN_T, EC_WORD_THIS, EC_WORD_WAY}, + {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_TOO, EC_WORD_TIRED, EC_WORD_ELLIPSIS}, + {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_STRONG, EC_WORD_TO, EC_WORD_POISON}, + {EC_WORD_LALALA, EC_WORD_LALALA, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_AWESOME, EC_WORD_LALALA}, + {EC_MOVE2(TOXIC), EC_WORD_IS, EC_WORD_A, EC_WORD_TERRIBLE, EC_WORD_THING, EC_WORD_ISN_T_IT_QUES}, }; -static const u8 gUnknown_086125DC[][4] = +// Only the 5th array in this data is used by the code. +static const u8 sPikeQueenWinStreakAppearances[][4] = { - {0x23, 0x46, 0x23, 0x01}, - {0x04, 0x09, 0x05, 0x00}, - {0x15, 0x2a, 0x15, 0x01}, - {0x1c, 0x38, 0x1c, 0x01}, - {0x15, 0x2a, 0x15, 0x01}, - {0x1c, 0x8c, 0x38, 0x01}, - {0x15, 0x46, 0x23, 0x00}, + {35, 70, 35, 1}, + { 4, 9, 5, 0}, + {21, 42, 21, 1}, + {28, 56, 28, 1}, + {21, 42, 21, 1}, + {28, 140, 56, 1}, + {21, 70, 35, 0}, }; static void (* const sBattlePikeFunctions[])(void) = { - sub_81A705C, - sub_81A7140, - sub_81A7248, - sub_81A73B8, - sub_81A7070, - sub_81A73EC, + SetRoomType, + GetBattlePikeData, + SetBattlePikeData, + GetInFinalRoom, + SetupRoomEventObjects, + GetRoomType, sub_81A7400, sub_81A740C, sub_81A7418, nullsub_76, nullsub_124, - sub_81A7468, - sub_81A74CC, - sub_81A74E0, - sub_81A7508, - sub_81A7580, - sub_81A8090, - sub_81A80DC, - sub_81A825C, - sub_81A827C, - sub_81A84B4, - sub_81A84EC, - sub_81A863C, - sub_81A8658, - sub_81A869C, - sub_81A86C0, - sub_81A8794, - sub_81A87E8, - sub_81A8830 + GetRoomInflictedStatus, + GetRoomInflictedStatusMon, + HealOneOrTwoMons, + BufferNPCMessage, + StatusInflictionScreenFade, + GetInBattlePike, + SetHintedRoom, + GetHintedRoomIndex, + GetRoomTypeHint, + ClearPikeTrainerIds, + BufferRecordMixingTrainerMessage, + GetCurrentRoomPikeQueenFightType, + HealSomeMonsBeforePikeQueen, + SetHealingRoomsDisabled, + CanAnyPartyMonsBeHealed, + BackupMonHeldItems, + RestoreMonHeldItems, + InitPikeChallenge }; -static const u8 gUnknown_0861266C[] = {3, 3, 1, 0, 0, 2, 2, 1, 4}; +static const u8 sRoomTypeHints[] = { + 3, // PIKE_ROOM_SINGLE_BATTLE + 3, // PIKE_ROOM_HEAL_FULL + 1, // PIKE_ROOM_NPC + 0, // PIKE_ROOM_STATUS + 0, // PIKE_ROOM_HEAL_PART + 2, // PIKE_ROOM_WILD_MONS + 2, // PIKE_ROOM_HARD_BATTLE + 1, // PIKE_ROOM_DOUBLE_BATTLE + 4, // PIKE_ROOM_BRAIN +}; -static const u8 gUnknown_08612675[][3] = +static const u8 sNumMonsToHealBeforePikeQueen[][3] = { {2, 1, 0}, {2, 0, 1}, @@ -532,9 +544,9 @@ static const u8 gUnknown_08612675[][3] = {0, 1, 2}, }; -static bool8 (* const gUnknown_08612688[])(struct Task *) = +static bool8 (* const sStatusInflictionScreenFadeFuncs[])(struct Task *) = { - sub_81A7D8C, sub_81A7DE8 + StatusInflictionFadeOut, StatusInflictionFadeIn }; static const u32 gUnknown_08612690[] = {0x400, 0x800}; @@ -545,78 +557,78 @@ void CallBattlePikeFunction(void) sBattlePikeFunctions[gSpecialVar_0x8004](); } -static void sub_81A705C(void) +static void SetRoomType(void) { u8 roomType = GetNextRoomType(); sRoomType = roomType; } -static void sub_81A7070(void) +static void SetupRoomEventObjects(void) { - bool32 setPerson1, setPerson2; - u32 person1; - u16 person2; + bool32 setObjGfx1, setObjGfx2; + 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); - setPerson1 = TRUE; - setPerson2 = FALSE; - person1 = 0; - person2 = 0; + setObjGfx1 = TRUE; + setObjGfx2 = FALSE; + objGfx1 = 0; + objGfx2 = 0; switch (sRoomType) { case PIKE_ROOM_SINGLE_BATTLE: PrepareOneTrainer(FALSE); - setPerson1 = FALSE; + setObjGfx1 = FALSE; break; case PIKE_ROOM_HEAL_FULL: - person1 = EVENT_OBJ_GFX_LINK_RECEPTIONIST; + objGfx1 = EVENT_OBJ_GFX_LINK_RECEPTIONIST; break; case PIKE_ROOM_NPC: - person1 = (u8)(sub_81A7B58()); + objGfx1 = (u8)(GetNPCRoomGraphicsId()); break; case PIKE_ROOM_STATUS: - person1 = EVENT_OBJ_GFX_GENTLEMAN; + objGfx1 = EVENT_OBJ_GFX_GENTLEMAN; if (sStatusMon == PIKE_STATUS_DUSCLOPS) - person2 = EVENT_OBJ_GFX_DUSCLOPS; + objGfx2 = EVENT_OBJ_GFX_DUSCLOPS; else - person2 = EVENT_OBJ_GFX_KIRLIA; - setPerson2 = TRUE; + objGfx2 = EVENT_OBJ_GFX_KIRLIA; + setObjGfx2 = TRUE; break; case PIKE_ROOM_HEAL_PART: - person1 = EVENT_OBJ_GFX_GENTLEMAN; + objGfx1 = EVENT_OBJ_GFX_GENTLEMAN; break; case PIKE_ROOM_WILD_MONS: - setPerson1 = FALSE; + setObjGfx1 = FALSE; break; case PIKE_ROOM_HARD_BATTLE: PrepareOneTrainer(TRUE); - person2 = EVENT_OBJ_GFX_LINK_RECEPTIONIST; - setPerson1 = FALSE; - setPerson2 = TRUE; + objGfx2 = EVENT_OBJ_GFX_LINK_RECEPTIONIST; + setObjGfx1 = FALSE; + setObjGfx2 = TRUE; break; case PIKE_ROOM_DOUBLE_BATTLE: PrepareTwoTrainers(); - setPerson1 = FALSE; + setObjGfx1 = FALSE; break; case PIKE_ROOM_BRAIN: SetFrontierBrainEventObjGfx(FRONTIER_FACILITY_PIKE); - person2 = EVENT_OBJ_GFX_LINK_RECEPTIONIST; - setPerson1 = FALSE; - setPerson2 = TRUE; + objGfx2 = EVENT_OBJ_GFX_LINK_RECEPTIONIST; + setObjGfx1 = FALSE; + setObjGfx2 = TRUE; break; default: return; } - if (setPerson1 == TRUE) - VarSet(VAR_OBJ_GFX_ID_0, person1); - if (setPerson2 == TRUE) - VarSet(VAR_OBJ_GFX_ID_1, person2); + if (setObjGfx1 == TRUE) + VarSet(VAR_OBJ_GFX_ID_0, objGfx1); + if (setObjGfx2 == TRUE) + VarSet(VAR_OBJ_GFX_ID_1, objGfx2); } -static void sub_81A7140(void) +static void GetBattlePikeData(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; @@ -643,7 +655,7 @@ static void sub_81A7140(void) } } -static void sub_81A7248(void) +static void SetBattlePikeData(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; @@ -683,15 +695,15 @@ static void sub_81A7248(void) } } -static void sub_81A73B8(void) +static void GetInFinalRoom(void) { - if (gSaveBlock2Ptr->frontier.curChallengeBattleNum >= 15) + if (gSaveBlock2Ptr->frontier.curChallengeBattleNum > 14) gSpecialVar_Result = TRUE; else gSpecialVar_Result = FALSE; } -static void sub_81A73EC(void) +static void GetRoomType(void) { gSpecialVar_Result = sRoomType; } @@ -725,7 +737,7 @@ static void nullsub_124(void) } -static void sub_81A7468(void) +static void GetRoomInflictedStatus(void) { switch (sStatusFlags) { @@ -747,35 +759,35 @@ static void sub_81A7468(void) } } -static void sub_81A74CC(void) +static void GetRoomInflictedStatusMon(void) { gSpecialVar_Result = sStatusMon; } -static void sub_81A74E0(void) +static void HealOneOrTwoMons(void) { u16 toHeal = (Random() % 2) + 1; TryHealMons(toHeal); gSpecialVar_Result = toHeal; } -static void sub_81A7508(void) +static void BufferNPCMessage(void) { - s32 id; + int speechId; if (gSaveBlock2Ptr->frontier.curChallengeBattleNum <= 4) - id = gUnknown_0861231C[sUnknown_03001294].unk2; + speechId = sNPCTable[sNpcId].speechId1; else if (gSaveBlock2Ptr->frontier.curChallengeBattleNum <= 10) - id = gUnknown_0861231C[sUnknown_03001294].unk3; + speechId = sNPCTable[sNpcId].speechId2; else - id = gUnknown_0861231C[sUnknown_03001294].unk4; + speechId = sNPCTable[sNpcId].speechId3; - FrontierSpeechToString(gUnknown_086123E4[id]); + FrontierSpeechToString(sNPCSpeeches[speechId]); } -static void sub_81A7580(void) +static void StatusInflictionScreenFade(void) { - CreateTask(sub_81A7EE4, 2); + CreateTask(Task_DoStatusInflictionScreenFade, 2); } static void HealMon(struct Pokemon *mon) @@ -1014,81 +1026,88 @@ static bool8 AtLeastOneHealthyMon(void) static u8 GetNextRoomType(void) { - u8 sp[8]; + u8 roomTypesAvailability[8]; u8 i; - u8 ret; - u8 var; - u8 count; - u8 *allocated; + u8 nextRoomType; + u8 roomTypeGroup; + u8 numRoomCandidates; + u8 *roomCandidates; u8 id; - if (gSaveBlock2Ptr->frontier.field_E10_2 == PIKE_ROOM_BRAIN) - return gSaveBlock2Ptr->frontier.field_E10_2; - if (gSpecialVar_0x8007 == gSaveBlock2Ptr->frontier.field_E10_1) + if (gSaveBlock2Ptr->frontier.pikeHintedRoomType == PIKE_ROOM_BRAIN) + return gSaveBlock2Ptr->frontier.pikeHintedRoomType; + + // Check if the player walked into the same room that the lady gave a hint about. + if (gSpecialVar_0x8007 == gSaveBlock2Ptr->frontier.pikeHintedRoomIndex) { - if (gSaveBlock2Ptr->frontier.field_E10_2 == PIKE_ROOM_STATUS) + if (gSaveBlock2Ptr->frontier.pikeHintedRoomType == PIKE_ROOM_STATUS) TryInflictRandomStatus(); - return gSaveBlock2Ptr->frontier.field_E10_2; + return gSaveBlock2Ptr->frontier.pikeHintedRoomType; } for (i = 0; i < 8; i++) - sp[i] = 0; + roomTypesAvailability[i] = 0; - count = 8; - var = gUnknown_0861266C[gSaveBlock2Ptr->frontier.field_E10_2]; + numRoomCandidates = 8; + + // The room types associated with the lady's hint cannot be in the other two rooms. + roomTypeGroup = sRoomTypeHints[gSaveBlock2Ptr->frontier.pikeHintedRoomType]; for (i = 0; i < 8; i++) { - if (gUnknown_0861266C[i] == var) + if (sRoomTypeHints[i] == roomTypeGroup) { - sp[i] = 1; - count--; + roomTypesAvailability[i] = 1; + numRoomCandidates--; } } - if (sp[7] != 1 && !AtLeastTwoAliveMons()) + // Remove room type candidates that would have no effect on the player's party. + if (roomTypesAvailability[PIKE_ROOM_DOUBLE_BATTLE] != 1 && !AtLeastTwoAliveMons()) { - sp[7] = 1; - count--; + roomTypesAvailability[PIKE_ROOM_DOUBLE_BATTLE] = 1; + numRoomCandidates--; } - if (sp[3] != 1 && !AtLeastOneHealthyMon()) + if (roomTypesAvailability[PIKE_ROOM_STATUS] != 1 && !AtLeastOneHealthyMon()) { - sp[3] = 1; - count--; + roomTypesAvailability[PIKE_ROOM_STATUS] = 1; + numRoomCandidates--; } - if (gSaveBlock2Ptr->frontier.field_E10_3) + + // Remove healing room type candidates if healing rooms are disabled. + if (gSaveBlock2Ptr->frontier.pikeHealingRoomsDisabled) { - if (sp[1] != 1) + if (roomTypesAvailability[PIKE_ROOM_HEAL_FULL] != 1) { - sp[1] = 1; - count--; + roomTypesAvailability[PIKE_ROOM_HEAL_FULL] = 1; + numRoomCandidates--; } - if (sp[4] != 1) + if (roomTypesAvailability[PIKE_ROOM_HEAL_PART] != 1) { - sp[4] = 1; - count--; + roomTypesAvailability[PIKE_ROOM_HEAL_PART] = 1; + numRoomCandidates--; } } - allocated = AllocZeroed(count); + roomCandidates = AllocZeroed(numRoomCandidates); id = 0; for (i = 0; i < 8; i++) { - if (sp[i] == 0) - allocated[id++] = i; + if (roomTypesAvailability[i] == 0) + roomCandidates[id++] = i; } - ret = allocated[Random() % count]; - free(allocated); - if (ret == PIKE_ROOM_STATUS) + nextRoomType = roomCandidates[Random() % numRoomCandidates]; + free(roomCandidates); + if (nextRoomType == PIKE_ROOM_STATUS) TryInflictRandomStatus(); - return ret; + return nextRoomType; } -static u16 sub_81A7B58(void) +static u16 GetNPCRoomGraphicsId(void) { - sUnknown_03001294 = Random() % 25; - return gUnknown_0861231C[sUnknown_03001294].unk0; + sNpcId = Random() % ARRAY_COUNT(sNPCTable); + return sNPCTable[sNpcId].graphicsId; } static u8 sub_81A7B84(void) @@ -1163,12 +1182,12 @@ u8 GetBattlePikeWildMonHeaderId(void) return headerId; } -static void sub_81A7D54(u8 taskId) +static void DoStatusInflictionScreenFade(u8 taskId) { - while (gUnknown_08612688[gTasks[taskId].data[0]](&gTasks[taskId])); + while (sStatusInflictionScreenFadeFuncs[gTasks[taskId].data[0]](&gTasks[taskId])); } -static bool8 sub_81A7D8C(struct Task *task) +static bool8 StatusInflictionFadeOut(struct Task *task) { if (task->data[6] == 0 || --task->data[6] == 0) { @@ -1187,7 +1206,7 @@ static bool8 sub_81A7D8C(struct Task *task) return FALSE; } -static bool8 sub_81A7DE8(struct Task *task) +static bool8 StatusInflictionFadeIn(struct Task *task) { if (task->data[6] == 0 || --task->data[6] == 0) { @@ -1202,7 +1221,7 @@ static bool8 sub_81A7DE8(struct Task *task) { if (--task->data[3] == 0) { - DestroyTask(FindTaskIdByFunc(sub_81A7D54)); + DestroyTask(FindTaskIdByFunc(DoStatusInflictionScreenFade)); } else { @@ -1213,36 +1232,36 @@ static bool8 sub_81A7DE8(struct Task *task) return FALSE; } -static void sub_81A7E60(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4) +static void StartStatusInflictionScreenFade(s16 fadeOutDelay, s16 fadeInDelay, s16 numFades, s16 fadeOutSpeed, s16 fadeInSpped) { - u8 taskId = CreateTask(sub_81A7D54, 3); + u8 taskId = CreateTask(DoStatusInflictionScreenFade, 3); - gTasks[taskId].data[1] = a0; - gTasks[taskId].data[2] = a1; - gTasks[taskId].data[3] = a2; - gTasks[taskId].data[4] = a3; - gTasks[taskId].data[5] = a4; - gTasks[taskId].data[6] = a0; + gTasks[taskId].data[1] = fadeOutDelay; + gTasks[taskId].data[2] = fadeInDelay; + gTasks[taskId].data[3] = numFades; + gTasks[taskId].data[4] = fadeOutSpeed; + gTasks[taskId].data[5] = fadeInSpped; + gTasks[taskId].data[6] = fadeOutDelay; } -static bool8 sub_81A7EC4(void) +static bool8 IsStatusInflictionScreenFadeTaskFinished(void) { - if (FindTaskIdByFunc(sub_81A7D54) == 0xFF) + if (FindTaskIdByFunc(DoStatusInflictionScreenFade) == 0xFF) return TRUE; else return FALSE; } -static void sub_81A7EE4(u8 taskId) +static void Task_DoStatusInflictionScreenFade(u8 taskId) { if (gTasks[taskId].data[0] == 0) { gTasks[taskId].data[0]++; - sub_81A7E60(0, 0, 3, 2, 2); + StartStatusInflictionScreenFade(0, 0, 3, 2, 2); } else { - if (sub_81A7EC4()) + if (IsStatusInflictionScreenFadeTaskFinished()) { EnableBothScriptContexts(); DestroyTask(taskId); @@ -1308,7 +1327,7 @@ static void TryHealMons(u8 healCount) } } -static void sub_81A8090(void) +static void GetInBattlePike(void) { gSpecialVar_Result = InBattlePike(); } @@ -1321,61 +1340,65 @@ bool8 InBattlePike(void) || gMapHeader.mapLayoutId == LAYOUT_UNKNOWN_MAP_084693AC; } -static void sub_81A80DC(void) +static void SetHintedRoom(void) { u8 i, count, id; - u8 *allocated; + u8 *roomCandidates; gSpecialVar_Result = 0; - if (sub_81A8590(1)) + if (GetPikeQueenFightType(1)) { gSpecialVar_Result = 1; - gSaveBlock2Ptr->frontier.field_E10_1 = Random() % 6; - gSaveBlock2Ptr->frontier.field_E10_2 = PIKE_ROOM_BRAIN; + gSaveBlock2Ptr->frontier.pikeHintedRoomIndex = Random() % 6; + gSaveBlock2Ptr->frontier.pikeHintedRoomType = PIKE_ROOM_BRAIN; } else { - gSaveBlock2Ptr->frontier.field_E10_1 = Random() % 3; - if (gSaveBlock2Ptr->frontier.field_E10_3) + gSaveBlock2Ptr->frontier.pikeHintedRoomIndex = Random() % 3; + if (gSaveBlock2Ptr->frontier.pikeHealingRoomsDisabled) count = 6; else count = 8; - allocated = AllocZeroed(count); + roomCandidates = AllocZeroed(count); for (i = 0, id = 0; i < count; i++) { - if (gSaveBlock2Ptr->frontier.field_E10_3) + if (gSaveBlock2Ptr->frontier.pikeHealingRoomsDisabled) { if (i != PIKE_ROOM_HEAL_FULL && i != PIKE_ROOM_HEAL_PART) - allocated[id++] = i; + roomCandidates[id++] = i; } else { - allocated[i] = i; + roomCandidates[i] = i; } } - gSaveBlock2Ptr->frontier.field_E10_2 = allocated[Random() % count]; - free(allocated); - if (gSaveBlock2Ptr->frontier.field_E10_2 == PIKE_ROOM_STATUS && !AtLeastOneHealthyMon()) - gSaveBlock2Ptr->frontier.field_E10_2 = PIKE_ROOM_NPC; - if (gSaveBlock2Ptr->frontier.field_E10_2 == PIKE_ROOM_DOUBLE_BATTLE && !AtLeastTwoAliveMons()) - gSaveBlock2Ptr->frontier.field_E10_2 = PIKE_ROOM_NPC; + + gSaveBlock2Ptr->frontier.pikeHintedRoomType = roomCandidates[Random() % count]; + free(roomCandidates); + if (gSaveBlock2Ptr->frontier.pikeHintedRoomType == PIKE_ROOM_STATUS && !AtLeastOneHealthyMon()) + gSaveBlock2Ptr->frontier.pikeHintedRoomType = PIKE_ROOM_NPC; + if (gSaveBlock2Ptr->frontier.pikeHintedRoomType == PIKE_ROOM_DOUBLE_BATTLE && !AtLeastTwoAliveMons()) + gSaveBlock2Ptr->frontier.pikeHintedRoomType = PIKE_ROOM_NPC; } } -static void sub_81A825C(void) +static void GetHintedRoomIndex(void) { - gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_E10_1; + // 0 = left room + // 1 = center room + // 2 = right room + gSpecialVar_Result = gSaveBlock2Ptr->frontier.pikeHintedRoomIndex; } -static void sub_81A827C(void) +static void GetRoomTypeHint(void) { - gSpecialVar_Result = gUnknown_0861266C[gSaveBlock2Ptr->frontier.field_E10_2]; + gSpecialVar_Result = sRoomTypeHints[gSaveBlock2Ptr->frontier.pikeHintedRoomType]; } static void PrepareOneTrainer(bool8 difficult) { - s32 i; + int i; u8 lvlMode; u8 battleNum; u16 challengeNum; @@ -1407,7 +1430,7 @@ static void PrepareOneTrainer(bool8 difficult) static void PrepareTwoTrainers(void) { - s32 i; + int i; u16 trainerId; u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u16 challengeNum = gSaveBlock2Ptr->frontier.pikeWinStreaks[lvlMode] / 14; @@ -1444,7 +1467,7 @@ static void PrepareTwoTrainers(void) gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum - 2] = gTrainerBattleOpponent_B; } -static void sub_81A84B4(void) +static void ClearPikeTrainerIds(void) { u8 i; @@ -1452,7 +1475,7 @@ static void sub_81A84B4(void) gSaveBlock2Ptr->frontier.trainerIds[i] = 0xFFFF; } -static void sub_81A84EC(void) +static void BufferRecordMixingTrainerMessage(void) { if (gSpecialVar_0x8005 == 0) { @@ -1485,31 +1508,31 @@ static bool8 AtLeastTwoAliveMons(void) return TRUE; } -static u8 sub_81A8590(u8 arg0) +static u8 GetPikeQueenFightType(u8 nextRoom) { - u8 symbolsCount; + u8 numPikeSymbols; u8 var = 5; u8 ret = 0; u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; - u16 wins = gSaveBlock2Ptr->frontier.pikeWinStreaks[lvlMode]; - wins += arg0; - symbolsCount = GetPlayerSymbolCountForFacility(FRONTIER_FACILITY_PIKE); + u16 winStreak = gSaveBlock2Ptr->frontier.pikeWinStreaks[lvlMode]; + winStreak += nextRoom; + numPikeSymbols = GetPlayerSymbolCountForFacility(FRONTIER_FACILITY_PIKE); - switch (symbolsCount) + switch (numPikeSymbols) { case 0: case 1: - if (wins == gUnknown_086125DC[var][symbolsCount] - gUnknown_086125DC[var][3]) - ret = symbolsCount + 1; + if (winStreak == sPikeQueenWinStreakAppearances[var][numPikeSymbols] - sPikeQueenWinStreakAppearances[var][3]) + ret = numPikeSymbols + 1; break; case 2: default: - if (wins == gUnknown_086125DC[var][0] - gUnknown_086125DC[var][3]) + if (winStreak == sPikeQueenWinStreakAppearances[var][0] - sPikeQueenWinStreakAppearances[var][3]) ret = 3; - else if (wins == gUnknown_086125DC[var][1] - gUnknown_086125DC[var][3] - || (wins > gUnknown_086125DC[var][1] - && (wins - gUnknown_086125DC[var][1] + gUnknown_086125DC[var][3]) % gUnknown_086125DC[var][2] == 0)) + else if (winStreak == sPikeQueenWinStreakAppearances[var][1] - sPikeQueenWinStreakAppearances[var][3] + || (winStreak > sPikeQueenWinStreakAppearances[var][1] + && (winStreak - sPikeQueenWinStreakAppearances[var][1] + sPikeQueenWinStreakAppearances[var][3]) % sPikeQueenWinStreakAppearances[var][2] == 0)) ret = 4; break; } @@ -1517,25 +1540,25 @@ static u8 sub_81A8590(u8 arg0) return ret; } -static void sub_81A863C(void) +static void GetCurrentRoomPikeQueenFightType(void) { - gSpecialVar_Result = sub_81A8590(0); + gSpecialVar_Result = GetPikeQueenFightType(0); } -static void sub_81A8658(void) +static void HealSomeMonsBeforePikeQueen(void) { - u8 toHealCount = gUnknown_08612675[gSaveBlock2Ptr->frontier.field_E10_1][gSpecialVar_0x8007]; + u8 toHealCount = sNumMonsToHealBeforePikeQueen[gSaveBlock2Ptr->frontier.pikeHintedRoomIndex][gSpecialVar_0x8007]; TryHealMons(toHealCount); gSpecialVar_Result = toHealCount; } -static void sub_81A869C(void) +static void SetHealingRoomsDisabled(void) { - gSaveBlock2Ptr->frontier.field_E10_3 = gSpecialVar_0x8005; + gSaveBlock2Ptr->frontier.pikeHealingRoomsDisabled = gSpecialVar_0x8005; } -static void sub_81A86C0(void) +static void CanAnyPartyMonsBeHealed(void) { u8 i, j; @@ -1574,19 +1597,19 @@ static void sub_81A86C0(void) } } -static void sub_81A8794(void) +static void BackupMonHeldItems(void) { u8 i; for (i = 0; i < 3; i++) { - s32 heldItem = GetMonData(&gSaveBlock1Ptr->playerParty[gSaveBlock2Ptr->frontier.selectedPartyMons[i] - 1], + int heldItem = GetMonData(&gSaveBlock1Ptr->playerParty[gSaveBlock2Ptr->frontier.selectedPartyMons[i] - 1], MON_DATA_HELD_ITEM); - gSaveBlock2Ptr->frontier.field_E12[i] = heldItem; + gSaveBlock2Ptr->frontier.pikeHeldItemsBackup[i] = heldItem; } } -static void sub_81A87E8(void) +static void RestoreMonHeldItems(void) { u8 i; @@ -1594,11 +1617,11 @@ static void sub_81A87E8(void) { SetMonData(&gPlayerParty[gSaveBlock2Ptr->frontier.selectedPartyMons[i] - 1], MON_DATA_HELD_ITEM, - &gSaveBlock2Ptr->frontier.field_E12[i]); + &gSaveBlock2Ptr->frontier.pikeHeldItemsBackup[i]); } } -static void sub_81A8830(void) +static void InitPikeChallenge(void) { u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 824a2946d8..a2fa4120f4 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -97,7 +97,7 @@ struct PyramidTrainerEncounterMusic }; // This file's functions. -static void InitPyramidBag(void); +static void InitPyramidChallenge(void); static void GetBattlePyramidData(void); static void SetBattlePyramidData(void); static void sub_81A9134(void); @@ -814,7 +814,7 @@ static const u8 sHintTextTypes[] = static void (* const sBattlePyramidFunctions[])(void) = { - InitPyramidBag, + InitPyramidChallenge, GetBattlePyramidData, SetBattlePyramidData, sub_81A9134, @@ -865,7 +865,7 @@ void CallBattlePyramidFunction(void) sBattlePyramidFunctions[gSpecialVar_0x8004](); } -static void InitPyramidBag(void) +static void InitPyramidChallenge(void) { bool32 isCurrent; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; From 3a40f5203baafb29f94dda8abdce6489d81635ae Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 7 Feb 2019 17:41:44 -0600 Subject: [PATCH 024/217] Remove old rom_818CFC8.h header --- include/rom_818CFC8.h | 11 ----------- src/event_object_movement.c | 4 ++-- src/field_poison.c | 2 +- src/item_menu.c | 2 +- src/item_use.c | 2 +- src/map_name_popup.c | 2 +- src/start_menu.c | 1 - 7 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 include/rom_818CFC8.h diff --git a/include/rom_818CFC8.h b/include/rom_818CFC8.h deleted file mode 100644 index c1fc78e1e4..0000000000 --- a/include/rom_818CFC8.h +++ /dev/null @@ -1,11 +0,0 @@ -// -// Created by Scott Norton on 9/6/17. -// - -#ifndef GUARD_ROM_818CFC8_H -#define GUARD_ROM_818CFC8_H - -bool8 InBattlePyramid(void); -u8 GetNumBattlePyramidEventObjects(void); - -#endif //GUARD_ROM_818CFC8_H diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 845e41dadf..ba62db10da 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1,4 +1,6 @@ #include "global.h" +#include "alloc.h" +#include "battle_pyramid.h" #include "berry.h" #include "decoration.h" #include "event_data.h" @@ -9,14 +11,12 @@ #include "field_effect_helpers.h" #include "field_player_avatar.h" #include "fieldmap.h" -#include "alloc.h" #include "mauville_old_man.h" #include "metatile_behavior.h" #include "overworld.h" #include "palette.h" #include "pokenav.h" #include "random.h" -#include "rom_818CFC8.h" #include "sprite.h" #include "task.h" #include "trainer_see.h" diff --git a/src/field_poison.c b/src/field_poison.c index 89cd027284..532c7f0273 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -1,6 +1,7 @@ #include "global.h" #include "battle.h" #include "battle_pike.h" +#include "battle_pyramid.h" #include "event_data.h" #include "field_message_box.h" #include "field_poison.h" @@ -8,7 +9,6 @@ #include "frontier_util.h" #include "party_menu.h" #include "pokenav.h" -#include "rom_818CFC8.h" #include "script.h" #include "string_util.h" #include "strings.h" diff --git a/src/item_menu.c b/src/item_menu.c index 24a50aa9a0..43f2afce34 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -2,6 +2,7 @@ #include "item_menu.h" #include "battle.h" #include "battle_controllers.h" +#include "battle_pyramid.h" #include "frontier_util.h" #include "berry_tag_screen.h" #include "bg.h" @@ -33,7 +34,6 @@ #include "player_pc.h" #include "pokemon.h" #include "pokemon_summary_screen.h" -#include "rom_818CFC8.h" #include "scanline_effect.h" #include "script.h" #include "shop.h" diff --git a/src/item_use.c b/src/item_use.c index 0ea5f6acf7..97d6292c45 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -1,6 +1,7 @@ #include "global.h" #include "item_use.h" #include "battle.h" +#include "battle_pyramid.h" #include "battle_pyramid_bag.h" #include "berry.h" #include "bike.h" @@ -24,7 +25,6 @@ #include "party_menu.h" #include "pokeblock.h" #include "pokemon.h" -#include "rom_818CFC8.h" #include "script.h" #include "sound.h" #include "strings.h" diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 0d88815c00..cdb4c3330d 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -1,4 +1,5 @@ #include "global.h" +#include "battle_pyramid.h" #include "bg.h" #include "event_data.h" #include "gpu_regs.h" @@ -7,7 +8,6 @@ #include "map_name_popup.h" #include "palette.h" #include "region_map.h" -#include "rom_818CFC8.h" #include "start_menu.h" #include "string_util.h" #include "task.h" diff --git a/src/start_menu.c b/src/start_menu.c index 334330b672..d5eec76d23 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -15,7 +15,6 @@ #include "overworld.h" #include "link.h" #include "frontier_util.h" -#include "rom_818CFC8.h" #include "field_specials.h" #include "event_object_movement.h" #include "script.h" From 4570e3b6a5fc1d652c224069a711d9f2fbee50e0 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 8 Feb 2019 09:41:36 -0600 Subject: [PATCH 025/217] Document battle arena --- ...ymbols.png => arena_judgement_symbols.png} | Bin include/battle_arena.h | 4 +- include/global.h | 2 +- include/graphics.h | 4 +- src/battle_arena.c | 134 ++++++++++-------- src/battle_script_commands.c | 4 +- src/graphics.c | 4 +- 7 files changed, 84 insertions(+), 68 deletions(-) rename graphics/battle_frontier/{symbols.png => arena_judgement_symbols.png} (100%) diff --git a/graphics/battle_frontier/symbols.png b/graphics/battle_frontier/arena_judgement_symbols.png similarity index 100% rename from graphics/battle_frontier/symbols.png rename to graphics/battle_frontier/arena_judgement_symbols.png diff --git a/include/battle_arena.h b/include/battle_arena.h index bf305ea4ea..c3bdd4ea79 100644 --- a/include/battle_arena.h +++ b/include/battle_arena.h @@ -8,7 +8,7 @@ void BattleArena_AddMindPoints(u8 battler); void BattleArena_AddSkillPoints(u8 battler); void BattleArena_DeductMindPoints(u8 battler, u16 stringId); void sub_81A586C(u8 battler); -void sub_81A5BF8(void); -void sub_81A5D44(void); +void DrawArenaRefereeTextBox(void); +void RemoveArenaRefereeTextBox(void); #endif //GUARD_BATTLE_ARENA_H diff --git a/include/global.h b/include/global.h index bbf5d5e0aa..14a6387cdc 100644 --- a/include/global.h +++ b/include/global.h @@ -345,7 +345,7 @@ struct BattleFrontier /*0xDC6*/ u16 field_DC6; /*0xDC8*/ u16 palaceWinStreaks[2][2]; /*0xDD0*/ u16 palaceRecordWinStreaks[2][2]; - /*0xDD8*/ u16 field_DD8; + /*0xDD8*/ u16 arenaRewardItem; /*0xDDA*/ u16 arenaWinStreaks[2]; /*0xDDE*/ u16 arenaRecordStreaks[2]; /*0xDE2*/ u16 factoryWinStreaks[2][2]; diff --git a/include/graphics.h b/include/graphics.h index 0f7c604e79..f86a040857 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4105,8 +4105,8 @@ extern const u32 gUnknown_08D83C3C[]; extern const u32 gUnknown_08D83900[]; extern const u32 gBattleFrontierGfx_DomeOptions[]; -extern const u32 gUnknown_08D854E8[]; -extern const u32 gUnknown_08D855E8[]; +extern const u32 gBattleArenaJudgementSymbolsGfx[]; +extern const u32 gBattleArenaJudgementSymbolsPalette[]; extern const u32 gContest2Pal[]; extern const u32 gBattleAnimSpriteSheet_000[]; diff --git a/src/battle_arena.c b/src/battle_arena.c index cfcb10a0d0..8146f5b389 100644 --- a/src/battle_arena.c +++ b/src/battle_arena.c @@ -22,18 +22,20 @@ #include "constants/songs.h" #include "constants/battle_string_ids.h" #include "constants/battle_frontier.h" +#include "constants/items.h" #include "constants/moves.h" +#include "constants/rgb.h" // This file's functions. -static void sub_81A58B4(void); -static void sub_81A5964(void); -static void sub_81A59FC(void); +static void InitArenaChallenge(void); +static void GetArenaData(void); +static void SetArenaData(void); static void sub_81A5AC4(void); -static void sub_81A5B08(void); -static void sub_81A5B88(void); -static void sub_81A5BE0(void); +static void SetArenaRewardItem(void); +static void GiveArenaRewardItem(void); +static void BufferArenaOpponentName(void); static void SpriteCb_JudgmentIcon(struct Sprite *sprite); -static void ShowJudgmentSprite(u8 x, u8 y, u8 arg2, u8 battler); +static void ShowJudgmentSprite(u8 x, u8 y, u8 category, u8 battler); // Const rom data. static const s8 sMindRatings[] = @@ -395,7 +397,9 @@ static const s8 sMindRatings[] = [MOVE_PSYCHO_BOOST] = 1, }; -static const struct OamData sOamData_8611F24 = +#define TAG_JUDGEMENT_ICON 1000 + +static const struct OamData sJudgementIconOamData = { .y = 0, .affineMode = 0, @@ -412,74 +416,87 @@ static const struct OamData sOamData_8611F24 = .affineParam = 0 }; -static const union AnimCmd sSpriteAnim_8611F2C[] = +static const union AnimCmd sJudgementIconAnimCmd0[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_8611F34[] = +static const union AnimCmd sJudgementIconAnimCmd1[] = { ANIMCMD_FRAME(4, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_8611F3C[] = +static const union AnimCmd sJudgementIconAnimCmd2[] = { ANIMCMD_FRAME(8, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_8611F44[] = +static const union AnimCmd sJudgementIconAnimCmd3[] = { ANIMCMD_FRAME(12, 1), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_8611F4C[] = +static const union AnimCmd *const sJudgementIconAnimCmds[] = { - sSpriteAnim_8611F2C, - sSpriteAnim_8611F34, - sSpriteAnim_8611F3C, - sSpriteAnim_8611F44 + sJudgementIconAnimCmd0, + sJudgementIconAnimCmd1, + sJudgementIconAnimCmd2, + sJudgementIconAnimCmd3 }; static const struct SpriteTemplate sSpriteTemplate_JudgmentIcon = { - .tileTag = 0x3E8, + .tileTag = TAG_JUDGEMENT_ICON, .paletteTag = 0xFFFF, - .oam = &sOamData_8611F24, - .anims = sSpriteAnimTable_8611F4C, + .oam = &sJudgementIconOamData, + .anims = sJudgementIconAnimCmds, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCb_JudgmentIcon, }; -static const struct CompressedSpriteSheet gUnknown_08611F74[] = +static const struct CompressedSpriteSheet sBattleArenaJudgementSymbolsSpriteSheet[] = { - {gUnknown_08D854E8, 0x200, 0x3E8}, + {gBattleArenaJudgementSymbolsGfx, 0x200, TAG_JUDGEMENT_ICON}, {0} }; static void (* const sArenaFunctions[])(void) = { - sub_81A58B4, - sub_81A5964, - sub_81A59FC, + InitArenaChallenge, + GetArenaData, + SetArenaData, sub_81A5AC4, - sub_81A5B08, - sub_81A5B88, - sub_81A5BE0, + SetArenaRewardItem, + GiveArenaRewardItem, + BufferArenaOpponentName, }; -static const u16 gUnknown_08611FA0[6] = +static const u16 sShortStreakRewardItems[] = { - 0x003f, 0x0040, 0x0041, 0x0043, 0x0042, 0x0046 + ITEM_HP_UP, + ITEM_PROTEIN, + ITEM_IRON, + ITEM_CALCIUM, + ITEM_CARBOS, + ITEM_ZINC, }; -static const u16 gUnknown_08611FAC[9] = +static const u16 sLongStreakRewardItems[] = { - 0x00b3, 0x00b4, 0x00b7, 0x00c8, 0x00b9, 0x00bb, 0x00c4, 0x00c6, 0x00ba + ITEM_BRIGHT_POWDER, + ITEM_WHITE_HERB, + ITEM_QUICK_CLAW, + ITEM_LEFTOVERS, + ITEM_MENTAL_HERB, + ITEM_KINGS_ROCK, + ITEM_FOCUS_BAND, + ITEM_SCOPE_LENS, + ITEM_CHOICE_BAND, }; // code @@ -490,15 +507,15 @@ void CallBattleArenaFunction(void) u8 BattleArena_ShowJudgmentWindow(u8 *state) { - s32 i; + int i; u8 ret = 0; switch (*state) { case 0: - BeginNormalPaletteFade(0x7FFFFF1C, 4, 0, 8, 0); + BeginNormalPaletteFade(0x7FFFFF1C, 4, 0, 8, RGB_BLACK); SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_BG3 | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR); - LoadCompressedSpriteSheet(gUnknown_08611F74); - LoadCompressedPalette(gUnknown_08D855E8, 0x1F0, 0x20); + LoadCompressedSpriteSheet(sBattleArenaJudgementSymbolsSpriteSheet); + LoadCompressedPalette(gBattleArenaJudgementSymbolsPalette, 0x1F0, 0x20); gBattle_WIN0H = 0xFF; gBattle_WIN0V = 0x70; (*state)++; @@ -536,7 +553,7 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state) SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR); for (i = 0; i < 8; i++) { - u8 spriteId = CreateSprite(&sSpriteTemplate_JudgmentIcon, 0x40 + (i * 0x10), 84, 0); + u8 spriteId = CreateSprite(&sSpriteTemplate_JudgmentIcon, 64 + i * 16, 84, 0); StartSpriteAnim(&gSprites[spriteId], 3); } ret = 1; @@ -596,14 +613,14 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state) HandleBattleWindow(5, 0, 24, 13, WINDOW_CLEAR); CopyBgTilemapBufferToVram(0); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256); - BeginNormalPaletteFade(0x7FFFFF1C, 4, 8, 0, 0); + BeginNormalPaletteFade(0x7FFFFF1C, 4, 8, 0, RGB_BLACK); (*state)++; break; case 10: if (!gPaletteFade.active) { SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR); - FreeSpriteTilesByTag(0x3E8); + FreeSpriteTilesByTag(TAG_JUDGEMENT_ICON); ret = 1; (*state)++; } @@ -615,9 +632,9 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state) static void ShowJudgmentSprite(u8 x, u8 y, u8 category, u8 battler) { - s32 animNum = 0; - s32 pointsPlayer = 0; - s32 pointsOpponent = 0; + int animNum = 0; + int pointsPlayer = 0; + int pointsOpponent = 0; s8 *mindPoints = gBattleStruct->arenaMindPoints; s8 *skillPoints = gBattleStruct->arenaSkillPoints; u16 *hpAtStart = gBattleStruct->arenaStartHp; @@ -686,7 +703,6 @@ void BattleArena_InitPoints(void) void BattleArena_AddMindPoints(u8 battler) { s8 *mindPoints = gBattleStruct->arenaMindPoints; - mindPoints[battler] += sMindRatings[gCurrentMove]; } @@ -707,7 +723,7 @@ void BattleArena_AddSkillPoints(u8 battler) if (!(gMoveResultFlags & MOVE_RESULT_MISSED) || gBattleCommunication[6] != 1) skillPoints[battler] -= 2; } - else if (gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE && gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE) + else if ((gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE) && (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE)) { skillPoints[battler] += 1; } @@ -765,7 +781,7 @@ void sub_81A586C(u8 battler) // Unused. hpAtStart[BATTLE_OPPOSITE(battler)] = gBattleMons[BATTLE_OPPOSITE(battler)].hp; } -static void sub_81A58B4(void) +static void InitArenaChallenge(void) { bool32 isCurrent; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; @@ -786,14 +802,14 @@ static void sub_81A58B4(void) gTrainerBattleOpponent_A = 0; } -static void sub_81A5964(void) +static void GetArenaData(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; switch (gSpecialVar_0x8005) { case 0: - gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_DD8; + gSpecialVar_Result = gSaveBlock2Ptr->frontier.arenaRewardItem; break; case 1: gSpecialVar_Result = gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode]; @@ -807,14 +823,14 @@ static void sub_81A5964(void) } } -static void sub_81A59FC(void) +static void SetArenaData(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; switch (gSpecialVar_0x8005) { case 0: - gSaveBlock2Ptr->frontier.field_DD8 = gSpecialVar_0x8006; + gSaveBlock2Ptr->frontier.arenaRewardItem = gSpecialVar_0x8006; break; case 1: gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode] = gSpecialVar_0x8006; @@ -846,22 +862,22 @@ static void sub_81A5AC4(void) sub_81A4C30(); } -static void sub_81A5B08(void) +static void SetArenaRewardItem(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; if (gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode] > 41) - gSaveBlock2Ptr->frontier.field_DD8 = gUnknown_08611FAC[Random() % ARRAY_COUNT(gUnknown_08611FAC)]; + gSaveBlock2Ptr->frontier.arenaRewardItem = sLongStreakRewardItems[Random() % ARRAY_COUNT(sLongStreakRewardItems)]; else - gSaveBlock2Ptr->frontier.field_DD8 = gUnknown_08611FA0[Random() % ARRAY_COUNT(gUnknown_08611FA0)]; + gSaveBlock2Ptr->frontier.arenaRewardItem = sShortStreakRewardItems[Random() % ARRAY_COUNT(sShortStreakRewardItems)]; } -static void sub_81A5B88(void) +static void GiveArenaRewardItem(void) { - if (AddBagItem(gSaveBlock2Ptr->frontier.field_DD8, 1) == TRUE) + if (AddBagItem(gSaveBlock2Ptr->frontier.arenaRewardItem, 1) == TRUE) { - CopyItemName(gSaveBlock2Ptr->frontier.field_DD8, gStringVar1); - gSaveBlock2Ptr->frontier.field_DD8 = 0; + CopyItemName(gSaveBlock2Ptr->frontier.arenaRewardItem, gStringVar1); + gSaveBlock2Ptr->frontier.arenaRewardItem = 0; gSpecialVar_Result = TRUE; } else @@ -870,12 +886,12 @@ static void sub_81A5B88(void) } } -static void sub_81A5BE0(void) +static void BufferArenaOpponentName(void) { GetFrontierTrainerName(gStringVar1, gTrainerBattleOpponent_A); } -void sub_81A5BF8(void) +void DrawArenaRefereeTextBox(void) { u8 width = 27; u8 palNum = 7; @@ -898,7 +914,7 @@ void sub_81A5BF8(void) FillBgTilemapBufferRect(0, 0x836, 29, 19, 1, 1, palNum); } -void sub_81A5D44(void) +void RemoveArenaRefereeTextBox(void) { u8 width; u8 height; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 6023b2c1b6..a53fa30f21 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -6721,10 +6721,10 @@ static void atk76_various(void) MarkBattlerForControllerExec(gActiveBattler); break; case 14: - sub_81A5BF8(); + DrawArenaRefereeTextBox(); break; case 15: - sub_81A5D44(); + RemoveArenaRefereeTextBox(); break; case VARIOUS_ARENA_JUDGMENT_STRING: BattleStringExpandPlaceholdersToDisplayedString(gRefereeStringsTable[gBattlescriptCurrInstr[1]]); diff --git a/src/graphics.c b/src/graphics.c index 1fc106dcc5..c6af134770 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -984,8 +984,8 @@ const u32 gUnknown_08D85358[] = INCBIN_U32("graphics/battle_frontier/options_pal const u32 gUnknown_08D85444[] = INCBIN_U32("graphics/battle_frontier/options_pal2.gbapal.lz"); // pokeball pal const u32 gUnknown_08D854C8[] = INCBIN_U32("graphics/battle_frontier/options_pal3.gbapal.lz"); // arrow pal -const u32 gUnknown_08D854E8[] = INCBIN_U32("graphics/battle_frontier/symbols.4bpp.lz"); -const u32 gUnknown_08D855E8[] = INCBIN_U32("graphics/battle_frontier/symbols.gbapal.lz"); +const u32 gBattleArenaJudgementSymbolsGfx[] = INCBIN_U32("graphics/battle_frontier/arena_judgement_symbols.4bpp.lz"); +const u32 gBattleArenaJudgementSymbolsPalette[] = INCBIN_U32("graphics/battle_frontier/arena_judgement_symbols.gbapal.lz"); const u32 gUnknown_08D85600[] = INCBIN_U32("graphics/battle_frontier/text.gbapal.lz"); const u16 gUnknown_08D85620[] = INCBIN_U16("graphics/battle_frontier/text_pp.gbapal"); From 6add3e17944402eab6419d217c98d14d93f38a55 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 8 Feb 2019 11:08:25 -0600 Subject: [PATCH 026/217] Document some battle dome stuff --- data/event_scripts.s | 228 +++++------ include/battle_dome.h | 4 +- include/strings.h | 118 ++++++ src/battle_dome.c | 871 ++++++++++++++++++------------------------ 4 files changed, 611 insertions(+), 610 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index c6ebcd6955..cf9590ce56 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -5631,346 +5631,346 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .include "data/text/match_call.inc" .include "data/scripts/apprentice.inc" -gBattleDomeOpponentPotential1:: +gBattleDomeOpponentPotentialText1:: .string "The best candidate to be a champ!$" -gBattleDomeOpponentPotential2:: +gBattleDomeOpponentPotentialText2:: .string "A sure-finalist team.$" -gBattleDomeOpponentPotential3:: +gBattleDomeOpponentPotentialText3:: .string "A likely top-three finisher.$" -gBattleDomeOpponentPotential4:: +gBattleDomeOpponentPotentialText4:: .string "A candidate to finish first.$" -gBattleDomeOpponentPotential5:: +gBattleDomeOpponentPotentialText5:: .string "A team with top-class potential.$" -gBattleDomeOpponentPotential6:: +gBattleDomeOpponentPotentialText6:: .string "The dark horse team this tournament.$" -gBattleDomeOpponentPotential7:: +gBattleDomeOpponentPotentialText7:: .string "A better-than-average team.$" -gBattleDomeOpponentPotential8:: +gBattleDomeOpponentPotentialText8:: .string "This tournament's average team.$" -gBattleDomeOpponentPotential9:: +gBattleDomeOpponentPotentialText9:: .string "A team with average potential.$" -gBattleDomeOpponentPotential10:: +gBattleDomeOpponentPotentialText10:: .string "A weaker-than-average team.$" -gBattleDomeOpponentPotential11:: +gBattleDomeOpponentPotentialText11:: .string "A team looking for its first win.$" -gBattleDomeOpponentPotential12:: +gBattleDomeOpponentPotentialText12:: .string "One win will make this team proud.$" -gBattleDomeOpponentPotential13:: +gBattleDomeOpponentPotentialText13:: .string "Overall, a weak team.$" -gBattleDomeOpponentPotential14:: +gBattleDomeOpponentPotentialText14:: .string "A team with very low potential.$" -gBattleDomeOpponentPotential15:: +gBattleDomeOpponentPotentialText15:: .string "A team unlikely to win the tournament.$" -gBattleDomeOpponentPotential16:: +gBattleDomeOpponentPotentialText16:: .string "The team most unlikely to win.$" -gBattleDomeOpponentPotential17:: +gBattleDomeOpponentPotentialText17:: .string "The perfect, invincible superstar!$" -gBattleDomeOpponentStyle1:: +gBattleDomeOpponentStyleText1:: .string "Willing to risk total disaster at times.$" -gBattleDomeOpponentStyle2:: +gBattleDomeOpponentStyleText2:: .string "Skilled at enduring long battles.$" -gBattleDomeOpponentStyle3:: +gBattleDomeOpponentStyleText3:: .string "Varies tactics to suit the opponent.$" -gBattleDomeOpponentStyle4:: +gBattleDomeOpponentStyleText4:: .string "Has a tough winning pattern.$" -gBattleDomeOpponentStyle5:: +gBattleDomeOpponentStyleText5:: .string "Occasionally uses a very rare move.$" -gBattleDomeOpponentStyle6:: +gBattleDomeOpponentStyleText6:: .string "Uses startling and disruptive moves.$" -gBattleDomeOpponentStyle7:: +gBattleDomeOpponentStyleText7:: .string "Constantly watches HP in battle.$" -gBattleDomeOpponentStyle8:: +gBattleDomeOpponentStyleText8:: .string "Good at storing then loosing power.$" -gBattleDomeOpponentStyle9:: +gBattleDomeOpponentStyleText9:: .string "Skilled at enfeebling foes.$" -gBattleDomeOpponentStyle10:: +gBattleDomeOpponentStyleText10:: .string "Prefers tactics that rely on luck.$" -gBattleDomeOpponentStyle11:: +gBattleDomeOpponentStyleText11:: .string "Attacks with a regal atmosphere.$" -gBattleDomeOpponentStyle12:: +gBattleDomeOpponentStyleText12:: .string "Attacks with powerful, low-PP moves.$" -gBattleDomeOpponentStyle13:: +gBattleDomeOpponentStyleText13:: .string "Skilled at enfeebling, then attacking.$" -gBattleDomeOpponentStyle14:: +gBattleDomeOpponentStyleText14:: .string "Battles while enduring all attacks.$" -gBattleDomeOpponentStyle15:: +gBattleDomeOpponentStyleText15:: .string "Skilled at upsetting foes emotionally.$" -gBattleDomeOpponentStyle16:: +gBattleDomeOpponentStyleText16:: .string "Uses strong and straightforward moves.$" -gBattleDomeOpponentStyle17:: +gBattleDomeOpponentStyleText17:: .string "Aggressively uses strong moves.$" -gBattleDomeOpponentStyle18:: +gBattleDomeOpponentStyleText18:: .string "Battles while cleverly dodging attacks.$" -gBattleDomeOpponentStyle19:: +gBattleDomeOpponentStyleText19:: .string "Skilled at using upsetting attacks.$" -gBattleDomeOpponentStyle20:: +gBattleDomeOpponentStyleText20:: .string "Uses many popular moves.$" -gBattleDomeOpponentStyle21:: +gBattleDomeOpponentStyleText21:: .string "Has moves for powerful combinations.$" -gBattleDomeOpponentStyle22:: +gBattleDomeOpponentStyleText22:: .string "Uses high-probability attacks.$" -gBattleDomeOpponentStyle23:: +gBattleDomeOpponentStyleText23:: .string "Aggressively uses spectacular moves.$" -gBattleDomeOpponentStyle24:: +gBattleDomeOpponentStyleText24:: .string "Emphasizes offense over defense.$" -gBattleDomeOpponentStyle25:: +gBattleDomeOpponentStyleText25:: .string "Emphasizes defense over offense.$" -gBattleDomeOpponentStyle26:: +gBattleDomeOpponentStyleText26:: .string "Attacks quickly with strong moves.$" -gBattleDomeOpponentStyle27:: +gBattleDomeOpponentStyleText27:: .string "Often uses moves with added effects.$" -gBattleDomeOpponentStyle28:: +gBattleDomeOpponentStyleText28:: .string "Uses a well-balanced mix of moves.$" -gBattleDomeOpponentStyleUnused1:: +gBattleDomeOpponentStyleTextUnused1:: .string "This is sample message 1.$" -gBattleDomeOpponentStyleUnused2:: +gBattleDomeOpponentStyleTextUnused2:: .string "This is sample message 2.$" -gBattleDomeOpponentStyleUnused3:: +gBattleDomeOpponentStyleTextUnused3:: .string "This is sample message 3.$" -gBattleDomeOpponentStyleUnused4:: +gBattleDomeOpponentStyleTextUnused4:: .string "This is sample message 4.$" -gBattleDomeOpponentStats1:: +gBattleDomeOpponentStatsText1:: .string "Emphasizes HP and ATTACK.$" -gBattleDomeOpponentStats2:: +gBattleDomeOpponentStatsText2:: .string "Emphasizes HP and DEFENSE.$" -gBattleDomeOpponentStats3:: +gBattleDomeOpponentStatsText3:: .string "Emphasizes HP and SPEED.$" -gBattleDomeOpponentStats4:: +gBattleDomeOpponentStatsText4:: .string "Emphasizes HP and SP. ATTACK.$" -gBattleDomeOpponentStats5:: +gBattleDomeOpponentStatsText5:: .string "Emphasizes HP and SP. DEFENSE.$" -gBattleDomeOpponentStats6:: +gBattleDomeOpponentStatsText6:: .string "Emphasizes ATTACK and DEFENSE.$" -gBattleDomeOpponentStats7:: +gBattleDomeOpponentStatsText7:: .string "Emphasizes ATTACK and SPEED.$" -gBattleDomeOpponentStats8:: +gBattleDomeOpponentStatsText8:: .string "Emphasizes ATTACK and SP. ATTACK.$" -gBattleDomeOpponentStats9:: +gBattleDomeOpponentStatsText9:: .string "Emphasizes ATTACK and SP. DEFENSE.$" -gBattleDomeOpponentStats10:: +gBattleDomeOpponentStatsText10:: .string "Emphasizes DEFENSE and SPEED.$" -gBattleDomeOpponentStats11:: +gBattleDomeOpponentStatsText11:: .string "Emphasizes DEFENSE and SP. ATTACK.$" -gBattleDomeOpponentStats12:: +gBattleDomeOpponentStatsText12:: .string "Emphasizes DEFENSE and SP. DEFENSE.$" -gBattleDomeOpponentStats13:: +gBattleDomeOpponentStatsText13:: .string "Emphasizes SPEED and SP. ATTACK.$" -gBattleDomeOpponentStats14:: +gBattleDomeOpponentStatsText14:: .string "Emphasizes SPEED and SP. DEFENSE.$" -gBattleDomeOpponentStats15:: +gBattleDomeOpponentStatsText15:: .string "Emphasizes SP. ATTACK and SP. DEFENSE.$" -gBattleDomeOpponentStats16:: +gBattleDomeOpponentStatsText16:: .string "Emphasizes HP.$" -gBattleDomeOpponentStats17:: +gBattleDomeOpponentStatsText17:: .string "Emphasizes ATTACK.$" -gBattleDomeOpponentStats18:: +gBattleDomeOpponentStatsText18:: .string "Emphasizes DEFENSE.$" -gBattleDomeOpponentStats19:: +gBattleDomeOpponentStatsText19:: .string "Emphasizes SPEED.$" -gBattleDomeOpponentStats20:: +gBattleDomeOpponentStatsText20:: .string "Emphasizes SP. ATTACK.$" -gBattleDomeOpponentStats21:: +gBattleDomeOpponentStatsText21:: .string "Emphasizes SP. DEFENSE.$" -gBattleDomeOpponentStats22:: +gBattleDomeOpponentStatsText22:: .string "Neglects HP and ATTACK.$" -gBattleDomeOpponentStats23:: +gBattleDomeOpponentStatsText23:: .string "Neglects HP and DEFENSE.$" -gBattleDomeOpponentStats24:: +gBattleDomeOpponentStatsText24:: .string "Neglects HP and SPEED.$" -gBattleDomeOpponentStats25:: +gBattleDomeOpponentStatsText25:: .string "Neglects HP and SP. ATTACK.$" -gBattleDomeOpponentStats26:: +gBattleDomeOpponentStatsText26:: .string "Neglects HP and SP. DEFENSE.$" -gBattleDomeOpponentStats27:: +gBattleDomeOpponentStatsText27:: .string "Neglects ATTACK and DEFENSE.$" -gBattleDomeOpponentStats28:: +gBattleDomeOpponentStatsText28:: .string "Neglects ATTACK and SPEED.$" -gBattleDomeOpponentStats29:: +gBattleDomeOpponentStatsText29:: .string "Neglects ATTACK and SP. ATTACK.$" -gBattleDomeOpponentStats30:: +gBattleDomeOpponentStatsText30:: .string "Neglects ATTACK and SP. DEFENSE.$" -gBattleDomeOpponentStats31:: +gBattleDomeOpponentStatsText31:: .string "Neglects DEFENSE and SPEED.$" -gBattleDomeOpponentStats32:: +gBattleDomeOpponentStatsText32:: .string "Neglects DEFENSE and SP. ATTACK.$" -gBattleDomeOpponentStats33:: +gBattleDomeOpponentStatsText33:: .string "Neglects DEFENSE and SP. DEFENSE.$" -gBattleDomeOpponentStats34:: +gBattleDomeOpponentStatsText34:: .string "Neglects SPEED and SP. ATTACK.$" -gBattleDomeOpponentStats35:: +gBattleDomeOpponentStatsText35:: .string "Neglects SPEED and SP. DEFENSE.$" -gBattleDomeOpponentStats36:: +gBattleDomeOpponentStatsText36:: .string "Neglects SP. ATTACK and SP. DEFENSE.$" -gBattleDomeOpponentStats37:: +gBattleDomeOpponentStatsText37:: .string "Neglects HP.$" -gBattleDomeOpponentStats38:: +gBattleDomeOpponentStatsText38:: .string "Neglects ATTACK.$" -gBattleDomeOpponentStats39:: +gBattleDomeOpponentStatsText39:: .string "Neglects DEFENSE.$" -gBattleDomeOpponentStats40:: +gBattleDomeOpponentStatsText40:: .string "Neglects SPEED.$" -gBattleDomeOpponentStats41:: +gBattleDomeOpponentStatsText41:: .string "Neglects SP. ATTACK.$" -gBattleDomeOpponentStats42:: +gBattleDomeOpponentStatsText42:: .string "Neglects SP. DEFENSE.$" -gBattleDomeOpponentStats43:: +gBattleDomeOpponentStatsText43:: .string "Raises POKéMON in a well-balanced way.$" -gBattleDomeWinStrings1:: +gBattleDomeWinText1:: .string "Let the battle begin!$" -gBattleDomeWinStrings2:: +gBattleDomeWinText2:: .string "{STR_VAR_1} won using {STR_VAR_2}!$" -gBattleDomeWinStrings3:: +gBattleDomeWinText3:: .string "{STR_VAR_1} became the champ!$" -gBattleDomeWinStrings4:: +gBattleDomeWinText4:: .string "{STR_VAR_1} won by default!$" -gBattleDomeWinStrings5:: +gBattleDomeWinText5:: .string "{STR_VAR_1} won outright by default!$" -gBattleDomeWinStrings6:: +gBattleDomeWinText6:: .string "{STR_VAR_1} won without using a move!$" -gBattleDomeWinStrings7:: +gBattleDomeWinText7:: .string "{STR_VAR_1} won outright with no moves!$" -gBattleDomeMatchNumber1:: +gBattleDomeMatchNumberText1:: .string "Round 1, Match 1$" -gBattleDomeMatchNumber2:: +gBattleDomeMatchNumberText2:: .string "Round 1, Match 2$" -gBattleDomeMatchNumber3:: +gBattleDomeMatchNumberText3:: .string "Round 1, Match 3$" -gBattleDomeMatchNumber4:: +gBattleDomeMatchNumberText4:: .string "Round 1, Match 4$" -gBattleDomeMatchNumber5:: +gBattleDomeMatchNumberText5:: .string "Round 1, Match 5$" -gBattleDomeMatchNumber6:: +gBattleDomeMatchNumberText6:: .string "Round 1, Match 6$" -gBattleDomeMatchNumber7:: +gBattleDomeMatchNumberText7:: .string "Round 1, Match 7$" -gBattleDomeMatchNumber8:: +gBattleDomeMatchNumberText8:: .string "Round 1, Match 8$" -gBattleDomeMatchNumber9:: +gBattleDomeMatchNumberText9:: .string "Round 2, Match 1$" -gBattleDomeMatchNumber10:: +gBattleDomeMatchNumberText10:: .string "Round 2, Match 2$" -gBattleDomeMatchNumber11:: +gBattleDomeMatchNumberText11:: .string "Round 2, Match 3$" -gBattleDomeMatchNumber12:: +gBattleDomeMatchNumberText12:: .string "Round 2, Match 4$" -gBattleDomeMatchNumber13:: +gBattleDomeMatchNumberText13:: .string "Semifinal Match 1$" -gBattleDomeMatchNumber14:: +gBattleDomeMatchNumberText14:: .string "Semifinal Match 2$" -gBattleDomeMatchNumber15:: +gBattleDomeMatchNumberText15:: .string "Final Match$" BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B diff --git a/include/battle_dome.h b/include/battle_dome.h index 2265f14ce7..d1dfdb1003 100644 --- a/include/battle_dome.h +++ b/include/battle_dome.h @@ -3,7 +3,7 @@ extern u32 gUnknown_0203CD70; -s32 GetDomeTrainerMonCountInBits(u16 tournamentTrainerId); -s32 TrainerIdToDomeTournamentId(u16 trainerId); +int GetDomeTrainerMonCountInBits(u16 tournamentTrainerId); +int TrainerIdToDomeTournamentId(u16 trainerId); #endif // GUARD_BATTLE_DOME_H diff --git a/include/strings.h b/include/strings.h index 15acde0f7b..9557dcca2a 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1687,6 +1687,122 @@ extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B[]; extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF[]; extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D[]; +// Battle Dome. +extern const u8 gBattleDomeOpponentPotentialText1[]; +extern const u8 gBattleDomeOpponentPotentialText2[]; +extern const u8 gBattleDomeOpponentPotentialText3[]; +extern const u8 gBattleDomeOpponentPotentialText4[]; +extern const u8 gBattleDomeOpponentPotentialText5[]; +extern const u8 gBattleDomeOpponentPotentialText6[]; +extern const u8 gBattleDomeOpponentPotentialText7[]; +extern const u8 gBattleDomeOpponentPotentialText8[]; +extern const u8 gBattleDomeOpponentPotentialText9[]; +extern const u8 gBattleDomeOpponentPotentialText10[]; +extern const u8 gBattleDomeOpponentPotentialText11[]; +extern const u8 gBattleDomeOpponentPotentialText12[]; +extern const u8 gBattleDomeOpponentPotentialText13[]; +extern const u8 gBattleDomeOpponentPotentialText14[]; +extern const u8 gBattleDomeOpponentPotentialText15[]; +extern const u8 gBattleDomeOpponentPotentialText16[]; +extern const u8 gBattleDomeOpponentPotentialText17[]; +extern const u8 gBattleDomeOpponentStyleText1[]; +extern const u8 gBattleDomeOpponentStyleText2[]; +extern const u8 gBattleDomeOpponentStyleText3[]; +extern const u8 gBattleDomeOpponentStyleText4[]; +extern const u8 gBattleDomeOpponentStyleText5[]; +extern const u8 gBattleDomeOpponentStyleText6[]; +extern const u8 gBattleDomeOpponentStyleText7[]; +extern const u8 gBattleDomeOpponentStyleText8[]; +extern const u8 gBattleDomeOpponentStyleText9[]; +extern const u8 gBattleDomeOpponentStyleText10[]; +extern const u8 gBattleDomeOpponentStyleText11[]; +extern const u8 gBattleDomeOpponentStyleText12[]; +extern const u8 gBattleDomeOpponentStyleText13[]; +extern const u8 gBattleDomeOpponentStyleText14[]; +extern const u8 gBattleDomeOpponentStyleText15[]; +extern const u8 gBattleDomeOpponentStyleText16[]; +extern const u8 gBattleDomeOpponentStyleText17[]; +extern const u8 gBattleDomeOpponentStyleText18[]; +extern const u8 gBattleDomeOpponentStyleText19[]; +extern const u8 gBattleDomeOpponentStyleText20[]; +extern const u8 gBattleDomeOpponentStyleText21[]; +extern const u8 gBattleDomeOpponentStyleText22[]; +extern const u8 gBattleDomeOpponentStyleText23[]; +extern const u8 gBattleDomeOpponentStyleText24[]; +extern const u8 gBattleDomeOpponentStyleText25[]; +extern const u8 gBattleDomeOpponentStyleText26[]; +extern const u8 gBattleDomeOpponentStyleText27[]; +extern const u8 gBattleDomeOpponentStyleText28[]; +extern const u8 gBattleDomeOpponentStyleTextUnused1[]; +extern const u8 gBattleDomeOpponentStyleTextUnused2[]; +extern const u8 gBattleDomeOpponentStyleTextUnused3[]; +extern const u8 gBattleDomeOpponentStyleTextUnused4[]; +extern const u8 gBattleDomeOpponentStatsText1[]; +extern const u8 gBattleDomeOpponentStatsText2[]; +extern const u8 gBattleDomeOpponentStatsText3[]; +extern const u8 gBattleDomeOpponentStatsText4[]; +extern const u8 gBattleDomeOpponentStatsText5[]; +extern const u8 gBattleDomeOpponentStatsText6[]; +extern const u8 gBattleDomeOpponentStatsText7[]; +extern const u8 gBattleDomeOpponentStatsText8[]; +extern const u8 gBattleDomeOpponentStatsText9[]; +extern const u8 gBattleDomeOpponentStatsText10[]; +extern const u8 gBattleDomeOpponentStatsText11[]; +extern const u8 gBattleDomeOpponentStatsText12[]; +extern const u8 gBattleDomeOpponentStatsText13[]; +extern const u8 gBattleDomeOpponentStatsText14[]; +extern const u8 gBattleDomeOpponentStatsText15[]; +extern const u8 gBattleDomeOpponentStatsText16[]; +extern const u8 gBattleDomeOpponentStatsText17[]; +extern const u8 gBattleDomeOpponentStatsText18[]; +extern const u8 gBattleDomeOpponentStatsText19[]; +extern const u8 gBattleDomeOpponentStatsText20[]; +extern const u8 gBattleDomeOpponentStatsText21[]; +extern const u8 gBattleDomeOpponentStatsText22[]; +extern const u8 gBattleDomeOpponentStatsText23[]; +extern const u8 gBattleDomeOpponentStatsText24[]; +extern const u8 gBattleDomeOpponentStatsText25[]; +extern const u8 gBattleDomeOpponentStatsText26[]; +extern const u8 gBattleDomeOpponentStatsText27[]; +extern const u8 gBattleDomeOpponentStatsText28[]; +extern const u8 gBattleDomeOpponentStatsText29[]; +extern const u8 gBattleDomeOpponentStatsText30[]; +extern const u8 gBattleDomeOpponentStatsText31[]; +extern const u8 gBattleDomeOpponentStatsText32[]; +extern const u8 gBattleDomeOpponentStatsText33[]; +extern const u8 gBattleDomeOpponentStatsText34[]; +extern const u8 gBattleDomeOpponentStatsText35[]; +extern const u8 gBattleDomeOpponentStatsText36[]; +extern const u8 gBattleDomeOpponentStatsText37[]; +extern const u8 gBattleDomeOpponentStatsText38[]; +extern const u8 gBattleDomeOpponentStatsText39[]; +extern const u8 gBattleDomeOpponentStatsText40[]; +extern const u8 gBattleDomeOpponentStatsText41[]; +extern const u8 gBattleDomeOpponentStatsText42[]; +extern const u8 gBattleDomeOpponentStatsText43[]; +extern const u8 gBattleDomeMatchNumberText1[]; +extern const u8 gBattleDomeMatchNumberText2[]; +extern const u8 gBattleDomeMatchNumberText3[]; +extern const u8 gBattleDomeMatchNumberText4[]; +extern const u8 gBattleDomeMatchNumberText5[]; +extern const u8 gBattleDomeMatchNumberText6[]; +extern const u8 gBattleDomeMatchNumberText7[]; +extern const u8 gBattleDomeMatchNumberText8[]; +extern const u8 gBattleDomeMatchNumberText9[]; +extern const u8 gBattleDomeMatchNumberText10[]; +extern const u8 gBattleDomeMatchNumberText11[]; +extern const u8 gBattleDomeMatchNumberText12[]; +extern const u8 gBattleDomeMatchNumberText13[]; +extern const u8 gBattleDomeMatchNumberText14[]; +extern const u8 gBattleDomeMatchNumberText15[]; +extern const u8 gBattleDomeWinText1[]; +extern const u8 gBattleDomeWinText2[]; +extern const u8 gBattleDomeWinText3[]; +extern const u8 gBattleDomeWinText4[]; +extern const u8 gBattleDomeWinText5[]; +extern const u8 gBattleDomeWinText6[]; +extern const u8 gBattleDomeWinText7[]; + // Battle Pyramid. extern const u8 BattlePyramid_ExitHintUp_Text1[]; extern const u8 BattlePyramid_ExitHintLeft_Text1[]; @@ -1815,6 +1931,8 @@ extern const u8 BattlePyramid_FiveTrainersRemaining_Text6[]; extern const u8 BattlePyramid_SixTrainersRemaining_Text6[]; extern const u8 BattlePyramid_SevenTrainersRemaining_Text6[]; + + // PC strings extern const u8 gText_ExitFromBox[]; extern const u8 gText_WhatDoYouWantToDo[]; diff --git a/src/battle_dome.c b/src/battle_dome.c index b9e27675b7..f6327f31f5 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -17,6 +17,7 @@ #include "text.h" #include "bg.h" #include "window.h" +#include "strings.h" #include "palette.h" #include "decompress.h" #include "party_menu.h" @@ -59,177 +60,62 @@ struct UnkStruct_860DD10 }; // text -extern const u8 gTrainerClassNames[][0xD]; - -extern const u8 gBattleDomeOpponentPotential1[]; -extern const u8 gBattleDomeOpponentPotential2[]; -extern const u8 gBattleDomeOpponentPotential3[]; -extern const u8 gBattleDomeOpponentPotential4[]; -extern const u8 gBattleDomeOpponentPotential5[]; -extern const u8 gBattleDomeOpponentPotential6[]; -extern const u8 gBattleDomeOpponentPotential7[]; -extern const u8 gBattleDomeOpponentPotential8[]; -extern const u8 gBattleDomeOpponentPotential9[]; -extern const u8 gBattleDomeOpponentPotential10[]; -extern const u8 gBattleDomeOpponentPotential11[]; -extern const u8 gBattleDomeOpponentPotential12[]; -extern const u8 gBattleDomeOpponentPotential13[]; -extern const u8 gBattleDomeOpponentPotential14[]; -extern const u8 gBattleDomeOpponentPotential15[]; -extern const u8 gBattleDomeOpponentPotential16[]; -extern const u8 gBattleDomeOpponentPotential17[]; -extern const u8 gBattleDomeOpponentStyle1[]; -extern const u8 gBattleDomeOpponentStyle2[]; -extern const u8 gBattleDomeOpponentStyle3[]; -extern const u8 gBattleDomeOpponentStyle4[]; -extern const u8 gBattleDomeOpponentStyle5[]; -extern const u8 gBattleDomeOpponentStyle6[]; -extern const u8 gBattleDomeOpponentStyle7[]; -extern const u8 gBattleDomeOpponentStyle8[]; -extern const u8 gBattleDomeOpponentStyle9[]; -extern const u8 gBattleDomeOpponentStyle10[]; -extern const u8 gBattleDomeOpponentStyle11[]; -extern const u8 gBattleDomeOpponentStyle12[]; -extern const u8 gBattleDomeOpponentStyle13[]; -extern const u8 gBattleDomeOpponentStyle14[]; -extern const u8 gBattleDomeOpponentStyle15[]; -extern const u8 gBattleDomeOpponentStyle16[]; -extern const u8 gBattleDomeOpponentStyle17[]; -extern const u8 gBattleDomeOpponentStyle18[]; -extern const u8 gBattleDomeOpponentStyle19[]; -extern const u8 gBattleDomeOpponentStyle20[]; -extern const u8 gBattleDomeOpponentStyle21[]; -extern const u8 gBattleDomeOpponentStyle22[]; -extern const u8 gBattleDomeOpponentStyle23[]; -extern const u8 gBattleDomeOpponentStyle24[]; -extern const u8 gBattleDomeOpponentStyle25[]; -extern const u8 gBattleDomeOpponentStyle26[]; -extern const u8 gBattleDomeOpponentStyle27[]; -extern const u8 gBattleDomeOpponentStyle28[]; -extern const u8 gBattleDomeOpponentStyleUnused1[]; -extern const u8 gBattleDomeOpponentStyleUnused2[]; -extern const u8 gBattleDomeOpponentStyleUnused3[]; -extern const u8 gBattleDomeOpponentStyleUnused4[]; -extern const u8 gBattleDomeOpponentStats1[]; -extern const u8 gBattleDomeOpponentStats2[]; -extern const u8 gBattleDomeOpponentStats3[]; -extern const u8 gBattleDomeOpponentStats4[]; -extern const u8 gBattleDomeOpponentStats5[]; -extern const u8 gBattleDomeOpponentStats6[]; -extern const u8 gBattleDomeOpponentStats7[]; -extern const u8 gBattleDomeOpponentStats8[]; -extern const u8 gBattleDomeOpponentStats9[]; -extern const u8 gBattleDomeOpponentStats10[]; -extern const u8 gBattleDomeOpponentStats11[]; -extern const u8 gBattleDomeOpponentStats12[]; -extern const u8 gBattleDomeOpponentStats13[]; -extern const u8 gBattleDomeOpponentStats14[]; -extern const u8 gBattleDomeOpponentStats15[]; -extern const u8 gBattleDomeOpponentStats16[]; -extern const u8 gBattleDomeOpponentStats17[]; -extern const u8 gBattleDomeOpponentStats18[]; -extern const u8 gBattleDomeOpponentStats19[]; -extern const u8 gBattleDomeOpponentStats20[]; -extern const u8 gBattleDomeOpponentStats21[]; -extern const u8 gBattleDomeOpponentStats22[]; -extern const u8 gBattleDomeOpponentStats23[]; -extern const u8 gBattleDomeOpponentStats24[]; -extern const u8 gBattleDomeOpponentStats25[]; -extern const u8 gBattleDomeOpponentStats26[]; -extern const u8 gBattleDomeOpponentStats27[]; -extern const u8 gBattleDomeOpponentStats28[]; -extern const u8 gBattleDomeOpponentStats29[]; -extern const u8 gBattleDomeOpponentStats30[]; -extern const u8 gBattleDomeOpponentStats31[]; -extern const u8 gBattleDomeOpponentStats32[]; -extern const u8 gBattleDomeOpponentStats33[]; -extern const u8 gBattleDomeOpponentStats34[]; -extern const u8 gBattleDomeOpponentStats35[]; -extern const u8 gBattleDomeOpponentStats36[]; -extern const u8 gBattleDomeOpponentStats37[]; -extern const u8 gBattleDomeOpponentStats38[]; -extern const u8 gBattleDomeOpponentStats39[]; -extern const u8 gBattleDomeOpponentStats40[]; -extern const u8 gBattleDomeOpponentStats41[]; -extern const u8 gBattleDomeOpponentStats42[]; -extern const u8 gBattleDomeOpponentStats43[]; -extern const u8 gBattleDomeMatchNumber1[]; -extern const u8 gBattleDomeMatchNumber2[]; -extern const u8 gBattleDomeMatchNumber3[]; -extern const u8 gBattleDomeMatchNumber4[]; -extern const u8 gBattleDomeMatchNumber5[]; -extern const u8 gBattleDomeMatchNumber6[]; -extern const u8 gBattleDomeMatchNumber7[]; -extern const u8 gBattleDomeMatchNumber8[]; -extern const u8 gBattleDomeMatchNumber9[]; -extern const u8 gBattleDomeMatchNumber10[]; -extern const u8 gBattleDomeMatchNumber11[]; -extern const u8 gBattleDomeMatchNumber12[]; -extern const u8 gBattleDomeMatchNumber13[]; -extern const u8 gBattleDomeMatchNumber14[]; -extern const u8 gBattleDomeMatchNumber15[]; -extern const u8 gBattleDomeWinStrings1[]; -extern const u8 gBattleDomeWinStrings2[]; -extern const u8 gBattleDomeWinStrings3[]; -extern const u8 gBattleDomeWinStrings4[]; -extern const u8 gBattleDomeWinStrings5[]; -extern const u8 gBattleDomeWinStrings6[]; -extern const u8 gBattleDomeWinStrings7[]; +extern const u8 gTrainerClassNames[][13]; // This file's functions. static u8 GetDomeTrainerMonIvs(u16 trainerId); -static void SwapDomeTrainers(s32 id1, s32 id2, u16 *statsArray); -static void CalcDomeMonStats(u16 species, s32 level, s32 ivs, u8 evBits, u8 nature, s32 *stats); -static void CreateDomeTrainerMons(u16 tournamentTrainerId); -static s32 sub_818FCBC(u16 tournamentTrainerId, bool8 arg1); -static s32 sub_818FDB8(u16 tournamentTrainerId, bool8 arg1); -static s32 GetTypeEffectivenessPoints(s32 move, s32 species, s32 arg2); -static s32 sub_818FEB4(s32 *arr, bool8 arg1); -static void sub_8190400(u8 taskId); +static void SwapDomeTrainers(int id1, int id2, u16 *statsArray); +static void CalcDomeMonStats(u16 species, int level, int ivs, u8 evBits, u8 nature, int *stats); +static void CreateDomeOpponentMons(u16 tournamentTrainerId); +static int sub_818FCBC(u16 tournamentTrainerId, bool8 arg1); +static int sub_818FDB8(u16 tournamentTrainerId, bool8 arg1); +static int GetTypeEffectivenessPoints(int move, int species, int arg2); +static int sub_818FEB4(int *arr, bool8 arg1); +static void Task_ShowOpponentInfo(u8 taskId); static void sub_8190CD4(u8 taskId); static u8 sub_819221C(u8 taskId); -static void sub_8194D48(void); -static s32 TrainerIdToTournamentId(u16 trainerId); +static void InitDomeFacilityTrainersAndMons(void); +static int TrainerIdToTournamentId(u16 trainerId); static u16 TrainerIdOfPlayerOpponent(void); -static void sub_8194220(u8 taskId); +static void Task_ShowTourneyTree(u8 taskId); static void sub_8194950(u8 taskId); static void CB2_BattleDome(void); static void VblankCb0_BattleDome(void); static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo); static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId); -static s32 sub_8192F08(u8, u8*); +static int sub_8192F08(u8, u8*); static u8 GetDomeBrainTrainerPicId(void); static u8 GetDomeBrainTrainerClass(void); -static void CopyDomeBrainTrainerName(u8 *dst); -static void CopyDomeTrainerName(u8 *dst, u16 trainerId); +static void CopyDomeBrainTrainerName(u8 *str); +static void CopyDomeTrainerName(u8 *str, u16 trainerId); static void HblankCb_BattleDome(void); static void VblankCb1_BattleDome(void); -static u8 sub_8193BDC(u8 taskId); +static u8 UpdateTourneyTreeCursor(u8 taskId); static void DecideRoundWinners(u8 roundId); static u8 sub_81953E8(u8 tournamentId, u8); static void sub_81948EC(u8, u8); static void sub_8190B40(struct Sprite *sprite); static void sub_8190C6C(struct Sprite *sprite); -static void sub_818E9CC(void); -static void sub_818EA84(void); -static void sub_818ED28(void); -static void sub_818F9B0(void); -static void sub_818F9E0(void); -static void sub_818FA20(void); +static void InitDomeChallenge(void); +static void GetDomeData(void); +static void SetDomeData(void); +static void BufferDomeRoundText(void); +static void BufferDomeOpponentName(void); +static void InitDomeOpponentParty(void); static void ShowDomeOpponentInfo(void); -static void sub_81938A4(void); -static void sub_81938E0(void); -static void sub_8190298(void); -static void sub_81902E4(void); -static void sub_8193D40(void); -static void sub_8193D7C(void); +static void ShowDomeTourneyTree(void); +static void ShowPreviousDomeResultsTourneyTree(void); +static void SetDomeOpponentId(void); +static void SetDomeOpponentGraphicsId(void); +static void ShowNonInteractiveDomeTourneyTree(void); +static void ResolveDomeRoundWinners(void); static void sub_81902F8(void); -static void sub_819033C(void); -static void sub_8194D68(void); -static void sub_8194E44(void); -static void sub_8194EB4(void); -static void sub_8194EC0(void); -static void sub_8194EF8(void); +static void UpdateDomeStreaks(void); +static void RestoreDomePlayerParty(void); +static void RestoreDomePlayerPartyHeldItems(void); +static void ReduceDomePlayerPartyTo3Mons(void); +static void GetPlayerSeededBeforeOpponent(void); +static void BufferLastDomeWinnerName(void); static void sub_8194F58(void); static void InitDomeTrainers(void); @@ -240,7 +126,7 @@ static EWRAM_DATA struct BattleDomeStruct *sBattleDomeStruct = {0}; static EWRAM_DATA u8 *sTilemapBuffer = NULL; // Const rom data. -static const u8 sMovePointsForDomeTrainers[MOVES_COUNT][DOME_TOURNAMENT_TRAINERS_COUNT] = +static const u8 sMovePointsForDomeTrainers[][DOME_TOURNAMENT_TRAINERS_COUNT] = { [MOVE_NONE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, [MOVE_POUND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, @@ -645,7 +531,7 @@ static const u8 sUnusedArray[] = 0, 0, 0, 254, 0, 0, 0, 0, 0, }; -static const u8 gUnknown_0860CBF1[][5][4]= +static const u8 sTourneyTreeCursorMovementMap[][5][4]= { {{0x07, 0x01, 0x08, 0x10}, {0x07, 0x01, 0x08, 0x10}, {0x07, 0x01, 0x08, 0x10}, {0x07, 0x01, 0x08, 0x10}, {0x07, 0x01, 0x08, 0x10}}, {{0x00, 0x02, 0x09, 0x10}, {0x00, 0x02, 0x09, 0x10}, {0x00, 0x02, 0x09, 0x10}, {0x00, 0x02, 0x09, 0x10}, {0x00, 0x02, 0x09, 0x10}}, @@ -960,14 +846,14 @@ static const struct WindowTemplate gUnknown_0860CEB4[] = // UB: No DUMMY_WIN_TEMPLATE at the array's end. }; -static const struct ScanlineEffectParams gUnknown_0860CF44 = +static const struct ScanlineEffectParams sTourneyTreeScanlineEffectParams = { .dmaDest = (void *)REG_ADDR_BG3CNT, - .dmaControl = 0xa2600001, + .dmaControl = SCANLINE_EFFECT_DMACNT_16BIT, .initState = 1, }; -static const struct CompressedSpriteSheet gUnknown_0860CF50[] = +static const struct CompressedSpriteSheet sDomeOptionsSpriteSheet[] = { {gBattleFrontierGfx_DomeOptions, 0x0600, 0x0000}, {}, @@ -1191,34 +1077,31 @@ static const struct SpriteTemplate gUnknown_0860D068 = .callback = sub_8190C6C }; -static const u8 gUnknown_0860D080[DOME_TOURNAMENT_TRAINERS_COUNT] = -{ - 0x00, 0x08, 0x0c, 0x04, 0x07, 0x0f, 0x0b, 0x03, 0x02, 0x0a, 0x0e, 0x06, 0x05, 0x0d, 0x09, 0x01 -}; +static const u8 sTourneyTreeTrainerIds[] = {0, 8, 12, 4, 7, 15, 11, 3, 2, 10, 14, 6, 5, 13, 9, 1}; -static void (* const gUnknown_0860D090[])(void) = +static void (* const sBattleDomeFunctions[])(void) = { - sub_818E9CC, - sub_818EA84, - sub_818ED28, - sub_818F9B0, - sub_818F9E0, - sub_818FA20, + InitDomeChallenge, + GetDomeData, + SetDomeData, + BufferDomeRoundText, + BufferDomeOpponentName, + InitDomeOpponentParty, ShowDomeOpponentInfo, - sub_81938A4, - sub_81938E0, - sub_8190298, - sub_81902E4, - sub_8193D40, - sub_8193D7C, + ShowDomeTourneyTree, + ShowPreviousDomeResultsTourneyTree, + SetDomeOpponentId, + SetDomeOpponentGraphicsId, + ShowNonInteractiveDomeTourneyTree, + ResolveDomeRoundWinners, sub_81902F8, - sub_819033C, - sub_8194D48, - sub_8194D68, - sub_8194E44, - sub_8194EB4, - sub_8194EC0, - sub_8194EF8, + UpdateDomeStreaks, + InitDomeFacilityTrainersAndMons, + RestoreDomePlayerParty, + RestoreDomePlayerPartyHeldItems, + ReduceDomePlayerPartyTo3Mons, + GetPlayerSeededBeforeOpponent, + BufferLastDomeWinnerName, sub_8194F58, InitDomeTrainers, }; @@ -1293,108 +1176,108 @@ static const u8 gUnknown_0860D1A0[][4] = static const u8 gUnknown_0860D1C0[] = {0x00, 0x0f, 0x08, 0x07, 0x03, 0x0c, 0x0b, 0x04, 0x01, 0x0e, 0x09, 0x06, 0x02, 0x0d, 0x0a, 0x05}; -static const u8 *const gBattleDomePotentialPointers[] = +static const u8 *const sBattleDomePotentialTexts[] = { - gBattleDomeOpponentPotential1, - gBattleDomeOpponentPotential2, - gBattleDomeOpponentPotential3, - gBattleDomeOpponentPotential4, - gBattleDomeOpponentPotential5, - gBattleDomeOpponentPotential6, - gBattleDomeOpponentPotential7, - gBattleDomeOpponentPotential8, - gBattleDomeOpponentPotential9, - gBattleDomeOpponentPotential10, - gBattleDomeOpponentPotential11, - gBattleDomeOpponentPotential12, - gBattleDomeOpponentPotential13, - gBattleDomeOpponentPotential14, - gBattleDomeOpponentPotential15, - gBattleDomeOpponentPotential16, - gBattleDomeOpponentPotential17, + gBattleDomeOpponentPotentialText1, + gBattleDomeOpponentPotentialText2, + gBattleDomeOpponentPotentialText3, + gBattleDomeOpponentPotentialText4, + gBattleDomeOpponentPotentialText5, + gBattleDomeOpponentPotentialText6, + gBattleDomeOpponentPotentialText7, + gBattleDomeOpponentPotentialText8, + gBattleDomeOpponentPotentialText9, + gBattleDomeOpponentPotentialText10, + gBattleDomeOpponentPotentialText11, + gBattleDomeOpponentPotentialText12, + gBattleDomeOpponentPotentialText13, + gBattleDomeOpponentPotentialText14, + gBattleDomeOpponentPotentialText15, + gBattleDomeOpponentPotentialText16, + gBattleDomeOpponentPotentialText17, }; -static const u8 *const gBattleDomeOpponentStylePointers[] = +static const u8 *const sBattleDomeOpponentStyleTexts[] = { - gBattleDomeOpponentStyle1, - gBattleDomeOpponentStyle2, - gBattleDomeOpponentStyle3, - gBattleDomeOpponentStyle4, - gBattleDomeOpponentStyle5, - gBattleDomeOpponentStyle6, - gBattleDomeOpponentStyle7, - gBattleDomeOpponentStyle8, - gBattleDomeOpponentStyle9, - gBattleDomeOpponentStyle10, - gBattleDomeOpponentStyle11, - gBattleDomeOpponentStyle12, - gBattleDomeOpponentStyle13, - gBattleDomeOpponentStyle14, - gBattleDomeOpponentStyle15, - gBattleDomeOpponentStyle16, - gBattleDomeOpponentStyle17, - gBattleDomeOpponentStyle18, - gBattleDomeOpponentStyle19, - gBattleDomeOpponentStyle20, - gBattleDomeOpponentStyle21, - gBattleDomeOpponentStyle22, - gBattleDomeOpponentStyle23, - gBattleDomeOpponentStyle24, - gBattleDomeOpponentStyle25, - gBattleDomeOpponentStyle26, - gBattleDomeOpponentStyle27, - gBattleDomeOpponentStyle28, - gBattleDomeOpponentStyleUnused1, - gBattleDomeOpponentStyleUnused2, - gBattleDomeOpponentStyleUnused3, - gBattleDomeOpponentStyleUnused4, + gBattleDomeOpponentStyleText1, + gBattleDomeOpponentStyleText2, + gBattleDomeOpponentStyleText3, + gBattleDomeOpponentStyleText4, + gBattleDomeOpponentStyleText5, + gBattleDomeOpponentStyleText6, + gBattleDomeOpponentStyleText7, + gBattleDomeOpponentStyleText8, + gBattleDomeOpponentStyleText9, + gBattleDomeOpponentStyleText10, + gBattleDomeOpponentStyleText11, + gBattleDomeOpponentStyleText12, + gBattleDomeOpponentStyleText13, + gBattleDomeOpponentStyleText14, + gBattleDomeOpponentStyleText15, + gBattleDomeOpponentStyleText16, + gBattleDomeOpponentStyleText17, + gBattleDomeOpponentStyleText18, + gBattleDomeOpponentStyleText19, + gBattleDomeOpponentStyleText20, + gBattleDomeOpponentStyleText21, + gBattleDomeOpponentStyleText22, + gBattleDomeOpponentStyleText23, + gBattleDomeOpponentStyleText24, + gBattleDomeOpponentStyleText25, + gBattleDomeOpponentStyleText26, + gBattleDomeOpponentStyleText27, + gBattleDomeOpponentStyleText28, + gBattleDomeOpponentStyleTextUnused1, + gBattleDomeOpponentStyleTextUnused2, + gBattleDomeOpponentStyleTextUnused3, + gBattleDomeOpponentStyleTextUnused4, }; -static const u8 *const gBattleDomeOpponentStatsPointers[] = +static const u8 *const sBattleDomeOpponentStatsTexts[] = { - gBattleDomeOpponentStats1, - gBattleDomeOpponentStats2, - gBattleDomeOpponentStats3, - gBattleDomeOpponentStats4, - gBattleDomeOpponentStats5, - gBattleDomeOpponentStats6, - gBattleDomeOpponentStats7, - gBattleDomeOpponentStats8, - gBattleDomeOpponentStats9, - gBattleDomeOpponentStats10, - gBattleDomeOpponentStats11, - gBattleDomeOpponentStats12, - gBattleDomeOpponentStats13, - gBattleDomeOpponentStats14, - gBattleDomeOpponentStats15, - gBattleDomeOpponentStats16, - gBattleDomeOpponentStats17, - gBattleDomeOpponentStats18, - gBattleDomeOpponentStats19, - gBattleDomeOpponentStats20, - gBattleDomeOpponentStats21, - gBattleDomeOpponentStats22, - gBattleDomeOpponentStats23, - gBattleDomeOpponentStats24, - gBattleDomeOpponentStats25, - gBattleDomeOpponentStats26, - gBattleDomeOpponentStats27, - gBattleDomeOpponentStats28, - gBattleDomeOpponentStats29, - gBattleDomeOpponentStats30, - gBattleDomeOpponentStats31, - gBattleDomeOpponentStats32, - gBattleDomeOpponentStats33, - gBattleDomeOpponentStats34, - gBattleDomeOpponentStats35, - gBattleDomeOpponentStats36, - gBattleDomeOpponentStats37, - gBattleDomeOpponentStats38, - gBattleDomeOpponentStats39, - gBattleDomeOpponentStats40, - gBattleDomeOpponentStats41, - gBattleDomeOpponentStats42, - gBattleDomeOpponentStats43, + gBattleDomeOpponentStatsText1, + gBattleDomeOpponentStatsText2, + gBattleDomeOpponentStatsText3, + gBattleDomeOpponentStatsText4, + gBattleDomeOpponentStatsText5, + gBattleDomeOpponentStatsText6, + gBattleDomeOpponentStatsText7, + gBattleDomeOpponentStatsText8, + gBattleDomeOpponentStatsText9, + gBattleDomeOpponentStatsText10, + gBattleDomeOpponentStatsText11, + gBattleDomeOpponentStatsText12, + gBattleDomeOpponentStatsText13, + gBattleDomeOpponentStatsText14, + gBattleDomeOpponentStatsText15, + gBattleDomeOpponentStatsText16, + gBattleDomeOpponentStatsText17, + gBattleDomeOpponentStatsText18, + gBattleDomeOpponentStatsText19, + gBattleDomeOpponentStatsText20, + gBattleDomeOpponentStatsText21, + gBattleDomeOpponentStatsText22, + gBattleDomeOpponentStatsText23, + gBattleDomeOpponentStatsText24, + gBattleDomeOpponentStatsText25, + gBattleDomeOpponentStatsText26, + gBattleDomeOpponentStatsText27, + gBattleDomeOpponentStatsText28, + gBattleDomeOpponentStatsText29, + gBattleDomeOpponentStatsText30, + gBattleDomeOpponentStatsText31, + gBattleDomeOpponentStatsText32, + gBattleDomeOpponentStatsText33, + gBattleDomeOpponentStatsText34, + gBattleDomeOpponentStatsText35, + gBattleDomeOpponentStatsText36, + gBattleDomeOpponentStatsText37, + gBattleDomeOpponentStatsText38, + gBattleDomeOpponentStatsText39, + gBattleDomeOpponentStatsText40, + gBattleDomeOpponentStatsText41, + gBattleDomeOpponentStatsText42, + gBattleDomeOpponentStatsText43, }; static const u8 sInfoTrainerMonX[] = {0x68, 0x88, 0x68}; @@ -1403,34 +1286,34 @@ static const u8 gUnknown_0860D346[] = {0x00, 0x04, 0x00}; static const u8 gUnknown_0860D349[] = {0x00, 0x05, 0x09, 0x0c, 0x0e, 0x00, 0x00}; -static const u8 *const gBattleDomeMatchNumberPointers[] = +static const u8 *const sBattleDomeMatchNumberTexts[] = { - gBattleDomeMatchNumber1, - gBattleDomeMatchNumber2, - gBattleDomeMatchNumber3, - gBattleDomeMatchNumber4, - gBattleDomeMatchNumber5, - gBattleDomeMatchNumber6, - gBattleDomeMatchNumber7, - gBattleDomeMatchNumber8, - gBattleDomeMatchNumber9, - gBattleDomeMatchNumber10, - gBattleDomeMatchNumber11, - gBattleDomeMatchNumber12, - gBattleDomeMatchNumber13, - gBattleDomeMatchNumber14, - gBattleDomeMatchNumber15, + gBattleDomeMatchNumberText1, + gBattleDomeMatchNumberText2, + gBattleDomeMatchNumberText3, + gBattleDomeMatchNumberText4, + gBattleDomeMatchNumberText5, + gBattleDomeMatchNumberText6, + gBattleDomeMatchNumberText7, + gBattleDomeMatchNumberText8, + gBattleDomeMatchNumberText9, + gBattleDomeMatchNumberText10, + gBattleDomeMatchNumberText11, + gBattleDomeMatchNumberText12, + gBattleDomeMatchNumberText13, + gBattleDomeMatchNumberText14, + gBattleDomeMatchNumberText15, }; -static const u8 *const gBattleDomeWinStringsPointers[] = +static const u8 *const sBattleDomeWinTexts[] = { - gBattleDomeWinStrings1, - gBattleDomeWinStrings2, - gBattleDomeWinStrings3, - gBattleDomeWinStrings4, - gBattleDomeWinStrings5, - gBattleDomeWinStrings6, - gBattleDomeWinStrings7, + gBattleDomeWinText1, + gBattleDomeWinText2, + gBattleDomeWinText3, + gBattleDomeWinText4, + gBattleDomeWinText5, + gBattleDomeWinText6, + gBattleDomeWinText7, }; static const u8 sFirstTrainerMonX[] = {0x60, 0x60, 0x60}; @@ -2373,10 +2256,10 @@ static const u8 gUnknown_0860DE10[DOME_TOURNAMENT_TRAINERS_COUNT][4] = // code void CallBattleDomeFunction(void) { - gUnknown_0860D090[gSpecialVar_0x8004](); + sBattleDomeFunctions[gSpecialVar_0x8004](); } -static void sub_818E9CC(void) +static void InitDomeChallenge(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); @@ -2392,7 +2275,7 @@ static void sub_818E9CC(void) gTrainerBattleOpponent_A = 0; } -static void sub_818EA84(void) +static void GetDomeData(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); @@ -2460,7 +2343,7 @@ static void sub_818EA84(void) } } -static void sub_818ED28(void) +static void SetDomeData(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); @@ -2528,21 +2411,21 @@ static void sub_818ED28(void) static void InitDomeTrainers(void) { - s32 i, j, k; - s32 monLevel; - s32 species[3]; - s32 monTypesBits, monTypesCount; - s32 trainerId; - s32 monSetId; + int i, j, k; + int monLevel; + int species[3]; + int monTypesBits, monTypesCount; + int trainerId; + int monSetId; u16 *statSums; - s32 *statValues; + int *statValues; u8 ivs = 0; species[0] = 0; species[1] = 0; species[2] = 0; statSums = AllocZeroed(sizeof(u16) * DOME_TOURNAMENT_TRAINERS_COUNT); - statValues = AllocZeroed(sizeof(s32) * 6); + statValues = AllocZeroed(sizeof(int) * 6); gSaveBlock2Ptr->frontier.field_D0A = gSaveBlock2Ptr->frontier.lvlMode + 1; gSaveBlock2Ptr->frontier.field_D0B = VarGet(VAR_FRONTIER_BATTLE_MODE) + 1; @@ -2599,7 +2482,7 @@ static void InitDomeTrainers(void) monSetId = RandomizeFacilityTrainerMonSet(trainerId); for (k = 0; k < j; k++) { - s32 checkingMonSetId = gSaveBlock2Ptr->frontier.domeMonIds[i][k]; + int checkingMonSetId = gSaveBlock2Ptr->frontier.domeMonIds[i][k]; if (checkingMonSetId == monSetId || species[0] == gFacilityTrainerMons[monSetId].species || species[1] == gFacilityTrainerMons[monSetId].species @@ -2729,12 +2612,12 @@ static void InitDomeTrainers(void) stats[statIndex] = (u8) ModifyStatByNature(nature, stats[statIndex], statIndex); \ } -static void CalcDomeMonStats(u16 species, s32 level, s32 ivs, u8 evBits, u8 nature, s32 *stats) +static void CalcDomeMonStats(u16 species, int level, int ivs, u8 evBits, u8 nature, int *stats) { - s32 i, count; + int i, count; u8 bits; u16 resultingEvs; - s32 evs[NUM_STATS]; + int evs[NUM_STATS]; count = 0, bits = evBits; for (i = 0; i < NUM_STATS; bits >>= 1, i++) @@ -2757,7 +2640,7 @@ static void CalcDomeMonStats(u16 species, s32 level, s32 ivs, u8 evBits, u8 natu } else { - s32 n = 2 * gBaseStats[species].baseHP; + int n = 2 * gBaseStats[species].baseHP; stats[STAT_HP] = (((n + ivs + evs[STAT_HP] / 4) * level) / 100) + level + 10; } @@ -2768,9 +2651,9 @@ static void CalcDomeMonStats(u16 species, s32 level, s32 ivs, u8 evBits, u8 natu CALC_STAT(baseSpDefense, STAT_SPDEF); } -static void SwapDomeTrainers(s32 id1, s32 id2, u16 *statsArray) +static void SwapDomeTrainers(int id1, int id2, u16 *statsArray) { - s32 i; + int i; u16 temp; SWAP(statsArray[id1], statsArray[id2], temp); @@ -2780,29 +2663,29 @@ static void SwapDomeTrainers(s32 id1, s32 id2, u16 *statsArray) SWAP(gSaveBlock2Ptr->frontier.domeMonIds[id1][i], gSaveBlock2Ptr->frontier.domeMonIds[id2][i], temp); } -static void sub_818F9B0(void) +static void BufferDomeRoundText(void) { StringCopy(gStringVar1, gRoundsStringTable[gSaveBlock2Ptr->frontier.curChallengeBattleNum]); } -static void sub_818F9E0(void) +static void BufferDomeOpponentName(void) { StringCopy(gStringVar1, gRoundsStringTable[gSaveBlock2Ptr->frontier.curChallengeBattleNum]); CopyDomeTrainerName(gStringVar2, gTrainerBattleOpponent_A); } -static void sub_818FA20(void) +static void InitDomeOpponentParty(void) { gUnknown_0203CD70 = 0; gUnknown_0203CD74 = GetMonData(&gPlayerParty[0], MON_DATA_MAX_HP, NULL); gUnknown_0203CD74 += GetMonData(&gPlayerParty[1], MON_DATA_MAX_HP, NULL); CalculatePlayerPartyCount(); - CreateDomeTrainerMons(TrainerIdToTournamentId(gTrainerBattleOpponent_A)); + CreateDomeOpponentMons(TrainerIdToTournamentId(gTrainerBattleOpponent_A)); } -static void CreateDomeMon(u8 monPartyId, u16 tournamentTrainerId, u8 tournamentMonId, u32 otId) +static void CreateDomeOpponentMon(u8 monPartyId, u16 tournamentTrainerId, u8 tournamentMonId, u32 otId) { - s32 i; + int i; u8 happiness = 0xFF; u8 fixedIv = GetDomeTrainerMonIvs(tournamentTrainerId); // BUG: Should be using trainerId instead of tournamentTrainerId. As a result, all Pokemon have ivs of 3. u8 level = SetFacilityPtrsGetLevel(); @@ -2827,11 +2710,11 @@ static void CreateDomeMon(u8 monPartyId, u16 tournamentTrainerId, u8 tournamentM &gBattleFrontierHeldItems[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[tournamentTrainerId][tournamentMonId]].itemTableId]); } -static void CreateDomeTrainerMons(u16 tournamentTrainerId) +static void CreateDomeOpponentMons(u16 tournamentTrainerId) { u8 monsCount = 0; u32 otId = 0; - s32 i, bits; + int i, bits; ZeroEnemyPartyMons(); bits = GetDomeTrainerMonCountInBits(tournamentTrainerId); @@ -2842,7 +2725,7 @@ static void CreateDomeTrainerMons(u16 tournamentTrainerId) { if (bits & 1) { - CreateDomeMon(monsCount, tournamentTrainerId, i, otId); + CreateDomeOpponentMon(monsCount, tournamentTrainerId, i, otId); monsCount++; } bits >>= 1; @@ -2854,7 +2737,7 @@ static void CreateDomeTrainerMons(u16 tournamentTrainerId) { if (bits & 4) { - CreateDomeMon(monsCount, tournamentTrainerId, i, otId); + CreateDomeOpponentMon(monsCount, tournamentTrainerId, i, otId); monsCount++; } bits <<= 1; @@ -2862,9 +2745,9 @@ static void CreateDomeTrainerMons(u16 tournamentTrainerId) } } -s32 GetDomeTrainerMonCountInBits(u16 tournamentTrainerId) +int GetDomeTrainerMonCountInBits(u16 tournamentTrainerId) { - s32 bits; + int bits; if (Random() & 1) { bits = sub_818FCBC(tournamentTrainerId, FALSE); @@ -2881,10 +2764,10 @@ s32 GetDomeTrainerMonCountInBits(u16 tournamentTrainerId) return bits; } -static s32 sub_818FCBC(u16 tournamentTrainerId, bool8 arg1) +static int sub_818FCBC(u16 tournamentTrainerId, bool8 arg1) { - s32 i, moveId, playerMonId; - s32 array[3]; + int i, moveId, playerMonId; + int array[3]; for (i = 0; i < 3; i++) { @@ -2909,10 +2792,10 @@ static s32 sub_818FCBC(u16 tournamentTrainerId, bool8 arg1) return sub_818FEB4(array, arg1); } -static s32 sub_818FDB8(u16 tournamentTrainerId, bool8 arg1) +static int sub_818FDB8(u16 tournamentTrainerId, bool8 arg1) { - s32 i, moveId, playerMonId; - s32 array[3]; + int i, moveId, playerMonId; + int array[3]; for (i = 0; i < 3; i++) { @@ -2937,11 +2820,11 @@ static s32 sub_818FDB8(u16 tournamentTrainerId, bool8 arg1) return sub_818FEB4(array, arg1); } -static s32 sub_818FEB4(s32 *arr, bool8 arg1) +static int sub_818FEB4(int *arr, bool8 arg1) { - s32 i, j; - s32 bits = 0; - s32 array[3]; + int i, j; + int bits = 0; + int array[3]; for (i = 0; i < 3; i++) array[i] = i; @@ -2968,7 +2851,7 @@ static s32 sub_818FEB4(s32 *arr, bool8 arg1) { for (j = i + 1; j < 3; j++) { - s32 temp; + int temp; if (arr[i] < arr[j]) { @@ -3012,11 +2895,11 @@ static s32 sub_818FEB4(s32 *arr, bool8 arg1) // Functionally equivalent, while loop is impossible to match. #ifdef NONMATCHING -static s32 GetTypeEffectivenessPoints(s32 move, s32 targetSpecies, s32 arg2) +static int GetTypeEffectivenessPoints(int move, int targetSpecies, int arg2) { - s32 defType1, defType2, defAbility, moveType; - s32 i = 0; - s32 typePower = TYPE_x1; + int defType1, defType2, defAbility, moveType; + int i = 0; + int typePower = TYPE_x1; if (move == MOVE_NONE || move == 0xFFFF || gBattleMoves[move].power == 0) return 0; @@ -3131,7 +3014,7 @@ static s32 GetTypeEffectivenessPoints(s32 move, s32 targetSpecies, s32 arg2) } #else NAKED -static s32 GetTypeEffectivenessPoints(s32 move, s32 species, s32 arg2) +static int GetTypeEffectivenessPoints(int move, int species, int arg2) { asm_unified("\n\ push {r4-r7,lr}\n\ @@ -3394,9 +3277,9 @@ static u8 GetDomeTrainerMonIvs(u16 trainerId) return fixedIv; } -static s32 TournamentIdOfOpponent(s32 roundId, s32 trainerId) +static int TournamentIdOfOpponent(int roundId, int trainerId) { - s32 i, j, val; + int i, j, val; for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) { @@ -3431,7 +3314,7 @@ static s32 TournamentIdOfOpponent(s32 roundId, s32 trainerId) } } -static void sub_8190298(void) +static void SetDomeOpponentId(void) { gTrainerBattleOpponent_A = TrainerIdOfPlayerOpponent(); } @@ -3441,7 +3324,7 @@ static u16 TrainerIdOfPlayerOpponent(void) return gSaveBlock2Ptr->frontier.domeTrainers[TournamentIdOfOpponent(gSaveBlock2Ptr->frontier.curChallengeBattleNum, TRAINER_PLAYER)].trainerId; } -static void sub_81902E4(void) +static void SetDomeOpponentGraphicsId(void) { SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0); } @@ -3454,7 +3337,7 @@ static void sub_81902F8(void) sub_81A4C30(); } -static void sub_819033C(void) +static void UpdateDomeStreaks(void) { u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); @@ -3470,7 +3353,7 @@ static void sub_819033C(void) static void ShowDomeOpponentInfo(void) { - u8 taskId = CreateTask(sub_8190400, 0); + u8 taskId = CreateTask(Task_ShowOpponentInfo, 0); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = TrainerIdToTournamentId(TrainerIdOfPlayerOpponent()); gTasks[taskId].data[2] = 0; @@ -3479,12 +3362,12 @@ static void ShowDomeOpponentInfo(void) SetMainCallback2(CB2_BattleDome); } -static void sub_8190400(u8 taskId) +static void Task_ShowOpponentInfo(u8 taskId) { - s32 i; - s32 r5 = gTasks[taskId].data[1]; - s32 r9 = gTasks[taskId].data[2]; - s32 r7 = gTasks[taskId].data[3]; + int i; + int r5 = gTasks[taskId].data[1]; + int r9 = gTasks[taskId].data[2]; + int r7 = gTasks[taskId].data[3]; switch (gTasks[taskId].data[0]) { @@ -3531,7 +3414,7 @@ static void sub_8190400(u8 taskId) DecompressAndLoadBgGfxUsingHeap(2, gUnknown_08D83D50, 0x2000, 0, 0); DecompressAndLoadBgGfxUsingHeap(2, gUnknown_08D84970, 0x2000, 0, 1); DecompressAndLoadBgGfxUsingHeap(3, gUnknown_08D84F00, 0x800, 0, 1); - LoadCompressedSpriteSheet(gUnknown_0860CF50); + LoadCompressedSpriteSheet(sDomeOptionsSpriteSheet); LoadCompressedPalette(gUnknown_08D85358, 0, 0x200); LoadCompressedPalette(gUnknown_08D85444, 0x100, 0x200); LoadCompressedPalette(gUnknown_08D85600, 0xF0, 0x20); @@ -3774,10 +3657,10 @@ static void SpriteCb_MonIconCardScrollRight(struct Sprite *sprite) static void sub_8190B40(struct Sprite *sprite) { - s32 taskId1 = sprite->data[0]; - s32 arrId = gTasks[gTasks[taskId1].data[4]].data[1]; - s32 tournmanetTrainerId = gUnknown_0860D080[arrId]; - s32 roundId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; + int taskId1 = sprite->data[0]; + int arrId = gTasks[gTasks[taskId1].data[4]].data[1]; + int tournmanetTrainerId = sTourneyTreeTrainerIds[arrId]; + int roundId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; if (gTasks[taskId1].data[3] == 1) { @@ -3843,7 +3726,7 @@ static void sub_8190B40(struct Sprite *sprite) static void sub_8190C6C(struct Sprite *sprite) { - s32 taskId1 = sprite->data[0]; + int taskId1 = sprite->data[0]; if (gTasks[taskId1].data[3] == 1) { @@ -3873,12 +3756,12 @@ static void sub_8190C6C(struct Sprite *sprite) static void sub_8190CD4(u8 taskId) { - s32 i; - s32 windowId = 0; - s32 r9 = gTasks[taskId].data[3]; - s32 taskId2 = gTasks[taskId].data[4]; - s32 trainerTournamentId = 0; - s32 matchNo = 0; + int i; + int windowId = 0; + int r9 = gTasks[taskId].data[3]; + int taskId2 = gTasks[taskId].data[4]; + int trainerTournamentId = 0; + int matchNo = 0; switch (gTasks[taskId].data[0]) { @@ -3946,14 +3829,14 @@ static void sub_8190CD4(u8 taskId) { gBattle_BG2_X = 0; gBattle_BG2_Y = 320; - trainerTournamentId = gUnknown_0860D080[gTasks[taskId2].data[1]]; + trainerTournamentId = sTourneyTreeTrainerIds[gTasks[taskId2].data[1]]; DisplayTrainerInfoOnCard(gTasks[taskId].data[2] | 0x10, trainerTournamentId); } else { gBattle_BG2_X = 256; gBattle_BG2_Y = 0; - trainerTournamentId = gUnknown_0860D080[gTasks[taskId2].data[1]]; + trainerTournamentId = sTourneyTreeTrainerIds[gTasks[taskId2].data[1]]; DisplayTrainerInfoOnCard(gTasks[taskId].data[2] | 0x10, trainerTournamentId); sBattleDomeStruct->unk_10 = 0; } @@ -4062,14 +3945,14 @@ static void sub_8190CD4(u8 taskId) { gBattle_BG2_X = 0; gBattle_BG2_Y = 160; - trainerTournamentId = gUnknown_0860D080[gTasks[taskId2].data[1]]; + trainerTournamentId = sTourneyTreeTrainerIds[gTasks[taskId2].data[1]]; DisplayTrainerInfoOnCard(gTasks[taskId].data[2] | 4, trainerTournamentId); } else { gBattle_BG2_X = 0; gBattle_BG2_Y = 0; - trainerTournamentId = gUnknown_0860D080[gTasks[taskId2].data[1]]; + trainerTournamentId = sTourneyTreeTrainerIds[gTasks[taskId2].data[1]]; DisplayTrainerInfoOnCard(gTasks[taskId].data[2] | 4, trainerTournamentId); sBattleDomeStruct->unk_10 = 0; } @@ -4175,7 +4058,7 @@ static void sub_8190CD4(u8 taskId) { gBattle_BG2_X = 256; gBattle_BG2_Y = 160; - trainerTournamentId = gUnknown_0860D080[gTasks[taskId2].data[1]]; + trainerTournamentId = sTourneyTreeTrainerIds[gTasks[taskId2].data[1]]; DisplayTrainerInfoOnCard(gTasks[taskId].data[2] | 8, trainerTournamentId); } else @@ -4574,7 +4457,7 @@ static void sub_8190CD4(u8 taskId) } else { - i = CreateTask(sub_8194220, 0); + i = CreateTask(Task_ShowTourneyTree, 0); gTasks[i].data[0] = 0; gTasks[i].data[1] = 0; gTasks[i].data[2] = 3; @@ -4590,9 +4473,9 @@ static void sub_8190CD4(u8 taskId) static u8 sub_819221C(u8 taskId) { u8 retVal = 0; - s32 taskId2 = gTasks[taskId].data[4]; - s32 r5 = gTasks[taskId2].data[1]; - u8 r10 = gUnknown_0860D080[r5]; + int taskId2 = gTasks[taskId].data[4]; + int r5 = gTasks[taskId2].data[1]; + u8 r10 = sTourneyTreeTrainerIds[r5]; u16 roundId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; if (gMain.newKeys & (A_BUTTON | B_BUTTON)) @@ -4699,12 +4582,12 @@ static u8 sub_819221C(u8 taskId) static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId) { struct TextPrinterTemplate textPrinter; - s32 i, j, k; - s32 trainerId = 0; + int i, j, k; + int trainerId = 0; u8 nature = 0; - s32 arrId = 0; - s32 windowId = 0; - s32 x = 0, y = 0; + int arrId = 0; + int windowId = 0; + int x = 0, y = 0; u8 palSlot = 0; s16 *allocatedArray = AllocZeroed(sizeof(s16) * 18); trainerId = gSaveBlock2Ptr->frontier.domeTrainers[trainerTournamentId].trainerId; @@ -4835,9 +4718,9 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId) PutWindowTilemap(windowId + 4); CopyWindowToVram(windowId + 4, 3); if (trainerId == TRAINER_FRONTIER_BRAIN) - textPrinter.currentChar = gBattleDomePotentialPointers[16]; + textPrinter.currentChar = sBattleDomePotentialTexts[16]; else - textPrinter.currentChar = gBattleDomePotentialPointers[trainerTournamentId]; + textPrinter.currentChar = sBattleDomePotentialTexts[trainerTournamentId]; textPrinter.fontId = 1; textPrinter.windowId = windowId + 4; @@ -4864,7 +4747,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId) for (i = 0; i < ARRAY_COUNT(gUnknown_0860C988); i++) { - s32 r4 = 0; + int r4 = 0; for (k = 0, j = 0; j < DOME_TOURNAMENT_TRAINERS_COUNT; j++) { @@ -4879,7 +4762,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId) break; } - textPrinter.currentChar = gBattleDomeOpponentStylePointers[i]; + textPrinter.currentChar = sBattleDomeOpponentStyleTexts[i]; textPrinter.y = 20; textPrinter.currentY = 20; AddTextPrinter(&textPrinter, 0, NULL); @@ -4930,7 +4813,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId) { for (i = 0; i < 3; i++) { - s32 evBits = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[trainerTournamentId][i]].evSpread; + int evBits = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[trainerTournamentId][i]].evSpread; for (k = 0, j = 0; j < NUM_STATS; j++) { allocatedArray[j] = 0; @@ -5051,19 +4934,19 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId) else i = 42; - textPrinter.currentChar = gBattleDomeOpponentStatsPointers[i]; + textPrinter.currentChar = sBattleDomeOpponentStatsTexts[i]; textPrinter.y = 36; textPrinter.currentY = 36; AddTextPrinter(&textPrinter, 0, NULL); Free(allocatedArray); } -static s32 sub_8192F08(u8 arg0, u8 *arg1) +static int sub_8192F08(u8 arg0, u8 *arg1) { - s32 i; + int i; u8 tournamentId; - s32 retVal = 0; - s32 count = 0; + int retVal = 0; + int count = 0; for (i = gUnknown_0860D3C4[arg0][0]; i < gUnknown_0860D3C4[arg0][0] + gUnknown_0860D3C4[arg0][1]; i++) { @@ -5123,14 +5006,14 @@ static s32 sub_8192F08(u8 arg0, u8 *arg1) static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo) { struct TextPrinterTemplate textPrinter; - s32 tournamentIds[2]; - s32 trainerIds[2]; + int tournamentIds[2]; + int trainerIds[2]; bool32 lost[2]; - s32 i; - s32 winStringId = 0; - s32 arrId = 0; - s32 windowId = 0; - s32 x = 0, y = 0; + int i; + int winStringId = 0; + int arrId = 0; + int windowId = 0; + int x = 0, y = 0; u8 palSlot = 0; if (flags & 1) @@ -5274,7 +5157,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo) textPrinter.fgColor = 14; textPrinter.bgColor = 0; textPrinter.shadowColor = 13; - StringExpandPlaceholders(gStringVar4, gBattleDomeWinStringsPointers[winStringId]); + StringExpandPlaceholders(gStringVar4, sBattleDomeWinTexts[winStringId]); textPrinter.currentChar = gStringVar4; textPrinter.windowId = windowId + 8; textPrinter.fontId = 1; @@ -5320,7 +5203,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo) // Print match number. textPrinter.letterSpacing = 0; - textPrinter.currentChar = gBattleDomeMatchNumberPointers[matchNo]; + textPrinter.currentChar = sBattleDomeMatchNumberTexts[matchNo]; textPrinter.windowId = windowId + 5; textPrinter.currentX = GetStringCenterAlignXOffsetWithLetterSpacing(textPrinter.fontId, textPrinter.currentChar, 0xA0, textPrinter.letterSpacing); textPrinter.currentY = textPrinter.y = 2; @@ -5329,9 +5212,9 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo) AddTextPrinter(&textPrinter, 0, NULL); } -static void sub_81938A4(void) +static void ShowDomeTourneyTree(void) { - u8 taskId = CreateTask(sub_8194220, 0); + u8 taskId = CreateTask(Task_ShowTourneyTree, 0); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 0; gTasks[taskId].data[2] = 2; @@ -5339,14 +5222,14 @@ static void sub_81938A4(void) SetMainCallback2(CB2_BattleDome); } -static void sub_81938E0(void) +static void ShowPreviousDomeResultsTourneyTree(void) { u8 taskId; - sub_8194D48(); + InitDomeFacilityTrainersAndMons(); gSaveBlock2Ptr->frontier.lvlMode = gSaveBlock2Ptr->frontier.field_D0A - 1; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 3; - taskId = CreateTask(sub_8194220, 0); + taskId = CreateTask(Task_ShowTourneyTree, 0); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 0; gTasks[taskId].data[2] = 2; @@ -5357,7 +5240,7 @@ static void sub_81938E0(void) static void sub_819395C(u8 taskId) { u8 newTaskId = 0; - s32 spriteId = gTasks[taskId].data[1]; + int spriteId = gTasks[taskId].data[1]; switch (gTasks[taskId].data[0]) { @@ -5374,7 +5257,7 @@ static void sub_819395C(u8 taskId) gTasks[taskId].data[0] = 2; break; case 2: - switch (sub_8193BDC(taskId)) + switch (UpdateTourneyTreeCursor(taskId)) { case 0: default: @@ -5399,9 +5282,9 @@ static void sub_819395C(u8 taskId) FreeAllWindowBuffers(); ScanlineEffect_Stop(); FREE_AND_SET_NULL(sTilemapBuffer); - newTaskId = CreateTask(sub_8190400, 0); + newTaskId = CreateTask(Task_ShowOpponentInfo, 0); gTasks[newTaskId].data[0] = 0; - gTasks[newTaskId].data[1] = gUnknown_0860D080[spriteId]; + gTasks[newTaskId].data[1] = sTourneyTreeTrainerIds[spriteId]; gTasks[newTaskId].data[2] = 1; gTasks[newTaskId].data[3] = taskId; @@ -5417,7 +5300,7 @@ static void sub_819395C(u8 taskId) FreeAllWindowBuffers(); ScanlineEffect_Stop(); FREE_AND_SET_NULL(sTilemapBuffer); - newTaskId = CreateTask(sub_8190400, 0); + newTaskId = CreateTask(Task_ShowOpponentInfo, 0); gTasks[newTaskId].data[0] = 0; gTasks[newTaskId].data[1] = spriteId - 16; gTasks[newTaskId].data[2] = 2; @@ -5442,21 +5325,21 @@ static void sub_819395C(u8 taskId) } } -static u8 sub_8193BDC(u8 taskId) +static u8 UpdateTourneyTreeCursor(u8 taskId) { u8 retVal = 1; - s32 arrId = 4; - s32 spriteId = gTasks[taskId].data[1]; - s32 roundId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; + int direction = 4; + int tourneyTreeCursorSpriteId = gTasks[taskId].data[1]; + int roundId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; - if (gMain.newKeys == B_BUTTON || (gMain.newKeys & A_BUTTON && spriteId == 31)) + if (gMain.newKeys == B_BUTTON || (gMain.newKeys & A_BUTTON && tourneyTreeCursorSpriteId == 31)) { PlaySE(SE_SELECT); retVal = 0; } else if (gMain.newKeys & A_BUTTON) { - if (spriteId < 16) + if (tourneyTreeCursorSpriteId < 16) { PlaySE(SE_SELECT); retVal = 2; @@ -5469,31 +5352,31 @@ static u8 sub_8193BDC(u8 taskId) } else { - if (gMain.newKeys == DPAD_UP && gUnknown_0860CBF1[spriteId][roundId][0] != 0xFF) - arrId = 0; - else if (gMain.newKeys == DPAD_DOWN && gUnknown_0860CBF1[spriteId][roundId][1] != 0xFF) - arrId = 1; - else if (gMain.newKeys == DPAD_LEFT && gUnknown_0860CBF1[spriteId][roundId][2] != 0xFF) - arrId = 2; - else if (gMain.newKeys == DPAD_RIGHT && gUnknown_0860CBF1[spriteId][roundId][3] != 0xFF) - arrId = 3; + if (gMain.newKeys == DPAD_UP && sTourneyTreeCursorMovementMap[tourneyTreeCursorSpriteId][roundId][0] != 0xFF) + direction = 0; + else if (gMain.newKeys == DPAD_DOWN && sTourneyTreeCursorMovementMap[tourneyTreeCursorSpriteId][roundId][1] != 0xFF) + direction = 1; + else if (gMain.newKeys == DPAD_LEFT && sTourneyTreeCursorMovementMap[tourneyTreeCursorSpriteId][roundId][2] != 0xFF) + direction = 2; + else if (gMain.newKeys == DPAD_RIGHT && sTourneyTreeCursorMovementMap[tourneyTreeCursorSpriteId][roundId][3] != 0xFF) + direction = 3; } - if (arrId != 4) + if (direction != 4) { PlaySE(SE_SELECT); - StartSpriteAnim(&gSprites[spriteId], 0); - spriteId = gUnknown_0860CBF1[spriteId][roundId][arrId]; - StartSpriteAnim(&gSprites[spriteId], 1); - gTasks[taskId].data[1] = spriteId; + StartSpriteAnim(&gSprites[tourneyTreeCursorSpriteId], 0); + tourneyTreeCursorSpriteId = sTourneyTreeCursorMovementMap[tourneyTreeCursorSpriteId][roundId][direction]; + StartSpriteAnim(&gSprites[tourneyTreeCursorSpriteId], 1); + gTasks[taskId].data[1] = tourneyTreeCursorSpriteId; } return retVal; } -static void sub_8193D40(void) +static void ShowNonInteractiveDomeTourneyTree(void) { - u8 taskId = CreateTask(sub_8194220, 0); + u8 taskId = CreateTask(Task_ShowTourneyTree, 0); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 1; gTasks[taskId].data[2] = 2; @@ -5501,9 +5384,9 @@ static void sub_8193D40(void) SetMainCallback2(CB2_BattleDome); } -static void sub_8193D7C(void) +static void ResolveDomeRoundWinners(void) { - s32 i; + int i; if (gSpecialVar_0x8005 == 1) { @@ -5525,14 +5408,14 @@ static void sub_8193D7C(void) } } -static u16 GetWinningMove(s32 winnerTournamentId, s32 loserTournamentId, u8 roundId) +static u16 GetWinningMove(int winnerTournamentId, int loserTournamentId, u8 roundId) { - s32 i, j, k; - s32 moveScores[4 * 3]; + int i, j, k; + int moveScores[4 * 3]; u16 moveIds[4 * 3]; u16 bestScore = 0; u16 bestId = 0; - s32 movePower = 0; + int movePower = 0; SetFacilityPtrsGetLevel(); // Calc move points of all 4 moves for all 3 pokemon hitting all 3 target mons. @@ -5639,12 +5522,12 @@ static u16 GetWinningMove(s32 winnerTournamentId, s32 loserTournamentId, u8 roun return moveIds[j]; } -static void sub_8194220(u8 taskId) +static void Task_ShowTourneyTree(u8 taskId) { - s32 i; + int i; struct TextPrinterTemplate textPrinter; - s32 r10 = gTasks[taskId].data[1]; - s32 r4 = gTasks[taskId].data[2]; + int r10 = gTasks[taskId].data[1]; + int r4 = gTasks[taskId].data[2]; switch (gTasks[taskId].data[0]) { @@ -5703,7 +5586,7 @@ static void sub_8194220(u8 taskId) gTasks[taskId].data[0]++; break; case 3: - LoadCompressedSpriteSheet(gUnknown_0860CF50); + LoadCompressedSpriteSheet(sDomeOptionsSpriteSheet); if (r10 == 0) { for (i = 0; i < (unsigned) 31; i++) @@ -5734,7 +5617,7 @@ static void sub_8194220(u8 taskId) AddTextPrinter(&textPrinter, 0, NULL); for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) { - s32 roundId, var2; + int roundId, var2; CopyDomeTrainerName(gDisplayedStringBattle, gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId); if (r10 == 1) @@ -5851,19 +5734,19 @@ static void sub_8194220(u8 taskId) i = 0; while (i < 91) { - gScanlineEffectRegBuffers[0][i] = 0x1F0A; - gScanlineEffectRegBuffers[1][i] = 0x1F0A; + gScanlineEffectRegBuffers[0][i] = BGCNT_PRIORITY(2) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_CHARBASE(2) | BGCNT_TXT256x256; + gScanlineEffectRegBuffers[1][i] = BGCNT_PRIORITY(2) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_CHARBASE(2) | BGCNT_TXT256x256; i++; } while (i < 160) { - gScanlineEffectRegBuffers[0][i] = 0x1F09; - gScanlineEffectRegBuffers[1][i] = 0x1F09; + gScanlineEffectRegBuffers[0][i] = BGCNT_PRIORITY(1) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_CHARBASE(2) | BGCNT_TXT256x256; + gScanlineEffectRegBuffers[1][i] = BGCNT_PRIORITY(1) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_CHARBASE(2) | BGCNT_TXT256x256; i++; } - ScanlineEffect_SetParams(gUnknown_0860CF44); + ScanlineEffect_SetParams(sTourneyTreeScanlineEffectParams); DestroyTask(taskId); break; } @@ -5871,7 +5754,7 @@ static void sub_8194220(u8 taskId) static void sub_81948EC(u8 tournamentId, u8 arg1) { - s32 i; + int i; const struct UnkStruct_860DD10 *structPtr = gUnknown_0860DD10[tournamentId][arg1]; for (i = 0; i < gUnknown_0860DE10[tournamentId][arg1]; i++) @@ -5882,7 +5765,7 @@ static void sub_81948EC(u8 tournamentId, u8 arg1) static void sub_8194950(u8 taskId) { - s32 i; + int i; struct TextPrinterTemplate textPrinter; switch (gTasks[taskId].data[0]) @@ -5923,7 +5806,7 @@ static void sub_8194950(u8 taskId) } if (!gSaveBlock2Ptr->frontier.domeTrainers[i].isEliminated) { - s32 roundId = gSaveBlock2Ptr->frontier.curChallengeBattleNum - 1; + int roundId = gSaveBlock2Ptr->frontier.curChallengeBattleNum - 1; sub_81948EC(i, roundId); } } @@ -6050,20 +5933,20 @@ static void VblankCb1_BattleDome(void) ScanlineEffect_InitHBlankDmaTransfer(); } -static void sub_8194D48(void) +static void InitDomeFacilityTrainersAndMons(void) { gFacilityTrainerMons = gBattleFrontierMons; gFacilityTrainers = gBattleFrontierTrainers; } -static void sub_8194D68(void) +static void RestoreDomePlayerParty(void) { - s32 i, moveSlot; + int i, moveSlot; for (i = 0; i < 2; i++) { - s32 playerMonId = gSaveBlock2Ptr->frontier.selectedPartyMons[gSelectedOrderFromParty[i] - 1] - 1; - s32 count; + int playerMonId = gSaveBlock2Ptr->frontier.selectedPartyMons[gSelectedOrderFromParty[i] - 1] - 1; + int count; for (moveSlot = 0; moveSlot < MAX_MON_MOVES; moveSlot++) { @@ -6082,24 +5965,24 @@ static void sub_8194D68(void) } } -static void sub_8194E44(void) +static void RestoreDomePlayerPartyHeldItems(void) { - s32 i; + int i; for (i = 0; i < 2; i++) { - s32 playerMonId = gSaveBlock2Ptr->frontier.selectedPartyMons[gSelectedOrderFromParty[i] - 1] - 1; + int playerMonId = gSaveBlock2Ptr->frontier.selectedPartyMons[gSelectedOrderFromParty[i] - 1] - 1; u16 item = GetMonData(&gSaveBlock1Ptr->playerParty[playerMonId], MON_DATA_HELD_ITEM, NULL); SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, &item); } } -static void sub_8194EB4(void) +static void ReduceDomePlayerPartyTo3Mons(void) { ReducePlayerPartyToSelectedMons(); } -static void sub_8194EC0(void) +static void GetPlayerSeededBeforeOpponent(void) { if (TrainerIdToTournamentId(gTrainerBattleOpponent_A) > TrainerIdToTournamentId(TRAINER_PLAYER)) gSpecialVar_Result = 1; @@ -6107,11 +5990,11 @@ static void sub_8194EC0(void) gSpecialVar_Result = 2; } -static void sub_8194EF8(void) +static void BufferLastDomeWinnerName(void) { - s32 i; + int i; - sub_8194D48(); + InitDomeFacilityTrainersAndMons(); for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) { if (!gSaveBlock2Ptr->frontier.domeTrainers[i].isEliminated) @@ -6122,15 +6005,15 @@ static void sub_8194EF8(void) static void sub_8194F58(void) { - s32 i, j, k; - s32 monLevel; - s32 species[3]; - s32 monTypesBits; - s32 trainerId; - s32 monSetId; + int i, j, k; + int monLevel; + int species[3]; + int monTypesBits; + int trainerId; + int monSetId; u8 lvlMode; u16 *statSums; - s32 *statValues; + int *statValues; u8 ivs = 0; species[0] = 0; @@ -6140,7 +6023,7 @@ static void sub_8194F58(void) return; statSums = AllocZeroed(sizeof(u16) * DOME_TOURNAMENT_TRAINERS_COUNT); - statValues = AllocZeroed(sizeof(s32) * 6); + statValues = AllocZeroed(sizeof(int) * 6); lvlMode = gSaveBlock2Ptr->frontier.lvlMode; gSaveBlock2Ptr->frontier.lvlMode = 0; // This one, I'd like to call a 'C fakematching'. @@ -6177,7 +6060,7 @@ static void sub_8194F58(void) monSetId = RandomizeFacilityTrainerMonSet(trainerId); for (k = 0; k < j; k++) { - s32 checkingMonId = gSaveBlock2Ptr->frontier.domeMonIds[i][k]; + int checkingMonId = gSaveBlock2Ptr->frontier.domeMonIds[i][k]; if (checkingMonId == monSetId || species[0] == gFacilityTrainerMons[monSetId].species || species[1] == gFacilityTrainerMons[monSetId].species @@ -6253,9 +6136,9 @@ static void sub_8194F58(void) gSaveBlock2Ptr->frontier.lvlMode = lvlMode; } -static s32 TrainerIdToTournamentId(u16 trainerId) +static int TrainerIdToTournamentId(u16 trainerId) { - s32 i; + int i; for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) { @@ -6267,9 +6150,9 @@ static s32 TrainerIdToTournamentId(u16 trainerId) } // The same as the above one, but has global scope. -s32 TrainerIdToDomeTournamentId(u16 trainerId) +int TrainerIdToDomeTournamentId(u16 trainerId) { - s32 i; + int i; for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) { @@ -6280,10 +6163,10 @@ s32 TrainerIdToDomeTournamentId(u16 trainerId) return i; } -static u8 sub_81953E8(u8 tournamentId, u8 arg1) +static u8 sub_81953E8(u8 tournamentId, u8 round) { u8 arr[2]; - sub_8192F08(gUnknown_0860D1A0[gUnknown_0860D1C0[tournamentId] / 2][arg1] - 16, arr); + sub_8192F08(gUnknown_0860D1A0[gUnknown_0860D1C0[tournamentId] / 2][round] - 16, arr); if (tournamentId == arr[0]) return arr[1]; else @@ -6292,11 +6175,11 @@ static u8 sub_81953E8(u8 tournamentId, u8 arg1) static void DecideRoundWinners(u8 roundId) { - s32 i; - s32 moveSlot, monId1, monId2; - s32 tournamentId1, tournamentId2; - s32 species; - s32 points1 = 0, points2 = 0; + int i; + int moveSlot, monId1, monId2; + int tournamentId1, tournamentId2; + int species; + int points1 = 0, points2 = 0; for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) { @@ -6400,28 +6283,28 @@ static void DecideRoundWinners(u8 roundId) } } -static void CopyDomeTrainerName(u8 *dst, u16 trainerId) +static void CopyDomeTrainerName(u8 *str, u16 trainerId) { - s32 i = 0; + int i = 0; SetFacilityPtrsGetLevel(); if (trainerId == TRAINER_FRONTIER_BRAIN) { - CopyDomeBrainTrainerName(dst); + CopyDomeBrainTrainerName(str); } else { if (trainerId == TRAINER_PLAYER) { for (i = 0; i < PLAYER_NAME_LENGTH; i++) - dst[i] = gSaveBlock2Ptr->playerName[i]; + str[i] = gSaveBlock2Ptr->playerName[i]; } else if (trainerId < 300) { for (i = 0; i < PLAYER_NAME_LENGTH; i++) - dst[i] = gFacilityTrainers[trainerId].trainerName[i]; + str[i] = gFacilityTrainers[trainerId].trainerName[i]; } - dst[i] = EOS; + str[i] = EOS; } } @@ -6435,11 +6318,11 @@ static u8 GetDomeBrainTrainerClass(void) return gTrainers[TRAINER_TUCKER].trainerClass; } -static void CopyDomeBrainTrainerName(u8 *dst) +static void CopyDomeBrainTrainerName(u8 *str) { - s32 i; + int i; for (i = 0; i < PLAYER_NAME_LENGTH; i++) - dst[i] = gTrainers[TRAINER_TUCKER].trainerName[i]; - dst[i] = EOS; + str[i] = gTrainers[TRAINER_TUCKER].trainerName[i]; + str[i] = EOS; } From abebd2b8648313deeee52ef5be1d6cc0927193ad Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 8 Feb 2019 11:48:51 -0600 Subject: [PATCH 027/217] Cleanup externs in overworld.c --- include/cable_club.h | 1 + include/field_camera.h | 1 + include/field_control_avatar.h | 2 + include/field_effect.h | 1 + include/field_message_box.h | 1 + include/field_player_avatar.h | 3 ++ include/field_screen_effect.h | 1 + include/field_specials.h | 2 + include/field_weather.h | 1 + include/fieldmap.h | 6 +++ include/link.h | 2 + include/link_rfu.h | 1 + include/match_call.h | 1 + include/secret_base.h | 2 + include/tileset_anims.h | 9 +++++ src/field_specials.c | 2 +- src/new_game.c | 2 +- src/overworld.c | 69 +++------------------------------- 18 files changed, 42 insertions(+), 65 deletions(-) create mode 100755 include/tileset_anims.h diff --git a/include/cable_club.h b/include/cable_club.h index ebdc82b46d..60d56460d9 100644 --- a/include/cable_club.h +++ b/include/cable_club.h @@ -15,5 +15,6 @@ void sub_80B360C(void); bool32 sub_80B2AF4(u16 *arg0, u16 *arg1); void sub_80B3AF8(u8 taskId); void task00_08081A90(u8 taskId); +bool32 sub_80B39D4(u8 linkPlayerIndex); #endif //GUARD_CABLE_CLUB_H diff --git a/include/field_camera.h b/include/field_camera.h index fdc4c54506..fecea244e4 100644 --- a/include/field_camera.h +++ b/include/field_camera.h @@ -32,5 +32,6 @@ void SetCameraPanningCallback(void (*a)(void)); void SetCameraPanning(s16 a, s16 b); void InstallCameraPanAheadCallback(void); void UpdateCameraPanning(void); +void FieldUpdateBgTilemapScroll(void); #endif //GUARD_FIELD_CAMERA_H diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index 3cc4a8324b..738cceb3e6 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -37,5 +37,7 @@ u8 sub_8068F18(void); bool8 dive_warp(struct MapPosition *position, u16 b); int SetCableClubWarp(void); u8 TrySetDiveWarp(void); +const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction); +u8 *GetCoordEventScriptAtMapPosition(struct MapPosition *position); #endif // GUARD_FIELDCONTROLAVATAR_H diff --git a/include/field_effect.h b/include/field_effect.h index 7620cedcd0..205dbb68a1 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -13,6 +13,7 @@ extern bool8 (*gFieldCallback2)(void); u32 FieldEffectStart(u8); bool8 FieldEffectActiveListContains(u8 id); +void FieldEffectActiveListClear(void); void sub_80B69DC(void); u8 AddNewGameBirchObject(s16, s16, u8); void FieldEffectStop(struct Sprite *sprite, u8 id); diff --git a/include/field_message_box.h b/include/field_message_box.h index 9515a54fdd..58f782d9cf 100644 --- a/include/field_message_box.h +++ b/include/field_message_box.h @@ -17,5 +17,6 @@ void HideFieldMessageBox(void); bool8 IsFieldMessageBoxHidden(void); u8 GetFieldMessageBoxMode(void); void sub_8098374(void); +void InitFieldMessageBox(void); #endif // GUARD_FIELD_MESSAGE_BOX_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 3aedec5de7..45cd0dbd92 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -60,5 +60,8 @@ bool8 IsPlayerFacingSurfableFishableWater(void); bool8 IsPlayerSurfingNorth(void); void sub_808C228(u8 direction); u8 sub_808BCD0(void); +void sub_808B578(void); +u8 GetFRLGAvatarGraphicsIdByGender(u8); +u8 GetRSAvatarGraphicsIdByGender(u8); #endif // GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index 7f12bcd369..2b8b3a5a3a 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -40,5 +40,6 @@ void sub_80B0268(void); void sub_80B0534(void); void sub_80B058C(void); void sub_80B05B4(void); +void WriteFlashScanlineEffectBuffer(u8 flashLevel); #endif // GUARD_FIELD_SCREEN_EFFECT_H diff --git a/include/field_specials.h b/include/field_specials.h index 10433299ba..981d65c0ab 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -23,5 +23,7 @@ bool8 sub_813B9C0(void); void SetShoalItemFlag(u16 v0); void UpdateFrontierManiac(u16 a0); void UpdateFrontierGambler(u16 a0); +void ResetCyclingRoadChallengeData(void); +bool8 warp0_in_pokecenter(void); #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/field_weather.h b/include/field_weather.h index 91dcef1dc4..2d73f2b949 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -233,5 +233,6 @@ void SetSav1WeatherFromCurrMapHeader(void); void SetWeather(u32 weather); void DoCurrentWeather(void); void UpdateWeatherPerDay(u16 increment); +void sub_80AEE84(void); #endif // GUARD_WEATHER_H diff --git a/include/fieldmap.h b/include/fieldmap.h index 3c7b7536de..24bc4989af 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -33,6 +33,12 @@ void InitMap(void); void InitMapFromSavedGame(void); void InitTrainerHillMap(void); void InitBattlePyramidMap(bool8 setPlayerPosition); +void copy_map_tileset1_tileset2_to_vram(struct MapLayout const *mapLayout); +void apply_map_tileset1_tileset2_palette(struct MapLayout const *mapLayout); +void apply_map_tileset2_palette(struct MapLayout const *mapLayout); +void copy_map_tileset2_to_vram_2(struct MapLayout const *mapLayout); +extern void copy_map_tileset1_to_vram(const struct MapLayout *); +extern void copy_map_tileset2_to_vram(const struct MapLayout *); void SpriteCB_PokeballGlow(struct Sprite *); void SpriteCB_PokecenterMonitor(struct Sprite *); diff --git a/include/link.h b/include/link.h index 9552f062cc..52a6315702 100644 --- a/include/link.h +++ b/include/link.h @@ -312,5 +312,7 @@ void sub_800AB18(void); void sub_8009F18(void); bool8 sub_800AA60(void); void sub_800ABF4(u16 a0); +bool32 sub_8009F3C(void); +u32 sub_800B4DC(void); #endif // GUARD_LINK_H diff --git a/include/link_rfu.h b/include/link_rfu.h index 08cab616cc..d468d6c498 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -282,5 +282,6 @@ void sub_800EF7C(void); bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx); s32 sub_800E87C(u8 idx); void sub_8011BA4(void); +void sub_8010198(void); #endif //GUARD_LINK_RFU_H diff --git a/include/match_call.h b/include/match_call.h index 1f431bfaf1..17d40d41cf 100644 --- a/include/match_call.h +++ b/include/match_call.h @@ -11,5 +11,6 @@ enum { }; s32 GetRematchIdxByTrainerIdx(s32 trainerIdx); +void InitMatchCallCounters(void); #endif //GUARD_MATCH_CALL_H diff --git a/include/secret_base.h b/include/secret_base.h index 4b44d46786..57ad81fee3 100644 --- a/include/secret_base.h +++ b/include/secret_base.h @@ -22,6 +22,8 @@ void sub_80EB56C(void); void sub_80EB9E0(void); void sub_80EBB28(void); void WarpIntoSecretBase(const struct MapPosition *position, const struct MapEvents *events); +bool8 sub_80E909C(void); +void sub_80EB218(void); // SetCurrentSecretBaseFromPosition void sub_80E9608(const struct MapPosition *position, const struct MapEvents *events); diff --git a/include/tileset_anims.h b/include/tileset_anims.h new file mode 100755 index 0000000000..17d883cd2e --- /dev/null +++ b/include/tileset_anims.h @@ -0,0 +1,9 @@ +#ifndef GUARD_TILESET_ANIMS_H +#define GUARD_TILESET_ANIMS_H + +void cur_mapheader_run_tileset_funcs_after_some_cpuset(void); +void sub_80A0A2C(void); +void sub_80A0A38(void); +void TransferTilesetAnimsBuffer(void); + +#endif // GUARD_TILESET_ANIMS_H diff --git a/src/field_specials.c b/src/field_specials.c index f2ebf2b8e2..3c26085dde 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1956,7 +1956,7 @@ void sub_8139D98(void) } } -bool32 warp0_in_pokecenter(void) +bool8 warp0_in_pokecenter(void) { static const u16 gUnknown_085B2C2A[] = { 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a, 0x1a35, 0x193c, 0xFFFF }; diff --git a/src/new_game.c b/src/new_game.c index 1581202458..f68ed3d4fb 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -8,6 +8,7 @@ #include "lottery_corner.h" #include "play_time.h" #include "mauville_old_man.h" +#include "match_call.h" #include "lilycove_lady.h" #include "load_save.h" #include "pokeblock.h" @@ -47,7 +48,6 @@ extern void NewGameInitPCItems(void); extern void ClearDecorationInventories(void); extern void ResetFanClub(void); extern void copy_strings_to_sav1(void); -extern void InitMatchCallCounters(void); extern void sub_801AFD8(void); extern void sub_800E5AC(void); extern void ResetContestLinkResults(void); diff --git a/src/overworld.c b/src/overworld.c index 2bc4f96d56..43610fe094 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -19,6 +19,7 @@ #include "field_tasks.h" #include "field_weather.h" #include "fieldmap.h" +#include "fldeff.h" #include "gpu_regs.h" #include "heal_location.h" #include "link.h" @@ -28,6 +29,7 @@ #include "alloc.h" #include "m4a.h" #include "map_name_popup.h" +#include "match_call.h" #include "menu.h" #include "metatile_behavior.h" #include "mirage_tower.h" @@ -42,14 +44,15 @@ #include "save.h" #include "save_location.h" #include "script.h" -// #include "script_pokemon_80C4.h" +#include "script_pokemon_util_80F87D8.h" #include "secret_base.h" #include "sound.h" #include "start_menu.h" #include "task.h" -// #include "tileset_anim.h" +#include "tileset_anims.h" #include "time_events.h" #include "trainer_hill.h" +#include "trainer_pokemon_sprites.h" #include "tv.h" #include "scanline_effect.h" #include "wild_encounter.h" @@ -85,71 +88,11 @@ extern const u8 gUnknown_082773F5[]; extern const u8 gUnknown_082774EF[]; extern const u8 gUnknown_08277509[]; -// vars extern const struct MapLayout *const gMapLayouts[]; extern const struct MapHeader *const *const gMapGroups[]; -extern const s32 gMaxFlashLevel; +extern const int gMaxFlashLevel; extern const u16 gUnknown_82EC7C4[]; -// functions -extern void HealPlayerParty(void); -extern void move_tilemap_camera_to_upper_left_corner(void); -extern void cur_mapheader_run_tileset_funcs_after_some_cpuset(void); -extern void DrawWholeMapView(void); -extern void copy_map_tileset1_tileset2_to_vram(const struct MapLayout *); -extern void apply_map_tileset1_tileset2_palette(const struct MapLayout *); -extern void ResetCyclingRoadChallengeData(void); -extern void ApplyNewEncryptionKeyToWord(u32 *word, u32 newKey); -extern void mapheader_run_script_with_tag_x5(void); -extern void ResetFieldTasksArgs(void); -extern void sub_80A0A2C(void); -extern void apply_map_tileset2_palette(const struct MapLayout *); -extern void copy_map_tileset2_to_vram_2(const struct MapLayout *); -extern void RestartWildEncounterImmunitySteps(void); -extern void ShowMapNamePopup(void); -extern bool32 sub_808651C(void); -extern bool8 sub_80AF6A4(void); -extern bool8 sub_80E909C(void); -extern void c2_change_map(void); -extern void sub_81D5DF8(void); -extern void sub_80EB218(void); -extern void sub_80AF3C8(void); -extern void sub_808B578(void); -extern void sub_80AF314(void); -extern void sub_80AF214(void); -extern void sub_80AF188(void); -extern void RotatingGate_InitPuzzleAndGraphics(void); -extern void sub_80AF168(void); -extern void sub_80AF3C8(void); -extern void ExecuteTruckSequence(void); -extern void sub_80A0A38(void); -extern void WriteFlashScanlineEffectBuffer(u8); -extern void InitMatchCallCounters(void); -extern void sub_80EDB44(void); -extern void InitFieldMessageBox(void); -extern void copy_map_tileset1_to_vram(const struct MapLayout *); -extern void copy_map_tileset2_to_vram(const struct MapLayout *); -extern void FieldUpdateBgTilemapScroll(void); -extern void TransferTilesetAnimsBuffer(void); -extern bool8 warp0_in_pokecenter(void); -extern void ResetAllPicSprites(void); -extern void FieldEffectActiveListClear(void); -extern void SetUpFieldTasks(void); -extern void ShowStartMenu(void); -extern void sub_80AEE84(void); -extern void mapldr_default(void); -extern bool32 sub_800F0B8(void); -extern bool32 sub_8009F3C(void); -extern void sub_8010198(void); -extern u32 sub_800B4DC(void); -extern bool32 sub_80B39D4(u8); -extern const u8* GetInteractedLinkPlayerScript(struct MapPosition *a1, u8, u8); -extern u8 *GetCoordEventScriptAtMapPosition(void*); -extern u8 GetFRLGAvatarGraphicsIdByGender(u8); -extern u8 GetRSAvatarGraphicsIdByGender(u8); -extern void UpdateEventObjectSpriteVisibility(struct Sprite*, u8); - -// this file's functions static void Overworld_ResetStateAfterWhiteOut(void); static void c2_80567AC(void); static void CB2_LoadMap2(void); From 40dc6833c579f13a0ad939e3ac9ebd83d7dd752e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 8 Feb 2019 15:07:42 -0600 Subject: [PATCH 028/217] Fully document tileset animations --- data/tilesets/headers.inc | 50 +- .../building/anim/{ => tv_turned_on}/0.png | Bin .../building/anim/{ => tv_turned_on}/1.png | Bin .../primary/general/anim/{0 => flower}/0.png | Bin .../primary/general/anim/{0 => flower}/1.png | Bin .../primary/general/anim/{0 => flower}/2.png | Bin .../general/anim/{4 => land_water_edge}/0.png | Bin .../general/anim/{4 => land_water_edge}/1.png | Bin .../general/anim/{4 => land_water_edge}/2.png | Bin .../general/anim/{4 => land_water_edge}/3.png | Bin .../general/anim/{2 => sand_water_edge}/0.png | Bin .../general/anim/{2 => sand_water_edge}/1.png | Bin .../general/anim/{2 => sand_water_edge}/2.png | Bin .../general/anim/{2 => sand_water_edge}/3.png | Bin .../general/anim/{2 => sand_water_edge}/4.png | Bin .../general/anim/{2 => sand_water_edge}/5.png | Bin .../general/anim/{2 => sand_water_edge}/6.png | Bin .../primary/general/anim/{1 => water}/0.png | Bin .../primary/general/anim/{1 => water}/1.png | Bin .../primary/general/anim/{1 => water}/2.png | Bin .../primary/general/anim/{1 => water}/3.png | Bin .../primary/general/anim/{1 => water}/4.png | Bin .../primary/general/anim/{1 => water}/5.png | Bin .../primary/general/anim/{1 => water}/6.png | Bin .../primary/general/anim/{1 => water}/7.png | Bin .../general/anim/{3 => waterfall}/0.png | Bin .../general/anim/{3 => waterfall}/1.png | Bin .../general/anim/{3 => waterfall}/2.png | Bin .../general/anim/{3 => waterfall}/3.png | Bin .../anim/{ => flag}/0.png | Bin .../anim/{ => flag}/1.png | Bin .../anim/{ => flag}/2.png | Bin .../anim/{ => flag}/3.png | Bin .../anim/{ => flag}/0.png | Bin .../anim/{ => flag}/1.png | Bin .../anim/{ => flag}/2.png | Bin .../anim/{ => flag}/3.png | Bin .../anim/{1 => statue_shadow}/0.png | Bin .../anim/{1 => statue_shadow}/1.png | Bin .../anim/{1 => statue_shadow}/2.png | Bin .../battle_pyramid/anim/{0 => torch}/0.png | Bin .../battle_pyramid/anim/{0 => torch}/1.png | Bin .../battle_pyramid/anim/{0 => torch}/2.png | Bin .../anim/{ => blinking_lights}/0.png | Bin .../anim/{ => blinking_lights}/1.png | Bin .../secondary/cave/anim/{ => lava}/0.png | Bin .../secondary/cave/anim/{ => lava}/1.png | Bin .../secondary/cave/anim/{ => lava}/2.png | Bin .../secondary/cave/anim/{ => lava}/3.png | Bin .../cave/anim/{unused/0.png => lava/4.png} | Bin .../cave/anim/{unused/1.png => lava/5.png} | Bin .../cave/anim/{unused/2.png => lava/6.png} | Bin .../cave/anim/{unused/3.png => lava/7.png} | Bin .../secondary/dewford/anim/{ => flag}/0.png | Bin .../secondary/dewford/anim/{ => flag}/1.png | Bin .../secondary/dewford/anim/{ => flag}/2.png | Bin .../secondary/dewford/anim/{ => flag}/3.png | Bin .../elite_four/anim/{1 => floor_light}/0.png | Bin .../elite_four/anim/{1 => floor_light}/1.png | Bin .../elite_four/anim/{0 => wall_lights}/0.png | Bin .../elite_four/anim/{0 => wall_lights}/1.png | Bin .../elite_four/anim/{0 => wall_lights}/2.png | Bin .../elite_four/anim/{0 => wall_lights}/3.png | Bin .../ever_grande/anim/{ => flowers}/0.png | Bin .../ever_grande/anim/{ => flowers}/1.png | Bin .../ever_grande/anim/{ => flowers}/2.png | Bin .../ever_grande/anim/{ => flowers}/3.png | Bin .../ever_grande/anim/{ => flowers}/4.png | Bin .../ever_grande/anim/{ => flowers}/5.png | Bin .../ever_grande/anim/{ => flowers}/6.png | Bin .../ever_grande/anim/{ => flowers}/7.png | Bin .../lavaridge/anim/{ => steam}/0.png | Bin .../lavaridge/anim/{ => steam}/1.png | Bin .../lavaridge/anim/{ => steam}/2.png | Bin .../lavaridge/anim/{ => steam}/3.png | Bin .../mauville/anim/{0/a => flower_1}/0.png | Bin .../mauville/anim/{0/a => flower_1}/1.png | Bin .../mauville/anim/{0/a => flower_1}/2.png | Bin .../mauville/anim/{0/a => flower_1}/3.png | Bin .../anim/{1/a/1.png => flower_1/4.png} | Bin .../mauville/anim/{0/b => flower_2}/0.png | Bin .../mauville/anim/{0/b => flower_2}/1.png | Bin .../mauville/anim/{0/b => flower_2}/2.png | Bin .../mauville/anim/{0/b => flower_2}/3.png | Bin .../anim/{1/b/1.png => flower_2/4.png} | Bin .../anim/{ => electric_gates}/0.png | Bin .../anim/{ => electric_gates}/1.png | Bin .../pacifidlog/anim/{0 => log_bridges}/0.png | Bin .../pacifidlog/anim/{0 => log_bridges}/1.png | Bin .../pacifidlog/anim/{0 => log_bridges}/2.png | Bin .../anim/{1 => water_currents}/0.png | Bin .../anim/{1 => water_currents}/1.png | Bin .../anim/{1 => water_currents}/2.png | Bin .../anim/{1 => water_currents}/3.png | Bin .../anim/{1 => water_currents}/4.png | Bin .../anim/{1 => water_currents}/5.png | Bin .../anim/{1 => water_currents}/6.png | Bin .../anim/{1 => water_currents}/7.png | Bin .../rustboro/anim/{1 => fountain}/0.png | Bin .../rustboro/anim/{1 => fountain}/1.png | Bin .../rustboro/anim/{0 => windy_water}/0.png | Bin .../rustboro/anim/{0 => windy_water}/1.png | Bin .../rustboro/anim/{0 => windy_water}/2.png | Bin .../rustboro/anim/{0 => windy_water}/3.png | Bin .../rustboro/anim/{0 => windy_water}/4.png | Bin .../rustboro/anim/{0 => windy_water}/5.png | Bin .../rustboro/anim/{0 => windy_water}/6.png | Bin .../rustboro/anim/{0 => windy_water}/7.png | Bin .../slateport/anim/{ => balloons}/0.png | Bin .../slateport/anim/{ => balloons}/1.png | Bin .../slateport/anim/{ => balloons}/2.png | Bin .../slateport/anim/{ => balloons}/3.png | Bin .../sootopolis/anim/{ => stormy_water}/0.png | Bin .../sootopolis/anim/{ => stormy_water}/1.png | Bin .../sootopolis/anim/{ => stormy_water}/2.png | Bin .../sootopolis/anim/{ => stormy_water}/3.png | Bin .../sootopolis/anim/{ => stormy_water}/4.png | Bin .../sootopolis/anim/{ => stormy_water}/5.png | Bin .../sootopolis/anim/{ => stormy_water}/6.png | Bin .../sootopolis/anim/{ => stormy_water}/7.png | Bin .../anim/{1 => front_waterfall}/0.png | Bin .../anim/{1 => front_waterfall}/1.png | Bin .../anim/{1 => front_waterfall}/2.png | Bin .../anim/{0 => side_waterfall}/0.png | Bin .../anim/{0 => side_waterfall}/1.png | Bin .../anim/{0 => side_waterfall}/2.png | Bin .../underwater/anim/{ => seaweed}/0.png | Bin .../underwater/anim/{ => seaweed}/1.png | Bin .../underwater/anim/{ => seaweed}/2.png | Bin .../underwater/anim/{ => seaweed}/3.png | Bin include/graphics.h | 4 + include/tileset_anims.h | 6 +- src/battle_dome.c | 2 +- src/overworld.c | 12 +- src/tileset_anims.c | 1662 +++++++---------- 135 files changed, 758 insertions(+), 978 deletions(-) rename data/tilesets/primary/building/anim/{ => tv_turned_on}/0.png (100%) rename data/tilesets/primary/building/anim/{ => tv_turned_on}/1.png (100%) rename data/tilesets/primary/general/anim/{0 => flower}/0.png (100%) rename data/tilesets/primary/general/anim/{0 => flower}/1.png (100%) rename data/tilesets/primary/general/anim/{0 => flower}/2.png (100%) rename data/tilesets/primary/general/anim/{4 => land_water_edge}/0.png (100%) rename data/tilesets/primary/general/anim/{4 => land_water_edge}/1.png (100%) rename data/tilesets/primary/general/anim/{4 => land_water_edge}/2.png (100%) rename data/tilesets/primary/general/anim/{4 => land_water_edge}/3.png (100%) rename data/tilesets/primary/general/anim/{2 => sand_water_edge}/0.png (100%) rename data/tilesets/primary/general/anim/{2 => sand_water_edge}/1.png (100%) rename data/tilesets/primary/general/anim/{2 => sand_water_edge}/2.png (100%) rename data/tilesets/primary/general/anim/{2 => sand_water_edge}/3.png (100%) rename data/tilesets/primary/general/anim/{2 => sand_water_edge}/4.png (100%) rename data/tilesets/primary/general/anim/{2 => sand_water_edge}/5.png (100%) rename data/tilesets/primary/general/anim/{2 => sand_water_edge}/6.png (100%) rename data/tilesets/primary/general/anim/{1 => water}/0.png (100%) rename data/tilesets/primary/general/anim/{1 => water}/1.png (100%) rename data/tilesets/primary/general/anim/{1 => water}/2.png (100%) rename data/tilesets/primary/general/anim/{1 => water}/3.png (100%) rename data/tilesets/primary/general/anim/{1 => water}/4.png (100%) rename data/tilesets/primary/general/anim/{1 => water}/5.png (100%) rename data/tilesets/primary/general/anim/{1 => water}/6.png (100%) rename data/tilesets/primary/general/anim/{1 => water}/7.png (100%) rename data/tilesets/primary/general/anim/{3 => waterfall}/0.png (100%) rename data/tilesets/primary/general/anim/{3 => waterfall}/1.png (100%) rename data/tilesets/primary/general/anim/{3 => waterfall}/2.png (100%) rename data/tilesets/primary/general/anim/{3 => waterfall}/3.png (100%) rename data/tilesets/secondary/battle_frontier_outside_east/anim/{ => flag}/0.png (100%) rename data/tilesets/secondary/battle_frontier_outside_east/anim/{ => flag}/1.png (100%) rename data/tilesets/secondary/battle_frontier_outside_east/anim/{ => flag}/2.png (100%) rename data/tilesets/secondary/battle_frontier_outside_east/anim/{ => flag}/3.png (100%) rename data/tilesets/secondary/battle_frontier_outside_west/anim/{ => flag}/0.png (100%) rename data/tilesets/secondary/battle_frontier_outside_west/anim/{ => flag}/1.png (100%) rename data/tilesets/secondary/battle_frontier_outside_west/anim/{ => flag}/2.png (100%) rename data/tilesets/secondary/battle_frontier_outside_west/anim/{ => flag}/3.png (100%) rename data/tilesets/secondary/battle_pyramid/anim/{1 => statue_shadow}/0.png (100%) rename data/tilesets/secondary/battle_pyramid/anim/{1 => statue_shadow}/1.png (100%) rename data/tilesets/secondary/battle_pyramid/anim/{1 => statue_shadow}/2.png (100%) rename data/tilesets/secondary/battle_pyramid/anim/{0 => torch}/0.png (100%) rename data/tilesets/secondary/battle_pyramid/anim/{0 => torch}/1.png (100%) rename data/tilesets/secondary/battle_pyramid/anim/{0 => torch}/2.png (100%) rename data/tilesets/secondary/bike_shop/anim/{ => blinking_lights}/0.png (100%) rename data/tilesets/secondary/bike_shop/anim/{ => blinking_lights}/1.png (100%) rename data/tilesets/secondary/cave/anim/{ => lava}/0.png (100%) rename data/tilesets/secondary/cave/anim/{ => lava}/1.png (100%) rename data/tilesets/secondary/cave/anim/{ => lava}/2.png (100%) rename data/tilesets/secondary/cave/anim/{ => lava}/3.png (100%) rename data/tilesets/secondary/cave/anim/{unused/0.png => lava/4.png} (100%) rename data/tilesets/secondary/cave/anim/{unused/1.png => lava/5.png} (100%) rename data/tilesets/secondary/cave/anim/{unused/2.png => lava/6.png} (100%) rename data/tilesets/secondary/cave/anim/{unused/3.png => lava/7.png} (100%) rename data/tilesets/secondary/dewford/anim/{ => flag}/0.png (100%) rename data/tilesets/secondary/dewford/anim/{ => flag}/1.png (100%) rename data/tilesets/secondary/dewford/anim/{ => flag}/2.png (100%) rename data/tilesets/secondary/dewford/anim/{ => flag}/3.png (100%) rename data/tilesets/secondary/elite_four/anim/{1 => floor_light}/0.png (100%) rename data/tilesets/secondary/elite_four/anim/{1 => floor_light}/1.png (100%) rename data/tilesets/secondary/elite_four/anim/{0 => wall_lights}/0.png (100%) rename data/tilesets/secondary/elite_four/anim/{0 => wall_lights}/1.png (100%) rename data/tilesets/secondary/elite_four/anim/{0 => wall_lights}/2.png (100%) rename data/tilesets/secondary/elite_four/anim/{0 => wall_lights}/3.png (100%) rename data/tilesets/secondary/ever_grande/anim/{ => flowers}/0.png (100%) rename data/tilesets/secondary/ever_grande/anim/{ => flowers}/1.png (100%) rename data/tilesets/secondary/ever_grande/anim/{ => flowers}/2.png (100%) rename data/tilesets/secondary/ever_grande/anim/{ => flowers}/3.png (100%) rename data/tilesets/secondary/ever_grande/anim/{ => flowers}/4.png (100%) rename data/tilesets/secondary/ever_grande/anim/{ => flowers}/5.png (100%) rename data/tilesets/secondary/ever_grande/anim/{ => flowers}/6.png (100%) rename data/tilesets/secondary/ever_grande/anim/{ => flowers}/7.png (100%) rename data/tilesets/secondary/lavaridge/anim/{ => steam}/0.png (100%) rename data/tilesets/secondary/lavaridge/anim/{ => steam}/1.png (100%) rename data/tilesets/secondary/lavaridge/anim/{ => steam}/2.png (100%) rename data/tilesets/secondary/lavaridge/anim/{ => steam}/3.png (100%) rename data/tilesets/secondary/mauville/anim/{0/a => flower_1}/0.png (100%) rename data/tilesets/secondary/mauville/anim/{0/a => flower_1}/1.png (100%) rename data/tilesets/secondary/mauville/anim/{0/a => flower_1}/2.png (100%) rename data/tilesets/secondary/mauville/anim/{0/a => flower_1}/3.png (100%) rename data/tilesets/secondary/mauville/anim/{1/a/1.png => flower_1/4.png} (100%) rename data/tilesets/secondary/mauville/anim/{0/b => flower_2}/0.png (100%) rename data/tilesets/secondary/mauville/anim/{0/b => flower_2}/1.png (100%) rename data/tilesets/secondary/mauville/anim/{0/b => flower_2}/2.png (100%) rename data/tilesets/secondary/mauville/anim/{0/b => flower_2}/3.png (100%) rename data/tilesets/secondary/mauville/anim/{1/b/1.png => flower_2/4.png} (100%) rename data/tilesets/secondary/mauville_gym/anim/{ => electric_gates}/0.png (100%) rename data/tilesets/secondary/mauville_gym/anim/{ => electric_gates}/1.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{0 => log_bridges}/0.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{0 => log_bridges}/1.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{0 => log_bridges}/2.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{1 => water_currents}/0.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{1 => water_currents}/1.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{1 => water_currents}/2.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{1 => water_currents}/3.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{1 => water_currents}/4.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{1 => water_currents}/5.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{1 => water_currents}/6.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{1 => water_currents}/7.png (100%) rename data/tilesets/secondary/rustboro/anim/{1 => fountain}/0.png (100%) rename data/tilesets/secondary/rustboro/anim/{1 => fountain}/1.png (100%) rename data/tilesets/secondary/rustboro/anim/{0 => windy_water}/0.png (100%) rename data/tilesets/secondary/rustboro/anim/{0 => windy_water}/1.png (100%) rename data/tilesets/secondary/rustboro/anim/{0 => windy_water}/2.png (100%) rename data/tilesets/secondary/rustboro/anim/{0 => windy_water}/3.png (100%) rename data/tilesets/secondary/rustboro/anim/{0 => windy_water}/4.png (100%) rename data/tilesets/secondary/rustboro/anim/{0 => windy_water}/5.png (100%) rename data/tilesets/secondary/rustboro/anim/{0 => windy_water}/6.png (100%) rename data/tilesets/secondary/rustboro/anim/{0 => windy_water}/7.png (100%) rename data/tilesets/secondary/slateport/anim/{ => balloons}/0.png (100%) rename data/tilesets/secondary/slateport/anim/{ => balloons}/1.png (100%) rename data/tilesets/secondary/slateport/anim/{ => balloons}/2.png (100%) rename data/tilesets/secondary/slateport/anim/{ => balloons}/3.png (100%) rename data/tilesets/secondary/sootopolis/anim/{ => stormy_water}/0.png (100%) rename data/tilesets/secondary/sootopolis/anim/{ => stormy_water}/1.png (100%) rename data/tilesets/secondary/sootopolis/anim/{ => stormy_water}/2.png (100%) rename data/tilesets/secondary/sootopolis/anim/{ => stormy_water}/3.png (100%) rename data/tilesets/secondary/sootopolis/anim/{ => stormy_water}/4.png (100%) rename data/tilesets/secondary/sootopolis/anim/{ => stormy_water}/5.png (100%) rename data/tilesets/secondary/sootopolis/anim/{ => stormy_water}/6.png (100%) rename data/tilesets/secondary/sootopolis/anim/{ => stormy_water}/7.png (100%) rename data/tilesets/secondary/sootopolis_gym/anim/{1 => front_waterfall}/0.png (100%) rename data/tilesets/secondary/sootopolis_gym/anim/{1 => front_waterfall}/1.png (100%) rename data/tilesets/secondary/sootopolis_gym/anim/{1 => front_waterfall}/2.png (100%) rename data/tilesets/secondary/sootopolis_gym/anim/{0 => side_waterfall}/0.png (100%) rename data/tilesets/secondary/sootopolis_gym/anim/{0 => side_waterfall}/1.png (100%) rename data/tilesets/secondary/sootopolis_gym/anim/{0 => side_waterfall}/2.png (100%) rename data/tilesets/secondary/underwater/anim/{ => seaweed}/0.png (100%) rename data/tilesets/secondary/underwater/anim/{ => seaweed}/1.png (100%) rename data/tilesets/secondary/underwater/anim/{ => seaweed}/2.png (100%) rename data/tilesets/secondary/underwater/anim/{ => seaweed}/3.png (100%) diff --git a/data/tilesets/headers.inc b/data/tilesets/headers.inc index 2083e17df7..c56234b13b 100644 --- a/data/tilesets/headers.inc +++ b/data/tilesets/headers.inc @@ -7,7 +7,7 @@ gTileset_General:: @ 83DF704 .4byte gTilesetPalettes_General .4byte gMetatiles_General .4byte gMetatileAttributes_General - .4byte TilesetCb_General + .4byte InitTilesetAnim_General .align 2 gTileset_Petalburg:: @ 83DF71C @@ -18,7 +18,7 @@ gTileset_Petalburg:: @ 83DF71C .4byte gTilesetPalettes_Petalburg .4byte gMetatiles_Petalburg .4byte gMetatileAttributes_Petalburg - .4byte TilesetCb_Petalburg + .4byte InitTilesetAnim_Petalburg .align 2 gTileset_Rustboro:: @ 83DF734 @@ -29,7 +29,7 @@ gTileset_Rustboro:: @ 83DF734 .4byte gTilesetPalettes_Rustboro .4byte gMetatiles_Rustboro .4byte gMetatileAttributes_Rustboro - .4byte TilesetCb_Rustboro + .4byte InitTilesetAnim_Rustboro .align 2 gTileset_Dewford:: @ 83DF74C @@ -40,7 +40,7 @@ gTileset_Dewford:: @ 83DF74C .4byte gTilesetPalettes_Dewford .4byte gMetatiles_Dewford .4byte gMetatileAttributes_Dewford - .4byte TilesetCb_Dewford + .4byte InitTilesetAnim_Dewford .align 2 gTileset_Slateport:: @ 83DF764 @@ -51,7 +51,7 @@ gTileset_Slateport:: @ 83DF764 .4byte gTilesetPalettes_Slateport .4byte gMetatiles_Slateport .4byte gMetatileAttributes_Slateport - .4byte TilesetCb_Slateport + .4byte InitTilesetAnim_Slateport .align 2 gTileset_Mauville:: @ 83DF77C @@ -62,7 +62,7 @@ gTileset_Mauville:: @ 83DF77C .4byte gTilesetPalettes_Mauville .4byte gMetatiles_Mauville .4byte gMetatileAttributes_Mauville - .4byte TilesetCb_Mauville + .4byte InitTilesetAnim_Mauville .align 2 gTileset_Lavaridge:: @ 83DF794 @@ -73,7 +73,7 @@ gTileset_Lavaridge:: @ 83DF794 .4byte gTilesetPalettes_Lavaridge .4byte gMetatiles_Lavaridge .4byte gMetatileAttributes_Lavaridge - .4byte TilesetCb_Lavaridge + .4byte InitTilesetAnim_Lavaridge .align 2 gTileset_Fallarbor:: @ 83DF7AC @@ -84,7 +84,7 @@ gTileset_Fallarbor:: @ 83DF7AC .4byte gTilesetPalettes_Fallarbor .4byte gMetatiles_Fallarbor .4byte gMetatileAttributes_Fallarbor - .4byte TilesetCb_Fallarbor + .4byte InitTilesetAnim_Fallarbor .align 2 gTileset_Fortree:: @ 83DF7C4 @@ -95,7 +95,7 @@ gTileset_Fortree:: @ 83DF7C4 .4byte gTilesetPalettes_Fortree .4byte gMetatiles_Fortree .4byte gMetatileAttributes_Fortree - .4byte TilesetCb_Fortree + .4byte InitTilesetAnim_Fortree .align 2 gTileset_Lilycove:: @ 83DF7DC @@ -106,7 +106,7 @@ gTileset_Lilycove:: @ 83DF7DC .4byte gTilesetPalettes_Lilycove .4byte gMetatiles_Lilycove .4byte gMetatileAttributes_Lilycove - .4byte TilesetCb_Lilycove + .4byte InitTilesetAnim_Lilycove .align 2 gTileset_Mossdeep:: @ 83DF7F4 @@ -117,7 +117,7 @@ gTileset_Mossdeep:: @ 83DF7F4 .4byte gTilesetPalettes_Mossdeep .4byte gMetatiles_Mossdeep .4byte gMetatileAttributes_Mossdeep - .4byte TilesetCb_Mossdeep + .4byte InitTilesetAnim_Mossdeep .align 2 gTileset_EverGrande:: @ 83DF80C @@ -128,7 +128,7 @@ gTileset_EverGrande:: @ 83DF80C .4byte gTilesetPalettes_EverGrande .4byte gMetatiles_EverGrande .4byte gMetatileAttributes_EverGrande - .4byte TilesetCb_EverGrande + .4byte InitTilesetAnim_EverGrande .align 2 gTileset_Pacifidlog:: @ 83DF824 @@ -139,7 +139,7 @@ gTileset_Pacifidlog:: @ 83DF824 .4byte gTilesetPalettes_Pacifidlog .4byte gMetatiles_Pacifidlog .4byte gMetatileAttributes_Pacifidlog - .4byte TilesetCb_Pacifidlog + .4byte InitTilesetAnim_Pacifidlog .align 2 gTileset_Sootopolis:: @ 83DF83C @@ -150,7 +150,7 @@ gTileset_Sootopolis:: @ 83DF83C .4byte gTilesetPalettes_Sootopolis .4byte gMetatiles_Sootopolis .4byte gMetatileAttributes_Sootopolis - .4byte TilesetCb_Sootopolis + .4byte InitTilesetAnim_Sootopolis .align 2 gTileset_BattleFrontierOutsideWest:: @ 83DF854 @@ -161,7 +161,7 @@ gTileset_BattleFrontierOutsideWest:: @ 83DF854 .4byte gTilesetPalettes_BattleFrontierOutsideWest .4byte gMetatiles_BattleFrontierOutsideWest .4byte gMetatileAttributes_BattleFrontierOutsideWest - .4byte TilesetCb_BattleFrontierOutsideWest + .4byte InitTilesetAnim_BattleFrontierOutsideWest .align 2 gTileset_BattleFrontierOutsideEast:: @ 83DF86C @@ -172,7 +172,7 @@ gTileset_BattleFrontierOutsideEast:: @ 83DF86C .4byte gTilesetPalettes_BattleFrontierOutsideEast .4byte gMetatiles_BattleFrontierOutsideEast .4byte gMetatileAttributes_BattleFrontierOutsideEast - .4byte TilesetCb_BattleFrontierOutsideEast + .4byte InitTilesetAnim_BattleFrontierOutsideEast .align 2 gTileset_Building:: @ 83DF884 @@ -183,7 +183,7 @@ gTileset_Building:: @ 83DF884 .4byte gTilesetPalettes_InsideBuilding .4byte gMetatiles_InsideBuilding .4byte gMetatileAttributes_InsideBuilding - .4byte TilesetCb_InsideBuilding + .4byte InitTilesetAnim_Building .align 2 gTileset_Shop:: @ 83DF89C @@ -216,7 +216,7 @@ gTileset_Cave:: @ 83DF8CC .4byte gTilesetPalettes_Cave .4byte gMetatiles_Cave .4byte gMetatileAttributes_Cave - .4byte TilesetCb_Cave + .4byte InitTilesetAnim_Cave .align 2 gTileset_PokemonSchool:: @ 83DF8E4 @@ -337,7 +337,7 @@ gTileset_BikeShop:: @ 83DF9D4 .4byte gTilesetPalettes_BikeShop .4byte gMetatiles_BikeShop .4byte gMetatileAttributes_BikeShop - .4byte TilesetCb_BikeShop + .4byte InitTilesetAnim_BikeShop .align 2 gTileset_RusturfTunnel:: @ 83DF9EC @@ -491,7 +491,7 @@ gTileset_Underwater:: @ 83DFB24 .4byte gTilesetPalettes_Underwater .4byte gMetatiles_Underwater .4byte gMetatileAttributes_Underwater - .4byte TilesetCb_Underwater + .4byte InitTilesetAnim_Underwater .align 2 gTileset_PetalburgGym:: @ 83DFB3C @@ -513,7 +513,7 @@ gTileset_SootopolisGym:: @ 83DFB54 .4byte gTilesetPalettes_SootopolisGym .4byte gMetatiles_SootopolisGym .4byte gMetatileAttributes_SootopolisGym - .4byte TilesetCb_SootopolisGym + .4byte InitTilesetAnim_SootopolisGym .align 2 gTileset_GenericBuilding:: @ 83DFB6C @@ -568,7 +568,7 @@ gTileset_MauvilleGym:: @ 83DFBCC .4byte gTilesetPalettes_MauvilleGym .4byte gMetatiles_MauvilleGym .4byte gMetatileAttributes_MauvilleGym - .4byte TilesetCb_MauvilleGym + .4byte InitTilesetAnim_MauvilleGym .align 2 gTileset_LavaridgeGym:: @ 83DFBE4 @@ -653,7 +653,7 @@ gTileset_EliteFour:: @ 83DFC7C .4byte gTilesetPalettes_EliteFour .4byte gMetatiles_EliteFour .4byte gMetatileAttributes_EliteFour - .4byte TilesetCb_EliteFour + .4byte InitTilesetAnim_EliteFour .align 2 gTileset_BattleFrontier:: @ 83DFC94 @@ -686,7 +686,7 @@ gTileset_BattleDome:: @ 83DFCC4 .4byte gTilesetPalettes_BattleDome .4byte gMetatiles_BattleDome .4byte gMetatileAttributes_BattleDome - .4byte TilesetCb_BattleDome + .4byte InitTilesetAnim_BattleDome .align 2 gTileset_BattleFactory:: @ 83DFCDC @@ -730,7 +730,7 @@ gTileset_BattlePyramid:: @ 83DFD24 .4byte gTilesetPalettes_BattlePyramid .4byte gMetatiles_BattlePyramid .4byte gMetatileAttributes_BattlePyramid - .4byte TilesetCb_BattlePyramid + .4byte InitTilesetAnim_BattlePyramid .align 2 gTileset_MirageTower:: @ 83DFD3C diff --git a/data/tilesets/primary/building/anim/0.png b/data/tilesets/primary/building/anim/tv_turned_on/0.png similarity index 100% rename from data/tilesets/primary/building/anim/0.png rename to data/tilesets/primary/building/anim/tv_turned_on/0.png diff --git a/data/tilesets/primary/building/anim/1.png b/data/tilesets/primary/building/anim/tv_turned_on/1.png similarity index 100% rename from data/tilesets/primary/building/anim/1.png rename to data/tilesets/primary/building/anim/tv_turned_on/1.png diff --git a/data/tilesets/primary/general/anim/0/0.png b/data/tilesets/primary/general/anim/flower/0.png similarity index 100% rename from data/tilesets/primary/general/anim/0/0.png rename to data/tilesets/primary/general/anim/flower/0.png diff --git a/data/tilesets/primary/general/anim/0/1.png b/data/tilesets/primary/general/anim/flower/1.png similarity index 100% rename from data/tilesets/primary/general/anim/0/1.png rename to data/tilesets/primary/general/anim/flower/1.png diff --git a/data/tilesets/primary/general/anim/0/2.png b/data/tilesets/primary/general/anim/flower/2.png similarity index 100% rename from data/tilesets/primary/general/anim/0/2.png rename to data/tilesets/primary/general/anim/flower/2.png diff --git a/data/tilesets/primary/general/anim/4/0.png b/data/tilesets/primary/general/anim/land_water_edge/0.png similarity index 100% rename from data/tilesets/primary/general/anim/4/0.png rename to data/tilesets/primary/general/anim/land_water_edge/0.png diff --git a/data/tilesets/primary/general/anim/4/1.png b/data/tilesets/primary/general/anim/land_water_edge/1.png similarity index 100% rename from data/tilesets/primary/general/anim/4/1.png rename to data/tilesets/primary/general/anim/land_water_edge/1.png diff --git a/data/tilesets/primary/general/anim/4/2.png b/data/tilesets/primary/general/anim/land_water_edge/2.png similarity index 100% rename from data/tilesets/primary/general/anim/4/2.png rename to data/tilesets/primary/general/anim/land_water_edge/2.png diff --git a/data/tilesets/primary/general/anim/4/3.png b/data/tilesets/primary/general/anim/land_water_edge/3.png similarity index 100% rename from data/tilesets/primary/general/anim/4/3.png rename to data/tilesets/primary/general/anim/land_water_edge/3.png diff --git a/data/tilesets/primary/general/anim/2/0.png b/data/tilesets/primary/general/anim/sand_water_edge/0.png similarity index 100% rename from data/tilesets/primary/general/anim/2/0.png rename to data/tilesets/primary/general/anim/sand_water_edge/0.png diff --git a/data/tilesets/primary/general/anim/2/1.png b/data/tilesets/primary/general/anim/sand_water_edge/1.png similarity index 100% rename from data/tilesets/primary/general/anim/2/1.png rename to data/tilesets/primary/general/anim/sand_water_edge/1.png diff --git a/data/tilesets/primary/general/anim/2/2.png b/data/tilesets/primary/general/anim/sand_water_edge/2.png similarity index 100% rename from data/tilesets/primary/general/anim/2/2.png rename to data/tilesets/primary/general/anim/sand_water_edge/2.png diff --git a/data/tilesets/primary/general/anim/2/3.png b/data/tilesets/primary/general/anim/sand_water_edge/3.png similarity index 100% rename from data/tilesets/primary/general/anim/2/3.png rename to data/tilesets/primary/general/anim/sand_water_edge/3.png diff --git a/data/tilesets/primary/general/anim/2/4.png b/data/tilesets/primary/general/anim/sand_water_edge/4.png similarity index 100% rename from data/tilesets/primary/general/anim/2/4.png rename to data/tilesets/primary/general/anim/sand_water_edge/4.png diff --git a/data/tilesets/primary/general/anim/2/5.png b/data/tilesets/primary/general/anim/sand_water_edge/5.png similarity index 100% rename from data/tilesets/primary/general/anim/2/5.png rename to data/tilesets/primary/general/anim/sand_water_edge/5.png diff --git a/data/tilesets/primary/general/anim/2/6.png b/data/tilesets/primary/general/anim/sand_water_edge/6.png similarity index 100% rename from data/tilesets/primary/general/anim/2/6.png rename to data/tilesets/primary/general/anim/sand_water_edge/6.png diff --git a/data/tilesets/primary/general/anim/1/0.png b/data/tilesets/primary/general/anim/water/0.png similarity index 100% rename from data/tilesets/primary/general/anim/1/0.png rename to data/tilesets/primary/general/anim/water/0.png diff --git a/data/tilesets/primary/general/anim/1/1.png b/data/tilesets/primary/general/anim/water/1.png similarity index 100% rename from data/tilesets/primary/general/anim/1/1.png rename to data/tilesets/primary/general/anim/water/1.png diff --git a/data/tilesets/primary/general/anim/1/2.png b/data/tilesets/primary/general/anim/water/2.png similarity index 100% rename from data/tilesets/primary/general/anim/1/2.png rename to data/tilesets/primary/general/anim/water/2.png diff --git a/data/tilesets/primary/general/anim/1/3.png b/data/tilesets/primary/general/anim/water/3.png similarity index 100% rename from data/tilesets/primary/general/anim/1/3.png rename to data/tilesets/primary/general/anim/water/3.png diff --git a/data/tilesets/primary/general/anim/1/4.png b/data/tilesets/primary/general/anim/water/4.png similarity index 100% rename from data/tilesets/primary/general/anim/1/4.png rename to data/tilesets/primary/general/anim/water/4.png diff --git a/data/tilesets/primary/general/anim/1/5.png b/data/tilesets/primary/general/anim/water/5.png similarity index 100% rename from data/tilesets/primary/general/anim/1/5.png rename to data/tilesets/primary/general/anim/water/5.png diff --git a/data/tilesets/primary/general/anim/1/6.png b/data/tilesets/primary/general/anim/water/6.png similarity index 100% rename from data/tilesets/primary/general/anim/1/6.png rename to data/tilesets/primary/general/anim/water/6.png diff --git a/data/tilesets/primary/general/anim/1/7.png b/data/tilesets/primary/general/anim/water/7.png similarity index 100% rename from data/tilesets/primary/general/anim/1/7.png rename to data/tilesets/primary/general/anim/water/7.png diff --git a/data/tilesets/primary/general/anim/3/0.png b/data/tilesets/primary/general/anim/waterfall/0.png similarity index 100% rename from data/tilesets/primary/general/anim/3/0.png rename to data/tilesets/primary/general/anim/waterfall/0.png diff --git a/data/tilesets/primary/general/anim/3/1.png b/data/tilesets/primary/general/anim/waterfall/1.png similarity index 100% rename from data/tilesets/primary/general/anim/3/1.png rename to data/tilesets/primary/general/anim/waterfall/1.png diff --git a/data/tilesets/primary/general/anim/3/2.png b/data/tilesets/primary/general/anim/waterfall/2.png similarity index 100% rename from data/tilesets/primary/general/anim/3/2.png rename to data/tilesets/primary/general/anim/waterfall/2.png diff --git a/data/tilesets/primary/general/anim/3/3.png b/data/tilesets/primary/general/anim/waterfall/3.png similarity index 100% rename from data/tilesets/primary/general/anim/3/3.png rename to data/tilesets/primary/general/anim/waterfall/3.png diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.png similarity index 100% rename from data/tilesets/secondary/battle_frontier_outside_east/anim/0.png rename to data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.png diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.png similarity index 100% rename from data/tilesets/secondary/battle_frontier_outside_east/anim/1.png rename to data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.png diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.png similarity index 100% rename from data/tilesets/secondary/battle_frontier_outside_east/anim/2.png rename to data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.png diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.png similarity index 100% rename from data/tilesets/secondary/battle_frontier_outside_east/anim/3.png rename to data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.png diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.png similarity index 100% rename from data/tilesets/secondary/battle_frontier_outside_west/anim/0.png rename to data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.png diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.png similarity index 100% rename from data/tilesets/secondary/battle_frontier_outside_west/anim/1.png rename to data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.png diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.png similarity index 100% rename from data/tilesets/secondary/battle_frontier_outside_west/anim/2.png rename to data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.png diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.png similarity index 100% rename from data/tilesets/secondary/battle_frontier_outside_west/anim/3.png rename to data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/0.png b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.png similarity index 100% rename from data/tilesets/secondary/battle_pyramid/anim/1/0.png rename to data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/1.png b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.png similarity index 100% rename from data/tilesets/secondary/battle_pyramid/anim/1/1.png rename to data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/2.png b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.png similarity index 100% rename from data/tilesets/secondary/battle_pyramid/anim/1/2.png rename to data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/0.png b/data/tilesets/secondary/battle_pyramid/anim/torch/0.png similarity index 100% rename from data/tilesets/secondary/battle_pyramid/anim/0/0.png rename to data/tilesets/secondary/battle_pyramid/anim/torch/0.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/1.png b/data/tilesets/secondary/battle_pyramid/anim/torch/1.png similarity index 100% rename from data/tilesets/secondary/battle_pyramid/anim/0/1.png rename to data/tilesets/secondary/battle_pyramid/anim/torch/1.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/2.png b/data/tilesets/secondary/battle_pyramid/anim/torch/2.png similarity index 100% rename from data/tilesets/secondary/battle_pyramid/anim/0/2.png rename to data/tilesets/secondary/battle_pyramid/anim/torch/2.png diff --git a/data/tilesets/secondary/bike_shop/anim/0.png b/data/tilesets/secondary/bike_shop/anim/blinking_lights/0.png similarity index 100% rename from data/tilesets/secondary/bike_shop/anim/0.png rename to data/tilesets/secondary/bike_shop/anim/blinking_lights/0.png diff --git a/data/tilesets/secondary/bike_shop/anim/1.png b/data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png similarity index 100% rename from data/tilesets/secondary/bike_shop/anim/1.png rename to data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png diff --git a/data/tilesets/secondary/cave/anim/0.png b/data/tilesets/secondary/cave/anim/lava/0.png similarity index 100% rename from data/tilesets/secondary/cave/anim/0.png rename to data/tilesets/secondary/cave/anim/lava/0.png diff --git a/data/tilesets/secondary/cave/anim/1.png b/data/tilesets/secondary/cave/anim/lava/1.png similarity index 100% rename from data/tilesets/secondary/cave/anim/1.png rename to data/tilesets/secondary/cave/anim/lava/1.png diff --git a/data/tilesets/secondary/cave/anim/2.png b/data/tilesets/secondary/cave/anim/lava/2.png similarity index 100% rename from data/tilesets/secondary/cave/anim/2.png rename to data/tilesets/secondary/cave/anim/lava/2.png diff --git a/data/tilesets/secondary/cave/anim/3.png b/data/tilesets/secondary/cave/anim/lava/3.png similarity index 100% rename from data/tilesets/secondary/cave/anim/3.png rename to data/tilesets/secondary/cave/anim/lava/3.png diff --git a/data/tilesets/secondary/cave/anim/unused/0.png b/data/tilesets/secondary/cave/anim/lava/4.png similarity index 100% rename from data/tilesets/secondary/cave/anim/unused/0.png rename to data/tilesets/secondary/cave/anim/lava/4.png diff --git a/data/tilesets/secondary/cave/anim/unused/1.png b/data/tilesets/secondary/cave/anim/lava/5.png similarity index 100% rename from data/tilesets/secondary/cave/anim/unused/1.png rename to data/tilesets/secondary/cave/anim/lava/5.png diff --git a/data/tilesets/secondary/cave/anim/unused/2.png b/data/tilesets/secondary/cave/anim/lava/6.png similarity index 100% rename from data/tilesets/secondary/cave/anim/unused/2.png rename to data/tilesets/secondary/cave/anim/lava/6.png diff --git a/data/tilesets/secondary/cave/anim/unused/3.png b/data/tilesets/secondary/cave/anim/lava/7.png similarity index 100% rename from data/tilesets/secondary/cave/anim/unused/3.png rename to data/tilesets/secondary/cave/anim/lava/7.png diff --git a/data/tilesets/secondary/dewford/anim/0.png b/data/tilesets/secondary/dewford/anim/flag/0.png similarity index 100% rename from data/tilesets/secondary/dewford/anim/0.png rename to data/tilesets/secondary/dewford/anim/flag/0.png diff --git a/data/tilesets/secondary/dewford/anim/1.png b/data/tilesets/secondary/dewford/anim/flag/1.png similarity index 100% rename from data/tilesets/secondary/dewford/anim/1.png rename to data/tilesets/secondary/dewford/anim/flag/1.png diff --git a/data/tilesets/secondary/dewford/anim/2.png b/data/tilesets/secondary/dewford/anim/flag/2.png similarity index 100% rename from data/tilesets/secondary/dewford/anim/2.png rename to data/tilesets/secondary/dewford/anim/flag/2.png diff --git a/data/tilesets/secondary/dewford/anim/3.png b/data/tilesets/secondary/dewford/anim/flag/3.png similarity index 100% rename from data/tilesets/secondary/dewford/anim/3.png rename to data/tilesets/secondary/dewford/anim/flag/3.png diff --git a/data/tilesets/secondary/elite_four/anim/1/0.png b/data/tilesets/secondary/elite_four/anim/floor_light/0.png similarity index 100% rename from data/tilesets/secondary/elite_four/anim/1/0.png rename to data/tilesets/secondary/elite_four/anim/floor_light/0.png diff --git a/data/tilesets/secondary/elite_four/anim/1/1.png b/data/tilesets/secondary/elite_four/anim/floor_light/1.png similarity index 100% rename from data/tilesets/secondary/elite_four/anim/1/1.png rename to data/tilesets/secondary/elite_four/anim/floor_light/1.png diff --git a/data/tilesets/secondary/elite_four/anim/0/0.png b/data/tilesets/secondary/elite_four/anim/wall_lights/0.png similarity index 100% rename from data/tilesets/secondary/elite_four/anim/0/0.png rename to data/tilesets/secondary/elite_four/anim/wall_lights/0.png diff --git a/data/tilesets/secondary/elite_four/anim/0/1.png b/data/tilesets/secondary/elite_four/anim/wall_lights/1.png similarity index 100% rename from data/tilesets/secondary/elite_four/anim/0/1.png rename to data/tilesets/secondary/elite_four/anim/wall_lights/1.png diff --git a/data/tilesets/secondary/elite_four/anim/0/2.png b/data/tilesets/secondary/elite_four/anim/wall_lights/2.png similarity index 100% rename from data/tilesets/secondary/elite_four/anim/0/2.png rename to data/tilesets/secondary/elite_four/anim/wall_lights/2.png diff --git a/data/tilesets/secondary/elite_four/anim/0/3.png b/data/tilesets/secondary/elite_four/anim/wall_lights/3.png similarity index 100% rename from data/tilesets/secondary/elite_four/anim/0/3.png rename to data/tilesets/secondary/elite_four/anim/wall_lights/3.png diff --git a/data/tilesets/secondary/ever_grande/anim/0.png b/data/tilesets/secondary/ever_grande/anim/flowers/0.png similarity index 100% rename from data/tilesets/secondary/ever_grande/anim/0.png rename to data/tilesets/secondary/ever_grande/anim/flowers/0.png diff --git a/data/tilesets/secondary/ever_grande/anim/1.png b/data/tilesets/secondary/ever_grande/anim/flowers/1.png similarity index 100% rename from data/tilesets/secondary/ever_grande/anim/1.png rename to data/tilesets/secondary/ever_grande/anim/flowers/1.png diff --git a/data/tilesets/secondary/ever_grande/anim/2.png b/data/tilesets/secondary/ever_grande/anim/flowers/2.png similarity index 100% rename from data/tilesets/secondary/ever_grande/anim/2.png rename to data/tilesets/secondary/ever_grande/anim/flowers/2.png diff --git a/data/tilesets/secondary/ever_grande/anim/3.png b/data/tilesets/secondary/ever_grande/anim/flowers/3.png similarity index 100% rename from data/tilesets/secondary/ever_grande/anim/3.png rename to data/tilesets/secondary/ever_grande/anim/flowers/3.png diff --git a/data/tilesets/secondary/ever_grande/anim/4.png b/data/tilesets/secondary/ever_grande/anim/flowers/4.png similarity index 100% rename from data/tilesets/secondary/ever_grande/anim/4.png rename to data/tilesets/secondary/ever_grande/anim/flowers/4.png diff --git a/data/tilesets/secondary/ever_grande/anim/5.png b/data/tilesets/secondary/ever_grande/anim/flowers/5.png similarity index 100% rename from data/tilesets/secondary/ever_grande/anim/5.png rename to data/tilesets/secondary/ever_grande/anim/flowers/5.png diff --git a/data/tilesets/secondary/ever_grande/anim/6.png b/data/tilesets/secondary/ever_grande/anim/flowers/6.png similarity index 100% rename from data/tilesets/secondary/ever_grande/anim/6.png rename to data/tilesets/secondary/ever_grande/anim/flowers/6.png diff --git a/data/tilesets/secondary/ever_grande/anim/7.png b/data/tilesets/secondary/ever_grande/anim/flowers/7.png similarity index 100% rename from data/tilesets/secondary/ever_grande/anim/7.png rename to data/tilesets/secondary/ever_grande/anim/flowers/7.png diff --git a/data/tilesets/secondary/lavaridge/anim/0.png b/data/tilesets/secondary/lavaridge/anim/steam/0.png similarity index 100% rename from data/tilesets/secondary/lavaridge/anim/0.png rename to data/tilesets/secondary/lavaridge/anim/steam/0.png diff --git a/data/tilesets/secondary/lavaridge/anim/1.png b/data/tilesets/secondary/lavaridge/anim/steam/1.png similarity index 100% rename from data/tilesets/secondary/lavaridge/anim/1.png rename to data/tilesets/secondary/lavaridge/anim/steam/1.png diff --git a/data/tilesets/secondary/lavaridge/anim/2.png b/data/tilesets/secondary/lavaridge/anim/steam/2.png similarity index 100% rename from data/tilesets/secondary/lavaridge/anim/2.png rename to data/tilesets/secondary/lavaridge/anim/steam/2.png diff --git a/data/tilesets/secondary/lavaridge/anim/3.png b/data/tilesets/secondary/lavaridge/anim/steam/3.png similarity index 100% rename from data/tilesets/secondary/lavaridge/anim/3.png rename to data/tilesets/secondary/lavaridge/anim/steam/3.png diff --git a/data/tilesets/secondary/mauville/anim/0/a/0.png b/data/tilesets/secondary/mauville/anim/flower_1/0.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/0/a/0.png rename to data/tilesets/secondary/mauville/anim/flower_1/0.png diff --git a/data/tilesets/secondary/mauville/anim/0/a/1.png b/data/tilesets/secondary/mauville/anim/flower_1/1.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/0/a/1.png rename to data/tilesets/secondary/mauville/anim/flower_1/1.png diff --git a/data/tilesets/secondary/mauville/anim/0/a/2.png b/data/tilesets/secondary/mauville/anim/flower_1/2.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/0/a/2.png rename to data/tilesets/secondary/mauville/anim/flower_1/2.png diff --git a/data/tilesets/secondary/mauville/anim/0/a/3.png b/data/tilesets/secondary/mauville/anim/flower_1/3.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/0/a/3.png rename to data/tilesets/secondary/mauville/anim/flower_1/3.png diff --git a/data/tilesets/secondary/mauville/anim/1/a/1.png b/data/tilesets/secondary/mauville/anim/flower_1/4.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/1/a/1.png rename to data/tilesets/secondary/mauville/anim/flower_1/4.png diff --git a/data/tilesets/secondary/mauville/anim/0/b/0.png b/data/tilesets/secondary/mauville/anim/flower_2/0.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/0/b/0.png rename to data/tilesets/secondary/mauville/anim/flower_2/0.png diff --git a/data/tilesets/secondary/mauville/anim/0/b/1.png b/data/tilesets/secondary/mauville/anim/flower_2/1.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/0/b/1.png rename to data/tilesets/secondary/mauville/anim/flower_2/1.png diff --git a/data/tilesets/secondary/mauville/anim/0/b/2.png b/data/tilesets/secondary/mauville/anim/flower_2/2.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/0/b/2.png rename to data/tilesets/secondary/mauville/anim/flower_2/2.png diff --git a/data/tilesets/secondary/mauville/anim/0/b/3.png b/data/tilesets/secondary/mauville/anim/flower_2/3.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/0/b/3.png rename to data/tilesets/secondary/mauville/anim/flower_2/3.png diff --git a/data/tilesets/secondary/mauville/anim/1/b/1.png b/data/tilesets/secondary/mauville/anim/flower_2/4.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/1/b/1.png rename to data/tilesets/secondary/mauville/anim/flower_2/4.png diff --git a/data/tilesets/secondary/mauville_gym/anim/0.png b/data/tilesets/secondary/mauville_gym/anim/electric_gates/0.png similarity index 100% rename from data/tilesets/secondary/mauville_gym/anim/0.png rename to data/tilesets/secondary/mauville_gym/anim/electric_gates/0.png diff --git a/data/tilesets/secondary/mauville_gym/anim/1.png b/data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png similarity index 100% rename from data/tilesets/secondary/mauville_gym/anim/1.png rename to data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png diff --git a/data/tilesets/secondary/pacifidlog/anim/0/0.png b/data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/0/0.png rename to data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png diff --git a/data/tilesets/secondary/pacifidlog/anim/0/1.png b/data/tilesets/secondary/pacifidlog/anim/log_bridges/1.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/0/1.png rename to data/tilesets/secondary/pacifidlog/anim/log_bridges/1.png diff --git a/data/tilesets/secondary/pacifidlog/anim/0/2.png b/data/tilesets/secondary/pacifidlog/anim/log_bridges/2.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/0/2.png rename to data/tilesets/secondary/pacifidlog/anim/log_bridges/2.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/0.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/0.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/1/0.png rename to data/tilesets/secondary/pacifidlog/anim/water_currents/0.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/1.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/1.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/1/1.png rename to data/tilesets/secondary/pacifidlog/anim/water_currents/1.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/2.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/2.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/1/2.png rename to data/tilesets/secondary/pacifidlog/anim/water_currents/2.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/3.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/3.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/1/3.png rename to data/tilesets/secondary/pacifidlog/anim/water_currents/3.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/4.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/4.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/1/4.png rename to data/tilesets/secondary/pacifidlog/anim/water_currents/4.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/5.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/5.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/1/5.png rename to data/tilesets/secondary/pacifidlog/anim/water_currents/5.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/6.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/6.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/1/6.png rename to data/tilesets/secondary/pacifidlog/anim/water_currents/6.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/7.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/7.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/1/7.png rename to data/tilesets/secondary/pacifidlog/anim/water_currents/7.png diff --git a/data/tilesets/secondary/rustboro/anim/1/0.png b/data/tilesets/secondary/rustboro/anim/fountain/0.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/1/0.png rename to data/tilesets/secondary/rustboro/anim/fountain/0.png diff --git a/data/tilesets/secondary/rustboro/anim/1/1.png b/data/tilesets/secondary/rustboro/anim/fountain/1.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/1/1.png rename to data/tilesets/secondary/rustboro/anim/fountain/1.png diff --git a/data/tilesets/secondary/rustboro/anim/0/0.png b/data/tilesets/secondary/rustboro/anim/windy_water/0.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/0/0.png rename to data/tilesets/secondary/rustboro/anim/windy_water/0.png diff --git a/data/tilesets/secondary/rustboro/anim/0/1.png b/data/tilesets/secondary/rustboro/anim/windy_water/1.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/0/1.png rename to data/tilesets/secondary/rustboro/anim/windy_water/1.png diff --git a/data/tilesets/secondary/rustboro/anim/0/2.png b/data/tilesets/secondary/rustboro/anim/windy_water/2.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/0/2.png rename to data/tilesets/secondary/rustboro/anim/windy_water/2.png diff --git a/data/tilesets/secondary/rustboro/anim/0/3.png b/data/tilesets/secondary/rustboro/anim/windy_water/3.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/0/3.png rename to data/tilesets/secondary/rustboro/anim/windy_water/3.png diff --git a/data/tilesets/secondary/rustboro/anim/0/4.png b/data/tilesets/secondary/rustboro/anim/windy_water/4.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/0/4.png rename to data/tilesets/secondary/rustboro/anim/windy_water/4.png diff --git a/data/tilesets/secondary/rustboro/anim/0/5.png b/data/tilesets/secondary/rustboro/anim/windy_water/5.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/0/5.png rename to data/tilesets/secondary/rustboro/anim/windy_water/5.png diff --git a/data/tilesets/secondary/rustboro/anim/0/6.png b/data/tilesets/secondary/rustboro/anim/windy_water/6.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/0/6.png rename to data/tilesets/secondary/rustboro/anim/windy_water/6.png diff --git a/data/tilesets/secondary/rustboro/anim/0/7.png b/data/tilesets/secondary/rustboro/anim/windy_water/7.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/0/7.png rename to data/tilesets/secondary/rustboro/anim/windy_water/7.png diff --git a/data/tilesets/secondary/slateport/anim/0.png b/data/tilesets/secondary/slateport/anim/balloons/0.png similarity index 100% rename from data/tilesets/secondary/slateport/anim/0.png rename to data/tilesets/secondary/slateport/anim/balloons/0.png diff --git a/data/tilesets/secondary/slateport/anim/1.png b/data/tilesets/secondary/slateport/anim/balloons/1.png similarity index 100% rename from data/tilesets/secondary/slateport/anim/1.png rename to data/tilesets/secondary/slateport/anim/balloons/1.png diff --git a/data/tilesets/secondary/slateport/anim/2.png b/data/tilesets/secondary/slateport/anim/balloons/2.png similarity index 100% rename from data/tilesets/secondary/slateport/anim/2.png rename to data/tilesets/secondary/slateport/anim/balloons/2.png diff --git a/data/tilesets/secondary/slateport/anim/3.png b/data/tilesets/secondary/slateport/anim/balloons/3.png similarity index 100% rename from data/tilesets/secondary/slateport/anim/3.png rename to data/tilesets/secondary/slateport/anim/balloons/3.png diff --git a/data/tilesets/secondary/sootopolis/anim/0.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/0.png similarity index 100% rename from data/tilesets/secondary/sootopolis/anim/0.png rename to data/tilesets/secondary/sootopolis/anim/stormy_water/0.png diff --git a/data/tilesets/secondary/sootopolis/anim/1.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/1.png similarity index 100% rename from data/tilesets/secondary/sootopolis/anim/1.png rename to data/tilesets/secondary/sootopolis/anim/stormy_water/1.png diff --git a/data/tilesets/secondary/sootopolis/anim/2.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/2.png similarity index 100% rename from data/tilesets/secondary/sootopolis/anim/2.png rename to data/tilesets/secondary/sootopolis/anim/stormy_water/2.png diff --git a/data/tilesets/secondary/sootopolis/anim/3.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/3.png similarity index 100% rename from data/tilesets/secondary/sootopolis/anim/3.png rename to data/tilesets/secondary/sootopolis/anim/stormy_water/3.png diff --git a/data/tilesets/secondary/sootopolis/anim/4.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/4.png similarity index 100% rename from data/tilesets/secondary/sootopolis/anim/4.png rename to data/tilesets/secondary/sootopolis/anim/stormy_water/4.png diff --git a/data/tilesets/secondary/sootopolis/anim/5.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/5.png similarity index 100% rename from data/tilesets/secondary/sootopolis/anim/5.png rename to data/tilesets/secondary/sootopolis/anim/stormy_water/5.png diff --git a/data/tilesets/secondary/sootopolis/anim/6.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/6.png similarity index 100% rename from data/tilesets/secondary/sootopolis/anim/6.png rename to data/tilesets/secondary/sootopolis/anim/stormy_water/6.png diff --git a/data/tilesets/secondary/sootopolis/anim/7.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/7.png similarity index 100% rename from data/tilesets/secondary/sootopolis/anim/7.png rename to data/tilesets/secondary/sootopolis/anim/stormy_water/7.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/0.png b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.png similarity index 100% rename from data/tilesets/secondary/sootopolis_gym/anim/1/0.png rename to data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/1.png b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.png similarity index 100% rename from data/tilesets/secondary/sootopolis_gym/anim/1/1.png rename to data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/2.png b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.png similarity index 100% rename from data/tilesets/secondary/sootopolis_gym/anim/1/2.png rename to data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/0.png b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.png similarity index 100% rename from data/tilesets/secondary/sootopolis_gym/anim/0/0.png rename to data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/1.png b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.png similarity index 100% rename from data/tilesets/secondary/sootopolis_gym/anim/0/1.png rename to data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/2.png b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.png similarity index 100% rename from data/tilesets/secondary/sootopolis_gym/anim/0/2.png rename to data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.png diff --git a/data/tilesets/secondary/underwater/anim/0.png b/data/tilesets/secondary/underwater/anim/seaweed/0.png similarity index 100% rename from data/tilesets/secondary/underwater/anim/0.png rename to data/tilesets/secondary/underwater/anim/seaweed/0.png diff --git a/data/tilesets/secondary/underwater/anim/1.png b/data/tilesets/secondary/underwater/anim/seaweed/1.png similarity index 100% rename from data/tilesets/secondary/underwater/anim/1.png rename to data/tilesets/secondary/underwater/anim/seaweed/1.png diff --git a/data/tilesets/secondary/underwater/anim/2.png b/data/tilesets/secondary/underwater/anim/seaweed/2.png similarity index 100% rename from data/tilesets/secondary/underwater/anim/2.png rename to data/tilesets/secondary/underwater/anim/seaweed/2.png diff --git a/data/tilesets/secondary/underwater/anim/3.png b/data/tilesets/secondary/underwater/anim/seaweed/3.png similarity index 100% rename from data/tilesets/secondary/underwater/anim/3.png rename to data/tilesets/secondary/underwater/anim/seaweed/3.png diff --git a/include/graphics.h b/include/graphics.h index f86a040857..58a9666a62 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4104,6 +4104,10 @@ extern const u32 gUnknown_08D83B2C[]; extern const u32 gUnknown_08D83C3C[]; extern const u32 gUnknown_08D83900[]; extern const u32 gBattleFrontierGfx_DomeOptions[]; +extern const u16 gTilesetAnims_BattleDomePals0_0[]; +extern const u16 gTilesetAnims_BattleDomePals0_1[]; +extern const u16 gTilesetAnims_BattleDomePals0_2[]; +extern const u16 gTilesetAnims_BattleDomePals0_3[]; extern const u32 gBattleArenaJudgementSymbolsGfx[]; extern const u32 gBattleArenaJudgementSymbolsPalette[]; diff --git a/include/tileset_anims.h b/include/tileset_anims.h index 17d883cd2e..0e515f044d 100755 --- a/include/tileset_anims.h +++ b/include/tileset_anims.h @@ -1,9 +1,9 @@ #ifndef GUARD_TILESET_ANIMS_H #define GUARD_TILESET_ANIMS_H -void cur_mapheader_run_tileset_funcs_after_some_cpuset(void); -void sub_80A0A2C(void); -void sub_80A0A38(void); +void InitTilesetAnimations(void); +void InitSecondaryTilesetAnimation(void); +void UpdateTilesetAnimations(void); void TransferTilesetAnimsBuffer(void); #endif // GUARD_TILESET_ANIMS_H diff --git a/src/battle_dome.c b/src/battle_dome.c index f6327f31f5..bfede1b28b 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -126,7 +126,7 @@ static EWRAM_DATA struct BattleDomeStruct *sBattleDomeStruct = {0}; static EWRAM_DATA u8 *sTilemapBuffer = NULL; // Const rom data. -static const u8 sMovePointsForDomeTrainers[][DOME_TOURNAMENT_TRAINERS_COUNT] = +static const u8 sMovePointsForDomeTrainers[MOVES_COUNT][DOME_TOURNAMENT_TRAINERS_COUNT] = { [MOVE_NONE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, [MOVE_POUND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, diff --git a/src/overworld.c b/src/overworld.c index 43610fe094..08fd94c1be 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -528,7 +528,7 @@ static void mapdata_load_assets_to_gpu_and_full_redraw(void) copy_map_tileset1_tileset2_to_vram(gMapHeader.mapLayout); apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout); DrawWholeMapView(); - cur_mapheader_run_tileset_funcs_after_some_cpuset(); + InitTilesetAnimations(); } const struct MapLayout *GetMapLayout(void) @@ -808,7 +808,7 @@ void mliX_load_map(u8 mapGroup, u8 mapNum) for (paletteIndex = 6; paletteIndex < 13; paletteIndex++) ApplyWeatherGammaShiftToPal(paletteIndex); - sub_80A0A2C(); + InitSecondaryTilesetAnimation(); UpdateLocationHistoryForRoamer(); RoamerMove(); DoCurrentWeather(); @@ -1451,7 +1451,7 @@ static void OverworldBasic(void) UpdateCameraPanning(); BuildOamBuffer(); UpdatePaletteFade(); - sub_80A0A38(); + UpdateTilesetAnimations(); do_scheduled_bg_tilemap_copies_to_vram(); } @@ -1843,7 +1843,7 @@ static bool32 map_loading_iteration_3(u8 *state) (*state)++; break; case 10: - cur_mapheader_run_tileset_funcs_after_some_cpuset(); + InitTilesetAnimations(); (*state)++; break; case 11: @@ -1918,7 +1918,7 @@ static bool32 load_map_stuff(u8 *state, u32 a2) (*state)++; break; case 10: - cur_mapheader_run_tileset_funcs_after_some_cpuset(); + InitTilesetAnimations(); (*state)++; break; case 11: @@ -2015,7 +2015,7 @@ static bool32 map_loading_iteration_2_link(u8 *state) (*state)++; break; case 9: - cur_mapheader_run_tileset_funcs_after_some_cpuset(); + InitTilesetAnimations(); (*state)++; break; case 11: diff --git a/src/tileset_anims.c b/src/tileset_anims.c index f7c3cd482c..087b75b7c4 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -1,5 +1,5 @@ -// Includes #include "global.h" +#include "graphics.h" #include "palette.h" #include "util.h" #include "battle_transition.h" @@ -7,10 +7,6 @@ #include "battle_transition.h" #include "fieldmap.h" -// Static type declarations - -// Static RAM declarations - static EWRAM_DATA struct { const u16 *src; u16 *dest; @@ -18,211 +14,209 @@ static EWRAM_DATA struct { } sTilesetDMA3TransferBuffer[20] = {0}; static u8 sTilesetDMA3TransferBufferSize; -static u16 sPrimaryTilesetCBCounter; -static u16 sPrimaryTilesetCBBufferSize; -static u16 sSecondaryTilesetCBCounter; -static u16 sSecondaryTilesetCBBufferSize; -static void (*sPrimaryTilesetCB)(u16); -static void (*sSecondaryTilesetCB)(u16); +static u16 sPrimaryTilesetAnimCounter; +static u16 sPrimaryTilesetAnimCounterMax; +static u16 sSecondaryTilesetAnimCounter; +static u16 sSecondaryTilesetAnimCounterMax; +static void (*sPrimaryTilesetAnimCallback)(u16); +static void (*sSecondaryTilesetAnimCallback)(u16); -// Static ROM declarations - -static void cur_mapheader_run_tileset1_func(void); -static void cur_mapheader_run_tileset2_func(void); - -// .rodata - - -const u16 gTilesetAnims_General0_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/0/1.4bpp"); - -const u16 gTilesetAnims_General0_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/0/0.4bpp"); - -const u16 gTilesetAnims_General0_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/0/2.4bpp"); +static void _InitPrimaryTilesetAnimation(void); +static void _InitSecondaryTilesetAnimation(void); +static void TilesetAnim_General(u16); +static void TilesetAnim_Building(u16); +static void TilesetAnim_Rustboro(u16); +static void TilesetAnim_Dewford(u16); +static void TilesetAnim_Slateport(u16); +static void TilesetAnim_Mauville(u16); +static void TilesetAnim_Lavaridge(u16); +static void TilesetAnim_EverGrande(u16); +static void TilesetAnim_Pacifidlog(u16); +static void TilesetAnim_Sootopolis(u16); +static void TilesetAnim_BattleFrontierOutsideWest(u16); +static void TilesetAnim_BattleFrontierOutsideEast(u16); +static void TilesetAnim_Underwater(u16); +static void TilesetAnim_SootopolisGym(u16); +static void TilesetAnim_Cave(u16); +static void TilesetAnim_EliteFour(u16); +static void TilesetAnim_MauvilleGym(u16); +static void TilesetAnim_BikeShop(u16); +static void TilesetAnim_BattlePyramid(u16); +static void TilesetAnim_BattleDome(u16); +static void QueueAnimTiles_General_Flower(u16); +static void QueueAnimTiles_General_Water(u16); +static void QueueAnimTiles_General_SandWaterEdge(u16); +static void QueueAnimTiles_General_Waterfall(u16); +static void QueueAnimTiles_General_LandWaterEdge(u16); +static void QueueAnimTiles_Building_TVTurnedOn(u16); +static void QueueAnimTiles_Rustboro_WindyWater(u16, u8); +static void QueueAnimTiles_Rustboro_Fountain(u16); +static void QueueAnimTiles_Dewford_Flag(u16); +static void QueueAnimTiles_Slateport_Balloons(u16); +static void QueueAnimTiles_Mauville_Flowers(u16, u8); +static void QueueAnimTiles_BikeShop_BlinkingLights(u16); +static void QueueAnimTiles_BattlePyramid_Torch(u16); +static void QueueAnimTiles_BattlePyramid_StatueShadow(u16); +static void BlendAnimPalette_BattleDome_FloorLights(u16); +static void BlendAnimPalette_BattleDome_FloorLightsNoBlend(u16); +static void QueueAnimTiles_Lavaridge_Steam(u8); +static void QueueAnimTiles_Lavaridge_Lava(u16); +static void QueueAnimTiles_EverGrande_Flowers(u16, u8); +static void QueueAnimTiles_Pacifidlog_LogBridges(u8); +static void QueueAnimTiles_Pacifidlog_WaterCurrents(u8); +static void QueueAnimTiles_Sootopolis_StormyWater(u16); +static void QueueAnimTiles_Underwater_Seaweed(u8); +static void QueueAnimTiles_Cave_Lava(u16); +static void QueueAnimTiles_BattleFrontierOutsideWest_Flag(u16); +static void QueueAnimTiles_BattleFrontierOutsideEast_Flag(u16); +static void QueueAnimTiles_MauvilleGym_ElectricGates(u16); +static void QueueAnimTiles_SootopolisGym_Waterfalls(u16); +static void QueueAnimTiles_EliteFour_GroundLights(u16); +static void QueueAnimTiles_EliteFour_WallLights(u16); +const u16 gTilesetAnims_General_Flower_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/1.4bpp"); +const u16 gTilesetAnims_General_Flower_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/0.4bpp"); +const u16 gTilesetAnims_General_Flower_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/2.4bpp"); const u16 tileset_anims_space_0[16] = {}; -const u16 *const gTilesetAnims_General0[] = { - gTilesetAnims_General0_Frame0, - gTilesetAnims_General0_Frame1, - gTilesetAnims_General0_Frame0, - gTilesetAnims_General0_Frame2 +const u16 *const gTilesetAnims_General_Flower[] = { + gTilesetAnims_General_Flower_Frame0, + gTilesetAnims_General_Flower_Frame1, + gTilesetAnims_General_Flower_Frame0, + gTilesetAnims_General_Flower_Frame2 }; -const u16 gTilesetAnims_General1_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/1/0.4bpp"); +const u16 gTilesetAnims_General_Water_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/water/0.4bpp"); +const u16 gTilesetAnims_General_Water_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/water/1.4bpp"); +const u16 gTilesetAnims_General_Water_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/water/2.4bpp"); +const u16 gTilesetAnims_General_Water_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/water/3.4bpp"); +const u16 gTilesetAnims_General_Water_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/water/4.4bpp"); +const u16 gTilesetAnims_General_Water_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/water/5.4bpp"); +const u16 gTilesetAnims_General_Water_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/water/6.4bpp"); +const u16 gTilesetAnims_General_Water_Frame7[] = INCBIN_U16("data/tilesets/primary/general/anim/water/7.4bpp"); -const u16 gTilesetAnims_General1_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/1/1.4bpp"); - -const u16 gTilesetAnims_General1_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/1/2.4bpp"); - -const u16 gTilesetAnims_General1_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/1/3.4bpp"); - -const u16 gTilesetAnims_General1_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/1/4.4bpp"); - -const u16 gTilesetAnims_General1_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/1/5.4bpp"); - -const u16 gTilesetAnims_General1_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/1/6.4bpp"); - -const u16 gTilesetAnims_General1_Frame7[] = INCBIN_U16("data/tilesets/primary/general/anim/1/7.4bpp"); - -const u16 *const gTilesetAnims_General1[] = { - gTilesetAnims_General1_Frame0, - gTilesetAnims_General1_Frame1, - gTilesetAnims_General1_Frame2, - gTilesetAnims_General1_Frame3, - gTilesetAnims_General1_Frame4, - gTilesetAnims_General1_Frame5, - gTilesetAnims_General1_Frame6, - gTilesetAnims_General1_Frame7 +const u16 *const gTilesetAnims_General_Water[] = { + gTilesetAnims_General_Water_Frame0, + gTilesetAnims_General_Water_Frame1, + gTilesetAnims_General_Water_Frame2, + gTilesetAnims_General_Water_Frame3, + gTilesetAnims_General_Water_Frame4, + gTilesetAnims_General_Water_Frame5, + gTilesetAnims_General_Water_Frame6, + gTilesetAnims_General_Water_Frame7 }; -const u16 gTilesetAnims_General2_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/2/0.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/0.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/1.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/2.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/3.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/4.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/5.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/6.4bpp"); -const u16 gTilesetAnims_General2_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/2/1.4bpp"); - -const u16 gTilesetAnims_General2_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/2/2.4bpp"); - -const u16 gTilesetAnims_General2_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/2/3.4bpp"); - -const u16 gTilesetAnims_General2_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/2/4.4bpp"); - -const u16 gTilesetAnims_General2_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/2/5.4bpp"); - -const u16 gTilesetAnims_General2_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/2/6.4bpp"); - -const u16 *const gTilesetAnims_General2[] = { - gTilesetAnims_General2_Frame0, - gTilesetAnims_General2_Frame1, - gTilesetAnims_General2_Frame2, - gTilesetAnims_General2_Frame3, - gTilesetAnims_General2_Frame4, - gTilesetAnims_General2_Frame5, - gTilesetAnims_General2_Frame6, - gTilesetAnims_General2_Frame0 +const u16 *const gTilesetAnims_General_SandWaterEdge[] = { + gTilesetAnims_General_SandWaterEdge_Frame0, + gTilesetAnims_General_SandWaterEdge_Frame1, + gTilesetAnims_General_SandWaterEdge_Frame2, + gTilesetAnims_General_SandWaterEdge_Frame3, + gTilesetAnims_General_SandWaterEdge_Frame4, + gTilesetAnims_General_SandWaterEdge_Frame5, + gTilesetAnims_General_SandWaterEdge_Frame6, + gTilesetAnims_General_SandWaterEdge_Frame0 }; -const u16 gTilesetAnims_General3_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/3/0.4bpp"); +const u16 gTilesetAnims_General_Waterfall_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/waterfall/0.4bpp"); +const u16 gTilesetAnims_General_Waterfall_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/waterfall/1.4bpp"); +const u16 gTilesetAnims_General_Waterfall_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/waterfall/2.4bpp"); +const u16 gTilesetAnims_General_Waterfall_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/waterfall/3.4bpp"); -const u16 gTilesetAnims_General3_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/3/1.4bpp"); - -const u16 gTilesetAnims_General3_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/3/2.4bpp"); - -const u16 gTilesetAnims_General3_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/3/3.4bpp"); - -const u16 *const gTilesetAnims_General3[] = { - gTilesetAnims_General3_Frame0, - gTilesetAnims_General3_Frame1, - gTilesetAnims_General3_Frame2, - gTilesetAnims_General3_Frame3 +const u16 *const gTilesetAnims_General_Waterfall[] = { + gTilesetAnims_General_Waterfall_Frame0, + gTilesetAnims_General_Waterfall_Frame1, + gTilesetAnims_General_Waterfall_Frame2, + gTilesetAnims_General_Waterfall_Frame3 }; -const u16 gTilesetAnims_General4_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/4/0.4bpp"); +const u16 gTilesetAnims_General_LandWaterEdge_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/land_water_edge/0.4bpp"); +const u16 gTilesetAnims_General_LandWaterEdge_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/land_water_edge/1.4bpp"); +const u16 gTilesetAnims_General_LandWaterEdge_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/land_water_edge/2.4bpp"); +const u16 gTilesetAnims_General_LandWaterEdge_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/land_water_edge/3.4bpp"); -const u16 gTilesetAnims_General4_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/4/1.4bpp"); - -const u16 gTilesetAnims_General4_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/4/2.4bpp"); - -const u16 gTilesetAnims_General4_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/4/3.4bpp"); - -const u16 *const gTilesetAnims_General4[] = { - gTilesetAnims_General4_Frame0, - gTilesetAnims_General4_Frame1, - gTilesetAnims_General4_Frame2, - gTilesetAnims_General4_Frame3 +const u16 *const gTilesetAnims_General_LandWaterEdge[] = { + gTilesetAnims_General_LandWaterEdge_Frame0, + gTilesetAnims_General_LandWaterEdge_Frame1, + gTilesetAnims_General_LandWaterEdge_Frame2, + gTilesetAnims_General_LandWaterEdge_Frame3 }; -const u16 gTilesetAnims_Lavaridge0_Frame0[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/0.4bpp"); +const u16 gTilesetAnims_Lavaridge_Steam_Frame0[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/steam/0.4bpp"); +const u16 gTilesetAnims_Lavaridge_Steam_Frame1[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/steam/1.4bpp"); +const u16 gTilesetAnims_Lavaridge_Steam_Frame2[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/steam/2.4bpp"); +const u16 gTilesetAnims_Lavaridge_Steam_Frame3[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/steam/3.4bpp"); -const u16 gTilesetAnims_Lavaridge0_Frame1[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/1.4bpp"); - -const u16 gTilesetAnims_Lavaridge0_Frame2[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/2.4bpp"); - -const u16 gTilesetAnims_Lavaridge0_Frame3[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/3.4bpp"); - -const u16 *const gTilesetAnims_Lavaridge0[] = { - gTilesetAnims_Lavaridge0_Frame0, - gTilesetAnims_Lavaridge0_Frame1, - gTilesetAnims_Lavaridge0_Frame2, - gTilesetAnims_Lavaridge0_Frame3 +const u16 *const gTilesetAnims_Lavaridge_Steam[] = { + gTilesetAnims_Lavaridge_Steam_Frame0, + gTilesetAnims_Lavaridge_Steam_Frame1, + gTilesetAnims_Lavaridge_Steam_Frame2, + gTilesetAnims_Lavaridge_Steam_Frame3 }; -const u16 gTilesetAnims_Pacifidlog0_Frame0[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/0/0.4bpp"); +const u16 gTilesetAnims_Pacifidlog_LogBridges_Frame0[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/log_bridges/0.4bpp"); +const u16 gTilesetAnims_Pacifidlog_LogBridges_Frame1[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/log_bridges/1.4bpp"); +const u16 gTilesetAnims_Pacifidlog_LogBridges_Frame2[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/log_bridges/2.4bpp"); -const u16 gTilesetAnims_Pacifidlog0_Frame1[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/0/1.4bpp"); - -const u16 gTilesetAnims_Pacifidlog0_Frame2[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/0/2.4bpp"); - -const u16 *const gTilesetAnims_Pacifidlog0[] = { - gTilesetAnims_Pacifidlog0_Frame0, - gTilesetAnims_Pacifidlog0_Frame1, - gTilesetAnims_Pacifidlog0_Frame2, - gTilesetAnims_Pacifidlog0_Frame1 +const u16 *const gTilesetAnims_Pacifidlog_LogBridges[] = { + gTilesetAnims_Pacifidlog_LogBridges_Frame0, + gTilesetAnims_Pacifidlog_LogBridges_Frame1, + gTilesetAnims_Pacifidlog_LogBridges_Frame2, + gTilesetAnims_Pacifidlog_LogBridges_Frame1 }; -const u16 gTilesetAnims_Underwater0_Frame0[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/0.4bpp"); +const u16 gTilesetAnims_Underwater_Seaweed_Frame0[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/seaweed/0.4bpp"); +const u16 gTilesetAnims_Underwater_Seaweed_Frame1[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/seaweed/1.4bpp"); +const u16 gTilesetAnims_Underwater_Seaweed_Frame2[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/seaweed/2.4bpp"); +const u16 gTilesetAnims_Underwater_Seaweed_Frame3[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/seaweed/3.4bpp"); -const u16 gTilesetAnims_Underwater0_Frame1[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/1.4bpp"); - -const u16 gTilesetAnims_Underwater0_Frame2[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/2.4bpp"); - -const u16 gTilesetAnims_Underwater0_Frame3[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/3.4bpp"); - -const u16 *const gTilesetAnims_Underwater0[] = { - gTilesetAnims_Underwater0_Frame0, - gTilesetAnims_Underwater0_Frame1, - gTilesetAnims_Underwater0_Frame2, - gTilesetAnims_Underwater0_Frame3 +const u16 *const gTilesetAnims_Underwater_Seaweed[] = { + gTilesetAnims_Underwater_Seaweed_Frame0, + gTilesetAnims_Underwater_Seaweed_Frame1, + gTilesetAnims_Underwater_Seaweed_Frame2, + gTilesetAnims_Underwater_Seaweed_Frame3 }; -const u16 gTilesetAnims_Pacifidlog1_Frame0[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/0.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame0[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/0.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame1[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/1.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame2[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/2.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame3[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/3.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame4[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/4.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame5[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/5.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame6[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/6.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame7[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/7.4bpp"); -const u16 gTilesetAnims_Pacifidlog1_Frame1[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/1.4bpp"); - -const u16 gTilesetAnims_Pacifidlog1_Frame2[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/2.4bpp"); - -const u16 gTilesetAnims_Pacifidlog1_Frame3[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/3.4bpp"); - -const u16 gTilesetAnims_Pacifidlog1_Frame4[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/4.4bpp"); - -const u16 gTilesetAnims_Pacifidlog1_Frame5[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/5.4bpp"); - -const u16 gTilesetAnims_Pacifidlog1_Frame6[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/6.4bpp"); - -const u16 gTilesetAnims_Pacifidlog1_Frame7[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/7.4bpp"); - -const u16 *const gTilesetAnims_Pacifidlog1[] = { - gTilesetAnims_Pacifidlog1_Frame0, - gTilesetAnims_Pacifidlog1_Frame1, - gTilesetAnims_Pacifidlog1_Frame2, - gTilesetAnims_Pacifidlog1_Frame3, - gTilesetAnims_Pacifidlog1_Frame4, - gTilesetAnims_Pacifidlog1_Frame5, - gTilesetAnims_Pacifidlog1_Frame6, - gTilesetAnims_Pacifidlog1_Frame7 +const u16 *const gTilesetAnims_Pacifidlog_WaterCurrents[] = { + gTilesetAnims_Pacifidlog_WaterCurrents_Frame0, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame1, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame2, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame3, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame4, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame5, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame6, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame7 }; -const u16 gTilesetAnims_Mauville0a_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/0.4bpp"); - -const u16 gTilesetAnims_Mauville0a_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/1.4bpp"); - -const u16 gTilesetAnims_Mauville0a_Frame2[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/2.4bpp"); - -const u16 gTilesetAnims_Mauville0a_Frame3[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/3.4bpp"); - -const u16 gTilesetAnims_Mauville1a_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/1/a/1.4bpp"); - -const u16 gTilesetAnims_Mauville0b_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/0.4bpp"); - -const u16 gTilesetAnims_Mauville0b_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/1.4bpp"); - -const u16 gTilesetAnims_Mauville0b_Frame2[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/2.4bpp"); - -const u16 gTilesetAnims_Mauville0b_Frame3[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/3.4bpp"); - -const u16 gTilesetAnims_Mauville1b_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/1/b/1.4bpp"); - +const u16 gTilesetAnims_Mauville_Flower1_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_1/0.4bpp"); +const u16 gTilesetAnims_Mauville_Flower1_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_1/1.4bpp"); +const u16 gTilesetAnims_Mauville_Flower1_Frame2[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_1/2.4bpp"); +const u16 gTilesetAnims_Mauville_Flower1_Frame3[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_1/3.4bpp"); +const u16 gTilesetAnims_Mauville_Flower1_Frame4[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_1/4.4bpp"); +const u16 gTilesetAnims_Mauville_Flower2_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_2/0.4bpp"); +const u16 gTilesetAnims_Mauville_Flower2_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_2/1.4bpp"); +const u16 gTilesetAnims_Mauville_Flower2_Frame2[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_2/2.4bpp"); +const u16 gTilesetAnims_Mauville_Flower2_Frame3[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_2/3.4bpp"); +const u16 gTilesetAnims_Mauville_Flower2_Frame4[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_2/4.4bpp"); const u16 tileset_anims_space_1[16] = {}; -u16 *const gTilesetAnims_MauvilleVDests0[] = { +u16 *const gTilesetAnims_Mauville_Flower1_VDests[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 96)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 100)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 104)), @@ -233,7 +227,7 @@ u16 *const gTilesetAnims_MauvilleVDests0[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 124)) }; -u16 *const gTilesetAnims_MauvilleVDests1[] = { +u16 *const gTilesetAnims_Mauville_Flower2_VDests[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 128)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 132)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 136)), @@ -244,67 +238,60 @@ u16 *const gTilesetAnims_MauvilleVDests1[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 156)) }; -const u16 *const gTilesetAnims_Mauville0a[] = { - gTilesetAnims_Mauville0a_Frame0, - gTilesetAnims_Mauville0a_Frame0, - gTilesetAnims_Mauville0a_Frame1, - gTilesetAnims_Mauville0a_Frame2, - gTilesetAnims_Mauville0a_Frame3, - gTilesetAnims_Mauville0a_Frame3, - gTilesetAnims_Mauville0a_Frame3, - gTilesetAnims_Mauville0a_Frame3, - gTilesetAnims_Mauville0a_Frame3, - gTilesetAnims_Mauville0a_Frame3, - gTilesetAnims_Mauville0a_Frame2, - gTilesetAnims_Mauville0a_Frame1 +const u16 *const gTilesetAnims_Mauville_Flower1[] = { + gTilesetAnims_Mauville_Flower1_Frame0, + gTilesetAnims_Mauville_Flower1_Frame0, + gTilesetAnims_Mauville_Flower1_Frame1, + gTilesetAnims_Mauville_Flower1_Frame2, + gTilesetAnims_Mauville_Flower1_Frame3, + gTilesetAnims_Mauville_Flower1_Frame3, + gTilesetAnims_Mauville_Flower1_Frame3, + gTilesetAnims_Mauville_Flower1_Frame3, + gTilesetAnims_Mauville_Flower1_Frame3, + gTilesetAnims_Mauville_Flower1_Frame3, + gTilesetAnims_Mauville_Flower1_Frame2, + gTilesetAnims_Mauville_Flower1_Frame1 }; -const u16 *const gTilesetAnims_Mauville0b[] = { - gTilesetAnims_Mauville0b_Frame0, - gTilesetAnims_Mauville0b_Frame0, - gTilesetAnims_Mauville0b_Frame1, - gTilesetAnims_Mauville0b_Frame2, - gTilesetAnims_Mauville0b_Frame3, - gTilesetAnims_Mauville0b_Frame3, - gTilesetAnims_Mauville0b_Frame3, - gTilesetAnims_Mauville0b_Frame3, - gTilesetAnims_Mauville0b_Frame3, - gTilesetAnims_Mauville0b_Frame3, - gTilesetAnims_Mauville0b_Frame2, - gTilesetAnims_Mauville0b_Frame1 +const u16 *const gTilesetAnims_Mauville_Flower2[] = { + gTilesetAnims_Mauville_Flower2_Frame0, + gTilesetAnims_Mauville_Flower2_Frame0, + gTilesetAnims_Mauville_Flower2_Frame1, + gTilesetAnims_Mauville_Flower2_Frame2, + gTilesetAnims_Mauville_Flower2_Frame3, + gTilesetAnims_Mauville_Flower2_Frame3, + gTilesetAnims_Mauville_Flower2_Frame3, + gTilesetAnims_Mauville_Flower2_Frame3, + gTilesetAnims_Mauville_Flower2_Frame3, + gTilesetAnims_Mauville_Flower2_Frame3, + gTilesetAnims_Mauville_Flower2_Frame2, + gTilesetAnims_Mauville_Flower2_Frame1 }; -const u16 *const gTilesetAnims_Mauville1a[] = { - gTilesetAnims_Mauville0a_Frame0, - gTilesetAnims_Mauville0a_Frame0, - gTilesetAnims_Mauville1a_Frame1, - gTilesetAnims_Mauville1a_Frame1 +const u16 *const gTilesetAnims_Mauville_Flower1_B[] = { + gTilesetAnims_Mauville_Flower1_Frame0, + gTilesetAnims_Mauville_Flower1_Frame0, + gTilesetAnims_Mauville_Flower1_Frame4, + gTilesetAnims_Mauville_Flower1_Frame4 }; -const u16 *const gTilesetAnims_Mauville1b[] = { - gTilesetAnims_Mauville0b_Frame0, - gTilesetAnims_Mauville0b_Frame0, - gTilesetAnims_Mauville1b_Frame1, - gTilesetAnims_Mauville1b_Frame1 +const u16 *const gTilesetAnims_Mauville_Flower2_B[] = { + gTilesetAnims_Mauville_Flower2_Frame0, + gTilesetAnims_Mauville_Flower2_Frame0, + gTilesetAnims_Mauville_Flower2_Frame4, + gTilesetAnims_Mauville_Flower2_Frame4 }; -const u16 gTilesetAnims_Rustboro0_Frame0[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/0.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame0[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/0.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame1[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/1.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame2[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/2.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame3[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/3.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame4[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/4.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame5[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/5.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame6[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/6.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame7[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/7.4bpp"); -const u16 gTilesetAnims_Rustboro0_Frame1[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/1.4bpp"); - -const u16 gTilesetAnims_Rustboro0_Frame2[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/2.4bpp"); - -const u16 gTilesetAnims_Rustboro0_Frame3[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/3.4bpp"); - -const u16 gTilesetAnims_Rustboro0_Frame4[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/4.4bpp"); - -const u16 gTilesetAnims_Rustboro0_Frame5[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/5.4bpp"); - -const u16 gTilesetAnims_Rustboro0_Frame6[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/6.4bpp"); - -const u16 gTilesetAnims_Rustboro0_Frame7[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/7.4bpp"); - -u16 *const gTilesetAnims_RustboroVDests0[] = { +u16 *const gTilesetAnims_Rustboro_WindyWater_VDests[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 128)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 132)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 136)), @@ -315,72 +302,54 @@ u16 *const gTilesetAnims_RustboroVDests0[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 156)) }; -const u16 *const gTilesetAnims_Rustboro0[] = { - gTilesetAnims_Rustboro0_Frame0, - gTilesetAnims_Rustboro0_Frame1, - gTilesetAnims_Rustboro0_Frame2, - gTilesetAnims_Rustboro0_Frame3, - gTilesetAnims_Rustboro0_Frame4, - gTilesetAnims_Rustboro0_Frame5, - gTilesetAnims_Rustboro0_Frame6, - gTilesetAnims_Rustboro0_Frame7 +const u16 *const gTilesetAnims_Rustboro_WindyWater[] = { + gTilesetAnims_Rustboro_WindyWater_Frame0, + gTilesetAnims_Rustboro_WindyWater_Frame1, + gTilesetAnims_Rustboro_WindyWater_Frame2, + gTilesetAnims_Rustboro_WindyWater_Frame3, + gTilesetAnims_Rustboro_WindyWater_Frame4, + gTilesetAnims_Rustboro_WindyWater_Frame5, + gTilesetAnims_Rustboro_WindyWater_Frame6, + gTilesetAnims_Rustboro_WindyWater_Frame7 }; -const u16 gTilesetAnims_Rustboro1_Frame0[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/1/0.4bpp"); - -const u16 gTilesetAnims_Rustboro1_Frame1[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/1/1.4bpp"); - +const u16 gTilesetAnims_Rustboro_Fountain_Frame0[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/fountain/0.4bpp"); +const u16 gTilesetAnims_Rustboro_Fountain_Frame1[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/fountain/1.4bpp"); const u16 tileset_anims_space_2[16] = {}; -const u16 *const gTilesetAnims_Rustboro1[] = { - gTilesetAnims_Rustboro1_Frame0, - gTilesetAnims_Rustboro1_Frame1 +const u16 *const gTilesetAnims_Rustboro_Fountain[] = { + gTilesetAnims_Rustboro_Fountain_Frame0, + gTilesetAnims_Rustboro_Fountain_Frame1 }; -const u16 gTilesetAnims_Lavaridge1_Cave0_Frame0[] = INCBIN_U16("data/tilesets/secondary/cave/anim/0.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_Cave0_Frame1[] = INCBIN_U16("data/tilesets/secondary/cave/anim/1.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_Cave0_Frame2[] = INCBIN_U16("data/tilesets/secondary/cave/anim/2.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_Cave0_Frame3[] = INCBIN_U16("data/tilesets/secondary/cave/anim/3.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_CaveUnused_Frame0[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/0.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_CaveUnused_Frame1[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/1.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_CaveUnused_Frame2[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/2.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_CaveUnused_Frame3[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/3.4bpp"); - +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame0[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/0.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame1[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/1.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame2[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/2.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame3[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/3.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame4[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/4.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame5[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/5.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame6[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/6.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame7[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/7.4bpp"); const u16 tileset_anims_space_3[16] = {}; -const u16 *const gTilesetAnims_Lavaridge1_Cave0[] = { - gTilesetAnims_Lavaridge1_Cave0_Frame0, - gTilesetAnims_Lavaridge1_Cave0_Frame1, - gTilesetAnims_Lavaridge1_Cave0_Frame2, - gTilesetAnims_Lavaridge1_Cave0_Frame3 +const u16 *const gTilesetAnims_Lavaridge_Cave_Lava[] = { + gTilesetAnims_Lavaridge_Cave_Lava_Frame0, + gTilesetAnims_Lavaridge_Cave_Lava_Frame1, + gTilesetAnims_Lavaridge_Cave_Lava_Frame2, + gTilesetAnims_Lavaridge_Cave_Lava_Frame3 }; -const u16 gTilesetAnims_EverGrande0_Frame0[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/0.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame1[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/1.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame2[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/2.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame3[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/3.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame4[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/4.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame5[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/5.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame6[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/6.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame7[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/7.4bpp"); - +const u16 gTilesetAnims_EverGrande_Flowers_Frame0[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/0.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame1[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/1.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame2[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/2.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame3[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/3.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame4[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/4.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame5[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/5.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame6[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/6.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame7[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/7.4bpp"); const u16 tileset_anims_space_4[16] = {}; -u16 *const gTilesetAnims_EverGrandeVDests0[] = { +u16 *const gTilesetAnims_EverGrande_VDests[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 224)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 228)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 232)), @@ -391,243 +360,190 @@ u16 *const gTilesetAnims_EverGrandeVDests0[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 252)) }; -const u16 *const gTilesetAnims_EverGrande0[] = { - gTilesetAnims_EverGrande0_Frame0, - gTilesetAnims_EverGrande0_Frame1, - gTilesetAnims_EverGrande0_Frame2, - gTilesetAnims_EverGrande0_Frame3, - gTilesetAnims_EverGrande0_Frame4, - gTilesetAnims_EverGrande0_Frame5, - gTilesetAnims_EverGrande0_Frame6, - gTilesetAnims_EverGrande0_Frame7 +const u16 *const gTilesetAnims_EverGrande_Flowers[] = { + gTilesetAnims_EverGrande_Flowers_Frame0, + gTilesetAnims_EverGrande_Flowers_Frame1, + gTilesetAnims_EverGrande_Flowers_Frame2, + gTilesetAnims_EverGrande_Flowers_Frame3, + gTilesetAnims_EverGrande_Flowers_Frame4, + gTilesetAnims_EverGrande_Flowers_Frame5, + gTilesetAnims_EverGrande_Flowers_Frame6, + gTilesetAnims_EverGrande_Flowers_Frame7 }; -const u16 gTilesetAnims_Dewford0_Frame0[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/0.4bpp"); +const u16 gTilesetAnims_Dewford_Flag_Frame0[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/flag/0.4bpp"); +const u16 gTilesetAnims_Dewford_Flag_Frame1[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/flag/1.4bpp"); +const u16 gTilesetAnims_Dewford_Flag_Frame2[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/flag/2.4bpp"); +const u16 gTilesetAnims_Dewford_Flag_Frame3[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/flag/3.4bpp"); -const u16 gTilesetAnims_Dewford0_Frame1[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/1.4bpp"); - -const u16 gTilesetAnims_Dewford0_Frame2[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/2.4bpp"); - -const u16 gTilesetAnims_Dewford0_Frame3[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/3.4bpp"); - -const u16 *const gTilesetAnims_Dewford0[] = { - gTilesetAnims_Dewford0_Frame0, - gTilesetAnims_Dewford0_Frame1, - gTilesetAnims_Dewford0_Frame2, - gTilesetAnims_Dewford0_Frame3 +const u16 *const gTilesetAnims_Dewford_Flag[] = { + gTilesetAnims_Dewford_Flag_Frame0, + gTilesetAnims_Dewford_Flag_Frame1, + gTilesetAnims_Dewford_Flag_Frame2, + gTilesetAnims_Dewford_Flag_Frame3 }; -const u16 gTilesetAnims_BattleFrontierOutsideWest0_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/0.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame3[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.4bpp"); -const u16 gTilesetAnims_BattleFrontierOutsideWest0_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/1.4bpp"); - -const u16 gTilesetAnims_BattleFrontierOutsideWest0_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/2.4bpp"); - -const u16 gTilesetAnims_BattleFrontierOutsideWest0_Frame3[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/3.4bpp"); - -const u16 *const gTilesetAnims_BattleFrontierOutsideWest0[] = { - gTilesetAnims_BattleFrontierOutsideWest0_Frame0, - gTilesetAnims_BattleFrontierOutsideWest0_Frame1, - gTilesetAnims_BattleFrontierOutsideWest0_Frame2, - gTilesetAnims_BattleFrontierOutsideWest0_Frame3 +const u16 *const gTilesetAnims_BattleFrontierOutsideWest_Flag[] = { + gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame0, + gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame1, + gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame2, + gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame3 }; -const u16 gTilesetAnims_BattleFrontierOutsideEast0_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/0.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame3[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.4bpp"); -const u16 gTilesetAnims_BattleFrontierOutsideEast0_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/1.4bpp"); - -const u16 gTilesetAnims_BattleFrontierOutsideEast0_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/2.4bpp"); - -const u16 gTilesetAnims_BattleFrontierOutsideEast0_Frame3[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/3.4bpp"); - -const u16 *const gTilesetAnims_BattleFrontierOutsideEast0[] = { - gTilesetAnims_BattleFrontierOutsideEast0_Frame0, - gTilesetAnims_BattleFrontierOutsideEast0_Frame1, - gTilesetAnims_BattleFrontierOutsideEast0_Frame2, - gTilesetAnims_BattleFrontierOutsideEast0_Frame3 +const u16 *const gTilesetAnims_BattleFrontierOutsideEast_Flag[] = { + gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame0, + gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame1, + gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame2, + gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame3 }; -const u16 gTilesetAnims_Slateport0_Frame0[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/0.4bpp"); +const u16 gTilesetAnims_Slateport_Balloons_Frame0[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/balloons/0.4bpp"); +const u16 gTilesetAnims_Slateport_Balloons_Frame1[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/balloons/1.4bpp"); +const u16 gTilesetAnims_Slateport_Balloons_Frame2[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/balloons/2.4bpp"); +const u16 gTilesetAnims_Slateport_Balloons_Frame3[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/balloons/3.4bpp"); -const u16 gTilesetAnims_Slateport0_Frame1[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/1.4bpp"); - -const u16 gTilesetAnims_Slateport0_Frame2[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/2.4bpp"); - -const u16 gTilesetAnims_Slateport0_Frame3[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/3.4bpp"); - -const u16 *const gTilesetAnims_Slateport0[] = { - gTilesetAnims_Slateport0_Frame0, - gTilesetAnims_Slateport0_Frame1, - gTilesetAnims_Slateport0_Frame2, - gTilesetAnims_Slateport0_Frame3 +const u16 *const gTilesetAnims_Slateport_Balloons[] = { + gTilesetAnims_Slateport_Balloons_Frame0, + gTilesetAnims_Slateport_Balloons_Frame1, + gTilesetAnims_Slateport_Balloons_Frame2, + gTilesetAnims_Slateport_Balloons_Frame3 }; -const u16 gTilesetAnims_InsideBuilding0_Frame0[] = INCBIN_U16("data/tilesets/primary/building/anim/0.4bpp"); +const u16 gTilesetAnims_Building_TvTurnedOn_Frame0[] = INCBIN_U16("data/tilesets/primary/building/anim/tv_turned_on/0.4bpp"); +const u16 gTilesetAnims_Building_TvTurnedOn_Frame1[] = INCBIN_U16("data/tilesets/primary/building/anim/tv_turned_on/1.4bpp"); -const u16 gTilesetAnims_InsideBuilding0_Frame1[] = INCBIN_U16("data/tilesets/primary/building/anim/1.4bpp"); - -const u16 *const gTilesetAnims_InsideBuilding0[] = { - gTilesetAnims_InsideBuilding0_Frame0, - gTilesetAnims_InsideBuilding0_Frame1 +const u16 *const gTilesetAnims_Building_TvTurnedOn[] = { + gTilesetAnims_Building_TvTurnedOn_Frame0, + gTilesetAnims_Building_TvTurnedOn_Frame1 }; -const u16 gTilesetAnims_SootopolisGym0_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/0/0.4bpp"); +const u16 gTilesetAnims_SootopolisGym_SideWaterfall_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.4bpp"); +const u16 gTilesetAnims_SootopolisGym_SideWaterfall_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.4bpp"); +const u16 gTilesetAnims_SootopolisGym_SideWaterfall_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.4bpp"); +const u16 gTilesetAnims_SootopolisGym_FrontWaterfall_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.4bpp"); +const u16 gTilesetAnims_SootopolisGym_FrontWaterfall_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.4bpp"); +const u16 gTilesetAnims_SootopolisGym_FrontWaterfall_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.4bpp"); -const u16 gTilesetAnims_SootopolisGym0_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/0/1.4bpp"); - -const u16 gTilesetAnims_SootopolisGym0_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/0/2.4bpp"); - -const u16 gTilesetAnims_SootopolisGym1_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/1/0.4bpp"); - -const u16 gTilesetAnims_SootopolisGym1_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/1/1.4bpp"); - -const u16 gTilesetAnims_SootopolisGym1_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/1/2.4bpp"); - -const u16 *const gTilesetAnims_SootopolisGym0[] = { - gTilesetAnims_SootopolisGym0_Frame0, - gTilesetAnims_SootopolisGym0_Frame1, - gTilesetAnims_SootopolisGym0_Frame2 +const u16 *const gTilesetAnims_SootopolisGym_SideWaterfall[] = { + gTilesetAnims_SootopolisGym_SideWaterfall_Frame0, + gTilesetAnims_SootopolisGym_SideWaterfall_Frame1, + gTilesetAnims_SootopolisGym_SideWaterfall_Frame2 }; -const u16 *const gTilesetAnims_SootopolisGym1[] = { - gTilesetAnims_SootopolisGym1_Frame0, - gTilesetAnims_SootopolisGym1_Frame1, - gTilesetAnims_SootopolisGym1_Frame2 +const u16 *const gTilesetAnims_SootopolisGym_FrontWaterfall[] = { + gTilesetAnims_SootopolisGym_FrontWaterfall_Frame0, + gTilesetAnims_SootopolisGym_FrontWaterfall_Frame1, + gTilesetAnims_SootopolisGym_FrontWaterfall_Frame2 }; -const u16 gTilesetAnims_EliteFour0_Frame0[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/1/0.4bpp"); - -const u16 gTilesetAnims_EliteFour0_Frame1[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/1/1.4bpp"); - -const u16 gTilesetAnims_EliteFour1_Frame0[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/0.4bpp"); - -const u16 gTilesetAnims_EliteFour1_Frame1[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/1.4bpp"); - -const u16 gTilesetAnims_EliteFour1_Frame2[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/2.4bpp"); - -const u16 gTilesetAnims_EliteFour1_Frame3[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/3.4bpp"); - +const u16 gTilesetAnims_EliteFour_FloorLight_Frame0[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/floor_light/0.4bpp"); +const u16 gTilesetAnims_EliteFour_FloorLight_Frame1[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/floor_light/1.4bpp"); +const u16 gTilesetAnims_EliteFour_WallLights_Frame0[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/wall_lights/0.4bpp"); +const u16 gTilesetAnims_EliteFour_WallLights_Frame1[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/wall_lights/1.4bpp"); +const u16 gTilesetAnims_EliteFour_WallLights_Frame2[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/wall_lights/2.4bpp"); +const u16 gTilesetAnims_EliteFour_WallLights_Frame3[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/wall_lights/3.4bpp"); const u16 tileset_anims_space_5[16] = {}; -const u16 *const gTilesetAnims_EliteFour1[] = { - gTilesetAnims_EliteFour1_Frame0, - gTilesetAnims_EliteFour1_Frame1, - gTilesetAnims_EliteFour1_Frame2, - gTilesetAnims_EliteFour1_Frame3 +const u16 *const gTilesetAnims_EliteFour_WallLights[] = { + gTilesetAnims_EliteFour_WallLights_Frame0, + gTilesetAnims_EliteFour_WallLights_Frame1, + gTilesetAnims_EliteFour_WallLights_Frame2, + gTilesetAnims_EliteFour_WallLights_Frame3 }; -const u16 *const gTilesetAnims_EliteFour0[] = { - gTilesetAnims_EliteFour0_Frame0, - gTilesetAnims_EliteFour0_Frame1 +const u16 *const gTilesetAnims_EliteFour_FloorLight[] = { + gTilesetAnims_EliteFour_FloorLight_Frame0, + gTilesetAnims_EliteFour_FloorLight_Frame1 }; -const u16 gTilesetAnims_MauvilleGym0_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/anim/0.4bpp"); - -const u16 gTilesetAnims_MauvilleGym0_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/anim/1.4bpp"); - +const u16 gTilesetAnims_MauvilleGym_ElectricGates_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/anim/electric_gates/0.4bpp"); +const u16 gTilesetAnims_MauvilleGym_ElectricGates_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/anim/electric_gates/1.4bpp"); const u16 tileset_anims_space_6[16] = {}; -const u16 *const gTilesetAnims_MauvilleGym0[] = { - gTilesetAnims_MauvilleGym0_Frame0, - gTilesetAnims_MauvilleGym0_Frame1 +const u16 *const gTilesetAnims_MauvilleGym_ElectricGates[] = { + gTilesetAnims_MauvilleGym_ElectricGates_Frame0, + gTilesetAnims_MauvilleGym_ElectricGates_Frame1 }; -const u16 gTilesetAnims_BikeShop0_Frame0[] = INCBIN_U16("data/tilesets/secondary/bike_shop/anim/0.4bpp"); - -const u16 gTilesetAnims_BikeShop0_Frame1[] = INCBIN_U16("data/tilesets/secondary/bike_shop/anim/1.4bpp"); - +const u16 gTilesetAnims_BikeShop_BlinkingLights_Frame0[] = INCBIN_U16("data/tilesets/secondary/bike_shop/anim/blinking_lights/0.4bpp"); +const u16 gTilesetAnims_BikeShop_BlinkingLights_Frame1[] = INCBIN_U16("data/tilesets/secondary/bike_shop/anim/blinking_lights/1.4bpp"); const u16 tileset_anims_space_7[16] = {}; -const u16 *const gTilesetAnims_BikeShop0[] = { - gTilesetAnims_BikeShop0_Frame0, - gTilesetAnims_BikeShop0_Frame1 +const u16 *const gTilesetAnims_BikeShop_BlinkingLights[] = { + gTilesetAnims_BikeShop_BlinkingLights_Frame0, + gTilesetAnims_BikeShop_BlinkingLights_Frame1 }; -const u16 gTilesetAnims_Sootopolis0_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/0.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/1.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/2.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame3[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/3.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/4.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame5[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/5.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame6[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/6.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame7[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/7.4bpp"); - +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/0.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/1.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/2.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame3[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/3.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/4.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame5[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/5.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame6[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/6.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame7[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/7.4bpp"); const u16 tileset_anims_space_8[16] = {}; const u16 gTilesetAnims_Unused1_Frame0[] = INCBIN_U16("data/tilesets/secondary/unused_1/0.4bpp"); - const u16 gTilesetAnims_Unused1_Frame1[] = INCBIN_U16("data/tilesets/secondary/unused_1/1.4bpp"); - const u16 gTilesetAnims_Unused1_Frame2[] = INCBIN_U16("data/tilesets/secondary/unused_1/2.4bpp"); - const u16 gTilesetAnims_Unused1_Frame3[] = INCBIN_U16("data/tilesets/secondary/unused_1/3.4bpp"); -const u16 *const gTilesetAnims_Sootopolis0[] = { - gTilesetAnims_Sootopolis0_Frame0, - gTilesetAnims_Sootopolis0_Frame1, - gTilesetAnims_Sootopolis0_Frame2, - gTilesetAnims_Sootopolis0_Frame3, - gTilesetAnims_Sootopolis0_Frame4, - gTilesetAnims_Sootopolis0_Frame5, - gTilesetAnims_Sootopolis0_Frame6, - gTilesetAnims_Sootopolis0_Frame7 +const u16 *const gTilesetAnims_Sootopolis_StormyWater[] = { + gTilesetAnims_Sootopolis_StormyWater_Frame0, + gTilesetAnims_Sootopolis_StormyWater_Frame1, + gTilesetAnims_Sootopolis_StormyWater_Frame2, + gTilesetAnims_Sootopolis_StormyWater_Frame3, + gTilesetAnims_Sootopolis_StormyWater_Frame4, + gTilesetAnims_Sootopolis_StormyWater_Frame5, + gTilesetAnims_Sootopolis_StormyWater_Frame6, + gTilesetAnims_Sootopolis_StormyWater_Frame7 }; -const u16 gTilesetAnims_BattlePyramid0_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/0/0.4bpp"); - -const u16 gTilesetAnims_BattlePyramid0_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/0/1.4bpp"); - -const u16 gTilesetAnims_BattlePyramid0_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/0/2.4bpp"); - +const u16 gTilesetAnims_BattlePyramid_Torch_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/torch/0.4bpp"); +const u16 gTilesetAnims_BattlePyramid_Torch_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/torch/1.4bpp"); +const u16 gTilesetAnims_BattlePyramid_Torch_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/torch/2.4bpp"); const u16 tileset_anims_space_9[16] = {}; -const u16 gTilesetAnims_BattlePyramid1_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/1/0.4bpp"); - -const u16 gTilesetAnims_BattlePyramid1_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/1/1.4bpp"); - -const u16 gTilesetAnims_BattlePyramid1_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/1/2.4bpp"); - +const u16 gTilesetAnims_BattlePyramid_StatueShadow_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.4bpp"); +const u16 gTilesetAnims_BattlePyramid_StatueShadow_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.4bpp"); +const u16 gTilesetAnims_BattlePyramid_StatueShadow_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.4bpp"); const u16 tileset_anims_space_10[7808] = {}; const u16 gTilesetAnims_Unused2_Frame0[] = INCBIN_U16("data/tilesets/secondary/unused_2/0.4bpp"); - const u16 tileset_anims_space_11[224] = {}; const u16 gTilesetAnims_Unused2_Frame1[] = INCBIN_U16("data/tilesets/secondary/unused_2/1.4bpp"); -const u16 *const gTilesetAnims_BattlePyramid0[] = { - gTilesetAnims_BattlePyramid0_Frame0, - gTilesetAnims_BattlePyramid0_Frame1, - gTilesetAnims_BattlePyramid0_Frame2 +const u16 *const gTilesetAnims_BattlePyramid_Torch[] = { + gTilesetAnims_BattlePyramid_Torch_Frame0, + gTilesetAnims_BattlePyramid_Torch_Frame1, + gTilesetAnims_BattlePyramid_Torch_Frame2 }; -const u16 *const gTilesetAnims_BattlePyramid1[] = { - gTilesetAnims_BattlePyramid1_Frame0, - gTilesetAnims_BattlePyramid1_Frame1, - gTilesetAnims_BattlePyramid1_Frame2 +const u16 *const gTilesetAnims_BattlePyramid_StatueShadow[] = { + gTilesetAnims_BattlePyramid_StatueShadow_Frame0, + gTilesetAnims_BattlePyramid_StatueShadow_Frame1, + gTilesetAnims_BattlePyramid_StatueShadow_Frame2 }; -extern const u16 gTilesetAnims_BattleDomePals0_0[]; -extern const u16 gTilesetAnims_BattleDomePals0_1[]; -extern const u16 gTilesetAnims_BattleDomePals0_2[]; -extern const u16 gTilesetAnims_BattleDomePals0_3[]; - -static const u16 *const gTilesetAnims_BattleDomePals0[] = { +static const u16 *const gTilesetAnims_BattleDomeFloorLightPals[] = { gTilesetAnims_BattleDomePals0_0, gTilesetAnims_BattleDomePals0_1, gTilesetAnims_BattleDomePals0_2, gTilesetAnims_BattleDomePals0_3, }; -// .text - static void ResetTilesetAnimBuffer(void) { sTilesetDMA3TransferBufferSize = 0; @@ -650,763 +566,623 @@ void TransferTilesetAnimsBuffer(void) int i; for (i = 0; i < sTilesetDMA3TransferBufferSize; i ++) - { DmaCopy16(3, sTilesetDMA3TransferBuffer[i].src, sTilesetDMA3TransferBuffer[i].dest, sTilesetDMA3TransferBuffer[i].size); - } + sTilesetDMA3TransferBufferSize = 0; } -void cur_mapheader_run_tileset_funcs_after_some_cpuset(void) +void InitTilesetAnimations(void) { ResetTilesetAnimBuffer(); - cur_mapheader_run_tileset1_func(); - cur_mapheader_run_tileset2_func(); + _InitPrimaryTilesetAnimation(); + _InitSecondaryTilesetAnimation(); } -void sub_80A0A2C(void) +void InitSecondaryTilesetAnimation(void) { - cur_mapheader_run_tileset2_func(); + _InitSecondaryTilesetAnimation(); } -void sub_80A0A38(void) +void UpdateTilesetAnimations(void) { ResetTilesetAnimBuffer(); - if (++sPrimaryTilesetCBCounter >= sPrimaryTilesetCBBufferSize) - sPrimaryTilesetCBCounter = 0; - if (++sSecondaryTilesetCBCounter >= sSecondaryTilesetCBBufferSize) - sSecondaryTilesetCBCounter = 0; - if (sPrimaryTilesetCB) - sPrimaryTilesetCB(sPrimaryTilesetCBCounter); - if (sSecondaryTilesetCB) - sSecondaryTilesetCB(sSecondaryTilesetCBCounter); + if (++sPrimaryTilesetAnimCounter >= sPrimaryTilesetAnimCounterMax) + sPrimaryTilesetAnimCounter = 0; + if (++sSecondaryTilesetAnimCounter >= sSecondaryTilesetAnimCounterMax) + sSecondaryTilesetAnimCounter = 0; + + if (sPrimaryTilesetAnimCallback) + sPrimaryTilesetAnimCallback(sPrimaryTilesetAnimCounter); + if (sSecondaryTilesetAnimCallback) + sSecondaryTilesetAnimCallback(sSecondaryTilesetAnimCounter); } -static void cur_mapheader_run_tileset1_func(void) +static void _InitPrimaryTilesetAnimation(void) { - sPrimaryTilesetCBCounter = 0; - sPrimaryTilesetCBBufferSize = 0; - sPrimaryTilesetCB = NULL; + sPrimaryTilesetAnimCounter = 0; + sPrimaryTilesetAnimCounterMax = 0; + sPrimaryTilesetAnimCallback = NULL; if (gMapHeader.mapLayout->primaryTileset && gMapHeader.mapLayout->primaryTileset->callback) gMapHeader.mapLayout->primaryTileset->callback(); } -static void cur_mapheader_run_tileset2_func(void) +static void _InitSecondaryTilesetAnimation(void) { - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = 0; - sSecondaryTilesetCB = NULL; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = 0; + sSecondaryTilesetAnimCallback = NULL; if (gMapHeader.mapLayout->secondaryTileset && gMapHeader.mapLayout->secondaryTileset->callback) gMapHeader.mapLayout->secondaryTileset->callback(); } -void TilesetCb_General(void) +void InitTilesetAnim_General(void) { - static void sub_80A0B70(u16); - - sPrimaryTilesetCBCounter = 0; - sPrimaryTilesetCBBufferSize = 0x100; - sPrimaryTilesetCB = sub_80A0B70; + sPrimaryTilesetAnimCounter = 0; + sPrimaryTilesetAnimCounterMax = 256; + sPrimaryTilesetAnimCallback = TilesetAnim_General; } -void TilesetCb_InsideBuilding(void) +void InitTilesetAnim_Building(void) { - static void sub_80A0BB4(u16); - - sPrimaryTilesetCBCounter = 0; - sPrimaryTilesetCBBufferSize = 0x100; - sPrimaryTilesetCB = sub_80A0BB4; + sPrimaryTilesetAnimCounter = 0; + sPrimaryTilesetAnimCounterMax = 256; + sPrimaryTilesetAnimCallback = TilesetAnim_Building; } -static void sub_80A0B70(u16 timer) +static void TilesetAnim_General(u16 timer) { - static void gTilesetAnims_Flower(u16); - static void gTilesetAnims_Water(u16); - static void gTilesetAnims_SandWaterEdge(u16); - static void gTilesetAnims_Waterfall(u16); - static void gTilesetAnims_LandWaterEdge (u16); - - if ((timer & 0x0F) == 0) - gTilesetAnims_Flower(timer >> 4); - if ((timer & 0x0F) == 1) - gTilesetAnims_Water(timer >> 4); - if ((timer & 0x0F) == 2) - gTilesetAnims_SandWaterEdge(timer >> 4); - if ((timer & 0x0F) == 3) - gTilesetAnims_Waterfall(timer >> 4); - if ((timer & 0x0F) == 4) - gTilesetAnims_LandWaterEdge (timer >> 4); + if (timer % 16 == 0) + QueueAnimTiles_General_Flower(timer >> 4); + if (timer % 16 == 1) + QueueAnimTiles_General_Water(timer >> 4); + if (timer % 16 == 2) + QueueAnimTiles_General_SandWaterEdge(timer >> 4); + if (timer % 16 == 3) + QueueAnimTiles_General_Waterfall(timer >> 4); + if (timer % 16 == 4) + QueueAnimTiles_General_LandWaterEdge(timer >> 4); } -static void sub_80A0BB4(u16 timer) +static void TilesetAnim_Building(u16 timer) { - static void sub_80A1688(u16); - - if ((timer & 0x7) == 0) - sub_80A1688(timer >> 3); + if (timer % 8 == 0) + QueueAnimTiles_Building_TVTurnedOn(timer >> 3); } -static void gTilesetAnims_Flower(u16 timer) +static void QueueAnimTiles_General_Flower(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_General0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(508)), 0x80); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_General_Flower[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(508)), 0x80); } -static void gTilesetAnims_Water(u16 timer) +static void QueueAnimTiles_General_Water(u16 timer) { - u8 idx; - - idx = timer % 8; - AppendTilesetAnimToBuffer(gTilesetAnims_General1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(432)), 0x3C0); + u8 i = timer % 8; + AppendTilesetAnimToBuffer(gTilesetAnims_General_Water[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(432)), 0x3C0); } -static void gTilesetAnims_SandWaterEdge(u16 timer) +static void QueueAnimTiles_General_SandWaterEdge(u16 timer) { - u16 idx; - - idx = timer % 8; - AppendTilesetAnimToBuffer(gTilesetAnims_General2[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 0x140); + u16 i = timer % 8; + AppendTilesetAnimToBuffer(gTilesetAnims_General_SandWaterEdge[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 0x140); } -static void gTilesetAnims_Waterfall(u16 timer) +static void QueueAnimTiles_General_Waterfall(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_General3[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(496)), 0xc0); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_General_Waterfall[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(496)), 0xc0); } -void TilesetCb_Petalburg(void) +void InitTilesetAnim_Petalburg(void) { - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = NULL; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = NULL; } -void TilesetCb_Rustboro(void) +void InitTilesetAnim_Rustboro(void) { - static void sub_80A103C(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A103C; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Rustboro; } -void TilesetCb_Dewford(void) +void InitTilesetAnim_Dewford(void) { - static void sub_80A10B8(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A10B8; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Dewford; } -void TilesetCb_Slateport(void) +void InitTilesetAnim_Slateport(void) { - static void sub_80A10D0(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A10D0; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Slateport; } -void TilesetCb_Mauville(void) +void InitTilesetAnim_Mauville(void) { - static void sub_80A10E8(u16); - - sSecondaryTilesetCBCounter = sPrimaryTilesetCBCounter; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A10E8; + sSecondaryTilesetAnimCounter = sPrimaryTilesetAnimCounter; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Mauville; } -void TilesetCb_Lavaridge(void) +void InitTilesetAnim_Lavaridge(void) { - static void sub_80A115C(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A115C; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Lavaridge; } -void TilesetCb_Fallarbor(void) +void InitTilesetAnim_Fallarbor(void) { - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = NULL; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = NULL; } -void TilesetCb_Fortree(void) +void InitTilesetAnim_Fortree(void) { - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = NULL; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = NULL; } -void TilesetCb_Lilycove(void) +void InitTilesetAnim_Lilycove(void) { - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = NULL; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = NULL; } -void TilesetCb_Mossdeep(void) +void InitTilesetAnim_Mossdeep(void) { - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = NULL; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = NULL; } -void TilesetCb_EverGrande(void) +void InitTilesetAnim_EverGrande(void) { - static void sub_80A1188(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A1188; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_EverGrande; } -void TilesetCb_Pacifidlog(void) +void InitTilesetAnim_Pacifidlog(void) { - static void sub_80A11FC(u16); - - sSecondaryTilesetCBCounter = sPrimaryTilesetCBCounter; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A11FC; + sSecondaryTilesetAnimCounter = sPrimaryTilesetAnimCounter; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Pacifidlog; } -void TilesetCb_Sootopolis(void) +void InitTilesetAnim_Sootopolis(void) { - static void sub_80A122C(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A122C; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Sootopolis; } -void TilesetCb_BattleFrontierOutsideWest(void) +void InitTilesetAnim_BattleFrontierOutsideWest(void) { - static void sub_80A127C(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A127C; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_BattleFrontierOutsideWest; } -void TilesetCb_BattleFrontierOutsideEast(void) +void InitTilesetAnim_BattleFrontierOutsideEast(void) { - static void sub_80A1294(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A1294; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_BattleFrontierOutsideEast; } -void TilesetCb_Underwater(void) +void InitTilesetAnim_Underwater(void) { - static void sub_80A1244(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = 128; - sSecondaryTilesetCB = sub_80A1244; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = 128; + sSecondaryTilesetAnimCallback = TilesetAnim_Underwater; } -void TilesetCb_SootopolisGym(void) +void InitTilesetAnim_SootopolisGym(void) { - static void sub_80A15D8(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = 240; - sSecondaryTilesetCB = sub_80A15D8; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = 240; + sSecondaryTilesetAnimCallback = TilesetAnim_SootopolisGym; } -void TilesetCb_Cave(void) +void InitTilesetAnim_Cave(void) { - static void sub_80A1260(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A1260; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Cave; } -void TilesetCb_EliteFour(void) +void InitTilesetAnim_EliteFour(void) { - static void sub_80A15F0(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = 128; - sSecondaryTilesetCB = sub_80A15F0; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = 128; + sSecondaryTilesetAnimCallback = TilesetAnim_EliteFour; } -void TilesetCb_MauvilleGym(void) +void InitTilesetAnim_MauvilleGym(void) { - static void sub_80A15C0(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A15C0; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_MauvilleGym; } -void TilesetCb_BikeShop(void) +void InitTilesetAnim_BikeShop(void) { - static void sub_80A161C(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A161C; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_BikeShop; } -void TilesetCb_BattlePyramid(void) +void InitTilesetAnim_BattlePyramid(void) { - static void sub_80A1634(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A1634; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_BattlePyramid; } -void TilesetCb_BattleDome(void) +void InitTilesetAnim_BattleDome(void) { - static void sub_80A1658(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A1658; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_BattleDome; } -static void sub_80A103C(u16 timer) +static void TilesetAnim_Rustboro(u16 timer) { - static void sub_80A1434(u16, u8); - static void sub_80A1470(u16); - - if ((timer & 0x07) == 0) + if (timer % 8 == 0) { - sub_80A1434(timer >> 3, 0); - sub_80A1470(timer >> 3); + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 0); + QueueAnimTiles_Rustboro_Fountain(timer >> 3); } - if ((timer & 0x07) == 1) - sub_80A1434(timer >> 3, 1); - if ((timer & 0x07) == 2) - sub_80A1434(timer >> 3, 2); - if ((timer & 0x07) == 3) - sub_80A1434(timer >> 3, 3); - if ((timer & 0x07) == 4) - sub_80A1434(timer >> 3, 4); - if ((timer & 0x07) == 5) - sub_80A1434(timer >> 3, 5); - if ((timer & 0x07) == 6) - sub_80A1434(timer >> 3, 6); - if ((timer & 0x07) == 7) - sub_80A1434(timer >> 3, 7); + if (timer % 8 == 1) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 1); + if (timer % 8 == 2) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 2); + if (timer % 8 == 3) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 3); + if (timer % 8 == 4) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 4); + if (timer % 8 == 5) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 5); + if (timer % 8 == 6) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 6); + if (timer % 8 == 7) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 7); } -static void sub_80A10B8(u16 timer) +static void TilesetAnim_Dewford(u16 timer) { - static void sub_80A1520(u16); - - if ((timer & 7) == 0) - sub_80A1520(timer >> 3); + if (timer % 8 == 0) + QueueAnimTiles_Dewford_Flag(timer >> 3); } -static void sub_80A10D0(u16 timer) +static void TilesetAnim_Slateport(u16 timer) { - static void sub_80A1598(u16); - - if ((timer & 15) == 0) - sub_80A1598(timer >> 4); + if (timer % 16 == 0) + QueueAnimTiles_Slateport_Balloons(timer >> 4); } -static void sub_80A10E8(u16 timer) +static void TilesetAnim_Mauville(u16 timer) { - static void sub_80A1394(u16, u8); - - if ((timer & 0x07) == 0) - sub_80A1394(timer >> 3, 0); - if ((timer & 0x07) == 1) - sub_80A1394(timer >> 3, 1); - if ((timer & 0x07) == 2) - sub_80A1394(timer >> 3, 2); - if ((timer & 0x07) == 3) - sub_80A1394(timer >> 3, 3); - if ((timer & 0x07) == 4) - sub_80A1394(timer >> 3, 4); - if ((timer & 0x07) == 5) - sub_80A1394(timer >> 3, 5); - if ((timer & 0x07) == 6) - sub_80A1394(timer >> 3, 6); - if ((timer & 0x07) == 7) - sub_80A1394(timer >> 3, 7); + if (timer % 8 == 0) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 0); + if (timer % 8 == 1) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 1); + if (timer % 8 == 2) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 2); + if (timer % 8 == 3) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 3); + if (timer % 8 == 4) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 4); + if (timer % 8 == 5) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 5); + if (timer % 8 == 6) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 6); + if (timer % 8 == 7) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 7); } -static void sub_80A115C(u16 timer) +static void TilesetAnim_Lavaridge(u16 timer) { - static void sub_80A12D4(u8); - static void sub_80A1498(u16); - - if ((timer & 0x0F) == 0) - sub_80A12D4(timer >> 4); - if ((timer & 0x0F) == 1) - sub_80A1498(timer >> 4); + if (timer % 16 == 0) + QueueAnimTiles_Lavaridge_Steam(timer >> 4); + if (timer % 16 == 1) + QueueAnimTiles_Lavaridge_Lava(timer >> 4); } -static void sub_80A1188(u16 timer) +static void TilesetAnim_EverGrande(u16 timer) { - static void sub_80A14C0(u16, u8); - - if ((timer & 0x07) == 0) - sub_80A14C0(timer >> 3, 0); - if ((timer & 0x07) == 1) - sub_80A14C0(timer >> 3, 1); - if ((timer & 0x07) == 2) - sub_80A14C0(timer >> 3, 2); - if ((timer & 0x07) == 3) - sub_80A14C0(timer >> 3, 3); - if ((timer & 0x07) == 4) - sub_80A14C0(timer >> 3, 4); - if ((timer & 0x07) == 5) - sub_80A14C0(timer >> 3, 5); - if ((timer & 0x07) == 6) - sub_80A14C0(timer >> 3, 6); - if ((timer & 0x07) == 7) - sub_80A14C0(timer >> 3, 7); + if (timer % 8 == 0) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 0); + if (timer % 8 == 1) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 1); + if (timer % 8 == 2) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 2); + if (timer % 8 == 3) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 3); + if (timer % 8 == 4) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 4); + if (timer % 8 == 5) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 5); + if (timer % 8 == 6) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 6); + if (timer % 8 == 7) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 7); } -static void sub_80A11FC(u16 timer) +static void TilesetAnim_Pacifidlog(u16 timer) { - static void sub_80A131C(u8); - static void sub_80A136C(u8); - - if ((timer & 0x0F) == 0) - sub_80A131C(timer >> 4); - if ((timer & 0x0F) == 1) - sub_80A136C(timer >> 4); + if (timer % 16 == 0) + QueueAnimTiles_Pacifidlog_LogBridges(timer >> 4); + if (timer % 16 == 1) + QueueAnimTiles_Pacifidlog_WaterCurrents(timer >> 4); } -static void sub_80A122C(u16 timer) +static void TilesetAnim_Sootopolis(u16 timer) { - static void sub_80A1798(u16); - - if ((timer & 0x0F) == 0) - sub_80A1798(timer >> 4); + if (timer % 16 == 0) + QueueAnimTiles_Sootopolis_StormyWater(timer >> 4); } -static void sub_80A1244(u16 timer) +static void TilesetAnim_Underwater(u16 timer) { - static void sub_80A1344(u8); - - if ((timer & 0x0F) == 0) - sub_80A1344(timer >> 4); + if (timer % 16 == 0) + QueueAnimTiles_Underwater_Seaweed(timer >> 4); } -static void sub_80A1260(u16 timer) +static void TilesetAnim_Cave(u16 timer) { - static void sub_80A14F8(u16); - - if ((timer & 0x0F) == 1) - sub_80A14F8(timer >> 4); + if (timer % 16 == 1) + QueueAnimTiles_Cave_Lava(timer >> 4); } -static void sub_80A127C(u16 timer) +static void TilesetAnim_BattleFrontierOutsideWest(u16 timer) { - static void sub_80A1548(u16); - - if ((timer & 0x07) == 0) - sub_80A1548(timer >> 3); + if (timer % 8 == 0) + QueueAnimTiles_BattleFrontierOutsideWest_Flag(timer >> 3); } -static void sub_80A1294(u16 timer) +static void TilesetAnim_BattleFrontierOutsideEast(u16 timer) { - static void sub_80A1570(u16); - - if ((timer & 0x07) == 0) - sub_80A1570(timer >> 3); + if (timer % 8 == 0) + QueueAnimTiles_BattleFrontierOutsideEast_Flag(timer >> 3); } -static void gTilesetAnims_LandWaterEdge (u16 timer) +static void QueueAnimTiles_General_LandWaterEdge(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_General4[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(480)), 0x140); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_General_LandWaterEdge[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(480)), 0x140); } -static void sub_80A12D4(u8 timer) +static void QueueAnimTiles_Lavaridge_Steam(u8 timer) { - u8 idx; + u8 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge_Steam[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 288)), 0x80); - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 288)), 0x80); - - idx = (timer + 2) % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 292)), 0x80); + i = (timer + 2) % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge_Steam[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 292)), 0x80); } -static void sub_80A131C(u8 timer) +static void QueueAnimTiles_Pacifidlog_LogBridges(u8 timer) { - u8 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 464)), 0x3C0); + u8 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog_LogBridges[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 464)), 0x3C0); } -static void sub_80A1344(u8 timer) +static void QueueAnimTiles_Underwater_Seaweed(u8 timer) { - u8 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Underwater0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x80); + u8 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Underwater_Seaweed[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x80); } -static void sub_80A136C(u8 timer) +static void QueueAnimTiles_Pacifidlog_WaterCurrents(u8 timer) { - u8 idx; - - idx = timer % 8; - AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x100); + u8 i = timer % 8; + AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog_WaterCurrents[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x100); } -static void sub_80A1394(u16 timer_div, u8 timer_mod) +static void QueueAnimTiles_Mauville_Flowers(u16 timer_div, u8 timer_mod) { timer_div -= timer_mod; if (timer_div < 12) // almost certainly a typo { timer_div %= 12; - AppendTilesetAnimToBuffer(gTilesetAnims_Mauville0a[timer_div], gTilesetAnims_MauvilleVDests0[timer_mod], 0x80); - AppendTilesetAnimToBuffer(gTilesetAnims_Mauville0b[timer_div], gTilesetAnims_MauvilleVDests1[timer_mod], 0x80); + AppendTilesetAnimToBuffer(gTilesetAnims_Mauville_Flower1[timer_div], gTilesetAnims_Mauville_Flower1_VDests[timer_mod], 0x80); + AppendTilesetAnimToBuffer(gTilesetAnims_Mauville_Flower2[timer_div], gTilesetAnims_Mauville_Flower2_VDests[timer_mod], 0x80); } else { timer_div %= 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Mauville1a[timer_div], gTilesetAnims_MauvilleVDests0[timer_mod], 0x80); - AppendTilesetAnimToBuffer(gTilesetAnims_Mauville1b[timer_div], gTilesetAnims_MauvilleVDests1[timer_mod], 0x80); + AppendTilesetAnimToBuffer(gTilesetAnims_Mauville_Flower1_B[timer_div], gTilesetAnims_Mauville_Flower1_VDests[timer_mod], 0x80); + AppendTilesetAnimToBuffer(gTilesetAnims_Mauville_Flower2_B[timer_div], gTilesetAnims_Mauville_Flower2_VDests[timer_mod], 0x80); } } -static void sub_80A1434(u16 timer_div, u8 timer_mod) +static void QueueAnimTiles_Rustboro_WindyWater(u16 timer_div, u8 timer_mod) { timer_div -= timer_mod; timer_div %= 8; - if (gTilesetAnims_Rustboro0[timer_div]) - AppendTilesetAnimToBuffer(gTilesetAnims_Rustboro0[timer_div], gTilesetAnims_RustboroVDests0[timer_mod], 0x80); + if (gTilesetAnims_Rustboro_WindyWater[timer_div]) + AppendTilesetAnimToBuffer(gTilesetAnims_Rustboro_WindyWater[timer_div], gTilesetAnims_Rustboro_WindyWater_VDests[timer_mod], 0x80); } -static void sub_80A1470(u16 timer) +static void QueueAnimTiles_Rustboro_Fountain(u16 timer) { - u16 idx; - - idx = timer % 2; - AppendTilesetAnimToBuffer(gTilesetAnims_Rustboro1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 448)), 0x80); + u16 i = timer % 2; + AppendTilesetAnimToBuffer(gTilesetAnims_Rustboro_Fountain[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 448)), 0x80); } -static void sub_80A1498(u16 timer) +static void QueueAnimTiles_Lavaridge_Lava(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge1_Cave0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 160)), 0x80); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge_Cave_Lava[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 160)), 0x80); } -static void sub_80A14C0(u16 timer_div, u8 timer_mod) +static void QueueAnimTiles_EverGrande_Flowers(u16 timer_div, u8 timer_mod) { timer_div -= timer_mod; timer_div %= 8; - AppendTilesetAnimToBuffer(gTilesetAnims_EverGrande0[timer_div], gTilesetAnims_EverGrandeVDests0[timer_mod], 0x80); + AppendTilesetAnimToBuffer(gTilesetAnims_EverGrande_Flowers[timer_div], gTilesetAnims_EverGrande_VDests[timer_mod], 0x80); } -static void sub_80A14F8(u16 timer) +static void QueueAnimTiles_Cave_Lava(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge1_Cave0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 416)), 0x80); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge_Cave_Lava[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 416)), 0x80); } -static void sub_80A1520(u16 timer) +static void QueueAnimTiles_Dewford_Flag(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Dewford0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 170)), 0xC0); + u16 id = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Dewford_Flag[id], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 170)), 0xC0); } -static void sub_80A1548(u16 timer) +static void QueueAnimTiles_BattleFrontierOutsideWest_Flag(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideWest0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 218)), 0xC0); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideWest_Flag[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 218)), 0xC0); } -static void sub_80A1570(u16 timer) +static void QueueAnimTiles_BattleFrontierOutsideEast_Flag(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideEast0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 218)), 0xC0); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideEast_Flag[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 218)), 0xC0); } -static void sub_80A1598(u16 timer) +static void QueueAnimTiles_Slateport_Balloons(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Slateport0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 224)), 0x80); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Slateport_Balloons[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 224)), 0x80); } -static void sub_80A15C0(u16 timer) +static void TilesetAnim_MauvilleGym(u16 timer) { - static void sub_80A1748(u16); - - if ((timer & 1) == 0) - sub_80A1748(timer >> 1); + if (timer % 2 == 0) + QueueAnimTiles_MauvilleGym_ElectricGates(timer >> 1); } -static void sub_80A15D8(u16 timer) +static void TilesetAnim_SootopolisGym(u16 timer) { - static void sub_80A16B0(u16); - - if ((timer & 7) == 0) - sub_80A16B0(timer >> 3); + if (timer % 8 == 0) + QueueAnimTiles_SootopolisGym_Waterfalls(timer >> 3); } -static void sub_80A15F0(u16 timer) +static void TilesetAnim_EliteFour(u16 timer) { - static void sub_80A1720(u16); - static void sub_80A16F8(u16); - - if ((timer & 0x3f) == 1) - sub_80A1720(timer >> 6); - if ((timer & 0x07) == 1) - sub_80A16F8(timer >> 3); -} -static void sub_80A161C(u16 timer) -{ - static void sub_80A1770(u16); - - if ((timer & 3) == 0) - sub_80A1770(timer >> 2); + if (timer % 64 == 1) + QueueAnimTiles_EliteFour_GroundLights(timer >> 6); + if (timer % 8 == 1) + QueueAnimTiles_EliteFour_WallLights(timer >> 3); } -static void sub_80A1634(u16 timer) +static void TilesetAnim_BikeShop(u16 timer) { - static void sub_80A17C0(u16); - static void sub_80A17EC(u16); + if (timer % 4 == 0) + QueueAnimTiles_BikeShop_BlinkingLights(timer >> 2); +} - if ((timer & 7) == 0) +static void TilesetAnim_BattlePyramid(u16 timer) +{ + if (timer % 8 == 0) { - sub_80A17C0(timer >> 3); - sub_80A17EC(timer >> 3); + QueueAnimTiles_BattlePyramid_Torch(timer >> 3); + QueueAnimTiles_BattlePyramid_StatueShadow(timer >> 3); } } -static void sub_80A1658(u16 timer) +static void TilesetAnim_BattleDome(u16 timer) { - static void sub_80A1818(u16); - - if ((timer & 3) == 0) - sub_80A1818(timer >> 2); + if (timer % 4 == 0) + BlendAnimPalette_BattleDome_FloorLights(timer >> 2); } -static void sub_80A1670(u16 timer) +static void TilesetAnim_BattleDome2(u16 timer) { - static void sub_80A1884(u16); - - if ((timer & 3) == 0) - sub_80A1884(timer >> 2); + if (timer % 4 == 0) + BlendAnimPalette_BattleDome_FloorLightsNoBlend(timer >> 2); } -static void sub_80A1688(u16 timer) +static void QueueAnimTiles_Building_TVTurnedOn(u16 timer) { - u16 idx; - - idx = timer % 2; - AppendTilesetAnimToBuffer(gTilesetAnims_InsideBuilding0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(496)), 0x80); + u16 i = timer % 2; + AppendTilesetAnimToBuffer(gTilesetAnims_Building_TvTurnedOn[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(496)), 0x80); } -static void sub_80A16B0(u16 timer) +static void QueueAnimTiles_SootopolisGym_Waterfalls(u16 timer) { - u16 idx; - - idx = timer % 3; - AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x180); - AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 464)), 0x280); + u16 i = timer % 3; + AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym_SideWaterfall[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x180); + AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym_FrontWaterfall[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 464)), 0x280); } -static void sub_80A16F8(u16 timer) +static void QueueAnimTiles_EliteFour_WallLights(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 504)), 0x20); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour_WallLights[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 504)), 0x20); } -static void sub_80A1720(u16 timer) +static void QueueAnimTiles_EliteFour_GroundLights(u16 timer) { - u16 idx; - - idx = timer % 2; - AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 480)), 0x80); + u16 i = timer % 2; + AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour_FloorLight[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 480)), 0x80); } -static void sub_80A1748(u16 timer) +static void QueueAnimTiles_MauvilleGym_ElectricGates(u16 timer) { - u16 idx; - - idx = timer % 2; - AppendTilesetAnimToBuffer(gTilesetAnims_MauvilleGym0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 144)), 0x200); + u16 i = timer % 2; + AppendTilesetAnimToBuffer(gTilesetAnims_MauvilleGym_ElectricGates[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 144)), 0x200); } -static void sub_80A1770(u16 timer) +static void QueueAnimTiles_BikeShop_BlinkingLights(u16 timer) { - u16 idx; - - idx = timer % 2; - AppendTilesetAnimToBuffer(gTilesetAnims_BikeShop0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x120); + u16 i = timer % 2; + AppendTilesetAnimToBuffer(gTilesetAnims_BikeShop_BlinkingLights[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x120); } -static void sub_80A1798(u16 timer) +static void QueueAnimTiles_Sootopolis_StormyWater(u16 timer) { - u16 idx; - - idx = timer % 8; - AppendTilesetAnimToBuffer(gTilesetAnims_Sootopolis0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 240)), 0xc00); + u16 i = timer % 8; + AppendTilesetAnimToBuffer(gTilesetAnims_Sootopolis_StormyWater[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 240)), 0xc00); } -static void sub_80A17C0(u16 timer) +static void QueueAnimTiles_BattlePyramid_Torch(u16 timer) { - u16 idx; - - idx = timer % 3; - AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 151)), 0x100); + u16 i = timer % 3; + AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid_Torch[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 151)), 0x100); } -static void sub_80A17EC(u16 timer) +static void QueueAnimTiles_BattlePyramid_StatueShadow(u16 timer) { - u16 idx; - - idx = timer % 3; - AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 135)), 0x100); + u16 i = timer % 3; + AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid_StatueShadow[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 135)), 0x100); } -static void sub_80A1818(u16 a1) +static void BlendAnimPalette_BattleDome_FloorLights(u16 timer) { - CpuCopy16(gTilesetAnims_BattleDomePals0[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32); - BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); + CpuCopy16(gTilesetAnims_BattleDomeFloorLightPals[timer % 4], gPlttBufferUnfaded + 0x80, 32); + BlendPalette(0x80, 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); if ((u8)FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) != 0xFF ) { - sSecondaryTilesetCB = sub_80A1670; - sSecondaryTilesetCBBufferSize = 0x20; + sSecondaryTilesetAnimCallback = TilesetAnim_BattleDome2; + sSecondaryTilesetAnimCounterMax = 32; } } -static void sub_80A1884(u16 a1) +static void BlendAnimPalette_BattleDome_FloorLightsNoBlend(u16 timer) { - CpuCopy16(gTilesetAnims_BattleDomePals0[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32); + CpuCopy16(gTilesetAnims_BattleDomeFloorLightPals[timer % 4], gPlttBufferUnfaded + 0x80, 32); if ((u8)FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == 0xFF ) { - BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); - if (!--sSecondaryTilesetCBBufferSize) - sSecondaryTilesetCB = NULL; + BlendPalette(0x80, 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); + if (!--sSecondaryTilesetAnimCounterMax) + sSecondaryTilesetAnimCallback = NULL; } } From 6f1d2b870c1426e7f405f3b3bc4ff2b9edb380e1 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 9 Feb 2019 09:57:30 -0600 Subject: [PATCH 029/217] Give proper names to dynamic map layouts --- data/event_scripts.s | 12 +- .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | Bin .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | 0 .../border.bin | Bin .../map.bin | Bin data/layouts/layouts.json | 304 +++++++++--------- .../scripts.inc | 4 +- data/maps/Route130/scripts.inc | 2 +- data/maps/Route131/scripts.inc | 2 +- data/maps/SkyPillar_1F/scripts.inc | 2 +- data/maps/SkyPillar_2F/scripts.inc | 2 +- data/maps/SkyPillar_3F/scripts.inc | 2 +- data/maps/SkyPillar_4F/scripts.inc | 2 +- data/maps/SkyPillar_5F/scripts.inc | 2 +- data/maps/SkyPillar_Top/scripts.inc | 2 +- data/maps/SootopolisCity/scripts.inc | 2 +- .../scripts.inc | 2 +- .../map.json | 4 +- .../scripts.inc | 0 .../map.json | 4 +- .../scripts.inc | 0 .../map.json | 4 +- .../scripts.inc | 0 .../map.json | 4 +- .../scripts.inc | 0 .../map.json | 4 +- .../scripts.inc | 0 .../map.json | 4 +- .../scripts.inc | 0 data/maps/map_groups.json | 12 +- include/constants/layouts.h | 76 ++--- src/battle_pike.c | 2 +- 104 files changed, 227 insertions(+), 227 deletions(-) rename data/layouts/{UnknownMap_0845A394 => CaveOfOrigin_Unused_B4F_Lava}/border.bin (100%) rename data/layouts/{UnknownMap_0845A394 => CaveOfOrigin_Unused_B4F_Lava}/map.bin (100%) rename data/layouts/{UnknownMap_08428450 => LittlerootTown_ProfessorBirchsLabWithTable}/border.bin (100%) rename data/layouts/{UnknownMap_08480DAC => LittlerootTown_ProfessorBirchsLabWithTable}/map.bin (100%) rename data/layouts/{UnknownMap_08417FC4 => Route130_MirageIsland}/border.bin (100%) rename data/layouts/{UnknownMap_08417FC4 => Route130_MirageIsland}/map.bin (100%) rename data/layouts/{UnknownMap_0845D470 => Route131_SkyPillar}/border.bin (100%) rename data/layouts/{UnknownMap_0845D470 => Route131_SkyPillar}/map.bin (100%) rename data/layouts/{UnknownMap_0845ECB4 => SeafloorCavern_Room9_Lava}/border.bin (100%) rename data/layouts/{UnknownMap_0845ECB4 => SeafloorCavern_Room9_Lava}/map.bin (100%) rename data/layouts/{UnknownMap_084294C4 => SkyPillar_1F_Clean}/border.bin (100%) rename data/layouts/{UnknownMap_08480F54 => SkyPillar_1F_Clean}/map.bin (100%) rename data/layouts/{UnknownMap_084294E8 => SkyPillar_2F_Clean}/border.bin (100%) rename data/layouts/{UnknownMap_084810FC => SkyPillar_2F_Clean}/map.bin (100%) rename data/layouts/{UnknownMap_08480DAC => SkyPillar_3F_Clean}/border.bin (100%) rename data/layouts/{UnknownMap_084812A4 => SkyPillar_3F_Clean}/map.bin (100%) rename data/layouts/{UnknownMap_08480F54 => SkyPillar_4F_Clean}/border.bin (100%) rename data/layouts/{UnknownMap_0848144C => SkyPillar_4F_Clean}/map.bin (100%) rename data/layouts/{UnknownMap_084810FC => SkyPillar_5F_Clean}/border.bin (100%) rename data/layouts/{UnknownMap_084815F4 => SkyPillar_5F_Clean}/map.bin (100%) rename data/layouts/{UnknownMap_08481B24 => SkyPillar_Top_Clean}/border.bin (100%) rename data/layouts/{UnknownMap_08481B24 => SkyPillar_Top_Clean}/map.bin (100%) rename data/layouts/{UnknownMap_08469200 => SootopolisCity_LegendsBattle}/border.bin (100%) rename data/layouts/{UnknownMap_08469200 => SootopolisCity_LegendsBattle}/map.bin (100%) rename data/layouts/{UnknownMap_084693AC => SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked}/border.bin (100%) rename data/layouts/{UnknownMap_08481DBC => SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked}/map.bin (100%) rename data/layouts/{UnknownMap_084812A4 => UnknownLinkContestRoom_25_29}/border.bin (100%) rename data/layouts/{UnknownMap_25_29 => UnknownLinkContestRoom_25_29}/map.bin (100%) rename data/layouts/{UnknownMap_0848144C => UnknownLinkContestRoom_25_30}/border.bin (100%) rename data/layouts/{UnknownMap_25_30 => UnknownLinkContestRoom_25_30}/map.bin (100%) rename data/layouts/{UnknownMap_084815F4 => UnknownLinkContestRoom_25_31}/border.bin (100%) rename data/layouts/{UnknownMap_25_31 => UnknownLinkContestRoom_25_31}/map.bin (100%) rename data/layouts/{UnknownMap_25_29 => UnknownLinkContestRoom_25_32}/border.bin (100%) rename data/layouts/{UnknownMap_25_32 => UnknownLinkContestRoom_25_32}/map.bin (100%) rename data/layouts/{UnknownMap_25_30 => UnknownLinkContestRoom_25_33}/border.bin (100%) rename data/layouts/{UnknownMap_25_33 => UnknownLinkContestRoom_25_33}/map.bin (100%) rename data/layouts/{UnknownMap_25_31 => UnknownLinkContestRoom_25_34}/border.bin (100%) rename data/layouts/{UnknownMap_25_34 => UnknownLinkContestRoom_25_34}/map.bin (100%) rename data/layouts/{UnknownMap_25_32 => Unknown_08428450}/border.bin (100%) rename data/layouts/{UnknownMap_08428450 => Unknown_08428450}/map.bin (100%) rename data/layouts/{UnknownMap_25_33 => Unknown_084294C4}/border.bin (100%) rename data/layouts/{UnknownMap_084294C4 => Unknown_084294C4}/map.bin (100%) rename data/layouts/{UnknownMap_25_34 => Unknown_084294E8}/border.bin (100%) rename data/layouts/{UnknownMap_084294E8 => Unknown_084294E8}/map.bin (100%) rename data/layouts/{UnknownMap_0843E6C0 => Unknown_0843E6C0}/border.bin (100%) rename data/layouts/{UnknownMap_0843E6C0 => Unknown_0843E6C0}/map.bin (100%) rename data/layouts/{UnknownMap_0843E6E4 => Unknown_0843E6E4}/border.bin (100%) rename data/layouts/{UnknownMap_0843E6E4 => Unknown_0843E6E4}/map.bin (100%) rename data/layouts/{UnknownMap_0843E708 => Unknown_0843E708}/border.bin (100%) rename data/layouts/{UnknownMap_0843E708 => Unknown_0843E708}/map.bin (100%) rename data/layouts/{UnknownMap_0843E72C => Unknown_0843E72C}/border.bin (100%) rename data/layouts/{UnknownMap_0843E72C => Unknown_0843E72C}/map.bin (100%) rename data/layouts/{UnknownMap_0843E750 => Unknown_0843E750}/border.bin (100%) rename data/layouts/{UnknownMap_0843E750 => Unknown_0843E750}/map.bin (100%) rename data/layouts/{UnknownMap_0843E774 => Unknown_0843E774}/border.bin (100%) rename data/layouts/{UnknownMap_0843E774 => Unknown_0843E774}/map.bin (100%) rename data/layouts/{UnknownMap_0843E798 => Unknown_0843E798}/border.bin (100%) rename data/layouts/{UnknownMap_0843E798 => Unknown_0843E798}/map.bin (100%) rename data/layouts/{UnknownMap_0843E7BC => Unknown_0843E7BC}/border.bin (100%) rename data/layouts/{UnknownMap_0843E7BC => Unknown_0843E7BC}/map.bin (100%) rename data/layouts/{UnknownMap_0843E7E0 => Unknown_0843E7E0}/border.bin (100%) rename data/layouts/{UnknownMap_0843E7E0 => Unknown_0843E7E0}/map.bin (100%) rename data/layouts/{UnknownMap_0843E804 => Unknown_0843E804}/border.bin (100%) rename data/layouts/{UnknownMap_0843E804 => Unknown_0843E804}/map.bin (100%) rename data/layouts/{UnknownMap_0843E828 => Unknown_0843E828}/border.bin (100%) rename data/layouts/{UnknownMap_0843E828 => Unknown_0843E828}/map.bin (100%) rename data/layouts/{UnknownMap_0843E84C => Unknown_0843E84C}/border.bin (100%) rename data/layouts/{UnknownMap_0843E84C => Unknown_0843E84C}/map.bin (100%) rename data/layouts/{UnknownMap_0843E870 => Unknown_0843E870}/border.bin (100%) rename data/layouts/{UnknownMap_0843E870 => Unknown_0843E870}/map.bin (100%) rename data/layouts/{UnknownMap_0843E894 => Unknown_0843E894}/border.bin (100%) rename data/layouts/{UnknownMap_0843E894 => Unknown_0843E894}/map.bin (100%) rename data/layouts/{UnknownMap_08447028 => Unknown_08447028}/border.bin (100%) rename data/layouts/{UnknownMap_08447028 => Unknown_08447028}/map.bin (100%) rename data/layouts/{UnknownMap_08481DBC => Unknown_084693AC}/border.bin (100%) rename data/layouts/{UnknownMap_084693AC => Unknown_084693AC}/map.bin (100%) rename data/maps/{UnknownMap_25_29 => UnknownLinkContestRoom_25_29}/map.json (82%) rename data/maps/{UnknownMap_25_29 => UnknownLinkContestRoom_25_29}/scripts.inc (100%) rename data/maps/{UnknownMap_25_30 => UnknownLinkContestRoom_25_30}/map.json (82%) rename data/maps/{UnknownMap_25_30 => UnknownLinkContestRoom_25_30}/scripts.inc (100%) rename data/maps/{UnknownMap_25_31 => UnknownLinkContestRoom_25_31}/map.json (82%) rename data/maps/{UnknownMap_25_31 => UnknownLinkContestRoom_25_31}/scripts.inc (100%) rename data/maps/{UnknownMap_25_32 => UnknownLinkContestRoom_25_32}/map.json (82%) rename data/maps/{UnknownMap_25_32 => UnknownLinkContestRoom_25_32}/scripts.inc (100%) rename data/maps/{UnknownMap_25_33 => UnknownLinkContestRoom_25_33}/map.json (82%) rename data/maps/{UnknownMap_25_33 => UnknownLinkContestRoom_25_33}/scripts.inc (100%) rename data/maps/{UnknownMap_25_34 => UnknownLinkContestRoom_25_34}/map.json (82%) rename data/maps/{UnknownMap_25_34 => UnknownLinkContestRoom_25_34}/scripts.inc (100%) diff --git a/data/event_scripts.s b/data/event_scripts.s index cf9590ce56..8d8b0cd68e 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -636,12 +636,12 @@ SecretBase_RedCave1_Text_23B759: @ 823B759 .include "data/maps/RecordCorner/scripts.inc" .include "data/maps/DoubleBattleColosseum/scripts.inc" .include "data/maps/LinkContestRoom1/scripts.inc" - .include "data/maps/UnknownMap_25_29/scripts.inc" - .include "data/maps/UnknownMap_25_30/scripts.inc" - .include "data/maps/UnknownMap_25_31/scripts.inc" - .include "data/maps/UnknownMap_25_32/scripts.inc" - .include "data/maps/UnknownMap_25_33/scripts.inc" - .include "data/maps/UnknownMap_25_34/scripts.inc" + .include "data/maps/UnknownLinkContestRoom_25_29/scripts.inc" + .include "data/maps/UnknownLinkContestRoom_25_30/scripts.inc" + .include "data/maps/UnknownLinkContestRoom_25_31/scripts.inc" + .include "data/maps/UnknownLinkContestRoom_25_32/scripts.inc" + .include "data/maps/UnknownLinkContestRoom_25_33/scripts.inc" + .include "data/maps/UnknownLinkContestRoom_25_34/scripts.inc" .include "data/maps/LinkContestRoom2/scripts.inc" .include "data/maps/LinkContestRoom3/scripts.inc" .include "data/maps/LinkContestRoom4/scripts.inc" diff --git a/data/layouts/UnknownMap_0845A394/border.bin b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/border.bin similarity index 100% rename from data/layouts/UnknownMap_0845A394/border.bin rename to data/layouts/CaveOfOrigin_Unused_B4F_Lava/border.bin diff --git a/data/layouts/UnknownMap_0845A394/map.bin b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin similarity index 100% rename from data/layouts/UnknownMap_0845A394/map.bin rename to data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin diff --git a/data/layouts/UnknownMap_08428450/border.bin b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin similarity index 100% rename from data/layouts/UnknownMap_08428450/border.bin rename to data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin diff --git a/data/layouts/UnknownMap_08480DAC/map.bin b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin similarity index 100% rename from data/layouts/UnknownMap_08480DAC/map.bin rename to data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin diff --git a/data/layouts/UnknownMap_08417FC4/border.bin b/data/layouts/Route130_MirageIsland/border.bin similarity index 100% rename from data/layouts/UnknownMap_08417FC4/border.bin rename to data/layouts/Route130_MirageIsland/border.bin diff --git a/data/layouts/UnknownMap_08417FC4/map.bin b/data/layouts/Route130_MirageIsland/map.bin similarity index 100% rename from data/layouts/UnknownMap_08417FC4/map.bin rename to data/layouts/Route130_MirageIsland/map.bin diff --git a/data/layouts/UnknownMap_0845D470/border.bin b/data/layouts/Route131_SkyPillar/border.bin similarity index 100% rename from data/layouts/UnknownMap_0845D470/border.bin rename to data/layouts/Route131_SkyPillar/border.bin diff --git a/data/layouts/UnknownMap_0845D470/map.bin b/data/layouts/Route131_SkyPillar/map.bin similarity index 100% rename from data/layouts/UnknownMap_0845D470/map.bin rename to data/layouts/Route131_SkyPillar/map.bin diff --git a/data/layouts/UnknownMap_0845ECB4/border.bin b/data/layouts/SeafloorCavern_Room9_Lava/border.bin similarity index 100% rename from data/layouts/UnknownMap_0845ECB4/border.bin rename to data/layouts/SeafloorCavern_Room9_Lava/border.bin diff --git a/data/layouts/UnknownMap_0845ECB4/map.bin b/data/layouts/SeafloorCavern_Room9_Lava/map.bin similarity index 100% rename from data/layouts/UnknownMap_0845ECB4/map.bin rename to data/layouts/SeafloorCavern_Room9_Lava/map.bin diff --git a/data/layouts/UnknownMap_084294C4/border.bin b/data/layouts/SkyPillar_1F_Clean/border.bin similarity index 100% rename from data/layouts/UnknownMap_084294C4/border.bin rename to data/layouts/SkyPillar_1F_Clean/border.bin diff --git a/data/layouts/UnknownMap_08480F54/map.bin b/data/layouts/SkyPillar_1F_Clean/map.bin similarity index 100% rename from data/layouts/UnknownMap_08480F54/map.bin rename to data/layouts/SkyPillar_1F_Clean/map.bin diff --git a/data/layouts/UnknownMap_084294E8/border.bin b/data/layouts/SkyPillar_2F_Clean/border.bin similarity index 100% rename from data/layouts/UnknownMap_084294E8/border.bin rename to data/layouts/SkyPillar_2F_Clean/border.bin diff --git a/data/layouts/UnknownMap_084810FC/map.bin b/data/layouts/SkyPillar_2F_Clean/map.bin similarity index 100% rename from data/layouts/UnknownMap_084810FC/map.bin rename to data/layouts/SkyPillar_2F_Clean/map.bin diff --git a/data/layouts/UnknownMap_08480DAC/border.bin b/data/layouts/SkyPillar_3F_Clean/border.bin similarity index 100% rename from data/layouts/UnknownMap_08480DAC/border.bin rename to data/layouts/SkyPillar_3F_Clean/border.bin diff --git a/data/layouts/UnknownMap_084812A4/map.bin b/data/layouts/SkyPillar_3F_Clean/map.bin similarity index 100% rename from data/layouts/UnknownMap_084812A4/map.bin rename to data/layouts/SkyPillar_3F_Clean/map.bin diff --git a/data/layouts/UnknownMap_08480F54/border.bin b/data/layouts/SkyPillar_4F_Clean/border.bin similarity index 100% rename from data/layouts/UnknownMap_08480F54/border.bin rename to data/layouts/SkyPillar_4F_Clean/border.bin diff --git a/data/layouts/UnknownMap_0848144C/map.bin b/data/layouts/SkyPillar_4F_Clean/map.bin similarity index 100% rename from data/layouts/UnknownMap_0848144C/map.bin rename to data/layouts/SkyPillar_4F_Clean/map.bin diff --git a/data/layouts/UnknownMap_084810FC/border.bin b/data/layouts/SkyPillar_5F_Clean/border.bin similarity index 100% rename from data/layouts/UnknownMap_084810FC/border.bin rename to data/layouts/SkyPillar_5F_Clean/border.bin diff --git a/data/layouts/UnknownMap_084815F4/map.bin b/data/layouts/SkyPillar_5F_Clean/map.bin similarity index 100% rename from data/layouts/UnknownMap_084815F4/map.bin rename to data/layouts/SkyPillar_5F_Clean/map.bin diff --git a/data/layouts/UnknownMap_08481B24/border.bin b/data/layouts/SkyPillar_Top_Clean/border.bin similarity index 100% rename from data/layouts/UnknownMap_08481B24/border.bin rename to data/layouts/SkyPillar_Top_Clean/border.bin diff --git a/data/layouts/UnknownMap_08481B24/map.bin b/data/layouts/SkyPillar_Top_Clean/map.bin similarity index 100% rename from data/layouts/UnknownMap_08481B24/map.bin rename to data/layouts/SkyPillar_Top_Clean/map.bin diff --git a/data/layouts/UnknownMap_08469200/border.bin b/data/layouts/SootopolisCity_LegendsBattle/border.bin similarity index 100% rename from data/layouts/UnknownMap_08469200/border.bin rename to data/layouts/SootopolisCity_LegendsBattle/border.bin diff --git a/data/layouts/UnknownMap_08469200/map.bin b/data/layouts/SootopolisCity_LegendsBattle/map.bin similarity index 100% rename from data/layouts/UnknownMap_08469200/map.bin rename to data/layouts/SootopolisCity_LegendsBattle/map.bin diff --git a/data/layouts/UnknownMap_084693AC/border.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin similarity index 100% rename from data/layouts/UnknownMap_084693AC/border.bin rename to data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin diff --git a/data/layouts/UnknownMap_08481DBC/map.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin similarity index 100% rename from data/layouts/UnknownMap_08481DBC/map.bin rename to data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin diff --git a/data/layouts/UnknownMap_084812A4/border.bin b/data/layouts/UnknownLinkContestRoom_25_29/border.bin similarity index 100% rename from data/layouts/UnknownMap_084812A4/border.bin rename to data/layouts/UnknownLinkContestRoom_25_29/border.bin diff --git a/data/layouts/UnknownMap_25_29/map.bin b/data/layouts/UnknownLinkContestRoom_25_29/map.bin similarity index 100% rename from data/layouts/UnknownMap_25_29/map.bin rename to data/layouts/UnknownLinkContestRoom_25_29/map.bin diff --git a/data/layouts/UnknownMap_0848144C/border.bin b/data/layouts/UnknownLinkContestRoom_25_30/border.bin similarity index 100% rename from data/layouts/UnknownMap_0848144C/border.bin rename to data/layouts/UnknownLinkContestRoom_25_30/border.bin diff --git a/data/layouts/UnknownMap_25_30/map.bin b/data/layouts/UnknownLinkContestRoom_25_30/map.bin similarity index 100% rename from data/layouts/UnknownMap_25_30/map.bin rename to data/layouts/UnknownLinkContestRoom_25_30/map.bin diff --git a/data/layouts/UnknownMap_084815F4/border.bin b/data/layouts/UnknownLinkContestRoom_25_31/border.bin similarity index 100% rename from data/layouts/UnknownMap_084815F4/border.bin rename to data/layouts/UnknownLinkContestRoom_25_31/border.bin diff --git a/data/layouts/UnknownMap_25_31/map.bin b/data/layouts/UnknownLinkContestRoom_25_31/map.bin similarity index 100% rename from data/layouts/UnknownMap_25_31/map.bin rename to data/layouts/UnknownLinkContestRoom_25_31/map.bin diff --git a/data/layouts/UnknownMap_25_29/border.bin b/data/layouts/UnknownLinkContestRoom_25_32/border.bin similarity index 100% rename from data/layouts/UnknownMap_25_29/border.bin rename to data/layouts/UnknownLinkContestRoom_25_32/border.bin diff --git a/data/layouts/UnknownMap_25_32/map.bin b/data/layouts/UnknownLinkContestRoom_25_32/map.bin similarity index 100% rename from data/layouts/UnknownMap_25_32/map.bin rename to data/layouts/UnknownLinkContestRoom_25_32/map.bin diff --git a/data/layouts/UnknownMap_25_30/border.bin b/data/layouts/UnknownLinkContestRoom_25_33/border.bin similarity index 100% rename from data/layouts/UnknownMap_25_30/border.bin rename to data/layouts/UnknownLinkContestRoom_25_33/border.bin diff --git a/data/layouts/UnknownMap_25_33/map.bin b/data/layouts/UnknownLinkContestRoom_25_33/map.bin similarity index 100% rename from data/layouts/UnknownMap_25_33/map.bin rename to data/layouts/UnknownLinkContestRoom_25_33/map.bin diff --git a/data/layouts/UnknownMap_25_31/border.bin b/data/layouts/UnknownLinkContestRoom_25_34/border.bin similarity index 100% rename from data/layouts/UnknownMap_25_31/border.bin rename to data/layouts/UnknownLinkContestRoom_25_34/border.bin diff --git a/data/layouts/UnknownMap_25_34/map.bin b/data/layouts/UnknownLinkContestRoom_25_34/map.bin similarity index 100% rename from data/layouts/UnknownMap_25_34/map.bin rename to data/layouts/UnknownLinkContestRoom_25_34/map.bin diff --git a/data/layouts/UnknownMap_25_32/border.bin b/data/layouts/Unknown_08428450/border.bin similarity index 100% rename from data/layouts/UnknownMap_25_32/border.bin rename to data/layouts/Unknown_08428450/border.bin diff --git a/data/layouts/UnknownMap_08428450/map.bin b/data/layouts/Unknown_08428450/map.bin similarity index 100% rename from data/layouts/UnknownMap_08428450/map.bin rename to data/layouts/Unknown_08428450/map.bin diff --git a/data/layouts/UnknownMap_25_33/border.bin b/data/layouts/Unknown_084294C4/border.bin similarity index 100% rename from data/layouts/UnknownMap_25_33/border.bin rename to data/layouts/Unknown_084294C4/border.bin diff --git a/data/layouts/UnknownMap_084294C4/map.bin b/data/layouts/Unknown_084294C4/map.bin similarity index 100% rename from data/layouts/UnknownMap_084294C4/map.bin rename to data/layouts/Unknown_084294C4/map.bin diff --git a/data/layouts/UnknownMap_25_34/border.bin b/data/layouts/Unknown_084294E8/border.bin similarity index 100% rename from data/layouts/UnknownMap_25_34/border.bin rename to data/layouts/Unknown_084294E8/border.bin diff --git a/data/layouts/UnknownMap_084294E8/map.bin b/data/layouts/Unknown_084294E8/map.bin similarity index 100% rename from data/layouts/UnknownMap_084294E8/map.bin rename to data/layouts/Unknown_084294E8/map.bin diff --git a/data/layouts/UnknownMap_0843E6C0/border.bin b/data/layouts/Unknown_0843E6C0/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E6C0/border.bin rename to data/layouts/Unknown_0843E6C0/border.bin diff --git a/data/layouts/UnknownMap_0843E6C0/map.bin b/data/layouts/Unknown_0843E6C0/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E6C0/map.bin rename to data/layouts/Unknown_0843E6C0/map.bin diff --git a/data/layouts/UnknownMap_0843E6E4/border.bin b/data/layouts/Unknown_0843E6E4/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E6E4/border.bin rename to data/layouts/Unknown_0843E6E4/border.bin diff --git a/data/layouts/UnknownMap_0843E6E4/map.bin b/data/layouts/Unknown_0843E6E4/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E6E4/map.bin rename to data/layouts/Unknown_0843E6E4/map.bin diff --git a/data/layouts/UnknownMap_0843E708/border.bin b/data/layouts/Unknown_0843E708/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E708/border.bin rename to data/layouts/Unknown_0843E708/border.bin diff --git a/data/layouts/UnknownMap_0843E708/map.bin b/data/layouts/Unknown_0843E708/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E708/map.bin rename to data/layouts/Unknown_0843E708/map.bin diff --git a/data/layouts/UnknownMap_0843E72C/border.bin b/data/layouts/Unknown_0843E72C/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E72C/border.bin rename to data/layouts/Unknown_0843E72C/border.bin diff --git a/data/layouts/UnknownMap_0843E72C/map.bin b/data/layouts/Unknown_0843E72C/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E72C/map.bin rename to data/layouts/Unknown_0843E72C/map.bin diff --git a/data/layouts/UnknownMap_0843E750/border.bin b/data/layouts/Unknown_0843E750/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E750/border.bin rename to data/layouts/Unknown_0843E750/border.bin diff --git a/data/layouts/UnknownMap_0843E750/map.bin b/data/layouts/Unknown_0843E750/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E750/map.bin rename to data/layouts/Unknown_0843E750/map.bin diff --git a/data/layouts/UnknownMap_0843E774/border.bin b/data/layouts/Unknown_0843E774/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E774/border.bin rename to data/layouts/Unknown_0843E774/border.bin diff --git a/data/layouts/UnknownMap_0843E774/map.bin b/data/layouts/Unknown_0843E774/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E774/map.bin rename to data/layouts/Unknown_0843E774/map.bin diff --git a/data/layouts/UnknownMap_0843E798/border.bin b/data/layouts/Unknown_0843E798/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E798/border.bin rename to data/layouts/Unknown_0843E798/border.bin diff --git a/data/layouts/UnknownMap_0843E798/map.bin b/data/layouts/Unknown_0843E798/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E798/map.bin rename to data/layouts/Unknown_0843E798/map.bin diff --git a/data/layouts/UnknownMap_0843E7BC/border.bin b/data/layouts/Unknown_0843E7BC/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E7BC/border.bin rename to data/layouts/Unknown_0843E7BC/border.bin diff --git a/data/layouts/UnknownMap_0843E7BC/map.bin b/data/layouts/Unknown_0843E7BC/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E7BC/map.bin rename to data/layouts/Unknown_0843E7BC/map.bin diff --git a/data/layouts/UnknownMap_0843E7E0/border.bin b/data/layouts/Unknown_0843E7E0/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E7E0/border.bin rename to data/layouts/Unknown_0843E7E0/border.bin diff --git a/data/layouts/UnknownMap_0843E7E0/map.bin b/data/layouts/Unknown_0843E7E0/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E7E0/map.bin rename to data/layouts/Unknown_0843E7E0/map.bin diff --git a/data/layouts/UnknownMap_0843E804/border.bin b/data/layouts/Unknown_0843E804/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E804/border.bin rename to data/layouts/Unknown_0843E804/border.bin diff --git a/data/layouts/UnknownMap_0843E804/map.bin b/data/layouts/Unknown_0843E804/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E804/map.bin rename to data/layouts/Unknown_0843E804/map.bin diff --git a/data/layouts/UnknownMap_0843E828/border.bin b/data/layouts/Unknown_0843E828/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E828/border.bin rename to data/layouts/Unknown_0843E828/border.bin diff --git a/data/layouts/UnknownMap_0843E828/map.bin b/data/layouts/Unknown_0843E828/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E828/map.bin rename to data/layouts/Unknown_0843E828/map.bin diff --git a/data/layouts/UnknownMap_0843E84C/border.bin b/data/layouts/Unknown_0843E84C/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E84C/border.bin rename to data/layouts/Unknown_0843E84C/border.bin diff --git a/data/layouts/UnknownMap_0843E84C/map.bin b/data/layouts/Unknown_0843E84C/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E84C/map.bin rename to data/layouts/Unknown_0843E84C/map.bin diff --git a/data/layouts/UnknownMap_0843E870/border.bin b/data/layouts/Unknown_0843E870/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E870/border.bin rename to data/layouts/Unknown_0843E870/border.bin diff --git a/data/layouts/UnknownMap_0843E870/map.bin b/data/layouts/Unknown_0843E870/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E870/map.bin rename to data/layouts/Unknown_0843E870/map.bin diff --git a/data/layouts/UnknownMap_0843E894/border.bin b/data/layouts/Unknown_0843E894/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E894/border.bin rename to data/layouts/Unknown_0843E894/border.bin diff --git a/data/layouts/UnknownMap_0843E894/map.bin b/data/layouts/Unknown_0843E894/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E894/map.bin rename to data/layouts/Unknown_0843E894/map.bin diff --git a/data/layouts/UnknownMap_08447028/border.bin b/data/layouts/Unknown_08447028/border.bin similarity index 100% rename from data/layouts/UnknownMap_08447028/border.bin rename to data/layouts/Unknown_08447028/border.bin diff --git a/data/layouts/UnknownMap_08447028/map.bin b/data/layouts/Unknown_08447028/map.bin similarity index 100% rename from data/layouts/UnknownMap_08447028/map.bin rename to data/layouts/Unknown_08447028/map.bin diff --git a/data/layouts/UnknownMap_08481DBC/border.bin b/data/layouts/Unknown_084693AC/border.bin similarity index 100% rename from data/layouts/UnknownMap_08481DBC/border.bin rename to data/layouts/Unknown_084693AC/border.bin diff --git a/data/layouts/UnknownMap_084693AC/map.bin b/data/layouts/Unknown_084693AC/map.bin similarity index 100% rename from data/layouts/UnknownMap_084693AC/map.bin rename to data/layouts/Unknown_084693AC/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index b6e31981d9..353b9a2840 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -452,14 +452,14 @@ "blockdata_filepath": "data/layouts/Route129/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_08417FC4", - "name": "UnknownMap_08417FC4_Layout", + "id": "LAYOUT_ROUTE130_MIRAGE_ISLAND", + "name": "Route130_MirageIsland_Layout", "width": 80, "height": 40, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_08417FC4/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_08417FC4/map.bin" + "border_filepath": "data/layouts/Route130_MirageIsland/border.bin", + "blockdata_filepath": "data/layouts/Route130_MirageIsland/map.bin" }, { "id": "LAYOUT_ROUTE131", @@ -742,14 +742,14 @@ "blockdata_filepath": "data/layouts/LilycoveCity_House2/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_08428450", - "name": "UnknownMap_08428450_Layout", + "id": "LAYOUT_UNKNOWN_08428450", + "name": "Unknown_08428450_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Contest", - "border_filepath": "data/layouts/UnknownMap_08428450/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_08428450/map.bin" + "border_filepath": "data/layouts/Unknown_08428450/border.bin", + "blockdata_filepath": "data/layouts/Unknown_08428450/map.bin" }, { "id": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE", @@ -822,24 +822,24 @@ "blockdata_filepath": "data/layouts/SlateportCity_SternsShipyard_2F/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_084294C4", - "name": "UnknownMap_084294C4_Layout", + "id": "LAYOUT_UNKNOWN_084294C4", + "name": "Unknown_084294C4_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Contest", - "border_filepath": "data/layouts/UnknownMap_084294C4/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_084294C4/map.bin" + "border_filepath": "data/layouts/Unknown_084294C4/border.bin", + "blockdata_filepath": "data/layouts/Unknown_084294C4/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_084294E8", - "name": "UnknownMap_084294E8_Layout", + "id": "LAYOUT_UNKNOWN_084294E8", + "name": "Unknown_084294E8_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Contest", - "border_filepath": "data/layouts/UnknownMap_084294E8/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_084294E8/map.bin" + "border_filepath": "data/layouts/Unknown_084294E8/border.bin", + "blockdata_filepath": "data/layouts/Unknown_084294E8/map.bin" }, { "id": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB", @@ -1692,144 +1692,144 @@ "blockdata_filepath": "data/layouts/ShoalCave_HighTideInnerRoom/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E6C0", - "name": "UnknownMap_0843E6C0_Layout", + "id": "LAYOUT_UNKNOWN_0843E6C0", + "name": "Unknown_0843E6C0_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E6C0/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E6C0/map.bin" + "border_filepath": "data/layouts/Unknown_0843E6C0/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E6C0/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E6E4", - "name": "UnknownMap_0843E6E4_Layout", + "id": "LAYOUT_UNKNOWN_0843E6E4", + "name": "Unknown_0843E6E4_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E6E4/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E6E4/map.bin" + "border_filepath": "data/layouts/Unknown_0843E6E4/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E6E4/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E708", - "name": "UnknownMap_0843E708_Layout", + "id": "LAYOUT_UNKNOWN_0843E708", + "name": "Unknown_0843E708_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E708/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E708/map.bin" + "border_filepath": "data/layouts/Unknown_0843E708/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E708/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E72C", - "name": "UnknownMap_0843E72C_Layout", + "id": "LAYOUT_UNKNOWN_0843E72C", + "name": "Unknown_0843E72C_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E72C/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E72C/map.bin" + "border_filepath": "data/layouts/Unknown_0843E72C/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E72C/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E750", - "name": "UnknownMap_0843E750_Layout", + "id": "LAYOUT_UNKNOWN_0843E750", + "name": "Unknown_0843E750_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E750/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E750/map.bin" + "border_filepath": "data/layouts/Unknown_0843E750/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E750/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E774", - "name": "UnknownMap_0843E774_Layout", + "id": "LAYOUT_UNKNOWN_0843E774", + "name": "Unknown_0843E774_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E774/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E774/map.bin" + "border_filepath": "data/layouts/Unknown_0843E774/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E774/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E798", - "name": "UnknownMap_0843E798_Layout", + "id": "LAYOUT_UNKNOWN_0843E798", + "name": "Unknown_0843E798_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E798/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E798/map.bin" + "border_filepath": "data/layouts/Unknown_0843E798/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E798/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E7BC", - "name": "UnknownMap_0843E7BC_Layout", + "id": "LAYOUT_UNKNOWN_0843E7BC", + "name": "Unknown_0843E7BC_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E7BC/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E7BC/map.bin" + "border_filepath": "data/layouts/Unknown_0843E7BC/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E7BC/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E7E0", - "name": "UnknownMap_0843E7E0_Layout", + "id": "LAYOUT_UNKNOWN_0843E7E0", + "name": "Unknown_0843E7E0_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E7E0/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E7E0/map.bin" + "border_filepath": "data/layouts/Unknown_0843E7E0/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E7E0/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E804", - "name": "UnknownMap_0843E804_Layout", + "id": "LAYOUT_UNKNOWN_0843E804", + "name": "Unknown_0843E804_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E804/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E804/map.bin" + "border_filepath": "data/layouts/Unknown_0843E804/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E804/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E828", - "name": "UnknownMap_0843E828_Layout", + "id": "LAYOUT_UNKNOWN_0843E828", + "name": "Unknown_0843E828_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E828/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E828/map.bin" + "border_filepath": "data/layouts/Unknown_0843E828/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E828/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E84C", - "name": "UnknownMap_0843E84C_Layout", + "id": "LAYOUT_UNKNOWN_0843E84C", + "name": "Unknown_0843E84C_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E84C/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E84C/map.bin" + "border_filepath": "data/layouts/Unknown_0843E84C/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E84C/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E870", - "name": "UnknownMap_0843E870_Layout", + "id": "LAYOUT_UNKNOWN_0843E870", + "name": "Unknown_0843E870_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E870/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E870/map.bin" + "border_filepath": "data/layouts/Unknown_0843E870/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E870/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E894", - "name": "UnknownMap_0843E894_Layout", + "id": "LAYOUT_UNKNOWN_0843E894", + "name": "Unknown_0843E894_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E894/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E894/map.bin" + "border_filepath": "data/layouts/Unknown_0843E894/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E894/map.bin" }, { "id": "LAYOUT_NEW_MAUVILLE_ENTRANCE", @@ -2252,64 +2252,64 @@ "blockdata_filepath": "data/layouts/LinkContestRoom1/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_25_29", - "name": "UnknownMap_25_29_Layout", + "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29", + "name": "UnknownLinkContestRoom_25_29_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Contest", - "border_filepath": "data/layouts/UnknownMap_25_29/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_25_29/map.bin" + "border_filepath": "data/layouts/UnknownLinkContestRoom_25_29/border.bin", + "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_29/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_25_30", - "name": "UnknownMap_25_30_Layout", + "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30", + "name": "UnknownLinkContestRoom_25_30_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Contest", - "border_filepath": "data/layouts/UnknownMap_25_30/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_25_30/map.bin" + "border_filepath": "data/layouts/UnknownLinkContestRoom_25_30/border.bin", + "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_30/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_25_31", - "name": "UnknownMap_25_31_Layout", + "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31", + "name": "UnknownLinkContestRoom_25_31_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Contest", - "border_filepath": "data/layouts/UnknownMap_25_31/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_25_31/map.bin" + "border_filepath": "data/layouts/UnknownLinkContestRoom_25_31/border.bin", + "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_31/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_25_32", - "name": "UnknownMap_25_32_Layout", + "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32", + "name": "UnknownLinkContestRoom_25_32_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Contest", - "border_filepath": "data/layouts/UnknownMap_25_32/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_25_32/map.bin" + "border_filepath": "data/layouts/UnknownLinkContestRoom_25_32/border.bin", + "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_32/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_25_33", - "name": "UnknownMap_25_33_Layout", + "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33", + "name": "UnknownLinkContestRoom_25_33_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Contest", - "border_filepath": "data/layouts/UnknownMap_25_33/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_25_33/map.bin" + "border_filepath": "data/layouts/UnknownLinkContestRoom_25_33/border.bin", + "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_33/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_25_34", - "name": "UnknownMap_25_34_Layout", + "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34", + "name": "UnknownLinkContestRoom_25_34_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Contest", - "border_filepath": "data/layouts/UnknownMap_25_34/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_25_34/map.bin" + "border_filepath": "data/layouts/UnknownLinkContestRoom_25_34/border.bin", + "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_34/map.bin" }, { "id": "LAYOUT_LINK_CONTEST_ROOM2", @@ -2412,14 +2412,14 @@ "blockdata_filepath": "data/layouts/SafariZone_South/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_08447028", - "name": "UnknownMap_08447028_Layout", + "id": "LAYOUT_UNKNOWN_08447028", + "name": "Unknown_08447028_Layout", "width": 58, "height": 26, "primary_tileset": "gTileset_General", "secondary_tileset": "0", - "border_filepath": "data/layouts/UnknownMap_08447028/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_08447028/map.bin" + "border_filepath": "data/layouts/Unknown_08447028/border.bin", + "blockdata_filepath": "data/layouts/Unknown_08447028/map.bin" }, { "id": "LAYOUT_ROUTE109_SEASHORE_HOUSE", @@ -3112,14 +3112,14 @@ "blockdata_filepath": "data/layouts/ScorchedSlab/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0845A394", - "name": "UnknownMap_0845A394_Layout", + "id": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_B4F_LAVA", + "name": "CaveOfOrigin_Unused_B4F_Lava_Layout", "width": 19, "height": 19, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0845A394/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0845A394/map.bin" + "border_filepath": "data/layouts/CaveOfOrigin_Unused_B4F_Lava/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin" }, { "id": "LAYOUT_RUSTBORO_CITY_FLAT1_1F", @@ -3182,14 +3182,14 @@ "blockdata_filepath": "data/layouts/AquaHideout_UnusedRubyMap3/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0845D470", - "name": "UnknownMap_0845D470_Layout", + "id": "LAYOUT_ROUTE131_SKY_PILLAR", + "name": "Route131_SkyPillar_Layout", "width": 60, "height": 40, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Pacifidlog", - "border_filepath": "data/layouts/UnknownMap_0845D470/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0845D470/map.bin" + "border_filepath": "data/layouts/Route131_SkyPillar/border.bin", + "blockdata_filepath": "data/layouts/Route131_SkyPillar/map.bin" }, { "id": "LAYOUT_SKY_PILLAR_ENTRANCE", @@ -3252,14 +3252,14 @@ "blockdata_filepath": "data/layouts/SkyPillar_4F/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0845ECB4", - "name": "UnknownMap_0845ECB4_Layout", + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM9_LAVA", + "name": "SeafloorCavern_Room9_Lava_Layout", "width": 27, "height": 46, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0845ECB4/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0845ECB4/map.bin" + "border_filepath": "data/layouts/SeafloorCavern_Room9_Lava/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room9_Lava/map.bin" }, { "id": "LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE", @@ -3562,14 +3562,14 @@ "blockdata_filepath": "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_08469200", - "name": "UnknownMap_08469200_Layout", + "id": "LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE", + "name": "SootopolisCity_LegendsBattle_Layout", "width": 60, "height": 60, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Sootopolis", - "border_filepath": "data/layouts/UnknownMap_08469200/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_08469200/map.bin" + "border_filepath": "data/layouts/SootopolisCity_LegendsBattle/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_LegendsBattle/map.bin" }, { "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3", @@ -3582,14 +3582,14 @@ "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_084693AC", - "name": "UnknownMap_084693AC_Layout", + "id": "LAYOUT_UNKNOWN_084693AC", + "name": "Unknown_084693AC_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_BattlePike", - "border_filepath": "data/layouts/UnknownMap_084693AC/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_084693AC/map.bin" + "border_filepath": "data/layouts/Unknown_084693AC/border.bin", + "blockdata_filepath": "data/layouts/Unknown_084693AC/map.bin" }, { "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", @@ -4312,74 +4312,74 @@ "blockdata_filepath": "data/layouts/MeteorFalls_StevensCave/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_08480DAC", - "name": "UnknownMap_08480DAC_Layout", + "id": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE", + "name": "LittlerootTown_ProfessorBirchsLabWithTable_Layout", "width": 13, "height": 13, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Lab", - "border_filepath": "data/layouts/UnknownMap_08480DAC/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_08480DAC/map.bin" + "border_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_08480F54", - "name": "UnknownMap_08480F54_Layout", + "id": "LAYOUT_SKY_PILLAR_1F_CLEAN", + "name": "SkyPillar_1F_Clean_Layout", "width": 14, "height": 14, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Pacifidlog", - "border_filepath": "data/layouts/UnknownMap_08480F54/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_08480F54/map.bin" + "border_filepath": "data/layouts/SkyPillar_1F_Clean/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_1F_Clean/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_084810FC", - "name": "UnknownMap_084810FC_Layout", + "id": "LAYOUT_SKY_PILLAR_2F_CLEAN", + "name": "SkyPillar_2F_Clean_Layout", "width": 14, "height": 14, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Pacifidlog", - "border_filepath": "data/layouts/UnknownMap_084810FC/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_084810FC/map.bin" + "border_filepath": "data/layouts/SkyPillar_2F_Clean/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_2F_Clean/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_084812A4", - "name": "UnknownMap_084812A4_Layout", + "id": "LAYOUT_SKY_PILLAR_3F_CLEAN", + "name": "SkyPillar_3F_Clean_Layout", "width": 14, "height": 14, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Pacifidlog", - "border_filepath": "data/layouts/UnknownMap_084812A4/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_084812A4/map.bin" + "border_filepath": "data/layouts/SkyPillar_3F_Clean/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_3F_Clean/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0848144C", - "name": "UnknownMap_0848144C_Layout", + "id": "LAYOUT_SKY_PILLAR_4F_CLEAN", + "name": "SkyPillar_4F_Clean_Layout", "width": 14, "height": 14, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Pacifidlog", - "border_filepath": "data/layouts/UnknownMap_0848144C/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0848144C/map.bin" + "border_filepath": "data/layouts/SkyPillar_4F_Clean/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_4F_Clean/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_084815F4", - "name": "UnknownMap_084815F4_Layout", + "id": "LAYOUT_SKY_PILLAR_5F_CLEAN", + "name": "SkyPillar_5F_Clean_Layout", "width": 14, "height": 14, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Pacifidlog", - "border_filepath": "data/layouts/UnknownMap_084815F4/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_084815F4/map.bin" + "border_filepath": "data/layouts/SkyPillar_5F_Clean/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_5F_Clean/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_08481B24", - "name": "UnknownMap_08481B24_Layout", + "id": "LAYOUT_SKY_PILLAR_TOP_CLEAN", + "name": "SkyPillar_Top_Clean_Layout", "width": 27, "height": 24, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Pacifidlog", - "border_filepath": "data/layouts/UnknownMap_08481B24/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_08481B24/map.bin" + "border_filepath": "data/layouts/SkyPillar_Top_Clean/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_Top_Clean/map.bin" }, { "id": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", @@ -4402,14 +4402,14 @@ "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_08481DBC", - "name": "UnknownMap_08481DBC_Layout", + "id": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED", + "name": "SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked_Layout", "width": 11, "height": 8, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_MysteryEventsHouse", - "border_filepath": "data/layouts/UnknownMap_08481DBC/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_08481DBC/map.bin" + "border_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin" } ] } \ No newline at end of file diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index b47df74b8a..5c762743ca 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -28,11 +28,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9:: @ 81F9CE9 goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480DAC + setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE end LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480DAC + setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN setobjectxyperm 3, 5, 10 end diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 819d9e4f3c..8ca9dcbb0d 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -27,7 +27,7 @@ Route130_MapScript1_1F7365: @ 81F7365 end Route130_EventScript_1F73B1:: @ 81F73B1 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08417FC4 + setmaplayoutindex LAYOUT_ROUTE130_MIRAGE_ISLAND end Route130_EventScript_1F73B5:: @ 81F73B5 diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index 700ac25f6a..e709a14ef1 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -9,7 +9,7 @@ Route131_MapScript1_1F740A: @ 81F740A end Route131_EventScript_1F741B:: @ 81F741B - setmaplayoutindex LAYOUT_UNKNOWN_MAP_0845D470 + setmaplayoutindex LAYOUT_ROUTE131_SKY_PILLAR return Route131_EventScript_1F741F:: @ 81F741F diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc index 2230dad8d2..a0b62df258 100644 --- a/data/maps/SkyPillar_1F/scripts.inc +++ b/data/maps/SkyPillar_1F/scripts.inc @@ -8,6 +8,6 @@ SkyPillar_1F_MapScript1_23961B: @ 823961B end SkyPillar_1F_EventScript_239627:: @ 8239627 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480F54 + setmaplayoutindex LAYOUT_SKY_PILLAR_1F_CLEAN return diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index fa89f3893c..a0a4aeaf33 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -11,7 +11,7 @@ SkyPillar_2F_MapScript1_23963B: @ 823963B end SkyPillar_2F_EventScript_23964C:: @ 823964C - setmaplayoutindex LAYOUT_UNKNOWN_MAP_084810FC + setmaplayoutindex LAYOUT_SKY_PILLAR_2F_CLEAN return SkyPillar_2F_MapScript1_239650: @ 8239650 diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc index 015d754eb8..d78ee62665 100644 --- a/data/maps/SkyPillar_3F/scripts.inc +++ b/data/maps/SkyPillar_3F/scripts.inc @@ -8,6 +8,6 @@ SkyPillar_3F_MapScript1_239661: @ 8239661 end SkyPillar_3F_EventScript_23966D:: @ 823966D - setmaplayoutindex LAYOUT_UNKNOWN_MAP_084812A4 + setmaplayoutindex LAYOUT_SKY_PILLAR_3F_CLEAN return diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index ccab2453c8..3904e954f4 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -11,7 +11,7 @@ SkyPillar_4F_MapScript1_239681: @ 8239681 end SkyPillar_4F_EventScript_239692:: @ 8239692 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_0848144C + setmaplayoutindex LAYOUT_SKY_PILLAR_4F_CLEAN return SkyPillar_4F_MapScript1_239696: @ 8239696 diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc index b3e3f6605f..20478e77e4 100644 --- a/data/maps/SkyPillar_5F/scripts.inc +++ b/data/maps/SkyPillar_5F/scripts.inc @@ -8,6 +8,6 @@ SkyPillar_5F_MapScript1_2396A8: @ 82396A8 return SkyPillar_5F_EventScript_2396B4:: @ 82396B4 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_084815F4 + setmaplayoutindex LAYOUT_SKY_PILLAR_5F_CLEAN return diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index f764ea79c1..4ca4c4681d 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -23,7 +23,7 @@ SkyPillar_Top_MapScript1_2396E6: @ 82396E6 end SkyPillar_Top_EventScript_2396FD:: @ 82396FD - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481B24 + setmaplayoutindex LAYOUT_SKY_PILLAR_TOP_CLEAN setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 5e212ddfe4..5666ce6cf4 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -97,7 +97,7 @@ SootopolisCity_EventScript_1E5800:: @ 81E5800 return SootopolisCity_EventScript_1E5801:: @ 81E5801 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08469200 + setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE return SootopolisCity_EventScript_1E5805:: @ 81E5805 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 252bd12010..5db2042935 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -16,7 +16,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D setvar VAR_TEMP_1, 1 setobjectxyperm 1, 3, 2 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481DBC + setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED return SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991 diff --git a/data/maps/UnknownMap_25_29/map.json b/data/maps/UnknownLinkContestRoom_25_29/map.json similarity index 82% rename from data/maps/UnknownMap_25_29/map.json rename to data/maps/UnknownLinkContestRoom_25_29/map.json index 8f7ac02268..956a681580 100644 --- a/data/maps/UnknownMap_25_29/map.json +++ b/data/maps/UnknownLinkContestRoom_25_29/map.json @@ -1,7 +1,7 @@ { "id": "MAP_UNKNOWN_MAP_25_29", - "name": "UnknownMap_25_29", - "layout": "LAYOUT_UNKNOWN_MAP_25_29", + "name": "UnknownLinkContestRoom_25_29", + "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29", "music": "MUS_NIBI", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, diff --git a/data/maps/UnknownMap_25_29/scripts.inc b/data/maps/UnknownLinkContestRoom_25_29/scripts.inc similarity index 100% rename from data/maps/UnknownMap_25_29/scripts.inc rename to data/maps/UnknownLinkContestRoom_25_29/scripts.inc diff --git a/data/maps/UnknownMap_25_30/map.json b/data/maps/UnknownLinkContestRoom_25_30/map.json similarity index 82% rename from data/maps/UnknownMap_25_30/map.json rename to data/maps/UnknownLinkContestRoom_25_30/map.json index 5f321e6b53..526c6de2aa 100644 --- a/data/maps/UnknownMap_25_30/map.json +++ b/data/maps/UnknownLinkContestRoom_25_30/map.json @@ -1,7 +1,7 @@ { "id": "MAP_UNKNOWN_MAP_25_30", - "name": "UnknownMap_25_30", - "layout": "LAYOUT_UNKNOWN_MAP_25_30", + "name": "UnknownLinkContestRoom_25_30", + "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30", "music": "MUS_NIBI", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, diff --git a/data/maps/UnknownMap_25_30/scripts.inc b/data/maps/UnknownLinkContestRoom_25_30/scripts.inc similarity index 100% rename from data/maps/UnknownMap_25_30/scripts.inc rename to data/maps/UnknownLinkContestRoom_25_30/scripts.inc diff --git a/data/maps/UnknownMap_25_31/map.json b/data/maps/UnknownLinkContestRoom_25_31/map.json similarity index 82% rename from data/maps/UnknownMap_25_31/map.json rename to data/maps/UnknownLinkContestRoom_25_31/map.json index f7b06ac426..9548c11259 100644 --- a/data/maps/UnknownMap_25_31/map.json +++ b/data/maps/UnknownLinkContestRoom_25_31/map.json @@ -1,7 +1,7 @@ { "id": "MAP_UNKNOWN_MAP_25_31", - "name": "UnknownMap_25_31", - "layout": "LAYOUT_UNKNOWN_MAP_25_31", + "name": "UnknownLinkContestRoom_25_31", + "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31", "music": "MUS_NIBI", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, diff --git a/data/maps/UnknownMap_25_31/scripts.inc b/data/maps/UnknownLinkContestRoom_25_31/scripts.inc similarity index 100% rename from data/maps/UnknownMap_25_31/scripts.inc rename to data/maps/UnknownLinkContestRoom_25_31/scripts.inc diff --git a/data/maps/UnknownMap_25_32/map.json b/data/maps/UnknownLinkContestRoom_25_32/map.json similarity index 82% rename from data/maps/UnknownMap_25_32/map.json rename to data/maps/UnknownLinkContestRoom_25_32/map.json index c963d0129a..27411d28e2 100644 --- a/data/maps/UnknownMap_25_32/map.json +++ b/data/maps/UnknownLinkContestRoom_25_32/map.json @@ -1,7 +1,7 @@ { "id": "MAP_UNKNOWN_MAP_25_32", - "name": "UnknownMap_25_32", - "layout": "LAYOUT_UNKNOWN_MAP_25_32", + "name": "UnknownLinkContestRoom_25_32", + "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32", "music": "MUS_NIBI", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, diff --git a/data/maps/UnknownMap_25_32/scripts.inc b/data/maps/UnknownLinkContestRoom_25_32/scripts.inc similarity index 100% rename from data/maps/UnknownMap_25_32/scripts.inc rename to data/maps/UnknownLinkContestRoom_25_32/scripts.inc diff --git a/data/maps/UnknownMap_25_33/map.json b/data/maps/UnknownLinkContestRoom_25_33/map.json similarity index 82% rename from data/maps/UnknownMap_25_33/map.json rename to data/maps/UnknownLinkContestRoom_25_33/map.json index 441f767b6b..1a15ae6d6a 100644 --- a/data/maps/UnknownMap_25_33/map.json +++ b/data/maps/UnknownLinkContestRoom_25_33/map.json @@ -1,7 +1,7 @@ { "id": "MAP_UNKNOWN_MAP_25_33", - "name": "UnknownMap_25_33", - "layout": "LAYOUT_UNKNOWN_MAP_25_33", + "name": "UnknownLinkContestRoom_25_33", + "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33", "music": "MUS_NIBI", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, diff --git a/data/maps/UnknownMap_25_33/scripts.inc b/data/maps/UnknownLinkContestRoom_25_33/scripts.inc similarity index 100% rename from data/maps/UnknownMap_25_33/scripts.inc rename to data/maps/UnknownLinkContestRoom_25_33/scripts.inc diff --git a/data/maps/UnknownMap_25_34/map.json b/data/maps/UnknownLinkContestRoom_25_34/map.json similarity index 82% rename from data/maps/UnknownMap_25_34/map.json rename to data/maps/UnknownLinkContestRoom_25_34/map.json index 7bdf1d2266..4c90858b94 100644 --- a/data/maps/UnknownMap_25_34/map.json +++ b/data/maps/UnknownLinkContestRoom_25_34/map.json @@ -1,7 +1,7 @@ { "id": "MAP_UNKNOWN_MAP_25_34", - "name": "UnknownMap_25_34", - "layout": "LAYOUT_UNKNOWN_MAP_25_34", + "name": "UnknownLinkContestRoom_25_34", + "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34", "music": "MUS_NIBI", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownLinkContestRoom_25_34/scripts.inc similarity index 100% rename from data/maps/UnknownMap_25_34/scripts.inc rename to data/maps/UnknownLinkContestRoom_25_34/scripts.inc diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index e20d1adf24..4088ddbb51 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -461,12 +461,12 @@ "RecordCorner", "DoubleBattleColosseum", "LinkContestRoom1", - "UnknownMap_25_29", - "UnknownMap_25_30", - "UnknownMap_25_31", - "UnknownMap_25_32", - "UnknownMap_25_33", - "UnknownMap_25_34", + "UnknownLinkContestRoom_25_29", + "UnknownLinkContestRoom_25_30", + "UnknownLinkContestRoom_25_31", + "UnknownLinkContestRoom_25_32", + "UnknownLinkContestRoom_25_33", + "UnknownLinkContestRoom_25_34", "LinkContestRoom2", "LinkContestRoom3", "LinkContestRoom4", diff --git a/include/constants/layouts.h b/include/constants/layouts.h index d12db9b33f..d4819c46ad 100755 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -46,7 +46,7 @@ #define LAYOUT_ROUTE127 43 #define LAYOUT_ROUTE128 44 #define LAYOUT_ROUTE129 45 -#define LAYOUT_UNKNOWN_MAP_08417FC4 46 +#define LAYOUT_ROUTE130_MIRAGE_ISLAND 46 #define LAYOUT_ROUTE131 47 #define LAYOUT_ROUTE132 48 #define LAYOUT_ROUTE133 49 @@ -75,7 +75,7 @@ #define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_LOBBY 72 #define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_HALL 73 #define LAYOUT_LILYCOVE_CITY_HOUSE2 74 -#define LAYOUT_UNKNOWN_MAP_08428450 75 +#define LAYOUT_UNKNOWN_08428450 75 #define LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE 76 #define LAYOUT_PACIFIDLOG_TOWN_HOUSE1 77 #define LAYOUT_PACIFIDLOG_TOWN_HOUSE2 78 @@ -83,8 +83,8 @@ #define LAYOUT_HOUSE_WITH_BED 80 #define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F 81 #define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F 82 -#define LAYOUT_UNKNOWN_MAP_084294C4 83 -#define LAYOUT_UNKNOWN_MAP_084294E8 84 +#define LAYOUT_UNKNOWN_084294C4 83 +#define LAYOUT_UNKNOWN_084294E8 84 #define LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB 85 #define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F 86 #define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F 87 @@ -170,20 +170,20 @@ #define LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM 167 #define LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM 168 #define LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM 169 -#define LAYOUT_UNKNOWN_MAP_0843E6C0 170 -#define LAYOUT_UNKNOWN_MAP_0843E6E4 171 -#define LAYOUT_UNKNOWN_MAP_0843E708 172 -#define LAYOUT_UNKNOWN_MAP_0843E72C 173 -#define LAYOUT_UNKNOWN_MAP_0843E750 174 -#define LAYOUT_UNKNOWN_MAP_0843E774 175 -#define LAYOUT_UNKNOWN_MAP_0843E798 176 -#define LAYOUT_UNKNOWN_MAP_0843E7BC 177 -#define LAYOUT_UNKNOWN_MAP_0843E7E0 178 -#define LAYOUT_UNKNOWN_MAP_0843E804 179 -#define LAYOUT_UNKNOWN_MAP_0843E828 180 -#define LAYOUT_UNKNOWN_MAP_0843E84C 181 -#define LAYOUT_UNKNOWN_MAP_0843E870 182 -#define LAYOUT_UNKNOWN_MAP_0843E894 183 +#define LAYOUT_UNKNOWN_0843E6C0 170 +#define LAYOUT_UNKNOWN_0843E6E4 171 +#define LAYOUT_UNKNOWN_0843E708 172 +#define LAYOUT_UNKNOWN_0843E72C 173 +#define LAYOUT_UNKNOWN_0843E750 174 +#define LAYOUT_UNKNOWN_0843E774 175 +#define LAYOUT_UNKNOWN_0843E798 176 +#define LAYOUT_UNKNOWN_0843E7BC 177 +#define LAYOUT_UNKNOWN_0843E7E0 178 +#define LAYOUT_UNKNOWN_0843E804 179 +#define LAYOUT_UNKNOWN_0843E828 180 +#define LAYOUT_UNKNOWN_0843E84C 181 +#define LAYOUT_UNKNOWN_0843E870 182 +#define LAYOUT_UNKNOWN_0843E894 183 #define LAYOUT_NEW_MAUVILLE_ENTRANCE 184 #define LAYOUT_NEW_MAUVILLE_INSIDE 185 #define LAYOUT_ABANDONED_SHIP_DECK 186 @@ -226,12 +226,12 @@ #define LAYOUT_RECORD_CORNER 223 #define LAYOUT_DOUBLE_BATTLE_COLOSSEUM 224 #define LAYOUT_LINK_CONTEST_ROOM1 225 -#define LAYOUT_UNKNOWN_MAP_25_29 226 -#define LAYOUT_UNKNOWN_MAP_25_30 227 -#define LAYOUT_UNKNOWN_MAP_25_31 228 -#define LAYOUT_UNKNOWN_MAP_25_32 229 -#define LAYOUT_UNKNOWN_MAP_25_33 230 -#define LAYOUT_UNKNOWN_MAP_25_34 231 +#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29 226 +#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30 227 +#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31 228 +#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32 229 +#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33 230 +#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34 231 #define LAYOUT_LINK_CONTEST_ROOM2 232 #define LAYOUT_LINK_CONTEST_ROOM3 233 #define LAYOUT_LINK_CONTEST_ROOM4 234 @@ -242,7 +242,7 @@ #define LAYOUT_SAFARI_ZONE_NORTH 239 #define LAYOUT_SAFARI_ZONE_SOUTHWEST 240 #define LAYOUT_SAFARI_ZONE_SOUTH 241 -#define LAYOUT_UNKNOWN_MAP_08447028 242 +#define LAYOUT_UNKNOWN_08447028 242 #define LAYOUT_ROUTE109_SEASHORE_HOUSE 243 #define LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE 244 #define LAYOUT_ROUTE110_TRICK_HOUSE_END 245 @@ -312,21 +312,21 @@ #define LAYOUT_SOOTOPOLIS_CITY_HOUSE3 309 #define LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS 310 #define LAYOUT_SCORCHED_SLAB 311 -#define LAYOUT_UNKNOWN_MAP_0845A394 312 +#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_B4F_LAVA 312 #define LAYOUT_RUSTBORO_CITY_FLAT1_1F 313 #define LAYOUT_RUSTBORO_CITY_FLAT1_2F 314 #define LAYOUT_EVER_GRANDE_CITY_HALL4 315 #define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 316 #define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 317 #define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 318 -#define LAYOUT_UNKNOWN_MAP_0845D470 319 +#define LAYOUT_ROUTE131_SKY_PILLAR 319 #define LAYOUT_SKY_PILLAR_ENTRANCE 320 #define LAYOUT_SKY_PILLAR_OUTSIDE 321 #define LAYOUT_SKY_PILLAR_1F 322 #define LAYOUT_SKY_PILLAR_2F 323 #define LAYOUT_SKY_PILLAR_3F 324 #define LAYOUT_SKY_PILLAR_4F 325 -#define LAYOUT_UNKNOWN_MAP_0845ECB4 326 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM9_LAVA 326 #define LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE 327 #define LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM 328 #define LAYOUT_SAFARI_ZONE_REST_HOUSE 329 @@ -357,9 +357,9 @@ #define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY 354 #define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR 355 #define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM 356 -#define LAYOUT_UNKNOWN_MAP_08469200 357 +#define LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE 357 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 358 -#define LAYOUT_UNKNOWN_MAP_084693AC 359 +#define LAYOUT_UNKNOWN_084693AC 359 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY 360 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE 361 #define LAYOUT_BATTLE_PYRAMID_SQUARE01 362 @@ -432,15 +432,15 @@ #define LAYOUT_BATTLE_FRONTIER_LOUNGE2 429 #define LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE 430 #define LAYOUT_METEOR_FALLS_STEVENS_CAVE 431 -#define LAYOUT_UNKNOWN_MAP_08480DAC 432 -#define LAYOUT_UNKNOWN_MAP_08480F54 433 -#define LAYOUT_UNKNOWN_MAP_084810FC 434 -#define LAYOUT_UNKNOWN_MAP_084812A4 435 -#define LAYOUT_UNKNOWN_MAP_0848144C 436 -#define LAYOUT_UNKNOWN_MAP_084815F4 437 -#define LAYOUT_UNKNOWN_MAP_08481B24 438 +#define LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE 432 +#define LAYOUT_SKY_PILLAR_1F_CLEAN 433 +#define LAYOUT_SKY_PILLAR_2F_CLEAN 434 +#define LAYOUT_SKY_PILLAR_3F_CLEAN 435 +#define LAYOUT_SKY_PILLAR_4F_CLEAN 436 +#define LAYOUT_SKY_PILLAR_5F_CLEAN 437 +#define LAYOUT_SKY_PILLAR_TOP_CLEAN 438 #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F 439 #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F 440 -#define LAYOUT_UNKNOWN_MAP_08481DBC 441 +#define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED 441 #endif // GUARD_CONSTANTS_LAYOUTS_H diff --git a/src/battle_pike.c b/src/battle_pike.c index f2f2025d7f..cc58b81bb2 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -1337,7 +1337,7 @@ bool8 InBattlePike(void) return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 - || gMapHeader.mapLayoutId == LAYOUT_UNKNOWN_MAP_084693AC; + || gMapHeader.mapLayoutId == LAYOUT_UNKNOWN_084693AC; } static void SetHintedRoom(void) From 45297797e6f038ecf30a78306a15cdf5d33a859c Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sat, 9 Feb 2019 21:07:07 -0500 Subject: [PATCH 030/217] Document the intro movie state machine Need to study the water droplet animation more closely before they can be renamed; otherwise, this names every major symbol in this file. --- include/intro.h | 2 +- include/intro_credits_graphics.h | 4 +- include/new_game.h | 2 +- include/title_screen.h | 2 +- src/credits.c | 10 +- src/intro.c | 386 ++++++++++++++++++------------- src/intro_credits_graphics.c | 5 +- src/new_game.c | 2 +- src/reset_save_heap.c | 2 +- src/title_screen.c | 6 +- 10 files changed, 242 insertions(+), 179 deletions(-) diff --git a/include/intro.h b/include/intro.h index b1bfe20a40..198ae26696 100644 --- a/include/intro.h +++ b/include/intro.h @@ -9,6 +9,6 @@ void CB2_InitCopyrightScreenAfterBootup(void); void CB2_InitCopyrightScreenAfterBootup(void); void CB2_InitCopyrightScreenAfterTitleScreen(void); -void sub_816F2A8(u16, u16, u16, u16); +void PanFadeAndZoomScreen(u16, u16, u16, u16); #endif // GUARD_INTRO_H diff --git a/include/intro_credits_graphics.h b/include/intro_credits_graphics.h index 354d62e05c..2c7ceaf57c 100644 --- a/include/intro_credits_graphics.h +++ b/include/intro_credits_graphics.h @@ -9,7 +9,7 @@ extern const struct CompressedSpriteSheet gIntro2BrendanSpriteSheet[]; extern const struct CompressedSpriteSheet gIntro2MaySpriteSheet[]; extern const struct CompressedSpriteSheet gIntro2BicycleSpriteSheet[]; extern const struct CompressedSpriteSheet gIntro2FlygonSpriteSheet[]; -extern const struct SpritePalette gUnknown_085F530C[]; +extern const struct SpritePalette gIntroBikeAndFlygonPalette[]; extern const struct CompressedSpriteSheet gUnknown_085F5334[]; extern const struct CompressedSpriteSheet gUnknown_085F5344[]; extern const struct CompressedSpriteSheet gUnknown_085F5354[]; @@ -21,7 +21,7 @@ void load_intro_part2_graphics(u8 a); void sub_817B150(u8 a); void sub_817B1C8(u8); void sub_817B3A8(u8); -u8 sub_817B3DC(u8 a, u16 b, u16 c, u16 d); +u8 CreateBicycleAnimationTask(u8 a, u16 b, u16 c, u16 d); void sub_817B540(u8); u8 intro_create_brendan_sprite(s16 a, s16 b); u8 intro_create_may_sprite(s16 a, s16 b); diff --git a/include/new_game.h b/include/new_game.h index f4d69cbced..8fab054837 100644 --- a/include/new_game.h +++ b/include/new_game.h @@ -8,7 +8,7 @@ void SetTrainerId(u32 trainerId, u8 *dst); u32 GetTrainerId(u8 *trainerId); void CopyTrainerId(u8 *dst, u8 *src); void NewGameInitData(void); -void sub_808447C(void); +void ResetMenuAndMonGlobals(void); void Sav2_ClearSetDefault(void); #endif // GUARD_NEW_GAME_H diff --git a/include/title_screen.h b/include/title_screen.h index b660792fce..ad0809ed24 100644 --- a/include/title_screen.h +++ b/include/title_screen.h @@ -1,7 +1,7 @@ #ifndef GUARD_TITLE_SCREEN_H #define GUARD_TITLE_SCREEN_H -extern const u16 gUnknown_0853FF70[]; +extern const u16 gIntroWaterDropData[]; void CB2_InitTitleScreen(void); diff --git a/src/credits.c b/src/credits.c index 3639d36e4c..c96c6b4a18 100644 --- a/src/credits.c +++ b/src/credits.c @@ -1869,7 +1869,7 @@ static void sub_817664C(u8 data, u8 taskIdA) gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0; - gTasks[taskIdA].data[TDA_0] = sub_817B3DC(0, 0x2000, 0x20, 8); + gTasks[taskIdA].data[TDA_0] = CreateBicycleAnimationTask(0, 0x2000, 0x20, 8); break; case 1: gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE; @@ -1880,7 +1880,7 @@ static void sub_817664C(u8 data, u8 taskIdA) gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0; - gTasks[taskIdA].data[TDA_0] = sub_817B3DC(0, 0x2000, 0x20, 8); + gTasks[taskIdA].data[TDA_0] = CreateBicycleAnimationTask(0, 0x2000, 0x20, 8); break; case 2: gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE; @@ -1891,7 +1891,7 @@ static void sub_817664C(u8 data, u8 taskIdA) gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0; - gTasks[taskIdA].data[TDA_0] = sub_817B3DC(1, 0x2000, 0x200, 8); + gTasks[taskIdA].data[TDA_0] = CreateBicycleAnimationTask(1, 0x2000, 0x200, 8); break; case 3: gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE; @@ -1902,7 +1902,7 @@ static void sub_817664C(u8 data, u8 taskIdA) gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0; - gTasks[taskIdA].data[TDA_0] = sub_817B3DC(1, 0x2000, 0x200, 8); + gTasks[taskIdA].data[TDA_0] = CreateBicycleAnimationTask(1, 0x2000, 0x200, 8); break; case 4: gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE; @@ -1913,7 +1913,7 @@ static void sub_817664C(u8 data, u8 taskIdA) gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0; - gTasks[taskIdA].data[TDA_0] = sub_817B3DC(2, 0x2000, 0x200, 8); + gTasks[taskIdA].data[TDA_0] = CreateBicycleAnimationTask(2, 0x2000, 0x200, 8); break; } diff --git a/src/intro.c b/src/intro.c index 18a899fb0a..728811e825 100644 --- a/src/intro.c +++ b/src/intro.c @@ -27,14 +27,75 @@ #include "constants/rgb.h" #include "constants/battle_anim.h" +/* + * Intro animation sequence state machine + * -------------------------------------- + * + * Entry Point: CB2_InitCopyrightScreenAfterBootup + * + * Note: States advance sequentially unless otherwise stated. + * + * CB2_InitCopyrightScreenAfterBootup + * - Registers a serial interrupt handler that listens for a GameCube. + * - Waits for 140 frames, and then until palette fading completes. + * - Stops looking for a GameCube for dualboot. + * - Check the save file for corruption + * - Setup global pointers to save file + * - Initialize gHeap + * + * MainCB2_Intro + * - Spawn Task_IntroLoadPart1Graphics + * - If any keys are pressed during the intro, advance to + * MainCB2_EndIntro (which will then kill all tasks). + * + * Task_IntroLoadPart1Graphics + * Task_IntroFadeIn (frame counter starts at 0 here) + * Task_IntroWaterDrops + * - At frame 128 of this state, spawn Task_IntroWaterDrops_1 + * - At frame 256 of this state, spawn Task_IntroWaterDrops_2 + * - At frame 560 of this state, spawn Task_IntroWaterDrops_3 + * Task_IntroScrollDownAndShowFlygon + * Task_IntroWaitToSetupPart2 + * Task_IntroLoadPart2Graphics + * Task_IntroStartBikeRide + * - Spawn Task_AdvanceBicycleAnimation + * Task_IntroHandleBikeAndFlygonMovement + * - At frame 1856, kills the bicycle animation task + * Task_IntroWaitToSetupPart3 + * Task_IntroLoadPart3Graphics (frame counter resets to 0 here) + * Task_IntroSpinAndZoomPokeball + * - Continues until the zoom reaches a certain point + * Task_IntroWaitToSetupPart3LegendsFight + * Task_IntroLoadGroudonScene + * Task_IntroLoadPart3Graphics1 + * Task_IntroLoadPart3Graphics2 + * Task_IntroLoadPart3Graphics3 + * Task_IntroLoadPart3Graphics4 + * Task_IntroGroudonScene + * Task_IntroLoadKyogreScene + * Task_IntroKyogreScene + * Task_IntroLoadClouds1 + * Task_IntroLoadClouds2 + * Task_IntroLoadClouds3 + * Task_IntroCloudsScene + * Task_IntroLoadRayquazaLightningScene + * Task_IntroRaquazaLightningScene + * Task_IntroLoadRaquazaGlowScene + * Task_IntroRaquazaGlowScene_0 + * - Runs concurrently with Task_IntroRaquazaGlowScene_1 + * Task_EndIntroMovie + * MainCB2_EndIntro + * - Advances to CB2_InitTitleScreen + */ + extern const struct CompressedSpriteSheet gBattleAnimPicTable[]; extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; extern const struct SpriteTemplate gUnknown_08596C10[]; //ewram -EWRAM_DATA u16 gUnknown_0203BCC8 = 0; +EWRAM_DATA u16 gIntroCharacterGender = 0; EWRAM_DATA u16 gUnknown_0203BCCA = 0; -EWRAM_DATA u16 gUnknown_0203BCCC = 0; +EWRAM_DATA u16 gIntroGraphicsFlygonYOffset = 0; //iwram u32 gIntroFrameCounter; @@ -67,12 +128,12 @@ static const u8 sUnknownBytes[] = { 0x10, 0x11, 0x12, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x02, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x00 }; -static const struct CompressedSpriteSheet gUnknown_085E4A74[] = +static const struct CompressedSpriteSheet gIntroSpriteSheet_Sparkle[] = { {gIntro1SparkleGfx, 0x400, 1505}, {NULL}, }; -static const struct SpritePalette gUnknown_085E4A84[] = +static const struct SpritePalette gIntroPalette_Lightning[] = { {gIntro3LightningPal, 1505}, {NULL}, @@ -132,14 +193,14 @@ static const u8 gUnknown_085E4AD0[][2] = {0xD0, 0x26}, {0x00, 0x00}, }; -static const struct CompressedSpriteSheet gUnknown_085E4AE8[] = +static const struct CompressedSpriteSheet gIntroPokemonRunningSpriteSheet[] = { {gIntro2VolbeatGfx, 0x400, 1500}, {gIntro2TorchicGfx, 0xC00, 1501}, {gIntro2ManectricGfx, 0x2000, 1502}, {NULL}, }; -static const struct SpritePalette gUnknown_085E4B08[] = +static const struct SpritePalette gIntroPokemonRunningPalette[] = { {gIntro2VolbeatPal, 1500}, {gIntro2TorchicPal, 1501}, @@ -278,12 +339,12 @@ static const struct SpriteTemplate gUnknown_085E4BDC = .affineAnims = gDummySpriteAffineAnimTable, .callback = sub_816DAE8, }; -static const struct CompressedSpriteSheet gUnknown_085E4BF4[] = +static const struct CompressedSpriteSheet gIntroRayquazaLightningSpriteSheet[] = { {gIntro3LightningGfx, 0xC00, 1503}, {NULL}, }; -static const struct SpritePalette gUnknown_085E4C04[] = +static const struct SpritePalette gIntroRayquazaLightningPalette[] = { {gIntro3LightningPal, 1503}, {NULL}, @@ -328,8 +389,8 @@ static const union AnimCmd *const gUnknown_085E4C40[] = gUnknown_085E4C28, gUnknown_085E4C34, }; -static void sub_816EC6C(struct Sprite *sprite); -static const struct SpriteTemplate gUnknown_085E4C4C = +static void SpriteCB_IntroRaquazaLightning(struct Sprite *sprite); +static const struct SpriteTemplate gIntroLightningSprite = { .tileTag = 1503, .paletteTag = 1503, @@ -337,9 +398,9 @@ static const struct SpriteTemplate gUnknown_085E4C4C = .anims = gUnknown_085E4C40, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_816EC6C, + .callback = SpriteCB_IntroRaquazaLightning, }; -static const s16 gUnknown_085E4C64[][3] = +static const s16 gIntroGroudonRockData[][3] = { {0x68, 0x00, 0x0C0}, {0x8E, 0x03, 0x280}, @@ -358,7 +419,7 @@ static const struct SpritePalette gUnknown_085E4C98[] = {gIntro2BubblesPal, 1504}, {NULL}, }; -static const s16 gUnknown_085E4CA8[][3] = +static const s16 gIntroKyogreBubbleData[][3] = { {0x42, 0x40, 0x1}, {0x60, 0x60, 0x8}, @@ -402,7 +463,7 @@ static const union AnimCmd *const gUnknown_085E4D10[] = { gUnknown_085E4CF8, }; -static void sub_816E7B4(struct Sprite *sprite); +static void SpriteCB_IntroKyogreBubbles(struct Sprite *sprite); static const struct SpriteTemplate gUnknown_085E4D14 = { .tileTag = 1504, @@ -411,7 +472,7 @@ static const struct SpriteTemplate gUnknown_085E4D14 = .anims = gUnknown_085E4D10, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_816E7B4, + .callback = SpriteCB_IntroKyogreBubbles, }; static const struct OamData gUnknown_085E4D2C = { @@ -457,7 +518,7 @@ static const union AnimCmd *const gUnknown_085E4D54[] = gUnknown_085E4D4C, }; static void sub_816F454(struct Sprite *sprite); -static const struct SpriteTemplate gUnknown_085E4D64 = +static const struct SpriteTemplate gIntroWaterDropSprite = { .tileTag = 2000, .paletteTag = 2000, @@ -497,7 +558,7 @@ static const union AnimCmd gUnknown_085E4DB4[] = ANIMCMD_FRAME(256, 16), ANIMCMD_END, }; -static const union AnimCmd *const gUnknown_085E4DC4[] = +static const union AnimCmd *const gIntroBicycleAnimationCommands[] = { gUnknown_085E4D7C, gUnknown_085E4D90, @@ -772,17 +833,17 @@ static const struct SpriteTemplate gUnknown_085E4FC4 = .affineAnims = gDummySpriteAffineAnimTable, .callback = sub_816FEDC, }; -static const struct CompressedSpriteSheet gUnknown_085E4FDC[] = +static const struct CompressedSpriteSheet gIntroSpriteSheet_WaterDropAndLogo[] = { {gIntroTiles, 0x1400, 2000}, {NULL}, }; -static const struct CompressedSpriteSheet gUnknown_085E4FEC[] = +static const struct CompressedSpriteSheet gIntroSpriteSheet_Flygon[] = { {gIntro1FlygonGfx, 0x400, 2002}, {NULL}, }; -static const struct SpritePalette gUnknown_085E4FFC[] = +static const struct SpritePalette gIntroPalette_DropLogoFlygon[] = { {gIntro1DropsPal, 2000}, {gIntro1GFLogoPal, 2001}, @@ -814,8 +875,8 @@ static const union AnimCmd *const gUnknown_085E502C[] = { gUnknown_085E5024, }; -static void sub_8170040(struct Sprite *sprite); -static const struct SpriteTemplate gUnknown_085E5030 = +static void SpriteCB_IntroRaquazaHyperbeam(struct Sprite *sprite); +static const struct SpriteTemplate gIntroRaquazaHyperbeamSprite = { .tileTag = 2003, .paletteTag = 2003, @@ -823,14 +884,14 @@ static const struct SpriteTemplate gUnknown_085E5030 = .anims = gUnknown_085E502C, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8170040, + .callback = SpriteCB_IntroRaquazaHyperbeam, }; -static const struct CompressedSpriteSheet gUnknown_085E5048[] = +static const struct CompressedSpriteSheet gIntroRaquazaGlowSpriteSheet[] = { {gIntro3MiscTiles, 0xA00, 2003}, {NULL}, }; -static const struct SpritePalette gUnknown_085E5058[] = +static const struct SpritePalette gIntroRaquazaGlowPalette[] = { {gIntro3Misc1Palette, 2003}, {NULL}, @@ -855,36 +916,36 @@ static void Task_IntroWaitToSetupPart3(u8); static void Task_IntroLoadPart3Graphics(u8); static void Task_IntroSpinAndZoomPokeball(u8); static void Task_IntroWaitToSetupPart3LegendsFight(u8); -static void Task_IntroLoadPart1Graphics3(u8); -static void Task_IntroLoadPart1Graphics4(u8); -static void Task_IntroLoadPart1Graphics5(u8); -static void Task_IntroLoadPart1Graphics6(u8); -static void Task_IntroLoadPart1Graphics7(u8); -static void Task_IntroLoadPart1Graphics8(u8); -static void Task_IntroLoadPart1Graphics9(u8); -static void Task_IntroFadeIn0(u8); -static void Task_IntroFadeIn1(u8); -static void Task_IntroFadeIn2(u8); -static void Task_IntroFadeIn3(u8); -static void Task_IntroFadeIn4(u8); -static void Task_IntroFadeIn5(u8); -static void Task_IntroFadeIn6(u8); -static void Task_IntroFadeIn7(u8); -static void Task_IntroFadeIn8(u8); -static void Task_IntroFadeIn9(u8); -static void sub_816E190(u8); -static void sub_816E1F8(struct Sprite *); -static void sub_816E6D4(u8); -static void sub_816E74C(void); -static void sub_816EEA8(u8); +static void Task_IntroLoadGroudonScene(u8); +static void Task_IntroLoadPart3Graphics1(u8); +static void Task_IntroLoadPart3Graphics2(u8); +static void Task_IntroLoadPart3Graphics3(u8); +static void Task_IntroLoadPart3Graphics4(u8); +static void Task_IntroGroudonScene(u8); +static void Task_IntroLoadKyogreScene(u8); +static void Task_IntroKyogreScene(u8); +static void Task_IntroLoadClouds1(u8); +static void Task_IntroLoadClouds2(u8); +static void Task_IntroLoadClouds3(u8); +static void Task_IntroCloudScene(u8); +static void Task_IntroLoadRaquazaLightningScene(u8); +static void Task_IntroRaquazaLightningScene(u8); +static void Task_IntroLoadRaquazaGlowScene(u8); +static void Task_IntroRaquazaGlowScene_0(u8); +static void Task_EndIntroMovie(u8); +static void CreateGroudonRockSprites(u8); +static void SpriteCB_IntroGroudonRocks(struct Sprite *); +static void CreateKyogreBubbleSprites_0(u8); +static void CreateKyogreBubbleSprites_1(void); +static void Task_IntroRaquazaGlowScene_1(u8); static void sub_816F46C(struct Sprite *); static void sub_816F5B4(struct Sprite *); static void sub_816F660(struct Sprite *); static void SpriteCB_WaterDropFall(struct Sprite *); static void sub_816F318(struct Sprite *); -static void sub_816F9D4(struct Sprite *); -static void sub_816FAB0(struct Sprite *); -static u8 sub_816FDB8(s16, s16, s16); +static void SpriteCB_IntroGraphicsBicycle(struct Sprite *); +static void SpriteCB_IntroGraphicsFlygon(struct Sprite *); +static u8 CreatePart1Animations(s16, s16, s16); static void VBlankCB_Intro(void) { @@ -1006,7 +1067,7 @@ void CB2_InitCopyrightScreenAfterBootup(void) if (!SetUpCopyrightScreen()) { SetSaveBlocksPointers(sub_815355C()); - sub_808447C(); + ResetMenuAndMonGlobals(); Save_ResetSaveCounters(); Save_LoadGameData(SAVE_NORMAL); if (gSaveFileStatus == 0 || gSaveFileStatus == 2) @@ -1024,7 +1085,7 @@ void CB2_InitCopyrightScreenAfterTitleScreen(void) static void Task_IntroLoadPart1Graphics(u8 taskId) { SetVBlankCallback(NULL); - gUnknown_0203BCC8 = Random() & 1; + gIntroCharacterGender = Random() & 1; intro_reset_and_hide_bgs(); SetGpuReg(REG_OFFSET_BG3VOFS, 0); SetGpuReg(REG_OFFSET_BG2VOFS, 0x50); @@ -1044,11 +1105,11 @@ static void Task_IntroLoadPart1Graphics(u8 taskId) SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(20) | BGCNT_16COLOR | BGCNT_TXT256x512); SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(1) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(18) | BGCNT_16COLOR | BGCNT_TXT256x512); SetGpuReg(REG_OFFSET_BG0CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(16) | BGCNT_16COLOR | BGCNT_TXT256x512); - LoadCompressedSpriteSheet(gUnknown_085E4FDC); - LoadCompressedSpriteSheet(gUnknown_085E4FEC); - LoadSpritePalettes(gUnknown_085E4FFC); - LoadCompressedSpriteSheet(gUnknown_085E4A74); - LoadSpritePalettes(gUnknown_085E4A84); + LoadCompressedSpriteSheet(gIntroSpriteSheet_WaterDropAndLogo); + LoadCompressedSpriteSheet(gIntroSpriteSheet_Flygon); + LoadSpritePalettes(gIntroPalette_DropLogoFlygon); + LoadCompressedSpriteSheet(gIntroSpriteSheet_Sparkle); + LoadSpritePalettes(gIntroPalette_Lightning); CpuCopy16(gPlttBufferUnfaded + 0x100, gPlttBufferUnfaded + 0x1F0, 0x20); CpuCopy16(gPlttBufferUnfaded + 0x100, gPlttBufferUnfaded + 0x1E1, 0x1E); CpuCopy16(gPlttBufferUnfaded + 0x100, gPlttBufferUnfaded + 0x1D2, 0x1C); @@ -1056,7 +1117,7 @@ static void Task_IntroLoadPart1Graphics(u8 taskId) CpuCopy16(gPlttBufferUnfaded + 0x100, gPlttBufferUnfaded + 0x1B4, 0x18); CpuCopy16(gPlttBufferUnfaded + 0x100, gPlttBufferUnfaded + 0x1A5, 0x16); CpuCopy16(gPlttBufferUnfaded + 0x100, gPlttBufferUnfaded + 0x196, 0x14); - sub_816FDB8(0x78, 0x50, 0); + CreatePart1Animations(0x78, 0x50, 0); gTasks[taskId].data[0] = CreateWaterDrop(236, -14, 0x200, 1, 0x78, FALSE); gTasks[taskId].func = Task_IntroFadeIn; } @@ -1194,7 +1255,7 @@ static void Task_IntroLoadPart2Graphics(u8 taskId) FreeAllSpritePalettes(); gUnknown_0203BD24 = 0; gUnknown_0203BD26 = 0; - gUnknown_0203BCCC = 0; + gIntroGraphicsFlygonYOffset = 0; load_intro_part2_graphics(1); gTasks[taskId].func = Task_IntroStartBikeRide; } @@ -1203,7 +1264,7 @@ static void Task_IntroStartBikeRide(u8 taskId) { u8 spriteId; - if (gUnknown_0203BCC8 == 0) + if (gIntroCharacterGender == 0) LoadCompressedSpriteSheet(gIntro2BrendanSpriteSheet); else LoadCompressedSpriteSheet(gIntro2MaySpriteSheet); @@ -1213,29 +1274,29 @@ static void Task_IntroStartBikeRide(u8 taskId) for (spriteId = 0; spriteId < 3; spriteId++) { - LoadCompressedSpriteSheet(&gUnknown_085E4AE8[spriteId]); + LoadCompressedSpriteSheet(&gIntroPokemonRunningSpriteSheet[spriteId]); } - LoadSpritePalettes(gUnknown_085F530C); - LoadSpritePalettes(gUnknown_085E4B08); + LoadSpritePalettes(gIntroBikeAndFlygonPalette); + LoadSpritePalettes(gIntroPokemonRunningPalette); CreateSprite(&gUnknown_085E4BDC, 0x110, 0x80, 0); CreateSprite(&gUnknown_085E4BA4, 0x120, 0x6E, 1); - if (gUnknown_0203BCC8 == 0) + if (gIntroCharacterGender == 0) spriteId = intro_create_brendan_sprite(0x110, 100); else spriteId = intro_create_may_sprite(0x110, 100); - gSprites[spriteId].callback = sub_816F9D4; - gSprites[spriteId].anims = gUnknown_085E4DC4; + gSprites[spriteId].callback = SpriteCB_IntroGraphicsBicycle; + gSprites[spriteId].anims = gIntroBicycleAnimationCommands; gTasks[taskId].data[1] = spriteId; CreateSprite(&gUnknown_085E4B40, 0x110, 0x50, 0x4); spriteId = intro_create_flygon_sprite(-0x40, 0x3C); - gSprites[spriteId].callback = sub_816FAB0; + gSprites[spriteId].callback = SpriteCB_IntroGraphicsFlygon; gTasks[taskId].data[2] = spriteId; BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_WHITEALPHA); SetVBlankCallback(VBlankCB_Intro); - gTasks[taskId].data[0] = sub_817B3DC(1, 0x4000, 0x400, 0x10); + gTasks[taskId].data[0] = CreateBicycleAnimationTask(1, 0x4000, 0x400, 0x10); sub_817B150(1); gTasks[taskId].func = Task_IntroHandleBikeAndFlygonMovement; } @@ -1243,11 +1304,12 @@ static void Task_IntroStartBikeRide(u8 taskId) static void Task_IntroHandleBikeAndFlygonMovement(u8 taskId) { s16 a; - u16 sine; + u16 offset; if (gIntroFrameCounter == 1856) { gUnknown_0203BD28 = 2; + // Destroys the CreateBicycleAnimationTask created earlier. DestroyTask(gTasks[taskId].data[0]); } if (gIntroFrameCounter > 1946) @@ -1268,8 +1330,8 @@ static void Task_IntroHandleBikeAndFlygonMovement(u8 taskId) if (gIntroFrameCounter == 1727) gSprites[gTasks[taskId].data[1]].data[0] = 4; - sine = Sin(gTasks[taskId].data[3] >> 2 & 0x7F, 48); - gUnknown_0203BCCC = sine; + offset = Sin(gTasks[taskId].data[3] >> 2 & 0x7F, 48); + gIntroGraphicsFlygonYOffset = offset; if (gTasks[taskId].data[3] < 512) gTasks[taskId].data[3]++; sub_817B540(0); @@ -1493,7 +1555,7 @@ static void Task_IntroLoadPart3Graphics(u8 taskId) gTasks[taskId].data[1] = 0; gTasks[taskId].data[2] = 0; gTasks[taskId].data[3] = 0; - sub_816F2A8(0x78, 0x50, 0, 0); + PanFadeAndZoomScreen(0x78, 0x50, 0, 0); ResetSpriteData(); FreeAllSpritePalettes(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_WHITEALPHA); @@ -1518,7 +1580,7 @@ static void Task_IntroSpinAndZoomPokeball(u8 taskId) gTasks[taskId].func = Task_IntroWaitToSetupPart3LegendsFight; } - sub_816F2A8(0x78, 0x50, 0x10000 / gTasks[taskId].data[1], gTasks[taskId].data[0]); + PanFadeAndZoomScreen(0x78, 0x50, 0x10000 / gTasks[taskId].data[1], gTasks[taskId].data[0]); if (gIntroFrameCounter == 28) BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_WHITEALPHA); @@ -1527,10 +1589,10 @@ static void Task_IntroSpinAndZoomPokeball(u8 taskId) static void Task_IntroWaitToSetupPart3LegendsFight(u8 taskId) { if (gIntroFrameCounter > 43) - gTasks[taskId].func = Task_IntroLoadPart1Graphics3; + gTasks[taskId].func = Task_IntroLoadGroudonScene; } -static void Task_IntroLoadPart1Graphics3(u8 taskId) +static void Task_IntroLoadGroudonScene(u8 taskId) { if (!gPaletteFade.active) { @@ -1545,11 +1607,11 @@ static void Task_IntroLoadPart1Graphics3(u8 taskId) LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_ROCKS)]); LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_ROCKS)]); CpuCopy16(gIntro3BgPal, gPlttBufferUnfaded, sizeof(gIntro3BgPal)); - gTasks[taskId].func = Task_IntroLoadPart1Graphics4; + gTasks[taskId].func = Task_IntroLoadPart3Graphics1; } } -static void Task_IntroLoadPart1Graphics4(u8 taskId) +static void Task_IntroLoadPart3Graphics1(u8 taskId) { SetGpuReg(REG_OFFSET_WIN0H, 0xF0); SetGpuReg(REG_OFFSET_WIN0V, 0xA0); @@ -1577,11 +1639,11 @@ static void Task_IntroLoadPart1Graphics4(u8 taskId) gTasks[taskId].data[1] = 0xFFA0; gTasks[taskId].data[2] = 0xFF51; gTasks[taskId].data[3] = 0x100; - sub_816F2A8(0xFFA0, 0xFF51, 0x100, 0); - gTasks[taskId].func = Task_IntroLoadPart1Graphics5; + PanFadeAndZoomScreen(0xFFA0, 0xFF51, 0x100, 0); + gTasks[taskId].func = Task_IntroLoadPart3Graphics2; } -static void Task_IntroLoadPart1Graphics5(u8 taskId) +static void Task_IntroLoadPart3Graphics2(u8 taskId) { if (gTasks[taskId].data[0] != 32) { @@ -1591,30 +1653,30 @@ static void Task_IntroLoadPart1Graphics5(u8 taskId) else { SetGpuReg(REG_OFFSET_WIN0V, 0x2080); - gTasks[taskId].func = Task_IntroLoadPart1Graphics6; + gTasks[taskId].func = Task_IntroLoadPart3Graphics3; } } -static void Task_IntroLoadPart1Graphics6(u8 taskId) +static void Task_IntroLoadPart3Graphics3(u8 taskId) { - gTasks[taskId].func = Task_IntroLoadPart1Graphics7; + gTasks[taskId].func = Task_IntroLoadPart3Graphics4; } -static void Task_IntroLoadPart1Graphics7(u8 taskId) +static void Task_IntroLoadPart3Graphics4(u8 taskId) { gTasks[taskId].data[0] = 0; - gTasks[taskId].func = Task_IntroLoadPart1Graphics8; + gTasks[taskId].func = Task_IntroGroudonScene; ScanlineEffect_InitWave(0, 0xA0, 0x4, 4, 1, 4, 0); } -static void Task_IntroLoadPart1Graphics8(u8 taskId) +static void Task_IntroGroudonScene(u8 taskId) { s16 *data = gTasks[taskId].data; data[5]++; if ((u16)(data[0] - 1) < 7 && data[5] % 2 == 0) data[4] ^= 3; - sub_816F2A8(data[1], data[2] + data[4], data[3], 0); + PanFadeAndZoomScreen(data[1], data[2] + data[4], data[3], 0); switch (data[0]) { case 0: @@ -1624,7 +1686,7 @@ static void Task_IntroLoadPart1Graphics8(u8 taskId) data[0]++; data[6] = 2; data[7] = 0x1E2; - sub_816E190(taskId); + CreateGroudonRockSprites(taskId); } break; case 1: @@ -1706,30 +1768,30 @@ static void Task_IntroLoadPart1Graphics8(u8 taskId) case 9: if (!gPaletteFade.active) { - gTasks[taskId].func = Task_IntroLoadPart1Graphics9; + gTasks[taskId].func = Task_IntroLoadKyogreScene; gScanlineEffect.state = 3; } break; } } -static void sub_816E190(u8 a0) +static void CreateGroudonRockSprites(u8 a0) { int i; u8 spriteId; for (i = 0; i < 6; i++) { - spriteId = CreateSprite(gUnknown_08596C10, gUnknown_085E4C64[i][0], 0xA0, i); - gSprites[spriteId].callback = sub_816E1F8; + spriteId = CreateSprite(gUnknown_08596C10, gIntroGroudonRockData[i][0], 0xA0, i); + gSprites[spriteId].callback = SpriteCB_IntroGroudonRocks; gSprites[spriteId].oam.priority = 0; gSprites[spriteId].data[1] = i; gSprites[spriteId].data[4] = a0; - StartSpriteAnim(&gSprites[spriteId], gUnknown_085E4C64[i][1]); + StartSpriteAnim(&gSprites[spriteId], gIntroGroudonRockData[i][1]); } } -static void sub_816E1F8(struct Sprite *sprite) +static void SpriteCB_IntroGroudonRocks(struct Sprite *sprite) { sprite->data[3]++; if (sprite->data[3] % 2 == 0) @@ -1738,7 +1800,7 @@ static void sub_816E1F8(struct Sprite *sprite) switch(sprite->data[0]) { case 0: - sprite->data[2] += gUnknown_085E4C64[sprite->data[1]][2]; + sprite->data[2] += gIntroGroudonRockData[sprite->data[1]][2]; sprite->pos1.y -= (sprite->data[2] & 0xFF00) >> 8; sprite->data[2] &= 0xFF; if (gTasks[sprite->data[4]].data[0] > 7) @@ -1758,7 +1820,7 @@ static void sub_816E1F8(struct Sprite *sprite) } } -static void Task_IntroLoadPart1Graphics9(u8 taskId) +static void Task_IntroLoadKyogreScene(u8 taskId) { ResetSpriteData(); LZDecompressVram(gIntro3KyogreGfx, (void *)VRAM); @@ -1767,21 +1829,21 @@ static void Task_IntroLoadPart1Graphics9(u8 taskId) LoadCompressedSpriteSheet(gUnknown_085E4C88); LoadSpritePalette(gUnknown_085E4C98); BeginNormalPaletteFade(0xFFFFFFFE, 0, 0x10, 0, RGB_WHITEALPHA); - gTasks[taskId].func = Task_IntroFadeIn0; + gTasks[taskId].func = Task_IntroKyogreScene; gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 0x150; gTasks[taskId].data[2] = 0x50; gTasks[taskId].data[6] = 0x10; gTasks[taskId].data[3] = 0x100; - sub_816F2A8(0x150, 0x50, 0x100, 0); + PanFadeAndZoomScreen(0x150, 0x50, 0x100, 0); ScanlineEffect_InitWave(0, 0xA0, 4, 4, 1, 6, 0); } -static void Task_IntroFadeIn0(u8 taskId) +static void Task_IntroKyogreScene(u8 taskId) { s16 *data = gTasks[taskId].data; - sub_816F2A8(data[1], data[2], data[3], 0); + PanFadeAndZoomScreen(data[1], data[2], data[3], 0); switch (data[0]) { @@ -1798,7 +1860,7 @@ static void Task_IntroFadeIn0(u8 taskId) data[6] = 0x19; data[7] = 1; data[0]++; - sub_816E6D4(0); + CreateKyogreBubbleSprites_0(0); } break; case 2: @@ -1808,8 +1870,8 @@ static void Task_IntroFadeIn0(u8 taskId) gTasks[taskId].data[2] -= 0x102; data[6] = 8; data[0]++; - sub_816E6D4(0); - sub_816E74C(); + CreateKyogreBubbleSprites_0(0); + CreateKyogreBubbleSprites_1(); } break; case 3: @@ -1891,7 +1953,7 @@ static void Task_IntroFadeIn0(u8 taskId) { data[6] = 0; data[0]++; - sub_816E6D4(taskId); + CreateKyogreBubbleSprites_0(taskId); } break; case 11: @@ -1914,43 +1976,43 @@ static void Task_IntroFadeIn0(u8 taskId) case 13: if (!gPaletteFade.active) { - gTasks[taskId].func = Task_IntroFadeIn1; + gTasks[taskId].func = Task_IntroLoadClouds1; gScanlineEffect.state = 3; } break; } } -static void sub_816E6D4(u8 a0) +static void CreateKyogreBubbleSprites_0(u8 taskId) { int i; u8 spriteId; for (i = 0; i < 6; i++) { - spriteId = CreateSprite(&gUnknown_085E4D14, gUnknown_085E4CA8[i][0], gUnknown_085E4CA8[i][1], i); + spriteId = CreateSprite(&gUnknown_085E4D14, gIntroKyogreBubbleData[i][0], gIntroKyogreBubbleData[i][1], i); gSprites[spriteId].invisible = TRUE; - gSprites[spriteId].data[5] = a0; - gSprites[spriteId].data[6] = gUnknown_085E4CA8[i][2]; + gSprites[spriteId].data[5] = taskId; + gSprites[spriteId].data[6] = gIntroKyogreBubbleData[i][2]; gSprites[spriteId].data[7] = 0x40; } } -static void sub_816E74C(void) +static void CreateKyogreBubbleSprites_1(void) { int i; u8 spriteId; for (i = 0; i < 6; i++) { - spriteId = CreateSprite(&gUnknown_085E4D14, gUnknown_085E4CA8[i + 6][0], gUnknown_085E4CA8[i + 6][1], i); + spriteId = CreateSprite(&gUnknown_085E4D14, gIntroKyogreBubbleData[i + 6][0], gIntroKyogreBubbleData[i + 6][1], i); gSprites[spriteId].invisible = TRUE; - gSprites[spriteId].data[6] = gUnknown_085E4CA8[i][2]; + gSprites[spriteId].data[6] = gIntroKyogreBubbleData[i][2]; gSprites[spriteId].data[7] = 0x40; } } -static void sub_816E7B4(struct Sprite *sprite) +static void SpriteCB_IntroKyogreBubbles(struct Sprite *sprite) { switch(sprite->data[0]) { @@ -1988,7 +2050,7 @@ static void sub_816E7B4(struct Sprite *sprite) } } -static void Task_IntroFadeIn1(u8 taskId) +static void Task_IntroLoadClouds1(u8 taskId) { SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 @@ -2027,27 +2089,27 @@ static void Task_IntroFadeIn1(u8 taskId) LZDecompressVram(gIntro3CloudsGfx, (void *)VRAM); LZDecompressVram(gIntro3CloudsGfx, (void *)(VRAM + 0x4000)); LZDecompressVram(gIntro3Clouds3Tilemap, (void *)(VRAM + 0xE000)); - gTasks[taskId].func = Task_IntroFadeIn2; + gTasks[taskId].func = Task_IntroLoadClouds2; } -static void Task_IntroFadeIn2(u8 taskId) +static void Task_IntroLoadClouds2(u8 taskId) { LZDecompressVram(gIntro3Clouds1Tilemap, (void *)(VRAM + 0xC000)); LZDecompressVram(gIntro3Clouds2Tilemap, (void *)(VRAM + 0xD000)); - gTasks[taskId].func = Task_IntroFadeIn3; + gTasks[taskId].func = Task_IntroLoadClouds3; } -static void Task_IntroFadeIn3(u8 taskId) +static void Task_IntroLoadClouds3(u8 taskId) { SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); SetGpuReg(REG_OFFSET_BLDY, 0); - gTasks[taskId].func = Task_IntroFadeIn4; + gTasks[taskId].func = Task_IntroCloudScene; gTasks[taskId].data[0] = 0; gTasks[taskId].data[6] = 16; } -static void Task_IntroFadeIn4(u8 taskId) +static void Task_IntroCloudScene(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -2071,12 +2133,12 @@ static void Task_IntroFadeIn4(u8 taskId) if (data[6] != 0) data[6] -= 0x80; else if (!gPaletteFade.active) - gTasks[taskId].func = Task_IntroFadeIn5; + gTasks[taskId].func = Task_IntroLoadRaquazaLightningScene; break; } } -static void Task_IntroFadeIn5(u8 taskId) +static void Task_IntroLoadRaquazaLightningScene(u8 taskId) { LZDecompressVram(gIntro3RayquazaTilemap, (void *)(VRAM + 0xE000)); LZDecompressVram(gIntro3Clouds4Tilemap, (void *)(VRAM + 0xC000)); @@ -2088,15 +2150,15 @@ static void Task_IntroFadeIn5(u8 taskId) | DISPCNT_BG2_ON | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON); - gTasks[taskId].func = Task_IntroFadeIn6; + gTasks[taskId].func = Task_IntroRaquazaLightningScene; gTasks[taskId].data[0] = 0; gTasks[taskId].data[6] = 1; gTasks[taskId].data[7] = 0; - LoadCompressedSpriteSheetUsingHeap(gUnknown_085E4BF4); - LoadSpritePalettes(gUnknown_085E4C04); + LoadCompressedSpriteSheetUsingHeap(gIntroRayquazaLightningSpriteSheet); + LoadSpritePalettes(gIntroRayquazaLightningPalette); } -static void Task_IntroFadeIn6(u8 taskId) +static void Task_IntroRaquazaLightningScene(u8 taskId) { s16 *data = gTasks[taskId].data; u8 spriteId; @@ -2106,10 +2168,10 @@ static void Task_IntroFadeIn6(u8 taskId) case 0: if (--data[6] == 0) { - CreateSprite(&gUnknown_085E4C4C, 200, 48, 0); - spriteId = CreateSprite(&gUnknown_085E4C4C, 200, 80, 1); + CreateSprite(&gIntroLightningSprite, 200, 48, 0); + spriteId = CreateSprite(&gIntroLightningSprite, 200, 80, 1); StartSpriteAnim(&gSprites[spriteId], 1); - spriteId = CreateSprite(&gUnknown_085E4C4C, 200, 112, 2); + spriteId = CreateSprite(&gIntroLightningSprite, 200, 112, 2); StartSpriteAnim(&gSprites[spriteId], 2); data[0]++; data[6] = 72; @@ -2118,10 +2180,10 @@ static void Task_IntroFadeIn6(u8 taskId) case 1: if (--data[6] == 0) { - CreateSprite(&gUnknown_085E4C4C, 40, 48, 0); - spriteId = CreateSprite(&gUnknown_085E4C4C, 40, 80, 1); + CreateSprite(&gIntroLightningSprite, 40, 48, 0); + spriteId = CreateSprite(&gIntroLightningSprite, 40, 80, 1); StartSpriteAnim(&gSprites[spriteId], 1); - spriteId = CreateSprite(&gUnknown_085E4C4C, 40, 112, 2); + spriteId = CreateSprite(&gIntroLightningSprite, 40, 112, 2); StartSpriteAnim(&gSprites[spriteId], 2); data[0]++; data[6] = 48; @@ -2129,12 +2191,12 @@ static void Task_IntroFadeIn6(u8 taskId) break; case 2: if (--data[6] == 0) - gTasks[taskId].func = Task_IntroFadeIn7; + gTasks[taskId].func = Task_IntroLoadRaquazaGlowScene; break; } } -static void sub_816EC6C(struct Sprite *sprite) +static void SpriteCB_IntroRaquazaLightning(struct Sprite *sprite) { if (sprite->animEnded) sprite->invisible = TRUE; @@ -2165,30 +2227,30 @@ static void sub_816EC6C(struct Sprite *sprite) } } -static void Task_IntroFadeIn7(u8 taskId) +static void Task_IntroLoadRaquazaGlowScene(u8 taskId) { u8 newTaskId; - LoadCompressedSpriteSheet(gUnknown_085E5048); - LoadSpritePalettes(gUnknown_085E5058); + LoadCompressedSpriteSheet(gIntroRaquazaGlowSpriteSheet); + LoadSpritePalettes(gIntroRaquazaGlowPalette); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON); - gTasks[taskId].func = Task_IntroFadeIn8; + gTasks[taskId].func = Task_IntroRaquazaGlowScene_0; BeginNormalPaletteFade(0x0000FFDE, 0, 16, 0, RGB(9, 10, 10)); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 0xA8; gTasks[taskId].data[2] = -0x10; gTasks[taskId].data[3] = -0x88; gTasks[taskId].data[4] = -0x10; - newTaskId = CreateTask(sub_816EEA8, 0); + newTaskId = CreateTask(Task_IntroRaquazaGlowScene_1, 0); gTasks[newTaskId].data[4] = taskId; } -static void Task_IntroFadeIn8(u8 taskId) +static void Task_IntroRaquazaGlowScene_0(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -2230,22 +2292,22 @@ static void Task_IntroFadeIn8(u8 taskId) break; case 3: if (--data[5] == 0) - gTasks[taskId].func = Task_IntroFadeIn9; + gTasks[taskId].func = Task_EndIntroMovie; break; } } -static void Task_IntroFadeIn9(u8 taskId) +static void Task_EndIntroMovie(u8 taskId) { DestroyTask(taskId); SetMainCallback2(MainCB2_EndIntro); } -static void sub_816EEA8(u8 taskId) +static void Task_IntroRaquazaGlowScene_1(u8 taskId) { + // Note: data[4] contains the taskId of Task_IntroRaquazaGlowScene_0 u8 spriteId; s16 *data = gTasks[taskId].data; - data[2]++; switch(data[0]) @@ -2292,7 +2354,7 @@ static void sub_816EEA8(u8 taskId) } if (data[1] == 6) { - spriteId = CreateSprite(&gUnknown_085E5030, 120, 88, 15); + spriteId = CreateSprite(&gIntroRaquazaHyperbeamSprite, 120, 88, 15); PlaySE(SE_OP_BASYU); gSprites[spriteId].invisible = TRUE; gSprites[spriteId].data[3] = data[4]; @@ -2365,7 +2427,7 @@ static void Task_IntroWaterDrops_1(u8 taskId) | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD); - SetGpuReg(REG_OFFSET_BLDALPHA, gUnknown_0853FF70[31]); + SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[31]); SetGpuReg(REG_OFFSET_BLDY, 0); gTasks[taskId].data[1] = 0x40; gTasks[taskId].data[0]++; @@ -2377,11 +2439,11 @@ static void Task_IntroWaterDrops_1(u8 taskId) gTasks[taskId].data[1]--; tmp = gTasks[taskId].data[1] / 2; - SetGpuReg(REG_OFFSET_BLDALPHA, gUnknown_0853FF70[tmp]); + SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[tmp]); } else { - SetGpuReg(REG_OFFSET_BLDALPHA, gUnknown_0853FF70[0]); + SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[0]); gTasks[taskId].data[1] = 0x10; gTasks[taskId].data[0]++; } @@ -2408,7 +2470,7 @@ static void Task_IntroWaterDrops_2(u8 taskId) | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD); - SetGpuReg(REG_OFFSET_BLDALPHA, gUnknown_0853FF70[0]); + SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[0]); SetGpuReg(REG_OFFSET_BLDY, 0); gTasks[taskId].data[1] = 0; gTasks[taskId].data[0]++; @@ -2420,11 +2482,11 @@ static void Task_IntroWaterDrops_2(u8 taskId) gTasks[taskId].data[1]++; tmp = gTasks[taskId].data[1] / 2; - SetGpuReg(REG_OFFSET_BLDALPHA, gUnknown_0853FF70[tmp]); + SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[tmp]); } else { - SetGpuReg(REG_OFFSET_BLDALPHA, gUnknown_0853FF70[31]); + SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[31]); gTasks[taskId].data[1] = 0x10; gTasks[taskId].data[0]++; } @@ -2445,15 +2507,15 @@ static void Task_IntroWaterDrops_2(u8 taskId) } } -void sub_816F2A8(u16 scrX, u16 scrY, u16 zoom, u16 alpha) +void PanFadeAndZoomScreen(u16 screenX, u16 screenY, u16 zoom, u16 alpha) { struct BgAffineSrcData src; struct BgAffineDstData dest; src.texX = 0x8000; src.texY = 0x8000; - src.scrX = scrX; - src.scrY = scrY; + src.scrX = screenX; + src.scrY = screenY; src.sx = zoom; src.sy = zoom; src.alpha = alpha; @@ -2662,7 +2724,7 @@ static u8 CreateWaterDrop(s16 x, s16 y, u16 c, u16 d, u16 e, u8 fallImmediately) u8 spriteId; u8 oldSpriteId; - spriteId = CreateSprite(&gUnknown_085E4D64, x, y, 1); + spriteId = CreateSprite(&gIntroWaterDropSprite, x, y, 1); gSprites[spriteId].data[0] = 0; gSprites[spriteId].data[7] = 0; gSprites[spriteId].data[1] = d; @@ -2680,7 +2742,7 @@ static u8 CreateWaterDrop(s16 x, s16 y, u16 c, u16 d, u16 e, u8 fallImmediately) gSprites[spriteId].callback = SpriteCB_WaterDropFall_2; oldSpriteId = spriteId; - spriteId = CreateSprite(&gUnknown_085E4D64, x, y, 1); + spriteId = CreateSprite(&gIntroWaterDropSprite, x, y, 1); gSprites[spriteId].data[7] = oldSpriteId; gSprites[spriteId].data[1] = d + 1; gSprites[spriteId].oam.affineMode = 3; @@ -2688,7 +2750,7 @@ static u8 CreateWaterDrop(s16 x, s16 y, u16 c, u16 d, u16 e, u8 fallImmediately) CalcCenterToCornerVec(&gSprites[spriteId], 0, 2, 2); gSprites[spriteId].callback = sub_816F3A4; - spriteId = CreateSprite(&gUnknown_085E4D64, x, y, 1); + spriteId = CreateSprite(&gIntroWaterDropSprite, x, y, 1); gSprites[spriteId].data[7] = oldSpriteId; gSprites[spriteId].data[1] = d + 2; StartSpriteAnim(&gSprites[spriteId], 1); @@ -2704,7 +2766,7 @@ static u8 CreateWaterDrop(s16 x, s16 y, u16 c, u16 d, u16 e, u8 fallImmediately) return oldSpriteId; } -static void sub_816F9D4(struct Sprite *sprite) +static void SpriteCB_IntroGraphicsBicycle(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -2753,7 +2815,7 @@ static void sub_816F9D4(struct Sprite *sprite) } } -static void sub_816FAB0(struct Sprite *sprite) +static void SpriteCB_IntroGraphicsFlygon(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -2776,7 +2838,7 @@ static void sub_816FAB0(struct Sprite *sprite) sprite->pos2.x -= 2; break; } - sprite->pos2.y = Sin((u8)sprite->data[1], 8) - gUnknown_0203BCCC; + sprite->pos2.y = Sin((u8)sprite->data[1], 8) - gIntroGraphicsFlygonYOffset; sprite->data[1] += 4; } @@ -2896,7 +2958,7 @@ static void sub_816FD44(struct Sprite *sprite) } } -static u8 sub_816FDB8(s16 a0, s16 a1, s16 a2) +static u8 CreatePart1Animations(s16 a0, s16 a1, s16 a2) { u16 i; u8 spriteId; @@ -2981,7 +3043,7 @@ static void sub_816FEDC(struct Sprite *sprite) } } -static void sub_8170040(struct Sprite *sprite) +static void SpriteCB_IntroRaquazaHyperbeam(struct Sprite *sprite) { u16 foo; diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index d85e58938b..ba1f561583 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -269,7 +269,7 @@ const struct CompressedSpriteSheet gIntro2FlygonSpriteSheet[] = { { NULL } }; -const struct SpritePalette gUnknown_085F530C[] = { +const struct SpritePalette gIntroBikeAndFlygonPalette[] = { { gIntro2BrendanNoTurnPal, 1002 }, { gIntro2BrendanNoTurnPal, 1003 }, { gIntro2FlygonPal, 1004 }, @@ -358,6 +358,7 @@ void load_intro_part2_graphics(u8 a) gReservedSpritePaletteCount = 8; } +// Note: This is only called with a=1. void sub_817B150(u8 a) { switch (a) @@ -509,7 +510,7 @@ void sub_817B3A8(u8 a) | DISPCNT_OBJ_ON); } -u8 sub_817B3DC(u8 a, u16 b, u16 c, u16 d) +u8 CreateBicycleAnimationTask(u8 a, u16 b, u16 c, u16 d) { u8 taskId = CreateTask(&sub_817B458, 0); diff --git a/src/new_game.c b/src/new_game.c index f68ed3d4fb..a4bf2951ff 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -146,7 +146,7 @@ void Sav2_ClearSetDefault(void) SetDefaultOptions(); } -void sub_808447C(void) +void ResetMenuAndMonGlobals(void) { gDifferentSaveFile = 0; sub_80BB358(); diff --git a/src/reset_save_heap.c b/src/reset_save_heap.c index d7c93a75c2..95d63a3233 100644 --- a/src/reset_save_heap.c +++ b/src/reset_save_heap.c @@ -19,7 +19,7 @@ void sub_81700F8(void) REG_IME = imeBackup; gMain.inBattle = FALSE; SetSaveBlocksPointers(sub_815355C()); - sub_808447C(); + ResetMenuAndMonGlobals(); Save_ResetSaveCounters(); Save_LoadGameData(0); if (gSaveFileStatus == 0 || gSaveFileStatus == 2) diff --git a/src/title_screen.c b/src/title_screen.c index 48571ff96c..06bb066bb5 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -64,7 +64,7 @@ static const u32 sTitleScreenRayquazaTilemap[] = INCBIN_U32("graphics/title_scre static const u32 sTitleScreenLogoShineGfx[] = INCBIN_U32("graphics/title_screen/logo_shine.4bpp.lz"); static const u32 sTitleScreenCloudsGfx[] = INCBIN_U32("graphics/title_screen/clouds.4bpp.lz"); -const u16 gUnknown_0853FF70[] = +const u16 gIntroWaterDropData[] = { 0x0010, 0x0110, 0x0210, 0x0310, 0x0410, 0x0510, 0x0610, 0x0710, 0x0810, 0x0910, 0x0a10, 0x0b10, 0x0c10, 0x0d10, 0x0e10, 0x0f10, @@ -324,7 +324,7 @@ static void SpriteCB_VersionBannerLeft(struct Sprite *sprite) sprite->pos1.y++; if (sprite->data[0] != 0) sprite->data[0]--; - SetGpuReg(REG_OFFSET_BLDALPHA, gUnknown_0853FF70[sprite->data[0]]); + SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[sprite->data[0]]); } } @@ -542,7 +542,7 @@ void CB2_InitTitleScreen(void) gMain.state = 4; break; case 4: - sub_816F2A8(0x78, 0x50, 0x100, 0); + PanFadeAndZoomScreen(0x78, 0x50, 0x100, 0); SetGpuReg(REG_OFFSET_BG2X_L, -29 * 256); SetGpuReg(REG_OFFSET_BG2X_H, -1); SetGpuReg(REG_OFFSET_BG2Y_L, -32 * 256); From 37bea25b01be5cf970882e9b9f21a411fabcc4bf Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sat, 9 Feb 2019 21:50:12 -0500 Subject: [PATCH 031/217] Name the possible return values of palette fading functions Also replace implicit conversion from gPalette.active into a status with if statements, to make the return value clear. I've also added comments when the check is redundant. --- include/palette.h | 5 +++++ src/palette.c | 33 +++++++++++++++++++++------------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/include/palette.h b/include/palette.h index e24da3e00b..84794afc9d 100644 --- a/include/palette.h +++ b/include/palette.h @@ -9,6 +9,11 @@ #define PLTT_BUFFER_SIZE 0x200 #define PLTT_DECOMP_BUFFER_SIZE (PLTT_BUFFER_SIZE * 2) +#define PALETTE_FADE_STATUS_DELAY 2 +#define PALETTE_FADE_STATUS_ACTIVE 1 +#define PALETTE_FADE_STATUS_DONE 0 +#define PALETTE_FADE_STATUS_LOADING -1 + enum { FAST_FADE_IN_FROM_WHITE, diff --git a/src/palette.c b/src/palette.c index be51438768..5d1d6635c3 100644 --- a/src/palette.c +++ b/src/palette.c @@ -115,7 +115,7 @@ u8 UpdatePaletteFade(void) u8 dummy = 0; if (sPlttBufferTransferPending) - return -1; + return PALETTE_FADE_STATUS_LOADING; if (gPaletteFade.mode == NORMAL_FADE) result = UpdateNormalPaletteFade(); @@ -409,11 +409,11 @@ static u8 UpdateNormalPaletteFade(void) u16 selectedPalettes; if (!gPaletteFade.active) - return 0; + return PALETTE_FADE_STATUS_DONE; if (IsSoftwarePaletteFadeFinishing()) { - return gPaletteFade.active; + return gPaletteFade.active ? PALETTE_FADE_STATUS_ACTIVE : PALETTE_FADE_STATUS_DONE; } else { @@ -483,7 +483,9 @@ static u8 UpdateNormalPaletteFade(void) } } - return gPaletteFade.active; + // gPaletteFade.active cannot change since the last time it was checked. So this + // is equivalent to `return PALETTE_FADE_STATUS_ACTIVE;` + return gPaletteFade.active ? PALETTE_FADE_STATUS_ACTIVE : PALETTE_FADE_STATUS_DONE; } } @@ -578,10 +580,11 @@ static u8 UpdateFastPaletteFade(void) s8 b; if (!gPaletteFade.active) - return 0; + return PALETTE_FADE_STATUS_DONE; if (IsSoftwarePaletteFadeFinishing()) - return gPaletteFade.active; + return gPaletteFade.active ? PALETTE_FADE_STATUS_ACTIVE : PALETTE_FADE_STATUS_DONE; + if (gPaletteFade.objPaletteToggle) { @@ -688,7 +691,9 @@ static u8 UpdateFastPaletteFade(void) gPaletteFade.objPaletteToggle ^= 1; if (gPaletteFade.objPaletteToggle) - return gPaletteFade.active; + // gPaletteFade.active cannot change since the last time it was checked. So this + // is equivalent to `return PALETTE_FADE_STATUS_ACTIVE;` + return gPaletteFade.active ? PALETTE_FADE_STATUS_ACTIVE : PALETTE_FADE_STATUS_DONE; if (gPaletteFade.y - gPaletteFade.deltaY < 0) gPaletteFade.y = 0; @@ -714,8 +719,10 @@ static u8 UpdateFastPaletteFade(void) gPaletteFade.mode = NORMAL_FADE; gPaletteFade.softwareFadeFinishing = 1; } - - return gPaletteFade.active; + + // gPaletteFade.active cannot change since the last time it was checked. So this + // is equivalent to `return PALETTE_FADE_STATUS_ACTIVE;` + return gPaletteFade.active ? PALETTE_FADE_STATUS_ACTIVE : PALETTE_FADE_STATUS_DONE; } void BeginHardwarePaletteFade(u8 blendCnt, u8 delay, u8 y, u8 targetY, u8 shouldResetBlendRegisters) @@ -739,12 +746,12 @@ void BeginHardwarePaletteFade(u8 blendCnt, u8 delay, u8 y, u8 targetY, u8 should static u8 UpdateHardwarePaletteFade(void) { if (!gPaletteFade.active) - return 0; + return PALETTE_FADE_STATUS_DONE; if (gPaletteFade.delayCounter < gPaletteFade_delay) { gPaletteFade.delayCounter++; - return 2; + return PALETTE_FADE_STATUS_DELAY; } gPaletteFade.delayCounter = 0; @@ -778,7 +785,9 @@ static u8 UpdateHardwarePaletteFade(void) gPaletteFade.shouldResetBlendRegisters = 0; } - return gPaletteFade.active; + // gPaletteFade.active cannot change since the last time it was checked. So this + // is equivalent to `return PALETTE_FADE_STATUS_ACTIVE;` + return gPaletteFade.active ? PALETTE_FADE_STATUS_ACTIVE : PALETTE_FADE_STATUS_DONE; } static void UpdateBlendRegisters(void) From d0cc8dfc174994fea3510e6e271d7af9899e0bf8 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sat, 9 Feb 2019 22:02:56 -0500 Subject: [PATCH 032/217] Change negative constant into unsigned hex constant --- include/palette.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/palette.h b/include/palette.h index 84794afc9d..8d16270aa3 100644 --- a/include/palette.h +++ b/include/palette.h @@ -12,7 +12,7 @@ #define PALETTE_FADE_STATUS_DELAY 2 #define PALETTE_FADE_STATUS_ACTIVE 1 #define PALETTE_FADE_STATUS_DONE 0 -#define PALETTE_FADE_STATUS_LOADING -1 +#define PALETTE_FADE_STATUS_LOADING 0xFF enum { From 3fd878483f38145cb4311d377f99545f25af52a8 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 10 Feb 2019 00:50:46 -0500 Subject: [PATCH 033/217] Start renaming symbols I finally figured out what the code is trying to do. I have a foothold; the rest should follow. --- common_syms/overworld.txt | 2 +- data/scripts/cable_club.inc | 4 +- include/cable_club.h | 2 +- include/global.h | 4 +- include/overworld.h | 2 +- include/trainer_card.h | 2 +- src/cable_club.c | 12 +- src/overworld.c | 327 +++++++++++++++++++----------------- src/rom_8011DC0.c | 4 +- src/start_menu.c | 4 +- src/trainer_card.c | 2 +- 11 files changed, 197 insertions(+), 168 deletions(-) diff --git a/common_syms/overworld.txt b/common_syms/overworld.txt index b92da84ec7..dcf48cb6ce 100644 --- a/common_syms/overworld.txt +++ b/common_syms/overworld.txt @@ -4,5 +4,5 @@ gBGTilemapBuffers3 gUnknown_03005DA8 gFieldCallback gFieldCallback2 -gUnknown_03005DB4 +gLinkGuestPlayerId gFieldLinkPlayerCount diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index b73d7e1fac..b1e34278fd 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -914,14 +914,14 @@ RecordCorner_EventScript_277471:: @ 8277471 releaseall end -EventScript_TradeRoom_ReadTrainerCard1:: @ 827747E +EventScript_TradeRoom_ReadTrainerCard_NoColor:: @ 827747E msgbox Text_278452, MSGBOX_DEFAULT fadescreen 1 special sp02A_crash_sound waitstate end -EventScript_TradeRoom_ReadTrainerCard2:: @ 827748D +EventScript_TradeRoom_ReadTrainerCard_Normal:: @ 827748D msgbox Text_27847B, MSGBOX_DEFAULT fadescreen 1 special sp02A_crash_sound diff --git a/include/cable_club.h b/include/cable_club.h index 60d56460d9..c2849ca3eb 100644 --- a/include/cable_club.h +++ b/include/cable_club.h @@ -15,6 +15,6 @@ void sub_80B360C(void); bool32 sub_80B2AF4(u16 *arg0, u16 *arg1); void sub_80B3AF8(u8 taskId); void task00_08081A90(u8 taskId); -bool32 sub_80B39D4(u8 linkPlayerIndex); +bool32 GetLinkTrainerCardColor(u8 linkPlayerIndex); #endif //GUARD_CABLE_CLUB_H diff --git a/include/global.h b/include/global.h index 14a6387cdc..64d039c6fc 100644 --- a/include/global.h +++ b/include/global.h @@ -907,12 +907,12 @@ struct MapPosition s8 height; }; -struct UnkStruct_8054FF8 +struct TradeRoomTrainer { u8 a; u8 b; u8 c; - u8 d; + u8 facing; struct MapPosition sub; u16 field_C; }; diff --git a/include/overworld.h b/include/overworld.h index 79cbf1da32..1a8702d713 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -25,7 +25,7 @@ extern u16 *gBGTilemapBuffers3; extern u16 gUnknown_03005DA8; extern void (*gFieldCallback)(void); extern bool8 (*gFieldCallback2)(void); -extern u8 gUnknown_03005DB4; +extern u8 gLinkGuestPlayerId; extern u8 gFieldLinkPlayerCount; // Exported ROM declarations diff --git a/include/trainer_card.h b/include/trainer_card.h index 1cadbd8fcc..173d23baa4 100644 --- a/include/trainer_card.h +++ b/include/trainer_card.h @@ -43,7 +43,7 @@ struct TrainerCard extern struct TrainerCard gTrainerCards[4]; u32 CountPlayerTrainerStars(void); -u8 sub_80C4904(u8 cardId); +u8 GetTrainerCardStars(u8 cardId); void CopyTrainerCardData(struct TrainerCard *dst, u16 *src, u8 gameVersion); void ShowPlayerTrainerCard(void (*callback)(void)); void ShowTrainerCardInLink(u8 arg0, void (*callback)(void)); diff --git a/src/cable_club.c b/src/cable_club.c index 303b0d016c..a778ff5597 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -352,7 +352,7 @@ static void sub_80B2918(u8 taskId) else { gFieldLinkPlayerCount = GetLinkPlayerCount_2(); - gUnknown_03005DB4 = GetMultiplayerId(); + gLinkGuestPlayerId = GetMultiplayerId(); sub_800AA04(gFieldLinkPlayerCount); card = (struct TrainerCard *)gBlockSendBuffer; TrainerCard_GenerateCardForPlayer(card); @@ -399,7 +399,7 @@ static void sub_80B2A08(u8 taskId) else { gFieldLinkPlayerCount = GetLinkPlayerCount_2(); - gUnknown_03005DB4 = GetMultiplayerId(); + gLinkGuestPlayerId = GetMultiplayerId(); sub_800AA04(gFieldLinkPlayerCount); card = (struct TrainerCard *)gBlockSendBuffer; TrainerCard_GenerateCardForPlayer(card); @@ -972,7 +972,7 @@ void sub_80B360C(void) if (gSpecialVar_0x8004 == 1 || gSpecialVar_0x8004 == 2) { - UpdatePlayerLinkBattleRecords(gUnknown_03005DB4 ^ 1); + UpdatePlayerLinkBattleRecords(gLinkGuestPlayerId ^ 1); if (gWirelessCommType) { switch (gBattleOutcome) @@ -1177,14 +1177,16 @@ void sp02A_crash_sound(void) ShowTrainerCardInLink(gSpecialVar_0x8006, CB2_ReturnToFieldContinueScriptPlayMapMusic); } -bool32 sub_80B39D4(u8 linkPlayerIndex) +// Returns FALSE if the player has no stars. Returns TRUE otherwise, and puts the name of the +// color into gStringVar2. +bool32 GetLinkTrainerCardColor(u8 linkPlayerIndex) { u32 trainerCardColorIndex; gSpecialVar_0x8006 = linkPlayerIndex; StringCopy(gStringVar1, gLinkPlayers[linkPlayerIndex].name); - trainerCardColorIndex = sub_80C4904(linkPlayerIndex); + trainerCardColorIndex = GetTrainerCardStars(linkPlayerIndex); if (trainerCardColorIndex == 0) return FALSE; diff --git a/src/overworld.c b/src/overworld.c index 08fd94c1be..a9dfa42801 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -66,13 +66,33 @@ #include "constants/species.h" #include "constants/weather.h" +#define LINK_CONSTANT_UNK_1 0x11 +#define LINK_CONSTANT_DPAD_DOWN 0x12 +#define LINK_CONSTANT_DPAD_UP 0x13 +#define LINK_CONSTANT_DPAD_LEFT 0x14 +#define LINK_CONSTANT_DPAD_RIGHT 0x15 +#define LINK_CONSTANT_UNK_2 0x16 +#define LINK_CONSTANT_UNK_3 0x17 +#define LINK_CONSTANT_START_BUTTON 0x18 +#define LINK_CONSTANT_A_BUTTON 0x19 +#define LINK_CONSTANT_UNK_4 0x1A // I'd guess this is the B button? +#define LINK_CONSTANT_UNK_5 0x1B +#define LINK_CONSTANT_UNK_6 0x1C +#define LINK_CONSTANT_UNK_7 0x1D +#define LINK_CONSTANT_UNK_8 0x1E + +#define TRAINER_TRADING_STATE_IDLE 0x80 +#define TRAINER_TRADING_STATE_UNK_1 0x81 +#define TRAINER_TRADING_STATE_UNK_2 0x82 +#define TRAINER_TRADING_STATE_UNK_3 0x83 + // event scripts extern const u8 EventScript_WhiteOut[]; extern const u8 EventScript_271862[]; extern const u8 EventScript_277513[]; extern const u8 EventScript_TradeRoom_TooBusyToNotice[]; -extern const u8 EventScript_TradeRoom_ReadTrainerCard1[]; -extern const u8 EventScript_TradeRoom_ReadTrainerCard2[]; +extern const u8 EventScript_TradeRoom_ReadTrainerCard_NoColor[]; +extern const u8 EventScript_TradeRoom_ReadTrainerCard_Normal[]; extern const u8 gUnknown_08277388[]; extern const u8 gUnknown_082773A3[]; extern const u8 gUnknown_082773BE[]; @@ -106,21 +126,21 @@ static bool32 load_map_stuff(u8 *state, u32); static bool32 map_loading_iteration_2_link(u8 *state); static void mli4_mapscripts_and_other(void); static void InitOverworldGraphicsRegisters(void); -static u8 sub_8087858(u8); +static u8 GetSpriteForLinkedPlayer(u8); static u16 sub_80871C0(u32 a1); static void sub_80867C8(void); static void sub_80867D8(void); static void sub_8086AE4(void); static void sub_80869DC(void); static void sub_8086B14(void); -static void sub_8086AAC(void); +static void SetCameraToTrackGuestPlayer(void); static void sub_8086988(bool32 arg0); static void sub_8086A80(void); static void sub_8086A68(void); static void sub_8086860(void); -static void sub_8086AC8(void); +static void SetCameraToTrackGuestPlayer_2(void); static void sub_8086B9C(void); -static void sub_8086C40(void); +static void guess_ResetHeldKeys(void); static void sub_8086C90(void); static void sub_8086FA0(u16); static void sub_8086F38(u16*, s32); @@ -138,26 +158,26 @@ static void SpawnLinkPlayerEventObject(u8 linkPlayerId, s16 x, s16 y, u8 a4); static void InitLinkPlayerEventObjectPos(struct EventObject *eventObj, s16 x, s16 y); static void sub_80877DC(u8 linkPlayerId, u8 a2); static void sub_808780C(u8 linkPlayerId); -static u8 sub_8087858(u8 linkPlayerId); +static u8 GetSpriteForLinkedPlayer(u8 linkPlayerId); static void sub_8087584(void); -static u32 sub_8087690(void); +static u32 GetLinkEventQueueLength(void); static void ZeroLinkPlayerEventObject(struct LinkPlayerEventObject *linkPlayerEventObj); -static const u8 *sub_80873B4(struct UnkStruct_8054FF8 *a1); +static const u8 *sub_80873B4(struct TradeRoomTrainer *a1); static u16 sub_8087480(const u8 *script); static void sub_8087510(void); static void sub_808751C(void); static void sub_8087530(const u8 *script); static void sub_808754C(void); static void sub_8087568(const u8 *script); -static void sub_80872D8(s32 linkPlayerId, s32 a2, struct UnkStruct_8054FF8 *a3); -static bool32 sub_8087340(struct UnkStruct_8054FF8 *a1); -static bool32 sub_8087358(struct UnkStruct_8054FF8 *a1); -static u8 *sub_8087370(struct UnkStruct_8054FF8 *a1); -static bool32 sub_8087388(struct UnkStruct_8054FF8 *a1); -static const u8 *sub_80873B4(struct UnkStruct_8054FF8 *a1); +static void sub_80872D8(s32 linkPlayerId, s32 a2, struct TradeRoomTrainer *a3); +static bool32 sub_8087340(struct TradeRoomTrainer *a1); +static bool32 sub_8087358(struct TradeRoomTrainer *a1); +static u8 *sub_8087370(struct TradeRoomTrainer *a1); +static bool32 sub_8087388(struct TradeRoomTrainer *a1); +static const u8 *sub_80873B4(struct TradeRoomTrainer *a1); static u16 sub_808711C(u32); static u16 sub_8087140(u32); -static void sub_808709C(u16 *a1); +static void guess_ResetLinkKeys(u16 *a1); static u16 sub_80870B0(u32 a1); static u16 sub_80870F8(u32 a1); static u16 sub_8087068(u16 a1); @@ -172,8 +192,8 @@ static u16 GetCenterScreenMetatileBehavior(void); // IWRAM bss vars IWRAM_DATA static void *sUnknown_03000E0C; -IWRAM_DATA static u8 sUnknown_03000E10[4]; -IWRAM_DATA static u16 (*sUnknown_03000E14)(u32); +IWRAM_DATA static u8 sTrainerTradingStates[4]; +IWRAM_DATA static u16 (*sguess_PlayerKeyCallback)(u32); IWRAM_DATA static u8 sUnknown_03000E18; IWRAM_DATA static u8 sUnknown_03000E19; IWRAM_DATA static u32 sUnusedVar; @@ -185,7 +205,7 @@ u16 *gBGTilemapBuffers3; u16 gUnknown_03005DA8; void (*gFieldCallback)(void); bool8 (*gFieldCallback2)(void); -u8 gUnknown_03005DB4; +u8 gLinkGuestPlayerId; u8 gFieldLinkPlayerCount; // EWRAM vars @@ -323,7 +343,7 @@ static u8 sub_80879D8(struct LinkPlayerEventObject *, struct EventObject *, u8); static u8 sub_80879F8(struct LinkPlayerEventObject *, struct EventObject *, u8); static u8 sub_80879FC(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 (*const gUnknown_08339DC8[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = +static u8 (*const gLinkPlayerEventModes[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = { sub_80879D8, sub_80879F8, @@ -1100,7 +1120,7 @@ u16 GetCurrLocationDefaultMusic(void) } else { - if (gSaveBlock1Ptr->pos.x < 24) + if (gSaveBlock1Ptr->pos.x < LINK_CONSTANT_START_BUTTON) return MUS_DOORO_X1; else return MUS_GRANROAD; @@ -1243,7 +1263,7 @@ static void PlayAmbientCry(void) && !MetatileBehavior_IsSurfableWaterOrUnderwater(MapGridGetMetatileBehaviorAt(x, y))) return; pan = (Random() % 88) + 212; - volume = (Random() % 30) + 50; + volume = (Random() % LINK_CONSTANT_UNK_8) + 50; PlayCry2(sAmbientCrySpecies, pan, volume, 1); } @@ -1810,7 +1830,7 @@ static bool32 map_loading_iteration_3(u8 *state) sub_8086AE4(); sub_80869DC(); sub_8086B14(); - sub_8086AAC(); + SetCameraToTrackGuestPlayer(); (*state)++; break; case 4: @@ -1982,7 +2002,7 @@ static bool32 map_loading_iteration_2_link(u8 *state) case 2: sub_8086B9C(); sub_8086A68(); - sub_8086AC8(); + SetCameraToTrackGuestPlayer_2(); (*state)++; break; case 3: @@ -2169,21 +2189,25 @@ static void sub_8086A80(void) InitCameraUpdateCallback(gPlayerAvatar.spriteId); } -static void sub_8086AAC(void) +static void SetCameraToTrackGuestPlayer(void) { - InitCameraUpdateCallback(sub_8087858(gUnknown_03005DB4)); + InitCameraUpdateCallback(GetSpriteForLinkedPlayer(gLinkGuestPlayerId)); } -static void sub_8086AC8(void) +// Duplicate function. +static void SetCameraToTrackGuestPlayer_2(void) { - InitCameraUpdateCallback(sub_8087858(gUnknown_03005DB4)); + InitCameraUpdateCallback(GetSpriteForLinkedPlayer(gLinkGuestPlayerId)); } static void sub_8086AE4(void) { u16 x, y; GetCameraFocusCoords(&x, &y); - sub_8088B3C(x + gUnknown_03005DB4, y); + + // This is a hack of some kind; it's undone in sub_8086B14, which is called + // soon after this function. + sub_8088B3C(x + gLinkGuestPlayerId, y); } static void sub_8086B14(void) @@ -2192,7 +2216,7 @@ static void sub_8086B14(void) u16 x, y; GetCameraFocusCoords(&x, &y); - x -= gUnknown_03005DB4; + x -= gLinkGuestPlayerId; for (i = 0; i < gFieldLinkPlayerCount; i++) { @@ -2200,7 +2224,7 @@ static void sub_8086B14(void) CreateLinkPlayerSprite(i, gLinkPlayers[i].version); } - sub_8086C40(); + guess_ResetHeldKeys(); } static void sub_8086B9C(void) @@ -2214,10 +2238,10 @@ static void c1_link_related(void) { if (gWirelessCommType == 0 || !sub_800F0B8() || !sub_8009F3C()) { - u8 var = gUnknown_03005DB4; - sub_8086F38(gLinkPartnersHeldKeys, var); - sub_8086FA0(sUnknown_03000E14(var)); - sub_8086C40(); + u8 guestId = gLinkGuestPlayerId; + sub_8086F38(gLinkPartnersHeldKeys, guestId); + sub_8086FA0(sguess_PlayerKeyCallback(guestId)); + guess_ResetHeldKeys(); } } @@ -2227,15 +2251,15 @@ void sub_8086C2C(void) c1_link_related_func_set(sub_80870B0); } -static void sub_8086C40(void) +static void guess_ResetHeldKeys(void) { - sub_808709C(gLinkPartnersHeldKeys); + guess_ResetLinkKeys(gLinkPartnersHeldKeys); } static void c1_link_related_func_set(u16 (*func)(u32)) { sUnknown_03000E19 = 0; - sUnknown_03000E14 = func; + sguess_PlayerKeyCallback = func; } static void sub_8086C64(void) @@ -2248,7 +2272,7 @@ static void sub_8086C90(void) { s32 i; for (i = 0; i < 4; i++) - sUnknown_03000E10[i] = 0x80; + sTrainerTradingStates[i] = TRAINER_TRADING_STATE_IDLE; } static bool32 sub_8086CA8(u16 a1) @@ -2257,7 +2281,7 @@ static bool32 sub_8086CA8(u16 a1) s32 count = gFieldLinkPlayerCount; for (i = 0; i < count; i++) - if (sUnknown_03000E10[i] != a1) + if (sTrainerTradingStates[i] != a1) return FALSE; return TRUE; } @@ -2268,23 +2292,23 @@ static bool32 sub_8086CE0(u16 a1) s32 count = gFieldLinkPlayerCount; for (i = 0; i < count; i++) - if (sUnknown_03000E10[i] == a1) + if (sTrainerTradingStates[i] == a1) return TRUE; return FALSE; } -static void sub_8086D18(u32 a1, u16 a2, struct UnkStruct_8054FF8 *a3, u16 *a4) +static void sub_8086D18(u32 playerId, u16 key, struct TradeRoomTrainer *trainer, u16 *a4) { const u8 *script; - if (sUnknown_03000E10[a1] == 0x80) + if (sTrainerTradingStates[playerId] == TRAINER_TRADING_STATE_IDLE) { - script = sub_8087370(a3); + script = sub_8087370(trainer); if (script) { *a4 = sub_8087480(script); - sUnknown_03000E10[a1] = 0x81; - if (a3->b) + sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_1; + if (trainer->b) { c1_link_related_func_set(sub_80870F8); sub_8087530(script); @@ -2293,66 +2317,67 @@ static void sub_8086D18(u32 a1, u16 a2, struct UnkStruct_8054FF8 *a3, u16 *a4) } if (sub_8086CE0(0x83) == 1) { - sUnknown_03000E10[a1] = 0x81; - if (a3->b) + sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_1; + if (trainer->b) { c1_link_related_func_set(sub_80870F8); sub_8087584(); } return; } - switch (a2) + + switch (key) { - case 24: - if (sub_8087358(a3)) + case LINK_CONSTANT_START_BUTTON: + if (sub_8087358(trainer)) { - sUnknown_03000E10[a1] = 0x81; - if (a3->b) + sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_1; + if (trainer->b) { c1_link_related_func_set(sub_80870F8); sub_808751C(); } } break; - case 18: - if (sub_8087388(a3) == TRUE) + case LINK_CONSTANT_DPAD_DOWN: + if (sub_8087388(trainer) == TRUE) { - sUnknown_03000E10[a1] = 0x81; - if (a3->b) + sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_1; + if (trainer->b) { c1_link_related_func_set(sub_80870F8); sub_808754C(); } } break; - case 25: - script = sub_80873B4(a3); + case LINK_CONSTANT_A_BUTTON: + script = sub_80873B4(trainer); if (script) { - sUnknown_03000E10[a1] = 0x81; - if (a3->b) + sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_1; + if (trainer->b) { c1_link_related_func_set(sub_80870F8); sub_8087568(script); } } break; - case 27: - if (sub_8087340(a3)) + case LINK_CONSTANT_UNK_5: + if (sub_8087340(trainer)) { - sUnknown_03000E10[a1] = 0x81; - if (a3->b) + sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_1; + if (trainer->b) { c1_link_related_func_set(sub_808711C); sub_8087510(); } } break; - case 28: - if (sub_8087340(a3)) + case LINK_CONSTANT_UNK_6: + if (sub_8087340(trainer)) { - sUnknown_03000E10[a1] = 0x81; - if (a3->b) + sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_1; + if (trainer->b) { c1_link_related_func_set(sub_8087140); sub_8087510(); @@ -2362,64 +2387,64 @@ static void sub_8086D18(u32 a1, u16 a2, struct UnkStruct_8054FF8 *a3, u16 *a4) } } - switch (a2) + switch (key) { - case 23: - sUnknown_03000E10[a1] = 0x83; + case LINK_CONSTANT_UNK_3: + sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_3; break; - case 22: - sUnknown_03000E10[a1] = 0x82; + case LINK_CONSTANT_UNK_2: + sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_2; break; - case 26: - sUnknown_03000E10[a1] = 0x80; - if (a3->b) + case LINK_CONSTANT_UNK_4: + sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_IDLE; + if (trainer->b) c1_link_related_func_set(sub_80870B0); break; - case 29: - if (sUnknown_03000E10[a1] == 0x82) - sUnknown_03000E10[a1] = 0x81; + case LINK_CONSTANT_UNK_7: + if (sTrainerTradingStates[playerId] == TRAINER_TRADING_STATE_UNK_2) + sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_1; break; } } -static void sub_8086F38(u16 *a1, s32 a2) +static void sub_8086F38(u16 *keys, s32 guestId) { - struct UnkStruct_8054FF8 st; + struct TradeRoomTrainer trainer; s32 i; for (i = 0; i < 4; i++) { - u8 v5 = a1[i]; + u8 key = keys[i]; u16 v8 = 0; - sub_80872D8(i, a2, &st); - sub_8086D18(i, v5, &st, &v8); - if (sUnknown_03000E10[i] == 0x80) - v8 = sub_8087068(v5); + sub_80872D8(i, guestId, &trainer); + sub_8086D18(i, key, &trainer, &v8); + if (sTrainerTradingStates[i] == TRAINER_TRADING_STATE_IDLE) + v8 = sub_8087068(key); sub_808796C(i, v8); } } static void sub_8086FA0(u16 a1) { - if (a1 >= 17 && a1 < 30) + if (a1 >= LINK_CONSTANT_UNK_1 && a1 < LINK_CONSTANT_UNK_8) gUnknown_03005DA8 = a1; else - gUnknown_03005DA8 = 17; + gUnknown_03005DA8 = LINK_CONSTANT_UNK_1; if (gWirelessCommType != 0 - && sub_8087690() > 1 + && GetLinkEventQueueLength() > 1 && is_c1_link_related_active() == TRUE && sub_8009F3C() == TRUE) { switch (a1) { - case 17: - case 18: - case 19: - case 20: - case 21: - case 24: - case 25: + case LINK_CONSTANT_UNK_1: + case LINK_CONSTANT_DPAD_DOWN: + case LINK_CONSTANT_DPAD_UP: + case LINK_CONSTANT_DPAD_LEFT: + case LINK_CONSTANT_DPAD_RIGHT: + case LINK_CONSTANT_START_BUTTON: + case LINK_CONSTANT_A_BUTTON: gUnknown_03005DA8 = 0; break; } @@ -2429,52 +2454,53 @@ static void sub_8086FA0(u16 a1) static u16 sub_808700C(u32 a1) { if (gMain.heldKeys & DPAD_UP) - return 19; + return LINK_CONSTANT_DPAD_UP; else if (gMain.heldKeys & DPAD_DOWN) - return 18; + return LINK_CONSTANT_DPAD_DOWN; else if (gMain.heldKeys & DPAD_LEFT) - return 20; + return LINK_CONSTANT_DPAD_LEFT; else if (gMain.heldKeys & DPAD_RIGHT) - return 21; + return LINK_CONSTANT_DPAD_RIGHT; else if (gMain.newKeys & START_BUTTON) - return 24; + return LINK_CONSTANT_START_BUTTON; else if (gMain.newKeys & A_BUTTON) - return 25; + return LINK_CONSTANT_A_BUTTON; else - return 17; + return LINK_CONSTANT_UNK_1; } static u16 sub_8087068(u16 a1) { switch (a1) { - case 21: + case LINK_CONSTANT_DPAD_RIGHT: return 4; - case 20: + case LINK_CONSTANT_DPAD_LEFT: return 3; - case 19: + case LINK_CONSTANT_DPAD_UP: return 1; - case 18: + case LINK_CONSTANT_DPAD_DOWN: return 2; default: return 0; } } -static void sub_808709C(u16 *a1) +// Overwrites the keys with 0x11 +static void guess_ResetLinkKeys(u16 *keys) { s32 i; for (i = 0; i < 4; i++) - a1[i] = 17; + keys[i] = LINK_CONSTANT_UNK_1; } static u16 sub_80870B0(u32 a1) { if (ScriptContext2_IsEnabled() == 1) - return 17; + return LINK_CONSTANT_UNK_1; if (sub_800B4DC() > 4) return 27; - if (sub_8087690() <= 4) + if (GetLinkEventQueueLength() <= 4) return sub_808700C(a1); return 28; } @@ -2482,7 +2508,7 @@ static u16 sub_80870B0(u32 a1) static u16 sub_80870EC(u32 a1) { sub_8086C64(); - return 17; + return LINK_CONSTANT_UNK_1; } static u16 sub_80870F8(u32 a1) @@ -2490,7 +2516,7 @@ static u16 sub_80870F8(u32 a1) u16 retVal; if (ScriptContext2_IsEnabled() == TRUE) { - retVal = 17; + retVal = LINK_CONSTANT_UNK_1; } else { @@ -2505,7 +2531,7 @@ static u16 sub_808711C(u32 a1) u16 retVal; if (sub_800B4DC() > 2) { - retVal = 17; + retVal = LINK_CONSTANT_UNK_1; } else { @@ -2519,9 +2545,9 @@ static u16 sub_808711C(u32 a1) static u16 sub_8087140(u32 a1) { u16 retVal; - if (sub_8087690() > 2) + if (GetLinkEventQueueLength() > 2) { - retVal = 17; + retVal = LINK_CONSTANT_UNK_1; } else { @@ -2535,12 +2561,12 @@ static u16 sub_8087140(u32 a1) static u16 sub_8087164(u32 a1) { sub_8086C64(); - return 17; + return LINK_CONSTANT_UNK_1; } static u16 sub_8087170(u32 linkPlayerId) { - if (sUnknown_03000E10[linkPlayerId] == 0x82) + if (sTrainerTradingStates[linkPlayerId] == TRAINER_TRADING_STATE_UNK_2) { if (gMain.newKeys & B_BUTTON) { @@ -2549,13 +2575,13 @@ static u16 sub_8087170(u32 linkPlayerId) } else { - return 17; + return LINK_CONSTANT_UNK_1; } } else { sub_8086C64(); - return 17; + return LINK_CONSTANT_UNK_1; } } @@ -2567,19 +2593,19 @@ static u16 sub_80871AC(u32 a1) static u16 sub_80871C0(u32 a1) { - return 17; + return LINK_CONSTANT_UNK_1; } static u16 sub_80871C4(u32 a1) { - if (sUnknown_03000E10[a1] != 0x83) + if (sTrainerTradingStates[a1] != TRAINER_TRADING_STATE_UNK_3) sub_8086C64(); - if (sub_8086CA8(0x83) == TRUE) + if (sub_8086CA8(TRAINER_TRADING_STATE_UNK_3) == TRUE) { ScriptContext1_SetupScript(EventScript_277513); c1_link_related_func_set(sub_80871C0); } - return 17; + return LINK_CONSTANT_UNK_1; } static u16 sub_80871FC(u32 a1) @@ -2590,16 +2616,16 @@ static u16 sub_80871FC(u32 a1) static u16 sub_8087210(u32 a1) { - return 17; + return LINK_CONSTANT_UNK_1; } u32 sub_8087214(void) { if (sub_8086CE0(0x83) == TRUE) return 2; - if (sUnknown_03000E14 == sub_8087170 && sUnknown_03000E10[gUnknown_03005DB4] != 0x82) + if (sguess_PlayerKeyCallback == sub_8087170 && sTrainerTradingStates[gLinkGuestPlayerId] != TRAINER_TRADING_STATE_UNK_2) return 0; - if (sUnknown_03000E14 == sub_8087164 && sUnknown_03000E10[gUnknown_03005DB4] == 0x81) + if (sguess_PlayerKeyCallback == sub_8087164 && sTrainerTradingStates[gLinkGuestPlayerId] == TRAINER_TRADING_STATE_UNK_1) return 2; if (sub_8086CA8(0x82) != 0) return 1; @@ -2635,14 +2661,14 @@ u16 sub_80872C4(void) return 0; } -static void sub_80872D8(s32 linkPlayerId, s32 a2, struct UnkStruct_8054FF8 *a3) +static void sub_80872D8(s32 linkPlayerId, s32 a2, struct TradeRoomTrainer *a3) { s16 x, y; a3->a = linkPlayerId; a3->b = (linkPlayerId == a2) ? 1 : 0; a3->c = gLinkPlayerEventObjects[linkPlayerId].mode; - a3->d = sub_80878A0(linkPlayerId); + a3->facing = sub_80878A0(linkPlayerId); sub_8087878(linkPlayerId, &x, &y); a3->sub.x = x; a3->sub.y = y; @@ -2650,7 +2676,7 @@ static void sub_80872D8(s32 linkPlayerId, s32 a2, struct UnkStruct_8054FF8 *a3) a3->field_C = MapGridGetMetatileBehaviorAt(x, y); } -static bool32 sub_8087340(struct UnkStruct_8054FF8 *a1) +static bool32 sub_8087340(struct TradeRoomTrainer *a1) { u8 v1 = a1->c; if (v1 == 2 || v1 == 0) @@ -2659,7 +2685,7 @@ static bool32 sub_8087340(struct UnkStruct_8054FF8 *a1) return FALSE; } -static bool32 sub_8087358(struct UnkStruct_8054FF8 *a1) +static bool32 sub_8087358(struct TradeRoomTrainer *a1) { u8 v1 = a1->c; if (v1 == 2 || v1 == 0) @@ -2668,26 +2694,26 @@ static bool32 sub_8087358(struct UnkStruct_8054FF8 *a1) return FALSE; } -static u8 *sub_8087370(struct UnkStruct_8054FF8 *a1) +static u8 *sub_8087370(struct TradeRoomTrainer *a1) { if (a1->c != 2) return 0; return GetCoordEventScriptAtMapPosition(&a1->sub); } -static bool32 sub_8087388(struct UnkStruct_8054FF8 *a1) +static bool32 sub_8087388(struct TradeRoomTrainer *a1) { if (a1->c != 2 && a1->c != 0) return FALSE; else if (!MetatileBehavior_IsSouthArrowWarp(a1->field_C)) return FALSE; - else if (a1->d != 1) + else if (a1->facing != 1) return FALSE; else return TRUE; } -static const u8 *sub_80873B4(struct UnkStruct_8054FF8 *a1) +static const u8 *sub_80873B4(struct TradeRoomTrainer *a1) { struct MapPosition unkStruct; u8 linkPlayerId; @@ -2696,8 +2722,8 @@ static const u8 *sub_80873B4(struct UnkStruct_8054FF8 *a1) return 0; unkStruct = a1->sub; - unkStruct.x += gDirectionToVectors[a1->d].x; - unkStruct.y += gDirectionToVectors[a1->d].y; + unkStruct.x += gDirectionToVectors[a1->facing].x; + unkStruct.y += gDirectionToVectors[a1->facing].y; unkStruct.height = 0; linkPlayerId = GetLinkPlayerIdAt(unkStruct.x, unkStruct.y); @@ -2705,15 +2731,15 @@ static const u8 *sub_80873B4(struct UnkStruct_8054FF8 *a1) { if (!a1->b) return EventScript_TradeRoom_TooBusyToNotice; - else if (sUnknown_03000E10[linkPlayerId] != 0x80) + else if (sTrainerTradingStates[linkPlayerId] != TRAINER_TRADING_STATE_IDLE) return EventScript_TradeRoom_TooBusyToNotice; - else if (!sub_80B39D4(linkPlayerId)) - return EventScript_TradeRoom_ReadTrainerCard1; + else if (!GetLinkTrainerCardColor(linkPlayerId)) + return EventScript_TradeRoom_ReadTrainerCard_NoColor; else - return EventScript_TradeRoom_ReadTrainerCard2; + return EventScript_TradeRoom_ReadTrainerCard_Normal; } - return GetInteractedLinkPlayerScript(&unkStruct, a1->field_C, a1->d); + return GetInteractedLinkPlayerScript(&unkStruct, a1->field_C, a1->facing); } static u16 sub_8087480(const u8 *script) @@ -2806,9 +2832,9 @@ bool32 sub_80875C8(void) return FALSE; else if (sub_8009F3C() != TRUE) return FALSE; - else if (sUnknown_03000E14 == sub_808711C) + else if (sguess_PlayerKeyCallback == sub_808711C) return TRUE; - else if (sUnknown_03000E14 != sub_80870F8) + else if (sguess_PlayerKeyCallback != sub_80870F8) return FALSE; temp = sUnknown_03000E18; @@ -2824,13 +2850,13 @@ bool32 sub_80875C8(void) bool32 sub_8087634(void) { - if (sub_8087690() < 2) + if (GetLinkEventQueueLength() < 2) return FALSE; else if (is_c1_link_related_active() != TRUE) return FALSE; else if (sub_8009F3C() != TRUE) return FALSE; - else if (sUnknown_03000E14 == sub_8087140) + else if (sguess_PlayerKeyCallback == sub_8087140) return TRUE; else return FALSE; @@ -2846,7 +2872,7 @@ bool32 sub_808766C(void) return TRUE; } -static u32 sub_8087690(void) +static u32 GetLinkEventQueueLength(void) { if (gWirelessCommType != 0) return gUnknown_03005000.unk_9e8.unk_232; @@ -2923,7 +2949,8 @@ static void sub_808780C(u8 linkPlayerId) eventObj->active = 0; } -static u8 sub_8087858(u8 linkPlayerId) +// Returns the spriteId corresponding to this player. +static u8 GetSpriteForLinkedPlayer(u8 linkPlayerId) { u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; struct EventObject *eventObj = &gEventObjects[eventObjId]; @@ -2986,7 +3013,7 @@ static void sub_808796C(u8 linkPlayerId, u8 a2) if (a2 > 10) eventObj->triggerGroundEffectsOnMove = 1; else - gUnknown_08339E00[gUnknown_08339DC8[linkPlayerEventObj->mode](linkPlayerEventObj, eventObj, a2)](linkPlayerEventObj, eventObj); + gUnknown_08339E00[gLinkPlayerEventModes[linkPlayerEventObj->mode](linkPlayerEventObj, eventObj, a2)](linkPlayerEventObj, eventObj); } } diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 9bdd861674..c409d5d323 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -188,7 +188,7 @@ extern u8 gUnknown_02022C3E; extern u16 gUnknown_02022C3C; extern u8 gUnknown_02022C20[]; extern u8 gFieldLinkPlayerCount; -extern u8 gUnknown_03005DB4; +extern u8 gLinkGuestPlayerId; // IWRAM vars IWRAM_DATA struct UnkStruct_Leader *gUnknown_03000DA0; @@ -1641,7 +1641,7 @@ void sub_8014304(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 arg4) gSpecialVar_0x8004 = arg4; VarSet(VAR_0x4087, arg4); gFieldLinkPlayerCount = GetLinkPlayerCount(); - gUnknown_03005DB4 = GetMultiplayerId(); + gLinkGuestPlayerId = GetMultiplayerId(); SetCableClubWarp(); SetWarpDestination(mapGroup, mapNum, -1, x, y); WarpIntoMap(); diff --git a/src/start_menu.c b/src/start_menu.c index d5eec76d23..a1c9fc9ad7 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -84,7 +84,7 @@ EWRAM_DATA static bool8 sSavingComplete = FALSE; EWRAM_DATA static u8 sSaveInfoWindowId = 0; // Extern variables. -extern u8 gUnknown_03005DB4; +extern u8 gLinkGuestPlayerId; // Extern functions in not decompiled files. extern void sub_80AF688(void); @@ -734,7 +734,7 @@ static bool8 StartMenuLinkModePlayerNameCallback(void) { PlayRainSoundEffect(); CleanupOverworldWindowsAndTilemaps(); - ShowTrainerCardInLink(gUnknown_03005DB4, CB2_ReturnToFieldWithOpenMenu); + ShowTrainerCardInLink(gLinkGuestPlayerId, CB2_ReturnToFieldWithOpenMenu); return TRUE; } diff --git a/src/trainer_card.c b/src/trainer_card.c index 49a62284f9..be2e95ab3b 100755 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -1536,7 +1536,7 @@ static void sub_80C48C8(void) } } -u8 sub_80C4904(u8 cardId) +u8 GetTrainerCardStars(u8 cardId) { struct TrainerCard* trainerCards = gTrainerCards; return trainerCards[cardId].stars; From f2f1b1978ba3423a519df66d4f382dd68ac8b185 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 10 Feb 2019 03:54:50 -0500 Subject: [PATCH 034/217] Done documenting link code in overworld.c --- asm/pokenav.s | 2 +- common_syms/overworld.txt | 4 +- data/scripts/cable_club.inc | 2 +- include/global.h | 8 +- include/link.h | 4 +- include/link_rfu.h | 6 +- include/overworld.h | 22 +- src/cable_club.c | 8 +- src/easy_chat.c | 2 +- src/field_screen_effect.c | 2 +- src/link.c | 18 +- src/link_rfu.c | 18 +- src/menu_helpers.c | 4 +- src/overworld.c | 602 +++++++++++++++++++----------------- src/rom_8011DC0.c | 4 +- src/scrcmd.c | 6 +- src/start_menu.c | 10 +- src/trade.c | 4 +- 18 files changed, 380 insertions(+), 346 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 40ce730ea1..337a296adc 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -12,7 +12,7 @@ sub_81C7078: @ 81C7078 push {r4,r5,lr} adds r5, r0, 0 adds r4, r1, 0 - bl is_c1_link_related_active + bl IsUpdateLinkStateCBActive cmp r0, 0 bne _081C7090 ldr r0, =sub_81C7170 diff --git a/common_syms/overworld.txt b/common_syms/overworld.txt index dcf48cb6ce..8506c74a07 100644 --- a/common_syms/overworld.txt +++ b/common_syms/overworld.txt @@ -1,8 +1,8 @@ gBGTilemapBuffers1 gBGTilemapBuffers2 gBGTilemapBuffers3 -gUnknown_03005DA8 +gHeldKeyCodeToSend gFieldCallback gFieldCallback2 -gLinkGuestPlayerId +gLinkSelfPlayerId gFieldLinkPlayerCount diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index b1e34278fd..c5e8a41a7e 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -967,7 +967,7 @@ RecordCorner_EventScript_2774E0:: @ 82774E0 closemessage end -gUnknown_082774EF:: @ 82774EF +gEventScript_ConfirmLeaveTradeRoom:: @ 82774EF msgbox Text_2783A8, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq gUnknown_08277509 diff --git a/include/global.h b/include/global.h index 64d039c6fc..6843b4216b 100644 --- a/include/global.h +++ b/include/global.h @@ -907,13 +907,13 @@ struct MapPosition s8 height; }; -struct TradeRoomTrainer +struct TradeRoomPlayer { - u8 a; - u8 b; + u8 playerId; + u8 isSelf; u8 c; u8 facing; - struct MapPosition sub; + struct MapPosition pos; u16 field_C; }; diff --git a/include/link.h b/include/link.h index 52a6315702..b29d9b4e15 100644 --- a/include/link.h +++ b/include/link.h @@ -312,7 +312,7 @@ void sub_800AB18(void); void sub_8009F18(void); bool8 sub_800AA60(void); void sub_800ABF4(u16 a0); -bool32 sub_8009F3C(void); -u32 sub_800B4DC(void); +bool32 IsSendingKeysToLink(void); +u32 GetLinkRecvQueueLength(void); #endif // GUARD_LINK_H diff --git a/include/link_rfu.h b/include/link_rfu.h index d468d6c498..435880e208 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -218,7 +218,7 @@ void sub_800E700(void); void sub_800EDD4(void); void sub_800F6FC(u8 who); void sub_800F728(u8 who); -bool32 sub_800F7E4(void); +bool32 IsSendingKeysToRfu(void); void sub_800F804(void); void sub_800F850(void); u8 sub_800FCD8(void); @@ -237,8 +237,8 @@ void sub_800E6D0(void); bool32 sub_8010EC0(void); bool32 sub_8010F1C(void); bool32 sub_8011A80(void); -bool32 sub_800F0B8(void); -u32 sub_80124D4(void); +bool32 IsRfuRecvQueueEmpty(void); +u32 GetRfuRecvQueueLength(void); void RfuVSync(void); void sub_80111B0(bool32 a0); u8 sub_8011A74(void); diff --git a/include/overworld.h b/include/overworld.h index 1a8702d713..b5c41b1e6a 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -1,6 +1,18 @@ #ifndef GUARD_OVERWORLD_H #define GUARD_OVERWORLD_H +#define LINK_KEY_CODE_NULL 0x00 +#define LINK_KEY_CODE_EMPTY 0x11 +#define LINK_KEY_CODE_DPAD_DOWN 0x12 +#define LINK_KEY_CODE_DPAD_UP 0x13 +#define LINK_KEY_CODE_DPAD_LEFT 0x14 +#define LINK_KEY_CODE_DPAD_RIGHT 0x15 +#define LINK_KEY_CODE_UNK_2 0x16 +#define LINK_KEY_CODE_UNK_3 0x17 +#define LINK_KEY_CODE_START_BUTTON 0x18 +#define LINK_KEY_CODE_A_BUTTON 0x19 +#define LINK_KEY_CODE_UNK_4 0x1A // I'd guess this is the B button? + struct InitialPlayerAvatarState { u8 transitionFlags; @@ -22,10 +34,10 @@ extern struct LinkPlayerEventObject gLinkPlayerEventObjects[4]; extern u16 *gBGTilemapBuffers1; extern u16 *gBGTilemapBuffers2; extern u16 *gBGTilemapBuffers3; -extern u16 gUnknown_03005DA8; +extern u16 gHeldKeyCodeToSend; extern void (*gFieldCallback)(void); extern bool8 (*gFieldCallback2)(void); -extern u8 gLinkGuestPlayerId; +extern u8 gLinkSelfPlayerId; extern u8 gFieldLinkPlayerCount; // Exported ROM declarations @@ -103,7 +115,7 @@ u8 GetSavedWarpRegionMapSectionId(void); u8 GetCurrentRegionMapSectionId(void); u8 GetCurrentMapBattleScene(void); void CleanupOverworldWindowsAndTilemaps(void); -bool32 is_c1_link_related_active(void); +bool32 IsUpdateLinkStateCBActive(void); void CB1_Overworld(void); void CB2_OverworldBasic(void); void CB2_Overworld(void); @@ -117,13 +129,13 @@ void sub_8086074(void); void CB2_ReturnToField(void); void CB2_ReturnToFieldLocal(void); void CB2_ReturnToFieldLink(void); -void c2_8056854(void); +void CB2_ReturnToFieldFromMultiplayer(void); void CB2_ReturnToFieldWithOpenMenu(void); void CB2_ReturnToFieldContinueScript(void); void CB2_ReturnToFieldContinueScriptPlayMapMusic(void); void sub_80861E8(void); void CB2_ContinueSavedGame(void); -void sub_8086C2C(void); +void ResetAllMultiplayerState(void); u32 sub_8087214(void); bool32 sub_808727C(void); u16 sub_8087288(void); diff --git a/src/cable_club.c b/src/cable_club.c index a778ff5597..c76de7a6a9 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -352,7 +352,7 @@ static void sub_80B2918(u8 taskId) else { gFieldLinkPlayerCount = GetLinkPlayerCount_2(); - gLinkGuestPlayerId = GetMultiplayerId(); + gLinkSelfPlayerId = GetMultiplayerId(); sub_800AA04(gFieldLinkPlayerCount); card = (struct TrainerCard *)gBlockSendBuffer; TrainerCard_GenerateCardForPlayer(card); @@ -399,7 +399,7 @@ static void sub_80B2A08(u8 taskId) else { gFieldLinkPlayerCount = GetLinkPlayerCount_2(); - gLinkGuestPlayerId = GetMultiplayerId(); + gLinkSelfPlayerId = GetMultiplayerId(); sub_800AA04(gFieldLinkPlayerCount); card = (struct TrainerCard *)gBlockSendBuffer; TrainerCard_GenerateCardForPlayer(card); @@ -972,7 +972,7 @@ void sub_80B360C(void) if (gSpecialVar_0x8004 == 1 || gSpecialVar_0x8004 == 2) { - UpdatePlayerLinkBattleRecords(gLinkGuestPlayerId ^ 1); + UpdatePlayerLinkBattleRecords(gLinkSelfPlayerId ^ 1); if (gWirelessCommType) { switch (gBattleOutcome) @@ -993,7 +993,7 @@ void sub_80B360C(void) } else { - gMain.savedCallback = c2_8056854; + gMain.savedCallback = CB2_ReturnToFieldFromMultiplayer; } SetMainCallback2(sub_80A0514); diff --git a/src/easy_chat.c b/src/easy_chat.c index c84895df51..2dce4de0df 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -146,7 +146,7 @@ static void sub_811A2A4(u8 taskId, TaskFunc taskFunc) static void sub_811A2C0(u8 taskId) { - if (!is_c1_link_related_active()) + if (!IsUpdateLinkStateCBActive()) { while (sub_811A428(taskId)); } diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 93017f1251..ee9b497326 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -255,7 +255,7 @@ void sub_80AF2B4(u8 taskId) break; case 2: sub_8009F18(); - sub_8086C2C(); + ResetAllMultiplayerState(); ScriptContext2_Disable(); DestroyTask(taskId); break; diff --git a/src/link.c b/src/link.c index bec9dddc6e..1550d8783d 100644 --- a/src/link.c +++ b/src/link.c @@ -28,7 +28,7 @@ #include "link.h" #include "link_rfu.h" -extern u16 gUnknown_03005DA8; +extern u16 gHeldKeyCodeToSend; // Static type declarations @@ -695,12 +695,12 @@ static void BuildSendCmd(u16 command) gSendCmd[0] = LINKCMD_0x5566; break; case LINKCMD_SEND_HELD_KEYS_2: - if (gUnknown_03005DA8 == 0 || gLinkTransferringData) + if (gHeldKeyCodeToSend == 0 || gLinkTransferringData) { break; } gSendCmd[0] = LINKCMD_SEND_HELD_KEYS_2; - gSendCmd[1] = gUnknown_03005DA8; + gSendCmd[1] = gHeldKeyCodeToSend; break; } } @@ -714,11 +714,11 @@ void sub_8009F18(void) gLinkCallback = sub_8009F70; } -bool32 sub_8009F3C(void) +bool32 IsSendingKeysToLink(void) { if (gWirelessCommType) { - return sub_800F7E4(); + return IsSendingKeysToRfu(); } if (gLinkCallback == sub_8009F70) { @@ -1849,7 +1849,7 @@ bool8 HandleLinkConnection(void) r5 = sub_8010F1C(); if (sub_808766C() == TRUE) { - if (r4 == TRUE || sub_800F0B8() || r5) + if (r4 == TRUE || IsRfuRecvQueueEmpty() || r5) { return TRUE; } @@ -1882,18 +1882,18 @@ void sub_800B4C0(void) } } -u32 sub_800B4DC(void) +u32 GetLinkRecvQueueLength(void) { if (gWirelessCommType != 0) { - return sub_80124D4(); + return GetRfuRecvQueueLength(); } return gLink.recvQueue.count; } bool8 sub_800B504(void) { - if (sub_800B4DC() > 2) + if (GetLinkRecvQueueLength() > 2) { return TRUE; } diff --git a/src/link_rfu.c b/src/link_rfu.c index ebfc802e01..859d741b19 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -17,7 +17,7 @@ #include "text.h" #include "constants/species.h" -extern u16 gUnknown_03005DA8; +extern u16 gHeldKeyCodeToSend; extern void nullsub_89(u8 taskId); struct UnkRfuStruct_1 gUnknown_03004140; @@ -2978,7 +2978,7 @@ static void sub_800F048(void) } } -bool32 sub_800F0B8(void) +bool32 IsRfuRecvQueueEmpty(void) { s32 i; s32 j; @@ -3199,7 +3199,7 @@ bool32 sub_800F4F0(void) for (i = 0; i < CMD_LENGTH - 1; i++) gSendCmd[i] = 0; } - return sub_800F0B8(); + return IsRfuRecvQueueEmpty(); } void sub_800F638(u8 unused, u32 flags) @@ -3259,10 +3259,12 @@ u8 sub_800F74C(const u8 *a0) void rfu_func_080F97B8(void) { - if (gReceivedRemoteLinkPlayers && gUnknown_03005DA8 && gLinkTransferringData != 1) + if (gReceivedRemoteLinkPlayers + && gHeldKeyCodeToSend != LINK_KEY_CODE_NULL + && gLinkTransferringData != TRUE) { gUnknown_03000D78[0]++; - gUnknown_03005DA8 |= (gUnknown_03000D78[0] << 8); + gHeldKeyCodeToSend |= (gUnknown_03000D78[0] << 8); sub_800FD14(0xbe00); } } @@ -3272,7 +3274,7 @@ struct UnkLinkRfuStruct_02022B14 *sub_800F7DC(void) return &gUnknown_02022B14; } -bool32 sub_800F7E4(void) +bool32 IsSendingKeysToRfu(void) { return gUnknown_03005000.unk_00 == rfu_func_080F97B8; } @@ -3496,7 +3498,7 @@ void sub_800FD14(u16 command) gSendCmd[1 + i] = gUnknown_03005000.unk_f2[i]; break; case 0xbe00: - gSendCmd[1] = gUnknown_03005DA8; + gSendCmd[1] = gHeldKeyCodeToSend; break; case 0xee00: break; @@ -5150,7 +5152,7 @@ u32 sub_80124C0(void) return gUnknown_03005000.unk_9e8.unk_232; } -u32 sub_80124D4(void) +u32 GetRfuRecvQueueLength(void) { return gUnknown_03005000.unk_124.unk_8c2; } diff --git a/src/menu_helpers.c b/src/menu_helpers.c index e6547b3000..846c23b6b6 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -293,7 +293,7 @@ bool8 sub_8122148(u16 itemId) bool8 itemid_80BF6D8_mail_related(u16 itemId) { - if (is_c1_link_related_active() != TRUE && InUnionRoom() != TRUE) + if (IsUpdateLinkStateCBActive() != TRUE && InUnionRoom() != TRUE) return TRUE; else if (ItemIsMail(itemId) != TRUE) return TRUE; @@ -303,7 +303,7 @@ bool8 itemid_80BF6D8_mail_related(u16 itemId) bool8 sub_81221AC(void) { - if (is_c1_link_related_active() == TRUE || gReceivedRemoteLinkPlayers == 1) + if (IsUpdateLinkStateCBActive() == TRUE || gReceivedRemoteLinkPlayers == 1) return TRUE; else return FALSE; diff --git a/src/overworld.c b/src/overworld.c index a9dfa42801..ca588a0729 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -66,25 +66,21 @@ #include "constants/species.h" #include "constants/weather.h" -#define LINK_CONSTANT_UNK_1 0x11 -#define LINK_CONSTANT_DPAD_DOWN 0x12 -#define LINK_CONSTANT_DPAD_UP 0x13 -#define LINK_CONSTANT_DPAD_LEFT 0x14 -#define LINK_CONSTANT_DPAD_RIGHT 0x15 -#define LINK_CONSTANT_UNK_2 0x16 -#define LINK_CONSTANT_UNK_3 0x17 -#define LINK_CONSTANT_START_BUTTON 0x18 -#define LINK_CONSTANT_A_BUTTON 0x19 -#define LINK_CONSTANT_UNK_4 0x1A // I'd guess this is the B button? -#define LINK_CONSTANT_UNK_5 0x1B -#define LINK_CONSTANT_UNK_6 0x1C -#define LINK_CONSTANT_UNK_7 0x1D -#define LINK_CONSTANT_UNK_8 0x1E +// These two are a hack to stop user input until link stuff can be +// resolved. +#define LINK_KEY_CODE_HANDLE_RECV_QUEUE 0x1B +#define LINK_KEY_CODE_HANDLE_SEND_QUEUE 0x1C +#define LINK_KEY_CODE_UNK_7 0x1D +#define LINK_KEY_CODE_UNK_8 0x1E -#define TRAINER_TRADING_STATE_IDLE 0x80 -#define TRAINER_TRADING_STATE_UNK_1 0x81 -#define TRAINER_TRADING_STATE_UNK_2 0x82 -#define TRAINER_TRADING_STATE_UNK_3 0x83 +#define PLAYER_TRADING_STATE_IDLE 0x80 +#define PLAYER_TRADING_STATE_BUSY 0x81 +#define PLAYER_TRADING_STATE_UNK_2 0x82 +#define PLAYER_TRADING_STATE_UNK_3 0x83 + +#define EVENT_SCRIPT_NONE 0 +#define EVENT_SCRIPT_ID_9 9 +#define EVENT_SCRIPT_ID_10 10 // event scripts extern const u8 EventScript_WhiteOut[]; @@ -105,7 +101,7 @@ extern const u8 gUnknown_08277374[]; extern const u8 gUnknown_0827737E[]; extern const u8 gUnknown_082773FF[]; extern const u8 gUnknown_082773F5[]; -extern const u8 gUnknown_082774EF[]; +extern const u8 gEventScript_ConfirmLeaveTradeRoom[]; extern const u8 gUnknown_08277509[]; extern const struct MapLayout *const gMapLayouts[]; @@ -139,20 +135,20 @@ static void sub_8086A80(void); static void sub_8086A68(void); static void sub_8086860(void); static void SetCameraToTrackGuestPlayer_2(void); -static void sub_8086B9C(void); -static void guess_ResetHeldKeys(void); -static void sub_8086C90(void); -static void sub_8086FA0(u16); -static void sub_8086F38(u16*, s32); +static void CreateLinkPlayerSprites(void); +static void ClearAllPlayerKeys(void); +static void ResetAllTradingStates(void); +static void UpdateHeldKeyCode(u16); +static void UpdateAllLinkPlayers(u16*, s32); static u8 npc_something3(u8 a1, u8 a2); static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y); static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion); -static void sub_8087878(u8 linkPlayerId, u16 *x, u16 *y); -static u8 sub_80878A0(u8 linkPlayerId); -static u8 sub_80878C0(u8 linkPlayerId); +static void GetLinkPlayerCoords(u8 linkPlayerId, u16 *x, u16 *y); +static u8 GetLinkPlayerFacingDirection(u8 linkPlayerId); +static u8 GetLinkPlayerElevation(u8 linkPlayerId); static s32 sub_80878E4(u8 linkPlayerId); static u8 GetLinkPlayerIdAt(s16 x, s16 y); -static void sub_808796C(u8 linkPlayerId, u8 a2); +static void RunPlayerEventScript(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); @@ -160,29 +156,29 @@ 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 GetLinkEventQueueLength(void); +static u32 GetLinkSendQueueLength(void); static void ZeroLinkPlayerEventObject(struct LinkPlayerEventObject *linkPlayerEventObj); -static const u8 *sub_80873B4(struct TradeRoomTrainer *a1); -static u16 sub_8087480(const u8 *script); +static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *a1); +static u16 GetTypeForTileEventScript(const u8 *script); static void sub_8087510(void); -static void sub_808751C(void); +static void InitLinkRoomStartMenuScript(void); static void sub_8087530(const u8 *script); -static void sub_808754C(void); -static void sub_8087568(const u8 *script); -static void sub_80872D8(s32 linkPlayerId, s32 a2, struct TradeRoomTrainer *a3); -static bool32 sub_8087340(struct TradeRoomTrainer *a1); -static bool32 sub_8087358(struct TradeRoomTrainer *a1); -static u8 *sub_8087370(struct TradeRoomTrainer *a1); -static bool32 sub_8087388(struct TradeRoomTrainer *a1); -static const u8 *sub_80873B4(struct TradeRoomTrainer *a1); -static u16 sub_808711C(u32); -static u16 sub_8087140(u32); -static void guess_ResetLinkKeys(u16 *a1); -static u16 sub_80870B0(u32 a1); -static u16 sub_80870F8(u32 a1); +static void CreateConfirmLeaveTradeRoomPrompt(void); +static void InitMenuBasedScript(const u8 *script); +static void LoadTradeRoomPlayer(s32 linkPlayerId, s32 a2, struct TradeRoomPlayer *a3); +static bool32 sub_8087340(struct TradeRoomPlayer *a1); +static bool32 sub_8087340_2(struct TradeRoomPlayer *a1); +static u8 *TryGetTileEventScript(struct TradeRoomPlayer *a1); +static bool32 PlayerIsAtSouthExit(struct TradeRoomPlayer *a1); +static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *a1); +static u16 KeyInterCB_DeferToRecvQueue(u32); +static u16 KeyInterCB_DeferToSendQueue(u32); +static void ResetPlayerHeldKeys(u16 *a1); +static u16 KeyInterCB_SelfIdle(u32 a1); +static u16 KeyInterCB_DeferToEventScript(u32 a1); static u16 sub_8087068(u16 a1); -static void c1_link_related(void); -static void c1_link_related_func_set(u16 (*func)(u32)); +static void CB1_UpdateLinkState(void); +static void SetKeyInterceptCallback(u16 (*func)(u32)); static void SetFieldVBlankCallback(void); static void FieldClearVBlankHBlankCallbacks(void); static void sub_8085810(void); @@ -192,20 +188,23 @@ static u16 GetCenterScreenMetatileBehavior(void); // IWRAM bss vars IWRAM_DATA static void *sUnknown_03000E0C; -IWRAM_DATA static u8 sTrainerTradingStates[4]; -IWRAM_DATA static u16 (*sguess_PlayerKeyCallback)(u32); -IWRAM_DATA static u8 sUnknown_03000E18; -IWRAM_DATA static u8 sUnknown_03000E19; +IWRAM_DATA static u8 sPlayerTradingStates[4]; +// This callback is called with a player's key code. It then returns an +// adjusted key code, effectively intercepting the input before anything +// can process it. +IWRAM_DATA static u16 (*sPlayerKeyInterceptCallback)(u32); +IWRAM_DATA static bool8 sUnknown_03000E18; +IWRAM_DATA static u8 sRfuKeepAliveTimer; IWRAM_DATA static u32 sUnusedVar; // IWRAM common u16 *gBGTilemapBuffers1; u16 *gBGTilemapBuffers2; u16 *gBGTilemapBuffers3; -u16 gUnknown_03005DA8; +u16 gHeldKeyCodeToSend; void (*gFieldCallback)(void); bool8 (*gFieldCallback2)(void); -u8 gLinkGuestPlayerId; +u8 gLinkSelfPlayerId; // This is our player id in a multiplayer mode. u8 gFieldLinkPlayerCount; // EWRAM vars @@ -1120,7 +1119,7 @@ u16 GetCurrLocationDefaultMusic(void) } else { - if (gSaveBlock1Ptr->pos.x < LINK_CONSTANT_START_BUTTON) + if (gSaveBlock1Ptr->pos.x < LINK_KEY_CODE_START_BUTTON) return MUS_DOORO_X1; else return MUS_GRANROAD; @@ -1263,7 +1262,7 @@ static void PlayAmbientCry(void) && !MetatileBehavior_IsSurfableWaterOrUnderwater(MapGridGetMetatileBehaviorAt(x, y))) return; pan = (Random() % 88) + 212; - volume = (Random() % LINK_CONSTANT_UNK_8) + 50; + volume = (Random() % LINK_KEY_CODE_UNK_8) + 50; PlayCry2(sAmbientCrySpecies, pan, volume, 1); } @@ -1427,9 +1426,9 @@ static void ResetSafariZoneFlag_(void) ResetSafariZoneFlag(); } -bool32 is_c1_link_related_active(void) +bool32 IsUpdateLinkStateCBActive(void) { - if (gMain.callback1 == c1_link_related) + if (gMain.callback1 == CB1_UpdateLinkState) return TRUE; else return FALSE; @@ -1615,15 +1614,15 @@ static void c2_80567AC(void) if (map_loading_iteration_3(&gMain.state)) { SetFieldVBlankCallback(); - SetMainCallback1(c1_link_related); - sub_8086C2C(); + SetMainCallback1(CB1_UpdateLinkState); + ResetAllMultiplayerState(); SetMainCallback2(CB2_Overworld); } } void CB2_ReturnToField(void) { - if (is_c1_link_related_active() == TRUE) + if (IsUpdateLinkStateCBActive() == TRUE) { SetMainCallback2(CB2_ReturnToFieldLink); } @@ -1649,12 +1648,12 @@ void CB2_ReturnToFieldLink(void) SetMainCallback2(CB2_Overworld); } -void c2_8056854(void) +void CB2_ReturnToFieldFromMultiplayer(void) { FieldClearVBlankHBlankCallbacks(); StopMapMusic(); - SetMainCallback1(c1_link_related); - sub_8086C2C(); + SetMainCallback1(CB1_UpdateLinkState); + ResetAllMultiplayerState(); if (gWirelessCommType != 0) gFieldCallback = sub_80AF314; @@ -2000,7 +1999,7 @@ static bool32 map_loading_iteration_2_link(u8 *state) (*state)++; break; case 2: - sub_8086B9C(); + CreateLinkPlayerSprites(); sub_8086A68(); SetCameraToTrackGuestPlayer_2(); (*state)++; @@ -2191,13 +2190,13 @@ static void sub_8086A80(void) static void SetCameraToTrackGuestPlayer(void) { - InitCameraUpdateCallback(GetSpriteForLinkedPlayer(gLinkGuestPlayerId)); + InitCameraUpdateCallback(GetSpriteForLinkedPlayer(gLinkSelfPlayerId)); } // Duplicate function. static void SetCameraToTrackGuestPlayer_2(void) { - InitCameraUpdateCallback(GetSpriteForLinkedPlayer(gLinkGuestPlayerId)); + InitCameraUpdateCallback(GetSpriteForLinkedPlayer(gLinkSelfPlayerId)); } static void sub_8086AE4(void) @@ -2207,7 +2206,7 @@ static void sub_8086AE4(void) // This is a hack of some kind; it's undone in sub_8086B14, which is called // soon after this function. - sub_8088B3C(x + gLinkGuestPlayerId, y); + sub_8088B3C(x + gLinkSelfPlayerId, y); } static void sub_8086B14(void) @@ -2216,7 +2215,7 @@ static void sub_8086B14(void) u16 x, y; GetCameraFocusCoords(&x, &y); - x -= gLinkGuestPlayerId; + x -= gLinkSelfPlayerId; for (i = 0; i < gFieldLinkPlayerCount; i++) { @@ -2224,103 +2223,118 @@ static void sub_8086B14(void) CreateLinkPlayerSprite(i, gLinkPlayers[i].version); } - guess_ResetHeldKeys(); + ClearAllPlayerKeys(); } -static void sub_8086B9C(void) +static void CreateLinkPlayerSprites(void) { u16 i; for (i = 0; i < gFieldLinkPlayerCount; i++) CreateLinkPlayerSprite(i, gLinkPlayers[i].version); } -static void c1_link_related(void) + +static void CB1_UpdateLinkState(void) { - if (gWirelessCommType == 0 || !sub_800F0B8() || !sub_8009F3C()) + if (gWirelessCommType == 0 || !IsRfuRecvQueueEmpty() || !IsSendingKeysToLink()) { - u8 guestId = gLinkGuestPlayerId; - sub_8086F38(gLinkPartnersHeldKeys, guestId); - sub_8086FA0(sguess_PlayerKeyCallback(guestId)); - guess_ResetHeldKeys(); + u8 selfId = gLinkSelfPlayerId; + UpdateAllLinkPlayers(gLinkPartnersHeldKeys, selfId); + + // Note: Because guestId is between 0 and 4, while the smallest key code is + // LINK_KEY_CODE_EMPTY, this is functionally equivalent to `sPlayerKeyInterceptCallback(0)`. + // It is expecting the callback to be KeyInterCB_SelfIdle, and that will + // completely ignore any input parameters. + // + // UpdateHeldKeyCode performs a sanity check on its input; if + // sPlayerKeyInterceptCallback echoes back the argument, which is selfId, then + // it'll use LINK_KEY_CODE_EMPTY instead. + UpdateHeldKeyCode(sPlayerKeyInterceptCallback(selfId)); + ClearAllPlayerKeys(); } } -void sub_8086C2C(void) +void ResetAllMultiplayerState(void) { - sub_8086C90(); - c1_link_related_func_set(sub_80870B0); + ResetAllTradingStates(); + SetKeyInterceptCallback(KeyInterCB_SelfIdle); } -static void guess_ResetHeldKeys(void) +static void ClearAllPlayerKeys(void) { - guess_ResetLinkKeys(gLinkPartnersHeldKeys); + ResetPlayerHeldKeys(gLinkPartnersHeldKeys); } -static void c1_link_related_func_set(u16 (*func)(u32)) +static void SetKeyInterceptCallback(u16 (*func)(u32)) { - sUnknown_03000E19 = 0; - sguess_PlayerKeyCallback = func; + sRfuKeepAliveTimer = 0; + sPlayerKeyInterceptCallback = func; } -static void sub_8086C64(void) +// Once every ~60 frames, if the link state hasn't changed (timer reset by calls +// to SetKeyInterceptCallback), it does a bunch of sanity checks on the connection. +// I'm not sure if sRfuKeepAliveTimer is reset in the process, though; rfu stuff is +// still undocumented. +static void CheckRfuKeepAliveTimer(void) { - if (gWirelessCommType != 0 && ++sUnknown_03000E19 > 60) + if (gWirelessCommType != 0 && ++sRfuKeepAliveTimer > 60) sub_8010198(); } -static void sub_8086C90(void) +static void ResetAllTradingStates(void) { s32 i; for (i = 0; i < 4; i++) - sTrainerTradingStates[i] = TRAINER_TRADING_STATE_IDLE; + sPlayerTradingStates[i] = PLAYER_TRADING_STATE_IDLE; } -static bool32 sub_8086CA8(u16 a1) +// Returns true if all connected players are in tradingState. +static bool32 AreAllPlayersInState(u16 tradingState) { s32 i; s32 count = gFieldLinkPlayerCount; for (i = 0; i < count; i++) - if (sTrainerTradingStates[i] != a1) + if (sPlayerTradingStates[i] != tradingState) return FALSE; return TRUE; } -static bool32 sub_8086CE0(u16 a1) +static bool32 AreAnyPlayersInState(u16 tradingState) { s32 i; s32 count = gFieldLinkPlayerCount; for (i = 0; i < count; i++) - if (sTrainerTradingStates[i] == a1) + if (sPlayerTradingStates[i] == tradingState) return TRUE; return FALSE; } -static void sub_8086D18(u32 playerId, u16 key, struct TradeRoomTrainer *trainer, u16 *a4) +static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlayer *trainer, u16 *eventScriptType) { const u8 *script; - if (sTrainerTradingStates[playerId] == TRAINER_TRADING_STATE_IDLE) + if (sPlayerTradingStates[playerId] == PLAYER_TRADING_STATE_IDLE) { - script = sub_8087370(trainer); + script = TryGetTileEventScript(trainer); if (script) { - *a4 = sub_8087480(script); - sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_1; - if (trainer->b) + *eventScriptType = GetTypeForTileEventScript(script); + sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; + if (trainer->isSelf) { - c1_link_related_func_set(sub_80870F8); + SetKeyInterceptCallback(KeyInterCB_DeferToEventScript); sub_8087530(script); } return; } - if (sub_8086CE0(0x83) == 1) + if (AreAnyPlayersInState(PLAYER_TRADING_STATE_UNK_3) == TRUE) { - sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_1; - if (trainer->b) + sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; + if (trainer->isSelf) { - c1_link_related_func_set(sub_80870F8); + SetKeyInterceptCallback(KeyInterCB_DeferToEventScript); sub_8087584(); } return; @@ -2328,58 +2342,58 @@ static void sub_8086D18(u32 playerId, u16 key, struct TradeRoomTrainer *trainer, switch (key) { - case LINK_CONSTANT_START_BUTTON: - if (sub_8087358(trainer)) + case LINK_KEY_CODE_START_BUTTON: + if (sub_8087340_2(trainer)) { - sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_1; - if (trainer->b) + sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; + if (trainer->isSelf) { - c1_link_related_func_set(sub_80870F8); - sub_808751C(); + SetKeyInterceptCallback(KeyInterCB_DeferToEventScript); + InitLinkRoomStartMenuScript(); } } break; - case LINK_CONSTANT_DPAD_DOWN: - if (sub_8087388(trainer) == TRUE) + case LINK_KEY_CODE_DPAD_DOWN: + if (PlayerIsAtSouthExit(trainer) == TRUE) { - sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_1; - if (trainer->b) + sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; + if (trainer->isSelf) { - c1_link_related_func_set(sub_80870F8); - sub_808754C(); + SetKeyInterceptCallback(KeyInterCB_DeferToEventScript); + CreateConfirmLeaveTradeRoomPrompt(); } } break; - case LINK_CONSTANT_A_BUTTON: - script = sub_80873B4(trainer); + case LINK_KEY_CODE_A_BUTTON: + script = TryInteractWithPlayer(trainer); if (script) { - sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_1; - if (trainer->b) + sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; + if (trainer->isSelf) { - c1_link_related_func_set(sub_80870F8); - sub_8087568(script); + SetKeyInterceptCallback(KeyInterCB_DeferToEventScript); + InitMenuBasedScript(script); } } break; - case LINK_CONSTANT_UNK_5: + case LINK_KEY_CODE_HANDLE_RECV_QUEUE: if (sub_8087340(trainer)) { - sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_1; - if (trainer->b) + sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; + if (trainer->isSelf) { - c1_link_related_func_set(sub_808711C); + SetKeyInterceptCallback(KeyInterCB_DeferToRecvQueue); sub_8087510(); } } break; - case LINK_CONSTANT_UNK_6: + case LINK_KEY_CODE_HANDLE_SEND_QUEUE: if (sub_8087340(trainer)) { - sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_1; - if (trainer->b) + sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; + if (trainer->isSelf) { - c1_link_related_func_set(sub_8087140); + SetKeyInterceptCallback(KeyInterCB_DeferToSendQueue); sub_8087510(); } } @@ -2389,97 +2403,97 @@ static void sub_8086D18(u32 playerId, u16 key, struct TradeRoomTrainer *trainer, switch (key) { - case LINK_CONSTANT_UNK_3: - sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_3; + case LINK_KEY_CODE_UNK_3: + sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_UNK_3; break; - case LINK_CONSTANT_UNK_2: - sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_2; + case LINK_KEY_CODE_UNK_2: + sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_UNK_2; break; - case LINK_CONSTANT_UNK_4: - sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_IDLE; - if (trainer->b) - c1_link_related_func_set(sub_80870B0); + case LINK_KEY_CODE_UNK_4: + sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_IDLE; + if (trainer->isSelf) + SetKeyInterceptCallback(KeyInterCB_SelfIdle); break; - case LINK_CONSTANT_UNK_7: - if (sTrainerTradingStates[playerId] == TRAINER_TRADING_STATE_UNK_2) - sTrainerTradingStates[playerId] = TRAINER_TRADING_STATE_UNK_1; + case LINK_KEY_CODE_UNK_7: + if (sPlayerTradingStates[playerId] == PLAYER_TRADING_STATE_UNK_2) + sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; break; } } -static void sub_8086F38(u16 *keys, s32 guestId) +static void UpdateAllLinkPlayers(u16 *keys, s32 selfId) { - struct TradeRoomTrainer trainer; + struct TradeRoomPlayer trainer; s32 i; for (i = 0; i < 4; i++) { u8 key = keys[i]; - u16 v8 = 0; - sub_80872D8(i, guestId, &trainer); - sub_8086D18(i, key, &trainer, &v8); - if (sTrainerTradingStates[i] == TRAINER_TRADING_STATE_IDLE) - v8 = sub_8087068(key); - sub_808796C(i, v8); + u16 eventScriptType = EVENT_SCRIPT_NONE; + LoadTradeRoomPlayer(i, selfId, &trainer); + HandleLinkPlayerKeyInput(i, key, &trainer, &eventScriptType); + if (sPlayerTradingStates[i] == PLAYER_TRADING_STATE_IDLE) + eventScriptType = sub_8087068(key); + RunPlayerEventScript(i, eventScriptType); } } -static void sub_8086FA0(u16 a1) +static void UpdateHeldKeyCode(u16 key) { - if (a1 >= LINK_CONSTANT_UNK_1 && a1 < LINK_CONSTANT_UNK_8) - gUnknown_03005DA8 = a1; + if (key >= LINK_KEY_CODE_EMPTY && key < LINK_KEY_CODE_UNK_8) + gHeldKeyCodeToSend = key; else - gUnknown_03005DA8 = LINK_CONSTANT_UNK_1; + gHeldKeyCodeToSend = LINK_KEY_CODE_EMPTY; if (gWirelessCommType != 0 - && GetLinkEventQueueLength() > 1 - && is_c1_link_related_active() == TRUE - && sub_8009F3C() == TRUE) + && GetLinkSendQueueLength() > 1 + && IsUpdateLinkStateCBActive() == TRUE + && IsSendingKeysToLink() == TRUE) { - switch (a1) + switch (key) { - case LINK_CONSTANT_UNK_1: - case LINK_CONSTANT_DPAD_DOWN: - case LINK_CONSTANT_DPAD_UP: - case LINK_CONSTANT_DPAD_LEFT: - case LINK_CONSTANT_DPAD_RIGHT: - case LINK_CONSTANT_START_BUTTON: - case LINK_CONSTANT_A_BUTTON: - gUnknown_03005DA8 = 0; + case LINK_KEY_CODE_EMPTY: + case LINK_KEY_CODE_DPAD_DOWN: + case LINK_KEY_CODE_DPAD_UP: + case LINK_KEY_CODE_DPAD_LEFT: + case LINK_KEY_CODE_DPAD_RIGHT: + case LINK_KEY_CODE_START_BUTTON: + case LINK_KEY_CODE_A_BUTTON: + gHeldKeyCodeToSend = LINK_KEY_CODE_NULL; break; } } } -static u16 sub_808700C(u32 a1) +static u16 KeyInterCB_ReadButtons(u32 key) { if (gMain.heldKeys & DPAD_UP) - return LINK_CONSTANT_DPAD_UP; + return LINK_KEY_CODE_DPAD_UP; else if (gMain.heldKeys & DPAD_DOWN) - return LINK_CONSTANT_DPAD_DOWN; + return LINK_KEY_CODE_DPAD_DOWN; else if (gMain.heldKeys & DPAD_LEFT) - return LINK_CONSTANT_DPAD_LEFT; + return LINK_KEY_CODE_DPAD_LEFT; else if (gMain.heldKeys & DPAD_RIGHT) - return LINK_CONSTANT_DPAD_RIGHT; + return LINK_KEY_CODE_DPAD_RIGHT; else if (gMain.newKeys & START_BUTTON) - return LINK_CONSTANT_START_BUTTON; + return LINK_KEY_CODE_START_BUTTON; else if (gMain.newKeys & A_BUTTON) - return LINK_CONSTANT_A_BUTTON; + return LINK_KEY_CODE_A_BUTTON; else - return LINK_CONSTANT_UNK_1; + return LINK_KEY_CODE_EMPTY; } static u16 sub_8087068(u16 a1) { switch (a1) { - case LINK_CONSTANT_DPAD_RIGHT: + case LINK_KEY_CODE_DPAD_RIGHT: return 4; - case LINK_CONSTANT_DPAD_LEFT: + case LINK_KEY_CODE_DPAD_LEFT: return 3; - case LINK_CONSTANT_DPAD_UP: + case LINK_KEY_CODE_DPAD_UP: return 1; - case LINK_CONSTANT_DPAD_DOWN: + case LINK_KEY_CODE_DPAD_DOWN: return 2; default: return 0; @@ -2487,251 +2501,257 @@ static u16 sub_8087068(u16 a1) } // Overwrites the keys with 0x11 -static void guess_ResetLinkKeys(u16 *keys) +static void ResetPlayerHeldKeys(u16 *keys) { s32 i; for (i = 0; i < 4; i++) - keys[i] = LINK_CONSTANT_UNK_1; + keys[i] = LINK_KEY_CODE_EMPTY; } -static u16 sub_80870B0(u32 a1) + +static u16 KeyInterCB_SelfIdle(u32 key) { - if (ScriptContext2_IsEnabled() == 1) - return LINK_CONSTANT_UNK_1; - if (sub_800B4DC() > 4) - return 27; - if (GetLinkEventQueueLength() <= 4) - return sub_808700C(a1); - return 28; + if (ScriptContext2_IsEnabled() == TRUE) + return LINK_KEY_CODE_EMPTY; + if (GetLinkRecvQueueLength() > 4) + return LINK_KEY_CODE_HANDLE_RECV_QUEUE; + if (GetLinkSendQueueLength() <= 4) + return KeyInterCB_ReadButtons(key); + return LINK_KEY_CODE_HANDLE_SEND_QUEUE; } -static u16 sub_80870EC(u32 a1) +static u16 sub_80870EC(u32 key) { - sub_8086C64(); - return LINK_CONSTANT_UNK_1; + CheckRfuKeepAliveTimer(); + return LINK_KEY_CODE_EMPTY; } -static u16 sub_80870F8(u32 a1) +// Ignore the player's inputs as long as there is an event script +// in ScriptContext2. +static u16 KeyInterCB_DeferToEventScript(u32 key) { u16 retVal; if (ScriptContext2_IsEnabled() == TRUE) { - retVal = LINK_CONSTANT_UNK_1; + retVal = LINK_KEY_CODE_EMPTY; } else { - retVal = 26; - c1_link_related_func_set(sub_80870EC); + retVal = LINK_KEY_CODE_UNK_4; + SetKeyInterceptCallback(sub_80870EC); } return retVal; } -static u16 sub_808711C(u32 a1) +// Ignore the player's inputs as long as there are events being recived. +static u16 KeyInterCB_DeferToRecvQueue(u32 key) { u16 retVal; - if (sub_800B4DC() > 2) + if (GetLinkRecvQueueLength() > 2) { - retVal = LINK_CONSTANT_UNK_1; + retVal = LINK_KEY_CODE_EMPTY; } else { - retVal = 26; + retVal = LINK_KEY_CODE_UNK_4; ScriptContext2_Disable(); - c1_link_related_func_set(sub_80870EC); + SetKeyInterceptCallback(sub_80870EC); } return retVal; } -static u16 sub_8087140(u32 a1) +// Ignore the player's inputs as long as there are events being sent. +static u16 KeyInterCB_DeferToSendQueue(u32 key) { u16 retVal; - if (GetLinkEventQueueLength() > 2) + if (GetLinkSendQueueLength() > 2) { - retVal = LINK_CONSTANT_UNK_1; + retVal = LINK_KEY_CODE_EMPTY; } else { - retVal = 26; + retVal = LINK_KEY_CODE_UNK_4; ScriptContext2_Disable(); - c1_link_related_func_set(sub_80870EC); + SetKeyInterceptCallback(sub_80870EC); } return retVal; } -static u16 sub_8087164(u32 a1) +static u16 sub_8087164(u32 key) { - sub_8086C64(); - return LINK_CONSTANT_UNK_1; + CheckRfuKeepAliveTimer(); + return LINK_KEY_CODE_EMPTY; } static u16 sub_8087170(u32 linkPlayerId) { - if (sTrainerTradingStates[linkPlayerId] == TRAINER_TRADING_STATE_UNK_2) + if (sPlayerTradingStates[linkPlayerId] == PLAYER_TRADING_STATE_UNK_2) { if (gMain.newKeys & B_BUTTON) { - c1_link_related_func_set(sub_8087164); - return 29; + SetKeyInterceptCallback(sub_8087164); + return LINK_KEY_CODE_UNK_7; } else { - return LINK_CONSTANT_UNK_1; + return LINK_KEY_CODE_EMPTY; } } else { - sub_8086C64(); - return LINK_CONSTANT_UNK_1; + CheckRfuKeepAliveTimer(); + return LINK_KEY_CODE_EMPTY; } } static u16 sub_80871AC(u32 a1) { - c1_link_related_func_set(sub_8087170); - return 22; + SetKeyInterceptCallback(sub_8087170); + return LINK_KEY_CODE_UNK_2; } static u16 sub_80871C0(u32 a1) { - return LINK_CONSTANT_UNK_1; + return LINK_KEY_CODE_EMPTY; } static u16 sub_80871C4(u32 a1) { - if (sTrainerTradingStates[a1] != TRAINER_TRADING_STATE_UNK_3) - sub_8086C64(); - if (sub_8086CA8(TRAINER_TRADING_STATE_UNK_3) == TRUE) + if (sPlayerTradingStates[a1] != PLAYER_TRADING_STATE_UNK_3) + CheckRfuKeepAliveTimer(); + if (AreAllPlayersInState(PLAYER_TRADING_STATE_UNK_3) == TRUE) { ScriptContext1_SetupScript(EventScript_277513); - c1_link_related_func_set(sub_80871C0); + SetKeyInterceptCallback(sub_80871C0); } - return LINK_CONSTANT_UNK_1; + return LINK_KEY_CODE_EMPTY; } static u16 sub_80871FC(u32 a1) { - c1_link_related_func_set(sub_80871C4); + SetKeyInterceptCallback(sub_80871C4); return 23; } static u16 sub_8087210(u32 a1) { - return LINK_CONSTANT_UNK_1; + return LINK_KEY_CODE_EMPTY; } u32 sub_8087214(void) { - if (sub_8086CE0(0x83) == TRUE) + if (AreAnyPlayersInState(PLAYER_TRADING_STATE_UNK_3) == TRUE) return 2; - if (sguess_PlayerKeyCallback == sub_8087170 && sTrainerTradingStates[gLinkGuestPlayerId] != TRAINER_TRADING_STATE_UNK_2) + if (sPlayerKeyInterceptCallback == sub_8087170 && sPlayerTradingStates[gLinkSelfPlayerId] != PLAYER_TRADING_STATE_UNK_2) return 0; - if (sguess_PlayerKeyCallback == sub_8087164 && sTrainerTradingStates[gLinkGuestPlayerId] == TRAINER_TRADING_STATE_UNK_1) + if (sPlayerKeyInterceptCallback == sub_8087164 && sPlayerTradingStates[gLinkSelfPlayerId] == PLAYER_TRADING_STATE_BUSY) return 2; - if (sub_8086CA8(0x82) != 0) + if (AreAllPlayersInState(PLAYER_TRADING_STATE_UNK_2) != FALSE) return 1; return 0; } bool32 sub_808727C(void) { - return sub_8086CE0(0x83); + return AreAnyPlayersInState(PLAYER_TRADING_STATE_UNK_3); } u16 sub_8087288(void) { - c1_link_related_func_set(sub_80871AC); + SetKeyInterceptCallback(sub_80871AC); return 0; } u16 sub_808729C(void) { - c1_link_related_func_set(sub_80870F8); + SetKeyInterceptCallback(KeyInterCB_DeferToEventScript); return 0; } u16 sub_80872B0(void) { - c1_link_related_func_set(sub_80871FC); + SetKeyInterceptCallback(sub_80871FC); return 0; } u16 sub_80872C4(void) { - c1_link_related_func_set(sub_8087210); + SetKeyInterceptCallback(sub_8087210); return 0; } -static void sub_80872D8(s32 linkPlayerId, s32 a2, struct TradeRoomTrainer *a3) +static void LoadTradeRoomPlayer(s32 linkPlayerId, s32 myPlayerId, struct TradeRoomPlayer *trainer) { s16 x, y; - a3->a = linkPlayerId; - a3->b = (linkPlayerId == a2) ? 1 : 0; - a3->c = gLinkPlayerEventObjects[linkPlayerId].mode; - a3->facing = sub_80878A0(linkPlayerId); - sub_8087878(linkPlayerId, &x, &y); - a3->sub.x = x; - a3->sub.y = y; - a3->sub.height = sub_80878C0(linkPlayerId); - a3->field_C = MapGridGetMetatileBehaviorAt(x, y); + trainer->playerId = linkPlayerId; + trainer->isSelf = (linkPlayerId == myPlayerId) ? 1 : 0; + trainer->c = gLinkPlayerEventObjects[linkPlayerId].mode; + trainer->facing = GetLinkPlayerFacingDirection(linkPlayerId); + GetLinkPlayerCoords(linkPlayerId, &x, &y); + trainer->pos.x = x; + trainer->pos.y = y; + trainer->pos.height = GetLinkPlayerElevation(linkPlayerId); + trainer->field_C = MapGridGetMetatileBehaviorAt(x, y); } -static bool32 sub_8087340(struct TradeRoomTrainer *a1) +static bool32 sub_8087340(struct TradeRoomPlayer *player) { - u8 v1 = a1->c; + u8 v1 = player->c; if (v1 == 2 || v1 == 0) return TRUE; else return FALSE; } -static bool32 sub_8087358(struct TradeRoomTrainer *a1) +// Duplicate function. +static bool32 sub_8087340_2(struct TradeRoomPlayer *player) { - u8 v1 = a1->c; + u8 v1 = player->c; if (v1 == 2 || v1 == 0) return TRUE; else return FALSE; } -static u8 *sub_8087370(struct TradeRoomTrainer *a1) +static u8 *TryGetTileEventScript(struct TradeRoomPlayer *player) { - if (a1->c != 2) + if (player->c != 2) return 0; - return GetCoordEventScriptAtMapPosition(&a1->sub); + return GetCoordEventScriptAtMapPosition(&player->pos); } -static bool32 sub_8087388(struct TradeRoomTrainer *a1) +static bool32 PlayerIsAtSouthExit(struct TradeRoomPlayer *player) { - if (a1->c != 2 && a1->c != 0) + if (player->c != 2 && player->c != 0) return FALSE; - else if (!MetatileBehavior_IsSouthArrowWarp(a1->field_C)) + else if (!MetatileBehavior_IsSouthArrowWarp(player->field_C)) return FALSE; - else if (a1->facing != 1) + else if (player->facing != 1) return FALSE; else return TRUE; } -static const u8 *sub_80873B4(struct TradeRoomTrainer *a1) +static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *player) { - struct MapPosition unkStruct; + struct MapPosition otherPlayerPos; u8 linkPlayerId; - if (a1->c && a1->c != 2) + if (player->c && player->c != 2) return 0; - unkStruct = a1->sub; - unkStruct.x += gDirectionToVectors[a1->facing].x; - unkStruct.y += gDirectionToVectors[a1->facing].y; - unkStruct.height = 0; - linkPlayerId = GetLinkPlayerIdAt(unkStruct.x, unkStruct.y); + otherPlayerPos = player->pos; + otherPlayerPos.x += gDirectionToVectors[player->facing].x; + otherPlayerPos.y += gDirectionToVectors[player->facing].y; + otherPlayerPos.height = 0; + linkPlayerId = GetLinkPlayerIdAt(otherPlayerPos.x, otherPlayerPos.y); if (linkPlayerId != 4) { - if (!a1->b) + if (!player->isSelf) return EventScript_TradeRoom_TooBusyToNotice; - else if (sTrainerTradingStates[linkPlayerId] != TRAINER_TRADING_STATE_IDLE) + else if (sPlayerTradingStates[linkPlayerId] != PLAYER_TRADING_STATE_IDLE) return EventScript_TradeRoom_TooBusyToNotice; else if (!GetLinkTrainerCardColor(linkPlayerId)) return EventScript_TradeRoom_ReadTrainerCard_NoColor; @@ -2739,10 +2759,10 @@ static const u8 *sub_80873B4(struct TradeRoomTrainer *a1) return EventScript_TradeRoom_ReadTrainerCard_Normal; } - return GetInteractedLinkPlayerScript(&unkStruct, a1->field_C, a1->facing); + return GetInteractedLinkPlayerScript(&otherPlayerPos, player->field_C, player->facing); } -static u16 sub_8087480(const u8 *script) +static u16 GetTypeForTileEventScript(const u8 *script) { if (script == gUnknown_08277388) return 10; @@ -2777,7 +2797,7 @@ static void sub_8087510(void) ScriptContext2_Enable(); } -static void sub_808751C(void) +static void InitLinkRoomStartMenuScript(void) { PlaySE(SE_WIN_OPEN); ShowStartMenu(); @@ -2791,14 +2811,14 @@ static void sub_8087530(const u8 *script) ScriptContext2_Enable(); } -static void sub_808754C(void) +static void CreateConfirmLeaveTradeRoomPrompt(void) { PlaySE(SE_WIN_OPEN); - ScriptContext1_SetupScript(gUnknown_082774EF); + ScriptContext1_SetupScript(gEventScript_ConfirmLeaveTradeRoom); ScriptContext2_Enable(); } -static void sub_8087568(const u8 *script) +static void InitMenuBasedScript(const u8 *script) { PlaySE(SE_SELECT); ScriptContext1_SetupScript(script); @@ -2813,12 +2833,12 @@ static void sub_8087584(void) bool32 sub_8087598(void) { - if (!is_c1_link_related_active()) - return 0; - if (sub_800B4DC() >= 3) - sUnknown_03000E18 = 1; + if (!IsUpdateLinkStateCBActive()) + return FALSE; + if (GetLinkRecvQueueLength() >= 3) + sUnknown_03000E18 = TRUE; else - sUnknown_03000E18 = 0; + sUnknown_03000E18 = FALSE; return sUnknown_03000E18; } @@ -2826,19 +2846,19 @@ bool32 sub_80875C8(void) { u8 temp; - if (sub_800B4DC() < 2) + if (GetLinkRecvQueueLength() < 2) return FALSE; - else if (is_c1_link_related_active() != TRUE) + else if (IsUpdateLinkStateCBActive() != TRUE) return FALSE; - else if (sub_8009F3C() != TRUE) + else if (IsSendingKeysToLink() != TRUE) return FALSE; - else if (sguess_PlayerKeyCallback == sub_808711C) + else if (sPlayerKeyInterceptCallback == KeyInterCB_DeferToRecvQueue) return TRUE; - else if (sguess_PlayerKeyCallback != sub_80870F8) + else if (sPlayerKeyInterceptCallback != KeyInterCB_DeferToEventScript) return FALSE; temp = sUnknown_03000E18; - sUnknown_03000E18 = 0; + sUnknown_03000E18 = FALSE; if (temp == TRUE) return TRUE; @@ -2850,13 +2870,13 @@ bool32 sub_80875C8(void) bool32 sub_8087634(void) { - if (GetLinkEventQueueLength() < 2) + if (GetLinkSendQueueLength() < 2) return FALSE; - else if (is_c1_link_related_active() != TRUE) + else if (IsUpdateLinkStateCBActive() != TRUE) return FALSE; - else if (sub_8009F3C() != TRUE) + else if (IsSendingKeysToLink() != TRUE) return FALSE; - else if (sguess_PlayerKeyCallback == sub_8087140) + else if (sPlayerKeyInterceptCallback == KeyInterCB_DeferToSendQueue) return TRUE; else return FALSE; @@ -2866,13 +2886,13 @@ bool32 sub_808766C(void) { if (gWirelessCommType != 0) return FALSE; - else if (!sub_8009F3C()) + else if (!IsSendingKeysToLink()) return FALSE; else return TRUE; } -static u32 GetLinkEventQueueLength(void) +static u32 GetLinkSendQueueLength(void) { if (gWirelessCommType != 0) return gUnknown_03005000.unk_9e8.unk_232; @@ -2957,7 +2977,7 @@ static u8 GetSpriteForLinkedPlayer(u8 linkPlayerId) return eventObj->spriteId; } -static void sub_8087878(u8 linkPlayerId, u16 *x, u16 *y) +static void GetLinkPlayerCoords(u8 linkPlayerId, u16 *x, u16 *y) { u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; struct EventObject *eventObj = &gEventObjects[eventObjId]; @@ -2965,14 +2985,14 @@ static void sub_8087878(u8 linkPlayerId, u16 *x, u16 *y) *y = eventObj->currentCoords.y; } -static u8 sub_80878A0(u8 linkPlayerId) +static u8 GetLinkPlayerFacingDirection(u8 linkPlayerId) { u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; struct EventObject *eventObj = &gEventObjects[eventObjId]; return eventObj->range.as_byte; } -static u8 sub_80878C0(u8 linkPlayerId) +static u8 GetLinkPlayerElevation(u8 linkPlayerId) { u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; struct EventObject *eventObj = &gEventObjects[eventObjId]; @@ -3002,7 +3022,7 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y) return 4; } -static void sub_808796C(u8 linkPlayerId, u8 a2) +static void RunPlayerEventScript(u8 linkPlayerId, u8 eventScriptType) { struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; u8 eventObjId = linkPlayerEventObj->eventObjId; @@ -3010,10 +3030,10 @@ static void sub_808796C(u8 linkPlayerId, u8 a2) if (linkPlayerEventObj->active) { - if (a2 > 10) + if (eventScriptType > 10) eventObj->triggerGroundEffectsOnMove = 1; else - gUnknown_08339E00[gLinkPlayerEventModes[linkPlayerEventObj->mode](linkPlayerEventObj, eventObj, a2)](linkPlayerEventObj, eventObj); + gUnknown_08339E00[gLinkPlayerEventModes[linkPlayerEventObj->mode](linkPlayerEventObj, eventObj, eventScriptType)](linkPlayerEventObj, eventObj); } } diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index c409d5d323..57fb2c8983 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -188,7 +188,7 @@ extern u8 gUnknown_02022C3E; extern u16 gUnknown_02022C3C; extern u8 gUnknown_02022C20[]; extern u8 gFieldLinkPlayerCount; -extern u8 gLinkGuestPlayerId; +extern u8 gLinkSelfPlayerId; // IWRAM vars IWRAM_DATA struct UnkStruct_Leader *gUnknown_03000DA0; @@ -1641,7 +1641,7 @@ void sub_8014304(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 arg4) gSpecialVar_0x8004 = arg4; VarSet(VAR_0x4087, arg4); gFieldLinkPlayerCount = GetLinkPlayerCount(); - gLinkGuestPlayerId = GetMultiplayerId(); + gLinkSelfPlayerId = GetMultiplayerId(); SetCableClubWarp(); SetWarpDestination(mapGroup, mapNum, -1, x, y); WarpIntoMap(); diff --git a/src/scrcmd.c b/src/scrcmd.c index 837259a7f6..e681a9135e 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1203,7 +1203,7 @@ bool8 ScrCmd_turnvobject(struct ScriptContext *ctx) bool8 ScrCmd_lockall(struct ScriptContext *ctx) { - if (is_c1_link_related_active()) + if (IsUpdateLinkStateCBActive()) { return FALSE; } @@ -1217,7 +1217,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx) bool8 ScrCmd_lock(struct ScriptContext *ctx) { - if (is_c1_link_related_active()) + if (IsUpdateLinkStateCBActive()) { return FALSE; } @@ -2182,7 +2182,7 @@ bool8 ScrCmd_cmdD8(struct ScriptContext *ctx) bool8 ScrCmd_cmdD9(struct ScriptContext *ctx) { - if (is_c1_link_related_active()) + if (IsUpdateLinkStateCBActive()) { return FALSE; } diff --git a/src/start_menu.c b/src/start_menu.c index a1c9fc9ad7..4b41933ae6 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -84,7 +84,7 @@ EWRAM_DATA static bool8 sSavingComplete = FALSE; EWRAM_DATA static u8 sSaveInfoWindowId = 0; // Extern variables. -extern u8 gLinkGuestPlayerId; +extern u8 gLinkSelfPlayerId; // Extern functions in not decompiled files. extern void sub_80AF688(void); @@ -244,7 +244,7 @@ static void BuildStartMenuActions(void) { sNumStartMenuActions = 0; - if (is_c1_link_related_active() == TRUE) + if (IsUpdateLinkStateCBActive() == TRUE) { BuildLinkModeStartMenu(); } @@ -547,7 +547,7 @@ void sub_809FA34(u8 taskId) // Referenced in field_screen.s and rom_8011DC0.s void ShowStartMenu(void) // Called from overworld.c and field_control_avatar.s { - if (!is_c1_link_related_active()) + if (!IsUpdateLinkStateCBActive()) { FreezeEventObjects(); sub_808B864(); @@ -672,7 +672,7 @@ static bool8 StartMenuPlayerNameCallback(void) RemoveExtraStartMenuWindows(); CleanupOverworldWindowsAndTilemaps(); - if (is_c1_link_related_active() || InUnionRoom()) + if (IsUpdateLinkStateCBActive() || InUnionRoom()) ShowPlayerTrainerCard(CB2_ReturnToFieldWithOpenMenu); // Display trainer card else if (FlagGet(FLAG_SYS_FRONTIER_PASS)) ShowFrontierPass(CB2_ReturnToFieldWithOpenMenu); // Display frontier pass @@ -734,7 +734,7 @@ static bool8 StartMenuLinkModePlayerNameCallback(void) { PlayRainSoundEffect(); CleanupOverworldWindowsAndTilemaps(); - ShowTrainerCardInLink(gLinkGuestPlayerId, CB2_ReturnToFieldWithOpenMenu); + ShowTrainerCardInLink(gLinkSelfPlayerId, CB2_ReturnToFieldWithOpenMenu); return TRUE; } diff --git a/src/trade.c b/src/trade.c index 70b57fbc77..2cd7cf2d93 100644 --- a/src/trade.c +++ b/src/trade.c @@ -2762,7 +2762,7 @@ static void sub_80794CC(void) Free(gUnknown_0203229C); FreeAllWindowBuffers(); sub_800E084(); - SetMainCallback2(c2_8056854); + SetMainCallback2(CB2_ReturnToFieldFromMultiplayer); } } else @@ -2772,7 +2772,7 @@ static void sub_80794CC(void) Free(gUnknown_02032184); Free(gUnknown_0203229C); FreeAllWindowBuffers(); - SetMainCallback2(c2_8056854); + SetMainCallback2(CB2_ReturnToFieldFromMultiplayer); } } } From e75f45dbcfcd65901035fbc7e3793332670eb306 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 10 Feb 2019 20:42:50 -0500 Subject: [PATCH 035/217] Reverse engineered many of the multiplayer events Some corrections to the way events are handled and identified. --- asm/rom_81D1C44.s | 2 +- data/event_scripts.s | 20 +- data/io_reg.s | 10 +- data/maps/DoubleBattleColosseum/map.json | 8 +- .../MossdeepCity_SpaceCenter_2F/scripts.inc | 2 +- data/maps/RecordCorner/map.json | 8 +- data/maps/SingleBattleColosseum/map.json | 4 +- .../scripts.inc | 2 +- data/maps/TradeCenter/map.json | 6 +- data/scripts/cable_club.inc | 100 ++--- data/specials.inc | 12 +- include/constants/battle_frontier.h | 2 + include/link.h | 6 +- include/overworld.h | 19 +- include/party_menu.h | 2 +- include/record_mixing.h | 2 +- include/save.h | 6 +- src/battle_controllers.c | 2 +- src/berry_blender.c | 8 +- src/cable_club.c | 31 +- src/field_screen_effect.c | 4 +- src/link.c | 10 +- src/link_rfu.c | 4 +- src/mystery_event_menu.c | 2 +- src/overworld.c | 399 ++++++++++-------- src/party_menu.c | 2 +- src/record_mixing.c | 50 ++- src/rom_8011DC0.c | 2 +- src/save.c | 4 +- src/script_pokemon_util_80F87D8.c | 21 +- src/start_menu.c | 4 +- src/trade.c | 8 +- 32 files changed, 412 insertions(+), 350 deletions(-) diff --git a/asm/rom_81D1C44.s b/asm/rom_81D1C44.s index 13664a4b2b..a9ef8e4f20 100644 --- a/asm/rom_81D1C44.s +++ b/asm/rom_81D1C44.s @@ -6500,7 +6500,7 @@ _081D4F6C: bne _081D4F88 movs r0, 0x49 bl PlaySE - bl sub_800A620 + bl CheckShouldAdvanceLinkState movs r0, 0 strh r0, [r5] b _081D4FE6 diff --git a/data/event_scripts.s b/data/event_scripts.s index 8d8b0cd68e..1e7dbe237b 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1157,21 +1157,21 @@ EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851 setvar VAR_0x40D3, 1 return -EventScript_WhiteOut:: @ 8271857 +gEventScript_WhiteOut:: @ 8271857 call EverGrandeCity_HallOfFame_EventScript_2718CC - goto EventScript_271862 + goto gEventScript_ResetMrBriney end -EventScript_271862:: @ 8271862 +gEventScript_ResetMrBriney:: @ 8271862 compare VAR_0x4096, 1 - goto_if_eq EverGrandeCity_HallOfFame_EventScript_271884 + goto_if_eq EventScript_MoveMrBrineyToHouse compare VAR_0x4096, 2 - goto_if_eq EverGrandeCity_HallOfFame_EventScript_27189A + goto_if_eq EventScript_MoveMrBrineyToDewford compare VAR_0x4096, 3 - goto_if_eq EverGrandeCity_HallOfFame_EventScript_2718B3 + goto_if_eq EventScript_MoveMrBrineyToRoute108 end -EverGrandeCity_HallOfFame_EventScript_271884:: @ 8271884 +EventScript_MoveMrBrineyToHouse:: @ 8271884 setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN setflag FLAG_HIDE_ROUTE_108_MR_BRINEY @@ -1181,7 +1181,7 @@ EverGrandeCity_HallOfFame_EventScript_271884:: @ 8271884 clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO end -EverGrandeCity_HallOfFame_EventScript_27189A:: @ 827189A +EventScript_MoveMrBrineyToDewford:: @ 827189A setflag FLAG_HIDE_ROUTE_108_MR_BRINEY setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT setflag FLAG_HIDE_ROUTE_104_MR_BRINEY @@ -1192,7 +1192,7 @@ EverGrandeCity_HallOfFame_EventScript_27189A:: @ 827189A clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN end -EverGrandeCity_HallOfFame_EventScript_2718B3:: @ 82718B3 +EventScript_MoveMrBrineyToRoute108:: @ 82718B3 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY @@ -1610,7 +1610,7 @@ EventScript_271D5E:: @ 8271D5E goto EventScript_271D89 EventScript_271D83:: @ 8271D83 - special sub_80E6BE8 + special EventScript_RecordMixingPlayerSpotTriggered waitstate lock faceplayer diff --git a/data/io_reg.s b/data/io_reg.s index e6315cd894..9c5f64f583 100644 --- a/data/io_reg.s +++ b/data/io_reg.s @@ -24,11 +24,11 @@ gUnref_82EC784:: @ 82EC784 .4byte 0x02000100 .4byte 0x08000400 -gUnknown_82EC7C4:: @ 82EC7C4 - .2byte 0x0100 - .2byte 0x0200 - .2byte 0x0400 - .2byte 0x0800 +gOverworldBackgroundLayerFlags:: @ 82EC7C4 + .2byte 0x0100 /* BLDCNT_TGT2_BG0 */ + .2byte 0x0200 /* BLDCNT_TGT2_BG1 */ + .2byte 0x0400 /* BLDCNT_TGT2_BG2 */ + .2byte 0x0800 /* BLDCNT_TGT2_BG3 */ gUnknown_82EC7CC:: @ 82EC7CC .2byte 0x0001 diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/DoubleBattleColosseum/map.json index c0cd887613..b46c8fa3ea 100644 --- a/data/maps/DoubleBattleColosseum/map.json +++ b/data/maps/DoubleBattleColosseum/map.json @@ -52,7 +52,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gUnknown_08277388" + "script": "gEventScript_DoubleBattleColosseum_PlayerSpot0" }, { "type": "trigger", @@ -61,7 +61,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gUnknown_082773BE" + "script": "gEventScript_DoubleBattleColosseum_PlayerSpot2" }, { "type": "trigger", @@ -70,7 +70,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gUnknown_082773A3" + "script": "gEventScript_DoubleBattleColosseum_PlayerSpot1" }, { "type": "trigger", @@ -79,7 +79,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gUnknown_082773D9" + "script": "gEventScript_DoubleBattleColosseum_PlayerSpot3" } ], "bg_events": [] diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 0602c9dad1..d2e5dded13 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -248,7 +248,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C waitmovement 0 special SavePlayerParty fadescreen 1 - special sub_80F9438 + special EventScript_ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 goto_if_ne MossdeepCity_SpaceCenter_2F_EventScript_224032 diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index 98bcc02012..9bf870a526 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -66,7 +66,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gUnknown_0827741D" + "script": "gEventScript_RecordCenter_Spot0" }, { "type": "trigger", @@ -75,7 +75,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gUnknown_08277447" + "script": "gEventScript_RecordCenter_Spot2" }, { "type": "trigger", @@ -84,7 +84,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gUnknown_08277432" + "script": "gEventScript_RecordCenter_Spot1" }, { "type": "trigger", @@ -93,7 +93,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gUnknown_0827745C" + "script": "gEventScript_RecordCenter_Spot3" } ], "bg_events": [] diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json index a2cc78b2f2..4576bc0429 100644 --- a/data/maps/SingleBattleColosseum/map.json +++ b/data/maps/SingleBattleColosseum/map.json @@ -52,7 +52,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gUnknown_08277374" + "script": "gEventScript_SingleBattleColosseum_PlayerSpot0" }, { "type": "trigger", @@ -61,7 +61,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gUnknown_0827737E" + "script": "gEventScript_SingleBattleColosseum_PlayerSpot1" } ], "bg_events": [] diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 5db2042935..2d8de4bb4f 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -129,7 +129,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2:: @ 8227AE2 SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF:: @ 8227AEF msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C84, MSGBOX_DEFAULT fadescreen 1 - special sub_80F9438 + special EventScript_ChooseHalfPartyForBattle waitstate return diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index f7511a7537..6ab2bdbe1e 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -46,22 +46,24 @@ ], "coord_events": [ { + "comment": "This is trade seat #1.", "type": "trigger", "x": 4, "y": 5, "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gUnknown_082773F5" + "script": "gEventScript_TradeCenter_Chair0" }, { + "comment": "This is trade seat #2.", "type": "trigger", "x": 7, "y": 5, "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gUnknown_082773FF" + "script": "gEventScript_TradeCenter_Chair1" } ], "bg_events": [] diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index c5e8a41a7e..dbd664dbc4 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -791,116 +791,118 @@ EventScript_CableBoxResults:: @ 8277365 releaseall end -gUnknown_08277374:: @ 8277374 +gEventScript_SingleBattleColosseum_PlayerSpot0:: @ 8277374 setvar VAR_0x8005, 0 - special sub_80B3968 + special EventScript_ColosseumPlayerSpotTriggered waitstate end -gUnknown_0827737E:: @ 827737E +gEventScript_SingleBattleColosseum_PlayerSpot1:: @ 827737E setvar VAR_0x8005, 1 - special sub_80B3968 + special EventScript_ColosseumPlayerSpotTriggered waitstate end -gUnknown_08277388:: @ 8277388 +gEventScript_DoubleBattleColosseum_PlayerSpot0:: @ 8277388 fadescreen 1 - special sub_80F9438 + special EventScript_ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq DoubleBattleColosseum_EventScript_2773F4 + goto_if_eq gEventScript_DoubleBattleColosseum_CancelSpotTrigger setvar VAR_0x8005, 0 - special sub_80B3968 + special EventScript_ColosseumPlayerSpotTriggered waitstate end -gUnknown_082773A3:: @ 82773A3 +gEventScript_DoubleBattleColosseum_PlayerSpot1:: @ 82773A3 fadescreen 1 - special sub_80F9438 + special EventScript_ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq DoubleBattleColosseum_EventScript_2773F4 + goto_if_eq gEventScript_DoubleBattleColosseum_CancelSpotTrigger setvar VAR_0x8005, 1 - special sub_80B3968 + special EventScript_ColosseumPlayerSpotTriggered waitstate end -gUnknown_082773BE:: @ 82773BE +gEventScript_DoubleBattleColosseum_PlayerSpot2:: @ 82773BE fadescreen 1 - special sub_80F9438 + special EventScript_ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq DoubleBattleColosseum_EventScript_2773F4 + goto_if_eq gEventScript_DoubleBattleColosseum_CancelSpotTrigger setvar VAR_0x8005, 2 - special sub_80B3968 + special EventScript_ColosseumPlayerSpotTriggered waitstate end -gUnknown_082773D9:: @ 82773D9 +gEventScript_DoubleBattleColosseum_PlayerSpot3:: @ 82773D9 fadescreen 1 - special sub_80F9438 + special EventScript_ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq DoubleBattleColosseum_EventScript_2773F4 + goto_if_eq gEventScript_DoubleBattleColosseum_CancelSpotTrigger setvar VAR_0x8005, 3 - special sub_80B3968 + special EventScript_ColosseumPlayerSpotTriggered waitstate end -DoubleBattleColosseum_EventScript_2773F4:: @ 82773F4 +gEventScript_DoubleBattleColosseum_CancelSpotTrigger:: @ 82773F4 end -gUnknown_082773F5:: @ 82773F5 +gEventScript_TradeCenter_Chair0:: @ 82773F5 setvar VAR_0x8005, 0 - special sub_80B3924 + special EventScript_PlayerEnteredTradeSeat waitstate end -gUnknown_082773FF:: @ 82773FF +gEventScript_TradeCenter_Chair1:: @ 82773FF setvar VAR_0x8005, 1 - special sub_80B3924 + special EventScript_PlayerEnteredTradeSeat waitstate end -gUnknown_08277409:: @ 8277409 +/* Never used */ +gEventScript_TradeCenter_Chair2:: @ 8277409 setvar VAR_0x8005, 2 - special sub_80B3924 + special EventScript_PlayerEnteredTradeSeat waitstate end -gUnknown_08277413:: @ 8277413 +/* Never used */ +gEventScript_TradeCenter_Chair3:: @ 8277413 setvar VAR_0x8005, 3 - special sub_80B3924 + special EventScript_PlayerEnteredTradeSeat waitstate end -gUnknown_0827741D:: @ 827741D +gEventScript_RecordCenter_Spot0:: @ 827741D setvar VAR_0x8005, 0 - special sub_80E6BE8 + special EventScript_RecordMixingPlayerSpotTriggered waitstate compare VAR_TEMP_1, 0 goto_if_ne RecordCorner_EventScript_277471 end -gUnknown_08277432:: @ 8277432 +gEventScript_RecordCenter_Spot1:: @ 8277432 setvar VAR_0x8005, 1 - special sub_80E6BE8 + special EventScript_RecordMixingPlayerSpotTriggered waitstate compare VAR_TEMP_1, 0 goto_if_ne RecordCorner_EventScript_277471 end -gUnknown_08277447:: @ 8277447 +gEventScript_RecordCenter_Spot2:: @ 8277447 setvar VAR_0x8005, 2 - special sub_80E6BE8 + special EventScript_RecordMixingPlayerSpotTriggered waitstate compare VAR_TEMP_1, 0 goto_if_ne RecordCorner_EventScript_277471 end -gUnknown_0827745C:: @ 827745C +gEventScript_RecordCenter_Spot3:: @ 827745C setvar VAR_0x8005, 3 - special sub_80E6BE8 + special EventScript_RecordMixingPlayerSpotTriggered waitstate compare VAR_TEMP_1, 0 goto_if_ne RecordCorner_EventScript_277471 @@ -914,21 +916,21 @@ RecordCorner_EventScript_277471:: @ 8277471 releaseall end -EventScript_TradeRoom_ReadTrainerCard_NoColor:: @ 827747E +gEventScript_TradeRoom_ReadTrainerCard_NoColor:: @ 827747E msgbox Text_278452, MSGBOX_DEFAULT fadescreen 1 special sp02A_crash_sound waitstate end -EventScript_TradeRoom_ReadTrainerCard_Normal:: @ 827748D +gEventScript_TradeRoom_ReadTrainerCard_Normal:: @ 827748D msgbox Text_27847B, MSGBOX_DEFAULT fadescreen 1 special sp02A_crash_sound waitstate end -EventScript_TradeRoom_TooBusyToNotice:: @ 827749C +gEventScript_TradeRoom_TooBusyToNotice:: @ 827749C msgbox Text_27842E, MSGBOX_DEFAULT closemessage end @@ -968,21 +970,21 @@ RecordCorner_EventScript_2774E0:: @ 82774E0 end gEventScript_ConfirmLeaveTradeRoom:: @ 82774EF - msgbox Text_2783A8, MSGBOX_YESNO + msgbox Text_TerminateLinkConfirmation, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq gUnknown_08277509 + goto_if_eq gEventScript_TerminateLink erasebox 0, 0, 29, 19 releaseall end -gUnknown_08277509:: @ 8277509 - messageautoscroll Text_2783E9 +gEventScript_TerminateLink:: @ 8277509 + messageautoscroll Text_TerminateLinkPleaseWait waitmessage - special sub_80B371C + special EventScript_ExitLinkRoom end -EventScript_277513:: @ 8277513 - special sub_80B36EC +gEventScript_DoLinkRoomExit:: @ 8277513 + special EventScript_CleanupLinkRoomState special sub_80AF9F8 waitstate end @@ -1736,11 +1738,11 @@ OldaleTown_PokemonCenter_2F_Text_278372: @ 8278372 .string "Please confirm the number of\n" .string "players and start again.$" -Text_2783A8: @ 82783A8 +Text_TerminateLinkConfirmation: @ 82783A8 .string "The link will be terminated if you\n" .string "leave the room. Is that okay?$" -Text_2783E9: @ 82783E9 +Text_TerminateLinkPleaseWait: @ 82783E9 .string "Terminating link…\n" .string "You will be escorted out of\l" .string "the room. Please wait.$" diff --git a/data/specials.inc b/data/specials.inc index b3ca15ed1e..e13a23ab0d 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -12,8 +12,8 @@ gSpecials:: @ 81DBA64 def_special SetCableClubWarp def_special sub_80AF948 def_special sub_80AF9F8 - def_special sub_80B36EC - def_special sub_80B371C + def_special EventScript_CleanupLinkRoomState + def_special EventScript_ExitLinkRoom def_special sub_80E8E18 def_special sub_80E8BC8 def_special sub_80E9068 @@ -35,14 +35,14 @@ gSpecials:: @ 81DBA64 def_special sub_80E91F8 def_special sub_80EA30C def_special DoSecretBasePCTurnOffEffect - def_special sub_80E6BE8 + def_special EventScript_RecordMixingPlayerSpotTriggered def_special sub_80B2DA4 def_special sub_80B2E4C def_special sub_80B2E74 def_special sub_80B2EA8 def_special CloseLink - def_special sub_80B3968 - def_special sub_80B3924 + def_special EventScript_ColosseumPlayerSpotTriggered + def_special EventScript_PlayerEnteredTradeSeat def_special nullsub_37 def_special sub_80B3254 def_special sub_80B2FD8 @@ -50,7 +50,7 @@ gSpecials:: @ 81DBA64 def_special SpawnLinkPartnerEventObject def_special SavePlayerParty def_special LoadPlayerParty - def_special sub_80F9438 + def_special EventScript_ChooseHalfPartyForBattle def_special sp02A_crash_sound def_special EventObjectInteractionGetBerryTreeData def_special EventObjectInteractionGetBerryName diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h index ca9e3bc9f4..1224c0f310 100644 --- a/include/constants/battle_frontier.h +++ b/include/constants/battle_frontier.h @@ -10,6 +10,8 @@ #define FRONTIER_FACILITY_PIKE 5 #define FRONTIER_FACILITY_PYRAMID 6 #define NUM_FRONTIER_FACILITIES 7 +// The multiplayer battle colosseum rooms re-use VAR_FRONTIER_FACILITY. +#define FRONTIER_FACILITY_DOUBLE_COLOSSEUM 9 #define TENT_VERDANTURF 2 #define TENT_FALLARBOR 3 diff --git a/include/link.h b/include/link.h index b29d9b4e15..8c272699d0 100644 --- a/include/link.h +++ b/include/link.h @@ -244,7 +244,7 @@ bool8 IsLinkTaskFinished(void); void CreateWirelessStatusIndicatorSprite(u8, u8); void sub_800ADF8(void); void sub_800B488(void); -void sub_800A620(void); +void CheckShouldAdvanceLinkState(void); void sub_8011BD0(void); u8 IsLinkMaster(void); void sub_800AC34(void); @@ -299,8 +299,8 @@ extern struct LinkPlayer gLocalLinkPlayer; bool32 Link_AnyPartnersPlayingRubyOrSapphire(void); bool32 sub_800A03C(void); -void sub_8009628(u8); -u8 sub_800AA48(void); +void SetLocalLinkPlayerId(u8); +u8 GetSavedPlayerCount(void); void sub_8009FAC(void); bool8 sub_800A4D8(u8 a0); u8 sub_800A9D8(void); diff --git a/include/overworld.h b/include/overworld.h index b5c41b1e6a..9434d5c284 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -8,11 +8,22 @@ #define LINK_KEY_CODE_DPAD_LEFT 0x14 #define LINK_KEY_CODE_DPAD_RIGHT 0x15 #define LINK_KEY_CODE_UNK_2 0x16 -#define LINK_KEY_CODE_UNK_3 0x17 +#define LINK_KEY_CODE_EXIT_ROOM 0x17 #define LINK_KEY_CODE_START_BUTTON 0x18 #define LINK_KEY_CODE_A_BUTTON 0x19 #define LINK_KEY_CODE_UNK_4 0x1A // I'd guess this is the B button? +// These two are a hack to stop user input until link stuff can be +// resolved. +#define LINK_KEY_CODE_HANDLE_RECV_QUEUE 0x1B +#define LINK_KEY_CODE_HANDLE_SEND_QUEUE 0x1C +#define LINK_KEY_CODE_UNK_7 0x1D +#define LINK_KEY_CODE_UNK_8 0x1E + +#define MOVEMENT_MODE_FREE 0 +#define MOVEMENT_MODE_FROZEN 1 +#define MOVEMENT_MODE_SCRIPTED 2 + struct InitialPlayerAvatarState { u8 transitionFlags; @@ -24,7 +35,7 @@ struct LinkPlayerEventObject u8 active; u8 linkPlayerId; u8 eventObjId; - u8 mode; + u8 movementMode; }; // Exported RAM declarations @@ -120,7 +131,7 @@ void CB1_Overworld(void); void CB2_OverworldBasic(void); void CB2_Overworld(void); void SetMainCallback1(void (*cb)(void)); -void sub_8085E94(void *a0); +void SetUnusedCallback(void *a0); void CB2_NewGame(void); void CB2_WhiteOut(void); void CB2_LoadMap(void); @@ -140,7 +151,7 @@ u32 sub_8087214(void); bool32 sub_808727C(void); u16 sub_8087288(void); u16 sub_808729C(void); -u16 sub_80872B0(void); +u16 QueueExitLinkRoomKey(void); u16 sub_80872C4(void); bool32 sub_8087598(void); bool32 sub_80875C8(void); diff --git a/include/party_menu.h b/include/party_menu.h index 702b4fde17..e67dd56f2c 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -85,7 +85,7 @@ u8 GetItemEffectType(u16 item); void CB2_PartyMenuFromStartMenu(void); void sub_81B7F60(void); void sub_81B8448(void); -void sub_81B8518(u8 unused); +void InitChooseHalfPartyForBattle(u8 unused); void sub_81B8558(void); void sub_81B8904(u8 initArg, MainCallback callback); void sub_81B892C(void); diff --git a/include/record_mixing.h b/include/record_mixing.h index 0d50f46f9a..d02b77f9ca 100644 --- a/include/record_mixing.h +++ b/include/record_mixing.h @@ -7,7 +7,7 @@ struct PlayerHallRecords struct RankingHall2P twoPlayers[2]; }; -void sub_80E6BE8(void); +void EventScript_RecordMixingPlayerSpotTriggered(void); void GetPlayerHallRecords(struct PlayerHallRecords *dst); #endif //GUARD_RECORD_MIXING_H diff --git a/include/save.h b/include/save.h index 42ce8b3f32..de2dd5129e 100644 --- a/include/save.h +++ b/include/save.h @@ -83,13 +83,11 @@ bool8 sub_8153380(void); bool8 sub_81533AC(void); u8 sub_81533E0(void); u8 sub_8153408(void); -u8 sub_8153430(void); -bool8 sub_8153474(void); +u8 FullSaveGame(void); //FullSaveGame +bool8 CheckSaveFile(void); //CheckSaveFile u8 Save_LoadGameData(u8 a1); u16 sub_815355C(void); u8 sub_81534D0(u8); -u8 sub_8153430(void); -bool8 sub_8153474(void); u32 TryCopySpecialSaveSection(u8 sector, u8* dst); u32 sub_8153634(u8 sector, u8* src); void sub_8153688(u8 taskId); diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 70a53f332c..29272c19ac 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -767,7 +767,7 @@ static void Task_HandleSendLinkBuffersData(u8 taskId) { if (IsLinkMaster()) { - sub_800A620(); + CheckShouldAdvanceLinkState(); gTasks[taskId].data[11]++; } else diff --git a/src/berry_blender.c b/src/berry_blender.c index f2e3c7d14a..cfcd81f73b 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -146,8 +146,8 @@ extern void sub_81AABF0(void (*callback)(void)); extern void sub_800B4C0(void); extern void ClearLinkCallback(void); extern void sub_8009F8C(void); -extern void sub_8153430(void); -extern bool8 sub_8153474(void); +extern void FullSaveGame(void); +extern bool8 CheckSaveFile(void); extern void sub_80EECEC(void); // this file's functions @@ -2600,7 +2600,7 @@ static bool8 LinkPlayAgainHandleSaving(void) } break; case 2: - sub_8153430(); + FullSaveGame(); sBerryBlenderData->field_1A0++; sBerryBlenderData->framesToWait = 0; break; @@ -2614,7 +2614,7 @@ static bool8 LinkPlayAgainHandleSaving(void) case 4: if (IsLinkTaskFinished()) { - if (sub_8153474()) + if (CheckSaveFile()) { sBerryBlenderData->field_1A0 = 5; } diff --git a/src/cable_club.c b/src/cable_club.c index c76de7a6a9..05c19c9ae3 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -282,7 +282,7 @@ static void sub_80B2804(u8 taskId) if (GetFieldMessageBoxMode() == FIELD_MESSAGE_BOX_HIDDEN) { - if (sub_800AA48() != GetLinkPlayerCount_2()) + if (GetSavedPlayerCount() != GetLinkPlayerCount_2()) { ShowFieldAutoScrollMessage(gText_ConfirmLinkWhenPlayersReady); gTasks[taskId].func = sub_80B270C; @@ -295,7 +295,7 @@ static void sub_80B2804(u8 taskId) else if (gMain.heldKeys & A_BUTTON) { PlaySE(SE_SELECT); - sub_800A620(); + CheckShouldAdvanceLinkState(); gTasks[taskId].func = sub_80B28A8; } } @@ -310,7 +310,7 @@ static void sub_80B28A8(u8 taskId) || sub_80B2D6C(taskId) == TRUE) return; - if (GetLinkPlayerCount_2() != sub_800AA48()) + if (GetLinkPlayerCount_2() != GetSavedPlayerCount()) { gTasks[taskId].func = sub_80B2D2C; } @@ -764,9 +764,9 @@ static void sub_80B3194(u8 taskId) static void sub_80B31E8(u8 taskId) { - if (sub_800AA48() == GetLinkPlayerCount_2()) + if (GetSavedPlayerCount() == GetLinkPlayerCount_2()) { - sub_800A620(); + CheckShouldAdvanceLinkState(); gTasks[taskId].func = sub_80B3220; } } @@ -999,7 +999,7 @@ void sub_80B360C(void) SetMainCallback2(sub_80A0514); } -void sub_80B36EC(void) +void EventScript_CleanupLinkRoomState(void) { if (gSpecialVar_0x8004 == 1 || gSpecialVar_0x8004 == 2 || gSpecialVar_0x8004 == 5 || gSpecialVar_0x8004 == 9) { @@ -1009,11 +1009,13 @@ void sub_80B36EC(void) SetWarpDestinationToDynamicWarp(0x7F); } -void sub_80B371C(void) +void EventScript_ExitLinkRoom(void) { - sub_80872B0(); + QueueExitLinkRoomKey(); } +// I can't find anything that would set data[0] to a value before this +// stask starts. Is it a bug? static void sub_80B3728(u8 taskId) { struct Task* task = &gTasks[taskId]; @@ -1028,7 +1030,7 @@ static void sub_80B3728(u8 taskId) if (IsFieldMessageBoxHidden()) { sub_8087288(); - sub_8009628(gSpecialVar_0x8005); + SetLocalLinkPlayerId(gSpecialVar_0x8005); task->data[0] = 2; } break; @@ -1130,7 +1132,8 @@ static void sub_80B3894(u8 taskId) } } -void sub_80B3924(void) +// Note: VAR_0x8005 is set to the ID of the trade seat. +void EventScript_PlayerEnteredTradeSeat(void) { if (gWirelessCommType != 0) { @@ -1152,7 +1155,8 @@ void nullsub_37(void) } -void sub_80B3968(void) +// Note: VAR_0x8005 is set to the ID of the player spot. +void EventScript_ColosseumPlayerSpotTriggered(void) { gLinkType = 0x2211; @@ -1166,6 +1170,7 @@ void sub_80B3968(void) } } +// This function is never called. static void sub_80B39A4(void) { u8 taskId = CreateTask(sub_80B3728, 80); @@ -1265,13 +1270,13 @@ void sub_80B3AF8(u8 taskId) } break; case 2: - if (GetLinkPlayerCount_2() >= sub_800AA48()) + if (GetLinkPlayerCount_2() >= GetSavedPlayerCount()) { if (IsLinkMaster()) { if (++data[1] > 30) { - sub_800A620(); + CheckShouldAdvanceLinkState(); data[0]++; } } diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index ee9b497326..b8427c7de8 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -621,7 +621,7 @@ void sub_80AF948(void) CreateTask(sub_80AF8E0, 10); } -static void sub_80AF96C(u8 taskId) +static void Task_ReturnToWorldFromLinkRoom(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -654,7 +654,7 @@ static void sub_80AF96C(u8 taskId) void sub_80AF9F8(void) { - CreateTask(sub_80AF96C, 10); + CreateTask(Task_ReturnToWorldFromLinkRoom, 10); } static void sub_80AFA0C(u8 taskId) diff --git a/src/link.c b/src/link.c index 1550d8783d..72ac3e8787 100644 --- a/src/link.c +++ b/src/link.c @@ -302,9 +302,9 @@ void LinkTestScreen(void) SetMainCallback2(CB2_LinkTest); } -void sub_8009628(u8 a0) +void SetLocalLinkPlayerId(u8 playerId) { - gLocalLinkPlayer.id = a0; + gLocalLinkPlayer.id = playerId; } static void InitLocalLinkPlayer(void) @@ -1142,7 +1142,7 @@ void ResetBlockReceivedFlag(u8 who) } } -void sub_800A620(void) +void CheckShouldAdvanceLinkState(void) { if ((gLinkStatus & LINK_STAT_MASTER) && EXTRACT_PLAYER_COUNT(gLinkStatus) > 1) { @@ -1327,7 +1327,9 @@ void sub_800AA04(u8 a0) } } -u8 sub_800AA48(void) +// The number of players when trading began. This is frequently compared against the +// current number of connected players to check if anyone dropped out. +u8 GetSavedPlayerCount(void) { return gSavedLinkPlayerCount; } diff --git a/src/link_rfu.c b/src/link_rfu.c index 859d741b19..f13d15337d 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -3788,10 +3788,10 @@ bool32 sub_8010454(u32 a0) u8 sub_801048C(bool32 a0) { - if (a0 == 0) + if (a0 == FALSE) return sub_800D550(0, 0); sub_800D550(1, 0x258); - return FALSE; + return 0; } void sub_80104B0(void) diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index 0de4675d92..2058bb81fd 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -179,7 +179,7 @@ static void CB2_MysteryEventMenu(void) if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - sub_800A620(); + CheckShouldAdvanceLinkState(); SetWindowBorderStyle(1, 1, 1, 0xD); PrintMysteryMenuText(1, gText_LoadingEvent, 1, 2, 0); PutWindowTilemap(1); diff --git a/src/overworld.c b/src/overworld.c index ca588a0729..671d3412f3 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -66,48 +66,47 @@ #include "constants/species.h" #include "constants/weather.h" -// These two are a hack to stop user input until link stuff can be -// resolved. -#define LINK_KEY_CODE_HANDLE_RECV_QUEUE 0x1B -#define LINK_KEY_CODE_HANDLE_SEND_QUEUE 0x1C -#define LINK_KEY_CODE_UNK_7 0x1D -#define LINK_KEY_CODE_UNK_8 0x1E - #define PLAYER_TRADING_STATE_IDLE 0x80 #define PLAYER_TRADING_STATE_BUSY 0x81 #define PLAYER_TRADING_STATE_UNK_2 0x82 -#define PLAYER_TRADING_STATE_UNK_3 0x83 +#define PLAYER_TRADING_STATE_EXITING_ROOM 0x83 -#define EVENT_SCRIPT_NONE 0 -#define EVENT_SCRIPT_ID_9 9 -#define EVENT_SCRIPT_ID_10 10 +#define FACING_NONE 0 +#define FACING_UP 1 +#define FACING_DOWN 2 +#define FACING_LEFT 3 +#define FACING_RIGHT 4 +#define FACING_FORCED_UP 7 +#define FACING_FORCED_DOWN 8 +#define FACING_FORCED_LEFT 9 +#define FACING_FORCED_RIGHT 10 // event scripts -extern const u8 EventScript_WhiteOut[]; -extern const u8 EventScript_271862[]; -extern const u8 EventScript_277513[]; -extern const u8 EventScript_TradeRoom_TooBusyToNotice[]; -extern const u8 EventScript_TradeRoom_ReadTrainerCard_NoColor[]; -extern const u8 EventScript_TradeRoom_ReadTrainerCard_Normal[]; -extern const u8 gUnknown_08277388[]; -extern const u8 gUnknown_082773A3[]; -extern const u8 gUnknown_082773BE[]; -extern const u8 gUnknown_082773D9[]; -extern const u8 gUnknown_0827741D[]; -extern const u8 gUnknown_08277432[]; -extern const u8 gUnknown_08277447[]; -extern const u8 gUnknown_0827745C[]; -extern const u8 gUnknown_08277374[]; -extern const u8 gUnknown_0827737E[]; -extern const u8 gUnknown_082773FF[]; -extern const u8 gUnknown_082773F5[]; +extern const u8 gEventScript_WhiteOut[]; +extern const u8 gEventScript_ResetMrBriney[]; +extern const u8 gEventScript_DoLinkRoomExit[]; +extern const u8 gEventScript_TradeRoom_TooBusyToNotice[]; +extern const u8 gEventScript_TradeRoom_ReadTrainerCard_NoColor[]; +extern const u8 gEventScript_TradeRoom_ReadTrainerCard_Normal[]; +extern const u8 gEventScript_DoubleBattleColosseum_PlayerSpot0[]; +extern const u8 gEventScript_DoubleBattleColosseum_PlayerSpot1[]; +extern const u8 gEventScript_DoubleBattleColosseum_PlayerSpot2[]; +extern const u8 gEventScript_DoubleBattleColosseum_PlayerSpot3[]; +extern const u8 gEventScript_RecordCenter_Spot0[]; +extern const u8 gEventScript_RecordCenter_Spot1[]; +extern const u8 gEventScript_RecordCenter_Spot2[]; +extern const u8 gEventScript_RecordCenter_Spot3[]; +extern const u8 gEventScript_SingleBattleColosseum_PlayerSpot0[]; +extern const u8 gEventScript_SingleBattleColosseum_PlayerSpot1[]; +extern const u8 gEventScript_TradeCenter_Chair1[]; +extern const u8 gEventScript_TradeCenter_Chair0[]; extern const u8 gEventScript_ConfirmLeaveTradeRoom[]; -extern const u8 gUnknown_08277509[]; +extern const u8 gEventScript_TerminateLink[]; extern const struct MapLayout *const gMapLayouts[]; extern const struct MapHeader *const *const gMapGroups[]; extern const int gMaxFlashLevel; -extern const u16 gUnknown_82EC7C4[]; +extern const u16 gOverworldBackgroundLayerFlags[]; static void Overworld_ResetStateAfterWhiteOut(void); static void c2_80567AC(void); @@ -123,7 +122,7 @@ static bool32 map_loading_iteration_2_link(u8 *state); static void mli4_mapscripts_and_other(void); static void InitOverworldGraphicsRegisters(void); static u8 GetSpriteForLinkedPlayer(u8); -static u16 sub_80871C0(u32 a1); +static u16 KeyInterCB_SendNothing(u32 a1); static void sub_80867C8(void); static void sub_80867D8(void); static void sub_8086AE4(void); @@ -140,7 +139,7 @@ static void ClearAllPlayerKeys(void); static void ResetAllTradingStates(void); static void UpdateHeldKeyCode(u16); static void UpdateAllLinkPlayers(u16*, s32); -static u8 npc_something3(u8 a1, u8 a2); +static u8 FlipVerticalAndClearForced(u8 a1, u8 a2); static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y); static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion); static void GetLinkPlayerCoords(u8 linkPlayerId, u16 *x, u16 *y); @@ -148,7 +147,7 @@ static u8 GetLinkPlayerFacingDirection(u8 linkPlayerId); static u8 GetLinkPlayerElevation(u8 linkPlayerId); static s32 sub_80878E4(u8 linkPlayerId); static u8 GetLinkPlayerIdAt(s16 x, s16 y); -static void RunPlayerEventScript(u8 linkPlayerId, u8 a2); +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); @@ -159,7 +158,7 @@ static void sub_8087584(void); static u32 GetLinkSendQueueLength(void); static void ZeroLinkPlayerEventObject(struct LinkPlayerEventObject *linkPlayerEventObj); static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *a1); -static u16 GetTypeForTileEventScript(const u8 *script); +static u16 GetDirectionForEventScript(const u8 *script); static void sub_8087510(void); static void InitLinkRoomStartMenuScript(void); static void sub_8087530(const u8 *script); @@ -176,7 +175,7 @@ static u16 KeyInterCB_DeferToSendQueue(u32); static void ResetPlayerHeldKeys(u16 *a1); static u16 KeyInterCB_SelfIdle(u32 a1); static u16 KeyInterCB_DeferToEventScript(u32 a1); -static u16 sub_8087068(u16 a1); +static u16 GetDirectionForDpadKey(u16 a1); static void CB1_UpdateLinkState(void); static void SetKeyInterceptCallback(u16 (*func)(u32)); static void SetFieldVBlankCallback(void); @@ -187,7 +186,7 @@ static u8 GetAdjustedInitialDirection(struct InitialPlayerAvatarState *playerStr static u16 GetCenterScreenMetatileBehavior(void); // IWRAM bss vars -IWRAM_DATA static void *sUnknown_03000E0C; +IWRAM_DATA static void *sUnusedCallback; IWRAM_DATA static u8 sPlayerTradingStates[4]; // This callback is called with a player's key code. It then returns an // adjusted key code, effectively intercepting the input before anything @@ -338,49 +337,53 @@ static const struct ScanlineEffectParams sFlashEffectParams = 0, }; -static u8 sub_80879D8(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 sub_80879F8(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 sub_80879FC(struct LinkPlayerEventObject *, struct EventObject *, u8); +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 (*const gLinkPlayerEventModes[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = +static u8 (*const gLinkPlayerMovementModes[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = { - sub_80879D8, - sub_80879F8, - sub_80879FC, + MovementEventModeCB_Normal, // MOVEMENT_MODE_FREE + MovementEventModeCB_Ignored, // MOVEMENT_MODE_FROZEN + MovementEventModeCB_Normal_2, // MOVEMENT_MODE_SCRIPTED }; -static u8 sub_8087A1C(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 sub_8087A20(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 sub_8087A88(struct LinkPlayerEventObject *, struct EventObject *, u8); +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 (*const gUnknown_08339DD4[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = +// These handlers return TRUE if the movement was scripted and successful, and FALSE otherwise. +static bool8 (*const gLinkPlayerFacingHandlers[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = { - sub_8087A1C, - sub_8087A20, - sub_8087A20, - sub_8087A20, - sub_8087A20, - sub_8087A1C, - sub_8087A1C, - sub_8087A88, - sub_8087A88, - sub_8087A88, - sub_8087A88, + FacingHandler_DoNothing, + FacingHandler_DpadMovement, + FacingHandler_DpadMovement, + FacingHandler_DpadMovement, + FacingHandler_DpadMovement, + FacingHandler_DoNothing, + FacingHandler_DoNothing, + FacingHandler_ForcedFacingChange, + FacingHandler_ForcedFacingChange, + FacingHandler_ForcedFacingChange, + FacingHandler_ForcedFacingChange, }; -static void sub_8087AA0(struct LinkPlayerEventObject *, struct EventObject *); -static void sub_8087AA8(struct LinkPlayerEventObject *, struct EventObject *); +static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerEventObject *, struct EventObject *); +static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerEventObject *, struct EventObject *); -static void (*const gUnknown_08339E00[])(struct LinkPlayerEventObject *, struct EventObject *) = +// These handlers are run after an attempted movement. +static void (*const gMovementStatusHandler[])(struct LinkPlayerEventObject *, struct EventObject *) = { - sub_8087AA0, - sub_8087AA8, + // FALSE: + MovementStatusHandler_EnterFreeMode, + // TRUE: + MovementStatusHandler_TryAdvanceScript, }; // code void DoWhiteOut(void) { - ScriptContext2_RunNewScript(EventScript_WhiteOut); + ScriptContext2_RunNewScript(gEventScript_WhiteOut); SetMoney(&gSaveBlock1Ptr->money, GetMoney(&gSaveBlock1Ptr->money) / 2); HealPlayerParty(); Overworld_ResetStateAfterWhiteOut(); @@ -406,7 +409,7 @@ void Overworld_ResetStateAfterTeleport(void) FlagClear(FLAG_SYS_SAFARI_MODE); FlagClear(FLAG_SYS_USE_STRENGTH); FlagClear(FLAG_SYS_USE_FLASH); - ScriptContext2_RunNewScript(EventScript_271862); + ScriptContext2_RunNewScript(gEventScript_ResetMrBriney); } void Overworld_ResetStateAfterDigEscRope(void) @@ -1495,9 +1498,10 @@ void SetMainCallback1(MainCallback cb) gMain.callback1 = cb; } -void sub_8085E94(void *a0) +// This function is never called. +void SetUnusedCallback(void *func) { - sUnknown_03000E0C = a0; + sUnusedCallback = func; } static bool8 map_post_load_hook_exec(void) @@ -2102,7 +2106,7 @@ static void InitOverworldGraphicsRegisters(void) SetGpuReg(REG_OFFSET_WIN0V, 0xFF); SetGpuReg(REG_OFFSET_WIN1H, 0xFFFF); SetGpuReg(REG_OFFSET_WIN1V, 0xFFFF); - SetGpuReg(REG_OFFSET_BLDCNT, gUnknown_82EC7C4[1] | gUnknown_82EC7C4[2] | gUnknown_82EC7C4[3] + SetGpuReg(REG_OFFSET_BLDCNT, gOverworldBackgroundLayerFlags[1] | gOverworldBackgroundLayerFlags[2] | gOverworldBackgroundLayerFlags[3] | BLDCNT_TGT2_OBJ | BLDCNT_EFFECT_BLEND); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(13, 7)); InitOverworldBgs(); @@ -2249,6 +2253,9 @@ static void CB1_UpdateLinkState(void) // UpdateHeldKeyCode performs a sanity check on its input; if // sPlayerKeyInterceptCallback echoes back the argument, which is selfId, then // it'll use LINK_KEY_CODE_EMPTY instead. + // + // Note 2: There are some key intercept callbacks that treat the key as a player + // ID. It's so hacky. UpdateHeldKeyCode(sPlayerKeyInterceptCallback(selfId)); ClearAllPlayerKeys(); } @@ -2311,7 +2318,7 @@ static bool32 AreAnyPlayersInState(u16 tradingState) return FALSE; } -static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlayer *trainer, u16 *eventScriptType) +static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlayer *trainer, u16 *forceFacing) { const u8 *script; @@ -2320,7 +2327,7 @@ static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlay script = TryGetTileEventScript(trainer); if (script) { - *eventScriptType = GetTypeForTileEventScript(script); + *forceFacing = GetDirectionForEventScript(script); sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; if (trainer->isSelf) { @@ -2329,7 +2336,7 @@ static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlay } return; } - if (AreAnyPlayersInState(PLAYER_TRADING_STATE_UNK_3) == TRUE) + if (AreAnyPlayersInState(PLAYER_TRADING_STATE_EXITING_ROOM) == TRUE) { sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; if (trainer->isSelf) @@ -2403,8 +2410,8 @@ static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlay switch (key) { - case LINK_KEY_CODE_UNK_3: - sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_UNK_3; + case LINK_KEY_CODE_EXIT_ROOM: + sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_EXITING_ROOM; break; case LINK_KEY_CODE_UNK_2: sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_UNK_2; @@ -2429,12 +2436,12 @@ static void UpdateAllLinkPlayers(u16 *keys, s32 selfId) for (i = 0; i < 4; i++) { u8 key = keys[i]; - u16 eventScriptType = EVENT_SCRIPT_NONE; + u16 setFacing = FACING_NONE; LoadTradeRoomPlayer(i, selfId, &trainer); - HandleLinkPlayerKeyInput(i, key, &trainer, &eventScriptType); + HandleLinkPlayerKeyInput(i, key, &trainer, &setFacing); if (sPlayerTradingStates[i] == PLAYER_TRADING_STATE_IDLE) - eventScriptType = sub_8087068(key); - RunPlayerEventScript(i, eventScriptType); + setFacing = GetDirectionForDpadKey(key); + SetPlayerFacingDirection(i, setFacing); } } @@ -2483,20 +2490,20 @@ static u16 KeyInterCB_ReadButtons(u32 key) return LINK_KEY_CODE_EMPTY; } -static u16 sub_8087068(u16 a1) +static u16 GetDirectionForDpadKey(u16 a1) { switch (a1) { case LINK_KEY_CODE_DPAD_RIGHT: - return 4; + return FACING_RIGHT; case LINK_KEY_CODE_DPAD_LEFT: - return 3; + return FACING_LEFT; case LINK_KEY_CODE_DPAD_UP: - return 1; + return FACING_UP; case LINK_KEY_CODE_DPAD_DOWN: - return 2; + return FACING_DOWN; default: - return 0; + return FACING_NONE; } } @@ -2577,19 +2584,19 @@ static u16 KeyInterCB_DeferToSendQueue(u32 key) return retVal; } -static u16 sub_8087164(u32 key) +static u16 KeyInterCB_DoNothingAndKeepAlive(u32 key) { CheckRfuKeepAliveTimer(); return LINK_KEY_CODE_EMPTY; } -static u16 sub_8087170(u32 linkPlayerId) +static u16 sub_8087170(u32 keyOrPlayerId) { - if (sPlayerTradingStates[linkPlayerId] == PLAYER_TRADING_STATE_UNK_2) + if (sPlayerTradingStates[keyOrPlayerId] == PLAYER_TRADING_STATE_UNK_2) { if (gMain.newKeys & B_BUTTON) { - SetKeyInterceptCallback(sub_8087164); + SetKeyInterceptCallback(KeyInterCB_DoNothingAndKeepAlive); return LINK_KEY_CODE_UNK_7; } else @@ -2610,41 +2617,45 @@ static u16 sub_80871AC(u32 a1) return LINK_KEY_CODE_UNK_2; } -static u16 sub_80871C0(u32 a1) +static u16 KeyInterCB_SendNothing(u32 key) { return LINK_KEY_CODE_EMPTY; } -static u16 sub_80871C4(u32 a1) +static u16 KeyInterCB_WaitForPlayersToExit(u32 keyOrPlayerId) { - if (sPlayerTradingStates[a1] != PLAYER_TRADING_STATE_UNK_3) + // keyOrPlayerId could be any keycode. This callback does no sanity checking + // on the size of the key. It's assuming that it is being called from + // CB1_UpdateLinkState. + if (sPlayerTradingStates[keyOrPlayerId] != PLAYER_TRADING_STATE_EXITING_ROOM) CheckRfuKeepAliveTimer(); - if (AreAllPlayersInState(PLAYER_TRADING_STATE_UNK_3) == TRUE) + if (AreAllPlayersInState(PLAYER_TRADING_STATE_EXITING_ROOM) == TRUE) { - ScriptContext1_SetupScript(EventScript_277513); - SetKeyInterceptCallback(sub_80871C0); + ScriptContext1_SetupScript(gEventScript_DoLinkRoomExit); + SetKeyInterceptCallback(KeyInterCB_SendNothing); } return LINK_KEY_CODE_EMPTY; } -static u16 sub_80871FC(u32 a1) +static u16 KeyInterCB_SendExitRoomKey(u32 key) { - SetKeyInterceptCallback(sub_80871C4); - return 23; + SetKeyInterceptCallback(KeyInterCB_WaitForPlayersToExit); + return LINK_KEY_CODE_EXIT_ROOM; } -static u16 sub_8087210(u32 a1) +// Duplicate function. +static u16 KeyInterCB_SendNothing_2(u32 key) { return LINK_KEY_CODE_EMPTY; } u32 sub_8087214(void) { - if (AreAnyPlayersInState(PLAYER_TRADING_STATE_UNK_3) == TRUE) + if (AreAnyPlayersInState(PLAYER_TRADING_STATE_EXITING_ROOM) == TRUE) return 2; if (sPlayerKeyInterceptCallback == sub_8087170 && sPlayerTradingStates[gLinkSelfPlayerId] != PLAYER_TRADING_STATE_UNK_2) return 0; - if (sPlayerKeyInterceptCallback == sub_8087164 && sPlayerTradingStates[gLinkSelfPlayerId] == PLAYER_TRADING_STATE_BUSY) + if (sPlayerKeyInterceptCallback == KeyInterCB_DoNothingAndKeepAlive && sPlayerTradingStates[gLinkSelfPlayerId] == PLAYER_TRADING_STATE_BUSY) return 2; if (AreAllPlayersInState(PLAYER_TRADING_STATE_UNK_2) != FALSE) return 1; @@ -2653,7 +2664,7 @@ u32 sub_8087214(void) bool32 sub_808727C(void) { - return AreAnyPlayersInState(PLAYER_TRADING_STATE_UNK_3); + return AreAnyPlayersInState(PLAYER_TRADING_STATE_EXITING_ROOM); } u16 sub_8087288(void) @@ -2668,15 +2679,17 @@ u16 sub_808729C(void) return 0; } -u16 sub_80872B0(void) +// The exit room key will be sent at the next opportunity. +// The return value is meaningless. +u16 QueueExitLinkRoomKey(void) { - SetKeyInterceptCallback(sub_80871FC); + SetKeyInterceptCallback(KeyInterCB_SendExitRoomKey); return 0; } u16 sub_80872C4(void) { - SetKeyInterceptCallback(sub_8087210); + SetKeyInterceptCallback(KeyInterCB_SendNothing_2); return 0; } @@ -2686,7 +2699,7 @@ static void LoadTradeRoomPlayer(s32 linkPlayerId, s32 myPlayerId, struct TradeRo trainer->playerId = linkPlayerId; trainer->isSelf = (linkPlayerId == myPlayerId) ? 1 : 0; - trainer->c = gLinkPlayerEventObjects[linkPlayerId].mode; + trainer->c = gLinkPlayerEventObjects[linkPlayerId].movementMode; trainer->facing = GetLinkPlayerFacingDirection(linkPlayerId); GetLinkPlayerCoords(linkPlayerId, &x, &y); trainer->pos.x = x; @@ -2698,7 +2711,7 @@ static void LoadTradeRoomPlayer(s32 linkPlayerId, s32 myPlayerId, struct TradeRo static bool32 sub_8087340(struct TradeRoomPlayer *player) { u8 v1 = player->c; - if (v1 == 2 || v1 == 0) + if (v1 == MOVEMENT_MODE_SCRIPTED || v1 == MOVEMENT_MODE_FREE) return TRUE; else return FALSE; @@ -2708,7 +2721,7 @@ static bool32 sub_8087340(struct TradeRoomPlayer *player) static bool32 sub_8087340_2(struct TradeRoomPlayer *player) { u8 v1 = player->c; - if (v1 == 2 || v1 == 0) + if (v1 == MOVEMENT_MODE_SCRIPTED || v1 == MOVEMENT_MODE_FREE) return TRUE; else return FALSE; @@ -2716,14 +2729,14 @@ static bool32 sub_8087340_2(struct TradeRoomPlayer *player) static u8 *TryGetTileEventScript(struct TradeRoomPlayer *player) { - if (player->c != 2) - return 0; + if (player->c != MOVEMENT_MODE_SCRIPTED) + return FACING_NONE; return GetCoordEventScriptAtMapPosition(&player->pos); } static bool32 PlayerIsAtSouthExit(struct TradeRoomPlayer *player) { - if (player->c != 2 && player->c != 0) + if (player->c != MOVEMENT_MODE_SCRIPTED && player->c != MOVEMENT_MODE_FREE) return FALSE; else if (!MetatileBehavior_IsSouthArrowWarp(player->field_C)) return FALSE; @@ -2738,8 +2751,8 @@ static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *player) struct MapPosition otherPlayerPos; u8 linkPlayerId; - if (player->c && player->c != 2) - return 0; + if (player->c != MOVEMENT_MODE_FREE && player->c != MOVEMENT_MODE_SCRIPTED) + return FACING_NONE; otherPlayerPos = player->pos; otherPlayerPos.x += gDirectionToVectors[player->facing].x; @@ -2750,46 +2763,48 @@ static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *player) if (linkPlayerId != 4) { if (!player->isSelf) - return EventScript_TradeRoom_TooBusyToNotice; + return gEventScript_TradeRoom_TooBusyToNotice; else if (sPlayerTradingStates[linkPlayerId] != PLAYER_TRADING_STATE_IDLE) - return EventScript_TradeRoom_TooBusyToNotice; + return gEventScript_TradeRoom_TooBusyToNotice; else if (!GetLinkTrainerCardColor(linkPlayerId)) - return EventScript_TradeRoom_ReadTrainerCard_NoColor; + return gEventScript_TradeRoom_ReadTrainerCard_NoColor; else - return EventScript_TradeRoom_ReadTrainerCard_Normal; + return gEventScript_TradeRoom_ReadTrainerCard_Normal; } return GetInteractedLinkPlayerScript(&otherPlayerPos, player->field_C, player->facing); } -static u16 GetTypeForTileEventScript(const u8 *script) +// This returns which direction to force the player to look when one of +// these event scripts runs. +static u16 GetDirectionForEventScript(const u8 *script) { - if (script == gUnknown_08277388) - return 10; - else if (script == gUnknown_082773A3) - return 9; - else if (script == gUnknown_082773BE) - return 10; - else if (script == gUnknown_082773D9) - return 9; - else if (script == gUnknown_0827741D) - return 10; - else if (script == gUnknown_08277432) - return 9; - else if (script == gUnknown_08277447) - return 10; - else if (script == gUnknown_0827745C) - return 9; - else if (script == gUnknown_08277374) - return 10; - else if (script == gUnknown_0827737E) - return 9; - else if (script == gUnknown_082773F5) - return 10; - else if (script == gUnknown_082773FF) - return 9; + if (script == gEventScript_DoubleBattleColosseum_PlayerSpot0) + return FACING_FORCED_RIGHT; + else if (script == gEventScript_DoubleBattleColosseum_PlayerSpot1) + return FACING_FORCED_LEFT; + else if (script == gEventScript_DoubleBattleColosseum_PlayerSpot2) + return FACING_FORCED_RIGHT; + else if (script == gEventScript_DoubleBattleColosseum_PlayerSpot3) + return FACING_FORCED_LEFT; + else if (script == gEventScript_RecordCenter_Spot0) + return FACING_FORCED_RIGHT; + else if (script == gEventScript_RecordCenter_Spot1) + return FACING_FORCED_LEFT; + else if (script == gEventScript_RecordCenter_Spot2) + return FACING_FORCED_RIGHT; + else if (script == gEventScript_RecordCenter_Spot3) + return FACING_FORCED_LEFT; + else if (script == gEventScript_SingleBattleColosseum_PlayerSpot0) + return FACING_FORCED_RIGHT; + else if (script == gEventScript_SingleBattleColosseum_PlayerSpot1) + return FACING_FORCED_LEFT; + else if (script == gEventScript_TradeCenter_Chair0) + return FACING_FORCED_RIGHT; + else if (script == gEventScript_TradeCenter_Chair1) + return FACING_FORCED_LEFT; else - return 0; + return FACING_NONE; } static void sub_8087510(void) @@ -2827,7 +2842,7 @@ static void InitMenuBasedScript(const u8 *script) static void sub_8087584(void) { - ScriptContext1_SetupScript(gUnknown_08277509); + ScriptContext1_SetupScript(gEventScript_TerminateLink); ScriptContext2_Enable(); } @@ -2927,7 +2942,7 @@ static void SpawnLinkPlayerEventObject(u8 linkPlayerId, s16 x, s16 y, u8 a4) linkPlayerEventObj->active = 1; linkPlayerEventObj->linkPlayerId = linkPlayerId; linkPlayerEventObj->eventObjId = eventObjId; - linkPlayerEventObj->mode = 0; + linkPlayerEventObj->movementMode = MOVEMENT_MODE_FREE; eventObj->active = 1; eventObj->singleMovementActive = a4; @@ -3012,7 +3027,7 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y) for (i = 0; i < 4; i++) { if (gLinkPlayerEventObjects[i].active - && (gLinkPlayerEventObjects[i].mode == 0 || gLinkPlayerEventObjects[i].mode == 2)) + && (gLinkPlayerEventObjects[i].movementMode == 0 || gLinkPlayerEventObjects[i].movementMode == 2)) { struct EventObject *eventObj = &gEventObjects[gLinkPlayerEventObjects[i].eventObjId]; if (eventObj->currentCoords.x == x && eventObj->currentCoords.y == y) @@ -3022,7 +3037,7 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y) return 4; } -static void RunPlayerEventScript(u8 linkPlayerId, u8 eventScriptType) +static void SetPlayerFacingDirection(u8 linkPlayerId, u8 facing) { struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; u8 eventObjId = linkPlayerEventObj->eventObjId; @@ -3030,94 +3045,108 @@ static void RunPlayerEventScript(u8 linkPlayerId, u8 eventScriptType) if (linkPlayerEventObj->active) { - if (eventScriptType > 10) + if (facing > FACING_FORCED_RIGHT) eventObj->triggerGroundEffectsOnMove = 1; - else - gUnknown_08339E00[gLinkPlayerEventModes[linkPlayerEventObj->mode](linkPlayerEventObj, eventObj, eventScriptType)](linkPlayerEventObj, eventObj); + 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) + + gMovementStatusHandler[TEMP](linkPlayerEventObj, eventObj); + + // Clean up the hack. + #undef TEMP + } } } -static u8 sub_80879D8(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) + +static u8 MovementEventModeCB_Normal(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) { - return gUnknown_08339DD4[a3](linkPlayerEventObj, eventObj, a3); + return gLinkPlayerFacingHandlers[a3](linkPlayerEventObj, eventObj, a3); } -static u8 sub_80879F8(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 MovementEventModeCB_Ignored(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) { - return 1; + return FACING_UP; } -static u8 sub_80879FC(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +// Duplicate Function +static u8 MovementEventModeCB_Normal_2(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) { - return gUnknown_08339DD4[a3](linkPlayerEventObj, eventObj, a3); + return gLinkPlayerFacingHandlers[a3](linkPlayerEventObj, eventObj, a3); } -static u8 sub_8087A1C(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static bool8 FacingHandler_DoNothing(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) { - return 0; + return FALSE; } -static u8 sub_8087A20(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static bool8 FacingHandler_DpadMovement(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) { s16 x, y; - eventObj->range.as_byte = npc_something3(a3, eventObj->range.as_byte); + eventObj->range.as_byte = FlipVerticalAndClearForced(a3, eventObj->range.as_byte); EventObjectMoveDestCoords(eventObj, eventObj->range.as_byte, &x, &y); if (LinkPlayerDetectCollision(linkPlayerEventObj->eventObjId, eventObj->range.as_byte, x, y)) { - return 0; + return FALSE; } else { eventObj->directionSequenceIndex = 16; ShiftEventObjectCoords(eventObj, x, y); EventObjectUpdateZCoord(eventObj); - return 1; + return TRUE; } } -static u8 sub_8087A88(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static bool8 FacingHandler_ForcedFacingChange(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) { - eventObj->range.as_byte = npc_something3(a3, eventObj->range.as_byte); - return 0; + eventObj->range.as_byte = FlipVerticalAndClearForced(a3, eventObj->range.as_byte); + return FALSE; } -static void sub_8087AA0(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj) +// 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) { - linkPlayerEventObj->mode = 0; + linkPlayerEventObj->movementMode = MOVEMENT_MODE_FREE; } -static void sub_8087AA8(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj) +static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj) { eventObj->directionSequenceIndex--; - linkPlayerEventObj->mode = 1; + linkPlayerEventObj->movementMode = MOVEMENT_MODE_FROZEN; MoveCoords(eventObj->range.as_byte, &eventObj->initialCoords.x, &eventObj->initialCoords.y); if (!eventObj->directionSequenceIndex) { ShiftStillEventObjectCoords(eventObj); - linkPlayerEventObj->mode = 2; + linkPlayerEventObj->movementMode = MOVEMENT_MODE_SCRIPTED; } } -static u8 npc_something3(u8 a1, u8 a2) +// Flip Up/Down facing codes. If newFacing doesn't specify a direction, default +// to oldFacing. Note that this clears also the "FORCED" part of the facing code, +// even for Left/Right codes. +static u8 FlipVerticalAndClearForced(u8 newFacing, u8 oldFacing) { - switch (a1 - 1) + switch (newFacing - 1) { - case 0: - case 6: - return 2; - case 1: - case 7: - return 1; - case 2: - case 8: - return 3; - case 3: - case 9: - return 4; + case (FACING_UP - 1): + case (FACING_FORCED_UP - 1): + return FACING_DOWN; + case (FACING_DOWN - 1): + case (FACING_FORCED_DOWN - 1): + return FACING_UP; + case (FACING_LEFT - 1): + case (FACING_FORCED_LEFT - 1): + return FACING_LEFT; + case (FACING_RIGHT - 1): + case (FACING_FORCED_RIGHT - 1): + return FACING_RIGHT; } - return a2; + return oldFacing; } static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y) @@ -3177,7 +3206,7 @@ static void SpriteCB_LinkPlayer(struct Sprite *sprite) SetObjectSubpriorityByZCoord(eventObj->previousElevation, sprite, 1); sprite->oam.priority = ZCoordToPriority(eventObj->previousElevation); - if (!linkPlayerEventObj->mode) + if (!linkPlayerEventObj->movementMode != MOVEMENT_MODE_FREE) StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObj->range.as_byte)); else StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(eventObj->range.as_byte)); diff --git a/src/party_menu.c b/src/party_menu.c index 15b5d24d8e..7cf2303d49 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -6513,7 +6513,7 @@ static void sub_81B8474(u8 taskId) gTasks[taskId].func = sub_81B8104; } -void sub_81B8518(u8 unused) +void InitChooseHalfPartyForBattle(u8 unused) { sub_81B8558(); InitPartyMenu(4, 0, 0, 0, 0, sub_81B1370, gMain.savedCallback); diff --git a/src/record_mixing.c b/src/record_mixing.c index 1890336858..4c0ada8300 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -106,7 +106,7 @@ static EWRAM_DATA union PlayerRecords *sSentRecord = NULL; // Static ROM declarations static void Task_RecordMixing_Main(u8 taskId); -static void sub_80E7324(u8 taskId); +static void Task_MixingRecordsRecv(u8 taskId); static void Task_SendPacket(u8 taskId); static void Task_CopyReceiveBuffer(u8 taskId); static void Task_SendPacket_SwitchToReceive(u8 taskId); @@ -120,7 +120,7 @@ static void ReceiveLilycoveLadyData(LilycoveLady *, size_t, u8); static void sub_80E7B2C(const u8 *); static void ReceiveDaycareMailData(struct RecordMixingDayCareMail *, size_t, u8, TVShow *); static void ReceiveGiftItem(u16 *item, u8 which); -static void sub_80E7FF8(u8 taskId); +static void Task_DoRecordMixing(u8 taskId); static void sub_80E8110(struct Apprentice *arg0, struct Apprentice *arg1); static void ReceiveApprenticeData(struct Apprentice *arg0, size_t arg1, u32 arg2); static void ReceiveRankingHallRecords(struct PlayerHallRecords *hallRecords, size_t arg1, u32 arg2); @@ -170,7 +170,8 @@ static const u8 gUnknown_0858CFBE[3][4] = #define BUFFER_CHUNK_SIZE 200 -void sub_80E6BE8(void) +// Note: VAR_0x8005 contains the spotId. +void EventScript_RecordMixingPlayerSpotTriggered(void) { sub_80B37D4(Task_RecordMixing_Main); } @@ -313,6 +314,7 @@ static void Task_RecordMixing_SoundEffect(u8 taskId) #define tState data[0] #define tSndEffTaskId data[15] +// Note: Currently, special var 8005 contains the player's spot id. static void Task_RecordMixing_Main(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -322,16 +324,16 @@ static void Task_RecordMixing_Main(u8 taskId) case 0: // init sSentRecord = malloc(sizeof(union PlayerRecords)); sReceivedRecords = malloc(sizeof(union PlayerRecords) * 4); - sub_8009628(gSpecialVar_0x8005); + SetLocalLinkPlayerId(gSpecialVar_0x8005); VarSet(VAR_TEMP_0, 1); gUnknown_03001130 = FALSE; PrepareExchangePacket(); CreateRecordMixingSprite(); tState = 1; - data[10] = CreateTask(sub_80E7324, 80); + data[10] = CreateTask(Task_MixingRecordsRecv, 80); tSndEffTaskId = CreateTask(Task_RecordMixing_SoundEffect, 81); break; - case 1: // wait for sub_80E7324 + case 1: // wait for Task_MixingRecordsRecv if (!gTasks[data[10]].isActive) { tState = 2; @@ -341,11 +343,11 @@ static void Task_RecordMixing_Main(u8 taskId) } break; case 2: - data[10] = CreateTask(sub_80E7FF8, 10); + data[10] = CreateTask(Task_DoRecordMixing, 10); tState = 3; PlaySE(SE_W226); break; - case 3: // wait for sub_80E7FF8 + case 3: // wait for Task_DoRecordMixing if (!gTasks[data[10]].isActive) { tState = 4; @@ -381,7 +383,7 @@ static void Task_RecordMixing_Main(u8 taskId) #undef tState #undef tSndEffTaskId -static void sub_80E7324(u8 taskId) +static void Task_MixingRecordsRecv(u8 taskId) { struct Task *task = &gTasks[taskId]; @@ -405,7 +407,7 @@ static void sub_80E7324(u8 taskId) u8 players = GetLinkPlayerCount_2(); if (IsLinkMaster() == TRUE) { - if (players == sub_800AA48()) + if (players == GetSavedPlayerCount()) { PlaySE(SE_PIN); task->data[0] = 201; @@ -420,14 +422,15 @@ static void sub_80E7324(u8 taskId) } break; case 201: - if (sub_800AA48() == GetLinkPlayerCount_2() && ++task->data[12] > (GetLinkPlayerCount_2() * 30)) + // We're the link master. Delay for 30 frames per connected player. + if (GetSavedPlayerCount() == GetLinkPlayerCount_2() && ++task->data[12] > (GetLinkPlayerCount_2() * 30)) { - sub_800A620(); + CheckShouldAdvanceLinkState(); task->data[0] = 1; } break; case 301: - if (sub_800AA48() == GetLinkPlayerCount_2()) + if (GetSavedPlayerCount() == GetLinkPlayerCount_2()) task->data[0] = 1; break; case 400: // wait 20 frames @@ -470,6 +473,7 @@ static void sub_80E7324(u8 taskId) StorePtrInTaskData(sReceivedRecords, (u16 *)&gTasks[subTaskId].data[5]); sRecordStructSize = sizeof(struct PlayerRecordsEmerald); } + // Note: This task is destroyed by Task_CopyReceiveBuffer when it's done. } break; case 5: // wait 60 frames @@ -938,7 +942,7 @@ static void ReceiveGiftItem(u16 *item, u8 which) } } -static void sub_80E7FF8(u8 taskId) +static void Task_DoRecordMixing(u8 taskId) { struct Task *task = &gTasks[taskId]; @@ -953,20 +957,22 @@ static void sub_80E7FF8(u8 taskId) else task->data[0] = 6; break; + + // Mixing Ruby/Sapphire records. case 2: SetContinueGameWarpStatusToDynamicWarp(); - sub_8153430(); + FullSaveGame(); task->data[0] ++; break; case 3: - if (sub_8153474()) + if (CheckSaveFile()) { ClearContinueGameWarpStatus2(); task->data[0] = 4; task->data[1] = 0; } break; - case 4: + case 4: // Wait 10 frames if (++task->data[1] > 10) { sub_800AC34(); @@ -974,22 +980,24 @@ static void sub_80E7FF8(u8 taskId) } break; case 5: - if (gReceivedRemoteLinkPlayers == 0) + if (gReceivedRemoteLinkPlayers == FALSE) DestroyTask(taskId); break; + + // Mixing Emerald/FireRed/LeafGreen records. case 6: - if (!sub_801048C(0)) + if (!sub_801048C(FALSE)) { CreateTask(sub_8153688, 5); task->data[0] ++; } break; - case 7: + case 7: // wait for sub_8153688 to finish. if (!FuncIsActiveTask(sub_8153688)) { if (gWirelessCommType) { - sub_801048C(1); + sub_801048C(TRUE); task->data[0] = 8; } else diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 57fb2c8983..8f95e6719e 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -1697,7 +1697,7 @@ void sub_801440C(u8 taskId) case 81: CleanupOverworldWindowsAndTilemaps(); gMain.savedCallback = sub_801AC54; - sub_81B8518(3); + InitChooseHalfPartyForBattle(3); break; case 1: CleanupOverworldWindowsAndTilemaps(); diff --git a/src/save.c b/src/save.c index a22e20f0b2..d07e597661 100644 --- a/src/save.c +++ b/src/save.c @@ -768,7 +768,7 @@ u8 sub_8153408(void) // trade.s save return 0; } -u8 sub_8153430(void) +u8 FullSaveGame(void) { if (gFlashMemoryPresent != TRUE) return 1; @@ -780,7 +780,7 @@ u8 sub_8153430(void) return 0; } -bool8 sub_8153474(void) +bool8 CheckSaveFile(void) { u8 retVal = FALSE; u16 val = ++gUnknown_03006208; diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c index cade00b50f..f971d84876 100755 --- a/src/script_pokemon_util_80F87D8.c +++ b/src/script_pokemon_util_80F87D8.c @@ -29,6 +29,7 @@ #include "constants/items.h" #include "constants/species.h" #include "constants/vars.h" +#include "constants/battle_frontier.h" extern const u16 gEventObjectPalette8[]; extern const u16 gEventObjectPalette17[]; @@ -40,7 +41,7 @@ static const u8 gUnknown_0858D8EC[] = { 3, 4, 5, 14 }; static void sub_80F8EE8(u8 taskId); static void sub_80F9088(u8 taskId); -static void sub_80F9460(void); +static void CB2_ReturnFromChooseHalfParty(void); static void sub_80F94B8(void); void SetContestTrainerGfxIds(void) @@ -640,22 +641,24 @@ void ScriptSetMonMoveSlot(u8 monIndex, u16 move, u8 slot) SetMonMoveSlot(&gPlayerParty[monIndex], move, slot); } -void sub_80F9438(void) +// Note: When control returns to the event script, gSpecialVar_Result be +// TRUE if the party selection was successful. +void EventScript_ChooseHalfPartyForBattle(void) { - gMain.savedCallback = sub_80F9460; - VarSet(VAR_FRONTIER_FACILITY, 9); // this isn't a valid frontier facility id (??) - sub_81B8518(0); + gMain.savedCallback = CB2_ReturnFromChooseHalfParty; + VarSet(VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_DOUBLE_COLOSSEUM); + InitChooseHalfPartyForBattle(0); } -static void sub_80F9460(void) +static void CB2_ReturnFromChooseHalfParty(void) { switch (gSelectedOrderFromParty[0]) { case 0: - gSpecialVar_Result = 0; + gSpecialVar_Result = FALSE; break; default: - gSpecialVar_Result = 1; + gSpecialVar_Result = TRUE; break; } @@ -665,7 +668,7 @@ static void sub_80F9460(void) void sub_80F9490(void) { gMain.savedCallback = sub_80F94B8; - sub_81B8518(gSpecialVar_0x8004 + 1); + InitChooseHalfPartyForBattle(gSpecialVar_0x8004 + 1); } static void sub_80F94B8(void) diff --git a/src/start_menu.c b/src/start_menu.c index 4b41933ae6..dfe3b08be4 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1265,11 +1265,11 @@ static void sub_80A0550(u8 taskId) break; case 1: SetContinueGameWarpStatusToDynamicWarp(); - sub_8153430(); + FullSaveGame(); *step = 2; break; case 2: - if (sub_8153474()) + if (CheckSaveFile()) { ClearContinueGameWarpStatus2(); *step = 3; diff --git a/src/trade.c b/src/trade.c index 2cd7cf2d93..db5e6a1a39 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1507,13 +1507,13 @@ static void sub_80773D0(void) } break; case 3: - if (GetLinkPlayerCount_2() >= sub_800AA48()) + if (GetLinkPlayerCount_2() >= GetSavedPlayerCount()) { if (IsLinkMaster()) { if (++gUnknown_0203229C->unk_A8 > 30) { - sub_800A620(); + CheckShouldAdvanceLinkState(); gMain.state++; } } @@ -4099,11 +4099,11 @@ void sub_807AE50(void) case 3: if (IsLinkMaster()) { - if (GetLinkPlayerCount_2() >= sub_800AA48()) + if (GetLinkPlayerCount_2() >= GetSavedPlayerCount()) { if (++gUnknown_020322A0->timer > 30) { - sub_800A620(); + CheckShouldAdvanceLinkState(); gMain.state++; } } From 327de0283df467efbd819e192c54e6224684cb38 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 10 Feb 2019 21:16:12 -0500 Subject: [PATCH 036/217] Adjust constants returned by FlipVerticalAndClearForced --- src/overworld.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/overworld.c b/src/overworld.c index 671d3412f3..b5b1b04a6e 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -3135,16 +3135,16 @@ static u8 FlipVerticalAndClearForced(u8 newFacing, u8 oldFacing) { case (FACING_UP - 1): case (FACING_FORCED_UP - 1): - return FACING_DOWN; + return DIR_NORTH; case (FACING_DOWN - 1): case (FACING_FORCED_DOWN - 1): - return FACING_UP; + return DIR_SOUTH; case (FACING_LEFT - 1): case (FACING_FORCED_LEFT - 1): - return FACING_LEFT; + return DIR_WEST; case (FACING_RIGHT - 1): case (FACING_FORCED_RIGHT - 1): - return FACING_RIGHT; + return DIR_EAST; } return oldFacing; } From 05ad946b83728a9fb2baa320aeb8902622a36e13 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 10 Feb 2019 22:12:43 -0500 Subject: [PATCH 037/217] Ignore trigraph warning --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1841eb6b8b..c9a7c2e059 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ ASFLAGS := -mcpu=arm7tdmi CC1 := tools/agbcc/bin/agbcc$(EXE) override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm -CPPFLAGS := -I tools/agbcc/include -I tools/agbcc -iquote include +CPPFLAGS := -I tools/agbcc/include -I tools/agbcc -iquote include -Wno-trigraphs LDFLAGS = -Map ../../$(MAP) From d979ac3bf3924051de8bb4154e8398083535eabb Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 11 Feb 2019 00:05:20 -0500 Subject: [PATCH 038/217] Document main_menu state machine, name window constants The new names for the constants (and newly named functions) give a much better understanding of what the window system is trying to do. --- asm/rom_8011DC0.s | 12 +- common_syms/window.txt | 2 +- include/menu.h | 4 +- include/window.h | 10 +- src/battle_controller_link_partner.c | 10 +- src/battle_controller_recorded_opponent.c | 6 +- src/battle_controller_safari.c | 8 +- src/battle_controller_wally.c | 8 +- src/battle_dome.c | 2 +- src/battle_factory_screen.c | 48 +++--- src/battle_pyramid_bag.c | 18 +-- src/battle_records.c | 6 +- src/battle_tower.c | 6 +- src/berry_blender.c | 4 +- src/berry_fix_program.c | 4 +- src/berry_tag_screen.c | 14 +- src/cable_club.c | 4 +- src/clear_save_data_screen.c | 4 +- src/coins.c | 4 +- src/contest.c | 14 +- src/contest_link_80F57C4.c | 2 +- src/contest_painting.c | 2 +- src/credits.c | 2 +- src/daycare.c | 4 +- src/decoration.c | 30 ++-- src/diploma.c | 2 +- src/egg_hatch.c | 4 +- src/field_message_box.c | 2 +- src/field_player_avatar.c | 10 +- src/field_region_map.c | 4 +- src/field_specials.c | 4 +- src/frontier_pass.c | 8 +- src/frontier_util.c | 20 +-- src/hall_of_fame.c | 10 +- src/item_menu.c | 28 ++-- src/item_use.c | 4 +- src/learn_move.c | 6 +- src/list_menu.c | 4 +- src/mail.c | 4 +- src/main_menu.c | 189 ++++++++++++++++++---- src/map_name_popup.c | 4 +- src/menu.c | 51 +++--- src/money.c | 2 +- src/mystery_event_menu.c | 2 +- src/naming_screen.c | 8 +- src/option_menu.c | 4 +- src/party_menu.c | 6 +- src/player_pc.c | 10 +- src/pokeblock.c | 4 +- src/pokeblock_feed.c | 2 +- src/pokedex.c | 8 +- src/pokemon_storage_system.c | 26 +-- src/pokemon_summary_screen.c | 16 +- src/record_mixing.c | 2 +- src/region_map.c | 4 +- src/rom_8011DC0.c | 12 +- src/roulette.c | 8 +- src/save_failed_screen.c | 16 +- src/scrcmd.c | 4 +- src/script_menu.c | 12 +- src/secret_base.c | 14 +- src/shop.c | 4 +- src/slot_machine.c | 14 +- src/start_menu.c | 12 +- src/starter_choose.c | 6 +- src/trade.c | 18 +-- src/trainer_card.c | 8 +- src/trainer_hill.c | 2 +- src/window.c | 8 +- 69 files changed, 480 insertions(+), 334 deletions(-) diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index af7fdbf3df..ac7f6ac1c0 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -745,7 +745,7 @@ _08017228: bl DestroyListMenuTask ldrb r0, [r5] movs r1, 0x1 - bl sub_819746C + bl ClearWindowAndBorder ldrb r0, [r5] bl RemoveWindow movs r0, 0 @@ -765,7 +765,7 @@ _08017264: bl DestroyListMenuTask ldrb r0, [r5] movs r1, 0x1 - bl sub_819746C + bl ClearWindowAndBorder ldrb r0, [r5] bl RemoveWindow strb r4, [r7] @@ -23941,7 +23941,7 @@ _08022DE8: beq _08022DFA movs r0, 0 movs r1, 0x1 - bl sub_8197434 + bl ClearWindowAndWideBorder _08022DFA: ldrb r0, [r7, 0xE] movs r1, 0x1 @@ -24245,7 +24245,7 @@ _0802301E: _08023044: movs r0, 0 movs r1, 0x1 - bl sub_8197434 + bl ClearWindowAndWideBorder movs r0, 0xA movs r1, 0x1 movs r2, 0 @@ -26578,7 +26578,7 @@ _080242A4: _080242A6: movs r0, 0 movs r1, 0x1 - bl sub_8197434 + bl ClearWindowAndWideBorder movs r4, 0 str r4, [sp] adds r0, r6, 0 @@ -26756,7 +26756,7 @@ _080243EA: _080243F6: movs r0, 0 movs r1, 0x1 - bl sub_8197434 + bl ClearWindowAndWideBorder adds r0, r5, 0 bl sub_8021488 movs r0, 0x1 diff --git a/common_syms/window.txt b/common_syms/window.txt index e1b52a24fa..87a1679d16 100644 --- a/common_syms/window.txt +++ b/common_syms/window.txt @@ -1,5 +1,5 @@ filler_03002F58 filler_03002F5C -gUnknown_03002F60 +gTransparentTileNumber filler_03002F64 gUnknown_03002F70 diff --git a/include/menu.h b/include/menu.h index aca4624687..cb017187a1 100644 --- a/include/menu.h +++ b/include/menu.h @@ -26,11 +26,11 @@ void sub_8197200(void); u16 RunTextPrintersAndIsPrinter0Active(void); void sub_81973A4(void); void NewMenuHelpers_DrawDialogueFrame(u8, u8); -void sub_819746C(u8 windowId, bool8 copyToVram); +void ClearWindowAndBorder(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 sub_8197434(u8 windowId, bool8 copyToVram); +void ClearWindowAndWideBorder(u8 windowId, bool8 copyToVram); void SetStandardWindowBorderStyle(u8 a0, u8 a1); void DisplayYesNoMenu(void); u32 GetPlayerTextSpeed(void); diff --git a/include/window.h b/include/window.h index 25573ac3e9..4138ce948d 100644 --- a/include/window.h +++ b/include/window.h @@ -1,6 +1,13 @@ #ifndef GUARD_WINDOW_H #define GUARD_WINDOW_H +// The tile ID for a transparent tile in the window tilesheet +#define TRANSPARENT_TILE_NUMBER 0 + +#define PIXEL_BUFFER_TRANSPARENT 0x00 +#define PIXEL_BUFFER_WHITE 0x11 +#define PIXEL_BUFFER_UNKNOWN 0xFF + enum { WINDOW_BG, @@ -73,6 +80,7 @@ extern u32 filler_03002F58; extern u32 filler_03002F5C; extern u32 filler_03002F64; -extern u8 gUnknown_03002F60; +// This global is set to TRANSPARENT_TILE_NUMBER and never changed. +extern u8 gTransparentTileNumber; #endif // GUARD_WINDOW_H diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 19d39609fb..4eb122d054 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -90,7 +90,7 @@ static void LinkPartnerHandleBattleAnimation(void); static void LinkPartnerHandleLinkStandbyMsg(void); static void LinkPartnerHandleResetActionMoveSelection(void); static void LinkPartnerHandleCmd55(void); -static void nullsub_113(void); +static void SpriteCB_Null3(void); static void LinkPartnerBufferRunCommand(void); static void LinkPartnerBufferExecCompleted(void); @@ -161,10 +161,10 @@ static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = LinkPartnerHandleLinkStandbyMsg, LinkPartnerHandleResetActionMoveSelection, LinkPartnerHandleCmd55, - nullsub_113 + SpriteCB_Null3 }; -static void nullsub_112(void) +static void SpriteCB_Null2(void) { } @@ -1564,7 +1564,7 @@ static void LinkPartnerHandleIntroTrainerBallThrow(void) gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gBattleSpritesDataPtr->animationData->field_9_x1 = 1; - gBattlerControllerFuncs[gActiveBattler] = nullsub_112; + gBattlerControllerFuncs[gActiveBattler] = SpriteCB_Null2; } static void sub_814DCCC(u8 taskId) @@ -1687,6 +1687,6 @@ static void LinkPartnerHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } -static void nullsub_113(void) +static void SpriteCB_Null3(void) { } diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 911eb6ce58..25e59172d4 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -93,7 +93,7 @@ static void RecordedOpponentHandleBattleAnimation(void); static void RecordedOpponentHandleLinkStandbyMsg(void); static void RecordedOpponentHandleResetActionMoveSelection(void); static void RecordedOpponentHandleCmd55(void); -static void nullsub_119(void); +static void SpriteCB_Null9(void); static void RecordedOpponentBufferRunCommand(void); static void RecordedOpponentBufferExecCompleted(void); @@ -165,7 +165,7 @@ static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void RecordedOpponentHandleLinkStandbyMsg, RecordedOpponentHandleResetActionMoveSelection, RecordedOpponentHandleCmd55, - nullsub_119 + SpriteCB_Null9 }; static void nullsub_70(void) @@ -1791,6 +1791,6 @@ static void RecordedOpponentHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } -static void nullsub_119(void) +static void SpriteCB_Null9(void) { } diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 54ba04ab4a..b7223844f1 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -84,7 +84,7 @@ static void SafariHandleBattleAnimation(void); static void SafariHandleLinkStandbyMsg(void); static void SafariHandleResetActionMoveSelection(void); static void SafariHandleCmd55(void); -static void nullsub_115(void); +static void SpriteCB_Null5(void); static void SafariBufferRunCommand(void); static void SafariBufferExecCompleted(void); @@ -148,10 +148,10 @@ static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) = SafariHandleLinkStandbyMsg, SafariHandleResetActionMoveSelection, SafariHandleCmd55, - nullsub_115 + SpriteCB_Null5 }; -static void nullsub_114(void) +static void SpriteCB_Null4(void) { } @@ -688,6 +688,6 @@ static void SafariHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_81595E4; } -static void nullsub_115(void) +static void SpriteCB_Null5(void) { } diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index d891b96b67..a196f8a44b 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -92,7 +92,7 @@ static void WallyHandleBattleAnimation(void); static void WallyHandleLinkStandbyMsg(void); static void WallyHandleResetActionMoveSelection(void); static void WallyHandleCmd55(void); -static void nullsub_118(void); +static void SpriteCB_Null8(void); static void WallyBufferRunCommand(void); static void WallyBufferExecCompleted(void); @@ -161,10 +161,10 @@ static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(void) = WallyHandleLinkStandbyMsg, WallyHandleResetActionMoveSelection, WallyHandleCmd55, - nullsub_118 + SpriteCB_Null8 }; -static void nullsub_117(void) +static void SpriteCB_Null7(void) { } @@ -1559,6 +1559,6 @@ static void WallyHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } -static void nullsub_118(void) +static void SpriteCB_Null8(void) { } diff --git a/src/battle_dome.c b/src/battle_dome.c index bfede1b28b..2ec9f8f3d4 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -3794,7 +3794,7 @@ static void sub_8190CD4(u8 taskId) for (i = windowId; i < windowId + 9; i++) { CopyWindowToVram(i, 2); - FillWindowPixelBuffer(i, 0); + FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); } gTasks[taskId].data[0] = 3; break; diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index bb9fe8e280..6d7ec3c45f 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -1786,14 +1786,14 @@ static void sub_819B958(u8 windowId) { gSprites[sFactorySelectScreen->menuCursor1SpriteId].invisible = TRUE; gSprites[sFactorySelectScreen->menuCursor2SpriteId].invisible = TRUE; - FillWindowPixelBuffer(windowId, 0); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT); CopyWindowToVram(windowId, 2); ClearWindowTilemap(windowId); } static void Select_PrintRentalPkmnString(void) { - FillWindowPixelBuffer(0, 0); + FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); AddTextPrinterParameterized(0, 1, gText_RentalPkmn2, 2, 1, 0, NULL); CopyWindowToVram(0, 3); } @@ -1804,7 +1804,7 @@ static void Select_PrintMonSpecies(void) u8 x; u8 monId = sFactorySelectScreen->cursorPos; - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); species = GetMonData(&sFactorySelectScreen->mons[monId].monData, MON_DATA_SPECIES, NULL); StringCopy(gStringVar4, gSpeciesNames[species]); x = GetStringRightAlignXOffset(1, gStringVar4, 86); @@ -1816,7 +1816,7 @@ static void Select_PrintSelectMonString(void) { const u8 *str = NULL; - FillWindowPixelBuffer(2, 0); + FillWindowPixelBuffer(2, PIXEL_BUFFER_TRANSPARENT); if (sFactorySelectScreen->selectingMonsState == 1) str = gText_SelectFirstPkmn; else if (sFactorySelectScreen->selectingMonsState == 2) @@ -1832,7 +1832,7 @@ static void Select_PrintSelectMonString(void) static void Select_PrintCantSelectSameMon(void) { - FillWindowPixelBuffer(2, 0); + FillWindowPixelBuffer(2, PIXEL_BUFFER_TRANSPARENT); AddTextPrinterParameterized(2, 1, gText_CantSelectSamePkmn, 2, 5, 0, NULL); CopyWindowToVram(2, 2); } @@ -1842,7 +1842,7 @@ static void Select_PrintMenuOptions(void) u8 selectedId = sFactorySelectScreen->mons[sFactorySelectScreen->cursorPos].selectedId; PutWindowTilemap(3); - FillWindowPixelBuffer(3, 0); + FillWindowPixelBuffer(3, PIXEL_BUFFER_TRANSPARENT); AddTextPrinterParameterized3(3, 1, 7, 1, gUnknown_08610476, 0, gText_Summary); if (selectedId != 0) AddTextPrinterParameterized3(3, 1, 7, 17, gUnknown_08610476, 0, gText_Deselect); @@ -1856,7 +1856,7 @@ static void Select_PrintMenuOptions(void) static void Select_PrintYesNoOptions(void) { PutWindowTilemap(4); - FillWindowPixelBuffer(4, 0); + FillWindowPixelBuffer(4, PIXEL_BUFFER_TRANSPARENT); AddTextPrinterParameterized3(4, 1, 7, 1, gUnknown_08610476, 0, gText_Yes2); AddTextPrinterParameterized3(4, 1, 7, 17, gUnknown_08610476, 0, gText_No2); CopyWindowToVram(4, 3); @@ -1924,7 +1924,7 @@ static void Select_PrintMonCategory(void) if (monId < SELECTABLE_MONS_COUNT) { PutWindowTilemap(5); - FillWindowPixelBuffer(5, 0); + FillWindowPixelBuffer(5, PIXEL_BUFFER_TRANSPARENT); species = GetMonData(&sFactorySelectScreen->mons[monId].monData, MON_DATA_SPECIES, NULL); CopyMonCategoryText(SpeciesToNationalPokedexNum(species), text); x = GetStringRightAlignXOffset(1, text, 0x76); @@ -2873,7 +2873,7 @@ static void sub_819D588(u8 taskId) case 3: if (!gPaletteFade.active) { - FillWindowPixelBuffer(5, 0); + FillWindowPixelBuffer(5, PIXEL_BUFFER_TRANSPARENT); CopyWindowToVram(5, 2); if (sFactorySwapScreen->inEnemyScreen == TRUE) { @@ -3002,7 +3002,7 @@ static void sub_819D770(u8 taskId) gTasks[taskId].data[0]++; break; case 6: - FillWindowPixelBuffer(5, 0); + FillWindowPixelBuffer(5, PIXEL_BUFFER_TRANSPARENT); CopyWindowToVram(5, 2); gTasks[taskId].data[0]++; break; @@ -3546,7 +3546,7 @@ static void sub_819EA64(u8 windowId) { gSprites[sFactorySwapScreen->menuCursor1SpriteId].invisible = TRUE; gSprites[sFactorySwapScreen->menuCursor2SpriteId].invisible = TRUE; - FillWindowPixelBuffer(windowId, 0); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT); CopyWindowToVram(windowId, 2); ClearWindowTilemap(windowId); } @@ -3554,14 +3554,14 @@ static void sub_819EA64(u8 windowId) static void sub_819EAC0(void) { PutWindowTilemap(1); - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); CopyWindowToVram(1, 2); } static void sub_819EADC(void) { PutWindowTilemap(7); - FillWindowPixelBuffer(7, 0); + FillWindowPixelBuffer(7, PIXEL_BUFFER_TRANSPARENT); CopyWindowToVram(7, 2); } @@ -3569,13 +3569,13 @@ static void sub_819EAF8(void) { sub_819EAC0(); PutWindowTilemap(5); - FillWindowPixelBuffer(5, 0); + FillWindowPixelBuffer(5, PIXEL_BUFFER_TRANSPARENT); CopyWindowToVram(5, 2); } static void Swap_PrintPkmnSwap(void) { - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized(0, 1, gText_PkmnSwap, 2, 1, 0, NULL); CopyWindowToVram(0, 3); } @@ -3585,7 +3585,7 @@ static void Swap_PrintMonSpecies(void) u16 species; u8 x; - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); if (sFactorySwapScreen->cursorPos > 2) { CopyWindowToVram(1, 2); @@ -3606,7 +3606,7 @@ static void Swap_PrintMonSpecies(void) static void Swap_PrintOnInfoWindow(const u8 *str) { - FillWindowPixelBuffer(2, 0); + FillWindowPixelBuffer(2, PIXEL_BUFFER_TRANSPARENT); AddTextPrinterParameterized(2, 1, str, 2, 5, 0, NULL); CopyWindowToVram(2, 2); } @@ -3614,7 +3614,7 @@ static void Swap_PrintOnInfoWindow(const u8 *str) static void Swap_PrintMenuOptions(void) { PutWindowTilemap(3); - FillWindowPixelBuffer(3, 0); + FillWindowPixelBuffer(3, PIXEL_BUFFER_TRANSPARENT); AddTextPrinterParameterized3(3, 1, 15, 1, gUnknown_08610922, 0, gText_Summary2); AddTextPrinterParameterized3(3, 1, 15, 17, gUnknown_08610922, 0, gText_Swap); AddTextPrinterParameterized3(3, 1, 15, 33, gUnknown_08610922, 0, gText_Rechoose); @@ -3624,7 +3624,7 @@ static void Swap_PrintMenuOptions(void) static void Swap_PrintYesNoOptions(void) { PutWindowTilemap(4); - FillWindowPixelBuffer(4, 0); + FillWindowPixelBuffer(4, PIXEL_BUFFER_TRANSPARENT); AddTextPrinterParameterized3(4, 1, 7, 1, gUnknown_08610922, 0, gText_Yes3); AddTextPrinterParameterized3(4, 1, 7, 17, gUnknown_08610922, 0, gText_No3); CopyWindowToVram(4, 3); @@ -3638,7 +3638,7 @@ static void Swap_PrintActionString(const u8 *str, u32 y, u32 windowId) static void Swap_PrintActionStrings(void) { - FillWindowPixelBuffer(5, 0); + FillWindowPixelBuffer(5, PIXEL_BUFFER_TRANSPARENT); switch (sFactorySwapScreen->inEnemyScreen) { case TRUE: @@ -3652,7 +3652,7 @@ static void Swap_PrintActionStrings(void) static void Swap_PrintActionStrings2(void) { - FillWindowPixelBuffer(3, 0); + FillWindowPixelBuffer(3, PIXEL_BUFFER_TRANSPARENT); switch (sFactorySwapScreen->inEnemyScreen) { case TRUE: @@ -3693,7 +3693,7 @@ static void Swap_PrintMonSpecies2(void) LoadPalette(pal, 0xF0, 0xA); PutWindowTilemap(7); - FillWindowPixelBuffer(7, 0); + FillWindowPixelBuffer(7, PIXEL_BUFFER_TRANSPARENT); if (sFactorySwapScreen->cursorPos > 2) { CopyWindowToVram(7, 3); @@ -3745,7 +3745,7 @@ static void Swap_PrintMonCategory(void) u8 x; u8 monId = sFactorySwapScreen->cursorPos; - FillWindowPixelBuffer(8, 0); + FillWindowPixelBuffer(8, PIXEL_BUFFER_TRANSPARENT); if (monId > 2) { CopyWindowToVram(8, 2); @@ -3940,7 +3940,7 @@ static void Task_SwapCantHaveSameMons(u8 taskId) case 2: if (sFactorySwapScreen->unk30 != TRUE) { - FillWindowPixelBuffer(5, 0); + FillWindowPixelBuffer(5, PIXEL_BUFFER_TRANSPARENT); CopyWindowToVram(5, 2); gTasks[taskId].data[0]++; } diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index 1f0672dcb1..3601c5ad2b 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -651,7 +651,7 @@ static void PrintItemDescription(s32 listMenuId) StringExpandPlaceholders(gStringVar4, gText_ReturnToVar1); desc = gStringVar4; } - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); PrintOnWindow_Font1(1, desc, 3, 0, 0, 1, 0, 0); } @@ -911,7 +911,7 @@ static void sub_81C5D20(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected); - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0); if (gPyramidBagResources->menuActionsCount == 1) sub_81C5EAC(sub_81C6D24(0)); @@ -1048,7 +1048,7 @@ static void BagAction_UseOnField(u8 taskId) else if (ItemId_GetFieldFunc(gSpecialVar_ItemId) != NULL) { sub_81C61A8(); - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); schedule_bg_copy_tilemap_to_vram(0); ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId); } @@ -1086,7 +1086,7 @@ static void BagAction_Toss(u8 taskId) { CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_TossHowManyVar1s); - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0); sub_81C6404(); gTasks[taskId].func = sub_81C64B4; @@ -1100,7 +1100,7 @@ static void sub_81C6350(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 2); StringExpandPlaceholders(gStringVar4, gText_ConfirmTossItems); - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0); sub_81C6DAC(taskId, &sYesNoTossFuncions); } @@ -1168,7 +1168,7 @@ static void TossItem(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 2); StringExpandPlaceholders(gStringVar4, gText_ThrewAwayVar2Var1s); - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0); gTasks[taskId].func = sub_81C65CC; } @@ -1265,7 +1265,7 @@ static void Task_BeginItemSwap(u8 taskId) ListMenuSetUnkIndicatorsStructField(data[0], 0x10, 1); CopyItemName(gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.lvlMode][data[1]], gStringVar1); StringExpandPlaceholders(gStringVar4, gText_MoveVar1Where); - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0); sub_81C5A98(data[0], 1); sub_81C704C(data[1]); @@ -1395,7 +1395,7 @@ static void sub_81C6BD8(void) LoadPalette(gUnknown_0860F074, 0xF0, 0x20); for (i = 0; i < 5; i++) - FillWindowPixelBuffer(i, 0); + FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); PutWindowTilemap(0); PutWindowTilemap(1); @@ -1456,7 +1456,7 @@ static void sub_81C6DAC(u8 taskId, const struct YesNoFuncTable *yesNoTable) void DisplayItemMessageInBattlePyramid(u8 taskId, const u8 *str, void (*callback)(u8 taskId)) { - FillWindowPixelBuffer(2, 0x11); + FillWindowPixelBuffer(2, PIXEL_BUFFER_WHITE); DisplayMessageAndContinueTask(taskId, 2, 0xA, 0xD, 1, GetPlayerTextSpeedDelay(), str, callback); schedule_bg_copy_tilemap_to_vram(1); } diff --git a/src/battle_records.c b/src/battle_records.c index f9c40d8de6..2ec0ee91e5 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -321,7 +321,7 @@ void ShowLinkBattleRecords(void) gRecordsWindowId = AddWindow(&sLinkBattleRecordsWindow); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, 0x11); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); StringExpandPlaceholders(gStringVar4, gText_PlayersBattleResults); x = GetStringCenterAlignXOffset(1, gStringVar4, 208); @@ -342,7 +342,7 @@ void ShowLinkBattleRecords(void) void RemoveRecordsWindow(void) { - sub_819746C(gRecordsWindowId, FALSE); + ClearWindowAndBorder(gRecordsWindowId, FALSE); RemoveWindow(gRecordsWindowId); } @@ -383,7 +383,7 @@ static void Task_ExitTrainerHillRecords(u8 taskId) static void RemoveTrainerHillRecordsWindow(u8 windowId) { - FillWindowPixelBuffer(windowId, 0); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT); ClearWindowTilemap(windowId); CopyWindowToVram(windowId, 2); RemoveWindow(windowId); diff --git a/src/battle_tower.c b/src/battle_tower.c index fbb77789e0..35c72f6132 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -51,7 +51,7 @@ static void AwardBattleTowerRibbons(void); static void SaveBattleTowerProgress(void); static void sub_8163914(void); static void nullsub_61(void); -static void nullsub_116(void); +static void SpriteCB_Null6(void); static void sub_81642A0(void); static void sub_8164828(void); static void sub_8164B74(void); @@ -1061,7 +1061,7 @@ static void (* const gUnknown_085DF96C[])(void) = SaveBattleTowerProgress, sub_8163914, nullsub_61, - nullsub_116, + SpriteCB_Null6, sub_81642A0, sub_8164828, sub_8164B74, @@ -2437,7 +2437,7 @@ static void nullsub_61(void) } -static void nullsub_116(void) +static void SpriteCB_Null6(void) { } diff --git a/src/berry_blender.c b/src/berry_blender.c index f2e3c7d14a..3075cc9352 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -945,7 +945,7 @@ static void InitBerryBlenderWindows(void) DeactivateAllTextPrinters(); for (i = 0; i < 5; i++) - FillWindowPixelBuffer(i, 0); + FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14); sub_81978B0(0xE0); @@ -3538,7 +3538,7 @@ void ShowBerryBlenderRecordWindow(void) winTemplate = sBlenderRecordWindowTemplate; gRecordsWindowId = AddWindow(&winTemplate); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, 0); - FillWindowPixelBuffer(gRecordsWindowId, 0x11); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); xPos = GetStringCenterAlignXOffset(1, gText_BlenderMaxSpeedRecord, 0x90); AddTextPrinterParameterized(gRecordsWindowId, 1, gText_BlenderMaxSpeedRecord, xPos, 1, 0, NULL); diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index 3631c083ad..7e72a9f3ba 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -226,8 +226,8 @@ static void berry_fix_gpu_set(void) DmaCopy32(3, sUnknown_08618138, BG_PLTT + 0x1E0, 0x20); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP); - FillWindowPixelBuffer(2, 0); - FillWindowPixelBuffer(3, 0); + FillWindowPixelBuffer(2, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(3, PIXEL_BUFFER_TRANSPARENT); FillWindowPixelBuffer(0, 0xAA); width = GetStringWidth(0, sUnknown_08617E9B, 0); diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 6e968fc0ab..6c08611add 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -381,7 +381,7 @@ static void PrintTextInBerryTagScreen(u8 windowId, const u8 *text, u8 x, u8 y, s static void AddBerryTagTextToBg0(void) { memcpy(GetBgTilemapBuffer(0), sBerryTag->tilemapBuffers[2], sizeof(sBerryTag->tilemapBuffers[2])); - FillWindowPixelBuffer(WIN_BERRY_TAG, 0xFF); + FillWindowPixelBuffer(WIN_BERRY_TAG, PIXEL_BUFFER_UNKNOWN); PrintTextInBerryTagScreen(WIN_BERRY_TAG, gText_BerryTag, GetStringCenterAlignXOffset(1, gText_BerryTag, 0x40), 1, 0, 1); PutWindowTilemap(WIN_BERRY_TAG); schedule_bg_copy_tilemap_to_vram(0); @@ -598,7 +598,7 @@ static void Task_DisplayAnotherBerry(u8 taskId) switch (data[0]) { case 0x30: - FillWindowPixelBuffer(0, 0); + FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); break; case 0x40: PrintBerryNumberAndName(); @@ -608,7 +608,7 @@ static void Task_DisplayAnotherBerry(u8 taskId) CreateBerrySprite(); break; case 0x60: - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); break; case 0x70: PrintBerrySize(); @@ -620,7 +620,7 @@ static void Task_DisplayAnotherBerry(u8 taskId) SetFlavorCirclesVisiblity(); break; case 0xA0: - FillWindowPixelBuffer(2, 0); + FillWindowPixelBuffer(2, PIXEL_BUFFER_TRANSPARENT); break; case 0xB0: PrintBerryDescription1(); @@ -635,7 +635,7 @@ static void Task_DisplayAnotherBerry(u8 taskId) switch (data[0]) { case 0x30: - FillWindowPixelBuffer(2, 0); + FillWindowPixelBuffer(2, PIXEL_BUFFER_TRANSPARENT); break; case 0x40: PrintBerryDescription2(); @@ -647,7 +647,7 @@ static void Task_DisplayAnotherBerry(u8 taskId) SetFlavorCirclesVisiblity(); break; case 0x70: - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); break; case 0x80: PrintBerryFirmness(); @@ -660,7 +660,7 @@ static void Task_DisplayAnotherBerry(u8 taskId) CreateBerrySprite(); break; case 0xB0: - FillWindowPixelBuffer(0, 0); + FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); break; case 0xC0: PrintBerryNumberAndName(); diff --git a/src/cable_club.c b/src/cable_club.c index 303b0d016c..f8137fd8fa 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -92,7 +92,9 @@ static void sub_80B23B0(u16 windowId, u32 value) static void sub_80B241C(u16 windowId) { - sub_819746C(windowId, FALSE); + // Following this call with a copy-to-vram with mode 3 is identical to + // calling ClearWindowAndBorder(windowId, TRUE). + ClearWindowAndBorder(windowId, FALSE); CopyWindowToVram(windowId, 3); } diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c index 72d0daf559..6a89a05337 100644 --- a/src/clear_save_data_screen.c +++ b/src/clear_save_data_screen.c @@ -90,7 +90,7 @@ static void Task_ClearSaveDataScreenYesNoChoice(u8 taskId) switch (Menu_ProcessInputNoWrapClearOnChoose()) { case 0: - FillWindowPixelBuffer(0, 17); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized(0, 1, gText_ClearingData, 0, 1, 0, 0); gTasks[taskId].func = Task_ClearSaveData; break; @@ -203,7 +203,7 @@ static void InitClearSaveDataScreenWindows(void) { InitWindows(sClearSaveTextWindow); DeactivateAllTextPrinters(); - FillWindowPixelBuffer(0, 0); + FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); LoadWindowGfx(0, 0, 2, 224); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); } diff --git a/src/coins.c b/src/coins.c index 967eb92aca..6ad80f80c7 100644 --- a/src/coins.c +++ b/src/coins.c @@ -27,7 +27,7 @@ void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y) struct WindowTemplate template; SetWindowTemplateFields(&template, 0, x, y, 8, 2, 0xF, 0x141); sCoinsWindowId = AddWindow(&template); - FillWindowPixelBuffer(sCoinsWindowId, 0); + FillWindowPixelBuffer(sCoinsWindowId, PIXEL_BUFFER_TRANSPARENT); PutWindowTilemap(sCoinsWindowId); SetWindowBorderStyle(sCoinsWindowId, FALSE, 0x214, 0xE); PrintCoinsString(coinAmount); @@ -35,7 +35,7 @@ void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y) void HideCoinsWindow(void) { - sub_819746C(sCoinsWindowId, TRUE); + ClearWindowAndBorder(sCoinsWindowId, TRUE); RemoveWindow(sCoinsWindowId); } diff --git a/src/contest.c b/src/contest.c index cf084e35e4..1799612984 100644 --- a/src/contest.c +++ b/src/contest.c @@ -819,7 +819,7 @@ static void sub_80D8490(u8 taskId) } r5 = StringCopy(r5, gMoveNames[move]); - FillWindowPixelBuffer(i + 5, 0); + FillWindowPixelBuffer(i + 5, PIXEL_BUFFER_TRANSPARENT); Contest_PrintTextToBg0WindowAt(i + 5, sp8, 5, 1, 7); } @@ -941,7 +941,7 @@ static void sub_80D895C(u8 taskId) for (i = 0; i < 4; i++) { - FillWindowPixelBuffer(5 + i, 0); + FillWindowPixelBuffer(5 + i, PIXEL_BUFFER_TRANSPARENT); PutWindowTilemap(5 + i); CopyWindowToVram(5 + i, 2); } @@ -2258,7 +2258,7 @@ static void sub_80DAEA4(void) for (i = 0; i < 4; i++) { - FillWindowPixelBuffer(gUnknown_02039F26[i], 0); + FillWindowPixelBuffer(gUnknown_02039F26[i], PIXEL_BUFFER_TRANSPARENT); sub_80DAF04(i); sub_80DAF88(i); } @@ -2478,7 +2478,7 @@ static void prints_contest_move_description(u16 a) ContestBG_FillBoxWithTile(0, 0x5036, 0x15, 0x20, 0x08, 0x01, 0x11); ContestBG_FillBoxWithTile(0, 0x5014, 0x15, 0x20, numHearts, 0x01, 0x11); - FillWindowPixelBuffer(10, 0); + FillWindowPixelBuffer(10, PIXEL_BUFFER_TRANSPARENT); Contest_PrintTextToBg0WindowStd(10, gContestEffectDescriptionPointers[gContestMoves[a].effect]); Contest_PrintTextToBg0WindowStd(9, gText_Slash); } @@ -2621,7 +2621,7 @@ static void sub_80DB884(void) static void sub_80DB89C(void) { - FillWindowPixelBuffer(4, 0); + FillWindowPixelBuffer(4, PIXEL_BUFFER_TRANSPARENT); CopyWindowToVram(4, 2); Contest_SetBgCopyFlags(0); } @@ -3456,7 +3456,7 @@ static void sub_80DCD48(void) break; default: for (i = 0; i < 4; i++) - FillWindowPixelBuffer(i, 0); + FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); for (i = 0; i < 4; i++) { value = sContestantStatus[i].unk4; @@ -5038,7 +5038,7 @@ static void sub_80DF750(void) return; for (i = 0; i < 4; i++) - FillWindowPixelBuffer(i, 0); + FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); if (gHeap[0x1A000] == 2) { diff --git a/src/contest_link_80F57C4.c b/src/contest_link_80F57C4.c index 381fb34fab..50d844b93b 100644 --- a/src/contest_link_80F57C4.c +++ b/src/contest_link_80F57C4.c @@ -904,7 +904,7 @@ static void sub_80F6AE8(void) // windowTemplate.width = 30; // windowTemplate.height = 2; // windowId = AddWindow(&windowTemplate); -// FillWindowPixelBuffer(windowId, 0x11); +// FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); // origWidth = GetStringWidth(1, text, 0) + 9; // strWidth = origWidth; // if (strWidth < 0) diff --git a/src/contest_painting.c b/src/contest_painting.c index 71a110aa84..429d553aa6 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -279,7 +279,7 @@ static void InitContestPaintingWindow(void) SetBgTilemapBuffer(1, AllocZeroed(BG_SCREEN_SIZE)); gContestPaintingWindowId = AddWindow(&gUnknown_085B07EC); DeactivateAllTextPrinters(); - FillWindowPixelBuffer(gContestPaintingWindowId, 0); + FillWindowPixelBuffer(gContestPaintingWindowId, PIXEL_BUFFER_TRANSPARENT); PutWindowTilemap(gContestPaintingWindowId); CopyWindowToVram(gContestPaintingWindowId, 3); ShowBg(1); diff --git a/src/credits.c b/src/credits.c index 3639d36e4c..747d63f094 100644 --- a/src/credits.c +++ b/src/credits.c @@ -1592,7 +1592,7 @@ static void sub_8175DA0(u8 taskIdB) case 5: if (!gPaletteFade.active) { - FillWindowPixelBuffer(0, 0); + FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); CopyWindowToVram(0, 2); gTasks[taskIdB].data[TDB_0] = 2; } diff --git a/src/daycare.c b/src/daycare.c index b75fab2924..14120f20bf 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1259,7 +1259,7 @@ static void Task_HandleDaycareLevelMenuInput(u8 taskId) break; } DestroyListMenuTask(gTasks[taskId].tMenuListTaskId, NULL, NULL); - sub_819746C(gTasks[taskId].tWindowId, TRUE); + ClearWindowAndBorder(gTasks[taskId].tWindowId, TRUE); RemoveWindow(gTasks[taskId].tWindowId); DestroyTask(taskId); EnableBothScriptContexts(); @@ -1268,7 +1268,7 @@ static void Task_HandleDaycareLevelMenuInput(u8 taskId) { gSpecialVar_Result = 2; DestroyListMenuTask(gTasks[taskId].tMenuListTaskId, NULL, NULL); - sub_819746C(gTasks[taskId].tWindowId, TRUE); + ClearWindowAndBorder(gTasks[taskId].tWindowId, TRUE); RemoveWindow(gTasks[taskId].tWindowId); DestroyTask(taskId); EnableBothScriptContexts(); diff --git a/src/decoration.c b/src/decoration.c index 2ac49b98c1..afbb4ad409 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -543,7 +543,7 @@ void sub_8126B80(u8 taskId) void sub_8126C08(void) { - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized2(0, 1, sSecretBasePCMenuItemDescriptions[sSecretBasePCMenuCursorPos], 0, 0, 2, 1, 3); } @@ -572,7 +572,7 @@ void SecretBasePC_PutAway(u8 taskId) else { sub_8126A58(0); - sub_8197434(0, 0); + ClearWindowAndWideBorder(0, 0); FadeScreen(1, 0); gTasks[taskId].data[2] = 0; gTasks[taskId].func = sub_8129ABC; @@ -617,7 +617,7 @@ void sub_8126DA4(u8 taskId) void SecretBasePC_PrepMenuForSelectingStoredDecors(u8 taskId) { LoadPalette(gUnknown_085A6BB0, 0xd0, 0x20); - sub_8197434(0, 0); + ClearWindowAndWideBorder(0, 0); sub_8126A58(0); sub_8126DFC(taskId); } @@ -634,7 +634,7 @@ void sub_8126DFC(u8 taskId) void sub_8126E44(u8 taskId) { - FillWindowPixelBuffer(sDecorMenuWindowIndices[1], 0x11); + FillWindowPixelBuffer(sDecorMenuWindowIndices[1], PIXEL_BUFFER_WHITE); sub_8126E8C(taskId); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(sDecorMenuWindowIndices[1], 9, sCurDecorationCategory); gTasks[taskId].func = sub_8127088; @@ -751,7 +751,7 @@ void sub_81270E8(u8 taskId) void sub_8127180(u8 taskId) { - sub_8197434(0, 0); + ClearWindowAndWideBorder(0, 0); sub_8126DFC(taskId); } @@ -779,7 +779,7 @@ void sub_81271CC(u8 taskId) void sub_8127208(u8 taskId) { LoadPalette(gUnknown_085A6BB0, 0xd0, 0x20); - sub_8197434(0, 0); + ClearWindowAndWideBorder(0, 0); gTasks[taskId].data[11] = 2; sCurDecorationCategory = DECORCAT_DESK; sub_8126DFC(taskId); @@ -968,7 +968,7 @@ void sub_8127744(u32 a0) const u8 *txt; winidx = sDecorMenuWindowIndices[3]; - FillWindowPixelBuffer(winidx, 0x11); + FillWindowPixelBuffer(winidx, PIXEL_BUFFER_WHITE); if (a0 >= sCurDecorCatCount) { txt = gText_GoBackPrevMenu; @@ -1095,7 +1095,7 @@ void sub_8127A14(u8 taskId) void sub_8127A30(u8 taskId) { - sub_8197434(0, 0); + ClearWindowAndWideBorder(0, 0); gTasks[taskId].func = sub_8127A14; } @@ -1103,7 +1103,7 @@ void sub_8127A5C(u8 taskId) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - sub_8197434(0, 0); + ClearWindowAndWideBorder(0, 0); sub_81269D4(1); sub_8127620(taskId); } @@ -1634,7 +1634,7 @@ void sub_81289D0(u8 taskId) void sub_81289F0(u8 taskId) { - sub_8197434(0, 0); + ClearWindowAndWideBorder(0, 0); sub_8128AAC(taskId); if (gDecorations[gCurDecorInventoryItems[gCurDecorationIndex]].permission != DECORPERM_SOLID_MAT) { @@ -1699,7 +1699,7 @@ void sub_8128B80(u8 taskId) void sub_8128BA0(u8 taskId) { - sub_8197434(0, 0); + ClearWindowAndWideBorder(0, 0); sub_8128BBC(taskId); } @@ -1887,7 +1887,7 @@ void sub_8128E18(u8 taskId) void sub_8128FD8(u8 taskId) { - sub_8197434(0, 1); + ClearWindowAndWideBorder(0, 1); gSprites[sDecor_CameraSpriteObjectIdx1].data[7] = 0; gTasks[taskId].data[10] = 0; gTasks[taskId].func = sub_8128E18; @@ -2251,7 +2251,7 @@ void sub_81298EC(u8 taskId) if (!gPaletteFade.active) { DrawWholeMapView(); ScriptContext1_SetupScript(EventScript_275D2E); - sub_8197434(0, 1); + ClearWindowAndWideBorder(0, 1); gTasks[taskId].data[2] = 2; } break; @@ -2343,7 +2343,7 @@ void sub_8129ABC(u8 taskId) void sub_8129B34(u8 taskId) { - sub_8197434(0, 1); + ClearWindowAndWideBorder(0, 1); gSprites[sDecor_CameraSpriteObjectIdx1].data[7] = 0; gSprites[sDecor_CameraSpriteObjectIdx1].invisible = FALSE; gSprites[sDecor_CameraSpriteObjectIdx1].callback = sub_812A36C; @@ -2607,7 +2607,7 @@ void sub_812A1F0(u8 taskId) void sub_812A210(u8 taskId) { - sub_8197434(0, 0); + ClearWindowAndWideBorder(0, 0); sub_812A22C(taskId); } diff --git a/src/diploma.c b/src/diploma.c index b3d5a48fa0..9194af7106 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -197,7 +197,7 @@ static void InitDiplomaWindow(void) InitWindows(sDiplomaWinTemplates); DeactivateAllTextPrinters(); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); - FillWindowPixelBuffer(0, 0); + FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); PutWindowTilemap(0); } diff --git a/src/egg_hatch.c b/src/egg_hatch.c index e1d94889a8..f52f66a2aa 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -606,7 +606,7 @@ static void CB2_EggHatch_1(void) case 1: if (!gPaletteFade.active) { - FillWindowPixelBuffer(sEggHatchData->windowId, 0); + FillWindowPixelBuffer(sEggHatchData->windowId, PIXEL_BUFFER_TRANSPARENT); sEggHatchData->CB2_PalCounter = 0; sEggHatchData->CB2_state++; } @@ -857,7 +857,7 @@ static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8 static void EggHatchPrintMessage(u8 windowId, u8* string, u8 x, u8 y, u8 speed) { - FillWindowPixelBuffer(windowId, 0xFF); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_UNKNOWN); sEggHatchData->textColor[0] = 0; sEggHatchData->textColor[1] = 5; sEggHatchData->textColor[2] = 6; diff --git a/src/field_message_box.c b/src/field_message_box.c index 299aafaf26..111807240b 100755 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -127,7 +127,7 @@ static void textbox_auto_and_task_add(void) void HideFieldMessageBox(void) { task_del_textbox(); - sub_8197434(0, 1); + ClearWindowAndWideBorder(0, 1); sFieldMessageBoxMode = 0; } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index b1291f0ce1..dff010d13c 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1918,7 +1918,7 @@ static bool8 Fishing9(struct Task *task) static bool8 Fishing10(struct Task *task) { AlignFishingAnimationFrames(); - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized2(0, 1, gText_PokemonOnHook, 1, 0, 2, 1, 3); task->tStep++; task->tFrameCounter = 0; @@ -1944,7 +1944,7 @@ static bool8 Fishing11(struct Task *task) sub_8155604(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 0, 0); gSprites[gPlayerAvatar.spriteId].pos2.x = 0; gSprites[gPlayerAvatar.spriteId].pos2.y = 0; - sub_8197434(0, TRUE); + ClearWindowAndWideBorder(0, TRUE); task->tFrameCounter++; return FALSE; } @@ -1966,7 +1966,7 @@ static bool8 Fishing12(struct Task *task) { AlignFishingAnimationFrames(); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection())); - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized2(0, 1, gText_NotEvenANibble, 1, 0, 2, 1, 3); task->tStep = FISHING_SHOW_RESULT; return TRUE; @@ -1977,7 +1977,7 @@ static bool8 Fishing13(struct Task *task) { AlignFishingAnimationFrames(); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection())); - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized2(0, 1, gText_ItGotAway, 1, 0, 2, 1, 3); task->tStep++; return TRUE; @@ -2017,7 +2017,7 @@ static bool8 Fishing16(struct Task *task) gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); UnfreezeEventObjects(); - sub_8197434(0, TRUE); + ClearWindowAndWideBorder(0, TRUE); sub_80ED950(0); DestroyTask(FindTaskIdByFunc(Task_Fishing)); } diff --git a/src/field_region_map.c b/src/field_region_map.c index d49ce3a4e4..6814b26bd3 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -196,13 +196,13 @@ static void PrintRegionMapSecName(void) { if (sFieldRegionMapHandler->regionMap.iconDrawType != MAPSECTYPE_NONE) { - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized(0, 1, sFieldRegionMapHandler->regionMap.mapSecName, 0, 1, 0, NULL); schedule_bg_copy_tilemap_to_vram(0); } else { - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); CopyWindowToVram(0, 3); } } diff --git a/src/field_specials.c b/src/field_specials.c index 3c26085dde..9390eab87b 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -2645,7 +2645,7 @@ static void sub_813A570(u8 taskId) DestroyListMenuTask(task->data[14], NULL, NULL); Free(gUnknown_0203AB64); sub_8198070(task->data[13], 1); - FillWindowPixelBuffer(task->data[13], 0); + FillWindowPixelBuffer(task->data[13], PIXEL_BUFFER_TRANSPARENT); CopyWindowToVram(task->data[13], 2); RemoveWindow(task->data[13]); DestroyTask(taskId); @@ -3226,7 +3226,7 @@ void sub_813AF48(void) DestroyListMenuTask(task->data[14], NULL, NULL); Free(gUnknown_0203AB64); sub_8198070(task->data[13], TRUE); - FillWindowPixelBuffer(task->data[13], 0); + FillWindowPixelBuffer(task->data[13], PIXEL_BUFFER_TRANSPARENT); ClearWindowTilemap(task->data[13]); CopyWindowToVram(task->data[13], 2); RemoveWindow(task->data[13]); diff --git a/src/frontier_pass.c b/src/frontier_pass.c index 0db546c4d7..39442dcfd0 100644 --- a/src/frontier_pass.c +++ b/src/frontier_pass.c @@ -1090,7 +1090,7 @@ static void ShowAndPrintWindows(void) for (i = 0; i < WINDOW_COUNT; i++) { PutWindowTilemap(i); - FillWindowPixelBuffer(i, 0); + FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); } x = GetStringCenterAlignXOffset(1, gText_SymbolsEarned, 96); @@ -1116,7 +1116,7 @@ static void ShowAndPrintWindows(void) static void PrintAreaDescription(u8 cursorArea) { - FillWindowPixelBuffer(WINDOW_DESCRIPTION, 0); + FillWindowPixelBuffer(WINDOW_DESCRIPTION, PIXEL_BUFFER_TRANSPARENT); if (cursorArea == CURSOR_AREA_RECORD && !sPassData->hasBattleRecord) AddTextPrinterParameterized3(WINDOW_DESCRIPTION, 1, 2, 0, sTextColors[1], 0, sPassAreaDescriptions[0]); else if (cursorArea != CURSOR_AREA_NOTHING) @@ -1656,7 +1656,7 @@ static void PrintOnFrontierMap(void) for (i = 0; i < MAP_WINDOW_COUNT; i++) { PutWindowTilemap(i); - FillWindowPixelBuffer(i, 0); + FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); } for (i = 0; i < NUM_FRONTIER_FACILITIES; i++) @@ -1698,7 +1698,7 @@ static void HandleFrontierMapCursorMove(u8 direction) StartSpriteAnim(sMapData->mapIndicatorSprite, sMapLandmarks[sMapData->cursorPos].animNum); sMapData->mapIndicatorSprite->pos1.x = sMapLandmarks[sMapData->cursorPos].x; sMapData->mapIndicatorSprite->pos1.y = sMapLandmarks[sMapData->cursorPos].y; - FillWindowPixelBuffer(MAP_WINDOW_DESCRIPTION, 0); + FillWindowPixelBuffer(MAP_WINDOW_DESCRIPTION, PIXEL_BUFFER_TRANSPARENT); AddTextPrinterParameterized3(MAP_WINDOW_DESCRIPTION, 1, 4, 0, sTextColors[0], 0, sMapLandmarks[sMapData->cursorPos].description); for (i = 0; i < 3; i++) diff --git a/src/frontier_util.c b/src/frontier_util.c index e6954c3560..071eece0ca 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -1045,7 +1045,7 @@ static void ShowTowerResultsWindow(u8 battleMode) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, 0x11); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); if (battleMode == FRONTIER_MODE_SINGLES) StringExpandPlaceholders(gStringVar4, gText_SingleBattleRoomResults); else if (battleMode == FRONTIER_MODE_DOUBLES) @@ -1116,7 +1116,7 @@ static void ShowDomeResultsWindow(u8 battleMode) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, 0x11); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); if (battleMode == FRONTIER_MODE_SINGLES) StringExpandPlaceholders(gStringVar4, gText_SingleBattleTourneyResults); else @@ -1192,7 +1192,7 @@ static void ShowPalaceResultsWindow(u8 battleMode) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, 0x11); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); if (battleMode == FRONTIER_MODE_SINGLES) StringExpandPlaceholders(gStringVar4, gText_SingleBattleHallResults); else @@ -1248,7 +1248,7 @@ static void ShowPikeResultsWindow(void) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, 0x11); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); StringExpandPlaceholders(gStringVar4, gText_BattleChoiceResults); PrintAligned(gStringVar4, 0); AddTextPrinterParameterized(gRecordsWindowId, 1, gText_Lv502, 8, 33, TEXT_SPEED_FF, NULL); @@ -1310,7 +1310,7 @@ static void ShowArenaResultsWindow(void) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, 0x11); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); PrintHyphens(10); StringExpandPlaceholders(gStringVar4, gText_SetKOTourneyResults); PrintAligned(gStringVar4, 2); @@ -1396,7 +1396,7 @@ static void ShowFactoryResultsWindow(u8 battleMode) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, 0x11); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); if (battleMode == FRONTIER_MODE_SINGLES) StringExpandPlaceholders(gStringVar4, gText_BattleSwapSingleResults); else @@ -1461,7 +1461,7 @@ static void ShowPyramidResultsWindow(void) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, 0x11); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); StringExpandPlaceholders(gStringVar4, gText_BattleQuestResults); PrintAligned(gStringVar4, 2); AddTextPrinterParameterized(gRecordsWindowId, 1, gText_Lv502, 8, 49, TEXT_SPEED_FF, NULL); @@ -1484,7 +1484,7 @@ static void ShowLinkContestResultsWindow(void) gRecordsWindowId = AddWindow(&gUnknown_08611C7C); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, 0x11); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); StringExpandPlaceholders(gStringVar4, gText_LinkContestResults); x = GetStringCenterAlignXOffset(1, gStringVar4, 208); @@ -2354,7 +2354,7 @@ void ShowRankingHallRecordsWindow(void) { gRecordsWindowId = AddWindow(&gUnknown_08611C84); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, 0x11); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); PrintHallRecords(gSpecialVar_0x8005, FRONTIER_LVL_50); PutWindowTilemap(gRecordsWindowId); CopyWindowToVram(gRecordsWindowId, 3); @@ -2362,7 +2362,7 @@ void ShowRankingHallRecordsWindow(void) void ScrollRankingHallRecordsWindow(void) { - FillWindowPixelBuffer(gRecordsWindowId, 0x11); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); PrintHallRecords(gSpecialVar_0x8005, FRONTIER_LVL_OPEN); CopyWindowToVram(gRecordsWindowId, 2); } diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 3f217b7828..b064c991ba 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -570,7 +570,7 @@ static void Task_Hof_DisplayMon(u8 taskId) gSprites[spriteId].tSpecies = currMon->species; gSprites[spriteId].callback = SpriteCB_GetOnScreenAndAnimate; gTasks[taskId].tMonSpriteId(currMonId) = spriteId; - sub_8197434(0, TRUE); + ClearWindowAndWideBorder(0, TRUE); gTasks[taskId].func = Task_Hof_PrintMonInfoAfterAnimating; } @@ -649,7 +649,7 @@ static void sub_8173DC0(u8 taskId) gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 1; } BeginNormalPaletteFade(sUnknown_0203BCD4, 0, 12, 12, RGB(16, 29, 24)); - FillWindowPixelBuffer(0, 0); + FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); CopyWindowToVram(0, 3); gTasks[taskId].tFrameCount = 7; gTasks[taskId].func = sub_8173EA4; @@ -1086,7 +1086,7 @@ static void Task_HofPC_ExitOnButtonPress(u8 taskId) static void HallOfFame_PrintWelcomeText(u8 unusedPossiblyWindowId, u8 unused2) { - FillWindowPixelBuffer(0, 0); + FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); PutWindowTilemap(0); AddTextPrinterParameterized3(0, 1, GetStringCenterAlignXOffset(1, gText_WelcomeToHOF, 0xD0), 1, sUnknown_085E5388, 0, gText_WelcomeToHOF); CopyWindowToVram(0, 3); @@ -1099,7 +1099,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u s32 dexNumber; s32 width; - FillWindowPixelBuffer(0, 0); + FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); PutWindowTilemap(0); // dex number @@ -1180,7 +1180,7 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2) u32 width; u16 trainerId; - FillWindowPixelBuffer(1, 0x11); + FillWindowPixelBuffer(1, PIXEL_BUFFER_WHITE); PutWindowTilemap(1); SetWindowBorderStyle(1, FALSE, 0x21D, 0xD); AddTextPrinterParameterized3(1, 1, 0, 1, sUnknown_085E538C, -1, gText_Name); diff --git a/src/item_menu.c b/src/item_menu.c index 43f2afce34..db16a887ec 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -884,7 +884,7 @@ void bag_menu_print_description_box_text(int a) StringExpandPlaceholders(gStringVar4, gText_ReturnToVar1); str = gStringVar4; } - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); bag_menu_print(1, 1, str, 3, 1, 0, 0, 0, 0); } @@ -1028,7 +1028,7 @@ void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void ( *callback)(u s16* data = gTasks[taskId].data; data[10] = AddItemMessageWindow(4); - FillWindowPixelBuffer(data[10], 17); + FillWindowPixelBuffer(data[10], PIXEL_BUFFER_WHITE); DisplayMessageAndContinueTask(taskId, data[10], 10, 13, fontId, GetPlayerTextSpeedDelay(), str, callback); schedule_bg_copy_tilemap_to_vram(1); } @@ -1293,7 +1293,7 @@ void bag_menu_swap_items(u8 taskId) gUnknown_0203CE54->unk81A = data[1]; CopyItemName(BagGetItemIdByPocketPosition(gUnknown_0203CE58.pocket + 1, data[1]), gStringVar1); StringExpandPlaceholders(gStringVar4, gText_MoveVar1Where); - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); sub_80D4FEC(data[1]); sub_81AB89C(); @@ -1505,7 +1505,7 @@ void sub_81AC644(u8 unused) { CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected); - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); } if (gUnknown_0203CE54->unk828 == 1) @@ -1646,7 +1646,7 @@ void ItemMenu_UseOutOfBattle(u8 taskId) bag_menu_print_there_is_no_pokemon(taskId); else { - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); schedule_bg_copy_tilemap_to_vram(0); if (gUnknown_0203CE58.pocket != BERRIES_POCKET) ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId); @@ -1670,7 +1670,7 @@ void ItemMenu_Toss(u8 taskId) { CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_TossHowManyVar1s); - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); sub_81ABC3C(7); gTasks[taskId].func = Task_ChooseHowManyToToss; @@ -1684,7 +1684,7 @@ void BagMenuConfirmToss(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[8], 0, 3); StringExpandPlaceholders(gStringVar4, gText_ConfirmTossItems); - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); bag_menu_yes_no(taskId, 5, &gUnknown_08614084); } @@ -1727,7 +1727,7 @@ void BagMenuActuallyToss(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[8], 0, 3); StringExpandPlaceholders(gStringVar4, gText_ThrewAwayVar2Var1s); - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); gTasks[taskId].func = Task_ActuallyToss; } @@ -2043,7 +2043,7 @@ void display_deposit_item_ask_str(u8 taskId) { CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_DepositHowManyVar1); - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); sub_81ABC3C(7); gTasks[taskId].func = sub_81ADA7C; @@ -2078,7 +2078,7 @@ void sub_81ADB14(u8 taskId) { s16* data = gTasks[taskId].data; - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); if (ItemId_GetImportance(gSpecialVar_ItemId)) { bag_menu_print(1, 1, gText_CantStoreImportantItems, 3, 1, 0, 0, 0, 0); @@ -2244,7 +2244,7 @@ void bag_menu_print_pocket_names(const u8 *pocketName1, const u8 *pocketName2) window.width = 16; window.height = 2; windowId = AddWindow(&window); - FillWindowPixelBuffer(windowId, 0); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT); offset = GetStringCenterAlignXOffset(1, pocketName1, 0x40); bag_menu_print(windowId, 1, pocketName1, offset, 1, 0, 0, -1, 1); if (pocketName2) @@ -2283,7 +2283,7 @@ void setup_bag_menu_textboxes(void) LoadPalette(&gUnknown_0860F074, 0xF0, 0x20); for (i = 0; i < 3; i++) { - FillWindowPixelBuffer(i, 0); + FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); PutWindowTilemap(i); } schedule_bg_copy_tilemap_to_vram(0); @@ -2366,7 +2366,7 @@ void bag_menu_remove_money_window(void) void bag_menu_prepare_tmhm_move_window(void) { - FillWindowPixelBuffer(3, 0); + FillWindowPixelBuffer(3, PIXEL_BUFFER_TRANSPARENT); blit_move_info_icon(3, 19, 0, 0); blit_move_info_icon(3, 20, 0, 12); blit_move_info_icon(3, 21, 0, 24); @@ -2380,7 +2380,7 @@ void PrintTMHMMoveData(u16 itemId) u16 moveId; const u8* text; - FillWindowPixelBuffer(4, 0); + FillWindowPixelBuffer(4, PIXEL_BUFFER_TRANSPARENT); if (itemId == ITEM_NONE) { for (i = 0; i < 4; i++) diff --git a/src/item_use.c b/src/item_use.c index 97d6292c45..81f4b7b542 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -188,7 +188,7 @@ void DisplayCannotDismountBikeMessage(u8 taskId, bool8 isUsingRegisteredKeyItemO void CleanUpAfterFailingToUseRegisteredKeyItemOnField(u8 taskId) { - sub_8197434(0, 1); + ClearWindowAndWideBorder(0, 1); DestroyTask(taskId); ScriptUnfreezeEventObjects(); ScriptContext2_Disable(); @@ -350,7 +350,7 @@ void sub_80FD504(u8 taskId) void sub_80FD5CC(u8 taskId) { - sub_8197434(0, 1); + ClearWindowAndWideBorder(0, 1); ScriptUnfreezeEventObjects(); ScriptContext2_Disable(); DestroyTask(taskId); diff --git a/src/learn_move.c b/src/learn_move.c index 7a6916013a..d9ebe3f3b0 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -498,7 +498,7 @@ static void LearnMoveMain(void) case 27: if (!sub_81D2C3C()) { - FillWindowPixelBuffer(3, 0x11); + FillWindowPixelBuffer(3, PIXEL_BUFFER_WHITE); if (sLearnMoveStruct2.showContestInfo == FALSE) { sLearnMoveStruct->state = 3; @@ -631,7 +631,7 @@ static void HideSpritesAndPrintTeachText(bool8 a) if (!a) { StringExpandPlaceholders(gStringVar4, gText_TeachWhichMoveToPkmn); - FillWindowPixelBuffer(3, 0x11); + FillWindowPixelBuffer(3, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized(3, 1, gStringVar4, 0, 1, 0, NULL); } } @@ -695,7 +695,7 @@ static void ShowTeachMoveText(bool8 showContest) if (showContest == FALSE) { StringExpandPlaceholders(gStringVar4, gText_TeachWhichMoveToPkmn); - FillWindowPixelBuffer(3, 0x11); + FillWindowPixelBuffer(3, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized(3, 1, gStringVar4, 0, 1, 0, NULL); } } diff --git a/src/list_menu.c b/src/list_menu.c index 7a95476614..6442debba3 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -355,11 +355,11 @@ s32 DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenu switch (arg2) { case 0: // can never be reached, because of the if statement above - sub_819746C(sMysteryGiftLinkMenu.windowId, FALSE); + ClearWindowAndBorder(sMysteryGiftLinkMenu.windowId, FALSE); break; case 2: case 1: - sub_819746C(sMysteryGiftLinkMenu.windowId, FALSE); + ClearWindowAndBorder(sMysteryGiftLinkMenu.windowId, FALSE); break; } } diff --git a/src/mail.c b/src/mail.c index 45e96e85e5..6d9c98350b 100644 --- a/src/mail.c +++ b/src/mail.c @@ -477,8 +477,8 @@ static void sub_8121B1C(void) y = 0; PutWindowTilemap(0); PutWindowTilemap(1); - FillWindowPixelBuffer(0, 0); - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); for (i = 0; i < sMailRead->layout->numSubStructs; i ++) { if (sMailRead->strbuf[i][0] == EOS || sMailRead->strbuf[i][0] == CHAR_SPACE) diff --git a/src/main_menu.c b/src/main_menu.c index 4cd5c8e14c..9a320bcea1 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -39,6 +39,135 @@ #include "title_screen.h" #include "window.h" +/* + * Main menu state machine + * ----------------------- + * + * Entry point: CB2_InitMainMenu + * + * Note: States advance sequentially unless otherwise stated. + * + * CB2_InitMainMenu / CB2_ReinitMainMenu + * - Both of these states call InitMainMenu, which does all the work. + * - In the Reinit case, the init code will check if the user came from + * the options screen. If they did, then the options menu item is + * pre-selected. + * + * Task_MainMenuCheckSaveFile + * - Determines how many menu options to show based on whether + * the save file is Ok, empty, corrupted, etc. + * - If there was an error loading the save file, advance to + * Task_WaitForSaveFileErrorWindow. + * - If there were no errors, advance to Task_MainMenuCheckBattery. + * - Note that the check to enable Mystery Events would normally happen + * here, but this version of Emerald has them disabled. + * + * Task_WaitForSaveFileErrorWindow + * - Wait for the text to finish printing and then for the A button + * to be pressed. + * + * Task_MainMenuCheckBattery + * - If the battery is OK, advance to Task_DisplayMainMenu. + * - If the battery is dry, advance to Task_WaitForBatteryDryErrorWindow. + * + * Task_WaitForBatteryDryErrorWindow + * - Wait for the text to finish printing and then for the A button + * to be pressed. + * + * Task_DisplayMainWindow + * - Display the buttons to the user. If the menu is in HAS_MYSTERY_EVENTS + * mode, there are too many buttons for one screen and a scrollbar is added, + * and the scrollbar task is spawned (Task_ScrollIndicatorArrowPairOnMainMenu). + * + * Task_HighlightSelectedMainMenuItem + * - Update the UI to match the currently selected item. + * + * Task_HandleMainMenuInput + * - If A is pressed, advance to Task_HandleMainMenuAPressed. + * - If B is pressed, return to the title screen via CB2_InitTitleScreen. + * - If Up or Down is pressed, handle scrolling if there is a scroll bar, change + * the selection, then go back to Task_HighlightSelectedMainMenuItem. + * + * Task_HandleMainMenuAPressed + * - If the user selected New Game, advance to Task_NewGameBirchSpeech_Init. + * - If the user selected Continue, advance to CB2_ContinueSavedGame. + * - If the user selected the Options menu, advance to CB2_InitOptionMenu. + * - If the user selected Mystery Gift, advance to CB2_MysteryGift. However, + * if the wireless adapter was removed, instead advance to + * Task_DisplayMainMenuInvalidActionError. + * - Code to start a Mystery Event is present here, but is unreachable in this + * version. + * + * Task_HandleMainMenuBPressed + * - Clean up the main menu and go back to CB2_InitTitleScreen. + * + * Task_DisplayMainMenuInvalidActionError + * - Print one of three different error messages, wait for the text to stop + * printing, and then wait for A or B to be pressed. + * - Then advance to Task_HandleMainMenuBPressed. + * + * Task_NewGameBirchSpeechInit + * - Load the sprites for the intro speech, start playing music + * Task_NewGameBirchSpeech_WaitToShowBirch + * - Spawn Task_NewGameBirchSpeech_FadeInTarget1OutTarget2 + * - Spawn Task_NewGameBirchSpeech_FadePlatformOut + * - Both of these tasks destroy themselves when done. + * Task_NewGameBirchSpeech_WaitForSpriteFadeInWelcome + * Task_NewGameBirchSpeech_ThisIsAPokemon + * - When the text is done printing, spawns Task_NewGameBirchSpeechSub_InitPokeball + * Task_NewGameBirchSpeech_MainSpeech + * Task_NewGameBirchSpeech_AndYouAre + * Task_NewGameBirchSpeech_StartBirchLotadPlatformFade + * Task_NewGameBirchSpeech_StartBirchLotadPlatformFade + * Task_NewGameBirchSpeech_SlidePlatformAway + * Task_NewGameBirchSpeech_StartPlayerFadeIn + * Task_NewGameBirchSpeech_WaitForPlayerFadeIn + * Task_NewGameBirchSpeech_BoyOrGirl + * Task_NewGameBirchSpeech_WaitToShowGenderMenu + * Task_NewGameBirchSpeech_ChooseGender + * - Animates by advancing to Task_NewGameBirchSpeech_SlideOutOldGenderSprite + * whenever the player's selection changes. + * - Advances to Task_NewGameBirchSpeech_WhatsYourName when done. + * + * Task_NewGameBirchSpeech_SlideOutOldGenderSprite + * Task_NewGameBirchSpeech_SlideInNewGenderSprite + * - Returns back to Task_NewGameBirchSpeech_ChooseGender. + * + * Task_NewGameBirchSpeech_WhatsYourName + * Task_NewGameBirchSpeech_WaitForWhatsYourNameToPrint + * Task_NewGameBirchSpeech_WaitPressBeforeNameChoice + * Task_NewGameBirchSpeech_StartNamingScreen + * C2_NamingScreen + * - Returns to CB2_NewGameBirchSpeech_ReturnFromNamingScreen when done + * CB2_NewGameBirchSpeech_ReturnFromNamingScreen + * Task_NewGameBirchSpeech_ReturnFromNamingScreenShowTextbox + * Task_NewGameBirchSpeech_SoItsPlayerName + * Task_NewGameBirchSpeech_CreateNameYesNo + * Task_NewGameBirchSpeech_ProcessNameYesNoMenu + * - If confirmed, advance to Task_NewGameBirchSpeech_SlidePlatformAway2. + * - Otherwise, return to Task_NewGameBirchSpeech_BoyOrGirl. + * + * Task_NewGameBirchSpeech_SlidePlatformAway2 + * Task_NewGameBirchSpeech_ReshowBirchLotad + * Task_NewGameBirchSpeech_WaitForSpriteFadeInAndTextPrinter + * Task_NewGameBirchSpeech_AreYouReady + * Task_NewGameBirchSpeech_ShrinkPlayer + * Task_NewGameBirchSpeech_WaitForPlayerShrink + * Task_NewGameBirchSpeech_FadePlayerToWhite + * Task_NewGameBirchSpeech_Cleanup + * - Advances to CB2_NewGame. + * + * Task_NewGameBirchSpeechSub_InitPokeball + * - Advances to Task_NewGameBirchSpeechSub_WaitForLotad + * Task_NewGameBirchSpeechSub_WaitForLotad + * - Destroys itself when done. + */ + +// These two defines are used with the sCurrItemAndOptionsMenuCheck, +// to distinguish between its two parts. +#define OPTION_MENU_FLAG 0x8000 +#define CURRENT_ITEM_MASK 0x7FFF + // Static type declarations // Static RAM declarations @@ -112,7 +241,7 @@ static void SpriteCB_MovePlayerDownWhileShrinking(struct Sprite*); static void Task_NewGameBirchSpeech_WaitForPlayerShrink(u8); static void Task_NewGameBirchSpeech_FadePlayerToWhite(u8); static void Task_NewGameBirchSpeech_Cleanup(u8); -static void nullsub_11(); +static void SpriteCB_Null(); static void Task_NewGameBirchSpeech_ReturnFromNamingScreenShowTextbox(u8); static void MainMenu_FormatSavegamePlayer(void); static void MainMenu_FormatSavegamePokedex(void); @@ -247,7 +376,7 @@ static const struct WindowTemplate sWindowTemplates_MainMenu[] = DUMMY_WIN_TEMPLATE }; -static const struct WindowTemplate gUnknown_082FF080[] = +static const struct WindowTemplate gNewGameBirchSpeechTextWindows[] = { { .bg = 0, @@ -542,7 +671,7 @@ static void Task_MainMenuCheckSaveFile(u8 taskId) gTasks[taskId].func = Task_WaitForSaveFileErrorWindow; break; } - if (sCurrItemAndOptionMenuCheck & 0x8000) // are we returning from the options menu? + if (sCurrItemAndOptionMenuCheck & OPTION_MENU_FLAG) // are we returning from the options menu? { switch (tMenuType) // if so, highlight the OPTIONS item { @@ -558,7 +687,7 @@ static void Task_MainMenuCheckSaveFile(u8 taskId) break; } } - sCurrItemAndOptionMenuCheck &= 0x7FFF; // turn off the "returning from options menu" flag + sCurrItemAndOptionMenuCheck &= CURRENT_ITEM_MASK; // turn off the "returning from options menu" flag tCurrItem = sCurrItemAndOptionMenuCheck; tItemCount = tMenuType + 2; } @@ -637,6 +766,8 @@ static void Task_DisplayMainMenu(u8 taskId) palette = RGB(26, 26, 25); LoadPalette(&palette, 252, 2); + // Note: If there is no save file, the save block is zeroed out, + // so the default gender is MALE. if (gSaveBlock2Ptr->playerGender == MALE) { palette = RGB(4, 16, 31); @@ -813,14 +944,14 @@ static void Task_HandleMainMenuAPressed(u8 taskId) { if (gTasks[taskId].tMenuType == HAS_MYSTERY_EVENTS) RemoveScrollIndicatorArrowPair(gTasks[taskId].tScrollArrowTaskId); - sub_819746C(0, 1); - sub_819746C(1, 1); - sub_819746C(2, 1); - sub_819746C(3, 1); - sub_819746C(4, 1); - sub_819746C(5, 1); - sub_819746C(6, 1); - sub_819746C(7, 1); + ClearWindowAndBorder(0, TRUE); + ClearWindowAndBorder(1, TRUE); + ClearWindowAndBorder(2, TRUE); + ClearWindowAndBorder(3, TRUE); + ClearWindowAndBorder(4, TRUE); + ClearWindowAndBorder(5, TRUE); + ClearWindowAndBorder(6, TRUE); + ClearWindowAndBorder(7, TRUE); wirelessAdapterConnected = IsWirelessAdapterConnected(); switch (gTasks[taskId].tMenuType) { @@ -973,7 +1104,7 @@ static void Task_HandleMainMenuAPressed(u8 taskId) if (action != ACTION_OPTION) sCurrItemAndOptionMenuCheck = 0; else - sCurrItemAndOptionMenuCheck |= 0x8000; // entering the options menu + sCurrItemAndOptionMenuCheck |= OPTION_MENU_FLAG; // entering the options menu } } @@ -981,7 +1112,7 @@ static void Task_HandleMainMenuBPressed(u8 taskId) { if (!gPaletteFade.active) { - if (gTasks[taskId].tMenuType == 3) + if (gTasks[taskId].tMenuType == HAS_MYSTERY_EVENTS) RemoveScrollIndicatorArrowPair(gTasks[taskId].tScrollArrowTaskId); sCurrItemAndOptionMenuCheck = 0; FreeAllWindowBuffers(); @@ -1199,7 +1330,7 @@ static void Task_NewGameBirchSpeech_WaitForSpriteFadeInWelcome(u8 taskId) } else { - InitWindows(gUnknown_082FF080); + InitWindows(gNewGameBirchSpeechTextWindows); LoadMainMenuWindowFrameTiles(0, 0xF3); LoadMessageBoxGfx(0, 0xFC, 0xF0); NewGameBirchSpeech_ShowDialogueWindow(0, 1); @@ -1642,7 +1773,7 @@ static void Task_NewGameBirchSpeech_FadePlayerToWhite(u8 taskId) if (!gPaletteFade.active) { spriteId = gTasks[taskId].tPlayerSpriteId; - gSprites[spriteId].callback = nullsub_11; + gSprites[spriteId].callback = SpriteCB_Null; SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); BeginNormalPaletteFade(0xFFFF0000, 0, 0, 16, RGB_WHITEALPHA); gTasks[taskId].func = Task_NewGameBirchSpeech_Cleanup; @@ -1730,14 +1861,14 @@ static void CB2_NewGameBirchSpeech_ReturnFromNamingScreen(void) REG_IME = savedIme; SetVBlankCallback(VBlankCB_MainMenu); SetMainCallback2(CB2_MainMenu); - InitWindows(gUnknown_082FF080); + InitWindows(gNewGameBirchSpeechTextWindows); LoadMainMenuWindowFrameTiles(0, 0xF3); LoadMessageBoxGfx(0, 0xFC, 0xF0); PutWindowTilemap(0); CopyWindowToVram(0, 3); } -static void nullsub_11(struct Sprite *sprite) +static void SpriteCB_Null(struct Sprite *sprite) { } @@ -1763,22 +1894,22 @@ static void AddBirchSpeechObjects(u8 taskId) u8 maySpriteId; birchSpriteId = AddNewGameBirchObject(0x88, 0x3C, 1); - gSprites[birchSpriteId].callback = nullsub_11; + gSprites[birchSpriteId].callback = SpriteCB_Null; gSprites[birchSpriteId].oam.priority = 0; gSprites[birchSpriteId].invisible = TRUE; gTasks[taskId].tBirchSpriteId = birchSpriteId; lotadSpriteId = NewGameBirchSpeech_CreateLotadSprite(100, 0x4B); - gSprites[lotadSpriteId].callback = nullsub_11; + gSprites[lotadSpriteId].callback = SpriteCB_Null; gSprites[lotadSpriteId].oam.priority = 0; gSprites[lotadSpriteId].invisible = TRUE; gTasks[taskId].tLotadSpriteId = lotadSpriteId; brendanSpriteId = CreateTrainerSprite(FacilityClassToPicIndex(FACILITY_CLASS_BRENDAN), 120, 60, 0, &gDecompressionBuffer[0]); - gSprites[brendanSpriteId].callback = nullsub_11; + gSprites[brendanSpriteId].callback = SpriteCB_Null; gSprites[brendanSpriteId].invisible = TRUE; gSprites[brendanSpriteId].oam.priority = 0; gTasks[taskId].tBrendanSpriteId = brendanSpriteId; maySpriteId = CreateTrainerSprite(FacilityClassToPicIndex(FACILITY_CLASS_MAY), 120, 60, 0, &gDecompressionBuffer[0x800]); - gSprites[maySpriteId].callback = nullsub_11; + gSprites[maySpriteId].callback = SpriteCB_Null; gSprites[maySpriteId].invisible = TRUE; gSprites[maySpriteId].oam.priority = 0; gTasks[taskId].tMaySpriteId = maySpriteId; @@ -1966,8 +2097,8 @@ static void NewGameBirchSpeech_StartFadePlatformOut(u8 taskId, u8 delay) static void NewGameBirchSpeech_ShowGenderMenu(void) { - DrawMainMenuWindowBorder(&gUnknown_082FF080[1], 0xF3); - FillWindowPixelBuffer(1, 17); + DrawMainMenuWindowBorder(&gNewGameBirchSpeechTextWindows[1], 0xF3); + FillWindowPixelBuffer(1, PIXEL_BUFFER_WHITE); PrintMenuTable(1, 2, sMenuActions_Gender); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(1, 2, 0); PutWindowTilemap(1); @@ -1995,7 +2126,7 @@ static void NewGameBirchSpeech_SetDefaultPlayerName(u8 nameId) static void CreateMainMenuErrorWindow(const u8* str) { - FillWindowPixelBuffer(7, 17); + FillWindowPixelBuffer(7, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized(7, 1, str, 0, 1, 2, 0); PutWindowTilemap(7); CopyWindowToVram(7, 2); @@ -2105,12 +2236,12 @@ static void NewGameBirchSpeech_ClearGenderWindowTilemap(u8 a, u8 b, u8 c, u8 d, FillBgTilemapBufferRect(a, 0, b + 0xFF, c + 0xFF, d + 2, e + 2, 2); } -static void NewGameBirchSpeech_ClearGenderWindow(u8 windowId, u8 a) +static void NewGameBirchSpeech_ClearGenderWindow(u8 windowId, bool8 copyToVram) { CallWindowFunction(windowId, NewGameBirchSpeech_ClearGenderWindowTilemap); - FillWindowPixelBuffer(windowId, 0x11); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); ClearWindowTilemap(windowId); - if (a == 1) + if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); } @@ -2146,7 +2277,7 @@ void CreateYesNoMenuParameterized(u8 a, u8 b, u16 c, u16 d, u8 e, u8 f) static void NewGameBirchSpeech_ShowDialogueWindow(u8 windowId, u8 copyToVram) { CallWindowFunction(windowId, NewGameBirchSpeech_CreateDialogueWindowBorder); - FillWindowPixelBuffer(windowId, 17); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); diff --git a/src/map_name_popup.c b/src/map_name_popup.c index cdb4c3330d..30b04c21d0 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -276,7 +276,7 @@ static void Task_MapNamePopUpWindow(u8 taskId) } break; case 4: - sub_819746C(GetMapNamePopUpWindowId(), TRUE); + ClearWindowAndBorder(GetMapNamePopUpWindowId(), TRUE); task->data[0] = 5; break; case 5: @@ -290,7 +290,7 @@ void HideMapNamePopUpWindow(void) { if (FuncIsActiveTask(Task_MapNamePopUpWindow)) { - sub_819746C(GetMapNamePopUpWindowId(), TRUE); + ClearWindowAndBorder(GetMapNamePopUpWindowId(), TRUE); RemoveMapNamePopUpWindow(); SetGpuReg_ForcedBlank(REG_OFFSET_BG0VOFS, 0); DestroyTask(sPopupTaskId); diff --git a/src/menu.c b/src/menu.c index ae589dff4c..9a9cec9ddb 100644 --- a/src/menu.c +++ b/src/menu.c @@ -126,8 +126,8 @@ const struct MoveMenuInfoIcon gMoveMenuInfoIcons[] = extern void sub_81973A4(void); extern void DrawStandardFrame(u8, u8, u8, u8, u8, u8); extern void DrawDialogueFrame(u8, u8, u8, u8, u8, u8); -extern void sub_81977BC(u8, u8, u8, u8, u8, u8); -extern void sub_8197804(u8, u8, u8, u8, u8, u8); +extern void ClearWindowAndBorderTilemap(u8, u8, u8, u8, u8, u8); +extern void ClearWindowAndWideBorderTilemap(u8, u8, u8, u8, u8, u8); extern void sub_8197BB4(u8, u8, u8, u8, u8, u8); extern void sub_8197E30(u8, u8, u8, u8, u8, u8); extern void DrawWindowBorder(u8, u8, u8, u8, u8, u8); @@ -213,7 +213,7 @@ void sub_81973A4(void) void NewMenuHelpers_DrawDialogueFrame(u8 windowId, bool8 copyToVram) { CallWindowFunction(windowId, DrawDialogueFrame); - FillWindowPixelBuffer(windowId, 0x11); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -222,25 +222,25 @@ void NewMenuHelpers_DrawDialogueFrame(u8 windowId, bool8 copyToVram) void NewMenuHelpers_DrawStdWindowFrame(u8 windowId, bool8 copyToVram) { CallWindowFunction(windowId, DrawStandardFrame); - FillWindowPixelBuffer(windowId, 0x11); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); } -void sub_8197434(u8 windowId, bool8 copyToVram) +void ClearWindowAndWideBorder(u8 windowId, bool8 copyToVram) { - CallWindowFunction(windowId, sub_8197804); - FillWindowPixelBuffer(windowId, 0x11); + CallWindowFunction(windowId, ClearWindowAndWideBorderTilemap); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); ClearWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); } -void sub_819746C(u8 windowId, bool8 copyToVram) +void ClearWindowAndBorder(u8 windowId, bool8 copyToVram) { - CallWindowFunction(windowId, sub_81977BC); - FillWindowPixelBuffer(windowId, 0x11); + CallWindowFunction(windowId, ClearWindowAndBorderTilemap); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); ClearWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -408,14 +408,17 @@ void DrawDialogueFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height DLG_WINDOW_PALETTE_NUM); } -void sub_81977BC(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) +// Clears the given window, and a 1-tile border around the window, to transparent tiles. +void ClearWindowAndBorderTilemap(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) { - FillBgTilemapBufferRect(bg, 0, tilemapLeft - 1, tilemapTop - 1, width + 2, height + 2, STD_WINDOW_PALETTE_NUM); + FillBgTilemapBufferRect(bg, TRANSPARENT_TILE_NUMBER, tilemapLeft - 1, tilemapTop - 1, width + 2, height + 2, STD_WINDOW_PALETTE_NUM); } -void sub_8197804(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) +// Clears the given window, and a 1-tile border the top and bottom, plus a 3-tile border on the left and right. +// Tiles are set to a transparent tile. +void ClearWindowAndWideBorderTilemap(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) { - FillBgTilemapBufferRect(bg, 0, tilemapLeft - 3, tilemapTop - 1, width + 6, height + 2, STD_WINDOW_PALETTE_NUM); + FillBgTilemapBufferRect(bg, TRANSPARENT_TILE_NUMBER, tilemapLeft - 3, tilemapTop - 1, width + 6, height + 2, STD_WINDOW_PALETTE_NUM); } void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram) @@ -554,7 +557,7 @@ void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 tileNum, u8 paletteNum) sTileNum = tileNum; sPaletteNum = paletteNum; CallWindowFunction(windowId, sub_8197BB4); - FillWindowPixelBuffer(windowId, 0x11); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -565,7 +568,7 @@ void sub_8197B64(u8 windowId, bool8 copyToVram, u16 tileNum) sTileNum = tileNum; sPaletteNum = GetWindowAttribute(windowId, WINDOW_PALETTE_NUM); CallWindowFunction(windowId, sub_8197BB4); - FillWindowPixelBuffer(windowId, 0x11); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -669,7 +672,7 @@ void sub_8197BB4(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 p void sub_8197DF8(u8 windowId, bool8 copyToVram) { CallWindowFunction(windowId, sub_8197E30); - FillWindowPixelBuffer(windowId, 0); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT); ClearWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -685,7 +688,7 @@ void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, u16 baseTileNum, u8 pal sTileNum = baseTileNum; sPaletteNum = paletteNum; CallWindowFunction(windowId, DrawWindowBorder); - FillWindowPixelBuffer(windowId, 0x11); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -696,7 +699,7 @@ void sub_8197EC8(u8 windowId, bool8 copyToVram, u16 baseTileNum) sTileNum = baseTileNum; sPaletteNum = GetWindowAttribute(windowId, WINDOW_PALETTE_NUM); CallWindowFunction(windowId, DrawWindowBorder); - FillWindowPixelBuffer(windowId, 0x11); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -765,7 +768,7 @@ void DrawWindowBorder(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, void sub_8198070(u8 windowId, bool8 copyToVram) { CallWindowFunction(windowId, sub_81980A8); - FillWindowPixelBuffer(windowId, 0); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT); ClearWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -811,7 +814,7 @@ void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram) if (sWindowId != 0xFF) { PutWindowTilemap(sWindowId); - FillWindowPixelBuffer(sWindowId, 0xFF); + FillWindowPixelBuffer(sWindowId, PIXEL_BUFFER_UNKNOWN); width = GetStringWidth(0, string, 0); AddTextPrinterParameterized3(sWindowId, 0, @@ -845,7 +848,7 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo color[2] = 2; } PutWindowTilemap(sWindowId); - FillWindowPixelBuffer(sWindowId, 0xFF); + FillWindowPixelBuffer(sWindowId, PIXEL_BUFFER_UNKNOWN); if (string2 != NULL) { width = GetStringWidth(0, string2, 0); @@ -873,7 +876,7 @@ void sub_81982F0(void) { if (sWindowId != 0xFF) { - FillWindowPixelBuffer(sWindowId, 0xFF); + FillWindowPixelBuffer(sWindowId, PIXEL_BUFFER_UNKNOWN); CopyWindowToVram(sWindowId, 3); } } @@ -882,7 +885,7 @@ void sub_8198314(void) { if (sWindowId != 0xFF) { - FillWindowPixelBuffer(sWindowId, 0); + FillWindowPixelBuffer(sWindowId, PIXEL_BUFFER_TRANSPARENT); ClearWindowTilemap(sWindowId); CopyWindowToVram(sWindowId, 3); RemoveWindow(sWindowId); diff --git a/src/money.c b/src/money.c index faf830637a..33dffdc75d 100644 --- a/src/money.c +++ b/src/money.c @@ -169,7 +169,7 @@ void DrawMoneyBox(int amount, u8 x, u8 y) SetWindowTemplateFields(&template, 0, x + 1, y + 1, 10, 2, 15, 8); sMoneyBoxWindowId = AddWindow(&template); - FillWindowPixelBuffer(sMoneyBoxWindowId, 0); + FillWindowPixelBuffer(sMoneyBoxWindowId, PIXEL_BUFFER_TRANSPARENT); PutWindowTilemap(sMoneyBoxWindowId); CopyWindowToVram(sMoneyBoxWindowId, 1); PrintMoneyAmountInMoneyBoxWithBorder(sMoneyBoxWindowId, 0x214, 14, amount); diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index 0de4675d92..c30fb9c1a0 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -90,7 +90,7 @@ void CB2_InitMysteryEventMenu(void) DeactivateAllTextPrinters(); for (i = 0; i < 2; i++) - FillWindowPixelBuffer(i, 0); + FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14); LoadUserWindowBorderGfx(0, 1u, 0xD0u); diff --git a/src/naming_screen.c b/src/naming_screen.c index c310ceb9fb..cb53604df9 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1474,7 +1474,7 @@ static void HandleDpadMovement(struct Task *task) static void sub_80E4894(void) { - FillWindowPixelBuffer(gNamingScreenData->windows[3], 0x11); + FillWindowPixelBuffer(gNamingScreenData->windows[3], PIXEL_BUFFER_WHITE); AddTextPrinterParameterized(gNamingScreenData->windows[3], 1, gNamingScreenData->template->title, 8, 1, 0, 0); PutWindowTilemap(gNamingScreenData->windows[3]); } @@ -1485,7 +1485,7 @@ static void sub_80E48E8(void) StringCopy(buffer, gSpeciesNames[gNamingScreenData->monSpecies]); StringAppendN(buffer, gNamingScreenData->template->title, 15); - FillWindowPixelBuffer(gNamingScreenData->windows[3], 0x11); + FillWindowPixelBuffer(gNamingScreenData->windows[3], PIXEL_BUFFER_WHITE); AddTextPrinterParameterized(gNamingScreenData->windows[3], 1, buffer, 8, 1, 0, 0); PutWindowTilemap(gNamingScreenData->windows[3]); } @@ -1672,7 +1672,7 @@ static void sub_80E4D10(void) u8 maxChars = gNamingScreenData->template->maxChars; u16 unk = gNamingScreenData->inputCharBaseXPos - 0x40; - FillWindowPixelBuffer(gNamingScreenData->windows[2], 0x11); + FillWindowPixelBuffer(gNamingScreenData->windows[2], PIXEL_BUFFER_WHITE); for (i = 0; i < maxChars; i++) { @@ -1766,7 +1766,7 @@ static void sub_80E4EF0(void) { const u8 color[3] = { 15, 1, 2 }; - FillWindowPixelBuffer(gNamingScreenData->windows[4], 0xFF); + FillWindowPixelBuffer(gNamingScreenData->windows[4], PIXEL_BUFFER_UNKNOWN); AddTextPrinterParameterized3(gNamingScreenData->windows[4], 0, 2, 1, color, 0, gText_MoveOkBack); PutWindowTilemap(gNamingScreenData->windows[4]); CopyWindowToVram(gNamingScreenData->windows[4], 3); diff --git a/src/option_menu.c b/src/option_menu.c index 122ba8d8af..6ffc4de500 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -620,7 +620,7 @@ static void ButtonMode_DrawChoices(u8 selection) static void DrawTextOption(void) { - FillWindowPixelBuffer(WIN_TEXT_OPTION, 0x11); + FillWindowPixelBuffer(WIN_TEXT_OPTION, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized(WIN_TEXT_OPTION, 1, gText_Option, 8, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(WIN_TEXT_OPTION, 3); } @@ -629,7 +629,7 @@ static void DrawOptionMenuTexts(void) { u8 i; - FillWindowPixelBuffer(WIN_OPTIONS, 0x11); + FillWindowPixelBuffer(WIN_OPTIONS, PIXEL_BUFFER_WHITE); for (i = 0; i < MENUITEM_COUNT; i++) { AddTextPrinterParameterized(WIN_OPTIONS, 1, sOptionMenuItemsNames[i], 8, (i * 16) + 1, TEXT_SPEED_FF, NULL); diff --git a/src/party_menu.c b/src/party_menu.c index 15b5d24d8e..d2a4d09f2e 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -3108,7 +3108,7 @@ static void sub_81B239C(u8 a) } DeactivateAllTextPrinters(); for (i = 0; i < PARTY_SIZE; i++) - FillWindowPixelBuffer(i, 0); + FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); LoadUserWindowBorderGfx(0, 0x4F, 0xD0); LoadPalette(GetOverworldTextboxPalettePtr(), 0xE0, 0x20); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); @@ -3126,7 +3126,7 @@ static void sub_81B2428(bool8 a) if (a == TRUE) { firstWindowId = AddWindow(&gUnknown_08615918); - FillWindowPixelBuffer(firstWindowId, 0); + FillWindowPixelBuffer(firstWindowId, PIXEL_BUFFER_TRANSPARENT); mainOffset = GetStringCenterAlignXOffset(0, gMenuText_Confirm, 48); AddTextPrinterParameterized4(firstWindowId, 0, mainOffset, 1, 0, 0, gUnknown_086157FC[0], -1, gMenuText_Confirm); PutWindowTilemap(firstWindowId); @@ -3139,7 +3139,7 @@ static void sub_81B2428(bool8 a) windowId = AddWindow(&gUnknown_08615908); offset = 3; } - FillWindowPixelBuffer(windowId, 0); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT); if (gUnknown_0203CEC8.unk8_0 != 10) { mainOffset = GetStringCenterAlignXOffset(0, gText_Cancel, 48); diff --git a/src/player_pc.c b/src/player_pc.c index 0d08a5e7b2..9d1b2f788a 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -403,7 +403,7 @@ static void PlayerPC_Mailbox(u8 taskId) ItemStorage_SetItemAndMailCount(taskId); if (sub_81D1C44(playerPCItemPageInfo.count) == TRUE) { - sub_8197434(0, 0); + ClearWindowAndWideBorder(0, 0); Mailbox_DrawMailboxMenu(taskId); gTasks[taskId].func = Mailbox_ProcessInput; } @@ -560,7 +560,7 @@ static void ItemStorage_WithdrawToss_Helper(u8 taskId, bool8 toss) FreeAndReserveObjectSpritePalettes(); LoadListMenuArrowsGfx(); sub_8122344(gUnknown_0203BCC4->spriteIds, 7); - sub_8197434(0,0); + ClearWindowAndWideBorder(0,0); gTasks[taskId].func = ItemStorage_ProcessWithdrawTossInput; } @@ -863,7 +863,7 @@ static void Mailbox_NoPokemonForMail(u8 taskId) static void Mailbox_Cancel(u8 taskId) { sub_81D1D04(2); - sub_8197434(0, 0); + ClearWindowAndWideBorder(0, 0); Mailbox_DrawMailboxMenu(taskId); schedule_bg_copy_tilemap_to_vram(0); gTasks[taskId].func = Mailbox_ProcessInput; @@ -977,7 +977,7 @@ static void sub_816BEF0(s32 id) description = (u8 *)ItemId_GetDescription(gSaveBlock1Ptr->pcItems[id].itemId); else description = ItemStorage_GetItemPcResponse(ITEMPC_GO_BACK_TO_PREV); - FillWindowPixelBuffer(windowId, 17); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized(windowId, 1, description, 0, 1, 0, NULL); } @@ -1123,7 +1123,7 @@ static const u8* ItemStorage_GetItemPcResponse(u16 itemId) static void ItemStorage_PrintItemPcResponse(const u8 *string) { u8 windowId = gUnknown_0203BCC4->windowIds[1]; - FillWindowPixelBuffer(windowId, 0x11); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); StringExpandPlaceholders(gStringVar4, string); AddTextPrinterParameterized(windowId, 1, gStringVar4, 0, 1, 0, NULL); } diff --git a/src/pokeblock.c b/src/pokeblock.c index 3fd4f34df4..31eaf3540c 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -665,7 +665,7 @@ static void HandleInitWindows(void) for (i = 0; i < ARRAY_COUNT(sWindowTemplatesForPokeblockMenu) - 1; i++) { - FillWindowPixelBuffer(i, 0); + FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); } schedule_bg_copy_tilemap_to_vram(0); @@ -749,7 +749,7 @@ static void sub_8135FCC(s32 pkblId) struct Pokeblock *pokeblock; u16 rectTilemapSrc[2]; - FillWindowPixelBuffer(7, 0); + FillWindowPixelBuffer(7, PIXEL_BUFFER_TRANSPARENT); if (pkblId != LIST_B_PRESSED) { diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index b1f182b660..1ad0920d3f 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -704,7 +704,7 @@ static void HandleInitWindows(void) DeactivateAllTextPrinters(); LoadUserWindowBorderGfx(0, 1, 0xE0); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); - FillWindowPixelBuffer(0, 0); + FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); PutWindowTilemap(0); schedule_bg_copy_tilemap_to_vram(0); } diff --git a/src/pokedex.c b/src/pokedex.c index c47ada5b8b..3067771f2a 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -2926,7 +2926,7 @@ void sub_80BEA24(u8 taskId) case 1: DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); CopyToBgTilemapBuffer(3, gPokedexTilemap_DescriptionScreen, 0, 0); - FillWindowPixelBuffer(0, 0); + FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); PutWindowTilemap(0); PutWindowTilemap(1); sub_80C0D30(1, sPokedexListItem->dexNum); @@ -3221,7 +3221,7 @@ void sub_80BF250(u8 taskId) case 1: DecompressAndLoadBgGfxUsingHeap(3, &gPokedexMenu_Gfx, 0x2000, 0, 0); CopyToBgTilemapBuffer(3, &gPokedexTilemap_CryScreen, 0, 0); - FillWindowPixelBuffer(0, 0); + FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); PutWindowTilemap(0); PutWindowTilemap(3); PutWindowTilemap(2); @@ -3415,7 +3415,7 @@ void sub_80BF82C(u8 taskId) case 1: DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); CopyToBgTilemapBuffer(3, gPokedexTilemap_SizeScreen, 0, 0); - FillWindowPixelBuffer(0, 0); + FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); PutWindowTilemap(0); gMain.state++; break; @@ -3762,7 +3762,7 @@ void sub_80BFE38(u8 taskId) case 1: DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); CopyToBgTilemapBuffer(3, gPokedexTilemap_DescriptionScreen, 0, 0); - FillWindowPixelBuffer(0, 0); + FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); PutWindowTilemap(0); PutWindowTilemap(1); sub_80C0D30(1, gTasks[taskId].data[1]); diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index c0aec4dddd..12f41d4d01 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -1218,7 +1218,7 @@ static const u16 gWallpaperPalettes_Plain[][16] = static const u32 gWallpaperTiles_Plain[] = INCBIN_U32("graphics/pokemon_storage/plain.4bpp.lz"); static const u32 gWallpaperTilemap_Plain[] = INCBIN_U32("graphics/pokemon_storage/plain.bin.lz"); -// 12×18 tilemap +// 12�18 tilemap static const u32 gUnknown_085773C4[] = INCBIN_U32("graphics/unused/tilemap_5773C4.bin"); static const u16 gUnknown_08577574[][2] = @@ -1737,7 +1737,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) CreatePCMenu(task->data[1], &task->data[15]); sub_81973A4(); NewMenuHelpers_DrawDialogueFrame(0, 0); - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, TEXT_SPEED_FF, NULL, 2, 1, 3); CopyWindowToVram(0, 3); CopyWindowToVram(task->data[15], 3); @@ -1763,13 +1763,13 @@ static void Task_PokemonStorageSystemPC(u8 taskId) if (task->data[1] != task->data[3]) { task->data[1] = task->data[3]; - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3); } break; case MENU_B_PRESSED: case 4: - sub_819746C(task->data[15], TRUE); + ClearWindowAndBorder(task->data[15], TRUE); ScriptContext2_Disable(); EnableBothScriptContexts(); RemoveWindow(task->data[15]); @@ -1778,13 +1778,13 @@ static void Task_PokemonStorageSystemPC(u8 taskId) default: if (task->data[2] == 0 && CountPartyMons() == PARTY_SIZE) { - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized2(0, 1, gText_PartyFull, 0, NULL, 2, 1, 3); task->data[0] = 3; } else if (task->data[2] == 1 && CountPartyMons() == 1) { - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized2(0, 1, gText_JustOnePkmn, 0, NULL, 2, 1, 3); task->data[0] = 3; } @@ -1799,7 +1799,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) case 3: if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3); task->data[0] = 2; } @@ -1809,7 +1809,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) task->data[1] = 4; Menu_MoveCursor(-1); task->data[1] = Menu_GetCursorPos(); - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3); task->data[0] = 2; } @@ -1819,7 +1819,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) task->data[1] = 0; Menu_MoveCursor(1); task->data[1] = Menu_GetCursorPos(); - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3); task->data[0] = 2; } @@ -4107,7 +4107,7 @@ static void LoadCursorMonGfx(u16 species, u32 pid) static void PrintCursorMonInfo(void) { - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) { AddTextPrinterParameterized(0, 1, sPSSData->cursorMonNickText, 6, 0, TEXT_SPEED_FF, NULL); @@ -4416,7 +4416,7 @@ static void PrintStorageActionText(u8 id) } DynamicPlaceholderTextUtil_ExpandPlaceholders(sPSSData->field_2190, gPCStorageActionTexts[id].text); - FillWindowPixelBuffer(1, 0x11); + FillWindowPixelBuffer(1, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized(1, 1, sPSSData->field_2190, 0, 1, TEXT_SPEED_FF, NULL); sub_8098858(1, 2, 14); PutWindowTilemap(1); @@ -8835,7 +8835,7 @@ static bool8 sub_80D0164(void) sPSSData->field_2200 = AddWindow8Bit(&gUnknown_0857BB1C); if (sPSSData->field_2200 != 0xFF) { - FillWindowPixelBuffer(sPSSData->field_2200, 0); + FillWindowPixelBuffer(sPSSData->field_2200, PIXEL_BUFFER_TRANSPARENT); return TRUE; } } @@ -9911,7 +9911,7 @@ static void PrintItemDescription(void) else description = ItemId_GetDescription(sPSSData->cursorMonItem); - FillWindowPixelBuffer(2, 0x11); + FillWindowPixelBuffer(2, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized5(2, 1, description, 4, 0, 0, NULL, 0, 1); } diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 46bdc9ef36..7985a1964e 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -2631,7 +2631,7 @@ static void ResetWindows(void) for (i = 0; i < 20; i++) { - FillWindowPixelBuffer(i, 0); + FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); } for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++) { @@ -2646,9 +2646,9 @@ static void SummaryScreen_PrintTextOnWindow(u8 windowId, const u8 *string, u8 x, static void sub_81C25E8(void) { - FillWindowPixelBuffer(17, 0); - FillWindowPixelBuffer(18, 0); - FillWindowPixelBuffer(19, 0); + FillWindowPixelBuffer(17, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(18, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(19, PIXEL_BUFFER_TRANSPARENT); if (!pssData->summary.isEgg) sub_81C2628(); else @@ -2899,7 +2899,7 @@ static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 te if (*windowIdPtr == 0xFF) { *windowIdPtr = AddWindow(&template[templateId]); - FillWindowPixelBuffer(*windowIdPtr, 0); + FillWindowPixelBuffer(*windowIdPtr, PIXEL_BUFFER_TRANSPARENT); } return *windowIdPtr; } @@ -2921,7 +2921,7 @@ static void PrintPageSpecificText(u8 pageIndex) for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++) { if (pssData->windowIds[i] != 0xFF) - FillWindowPixelBuffer(pssData->windowIds[i], 0); + FillWindowPixelBuffer(pssData->windowIds[i], PIXEL_BUFFER_TRANSPARENT); } sTextPrinterFunctions[pageIndex](); } @@ -3568,7 +3568,7 @@ static void PrintContestMoveDescription(u8 moveSlot) static void PrintMoveDetails(u16 move) { u8 windowId = AddWindowFromTemplateList(gUnknown_0861CD14, 2); - FillWindowPixelBuffer(windowId, 0); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT); if (move != MOVE_NONE) { if (pssData->currPageIndex == 2) @@ -3642,7 +3642,7 @@ static void sub_81C40A0(u8 moveIndex1, u8 moveIndex2) static void PrintHMMovesCantBeForgotten(void) { u8 windowId = AddWindowFromTemplateList(gUnknown_0861CD14, 2); - FillWindowPixelBuffer(windowId, 0); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT); SummaryScreen_PrintTextOnWindow(windowId, gText_HMMovesCantBeForgotten2, 6, 1, 0, 0); } diff --git a/src/record_mixing.c b/src/record_mixing.c index 1890336858..5b106a1842 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -370,7 +370,7 @@ static void Task_RecordMixing_Main(u8 taskId) { CreateTask(sub_80AF2B4, 10); } - sub_8197434(0, 1); + ClearWindowAndWideBorder(0, 1); DestroyTask(taskId); EnableBothScriptContexts(); } diff --git a/src/region_map.c b/src/region_map.c index ff0c191673..e69889584c 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1707,7 +1707,7 @@ static void sub_8124904(void) } else { - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); } AddTextPrinterParameterized(0, 1, sFlyMap->regionMap.mapSecName, 0, 1, 0, NULL); schedule_bg_copy_tilemap_to_vram(0); @@ -1721,7 +1721,7 @@ static void sub_8124904(void) sub_8198070(1, FALSE); SetWindowBorderStyle(0, FALSE, 0x65, 0x0d); } - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); CopyWindowToVram(0, 2); schedule_bg_copy_tilemap_to_vram(0); gUnknown_03001180 = FALSE; diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 9bdd861674..e3003b22e3 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -387,7 +387,7 @@ void nullsub_89(void) void sub_80124EC(u8 windowId, u8 arg1, u8 stringId) { - FillWindowPixelBuffer(windowId, 0x11); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); switch (arg1 << 8) { case 0x200: @@ -786,10 +786,10 @@ void sub_8012780(u8 taskId) void sub_8012F64(struct UnkStruct_Leader *data) { ClearWindowTilemap(data->field_11); - sub_819746C(data->field_11, FALSE); + ClearWindowAndBorder(data->field_11, FALSE); DestroyListMenuTask(data->listTaskId, 0, 0); ClearWindowTilemap(data->field_10); - sub_819746C(data->listWindowId, FALSE); + ClearWindowAndBorder(data->listWindowId, FALSE); CopyBgTilemapBufferToVram(0); RemoveWindow(data->field_11); RemoveWindow(data->listWindowId); @@ -1254,10 +1254,10 @@ void sub_80134E8(u8 taskId) case 18: case 20: ClearWindowTilemap(data->field_D); - sub_819746C(data->field_D, FALSE); + ClearWindowAndBorder(data->field_D, FALSE); DestroyListMenuTask(data->listTaskId, 0, 0); ClearWindowTilemap(data->field_C); - sub_819746C(data->listWindowId, FALSE); + ClearWindowAndBorder(data->listWindowId, FALSE); CopyBgTilemapBufferToVram(0); RemoveWindow(data->field_D); RemoveWindow(data->listWindowId); @@ -2155,7 +2155,7 @@ void sub_8014F48(u8 taskId) data->listTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); sub_8018784(data->field_D); - FillWindowPixelBuffer(data->field_D, 0x11); + FillWindowPixelBuffer(data->field_D, PIXEL_BUFFER_WHITE); PutWindowTilemap(data->field_D); sub_80125BC(data->field_D); CopyWindowToVram(data->field_D, 2); diff --git a/src/roulette.c b/src/roulette.c index a6a020f396..7826c13531 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -1052,7 +1052,7 @@ static void sub_8140914(u8 taskId) static void sub_8140968(u8 taskId) { - sub_819746C(0, TRUE); + ClearWindowAndBorder(0, TRUE); gTasks[taskId].func = sub_8140BD0; } @@ -3272,7 +3272,7 @@ static void sub_81428E4(u8 taskId) static void sub_8142918(u8 taskId) { - sub_819746C(0, TRUE); + ClearWindowAndBorder(0, TRUE); HideCoinsWindow(); FreeAllWindowBuffers(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); @@ -3283,7 +3283,7 @@ static void sub_8142918(u8 taskId) static void sub_814297C(u8 taskId) { - sub_819746C(0, FALSE); + ClearWindowAndBorder(0, FALSE); HideCoinsWindow(); ScriptContext2_Disable(); DestroyTask(taskId); @@ -3296,7 +3296,7 @@ static void sub_81429A0(u8 taskId) { gSpecialVar_0x8004 = 1; HideCoinsWindow(); - sub_819746C(0, TRUE); + ClearWindowAndBorder(0, TRUE); ScriptContext2_Disable(); DestroyTask(taskId); } diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index c668c1db08..4cd4cd4bfa 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -231,8 +231,8 @@ static void CB2_SaveFailedScreen(void) LoadPalette(gUnknown_0860F074, 0xF0, 0x20); SetWindowBorderStyle(gSaveFailedWindowIds[TEXT_WIN_ID], FALSE, 0x214, 0xE); SetWindowBorderStyle(gSaveFailedWindowIds[CLOCK_WIN_ID], FALSE, 0x214, 0xE); - FillWindowPixelBuffer(gSaveFailedWindowIds[CLOCK_WIN_ID], 0x11); // backwards? - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], 0x11); + FillWindowPixelBuffer(gSaveFailedWindowIds[CLOCK_WIN_ID], PIXEL_BUFFER_WHITE); // backwards? + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_BUFFER_WHITE); CopyWindowToVram(gSaveFailedWindowIds[CLOCK_WIN_ID], 2); // again? CopyWindowToVram(gSaveFailedWindowIds[TEXT_WIN_ID], 1); SaveFailedScreenTextPrint(gText_SaveFailedCheckingBackup, 1, 0); @@ -265,19 +265,19 @@ static void CB2_WipeSave(void) { if (WipeSectors(gDamagedSaveSectors) != FALSE) { - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], 0x11); + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_BUFFER_WHITE); SaveFailedScreenTextPrint(gText_BackupMemoryDamaged, 1, 0); SetMainCallback2(CB2_GameplayCannotBeContinued); return; } - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], 0x11); + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_BUFFER_WHITE); SaveFailedScreenTextPrint(gText_CheckCompleted, 1, 0); HandleSavingData(gSaveFailedType); if (gDamagedSaveSectors != 0) { - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], 0x11); + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_BUFFER_WHITE); SaveFailedScreenTextPrint(gText_SaveFailedCheckingBackup, 1, 0); } @@ -286,12 +286,12 @@ static void CB2_WipeSave(void) if (wipeTries == 3) { - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], 0x11); + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_BUFFER_WHITE); SaveFailedScreenTextPrint(gText_BackupMemoryDamaged, 1, 0); } else { - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], 0x11); + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_BUFFER_WHITE); if (gGameContinueCallback == NULL) SaveFailedScreenTextPrint(gText_SaveCompleteGameCannotContinue, 1, 0); @@ -308,7 +308,7 @@ static void CB2_GameplayCannotBeContinued(void) if (gMain.newKeys & A_BUTTON) { - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], 0x11); + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_BUFFER_WHITE); SaveFailedScreenTextPrint(gText_GamePlayCannotBeContinued, 1, 0); SetVBlankCallback(VBlankCB); SetMainCallback2(CB2_FadeAndReturnToTitleScreen); diff --git a/src/scrcmd.c b/src/scrcmd.c index 837259a7f6..4cc8df82e5 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1519,7 +1519,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) LoadUserWindowBorderGfx(gUnknown_03000F30, 0x214, 0xE0); NewMenuHelpers_DrawStdWindowFrame(gUnknown_03000F30, 0); PutWindowTilemap(gUnknown_03000F30); - FillWindowPixelBuffer(gUnknown_03000F30, 0x11); + FillWindowPixelBuffer(gUnknown_03000F30, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized(gUnknown_03000F30, 6, gStringVar4, xText, yText, 0xFF, 0x0); CopyWindowToVram(gUnknown_03000F30, 3); return FALSE; @@ -2254,7 +2254,7 @@ bool8 ScrCmd_setmonmetlocation(struct ScriptContext *ctx) void sub_809BDB4(void) { - sub_819746C(gUnknown_03000F30, 1); + ClearWindowAndBorder(gUnknown_03000F30, 1); RemoveWindow(gUnknown_03000F30); } diff --git a/src/script_menu.c b/src/script_menu.c index 7180bfc607..98761fe342 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1639,27 +1639,27 @@ static void sub_80E2A94(u8 multichoiceId) switch (multichoiceId) { case 77: - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized2(0, 1, gUnknown_0858BBAC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; case 76: - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized2(0, 1, gUnknown_0858BB9C[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; case 78: - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized2(0, 1, gUnknown_0858BBBC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; case 79: - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized2(0, 1, gUnknown_0858BBCC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; case 75: - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized2(0, 1, gUnknown_0858BBEC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; case 74: - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized2(0, 1, gUnknown_0858BBE0[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; } diff --git a/src/secret_base.c b/src/secret_base.c index adcab9cbc3..74d9ac9b00 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -871,7 +871,7 @@ void sub_80E9C9C(u8 taskId) { data[1] = 0; data[2] = 0; - sub_8197434(0, 0); + ClearWindowAndWideBorder(0, 0); gUnknown_0203A020 = calloc(1, sizeof(struct SecretBaseListMenuBuffer)); data[6] = AddWindow(&gUnknown_0858D06C[0]); game_continue(taskId); @@ -963,7 +963,7 @@ void sub_80E9E90(u8 taskId) PlaySE(SE_SELECT); DestroyListMenuTask(data[5], NULL, NULL); RemoveScrollIndicatorArrowPair(data[8]); - sub_819746C(data[6], 0); + ClearWindowAndBorder(data[6], 0); ClearWindowTilemap(data[6]); RemoveWindow(data[6]); schedule_bg_copy_tilemap_to_vram(0); @@ -1020,8 +1020,8 @@ void sub_80E9FFC(u8 taskId) s16 *data; data = gTasks[taskId].data; - sub_819746C(data[6], FALSE); - sub_819746C(data[7], FALSE); + ClearWindowAndBorder(data[6], FALSE); + ClearWindowAndBorder(data[7], FALSE); ClearWindowTilemap(data[6]); ClearWindowTilemap(data[7]); RemoveWindow(data[7]); @@ -1042,7 +1042,7 @@ void sub_80EA08C(u8 taskId) s16 *data; data = gTasks[taskId].data; - sub_8197434(0, 0); + ClearWindowAndWideBorder(0, 0); DestroyListMenuTask(data[5], &data[2], &data[1]); gSaveBlock1Ptr->secretBases[data[4]].sbr_field_1_6 = 0; game_continue(taskId); @@ -1061,7 +1061,7 @@ void sub_80EA13C(u8 taskId) s16 *data; data = gTasks[taskId].data; - sub_8197434(0, 0); + ClearWindowAndWideBorder(0, 0); DestroyListMenuTask(data[5], &data[2], &data[1]); sub_80E9E00(taskId); gTasks[taskId].func = sub_80E9E90; @@ -1073,7 +1073,7 @@ void sub_80EA18C(u8 taskId) data = gTasks[taskId].data; sub_80E9E44(taskId); - sub_819746C(data[7], 0); + ClearWindowAndBorder(data[7], 0); ClearWindowTilemap(data[7]); RemoveWindow(data[7]); schedule_bg_copy_tilemap_to_vram(0); diff --git a/src/shop.c b/src/shop.c index 8eefd5e97f..9c7c30feda 100755 --- a/src/shop.c +++ b/src/shop.c @@ -545,7 +545,7 @@ static void BuyMenuPrintItemDescriptionAndShowItemIcon(int item, bool8 onInit, s description = gText_QuitShopping; } - FillWindowPixelBuffer(2, 0); + FillWindowPixelBuffer(2, PIXEL_BUFFER_TRANSPARENT); BuyMenuPrint(2, description, 3, 1, 0, 0); } @@ -1144,7 +1144,7 @@ static void BuyMenuPrintItemQuantityAndPrice(u8 taskId) { s16 *data = gTasks[taskId].data; - FillWindowPixelBuffer(4, 0x11); + FillWindowPixelBuffer(4, PIXEL_BUFFER_WHITE); PrintMoneyAmount(4, 38, 1, gShopDataPtr->totalCost, TEXT_SPEED_FF); ConvertIntToDecimalStringN(gStringVar1, tItemCount, 2, 2); StringExpandPlaceholders(gStringVar4, gText_xVar1); diff --git a/src/slot_machine.c b/src/slot_machine.c index 0871506cd0..bf26de437a 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -1026,7 +1026,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - sub_8197434(0, TRUE); + ClearWindowAndWideBorder(0, TRUE); sSlotMachine->state = 5; } return FALSE; @@ -1269,7 +1269,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) s8 input = Menu_ProcessInputNoWrapClearOnChoose(); if (input == 0) { - sub_8197434(0, TRUE); + ClearWindowAndWideBorder(0, TRUE); sub_8103D8C(0); sub_8103D8C(1); sub_8103D8C(2); @@ -1278,7 +1278,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) } else if (input == 1 || input == -1) { - sub_8197434(0, TRUE); + ClearWindowAndWideBorder(0, TRUE); sSlotMachine->state = 5; } return FALSE; @@ -1297,7 +1297,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - sub_8197434(0, TRUE); + ClearWindowAndWideBorder(0, TRUE); sSlotMachine->state = 5; } return FALSE; @@ -1316,7 +1316,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - sub_8197434(0, TRUE); + ClearWindowAndWideBorder(0, TRUE); sSlotMachine->state = 27; } return FALSE; @@ -3036,7 +3036,7 @@ s16 sub_8102D5C(s16 a0) sub_81065DC(); AddWindow(&gUnknown_085A7444); PutWindowTilemap(1); - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); task->data[0]++; } @@ -3052,7 +3052,7 @@ s16 sub_8102D5C(s16 a0) { if (gMain.newKeys & (B_BUTTON | SELECT_BUTTON)) { - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); ClearWindowTilemap(1); CopyWindowToVram(1, 1); RemoveWindow(1); diff --git a/src/start_menu.c b/src/start_menu.c index d5eec76d23..4231db7cc7 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -897,7 +897,7 @@ static void SaveGameTask(u8 taskId) static void sub_80A0014(void) { - sub_8197434(0, TRUE); + ClearWindowAndWideBorder(0, TRUE); } static void HideSaveInfoWindow(void) @@ -943,7 +943,7 @@ static bool8 SaveErrorTimer(void) static u8 SaveConfirmSaveCallback(void) { - sub_819746C(GetStartMenuWindowId(), FALSE); + ClearWindowAndBorder(GetStartMenuWindowId(), FALSE); RemoveStartMenuWindow(); ShowSaveInfoWindow(); @@ -1135,7 +1135,7 @@ static void InitBattlePyramidRetire(void) static u8 BattlePyramidConfirmRetireCallback(void) { - sub_819746C(GetStartMenuWindowId(), FALSE); + ClearWindowAndBorder(GetStartMenuWindowId(), FALSE); RemoveStartMenuWindow(); ShowSaveMessage(gText_BattlePyramidConfirmRetire, BattlePyramidRetireYesNoCallback); @@ -1232,7 +1232,7 @@ static void sub_80A0550(u8 taskId) switch (*step) { case 0: - FillWindowPixelBuffer(0, 17); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized2(0, 1, gText_SavingDontTurnOffPower, @@ -1364,7 +1364,7 @@ static void ShowSaveInfoWindow(void) static void RemoveSaveInfoWindow(void) { - sub_819746C(sSaveInfoWindowId, FALSE); + ClearWindowAndBorder(sSaveInfoWindowId, FALSE); RemoveWindow(sSaveInfoWindowId); } @@ -1386,7 +1386,7 @@ void sub_80A08CC(void) // Referenced in data/specials.inc and data/scripts/maps/ static void HideStartMenuWindow(void) { - sub_819746C(GetStartMenuWindowId(), TRUE); + ClearWindowAndBorder(GetStartMenuWindowId(), TRUE); RemoveStartMenuWindow(); ScriptUnfreezeEventObjects(); ScriptContext2_Disable(); diff --git a/src/starter_choose.c b/src/starter_choose.c index 2d4a1b1e1c..f4067b3821 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -523,7 +523,7 @@ static void Task_StarterChoose3(u8 taskId) static void Task_StarterChoose4(u8 taskId) { PlayCry1(GetStarterPokemon(gTasks[taskId].tStarterSelection), 0); - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized(0, 1, gText_ConfirmStarterChoice, 0, 1, 0, NULL); schedule_bg_copy_tilemap_to_vram(0); CreateYesNoMenu(&gUnknown_085B1DDC, 0x2A8, 0xD, 0); @@ -579,7 +579,7 @@ static void CreateStarterPokemonLabel(u8 selection) winTemplate.tilemapTop = gStarterChoose_LabelCoords[selection][1]; sStarterChooseWindowId = AddWindow(&winTemplate); - FillWindowPixelBuffer(sStarterChooseWindowId, 0); + FillWindowPixelBuffer(sStarterChooseWindowId, PIXEL_BUFFER_TRANSPARENT); width = GetStringCenterAlignXOffset(7, text, 0x68); AddTextPrinterParameterized3(sStarterChooseWindowId, 7, width, 1, gUnknown_085B1E0C, 0, text); @@ -600,7 +600,7 @@ static void CreateStarterPokemonLabel(u8 selection) static void sub_8134604(void) { - FillWindowPixelBuffer(sStarterChooseWindowId, 0); + FillWindowPixelBuffer(sStarterChooseWindowId, PIXEL_BUFFER_TRANSPARENT); ClearWindowTilemap(sStarterChooseWindowId); RemoveWindow(sStarterChooseWindowId); sStarterChooseWindowId = 0xFF; diff --git a/src/trade.c b/src/trade.c index 70b57fbc77..148ad2e265 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1418,7 +1418,7 @@ static void sub_80772A4(void) for (i = 0; i < 18; i++) { ClearWindowTilemap(i); - FillWindowPixelBuffer(i, 0); + FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); } FillBgTilemapBufferRect(0, 0, 0, 0, 30, 20, 15); @@ -2461,7 +2461,7 @@ static void sub_8078DBC(void) if (gUnknown_0203229C->tradeMenuCursorPosition < 6) { sub_8098858(1, 1, 14); - FillWindowPixelBuffer(1, 0x11); + FillWindowPixelBuffer(1, PIXEL_BUFFER_WHITE); PrintMenuTable(1, 2, gUnknown_0832DEAC); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(1, 2, 0); PutWindowTilemap(1); @@ -2724,7 +2724,7 @@ static void sub_8079408(void) for (i = 0; i < 4; i++) { - FillWindowPixelBuffer(i + 14, 0); + FillWindowPixelBuffer(i + 14, PIXEL_BUFFER_TRANSPARENT); rbox_fill_rectangle(i + 14); } @@ -3256,7 +3256,7 @@ static void sub_807A0C4(void) static void sub_807A19C(u8 a0) { - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); AddTextPrinterParameterized(0, 1, gUnknown_0832DEBC[a0], 0, 1, TEXT_SPEED_FF, NULL); sub_8098858(0, 20, 12); PutWindowTilemap(0); @@ -4185,7 +4185,7 @@ void sub_807B140(void) void sub_807B154(void) { - FillWindowPixelBuffer(0, 0xFF); + FillWindowPixelBuffer(0, PIXEL_BUFFER_UNKNOWN); PutWindowTilemap(0); CopyWindowToVram(0, 3); } @@ -4263,7 +4263,7 @@ static void sub_807B270(void) break; case 8: sub_807ACFC(1, 1); - FillWindowPixelBuffer(0, 0xFF); + FillWindowPixelBuffer(0, PIXEL_BUFFER_UNKNOWN); PutWindowTilemap(0); CopyWindowToVram(0, 3); gMain.state++; @@ -4654,7 +4654,7 @@ static bool8 sub_807BBEC(void) if (!gPaletteFade.active) { sub_807B62C(4); - FillWindowPixelBuffer(0, 0xFF); + FillWindowPixelBuffer(0, PIXEL_BUFFER_UNKNOWN); CopyWindowToVram(0, 3); gUnknown_020322A0->state++; } @@ -5146,7 +5146,7 @@ static bool8 sub_807CFC8(void) if (!gPaletteFade.active) { sub_807B62C(4); - FillWindowPixelBuffer(0, 0xFF); + FillWindowPixelBuffer(0, PIXEL_BUFFER_UNKNOWN); CopyWindowToVram(0, 3); gUnknown_020322A0->state++; } @@ -6085,7 +6085,7 @@ void sub_807F19C(void) void sub_807F1A8(u8 windowId, const u8 *str, u8 speed) { - FillWindowPixelBuffer(windowId, 0xFF); + FillWindowPixelBuffer(windowId, PIXEL_BUFFER_UNKNOWN); gUnknown_020322A0->unk_F6[0] = 15; gUnknown_020322A0->unk_F6[1] = 1; gUnknown_020322A0->unk_F6[2] = 6; diff --git a/src/trainer_card.c b/src/trainer_card.c index 49a62284f9..d6d3b31527 100755 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -350,7 +350,7 @@ static void sub_80C2760(u8 taskId) case 0: if (!IsDma3ManagerBusyWithBgCopy()) { - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); sData->var_0++; } break; @@ -363,7 +363,7 @@ static void sub_80C2760(u8 taskId) sData->var_0++; break; case 3: - FillWindowPixelBuffer(2, 0); + FillWindowPixelBuffer(2, PIXEL_BUFFER_TRANSPARENT); sub_80C4FF0(); sub_80C438C(2); sData->var_0++; @@ -1634,7 +1634,7 @@ static bool8 sub_80C4B08(struct Task* task) switch (sData->var_4) { case 0: - FillWindowPixelBuffer(1, 0); + FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); FillBgTilemapBufferRect_Palette0(3, 0, 0, 0, 0x20, 0x20); break; case 1: @@ -1659,7 +1659,7 @@ static bool8 sub_80C4B08(struct Task* task) if (!sData->var_8) sub_80C474C(); else - FillWindowPixelBuffer(2, 0); + FillWindowPixelBuffer(2, PIXEL_BUFFER_TRANSPARENT); break; case 4: if (sData->var_8) diff --git a/src/trainer_hill.c b/src/trainer_hill.c index efe11b0c7d..5f351554e7 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -609,7 +609,7 @@ void PrintOnTrainerHillRecordsWindow(void) u32 total, minutes, secondsWhole, secondsFraction; SetUpDataStruct(); - FillWindowPixelBuffer(0, 0); + FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); x = GetStringCenterAlignXOffset(1, gText_TimeBoard, 0xD0); AddTextPrinterParameterized3(0, 1, x, 2, sRecordWinColors, TEXT_SPEED_FF, gText_TimeBoard); diff --git a/src/window.c b/src/window.c index 3da5291789..1daf4b5fcb 100644 --- a/src/window.c +++ b/src/window.c @@ -6,7 +6,7 @@ u32 filler_03002F58; u32 filler_03002F5C; -u8 gUnknown_03002F60; +u8 gTransparentTileNumber; u32 filler_03002F64; void *gUnknown_03002F70[4]; extern u32 gUnneededFireRedVariable; @@ -106,7 +106,7 @@ bool16 InitWindows(const struct WindowTemplate *templates) } } - gUnknown_03002F60 = 0; + gTransparentTileNumber = TRANSPARENT_TILE_NUMBER; return TRUE; } @@ -359,13 +359,14 @@ void PutWindowRectTilemapOverridePalette(u8 windowId, u8 x, u8 y, u8 width, u8 h } } +// Fills a window with transparent tiles. void ClearWindowTilemap(u8 windowId) { struct Window windowLocal = gWindows[windowId]; FillBgTilemapBufferRect( windowLocal.window.bg, - gUnknown_03002F60, + gTransparentTileNumber, windowLocal.window.tilemapLeft, windowLocal.window.tilemapTop, windowLocal.window.width, @@ -451,6 +452,7 @@ void CopyToWindowPixelBuffer(u8 windowId, const void *src, u16 size, u16 tileOff LZ77UnCompWram(src, gWindows[windowId].tileData + (0x20 * tileOffset)); } +// Sets all pixels within the window to the fillValue color. void FillWindowPixelBuffer(u8 windowId, u8 fillValue) { int fillSize = gWindows[windowId].window.width * gWindows[windowId].window.height; From 449fb25f2372c8d51fc156d0eeeffa4023ec38b8 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 12 Feb 2019 00:40:34 -0600 Subject: [PATCH 039/217] Clear up misnamed time-based flags and functions --- asm/macros/event.inc | 2 +- data/event_scripts.s | 2 +- data/maps/LilycoveCity/scripts.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc | 4 ++-- data/maps/PacifidlogTown_House2/scripts.inc | 2 +- data/maps/Route104_PrettyPetalFlowerShop/scripts.inc | 2 +- data/maps/Route111/scripts.inc | 2 +- data/maps/Route114/scripts.inc | 2 +- data/maps/Route120/scripts.inc | 2 +- data/maps/Route123_BerryMastersHouse/scripts.inc | 4 ++-- data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc | 2 +- data/maps/SootopolisCity/scripts.inc | 2 +- data/script_cmd_table.inc | 2 +- data/scripts/pokeblocks.inc | 4 ++-- include/event_data.h | 2 +- src/clock.c | 2 +- src/event_data.c | 7 +++---- src/scrcmd.c | 2 +- 19 files changed, 24 insertions(+), 25 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 091c32a2a9..fa0b3fa065 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -313,7 +313,7 @@ .endm @ Runs time based events. In FireRed, this command is a nop. - .macro dodailyevents + .macro dotimebasedevents .byte 0x2d .endm diff --git a/data/event_scripts.s b/data/event_scripts.s index fbee3987c7..c1b71e5d4b 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1748,7 +1748,7 @@ RustboroCity_Gym_EventScript_271E84:: @ 8271E84 DewfordTown_EventScript_271E8B:: @ 8271E8B DewfordTown_Hall_EventScript_271E8B:: @ 8271E8B - dodailyevents + dotimebasedevents setvar VAR_0x8004, 0 special BufferTrendyPhraseString return diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index c1cec509f7..cfa6b38675 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -33,7 +33,7 @@ LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8 lock faceplayer - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_LILYCOVE_RECEIVED_BERRY, LilycoveCity_EventScript_1E2C18 msgbox LilycoveCity_Text_2A7244, MSGBOX_DEFAULT random 10 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index 2f8fcda3a7..ffa2244f4c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F693:: @ 821F693 LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C lock faceplayer - dodailyevents + dotimebasedevents compare VAR_POKELOT_PRIZE, 0 goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_21F7F7 goto_if_set FLAG_DAILY_PICKED_LOTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_21F78D diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index e875be96fa..6d9022065e 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -52,7 +52,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 faceplayer compare VAR_0x405D, 2 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223024 - dodailyevents + dotimebasedevents specialvar VAR_RESULT, GetWeekCount buffernumberstring 0, VAR_RESULT compare VAR_RESULT, 0 @@ -74,7 +74,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22301B:: @ 822301B return MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 - dodailyevents + dotimebasedevents specialvar VAR_RESULT, GetWeekCount buffernumberstring 0, VAR_RESULT compare VAR_RESULT, 0 diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index b3078fa2d2..c7c04c0bd8 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -4,7 +4,7 @@ PacifidlogTown_House2_MapScripts:: @ 8203791 PacifidlogTown_House2_EventScript_203792:: @ 8203792 lock faceplayer - dodailyevents + dotimebasedevents call PacifidlogTown_House2_EventScript_2037DE goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_20387E call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_2037F8 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index e9af43d730..7f5e352876 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -84,7 +84,7 @@ Route104_PrettyPetalFlowerShop_EventScript_22A421:: @ 822A421 Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442 lock faceplayer - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY, Route104_PrettyPetalFlowerShop_EventScript_22A482 msgbox Route104_PrettyPetalFlowerShop_Text_2A7A98, MSGBOX_DEFAULT random 8 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 75de7dce74..74ee42c646 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -159,7 +159,7 @@ Route111_Movement_1F0EB1:: @ 81F0EB1 Route111_EventScript_1F0EB9:: @ 81F0EB9 lock faceplayer - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_ROUTE_111_RECEIVED_BERRY, Route111_EventScript_1F0EF4 msgbox Route111_Text_2A6EBD, MSGBOX_DEFAULT giveitem_std ITEM_RAZZ_BERRY diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 8f0c1c6ace..cccc8de5fa 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -27,7 +27,7 @@ Route114_MapScript2_1F2578: @ 81F2578 Route114_EventScript_1F2582:: @ 81F2582 lock faceplayer - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_ROUTE_114_RECEIVED_BERRY, Route114_EventScript_1F25C7 msgbox Route114_Text_2A6FCB, MSGBOX_DEFAULT random 5 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index cd864e1dc5..a66026283e 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -98,7 +98,7 @@ Route120_EventScript_1F5523:: @ 81F5523 Route120_EventScript_1F5527:: @ 81F5527 lock faceplayer - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_ROUTE_120_RECEIVED_BERRY, Route120_EventScript_1F5625 msgbox Route120_Text_2A70C7, MSGBOX_YESNO compare VAR_RESULT, 1 diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index a3ae5df939..a7175e6981 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -9,7 +9,7 @@ Route123_BerryMastersHouse_MapScript1_26F841: @ 826F841 Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 lock faceplayer - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY, Route123_BerryMastersHouse_EventScript_26F8B6 msgbox Route123_BerryMastersHouse_Text_2A7386, MSGBOX_DEFAULT random 10 @@ -38,7 +38,7 @@ Route123_BerryMastersHouse_EventScript_26F8B6:: @ 826F8B6 Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 lock faceplayer - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_26FA6F msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT setvar VAR_0x8004, 13 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index 6e0f4eddb2..2874da9633 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -18,7 +18,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD5:: @ 8236DD5 ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 lock faceplayer - dodailyevents + dotimebasedevents call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_236ED9 checkitem ITEM_SHOAL_SALT, 4 compare VAR_RESULT, 0 diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 5e212ddfe4..9d554f8eb1 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -742,7 +742,7 @@ SootopolisCity_EventScript_1E5F10:: @ 81E5F10 end SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B - dodailyevents + dotimebasedevents special GetPlayerBigGuyGirlString goto_if_set FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY, SootopolisCity_EventScript_1E5FBB msgbox SootopolisCity_Text_2A7BB0, MSGBOX_DEFAULT diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 07b22dda2e..39864b2a85 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -45,7 +45,7 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_clearflag .4byte ScrCmd_checkflag .4byte ScrCmd_initclock - .4byte ScrCmd_dodailyevents + .4byte ScrCmd_dotimebasedevents .4byte ScrCmd_gettime .4byte ScrCmd_playse .4byte ScrCmd_waitse diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 05b468e236..c2a580a617 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -264,7 +264,7 @@ EventScript_Pblock1_No: @ 8293C70 EventScript_Pblock1_NoBerries: @ 8293C7A msgbox Text_Pblock1_NoBerries, MSGBOX_DEFAULT - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_293C92 goto LilycoveCity_ContestLobby_EventScript_293C9C end @@ -551,7 +551,7 @@ LilycoveCity_ContestLobby_EventScript_293FF8: @ 8293FF8 specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 goto_if_eq LilycoveCity_ContestLobby_EventScript_294028 - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_294028 goto LilycoveCity_ContestLobby_EventScript_294032 end diff --git a/include/event_data.h b/include/event_data.h index e09b32d441..3b8e2701f3 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -6,7 +6,7 @@ void InitEventData(void); void ClearTempFieldEventData(void); -void ClearUpperFlags(void); +void ClearDailyFlags(void); void DisableNationalPokedex(void); void EnableNationalPokedex(void); bool32 IsNationalPokedexEnabled(void); diff --git a/src/clock.c b/src/clock.c index d52fde22e6..1e7c5f83e9 100644 --- a/src/clock.c +++ b/src/clock.c @@ -41,7 +41,7 @@ static void UpdatePerDay(struct Time *localTime) if (*days != localTime->days && *days <= localTime->days) { daysSince = localTime->days - *days; - ClearUpperFlags(); + ClearDailyFlags(); UpdateDewfordTrendPerDay(daysSince); UpdateTVShowsPerDay(daysSince); UpdateWeatherPerDay(daysSince); diff --git a/src/event_data.c b/src/event_data.c index df289c538d..a9da142e52 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -3,7 +3,7 @@ #include "pokedex.h" #define TEMP_FLAGS_SIZE 0x4 -#define TEMP_UPPER_FLAGS_SIZE 0x8 +#define DAILY_FLAGS_SIZE 0x8 #define TEMP_VARS_SIZE 0x20 EWRAM_DATA u16 gSpecialVar_0x8000 = 0; @@ -48,10 +48,9 @@ void ClearTempFieldEventData(void) FlagClear(FLAG_NURSE_UNION_ROOM_REMINDER); } -// Probably had different flag splits at one point. -void ClearUpperFlags(void) +void ClearDailyFlags(void) { - memset(gSaveBlock1Ptr->flags + 0x124, 0, TEMP_UPPER_FLAGS_SIZE); + memset(gSaveBlock1Ptr->flags + 0x124, 0, DAILY_FLAGS_SIZE); } void DisableNationalPokedex(void) diff --git a/src/scrcmd.c b/src/scrcmd.c index 837259a7f6..51d96ff2ef 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -690,7 +690,7 @@ bool8 ScrCmd_initclock(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_dodailyevents(struct ScriptContext *ctx) +bool8 ScrCmd_dotimebasedevents(struct ScriptContext *ctx) { DoTimeBasedEvents(); return FALSE; From e7d02681436900d901d4667e525d5d5a99ad2ba1 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 13 Feb 2019 21:41:28 -0500 Subject: [PATCH 040/217] Fix spelling of Rayquaza --- src/intro.c | 64 ++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/intro.c b/src/intro.c index 728811e825..4f76faf870 100644 --- a/src/intro.c +++ b/src/intro.c @@ -79,10 +79,10 @@ * Task_IntroLoadClouds3 * Task_IntroCloudsScene * Task_IntroLoadRayquazaLightningScene - * Task_IntroRaquazaLightningScene - * Task_IntroLoadRaquazaGlowScene - * Task_IntroRaquazaGlowScene_0 - * - Runs concurrently with Task_IntroRaquazaGlowScene_1 + * Task_IntroRayquazaLightningScene + * Task_IntroLoadRayquazaGlowScene + * Task_IntroRayquazaGlowScene_0 + * - Runs concurrently with Task_IntroRayquazaGlowScene_1 * Task_EndIntroMovie * MainCB2_EndIntro * - Advances to CB2_InitTitleScreen @@ -389,7 +389,7 @@ static const union AnimCmd *const gUnknown_085E4C40[] = gUnknown_085E4C28, gUnknown_085E4C34, }; -static void SpriteCB_IntroRaquazaLightning(struct Sprite *sprite); +static void SpriteCB_IntroRayquazaLightning(struct Sprite *sprite); static const struct SpriteTemplate gIntroLightningSprite = { .tileTag = 1503, @@ -398,7 +398,7 @@ static const struct SpriteTemplate gIntroLightningSprite = .anims = gUnknown_085E4C40, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCB_IntroRaquazaLightning, + .callback = SpriteCB_IntroRayquazaLightning, }; static const s16 gIntroGroudonRockData[][3] = { @@ -875,8 +875,8 @@ static const union AnimCmd *const gUnknown_085E502C[] = { gUnknown_085E5024, }; -static void SpriteCB_IntroRaquazaHyperbeam(struct Sprite *sprite); -static const struct SpriteTemplate gIntroRaquazaHyperbeamSprite = +static void SpriteCB_IntroRayquazaHyperbeam(struct Sprite *sprite); +static const struct SpriteTemplate gIntroRayquazaHyperbeamSprite = { .tileTag = 2003, .paletteTag = 2003, @@ -884,14 +884,14 @@ static const struct SpriteTemplate gIntroRaquazaHyperbeamSprite = .anims = gUnknown_085E502C, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCB_IntroRaquazaHyperbeam, + .callback = SpriteCB_IntroRayquazaHyperbeam, }; -static const struct CompressedSpriteSheet gIntroRaquazaGlowSpriteSheet[] = +static const struct CompressedSpriteSheet gIntroRayquazaGlowSpriteSheet[] = { {gIntro3MiscTiles, 0xA00, 2003}, {NULL}, }; -static const struct SpritePalette gIntroRaquazaGlowPalette[] = +static const struct SpritePalette gIntroRayquazaGlowPalette[] = { {gIntro3Misc1Palette, 2003}, {NULL}, @@ -928,16 +928,16 @@ static void Task_IntroLoadClouds1(u8); static void Task_IntroLoadClouds2(u8); static void Task_IntroLoadClouds3(u8); static void Task_IntroCloudScene(u8); -static void Task_IntroLoadRaquazaLightningScene(u8); -static void Task_IntroRaquazaLightningScene(u8); -static void Task_IntroLoadRaquazaGlowScene(u8); -static void Task_IntroRaquazaGlowScene_0(u8); +static void Task_IntroLoadRayquazaLightningScene(u8); +static void Task_IntroRayquazaLightningScene(u8); +static void Task_IntroLoadRayquazaGlowScene(u8); +static void Task_IntroRayquazaGlowScene_0(u8); static void Task_EndIntroMovie(u8); static void CreateGroudonRockSprites(u8); static void SpriteCB_IntroGroudonRocks(struct Sprite *); static void CreateKyogreBubbleSprites_0(u8); static void CreateKyogreBubbleSprites_1(void); -static void Task_IntroRaquazaGlowScene_1(u8); +static void Task_IntroRayquazaGlowScene_1(u8); static void sub_816F46C(struct Sprite *); static void sub_816F5B4(struct Sprite *); static void sub_816F660(struct Sprite *); @@ -2133,12 +2133,12 @@ static void Task_IntroCloudScene(u8 taskId) if (data[6] != 0) data[6] -= 0x80; else if (!gPaletteFade.active) - gTasks[taskId].func = Task_IntroLoadRaquazaLightningScene; + gTasks[taskId].func = Task_IntroLoadRayquazaLightningScene; break; } } -static void Task_IntroLoadRaquazaLightningScene(u8 taskId) +static void Task_IntroLoadRayquazaLightningScene(u8 taskId) { LZDecompressVram(gIntro3RayquazaTilemap, (void *)(VRAM + 0xE000)); LZDecompressVram(gIntro3Clouds4Tilemap, (void *)(VRAM + 0xC000)); @@ -2150,7 +2150,7 @@ static void Task_IntroLoadRaquazaLightningScene(u8 taskId) | DISPCNT_BG2_ON | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON); - gTasks[taskId].func = Task_IntroRaquazaLightningScene; + gTasks[taskId].func = Task_IntroRayquazaLightningScene; gTasks[taskId].data[0] = 0; gTasks[taskId].data[6] = 1; gTasks[taskId].data[7] = 0; @@ -2158,7 +2158,7 @@ static void Task_IntroLoadRaquazaLightningScene(u8 taskId) LoadSpritePalettes(gIntroRayquazaLightningPalette); } -static void Task_IntroRaquazaLightningScene(u8 taskId) +static void Task_IntroRayquazaLightningScene(u8 taskId) { s16 *data = gTasks[taskId].data; u8 spriteId; @@ -2191,12 +2191,12 @@ static void Task_IntroRaquazaLightningScene(u8 taskId) break; case 2: if (--data[6] == 0) - gTasks[taskId].func = Task_IntroLoadRaquazaGlowScene; + gTasks[taskId].func = Task_IntroLoadRayquazaGlowScene; break; } } -static void SpriteCB_IntroRaquazaLightning(struct Sprite *sprite) +static void SpriteCB_IntroRayquazaLightning(struct Sprite *sprite) { if (sprite->animEnded) sprite->invisible = TRUE; @@ -2227,30 +2227,30 @@ static void SpriteCB_IntroRaquazaLightning(struct Sprite *sprite) } } -static void Task_IntroLoadRaquazaGlowScene(u8 taskId) +static void Task_IntroLoadRayquazaGlowScene(u8 taskId) { u8 newTaskId; - LoadCompressedSpriteSheet(gIntroRaquazaGlowSpriteSheet); - LoadSpritePalettes(gIntroRaquazaGlowPalette); + LoadCompressedSpriteSheet(gIntroRayquazaGlowSpriteSheet); + LoadSpritePalettes(gIntroRayquazaGlowPalette); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON); - gTasks[taskId].func = Task_IntroRaquazaGlowScene_0; + gTasks[taskId].func = Task_IntroRayquazaGlowScene_0; BeginNormalPaletteFade(0x0000FFDE, 0, 16, 0, RGB(9, 10, 10)); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 0xA8; gTasks[taskId].data[2] = -0x10; gTasks[taskId].data[3] = -0x88; gTasks[taskId].data[4] = -0x10; - newTaskId = CreateTask(Task_IntroRaquazaGlowScene_1, 0); + newTaskId = CreateTask(Task_IntroRayquazaGlowScene_1, 0); gTasks[newTaskId].data[4] = taskId; } -static void Task_IntroRaquazaGlowScene_0(u8 taskId) +static void Task_IntroRayquazaGlowScene_0(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -2303,9 +2303,9 @@ static void Task_EndIntroMovie(u8 taskId) SetMainCallback2(MainCB2_EndIntro); } -static void Task_IntroRaquazaGlowScene_1(u8 taskId) +static void Task_IntroRayquazaGlowScene_1(u8 taskId) { - // Note: data[4] contains the taskId of Task_IntroRaquazaGlowScene_0 + // Note: data[4] contains the taskId of Task_IntroRayquazaGlowScene_0 u8 spriteId; s16 *data = gTasks[taskId].data; data[2]++; @@ -2354,7 +2354,7 @@ static void Task_IntroRaquazaGlowScene_1(u8 taskId) } if (data[1] == 6) { - spriteId = CreateSprite(&gIntroRaquazaHyperbeamSprite, 120, 88, 15); + spriteId = CreateSprite(&gIntroRayquazaHyperbeamSprite, 120, 88, 15); PlaySE(SE_OP_BASYU); gSprites[spriteId].invisible = TRUE; gSprites[spriteId].data[3] = data[4]; @@ -3043,7 +3043,7 @@ static void sub_816FEDC(struct Sprite *sprite) } } -static void SpriteCB_IntroRaquazaHyperbeam(struct Sprite *sprite) +static void SpriteCB_IntroRayquazaHyperbeam(struct Sprite *sprite) { u16 foo; From 05d02e804ec064cae9d7af42d204d481afdf40ff Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 13 Feb 2019 21:46:11 -0600 Subject: [PATCH 041/217] Fix C comment consumption logic --- tools/scaninc/c_file.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/scaninc/c_file.cpp b/tools/scaninc/c_file.cpp index d470f959d4..595f366cbe 100644 --- a/tools/scaninc/c_file.cpp +++ b/tools/scaninc/c_file.cpp @@ -134,7 +134,7 @@ bool CFile::ConsumeComment() if (m_buffer[m_pos] == '/' && m_buffer[m_pos + 1] == '*') { m_pos += 2; - while (m_buffer[m_pos] != '*' && m_buffer[m_pos + 1] != '/') + while (m_buffer[m_pos] != '*' || m_buffer[m_pos + 1] != '/') { if (m_buffer[m_pos] == 0) return false; From cb5704453116c0a4277d15e298b8cfb7b44deeaa Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 14 Feb 2019 13:05:49 +0100 Subject: [PATCH 042/217] Fix two battle scripting macros --- asm/macros/battle_script.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 6b0e285b68..6370ef5697 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1341,15 +1341,15 @@ .endm .macro sethword dst:req, value:req - setbyte \dst, \value & 0xFF - setbyte \dst + 1, (\value >> 8) & 0xFF + setbyte \dst, (\value) & 0xFF + setbyte \dst + 1, ((\value) >> 8) & 0xFF .endm .macro setword dst:req, value:req - setbyte \dst, \value & 0xFF - setbyte \dst + 1, (\value >> 8) & 0xFF - setbyte \dst + 2, (\value >> 16) & 0xFF - setbyte \dst + 3, (\value >> 24) & 0xFF + setbyte \dst, (\value) & 0xFF + setbyte \dst + 1, ((\value) >> 8) & 0xFF + setbyte \dst + 2, ((\value) >> 16) & 0xFF + setbyte \dst + 3, ((\value) >> 24) & 0xFF .endm .macro copybyte dst:req, src:req From 0a3912c95d4eaa5c8869a38a92c8873e9752e53a Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 15 Feb 2019 01:28:28 -0500 Subject: [PATCH 043/217] Add comments explaining asm in pokedex.c I added comments to each of the asm functions explaining why they won't match with the C. I also got one of the functions much closer to matching. --- src/pokedex.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/pokedex.c b/src/pokedex.c index c47ada5b8b..ac38bdc98c 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -3539,8 +3539,9 @@ void sub_80BFCF4(u16 a) { CopyToBgTilemapBuffer(1, gPokedexTilemap_ScreenSelectBar2, 0, 0); } - #ifdef NONMATCHING +// This doesn't match because gcc flips the naming of the r3 and r4 +// registers. void sub_80BFD0C(u8 a, u16 unused) { u8 i; @@ -3629,6 +3630,8 @@ _080BFD3E:\n\ #endif #ifdef NONMATCHING +// This doesn't match because gcc flips the naming of the r3 and r4 +// registers. void sub_80BFD7C(u8 a, u16 b) { u8 i; @@ -3959,6 +3962,8 @@ void sub_80C0354(u16 height, u8 left, u8 top) } #ifdef NONMATCHING +// This doesn't match because gcc manages to avoid using the stack +// to store local variables. void sub_80C0460(u16 weight, u8 left, u8 top) { u8 buffer[16]; @@ -5205,18 +5210,24 @@ void sub_80C1D70(u8 taskId) } #ifdef NONMATCHING +// This doesn't match because gcc flips the naming of the r7 and r6 +// registers. It also does one of the additions backwards. void sub_80C1D98(u8 a, u8 b, u8 c, u8 d) { u16 i; u16* ptr = GetBgTilemapBuffer(3); + u16* temp; for (i = 0; i < d; i++) { - ptr[b + i + (c << 6)] %= 0x1000; - ptr[b + i + (c << 6)] |= a * 4096; + // This addition is supposed to be done in this order; however, + // gcc will always do it in ptr + (c << 5) order. + temp = (c << 5) + ptr; + temp[b + i] %= 0x1000; + temp[b + i] |= a * 4096; - ptr[b + i + (c << 6) + 32] %= 0x1000; - ptr[b + i + (c << 6) + 32] |= a * 4096; + temp[b + i + 32] %= 0x1000; + temp[b + i + 32] |= a * 4096; } } #else From 986d3d8b2fc03bc3e384da15e5d1be4af8507e7b Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 15 Feb 2019 03:40:57 -0500 Subject: [PATCH 044/217] Finish and polish new_game.c Only one function is left undocumented. I tried to go into the assembly to at least name it, but it clears fields in the save block that aren't even documented yet. --- asm/easy_chat.s | 10 ++++++- asm/rom_8011DC0.s | 27 ++++++++++------- common_syms/pokedex.txt | 2 +- data/event_scripts.s | 2 +- include/field_specials.h | 2 ++ include/global.h | 8 ++--- include/item_menu.h | 2 ++ include/link.h | 2 +- include/link_rfu.h | 3 +- include/main.h | 2 ++ include/player_pc.h | 2 ++ include/pokedex.h | 3 +- include/secret_base.h | 2 ++ include/tv.h | 1 + src/easy_chat.c | 2 +- src/event_data.c | 4 +-- src/frontier_util.c | 12 ++++---- src/link_rfu.c | 63 ++++++++++++++++++++++++---------------- src/new_game.c | 44 ++++++++++++---------------- src/pokedex.c | 7 +++-- src/record_mixing.c | 2 +- src/rom_8011DC0.c | 6 ++-- src/save_location.c | 14 ++++----- 23 files changed, 127 insertions(+), 95 deletions(-) diff --git a/asm/easy_chat.s b/asm/easy_chat.s index f6f09a87e4..7a46f12c5e 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -9869,10 +9869,18 @@ _0811F8AE: .pool thumb_func_end InitializeEasyChatWordArray +@void sub_811F8BC() { +@ s16* v; +@ s16* ptr; +@ v = GetSaveBlock1Field3564(); +@ for (ptr = v + 3; ptr >= v; ptr--) { +@ *ptr = -1; +@ } +@} thumb_func_start sub_811F8BC sub_811F8BC: @ 811F8BC push {lr} - bl sub_801B058 + bl GetSaveBlock1Field3564 ldr r1, =0x0000ffff adds r2, r1, 0 adds r1, r0, 0x6 diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index af7fdbf3df..9034d569d1 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -8315,6 +8315,11 @@ _0801AFC2: .pool thumb_func_end sub_801AC54 +@void sub_801AFD8() { +@ CpuFill32(0, &gSaveBlock1Ptr->field_322C, 219); +@ sub_801B180(); +@ sub_811F8BC(); +@} thumb_func_start sub_801AFD8 sub_801AFD8: @ 801AFD8 push {lr} @@ -8367,25 +8372,25 @@ sav1_get_mevent_buffer_2: @ 801B034 .pool thumb_func_end sav1_get_mevent_buffer_2 - thumb_func_start sub_801B044 -sub_801B044: @ 801B044 + thumb_func_start GetSaveBlock1Field356C +GetSaveBlock1Field356C: @ 801B044 ldr r0, =gSaveBlock1Ptr ldr r0, [r0] ldr r1, =0x0000356c adds r0, r1 bx lr .pool - thumb_func_end sub_801B044 + thumb_func_end GetSaveBlock1Field356C - thumb_func_start sub_801B058 -sub_801B058: @ 801B058 + thumb_func_start GetSaveBlock1Field3564 +GetSaveBlock1Field3564: @ 801B058 ldr r0, =gSaveBlock1Ptr ldr r0, [r0] ldr r1, =0x00003564 adds r0, r1 bx lr .pool - thumb_func_end sub_801B058 + thumb_func_end GetSaveBlock1Field3564 thumb_func_start sub_801B06C sub_801B06C: @ 801B06C @@ -8531,7 +8536,7 @@ sub_801B180: @ 801B180 sub sp, 0x4 movs r0, 0 str r0, [sp] - bl sub_801B044 + bl GetSaveBlock1Field356C adds r1, r0, 0 ldr r2, =0x05000001 mov r0, sp @@ -13795,7 +13800,7 @@ _0801DB60: sub_801DB68: @ 801DB68 push {r4,r5,lr} adds r4, r0, 0 - bl sub_801B044 + bl GetSaveBlock1Field356C adds r5, r0, 0 movs r0, 0x3 adds r1, r4, 0 @@ -13841,7 +13846,7 @@ _0801DBB8: thumb_func_start sub_801DBC0 sub_801DBC0: @ 801DBC0 push {lr} - bl sub_801B044 + bl GetSaveBlock1Field356C movs r1, 0 strb r1, [r0] strb r1, [r0, 0x1] @@ -13858,7 +13863,7 @@ sub_801DBDC: @ 801DBDC ldr r0, =0x0000402e bl GetVarPointer adds r4, r0, 0 - bl sub_801B044 + bl GetSaveBlock1Field356C adds r2, r0, 0 ldr r0, [r2] lsls r0, 24 @@ -13889,7 +13894,7 @@ _0801DC10: sub_801DC20: @ 801DC20 push {r4-r6,lr} ldr r6, =gSpecialVar_Result - bl sub_801B044 + bl GetSaveBlock1Field356C adds r4, r0, 0 bl IsMysteryEventEnabled cmp r0, 0 diff --git a/common_syms/pokedex.txt b/common_syms/pokedex.txt index c982c9d3a3..4f5f162e97 100644 --- a/common_syms/pokedex.txt +++ b/common_syms/pokedex.txt @@ -1,2 +1,2 @@ -gUnknown_030060B0 +gUnusedU8 gUnknown_030060B4 diff --git a/data/event_scripts.s b/data/event_scripts.s index 7ee8e6cf27..1b8807ed76 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -940,7 +940,7 @@ EventScript_27149D:: @ 827149D setberrytree 82, 36, 5 return -EventScript_2715DE:: @ 82715DE +EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_LINK_CONTEST_POKE_BALL setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE diff --git a/include/field_specials.h b/include/field_specials.h index 981d65c0ab..bff04a7397 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -25,5 +25,7 @@ void UpdateFrontierManiac(u16 a0); void UpdateFrontierGambler(u16 a0); void ResetCyclingRoadChallengeData(void); bool8 warp0_in_pokecenter(void); +void ResetFanClub(void); + #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/global.h b/include/global.h index 14a6387cdc..82f31ad539 100644 --- a/include/global.h +++ b/include/global.h @@ -376,7 +376,7 @@ struct BattleFrontier /*0xEBC*/ u32 battlesCount; /*0xEC0*/ u16 field_EC0[16]; /*0xEE0*/ u8 field_EE0; - /*0xEE1*/ u8 field_EE1[2][PLAYER_NAME_LENGTH + 1]; + /*0xEE1*/ u8 opponentName[2][PLAYER_NAME_LENGTH + 1]; /*0xEF1*/ u8 field_EF1[2][4]; /*0xEF9*/ u8 field_EF9_0:7; /*0xEF9*/ u8 field_EF9_1:1; @@ -446,7 +446,7 @@ struct SaveBlock2 /*0x90*/ u8 filler_90[0x8]; /*0x98*/ struct Time localTimeOffset; /*0xA0*/ struct Time lastBerryTreeUpdate; - /*0xA8*/ u32 field_A8; + /*0xA8*/ u32 unusedFlagField; // Written to, but never read. /*0xAC*/ u32 encryptionKey; /*0xB0*/ struct PlayersApprentice playerApprentice; /*0xDC*/ struct Apprentice apprentices[4]; // From record mixing. @@ -787,7 +787,7 @@ struct WaldaPhrase bool8 patternUnlocked; }; -struct UnkSaveSubstruct_3b98 +struct TrainerNameRecord { u32 trainerId; u8 trainerName[PLAYER_NAME_LENGTH + 1]; @@ -891,7 +891,7 @@ struct SaveBlock1 /*0x3B14*/ struct RecordMixingGift recordMixingGift; /*0x3B24*/ u8 seen2[DEX_FLAGS_NO]; /*0x3B58*/ LilycoveLady lilycoveLady; - /*0x3B98*/ struct UnkSaveSubstruct_3b98 unk_3B98[20]; + /*0x3B98*/ struct TrainerNameRecord trainerNameRecords[20]; /*0x3C88*/ u8 filler_3C88[0xDC]; /*0x3D64*/ struct SaveTrainerHill trainerHill; /*0x3D70*/ struct WaldaPhrase waldaPhrase; diff --git a/include/item_menu.h b/include/item_menu.h index d972cdf830..2ca1af2001 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -79,5 +79,7 @@ bool8 UseRegisteredKeyItemOnField(void); void CB2_GoToSellMenu(void); void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)()); void DoWallyTutorialBagMenu(void); +void ResetBagScrollPositions(void); + #endif //GUARD_item_menu_H diff --git a/include/link.h b/include/link.h index 52a6315702..11eff5c289 100644 --- a/include/link.h +++ b/include/link.h @@ -305,7 +305,7 @@ void sub_8009FAC(void); bool8 sub_800A4D8(u8 a0); u8 sub_800A9D8(void); u8 sub_800A0C8(s32, s32); -u16 *sub_801B058(void); +u16 *GetSaveBlock1Field3564(void); u8 sub_800A9A8(void); void sub_800AD10(void); void sub_800AB18(void); diff --git a/include/link_rfu.h b/include/link_rfu.h index d468d6c498..c91f9f1d35 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -213,6 +213,7 @@ extern struct UnkRfuStruct_2 gUnknown_03005000; extern u8 gWirelessStatusIndicatorSpriteId; // Exported ROM declarations +void WipeTrainerNameRecords(void); u32 sub_800BEC0(void); void sub_800E700(void); void sub_800EDD4(void); @@ -263,7 +264,7 @@ void sub_800E084(void); void sub_801103C(void); void sub_8011C5C(void); void sub_80106D4(void); -void sub_800E3A8(void); +void RecordMixTrainerNames(void); void sub_800ED10(void); void sub_800ED28(void); void sub_8011090(u8 a0, u32 a1, u32 a2); diff --git a/include/main.h b/include/main.h index 2ed30307ba..728064288a 100644 --- a/include/main.h +++ b/include/main.h @@ -68,5 +68,7 @@ void ClearPokemonCrySongs(void); void RestoreSerialTimer3IntrHandlers(void); void StartTimer1(void); void SeedRngAndSetTrainerId(void); +extern u16 GetGeneratedTrainerIdLower(void); + #endif // GUARD_MAIN_H diff --git a/include/player_pc.h b/include/player_pc.h index 5a0b83683e..53bb25c6b5 100644 --- a/include/player_pc.h +++ b/include/player_pc.h @@ -85,5 +85,7 @@ extern const struct MenuAction gMailboxMailOptions[]; void ReshowPlayerPC(u8 taskId); void sub_816B31C(void); void Mailbox_ReturnToMailListAfterDeposit(void); +void NewGameInitPCItems(void); + #endif //GUARD_PLAYER_PC_H diff --git a/include/pokedex.h b/include/pokedex.h index 91e9e37d4d..c1eba62b2b 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -1,7 +1,7 @@ #ifndef GUARD_POKEDEX_H #define GUARD_POKEDEX_H -extern u8 gUnknown_030060B0; +extern u8 gUnusedU8; extern void (*gUnknown_030060B4)(void); #define HOENN_DEX_COUNT 202 @@ -42,5 +42,6 @@ u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 trainerId, u32 personality); s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId); u16 CreateMonSpriteFromNationalDexNumber(u16, s16, s16, u16); bool16 HasAllHoennMons(void); +void ResetPokedexScrollPositions(void); #endif // GUARD_POKEDEX_H diff --git a/include/secret_base.h b/include/secret_base.h index 57ad81fee3..699158d0e6 100644 --- a/include/secret_base.h +++ b/include/secret_base.h @@ -24,6 +24,7 @@ void sub_80EBB28(void); void WarpIntoSecretBase(const struct MapPosition *position, const struct MapEvents *events); bool8 sub_80E909C(void); void sub_80EB218(void); +void ResetSecretBases(void); // SetCurrentSecretBaseFromPosition void sub_80E9608(const struct MapPosition *position, const struct MapEvents *events); @@ -33,4 +34,5 @@ void sub_80E8BC8(void); void sub_80E8D4C(void); void EnableBothScriptContexts(void); + #endif //GUARD_SECRET_BASE_H diff --git a/include/tv.h b/include/tv.h index 760d875228..a7ef3daa8b 100644 --- a/include/tv.h +++ b/include/tv.h @@ -61,5 +61,6 @@ void ContestLiveUpdates_BeforeInterview_2(u8 a0); void ContestLiveUpdates_BeforeInterview_3(u8 a0); void ContestLiveUpdates_BeforeInterview_4(u16 a0); void ContestLiveUpdates_BeforeInterview_5(u8 a0, u8 a1); +void ResetGabbyAndTy(void); #endif //GUARD_TV_H diff --git a/src/easy_chat.c b/src/easy_chat.c index c84895df51..7158253d1d 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -359,7 +359,7 @@ void easy_chat_input_maybe(void) words = gSaveBlock2Ptr->apprentices[0].easyChatWords; break; case 20: - words = sub_801B058(); + words = GetSaveBlock1Field3564(); break; default: return; diff --git a/src/event_data.c b/src/event_data.c index a9da142e52..e75c377732 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -28,8 +28,6 @@ EWRAM_DATA static u8 gUnknown_020375FC[16] = {0}; extern u16 *const gSpecialVars[]; -extern void sub_80BB358(void); - void InitEventData(void) { memset(gSaveBlock1Ptr->flags, 0, sizeof(gSaveBlock1Ptr->flags)); @@ -69,7 +67,7 @@ void EnableNationalPokedex(void) FlagSet(FLAG_SYS_NATIONAL_DEX); gSaveBlock2Ptr->pokedex.mode = DEX_MODE_NATIONAL; gSaveBlock2Ptr->pokedex.order = 0; - sub_80BB358(); + ResetPokedexScrollPositions(); } bool32 IsNationalPokedexEnabled(void) diff --git a/src/frontier_util.c b/src/frontier_util.c index e6954c3560..6fcbd4ffbe 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -1528,7 +1528,7 @@ static void ShowLinkContestResultsWindow(void) static void sub_81A31FC(void) { - u8 text[32]; + u8 name[32]; s32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; s32 facility = VarGet(VAR_FRONTIER_FACILITY); s32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); @@ -1541,9 +1541,9 @@ static void sub_81A31FC(void) gSaveBlock2Ptr->frontier.towerRecordWinStreaks[battleMode][lvlMode] = gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode]; if (battleMode == FRONTIER_MODE_LINK_MULTIS) { - StringCopy(text, gLinkPlayers[gBattleScripting.multiplayerId ^ 1].name); - StripExtCtrlCodes(text); - StringCopy(gSaveBlock2Ptr->frontier.field_EE1[lvlMode], text); + StringCopy(name, gLinkPlayers[gBattleScripting.multiplayerId ^ 1].name); + StripExtCtrlCodes(name); + StringCopy(gSaveBlock2Ptr->frontier.opponentName[lvlMode], name); SetTrainerId(gLinkPlayers[gBattleScripting.multiplayerId ^ 1].trainerId, gSaveBlock2Ptr->frontier.field_EF1[lvlMode]); } if (gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode] > 1 @@ -2336,8 +2336,8 @@ static void PrintHallRecords(s32 hallFacilityId, s32 lvlMode) AddTextPrinterParameterized(gRecordsWindowId, 1, gLevelModeText[lvlMode], x, 1, TEXT_SPEED_FF, NULL); if (hallFacilityId == HALL_FACILITIES_COUNT) { - gSaveBlock2Ptr->frontier.field_EE1[0][PLAYER_NAME_LENGTH] = EOS; - gSaveBlock2Ptr->frontier.field_EE1[1][PLAYER_NAME_LENGTH] = EOS; + gSaveBlock2Ptr->frontier.opponentName[0][PLAYER_NAME_LENGTH] = EOS; + gSaveBlock2Ptr->frontier.opponentName[1][PLAYER_NAME_LENGTH] = EOS; Fill2PRecords(records2P, lvlMode); for (i = 0; i < 3; i++) Print2PRecord(i, 1, 4, &records2P[i]); diff --git a/src/link_rfu.c b/src/link_rfu.c index ebfc802e01..122ffd2430 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -16,6 +16,7 @@ #include "task.h" #include "text.h" #include "constants/species.h" +#include "save.h" extern u16 gUnknown_03005DA8; extern void nullsub_89(u8 taskId); @@ -2347,17 +2348,17 @@ void sub_800E174(void) } } -void sub_800E378(struct UnkSaveSubstruct_3b98 *dest, u32 trainerId, const u8 *name) +void CopyTrainerRecord(struct TrainerNameRecord *dest, u32 trainerId, const u8 *name) { dest->trainerId = trainerId; StringCopy(dest->trainerName, name); } -bool32 sub_800E388(const u8 *name) +bool32 NameIsNotEmpty(const u8 *name) { s32 i; - for (i = 0; i < 8; i++) + for (i = 0; i < PLAYER_NAME_LENGTH + 1; i++) { if (name[i] != 0) { @@ -2367,52 +2368,64 @@ bool32 sub_800E388(const u8 *name) return FALSE; } -void sub_800E3A8(void) +// Save the currently connected players into the trainer records, shifting all previous records down. +void RecordMixTrainerNames(void) { if (gWirelessCommType != 0) { s32 i; s32 j; - s32 cnt; - s32 sp0[5]; - struct UnkSaveSubstruct_3b98 *sp14 = calloc(20, sizeof(struct UnkSaveSubstruct_3b98)); + s32 nextSpace; + s32 connectedTrainerRecordIndecies[5]; + struct TrainerNameRecord *newRecords = calloc(20, sizeof(struct TrainerNameRecord)); + + // Check if we already have a record saved for connected trainers. for (i = 0; i < GetLinkPlayerCount(); i++) { - sp0[i] = -1; + connectedTrainerRecordIndecies[i] = -1; for (j = 0; j < 20; j++) { - if ((u16)gLinkPlayers[i].trainerId == gSaveBlock1Ptr->unk_3B98[j].trainerId && StringCompare(gLinkPlayers[i].name, gSaveBlock1Ptr->unk_3B98[j].trainerName) == 0) + if ((u16)gLinkPlayers[i].trainerId == gSaveBlock1Ptr->trainerNameRecords[j].trainerId && StringCompare(gLinkPlayers[i].name, gSaveBlock1Ptr->trainerNameRecords[j].trainerName) == 0) { - sp0[i] = j; + connectedTrainerRecordIndecies[i] = j; } } } - cnt = 0; + + // Save the connected trainers first, at the top of the list. + nextSpace = 0; for (i = 0; i < GetLinkPlayerCount(); i++) { if (i != GetMultiplayerId() && gLinkPlayers[i].language != LANGUAGE_JAPANESE) { - sub_800E378(&sp14[cnt], (u16)gLinkPlayers[i].trainerId, gLinkPlayers[i].name); - if (sp0[i] >= 0) + CopyTrainerRecord(&newRecords[nextSpace], (u16)gLinkPlayers[i].trainerId, gLinkPlayers[i].name); + + // If we already had a record for this trainer, wipe it so that the next step doesn't duplicate it. + if (connectedTrainerRecordIndecies[i] >= 0) { - memset(gSaveBlock1Ptr->unk_3B98[sp0[i]].trainerName, 0, 8); + memset(gSaveBlock1Ptr->trainerNameRecords[connectedTrainerRecordIndecies[i]].trainerName, 0, 8); } - cnt++; + nextSpace++; } } + + // Copy all non-empty records to the new list, in the order they appear on the old list. If the list is full, + // the last (oldest) records will be dropped. for (i = 0; i < 20; i++) { - if (sub_800E388(gSaveBlock1Ptr->unk_3B98[i].trainerName)) + if (NameIsNotEmpty(gSaveBlock1Ptr->trainerNameRecords[i].trainerName)) { - sub_800E378(&sp14[cnt], gSaveBlock1Ptr->unk_3B98[i].trainerId, gSaveBlock1Ptr->unk_3B98[i].trainerName); - if (++cnt >= 20) + CopyTrainerRecord(&newRecords[nextSpace], gSaveBlock1Ptr->trainerNameRecords[i].trainerId, gSaveBlock1Ptr->trainerNameRecords[i].trainerName); + if (++nextSpace >= 20) { break; } } } - memcpy(gSaveBlock1Ptr->unk_3B98, sp14, 20 * sizeof(struct UnkSaveSubstruct_3b98)); - free(sp14); + + // Finalize the new list, and clean up. + memcpy(gSaveBlock1Ptr->trainerNameRecords, newRecords, 20 * sizeof(struct TrainerNameRecord)); + free(newRecords); } } @@ -2422,11 +2435,11 @@ bool32 sub_800E540(u16 id, u8 *name) for (i = 0; i < 20; i++) { - if (StringCompare(gSaveBlock1Ptr->unk_3B98[i].trainerName, name) == 0 && gSaveBlock1Ptr->unk_3B98[i].trainerId == id) + if (StringCompare(gSaveBlock1Ptr->trainerNameRecords[i].trainerName, name) == 0 && gSaveBlock1Ptr->trainerNameRecords[i].trainerId == id) { return TRUE; } - if (!sub_800E388(gSaveBlock1Ptr->unk_3B98[i].trainerName)) + if (!NameIsNotEmpty(gSaveBlock1Ptr->trainerNameRecords[i].trainerName)) { return FALSE; } @@ -2434,14 +2447,14 @@ bool32 sub_800E540(u16 id, u8 *name) return FALSE; } -void sub_800E5AC(void) +void WipeTrainerNameRecords(void) { s32 i; for (i = 0; i < 20; i++) { - gSaveBlock1Ptr->unk_3B98[i].trainerId = 0; - CpuFill16(0, gSaveBlock1Ptr->unk_3B98[i].trainerName, 8); + gSaveBlock1Ptr->trainerNameRecords[i].trainerId = 0; + CpuFill16(0, gSaveBlock1Ptr->trainerNameRecords[i].trainerName, 8); } } diff --git a/src/new_game.c b/src/new_game.c index a4bf2951ff..be84445bf5 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -30,31 +30,25 @@ #include "apprentice.h" #include "frontier_util.h" #include "constants/maps.h" +#include "pokedex.h" +#include "save.h" +#include "link_rfu.h" +#include "main.h" +#include "contest.h" +#include "item_menu.h" +#include "pokemon_storage_system.h" +#include "decoration_inventory.h" +#include "secret_base.h" +#include "player_pc.h" +#include "field_specials.h" -extern u16 gSaveFileStatus; -extern u8 gUnknown_030060B0; -// TODO: replace those declarations with file headers -extern u16 GetGeneratedTrainerIdLower(void); -extern void ClearContestWinnerPicsInContestHall(void); -extern void sub_80BB358(void); -extern void ResetBagScrollPositions(void); -extern void ResetGabbyAndTy(void); -extern void ResetSecretBases(void); -extern void ResetLinkContestBoolean(void); -extern void sub_8052DA8(void); -extern void ResetPokemonStorageSystem(void); -extern void NewGameInitPCItems(void); -extern void ClearDecorationInventories(void); -extern void ResetFanClub(void); extern void copy_strings_to_sav1(void); extern void sub_801AFD8(void); -extern void sub_800E5AC(void); -extern void ResetContestLinkResults(void); extern void ResetPokeJumpResults(void); extern void SetBerryPowder(u32* powder, u32 newValue); -extern const u8 EventScript_2715DE[]; +extern const u8 EventScript_ResetAllMapFlags[]; // this file's functions static void ClearFrontierRecord(void); @@ -112,7 +106,7 @@ static void SetDefaultOptions(void) static void ClearPokedexFlags(void) { - gUnknown_030060B0 = 0; + gUnusedU8 = 0; memset(&gSaveBlock2Ptr->pokedex.owned, 0, sizeof(gSaveBlock2Ptr->pokedex.owned)); memset(&gSaveBlock2Ptr->pokedex.seen, 0, sizeof(gSaveBlock2Ptr->pokedex.seen)); } @@ -130,8 +124,8 @@ static void ClearFrontierRecord(void) { CpuFill32(0, &gSaveBlock2Ptr->frontier, sizeof(gSaveBlock2Ptr->frontier)); - gSaveBlock2Ptr->frontier.field_EE1[0][0] = EOS; - gSaveBlock2Ptr->frontier.field_EE1[1][0] = EOS; + gSaveBlock2Ptr->frontier.opponentName[0][0] = EOS; + gSaveBlock2Ptr->frontier.opponentName[1][0] = EOS; } static void WarpToTruck(void) @@ -149,7 +143,7 @@ void Sav2_ClearSetDefault(void) void ResetMenuAndMonGlobals(void) { gDifferentSaveFile = 0; - sub_80BB358(); + ResetPokedexScrollPositions(); ZeroPlayerPartyMons(); ZeroEnemyPartyMons(); ResetBagScrollPositions(); @@ -170,7 +164,7 @@ void NewGameInitData(void) ClearSav1(); ClearMailData(); gSaveBlock2Ptr->specialSaveWarpFlags = 0; - gSaveBlock2Ptr->field_A8 = 0; + gSaveBlock2Ptr->unusedFlagField = 0; InitPlayerTrainerId(); PlayTimeCounter_Reset(); ClearPokedexFlags(); @@ -203,7 +197,7 @@ void NewGameInitData(void) ResetFanClub(); ResetLotteryCorner(); WarpToTruck(); - ScriptContext2_RunNewScript(EventScript_2715DE); + ScriptContext2_RunNewScript(EventScript_ResetAllMapFlags); ResetMiniGamesResults(); copy_strings_to_sav1(); SetLilycoveLady(); @@ -211,7 +205,7 @@ void NewGameInitData(void) ClearRankingHallRecords(); InitMatchCallCounters(); sub_801AFD8(); - sub_800E5AC(); + WipeTrainerNameRecords(); ResetTrainerHillResults(); ResetContestLinkResults(); } diff --git a/src/pokedex.c b/src/pokedex.c index c47ada5b8b..b2eba6836a 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -37,7 +37,8 @@ static EWRAM_DATA u8 gUnknown_02039B52 = 0; static EWRAM_DATA struct PokedexListItem *sPokedexListItem = NULL; // IWRAM common -u8 gUnknown_030060B0; +// This is written to, but never read. +u8 gUnusedU8; void (*gUnknown_030060B4)(void); struct PokedexOption @@ -1225,7 +1226,7 @@ void ResetPokedex(void) gUnknown_02039B50 = 0; gUnknown_02039B52 = 64; - gUnknown_030060B0 = 0; + gUnusedU8 = 0; gSaveBlock2Ptr->pokedex.mode = DEX_MODE_HOENN; gSaveBlock2Ptr->pokedex.order = 0; gSaveBlock2Ptr->pokedex.nationalMagic = 0; @@ -1243,7 +1244,7 @@ void ResetPokedex(void) } } -void sub_80BB358(void) +void ResetPokedexScrollPositions(void) { gUnknown_02039B50 = 0; gUnknown_02039B52 = 64; diff --git a/src/record_mixing.c b/src/record_mixing.c index 1890336858..c0ca5f19cc 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -1087,7 +1087,7 @@ void GetPlayerHallRecords(struct PlayerHallRecords *dst) CopyTrainerId(dst->twoPlayers[j].id1, gSaveBlock2Ptr->playerTrainerId); CopyTrainerId(dst->twoPlayers[j].id2, gSaveBlock2Ptr->frontier.field_EF1[j]); StringCopy(dst->twoPlayers[j].name1, gSaveBlock2Ptr->playerName); - StringCopy(dst->twoPlayers[j].name2, gSaveBlock2Ptr->frontier.field_EE1[j]); + StringCopy(dst->twoPlayers[j].name2, gSaveBlock2Ptr->frontier.opponentName[j]); } for (i = 0; i < 2; i++) diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 9bdd861674..baed26cf81 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -1687,7 +1687,7 @@ void sub_801440C(u8 taskId) case 9 ... 11: case 13: case 15: - sub_800E3A8(); + RecordMixTrainerNames(); break; } @@ -1800,12 +1800,12 @@ void sub_8014790(u8 taskId) sendBuff[1] = GetMonData(&gPlayerParty[gSelectedOrderFromParty[1] - 1], MON_DATA_SPECIES, NULL); gMain.savedCallback = NULL; data[0] = 4; - sub_800E3A8(); + RecordMixTrainerNames(); ResetBlockReceivedFlags(); break; case 16: case 23 ... 27: - sub_800E3A8(); + RecordMixTrainerNames(); DestroyTask(taskId); default: EnableBothScriptContexts(); diff --git a/src/save_location.c b/src/save_location.c index 2443b3161b..20972873ca 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -120,13 +120,13 @@ void TrySetMapSaveWarpStatus(void) void sub_81AFDA0(void) { - gSaveBlock2Ptr->field_A8 |= 0x8000; - gSaveBlock2Ptr->field_A8 |= 0x1; - gSaveBlock2Ptr->field_A8 |= 0x2; - gSaveBlock2Ptr->field_A8 |= 0x4; - gSaveBlock2Ptr->field_A8 |= 0x10; - gSaveBlock2Ptr->field_A8 |= 0x20; - gSaveBlock2Ptr->field_A8 |= 0x8; + gSaveBlock2Ptr->unusedFlagField |= 0x8000; + gSaveBlock2Ptr->unusedFlagField |= 0x1; + gSaveBlock2Ptr->unusedFlagField |= 0x2; + gSaveBlock2Ptr->unusedFlagField |= 0x4; + gSaveBlock2Ptr->unusedFlagField |= 0x10; + gSaveBlock2Ptr->unusedFlagField |= 0x20; + gSaveBlock2Ptr->unusedFlagField |= 0x8; } void sub_81AFDD0(void) From e90e3458cb0836a5a027b4ed59fd05f34f904bcf Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 15 Feb 2019 18:24:55 -0500 Subject: [PATCH 045/217] Document the regi* code more Fixed some confusing naming, named some unknown symbols, and fixed the names of some flags. --- data/field_effect_scripts.s | 17 +++- data/maps/AncientTomb/scripts.inc | 4 +- data/maps/DesertRuins/scripts.inc | 4 +- data/maps/IslandCave/scripts.inc | 14 ++-- data/specials.inc | 2 +- include/braille_puzzles.h | 8 +- include/constants/field_effects.h | 2 +- include/constants/flags.h | 6 +- include/constants/vars.h | 6 +- src/braille_puzzles.c | 125 +++++++++++++++--------------- src/fldeff_flash.c | 6 +- src/fldeff_rocksmash.c | 6 +- 12 files changed, 110 insertions(+), 90 deletions(-) diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 93fe33f8a5..2edf13661e 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -10,66 +10,79 @@ gFieldEffectScriptPointers:: @ 82DB9D4 .4byte gFieldEffectScript_UseCutOnTree .4byte gFieldEffectScript_Shadow .4byte gFieldEffectScript_TallGrass + .4byte gFieldEffectScript_Ripple .4byte gFieldEffectScript_FieldMoveShowMon .4byte gFieldEffectScript_Ash .4byte gFieldEffectScript_SurfBlob .4byte gFieldEffectScript_UseSurf + .4byte gFieldEffectScript_GroundImpactDust .4byte gFieldEffectScript_Unknown11 .4byte gFieldEffectScript_BikeHopTallGrass .4byte gFieldEffectScript_SandFootprints .4byte gFieldEffectScript_BikeHopBigSplash + .4byte gFieldEffectScript_Splash .4byte gFieldEffectScript_BikeHopSmallSplash .4byte gFieldEffectScript_LongGrass .4byte gFieldEffectScript_Unknown18 .4byte gFieldEffectScript_Unknown19 + .4byte gFieldEffectScript_Unknown20 .4byte gFieldEffectScript_Unknown21 .4byte gFieldEffectScript_Unknown22 .4byte gFieldEffectScript_BerryTreeGrowthSparkle .4byte gFieldEffectScript_DeepSandFootprints + .4byte gFieldEffectScript_Unknown25 .4byte gFieldEffectScript_Unknown26 .4byte gFieldEffectScript_Unknown27 .4byte gFieldEffectScript_TreeDisguise .4byte gFieldEffectScript_MountainDisguise + .4byte gFieldEffectScript_Unknown30 .4byte gFieldEffectScript_UseFly .4byte gFieldEffectScript_FlyIn .4byte gFieldEffectScript_QuestionMarkIcon .4byte gFieldEffectScript_FeetInFlowingWater + .4byte gFieldEffectScript_BikeTireTracks .4byte gFieldEffectScript_SandDisguisePlaceholder .4byte gFieldEffectScript_UseRockSmash .4byte gFieldEffectScript_Unknown38 .4byte gFieldEffectScript_Unknown39 + .4byte gFieldEffectScript_Unknown40 .4byte gFieldEffectScript_ShortGrass .4byte gFieldEffectScript_HotSpringsWater .4byte gFieldEffectScript_Unknown43 .4byte gFieldEffectScript_Unknown44 + .4byte gFieldEffectScript_Unknown45 .4byte gFieldEffectScript_HeartIcon .4byte gFieldEffectScript_Unknown47 .4byte gFieldEffectScript_Unknown48 .4byte gFieldEffectScript_JumpOutOfAsh + .4byte gFieldEffectScript_Unknown50 .4byte gFieldEffectScript_Unknown51 .4byte gFieldEffectScript_Unknown52 .4byte gFieldEffectScript_Bubbles .4byte gFieldEffectScript_Unknown54 + .4byte gFieldEffectScript_Unknown55 .4byte gFieldEffectScript_Unknown56 .4byte gFieldEffectScript_Unknown57 .4byte gFieldEffectScript_Unknown58 .4byte gFieldEffectScript_FieldMoveShowMonInit - .4byte gFieldEffectScript_Unknown60 + + .4byte gFieldEffectScript_UsePuzzleEffect .4byte gFieldEffectScript_Unknown61 .4byte gFieldEffectScript_Unknown62 .4byte gFieldEffectScript_Unknown63 .4byte gFieldEffectScript_Rayquaza + .4byte gFieldEffectScript_Unknown65 .4byte gFieldEffectScript_Unknown66 @@ -315,7 +328,7 @@ gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC field_eff_callnative FldEff_FieldMoveShowMonInit field_eff_end -gFieldEffectScript_Unknown60:: @ 82DBCD2 +gFieldEffectScript_UsePuzzleEffect:: @ 82DBCD2 field_eff_callnative FldEff_UsePuzzleEffect field_eff_end diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 45bb9e007a..7e9b027b27 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -25,7 +25,7 @@ AncientTomb_EventScript_238FEE:: @ 8238FEE return AncientTomb_MapScript1_238FF2: @ 8238FF2 - call_if_unset FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_238FFC + call_if_unset FLAG_SYS_BRAILLE_REGISTEEL_HM, AncientTomb_EventScript_238FFC end AncientTomb_EventScript_238FFC:: @ 8238FFC @@ -39,7 +39,7 @@ AncientTomb_EventScript_238FFC:: @ 8238FFC AncientTomb_EventScript_239033:: @ 8239033 lockall - goto_if_set FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_239046 + goto_if_set FLAG_SYS_BRAILLE_REGISTEEL_HM, AncientTomb_EventScript_239046 braillemessage AncientTomb_Braille_2A6D06 waitbuttonpress hidebox2 diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 62828e9712..ff58b3ba5e 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -16,7 +16,7 @@ DesertRuins_EventScript_22D975:: @ 822D975 return DesertRuins_MapScript1_22D989: @ 822D989 - call_if_unset FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_22D993 + call_if_unset FLAG_SYS_BRAILLE_REGIROCK_HM, DesertRuins_EventScript_22D993 end DesertRuins_EventScript_22D993:: @ 822D993 @@ -39,7 +39,7 @@ DesertRuins_EventScript_22D9D7:: @ 822D9D7 DesertRuins_EventScript_22D9DB:: @ 822D9DB lockall - goto_if_set FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_22D9EE + goto_if_set FLAG_SYS_BRAILLE_REGIROCK_HM, DesertRuins_EventScript_22D9EE braillemessage DesertRuins_Braille_2A6CA0 waitbuttonpress hidebox2 diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 7b551b4a76..3b6d94f0b2 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -16,7 +16,7 @@ IslandCave_EventScript_238E44:: @ 8238E44 return IslandCave_MapScript1_238E58: @ 8238E58 - call_if_unset FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238E62 + call_if_unset FLAG_SYS_BRAILLE_REGICE_PUZZLE, IslandCave_EventScript_238E62 end IslandCave_EventScript_238E62:: @ 8238E62 @@ -47,13 +47,13 @@ IslandCave_EventScript_238EAF:: @ 8238EAF setmetatile 9, 20, 564, 1 special DrawWholeMapView playse SE_BAN - setflag FLAG_SYS_BRAILLE_WAIT + setflag FLAG_SYS_BRAILLE_REGICE_PUZZLE end IslandCave_EventScript_238EEF:: @ 8238EEF lockall call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45 - goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F13 + goto_if_set FLAG_SYS_BRAILLE_REGICE_PUZZLE, IslandCave_EventScript_238F13 braillemessage IslandCave_Braille_2A6CD4 setflag FLAG_TEMP_2 special ShouldDoBrailleRegicePuzzle @@ -69,7 +69,7 @@ IslandCave_EventScript_238F1D:: @ 8238F1D lockall call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45 braillemessage IslandCave_Braille_2A6CD4 - goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F41 + goto_if_set FLAG_SYS_BRAILLE_REGICE_PUZZLE, IslandCave_EventScript_238F41 setflag FLAG_TEMP_2 special ShouldDoBrailleRegicePuzzle goto IslandCave_EventScript_238F41 @@ -82,9 +82,9 @@ IslandCave_EventScript_238F41:: @ 8238F41 end IslandCave_EventScript_238F45:: @ 8238F45 - setvar VAR_0x403B, 0 - setvar VAR_0x403C, 0 - setvar VAR_0x403D, 0 + setvar VAR_REGICE_STEPS_1, 0 + setvar VAR_REGICE_STEPS_2, 0 + setvar VAR_REGICE_STEPS_3, 0 clearflag FLAG_TEMP_3 return diff --git a/data/specials.inc b/data/specials.inc index b3ca15ed1e..cbbd81dc1a 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -291,7 +291,7 @@ gSpecials:: @ 81DBA64 def_special GetPokeblockNameByMonNature def_special GetSecretBaseNearbyMapName def_special CheckRelicanthWailord - def_special ShouldDoBrailleStrengthEffectOld + def_special ShouldDoBrailleRegirockEffectOld def_special sub_80B0534 def_special sub_80B058C def_special WaitWeather diff --git a/include/braille_puzzles.h b/include/braille_puzzles.h index d4c5a24d83..1614c92e1b 100644 --- a/include/braille_puzzles.h +++ b/include/braille_puzzles.h @@ -1,11 +1,11 @@ #ifndef GUARD_BRAILLE_PUZZLES_H #define GUARD_BRAILLE_PUZZLES_H -bool8 ShouldDoBrailleFlyEffect(void); -bool8 ShouldDoBrailleStrengthEffect(void); +bool8 ShouldDoBrailleRegisteelEffect(void); +bool8 ShouldDoBrailleRegirockEffect(void); bool8 ShouldDoBrailleDigEffect(void); void DoBrailleDigEffect(void); -void sub_8179918(void); -void sub_8179834(void); +void SetUpPuzzleEffectRegisteel(void); +void SetUpPuzzleEffectRegirock(void); #endif // GUARD_BRAILLE_PUZZLES_H diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index add195df86..282f9ce753 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -61,7 +61,7 @@ #define FLDEFF_SECRET_POWER_SHRUB 57 #define FLDEFF_CUT_GRASS 58 #define FLDEFF_FIELD_MOVE_SHOW_MON_INIT 59 -#define FLDEFF_USE_FLY_ANCIENT_TOMB 60 +#define FLDEFF_USE_TOMB_PUZZLE_EFFECT 60 #define FLDEFF_PCTURN_ON 61 #define FLDEFF_HALL_OF_FAME_RECORD 62 #define FLDEFF_USE_TELEPORT 63 diff --git a/include/constants/flags.h b/include/constants/flags.h index 5082014e7b..11a0c849cf 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1352,9 +1352,9 @@ #define FLAG_SYS_ENC_UP_ITEM (SYSTEM_FLAGS + 0x4D) #define FLAG_SYS_ENC_DOWN_ITEM (SYSTEM_FLAGS + 0x4E) #define FLAG_SYS_BRAILLE_DIG (SYSTEM_FLAGS + 0x4F) -#define FLAG_SYS_BRAILLE_STRENGTH (SYSTEM_FLAGS + 0x50) -#define FLAG_SYS_BRAILLE_WAIT (SYSTEM_FLAGS + 0x51) -#define FLAG_SYS_BRAILLE_FLY (SYSTEM_FLAGS + 0x52) +#define FLAG_SYS_BRAILLE_REGIROCK_HM (SYSTEM_FLAGS + 0x50) +#define FLAG_SYS_BRAILLE_REGICE_PUZZLE (SYSTEM_FLAGS + 0x51) +#define FLAG_SYS_BRAILLE_REGISTEEL_HM (SYSTEM_FLAGS + 0x52) #define FLAG_SYS_HAS_EON_TICKET (SYSTEM_FLAGS + 0x53) #define FLAG_LANDMARK_POKEMON_LEAGUE (SYSTEM_FLAGS + 0x54) diff --git a/include/constants/vars.h b/include/constants/vars.h index c055c5baf3..fedc856572 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -75,9 +75,9 @@ #define VAR_0x4038 0x4038 #define VAR_0x4039 0x4039 #define VAR_0x403A 0x403A -#define VAR_0x403B 0x403B -#define VAR_0x403C 0x403C -#define VAR_0x403D 0x403D +#define VAR_REGICE_STEPS_1 0x403B +#define VAR_REGICE_STEPS_2 0x403C +#define VAR_REGICE_STEPS_3 0x403D #define VAR_ALTERING_CAVE_WILD_SET 0x403E #define VAR_0x403F 0x403F #define VAR_DAYS 0x4040 diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 6be8ba4a44..449c1dfea2 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -10,21 +10,20 @@ #include "constants/maps.h" #include "constants/songs.h" #include "constants/species.h" - -extern void MapGridSetMetatileIdAt(s32 x, s32 y, u16 metatileId); // fieldmap -extern u8 GetCursorSelectionMonId(void); -extern u8 oei_task_add(void); +#include "fieldmap.h" +#include "party_menu.h" +#include "fldeff.h" // why do this, GF? enum { - STRENGTH_PUZZLE, - FLY_PUZZLE + REGIROCK_PUZZLE, + REGISTEEL_PUZZLE }; EWRAM_DATA static u8 sBraillePuzzleCallbackFlag = 0; -static const u8 gUnknown_085EFE74[][2] = +static const u8 gRegicePathCoords[][2] = { {0x04, 0x15}, {0x05, 0x15}, @@ -65,8 +64,8 @@ static const u8 gUnknown_085EFE74[][2] = }; void SealedChamberShakingEffect(u8); -void sub_8179860(void); -void sub_8179944(void); +void DoBrailleRegirockEffect(void); +void DoBrailleRegisteelEffect(void); bool8 ShouldDoBrailleDigEffect(void) { @@ -115,10 +114,10 @@ bool8 CheckRelicanthWailord(void) // THEORY: this was caused by block commenting out all of the older R/S braille functions but leaving the call to it itself, which creates the nullsub. // the code is shown below to show what this might look like. -void ShouldDoBrailleStrengthEffectOld(void) +void ShouldDoBrailleRegirockEffectOld(void) { /* - if (!FlagGet(FLAG_SYS_BRAILLE_STRENGTH) && (gSaveBlock1.location.mapGroup == MAP_GROUP_DESERT_RUINS && gSaveBlock1.location.mapNum == MAP_ID_DESERT_RUINS)) + if (!FlagGet(FLAG_SYS_BRAILLE_REGIROCK_HM) && (gSaveBlock1.location.mapGroup == MAP_GROUP_DESERT_RUINS && gSaveBlock1.location.mapNum == MAP_ID_DESERT_RUINS)) { if (gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 23) return TRUE; @@ -131,7 +130,7 @@ void ShouldDoBrailleStrengthEffectOld(void) return FALSE; } -void DoBrailleStrengthEffect(void) +void DoBrailleRegirockEffect(void) { FieldEffectActiveListRemove(FLDEFF_USE_STRENGTH); MapGridSetMetatileIdAt(14, 26, 554); @@ -142,13 +141,13 @@ void DoBrailleStrengthEffect(void) MapGridSetMetatileIdAt(16, 27, 3636); DrawWholeMapView(); PlaySE(SE_BAN); - FlagSet(FLAG_SYS_BRAILLE_STRENGTH); + FlagSet(FLAG_SYS_BRAILLE_REGIROCK_HM); ScriptContext2_Disable(); } -bool8 ShouldDoBrailleFlyEffect(void) +bool8 ShouldDoBrailleRegisteelEffect(void) { - if (!FlagGet(FLAG_SYS_BRAILLE_FLY) && (gSaveBlock1.location.mapGroup == MAP_GROUP_ANCIENT_TOMB && gSaveBlock1.location.mapNum == MAP_ID_ANCIENT_TOMB)) + if (!FlagGet(FLAG_SYS_BRAILLE_REGISTEEL_HM) && (gSaveBlock1.location.mapGroup == MAP_GROUP_ANCIENT_TOMB && gSaveBlock1.location.mapNum == MAP_ID_ANCIENT_TOMB)) { if (gSaveBlock1.pos.x == 8 && gSaveBlock1.pos.y == 25) return TRUE; @@ -157,24 +156,24 @@ bool8 ShouldDoBrailleFlyEffect(void) return FALSE; } -void DoBrailleFlyEffect(void) +void DoBrailleRegisteelEffect(void) { gFieldEffectArguments[0] = gLastFieldPokeMenuOpened; - FieldEffectStart(FLDEFF_USE_FLY_ANCIENT_TOMB); + FieldEffectStart(FLDEFF_USE_TOMB_PUZZLE_EFFECT); } bool8 FldEff_UseFlyAncientTomb(void) { u8 taskId = oei_task_add(); - gTasks[taskId].data[8] = (u32)UseFlyAncientTomb_Callback >> 16; - gTasks[taskId].data[9] = (u32)UseFlyAncientTomb_Callback; + gTasks[taskId].data[8] = (u32)UseRegisteelHm_Callback >> 16; + gTasks[taskId].data[9] = (u32)UseRegisteelHm_Callback; return FALSE; } -void UseFlyAncientTomb_Callback(void) +void UseRegisteelHm_Callback(void) { - FieldEffectActiveListRemove(FLDEFF_USE_FLY_ANCIENT_TOMB); + FieldEffectActiveListRemove(FLDEFF_USE_TOMB_PUZZLE_EFFECT); UseFlyAncientTomb_Finish(); } @@ -188,7 +187,7 @@ void UseFlyAncientTomb_Finish(void) MapGridSetMetatileIdAt(16, 27, 3636); DrawWholeMapView(); PlaySE(SE_BAN); - FlagSet(FLAG_SYS_BRAILLE_FLY); + FlagSet(FLAG_SYS_BRAILLE_REGISTEEL_HM); ScriptContext2_Disable(); } */ @@ -240,25 +239,25 @@ void SealedChamberShakingEffect(u8 taskId) } // moved later in the function because it was rewritten. -bool8 ShouldDoBrailleStrengthEffect(void) +bool8 ShouldDoBrailleRegirockEffect(void) { - if (!FlagGet(FLAG_SYS_BRAILLE_STRENGTH) + if (!FlagGet(FLAG_SYS_BRAILLE_REGIROCK_HM) && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(DESERT_RUINS) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(DESERT_RUINS)) { if (gSaveBlock1Ptr->pos.x == 6 && gSaveBlock1Ptr->pos.y == 23) { - sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; + sBraillePuzzleCallbackFlag = REGIROCK_PUZZLE; return TRUE; } else if (gSaveBlock1Ptr->pos.x == 5 && gSaveBlock1Ptr->pos.y == 23) { - sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; + sBraillePuzzleCallbackFlag = REGIROCK_PUZZLE; return TRUE; } else if (gSaveBlock1Ptr->pos.x == 7 && gSaveBlock1Ptr->pos.y == 23) { - sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; + sBraillePuzzleCallbackFlag = REGIROCK_PUZZLE; return TRUE; } } @@ -266,19 +265,19 @@ bool8 ShouldDoBrailleStrengthEffect(void) return FALSE; } -void sub_8179834(void) +void SetUpPuzzleEffectRegirock(void) { gFieldEffectArguments[0] = GetCursorSelectionMonId(); - FieldEffectStart(FLDEFF_USE_FLY_ANCIENT_TOMB); + FieldEffectStart(FLDEFF_USE_TOMB_PUZZLE_EFFECT); } -void UseStrengthDesertRuins_Callback(void) +void UseRegirockHm_Callback(void) { - FieldEffectActiveListRemove(FLDEFF_USE_FLY_ANCIENT_TOMB); - sub_8179860(); + FieldEffectActiveListRemove(FLDEFF_USE_TOMB_PUZZLE_EFFECT); + DoBrailleRegirockEffect(); } -void sub_8179860(void) +void DoBrailleRegirockEffect(void) { MapGridSetMetatileIdAt(14, 26, 554); MapGridSetMetatileIdAt(15, 26, 555); @@ -288,33 +287,36 @@ void sub_8179860(void) MapGridSetMetatileIdAt(16, 27, 3636); DrawWholeMapView(); PlaySE(SE_BAN); - FlagSet(FLAG_SYS_BRAILLE_STRENGTH); + FlagSet(FLAG_SYS_BRAILLE_REGIROCK_HM); ScriptContext2_Disable(); } -bool8 ShouldDoBrailleFlyEffect(void) +bool8 ShouldDoBrailleRegisteelEffect(void) { - if (!FlagGet(FLAG_SYS_BRAILLE_FLY) && (gSaveBlock1Ptr->location.mapGroup == 0x18 && gSaveBlock1Ptr->location.mapNum == 0x44)) + if (!FlagGet(FLAG_SYS_BRAILLE_REGISTEEL_HM) && (gSaveBlock1Ptr->location.mapGroup == 0x18 && gSaveBlock1Ptr->location.mapNum == 0x44)) { if (gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 25) - { sBraillePuzzleCallbackFlag = FLY_PUZZLE; return TRUE; } + { + sBraillePuzzleCallbackFlag = REGISTEEL_PUZZLE; + return TRUE; + } } return FALSE; } -void sub_8179918(void) +void SetUpPuzzleEffectRegisteel(void) { gFieldEffectArguments[0] = GetCursorSelectionMonId(); - FieldEffectStart(FLDEFF_USE_FLY_ANCIENT_TOMB); + FieldEffectStart(FLDEFF_USE_TOMB_PUZZLE_EFFECT); } -void UseFlyAncientTomb_Callback(void) +void UseRegisteelHm_Callback(void) { - FieldEffectActiveListRemove(FLDEFF_USE_FLY_ANCIENT_TOMB); - sub_8179944(); + FieldEffectActiveListRemove(FLDEFF_USE_TOMB_PUZZLE_EFFECT); + DoBrailleRegisteelEffect(); } -void sub_8179944(void) +void DoBrailleRegisteelEffect(void) { MapGridSetMetatileIdAt(14, 26, 554); MapGridSetMetatileIdAt(15, 26, 555); @@ -324,7 +326,7 @@ void sub_8179944(void) MapGridSetMetatileIdAt(16, 27, 3636); DrawWholeMapView(); PlaySE(SE_BAN); - FlagSet(FLAG_SYS_BRAILLE_FLY); + FlagSet(FLAG_SYS_BRAILLE_REGISTEEL_HM); ScriptContext2_Disable(); } @@ -332,7 +334,7 @@ void sub_8179944(void) void DoBrailleWait(void) { /* - if (!FlagGet(FLAG_SYS_BRAILLE_WAIT)) + if (!FlagGet(FLAG_SYS_BRAILLE_REGICE_PUZZLE)) CreateTask(Task_BrailleWait, 0x50); } @@ -410,15 +412,15 @@ bool8 FldEff_UsePuzzleEffect(void) { u8 taskId = oei_task_add(); - if (sBraillePuzzleCallbackFlag == FLY_PUZZLE) + if (sBraillePuzzleCallbackFlag == REGISTEEL_PUZZLE) { - gTasks[taskId].data[8] = (u32)UseFlyAncientTomb_Callback >> 16; - gTasks[taskId].data[9] = (u32)UseFlyAncientTomb_Callback; + gTasks[taskId].data[8] = (u32)UseRegisteelHm_Callback >> 16; + gTasks[taskId].data[9] = (u32)UseRegisteelHm_Callback; } else { - gTasks[taskId].data[8] = (u32)UseStrengthDesertRuins_Callback >> 16; - gTasks[taskId].data[9] = (u32)UseStrengthDesertRuins_Callback; + gTasks[taskId].data[8] = (u32)UseRegirockHm_Callback >> 16; + gTasks[taskId].data[9] = (u32)UseRegirockHm_Callback; } return FALSE; } @@ -430,7 +432,7 @@ bool8 ShouldDoBrailleRegicePuzzle(void) if (gSaveBlock1Ptr->location.mapGroup == 0x18 && gSaveBlock1Ptr->location.mapNum == 0x43) { - if (FlagGet(FLAG_SYS_BRAILLE_WAIT) != FALSE) + if (FlagGet(FLAG_SYS_BRAILLE_REGICE_PUZZLE)) return FALSE; if (FlagGet(FLAG_TEMP_2) == FALSE) return FALSE; @@ -439,35 +441,36 @@ bool8 ShouldDoBrailleRegicePuzzle(void) for (i = 0; i < 36; i++) { - u8 xPos = gUnknown_085EFE74[i][0]; - u8 yPos = gUnknown_085EFE74[i][1]; + u8 xPos = gRegicePathCoords[i][0]; + u8 yPos = gRegicePathCoords[i][1]; if (gSaveBlock1Ptr->pos.x == xPos && gSaveBlock1Ptr->pos.y == yPos) { u16 varValue; if (i < 16) { - u16 val = VarGet(VAR_0x403B); + u16 val = VarGet(VAR_REGICE_STEPS_1); val |= 1 << i; - VarSet(VAR_0x403B, val); + VarSet(VAR_REGICE_STEPS_1, val); } else if (i < 32) { - u16 val = VarGet(VAR_0x403C); + u16 val = VarGet(VAR_REGICE_STEPS_2); val |= 1 << (i - 16); - VarSet(VAR_0x403C, val); + VarSet(VAR_REGICE_STEPS_2, val); } else { - u16 val = VarGet(VAR_0x403D); + u16 val = VarGet(VAR_REGICE_STEPS_3); val |= 1 << (i - 32); - VarSet(VAR_0x403D, val); + VarSet(VAR_REGICE_STEPS_3, val); } - varValue = VarGet(VAR_0x403B); - if (varValue != 0xFFFF || VarGet(VAR_0x403C) != varValue || VarGet(VAR_0x403D) != 0xF) + varValue = VarGet(VAR_REGICE_STEPS_1); + if (varValue != 0xFFFF || VarGet(VAR_REGICE_STEPS_2) != varValue || VarGet(VAR_REGICE_STEPS_3) != 0xF) return FALSE; + // This final check is redundant. if (gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 21) return TRUE; else diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index f3bd76cbf6..c002f700f6 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -74,11 +74,13 @@ static const u32 gCaveTransitionTiles[] = INCBIN_U32("graphics/misc/cave_transit // text bool8 SetUpFieldMove_Flash(void) { - if (ShouldDoBrailleFlyEffect()) + // In Ruby and Sapphire, Registeel's tomb is opened by using Fly. In Emerald, + // Flash is used instead. + if (ShouldDoBrailleRegisteelEffect()) { gSpecialVar_Result = GetCursorSelectionMonId(); gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; - gPostMenuFieldCallback = sub_8179918; + gPostMenuFieldCallback = SetUpPuzzleEffectRegisteel; return TRUE; } else if (gMapHeader.cave == TRUE && !FlagGet(FLAG_SYS_USE_FLASH)) diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index 9181b55324..86df8e943a 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -119,11 +119,13 @@ static void sub_813561C(u8 taskId) bool8 SetUpFieldMove_RockSmash(void) { - if (ShouldDoBrailleStrengthEffect()) + // In Ruby and Sapphire, Regirock's tomb is opened by using Strength. In Emerald, + // it is opened by using Rock Smash. + if (ShouldDoBrailleRegirockEffect()) { gSpecialVar_Result = GetCursorSelectionMonId(); gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; - gPostMenuFieldCallback = sub_8179834; + gPostMenuFieldCallback = SetUpPuzzleEffectRegirock; return TRUE; } else if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE) From 0b1bb9e4e934a26f8b165b00e08f8c2f8ed8953d Mon Sep 17 00:00:00 2001 From: garak Date: Sat, 16 Feb 2019 16:44:48 -0500 Subject: [PATCH 046/217] use strings for map json coord_event var_value --- data/maps/AquaHideout_B2F/map.json | 4 +- .../map.json | 14 ++-- .../map.json | 14 ++-- .../map.json | 18 ++--- .../BattleFrontier_BattlePyramidTop/map.json | 2 +- data/maps/DoubleBattleColosseum/map.json | 8 +-- data/maps/EverGrandeCity/map.json | 22 +++--- data/maps/FarawayIsland_Entrance/map.json | 6 +- data/maps/InsideOfTruck/map.json | 6 +- data/maps/JaggedPass/map.json | 10 +-- data/maps/LavaridgeTown/map.json | 2 +- .../LilycoveCity_CoveLilyMotel_1F/map.json | 2 +- data/maps/LittlerootTown/map.json | 18 ++--- .../LittlerootTown_BrendansHouse_1F/map.json | 8 +-- .../maps/LittlerootTown_MaysHouse_1F/map.json | 8 +-- data/maps/MarineCave_End/map.json | 2 +- data/maps/MauvilleCity_Gym/map.json | 8 +-- data/maps/MeteorFalls_1F_1R/map.json | 2 +- data/maps/MossdeepCity/map.json | 20 +++--- data/maps/MossdeepCity_Gym/map.json | 18 ++--- data/maps/MtPyre_Exterior/map.json | 10 +-- data/maps/MtPyre_Summit/map.json | 12 ++-- data/maps/NavelRock_Top/map.json | 2 +- data/maps/NewMauville_Entrance/map.json | 2 +- data/maps/NewMauville_Inside/map.json | 20 +++--- data/maps/OldaleTown/map.json | 8 +-- data/maps/PetalburgCity/map.json | 16 ++--- data/maps/PetalburgWoods/map.json | 4 +- data/maps/RecordCorner/map.json | 8 +-- data/maps/Route101/map.json | 18 ++--- data/maps/Route104/map.json | 2 +- data/maps/Route110/map.json | 18 ++--- .../map.json | 4 +- .../map.json | 4 +- data/maps/Route110_TrickHouseEnd/map.json | 2 +- .../maps/Route110_TrickHouseEntrance/map.json | 8 +-- data/maps/Route110_TrickHousePuzzle2/map.json | 8 +-- data/maps/Route110_TrickHousePuzzle3/map.json | 8 +-- data/maps/Route110_TrickHousePuzzle5/map.json | 44 ++++++------ data/maps/Route110_TrickHousePuzzle7/map.json | 8 +-- data/maps/Route111/map.json | 68 +++++++++---------- .../Route114_FossilManiacsTunnel/map.json | 4 +- data/maps/Route116/map.json | 2 +- data/maps/Route118/map.json | 6 +- data/maps/Route119/map.json | 4 +- data/maps/Route121/map.json | 8 +-- .../maps/Route121_SafariZoneEntrance/map.json | 2 +- data/maps/RustboroCity/map.json | 42 ++++++------ data/maps/RusturfTunnel/map.json | 10 +-- data/maps/SeafloorCavern_Room9/map.json | 2 +- data/maps/SingleBattleColosseum/map.json | 4 +- data/maps/SkyPillar_Top/map.json | 2 +- data/maps/SlateportCity/map.json | 2 +- data/maps/SlateportCity_Harbor/map.json | 8 +-- .../SlateportCity_OceanicMuseum_1F/map.json | 4 +- data/maps/TerraCave_End/map.json | 2 +- data/maps/TradeCenter/map.json | 4 +- data/maps/TrainerHill_Entrance/map.json | 2 +- data/maps/VictoryRoad_1F/map.json | 4 +- tools/mapjson/mapjson.cpp | 2 +- 60 files changed, 290 insertions(+), 290 deletions(-) diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json index 56bbaab304..e028195fa6 100644 --- a/data/maps/AquaHideout_B2F/map.json +++ b/data/maps/AquaHideout_B2F/map.json @@ -172,7 +172,7 @@ "y": 17, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "AquaHideout_B2F_EventScript_233DE5" }, { @@ -181,7 +181,7 @@ "y": 16, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "AquaHideout_B2F_EventScript_233DE5" } ], diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json index 9ed644d798..0a548665c5 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json @@ -49,7 +49,7 @@ "y": 3, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2" }, { @@ -58,7 +58,7 @@ "y": 6, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082" }, { @@ -67,7 +67,7 @@ "y": 7, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 1, + "var_value": "1", "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D" }, { @@ -76,7 +76,7 @@ "y": 6, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082" }, { @@ -85,7 +85,7 @@ "y": 6, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082" }, { @@ -94,7 +94,7 @@ "y": 7, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 1, + "var_value": "1", "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D" }, { @@ -103,7 +103,7 @@ "y": 7, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 1, + "var_value": "1", "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D" } ], diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json index 60aeee81cc..6e0e749605 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json @@ -22,7 +22,7 @@ "y": 3, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174" }, { @@ -31,7 +31,7 @@ "y": 18, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202" }, { @@ -40,7 +40,7 @@ "y": 18, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202" }, { @@ -49,7 +49,7 @@ "y": 18, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202" }, { @@ -58,7 +58,7 @@ "y": 19, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 1, + "var_value": "1", "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D" }, { @@ -67,7 +67,7 @@ "y": 19, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 1, + "var_value": "1", "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D" }, { @@ -76,7 +76,7 @@ "y": 19, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 1, + "var_value": "1", "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D" } ], diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json index e2d0645cb0..ca416ce540 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json @@ -49,7 +49,7 @@ "y": 3, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E" }, { @@ -58,7 +58,7 @@ "y": 3, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59" }, { @@ -67,7 +67,7 @@ "y": 3, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64" }, { @@ -76,7 +76,7 @@ "y": 10, "elevation": 0, "var": "VAR_TEMP_3", - "var_value": 1, + "var_value": "1", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" }, { @@ -85,7 +85,7 @@ "y": 10, "elevation": 0, "var": "VAR_TEMP_3", - "var_value": 1, + "var_value": "1", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" }, { @@ -94,7 +94,7 @@ "y": 9, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" }, { @@ -103,7 +103,7 @@ "y": 9, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" }, { @@ -112,7 +112,7 @@ "y": 9, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" }, { @@ -121,7 +121,7 @@ "y": 10, "elevation": 0, "var": "VAR_TEMP_3", - "var_value": 1, + "var_value": "1", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" } ], diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.json b/data/maps/BattleFrontier_BattlePyramidTop/map.json index 09fe56ef1a..ff5fc875a3 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/map.json +++ b/data/maps/BattleFrontier_BattlePyramidTop/map.json @@ -49,7 +49,7 @@ "y": 9, "elevation": 4, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePyramidTop_EventScript_255256" } ], diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/DoubleBattleColosseum/map.json index c0cd887613..7480e36c1f 100644 --- a/data/maps/DoubleBattleColosseum/map.json +++ b/data/maps/DoubleBattleColosseum/map.json @@ -51,7 +51,7 @@ "y": 4, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "gUnknown_08277388" }, { @@ -60,7 +60,7 @@ "y": 6, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "gUnknown_082773BE" }, { @@ -69,7 +69,7 @@ "y": 4, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "gUnknown_082773A3" }, { @@ -78,7 +78,7 @@ "y": 6, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "gUnknown_082773D9" } ], diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 4812461f7c..502aae2fc6 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -57,7 +57,7 @@ "y": 58, "elevation": 1, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "EverGrandeCity_EventScript_1E7D46" }, { @@ -66,7 +66,7 @@ "y": 58, "elevation": 1, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "EverGrandeCity_EventScript_1E7D46" }, { @@ -75,7 +75,7 @@ "y": 58, "elevation": 1, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "EverGrandeCity_EventScript_1E7D46" }, { @@ -84,7 +84,7 @@ "y": 58, "elevation": 1, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "EverGrandeCity_EventScript_1E7D46" }, { @@ -93,7 +93,7 @@ "y": 58, "elevation": 1, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "EverGrandeCity_EventScript_1E7D46" }, { @@ -102,7 +102,7 @@ "y": 58, "elevation": 1, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "EverGrandeCity_EventScript_1E7D46" }, { @@ -111,7 +111,7 @@ "y": 58, "elevation": 1, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "EverGrandeCity_EventScript_1E7D46" }, { @@ -120,7 +120,7 @@ "y": 58, "elevation": 1, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "EverGrandeCity_EventScript_1E7D46" }, { @@ -129,7 +129,7 @@ "y": 58, "elevation": 1, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "EverGrandeCity_EventScript_1E7D46" }, { @@ -138,7 +138,7 @@ "y": 58, "elevation": 1, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "EverGrandeCity_EventScript_1E7D46" }, { @@ -147,7 +147,7 @@ "y": 58, "elevation": 1, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "EverGrandeCity_EventScript_1E7D46" } ], diff --git a/data/maps/FarawayIsland_Entrance/map.json b/data/maps/FarawayIsland_Entrance/map.json index 683010e127..93dd0b584f 100644 --- a/data/maps/FarawayIsland_Entrance/map.json +++ b/data/maps/FarawayIsland_Entrance/map.json @@ -64,7 +64,7 @@ "y": 18, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "FarawayIsland_Entrance_EventScript_267C98" }, { @@ -73,7 +73,7 @@ "y": 20, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "FarawayIsland_Entrance_EventScript_267C9D" }, { @@ -82,7 +82,7 @@ "y": 9, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "FarawayIsland_Entrance_EventScript_267C98" } ], diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index 4978d841ca..0719696c01 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -84,7 +84,7 @@ "y": 1, "elevation": 3, "var": "VAR_0x4092", - "var_value": 0, + "var_value": "0", "script": "InsideOfTruck_EventScript_23BF04" }, { @@ -93,7 +93,7 @@ "y": 2, "elevation": 3, "var": "VAR_0x4092", - "var_value": 0, + "var_value": "0", "script": "InsideOfTruck_EventScript_23BF04" }, { @@ -102,7 +102,7 @@ "y": 3, "elevation": 3, "var": "VAR_0x4092", - "var_value": 0, + "var_value": "0", "script": "InsideOfTruck_EventScript_23BF04" } ], diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index 748fc99149..1e344bff0e 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -185,7 +185,7 @@ "y": 15, "elevation": 3, "var": "VAR_0x40C8", - "var_value": 1, + "var_value": "1", "script": "JaggedPass_EventScript_2306BB" }, { @@ -194,7 +194,7 @@ "y": 20, "elevation": 3, "var": "VAR_0x40C8", - "var_value": 1, + "var_value": "1", "script": "JaggedPass_EventScript_2306BB" }, { @@ -203,7 +203,7 @@ "y": 20, "elevation": 3, "var": "VAR_0x40C8", - "var_value": 1, + "var_value": "1", "script": "JaggedPass_EventScript_2306BB" }, { @@ -212,7 +212,7 @@ "y": 15, "elevation": 3, "var": "VAR_0x40C8", - "var_value": 1, + "var_value": "1", "script": "JaggedPass_EventScript_2306BB" }, { @@ -221,7 +221,7 @@ "y": 15, "elevation": 3, "var": "VAR_0x40C8", - "var_value": 1, + "var_value": "1", "script": "JaggedPass_EventScript_2306BB" } ], diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index 6bf3162c8e..fa59b5e0ee 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -189,7 +189,7 @@ "y": 3, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "LavaridgeTown_EventScript_1EA6FA" } ], diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json index f00b407c70..f42538ba51 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -58,7 +58,7 @@ "y": 2, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_218211" } ], diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json index 28decfc87f..1d0c2763a4 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -155,7 +155,7 @@ "y": 1, "elevation": 3, "var": "VAR_0x4050", - "var_value": 0, + "var_value": "0", "script": "LittlerootTown_EventScript_1E8091" }, { @@ -164,7 +164,7 @@ "y": 1, "elevation": 3, "var": "VAR_0x4050", - "var_value": 0, + "var_value": "0", "script": "LittlerootTown_EventScript_1E80EF" }, { @@ -173,7 +173,7 @@ "y": 1, "elevation": 3, "var": "VAR_0x4050", - "var_value": 1, + "var_value": "1", "script": "LittlerootTown_EventScript_1E811F" }, { @@ -182,7 +182,7 @@ "y": 9, "elevation": 3, "var": "VAR_0x4050", - "var_value": 3, + "var_value": "3", "script": "LittlerootTown_EventScript_1E81F9" }, { @@ -191,7 +191,7 @@ "y": 9, "elevation": 3, "var": "VAR_0x4050", - "var_value": 3, + "var_value": "3", "script": "LittlerootTown_EventScript_1E8205" }, { @@ -200,7 +200,7 @@ "y": 9, "elevation": 3, "var": "VAR_0x4050", - "var_value": 3, + "var_value": "3", "script": "LittlerootTown_EventScript_1E81E1" }, { @@ -209,7 +209,7 @@ "y": 9, "elevation": 3, "var": "VAR_0x4050", - "var_value": 3, + "var_value": "3", "script": "LittlerootTown_EventScript_1E81ED" }, { @@ -218,7 +218,7 @@ "y": 2, "elevation": 3, "var": "VAR_0x4050", - "var_value": 3, + "var_value": "3", "script": "LittlerootTown_EventScript_1E81BB" }, { @@ -227,7 +227,7 @@ "y": 2, "elevation": 3, "var": "VAR_0x4050", - "var_value": 3, + "var_value": "3", "script": "LittlerootTown_EventScript_1E81CE" } ], diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index 79f3c75a8d..efa6f6079e 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -136,7 +136,7 @@ "y": 8, "elevation": 0, "var": "VAR_0x4092", - "var_value": 4, + "var_value": "4", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78A3" }, { @@ -145,7 +145,7 @@ "y": 3, "elevation": 0, "var": "VAR_0x408D", - "var_value": 2, + "var_value": "2", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78BE" }, { @@ -154,7 +154,7 @@ "y": 4, "elevation": 0, "var": "VAR_0x408D", - "var_value": 2, + "var_value": "2", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78CA" }, { @@ -163,7 +163,7 @@ "y": 3, "elevation": 0, "var": "VAR_0x408D", - "var_value": 2, + "var_value": "2", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78D6" } ], diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index 817def8b2a..34260c77ac 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -136,7 +136,7 @@ "y": 8, "elevation": 0, "var": "VAR_0x4092", - "var_value": 4, + "var_value": "4", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A4C" }, { @@ -145,7 +145,7 @@ "y": 3, "elevation": 0, "var": "VAR_0x408D", - "var_value": 2, + "var_value": "2", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A67" }, { @@ -154,7 +154,7 @@ "y": 4, "elevation": 0, "var": "VAR_0x408D", - "var_value": 2, + "var_value": "2", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A73" }, { @@ -163,7 +163,7 @@ "y": 3, "elevation": 0, "var": "VAR_0x408D", - "var_value": 2, + "var_value": "2", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A7F" } ], diff --git a/data/maps/MarineCave_End/map.json b/data/maps/MarineCave_End/map.json index 017adcc9a3..eb3d5cc62a 100644 --- a/data/maps/MarineCave_End/map.json +++ b/data/maps/MarineCave_End/map.json @@ -44,7 +44,7 @@ "y": 26, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 1, + "var_value": "1", "script": "MarineCave_End_EventScript_23B01B" } ], diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json index 2ae4cb474e..6a4429fa76 100644 --- a/data/maps/MauvilleCity_Gym/map.json +++ b/data/maps/MauvilleCity_Gym/map.json @@ -129,7 +129,7 @@ "y": 12, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "MauvilleCity_Gym_EventScript_20E01E" }, { @@ -138,7 +138,7 @@ "y": 9, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "MauvilleCity_Gym_EventScript_20E043" }, { @@ -147,7 +147,7 @@ "y": 15, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "MauvilleCity_Gym_EventScript_20DFF9" }, { @@ -156,7 +156,7 @@ "y": 9, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "MauvilleCity_Gym_EventScript_20E068" } ], diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index c7611f2fd4..2f20b485f0 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -196,7 +196,7 @@ "y": 18, "elevation": 4, "var": "VAR_0x40BF", - "var_value": 0, + "var_value": "0", "script": "MeteorFalls_1F_1R_EventScript_22BD5F" } ], diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index 66d4267807..c4eb8e7731 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -331,7 +331,7 @@ "y": 25, "elevation": 0, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "MossdeepCity_EventScript_1E4B38" }, { @@ -340,7 +340,7 @@ "y": 25, "elevation": 0, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "MossdeepCity_EventScript_1E4B38" }, { @@ -349,7 +349,7 @@ "y": 27, "elevation": 0, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "MossdeepCity_EventScript_1E4B38" }, { @@ -358,7 +358,7 @@ "y": 27, "elevation": 0, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "MossdeepCity_EventScript_1E4B38" }, { @@ -367,7 +367,7 @@ "y": 21, "elevation": 5, "var": "VAR_0x405D", - "var_value": 1, + "var_value": "1", "script": "MossdeepCity_EventScript_1E4B41" }, { @@ -376,7 +376,7 @@ "y": 22, "elevation": 5, "var": "VAR_0x405D", - "var_value": 1, + "var_value": "1", "script": "MossdeepCity_EventScript_1E4B41" }, { @@ -385,7 +385,7 @@ "y": 23, "elevation": 5, "var": "VAR_0x405D", - "var_value": 1, + "var_value": "1", "script": "MossdeepCity_EventScript_1E4B41" }, { @@ -394,7 +394,7 @@ "y": 24, "elevation": 5, "var": "VAR_0x405D", - "var_value": 1, + "var_value": "1", "script": "MossdeepCity_EventScript_1E4B41" }, { @@ -403,7 +403,7 @@ "y": 25, "elevation": 5, "var": "VAR_0x405D", - "var_value": 1, + "var_value": "1", "script": "MossdeepCity_EventScript_1E4B41" }, { @@ -412,7 +412,7 @@ "y": 26, "elevation": 5, "var": "VAR_0x405D", - "var_value": 1, + "var_value": "1", "script": "MossdeepCity_EventScript_1E4B41" } ], diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json index 37c41435b0..81ce5e4689 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -590,7 +590,7 @@ "y": 21, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "MossdeepCity_Gym_EventScript_220C67" }, { @@ -599,7 +599,7 @@ "y": 10, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "MossdeepCity_Gym_EventScript_220C7D" }, { @@ -608,7 +608,7 @@ "y": 7, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "MossdeepCity_Gym_EventScript_220C7D" }, { @@ -617,7 +617,7 @@ "y": 34, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "MossdeepCity_Gym_EventScript_220C93" }, { @@ -626,7 +626,7 @@ "y": 24, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "MossdeepCity_Gym_EventScript_220CA9" }, { @@ -635,7 +635,7 @@ "y": 21, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "MossdeepCity_Gym_EventScript_220CA9" }, { @@ -644,7 +644,7 @@ "y": 6, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "MossdeepCity_Gym_EventScript_220CBF" }, { @@ -653,7 +653,7 @@ "y": 6, "elevation": 0, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "MossdeepCity_Gym_EventScript_220AF1" }, { @@ -662,7 +662,7 @@ "y": 30, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "MossdeepCity_Gym_EventScript_220C67" } ], diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json index 2075fed62c..6b35427dfb 100644 --- a/data/maps/MtPyre_Exterior/map.json +++ b/data/maps/MtPyre_Exterior/map.json @@ -71,7 +71,7 @@ "y": 21, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "MtPyre_Exterior_EventScript_231FED" }, { @@ -80,7 +80,7 @@ "y": 21, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "MtPyre_Exterior_EventScript_231FED" }, { @@ -89,7 +89,7 @@ "y": 27, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "MtPyre_Exterior_EventScript_231FF2" }, { @@ -98,7 +98,7 @@ "y": 28, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "MtPyre_Exterior_EventScript_231FF2" }, { @@ -107,7 +107,7 @@ "y": 21, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "MtPyre_Exterior_EventScript_231FED" } ], diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index cc9efce093..d729766d58 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -149,7 +149,7 @@ "y": 7, "elevation": 3, "var": "VAR_0x40B9", - "var_value": 0, + "var_value": "0", "script": "MtPyre_Summit_EventScript_232018" }, { @@ -158,7 +158,7 @@ "y": 7, "elevation": 3, "var": "VAR_0x40B9", - "var_value": 0, + "var_value": "0", "script": "MtPyre_Summit_EventScript_232024" }, { @@ -167,7 +167,7 @@ "y": 7, "elevation": 3, "var": "VAR_0x40B9", - "var_value": 0, + "var_value": "0", "script": "MtPyre_Summit_EventScript_232030" }, { @@ -176,7 +176,7 @@ "y": 9, "elevation": 3, "var": "VAR_0x40B9", - "var_value": 2, + "var_value": "2", "script": "MtPyre_Summit_EventScript_2321EC" }, { @@ -185,7 +185,7 @@ "y": 9, "elevation": 3, "var": "VAR_0x40B9", - "var_value": 2, + "var_value": "2", "script": "MtPyre_Summit_EventScript_2321F8" }, { @@ -194,7 +194,7 @@ "y": 9, "elevation": 3, "var": "VAR_0x40B9", - "var_value": 2, + "var_value": "2", "script": "MtPyre_Summit_EventScript_232204" } ], diff --git a/data/maps/NavelRock_Top/map.json b/data/maps/NavelRock_Top/map.json index cc2070e7e3..93e35bdea0 100644 --- a/data/maps/NavelRock_Top/map.json +++ b/data/maps/NavelRock_Top/map.json @@ -44,7 +44,7 @@ "y": 10, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "NavelRock_Top_EventScript_26916F" } ], diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json index bfc15c8a06..00467c1d9d 100644 --- a/data/maps/NewMauville_Entrance/map.json +++ b/data/maps/NewMauville_Entrance/map.json @@ -37,7 +37,7 @@ "y": 2, "elevation": 3, "var": "VAR_0x40BA", - "var_value": 0, + "var_value": "0", "script": "NewMauville_Entrance_EventScript_2372FF" } ], diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index 223faec2d9..73a15bd0ce 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -135,7 +135,7 @@ "y": 38, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "NewMauville_Inside_EventScript_237459" }, { @@ -144,7 +144,7 @@ "y": 36, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "NewMauville_Inside_EventScript_237471" }, { @@ -153,7 +153,7 @@ "y": 26, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "NewMauville_Inside_EventScript_237459" }, { @@ -162,7 +162,7 @@ "y": 22, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "NewMauville_Inside_EventScript_237459" }, { @@ -171,7 +171,7 @@ "y": 18, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "NewMauville_Inside_EventScript_237471" }, { @@ -180,7 +180,7 @@ "y": 11, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "NewMauville_Inside_EventScript_237471" }, { @@ -189,7 +189,7 @@ "y": 11, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "NewMauville_Inside_EventScript_237459" }, { @@ -198,7 +198,7 @@ "y": 10, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "NewMauville_Inside_EventScript_237459" }, { @@ -207,7 +207,7 @@ "y": 10, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "NewMauville_Inside_EventScript_237471" }, { @@ -216,7 +216,7 @@ "y": 6, "elevation": 3, "var": "VAR_0x40BA", - "var_value": 1, + "var_value": "1", "script": "NewMauville_Inside_EventScript_237725" } ], diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 378d108e27..75437393fd 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -120,7 +120,7 @@ "y": 10, "elevation": 3, "var": "VAR_0x4051", - "var_value": 0, + "var_value": "0", "script": "OldaleTown_EventScript_1E903F" }, { @@ -129,7 +129,7 @@ "y": 19, "elevation": 3, "var": "VAR_0x40C7", - "var_value": 1, + "var_value": "1", "script": "OldaleTown_EventScript_1E9086" }, { @@ -138,7 +138,7 @@ "y": 19, "elevation": 3, "var": "VAR_0x40C7", - "var_value": 1, + "var_value": "1", "script": "OldaleTown_EventScript_1E90A6" }, { @@ -147,7 +147,7 @@ "y": 19, "elevation": 3, "var": "VAR_0x40C7", - "var_value": 1, + "var_value": "1", "script": "OldaleTown_EventScript_1E90C6" } ], diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index e62590b814..475eed1d4a 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -194,7 +194,7 @@ "y": 10, "elevation": 3, "var": "VAR_0x4057", - "var_value": 0, + "var_value": "0", "script": "PetalburgCity_EventScript_1DC49A" }, { @@ -203,7 +203,7 @@ "y": 11, "elevation": 3, "var": "VAR_0x4057", - "var_value": 0, + "var_value": "0", "script": "PetalburgCity_EventScript_1DC4A6" }, { @@ -212,7 +212,7 @@ "y": 12, "elevation": 3, "var": "VAR_0x4057", - "var_value": 0, + "var_value": "0", "script": "PetalburgCity_EventScript_1DC4B2" }, { @@ -221,7 +221,7 @@ "y": 13, "elevation": 3, "var": "VAR_0x4057", - "var_value": 0, + "var_value": "0", "script": "PetalburgCity_EventScript_1DC4BE" }, { @@ -230,7 +230,7 @@ "y": 10, "elevation": 3, "var": "VAR_0x40C9", - "var_value": 0, + "var_value": "0", "script": "PetalburgCity_EventScript_1DC691" }, { @@ -239,7 +239,7 @@ "y": 11, "elevation": 3, "var": "VAR_0x40C9", - "var_value": 0, + "var_value": "0", "script": "PetalburgCity_EventScript_1DC6A7" }, { @@ -248,7 +248,7 @@ "y": 12, "elevation": 3, "var": "VAR_0x40C9", - "var_value": 0, + "var_value": "0", "script": "PetalburgCity_EventScript_1DC6BD" }, { @@ -257,7 +257,7 @@ "y": 13, "elevation": 3, "var": "VAR_0x40C9", - "var_value": 0, + "var_value": "0", "script": "PetalburgCity_EventScript_1DC6D3" } ], diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index 9a5f051b39..534f88c925 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -235,7 +235,7 @@ "y": 23, "elevation": 3, "var": "VAR_0x4098", - "var_value": 0, + "var_value": "0", "script": "PetalburgWoods_EventScript_22DFD7" }, { @@ -244,7 +244,7 @@ "y": 23, "elevation": 3, "var": "VAR_0x4098", - "var_value": 0, + "var_value": "0", "script": "PetalburgWoods_EventScript_22E079" } ], diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index 98bcc02012..4b5d55c378 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -65,7 +65,7 @@ "y": 4, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "gUnknown_0827741D" }, { @@ -74,7 +74,7 @@ "y": 6, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "gUnknown_08277447" }, { @@ -83,7 +83,7 @@ "y": 4, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "gUnknown_08277432" }, { @@ -92,7 +92,7 @@ "y": 6, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "gUnknown_0827745C" } ], diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 673db80eab..4bda7149be 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -112,7 +112,7 @@ "y": 19, "elevation": 3, "var": "VAR_0x4060", - "var_value": 1, + "var_value": "1", "script": "Route101_EventScript_1EBCDE" }, { @@ -121,7 +121,7 @@ "y": 19, "elevation": 3, "var": "VAR_0x4060", - "var_value": 1, + "var_value": "1", "script": "Route101_EventScript_1EBCDE" }, { @@ -130,7 +130,7 @@ "y": 18, "elevation": 3, "var": "VAR_0x4060", - "var_value": 2, + "var_value": "2", "script": "Route101_EventScript_1EBD4E" }, { @@ -139,7 +139,7 @@ "y": 18, "elevation": 3, "var": "VAR_0x4060", - "var_value": 2, + "var_value": "2", "script": "Route101_EventScript_1EBD4E" }, { @@ -148,7 +148,7 @@ "y": 16, "elevation": 3, "var": "VAR_0x4060", - "var_value": 2, + "var_value": "2", "script": "Route101_EventScript_1EBD64" }, { @@ -157,7 +157,7 @@ "y": 15, "elevation": 3, "var": "VAR_0x4060", - "var_value": 2, + "var_value": "2", "script": "Route101_EventScript_1EBD64" }, { @@ -166,7 +166,7 @@ "y": 17, "elevation": 3, "var": "VAR_0x4060", - "var_value": 2, + "var_value": "2", "script": "Route101_EventScript_1EBD64" }, { @@ -175,7 +175,7 @@ "y": 18, "elevation": 3, "var": "VAR_0x4060", - "var_value": 2, + "var_value": "2", "script": "Route101_EventScript_1EBD64" }, { @@ -184,7 +184,7 @@ "y": 13, "elevation": 3, "var": "VAR_0x4060", - "var_value": 2, + "var_value": "2", "script": "Route101_EventScript_1EBD7A" } ], diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json index 733ad49899..0b0ed68371 100644 --- a/data/maps/Route104/map.json +++ b/data/maps/Route104/map.json @@ -538,7 +538,7 @@ "y": 51, "elevation": 3, "var": "VAR_0x4063", - "var_value": 1, + "var_value": "1", "script": "Route104_EventScript_1ECCB3" } ], diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index 1891b89f78..bcf04e1efb 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -550,7 +550,7 @@ "y": 92, "elevation": 3, "var": "VAR_CYCLING_CHALLENGE_STATE", - "var_value": 2, + "var_value": "2", "script": "Route110_EventScript_1EF661" }, { @@ -559,7 +559,7 @@ "y": 92, "elevation": 3, "var": "VAR_CYCLING_CHALLENGE_STATE", - "var_value": 2, + "var_value": "2", "script": "Route110_EventScript_1EF661" }, { @@ -568,7 +568,7 @@ "y": 56, "elevation": 3, "var": "VAR_0x4069", - "var_value": 0, + "var_value": "0", "script": "Route110_EventScript_1EF74D" }, { @@ -577,7 +577,7 @@ "y": 56, "elevation": 3, "var": "VAR_0x4069", - "var_value": 0, + "var_value": "0", "script": "Route110_EventScript_1EF758" }, { @@ -586,7 +586,7 @@ "y": 56, "elevation": 3, "var": "VAR_0x4069", - "var_value": 0, + "var_value": "0", "script": "Route110_EventScript_1EF763" }, { @@ -595,7 +595,7 @@ "y": 85, "elevation": 3, "var": "VAR_0x40DA", - "var_value": 1, + "var_value": "1", "script": "Route110_EventScript_1EF9CB" }, { @@ -604,7 +604,7 @@ "y": 85, "elevation": 3, "var": "VAR_0x40DA", - "var_value": 1, + "var_value": "1", "script": "Route110_EventScript_1EF9D6" }, { @@ -613,7 +613,7 @@ "y": 85, "elevation": 3, "var": "VAR_0x40DA", - "var_value": 1, + "var_value": "1", "script": "Route110_EventScript_1EF9E1" }, { @@ -622,7 +622,7 @@ "y": 85, "elevation": 3, "var": "VAR_0x40DA", - "var_value": 1, + "var_value": "1", "script": "Route110_EventScript_1EF9EC" } ], diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json index 119d5b55cb..5536716af1 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -65,7 +65,7 @@ "y": 4, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84" }, { @@ -74,7 +74,7 @@ "y": 4, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 1, + "var_value": "1", "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6" } ], diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json index c5c63def13..347f22ba12 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -65,7 +65,7 @@ "y": 4, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0" }, { @@ -74,7 +74,7 @@ "y": 4, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 1, + "var_value": "1", "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13" } ], diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json index dafcec8a67..13c6b53a5f 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -51,7 +51,7 @@ "y": 2, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHouseEnd_EventScript_26B041" } ], diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index 2f85d66c59..cd2e63edc9 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -58,7 +58,7 @@ "y": 7, "elevation": 3, "var": "VAR_0x40A5", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" }, { @@ -67,7 +67,7 @@ "y": 6, "elevation": 3, "var": "VAR_0x40A5", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" }, { @@ -76,7 +76,7 @@ "y": 6, "elevation": 3, "var": "VAR_0x40A5", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" }, { @@ -85,7 +85,7 @@ "y": 7, "elevation": 3, "var": "VAR_0x40A5", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" } ], diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json index 0c49c00f27..12b436f734 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.json +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -110,7 +110,7 @@ "y": 12, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle2_EventScript_26BBDD" }, { @@ -119,7 +119,7 @@ "y": 4, "elevation": 0, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle2_EventScript_26BBF0" }, { @@ -128,7 +128,7 @@ "y": 5, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle2_EventScript_26BC03" }, { @@ -137,7 +137,7 @@ "y": 11, "elevation": 3, "var": "VAR_TEMP_4", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle2_EventScript_26BC16" } ], diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index 8a60428d26..5d6227cd22 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -136,7 +136,7 @@ "y": 14, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle3_EventScript_26C4CD" }, { @@ -145,7 +145,7 @@ "y": 11, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle3_EventScript_26C4D9" }, { @@ -154,7 +154,7 @@ "y": 5, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle3_EventScript_26C4E5" }, { @@ -163,7 +163,7 @@ "y": 2, "elevation": 3, "var": "VAR_TEMP_4", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle3_EventScript_26C4F1" } ], diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index 6f995d5e9f..5b83f31e0f 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -110,7 +110,7 @@ "y": 17, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CBD7" }, { @@ -119,7 +119,7 @@ "y": 17, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CBE3" }, { @@ -128,7 +128,7 @@ "y": 17, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CBEF" }, { @@ -137,7 +137,7 @@ "y": 17, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CBFB" }, { @@ -146,7 +146,7 @@ "y": 7, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CC13" }, { @@ -155,7 +155,7 @@ "y": 7, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CC1F" }, { @@ -164,7 +164,7 @@ "y": 10, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CC5B" }, { @@ -173,7 +173,7 @@ "y": 10, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CC67" }, { @@ -182,7 +182,7 @@ "y": 10, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CC73" }, { @@ -191,7 +191,7 @@ "y": 19, "elevation": 3, "var": "VAR_TEMP_4", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CC97" }, { @@ -200,7 +200,7 @@ "y": 19, "elevation": 3, "var": "VAR_TEMP_4", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CCA3" }, { @@ -209,7 +209,7 @@ "y": 4, "elevation": 3, "var": "VAR_TEMP_5", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CCDF" }, { @@ -218,7 +218,7 @@ "y": 17, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CC07" }, { @@ -227,7 +227,7 @@ "y": 7, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CC2B" }, { @@ -236,7 +236,7 @@ "y": 7, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CC37" }, { @@ -245,7 +245,7 @@ "y": 7, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CC43" }, { @@ -254,7 +254,7 @@ "y": 7, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CC4F" }, { @@ -263,7 +263,7 @@ "y": 10, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CC7F" }, { @@ -272,7 +272,7 @@ "y": 10, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CC8B" }, { @@ -281,7 +281,7 @@ "y": 19, "elevation": 3, "var": "VAR_TEMP_4", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CCAF" }, { @@ -290,7 +290,7 @@ "y": 19, "elevation": 3, "var": "VAR_TEMP_4", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CCBB" }, { @@ -299,7 +299,7 @@ "y": 19, "elevation": 3, "var": "VAR_TEMP_4", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CCC7" } ], diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json index e21657b67c..a4a12eb7f3 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.json +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -232,7 +232,7 @@ "y": 19, "elevation": 0, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle7_EventScript_26E31B" }, { @@ -241,7 +241,7 @@ "y": 14, "elevation": 0, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle7_EventScript_26E331" }, { @@ -250,7 +250,7 @@ "y": 6, "elevation": 0, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle7_EventScript_26E347" }, { @@ -259,7 +259,7 @@ "y": 7, "elevation": 0, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route110_TrickHousePuzzle7_EventScript_26E35D" } ], diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index 6e2bdf18a0..0061ffefbd 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -673,7 +673,7 @@ "y": 62, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FBD" }, { @@ -682,7 +682,7 @@ "y": 61, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0F0A" }, { @@ -691,7 +691,7 @@ "y": 61, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0F0A" }, { @@ -700,7 +700,7 @@ "y": 61, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0F0A" }, { @@ -709,7 +709,7 @@ "y": 63, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FB0" }, { @@ -718,7 +718,7 @@ "y": 44, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0F16" }, { @@ -727,7 +727,7 @@ "y": 43, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0F16" }, { @@ -736,7 +736,7 @@ "y": 42, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0F16" }, { @@ -745,7 +745,7 @@ "y": 40, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0F16" }, { @@ -754,7 +754,7 @@ "y": 61, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0F0A" }, { @@ -763,7 +763,7 @@ "y": 32, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FB0" }, { @@ -772,7 +772,7 @@ "y": 31, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FB0" }, { @@ -781,7 +781,7 @@ "y": 37, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FB0" }, { @@ -790,7 +790,7 @@ "y": 36, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FB0" }, { @@ -799,7 +799,7 @@ "y": 39, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0F16" }, { @@ -808,7 +808,7 @@ "y": 38, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0F16" }, { @@ -817,7 +817,7 @@ "y": 64, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FB0" }, { @@ -826,7 +826,7 @@ "y": 65, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FB0" }, { @@ -835,7 +835,7 @@ "y": 65, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FB0" }, { @@ -844,7 +844,7 @@ "y": 66, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FB0" }, { @@ -853,7 +853,7 @@ "y": 67, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FB0" }, { @@ -862,7 +862,7 @@ "y": 68, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FB0" }, { @@ -871,7 +871,7 @@ "y": 69, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FB0" }, { @@ -880,7 +880,7 @@ "y": 61, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FBD" }, { @@ -889,7 +889,7 @@ "y": 62, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FBD" }, { @@ -898,7 +898,7 @@ "y": 62, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FBD" }, { @@ -907,7 +907,7 @@ "y": 62, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FBD" }, { @@ -916,7 +916,7 @@ "y": 38, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FBD" }, { @@ -925,7 +925,7 @@ "y": 39, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FBD" }, { @@ -934,7 +934,7 @@ "y": 40, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FBD" }, { @@ -943,7 +943,7 @@ "y": 41, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FBD" }, { @@ -952,7 +952,7 @@ "y": 42, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FBD" }, { @@ -961,7 +961,7 @@ "y": 43, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FBD" }, { @@ -970,7 +970,7 @@ "y": 44, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "Route111_EventScript_1F0FBD" } ], diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index 48b3ca7f49..84370ce04e 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -58,7 +58,7 @@ "y": 4, "elevation": 3, "var": "VAR_0x40CC", - "var_value": 1, + "var_value": "1", "script": "Route114_FossilManiacsTunnel_EventScript_22AF66" }, { @@ -67,7 +67,7 @@ "y": 4, "elevation": 3, "var": "VAR_0x40CC", - "var_value": 1, + "var_value": "1", "script": "Route114_FossilManiacsTunnel_EventScript_22AF66" } ], diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 7e76a9e638..35ced75879 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -434,7 +434,7 @@ "y": 9, "elevation": 3, "var": "VAR_0x406F", - "var_value": 1, + "var_value": "1", "script": "Route116_EventScript_1F2D95" } ], diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index 135e7eb742..8514596c87 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -327,7 +327,7 @@ "y": 11, "elevation": 3, "var": "VAR_0x4071", - "var_value": 0, + "var_value": "0", "script": "Route118_EventScript_1F3E8E" }, { @@ -336,7 +336,7 @@ "y": 11, "elevation": 3, "var": "VAR_0x4071", - "var_value": 0, + "var_value": "0", "script": "Route118_EventScript_1F3EAE" }, { @@ -345,7 +345,7 @@ "y": 11, "elevation": 3, "var": "VAR_0x4071", - "var_value": 0, + "var_value": "0", "script": "Route118_EventScript_1F3EC4" } ], diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index fd6c836b70..b7e59c363f 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -608,7 +608,7 @@ "y": 31, "elevation": 0, "var": "VAR_0x4072", - "var_value": 0, + "var_value": "0", "script": "Route119_EventScript_1F4472" }, { @@ -617,7 +617,7 @@ "y": 31, "elevation": 0, "var": "VAR_0x4072", - "var_value": 0, + "var_value": "0", "script": "Route119_EventScript_1F447D" }, { diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index 82b7139a3b..62719c2c52 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -424,7 +424,7 @@ "y": 5, "elevation": 3, "var": "VAR_0x4074", - "var_value": 0, + "var_value": "0", "script": "Route121_EventScript_1F5E18" }, { @@ -433,7 +433,7 @@ "y": 6, "elevation": 3, "var": "VAR_0x4074", - "var_value": 0, + "var_value": "0", "script": "Route121_EventScript_1F5E18" }, { @@ -442,7 +442,7 @@ "y": 7, "elevation": 3, "var": "VAR_0x4074", - "var_value": 0, + "var_value": "0", "script": "Route121_EventScript_1F5E18" }, { @@ -451,7 +451,7 @@ "y": 8, "elevation": 3, "var": "VAR_0x4074", - "var_value": 0, + "var_value": "0", "script": "Route121_EventScript_1F5E18" } ], diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index 878798477e..bda91381af 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -91,7 +91,7 @@ "y": 4, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route121_SafariZoneEntrance_EventScript_22BC18" } ], diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index 7d09f0cdcb..3ca35fc79f 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -332,7 +332,7 @@ "y": 20, "elevation": 3, "var": "VAR_0x405A", - "var_value": 1, + "var_value": "1", "script": "RustboroCity_EventScript_1E095A" }, { @@ -341,7 +341,7 @@ "y": 21, "elevation": 3, "var": "VAR_0x405A", - "var_value": 1, + "var_value": "1", "script": "RustboroCity_EventScript_1E0971" }, { @@ -350,7 +350,7 @@ "y": 22, "elevation": 3, "var": "VAR_0x405A", - "var_value": 1, + "var_value": "1", "script": "RustboroCity_EventScript_1E0988" }, { @@ -359,7 +359,7 @@ "y": 23, "elevation": 3, "var": "VAR_0x405A", - "var_value": 1, + "var_value": "1", "script": "RustboroCity_EventScript_1E099F" }, { @@ -368,7 +368,7 @@ "y": 24, "elevation": 3, "var": "VAR_0x405A", - "var_value": 1, + "var_value": "1", "script": "RustboroCity_EventScript_1E09B6" }, { @@ -377,7 +377,7 @@ "y": 9, "elevation": 3, "var": "VAR_0x405A", - "var_value": 2, + "var_value": "2", "script": "RustboroCity_EventScript_1E0AFE" }, { @@ -386,7 +386,7 @@ "y": 10, "elevation": 3, "var": "VAR_0x405A", - "var_value": 2, + "var_value": "2", "script": "RustboroCity_EventScript_1E0B0A" }, { @@ -395,7 +395,7 @@ "y": 11, "elevation": 3, "var": "VAR_0x405A", - "var_value": 2, + "var_value": "2", "script": "RustboroCity_EventScript_1E0B16" }, { @@ -404,7 +404,7 @@ "y": 12, "elevation": 3, "var": "VAR_0x405A", - "var_value": 2, + "var_value": "2", "script": "RustboroCity_EventScript_1E0B22" }, { @@ -413,7 +413,7 @@ "y": 9, "elevation": 3, "var": "VAR_0x405A", - "var_value": 4, + "var_value": "4", "script": "RustboroCity_EventScript_1E0C2B" }, { @@ -422,7 +422,7 @@ "y": 10, "elevation": 3, "var": "VAR_0x405A", - "var_value": 4, + "var_value": "4", "script": "RustboroCity_EventScript_1E0C37" }, { @@ -431,7 +431,7 @@ "y": 11, "elevation": 3, "var": "VAR_0x405A", - "var_value": 4, + "var_value": "4", "script": "RustboroCity_EventScript_1E0C43" }, { @@ -440,7 +440,7 @@ "y": 12, "elevation": 3, "var": "VAR_0x405A", - "var_value": 4, + "var_value": "4", "script": "RustboroCity_EventScript_1E0C4F" }, { @@ -449,7 +449,7 @@ "y": 53, "elevation": 3, "var": "VAR_0x405A", - "var_value": 7, + "var_value": "7", "script": "RustboroCity_EventScript_1E0DF3" }, { @@ -458,7 +458,7 @@ "y": 53, "elevation": 3, "var": "VAR_0x405A", - "var_value": 7, + "var_value": "7", "script": "RustboroCity_EventScript_1E0E33" }, { @@ -467,7 +467,7 @@ "y": 53, "elevation": 3, "var": "VAR_0x405A", - "var_value": 7, + "var_value": "7", "script": "RustboroCity_EventScript_1E0E73" }, { @@ -476,7 +476,7 @@ "y": 53, "elevation": 3, "var": "VAR_0x405A", - "var_value": 7, + "var_value": "7", "script": "RustboroCity_EventScript_1E0EB3" }, { @@ -485,7 +485,7 @@ "y": 53, "elevation": 3, "var": "VAR_0x405A", - "var_value": 7, + "var_value": "7", "script": "RustboroCity_EventScript_1E0EF3" }, { @@ -494,7 +494,7 @@ "y": 53, "elevation": 3, "var": "VAR_0x405A", - "var_value": 7, + "var_value": "7", "script": "RustboroCity_EventScript_1E0F33" }, { @@ -503,7 +503,7 @@ "y": 53, "elevation": 3, "var": "VAR_0x405A", - "var_value": 7, + "var_value": "7", "script": "RustboroCity_EventScript_1E0F73" }, { @@ -512,7 +512,7 @@ "y": 53, "elevation": 3, "var": "VAR_0x405A", - "var_value": 7, + "var_value": "7", "script": "RustboroCity_EventScript_1E0FB3" } ], diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index 424dd4789c..7d3287d041 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -175,7 +175,7 @@ "y": 4, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "RusturfTunnel_EventScript_22D071" }, { @@ -184,7 +184,7 @@ "y": 4, "elevation": 3, "var": "VAR_RUSTURF_TUNNEL_STATE", - "var_value": 2, + "var_value": "2", "script": "RusturfTunnel_EventScript_22D083" }, { @@ -193,7 +193,7 @@ "y": 5, "elevation": 3, "var": "VAR_RUSTURF_TUNNEL_STATE", - "var_value": 2, + "var_value": "2", "script": "RusturfTunnel_EventScript_22D083" }, { @@ -202,7 +202,7 @@ "y": 4, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "RusturfTunnel_EventScript_22D077" }, { @@ -211,7 +211,7 @@ "y": 5, "elevation": 3, "var": "0", - "var_value": 0, + "var_value": "0", "script": "RusturfTunnel_EventScript_22D07D" } ], diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index c2d8b8870d..093d1a83d2 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -122,7 +122,7 @@ "y": 42, "elevation": 3, "var": "VAR_0x40A2", - "var_value": 0, + "var_value": "0", "script": "SeafloorCavern_Room9_EventScript_234DC9" } ], diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json index a2cc78b2f2..4c2340fca6 100644 --- a/data/maps/SingleBattleColosseum/map.json +++ b/data/maps/SingleBattleColosseum/map.json @@ -51,7 +51,7 @@ "y": 5, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "gUnknown_08277374" }, { @@ -60,7 +60,7 @@ "y": 5, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "gUnknown_0827737E" } ], diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index 0d53a80be5..6d805d27e7 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -57,7 +57,7 @@ "y": 9, "elevation": 3, "var": "VAR_0x40D7", - "var_value": 0, + "var_value": "0", "script": "SkyPillar_Top_EventScript_23979A" } ], diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index 52f2f64127..fbda272345 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -572,7 +572,7 @@ "y": 13, "elevation": 3, "var": "VAR_0x40D2", - "var_value": 2, + "var_value": "2", "script": "SlateportCity_EventScript_1DD5DC" } ], diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index a48b6a82f2..9317db74cb 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -156,7 +156,7 @@ "y": 11, "elevation": 3, "var": "VAR_0x40A0", - "var_value": 1, + "var_value": "1", "script": "SlateportCity_Harbor_EventScript_20C9BB" }, { @@ -165,7 +165,7 @@ "y": 12, "elevation": 3, "var": "VAR_0x40A0", - "var_value": 1, + "var_value": "1", "script": "SlateportCity_Harbor_EventScript_20C9C7" }, { @@ -174,7 +174,7 @@ "y": 13, "elevation": 3, "var": "VAR_0x40A0", - "var_value": 1, + "var_value": "1", "script": "SlateportCity_Harbor_EventScript_20C9D3" }, { @@ -183,7 +183,7 @@ "y": 14, "elevation": 3, "var": "VAR_0x40A0", - "var_value": 1, + "var_value": "1", "script": "SlateportCity_Harbor_EventScript_20C9DF" } ], diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index 7202fc35ae..f784a5cde1 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -227,7 +227,7 @@ "y": 7, "elevation": 3, "var": "VAR_0x40AA", - "var_value": 0, + "var_value": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD9F" }, { @@ -236,7 +236,7 @@ "y": 7, "elevation": 3, "var": "VAR_0x40AA", - "var_value": 0, + "var_value": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20ADB0" } ], diff --git a/data/maps/TerraCave_End/map.json b/data/maps/TerraCave_End/map.json index 9b5ab9f32f..6d79cb74e9 100644 --- a/data/maps/TerraCave_End/map.json +++ b/data/maps/TerraCave_End/map.json @@ -44,7 +44,7 @@ "y": 26, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 1, + "var_value": "1", "script": "TerraCave_End_EventScript_23B0EC" } ], diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index f7511a7537..05553e3a02 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -51,7 +51,7 @@ "y": 5, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "gUnknown_082773F5" }, { @@ -60,7 +60,7 @@ "y": 5, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "gUnknown_082773FF" } ], diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json index 32f6cee379..db94fb2b23 100644 --- a/data/maps/TrainerHill_Entrance/map.json +++ b/data/maps/TrainerHill_Entrance/map.json @@ -110,7 +110,7 @@ "y": 6, "elevation": 3, "var": "VAR_0x40D6", - "var_value": 0, + "var_value": "0", "script": "TrainerHill_Entrance_EventScript_268229" } ], diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index b459815872..534d8dd59b 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -176,7 +176,7 @@ "y": 23, "elevation": 4, "var": "VAR_0x40C3", - "var_value": 0, + "var_value": "0", "script": "VictoryRoad_1F_EventScript_235DAF" }, { @@ -185,7 +185,7 @@ "y": 23, "elevation": 4, "var": "VAR_0x40C3", - "var_value": 0, + "var_value": "0", "script": "VictoryRoad_1F_EventScript_235DC8" } ], diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 2dd6e5b315..d2b9b6802c 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -197,7 +197,7 @@ string generate_map_events_text(Json map_data) { << coord_event["y"].int_value() << ", " << coord_event["elevation"].int_value() << ", " << coord_event["var"].string_value() << ", " - << coord_event["var_value"].int_value() << ", " + << coord_event["var_value"].string_value() << ", " << coord_event["script"].string_value() << "\n"; } else if (coord_event["type"] == "weather") { From 19b76bffda07d8878c1ff1a9005e1b57c549ffce Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 16 Feb 2019 16:40:31 -0600 Subject: [PATCH 047/217] Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields --- .../AbandonedShip_CaptainsOffice/map.json | 8 +- data/maps/AbandonedShip_Corridors_1F/map.json | 8 +- .../maps/AbandonedShip_Corridors_B1F/map.json | 8 +- .../AbandonedShip_HiddenFloorRooms/map.json | 16 +- data/maps/AbandonedShip_Room_B1F/map.json | 4 +- data/maps/AbandonedShip_Rooms2_1F/map.json | 20 +- data/maps/AbandonedShip_Rooms2_B1F/map.json | 8 +- data/maps/AbandonedShip_Rooms_1F/map.json | 16 +- data/maps/AbandonedShip_Rooms_B1F/map.json | 8 +- data/maps/AncientTomb/map.json | 4 +- data/maps/AquaHideout_1F/map.json | 12 +- data/maps/AquaHideout_B1F/map.json | 36 ++-- data/maps/AquaHideout_B2F/map.json | 24 +-- data/maps/ArtisanCave_1F/map.json | 4 +- data/maps/ArtisanCave_B1F/map.json | 4 +- .../map.json | 36 ++-- .../map.json | 4 +- .../BattleFrontier_BattleArenaLobby/map.json | 20 +- .../map.json | 60 +++--- .../map.json | 4 +- .../BattleFrontier_BattleDomeLobby/map.json | 24 +-- .../map.json | 4 +- .../map.json | 32 +-- .../map.json | 24 +-- .../map.json | 4 +- .../map.json | 20 +- .../map.json | 28 +-- .../BattleFrontier_BattlePalaceLobby/map.json | 24 +-- .../map.json | 4 +- .../BattleFrontier_BattlePikeLobby/map.json | 16 +- .../map.json | 8 +- .../map.json | 4 +- .../map.json | 8 +- .../map.json | 36 ++-- .../map.json | 64 +++--- .../map.json | 16 +- .../BattleFrontier_BattlePyramidTop/map.json | 8 +- .../map.json | 12 +- .../map.json | 24 +-- .../map.json | 4 +- .../map.json | 16 +- .../map.json | 4 +- .../BattleFrontier_BattleTowerLobby/map.json | 36 ++-- .../map.json | 36 ++-- data/maps/BattleFrontier_Lounge1/map.json | 12 +- data/maps/BattleFrontier_Lounge2/map.json | 20 +- data/maps/BattleFrontier_Lounge3/map.json | 20 +- data/maps/BattleFrontier_Lounge4/map.json | 12 +- data/maps/BattleFrontier_Lounge5/map.json | 16 +- data/maps/BattleFrontier_Lounge6/map.json | 4 +- data/maps/BattleFrontier_Lounge7/map.json | 16 +- data/maps/BattleFrontier_Lounge8/map.json | 12 +- data/maps/BattleFrontier_Lounge9/map.json | 4 +- data/maps/BattleFrontier_Mart/map.json | 16 +- data/maps/BattleFrontier_OutsideEast/map.json | 104 +++++----- data/maps/BattleFrontier_OutsideWest/map.json | 96 ++++----- .../BattleFrontier_PokemonCenter_1F/map.json | 20 +- .../BattleFrontier_PokemonCenter_2F/map.json | 16 +- data/maps/BattleFrontier_RankingHall/map.json | 12 +- .../BattleFrontier_ReceptionGate/map.json | 20 +- data/maps/BattleFrontier_ScottsHouse/map.json | 4 +- data/maps/BattlePyramidSquare01/map.json | 28 +-- data/maps/BattlePyramidSquare02/map.json | 28 +-- data/maps/BattlePyramidSquare03/map.json | 28 +-- data/maps/BattlePyramidSquare04/map.json | 28 +-- data/maps/BattlePyramidSquare05/map.json | 28 +-- data/maps/BattlePyramidSquare06/map.json | 28 +-- data/maps/BattlePyramidSquare07/map.json | 28 +-- data/maps/BattlePyramidSquare08/map.json | 28 +-- data/maps/BattlePyramidSquare09/map.json | 28 +-- data/maps/BattlePyramidSquare10/map.json | 28 +-- data/maps/BattlePyramidSquare11/map.json | 28 +-- data/maps/BattlePyramidSquare12/map.json | 28 +-- data/maps/BattlePyramidSquare13/map.json | 28 +-- data/maps/BattlePyramidSquare14/map.json | 28 +-- data/maps/BattlePyramidSquare15/map.json | 28 +-- data/maps/BattlePyramidSquare16/map.json | 28 +-- data/maps/BirthIsland_Exterior/map.json | 8 +- data/maps/BirthIsland_Harbor/map.json | 8 +- data/maps/CaveOfOrigin_B1F/map.json | 4 +- data/maps/DesertRuins/map.json | 4 +- data/maps/DesertUnderpass/map.json | 4 +- data/maps/DewfordTown/map.json | 20 +- data/maps/DewfordTown_Gym/map.json | 32 +-- data/maps/DewfordTown_Hall/map.json | 36 ++-- data/maps/DewfordTown_House1/map.json | 12 +- data/maps/DewfordTown_House2/map.json | 8 +- .../DewfordTown_PokemonCenter_1F/map.json | 12 +- .../DewfordTown_PokemonCenter_2F/map.json | 16 +- .../EverGrandeCity_ChampionsRoom/map.json | 12 +- data/maps/EverGrandeCity_DrakesRoom/map.json | 4 +- data/maps/EverGrandeCity_GlaciasRoom/map.json | 4 +- data/maps/EverGrandeCity_HallOfFame/map.json | 4 +- data/maps/EverGrandeCity_PhoebesRoom/map.json | 4 +- .../EverGrandeCity_PokemonCenter_1F/map.json | 16 +- .../EverGrandeCity_PokemonCenter_2F/map.json | 16 +- .../EverGrandeCity_PokemonLeague_1F/map.json | 16 +- .../EverGrandeCity_PokemonLeague_2F/map.json | 16 +- data/maps/EverGrandeCity_SidneysRoom/map.json | 4 +- data/maps/FallarborTown/map.json | 16 +- .../map.json | 12 +- .../FallarborTown_BattleTentCorridor/map.json | 4 +- .../FallarborTown_BattleTentLobby/map.json | 20 +- data/maps/FallarborTown_House1/map.json | 8 +- data/maps/FallarborTown_House2/map.json | 4 +- data/maps/FallarborTown_Mart/map.json | 20 +- .../FallarborTown_PokemonCenter_1F/map.json | 16 +- .../FallarborTown_PokemonCenter_2F/map.json | 16 +- data/maps/FarawayIsland_Entrance/map.json | 8 +- data/maps/FarawayIsland_Interior/map.json | 4 +- data/maps/FieryPath/map.json | 32 +-- data/maps/FortreeCity/map.json | 28 +-- data/maps/FortreeCity_DecorationShop/map.json | 16 +- data/maps/FortreeCity_Gym/map.json | 32 +-- data/maps/FortreeCity_House1/map.json | 12 +- data/maps/FortreeCity_House2/map.json | 8 +- data/maps/FortreeCity_House3/map.json | 8 +- data/maps/FortreeCity_House4/map.json | 12 +- data/maps/FortreeCity_House5/map.json | 12 +- data/maps/FortreeCity_Mart/map.json | 16 +- .../FortreeCity_PokemonCenter_1F/map.json | 16 +- .../FortreeCity_PokemonCenter_2F/map.json | 16 +- data/maps/GraniteCave_1F/map.json | 8 +- data/maps/GraniteCave_B1F/map.json | 4 +- data/maps/GraniteCave_B2F/map.json | 36 ++-- data/maps/GraniteCave_StevensRoom/map.json | 4 +- data/maps/InsideOfTruck/map.json | 12 +- data/maps/IslandCave/map.json | 4 +- data/maps/JaggedPass/map.json | 28 +-- data/maps/LavaridgeTown/map.json | 36 ++-- data/maps/LavaridgeTown_Gym_1F/map.json | 24 +-- data/maps/LavaridgeTown_Gym_B1F/map.json | 16 +- data/maps/LavaridgeTown_HerbShop/map.json | 12 +- data/maps/LavaridgeTown_House/map.json | 12 +- data/maps/LavaridgeTown_Mart/map.json | 12 +- .../LavaridgeTown_PokemonCenter_1F/map.json | 16 +- .../LavaridgeTown_PokemonCenter_2F/map.json | 16 +- data/maps/LilycoveCity/map.json | 88 ++++----- data/maps/LilycoveCity_ContestHall/map.json | 128 ++++++------ data/maps/LilycoveCity_ContestLobby/map.json | 100 +++++----- .../LilycoveCity_CoveLilyMotel_1F/map.json | 4 +- .../LilycoveCity_CoveLilyMotel_2F/map.json | 28 +-- .../map.json | 4 +- .../map.json | 16 +- .../LilycoveCity_DepartmentStore_1F/map.json | 24 +-- .../LilycoveCity_DepartmentStore_2F/map.json | 20 +- .../LilycoveCity_DepartmentStore_3F/map.json | 20 +- .../LilycoveCity_DepartmentStore_4F/map.json | 20 +- .../LilycoveCity_DepartmentStore_5F/map.json | 28 +-- data/maps/LilycoveCity_Harbor/map.json | 20 +- data/maps/LilycoveCity_House1/map.json | 8 +- data/maps/LilycoveCity_House2/map.json | 4 +- data/maps/LilycoveCity_House3/map.json | 24 +-- data/maps/LilycoveCity_House4/map.json | 8 +- .../LilycoveCity_LilycoveMuseum_1F/map.json | 40 ++-- .../LilycoveCity_LilycoveMuseum_2F/map.json | 16 +- .../LilycoveCity_MoveDeletersHouse/map.json | 4 +- .../LilycoveCity_PokemonCenter_1F/map.json | 20 +- .../LilycoveCity_PokemonCenter_2F/map.json | 16 +- .../map.json | 36 ++-- data/maps/LinkContestRoom1/map.json | 60 +++--- data/maps/LittlerootTown/map.json | 32 +-- .../LittlerootTown_BrendansHouse_1F/map.json | 28 +-- .../LittlerootTown_BrendansHouse_2F/map.json | 64 +++--- .../maps/LittlerootTown_MaysHouse_1F/map.json | 28 +-- .../maps/LittlerootTown_MaysHouse_2F/map.json | 64 +++--- .../map.json | 24 +-- data/maps/MagmaHideout_1F/map.json | 24 +-- data/maps/MagmaHideout_2F_1R/map.json | 16 +- data/maps/MagmaHideout_2F_2R/map.json | 24 +-- data/maps/MagmaHideout_3F_1R/map.json | 12 +- data/maps/MagmaHideout_3F_2R/map.json | 8 +- data/maps/MagmaHideout_3F_3R/map.json | 4 +- data/maps/MagmaHideout_4F/map.json | 32 +-- data/maps/MarineCave_End/map.json | 4 +- data/maps/MauvilleCity/map.json | 44 ++--- data/maps/MauvilleCity_BikeShop/map.json | 8 +- data/maps/MauvilleCity_GameCorner/map.json | 48 ++--- data/maps/MauvilleCity_Gym/map.json | 28 +-- data/maps/MauvilleCity_House1/map.json | 4 +- data/maps/MauvilleCity_House2/map.json | 4 +- data/maps/MauvilleCity_Mart/map.json | 12 +- .../MauvilleCity_PokemonCenter_1F/map.json | 20 +- .../MauvilleCity_PokemonCenter_2F/map.json | 20 +- data/maps/MeteorFalls_1F_1R/map.json | 40 ++-- data/maps/MeteorFalls_1F_2R/map.json | 12 +- data/maps/MeteorFalls_B1F_2R/map.json | 4 +- data/maps/MeteorFalls_StevensCave/map.json | 4 +- data/maps/MirageTower_3F/map.json | 8 +- data/maps/MirageTower_4F/map.json | 12 +- data/maps/MossdeepCity/map.json | 68 +++---- data/maps/MossdeepCity_GameCorner_1F/map.json | 8 +- .../maps/MossdeepCity_GameCorner_B1F/map.json | 4 +- data/maps/MossdeepCity_Gym/map.json | 144 +++++++------- data/maps/MossdeepCity_House1/map.json | 8 +- data/maps/MossdeepCity_House2/map.json | 12 +- data/maps/MossdeepCity_House3/map.json | 4 +- data/maps/MossdeepCity_House4/map.json | 12 +- data/maps/MossdeepCity_Mart/map.json | 16 +- .../MossdeepCity_PokemonCenter_1F/map.json | 12 +- .../MossdeepCity_PokemonCenter_2F/map.json | 20 +- .../maps/MossdeepCity_SpaceCenter_1F/map.json | 44 ++--- .../maps/MossdeepCity_SpaceCenter_2F/map.json | 36 ++-- data/maps/MossdeepCity_StevensHouse/map.json | 12 +- data/maps/MtChimney/map.json | 120 ++++++------ data/maps/MtChimney_CableCarStation/map.json | 8 +- data/maps/MtPyre_1F/map.json | 12 +- data/maps/MtPyre_2F/map.json | 32 +-- data/maps/MtPyre_3F/map.json | 16 +- data/maps/MtPyre_4F/map.json | 8 +- data/maps/MtPyre_5F/map.json | 8 +- data/maps/MtPyre_6F/map.json | 12 +- data/maps/MtPyre_Exterior/map.json | 8 +- data/maps/MtPyre_Summit/map.json | 32 +-- data/maps/NavelRock_Bottom/map.json | 4 +- data/maps/NavelRock_Harbor/map.json | 8 +- data/maps/NavelRock_Top/map.json | 4 +- data/maps/NewMauville_Inside/map.json | 32 +-- data/maps/OldaleTown/map.json | 16 +- data/maps/OldaleTown_House1/map.json | 4 +- data/maps/OldaleTown_House2/map.json | 8 +- data/maps/OldaleTown_Mart/map.json | 12 +- .../maps/OldaleTown_PokemonCenter_1F/map.json | 16 +- .../maps/OldaleTown_PokemonCenter_2F/map.json | 16 +- data/maps/PacifidlogTown/map.json | 12 +- data/maps/PacifidlogTown_House1/map.json | 8 +- data/maps/PacifidlogTown_House2/map.json | 12 +- data/maps/PacifidlogTown_House3/map.json | 8 +- data/maps/PacifidlogTown_House4/map.json | 12 +- data/maps/PacifidlogTown_House5/map.json | 8 +- .../PacifidlogTown_PokemonCenter_1F/map.json | 20 +- .../PacifidlogTown_PokemonCenter_2F/map.json | 16 +- data/maps/PetalburgCity/map.json | 36 ++-- data/maps/PetalburgCity_Gym/map.json | 44 ++--- data/maps/PetalburgCity_House1/map.json | 8 +- data/maps/PetalburgCity_House2/map.json | 8 +- data/maps/PetalburgCity_Mart/map.json | 16 +- .../PetalburgCity_PokemonCenter_1F/map.json | 20 +- .../PetalburgCity_PokemonCenter_2F/map.json | 16 +- data/maps/PetalburgCity_WallysHouse/map.json | 8 +- data/maps/PetalburgWoods/map.json | 52 ++--- data/maps/RecordCorner/map.json | 4 +- data/maps/Route101/map.json | 24 +-- data/maps/Route102/map.json | 36 ++-- data/maps/Route103/map.json | 80 ++++---- data/maps/Route104/map.json | 136 ++++++------- data/maps/Route104_MrBrineysHouse/map.json | 8 +- .../Route104_PrettyPetalFlowerShop/map.json | 12 +- data/maps/Route105/map.json | 32 +-- data/maps/Route106/map.json | 20 +- data/maps/Route107/map.json | 28 +-- data/maps/Route108/map.json | 28 +-- data/maps/Route109/map.json | 96 ++++----- data/maps/Route109_SeashoreHouse/map.json | 16 +- data/maps/Route110/map.json | 144 +++++++------- .../map.json | 4 +- .../map.json | 4 +- data/maps/Route110_TrickHouseEnd/map.json | 4 +- .../maps/Route110_TrickHouseEntrance/map.json | 4 +- data/maps/Route110_TrickHousePuzzle1/map.json | 60 +++--- data/maps/Route110_TrickHousePuzzle2/map.json | 20 +- data/maps/Route110_TrickHousePuzzle3/map.json | 28 +-- data/maps/Route110_TrickHousePuzzle4/map.json | 56 +++--- data/maps/Route110_TrickHousePuzzle5/map.json | 20 +- data/maps/Route110_TrickHousePuzzle6/map.json | 16 +- data/maps/Route110_TrickHousePuzzle7/map.json | 36 ++-- data/maps/Route110_TrickHousePuzzle8/map.json | 16 +- data/maps/Route111/map.json | 184 +++++++++--------- data/maps/Route111_OldLadysRestStop/map.json | 4 +- .../Route111_WinstrateFamilysHouse/map.json | 16 +- data/maps/Route112/map.json | 56 +++--- data/maps/Route112_CableCarStation/map.json | 8 +- data/maps/Route113/map.json | 64 +++--- data/maps/Route113_GlassWorkshop/map.json | 8 +- data/maps/Route114/map.json | 108 +++++----- .../maps/Route114_FossilManiacsHouse/map.json | 4 +- .../Route114_FossilManiacsTunnel/map.json | 4 +- data/maps/Route114_LanettesHouse/map.json | 4 +- data/maps/Route115/map.json | 92 ++++----- data/maps/Route116/map.json | 112 +++++------ .../maps/Route116_TunnelersRestHouse/map.json | 12 +- data/maps/Route117/map.json | 96 ++++----- data/maps/Route117_PokemonDayCare/map.json | 4 +- data/maps/Route118/map.json | 84 ++++---- data/maps/Route119/map.json | 172 ++++++++-------- data/maps/Route119_House/map.json | 28 +-- .../Route119_WeatherInstitute_1F/map.json | 20 +- .../Route119_WeatherInstitute_2F/map.json | 32 +-- data/maps/Route120/map.json | 176 ++++++++--------- data/maps/Route121/map.json | 116 +++++------ .../maps/Route121_SafariZoneEntrance/map.json | 12 +- data/maps/Route123/map.json | 172 ++++++++-------- data/maps/Route123_BerryMastersHouse/map.json | 8 +- data/maps/Route124/map.json | 48 ++--- .../map.json | 4 +- data/maps/Route125/map.json | 40 ++-- data/maps/Route126/map.json | 36 ++-- data/maps/Route127/map.json | 44 ++--- data/maps/Route128/map.json | 40 ++-- data/maps/Route129/map.json | 20 +- data/maps/Route130/map.json | 16 +- data/maps/Route131/map.json | 32 +-- data/maps/Route132/map.json | 40 ++-- data/maps/Route133/map.json | 40 ++-- data/maps/Route134/map.json | 44 ++--- data/maps/RustboroCity/map.json | 64 +++--- data/maps/RustboroCity_CuttersHouse/map.json | 8 +- data/maps/RustboroCity_DevonCorp_1F/map.json | 12 +- data/maps/RustboroCity_DevonCorp_2F/map.json | 24 +-- data/maps/RustboroCity_DevonCorp_3F/map.json | 12 +- data/maps/RustboroCity_Flat1_1F/map.json | 8 +- data/maps/RustboroCity_Flat1_2F/map.json | 32 +-- data/maps/RustboroCity_Flat2_1F/map.json | 8 +- data/maps/RustboroCity_Flat2_2F/map.json | 8 +- data/maps/RustboroCity_Flat2_3F/map.json | 8 +- data/maps/RustboroCity_Gym/map.json | 20 +- data/maps/RustboroCity_House1/map.json | 8 +- data/maps/RustboroCity_House2/map.json | 8 +- data/maps/RustboroCity_House3/map.json | 12 +- data/maps/RustboroCity_Mart/map.json | 16 +- .../RustboroCity_PokemonCenter_1F/map.json | 16 +- .../RustboroCity_PokemonCenter_2F/map.json | 16 +- data/maps/RustboroCity_PokemonSchool/map.json | 28 +-- data/maps/RusturfTunnel/map.json | 40 ++-- data/maps/SSTidalCorridor/map.json | 20 +- data/maps/SSTidalLowerDeck/map.json | 8 +- data/maps/SSTidalRooms/map.json | 32 +-- data/maps/SafariZone_North/map.json | 36 ++-- data/maps/SafariZone_Northeast/map.json | 36 ++-- data/maps/SafariZone_Northwest/map.json | 8 +- data/maps/SafariZone_RestHouse/map.json | 12 +- data/maps/SafariZone_South/map.json | 24 +-- data/maps/SafariZone_Southeast/map.json | 20 +- data/maps/SafariZone_Southwest/map.json | 8 +- data/maps/ScorchedSlab/map.json | 4 +- data/maps/SeafloorCavern_Entrance/map.json | 4 +- data/maps/SeafloorCavern_Room1/map.json | 20 +- data/maps/SeafloorCavern_Room2/map.json | 32 +-- data/maps/SeafloorCavern_Room3/map.json | 36 ++-- data/maps/SeafloorCavern_Room4/map.json | 8 +- data/maps/SeafloorCavern_Room5/map.json | 24 +-- data/maps/SeafloorCavern_Room8/map.json | 48 ++--- data/maps/SeafloorCavern_Room9/map.json | 28 +-- data/maps/SecretBase_BlueCave1/map.json | 60 +++--- data/maps/SecretBase_BlueCave2/map.json | 60 +++--- data/maps/SecretBase_BlueCave3/map.json | 60 +++--- data/maps/SecretBase_BlueCave4/map.json | 60 +++--- data/maps/SecretBase_BrownCave1/map.json | 60 +++--- data/maps/SecretBase_BrownCave2/map.json | 60 +++--- data/maps/SecretBase_BrownCave3/map.json | 60 +++--- data/maps/SecretBase_BrownCave4/map.json | 60 +++--- data/maps/SecretBase_RedCave1/map.json | 60 +++--- data/maps/SecretBase_RedCave2/map.json | 60 +++--- data/maps/SecretBase_RedCave3/map.json | 60 +++--- data/maps/SecretBase_RedCave4/map.json | 60 +++--- data/maps/SecretBase_Shrub1/map.json | 60 +++--- data/maps/SecretBase_Shrub2/map.json | 60 +++--- data/maps/SecretBase_Shrub3/map.json | 60 +++--- data/maps/SecretBase_Shrub4/map.json | 60 +++--- data/maps/SecretBase_Tree1/map.json | 60 +++--- data/maps/SecretBase_Tree2/map.json | 60 +++--- data/maps/SecretBase_Tree3/map.json | 60 +++--- data/maps/SecretBase_Tree4/map.json | 60 +++--- data/maps/SecretBase_YellowCave1/map.json | 60 +++--- data/maps/SecretBase_YellowCave2/map.json | 60 +++--- data/maps/SecretBase_YellowCave3/map.json | 60 +++--- data/maps/SecretBase_YellowCave4/map.json | 60 +++--- .../ShoalCave_LowTideEntranceRoom/map.json | 8 +- data/maps/ShoalCave_LowTideIceRoom/map.json | 8 +- data/maps/ShoalCave_LowTideInnerRoom/map.json | 4 +- data/maps/ShoalCave_LowTideLowerRoom/map.json | 8 +- .../maps/ShoalCave_LowTideStairsRoom/map.json | 4 +- data/maps/SingleBattleColosseum/map.json | 4 +- data/maps/SkyPillar_Outside/map.json | 4 +- data/maps/SkyPillar_Top/map.json | 8 +- data/maps/SlateportCity/map.json | 140 ++++++------- .../map.json | 12 +- .../SlateportCity_BattleTentCorridor/map.json | 4 +- .../SlateportCity_BattleTentLobby/map.json | 20 +- data/maps/SlateportCity_Harbor/map.json | 32 +-- data/maps/SlateportCity_House1/map.json | 4 +- data/maps/SlateportCity_House2/map.json | 8 +- data/maps/SlateportCity_Mart/map.json | 12 +- .../SlateportCity_OceanicMuseum_1F/map.json | 56 +++--- .../SlateportCity_OceanicMuseum_2F/map.json | 28 +-- .../SlateportCity_PokemonCenter_1F/map.json | 12 +- .../SlateportCity_PokemonCenter_2F/map.json | 16 +- .../SlateportCity_PokemonFanClub/map.json | 36 ++-- .../SlateportCity_SternsShipyard_1F/map.json | 16 +- .../SlateportCity_SternsShipyard_2F/map.json | 12 +- data/maps/SootopolisCity/map.json | 72 +++---- data/maps/SootopolisCity_Gym_1F/map.json | 8 +- data/maps/SootopolisCity_Gym_B1F/map.json | 40 ++-- data/maps/SootopolisCity_House1/map.json | 8 +- data/maps/SootopolisCity_House2/map.json | 4 +- data/maps/SootopolisCity_House3/map.json | 8 +- data/maps/SootopolisCity_House4/map.json | 12 +- data/maps/SootopolisCity_House5/map.json | 8 +- data/maps/SootopolisCity_House6/map.json | 4 +- data/maps/SootopolisCity_House7/map.json | 8 +- .../map.json | 8 +- data/maps/SootopolisCity_Mart/map.json | 12 +- .../map.json | 4 +- .../map.json | 4 +- .../SootopolisCity_PokemonCenter_1F/map.json | 16 +- .../SootopolisCity_PokemonCenter_2F/map.json | 16 +- data/maps/SouthernIsland_Exterior/map.json | 8 +- data/maps/SouthernIsland_Interior/map.json | 8 +- data/maps/TerraCave_End/map.json | 4 +- data/maps/TradeCenter/map.json | 4 +- data/maps/TrainerHill_Elevator/map.json | 4 +- data/maps/TrainerHill_Entrance/map.json | 20 +- data/maps/TrainerHill_Roof/map.json | 4 +- data/maps/Underwater_SeafloorCavern/map.json | 16 +- data/maps/UnionRoom/map.json | 36 ++-- data/maps/VerdanturfTown/map.json | 16 +- .../map.json | 12 +- .../map.json | 4 +- .../VerdanturfTown_BattleTentLobby/map.json | 24 +-- .../map.json | 8 +- data/maps/VerdanturfTown_House/map.json | 8 +- data/maps/VerdanturfTown_Mart/map.json | 16 +- .../VerdanturfTown_PokemonCenter_1F/map.json | 16 +- .../VerdanturfTown_PokemonCenter_2F/map.json | 16 +- data/maps/VerdanturfTown_WandasHouse/map.json | 20 +- data/maps/VictoryRoad_1F/map.json | 36 ++-- data/maps/VictoryRoad_B1F/map.json | 84 ++++---- data/maps/VictoryRoad_B2F/map.json | 28 +-- tools/mapjson/mapjson.cpp | 4 +- 429 files changed, 5554 insertions(+), 5554 deletions(-) diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json index 69a8b31cb4..c88afc8068 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.json +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_CaptainsOffice_EventScript_2387E2", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_CaptainsOffice_EventScript_29126E", "flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY" } diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index d2f65aee41..4ddf92226f 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Corridors_1F_EventScript_2379A5", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", "movement_range_x": 4, "movement_range_y": 7, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "AbandonedShip_Corridors_1F_EventScript_2379AE", "flag": "0" } diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json index 7e27751b12..9bccfc6364 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Corridors_B1F_EventScript_237DBF", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "AbandonedShip_Corridors_B1F_EventScript_237E13", "flag": "0" } diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index 51fc0f2603..f71ad8eb32 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_HiddenFloorRooms_EventScript_29127B", "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_HiddenFloorRooms_EventScript_291288", "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_HiddenFloorRooms_EventScript_2912A2", "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_HiddenFloorRooms_EventScript_291295", "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE" } diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json index f762b08f9c..60dd5e1b39 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.json +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Room_B1F_EventScript_291254", "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13" } diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json index 84ccb93dcf..49a4c2da07 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "AbandonedShip_Rooms2_1F_EventScript_2380A7", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "AbandonedShip_Rooms2_1F_EventScript_23810B", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms2_1F_EventScript_291261", "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "AbandonedShip_Rooms2_1F_EventScript_238186", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "AbandonedShip_Rooms2_1F_EventScript_23816F", "flag": "0" } diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json index 2e8256331a..3f56bf6cd5 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms2_B1F_EventScript_238025", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms2_B1F_EventScript_291247", "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL" } diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json index 789b4edb51..e97c74fcfd 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms_1F_EventScript_237A93", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms_1F_EventScript_29122D", "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "AbandonedShip_Rooms_1F_EventScript_237AB3", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "AbandonedShip_Rooms_1F_EventScript_237A9C", "flag": "0" } diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json index 224b25165b..65b5fb9cf6 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms_B1F_EventScript_237FC6", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms_B1F_EventScript_29123A", "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE" } diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json index 327e7eded5..9de100bff1 100644 --- a/data/maps/AncientTomb/map.json +++ b/data/maps/AncientTomb/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AncientTomb_EventScript_23905A", "flag": "FLAG_HIDE_REGISTEEL" } diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json index 278bc5894d..5f585f32f3 100644 --- a/data/maps/AquaHideout_1F/map.json +++ b/data/maps/AquaHideout_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_1F_EventScript_233494", "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_1F_EventScript_2334C6", "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 13, "movement_range_y": 5, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "AquaHideout_1F_EventScript_2334F8", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" } diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json index 80c4af8efd..5b6beee112 100644 --- a/data/maps/AquaHideout_B1F/map.json +++ b/data/maps/AquaHideout_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "AquaHideout_B1F_EventScript_233A85", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "AquaHideout_B1F_EventScript_233AB0", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B1F_EventScript_291372", "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 4, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "AquaHideout_B1F_EventScript_233AD5", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B1F_EventScript_291358", "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B1F_EventScript_2339EB", "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B1F_EventScript_291365", "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B1F_EventScript_233A38", "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "AquaHideout_B1F_EventScript_233AEC", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" } diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json index e028195fa6..64c6eddff7 100644 --- a/data/maps/AquaHideout_B2F/map.json +++ b/data/maps/AquaHideout_B2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B2F_EventScript_233E09", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", "movement_range_x": 4, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "AquaHideout_B2F_EventScript_233E8A", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B2F_EventScript_29137F", "flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "AquaHideout_B2F_EventScript_233EAF", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "AquaHideout_B2F_EventScript_233EC6", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" } diff --git a/data/maps/ArtisanCave_1F/map.json b/data/maps/ArtisanCave_1F/map.json index a0792d7335..2092ca7eab 100644 --- a/data/maps/ArtisanCave_1F/map.json +++ b/data/maps/ArtisanCave_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ArtisanCave_1F_EventScript_2914D1", "flag": "FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS" } diff --git a/data/maps/ArtisanCave_B1F/map.json b/data/maps/ArtisanCave_B1F/map.json index d47609dc88..32174cd446 100644 --- a/data/maps/ArtisanCave_B1F/map.json +++ b/data/maps/ArtisanCave_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ArtisanCave_B1F_EventScript_2914C4", "flag": "FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP" } diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json index 5b1a51ad52..6299e7b11c 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/map.json b/data/maps/BattleFrontier_BattleArenaCorridor/map.json index 2cacf66215..02f3cd0194 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/map.json +++ b/data/maps/BattleFrontier_BattleArenaCorridor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleArenaLobby/map.json b/data/maps/BattleFrontier_BattleArenaLobby/map.json index fc8e5bd373..49712c5dd8 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/map.json +++ b/data/maps/BattleFrontier_BattleArenaLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleArenaLobby_EventScript_255DF4", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleArenaLobby_EventScript_2560C1", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleArenaLobby_EventScript_2560AF", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleArenaLobby_EventScript_2560B8", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleArenaLobby_EventScript_2560A6", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json index e897866d4f..e3a6c915b8 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/map.json b/data/maps/BattleFrontier_BattleDomeCorridor/map.json index 3f7dc3bdae..6e7f2c3f5d 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/map.json +++ b/data/maps/BattleFrontier_BattleDomeCorridor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleDomeLobby/map.json b/data/maps/BattleFrontier_BattleDomeLobby/map.json index c94d1e1c7b..89eeb60e46 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/map.json +++ b/data/maps/BattleFrontier_BattleDomeLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleDomeLobby_EventScript_249A35", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleDomeLobby_EventScript_249E10", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleDomeLobby_EventScript_249DFE", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleDomeLobby_EventScript_249E07", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleDomeLobby_EventScript_249DED", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleDomeLobby_EventScript_249A47", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json index 0e96decdfd..293a9cc225 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json index de1cdd2ff1..5f45fa7acb 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/map.json b/data/maps/BattleFrontier_BattleFactoryLobby/map.json index 87ad1077ab..8ed837413f 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/map.json +++ b/data/maps/BattleFrontier_BattleFactoryLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleFactoryLobby_EventScript_2585CB", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleFactoryLobby_EventScript_258813", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleFactoryLobby_EventScript_25881C", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleFactoryLobby_EventScript_258825", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleFactoryLobby_EventScript_258830", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleFactoryLobby_EventScript_2585DD", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json index 4d9d792f7a..fd20b7180c 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json index b0405cff03..cfa4cf97ff 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/map.json b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json index 34378700eb..9d635efc78 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/map.json +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/map.json b/data/maps/BattleFrontier_BattlePalaceLobby/map.json index ccdbe327ae..c1d79ee509 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/map.json +++ b/data/maps/BattleFrontier_BattlePalaceLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePalaceLobby_EventScript_24D944", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC82", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC9D", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC8B", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC94", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePalaceLobby_EventScript_24D956", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/map.json b/data/maps/BattleFrontier_BattlePikeCorridor/map.json index e35831a6d3..98b061e9fe 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/map.json +++ b/data/maps/BattleFrontier_BattlePikeCorridor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.json b/data/maps/BattleFrontier_BattlePikeLobby/map.json index 938e4da3f3..5854c6bf7a 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/map.json +++ b/data/maps/BattleFrontier_BattlePikeLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePikeLobby_EventScript_25B868", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAAB", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAB4", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePikeLobby_EventScript_25BABD", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json index 0a548665c5..630a0e3354 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json index 437e7fcfd2..a07464a15d 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json index ca416ce540..ac9230c533 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json index 2184971eb0..4c7bcad2aa 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json index aab03982fd..14a2e7d237 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -217,8 +217,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.json b/data/maps/BattleFrontier_BattlePyramidLobby/map.json index 7ffd80dcf4..4f99b94881 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/map.json +++ b/data/maps/BattleFrontier_BattlePyramidLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePyramidLobby_EventScript_2508B1", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePyramidLobby_EventScript_250ACE", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E83", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E8C", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.json b/data/maps/BattleFrontier_BattlePyramidTop/map.json index ff5fc875a3..fcb4594267 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/map.json +++ b/data/maps/BattleFrontier_BattlePyramidTop/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "3", "script": "BattleFrontier_BattlePyramidTop_EventScript_2551D0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json index 736fd55c83..c8efe3399c 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json index 60d7bc73ac..698edcc65b 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/map.json b/data/maps/BattleFrontier_BattleTowerCorridor/map.json index c99dcac09f..5081edd82d 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/map.json +++ b/data/maps/BattleFrontier_BattleTowerCorridor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/map.json b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json index a15882e77d..de898bef45 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/map.json +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.json b/data/maps/BattleFrontier_BattleTowerElevator/map.json index 6af03f7f9e..f4cbd3590c 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/map.json +++ b/data/maps/BattleFrontier_BattleTowerElevator/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json index 4773d78ed5..339b20b56f 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/map.json +++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerLobby_EventScript_23E936", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerLobby_EventScript_23EEE7", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFB5", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFBE", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerLobby_EventScript_28CB96", "flag": "FLAG_HIDE_BATTLE_TOWER_REPORTER" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_Apprentice", "flag": "FLAG_HIDE_APPRENTICE" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerLobby_EventScript_23EA9F", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerLobby_EventScript_23EC08", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerLobby_EventScript_23ED74", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json index 2a9726fc0d..f3b0807320 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 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" }, @@ -48,8 +48,8 @@ "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, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB", "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008", "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015", "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 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" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 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" }, @@ -113,8 +113,8 @@ "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, + "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" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "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" } diff --git a/data/maps/BattleFrontier_Lounge1/map.json b/data/maps/BattleFrontier_Lounge1/map.json index 3f6b1681ee..8d4870f4fe 100644 --- a/data/maps/BattleFrontier_Lounge1/map.json +++ b/data/maps/BattleFrontier_Lounge1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge1_EventScript_25E775", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge1_EventScript_25E94D", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge1_EventScript_25E956", "flag": "0" } diff --git a/data/maps/BattleFrontier_Lounge2/map.json b/data/maps/BattleFrontier_Lounge2/map.json index bade814621..e2ace0b93c 100644 --- a/data/maps/BattleFrontier_Lounge2/map.json +++ b/data/maps/BattleFrontier_Lounge2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge2_EventScript_260643", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge2_EventScript_26073C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge2_EventScript_260747", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge2_EventScript_26075D", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge2_EventScript_260752", "flag": "0" } diff --git a/data/maps/BattleFrontier_Lounge3/map.json b/data/maps/BattleFrontier_Lounge3/map.json index 592f65a7b0..5ff702a86f 100644 --- a/data/maps/BattleFrontier_Lounge3/map.json +++ b/data/maps/BattleFrontier_Lounge3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge3_EventScript_261D83", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge3_EventScript_261FE1", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge3_EventScript_261FC1", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge3_EventScript_261FD1", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 0, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge3_EventScript_261FB8", "flag": "0" } diff --git a/data/maps/BattleFrontier_Lounge4/map.json b/data/maps/BattleFrontier_Lounge4/map.json index 9165d21fbb..b67d3bb07b 100644 --- a/data/maps/BattleFrontier_Lounge4/map.json +++ b/data/maps/BattleFrontier_Lounge4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge4_EventScript_26358D", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge4_EventScript_263596", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge4_EventScript_26359F", "flag": "0" } diff --git a/data/maps/BattleFrontier_Lounge5/map.json b/data/maps/BattleFrontier_Lounge5/map.json index 500b0fb717..698569d9b7 100644 --- a/data/maps/BattleFrontier_Lounge5/map.json +++ b/data/maps/BattleFrontier_Lounge5/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge5_EventScript_2645C6", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge5_EventScript_264617", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge5_EventScript_264620", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge5_EventScript_264629", "flag": "0" } diff --git a/data/maps/BattleFrontier_Lounge6/map.json b/data/maps/BattleFrontier_Lounge6/map.json index 0b48dbbcfd..1ecbec9f8f 100644 --- a/data/maps/BattleFrontier_Lounge6/map.json +++ b/data/maps/BattleFrontier_Lounge6/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge6_EventScript_264FED", "flag": "0" } diff --git a/data/maps/BattleFrontier_Lounge7/map.json b/data/maps/BattleFrontier_Lounge7/map.json index 28fd390f7d..da866ea721 100644 --- a/data/maps/BattleFrontier_Lounge7/map.json +++ b/data/maps/BattleFrontier_Lounge7/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge7_EventScript_2656DB", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge7_EventScript_265255", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge7_EventScript_265445", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge7_EventScript_2656E4", "flag": "0" } diff --git a/data/maps/BattleFrontier_Lounge8/map.json b/data/maps/BattleFrontier_Lounge8/map.json index 13cf5e2546..ff2bd23614 100644 --- a/data/maps/BattleFrontier_Lounge8/map.json +++ b/data/maps/BattleFrontier_Lounge8/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge8_EventScript_2676DC", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge8_EventScript_2676CA", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge8_EventScript_2676D3", "flag": "0" } diff --git a/data/maps/BattleFrontier_Lounge9/map.json b/data/maps/BattleFrontier_Lounge9/map.json index 3d4faf383c..9f0a56ba01 100644 --- a/data/maps/BattleFrontier_Lounge9/map.json +++ b/data/maps/BattleFrontier_Lounge9/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_Mart/map.json b/data/maps/BattleFrontier_Mart/map.json index 068a46b727..46f6de9af3 100644 --- a/data/maps/BattleFrontier_Mart/map.json +++ b/data/maps/BattleFrontier_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Mart_EventScript_267ACC", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Mart_EventScript_267B0B", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Mart_EventScript_267B02", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Mart_EventScript_267B20", "flag": "0" } diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json index 700c24aff9..e119f89a0f 100644 --- a/data/maps/BattleFrontier_OutsideEast/map.json +++ b/data/maps/BattleFrontier_OutsideEast/map.json @@ -28,8 +28,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242C67", "flag": "0" }, @@ -41,8 +41,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242C70", "flag": "0" }, @@ -54,8 +54,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 2, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242C79", "flag": "0" }, @@ -67,8 +67,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242C82", "flag": "0" }, @@ -80,8 +80,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242C8B", "flag": "0" }, @@ -93,8 +93,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242C94", "flag": "0" }, @@ -106,8 +106,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242CBB", "flag": "0" }, @@ -119,8 +119,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242CE1", "flag": "0" }, @@ -132,8 +132,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242CB2", "flag": "0" }, @@ -145,8 +145,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 6, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242CC4", "flag": "0" }, @@ -158,8 +158,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242CCD", "flag": "0" }, @@ -171,8 +171,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242CD6", "flag": "0" }, @@ -184,8 +184,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242C9F", "flag": "0" }, @@ -197,8 +197,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242CEA", "flag": "FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO" }, @@ -210,8 +210,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242D79", "flag": "0" }, @@ -223,8 +223,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242D82", "flag": "0" }, @@ -236,8 +236,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", "movement_range_x": 2, "movement_range_y": 6, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242D8B", "flag": "0" }, @@ -249,8 +249,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242D94", "flag": "0" }, @@ -262,8 +262,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242D9D", "flag": "0" }, @@ -275,8 +275,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 3, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242DA6", "flag": "0" }, @@ -288,8 +288,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242DAF", "flag": "0" }, @@ -301,8 +301,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242DB8", "flag": "0" }, @@ -314,8 +314,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242DC3", "flag": "0" }, @@ -327,8 +327,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242DE9", "flag": "0" }, @@ -340,8 +340,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242DE0", "flag": "0" }, @@ -353,8 +353,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242E08", "flag": "0" } diff --git a/data/maps/BattleFrontier_OutsideWest/map.json b/data/maps/BattleFrontier_OutsideWest/map.json index 43298e6635..6f97192ed0 100644 --- a/data/maps/BattleFrontier_OutsideWest/map.json +++ b/data/maps/BattleFrontier_OutsideWest/map.json @@ -28,8 +28,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D50F", "flag": "0" }, @@ -41,8 +41,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -54,8 +54,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D3F0", "flag": "0" }, @@ -67,8 +67,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 8, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D68B", "flag": "0" }, @@ -80,8 +80,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D52D", "flag": "0" }, @@ -93,8 +93,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D69D", "flag": "0" }, @@ -106,8 +106,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D6A6", "flag": "0" }, @@ -119,8 +119,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D679", "flag": "0" }, @@ -132,8 +132,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D536", "flag": "0" }, @@ -145,8 +145,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D53D", "flag": "0" }, @@ -158,8 +158,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D694", "flag": "0" }, @@ -171,8 +171,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D5C6", "flag": "0" }, @@ -184,8 +184,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D635", "flag": "0" }, @@ -197,8 +197,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D57F", "flag": "0" }, @@ -210,8 +210,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D682", "flag": "0" }, @@ -223,8 +223,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_249E19", "flag": "0" }, @@ -236,8 +236,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D667", "flag": "0" }, @@ -249,8 +249,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D518", "flag": "0" }, @@ -262,8 +262,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D6AF", "flag": "0" }, @@ -275,8 +275,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D6B8", "flag": "0" }, @@ -288,8 +288,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D6C3", "flag": "0" }, @@ -301,8 +301,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D6CE", "flag": "0" }, @@ -314,8 +314,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D6D7", "flag": "0" }, @@ -327,8 +327,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D6EE", "flag": "0" } diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/map.json b/data/maps/BattleFrontier_PokemonCenter_1F/map.json index 4a78ec120d..8f8153c085 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_PokemonCenter_1F_EventScript_267908", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_PokemonCenter_1F_EventScript_267916", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_PokemonCenter_1F_EventScript_26791F", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_PokemonCenter_1F_EventScript_267928", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_PokemonCenter_1F_EventScript_267931", "flag": "0" } diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/map.json b/data/maps/BattleFrontier_PokemonCenter_2F/map.json index 1f3babd48d..caa6fed8ac 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/BattleFrontier_RankingHall/map.json b/data/maps/BattleFrontier_RankingHall/map.json index 64fa727d72..af28ecea64 100644 --- a/data/maps/BattleFrontier_RankingHall/map.json +++ b/data/maps/BattleFrontier_RankingHall/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_RankingHall_EventScript_25E52F", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_RankingHall_EventScript_25E54A", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_RankingHall_EventScript_25E573", "flag": "0" } diff --git a/data/maps/BattleFrontier_ReceptionGate/map.json b/data/maps/BattleFrontier_ReceptionGate/map.json index ffde653f74..db140442ea 100644 --- a/data/maps/BattleFrontier_ReceptionGate/map.json +++ b/data/maps/BattleFrontier_ReceptionGate/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_ReceptionGate_EventScript_2662FC", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_ReceptionGate_EventScript_266310", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_ReceptionGate_EventScript_266436", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_ReceptionGate_EventScript_2664F4", "flag": "0" } diff --git a/data/maps/BattleFrontier_ScottsHouse/map.json b/data/maps/BattleFrontier_ScottsHouse/map.json index aa6003a862..bff7696b39 100644 --- a/data/maps/BattleFrontier_ScottsHouse/map.json +++ b/data/maps/BattleFrontier_ScottsHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_ScottsHouse_EventScript_2636A8", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare01/map.json b/data/maps/BattlePyramidSquare01/map.json index 57e51307bf..2b0d26de03 100644 --- a/data/maps/BattlePyramidSquare01/map.json +++ b/data/maps/BattlePyramidSquare01/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare02/map.json b/data/maps/BattlePyramidSquare02/map.json index 3f3d6ca93e..32b0ad7ec3 100644 --- a/data/maps/BattlePyramidSquare02/map.json +++ b/data/maps/BattlePyramidSquare02/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare03/map.json b/data/maps/BattlePyramidSquare03/map.json index 1045795531..bbec7daa4d 100644 --- a/data/maps/BattlePyramidSquare03/map.json +++ b/data/maps/BattlePyramidSquare03/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare04/map.json b/data/maps/BattlePyramidSquare04/map.json index 1531309994..8f63efd06f 100644 --- a/data/maps/BattlePyramidSquare04/map.json +++ b/data/maps/BattlePyramidSquare04/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare05/map.json b/data/maps/BattlePyramidSquare05/map.json index d08cc103b0..7e26a9ee36 100644 --- a/data/maps/BattlePyramidSquare05/map.json +++ b/data/maps/BattlePyramidSquare05/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare06/map.json b/data/maps/BattlePyramidSquare06/map.json index 0528d33bd6..289a1e5c2e 100644 --- a/data/maps/BattlePyramidSquare06/map.json +++ b/data/maps/BattlePyramidSquare06/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare07/map.json b/data/maps/BattlePyramidSquare07/map.json index 23a4874eac..7452345476 100644 --- a/data/maps/BattlePyramidSquare07/map.json +++ b/data/maps/BattlePyramidSquare07/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare08/map.json b/data/maps/BattlePyramidSquare08/map.json index ab7be039c2..cac7ed96e2 100644 --- a/data/maps/BattlePyramidSquare08/map.json +++ b/data/maps/BattlePyramidSquare08/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare09/map.json b/data/maps/BattlePyramidSquare09/map.json index 1add766dcb..b5a1113346 100644 --- a/data/maps/BattlePyramidSquare09/map.json +++ b/data/maps/BattlePyramidSquare09/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare10/map.json b/data/maps/BattlePyramidSquare10/map.json index 1450e644ca..5171d112e4 100644 --- a/data/maps/BattlePyramidSquare10/map.json +++ b/data/maps/BattlePyramidSquare10/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare11/map.json b/data/maps/BattlePyramidSquare11/map.json index d4ebaaa2d6..58ac0476f3 100644 --- a/data/maps/BattlePyramidSquare11/map.json +++ b/data/maps/BattlePyramidSquare11/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare12/map.json b/data/maps/BattlePyramidSquare12/map.json index 29063c9503..648c3e3a65 100644 --- a/data/maps/BattlePyramidSquare12/map.json +++ b/data/maps/BattlePyramidSquare12/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare13/map.json b/data/maps/BattlePyramidSquare13/map.json index 71fb71e5de..c9342b3b9e 100644 --- a/data/maps/BattlePyramidSquare13/map.json +++ b/data/maps/BattlePyramidSquare13/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare14/map.json b/data/maps/BattlePyramidSquare14/map.json index 3398dcd474..6f94619676 100644 --- a/data/maps/BattlePyramidSquare14/map.json +++ b/data/maps/BattlePyramidSquare14/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare15/map.json b/data/maps/BattlePyramidSquare15/map.json index 0eb433ae1e..3aa2571f66 100644 --- a/data/maps/BattlePyramidSquare15/map.json +++ b/data/maps/BattlePyramidSquare15/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare16/map.json b/data/maps/BattlePyramidSquare16/map.json index e6827e1a3e..70b677c34f 100644 --- a/data/maps/BattlePyramidSquare16/map.json +++ b/data/maps/BattlePyramidSquare16/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 43ffc5d44f..c87f39fb8c 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BirthIsland_Exterior_EventScript_267F83", "flag": "FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_DEOXYS" } diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index f55cf8e930..b212247bb1 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BirthIsland_Harbor_EventScript_26805D", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json index f8c5848454..2a764c677d 100644 --- a/data/maps/CaveOfOrigin_B1F/map.json +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "CaveOfOrigin_B1F_EventScript_2357A9", "flag": "FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE" } diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json index 439611a39b..28a04a458d 100644 --- a/data/maps/DesertRuins/map.json +++ b/data/maps/DesertRuins/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DesertRuins_EventScript_22DA02", "flag": "FLAG_HIDE_REGIROCK" } diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json index 3a16f2c5d1..ca4b894d4f 100644 --- a/data/maps/DesertUnderpass/map.json +++ b/data/maps/DesertUnderpass/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DesertUnderpass_EventScript_23AF41", "flag": "FLAG_HIDE_DESERT_UNDERPASS_FOSSIL" } diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 64e70fe7fd..8cd8635887 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_EventScript_1E95B1", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "3", "script": "DewfordTown_EventScript_1E9511", "flag": "FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_EventScript_1E95D5", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_EventScript_1E9922", "flag": "0" } diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json index e42e4ffe8b..cf87f878ae 100644 --- a/data/maps/DewfordTown_Gym/map.json +++ b/data/maps/DewfordTown_Gym/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Gym_EventScript_1FC7C2", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "DewfordTown_Gym_EventScript_1FC8B7", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "DewfordTown_Gym_EventScript_1FC8D9", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "DewfordTown_Gym_EventScript_1FC8FB", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Gym_EventScript_1FC983", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "DewfordTown_Gym_EventScript_1FC93F", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "DewfordTown_Gym_EventScript_1FC961", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "DewfordTown_Gym_EventScript_1FC91D", "flag": "0" } diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index f6a8dac7ba..b801ea3c26 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1FD4D0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1FD4F9", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1FD50A", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1FD547", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1FD563", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1FD57F", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1FD62F", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1FD63B", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1FD7DA", "flag": "FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN" } diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index fbc3e02ed1..dfae500bdd 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_House1_EventScript_1FC3D7", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_House1_EventScript_1FC3CE", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_House1_EventScript_1FC3E0", "flag": "0" } diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json index 742fde7064..bc9c008fc3 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_House2_EventScript_1FE22E", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_House2_EventScript_1FE271", "flag": "0" } diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json index 137b9f5e9a..89acf1ea8f 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC537", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC545", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC54E", "flag": "0" } diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json index e4f298d73f..2792a9a20b 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json index 0281bebc55..4819c3b894 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.json +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_CHAMPIONS_ROOM_RIVAL" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_CHAMPIONS_ROOM_BIRCH" } diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json index 92e1651e55..4fb0d16ef6 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.json +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_DrakesRoom_EventScript_2286F3", "flag": "0" } diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json index 7744894159..ea3116460d 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.json +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_GlaciasRoom_EventScript_228469", "flag": "0" } diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json index c7440cf989..d0588f76a9 100644 --- a/data/maps/EverGrandeCity_HallOfFame/map.json +++ b/data/maps/EverGrandeCity_HallOfFame/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json index 36bf11a134..a0072fd08f 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.json +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PhoebesRoom_EventScript_2281CB", "flag": "0" } diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json index 7263f67cb2..38c527b34e 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A59", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A67", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A70", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A79", "flag": "FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT" } diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json index 195197b562..f1dcd3868b 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json index 5fe580001b..2a9efbeaf9 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_1F_EventScript_2295FC", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_1F_EventScript_22960A", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_1F_EventScript_229636", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_1F_EventScript_229636", "flag": "0" } diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json index 43d777f358..0d0bb68a10 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json index 2eceb30aea..87545b5973 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.json +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_SidneysRoom_EventScript_227F64", "flag": "0" } diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index e2519f8804..4afffa73c2 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_EventScript_1EB22B", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_EventScript_1EB20C", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_EventScript_1EB234", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_EventScript_1EB23D", "flag": "FLAG_HIDE_FALLARBOR_AZURILL" } diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/map.json b/data/maps/FallarborTown_BattleTentBattleRoom/map.json index 53a2801962..da4c9fd4f4 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/map.json +++ b/data/maps/FallarborTown_BattleTentBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/FallarborTown_BattleTentCorridor/map.json b/data/maps/FallarborTown_BattleTentCorridor/map.json index 51d69dc932..60168264f3 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/map.json +++ b/data/maps/FallarborTown_BattleTentCorridor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/FallarborTown_BattleTentLobby/map.json b/data/maps/FallarborTown_BattleTentLobby/map.json index 5c36cf3d93..aa65e71a0d 100644 --- a/data/maps/FallarborTown_BattleTentLobby/map.json +++ b/data/maps/FallarborTown_BattleTentLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_BattleTentLobby_EventScript_200001", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_BattleTentLobby_EventScript_20020D", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_BattleTentLobby_EventScript_200216", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_BattleTentLobby_EventScript_20021F", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_BattleTentLobby_EventScript_200228", "flag": "FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT" } diff --git a/data/maps/FallarborTown_House1/map.json b/data/maps/FallarborTown_House1/map.json index fb66ad1de5..e5e75c6315 100644 --- a/data/maps/FallarborTown_House1/map.json +++ b/data/maps/FallarborTown_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_House1_EventScript_200F13", "flag": "FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_House1_EventScript_200FBC", "flag": "0" } diff --git a/data/maps/FallarborTown_House2/map.json b/data/maps/FallarborTown_House2/map.json index 2b5ea52147..fe0ce67a02 100644 --- a/data/maps/FallarborTown_House2/map.json +++ b/data/maps/FallarborTown_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_House2_EventScript_201383", "flag": "0" } diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index 9416efe011..9248eec875 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_Mart_EventScript_1FFCBF", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_Mart_EventScript_1FFCF4", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_Mart_EventScript_1FFCFD", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_Mart_EventScript_1FFD06", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_Mart_EventScript_2C80B6", "flag": "0" } diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json index a432b8a1ab..b1ea1ed144 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_1F_EventScript_200BE1", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_1F_EventScript_200BEF", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_1F_EventScript_200BF8", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_1F_EventScript_200C01", "flag": "FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE" } diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json index be694d2572..029a4a9c66 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/FarawayIsland_Entrance/map.json b/data/maps/FarawayIsland_Entrance/map.json index 93dd0b584f..e8dc6dbed1 100644 --- a/data/maps/FarawayIsland_Entrance/map.json +++ b/data/maps/FarawayIsland_Entrance/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FarawayIsland_Entrance_EventScript_267CA2", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/FarawayIsland_Interior/map.json b/data/maps/FarawayIsland_Interior/map.json index d6531d043a..b41c5461a2 100644 --- a/data/maps/FarawayIsland_Interior/map.json +++ b/data/maps/FarawayIsland_Interior/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS", "movement_range_x": 15, "movement_range_y": 15, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "1", "script": "FarawayIsland_Interior_EventScript_267DF2", "flag": "FLAG_HIDE_MEW" } diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json index 26c609e05d..61324a8ffc 100644 --- a/data/maps/FieryPath/map.json +++ b/data/maps/FieryPath/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FieryPath_EventScript_29119E", "flag": "FLAG_ITEM_FIERY_PATH_TM06" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FieryPath_EventScript_2908BA", "flag": "FLAG_TEMP_11" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FieryPath_EventScript_2908BA", "flag": "FLAG_TEMP_12" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FieryPath_EventScript_2908BA", "flag": "FLAG_TEMP_13" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FieryPath_EventScript_2908BA", "flag": "FLAG_TEMP_14" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FieryPath_EventScript_2908BA", "flag": "FLAG_TEMP_15" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FieryPath_EventScript_2908BA", "flag": "FLAG_TEMP_16" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FieryPath_EventScript_291191", "flag": "FLAG_ITEM_FIERY_PATH_FIRE_STONE" } diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index 0aec65572d..d66ec1f4b3 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_1E25B6", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_1E25DE", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_1E25BF", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_1E25F0", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_1E25E7", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_1E25F9", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_1E2614", "flag": "FLAG_HIDE_FORTREE_CITY_KECLEON" } diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index 6a8d9fdabd..a8654e7087 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_DecorationShop_EventScript_21800E", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_DecorationShop_EventScript_218017", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_DecorationShop_EventScript_218020", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_DecorationShop_EventScript_21804C", "flag": "0" } diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json index ad6b7c6b91..f985b2ce47 100644 --- a/data/maps/FortreeCity_Gym/map.json +++ b/data/maps/FortreeCity_Gym/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_Gym_EventScript_2165C8", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "FortreeCity_Gym_EventScript_2166A8", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "FortreeCity_Gym_EventScript_2166D6", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "FortreeCity_Gym_EventScript_2166ED", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "FortreeCity_Gym_EventScript_2166BF", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_Gym_EventScript_216732", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "FortreeCity_Gym_EventScript_216704", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "FortreeCity_Gym_EventScript_21671B", "flag": "0" } diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index 8f349e6403..62469515aa 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House1_EventScript_2162BB", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House1_EventScript_216368", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House1_EventScript_21635F", "flag": "0" } diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index 7b9a67ab6b..17f928fe90 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House2_EventScript_2177CB", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House2_EventScript_2C811E", "flag": "0" } diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index d886e0cdb0..8b7e971c7e 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House3_EventScript_217AE8", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House3_EventScript_217AF1", "flag": "0" } diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index 11fd05bf5e..a9db995edd 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House4_EventScript_217C81", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House4_EventScript_217C8A", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House4_EventScript_217D20", "flag": "FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL" } diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index 37e23502b6..a60c02ec3e 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House5_EventScript_217EF2", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House5_EventScript_217F04", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House5_EventScript_217EFB", "flag": "0" } diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json index 3b7e0723b4..c1bb6df86c 100644 --- a/data/maps/FortreeCity_Mart/map.json +++ b/data/maps/FortreeCity_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_Mart_EventScript_217666", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_Mart_EventScript_217698", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_Mart_EventScript_2176A1", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_Mart_EventScript_2176AA", "flag": "0" } diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json index f51926d3be..efa58e87bb 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_1F_EventScript_2173E7", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_1F_EventScript_2173F5", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_1F_EventScript_2173FE", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_1F_EventScript_217407", "flag": "0" } diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json index 4984b76926..79bdfad307 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json index 3f720a5692..67f2e80007 100644 --- a/data/maps/GraniteCave_1F/map.json +++ b/data/maps/GraniteCave_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_1F_EventScript_22DA5E", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_1F_EventScript_291150", "flag": "FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE" } diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json index 6e3a144036..b33e751e52 100644 --- a/data/maps/GraniteCave_B1F/map.json +++ b/data/maps/GraniteCave_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B1F_EventScript_29115D", "flag": "FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL" } diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json index 18b5ca9d42..48de001806 100644 --- a/data/maps/GraniteCave_B2F/map.json +++ b/data/maps/GraniteCave_B2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_29116A", "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_REPEL" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_291177", "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_2907A6", "flag": "FLAG_TEMP_11" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_2907A6", "flag": "FLAG_TEMP_12" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_2907A6", "flag": "FLAG_TEMP_13" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_2907A6", "flag": "FLAG_TEMP_14" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_2907A6", "flag": "FLAG_TEMP_15" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_2907A6", "flag": "FLAG_TEMP_16" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_2907A6", "flag": "FLAG_TEMP_17" } diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json index 22a6207c27..ae5b61a6b6 100644 --- a/data/maps/GraniteCave_StevensRoom/map.json +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_StevensRoom_EventScript_22DC7B", "flag": "FLAG_HIDE_GRANITE_CAVE_STEVEN" } diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index 0719696c01..d6bbd2f46e 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "InsideOfTruck_EventScript_23BF6C", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "InsideOfTruck_EventScript_23BF6C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "InsideOfTruck_EventScript_23BF6C", "flag": "0" } diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json index c6365025b2..27876f5e58 100644 --- a/data/maps/IslandCave/map.json +++ b/data/maps/IslandCave/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "IslandCave_EventScript_238F58", "flag": "FLAG_HIDE_REGICE" } diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index 1e344bff0e..1b9c5471d6 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "JaggedPass_EventScript_230785", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "JaggedPass_EventScript_2307FB", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "JaggedPass_EventScript_291184", "flag": "FLAG_ITEM_JAGGED_PASS_BURN_HEAL" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "JaggedPass_EventScript_23079C", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "JaggedPass_EventScript_230718", "flag": "FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "JaggedPass_EventScript_230871", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "JaggedPass_EventScript_23085A", "flag": "0" } diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index fa59b5e0ee..9bec14bd1a 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -28,8 +28,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_1EA73B", "flag": "0" }, @@ -41,8 +41,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_1EA70E", "flag": "0" }, @@ -54,8 +54,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_1EA717", "flag": "0" }, @@ -67,8 +67,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_1EA720", "flag": "0" }, @@ -80,8 +80,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_1EA729", "flag": "0" }, @@ -93,8 +93,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_1EA732", "flag": "0" }, @@ -106,8 +106,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2" }, @@ -119,8 +119,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1" }, @@ -132,8 +132,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_1EA744", "flag": "0" } diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json index dac9467f06..aae6afc034 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_Gym_1F_EventScript_1FE78C", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "LavaridgeTown_Gym_1F_EventScript_1FE87F", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "LavaridgeTown_Gym_1F_EventScript_1FE900", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "LavaridgeTown_Gym_1F_EventScript_1FE8AF", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "LavaridgeTown_Gym_1F_EventScript_1FE8E5", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_Gym_1F_EventScript_1FE96C", "flag": "0" } diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json index c81e42dc23..9679beb485 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.json +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "LavaridgeTown_Gym_B1F_EventScript_1FE91B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "LavaridgeTown_Gym_B1F_EventScript_1FE8CA", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "LavaridgeTown_Gym_B1F_EventScript_1FE936", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "LavaridgeTown_Gym_B1F_EventScript_1FE951", "flag": "0" } diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json index c8091527c5..203812fb27 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.json +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_HerbShop_EventScript_1FE4D7", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_HerbShop_EventScript_1FE505", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_HerbShop_EventScript_1FE4FC", "flag": "0" } diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index 5465c81f84..a0cd74f59e 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_House_EventScript_1FF912", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_House_EventScript_1FF91B", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_House_EventScript_2C804E", "flag": "0" } diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json index 1208d3e536..2f8d1278f2 100644 --- a/data/maps/LavaridgeTown_Mart/map.json +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_Mart_EventScript_1FF9CE", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_Mart_EventScript_1FF9FE", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_Mart_EventScript_1FFA07", "flag": "0" } diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json index 18980fb3cb..ef32ef6605 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E", "flag": "0" } diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json index a8c2ef9a32..95d1e194fc 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index d10f00260b..63c5925fdd 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2C53", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2C2B", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2C22", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2C4A", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2C91", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2C72", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2C9A", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2CA3", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2CAC", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2D7D", "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_2910E8", "flag": "FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2DD5", "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2DBA", "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2DC3", "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2DCC", "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2BD8", "flag": "0" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2DDE", "flag": "FLAG_HIDE_LILYCOVE_CITY_RIVAL" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E302D", "flag": "0" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2CEE", "flag": "0" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2CDD", "flag": "0" }, @@ -293,8 +293,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2CCB", "flag": "0" }, @@ -306,8 +306,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2CD4", "flag": "0" } diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json index 644ec55ee3..3522c7963c 100644 --- a/data/maps/LilycoveCity_ContestHall/map.json +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 4, "movement_range_y": 4, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B485", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B48E", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B497", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B4A9", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B4C0", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B4D7", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B4EE", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B505", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B51C", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B533", "flag": "0" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B56A", "flag": "0" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B53C", "flag": "0" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B581", "flag": "0" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B598", "flag": "0" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B5AF", "flag": "0" }, @@ -217,8 +217,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B5C6", "flag": "0" }, @@ -230,8 +230,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B5DD", "flag": "0" }, @@ -243,8 +243,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B5F4", "flag": "0" }, @@ -256,8 +256,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B60B", "flag": "0" }, @@ -269,8 +269,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B639", "flag": "0" }, @@ -282,8 +282,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B622", "flag": "0" }, @@ -295,8 +295,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B553", "flag": "0" }, @@ -308,8 +308,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B650", "flag": "0" }, @@ -321,8 +321,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B667", "flag": "0" }, @@ -334,8 +334,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B67E", "flag": "0" }, @@ -347,8 +347,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B695", "flag": "0" }, @@ -360,8 +360,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B6AC", "flag": "0" }, @@ -373,8 +373,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B6C3", "flag": "0" }, @@ -386,8 +386,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B6DA", "flag": "0" }, @@ -399,8 +399,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B71C", "flag": "0" }, @@ -412,8 +412,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B705", "flag": "0" }, @@ -425,8 +425,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B4A0", "flag": "0" } diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json index 65571d71ca..3cbb48f214 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.json +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A554", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A806", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_293FA2", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A708", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A711", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A71A", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_28CA59", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A768", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_293FB4", "flag": "0" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A72C", "flag": "0" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A723", "flag": "0" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A735", "flag": "0" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_293FAB", "flag": "0" }, @@ -217,8 +217,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_293FBD", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT" }, @@ -230,8 +230,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A771", "flag": "0" }, @@ -243,8 +243,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A7B3", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" }, @@ -256,8 +256,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A7BE", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" }, @@ -269,8 +269,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A7C9", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" }, @@ -282,8 +282,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A7D9", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" }, @@ -295,8 +295,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A7E9", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" }, @@ -308,8 +308,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A7A8", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" }, @@ -321,8 +321,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A798", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" }, @@ -334,8 +334,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21ACF1", "flag": "0" } diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json index f42538ba51..8f251039c2 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_218189", "flag": "0" } diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json index 94ae040698..0bd5518158 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3", "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218729", "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218732", "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218720", "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218744", "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_21873B", "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_21874D", "flag": "FLAG_HIDE_LILCOVE_MOTEL_SCOTT" } diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json index 2c22272ac3..75a1fddf9e 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStoreElevator_EventScript_220624", "flag": "0" } diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json index 784660e368..7514a548a0 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220268", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_22028C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_22022F", "flag": "FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186", "flag": "0" } diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json index 58e400ff46..564377f7fe 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F693", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F69C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F82F", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F838", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F841", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F84A", "flag": "0" } diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json index b3fd03f005..3238eeee88 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB2D", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB36", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB3F", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB7A", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB48", "flag": "0" } diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json index e9d5785e63..9ecf5104ae 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCB6", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCBF", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCC8", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FC65", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FC8C", "flag": "0" } diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json index b41eecd31f..2abccb7831 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDEB", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDF4", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDFD", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FE06", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FE2C", "flag": "0" } diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json index 6ea8bbbf27..a49de92558 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_2200BC", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_22006C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_21FFA6", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_21FFDC", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_22000A", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_22003A", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_220075", "flag": "0" } diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json index 1eb68641ac..28e2366e62 100644 --- a/data/maps/LilycoveCity_Harbor/map.json +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_Harbor_EventScript_21E00F", "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_Harbor_EventScript_21E637", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER" } diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json index b8d59e9531..54fa583332 100644 --- a/data/maps/LilycoveCity_House1/map.json +++ b/data/maps/LilycoveCity_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House1_EventScript_21ECCE", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House1_EventScript_21ECD7", "flag": "0" } diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json index 87f5a52d9d..b3e4127a6a 100644 --- a/data/maps/LilycoveCity_House2/map.json +++ b/data/maps/LilycoveCity_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House2_EventScript_21ED75", "flag": "0" } diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json index 78dffc5f0b..537fc46b3e 100644 --- a/data/maps/LilycoveCity_House3/map.json +++ b/data/maps/LilycoveCity_House3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House3_EventScript_21EF3D", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House3_EventScript_21EE4B", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House3_EventScript_21EED5", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House3_EventScript_21EF09", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House3_EventScript_21EEA1", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House3_EventScript_21EE8A", "flag": "0" } diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json index 72cd396f02..f442d00ba8 100644 --- a/data/maps/LilycoveCity_House4/map.json +++ b/data/maps/LilycoveCity_House4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House4_EventScript_21F5B5", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House4_EventScript_21F5BE", "flag": "0" } diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json index 72f376e23e..11272059e2 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E07", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E10", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E19", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E42", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E22", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3" } diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json index ab2ae56fb2..18a2829e46 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219866", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21998A", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219993", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21999C", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" } diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json index d200fad221..f4adbabe89 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_MoveDeletersHouse_EventScript_21EA0B", "flag": "0" } diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json index b58418edd9..c5c0121f4a 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5E8", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5F6", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5FF", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_1F_EventScript_2A836B", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_1F_EventScript_2A89C7", "flag": "FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY" } diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json index 346a911732..6bfb1c4cb0 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json index b48876cce0..0591d3c8e9 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3", "flag": "FLAG_HIDE_FANCLUB_LITTLE_BOY" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55", "flag": "FLAG_HIDE_FANCLUB_BOY" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7", "flag": "FLAG_HIDE_FANCLUB_LADY" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19", "flag": "FLAG_HIDE_FANCLUB_OLD_LADY" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B", "flag": "FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER" } diff --git a/data/maps/LinkContestRoom1/map.json b/data/maps/LinkContestRoom1/map.json index 538b0af697..664a32b29f 100644 --- a/data/maps/LinkContestRoom1/map.json +++ b/data/maps/LinkContestRoom1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_LINK_CONTEST_POKE_BALL" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json index 1d0c2763a4..7ef696a58d 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -28,8 +28,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_EventScript_1E8034", "flag": "0" }, @@ -41,8 +41,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_EventScript_1E8022", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN" }, @@ -54,8 +54,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_EventScript_1E802B", "flag": "0" }, @@ -67,8 +67,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_EventScript_1E863D", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE" }, @@ -80,8 +80,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK" }, @@ -93,8 +93,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK" }, @@ -106,8 +106,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_RIVAL" }, @@ -119,8 +119,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCH" } diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index efa6f6079e..ca5ee92de9 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_BrendansHouse_1F_EventScript_2929C5", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 3, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_BrendansHouse_1F_EventScript_292ACD", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_BrendansHouse_1F_EventScript_292ABA", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F89F3", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_PLAYERS_HOUSE_DAD" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN" } diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json index 4adc283881..e07959b205 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F94C1", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F8481", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL" }, @@ -217,8 +217,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL" } diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index 34260c77ac..e1f7d823ac 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_MaysHouse_1F_EventScript_2929C5", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_MaysHouse_1F_EventScript_292ABA", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 3, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_MaysHouse_1F_EventScript_292ACD", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F89F3", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_PLAYERS_HOUSE_DAD" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A3D", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN" } diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index be1329fbdd..d92b024c6d 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_MaysHouse_2F_EventScript_1F94C1", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL" }, @@ -217,8 +217,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_MaysHouse_2F_EventScript_1F9334", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL" } diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json index 2b29f99c1f..25ec2e745d 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA023", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA" } diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json index 2d07a723a7..8eb3e23b52 100644 --- a/data/maps/MagmaHideout_1F/map.json +++ b/data/maps/MagmaHideout_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MagmaHideout_1F_EventScript_23988C", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_1F_EventScript_2914DE", "flag": "FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "MagmaHideout_1F_EventScript_2398A3", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_1F_EventScript_2908BA", "flag": "FLAG_TEMP_11" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_1F_EventScript_2908BA", "flag": "FLAG_TEMP_12" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_1F_EventScript_2908BA", "flag": "FLAG_TEMP_13" } diff --git a/data/maps/MagmaHideout_2F_1R/map.json b/data/maps/MagmaHideout_2F_1R/map.json index 75db41221a..d628c1b5ae 100644 --- a/data/maps/MagmaHideout_2F_1R/map.json +++ b/data/maps/MagmaHideout_2F_1R/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 5, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MagmaHideout_2F_1R_EventScript_239B7F", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", "movement_range_x": 7, "movement_range_y": 6, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MagmaHideout_2F_1R_EventScript_239B96", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "MagmaHideout_2F_1R_EventScript_239B51", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MagmaHideout_2F_1R_EventScript_239B68", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" } diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json index af80ea8ff7..ef7086bbf8 100644 --- a/data/maps/MagmaHideout_2F_2R/map.json +++ b/data/maps/MagmaHideout_2F_2R/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "MagmaHideout_2F_2R_EventScript_239E4D", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MagmaHideout_2F_2R_EventScript_239E36", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_2F_2R_EventScript_2914EB", "flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "MagmaHideout_2F_2R_EventScript_239E1F", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MagmaHideout_2F_2R_EventScript_239E08", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_2F_2R_EventScript_2914F8", "flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE" } diff --git a/data/maps/MagmaHideout_3F_1R/map.json b/data/maps/MagmaHideout_3F_1R/map.json index ec61d27591..67202e748a 100644 --- a/data/maps/MagmaHideout_3F_1R/map.json +++ b/data/maps/MagmaHideout_3F_1R/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "MagmaHideout_3F_1R_EventScript_23A1B3", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "MagmaHideout_3F_1R_EventScript_23A1CA", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_3F_1R_EventScript_291505", "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET" } diff --git a/data/maps/MagmaHideout_3F_2R/map.json b/data/maps/MagmaHideout_3F_2R/map.json index 23e8d0b8ca..bc67b15e5a 100644 --- a/data/maps/MagmaHideout_3F_2R/map.json +++ b/data/maps/MagmaHideout_3F_2R/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MagmaHideout_3F_2R_EventScript_23A3D5", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_3F_2R_EventScript_291512", "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX" } diff --git a/data/maps/MagmaHideout_3F_3R/map.json b/data/maps/MagmaHideout_3F_3R/map.json index 40921b8ca9..00fc5a46c6 100644 --- a/data/maps/MagmaHideout_3F_3R/map.json +++ b/data/maps/MagmaHideout_3F_3R/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_3F_3R_EventScript_29152C", "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE" } diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json index dcec4fdb9f..b627ae1edc 100644 --- a/data/maps/MagmaHideout_4F/map.json +++ b/data/maps/MagmaHideout_4F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MagmaHideout_4F_EventScript_23A68C", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MagmaHideout_4F_EventScript_23A6A3", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MagmaHideout_4F_EventScript_23A6BA", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "MagmaHideout_4F_EventScript_23A6D1", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_4F_EventScript_23A560", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_4F_EventScript_29151F", "flag": "FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE" } diff --git a/data/maps/MarineCave_End/map.json b/data/maps/MarineCave_End/map.json index eb3d5cc62a..ec1c3389a4 100644 --- a/data/maps/MarineCave_End/map.json +++ b/data/maps/MarineCave_End/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MARINE_CAVE_KYOGRE" } diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index 4ee667f2b1..f3bde6eb96 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -43,8 +43,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_1DF3B3", "flag": "0" }, @@ -56,8 +56,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_1DF3CE", "flag": "0" }, @@ -69,8 +69,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_1DF3BC", "flag": "0" }, @@ -82,8 +82,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_1DF3C5", "flag": "0" }, @@ -95,8 +95,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_1DF3FB", "flag": "0" }, @@ -108,8 +108,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_1DF452", "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLY" }, @@ -121,8 +121,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_1DF41D", "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE" }, @@ -134,8 +134,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_1DF73A", "flag": "FLAG_HIDE_MAUVILLE_CITY_WATTSON" }, @@ -147,8 +147,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_2910CE", "flag": "FLAG_ITEM_MAUVILLE_CITY_X_SPEED" }, @@ -160,8 +160,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_2C7F7E", "flag": "0" }, @@ -173,8 +173,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MAUVILLE_CITY_SCOTT" } diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json index c774718f04..98c1fcee1d 100644 --- a/data/maps/MauvilleCity_BikeShop/map.json +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_BikeShop_EventScript_20EBBC", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_BikeShop_EventScript_20ED31", "flag": "0" } diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index 696694a6bc..07bfd3bb2c 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_210125", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_21012E", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_20FBB9", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_20FCF1", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_210137", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_21021D", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_210279", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_210289", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_20FE9F", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_210299", "flag": "0" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_2102B6", "flag": "0" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_2102C6", "flag": "0" } diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json index 6a4429fa76..9de74941c4 100644 --- a/data/maps/MauvilleCity_Gym/map.json +++ b/data/maps/MauvilleCity_Gym/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_Gym_EventScript_20DEEB", "flag": "FLAG_HIDE_MAUVILLE_GYM_WATTSON" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MauvilleCity_Gym_EventScript_20E0D0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MauvilleCity_Gym_EventScript_20E0FE", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MauvilleCity_Gym_EventScript_20E0E7", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MauvilleCity_Gym_EventScript_20E0B9", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_Gym_EventScript_20E12C", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MauvilleCity_Gym_EventScript_20E115", "flag": "0" } diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json index ec2d63cf91..d7e148b310 100644 --- a/data/maps/MauvilleCity_House1/map.json +++ b/data/maps/MauvilleCity_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_House1_EventScript_20F976", "flag": "0" } diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json index f29a2a34c2..272b60f0fd 100644 --- a/data/maps/MauvilleCity_House2/map.json +++ b/data/maps/MauvilleCity_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_House2_EventScript_210C5D", "flag": "0" } diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json index 23b451ae26..598ed6e526 100644 --- a/data/maps/MauvilleCity_Mart/map.json +++ b/data/maps/MauvilleCity_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_Mart_EventScript_2110E6", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_Mart_EventScript_21111C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_Mart_EventScript_211125", "flag": "0" } diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json index 3e63670aba..c024c2cba5 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E78", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_1F_EventScript_28E066", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E86", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E8F", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E98", "flag": "0" } diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json index 956868d684..4afcc3882a 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_2F_EventScript_21102F", "flag": "0" } diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index 2f20b485f0..3492e05bc6 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_1F_1R_EventScript_2911AB", "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_1F_1R_EventScript_2911C5", "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_1F_1R_EventScript_2911B8", "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_1F_1R_EventScript_2911D2", "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_1F_1R_EventScript_22BF25", "flag": "FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO" } diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json index f1e47c9868..be52085cd0 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MeteorFalls_1F_2R_EventScript_22C4DE", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MeteorFalls_1F_2R_EventScript_22C540", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MeteorFalls_1F_2R_EventScript_22C5A4", "flag": "0" } diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json index 527813efb3..7c45bfdd09 100644 --- a/data/maps/MeteorFalls_B1F_2R/map.json +++ b/data/maps/MeteorFalls_B1F_2R/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_B1F_2R_EventScript_2911DF", "flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02" } diff --git a/data/maps/MeteorFalls_StevensCave/map.json b/data/maps/MeteorFalls_StevensCave/map.json index b3d696c8e4..b23c3f952d 100644 --- a/data/maps/MeteorFalls_StevensCave/map.json +++ b/data/maps/MeteorFalls_StevensCave/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_StevensCave_EventScript_23B182", "flag": "0" } diff --git a/data/maps/MirageTower_3F/map.json b/data/maps/MirageTower_3F/map.json index 7ba9772da9..a653c6e525 100644 --- a/data/maps/MirageTower_3F/map.json +++ b/data/maps/MirageTower_3F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MirageTower_3F_EventScript_2907A6", "flag": "FLAG_TEMP_11" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MirageTower_3F_EventScript_2907A6", "flag": "FLAG_TEMP_12" } diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json index a39ed14a95..d6b69a14c0 100644 --- a/data/maps/MirageTower_4F/map.json +++ b/data/maps/MirageTower_4F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MirageTower_4F_EventScript_23AD48", "flag": "FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MirageTower_4F_EventScript_23AD89", "flag": "FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MirageTower_4F_EventScript_2907A6", "flag": "FLAG_TEMP_11" } diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index c4eb8e7731..767a99584c 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4AD1", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4AF9", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4AB2", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4AF0", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4B02", "flag": "0" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_2910F5", "flag": "FLAG_ITEM_MOSSDEEP_CITY_NET_BALL" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4C10", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4B0B", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4C26", "flag": "0" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, @@ -220,8 +220,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_2C81EE", "flag": "0" }, @@ -233,8 +233,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4C85", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SCOTT" }, @@ -246,8 +246,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4C7C", "flag": "0" } diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json index ffb52896e2..8ea28a4742 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_GameCorner_1F_EventScript_224B54", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_GameCorner_1F_EventScript_224B4B", "flag": "0" } diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json index 4469b2642c..c86bf2b6e1 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json index 81ce5e4689..2d86ad9a8e 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Gym_EventScript_220898", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220AFD", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220B2B", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220B70", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220B59", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220B14", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220B42", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Gym_EventScript_220C11", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Gym_EventScript_220898", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -217,8 +217,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -230,8 +230,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220B9E", "flag": "0" }, @@ -243,8 +243,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220B87", "flag": "0" }, @@ -256,8 +256,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -269,8 +269,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -282,8 +282,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -295,8 +295,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -308,8 +308,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -321,8 +321,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -334,8 +334,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220BCC", "flag": "0" }, @@ -347,8 +347,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -360,8 +360,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220BB5", "flag": "0" }, @@ -373,8 +373,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220BFA", "flag": "0" }, @@ -386,8 +386,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -399,8 +399,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -412,8 +412,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -425,8 +425,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220BE3", "flag": "0" }, @@ -438,8 +438,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -451,8 +451,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -464,8 +464,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -477,8 +477,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json index 55e573f694..def086288f 100644 --- a/data/maps/MossdeepCity_House1/map.json +++ b/data/maps/MossdeepCity_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House1_EventScript_221FD6", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House1_EventScript_222006", "flag": "0" } diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index 7f2121b7f1..e63a1aee66 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House2_EventScript_2220DF", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House2_EventScript_2220E8", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House2_EventScript_2220F1", "flag": "FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL" } diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json index 1f28d4d222..237a315ff2 100644 --- a/data/maps/MossdeepCity_House3/map.json +++ b/data/maps/MossdeepCity_House3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House3_EventScript_2225C3", "flag": "0" } diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json index 9f9f01ebd1..2d1b333355 100644 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House4_EventScript_222DD8", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House4_EventScript_222DF7", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House4_EventScript_222E1E", "flag": "0" } diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json index 6b739a2d2f..bd14a30c16 100644 --- a/data/maps/MossdeepCity_Mart/map.json +++ b/data/maps/MossdeepCity_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Mart_EventScript_2223C8", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Mart_EventScript_2223F6", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Mart_EventScript_2223FF", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Mart_EventScript_222408", "flag": "0" } diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json index 6f1f3f774f..fc78cc9678 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_1F_EventScript_22224E", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_1F_EventScript_22225C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_1F_EventScript_222265", "flag": "0" } diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json index 7aa2e7ccb3..88bf3caf2a 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_2F_EventScript_22235B", "flag": "0" } diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index f53950394f..0d02d368ad 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_222FD8", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_223063", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_22308E", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_223168", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_22312D", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231DA", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231F1", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MossdeepCity_SpaceCenter_1F_EventScript_223208", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_22321F", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231CF", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231B9", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN" } diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json index a40f6ca9d7..5c758bf3e0 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F03", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_223EC8", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_223E8D", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F7A", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F3E", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F50", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F47", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F59", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F6F", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" } diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json index beedbd75ae..76844e258e 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.json +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_StevensHouse_EventScript_222912", "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_StevensHouse_EventScript_222841", "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_StevensHouse_EventScript_22291B", "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY" } diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index b8dd7bb09c..2b19e7f8d8 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22EDD5", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22EE0B", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MtChimney_EventScript_22F06E", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0C0", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0B7", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F05C", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F053", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F065", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22EEF3", "flag": "FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0C9", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_RUN_IN_PLACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0DB", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0D2", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0A5", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0D2", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0D2", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -217,8 +217,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0AE", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -230,8 +230,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F09C", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -243,8 +243,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0DB", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, @@ -256,8 +256,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0D2", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -269,8 +269,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0DB", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, @@ -282,8 +282,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0D2", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -295,8 +295,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtChimney_EventScript_22F085", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -308,8 +308,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0DB", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, @@ -321,8 +321,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0D2", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -334,8 +334,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtChimney_EventScript_22F14A", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, @@ -347,8 +347,8 @@ "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "MtChimney_EventScript_22F1AC", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, @@ -360,8 +360,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtChimney_EventScript_22F1C3", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, @@ -373,8 +373,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtChimney_EventScript_22F1DA", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, @@ -386,8 +386,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtChimney_EventScript_22F1F1", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -399,8 +399,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "MtChimney_EventScript_22F208", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" } diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json index 155686bbb5..1b0efd3d93 100644 --- a/data/maps/MtChimney_CableCarStation/map.json +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_CableCarStation_EventScript_22AC4B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json index 1969ba9cdc..8b2e146f5a 100644 --- a/data/maps/MtPyre_1F/map.json +++ b/data/maps/MtPyre_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_1F_EventScript_230F3F", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_1F_EventScript_230F78", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_1F_EventScript_230F81", "flag": "0" } diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json index 07b20b3b38..7a5c4d6396 100644 --- a/data/maps/MtPyre_2F/map.json +++ b/data/maps/MtPyre_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MtPyre_2F_EventScript_231128", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_2F_EventScript_2912FD", "flag": "FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_2F_EventScript_231116", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_2F_EventScript_23111F", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MtPyre_2F_EventScript_23115A", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MtPyre_2F_EventScript_23113F", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MtPyre_2F_EventScript_23118C", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MtPyre_2F_EventScript_231175", "flag": "0" } diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json index a1b39048e4..b8684cff96 100644 --- a/data/maps/MtPyre_3F/map.json +++ b/data/maps/MtPyre_3F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "MtPyre_3F_EventScript_231753", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "MtPyre_3F_EventScript_23176A", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_3F_EventScript_29130A", "flag": "FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "MtPyre_3F_EventScript_231781", "flag": "0" } diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json index a7bf954e71..59d4dd1105 100644 --- a/data/maps/MtPyre_4F/map.json +++ b/data/maps/MtPyre_4F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MtPyre_4F_EventScript_231C6E", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_4F_EventScript_291317", "flag": "FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE" } diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json index b27d426ac5..1c035bd4da 100644 --- a/data/maps/MtPyre_5F/map.json +++ b/data/maps/MtPyre_5F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MtPyre_5F_EventScript_231BC9", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_5F_EventScript_291324", "flag": "FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE" } diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json index a169953f23..8f7c4f30fa 100644 --- a/data/maps/MtPyre_6F/map.json +++ b/data/maps/MtPyre_6F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_6F_EventScript_231D3B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_6F_EventScript_291331", "flag": "FLAG_ITEM_MT_PYRE_6F_TM_30" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_6F_EventScript_231D9D", "flag": "0" } diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json index 6b35427dfb..2a8a5eaffb 100644 --- a/data/maps/MtPyre_Exterior/map.json +++ b/data/maps/MtPyre_Exterior/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_Exterior_EventScript_29133E", "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_Exterior_EventScript_29134B", "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48" } diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index d729766d58..fedde68e80 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_Summit_EventScript_23213C", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_Summit_EventScript_2321A2", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_Summit_EventScript_2323FD", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_Summit_EventScript_232414", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_Summit_EventScript_23242B", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_Summit_EventScript_232442", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE" } diff --git a/data/maps/NavelRock_Bottom/map.json b/data/maps/NavelRock_Bottom/map.json index e4fb5a2fee..ee324635bd 100644 --- a/data/maps/NavelRock_Bottom/map.json +++ b/data/maps/NavelRock_Bottom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NavelRock_Bottom_EventScript_2692A2", "flag": "FLAG_HIDE_LUGIA" } diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index 39c8d9f0f6..7ea3ef0e7b 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NavelRock_Harbor_EventScript_2690BD", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/NavelRock_Top/map.json b/data/maps/NavelRock_Top/map.json index 93e35bdea0..4b025ccae6 100644 --- a/data/maps/NavelRock_Top/map.json +++ b/data/maps/NavelRock_Top/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_HO_OH" } diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index 73a15bd0ce..fe79597031 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_2911EC", "flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_2911F9", "flag": "FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_291206", "flag": "FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_291213", "flag": "FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_291220", "flag": "FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_2377AF", "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_2377FC", "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_237849", "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3" } diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 75437393fd..164cd3eae0 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_EventScript_1E8EF3", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_EventScript_1E8EFC", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_EventScript_1E901F", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_EventScript_1E9070", "flag": "FLAG_HIDE_OLDALE_TOWN_RIVAL" } diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json index fe0ac7b6aa..aa837378c3 100644 --- a/data/maps/OldaleTown_House1/map.json +++ b/data/maps/OldaleTown_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_House1_EventScript_1FBE86", "flag": "0" } diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json index 2de7632fd3..fbcf968e7e 100644 --- a/data/maps/OldaleTown_House2/map.json +++ b/data/maps/OldaleTown_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_House2_EventScript_1FBF5B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_House2_EventScript_1FBF64", "flag": "0" } diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json index 1226dd17fa..9f1f894ce3 100644 --- a/data/maps/OldaleTown_Mart/map.json +++ b/data/maps/OldaleTown_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_Mart_EventScript_1FC240", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_Mart_EventScript_1FC28A", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_Mart_EventScript_1FC2A9", "flag": "0" } diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json index 94cbe1627d..7c9ed89a00 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC01A", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC028", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC031", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC03A", "flag": "0" } diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json index 7a899e4a91..cddd0a5a30 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index 1219eabadf..971bf5b860 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_EventScript_1EBACC", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_EventScript_1EBAD5", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_EventScript_1EBAC3", "flag": "0" } diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index 19f592374e..1e48da85c2 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House1_EventScript_20365D", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House1_EventScript_203666", "flag": "0" } diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json index 370b37d736..d57720795a 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House2_EventScript_203792", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House2_EventScript_203891", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House2_EventScript_2038AC", "flag": "0" } diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json index 5788245257..181d69a803 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House3_EventScript_203CB5", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House3_EventScript_203C11", "flag": "0" } diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index 2db52fe9b2..d38384fc94 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House4_EventScript_203F55", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House4_EventScript_203F4C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House4_EventScript_203F5E", "flag": "0" } diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json index b8c4a03523..db7e51c46c 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House5_EventScript_204111", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House5_EventScript_204137", "flag": "0" } diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index 1f141dec57..6902432778 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034B6", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034D6", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034C4", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034CD", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE", "flag": "0" } diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json index 2b6a43ce0f..c5f7c9907a 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index 475eed1d4a..d8f77168b2 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_EventScript_1DC3FD", "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_PETALBURG_CITY_WALLY" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_EventScript_1DC3E6", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_EventScript_1DC488", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_EventScript_2910B4", "flag": "FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_EventScript_2910C1", "flag": "FLAG_ITEM_PETALBURG_CITY_ETHER" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_EventScript_1DC82E", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_PETALBURG_CITY_SCOTT" } diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index 6f133a979a..297c58a306 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_2049F1", "flag": "FLAG_HIDE_PETALYBURG_GYM_NORMAN" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_2054AA", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_2053BA", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_2053F6", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_2054E6", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_205432", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_205522", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_20546E", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_20574F", "flag": "FLAG_HIDE_PETALBURG_GYM_GREETER" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_PETALBURG_GYM_WALLY" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE" } diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json index 1345f8d6be..68e9a4dce9 100644 --- a/data/maps/PetalburgCity_House1/map.json +++ b/data/maps/PetalburgCity_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_House1_EventScript_2077A3", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_House1_EventScript_20779A", "flag": "0" } diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json index cc193445ee..b6c0107a0c 100644 --- a/data/maps/PetalburgCity_House2/map.json +++ b/data/maps/PetalburgCity_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_House2_EventScript_2078F3", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_House2_EventScript_2078FC", "flag": "0" } diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json index c811ece3c0..b08837e803 100644 --- a/data/maps/PetalburgCity_Mart/map.json +++ b/data/maps/PetalburgCity_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Mart_EventScript_207D69", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Mart_EventScript_207DE8", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Mart_EventScript_207DDF", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Mart_EventScript_207DD6", "flag": "0" } diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json index a82cbb85aa..eeb22dca42 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_1F_EventScript_2079FC", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_1F_EventScript_291539", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A0A", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A13", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A1C", "flag": "0" } diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json index 49f2942b35..279c5e44b5 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json index b6a152be29..c961d300ca 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_WallysHouse_EventScript_204278", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_WallysHouse_EventScript_2042C0", "flag": "0" } diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index 534f88c925..4921b88ae8 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_2906BB", "flag": "FLAG_TEMP_11" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_2906BB", "flag": "FLAG_TEMP_12" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_29110F", "flag": "FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_291102", "flag": "FLAG_ITEM_PETALBURG_WOODS_X_ATTACK" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_29111C", "flag": "FLAG_ITEM_PETALBURG_WOODS_ETHER" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_22E210", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "PetalburgWoods_EventScript_22E26D", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "PetalburgWoods_EventScript_22E284", "flag": "0" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_22E219", "flag": "0" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_291129", "flag": "FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_22E222", "flag": "0" } diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index 4b5d55c378..4777472d20 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RecordCorner_EventScript_2774C6", "flag": "0" } diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 4bda7149be..97c303c1ce 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route101_EventScript_1EBDFB", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route101_EventScript_1EBE16", "flag": "FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_101_ZIGZAGOON" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route101_EventScript_272141", "flag": "FLAG_HIDE_ROUTE_101_BIRCH" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route101_EventScript_1EBE04", "flag": "FLAG_HIDE_ROUTE_101_BOY" } diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index e6418c42c2..7a6c6d9630 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route102_EventScript_1EC0E1", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route102_EventScript_1EC105", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route102_EventScript_1EC1B3", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route102_EventScript_1EC1CA", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route102_EventScript_1EC0FC", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route102_EventScript_290CD8", "flag": "FLAG_ITEM_ROUTE_102_POTION" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "2", "script": "BerryTreeScript", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "1", "script": "BerryTreeScript", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route102_EventScript_1EC1E1", "flag": "0" } diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index 516c4ed8fc..6516e99dce 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_1EC5E2", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_1EC3C1", "flag": "FLAG_HIDE_ROUTE_103_RIVAL" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route103_EventScript_1EC5F4", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route103_EventScript_1EC66E", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route103_EventScript_1EC60B", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route103_EventScript_1EC6D1", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "5", "script": "BerryTreeScript", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "6", "script": "BerryTreeScript", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "7", "script": "BerryTreeScript", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_1EC5D9", "flag": "0" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_272141", "flag": "FLAG_HIDE_ROUTE_103_BIRCH" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route103_EventScript_1EC6E8", "flag": "0" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_290CE5", "flag": "FLAG_ITEM_ROUTE_103_GUARD_SPEC" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_2906BB", "flag": "FLAG_TEMP_12" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_2906BB", "flag": "FLAG_TEMP_13" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route103_EventScript_1EC761", "flag": "0" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route103_EventScript_1EC74A", "flag": "0" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route103_EventScript_1EC78F", "flag": "0" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route103_EventScript_1EC778", "flag": "0" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_290CF2", "flag": "FLAG_ITEM_ROUTE_103_PP_UP" } diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json index 0b0ed68371..e14a73c29a 100644 --- a/data/maps/Route104/map.json +++ b/data/maps/Route104/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ED00F", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ED006", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route104_EventScript_1ED38D", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ED045", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ED04E", "flag": "0" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ED090", "flag": "0" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ED35F", "flag": "0" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 8, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "8", "script": "BerryTreeScript", "flag": "0" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 9, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "9", "script": "BerryTreeScript", "flag": "0" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 10, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "10", "script": "BerryTreeScript", "flag": "0" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 11, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "11", "script": "BerryTreeScript", "flag": "0" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 12, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "12", "script": "BerryTreeScript", "flag": "0" }, @@ -220,8 +220,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 13, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "13", "script": "BerryTreeScript", "flag": "0" }, @@ -233,8 +233,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ECF8C", "flag": "0" }, @@ -246,8 +246,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "3", "script": "BerryTreeScript", "flag": "0" }, @@ -259,8 +259,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "4", "script": "BerryTreeScript", "flag": "0" }, @@ -272,8 +272,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 75, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "75", "script": "BerryTreeScript", "flag": "0" }, @@ -285,8 +285,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 76, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "76", "script": "BerryTreeScript", "flag": "0" }, @@ -298,8 +298,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_290CFF", "flag": "FLAG_ITEM_ROUTE_104_PP_UP" }, @@ -311,8 +311,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ECFCD", "flag": "FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST" }, @@ -324,8 +324,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route104_EventScript_1ED597", "flag": "0" }, @@ -337,8 +337,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route104_EventScript_1ED5B6", "flag": "0" }, @@ -350,8 +350,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route104_EventScript_1ED43B", "flag": "0" }, @@ -363,8 +363,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route104_EventScript_1ED4E9", "flag": "0" }, @@ -376,8 +376,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_290D0C", "flag": "FLAG_ITEM_ROUTE_104_POKE_BALL" }, @@ -389,8 +389,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", "movement_range_x": 5, "movement_range_y": 6, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route104_EventScript_1ED376", "flag": "0" }, @@ -402,8 +402,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_290D19", "flag": "FLAG_ITEM_ROUTE_104_X_ACCURACY" }, @@ -415,8 +415,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_2906BB", "flag": "FLAG_TEMP_11" }, @@ -428,8 +428,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_290D26", "flag": "FLAG_ITEM_ROUTE_104_POTION" }, @@ -441,8 +441,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ED057", "flag": "0" }, @@ -454,8 +454,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ED5D5", "flag": "0" }, @@ -467,8 +467,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ECC9E", "flag": "FLAG_HIDE_ROUTE_104_RIVAL" } diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json index bdd2361e06..438d56b307 100644 --- a/data/maps/Route104_MrBrineysHouse/map.json +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_MrBrineysHouse_EventScript_229D67", "flag": "FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_MrBrineysHouse_EventScript_229E5D", "flag": "FLAG_HIDE_BRINEYS_HOUSE_PEEKO" } diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json index cd00d18e1c..9d3d307948 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_PrettyPetalFlowerShop_EventScript_22A373", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_PrettyPetalFlowerShop_EventScript_22A40C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_PrettyPetalFlowerShop_EventScript_22A442", "flag": "0" } diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index 937582affe..b42965229d 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route105_EventScript_1EE261", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 7, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route105_EventScript_1EE278", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 7, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route105_EventScript_1EE28F", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 5, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route105_EventScript_1EE2A6", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route105_EventScript_290D33", "flag": "FLAG_ITEM_ROUTE_105_IRON" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 7, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route105_EventScript_1EE24A", "flag": "0" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 2, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route105_EventScript_1EE2BD", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 2, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route105_EventScript_1EE2D4", "flag": "0" } diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json index fd86567e96..93e98078ba 100644 --- a/data/maps/Route106/map.json +++ b/data/maps/Route106/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route106_EventScript_1EE493", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route106_EventScript_1EE4AA", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route106_EventScript_1EE4C1", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route106_EventScript_1EE523", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route106_EventScript_290D40", "flag": "FLAG_ITEM_ROUTE_106_PROTEIN" } diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json index dcb17ed8c7..3813f4795d 100644 --- a/data/maps/Route107/map.json +++ b/data/maps/Route107/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route107_EventScript_1EE595", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 6, "movement_range_y": 2, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route107_EventScript_1EE5AC", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route107_EventScript_1EE60E", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route107_EventScript_1EE625", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route107_EventScript_1EE63C", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route107_EventScript_1EE657", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route107_EventScript_1EE672", "flag": "0" } diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json index daa9dab75a..bb22c01e30 100644 --- a/data/maps/Route108/map.json +++ b/data/maps/Route108/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route108_EventScript_1EE68A", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route108_EventScript_1EE6B8", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route108_EventScript_1EE6A1", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", "movement_range_x": 6, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route108_EventScript_1EE6CF", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route108_EventScript_1EE6E6", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route108_EventScript_1EE6FD", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route108_EventScript_290D4D", "flag": "FLAG_ITEM_ROUTE_108_STAR_PIECE" } diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json index b3bd9f507e..9bb4d21de9 100644 --- a/data/maps/Route109/map.json +++ b/data/maps/Route109/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_1EE910", "flag": "FLAG_HIDE_ROUTE_108_MR_BRINEY" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route109_EventScript_1EEA3D", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route109_EventScript_1EEA54", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route109_EventScript_1EEA6B", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route109_EventScript_1EEA82", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route109_EventScript_1EEA99", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route109_EventScript_1EEAFB", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_1EE995", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_290D5A", "flag": "FLAG_ITEM_ROUTE_109_PP_UP" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route109_EventScript_1EEB74", "flag": "0" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route109_EventScript_1EEB5D", "flag": "0" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route109_EventScript_1EEB8B", "flag": "0" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_1EE99E", "flag": "0" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_1EE9B5", "flag": "0" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_1EEA06", "flag": "0" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route109_EventScript_1EEBBD", "flag": "0" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route109_EventScript_1EEBA2", "flag": "0" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_1EEA0F", "flag": "0" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_1EEA18", "flag": "0" }, @@ -293,8 +293,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route109_EventScript_1EEBEF", "flag": "0" }, @@ -306,8 +306,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route109_EventScript_1EEBD8", "flag": "0" }, @@ -319,8 +319,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_290D67", "flag": "FLAG_ITEM_ROUTE_109_POTION" }, @@ -332,8 +332,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route109_EventScript_1EEC06", "flag": "0" } diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json index e30fcc078e..3f293b2916 100644 --- a/data/maps/Route109_SeashoreHouse/map.json +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_SeashoreHouse_EventScript_2693FE", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route109_SeashoreHouse_EventScript_2694E2", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route109_SeashoreHouse_EventScript_269518", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route109_SeashoreHouse_EventScript_2694FD", "flag": "0" } diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index bcf04e1efb..404155652e 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF338", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF32F", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF326", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF314", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF31D", "flag": "0" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF30B", "flag": "0" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF302", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT", "movement_range_x": 2, "movement_range_y": 14, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route110_EventScript_1EF529", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 10, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route110_EventScript_1EF4B0", "flag": "0" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route110_EventScript_1EF540", "flag": "0" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", "movement_range_x": 4, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route110_EventScript_1EF4C7", "flag": "0" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route110_EventScript_1EF3F2", "flag": "0" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_EventScript_1EF409", "flag": "0" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route110_EventScript_1EF420", "flag": "0" }, @@ -220,8 +220,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_EventScript_1EF482", "flag": "0" }, @@ -233,8 +233,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 16, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "16", "script": "BerryTreeScript", "flag": "0" }, @@ -246,8 +246,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 17, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "17", "script": "BerryTreeScript", "flag": "0" }, @@ -259,8 +259,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 18, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "18", "script": "BerryTreeScript", "flag": "0" }, @@ -272,8 +272,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_290D81", "flag": "FLAG_ITEM_ROUTE_110_DIRE_HIT" }, @@ -285,8 +285,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_290D74", "flag": "FLAG_ITEM_ROUTE_109_RARE_CANDY" }, @@ -298,8 +298,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF3B7", "flag": "0" }, @@ -311,8 +311,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF2AA", "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, @@ -324,8 +324,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF2C0", "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, @@ -337,8 +337,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF2D6", "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, @@ -350,8 +350,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF2EC", "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, @@ -363,8 +363,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, @@ -376,8 +376,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 7, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route110_EventScript_1EF499", "flag": "0" }, @@ -389,8 +389,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_110_RIVAL_1" }, @@ -402,8 +402,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_110_RIVAL_2" }, @@ -415,8 +415,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route110_EventScript_1EF604", "flag": "0" }, @@ -428,8 +428,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route110_EventScript_1EF5A2", "flag": "0" }, @@ -441,8 +441,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route110_EventScript_1EF61C", "flag": "0" }, @@ -454,8 +454,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route110_EventScript_1EF64A", "flag": "0" }, @@ -467,8 +467,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route110_EventScript_1EF633", "flag": "0" }, @@ -480,8 +480,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_290D8E", "flag": "FLAG_ITEM_ROUTE_110_ELIXIR" }, @@ -493,8 +493,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_110_BIRCH" } diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json index 5536716af1..b692426fd8 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78", "flag": "0" } diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json index 347f22ba12..dcc9029e53 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4", "flag": "0" } diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json index 13c6b53a5f..62548fe8b0 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHouseEnd_EventScript_26AD17", "flag": "FLAG_HIDE_TRICK_HOUSE_END_MAN" } diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index cd2e63edc9..59280848e1 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHouseEntrance_EventScript_269D3B", "flag": "FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN" } diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json index 283e867939..849e74b620 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.json +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route110_TrickHousePuzzle1_EventScript_26B948", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle1_EventScript_26B95F", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle1_EventScript_26B976", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_13" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_12" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_14" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_17" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_16" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_15" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_19" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_18" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_1B" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_29140E", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_1C" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_1E" } diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json index 12b436f734..9903231e7d 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.json +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle2_EventScript_26BC75", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route110_TrickHousePuzzle2_EventScript_26BC8C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle2_EventScript_26BCA3", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle2_EventScript_291428", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle2_EventScript_29141B", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL" } diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index 5d6227cd22..22807b80bc 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle3_EventScript_26C5C4", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle3_EventScript_26C5DB", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle3_EventScript_26C5F2", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle3_EventScript_291442", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle3_EventScript_291435", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle3_EventScript_2907A6", "flag": "FLAG_TEMP_15" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle3_EventScript_2907A6", "flag": "FLAG_TEMP_16" } diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json index 03a953310d..542a67aecd 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.json +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle4_EventScript_26C87E", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle4_EventScript_26C8AC", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle4_EventScript_26C895", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_29144F", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_11" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_12" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_13" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_14" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_15" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_16" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_17" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_18" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_19" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_1A" } diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index 5b83f31e0f..ae94ed2400 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CB32", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CB53", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CB74", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CB95", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CBB6", "flag": "0" } diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json index b468e59be0..144916353d 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.json +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle6_EventScript_26DDE1", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route110_TrickHousePuzzle6_EventScript_26DDF8", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle6_EventScript_26DE0F", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle6_EventScript_29145C", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL" } diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json index a4a12eb7f3..0263e0848a 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.json +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle7_EventScript_26E389", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle7_EventScript_26E3B7", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle7_EventScript_26E3A0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle7_EventScript_291469", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle7_EventScript_26E3E5", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle7_EventScript_26E3CE", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle7_EventScript_26E3FC", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json index 0232237404..f73e603374 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.json +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle8_EventScript_26E81F", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle8_EventScript_26E84D", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle8_EventScript_26E836", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle8_EventScript_291476", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL" } diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index 0061ffefbd..ef981272af 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1F0FC5", "flag": "FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route111_EventScript_1F121B", "flag": "0" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 19, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "19", "script": "BerryTreeScript", "flag": "0" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 20, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "20", "script": "BerryTreeScript", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1F1189", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route111_EventScript_1F1204", "flag": "0" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route111_EventScript_1F1260", "flag": "0" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route111_EventScript_1F1232", "flag": "0" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route111_EventScript_1F1249", "flag": "0" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_28CDF6", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_28CDD6", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" }, @@ -220,8 +220,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_2907A6", "flag": "FLAG_TEMP_11" }, @@ -233,8 +233,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_2907A6", "flag": "FLAG_TEMP_12" }, @@ -246,8 +246,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1F0EB9", "flag": "0" }, @@ -259,8 +259,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_290D9B", "flag": "FLAG_ITEM_ROUTE_111_TM_37" }, @@ -272,8 +272,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 80, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "80", "script": "BerryTreeScript", "flag": "0" }, @@ -285,8 +285,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 81, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "81", "script": "BerryTreeScript", "flag": "0" }, @@ -298,8 +298,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_28CE96", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" }, @@ -311,8 +311,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_28CEB6", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" }, @@ -324,8 +324,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_28CF16", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" }, @@ -337,8 +337,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_28CF36", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" }, @@ -350,8 +350,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_290DA8", "flag": "FLAG_ITEM_ROUTE_111_STARDUST" }, @@ -363,8 +363,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_290DB5", "flag": "FLAG_ITEM_ROUTE_111_HP_UP" }, @@ -376,8 +376,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_2906BB", "flag": "FLAG_TEMP_13" }, @@ -389,8 +389,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route111_EventScript_1F12D9", "flag": "0" }, @@ -402,8 +402,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route111_EventScript_1F12C2", "flag": "0" }, @@ -415,8 +415,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route111_EventScript_1F12F0", "flag": "0" }, @@ -428,8 +428,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 4, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route111_EventScript_1F1369", "flag": "0" }, @@ -441,8 +441,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route111_EventScript_1F1307", "flag": "0" }, @@ -454,8 +454,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_2765FF", "flag": "FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN" }, @@ -467,8 +467,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1F1192", "flag": "0" }, @@ -480,8 +480,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route111_EventScript_1F13F9", "flag": "0" }, @@ -493,8 +493,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route111_EventScript_1F1410", "flag": "0" }, @@ -506,8 +506,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route111_EventScript_1F13E2", "flag": "0" }, @@ -519,8 +519,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route111_EventScript_1F13CB", "flag": "0" }, @@ -532,8 +532,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route111_EventScript_1F143E", "flag": "0" }, @@ -545,8 +545,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route111_EventScript_1F1427", "flag": "0" }, @@ -558,8 +558,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route111_EventScript_1F1455", "flag": "0" }, @@ -571,8 +571,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_290DC2", "flag": "FLAG_ITEM_ROUTE_111_ELIXIR" }, @@ -584,8 +584,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1F119B", "flag": "0" }, @@ -597,8 +597,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_111_DESERT_FOSSIL" }, @@ -610,8 +610,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_111_PLAYER_DESCENT" }, @@ -623,8 +623,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1F11E4", "flag": "FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY" } diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json index d4e77fddac..c915bfb95d 100644 --- a/data/maps/Route111_OldLadysRestStop/map.json +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_OldLadysRestStop_EventScript_22A920", "flag": "0" } diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json index d41cc1214a..fed3dab3f3 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_WinstrateFamilysHouse_EventScript_22A4E8", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_WinstrateFamilysHouse_EventScript_22A48D", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_WinstrateFamilysHouse_EventScript_22A4A2", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_WinstrateFamilysHouse_EventScript_22A4FD", "flag": "0" } diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index 937719abff..8839cc1147 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route112_EventScript_1F1DB7", "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route112_EventScript_1F1E6A", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route112_EventScript_1F1EE3", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route112_EventScript_1F1EFA", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route112_EventScript_1F1E81", "flag": "0" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route112_EventScript_1F1DB7", "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 24, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "24", "script": "BerryTreeScript", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 23, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "23", "script": "BerryTreeScript", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 22, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "22", "script": "BerryTreeScript", "flag": "0" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 21, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "21", "script": "BerryTreeScript", "flag": "0" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route112_EventScript_1F1E61", "flag": "0" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route112_EventScript_290DCF", "flag": "FLAG_ITEM_ROUTE_112_NUGGET" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route112_EventScript_1F1F11", "flag": "0" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route112_EventScript_1F1F28", "flag": "0" } diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json index 8552ec139a..52958a4eed 100644 --- a/data/maps/Route112_CableCarStation/map.json +++ b/data/maps/Route112_CableCarStation/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route112_CableCarStation_EventScript_22AB17", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index 7dc18e5724..1ae33fda76 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_1F2193", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_1F218A", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route113_EventScript_1F21C0", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route113_EventScript_1F21D7", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route113_EventScript_1F21EE", "flag": "0" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_290DDC", "flag": "FLAG_ITEM_ROUTE_113_MAX_ETHER" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_290DE9", "flag": "FLAG_ITEM_ROUTE_113_SUPER_REPEL" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_HIDDEN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "Route113_EventScript_1F2250", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_HIDDEN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "Route113_EventScript_1F22B2", "flag": "0" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route113_EventScript_1F22C9", "flag": "0" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route113_EventScript_1F22E4", "flag": "0" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_290DF6", "flag": "FLAG_ITEM_ROUTE_113_HYPER_POTION" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route113_EventScript_1F2344", "flag": "0" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route113_EventScript_1F232D", "flag": "0" }, @@ -220,8 +220,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route113_EventScript_1F22FF", "flag": "0" }, @@ -233,8 +233,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route113_EventScript_1F2316", "flag": "0" } diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json index 185461fdb5..70e342048a 100644 --- a/data/maps/Route113_GlassWorkshop/map.json +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route113_GlassWorkshop_EventScript_26ED1E", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route113_GlassWorkshop_EventScript_26F194", "flag": "0" } diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json index 75f975eb69..9d10029102 100644 --- a/data/maps/Route114/map.json +++ b/data/maps/Route114/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 77, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "77", "script": "BerryTreeScript", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 78, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "78", "script": "BerryTreeScript", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route114_EventScript_1F2640", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route114_EventScript_1F2657", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route114_EventScript_1F266E", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route114_EventScript_1F2685", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route114_EventScript_1F269C", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 68, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "68", "script": "BerryTreeScript", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_290E03", "flag": "FLAG_ITEM_ROUTE_114_RARE_CANDY" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_290E10", "flag": "FLAG_ITEM_ROUTE_114_PROTEIN" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_2907A6", "flag": "FLAG_TEMP_11" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_1F25D1", "flag": "0" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_1F2612", "flag": "0" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_1F2582", "flag": "0" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_1F2777", "flag": "0" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_1F2760", "flag": "0" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route114_EventScript_1F26FE", "flag": "0" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_2907A6", "flag": "FLAG_TEMP_12" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_2907A6", "flag": "FLAG_TEMP_13" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_2907A6", "flag": "FLAG_TEMP_14" }, @@ -293,8 +293,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_2907A6", "flag": "FLAG_TEMP_15" }, @@ -306,8 +306,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route114_EventScript_1F27A9", "flag": "0" }, @@ -319,8 +319,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route114_EventScript_1F278E", "flag": "0" }, @@ -332,8 +332,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route114_EventScript_1F27DB", "flag": "0" }, @@ -345,8 +345,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route114_EventScript_1F27C4", "flag": "0" }, @@ -358,8 +358,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_290E1D", "flag": "FLAG_ITEM_ROUTE_114_ENERGY_POWDER" }, @@ -371,8 +371,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route114_EventScript_1F27F2", "flag": "0" } diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json index c3c29bdd99..0c5c5ea775 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.json +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_FossilManiacsHouse_EventScript_22AD3A", "flag": "0" } diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index 84370ce04e..0582198dbf 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_FossilManiacsTunnel_EventScript_22AF87", "flag": "0" } diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json index 5dbe09a09e..b4b1b412b5 100644 --- a/data/maps/Route114_LanettesHouse/map.json +++ b/data/maps/Route114_LanettesHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_LanettesHouse_EventScript_22B2D2", "flag": "FLAG_HIDE_LANETTES_HOUSE_LANETTE" } diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json index 58e5a602be..1c7603b586 100644 --- a/data/maps/Route115/map.json +++ b/data/maps/Route115/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_1F2973", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route115_EventScript_1F298E", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route115_EventScript_1F2A07", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 69, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "69", "script": "BerryTreeScript", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 70, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "70", "script": "BerryTreeScript", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 71, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "71", "script": "BerryTreeScript", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route115_EventScript_1F2A69", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 5, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route115_EventScript_1F29F0", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route115_EventScript_1F2ACB", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_290E2A", "flag": "FLAG_ITEM_ROUTE_115_SUPER_POTION" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_290E37", "flag": "FLAG_ITEM_ROUTE_115_TM_01" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_290E44", "flag": "FLAG_ITEM_ROUTE_115_IRON" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 55, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "55", "script": "BerryTreeScript", "flag": "0" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 56, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "56", "script": "BerryTreeScript", "flag": "0" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_2907A6", "flag": "FLAG_TEMP_11" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_290E51", "flag": "FLAG_ITEM_ROUTE_115_GREAT_BALL" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route115_EventScript_1F2AE2", "flag": "0" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route115_EventScript_1F2AF9", "flag": "0" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route115_EventScript_1F2B27", "flag": "0" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route115_EventScript_1F2B10", "flag": "0" }, @@ -293,8 +293,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route115_EventScript_1F2B3E", "flag": "0" }, @@ -306,8 +306,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_290E6B", "flag": "FLAG_ITEM_ROUTE_115_PP_UP" }, @@ -319,8 +319,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_290E5E", "flag": "FLAG_ITEM_ROUTE_115_HEAL_POWDER" } diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 35ced75879..79aa60e75a 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 25, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "25", "script": "BerryTreeScript", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 26, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "26", "script": "BerryTreeScript", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route116_EventScript_1F2E89", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_2906BB", "flag": "FLAG_TEMP_11" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_2906BB", "flag": "FLAG_TEMP_12" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route116_EventScript_1F2EA0", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_290E85", "flag": "FLAG_ITEM_ROUTE_116_ETHER" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_290E92", "flag": "FLAG_ITEM_ROUTE_116_REPEL" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 66, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "66", "script": "BerryTreeScript", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 67, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "67", "script": "BerryTreeScript", "flag": "0" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_1F2D84", "flag": "FLAG_HIDE_ROUTE_116_MR_BRINEY" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_2906BB", "flag": "FLAG_TEMP_13" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route116_EventScript_1F2F65", "flag": "0" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_2906BB", "flag": "FLAG_TEMP_14" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_290E9F", "flag": "FLAG_ITEM_ROUTE_116_HP_UP" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route116_EventScript_1F2F7C", "flag": "0" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route116_EventScript_1F2F93", "flag": "0" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route116_EventScript_1F2EB7", "flag": "0" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_1F2CA2", "flag": "FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_290E78", "flag": "FLAG_ITEM_ROUTE_116_X_SPECIAL" }, @@ -293,8 +293,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_1F2C70", "flag": "FLAG_HIDE_ROUTE_116_TUNNELER" }, @@ -306,8 +306,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_1F2DB6", "flag": "FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN" }, @@ -319,8 +319,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route116_EventScript_1F3041", "flag": "0" }, @@ -332,8 +332,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route116_EventScript_1F3058", "flag": "0" }, @@ -345,8 +345,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_290EAC", "flag": "FLAG_ITEM_ROUTE_116_POTION" }, @@ -358,8 +358,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_2906BB", "flag": "FLAG_TEMP_15" }, @@ -371,8 +371,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route116_EventScript_1F3086", "flag": "0" }, @@ -384,8 +384,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route116_EventScript_1F306F", "flag": "0" } diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json index 0301a32eec..f9dfb484c8 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.json +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_TunnelersRestHouse_EventScript_22B85A", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_TunnelersRestHouse_EventScript_22B86C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_TunnelersRestHouse_EventScript_22B863", "flag": "0" } diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index ab9aa7b24a..c4cb4d5e56 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_1F399A", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_1F39A3", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_291C18", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 8, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route117_EventScript_1F3A94", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route117_EventScript_1F3A32", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route117_EventScript_1F39D0", "flag": "0" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 29, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "29", "script": "BerryTreeScript", "flag": "0" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 28, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "28", "script": "BerryTreeScript", "flag": "0" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 27, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "27", "script": "BerryTreeScript", "flag": "0" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_290EB9", "flag": "FLAG_ITEM_ROUTE_117_GREAT_BALL" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_2906BB", "flag": "FLAG_TEMP_11" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_290EC6", "flag": "FLAG_ITEM_ROUTE_117_REVIVE" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route117_EventScript_1F3AF6", "flag": "0" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route117_EventScript_1F3B58", "flag": "0" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route117_EventScript_1F3BD3", "flag": "0" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route117_EventScript_1F3B6F", "flag": "0" }, @@ -293,8 +293,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_1F39AC", "flag": "0" }, @@ -306,8 +306,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route117_EventScript_1F3C4E", "flag": "0" }, @@ -319,8 +319,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route117_EventScript_1F3C65", "flag": "0" }, @@ -332,8 +332,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 4, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route117_EventScript_1F3C37", "flag": "0" } diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json index a62485c74d..c233701e55 100644 --- a/data/maps/Route117_PokemonDayCare/map.json +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route117_PokemonDayCare_EventScript_291D11", "flag": "0" } diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index 8514596c87..66b7a17899 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 31, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "31", "script": "BerryTreeScript", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 32, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "32", "script": "BerryTreeScript", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 33, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "33", "script": "BerryTreeScript", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route118_EventScript_1F4079", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_28CE16", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_28CE36", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_1F3E73", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_28CED6", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_28CEF6", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_28CF16", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_28CF36", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_2906BB", "flag": "FLAG_TEMP_11" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_1F3E14", "flag": "0" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route118_EventScript_1F3F87", "flag": "0" }, @@ -220,8 +220,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_1F4000", "flag": "0" }, @@ -233,8 +233,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route118_EventScript_1F4090", "flag": "0" }, @@ -246,8 +246,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route118_EventScript_1F3FE9", "flag": "0" }, @@ -259,8 +259,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route118_EventScript_1F4017", "flag": "0" }, @@ -272,8 +272,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_118_STEVEN" }, @@ -285,8 +285,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_290ED3", "flag": "FLAG_ITEM_ROUTE_118_HYPER_POTION" }, @@ -298,8 +298,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route118_EventScript_1F40A7", "flag": "0" } diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index b7e59c363f..bdb3e923d3 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 34, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "34", "script": "BerryTreeScript", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 35, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "35", "script": "BerryTreeScript", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 36, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "36", "script": "BerryTreeScript", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_1F47E2", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_1F47B4", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_1F479D", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route119_EventScript_1F4810", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_1F4786", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route119_EventScript_1F4872", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_1F47CB", "flag": "0" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_1F47F9", "flag": "0" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_1F4902", "flag": "0" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_MOUNTAIN_DISGUISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route119_EventScript_1F4919", "flag": "0" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route119_EventScript_1F48D4", "flag": "0" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route119_EventScript_1F48EB", "flag": "0" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_119_RIVAL" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_290EE0", "flag": "FLAG_ITEM_ROUTE_119_SUPER_REPEL" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_290EED", "flag": "FLAG_ITEM_ROUTE_119_ZINC" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_290EFA", "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_1" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_290F07", "flag": "FLAG_ITEM_ROUTE_119_LEAF_STONE" }, @@ -293,8 +293,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_290F14", "flag": "FLAG_ITEM_ROUTE_119_RARE_CANDY" }, @@ -306,8 +306,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_290F21", "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_1" }, @@ -319,8 +319,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1F49A3", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, @@ -332,8 +332,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1F49BA", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, @@ -345,8 +345,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE" }, @@ -358,8 +358,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1F49D1", "flag": "0" }, @@ -371,8 +371,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 83, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "83", "script": "BerryTreeScript", "flag": "0" }, @@ -384,8 +384,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 84, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "84", "script": "BerryTreeScript", "flag": "0" }, @@ -397,8 +397,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 85, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "85", "script": "BerryTreeScript", "flag": "0" }, @@ -410,8 +410,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 86, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "86", "script": "BerryTreeScript", "flag": "0" }, @@ -423,8 +423,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1F476B", "flag": "0" }, @@ -436,8 +436,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_290F2E", "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_2" }, @@ -449,8 +449,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1F49DA", "flag": "0" }, @@ -462,8 +462,8 @@ "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route119_EventScript_1F4930", "flag": "0" }, @@ -475,8 +475,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_27231C", "flag": "FLAG_HIDE_ROUTE_119_KECLEON_1" }, @@ -488,8 +488,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_272329", "flag": "FLAG_HIDE_ROUTE_119_KECLEON_2" }, @@ -501,8 +501,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1F4947", "flag": "0" }, @@ -514,8 +514,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route119_EventScript_1F498C", "flag": "0" }, @@ -527,8 +527,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route119_EventScript_1F4975", "flag": "0" }, @@ -540,8 +540,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route119_EventScript_1F495E", "flag": "0" }, @@ -553,8 +553,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_291399", "flag": "FLAG_ITEM_ROUTE_119_NUGGET" }, @@ -566,8 +566,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_290F3B", "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_2" }, @@ -579,8 +579,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_119_SCOTT" } diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json index fdfd19f78d..31d84664f9 100644 --- a/data/maps/Route119_House/map.json +++ b/data/maps/Route119_House/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_270966", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_27096F", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_27096F", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_27096F", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 3, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_27096F", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_27096F", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_27096F", "flag": "0" } diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json index 9101e24951..8200c20df2 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route119_WeatherInstitute_1F_EventScript_26FB29", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route119_WeatherInstitute_1F_EventScript_26FB40", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_WeatherInstitute_1F_EventScript_26FB0F", "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_WeatherInstitute_1F_EventScript_26FAC8", "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_WeatherInstitute_1F_EventScript_26FAA4", "flag": "0" } diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index a8a1ebf62f..4b4534a8e7 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route119_WeatherInstitute_2F_EventScript_26FF7F", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route119_WeatherInstitute_2F_EventScript_26FF96", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_WeatherInstitute_2F_EventScript_26FFAD", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_WeatherInstitute_2F_EventScript_27018B", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route119_WeatherInstitute_2F_EventScript_26FF68", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" } diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index db93042de7..63585f86f8 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 46, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "46", "script": "BerryTreeScript", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 45, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "45", "script": "BerryTreeScript", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 44, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "44", "script": "BerryTreeScript", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 43, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "43", "script": "BerryTreeScript", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 37, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "37", "script": "BerryTreeScript", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 38, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "38", "script": "BerryTreeScript", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 39, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "39", "script": "BerryTreeScript", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 40, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "40", "script": "BerryTreeScript", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 41, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "41", "script": "BerryTreeScript", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 42, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "42", "script": "BerryTreeScript", "flag": "0" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_1F57D7", "flag": "0" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_1F57EE", "flag": "0" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route120_EventScript_1F5850", "flag": "0" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route120_EventScript_1F5867", "flag": "0" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_1F587E", "flag": "0" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_290F48", "flag": "FLAG_ITEM_ROUTE_120_NUGGET" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_28CE76", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_28CE56", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_28CF16", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_28CF36", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" }, @@ -293,8 +293,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_2906BB", "flag": "FLAG_TEMP_11" }, @@ -306,8 +306,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_290F55", "flag": "FLAG_ITEM_ROUTE_120_FULL_HEAL" }, @@ -319,8 +319,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_1F5527", "flag": "0" }, @@ -332,8 +332,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route120_EventScript_1F58E0", "flag": "0" }, @@ -345,8 +345,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route120_EventScript_1F58F7", "flag": "0" }, @@ -358,8 +358,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route120_EventScript_1F590E", "flag": "0" }, @@ -371,8 +371,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_1F5925", "flag": "0" }, @@ -384,8 +384,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_290F6F", "flag": "FLAG_ITEM_ROUTE_120_NEST_BALL" }, @@ -397,8 +397,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_290F62", "flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION" }, @@ -410,8 +410,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_1F57BC", "flag": "FLAG_HIDE_ROUTE_120_KECLEON_1" }, @@ -423,8 +423,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_1F5641", "flag": "FLAG_HIDE_ROUTE_120_STEVEN" }, @@ -436,8 +436,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_2906BB", "flag": "FLAG_TEMP_14" }, @@ -449,8 +449,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_2906BB", "flag": "FLAG_TEMP_12" }, @@ -462,8 +462,8 @@ "movement_type": "MOVEMENT_TYPE_MOUNTAIN_DISGUISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_1F593C", "flag": "0" }, @@ -475,8 +475,8 @@ "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_1F5953", "flag": "0" }, @@ -488,8 +488,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE" }, @@ -501,8 +501,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_2722DB", "flag": "FLAG_HIDE_ROUTE_120_KECLEON_2" }, @@ -514,8 +514,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_2722E8", "flag": "FLAG_HIDE_ROUTE_120_KECLEON_3" }, @@ -527,8 +527,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_2722F5", "flag": "FLAG_HIDE_ROUTE_120_KECLEON_4" }, @@ -540,8 +540,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_27230F", "flag": "FLAG_HIDE_ROUTE_120_KECLEON_6" }, @@ -553,8 +553,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_272302", "flag": "FLAG_HIDE_ROUTE_120_KECLEON_5" }, @@ -566,8 +566,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_1F5981", "flag": "0" }, @@ -579,8 +579,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_1F596A", "flag": "0" }, @@ -592,8 +592,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_290F7C", "flag": "FLAG_ITEM_ROUTE_120_REVIVE" } diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index 62719c2c52..ad20a81197 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route121_EventScript_1F5DFD", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 47, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "47", "script": "BerryTreeScript", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 48, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "48", "script": "BerryTreeScript", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 49, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "49", "script": "BerryTreeScript", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 50, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "50", "script": "BerryTreeScript", "flag": "0" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 51, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "51", "script": "BerryTreeScript", "flag": "0" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 52, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "52", "script": "BerryTreeScript", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 53, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "53", "script": "BerryTreeScript", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 54, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "54", "script": "BerryTreeScript", "flag": "0" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route121_EventScript_1F5F04", "flag": "0" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route121_EventScript_1F5F1F", "flag": "0" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" }, @@ -220,8 +220,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route121_EventScript_2906BB", "flag": "FLAG_TEMP_11" }, @@ -233,8 +233,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route121_EventScript_2906BB", "flag": "FLAG_TEMP_12" }, @@ -246,8 +246,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route121_EventScript_1F5E74", "flag": "0" }, @@ -259,8 +259,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route121_EventScript_1F5E8B", "flag": "0" }, @@ -272,8 +272,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route121_EventScript_1F5EED", "flag": "0" }, @@ -285,8 +285,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route121_EventScript_1F5F3A", "flag": "0" }, @@ -298,8 +298,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route121_EventScript_290F89", "flag": "FLAG_ITEM_ROUTE_121_CARBOS" }, @@ -311,8 +311,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route121_EventScript_2906BB", "flag": "FLAG_TEMP_13" }, @@ -324,8 +324,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route121_EventScript_1F5F9C", "flag": "0" }, @@ -337,8 +337,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route121_EventScript_1F5FB3", "flag": "0" }, @@ -350,8 +350,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route121_EventScript_1F5FCA", "flag": "0" }, @@ -363,8 +363,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route121_EventScript_1F5FE1", "flag": "0" }, @@ -376,8 +376,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route121_EventScript_1F5FF8", "flag": "0" }, @@ -389,8 +389,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route121_EventScript_290F96", "flag": "FLAG_ITEM_ROUTE_121_REVIVE" }, @@ -402,8 +402,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route121_EventScript_290FA3", "flag": "FLAG_ITEM_ROUTE_121_ZINC" } diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index bda91381af..90eedd7735 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route121_SafariZoneEntrance_EventScript_22BBE6", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route121_SafariZoneEntrance_EventScript_22BBEF", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json index d5a99b75c5..6562fa7a91 100644 --- a/data/maps/Route123/map.json +++ b/data/maps/Route123/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 58, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "58", "script": "BerryTreeScript", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 59, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "59", "script": "BerryTreeScript", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 60, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "60", "script": "BerryTreeScript", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 61, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "61", "script": "BerryTreeScript", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 62, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "62", "script": "BerryTreeScript", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 63, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "63", "script": "BerryTreeScript", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 64, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "64", "script": "BerryTreeScript", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route123_EventScript_1F61C5", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route123_EventScript_1F61DC", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 65, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "65", "script": "BerryTreeScript", "flag": "0" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 72, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "72", "script": "BerryTreeScript", "flag": "0" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 73, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "73", "script": "BerryTreeScript", "flag": "0" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 74, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "74", "script": "BerryTreeScript", "flag": "0" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 79, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "79", "script": "BerryTreeScript", "flag": "0" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 14, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "14", "script": "BerryTreeScript", "flag": "0" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 15, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "15", "script": "BerryTreeScript", "flag": "0" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 30, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "30", "script": "BerryTreeScript", "flag": "0" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_2906BB", "flag": "FLAG_TEMP_11" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_2906BB", "flag": "FLAG_TEMP_12" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_2906BB", "flag": "FLAG_TEMP_13" }, @@ -293,8 +293,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_290FB0", "flag": "FLAG_ITEM_ROUTE_123_CALCIUM" }, @@ -306,8 +306,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_1F6151", "flag": "0" }, @@ -319,8 +319,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 87, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "87", "script": "BerryTreeScript", "flag": "0" }, @@ -332,8 +332,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 88, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "88", "script": "BerryTreeScript", "flag": "0" }, @@ -345,8 +345,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 89, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "89", "script": "BerryTreeScript", "flag": "0" }, @@ -358,8 +358,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route123_EventScript_1F61F3", "flag": "0" }, @@ -371,8 +371,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route123_EventScript_1F62E9", "flag": "0" }, @@ -384,8 +384,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route123_EventScript_1F62CE", "flag": "0" }, @@ -397,8 +397,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route123_EventScript_1F620A", "flag": "0" }, @@ -410,8 +410,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route123_EventScript_1F626C", "flag": "0" }, @@ -423,8 +423,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route123_EventScript_1F6304", "flag": "0" }, @@ -436,8 +436,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_290FBD", "flag": "FLAG_ITEM_ROUTE_123_ULTRA_BALL" }, @@ -449,8 +449,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_290FCA", "flag": "FLAG_ITEM_ROUTE_123_ELIXIR" }, @@ -462,8 +462,8 @@ "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route123_EventScript_1F6377", "flag": "0" }, @@ -475,8 +475,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route123_EventScript_1F6360", "flag": "0" }, @@ -488,8 +488,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route123_EventScript_1F6349", "flag": "0" }, @@ -501,8 +501,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route123_EventScript_1F63BC", "flag": "0" }, @@ -514,8 +514,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route123_EventScript_1F6332", "flag": "0" }, @@ -527,8 +527,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route123_EventScript_1F631B", "flag": "0" }, @@ -540,8 +540,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_290FD7", "flag": "FLAG_ITEM_ROUTE_123_PP_UP" }, @@ -553,8 +553,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route123_EventScript_1F638E", "flag": "0" }, @@ -566,8 +566,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route123_EventScript_1F63A5", "flag": "0" }, @@ -579,8 +579,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_290FE4", "flag": "FLAG_ITEM_ROUTE_123_REVIVAL_HERB" } diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index 47ad26314b..c87feb2bc2 100644 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_BerryMastersHouse_EventScript_26F845", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_BerryMastersHouse_EventScript_26F8C0", "flag": "0" } diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index 1f3ef4f6c2..7169a02998 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 5, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route124_EventScript_1F6585", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 5, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route124_EventScript_1F659C", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route124_EventScript_1F65B3", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 6, "movement_range_y": 8, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route124_EventScript_1F6615", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 7, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route124_EventScript_1F662C", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route124_EventScript_290FF1", "flag": "FLAG_ITEM_ROUTE_124_RED_SHARD" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route124_EventScript_290FFE", "flag": "FLAG_ITEM_ROUTE_124_BLUE_SHARD" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route124_EventScript_29100B", "flag": "FLAG_ITEM_ROUTE_124_YELLOW_SHARD" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route124_EventScript_1F6643", "flag": "0" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route124_EventScript_1F66A7", "flag": "0" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route124_EventScript_1F670B", "flag": "0" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route124_EventScript_1F6722", "flag": "0" } diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json index ed159e565b..2b61cd6fa6 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route124_DivingTreasureHuntersHouse_EventScript_270A32", "flag": "0" } diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index 55f9b692dc..8071cf2449 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route125_EventScript_1F67A4", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 2, "movement_range_y": 5, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route125_EventScript_1F67BB", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 6, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route125_EventScript_1F67D2", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 9, "movement_range_y": 9, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route125_EventScript_1F67E9", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route125_EventScript_1F6800", "flag": "0" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route125_EventScript_1F6862", "flag": "0" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route125_EventScript_1F687D", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route125_EventScript_1F6898", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route125_EventScript_1F68AF", "flag": "0" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route125_EventScript_291018", "flag": "FLAG_ITEM_ROUTE_125_BIG_PEARL" } diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index 8ccd3c3658..1e886a083c 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 10, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route126_EventScript_1F68D6", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 9, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route126_EventScript_1F68ED", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route126_EventScript_1F6904", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route126_EventScript_1F691B", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route126_EventScript_291025", "flag": "FLAG_ITEM_ROUTE_126_GREEN_SHARD" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route126_EventScript_1F6960", "flag": "0" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route126_EventScript_1F6977", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route126_EventScript_1F6949", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route126_EventScript_1F6932", "flag": "0" } diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index 06fd540d20..1b30f7d55f 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -43,8 +43,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route127_EventScript_1F6A35", "flag": "0" }, @@ -56,8 +56,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route127_EventScript_1F6A4C", "flag": "0" }, @@ -69,8 +69,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route127_EventScript_291032", "flag": "FLAG_ITEM_ROUTE_127_ZINC" }, @@ -82,8 +82,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route127_EventScript_29103F", "flag": "FLAG_ITEM_ROUTE_127_CARBOS" }, @@ -95,8 +95,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route127_EventScript_1F6A63", "flag": "0" }, @@ -108,8 +108,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route127_EventScript_1F6A91", "flag": "0" }, @@ -121,8 +121,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route127_EventScript_1F6A7A", "flag": "0" }, @@ -134,8 +134,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route127_EventScript_1F6AA8", "flag": "0" }, @@ -147,8 +147,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route127_EventScript_1F6AD6", "flag": "0" }, @@ -160,8 +160,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route127_EventScript_1F6ABF", "flag": "0" }, @@ -173,8 +173,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route127_EventScript_29104C", "flag": "FLAG_ITEM_ROUTE_127_RARE_CANDY" } diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index b1d63ef636..826290ff3b 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -43,8 +43,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN", "movement_range_x": 5, "movement_range_y": 5, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route128_EventScript_1F6CBE", "flag": "0" }, @@ -56,8 +56,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 5, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route128_EventScript_1F6D20", "flag": "0" }, @@ -69,8 +69,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_128_STEVEN" }, @@ -82,8 +82,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_128_ARCHIE" }, @@ -95,8 +95,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_128_MAXIE" }, @@ -108,8 +108,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route128_EventScript_1F6DB0", "flag": "0" }, @@ -121,8 +121,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route128_EventScript_1F6D99", "flag": "0" }, @@ -134,8 +134,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route128_EventScript_1F6D82", "flag": "0" }, @@ -147,8 +147,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route128_EventScript_1F6DDE", "flag": "0" }, @@ -160,8 +160,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route128_EventScript_1F6DC7", "flag": "0" } diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index 310a3e06a8..b3e45b2278 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 3, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route129_EventScript_1F72EC", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 5, "movement_range_y": 2, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route129_EventScript_1F7303", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route129_EventScript_1F7331", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route129_EventScript_1F731A", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route129_EventScript_1F7348", "flag": "0" } diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json index d9797e5cc1..0a68d442c5 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 3, "movement_range_y": 6, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route130_EventScript_1F73BF", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route130_EventScript_1F73D6", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 82, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "82", "script": "BerryTreeScript", "flag": "FLAG_TEMP_11" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route130_EventScript_1F73ED", "flag": "0" } diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json index f8d56cc35b..3a48042f9e 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN", "movement_range_x": 5, "movement_range_y": 7, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route131_EventScript_1F7429", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 7, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route131_EventScript_1F7440", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", "movement_range_x": 6, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route131_EventScript_1F7457", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP", "movement_range_x": 3, "movement_range_y": 5, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route131_EventScript_1F746E", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route131_EventScript_1F7485", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route131_EventScript_1F74A0", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route131_EventScript_1F74D2", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route131_EventScript_1F74BB", "flag": "0" } diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json index 719863d2b2..ae04ff62dd 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route132_EventScript_1F74EA", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route132_EventScript_1F7501", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route132_EventScript_291059", "flag": "FLAG_ITEM_ROUTE_132_RARE_CANDY" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route132_EventScript_1F752F", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route132_EventScript_1F7518", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route132_EventScript_1F7546", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route132_EventScript_1F755D", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route132_EventScript_1F758B", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route132_EventScript_1F7574", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route132_EventScript_291066", "flag": "FLAG_ITEM_ROUTE_132_PROTEIN" } diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index 36e7380f73..2a8941e12e 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 2, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route133_EventScript_1F75A3", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route133_EventScript_1F75D1", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 2, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route133_EventScript_1F75BA", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route133_EventScript_291073", "flag": "FLAG_ITEM_ROUTE_133_BIG_PEARL" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route133_EventScript_291080", "flag": "FLAG_ITEM_ROUTE_133_STAR_PIECE" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route133_EventScript_1F75FF", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route133_EventScript_1F75E8", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route133_EventScript_1F7616", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route133_EventScript_1F762D", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route133_EventScript_29108D", "flag": "FLAG_ITEM_ROUTE_133_MAX_REVIVE" } diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json index 350db1e051..1e9123efeb 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT", "movement_range_x": 3, "movement_range_y": 5, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route134_EventScript_1F7653", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route134_EventScript_1F766A", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route134_EventScript_1F7698", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route134_EventScript_1F7681", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 6, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route134_EventScript_1F76AF", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route134_EventScript_1F76F4", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route134_EventScript_1F770B", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 6, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route134_EventScript_1F76DD", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route134_EventScript_1F76C6", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route134_EventScript_29109A", "flag": "FLAG_ITEM_ROUTE_134_CARBOS" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route134_EventScript_2910A7", "flag": "FLAG_ITEM_ROUTE_134_STAR_PIECE" } diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index 3ca35fc79f..d43f7c33b5 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E088A", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E085F", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E08DA", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E08D1", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E08B2", "flag": "0" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E0893", "flag": "0" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E0922", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E0938", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E0ADD", "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E087E", "flag": "0" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_2910DB", "flag": "FLAG_ITEM_RUSTBORO_CITY_X_DEFEND" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E094E", "flag": "0" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E0DB8", "flag": "FLAG_HIDE_RUSBORO_CITY_RIVAL" }, @@ -220,8 +220,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_RUSTBORO_CITY_SCIENTIST" }, @@ -233,8 +233,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E1236", "flag": "0" } diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index f2490588a6..134b9f726e 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_CuttersHouse_EventScript_215BD4", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_CuttersHouse_EventScript_215C0A", "flag": "0" } diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json index 8bb9a2e2f9..7eee742116 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.json +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_1F_EventScript_211261", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_1F_EventScript_211293", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_1F_EventScript_2112CE", "flag": "0" } diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index 01da7a9383..9ab8647746 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_2F_EventScript_21186F", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_2F_EventScript_211886", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_2F_EventScript_2118B0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 10, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_2F_EventScript_2118DA", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_2F_EventScript_2118F1", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_2F_EventScript_211BCF", "flag": "0" } diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index 91e8e53fc1..0ed5d0b7ee 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_3F_EventScript_21256C", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_3F_EventScript_2125E1", "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_3F_EventScript_21256C", "flag": "0" } diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json index d0a4e56159..bc016aa2c3 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_1F_EventScript_2150CE", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_1F_EventScript_2150D7", "flag": "0" } diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index 0f2de8d538..5c047888e2 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_2F_EventScript_21523D", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_2F_EventScript_215246", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_2F_EventScript_215246", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_2F_EventScript_215246", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_2F_EventScript_21513A", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_2F_EventScript_215246", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_2F_EventScript_215246", "flag": "0" } diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json index 9fab521c7a..6d10fe9d82 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat2_1F_EventScript_215F80", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat2_1F_EventScript_215F77", "flag": "0" } diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json index 20ed3c9d45..a7d254e4da 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat2_2F_EventScript_215FD8", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat2_2F_EventScript_215FE1", "flag": "0" } diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json index 8ad2605112..2366b53923 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat2_3F_EventScript_216117", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat2_3F_EventScript_216120", "flag": "0" } diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json index ace68d0577..3da39df9d3 100644 --- a/data/maps/RustboroCity_Gym/map.json +++ b/data/maps/RustboroCity_Gym/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Gym_EventScript_212F31", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "RustboroCity_Gym_EventScript_212FE3", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "RustboroCity_Gym_EventScript_212FFA", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Gym_EventScript_213028", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "RustboroCity_Gym_EventScript_213011", "flag": "0" } diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index 598429b227..bc889d66bf 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House1_EventScript_21593F", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House1_EventScript_2159DF", "flag": "0" } diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json index 7533e995b9..b10b2c074f 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House2_EventScript_215EB4", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House2_EventScript_215EBD", "flag": "0" } diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json index c11aa89e38..50b5f1295f 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House3_EventScript_216191", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House3_EventScript_21619A", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House3_EventScript_2161A3", "flag": "0" } diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json index 714edcd584..a2a5a846f3 100644 --- a/data/maps/RustboroCity_Mart/map.json +++ b/data/maps/RustboroCity_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Mart_EventScript_214F06", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Mart_EventScript_214F7D", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Mart_EventScript_214F74", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Mart_EventScript_214F86", "flag": "0" } diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json index aabe2785fe..b91dd25ac4 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_1F_EventScript_214D76", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_1F_EventScript_214D84", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_1F_EventScript_214D8D", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_1F_EventScript_214D96", "flag": "0" } diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json index 9c63421e36..db6388bba9 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json index fb6944f400..614b123c42 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_213F5F", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_213F68", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_213F71", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_213F7A", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_213F83", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_213F95", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_214040", "flag": "FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT" } diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index 7d3287d041..b873c76c8a 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_22CE76", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_2907A6", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_291136", "flag": "FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_291143", "flag": "FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_22D0C2", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_22D0AF", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_PEEKO" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_2907A6", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "RusturfTunnel_EventScript_22D1B1", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_22CE5F", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN" } diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json index c8192aaa84..ce6c3d2d07 100644 --- a/data/maps/SSTidalCorridor/map.json +++ b/data/maps/SSTidalCorridor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalCorridor_EventScript_23C119", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalCorridor_EventScript_23C1A3", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalCorridor_EventScript_23C0D9", "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalCorridor_EventScript_23C0E2", "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT" } diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json index 1a7b1fde0f..3e678ca8cc 100644 --- a/data/maps/SSTidalLowerDeck/map.json +++ b/data/maps/SSTidalLowerDeck/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", "movement_range_x": 4, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SSTidalLowerDeck_EventScript_23C819", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 7, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SSTidalLowerDeck_EventScript_23C830", "flag": "0" } diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json index 935c5c33d3..8fb4bd05db 100644 --- a/data/maps/SSTidalRooms/map.json +++ b/data/maps/SSTidalRooms/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalRooms_EventScript_23CA49", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SSTidalRooms_EventScript_23CA60", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalRooms_EventScript_23CA77", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "SSTidalRooms_EventScript_23CA8E", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "SSTidalRooms_EventScript_23CAA9", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SSTidalRooms_EventScript_23CAC4", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalRooms_EventScript_23CADB", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalRooms_EventScript_23C9F2", "flag": "FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER" } diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index e0202beb9a..7c637f0efc 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_23D254", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_23D25D", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_2907A6", "flag": "FLAG_TEMP_11" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_2907A6", "flag": "FLAG_TEMP_12" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_2907A6", "flag": "FLAG_TEMP_13" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_2907A6", "flag": "FLAG_TEMP_14" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_2907A6", "flag": "FLAG_TEMP_15" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_2907A6", "flag": "FLAG_TEMP_16" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_2912C9", "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM" } diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index 6ce7c4d019..8e3337f532 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_23D3C6", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_23D3D8", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_2907A6", "flag": "FLAG_TEMP_15" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_23D3CF", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_2907A6", "flag": "FLAG_TEMP_13" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_2907A6", "flag": "FLAG_TEMP_11" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_2907A6", "flag": "FLAG_TEMP_14" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_2907A6", "flag": "FLAG_TEMP_12" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_2912E3", "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET" } diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json index 910c7cf3c1..2d3a1fa494 100644 --- a/data/maps/SafariZone_Northwest/map.json +++ b/data/maps/SafariZone_Northwest/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northwest_EventScript_23D24A", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northwest_EventScript_2912BC", "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22" } diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json index 16acff6dd8..db0ba8048a 100644 --- a/data/maps/SafariZone_RestHouse/map.json +++ b/data/maps/SafariZone_RestHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_RestHouse_EventScript_242BE7", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_RestHouse_EventScript_242BF0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_RestHouse_EventScript_242BF9", "flag": "0" } diff --git a/data/maps/SafariZone_South/map.json b/data/maps/SafariZone_South/map.json index c958a1a944..371be21194 100644 --- a/data/maps/SafariZone_South/map.json +++ b/data/maps/SafariZone_South/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_South_EventScript_23D2E5", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_South_EventScript_23D2CA", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_South_EventScript_23D2D3", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_South_EventScript_23D2DC", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_South_EventScript_23D390", "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_South_EventScript_23D3A2", "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS" } diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json index d2e3d7140a..3ace624882 100644 --- a/data/maps/SafariZone_Southeast/map.json +++ b/data/maps/SafariZone_Southeast/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southeast_EventScript_23D3BD", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southeast_EventScript_23D3B4", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southeast_EventScript_23D3AB", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southeast_EventScript_2912F0", "flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southeast_EventScript_23D399", "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION" } diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json index 41cce9e80b..5e383a694d 100644 --- a/data/maps/SafariZone_Southwest/map.json +++ b/data/maps/SafariZone_Southwest/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southwest_EventScript_23D267", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southwest_EventScript_2912D6", "flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE" } diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json index f24aa0ebac..304ebd6763 100644 --- a/data/maps/ScorchedSlab/map.json +++ b/data/maps/ScorchedSlab/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ScorchedSlab_EventScript_2912AF", "flag": "FLAG_ITEM_SCORCHED_SLAB_TM_11" } diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json index c1f45f1bf1..12000c6996 100644 --- a/data/maps/SeafloorCavern_Entrance/map.json +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Entrance_EventScript_234485", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT" } diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json index 3976ff46a1..bcac092567 100644 --- a/data/maps/SeafloorCavern_Room1/map.json +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room1_EventScript_2908BA", "flag": "FLAG_TEMP_11" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room1_EventScript_2908BA", "flag": "FLAG_TEMP_12" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room1_EventScript_2907A6", "flag": "FLAG_TEMP_13" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "SeafloorCavern_Room1_EventScript_2347EC", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SeafloorCavern_Room1_EventScript_234803", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" } diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json index 19b8b05736..3e5d6b1271 100644 --- a/data/maps/SeafloorCavern_Room2/map.json +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room2_EventScript_2908BA", "flag": "FLAG_TEMP_12" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room2_EventScript_2908BA", "flag": "FLAG_TEMP_13" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room2_EventScript_2908BA", "flag": "FLAG_TEMP_11" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room2_EventScript_2908BA", "flag": "FLAG_TEMP_15" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room2_EventScript_2908BA", "flag": "FLAG_TEMP_16" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room2_EventScript_2907A6", "flag": "FLAG_TEMP_18" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room2_EventScript_2907A6", "flag": "FLAG_TEMP_19" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room2_EventScript_2908BA", "flag": "FLAG_TEMP_17" } diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json index b7e46a87f1..c7a90b42dc 100644 --- a/data/maps/SeafloorCavern_Room3/map.json +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room3_EventScript_2908BA", "flag": "FLAG_TEMP_12" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room3_EventScript_2908BA", "flag": "FLAG_TEMP_14" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room3_EventScript_2908BA", "flag": "FLAG_TEMP_15" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room3_EventScript_2908BA", "flag": "FLAG_TEMP_16" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room3_EventScript_2908BA", "flag": "FLAG_TEMP_17" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room3_EventScript_2908BA", "flag": "FLAG_TEMP_18" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room3_EventScript_2908BA", "flag": "FLAG_TEMP_19" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "SeafloorCavern_Room3_EventScript_234938", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "SeafloorCavern_Room3_EventScript_23494F", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" } diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json index 02662f0177..0638ab4ed3 100644 --- a/data/maps/SeafloorCavern_Room4/map.json +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SeafloorCavern_Room4_EventScript_234C9C", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SeafloorCavern_Room4_EventScript_234CB3", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" } diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json index cfdbd64efe..975fc6a988 100644 --- a/data/maps/SeafloorCavern_Room5/map.json +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room5_EventScript_2908BA", "flag": "FLAG_TEMP_11" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room5_EventScript_2908BA", "flag": "FLAG_TEMP_12" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room5_EventScript_2908BA", "flag": "FLAG_TEMP_13" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room5_EventScript_2907A6", "flag": "FLAG_TEMP_15" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room5_EventScript_2907A6", "flag": "FLAG_TEMP_16" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room5_EventScript_2908BA", "flag": "FLAG_TEMP_14" } diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json index f556c23334..88ea40e3af 100644 --- a/data/maps/SeafloorCavern_Room8/map.json +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_11" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_12" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_13" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_14" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_15" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_16" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_17" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_18" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_19" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_1A" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_1B" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_1C" } diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index 093d1a83d2..fe02ad28b6 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room9_EventScript_291401", "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2" } diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index ee7806e57c..8f255972f4 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BlueCave1_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json index cdba6e817f..ec5d74d2f6 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BlueCave2_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json index 5dc78c8915..07be1610a8 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BlueCave3_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json index dfc9c67a82..45762d6198 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BlueCave4_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json index 20411331f9..679564ba7a 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BrownCave1_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json index 8001492235..35d5be558b 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BrownCave2_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json index 08ccc8c323..5424ee85e5 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BrownCave3_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json index f6184cee21..de3b4709ef 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BrownCave4_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json index 309dd3de09..eac0366c17 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_RedCave1_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json index 0c2162856a..bcbfbd0f2f 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_RedCave2_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json index ca5f00d6aa..00c14d3f31 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_RedCave3_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json index 6fe94e6bb6..b54974c4cc 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_RedCave4_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json index 7f7dedc1cc..38cb8997f1 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Shrub1_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json index 0be1b06f1e..728226fdc6 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Shrub2_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json index 7104bf5a2e..a3c5cdf057 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Shrub3_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json index 15b39293d9..9977f6eeb1 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Shrub4_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json index a03a38cde3..5d3309cc77 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Tree1_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json index 484096be1a..67deb9a10a 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Tree2_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index c1015dd9c0..6e4494836d 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Tree3_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json index 297834653a..465b1d50b5 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Tree4_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json index 0cc46d97e6..a14826a3a5 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_YellowCave1_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json index 9660114afc..97b6baa22f 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_YellowCave2_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json index fbc6d6217d..581a3479f7 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_YellowCave3_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json index d91c2f9a3a..3dfa7cc08c 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_YellowCave4_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json index 477c1c5007..1ebb9f5551 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideEntranceRoom_EventScript_2913C0", "flag": "FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideEntranceRoom_EventScript_236DD9", "flag": "0" } diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json index fd2e726801..dffef7da9a 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/map.json +++ b/data/maps/ShoalCave_LowTideIceRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideIceRoom_EventScript_2913E7", "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideIceRoom_EventScript_2913F4", "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE" } diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json index a7c276aa48..04e4ec67f9 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.json +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideInnerRoom_EventScript_2913CD", "flag": "FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY" } diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json index 5c399ed538..92f0fd11a0 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.json +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideLowerRoom_EventScript_2908BA", "flag": "FLAG_TEMP_11" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideLowerRoom_EventScript_2371B2", "flag": "0" } diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json index e4ad65f52d..239effc745 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.json +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideStairsRoom_EventScript_2913DA", "flag": "FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL" } diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json index 4c2340fca6..167344e619 100644 --- a/data/maps/SingleBattleColosseum/map.json +++ b/data/maps/SingleBattleColosseum/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SingleBattleColosseum_EventScript_2774A6", "flag": "0" } diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json index dd76c1d32f..6a3764aa94 100644 --- a/data/maps/SkyPillar_Outside/map.json +++ b/data/maps/SkyPillar_Outside/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SkyPillar_Outside_EventScript_2393F8", "flag": "FLAG_HIDE_SKY_PILLAR_WALLACE" } diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index 6d805d27e7..5cb6a1a693 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SkyPillar_Top_EventScript_239722", "flag": "FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT" } diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index fbda272345..ee9f3c379c 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCED9", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCEF6", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCEB8", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCF17", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD009", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCE42", "flag": "0" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCE63", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCE84", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD353", "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD35C", "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD1F8", "flag": "FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCFE5", "flag": "0" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCFEE", "flag": "0" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCFF7", "flag": "0" }, @@ -220,8 +220,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD000", "flag": "0" }, @@ -233,8 +233,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCFBB", "flag": "0" }, @@ -246,8 +246,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCFDC", "flag": "0" }, @@ -259,8 +259,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD020", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -272,8 +272,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD037", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -285,8 +285,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD198", "flag": "0" }, @@ -298,8 +298,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD16A", "flag": "0" }, @@ -311,8 +311,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD365", "flag": "0" }, @@ -324,8 +324,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCDE4", "flag": "0" }, @@ -337,8 +337,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD1D8", "flag": "FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN" }, @@ -350,8 +350,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCDBD", "flag": "0" }, @@ -363,8 +363,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD04E", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -376,8 +376,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD065", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -389,8 +389,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD07C", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -402,8 +402,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD093", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -415,8 +415,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD0AA", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -428,8 +428,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD0C1", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -441,8 +441,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD14A", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -454,8 +454,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD153", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -467,8 +467,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD36E", "flag": "0" }, @@ -480,8 +480,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SLATEPORT_CITY_SCOTT" } diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/map.json b/data/maps/SlateportCity_BattleTentBattleRoom/map.json index ed9a8866c3..e39f043637 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/map.json +++ b/data/maps/SlateportCity_BattleTentBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/SlateportCity_BattleTentCorridor/map.json b/data/maps/SlateportCity_BattleTentCorridor/map.json index d5e2d5e379..eea0cac800 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/map.json +++ b/data/maps/SlateportCity_BattleTentCorridor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/SlateportCity_BattleTentLobby/map.json b/data/maps/SlateportCity_BattleTentLobby/map.json index 07af8ad738..45783e2c96 100644 --- a/data/maps/SlateportCity_BattleTentLobby/map.json +++ b/data/maps/SlateportCity_BattleTentLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_BattleTentLobby_EventScript_2088AA", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_BattleTentLobby_EventScript_208A3D", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_BattleTentLobby_EventScript_208A7E", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_BattleTentLobby_EventScript_208A87", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_BattleTentLobby_EventScript_208A90", "flag": "0" } diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index 9317db74cb..4c9b45683e 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Harbor_EventScript_20CAF1", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Harbor_EventScript_20CC52", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Harbor_EventScript_20CC99", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Harbor_EventScript_20CCA2", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW" } diff --git a/data/maps/SlateportCity_House1/map.json b/data/maps/SlateportCity_House1/map.json index b1eed10274..47943e5179 100644 --- a/data/maps/SlateportCity_House1/map.json +++ b/data/maps/SlateportCity_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_House1_EventScript_209AA5", "flag": "0" } diff --git a/data/maps/SlateportCity_House2/map.json b/data/maps/SlateportCity_House2/map.json index 24ae6e67d0..a6a686cf72 100644 --- a/data/maps/SlateportCity_House2/map.json +++ b/data/maps/SlateportCity_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_House2_EventScript_20D9AF", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_House2_EventScript_20D9B8", "flag": "0" } diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json index cec96e59ff..597abbf066 100644 --- a/data/maps/SlateportCity_Mart/map.json +++ b/data/maps/SlateportCity_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Mart_EventScript_20DC49", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Mart_EventScript_20DC76", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Mart_EventScript_20DC7F", "flag": "0" } diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index f784a5cde1..517647bd10 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD96", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE5F", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE68", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE56", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE4D", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE71", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD96", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE7A", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AED4", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEDD", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEE6", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEEF", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEF8", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_28C883", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" } diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index dbb46dbfce..6eaecba97a 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BB00", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD64", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD6D", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD76", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" } diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json index eecc722481..3e87ae2562 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAD3", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAE1", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAEA", "flag": "0" } diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json index e12efc0f07..e6ad0518b8 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json index e41bee0fdb..045a0c315f 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_20A1E8", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_20A1F1", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_28C943", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_20A17E", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_209E96", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_20A20D", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_20A1FA", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_20A220", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_2C7F16", "flag": "0" } diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json index 8497f4212a..3514312806 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_SternsShipyard_1F_EventScript_207F40", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_SternsShipyard_1F_EventScript_207FED", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_SternsShipyard_1F_EventScript_207FF6", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_SternsShipyard_1F_EventScript_207FFF", "flag": "FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY" } diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json index 025d97f9a0..2e57c63fd5 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_SternsShipyard_2F_EventScript_20863E", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_SternsShipyard_2F_EventScript_208647", "flag": "0" } diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index 88ca51ff74..76ababed86 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E5E8D", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E5FE2", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E5ED8", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E608E", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E60E3", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E6017", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E6166", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E6038", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E6411", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E63DB", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E6393", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E635D", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, @@ -217,8 +217,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E64F2", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE" }, @@ -230,8 +230,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E651F", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE" }, @@ -243,8 +243,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E6446", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE" } diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json index 6c1e4374d2..6b8cab1498 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.json +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_Gym_1F_EventScript_224F44", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_Gym_1F_EventScript_225040", "flag": "0" } diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json index 663d7db847..d378f84e29 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.json +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "SootopolisCity_Gym_B1F_EventScript_225C8B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "SootopolisCity_Gym_B1F_EventScript_225CD0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "SootopolisCity_Gym_B1F_EventScript_225CB9", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "SootopolisCity_Gym_B1F_EventScript_225CE7", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "SootopolisCity_Gym_B1F_EventScript_225D15", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "SootopolisCity_Gym_B1F_EventScript_225D2C", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "SootopolisCity_Gym_B1F_EventScript_225CA2", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SootopolisCity_Gym_B1F_EventScript_225CFE", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SootopolisCity_Gym_B1F_EventScript_225D5A", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SootopolisCity_Gym_B1F_EventScript_225D43", "flag": "0" } diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json index b5ecf4e411..2be2adebed 100644 --- a/data/maps/SootopolisCity_House1/map.json +++ b/data/maps/SootopolisCity_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House1_EventScript_22694D", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House1_EventScript_22698E", "flag": "0" } diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json index ea9d582848..af03fdff59 100644 --- a/data/maps/SootopolisCity_House2/map.json +++ b/data/maps/SootopolisCity_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House2_EventScript_226A77", "flag": "0" } diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json index 765803e8a7..af925c4c9f 100644 --- a/data/maps/SootopolisCity_House3/map.json +++ b/data/maps/SootopolisCity_House3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House3_EventScript_226B72", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House3_EventScript_226B9B", "flag": "0" } diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json index 492aac1343..db7ffd5d40 100644 --- a/data/maps/SootopolisCity_House4/map.json +++ b/data/maps/SootopolisCity_House4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House4_EventScript_226D16", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House4_EventScript_226D1F", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House4_EventScript_226D28", "flag": "0" } diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json index 24cdafe8bd..5e20e33df2 100644 --- a/data/maps/SootopolisCity_House5/map.json +++ b/data/maps/SootopolisCity_House5/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House5_EventScript_226E94", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House5_EventScript_226E9D", "flag": "0" } diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json index d787c3e67d..7175903186 100644 --- a/data/maps/SootopolisCity_House6/map.json +++ b/data/maps/SootopolisCity_House6/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House6_EventScript_226F5C", "flag": "0" } diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json index de04646828..4d500fcb0a 100644 --- a/data/maps/SootopolisCity_House7/map.json +++ b/data/maps/SootopolisCity_House7/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House7_EventScript_2270CC", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House7_EventScript_2270D5", "flag": "0" } diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json index 5f8acc9bb5..d7ed8b980a 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22722B", "flag": "0" } diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json index bb031b2af7..e9b9780137 100644 --- a/data/maps/SootopolisCity_Mart/map.json +++ b/data/maps/SootopolisCity_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_Mart_EventScript_226795", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_Mart_EventScript_2267C2", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_Mart_EventScript_2267EC", "flag": "0" } diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json index b57eae35c6..791b9fdaa0 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24", "flag": "0" } diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json index fcc77a3311..dbb651a443 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index bce2e52bd6..90a8dcdade 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_1F_EventScript_226500", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_1F_EventScript_22650E", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_1F_EventScript_226538", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_1F_EventScript_2C8256", "flag": "0" } diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json index 32e27dbdf2..33308de7be 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json index a747a48b8d..26447c163d 100644 --- a/data/maps/SouthernIsland_Exterior/map.json +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SouthernIsland_Exterior_EventScript_2429D2", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json index 6d099763a7..5fd8354f6c 100644 --- a/data/maps/SouthernIsland_Interior/map.json +++ b/data/maps/SouthernIsland_Interior/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON" } diff --git a/data/maps/TerraCave_End/map.json b/data/maps/TerraCave_End/map.json index 6d79cb74e9..991743d63e 100644 --- a/data/maps/TerraCave_End/map.json +++ b/data/maps/TerraCave_End/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_TERRA_CAVE_GROUDON" } diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 05553e3a02..257c7d1c82 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "TradeCenter_EventScript_2774B6", "flag": "0" } diff --git a/data/maps/TrainerHill_Elevator/map.json b/data/maps/TrainerHill_Elevator/map.json index 731bcf44a0..03354b0daf 100644 --- a/data/maps/TrainerHill_Elevator/map.json +++ b/data/maps/TrainerHill_Elevator/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "TrainerHill_Elevator_EventScript_26935F", "flag": "0" } diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json index db94fb2b23..4b12b1c80b 100644 --- a/data/maps/TrainerHill_Entrance/map.json +++ b/data/maps/TrainerHill_Entrance/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "TrainerHill_Entrance_EventScript_2681FD", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "TrainerHill_Entrance_EventScript_2681EF", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "TrainerHill_Entrance_EventScript_2683C7", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "TrainerHill_Entrance_EventScript_2683AC", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "TrainerHill_Entrance_EventScript_268391", "flag": "0" } diff --git a/data/maps/TrainerHill_Roof/map.json b/data/maps/TrainerHill_Roof/map.json index d54779a8eb..8a623028ed 100644 --- a/data/maps/TrainerHill_Roof/map.json +++ b/data/maps/TrainerHill_Roof/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "TrainerHill_Roof_EventScript_268FB2", "flag": "0" } diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json index 5497a7ba39..8e7d2c554d 100644 --- a/data/maps/Underwater_SeafloorCavern/map.json +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Underwater_SeafloorCavern_EventScript_2343DC", "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Underwater_SeafloorCavern_EventScript_2343DC", "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Underwater_SeafloorCavern_EventScript_2343DC", "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Underwater_SeafloorCavern_EventScript_2343DC", "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" } diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index 175ec3ad79..c42cd362cc 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_23D236", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_23D204", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_23D22C", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_23D222", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_23D218", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_23D20E", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_23D1FA", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_23D1F0", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_23D1E6", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_1" } diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index 06e6cc959a..3f8f4fe455 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_EventScript_1EB5A8", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_EventScript_1EB575", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_EventScript_1EB5BA", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_EventScript_1EB5B1", "flag": "0" } diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json index e08187b61d..2722518ebf 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/map.json b/data/maps/VerdanturfTown_BattleTentCorridor/map.json index 2e3b9aed1f..1577459148 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/map.json +++ b/data/maps/VerdanturfTown_BattleTentCorridor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/VerdanturfTown_BattleTentLobby/map.json b/data/maps/VerdanturfTown_BattleTentLobby/map.json index 2f5190f61c..2a56602716 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/map.json +++ b/data/maps/VerdanturfTown_BattleTentLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_BattleTentLobby_EventScript_201873", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_BattleTentLobby_EventScript_201A7B", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_BattleTentLobby_EventScript_201ABC", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_BattleTentLobby_EventScript_201AC5", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_BattleTentLobby_EventScript_201AD0", "flag": "FLAG_HIDE_VERDANTURF_TOWN_SCOTT" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_BattleTentLobby_EventScript_201AF7", "flag": "0" } diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json index 3a67851369..955e00a83c 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_203031", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA", "flag": "0" } diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json index cf6170e8af..9a357b4958 100644 --- a/data/maps/VerdanturfTown_House/map.json +++ b/data/maps/VerdanturfTown_House/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_House_EventScript_20335F", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_House_EventScript_203368", "flag": "0" } diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json index 8ea0e1bf59..4f9b8296e5 100644 --- a/data/maps/VerdanturfTown_Mart/map.json +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_Mart_EventScript_202587", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_Mart_EventScript_2025BA", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_Mart_EventScript_2025C3", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_Mart_EventScript_2025CC", "flag": "0" } diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index 1c1145565d..f9df06d335 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_1F_EventScript_20273A", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_1F_EventScript_202748", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_1F_EventScript_202751", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6", "flag": "0" } diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json index ad2df3d36f..bfa6db09e2 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json index 10a3996fdb..514b2581eb 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.json +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_WandasHouse_EventScript_2028BF", "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_WandasHouse_EventScript_202913", "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_WandasHouse_EventScript_2028E1", "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_WandasHouse_EventScript_20294E", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_WandasHouse_EventScript_20291C", "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN" } diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 534d8dd59b..65636a49e1 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "VictoryRoad_1F_EventScript_235E73", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "VictoryRoad_1F_EventScript_235EA1", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "VictoryRoad_1F_EventScript_235E8A", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_1F_EventScript_235E2C", "flag": "FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_1F_EventScript_291483", "flag": "FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_1F_EventScript_291490", "flag": "FLAG_ITEM_VICTORY_ROAD_1F_PP_UP" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_1F_EventScript_235E35", "flag": "FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_1F_EventScript_235ECF", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_1F_EventScript_235EB8", "flag": "0" } diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index 523eddc063..2fde100903 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2908BA", "flag": "FLAG_TEMP_13" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2908BA", "flag": "FLAG_TEMP_14" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2908BA", "flag": "FLAG_TEMP_11" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2908BA", "flag": "FLAG_TEMP_12" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2908BA", "flag": "FLAG_TEMP_17" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2908BA", "flag": "FLAG_TEMP_16" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2908BA", "flag": "FLAG_TEMP_1E" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2907A6", "flag": "FLAG_TEMP_19" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2907A6", "flag": "FLAG_TEMP_1A" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2907A6", "flag": "FLAG_TEMP_1B" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2907A6", "flag": "FLAG_TEMP_1C" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2907A6", "flag": "FLAG_TEMP_1D" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2908BA", "flag": "FLAG_TEMP_1F" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "VictoryRoad_B1F_EventScript_2364E5", "flag": "0" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "VictoryRoad_B1F_EventScript_2364FC", "flag": "0" }, @@ -217,8 +217,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_B1F_EventScript_236513", "flag": "0" }, @@ -230,8 +230,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2907A6", "flag": "FLAG_TEMP_15" }, @@ -243,8 +243,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_29149D", "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_TM_29" }, @@ -256,8 +256,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2914AA", "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE" }, @@ -269,8 +269,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "VictoryRoad_B1F_EventScript_23652A", "flag": "0" }, @@ -282,8 +282,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "VictoryRoad_B1F_EventScript_236541", "flag": "0" } diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json index 2667155a92..fd9195ed45 100644 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_B2F_EventScript_2368D5", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "VictoryRoad_B2F_EventScript_2368EC", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_B2F_EventScript_236903", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_B2F_EventScript_23691A", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B2F_EventScript_2914B7", "flag": "FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_B2F_EventScript_236948", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_B2F_EventScript_236931", "flag": "0" } diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index d2b9b6802c..1cf196fda6 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -161,8 +161,8 @@ string generate_map_events_text(Json map_data) { << obj_event["movement_type"].string_value() << ", " << obj_event["movement_range_x"].int_value() << ", " << obj_event["movement_range_y"].int_value() << ", " - << obj_event["trainer_type"].int_value() << ", " - << obj_event["trainer_sight_or_berry_tree_id"].int_value() << ", " + << obj_event["trainer_type"].string_value() << ", " + << obj_event["trainer_sight_or_berry_tree_id"].string_value() << ", " << obj_event["script"].string_value() << ", " << obj_event["flag"].string_value() << "\n"; } From 35575b57a01bbd5447fbcee3b30050d8d8c3d02e Mon Sep 17 00:00:00 2001 From: garak Date: Sat, 16 Feb 2019 23:51:06 -0500 Subject: [PATCH 048/217] use BG_CHAR_ADDR define --- src/battle_anim.c | 6 +-- src/battle_bg.c | 76 ++++++++++++++++++------------------ src/battle_gfx_sfx_util.c | 2 +- src/contest.c | 16 ++++---- src/field_effect.c | 4 +- src/intro.c | 18 ++++----- src/intro_credits_graphics.c | 8 ++-- src/title_screen.c | 4 +- 8 files changed, 67 insertions(+), 67 deletions(-) diff --git a/src/battle_anim.c b/src/battle_anim.c index f086b1c336..8a03f03b3a 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1933,12 +1933,12 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible) if (IsContest() == TRUE) { - RequestDma3Fill(0, (void*)(VRAM + 0x8000), 0x2000, 1); + RequestDma3Fill(0, (void*)(BG_CHAR_ADDR(2)), 0x2000, 1); RequestDma3Fill(0xFF, (void*)(VRAM + 0xF000), 0x1000, 0); } else { - RequestDma3Fill(0, (void*)(VRAM + 0x4000), 0x2000, 1); + RequestDma3Fill(0, (void*)(BG_CHAR_ADDR(1)), 0x2000, 1); RequestDma3Fill(0xFF, (void*)(VRAM + 0xe000), 0x1000, 0); } @@ -2460,7 +2460,7 @@ static void LoadMoveBg(u16 bgId) else { LZDecompressVram(gBattleAnimBackgroundTable[bgId].tilemap, (void *)(VRAM + 0xD000)); - LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(VRAM + 0x8000)); + LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(BG_CHAR_ADDR(2))); LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, 32, 32); } } diff --git a/src/battle_bg.c b/src/battle_bg.c index 61a914fc93..79618a151c 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -720,25 +720,25 @@ void DrawMainBattleBackground(void) { if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_x2000000)) { - LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60); } else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON) { - LZDecompressVram(gBattleTerrainTiles_Cave, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Cave, (void*)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Cave, (void*)(VRAM + 0xD000)); LoadCompressedPalette(gBattleTerrainPalette_Groudon, 0x20, 0x60); } else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE) { - LZDecompressVram(gBattleTerrainTiles_Water, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Water, (void*)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Water, (void*)(VRAM + 0xD000)); LoadCompressedPalette(gBattleTerrainPalette_Kyogre, 0x20, 0x60); } else if (gBattleTypeFlags & BATTLE_TYPE_RAYQUAZA) { - LZDecompressVram(gBattleTerrainTiles_Rayquaza, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Rayquaza, (void*)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Rayquaza, (void*)(VRAM + 0xD000)); LoadCompressedPalette(gBattleTerrainPalette_Rayquaza, 0x20, 0x60); } @@ -749,14 +749,14 @@ void DrawMainBattleBackground(void) u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass; if (trainerClass == TRAINER_CLASS_LEADER) { - LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, 0x20, 0x60); return; } else if (trainerClass == TRAINER_CLASS_CHAMPION) { - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, 0x20, 0x60); return; @@ -767,47 +767,47 @@ void DrawMainBattleBackground(void) { default: case MAP_BATTLE_SCENE_NORMAL: - LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tileset, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tileset, (void*)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tilemap, (void*)(VRAM + 0xD000)); LoadCompressedPalette(gBattleTerrainTable[gBattleTerrain].palette, 0x20, 0x60); break; case MAP_BATTLE_SCENE_GYM: - LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, 0x20, 0x60); break; case MAP_BATTLE_SCENE_MAGMA: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, 0x20, 0x60); break; case MAP_BATTLE_SCENE_AQUA: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, 0x20, 0x60); break; case MAP_BATTLE_SCENE_SIDNEY: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, 0x20, 0x60); break; case MAP_BATTLE_SCENE_PHOEBE: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, 0x20, 0x60); break; case MAP_BATTLE_SCENE_GLACIA: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, 0x20, 0x60); break; case MAP_BATTLE_SCENE_DRAKE: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, 0x20, 0x60); break; case MAP_BATTLE_SCENE_FRONTIER: - LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60); break; @@ -1089,8 +1089,8 @@ void DrawBattleEntryBackground(void) { if (gBattleTypeFlags & BATTLE_TYPE_LINK) { - LZDecompressVram(gUnknown_08D778F0, (void*)(VRAM + 0x4000)); - LZDecompressVram(gUnknown_08D77B0C, (void*)(VRAM + 0x10000)); + LZDecompressVram(gUnknown_08D778F0, (void*)(BG_CHAR_ADDR(1))); + LZDecompressVram(gUnknown_08D77B0C, (void*)(BG_SCREEN_ADDR(2)0)); LoadCompressedPalette(gUnknown_08D77AE4, 0x60, 0x20); SetBgAttribute(1, BG_ATTR_SCREENSIZE, 1); SetGpuReg(REG_OFFSET_BG1CNT, 0x5C04); @@ -1108,7 +1108,7 @@ void DrawBattleEntryBackground(void) { if (!(gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) || gPartnerTrainerId == TRAINER_STEVEN_PARTNER) { - LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000)); + LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(BG_CHAR_ADDR(1))); LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000)); } else @@ -1123,17 +1123,17 @@ void DrawBattleEntryBackground(void) } else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON) { - LZDecompressVram(gBattleTerrainAnimTiles_Cave, (void*)(VRAM + 0x4000)); + LZDecompressVram(gBattleTerrainAnimTiles_Cave, (void*)(BG_CHAR_ADDR(1))); LZDecompressVram(gBattleTerrainAnimTilemap_Cave, (void*)(VRAM + 0xE000)); } else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE) { - LZDecompressVram(gBattleTerrainAnimTiles_Underwater, (void*)(VRAM + 0x4000)); + LZDecompressVram(gBattleTerrainAnimTiles_Underwater, (void*)(BG_CHAR_ADDR(1))); LZDecompressVram(gBattleTerrainAnimTilemap_Underwater, (void*)(VRAM + 0xE000)); } else if (gBattleTypeFlags & BATTLE_TYPE_RAYQUAZA) { - LZDecompressVram(gBattleTerrainAnimTiles_Rayquaza, (void*)(VRAM + 0x4000)); + LZDecompressVram(gBattleTerrainAnimTiles_Rayquaza, (void*)(BG_CHAR_ADDR(1))); LZDecompressVram(gBattleTerrainAnimTilemap_Rayquaza, (void*)(VRAM + 0xE000)); } else @@ -1143,13 +1143,13 @@ void DrawBattleEntryBackground(void) u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass; if (trainerClass == TRAINER_CLASS_LEADER) { - LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000)); + LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(BG_CHAR_ADDR(1))); LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000)); return; } else if (trainerClass == TRAINER_CLASS_CHAMPION) { - LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000)); + LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(BG_CHAR_ADDR(1))); LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000)); return; } @@ -1157,12 +1157,12 @@ void DrawBattleEntryBackground(void) if (GetCurrentMapBattleScene() == MAP_BATTLE_SCENE_NORMAL) { - LZDecompressVram(gBattleTerrainTable[gBattleTerrain].entryTileset, (void*)(VRAM + 0x4000)); + LZDecompressVram(gBattleTerrainTable[gBattleTerrain].entryTileset, (void*)(BG_CHAR_ADDR(1))); LZDecompressVram(gBattleTerrainTable[gBattleTerrain].entryTilemap, (void*)(VRAM + 0xE000)); } else { - LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000)); + LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(BG_CHAR_ADDR(1))); LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000)); } } @@ -1187,11 +1187,11 @@ bool8 LoadChosenBattleElement(u8 caseId) case 3: if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER)) { - LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2))); } else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON) { - LZDecompressVram(gBattleTerrainTiles_Cave, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Cave, (void*)(BG_CHAR_ADDR(2))); } else { @@ -1200,12 +1200,12 @@ bool8 LoadChosenBattleElement(u8 caseId) u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass; if (trainerClass == TRAINER_CLASS_LEADER) { - LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2))); break; } else if (trainerClass == TRAINER_CLASS_CHAMPION) { - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); break; } } @@ -1214,31 +1214,31 @@ bool8 LoadChosenBattleElement(u8 caseId) { default: case MAP_BATTLE_SCENE_NORMAL: - LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tileset, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tileset, (void*)(BG_CHAR_ADDR(2))); break; case MAP_BATTLE_SCENE_GYM: - LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2))); break; case MAP_BATTLE_SCENE_MAGMA: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); break; case MAP_BATTLE_SCENE_AQUA: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); break; case MAP_BATTLE_SCENE_SIDNEY: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); break; case MAP_BATTLE_SCENE_PHOEBE: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); break; case MAP_BATTLE_SCENE_GLACIA: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); break; case MAP_BATTLE_SCENE_DRAKE: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); break; case MAP_BATTLE_SCENE_FRONTIER: - LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2))); break; } } diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 7c6b743042..668bbf6637 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -923,7 +923,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool8 notTransform } src = gMonSpritesGfxPtr->sprites[position]; - dst = (void *)(VRAM + 0x10000 + gSprites[gBattlerSpriteIds[battlerAtk]].oam.tileNum * 32); + dst = (void *)(BG_SCREEN_ADDR(2)0 + gSprites[gBattlerSpriteIds[battlerAtk]].oam.tileNum * 32); DmaCopy32(3, src, dst, 0x800); paletteOffset = 0x100 + battlerAtk * 16; lzPaletteData = GetFrontSpritePalFromSpeciesAndPersonality(targetSpecies, otId, personalityValue); diff --git a/src/contest.c b/src/contest.c index cf084e35e4..5fb3f4dd5a 100644 --- a/src/contest.c +++ b/src/contest.c @@ -589,8 +589,8 @@ static u8 sub_80D7E44(u8 *a) case 0: gPaletteFade.bufferTransferDisabled = TRUE; RequestDma3Fill(0, (void *)VRAM, 0x8000, 1); - RequestDma3Fill(0, (void *)VRAM + 0x8000, 0x8000, 1); - RequestDma3Fill(0, (void *)VRAM + 0x10000, 0x8000, 1); + RequestDma3Fill(0, (void *)BG_CHAR_ADDR(2), 0x8000, 1); + RequestDma3Fill(0, (void *)BG_SCREEN_ADDR(2)0, 0x8000, 1); break; case 1: LZDecompressVram(gContestMiscGfx, (void *)VRAM); @@ -3340,12 +3340,12 @@ static u8 sub_80DC9EC(u8 a) CpuFill32(0, gContestResources->field_38 + 0x500, 0x300); RequestDma3Copy(gContestResources->field_34, - (u8 *)(VRAM + 0x10000 + gSprites[spriteId1].oam.tileNum * 32), + (u8 *)(BG_SCREEN_ADDR(2)0 + gSprites[spriteId1].oam.tileNum * 32), 0x800, 1); RequestDma3Copy(gContestResources->field_38, - (u8 *)(VRAM + 0x10000 + gSprites[spriteId2].oam.tileNum * 32), + (u8 *)(BG_SCREEN_ADDR(2)0 + gSprites[spriteId2].oam.tileNum * 32), 0x800, 1); @@ -3870,8 +3870,8 @@ static void sub_80DD940(void) src = gContestApplauseMeterGfx + 64; else src = gContestApplauseMeterGfx; - CpuCopy32(src, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 17 + i) * 32), 32); - CpuCopy32(src + 32, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 25 + i) * 32), 32); + CpuCopy32(src, (void *)(BG_SCREEN_ADDR(2)0 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 17 + i) * 32), 32); + CpuCopy32(src + 32, (void *)(BG_SCREEN_ADDR(2)0 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 25 + i) * 32), 32); if (sContest.applauseLevel > 4) sub_80DDA20(); @@ -4120,7 +4120,7 @@ static void sub_80DE008(bool8 a) { if (sContestantStatus[i].turnOrderMod != 0 && a) { - CpuCopy32(GetTurnOrderNumberGfx(i), (void *)(VRAM + 0x10000 + (gSprites[gContestResources->field_14[i].unk1].oam.tileNum + 6) * 32), 32); + CpuCopy32(GetTurnOrderNumberGfx(i), (void *)(BG_SCREEN_ADDR(2)0 + (gSprites[gContestResources->field_14[i].unk1].oam.tileNum + 6) * 32), 32); gSprites[gContestResources->field_14[i].unk1].pos1.y = gUnknown_08587A70[gUnknown_02039F26[i]]; gSprites[gContestResources->field_14[i].unk1].invisible = FALSE; } @@ -4212,7 +4212,7 @@ static void sub_80DE350(void) s32 i; u16 bg1Cnt; - RequestDma3Fill(0,(void *)(VRAM + 0x8000), 0x2000, 0x1); + RequestDma3Fill(0,(void *)(BG_CHAR_ADDR(2)), 0x2000, 0x1); CpuFill32(0, gContestResources->field_24[1], 0x1000); Contest_SetBgCopyFlags(1); bg1Cnt = GetGpuReg(REG_OFFSET_BG1CNT); diff --git a/src/field_effect.c b/src/field_effect.c index badf57b160..69c6a1b7d3 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2960,8 +2960,8 @@ u8 sub_80B8F98(void) { for (i = 0; i < 8; i++) { - *(u16*)(VRAM + 0x8000 + (k + 1) * 32 + i * 4) = (gUnknown_0855B630[k * 32 + i * 4 + 1] << 8) + gUnknown_0855B630[k * 32 + i * 4]; - *(u16*)(VRAM + 0x8000 + (k + 1) * 32 + i * 4 + 2) = (gUnknown_0855B630[k * 32 + i * 4 + 3] << 8) + gUnknown_0855B630[k * 32 + i * 4 + 2]; + *(u16*)(BG_CHAR_ADDR(2) + (k + 1) * 32 + i * 4) = (gUnknown_0855B630[k * 32 + i * 4 + 1] << 8) + gUnknown_0855B630[k * 32 + i * 4]; + *(u16*)(BG_CHAR_ADDR(2) + (k + 1) * 32 + i * 4 + 2) = (gUnknown_0855B630[k * 32 + i * 4 + 3] << 8) + gUnknown_0855B630[k * 32 + i * 4 + 2]; } } return spriteId; diff --git a/src/intro.c b/src/intro.c index 4f76faf870..13ceced750 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1092,7 +1092,7 @@ static void Task_IntroLoadPart1Graphics(u8 taskId) SetGpuReg(REG_OFFSET_BG1VOFS, 0x18); SetGpuReg(REG_OFFSET_BG0VOFS, 0x28); LZ77UnCompVram(gIntro1BGLeavesGfx, (void *)VRAM); - LZ77UnCompVram(gIntro1BG0_Tilemap, (void *)(VRAM + 0x8000)); + LZ77UnCompVram(gIntro1BG0_Tilemap, (void *)(BG_CHAR_ADDR(2))); DmaClear16(3, VRAM + 0x8800, 0x800); LZ77UnCompVram(gIntro1BG1_Tilemap, (void *)(VRAM + 0x9000)); DmaClear16(3, VRAM + 0x9800, 0x800); @@ -1549,7 +1549,7 @@ static void Task_IntroLoadPart3Graphics(u8 taskId) { intro_reset_and_hide_bgs(); LZ77UnCompVram(gIntro3Pokeball_Gfx, (void *)VRAM); - LZ77UnCompVram(gIntro3Pokeball_Tilemap, (void *)(VRAM + 0x4000)); + LZ77UnCompVram(gIntro3Pokeball_Tilemap, (void *)(BG_CHAR_ADDR(1))); LoadPalette(gIntro3PokeballPal, 0, 0x200); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 0; @@ -1601,8 +1601,8 @@ static void Task_IntroLoadGroudonScene(u8 taskId) FreeAllSpritePalettes(); gReservedSpritePaletteCount = 8; LZDecompressVram(gIntro3GroudonGfx, (void *)VRAM); - LZDecompressVram(gIntro3GroudonTilemap, (void *)(VRAM + 0xC000)); - LZDecompressVram(gIntro3LegendBgGfx, (void *)(VRAM + 0x4000)); + LZDecompressVram(gIntro3GroudonTilemap, (void *)(BG_CHAR_ADDR(3))); + LZDecompressVram(gIntro3LegendBgGfx, (void *)(BG_CHAR_ADDR(1))); LZDecompressVram(gIntro3GroudonBgTilemap, (void *)(VRAM + 0xE000)); LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_ROCKS)]); LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_ROCKS)]); @@ -1824,7 +1824,7 @@ static void Task_IntroLoadKyogreScene(u8 taskId) { ResetSpriteData(); LZDecompressVram(gIntro3KyogreGfx, (void *)VRAM); - LZDecompressVram(gIntro3KyogreTilemap, (void *)(VRAM + 0xC000)); + LZDecompressVram(gIntro3KyogreTilemap, (void *)(BG_CHAR_ADDR(3))); LZDecompressVram(gIntro3KyogreBgTilemap, (void *)(VRAM + 0xE000)); LoadCompressedSpriteSheet(gUnknown_085E4C88); LoadSpritePalette(gUnknown_085E4C98); @@ -2087,14 +2087,14 @@ static void Task_IntroLoadClouds1(u8 taskId) SetGpuReg(REG_OFFSET_BG2HOFS, 0); SetGpuReg(REG_OFFSET_BG2VOFS, 0); LZDecompressVram(gIntro3CloudsGfx, (void *)VRAM); - LZDecompressVram(gIntro3CloudsGfx, (void *)(VRAM + 0x4000)); + LZDecompressVram(gIntro3CloudsGfx, (void *)(BG_CHAR_ADDR(1))); LZDecompressVram(gIntro3Clouds3Tilemap, (void *)(VRAM + 0xE000)); gTasks[taskId].func = Task_IntroLoadClouds2; } static void Task_IntroLoadClouds2(u8 taskId) { - LZDecompressVram(gIntro3Clouds1Tilemap, (void *)(VRAM + 0xC000)); + LZDecompressVram(gIntro3Clouds1Tilemap, (void *)(BG_CHAR_ADDR(3))); LZDecompressVram(gIntro3Clouds2Tilemap, (void *)(VRAM + 0xD000)); gTasks[taskId].func = Task_IntroLoadClouds3; } @@ -2141,8 +2141,8 @@ static void Task_IntroCloudScene(u8 taskId) static void Task_IntroLoadRayquazaLightningScene(u8 taskId) { LZDecompressVram(gIntro3RayquazaTilemap, (void *)(VRAM + 0xE000)); - LZDecompressVram(gIntro3Clouds4Tilemap, (void *)(VRAM + 0xC000)); - LZDecompressVram(gIntro3RayquazaGfx, (void *)(VRAM + 0x4000)); + LZDecompressVram(gIntro3Clouds4Tilemap, (void *)(BG_CHAR_ADDR(3))); + LZDecompressVram(gIntro3RayquazaGfx, (void *)(BG_CHAR_ADDR(1))); LZDecompressVram(gIntro3Clouds2Gfx, (void *)VRAM); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index ba1f561583..4489b64c39 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -331,7 +331,7 @@ static void sub_817B458(u8); void load_intro_part2_graphics(u8 a) { - LZ77UnCompVram(gUnknown_085F0740, (void *)(VRAM + 0x4000)); + LZ77UnCompVram(gUnknown_085F0740, (void *)(BG_CHAR_ADDR(1))); LZ77UnCompVram(gUnknown_085F0BC0, (void *)(VRAM + 0x7800)); LoadPalette(&gUnknown_085F06E0, 240, 32); switch (a) @@ -438,7 +438,7 @@ void sub_817B150(u8 a) void sub_817B1C8(u8 a) { - LZ77UnCompVram(gUnknown_085F0740, (void *)(VRAM + 0x4000)); + LZ77UnCompVram(gUnknown_085F0740, (void *)(BG_CHAR_ADDR(1))); LZ77UnCompVram(gUnknown_085F0BC0, (void *)(VRAM + 0x7800)); switch (a) { @@ -449,7 +449,7 @@ void sub_817B1C8(u8 a) LZ77UnCompVram(gUnknown_085F1398, (void *)(VRAM + 0x3000)); LoadPalette(&gUnknown_085F0CFC, 0, 96); LoadCompressedSpriteSheet(gUnknown_085F5064); - LZ77UnCompVram(gUnknown_085F16A8, (void *)(VRAM + 0x10000)); + LZ77UnCompVram(gUnknown_085F16A8, (void *)(BG_SCREEN_ADDR(2)0)); LoadPalette(&gUnknown_085F1668, 256, 32); sub_817B76C(); break; @@ -459,7 +459,7 @@ void sub_817B1C8(u8 a) LZ77UnCompVram(gUnknown_085F1398, (void *)(VRAM + 0x3000)); LoadPalette(&gUnknown_085F0D5C, 0, 96); LoadCompressedSpriteSheet(gUnknown_085F5064); - LZ77UnCompVram(gUnknown_085F16A8, (void *)(VRAM + 0x10000)); + LZ77UnCompVram(gUnknown_085F16A8, (void *)(BG_SCREEN_ADDR(2)0)); LoadPalette(&gUnknown_085F1688, 256, 32); sub_817B76C(); break; diff --git a/src/title_screen.c b/src/title_screen.c index 06bb066bb5..6e3ba45cfc 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -509,9 +509,9 @@ void CB2_InitTitleScreen(void) LZ77UnCompVram(gTitleScreenPokemonLogoGfx, (void *)VRAM); LZ77UnCompVram(gUnknown_08DE0644, (void *)(VRAM + 0x4800)); LoadPalette(gTitleScreenBgPalettes, 0, 0x1E0); - LZ77UnCompVram(sTitleScreenRayquazaGfx, (void *)(VRAM + 0x8000)); + LZ77UnCompVram(sTitleScreenRayquazaGfx, (void *)(BG_CHAR_ADDR(2))); LZ77UnCompVram(sTitleScreenRayquazaTilemap, (void *)(VRAM + 0xD000)); - LZ77UnCompVram(sTitleScreenCloudsGfx, (void *)(VRAM + 0xC000)); + LZ77UnCompVram(sTitleScreenCloudsGfx, (void *)(BG_CHAR_ADDR(3))); LZ77UnCompVram(gUnknown_08DDE458, (void *)(VRAM + 0xD800)); ScanlineEffect_Stop(); ResetTasks(); From 22657c708753df14e84d4bdae4afac0072803447 Mon Sep 17 00:00:00 2001 From: garak Date: Sun, 17 Feb 2019 00:25:48 -0500 Subject: [PATCH 049/217] use BG_SCREEN_ADDR macro for tilemap addresses --- src/battle_anim.c | 18 ++++----- src/battle_bg.c | 76 ++++++++++++++++++------------------ src/battle_gfx_sfx_util.c | 2 +- src/berry_blender.c | 2 +- src/clear_save_data_screen.c | 2 +- src/contest.c | 28 ++++++------- src/contest_painting.c | 14 +++---- src/credits.c | 2 +- src/field_effect.c | 2 +- src/field_effect_helpers.c | 4 +- src/intro.c | 24 ++++++------ src/intro_credits_graphics.c | 20 +++++----- src/main_menu.c | 4 +- src/pokemon_storage_system.c | 2 +- src/save_failed_screen.c | 4 +- src/starter_choose.c | 4 +- src/title_screen.c | 6 +-- 17 files changed, 107 insertions(+), 107 deletions(-) diff --git a/src/battle_anim.c b/src/battle_anim.c index 8a03f03b3a..f1cff1de2a 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1933,13 +1933,13 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible) if (IsContest() == TRUE) { - RequestDma3Fill(0, (void*)(BG_CHAR_ADDR(2)), 0x2000, 1); - RequestDma3Fill(0xFF, (void*)(VRAM + 0xF000), 0x1000, 0); + RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(16)), 0x2000, 1); + RequestDma3Fill(0xFF, (void*)(BG_SCREEN_ADDR(30)), 0x1000, 0); } else { - RequestDma3Fill(0, (void*)(BG_CHAR_ADDR(1)), 0x2000, 1); - RequestDma3Fill(0xFF, (void*)(VRAM + 0xe000), 0x1000, 0); + RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(8)), 0x2000, 1); + RequestDma3Fill(0xFF, (void*)(BG_SCREEN_ADDR(28)), 0x1000, 0); } sub_80A6B30(&animBg); @@ -1978,8 +1978,8 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible) } else { - RequestDma3Fill(0, (void*)(VRAM + 0x6000), 0x2000, 1); - RequestDma3Fill(0, (void*)(VRAM + 0xF000), 0x1000, 1); + RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(12)), 0x2000, 1); + RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(30)), 0x1000, 1); sub_80A6B90(&animBg, 2); CpuFill16(0, animBg.bgTiles + 0x1000, 0x1000); CpuFill16(0, animBg.bgTilemap + 0x400, 0x800); @@ -2452,14 +2452,14 @@ static void LoadMoveBg(u16 bgId) LZDecompressWram(tilemap, gDecompressionBuffer); sub_80A4720(sub_80A6D94(), (void*)(gDecompressionBuffer), 0x100, 0); dmaSrc = gDecompressionBuffer; - dmaDest = (void *)(VRAM + 0xD000); + dmaDest = (void *)(BG_SCREEN_ADDR(26)); DmaCopy32(3, dmaSrc, dmaDest, 0x800); - LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(VRAM + 0x2000)); + LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(BG_SCREEN_ADDR(4))); LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, sub_80A6D94() * 16, 32); } else { - LZDecompressVram(gBattleAnimBackgroundTable[bgId].tilemap, (void *)(VRAM + 0xD000)); + LZDecompressVram(gBattleAnimBackgroundTable[bgId].tilemap, (void *)(BG_SCREEN_ADDR(26))); LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(BG_CHAR_ADDR(2))); LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, 32, 32); } diff --git a/src/battle_bg.c b/src/battle_bg.c index 79618a151c..9ca0f8b846 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -721,25 +721,25 @@ void DrawMainBattleBackground(void) if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_x2000000)) { LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26))); LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60); } else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON) { LZDecompressVram(gBattleTerrainTiles_Cave, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Cave, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Cave, (void*)(BG_SCREEN_ADDR(26))); LoadCompressedPalette(gBattleTerrainPalette_Groudon, 0x20, 0x60); } else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE) { LZDecompressVram(gBattleTerrainTiles_Water, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Water, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Water, (void*)(BG_SCREEN_ADDR(26))); LoadCompressedPalette(gBattleTerrainPalette_Kyogre, 0x20, 0x60); } else if (gBattleTypeFlags & BATTLE_TYPE_RAYQUAZA) { LZDecompressVram(gBattleTerrainTiles_Rayquaza, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Rayquaza, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Rayquaza, (void*)(BG_SCREEN_ADDR(26))); LoadCompressedPalette(gBattleTerrainPalette_Rayquaza, 0x20, 0x60); } else @@ -750,14 +750,14 @@ void DrawMainBattleBackground(void) if (trainerClass == TRAINER_CLASS_LEADER) { LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26))); LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, 0x20, 0x60); return; } else if (trainerClass == TRAINER_CLASS_CHAMPION) { LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, 0x20, 0x60); return; } @@ -768,47 +768,47 @@ void DrawMainBattleBackground(void) default: case MAP_BATTLE_SCENE_NORMAL: LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tileset, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tilemap, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tilemap, (void*)(BG_SCREEN_ADDR(26))); LoadCompressedPalette(gBattleTerrainTable[gBattleTerrain].palette, 0x20, 0x60); break; case MAP_BATTLE_SCENE_GYM: LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26))); LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, 0x20, 0x60); break; case MAP_BATTLE_SCENE_MAGMA: LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, 0x20, 0x60); break; case MAP_BATTLE_SCENE_AQUA: LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, 0x20, 0x60); break; case MAP_BATTLE_SCENE_SIDNEY: LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, 0x20, 0x60); break; case MAP_BATTLE_SCENE_PHOEBE: LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, 0x20, 0x60); break; case MAP_BATTLE_SCENE_GLACIA: LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, 0x20, 0x60); break; case MAP_BATTLE_SCENE_DRAKE: LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, 0x20, 0x60); break; case MAP_BATTLE_SCENE_FRONTIER: LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26))); LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60); break; } @@ -1090,7 +1090,7 @@ void DrawBattleEntryBackground(void) if (gBattleTypeFlags & BATTLE_TYPE_LINK) { LZDecompressVram(gUnknown_08D778F0, (void*)(BG_CHAR_ADDR(1))); - LZDecompressVram(gUnknown_08D77B0C, (void*)(BG_SCREEN_ADDR(2)0)); + LZDecompressVram(gUnknown_08D77B0C, (void*)(VRAM + 0x10000)); LoadCompressedPalette(gUnknown_08D77AE4, 0x60, 0x20); SetBgAttribute(1, BG_ATTR_SCREENSIZE, 1); SetGpuReg(REG_OFFSET_BG1CNT, 0x5C04); @@ -1109,7 +1109,7 @@ void DrawBattleEntryBackground(void) if (!(gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) || gPartnerTrainerId == TRAINER_STEVEN_PARTNER) { LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(BG_CHAR_ADDR(1))); - LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000)); + LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(BG_SCREEN_ADDR(28))); } else { @@ -1124,17 +1124,17 @@ void DrawBattleEntryBackground(void) else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON) { LZDecompressVram(gBattleTerrainAnimTiles_Cave, (void*)(BG_CHAR_ADDR(1))); - LZDecompressVram(gBattleTerrainAnimTilemap_Cave, (void*)(VRAM + 0xE000)); + LZDecompressVram(gBattleTerrainAnimTilemap_Cave, (void*)(BG_SCREEN_ADDR(28))); } else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE) { LZDecompressVram(gBattleTerrainAnimTiles_Underwater, (void*)(BG_CHAR_ADDR(1))); - LZDecompressVram(gBattleTerrainAnimTilemap_Underwater, (void*)(VRAM + 0xE000)); + LZDecompressVram(gBattleTerrainAnimTilemap_Underwater, (void*)(BG_SCREEN_ADDR(28))); } else if (gBattleTypeFlags & BATTLE_TYPE_RAYQUAZA) { LZDecompressVram(gBattleTerrainAnimTiles_Rayquaza, (void*)(BG_CHAR_ADDR(1))); - LZDecompressVram(gBattleTerrainAnimTilemap_Rayquaza, (void*)(VRAM + 0xE000)); + LZDecompressVram(gBattleTerrainAnimTilemap_Rayquaza, (void*)(BG_SCREEN_ADDR(28))); } else { @@ -1144,13 +1144,13 @@ void DrawBattleEntryBackground(void) if (trainerClass == TRAINER_CLASS_LEADER) { LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(BG_CHAR_ADDR(1))); - LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000)); + LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(BG_SCREEN_ADDR(28))); return; } else if (trainerClass == TRAINER_CLASS_CHAMPION) { LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(BG_CHAR_ADDR(1))); - LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000)); + LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(BG_SCREEN_ADDR(28))); return; } } @@ -1158,12 +1158,12 @@ void DrawBattleEntryBackground(void) if (GetCurrentMapBattleScene() == MAP_BATTLE_SCENE_NORMAL) { LZDecompressVram(gBattleTerrainTable[gBattleTerrain].entryTileset, (void*)(BG_CHAR_ADDR(1))); - LZDecompressVram(gBattleTerrainTable[gBattleTerrain].entryTilemap, (void*)(VRAM + 0xE000)); + LZDecompressVram(gBattleTerrainTable[gBattleTerrain].entryTilemap, (void*)(BG_SCREEN_ADDR(28))); } else { LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(BG_CHAR_ADDR(1))); - LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000)); + LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(BG_SCREEN_ADDR(28))); } } } @@ -1246,14 +1246,14 @@ bool8 LoadChosenBattleElement(u8 caseId) case 4: if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER)) { - LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26))); } else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) { if (gGameVersion == VERSION_RUBY) - LZDecompressVram(gBattleTerrainTilemap_Cave, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Cave, (void*)(BG_SCREEN_ADDR(26))); else - LZDecompressVram(gBattleTerrainTilemap_Water, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Water, (void*)(BG_SCREEN_ADDR(26))); } else { @@ -1262,12 +1262,12 @@ bool8 LoadChosenBattleElement(u8 caseId) u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass; if (trainerClass == TRAINER_CLASS_LEADER) { - LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26))); break; } else if (trainerClass == TRAINER_CLASS_CHAMPION) { - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); break; } } @@ -1276,31 +1276,31 @@ bool8 LoadChosenBattleElement(u8 caseId) { default: case MAP_BATTLE_SCENE_NORMAL: - LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tilemap, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tilemap, (void*)(BG_SCREEN_ADDR(26))); break; case MAP_BATTLE_SCENE_GYM: - LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26))); break; case MAP_BATTLE_SCENE_MAGMA: - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); break; case MAP_BATTLE_SCENE_AQUA: - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); break; case MAP_BATTLE_SCENE_SIDNEY: - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); break; case MAP_BATTLE_SCENE_PHOEBE: - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); break; case MAP_BATTLE_SCENE_GLACIA: - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); break; case MAP_BATTLE_SCENE_DRAKE: - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); break; case MAP_BATTLE_SCENE_FRONTIER: - LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); + LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26))); break; } } diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 668bbf6637..7c6b743042 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -923,7 +923,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool8 notTransform } src = gMonSpritesGfxPtr->sprites[position]; - dst = (void *)(BG_SCREEN_ADDR(2)0 + gSprites[gBattlerSpriteIds[battlerAtk]].oam.tileNum * 32); + dst = (void *)(VRAM + 0x10000 + gSprites[gBattlerSpriteIds[battlerAtk]].oam.tileNum * 32); DmaCopy32(3, src, dst, 0x800); paletteOffset = 0x100 + battlerAtk * 16; lzPaletteData = GetFrontSpritePalFromSpeciesAndPersonality(targetSpecies, otId, personalityValue); diff --git a/src/berry_blender.c b/src/berry_blender.c index f2e3c7d14a..c85d0e8272 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -3104,7 +3104,7 @@ static void sub_8083170(u16 a0, u16 a1) s32 var1, var2, var3, var4; u16 *vram; - vram = (u16*)(VRAM + 0x6000); + vram = (u16*)(BG_SCREEN_ADDR(12)); var1 = (a0 * 64) / a1; var2 = var1 / 8; for (var4 = 0; var4 < var2; var4++) diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c index 72d0daf559..5ec90e10c2 100644 --- a/src/clear_save_data_screen.c +++ b/src/clear_save_data_screen.c @@ -153,7 +153,7 @@ static bool8 SetupClearSaveDataScreen(void) ((u16 *)(VRAM + 0x20))[i] = 0x1111; for (i = 0; i < 0x400; i++) - ((u16 *)(VRAM + 0xF000))[i] = 0x0001; + ((u16 *)(BG_SCREEN_ADDR(30)))[i] = 0x0001; ResetTasks(); ResetSpriteData(); ResetBgsAndClearDma3BusyFlags(0); diff --git a/src/contest.c b/src/contest.c index 5fb3f4dd5a..7be4aa23b5 100644 --- a/src/contest.c +++ b/src/contest.c @@ -318,7 +318,7 @@ void LoadContestBgAfterMoveAnim(void) s32 i; LZDecompressVram(gContestMiscGfx, (void *)VRAM); - LZDecompressVram(gContestAudienceGfx, (void *)(VRAM + 0x2000)); + LZDecompressVram(gContestAudienceGfx, (void *)(BG_SCREEN_ADDR(4))); CopyToBgTilemapBuffer(3, gUnknown_08C16FA8, 0, 0); CopyBgTilemapBufferToVram(3); LoadCompressedPalette(gUnknown_08C16E90, 0, 0x200); @@ -589,15 +589,15 @@ static u8 sub_80D7E44(u8 *a) case 0: gPaletteFade.bufferTransferDisabled = TRUE; RequestDma3Fill(0, (void *)VRAM, 0x8000, 1); - RequestDma3Fill(0, (void *)BG_CHAR_ADDR(2), 0x8000, 1); - RequestDma3Fill(0, (void *)BG_SCREEN_ADDR(2)0, 0x8000, 1); + RequestDma3Fill(0, (void *)VRAM + 0x8000, 0x8000, 1); + RequestDma3Fill(0, (void *)VRAM + 0x10000, 0x8000, 1); break; case 1: LZDecompressVram(gContestMiscGfx, (void *)VRAM); break; case 2: - LZDecompressVram(gContestAudienceGfx, (void *)(VRAM + 0x2000)); - DmaCopyLarge32(3, (void *)(VRAM + 0x2000), shared15800, 0x2000, 0x1000); + LZDecompressVram(gContestAudienceGfx, (void *)(BG_SCREEN_ADDR(4))); + DmaCopyLarge32(3, (void *)(BG_SCREEN_ADDR(4)), shared15800, 0x2000, 0x1000); break; case 3: CopyToBgTilemapBuffer(3, gUnknown_08C16FA8, 0, 0); @@ -3328,24 +3328,24 @@ static u8 sub_80DC9EC(u8 a) CopySpriteTiles(0, 3, (void *)VRAM, - (u16 *)(VRAM + 0xE000 + gUnknown_02039F26[a] * 5 * 64 + 0x26), + (u16 *)(BG_SCREEN_ADDR(28) + gUnknown_02039F26[a] * 5 * 64 + 0x26), gContestResources->field_34); CopySpriteTiles(0, 3, (void *)VRAM, - (u16 *)(VRAM + 0xE000 + gUnknown_02039F26[a] * 5 * 64 + 0x36), + (u16 *)(BG_SCREEN_ADDR(28) + gUnknown_02039F26[a] * 5 * 64 + 0x36), gContestResources->field_38); CpuFill32(0, gContestResources->field_34 + 0x500, 0x300); CpuFill32(0, gContestResources->field_38 + 0x500, 0x300); RequestDma3Copy(gContestResources->field_34, - (u8 *)(BG_SCREEN_ADDR(2)0 + gSprites[spriteId1].oam.tileNum * 32), + (u8 *)(VRAM + 0x10000 + gSprites[spriteId1].oam.tileNum * 32), 0x800, 1); RequestDma3Copy(gContestResources->field_38, - (u8 *)(BG_SCREEN_ADDR(2)0 + gSprites[spriteId2].oam.tileNum * 32), + (u8 *)(VRAM + 0x10000 + gSprites[spriteId2].oam.tileNum * 32), 0x800, 1); @@ -3870,8 +3870,8 @@ static void sub_80DD940(void) src = gContestApplauseMeterGfx + 64; else src = gContestApplauseMeterGfx; - CpuCopy32(src, (void *)(BG_SCREEN_ADDR(2)0 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 17 + i) * 32), 32); - CpuCopy32(src + 32, (void *)(BG_SCREEN_ADDR(2)0 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 25 + i) * 32), 32); + CpuCopy32(src, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 17 + i) * 32), 32); + CpuCopy32(src + 32, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 25 + i) * 32), 32); if (sContest.applauseLevel > 4) sub_80DDA20(); @@ -4027,11 +4027,11 @@ static void sub_80DDE30(u8 taskId) gTasks[taskId].data[10] = 0; if (gTasks[taskId].data[11] == 0) { - RequestDma3Copy(shared16800, (void *)(VRAM + 0x2000), 0x1000, 1); + RequestDma3Copy(shared16800, (void *)(BG_SCREEN_ADDR(4)), 0x1000, 1); } else { - RequestDma3Copy(shared15800, (void *)(VRAM + 0x2000), 0x1000, 1); + RequestDma3Copy(shared15800, (void *)(BG_SCREEN_ADDR(4)), 0x1000, 1); gTasks[taskId].data[12]++; } @@ -4120,7 +4120,7 @@ static void sub_80DE008(bool8 a) { if (sContestantStatus[i].turnOrderMod != 0 && a) { - CpuCopy32(GetTurnOrderNumberGfx(i), (void *)(BG_SCREEN_ADDR(2)0 + (gSprites[gContestResources->field_14[i].unk1].oam.tileNum + 6) * 32), 32); + CpuCopy32(GetTurnOrderNumberGfx(i), (void *)(VRAM + 0x10000 + (gSprites[gContestResources->field_14[i].unk1].oam.tileNum + 6) * 32), 32); gSprites[gContestResources->field_14[i].unk1].pos1.y = gUnknown_08587A70[gUnknown_02039F26[i]]; gSprites[gContestResources->field_14[i].unk1].invisible = FALSE; } diff --git a/src/contest_painting.c b/src/contest_painting.c index 71a110aa84..2f0c977642 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -554,7 +554,7 @@ static void sub_8130430(u8 arg0, u8 arg1) break; } -#define VRAM_PICTURE_DATA(x, y) (((u16 *)(VRAM + 0x6000))[(y) * 32 + (x)]) +#define VRAM_PICTURE_DATA(x, y) (((u16 *)(BG_SCREEN_ADDR(12)))[(y) * 32 + (x)]) // Set the background for (y = 0; y < 20; y++) @@ -579,7 +579,7 @@ static void sub_8130430(u8 arg0, u8 arg1) else if (arg0 < 8) { RLUnCompVram(gPictureFrameTiles_5, (void *)VRAM); - RLUnCompVram(gPictureFrameTilemap_5, (void *)(VRAM + 0x6000)); + RLUnCompVram(gPictureFrameTilemap_5, (void *)(BG_SCREEN_ADDR(12))); } else { @@ -587,23 +587,23 @@ static void sub_8130430(u8 arg0, u8 arg1) { case CONTEST_CATEGORY_COOL: RLUnCompVram(gPictureFrameTiles_0, (void *)VRAM); - RLUnCompVram(gPictureFrameTilemap_0, (void *)(VRAM + 0x6000)); + RLUnCompVram(gPictureFrameTilemap_0, (void *)(BG_SCREEN_ADDR(12))); break; case CONTEST_CATEGORY_BEAUTY: RLUnCompVram(gPictureFrameTiles_1, (void *)VRAM); - RLUnCompVram(gPictureFrameTilemap_1, (void *)(VRAM + 0x6000)); + RLUnCompVram(gPictureFrameTilemap_1, (void *)(BG_SCREEN_ADDR(12))); break; case CONTEST_CATEGORY_CUTE: RLUnCompVram(gPictureFrameTiles_2, (void *)VRAM); - RLUnCompVram(gPictureFrameTilemap_2, (void *)(VRAM + 0x6000)); + RLUnCompVram(gPictureFrameTilemap_2, (void *)(BG_SCREEN_ADDR(12))); break; case CONTEST_CATEGORY_SMART: RLUnCompVram(gPictureFrameTiles_3, (void *)VRAM); - RLUnCompVram(gPictureFrameTilemap_3, (void *)(VRAM + 0x6000)); + RLUnCompVram(gPictureFrameTilemap_3, (void *)(BG_SCREEN_ADDR(12))); break; case CONTEST_CATEGORY_TOUGH: RLUnCompVram(gPictureFrameTiles_4, (void *)VRAM); - RLUnCompVram(gPictureFrameTilemap_4, (void *)(VRAM + 0x6000)); + RLUnCompVram(gPictureFrameTilemap_4, (void *)(BG_SCREEN_ADDR(12))); break; } } diff --git a/src/credits.c b/src/credits.c index c96c6b4a18..aee5332f55 100644 --- a/src/credits.c +++ b/src/credits.c @@ -1343,7 +1343,7 @@ static void sub_81758E4(u8 taskIdA) FreeAllSpritePalettes(); gReservedSpritePaletteCount = 8; LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM); - LZ77UnCompVram(gBirchGrassTilemap, (void *)(VRAM + 0x3800)); + LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(7))); LoadPalette(gBirchBagGrassPal[0] + 1, 1, 31 * 2); for (i = 0; i < 0x800; i++) diff --git a/src/field_effect.c b/src/field_effect.c index 69c6a1b7d3..e7c0b39b92 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2953,7 +2953,7 @@ u8 sub_80B8F98(void) { for (j = 12; j < 18; j++) { - ((u16*)(VRAM + 0xF800))[i * 32 + j] = 0xBFF4 + i * 6 + j + 1; + ((u16*)(BG_SCREEN_ADDR(31)))[i * 32 + j] = 0xBFF4 + i * 6 + j + 1; } } for (k = 0; k < 90; k++) diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 53fd87e619..651b2baca4 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -1418,7 +1418,7 @@ void sub_8155F80(struct Sprite *sprite) { for (j = 12; j < 18; j++) { - ((u16*)(VRAM + 0xF800))[i * 32 + j] = 0xBFF4 + i * 6 + j + 1; + ((u16*)(BG_SCREEN_ADDR(31)))[i * 32 + j] = 0xBFF4 + i * 6 + j + 1; } } } @@ -1504,7 +1504,7 @@ void sub_8155F80(struct Sprite *sprite) { for (j = 12; j < 18; j++) { - ((u16*)(VRAM + 0xF800))[i * 32 + j] = 0; + ((u16*)(BG_SCREEN_ADDR(31)))[i * 32 + j] = 0; } } SetGpuReg(REG_OFFSET_BG0VOFS, 0); diff --git a/src/intro.c b/src/intro.c index 13ceced750..23457f3707 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1093,13 +1093,13 @@ static void Task_IntroLoadPart1Graphics(u8 taskId) SetGpuReg(REG_OFFSET_BG0VOFS, 0x28); LZ77UnCompVram(gIntro1BGLeavesGfx, (void *)VRAM); LZ77UnCompVram(gIntro1BG0_Tilemap, (void *)(BG_CHAR_ADDR(2))); - DmaClear16(3, VRAM + 0x8800, 0x800); - LZ77UnCompVram(gIntro1BG1_Tilemap, (void *)(VRAM + 0x9000)); - DmaClear16(3, VRAM + 0x9800, 0x800); - LZ77UnCompVram(gIntro1BG2_Tilemap, (void *)(VRAM + 0xA000)); - DmaClear16(3, VRAM + 0xA800, 0x800); - LZ77UnCompVram(gIntro1BG3_Tilemap, (void *)(VRAM + 0xB000)); - DmaClear16(3, VRAM + 0xB800, 0x800); + DmaClear16(3, BG_SCREEN_ADDR(17), 0x800); + LZ77UnCompVram(gIntro1BG1_Tilemap, (void *)(BG_SCREEN_ADDR(18))); + DmaClear16(3, BG_SCREEN_ADDR(19), 0x800); + LZ77UnCompVram(gIntro1BG2_Tilemap, (void *)(BG_SCREEN_ADDR(20))); + DmaClear16(3, BG_SCREEN_ADDR(21), 0x800); + LZ77UnCompVram(gIntro1BG3_Tilemap, (void *)(BG_SCREEN_ADDR(22))); + DmaClear16(3, BG_SCREEN_ADDR(23), 0x800); LoadPalette(gIntro1BGPals, 0, sizeof(gIntro1BGPals)); SetGpuReg(REG_OFFSET_BG3CNT, BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(22) | BGCNT_16COLOR | BGCNT_TXT256x512); SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(20) | BGCNT_16COLOR | BGCNT_TXT256x512); @@ -1603,7 +1603,7 @@ static void Task_IntroLoadGroudonScene(u8 taskId) LZDecompressVram(gIntro3GroudonGfx, (void *)VRAM); LZDecompressVram(gIntro3GroudonTilemap, (void *)(BG_CHAR_ADDR(3))); LZDecompressVram(gIntro3LegendBgGfx, (void *)(BG_CHAR_ADDR(1))); - LZDecompressVram(gIntro3GroudonBgTilemap, (void *)(VRAM + 0xE000)); + LZDecompressVram(gIntro3GroudonBgTilemap, (void *)(BG_SCREEN_ADDR(28))); LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_ROCKS)]); LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_ROCKS)]); CpuCopy16(gIntro3BgPal, gPlttBufferUnfaded, sizeof(gIntro3BgPal)); @@ -1825,7 +1825,7 @@ static void Task_IntroLoadKyogreScene(u8 taskId) ResetSpriteData(); LZDecompressVram(gIntro3KyogreGfx, (void *)VRAM); LZDecompressVram(gIntro3KyogreTilemap, (void *)(BG_CHAR_ADDR(3))); - LZDecompressVram(gIntro3KyogreBgTilemap, (void *)(VRAM + 0xE000)); + LZDecompressVram(gIntro3KyogreBgTilemap, (void *)(BG_SCREEN_ADDR(28))); LoadCompressedSpriteSheet(gUnknown_085E4C88); LoadSpritePalette(gUnknown_085E4C98); BeginNormalPaletteFade(0xFFFFFFFE, 0, 0x10, 0, RGB_WHITEALPHA); @@ -2088,14 +2088,14 @@ static void Task_IntroLoadClouds1(u8 taskId) SetGpuReg(REG_OFFSET_BG2VOFS, 0); LZDecompressVram(gIntro3CloudsGfx, (void *)VRAM); LZDecompressVram(gIntro3CloudsGfx, (void *)(BG_CHAR_ADDR(1))); - LZDecompressVram(gIntro3Clouds3Tilemap, (void *)(VRAM + 0xE000)); + LZDecompressVram(gIntro3Clouds3Tilemap, (void *)(BG_SCREEN_ADDR(28))); gTasks[taskId].func = Task_IntroLoadClouds2; } static void Task_IntroLoadClouds2(u8 taskId) { LZDecompressVram(gIntro3Clouds1Tilemap, (void *)(BG_CHAR_ADDR(3))); - LZDecompressVram(gIntro3Clouds2Tilemap, (void *)(VRAM + 0xD000)); + LZDecompressVram(gIntro3Clouds2Tilemap, (void *)(BG_SCREEN_ADDR(26))); gTasks[taskId].func = Task_IntroLoadClouds3; } @@ -2140,7 +2140,7 @@ static void Task_IntroCloudScene(u8 taskId) static void Task_IntroLoadRayquazaLightningScene(u8 taskId) { - LZDecompressVram(gIntro3RayquazaTilemap, (void *)(VRAM + 0xE000)); + LZDecompressVram(gIntro3RayquazaTilemap, (void *)(BG_SCREEN_ADDR(28))); LZDecompressVram(gIntro3Clouds4Tilemap, (void *)(BG_CHAR_ADDR(3))); LZDecompressVram(gIntro3RayquazaGfx, (void *)(BG_CHAR_ADDR(1))); LZDecompressVram(gIntro3Clouds2Gfx, (void *)VRAM); diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index 4489b64c39..b98708324c 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -332,14 +332,14 @@ static void sub_817B458(u8); void load_intro_part2_graphics(u8 a) { LZ77UnCompVram(gUnknown_085F0740, (void *)(BG_CHAR_ADDR(1))); - LZ77UnCompVram(gUnknown_085F0BC0, (void *)(VRAM + 0x7800)); + LZ77UnCompVram(gUnknown_085F0BC0, (void *)(BG_SCREEN_ADDR(15))); LoadPalette(&gUnknown_085F06E0, 240, 32); switch (a) { case 0: default: LZ77UnCompVram(gUnknown_085F0DBC, (void *)(VRAM)); - LZ77UnCompVram(gUnknown_085F1398, (void *)(VRAM + 0x3000)); + LZ77UnCompVram(gUnknown_085F1398, (void *)(BG_SCREEN_ADDR(6))); LoadPalette(&gUnknown_085F0CFC, 0, 96); LoadCompressedSpriteSheet(gUnknown_085F5064); LoadPalette(&gUnknown_085F1668, 256, 32); @@ -347,7 +347,7 @@ void load_intro_part2_graphics(u8 a) break; case 1: LZ77UnCompVram(gUnknown_085F1824, (void *)(VRAM)); - LZ77UnCompVram(gUnknown_085F1EAC, (void *)(VRAM + 0x3000)); + LZ77UnCompVram(gUnknown_085F1EAC, (void *)(BG_SCREEN_ADDR(6))); LoadPalette(&gUnknown_085F17E4, 0, 32); LoadCompressedSpriteSheet(gUnknown_085F50EC); LoadPalette(&gUnknown_085F21B0, 256, 32); @@ -439,27 +439,27 @@ void sub_817B150(u8 a) void sub_817B1C8(u8 a) { LZ77UnCompVram(gUnknown_085F0740, (void *)(BG_CHAR_ADDR(1))); - LZ77UnCompVram(gUnknown_085F0BC0, (void *)(VRAM + 0x7800)); + LZ77UnCompVram(gUnknown_085F0BC0, (void *)(BG_SCREEN_ADDR(15))); switch (a) { case 0: default: LoadPalette(&gUnknown_085F06E0, 240, 32); LZ77UnCompVram(gUnknown_085F0DBC, (void *)(VRAM)); - LZ77UnCompVram(gUnknown_085F1398, (void *)(VRAM + 0x3000)); + LZ77UnCompVram(gUnknown_085F1398, (void *)(BG_SCREEN_ADDR(6))); LoadPalette(&gUnknown_085F0CFC, 0, 96); LoadCompressedSpriteSheet(gUnknown_085F5064); - LZ77UnCompVram(gUnknown_085F16A8, (void *)(BG_SCREEN_ADDR(2)0)); + LZ77UnCompVram(gUnknown_085F16A8, (void *)(VRAM + 0x10000)); LoadPalette(&gUnknown_085F1668, 256, 32); sub_817B76C(); break; case 1: LoadPalette(&gUnknown_085F0700, 240, 32); LZ77UnCompVram(gUnknown_085F0DBC, (void *)(VRAM)); - LZ77UnCompVram(gUnknown_085F1398, (void *)(VRAM + 0x3000)); + LZ77UnCompVram(gUnknown_085F1398, (void *)(BG_SCREEN_ADDR(6))); LoadPalette(&gUnknown_085F0D5C, 0, 96); LoadCompressedSpriteSheet(gUnknown_085F5064); - LZ77UnCompVram(gUnknown_085F16A8, (void *)(BG_SCREEN_ADDR(2)0)); + LZ77UnCompVram(gUnknown_085F16A8, (void *)(VRAM + 0x10000)); LoadPalette(&gUnknown_085F1688, 256, 32); sub_817B76C(); break; @@ -467,7 +467,7 @@ void sub_817B1C8(u8 a) case 3: LoadPalette(&gUnknown_085F0700, 240, 32); LZ77UnCompVram(gUnknown_085F1824, (void *)(VRAM)); - LZ77UnCompVram(gUnknown_085F1EAC, (void *)(VRAM + 0x3000)); + LZ77UnCompVram(gUnknown_085F1EAC, (void *)(BG_SCREEN_ADDR(6))); LoadPalette(&gUnknown_085F1804, 0, 32); LoadCompressedSpriteSheet(gUnknown_085F50EC); LoadPalette(&gUnknown_085F1804, 256, 32); @@ -476,7 +476,7 @@ void sub_817B1C8(u8 a) case 4: LoadPalette(&gUnknown_085F0720, 240, 32); LZ77UnCompVram(gUnknown_085F235C, (void *)(VRAM)); - LZ77UnCompVram(gUnknown_085F2568, (void *)(VRAM + 0x3000)); + LZ77UnCompVram(gUnknown_085F2568, (void *)(BG_SCREEN_ADDR(6))); LoadPalette(&gUnknown_085F231C, 0, 64); LoadCompressedSpriteSheet(gUnknown_085F5180); LoadPalette(&gUnknown_085F2548, 256, 32); diff --git a/src/main_menu.c b/src/main_menu.c index 4cd5c8e14c..82a30aa598 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -1147,7 +1147,7 @@ static void Task_NewGameBirchSpeech_Init(u8 taskId) SetGpuReg(REG_OFFSET_BLDY, 0); LZ77UnCompVram(sBirchSpeechShadowGfx, (void*)VRAM); - LZ77UnCompVram(sBirchSpeechBgMap, (void*)(VRAM + 0x3800)); + LZ77UnCompVram(sBirchSpeechBgMap, (void*)(BG_SCREEN_ADDR(7))); LoadPalette(sBirchSpeechBgPals, 0, 64); LoadPalette(sBirchSpeechPlatformBlackPal, 1, 16); ScanlineEffect_Stop(); @@ -1687,7 +1687,7 @@ static void CB2_NewGameBirchSpeech_ReturnFromNamingScreen(void) DmaFill16(3, 0, PLTT, PLTT_SIZE); ResetPaletteFade(); LZ77UnCompVram(sBirchSpeechShadowGfx, (u8*)VRAM); - LZ77UnCompVram(sBirchSpeechBgMap, (u8*)(VRAM + 0x3800)); + LZ77UnCompVram(sBirchSpeechBgMap, (u8*)(BG_SCREEN_ADDR(7))); LoadPalette(sBirchSpeechBgPals, 0, 64); LoadPalette(&sBirchSpeechBgGradientPal[1], 1, 16); ResetTasks(); diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index c0aec4dddd..c1ebe91b47 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -3927,7 +3927,7 @@ static void SetScrollingBackground(void) { SetGpuReg(REG_OFFSET_BG3CNT, BGCNT_PRIORITY(3) | BGCNT_CHARBASE(3) | BGCNT_16COLOR | BGCNT_SCREENBASE(31)); DecompressAndLoadBgGfxUsingHeap(3, gPokemonStorageScrollingBGTileset, 0, 0, 0); - LZ77UnCompVram(gPokemonStorageScrollingBGTilemap, (void *)VRAM + 0xF800); + LZ77UnCompVram(gPokemonStorageScrollingBGTilemap, (void *)BG_SCREEN_ADDR(31)); } static void ScrollBackground(void) diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index c668c1db08..2478ebbec0 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -208,8 +208,8 @@ static void CB2_SaveFailedScreen(void) DmaFill32(3, 0, OAM, OAM_SIZE); DmaFill16(3, 0, PLTT, PLTT_SIZE); LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM); - LZ77UnCompVram(gBirchBagTilemap, (void *)(VRAM + 0x7000)); - LZ77UnCompVram(gBirchGrassTilemap, (void *)(VRAM + 0x7800)); + LZ77UnCompVram(gBirchBagTilemap, (void *)(BG_SCREEN_ADDR(14))); + LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(15))); LZ77UnCompVram(sSaveFailedClockGfx, (void *)(VRAM + 0x10020)); ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, gUnknown_085EFD88, 3); diff --git a/src/starter_choose.c b/src/starter_choose.c index 2d4a1b1e1c..5a8de3b4ac 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -393,8 +393,8 @@ void CB2_ChooseStarter(void) DmaFill16(3, 0, PLTT, PLTT_SIZE); LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM); - LZ77UnCompVram(gBirchBagTilemap, (void *)(VRAM + 0x3000)); - LZ77UnCompVram(gBirchGrassTilemap, (void *)(VRAM + 0x3800)); + LZ77UnCompVram(gBirchBagTilemap, (void *)(BG_SCREEN_ADDR(6))); + LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(7))); ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, gUnknown_085B1E00, ARRAY_COUNT(gUnknown_085B1E00)); diff --git a/src/title_screen.c b/src/title_screen.c index 6e3ba45cfc..ca34f90f85 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -507,12 +507,12 @@ void CB2_InitTitleScreen(void) break; case 1: LZ77UnCompVram(gTitleScreenPokemonLogoGfx, (void *)VRAM); - LZ77UnCompVram(gUnknown_08DE0644, (void *)(VRAM + 0x4800)); + LZ77UnCompVram(gUnknown_08DE0644, (void *)(BG_SCREEN_ADDR(9))); LoadPalette(gTitleScreenBgPalettes, 0, 0x1E0); LZ77UnCompVram(sTitleScreenRayquazaGfx, (void *)(BG_CHAR_ADDR(2))); - LZ77UnCompVram(sTitleScreenRayquazaTilemap, (void *)(VRAM + 0xD000)); + LZ77UnCompVram(sTitleScreenRayquazaTilemap, (void *)(BG_SCREEN_ADDR(26))); LZ77UnCompVram(sTitleScreenCloudsGfx, (void *)(BG_CHAR_ADDR(3))); - LZ77UnCompVram(gUnknown_08DDE458, (void *)(VRAM + 0xD800)); + LZ77UnCompVram(gUnknown_08DDE458, (void *)(BG_SCREEN_ADDR(27))); ScanlineEffect_Stop(); ResetTasks(); ResetSpriteData(); From 698c2879e4d29d78b10f47718fcf99de1b0c2ee4 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 11 Feb 2019 14:59:44 -0500 Subject: [PATCH 050/217] Decompiled sub_81C7078 --- asm/pokenav.s | 43 +-------------- ld_script.txt | 1 + src/pokenav_main.c | 134 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 136 insertions(+), 42 deletions(-) create mode 100644 src/pokenav_main.c diff --git a/asm/pokenav.s b/asm/pokenav.s index 40ce730ea1..f6f2b69b65 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -7,48 +7,7 @@ - thumb_func_start sub_81C7078 -sub_81C7078: @ 81C7078 - push {r4,r5,lr} - adds r5, r0, 0 - adds r4, r1, 0 - bl is_c1_link_related_active - cmp r0, 0 - bne _081C7090 - ldr r0, =sub_81C7170 - b _081C7092 - .pool -_081C7090: - ldr r0, =sub_81C71E4 -_081C7092: - lsls r1, r4, 24 - lsrs r1, 24 - bl CreateTask - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r4, 0 - movs r1, 0x1 - adds r2, r5, 0 - bl SetWordTaskArg - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r2, =gUnknown_0203CF3C - ldrb r1, [r2] - strh r1, [r0, 0xE] - ldrb r0, [r2] - adds r1, r0, 0x1 - strb r1, [r2] - lsls r0, 24 - lsrs r0, 8 - orrs r0, r4 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81C7078 + thumb_func_start sub_81C70D8 sub_81C70D8: @ 81C70D8 diff --git a/ld_script.txt b/ld_script.txt index 306a1f4b07..a92e1d85e6 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -289,6 +289,7 @@ SECTIONS { src/pokemon_summary_screen.o(.text); src/unk_pokedex_area_screen_helper.o(.text); src/battle_pyramid_bag.o(.text); + src/pokenav_main.o(.text); asm/pokenav.o(.text); src/pokenav_match_call.o(.text); asm/rom_81D1C44.o(.text); diff --git a/src/pokenav_main.c b/src/pokenav_main.c new file mode 100644 index 0000000000..fd8e513184 --- /dev/null +++ b/src/pokenav_main.c @@ -0,0 +1,134 @@ +#include "global.h" +#include "alloc.h" +#include "task.h" +#include "main.h" +#include "overworld.h" + +/* + + thumb_func_start CB2_PokeNav +CB2_PokeNav: @ 81C7250 + push {r4,lr} + ldr r4, =gUnknown_0203CF40 + movs r0, 0x5C + bl Alloc + str r0, [r4] + cmp r0, 0 + bne _081C7270 + ldr r0, =CB2_ReturnToFieldWithOpenMenu + bl SetMainCallback2 + b _081C7292 + .pool +_081C7270: + bl sub_81C7360 + bl ResetTasks + movs r0, 0 + bl SetVBlankCallback + ldr r0, =sub_81C742C + movs r1, 0 + bl CreateTask + ldr r0, =sub_81C7400 + bl SetMainCallback2 + ldr r0, =sub_81C7418 + bl SetVBlankCallback +_081C7292: + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end CB2_PokeNav + +*/ + +extern u8* gUnknown_0203CF40; +extern void sub_81C7360(void); +extern void sub_81C742C(u8 taskId); +extern void sub_81C7400(void); +extern void sub_81C7418(void); + +/* +void CB2_PokeNav(void) +{ + gUnknown_0203CF40 = Alloc(0x5C); + if (gUnknown_0203CF40 == NULL) { + SetMainCallback2(CB2_ReturnToFieldWithOpenMenu); + } else { + sub_81C7360(); + ResetTasks(); + SetVBlankCallback(NULL); + CreateTask(sub_81C742C, 0); + SetMainCallback2(sub_81C7400); + SetVBlankCallback(sub_81C7418); + } +}*/ + +/* +thumb_func_start sub_81C7078 +sub_81C7078: @ 81C7078 + push {r4,r5,lr} + adds r5, r0, 0 + adds r4, r1, 0 + bl is_c1_link_related_active + cmp r0, 0 + bne _081C7090 + ldr r0, =sub_81C7170 + b _081C7092 + .pool +_081C7090: + ldr r0, =sub_81C71E4 +_081C7092: + lsls r1, r4, 24 + lsrs r1, 24 + bl CreateTask + lsls r0, 24 + lsrs r4, r0, 24 + adds r0, r4, 0 + movs r1, 0x1 + adds r2, r5, 0 + bl SetWordTaskArg + ldr r1, =gTasks + lsls r0, r4, 2 + adds r0, r4 + lsls r0, 3 + adds r0, r1 + ldr r2, =gUnknown_0203CF3C + ldrb r1, [r2] + strh r1, [r0, 0xE] + ldrb r0, [r2] + adds r1, r0, 0x1 + strb r1, [r2] + lsls r0, 24 + lsrs r0, 8 + orrs r0, r4 + pop {r4,r5} + pop {r1} + bx r1 + .pool + thumb_func_end sub_81C7078 + */ + +extern u8 gUnknown_0203CF3C; +extern void sub_81C7170(u8 a0); +extern void sub_81C71E4(u8 a0); + +u32 sub_81C7078(s32 a0, u32 a1) +{ + u16 taskId; + u32 old; + + if (is_c1_link_related_active() == FALSE) + taskId = CreateTask(sub_81C7170, a1); + else + taskId = CreateTask(sub_81C71E4, a1); + + //taskId = CreateTask(temp, a1); + + SetWordTaskArg(taskId, 1, a0); + + gTasks[taskId].data[3] = gUnknown_0203CF3C; + //old = gUnknown_0203CF3C; + //gUnknown_0203CF3C = old + 1; + return ((gUnknown_0203CF3C++) << 16) | taskId; +} + +// nonce \ No newline at end of file From 052cd4da10355a0b85372c4e6aeaaadc07383d48 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 11 Feb 2019 16:06:46 -0500 Subject: [PATCH 051/217] Decompiled sub_81C70D8 --- asm/pokenav.s | 36 ------------------------- src/pokenav_main.c | 66 ++++++++++------------------------------------ 2 files changed, 14 insertions(+), 88 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index f6f2b69b65..41644ebccc 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -9,42 +9,6 @@ - thumb_func_start sub_81C70D8 -sub_81C70D8: @ 81C70D8 - push {lr} - ldr r1, =0x0000ffff - ands r1, r0 - lsrs r3, r0, 16 - ldr r2, =gTasks - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r1, r0, r2 - ldrb r0, [r1, 0x4] - cmp r0, 0 - beq _081C711C - ldr r2, [r1] - ldr r0, =sub_81C7170 - cmp r2, r0 - beq _081C70FE - ldr r0, =sub_81C71E4 - cmp r2, r0 - bne _081C711C -_081C70FE: - movs r2, 0xE - ldrsh r0, [r1, r2] - cmp r0, r3 - bne _081C711C - movs r0, 0x1 - b _081C711E - .pool -_081C711C: - movs r0, 0 -_081C711E: - pop {r1} - bx r1 - thumb_func_end sub_81C70D8 - thumb_func_start sub_81C7124 sub_81C7124: @ 81C7124 push {r4-r6,lr} diff --git a/src/pokenav_main.c b/src/pokenav_main.c index fd8e513184..fc45b9406b 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -62,51 +62,6 @@ void CB2_PokeNav(void) } }*/ -/* -thumb_func_start sub_81C7078 -sub_81C7078: @ 81C7078 - push {r4,r5,lr} - adds r5, r0, 0 - adds r4, r1, 0 - bl is_c1_link_related_active - cmp r0, 0 - bne _081C7090 - ldr r0, =sub_81C7170 - b _081C7092 - .pool -_081C7090: - ldr r0, =sub_81C71E4 -_081C7092: - lsls r1, r4, 24 - lsrs r1, 24 - bl CreateTask - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r4, 0 - movs r1, 0x1 - adds r2, r5, 0 - bl SetWordTaskArg - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r2, =gUnknown_0203CF3C - ldrb r1, [r2] - strh r1, [r0, 0xE] - ldrb r0, [r2] - adds r1, r0, 0x1 - strb r1, [r2] - lsls r0, 24 - lsrs r0, 8 - orrs r0, r4 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81C7078 - */ - extern u8 gUnknown_0203CF3C; extern void sub_81C7170(u8 a0); extern void sub_81C71E4(u8 a0); @@ -114,21 +69,28 @@ extern void sub_81C71E4(u8 a0); u32 sub_81C7078(s32 a0, u32 a1) { u16 taskId; - u32 old; - if (is_c1_link_related_active() == FALSE) + if (!is_c1_link_related_active()) taskId = CreateTask(sub_81C7170, a1); else taskId = CreateTask(sub_81C71E4, a1); - //taskId = CreateTask(temp, a1); - SetWordTaskArg(taskId, 1, a0); gTasks[taskId].data[3] = gUnknown_0203CF3C; - //old = gUnknown_0203CF3C; - //gUnknown_0203CF3C = old + 1; return ((gUnknown_0203CF3C++) << 16) | taskId; } -// nonce \ No newline at end of file +bool32 sub_81C70D8(u32 a0, u32 unused) { + u32 v1 = a0 & 0xFFFF; + u32 v2 = a0 >> 16; + if (gTasks[v1].isActive + && (gTasks[v1].func == sub_81C7170 || gTasks[v1].func == sub_81C71E4) + && gTasks[v1].data[3] == v2) { + + return TRUE; + } else { + return FALSE; + } +} + From 6466d0bea8e743f8dbba0b2d0bc2e4bce60ea501 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 11 Feb 2019 16:35:02 -0500 Subject: [PATCH 052/217] Decompiled sub_81C7124 --- asm/pokenav.s | 43 ------------------------------------------- src/pokenav_main.c | 25 ++++++++++++++++++++++--- 2 files changed, 22 insertions(+), 46 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 41644ebccc..db18b89a73 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -4,49 +4,6 @@ .syntax unified .text - - - - - - thumb_func_start sub_81C7124 -sub_81C7124: @ 81C7124 - push {r4-r6,lr} - adds r6, r0, 0 - movs r5, 0 - ldr r4, =gTasks -_081C712C: - ldrb r0, [r4, 0x4] - cmp r0, 0 - beq _081C7160 - ldr r1, [r4] - ldr r0, =sub_81C7170 - cmp r1, r0 - beq _081C7140 - ldr r0, =sub_81C71E4 - cmp r1, r0 - bne _081C7160 -_081C7140: - lsls r0, r5, 24 - lsrs r0, 24 - movs r1, 0x1 - bl GetWordTaskArg - cmp r0, r6 - bne _081C7160 - movs r0, 0x1 - b _081C716A - .pool -_081C7160: - adds r4, 0x28 - adds r5, 0x1 - cmp r5, 0xF - ble _081C712C - movs r0, 0 -_081C716A: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_81C7124 thumb_func_start sub_81C7170 sub_81C7170: @ 81C7170 diff --git a/src/pokenav_main.c b/src/pokenav_main.c index fc45b9406b..2d5144a7f2 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -81,16 +81,35 @@ u32 sub_81C7078(s32 a0, u32 a1) return ((gUnknown_0203CF3C++) << 16) | taskId; } -bool32 sub_81C70D8(u32 a0, u32 unused) { +bool32 sub_81C70D8(u32 a0, u32 unused) +{ u32 v1 = a0 & 0xFFFF; u32 v2 = a0 >> 16; if (gTasks[v1].isActive && (gTasks[v1].func == sub_81C7170 || gTasks[v1].func == sub_81C71E4) - && gTasks[v1].data[3] == v2) { + && gTasks[v1].data[3] == v2) + { return TRUE; - } else { + } + else + { return FALSE; } } +bool32 sub_81C7124(u32 a0) +{ + s32 i; + for (i = 0; i < 16; i++) { + if (gTasks[i].isActive + && (gTasks[i].func == sub_81C7170 || gTasks[i].func == sub_81C71E4)) + { + u32 arg = GetWordTaskArg((u8)i, 1); + if (arg == a0) { + return TRUE; + } + } + } + return FALSE; +} \ No newline at end of file From fb705e604743f30983145a184472570fdc42fe35 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Feb 2019 00:51:54 -0500 Subject: [PATCH 053/217] Decompiled sub_81C7170. --- asm/pokenav.s | 60 ---------------------------------------------- src/pokenav_main.c | 36 ++++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 62 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index db18b89a73..9568a9fee6 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,66 +5,6 @@ .text - thumb_func_start sub_81C7170 -sub_81C7170: @ 81C7170 - push {r4-r7,lr} - lsls r0, 24 - lsrs r5, r0, 24 - adds r0, r5, 0 - movs r1, 0x1 - bl GetWordTaskArg - adds r6, r0, 0 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r4, r0, r1 - movs r7, 0 -_081C718C: - movs r1, 0 - ldrsh r0, [r4, r1] - bl _call_via_r6 - cmp r0, 0x4 - bhi _081C71D6 - lsls r0, 2 - ldr r1, =_081C71AC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_081C71AC: - .4byte _081C71C6 - .4byte _081C71C0 - .4byte _081C71DE - .4byte _081C71DA - .4byte _081C71CE -_081C71C0: - ldrh r0, [r4] - adds r0, 0x1 - b _081C71D8 -_081C71C6: - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - b _081C71DE -_081C71CE: - adds r0, r5, 0 - bl DestroyTask - b _081C71DE -_081C71D6: - subs r0, 0x5 -_081C71D8: - strh r0, [r4] -_081C71DA: - cmp r7, 0 - beq _081C718C -_081C71DE: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81C7170 - thumb_func_start sub_81C71E4 sub_81C71E4: @ 81C71E4 push {r4,r5,lr} diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 2d5144a7f2..4791cbc25e 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -66,7 +66,7 @@ extern u8 gUnknown_0203CF3C; extern void sub_81C7170(u8 a0); extern void sub_81C71E4(u8 a0); -u32 sub_81C7078(s32 a0, u32 a1) +u32 sub_81C7078(u32 (*a0)(u32), u32 a1) { u16 taskId; @@ -75,7 +75,7 @@ u32 sub_81C7078(s32 a0, u32 a1) else taskId = CreateTask(sub_81C71E4, a1); - SetWordTaskArg(taskId, 1, a0); + SetWordTaskArg(taskId, 1, (u32)a0); gTasks[taskId].data[3] = gUnknown_0203CF3C; return ((gUnknown_0203CF3C++) << 16) | taskId; @@ -112,4 +112,36 @@ bool32 sub_81C7124(u32 a0) } } return FALSE; +} + +void sub_81C7170(u8 taskId) +{ + s16 *dataPtr; + u32 (*func)(u32); + bool32 exitLoop; + + func = (u32 (*)(u32))GetWordTaskArg(taskId, 1); + dataPtr = gTasks[taskId].data; + exitLoop = FALSE; + while (!exitLoop) { + u32 v1 =((u32 (*)(u32))func)(dataPtr[0]); + switch (v1) { + case 1: + dataPtr[0] = dataPtr[0] + 1; + break; + case 0: + dataPtr[0]++; + return; + case 4: + DestroyTask(taskId); + return; + default: + dataPtr[0] = v1 - 5; + break; + case 3: + break; + case 2: + return; + } + } } \ No newline at end of file From 69b014f7aa9da2e61d158b33806bcdfce1fb95a0 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Feb 2019 01:30:39 -0500 Subject: [PATCH 054/217] Decompiled sub_81C71E4 --- asm/pokenav.s | 53 ---------------------------------------------- src/pokenav_main.c | 27 +++++++++++++++++++++++ 2 files changed, 27 insertions(+), 53 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 9568a9fee6..84d3c4b2b7 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,59 +5,6 @@ .text - thumb_func_start sub_81C71E4 -sub_81C71E4: @ 81C71E4 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - bl sub_8087598 - cmp r0, 0 - bne _081C724A - adds r0, r5, 0 - movs r1, 0x1 - bl GetWordTaskArg - adds r2, r0, 0 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r4, r0, r1 - movs r1, 0 - ldrsh r0, [r4, r1] - bl _call_via_r2 - cmp r0, 0x4 - bhi _081C7246 - lsls r0, 2 - ldr r1, =_081C7224 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_081C7224: - .4byte _081C7238 - .4byte _081C7238 - .4byte _081C724A - .4byte _081C724A - .4byte _081C723E -_081C7238: - ldrh r0, [r4] - adds r0, 0x1 - b _081C7248 -_081C723E: - adds r0, r5, 0 - bl DestroyTask - b _081C724A -_081C7246: - subs r0, 0x5 -_081C7248: - strh r0, [r4] -_081C724A: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_81C71E4 - thumb_func_start CB2_PokeNav CB2_PokeNav: @ 81C7250 push {r4,lr} diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 4791cbc25e..06d599f99c 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -144,4 +144,31 @@ void sub_81C7170(u8 taskId) return; } } +} + +void sub_81C71E4(u8 taskId) { + u32 (*func)(u32); + s16 *data; + u32 v1; + + if (sub_8087598()) { + return; + } + func = (u32 (*)(u32))GetWordTaskArg(taskId, 1); + data = gTasks[taskId].data; + v1 = func(data[0]); + switch (v1) { + case 0: + case 1: + data[0]++; + break; + case 4: + DestroyTask(taskId); + break; + default: + data[0] = v1 - 5; + break; + case 2: + case 3: + } } \ No newline at end of file From cd84c92cfa67fc1afc1e03795fbf390e546a7482 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Feb 2019 01:34:43 -0500 Subject: [PATCH 055/217] Decompiled CB2_PokeNav --- asm/pokenav.s | 32 -------------------------------- src/pokenav_main.c | 31 ++++++++++++++++--------------- 2 files changed, 16 insertions(+), 47 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 84d3c4b2b7..92cde018a8 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,38 +5,6 @@ .text - thumb_func_start CB2_PokeNav -CB2_PokeNav: @ 81C7250 - push {r4,lr} - ldr r4, =gUnknown_0203CF40 - movs r0, 0x5C - bl Alloc - str r0, [r4] - cmp r0, 0 - bne _081C7270 - ldr r0, =CB2_ReturnToFieldWithOpenMenu - bl SetMainCallback2 - b _081C7292 - .pool -_081C7270: - bl sub_81C7360 - bl ResetTasks - movs r0, 0 - bl SetVBlankCallback - ldr r0, =sub_81C742C - movs r1, 0 - bl CreateTask - ldr r0, =sub_81C7400 - bl SetMainCallback2 - ldr r0, =sub_81C7418 - bl SetVBlankCallback -_081C7292: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end CB2_PokeNav - thumb_func_start sub_81C72A4 sub_81C72A4: @ 81C72A4 push {lr} diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 06d599f99c..437ca009f4 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -46,21 +46,7 @@ extern void sub_81C742C(u8 taskId); extern void sub_81C7400(void); extern void sub_81C7418(void); -/* -void CB2_PokeNav(void) -{ - gUnknown_0203CF40 = Alloc(0x5C); - if (gUnknown_0203CF40 == NULL) { - SetMainCallback2(CB2_ReturnToFieldWithOpenMenu); - } else { - sub_81C7360(); - ResetTasks(); - SetVBlankCallback(NULL); - CreateTask(sub_81C742C, 0); - SetMainCallback2(sub_81C7400); - SetVBlankCallback(sub_81C7418); - } -}*/ + extern u8 gUnknown_0203CF3C; extern void sub_81C7170(u8 a0); @@ -171,4 +157,19 @@ void sub_81C71E4(u8 taskId) { case 2: case 3: } +} + +void CB2_PokeNav(void) +{ + gUnknown_0203CF40 = Alloc(0x5C); + if (gUnknown_0203CF40 == NULL) { + SetMainCallback2(CB2_ReturnToFieldWithOpenMenu); + } else { + sub_81C7360(); + ResetTasks(); + SetVBlankCallback(NULL); + CreateTask(sub_81C742C, 0); + SetMainCallback2(sub_81C7400); + SetVBlankCallback(sub_81C7418); + } } \ No newline at end of file From 9bda2297e36bd4aa476326310d85ea26c9beeb7c Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Feb 2019 01:39:27 -0500 Subject: [PATCH 056/217] Decompiled sub_81C72A4 --- asm/pokenav.s | 12 ------------ src/pokenav_main.c | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 92cde018a8..64439e890a 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,18 +5,6 @@ .text - thumb_func_start sub_81C72A4 -sub_81C72A4: @ 81C72A4 - push {lr} - ldr r0, =sub_81C72BC - bl SetMainCallback2 - movs r0, 0x1 - movs r1, 0 - bl FadeScreen - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C72A4 thumb_func_start sub_81C72BC sub_81C72BC: @ 81C72BC diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 437ca009f4..13b6331a5e 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -3,6 +3,7 @@ #include "task.h" #include "main.h" #include "overworld.h" +#include "field_weather.h" /* @@ -172,4 +173,26 @@ void CB2_PokeNav(void) SetMainCallback2(sub_81C7400); SetVBlankCallback(sub_81C7418); } +} + +/* + thumb_func_start sub_81C72A4 +sub_81C72A4: @ 81C72A4 + push {lr} + ldr r0, =sub_81C72BC + bl SetMainCallback2 + movs r0, 0x1 + movs r1, 0 + bl FadeScreen + pop {r0} + bx r0 + .pool + thumb_func_end sub_81C72A4 +*/ + +extern void sub_81C72BC(void); + +void sub_81C72A4() { + SetMainCallback2(sub_81C72BC); + FadeScreen(1, 0); } \ No newline at end of file From d52cbe6bcb7777547ba1dc0c3e58c9d72aff4338 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Feb 2019 02:23:08 -0500 Subject: [PATCH 057/217] Decompiled sub_81C72BC --- asm/pokenav.s | 45 ----------------------- src/pokenav_main.c | 90 +++++++++++++++++----------------------------- 2 files changed, 33 insertions(+), 102 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 64439e890a..dbe58020a2 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,51 +5,6 @@ .text - - thumb_func_start sub_81C72BC -sub_81C72BC: @ 81C72BC - push {r4,lr} - bl UpdatePaletteFade - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081C7320 - ldr r4, =gUnknown_0203CF40 - movs r0, 0x5C - bl Alloc - str r0, [r4] - cmp r0, 0 - bne _081C72F0 - ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic - bl SetMainCallback2 - b _081C7320 - .pool -_081C72F0: - bl sub_81C7360 - ldr r1, [r4] - movs r0, 0x1 - strh r0, [r1, 0x8] - bl ResetTasks - bl ResetSpriteData - bl FreeAllSpritePalettes - movs r0, 0 - bl SetVBlankCallback - ldr r0, =sub_81C742C - movs r1, 0 - bl CreateTask - ldr r0, =sub_81C7400 - bl SetMainCallback2 - ldr r0, =sub_81C7418 - bl SetVBlankCallback -_081C7320: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C72BC - thumb_func_start sub_81C7334 sub_81C7334: @ 81C7334 push {r4,lr} diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 13b6331a5e..0712b95d5e 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -4,55 +4,28 @@ #include "main.h" #include "overworld.h" #include "field_weather.h" +#include "palette.h" -/* +// Can confirm the size is correct on line 287 of the generated pokenav_main.s +// file. The expected size is 0x5C. +struct UnknownStruct_0203CF40 { + u8 data1[8]; + u16 field_0; + u8 data[0x52]; +}; - thumb_func_start CB2_PokeNav -CB2_PokeNav: @ 81C7250 - push {r4,lr} - ldr r4, =gUnknown_0203CF40 - movs r0, 0x5C - bl Alloc - str r0, [r4] - cmp r0, 0 - bne _081C7270 - ldr r0, =CB2_ReturnToFieldWithOpenMenu - bl SetMainCallback2 - b _081C7292 - .pool -_081C7270: - bl sub_81C7360 - bl ResetTasks - movs r0, 0 - bl SetVBlankCallback - ldr r0, =sub_81C742C - movs r1, 0 - bl CreateTask - ldr r0, =sub_81C7400 - bl SetMainCallback2 - ldr r0, =sub_81C7418 - bl SetVBlankCallback -_081C7292: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end CB2_PokeNav +extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40; +extern u8 gUnknown_0203CF3C; -*/ - -extern u8* gUnknown_0203CF40; extern void sub_81C7360(void); extern void sub_81C742C(u8 taskId); extern void sub_81C7400(void); extern void sub_81C7418(void); - - - -extern u8 gUnknown_0203CF3C; extern void sub_81C7170(u8 a0); extern void sub_81C71E4(u8 a0); +void sub_81C72BC(void); + u32 sub_81C7078(u32 (*a0)(u32), u32 a1) { u16 taskId; @@ -162,7 +135,7 @@ void sub_81C71E4(u8 taskId) { void CB2_PokeNav(void) { - gUnknown_0203CF40 = Alloc(0x5C); + gUnknown_0203CF40 = Alloc(sizeof(struct UnknownStruct_0203CF40)); if (gUnknown_0203CF40 == NULL) { SetMainCallback2(CB2_ReturnToFieldWithOpenMenu); } else { @@ -175,24 +148,27 @@ void CB2_PokeNav(void) } } -/* - thumb_func_start sub_81C72A4 -sub_81C72A4: @ 81C72A4 - push {lr} - ldr r0, =sub_81C72BC - bl SetMainCallback2 - movs r0, 0x1 - movs r1, 0 - bl FadeScreen - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C72A4 -*/ - -extern void sub_81C72BC(void); - void sub_81C72A4() { SetMainCallback2(sub_81C72BC); FadeScreen(1, 0); +} + +void sub_81C72BC() { + UpdatePaletteFade(); + if (!gPaletteFade.active) { + gUnknown_0203CF40 = Alloc(sizeof(struct UnknownStruct_0203CF40)); + if (gUnknown_0203CF40 == NULL) { + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); + } else { + sub_81C7360(); + gUnknown_0203CF40->field_0 = 1; + ResetTasks(); + ResetSpriteData(); + FreeAllSpritePalettes(); + SetVBlankCallback(NULL); + CreateTask(sub_81C742C, 0); + SetMainCallback2(sub_81C7400); + SetVBlankCallback(sub_81C7418); + } + } } \ No newline at end of file From aa61e105e0053af11826de510e93974d8443831d Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Feb 2019 02:28:46 -0500 Subject: [PATCH 058/217] Decompiled sub_81C7334 --- asm/pokenav.s | 22 ---------------------- src/pokenav_main.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index dbe58020a2..7a878c373a 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,28 +5,6 @@ .text - thumb_func_start sub_81C7334 -sub_81C7334: @ 81C7334 - push {r4,lr} - movs r4, 0 -_081C7338: - adds r0, r4, 0 - bl sub_81C7650 - adds r4, 0x1 - cmp r4, 0x12 - ble _081C7338 - ldr r4, =gUnknown_0203CF40 - ldr r0, [r4] - bl Free - movs r0, 0 - str r0, [r4] - bl InitKeys - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C7334 - thumb_func_start sub_81C7360 sub_81C7360: @ 81C7360 push {r4,r5,lr} diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 0712b95d5e..f1973ea156 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -23,6 +23,7 @@ extern void sub_81C7400(void); extern void sub_81C7418(void); extern void sub_81C7170(u8 a0); extern void sub_81C71E4(u8 a0); +extern void sub_81C7650(s32 a0); void sub_81C72BC(void); @@ -171,4 +172,15 @@ void sub_81C72BC() { SetVBlankCallback(sub_81C7418); } } +} + +void sub_81C7334() { + s32 i; + for (i = 0; i < 19; i++) { + sub_81C7650(i); + } + + Free(gUnknown_0203CF40); + gUnknown_0203CF40 = NULL; + InitKeys(); } \ No newline at end of file From 5441d80ebc694e56b080d9f280b974ff50eed1fb Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Feb 2019 02:59:17 -0500 Subject: [PATCH 059/217] Decompiled sub_81C7360 --- asm/pokenav.s | 24 ------------------------ src/pokenav_main.c | 39 ++++++++++++++++++++++++++++++--------- 2 files changed, 30 insertions(+), 33 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 7a878c373a..77e826bde5 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,30 +5,6 @@ .text - thumb_func_start sub_81C7360 -sub_81C7360: @ 81C7360 - push {r4,r5,lr} - adds r5, r0, 0 - movs r2, 0 - movs r1, 0x12 - adds r0, 0x58 -_081C736A: - str r2, [r0] - subs r0, 0x4 - subs r1, 0x1 - cmp r1, 0 - bge _081C736A - movs r4, 0 - strh r4, [r5, 0x8] - str r4, [r5, 0x4] - bl sub_81C7388 - str r0, [r5, 0xC] - str r4, [r5] - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_81C7360 - thumb_func_start sub_81C7388 sub_81C7388: @ 81C7388 push {r4-r6,lr} diff --git a/src/pokenav_main.c b/src/pokenav_main.c index f1973ea156..3f6f8eb5cf 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -6,26 +6,28 @@ #include "field_weather.h" #include "palette.h" -// Can confirm the size is correct on line 287 of the generated pokenav_main.s -// file. The expected size is 0x5C. struct UnknownStruct_0203CF40 { - u8 data1[8]; - u16 field_0; - u8 data[0x52]; + u32 field_0; + u32 field_1; + u16 field_2; + u32 field_3; + u32 field_4; + u32 field_5[18]; }; extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40; extern u8 gUnknown_0203CF3C; -extern void sub_81C7360(void); extern void sub_81C742C(u8 taskId); extern void sub_81C7400(void); extern void sub_81C7418(void); extern void sub_81C7170(u8 a0); extern void sub_81C71E4(u8 a0); extern void sub_81C7650(s32 a0); +extern u32 sub_81C7388(void); void sub_81C72BC(void); +void sub_81C7360(struct UnknownStruct_0203CF40 *a0); u32 sub_81C7078(u32 (*a0)(u32), u32 a1) { @@ -140,7 +142,7 @@ void CB2_PokeNav(void) if (gUnknown_0203CF40 == NULL) { SetMainCallback2(CB2_ReturnToFieldWithOpenMenu); } else { - sub_81C7360(); + sub_81C7360(gUnknown_0203CF40); ResetTasks(); SetVBlankCallback(NULL); CreateTask(sub_81C742C, 0); @@ -161,8 +163,8 @@ void sub_81C72BC() { if (gUnknown_0203CF40 == NULL) { SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } else { - sub_81C7360(); - gUnknown_0203CF40->field_0 = 1; + sub_81C7360(gUnknown_0203CF40); + gUnknown_0203CF40->field_2 = 1; ResetTasks(); ResetSpriteData(); FreeAllSpritePalettes(); @@ -183,4 +185,23 @@ void sub_81C7334() { Free(gUnknown_0203CF40); gUnknown_0203CF40 = NULL; InitKeys(); +} + +// Clears UnknownStruct_0203CF40 +void sub_81C7360(struct UnknownStruct_0203CF40 *a0) { + s32 i; + u32 *arrayPtr; + s32 fill; + + fill = 0; + i = 18; + arrayPtr = &(a0->field_5[17]); + for (i; i >= 0; i--) { + *arrayPtr = fill; + arrayPtr -= 1; + } + a0->field_2 = 0; + a0->field_1 = 0; + a0->field_3 = sub_81C7388(); + a0->field_0 = 0; } \ No newline at end of file From 729e7116f2a71d72a7a3ab90d12159130a1d6a16 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Feb 2019 03:48:32 -0500 Subject: [PATCH 060/217] Decompiled AnyMonHasRibbon --- asm/pokenav.s | 64 +--------------------------------------------- src/pokenav_main.c | 31 ++++++++++++++++++++-- 2 files changed, 30 insertions(+), 65 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 77e826bde5..474efe935e 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,69 +5,7 @@ .text - thumb_func_start sub_81C7388 -sub_81C7388: @ 81C7388 - push {r4-r6,lr} - movs r5, 0 -_081C738C: - movs r0, 0x64 - adds r1, r5, 0 - muls r1, r0 - ldr r0, =gPlayerParty - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0x5 - bl GetMonData - cmp r0, 0 - beq _081C73BA - adds r0, r4, 0 - movs r1, 0x6 - bl GetMonData - cmp r0, 0 - bne _081C73BA - adds r0, r4, 0 - movs r1, 0x52 - bl GetMonData - cmp r0, 0 - bne _081C73E2 -_081C73BA: - adds r5, 0x1 - cmp r5, 0x5 - ble _081C738C - movs r4, 0 -_081C73C2: - movs r5, 0 - lsls r6, r4, 24 -_081C73C6: - adds r0, r4, 0 - adds r1, r5, 0 - bl CheckBoxMonSanityAt - cmp r0, 0 - beq _081C73EC - lsls r1, r5, 24 - lsrs r1, 24 - lsrs r0, r6, 24 - movs r2, 0x52 - bl GetBoxMonDataAt - cmp r0, 0 - beq _081C73EC -_081C73E2: - movs r0, 0x1 - b _081C73FA - .pool -_081C73EC: - adds r5, 0x1 - cmp r5, 0x1D - ble _081C73C6 - adds r4, 0x1 - cmp r4, 0xD - ble _081C73C2 - movs r0, 0 -_081C73FA: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_81C7388 + thumb_func_start sub_81C7400 sub_81C7400: @ 81C7400 diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 3f6f8eb5cf..125ced646f 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -5,6 +5,7 @@ #include "overworld.h" #include "field_weather.h" #include "palette.h" +#include "pokemon_storage_system.h" struct UnknownStruct_0203CF40 { u32 field_0; @@ -24,7 +25,7 @@ extern void sub_81C7418(void); extern void sub_81C7170(u8 a0); extern void sub_81C71E4(u8 a0); extern void sub_81C7650(s32 a0); -extern u32 sub_81C7388(void); +extern u32 AnyMonHasRibbon(void); void sub_81C72BC(void); void sub_81C7360(struct UnknownStruct_0203CF40 *a0); @@ -202,6 +203,32 @@ void sub_81C7360(struct UnknownStruct_0203CF40 *a0) { } a0->field_2 = 0; a0->field_1 = 0; - a0->field_3 = sub_81C7388(); + a0->field_3 = AnyMonHasRibbon(); a0->field_0 = 0; +} + +bool32 AnyMonHasRibbon() { + s32 i; + s32 j; + + for (i = 0; i < 6; i++) { + if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_HAS_SPECIES) + && !GetMonData(&gPlayerParty[i], MON_DATA_SANITY_IS_EGG) + && GetMonData(&gPlayerParty[i], MON_DATA_RIBBON_COUNT) != 0) + { + return TRUE; + } + } + + for (j = 0; j < 14; j++) { + for (i = 0; i < 30; i++) { + if (CheckBoxMonSanityAt(j, i) + && GetBoxMonDataAt(j, i, MON_DATA_RIBBON_COUNT) != 0) + { + return TRUE; + } + } + } + + return FALSE; } \ No newline at end of file From 323df8ed407f22977053f9b672d661b00c9a63d3 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Feb 2019 03:51:48 -0500 Subject: [PATCH 061/217] Decompiled sub_81C7400 --- asm/pokenav.s | 13 ------------- src/pokenav_main.c | 7 +++++++ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 474efe935e..c0fb9c48db 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,19 +5,6 @@ .text - - - thumb_func_start sub_81C7400 -sub_81C7400: @ 81C7400 - push {lr} - bl RunTasks - bl AnimateSprites - bl BuildOamBuffer - bl UpdatePaletteFade - pop {r0} - bx r0 - thumb_func_end sub_81C7400 - thumb_func_start sub_81C7418 sub_81C7418: @ 81C7418 push {lr} diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 125ced646f..b39ab7bb10 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -231,4 +231,11 @@ bool32 AnyMonHasRibbon() { } return FALSE; +} + +void sub_81C7400() { + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + UpdatePaletteFade(); } \ No newline at end of file From cf721879dd2d6f36b02e3ce92220fd95e9da7f45 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Feb 2019 03:54:35 -0500 Subject: [PATCH 062/217] Decompiled sub_81C7418 --- asm/pokenav.s | 10 ---------- src/pokenav_main.c | 6 ++++++ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index c0fb9c48db..2d7981f103 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,16 +5,6 @@ .text - thumb_func_start sub_81C7418 -sub_81C7418: @ 81C7418 - push {lr} - bl TransferPlttBuffer - bl LoadOam - bl ProcessSpriteCopyRequests - pop {r0} - bx r0 - thumb_func_end sub_81C7418 - thumb_func_start sub_81C742C sub_81C742C: @ 81C742C push {r4-r7,lr} diff --git a/src/pokenav_main.c b/src/pokenav_main.c index b39ab7bb10..bd57d6e053 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -238,4 +238,10 @@ void sub_81C7400() { AnimateSprites(); BuildOamBuffer(); UpdatePaletteFade(); +} + +void sub_81C7418() { + TransferPlttBuffer(); + LoadOam(); + ProcessSpriteCopyRequests(); } \ No newline at end of file From 3d73f7c48c7c658b0d12fbc89867a44bf9490206 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Feb 2019 20:20:15 -0500 Subject: [PATCH 063/217] Decompiled sub_81C742C --- asm/pokenav.s | 140 --------------------------------------------- src/pokenav_main.c | 116 +++++++++++++++++++++++++++++++------ 2 files changed, 98 insertions(+), 158 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 2d7981f103..3f09a59051 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,146 +5,6 @@ .text - thumb_func_start sub_81C742C -sub_81C742C: @ 81C742C - push {r4-r7,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, =gTasks + 0x8 - adds r7, r1, r0 - movs r1, 0 - ldrsh r0, [r7, r1] - cmp r0, 0x5 - bls _081C7446 - b _081C7562 -_081C7446: - lsls r0, 2 - ldr r1, =_081C7458 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_081C7458: - .4byte _081C7470 - .4byte _081C747A - .4byte _081C7490 - .4byte _081C749C - .4byte _081C751E - .4byte _081C752C -_081C7470: - bl sub_81C76C4 - movs r0, 0x1 - strh r0, [r7] - b _081C7562 -_081C747A: - bl sub_81C76FC - cmp r0, 0 - bne _081C7562 - ldr r0, =0x000186a0 - bl sub_81C756C - b _081C74E8 - .pool -_081C7490: - bl sub_81C786C - cmp r0, 0 - bne _081C7562 - movs r0, 0x3 - strh r0, [r7] -_081C749C: - bl sub_81C75E0 - adds r6, r0, 0 - movs r0, 0x1 - negs r0, r0 - cmp r6, r0 - beq _081C74FC - ldr r0, =0x0001869f - cmp r6, r0 - bls _081C7506 - ldr r4, =gUnknown_0861F3EC - ldr r5, =gUnknown_0203CF40 - ldr r0, [r5] - ldr r1, [r0, 0x4] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r1, r4, 0 - adds r1, 0x18 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 - ldr r0, [r5] - ldr r1, [r0, 0x4] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r4, 0x14 - adds r0, r4 - ldr r0, [r0] - bl _call_via_r0 - adds r0, r6, 0 - bl sub_81C756C - cmp r0, 0 - beq _081C74FC -_081C74E8: - movs r0, 0x4 - strh r0, [r7] - b _081C7562 - .pool -_081C74FC: - bl sub_81C7710 - movs r0, 0x5 - strh r0, [r7] - b _081C7562 -_081C7506: - cmp r6, 0 - beq _081C7562 - adds r0, r6, 0 - bl sub_81C7850 - bl sub_81C786C - cmp r0, 0 - beq _081C7562 - movs r0, 0x2 - strh r0, [r7] - b _081C7562 -_081C751E: - bl sub_81C75D4 - cmp r0, 0 - bne _081C7562 - movs r0, 0x3 - strh r0, [r7] - b _081C7562 -_081C752C: - bl sub_81C7738 - cmp r0, 0 - bne _081C7562 - ldr r0, =gUnknown_0203CF40 - ldr r0, [r0] - ldrh r0, [r0, 0x8] - negs r4, r0 - orrs r4, r0 - lsrs r4, 31 - bl sub_81C9430 - bl sub_81C7334 - cmp r4, 0 - beq _081C755C - ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic - bl SetMainCallback2 - b _081C7562 - .pool -_081C755C: - ldr r0, =CB2_ReturnToFieldWithOpenMenu - bl SetMainCallback2 -_081C7562: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C742C - thumb_func_start sub_81C756C sub_81C756C: @ 81C756C push {r4-r6,lr} diff --git a/src/pokenav_main.c b/src/pokenav_main.c index bd57d6e053..e75ae38f31 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -8,25 +8,41 @@ #include "pokemon_storage_system.h" struct UnknownStruct_0203CF40 { - u32 field_0; - u32 field_1; - u16 field_2; - u32 field_3; - u32 field_4; - u32 field_5[18]; + u32 field0; + u32 field4; + u16 field8; + u32 fieldC; + u32 field10; + u32 field14[18]; +}; + +struct UnknownStruct_0861F3EC { + void (*data[7])(void); }; extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40; extern u8 gUnknown_0203CF3C; +extern struct UnknownStruct_0861F3EC gUnknown_0861F3EC[7]; // Unknown size; at least 7. -extern void sub_81C742C(u8 taskId); -extern void sub_81C7400(void); -extern void sub_81C7418(void); -extern void sub_81C7170(u8 a0); -extern void sub_81C71E4(u8 a0); extern void sub_81C7650(s32 a0); -extern u32 AnyMonHasRibbon(void); +extern void sub_81C76C4(void); +extern void sub_81C7710(void); +extern void sub_81C7850(u32 a0); +extern void sub_81C9430(void); +extern u32 sub_81C756C(u32 a0); +extern u32 sub_81C76FC(void); +extern u32 sub_81C786C(void); +extern u32 sub_81C75E0(void); +extern u32 sub_81C75D4(void); +extern u32 sub_81C7738(void); +u32 AnyMonHasRibbon(void); +void sub_81C7334(void); +void sub_81C71E4(u8 a0); +void sub_81C7170(u8 a0); +void sub_81C7418(void); +void sub_81C7400(void); +void sub_81C742C(u8 taskId); void sub_81C72BC(void); void sub_81C7360(struct UnknownStruct_0203CF40 *a0); @@ -165,7 +181,7 @@ void sub_81C72BC() { SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } else { sub_81C7360(gUnknown_0203CF40); - gUnknown_0203CF40->field_2 = 1; + gUnknown_0203CF40->field8 = 1; ResetTasks(); ResetSpriteData(); FreeAllSpritePalettes(); @@ -196,15 +212,15 @@ void sub_81C7360(struct UnknownStruct_0203CF40 *a0) { fill = 0; i = 18; - arrayPtr = &(a0->field_5[17]); + arrayPtr = &(a0->field14[17]); for (i; i >= 0; i--) { *arrayPtr = fill; arrayPtr -= 1; } - a0->field_2 = 0; - a0->field_1 = 0; - a0->field_3 = AnyMonHasRibbon(); - a0->field_0 = 0; + a0->field8 = 0; + a0->field4 = 0; + a0->fieldC = AnyMonHasRibbon(); + a0->field0 = 0; } bool32 AnyMonHasRibbon() { @@ -244,4 +260,68 @@ void sub_81C7418() { TransferPlttBuffer(); LoadOam(); ProcessSpriteCopyRequests(); +} + +void sub_81C742C(u8 taskId) { + s16* dataPtr; + u32 v1; + bool32 v2; + + dataPtr = gTasks[taskId].data; + + switch (dataPtr[0]) { + case 0: + sub_81C76C4(); + dataPtr[0] = 1; + break; + case 1: + if (sub_81C76FC()) { + break; + } + sub_81C756C(0x186a0); + dataPtr[0] = 4; + break; + case 2: + if (sub_81C786C()) { + break; + } + dataPtr[0] = 3; + case 3: + v1 = sub_81C75E0(); + if (v1 == -1) { + sub_81C7710(); + dataPtr[0] = 5; + } else if (v1 > 0x1869F) { + gUnknown_0861F3EC[gUnknown_0203CF40->field4].data[6](); + gUnknown_0861F3EC[gUnknown_0203CF40->field4].data[5](); + if (sub_81C756C(v1)) { + dataPtr[0] = 4; + } else { + sub_81C7710(); + dataPtr[0] = 5; + } + } else if (v1 != 0) { + sub_81C7850(v1); + if (sub_81C786C()) { + dataPtr[0] = 2; + } + } + break; + case 4: + if (!sub_81C75D4()) { + dataPtr[0] = 3; + } + break; + case 5: + if (!sub_81C7738()) { + v2 = gUnknown_0203CF40->field8 != 0; + sub_81C9430(); + sub_81C7334(); + if (v2) { + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); + } else { + SetMainCallback2(CB2_ReturnToFieldWithOpenMenu); + } + } + } } \ No newline at end of file From 112fc4701794ba3b1a35882d7995c907448431fe Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Feb 2019 20:57:51 -0500 Subject: [PATCH 064/217] Decompiled sub_81C756C Also discovered a constant that may be useful for future decompiling. Comments were added in the asm that references the constant. --- asm/pokenav.s | 51 +--------------------------------------------- asm/rom_8011DC0.s | 2 +- src/pokedex.c | 4 ++-- src/pokenav_main.c | 33 ++++++++++++++++++++++++------ 4 files changed, 31 insertions(+), 59 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 3f09a59051..f3fd3923ea 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,55 +5,6 @@ .text - thumb_func_start sub_81C756C -sub_81C756C: @ 81C756C - push {r4-r6,lr} - ldr r1, =0xfffe7960 - adds r6, r0, r1 - bl sub_81C75F4 - ldr r5, =gUnknown_0861F3EC - lsls r0, r6, 3 - subs r0, r6 - lsls r4, r0, 2 - adds r0, r4, r5 - ldr r0, [r0] - bl _call_via_r0 - cmp r0, 0 - beq _081C75CC - adds r0, r5, 0 - adds r0, 0x8 - adds r0, r4, r0 - ldr r0, [r0] - bl _call_via_r0 - cmp r0, 0 - beq _081C75CC - adds r0, r5, 0 - adds r0, 0xC - adds r0, r4, r0 - ldr r0, [r0] - adds r1, r5, 0 - adds r1, 0x10 - adds r1, r4, r1 - ldr r1, [r1] - bl sub_81C7834 - ldr r0, =gUnknown_0203CF40 - ldr r1, [r0] - adds r0, r5, 0x4 - adds r0, r4, r0 - ldr r0, [r0] - str r0, [r1] - str r6, [r1, 0x4] - movs r0, 0x1 - b _081C75CE - .pool -_081C75CC: - movs r0, 0 -_081C75CE: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_81C756C - thumb_func_start sub_81C75D4 sub_81C75D4: @ 81C75D4 push {lr} @@ -9441,7 +9392,7 @@ sub_81CBE50: @ 81CBE50 movs r0, 0x9 bl GetGameStat adds r1, r0, 0 - ldr r0, =0x0001869f + ldr r0, =0x0001869f @ Note to decompiler: See UNKNOWN_OFFSET cmp r1, r0 ble _081CBE68 adds r1, r0, 0 diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index af7fdbf3df..ec5b7e8f51 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -27181,7 +27181,7 @@ sub_8024700: @ 8024700 adds r0, r5, 0 bl sub_8024668 adds r1, r0, r4 - ldr r2, =0x0001869f + ldr r2, =0x0001869f @ Note to decompiler: See UNKNOWN_OFFSET cmp r1, r2 bhi _08024730 adds r0, r5, 0 diff --git a/src/pokedex.c b/src/pokedex.c index c47ada5b8b..22c8286a4b 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -4036,7 +4036,7 @@ void sub_80C0460(u16 weight, u8 left, u8 top) lsls r2, 24\n\ lsrs r2, 24\n\ str r2, [sp, 0x10]\n\ - ldr r5, =0x000186a0\n\ + ldr r5, =0x000186a0 @ Note to decompiler: See UNKNOWN_OFFSET\n\ muls r0, r5\n\ ldr r1, =0x000011b8\n\ bl __divsi3\n\ @@ -4070,7 +4070,7 @@ _080C04C0:\n\ mov r8, r1\n\ movs r6, 0x1\n\ _080C04C6:\n\ - ldr r1, =0x000186a0\n\ + ldr r1, =0x000186a0 @ Note to decompiler: See UNKNOWN_OFFSET\n\ adds r0, r7, 0\n\ bl __umodsi3\n\ adds r7, r0, 0\n\ diff --git a/src/pokenav_main.c b/src/pokenav_main.c index e75ae38f31..21ee72f30f 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -7,8 +7,10 @@ #include "palette.h" #include "pokemon_storage_system.h" +#define UNKNOWN_OFFSET 100000 + struct UnknownStruct_0203CF40 { - u32 field0; + u32 (*field0)(void); u32 field4; u16 field8; u32 fieldC; @@ -17,7 +19,7 @@ struct UnknownStruct_0203CF40 { }; struct UnknownStruct_0861F3EC { - void (*data[7])(void); + u32 (*data[7])(void); }; extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40; @@ -29,13 +31,15 @@ extern void sub_81C76C4(void); extern void sub_81C7710(void); extern void sub_81C7850(u32 a0); extern void sub_81C9430(void); -extern u32 sub_81C756C(u32 a0); +extern void sub_81C75F4(void); +extern void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)); extern u32 sub_81C76FC(void); extern u32 sub_81C786C(void); extern u32 sub_81C75E0(void); extern u32 sub_81C75D4(void); extern u32 sub_81C7738(void); +bool32 sub_81C756C(u32 a0); u32 AnyMonHasRibbon(void); void sub_81C7334(void); void sub_81C71E4(u8 a0); @@ -220,7 +224,7 @@ void sub_81C7360(struct UnknownStruct_0203CF40 *a0) { a0->field8 = 0; a0->field4 = 0; a0->fieldC = AnyMonHasRibbon(); - a0->field0 = 0; + a0->field0 = NULL; } bool32 AnyMonHasRibbon() { @@ -278,7 +282,7 @@ void sub_81C742C(u8 taskId) { if (sub_81C76FC()) { break; } - sub_81C756C(0x186a0); + sub_81C756C(UNKNOWN_OFFSET); dataPtr[0] = 4; break; case 2: @@ -291,7 +295,7 @@ void sub_81C742C(u8 taskId) { if (v1 == -1) { sub_81C7710(); dataPtr[0] = 5; - } else if (v1 > 0x1869F) { + } else if (v1 >= UNKNOWN_OFFSET) { gUnknown_0861F3EC[gUnknown_0203CF40->field4].data[6](); gUnknown_0861F3EC[gUnknown_0203CF40->field4].data[5](); if (sub_81C756C(v1)) { @@ -324,4 +328,21 @@ void sub_81C742C(u8 taskId) { } } } +} + +bool32 sub_81C756C(u32 a0) { + u32 index; + + index = a0 - UNKNOWN_OFFSET; + sub_81C75F4(); + if (!gUnknown_0861F3EC[index].data[0]()) { + return FALSE; + } + if (!gUnknown_0861F3EC[index].data[2]()) { + return FALSE; + } + sub_81C7834(gUnknown_0861F3EC[index].data[3], gUnknown_0861F3EC[index].data[4]); + gUnknown_0203CF40->field0 = gUnknown_0861F3EC[index].data[1]; + gUnknown_0203CF40->field4 = index; + return TRUE; } \ No newline at end of file From 13a6765c882e0f3db83b50f37af8667b64a1d47e Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Feb 2019 21:33:15 -0500 Subject: [PATCH 065/217] Decompiled several trivial functions --- asm/pokenav.s | 72 +++------------------------------------------- src/pokenav_main.c | 42 +++++++++++++++++++++------ 2 files changed, 37 insertions(+), 77 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index f3fd3923ea..b5f33872cb 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,70 +5,6 @@ .text - thumb_func_start sub_81C75D4 -sub_81C75D4: @ 81C75D4 - push {lr} - bl sub_81C786C - pop {r1} - bx r1 - thumb_func_end sub_81C75D4 - - thumb_func_start sub_81C75E0 -sub_81C75E0: @ 81C75E0 - push {lr} - ldr r0, =gUnknown_0203CF40 - ldr r0, [r0] - ldr r0, [r0] - bl _call_via_r0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81C75E0 - - thumb_func_start sub_81C75F4 -sub_81C75F4: @ 81C75F4 - push {lr} - bl InitKeys - pop {r0} - bx r0 - thumb_func_end sub_81C75F4 - - thumb_func_start c3args_set_0toR1_1to0 -c3args_set_0toR1_1to0: @ 81C7600 - push {lr} - bl SetVBlankCallback - pop {r0} - bx r0 - thumb_func_end c3args_set_0toR1_1to0 - - thumb_func_start sub_81C760C -sub_81C760C: @ 81C760C - push {lr} - ldr r0, =sub_81C7418 - bl SetVBlankCallback - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C760C - - thumb_func_start sub_81C761C -sub_81C761C: @ 81C761C - push {r4,lr} - adds r4, r0, 0 - adds r0, r1, 0 - bl Alloc - ldr r1, =gUnknown_0203CF40 - ldr r1, [r1] - lsls r4, 2 - adds r1, 0x10 - adds r1, r4 - str r0, [r1] - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81C761C - thumb_func_start sub_81C763C sub_81C763C: @ 81C763C ldr r1, =gUnknown_0203CF40 @@ -6694,7 +6630,7 @@ titlescreen_0: @ 81CA92C ldr r2, [r2, 0x8] bl ScanlineEffect_SetParams ldr r0, =sub_81CA914 - bl c3args_set_0toR1_1to0 + bl IndirectSetVBlankCallback ldr r0, =sub_81CA9EC movs r1, 0x3 bl CreateTask @@ -10543,7 +10479,7 @@ _081CC714: .4byte _081CC82A _081CC734: movs r0, 0 - bl c3args_set_0toR1_1to0 + bl IndirectSetVBlankCallback movs r0, 0x1 bl HideBg movs r0, 0x2 @@ -10623,7 +10559,7 @@ _081CC7E2: movs r0, 0x2 bl ShowBg ldr r0, =sub_81CC6A4 - bl c3args_set_0toR1_1to0 + bl IndirectSetVBlankCallback b _081CC77C .pool _081CC804: @@ -13809,7 +13745,7 @@ _081CE218: bne _081CE2C0 _081CE230: ldr r0, =sub_81CEE44 - bl c3args_set_0toR1_1to0 + bl IndirectSetVBlankCallback b _081CDFB0 .pool _081CE23C: diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 21ee72f30f..b2e0589ce1 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -14,8 +14,8 @@ struct UnknownStruct_0203CF40 { u32 field4; u16 field8; u32 fieldC; - u32 field10; - u32 field14[18]; + u32* field10[19]; + //u32* field14[18]; }; struct UnknownStruct_0861F3EC { @@ -31,16 +31,16 @@ extern void sub_81C76C4(void); extern void sub_81C7710(void); extern void sub_81C7850(u32 a0); extern void sub_81C9430(void); -extern void sub_81C75F4(void); extern void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)); extern u32 sub_81C76FC(void); extern u32 sub_81C786C(void); -extern u32 sub_81C75E0(void); -extern u32 sub_81C75D4(void); extern u32 sub_81C7738(void); bool32 sub_81C756C(u32 a0); u32 AnyMonHasRibbon(void); +u32 sub_81C75E0(void); +u32 sub_81C75D4(void); +void sub_81C75F4(void); void sub_81C7334(void); void sub_81C71E4(u8 a0); void sub_81C7170(u8 a0); @@ -211,12 +211,12 @@ void sub_81C7334() { // Clears UnknownStruct_0203CF40 void sub_81C7360(struct UnknownStruct_0203CF40 *a0) { s32 i; - u32 *arrayPtr; - s32 fill; + u32 **arrayPtr; + s32 *fill; - fill = 0; + fill = NULL; i = 18; - arrayPtr = &(a0->field14[17]); + arrayPtr = &(a0->field10[18]); for (i; i >= 0; i--) { *arrayPtr = fill; arrayPtr -= 1; @@ -345,4 +345,28 @@ bool32 sub_81C756C(u32 a0) { gUnknown_0203CF40->field0 = gUnknown_0861F3EC[index].data[1]; gUnknown_0203CF40->field4 = index; return TRUE; +} + +u32 sub_81C75D4(void) { + return sub_81C786C(); +} + +u32 sub_81C75E0(void) { + return gUnknown_0203CF40->field0(); +} + +void sub_81C75F4(void) { + InitKeys(); +} + +void IndirectSetVBlankCallback(IntrCallback callback) { + SetVBlankCallback(callback); +} + +void sub_81C760C(void) { + SetVBlankCallback(sub_81C7418); +} + +u32* sub_81C761C(u32 a0, u32 a1) { + return gUnknown_0203CF40->field10[a0] = (u32*)Alloc(a1); } \ No newline at end of file From b0385568510c39bbc42d63d59085a1f1ef44cf8d Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Feb 2019 22:18:12 -0500 Subject: [PATCH 066/217] Decompiled several setters and getters --- asm/pokenav.s | 88 ---------------------------------------------- src/pokenav_main.c | 55 ++++++++++++++++++++++++----- 2 files changed, 47 insertions(+), 96 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index b5f33872cb..744ed90c4e 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,94 +5,6 @@ .text - thumb_func_start sub_81C763C -sub_81C763C: @ 81C763C - ldr r1, =gUnknown_0203CF40 - ldr r1, [r1] - lsls r0, 2 - adds r1, 0x10 - adds r1, r0 - ldr r0, [r1] - bx lr - .pool - thumb_func_end sub_81C763C - - thumb_func_start sub_81C7650 -sub_81C7650: @ 81C7650 - push {r4,r5,lr} - ldr r5, =gUnknown_0203CF40 - ldr r1, [r5] - lsls r4, r0, 2 - adds r1, 0x10 - adds r1, r4 - ldr r0, [r1] - cmp r0, 0 - beq _081C7670 - bl Free - ldr r0, [r5] - adds r0, 0x10 - adds r0, r4 - movs r1, 0 - str r1, [r0] -_081C7670: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C7650 - - thumb_func_start sub_81C767C -sub_81C767C: @ 81C767C - ldr r0, =gUnknown_0203CF40 - ldr r0, [r0] - ldrh r0, [r0, 0x8] - bx lr - .pool - thumb_func_end sub_81C767C - - thumb_func_start sub_81C7688 -sub_81C7688: @ 81C7688 - ldr r1, =gUnknown_0203CF40 - ldr r1, [r1] - strh r0, [r1, 0x8] - bx lr - .pool - thumb_func_end sub_81C7688 - - thumb_func_start sub_81C7694 -sub_81C7694: @ 81C7694 - push {lr} - adds r1, r0, 0 - cmp r1, 0x4 - bls _081C769E - movs r1, 0 -_081C769E: - ldr r0, =gUnknown_0203CF40 - ldr r0, [r0] - strh r1, [r0, 0xA] - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C7694 - - thumb_func_start sub_81C76AC -sub_81C76AC: @ 81C76AC - ldr r0, =gUnknown_0203CF40 - ldr r0, [r0] - ldrh r0, [r0, 0xA] - bx lr - .pool - thumb_func_end sub_81C76AC - - thumb_func_start sub_81C76B8 -sub_81C76B8: @ 81C76B8 - ldr r0, =gUnknown_0203CF40 - ldr r0, [r0] - ldr r0, [r0, 0xC] - bx lr - .pool - thumb_func_end sub_81C76B8 - thumb_func_start sub_81C76C4 sub_81C76C4: @ 81C76C4 push {r4,lr} diff --git a/src/pokenav_main.c b/src/pokenav_main.c index b2e0589ce1..f35564ee74 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -13,6 +13,7 @@ struct UnknownStruct_0203CF40 { u32 (*field0)(void); u32 field4; u16 field8; + u16 fieldA; u32 fieldC; u32* field10[19]; //u32* field14[18]; @@ -26,12 +27,11 @@ extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40; extern u8 gUnknown_0203CF3C; extern struct UnknownStruct_0861F3EC gUnknown_0861F3EC[7]; // Unknown size; at least 7. -extern void sub_81C7650(s32 a0); +extern void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)); +extern void sub_81C7850(u32 a0); extern void sub_81C76C4(void); extern void sub_81C7710(void); -extern void sub_81C7850(u32 a0); extern void sub_81C9430(void); -extern void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)); extern u32 sub_81C76FC(void); extern u32 sub_81C786C(void); extern u32 sub_81C7738(void); @@ -40,15 +40,16 @@ bool32 sub_81C756C(u32 a0); u32 AnyMonHasRibbon(void); u32 sub_81C75E0(void); u32 sub_81C75D4(void); -void sub_81C75F4(void); -void sub_81C7334(void); +void sub_81C7360(struct UnknownStruct_0203CF40 *a0); +void sub_81C7650(u32 index); void sub_81C71E4(u8 a0); void sub_81C7170(u8 a0); +void sub_81C742C(u8 taskId); +void sub_81C75F4(void); +void sub_81C7334(void); void sub_81C7418(void); void sub_81C7400(void); -void sub_81C742C(u8 taskId); void sub_81C72BC(void); -void sub_81C7360(struct UnknownStruct_0203CF40 *a0); u32 sub_81C7078(u32 (*a0)(u32), u32 a1) { @@ -369,4 +370,42 @@ void sub_81C760C(void) { u32* sub_81C761C(u32 a0, u32 a1) { return gUnknown_0203CF40->field10[a0] = (u32*)Alloc(a1); -} \ No newline at end of file +} + +u32* sub_81C763C(u32 a0) { + return gUnknown_0203CF40->field10[a0]; +} + +void sub_81C7650(u32 index) { + if (gUnknown_0203CF40->field10[index] != NULL) { + Free(gUnknown_0203CF40->field10[index]); + gUnknown_0203CF40->field10[index] = NULL; + } +} + +u16 sub_81C767C(void) { + return gUnknown_0203CF40->field8; +} + +void sub_81C7688(u16 a0) { + gUnknown_0203CF40->field8 = a0; +} + +void sub_81C7694(u32 a0) { + u32 value; + value = a0; + if (a0 > 4) { + value = 0; + } + gUnknown_0203CF40->fieldA = value; +} + +u16 sub_81C76AC(void) { + return gUnknown_0203CF40->fieldA; +} + +u32 sub_81C76B8(void) { + return gUnknown_0203CF40->fieldC; +} + + From 5beb2baa97c0ffdc7be38aad3fbc46e8f3abac37 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Feb 2019 22:35:07 -0500 Subject: [PATCH 067/217] Decompiled sub_81C76C4 --- asm/pokenav.s | 26 -------------------------- src/pokenav_main.c | 35 ++++++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 35 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 744ed90c4e..e8c31bcf67 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,32 +5,6 @@ .text - thumb_func_start sub_81C76C4 -sub_81C76C4: @ 81C76C4 - push {r4,lr} - ldr r1, =0x0000082c - movs r0, 0 - bl sub_81C761C - adds r4, r0, 0 - cmp r4, 0 - beq _081C76F4 - bl ResetSpriteData - bl FreeAllSpritePalettes - ldr r0, =sub_81C7764 - movs r1, 0x1 - bl sub_81C7078 - str r0, [r4, 0xC] - movs r0, 0x1 - b _081C76F6 - .pool -_081C76F4: - movs r0, 0 -_081C76F6: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81C76C4 - thumb_func_start sub_81C76FC sub_81C76FC: @ 81C76FC push {lr} diff --git a/src/pokenav_main.c b/src/pokenav_main.c index f35564ee74..35dcbeb738 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -15,28 +15,33 @@ struct UnknownStruct_0203CF40 { u16 field8; u16 fieldA; u32 fieldC; - u32* field10[19]; - //u32* field14[18]; + void* field10[19]; }; struct UnknownStruct_0861F3EC { u32 (*data[7])(void); }; +struct UnknownStruct_sub_81C76C4 { + u32 data[523]; +}; + extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40; extern u8 gUnknown_0203CF3C; extern struct UnknownStruct_0861F3EC gUnknown_0861F3EC[7]; // Unknown size; at least 7. extern void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)); extern void sub_81C7850(u32 a0); -extern void sub_81C76C4(void); extern void sub_81C7710(void); extern void sub_81C9430(void); +extern u32 sub_81C7764(u32 a0); extern u32 sub_81C76FC(void); extern u32 sub_81C786C(void); extern u32 sub_81C7738(void); + bool32 sub_81C756C(u32 a0); +bool32 sub_81C76C4(void); u32 AnyMonHasRibbon(void); u32 sub_81C75E0(void); u32 sub_81C75D4(void); @@ -212,8 +217,8 @@ void sub_81C7334() { // Clears UnknownStruct_0203CF40 void sub_81C7360(struct UnknownStruct_0203CF40 *a0) { s32 i; - u32 **arrayPtr; - s32 *fill; + void **arrayPtr; + void *fill; fill = NULL; i = 18; @@ -368,12 +373,12 @@ void sub_81C760C(void) { SetVBlankCallback(sub_81C7418); } -u32* sub_81C761C(u32 a0, u32 a1) { - return gUnknown_0203CF40->field10[a0] = (u32*)Alloc(a1); +void* sub_81C761C(u32 index, u32 size) { + return gUnknown_0203CF40->field10[index] = (void*)Alloc(size); } -u32* sub_81C763C(u32 a0) { - return gUnknown_0203CF40->field10[a0]; +void* sub_81C763C(u32 index) { + return gUnknown_0203CF40->field10[index]; } void sub_81C7650(u32 index) { @@ -408,4 +413,16 @@ u32 sub_81C76B8(void) { return gUnknown_0203CF40->fieldC; } +bool32 sub_81C76C4(void) { + struct UnknownStruct_sub_81C76C4 *v1; + v1 = (struct UnknownStruct_sub_81C76C4*)sub_81C761C(0, sizeof(struct UnknownStruct_sub_81C76C4)); + if (v1 == NULL) { + return FALSE; + } else { + ResetSpriteData(); + FreeAllSpritePalettes(); + v1->data[3] = sub_81C7078(sub_81C7764, 1); + return TRUE; + } +} \ No newline at end of file From 7c405e08d0625355395c2da76b877e3b302c3ea0 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 13 Feb 2019 00:07:48 -0500 Subject: [PATCH 068/217] Decompiled three more small functions --- asm/pokenav.s | 53 ---------------------------------------------- src/pokenav_main.c | 38 +++++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 57 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index e8c31bcf67..d04b665be3 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,59 +5,6 @@ .text - thumb_func_start sub_81C76FC -sub_81C76FC: @ 81C76FC - push {lr} - movs r0, 0 - bl sub_81C763C - ldr r0, [r0, 0xC] - bl sub_81C70D8 - pop {r1} - bx r1 - thumb_func_end sub_81C76FC - - thumb_func_start sub_81C7710 -sub_81C7710: @ 81C7710 - push {lr} - sub sp, 0x4 - movs r0, 0x6F - bl PlaySE - bl sub_81CAADC - movs r1, 0x1 - negs r1, r1 - movs r0, 0 - str r0, [sp] - adds r0, r1, 0 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - add sp, 0x4 - pop {r0} - bx r0 - thumb_func_end sub_81C7710 - - thumb_func_start sub_81C7738 -sub_81C7738: @ 81C7738 - push {lr} - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _081C7750 - movs r0, 0x1 - b _081C775E - .pool -_081C7750: - bl sub_81C99D4 - bl sub_81C7C94 - bl FreeAllWindowBuffers - movs r0, 0 -_081C775E: - pop {r1} - bx r1 - thumb_func_end sub_81C7738 - thumb_func_start sub_81C7764 sub_81C7764: @ 81C7764 push {r4,lr} diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 35dcbeb738..bda65e7ce0 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -6,6 +6,9 @@ #include "field_weather.h" #include "palette.h" #include "pokemon_storage_system.h" +#include "sound.h" +#include "constants/songs.h" +#include "window.h" #define UNKNOWN_OFFSET 100000 @@ -32,12 +35,12 @@ extern struct UnknownStruct_0861F3EC gUnknown_0861F3EC[7]; // Unknown size; at l extern void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)); extern void sub_81C7850(u32 a0); -extern void sub_81C7710(void); extern void sub_81C9430(void); extern u32 sub_81C7764(u32 a0); -extern u32 sub_81C76FC(void); extern u32 sub_81C786C(void); -extern u32 sub_81C7738(void); +extern void sub_81CAADC(void); +extern void sub_81C99D4(void); +extern void sub_81C7C94(void); bool32 sub_81C756C(u32 a0); @@ -45,11 +48,14 @@ bool32 sub_81C76C4(void); u32 AnyMonHasRibbon(void); u32 sub_81C75E0(void); u32 sub_81C75D4(void); +u32 sub_81C76FC(void); +bool32 sub_81C7738(void); void sub_81C7360(struct UnknownStruct_0203CF40 *a0); void sub_81C7650(u32 index); void sub_81C71E4(u8 a0); void sub_81C7170(u8 a0); void sub_81C742C(u8 taskId); +void sub_81C7710(void); void sub_81C75F4(void); void sub_81C7334(void); void sub_81C7418(void); @@ -71,7 +77,7 @@ u32 sub_81C7078(u32 (*a0)(u32), u32 a1) return ((gUnknown_0203CF3C++) << 16) | taskId; } -bool32 sub_81C70D8(u32 a0, u32 unused) +bool32 sub_81C70D8(u32 a0) { u32 v1 = a0 & 0xFFFF; u32 v2 = a0 >> 16; @@ -425,4 +431,28 @@ bool32 sub_81C76C4(void) { v1->data[3] = sub_81C7078(sub_81C7764, 1); return TRUE; } +} + +u32 sub_81C76FC(void) { + // This is a guess. + struct UnknownStruct_sub_81C76C4 *v1; + v1 = sub_81C763C(0); + return sub_81C70D8(v1->data[3]); +} + +void sub_81C7710(void) { + PlaySE(SE_PN_OFF); + sub_81CAADC(); + BeginNormalPaletteFade(-1, -1, 0, 16, 0); +} + +bool32 sub_81C7738(void) { + if (!gPaletteFade.active) { + sub_81C99D4(); + sub_81C7C94(); + FreeAllWindowBuffers(); + return FALSE; + } else { + return TRUE; + } } \ No newline at end of file From 3bb4057bada112943dd1e39c695c3b6ef36c10f4 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 13 Feb 2019 02:31:24 -0500 Subject: [PATCH 069/217] Decompiled sub_81C7764 --- asm/pokenav.s | 92 ---------------------------------------------- include/graphics.h | 5 ++- src/pokenav_main.c | 57 +++++++++++++++++++++++++++- 3 files changed, 59 insertions(+), 95 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index d04b665be3..74cf91ca46 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,98 +5,6 @@ .text - thumb_func_start sub_81C7764 -sub_81C7764: @ 81C7764 - push {r4,lr} - sub sp, 0x4 - cmp r0, 0x1 - beq _081C77B0 - cmp r0, 0x1 - bgt _081C7776 - cmp r0, 0 - beq _081C7780 - b _081C782A -_081C7776: - cmp r0, 0x2 - beq _081C77FC - cmp r0, 0x3 - beq _081C780E - b _081C782A -_081C7780: - movs r1, 0x82 - lsls r1, 5 - movs r0, 0 - bl SetGpuReg - bl FreeAllWindowBuffers - movs r0, 0 - bl ResetBgsAndClearDma3BusyFlags - ldr r1, =gUnknown_0861FA04 - movs r0, 0 - movs r2, 0x1 - bl InitBgsFromTemplates - bl sub_8199D98 - bl reset_temp_tile_data_buffers - movs r0, 0x1 - b _081C782C - .pool -_081C77B0: - movs r0, 0 - bl sub_81C763C - adds r4, r0, 0 - ldr r1, =gPokenavHeader_Gfx - movs r0, 0 - str r0, [sp] - movs r2, 0 - movs r3, 0 - bl decompress_and_copy_tile_data_to_vram - adds r4, 0x2C - movs r0, 0 - adds r1, r4, 0 - bl SetBgTilemapBuffer - ldr r1, =gPokenavHeader_Tilemap - movs r0, 0 - movs r2, 0 - movs r3, 0 - bl CopyToBgTilemapBuffer - ldr r0, =gPokenavHeader_Pal - movs r1, 0 - movs r2, 0x20 - bl sub_81C7944 - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0 - b _081C782C - .pool -_081C77FC: - bl free_temp_tile_data_buffers_if_possible - lsls r0, 24 - cmp r0, 0 - bne _081C7818 - bl sub_81C7B74 - movs r0, 0 - b _081C782C -_081C780E: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - beq _081C781C -_081C7818: - movs r0, 0x2 - b _081C782C -_081C781C: - bl sub_81C7C28 - bl sub_81C7D28 - movs r0, 0 - bl ShowBg -_081C782A: - movs r0, 0x4 -_081C782C: - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81C7764 - thumb_func_start sub_81C7834 sub_81C7834: @ 81C7834 push {r4,r5,lr} diff --git a/include/graphics.h b/include/graphics.h index 58a9666a62..2ac2f2a5a3 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4007,9 +4007,12 @@ extern const u32 gBerryPalette_Enigma[]; //credits extern const u32 gCreditsCopyrightEnd_Gfx[]; -//pokenav condition marker +//pokenav extern const u8 gPokenavConditionMarker_Gfx[]; extern const u16 gPokenavConditionMarker_Pal[]; +extern const u16 gPokenavHeader_Pal[]; +extern const u32 gPokenavHeader_Gfx[]; +extern const u32 gPokenavHeader_Tilemap[]; extern const u32 gUnknown_08D9862C[]; extern const u32 gUnknown_08D98CC8[]; diff --git a/src/pokenav_main.c b/src/pokenav_main.c index bda65e7ce0..21d3e90e85 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -9,6 +9,10 @@ #include "sound.h" #include "constants/songs.h" #include "window.h" +#include "gpu_regs.h" +#include "bg.h" +#include "menu.h" +#include "graphics.h" #define UNKNOWN_OFFSET 100000 @@ -29,6 +33,8 @@ struct UnknownStruct_sub_81C76C4 { u32 data[523]; }; +extern struct BgTemplate gUnknown_0861FA04; + extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40; extern u8 gUnknown_0203CF3C; extern struct UnknownStruct_0861F3EC gUnknown_0861F3EC[7]; // Unknown size; at least 7. @@ -36,11 +42,15 @@ extern struct UnknownStruct_0861F3EC gUnknown_0861F3EC[7]; // Unknown size; at l extern void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)); extern void sub_81C7850(u32 a0); extern void sub_81C9430(void); -extern u32 sub_81C7764(u32 a0); extern u32 sub_81C786C(void); extern void sub_81CAADC(void); extern void sub_81C99D4(void); extern void sub_81C7C94(void); +extern void sub_8199D98(void); +extern void sub_81C7944(void* palette, u32 a1, u32 a2); +extern void sub_81C7B74(void); +extern void sub_81C7C28(void); +extern void sub_81C7D28(void); bool32 sub_81C756C(u32 a0); @@ -49,6 +59,7 @@ u32 AnyMonHasRibbon(void); u32 sub_81C75E0(void); u32 sub_81C75D4(void); u32 sub_81C76FC(void); +u32 sub_81C7764(s32 a0); bool32 sub_81C7738(void); void sub_81C7360(struct UnknownStruct_0203CF40 *a0); void sub_81C7650(u32 index); @@ -62,7 +73,7 @@ void sub_81C7418(void); void sub_81C7400(void); void sub_81C72BC(void); -u32 sub_81C7078(u32 (*a0)(u32), u32 a1) +u32 sub_81C7078(u32 (*a0)(s32), u32 a1) { u16 taskId; @@ -455,4 +466,46 @@ bool32 sub_81C7738(void) { } else { return TRUE; } +} + +u32 sub_81C7764(s32 a0) { + // This is a guess. + struct UnknownStruct_sub_81C76C4 *v1; + + switch (a0) { + case 0: + SetGpuReg(0, 0x82 << 5); + FreeAllWindowBuffers(); + ResetBgsAndClearDma3BusyFlags(0); + InitBgsFromTemplates(0, &gUnknown_0861FA04, 1); + sub_8199D98(); + reset_temp_tile_data_buffers(); + return 1; + case 1: + v1 = sub_81C763C(0); + decompress_and_copy_tile_data_to_vram(0, &gPokenavHeader_Gfx, 0, 0, 0); + SetBgTilemapBuffer(0, &v1->data[11]); + CopyToBgTilemapBuffer(0, &gPokenavHeader_Tilemap, 0, 0); + sub_81C7944(&gPokenavHeader_Pal, 0, 0x20); + CopyBgTilemapBufferToVram(0); + return 0; + case 2: + if (free_temp_tile_data_buffers_if_possible()) { + return 2; + } else { + sub_81C7B74(); + return 0; + } + case 3: + if (IsDma3ManagerBusyWithBgCopy()) { + return 2; + } else { + sub_81C7C28(); + sub_81C7D28(); + ShowBg(0); + return 4; + } + default: + return 4; + } } \ No newline at end of file From 34b16e9e78a717331344934abe4ee172ca487692 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 13 Feb 2019 03:19:27 -0500 Subject: [PATCH 070/217] Decompiled 5 functions for unknown structs --- asm/pokenav.s | 86 ---------------------------------------------- src/pokenav_main.c | 64 ++++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 89 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 74cf91ca46..904822ee48 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,92 +5,6 @@ .text - thumb_func_start sub_81C7834 -sub_81C7834: @ 81C7834 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - movs r0, 0 - bl sub_81C763C - str r4, [r0] - str r5, [r0, 0x4] - movs r1, 0 - str r1, [r0, 0x8] - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_81C7834 - - thumb_func_start sub_81C7850 -sub_81C7850: @ 81C7850 - push {r4,lr} - adds r4, r0, 0 - movs r0, 0 - bl sub_81C763C - movs r1, 0 - str r1, [r0, 0x8] - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81C7850 - - thumb_func_start sub_81C786C -sub_81C786C: @ 81C786C - push {lr} - movs r0, 0 - bl sub_81C763C - ldr r0, [r0, 0x4] - bl _call_via_r0 - pop {r1} - bx r1 - thumb_func_end sub_81C786C - - thumb_func_start sub_81C7880 -sub_81C7880: @ 81C7880 - push {r4,lr} - movs r0, 0 - bl sub_81C763C - adds r4, r0, 0 - ldr r0, =atk47_cmd47 - movs r1, 0x4 - bl sub_81C7078 - str r0, [r4, 0xC] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C7880 - - thumb_func_start sub_81C78A0 -sub_81C78A0: @ 81C78A0 - push {r4,lr} - movs r0, 0 - bl sub_81C763C - adds r4, r0, 0 - ldr r0, =sub_81C791C - movs r1, 0x4 - bl sub_81C7078 - str r0, [r4, 0xC] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C78A0 - - thumb_func_start sub_81C78C0 -sub_81C78C0: @ 81C78C0 - push {lr} - movs r0, 0 - bl sub_81C763C - ldr r0, [r0, 0xC] - bl sub_81C70D8 - pop {r1} - bx r1 - thumb_func_end sub_81C78C0 - thumb_func_start atk47_cmd47 atk47_cmd47: @ 81C78D4 push {lr} diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 21d3e90e85..29df2b40f1 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -29,6 +29,11 @@ struct UnknownStruct_0861F3EC { u32 (*data[7])(void); }; +struct UnknownStruct_sub_81C7850 { + // Unknown size; at least 3. + void (*data[3])(u32); +}; + struct UnknownStruct_sub_81C76C4 { u32 data[523]; }; @@ -39,10 +44,7 @@ extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40; extern u8 gUnknown_0203CF3C; extern struct UnknownStruct_0861F3EC gUnknown_0861F3EC[7]; // Unknown size; at least 7. -extern void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)); -extern void sub_81C7850(u32 a0); extern void sub_81C9430(void); -extern u32 sub_81C786C(void); extern void sub_81CAADC(void); extern void sub_81C99D4(void); extern void sub_81C7C94(void); @@ -51,6 +53,8 @@ extern void sub_81C7944(void* palette, u32 a1, u32 a2); extern void sub_81C7B74(void); extern void sub_81C7C28(void); extern void sub_81C7D28(void); +extern u32 atk47_cmd47(s32 a0); +extern u32 sub_81C791C(s32 a0); bool32 sub_81C756C(u32 a0); @@ -59,10 +63,13 @@ u32 AnyMonHasRibbon(void); u32 sub_81C75E0(void); u32 sub_81C75D4(void); u32 sub_81C76FC(void); +u32 sub_81C786C(void); u32 sub_81C7764(s32 a0); bool32 sub_81C7738(void); +void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)); void sub_81C7360(struct UnknownStruct_0203CF40 *a0); void sub_81C7650(u32 index); +void sub_81C7850(u32 a0); void sub_81C71E4(u8 a0); void sub_81C7170(u8 a0); void sub_81C742C(u8 taskId); @@ -508,4 +515,55 @@ u32 sub_81C7764(s32 a0) { default: return 4; } +} + +void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)) { + // This is a guess. + struct UnknownStruct_0861F3EC *v1; + + v1 = sub_81C763C(0); + v1->data[0] = a0; + v1->data[1] = a1; + v1->data[2] = NULL; +} + +void sub_81C7850(u32 a0) { + // This is a guess. + struct UnknownStruct_sub_81C7850 *v1; + + v1 = sub_81C763C(0); + v1->data[2] = NULL; + v1->data[0](a0); +} + +u32 sub_81C786C(void) { + // This is a guess. + struct UnknownStruct_0861F3EC *v1; + + v1 = sub_81C763C(0); + return v1->data[1](); +} + +void sub_81C7880(void) { + // This is a guess. + struct UnknownStruct_0203CF40* v1; + + v1 = sub_81C763C(0); + v1->fieldC = sub_81C7078(atk47_cmd47, 4); +} + +void sub_81C78A0(void) { + // This is a guess. + struct UnknownStruct_0203CF40* v1; + + v1 = sub_81C763C(0); + v1->fieldC = sub_81C7078(sub_81C791C, 4); +} + +bool32 sub_81C78C0(void) { + // This is a guess. + struct UnknownStruct_0203CF40* v1; + + v1 = sub_81C763C(0); + return sub_81C70D8(v1->fieldC); } \ No newline at end of file From a8d920cc45abdef48ca660530d094661557a8451 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 13 Feb 2019 21:37:34 -0500 Subject: [PATCH 071/217] Decompiled 2 functions, unable to decompile 1. sub_81C795C could not be decompiled due to register naming issues. However, its structure was correctly matched, so I have left the C code and a comment explaining the issue. --- asm/pokenav.s | 149 ++++++--------------------------------------- src/pokenav_main.c | 99 ++++++++++++++++++++++++++++-- 2 files changed, 115 insertions(+), 133 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 904822ee48..e810049ffb 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,115 +5,6 @@ .text - thumb_func_start atk47_cmd47 -atk47_cmd47: @ 81C78D4 - push {lr} - cmp r0, 0x1 - beq _081C78EA - cmp r0, 0x1 - bgt _081C78E4 - cmp r0, 0 - beq _081C78EA - b _081C7914 -_081C78E4: - cmp r0, 0x2 - beq _081C78EE - b _081C7914 -_081C78EA: - movs r0, 0 - b _081C7916 -_081C78EE: - movs r1, 0xC0 - lsls r1, 1 - movs r0, 0 - movs r2, 0x1 - bl ChangeBgY - ldr r1, =0x00001fff - cmp r0, r1 - bhi _081C7908 - movs r0, 0x2 - b _081C7916 - .pool -_081C7908: - movs r1, 0x80 - lsls r1, 6 - movs r0, 0 - movs r2, 0 - bl ChangeBgY -_081C7914: - movs r0, 0x4 -_081C7916: - pop {r1} - bx r1 - thumb_func_end atk47_cmd47 - - thumb_func_start sub_81C791C -sub_81C791C: @ 81C791C - push {lr} - movs r1, 0xC0 - lsls r1, 1 - movs r0, 0 - movs r2, 0x2 - bl ChangeBgY - cmp r0, 0 - ble _081C7932 - movs r0, 0x2 - b _081C793E -_081C7932: - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x4 -_081C793E: - pop {r1} - bx r1 - thumb_func_end sub_81C791C - - thumb_func_start sub_81C7944 -sub_81C7944: @ 81C7944 - push {lr} - lsls r1, 1 - ldr r3, =gPlttBufferUnfaded - adds r1, r3 - lsls r2, 10 - lsrs r2, 11 - bl CpuSet - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C7944 - - thumb_func_start sub_81C795C -sub_81C795C: @ 81C795C - push {r4,lr} - adds r4, r0, 0 - b _081C7974 -_081C7962: - lsls r0, r1, 4 - movs r2, 0x80 - lsls r2, 1 - adds r1, r0, r2 - ldr r0, [r4] - movs r2, 0x20 - bl sub_81C7944 - adds r4, 0x8 -_081C7974: - ldr r0, [r4] - cmp r0, 0 - beq _081C7988 - ldrh r0, [r4, 0x4] - bl AllocSpritePalette - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0xFF - bne _081C7962 -_081C7988: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81C795C - thumb_func_start sub_81C7990 sub_81C7990: @ 81C7990 push {lr} @@ -4401,7 +4292,7 @@ _081C9A5C: ldr r0, =gPokenavMessageBox_Pal movs r1, 0x10 movs r2, 0x20 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded movs r0, 0x1 movs r1, 0 movs r2, 0 @@ -4454,7 +4345,7 @@ _081C9AFA: ldr r0, =gUnknown_0861FD4C movs r1, 0x20 movs r2, 0x20 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded b _081C9AD6 .pool _081C9B30: @@ -4481,7 +4372,7 @@ _081C9B3E: ldr r0, =gUnknown_0861FC78 movs r1, 0x30 movs r2, 0x20 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded bl sub_81C9894 cmp r0, 0x3 beq _081C9B76 @@ -6152,7 +6043,7 @@ sub_81CA850: @ 81CA850 ldr r0, =gUnknown_0861FC78 + 0xE movs r1, 0x31 movs r2, 0x4 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded pop {r0} bx r0 .pool @@ -7636,7 +7527,7 @@ _081CB368: ldr r0, =gUnknown_08622510 movs r1, 0x20 movs r2, 0x20 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded movs r0, 0x2 b _081CB418 .pool @@ -7669,7 +7560,7 @@ _081CB3E0: ldr r0, =gUnknown_086226E0 movs r1, 0x10 movs r2, 0x20 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded movs r0, 0x1 _081CB418: bl CopyBgTilemapBufferToVram @@ -7693,11 +7584,11 @@ _081CB424: ldr r0, =gUnknown_08622700 movs r1, 0x30 movs r2, 0x20 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded ldr r0, =gUnknown_08622720 movs r1, 0x50 movs r2, 0x20 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded movs r0, 0 b _081CB506 .pool @@ -10555,11 +10446,11 @@ sub_81CCA1C: @ 81CCA1C ldr r0, =gUnknown_08622868 movs r1, 0x10 movs r2, 0x20 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded ldr r0, =gHoennMapZoomIcons_Pal movs r1, 0x30 movs r2, 0x20 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded bl sub_8124658 lsls r0, 24 cmp r0, 0 @@ -13180,11 +13071,11 @@ _081CDFF2: ldr r0, =gPokenavCondition_Pal movs r1, 0x10 movs r2, 0x20 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded ldr r0, =gUnknown_08623208 movs r1, 0xF0 movs r2, 0x20 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded ldr r0, =0x00001814 adds r1, r5, r0 ldr r0, =0x0000ffb0 @@ -13211,7 +13102,7 @@ _081CE03C: ldr r0, =gUnknown_086231E8 movs r1, 0x30 movs r2, 0x20 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded movs r0, 0x2 bl sub_81D21DC b _081CDFB0 @@ -15659,7 +15550,7 @@ _081CF454: ldr r0, =gUnknown_086233C4 movs r1, 0x10 movs r2, 0x20 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded movs r0, 0x1 bl CopyBgTilemapBufferToVram _081CF498: @@ -15683,7 +15574,7 @@ _081CF4C0: ldr r0, =gUnknown_08623570 movs r1, 0x20 movs r2, 0x20 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded bl sub_81CF88C b _081CF498 .pool @@ -17043,7 +16934,7 @@ _081CFEF4: ldr r0, =gUnknown_086235E4 movs r1, 0x10 movs r2, 0x20 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded movs r0, 0x1 bl CopyBgTilemapBufferToVram _081CFF32: @@ -17077,7 +16968,7 @@ _081CFF76: ldr r0, =gUnknown_08623790 movs r1, 0x20 movs r2, 0x20 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded bl sub_81D0304 b _081CFF32 .pool @@ -18580,7 +18471,7 @@ _081D0AB8: ldr r0, =gUnknown_08DDE010 movs r1, 0x10 movs r2, 0x20 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded b _081D0BBA .pool _081D0B04: @@ -18618,11 +18509,11 @@ _081D0B12: ldr r0, =gUnknown_08623FF8 movs r1, 0x20 movs r2, 0xA0 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded ldr r0, =gUnknown_08624098 movs r1, 0xA0 movs r2, 0x20 - bl sub_81C7944 + bl CopyPaletteIntoBufferUnfaded movs r0, 0x1 b _081D0BBC .pool diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 29df2b40f1..5610966b76 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -13,9 +13,15 @@ #include "bg.h" #include "menu.h" #include "graphics.h" +#include "gba/macro.h" #define UNKNOWN_OFFSET 100000 +struct PaletteDescriptor { + void *palette; + u16 tag; +}; + struct UnknownStruct_0203CF40 { u32 (*field0)(void); u32 field4; @@ -49,14 +55,12 @@ extern void sub_81CAADC(void); extern void sub_81C99D4(void); extern void sub_81C7C94(void); extern void sub_8199D98(void); -extern void sub_81C7944(void* palette, u32 a1, u32 a2); extern void sub_81C7B74(void); extern void sub_81C7C28(void); extern void sub_81C7D28(void); -extern u32 atk47_cmd47(s32 a0); -extern u32 sub_81C791C(s32 a0); +u32 sub_81C791C(s32 a0); bool32 sub_81C756C(u32 a0); bool32 sub_81C76C4(void); u32 AnyMonHasRibbon(void); @@ -65,7 +69,9 @@ u32 sub_81C75D4(void); u32 sub_81C76FC(void); u32 sub_81C786C(void); u32 sub_81C7764(s32 a0); +u32 atk47_cmd47(s32 a0); bool32 sub_81C7738(void); +void CopyPaletteIntoBufferUnfaded(void *palette, u32 a1, u32 a2); void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)); void sub_81C7360(struct UnknownStruct_0203CF40 *a0); void sub_81C7650(u32 index); @@ -493,7 +499,7 @@ u32 sub_81C7764(s32 a0) { decompress_and_copy_tile_data_to_vram(0, &gPokenavHeader_Gfx, 0, 0, 0); SetBgTilemapBuffer(0, &v1->data[11]); CopyToBgTilemapBuffer(0, &gPokenavHeader_Tilemap, 0, 0); - sub_81C7944(&gPokenavHeader_Pal, 0, 0x20); + CopyPaletteIntoBufferUnfaded(&gPokenavHeader_Pal, 0, 0x20); CopyBgTilemapBufferToVram(0); return 0; case 2: @@ -566,4 +572,89 @@ bool32 sub_81C78C0(void) { v1 = sub_81C763C(0); return sub_81C70D8(v1->fieldC); +} + +u32 atk47_cmd47(s32 a0) { + switch (a0) { + default: + return 4; + case 1: + return 0; + case 0: + return 0; + case 2: + if ((u32)ChangeBgY(0, 384, 1) >= 0x2000) { + ChangeBgY(0, 0x2000, 0); + return 4; + } else { + return 2; + } + } +} + +u32 sub_81C791C(s32 a0) { + if (ChangeBgY(0, 384, 2) <= 0) { + ChangeBgY(0, 0, 0); + return 4; + } else { + return 2; + } +} + +void CopyPaletteIntoBufferUnfaded(void *palette, u32 bufferOffset, u32 size) { + CpuCopy16(palette, gPlttBufferUnfaded + bufferOffset, size); +} + +__attribute__((naked)) +void sub_81C795C(struct PaletteDescriptor *palettes) { + // This code matches the assembly almost exactly; however, gcc chooses + // to store `index` in r0 instead of r1. +#ifdef NONMATCHING + struct PaletteDescriptor *current; + u32 offset; + u32 index; + + current = palettes; + for (;;) { + if (current->palette == NULL) { + break; + } + index = AllocSpritePalette(current->tag); + if (index == 0xFF) { + break; + } + offset = (index * 16) + 0x100; + CopyPaletteIntoBufferUnfaded(current->palette, offset, 0x20); + current++; + } +#else // NONMATCHING + asm(".syntax unified\n\ + push {r4,lr}\n\ + adds r4, r0, 0\n\ + b _081C7974\n\ + _081C7962:\n\ + lsls r0, r1, 4\n\ + movs r2, 0x80\n\ + lsls r2, 1\n\ + adds r1, r0, r2\n\ + ldr r0, [r4]\n\ + movs r2, 0x20\n\ + bl CopyPaletteIntoBufferUnfaded\n\ + adds r4, 0x8\n\ + _081C7974:\n\ + ldr r0, [r4]\n\ + cmp r0, 0\n\ + beq _081C7988\n\ + ldrh r0, [r4, 0x4]\n\ + bl AllocSpritePalette\n\ + lsls r0, 24\n\ + lsrs r1, r0, 24\n\ + cmp r1, 0xFF\n\ + bne _081C7962\n\ + _081C7988:\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided"); +#endif // NONMATCHING } \ No newline at end of file From f95eebf47a9fd235f722104d727b0b9da9af4474 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 13 Feb 2019 23:58:49 -0500 Subject: [PATCH 072/217] With help, sub_81C795C has been tamed. Thanks to Garak on the discord server. --- src/pokenav_main.c | 65 +++++++++++----------------------------------- 1 file changed, 15 insertions(+), 50 deletions(-) diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 5610966b76..3e77ba686e 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -605,56 +605,21 @@ void CopyPaletteIntoBufferUnfaded(void *palette, u32 bufferOffset, u32 size) { CpuCopy16(palette, gPlttBufferUnfaded + bufferOffset, size); } -__attribute__((naked)) void sub_81C795C(struct PaletteDescriptor *palettes) { - // This code matches the assembly almost exactly; however, gcc chooses - // to store `index` in r0 instead of r1. -#ifdef NONMATCHING struct PaletteDescriptor *current; - u32 offset; - u32 index; - - current = palettes; - for (;;) { - if (current->palette == NULL) { - break; - } - index = AllocSpritePalette(current->tag); - if (index == 0xFF) { - break; - } - offset = (index * 16) + 0x100; - CopyPaletteIntoBufferUnfaded(current->palette, offset, 0x20); - current++; - } -#else // NONMATCHING - asm(".syntax unified\n\ - push {r4,lr}\n\ - adds r4, r0, 0\n\ - b _081C7974\n\ - _081C7962:\n\ - lsls r0, r1, 4\n\ - movs r2, 0x80\n\ - lsls r2, 1\n\ - adds r1, r0, r2\n\ - ldr r0, [r4]\n\ - movs r2, 0x20\n\ - bl CopyPaletteIntoBufferUnfaded\n\ - adds r4, 0x8\n\ - _081C7974:\n\ - ldr r0, [r4]\n\ - cmp r0, 0\n\ - beq _081C7988\n\ - ldrh r0, [r4, 0x4]\n\ - bl AllocSpritePalette\n\ - lsls r0, 24\n\ - lsrs r1, r0, 24\n\ - cmp r1, 0xFF\n\ - bne _081C7962\n\ - _081C7988:\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided"); -#endif // NONMATCHING + u32 index; + + for (current = palettes; current->palette != NULL; current++) + { + index = AllocSpritePalette(current->tag); + if (index == 0xFF) + { + break; + } + else + { + index = (index * 16) + 0x100; + CopyPaletteIntoBufferUnfaded(current->palette, index, 0x20); + } + } } \ No newline at end of file From d41c597f901383944dbb6689be08beeeb859b9cd Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Thu, 14 Feb 2019 11:55:58 -0500 Subject: [PATCH 073/217] Decompiled sub_81C7990 --- asm/pokenav.s | 22 ---------------------- src/pokenav_main.c | 6 +++++- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index e810049ffb..5f0a2aa917 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,28 +5,6 @@ .text - thumb_func_start sub_81C7990 -sub_81C7990: @ 81C7990 - push {lr} - sub sp, 0x4 - adds r3, r0, 0 - lsls r1, 16 - lsrs r1, 16 - mov r0, sp - strh r1, [r0] - lsls r3, 5 - ldr r0, =gPlttBufferFaded + 0x200 - adds r3, r0 - ldr r2, =0x01000010 - mov r0, sp - adds r1, r3, 0 - bl CpuSet - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C7990 - thumb_func_start sub_81C79BC sub_81C79BC: @ 81C79BC push {r4-r7,lr} diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 3e77ba686e..67d8129124 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -622,4 +622,8 @@ void sub_81C795C(struct PaletteDescriptor *palettes) { CopyPaletteIntoBufferUnfaded(current->palette, index, 0x20); } } -} \ No newline at end of file +} + +void sub_81C7990(u32 a0, u16 a1) { + CpuFill16(a1, gPlttBufferFaded + 0x100 + (a0 * 16), 16 * sizeof(u16)); +} From cb800e4708e08181b9b33296e9ab8c8180518b04 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Thu, 14 Feb 2019 16:30:52 -0500 Subject: [PATCH 074/217] Decompiled 5 functions Was unable to decompile sub_81C79BC. --- asm/pokenav.s | 293 +++------------------------------------------ src/pokenav_main.c | 187 ++++++++++++++++++++++++++++- 2 files changed, 202 insertions(+), 278 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 5f0a2aa917..5409c7aafd 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,267 +5,6 @@ .text - thumb_func_start sub_81C79BC -sub_81C79BC: @ 81C79BC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - str r0, [sp] - str r1, [sp, 0x4] - mov r10, r2 - str r3, [sp, 0x8] - ldr r0, [sp, 0x2C] - cmp r0, 0 - bne _081C79E4 - ldr r2, =0x001fffff - mov r1, r10 - ands r2, r1 - ldr r0, [sp] - b _081C79F4 - .pool -_081C79E4: - ldr r2, [sp, 0x2C] - ldr r0, [sp, 0x8] - cmp r2, r0 - blt _081C7A00 - ldr r2, =0x001fffff - mov r1, r10 - ands r2, r1 - ldr r0, [sp, 0x4] -_081C79F4: - ldr r1, [sp, 0x30] - bl CpuSet - b _081C7AAE - .pool -_081C7A00: - movs r2, 0x1 - negs r2, r2 - add r10, r2 - b _081C7AA6 -_081C7A08: - ldr r1, [sp] - ldrh r0, [r1] - movs r2, 0x1F - mov r9, r2 - mov r1, r9 - ands r1, r0 - mov r9, r1 - lsls r0, 16 - lsrs r2, r0, 21 - movs r1, 0x1F - ands r1, r2 - mov r8, r1 - lsrs r7, r0, 26 - movs r2, 0x1F - ands r7, r2 - ldr r0, [sp, 0x4] - ldrh r4, [r0] - movs r0, 0x1F - ands r0, r4 - mov r1, r9 - subs r0, r1 - lsls r0, 8 - ldr r1, [sp, 0x8] - bl __divsi3 - ldr r2, [sp, 0x2C] - adds r6, r0, 0 - muls r6, r2 - asrs r6, 8 - lsls r4, 16 - lsrs r0, r4, 21 - movs r1, 0x1F - ands r0, r1 - mov r2, r8 - subs r0, r2 - lsls r0, 8 - ldr r1, [sp, 0x8] - bl __divsi3 - ldr r1, [sp, 0x2C] - adds r5, r0, 0 - muls r5, r1 - asrs r5, 8 - lsrs r4, 26 - movs r2, 0x1F - ands r4, r2 - subs r4, r7 - lsls r4, 8 - adds r0, r4, 0 - ldr r1, [sp, 0x8] - bl __divsi3 - ldr r1, [sp, 0x2C] - muls r0, r1 - asrs r0, 8 - add r6, r9 - movs r2, 0x1F - ands r6, r2 - add r5, r8 - ands r5, r2 - adds r0, r7, r0 - ands r0, r2 - lsls r0, 10 - lsls r5, 5 - orrs r0, r5 - orrs r0, r6 - ldr r1, [sp, 0x30] - strh r0, [r1] - ldr r2, [sp] - adds r2, 0x2 - str r2, [sp] - ldr r0, [sp, 0x4] - adds r0, 0x2 - str r0, [sp, 0x4] - adds r1, 0x2 - str r1, [sp, 0x30] - movs r1, 0x1 - negs r1, r1 - add r10, r1 -_081C7AA6: - movs r0, 0x1 - negs r0, r0 - cmp r10, r0 - bne _081C7A08 -_081C7AAE: - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81C79BC - - thumb_func_start sub_81C7AC0 -sub_81C7AC0: @ 81C7AC0 - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - movs r0, 0 - bl sub_81C763C - cmp r4, 0x1 - beq _081C7AF0 - cmp r4, 0x1 - bgt _081C7ADA - cmp r4, 0 - beq _081C7AE4 - b _081C7B2C -_081C7ADA: - cmp r4, 0x2 - beq _081C7B04 - cmp r4, 0x3 - beq _081C7B18 - b _081C7B2C -_081C7AE4: - ldr r0, [r0, 0x14] - movs r1, 0x2 - negs r1, r1 - str r4, [sp] - movs r2, 0 - b _081C7B10 -_081C7AF0: - ldr r0, [r0, 0x14] - movs r1, 0x2 - negs r1, r1 - movs r2, 0 - str r2, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - b _081C7B2C -_081C7B04: - movs r0, 0x1 - negs r0, r0 - movs r1, 0x2 - negs r1, r1 - movs r2, 0 - str r2, [sp] -_081C7B10: - movs r3, 0x10 - bl BeginNormalPaletteFade - b _081C7B2C -_081C7B18: - movs r0, 0x1 - negs r0, r0 - movs r1, 0x2 - negs r1, r1 - movs r2, 0 - str r2, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade -_081C7B2C: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81C7AC0 - - thumb_func_start sub_81C7B34 -sub_81C7B34: @ 81C7B34 - ldr r0, =gPaletteFade - ldrb r0, [r0, 0x7] - lsrs r0, 7 - bx lr - .pool - thumb_func_end sub_81C7B34 - - thumb_func_start sub_81C7B40 -sub_81C7B40: @ 81C7B40 - push {lr} - ldr r0, =0xfffefffe - movs r1, 0x10 - movs r2, 0 - bl BlendPalettes - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C7B40 - - thumb_func_start sub_81C7B54 -sub_81C7B54: @ 81C7B54 - push {r4,r5,lr} - adds r5, r0, 0 - cmp r1, 0 - ble _081C7B6C - adds r4, r1, 0 -_081C7B5E: - adds r0, r5, 0 - adds r5, 0x4 - bl InitBgFromTemplate - subs r4, 0x1 - cmp r4, 0 - bne _081C7B5E -_081C7B6C: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_81C7B54 - - thumb_func_start sub_81C7B74 -sub_81C7B74: @ 81C7B74 - push {r4,lr} - movs r0, 0 - bl sub_81C763C - adds r4, r0, 0 - ldr r0, =gUnknown_0861FA08 - bl InitWindows - movs r0, 0 - str r0, [r4, 0x10] - bl sub_81C7BF8 - ldrb r0, [r4, 0x10] - bl PutWindowTilemap - ldrb r0, [r4, 0x10] - movs r1, 0x3 - bl CopyWindowToVram - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C7B74 - thumb_func_start sub_81C7BA4 sub_81C7BA4: @ 81C7BA4 push {r4,r5,lr} @@ -4420,7 +4159,7 @@ _081C9C06: bl sub_81C7DFC b _081C9AD6 _081C9C0E: - bl sub_81C7B34 + bl IsPaletteFadeActive cmp r0, 0 bne _081C9C5C bl sub_81C9894 @@ -4884,7 +4623,7 @@ _081C9F96: movs r0, 0 b _081C9FBE _081C9FB0: - bl sub_81C7B34 + bl IsPaletteFadeActive cmp r0, 0 beq _081C9FBC _081C9FB8: @@ -7624,7 +7363,7 @@ _081CB4A6: movs r0, 0 b _081CB506 _081CB4EA: - bl sub_81C7B34 + bl IsPaletteFadeActive cmp r0, 0 bne _081CB4FA bl sub_81C8010 @@ -8517,7 +8256,7 @@ _081CBB80: movs r0, 0 b _081CBBB4 _081CBB9A: - bl sub_81C7B34 + bl IsPaletteFadeActive cmp r0, 0 bne _081CBBAA bl sub_81C78C0 @@ -10104,7 +9843,7 @@ _081CC812: bl sub_81C7AC0 b _081CC77C _081CC82A: - bl sub_81C7B34 + bl IsPaletteFadeActive cmp r0, 0 bne _081CC83A bl sub_81C8010 @@ -10290,7 +10029,7 @@ _081CC972: movs r0, 0 b _081CC9BA _081CC982: - bl sub_81C7B34 + bl IsPaletteFadeActive cmp r0, 0 bne _081CC99E bl sub_81C7FDC @@ -13258,7 +12997,7 @@ _081CE1FC: bl sub_81C7FA0 b _081CDFB0 _081CE218: - bl sub_81C7B34 + bl IsPaletteFadeActive cmp r0, 0 bne _081CE2C0 bl sub_81CDD5C @@ -13387,7 +13126,7 @@ _081CE33A: movs r0, 0 b _081CE376 _081CE33E: - bl sub_81C7B34 + bl IsPaletteFadeActive cmp r0, 0 bne _081CE34E bl sub_81C78C0 @@ -15607,7 +15346,7 @@ _081CF552: bl sub_81C7AC0 b _081CF498 _081CF55A: - bl sub_81C7B34 + bl IsPaletteFadeActive cmp r0, 0 bne _081CF56A bl sub_81C8010 @@ -15914,7 +15653,7 @@ _081CF764: movs r0, 0 b _081CF792 _081CF778: - bl sub_81C7B34 + bl IsPaletteFadeActive cmp r0, 0 bne _081CF788 bl sub_81C78C0 @@ -15948,7 +15687,7 @@ _081CF7A4: movs r0, 0 b _081CF7C2 _081CF7B4: - bl sub_81C7B34 + bl IsPaletteFadeActive cmp r0, 0 beq _081CF7C0 movs r0, 0x2 @@ -16981,7 +16720,7 @@ _081CFFA4: bl sub_81C7FA0 b _081CFF32 _081CFFDE: - bl sub_81C7B34 + bl IsPaletteFadeActive cmp r0, 0 bne _081CFFEE bl sub_81C8010 @@ -17288,7 +17027,7 @@ _081D01E8: movs r0, 0 b _081D0216 _081D01FC: - bl sub_81C7B34 + bl IsPaletteFadeActive cmp r0, 0 bne _081D020C bl sub_81C78C0 @@ -17322,7 +17061,7 @@ _081D0228: movs r0, 0 b _081D0246 _081D0238: - bl sub_81C7B34 + bl IsPaletteFadeActive cmp r0, 0 beq _081D0244 movs r0, 0x2 @@ -18583,7 +18322,7 @@ _081D0BE8: movs r0, 0 b _081D0C4A _081D0C3C: - bl sub_81C7B34 + bl IsPaletteFadeActive cmp r0, 0 beq _081D0C48 _081D0C44: @@ -18614,7 +18353,7 @@ _081D0C60: movs r0, 0 b _081D0C7E _081D0C70: - bl sub_81C7B34 + bl IsPaletteFadeActive cmp r0, 0 beq _081D0C7C movs r0, 0x2 diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 67d8129124..fe05f288fc 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -45,6 +45,7 @@ struct UnknownStruct_sub_81C76C4 { }; extern struct BgTemplate gUnknown_0861FA04; +extern struct WindowTemplate gUnknown_0861FA08; extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40; extern u8 gUnknown_0203CF3C; @@ -55,9 +56,9 @@ extern void sub_81CAADC(void); extern void sub_81C99D4(void); extern void sub_81C7C94(void); extern void sub_8199D98(void); -extern void sub_81C7B74(void); extern void sub_81C7C28(void); extern void sub_81C7D28(void); +extern void sub_81C7BF8(void); u32 sub_81C791C(s32 a0); @@ -85,6 +86,7 @@ void sub_81C7334(void); void sub_81C7418(void); void sub_81C7400(void); void sub_81C72BC(void); +void sub_81C7B74(void); u32 sub_81C7078(u32 (*a0)(s32), u32 a1) { @@ -627,3 +629,186 @@ void sub_81C795C(struct PaletteDescriptor *palettes) { void sub_81C7990(u32 a0, u16 a1) { CpuFill16(a1, gPlttBufferFaded + 0x100 + (a0 * 16), 16 * sizeof(u16)); } + +__attribute__((naked)) +void sub_81C79BC(u16* a0, u16* a1, u32 a2, u32 a3, u32 unused, u32 a5, u32 a6) { + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0xC\n\ + str r0, [sp]\n\ + str r1, [sp, 0x4]\n\ + mov r10, r2\n\ + str r3, [sp, 0x8]\n\ + ldr r0, [sp, 0x2C]\n\ + cmp r0, 0\n\ + bne _081C79E4\n\ + ldr r2, =0x001fffff\n\ + mov r1, r10\n\ + ands r2, r1\n\ + ldr r0, [sp]\n\ + b _081C79F4\n\ + .pool\n\ +_081C79E4:\n\ + ldr r2, [sp, 0x2C]\n\ + ldr r0, [sp, 0x8]\n\ + cmp r2, r0\n\ + blt _081C7A00\n\ + ldr r2, =0x001fffff\n\ + mov r1, r10\n\ + ands r2, r1\n\ + ldr r0, [sp, 0x4]\n\ +_081C79F4:\n\ + ldr r1, [sp, 0x30]\n\ + bl CpuSet\n\ + b _081C7AAE\n\ + .pool\n\ +_081C7A00:\n\ + movs r2, 0x1\n\ + negs r2, r2\n\ + add r10, r2\n\ + b _081C7AA6\n\ +_081C7A08:\n\ + ldr r1, [sp]\n\ + ldrh r0, [r1]\n\ + movs r2, 0x1F\n\ + mov r9, r2\n\ + mov r1, r9\n\ + ands r1, r0\n\ + mov r9, r1\n\ + lsls r0, 16\n\ + lsrs r2, r0, 21\n\ + movs r1, 0x1F\n\ + ands r1, r2\n\ + mov r8, r1\n\ + lsrs r7, r0, 26\n\ + movs r2, 0x1F\n\ + ands r7, r2\n\ + ldr r0, [sp, 0x4]\n\ + ldrh r4, [r0]\n\ + movs r0, 0x1F\n\ + ands r0, r4\n\ + mov r1, r9\n\ + subs r0, r1\n\ + lsls r0, 8\n\ + ldr r1, [sp, 0x8]\n\ + bl __divsi3\n\ + ldr r2, [sp, 0x2C]\n\ + adds r6, r0, 0\n\ + muls r6, r2\n\ + asrs r6, 8\n\ + lsls r4, 16\n\ + lsrs r0, r4, 21\n\ + movs r1, 0x1F\n\ + ands r0, r1\n\ + mov r2, r8\n\ + subs r0, r2\n\ + lsls r0, 8\n\ + ldr r1, [sp, 0x8]\n\ + bl __divsi3\n\ + ldr r1, [sp, 0x2C]\n\ + adds r5, r0, 0\n\ + muls r5, r1\n\ + asrs r5, 8\n\ + lsrs r4, 26\n\ + movs r2, 0x1F\n\ + ands r4, r2\n\ + subs r4, r7\n\ + lsls r4, 8\n\ + adds r0, r4, 0\n\ + ldr r1, [sp, 0x8]\n\ + bl __divsi3\n\ + ldr r1, [sp, 0x2C]\n\ + muls r0, r1\n\ + asrs r0, 8\n\ + add r6, r9\n\ + movs r2, 0x1F\n\ + ands r6, r2\n\ + add r5, r8\n\ + ands r5, r2\n\ + adds r0, r7, r0\n\ + ands r0, r2\n\ + lsls r0, 10\n\ + lsls r5, 5\n\ + orrs r0, r5\n\ + orrs r0, r6\n\ + ldr r1, [sp, 0x30]\n\ + strh r0, [r1]\n\ + ldr r2, [sp]\n\ + adds r2, 0x2\n\ + str r2, [sp]\n\ + ldr r0, [sp, 0x4]\n\ + adds r0, 0x2\n\ + str r0, [sp, 0x4]\n\ + adds r1, 0x2\n\ + str r1, [sp, 0x30]\n\ + movs r1, 0x1\n\ + negs r1, r1\n\ + add r10, r1\n\ +_081C7AA6:\n\ + movs r0, 0x1\n\ + negs r0, r0\n\ + cmp r10, r0\n\ + bne _081C7A08\n\ +_081C7AAE:\n\ + add sp, 0xC\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided"); +} + +void sub_81C7AC0(s32 a0) { + u32 *v1; + v1 = sub_81C763C(0); + switch (a0) { + case 0: + BeginNormalPaletteFade(v1[5], -2, 0, 16, a0); + break; + case 1: + BeginNormalPaletteFade(v1[5], -2, 16, 0, 0); + break; + case 2: + BeginNormalPaletteFade(-1, -2, 0, 16, 0); + break; + case 3: + BeginNormalPaletteFade(-1, -2, 16, 0, 0); + break; + } +} + +bool32 IsPaletteFadeActive(void) { + return gPaletteFade.active; +} + +void sub_81C7B40(void) { + BlendPalettes(0xFFFEFFFE, 16, 0); +} + +void sub_81C7B54(const struct BgTemplate *a0, s32 a1) { + s32 i; + if (a1 <= 0) { + return; + } + for (i = a1; i != 0; i--) { + InitBgFromTemplate(a0++); + } +} + +void sub_81C7B74(void) { + u32 *v1; + + v1 = sub_81C763C(0); + InitWindows(&gUnknown_0861FA08); + v1[4] = 0; + sub_81C7BF8(); + PutWindowTilemap(v1[4]); + CopyWindowToVram(v1[4], 3); // TODO: Use a defined constant here. +} \ No newline at end of file From 6d929c61c5b445e488b47655437856e6542d0da9 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Thu, 14 Feb 2019 17:26:34 -0500 Subject: [PATCH 075/217] Decompiled 4 more functions --- asm/pokenav.s | 113 --------------------------------------------- src/pokenav_main.c | 60 +++++++++++++++++++++--- 2 files changed, 54 insertions(+), 119 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 5409c7aafd..2521345623 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,119 +5,6 @@ .text - thumb_func_start sub_81C7BA4 -sub_81C7BA4: @ 81C7BA4 - push {r4,r5,lr} - sub sp, 0xC - adds r4, r0, 0 - movs r0, 0 - bl sub_81C763C - adds r5, r0, 0 - ldr r0, [r5, 0x10] - bl sub_81C7BF8 - ldrb r0, [r5, 0x10] - ldr r1, =gUnknown_0861FA48 - str r1, [sp] - movs r1, 0 - str r1, [sp, 0x4] - ldr r1, =gUnknown_0861FA18 - lsls r4, 2 - adds r4, r1 - ldr r1, [r4] - str r1, [sp, 0x8] - movs r1, 0x1 - movs r2, 0 - movs r3, 0x1 - bl AddTextPrinterParameterized3 - add sp, 0xC - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C7BA4 - - thumb_func_start sub_81C7BE8 -sub_81C7BE8: @ 81C7BE8 - push {lr} - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - thumb_func_end sub_81C7BE8 - - thumb_func_start sub_81C7BF8 -sub_81C7BF8: @ 81C7BF8 - push {r4,lr} - sub sp, 0x8 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r4, 0 - movs r1, 0x44 - bl FillWindowPixelBuffer - movs r0, 0x80 - str r0, [sp] - movs r0, 0x1 - str r0, [sp, 0x4] - adds r0, r4, 0 - movs r1, 0x55 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - add sp, 0x8 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81C7BF8 - - thumb_func_start sub_81C7C28 -sub_81C7C28: @ 81C7C28 - push {r4-r6,lr} - movs r0, 0 - bl sub_81C763C - adds r6, r0, 0 - movs r5, 0 - ldr r4, =gUnknown_0861FA4C -_081C7C36: - adds r0, r4, 0 - bl LoadCompressedSpriteSheet - adds r4, 0x8 - adds r5, 0x1 - cmp r5, 0 - beq _081C7C36 - ldr r0, =gUnknown_0861FA54 - bl sub_81C795C - movs r0, 0 - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x80 - lsls r1, 9 - lsls r1, r0 - movs r0, 0x2 - negs r0, r0 - bics r0, r1 - str r0, [r6, 0x14] - ldr r0, =gUnknown_0861FB04 - movs r1, 0xDC - movs r2, 0xC - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r0, =gSprites - adds r1, r0 - str r1, [r6, 0x18] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C7C28 - thumb_func_start sub_81C7C94 sub_81C7C94: @ 81C7C94 push {lr} diff --git a/src/pokenav_main.c b/src/pokenav_main.c index fe05f288fc..a75a85a187 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -14,6 +14,7 @@ #include "menu.h" #include "graphics.h" #include "gba/macro.h" +#include "decompress.h" #define UNKNOWN_OFFSET 100000 @@ -44,21 +45,28 @@ struct UnknownStruct_sub_81C76C4 { u32 data[523]; }; +struct UnknownStruct_sub_81C7C28 { + struct CompressedSpriteSheet sheet; + u32 field4; +}; + extern struct BgTemplate gUnknown_0861FA04; extern struct WindowTemplate gUnknown_0861FA08; - extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40; extern u8 gUnknown_0203CF3C; +extern u8 gUnknown_0861FA48; extern struct UnknownStruct_0861F3EC gUnknown_0861F3EC[7]; // Unknown size; at least 7. +extern const u8 *(gUnknown_0861FA18[]); +extern const struct CompressedSpriteSheet gUnknown_0861FA4C[]; +extern const struct PaletteDescriptor gUnknown_0861FA54; +extern const struct SpriteTemplate gUnknown_0861FB04; extern void sub_81C9430(void); extern void sub_81CAADC(void); extern void sub_81C99D4(void); extern void sub_81C7C94(void); extern void sub_8199D98(void); -extern void sub_81C7C28(void); extern void sub_81C7D28(void); -extern void sub_81C7BF8(void); u32 sub_81C791C(s32 a0); @@ -77,6 +85,7 @@ void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)); void sub_81C7360(struct UnknownStruct_0203CF40 *a0); void sub_81C7650(u32 index); void sub_81C7850(u32 a0); +void sub_81C7BF8(u32 a0); void sub_81C71E4(u8 a0); void sub_81C7170(u8 a0); void sub_81C742C(u8 taskId); @@ -85,6 +94,7 @@ void sub_81C75F4(void); void sub_81C7334(void); void sub_81C7418(void); void sub_81C7400(void); +void sub_81C7C28(void); void sub_81C72BC(void); void sub_81C7B74(void); @@ -607,8 +617,8 @@ void CopyPaletteIntoBufferUnfaded(void *palette, u32 bufferOffset, u32 size) { CpuCopy16(palette, gPlttBufferUnfaded + bufferOffset, size); } -void sub_81C795C(struct PaletteDescriptor *palettes) { - struct PaletteDescriptor *current; +void sub_81C795C(const struct PaletteDescriptor *palettes) { + const struct PaletteDescriptor *current; u32 index; for (current = palettes; current->palette != NULL; current++) @@ -808,7 +818,45 @@ void sub_81C7B74(void) { v1 = sub_81C763C(0); InitWindows(&gUnknown_0861FA08); v1[4] = 0; - sub_81C7BF8(); + sub_81C7BF8(0); PutWindowTilemap(v1[4]); CopyWindowToVram(v1[4], 3); // TODO: Use a defined constant here. +} + +void sub_81C7BA4(u32 a0) { + u32* v1; + + v1 = sub_81C763C(0); + sub_81C7BF8(v1[4]); + AddTextPrinterParameterized3(v1[4], 1, 0, 1, &gUnknown_0861FA48, 0, gUnknown_0861FA18[a0]); +} + +bool8 sub_81C7BE8(void) { + return IsDma3ManagerBusyWithBgCopy(); +} + +void sub_81C7BF8(u32 a0) { + FillWindowPixelBuffer(a0, 0x44); + FillWindowPixelRect(a0, 0x55, 0, 0, 0x80, 1); +} + +void sub_81C7C28(void) { + u32* v1; + u32 i; + u8 v2; + u32 v3; + u32 v4; + u8 spriteId; + + v1 = sub_81C763C(0); + for (i = 0; i == 0; i++) { + LoadCompressedSpriteSheet(&gUnknown_0861FA4C[i]); + } + + sub_81C795C(&gUnknown_0861FA54); + v2 = IndexOfSpritePaletteTag(0); + v3 = 0x80 << 9 << v2; + v1[5] = -2 & ~v3; + spriteId = CreateSprite(&gUnknown_0861FB04, 0xDC, 0xC, 0); + v1[6] = (u32)(&gSprites[spriteId]); } \ No newline at end of file From 758b8c7f0eda1df1914f4cd34e81c0a768792d59 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Thu, 14 Feb 2019 21:03:52 -0500 Subject: [PATCH 076/217] Decompiled three more functions. --- asm/pokenav.s | 42 ------------------------------------------ src/pokenav_main.c | 25 ++++++++++++++++++++++++- 2 files changed, 24 insertions(+), 43 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 2521345623..01ba420aa2 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,48 +5,6 @@ .text - thumb_func_start sub_81C7C94 -sub_81C7C94: @ 81C7C94 - push {lr} - movs r0, 0 - bl sub_81C763C - ldr r0, [r0, 0x18] - bl DestroySprite - movs r0, 0 - bl FreeSpriteTilesByTag - movs r0, 0 - bl FreeSpritePaletteByTag - pop {r0} - bx r0 - thumb_func_end sub_81C7C94 - - thumb_func_start sub_81C7CB4 -sub_81C7CB4: @ 81C7CB4 - push {r4,lr} - adds r4, r0, 0 - movs r0, 0 - bl GetBgY - lsrs r0, 8 - negs r0, r0 - strh r0, [r4, 0x26] - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81C7CB4 - - thumb_func_start sub_81C7CCC -sub_81C7CCC: @ 81C7CCC - push {lr} - movs r0, 0 - bl sub_81C763C - ldr r0, [r0, 0x18] - ldr r1, =SpriteCallbackDummy - str r1, [r0, 0x1C] - pop {r1} - bx r1 - .pool - thumb_func_end sub_81C7CCC - thumb_func_start sub_81C7CE4 sub_81C7CE4: @ 81C7CE4 push {r4,lr} diff --git a/src/pokenav_main.c b/src/pokenav_main.c index a75a85a187..bc19a908b8 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -64,7 +64,6 @@ extern const struct SpriteTemplate gUnknown_0861FB04; extern void sub_81C9430(void); extern void sub_81CAADC(void); extern void sub_81C99D4(void); -extern void sub_81C7C94(void); extern void sub_8199D98(void); extern void sub_81C7D28(void); @@ -97,6 +96,7 @@ void sub_81C7400(void); void sub_81C7C28(void); void sub_81C72BC(void); void sub_81C7B74(void); +void sub_81C7C94(void); u32 sub_81C7078(u32 (*a0)(s32), u32 a1) { @@ -859,4 +859,27 @@ void sub_81C7C28(void) { v1[5] = -2 & ~v3; spriteId = CreateSprite(&gUnknown_0861FB04, 0xDC, 0xC, 0); v1[6] = (u32)(&gSprites[spriteId]); +} + +void sub_81C7C94(void) { + void **v1; + v1 = sub_81C763C(0); + DestroySprite(v1[6]); + FreeSpriteTilesByTag(0); + FreeSpritePaletteByTag(0); +} + +void sub_81C7CB4(u16 *a0) { + u32 v1; + v1 = GetBgY(0); + a0[19] = (v1 >> 8) * -1; +} + +struct Sprite* sub_81C7CCC(void) { + struct Sprite **v1; + struct Sprite *v2; + v1 = sub_81C763C(0); + v2 = v1[6]; + v2->callback = SpriteCallbackDummy; + return v2; } \ No newline at end of file From bf4c1a73c0e14c88e61bb74f99385414d9b807a9 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Thu, 14 Feb 2019 22:18:47 -0500 Subject: [PATCH 077/217] Start moving pokenav data into C files The types and usage of many of the globals are now known. --- data/pokenav.s | 114 ++-------------------- ld_script.txt | 1 + src/pokenav_main.c | 236 +++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 225 insertions(+), 126 deletions(-) diff --git a/data/pokenav.s b/data/pokenav.s index 1a5e2bd99f..030358715c 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -3,113 +3,6 @@ .section .rodata -gUnknown_0861F3EC:: @ 861F3EC - .4byte sub_81C9298 - .4byte sub_81C941C - .4byte sub_81C9924 - .4byte sub_81C9990 - .4byte sub_81C99C0 - .4byte sub_81C9430 - .4byte sub_81C99D4 - .4byte sub_81C9298 - .4byte sub_81C941C - .4byte sub_81C9940 - .4byte sub_81C9990 - .4byte sub_81C99C0 - .4byte sub_81C9430 - .4byte sub_81C99D4 - .4byte sub_81C9338 - .4byte sub_81C941C - .4byte sub_81C9940 - .4byte sub_81C9990 - .4byte sub_81C99C0 - .4byte sub_81C9430 - .4byte sub_81C99D4 - .4byte sub_81C9368 - .4byte sub_81C941C - .4byte sub_81C9940 - .4byte sub_81C9990 - .4byte sub_81C99C0 - .4byte sub_81C9430 - .4byte sub_81C99D4 - .4byte sub_81C92CC - .4byte sub_81C941C - .4byte sub_81C9940 - .4byte sub_81C9990 - .4byte sub_81C99C0 - .4byte sub_81C9430 - .4byte sub_81C99D4 - .4byte sub_81C9304 - .4byte sub_81C941C - .4byte sub_81C9940 - .4byte sub_81C9990 - .4byte sub_81C99C0 - .4byte sub_81C9430 - .4byte sub_81C99D4 - .4byte sub_81CC4D4 - .4byte sub_81CC554 - .4byte sub_81CC5F4 - .4byte sub_81CC62C - .4byte sub_81CC65C - .4byte sub_81CC524 - .4byte sub_81CC670 - .4byte sub_81CCFD8 - .4byte sub_81CD070 - .4byte sub_81CDDD4 - .4byte sub_81CDE2C - .4byte sub_81CDE64 - .4byte sub_81CD1C0 - .4byte sub_81CECA0 - .4byte sub_81CEF3C - .4byte sub_81CEFDC - .4byte sub_81CF330 - .4byte sub_81CF3A0 - .4byte sub_81CF3D0 - .4byte sub_81CEFF0 - .4byte sub_81CF3F8 - .4byte sub_81CD024 - .4byte sub_81CD070 - .4byte sub_81CDDD4 - .4byte sub_81CDE2C - .4byte sub_81CDE64 - .4byte sub_81CD1C0 - .4byte sub_81CECA0 - .4byte sub_81CEF98 - .4byte sub_81CEFDC - .4byte sub_81CF368 - .4byte sub_81CF3A0 - .4byte sub_81CF3D0 - .4byte sub_81CEFF0 - .4byte sub_81CF3F8 - .4byte sub_81CAAE8 - .4byte sub_81CAB24 - .4byte sub_81CB260 - .4byte sub_81CB29C - .4byte sub_81CB2CC - .4byte sub_81CAB38 - .4byte sub_81CB2E0 - .4byte sub_81CF9BC - .4byte sub_81CFA34 - .4byte sub_81CFDD0 - .4byte sub_81CFE40 - .4byte sub_81CFE70 - .4byte sub_81CFA48 - .4byte sub_81CFE98 - .4byte sub_81D0450 - .4byte sub_81D04A0 - .4byte sub_81D0978 - .4byte sub_81D09B0 - .4byte sub_81D09E0 - .4byte sub_81D04B8 - .4byte sub_81D09F4 - .4byte sub_81CFA04 - .4byte sub_81CFA34 - .4byte sub_81CFE08 - .4byte sub_81CFE40 - .4byte sub_81CFE70 - .4byte sub_81CFA48 - .4byte sub_81CFE98 - gUnknown_0861F590:: @ 861F590 .incbin "graphics/pokenav/icon2.gbapal" @@ -119,6 +12,13 @@ gUnknown_0861F5B0:: @ 861F5B0 gUnknown_0861F994:: @ 861F994 .incbin "graphics/pokenav/icon2_unused.4bpp.lz" +@ struct BgTemplate gUnknown_0861FA04 { +@ .bg: 0, +@ .charBaseIndex: 0 +@ .mapBaseIndex: 5 +@ .screenSize: 2, +@ +@ } gUnknown_0861FA04:: @ 861FA04 .byte 0x50 .byte 0x0 diff --git a/ld_script.txt b/ld_script.txt index a92e1d85e6..8c48cf3166 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -592,6 +592,7 @@ SECTIONS { src/pokemon_summary_screen.o(.rodata); src/unk_pokedex_area_screen_helper.o(.rodata); src/battle_pyramid_bag.o(.rodata); + src/pokenav_main.o(.rodata); data/pokenav.o(.rodata); src/pokenav_match_call.o(.rodata); data/rom_81D1C44.o(.rodata); diff --git a/src/pokenav_main.c b/src/pokenav_main.c index bc19a908b8..0b772ffe66 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -18,6 +18,7 @@ #define UNKNOWN_OFFSET 100000 + struct PaletteDescriptor { void *palette; u16 tag; @@ -50,23 +51,69 @@ struct UnknownStruct_sub_81C7C28 { u32 field4; }; -extern struct BgTemplate gUnknown_0861FA04; -extern struct WindowTemplate gUnknown_0861FA08; -extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40; -extern u8 gUnknown_0203CF3C; -extern u8 gUnknown_0861FA48; -extern struct UnknownStruct_0861F3EC gUnknown_0861F3EC[7]; // Unknown size; at least 7. -extern const u8 *(gUnknown_0861FA18[]); -extern const struct CompressedSpriteSheet gUnknown_0861FA4C[]; -extern const struct PaletteDescriptor gUnknown_0861FA54; -extern const struct SpriteTemplate gUnknown_0861FB04; -extern void sub_81C9430(void); +extern u32 sub_81C9430(void); extern void sub_81CAADC(void); -extern void sub_81C99D4(void); +extern u32 sub_81C99D4(void); extern void sub_8199D98(void); extern void sub_81C7D28(void); - +extern u32 sub_81C9298(void); +extern u32 sub_81C941C(void); +extern u32 sub_81C9924(void); +extern u32 sub_81C99C0(void); +extern u32 sub_81C9990(void); +extern u32 sub_81C9940(void); +extern u32 sub_81C9338(void); +extern u32 sub_81C9368(void); +extern u32 sub_81C92CC(void); +extern u32 sub_81C9304(void); +extern u32 sub_81CC4D4(void); +extern u32 sub_81CC554(void); +extern u32 sub_81CC5F4(void); +extern u32 sub_81CC62C(void); +extern u32 sub_81CC65C(void); +extern u32 sub_81CC524(void); +extern u32 sub_81CC670(void); +extern u32 sub_81CCFD8(void); +extern u32 sub_81CD070(void); +extern u32 sub_81CDDD4(void); +extern u32 sub_81CDE2C(void); +extern u32 sub_81CDE64(void); +extern u32 sub_81CD1C0(void); +extern u32 sub_81CECA0(void); +extern u32 sub_81CEF3C(void); +extern u32 sub_81CEFDC(void); +extern u32 sub_81CF330(void); +extern u32 sub_81CF3A0(void); +extern u32 sub_81CF3D0(void); +extern u32 sub_81CEFF0(void); +extern u32 sub_81CF3F8(void); +extern u32 sub_81CD024(void); +extern u32 sub_81CEF98(void); +extern u32 sub_81CF368(void); +extern u32 sub_81CAAE8(void); +extern u32 sub_81CAB24(void); +extern u32 sub_81CB260(void); +extern u32 sub_81CB29C(void); +extern u32 sub_81CB2CC(void); +extern u32 sub_81CAB38(void); +extern u32 sub_81CB2E0(void); +extern u32 sub_81CF9BC(void); +extern u32 sub_81CFA34(void); +extern u32 sub_81CFDD0(void); +extern u32 sub_81CFE40(void); +extern u32 sub_81CFE70(void); +extern u32 sub_81CFA48(void); +extern u32 sub_81CFE98(void); +extern u32 sub_81D0450(void); +extern u32 sub_81D04A0(void); +extern u32 sub_81D0978(void); +extern u32 sub_81D09B0(void); +extern u32 sub_81D09E0(void); +extern u32 sub_81D04B8(void); +extern u32 sub_81D09F4(void); +extern u32 sub_81CFA04(void); +extern u32 sub_81CFE08(void); u32 sub_81C791C(s32 a0); bool32 sub_81C756C(u32 a0); @@ -98,6 +145,157 @@ void sub_81C72BC(void); void sub_81C7B74(void); void sub_81C7C94(void); + +static u32 (*const gUnknown_0861F3EC[15][7])(void) = +{ + { + (u32 (*)(void))sub_81C9298, + sub_81C941C, + sub_81C9924, + sub_81C9990, + sub_81C99C0, + sub_81C9430, + sub_81C99D4, + }, + { + sub_81C9298, + sub_81C941C, + sub_81C9940, + sub_81C9990, + sub_81C99C0, + sub_81C9430, + sub_81C99D4, + }, + { + sub_81C9338, + sub_81C941C, + sub_81C9940, + sub_81C9990, + sub_81C99C0, + sub_81C9430, + sub_81C99D4, + }, + { + sub_81C9368, + sub_81C941C, + sub_81C9940, + sub_81C9990, + sub_81C99C0, + sub_81C9430, + sub_81C99D4, + }, + { + sub_81C92CC, + sub_81C941C, + sub_81C9940, + sub_81C9990, + sub_81C99C0, + sub_81C9430, + sub_81C99D4, + }, + { + sub_81C9304, + sub_81C941C, + sub_81C9940, + sub_81C9990, + sub_81C99C0, + sub_81C9430, + sub_81C99D4, + }, + { + sub_81CC4D4, + sub_81CC554, + sub_81CC5F4, + sub_81CC62C, + sub_81CC65C, + sub_81CC524, + sub_81CC670, + }, + { + sub_81CCFD8, + sub_81CD070, + sub_81CDDD4, + sub_81CDE2C, + sub_81CDE64, + sub_81CD1C0, + sub_81CECA0, + }, + { + sub_81CEF3C, + sub_81CEFDC, + sub_81CF330, + sub_81CF3A0, + sub_81CF3D0, + sub_81CEFF0, + sub_81CF3F8, + }, + { + sub_81CD024, + sub_81CD070, + sub_81CDDD4, + sub_81CDE2C, + sub_81CDE64, + sub_81CD1C0, + sub_81CECA0, + }, + { + sub_81CEF98, + sub_81CEFDC, + sub_81CF368, + sub_81CF3A0, + sub_81CF3D0, + sub_81CEFF0, + sub_81CF3F8, + }, + { + sub_81CAAE8, + sub_81CAB24, + sub_81CB260, + sub_81CB29C, + sub_81CB2CC, + sub_81CAB38, + sub_81CB2E0, + }, + { + sub_81CF9BC, + sub_81CFA34, + sub_81CFDD0, + sub_81CFE40, + sub_81CFE70, + sub_81CFA48, + sub_81CFE98, + }, + { + sub_81D0450, + sub_81D04A0, + sub_81D0978, + sub_81D09B0, + sub_81D09E0, + sub_81D04B8, + sub_81D09F4, + }, + { + sub_81CFA04, + sub_81CFA34, + sub_81CFE08, + sub_81CFE40, + sub_81CFE70, + sub_81CFA48, + sub_81CFE98, + }, +}; + +extern struct BgTemplate gUnknown_0861FA04; +extern struct WindowTemplate gUnknown_0861FA08; +extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40; +extern u8 gUnknown_0203CF3C; +extern u8 gUnknown_0861FA48; +//extern struct UnknownStruct_0861F3EC gUnknown_0861F3EC[7]; // Unknown size; at least 7. +extern const u8 *(gUnknown_0861FA18[]); +extern const struct CompressedSpriteSheet gUnknown_0861FA4C[]; +extern const struct PaletteDescriptor gUnknown_0861FA54; +extern const struct SpriteTemplate gUnknown_0861FB04; + u32 sub_81C7078(u32 (*a0)(s32), u32 a1) { u16 taskId; @@ -344,8 +542,8 @@ void sub_81C742C(u8 taskId) { sub_81C7710(); dataPtr[0] = 5; } else if (v1 >= UNKNOWN_OFFSET) { - gUnknown_0861F3EC[gUnknown_0203CF40->field4].data[6](); - gUnknown_0861F3EC[gUnknown_0203CF40->field4].data[5](); + gUnknown_0861F3EC[gUnknown_0203CF40->field4][6](); + gUnknown_0861F3EC[gUnknown_0203CF40->field4][5](); if (sub_81C756C(v1)) { dataPtr[0] = 4; } else { @@ -383,14 +581,14 @@ bool32 sub_81C756C(u32 a0) { index = a0 - UNKNOWN_OFFSET; sub_81C75F4(); - if (!gUnknown_0861F3EC[index].data[0]()) { + if (!gUnknown_0861F3EC[index][0]()) { return FALSE; } - if (!gUnknown_0861F3EC[index].data[2]()) { + if (!gUnknown_0861F3EC[index][2]()) { return FALSE; } - sub_81C7834(gUnknown_0861F3EC[index].data[3], gUnknown_0861F3EC[index].data[4]); - gUnknown_0203CF40->field0 = gUnknown_0861F3EC[index].data[1]; + sub_81C7834(gUnknown_0861F3EC[index][3], gUnknown_0861F3EC[index][4]); + gUnknown_0203CF40->field0 = gUnknown_0861F3EC[index][1]; gUnknown_0203CF40->field4 = index; return TRUE; } From a4aaf279ac4a2033b511ddf8d49463c024306112 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Thu, 14 Feb 2019 23:25:07 -0500 Subject: [PATCH 078/217] Move more data into pokenav, name some strings --- data/pokenav.s | 49 ----------------------- include/strings.h | 13 +++++++ src/pokenav_main.c | 96 ++++++++++++++++++++++++++++++++++++---------- src/strings.c | 24 ++++++------ 4 files changed, 100 insertions(+), 82 deletions(-) diff --git a/data/pokenav.s b/data/pokenav.s index 030358715c..284ccee24d 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -3,55 +3,6 @@ .section .rodata -gUnknown_0861F590:: @ 861F590 - .incbin "graphics/pokenav/icon2.gbapal" - -gUnknown_0861F5B0:: @ 861F5B0 - .incbin "graphics/pokenav/icon2.4bpp.lz" - -gUnknown_0861F994:: @ 861F994 - .incbin "graphics/pokenav/icon2_unused.4bpp.lz" - -@ struct BgTemplate gUnknown_0861FA04 { -@ .bg: 0, -@ .charBaseIndex: 0 -@ .mapBaseIndex: 5 -@ .screenSize: 2, -@ -@ } -gUnknown_0861FA04:: @ 861FA04 - .byte 0x50 - .byte 0x0 - .byte 0x0 - .byte 0x0 - -gUnknown_0861FA08:: @ 861FA08 - window_template 0, 1, 0x16, 0x10, 0x2, 0x0, 0x36 - null_window_template - -gUnknown_0861FA18:: @ 861FA18 - .4byte gUnknown_085EBED5 - .4byte gUnknown_085EBED9 - .4byte gUnknown_085EBEE9 - .4byte gUnknown_085EBEF9 - .4byte gUnknown_085EBF0E - .4byte gUnknown_085EBF22 - .4byte gUnknown_085EBF39 - .4byte gUnknown_085EBF49 - .4byte gUnknown_085EBF57 - .4byte gUnknown_085EBF60 - .4byte gUnknown_085EBF73 - .4byte gUnknown_085EBF84 - -gUnknown_0861FA48:: @ 861FA48 - .byte 0x4 - .byte 0x1 - .byte 0x2 - .byte 0x0 - -gUnknown_0861FA4C:: @ 861FA4C - obj_tiles gUnknown_0861F5B0, 0x1000, 0 - gUnknown_0861FA54:: @ 861FA54 obj_pal gUnknown_0861F590, 0 null_obj_pal diff --git a/include/strings.h b/include/strings.h index 9557dcca2a..3acbc1c553 100644 --- a/include/strings.h +++ b/include/strings.h @@ -986,6 +986,19 @@ extern const u8 gText_SomeonesPC[]; extern const u8 gText_PlayersPC[]; extern const u8 gText_WhichPCShouldBeAccessed[]; +extern const u8 gText_Navgear_ClearButtonList[]; +extern const u8 gText_NavgearMap_ZoomedOutButtons[]; +extern const u8 gText_NavgearMap_ZoomedInButtons[]; +extern const u8 gText_NavgearCondition_MonListButtons[]; +extern const u8 gText_NavgearCondition_MonStatusButtons[]; +extern const u8 gText_NavgearCondition_MarkingButtons[]; +extern const u8 gText_NavgearMatchCall_TrainerListButtons[]; +extern const u8 gText_NavgearMatchCall_CallMenuButtons[]; +extern const u8 gText_NavgearMatchCall_CheckTrainerButtons[]; +extern const u8 gText_NavgearRibbons_MonListButtons[]; +extern const u8 gText_NavgearRibbons_RibbonListButtons[]; +extern const u8 gText_NavgearRibbons_RibbonCheckButtons[]; + extern const u8 gUnknown_085EAD37[]; extern const u8 gUnknown_085EAD41[]; extern const u8 gUnknown_085EAD67[]; diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 0b772ffe66..2cf370630b 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -15,6 +15,7 @@ #include "graphics.h" #include "gba/macro.h" #include "decompress.h" +#include "strings.h" #define UNKNOWN_OFFSET 100000 @@ -33,10 +34,6 @@ struct UnknownStruct_0203CF40 { void* field10[19]; }; -struct UnknownStruct_0861F3EC { - u32 (*data[7])(void); -}; - struct UnknownStruct_sub_81C7850 { // Unknown size; at least 3. void (*data[3])(u32); @@ -146,7 +143,7 @@ void sub_81C7B74(void); void sub_81C7C94(void); -static u32 (*const gUnknown_0861F3EC[15][7])(void) = +u32 (*const gUnknown_0861F3EC[15][7])(void) = { { (u32 (*)(void))sub_81C9298, @@ -285,13 +282,70 @@ static u32 (*const gUnknown_0861F3EC[15][7])(void) = }, }; -extern struct BgTemplate gUnknown_0861FA04; -extern struct WindowTemplate gUnknown_0861FA08; +const u16 gUnknown_0861F590[] = INCBIN_U16("graphics/pokenav/icon2.gbapal"); +const u32 gUnknown_0861F5B0[] = INCBIN_U32("graphics/pokenav/icon2.4bpp.lz"); +const u32 gUnknown_0861F994[] = INCBIN_U32("graphics/pokenav/icon2_unused.4bpp.lz"); + +const struct BgTemplate gUnknown_0861FA04 = { + .bg = 0, + .charBaseIndex = 0, + .mapBaseIndex = 5, + .screenSize = 0, + .paletteMode = 0, + .priority = 0, + .baseTile = 0, +}; + +const struct WindowTemplate gUnknown_0861FA08[2] = { + { + .bg = 0, + .tilemapLeft = 1, + .tilemapTop = 0x16, + .width = 0x10, + .height = 0x2, + .paletteNum = 0, + .baseBlock = 0x36, + }, + { + .bg = 0xFF, + .tilemapLeft = 0, + .tilemapTop = 0, + .width = 0, + .height = 0, + .paletteNum = 0, + .baseBlock = 0, + }, +}; + +const u8 *const (MenuButtonReminders[12]) = { + gText_Navgear_ClearButtonList, + gText_NavgearMap_ZoomedOutButtons, + gText_NavgearMap_ZoomedInButtons, + gText_NavgearCondition_MonListButtons, + gText_NavgearCondition_MonStatusButtons, + gText_NavgearCondition_MarkingButtons, + gText_NavgearMatchCall_TrainerListButtons, + gText_NavgearMatchCall_CallMenuButtons, + gText_NavgearMatchCall_CheckTrainerButtons, + gText_NavgearRibbons_MonListButtons, + gText_NavgearRibbons_RibbonListButtons, + gText_NavgearRibbons_RibbonCheckButtons, +}; + +const u8 gMenuButtonReminderColor[4] = { + 4, 1, 2, 0 +}; + +const struct CompressedSpriteSheet gUnknown_0861FA4C[1] = { + { + .data = gUnknown_0861F5B0, + .size = 0x1000, + .tag = 0, + } +}; + extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40; extern u8 gUnknown_0203CF3C; -extern u8 gUnknown_0861FA48; -//extern struct UnknownStruct_0861F3EC gUnknown_0861F3EC[7]; // Unknown size; at least 7. -extern const u8 *(gUnknown_0861FA18[]); extern const struct CompressedSpriteSheet gUnknown_0861FA4C[]; extern const struct PaletteDescriptor gUnknown_0861FA54; extern const struct SpriteTemplate gUnknown_0861FB04; @@ -735,29 +789,29 @@ u32 sub_81C7764(s32 a0) { void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)) { // This is a guess. - struct UnknownStruct_0861F3EC *v1; + u32 (**v1)(void); v1 = sub_81C763C(0); - v1->data[0] = a0; - v1->data[1] = a1; - v1->data[2] = NULL; + v1[0] = a0; + v1[1] = a1; + v1[2] = NULL; } void sub_81C7850(u32 a0) { // This is a guess. - struct UnknownStruct_sub_81C7850 *v1; + void (**v1)(u32); v1 = sub_81C763C(0); - v1->data[2] = NULL; - v1->data[0](a0); + v1[2] = NULL; + v1[0](a0); } u32 sub_81C786C(void) { // This is a guess. - struct UnknownStruct_0861F3EC *v1; + u32 (**v1)(void); v1 = sub_81C763C(0); - return v1->data[1](); + return v1[1](); } void sub_81C7880(void) { @@ -1014,7 +1068,7 @@ void sub_81C7B74(void) { u32 *v1; v1 = sub_81C763C(0); - InitWindows(&gUnknown_0861FA08); + InitWindows(&gUnknown_0861FA08[0]); v1[4] = 0; sub_81C7BF8(0); PutWindowTilemap(v1[4]); @@ -1026,7 +1080,7 @@ void sub_81C7BA4(u32 a0) { v1 = sub_81C763C(0); sub_81C7BF8(v1[4]); - AddTextPrinterParameterized3(v1[4], 1, 0, 1, &gUnknown_0861FA48, 0, gUnknown_0861FA18[a0]); + AddTextPrinterParameterized3(v1[4], 1, 0, 1, gMenuButtonReminderColor, 0, MenuButtonReminders[a0]); } bool8 sub_81C7BE8(void) { diff --git a/src/strings.c b/src/strings.c index b0eb048ba5..f81a19083c 100644 --- a/src/strings.c +++ b/src/strings.c @@ -965,18 +965,18 @@ const u8 gUnknown_085EBE8E[] = _("Can't call opponent here."); const u8 gUnknown_085EBEA8[] = _("STRATEGY"); const u8 gUnknown_085EBEB1[] = _("TRAINER'S POKéMON"); const u8 gUnknown_085EBEC3[] = _("SELF-INTRODUCTION"); -const u8 gUnknown_085EBED5[] = _("{CLEAR 0x80}"); -const u8 gUnknown_085EBED9[] = _("{A_BUTTON}ZOOM {B_BUTTON}CANCEL"); -const u8 gUnknown_085EBEE9[] = _("{A_BUTTON}FULL {B_BUTTON}CANCEL"); -const u8 gUnknown_085EBEF9[] = _("{A_BUTTON}CONDITION {B_BUTTON}CANCEL"); -const u8 gUnknown_085EBF0E[] = _("{A_BUTTON}MARKINGS {B_BUTTON}CANCEL"); -const u8 gUnknown_085EBF22[] = _("{A_BUTTON}SELECT MARK {B_BUTTON}CANCEL"); -const u8 gUnknown_085EBF39[] = _("{A_BUTTON}MENU {B_BUTTON}CANCEL"); -const u8 gUnknown_085EBF49[] = _("{A_BUTTON}OK {B_BUTTON}CANCEL"); -const u8 gUnknown_085EBF57[] = _("{B_BUTTON}CANCEL"); -const u8 gUnknown_085EBF60[] = _("{A_BUTTON}RIBBONS {B_BUTTON}CANCEL"); -const u8 gUnknown_085EBF73[] = _("{A_BUTTON}CHECK {B_BUTTON}CANCEL"); -const u8 gUnknown_085EBF84[] = _("{B_BUTTON}CANCEL"); +const u8 gText_Navgear_ClearButtonList[] = _("{CLEAR 0x80}"); +const u8 gText_NavgearMap_ZoomedOutButtons[] = _("{A_BUTTON}ZOOM {B_BUTTON}CANCEL"); +const u8 gText_NavgearMap_ZoomedInButtons[] = _("{A_BUTTON}FULL {B_BUTTON}CANCEL"); +const u8 gText_NavgearCondition_MonListButtons[] = _("{A_BUTTON}CONDITION {B_BUTTON}CANCEL"); +const u8 gText_NavgearCondition_MonStatusButtons[] = _("{A_BUTTON}MARKINGS {B_BUTTON}CANCEL"); +const u8 gText_NavgearCondition_MarkingButtons[] = _("{A_BUTTON}SELECT MARK {B_BUTTON}CANCEL"); +const u8 gText_NavgearMatchCall_TrainerListButtons[] = _("{A_BUTTON}MENU {B_BUTTON}CANCEL"); +const u8 gText_NavgearMatchCall_CallMenuButtons[] = _("{A_BUTTON}OK {B_BUTTON}CANCEL"); +const u8 gText_NavgearMatchCall_CheckTrainerButtons[] = _("{B_BUTTON}CANCEL"); +const u8 gText_NavgearRibbons_MonListButtons[] = _("{A_BUTTON}RIBBONS {B_BUTTON}CANCEL"); +const u8 gText_NavgearRibbons_RibbonListButtons[] = _("{A_BUTTON}CHECK {B_BUTTON}CANCEL"); +const u8 gText_NavgearRibbons_RibbonCheckButtons[] = _("{B_BUTTON}CANCEL"); const u8 gText_NatureSlash[] = _("NATURE/"); const u8 gText_TrainerCloseBy[] = _("That TRAINER is close by.\nTalk to the TRAINER in person!"); const u8 gText_InParty[] = _("IN PARTY"); From be08a662a8a798f0b630a6ea464568aaec199ad7 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 15 Feb 2019 00:00:01 -0500 Subject: [PATCH 079/217] More data moved into C code --- data/pokenav.s | 7 ------- include/graphics.h | 5 +++++ src/pokenav_main.c | 41 +++++++++++++++++++++++++---------------- 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/data/pokenav.s b/data/pokenav.s index 284ccee24d..cb5030b4ba 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -3,13 +3,6 @@ .section .rodata -gUnknown_0861FA54:: @ 861FA54 - obj_pal gUnknown_0861F590, 0 - null_obj_pal - -gUnknown_0861FA64:: @ 861FA64 - obj_tiles gPokenavLeftHeaderHoennMap_Gfx, 0xC00, 2 - gUnknown_0861FA6C:: @ 861FA6C obj_tiles gPokenavLeftHeaderMainMenu_Gfx, 0x20, 3 obj_tiles gPokenavLeftHeaderCondition_Gfx, 0x20, 1 diff --git a/include/graphics.h b/include/graphics.h index 2ac2f2a5a3..48c00943b1 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4013,6 +4013,11 @@ extern const u16 gPokenavConditionMarker_Pal[]; extern const u16 gPokenavHeader_Pal[]; extern const u32 gPokenavHeader_Gfx[]; extern const u32 gPokenavHeader_Tilemap[]; +extern const u32 gPokenavLeftHeaderHoennMap_Gfx[]; +extern const u32 gPokenavLeftHeaderMainMenu_Gfx[]; +extern const u32 gPokenavLeftHeaderCondition_Gfx[]; +extern const u32 gPokenavLeftHeaderRibbons_Gfx[]; +extern const u32 gPokenavLeftHeaderMatchCall_Gfx[]; extern const u32 gUnknown_08D9862C[]; extern const u32 gUnknown_08D98CC8[]; diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 2cf370630b..f468ffc311 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -19,12 +19,6 @@ #define UNKNOWN_OFFSET 100000 - -struct PaletteDescriptor { - void *palette; - u16 tag; -}; - struct UnknownStruct_0203CF40 { u32 (*field0)(void); u32 field4; @@ -123,7 +117,7 @@ u32 sub_81C786C(void); u32 sub_81C7764(s32 a0); u32 atk47_cmd47(s32 a0); bool32 sub_81C7738(void); -void CopyPaletteIntoBufferUnfaded(void *palette, u32 a1, u32 a2); +void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 a1, u32 a2); void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)); void sub_81C7360(struct UnknownStruct_0203CF40 *a0); void sub_81C7650(u32 index); @@ -344,10 +338,25 @@ const struct CompressedSpriteSheet gUnknown_0861FA4C[1] = { } }; +const struct SpritePalette gUnknown_0861FA54[2] = { + { + .data = gUnknown_0861F590, + .tag = 0, + }, + { + .data = NULL, + .tag = 0, + } +}; + +const struct CompressedSpriteSheet gUnknown_0861FA64 = { + .data = gPokenavLeftHeaderHoennMap_Gfx, + .size = 0xC00, + .tag = 2 +}; + extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40; extern u8 gUnknown_0203CF3C; -extern const struct CompressedSpriteSheet gUnknown_0861FA4C[]; -extern const struct PaletteDescriptor gUnknown_0861FA54; extern const struct SpriteTemplate gUnknown_0861FB04; u32 sub_81C7078(u32 (*a0)(s32), u32 a1) @@ -763,7 +772,7 @@ u32 sub_81C7764(s32 a0) { decompress_and_copy_tile_data_to_vram(0, &gPokenavHeader_Gfx, 0, 0, 0); SetBgTilemapBuffer(0, &v1->data[11]); CopyToBgTilemapBuffer(0, &gPokenavHeader_Tilemap, 0, 0); - CopyPaletteIntoBufferUnfaded(&gPokenavHeader_Pal, 0, 0x20); + CopyPaletteIntoBufferUnfaded(gPokenavHeader_Pal, 0, 0x20); CopyBgTilemapBufferToVram(0); return 0; case 2: @@ -865,15 +874,15 @@ u32 sub_81C791C(s32 a0) { } } -void CopyPaletteIntoBufferUnfaded(void *palette, u32 bufferOffset, u32 size) { +void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 bufferOffset, u32 size) { CpuCopy16(palette, gPlttBufferUnfaded + bufferOffset, size); } -void sub_81C795C(const struct PaletteDescriptor *palettes) { - const struct PaletteDescriptor *current; +void sub_81C795C(const struct SpritePalette *palettes) { + const struct SpritePalette *current; u32 index; - for (current = palettes; current->palette != NULL; current++) + for (current = palettes; current->data != NULL; current++) { index = AllocSpritePalette(current->tag); if (index == 0xFF) @@ -883,7 +892,7 @@ void sub_81C795C(const struct PaletteDescriptor *palettes) { else { index = (index * 16) + 0x100; - CopyPaletteIntoBufferUnfaded(current->palette, index, 0x20); + CopyPaletteIntoBufferUnfaded(current->data, index, 0x20); } } } @@ -1105,7 +1114,7 @@ void sub_81C7C28(void) { LoadCompressedSpriteSheet(&gUnknown_0861FA4C[i]); } - sub_81C795C(&gUnknown_0861FA54); + sub_81C795C(gUnknown_0861FA54); v2 = IndexOfSpritePaletteTag(0); v3 = 0x80 << 9 << v2; v1[5] = -2 & ~v3; From 197ad274b4036b49cce8003c6458d1f83841735b Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 15 Feb 2019 00:07:57 -0500 Subject: [PATCH 080/217] Reformat braces --- src/pokenav_main.c | 338 +++++++++++++++++++++++++++------------------ 1 file changed, 203 insertions(+), 135 deletions(-) diff --git a/src/pokenav_main.c b/src/pokenav_main.c index f468ffc311..ecf381bd8d 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -19,7 +19,8 @@ #define UNKNOWN_OFFSET 100000 -struct UnknownStruct_0203CF40 { +struct UnknownStruct_0203CF40 +{ u32 (*field0)(void); u32 field4; u16 field8; @@ -28,16 +29,19 @@ struct UnknownStruct_0203CF40 { void* field10[19]; }; -struct UnknownStruct_sub_81C7850 { +struct UnknownStruct_sub_81C7850 +{ // Unknown size; at least 3. void (*data[3])(u32); }; -struct UnknownStruct_sub_81C76C4 { +struct UnknownStruct_sub_81C76C4 +{ u32 data[523]; }; -struct UnknownStruct_sub_81C7C28 { +struct UnknownStruct_sub_81C7C28 +{ struct CompressedSpriteSheet sheet; u32 field4; }; @@ -280,7 +284,8 @@ const u16 gUnknown_0861F590[] = INCBIN_U16("graphics/pokenav/icon2.gbapal"); const u32 gUnknown_0861F5B0[] = INCBIN_U32("graphics/pokenav/icon2.4bpp.lz"); const u32 gUnknown_0861F994[] = INCBIN_U32("graphics/pokenav/icon2_unused.4bpp.lz"); -const struct BgTemplate gUnknown_0861FA04 = { +const struct BgTemplate gUnknown_0861FA04 = +{ .bg = 0, .charBaseIndex = 0, .mapBaseIndex = 5, @@ -290,7 +295,8 @@ const struct BgTemplate gUnknown_0861FA04 = { .baseTile = 0, }; -const struct WindowTemplate gUnknown_0861FA08[2] = { +const struct WindowTemplate gUnknown_0861FA08[2] = +{ { .bg = 0, .tilemapLeft = 1, @@ -311,7 +317,8 @@ const struct WindowTemplate gUnknown_0861FA08[2] = { }, }; -const u8 *const (MenuButtonReminders[12]) = { +const u8 *const (MenuButtonReminders[12]) = +{ gText_Navgear_ClearButtonList, gText_NavgearMap_ZoomedOutButtons, gText_NavgearMap_ZoomedInButtons, @@ -326,11 +333,13 @@ const u8 *const (MenuButtonReminders[12]) = { gText_NavgearRibbons_RibbonCheckButtons, }; -const u8 gMenuButtonReminderColor[4] = { +const u8 gMenuButtonReminderColor[4] = +{ 4, 1, 2, 0 }; -const struct CompressedSpriteSheet gUnknown_0861FA4C[1] = { +const struct CompressedSpriteSheet gUnknown_0861FA4C[1] = +{ { .data = gUnknown_0861F5B0, .size = 0x1000, @@ -338,7 +347,8 @@ const struct CompressedSpriteSheet gUnknown_0861FA4C[1] = { } }; -const struct SpritePalette gUnknown_0861FA54[2] = { +const struct SpritePalette gUnknown_0861FA54[2] = +{ { .data = gUnknown_0861F590, .tag = 0, @@ -349,7 +359,8 @@ const struct SpritePalette gUnknown_0861FA54[2] = { } }; -const struct CompressedSpriteSheet gUnknown_0861FA64 = { +const struct CompressedSpriteSheet gUnknown_0861FA64 = +{ .data = gPokenavLeftHeaderHoennMap_Gfx, .size = 0xC00, .tag = 2 @@ -386,22 +397,20 @@ bool32 sub_81C70D8(u32 a0) return TRUE; } else - { return FALSE; - } } bool32 sub_81C7124(u32 a0) { s32 i; - for (i = 0; i < 16; i++) { + for (i = 0; i < 16; i++) + { if (gTasks[i].isActive && (gTasks[i].func == sub_81C7170 || gTasks[i].func == sub_81C71E4)) { u32 arg = GetWordTaskArg((u8)i, 1); - if (arg == a0) { + if (arg == a0) return TRUE; - } } } return FALSE; @@ -416,7 +425,8 @@ void sub_81C7170(u8 taskId) func = (u32 (*)(u32))GetWordTaskArg(taskId, 1); dataPtr = gTasks[taskId].data; exitLoop = FALSE; - while (!exitLoop) { + while (!exitLoop) + { u32 v1 =((u32 (*)(u32))func)(dataPtr[0]); switch (v1) { case 1: @@ -439,18 +449,19 @@ void sub_81C7170(u8 taskId) } } -void sub_81C71E4(u8 taskId) { +void sub_81C71E4(u8 taskId) +{ u32 (*func)(u32); s16 *data; u32 v1; - if (sub_8087598()) { + if (sub_8087598()) return; - } func = (u32 (*)(u32))GetWordTaskArg(taskId, 1); data = gTasks[taskId].data; v1 = func(data[0]); - switch (v1) { + switch (v1) + { case 0: case 1: data[0]++; @@ -481,18 +492,22 @@ void CB2_PokeNav(void) } } -void sub_81C72A4() { +void sub_81C72A4() +{ SetMainCallback2(sub_81C72BC); FadeScreen(1, 0); } -void sub_81C72BC() { +void sub_81C72BC() +{ UpdatePaletteFade(); - if (!gPaletteFade.active) { + if (!gPaletteFade.active) + { gUnknown_0203CF40 = Alloc(sizeof(struct UnknownStruct_0203CF40)); - if (gUnknown_0203CF40 == NULL) { + if (gUnknown_0203CF40 == NULL) SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); - } else { + else + { sub_81C7360(gUnknown_0203CF40); gUnknown_0203CF40->field8 = 1; ResetTasks(); @@ -506,9 +521,11 @@ void sub_81C72BC() { } } -void sub_81C7334() { +void sub_81C7334() +{ s32 i; - for (i = 0; i < 19; i++) { + for (i = 0; i < 19; i++) + { sub_81C7650(i); } @@ -518,7 +535,8 @@ void sub_81C7334() { } // Clears UnknownStruct_0203CF40 -void sub_81C7360(struct UnknownStruct_0203CF40 *a0) { +void sub_81C7360(struct UnknownStruct_0203CF40 *a0) +{ s32 i; void **arrayPtr; void *fill; @@ -526,7 +544,8 @@ void sub_81C7360(struct UnknownStruct_0203CF40 *a0) { fill = NULL; i = 18; arrayPtr = &(a0->field10[18]); - for (i; i >= 0; i--) { + for (i; i >= 0; i--) + { *arrayPtr = fill; arrayPtr -= 1; } @@ -536,11 +555,13 @@ void sub_81C7360(struct UnknownStruct_0203CF40 *a0) { a0->field0 = NULL; } -bool32 AnyMonHasRibbon() { +bool32 AnyMonHasRibbon() +{ s32 i; s32 j; - for (i = 0; i < 6; i++) { + for (i = 0; i < 6; i++) + { if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_HAS_SPECIES) && !GetMonData(&gPlayerParty[i], MON_DATA_SANITY_IS_EGG) && GetMonData(&gPlayerParty[i], MON_DATA_RIBBON_COUNT) != 0) @@ -549,8 +570,10 @@ bool32 AnyMonHasRibbon() { } } - for (j = 0; j < 14; j++) { - for (i = 0; i < 30; i++) { + for (j = 0; j < 14; j++) + { + for (i = 0; i < 30; i++) + { if (CheckBoxMonSanityAt(j, i) && GetBoxMonDataAt(j, i, MON_DATA_RIBBON_COUNT) != 0) { @@ -562,167 +585,187 @@ bool32 AnyMonHasRibbon() { return FALSE; } -void sub_81C7400() { +void sub_81C7400() +{ RunTasks(); AnimateSprites(); BuildOamBuffer(); UpdatePaletteFade(); } -void sub_81C7418() { +void sub_81C7418() +{ TransferPlttBuffer(); LoadOam(); ProcessSpriteCopyRequests(); } -void sub_81C742C(u8 taskId) { +void sub_81C742C(u8 taskId) +{ s16* dataPtr; u32 v1; bool32 v2; dataPtr = gTasks[taskId].data; - switch (dataPtr[0]) { + switch (dataPtr[0]) + { case 0: sub_81C76C4(); dataPtr[0] = 1; break; case 1: - if (sub_81C76FC()) { + if (sub_81C76FC()) break; - } sub_81C756C(UNKNOWN_OFFSET); dataPtr[0] = 4; break; case 2: - if (sub_81C786C()) { + if (sub_81C786C()) break; - } dataPtr[0] = 3; case 3: v1 = sub_81C75E0(); - if (v1 == -1) { + if (v1 == -1) + { sub_81C7710(); dataPtr[0] = 5; - } else if (v1 >= UNKNOWN_OFFSET) { + } + else if (v1 >= UNKNOWN_OFFSET) + { gUnknown_0861F3EC[gUnknown_0203CF40->field4][6](); gUnknown_0861F3EC[gUnknown_0203CF40->field4][5](); - if (sub_81C756C(v1)) { + if (sub_81C756C(v1)) dataPtr[0] = 4; - } else { + else + { sub_81C7710(); dataPtr[0] = 5; } - } else if (v1 != 0) { + } + else if (v1 != 0) + { sub_81C7850(v1); - if (sub_81C786C()) { + if (sub_81C786C()) dataPtr[0] = 2; - } } break; case 4: - if (!sub_81C75D4()) { + if (!sub_81C75D4()) dataPtr[0] = 3; - } break; case 5: - if (!sub_81C7738()) { + if (!sub_81C7738()) + { v2 = gUnknown_0203CF40->field8 != 0; sub_81C9430(); sub_81C7334(); - if (v2) { + if (v2) SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); - } else { + else SetMainCallback2(CB2_ReturnToFieldWithOpenMenu); - } } } } -bool32 sub_81C756C(u32 a0) { +bool32 sub_81C756C(u32 a0) +{ u32 index; index = a0 - UNKNOWN_OFFSET; sub_81C75F4(); - if (!gUnknown_0861F3EC[index][0]()) { + if (!gUnknown_0861F3EC[index][0]()) return FALSE; - } - if (!gUnknown_0861F3EC[index][2]()) { + if (!gUnknown_0861F3EC[index][2]()) return FALSE; - } sub_81C7834(gUnknown_0861F3EC[index][3], gUnknown_0861F3EC[index][4]); gUnknown_0203CF40->field0 = gUnknown_0861F3EC[index][1]; gUnknown_0203CF40->field4 = index; return TRUE; } -u32 sub_81C75D4(void) { +u32 sub_81C75D4(void) +{ return sub_81C786C(); } -u32 sub_81C75E0(void) { +u32 sub_81C75E0(void) +{ return gUnknown_0203CF40->field0(); } -void sub_81C75F4(void) { +void sub_81C75F4(void) +{ InitKeys(); } -void IndirectSetVBlankCallback(IntrCallback callback) { +void IndirectSetVBlankCallback(IntrCallback callback) +{ SetVBlankCallback(callback); } -void sub_81C760C(void) { +void sub_81C760C(void) +{ SetVBlankCallback(sub_81C7418); } -void* sub_81C761C(u32 index, u32 size) { +void* sub_81C761C(u32 index, u32 size) +{ return gUnknown_0203CF40->field10[index] = (void*)Alloc(size); } -void* sub_81C763C(u32 index) { +void* sub_81C763C(u32 index) +{ return gUnknown_0203CF40->field10[index]; } -void sub_81C7650(u32 index) { - if (gUnknown_0203CF40->field10[index] != NULL) { +void sub_81C7650(u32 index) +{ + if (gUnknown_0203CF40->field10[index] != NULL) + { Free(gUnknown_0203CF40->field10[index]); gUnknown_0203CF40->field10[index] = NULL; } } -u16 sub_81C767C(void) { +u16 sub_81C767C(void) +{ return gUnknown_0203CF40->field8; } -void sub_81C7688(u16 a0) { +void sub_81C7688(u16 a0) +{ gUnknown_0203CF40->field8 = a0; } -void sub_81C7694(u32 a0) { +void sub_81C7694(u32 a0) +{ u32 value; value = a0; - if (a0 > 4) { + if (a0 > 4) value = 0; - } gUnknown_0203CF40->fieldA = value; } -u16 sub_81C76AC(void) { +u16 sub_81C76AC(void) +{ return gUnknown_0203CF40->fieldA; } -u32 sub_81C76B8(void) { +u32 sub_81C76B8(void) +{ return gUnknown_0203CF40->fieldC; } -bool32 sub_81C76C4(void) { +bool32 sub_81C76C4(void) +{ struct UnknownStruct_sub_81C76C4 *v1; v1 = (struct UnknownStruct_sub_81C76C4*)sub_81C761C(0, sizeof(struct UnknownStruct_sub_81C76C4)); - if (v1 == NULL) { + if (v1 == NULL) return FALSE; - } else { + else + { ResetSpriteData(); FreeAllSpritePalettes(); v1->data[3] = sub_81C7078(sub_81C7764, 1); @@ -730,35 +773,40 @@ bool32 sub_81C76C4(void) { } } -u32 sub_81C76FC(void) { +u32 sub_81C76FC(void) +{ // This is a guess. struct UnknownStruct_sub_81C76C4 *v1; v1 = sub_81C763C(0); return sub_81C70D8(v1->data[3]); } -void sub_81C7710(void) { +void sub_81C7710(void) +{ PlaySE(SE_PN_OFF); sub_81CAADC(); BeginNormalPaletteFade(-1, -1, 0, 16, 0); } -bool32 sub_81C7738(void) { - if (!gPaletteFade.active) { +bool32 sub_81C7738(void) +{ + if (!gPaletteFade.active) + { sub_81C99D4(); sub_81C7C94(); FreeAllWindowBuffers(); return FALSE; - } else { + } else return TRUE; - } } -u32 sub_81C7764(s32 a0) { +u32 sub_81C7764(s32 a0) +{ // This is a guess. struct UnknownStruct_sub_81C76C4 *v1; - switch (a0) { + switch (a0) + { case 0: SetGpuReg(0, 0x82 << 5); FreeAllWindowBuffers(); @@ -776,28 +824,26 @@ u32 sub_81C7764(s32 a0) { CopyBgTilemapBufferToVram(0); return 0; case 2: - if (free_temp_tile_data_buffers_if_possible()) { + if (free_temp_tile_data_buffers_if_possible()) return 2; - } else { - sub_81C7B74(); - return 0; - } + + sub_81C7B74(); + return 0; case 3: - if (IsDma3ManagerBusyWithBgCopy()) { + if (IsDma3ManagerBusyWithBgCopy()) return 2; - } else { - sub_81C7C28(); - sub_81C7D28(); - ShowBg(0); - return 4; - } + + sub_81C7C28(); + sub_81C7D28(); + ShowBg(0); + return 4; default: return 4; } } -void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)) { - // This is a guess. +void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)) +{ u32 (**v1)(void); v1 = sub_81C763C(0); @@ -806,8 +852,8 @@ void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)) { v1[2] = NULL; } -void sub_81C7850(u32 a0) { - // This is a guess. +void sub_81C7850(u32 a0) +{ void (**v1)(u32); v1 = sub_81C763C(0); @@ -815,15 +861,16 @@ void sub_81C7850(u32 a0) { v1[0](a0); } -u32 sub_81C786C(void) { - // This is a guess. +u32 sub_81C786C(void) +{ u32 (**v1)(void); v1 = sub_81C763C(0); return v1[1](); } -void sub_81C7880(void) { +void sub_81C7880(void) +{ // This is a guess. struct UnknownStruct_0203CF40* v1; @@ -831,7 +878,8 @@ void sub_81C7880(void) { v1->fieldC = sub_81C7078(atk47_cmd47, 4); } -void sub_81C78A0(void) { +void sub_81C78A0(void) +{ // This is a guess. struct UnknownStruct_0203CF40* v1; @@ -839,7 +887,8 @@ void sub_81C78A0(void) { v1->fieldC = sub_81C7078(sub_81C791C, 4); } -bool32 sub_81C78C0(void) { +bool32 sub_81C78C0(void) +{ // This is a guess. struct UnknownStruct_0203CF40* v1; @@ -847,8 +896,10 @@ bool32 sub_81C78C0(void) { return sub_81C70D8(v1->fieldC); } -u32 atk47_cmd47(s32 a0) { - switch (a0) { +u32 atk47_cmd47(s32 a0) +{ + switch (a0) + { default: return 4; case 1: @@ -856,12 +907,13 @@ u32 atk47_cmd47(s32 a0) { case 0: return 0; case 2: - if ((u32)ChangeBgY(0, 384, 1) >= 0x2000) { + if ((u32)ChangeBgY(0, 384, 1) >= 0x2000) + { ChangeBgY(0, 0x2000, 0); return 4; - } else { - return 2; } + + return 2; } } @@ -869,16 +921,16 @@ u32 sub_81C791C(s32 a0) { if (ChangeBgY(0, 384, 2) <= 0) { ChangeBgY(0, 0, 0); return 4; - } else { - return 2; } + return 2; } void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 bufferOffset, u32 size) { CpuCopy16(palette, gPlttBufferUnfaded + bufferOffset, size); } -void sub_81C795C(const struct SpritePalette *palettes) { +void sub_81C795C(const struct SpritePalette *palettes) +{ const struct SpritePalette *current; u32 index; @@ -897,12 +949,14 @@ void sub_81C795C(const struct SpritePalette *palettes) { } } -void sub_81C7990(u32 a0, u16 a1) { +void sub_81C7990(u32 a0, u16 a1) +{ CpuFill16(a1, gPlttBufferFaded + 0x100 + (a0 * 16), 16 * sizeof(u16)); } __attribute__((naked)) -void sub_81C79BC(u16* a0, u16* a1, u32 a2, u32 a3, u32 unused, u32 a5, u32 a6) { +void sub_81C79BC(u16* a0, u16* a1, u32 a2, u32 a3, u32 unused, u32 a5, u32 a6) +{ asm(".syntax unified\n\ push {r4-r7,lr}\n\ mov r7, r10\n\ @@ -1036,10 +1090,12 @@ _081C7AAE:\n\ .syntax divided"); } -void sub_81C7AC0(s32 a0) { +void sub_81C7AC0(s32 a0) +{ u32 *v1; v1 = sub_81C763C(0); - switch (a0) { + switch (a0) + { case 0: BeginNormalPaletteFade(v1[5], -2, 0, 16, a0); break; @@ -1055,25 +1111,29 @@ void sub_81C7AC0(s32 a0) { } } -bool32 IsPaletteFadeActive(void) { +bool32 IsPaletteFadeActive(void) +{ return gPaletteFade.active; } -void sub_81C7B40(void) { +void sub_81C7B40(void) +{ BlendPalettes(0xFFFEFFFE, 16, 0); } -void sub_81C7B54(const struct BgTemplate *a0, s32 a1) { +void sub_81C7B54(const struct BgTemplate *a0, s32 a1) +{ s32 i; - if (a1 <= 0) { + if (a1 <= 0) return; - } - for (i = a1; i != 0; i--) { + for (i = a1; i != 0; i--) + { InitBgFromTemplate(a0++); } } -void sub_81C7B74(void) { +void sub_81C7B74(void) +{ u32 *v1; v1 = sub_81C763C(0); @@ -1084,7 +1144,8 @@ void sub_81C7B74(void) { CopyWindowToVram(v1[4], 3); // TODO: Use a defined constant here. } -void sub_81C7BA4(u32 a0) { +void sub_81C7BA4(u32 a0) +{ u32* v1; v1 = sub_81C763C(0); @@ -1092,16 +1153,19 @@ void sub_81C7BA4(u32 a0) { AddTextPrinterParameterized3(v1[4], 1, 0, 1, gMenuButtonReminderColor, 0, MenuButtonReminders[a0]); } -bool8 sub_81C7BE8(void) { +bool8 sub_81C7BE8(void) +{ return IsDma3ManagerBusyWithBgCopy(); } -void sub_81C7BF8(u32 a0) { +void sub_81C7BF8(u32 a0) +{ FillWindowPixelBuffer(a0, 0x44); FillWindowPixelRect(a0, 0x55, 0, 0, 0x80, 1); } -void sub_81C7C28(void) { +void sub_81C7C28(void) +{ u32* v1; u32 i; u8 v2; @@ -1110,7 +1174,8 @@ void sub_81C7C28(void) { u8 spriteId; v1 = sub_81C763C(0); - for (i = 0; i == 0; i++) { + for (i = 0; i == 0; i++) + { LoadCompressedSpriteSheet(&gUnknown_0861FA4C[i]); } @@ -1122,7 +1187,8 @@ void sub_81C7C28(void) { v1[6] = (u32)(&gSprites[spriteId]); } -void sub_81C7C94(void) { +void sub_81C7C94(void) +{ void **v1; v1 = sub_81C763C(0); DestroySprite(v1[6]); @@ -1130,13 +1196,15 @@ void sub_81C7C94(void) { FreeSpritePaletteByTag(0); } -void sub_81C7CB4(u16 *a0) { +void sub_81C7CB4(u16 *a0) +{ u32 v1; v1 = GetBgY(0); a0[19] = (v1 >> 8) * -1; } -struct Sprite* sub_81C7CCC(void) { +struct Sprite* sub_81C7CCC(void) +{ struct Sprite **v1; struct Sprite *v2; v1 = sub_81C763C(0); From fbcfb69fe6a0f29a5d28b3ca066d30d8a79602b8 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 15 Feb 2019 00:20:24 -0500 Subject: [PATCH 081/217] Remove guess code, fix pointer formatting --- src/pokenav_main.c | 54 ++++++++++++++++------------------------------ 1 file changed, 18 insertions(+), 36 deletions(-) diff --git a/src/pokenav_main.c b/src/pokenav_main.c index ecf381bd8d..fd86903e74 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -26,13 +26,7 @@ struct UnknownStruct_0203CF40 u16 field8; u16 fieldA; u32 fieldC; - void* field10[19]; -}; - -struct UnknownStruct_sub_81C7850 -{ - // Unknown size; at least 3. - void (*data[3])(u32); + void *field10[19]; }; struct UnknownStruct_sub_81C76C4 @@ -40,13 +34,6 @@ struct UnknownStruct_sub_81C76C4 u32 data[523]; }; -struct UnknownStruct_sub_81C7C28 -{ - struct CompressedSpriteSheet sheet; - u32 field4; -}; - - extern u32 sub_81C9430(void); extern void sub_81CAADC(void); extern u32 sub_81C99D4(void); @@ -602,7 +589,7 @@ void sub_81C7418() void sub_81C742C(u8 taskId) { - s16* dataPtr; + s16 *dataPtr; u32 v1; bool32 v2; @@ -709,12 +696,12 @@ void sub_81C760C(void) SetVBlankCallback(sub_81C7418); } -void* sub_81C761C(u32 index, u32 size) +void *sub_81C761C(u32 index, u32 size) { return gUnknown_0203CF40->field10[index] = (void*)Alloc(size); } -void* sub_81C763C(u32 index) +void *sub_81C763C(u32 index) { return gUnknown_0203CF40->field10[index]; } @@ -775,10 +762,9 @@ bool32 sub_81C76C4(void) u32 sub_81C76FC(void) { - // This is a guess. - struct UnknownStruct_sub_81C76C4 *v1; + u32 *v1; v1 = sub_81C763C(0); - return sub_81C70D8(v1->data[3]); + return sub_81C70D8(v1[3]); } void sub_81C7710(void) @@ -802,8 +788,7 @@ bool32 sub_81C7738(void) u32 sub_81C7764(s32 a0) { - // This is a guess. - struct UnknownStruct_sub_81C76C4 *v1; + u32 *v1; switch (a0) { @@ -818,7 +803,7 @@ u32 sub_81C7764(s32 a0) case 1: v1 = sub_81C763C(0); decompress_and_copy_tile_data_to_vram(0, &gPokenavHeader_Gfx, 0, 0, 0); - SetBgTilemapBuffer(0, &v1->data[11]); + SetBgTilemapBuffer(0, &v1[11]); CopyToBgTilemapBuffer(0, &gPokenavHeader_Tilemap, 0, 0); CopyPaletteIntoBufferUnfaded(gPokenavHeader_Pal, 0, 0x20); CopyBgTilemapBufferToVram(0); @@ -871,29 +856,26 @@ u32 sub_81C786C(void) void sub_81C7880(void) { - // This is a guess. - struct UnknownStruct_0203CF40* v1; + u32 *v1; v1 = sub_81C763C(0); - v1->fieldC = sub_81C7078(atk47_cmd47, 4); + v1[3] = sub_81C7078(atk47_cmd47, 4); } void sub_81C78A0(void) { - // This is a guess. - struct UnknownStruct_0203CF40* v1; + u32 *v1; v1 = sub_81C763C(0); - v1->fieldC = sub_81C7078(sub_81C791C, 4); + v1[3] = sub_81C7078(sub_81C791C, 4); } bool32 sub_81C78C0(void) { - // This is a guess. - struct UnknownStruct_0203CF40* v1; + u32 *v1; v1 = sub_81C763C(0); - return sub_81C70D8(v1->fieldC); + return sub_81C70D8(v1[3]); } u32 atk47_cmd47(s32 a0) @@ -955,7 +937,7 @@ void sub_81C7990(u32 a0, u16 a1) } __attribute__((naked)) -void sub_81C79BC(u16* a0, u16* a1, u32 a2, u32 a3, u32 unused, u32 a5, u32 a6) +void sub_81C79BC(u16 *a0, u16 *a1, u32 a2, u32 a3, u32 unused, u32 a5, u32 a6) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -1146,7 +1128,7 @@ void sub_81C7B74(void) void sub_81C7BA4(u32 a0) { - u32* v1; + u32 *v1; v1 = sub_81C763C(0); sub_81C7BF8(v1[4]); @@ -1166,7 +1148,7 @@ void sub_81C7BF8(u32 a0) void sub_81C7C28(void) { - u32* v1; + u32 *v1; u32 i; u8 v2; u32 v3; @@ -1203,7 +1185,7 @@ void sub_81C7CB4(u16 *a0) a0[19] = (v1 >> 8) * -1; } -struct Sprite* sub_81C7CCC(void) +struct Sprite *sub_81C7CCC(void) { struct Sprite **v1; struct Sprite *v2; From bfeb7fb32a04ee80481a7cd03a1522764182e2d8 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 15 Feb 2019 00:29:32 -0500 Subject: [PATCH 082/217] Tabs converted to spaces. Oops. --- src/pokenav_main.c | 1484 ++++++++++++++++++++++---------------------- 1 file changed, 742 insertions(+), 742 deletions(-) diff --git a/src/pokenav_main.c b/src/pokenav_main.c index fd86903e74..992bca3f04 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -21,17 +21,17 @@ struct UnknownStruct_0203CF40 { - u32 (*field0)(void); - u32 field4; - u16 field8; - u16 fieldA; - u32 fieldC; - void *field10[19]; + u32 (*field0)(void); + u32 field4; + u16 field8; + u16 fieldA; + u32 fieldC; + void *field10[19]; }; struct UnknownStruct_sub_81C76C4 { - u32 data[523]; + u32 data[523]; }; extern u32 sub_81C9430(void); @@ -130,141 +130,141 @@ void sub_81C7C94(void); u32 (*const gUnknown_0861F3EC[15][7])(void) = { - { - (u32 (*)(void))sub_81C9298, - sub_81C941C, - sub_81C9924, - sub_81C9990, - sub_81C99C0, - sub_81C9430, - sub_81C99D4, - }, - { - sub_81C9298, - sub_81C941C, - sub_81C9940, - sub_81C9990, - sub_81C99C0, - sub_81C9430, - sub_81C99D4, - }, - { - sub_81C9338, - sub_81C941C, - sub_81C9940, - sub_81C9990, - sub_81C99C0, - sub_81C9430, - sub_81C99D4, - }, - { - sub_81C9368, - sub_81C941C, - sub_81C9940, - sub_81C9990, - sub_81C99C0, - sub_81C9430, - sub_81C99D4, - }, - { - sub_81C92CC, - sub_81C941C, - sub_81C9940, - sub_81C9990, - sub_81C99C0, - sub_81C9430, - sub_81C99D4, - }, - { - sub_81C9304, - sub_81C941C, - sub_81C9940, - sub_81C9990, - sub_81C99C0, - sub_81C9430, - sub_81C99D4, - }, - { - sub_81CC4D4, - sub_81CC554, - sub_81CC5F4, - sub_81CC62C, - sub_81CC65C, - sub_81CC524, - sub_81CC670, - }, - { - sub_81CCFD8, - sub_81CD070, - sub_81CDDD4, - sub_81CDE2C, - sub_81CDE64, - sub_81CD1C0, - sub_81CECA0, - }, - { - sub_81CEF3C, - sub_81CEFDC, - sub_81CF330, - sub_81CF3A0, - sub_81CF3D0, - sub_81CEFF0, - sub_81CF3F8, - }, - { - sub_81CD024, - sub_81CD070, - sub_81CDDD4, - sub_81CDE2C, - sub_81CDE64, - sub_81CD1C0, - sub_81CECA0, - }, - { - sub_81CEF98, - sub_81CEFDC, - sub_81CF368, - sub_81CF3A0, - sub_81CF3D0, - sub_81CEFF0, - sub_81CF3F8, - }, - { - sub_81CAAE8, - sub_81CAB24, - sub_81CB260, - sub_81CB29C, - sub_81CB2CC, - sub_81CAB38, - sub_81CB2E0, - }, - { - sub_81CF9BC, - sub_81CFA34, - sub_81CFDD0, - sub_81CFE40, - sub_81CFE70, - sub_81CFA48, - sub_81CFE98, - }, - { - sub_81D0450, - sub_81D04A0, - sub_81D0978, - sub_81D09B0, - sub_81D09E0, - sub_81D04B8, - sub_81D09F4, - }, - { - sub_81CFA04, - sub_81CFA34, - sub_81CFE08, - sub_81CFE40, - sub_81CFE70, - sub_81CFA48, - sub_81CFE98, - }, + { + (u32 (*)(void))sub_81C9298, + sub_81C941C, + sub_81C9924, + sub_81C9990, + sub_81C99C0, + sub_81C9430, + sub_81C99D4, + }, + { + sub_81C9298, + sub_81C941C, + sub_81C9940, + sub_81C9990, + sub_81C99C0, + sub_81C9430, + sub_81C99D4, + }, + { + sub_81C9338, + sub_81C941C, + sub_81C9940, + sub_81C9990, + sub_81C99C0, + sub_81C9430, + sub_81C99D4, + }, + { + sub_81C9368, + sub_81C941C, + sub_81C9940, + sub_81C9990, + sub_81C99C0, + sub_81C9430, + sub_81C99D4, + }, + { + sub_81C92CC, + sub_81C941C, + sub_81C9940, + sub_81C9990, + sub_81C99C0, + sub_81C9430, + sub_81C99D4, + }, + { + sub_81C9304, + sub_81C941C, + sub_81C9940, + sub_81C9990, + sub_81C99C0, + sub_81C9430, + sub_81C99D4, + }, + { + sub_81CC4D4, + sub_81CC554, + sub_81CC5F4, + sub_81CC62C, + sub_81CC65C, + sub_81CC524, + sub_81CC670, + }, + { + sub_81CCFD8, + sub_81CD070, + sub_81CDDD4, + sub_81CDE2C, + sub_81CDE64, + sub_81CD1C0, + sub_81CECA0, + }, + { + sub_81CEF3C, + sub_81CEFDC, + sub_81CF330, + sub_81CF3A0, + sub_81CF3D0, + sub_81CEFF0, + sub_81CF3F8, + }, + { + sub_81CD024, + sub_81CD070, + sub_81CDDD4, + sub_81CDE2C, + sub_81CDE64, + sub_81CD1C0, + sub_81CECA0, + }, + { + sub_81CEF98, + sub_81CEFDC, + sub_81CF368, + sub_81CF3A0, + sub_81CF3D0, + sub_81CEFF0, + sub_81CF3F8, + }, + { + sub_81CAAE8, + sub_81CAB24, + sub_81CB260, + sub_81CB29C, + sub_81CB2CC, + sub_81CAB38, + sub_81CB2E0, + }, + { + sub_81CF9BC, + sub_81CFA34, + sub_81CFDD0, + sub_81CFE40, + sub_81CFE70, + sub_81CFA48, + sub_81CFE98, + }, + { + sub_81D0450, + sub_81D04A0, + sub_81D0978, + sub_81D09B0, + sub_81D09E0, + sub_81D04B8, + sub_81D09F4, + }, + { + sub_81CFA04, + sub_81CFA34, + sub_81CFE08, + sub_81CFE40, + sub_81CFE70, + sub_81CFA48, + sub_81CFE98, + }, }; const u16 gUnknown_0861F590[] = INCBIN_U16("graphics/pokenav/icon2.gbapal"); @@ -273,84 +273,84 @@ const u32 gUnknown_0861F994[] = INCBIN_U32("graphics/pokenav/icon2_unused.4bpp.l const struct BgTemplate gUnknown_0861FA04 = { - .bg = 0, - .charBaseIndex = 0, - .mapBaseIndex = 5, - .screenSize = 0, - .paletteMode = 0, - .priority = 0, - .baseTile = 0, + .bg = 0, + .charBaseIndex = 0, + .mapBaseIndex = 5, + .screenSize = 0, + .paletteMode = 0, + .priority = 0, + .baseTile = 0, }; const struct WindowTemplate gUnknown_0861FA08[2] = { - { - .bg = 0, - .tilemapLeft = 1, - .tilemapTop = 0x16, - .width = 0x10, - .height = 0x2, - .paletteNum = 0, - .baseBlock = 0x36, - }, - { - .bg = 0xFF, - .tilemapLeft = 0, - .tilemapTop = 0, - .width = 0, - .height = 0, - .paletteNum = 0, - .baseBlock = 0, - }, + { + .bg = 0, + .tilemapLeft = 1, + .tilemapTop = 0x16, + .width = 0x10, + .height = 0x2, + .paletteNum = 0, + .baseBlock = 0x36, + }, + { + .bg = 0xFF, + .tilemapLeft = 0, + .tilemapTop = 0, + .width = 0, + .height = 0, + .paletteNum = 0, + .baseBlock = 0, + }, }; const u8 *const (MenuButtonReminders[12]) = { - gText_Navgear_ClearButtonList, - gText_NavgearMap_ZoomedOutButtons, - gText_NavgearMap_ZoomedInButtons, - gText_NavgearCondition_MonListButtons, - gText_NavgearCondition_MonStatusButtons, - gText_NavgearCondition_MarkingButtons, - gText_NavgearMatchCall_TrainerListButtons, - gText_NavgearMatchCall_CallMenuButtons, - gText_NavgearMatchCall_CheckTrainerButtons, - gText_NavgearRibbons_MonListButtons, - gText_NavgearRibbons_RibbonListButtons, - gText_NavgearRibbons_RibbonCheckButtons, + gText_Navgear_ClearButtonList, + gText_NavgearMap_ZoomedOutButtons, + gText_NavgearMap_ZoomedInButtons, + gText_NavgearCondition_MonListButtons, + gText_NavgearCondition_MonStatusButtons, + gText_NavgearCondition_MarkingButtons, + gText_NavgearMatchCall_TrainerListButtons, + gText_NavgearMatchCall_CallMenuButtons, + gText_NavgearMatchCall_CheckTrainerButtons, + gText_NavgearRibbons_MonListButtons, + gText_NavgearRibbons_RibbonListButtons, + gText_NavgearRibbons_RibbonCheckButtons, }; const u8 gMenuButtonReminderColor[4] = { - 4, 1, 2, 0 + 4, 1, 2, 0 }; const struct CompressedSpriteSheet gUnknown_0861FA4C[1] = { - { - .data = gUnknown_0861F5B0, - .size = 0x1000, - .tag = 0, - } + { + .data = gUnknown_0861F5B0, + .size = 0x1000, + .tag = 0, + } }; const struct SpritePalette gUnknown_0861FA54[2] = { - { - .data = gUnknown_0861F590, - .tag = 0, - }, - { - .data = NULL, - .tag = 0, - } + { + .data = gUnknown_0861F590, + .tag = 0, + }, + { + .data = NULL, + .tag = 0, + } }; const struct CompressedSpriteSheet gUnknown_0861FA64 = { - .data = gPokenavLeftHeaderHoennMap_Gfx, - .size = 0xC00, - .tag = 2 + .data = gPokenavLeftHeaderHoennMap_Gfx, + .size = 0xC00, + .tag = 2 }; extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40; @@ -363,7 +363,7 @@ u32 sub_81C7078(u32 (*a0)(s32), u32 a1) if (!is_c1_link_related_active()) taskId = CreateTask(sub_81C7170, a1); - else + else taskId = CreateTask(sub_81C71E4, a1); SetWordTaskArg(taskId, 1, (u32)a0); @@ -374,94 +374,94 @@ u32 sub_81C7078(u32 (*a0)(s32), u32 a1) bool32 sub_81C70D8(u32 a0) { - u32 v1 = a0 & 0xFFFF; - u32 v2 = a0 >> 16; - if (gTasks[v1].isActive - && (gTasks[v1].func == sub_81C7170 || gTasks[v1].func == sub_81C71E4) - && gTasks[v1].data[3] == v2) - { - - return TRUE; - } - else - return FALSE; + u32 v1 = a0 & 0xFFFF; + u32 v2 = a0 >> 16; + if (gTasks[v1].isActive + && (gTasks[v1].func == sub_81C7170 || gTasks[v1].func == sub_81C71E4) + && gTasks[v1].data[3] == v2) + { + + return TRUE; + } + else + return FALSE; } bool32 sub_81C7124(u32 a0) { - s32 i; - for (i = 0; i < 16; i++) - { - if (gTasks[i].isActive - && (gTasks[i].func == sub_81C7170 || gTasks[i].func == sub_81C71E4)) - { - u32 arg = GetWordTaskArg((u8)i, 1); - if (arg == a0) - return TRUE; - } - } - return FALSE; + s32 i; + for (i = 0; i < 16; i++) + { + if (gTasks[i].isActive + && (gTasks[i].func == sub_81C7170 || gTasks[i].func == sub_81C71E4)) + { + u32 arg = GetWordTaskArg((u8)i, 1); + if (arg == a0) + return TRUE; + } + } + return FALSE; } void sub_81C7170(u8 taskId) { - s16 *dataPtr; - u32 (*func)(u32); - bool32 exitLoop; + s16 *dataPtr; + u32 (*func)(u32); + bool32 exitLoop; - func = (u32 (*)(u32))GetWordTaskArg(taskId, 1); - dataPtr = gTasks[taskId].data; - exitLoop = FALSE; - while (!exitLoop) - { - u32 v1 =((u32 (*)(u32))func)(dataPtr[0]); - switch (v1) { - case 1: - dataPtr[0] = dataPtr[0] + 1; - break; - case 0: - dataPtr[0]++; - return; - case 4: - DestroyTask(taskId); - return; - default: - dataPtr[0] = v1 - 5; - break; - case 3: - break; - case 2: - return; - } - } + func = (u32 (*)(u32))GetWordTaskArg(taskId, 1); + dataPtr = gTasks[taskId].data; + exitLoop = FALSE; + while (!exitLoop) + { + u32 v1 =((u32 (*)(u32))func)(dataPtr[0]); + switch (v1) { + case 1: + dataPtr[0] = dataPtr[0] + 1; + break; + case 0: + dataPtr[0]++; + return; + case 4: + DestroyTask(taskId); + return; + default: + dataPtr[0] = v1 - 5; + break; + case 3: + break; + case 2: + return; + } + } } void sub_81C71E4(u8 taskId) { - u32 (*func)(u32); - s16 *data; - u32 v1; + u32 (*func)(u32); + s16 *data; + u32 v1; - if (sub_8087598()) - return; - func = (u32 (*)(u32))GetWordTaskArg(taskId, 1); - data = gTasks[taskId].data; - v1 = func(data[0]); - switch (v1) - { - case 0: - case 1: - data[0]++; - break; - case 4: - DestroyTask(taskId); - break; - default: - data[0] = v1 - 5; - break; - case 2: - case 3: - } + if (sub_8087598()) + return; + func = (u32 (*)(u32))GetWordTaskArg(taskId, 1); + data = gTasks[taskId].data; + v1 = func(data[0]); + switch (v1) + { + case 0: + case 1: + data[0]++; + break; + case 4: + DestroyTask(taskId); + break; + default: + data[0] = v1 - 5; + break; + case 2: + case 3: + } } void CB2_PokeNav(void) @@ -481,439 +481,439 @@ void CB2_PokeNav(void) void sub_81C72A4() { - SetMainCallback2(sub_81C72BC); - FadeScreen(1, 0); + SetMainCallback2(sub_81C72BC); + FadeScreen(1, 0); } void sub_81C72BC() { - UpdatePaletteFade(); - if (!gPaletteFade.active) - { - gUnknown_0203CF40 = Alloc(sizeof(struct UnknownStruct_0203CF40)); - if (gUnknown_0203CF40 == NULL) - SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); - else - { - sub_81C7360(gUnknown_0203CF40); - gUnknown_0203CF40->field8 = 1; - ResetTasks(); - ResetSpriteData(); - FreeAllSpritePalettes(); - SetVBlankCallback(NULL); - CreateTask(sub_81C742C, 0); - SetMainCallback2(sub_81C7400); - SetVBlankCallback(sub_81C7418); - } - } + UpdatePaletteFade(); + if (!gPaletteFade.active) + { + gUnknown_0203CF40 = Alloc(sizeof(struct UnknownStruct_0203CF40)); + if (gUnknown_0203CF40 == NULL) + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); + else + { + sub_81C7360(gUnknown_0203CF40); + gUnknown_0203CF40->field8 = 1; + ResetTasks(); + ResetSpriteData(); + FreeAllSpritePalettes(); + SetVBlankCallback(NULL); + CreateTask(sub_81C742C, 0); + SetMainCallback2(sub_81C7400); + SetVBlankCallback(sub_81C7418); + } + } } void sub_81C7334() { - s32 i; - for (i = 0; i < 19; i++) - { - sub_81C7650(i); - } + s32 i; + for (i = 0; i < 19; i++) + { + sub_81C7650(i); + } - Free(gUnknown_0203CF40); - gUnknown_0203CF40 = NULL; - InitKeys(); + Free(gUnknown_0203CF40); + gUnknown_0203CF40 = NULL; + InitKeys(); } // Clears UnknownStruct_0203CF40 void sub_81C7360(struct UnknownStruct_0203CF40 *a0) { - s32 i; - void **arrayPtr; - void *fill; + s32 i; + void **arrayPtr; + void *fill; - fill = NULL; - i = 18; - arrayPtr = &(a0->field10[18]); - for (i; i >= 0; i--) - { - *arrayPtr = fill; - arrayPtr -= 1; - } - a0->field8 = 0; - a0->field4 = 0; - a0->fieldC = AnyMonHasRibbon(); - a0->field0 = NULL; + fill = NULL; + i = 18; + arrayPtr = &(a0->field10[18]); + for (i; i >= 0; i--) + { + *arrayPtr = fill; + arrayPtr -= 1; + } + a0->field8 = 0; + a0->field4 = 0; + a0->fieldC = AnyMonHasRibbon(); + a0->field0 = NULL; } bool32 AnyMonHasRibbon() { - s32 i; - s32 j; + s32 i; + s32 j; - for (i = 0; i < 6; i++) - { - if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_HAS_SPECIES) - && !GetMonData(&gPlayerParty[i], MON_DATA_SANITY_IS_EGG) - && GetMonData(&gPlayerParty[i], MON_DATA_RIBBON_COUNT) != 0) - { - return TRUE; - } - } + for (i = 0; i < 6; i++) + { + if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_HAS_SPECIES) + && !GetMonData(&gPlayerParty[i], MON_DATA_SANITY_IS_EGG) + && GetMonData(&gPlayerParty[i], MON_DATA_RIBBON_COUNT) != 0) + { + return TRUE; + } + } - for (j = 0; j < 14; j++) - { - for (i = 0; i < 30; i++) - { - if (CheckBoxMonSanityAt(j, i) - && GetBoxMonDataAt(j, i, MON_DATA_RIBBON_COUNT) != 0) - { - return TRUE; - } - } - } + for (j = 0; j < 14; j++) + { + for (i = 0; i < 30; i++) + { + if (CheckBoxMonSanityAt(j, i) + && GetBoxMonDataAt(j, i, MON_DATA_RIBBON_COUNT) != 0) + { + return TRUE; + } + } + } - return FALSE; + return FALSE; } void sub_81C7400() { - RunTasks(); - AnimateSprites(); - BuildOamBuffer(); - UpdatePaletteFade(); + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + UpdatePaletteFade(); } void sub_81C7418() { - TransferPlttBuffer(); - LoadOam(); - ProcessSpriteCopyRequests(); + TransferPlttBuffer(); + LoadOam(); + ProcessSpriteCopyRequests(); } void sub_81C742C(u8 taskId) { - s16 *dataPtr; - u32 v1; - bool32 v2; + s16 *dataPtr; + u32 v1; + bool32 v2; - dataPtr = gTasks[taskId].data; + dataPtr = gTasks[taskId].data; - switch (dataPtr[0]) - { - case 0: - sub_81C76C4(); - dataPtr[0] = 1; - break; - case 1: - if (sub_81C76FC()) - break; - sub_81C756C(UNKNOWN_OFFSET); - dataPtr[0] = 4; - break; - case 2: - if (sub_81C786C()) - break; - dataPtr[0] = 3; - case 3: - v1 = sub_81C75E0(); - if (v1 == -1) - { - sub_81C7710(); - dataPtr[0] = 5; - } - else if (v1 >= UNKNOWN_OFFSET) - { - gUnknown_0861F3EC[gUnknown_0203CF40->field4][6](); - gUnknown_0861F3EC[gUnknown_0203CF40->field4][5](); - if (sub_81C756C(v1)) - dataPtr[0] = 4; - else - { - sub_81C7710(); - dataPtr[0] = 5; - } - } - else if (v1 != 0) - { - sub_81C7850(v1); - if (sub_81C786C()) - dataPtr[0] = 2; - } - break; - case 4: - if (!sub_81C75D4()) - dataPtr[0] = 3; - break; - case 5: - if (!sub_81C7738()) - { - v2 = gUnknown_0203CF40->field8 != 0; - sub_81C9430(); - sub_81C7334(); - if (v2) - SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); - else - SetMainCallback2(CB2_ReturnToFieldWithOpenMenu); - } - } + switch (dataPtr[0]) + { + case 0: + sub_81C76C4(); + dataPtr[0] = 1; + break; + case 1: + if (sub_81C76FC()) + break; + sub_81C756C(UNKNOWN_OFFSET); + dataPtr[0] = 4; + break; + case 2: + if (sub_81C786C()) + break; + dataPtr[0] = 3; + case 3: + v1 = sub_81C75E0(); + if (v1 == -1) + { + sub_81C7710(); + dataPtr[0] = 5; + } + else if (v1 >= UNKNOWN_OFFSET) + { + gUnknown_0861F3EC[gUnknown_0203CF40->field4][6](); + gUnknown_0861F3EC[gUnknown_0203CF40->field4][5](); + if (sub_81C756C(v1)) + dataPtr[0] = 4; + else + { + sub_81C7710(); + dataPtr[0] = 5; + } + } + else if (v1 != 0) + { + sub_81C7850(v1); + if (sub_81C786C()) + dataPtr[0] = 2; + } + break; + case 4: + if (!sub_81C75D4()) + dataPtr[0] = 3; + break; + case 5: + if (!sub_81C7738()) + { + v2 = gUnknown_0203CF40->field8 != 0; + sub_81C9430(); + sub_81C7334(); + if (v2) + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); + else + SetMainCallback2(CB2_ReturnToFieldWithOpenMenu); + } + } } bool32 sub_81C756C(u32 a0) { - u32 index; + u32 index; - index = a0 - UNKNOWN_OFFSET; - sub_81C75F4(); - if (!gUnknown_0861F3EC[index][0]()) - return FALSE; - if (!gUnknown_0861F3EC[index][2]()) - return FALSE; - sub_81C7834(gUnknown_0861F3EC[index][3], gUnknown_0861F3EC[index][4]); - gUnknown_0203CF40->field0 = gUnknown_0861F3EC[index][1]; - gUnknown_0203CF40->field4 = index; - return TRUE; + index = a0 - UNKNOWN_OFFSET; + sub_81C75F4(); + if (!gUnknown_0861F3EC[index][0]()) + return FALSE; + if (!gUnknown_0861F3EC[index][2]()) + return FALSE; + sub_81C7834(gUnknown_0861F3EC[index][3], gUnknown_0861F3EC[index][4]); + gUnknown_0203CF40->field0 = gUnknown_0861F3EC[index][1]; + gUnknown_0203CF40->field4 = index; + return TRUE; } u32 sub_81C75D4(void) { - return sub_81C786C(); + return sub_81C786C(); } u32 sub_81C75E0(void) { - return gUnknown_0203CF40->field0(); + return gUnknown_0203CF40->field0(); } void sub_81C75F4(void) { - InitKeys(); + InitKeys(); } void IndirectSetVBlankCallback(IntrCallback callback) { - SetVBlankCallback(callback); + SetVBlankCallback(callback); } void sub_81C760C(void) { - SetVBlankCallback(sub_81C7418); + SetVBlankCallback(sub_81C7418); } void *sub_81C761C(u32 index, u32 size) { - return gUnknown_0203CF40->field10[index] = (void*)Alloc(size); + return gUnknown_0203CF40->field10[index] = (void*)Alloc(size); } void *sub_81C763C(u32 index) { - return gUnknown_0203CF40->field10[index]; + return gUnknown_0203CF40->field10[index]; } void sub_81C7650(u32 index) { - if (gUnknown_0203CF40->field10[index] != NULL) - { - Free(gUnknown_0203CF40->field10[index]); - gUnknown_0203CF40->field10[index] = NULL; - } + if (gUnknown_0203CF40->field10[index] != NULL) + { + Free(gUnknown_0203CF40->field10[index]); + gUnknown_0203CF40->field10[index] = NULL; + } } u16 sub_81C767C(void) { - return gUnknown_0203CF40->field8; + return gUnknown_0203CF40->field8; } void sub_81C7688(u16 a0) { - gUnknown_0203CF40->field8 = a0; + gUnknown_0203CF40->field8 = a0; } void sub_81C7694(u32 a0) { - u32 value; - value = a0; - if (a0 > 4) - value = 0; - gUnknown_0203CF40->fieldA = value; + u32 value; + value = a0; + if (a0 > 4) + value = 0; + gUnknown_0203CF40->fieldA = value; } u16 sub_81C76AC(void) { - return gUnknown_0203CF40->fieldA; + return gUnknown_0203CF40->fieldA; } u32 sub_81C76B8(void) { - return gUnknown_0203CF40->fieldC; + return gUnknown_0203CF40->fieldC; } bool32 sub_81C76C4(void) { - struct UnknownStruct_sub_81C76C4 *v1; + struct UnknownStruct_sub_81C76C4 *v1; - v1 = (struct UnknownStruct_sub_81C76C4*)sub_81C761C(0, sizeof(struct UnknownStruct_sub_81C76C4)); - if (v1 == NULL) - return FALSE; - else - { - ResetSpriteData(); - FreeAllSpritePalettes(); - v1->data[3] = sub_81C7078(sub_81C7764, 1); - return TRUE; - } + v1 = (struct UnknownStruct_sub_81C76C4*)sub_81C761C(0, sizeof(struct UnknownStruct_sub_81C76C4)); + if (v1 == NULL) + return FALSE; + else + { + ResetSpriteData(); + FreeAllSpritePalettes(); + v1->data[3] = sub_81C7078(sub_81C7764, 1); + return TRUE; + } } u32 sub_81C76FC(void) { - u32 *v1; - v1 = sub_81C763C(0); - return sub_81C70D8(v1[3]); + u32 *v1; + v1 = sub_81C763C(0); + return sub_81C70D8(v1[3]); } void sub_81C7710(void) { - PlaySE(SE_PN_OFF); - sub_81CAADC(); - BeginNormalPaletteFade(-1, -1, 0, 16, 0); + PlaySE(SE_PN_OFF); + sub_81CAADC(); + BeginNormalPaletteFade(-1, -1, 0, 16, 0); } bool32 sub_81C7738(void) { - if (!gPaletteFade.active) - { - sub_81C99D4(); - sub_81C7C94(); - FreeAllWindowBuffers(); - return FALSE; - } else - return TRUE; + if (!gPaletteFade.active) + { + sub_81C99D4(); + sub_81C7C94(); + FreeAllWindowBuffers(); + return FALSE; + } else + return TRUE; } u32 sub_81C7764(s32 a0) { - u32 *v1; + u32 *v1; - switch (a0) - { - case 0: - SetGpuReg(0, 0x82 << 5); - FreeAllWindowBuffers(); - ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, &gUnknown_0861FA04, 1); - sub_8199D98(); - reset_temp_tile_data_buffers(); - return 1; - case 1: - v1 = sub_81C763C(0); - decompress_and_copy_tile_data_to_vram(0, &gPokenavHeader_Gfx, 0, 0, 0); - SetBgTilemapBuffer(0, &v1[11]); - CopyToBgTilemapBuffer(0, &gPokenavHeader_Tilemap, 0, 0); - CopyPaletteIntoBufferUnfaded(gPokenavHeader_Pal, 0, 0x20); - CopyBgTilemapBufferToVram(0); - return 0; - case 2: - if (free_temp_tile_data_buffers_if_possible()) - return 2; - - sub_81C7B74(); - return 0; - case 3: - if (IsDma3ManagerBusyWithBgCopy()) - return 2; + switch (a0) + { + case 0: + SetGpuReg(0, 0x82 << 5); + FreeAllWindowBuffers(); + ResetBgsAndClearDma3BusyFlags(0); + InitBgsFromTemplates(0, &gUnknown_0861FA04, 1); + sub_8199D98(); + reset_temp_tile_data_buffers(); + return 1; + case 1: + v1 = sub_81C763C(0); + decompress_and_copy_tile_data_to_vram(0, &gPokenavHeader_Gfx, 0, 0, 0); + SetBgTilemapBuffer(0, &v1[11]); + CopyToBgTilemapBuffer(0, &gPokenavHeader_Tilemap, 0, 0); + CopyPaletteIntoBufferUnfaded(gPokenavHeader_Pal, 0, 0x20); + CopyBgTilemapBufferToVram(0); + return 0; + case 2: + if (free_temp_tile_data_buffers_if_possible()) + return 2; + + sub_81C7B74(); + return 0; + case 3: + if (IsDma3ManagerBusyWithBgCopy()) + return 2; - sub_81C7C28(); - sub_81C7D28(); - ShowBg(0); - return 4; - default: - return 4; - } + sub_81C7C28(); + sub_81C7D28(); + ShowBg(0); + return 4; + default: + return 4; + } } void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)) { - u32 (**v1)(void); + u32 (**v1)(void); - v1 = sub_81C763C(0); - v1[0] = a0; - v1[1] = a1; - v1[2] = NULL; + v1 = sub_81C763C(0); + v1[0] = a0; + v1[1] = a1; + v1[2] = NULL; } void sub_81C7850(u32 a0) { - void (**v1)(u32); + void (**v1)(u32); - v1 = sub_81C763C(0); - v1[2] = NULL; - v1[0](a0); + v1 = sub_81C763C(0); + v1[2] = NULL; + v1[0](a0); } u32 sub_81C786C(void) { - u32 (**v1)(void); + u32 (**v1)(void); - v1 = sub_81C763C(0); - return v1[1](); + v1 = sub_81C763C(0); + return v1[1](); } void sub_81C7880(void) { - u32 *v1; - - v1 = sub_81C763C(0); - v1[3] = sub_81C7078(atk47_cmd47, 4); + u32 *v1; + + v1 = sub_81C763C(0); + v1[3] = sub_81C7078(atk47_cmd47, 4); } void sub_81C78A0(void) { - u32 *v1; + u32 *v1; - v1 = sub_81C763C(0); - v1[3] = sub_81C7078(sub_81C791C, 4); + v1 = sub_81C763C(0); + v1[3] = sub_81C7078(sub_81C791C, 4); } bool32 sub_81C78C0(void) { - u32 *v1; + u32 *v1; - v1 = sub_81C763C(0); - return sub_81C70D8(v1[3]); + v1 = sub_81C763C(0); + return sub_81C70D8(v1[3]); } u32 atk47_cmd47(s32 a0) { - switch (a0) - { - default: - return 4; - case 1: - return 0; - case 0: - return 0; - case 2: - if ((u32)ChangeBgY(0, 384, 1) >= 0x2000) - { - ChangeBgY(0, 0x2000, 0); - return 4; - } - - return 2; - } + switch (a0) + { + default: + return 4; + case 1: + return 0; + case 0: + return 0; + case 2: + if ((u32)ChangeBgY(0, 384, 1) >= 0x2000) + { + ChangeBgY(0, 0x2000, 0); + return 4; + } + + return 2; + } } u32 sub_81C791C(s32 a0) { - if (ChangeBgY(0, 384, 2) <= 0) { - ChangeBgY(0, 0, 0); - return 4; - } - return 2; + if (ChangeBgY(0, 384, 2) <= 0) { + ChangeBgY(0, 0, 0); + return 4; + } + return 2; } void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 bufferOffset, u32 size) { - CpuCopy16(palette, gPlttBufferUnfaded + bufferOffset, size); + CpuCopy16(palette, gPlttBufferUnfaded + bufferOffset, size); } void sub_81C795C(const struct SpritePalette *palettes) { - const struct SpritePalette *current; + const struct SpritePalette *current; u32 index; for (current = palettes; current->data != NULL; current++) @@ -933,264 +933,264 @@ void sub_81C795C(const struct SpritePalette *palettes) void sub_81C7990(u32 a0, u16 a1) { - CpuFill16(a1, gPlttBufferFaded + 0x100 + (a0 * 16), 16 * sizeof(u16)); + CpuFill16(a1, gPlttBufferFaded + 0x100 + (a0 * 16), 16 * sizeof(u16)); } __attribute__((naked)) void sub_81C79BC(u16 *a0, u16 *a1, u32 a2, u32 a3, u32 unused, u32 a5, u32 a6) { - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0xC\n\ - str r0, [sp]\n\ - str r1, [sp, 0x4]\n\ - mov r10, r2\n\ - str r3, [sp, 0x8]\n\ - ldr r0, [sp, 0x2C]\n\ - cmp r0, 0\n\ - bne _081C79E4\n\ - ldr r2, =0x001fffff\n\ - mov r1, r10\n\ - ands r2, r1\n\ - ldr r0, [sp]\n\ - b _081C79F4\n\ - .pool\n\ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0xC\n\ + str r0, [sp]\n\ + str r1, [sp, 0x4]\n\ + mov r10, r2\n\ + str r3, [sp, 0x8]\n\ + ldr r0, [sp, 0x2C]\n\ + cmp r0, 0\n\ + bne _081C79E4\n\ + ldr r2, =0x001fffff\n\ + mov r1, r10\n\ + ands r2, r1\n\ + ldr r0, [sp]\n\ + b _081C79F4\n\ + .pool\n\ _081C79E4:\n\ - ldr r2, [sp, 0x2C]\n\ - ldr r0, [sp, 0x8]\n\ - cmp r2, r0\n\ - blt _081C7A00\n\ - ldr r2, =0x001fffff\n\ - mov r1, r10\n\ - ands r2, r1\n\ - ldr r0, [sp, 0x4]\n\ + ldr r2, [sp, 0x2C]\n\ + ldr r0, [sp, 0x8]\n\ + cmp r2, r0\n\ + blt _081C7A00\n\ + ldr r2, =0x001fffff\n\ + mov r1, r10\n\ + ands r2, r1\n\ + ldr r0, [sp, 0x4]\n\ _081C79F4:\n\ - ldr r1, [sp, 0x30]\n\ - bl CpuSet\n\ - b _081C7AAE\n\ - .pool\n\ + ldr r1, [sp, 0x30]\n\ + bl CpuSet\n\ + b _081C7AAE\n\ + .pool\n\ _081C7A00:\n\ - movs r2, 0x1\n\ - negs r2, r2\n\ - add r10, r2\n\ - b _081C7AA6\n\ + movs r2, 0x1\n\ + negs r2, r2\n\ + add r10, r2\n\ + b _081C7AA6\n\ _081C7A08:\n\ - ldr r1, [sp]\n\ - ldrh r0, [r1]\n\ - movs r2, 0x1F\n\ - mov r9, r2\n\ - mov r1, r9\n\ - ands r1, r0\n\ - mov r9, r1\n\ - lsls r0, 16\n\ - lsrs r2, r0, 21\n\ - movs r1, 0x1F\n\ - ands r1, r2\n\ - mov r8, r1\n\ - lsrs r7, r0, 26\n\ - movs r2, 0x1F\n\ - ands r7, r2\n\ - ldr r0, [sp, 0x4]\n\ - ldrh r4, [r0]\n\ - movs r0, 0x1F\n\ - ands r0, r4\n\ - mov r1, r9\n\ - subs r0, r1\n\ - lsls r0, 8\n\ - ldr r1, [sp, 0x8]\n\ - bl __divsi3\n\ - ldr r2, [sp, 0x2C]\n\ - adds r6, r0, 0\n\ - muls r6, r2\n\ - asrs r6, 8\n\ - lsls r4, 16\n\ - lsrs r0, r4, 21\n\ - movs r1, 0x1F\n\ - ands r0, r1\n\ - mov r2, r8\n\ - subs r0, r2\n\ - lsls r0, 8\n\ - ldr r1, [sp, 0x8]\n\ - bl __divsi3\n\ - ldr r1, [sp, 0x2C]\n\ - adds r5, r0, 0\n\ - muls r5, r1\n\ - asrs r5, 8\n\ - lsrs r4, 26\n\ - movs r2, 0x1F\n\ - ands r4, r2\n\ - subs r4, r7\n\ - lsls r4, 8\n\ - adds r0, r4, 0\n\ - ldr r1, [sp, 0x8]\n\ - bl __divsi3\n\ - ldr r1, [sp, 0x2C]\n\ - muls r0, r1\n\ - asrs r0, 8\n\ - add r6, r9\n\ - movs r2, 0x1F\n\ - ands r6, r2\n\ - add r5, r8\n\ - ands r5, r2\n\ - adds r0, r7, r0\n\ - ands r0, r2\n\ - lsls r0, 10\n\ - lsls r5, 5\n\ - orrs r0, r5\n\ - orrs r0, r6\n\ - ldr r1, [sp, 0x30]\n\ - strh r0, [r1]\n\ - ldr r2, [sp]\n\ - adds r2, 0x2\n\ - str r2, [sp]\n\ - ldr r0, [sp, 0x4]\n\ - adds r0, 0x2\n\ - str r0, [sp, 0x4]\n\ - adds r1, 0x2\n\ - str r1, [sp, 0x30]\n\ - movs r1, 0x1\n\ - negs r1, r1\n\ - add r10, r1\n\ + ldr r1, [sp]\n\ + ldrh r0, [r1]\n\ + movs r2, 0x1F\n\ + mov r9, r2\n\ + mov r1, r9\n\ + ands r1, r0\n\ + mov r9, r1\n\ + lsls r0, 16\n\ + lsrs r2, r0, 21\n\ + movs r1, 0x1F\n\ + ands r1, r2\n\ + mov r8, r1\n\ + lsrs r7, r0, 26\n\ + movs r2, 0x1F\n\ + ands r7, r2\n\ + ldr r0, [sp, 0x4]\n\ + ldrh r4, [r0]\n\ + movs r0, 0x1F\n\ + ands r0, r4\n\ + mov r1, r9\n\ + subs r0, r1\n\ + lsls r0, 8\n\ + ldr r1, [sp, 0x8]\n\ + bl __divsi3\n\ + ldr r2, [sp, 0x2C]\n\ + adds r6, r0, 0\n\ + muls r6, r2\n\ + asrs r6, 8\n\ + lsls r4, 16\n\ + lsrs r0, r4, 21\n\ + movs r1, 0x1F\n\ + ands r0, r1\n\ + mov r2, r8\n\ + subs r0, r2\n\ + lsls r0, 8\n\ + ldr r1, [sp, 0x8]\n\ + bl __divsi3\n\ + ldr r1, [sp, 0x2C]\n\ + adds r5, r0, 0\n\ + muls r5, r1\n\ + asrs r5, 8\n\ + lsrs r4, 26\n\ + movs r2, 0x1F\n\ + ands r4, r2\n\ + subs r4, r7\n\ + lsls r4, 8\n\ + adds r0, r4, 0\n\ + ldr r1, [sp, 0x8]\n\ + bl __divsi3\n\ + ldr r1, [sp, 0x2C]\n\ + muls r0, r1\n\ + asrs r0, 8\n\ + add r6, r9\n\ + movs r2, 0x1F\n\ + ands r6, r2\n\ + add r5, r8\n\ + ands r5, r2\n\ + adds r0, r7, r0\n\ + ands r0, r2\n\ + lsls r0, 10\n\ + lsls r5, 5\n\ + orrs r0, r5\n\ + orrs r0, r6\n\ + ldr r1, [sp, 0x30]\n\ + strh r0, [r1]\n\ + ldr r2, [sp]\n\ + adds r2, 0x2\n\ + str r2, [sp]\n\ + ldr r0, [sp, 0x4]\n\ + adds r0, 0x2\n\ + str r0, [sp, 0x4]\n\ + adds r1, 0x2\n\ + str r1, [sp, 0x30]\n\ + movs r1, 0x1\n\ + negs r1, r1\n\ + add r10, r1\n\ _081C7AA6:\n\ - movs r0, 0x1\n\ - negs r0, r0\n\ - cmp r10, r0\n\ - bne _081C7A08\n\ + movs r0, 0x1\n\ + negs r0, r0\n\ + cmp r10, r0\n\ + bne _081C7A08\n\ _081C7AAE:\n\ - add sp, 0xC\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided"); + add sp, 0xC\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided"); } void sub_81C7AC0(s32 a0) { - u32 *v1; - v1 = sub_81C763C(0); - switch (a0) - { - case 0: - BeginNormalPaletteFade(v1[5], -2, 0, 16, a0); - break; - case 1: - BeginNormalPaletteFade(v1[5], -2, 16, 0, 0); - break; - case 2: - BeginNormalPaletteFade(-1, -2, 0, 16, 0); - break; - case 3: - BeginNormalPaletteFade(-1, -2, 16, 0, 0); - break; - } + u32 *v1; + v1 = sub_81C763C(0); + switch (a0) + { + case 0: + BeginNormalPaletteFade(v1[5], -2, 0, 16, a0); + break; + case 1: + BeginNormalPaletteFade(v1[5], -2, 16, 0, 0); + break; + case 2: + BeginNormalPaletteFade(-1, -2, 0, 16, 0); + break; + case 3: + BeginNormalPaletteFade(-1, -2, 16, 0, 0); + break; + } } bool32 IsPaletteFadeActive(void) { - return gPaletteFade.active; + return gPaletteFade.active; } void sub_81C7B40(void) { - BlendPalettes(0xFFFEFFFE, 16, 0); + BlendPalettes(0xFFFEFFFE, 16, 0); } void sub_81C7B54(const struct BgTemplate *a0, s32 a1) { - s32 i; - if (a1 <= 0) - return; - for (i = a1; i != 0; i--) - { - InitBgFromTemplate(a0++); - } + s32 i; + if (a1 <= 0) + return; + for (i = a1; i != 0; i--) + { + InitBgFromTemplate(a0++); + } } void sub_81C7B74(void) { - u32 *v1; + u32 *v1; - v1 = sub_81C763C(0); - InitWindows(&gUnknown_0861FA08[0]); - v1[4] = 0; - sub_81C7BF8(0); - PutWindowTilemap(v1[4]); - CopyWindowToVram(v1[4], 3); // TODO: Use a defined constant here. + v1 = sub_81C763C(0); + InitWindows(&gUnknown_0861FA08[0]); + v1[4] = 0; + sub_81C7BF8(0); + PutWindowTilemap(v1[4]); + CopyWindowToVram(v1[4], 3); // TODO: Use a defined constant here. } void sub_81C7BA4(u32 a0) { - u32 *v1; + u32 *v1; - v1 = sub_81C763C(0); - sub_81C7BF8(v1[4]); - AddTextPrinterParameterized3(v1[4], 1, 0, 1, gMenuButtonReminderColor, 0, MenuButtonReminders[a0]); + v1 = sub_81C763C(0); + sub_81C7BF8(v1[4]); + AddTextPrinterParameterized3(v1[4], 1, 0, 1, gMenuButtonReminderColor, 0, MenuButtonReminders[a0]); } bool8 sub_81C7BE8(void) { - return IsDma3ManagerBusyWithBgCopy(); + return IsDma3ManagerBusyWithBgCopy(); } void sub_81C7BF8(u32 a0) { - FillWindowPixelBuffer(a0, 0x44); - FillWindowPixelRect(a0, 0x55, 0, 0, 0x80, 1); + FillWindowPixelBuffer(a0, 0x44); + FillWindowPixelRect(a0, 0x55, 0, 0, 0x80, 1); } void sub_81C7C28(void) { - u32 *v1; - u32 i; - u8 v2; - u32 v3; - u32 v4; - u8 spriteId; + u32 *v1; + u32 i; + u8 v2; + u32 v3; + u32 v4; + u8 spriteId; - v1 = sub_81C763C(0); - for (i = 0; i == 0; i++) - { - LoadCompressedSpriteSheet(&gUnknown_0861FA4C[i]); - } + v1 = sub_81C763C(0); + for (i = 0; i == 0; i++) + { + LoadCompressedSpriteSheet(&gUnknown_0861FA4C[i]); + } - sub_81C795C(gUnknown_0861FA54); - v2 = IndexOfSpritePaletteTag(0); - v3 = 0x80 << 9 << v2; - v1[5] = -2 & ~v3; - spriteId = CreateSprite(&gUnknown_0861FB04, 0xDC, 0xC, 0); - v1[6] = (u32)(&gSprites[spriteId]); + sub_81C795C(gUnknown_0861FA54); + v2 = IndexOfSpritePaletteTag(0); + v3 = 0x80 << 9 << v2; + v1[5] = -2 & ~v3; + spriteId = CreateSprite(&gUnknown_0861FB04, 0xDC, 0xC, 0); + v1[6] = (u32)(&gSprites[spriteId]); } void sub_81C7C94(void) { - void **v1; - v1 = sub_81C763C(0); - DestroySprite(v1[6]); - FreeSpriteTilesByTag(0); - FreeSpritePaletteByTag(0); + void **v1; + v1 = sub_81C763C(0); + DestroySprite(v1[6]); + FreeSpriteTilesByTag(0); + FreeSpritePaletteByTag(0); } void sub_81C7CB4(u16 *a0) { - u32 v1; - v1 = GetBgY(0); - a0[19] = (v1 >> 8) * -1; + u32 v1; + v1 = GetBgY(0); + a0[19] = (v1 >> 8) * -1; } struct Sprite *sub_81C7CCC(void) { - struct Sprite **v1; - struct Sprite *v2; - v1 = sub_81C763C(0); - v2 = v1[6]; - v2->callback = SpriteCallbackDummy; - return v2; + struct Sprite **v1; + struct Sprite *v2; + v1 = sub_81C763C(0); + v2 = v1[6]; + v2->callback = SpriteCallbackDummy; + return v2; } \ No newline at end of file From 762640664f19c19f3ddc97428753ce8f92d3372e Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sat, 16 Feb 2019 12:09:27 -0500 Subject: [PATCH 083/217] Fix formatting --- src/pokenav_main.c | 64 ++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 992bca3f04..3a761442e1 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -415,7 +415,8 @@ void sub_81C7170(u8 taskId) while (!exitLoop) { u32 v1 =((u32 (*)(u32))func)(dataPtr[0]); - switch (v1) { + switch (v1) + { case 1: dataPtr[0] = dataPtr[0] + 1; break; @@ -449,27 +450,28 @@ void sub_81C71E4(u8 taskId) v1 = func(data[0]); switch (v1) { - case 0: - case 1: - data[0]++; - break; - case 4: - DestroyTask(taskId); - break; - default: - data[0] = v1 - 5; - break; - case 2: - case 3: + case 0: + case 1: + data[0]++; + break; + case 4: + DestroyTask(taskId); + break; + default: + data[0] = v1 - 5; + break; + case 2: + case 3: } } void CB2_PokeNav(void) { gUnknown_0203CF40 = Alloc(sizeof(struct UnknownStruct_0203CF40)); - if (gUnknown_0203CF40 == NULL) { + if (gUnknown_0203CF40 == NULL) SetMainCallback2(CB2_ReturnToFieldWithOpenMenu); - } else { + else + { sub_81C7360(gUnknown_0203CF40); ResetTasks(); SetVBlankCallback(NULL); @@ -899,8 +901,10 @@ u32 atk47_cmd47(s32 a0) } } -u32 sub_81C791C(s32 a0) { - if (ChangeBgY(0, 384, 2) <= 0) { +u32 sub_81C791C(s32 a0) +{ + if (ChangeBgY(0, 384, 2) <= 0) + { ChangeBgY(0, 0, 0); return 4; } @@ -920,9 +924,7 @@ void sub_81C795C(const struct SpritePalette *palettes) { index = AllocSpritePalette(current->tag); if (index == 0xFF) - { break; - } else { index = (index * 16) + 0x100; @@ -1078,18 +1080,18 @@ void sub_81C7AC0(s32 a0) v1 = sub_81C763C(0); switch (a0) { - case 0: - BeginNormalPaletteFade(v1[5], -2, 0, 16, a0); - break; - case 1: - BeginNormalPaletteFade(v1[5], -2, 16, 0, 0); - break; - case 2: - BeginNormalPaletteFade(-1, -2, 0, 16, 0); - break; - case 3: - BeginNormalPaletteFade(-1, -2, 16, 0, 0); - break; + case 0: + BeginNormalPaletteFade(v1[5], -2, 0, 16, a0); + break; + case 1: + BeginNormalPaletteFade(v1[5], -2, 16, 0, 0); + break; + case 2: + BeginNormalPaletteFade(-1, -2, 0, 16, 0); + break; + case 3: + BeginNormalPaletteFade(-1, -2, 16, 0, 0); + break; } } From f52855258389fb88f06bc0d416cced71bb1fe99b Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sat, 16 Feb 2019 16:00:01 -0500 Subject: [PATCH 084/217] Rename pokenav file --- ld_script.txt | 4 ++-- src/{pokenav_main.c => pokenav.c} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename src/{pokenav_main.c => pokenav.c} (100%) diff --git a/ld_script.txt b/ld_script.txt index 8c48cf3166..77bc56ecc7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -289,7 +289,7 @@ SECTIONS { src/pokemon_summary_screen.o(.text); src/unk_pokedex_area_screen_helper.o(.text); src/battle_pyramid_bag.o(.text); - src/pokenav_main.o(.text); + src/pokenav.o(.text); asm/pokenav.o(.text); src/pokenav_match_call.o(.text); asm/rom_81D1C44.o(.text); @@ -592,7 +592,7 @@ SECTIONS { src/pokemon_summary_screen.o(.rodata); src/unk_pokedex_area_screen_helper.o(.rodata); src/battle_pyramid_bag.o(.rodata); - src/pokenav_main.o(.rodata); + src/pokenav.o(.rodata); data/pokenav.o(.rodata); src/pokenav_match_call.o(.rodata); data/rom_81D1C44.o(.rodata); diff --git a/src/pokenav_main.c b/src/pokenav.c similarity index 100% rename from src/pokenav_main.c rename to src/pokenav.c From 7ad225a72f0d60a4c390b41fba005512d23730aa Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 18 Feb 2019 00:16:27 -0500 Subject: [PATCH 085/217] Address formatting issues and use constants --- src/pokenav.c | 57 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/src/pokenav.c b/src/pokenav.c index 3a761442e1..595b66babc 100644 --- a/src/pokenav.c +++ b/src/pokenav.c @@ -16,6 +16,7 @@ #include "gba/macro.h" #include "decompress.h" #include "strings.h" +#include "constants/rgb.h" #define UNKNOWN_OFFSET 100000 @@ -131,7 +132,7 @@ void sub_81C7C94(void); u32 (*const gUnknown_0861F3EC[15][7])(void) = { { - (u32 (*)(void))sub_81C9298, + sub_81C9298, sub_81C941C, sub_81C9924, sub_81C9990, @@ -287,9 +288,9 @@ const struct WindowTemplate gUnknown_0861FA08[2] = { .bg = 0, .tilemapLeft = 1, - .tilemapTop = 0x16, - .width = 0x10, - .height = 0x2, + .tilemapTop = 22, + .width = 16, + .height = 2, .paletteNum = 0, .baseBlock = 0x36, }, @@ -384,7 +385,9 @@ bool32 sub_81C70D8(u32 a0) return TRUE; } else + { return FALSE; + } } bool32 sub_81C7124(u32 a0) @@ -462,6 +465,7 @@ void sub_81C71E4(u8 taskId) break; case 2: case 3: + break; } } @@ -469,7 +473,9 @@ void CB2_PokeNav(void) { gUnknown_0203CF40 = Alloc(sizeof(struct UnknownStruct_0203CF40)); if (gUnknown_0203CF40 == NULL) + { SetMainCallback2(CB2_ReturnToFieldWithOpenMenu); + } else { sub_81C7360(gUnknown_0203CF40); @@ -494,7 +500,9 @@ void sub_81C72BC() { gUnknown_0203CF40 = Alloc(sizeof(struct UnknownStruct_0203CF40)); if (gUnknown_0203CF40 == NULL) + { SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); + } else { sub_81C7360(gUnknown_0203CF40); @@ -549,7 +557,7 @@ bool32 AnyMonHasRibbon() s32 i; s32 j; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_HAS_SPECIES) && !GetMonData(&gPlayerParty[i], MON_DATA_SANITY_IS_EGG) @@ -559,9 +567,9 @@ bool32 AnyMonHasRibbon() } } - for (j = 0; j < 14; j++) + for (j = 0; j < TOTAL_BOXES_COUNT; j++) { - for (i = 0; i < 30; i++) + for (i = 0; i < IN_BOX_COUNT; i++) { if (CheckBoxMonSanityAt(j, i) && GetBoxMonDataAt(j, i, MON_DATA_RIBBON_COUNT) != 0) @@ -625,7 +633,9 @@ void sub_81C742C(u8 taskId) gUnknown_0861F3EC[gUnknown_0203CF40->field4][6](); gUnknown_0861F3EC[gUnknown_0203CF40->field4][5](); if (sub_81C756C(v1)) + { dataPtr[0] = 4; + } else { sub_81C7710(); @@ -654,6 +664,7 @@ void sub_81C742C(u8 taskId) else SetMainCallback2(CB2_ReturnToFieldWithOpenMenu); } + break; } } @@ -711,10 +722,7 @@ void *sub_81C763C(u32 index) void sub_81C7650(u32 index) { if (gUnknown_0203CF40->field10[index] != NULL) - { - Free(gUnknown_0203CF40->field10[index]); - gUnknown_0203CF40->field10[index] = NULL; - } + FREE_AND_SET_NULL(gUnknown_0203CF40->field10[index]); } u16 sub_81C767C(void) @@ -752,7 +760,9 @@ bool32 sub_81C76C4(void) v1 = (struct UnknownStruct_sub_81C76C4*)sub_81C761C(0, sizeof(struct UnknownStruct_sub_81C76C4)); if (v1 == NULL) + { return FALSE; + } else { ResetSpriteData(); @@ -773,7 +783,7 @@ void sub_81C7710(void) { PlaySE(SE_PN_OFF); sub_81CAADC(); - BeginNormalPaletteFade(-1, -1, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK); } bool32 sub_81C7738(void) @@ -785,7 +795,9 @@ bool32 sub_81C7738(void) FreeAllWindowBuffers(); return FALSE; } else + { return TRUE; + } } u32 sub_81C7764(s32 a0) @@ -795,7 +807,7 @@ u32 sub_81C7764(s32 a0) switch (a0) { case 0: - SetGpuReg(0, 0x82 << 5); + SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); FreeAllWindowBuffers(); ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, &gUnknown_0861FA04, 1); @@ -923,8 +935,10 @@ void sub_81C795C(const struct SpritePalette *palettes) for (current = palettes; current->data != NULL; current++) { index = AllocSpritePalette(current->tag); - if (index == 0xFF) + if (index == 0xFF) + { break; + } else { index = (index * 16) + 0x100; @@ -1084,13 +1098,13 @@ void sub_81C7AC0(s32 a0) BeginNormalPaletteFade(v1[5], -2, 0, 16, a0); break; case 1: - BeginNormalPaletteFade(v1[5], -2, 16, 0, 0); + BeginNormalPaletteFade(v1[5], -2, 16, 0, RGB_BLACK); break; case 2: - BeginNormalPaletteFade(-1, -2, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK); break; case 3: - BeginNormalPaletteFade(-1, -2, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -2, 16, 0, RGB_BLACK); break; } } @@ -1102,7 +1116,7 @@ bool32 IsPaletteFadeActive(void) void sub_81C7B40(void) { - BlendPalettes(0xFFFEFFFE, 16, 0); + BlendPalettes(0xFFFEFFFE, 16, RGB_BLACK); } void sub_81C7B54(const struct BgTemplate *a0, s32 a1) @@ -1165,9 +1179,8 @@ void sub_81C7C28(void) sub_81C795C(gUnknown_0861FA54); v2 = IndexOfSpritePaletteTag(0); - v3 = 0x80 << 9 << v2; - v1[5] = -2 & ~v3; - spriteId = CreateSprite(&gUnknown_0861FB04, 0xDC, 0xC, 0); + v1[5] = ~1 & ~(0x10000 << v2); + spriteId = CreateSprite(&gUnknown_0861FB04, 220, 12, 0); v1[6] = (u32)(&gSprites[spriteId]); } @@ -1195,4 +1208,4 @@ struct Sprite *sub_81C7CCC(void) v2 = v1[6]; v2->callback = SpriteCallbackDummy; return v2; -} \ No newline at end of file +} From 08579edbcd596c9659fe25490480c6f96e2b4288 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 18 Feb 2019 01:03:44 -0500 Subject: [PATCH 086/217] Clean up mistakes and bad formatting --- common_syms/overworld.txt | 2 +- data/event_scripts.s | 8 +- data/maps/DoubleBattleColosseum/map.json | 8 +- .../MossdeepCity_SpaceCenter_2F/scripts.inc | 2 +- data/maps/RecordCorner/map.json | 8 +- data/maps/SingleBattleColosseum/map.json | 4 +- .../scripts.inc | 2 +- data/maps/TradeCenter/map.json | 4 +- data/scripts/cable_club.inc | 86 +++++------ data/specials.inc | 12 +- include/global.h | 2 +- include/overworld.h | 2 +- include/record_mixing.h | 2 +- src/cable_club.c | 16 +- src/overworld.c | 143 +++++++++--------- src/record_mixing.c | 4 +- src/rom_8011DC0.c | 4 +- src/script_pokemon_util_80F87D8.c | 4 +- src/start_menu.c | 4 +- 19 files changed, 159 insertions(+), 158 deletions(-) diff --git a/common_syms/overworld.txt b/common_syms/overworld.txt index 8506c74a07..1ba43d7cff 100644 --- a/common_syms/overworld.txt +++ b/common_syms/overworld.txt @@ -4,5 +4,5 @@ gBGTilemapBuffers3 gHeldKeyCodeToSend gFieldCallback gFieldCallback2 -gLinkSelfPlayerId +LocalLinkPlayerId gFieldLinkPlayerCount diff --git a/data/event_scripts.s b/data/event_scripts.s index 1e7dbe237b..9c88ed49fa 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1157,12 +1157,12 @@ EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851 setvar VAR_0x40D3, 1 return -gEventScript_WhiteOut:: @ 8271857 +EventScript_WhiteOut:: @ 8271857 call EverGrandeCity_HallOfFame_EventScript_2718CC - goto gEventScript_ResetMrBriney + goto EventScript_ResetMrBriney end -gEventScript_ResetMrBriney:: @ 8271862 +EventScript_ResetMrBriney:: @ 8271862 compare VAR_0x4096, 1 goto_if_eq EventScript_MoveMrBrineyToHouse compare VAR_0x4096, 2 @@ -1610,7 +1610,7 @@ EventScript_271D5E:: @ 8271D5E goto EventScript_271D89 EventScript_271D83:: @ 8271D83 - special EventScript_RecordMixingPlayerSpotTriggered + special RecordMixingPlayerSpotTriggered waitstate lock faceplayer diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/DoubleBattleColosseum/map.json index b46c8fa3ea..20daa12c2e 100644 --- a/data/maps/DoubleBattleColosseum/map.json +++ b/data/maps/DoubleBattleColosseum/map.json @@ -52,7 +52,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gEventScript_DoubleBattleColosseum_PlayerSpot0" + "script": "EventScript_DoubleBattleColosseum_PlayerSpot0" }, { "type": "trigger", @@ -61,7 +61,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gEventScript_DoubleBattleColosseum_PlayerSpot2" + "script": "EventScript_DoubleBattleColosseum_PlayerSpot2" }, { "type": "trigger", @@ -70,7 +70,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gEventScript_DoubleBattleColosseum_PlayerSpot1" + "script": "EventScript_DoubleBattleColosseum_PlayerSpot1" }, { "type": "trigger", @@ -79,7 +79,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gEventScript_DoubleBattleColosseum_PlayerSpot3" + "script": "EventScript_DoubleBattleColosseum_PlayerSpot3" } ], "bg_events": [] diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index d2e5dded13..72c43febe8 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -248,7 +248,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C waitmovement 0 special SavePlayerParty fadescreen 1 - special EventScript_ChooseHalfPartyForBattle + special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 goto_if_ne MossdeepCity_SpaceCenter_2F_EventScript_224032 diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index 9bf870a526..cd39e69d0f 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -66,7 +66,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gEventScript_RecordCenter_Spot0" + "script": "EventScript_RecordCenter_Spot0" }, { "type": "trigger", @@ -75,7 +75,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gEventScript_RecordCenter_Spot2" + "script": "EventScript_RecordCenter_Spot2" }, { "type": "trigger", @@ -84,7 +84,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gEventScript_RecordCenter_Spot1" + "script": "EventScript_RecordCenter_Spot1" }, { "type": "trigger", @@ -93,7 +93,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gEventScript_RecordCenter_Spot3" + "script": "EventScript_RecordCenter_Spot3" } ], "bg_events": [] diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json index 4576bc0429..c5ff203c7c 100644 --- a/data/maps/SingleBattleColosseum/map.json +++ b/data/maps/SingleBattleColosseum/map.json @@ -52,7 +52,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gEventScript_SingleBattleColosseum_PlayerSpot0" + "script": "EventScript_SingleBattleColosseum_PlayerSpot0" }, { "type": "trigger", @@ -61,7 +61,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gEventScript_SingleBattleColosseum_PlayerSpot1" + "script": "EventScript_SingleBattleColosseum_PlayerSpot1" } ], "bg_events": [] diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 2d8de4bb4f..c85712d1d8 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -129,7 +129,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2:: @ 8227AE2 SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF:: @ 8227AEF msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C84, MSGBOX_DEFAULT fadescreen 1 - special EventScript_ChooseHalfPartyForBattle + special ChooseHalfPartyForBattle waitstate return diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 6ab2bdbe1e..d9e3f7c92c 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -53,7 +53,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gEventScript_TradeCenter_Chair0" + "script": "EventScript_TradeCenter_Chair0" }, { "comment": "This is trade seat #2.", @@ -63,7 +63,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": 0, - "script": "gEventScript_TradeCenter_Chair1" + "script": "EventScript_TradeCenter_Chair1" } ], "bg_events": [] diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index dbd664dbc4..5c413a7c12 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -791,118 +791,118 @@ EventScript_CableBoxResults:: @ 8277365 releaseall end -gEventScript_SingleBattleColosseum_PlayerSpot0:: @ 8277374 +EventScript_SingleBattleColosseum_PlayerSpot0:: @ 8277374 setvar VAR_0x8005, 0 - special EventScript_ColosseumPlayerSpotTriggered + special ColosseumPlayerSpotTriggered waitstate end -gEventScript_SingleBattleColosseum_PlayerSpot1:: @ 827737E +EventScript_SingleBattleColosseum_PlayerSpot1:: @ 827737E setvar VAR_0x8005, 1 - special EventScript_ColosseumPlayerSpotTriggered + special ColosseumPlayerSpotTriggered waitstate end -gEventScript_DoubleBattleColosseum_PlayerSpot0:: @ 8277388 +EventScript_DoubleBattleColosseum_PlayerSpot0:: @ 8277388 fadescreen 1 - special EventScript_ChooseHalfPartyForBattle + special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq gEventScript_DoubleBattleColosseum_CancelSpotTrigger + goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger setvar VAR_0x8005, 0 - special EventScript_ColosseumPlayerSpotTriggered + special ColosseumPlayerSpotTriggered waitstate end -gEventScript_DoubleBattleColosseum_PlayerSpot1:: @ 82773A3 +EventScript_DoubleBattleColosseum_PlayerSpot1:: @ 82773A3 fadescreen 1 - special EventScript_ChooseHalfPartyForBattle + special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq gEventScript_DoubleBattleColosseum_CancelSpotTrigger + goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger setvar VAR_0x8005, 1 - special EventScript_ColosseumPlayerSpotTriggered + special ColosseumPlayerSpotTriggered waitstate end -gEventScript_DoubleBattleColosseum_PlayerSpot2:: @ 82773BE +EventScript_DoubleBattleColosseum_PlayerSpot2:: @ 82773BE fadescreen 1 - special EventScript_ChooseHalfPartyForBattle + special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq gEventScript_DoubleBattleColosseum_CancelSpotTrigger + goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger setvar VAR_0x8005, 2 - special EventScript_ColosseumPlayerSpotTriggered + special ColosseumPlayerSpotTriggered waitstate end -gEventScript_DoubleBattleColosseum_PlayerSpot3:: @ 82773D9 +EventScript_DoubleBattleColosseum_PlayerSpot3:: @ 82773D9 fadescreen 1 - special EventScript_ChooseHalfPartyForBattle + special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq gEventScript_DoubleBattleColosseum_CancelSpotTrigger + goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger setvar VAR_0x8005, 3 - special EventScript_ColosseumPlayerSpotTriggered + special ColosseumPlayerSpotTriggered waitstate end -gEventScript_DoubleBattleColosseum_CancelSpotTrigger:: @ 82773F4 +EventScript_DoubleBattleColosseum_CancelSpotTrigger:: @ 82773F4 end -gEventScript_TradeCenter_Chair0:: @ 82773F5 +EventScript_TradeCenter_Chair0:: @ 82773F5 setvar VAR_0x8005, 0 - special EventScript_PlayerEnteredTradeSeat + special PlayerEnteredTradeSeat waitstate end -gEventScript_TradeCenter_Chair1:: @ 82773FF +EventScript_TradeCenter_Chair1:: @ 82773FF setvar VAR_0x8005, 1 - special EventScript_PlayerEnteredTradeSeat + special PlayerEnteredTradeSeat waitstate end /* Never used */ -gEventScript_TradeCenter_Chair2:: @ 8277409 +EventScript_TradeCenter_Chair2:: @ 8277409 setvar VAR_0x8005, 2 - special EventScript_PlayerEnteredTradeSeat + special PlayerEnteredTradeSeat waitstate end /* Never used */ -gEventScript_TradeCenter_Chair3:: @ 8277413 +EventScript_TradeCenter_Chair3:: @ 8277413 setvar VAR_0x8005, 3 - special EventScript_PlayerEnteredTradeSeat + special PlayerEnteredTradeSeat waitstate end -gEventScript_RecordCenter_Spot0:: @ 827741D +EventScript_RecordCenter_Spot0:: @ 827741D setvar VAR_0x8005, 0 - special EventScript_RecordMixingPlayerSpotTriggered + special RecordMixingPlayerSpotTriggered waitstate compare VAR_TEMP_1, 0 goto_if_ne RecordCorner_EventScript_277471 end -gEventScript_RecordCenter_Spot1:: @ 8277432 +EventScript_RecordCenter_Spot1:: @ 8277432 setvar VAR_0x8005, 1 - special EventScript_RecordMixingPlayerSpotTriggered + special RecordMixingPlayerSpotTriggered waitstate compare VAR_TEMP_1, 0 goto_if_ne RecordCorner_EventScript_277471 end -gEventScript_RecordCenter_Spot2:: @ 8277447 +EventScript_RecordCenter_Spot2:: @ 8277447 setvar VAR_0x8005, 2 - special EventScript_RecordMixingPlayerSpotTriggered + special RecordMixingPlayerSpotTriggered waitstate compare VAR_TEMP_1, 0 goto_if_ne RecordCorner_EventScript_277471 end -gEventScript_RecordCenter_Spot3:: @ 827745C +EventScript_RecordCenter_Spot3:: @ 827745C setvar VAR_0x8005, 3 - special EventScript_RecordMixingPlayerSpotTriggered + special RecordMixingPlayerSpotTriggered waitstate compare VAR_TEMP_1, 0 goto_if_ne RecordCorner_EventScript_277471 @@ -969,22 +969,22 @@ RecordCorner_EventScript_2774E0:: @ 82774E0 closemessage end -gEventScript_ConfirmLeaveTradeRoom:: @ 82774EF +EventScript_ConfirmLeaveTradeRoom:: @ 82774EF msgbox Text_TerminateLinkConfirmation, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq gEventScript_TerminateLink + goto_if_eq EventScript_TerminateLink erasebox 0, 0, 29, 19 releaseall end -gEventScript_TerminateLink:: @ 8277509 +EventScript_TerminateLink:: @ 8277509 messageautoscroll Text_TerminateLinkPleaseWait waitmessage - special EventScript_ExitLinkRoom + special ExitLinkRoom end -gEventScript_DoLinkRoomExit:: @ 8277513 - special EventScript_CleanupLinkRoomState +EventScript_DoLinkRoomExit:: @ 8277513 + special CleanupLinkRoomState special sub_80AF9F8 waitstate end diff --git a/data/specials.inc b/data/specials.inc index e13a23ab0d..e5f0b1f27c 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -12,8 +12,8 @@ gSpecials:: @ 81DBA64 def_special SetCableClubWarp def_special sub_80AF948 def_special sub_80AF9F8 - def_special EventScript_CleanupLinkRoomState - def_special EventScript_ExitLinkRoom + def_special CleanupLinkRoomState + def_special ExitLinkRoom def_special sub_80E8E18 def_special sub_80E8BC8 def_special sub_80E9068 @@ -35,14 +35,14 @@ gSpecials:: @ 81DBA64 def_special sub_80E91F8 def_special sub_80EA30C def_special DoSecretBasePCTurnOffEffect - def_special EventScript_RecordMixingPlayerSpotTriggered + def_special RecordMixingPlayerSpotTriggered def_special sub_80B2DA4 def_special sub_80B2E4C def_special sub_80B2E74 def_special sub_80B2EA8 def_special CloseLink - def_special EventScript_ColosseumPlayerSpotTriggered - def_special EventScript_PlayerEnteredTradeSeat + def_special ColosseumPlayerSpotTriggered + def_special PlayerEnteredTradeSeat def_special nullsub_37 def_special sub_80B3254 def_special sub_80B2FD8 @@ -50,7 +50,7 @@ gSpecials:: @ 81DBA64 def_special SpawnLinkPartnerEventObject def_special SavePlayerParty def_special LoadPlayerParty - def_special EventScript_ChooseHalfPartyForBattle + def_special ChooseHalfPartyForBattle def_special sp02A_crash_sound def_special EventObjectInteractionGetBerryTreeData def_special EventObjectInteractionGetBerryName diff --git a/include/global.h b/include/global.h index 6843b4216b..1b0b0afa3c 100644 --- a/include/global.h +++ b/include/global.h @@ -910,7 +910,7 @@ struct MapPosition struct TradeRoomPlayer { u8 playerId; - u8 isSelf; + u8 isLocalPlayer; u8 c; u8 facing; struct MapPosition pos; diff --git a/include/overworld.h b/include/overworld.h index 9434d5c284..ea361e25b5 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -48,7 +48,7 @@ extern u16 *gBGTilemapBuffers3; extern u16 gHeldKeyCodeToSend; extern void (*gFieldCallback)(void); extern bool8 (*gFieldCallback2)(void); -extern u8 gLinkSelfPlayerId; +extern u8 LocalLinkPlayerId; extern u8 gFieldLinkPlayerCount; // Exported ROM declarations diff --git a/include/record_mixing.h b/include/record_mixing.h index d02b77f9ca..4cd231e8a5 100644 --- a/include/record_mixing.h +++ b/include/record_mixing.h @@ -7,7 +7,7 @@ struct PlayerHallRecords struct RankingHall2P twoPlayers[2]; }; -void EventScript_RecordMixingPlayerSpotTriggered(void); +void RecordMixingPlayerSpotTriggered(void); void GetPlayerHallRecords(struct PlayerHallRecords *dst); #endif //GUARD_RECORD_MIXING_H diff --git a/src/cable_club.c b/src/cable_club.c index 05c19c9ae3..83e1e55dd9 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -352,7 +352,7 @@ static void sub_80B2918(u8 taskId) else { gFieldLinkPlayerCount = GetLinkPlayerCount_2(); - gLinkSelfPlayerId = GetMultiplayerId(); + LocalLinkPlayerId = GetMultiplayerId(); sub_800AA04(gFieldLinkPlayerCount); card = (struct TrainerCard *)gBlockSendBuffer; TrainerCard_GenerateCardForPlayer(card); @@ -399,7 +399,7 @@ static void sub_80B2A08(u8 taskId) else { gFieldLinkPlayerCount = GetLinkPlayerCount_2(); - gLinkSelfPlayerId = GetMultiplayerId(); + LocalLinkPlayerId = GetMultiplayerId(); sub_800AA04(gFieldLinkPlayerCount); card = (struct TrainerCard *)gBlockSendBuffer; TrainerCard_GenerateCardForPlayer(card); @@ -972,7 +972,7 @@ void sub_80B360C(void) if (gSpecialVar_0x8004 == 1 || gSpecialVar_0x8004 == 2) { - UpdatePlayerLinkBattleRecords(gLinkSelfPlayerId ^ 1); + UpdatePlayerLinkBattleRecords(LocalLinkPlayerId ^ 1); if (gWirelessCommType) { switch (gBattleOutcome) @@ -999,7 +999,7 @@ void sub_80B360C(void) SetMainCallback2(sub_80A0514); } -void EventScript_CleanupLinkRoomState(void) +void CleanupLinkRoomState(void) { if (gSpecialVar_0x8004 == 1 || gSpecialVar_0x8004 == 2 || gSpecialVar_0x8004 == 5 || gSpecialVar_0x8004 == 9) { @@ -1009,13 +1009,11 @@ void EventScript_CleanupLinkRoomState(void) SetWarpDestinationToDynamicWarp(0x7F); } -void EventScript_ExitLinkRoom(void) +void ExitLinkRoom(void) { QueueExitLinkRoomKey(); } -// I can't find anything that would set data[0] to a value before this -// stask starts. Is it a bug? static void sub_80B3728(u8 taskId) { struct Task* task = &gTasks[taskId]; @@ -1133,7 +1131,7 @@ static void sub_80B3894(u8 taskId) } // Note: VAR_0x8005 is set to the ID of the trade seat. -void EventScript_PlayerEnteredTradeSeat(void) +void PlayerEnteredTradeSeat(void) { if (gWirelessCommType != 0) { @@ -1156,7 +1154,7 @@ void nullsub_37(void) } // Note: VAR_0x8005 is set to the ID of the player spot. -void EventScript_ColosseumPlayerSpotTriggered(void) +void ColosseumPlayerSpotTriggered(void) { gLinkType = 0x2211; diff --git a/src/overworld.c b/src/overworld.c index b5b1b04a6e..95766805c5 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -82,26 +82,26 @@ #define FACING_FORCED_RIGHT 10 // event scripts -extern const u8 gEventScript_WhiteOut[]; -extern const u8 gEventScript_ResetMrBriney[]; -extern const u8 gEventScript_DoLinkRoomExit[]; +extern const u8 EventScript_WhiteOut[]; +extern const u8 EventScript_ResetMrBriney[]; +extern const u8 EventScript_DoLinkRoomExit[]; extern const u8 gEventScript_TradeRoom_TooBusyToNotice[]; extern const u8 gEventScript_TradeRoom_ReadTrainerCard_NoColor[]; extern const u8 gEventScript_TradeRoom_ReadTrainerCard_Normal[]; -extern const u8 gEventScript_DoubleBattleColosseum_PlayerSpot0[]; -extern const u8 gEventScript_DoubleBattleColosseum_PlayerSpot1[]; -extern const u8 gEventScript_DoubleBattleColosseum_PlayerSpot2[]; -extern const u8 gEventScript_DoubleBattleColosseum_PlayerSpot3[]; -extern const u8 gEventScript_RecordCenter_Spot0[]; -extern const u8 gEventScript_RecordCenter_Spot1[]; -extern const u8 gEventScript_RecordCenter_Spot2[]; -extern const u8 gEventScript_RecordCenter_Spot3[]; -extern const u8 gEventScript_SingleBattleColosseum_PlayerSpot0[]; -extern const u8 gEventScript_SingleBattleColosseum_PlayerSpot1[]; -extern const u8 gEventScript_TradeCenter_Chair1[]; -extern const u8 gEventScript_TradeCenter_Chair0[]; -extern const u8 gEventScript_ConfirmLeaveTradeRoom[]; -extern const u8 gEventScript_TerminateLink[]; +extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot0[]; +extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot1[]; +extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot2[]; +extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot3[]; +extern const u8 EventScript_RecordCenter_Spot0[]; +extern const u8 EventScript_RecordCenter_Spot1[]; +extern const u8 EventScript_RecordCenter_Spot2[]; +extern const u8 EventScript_RecordCenter_Spot3[]; +extern const u8 EventScript_SingleBattleColosseum_PlayerSpot0[]; +extern const u8 EventScript_SingleBattleColosseum_PlayerSpot1[]; +extern const u8 EventScript_TradeCenter_Chair1[]; +extern const u8 EventScript_TradeCenter_Chair0[]; +extern const u8 EventScript_ConfirmLeaveTradeRoom[]; +extern const u8 EventScript_TerminateLink[]; extern const struct MapLayout *const gMapLayouts[]; extern const struct MapHeader *const *const gMapGroups[]; @@ -186,7 +186,7 @@ static u8 GetAdjustedInitialDirection(struct InitialPlayerAvatarState *playerStr static u16 GetCenterScreenMetatileBehavior(void); // IWRAM bss vars -IWRAM_DATA static void *sUnusedCallback; +IWRAM_DATA static void *sUnusedOverworldCallback; IWRAM_DATA static u8 sPlayerTradingStates[4]; // This callback is called with a player's key code. It then returns an // adjusted key code, effectively intercepting the input before anything @@ -203,7 +203,7 @@ u16 *gBGTilemapBuffers3; u16 gHeldKeyCodeToSend; void (*gFieldCallback)(void); bool8 (*gFieldCallback2)(void); -u8 gLinkSelfPlayerId; // This is our player id in a multiplayer mode. +u8 LocalLinkPlayerId; // This is our player id in a multiplayer mode. u8 gFieldLinkPlayerCount; // EWRAM vars @@ -383,7 +383,7 @@ static void (*const gMovementStatusHandler[])(struct LinkPlayerEventObject *, st // code void DoWhiteOut(void) { - ScriptContext2_RunNewScript(gEventScript_WhiteOut); + ScriptContext2_RunNewScript(EventScript_WhiteOut); SetMoney(&gSaveBlock1Ptr->money, GetMoney(&gSaveBlock1Ptr->money) / 2); HealPlayerParty(); Overworld_ResetStateAfterWhiteOut(); @@ -409,7 +409,7 @@ void Overworld_ResetStateAfterTeleport(void) FlagClear(FLAG_SYS_SAFARI_MODE); FlagClear(FLAG_SYS_USE_STRENGTH); FlagClear(FLAG_SYS_USE_FLASH); - ScriptContext2_RunNewScript(gEventScript_ResetMrBriney); + ScriptContext2_RunNewScript(EventScript_ResetMrBriney); } void Overworld_ResetStateAfterDigEscRope(void) @@ -1122,7 +1122,7 @@ u16 GetCurrLocationDefaultMusic(void) } else { - if (gSaveBlock1Ptr->pos.x < LINK_KEY_CODE_START_BUTTON) + if (gSaveBlock1Ptr->pos.x < 24) return MUS_DOORO_X1; else return MUS_GRANROAD; @@ -1265,7 +1265,7 @@ static void PlayAmbientCry(void) && !MetatileBehavior_IsSurfableWaterOrUnderwater(MapGridGetMetatileBehaviorAt(x, y))) return; pan = (Random() % 88) + 212; - volume = (Random() % LINK_KEY_CODE_UNK_8) + 50; + volume = (Random() % 30) + 50; PlayCry2(sAmbientCrySpecies, pan, volume, 1); } @@ -1501,7 +1501,7 @@ void SetMainCallback1(MainCallback cb) // This function is never called. void SetUnusedCallback(void *func) { - sUnusedCallback = func; + sUnusedOverworldCallback = func; } static bool8 map_post_load_hook_exec(void) @@ -2194,13 +2194,13 @@ static void sub_8086A80(void) static void SetCameraToTrackGuestPlayer(void) { - InitCameraUpdateCallback(GetSpriteForLinkedPlayer(gLinkSelfPlayerId)); + InitCameraUpdateCallback(GetSpriteForLinkedPlayer(LocalLinkPlayerId)); } // Duplicate function. static void SetCameraToTrackGuestPlayer_2(void) { - InitCameraUpdateCallback(GetSpriteForLinkedPlayer(gLinkSelfPlayerId)); + InitCameraUpdateCallback(GetSpriteForLinkedPlayer(LocalLinkPlayerId)); } static void sub_8086AE4(void) @@ -2210,7 +2210,7 @@ static void sub_8086AE4(void) // This is a hack of some kind; it's undone in sub_8086B14, which is called // soon after this function. - sub_8088B3C(x + gLinkSelfPlayerId, y); + sub_8088B3C(x + LocalLinkPlayerId, y); } static void sub_8086B14(void) @@ -2219,7 +2219,7 @@ static void sub_8086B14(void) u16 x, y; GetCameraFocusCoords(&x, &y); - x -= gLinkSelfPlayerId; + x -= LocalLinkPlayerId; for (i = 0; i < gFieldLinkPlayerCount; i++) { @@ -2242,7 +2242,7 @@ static void CB1_UpdateLinkState(void) { if (gWirelessCommType == 0 || !IsRfuRecvQueueEmpty() || !IsSendingKeysToLink()) { - u8 selfId = gLinkSelfPlayerId; + u8 selfId = LocalLinkPlayerId; UpdateAllLinkPlayers(gLinkPartnersHeldKeys, selfId); // Note: Because guestId is between 0 and 4, while the smallest key code is @@ -2307,7 +2307,7 @@ static bool32 AreAllPlayersInState(u16 tradingState) return TRUE; } -static bool32 AreAnyPlayersInState(u16 tradingState) +static bool32 AreAnyPlayersInTradingState(u16 tradingState) { s32 i; s32 count = gFieldLinkPlayerCount; @@ -2329,17 +2329,17 @@ static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlay { *forceFacing = GetDirectionForEventScript(script); sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; - if (trainer->isSelf) + if (trainer->isLocalPlayer) { SetKeyInterceptCallback(KeyInterCB_DeferToEventScript); sub_8087530(script); } return; } - if (AreAnyPlayersInState(PLAYER_TRADING_STATE_EXITING_ROOM) == TRUE) + if (AreAnyPlayersInTradingState(PLAYER_TRADING_STATE_EXITING_ROOM) == TRUE) { sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; - if (trainer->isSelf) + if (trainer->isLocalPlayer) { SetKeyInterceptCallback(KeyInterCB_DeferToEventScript); sub_8087584(); @@ -2353,7 +2353,7 @@ static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlay if (sub_8087340_2(trainer)) { sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; - if (trainer->isSelf) + if (trainer->isLocalPlayer) { SetKeyInterceptCallback(KeyInterCB_DeferToEventScript); InitLinkRoomStartMenuScript(); @@ -2364,7 +2364,7 @@ static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlay if (PlayerIsAtSouthExit(trainer) == TRUE) { sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; - if (trainer->isSelf) + if (trainer->isLocalPlayer) { SetKeyInterceptCallback(KeyInterCB_DeferToEventScript); CreateConfirmLeaveTradeRoomPrompt(); @@ -2376,7 +2376,7 @@ static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlay if (script) { sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; - if (trainer->isSelf) + if (trainer->isLocalPlayer) { SetKeyInterceptCallback(KeyInterCB_DeferToEventScript); InitMenuBasedScript(script); @@ -2387,7 +2387,7 @@ static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlay if (sub_8087340(trainer)) { sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; - if (trainer->isSelf) + if (trainer->isLocalPlayer) { SetKeyInterceptCallback(KeyInterCB_DeferToRecvQueue); sub_8087510(); @@ -2398,7 +2398,7 @@ static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlay if (sub_8087340(trainer)) { sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; - if (trainer->isSelf) + if (trainer->isLocalPlayer) { SetKeyInterceptCallback(KeyInterCB_DeferToSendQueue); sub_8087510(); @@ -2418,7 +2418,7 @@ static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlay break; case LINK_KEY_CODE_UNK_4: sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_IDLE; - if (trainer->isSelf) + if (trainer->isLocalPlayer) SetKeyInterceptCallback(KeyInterCB_SelfIdle); break; case LINK_KEY_CODE_UNK_7: @@ -2631,7 +2631,7 @@ static u16 KeyInterCB_WaitForPlayersToExit(u32 keyOrPlayerId) CheckRfuKeepAliveTimer(); if (AreAllPlayersInState(PLAYER_TRADING_STATE_EXITING_ROOM) == TRUE) { - ScriptContext1_SetupScript(gEventScript_DoLinkRoomExit); + ScriptContext1_SetupScript(EventScript_DoLinkRoomExit); SetKeyInterceptCallback(KeyInterCB_SendNothing); } return LINK_KEY_CODE_EMPTY; @@ -2651,11 +2651,11 @@ static u16 KeyInterCB_SendNothing_2(u32 key) u32 sub_8087214(void) { - if (AreAnyPlayersInState(PLAYER_TRADING_STATE_EXITING_ROOM) == TRUE) + if (AreAnyPlayersInTradingState(PLAYER_TRADING_STATE_EXITING_ROOM) == TRUE) return 2; - if (sPlayerKeyInterceptCallback == sub_8087170 && sPlayerTradingStates[gLinkSelfPlayerId] != PLAYER_TRADING_STATE_UNK_2) + if (sPlayerKeyInterceptCallback == sub_8087170 && sPlayerTradingStates[LocalLinkPlayerId] != PLAYER_TRADING_STATE_UNK_2) return 0; - if (sPlayerKeyInterceptCallback == KeyInterCB_DoNothingAndKeepAlive && sPlayerTradingStates[gLinkSelfPlayerId] == PLAYER_TRADING_STATE_BUSY) + if (sPlayerKeyInterceptCallback == KeyInterCB_DoNothingAndKeepAlive && sPlayerTradingStates[LocalLinkPlayerId] == PLAYER_TRADING_STATE_BUSY) return 2; if (AreAllPlayersInState(PLAYER_TRADING_STATE_UNK_2) != FALSE) return 1; @@ -2664,7 +2664,7 @@ u32 sub_8087214(void) bool32 sub_808727C(void) { - return AreAnyPlayersInState(PLAYER_TRADING_STATE_EXITING_ROOM); + return AreAnyPlayersInTradingState(PLAYER_TRADING_STATE_EXITING_ROOM); } u16 sub_8087288(void) @@ -2698,7 +2698,7 @@ static void LoadTradeRoomPlayer(s32 linkPlayerId, s32 myPlayerId, struct TradeRo s16 x, y; trainer->playerId = linkPlayerId; - trainer->isSelf = (linkPlayerId == myPlayerId) ? 1 : 0; + trainer->isLocalPlayer = (linkPlayerId == myPlayerId) ? 1 : 0; trainer->c = gLinkPlayerEventObjects[linkPlayerId].movementMode; trainer->facing = GetLinkPlayerFacingDirection(linkPlayerId); GetLinkPlayerCoords(linkPlayerId, &x, &y); @@ -2762,7 +2762,7 @@ static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *player) if (linkPlayerId != 4) { - if (!player->isSelf) + if (!player->isLocalPlayer) return gEventScript_TradeRoom_TooBusyToNotice; else if (sPlayerTradingStates[linkPlayerId] != PLAYER_TRADING_STATE_IDLE) return gEventScript_TradeRoom_TooBusyToNotice; @@ -2779,29 +2779,29 @@ static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *player) // these event scripts runs. static u16 GetDirectionForEventScript(const u8 *script) { - if (script == gEventScript_DoubleBattleColosseum_PlayerSpot0) + if (script == EventScript_DoubleBattleColosseum_PlayerSpot0) return FACING_FORCED_RIGHT; - else if (script == gEventScript_DoubleBattleColosseum_PlayerSpot1) + else if (script == EventScript_DoubleBattleColosseum_PlayerSpot1) return FACING_FORCED_LEFT; - else if (script == gEventScript_DoubleBattleColosseum_PlayerSpot2) + else if (script == EventScript_DoubleBattleColosseum_PlayerSpot2) return FACING_FORCED_RIGHT; - else if (script == gEventScript_DoubleBattleColosseum_PlayerSpot3) + else if (script == EventScript_DoubleBattleColosseum_PlayerSpot3) return FACING_FORCED_LEFT; - else if (script == gEventScript_RecordCenter_Spot0) + else if (script == EventScript_RecordCenter_Spot0) return FACING_FORCED_RIGHT; - else if (script == gEventScript_RecordCenter_Spot1) + else if (script == EventScript_RecordCenter_Spot1) return FACING_FORCED_LEFT; - else if (script == gEventScript_RecordCenter_Spot2) + else if (script == EventScript_RecordCenter_Spot2) return FACING_FORCED_RIGHT; - else if (script == gEventScript_RecordCenter_Spot3) + else if (script == EventScript_RecordCenter_Spot3) return FACING_FORCED_LEFT; - else if (script == gEventScript_SingleBattleColosseum_PlayerSpot0) + else if (script == EventScript_SingleBattleColosseum_PlayerSpot0) return FACING_FORCED_RIGHT; - else if (script == gEventScript_SingleBattleColosseum_PlayerSpot1) + else if (script == EventScript_SingleBattleColosseum_PlayerSpot1) return FACING_FORCED_LEFT; - else if (script == gEventScript_TradeCenter_Chair0) + else if (script == EventScript_TradeCenter_Chair0) return FACING_FORCED_RIGHT; - else if (script == gEventScript_TradeCenter_Chair1) + else if (script == EventScript_TradeCenter_Chair1) return FACING_FORCED_LEFT; else return FACING_NONE; @@ -2829,7 +2829,7 @@ static void sub_8087530(const u8 *script) static void CreateConfirmLeaveTradeRoomPrompt(void) { PlaySE(SE_WIN_OPEN); - ScriptContext1_SetupScript(gEventScript_ConfirmLeaveTradeRoom); + ScriptContext1_SetupScript(EventScript_ConfirmLeaveTradeRoom); ScriptContext2_Enable(); } @@ -2842,7 +2842,7 @@ static void InitMenuBasedScript(const u8 *script) static void sub_8087584(void) { - ScriptContext1_SetupScript(gEventScript_TerminateLink); + ScriptContext1_SetupScript(EventScript_TerminateLink); ScriptContext2_Enable(); } @@ -3046,8 +3046,11 @@ static void SetPlayerFacingDirection(u8 linkPlayerId, u8 facing) if (linkPlayerEventObj->active) { if (facing > FACING_FORCED_RIGHT) + { eventObj->triggerGroundEffectsOnMove = 1; - else { + } + 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) @@ -3131,19 +3134,19 @@ static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerEventObject // even for Left/Right codes. static u8 FlipVerticalAndClearForced(u8 newFacing, u8 oldFacing) { - switch (newFacing - 1) + switch (newFacing) { - case (FACING_UP - 1): - case (FACING_FORCED_UP - 1): + case FACING_UP: + case FACING_FORCED_UP: return DIR_NORTH; - case (FACING_DOWN - 1): - case (FACING_FORCED_DOWN - 1): + case FACING_DOWN: + case FACING_FORCED_DOWN: return DIR_SOUTH; - case (FACING_LEFT - 1): - case (FACING_FORCED_LEFT - 1): + case FACING_LEFT: + case FACING_FORCED_LEFT: return DIR_WEST; - case (FACING_RIGHT - 1): - case (FACING_FORCED_RIGHT - 1): + case FACING_RIGHT: + case FACING_FORCED_RIGHT: return DIR_EAST; } return oldFacing; diff --git a/src/record_mixing.c b/src/record_mixing.c index 4c0ada8300..7bbb4286d6 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -171,7 +171,7 @@ static const u8 gUnknown_0858CFBE[3][4] = #define BUFFER_CHUNK_SIZE 200 // Note: VAR_0x8005 contains the spotId. -void EventScript_RecordMixingPlayerSpotTriggered(void) +void RecordMixingPlayerSpotTriggered(void) { sub_80B37D4(Task_RecordMixing_Main); } @@ -984,7 +984,7 @@ static void Task_DoRecordMixing(u8 taskId) DestroyTask(taskId); break; - // Mixing Emerald/FireRed/LeafGreen records. + // Mixing Emerald records. case 6: if (!sub_801048C(FALSE)) { diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 8f95e6719e..19f032fd0d 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -188,7 +188,7 @@ extern u8 gUnknown_02022C3E; extern u16 gUnknown_02022C3C; extern u8 gUnknown_02022C20[]; extern u8 gFieldLinkPlayerCount; -extern u8 gLinkSelfPlayerId; +extern u8 LocalLinkPlayerId; // IWRAM vars IWRAM_DATA struct UnkStruct_Leader *gUnknown_03000DA0; @@ -1641,7 +1641,7 @@ void sub_8014304(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 arg4) gSpecialVar_0x8004 = arg4; VarSet(VAR_0x4087, arg4); gFieldLinkPlayerCount = GetLinkPlayerCount(); - gLinkSelfPlayerId = GetMultiplayerId(); + LocalLinkPlayerId = GetMultiplayerId(); SetCableClubWarp(); SetWarpDestination(mapGroup, mapNum, -1, x, y); WarpIntoMap(); diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c index f971d84876..7d6020c7a6 100755 --- a/src/script_pokemon_util_80F87D8.c +++ b/src/script_pokemon_util_80F87D8.c @@ -641,9 +641,9 @@ void ScriptSetMonMoveSlot(u8 monIndex, u16 move, u8 slot) SetMonMoveSlot(&gPlayerParty[monIndex], move, slot); } -// Note: When control returns to the event script, gSpecialVar_Result be +// Note: When control returns to the event script, gSpecialVar_Result will be // TRUE if the party selection was successful. -void EventScript_ChooseHalfPartyForBattle(void) +void ChooseHalfPartyForBattle(void) { gMain.savedCallback = CB2_ReturnFromChooseHalfParty; VarSet(VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_DOUBLE_COLOSSEUM); diff --git a/src/start_menu.c b/src/start_menu.c index dfe3b08be4..352f94bff8 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -84,7 +84,7 @@ EWRAM_DATA static bool8 sSavingComplete = FALSE; EWRAM_DATA static u8 sSaveInfoWindowId = 0; // Extern variables. -extern u8 gLinkSelfPlayerId; +extern u8 LocalLinkPlayerId; // Extern functions in not decompiled files. extern void sub_80AF688(void); @@ -734,7 +734,7 @@ static bool8 StartMenuLinkModePlayerNameCallback(void) { PlayRainSoundEffect(); CleanupOverworldWindowsAndTilemaps(); - ShowTrainerCardInLink(gLinkSelfPlayerId, CB2_ReturnToFieldWithOpenMenu); + ShowTrainerCardInLink(LocalLinkPlayerId, CB2_ReturnToFieldWithOpenMenu); return TRUE; } From 40d4f7f8db4126086e975e90d7de967129d34dd0 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 18 Feb 2019 01:10:59 -0500 Subject: [PATCH 087/217] Minor fixes --- src/pokenav.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pokenav.c b/src/pokenav.c index 595b66babc..ff687e8dc5 100644 --- a/src/pokenav.c +++ b/src/pokenav.c @@ -326,7 +326,7 @@ const u8 gMenuButtonReminderColor[4] = 4, 1, 2, 0 }; -const struct CompressedSpriteSheet gUnknown_0861FA4C[1] = +const struct CompressedSpriteSheet gUnknown_0861FA4C[] = { { .data = gUnknown_0861F5B0, @@ -1095,7 +1095,7 @@ void sub_81C7AC0(s32 a0) switch (a0) { case 0: - BeginNormalPaletteFade(v1[5], -2, 0, 16, a0); + BeginNormalPaletteFade(v1[5], -2, 0, 16, RGB_BLACK); break; case 1: BeginNormalPaletteFade(v1[5], -2, 16, 0, RGB_BLACK); @@ -1172,7 +1172,7 @@ void sub_81C7C28(void) u8 spriteId; v1 = sub_81C763C(0); - for (i = 0; i == 0; i++) + for (i = 0; i < ARRAY_COUNT(gUnknown_0861FA4C); i++) { LoadCompressedSpriteSheet(&gUnknown_0861FA4C[i]); } From 93e9b9fe5d207a99c798bd48de9a37ff1c533cde Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 18 Feb 2019 01:33:41 -0500 Subject: [PATCH 088/217] Fix some names --- common_syms/pokedex.txt | 2 +- include/global.h | 2 +- include/pokedex.h | 2 +- src/link_rfu.c | 10 +++++----- src/new_game.c | 4 ++-- src/pokedex.c | 4 ++-- src/save_location.c | 14 +++++++------- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/common_syms/pokedex.txt b/common_syms/pokedex.txt index 4f5f162e97..9aa48a74db 100644 --- a/common_syms/pokedex.txt +++ b/common_syms/pokedex.txt @@ -1,2 +1,2 @@ -gUnusedU8 +gUnusedPokedexU8 gUnknown_030060B4 diff --git a/include/global.h b/include/global.h index 82f31ad539..cc308c3c99 100644 --- a/include/global.h +++ b/include/global.h @@ -446,7 +446,7 @@ struct SaveBlock2 /*0x90*/ u8 filler_90[0x8]; /*0x98*/ struct Time localTimeOffset; /*0xA0*/ struct Time lastBerryTreeUpdate; - /*0xA8*/ u32 unusedFlagField; // Written to, but never read. + /*0xA8*/ u32 field_A8; // Written to, but never read. /*0xAC*/ u32 encryptionKey; /*0xB0*/ struct PlayersApprentice playerApprentice; /*0xDC*/ struct Apprentice apprentices[4]; // From record mixing. diff --git a/include/pokedex.h b/include/pokedex.h index c1eba62b2b..6136f77861 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -1,7 +1,7 @@ #ifndef GUARD_POKEDEX_H #define GUARD_POKEDEX_H -extern u8 gUnusedU8; +extern u8 gUnusedPokedexU8; extern void (*gUnknown_030060B4)(void); #define HOENN_DEX_COUNT 202 diff --git a/src/link_rfu.c b/src/link_rfu.c index 122ffd2430..9ad6a1cd6b 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -2376,18 +2376,18 @@ void RecordMixTrainerNames(void) s32 i; s32 j; s32 nextSpace; - s32 connectedTrainerRecordIndecies[5]; + s32 connectedTrainerRecordIndicies[5]; struct TrainerNameRecord *newRecords = calloc(20, sizeof(struct TrainerNameRecord)); // Check if we already have a record saved for connected trainers. for (i = 0; i < GetLinkPlayerCount(); i++) { - connectedTrainerRecordIndecies[i] = -1; + connectedTrainerRecordIndicies[i] = -1; for (j = 0; j < 20; j++) { if ((u16)gLinkPlayers[i].trainerId == gSaveBlock1Ptr->trainerNameRecords[j].trainerId && StringCompare(gLinkPlayers[i].name, gSaveBlock1Ptr->trainerNameRecords[j].trainerName) == 0) { - connectedTrainerRecordIndecies[i] = j; + connectedTrainerRecordIndicies[i] = j; } } } @@ -2401,9 +2401,9 @@ void RecordMixTrainerNames(void) CopyTrainerRecord(&newRecords[nextSpace], (u16)gLinkPlayers[i].trainerId, gLinkPlayers[i].name); // If we already had a record for this trainer, wipe it so that the next step doesn't duplicate it. - if (connectedTrainerRecordIndecies[i] >= 0) + if (connectedTrainerRecordIndicies[i] >= 0) { - memset(gSaveBlock1Ptr->trainerNameRecords[connectedTrainerRecordIndecies[i]].trainerName, 0, 8); + memset(gSaveBlock1Ptr->trainerNameRecords[connectedTrainerRecordIndicies[i]].trainerName, 0, 8); } nextSpace++; } diff --git a/src/new_game.c b/src/new_game.c index be84445bf5..2e8930f7ce 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -106,7 +106,7 @@ static void SetDefaultOptions(void) static void ClearPokedexFlags(void) { - gUnusedU8 = 0; + gUnusedPokedexU8 = 0; memset(&gSaveBlock2Ptr->pokedex.owned, 0, sizeof(gSaveBlock2Ptr->pokedex.owned)); memset(&gSaveBlock2Ptr->pokedex.seen, 0, sizeof(gSaveBlock2Ptr->pokedex.seen)); } @@ -164,7 +164,7 @@ void NewGameInitData(void) ClearSav1(); ClearMailData(); gSaveBlock2Ptr->specialSaveWarpFlags = 0; - gSaveBlock2Ptr->unusedFlagField = 0; + gSaveBlock2Ptr->field_A8 = 0; InitPlayerTrainerId(); PlayTimeCounter_Reset(); ClearPokedexFlags(); diff --git a/src/pokedex.c b/src/pokedex.c index b2eba6836a..b8c3e93f92 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -38,7 +38,7 @@ static EWRAM_DATA struct PokedexListItem *sPokedexListItem = NULL; // IWRAM common // This is written to, but never read. -u8 gUnusedU8; +u8 gUnusedPokedexU8; void (*gUnknown_030060B4)(void); struct PokedexOption @@ -1226,7 +1226,7 @@ void ResetPokedex(void) gUnknown_02039B50 = 0; gUnknown_02039B52 = 64; - gUnusedU8 = 0; + gUnusedPokedexU8 = 0; gSaveBlock2Ptr->pokedex.mode = DEX_MODE_HOENN; gSaveBlock2Ptr->pokedex.order = 0; gSaveBlock2Ptr->pokedex.nationalMagic = 0; diff --git a/src/save_location.c b/src/save_location.c index 20972873ca..2443b3161b 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -120,13 +120,13 @@ void TrySetMapSaveWarpStatus(void) void sub_81AFDA0(void) { - gSaveBlock2Ptr->unusedFlagField |= 0x8000; - gSaveBlock2Ptr->unusedFlagField |= 0x1; - gSaveBlock2Ptr->unusedFlagField |= 0x2; - gSaveBlock2Ptr->unusedFlagField |= 0x4; - gSaveBlock2Ptr->unusedFlagField |= 0x10; - gSaveBlock2Ptr->unusedFlagField |= 0x20; - gSaveBlock2Ptr->unusedFlagField |= 0x8; + gSaveBlock2Ptr->field_A8 |= 0x8000; + gSaveBlock2Ptr->field_A8 |= 0x1; + gSaveBlock2Ptr->field_A8 |= 0x2; + gSaveBlock2Ptr->field_A8 |= 0x4; + gSaveBlock2Ptr->field_A8 |= 0x10; + gSaveBlock2Ptr->field_A8 |= 0x20; + gSaveBlock2Ptr->field_A8 |= 0x8; } void sub_81AFDD0(void) From fcb541189d5b2ef4d99771661b28e12512c73630 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 18 Feb 2019 02:02:20 -0500 Subject: [PATCH 089/217] Rename some flags, and use map ID macros --- data/field_effect_scripts.s | 13 ------- data/maps/AncientTomb/scripts.inc | 4 +- data/maps/DesertRuins/scripts.inc | 4 +- include/constants/flags.h | 6 +-- src/braille_puzzles.c | 62 +++++++++++++++---------------- 5 files changed, 38 insertions(+), 51 deletions(-) diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 2edf13661e..291d6abec1 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -10,79 +10,66 @@ gFieldEffectScriptPointers:: @ 82DB9D4 .4byte gFieldEffectScript_UseCutOnTree .4byte gFieldEffectScript_Shadow .4byte gFieldEffectScript_TallGrass - .4byte gFieldEffectScript_Ripple .4byte gFieldEffectScript_FieldMoveShowMon .4byte gFieldEffectScript_Ash .4byte gFieldEffectScript_SurfBlob .4byte gFieldEffectScript_UseSurf - .4byte gFieldEffectScript_GroundImpactDust .4byte gFieldEffectScript_Unknown11 .4byte gFieldEffectScript_BikeHopTallGrass .4byte gFieldEffectScript_SandFootprints .4byte gFieldEffectScript_BikeHopBigSplash - .4byte gFieldEffectScript_Splash .4byte gFieldEffectScript_BikeHopSmallSplash .4byte gFieldEffectScript_LongGrass .4byte gFieldEffectScript_Unknown18 .4byte gFieldEffectScript_Unknown19 - .4byte gFieldEffectScript_Unknown20 .4byte gFieldEffectScript_Unknown21 .4byte gFieldEffectScript_Unknown22 .4byte gFieldEffectScript_BerryTreeGrowthSparkle .4byte gFieldEffectScript_DeepSandFootprints - .4byte gFieldEffectScript_Unknown25 .4byte gFieldEffectScript_Unknown26 .4byte gFieldEffectScript_Unknown27 .4byte gFieldEffectScript_TreeDisguise .4byte gFieldEffectScript_MountainDisguise - .4byte gFieldEffectScript_Unknown30 .4byte gFieldEffectScript_UseFly .4byte gFieldEffectScript_FlyIn .4byte gFieldEffectScript_QuestionMarkIcon .4byte gFieldEffectScript_FeetInFlowingWater - .4byte gFieldEffectScript_BikeTireTracks .4byte gFieldEffectScript_SandDisguisePlaceholder .4byte gFieldEffectScript_UseRockSmash .4byte gFieldEffectScript_Unknown38 .4byte gFieldEffectScript_Unknown39 - .4byte gFieldEffectScript_Unknown40 .4byte gFieldEffectScript_ShortGrass .4byte gFieldEffectScript_HotSpringsWater .4byte gFieldEffectScript_Unknown43 .4byte gFieldEffectScript_Unknown44 - .4byte gFieldEffectScript_Unknown45 .4byte gFieldEffectScript_HeartIcon .4byte gFieldEffectScript_Unknown47 .4byte gFieldEffectScript_Unknown48 .4byte gFieldEffectScript_JumpOutOfAsh - .4byte gFieldEffectScript_Unknown50 .4byte gFieldEffectScript_Unknown51 .4byte gFieldEffectScript_Unknown52 .4byte gFieldEffectScript_Bubbles .4byte gFieldEffectScript_Unknown54 - .4byte gFieldEffectScript_Unknown55 .4byte gFieldEffectScript_Unknown56 .4byte gFieldEffectScript_Unknown57 .4byte gFieldEffectScript_Unknown58 .4byte gFieldEffectScript_FieldMoveShowMonInit - .4byte gFieldEffectScript_UsePuzzleEffect .4byte gFieldEffectScript_Unknown61 .4byte gFieldEffectScript_Unknown62 .4byte gFieldEffectScript_Unknown63 .4byte gFieldEffectScript_Rayquaza - .4byte gFieldEffectScript_Unknown65 .4byte gFieldEffectScript_Unknown66 diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 7e9b027b27..241cb50f13 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -25,7 +25,7 @@ AncientTomb_EventScript_238FEE:: @ 8238FEE return AncientTomb_MapScript1_238FF2: @ 8238FF2 - call_if_unset FLAG_SYS_BRAILLE_REGISTEEL_HM, AncientTomb_EventScript_238FFC + call_if_unset FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_238FFC end AncientTomb_EventScript_238FFC:: @ 8238FFC @@ -39,7 +39,7 @@ AncientTomb_EventScript_238FFC:: @ 8238FFC AncientTomb_EventScript_239033:: @ 8239033 lockall - goto_if_set FLAG_SYS_BRAILLE_REGISTEEL_HM, AncientTomb_EventScript_239046 + goto_if_set FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_239046 braillemessage AncientTomb_Braille_2A6D06 waitbuttonpress hidebox2 diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index ff58b3ba5e..ac0b547afc 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -16,7 +16,7 @@ DesertRuins_EventScript_22D975:: @ 822D975 return DesertRuins_MapScript1_22D989: @ 822D989 - call_if_unset FLAG_SYS_BRAILLE_REGIROCK_HM, DesertRuins_EventScript_22D993 + call_if_unset FLAG_SYS_REGIROCK_PUZZLE_COMPLETE, DesertRuins_EventScript_22D993 end DesertRuins_EventScript_22D993:: @ 822D993 @@ -39,7 +39,7 @@ DesertRuins_EventScript_22D9D7:: @ 822D9D7 DesertRuins_EventScript_22D9DB:: @ 822D9DB lockall - goto_if_set FLAG_SYS_BRAILLE_REGIROCK_HM, DesertRuins_EventScript_22D9EE + goto_if_set FLAG_SYS_REGIROCK_PUZZLE_COMPLETE, DesertRuins_EventScript_22D9EE braillemessage DesertRuins_Braille_2A6CA0 waitbuttonpress hidebox2 diff --git a/include/constants/flags.h b/include/constants/flags.h index 11a0c849cf..a7bc4c88ea 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1352,9 +1352,9 @@ #define FLAG_SYS_ENC_UP_ITEM (SYSTEM_FLAGS + 0x4D) #define FLAG_SYS_ENC_DOWN_ITEM (SYSTEM_FLAGS + 0x4E) #define FLAG_SYS_BRAILLE_DIG (SYSTEM_FLAGS + 0x4F) -#define FLAG_SYS_BRAILLE_REGIROCK_HM (SYSTEM_FLAGS + 0x50) -#define FLAG_SYS_BRAILLE_REGICE_PUZZLE (SYSTEM_FLAGS + 0x51) -#define FLAG_SYS_BRAILLE_REGISTEEL_HM (SYSTEM_FLAGS + 0x52) +#define FLAG_SYS_REGIROCK_PUZZLE_COMPLETE (SYSTEM_FLAGS + 0x50) +#define FLAG_SYS_BRAILLE_REGICE_PUZZLE (SYSTEM_FLAGS + 0x51) +#define FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED (SYSTEM_FLAGS + 0x52) #define FLAG_SYS_HAS_EON_TICKET (SYSTEM_FLAGS + 0x53) #define FLAG_LANDMARK_POKEMON_LEAGUE (SYSTEM_FLAGS + 0x54) diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 449c1dfea2..f894919405 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -70,8 +70,8 @@ void DoBrailleRegisteelEffect(void); bool8 ShouldDoBrailleDigEffect(void) { if (!FlagGet(FLAG_SYS_BRAILLE_DIG) - && (gSaveBlock1Ptr->location.mapGroup == 0x18 - && gSaveBlock1Ptr->location.mapNum == 0x47)) + && (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SEALED_CHAMBER_OUTER_ROOM) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEALED_CHAMBER_OUTER_ROOM))) { if (gSaveBlock1Ptr->pos.x == 10 && gSaveBlock1Ptr->pos.y == 3) return TRUE; @@ -86,12 +86,12 @@ bool8 ShouldDoBrailleDigEffect(void) void DoBrailleDigEffect(void) { - MapGridSetMetatileIdAt(16, 8, 554); - MapGridSetMetatileIdAt(17, 8, 555); - MapGridSetMetatileIdAt(18, 8, 556); - MapGridSetMetatileIdAt(16, 9, 3634); - MapGridSetMetatileIdAt(17, 9, 563); - MapGridSetMetatileIdAt(18, 9, 3636); + MapGridSetMetatileIdAt(16, 8, 0x22A); + MapGridSetMetatileIdAt(17, 8, 0x22B); + MapGridSetMetatileIdAt(18, 8, 0x22C); + MapGridSetMetatileIdAt(16, 9, 0xE32); + MapGridSetMetatileIdAt(17, 9, 0x233); + MapGridSetMetatileIdAt(18, 9, 0xE34); DrawWholeMapView(); PlaySE(SE_BAN); FlagSet(FLAG_SYS_BRAILLE_DIG); @@ -117,7 +117,7 @@ bool8 CheckRelicanthWailord(void) void ShouldDoBrailleRegirockEffectOld(void) { /* - if (!FlagGet(FLAG_SYS_BRAILLE_REGIROCK_HM) && (gSaveBlock1.location.mapGroup == MAP_GROUP_DESERT_RUINS && gSaveBlock1.location.mapNum == MAP_ID_DESERT_RUINS)) + if (!FlagGet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETE) && (gSaveBlock1.location.mapGroup == MAP_GROUP_DESERT_RUINS && gSaveBlock1.location.mapNum == MAP_ID_DESERT_RUINS)) { if (gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 23) return TRUE; @@ -141,13 +141,13 @@ void DoBrailleRegirockEffect(void) MapGridSetMetatileIdAt(16, 27, 3636); DrawWholeMapView(); PlaySE(SE_BAN); - FlagSet(FLAG_SYS_BRAILLE_REGIROCK_HM); + FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETE); ScriptContext2_Disable(); } bool8 ShouldDoBrailleRegisteelEffect(void) { - if (!FlagGet(FLAG_SYS_BRAILLE_REGISTEEL_HM) && (gSaveBlock1.location.mapGroup == MAP_GROUP_ANCIENT_TOMB && gSaveBlock1.location.mapNum == MAP_ID_ANCIENT_TOMB)) + if (!FlagGet(FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED) && (gSaveBlock1.location.mapGroup == MAP_GROUP_ANCIENT_TOMB && gSaveBlock1.location.mapNum == MAP_ID_ANCIENT_TOMB)) { if (gSaveBlock1.pos.x == 8 && gSaveBlock1.pos.y == 25) return TRUE; @@ -187,7 +187,7 @@ void UseFlyAncientTomb_Finish(void) MapGridSetMetatileIdAt(16, 27, 3636); DrawWholeMapView(); PlaySE(SE_BAN); - FlagSet(FLAG_SYS_BRAILLE_REGISTEEL_HM); + FlagSet(FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED); ScriptContext2_Disable(); } */ @@ -241,7 +241,7 @@ void SealedChamberShakingEffect(u8 taskId) // moved later in the function because it was rewritten. bool8 ShouldDoBrailleRegirockEffect(void) { - if (!FlagGet(FLAG_SYS_BRAILLE_REGIROCK_HM) + if (!FlagGet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETE) && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(DESERT_RUINS) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(DESERT_RUINS)) { @@ -279,21 +279,21 @@ void UseRegirockHm_Callback(void) void DoBrailleRegirockEffect(void) { - MapGridSetMetatileIdAt(14, 26, 554); - MapGridSetMetatileIdAt(15, 26, 555); - MapGridSetMetatileIdAt(16, 26, 556); - MapGridSetMetatileIdAt(14, 27, 3634); - MapGridSetMetatileIdAt(15, 27, 563); - MapGridSetMetatileIdAt(16, 27, 3636); + MapGridSetMetatileIdAt(14, 26, 0x22A); + MapGridSetMetatileIdAt(15, 26, 0x22B); + MapGridSetMetatileIdAt(16, 26, 0x22C); + MapGridSetMetatileIdAt(14, 27, 0xE32); + MapGridSetMetatileIdAt(15, 27, 0x233); + MapGridSetMetatileIdAt(16, 27, 0xE34); DrawWholeMapView(); PlaySE(SE_BAN); - FlagSet(FLAG_SYS_BRAILLE_REGIROCK_HM); + FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETE); ScriptContext2_Disable(); } bool8 ShouldDoBrailleRegisteelEffect(void) { - if (!FlagGet(FLAG_SYS_BRAILLE_REGISTEEL_HM) && (gSaveBlock1Ptr->location.mapGroup == 0x18 && gSaveBlock1Ptr->location.mapNum == 0x44)) + if (!FlagGet(FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED) && (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ANCIENT_TOMB) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ANCIENT_TOMB))) { if (gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 25) { @@ -318,15 +318,15 @@ void UseRegisteelHm_Callback(void) void DoBrailleRegisteelEffect(void) { - MapGridSetMetatileIdAt(14, 26, 554); - MapGridSetMetatileIdAt(15, 26, 555); - MapGridSetMetatileIdAt(16, 26, 556); - MapGridSetMetatileIdAt(14, 27, 3634); - MapGridSetMetatileIdAt(15, 27, 563); - MapGridSetMetatileIdAt(16, 27, 3636); + MapGridSetMetatileIdAt(14, 26, 0x22A); + MapGridSetMetatileIdAt(15, 26, 0x22B); + MapGridSetMetatileIdAt(16, 26, 0x22C); + MapGridSetMetatileIdAt(14, 27, 0xE32); + MapGridSetMetatileIdAt(15, 27, 0x233); + MapGridSetMetatileIdAt(16, 27, 0xE34); DrawWholeMapView(); PlaySE(SE_BAN); - FlagSet(FLAG_SYS_BRAILLE_REGISTEEL_HM); + FlagSet(FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED); ScriptContext2_Disable(); } @@ -429,8 +429,8 @@ bool8 ShouldDoBrailleRegicePuzzle(void) { u8 i; - if (gSaveBlock1Ptr->location.mapGroup == 0x18 - && gSaveBlock1Ptr->location.mapNum == 0x43) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ISLAND_CAVE) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ISLAND_CAVE)) { if (FlagGet(FLAG_SYS_BRAILLE_REGICE_PUZZLE)) return FALSE; @@ -467,7 +467,7 @@ bool8 ShouldDoBrailleRegicePuzzle(void) } varValue = VarGet(VAR_REGICE_STEPS_1); - if (varValue != 0xFFFF || VarGet(VAR_REGICE_STEPS_2) != varValue || VarGet(VAR_REGICE_STEPS_3) != 0xF) + if (varValue != 0xFFFF || VarGet(VAR_REGICE_STEPS_2) != 0xFFFF || VarGet(VAR_REGICE_STEPS_3) != 0xF) return FALSE; // This final check is redundant. From bfe67842ab3d8f6567f365a65ad82935ed74c338 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 18 Feb 2019 14:14:07 -0500 Subject: [PATCH 090/217] Fix spelling (again) --- src/link_rfu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/link_rfu.c b/src/link_rfu.c index 9ad6a1cd6b..4ad2a51695 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -2376,18 +2376,18 @@ void RecordMixTrainerNames(void) s32 i; s32 j; s32 nextSpace; - s32 connectedTrainerRecordIndicies[5]; + s32 connectedTrainerRecordIndices[5]; struct TrainerNameRecord *newRecords = calloc(20, sizeof(struct TrainerNameRecord)); // Check if we already have a record saved for connected trainers. for (i = 0; i < GetLinkPlayerCount(); i++) { - connectedTrainerRecordIndicies[i] = -1; + connectedTrainerRecordIndices[i] = -1; for (j = 0; j < 20; j++) { if ((u16)gLinkPlayers[i].trainerId == gSaveBlock1Ptr->trainerNameRecords[j].trainerId && StringCompare(gLinkPlayers[i].name, gSaveBlock1Ptr->trainerNameRecords[j].trainerName) == 0) { - connectedTrainerRecordIndicies[i] = j; + connectedTrainerRecordIndices[i] = j; } } } @@ -2401,9 +2401,9 @@ void RecordMixTrainerNames(void) CopyTrainerRecord(&newRecords[nextSpace], (u16)gLinkPlayers[i].trainerId, gLinkPlayers[i].name); // If we already had a record for this trainer, wipe it so that the next step doesn't duplicate it. - if (connectedTrainerRecordIndicies[i] >= 0) + if (connectedTrainerRecordIndices[i] >= 0) { - memset(gSaveBlock1Ptr->trainerNameRecords[connectedTrainerRecordIndicies[i]].trainerName, 0, 8); + memset(gSaveBlock1Ptr->trainerNameRecords[connectedTrainerRecordIndices[i]].trainerName, 0, 8); } nextSpace++; } From 486cf449b8d5715d4ba7d5f1144ab9b8288dd3ee Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 18 Feb 2019 14:17:02 -0500 Subject: [PATCH 091/217] Make flag names more consistent --- data/maps/DesertRuins/scripts.inc | 4 ++-- data/maps/IslandCave/scripts.inc | 8 ++++---- include/constants/flags.h | 4 ++-- src/braille_puzzles.c | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index ac0b547afc..34ae212245 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -16,7 +16,7 @@ DesertRuins_EventScript_22D975:: @ 822D975 return DesertRuins_MapScript1_22D989: @ 822D989 - call_if_unset FLAG_SYS_REGIROCK_PUZZLE_COMPLETE, DesertRuins_EventScript_22D993 + call_if_unset FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_22D993 end DesertRuins_EventScript_22D993:: @ 822D993 @@ -39,7 +39,7 @@ DesertRuins_EventScript_22D9D7:: @ 822D9D7 DesertRuins_EventScript_22D9DB:: @ 822D9DB lockall - goto_if_set FLAG_SYS_REGIROCK_PUZZLE_COMPLETE, DesertRuins_EventScript_22D9EE + goto_if_set FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_22D9EE braillemessage DesertRuins_Braille_2A6CA0 waitbuttonpress hidebox2 diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 3b6d94f0b2..3d0efa1ca8 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -16,7 +16,7 @@ IslandCave_EventScript_238E44:: @ 8238E44 return IslandCave_MapScript1_238E58: @ 8238E58 - call_if_unset FLAG_SYS_BRAILLE_REGICE_PUZZLE, IslandCave_EventScript_238E62 + call_if_unset FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238E62 end IslandCave_EventScript_238E62:: @ 8238E62 @@ -47,13 +47,13 @@ IslandCave_EventScript_238EAF:: @ 8238EAF setmetatile 9, 20, 564, 1 special DrawWholeMapView playse SE_BAN - setflag FLAG_SYS_BRAILLE_REGICE_PUZZLE + setflag FLAG_SYS_BRAILLE_REGICE_COMPLETED end IslandCave_EventScript_238EEF:: @ 8238EEF lockall call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45 - goto_if_set FLAG_SYS_BRAILLE_REGICE_PUZZLE, IslandCave_EventScript_238F13 + goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238F13 braillemessage IslandCave_Braille_2A6CD4 setflag FLAG_TEMP_2 special ShouldDoBrailleRegicePuzzle @@ -69,7 +69,7 @@ IslandCave_EventScript_238F1D:: @ 8238F1D lockall call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45 braillemessage IslandCave_Braille_2A6CD4 - goto_if_set FLAG_SYS_BRAILLE_REGICE_PUZZLE, IslandCave_EventScript_238F41 + goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238F41 setflag FLAG_TEMP_2 special ShouldDoBrailleRegicePuzzle goto IslandCave_EventScript_238F41 diff --git a/include/constants/flags.h b/include/constants/flags.h index a7bc4c88ea..b440ba78b5 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1352,8 +1352,8 @@ #define FLAG_SYS_ENC_UP_ITEM (SYSTEM_FLAGS + 0x4D) #define FLAG_SYS_ENC_DOWN_ITEM (SYSTEM_FLAGS + 0x4E) #define FLAG_SYS_BRAILLE_DIG (SYSTEM_FLAGS + 0x4F) -#define FLAG_SYS_REGIROCK_PUZZLE_COMPLETE (SYSTEM_FLAGS + 0x50) -#define FLAG_SYS_BRAILLE_REGICE_PUZZLE (SYSTEM_FLAGS + 0x51) +#define FLAG_SYS_REGIROCK_PUZZLE_COMPLETED (SYSTEM_FLAGS + 0x50) +#define FLAG_SYS_BRAILLE_REGICE_COMPLETED (SYSTEM_FLAGS + 0x51) #define FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED (SYSTEM_FLAGS + 0x52) #define FLAG_SYS_HAS_EON_TICKET (SYSTEM_FLAGS + 0x53) diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index f894919405..07b941f117 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -117,7 +117,7 @@ bool8 CheckRelicanthWailord(void) void ShouldDoBrailleRegirockEffectOld(void) { /* - if (!FlagGet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETE) && (gSaveBlock1.location.mapGroup == MAP_GROUP_DESERT_RUINS && gSaveBlock1.location.mapNum == MAP_ID_DESERT_RUINS)) + if (!FlagGet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED) && (gSaveBlock1.location.mapGroup == MAP_GROUP_DESERT_RUINS && gSaveBlock1.location.mapNum == MAP_ID_DESERT_RUINS)) { if (gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 23) return TRUE; @@ -141,7 +141,7 @@ void DoBrailleRegirockEffect(void) MapGridSetMetatileIdAt(16, 27, 3636); DrawWholeMapView(); PlaySE(SE_BAN); - FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETE); + FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED); ScriptContext2_Disable(); } @@ -241,7 +241,7 @@ void SealedChamberShakingEffect(u8 taskId) // moved later in the function because it was rewritten. bool8 ShouldDoBrailleRegirockEffect(void) { - if (!FlagGet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETE) + if (!FlagGet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED) && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(DESERT_RUINS) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(DESERT_RUINS)) { @@ -287,7 +287,7 @@ void DoBrailleRegirockEffect(void) MapGridSetMetatileIdAt(16, 27, 0xE34); DrawWholeMapView(); PlaySE(SE_BAN); - FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETE); + FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED); ScriptContext2_Disable(); } @@ -334,7 +334,7 @@ void DoBrailleRegisteelEffect(void) void DoBrailleWait(void) { /* - if (!FlagGet(FLAG_SYS_BRAILLE_REGICE_PUZZLE)) + if (!FlagGet(FLAG_SYS_BRAILLE_REGICE_COMPLETED)) CreateTask(Task_BrailleWait, 0x50); } @@ -432,7 +432,7 @@ bool8 ShouldDoBrailleRegicePuzzle(void) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ISLAND_CAVE) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ISLAND_CAVE)) { - if (FlagGet(FLAG_SYS_BRAILLE_REGICE_PUZZLE)) + if (FlagGet(FLAG_SYS_BRAILLE_REGICE_COMPLETED)) return FALSE; if (FlagGet(FLAG_TEMP_2) == FALSE) return FALSE; From 05f936815437a2c295ed717f8e425c29e97945b8 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 19 Feb 2019 15:08:40 -0600 Subject: [PATCH 092/217] Decompile start of flying.c --- asm/flying.s | 817 -------------------------------------------------- ld_script.txt | 1 + src/flying.c | 312 ++++++++++++++++++- 3 files changed, 307 insertions(+), 823 deletions(-) diff --git a/asm/flying.s b/asm/flying.s index c8010106ab..37873f17bf 100644 --- a/asm/flying.s +++ b/asm/flying.s @@ -5,823 +5,6 @@ .text - thumb_func_start sub_810DE70 -sub_810DE70: @ 810DE70 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0 - bl InitSpritePosToAnimTarget - ldrh r0, [r4, 0x22] - adds r0, 0x14 - strh r0, [r4, 0x22] - movs r0, 0xBF - strh r0, [r4, 0x30] - ldr r1, =sub_810DE98 - str r1, [r4, 0x1C] - adds r0, r4, 0 - bl _call_via_r1 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810DE70 - - thumb_func_start sub_810DE98 -sub_810DE98: @ 810DE98 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x30 - ldrsh r0, [r4, r1] - movs r1, 0x20 - bl Sin - strh r0, [r4, 0x24] - movs r1, 0x30 - ldrsh r0, [r4, r1] - movs r1, 0x8 - bl Cos - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x30] - adds r0, 0x5 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x30] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x47 - bne _0810DED2 - adds r0, r4, 0 - bl DestroyAnimSprite -_0810DED2: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_810DE98 - - thumb_func_start sub_810DED8 -sub_810DED8: @ 810DED8 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gTasks - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - adds r4, r1 - ldr r1, =gBattleAnimArgs - ldrh r0, [r1, 0x2] - strh r0, [r4, 0x8] - ldrh r0, [r1] - strh r0, [r4, 0xA] - ldr r0, =0x00002719 - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0xC] - ldr r0, =sub_810DF18 - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810DED8 - - thumb_func_start sub_810DF18 -sub_810DF18: @ 810DF18 - push {r4-r7,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r2, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r3, r0, r2 - ldrh r0, [r3, 0x1C] - adds r1, r0, 0x1 - strh r1, [r3, 0x1C] - lsls r0, 16 - asrs r0, 16 - movs r4, 0xA - ldrsh r1, [r3, r4] - adds r7, r2, 0 - cmp r0, r1 - bne _0810DF76 - movs r0, 0 - strh r0, [r3, 0x1C] - ldrb r0, [r3, 0xC] - ldr r2, =gPlttBufferFaded - lsls r0, 4 - movs r3, 0x84 - lsls r3, 1 - adds r1, r0, r3 - lsls r1, 1 - adds r1, r2 - ldrh r6, [r1] - movs r4, 0x7 - mov r12, r0 - ldr r0, =0x00000107 - add r0, r12 - lsls r0, 1 - adds r3, r0, r2 -_0810DF5E: - ldrh r0, [r3] - strh r0, [r1] - subs r3, 0x2 - subs r1, 0x2 - subs r4, 0x1 - cmp r4, 0 - bgt _0810DF5E - ldr r0, =0x00000101 - add r0, r12 - lsls r0, 1 - adds r0, r2 - strh r6, [r0] -_0810DF76: - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r7 - ldrh r1, [r0, 0x8] - subs r1, 0x1 - strh r1, [r0, 0x8] - lsls r1, 16 - cmp r1, 0 - bne _0810DF90 - adds r0, r5, 0 - bl DestroyAnimVisualTask -_0810DF90: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810DF18 - - thumb_func_start sub_810DFA8 -sub_810DFA8: @ 810DFA8 - push {r4-r6,lr} - adds r6, r0, 0 - movs r1, 0x1 - bl InitSpritePosToAnimAttacker - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _0810DFC8 - ldr r1, =gBattleAnimArgs - ldrh r0, [r1, 0x4] - negs r0, r0 - strh r0, [r1, 0x4] -_0810DFC8: - ldr r4, =gBattleAnimArgs - ldrh r0, [r4, 0x8] - strh r0, [r6, 0x2E] - ldrh r0, [r6, 0x20] - strh r0, [r6, 0x30] - ldr r5, =gBattleAnimTarget - ldrb r0, [r5] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r4, 0x4] - adds r0, r1 - strh r0, [r6, 0x32] - ldrh r0, [r6, 0x22] - strh r0, [r6, 0x34] - ldrb r0, [r5] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r4, [r4, 0x6] - adds r0, r4 - strh r0, [r6, 0x36] - adds r0, r6, 0 - bl InitAnimLinearTranslation - ldr r0, =RunStoredCallbackWhenAffineAnimEnds - str r0, [r6, 0x1C] - ldr r1, =sub_810E028 - adds r0, r6, 0 - bl StoreSpriteCallbackInData6 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810DFA8 - - thumb_func_start sub_810E028 -sub_810E028: @ 810E028 - push {r4,lr} - adds r4, r0, 0 - bl AnimTranslateLinear - lsls r0, 24 - cmp r0, 0 - beq _0810E03C - adds r0, r4, 0 - bl DestroyAnimSprite -_0810E03C: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_810E028 - - thumb_func_start sub_810E044 -sub_810E044: @ 810E044 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, =gBattleAnimAttacker - ldrb r0, [r4] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _0810E070 - ldr r1, =gBattleAnimArgs - ldrh r0, [r1] - negs r0, r0 - strh r0, [r1] - ldrh r0, [r1, 0x2] - negs r0, r0 - strh r0, [r1, 0x2] - ldrh r0, [r1, 0x4] - negs r0, r0 - strh r0, [r1, 0x4] - ldrh r0, [r1, 0x6] - negs r0, r0 - strh r0, [r1, 0x6] -_0810E070: - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _0810E088 - ldr r0, =gBattleAnimArgs - ldrh r1, [r0, 0x2] - negs r1, r1 - strh r1, [r0, 0x2] - ldrh r1, [r0, 0x6] - negs r1, r1 - strh r1, [r0, 0x6] -_0810E088: - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - ldr r2, =gBattleAnimArgs - ldrh r1, [r2] - ldrh r3, [r5, 0x20] - adds r1, r3 - strh r1, [r5, 0x20] - lsrs r0, 24 - ldrh r1, [r2, 0x2] - adds r0, r1 - strh r0, [r5, 0x22] - ldrh r0, [r2, 0x8] - strh r0, [r5, 0x2E] - movs r3, 0xC - ldrsh r0, [r2, r3] - cmp r0, 0 - bne _0810E0EC - ldr r4, =gBattleAnimTarget - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x32] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x36] - b _0810E0FE - .pool -_0810E0EC: - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - adds r2, r5, 0 - adds r2, 0x32 - adds r3, r5, 0 - adds r3, 0x36 - movs r1, 0x1 - bl SetAverageBattlerPositions -_0810E0FE: - ldr r4, =gBattleAnimArgs - ldrh r0, [r4, 0x4] - ldrh r1, [r5, 0x32] - adds r0, r1 - strh r0, [r5, 0x32] - ldrh r0, [r4, 0x6] - ldrh r3, [r5, 0x36] - adds r0, r3 - strh r0, [r5, 0x36] - ldr r0, =StartAnimLinearTranslation - str r0, [r5, 0x1C] - ldr r1, =DestroyAnimSprite - adds r0, r5, 0 - bl StoreSpriteCallbackInData6 - ldrb r1, [r4, 0xA] - adds r0, r5, 0 - bl SeekSpriteAnim - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810E044 - - thumb_func_start sub_810E13C -sub_810E13C: @ 810E13C - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl InitSpritePosToAnimAttacker - ldr r1, =gBattleAnimArgs - ldrh r0, [r1, 0x4] - strh r0, [r4, 0x2E] - ldrh r0, [r1, 0x6] - strh r0, [r4, 0x30] - ldr r0, =sub_810E184 - str r0, [r4, 0x1C] - movs r0, 0 - bl GetAnimBattlerSpriteId - ldr r2, =gSprites - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810E13C - - thumb_func_start sub_810E184 -sub_810E184: @ 810E184 - push {lr} - adds r2, r0, 0 - ldrh r1, [r2, 0x2E] - movs r3, 0x2E - ldrsh r0, [r2, r3] - cmp r0, 0 - ble _0810E198 - subs r0, r1, 0x1 - strh r0, [r2, 0x2E] - b _0810E1AA -_0810E198: - ldrh r0, [r2, 0x30] - ldrh r1, [r2, 0x32] - adds r0, r1 - strh r0, [r2, 0x32] - lsls r0, 16 - asrs r0, 24 - ldrh r1, [r2, 0x26] - subs r1, r0 - strh r1, [r2, 0x26] -_0810E1AA: - movs r3, 0x22 - ldrsh r0, [r2, r3] - movs r3, 0x26 - ldrsh r1, [r2, r3] - adds r0, r1 - movs r1, 0x20 - negs r1, r1 - cmp r0, r1 - bge _0810E1C2 - adds r0, r2, 0 - bl DestroyAnimSprite -_0810E1C2: - pop {r0} - bx r0 - thumb_func_end sub_810E184 - - thumb_func_start sub_810E1C8 -sub_810E1C8: @ 810E1C8 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _0810E1F8 - movs r0, 0x88 - lsls r0, 1 - strh r0, [r5, 0x20] - ldr r0, =0x0000ffe0 - strh r0, [r5, 0x22] - adds r0, r5, 0 - movs r1, 0x1 - bl StartSpriteAffineAnim - b _0810E1FE - .pool -_0810E1F8: - ldr r0, =0x0000ffe0 - strh r0, [r5, 0x20] - strh r0, [r5, 0x22] -_0810E1FE: - ldr r0, =gBattleAnimArgs - ldrh r0, [r0] - strh r0, [r5, 0x2E] - ldrh r0, [r5, 0x20] - strh r0, [r5, 0x30] - ldr r4, =gBattleAnimTarget - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x32] - ldrh r0, [r5, 0x22] - strh r0, [r5, 0x34] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x36] - adds r0, r5, 0 - bl InitAnimLinearTranslation - ldr r0, =sub_810E24C - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810E1C8 - - thumb_func_start sub_810E24C -sub_810E24C: @ 810E24C - push {r4,lr} - adds r4, r0, 0 - movs r0, 0x1 - strh r0, [r4, 0x2E] - adds r0, r4, 0 - bl AnimTranslateLinear - ldrh r1, [r4, 0x34] - lsrs r0, r1, 8 - cmp r0, 0xC8 - bls _0810E274 - ldrh r0, [r4, 0x24] - ldrh r2, [r4, 0x20] - adds r0, r2 - strh r0, [r4, 0x20] - movs r0, 0 - strh r0, [r4, 0x24] - movs r0, 0xFF - ands r0, r1 - strh r0, [r4, 0x34] -_0810E274: - movs r1, 0x20 - ldrsh r0, [r4, r1] - movs r2, 0x24 - ldrsh r1, [r4, r2] - adds r0, r1 - adds r0, 0x20 - movs r1, 0x98 - lsls r1, 1 - cmp r0, r1 - bhi _0810E296 - movs r1, 0x22 - ldrsh r0, [r4, r1] - movs r2, 0x26 - ldrsh r1, [r4, r2] - adds r0, r1 - cmp r0, 0xA0 - ble _0810E2BC -_0810E296: - movs r0, 0 - bl GetAnimBattlerSpriteId - ldr r2, =gSprites - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - adds r1, 0x3E - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - adds r0, r4, 0 - bl DestroyAnimSprite -_0810E2BC: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810E24C - - thumb_func_start sub_810E2C8 -sub_810E2C8: @ 810E2C8 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x2E] - subs r1, r0, 0x1 - strh r1, [r4, 0x2E] - lsls r0, 16 - cmp r0, 0 - bgt _0810E308 - ldrb r0, [r4, 0x1] - lsls r0, 30 - lsrs r0, 30 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0810E2FA - ldrb r0, [r4, 0x3] - lsls r0, 26 - lsrs r0, 27 - bl FreeOamMatrix - ldrb r1, [r4, 0x1] - movs r0, 0x4 - negs r0, r0 - ands r0, r1 - strb r0, [r4, 0x1] -_0810E2FA: - adds r0, r4, 0 - bl DestroySprite - ldr r1, =gAnimVisualTaskCount - ldrb r0, [r1] - subs r0, 0x1 - strb r0, [r1] -_0810E308: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810E2C8 - - thumb_func_start sub_810E314 -sub_810E314: @ 810E314 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r7, r0, 0 - adds r5, r7, 0 - adds r5, 0x2E - ldr r0, =gBattleAnimArgs - ldrh r1, [r0, 0xE] - movs r0, 0x80 - lsls r0, 1 - ands r0, r1 - cmp r0, 0 - beq _0810E33C - ldr r0, =gBattleAnimAttacker - b _0810E33E - .pool -_0810E33C: - ldr r0, =gBattleAnimTarget -_0810E33E: - ldrb r6, [r0] - adds r0, r6, 0 - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _0810E354 - ldr r1, =gBattleAnimArgs - ldrh r0, [r1] - negs r0, r0 - strh r0, [r1] -_0810E354: - adds r0, r6, 0 - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - ldr r4, =gBattleAnimArgs - lsrs r0, 24 - ldrh r1, [r4] - adds r0, r1 - strh r0, [r7, 0x20] - adds r0, r6, 0 - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - ldrh r1, [r4, 0x2] - lsrs r0, 24 - adds r1, r0, r1 - strh r1, [r7, 0x22] - lsls r1, 8 - strh r1, [r5, 0x8] - ldrh r1, [r4, 0xC] - adds r0, r1 - lsls r0, 1 - ldrh r2, [r5, 0xE] - movs r1, 0x1 - ands r1, r2 - orrs r1, r0 - strh r1, [r5, 0xE] - ldrb r0, [r5] - movs r2, 0x4 - mov r8, r2 - mov r1, r8 - orrs r0, r1 - strb r0, [r5] - ldrh r0, [r4, 0x4] - ldrb r1, [r4, 0x4] - strh r1, [r5, 0x2] - lsls r0, 16 - lsrs r0, 24 - strh r0, [r5, 0xA] - ldrh r0, [r4, 0x6] - strh r0, [r5, 0x4] - ldrh r0, [r4, 0x8] - strh r0, [r5, 0x6] - ldrh r0, [r4, 0xA] - strh r0, [r5, 0xC] - subs r1, 0x40 - lsls r1, 16 - lsrs r1, 16 - cmp r1, 0x7F - bhi _0810E44A - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _0810E3F0 - adds r0, r6, 0 - bl GetBattlerSpriteBGPriority - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x1 - movs r1, 0x3 - ands r0, r1 - lsls r0, 2 - ldrb r2, [r7, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - orrs r1, r0 - strb r1, [r7, 0x5] - b _0810E408 - .pool -_0810E3F0: - adds r0, r6, 0 - bl GetBattlerSpriteBGPriority - movs r1, 0x3 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r7, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r7, 0x5] -_0810E408: - ldrb r1, [r5, 0xE] - movs r4, 0x2 - negs r4, r4 - adds r0, r4, 0 - ands r0, r1 - strb r0, [r5, 0xE] - movs r2, 0x4 - ldrsh r0, [r5, r2] - movs r1, 0x80 - lsls r1, 8 - ands r0, r1 - cmp r0, 0 - bne _0810E4AA - adds r3, r7, 0 - adds r3, 0x3F - ldrb r2, [r3] - lsls r0, r2, 31 - lsrs r0, 31 - movs r1, 0x1 - eors r1, r0 - adds r0, r4, 0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - lsls r0, 31 - lsrs r0, 31 - adds r1, r7, 0 - adds r1, 0x2A - strb r0, [r1] - ldrb r0, [r3] - movs r1, 0x4 - orrs r0, r1 - b _0810E4A2 -_0810E44A: - adds r0, r6, 0 - bl GetBattlerSpriteBGPriority - movs r1, 0x3 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r7, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r7, 0x5] - ldrb r0, [r5, 0xE] - movs r4, 0x1 - orrs r0, r4 - strb r0, [r5, 0xE] - movs r1, 0x4 - ldrsh r0, [r5, r1] - movs r1, 0x80 - lsls r1, 8 - ands r0, r1 - cmp r0, 0 - beq _0810E4AA - adds r3, r7, 0 - adds r3, 0x3F - ldrb r2, [r3] - lsls r1, r2, 31 - lsrs r1, 31 - movs r0, 0x1 - eors r1, r0 - ands r1, r4 - movs r0, 0x2 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - lsls r0, 31 - lsrs r0, 31 - adds r1, r7, 0 - adds r1, 0x2A - strb r0, [r1] - ldrb r0, [r3] - mov r2, r8 - orrs r0, r2 -_0810E4A2: - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - strb r0, [r3] -_0810E4AA: - ldrh r1, [r5, 0x2] - lsrs r1, 6 - lsls r1, 4 - ldrb r2, [r5] - movs r0, 0xF - ands r0, r2 - orrs r0, r1 - strb r0, [r5] - ldr r3, =gSineTable - ldrh r0, [r5, 0x2] - lsls r0, 1 - adds r0, r3 - movs r2, 0 - ldrsh r1, [r0, r2] - ldrb r0, [r5, 0xC] - muls r0, r1 - asrs r0, 8 - strh r0, [r7, 0x24] - ldrb r2, [r7, 0x3] - lsls r2, 26 - lsrs r2, 27 - movs r1, 0x24 - ldrsh r0, [r7, r1] - negs r0, r0 - asrs r0, 1 - ldrb r5, [r5, 0xA] - adds r0, r5 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 1 - adds r1, r3 - ldrh r4, [r1] - ldr r1, =gOamMatrices - lsls r2, 3 - adds r2, r1 - adds r0, 0x40 - lsls r0, 1 - adds r0, r3 - ldrh r0, [r0] - strh r0, [r2, 0x6] - strh r0, [r2] - strh r4, [r2, 0x2] - lsls r0, r4, 16 - asrs r0, 16 - negs r0, r0 - strh r0, [r2, 0x4] - ldr r0, =sub_810E520 - str r0, [r7, 0x1C] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810E314 - thumb_func_start sub_810E520 sub_810E520: @ 810E520 push {r4-r7,lr} diff --git a/ld_script.txt b/ld_script.txt index 77bc56ecc7..be9efb1d5e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -165,6 +165,7 @@ SECTIONS { src/ice.o(.text); src/fight.o(.text); src/poison.o(.text); + src/flying.o(.text); asm/flying.o(.text); src/psychic.o(.text); src/bug.o(.text); diff --git a/src/flying.c b/src/flying.c index d3ea3f11bf..48df12a067 100644 --- a/src/flying.c +++ b/src/flying.c @@ -1,13 +1,16 @@ #include "global.h" #include "battle_anim.h" +#include "palette.h" +#include "trig.h" +#include "constants/battle_anim.h" #include "constants/rgb.h" -extern void sub_810DE70(struct Sprite *); -extern void sub_810DFA8(struct Sprite *); -extern void sub_810E044(struct Sprite *); -extern void sub_810E13C(struct Sprite *); -extern void sub_810E1C8(struct Sprite *); -extern void sub_810E314(struct Sprite *); +void sub_810DE70(struct Sprite *); +void sub_810DFA8(struct Sprite *); +void sub_810E044(struct Sprite *); +void sub_810E13C(struct Sprite *); +void sub_810E1C8(struct Sprite *); +void sub_810E314(struct Sprite *); extern void sub_810EA4C(struct Sprite *); extern void sub_810EAA0(struct Sprite *); extern void sub_810EC34(struct Sprite *); @@ -18,6 +21,13 @@ extern void sub_810EEF8(struct Sprite *); extern void sub_810F004(struct Sprite *); extern void sub_810F084(struct Sprite *); +static void sub_810DE98(struct Sprite *); +static void sub_810DF18(u8); +static void sub_810E028(struct Sprite *); +static void sub_810E184(struct Sprite *); +static void sub_810E24C(struct Sprite *); +void sub_810E520(struct Sprite *); + const struct SpriteTemplate gUnknown_08596270 = { .tileTag = ANIM_TAG_GUST, @@ -326,3 +336,293 @@ const struct SpriteTemplate gUnknown_08596514 = .affineAnims = gDummySpriteAffineAnimTable, .callback = sub_810F084, }; + + +void sub_810DE70(struct Sprite *sprite) +{ + InitSpritePosToAnimTarget(sprite, FALSE); + sprite->pos1.y += 20; + sprite->data[1] = 191; + sprite->callback = sub_810DE98; + sprite->callback(sprite); +} + +static void sub_810DE98(struct Sprite *sprite) { + sprite->pos2.x = Sin(sprite->data[1], 32); + sprite->pos2.y = Cos(sprite->data[1], 8); + sprite->data[1] += 5; + sprite->data[1] &= 0xFF; + if (++sprite->data[0] == 71) + DestroyAnimSprite(sprite); +} + +void sub_810DED8(u8 taskId) +{ + gTasks[taskId].data[0] = gBattleAnimArgs[1]; + gTasks[taskId].data[1] = gBattleAnimArgs[0]; + gTasks[taskId].data[2] = IndexOfSpritePaletteTag(ANIM_TAG_GUST); + gTasks[taskId].func = sub_810DF18; +} + +static void sub_810DF18(u8 taskId) +{ + u8 data2; + u16 temp; + int i, base; + + if (gTasks[taskId].data[10]++ == gTasks[taskId].data[1]) + { + gTasks[taskId].data[10] = 0; + data2 = gTasks[taskId].data[2]; + temp = gPlttBufferFaded[16 * data2 + 0x108]; + i = 7; + base = data2 * 16; + + do + { + gPlttBufferFaded[base + 0x101 + i] = gPlttBufferFaded[base + 0x100 + i]; + i--; + } + while (i > 0); + + gPlttBufferFaded[base + 0x101] = temp; + } + + if (--gTasks[taskId].data[0] == 0) + DestroyAnimVisualTask(taskId); +} + +void sub_810DFA8(struct Sprite *sprite) +{ + InitSpritePosToAnimAttacker(sprite, TRUE); + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + + sprite->data[0] = gBattleAnimArgs[4]; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[2]; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[3]; + InitAnimLinearTranslation(sprite); + sprite->callback = RunStoredCallbackWhenAffineAnimEnds; + StoreSpriteCallbackInData6(sprite, sub_810E028); +} + +static void sub_810E028(struct Sprite *sprite) +{ + if (AnimTranslateLinear(sprite)) + DestroyAnimSprite(sprite); +} + +void sub_810E044(struct Sprite *sprite) +{ + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + { + gBattleAnimArgs[0] = -gBattleAnimArgs[0]; + gBattleAnimArgs[1] = -gBattleAnimArgs[1]; + gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + gBattleAnimArgs[3] = -gBattleAnimArgs[3]; + } + + if (IsContest()) + { + gBattleAnimArgs[1] = -gBattleAnimArgs[1]; + gBattleAnimArgs[3] = -gBattleAnimArgs[3]; + } + + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[0] = gBattleAnimArgs[4]; + + if (gBattleAnimArgs[6] == 0) + { + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); + } + else + { + SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->data[2], &sprite->data[4]); + } + + sprite->data[2] = sprite->data[2] + gBattleAnimArgs[2]; + sprite->data[4] = sprite->data[4] + gBattleAnimArgs[3]; + sprite->callback = StartAnimLinearTranslation; + + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); + SeekSpriteAnim(sprite, gBattleAnimArgs[5]); +} + +void sub_810E13C(struct Sprite *sprite) +{ + InitSpritePosToAnimAttacker(sprite, TRUE); + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->callback = sub_810E184; + gSprites[GetAnimBattlerSpriteId(ANIM_ATTACKER)].invisible = 1; +} + +static void sub_810E184(struct Sprite *sprite) +{ + if (sprite->data[0] > 0) + { + sprite->data[0]--; + } + else + { + sprite->data[2] += sprite->data[1]; + sprite->pos2.y -= (sprite->data[2] >> 8); + } + + if (sprite->pos1.y + sprite->pos2.y < -32) + DestroyAnimSprite(sprite); +} + +void sub_810E1C8(struct Sprite *sprite) +{ + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + { + sprite->pos1.x = 272; + sprite->pos1.y = -32; + StartSpriteAffineAnim(sprite, 1); + } + else + { + sprite->pos1.x = -32; + sprite->pos1.y = -32; + } + + sprite->data[0] = gBattleAnimArgs[0]; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); + + InitAnimLinearTranslation(sprite); + sprite->callback = sub_810E24C; +} + +static void sub_810E24C(struct Sprite *sprite) +{ + sprite->data[0] = 1; + AnimTranslateLinear(sprite); + if (((u16)sprite->data[3] >> 8) > 200) + { + sprite->pos1.x += sprite->pos2.x; + sprite->pos2.x = 0; + sprite->data[3] &= 0xFF; + } + + if ((u32)(sprite->pos1.x + sprite->pos2.x + 32) > 304 || sprite->pos1.y + sprite->pos2.y > 160) + { + gSprites[GetAnimBattlerSpriteId(ANIM_ATTACKER)].invisible = 0; + DestroyAnimSprite(sprite); + } +} + +void sub_810E2C8(struct Sprite *sprite) +{ + if (sprite->data[0]-- <= 0) + { + if (sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK) + { + FreeOamMatrix(sprite->oam.matrixNum); + sprite->oam.affineMode = 0; + } + + DestroySprite(sprite); + gAnimVisualTaskCount--; + } +} + +// FAKEMATCHING +void sub_810E314(struct Sprite *sprite) +{ + s16 *data; + u8 slot; + s16 spriteCoord; + int t1, t2; + u32 arg2; + u32 matrixNum; + u8 sinIndex; + register s16 sinVal asm ("r4"); + register int sinVal2 asm ("r0"); + + data = sprite->data; + + if (gBattleAnimArgs[7] & 0x100) + slot = gBattleAnimAttacker; + else + slot = gBattleAnimTarget; + + if (GetBattlerSide(slot) == B_SIDE_PLAYER) + gBattleAnimArgs[0] = -gBattleAnimArgs[0]; + + sprite->pos1.x = GetBattlerSpriteCoord(slot, 0) + gBattleAnimArgs[0]; + spriteCoord = GetBattlerSpriteCoord(slot, 1); + sprite->pos1.y = spriteCoord + gBattleAnimArgs[1]; + data[4] = sprite->pos1.y << 8; + + t1 = (spriteCoord + (u16) gBattleAnimArgs[6]) << 1; + data[7] = (data[7] & 1) | t1; + ((u8 *) data)[0] |= 4; + + arg2 = (u16) gBattleAnimArgs[2]; + data[1] = (u8) gBattleAnimArgs[2]; + arg2 <<= 16; + data[5] = arg2 >> 24; + data[2] = gBattleAnimArgs[3]; + data[3] = gBattleAnimArgs[4]; + data[6] = gBattleAnimArgs[5]; + + if ((u16) (data[1] - 64) <= 0x7f) + { + if (!IsContest()) + sprite->oam.priority = GetBattlerSpriteBGPriority(slot) + 1; + else + sprite->oam.priority = GetBattlerSpriteBGPriority(slot); + + ((u8 *) data)[14] = data[7] & -2; + + if (!(data[2] & 0x8000)) + { + sprite->hFlip ^= 1; + sprite->animNum = sprite->hFlip; + + sprite->animBeginning = 1; + sprite->animEnded = 0; + } + } + else + { + sprite->oam.priority = GetBattlerSpriteBGPriority(slot); + ((u8 *) data)[14] |= 1; + + if (data[2] & 0x8000) + { + sprite->hFlip ^= 1; + sprite->animNum = sprite->hFlip; + + sprite->animBeginning = 1; + sprite->animEnded = 0; + } + } + + t2 = (u16) data[1] >> 6 << 4; + ((u8 *) data)[0] = (15 & data[0]) | t2; + + sprite->pos2.x = (gSineTable[(u16) data[1]] * (u8) data[6]) >> 8; + + matrixNum = sprite->oam.matrixNum; + + sinIndex = (-sprite->pos2.x >> 1) + data[5]; + sinVal = gSineTable[sinIndex]; + + gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[sinIndex + 64]; + gOamMatrices[matrixNum].b = sinVal; + sinVal2 = -sinVal; + gOamMatrices[matrixNum].c = sinVal2; + + sprite->callback = sub_810E520; +} From 4223bb65f05704ade92ed99d9d5ea58becf1c8ec Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 19 Feb 2019 16:30:15 -0600 Subject: [PATCH 093/217] Decompile several contest_link_80F57C4.c functions --- asm/contest_link_80F57C4.s | 393 ------------------------------------- src/contest_link_80F57C4.c | 136 ++++++++++++- 2 files changed, 132 insertions(+), 397 deletions(-) diff --git a/asm/contest_link_80F57C4.s b/asm/contest_link_80F57C4.s index d732936485..44f92caca5 100644 --- a/asm/contest_link_80F57C4.s +++ b/asm/contest_link_80F57C4.s @@ -5,399 +5,6 @@ .text - thumb_func_start sub_80F7364 -sub_80F7364: @ 80F7364 - push {r4-r7,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r1, 24 - lsrs r6, r1, 24 - ldr r1, =gUnknown_02039F18 - lsls r0, r5, 1 - adds r0, r1 - movs r2, 0 - ldrsh r0, [r0, r2] - adds r7, r1, 0 - cmp r0, 0 - bge _080F7380 - negs r0, r0 -_080F7380: - lsls r4, r0, 16 - adds r0, r4, 0 - movs r1, 0x50 - bl __udivsi3 - adds r2, r0, 0 - ldr r0, =0x0000ffff - ands r0, r2 - cmp r0, 0 - beq _080F739A - movs r0, 0x80 - lsls r0, 9 - adds r2, r0 -_080F739A: - lsrs r2, 16 - cmp r2, 0 - bne _080F73A6 - cmp r4, 0 - beq _080F73A6 - movs r2, 0x1 -_080F73A6: - cmp r6, 0 - beq _080F73B0 - cmp r2, 0xA - bls _080F73B0 - movs r2, 0xA -_080F73B0: - lsls r0, r5, 1 - adds r0, r7 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bge _080F73CC - negs r0, r2 - lsls r0, 24 - b _080F73CE - .pool -_080F73CC: - lsls r0, r2, 24 -_080F73CE: - lsrs r0, 24 - lsls r0, 24 - asrs r0, 24 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80F7364 - - thumb_func_start sub_80F73DC -sub_80F73DC: @ 80F73DC - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x10 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldr r1, =gTasks - lsls r0, 2 - add r0, r8 - lsls r0, 3 - adds r7, r0, r1 - ldrh r2, [r7, 0x1C] - movs r0, 0x1C - ldrsh r6, [r7, r0] - cmp r6, 0 - bne _080F741C - movs r1, 0x8 - ldrsh r0, [r7, r1] - movs r1, 0x3 - subs r1, r0 - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - strh r0, [r7, 0x1E] - adds r0, r2, 0x1 - strh r0, [r7, 0x1C] - b _080F74A4 - .pool -_080F741C: - cmp r6, 0x1 - bne _080F74A4 - ldrh r0, [r7, 0x1E] - subs r0, 0x1 - strh r0, [r7, 0x1E] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _080F74A4 - movs r2, 0x8 - ldrsh r4, [r7, r2] - lsls r4, 17 - ldr r0, =0x50430000 - adds r4, r0 - lsrs r4, 16 - movs r1, 0xA - ldrsh r0, [r7, r1] - lsls r3, r0, 1 - adds r3, r0 - adds r3, 0x5 - lsls r3, 24 - lsrs r3, 24 - movs r2, 0x2 - mov r9, r2 - str r2, [sp] - str r6, [sp, 0x4] - movs r5, 0x11 - str r5, [sp, 0x8] - str r6, [sp, 0xC] - movs r0, 0x2 - adds r1, r4, 0 - movs r2, 0x1 - bl WriteSequenceToBgTilemapBuffer - adds r4, 0x10 - lsls r4, 16 - lsrs r4, 16 - movs r1, 0xA - ldrsh r0, [r7, r1] - lsls r3, r0, 1 - adds r3, r0 - adds r3, 0x6 - lsls r3, 24 - lsrs r3, 24 - mov r2, r9 - str r2, [sp] - str r6, [sp, 0x4] - str r5, [sp, 0x8] - str r6, [sp, 0xC] - movs r0, 0x2 - adds r1, r4, 0 - movs r2, 0x1 - bl WriteSequenceToBgTilemapBuffer - ldr r0, =gUnknown_0203A034 - ldr r0, [r0] - ldr r1, [r0] - ldrb r0, [r1, 0x5] - adds r0, 0x1 - strb r0, [r1, 0x5] - mov r0, r8 - bl DestroyTask - movs r0, 0x18 - bl PlaySE -_080F74A4: - add sp, 0x10 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F73DC - - thumb_func_start sub_80F74BC -sub_80F74BC: @ 80F74BC - push {r4-r6,lr} - sub sp, 0xC - lsls r0, 24 - lsrs r5, r0, 24 - movs r4, 0 - ldr r1, =gContestFinalStandings - ldrb r0, [r1] - ldr r6, =gUnknown_0203A034 - cmp r0, 0 - beq _080F74DE -_080F74D0: - adds r4, 0x1 - cmp r4, 0x3 - bgt _080F74DE - adds r0, r4, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080F74D0 -_080F74DE: - ldr r1, [r6] - lsls r3, r4, 1 - adds r3, r4 - lsls r0, r3, 6 - movs r2, 0x80 - lsls r2, 1 - adds r0, r2 - ldr r1, [r1, 0x14] - adds r1, r0 - adds r3, 0x4 - lsls r3, 24 - lsrs r3, 24 - movs r0, 0x20 - str r0, [sp] - movs r0, 0x3 - str r0, [sp, 0x4] - movs r0, 0x9 - str r0, [sp, 0x8] - movs r0, 0x2 - movs r2, 0 - bl CopyToBgTilemapBufferRect_ChangePalette - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - strh r4, [r0, 0x1C] - movs r1, 0x1 - strh r1, [r0, 0x20] - ldr r1, =sub_80F753C - str r1, [r0] - ldr r0, [r6] - ldr r0, [r0] - strb r5, [r0, 0x3] - add sp, 0xC - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F74BC - - thumb_func_start sub_80F753C -sub_80F753C: @ 80F753C - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 - ldrh r0, [r4, 0x1E] - adds r0, 0x1 - strh r0, [r4, 0x1E] - lsls r0, 16 - asrs r5, r0, 16 - cmp r5, 0x1 - bne _080F75A0 - movs r0, 0 - strh r0, [r4, 0x1E] - ldrh r2, [r4, 0x20] - lsls r2, 24 - lsrs r2, 24 - ldr r3, =0x00006f8d - movs r0, 0x91 - movs r1, 0x1 - bl BlendPalette - movs r1, 0x22 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080F7590 - ldrh r0, [r4, 0x20] - adds r0, 0x1 - strh r0, [r4, 0x20] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x10 - bne _080F75A0 - strh r5, [r4, 0x22] - b _080F75A0 - .pool -_080F7590: - ldrh r0, [r4, 0x20] - subs r0, 0x1 - strh r0, [r4, 0x20] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bne _080F75A0 - strh r0, [r4, 0x22] -_080F75A0: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80F753C - - thumb_func_start sub_80F75A8 -sub_80F75A8: @ 80F75A8 - push {r4,lr} - adds r4, r0, 0 - ldrh r1, [r4, 0x2E] - movs r2, 0x2E - ldrsh r0, [r4, r2] - cmp r0, 0x9 - bgt _080F75D0 - adds r0, r1, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xA - bne _080F7610 - ldrh r0, [r4, 0x30] - movs r1, 0 - bl PlayCry1 - movs r0, 0 - strh r0, [r4, 0x30] - b _080F7610 -_080F75D0: - movs r0, 0xC0 - lsls r0, 3 - adds r2, r0, 0 - ldrh r1, [r4, 0x30] - adds r2, r1 - lsls r1, r2, 16 - asrs r1, 24 - ldrh r0, [r4, 0x20] - subs r0, r1 - strh r0, [r4, 0x20] - movs r1, 0xFF - ands r2, r1 - strh r2, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x77 - bgt _080F75F6 - movs r0, 0x78 - strh r0, [r4, 0x20] -_080F75F6: - movs r2, 0x20 - ldrsh r0, [r4, r2] - cmp r0, 0x78 - bne _080F7610 - ldr r0, =SpriteCallbackDummy - str r0, [r4, 0x1C] - movs r0, 0 - strh r0, [r4, 0x30] - ldr r0, =gUnknown_0203A034 - ldr r0, [r0] - ldr r1, [r0] - movs r0, 0x1 - strb r0, [r1, 0x6] -_080F7610: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F75A8 - - thumb_func_start sub_80F7620 -sub_80F7620: @ 80F7620 - push {lr} - adds r3, r0, 0 - movs r0, 0xC0 - lsls r0, 3 - adds r2, r0, 0 - ldrh r0, [r3, 0x30] - adds r2, r0 - lsls r1, r2, 16 - asrs r1, 24 - ldrh r0, [r3, 0x20] - subs r0, r1 - strh r0, [r3, 0x20] - movs r1, 0xFF - ands r2, r1 - strh r2, [r3, 0x30] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x20 - negs r1, r1 - cmp r0, r1 - bge _080F7664 - ldr r0, =SpriteCallbackDummy - str r0, [r3, 0x1C] - adds r2, r3, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldr r0, =gUnknown_0203A034 - ldr r0, [r0] - ldr r1, [r0] - movs r0, 0x2 - strb r0, [r1, 0x6] -_080F7664: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F7620 - thumb_func_start sub_80F7670 sub_80F7670: @ 80F7670 push {r4-r7,lr} diff --git a/src/contest_link_80F57C4.c b/src/contest_link_80F57C4.c index 381fb34fab..c72fc9ba34 100644 --- a/src/contest_link_80F57C4.c +++ b/src/contest_link_80F57C4.c @@ -110,13 +110,14 @@ static void sub_80F6EF4(u16); static void sub_80F60F0(u8); static void sub_80F616C(u8); static void sub_80F6204(u8); -void sub_80F73DC(u8); -void sub_80F74BC(u8); +static void sub_80F73DC(u8); +static void sub_80F74BC(u8); +static void sub_80F753C(u8); void sub_80F77E0(u8, u8); static void sub_80F6404(u8); -void sub_80F75A8(struct Sprite *); +static void sub_80F75A8(struct Sprite *); void sub_80F7670(u8); -void sub_80F7620(struct Sprite *); +static void sub_80F7620(struct Sprite *); static void sub_80F66B4(u8); static void sub_80F671C(u8); static void sub_80F677C(u8); @@ -1439,3 +1440,130 @@ u8 sub_80F7310(u8 monIndex, u8 arg1) return var1; } + +s8 sub_80F7364(u8 arg0, u8 arg1) +{ + u32 r4; + u32 r2; + s16 val; + s8 ret; + + val = gUnknown_02039F18[arg0]; + if (val < 0) + r4 = -val << 16; + else + r4 = val << 16; + + r2 = r4 / 80; + if (r2 & 0xFFFF) + r2 += 0x10000; + + r2 >>= 16; + if (r2 == 0 && r4 != 0) + r2 = 1; + + if (arg1 != 0 && r2 > 10) + r2 = 10; + + if (gUnknown_02039F18[arg0] < 0) + ret = -r2; + else + ret = r2; + + return ret; +} + +static void sub_80F73DC(u8 taskId) +{ + u16 firstTileNum; + + if (gTasks[taskId].data[10] == 0) + { + gTasks[taskId].data[11] = (3 - gTasks[taskId].data[0]) * 40; + gTasks[taskId].data[10]++; + } + else if (gTasks[taskId].data[10] == 1) + { + if (--gTasks[taskId].data[11] == -1) + { + firstTileNum = gTasks[taskId].data[0] * 2 + 0x5043; + WriteSequenceToBgTilemapBuffer(2, firstTileNum, 1, gTasks[taskId].data[1] * 3 + 5, 2, 1, 17, 1); + WriteSequenceToBgTilemapBuffer(2, firstTileNum + 0x10, 1, gTasks[taskId].data[1] * 3 + 6, 2, 1, 17, 1); + gUnknown_0203A034->unk0->unk5++; + DestroyTask(taskId); + PlaySE(SE_JYUNI); + } + } +} + +static void sub_80F74BC(u8 taskId) +{ + int i; + for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++) + ; + + CopyToBgTilemapBufferRect_ChangePalette(2, i * 0xC0 + 0x100 + gUnknown_0203A034->unkC[2], 0, i * 3 + 4, 32, 3, 9); + gTasks[taskId].data[10] = i; + gTasks[taskId].data[12] = 1; + gTasks[taskId].func = sub_80F753C; + gUnknown_0203A034->unk0->unk3 = taskId; +} + +static void sub_80F753C(u8 taskId) +{ + if (++gTasks[taskId].data[11] == 1) + { + gTasks[taskId].data[11] = 0; + BlendPalette(0x91, 1, gTasks[taskId].data[12], RGB(13, 28, 27)); + if (gTasks[taskId].data[13] == 0) + { + if (++gTasks[taskId].data[12] == 16) + gTasks[taskId].data[13] = 1; + } + else + { + if (--gTasks[taskId].data[12] == 0) + gTasks[taskId].data[13] = 0; + } + } +} + +static void sub_80F75A8(struct Sprite *sprite) +{ + if (sprite->data[0] < 10) + { + if (++sprite->data[0] == 10) + { + PlayCry1(sprite->data[1], 0); + sprite->data[1] = 0; + } + } + else + { + s16 delta = (u16)sprite->data[1] + 0x600; + sprite->pos1.x -= delta >> 8; + sprite->data[1] = (sprite->data[1] + 0x600) & 0xFF; + if (sprite->pos1.x < 120) + sprite->pos1.x = 120; + + if (sprite->pos1.x == 120) + { + sprite->callback = SpriteCallbackDummy; + sprite->data[1] = 0; + gUnknown_0203A034->unk0->unk6 = 1; + } + } +} + +static void sub_80F7620(struct Sprite *sprite) +{ + s16 delta = (u16)sprite->data[1] + 0x600; + sprite->pos1.x -= delta >> 8; + sprite->data[1] = (sprite->data[1] + 0x600) & 0xFF; + if (sprite->pos1.x < -32) + { + sprite->callback = SpriteCallbackDummy; + sprite->invisible = 1; + gUnknown_0203A034->unk0->unk6 = 2; + } +} From 1c6502338e2bf891d6bfbb6e804acff2b674ff29 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Feb 2019 18:05:33 -0600 Subject: [PATCH 094/217] Decompile contest_link_80F57C4.c --- asm/contest_link_80F57C4.s | 2119 -------------------------------- include/contest_link_80FC4F4.h | 5 + ld_script.txt | 1 - src/contest_link_80F57C4.c | 1593 +++++++++++++++++++++++- 4 files changed, 1580 insertions(+), 2138 deletions(-) delete mode 100644 asm/contest_link_80F57C4.s diff --git a/asm/contest_link_80F57C4.s b/asm/contest_link_80F57C4.s deleted file mode 100644 index 44f92caca5..0000000000 --- a/asm/contest_link_80F57C4.s +++ /dev/null @@ -1,2119 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_80F7670 -sub_80F7670: @ 80F7670 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r7, r0, 24 - ldr r1, =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r1, r0, r1 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - bne _080F7732 - movs r0, 0 - strh r0, [r1, 0x8] - ldr r0, =gUnknown_0203A034 - mov r8, r0 - ldr r0, [r0] - ldr r0, [r0] - ldrb r0, [r0, 0x7] - cmp r0, 0x27 - bhi _080F7732 - ldr r4, =gSpriteTemplate_858D860 - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0xF0 - bl __umodsi3 - adds r1, r0, 0 - subs r1, 0x14 - lsls r1, 16 - asrs r1, 16 - adds r0, r4, 0 - movs r2, 0x2C - movs r3, 0x5 - bl CreateSprite - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl Random - ldr r1, =gSprites - lsls r5, r4, 4 - adds r5, r4 - lsls r5, 2 - adds r5, r1 - lsls r0, 23 - lsrs r0, 23 - strh r0, [r5, 0x2E] - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x18 - bl __umodsi3 - adds r0, 0x10 - strh r0, [r5, 0x30] - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0xFF - ands r0, r1 - adds r0, 0x30 - strh r0, [r5, 0x32] - bl Random - ldrh r6, [r5, 0x4] - lsls r4, r6, 22 - lsrs r4, 22 - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x11 - bl __umodsi3 - adds r4, r0 - ldr r1, =0x000003ff - adds r0, r1, 0 - ands r4, r0 - ldr r0, =0xfffffc00 - ands r0, r6 - orrs r0, r4 - strh r0, [r5, 0x4] - mov r1, r8 - ldr r0, [r1] - ldr r1, [r0] - ldrb r0, [r1, 0x7] - adds r0, 0x1 - strb r0, [r1, 0x7] -_080F7732: - ldr r0, =gUnknown_0203A034 - ldr r0, [r0] - ldr r0, [r0] - ldrb r0, [r0, 0x9] - cmp r0, 0 - beq _080F7744 - adds r0, r7, 0 - bl DestroyTask -_080F7744: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F7670 - - thumb_func_start sub_80F7768 -sub_80F7768: @ 80F7768 - push {r4,r5,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x2E] - ldrh r1, [r4, 0x34] - adds r0, r1 - strh r0, [r4, 0x34] - lsls r0, 16 - asrs r0, 24 - movs r2, 0x30 - ldrsh r1, [r4, r2] - bl Sin - strh r0, [r4, 0x24] - ldrh r1, [r4, 0x32] - ldrh r0, [r4, 0x36] - adds r1, r0 - lsls r0, r1, 16 - asrs r0, 24 - ldrh r2, [r4, 0x20] - adds r0, r2 - strh r0, [r4, 0x20] - movs r0, 0xFF - ands r1, r0 - strh r1, [r4, 0x36] - ldrh r0, [r4, 0x22] - adds r0, 0x1 - strh r0, [r4, 0x22] - ldr r5, =gUnknown_0203A034 - ldr r0, [r5] - ldr r0, [r0] - ldrb r0, [r0, 0x9] - cmp r0, 0 - beq _080F77B6 - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] -_080F77B6: - movs r1, 0x20 - ldrsh r0, [r4, r1] - cmp r0, 0xF8 - bgt _080F77C6 - movs r2, 0x22 - ldrsh r0, [r4, r2] - cmp r0, 0x74 - ble _080F77D6 -_080F77C6: - adds r0, r4, 0 - bl DestroySprite - ldr r0, [r5] - ldr r1, [r0] - ldrb r0, [r1, 0x7] - subs r0, 0x1 - strb r0, [r1, 0x7] -_080F77D6: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F7768 - - thumb_func_start sub_80F77E0 -sub_80F77E0: @ 80F77E0 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r5, 24 - ldr r0, =sub_80F7824 - movs r1, 0x8 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - strh r4, [r1, 0x8] - strh r5, [r1, 0xA] - ldr r0, =gContestMons - lsls r4, 6 - adds r4, r0 - ldrh r0, [r4] - strh r0, [r1, 0xC] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F77E0 - - thumb_func_start sub_80F7824 -sub_80F7824: @ 80F7824 - push {r4,r5,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 - ldrb r5, [r4, 0x8] - ldrh r0, [r4, 0x1C] - adds r1, r0, 0x1 - strh r1, [r4, 0x1C] - lsls r0, 16 - asrs r0, 16 - movs r2, 0xA - ldrsh r1, [r4, r2] - cmp r0, r1 - bne _080F786E - movs r0, 0 - strh r0, [r4, 0x1C] - ldrh r0, [r4, 0xC] - ldrb r2, [r4, 0x1E] - ldr r1, =gContestMons - lsls r3, r5, 6 - adds r1, 0x38 - adds r3, r1 - ldr r1, [r3] - str r1, [sp] - adds r1, r5, 0 - movs r3, 0 - bl sub_80F69B8 - ldrh r0, [r4, 0x1E] - movs r1, 0x1 - eors r0, r1 - strh r0, [r4, 0x1E] -_080F786E: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F7824 - - thumb_func_start sub_80F7880 -sub_80F7880: @ 80F7880 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - ldr r0, =gUnknown_02039F08 - ldrh r2, [r0] - adds r4, r0, 0 - adds r3, r4, 0x2 - movs r0, 0x2 - mov r8, r0 -_080F7898: - lsls r0, r2, 16 - asrs r0, 16 - movs r5, 0 - ldrsh r1, [r3, r5] - cmp r0, r1 - bge _080F78A6 - ldrh r2, [r3] -_080F78A6: - adds r3, 0x2 - movs r0, 0x1 - negs r0, r0 - add r8, r0 - mov r1, r8 - cmp r1, 0 - bge _080F7898 - lsls r0, r2, 16 - str r0, [sp] - cmp r0, 0 - bge _080F78E4 - ldrh r2, [r4] - adds r3, r4, 0x2 - movs r4, 0x2 - mov r8, r4 -_080F78C4: - lsls r0, r2, 16 - asrs r0, 16 - movs r5, 0 - ldrsh r1, [r3, r5] - cmp r0, r1 - ble _080F78D2 - ldrh r2, [r3] -_080F78D2: - adds r3, 0x2 - movs r0, 0x1 - negs r0, r0 - add r8, r0 - lsls r1, r2, 16 - str r1, [sp] - mov r4, r8 - cmp r4, 0 - bge _080F78C4 -_080F78E4: - movs r5, 0 - mov r8, r5 - mov r10, r5 -_080F78EA: - ldr r0, =gContestMonConditions - mov r1, r8 - lsls r7, r1, 1 - adds r0, r7, r0 - movs r2, 0 - ldrsh r1, [r0, r2] - lsls r0, r1, 5 - subs r0, r1 - lsls r0, 2 - adds r0, r1 - lsls r0, 3 - ldr r4, [sp] - asrs r5, r4, 16 - adds r1, r5, 0 - cmp r5, 0 - bge _080F790C - negs r1, r5 -_080F790C: - bl __divsi3 - adds r4, r0, 0 - movs r1, 0xA - bl __modsi3 - cmp r0, 0x4 - ble _080F791E - adds r4, 0xA -_080F791E: - ldr r0, =gUnknown_0203A034 - mov r9, r0 - ldr r0, [r0] - ldr r0, [r0, 0x4] - mov r1, r10 - adds r6, r1, r0 - adds r0, r4, 0 - movs r1, 0xA - bl __divsi3 - str r0, [r6] - ldr r0, =gUnknown_02039F18 - adds r7, r0 - movs r2, 0 - ldrsh r1, [r7, r2] - cmp r1, 0 - bge _080F7942 - negs r1, r1 -_080F7942: - lsls r0, r1, 5 - subs r0, r1 - lsls r0, 2 - adds r0, r1 - lsls r0, 3 - adds r1, r5, 0 - cmp r1, 0 - bge _080F7954 - negs r1, r1 -_080F7954: - bl __divsi3 - adds r4, r0, 0 - movs r1, 0xA - bl __modsi3 - cmp r0, 0x4 - ble _080F7966 - adds r4, 0xA -_080F7966: - adds r0, r4, 0 - movs r1, 0xA - bl __divsi3 - str r0, [r6, 0x4] - movs r4, 0 - ldrsh r0, [r7, r4] - cmp r0, 0 - bge _080F797C - movs r0, 0x1 - strb r0, [r6, 0x10] -_080F797C: - mov r5, r9 - ldr r0, [r5] - ldr r0, [r0, 0x4] - mov r1, r10 - adds r4, r1, r0 - ldr r1, [r4] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - subs r0, r1 - lsls r0, 11 - movs r1, 0x64 - bl __divsi3 - adds r1, r0, 0 - movs r5, 0xFF - ands r0, r5 - cmp r0, 0x7F - bls _080F79A8 - movs r2, 0x80 - lsls r2, 1 - adds r1, r2 -_080F79A8: - lsrs r0, r1, 8 - str r0, [r4, 0x8] - ldr r1, [r4, 0x4] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - subs r0, r1 - lsls r0, 11 - movs r1, 0x64 - bl __divsi3 - adds r1, r0, 0 - ands r0, r5 - cmp r0, 0x7F - bls _080F79CC - movs r5, 0x80 - lsls r5, 1 - adds r1, r5 -_080F79CC: - lsrs r0, r1, 8 - str r0, [r4, 0xC] - mov r0, r8 - lsls r4, r0, 24 - lsrs r4, 24 - adds r0, r4, 0 - movs r1, 0x1 - bl sub_80F7310 - mov r2, r9 - ldr r1, [r2] - ldr r1, [r1, 0x4] - add r1, r10 - strb r0, [r1, 0x11] - adds r0, r4, 0 - movs r1, 0x1 - bl sub_80F7364 - mov r4, r9 - ldr r1, [r4] - ldr r1, [r1, 0x4] - add r1, r10 - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - bge _080F7A02 - negs r0, r0 -_080F7A02: - strb r0, [r1, 0x12] - ldr r0, =gContestFinalStandings - add r0, r8 - ldrb r0, [r0] - cmp r0, 0 - beq _080F7A60 - mov r5, r9 - ldr r0, [r5] - ldr r0, [r0, 0x4] - mov r2, r10 - adds r1, r2, r0 - ldr r5, [r1, 0x8] - ldrh r3, [r1, 0x8] - ldr r4, [r1, 0xC] - ldrh r2, [r1, 0xC] - ldrb r0, [r1, 0x10] - cmp r0, 0 - beq _080F7A2C - lsls r0, r2, 16 - negs r0, r0 - lsrs r2, r0, 16 -_080F7A2C: - lsls r0, r3, 16 - asrs r3, r0, 16 - lsls r0, r2, 16 - asrs r2, r0, 16 - adds r0, r3, r2 - cmp r0, 0x58 - bne _080F7A60 - cmp r2, 0 - ble _080F7A58 - subs r0, r4, 0x1 - str r0, [r1, 0xC] - b _080F7A60 - .pool -_080F7A58: - cmp r3, 0 - ble _080F7A60 - subs r0, r5, 0x1 - str r0, [r1, 0x8] -_080F7A60: - movs r4, 0x14 - add r10, r4 - movs r5, 0x1 - add r8, r5 - mov r0, r8 - cmp r0, 0x3 - bgt _080F7A70 - b _080F78EA -_080F7A70: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80F7880 - - thumb_func_start sub_80F7A80 -sub_80F7A80: @ 80F7A80 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - lsls r0, 24 - lsls r1, 24 - lsrs r1, 24 - mov r8, r1 - movs r1, 0 - str r1, [sp, 0x8] - movs r3, 0 - str r3, [sp, 0xC] - cmp r0, 0 - bne _080F7B5C - mov r9, r3 - ldr r4, =gUnknown_0203A034 - mov r10, r4 - movs r7, 0xA0 - lsls r7, 19 - movs r6, 0 -_080F7AAC: - mov r1, r10 - ldr r0, [r1] - ldr r0, [r0, 0x4] - adds r0, r6, r0 - ldrb r2, [r0, 0x11] - cmp r8, r2 - bcs _080F7B2E - adds r2, 0x13 - mov r3, r8 - subs r2, r3 - subs r2, 0x1 - lsls r2, 24 - lsrs r2, 24 - lsrs r3, r7, 24 - movs r0, 0x1 - str r0, [sp] - str r0, [sp, 0x4] - ldr r1, =0x000060b3 - bl FillBgTilemapBufferRect_Palette0 - ldr r0, =sub_80F7CA8 - movs r1, 0xA - bl CreateTask - lsls r0, 24 - lsrs r5, r0, 24 - mov r0, r10 - ldr r4, [r0] - ldr r1, [r4, 0x4] - adds r1, r6, r1 - ldr r0, [r1, 0x8] - lsls r0, 16 - ldrb r1, [r1, 0x11] - bl __udivsi3 - mov r1, r8 - adds r1, 0x1 - adds r3, r0, 0 - muls r3, r1 - ldr r0, =0x0000ffff - ands r0, r3 - ldr r1, =0x00007fff - cmp r0, r1 - bls _080F7B0A - movs r1, 0x80 - lsls r1, 9 - adds r3, r1 -_080F7B0A: - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - mov r1, r9 - strh r1, [r0, 0x8] - lsrs r1, r3, 16 - strh r1, [r0, 0xA] - ldr r1, [r4] - ldrb r0, [r1, 0x14] - adds r0, 0x1 - strb r0, [r1, 0x14] - ldr r0, [sp, 0x8] - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x8] -_080F7B2E: - movs r3, 0xC0 - lsls r3, 18 - adds r7, r3 - adds r6, 0x14 - movs r4, 0x1 - add r9, r4 - mov r0, r9 - cmp r0, 0x3 - ble _080F7AAC - b _080F7C7E - .pool -_080F7B5C: - movs r1, 0 - mov r9, r1 - mov r10, r1 - movs r3, 0xC0 - lsls r3, 19 - str r3, [sp, 0x10] -_080F7B68: - ldr r4, =gUnknown_0203A034 - ldr r0, [r4] - ldr r0, [r0, 0x4] - add r0, r10 - ldrb r2, [r0, 0x12] - ldrb r0, [r0, 0x10] - ldr r1, =0x000060a3 - cmp r0, 0 - beq _080F7B7C - adds r1, 0x2 -_080F7B7C: - lsls r0, r2, 24 - asrs r0, 24 - cmp r8, r0 - bge _080F7C64 - mov r3, r8 - lsls r2, r3, 24 - asrs r2, 24 - subs r2, 0x13 - subs r2, r0, r2 - subs r2, 0x1 - lsls r2, 24 - lsrs r2, 24 - ldr r4, [sp, 0x10] - lsrs r3, r4, 24 - movs r7, 0x1 - str r7, [sp] - str r7, [sp, 0x4] - movs r0, 0x1 - bl FillBgTilemapBufferRect_Palette0 - ldr r0, =sub_80F7CA8 - movs r1, 0xA - bl CreateTask - lsls r0, 24 - lsrs r5, r0, 24 - ldr r0, =gUnknown_0203A034 - ldr r6, [r0] - ldr r1, [r6, 0x4] - add r1, r10 - ldr r0, [r1, 0xC] - lsls r0, 16 - ldrb r1, [r1, 0x12] - bl __udivsi3 - mov r1, r8 - adds r1, 0x1 - adds r3, r0, 0 - muls r3, r1 - ldr r0, =0x0000ffff - ands r0, r3 - ldr r1, =0x00007fff - cmp r0, r1 - bls _080F7BDA - movs r1, 0x80 - lsls r1, 9 - adds r3, r1 -_080F7BDA: - ldr r1, =gTasks - lsls r2, r5, 2 - adds r0, r2, r5 - lsls r0, 3 - adds r4, r0, r1 - mov r0, r9 - strh r0, [r4, 0x8] - ldr r0, [r6, 0x4] - add r0, r10 - ldrb r0, [r0, 0x10] - adds r6, r1, 0 - cmp r0, 0 - beq _080F7C1C - strh r7, [r4, 0xC] - ldr r0, [sp, 0xC] - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0xC] - b _080F7C26 - .pool -_080F7C1C: - ldr r0, [sp, 0x8] - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x8] -_080F7C26: - ldr r1, =gUnknown_0203A034 - ldr r0, [r1] - ldr r0, [r0, 0x4] - mov r4, r10 - adds r1, r4, r0 - ldrb r0, [r1, 0x10] - ldr r4, =gUnknown_0203A034 - cmp r0, 0 - beq _080F7C4C - adds r0, r2, r5 - lsls r0, 3 - adds r0, r6 - lsrs r2, r3, 16 - ldr r1, [r1, 0x8] - subs r1, r2 - b _080F7C58 - .pool -_080F7C4C: - adds r0, r2, r5 - lsls r0, 3 - adds r0, r6 - lsrs r2, r3, 16 - ldr r1, [r1, 0x8] - adds r1, r2 -_080F7C58: - strh r1, [r0, 0xA] - ldr r0, [r4] - ldr r1, [r0] - ldrb r0, [r1, 0x14] - adds r0, 0x1 - strb r0, [r1, 0x14] -_080F7C64: - movs r0, 0x14 - add r10, r0 - ldr r1, [sp, 0x10] - movs r3, 0xC0 - lsls r3, 18 - adds r1, r3 - str r1, [sp, 0x10] - movs r4, 0x1 - add r9, r4 - mov r0, r9 - cmp r0, 0x3 - bgt _080F7C7E - b _080F7B68 -_080F7C7E: - ldr r1, [sp, 0xC] - cmp r1, 0 - beq _080F7C8A - movs r0, 0x16 - bl PlaySE -_080F7C8A: - ldr r3, [sp, 0x8] - cmp r3, 0 - beq _080F7C96 - movs r0, 0x15 - bl PlaySE -_080F7C96: - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80F7A80 - - thumb_func_start sub_80F7CA8 -sub_80F7CA8: @ 80F7CA8 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x8 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - movs r4, 0 - mov r9, r4 - ldr r1, =gTasks - lsls r0, 2 - add r0, r8 - lsls r0, 3 - adds r0, r1 - ldrb r6, [r0, 0x8] - ldrh r7, [r0, 0xA] - ldrh r1, [r0, 0xC] - mov r12, r1 - movs r2, 0xC - ldrsh r0, [r0, r2] - cmp r0, 0 - beq _080F7CF8 - ldr r2, =gUnknown_0203A034 - ldr r0, [r2] - ldr r0, [r0] - lsls r1, r6, 1 - adds r0, 0xC - adds r0, r1 - movs r3, 0 - ldrsh r0, [r0, r3] - adds r5, r1, 0 - cmp r0, 0 - bgt _080F7D10 - b _080F7D0E - .pool -_080F7CF8: - ldr r2, =gUnknown_0203A034 - ldr r0, [r2] - ldr r0, [r0] - lsls r1, r6, 1 - adds r0, 0xC - adds r0, r1 - movs r3, 0 - ldrsh r0, [r0, r3] - adds r5, r1, 0 - cmp r0, 0x57 - ble _080F7D10 -_080F7D0E: - movs r4, 0x1 -_080F7D10: - ldr r0, [r2] - ldr r0, [r0] - adds r0, 0xC - adds r2, r0, r5 - ldrh r3, [r2] - movs r0, 0 - ldrsh r1, [r2, r0] - lsls r0, r7, 16 - asrs r0, 16 - cmp r1, r0 - bne _080F7D2A - movs r1, 0x1 - mov r9, r1 -_080F7D2A: - mov r0, r9 - cmp r0, 0 - bne _080F7D4A - cmp r4, 0 - beq _080F7D3C - strh r7, [r2] - b _080F7D4A - .pool -_080F7D3C: - mov r1, r12 - cmp r1, 0 - beq _080F7D46 - subs r0, r3, 0x1 - b _080F7D48 -_080F7D46: - adds r0, r3, 0x1 -_080F7D48: - strh r0, [r2] -_080F7D4A: - cmp r4, 0 - bne _080F7DC4 - mov r2, r9 - cmp r2, 0 - bne _080F7DCA - movs r2, 0 -_080F7D56: - ldr r0, =gUnknown_0203A034 - ldr r0, [r0] - ldr r0, [r0] - adds r0, 0xC - adds r0, r5 - movs r1, 0 - ldrsh r3, [r0, r1] - adds r0, r2, 0x1 - lsls r1, r0, 3 - adds r4, r0, 0 - cmp r3, r1 - blt _080F7D78 - movs r0, 0x8 - b _080F7D94 - .pool -_080F7D78: - lsls r0, r2, 3 - cmp r3, r0 - blt _080F7D92 - adds r0, r3, 0 - cmp r3, 0 - bge _080F7D86 - adds r0, r3, 0x7 -_080F7D86: - asrs r0, 3 - lsls r0, 3 - subs r0, r3, r0 - lsls r0, 24 - lsrs r0, 24 - b _080F7D94 -_080F7D92: - movs r0, 0 -_080F7D94: - cmp r0, 0x3 - bhi _080F7DA0 - ldr r3, =0x0000504c - b _080F7DA2 - .pool -_080F7DA0: - ldr r3, =0x00005057 -_080F7DA2: - adds r1, r0, r3 - adds r2, 0x7 - lsls r2, 24 - lsrs r2, 24 - adds r3, r5, r6 - adds r3, 0x6 - lsls r3, 24 - movs r0, 0x1 - str r0, [sp] - str r0, [sp, 0x4] - movs r0, 0x2 - lsrs r3, 24 - bl FillBgTilemapBufferRect_Palette0 - adds r2, r4, 0 - cmp r2, 0xA - ble _080F7D56 -_080F7DC4: - mov r0, r9 - cmp r0, 0 - beq _080F7DDC -_080F7DCA: - ldr r0, =gUnknown_0203A034 - ldr r0, [r0] - ldr r1, [r0] - ldrb r0, [r1, 0x14] - subs r0, 0x1 - strb r0, [r1, 0x14] - mov r0, r8 - bl DestroyTask -_080F7DDC: - add sp, 0x8 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F7CA8 - - thumb_func_start sub_80F7DF4 -sub_80F7DF4: @ 80F7DF4 - push {r4,r5,lr} - ldr r4, =gUnknown_0203A034 - movs r0, 0x20 - bl AllocZeroed - str r0, [r4] - movs r0, 0x18 - bl AllocZeroed - ldr r1, [r4] - str r0, [r1] - movs r0, 0x50 - bl AllocZeroed - ldr r1, [r4] - str r0, [r1, 0x4] - movs r5, 0x80 - lsls r5, 4 - adds r0, r5, 0 - bl AllocZeroed - ldr r1, [r4] - str r0, [r1, 0x8] - adds r0, r5, 0 - bl AllocZeroed - ldr r1, [r4] - str r0, [r1, 0xC] - adds r0, r5, 0 - bl AllocZeroed - ldr r1, [r4] - str r0, [r1, 0x10] - adds r0, r5, 0 - bl AllocZeroed - ldr r1, [r4] - str r0, [r1, 0x14] - adds r0, r5, 0 - bl AllocZeroed - ldr r1, [r4] - str r0, [r1, 0x18] - movs r0, 0x80 - lsls r0, 5 - bl AllocZeroed - ldr r1, [r4] - str r0, [r1, 0x1C] - bl AllocateMonSpritesGfx - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F7DF4 - - thumb_func_start sub_80F7E64 -sub_80F7E64: @ 80F7E64 - push {r4,r5,lr} - ldr r5, =gUnknown_0203A034 - ldr r0, [r5] - ldr r0, [r0] - bl Free - ldr r0, [r5] - movs r4, 0 - str r4, [r0] - ldr r0, [r0, 0x4] - bl Free - ldr r0, [r5] - str r4, [r0, 0x4] - ldr r0, [r0, 0x8] - bl Free - ldr r0, [r5] - str r4, [r0, 0x8] - ldr r0, [r0, 0xC] - bl Free - ldr r0, [r5] - str r4, [r0, 0xC] - ldr r0, [r0, 0x10] - bl Free - ldr r0, [r5] - str r4, [r0, 0x10] - ldr r0, [r0, 0x14] - bl Free - ldr r0, [r5] - str r4, [r0, 0x14] - ldr r0, [r0, 0x18] - bl Free - ldr r0, [r5] - str r4, [r0, 0x18] - ldr r0, [r0, 0x1C] - bl Free - ldr r0, [r5] - str r4, [r0, 0x1C] - bl Free - str r4, [r5] - bl FreeMonSpritesGfx - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F7E64 - - thumb_func_start sub_80F7ED0 -sub_80F7ED0: @ 80F7ED0 - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - str r1, [sp] - mov r0, sp - movs r3, 0 - strb r4, [r0, 0x4] - mov r1, sp - movs r0, 0x7 - strb r0, [r1, 0x5] - mov r0, sp - strb r2, [r0, 0x6] - movs r1, 0x2 - strb r1, [r0, 0x7] - strb r2, [r0, 0x8] - strb r1, [r0, 0x9] - strb r3, [r0, 0xA] - strb r3, [r0, 0xB] - mov r3, sp - ldrb r2, [r3, 0xC] - subs r1, 0x12 - adds r0, r1, 0 - ands r0, r2 - strb r0, [r3, 0xC] - mov r2, sp - movs r0, 0x10 - strb r0, [r2, 0xC] - ldrb r0, [r2, 0xD] - ands r1, r0 - strb r1, [r2, 0xD] - mov r1, sp - movs r0, 0x80 - strb r0, [r1, 0xD] - mov r0, sp - movs r1, 0 - movs r2, 0 - bl AddTextPrinter - lsls r4, 24 - lsrs r4, 24 - adds r0, r4, 0 - bl PutWindowTilemap - add sp, 0x10 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80F7ED0 - - thumb_func_start sub_80F7F30 -sub_80F7F30: @ 80F7F30 - push {r4,r5,lr} - ldr r0, =gContestMonPartyIndex - ldrb r1, [r0] - movs r0, 0x64 - muls r0, r1 - ldr r1, =gPlayerParty - adds r0, r1 - bl sub_80DAE0C - lsls r0, 24 - lsrs r0, 24 - adds r5, r0, 0 - cmp r5, 0 - beq _080F7F5E - ldr r4, =gSpecialVar_ContestCategory - ldrb r0, [r4] - ldr r1, =gSpecialVar_ContestRank - ldrb r1, [r1] - bl sub_80DAB8C - ldrb r0, [r4] - bl sub_80DB09C -_080F7F5E: - ldr r0, =gSpecialVar_Result - strh r5, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F7F30 - - thumb_func_start sub_80F7F7C -sub_80F7F7C: @ 80F7F7C - push {r4,lr} - movs r4, 0 - ldr r0, =gContestMonPartyIndex - ldrb r1, [r0] - movs r0, 0x64 - muls r1, r0 - ldr r0, =gPlayerParty - adds r2, r1, r0 - ldr r0, =gSpecialVar_ContestCategory - ldrh r0, [r0] - cmp r0, 0x4 - bhi _080F7FEE - lsls r0, 2 - ldr r1, =_080F7FB0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080F7FB0: - .4byte _080F7FC4 - .4byte _080F7FCA - .4byte _080F7FD0 - .4byte _080F7FD6 - .4byte _080F7FDC -_080F7FC4: - adds r0, r2, 0 - movs r1, 0x32 - b _080F7FE0 -_080F7FCA: - adds r0, r2, 0 - movs r1, 0x33 - b _080F7FE0 -_080F7FD0: - adds r0, r2, 0 - movs r1, 0x34 - b _080F7FE0 -_080F7FD6: - adds r0, r2, 0 - movs r1, 0x35 - b _080F7FE0 -_080F7FDC: - adds r0, r2, 0 - movs r1, 0x36 -_080F7FE0: - bl GetMonData - ldr r1, =gSpecialVar_ContestRank - ldrh r1, [r1] - cmp r0, r1 - bls _080F7FEE - movs r4, 0x1 -_080F7FEE: - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80F7F7C - - thumb_func_start sub_80F7FFC -sub_80F7FFC: @ 80F7FFC - push {r4-r7,lr} - sub sp, 0x4 - ldr r1, =gContestFinalStandings - ldr r0, =gContestPlayerMonIndex - ldrb r0, [r0] - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _080F8010 - b _080F8250 -_080F8010: - ldr r0, =gSpecialVar_ContestCategory - ldrh r0, [r0] - cmp r0, 0x4 - bls _080F801A - b _080F8250 -_080F801A: - lsls r0, 2 - ldr r1, =_080F8034 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080F8034: - .4byte _080F8048 - .4byte _080F80B8 - .4byte _080F8124 - .4byte _080F8190 - .4byte _080F81F8 -_080F8048: - ldr r6, =gContestMonPartyIndex - ldrb r0, [r6] - movs r5, 0x64 - muls r0, r5 - ldr r4, =gPlayerParty - adds r0, r4 - movs r1, 0x32 - bl GetMonData - lsls r0, 24 - lsrs r1, r0, 24 - mov r0, sp - strb r1, [r0] - ldr r0, =gSpecialVar_ContestRank - ldrh r0, [r0] - cmp r1, r0 - bls _080F806C - b _080F8250 -_080F806C: - adds r0, r1, 0 - cmp r0, 0x3 - bls _080F8074 - b _080F8250 -_080F8074: - adds r1, r0, 0x1 - mov r0, sp - strb r1, [r0] - ldrb r0, [r6] - muls r0, r5 - adds r0, r4 - movs r1, 0x32 - mov r2, sp - bl SetMonData - ldrb r0, [r6] - muls r0, r5 - adds r0, r4 - bl GetRibbonCount - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bhi _080F809C - b _080F8250 -_080F809C: - ldrb r0, [r6] - muls r0, r5 - adds r0, r4 - movs r1, 0x32 - bl sub_80EE4DC - b _080F8250 - .pool -_080F80B8: - mov r4, sp - ldr r7, =gContestMonPartyIndex - ldrb r0, [r7] - movs r6, 0x64 - muls r0, r6 - ldr r5, =gPlayerParty - adds r0, r5 - movs r1, 0x33 - bl GetMonData - strb r0, [r4] - mov r0, sp - ldrb r2, [r0] - ldr r0, =gSpecialVar_ContestRank - ldrh r0, [r0] - cmp r2, r0 - bls _080F80DC - b _080F8250 -_080F80DC: - cmp r2, 0x3 - bls _080F80E2 - b _080F8250 -_080F80E2: - mov r1, sp - adds r0, r2, 0x1 - strb r0, [r1] - ldrb r0, [r7] - muls r0, r6 - adds r0, r5 - movs r1, 0x33 - mov r2, sp - bl SetMonData - ldrb r0, [r7] - muls r0, r6 - adds r0, r5 - bl GetRibbonCount - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bhi _080F810A - b _080F8250 -_080F810A: - ldrb r0, [r7] - muls r0, r6 - adds r0, r5 - movs r1, 0x33 - bl sub_80EE4DC - b _080F8250 - .pool -_080F8124: - mov r4, sp - ldr r7, =gContestMonPartyIndex - ldrb r0, [r7] - movs r6, 0x64 - muls r0, r6 - ldr r5, =gPlayerParty - adds r0, r5 - movs r1, 0x34 - bl GetMonData - strb r0, [r4] - mov r0, sp - ldrb r2, [r0] - ldr r0, =gSpecialVar_ContestRank - ldrh r0, [r0] - cmp r2, r0 - bls _080F8148 - b _080F8250 -_080F8148: - cmp r2, 0x3 - bls _080F814E - b _080F8250 -_080F814E: - mov r1, sp - adds r0, r2, 0x1 - strb r0, [r1] - ldrb r0, [r7] - muls r0, r6 - adds r0, r5 - movs r1, 0x34 - mov r2, sp - bl SetMonData - ldrb r0, [r7] - muls r0, r6 - adds r0, r5 - bl GetRibbonCount - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bls _080F8250 - ldrb r0, [r7] - muls r0, r6 - adds r0, r5 - movs r1, 0x34 - bl sub_80EE4DC - b _080F8250 - .pool -_080F8190: - mov r4, sp - ldr r7, =gContestMonPartyIndex - ldrb r0, [r7] - movs r6, 0x64 - muls r0, r6 - ldr r5, =gPlayerParty - adds r0, r5 - movs r1, 0x35 - bl GetMonData - strb r0, [r4] - mov r0, sp - ldrb r2, [r0] - ldr r0, =gSpecialVar_ContestRank - ldrh r0, [r0] - cmp r2, r0 - bhi _080F8250 - cmp r2, 0x3 - bhi _080F8250 - mov r1, sp - adds r0, r2, 0x1 - strb r0, [r1] - ldrb r0, [r7] - muls r0, r6 - adds r0, r5 - movs r1, 0x35 - mov r2, sp - bl SetMonData - ldrb r0, [r7] - muls r0, r6 - adds r0, r5 - bl GetRibbonCount - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bls _080F8250 - ldrb r0, [r7] - muls r0, r6 - adds r0, r5 - movs r1, 0x35 - bl sub_80EE4DC - b _080F8250 - .pool -_080F81F8: - mov r4, sp - ldr r7, =gContestMonPartyIndex - ldrb r0, [r7] - movs r6, 0x64 - muls r0, r6 - ldr r5, =gPlayerParty - adds r0, r5 - movs r1, 0x36 - bl GetMonData - strb r0, [r4] - mov r0, sp - ldrb r2, [r0] - ldr r0, =gSpecialVar_ContestRank - ldrh r0, [r0] - cmp r2, r0 - bhi _080F8250 - cmp r2, 0x3 - bhi _080F8250 - mov r1, sp - adds r0, r2, 0x1 - strb r0, [r1] - ldrb r0, [r7] - muls r0, r6 - adds r0, r5 - movs r1, 0x36 - mov r2, sp - bl SetMonData - ldrb r0, [r7] - muls r0, r6 - adds r0, r5 - bl GetRibbonCount - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bls _080F8250 - ldrb r0, [r7] - muls r0, r6 - adds r0, r5 - movs r1, 0x36 - bl sub_80EE4DC -_080F8250: - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F7FFC - - thumb_func_start sub_80F8264 -sub_80F8264: @ 80F8264 - push {r4,lr} - ldr r4, =gStringVar1 - ldr r0, =gSpecialVar_0x8006 - ldrh r1, [r0] - lsls r1, 6 - ldr r0, =gContestMons + 13 - adds r1, r0 - adds r0, r4, 0 - bl StringCopy - adds r0, r4, 0 - bl sub_81DB5AC - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F8264 - - thumb_func_start sub_80F8290 -sub_80F8290: @ 80F8290 - push {lr} - ldr r0, =gStringVar3 - ldr r1, =gSpecialVar_0x8006 - ldrh r1, [r1] - lsls r1, 6 - ldr r2, =gContestMons + 2 - adds r1, r2 - bl StringCopy - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F8290 - - thumb_func_start sub_80F82B4 -sub_80F82B4: @ 80F82B4 - push {r4-r6,lr} - movs r1, 0 - movs r2, 0 - ldr r5, =gSpecialVar_0x8004 - ldr r4, =gContestMonConditions - ldr r0, =gSpecialVar_0x8006 - ldrh r0, [r0] - lsls r0, 1 - adds r0, r4 - movs r6, 0 - ldrsh r3, [r0, r6] -_080F82CA: - lsls r0, r1, 1 - adds r0, r4 - movs r6, 0 - ldrsh r0, [r0, r6] - cmp r3, r0 - bge _080F82DC - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 -_080F82DC: - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x3 - bls _080F82CA - strh r2, [r5] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F82B4 - - thumb_func_start sub_80F82FC -sub_80F82FC: @ 80F82FC - ldr r2, =gSpecialVar_0x8004 - ldr r1, =gContestMonConditions - ldr r0, =gSpecialVar_0x8006 - ldrh r0, [r0] - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r2] - bx lr - .pool - thumb_func_end sub_80F82FC - - thumb_func_start sub_80F831C -sub_80F831C: @ 80F831C - push {lr} - movs r1, 0 - ldr r2, =gContestFinalStandings - ldrb r0, [r2] - ldr r3, =gSpecialVar_0x8005 - cmp r0, 0 - beq _080F833C -_080F832A: - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x3 - bhi _080F833C - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080F832A -_080F833C: - strh r1, [r3] - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F831C - - thumb_func_start sub_80F834C -sub_80F834C: @ 80F834C - push {r4,lr} - movs r1, 0 - ldr r2, =gContestFinalStandings - ldrb r0, [r2] - ldr r4, =gStringVar3 - ldr r3, =gContestMons + 13 - cmp r0, 0 - beq _080F836E -_080F835C: - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x3 - bhi _080F836E - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080F835C -_080F836E: - lsls r1, 6 - adds r1, r3 - adds r0, r4, 0 - bl StringCopy - adds r0, r4, 0 - bl sub_81DB5AC - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F834C - - thumb_func_start sub_80F8390 -sub_80F8390: @ 80F8390 - push {r4,lr} - movs r1, 0 - ldr r2, =gContestFinalStandings - ldrb r0, [r2] - ldr r4, =gStringVar1 - ldr r3, =gContestMons + 2 - cmp r0, 0 - beq _080F83B2 -_080F83A0: - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x3 - bhi _080F83B2 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080F83A0 -_080F83B2: - lsls r1, 6 - adds r1, r3 - adds r0, r4, 0 - bl StringCopy - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F8390 - - thumb_func_start sub_80F83D0 -sub_80F83D0: @ 80F83D0 - push {lr} - ldr r0, =sub_80D7B24 - bl SetMainCallback2 - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F83D0 - - thumb_func_start sub_80F83E0 -sub_80F83E0: @ 80F83E0 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _080F83FE - adds r0, r2, 0 - bl DestroyTask - ldr r0, =sub_80F83D0 - bl SetMainCallback2 -_080F83FE: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F83E0 - - thumb_func_start sub_80F840C -sub_80F840C: @ 80F840C - push {lr} - sub sp, 0x4 - bl ScriptContext2_Enable - ldr r0, =sub_80F83E0 - movs r1, 0xA - bl CreateTask - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F840C - - thumb_func_start sub_80F8438 -sub_80F8438: @ 80F8438 - ldr r2, =gSpecialVar_0x8004 - ldr r1, =gContestMons - ldr r0, =gSpecialVar_0x8006 - ldrh r0, [r0] - lsls r0, 6 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r2] - bx lr - .pool - thumb_func_end sub_80F8438 - - thumb_func_start sub_80F8458 -sub_80F8458: @ 80F8458 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _080F8476 - adds r0, r2, 0 - bl DestroyTask - ldr r0, =sub_80F5B00 - bl SetMainCallback2 -_080F8476: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F8458 - - thumb_func_start sub_80F8484 -sub_80F8484: @ 80F8484 - push {lr} - sub sp, 0x4 - bl ScriptContext2_Enable - ldr r0, =sub_80F8458 - movs r1, 0xA - bl CreateTask - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F8484 - - thumb_func_start sub_80F84B0 -sub_80F84B0: @ 80F84B0 - ldr r0, =gSpecialVar_0x8004 - ldr r1, =gContestPlayerMonIndex - ldrb r1, [r1] - strh r1, [r0] - bx lr - .pool - thumb_func_end sub_80F84B0 - - thumb_func_start sub_80F84C4 -sub_80F84C4: @ 80F84C4 - push {r4-r6,lr} - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - bl ScriptContext2_Enable - ldr r6, =sub_80FC580 - adds r0, r6, 0 - movs r1, 0 - bl CreateTask - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r2, =sub_80F8508 - adds r0, r4, 0 - adds r1, r6, 0 - bl SetTaskFuncWithFollowupFunc - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - strh r5, [r0, 0x1A] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F84C4 - - thumb_func_start sub_80F8508 -sub_80F8508: @ 80F8508 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, =gIsLinkContest - ldrb r1, [r0] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _080F8540 - ldr r0, =gContestMonPartyIndex - ldrb r0, [r0] - bl sub_80DA8C8 - ldr r1, =sub_80FC6BC - ldr r2, =sub_80F8568 - adds r0, r4, 0 - bl SetTaskFuncWithFollowupFunc - b _080F8556 - .pool -_080F8540: - ldr r0, =gContestMonPartyIndex - ldrb r0, [r0] - bl sub_80DA8C8 - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, =sub_81D9DE4 - str r1, [r0] -_080F8556: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F8508 - - thumb_func_start sub_80F8568 -sub_80F8568: @ 80F8568 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, =sub_80FC804 - ldr r2, =sub_80F8584 - bl SetTaskFuncWithFollowupFunc - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F8568 - - thumb_func_start sub_80F8584 -sub_80F8584: @ 80F8584 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, =sub_80FCE48 - ldr r2, =sub_80F85A0 - bl SetTaskFuncWithFollowupFunc - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F8584 - - thumb_func_start sub_80F85A0 -sub_80F85A0: @ 80F85A0 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, =sub_80FC894 - ldr r2, =sub_80F85BC - bl SetTaskFuncWithFollowupFunc - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F85A0 - - thumb_func_start sub_80F85BC -sub_80F85BC: @ 80F85BC - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x8 - lsls r0, 24 - lsrs r6, r0, 24 - movs r0, 0 - str r0, [sp] - str r0, [sp, 0x4] - movs r3, 0 - ldr r5, =gNumLinkContestPlayers - mov r12, r5 - ldr r0, =gSpecialVar_0x8004 - mov r9, r0 - add r1, sp, 0x4 - mov r8, r1 - ldrb r0, [r5] - cmp r3, r0 - bcs _080F8606 - lsls r0, r6, 2 - adds r0, r6 - lsls r4, r0, 3 - ldr r7, =gTasks + 0x8 -_080F85EC: - mov r1, sp - adds r2, r1, r3 - adds r1, r3, 0x1 - lsls r0, r1, 1 - adds r0, r4 - adds r0, r7 - ldrh r0, [r0] - strb r0, [r2] - lsls r1, 24 - lsrs r3, r1, 24 - ldrb r0, [r5] - cmp r3, r0 - bcc _080F85EC -_080F8606: - movs r3, 0 - mov r1, r12 - ldrb r0, [r1] - cmp r3, r0 - bcs _080F862A - adds r4, r0, 0 - mov r2, sp -_080F8614: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, r4 - bcs _080F862A - mov r0, sp - adds r1, r0, r3 - ldrb r0, [r2] - ldrb r1, [r1] - cmp r0, r1 - beq _080F8614 -_080F862A: - mov r1, r12 - ldrb r1, [r1] - cmp r3, r1 - bne _080F8644 - movs r0, 0 - b _080F8646 - .pool -_080F8644: - movs r0, 0x1 -_080F8646: - mov r1, r9 - strh r0, [r1] - movs r3, 0 - mov r4, r12 - ldrb r0, [r4] - cmp r3, r0 - bcs _080F8678 - mov r5, r8 - lsls r0, r6, 2 - adds r0, r6 - lsls r2, r0, 3 - ldr r7, =gTasks + 0x8 -_080F865E: - adds r1, r5, r3 - adds r0, r3, 0x5 - lsls r0, 1 - adds r0, r2 - adds r0, r7 - ldrh r0, [r0] - strb r0, [r1] - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - ldrb r1, [r4] - cmp r3, r1 - bcc _080F865E -_080F8678: - mov r0, r8 - bl sub_80F86E0 - ldr r1, =gUnknown_02039F2B - strb r0, [r1] - ldr r0, =gSpecialVar_ContestCategory - ldrb r0, [r0] - bl sub_80DB09C - ldr r1, =sub_80FCF40 - ldr r2, =sub_80F86B8 - adds r0, r6, 0 - bl SetTaskFuncWithFollowupFunc - add sp, 0x8 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F85BC - - thumb_func_start sub_80F86B8 -sub_80F86B8: @ 80F86B8 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0 - bl sub_80DCE58 - ldr r1, =sub_80FCFD0 - ldr r2, =sub_80F8714 - adds r0, r4, 0 - bl SetTaskFuncWithFollowupFunc - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F86B8 - - thumb_func_start sub_80F86E0 -sub_80F86E0: @ 80F86E0 - push {r4,r5,lr} - adds r3, r0, 0 - movs r4, 0 - movs r2, 0x1 - ldr r0, =gNumLinkContestPlayers - ldrb r0, [r0] - cmp r2, r0 - bge _080F8708 - adds r5, r0, 0 -_080F86F2: - adds r0, r3, r4 - adds r1, r3, r2 - ldrb r0, [r0] - ldrb r1, [r1] - cmp r0, r1 - bcs _080F8702 - lsls r0, r2, 24 - lsrs r4, r0, 24 -_080F8702: - adds r2, 0x1 - cmp r2, r5 - blt _080F86F2 -_080F8708: - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80F86E0 - - thumb_func_start sub_80F8714 -sub_80F8714: @ 80F8714 - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0x1 - bne _080F8748 - bl IsLinkTaskFinished - lsls r0, 24 - cmp r0, 0 - beq _080F877E - ldr r0, =gTasks - lsls r1, r6, 2 - adds r1, r6 - lsls r1, 3 - adds r1, r0 - ldr r0, =sub_80F878C - str r0, [r1] - b _080F877E - .pool -_080F8748: - ldr r5, =gContestMons + 2 - movs r4, 0x3 -_080F874C: - adds r0, r5, 0 - bl StringGetEnd10 - adds r5, 0x40 - subs r4, 0x1 - cmp r4, 0 - bge _080F874C - adds r0, r6, 0 - bl DestroyTask - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - movs r1, 0x4 - ldrsb r1, [r0, r1] - movs r2, 0x5 - ldrsb r2, [r0, r2] - movs r3, 0x1 - negs r3, r3 - movs r0, 0 - bl SetDynamicWarp - bl ScriptContext2_Disable - bl EnableBothScriptContexts -_080F877E: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F8714 - - thumb_func_start sub_80F878C -sub_80F878C: @ 80F878C - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl sub_800AC34 - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, =sub_80F87B4 - str r1, [r0] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F878C - - thumb_func_start sub_80F87B4 -sub_80F87B4: @ 80F87B4 - push {lr} - lsls r0, 24 - lsrs r1, r0, 24 - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _080F87D0 - adds r0, r1, 0 - bl DestroyTask - bl ScriptContext2_Disable - bl EnableBothScriptContexts -_080F87D0: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80F87B4 - - .align 2, 0 @ Don't pad with nop. diff --git a/include/contest_link_80FC4F4.h b/include/contest_link_80FC4F4.h index 6f3bab97dd..a3f1187982 100644 --- a/include/contest_link_80FC4F4.h +++ b/include/contest_link_80FC4F4.h @@ -4,5 +4,10 @@ void sub_80FCC88(u8); void sub_80FCC88(u8); void sub_80FCACC(u8); +void sub_80FC580(u8); +void sub_80FC6BC(u8); +void sub_80FC804(u8); +void sub_80FCE48(u8); +void sub_80FC894(u8); #endif //GUARD_CONTEST_LINK_80FC4F4_H diff --git a/ld_script.txt b/ld_script.txt index be9efb1d5e..eaf75c3dec 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -147,7 +147,6 @@ SECTIONS { src/secret_base.o(.text); src/tv.o(.text); src/contest_link_80F57C4.o(.text); - asm/contest_link_80F57C4.o(.text); src/script_pokemon_util_80F87D8.o(.text); src/field_poison.o(.text); src/pokemon_size_record.o(.text); diff --git a/src/contest_link_80F57C4.c b/src/contest_link_80F57C4.c index c72fc9ba34..485065d714 100644 --- a/src/contest_link_80F57C4.c +++ b/src/contest_link_80F57C4.c @@ -1,8 +1,11 @@ #include "global.h" +#include "alloc.h" #include "battle.h" +#include "battle_gfx_sfx_util.h" #include "bg.h" #include "contest.h" #include "contest_link_80F57C4.h" +#include "contest_link_80FC4F4.h" #include "decompress.h" #include "dma3.h" #include "event_data.h" @@ -22,11 +25,13 @@ #include "random.h" #include "save.h" #include "scanline_effect.h" +#include "script.h" #include "sound.h" #include "string_util.h" #include "strings.h" #include "task.h" #include "text.h" +#include "trig.h" #include "tv.h" #include "util.h" #include "window.h" @@ -44,26 +49,38 @@ struct ContestLinkUnk0 u8 unk4; u8 unk5; u8 unk6; - u8 filler7[0x1]; + u8 unk7; u8 spriteId; u8 unk9; u8 unkA; - u8 fillerB[0x9]; + s16 unkC[4]; u8 unk14; u8 filler15[0x3]; }; +struct ContestLinkUnk14 +{ + int unk0; + int unk4; + u32 unk8; + u32 unkC; + u8 unk10; + u8 unk11; + u8 unk12; +}; + struct ContestLinkUnk4 { - u8 filler0[0x50]; + struct ContestLinkUnk14 unk0[4]; }; struct ContestLink80F57C4 { struct ContestLinkUnk0 *unk0; struct ContestLinkUnk4 *unk4; - u8 filler8[0x4]; + u8 *unk8; u8 *unkC[4]; + u8 *unk1C; }; EWRAM_DATA struct ContestLink80F57C4 *gUnknown_0203A034 = NULL; @@ -80,20 +97,23 @@ extern const u8 gUnknown_0858D6D0[]; extern const struct SpriteTemplate gSpriteTemplate_858D7F8; extern const struct SpriteSheet gUnknown_0858D810[]; extern const struct SpritePalette gUnknown_0858D850; +extern const struct SpriteTemplate gSpriteTemplate_858D860; + +extern void sub_81D9DE4(u8); static void sub_80F6A9C(void); static void sub_80F71C8(void); u8 sub_80F7310(u8, u8); s8 sub_80F7364(u8, u8); -void sub_80F7ED0(int, u8 *, int); -void sub_80F7DF4(void); -static void sub_80F6A64(u8, u8); +static void sub_80F7ED0(int, u8 *, int); +static void sub_80F7DF4(void); +static void LoadAllContestMonIcons(u8, u8); static void sub_80F6DC0(void); static void sub_80F6AE8(void); static void sub_80F5CE4(u8); static void sub_80F5C00(void); static void sub_80F68B4(u8); -void sub_80F7880(void); +static void sub_80F7880(void); static void sub_80F5C24(void); static void sub_80F707C(const u8 *); static void sub_80F5ED8(u8); @@ -105,7 +125,8 @@ static void sub_80F68F0(u8); s16 sub_80F6B78(const u8 *, u8); static void sub_80F6E9C(s16, u16, u16, u16); static void sub_80F6058(u8); -void sub_80F7A80(u8, u8); +static void sub_80F7A80(u8, u8); +void sub_80F7CA8(u8); static void sub_80F6EF4(u16); static void sub_80F60F0(u8); static void sub_80F616C(u8); @@ -113,20 +134,29 @@ static void sub_80F6204(u8); static void sub_80F73DC(u8); static void sub_80F74BC(u8); static void sub_80F753C(u8); -void sub_80F77E0(u8, u8); +static void sub_80F77E0(u8, u8); +static void sub_80F7824(u8); static void sub_80F6404(u8); static void sub_80F75A8(struct Sprite *); -void sub_80F7670(u8); +static void sub_80F7670(u8); static void sub_80F7620(struct Sprite *); static void sub_80F66B4(u8); static void sub_80F671C(u8); static void sub_80F677C(u8); static void sub_80F67C4(u8); static void sub_80F6820(u8); -void sub_80F7E64(void); +static void sub_80F7E64(void); static void sub_80F6F68(struct Sprite *); static void sub_80F7014(struct Sprite *); static void sub_80F6FDC(struct Sprite *); +static void sub_80F8508(u8); +static void sub_80F8568(u8); +static void sub_80F8584(u8); +static void sub_80F85A0(u8); +static void sub_80F85BC(u8); +static void sub_80F86B8(u8); +static void sub_80F878C(u8); +static void sub_80F87B4(u8); void sub_80F57C4(void) { @@ -266,7 +296,7 @@ void sub_80F5B00(void) FreeAllSpritePalettes(); sub_80F591C(); sub_80F6A9C(); - sub_80F6A64(0, 1); + LoadAllContestMonIcons(0, 1); sub_80F5AE0(); memset(gUnknown_0203A034->unk0, 0, sizeof(*gUnknown_0203A034->unk0)); memset(gUnknown_0203A034->unk4, 0, sizeof(*gUnknown_0203A034->unk4)); @@ -828,7 +858,7 @@ static void sub_80F68F0(u8 taskId) gUnknown_0203A034->unk0->unkA = 1; } -void sub_80F69B8(u16 species, u8 monIndex, u8 arg2, u8 arg3, u32 personality) +void sub_80F69B8(u16 species, u8 monIndex, u8 srcOffset, u8 useDmaNow, u32 personality) { u8 frameNum; const u8 *iconPtr; @@ -839,8 +869,8 @@ void sub_80F69B8(u16 species, u8 monIndex, u8 arg2, u8 arg3, u32 personality) frameNum = (monIndex == *contestPlayerMonIndex) ? 1 : 0; iconPtr = GetMonIconPtr(species, personality, frameNum); - iconPtr += arg2 * 0x200 + 0x80; - if (arg3) + iconPtr += srcOffset * 0x200 + 0x80; + if (useDmaNow) { RequestDma3Copy(iconPtr, (void *)BG_CHAR_ADDR(1) + monIndex * 0x200, 0x180, 1); var0 = ((monIndex + 10) << 12); @@ -853,12 +883,12 @@ void sub_80F69B8(u16 species, u8 monIndex, u8 arg2, u8 arg3, u32 personality) } } -static void sub_80F6A64(u8 arg0, u8 arg1) +static void LoadAllContestMonIcons(u8 srcOffset, u8 useDmaNow) { int i; for (i = 0; i < 4; i++) - sub_80F69B8(gContestMons[i].species, i, arg0, arg1, gContestMons[i].personality); + sub_80F69B8(gContestMons[i].species, i, srcOffset, useDmaNow, gContestMons[i].personality); } static void sub_80F6A9C(void) @@ -1567,3 +1597,1530 @@ static void sub_80F7620(struct Sprite *sprite) gUnknown_0203A034->unk0->unk6 = 2; } } + +static void sub_80F7670(u8 taskId) +{ + if (++gTasks[taskId].data[0] == 5) + { + gTasks[taskId].data[0] = 0; + if (gUnknown_0203A034->unk0->unk7 < 40) + { + u8 spriteId = CreateSprite(&gSpriteTemplate_858D860, (Random() % 240) - 20, 44, 5); + gSprites[spriteId].data[0] = Random() % 512; + gSprites[spriteId].data[1] = (Random() % 24) + 16; + gSprites[spriteId].data[2] = (Random() % 256) + 48; + gSprites[spriteId].oam.tileNum += Random() % 17; + gUnknown_0203A034->unk0->unk7++; + } + } + + if (gUnknown_0203A034->unk0->unk9) + DestroyTask(taskId); +} + +void sub_80F7768(struct Sprite *sprite) +{ + register s16 var0 asm("r1"); + + sprite->data[3] += sprite->data[0]; + sprite->pos2.x = Sin(sprite->data[3] >> 8, sprite->data[1]); + var0 = sprite->data[4] + sprite->data[2]; + sprite->pos1.x += var0 >> 8; + var0 = var0 & 0xFF; + sprite->data[4] = var0; + sprite->pos1.y++; + if (gUnknown_0203A034->unk0->unk9) + sprite->invisible = 1; + + if (sprite->pos1.x > 248 || sprite->pos1.y > 116) + { + DestroySprite(sprite); + gUnknown_0203A034->unk0->unk7--; + } +} + +static void sub_80F77E0(u8 monIndex, u8 numFrames) +{ + u8 taskId = CreateTask(sub_80F7824, 8); + gTasks[taskId].data[0] = monIndex; + gTasks[taskId].data[1] = numFrames; + gTasks[taskId].data[2] = gContestMons[monIndex].species; +} + +static void sub_80F7824(u8 taskId) +{ + u8 monIndex = gTasks[taskId].data[0]; + if (gTasks[taskId].data[10]++ == gTasks[taskId].data[1]) + { + gTasks[taskId].data[10] = 0; + sub_80F69B8(gTasks[taskId].data[2], monIndex, gTasks[taskId].data[11], FALSE, gContestMons[monIndex].personality); + gTasks[taskId].data[11] ^= 1; + } +} + +// static void sub_80F7880(void) +// { +// int i; +// int var0; +// int var1; +// int var2; +// int var3; +// u32 var4; +// int var5; +// int var6; +// s16 var7; +// s16 var8; +// s16 r2; + +// r2 = gUnknown_02039F08[0]; +// for (i = 1; i < 4; i++) +// { +// if (r2 < gUnknown_02039F08[i]) +// r2 = gUnknown_02039F08[i]; +// } + +// if (r2 < 0) +// { +// r2 = gUnknown_02039F08[0]; +// for (i = 1; i < 4; i++) +// { +// if (r2 > gUnknown_02039F08[i]) +// r2 = gUnknown_02039F08[i]; +// } +// } + +// // _080F78E4 +// for (i = 0; i < 4; i++) +// { +// var0 = gContestMonConditions[i] * 1000; +// var1 = r2; +// if (r2 < 0) +// var1 = -var1; + +// var2 = var0 / var1; +// if (var2 % 10 > 4) +// var2 += 10; + +// gUnknown_0203A034->unk4->unk0[i].unk0 = var2 / 10; +// var3 = gUnknown_02039F18[i]; +// if (var3 < 0) +// var3 = -var3; + +// var0 = var3 * 1000; +// var1 = r2; +// if (r2 < 0) +// var1 = -var1; + +// var2 = var0 / var1; +// if (var2 % 10 > 4) +// var2 += 10; + +// // _080F7966 +// gUnknown_0203A034->unk4->unk0[i].unk4 = var2 / 10; +// if (gUnknown_02039F18[i] < 0) +// gUnknown_0203A034->unk4->unk0[i].unk10 = 1; + +// var4 = gUnknown_0203A034->unk4->unk0[i].unk0 * 22528 / 100; +// if ((var4 & 0xFF) > 0x7F) +// var4 += 0x100; + +// gUnknown_0203A034->unk4->unk0[i].unk8 = var4 >> 8; +// var4 = gUnknown_0203A034->unk4->unk0[i].unk4 * 22528 / 100; +// if ((var4 & 0xFF) > 0x7F) +// var4 += 0x100; + +// gUnknown_0203A034->unk4->unk0[i].unkC = var4 >> 8; +// gUnknown_0203A034->unk4->unk0[i].unk11 = sub_80F7310(i, 1); +// var5 = sub_80F7364(i, 1); +// if (var5 < 0) +// var5 = -var5; + +// gUnknown_0203A034->unk4->unk0[i].unk12 = var5; +// if (gContestFinalStandings[i]) +// { +// var7 = gUnknown_0203A034->unk4->unk0[i].unk8; +// var8 = gUnknown_0203A034->unk4->unk0[i].unkC; +// if (gUnknown_0203A034->unk4->unk0[i].unk10) +// var8 = -var8; + +// if (var7 + var8 == 88) +// { +// if (var8 > 0) +// gUnknown_0203A034->unk4->unk0[i].unkC--; +// else if (var7 > 0) +// gUnknown_0203A034->unk4->unk0[i].unk8--; +// } +// } +// } +// } + +NAKED +static void sub_80F7880(void) +{ + asm_unified("\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x4\n\ + ldr r0, =gUnknown_02039F08\n\ + ldrh r2, [r0]\n\ + adds r4, r0, 0\n\ + adds r3, r4, 0x2\n\ + movs r0, 0x2\n\ + mov r8, r0\n\ +_080F7898:\n\ + lsls r0, r2, 16\n\ + asrs r0, 16\n\ + movs r5, 0\n\ + ldrsh r1, [r3, r5]\n\ + cmp r0, r1\n\ + bge _080F78A6\n\ + ldrh r2, [r3]\n\ +_080F78A6:\n\ + adds r3, 0x2\n\ + movs r0, 0x1\n\ + negs r0, r0\n\ + add r8, r0\n\ + mov r1, r8\n\ + cmp r1, 0\n\ + bge _080F7898\n\ + lsls r0, r2, 16\n\ + str r0, [sp]\n\ + cmp r0, 0\n\ + bge _080F78E4\n\ + ldrh r2, [r4]\n\ + adds r3, r4, 0x2\n\ + movs r4, 0x2\n\ + mov r8, r4\n\ +_080F78C4:\n\ + lsls r0, r2, 16\n\ + asrs r0, 16\n\ + movs r5, 0\n\ + ldrsh r1, [r3, r5]\n\ + cmp r0, r1\n\ + ble _080F78D2\n\ + ldrh r2, [r3]\n\ +_080F78D2:\n\ + adds r3, 0x2\n\ + movs r0, 0x1\n\ + negs r0, r0\n\ + add r8, r0\n\ + lsls r1, r2, 16\n\ + str r1, [sp]\n\ + mov r4, r8\n\ + cmp r4, 0\n\ + bge _080F78C4\n\ +_080F78E4:\n\ + movs r5, 0\n\ + mov r8, r5\n\ + mov r10, r5\n\ +_080F78EA:\n\ + ldr r0, =gContestMonConditions\n\ + mov r1, r8\n\ + lsls r7, r1, 1\n\ + adds r0, r7, r0\n\ + movs r2, 0\n\ + ldrsh r1, [r0, r2]\n\ + lsls r0, r1, 5\n\ + subs r0, r1\n\ + lsls r0, 2\n\ + adds r0, r1\n\ + lsls r0, 3\n\ + ldr r4, [sp]\n\ + asrs r5, r4, 16\n\ + adds r1, r5, 0\n\ + cmp r5, 0\n\ + bge _080F790C\n\ + negs r1, r5\n\ +_080F790C:\n\ + bl __divsi3\n\ + adds r4, r0, 0\n\ + movs r1, 0xA\n\ + bl __modsi3\n\ + cmp r0, 0x4\n\ + ble _080F791E\n\ + adds r4, 0xA\n\ +_080F791E:\n\ + ldr r0, =gUnknown_0203A034\n\ + mov r9, r0\n\ + ldr r0, [r0]\n\ + ldr r0, [r0, 0x4]\n\ + mov r1, r10\n\ + adds r6, r1, r0\n\ + adds r0, r4, 0\n\ + movs r1, 0xA\n\ + bl __divsi3\n\ + str r0, [r6]\n\ + ldr r0, =gUnknown_02039F18\n\ + adds r7, r0\n\ + movs r2, 0\n\ + ldrsh r1, [r7, r2]\n\ + cmp r1, 0\n\ + bge _080F7942\n\ + negs r1, r1\n\ +_080F7942:\n\ + lsls r0, r1, 5\n\ + subs r0, r1\n\ + lsls r0, 2\n\ + adds r0, r1\n\ + lsls r0, 3\n\ + adds r1, r5, 0\n\ + cmp r1, 0\n\ + bge _080F7954\n\ + negs r1, r1\n\ +_080F7954:\n\ + bl __divsi3\n\ + adds r4, r0, 0\n\ + movs r1, 0xA\n\ + bl __modsi3\n\ + cmp r0, 0x4\n\ + ble _080F7966\n\ + adds r4, 0xA\n\ +_080F7966:\n\ + adds r0, r4, 0\n\ + movs r1, 0xA\n\ + bl __divsi3\n\ + str r0, [r6, 0x4]\n\ + movs r4, 0\n\ + ldrsh r0, [r7, r4]\n\ + cmp r0, 0\n\ + bge _080F797C\n\ + movs r0, 0x1\n\ + strb r0, [r6, 0x10]\n\ +_080F797C:\n\ + mov r5, r9\n\ + ldr r0, [r5]\n\ + ldr r0, [r0, 0x4]\n\ + mov r1, r10\n\ + adds r4, r1, r0\n\ + ldr r1, [r4]\n\ + lsls r0, r1, 1\n\ + adds r0, r1\n\ + lsls r0, 2\n\ + subs r0, r1\n\ + lsls r0, 11\n\ + movs r1, 0x64\n\ + bl __divsi3\n\ + adds r1, r0, 0\n\ + movs r5, 0xFF\n\ + ands r0, r5\n\ + cmp r0, 0x7F\n\ + bls _080F79A8\n\ + movs r2, 0x80\n\ + lsls r2, 1\n\ + adds r1, r2\n\ +_080F79A8:\n\ + lsrs r0, r1, 8\n\ + str r0, [r4, 0x8]\n\ + ldr r1, [r4, 0x4]\n\ + lsls r0, r1, 1\n\ + adds r0, r1\n\ + lsls r0, 2\n\ + subs r0, r1\n\ + lsls r0, 11\n\ + movs r1, 0x64\n\ + bl __divsi3\n\ + adds r1, r0, 0\n\ + ands r0, r5\n\ + cmp r0, 0x7F\n\ + bls _080F79CC\n\ + movs r5, 0x80\n\ + lsls r5, 1\n\ + adds r1, r5\n\ +_080F79CC:\n\ + lsrs r0, r1, 8\n\ + str r0, [r4, 0xC]\n\ + mov r0, r8\n\ + lsls r4, r0, 24\n\ + lsrs r4, 24\n\ + adds r0, r4, 0\n\ + movs r1, 0x1\n\ + bl sub_80F7310\n\ + mov r2, r9\n\ + ldr r1, [r2]\n\ + ldr r1, [r1, 0x4]\n\ + add r1, r10\n\ + strb r0, [r1, 0x11]\n\ + adds r0, r4, 0\n\ + movs r1, 0x1\n\ + bl sub_80F7364\n\ + mov r4, r9\n\ + ldr r1, [r4]\n\ + ldr r1, [r1, 0x4]\n\ + add r1, r10\n\ + lsls r0, 24\n\ + asrs r0, 24\n\ + cmp r0, 0\n\ + bge _080F7A02\n\ + negs r0, r0\n\ +_080F7A02:\n\ + strb r0, [r1, 0x12]\n\ + ldr r0, =gContestFinalStandings\n\ + add r0, r8\n\ + ldrb r0, [r0]\n\ + cmp r0, 0\n\ + beq _080F7A60\n\ + mov r5, r9\n\ + ldr r0, [r5]\n\ + ldr r0, [r0, 0x4]\n\ + mov r2, r10\n\ + adds r1, r2, r0\n\ + ldr r5, [r1, 0x8]\n\ + ldrh r3, [r1, 0x8]\n\ + ldr r4, [r1, 0xC]\n\ + ldrh r2, [r1, 0xC]\n\ + ldrb r0, [r1, 0x10]\n\ + cmp r0, 0\n\ + beq _080F7A2C\n\ + lsls r0, r2, 16\n\ + negs r0, r0\n\ + lsrs r2, r0, 16\n\ +_080F7A2C:\n\ + lsls r0, r3, 16\n\ + asrs r3, r0, 16\n\ + lsls r0, r2, 16\n\ + asrs r2, r0, 16\n\ + adds r0, r3, r2\n\ + cmp r0, 0x58\n\ + bne _080F7A60\n\ + cmp r2, 0\n\ + ble _080F7A58\n\ + subs r0, r4, 0x1\n\ + str r0, [r1, 0xC]\n\ + b _080F7A60\n\ + .pool\n\ +_080F7A58:\n\ + cmp r3, 0\n\ + ble _080F7A60\n\ + subs r0, r5, 0x1\n\ + str r0, [r1, 0x8]\n\ +_080F7A60:\n\ + movs r4, 0x14\n\ + add r10, r4\n\ + movs r5, 0x1\n\ + add r8, r5\n\ + mov r0, r8\n\ + cmp r0, 0x3\n\ + bgt _080F7A70\n\ + b _080F78EA\n\ +_080F7A70:\n\ + add sp, 0x4\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0"); +} + +// static void sub_80F7A80(u8 arg0, u8 arg1) +// { +// int i; +// u8 taskId; +// u8 sp8, spC; + +// sp8 = 0; +// spC = 0; +// if (!arg0) +// { +// u32 var0; +// for (i = 0; i < 4; i++) +// { +// int var1 = gUnknown_0203A034->unk4->unk0[i].unk11; +// if (arg1 < var1) +// { +// int x = var1 + 19; +// x -= arg1; +// x--; +// FillBgTilemapBufferRect_Palette0(1, 0x60B3, x, i * 3 + 5, 1, 1); +// taskId = CreateTask(sub_80F7CA8, 10); +// var0 = ((gUnknown_0203A034->unk4->unk0[i].unk8 << 16) / gUnknown_0203A034->unk4->unk0[i].unk11) * (arg1 + 1); +// var0 &= 0xFFFF; +// if (var0 > 0x7FFF) +// var0 += 0x10000; + +// gTasks[taskId].data[0] = i; +// gTasks[taskId].data[1] = var0 >> 16; +// gUnknown_0203A034->unk0->unk14++; +// sp8++; +// } +// } +// } +// else +// { +// u32 var0; +// for (i = 0; i < 4; i++) +// { +// int tile; +// s8 var1 = gUnknown_0203A034->unk4->unk0[i].unk12; +// tile = gUnknown_0203A034->unk4->unk0[i].unk10 ? 0x60A5 : 0x60A3; +// if (arg1 < var1) +// { +// int thing = ((s8)arg1 - 19); +// int x = var1 - thing; +// x--; +// FillBgTilemapBufferRect_Palette0(1, tile, x, i * 3 + 6, 1, 1); +// taskId = CreateTask(sub_80F7CA8, 10); +// var0 = ((gUnknown_0203A034->unk4->unk0[i].unkC << 16) / gUnknown_0203A034->unk4->unk0[i].unk12) * (arg1 + 1); +// var0 &= 0xFFFF; +// if (var0 > 0x7FFF) +// var0 += 0x10000; + +// gTasks[taskId].data[0] = i; +// if (gUnknown_0203A034->unk4->unk0[i].unk10) +// { +// gTasks[taskId].data[2] = 1; +// spC++; +// } +// else +// { +// sp8++; +// } + +// if (gUnknown_0203A034->unk4->unk0[i].unk10) +// gTasks[taskId].data[1] = gUnknown_0203A034->unk4->unk0[i].unk8 - (var0 >> 16); +// else +// gTasks[taskId].data[1] = gUnknown_0203A034->unk4->unk0[i].unk8 + (var0 >> 16); + +// gUnknown_0203A034->unk0->unk14++; +// } +// } +// } + +// if (spC) +// PlaySE(SE_PIN); + +// if (sp8) +// PlaySE(SE_BAN); +// } + +NAKED +static void sub_80F7A80(u8 arg0, u8 arg1) +{ + asm_unified("\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x14\n\ + lsls r0, 24\n\ + lsls r1, 24\n\ + lsrs r1, 24\n\ + mov r8, r1\n\ + movs r1, 0\n\ + str r1, [sp, 0x8]\n\ + movs r3, 0\n\ + str r3, [sp, 0xC]\n\ + cmp r0, 0\n\ + bne _080F7B5C\n\ + mov r9, r3\n\ + ldr r4, =gUnknown_0203A034\n\ + mov r10, r4\n\ + movs r7, 0xA0\n\ + lsls r7, 19\n\ + movs r6, 0\n\ +_080F7AAC:\n\ + mov r1, r10\n\ + ldr r0, [r1]\n\ + ldr r0, [r0, 0x4]\n\ + adds r0, r6, r0\n\ + ldrb r2, [r0, 0x11]\n\ + cmp r8, r2\n\ + bcs _080F7B2E\n\ + adds r2, 0x13\n\ + mov r3, r8\n\ + subs r2, r3\n\ + subs r2, 0x1\n\ + lsls r2, 24\n\ + lsrs r2, 24\n\ + lsrs r3, r7, 24\n\ + movs r0, 0x1\n\ + str r0, [sp]\n\ + str r0, [sp, 0x4]\n\ + ldr r1, =0x000060b3\n\ + bl FillBgTilemapBufferRect_Palette0\n\ + ldr r0, =sub_80F7CA8\n\ + movs r1, 0xA\n\ + bl CreateTask\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + mov r0, r10\n\ + ldr r4, [r0]\n\ + ldr r1, [r4, 0x4]\n\ + adds r1, r6, r1\n\ + ldr r0, [r1, 0x8]\n\ + lsls r0, 16\n\ + ldrb r1, [r1, 0x11]\n\ + bl __udivsi3\n\ + mov r1, r8\n\ + adds r1, 0x1\n\ + adds r3, r0, 0\n\ + muls r3, r1\n\ + ldr r0, =0x0000ffff\n\ + ands r0, r3\n\ + ldr r1, =0x00007fff\n\ + cmp r0, r1\n\ + bls _080F7B0A\n\ + movs r1, 0x80\n\ + lsls r1, 9\n\ + adds r3, r1\n\ +_080F7B0A:\n\ + ldr r1, =gTasks\n\ + lsls r0, r5, 2\n\ + adds r0, r5\n\ + lsls r0, 3\n\ + adds r0, r1\n\ + mov r1, r9\n\ + strh r1, [r0, 0x8]\n\ + lsrs r1, r3, 16\n\ + strh r1, [r0, 0xA]\n\ + ldr r1, [r4]\n\ + ldrb r0, [r1, 0x14]\n\ + adds r0, 0x1\n\ + strb r0, [r1, 0x14]\n\ + ldr r0, [sp, 0x8]\n\ + adds r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + str r0, [sp, 0x8]\n\ +_080F7B2E:\n\ + movs r3, 0xC0\n\ + lsls r3, 18\n\ + adds r7, r3\n\ + adds r6, 0x14\n\ + movs r4, 0x1\n\ + add r9, r4\n\ + mov r0, r9\n\ + cmp r0, 0x3\n\ + ble _080F7AAC\n\ + b _080F7C7E\n\ + .pool\n\ +_080F7B5C:\n\ + movs r1, 0\n\ + mov r9, r1\n\ + mov r10, r1\n\ + movs r3, 0xC0\n\ + lsls r3, 19\n\ + str r3, [sp, 0x10]\n\ +_080F7B68:\n\ + ldr r4, =gUnknown_0203A034\n\ + ldr r0, [r4]\n\ + ldr r0, [r0, 0x4]\n\ + add r0, r10\n\ + ldrb r2, [r0, 0x12]\n\ + ldrb r0, [r0, 0x10]\n\ + ldr r1, =0x000060a3\n\ + cmp r0, 0\n\ + beq _080F7B7C\n\ + adds r1, 0x2\n\ +_080F7B7C:\n\ + lsls r0, r2, 24\n\ + asrs r0, 24\n\ + cmp r8, r0\n\ + bge _080F7C64\n\ + mov r3, r8\n\ + lsls r2, r3, 24\n\ + asrs r2, 24\n\ + subs r2, 0x13\n\ + subs r2, r0, r2\n\ + subs r2, 0x1\n\ + lsls r2, 24\n\ + lsrs r2, 24\n\ + ldr r4, [sp, 0x10]\n\ + lsrs r3, r4, 24\n\ + movs r7, 0x1\n\ + str r7, [sp]\n\ + str r7, [sp, 0x4]\n\ + movs r0, 0x1\n\ + bl FillBgTilemapBufferRect_Palette0\n\ + ldr r0, =sub_80F7CA8\n\ + movs r1, 0xA\n\ + bl CreateTask\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + ldr r0, =gUnknown_0203A034\n\ + ldr r6, [r0]\n\ + ldr r1, [r6, 0x4]\n\ + add r1, r10\n\ + ldr r0, [r1, 0xC]\n\ + lsls r0, 16\n\ + ldrb r1, [r1, 0x12]\n\ + bl __udivsi3\n\ + mov r1, r8\n\ + adds r1, 0x1\n\ + adds r3, r0, 0\n\ + muls r3, r1\n\ + ldr r0, =0x0000ffff\n\ + ands r0, r3\n\ + ldr r1, =0x00007fff\n\ + cmp r0, r1\n\ + bls _080F7BDA\n\ + movs r1, 0x80\n\ + lsls r1, 9\n\ + adds r3, r1\n\ +_080F7BDA:\n\ + ldr r1, =gTasks\n\ + lsls r2, r5, 2\n\ + adds r0, r2, r5\n\ + lsls r0, 3\n\ + adds r4, r0, r1\n\ + mov r0, r9\n\ + strh r0, [r4, 0x8]\n\ + ldr r0, [r6, 0x4]\n\ + add r0, r10\n\ + ldrb r0, [r0, 0x10]\n\ + adds r6, r1, 0\n\ + cmp r0, 0\n\ + beq _080F7C1C\n\ + strh r7, [r4, 0xC]\n\ + ldr r0, [sp, 0xC]\n\ + adds r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + str r0, [sp, 0xC]\n\ + b _080F7C26\n\ + .pool\n\ +_080F7C1C:\n\ + ldr r0, [sp, 0x8]\n\ + adds r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + str r0, [sp, 0x8]\n\ +_080F7C26:\n\ + ldr r1, =gUnknown_0203A034\n\ + ldr r0, [r1]\n\ + ldr r0, [r0, 0x4]\n\ + mov r4, r10\n\ + adds r1, r4, r0\n\ + ldrb r0, [r1, 0x10]\n\ + ldr r4, =gUnknown_0203A034\n\ + cmp r0, 0\n\ + beq _080F7C4C\n\ + adds r0, r2, r5\n\ + lsls r0, 3\n\ + adds r0, r6\n\ + lsrs r2, r3, 16\n\ + ldr r1, [r1, 0x8]\n\ + subs r1, r2\n\ + b _080F7C58\n\ + .pool\n\ +_080F7C4C:\n\ + adds r0, r2, r5\n\ + lsls r0, 3\n\ + adds r0, r6\n\ + lsrs r2, r3, 16\n\ + ldr r1, [r1, 0x8]\n\ + adds r1, r2\n\ +_080F7C58:\n\ + strh r1, [r0, 0xA]\n\ + ldr r0, [r4]\n\ + ldr r1, [r0]\n\ + ldrb r0, [r1, 0x14]\n\ + adds r0, 0x1\n\ + strb r0, [r1, 0x14]\n\ +_080F7C64:\n\ + movs r0, 0x14\n\ + add r10, r0\n\ + ldr r1, [sp, 0x10]\n\ + movs r3, 0xC0\n\ + lsls r3, 18\n\ + adds r1, r3\n\ + str r1, [sp, 0x10]\n\ + movs r4, 0x1\n\ + add r9, r4\n\ + mov r0, r9\n\ + cmp r0, 0x3\n\ + bgt _080F7C7E\n\ + b _080F7B68\n\ +_080F7C7E:\n\ + ldr r1, [sp, 0xC]\n\ + cmp r1, 0\n\ + beq _080F7C8A\n\ + movs r0, 0x16\n\ + bl PlaySE\n\ +_080F7C8A:\n\ + ldr r3, [sp, 0x8]\n\ + cmp r3, 0\n\ + beq _080F7C96\n\ + movs r0, 0x15\n\ + bl PlaySE\n\ +_080F7C96:\n\ + add sp, 0x14\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0"); +} + +#ifdef NONMATCHING +void sub_80F7CA8(u8 taskId) +{ + register int r4 asm("r4"); + int r9; + u8 r6; + s16 r7; + s16 r12; + int i; + u8 var0; + u16 tileNum; + + r4 = 0; + r9 = 0; + r6 = gTasks[taskId].data[0]; + r7 = gTasks[taskId].data[1]; + r12 = gTasks[taskId].data[2]; + if (r12) + { + if (gUnknown_0203A034->unk0->unkC[r6] <= 0) + r4 = 1; + } + else + { + if (gUnknown_0203A034->unk0->unkC[r6] > 87) + r4 = 1; + } + + if (gUnknown_0203A034->unk0->unkC[r6] == r7) + r9 = 1; + + if (!r9) + { + if (r4) + gUnknown_0203A034->unk0->unkC[r6] = r7; + else if (r12) + gUnknown_0203A034->unk0->unkC[r6] = gUnknown_0203A034->unk0->unkC[r6] - 1; + else + gUnknown_0203A034->unk0->unkC[r6] = gUnknown_0203A034->unk0->unkC[r6] + 1; + } + + if (!r4 && !r9) + { + for (i = 0; i < 11; i++) + { + if (gUnknown_0203A034->unk0->unkC[r6] >= (i + 1) * 8) + { + var0 = 8; + } + else if (gUnknown_0203A034->unk0->unkC[r6] >= i * 8) + { + int var2 = gUnknown_0203A034->unk0->unkC[r6]; + int var1 = var2; + if (var1 < 0) + var1 += 7; + + var0 = var2 - ((var1 >> 3) << 3); + } + else + { + var0 = 0; + } + + if (var0 < 4) + tileNum = 0x504C; + else + tileNum = 0x5057; + + FillBgTilemapBufferRect_Palette0(2, tileNum + var0, i + 7, r6 * 3 + 6, 1, 1); + } + } + + if (r9) + { + gUnknown_0203A034->unk0->unk14--; + DestroyTask(taskId); + } +} +#else +NAKED +void sub_80F7CA8(u8 taskId) +{ + asm_unified("\n\ + push {r4-r7,lr}\n\ + mov r7, r9\n\ + mov r6, r8\n\ + push {r6,r7}\n\ + sub sp, 0x8\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r8, r0\n\ + movs r4, 0\n\ + mov r9, r4\n\ + ldr r1, =gTasks\n\ + lsls r0, 2\n\ + add r0, r8\n\ + lsls r0, 3\n\ + adds r0, r1\n\ + ldrb r6, [r0, 0x8]\n\ + ldrh r7, [r0, 0xA]\n\ + ldrh r1, [r0, 0xC]\n\ + mov r12, r1\n\ + movs r2, 0xC\n\ + ldrsh r0, [r0, r2]\n\ + cmp r0, 0\n\ + beq _080F7CF8\n\ + ldr r2, =gUnknown_0203A034\n\ + ldr r0, [r2]\n\ + ldr r0, [r0]\n\ + lsls r1, r6, 1\n\ + adds r0, 0xC\n\ + adds r0, r1\n\ + movs r3, 0\n\ + ldrsh r0, [r0, r3]\n\ + adds r5, r1, 0\n\ + cmp r0, 0\n\ + bgt _080F7D10\n\ + b _080F7D0E\n\ + .pool\n\ +_080F7CF8:\n\ + ldr r2, =gUnknown_0203A034\n\ + ldr r0, [r2]\n\ + ldr r0, [r0]\n\ + lsls r1, r6, 1\n\ + adds r0, 0xC\n\ + adds r0, r1\n\ + movs r3, 0\n\ + ldrsh r0, [r0, r3]\n\ + adds r5, r1, 0\n\ + cmp r0, 0x57\n\ + ble _080F7D10\n\ +_080F7D0E:\n\ + movs r4, 0x1\n\ +_080F7D10:\n\ + ldr r0, [r2]\n\ + ldr r0, [r0]\n\ + adds r0, 0xC\n\ + adds r2, r0, r5\n\ + ldrh r3, [r2]\n\ + movs r0, 0\n\ + ldrsh r1, [r2, r0]\n\ + lsls r0, r7, 16\n\ + asrs r0, 16\n\ + cmp r1, r0\n\ + bne _080F7D2A\n\ + movs r1, 0x1\n\ + mov r9, r1\n\ +_080F7D2A:\n\ + mov r0, r9\n\ + cmp r0, 0\n\ + bne _080F7D4A\n\ + cmp r4, 0\n\ + beq _080F7D3C\n\ + strh r7, [r2]\n\ + b _080F7D4A\n\ + .pool\n\ +_080F7D3C:\n\ + mov r1, r12\n\ + cmp r1, 0\n\ + beq _080F7D46\n\ + subs r0, r3, 0x1\n\ + b _080F7D48\n\ +_080F7D46:\n\ + adds r0, r3, 0x1\n\ +_080F7D48:\n\ + strh r0, [r2]\n\ +_080F7D4A:\n\ + cmp r4, 0\n\ + bne _080F7DC4\n\ + mov r2, r9\n\ + cmp r2, 0\n\ + bne _080F7DCA\n\ + movs r2, 0\n\ +_080F7D56:\n\ + ldr r0, =gUnknown_0203A034\n\ + ldr r0, [r0]\n\ + ldr r0, [r0]\n\ + adds r0, 0xC\n\ + adds r0, r5\n\ + movs r1, 0\n\ + ldrsh r3, [r0, r1]\n\ + adds r0, r2, 0x1\n\ + lsls r1, r0, 3\n\ + adds r4, r0, 0\n\ + cmp r3, r1\n\ + blt _080F7D78\n\ + movs r0, 0x8\n\ + b _080F7D94\n\ + .pool\n\ +_080F7D78:\n\ + lsls r0, r2, 3\n\ + cmp r3, r0\n\ + blt _080F7D92\n\ + adds r0, r3, 0\n\ + cmp r3, 0\n\ + bge _080F7D86\n\ + adds r0, r3, 0x7\n\ +_080F7D86:\n\ + asrs r0, 3\n\ + lsls r0, 3\n\ + subs r0, r3, r0\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + b _080F7D94\n\ +_080F7D92:\n\ + movs r0, 0\n\ +_080F7D94:\n\ + cmp r0, 0x3\n\ + bhi _080F7DA0\n\ + ldr r3, =0x0000504c\n\ + b _080F7DA2\n\ + .pool\n\ +_080F7DA0:\n\ + ldr r3, =0x00005057\n\ +_080F7DA2:\n\ + adds r1, r0, r3\n\ + adds r2, 0x7\n\ + lsls r2, 24\n\ + lsrs r2, 24\n\ + adds r3, r5, r6\n\ + adds r3, 0x6\n\ + lsls r3, 24\n\ + movs r0, 0x1\n\ + str r0, [sp]\n\ + str r0, [sp, 0x4]\n\ + movs r0, 0x2\n\ + lsrs r3, 24\n\ + bl FillBgTilemapBufferRect_Palette0\n\ + adds r2, r4, 0\n\ + cmp r2, 0xA\n\ + ble _080F7D56\n\ +_080F7DC4:\n\ + mov r0, r9\n\ + cmp r0, 0\n\ + beq _080F7DDC\n\ +_080F7DCA:\n\ + ldr r0, =gUnknown_0203A034\n\ + ldr r0, [r0]\n\ + ldr r1, [r0]\n\ + ldrb r0, [r1, 0x14]\n\ + subs r0, 0x1\n\ + strb r0, [r1, 0x14]\n\ + mov r0, r8\n\ + bl DestroyTask\n\ +_080F7DDC:\n\ + add sp, 0x8\n\ + pop {r3,r4}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool"); +} +#endif // NONMATCHING + +static void sub_80F7DF4(void) +{ + gUnknown_0203A034 = AllocZeroed(sizeof(*gUnknown_0203A034)); + gUnknown_0203A034->unk0 = AllocZeroed(sizeof(*gUnknown_0203A034->unk0)); + gUnknown_0203A034->unk4 = AllocZeroed(sizeof(*gUnknown_0203A034->unk4)); + gUnknown_0203A034->unk8 = AllocZeroed(BG_SCREEN_SIZE); + gUnknown_0203A034->unkC[0] = AllocZeroed(BG_SCREEN_SIZE); + gUnknown_0203A034->unkC[1] = AllocZeroed(BG_SCREEN_SIZE); + gUnknown_0203A034->unkC[2] = AllocZeroed(BG_SCREEN_SIZE); + gUnknown_0203A034->unkC[3] = AllocZeroed(BG_SCREEN_SIZE); + gUnknown_0203A034->unk1C = AllocZeroed(0x1000); + AllocateMonSpritesGfx(); +} + +static void sub_80F7E64(void) +{ + FREE_AND_SET_NULL(gUnknown_0203A034->unk0); + FREE_AND_SET_NULL(gUnknown_0203A034->unk4); + FREE_AND_SET_NULL(gUnknown_0203A034->unk8); + FREE_AND_SET_NULL(gUnknown_0203A034->unkC[0]); + FREE_AND_SET_NULL(gUnknown_0203A034->unkC[1]); + FREE_AND_SET_NULL(gUnknown_0203A034->unkC[2]); + FREE_AND_SET_NULL(gUnknown_0203A034->unkC[3]); + FREE_AND_SET_NULL(gUnknown_0203A034->unk1C); + FREE_AND_SET_NULL(gUnknown_0203A034); + FreeMonSpritesGfx(); +} + +static void sub_80F7ED0(int windowId, u8 *str, int arg2) +{ + struct TextPrinterTemplate textPrinter; + textPrinter.currentChar = str; + textPrinter.windowId = windowId; + textPrinter.fontId = 7; + textPrinter.x = arg2; + textPrinter.y = 2; + textPrinter.currentX = arg2; + textPrinter.currentY = 2; + textPrinter.letterSpacing = 0; + textPrinter.lineSpacing = 0; + textPrinter.unk = 0; + textPrinter.fgColor = 1; + textPrinter.bgColor = 0; + textPrinter.shadowColor = 8; + AddTextPrinter(&textPrinter, 0, NULL); + PutWindowTilemap(windowId); +} + +void sub_80F7F30(void) +{ + u8 result = sub_80DAE0C(&gPlayerParty[gContestMonPartyIndex]); + if (result) + { + sub_80DAB8C(gSpecialVar_ContestCategory, gSpecialVar_ContestRank); + sub_80DB09C(gSpecialVar_ContestCategory); + } + + gSpecialVar_Result = result; +} + +u16 sub_80F7F7C(void) +{ + u16 result = 0; + struct Pokemon *mon = &gPlayerParty[gContestMonPartyIndex]; + switch (gSpecialVar_ContestCategory) + { + case CONTEST_CATEGORY_COOL: + if (GetMonData(mon, MON_DATA_COOL_RIBBON) > gSpecialVar_ContestRank) + result = 1; + break; + case CONTEST_CATEGORY_BEAUTY: + if (GetMonData(mon, MON_DATA_BEAUTY_RIBBON) > gSpecialVar_ContestRank) + result = 1; + break; + case CONTEST_CATEGORY_CUTE: + if (GetMonData(mon, MON_DATA_CUTE_RIBBON) > gSpecialVar_ContestRank) + result = 1; + break; + case CONTEST_CATEGORY_SMART: + if (GetMonData(mon, MON_DATA_SMART_RIBBON) > gSpecialVar_ContestRank) + result = 1; + break; + case CONTEST_CATEGORY_TOUGH: + if (GetMonData(mon, MON_DATA_TOUGH_RIBBON) > gSpecialVar_ContestRank) + result = 1; + break; + } + + return result; +} + +void sub_80F7FFC(void) +{ + u8 ribbonData; + + if (gContestFinalStandings[gContestPlayerMonIndex] != 0) + return; + + switch (gSpecialVar_ContestCategory) + { + case CONTEST_CATEGORY_COOL: + ribbonData = GetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_COOL_RIBBON); + if (ribbonData <= gSpecialVar_ContestRank && ribbonData < 4) + { + ribbonData++; + SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_COOL_RIBBON, &ribbonData); + if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4) + sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_COOL_RIBBON); + } + break; + case CONTEST_CATEGORY_BEAUTY: + ribbonData = GetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_BEAUTY_RIBBON); + if (ribbonData <= gSpecialVar_ContestRank && ribbonData < 4) + { + ribbonData++; + SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_BEAUTY_RIBBON, &ribbonData); + if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4) + sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_BEAUTY_RIBBON); + } + break; + case CONTEST_CATEGORY_CUTE: + ribbonData = GetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_CUTE_RIBBON); + if (ribbonData <= gSpecialVar_ContestRank && ribbonData < 4) + { + ribbonData++; + SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_CUTE_RIBBON, &ribbonData); + if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4) + sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_CUTE_RIBBON); + } + break; + case CONTEST_CATEGORY_SMART: + ribbonData = GetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_SMART_RIBBON); + if (ribbonData <= gSpecialVar_ContestRank && ribbonData < 4) + { + ribbonData++; + SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_SMART_RIBBON, &ribbonData); + if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4) + sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_SMART_RIBBON); + } + break; + case CONTEST_CATEGORY_TOUGH: + ribbonData = GetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_TOUGH_RIBBON); + if (ribbonData <= gSpecialVar_ContestRank && ribbonData < 4) + { + ribbonData++; + SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_TOUGH_RIBBON, &ribbonData); + if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4) + sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_TOUGH_RIBBON); + } + break; + } +} + +void sub_80F8264(void) +{ + StringCopy(gStringVar1, gContestMons[gSpecialVar_0x8006].trainerName); + sub_81DB5AC(gStringVar1); +} + +void sub_80F8290(void) +{ + StringCopy(gStringVar3, gContestMons[gSpecialVar_0x8006].nickname); +} + +void sub_80F82B4(void) +{ + u8 i; + u8 count; + + for (i = 0, count = 0; i < 4; i++) + { + if (gContestMonConditions[gSpecialVar_0x8006] < gContestMonConditions[i]) + count++; + } + + gSpecialVar_0x8004 = count; +} + +void sub_80F82FC(void) +{ + gSpecialVar_0x8004 = gContestMonConditions[gSpecialVar_0x8006]; +} + +void sub_80F831C(void) +{ + u8 i; + + for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++) + ; + + gSpecialVar_0x8005 = i; +} + +void sub_80F834C(void) +{ + u8 i; + + for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++) + ; + + StringCopy(gStringVar3, gContestMons[i].trainerName); + sub_81DB5AC(gStringVar3); +} + +void sub_80F8390(void) +{ + u8 i; + + for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++) + ; + + StringCopy(gStringVar1, gContestMons[i].nickname); +} + +void sub_80F83D0(void) +{ + SetMainCallback2(sub_80D7B24); +} + +static void sub_80F83E0(u8 taskId) +{ + if (!gPaletteFade.active) + { + DestroyTask(taskId); + SetMainCallback2(sub_80F83D0); + } +} + +void sub_80F840C(void) +{ + ScriptContext2_Enable(); + CreateTask(sub_80F83E0, 10); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); +} + +void sub_80F8438(void) +{ + gSpecialVar_0x8004 = gContestMons[gSpecialVar_0x8006].species; +} + +static void sub_80F8458(u8 taskId) +{ + if (!gPaletteFade.active) + { + DestroyTask(taskId); + SetMainCallback2(sub_80F5B00); + } +} + +void sub_80F8484(void) +{ + ScriptContext2_Enable(); + CreateTask(sub_80F8458, 10); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); +} + +void sub_80F84B0(void) +{ + gSpecialVar_0x8004 = gContestPlayerMonIndex; +} + +void sub_80F84C4(u8 taskId) +{ + u8 newTaskId; + ScriptContext2_Enable(); + newTaskId = CreateTask(sub_80FC580, 0); + SetTaskFuncWithFollowupFunc(newTaskId, sub_80FC580, sub_80F8508); + gTasks[newTaskId].data[9] = taskId; +} + +static void sub_80F8508(u8 taskId) +{ + if (gIsLinkContest & 0x4) + { + sub_80DA8C8(gContestMonPartyIndex); + SetTaskFuncWithFollowupFunc(taskId, sub_80FC6BC, sub_80F8568); + } + else + { + sub_80DA8C8(gContestMonPartyIndex); + gTasks[taskId].func = sub_81D9DE4; + } +} + +static void sub_80F8568(u8 taskId) +{ + SetTaskFuncWithFollowupFunc(taskId, sub_80FC804, sub_80F8584); +} + +static void sub_80F8584(u8 taskId) +{ + SetTaskFuncWithFollowupFunc(taskId, sub_80FCE48, sub_80F85A0); +} + +static void sub_80F85A0(u8 taskId) +{ + SetTaskFuncWithFollowupFunc(taskId, sub_80FC894, sub_80F85BC); +} + +#ifdef NONMATCHING +static void sub_80F85BC(u8 taskId) +{ + u32 i; + u8 sp0[4]; + u8 sp4[4]; + + memset(sp0, 0, sizeof(sp0)); + memset(sp4, 0, sizeof(sp4)); + + for (i = 0; i < gNumLinkContestPlayers; i++) + sp0[i] = gTasks[taskId].data[i + 1]; + + for (i = 0; i < gNumLinkContestPlayers; i++) + { + if (sp0[0] != sp0[i + 1]) + break; + } + + if (i == gNumLinkContestPlayers) + gSpecialVar_0x8004 = 0; + else + gSpecialVar_0x8004 = 1; + + for (i = 0; i < gNumLinkContestPlayers; i++) + sp4[i] = gTasks[taskId].data[i + 5]; + + gUnknown_02039F2B = sub_80F86E0(sp4); + sub_80DB09C(gSpecialVar_ContestCategory); + SetTaskFuncWithFollowupFunc(taskId, sub_80FCF40, sub_80F86B8); +} +#else +NAKED +static void sub_80F85BC(u8 taskId) +{ + asm_unified("\n\ + push {r4-r7,lr}\n\ + mov r7, r9\n\ + mov r6, r8\n\ + push {r6,r7}\n\ + sub sp, 0x8\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + movs r0, 0\n\ + str r0, [sp]\n\ + str r0, [sp, 0x4]\n\ + movs r3, 0\n\ + ldr r5, =gNumLinkContestPlayers\n\ + mov r12, r5\n\ + ldr r0, =gSpecialVar_0x8004\n\ + mov r9, r0\n\ + add r1, sp, 0x4\n\ + mov r8, r1\n\ + ldrb r0, [r5]\n\ + cmp r3, r0\n\ + bcs _080F8606\n\ + lsls r0, r6, 2\n\ + adds r0, r6\n\ + lsls r4, r0, 3\n\ + ldr r7, =gTasks + 0x8\n\ +_080F85EC:\n\ + mov r1, sp\n\ + adds r2, r1, r3\n\ + adds r1, r3, 0x1\n\ + lsls r0, r1, 1\n\ + adds r0, r4\n\ + adds r0, r7\n\ + ldrh r0, [r0]\n\ + strb r0, [r2]\n\ + lsls r1, 24\n\ + lsrs r3, r1, 24\n\ + ldrb r0, [r5]\n\ + cmp r3, r0\n\ + bcc _080F85EC\n\ +_080F8606:\n\ + movs r3, 0\n\ + mov r1, r12\n\ + ldrb r0, [r1]\n\ + cmp r3, r0\n\ + bcs _080F862A\n\ + adds r4, r0, 0\n\ + mov r2, sp\n\ +_080F8614:\n\ + adds r0, r3, 0x1\n\ + lsls r0, 24\n\ + lsrs r3, r0, 24\n\ + cmp r3, r4\n\ + bcs _080F862A\n\ + mov r0, sp\n\ + adds r1, r0, r3\n\ + ldrb r0, [r2]\n\ + ldrb r1, [r1]\n\ + cmp r0, r1\n\ + beq _080F8614\n\ +_080F862A:\n\ + mov r1, r12\n\ + ldrb r1, [r1]\n\ + cmp r3, r1\n\ + bne _080F8644\n\ + movs r0, 0\n\ + b _080F8646\n\ + .pool\n\ +_080F8644:\n\ + movs r0, 0x1\n\ +_080F8646:\n\ + mov r1, r9\n\ + strh r0, [r1]\n\ + movs r3, 0\n\ + mov r4, r12\n\ + ldrb r0, [r4]\n\ + cmp r3, r0\n\ + bcs _080F8678\n\ + mov r5, r8\n\ + lsls r0, r6, 2\n\ + adds r0, r6\n\ + lsls r2, r0, 3\n\ + ldr r7, =gTasks + 0x8\n\ +_080F865E:\n\ + adds r1, r5, r3\n\ + adds r0, r3, 0x5\n\ + lsls r0, 1\n\ + adds r0, r2\n\ + adds r0, r7\n\ + ldrh r0, [r0]\n\ + strb r0, [r1]\n\ + adds r0, r3, 0x1\n\ + lsls r0, 24\n\ + lsrs r3, r0, 24\n\ + ldrb r1, [r4]\n\ + cmp r3, r1\n\ + bcc _080F865E\n\ +_080F8678:\n\ + mov r0, r8\n\ + bl sub_80F86E0\n\ + ldr r1, =gUnknown_02039F2B\n\ + strb r0, [r1]\n\ + ldr r0, =gSpecialVar_ContestCategory\n\ + ldrb r0, [r0]\n\ + bl sub_80DB09C\n\ + ldr r1, =sub_80FCF40\n\ + ldr r2, =sub_80F86B8\n\ + adds r0, r6, 0\n\ + bl SetTaskFuncWithFollowupFunc\n\ + add sp, 0x8\n\ + pop {r3,r4}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool"); +} +#endif // NONMATCHING + +static void sub_80F86B8(u8 taskId) +{ + sub_80DCE58(0); + SetTaskFuncWithFollowupFunc(taskId, sub_80FCFD0, sub_80F8714); +} + +u8 sub_80F86E0(u8 *arg0) +{ + int i; + u8 result = 0; + + for (i = 1; i < gNumLinkContestPlayers; i++) + { + if (arg0[result] < arg0[i]) + result = i; + } + + return result; +} + +void sub_80F8714(u8 taskId) +{ + int i; + + if (gSpecialVar_0x8004 == 1) + { + if (IsLinkTaskFinished()) + gTasks[taskId].func = sub_80F878C; + } + else + { + for (i = 0; i < 4; i++) + StringGetEnd10(gContestMons[i].nickname); + + DestroyTask(taskId); + SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); + ScriptContext2_Disable(); + EnableBothScriptContexts(); + } +} + +static void sub_80F878C(u8 taskId) +{ + sub_800AC34(); + gTasks[taskId].func = sub_80F87B4; +} + +static void sub_80F87B4(u8 taskId) +{ + if (!gReceivedRemoteLinkPlayers) + { + DestroyTask(taskId); + ScriptContext2_Disable(); + EnableBothScriptContexts(); + } +} From b105d20d1e0297d0c858fe99a0946e5c07da81c1 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 21 Feb 2019 17:40:20 -0600 Subject: [PATCH 095/217] Decompile chunk of easy_chat.c --- asm/easy_chat.s | 2635 --------------------------------------- data/easy_chat.s | 13 +- include/dewford_trend.h | 1 + include/strings.h | 9 + src/easy_chat.c | 2054 +++++++++++++++++++++++++----- 5 files changed, 1749 insertions(+), 2963 deletions(-) diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 7a46f12c5e..271d1bce1c 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5,2641 +5,6 @@ .text - thumb_func_start sub_811ACDC -sub_811ACDC: @ 811ACDC - push {r4-r6,lr} - ldr r2, =gMain - ldrh r1, [r2, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0811AD4A - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r0, [r0, 0x5] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x1 - beq _0811AD3E - b _0811AD24 - .pool -_0811AD04: - movs r0, 0x20 - ands r0, r2 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0 - bne _0811ADE0 - movs r0, 0x80 - ands r0, r2 - cmp r0, 0 - bne _0811ADD0 - movs r0, 0x10 - ands r0, r2 - cmp r0, 0 - bne _0811ADC0 - movs r0, 0 - b _0811AE32 -_0811AD24: - cmp r0, 0x1 - bgt _0811AD2E - cmp r0, 0 - beq _0811AD38 - b _0811AD4A -_0811AD2E: - cmp r0, 0x2 - beq _0811ADF6 - cmp r0, 0x3 - beq _0811AD44 - b _0811AD4A -_0811AD38: - bl sub_811B184 - b _0811ADFA -_0811AD3E: - bl sub_811B150 - b _0811ADFA -_0811AD44: - bl sub_811B264 - b _0811ADFA -_0811AD4A: - ldrh r2, [r2, 0x2E] - movs r0, 0x2 - ands r0, r2 - cmp r0, 0 - bne _0811ADF0 - movs r0, 0x8 - ands r0, r2 - cmp r0, 0 - bne _0811ADF6 - movs r0, 0x40 - ands r0, r2 - cmp r0, 0 - beq _0811AD04 - ldr r2, =gUnknown_0203A118 - ldr r1, [r2] - ldrb r0, [r1, 0x6] - subs r0, 0x1 - strb r0, [r1, 0x6] -_0811AD6E: - adds r6, r2, 0 -_0811AD70: - adds r5, r6, 0 - ldr r4, [r5] - movs r3, 0x6 - ldrsb r3, [r4, r3] - ldr r2, =gUnknown_08597550 - ldrb r1, [r4, 0x1] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 3 - adds r1, r0, r2 - ldrb r0, [r1, 0x2] - cmp r3, r0 - bne _0811AE00 - bl sub_811BA3C - movs r2, 0x3 - cmp r0, 0 - beq _0811AD96 - movs r2, 0x4 -_0811AD96: - ldr r1, [r5] - movs r0, 0x5 - ldrsb r0, [r1, r0] - cmp r0, 0 - bge _0811ADA4 - subs r0, r2, 0x1 - strb r0, [r1, 0x5] -_0811ADA4: - ldr r1, [r5] - movs r0, 0x5 - ldrsb r0, [r1, r0] - cmp r0, r2 - blt _0811ADB2 - movs r0, 0 - strb r0, [r1, 0x5] -_0811ADB2: - movs r0, 0x3 - b _0811AE32 - .pool -_0811ADC0: - ldr r2, =gUnknown_0203A118 - ldr r1, [r2] - ldrb r0, [r1, 0x5] - adds r0, 0x1 - strb r0, [r1, 0x5] - b _0811AD6E - .pool -_0811ADD0: - ldr r1, =gUnknown_0203A118 - ldr r0, [r1] - strb r3, [r0, 0x6] - adds r6, r1, 0 - b _0811AD70 - .pool -_0811ADE0: - ldr r2, =gUnknown_0203A118 - ldr r1, [r2] - ldrb r0, [r1, 0x5] - subs r0, 0x1 - strb r0, [r1, 0x5] - b _0811AD6E - .pool -_0811ADF0: - bl sub_811B150 - b _0811ADFA -_0811ADF6: - bl sub_811B1B4 -_0811ADFA: - lsls r0, 16 - lsrs r0, 16 - b _0811AE32 -_0811AE00: - movs r0, 0x5 - ldrsb r0, [r4, r0] - ldrb r1, [r1, 0x1] - cmp r0, r1 - blt _0811AE0E - subs r0, r1, 0x1 - strb r0, [r4, 0x5] -_0811AE0E: - bl sub_811AB44 - cmp r0, 0 - beq _0811AE28 - ldr r2, [r6] - ldr r0, [r2, 0x4] - ldr r1, =0x00ffff00 - ands r0, r1 - ldr r1, =0x00040100 - cmp r0, r1 - bne _0811AE28 - movs r0, 0 - strb r0, [r2, 0x5] -_0811AE28: - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - movs r0, 0 - strb r0, [r1, 0x4] - movs r0, 0x2 -_0811AE32: - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811ACDC - - thumb_func_start sub_811AE44 -sub_811AE44: @ 811AE44 - push {lr} - ldr r1, =gMain - ldrh r2, [r1, 0x2E] - movs r0, 0x2 - ands r0, r2 - adds r3, r1, 0 - cmp r0, 0 - beq _0811AE60 - bl sub_811B32C - b _0811AEF6 - .pool -_0811AE60: - movs r0, 0x1 - ands r0, r2 - cmp r0, 0 - beq _0811AEAE - ldr r0, =gUnknown_0203A118 - ldr r2, [r0] - movs r1, 0xA - ldrsb r1, [r2, r1] - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _0811AE84 - bl sub_811B2B0 - b _0811AEF6 - .pool -_0811AE84: - movs r0, 0xB - ldrsb r0, [r2, r0] - cmp r0, 0x1 - beq _0811AEA2 - cmp r0, 0x1 - bgt _0811AE96 - cmp r0, 0 - beq _0811AE9C - b _0811AEAE -_0811AE96: - cmp r0, 0x2 - beq _0811AEA8 - b _0811AEAE -_0811AE9C: - bl sub_811B33C - b _0811AEF6 -_0811AEA2: - bl sub_811B368 - b _0811AEF6 -_0811AEA8: - bl sub_811B32C - b _0811AEF6 -_0811AEAE: - ldrh r1, [r3, 0x2E] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0811AEBE - bl sub_811B33C - b _0811AEF6 -_0811AEBE: - ldrh r1, [r3, 0x30] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _0811AECC - movs r0, 0x2 - b _0811AEF2 -_0811AECC: - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _0811AED8 - movs r0, 0x3 - b _0811AEF2 -_0811AED8: - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _0811AEE4 - movs r0, 0x1 - b _0811AEF2 -_0811AEE4: - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - bne _0811AEF0 - movs r0, 0 - b _0811AEFA -_0811AEF0: - movs r0, 0 -_0811AEF2: - bl sub_811B528 -_0811AEF6: - lsls r0, 16 - lsrs r0, 16 -_0811AEFA: - pop {r1} - bx r1 - thumb_func_end sub_811AE44 - - thumb_func_start sub_811AF00 -sub_811AF00: @ 811AF00 - push {lr} - ldr r2, =gMain - ldrh r1, [r2, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0811AF24 - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - movs r0, 0x2 - strb r0, [r1, 0x4] - movs r0, 0xE - b _0811AF86 - .pool -_0811AF24: - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0811AF32 - bl sub_811B394 - b _0811AF82 -_0811AF32: - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _0811AF3E - movs r0, 0x4 - b _0811AF7E -_0811AF3E: - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0811AF4A - movs r0, 0x5 - b _0811AF7E -_0811AF4A: - ldrh r1, [r2, 0x30] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _0811AF58 - movs r0, 0x2 - b _0811AF7E -_0811AF58: - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _0811AF64 - movs r0, 0x3 - b _0811AF7E -_0811AF64: - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _0811AF70 - movs r0, 0x1 - b _0811AF7E -_0811AF70: - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - bne _0811AF7C - movs r0, 0 - b _0811AF86 -_0811AF7C: - movs r0, 0 -_0811AF7E: - bl sub_811B794 -_0811AF82: - lsls r0, 16 - lsrs r0, 16 -_0811AF86: - pop {r1} - bx r1 - thumb_func_end sub_811AF00 - - thumb_func_start sub_811AF8C -sub_811AF8C: @ 811AF8C - push {lr} - bl Menu_ProcessInputNoWrapClearOnChoose - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _0811AFC0 - cmp r1, 0 - bgt _0811AFA8 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _0811AFAC - b _0811AFE4 -_0811AFA8: - cmp r1, 0x1 - bne _0811AFE4 -_0811AFAC: - bl sub_811B2A4 - ldr r1, =gUnknown_0203A118 - ldr r1, [r1] - strb r0, [r1, 0x4] - movs r0, 0x7 - b _0811AFE6 - .pool -_0811AFC0: - ldr r0, =gSpecialVar_Result - strh r1, [r0] - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r0, [r0] - subs r0, 0x11 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bhi _0811AFD8 - bl sub_811B3E4 -_0811AFD8: - movs r0, 0x18 - b _0811AFE6 - .pool -_0811AFE4: - movs r0, 0 -_0811AFE6: - pop {r1} - bx r1 - thumb_func_end sub_811AF8C - - thumb_func_start sub_811AFEC -sub_811AFEC: @ 811AFEC - push {r4,lr} - bl Menu_ProcessInputNoWrapClearOnChoose - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _0811B020 - cmp r1, 0 - bgt _0811B008 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _0811B00C - b _0811B038 -_0811B008: - cmp r1, 0x1 - bne _0811B038 -_0811B00C: - bl sub_811B2A4 - ldr r1, =gUnknown_0203A118 - ldr r1, [r1] - strb r0, [r1, 0x4] - movs r0, 0x7 - b _0811B03A - .pool -_0811B020: - bl sub_811BE9C - ldr r4, =gSpecialVar_Result - bl sub_811B4EC - strh r0, [r4] - bl sub_811B3E4 - movs r0, 0x18 - b _0811B03A - .pool -_0811B038: - movs r0, 0 -_0811B03A: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811AFEC - - thumb_func_start sub_811B040 -sub_811B040: @ 811B040 - push {lr} - bl Menu_ProcessInputNoWrapClearOnChoose - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _0811B070 - cmp r1, 0 - bgt _0811B05C - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _0811B060 - b _0811B084 -_0811B05C: - cmp r1, 0x1 - bne _0811B084 -_0811B060: - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - movs r0, 0x1 - strb r0, [r1, 0x4] - movs r0, 0x7 - b _0811B086 - .pool -_0811B070: - bl sub_811B418 - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - movs r0, 0x1 - strb r0, [r1, 0x4] - movs r0, 0x8 - b _0811B086 - .pool -_0811B084: - movs r0, 0 -_0811B086: - pop {r1} - bx r1 - thumb_func_end sub_811B040 - - thumb_func_start sub_811B08C -sub_811B08C: @ 811B08C - push {lr} - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0811B0A4 - movs r0, 0x1A - b _0811B0B8 - .pool -_0811B0A4: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _0811B0B0 - movs r0, 0 - b _0811B0B8 -_0811B0B0: - bl sub_811B150 - lsls r0, 16 - lsrs r0, 16 -_0811B0B8: - pop {r1} - bx r1 - thumb_func_end sub_811B08C - - thumb_func_start sub_811B0BC -sub_811B0BC: @ 811B0BC - push {lr} - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - bne _0811B0D4 - movs r0, 0 - b _0811B0E0 - .pool -_0811B0D4: - bl sub_811B2A4 - ldr r1, =gUnknown_0203A118 - ldr r1, [r1] - strb r0, [r1, 0x4] - movs r0, 0x7 -_0811B0E0: - pop {r1} - bx r1 - .pool - thumb_func_end sub_811B0BC - - thumb_func_start sub_811B0E8 -sub_811B0E8: @ 811B0E8 - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - movs r0, 0xA - strb r0, [r1, 0x4] - movs r0, 0x6 - bx lr - .pool - thumb_func_end sub_811B0E8 - - thumb_func_start sub_811B0F8 -sub_811B0F8: @ 811B0F8 - push {r4,lr} - bl Menu_ProcessInputNoWrapClearOnChoose - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _0811B134 - cmp r1, 0 - bgt _0811B114 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _0811B118 - b _0811B148 -_0811B114: - cmp r1, 0x1 - bne _0811B148 -_0811B118: - bl sub_811B454 - ldr r2, =gUnknown_0203A118 - ldr r1, [r2] - movs r0, 0 - strb r0, [r1, 0x8] - ldr r1, [r2] - movs r0, 0x8 - strb r0, [r1, 0x4] - movs r0, 0x1F - b _0811B14A - .pool -_0811B134: - ldr r4, =gSpecialVar_Result - bl sub_811B4EC - strh r0, [r4] - bl sub_811B3E4 - movs r0, 0x18 - b _0811B14A - .pool -_0811B148: - movs r0, 0 -_0811B14A: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811B0F8 - - thumb_func_start sub_811B150 -sub_811B150: @ 811B150 - push {lr} - ldr r1, =gUnknown_0203A118 - ldr r2, [r1] - ldrb r0, [r2] - cmp r0, 0x13 - beq _0811B160 - cmp r0, 0xB - bne _0811B174 -_0811B160: - ldrb r0, [r2, 0x4] - strb r0, [r2, 0x8] - ldr r1, [r1] - movs r0, 0x8 - strb r0, [r1, 0x4] - movs r0, 0x22 - b _0811B180 - .pool -_0811B174: - ldrb r0, [r2, 0x4] - strb r0, [r2, 0x8] - ldr r1, [r1] - movs r0, 0x4 - strb r0, [r1, 0x4] - movs r0, 0x5 -_0811B180: - pop {r1} - bx r1 - thumb_func_end sub_811B150 - - thumb_func_start sub_811B184 -sub_811B184: @ 811B184 - push {lr} - ldr r2, =gUnknown_0203A118 - ldr r0, [r2] - ldrb r1, [r0, 0x4] - strb r1, [r0, 0x8] - ldr r1, [r2] - ldrb r0, [r1] - cmp r0, 0x6 - bne _0811B1A8 - ldrb r0, [r1, 0x4] - strb r0, [r1, 0x8] - ldr r1, [r2] - movs r0, 0x8 - strb r0, [r1, 0x4] - movs r0, 0x20 - b _0811B1AE - .pool -_0811B1A8: - movs r0, 0x5 - strb r0, [r1, 0x4] - movs r0, 0x4 -_0811B1AE: - pop {r1} - bx r1 - thumb_func_end sub_811B184 - - thumb_func_start sub_811B1B4 -sub_811B1B4: @ 811B1B4 - push {r4,lr} - ldr r4, =gUnknown_0203A118 - ldr r1, [r4] - ldrb r0, [r1, 0x4] - strb r0, [r1, 0x8] - ldr r1, [r4] - ldrb r0, [r1] - cmp r0, 0x11 - bne _0811B1DC - bl sub_811BD64 - cmp r0, 0 - bne _0811B1FA - bl sub_811BDB0 - cmp r0, 0 - bne _0811B1E8 - b _0811B256 - .pool -_0811B1DC: - cmp r0, 0x12 - bne _0811B204 - bl sub_811BDB0 - cmp r0, 0 - beq _0811B1F2 -_0811B1E8: - ldr r1, [r4] - movs r0, 0x8 - strb r0, [r1, 0x4] - movs r0, 0x1E - b _0811B25C -_0811B1F2: - bl sub_811BD64 - cmp r0, 0 - beq _0811B256 -_0811B1FA: - ldr r1, [r4] - movs r0, 0x8 - strb r0, [r1, 0x4] - movs r0, 0x1D - b _0811B25C -_0811B204: - cmp r0, 0x9 - beq _0811B20C - cmp r0, 0xD - bne _0811B21E -_0811B20C: - bl sub_811BD2C - cmp r0, 0 - bne _0811B256 - ldr r1, [r4] - movs r0, 0x8 - strb r0, [r1, 0x4] - movs r0, 0x21 - b _0811B25C -_0811B21E: - cmp r0, 0x13 - beq _0811B226 - cmp r0, 0xB - bne _0811B238 -_0811B226: - bl sub_811BCF4 - cmp r0, 0 - beq _0811B256 - ldr r1, [r4] - movs r0, 0x8 - strb r0, [r1, 0x4] - movs r0, 0x22 - b _0811B25C -_0811B238: - cmp r0, 0x14 - beq _0811B258 - bl sub_811BCF4 - cmp r0, 0x1 - beq _0811B24C - bl sub_811B4EC - cmp r0, 0 - bne _0811B256 -_0811B24C: - ldr r1, [r4] - movs r0, 0x4 - strb r0, [r1, 0x4] - movs r0, 0x5 - b _0811B25C -_0811B256: - ldr r1, [r4] -_0811B258: - movs r0, 0x6 - strb r0, [r1, 0x4] -_0811B25C: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811B1B4 - - thumb_func_start sub_811B264 -sub_811B264: @ 811B264 - push {lr} - ldr r2, =gUnknown_0203A118 - ldr r1, [r2] - ldrb r0, [r1, 0x4] - strb r0, [r1, 0x8] - ldr r0, [r2] - ldrb r0, [r0] - cmp r0, 0x11 - beq _0811B28E - cmp r0, 0x11 - bgt _0811B284 - cmp r0, 0xF - beq _0811B28A - b _0811B29E - .pool -_0811B284: - cmp r0, 0x12 - beq _0811B296 - b _0811B29E -_0811B28A: - movs r0, 0x19 - b _0811B2A0 -_0811B28E: - bl sub_811B3E4 - movs r0, 0x1C - b _0811B2A0 -_0811B296: - bl sub_811B3E4 - movs r0, 0x1B - b _0811B2A0 -_0811B29E: - movs r0, 0 -_0811B2A0: - pop {r1} - bx r1 - thumb_func_end sub_811B264 - - thumb_func_start sub_811B2A4 -sub_811B2A4: @ 811B2A4 - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r0, [r0, 0x8] - bx lr - .pool - thumb_func_end sub_811B2A4 - - thumb_func_start sub_811B2B0 -sub_811B2B0: @ 811B2B0 - push {lr} - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r0, [r0, 0x9] - cmp r0, 0 - bne _0811B2DC - bl sub_811B8E8 - lsls r0, 24 - lsrs r0, 24 - bl sub_811F3B8 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - movs r0, 0 - bl sub_811F548 - b _0811B2EC - .pool -_0811B2DC: - bl sub_811B908 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x1 - bl sub_811F548 -_0811B2EC: - bl sub_811F5B0 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0 - beq _0811B324 - ldr r2, =gUnknown_0203A118 - ldr r3, [r2] - subs r0, 0x1 - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - movs r1, 0 - strb r0, [r3, 0xF] - ldr r0, [r2] - strb r1, [r0, 0xE] - ldr r0, [r2] - strb r1, [r0, 0x10] - ldr r0, [r2] - strb r1, [r0, 0x11] - ldr r1, [r2] - movs r0, 0x3 - strb r0, [r1, 0x4] - movs r0, 0xB - b _0811B326 - .pool -_0811B324: - movs r0, 0 -_0811B326: - pop {r1} - bx r1 - thumb_func_end sub_811B2B0 - - thumb_func_start sub_811B32C -sub_811B32C: @ 811B32C - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - movs r0, 0 - strb r0, [r1, 0x4] - movs r0, 0xA - bx lr - .pool - thumb_func_end sub_811B32C - - thumb_func_start sub_811B33C -sub_811B33C: @ 811B33C - push {lr} - ldr r1, =gUnknown_0203A118 - ldr r0, [r1] - movs r2, 0 - strb r2, [r0, 0xA] - ldr r0, [r1] - strb r2, [r0, 0xB] - ldr r0, [r1] - strb r2, [r0, 0xC] - ldr r1, [r1] - ldrb r0, [r1, 0x9] - cmp r0, 0 - bne _0811B360 - movs r0, 0x1 - strb r0, [r1, 0x9] - b _0811B362 - .pool -_0811B360: - strb r2, [r1, 0x9] -_0811B362: - movs r0, 0x17 - pop {r1} - bx r1 - thumb_func_end sub_811B33C - - thumb_func_start sub_811B368 -sub_811B368: @ 811B368 - push {lr} - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r0, [r0] - cmp r0, 0x6 - beq _0811B388 - ldr r0, =0x0000ffff - bl sub_811B488 - movs r0, 0x1 - b _0811B390 - .pool -_0811B388: - movs r0, 0x20 - bl PlaySE - movs r0, 0 -_0811B390: - pop {r1} - bx r1 - thumb_func_end sub_811B368 - - thumb_func_start sub_811B394 -sub_811B394: @ 811B394 - push {r4,r5,lr} - bl sub_811B940 - lsls r0, 16 - lsrs r0, 16 - bl sub_811F578 - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r4, 0 - bl sub_811BF88 - adds r5, r0, 0 - cmp r5, 0 - beq _0811B3BC - movs r0, 0x20 - bl PlaySE - movs r0, 0 - b _0811B3DC -_0811B3BC: - adds r0, r4, 0 - bl sub_811B488 - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - ldrb r0, [r1] - cmp r0, 0x6 - bne _0811B3D8 - movs r0, 0x9 - strb r0, [r1, 0x4] - movs r0, 0xD - b _0811B3DC - .pool -_0811B3D8: - strb r5, [r1, 0x4] - movs r0, 0xC -_0811B3DC: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_811B394 - - thumb_func_start sub_811B3E4 -sub_811B3E4: @ 811B3E4 - push {r4,r5,lr} - movs r4, 0 - ldr r3, =gUnknown_0203A118 - ldr r0, [r3] - ldrb r0, [r0, 0x7] - cmp r4, r0 - bge _0811B40E - adds r5, r3, 0 -_0811B3F4: - ldr r3, [r5] - ldr r1, [r3, 0x38] - lsls r2, r4, 1 - adds r1, r2, r1 - adds r0, r3, 0 - adds r0, 0x3C - adds r0, r2 - ldrh r0, [r0] - strh r0, [r1] - adds r4, 0x1 - ldrb r3, [r3, 0x7] - cmp r4, r3 - blt _0811B3F4 -_0811B40E: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811B3E4 - - thumb_func_start sub_811B418 -sub_811B418: @ 811B418 - push {r4,r5,lr} - movs r3, 0 - ldr r2, =gUnknown_0203A118 - ldr r0, [r2] - ldrb r0, [r0, 0x7] - cmp r3, r0 - bge _0811B444 - adds r5, r2, 0 - ldr r0, =0x0000ffff - adds r4, r0, 0 -_0811B42C: - ldr r2, [r5] - lsls r0, r3, 1 - adds r1, r2, 0 - adds r1, 0x3C - adds r1, r0 - ldrh r0, [r1] - orrs r0, r4 - strh r0, [r1] - adds r3, 0x1 - ldrb r2, [r2, 0x7] - cmp r3, r2 - blt _0811B42C -_0811B444: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811B418 - - thumb_func_start sub_811B454 -sub_811B454: @ 811B454 - push {r4,r5,lr} - movs r4, 0 - ldr r3, =gUnknown_0203A118 - ldr r0, [r3] - ldrb r0, [r0, 0x7] - cmp r4, r0 - bge _0811B47E - adds r5, r3, 0 -_0811B464: - ldr r3, [r5] - lsls r1, r4, 1 - adds r2, r3, 0 - adds r2, 0x3C - adds r2, r1 - ldr r0, [r3, 0x38] - adds r1, r0 - ldrh r0, [r1] - strh r0, [r2] - adds r4, 0x1 - ldrb r3, [r3, 0x7] - cmp r4, r3 - blt _0811B464 -_0811B47E: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811B454 - - thumb_func_start sub_811B488 -sub_811B488: @ 811B488 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - bl sub_811B8C8 - lsls r0, 16 - ldr r1, =gUnknown_0203A118 - ldr r1, [r1] - lsrs r0, 15 - adds r1, 0x3C - adds r1, r0 - strh r4, [r1] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811B488 - - thumb_func_start sub_811B4AC -sub_811B4AC: @ 811B4AC - push {r4,r5,lr} - movs r2, 0 - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r1, [r0, 0x7] - cmp r2, r1 - bcs _0811B4E2 - adds r5, r1, 0 - adds r4, r0, 0 - adds r4, 0x3C - ldr r3, [r0, 0x38] -_0811B4C2: - lsls r0, r2, 1 - adds r1, r4, r0 - adds r0, r3 - ldrh r1, [r1] - ldrh r0, [r0] - cmp r1, r0 - beq _0811B4D8 - movs r0, 0x1 - b _0811B4E4 - .pool -_0811B4D8: - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, r5 - bcc _0811B4C2 -_0811B4E2: - movs r0, 0 -_0811B4E4: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_811B4AC - - thumb_func_start sub_811B4EC -sub_811B4EC: @ 811B4EC - push {lr} - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r0, [r0] - subs r0, 0x11 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bhi _0811B51C - bl sub_811BD64 - cmp r0, 0 - bne _0811B50E - bl sub_811BDB0 - cmp r0, 0 - beq _0811B518 -_0811B50E: - movs r0, 0 - b _0811B524 - .pool -_0811B518: - movs r0, 0x1 - b _0811B524 -_0811B51C: - bl sub_811B4AC - lsls r0, 24 - lsrs r0, 24 -_0811B524: - pop {r1} - bx r1 - thumb_func_end sub_811B4EC - - thumb_func_start sub_811B528 -sub_811B528: @ 811B528 - push {lr} - adds r2, r0, 0 - ldr r0, =gUnknown_0203A118 - ldr r3, [r0] - movs r1, 0xA - ldrsb r1, [r3, r1] - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _0811B558 - ldrb r0, [r3, 0x9] - cmp r0, 0 - bne _0811B550 - adds r0, r2, 0 - bl sub_811B568 - b _0811B55E - .pool -_0811B550: - adds r0, r2, 0 - bl sub_811B634 - b _0811B55E -_0811B558: - adds r0, r2, 0 - bl sub_811B6C4 -_0811B55E: - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - thumb_func_end sub_811B528 - - thumb_func_start sub_811B568 -sub_811B568: @ 811B568 - push {r4,lr} - cmp r0, 0x1 - beq _0811B5DE - cmp r0, 0x1 - bcc _0811B5FE - cmp r0, 0x2 - beq _0811B57C - cmp r0, 0x3 - beq _0811B5A4 - b _0811B62A -_0811B57C: - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - movs r0, 0xB - ldrsb r0, [r1, r0] - ldrb r3, [r1, 0xC] - cmn r0, r3 - beq _0811B62A - ldrb r2, [r1, 0xB] - cmp r0, 0 - beq _0811B59C - subs r0, r2, 0x1 - strb r0, [r1, 0xB] -_0811B594: - movs r0, 0xF - b _0811B62C - .pool -_0811B59C: - subs r0, r3, 0x1 - strb r0, [r1, 0xC] - movs r0, 0x11 - b _0811B62C -_0811B5A4: - ldr r0, =gUnknown_0203A118 - ldr r2, [r0] - movs r1, 0xB - ldrsb r1, [r2, r1] - ldrb r3, [r2, 0xC] - adds r1, r3 - ldrb r0, [r2, 0xD] - subs r0, 0x1 - cmp r1, r0 - bge _0811B62A - ldrb r1, [r2, 0xB] - movs r0, 0xB - ldrsb r0, [r2, r0] - cmp r0, 0x2 - bgt _0811B5D0 - adds r0, r1, 0x1 - strb r0, [r2, 0xB] - movs r4, 0xF - b _0811B5D6 - .pool -_0811B5D0: - adds r0, r3, 0x1 - strb r0, [r2, 0xC] - movs r4, 0x10 -_0811B5D6: - bl sub_811B978 - adds r0, r4, 0 - b _0811B62C -_0811B5DE: - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - ldrb r2, [r1, 0xA] - movs r0, 0xA - ldrsb r0, [r1, r0] - cmp r0, 0 - beq _0811B5F8 - subs r0, r2, 0x1 - strb r0, [r1, 0xA] - b _0811B594 - .pool -_0811B5F8: - bl sub_811B744 - b _0811B594 -_0811B5FE: - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - ldrb r2, [r1, 0xA] - movs r0, 0xA - ldrsb r0, [r1, r0] - cmp r0, 0 - bgt _0811B624 - adds r0, r2, 0x1 - strb r0, [r1, 0xA] - bl sub_811B9C8 - lsls r0, 24 - cmp r0, 0 - beq _0811B594 - bl sub_811B744 - b _0811B594 - .pool -_0811B624: - bl sub_811B744 - b _0811B594 -_0811B62A: - movs r0, 0 -_0811B62C: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811B568 - - thumb_func_start sub_811B634 -sub_811B634: @ 811B634 - push {lr} - cmp r0, 0x1 - beq _0811B6A0 - cmp r0, 0x1 - bcc _0811B684 - cmp r0, 0x2 - beq _0811B64A - cmp r0, 0x3 - beq _0811B66A - movs r0, 0 - b _0811B6BC -_0811B64A: - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - ldrb r2, [r1, 0xB] - movs r0, 0xB - ldrsb r0, [r1, r0] - cmp r0, 0 - ble _0811B660 - subs r0, r2, 0x1 - b _0811B662 - .pool -_0811B660: - movs r0, 0x3 -_0811B662: - strb r0, [r1, 0xB] - bl sub_811B978 - b _0811B6BA -_0811B66A: - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - ldrb r2, [r1, 0xB] - movs r0, 0xB - ldrsb r0, [r1, r0] - cmp r0, 0x2 - bgt _0811B680 - adds r0, r2, 0x1 - b _0811B662 - .pool -_0811B680: - movs r0, 0 - b _0811B662 -_0811B684: - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - ldrb r0, [r1, 0xA] - adds r0, 0x1 - strb r0, [r1, 0xA] - bl sub_811B9C8 - lsls r0, 24 - cmp r0, 0 - beq _0811B6BA - b _0811B6B6 - .pool -_0811B6A0: - ldr r2, =gUnknown_0203A118 - ldr r1, [r2] - ldrb r0, [r1, 0xA] - subs r0, 0x1 - strb r0, [r1, 0xA] - ldr r0, [r2] - ldrb r0, [r0, 0xA] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - bge _0811B6BA -_0811B6B6: - bl sub_811B744 -_0811B6BA: - movs r0, 0xF -_0811B6BC: - pop {r1} - bx r1 - .pool - thumb_func_end sub_811B634 - - thumb_func_start sub_811B6C4 -sub_811B6C4: @ 811B6C4 - push {lr} - adds r2, r0, 0 - cmp r2, 0x1 - beq _0811B714 - cmp r2, 0x1 - bcc _0811B728 - cmp r2, 0x2 - beq _0811B6DC - cmp r2, 0x3 - beq _0811B6F8 - movs r0, 0 - b _0811B73A -_0811B6DC: - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - ldrb r3, [r1, 0xB] - movs r0, 0xB - ldrsb r0, [r1, r0] - cmp r0, 0 - beq _0811B6F4 - subs r0, r3, 0x1 - b _0811B736 - .pool -_0811B6F4: - strb r2, [r1, 0xB] - b _0811B738 -_0811B6F8: - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - ldrb r2, [r1, 0xB] - movs r0, 0xB - ldrsb r0, [r1, r0] - cmp r0, 0x1 - bgt _0811B710 - adds r0, r2, 0x1 - b _0811B736 - .pool -_0811B710: - movs r0, 0 - b _0811B736 -_0811B714: - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - ldrb r0, [r1, 0xB] - adds r0, 0x1 - strb r0, [r1, 0xB] - bl sub_811B768 - b _0811B738 - .pool -_0811B728: - ldr r2, =gUnknown_0203A118 - ldr r1, [r2] - movs r0, 0 - strb r0, [r1, 0xA] - ldr r1, [r2] - ldrb r0, [r1, 0xB] - adds r0, 0x1 -_0811B736: - strb r0, [r1, 0xB] -_0811B738: - movs r0, 0xF -_0811B73A: - pop {r1} - bx r1 - .pool - thumb_func_end sub_811B6C4 - - thumb_func_start sub_811B744 -sub_811B744: @ 811B744 - push {lr} - ldr r2, =gUnknown_0203A118 - ldr r1, [r2] - movs r0, 0xFF - strb r0, [r1, 0xA] - ldr r2, [r2] - ldrb r1, [r2, 0xB] - movs r0, 0xB - ldrsb r0, [r2, r0] - cmp r0, 0 - beq _0811B75E - subs r0, r1, 0x1 - strb r0, [r2, 0xB] -_0811B75E: - pop {r0} - bx r0 - .pool - thumb_func_end sub_811B744 - - thumb_func_start sub_811B768 -sub_811B768: @ 811B768 - push {r4,lr} - ldr r4, =gUnknown_0203A118 - ldr r1, [r4] - ldrb r0, [r1, 0x9] - cmp r0, 0 - bne _0811B784 - movs r0, 0x1 - strb r0, [r1, 0xA] - bl sub_811B978 - b _0811B78E - .pool -_0811B784: - ldrb r0, [r1, 0xB] - bl sub_811B960 - ldr r1, [r4] - strb r0, [r1, 0xA] -_0811B78E: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_811B768 - - thumb_func_start sub_811B794 -sub_811B794: @ 811B794 - push {r4,lr} - cmp r0, 0x5 - bls _0811B79C - b _0811B8C0 -_0811B79C: - lsls r0, 2 - ldr r1, =_0811B7AC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0811B7AC: - .4byte _0811B848 - .4byte _0811B826 - .4byte _0811B7C4 - .4byte _0811B7F0 - .4byte _0811B870 - .4byte _0811B890 -_0811B7C4: - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - movs r0, 0x11 - ldrsb r0, [r1, r0] - ldrb r3, [r1, 0xE] - adds r0, r3 - cmp r0, 0 - bgt _0811B7D6 - b _0811B8C0 -_0811B7D6: - ldrb r2, [r1, 0x11] - movs r0, 0x11 - ldrsb r0, [r1, r0] - cmp r0, 0 - ble _0811B7E8 - subs r0, r2, 0x1 - b _0811B80E - .pool -_0811B7E8: - subs r0, r3, 0x1 - strb r0, [r1, 0xE] - movs r4, 0x13 - b _0811B81E -_0811B7F0: - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - movs r0, 0x11 - ldrsb r0, [r1, r0] - ldrb r3, [r1, 0xE] - adds r0, r3 - ldrb r2, [r1, 0xF] - cmp r0, r2 - bge _0811B8C0 - ldrb r2, [r1, 0x11] - movs r0, 0x11 - ldrsb r0, [r1, r0] - cmp r0, 0x2 - bgt _0811B818 - adds r0, r2, 0x1 -_0811B80E: - strb r0, [r1, 0x11] - movs r4, 0x12 - b _0811B81E - .pool -_0811B818: - adds r0, r3, 0x1 - strb r0, [r1, 0xE] - movs r4, 0x14 -_0811B81E: - bl sub_811B9A0 - adds r0, r4, 0 - b _0811B8C2 -_0811B826: - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - ldrb r2, [r1, 0x10] - movs r0, 0x10 - ldrsb r0, [r1, r0] - cmp r0, 0 - ble _0811B83C - subs r0, r2, 0x1 - b _0811B83E - .pool -_0811B83C: - movs r0, 0x1 -_0811B83E: - strb r0, [r1, 0x10] - bl sub_811B9A0 -_0811B844: - movs r0, 0x12 - b _0811B8C2 -_0811B848: - ldr r4, =gUnknown_0203A118 - ldr r1, [r4] - ldrb r2, [r1, 0x10] - movs r0, 0x10 - ldrsb r0, [r1, r0] - cmp r0, 0 - bgt _0811B866 - adds r0, r2, 0x1 - strb r0, [r1, 0x10] - bl sub_811BA1C - lsls r0, 24 - cmp r0, 0 - beq _0811B844 - ldr r1, [r4] -_0811B866: - movs r0, 0 - strb r0, [r1, 0x10] - b _0811B844 - .pool -_0811B870: - ldr r0, =gUnknown_0203A118 - ldr r2, [r0] - ldrb r0, [r2, 0xE] - adds r1, r0, 0 - cmp r1, 0 - beq _0811B8C0 - cmp r1, 0x3 - bls _0811B888 - subs r0, 0x4 - b _0811B88A - .pool -_0811B888: - movs r0, 0 -_0811B88A: - strb r0, [r2, 0xE] - movs r0, 0x15 - b _0811B8C2 -_0811B890: - ldr r3, =gUnknown_0203A118 - ldr r1, [r3] - ldrb r2, [r1, 0xE] - ldrb r0, [r1, 0xF] - subs r0, 0x4 - cmp r2, r0 - bgt _0811B8C0 - adds r0, r2, 0x4 - strb r0, [r1, 0xE] - ldr r2, [r3] - ldrb r1, [r2, 0xE] - ldrb r3, [r2, 0xF] - subs r0, r3, 0x3 - cmp r1, r0 - ble _0811B8B4 - adds r0, r3, 0 - adds r0, 0xFD - strb r0, [r2, 0xE] -_0811B8B4: - bl sub_811B9A0 - movs r0, 0x16 - b _0811B8C2 - .pool -_0811B8C0: - movs r0, 0 -_0811B8C2: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811B794 - - thumb_func_start sub_811B8C8 -sub_811B8C8: @ 811B8C8 - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - movs r2, 0x6 - ldrsb r2, [r0, r2] - ldrb r1, [r0, 0x2] - muls r1, r2 - ldrb r0, [r0, 0x5] - lsls r0, 24 - asrs r0, 24 - adds r0, r1 - lsls r0, 16 - lsrs r0, 16 - bx lr - .pool - thumb_func_end sub_811B8C8 - - thumb_func_start sub_811B8E8 -sub_811B8E8: @ 811B8E8 - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - movs r1, 0xB - ldrsb r1, [r0, r1] - ldrb r2, [r0, 0xC] - adds r1, r2 - lsls r1, 1 - ldrb r0, [r0, 0xA] - lsls r0, 24 - asrs r0, 24 - adds r0, r1 - lsls r0, 16 - lsrs r0, 16 - bx lr - .pool - thumb_func_end sub_811B8E8 - - thumb_func_start sub_811B908 -sub_811B908: @ 811B908 - push {lr} - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - ldrb r0, [r1, 0xA] - movs r3, 0 - cmp r0, 0x6 - bhi _0811B91A - movs r3, 0xA - ldrsb r3, [r1, r3] -_0811B91A: - ldrb r0, [r1, 0xB] - movs r2, 0 - cmp r0, 0x3 - bhi _0811B926 - movs r2, 0xB - ldrsb r2, [r1, r2] -_0811B926: - ldr r0, =gUnknown_08597748 - lsls r1, r2, 3 - subs r1, r2 - adds r1, r3, r1 - adds r1, r0 - ldrb r0, [r1] - pop {r1} - bx r1 - .pool - thumb_func_end sub_811B908 - - thumb_func_start sub_811B940 -sub_811B940: @ 811B940 - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - movs r1, 0x11 - ldrsb r1, [r0, r1] - ldrb r2, [r0, 0xE] - adds r1, r2 - lsls r1, 1 - ldrb r0, [r0, 0x10] - lsls r0, 24 - asrs r0, 24 - adds r0, r1 - lsls r0, 16 - lsrs r0, 16 - bx lr - .pool - thumb_func_end sub_811B940 - - thumb_func_start sub_811B960 -sub_811B960: @ 811B960 - push {lr} - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - beq _0811B96E - cmp r0, 0x1 - beq _0811B972 -_0811B96E: - movs r0, 0x6 - b _0811B974 -_0811B972: - movs r0, 0x5 -_0811B974: - pop {r1} - bx r1 - thumb_func_end sub_811B960 - - thumb_func_start sub_811B978 -sub_811B978: @ 811B978 - push {lr} - b _0811B98E -_0811B97C: - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - ldrb r2, [r1, 0xA] - movs r0, 0xA - ldrsb r0, [r1, r0] - cmp r0, 0 - beq _0811B998 - subs r0, r2, 0x1 - strb r0, [r1, 0xA] -_0811B98E: - bl sub_811B9C8 - lsls r0, 24 - cmp r0, 0 - bne _0811B97C -_0811B998: - pop {r0} - bx r0 - .pool - thumb_func_end sub_811B978 - - thumb_func_start sub_811B9A0 -sub_811B9A0: @ 811B9A0 - push {lr} - b _0811B9B6 -_0811B9A4: - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - ldrb r2, [r1, 0x10] - movs r0, 0x10 - ldrsb r0, [r1, r0] - cmp r0, 0 - beq _0811B9C0 - subs r0, r2, 0x1 - strb r0, [r1, 0x10] -_0811B9B6: - bl sub_811BA1C - lsls r0, 24 - cmp r0, 0 - bne _0811B9A4 -_0811B9C0: - pop {r0} - bx r0 - .pool - thumb_func_end sub_811B9A0 - - thumb_func_start sub_811B9C8 -sub_811B9C8: @ 811B9C8 - push {r4,lr} - ldr r4, =gUnknown_0203A118 - ldr r1, [r4] - ldrb r0, [r1, 0x9] - cmp r0, 0 - bne _0811B9F8 - bl sub_811B8E8 - adds r4, r0, 0 - bl sub_811F3AC - movs r1, 0 - lsls r0, 24 - lsls r4, 16 - lsrs r4, 16 - lsrs r0, 24 - cmp r4, r0 - bcc _0811B9EE - movs r1, 0x1 -_0811B9EE: - adds r0, r1, 0 - b _0811BA14 - .pool -_0811B9F8: - ldrb r0, [r1, 0xB] - bl sub_811B960 - movs r2, 0 - ldr r1, [r4] - ldrb r1, [r1, 0xA] - lsls r1, 24 - asrs r1, 24 - lsls r0, 24 - lsrs r0, 24 - cmp r1, r0 - ble _0811BA12 - movs r2, 0x1 -_0811BA12: - adds r0, r2, 0 -_0811BA14: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811B9C8 - - thumb_func_start sub_811BA1C -sub_811BA1C: @ 811BA1C - push {r4,lr} - bl sub_811B940 - adds r4, r0, 0 - bl sub_811F5B0 - movs r1, 0 - lsls r4, 16 - lsls r0, 16 - cmp r4, r0 - bcc _0811BA34 - movs r1, 0x1 -_0811BA34: - adds r0, r1, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811BA1C - - thumb_func_start sub_811BA3C -sub_811BA3C: @ 811BA3C - ldr r2, =gUnknown_08597550 - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r1, [r0, 0x1] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldrb r0, [r0, 0x3] - lsrs r0, 7 - bx lr - .pool - thumb_func_end sub_811BA3C - - thumb_func_start sub_811BA5C -sub_811BA5C: @ 811BA5C - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r0, [r0] - bx lr - .pool - thumb_func_end sub_811BA5C - - thumb_func_start sub_811BA68 -sub_811BA68: @ 811BA68 - ldr r2, =gUnknown_08597550 - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r1, [r0, 0x1] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldrb r0, [r0, 0x3] - lsls r0, 25 - lsrs r0, 25 - bx lr - .pool - thumb_func_end sub_811BA68 - - thumb_func_start sub_811BA88 -sub_811BA88: @ 811BA88 - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldr r0, [r0, 0x34] - bx lr - .pool - thumb_func_end sub_811BA88 - - thumb_func_start sub_811BA94 -sub_811BA94: @ 811BA94 - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - adds r0, 0x3C - bx lr - .pool - thumb_func_end sub_811BA94 - - thumb_func_start sub_811BAA0 -sub_811BAA0: @ 811BAA0 - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r0, [r0, 0x3] - bx lr - .pool - thumb_func_end sub_811BAA0 - - thumb_func_start sub_811BAAC -sub_811BAAC: @ 811BAAC - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r0, [r0, 0x2] - bx lr - .pool - thumb_func_end sub_811BAAC - - thumb_func_start sub_811BAB8 -sub_811BAB8: @ 811BAB8 - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r0, [r0, 0x5] - bx lr - .pool - thumb_func_end sub_811BAB8 - - thumb_func_start sub_811BAC4 -sub_811BAC4: @ 811BAC4 - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r0, [r0, 0x6] - bx lr - .pool - thumb_func_end sub_811BAC4 - - thumb_func_start sub_811BAD0 -sub_811BAD0: @ 811BAD0 - push {r4,r5,lr} - ldr r4, =gUnknown_08597550 - ldr r2, =gUnknown_0203A118 - ldr r5, [r2] - ldrb r3, [r5, 0x1] - lsls r2, r3, 1 - adds r2, r3 - lsls r2, 3 - adds r3, r4, 0 - adds r3, 0x8 - adds r2, r3 - ldr r2, [r2] - str r2, [r0] - ldrb r2, [r5, 0x1] - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 3 - adds r4, 0xC - adds r0, r4 - ldr r0, [r0] - str r0, [r1] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811BAD0 - - thumb_func_start sub_811BB08 -sub_811BB08: @ 811BB08 - push {r4,r5,lr} - ldr r4, =gUnknown_08597550 - ldr r2, =gUnknown_0203A118 - ldr r5, [r2] - ldrb r3, [r5, 0x1] - lsls r2, r3, 1 - adds r2, r3 - lsls r2, 3 - adds r3, r4, 0 - adds r3, 0x10 - adds r2, r3 - ldr r2, [r2] - str r2, [r0] - ldrb r2, [r5, 0x1] - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 3 - adds r4, 0x14 - adds r0, r4 - ldr r0, [r0] - str r0, [r1] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811BB08 - - thumb_func_start sub_811BB40 -sub_811BB40: @ 811BB40 - push {lr} - adds r2, r0, 0 - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r0, [r0] - cmp r0, 0x4 - bne _0811BB5C - ldr r0, =gText_StopGivingPkmnMail - b _0811BB7A - .pool -_0811BB5C: - cmp r0, 0x4 - blt _0811BB78 - cmp r0, 0x10 - bgt _0811BB78 - cmp r0, 0xF - blt _0811BB78 - ldr r0, =gText_LikeToQuitQuiz - str r0, [r2] - ldr r0, =gText_ChallengeQuestionMark - b _0811BB7E - .pool -_0811BB78: - ldr r0, =gText_QuitEditing -_0811BB7A: - str r0, [r2] - movs r0, 0 -_0811BB7E: - str r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end sub_811BB40 - - thumb_func_start sub_811BB88 -sub_811BB88: @ 811BB88 - ldr r2, =gText_AllTextBeingEditedWill - str r2, [r0] - ldr r0, =gText_BeDeletedThatOkay - str r0, [r1] - bx lr - .pool - thumb_func_end sub_811BB88 - - thumb_func_start sub_811BB9C -sub_811BB9C: @ 811BB9C - ldr r2, =gUnknown_0203A118 - ldr r3, [r2] - ldrb r2, [r3, 0xA] - strb r2, [r0] - ldrb r0, [r3, 0xB] - strb r0, [r1] - bx lr - .pool - thumb_func_end sub_811BB9C - - thumb_func_start sub_811BBB0 -sub_811BBB0: @ 811BBB0 - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r0, [r0, 0x9] - bx lr - .pool - thumb_func_end sub_811BBB0 - - thumb_func_start sub_811BBBC -sub_811BBBC: @ 811BBBC - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r0, [r0, 0xC] - bx lr - .pool - thumb_func_end sub_811BBBC - - thumb_func_start sub_811BBC8 -sub_811BBC8: @ 811BBC8 - ldr r2, =gUnknown_0203A118 - ldr r3, [r2] - ldrb r2, [r3, 0x10] - strb r2, [r0] - ldrb r0, [r3, 0x11] - strb r0, [r1] - bx lr - .pool - thumb_func_end sub_811BBC8 - - thumb_func_start sub_811BBDC -sub_811BBDC: @ 811BBDC - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r0, [r0, 0xE] - bx lr - .pool - thumb_func_end sub_811BBDC - - thumb_func_start sub_811BBE8 -sub_811BBE8: @ 811BBE8 - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r0, [r0, 0xF] - bx lr - .pool - thumb_func_end sub_811BBE8 - - thumb_func_start sub_811BBF4 -sub_811BBF4: @ 811BBF4 - movs r0, 0 - bx lr - thumb_func_end sub_811BBF4 - - thumb_func_start sub_811BBF8 -sub_811BBF8: @ 811BBF8 - push {lr} - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - ldrb r0, [r1, 0x4] - cmp r0, 0x2 - beq _0811BC10 - cmp r0, 0x3 - beq _0811BC1A - b _0811BC24 - .pool -_0811BC10: - ldrb r0, [r1, 0x9] - cmp r0, 0 - bne _0811BC24 - ldrb r0, [r1, 0xC] - b _0811BC1C -_0811BC1A: - ldrb r0, [r1, 0xE] -_0811BC1C: - cmp r0, 0 - beq _0811BC24 - movs r0, 0x1 - b _0811BC26 -_0811BC24: - movs r0, 0 -_0811BC26: - pop {r1} - bx r1 - thumb_func_end sub_811BBF8 - - thumb_func_start sub_811BC2C -sub_811BC2C: @ 811BC2C - push {lr} - ldr r0, =gUnknown_0203A118 - ldr r2, [r0] - ldrb r0, [r2, 0x4] - cmp r0, 0x2 - beq _0811BC44 - cmp r0, 0x3 - beq _0811BC5A - b _0811BC68 - .pool -_0811BC44: - ldrb r0, [r2, 0x9] - cmp r0, 0 - bne _0811BC68 - ldrb r1, [r2, 0xC] - adds r1, 0x4 - ldrb r0, [r2, 0xD] - subs r0, 0x1 - cmp r1, r0 - bgt _0811BC68 - movs r0, 0x1 - b _0811BC6A -_0811BC5A: - ldrb r0, [r2, 0xE] - adds r0, 0x4 - ldrb r2, [r2, 0xF] - cmp r0, r2 - bgt _0811BC68 - movs r0, 0x1 - b _0811BC6A -_0811BC68: - movs r0, 0 -_0811BC6A: - pop {r1} - bx r1 - thumb_func_end sub_811BC2C - - thumb_func_start sub_811BC70 -sub_811BC70: @ 811BC70 - push {lr} - bl sub_811BA3C - pop {r1} - bx r1 - thumb_func_end sub_811BC70 - - thumb_func_start sub_811BC7C -sub_811BC7C: @ 811BC7C - push {r4,r5,lr} - adds r5, r0, 0 - lsls r1, 24 - lsrs r3, r1, 24 - movs r2, 0 - cmp r2, r3 - bcs _0811BCB2 - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - adds r4, r0, 0 - adds r4, 0x3C -_0811BC92: - lsls r0, r2, 1 - adds r1, r0, r5 - adds r0, r4, r0 - ldrh r1, [r1] - ldrh r0, [r0] - cmp r1, r0 - beq _0811BCA8 - movs r0, 0x1 - b _0811BCB4 - .pool -_0811BCA8: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, r3 - bcc _0811BC92 -_0811BCB2: - movs r0, 0 -_0811BCB4: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_811BC7C - - thumb_func_start sub_811BCBC -sub_811BCBC: @ 811BCBC - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r0, [r0, 0x12] - bx lr - .pool - thumb_func_end sub_811BCBC - - thumb_func_start sub_811BCC8 -sub_811BCC8: @ 811BCC8 - push {lr} - lsls r0, 24 - lsrs r3, r0, 24 - movs r1, 0 - ldr r2, =gUnknown_08597550 -_0811BCD2: - ldrb r0, [r2] - cmp r0, r3 - bne _0811BCE4 - lsls r0, r1, 24 - lsrs r0, 24 - b _0811BCEE - .pool -_0811BCE4: - adds r2, 0x18 - adds r1, 0x1 - cmp r1, 0x14 - bls _0811BCD2 - movs r0, 0 -_0811BCEE: - pop {r1} - bx r1 - thumb_func_end sub_811BCC8 - - thumb_func_start sub_811BCF4 -sub_811BCF4: @ 811BCF4 - push {r4,lr} - movs r2, 0 - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r1, [r0, 0x7] - cmp r2, r1 - bge _0811BD24 - ldr r4, =0x0000ffff - adds r3, r1, 0 - adds r1, r0, 0 - adds r1, 0x3C -_0811BD0A: - ldrh r0, [r1] - cmp r0, r4 - beq _0811BD1C - movs r0, 0 - b _0811BD26 - .pool -_0811BD1C: - adds r1, 0x2 - adds r2, 0x1 - cmp r2, r3 - blt _0811BD0A -_0811BD24: - movs r0, 0x1 -_0811BD26: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811BCF4 - - thumb_func_start sub_811BD2C -sub_811BD2C: @ 811BD2C - push {r4,lr} - movs r2, 0 - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r1, [r0, 0x7] - cmp r2, r1 - bge _0811BD5C - ldr r4, =0x0000ffff - adds r3, r1, 0 - adds r1, r0, 0 - adds r1, 0x3C -_0811BD42: - ldrh r0, [r1] - cmp r0, r4 - bne _0811BD54 - movs r0, 0 - b _0811BD5E - .pool -_0811BD54: - adds r1, 0x2 - adds r2, 0x1 - cmp r2, r3 - blt _0811BD42 -_0811BD5C: - movs r0, 0x1 -_0811BD5E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811BD2C - - thumb_func_start sub_811BD64 -sub_811BD64: @ 811BD64 - push {r4,lr} - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r0, [r0] - cmp r0, 0x11 - bne _0811BD80 - bl sub_811BCF4 - b _0811BD9C - .pool -_0811BD7C: - movs r0, 0 - b _0811BD9C -_0811BD80: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - movs r2, 0 - ldr r3, =0x0000ffff - ldr r4, =0x00003b5a - adds r1, r0, r4 -_0811BD8C: - ldrh r0, [r1] - cmp r0, r3 - bne _0811BD7C - adds r1, 0x2 - adds r2, 0x1 - cmp r2, 0x8 - ble _0811BD8C - movs r0, 0x1 -_0811BD9C: - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811BD64 - - thumb_func_start sub_811BDB0 -sub_811BDB0: @ 811BDB0 - push {lr} - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - ldrb r0, [r0] - cmp r0, 0x12 - bne _0811BDC8 - bl sub_811BCF4 - b _0811BDDE - .pool -_0811BDC8: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003b58 - adds r0, r1 - movs r2, 0 - ldrh r1, [r0, 0x14] - ldr r0, =0x0000ffff - cmp r1, r0 - bne _0811BDDC - movs r2, 0x1 -_0811BDDC: - adds r0, r2, 0 -_0811BDDE: - pop {r1} - bx r1 - .pool - thumb_func_end sub_811BDB0 - - thumb_func_start sub_811BDF0 -sub_811BDF0: @ 811BDF0 - push {r4-r6,lr} - sub sp, 0x20 - adds r6, r0, 0 - ldr r0, =gSaveBlock1Ptr - ldr r4, [r0] - bl DynamicPlaceholderTextUtil_Reset - ldr r0, =0x00003b70 - adds r5, r4, r0 - adds r0, r5, 0 - bl StringLength - lsls r0, 16 - cmp r0, 0 - beq _0811BE34 - ldr r1, =0x00003b85 - adds r0, r4, r1 - ldrb r2, [r0] - mov r0, sp - adds r1, r5, 0 - bl TVShowConvertInternationalString - movs r0, 0 - mov r1, sp - bl DynamicPlaceholderTextUtil_SetPlaceholderPtr - b _0811BE3C - .pool -_0811BE34: - ldr r1, =gText_Lady - movs r0, 0 - bl DynamicPlaceholderTextUtil_SetPlaceholderPtr -_0811BE3C: - ldr r1, =gText_F700sQuiz - adds r0, r6, 0 - bl DynamicPlaceholderTextUtil_ExpandPlaceholders - add sp, 0x20 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811BDF0 - - thumb_func_start sub_811BE54 -sub_811BE54: @ 811BE54 - push {r4,r5,lr} - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] - adds r4, r0, 0 - adds r4, 0x3C - ldr r2, =gStringVar2 - movs r5, 0 - b _0811BE86 - .pool -_0811BE6C: - ldrh r1, [r4] - adds r0, r2, 0 - movs r2, 0 - bl CopyEasyChatWordPadded - adds r2, r0, 0 - movs r0, 0 - strb r0, [r2] - adds r2, 0x1 - adds r4, 0x2 - adds r5, 0x1 - ldr r0, =gUnknown_0203A118 - ldr r0, [r0] -_0811BE86: - ldrb r0, [r0, 0x7] - cmp r5, r0 - blt _0811BE6C - subs r2, 0x1 - movs r0, 0xFF - strb r0, [r2] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811BE54 - - thumb_func_start sub_811BE9C -sub_811BE9C: @ 811BE9C - push {r4,r5,lr} - ldr r5, =gUnknown_0203A118 - ldr r0, [r5] - ldrb r0, [r0] - cmp r0, 0x9 - beq _0811BEF0 - cmp r0, 0x9 - bgt _0811BEB8 - cmp r0, 0 - beq _0811BEC2 - b _0811BF14 - .pool -_0811BEB8: - cmp r0, 0xD - beq _0811BF0C - cmp r0, 0x14 - beq _0811BED0 - b _0811BF14 -_0811BEC2: - ldr r0, =0x00000865 - bl FlagSet - b _0811BF14 - .pool -_0811BED0: - bl sub_811BF20 - adds r1, r0, 0 - cmp r1, 0 - beq _0811BEE4 - ldr r1, =gSpecialVar_0x8004 - movs r0, 0x2 - b _0811BF12 - .pool -_0811BEE4: - ldr r0, =gSpecialVar_0x8004 - strh r1, [r0] - b _0811BF14 - .pool -_0811BEF0: - bl sub_811BE54 - ldr r4, =gSpecialVar_0x8004 - ldr r0, [r5] - adds r0, 0x3C - bl sub_81226D8 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4] - b _0811BF14 - .pool -_0811BF0C: - bl sub_811BF40 - ldr r1, =gSpecialVar_0x8004 -_0811BF12: - strh r0, [r1] -_0811BF14: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811BE9C - - thumb_func_start sub_811BF20 -sub_811BF20: @ 811BF20 - push {lr} - ldr r0, =gUnknown_08597764 - movs r1, 0x4 - bl sub_811BC7C - movs r1, 0 - lsls r0, 24 - cmp r0, 0 - bne _0811BF34 - movs r1, 0x1 -_0811BF34: - adds r0, r1, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_811BF20 - - thumb_func_start sub_811BF40 -sub_811BF40: @ 811BF40 - push {r4,r5,lr} - movs r4, 0 - movs r5, 0x80 - lsls r5, 9 -_0811BF48: - lsls r0, r4, 2 - ldr r1, =gUnknown_0859776C - adds r0, r1 - movs r1, 0x2 - bl sub_811BC7C - lsls r0, 24 - cmp r0, 0 - bne _0811BF64 - lsrs r0, r5, 16 - b _0811BF72 - .pool -_0811BF64: - movs r0, 0x80 - lsls r0, 9 - adds r5, r0 - adds r4, 0x1 - cmp r4, 0x4 - ble _0811BF48 - movs r0, 0 -_0811BF72: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_811BF40 - - thumb_func_start sub_811BF78 -sub_811BF78: @ 811BF78 - ldr r0, =gUnknown_0203A118 - ldr r1, [r0] - movs r0, 0 - strb r0, [r1, 0x13] - bx lr - .pool - thumb_func_end sub_811BF78 - - thumb_func_start sub_811BF88 -sub_811BF88: @ 811BF88 - movs r0, 0 - bx lr - thumb_func_end sub_811BF88 - - thumb_func_start sub_811BF8C -sub_811BF8C: @ 811BF8C - push {lr} - bl sub_811CE94 - lsls r0, 24 - cmp r0, 0 - beq _0811BF9C - movs r0, 0x1 - b _0811BF9E -_0811BF9C: - movs r0, 0 -_0811BF9E: - pop {r1} - bx r1 - thumb_func_end sub_811BF8C - thumb_func_start sub_811BFA4 sub_811BFA4: @ 811BFA4 push {r4,lr} diff --git a/data/easy_chat.s b/data/easy_chat.s index ce416dfbc9..4725f15d9d 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -17,7 +17,7 @@ gUnknown_08597530:: @ 8597530 .4byte 0x0000001b .4byte sub_811A938 -gUnknown_08597550:: @ 8597550 +gEasyChatScreenTemplates:: @ 8597550 .byte 0x00, 0x02, 0x02, 0x00 .align 2 @@ -208,13 +208,20 @@ gUnknown_08597550:: @ 8597550 .4byte gText_IsAsShownOkay gUnknown_08597748:: @ 8597748 - .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a + .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00 + .byte 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00 + .byte 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13 + .byte 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a gUnknown_08597764:: @ 8597764 .2byte 0x0209, 0x140b, 0x1030, 0x102a gUnknown_0859776C:: @ 859776C - .2byte 0x1240, 0x0628, 0x061f, 0x2204, 0x1422, 0x0197, 0x0415, 0x0198, 0x2207, 0x0449 + .2byte 0x1240, 0x0628 + .2byte 0x061f, 0x2204 + .2byte 0x1422, 0x0197 + .2byte 0x0415, 0x0198 + .2byte 0x2207, 0x0449 .align 2 gUnknown_08597780:: @ 8597780 diff --git a/include/dewford_trend.h b/include/dewford_trend.h index dac5ea6c97..608a925f57 100644 --- a/include/dewford_trend.h +++ b/include/dewford_trend.h @@ -4,5 +4,6 @@ void InitDewfordTrend(void); void UpdateDewfordTrendPerDay(u16); void UpdateDewfordTrendPerDay(u16 days); +bool8 sub_81226D8(u16 *a); #endif // GUARD_DEWFORDTREND_H diff --git a/include/strings.h b/include/strings.h index 3acbc1c553..af16251400 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2413,5 +2413,14 @@ extern const u8 gUnknown_085EDC45[]; extern const u8 gUnknown_085EDB00[]; extern const u8 gUnknown_085EDC84[]; +// Easy Chat Entry +extern const u8 gText_StopGivingPkmnMail[]; +extern const u8 gText_LikeToQuitQuiz[]; +extern const u8 gText_ChallengeQuestionMark[]; +extern const u8 gText_QuitEditing[]; +extern const u8 gText_AllTextBeingEditedWill[]; +extern const u8 gText_BeDeletedThatOkay[]; +extern const u8 gText_Lady[]; +extern const u8 gText_F700sQuiz[]; #endif // GUARD_STRINGS_H diff --git a/src/easy_chat.c b/src/easy_chat.c index 7158253d1d..5f5d20e166 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -2,20 +2,24 @@ // Includes #include "global.h" #include "alloc.h" -#include "constants/songs.h" -#include "sound.h" -#include "overworld.h" -#include "task.h" -#include "main.h" -#include "link.h" -#include "field_weather.h" -#include "window.h" -#include "palette.h" -#include "event_data.h" +#include "dewford_trend.h" +#include "dynamic_placeholder_text_util.h" #include "easy_chat.h" +#include "event_data.h" +#include "field_weather.h" +#include "international_string_util.h" +#include "link.h" +#include "main.h" +#include "menu.h" +#include "overworld.h" +#include "palette.h" +#include "sound.h" #include "string_util.h" - -// Static type declarations +#include "strings.h" +#include "task.h" +#include "window.h" +#include "constants/flags.h" +#include "constants/songs.h" #define EZCHAT_TASK_STATE 0 #define EZCHAT_TASK_KIND 1 @@ -24,38 +28,52 @@ #define EZCHAT_TASK_UNK06 6 #define EZCHAT_TASK_SIZE 7 -// Static RAM declarations - -EWRAM_DATA struct +struct EasyChatScreenTemplate { - u8 kind; - u8 unk_01; - u8 unk_02; - u8 unk_03; - u8 unk_04; - s8 unk_05; - s8 unk_06; - u8 unk_07; - u8 unk_08; - u8 unk_09; - u8 unk_0a; - u8 unk_0b; - u8 unk_0c; - u8 unk_0d; - u8 unk_0e[0x4]; - u8 sizeParam; - u8 unk_13; - u8 unk_14[0x20]; - const u8 *src; - const u16 *words; - u16 ecWordBuffer[9]; -} *gUnknown_0203A118 = NULL; + u8 unk_00; + u8 numColumns; + u8 numRows; + u8 unk_03_0:7; + u8 unk_03_7:1; + const u8 *titleText; + const u8 *instructionsText1; + const u8 *instructionsText2; + const u8 *confirmText1; + const u8 *confirmText2; +}; +struct EasyChatScreen +{ + /*0x00*/ u8 kind; + /*0x01*/ u8 templateId; + /*0x02*/ u8 numColumns; + /*0x03*/ u8 numRows; + /*0x04*/ u8 state; + /*0x05*/ s8 mainCursorColumn; + /*0x06*/ s8 mainCursorRow; + /*0x07*/ u8 unk_07; + /*0x08*/ u8 unk_08; + /*0x09*/ u8 unk_09; + /*0x0A*/ s8 unk_0a; + /*0x0B*/ s8 unk_0b; + /*0x0C*/ u8 unk_0c; + /*0x0D*/ u8 unk_0d; + /*0x0E*/ u8 unk_0e; + /*0x0F*/ u8 unk_0f; + /*0x10*/ s8 unk_10; + /*0x11*/ s8 unk_11; + /*0x12*/ u8 sizeParam; + /*0x13*/ u8 unk_13; + /*0x14*/ u8 unk_14[0x20]; + /*0x34*/ const u8 *titleText; + /*0x38*/ u16 *words; + /*0x3C*/ u16 ecWordBuffer[9]; +}; + +EWRAM_DATA struct EasyChatScreen *gEasyChatScreen = NULL; EWRAM_DATA void *gUnknown_0203A11C = 0; EWRAM_DATA void *gUnknown_0203A120 = 0; -// Static ROM declarations - static void sub_811A2C0(u8); static void sub_811A278(void); static bool8 sub_811A428(u8); @@ -68,23 +86,23 @@ static bool8 EasyChat_AllocateResources(u8, u16 *, u8); static void EasyChat_FreeResources(void); static u16 sub_811AAAC(void); static u16 sub_811AB68(void); -u16 sub_811ACDC(void); -u16 sub_811AE44(void); -u16 sub_811AF00(void); -u16 sub_811AF8C(void); -u16 sub_811AFEC(void); -u16 sub_811B040(void); -u16 sub_811B08C(void); -u16 sub_811B0BC(void); -u16 sub_811B0E8(void); -u16 sub_811B0F8(void); -u16 sub_811B150(void); +static u16 sub_811ACDC(void); +static u16 sub_811AE44(void); +static u16 sub_811AF00(void); +static u16 sub_811AF8C(void); +static u16 sub_811AFEC(void); +static u16 sub_811B040(void); +static u16 sub_811B08C(void); +static u16 sub_811B0BC(void); +static u16 sub_811B0E8(void); +static u16 sub_811B0F8(void); +static u16 sub_811B150(void); u16 sub_811B1B4(void); u8 sub_811BA68(void); -u8 sub_811BCC8(u8); -void sub_811BDF0(u8 *); +static u8 sub_811BCC8(u8); +static void sub_811BDF0(u8 *); void sub_811BF78(void); -bool8 sub_811BF8C(void); +static bool8 sub_811BF8C(void); bool8 sub_811BFA4(void); void sub_811C13C(void); /*static*/ void sub_811C158(u16); @@ -92,23 +110,60 @@ void sub_811C13C(void); bool8 sub_811F28C(void); void sub_811F2B8(void); u8 sub_811F3AC(void); - -// .rodata +int sub_811BA3C(void); +int sub_811B184(void); +int sub_811B264(void); +static int sub_811B32C(void); +static int sub_811B2B0(void); +static int sub_811B33C(void); +static int sub_811B368(void); +static u16 sub_811B528(int); +static u16 sub_811B794(u32); +static int sub_811B394(void); +static u8 sub_811B2A4(void); +static void sub_811B3E4(void); +static void sub_811BE9C(void); +static int sub_811B4EC(void); +static void sub_811B418(void); +static void sub_811B454(void); +static int sub_811BD64(void); +static int sub_811BDB0(void); +static int sub_811BD2C(void); +int sub_811BCF4(void); +static u16 sub_811B8E8(void); +int sub_811F3B8(u8); +void sub_811F548(int, u16); +static int sub_811B908(void); +u16 sub_811F5B0(void); +static void sub_811B488(u16); +u16 sub_811B940(void); +u16 sub_811F578(u16); +int sub_811BF88(int); +static u16 sub_811B8C8(void); +static int sub_811B568(u32); +static int sub_811B634(u32); +static int sub_811B6C4(u32); +static void sub_811B978(void); +static void sub_811B744(void); +static u8 sub_811B9C8(void); +static void sub_811B768(void); +static u8 sub_811B960(u8); +static void sub_811B9A0(void); +static u8 sub_811BA1C(void); +static int sub_811BF20(void); +static u16 sub_811BF40(void); +u8 sub_811CE94(void); +u8 *CopyEasyChatWordPadded(u8 *, u16, u16); extern const struct { u16 word; MainCallback callback; } gUnknown_08597530[4]; -extern const struct { - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 unk_03; - u8 *data; - u8 filler_08[16]; -} gUnknown_08597550[]; -// .text +extern const struct EasyChatScreenTemplate gEasyChatScreenTemplates[21]; +extern const u8 gUnknown_08597748[][7]; +extern const u16 gUnknown_08597764[]; +extern const u16 gUnknown_0859776C[][2]; void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam) { @@ -444,66 +499,66 @@ void sub_811A938(void) static bool8 EasyChat_AllocateResources(u8 kind, u16 *words, u8 sizeParam) { - u8 r6; + u8 templateId; int i; - gUnknown_0203A118 = malloc(sizeof(*gUnknown_0203A118)); - if (gUnknown_0203A118 == NULL) + gEasyChatScreen = malloc(sizeof(*gEasyChatScreen)); + if (gEasyChatScreen == NULL) { return FALSE; } - gUnknown_0203A118->kind = kind; - gUnknown_0203A118->words = words; - gUnknown_0203A118->unk_05 = 0; - gUnknown_0203A118->unk_06 = 0; - gUnknown_0203A118->unk_09 = 0; - gUnknown_0203A118->sizeParam = sizeParam; - gUnknown_0203A118->unk_13 = 0; - r6 = sub_811BCC8(kind); + gEasyChatScreen->kind = kind; + gEasyChatScreen->words = words; + gEasyChatScreen->mainCursorColumn = 0; + gEasyChatScreen->mainCursorRow = 0; + gEasyChatScreen->unk_09 = 0; + gEasyChatScreen->sizeParam = sizeParam; + gEasyChatScreen->unk_13 = 0; + templateId = sub_811BCC8(kind); if (kind == 0x10) { - sub_811BDF0(gUnknown_0203A118->unk_14); - gUnknown_0203A118->src = gUnknown_0203A118->unk_14; - gUnknown_0203A118->unk_04 = 7; + sub_811BDF0(gEasyChatScreen->unk_14); + gEasyChatScreen->titleText = gEasyChatScreen->unk_14; + gEasyChatScreen->state = 7; } else { - gUnknown_0203A118->unk_04 = 0; - gUnknown_0203A118->src = gUnknown_08597550[r6].data; + gEasyChatScreen->state = 0; + gEasyChatScreen->titleText = gEasyChatScreenTemplates[templateId].titleText; } - gUnknown_0203A118->unk_02 = gUnknown_08597550[r6].unk_01; - gUnknown_0203A118->unk_03 = gUnknown_08597550[r6].unk_02; - gUnknown_0203A118->unk_07 = gUnknown_0203A118->unk_02 * gUnknown_0203A118->unk_03; - gUnknown_0203A118->unk_01 = r6; - if (gUnknown_0203A118->unk_07 > 9) + gEasyChatScreen->numColumns = gEasyChatScreenTemplates[templateId].numColumns; + gEasyChatScreen->numRows = gEasyChatScreenTemplates[templateId].numRows; + gEasyChatScreen->unk_07 = gEasyChatScreen->numColumns * gEasyChatScreen->numRows; + gEasyChatScreen->templateId = templateId; + if (gEasyChatScreen->unk_07 > 9) { - gUnknown_0203A118->unk_07 = 9; + gEasyChatScreen->unk_07 = 9; } if (words != NULL) { - CpuCopy16(words, gUnknown_0203A118->ecWordBuffer, gUnknown_0203A118->unk_07 * sizeof(u16)); + CpuCopy16(words, gEasyChatScreen->ecWordBuffer, gEasyChatScreen->unk_07 * sizeof(u16)); } else { - for (i = 0; i < gUnknown_0203A118->unk_07; i ++) + for (i = 0; i < gEasyChatScreen->unk_07; i ++) { - gUnknown_0203A118->ecWordBuffer[i] = -1; + gEasyChatScreen->ecWordBuffer[i] = -1; } - gUnknown_0203A118->words = gUnknown_0203A118->ecWordBuffer; + gEasyChatScreen->words = gEasyChatScreen->ecWordBuffer; } - gUnknown_0203A118->unk_0d = (sub_811F3AC() - 1) / 2 + 1; + gEasyChatScreen->unk_0d = (sub_811F3AC() - 1) / 2 + 1; return TRUE; } static void EasyChat_FreeResources(void) { - if (gUnknown_0203A118 != NULL) - FREE_AND_SET_NULL(gUnknown_0203A118); + if (gEasyChatScreen != NULL) + FREE_AND_SET_NULL(gEasyChatScreen); } static u16 sub_811AAAC(void) { - switch (gUnknown_0203A118->unk_04) + switch (gEasyChatScreen->state) { case 0: return sub_811AB68(); @@ -549,263 +604,1612 @@ static u16 sub_811AB68(void) if (gMain.newKeys & A_BUTTON) { sub_811BF78(); - gUnknown_0203A118->unk_04 = 2; - gUnknown_0203A118->unk_0a = 0; - gUnknown_0203A118->unk_0b = 0; - gUnknown_0203A118->unk_0c = 0; + gEasyChatScreen->state = 2; + gEasyChatScreen->unk_0a = 0; + gEasyChatScreen->unk_0b = 0; + gEasyChatScreen->unk_0c = 0; return 9; } else if (gMain.newKeys & B_BUTTON) - { // FIXME: See note below + { return sub_811B150(); } else if (gMain.newKeys & START_BUTTON) - { // FIXME: See note below + { return sub_811B1B4(); } else if (gMain.newKeys & DPAD_UP) { - gUnknown_0203A118->unk_06--; + gEasyChatScreen->mainCursorRow--; } else if (gMain.newKeys & DPAD_LEFT) - { // FIXME: See note below - gUnknown_0203A118->unk_05--; + { + gEasyChatScreen->mainCursorColumn--; } else if (gMain.newKeys & DPAD_DOWN) - { // FIXME: See note below - gUnknown_0203A118->unk_06++; + { + gEasyChatScreen->mainCursorRow++; } else if (gMain.newKeys & DPAD_RIGHT) - { // FIXME: See note below - gUnknown_0203A118->unk_05++; + { + gEasyChatScreen->mainCursorColumn++; } else { return 0; } - if (gUnknown_0203A118->unk_06 < 0) + + if (gEasyChatScreen->mainCursorRow < 0) + gEasyChatScreen->mainCursorRow = gEasyChatScreenTemplates[gEasyChatScreen->templateId].numRows; + + if (gEasyChatScreen->mainCursorRow > gEasyChatScreenTemplates[gEasyChatScreen->templateId].numRows) + gEasyChatScreen->mainCursorRow = 0; + + if (gEasyChatScreen->mainCursorRow == gEasyChatScreenTemplates[gEasyChatScreen->templateId].numRows) { - gUnknown_0203A118->unk_06 = gUnknown_08597550[gUnknown_0203A118->unk_01].unk_02; - } - if (gUnknown_0203A118->unk_06 > gUnknown_08597550[gUnknown_0203A118->unk_01].unk_02) - { - gUnknown_0203A118->unk_06 = 0; - } - if (gUnknown_0203A118->unk_06 == gUnknown_08597550[gUnknown_0203A118->unk_01].unk_02) - { - if (gUnknown_0203A118->unk_05 > 2) - { - gUnknown_0203A118->unk_05 = 2; - } - gUnknown_0203A118->unk_04 = 1; + if (gEasyChatScreen->mainCursorColumn > 2) + gEasyChatScreen->mainCursorColumn = 2; + + gEasyChatScreen->state = 1; return 3; } - /* - * FIXME: right, down, left, b, and start - * should be inserted here, but aren't - */ - if (gUnknown_0203A118->unk_05 < 0) - { - gUnknown_0203A118->unk_05 = gUnknown_08597550[gUnknown_0203A118->unk_01].unk_01 - 1; - } - if (gUnknown_0203A118->unk_05 >= gUnknown_08597550[gUnknown_0203A118->unk_01].unk_01) - { - gUnknown_0203A118->unk_05 = 0; - } - if (sub_811AB44() && gUnknown_0203A118->unk_05 == 1 && gUnknown_0203A118->unk_06 == 4) - { - gUnknown_0203A118->unk_05 = 0; - } + + if (gEasyChatScreen->mainCursorColumn < 0) + gEasyChatScreen->mainCursorColumn = gEasyChatScreenTemplates[gEasyChatScreen->templateId].numColumns - 1; + + if (gEasyChatScreen->mainCursorColumn >= gEasyChatScreenTemplates[gEasyChatScreen->templateId].numColumns) + gEasyChatScreen->mainCursorColumn = 0; + + if (sub_811AB44() && gEasyChatScreen->mainCursorColumn == 1 && gEasyChatScreen->mainCursorRow == 4) + gEasyChatScreen->mainCursorColumn = 0; + return 2; } #else -__attribute__((naked)) static u16 sub_811AB68(void) +NAKED +static u16 sub_811AB68(void) { - asm_unified("\tpush {r4-r7,lr}\n" - "\tldr r0, =gMain\n" - "\tldrh r1, [r0, 0x2E]\n" - "\tmovs r0, 0x1\n" - "\tands r0, r1\n" - "\tcmp r0, 0\n" - "\tbeq _0811ABB8\n" - "\tbl sub_811BF78\n" - "\tldr r1, =gUnknown_0203A118\n" - "\tldr r3, [r1]\n" - "\tmovs r2, 0\n" - "\tmovs r0, 0x2\n" - "\tstrb r0, [r3, 0x4]\n" - "\tldr r0, [r1]\n" - "\tstrb r2, [r0, 0xA]\n" - "\tldr r0, [r1]\n" - "\tstrb r2, [r0, 0xB]\n" - "\tldr r0, [r1]\n" - "\tstrb r2, [r0, 0xC]\n" - "\tmovs r0, 0x9\n" - "\tb _0811ACCC_return_r0\n" - "\t.pool\n" - "_0811AB9C:\n" - "\tmovs r0, 0x20\n" - "\tands r0, r1\n" - "\tcmp r0, 0\n" - "\tbne _0811AC68_dpad_left\n" - "\tmovs r0, 0x80\n" - "\tands r0, r1\n" - "\tcmp r0, 0\n" - "\tbne _0811AC58_dpad_down\n" - "\tmovs r0, 0x10\n" - "\tands r0, r1\n" - "\tcmp r0, 0\n" - "\tbne _0811AC48_dpad_right\n" - "\tmovs r0, 0\n" - "\tb _0811ACCC_return_r0\n" - "_0811ABB8:\n" - "\tmovs r0, 0x2\n" - "\tands r0, r1\n" - "\tcmp r0, 0\n" - "\tbne _0811AC78_b_button\n" - "\tmovs r0, 0x8\n" - "\tands r0, r1\n" - "\tcmp r0, 0\n" - "\tbne _0811AC7E_start_button\n" - "\tmovs r0, 0x40\n" - "\tands r0, r1\n" - "\tcmp r0, 0\n" - "\tbeq _0811AB9C\n" - "\tldr r2, =gUnknown_0203A118\n" - "\tldr r1, [r2]\n" - "\tldrb r0, [r1, 0x6]\n" - "\tsubs r0, 0x1\n" - "_0811ABD8:\n" - "\tstrb r0, [r1, 0x6]\n" - "_0811ABDA:\n" - "\tadds r7, r2, 0\n" - "\tadds r4, r7, 0\n" - "\tldr r2, [r4]\n" - "\tmovs r0, 0x6\n" - "\tldrsb r0, [r2, r0]\n" - "\tldr r6, =gUnknown_08597550\n" - "\tcmp r0, 0\n" - "\tbge _0811ABF8\n" - "\tldrb r0, [r2, 0x1]\n" - "\tlsls r1, r0, 1\n" - "\tadds r1, r0\n" - "\tlsls r1, 3\n" - "\tadds r1, r6\n" - "\tldrb r0, [r1, 0x2]\n" - "\tstrb r0, [r2, 0x6]\n" - "_0811ABF8:\n" - "\tldr r3, [r4]\n" - "\tmovs r2, 0x6\n" - "\tldrsb r2, [r3, r2]\n" - "\tadds r5, r6, 0\n" - "\tldrb r1, [r3, 0x1]\n" - "\tlsls r0, r1, 1\n" - "\tadds r0, r1\n" - "\tlsls r0, 3\n" - "\tadds r0, r5\n" - "\tldrb r0, [r0, 0x2]\n" - "\tcmp r2, r0\n" - "\tble _0811AC14\n" - "\tmovs r0, 0\n" - "\tstrb r0, [r3, 0x6]\n" - "_0811AC14:\n" - "\tldr r3, [r4]\n" - "\tmovs r2, 0x6\n" - "\tldrsb r2, [r3, r2]\n" - "\tldrb r1, [r3, 0x1]\n" - "\tlsls r0, r1, 1\n" - "\tadds r0, r1\n" - "\tlsls r0, 3\n" - "\tadds r1, r0, r5\n" - "\tldrb r0, [r1, 0x2]\n" - "\tcmp r2, r0\n" - "\tbne _0811AC88\n" - "\tmovs r0, 0x5\n" - "\tldrsb r0, [r3, r0]\n" - "\tcmp r0, 0x2\n" - "\tble _0811AC36\n" - "\tmovs r0, 0x2\n" - "\tstrb r0, [r3, 0x5]\n" - "_0811AC36:\n" - "\tldr r1, [r4]\n" - "\tmovs r0, 0x1\n" - "\tstrb r0, [r1, 0x4]\n" - "\tmovs r0, 0x3\n" - "\tb _0811ACCC_return_r0\n" - "\t.pool\n" - "_0811AC48_dpad_right:\n" - "\tldr r2, =gUnknown_0203A118\n" - "\tldr r1, [r2]\n" - "\tldrb r0, [r1, 0x5]\n" - "\tadds r0, 0x1\n" - "\tstrb r0, [r1, 0x5]\n" - "\tb _0811ABDA\n" - "\t.pool\n" - "_0811AC58_dpad_down:\n" - "\tldr r2, =gUnknown_0203A118\n" - "\tldr r1, [r2]\n" - "\tldrb r0, [r1, 0x6]\n" - "\tadds r0, 0x1\n" - "\tb _0811ABD8\n" - "\t.pool\n" - "_0811AC68_dpad_left:\n" - "\tldr r2, =gUnknown_0203A118\n" - "\tldr r1, [r2]\n" - "\tldrb r0, [r1, 0x5]\n" - "\tsubs r0, 0x1\n" - "\tstrb r0, [r1, 0x5]\n" - "\tb _0811ABDA\n" - "\t.pool\n" - "_0811AC78_b_button:\n" - "\tbl sub_811B150\n" - "\tb _0811AC82\n" - "_0811AC7E_start_button:\n" - "\tbl sub_811B1B4\n" - "_0811AC82:\n" - "\tlsls r0, 16\n" - "\tlsrs r0, 16\n" - "\tb _0811ACCC_return_r0\n" - "_0811AC88:\n" - "\tmovs r0, 0x5\n" - "\tldrsb r0, [r3, r0]\n" - "\tcmp r0, 0\n" - "\tbge _0811AC96\n" - "\tldrb r0, [r1, 0x1]\n" - "\tsubs r0, 0x1\n" - "\tstrb r0, [r3, 0x5]\n" - "_0811AC96:\n" - "\tldr r3, [r4]\n" - "\tmovs r2, 0x5\n" - "\tldrsb r2, [r3, r2]\n" - "\tldrb r1, [r3, 0x1]\n" - "\tlsls r0, r1, 1\n" - "\tadds r0, r1\n" - "\tlsls r0, 3\n" - "\tadds r0, r6\n" - "\tldrb r0, [r0, 0x1]\n" - "\tcmp r2, r0\n" - "\tblt _0811ACB0\n" - "\tmovs r0, 0\n" - "\tstrb r0, [r3, 0x5]\n" - "_0811ACB0:\n" - "\tbl sub_811AB44\n" - "\tcmp r0, 0\n" - "\tbeq _0811ACCA\n" - "\tldr r2, [r7]\n" - "\tldr r0, [r2, 0x4]\n" - "\tldr r1, =0x00ffff00\n" - "\tands r0, r1\n" - "\tldr r1, =0x00040100\n" - "\tcmp r0, r1\n" - "\tbne _0811ACCA\n" - "\tmovs r0, 0\n" - "\tstrb r0, [r2, 0x5]\n" - "_0811ACCA:\n" - "\tmovs r0, 0x2\n" - "_0811ACCC_return_r0:\n" - "\tpop {r4-r7}\n" - "\tpop {r1}\n" - "\tbx r1\n" - "\t.pool"); + asm_unified("\n\ + push {r4-r7,lr}\n\ + ldr r0, =gMain\n\ + ldrh r1, [r0, 0x2E]\n\ + movs r0, 0x1\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0811ABB8\n\ + bl sub_811BF78\n\ + ldr r1, =gEasyChatScreen\n\ + ldr r3, [r1]\n\ + movs r2, 0\n\ + movs r0, 0x2\n\ + strb r0, [r3, 0x4]\n\ + ldr r0, [r1]\n\ + strb r2, [r0, 0xA]\n\ + ldr r0, [r1]\n\ + strb r2, [r0, 0xB]\n\ + ldr r0, [r1]\n\ + strb r2, [r0, 0xC]\n\ + movs r0, 0x9\n\ + b RETURN\n\ + .pool\n\ +_0811AB9C:\n\ + movs r0, 0x20\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0811AC68_dpad_left\n\ + movs r0, 0x80\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0811AC58_dpad_down\n\ + movs r0, 0x10\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0811AC48_dpad_right\n\ + movs r0, 0\n\ + b RETURN\n\ +_0811ABB8:\n\ + movs r0, 0x2\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0811AC78_b_button\n\ + movs r0, 0x8\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0811AC7E_start_button\n\ + movs r0, 0x40\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0811AB9C\n\ + ldr r2, =gEasyChatScreen\n\ + ldr r1, [r2]\n\ + ldrb r0, [r1, 0x6]\n\ + subs r0, 0x1\n\ +_0811ABD8:\n\ + strb r0, [r1, 0x6]\n\ +_0811ABDA:\n\ + adds r7, r2, 0\n\ + adds r4, r7, 0\n\ + ldr r2, [r4]\n\ + movs r0, 0x6\n\ + ldrsb r0, [r2, r0]\n\ + ldr r6, =gEasyChatScreenTemplates\n\ + cmp r0, 0\n\ + bge _0811ABF8\n\ + ldrb r0, [r2, 0x1]\n\ + lsls r1, r0, 1\n\ + adds r1, r0\n\ + lsls r1, 3\n\ + adds r1, r6\n\ + ldrb r0, [r1, 0x2]\n\ + strb r0, [r2, 0x6]\n\ +_0811ABF8:\n\ + ldr r3, [r4]\n\ + movs r2, 0x6\n\ + ldrsb r2, [r3, r2]\n\ + adds r5, r6, 0\n\ + ldrb r1, [r3, 0x1]\n\ + lsls r0, r1, 1\n\ + adds r0, r1\n\ + lsls r0, 3\n\ + adds r0, r5\n\ + ldrb r0, [r0, 0x2]\n\ + cmp r2, r0\n\ + ble _0811AC14\n\ + movs r0, 0\n\ + strb r0, [r3, 0x6]\n\ +_0811AC14:\n\ + ldr r3, [r4]\n\ + movs r2, 0x6\n\ + ldrsb r2, [r3, r2]\n\ + ldrb r1, [r3, 0x1]\n\ + lsls r0, r1, 1\n\ + adds r0, r1\n\ + lsls r0, 3\n\ + adds r1, r0, r5\n\ + ldrb r0, [r1, 0x2]\n\ + cmp r2, r0\n\ + bne _0811AC88\n\ + movs r0, 0x5\n\ + ldrsb r0, [r3, r0]\n\ + cmp r0, 0x2\n\ + ble _0811AC36\n\ + movs r0, 0x2\n\ + strb r0, [r3, 0x5]\n\ +_0811AC36:\n\ + ldr r1, [r4]\n\ + movs r0, 0x1\n\ + strb r0, [r1, 0x4]\n\ + movs r0, 0x3\n\ + b RETURN\n\ + .pool\n\ +_0811AC48_dpad_right:\n\ + ldr r2, =gEasyChatScreen\n\ + ldr r1, [r2]\n\ + ldrb r0, [r1, 0x5]\n\ + adds r0, 0x1\n\ + strb r0, [r1, 0x5]\n\ + b _0811ABDA\n\ + .pool\n\ +_0811AC58_dpad_down:\n\ + ldr r2, =gEasyChatScreen\n\ + ldr r1, [r2]\n\ + ldrb r0, [r1, 0x6]\n\ + adds r0, 0x1\n\ + b _0811ABD8\n\ + .pool\n\ +_0811AC68_dpad_left:\n\ + ldr r2, =gEasyChatScreen\n\ + ldr r1, [r2]\n\ + ldrb r0, [r1, 0x5]\n\ + subs r0, 0x1\n\ + strb r0, [r1, 0x5]\n\ + b _0811ABDA\n\ + .pool\n\ +_0811AC78_b_button:\n\ + bl sub_811B150\n\ + b _0811AC82\n\ +_0811AC7E_start_button:\n\ + bl sub_811B1B4\n\ +_0811AC82:\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + b RETURN\n\ +_0811AC88:\n\ + movs r0, 0x5\n\ + ldrsb r0, [r3, r0]\n\ + cmp r0, 0\n\ + bge _0811AC96\n\ + ldrb r0, [r1, 0x1]\n\ + subs r0, 0x1\n\ + strb r0, [r3, 0x5]\n\ +_0811AC96:\n\ + ldr r3, [r4]\n\ + movs r2, 0x5\n\ + ldrsb r2, [r3, r2]\n\ + ldrb r1, [r3, 0x1]\n\ + lsls r0, r1, 1\n\ + adds r0, r1\n\ + lsls r0, 3\n\ + adds r0, r6\n\ + ldrb r0, [r0, 0x1]\n\ + cmp r2, r0\n\ + blt _0811ACB0\n\ + movs r0, 0\n\ + strb r0, [r3, 0x5]\n\ +_0811ACB0:\n\ + bl sub_811AB44\n\ + cmp r0, 0\n\ + beq _0811ACCA\n\ + ldr r2, [r7]\n\ + ldr r0, [r2, 0x4]\n\ + ldr r1, =0x00ffff00\n\ + ands r0, r1\n\ + ldr r1, =0x00040100\n\ + cmp r0, r1\n\ + bne _0811ACCA\n\ + movs r0, 0\n\ + strb r0, [r2, 0x5]\n\ +_0811ACCA:\n\ + movs r0, 0x2\n\ +RETURN:\n\ + pop {r4-r7}\n\ + pop {r1}\n\ + bx r1\n\ + .pool"); +} +#endif // NONMATCHING + +#ifdef NONMATCHING +static u16 sub_811ACDC(void) +{ + int numFooterColumns; + + if (gMain.newKeys & A_BUTTON) + { + switch (gEasyChatScreen->mainCursorColumn) + { + case 0: + return sub_811B184(); + case 1: + return sub_811B150(); + case 2: + return sub_811B1B4(); + case 3: + return sub_811B264(); + } + } + + if (gMain.newKeys & B_BUTTON) + return sub_811B150(); + else if (gMain.newKeys & START_BUTTON) + return sub_811B1B4(); + else if (gMain.newKeys & DPAD_UP) + gEasyChatScreen->mainCursorRow--; + else if (gMain.newKeys & DPAD_LEFT) + gEasyChatScreen->mainCursorColumn--; + else if (gMain.newKeys & DPAD_DOWN) + gEasyChatScreen->mainCursorRow = 0; + else if (gMain.newKeys & DPAD_RIGHT) + gEasyChatScreen->mainCursorColumn++; + else + return 0; + + if (gEasyChatScreen->mainCursorRow == gEasyChatScreenTemplates[gEasyChatScreen->templateId].numRows) + { + numFooterColumns = sub_811BA3C() ? 4 : 3; + if (gEasyChatScreen->mainCursorColumn < 0) + gEasyChatScreen->mainCursorColumn = numFooterColumns - 1; + + if (gEasyChatScreen->mainCursorColumn >= numFooterColumns) + gEasyChatScreen->mainCursorColumn = 0; + + return 3; + } + + if (gEasyChatScreen->mainCursorColumn >= gEasyChatScreenTemplates[gEasyChatScreen->templateId].numColumns) + gEasyChatScreen->mainCursorColumn = gEasyChatScreenTemplates[gEasyChatScreen->templateId].numColumns - 1; + + if (sub_811AB44() && gEasyChatScreen->mainCursorColumn == 1 && gEasyChatScreen->mainCursorRow == 4) + gEasyChatScreen->mainCursorColumn = 0; + + gEasyChatScreen->state = 0; + return 2; +} +#else +NAKED +static u16 sub_811ACDC(void) +{ + asm_unified("\n\ + push {r4-r6,lr}\n\ + ldr r2, =gMain\n\ + ldrh r1, [r2, 0x2E]\n\ + movs r0, 0x1\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0811AD4A\n\ + ldr r0, =gEasyChatScreen\n\ + ldr r0, [r0]\n\ + ldrb r0, [r0, 0x5]\n\ + lsls r0, 24\n\ + asrs r0, 24\n\ + cmp r0, 0x1\n\ + beq _0811AD3E\n\ + b _0811AD24\n\ + .pool\n\ +_0811AD04:\n\ + movs r0, 0x20\n\ + ands r0, r2\n\ + lsls r0, 16\n\ + lsrs r3, r0, 16\n\ + cmp r3, 0\n\ + bne _0811ADE0\n\ + movs r0, 0x80\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + bne _0811ADD0\n\ + movs r0, 0x10\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + bne _0811ADC0\n\ + movs r0, 0\n\ + b _0811AE32\n\ +_0811AD24:\n\ + cmp r0, 0x1\n\ + bgt _0811AD2E\n\ + cmp r0, 0\n\ + beq _0811AD38\n\ + b _0811AD4A\n\ +_0811AD2E:\n\ + cmp r0, 0x2\n\ + beq _0811ADF6\n\ + cmp r0, 0x3\n\ + beq _0811AD44\n\ + b _0811AD4A\n\ +_0811AD38:\n\ + bl sub_811B184\n\ + b _0811ADFA\n\ +_0811AD3E:\n\ + bl sub_811B150\n\ + b _0811ADFA\n\ +_0811AD44:\n\ + bl sub_811B264\n\ + b _0811ADFA\n\ +_0811AD4A:\n\ + ldrh r2, [r2, 0x2E]\n\ + movs r0, 0x2\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + bne _0811ADF0\n\ + movs r0, 0x8\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + bne _0811ADF6\n\ + movs r0, 0x40\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _0811AD04\n\ + ldr r2, =gEasyChatScreen\n\ + ldr r1, [r2]\n\ + ldrb r0, [r1, 0x6]\n\ + subs r0, 0x1\n\ + strb r0, [r1, 0x6]\n\ +_0811AD6E:\n\ + adds r6, r2, 0\n\ +_0811AD70:\n\ + adds r5, r6, 0\n\ + ldr r4, [r5]\n\ + movs r3, 0x6\n\ + ldrsb r3, [r4, r3]\n\ + ldr r2, =gEasyChatScreenTemplates\n\ + ldrb r1, [r4, 0x1]\n\ + lsls r0, r1, 1\n\ + adds r0, r1\n\ + lsls r0, 3\n\ + adds r1, r0, r2\n\ + ldrb r0, [r1, 0x2]\n\ + cmp r3, r0\n\ + bne _0811AE00\n\ + bl sub_811BA3C\n\ + movs r2, 0x3\n\ + cmp r0, 0\n\ + beq _0811AD96\n\ + movs r2, 0x4\n\ +_0811AD96:\n\ + ldr r1, [r5]\n\ + movs r0, 0x5\n\ + ldrsb r0, [r1, r0]\n\ + cmp r0, 0\n\ + bge _0811ADA4\n\ + subs r0, r2, 0x1\n\ + strb r0, [r1, 0x5]\n\ +_0811ADA4:\n\ + ldr r1, [r5]\n\ + movs r0, 0x5\n\ + ldrsb r0, [r1, r0]\n\ + cmp r0, r2\n\ + blt _0811ADB2\n\ + movs r0, 0\n\ + strb r0, [r1, 0x5]\n\ +_0811ADB2:\n\ + movs r0, 0x3\n\ + b _0811AE32\n\ + .pool\n\ +_0811ADC0:\n\ + ldr r2, =gEasyChatScreen\n\ + ldr r1, [r2]\n\ + ldrb r0, [r1, 0x5]\n\ + adds r0, 0x1\n\ + strb r0, [r1, 0x5]\n\ + b _0811AD6E\n\ + .pool\n\ +_0811ADD0:\n\ + ldr r1, =gEasyChatScreen\n\ + ldr r0, [r1]\n\ + strb r3, [r0, 0x6]\n\ + adds r6, r1, 0\n\ + b _0811AD70\n\ + .pool\n\ +_0811ADE0:\n\ + ldr r2, =gEasyChatScreen\n\ + ldr r1, [r2]\n\ + ldrb r0, [r1, 0x5]\n\ + subs r0, 0x1\n\ + strb r0, [r1, 0x5]\n\ + b _0811AD6E\n\ + .pool\n\ +_0811ADF0:\n\ + bl sub_811B150\n\ + b _0811ADFA\n\ +_0811ADF6:\n\ + bl sub_811B1B4\n\ +_0811ADFA:\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + b _0811AE32\n\ +_0811AE00:\n\ + movs r0, 0x5\n\ + ldrsb r0, [r4, r0]\n\ + ldrb r1, [r1, 0x1]\n\ + cmp r0, r1\n\ + blt _0811AE0E\n\ + subs r0, r1, 0x1\n\ + strb r0, [r4, 0x5]\n\ +_0811AE0E:\n\ + bl sub_811AB44\n\ + cmp r0, 0\n\ + beq _0811AE28\n\ + ldr r2, [r6]\n\ + ldr r0, [r2, 0x4]\n\ + ldr r1, =0x00ffff00\n\ + ands r0, r1\n\ + ldr r1, =0x00040100\n\ + cmp r0, r1\n\ + bne _0811AE28\n\ + movs r0, 0\n\ + strb r0, [r2, 0x5]\n\ +_0811AE28:\n\ + ldr r0, =gEasyChatScreen\n\ + ldr r1, [r0]\n\ + movs r0, 0\n\ + strb r0, [r1, 0x4]\n\ + movs r0, 0x2\n\ +_0811AE32:\n\ + pop {r4-r6}\n\ + pop {r1}\n\ + bx r1\n\ + .pool"); +} +#endif // NONMATCHING + +static u16 sub_811AE44(void) +{ + if (gMain.newKeys & B_BUTTON) + return sub_811B32C(); + + if (gMain.newKeys & A_BUTTON) + { + if (gEasyChatScreen->unk_0a != -1) + return sub_811B2B0(); + + switch (gEasyChatScreen->unk_0b) + { + case 0: + return sub_811B33C(); + case 1: + return sub_811B368(); + case 2: + return sub_811B32C(); + } + } + + if (gMain.newKeys & SELECT_BUTTON) + return sub_811B33C(); + + if (gMain.newAndRepeatedKeys & DPAD_UP) + return sub_811B528(2); + + if (gMain.newAndRepeatedKeys & DPAD_DOWN) + return sub_811B528(3); + + if (gMain.newAndRepeatedKeys & DPAD_LEFT) + return sub_811B528(1); + + if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + return sub_811B528(0); + + return 0; +} + +static u16 sub_811AF00(void) +{ + if (gMain.newKeys & B_BUTTON) + { + gEasyChatScreen->state = 2; + return 14; + } + + if (gMain.newKeys & A_BUTTON) + return sub_811B394(); + + if (gMain.newKeys & START_BUTTON) + return sub_811B794(4); + + if (gMain.newKeys & SELECT_BUTTON) + return sub_811B794(5); + + if (gMain.newAndRepeatedKeys & DPAD_UP) + return sub_811B794(2); + + if (gMain.newAndRepeatedKeys & DPAD_DOWN) + return sub_811B794(3); + + if (gMain.newAndRepeatedKeys & DPAD_LEFT) + return sub_811B794(1); + + if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + return sub_811B794(0); + + return 0; +} + +static u16 sub_811AF8C(void) +{ + u8 var0; + + switch (Menu_ProcessInputNoWrapClearOnChoose()) + { + case MENU_B_PRESSED: // B Button + case 1: // No + gEasyChatScreen->state = sub_811B2A4(); + return 7; + case 0: // Yes + gSpecialVar_Result = 0; + var0 = gEasyChatScreen->kind - 17; + if (var0 < 2) + sub_811B3E4(); + + return 24; + default: + return 0; + } +} + +static u16 sub_811AFEC(void) +{ + switch (Menu_ProcessInputNoWrapClearOnChoose()) + { + case MENU_B_PRESSED: // B Button + case 1: // No + gEasyChatScreen->state = sub_811B2A4(); + return 7; + case 0: // Yes + sub_811BE9C(); + gSpecialVar_Result = sub_811B4EC(); + sub_811B3E4(); + return 24; + default: + return 0; + } +} + +static u16 sub_811B040(void) +{ + switch (Menu_ProcessInputNoWrapClearOnChoose()) + { + case MENU_B_PRESSED: // B Button + case 1: // No + gEasyChatScreen->state = 1; + return 7; + case 0: // Yes + sub_811B418(); + gEasyChatScreen->state = 1; + return 8; + default: + return 0; + } +} + +static u16 sub_811B08C(void) +{ + if (gMain.newKeys & A_BUTTON) + return 26; + + if (gMain.newKeys & B_BUTTON) + return sub_811B150(); + + return 0; +} + +static u16 sub_811B0BC(void) +{ + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + gEasyChatScreen->state = sub_811B2A4(); + return 7; + } + + return 0; +} + +static u16 sub_811B0E8(void) +{ + gEasyChatScreen->state = 10; + return 6; +} + +static u16 sub_811B0F8(void) +{ + switch (Menu_ProcessInputNoWrapClearOnChoose()) + { + case MENU_B_PRESSED: // B Button + case 1: // No + sub_811B454(); + gEasyChatScreen->unk_08 = 0; + gEasyChatScreen->state = 8; + return 31; + case 0: // Yes + gSpecialVar_Result = sub_811B4EC(); + sub_811B3E4(); + return 24; + default: + return 0; + } +} + +static u16 sub_811B150(void) +{ + if (gEasyChatScreen->kind == 19 || gEasyChatScreen->kind == 11) + { + gEasyChatScreen->unk_08 = gEasyChatScreen->state; + gEasyChatScreen->state = 8; + return 34; + } + else + { + gEasyChatScreen->unk_08 = gEasyChatScreen->state; + gEasyChatScreen->state = 4; + return 5; + } +} + +int sub_811B184(void) +{ + gEasyChatScreen->unk_08 = gEasyChatScreen->state; + if (gEasyChatScreen->kind != 6) + { + gEasyChatScreen->state = 5; + return 4; + } + else + { + gEasyChatScreen->unk_08 = gEasyChatScreen->state; + gEasyChatScreen->state = 8; + return 32; + } +} + +u16 sub_811B1B4(void) +{ + gEasyChatScreen->unk_08 = gEasyChatScreen->state; + if (gEasyChatScreen->kind == 17) + { + if (sub_811BD64()) + { + gEasyChatScreen->state = 8; + return 29; + } + + if (sub_811BDB0()) + { + gEasyChatScreen->state = 8; + return 30; + } + + gEasyChatScreen->state = 6; + return 6; + } + else if (gEasyChatScreen->kind == 18) + { + if (sub_811BDB0()) + { + gEasyChatScreen->state = 8; + return 30; + } + + if (sub_811BD64()) + { + gEasyChatScreen->state = 8; + return 29; + } + + gEasyChatScreen->state = 6; + return 6; + } + else if (gEasyChatScreen->kind == 9 || gEasyChatScreen->kind == 13) + { + if (!sub_811BD2C()) + { + gEasyChatScreen->state = 8; + return 33; + } + + gEasyChatScreen->state = 6; + return 6; + } + else if (gEasyChatScreen->kind == 19 || gEasyChatScreen->kind == 11) + { + if (sub_811BCF4()) + { + gEasyChatScreen->state = 8; + return 34; + } + + gEasyChatScreen->state = 6; + return 6; + } + else if (gEasyChatScreen->kind == 20) + { + gEasyChatScreen->state = 6; + return 6; + } + else + { + if (sub_811BCF4() == 1 || !sub_811B4EC()) + { + gEasyChatScreen->state = 4; + return 5; + } + + gEasyChatScreen->state = 6; + return 6; + } +} + +int sub_811B264(void) +{ + gEasyChatScreen->unk_08 = gEasyChatScreen->state; + switch (gEasyChatScreen->kind) + { + case 15: + return 25; + case 17: + sub_811B3E4(); + return 28; + case 18: + sub_811B3E4(); + return 27; + default: + return 0; + } +} + +static u8 sub_811B2A4(void) +{ + return gEasyChatScreen->unk_08; +} + +static int sub_811B2B0(void) +{ + u16 var1; + + if (gEasyChatScreen->unk_09 == 0) + { + u8 var0 = sub_811F3B8(sub_811B8E8()); + sub_811F548(0, var0); + } + else + { + sub_811F548(1, sub_811B908()); + } + + var1 = sub_811F5B0(); + if (var1 == 0) + return 0; + + gEasyChatScreen->unk_0f = (var1 - 1) / 2; + gEasyChatScreen->unk_0e = 0; + gEasyChatScreen->unk_10 = 0; + gEasyChatScreen->unk_11 = 0; + gEasyChatScreen->state = 3; + return 11; +} + +static int sub_811B32C(void) +{ + gEasyChatScreen->state = 0; + return 10; +} + +static int sub_811B33C(void) +{ + gEasyChatScreen->unk_0a = 0; + gEasyChatScreen->unk_0b = 0; + gEasyChatScreen->unk_0c = 0; + if (!gEasyChatScreen->unk_09) + gEasyChatScreen->unk_09 = 1; + else + gEasyChatScreen->unk_09 = 0; + + return 23; +} + +static int sub_811B368(void) +{ + if (gEasyChatScreen->kind == 6) + { + PlaySE(SE_HAZURE); + return 0; + } + else + { + sub_811B488(0xFFFF); + return 1; + } +} + +static int sub_811B394(void) +{ + u16 easyChatWord = sub_811F578(sub_811B940()); + if (sub_811BF88(easyChatWord)) + { + PlaySE(SE_HAZURE); + return 0; + } + else + { + sub_811B488(easyChatWord); + if (gEasyChatScreen->kind != 6) + { + gEasyChatScreen->state = 0; + return 12; + } + else + { + gEasyChatScreen->state = 9; + return 13; + } + } +} + +static void sub_811B3E4(void) +{ + int i; + for (i = 0; i < gEasyChatScreen->unk_07; i++) + gEasyChatScreen->words[i] = gEasyChatScreen->ecWordBuffer[i]; +} + +static void sub_811B418(void) +{ + int i; + for (i = 0; i < gEasyChatScreen->unk_07; i++) + gEasyChatScreen->ecWordBuffer[i] = 0xFFFF; +} + +static void sub_811B454(void) +{ + int i; + for (i = 0; i < gEasyChatScreen->unk_07; i++) + gEasyChatScreen->ecWordBuffer[i] = gEasyChatScreen->words[i]; +} + +static void sub_811B488(u16 easyChatWord) +{ + u16 index = sub_811B8C8(); + gEasyChatScreen->ecWordBuffer[index] = easyChatWord; +} + +static u8 sub_811B4AC(void) +{ + u16 i; + for (i = 0; i < gEasyChatScreen->unk_07; i++) + { + if (gEasyChatScreen->ecWordBuffer[i] != gEasyChatScreen->words[i]) + return 1; + } + + return 0; +} + +static int sub_811B4EC(void) +{ + u8 var0 = gEasyChatScreen->kind - 17; + if (var0 < 2) + { + if (sub_811BD64()) + return 0; + + if (sub_811BDB0()) + return 0; + + return 1; + } + else + { + return sub_811B4AC(); + } +} + +static u16 sub_811B528(int arg0) +{ + if (gEasyChatScreen->unk_0a != -1) + { + if (gEasyChatScreen->unk_09 == 0) + return sub_811B568(arg0); + else + return sub_811B634(arg0); + } + else + { + return sub_811B6C4(arg0); + } +} + +static int sub_811B568(u32 arg0) +{ + switch (arg0) + { + case 2: + if (gEasyChatScreen->unk_0b != -gEasyChatScreen->unk_0c) + { + if (gEasyChatScreen->unk_0b) + { + gEasyChatScreen->unk_0b--; + return 15; + } + else + { + gEasyChatScreen->unk_0c--; + return 17; + } + } + break; + case 3: + if (gEasyChatScreen->unk_0b + gEasyChatScreen->unk_0c < gEasyChatScreen->unk_0d - 1) + { + int var0; + if (gEasyChatScreen->unk_0b < 3) + { + gEasyChatScreen->unk_0b++; + var0 = 15; + } + else + { + gEasyChatScreen->unk_0c++; + var0 = 16; + } + + sub_811B978(); + return var0; + } + break; + case 1: + if (gEasyChatScreen->unk_0a) + gEasyChatScreen->unk_0a--; + else + sub_811B744(); + + return 15; + case 0: + if (gEasyChatScreen->unk_0a < 1) + { + gEasyChatScreen->unk_0a++; + if (sub_811B9C8()) + sub_811B744(); + } + else + { + sub_811B744(); + } + return 15; + } + + return 0; +} + +static int sub_811B634(u32 arg0) +{ + switch (arg0) + { + case 2: + if (gEasyChatScreen->unk_0b > 0) + gEasyChatScreen->unk_0b--; + else + gEasyChatScreen->unk_0b = 3; + + sub_811B978(); + return 15; + case 3: + if (gEasyChatScreen->unk_0b < 3) + gEasyChatScreen->unk_0b++; + else + gEasyChatScreen->unk_0b = 0; + + sub_811B978(); + return 15; + case 0: + gEasyChatScreen->unk_0a++; + if (sub_811B9C8()) + sub_811B744(); + + return 15; + case 1: + gEasyChatScreen->unk_0a--; + if (gEasyChatScreen->unk_0a < 0) + sub_811B744(); + + return 15; + } + + return 0; +} + +static int sub_811B6C4(u32 arg0) +{ + switch (arg0) + { + case 2: + if (gEasyChatScreen->unk_0b) + gEasyChatScreen->unk_0b--; + else + gEasyChatScreen->unk_0b = 2; + + return 15; + case 3: + if (gEasyChatScreen->unk_0b < 2) + gEasyChatScreen->unk_0b++; + else + gEasyChatScreen->unk_0b = 0; + + return 15; + case 1: + gEasyChatScreen->unk_0b++; + sub_811B768(); + return 15; + case 0: + gEasyChatScreen->unk_0a = 0; + gEasyChatScreen->unk_0b++; + return 15; + } + + return 0; +} + +static void sub_811B744(void) +{ + gEasyChatScreen->unk_0a = 0xFF; + if (gEasyChatScreen->unk_0b) + gEasyChatScreen->unk_0b--; +} + +static void sub_811B768(void) +{ + if (gEasyChatScreen->unk_09 == 0) + { + gEasyChatScreen->unk_0a = 1; + sub_811B978(); + } + else + { + gEasyChatScreen->unk_0a = sub_811B960(gEasyChatScreen->unk_0b); + } +} + +static u16 sub_811B794(u32 arg0) +{ + u16 result; + switch (arg0) + { + case 2: + if (gEasyChatScreen->unk_11 + gEasyChatScreen->unk_0e > 0) + { + if (gEasyChatScreen->unk_11 > 0) + { + gEasyChatScreen->unk_11--; + result = 18; + } + else + { + gEasyChatScreen->unk_0e--; + result = 19; + } + + sub_811B9A0(); + return result; + } + break; + case 3: + if (gEasyChatScreen->unk_11 + gEasyChatScreen->unk_0e < gEasyChatScreen->unk_0f) + { + if (gEasyChatScreen->unk_11 < 3) + { + gEasyChatScreen->unk_11++; + result = 18; + } + else + { + gEasyChatScreen->unk_0e++; + result = 20; + } + + sub_811B9A0(); + return result; + } + break; + case 1: + if (gEasyChatScreen->unk_10 > 0) + gEasyChatScreen->unk_10--; + else + gEasyChatScreen->unk_10 = 1; + + sub_811B9A0(); + return 18; + case 0: + if (gEasyChatScreen->unk_10 < 1) + { + gEasyChatScreen->unk_10++; + if (sub_811BA1C()) + gEasyChatScreen->unk_10 = 0; + } + else + { + gEasyChatScreen->unk_10 = 0; + } + return 18; + case 4: + if (gEasyChatScreen->unk_0e) + { + if (gEasyChatScreen->unk_0e > 3) + gEasyChatScreen->unk_0e -= 4; + else + gEasyChatScreen->unk_0e = 0; + + return 21; + } + break; + case 5: + if (gEasyChatScreen->unk_0e <= gEasyChatScreen->unk_0f - 4) + { + gEasyChatScreen->unk_0e += 4; + if (gEasyChatScreen->unk_0e > gEasyChatScreen->unk_0f - 3) + gEasyChatScreen->unk_0e = gEasyChatScreen->unk_0f + 0xFD; + + sub_811B9A0(); + return 22; + } + break; + } + + return 0; +} + +static u16 sub_811B8C8(void) +{ + return (gEasyChatScreen->mainCursorRow * gEasyChatScreen->numColumns) + gEasyChatScreen->mainCursorColumn; +} + +static u16 sub_811B8E8(void) +{ + return 2 * (gEasyChatScreen->unk_0b + gEasyChatScreen->unk_0c) + gEasyChatScreen->unk_0a; +} + +static int sub_811B908(void) +{ + int var0 = (u8)gEasyChatScreen->unk_0a < 7 ? gEasyChatScreen->unk_0a : 0; + int var1 = (u8)gEasyChatScreen->unk_0b < 4 ? gEasyChatScreen->unk_0b : 0; + return gUnknown_08597748[var1][var0]; +} + +u16 sub_811B940(void) +{ + return 2 * (gEasyChatScreen->unk_11 + gEasyChatScreen->unk_0e) + gEasyChatScreen->unk_10; +} + +static u8 sub_811B960(u8 arg0) +{ + switch (arg0) + { + case 0: + default: + return 6; + case 1: + return 5; + } +} + +static void sub_811B978(void) +{ + while (sub_811B9C8()) + { + if (gEasyChatScreen->unk_0a) + gEasyChatScreen->unk_0a--; + else + break; + } +} + +static void sub_811B9A0(void) +{ + while (sub_811BA1C()) + { + if (gEasyChatScreen->unk_10) + gEasyChatScreen->unk_10--; + else + break; + } +} + +static u8 sub_811B9C8(void) +{ + if (gEasyChatScreen->unk_09 == 0) + return sub_811B8E8() >= sub_811F3AC() ? 1 : 0; + else + return gEasyChatScreen->unk_0a > sub_811B960(gEasyChatScreen->unk_0b) ? 1 : 0; +} + +static u8 sub_811BA1C(void) +{ + return sub_811B940() >= sub_811F5B0() ? 1 : 0; +} + +int sub_811BA3C(void) +{ + return gEasyChatScreenTemplates[gEasyChatScreen->templateId].unk_03_7; +} + +u8 sub_811BA5C(void) +{ + return gEasyChatScreen->kind; +} + +u8 sub_811BA68(void) +{ + return gEasyChatScreenTemplates[gEasyChatScreen->templateId].unk_03_0; +} + +const u8 *sub_811BA88(void) +{ + return gEasyChatScreen->titleText; +} + +u16 *sub_811BA94(void) +{ + return gEasyChatScreen->ecWordBuffer; +} + +u8 sub_811BAA0(void) +{ + return gEasyChatScreen->numRows; +} + +u8 sub_811BAAC(void) +{ + return gEasyChatScreen->numColumns; +} + +u8 sub_811BAB8(void) +{ + return gEasyChatScreen->mainCursorColumn; +} + +u8 sub_811BAC4(void) +{ + return gEasyChatScreen->mainCursorRow; +} + +void sub_811BAD0(const u8 **str1, const u8 **str2) +{ + *str1 = gEasyChatScreenTemplates[gEasyChatScreen->templateId].instructionsText1; + *str2 = gEasyChatScreenTemplates[gEasyChatScreen->templateId].instructionsText2; +} + +void sub_811BB08(const u8 **str1, const u8 **str2) +{ + *str1 = gEasyChatScreenTemplates[gEasyChatScreen->templateId].confirmText1; + *str2 = gEasyChatScreenTemplates[gEasyChatScreen->templateId].confirmText2; +} + +void sub_811BB40(const u8 **str1, const u8 **str2) +{ + switch (gEasyChatScreen->kind) + { + case 4: + *str1 = gText_StopGivingPkmnMail; + *str2 = NULL; + break; + case 15: + case 16: + *str1 = gText_LikeToQuitQuiz; + *str2 = gText_ChallengeQuestionMark; + break; + default: + *str1 = gText_QuitEditing; + *str2 = NULL; + break; + } + +} + +void sub_811BB88(const u8 **str1, const u8 **str2) +{ + *str1 = gText_AllTextBeingEditedWill; + *str2 = gText_BeDeletedThatOkay; +} + +void sub_811BB9C(u8 *arg0, u8 *arg1) +{ + *arg0 = gEasyChatScreen->unk_0a; + *arg1 = gEasyChatScreen->unk_0b; +} + +u8 sub_811BBB0(void) +{ + return gEasyChatScreen->unk_09; +} + +u8 sub_811BBBC(void) +{ + return gEasyChatScreen->unk_0c; +} + +void sub_811BBC8(u8 *arg0, u8 *arg1) +{ + *arg0 = gEasyChatScreen->unk_10; + *arg1 = gEasyChatScreen->unk_11; +} + +u8 sub_811BBDC(void) +{ + return gEasyChatScreen->unk_0e; +} + +u8 sub_811BBE8(void) +{ + return gEasyChatScreen->unk_0f; +} + +static u8 unref_sub_811BBF4(void) +{ + return 0; +} + +int sub_811BBF8(void) +{ + switch (gEasyChatScreen->state) + { + case 2: + if (gEasyChatScreen->unk_09 == 0 && gEasyChatScreen->unk_0c) + return 1; + break; + case 3: + if (gEasyChatScreen->unk_0e) + return 1; + break; + } + + return 0; +} + +int sub_811BC2C(void) +{ + switch (gEasyChatScreen->state) + { + case 2: + if (gEasyChatScreen->unk_09 == 0 && gEasyChatScreen->unk_0c + 4 <= gEasyChatScreen->unk_0d - 1) + return 1; + break; + case 3: + if (gEasyChatScreen->unk_0e + 4 <= gEasyChatScreen->unk_0f) + return 1; + break; + } + + return 0; +} + +int sub_811BC70(void) +{ + return sub_811BA3C(); +} + +u8 sub_811BC7C(const u16 *arg0, u8 arg1) +{ + u8 i; + + for (i = 0; i < arg1; i++) + { + if (arg0[i] != gEasyChatScreen->ecWordBuffer[i]) + return 1; + } + + return 0; +} + +u8 sub_811BCBC(void) +{ + return gEasyChatScreen->sizeParam; +} + +static u8 sub_811BCC8(u8 entryType) +{ + u32 i; + + for (i = 0; i < ARRAY_COUNT(gEasyChatScreenTemplates); i++) + { + if (gEasyChatScreenTemplates[i].unk_00 == entryType) + return i; + } + + return 0; +} + +int sub_811BCF4(void) +{ + int i; + + for (i = 0; i < gEasyChatScreen->unk_07; i++) + { + if (gEasyChatScreen->ecWordBuffer[i] != 0xFFFF) + return 0; + } + + return 1; +} + +static int sub_811BD2C(void) +{ + int i; + + for (i = 0; i < gEasyChatScreen->unk_07; i++) + { + if (gEasyChatScreen->ecWordBuffer[i] == 0xFFFF) + return 0; + } + + return 1; +} + +static int sub_811BD64(void) +{ + int i; + struct SaveBlock1 *saveBlock1; + + if (gEasyChatScreen->kind == 17) + return sub_811BCF4(); + + saveBlock1 = gSaveBlock1Ptr; + for (i = 0; i < 9; i++) + { + if (saveBlock1->lilycoveLady.quiz.unk_002[i] != 0xFFFF) + return 0; + } + + return 1; +} + +static int sub_811BDB0(void) +{ + struct LilycoveLadyQuiz *quiz; + if (gEasyChatScreen->kind == 18) + return sub_811BCF4(); + + quiz = &gSaveBlock1Ptr->lilycoveLady.quiz; + return quiz->unk_014 == 0xFFFF ? 1 : 0; +} + +static void sub_811BDF0(u8 *arg0) +{ + u8 name[32]; + struct SaveBlock1 *saveBlock1 = gSaveBlock1Ptr; + DynamicPlaceholderTextUtil_Reset(); + if (StringLength(saveBlock1->lilycoveLady.quiz.playerName) != 0) + { + TVShowConvertInternationalString(name, saveBlock1->lilycoveLady.quiz.playerName, saveBlock1->lilycoveLady.quiz.language); + DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, name); + } + else + { + DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gText_Lady); + } + + DynamicPlaceholderTextUtil_ExpandPlaceholders(arg0, gText_F700sQuiz); +} + +static void sub_811BE54(void) +{ + int i; + u16 *ecWord; + u8 *str; + + ecWord = gEasyChatScreen->ecWordBuffer; + str = gStringVar2; + i = 0; + while (i < gEasyChatScreen->unk_07) + { + str = CopyEasyChatWordPadded(str, *ecWord, 0); + *str = 0; + str++; + ecWord++; + i++; + } + + str--; + str[0] = 0xFF; +} + +static void sub_811BE9C(void) +{ + switch (gEasyChatScreen->kind) + { + case 0: + FlagSet(FLAG_SYS_CHAT_USED); + break; + case 20: + if (sub_811BF20()) + gSpecialVar_0x8004 = 2; + else + gSpecialVar_0x8004 = 0; + break; + case 9: + sub_811BE54(); + gSpecialVar_0x8004 = sub_81226D8(gEasyChatScreen->ecWordBuffer); + break; + case 13: + gSpecialVar_0x8004 = sub_811BF40(); + break; + } +} + +static int sub_811BF20(void) +{ + return sub_811BC7C(gUnknown_08597764, 4) == 0; +} + +static u16 sub_811BF40(void) +{ + int i; + for (i = 0; i < 5; i++) + { + if (!sub_811BC7C(gUnknown_0859776C[i], 2)) + return i + 1; + } + + return 0; +} + +void sub_811BF78(void) +{ + gEasyChatScreen->unk_13 = 0; +} + +int sub_811BF88(int easyChatWord) +{ + return 0; +} + +static bool8 sub_811BF8C(void) +{ + if (!sub_811CE94()) + return 0; + else + return 1; } -#endif From c96f8751cddf1a203bd5f310683ea35bf9cb8db2 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Thu, 21 Feb 2019 23:27:12 -0500 Subject: [PATCH 096/217] Improve window palette macros --- include/window.h | 9 +--- src/battle_dome.c | 2 +- src/battle_factory_screen.c | 48 +++++++++--------- src/battle_interface.c | 2 +- src/battle_message.c | 94 ++++++++++++++++++------------------ src/battle_pyramid_bag.c | 18 +++---- src/battle_records.c | 4 +- src/berry_blender.c | 6 +-- src/berry_fix_program.c | 8 +-- src/berry_tag_screen.c | 14 +++--- src/clear_save_data_screen.c | 4 +- src/coins.c | 2 +- src/contest.c | 14 +++--- src/contest_link_80F57C4.c | 2 +- src/contest_painting.c | 2 +- src/credits.c | 2 +- src/decoration.c | 6 +-- src/diploma.c | 2 +- src/egg_hatch.c | 4 +- src/field_player_avatar.c | 6 +-- src/field_region_map.c | 4 +- src/field_specials.c | 4 +- src/frontier_pass.c | 8 +-- src/frontier_util.c | 20 ++++---- src/hall_of_fame.c | 8 +-- src/item_menu.c | 28 +++++------ src/learn_move.c | 6 +-- src/link.c | 8 +-- src/list_menu.c | 6 +-- src/mail.c | 4 +- src/main_menu.c | 36 +++++++------- src/match_call.c | 6 +-- src/menu.c | 32 ++++++------ src/money.c | 2 +- src/mystery_event_menu.c | 4 +- src/naming_screen.c | 8 +-- src/option_menu.c | 4 +- src/party_menu.c | 6 +-- src/player_pc.c | 4 +- src/pokeblock.c | 4 +- src/pokeblock_feed.c | 2 +- src/pokedex.c | 8 +-- src/pokemon_storage_system.c | 30 ++++++------ src/pokemon_summary_screen.c | 16 +++--- src/pokenav.c | 2 +- src/region_map.c | 6 +-- src/rom_8011DC0.c | 8 +-- src/save_failed_screen.c | 16 +++--- src/scrcmd.c | 2 +- src/script_menu.c | 12 ++--- src/shop.c | 4 +- src/slot_machine.c | 4 +- src/start_menu.c | 2 +- src/starter_choose.c | 6 +-- src/text.c | 4 +- src/trade.c | 18 +++---- src/trainer_card.c | 8 +-- src/trainer_hill.c | 2 +- src/unk_text_util_2.c | 4 +- src/window.c | 2 +- 60 files changed, 301 insertions(+), 306 deletions(-) diff --git a/include/window.h b/include/window.h index 4138ce948d..1daee39efc 100644 --- a/include/window.h +++ b/include/window.h @@ -1,12 +1,7 @@ #ifndef GUARD_WINDOW_H #define GUARD_WINDOW_H -// The tile ID for a transparent tile in the window tilesheet -#define TRANSPARENT_TILE_NUMBER 0 - -#define PIXEL_BUFFER_TRANSPARENT 0x00 -#define PIXEL_BUFFER_WHITE 0x11 -#define PIXEL_BUFFER_UNKNOWN 0xFF +#define PALETTE_NUM_TO_FILL_VALUE(num) ((num) | ((num) << 4)) enum { @@ -80,7 +75,7 @@ extern u32 filler_03002F58; extern u32 filler_03002F5C; extern u32 filler_03002F64; -// This global is set to TRANSPARENT_TILE_NUMBER and never changed. +// This global is set to 0 and never changed. extern u8 gTransparentTileNumber; #endif // GUARD_WINDOW_H diff --git a/src/battle_dome.c b/src/battle_dome.c index 2ec9f8f3d4..9ef66aac41 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -3794,7 +3794,7 @@ static void sub_8190CD4(u8 taskId) for (i = windowId; i < windowId + 9; i++) { CopyWindowToVram(i, 2); - FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); } gTasks[taskId].data[0] = 3; break; diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 6d7ec3c45f..f30f256f28 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -1786,14 +1786,14 @@ static void sub_819B958(u8 windowId) { gSprites[sFactorySelectScreen->menuCursor1SpriteId].invisible = TRUE; gSprites[sFactorySelectScreen->menuCursor2SpriteId].invisible = TRUE; - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); CopyWindowToVram(windowId, 2); ClearWindowTilemap(windowId); } static void Select_PrintRentalPkmnString(void) { - FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); AddTextPrinterParameterized(0, 1, gText_RentalPkmn2, 2, 1, 0, NULL); CopyWindowToVram(0, 3); } @@ -1804,7 +1804,7 @@ static void Select_PrintMonSpecies(void) u8 x; u8 monId = sFactorySelectScreen->cursorPos; - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); species = GetMonData(&sFactorySelectScreen->mons[monId].monData, MON_DATA_SPECIES, NULL); StringCopy(gStringVar4, gSpeciesNames[species]); x = GetStringRightAlignXOffset(1, gStringVar4, 86); @@ -1816,7 +1816,7 @@ static void Select_PrintSelectMonString(void) { const u8 *str = NULL; - FillWindowPixelBuffer(2, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); if (sFactorySelectScreen->selectingMonsState == 1) str = gText_SelectFirstPkmn; else if (sFactorySelectScreen->selectingMonsState == 2) @@ -1832,7 +1832,7 @@ static void Select_PrintSelectMonString(void) static void Select_PrintCantSelectSameMon(void) { - FillWindowPixelBuffer(2, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); AddTextPrinterParameterized(2, 1, gText_CantSelectSamePkmn, 2, 5, 0, NULL); CopyWindowToVram(2, 2); } @@ -1842,7 +1842,7 @@ static void Select_PrintMenuOptions(void) u8 selectedId = sFactorySelectScreen->mons[sFactorySelectScreen->cursorPos].selectedId; PutWindowTilemap(3); - FillWindowPixelBuffer(3, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(0)); AddTextPrinterParameterized3(3, 1, 7, 1, gUnknown_08610476, 0, gText_Summary); if (selectedId != 0) AddTextPrinterParameterized3(3, 1, 7, 17, gUnknown_08610476, 0, gText_Deselect); @@ -1856,7 +1856,7 @@ static void Select_PrintMenuOptions(void) static void Select_PrintYesNoOptions(void) { PutWindowTilemap(4); - FillWindowPixelBuffer(4, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(4, PALETTE_NUM_TO_FILL_VALUE(0)); AddTextPrinterParameterized3(4, 1, 7, 1, gUnknown_08610476, 0, gText_Yes2); AddTextPrinterParameterized3(4, 1, 7, 17, gUnknown_08610476, 0, gText_No2); CopyWindowToVram(4, 3); @@ -1924,7 +1924,7 @@ static void Select_PrintMonCategory(void) if (monId < SELECTABLE_MONS_COUNT) { PutWindowTilemap(5); - FillWindowPixelBuffer(5, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(5, PALETTE_NUM_TO_FILL_VALUE(0)); species = GetMonData(&sFactorySelectScreen->mons[monId].monData, MON_DATA_SPECIES, NULL); CopyMonCategoryText(SpeciesToNationalPokedexNum(species), text); x = GetStringRightAlignXOffset(1, text, 0x76); @@ -2873,7 +2873,7 @@ static void sub_819D588(u8 taskId) case 3: if (!gPaletteFade.active) { - FillWindowPixelBuffer(5, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(5, PALETTE_NUM_TO_FILL_VALUE(0)); CopyWindowToVram(5, 2); if (sFactorySwapScreen->inEnemyScreen == TRUE) { @@ -3002,7 +3002,7 @@ static void sub_819D770(u8 taskId) gTasks[taskId].data[0]++; break; case 6: - FillWindowPixelBuffer(5, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(5, PALETTE_NUM_TO_FILL_VALUE(0)); CopyWindowToVram(5, 2); gTasks[taskId].data[0]++; break; @@ -3546,7 +3546,7 @@ static void sub_819EA64(u8 windowId) { gSprites[sFactorySwapScreen->menuCursor1SpriteId].invisible = TRUE; gSprites[sFactorySwapScreen->menuCursor2SpriteId].invisible = TRUE; - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); CopyWindowToVram(windowId, 2); ClearWindowTilemap(windowId); } @@ -3554,14 +3554,14 @@ static void sub_819EA64(u8 windowId) static void sub_819EAC0(void) { PutWindowTilemap(1); - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); CopyWindowToVram(1, 2); } static void sub_819EADC(void) { PutWindowTilemap(7); - FillWindowPixelBuffer(7, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(7, PALETTE_NUM_TO_FILL_VALUE(0)); CopyWindowToVram(7, 2); } @@ -3569,13 +3569,13 @@ static void sub_819EAF8(void) { sub_819EAC0(); PutWindowTilemap(5); - FillWindowPixelBuffer(5, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(5, PALETTE_NUM_TO_FILL_VALUE(0)); CopyWindowToVram(5, 2); } static void Swap_PrintPkmnSwap(void) { - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized(0, 1, gText_PkmnSwap, 2, 1, 0, NULL); CopyWindowToVram(0, 3); } @@ -3585,7 +3585,7 @@ static void Swap_PrintMonSpecies(void) u16 species; u8 x; - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); if (sFactorySwapScreen->cursorPos > 2) { CopyWindowToVram(1, 2); @@ -3606,7 +3606,7 @@ static void Swap_PrintMonSpecies(void) static void Swap_PrintOnInfoWindow(const u8 *str) { - FillWindowPixelBuffer(2, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); AddTextPrinterParameterized(2, 1, str, 2, 5, 0, NULL); CopyWindowToVram(2, 2); } @@ -3614,7 +3614,7 @@ static void Swap_PrintOnInfoWindow(const u8 *str) static void Swap_PrintMenuOptions(void) { PutWindowTilemap(3); - FillWindowPixelBuffer(3, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(0)); AddTextPrinterParameterized3(3, 1, 15, 1, gUnknown_08610922, 0, gText_Summary2); AddTextPrinterParameterized3(3, 1, 15, 17, gUnknown_08610922, 0, gText_Swap); AddTextPrinterParameterized3(3, 1, 15, 33, gUnknown_08610922, 0, gText_Rechoose); @@ -3624,7 +3624,7 @@ static void Swap_PrintMenuOptions(void) static void Swap_PrintYesNoOptions(void) { PutWindowTilemap(4); - FillWindowPixelBuffer(4, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(4, PALETTE_NUM_TO_FILL_VALUE(0)); AddTextPrinterParameterized3(4, 1, 7, 1, gUnknown_08610922, 0, gText_Yes3); AddTextPrinterParameterized3(4, 1, 7, 17, gUnknown_08610922, 0, gText_No3); CopyWindowToVram(4, 3); @@ -3638,7 +3638,7 @@ static void Swap_PrintActionString(const u8 *str, u32 y, u32 windowId) static void Swap_PrintActionStrings(void) { - FillWindowPixelBuffer(5, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(5, PALETTE_NUM_TO_FILL_VALUE(0)); switch (sFactorySwapScreen->inEnemyScreen) { case TRUE: @@ -3652,7 +3652,7 @@ static void Swap_PrintActionStrings(void) static void Swap_PrintActionStrings2(void) { - FillWindowPixelBuffer(3, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(0)); switch (sFactorySwapScreen->inEnemyScreen) { case TRUE: @@ -3693,7 +3693,7 @@ static void Swap_PrintMonSpecies2(void) LoadPalette(pal, 0xF0, 0xA); PutWindowTilemap(7); - FillWindowPixelBuffer(7, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(7, PALETTE_NUM_TO_FILL_VALUE(0)); if (sFactorySwapScreen->cursorPos > 2) { CopyWindowToVram(7, 3); @@ -3745,7 +3745,7 @@ static void Swap_PrintMonCategory(void) u8 x; u8 monId = sFactorySwapScreen->cursorPos; - FillWindowPixelBuffer(8, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(8, PALETTE_NUM_TO_FILL_VALUE(0)); if (monId > 2) { CopyWindowToVram(8, 2); @@ -3940,7 +3940,7 @@ static void Task_SwapCantHaveSameMons(u8 taskId) case 2: if (sFactorySwapScreen->unk30 != TRUE) { - FillWindowPixelBuffer(5, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(5, PALETTE_NUM_TO_FILL_VALUE(0)); CopyWindowToVram(5, 2); gTasks[taskId].data[0]++; } diff --git a/src/battle_interface.c b/src/battle_interface.c index 0eb494db4b..17d44dac3a 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -2578,7 +2578,7 @@ static u8* AddTextPrinterAndCreateWindowOnHealthbox(const u8 *str, u32 x, u32 y, struct WindowTemplate winTemplate = sHealthboxWindowTemplate; winId = AddWindow(&winTemplate); - FillWindowPixelBuffer(winId, (bgColor << 4) | (bgColor)); + FillWindowPixelBuffer(winId, PALETTE_NUM_TO_FILL_VALUE(bgColor)); color[0] = bgColor; color[1] = 1; diff --git a/src/battle_message.c b/src/battle_message.c index 164108dece..b203f0b3e1 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1357,7 +1357,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = { // The corresponding WindowTemplate is gStandardBattleWindowTemplates[] within src/battle_bg.c { // 0 Standard battle message - .fillValue = 0xFF, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xF), .fontId = 1, .x = 0, .y = 1, @@ -1369,7 +1369,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 6, }, { // 1 "What will (pokemon) do?" - .fillValue = 0xFF, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xF), .fontId = 1, .x = 1, .y = 1, @@ -1381,7 +1381,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 6, }, { // 2 "Fight/Pokemon/Bag/Run" - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = 0, .y = 1, @@ -1393,7 +1393,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 3 Top left move - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1405,7 +1405,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 4 Top right move - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1417,7 +1417,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 5 Bottom left move - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1429,7 +1429,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 6 Bottom right move - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1441,7 +1441,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 7 "PP" - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1453,7 +1453,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 11, }, { // 8 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = 0, .y = 1, @@ -1465,7 +1465,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 9 PP remaining - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = 2, .y = 1, @@ -1477,7 +1477,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 11, }, { // 10 "type" - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1489,7 +1489,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 11 "switch which?" - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1501,7 +1501,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 12 "gText_BattleYesNoChoice" - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = 0, .y = 1, @@ -1513,7 +1513,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 13 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = 0, .y = 1, @@ -1525,7 +1525,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 14 - .fillValue = 0x0, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0), .fontId = 1, .x = 32, .y = 1, @@ -1537,7 +1537,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 2, }, { // 15 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1549,7 +1549,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 16 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1561,7 +1561,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 17 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1573,7 +1573,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 18 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1585,7 +1585,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 19 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1597,7 +1597,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 20 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1609,7 +1609,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 21 - .fillValue = 0x0, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0), .fontId = 1, .x = -1, .y = 1, @@ -1621,7 +1621,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 6, }, { // 22 - .fillValue = 0x0, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0), .fontId = 1, .x = -1, .y = 1, @@ -1633,7 +1633,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 6, }, { // 23 - .fillValue = 0x0, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0x0), .fontId = 1, .x = -1, .y = 1, @@ -1649,7 +1649,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = { { // 0 - .fillValue = 0xFF, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xF), .fontId = 1, .x = 0, .y = 1, @@ -1661,7 +1661,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 6, }, { // 1 - .fillValue = 0xFF, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xF), .fontId = 1, .x = 1, .y = 1, @@ -1673,7 +1673,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 6, }, { // 2 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = 0, .y = 1, @@ -1685,7 +1685,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 3 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1697,7 +1697,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 4 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1709,7 +1709,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 5 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1721,7 +1721,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 6 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1733,7 +1733,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 7 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1745,7 +1745,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 11, }, { // 8 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = 0, .y = 1, @@ -1757,7 +1757,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 9 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = 2, .y = 1, @@ -1769,7 +1769,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 11, }, { // 10 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1781,7 +1781,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 11 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1793,7 +1793,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 12 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = 0, .y = 1, @@ -1805,7 +1805,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 13 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = 0, .y = 1, @@ -1817,7 +1817,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 14 - .fillValue = 0x0, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0), .fontId = 1, .x = 32, .y = 1, @@ -1829,7 +1829,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 2, }, { // 15 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1841,7 +1841,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 16 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1853,7 +1853,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 17 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1865,7 +1865,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 18 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1877,7 +1877,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 19 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1889,7 +1889,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 20 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1901,7 +1901,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 21 - .fillValue = 0xEE, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1913,7 +1913,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 22 - .fillValue = 0x11, + .fillValue = PALETTE_NUM_TO_FILL_VALUE(0x1), .fontId = 1, .x = 0, .y = 1, diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index 3601c5ad2b..5103562155 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -651,7 +651,7 @@ static void PrintItemDescription(s32 listMenuId) StringExpandPlaceholders(gStringVar4, gText_ReturnToVar1); desc = gStringVar4; } - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); PrintOnWindow_Font1(1, desc, 3, 0, 0, 1, 0, 0); } @@ -911,7 +911,7 @@ static void sub_81C5D20(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected); - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0); if (gPyramidBagResources->menuActionsCount == 1) sub_81C5EAC(sub_81C6D24(0)); @@ -1048,7 +1048,7 @@ static void BagAction_UseOnField(u8 taskId) else if (ItemId_GetFieldFunc(gSpecialVar_ItemId) != NULL) { sub_81C61A8(); - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); schedule_bg_copy_tilemap_to_vram(0); ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId); } @@ -1086,7 +1086,7 @@ static void BagAction_Toss(u8 taskId) { CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_TossHowManyVar1s); - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0); sub_81C6404(); gTasks[taskId].func = sub_81C64B4; @@ -1100,7 +1100,7 @@ static void sub_81C6350(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 2); StringExpandPlaceholders(gStringVar4, gText_ConfirmTossItems); - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0); sub_81C6DAC(taskId, &sYesNoTossFuncions); } @@ -1168,7 +1168,7 @@ static void TossItem(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 2); StringExpandPlaceholders(gStringVar4, gText_ThrewAwayVar2Var1s); - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0); gTasks[taskId].func = sub_81C65CC; } @@ -1265,7 +1265,7 @@ static void Task_BeginItemSwap(u8 taskId) ListMenuSetUnkIndicatorsStructField(data[0], 0x10, 1); CopyItemName(gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.lvlMode][data[1]], gStringVar1); StringExpandPlaceholders(gStringVar4, gText_MoveVar1Where); - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0); sub_81C5A98(data[0], 1); sub_81C704C(data[1]); @@ -1395,7 +1395,7 @@ static void sub_81C6BD8(void) LoadPalette(gUnknown_0860F074, 0xF0, 0x20); for (i = 0; i < 5; i++) - FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); PutWindowTilemap(0); PutWindowTilemap(1); @@ -1456,7 +1456,7 @@ static void sub_81C6DAC(u8 taskId, const struct YesNoFuncTable *yesNoTable) void DisplayItemMessageInBattlePyramid(u8 taskId, const u8 *str, void (*callback)(u8 taskId)) { - FillWindowPixelBuffer(2, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(1)); DisplayMessageAndContinueTask(taskId, 2, 0xA, 0xD, 1, GetPlayerTextSpeedDelay(), str, callback); schedule_bg_copy_tilemap_to_vram(1); } diff --git a/src/battle_records.c b/src/battle_records.c index 2ec0ee91e5..eb41dcc94a 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -321,7 +321,7 @@ void ShowLinkBattleRecords(void) gRecordsWindowId = AddWindow(&sLinkBattleRecordsWindow); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); StringExpandPlaceholders(gStringVar4, gText_PlayersBattleResults); x = GetStringCenterAlignXOffset(1, gStringVar4, 208); @@ -383,7 +383,7 @@ static void Task_ExitTrainerHillRecords(u8 taskId) static void RemoveTrainerHillRecordsWindow(u8 windowId) { - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); ClearWindowTilemap(windowId); CopyWindowToVram(windowId, 2); RemoveWindow(windowId); diff --git a/src/berry_blender.c b/src/berry_blender.c index 60a6f77a03..0a35c672f9 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -945,7 +945,7 @@ static void InitBerryBlenderWindows(void) DeactivateAllTextPrinters(); for (i = 0; i < 5; i++) - FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14); sub_81978B0(0xE0); @@ -3538,7 +3538,7 @@ void ShowBerryBlenderRecordWindow(void) winTemplate = sBlenderRecordWindowTemplate; gRecordsWindowId = AddWindow(&winTemplate); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, 0); - FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); xPos = GetStringCenterAlignXOffset(1, gText_BlenderMaxSpeedRecord, 0x90); AddTextPrinterParameterized(gRecordsWindowId, 1, gText_BlenderMaxSpeedRecord, xPos, 1, 0, NULL); @@ -3647,7 +3647,7 @@ static void Blender_AddTextPrinter(u8 windowId, const u8 *string, u8 x, u8 y, s3 if (caseId != 3) { - FillWindowPixelBuffer(windowId, txtColor[0] | (txtColor[0] << 4)); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(txtColor[0])); } AddTextPrinterParameterized4(windowId, 1, x, y, letterSpacing, 1, txtColor, speed, string); diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index 7e72a9f3ba..24198fc870 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -226,9 +226,9 @@ static void berry_fix_gpu_set(void) DmaCopy32(3, sUnknown_08618138, BG_PLTT + 0x1E0, 0x20); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP); - FillWindowPixelBuffer(2, PIXEL_BUFFER_TRANSPARENT); - FillWindowPixelBuffer(3, PIXEL_BUFFER_TRANSPARENT); - FillWindowPixelBuffer(0, 0xAA); + FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0xA)); width = GetStringWidth(0, sUnknown_08617E9B, 0); left = (0x78 - width) / 2; @@ -273,7 +273,7 @@ static int berry_fix_text_update(int checkval) static void berry_fix_text_print(int scene) { FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32); - FillWindowPixelBuffer(1, 0xAA); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0xA)); AddTextPrinterParameterized3(1, 1, 0, 0, sUnknown_08618158, -1, gUnknown_08618160[scene]); PutWindowTilemap(1); CopyWindowToVram(1, 2); diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 6c08611add..7b69357786 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -381,7 +381,7 @@ static void PrintTextInBerryTagScreen(u8 windowId, const u8 *text, u8 x, u8 y, s static void AddBerryTagTextToBg0(void) { memcpy(GetBgTilemapBuffer(0), sBerryTag->tilemapBuffers[2], sizeof(sBerryTag->tilemapBuffers[2])); - FillWindowPixelBuffer(WIN_BERRY_TAG, PIXEL_BUFFER_UNKNOWN); + FillWindowPixelBuffer(WIN_BERRY_TAG, PALETTE_NUM_TO_FILL_VALUE(15)); PrintTextInBerryTagScreen(WIN_BERRY_TAG, gText_BerryTag, GetStringCenterAlignXOffset(1, gText_BerryTag, 0x40), 1, 0, 1); PutWindowTilemap(WIN_BERRY_TAG); schedule_bg_copy_tilemap_to_vram(0); @@ -598,7 +598,7 @@ static void Task_DisplayAnotherBerry(u8 taskId) switch (data[0]) { case 0x30: - FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); break; case 0x40: PrintBerryNumberAndName(); @@ -608,7 +608,7 @@ static void Task_DisplayAnotherBerry(u8 taskId) CreateBerrySprite(); break; case 0x60: - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); break; case 0x70: PrintBerrySize(); @@ -620,7 +620,7 @@ static void Task_DisplayAnotherBerry(u8 taskId) SetFlavorCirclesVisiblity(); break; case 0xA0: - FillWindowPixelBuffer(2, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); break; case 0xB0: PrintBerryDescription1(); @@ -635,7 +635,7 @@ static void Task_DisplayAnotherBerry(u8 taskId) switch (data[0]) { case 0x30: - FillWindowPixelBuffer(2, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); break; case 0x40: PrintBerryDescription2(); @@ -647,7 +647,7 @@ static void Task_DisplayAnotherBerry(u8 taskId) SetFlavorCirclesVisiblity(); break; case 0x70: - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); break; case 0x80: PrintBerryFirmness(); @@ -660,7 +660,7 @@ static void Task_DisplayAnotherBerry(u8 taskId) CreateBerrySprite(); break; case 0xB0: - FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); break; case 0xC0: PrintBerryNumberAndName(); diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c index 2e4ac84275..7fdd101e22 100644 --- a/src/clear_save_data_screen.c +++ b/src/clear_save_data_screen.c @@ -90,7 +90,7 @@ static void Task_ClearSaveDataScreenYesNoChoice(u8 taskId) switch (Menu_ProcessInputNoWrapClearOnChoose()) { case 0: - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized(0, 1, gText_ClearingData, 0, 1, 0, 0); gTasks[taskId].func = Task_ClearSaveData; break; @@ -203,7 +203,7 @@ static void InitClearSaveDataScreenWindows(void) { InitWindows(sClearSaveTextWindow); DeactivateAllTextPrinters(); - FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); LoadWindowGfx(0, 0, 2, 224); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); } diff --git a/src/coins.c b/src/coins.c index 6ad80f80c7..c6fbf12169 100644 --- a/src/coins.c +++ b/src/coins.c @@ -27,7 +27,7 @@ void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y) struct WindowTemplate template; SetWindowTemplateFields(&template, 0, x, y, 8, 2, 0xF, 0x141); sCoinsWindowId = AddWindow(&template); - FillWindowPixelBuffer(sCoinsWindowId, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(sCoinsWindowId, PALETTE_NUM_TO_FILL_VALUE(0)); PutWindowTilemap(sCoinsWindowId); SetWindowBorderStyle(sCoinsWindowId, FALSE, 0x214, 0xE); PrintCoinsString(coinAmount); diff --git a/src/contest.c b/src/contest.c index aa6bd99902..f668baf922 100644 --- a/src/contest.c +++ b/src/contest.c @@ -819,7 +819,7 @@ static void sub_80D8490(u8 taskId) } r5 = StringCopy(r5, gMoveNames[move]); - FillWindowPixelBuffer(i + 5, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(i + 5, PALETTE_NUM_TO_FILL_VALUE(0)); Contest_PrintTextToBg0WindowAt(i + 5, sp8, 5, 1, 7); } @@ -941,7 +941,7 @@ static void sub_80D895C(u8 taskId) for (i = 0; i < 4; i++) { - FillWindowPixelBuffer(5 + i, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(5 + i, PALETTE_NUM_TO_FILL_VALUE(0)); PutWindowTilemap(5 + i); CopyWindowToVram(5 + i, 2); } @@ -2258,7 +2258,7 @@ static void sub_80DAEA4(void) for (i = 0; i < 4; i++) { - FillWindowPixelBuffer(gUnknown_02039F26[i], PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(gUnknown_02039F26[i], PALETTE_NUM_TO_FILL_VALUE(0)); sub_80DAF04(i); sub_80DAF88(i); } @@ -2478,7 +2478,7 @@ static void prints_contest_move_description(u16 a) ContestBG_FillBoxWithTile(0, 0x5036, 0x15, 0x20, 0x08, 0x01, 0x11); ContestBG_FillBoxWithTile(0, 0x5014, 0x15, 0x20, numHearts, 0x01, 0x11); - FillWindowPixelBuffer(10, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(10, PALETTE_NUM_TO_FILL_VALUE(0)); Contest_PrintTextToBg0WindowStd(10, gContestEffectDescriptionPointers[gContestMoves[a].effect]); Contest_PrintTextToBg0WindowStd(9, gText_Slash); } @@ -2621,7 +2621,7 @@ static void sub_80DB884(void) static void sub_80DB89C(void) { - FillWindowPixelBuffer(4, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(4, PALETTE_NUM_TO_FILL_VALUE(0)); CopyWindowToVram(4, 2); Contest_SetBgCopyFlags(0); } @@ -3456,7 +3456,7 @@ static void sub_80DCD48(void) break; default: for (i = 0; i < 4; i++) - FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); for (i = 0; i < 4; i++) { value = sContestantStatus[i].unk4; @@ -5038,7 +5038,7 @@ static void sub_80DF750(void) return; for (i = 0; i < 4; i++) - FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); if (gHeap[0x1A000] == 2) { diff --git a/src/contest_link_80F57C4.c b/src/contest_link_80F57C4.c index 4539d09a65..8e9c42f3d0 100644 --- a/src/contest_link_80F57C4.c +++ b/src/contest_link_80F57C4.c @@ -935,7 +935,7 @@ static void sub_80F6AE8(void) // windowTemplate.width = 30; // windowTemplate.height = 2; // windowId = AddWindow(&windowTemplate); -// FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); +// FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); // origWidth = GetStringWidth(1, text, 0) + 9; // strWidth = origWidth; // if (strWidth < 0) diff --git a/src/contest_painting.c b/src/contest_painting.c index dbd1933066..b961c7a659 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -279,7 +279,7 @@ static void InitContestPaintingWindow(void) SetBgTilemapBuffer(1, AllocZeroed(BG_SCREEN_SIZE)); gContestPaintingWindowId = AddWindow(&gUnknown_085B07EC); DeactivateAllTextPrinters(); - FillWindowPixelBuffer(gContestPaintingWindowId, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(gContestPaintingWindowId, PALETTE_NUM_TO_FILL_VALUE(0)); PutWindowTilemap(gContestPaintingWindowId); CopyWindowToVram(gContestPaintingWindowId, 3); ShowBg(1); diff --git a/src/credits.c b/src/credits.c index 9aadc18aa7..66f9f7ea87 100644 --- a/src/credits.c +++ b/src/credits.c @@ -1592,7 +1592,7 @@ static void sub_8175DA0(u8 taskIdB) case 5: if (!gPaletteFade.active) { - FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); CopyWindowToVram(0, 2); gTasks[taskIdB].data[TDB_0] = 2; } diff --git a/src/decoration.c b/src/decoration.c index afbb4ad409..c3434522de 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -543,7 +543,7 @@ void sub_8126B80(u8 taskId) void sub_8126C08(void) { - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized2(0, 1, sSecretBasePCMenuItemDescriptions[sSecretBasePCMenuCursorPos], 0, 0, 2, 1, 3); } @@ -634,7 +634,7 @@ void sub_8126DFC(u8 taskId) void sub_8126E44(u8 taskId) { - FillWindowPixelBuffer(sDecorMenuWindowIndices[1], PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(sDecorMenuWindowIndices[1], PALETTE_NUM_TO_FILL_VALUE(1)); sub_8126E8C(taskId); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(sDecorMenuWindowIndices[1], 9, sCurDecorationCategory); gTasks[taskId].func = sub_8127088; @@ -968,7 +968,7 @@ void sub_8127744(u32 a0) const u8 *txt; winidx = sDecorMenuWindowIndices[3]; - FillWindowPixelBuffer(winidx, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(winidx, PALETTE_NUM_TO_FILL_VALUE(1)); if (a0 >= sCurDecorCatCount) { txt = gText_GoBackPrevMenu; diff --git a/src/diploma.c b/src/diploma.c index 9194af7106..f2c2a965c1 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -197,7 +197,7 @@ static void InitDiplomaWindow(void) InitWindows(sDiplomaWinTemplates); DeactivateAllTextPrinters(); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); - FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); PutWindowTilemap(0); } diff --git a/src/egg_hatch.c b/src/egg_hatch.c index f52f66a2aa..8fb21dbbed 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -606,7 +606,7 @@ static void CB2_EggHatch_1(void) case 1: if (!gPaletteFade.active) { - FillWindowPixelBuffer(sEggHatchData->windowId, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(sEggHatchData->windowId, PALETTE_NUM_TO_FILL_VALUE(0)); sEggHatchData->CB2_PalCounter = 0; sEggHatchData->CB2_state++; } @@ -857,7 +857,7 @@ static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8 static void EggHatchPrintMessage(u8 windowId, u8* string, u8 x, u8 y, u8 speed) { - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_UNKNOWN); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(15)); sEggHatchData->textColor[0] = 0; sEggHatchData->textColor[1] = 5; sEggHatchData->textColor[2] = 6; diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index dff010d13c..ddaaa208b2 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1918,7 +1918,7 @@ static bool8 Fishing9(struct Task *task) static bool8 Fishing10(struct Task *task) { AlignFishingAnimationFrames(); - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized2(0, 1, gText_PokemonOnHook, 1, 0, 2, 1, 3); task->tStep++; task->tFrameCounter = 0; @@ -1966,7 +1966,7 @@ static bool8 Fishing12(struct Task *task) { AlignFishingAnimationFrames(); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection())); - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized2(0, 1, gText_NotEvenANibble, 1, 0, 2, 1, 3); task->tStep = FISHING_SHOW_RESULT; return TRUE; @@ -1977,7 +1977,7 @@ static bool8 Fishing13(struct Task *task) { AlignFishingAnimationFrames(); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection())); - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized2(0, 1, gText_ItGotAway, 1, 0, 2, 1, 3); task->tStep++; return TRUE; diff --git a/src/field_region_map.c b/src/field_region_map.c index 6814b26bd3..e128c70849 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -196,13 +196,13 @@ static void PrintRegionMapSecName(void) { if (sFieldRegionMapHandler->regionMap.iconDrawType != MAPSECTYPE_NONE) { - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized(0, 1, sFieldRegionMapHandler->regionMap.mapSecName, 0, 1, 0, NULL); schedule_bg_copy_tilemap_to_vram(0); } else { - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); CopyWindowToVram(0, 3); } } diff --git a/src/field_specials.c b/src/field_specials.c index 9390eab87b..62d3b8e599 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -2645,7 +2645,7 @@ static void sub_813A570(u8 taskId) DestroyListMenuTask(task->data[14], NULL, NULL); Free(gUnknown_0203AB64); sub_8198070(task->data[13], 1); - FillWindowPixelBuffer(task->data[13], PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(task->data[13], PALETTE_NUM_TO_FILL_VALUE(0)); CopyWindowToVram(task->data[13], 2); RemoveWindow(task->data[13]); DestroyTask(taskId); @@ -3226,7 +3226,7 @@ void sub_813AF48(void) DestroyListMenuTask(task->data[14], NULL, NULL); Free(gUnknown_0203AB64); sub_8198070(task->data[13], TRUE); - FillWindowPixelBuffer(task->data[13], PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(task->data[13], PALETTE_NUM_TO_FILL_VALUE(0)); ClearWindowTilemap(task->data[13]); CopyWindowToVram(task->data[13], 2); RemoveWindow(task->data[13]); diff --git a/src/frontier_pass.c b/src/frontier_pass.c index 39442dcfd0..c449a50f0a 100644 --- a/src/frontier_pass.c +++ b/src/frontier_pass.c @@ -1090,7 +1090,7 @@ static void ShowAndPrintWindows(void) for (i = 0; i < WINDOW_COUNT; i++) { PutWindowTilemap(i); - FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); } x = GetStringCenterAlignXOffset(1, gText_SymbolsEarned, 96); @@ -1116,7 +1116,7 @@ static void ShowAndPrintWindows(void) static void PrintAreaDescription(u8 cursorArea) { - FillWindowPixelBuffer(WINDOW_DESCRIPTION, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(WINDOW_DESCRIPTION, PALETTE_NUM_TO_FILL_VALUE(0)); if (cursorArea == CURSOR_AREA_RECORD && !sPassData->hasBattleRecord) AddTextPrinterParameterized3(WINDOW_DESCRIPTION, 1, 2, 0, sTextColors[1], 0, sPassAreaDescriptions[0]); else if (cursorArea != CURSOR_AREA_NOTHING) @@ -1656,7 +1656,7 @@ static void PrintOnFrontierMap(void) for (i = 0; i < MAP_WINDOW_COUNT; i++) { PutWindowTilemap(i); - FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); } for (i = 0; i < NUM_FRONTIER_FACILITIES; i++) @@ -1698,7 +1698,7 @@ static void HandleFrontierMapCursorMove(u8 direction) StartSpriteAnim(sMapData->mapIndicatorSprite, sMapLandmarks[sMapData->cursorPos].animNum); sMapData->mapIndicatorSprite->pos1.x = sMapLandmarks[sMapData->cursorPos].x; sMapData->mapIndicatorSprite->pos1.y = sMapLandmarks[sMapData->cursorPos].y; - FillWindowPixelBuffer(MAP_WINDOW_DESCRIPTION, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(MAP_WINDOW_DESCRIPTION, PALETTE_NUM_TO_FILL_VALUE(0)); AddTextPrinterParameterized3(MAP_WINDOW_DESCRIPTION, 1, 4, 0, sTextColors[0], 0, sMapLandmarks[sMapData->cursorPos].description); for (i = 0; i < 3; i++) diff --git a/src/frontier_util.c b/src/frontier_util.c index 28c74ceaa9..5846616b71 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -1045,7 +1045,7 @@ static void ShowTowerResultsWindow(u8 battleMode) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); if (battleMode == FRONTIER_MODE_SINGLES) StringExpandPlaceholders(gStringVar4, gText_SingleBattleRoomResults); else if (battleMode == FRONTIER_MODE_DOUBLES) @@ -1116,7 +1116,7 @@ static void ShowDomeResultsWindow(u8 battleMode) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); if (battleMode == FRONTIER_MODE_SINGLES) StringExpandPlaceholders(gStringVar4, gText_SingleBattleTourneyResults); else @@ -1192,7 +1192,7 @@ static void ShowPalaceResultsWindow(u8 battleMode) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); if (battleMode == FRONTIER_MODE_SINGLES) StringExpandPlaceholders(gStringVar4, gText_SingleBattleHallResults); else @@ -1248,7 +1248,7 @@ static void ShowPikeResultsWindow(void) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); StringExpandPlaceholders(gStringVar4, gText_BattleChoiceResults); PrintAligned(gStringVar4, 0); AddTextPrinterParameterized(gRecordsWindowId, 1, gText_Lv502, 8, 33, TEXT_SPEED_FF, NULL); @@ -1310,7 +1310,7 @@ static void ShowArenaResultsWindow(void) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); PrintHyphens(10); StringExpandPlaceholders(gStringVar4, gText_SetKOTourneyResults); PrintAligned(gStringVar4, 2); @@ -1396,7 +1396,7 @@ static void ShowFactoryResultsWindow(u8 battleMode) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); if (battleMode == FRONTIER_MODE_SINGLES) StringExpandPlaceholders(gStringVar4, gText_BattleSwapSingleResults); else @@ -1461,7 +1461,7 @@ static void ShowPyramidResultsWindow(void) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); StringExpandPlaceholders(gStringVar4, gText_BattleQuestResults); PrintAligned(gStringVar4, 2); AddTextPrinterParameterized(gRecordsWindowId, 1, gText_Lv502, 8, 49, TEXT_SPEED_FF, NULL); @@ -1484,7 +1484,7 @@ static void ShowLinkContestResultsWindow(void) gRecordsWindowId = AddWindow(&gUnknown_08611C7C); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); StringExpandPlaceholders(gStringVar4, gText_LinkContestResults); x = GetStringCenterAlignXOffset(1, gStringVar4, 208); @@ -2354,7 +2354,7 @@ void ShowRankingHallRecordsWindow(void) { gRecordsWindowId = AddWindow(&gUnknown_08611C84); NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); PrintHallRecords(gSpecialVar_0x8005, FRONTIER_LVL_50); PutWindowTilemap(gRecordsWindowId); CopyWindowToVram(gRecordsWindowId, 3); @@ -2362,7 +2362,7 @@ void ShowRankingHallRecordsWindow(void) void ScrollRankingHallRecordsWindow(void) { - FillWindowPixelBuffer(gRecordsWindowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); PrintHallRecords(gSpecialVar_0x8005, FRONTIER_LVL_OPEN); CopyWindowToVram(gRecordsWindowId, 2); } diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index b064c991ba..b25342021d 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -649,7 +649,7 @@ static void sub_8173DC0(u8 taskId) gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 1; } BeginNormalPaletteFade(sUnknown_0203BCD4, 0, 12, 12, RGB(16, 29, 24)); - FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); CopyWindowToVram(0, 3); gTasks[taskId].tFrameCount = 7; gTasks[taskId].func = sub_8173EA4; @@ -1086,7 +1086,7 @@ static void Task_HofPC_ExitOnButtonPress(u8 taskId) static void HallOfFame_PrintWelcomeText(u8 unusedPossiblyWindowId, u8 unused2) { - FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); PutWindowTilemap(0); AddTextPrinterParameterized3(0, 1, GetStringCenterAlignXOffset(1, gText_WelcomeToHOF, 0xD0), 1, sUnknown_085E5388, 0, gText_WelcomeToHOF); CopyWindowToVram(0, 3); @@ -1099,7 +1099,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u s32 dexNumber; s32 width; - FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); PutWindowTilemap(0); // dex number @@ -1180,7 +1180,7 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2) u32 width; u16 trainerId; - FillWindowPixelBuffer(1, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(1)); PutWindowTilemap(1); SetWindowBorderStyle(1, FALSE, 0x21D, 0xD); AddTextPrinterParameterized3(1, 1, 0, 1, sUnknown_085E538C, -1, gText_Name); diff --git a/src/item_menu.c b/src/item_menu.c index db16a887ec..ae24c8a03a 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -884,7 +884,7 @@ void bag_menu_print_description_box_text(int a) StringExpandPlaceholders(gStringVar4, gText_ReturnToVar1); str = gStringVar4; } - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); bag_menu_print(1, 1, str, 3, 1, 0, 0, 0, 0); } @@ -1028,7 +1028,7 @@ void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void ( *callback)(u s16* data = gTasks[taskId].data; data[10] = AddItemMessageWindow(4); - FillWindowPixelBuffer(data[10], PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(data[10], PALETTE_NUM_TO_FILL_VALUE(1)); DisplayMessageAndContinueTask(taskId, data[10], 10, 13, fontId, GetPlayerTextSpeedDelay(), str, callback); schedule_bg_copy_tilemap_to_vram(1); } @@ -1293,7 +1293,7 @@ void bag_menu_swap_items(u8 taskId) gUnknown_0203CE54->unk81A = data[1]; CopyItemName(BagGetItemIdByPocketPosition(gUnknown_0203CE58.pocket + 1, data[1]), gStringVar1); StringExpandPlaceholders(gStringVar4, gText_MoveVar1Where); - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); sub_80D4FEC(data[1]); sub_81AB89C(); @@ -1505,7 +1505,7 @@ void sub_81AC644(u8 unused) { CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected); - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); } if (gUnknown_0203CE54->unk828 == 1) @@ -1646,7 +1646,7 @@ void ItemMenu_UseOutOfBattle(u8 taskId) bag_menu_print_there_is_no_pokemon(taskId); else { - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); schedule_bg_copy_tilemap_to_vram(0); if (gUnknown_0203CE58.pocket != BERRIES_POCKET) ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId); @@ -1670,7 +1670,7 @@ void ItemMenu_Toss(u8 taskId) { CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_TossHowManyVar1s); - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); sub_81ABC3C(7); gTasks[taskId].func = Task_ChooseHowManyToToss; @@ -1684,7 +1684,7 @@ void BagMenuConfirmToss(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[8], 0, 3); StringExpandPlaceholders(gStringVar4, gText_ConfirmTossItems); - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); bag_menu_yes_no(taskId, 5, &gUnknown_08614084); } @@ -1727,7 +1727,7 @@ void BagMenuActuallyToss(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[8], 0, 3); StringExpandPlaceholders(gStringVar4, gText_ThrewAwayVar2Var1s); - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); gTasks[taskId].func = Task_ActuallyToss; } @@ -2043,7 +2043,7 @@ void display_deposit_item_ask_str(u8 taskId) { CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_DepositHowManyVar1); - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); sub_81ABC3C(7); gTasks[taskId].func = sub_81ADA7C; @@ -2078,7 +2078,7 @@ void sub_81ADB14(u8 taskId) { s16* data = gTasks[taskId].data; - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); if (ItemId_GetImportance(gSpecialVar_ItemId)) { bag_menu_print(1, 1, gText_CantStoreImportantItems, 3, 1, 0, 0, 0, 0); @@ -2244,7 +2244,7 @@ void bag_menu_print_pocket_names(const u8 *pocketName1, const u8 *pocketName2) window.width = 16; window.height = 2; windowId = AddWindow(&window); - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); offset = GetStringCenterAlignXOffset(1, pocketName1, 0x40); bag_menu_print(windowId, 1, pocketName1, offset, 1, 0, 0, -1, 1); if (pocketName2) @@ -2283,7 +2283,7 @@ void setup_bag_menu_textboxes(void) LoadPalette(&gUnknown_0860F074, 0xF0, 0x20); for (i = 0; i < 3; i++) { - FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); PutWindowTilemap(i); } schedule_bg_copy_tilemap_to_vram(0); @@ -2366,7 +2366,7 @@ void bag_menu_remove_money_window(void) void bag_menu_prepare_tmhm_move_window(void) { - FillWindowPixelBuffer(3, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(0)); blit_move_info_icon(3, 19, 0, 0); blit_move_info_icon(3, 20, 0, 12); blit_move_info_icon(3, 21, 0, 24); @@ -2380,7 +2380,7 @@ void PrintTMHMMoveData(u16 itemId) u16 moveId; const u8* text; - FillWindowPixelBuffer(4, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(4, PALETTE_NUM_TO_FILL_VALUE(0)); if (itemId == ITEM_NONE) { for (i = 0; i < 4; i++) diff --git a/src/learn_move.c b/src/learn_move.c index d9ebe3f3b0..5173525553 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -498,7 +498,7 @@ static void LearnMoveMain(void) case 27: if (!sub_81D2C3C()) { - FillWindowPixelBuffer(3, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(1)); if (sLearnMoveStruct2.showContestInfo == FALSE) { sLearnMoveStruct->state = 3; @@ -631,7 +631,7 @@ static void HideSpritesAndPrintTeachText(bool8 a) if (!a) { StringExpandPlaceholders(gStringVar4, gText_TeachWhichMoveToPkmn); - FillWindowPixelBuffer(3, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized(3, 1, gStringVar4, 0, 1, 0, NULL); } } @@ -695,7 +695,7 @@ static void ShowTeachMoveText(bool8 showContest) if (showContest == FALSE) { StringExpandPlaceholders(gStringVar4, gText_TeachWhichMoveToPkmn); - FillWindowPixelBuffer(3, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized(3, 1, gStringVar4, 0, 1, 0, NULL); } } diff --git a/src/link.c b/src/link.c index bec9dddc6e..5c7614c1bf 100644 --- a/src/link.c +++ b/src/link.c @@ -1683,8 +1683,8 @@ static void sub_800B080(void) CopyToBgTilemapBuffer(1, gWirelessLinkDisplayTilemap, 0, 0); CopyBgTilemapBufferToVram(1); LoadPalette(gWirelessLinkDisplayPal, 0, 0x20); - FillWindowPixelBuffer(0, 0x00); - FillWindowPixelBuffer(2, 0x00); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); AddTextPrinterParameterized3(0, 3, 2, 6, gUnknown_082ED224, 0, gText_CommErrorEllipsis); AddTextPrinterParameterized3(2, 3, 2, 1, gUnknown_082ED224, 0, gText_MoveCloserToLinkPartner); PutWindowTilemap(0); @@ -1696,8 +1696,8 @@ static void sub_800B080(void) static void sub_800B138(void) { LoadBgTiles(0, g2BlankTilesGfx, 0x20, 0); - FillWindowPixelBuffer(1, 0x00); - FillWindowPixelBuffer(2, 0x00); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); AddTextPrinterParameterized3(1, 3, 2, 0, gUnknown_082ED224, 0, gText_CommErrorCheckConnections); PutWindowTilemap(1); PutWindowTilemap(2); diff --git a/src/list_menu.c b/src/list_menu.c index 6442debba3..83293890c0 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -486,7 +486,7 @@ void RedrawListMenu(u8 listTaskId) { struct ListMenu *list = (void*) gTasks[listTaskId].data; - FillWindowPixelBuffer(list->template.windowId, (list->template.fillValue << 4) | (list->template.fillValue)); + FillWindowPixelBuffer(list->template.windowId, PALETTE_NUM_TO_FILL_VALUE(list->template.fillValue)); ListMenuPrintEntries(list, list->scrollOffset, 0, list->template.maxShowed); ListMenuDrawCursor(list); CopyWindowToVram(list->template.windowId, 2); @@ -584,7 +584,7 @@ static u8 ListMenuInitInternal(struct ListMenuTemplate *listMenuTemplate, u16 sc if (list->template.totalItems < list->template.maxShowed) list->template.maxShowed = list->template.totalItems; - FillWindowPixelBuffer(list->template.windowId, (list->template.fillValue << 4) | (list->template.fillValue)); + FillWindowPixelBuffer(list->template.windowId, PALETTE_NUM_TO_FILL_VALUE(list->template.fillValue)); ListMenuPrintEntries(list, list->scrollOffset, 0, list->template.maxShowed); ListMenuDrawCursor(list); ListMenuCallSelectionChangedCallback(list, TRUE); @@ -795,7 +795,7 @@ static void ListMenuScroll(struct ListMenu *list, u8 count, bool8 movingDown) { if (count >= list->template.maxShowed) { - FillWindowPixelBuffer(list->template.windowId, (list->template.fillValue << 4) | (list->template.fillValue)); + FillWindowPixelBuffer(list->template.windowId, PALETTE_NUM_TO_FILL_VALUE(list->template.fillValue)); ListMenuPrintEntries(list, list->scrollOffset, 0, list->template.maxShowed); } else diff --git a/src/mail.c b/src/mail.c index 6d9c98350b..e8b750bfa5 100644 --- a/src/mail.c +++ b/src/mail.c @@ -477,8 +477,8 @@ static void sub_8121B1C(void) y = 0; PutWindowTilemap(0); PutWindowTilemap(1); - FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); for (i = 0; i < sMailRead->layout->numSubStructs; i ++) { if (sMailRead->strbuf[i][0] == EOS || sMailRead->strbuf[i][0] == CHAR_SPACE) diff --git a/src/main_menu.c b/src/main_menu.c index aa388df62d..cb39f036ec 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -783,8 +783,8 @@ static void Task_DisplayMainMenu(u8 taskId) { case HAS_NO_SAVED_GAME: default: - FillWindowPixelBuffer(0, 0xAA); - FillWindowPixelBuffer(1, 0xAA); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0xA)); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0xA)); AddTextPrinterParameterized3(0, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuNewGame); AddTextPrinterParameterized3(1, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuOption); PutWindowTilemap(0); @@ -795,9 +795,9 @@ static void Task_DisplayMainMenu(u8 taskId) DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[1], MAIN_MENU_BORDER_TILE); break; case HAS_SAVED_GAME: - FillWindowPixelBuffer(2, 0xAA); - FillWindowPixelBuffer(3, 0xAA); - FillWindowPixelBuffer(4, 0xAA); + FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0xA)); + FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(0xA)); + FillWindowPixelBuffer(4, PALETTE_NUM_TO_FILL_VALUE(0xA)); AddTextPrinterParameterized3(2, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuContinue); AddTextPrinterParameterized3(3, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuNewGame); AddTextPrinterParameterized3(4, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuOption); @@ -813,10 +813,10 @@ static void Task_DisplayMainMenu(u8 taskId) DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[4], MAIN_MENU_BORDER_TILE); break; case HAS_MYSTERY_GIFT: - FillWindowPixelBuffer(2, 0xAA); - FillWindowPixelBuffer(3, 0xAA); - FillWindowPixelBuffer(4, 0xAA); - FillWindowPixelBuffer(5, 0xAA); + FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0xA)); + FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(0xA)); + FillWindowPixelBuffer(4, PALETTE_NUM_TO_FILL_VALUE(0xA)); + FillWindowPixelBuffer(5, PALETTE_NUM_TO_FILL_VALUE(0xA)); AddTextPrinterParameterized3(2, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuContinue); AddTextPrinterParameterized3(3, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuNewGame); AddTextPrinterParameterized3(4, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuMysteryGift); @@ -836,11 +836,11 @@ static void Task_DisplayMainMenu(u8 taskId) DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[5], MAIN_MENU_BORDER_TILE); break; case HAS_MYSTERY_EVENTS: - FillWindowPixelBuffer(2, 0xAA); - FillWindowPixelBuffer(3, 0xAA); - FillWindowPixelBuffer(4, 0xAA); - FillWindowPixelBuffer(5, 0xAA); - FillWindowPixelBuffer(6, 0xAA); + FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0xA)); + FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(0xA)); + FillWindowPixelBuffer(4, PALETTE_NUM_TO_FILL_VALUE(0xA)); + FillWindowPixelBuffer(5, PALETTE_NUM_TO_FILL_VALUE(0xA)); + FillWindowPixelBuffer(6, PALETTE_NUM_TO_FILL_VALUE(0xA)); AddTextPrinterParameterized3(2, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuContinue); AddTextPrinterParameterized3(3, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuNewGame); AddTextPrinterParameterized3(4, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuMysteryGift2); @@ -2098,7 +2098,7 @@ static void NewGameBirchSpeech_StartFadePlatformOut(u8 taskId, u8 delay) static void NewGameBirchSpeech_ShowGenderMenu(void) { DrawMainMenuWindowBorder(&gNewGameBirchSpeechTextWindows[1], 0xF3); - FillWindowPixelBuffer(1, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(1)); PrintMenuTable(1, 2, sMenuActions_Gender); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(1, 2, 0); PutWindowTilemap(1); @@ -2126,7 +2126,7 @@ static void NewGameBirchSpeech_SetDefaultPlayerName(u8 nameId) static void CreateMainMenuErrorWindow(const u8* str) { - FillWindowPixelBuffer(7, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(7, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized(7, 1, str, 0, 1, 2, 0); PutWindowTilemap(7); CopyWindowToVram(7, 2); @@ -2239,7 +2239,7 @@ static void NewGameBirchSpeech_ClearGenderWindowTilemap(u8 a, u8 b, u8 c, u8 d, static void NewGameBirchSpeech_ClearGenderWindow(u8 windowId, bool8 copyToVram) { CallWindowFunction(windowId, NewGameBirchSpeech_ClearGenderWindowTilemap); - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); ClearWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -2277,7 +2277,7 @@ void CreateYesNoMenuParameterized(u8 a, u8 b, u16 c, u16 d, u8 e, u8 f) static void NewGameBirchSpeech_ShowDialogueWindow(u8 windowId, u8 copyToVram) { CallWindowFunction(windowId, NewGameBirchSpeech_CreateDialogueWindowBorder); - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); diff --git a/src/match_call.c b/src/match_call.c index e7e91969f1..76012e0767 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1191,7 +1191,7 @@ static bool32 LoadMatchCallWindowGfx(u8 taskId) return FALSE; } - FillWindowPixelBuffer(taskData[2], 0x88); + FillWindowPixelBuffer(taskData[2], PALETTE_NUM_TO_FILL_VALUE(8)); LoadPalette(sUnknown_0860EA4C, 0xE0, 0x20); LoadPalette(sPokeNavIconPalette, 0xF0, 0x20); ChangeBgY(0, -0x2000, 0); @@ -1241,7 +1241,7 @@ static bool32 sub_81962D8(u8 taskId) s16 *taskData = gTasks[taskId].data; if (!ExecuteMatchCallTextPrinter(taskData[2])) { - FillWindowPixelBuffer(taskData[2], 0x88); + FillWindowPixelBuffer(taskData[2], PALETTE_NUM_TO_FILL_VALUE(8)); if (!gMatchCallState.triggeredFromScript) SelectMatchCallMessage(gMatchCallState.trainerId, gStringVar4); @@ -1257,7 +1257,7 @@ static bool32 sub_8196330(u8 taskId) s16 *taskData = gTasks[taskId].data; if (!ExecuteMatchCallTextPrinter(taskData[2]) && !IsSEPlaying() && gMain.newKeys & (A_BUTTON | B_BUTTON)) { - FillWindowPixelBuffer(taskData[2], 0x88); + FillWindowPixelBuffer(taskData[2], PALETTE_NUM_TO_FILL_VALUE(8)); CopyWindowToVram(taskData[2], 2); PlaySE(SE_TOREOFF); return TRUE; diff --git a/src/menu.c b/src/menu.c index 9a9cec9ddb..26ea99de22 100644 --- a/src/menu.c +++ b/src/menu.c @@ -213,7 +213,7 @@ void sub_81973A4(void) void NewMenuHelpers_DrawDialogueFrame(u8 windowId, bool8 copyToVram) { CallWindowFunction(windowId, DrawDialogueFrame); - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -222,7 +222,7 @@ void NewMenuHelpers_DrawDialogueFrame(u8 windowId, bool8 copyToVram) void NewMenuHelpers_DrawStdWindowFrame(u8 windowId, bool8 copyToVram) { CallWindowFunction(windowId, DrawStandardFrame); - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -231,7 +231,7 @@ void NewMenuHelpers_DrawStdWindowFrame(u8 windowId, bool8 copyToVram) void ClearWindowAndWideBorder(u8 windowId, bool8 copyToVram) { CallWindowFunction(windowId, ClearWindowAndWideBorderTilemap); - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); ClearWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -240,7 +240,7 @@ void ClearWindowAndWideBorder(u8 windowId, bool8 copyToVram) void ClearWindowAndBorder(u8 windowId, bool8 copyToVram) { CallWindowFunction(windowId, ClearWindowAndBorderTilemap); - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); ClearWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -411,14 +411,14 @@ void DrawDialogueFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height // Clears the given window, and a 1-tile border around the window, to transparent tiles. void ClearWindowAndBorderTilemap(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) { - FillBgTilemapBufferRect(bg, TRANSPARENT_TILE_NUMBER, tilemapLeft - 1, tilemapTop - 1, width + 2, height + 2, STD_WINDOW_PALETTE_NUM); + FillBgTilemapBufferRect(bg, 0, tilemapLeft - 1, tilemapTop - 1, width + 2, height + 2, STD_WINDOW_PALETTE_NUM); } // Clears the given window, and a 1-tile border the top and bottom, plus a 3-tile border on the left and right. // Tiles are set to a transparent tile. void ClearWindowAndWideBorderTilemap(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) { - FillBgTilemapBufferRect(bg, TRANSPARENT_TILE_NUMBER, tilemapLeft - 3, tilemapTop - 1, width + 6, height + 2, STD_WINDOW_PALETTE_NUM); + FillBgTilemapBufferRect(bg, 0, tilemapLeft - 3, tilemapTop - 1, width + 6, height + 2, STD_WINDOW_PALETTE_NUM); } void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram) @@ -557,7 +557,7 @@ void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 tileNum, u8 paletteNum) sTileNum = tileNum; sPaletteNum = paletteNum; CallWindowFunction(windowId, sub_8197BB4); - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -568,7 +568,7 @@ void sub_8197B64(u8 windowId, bool8 copyToVram, u16 tileNum) sTileNum = tileNum; sPaletteNum = GetWindowAttribute(windowId, WINDOW_PALETTE_NUM); CallWindowFunction(windowId, sub_8197BB4); - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -672,7 +672,7 @@ void sub_8197BB4(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 p void sub_8197DF8(u8 windowId, bool8 copyToVram) { CallWindowFunction(windowId, sub_8197E30); - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); ClearWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -688,7 +688,7 @@ void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, u16 baseTileNum, u8 pal sTileNum = baseTileNum; sPaletteNum = paletteNum; CallWindowFunction(windowId, DrawWindowBorder); - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -699,7 +699,7 @@ void sub_8197EC8(u8 windowId, bool8 copyToVram, u16 baseTileNum) sTileNum = baseTileNum; sPaletteNum = GetWindowAttribute(windowId, WINDOW_PALETTE_NUM); CallWindowFunction(windowId, DrawWindowBorder); - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -768,7 +768,7 @@ void DrawWindowBorder(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, void sub_8198070(u8 windowId, bool8 copyToVram) { CallWindowFunction(windowId, sub_81980A8); - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); ClearWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -814,7 +814,7 @@ void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram) if (sWindowId != 0xFF) { PutWindowTilemap(sWindowId); - FillWindowPixelBuffer(sWindowId, PIXEL_BUFFER_UNKNOWN); + FillWindowPixelBuffer(sWindowId, PALETTE_NUM_TO_FILL_VALUE(15)); width = GetStringWidth(0, string, 0); AddTextPrinterParameterized3(sWindowId, 0, @@ -848,7 +848,7 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo color[2] = 2; } PutWindowTilemap(sWindowId); - FillWindowPixelBuffer(sWindowId, PIXEL_BUFFER_UNKNOWN); + FillWindowPixelBuffer(sWindowId, PALETTE_NUM_TO_FILL_VALUE(15)); if (string2 != NULL) { width = GetStringWidth(0, string2, 0); @@ -876,7 +876,7 @@ void sub_81982F0(void) { if (sWindowId != 0xFF) { - FillWindowPixelBuffer(sWindowId, PIXEL_BUFFER_UNKNOWN); + FillWindowPixelBuffer(sWindowId, PALETTE_NUM_TO_FILL_VALUE(15)); CopyWindowToVram(sWindowId, 3); } } @@ -885,7 +885,7 @@ void sub_8198314(void) { if (sWindowId != 0xFF) { - FillWindowPixelBuffer(sWindowId, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(sWindowId, PALETTE_NUM_TO_FILL_VALUE(0)); ClearWindowTilemap(sWindowId); CopyWindowToVram(sWindowId, 3); RemoveWindow(sWindowId); diff --git a/src/money.c b/src/money.c index 33dffdc75d..1b5e298f0e 100644 --- a/src/money.c +++ b/src/money.c @@ -169,7 +169,7 @@ void DrawMoneyBox(int amount, u8 x, u8 y) SetWindowTemplateFields(&template, 0, x + 1, y + 1, 10, 2, 15, 8); sMoneyBoxWindowId = AddWindow(&template); - FillWindowPixelBuffer(sMoneyBoxWindowId, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(sMoneyBoxWindowId, PALETTE_NUM_TO_FILL_VALUE(0)); PutWindowTilemap(sMoneyBoxWindowId); CopyWindowToVram(sMoneyBoxWindowId, 1); PrintMoneyAmountInMoneyBoxWithBorder(sMoneyBoxWindowId, 0x214, 14, amount); diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index c30fb9c1a0..b0f0ba3028 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -90,7 +90,7 @@ void CB2_InitMysteryEventMenu(void) DeactivateAllTextPrinters(); for (i = 0; i < 2; i++) - FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14); LoadUserWindowBorderGfx(0, 1u, 0xD0u); @@ -313,6 +313,6 @@ static void PrintMysteryMenuText(u8 windowId, const u8 *text, u8 x, u8 y, s32 sp textColor[1] = 2; textColor[2] = 3; - FillWindowPixelBuffer(windowId, (textColor[0]) | (textColor[0] << 4)); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(textColor[0])); AddTextPrinterParameterized4(windowId, 1, x, y, letterSpacing, lineSpacing, textColor, speed, text); } diff --git a/src/naming_screen.c b/src/naming_screen.c index cb53604df9..a84cbd6576 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1474,7 +1474,7 @@ static void HandleDpadMovement(struct Task *task) static void sub_80E4894(void) { - FillWindowPixelBuffer(gNamingScreenData->windows[3], PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gNamingScreenData->windows[3], PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized(gNamingScreenData->windows[3], 1, gNamingScreenData->template->title, 8, 1, 0, 0); PutWindowTilemap(gNamingScreenData->windows[3]); } @@ -1485,7 +1485,7 @@ static void sub_80E48E8(void) StringCopy(buffer, gSpeciesNames[gNamingScreenData->monSpecies]); StringAppendN(buffer, gNamingScreenData->template->title, 15); - FillWindowPixelBuffer(gNamingScreenData->windows[3], PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gNamingScreenData->windows[3], PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized(gNamingScreenData->windows[3], 1, buffer, 8, 1, 0, 0); PutWindowTilemap(gNamingScreenData->windows[3]); } @@ -1672,7 +1672,7 @@ static void sub_80E4D10(void) u8 maxChars = gNamingScreenData->template->maxChars; u16 unk = gNamingScreenData->inputCharBaseXPos - 0x40; - FillWindowPixelBuffer(gNamingScreenData->windows[2], PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gNamingScreenData->windows[2], PALETTE_NUM_TO_FILL_VALUE(1)); for (i = 0; i < maxChars; i++) { @@ -1766,7 +1766,7 @@ static void sub_80E4EF0(void) { const u8 color[3] = { 15, 1, 2 }; - FillWindowPixelBuffer(gNamingScreenData->windows[4], PIXEL_BUFFER_UNKNOWN); + FillWindowPixelBuffer(gNamingScreenData->windows[4], PALETTE_NUM_TO_FILL_VALUE(15)); AddTextPrinterParameterized3(gNamingScreenData->windows[4], 0, 2, 1, color, 0, gText_MoveOkBack); PutWindowTilemap(gNamingScreenData->windows[4]); CopyWindowToVram(gNamingScreenData->windows[4], 3); diff --git a/src/option_menu.c b/src/option_menu.c index 6ffc4de500..94bbef3063 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -620,7 +620,7 @@ static void ButtonMode_DrawChoices(u8 selection) static void DrawTextOption(void) { - FillWindowPixelBuffer(WIN_TEXT_OPTION, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(WIN_TEXT_OPTION, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized(WIN_TEXT_OPTION, 1, gText_Option, 8, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(WIN_TEXT_OPTION, 3); } @@ -629,7 +629,7 @@ static void DrawOptionMenuTexts(void) { u8 i; - FillWindowPixelBuffer(WIN_OPTIONS, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(WIN_OPTIONS, PALETTE_NUM_TO_FILL_VALUE(1)); for (i = 0; i < MENUITEM_COUNT; i++) { AddTextPrinterParameterized(WIN_OPTIONS, 1, sOptionMenuItemsNames[i], 8, (i * 16) + 1, TEXT_SPEED_FF, NULL); diff --git a/src/party_menu.c b/src/party_menu.c index d2a4d09f2e..15128ab0c3 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -3108,7 +3108,7 @@ static void sub_81B239C(u8 a) } DeactivateAllTextPrinters(); for (i = 0; i < PARTY_SIZE; i++) - FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); LoadUserWindowBorderGfx(0, 0x4F, 0xD0); LoadPalette(GetOverworldTextboxPalettePtr(), 0xE0, 0x20); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); @@ -3126,7 +3126,7 @@ static void sub_81B2428(bool8 a) if (a == TRUE) { firstWindowId = AddWindow(&gUnknown_08615918); - FillWindowPixelBuffer(firstWindowId, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(firstWindowId, PALETTE_NUM_TO_FILL_VALUE(0)); mainOffset = GetStringCenterAlignXOffset(0, gMenuText_Confirm, 48); AddTextPrinterParameterized4(firstWindowId, 0, mainOffset, 1, 0, 0, gUnknown_086157FC[0], -1, gMenuText_Confirm); PutWindowTilemap(firstWindowId); @@ -3139,7 +3139,7 @@ static void sub_81B2428(bool8 a) windowId = AddWindow(&gUnknown_08615908); offset = 3; } - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); if (gUnknown_0203CEC8.unk8_0 != 10) { mainOffset = GetStringCenterAlignXOffset(0, gText_Cancel, 48); diff --git a/src/player_pc.c b/src/player_pc.c index 9d1b2f788a..607c2a7210 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -977,7 +977,7 @@ static void sub_816BEF0(s32 id) description = (u8 *)ItemId_GetDescription(gSaveBlock1Ptr->pcItems[id].itemId); else description = ItemStorage_GetItemPcResponse(ITEMPC_GO_BACK_TO_PREV); - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized(windowId, 1, description, 0, 1, 0, NULL); } @@ -1123,7 +1123,7 @@ static const u8* ItemStorage_GetItemPcResponse(u16 itemId) static void ItemStorage_PrintItemPcResponse(const u8 *string) { u8 windowId = gUnknown_0203BCC4->windowIds[1]; - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); StringExpandPlaceholders(gStringVar4, string); AddTextPrinterParameterized(windowId, 1, gStringVar4, 0, 1, 0, NULL); } diff --git a/src/pokeblock.c b/src/pokeblock.c index 31eaf3540c..95f91a74da 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -665,7 +665,7 @@ static void HandleInitWindows(void) for (i = 0; i < ARRAY_COUNT(sWindowTemplatesForPokeblockMenu) - 1; i++) { - FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); } schedule_bg_copy_tilemap_to_vram(0); @@ -749,7 +749,7 @@ static void sub_8135FCC(s32 pkblId) struct Pokeblock *pokeblock; u16 rectTilemapSrc[2]; - FillWindowPixelBuffer(7, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(7, PALETTE_NUM_TO_FILL_VALUE(0)); if (pkblId != LIST_B_PRESSED) { diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index 1ad0920d3f..0a110120d3 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -704,7 +704,7 @@ static void HandleInitWindows(void) DeactivateAllTextPrinters(); LoadUserWindowBorderGfx(0, 1, 0xE0); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); - FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); PutWindowTilemap(0); schedule_bg_copy_tilemap_to_vram(0); } diff --git a/src/pokedex.c b/src/pokedex.c index 1034fdbb9e..2e5e8f213d 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -2927,7 +2927,7 @@ void sub_80BEA24(u8 taskId) case 1: DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); CopyToBgTilemapBuffer(3, gPokedexTilemap_DescriptionScreen, 0, 0); - FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); PutWindowTilemap(0); PutWindowTilemap(1); sub_80C0D30(1, sPokedexListItem->dexNum); @@ -3222,7 +3222,7 @@ void sub_80BF250(u8 taskId) case 1: DecompressAndLoadBgGfxUsingHeap(3, &gPokedexMenu_Gfx, 0x2000, 0, 0); CopyToBgTilemapBuffer(3, &gPokedexTilemap_CryScreen, 0, 0); - FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); PutWindowTilemap(0); PutWindowTilemap(3); PutWindowTilemap(2); @@ -3416,7 +3416,7 @@ void sub_80BF82C(u8 taskId) case 1: DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); CopyToBgTilemapBuffer(3, gPokedexTilemap_SizeScreen, 0, 0); - FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); PutWindowTilemap(0); gMain.state++; break; @@ -3766,7 +3766,7 @@ void sub_80BFE38(u8 taskId) case 1: DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); CopyToBgTilemapBuffer(3, gPokedexTilemap_DescriptionScreen, 0, 0); - FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); PutWindowTilemap(0); PutWindowTilemap(1); sub_80C0D30(1, gTasks[taskId].data[1]); diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index d0a7ed80c3..8abb349ef5 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -1552,7 +1552,7 @@ void sub_80C6D80(const u8 *string, void *dst, u8 arg2, u8 arg3, s32 arg4) winTemplate.width = 24; winTemplate.height = 2; windowId = AddWindow(&winTemplate); - FillWindowPixelBuffer(windowId, (arg3 << 4) | arg3); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(arg3)); tileData1 = (u8*) GetWindowAttribute(windowId, WINDOW_TILE_DATA); tileData2 = (winTemplate.width * 32) + tileData1; @@ -1599,7 +1599,7 @@ void sub_80C6EAC(const u8 *string, void *dst, u16 arg2, u8 arg3, u8 clr2, u8 clr winTemplate.height = 2; var = winTemplate.width * 32; windowId = AddWindow(&winTemplate); - FillWindowPixelBuffer(windowId, (arg3 << 4) | arg3); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(arg3)); tileData1 = (u8*) GetWindowAttribute(windowId, WINDOW_TILE_DATA); tileData2 = (winTemplate.width * 32) + tileData1; txtColor[0] = arg3; @@ -1737,7 +1737,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) CreatePCMenu(task->data[1], &task->data[15]); sub_81973A4(); NewMenuHelpers_DrawDialogueFrame(0, 0); - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, TEXT_SPEED_FF, NULL, 2, 1, 3); CopyWindowToVram(0, 3); CopyWindowToVram(task->data[15], 3); @@ -1763,7 +1763,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) if (task->data[1] != task->data[3]) { task->data[1] = task->data[3]; - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3); } break; @@ -1778,13 +1778,13 @@ static void Task_PokemonStorageSystemPC(u8 taskId) default: if (task->data[2] == 0 && CountPartyMons() == PARTY_SIZE) { - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized2(0, 1, gText_PartyFull, 0, NULL, 2, 1, 3); task->data[0] = 3; } else if (task->data[2] == 1 && CountPartyMons() == 1) { - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized2(0, 1, gText_JustOnePkmn, 0, NULL, 2, 1, 3); task->data[0] = 3; } @@ -1799,7 +1799,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) case 3: if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3); task->data[0] = 2; } @@ -1809,7 +1809,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) task->data[1] = 4; Menu_MoveCursor(-1); task->data[1] = Menu_GetCursorPos(); - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3); task->data[0] = 2; } @@ -1819,7 +1819,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) task->data[1] = 0; Menu_MoveCursor(1); task->data[1] = Menu_GetCursorPos(); - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3); task->data[0] = 2; } @@ -2103,7 +2103,7 @@ static void sub_80C7BE4(void) winTemplate.height = 4; windowId = AddWindow(&winTemplate); - FillWindowPixelBuffer(windowId, 0x44); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(4)); center = GetStringCenterAlignXOffset(1, boxName, 64); AddTextPrinterParameterized3(windowId, 1, center, 1, gUnknown_08571734, TEXT_SPEED_FF, boxName); @@ -4107,7 +4107,7 @@ static void LoadCursorMonGfx(u16 species, u32 pid) static void PrintCursorMonInfo(void) { - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) { AddTextPrinterParameterized(0, 1, sPSSData->cursorMonNickText, 6, 0, TEXT_SPEED_FF, NULL); @@ -4416,7 +4416,7 @@ static void PrintStorageActionText(u8 id) } DynamicPlaceholderTextUtil_ExpandPlaceholders(sPSSData->field_2190, gPCStorageActionTexts[id].text); - FillWindowPixelBuffer(1, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized(1, 1, sPSSData->field_2190, 0, 1, TEXT_SPEED_FF, NULL); sub_8098858(1, 2, 14); PutWindowTilemap(1); @@ -8835,7 +8835,7 @@ static bool8 sub_80D0164(void) sPSSData->field_2200 = AddWindow8Bit(&gUnknown_0857BB1C); if (sPSSData->field_2200 != 0xFF) { - FillWindowPixelBuffer(sPSSData->field_2200, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(sPSSData->field_2200, PALETTE_NUM_TO_FILL_VALUE(0)); return TRUE; } } @@ -8892,7 +8892,7 @@ static bool8 sub_80D024C(void) ChangeBgX(0, -1024, 0); ChangeBgY(0, -1024, 0); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); - FillWindowPixelBuffer8Bit(sPSSData->field_2200, 0); + FillWindowPixelBuffer8Bit(sPSSData->field_2200, PALETTE_NUM_TO_FILL_VALUE(0)); sub_80D07B0(sMoveMonsPtr->fromRow, sMoveMonsPtr->fromColumn); SetBgAttribute(0, BG_ATTR_PALETTEMODE, 1); PutWindowTilemap(sPSSData->field_2200); @@ -9911,7 +9911,7 @@ static void PrintItemDescription(void) else description = ItemId_GetDescription(sPSSData->cursorMonItem); - FillWindowPixelBuffer(2, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized5(2, 1, description, 4, 0, 0, NULL, 0, 1); } diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 7985a1964e..b34dcd9fb6 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -2631,7 +2631,7 @@ static void ResetWindows(void) for (i = 0; i < 20; i++) { - FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); } for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++) { @@ -2646,9 +2646,9 @@ static void SummaryScreen_PrintTextOnWindow(u8 windowId, const u8 *string, u8 x, static void sub_81C25E8(void) { - FillWindowPixelBuffer(17, PIXEL_BUFFER_TRANSPARENT); - FillWindowPixelBuffer(18, PIXEL_BUFFER_TRANSPARENT); - FillWindowPixelBuffer(19, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(17, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(18, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(19, PALETTE_NUM_TO_FILL_VALUE(0)); if (!pssData->summary.isEgg) sub_81C2628(); else @@ -2899,7 +2899,7 @@ static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 te if (*windowIdPtr == 0xFF) { *windowIdPtr = AddWindow(&template[templateId]); - FillWindowPixelBuffer(*windowIdPtr, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(*windowIdPtr, PALETTE_NUM_TO_FILL_VALUE(0)); } return *windowIdPtr; } @@ -2921,7 +2921,7 @@ static void PrintPageSpecificText(u8 pageIndex) for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++) { if (pssData->windowIds[i] != 0xFF) - FillWindowPixelBuffer(pssData->windowIds[i], PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(pssData->windowIds[i], PALETTE_NUM_TO_FILL_VALUE(0)); } sTextPrinterFunctions[pageIndex](); } @@ -3568,7 +3568,7 @@ static void PrintContestMoveDescription(u8 moveSlot) static void PrintMoveDetails(u16 move) { u8 windowId = AddWindowFromTemplateList(gUnknown_0861CD14, 2); - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); if (move != MOVE_NONE) { if (pssData->currPageIndex == 2) @@ -3642,7 +3642,7 @@ static void sub_81C40A0(u8 moveIndex1, u8 moveIndex2) static void PrintHMMovesCantBeForgotten(void) { u8 windowId = AddWindowFromTemplateList(gUnknown_0861CD14, 2); - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); SummaryScreen_PrintTextOnWindow(windowId, gText_HMMovesCantBeForgotten2, 6, 1, 0, 0); } diff --git a/src/pokenav.c b/src/pokenav.c index ff687e8dc5..f5b3d6e13c 100644 --- a/src/pokenav.c +++ b/src/pokenav.c @@ -1158,7 +1158,7 @@ bool8 sub_81C7BE8(void) void sub_81C7BF8(u32 a0) { - FillWindowPixelBuffer(a0, 0x44); + FillWindowPixelBuffer(a0, PALETTE_NUM_TO_FILL_VALUE(4)); FillWindowPixelRect(a0, 0x55, 0, 0, 0x80, 1); } diff --git a/src/region_map.c b/src/region_map.c index e69889584c..fa5e26b111 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1622,7 +1622,7 @@ void MCB2_FlyMap(void) case 7: LoadPalette(sRegionMapFramePal, 0x10, 0x20); PutWindowTilemap(2); - FillWindowPixelBuffer(2, 0x00); + FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); AddTextPrinterParameterized(2, 1, gText_FlyToWhere, 0, 1, 0, NULL); schedule_bg_copy_tilemap_to_vram(0); gMain.state++; @@ -1707,7 +1707,7 @@ static void sub_8124904(void) } else { - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); } AddTextPrinterParameterized(0, 1, sFlyMap->regionMap.mapSecName, 0, 1, 0, NULL); schedule_bg_copy_tilemap_to_vram(0); @@ -1721,7 +1721,7 @@ static void sub_8124904(void) sub_8198070(1, FALSE); SetWindowBorderStyle(0, FALSE, 0x65, 0x0d); } - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); CopyWindowToVram(0, 2); schedule_bg_copy_tilemap_to_vram(0); gUnknown_03001180 = FALSE; diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index d4047e26df..466ef430d0 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -387,7 +387,7 @@ void nullsub_89(void) void sub_80124EC(u8 windowId, u8 arg1, u8 stringId) { - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); switch (arg1 << 8) { case 0x200: @@ -506,7 +506,7 @@ void sub_8012780(u8 taskId) } data->field_11 = AddWindow(&gUnknown_082F012C); - FillWindowPixelBuffer(data->field_10, 0x22); + FillWindowPixelBuffer(data->field_10, PALETTE_NUM_TO_FILL_VALUE(2)); sub_80173E0(data->field_10, 0, gUnknown_082EDBC4, 8, 1, 4); PutWindowTilemap(data->field_10); CopyWindowToVram(data->field_10, 2); @@ -1075,7 +1075,7 @@ void sub_80134E8(u8 taskId) data->listWindowId = AddWindow(&gUnknown_082F0174); data->field_D = AddWindow(&gUnknown_082F017C); - FillWindowPixelBuffer(data->field_C, 0x22); + FillWindowPixelBuffer(data->field_C, PALETTE_NUM_TO_FILL_VALUE(2)); sub_80173E0(data->field_C, 0, gUnknown_082EF7DC, 8, 1, 4); PutWindowTilemap(data->field_C); CopyWindowToVram(data->field_C, 2); @@ -2155,7 +2155,7 @@ void sub_8014F48(u8 taskId) data->listTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); sub_8018784(data->field_D); - FillWindowPixelBuffer(data->field_D, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(data->field_D, PALETTE_NUM_TO_FILL_VALUE(1)); PutWindowTilemap(data->field_D); sub_80125BC(data->field_D); CopyWindowToVram(data->field_D, 2); diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 411f3f3d90..62d6f9e3e7 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -231,8 +231,8 @@ static void CB2_SaveFailedScreen(void) LoadPalette(gUnknown_0860F074, 0xF0, 0x20); SetWindowBorderStyle(gSaveFailedWindowIds[TEXT_WIN_ID], FALSE, 0x214, 0xE); SetWindowBorderStyle(gSaveFailedWindowIds[CLOCK_WIN_ID], FALSE, 0x214, 0xE); - FillWindowPixelBuffer(gSaveFailedWindowIds[CLOCK_WIN_ID], PIXEL_BUFFER_WHITE); // backwards? - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gSaveFailedWindowIds[CLOCK_WIN_ID], PALETTE_NUM_TO_FILL_VALUE(1)); // backwards? + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PALETTE_NUM_TO_FILL_VALUE(1)); CopyWindowToVram(gSaveFailedWindowIds[CLOCK_WIN_ID], 2); // again? CopyWindowToVram(gSaveFailedWindowIds[TEXT_WIN_ID], 1); SaveFailedScreenTextPrint(gText_SaveFailedCheckingBackup, 1, 0); @@ -265,19 +265,19 @@ static void CB2_WipeSave(void) { if (WipeSectors(gDamagedSaveSectors) != FALSE) { - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PALETTE_NUM_TO_FILL_VALUE(1)); SaveFailedScreenTextPrint(gText_BackupMemoryDamaged, 1, 0); SetMainCallback2(CB2_GameplayCannotBeContinued); return; } - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PALETTE_NUM_TO_FILL_VALUE(1)); SaveFailedScreenTextPrint(gText_CheckCompleted, 1, 0); HandleSavingData(gSaveFailedType); if (gDamagedSaveSectors != 0) { - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PALETTE_NUM_TO_FILL_VALUE(1)); SaveFailedScreenTextPrint(gText_SaveFailedCheckingBackup, 1, 0); } @@ -286,12 +286,12 @@ static void CB2_WipeSave(void) if (wipeTries == 3) { - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PALETTE_NUM_TO_FILL_VALUE(1)); SaveFailedScreenTextPrint(gText_BackupMemoryDamaged, 1, 0); } else { - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PALETTE_NUM_TO_FILL_VALUE(1)); if (gGameContinueCallback == NULL) SaveFailedScreenTextPrint(gText_SaveCompleteGameCannotContinue, 1, 0); @@ -308,7 +308,7 @@ static void CB2_GameplayCannotBeContinued(void) if (gMain.newKeys & A_BUTTON) { - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PALETTE_NUM_TO_FILL_VALUE(1)); SaveFailedScreenTextPrint(gText_GamePlayCannotBeContinued, 1, 0); SetVBlankCallback(VBlankCB); SetMainCallback2(CB2_FadeAndReturnToTitleScreen); diff --git a/src/scrcmd.c b/src/scrcmd.c index a1e391b4af..145437a2a8 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1519,7 +1519,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) LoadUserWindowBorderGfx(gUnknown_03000F30, 0x214, 0xE0); NewMenuHelpers_DrawStdWindowFrame(gUnknown_03000F30, 0); PutWindowTilemap(gUnknown_03000F30); - FillWindowPixelBuffer(gUnknown_03000F30, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(gUnknown_03000F30, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized(gUnknown_03000F30, 6, gStringVar4, xText, yText, 0xFF, 0x0); CopyWindowToVram(gUnknown_03000F30, 3); return FALSE; diff --git a/src/script_menu.c b/src/script_menu.c index 98761fe342..8831d65c66 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1639,27 +1639,27 @@ static void sub_80E2A94(u8 multichoiceId) switch (multichoiceId) { case 77: - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized2(0, 1, gUnknown_0858BBAC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; case 76: - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized2(0, 1, gUnknown_0858BB9C[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; case 78: - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized2(0, 1, gUnknown_0858BBBC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; case 79: - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized2(0, 1, gUnknown_0858BBCC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; case 75: - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized2(0, 1, gUnknown_0858BBEC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; case 74: - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized2(0, 1, gUnknown_0858BBE0[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; } diff --git a/src/shop.c b/src/shop.c index 9c7c30feda..8c530e0d33 100755 --- a/src/shop.c +++ b/src/shop.c @@ -545,7 +545,7 @@ static void BuyMenuPrintItemDescriptionAndShowItemIcon(int item, bool8 onInit, s description = gText_QuitShopping; } - FillWindowPixelBuffer(2, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); BuyMenuPrint(2, description, 3, 1, 0, 0); } @@ -1144,7 +1144,7 @@ static void BuyMenuPrintItemQuantityAndPrice(u8 taskId) { s16 *data = gTasks[taskId].data; - FillWindowPixelBuffer(4, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(4, PALETTE_NUM_TO_FILL_VALUE(1)); PrintMoneyAmount(4, 38, 1, gShopDataPtr->totalCost, TEXT_SPEED_FF); ConvertIntToDecimalStringN(gStringVar1, tItemCount, 2, 2); StringExpandPlaceholders(gStringVar4, gText_xVar1); diff --git a/src/slot_machine.c b/src/slot_machine.c index bf26de437a..f603f468c3 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -3036,7 +3036,7 @@ s16 sub_8102D5C(s16 a0) sub_81065DC(); AddWindow(&gUnknown_085A7444); PutWindowTilemap(1); - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); task->data[0]++; } @@ -3052,7 +3052,7 @@ s16 sub_8102D5C(s16 a0) { if (gMain.newKeys & (B_BUTTON | SELECT_BUTTON)) { - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); ClearWindowTilemap(1); CopyWindowToVram(1, 1); RemoveWindow(1); diff --git a/src/start_menu.c b/src/start_menu.c index 4231db7cc7..c61269c9cd 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1232,7 +1232,7 @@ static void sub_80A0550(u8 taskId) switch (*step) { case 0: - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized2(0, 1, gText_SavingDontTurnOffPower, diff --git a/src/starter_choose.c b/src/starter_choose.c index fda1d95fa9..4e21c1845a 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -523,7 +523,7 @@ static void Task_StarterChoose3(u8 taskId) static void Task_StarterChoose4(u8 taskId) { PlayCry1(GetStarterPokemon(gTasks[taskId].tStarterSelection), 0); - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized(0, 1, gText_ConfirmStarterChoice, 0, 1, 0, NULL); schedule_bg_copy_tilemap_to_vram(0); CreateYesNoMenu(&gUnknown_085B1DDC, 0x2A8, 0xD, 0); @@ -579,7 +579,7 @@ static void CreateStarterPokemonLabel(u8 selection) winTemplate.tilemapTop = gStarterChoose_LabelCoords[selection][1]; sStarterChooseWindowId = AddWindow(&winTemplate); - FillWindowPixelBuffer(sStarterChooseWindowId, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(sStarterChooseWindowId, PALETTE_NUM_TO_FILL_VALUE(0)); width = GetStringCenterAlignXOffset(7, text, 0x68); AddTextPrinterParameterized3(sStarterChooseWindowId, 7, width, 1, gUnknown_085B1E0C, 0, text); @@ -600,7 +600,7 @@ static void CreateStarterPokemonLabel(u8 selection) static void sub_8134604(void) { - FillWindowPixelBuffer(sStarterChooseWindowId, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(sStarterChooseWindowId, PALETTE_NUM_TO_FILL_VALUE(0)); ClearWindowTilemap(sStarterChooseWindowId); RemoveWindow(sStarterChooseWindowId); sStarterChooseWindowId = 0xFF; diff --git a/src/text.c b/src/text.c index a439d3ced8..c3ae315d0a 100644 --- a/src/text.c +++ b/src/text.c @@ -1581,7 +1581,7 @@ u16 RenderText(struct TextPrinter *textPrinter) textPrinter->printerTemplate.currentChar++; return 2; case 15: - FillWindowPixelBuffer(textPrinter->printerTemplate.windowId, textPrinter->printerTemplate.bgColor | textPrinter->printerTemplate.bgColor << 4); + FillWindowPixelBuffer(textPrinter->printerTemplate.windowId, PALETTE_NUM_TO_FILL_VALUE(textPrinter->printerTemplate.bgColor)); textPrinter->printerTemplate.currentX = textPrinter->printerTemplate.x; textPrinter->printerTemplate.currentY = textPrinter->printerTemplate.y; return 2; @@ -1702,7 +1702,7 @@ u16 RenderText(struct TextPrinter *textPrinter) case 2: if (TextPrinterWaitWithDownArrow(textPrinter)) { - FillWindowPixelBuffer(textPrinter->printerTemplate.windowId, (textPrinter->printerTemplate.bgColor << 4) | textPrinter->printerTemplate.bgColor); + FillWindowPixelBuffer(textPrinter->printerTemplate.windowId, PALETTE_NUM_TO_FILL_VALUE(textPrinter->printerTemplate.bgColor)); textPrinter->printerTemplate.currentX = textPrinter->printerTemplate.x; textPrinter->printerTemplate.currentY = textPrinter->printerTemplate.y; textPrinter->state = 0; diff --git a/src/trade.c b/src/trade.c index 148ad2e265..1b1b4670bd 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1418,7 +1418,7 @@ static void sub_80772A4(void) for (i = 0; i < 18; i++) { ClearWindowTilemap(i); - FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); } FillBgTilemapBufferRect(0, 0, 0, 0, 30, 20, 15); @@ -2461,7 +2461,7 @@ static void sub_8078DBC(void) if (gUnknown_0203229C->tradeMenuCursorPosition < 6) { sub_8098858(1, 1, 14); - FillWindowPixelBuffer(1, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(1)); PrintMenuTable(1, 2, gUnknown_0832DEAC); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(1, 2, 0); PutWindowTilemap(1); @@ -2724,7 +2724,7 @@ static void sub_8079408(void) for (i = 0; i < 4; i++) { - FillWindowPixelBuffer(i + 14, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(i + 14, PALETTE_NUM_TO_FILL_VALUE(0)); rbox_fill_rectangle(i + 14); } @@ -3256,7 +3256,7 @@ static void sub_807A0C4(void) static void sub_807A19C(u8 a0) { - FillWindowPixelBuffer(0, PIXEL_BUFFER_WHITE); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized(0, 1, gUnknown_0832DEBC[a0], 0, 1, TEXT_SPEED_FF, NULL); sub_8098858(0, 20, 12); PutWindowTilemap(0); @@ -4185,7 +4185,7 @@ void sub_807B140(void) void sub_807B154(void) { - FillWindowPixelBuffer(0, PIXEL_BUFFER_UNKNOWN); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(15)); PutWindowTilemap(0); CopyWindowToVram(0, 3); } @@ -4263,7 +4263,7 @@ static void sub_807B270(void) break; case 8: sub_807ACFC(1, 1); - FillWindowPixelBuffer(0, PIXEL_BUFFER_UNKNOWN); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(15)); PutWindowTilemap(0); CopyWindowToVram(0, 3); gMain.state++; @@ -4654,7 +4654,7 @@ static bool8 sub_807BBEC(void) if (!gPaletteFade.active) { sub_807B62C(4); - FillWindowPixelBuffer(0, PIXEL_BUFFER_UNKNOWN); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(15)); CopyWindowToVram(0, 3); gUnknown_020322A0->state++; } @@ -5146,7 +5146,7 @@ static bool8 sub_807CFC8(void) if (!gPaletteFade.active) { sub_807B62C(4); - FillWindowPixelBuffer(0, PIXEL_BUFFER_UNKNOWN); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(15)); CopyWindowToVram(0, 3); gUnknown_020322A0->state++; } @@ -6085,7 +6085,7 @@ void sub_807F19C(void) void sub_807F1A8(u8 windowId, const u8 *str, u8 speed) { - FillWindowPixelBuffer(windowId, PIXEL_BUFFER_UNKNOWN); + FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(15)); gUnknown_020322A0->unk_F6[0] = 15; gUnknown_020322A0->unk_F6[1] = 1; gUnknown_020322A0->unk_F6[2] = 6; diff --git a/src/trainer_card.c b/src/trainer_card.c index d6d3b31527..c8f0df0db3 100755 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -350,7 +350,7 @@ static void sub_80C2760(u8 taskId) case 0: if (!IsDma3ManagerBusyWithBgCopy()) { - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); sData->var_0++; } break; @@ -363,7 +363,7 @@ static void sub_80C2760(u8 taskId) sData->var_0++; break; case 3: - FillWindowPixelBuffer(2, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); sub_80C4FF0(); sub_80C438C(2); sData->var_0++; @@ -1634,7 +1634,7 @@ static bool8 sub_80C4B08(struct Task* task) switch (sData->var_4) { case 0: - FillWindowPixelBuffer(1, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); FillBgTilemapBufferRect_Palette0(3, 0, 0, 0, 0x20, 0x20); break; case 1: @@ -1659,7 +1659,7 @@ static bool8 sub_80C4B08(struct Task* task) if (!sData->var_8) sub_80C474C(); else - FillWindowPixelBuffer(2, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); break; case 4: if (sData->var_8) diff --git a/src/trainer_hill.c b/src/trainer_hill.c index 5f351554e7..821068fef5 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -609,7 +609,7 @@ void PrintOnTrainerHillRecordsWindow(void) u32 total, minutes, secondsWhole, secondsFraction; SetUpDataStruct(); - FillWindowPixelBuffer(0, PIXEL_BUFFER_TRANSPARENT); + FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); x = GetStringCenterAlignXOffset(1, gText_TimeBoard, 0xD0); AddTextPrinterParameterized3(0, 1, x, 2, sRecordWinColors, TEXT_SPEED_FF, gText_TimeBoard); diff --git a/src/unk_text_util_2.c b/src/unk_text_util_2.c index bbc256915f..08fdf2e84e 100644 --- a/src/unk_text_util_2.c +++ b/src/unk_text_util_2.c @@ -114,7 +114,7 @@ u16 Font6Func(struct TextPrinter *textPrinter) textPrinter->printerTemplate.currentY = textPrinter->printerTemplate.y + *textPrinter->printerTemplate.currentChar++; return 2; case 15: - FillWindowPixelBuffer(textPrinter->printerTemplate.windowId, textPrinter->printerTemplate.bgColor | (textPrinter->printerTemplate.bgColor << 4)); + FillWindowPixelBuffer(textPrinter->printerTemplate.windowId, PALETTE_NUM_TO_FILL_VALUE(textPrinter->printerTemplate.bgColor)); return 2; } break; @@ -146,7 +146,7 @@ u16 Font6Func(struct TextPrinter *textPrinter) case 2: if (TextPrinterWaitWithDownArrow(textPrinter)) { - FillWindowPixelBuffer(textPrinter->printerTemplate.windowId, textPrinter->printerTemplate.bgColor | (textPrinter->printerTemplate.bgColor << 4)); + FillWindowPixelBuffer(textPrinter->printerTemplate.windowId, PALETTE_NUM_TO_FILL_VALUE(textPrinter->printerTemplate.bgColor)); textPrinter->printerTemplate.currentX = textPrinter->printerTemplate.x; textPrinter->printerTemplate.currentY = textPrinter->printerTemplate.y; textPrinter->state = 0; diff --git a/src/window.c b/src/window.c index 1daf4b5fcb..94e68cae5f 100644 --- a/src/window.c +++ b/src/window.c @@ -106,7 +106,7 @@ bool16 InitWindows(const struct WindowTemplate *templates) } } - gTransparentTileNumber = TRANSPARENT_TILE_NUMBER; + gTransparentTileNumber = 0; return TRUE; } From 199863f21f41b3a51d9a6302ca7c3c2864ee1c17 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Thu, 21 Feb 2019 23:56:22 -0500 Subject: [PATCH 097/217] Replace more instances of fill values --- src/list_menu.c | 10 +++++----- src/naming_screen.c | 4 +++- src/pokemon_storage_system.c | 2 +- src/text.c | 4 ++-- src/unk_text_util_2.c | 4 ++-- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/list_menu.c b/src/list_menu.c index 83293890c0..656ab7a157 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -698,7 +698,7 @@ static void ListMenuErasePrintedCursor(struct ListMenu *list, u16 selectedRow) u8 width = GetMenuCursorDimensionByFont(list->template.fontId, 0); u8 height = GetMenuCursorDimensionByFont(list->template.fontId, 1); FillWindowPixelRect(list->template.windowId, - (list->template.fillValue << 4) | (list->template.fillValue), + PALETTE_NUM_TO_FILL_VALUE(list->template.fillValue), list->template.cursor_X, selectedRow * yMultiplier + list->template.upText_Y, width, @@ -806,26 +806,26 @@ static void ListMenuScroll(struct ListMenu *list, u8 count, bool8 movingDown) { u16 y, width, height; - ScrollWindow(list->template.windowId, 1, count * yMultiplier, (list->template.fillValue << 4) | (list->template.fillValue)); + ScrollWindow(list->template.windowId, 1, count * yMultiplier, PALETTE_NUM_TO_FILL_VALUE(list->template.fillValue)); ListMenuPrintEntries(list, list->scrollOffset, 0, count); y = (list->template.maxShowed * yMultiplier) + list->template.upText_Y; width = GetWindowAttribute(list->template.windowId, WINDOW_WIDTH) * 8; height = (GetWindowAttribute(list->template.windowId, WINDOW_HEIGHT) * 8) - y; FillWindowPixelRect(list->template.windowId, - (list->template.fillValue << 4) | (list->template.fillValue), + PALETTE_NUM_TO_FILL_VALUE(list->template.fillValue), 0, y, width, height); } else { u16 width; - ScrollWindow(list->template.windowId, 0, count * yMultiplier, (list->template.fillValue << 4) | (list->template.fillValue)); + ScrollWindow(list->template.windowId, 0, count * yMultiplier, PALETTE_NUM_TO_FILL_VALUE(list->template.fillValue)); ListMenuPrintEntries(list, list->scrollOffset + (list->template.maxShowed - count), list->template.maxShowed - count, count); width = GetWindowAttribute(list->template.windowId, WINDOW_WIDTH) * 8; FillWindowPixelRect(list->template.windowId, - (list->template.fillValue << 4) | (list->template.fillValue), + PALETTE_NUM_TO_FILL_VALUE(list->template.fillValue), 0, 0, width, list->template.upText_Y); } } diff --git a/src/naming_screen.c b/src/naming_screen.c index a84cbd6576..013eb37ca9 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1704,7 +1704,9 @@ static const struct TextColorThing sUnkColorStruct = static const u8 sFillValues[3] = { - 0xEE, 0xDD, 0xFF + PALETTE_NUM_TO_FILL_VALUE(0xE), + PALETTE_NUM_TO_FILL_VALUE(0xD), + PALETTE_NUM_TO_FILL_VALUE(0xF) }; static const u8 *const sUnkColors[3] = diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 8abb349ef5..d4c4c52248 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -9194,7 +9194,7 @@ static void sub_80D0834(u8 arg0, u8 arg1) if (species != SPECIES_NONE) { FillWindowPixelRect8Bit(sPSSData->field_2200, - 0, + PALETTE_NUM_TO_FILL_VALUE(0), 24 * arg0, 24 * arg1, 32, diff --git a/src/text.c b/src/text.c index c3ae315d0a..dc28d71c89 100644 --- a/src/text.c +++ b/src/text.c @@ -1724,12 +1724,12 @@ u16 RenderText(struct TextPrinter *textPrinter) int speed = gWindowVerticalScrollSpeeds[scrollSpeed]; if (textPrinter->scrollDistance < speed) { - ScrollWindow(textPrinter->printerTemplate.windowId, 0, textPrinter->scrollDistance, textPrinter->printerTemplate.bgColor << 4 | textPrinter->printerTemplate.bgColor); + ScrollWindow(textPrinter->printerTemplate.windowId, 0, textPrinter->scrollDistance, PALETTE_NUM_TO_FILL_VALUE(textPrinter->printerTemplate.bgColor)); textPrinter->scrollDistance = 0; } else { - ScrollWindow(textPrinter->printerTemplate.windowId, 0, speed, textPrinter->printerTemplate.bgColor << 4 | textPrinter->printerTemplate.bgColor); + ScrollWindow(textPrinter->printerTemplate.windowId, 0, speed, PALETTE_NUM_TO_FILL_VALUE(textPrinter->printerTemplate.bgColor)); textPrinter->scrollDistance -= speed; } CopyWindowToVram(textPrinter->printerTemplate.windowId, 2); diff --git a/src/unk_text_util_2.c b/src/unk_text_util_2.c index 08fdf2e84e..6fbe6d04f5 100644 --- a/src/unk_text_util_2.c +++ b/src/unk_text_util_2.c @@ -166,12 +166,12 @@ u16 Font6Func(struct TextPrinter *textPrinter) { if (textPrinter->scrollDistance < sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed]) { - ScrollWindow(textPrinter->printerTemplate.windowId, 0, textPrinter->scrollDistance, textPrinter->printerTemplate.bgColor | (textPrinter->printerTemplate.bgColor << 4)); + ScrollWindow(textPrinter->printerTemplate.windowId, 0, textPrinter->scrollDistance, PALETTE_NUM_TO_FILL_VALUE(textPrinter->printerTemplate.bgColor)); textPrinter->scrollDistance = 0; } else { - ScrollWindow(textPrinter->printerTemplate.windowId, 0, sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed], textPrinter->printerTemplate.bgColor | (textPrinter->printerTemplate.bgColor << 4)); + ScrollWindow(textPrinter->printerTemplate.windowId, 0, sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed], PALETTE_NUM_TO_FILL_VALUE(textPrinter->printerTemplate.bgColor)); textPrinter->scrollDistance -= sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed]; } CopyWindowToVram(textPrinter->printerTemplate.windowId, 2); From 44e92ce2596981c8d42b70922e5ae84d6b321ab1 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 01:40:11 -0500 Subject: [PATCH 098/217] Give window drawing functions better names --- asm/rom_8011DC0.s | 52 ++++++++++---------- asm/rom_81D1C44.s | 10 ++-- include/menu.h | 20 ++++---- include/window.h | 3 -- src/apprentice.c | 4 +- src/battle_pyramid_bag.c | 13 ++--- src/battle_records.c | 4 +- src/berry_blender.c | 10 ++-- src/cable_club.c | 4 +- src/clear_save_data_screen.c | 2 +- src/coins.c | 4 +- src/daycare.c | 6 +-- src/decoration.c | 42 ++++++++-------- src/field_message_box.c | 6 +-- src/field_player_avatar.c | 4 +- src/field_region_map.c | 4 +- src/field_specials.c | 12 ++--- src/fldeff_softboiled.c | 2 +- src/frontier_util.c | 18 +++---- src/hall_of_fame.c | 10 ++-- src/item_menu.c | 7 +-- src/item_use.c | 4 +- src/list_menu.c | 4 +- src/main_menu.c | 16 +++---- src/map_name_popup.c | 4 +- src/mauville_old_man.c | 2 +- src/menu.c | 92 ++++++++++++++++++------------------ src/menu_helpers.c | 2 +- src/money.c | 4 +- src/mystery_event_menu.c | 4 +- src/naming_screen.c | 2 +- src/party_menu.c | 14 +++--- src/player_pc.c | 24 +++++----- src/pokeblock.c | 8 ++-- src/pokeblock_feed.c | 2 +- src/pokemon_storage_system.c | 14 +++--- src/record_mixing.c | 4 +- src/region_map.c | 12 ++--- src/reset_rtc_screen.c | 10 ++-- src/rom_8011DC0.c | 16 +++---- src/roulette.c | 40 ++++++++-------- src/save_failed_screen.c | 4 +- src/scrcmd.c | 6 +-- src/script_menu.c | 4 +- src/secret_base.c | 16 +++---- src/shop.c | 16 +++---- src/slot_machine.c | 18 +++---- src/start_menu.c | 44 ++++++++--------- src/starter_choose.c | 2 +- src/trader.c | 4 +- src/trainer_card.c | 2 +- src/wallclock.c | 4 +- src/window.c | 1 + 53 files changed, 318 insertions(+), 318 deletions(-) diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index 7d43b18151..9a77545a7a 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -472,7 +472,7 @@ sub_8017020: @ 8017020 bl sub_81973A4 movs r0, 0 movs r1, 0x1 - bl NewMenuHelpers_DrawDialogueFrame + bl DrawDialogueFrame ldr r0, =gStringVar4 adds r1, r4, 0 bl StringExpandPlaceholders @@ -517,7 +517,7 @@ _08017076: bl sub_81973A4 movs r0, 0 movs r1, 0x1 - bl NewMenuHelpers_DrawDialogueFrame + bl DrawDialogueFrame ldr r0, =gStringVar4 adds r1, r5, 0 bl StringExpandPlaceholders @@ -563,7 +563,7 @@ _080170CA: negs r0, r0 b _08017110 _080170D4: - bl DisplayYesNoMenu + bl DisplayYesNoMenuWithDefault ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -609,7 +609,7 @@ sub_8017118: @ 8017118 lsrs r4, 24 adds r0, r4, 0 movs r1, 0 - bl NewMenuHelpers_DrawStdWindowFrame + bl DrawStdWindowFrame adds r0, r4, 0 movs r1, 0xFF bl FillWindowPixelBuffer @@ -705,7 +705,7 @@ _080171DC: strb r0, [r5] ldrb r0, [r5] movs r1, 0 - bl NewMenuHelpers_DrawStdWindowFrame + bl DrawStdWindowFrame ldr r0, =gMultiuseListMenuTemplate adds r2, r0, 0 ldr r1, [sp, 0x24] @@ -745,7 +745,7 @@ _08017228: bl DestroyListMenuTask ldrb r0, [r5] movs r1, 0x1 - bl ClearWindowAndBorder + bl ClearStdWindowAndFrame ldrb r0, [r5] bl RemoveWindow movs r0, 0 @@ -765,7 +765,7 @@ _08017264: bl DestroyListMenuTask ldrb r0, [r5] movs r1, 0x1 - bl ClearWindowAndBorder + bl ClearStdWindowAndFrame ldrb r0, [r5] bl RemoveWindow strb r4, [r7] @@ -818,7 +818,7 @@ _080172C8: strb r0, [r6] ldrb r0, [r6] movs r1, 0 - bl NewMenuHelpers_DrawStdWindowFrame + bl DrawStdWindowFrame ldr r0, =gMultiuseListMenuTemplate adds r2, r0, 0 ldr r1, [sp, 0x24] @@ -18242,7 +18242,7 @@ sub_801FEBC: @ 801FEBC lsls r0, 24 lsrs r0, 24 movs r1, 0 - bl sub_8198070 + bl ClearStdWindowAndFrameToTransparent ldr r0, [r4] ldrb r0, [r0, 0x18] bl ClearWindowTilemap @@ -18470,7 +18470,7 @@ sub_8020094: @ 8020094 lsls r0, 24 lsrs r0, 24 movs r1, 0 - bl sub_8198070 + bl ClearStdWindowAndFrameToTransparent ldr r0, [r4] ldrb r0, [r0, 0x1E] bl ClearWindowTilemap @@ -18913,7 +18913,7 @@ sub_802040C: @ 802040C push {lr} movs r0, 0x3 movs r1, 0 - bl sub_8198070 + bl ClearStdWindowAndFrameToTransparent movs r0, 0x3 bl ClearWindowTilemap pop {r0} @@ -22378,7 +22378,7 @@ _0802210C: movs r1, 0 adds r2, r4, 0 movs r3, 0xD - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette b _08022218 .pool _08022130: @@ -22509,7 +22509,7 @@ sub_802222C: @ 802222C adds r5, r4, r0 ldrb r0, [r5] movs r1, 0x1 - bl sub_8198070 + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r5] bl RemoveWindow adds r0, r4, 0 @@ -22577,7 +22577,7 @@ _08022296: movs r1, 0 adds r2, r4, 0 movs r3, 0xD - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette b _080224BA .pool _080222D0: @@ -22773,7 +22773,7 @@ _08022480: _08022494: ldrb r0, [r6, 0x2] movs r1, 0x1 - bl sub_8198070 + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r6, 0x2] bl ClearWindowTilemap ldrb r0, [r6, 0x2] @@ -23864,7 +23864,7 @@ _08022D38: _08022D42: movs r0, 0 movs r1, 0 - bl NewMenuHelpers_DrawDialogueFrame + bl DrawDialogueFrame ldrb r1, [r5, 0x1] movs r0, 0x2 mov r8, r0 @@ -23946,7 +23946,7 @@ _08022DE8: beq _08022DFA movs r0, 0 movs r1, 0x1 - bl ClearWindowAndWideBorder + bl ClearDialogWindowAndFrame _08022DFA: ldrb r0, [r7, 0xE] movs r1, 0x1 @@ -24250,7 +24250,7 @@ _0802301E: _08023044: movs r0, 0 movs r1, 0x1 - bl ClearWindowAndWideBorder + bl ClearDialogWindowAndFrame movs r0, 0xA movs r1, 0x1 movs r2, 0 @@ -26462,7 +26462,7 @@ _080241A6: beq _0802421E movs r0, 0 movs r1, 0 - bl NewMenuHelpers_DrawDialogueFrame + bl DrawDialogueFrame ldr r2, =gText_SavingDontTurnOffPower movs r0, 0 str r0, [sp] @@ -26550,7 +26550,7 @@ _08024246: strb r0, [r5, 0xC] b _080242D8 _0802426A: - bl DisplayYesNoMenu + bl DisplayYesNoMenuWithDefault b _080242D0 _08024270: bl Menu_ProcessInputNoWrapClearOnChoose @@ -26583,7 +26583,7 @@ _080242A4: _080242A6: movs r0, 0 movs r1, 0x1 - bl ClearWindowAndWideBorder + bl ClearDialogWindowAndFrame movs r4, 0 str r4, [sp] adds r0, r6, 0 @@ -26761,7 +26761,7 @@ _080243EA: _080243F6: movs r0, 0 movs r1, 0x1 - bl ClearWindowAndWideBorder + bl ClearDialogWindowAndFrame adds r0, r5, 0 bl sub_8021488 movs r0, 0x1 @@ -26819,7 +26819,7 @@ _0802445A: _08024460: movs r0, 0 movs r1, 0 - bl NewMenuHelpers_DrawDialogueFrame + bl DrawDialogueFrame ldrh r1, [r5, 0x14] cmp r1, 0x3 bne _08024490 @@ -27347,7 +27347,7 @@ sub_802482C: @ 802482C movs r1, 0 adds r2, r4, 0 adds r3, r5, 0 - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette ldr r2, =gText_Powder movs r0, 0x1 str r0, [sp] @@ -27446,7 +27446,7 @@ sub_8024918: @ 8024918 bl ClearWindowTilemap ldrb r0, [r4] movs r1, 0x1 - bl sub_8198070 + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r4] bl RemoveWindow pop {r4} @@ -38552,7 +38552,7 @@ _0802A3A4: _0802A3AE: movs r0, 0 movs r1, 0 - bl NewMenuHelpers_DrawDialogueFrame + bl DrawDialogueFrame ldr r2, =gText_SavingDontTurnOffPower str r4, [sp] movs r0, 0x2 diff --git a/asm/rom_81D1C44.s b/asm/rom_81D1C44.s index 13664a4b2b..eab52bbf46 100644 --- a/asm/rom_81D1C44.s +++ b/asm/rom_81D1C44.s @@ -108,7 +108,7 @@ sub_81D1D04: @ 81D1D04 adds r4, r0 ldrb r0, [r4] movs r1, 0 - bl sub_8198070 + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r4] bl ClearWindowTilemap ldrb r0, [r4] @@ -1613,7 +1613,7 @@ _081D284A: movs r1, 0 movs r2, 0x1 movs r3, 0xE - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette b _081D288E .pool _081D287C: @@ -1623,7 +1623,7 @@ _081D287C: movs r1, 0 movs r2, 0x1 movs r3, 0xE - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette _081D288E: movs r0, 0x2 bl PutWindowTilemap @@ -1633,12 +1633,12 @@ _081D288E: movs r1, 0 movs r2, 0x1 movs r3, 0xE - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette movs r0, 0x3 movs r1, 0 movs r2, 0x1 movs r3, 0xE - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette bl nullsub_79 movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram diff --git a/include/menu.h b/include/menu.h index cb017187a1..ae89a1ab46 100644 --- a/include/menu.h +++ b/include/menu.h @@ -25,23 +25,23 @@ void InitStandardTextBoxWindows(void); void sub_8197200(void); u16 RunTextPrintersAndIsPrinter0Active(void); void sub_81973A4(void); -void NewMenuHelpers_DrawDialogueFrame(u8, u8); -void ClearWindowAndBorder(u8 windowId, bool8 copyToVram); +void DrawDialogueFrame(u8, u8); +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 ClearWindowAndWideBorder(u8 windowId, bool8 copyToVram); +void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram); void SetStandardWindowBorderStyle(u8 a0, u8 a1); -void DisplayYesNoMenu(void); +void DisplayYesNoMenuWithDefault(void); u32 GetPlayerTextSpeed(void); u8 GetPlayerTextSpeedDelay(void); void sub_81978B0(u16 arg0); void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextPrinterTemplate *, u16)); void sub_8199DF0(u32 bg, u8 a1, int a2, int a3); void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 left, u8 top, const u8 *color, s8 speed, const u8 *str); -void sub_8198070(u8 windowId, bool8 copyToVram); +void ClearStdWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram); void SetWindowTemplateFields(struct WindowTemplate* template, u8 priority, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palNum, u16 baseBlock); -void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, u16 tileStart, u8 palette); +void DrawStdFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 tileStart, u8 palette); void schedule_bg_copy_tilemap_to_vram(u8 bgNum); void PrintMenuTable(u8 windowId, u8 itemCount, const struct MenuAction *strs); u8 InitMenuInUpperLeftCornerPlaySoundWhenAPressed(u8 windowId, u8 numItems, u8 initialCursorPos); @@ -60,9 +60,9 @@ s8 ProcessMenuInput_other(void); void do_scheduled_bg_tilemap_copies_to_vram(void); void clear_scheduled_bg_copies_to_vram(void); void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const u8 *color, s8 speed, const u8 *str); -void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u8 a3); +void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 a2, u8 a3); void sub_81995E4(u8 windowId, u8 optionsNo, const struct MenuAction *actions, const u8 *actionIds); -void sub_8197DF8(u8 windowId, bool8 copyToVram); +void ClearDialogWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram); u16 sub_8198AA4(u8, u8, u8, u8, u8, u8, u16); void *malloc_and_decompress(const void *src, u32 *sizeOut); u16 copy_decompressed_tile_data_to_vram(u8 bgId, const void *src, u16 size, u16 offset, u8 mode); @@ -75,13 +75,13 @@ u8 GetStartMenuWindowId(void); void sub_819A2BC(u8, u8); u8 Menu_MoveCursor(s8 cursorDelta); u8 Menu_MoveCursorNoWrapAround(s8 cursorDelta); -void NewMenuHelpers_DrawStdWindowFrame(u8 windowId, bool8 CopyToVram); +void DrawStdWindowFrame(u8 windowId, bool8 CopyToVram); u8 sub_81979C4(u8 a1); u8 sub_81983AC(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPos); void sub_819786C(u8 windowId, bool8 copyToVram); void AddTextPrinterForMessage_2(bool8 allowSkippingDelayWithButtonPress); void RemoveStartMenuWindow(void); -void sub_8197948(u8 initialCursorPos); +void DisplayYesNoMenuWithDefaultDefaultNo(u8 initialCursorPos); void sub_819A344(u8 a0, u8 *dest, u8 color); void RemoveMapNamePopUpWindow(void); u8 GetMapNamePopUpWindowId(void); diff --git a/include/window.h b/include/window.h index 1daee39efc..ece1ecd21e 100644 --- a/include/window.h +++ b/include/window.h @@ -75,7 +75,4 @@ extern u32 filler_03002F58; extern u32 filler_03002F5C; extern u32 filler_03002F64; -// This global is set to 0 and never changed. -extern u8 gTransparentTileNumber; - #endif // GUARD_WINDOW_H diff --git a/src/apprentice.c b/src/apprentice.c index 9cf8cd4b46..27ff8e36e7 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -1619,7 +1619,7 @@ static u8 CreateAndShowWindow(u8 left, u8 top, u8 width, u8 height) static void RemoveAndHideWindow(u8 windowId) { - sub_8198070(windowId, TRUE); + ClearStdWindowAndFrameToTransparent(windowId, TRUE); RemoveWindow(windowId); } @@ -1826,7 +1826,7 @@ static void Script_PrintMessage(void) FreezeEventObjects(); sub_808B864(); sub_808BCF4(); - NewMenuHelpers_DrawDialogueFrame(0, 1); + DrawDialogueFrame(0, 1); PrintMessage(); } diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index 5103562155..20029b2845 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -1146,7 +1146,7 @@ static void sub_81C64B4(u8 taskId) else if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - sub_8198070(3, 0); + ClearStdWindowAndFrameToTransparent(3, 0); ClearWindowTilemap(3); schedule_bg_copy_tilemap_to_vram(1); sub_81C6350(taskId); @@ -1154,7 +1154,7 @@ static void sub_81C64B4(u8 taskId) else if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); - sub_8198070(3, 0); + ClearStdWindowAndFrameToTransparent(3, 0); ClearWindowTilemap(3); schedule_bg_copy_tilemap_to_vram(1); DontTossItem(taskId); @@ -1415,7 +1415,7 @@ static void PrintOnWindow_Font7(u8 windowId, const u8 *src, u8 x, u8 y, u8 lette static void sub_81C6CEC(u8 windowId) { - SetWindowBorderStyle(windowId, 0, 1, 0xE); + DrawStdFrameWithCustomTileAndPalette(windowId, 0, 1, 0xE); schedule_bg_copy_tilemap_to_vram(1); } @@ -1430,7 +1430,7 @@ static u8 sub_81C6D24(u8 windowArrayId) if (*windowId == 0xFF) { *windowId = AddWindow(&gUnknown_0861F350[windowArrayId]); - SetWindowBorderStyle(*windowId, FALSE, 1, 0xE); + DrawStdFrameWithCustomTileAndPalette(*windowId, FALSE, 1, 0xE); schedule_bg_copy_tilemap_to_vram(1); } return *windowId; @@ -1441,7 +1441,7 @@ static void sub_81C6D6C(u8 windowArrayId) u8 *windowId = &gPyramidBagResources->windowIds[windowArrayId]; if (*windowId != 0xFF) { - sub_8198070(*windowId, FALSE); + ClearStdWindowAndFrameToTransparent(*windowId, FALSE); ClearWindowTilemap(*windowId); RemoveWindow(*windowId); schedule_bg_copy_tilemap_to_vram(1); @@ -1463,7 +1463,8 @@ void DisplayItemMessageInBattlePyramid(u8 taskId, const u8 *str, void (*callback static void sub_81C6E1C(void) { - sub_8197DF8(2, FALSE); + ClearDialogWindowAndFrameToTransparent(2, FALSE); + // This ClearWindowTilemap call is redundant, since ClearDialogWindowAndFrameToTransparent already calls it. ClearWindowTilemap(2); schedule_bg_copy_tilemap_to_vram(1); } diff --git a/src/battle_records.c b/src/battle_records.c index eb41dcc94a..03d2088b4f 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -320,7 +320,7 @@ void ShowLinkBattleRecords(void) s32 i, x; gRecordsWindowId = AddWindow(&sLinkBattleRecordsWindow); - NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); + DrawStdWindowFrame(gRecordsWindowId, FALSE); FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); StringExpandPlaceholders(gStringVar4, gText_PlayersBattleResults); @@ -342,7 +342,7 @@ void ShowLinkBattleRecords(void) void RemoveRecordsWindow(void) { - ClearWindowAndBorder(gRecordsWindowId, FALSE); + ClearStdWindowAndFrame(gRecordsWindowId, FALSE); RemoveWindow(gRecordsWindowId); } diff --git a/src/berry_blender.c b/src/berry_blender.c index 0a35c672f9..35749db544 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -1251,7 +1251,7 @@ static void sub_8080018(void) case 10: if (++sBerryBlenderData->framesToWait > 20) { - sub_8197DF8(4, TRUE); + ClearDialogWindowAndFrameToTransparent(4, TRUE); if (GetBlockReceivedStatus() == sub_800A9D8()) { for (i = 0; i < GetLinkPlayerCount(); i++) @@ -3325,7 +3325,7 @@ static bool8 Blender_PrintBlendingResults(void) sBerryBlenderData->mainState++; break; case 5: - sub_8198070(5, 1); + ClearStdWindowAndFrameToTransparent(5, 1); for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { @@ -3466,7 +3466,7 @@ static bool8 Blender_PrintBlendingRanking(void) } break; case 3: - SetWindowBorderStyle(5, 0, 1, 0xD); + DrawStdFrameWithCustomTileAndPalette(5, 0, 1, 0xD); xPos = GetStringCenterAlignXOffset(1, sText_Ranking, 0xA8); Blender_AddTextPrinter(5, sText_Ranking, xPos, 1, TEXT_SPEED_FF, 0); @@ -3537,7 +3537,7 @@ void ShowBerryBlenderRecordWindow(void) winTemplate = sBlenderRecordWindowTemplate; gRecordsWindowId = AddWindow(&winTemplate); - NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, 0); + DrawStdWindowFrame(gRecordsWindowId, 0); FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); xPos = GetStringCenterAlignXOffset(1, gText_BlenderMaxSpeedRecord, 0x90); @@ -3658,7 +3658,7 @@ static bool32 Blender_PrintText(s16 *textState, const u8 *string, s32 textSpeed) switch (*textState) { case 0: - sub_8197B1C(4, FALSE, 0x14, 0xF); + DrawDialogFrameWithCustomTileAndPalette(4, FALSE, 0x14, 0xF); Blender_AddTextPrinter(4, string, 0, 1, textSpeed, 0); PutWindowTilemap(4); CopyWindowToVram(4, 3); diff --git a/src/cable_club.c b/src/cable_club.c index f8137fd8fa..dfef399751 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -93,8 +93,8 @@ static void sub_80B23B0(u16 windowId, u32 value) static void sub_80B241C(u16 windowId) { // Following this call with a copy-to-vram with mode 3 is identical to - // calling ClearWindowAndBorder(windowId, TRUE). - ClearWindowAndBorder(windowId, FALSE); + // calling ClearStdWindowAndFrame(windowId, TRUE). + ClearStdWindowAndFrame(windowId, FALSE); CopyWindowToVram(windowId, 3); } diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c index 7fdd101e22..619b394105 100644 --- a/src/clear_save_data_screen.c +++ b/src/clear_save_data_screen.c @@ -79,7 +79,7 @@ void CB2_InitClearSaveDataScreen(void) static void Task_DoClearSaveDataScreenYesNo(u8 taskId) { - SetWindowBorderStyle(0, 0, 2, 14); + DrawStdFrameWithCustomTileAndPalette(0, 0, 2, 14); AddTextPrinterParameterized(0, 1, gText_ClearAllSaveData, 0, 1, 0, 0); CreateYesNoMenu(sClearSaveYesNo, 2, 14, 1); gTasks[taskId].func = Task_ClearSaveDataScreenYesNoChoice; diff --git a/src/coins.c b/src/coins.c index c6fbf12169..a8d8eae065 100644 --- a/src/coins.c +++ b/src/coins.c @@ -29,13 +29,13 @@ void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y) sCoinsWindowId = AddWindow(&template); FillWindowPixelBuffer(sCoinsWindowId, PALETTE_NUM_TO_FILL_VALUE(0)); PutWindowTilemap(sCoinsWindowId); - SetWindowBorderStyle(sCoinsWindowId, FALSE, 0x214, 0xE); + DrawStdFrameWithCustomTileAndPalette(sCoinsWindowId, FALSE, 0x214, 0xE); PrintCoinsString(coinAmount); } void HideCoinsWindow(void) { - ClearWindowAndBorder(sCoinsWindowId, TRUE); + ClearStdWindowAndFrame(sCoinsWindowId, TRUE); RemoveWindow(sCoinsWindowId); } diff --git a/src/daycare.c b/src/daycare.c index 14120f20bf..885ac31a1a 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1259,7 +1259,7 @@ static void Task_HandleDaycareLevelMenuInput(u8 taskId) break; } DestroyListMenuTask(gTasks[taskId].tMenuListTaskId, NULL, NULL); - ClearWindowAndBorder(gTasks[taskId].tWindowId, TRUE); + ClearStdWindowAndFrame(gTasks[taskId].tWindowId, TRUE); RemoveWindow(gTasks[taskId].tWindowId); DestroyTask(taskId); EnableBothScriptContexts(); @@ -1268,7 +1268,7 @@ static void Task_HandleDaycareLevelMenuInput(u8 taskId) { gSpecialVar_Result = 2; DestroyListMenuTask(gTasks[taskId].tMenuListTaskId, NULL, NULL); - ClearWindowAndBorder(gTasks[taskId].tWindowId, TRUE); + ClearStdWindowAndFrame(gTasks[taskId].tWindowId, TRUE); RemoveWindow(gTasks[taskId].tWindowId); DestroyTask(taskId); EnableBothScriptContexts(); @@ -1283,7 +1283,7 @@ void ShowDaycareLevelMenu(void) u8 daycareMenuTaskId; windowId = AddWindow(&sDaycareLevelMenuWindowTemplate); - NewMenuHelpers_DrawStdWindowFrame(windowId, FALSE); + DrawStdWindowFrame(windowId, FALSE); menuTemplate = sDaycareListMenuLevelTemplate; menuTemplate.windowId = windowId; diff --git a/src/decoration.c b/src/decoration.c index c3434522de..98c3ef0289 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -463,14 +463,14 @@ u8 sub_81269D4(u8 idx) { *winidx = AddWindow(&gUnknown_085A6B90[idx]); } - SetWindowBorderStyle(*winidx, 0, 0x214, 0xe); + DrawStdFrameWithCustomTileAndPalette(*winidx, 0, 0x214, 0xe); schedule_bg_copy_tilemap_to_vram(0); return *winidx; } void sub_8126A58(u8 idx) { - sub_8198070(sDecorMenuWindowIndices[idx], FALSE); + ClearStdWindowAndFrameToTransparent(sDecorMenuWindowIndices[idx], FALSE); ClearWindowTilemap(sDecorMenuWindowIndices[idx]); RemoveWindow(sDecorMenuWindowIndices[idx]); schedule_bg_copy_tilemap_to_vram(0); @@ -572,7 +572,7 @@ void SecretBasePC_PutAway(u8 taskId) else { sub_8126A58(0); - ClearWindowAndWideBorder(0, 0); + ClearDialogWindowAndFrame(0, 0); FadeScreen(1, 0); gTasks[taskId].data[2] = 0; gTasks[taskId].func = sub_8129ABC; @@ -617,7 +617,7 @@ void sub_8126DA4(u8 taskId) void SecretBasePC_PrepMenuForSelectingStoredDecors(u8 taskId) { LoadPalette(gUnknown_085A6BB0, 0xd0, 0x20); - ClearWindowAndWideBorder(0, 0); + ClearDialogWindowAndFrame(0, 0); sub_8126A58(0); sub_8126DFC(taskId); } @@ -751,7 +751,7 @@ void sub_81270E8(u8 taskId) void sub_8127180(u8 taskId) { - ClearWindowAndWideBorder(0, 0); + ClearDialogWindowAndFrame(0, 0); sub_8126DFC(taskId); } @@ -771,7 +771,7 @@ void sub_81271CC(u8 taskId) { sub_8126A58(1); sub_8126A88(); - NewMenuHelpers_DrawDialogueFrame(0, 0); + DrawDialogueFrame(0, 0); sub_8126C08(); gTasks[taskId].func = sub_8126B80; } @@ -779,7 +779,7 @@ void sub_81271CC(u8 taskId) void sub_8127208(u8 taskId) { LoadPalette(gUnknown_085A6BB0, 0xd0, 0x20); - ClearWindowAndWideBorder(0, 0); + ClearDialogWindowAndFrame(0, 0); gTasks[taskId].data[11] = 2; sCurDecorationCategory = DECORCAT_DESK; sub_8126DFC(taskId); @@ -1095,7 +1095,7 @@ void sub_8127A14(u8 taskId) void sub_8127A30(u8 taskId) { - ClearWindowAndWideBorder(0, 0); + ClearDialogWindowAndFrame(0, 0); gTasks[taskId].func = sub_8127A14; } @@ -1103,7 +1103,7 @@ void sub_8127A5C(u8 taskId) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - ClearWindowAndWideBorder(0, 0); + ClearDialogWindowAndFrame(0, 0); sub_81269D4(1); sub_8127620(taskId); } @@ -1628,13 +1628,13 @@ void sub_8128950(u8 taskId) void sub_81289D0(u8 taskId) { - DisplayYesNoMenu(); + DisplayYesNoMenuWithDefault(); DoYesNoFuncWithChoice(taskId, &gUnknown_085A72C4); } void sub_81289F0(u8 taskId) { - ClearWindowAndWideBorder(0, 0); + ClearDialogWindowAndFrame(0, 0); sub_8128AAC(taskId); if (gDecorations[gCurDecorInventoryItems[gCurDecorationIndex]].permission != DECORPERM_SOLID_MAT) { @@ -1693,13 +1693,13 @@ void sub_8128AAC(u8 taskId) void sub_8128B80(u8 taskId) { - DisplayYesNoMenu(); + DisplayYesNoMenuWithDefault(); DoYesNoFuncWithChoice(taskId, &gUnknown_085A72CC); } void sub_8128BA0(u8 taskId) { - ClearWindowAndWideBorder(0, 0); + ClearDialogWindowAndFrame(0, 0); sub_8128BBC(taskId); } @@ -1887,7 +1887,7 @@ void sub_8128E18(u8 taskId) void sub_8128FD8(u8 taskId) { - ClearWindowAndWideBorder(0, 1); + ClearDialogWindowAndFrame(0, 1); gSprites[sDecor_CameraSpriteObjectIdx1].data[7] = 0; gTasks[taskId].data[10] = 0; gTasks[taskId].func = sub_8128E18; @@ -2251,7 +2251,7 @@ void sub_81298EC(u8 taskId) if (!gPaletteFade.active) { DrawWholeMapView(); ScriptContext1_SetupScript(EventScript_275D2E); - ClearWindowAndWideBorder(0, 1); + ClearDialogWindowAndFrame(0, 1); gTasks[taskId].data[2] = 2; } break; @@ -2343,7 +2343,7 @@ void sub_8129ABC(u8 taskId) void sub_8129B34(u8 taskId) { - ClearWindowAndWideBorder(0, 1); + ClearDialogWindowAndFrame(0, 1); gSprites[sDecor_CameraSpriteObjectIdx1].data[7] = 0; gSprites[sDecor_CameraSpriteObjectIdx1].invisible = FALSE; gSprites[sDecor_CameraSpriteObjectIdx1].callback = sub_812A36C; @@ -2588,7 +2588,7 @@ void sub_812A0E8(u8 taskId) void sub_812A1A0(u8 taskId) { - DisplayYesNoMenu(); + DisplayYesNoMenuWithDefault(); DoYesNoFuncWithChoice(taskId, &gUnknown_085A7348); } @@ -2601,13 +2601,13 @@ void sub_812A1C0(u8 taskId) void sub_812A1F0(u8 taskId) { - DisplayYesNoMenu(); + DisplayYesNoMenuWithDefault(); DoYesNoFuncWithChoice(taskId, &gUnknown_085A7350); } void sub_812A210(u8 taskId) { - ClearWindowAndWideBorder(0, 0); + ClearDialogWindowAndFrame(0, 0); sub_812A22C(taskId); } @@ -2671,7 +2671,7 @@ void sub_812A334(void) u8 taskId; pal_fill_black(); - NewMenuHelpers_DrawDialogueFrame(0, 1); + DrawDialogueFrame(0, 1); sub_8126ABC(); taskId = CreateTask(sub_812A2C4, 8); gTasks[taskId].data[2] = 0; @@ -2725,7 +2725,7 @@ void sub_812A3D4(u8 taskId) void sub_812A458(u8 taskId) { - DisplayYesNoMenu(); + DisplayYesNoMenuWithDefault(); DoYesNoFuncWithChoice(taskId, &gUnknown_085A741C); } diff --git a/src/field_message_box.c b/src/field_message_box.c index 111807240b..ac5e7a4bb7 100755 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -33,7 +33,7 @@ static void sub_8098154(u8 taskId) task->data[0]++; break; case 1: - NewMenuHelpers_DrawDialogueFrame(0, 1); + DrawDialogueFrame(0, 1); task->data[0]++; break; case 2: @@ -127,7 +127,7 @@ static void textbox_auto_and_task_add(void) void HideFieldMessageBox(void) { task_del_textbox(); - ClearWindowAndWideBorder(0, 1); + ClearDialogWindowAndFrame(0, 1); sFieldMessageBoxMode = 0; } @@ -146,7 +146,7 @@ bool8 IsFieldMessageBoxHidden(void) void sub_8098358(void) { task_del_textbox(); - NewMenuHelpers_DrawStdWindowFrame(0, 1); + DrawStdWindowFrame(0, 1); sFieldMessageBoxMode = 0; } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index ddaaa208b2..4ab3cb21ef 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1944,7 +1944,7 @@ static bool8 Fishing11(struct Task *task) sub_8155604(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 0, 0); gSprites[gPlayerAvatar.spriteId].pos2.x = 0; gSprites[gPlayerAvatar.spriteId].pos2.y = 0; - ClearWindowAndWideBorder(0, TRUE); + ClearDialogWindowAndFrame(0, TRUE); task->tFrameCounter++; return FALSE; } @@ -2017,7 +2017,7 @@ static bool8 Fishing16(struct Task *task) gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); UnfreezeEventObjects(); - ClearWindowAndWideBorder(0, TRUE); + ClearDialogWindowAndFrame(0, TRUE); sub_80ED950(0); DestroyTask(FindTaskIdByFunc(Task_Fishing)); } diff --git a/src/field_region_map.c b/src/field_region_map.c index e128c70849..850e845543 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -139,11 +139,11 @@ static void FieldUpdateRegionMap(void) sFieldRegionMapHandler->state++; break; case 1: - SetWindowBorderStyle(1, 0, 0x27, 0xd); + DrawStdFrameWithCustomTileAndPalette(1, 0, 0x27, 0xd); offset = GetStringCenterAlignXOffset(1, gText_Hoenn, 0x38); AddTextPrinterParameterized(1, 1, gText_Hoenn, offset, 1, 0, NULL); schedule_bg_copy_tilemap_to_vram(0); - SetWindowBorderStyle(0, 0, 0x27, 0xd); + DrawStdFrameWithCustomTileAndPalette(0, 0, 0x27, 0xd); PrintRegionMapSecName(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); sFieldRegionMapHandler->state++; diff --git a/src/field_specials.c b/src/field_specials.c index 62d3b8e599..bdac426bd2 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1859,7 +1859,7 @@ void sub_8139B60(void) void sub_8139C10(void) { - sub_8198070(gUnknown_0203AB5E, TRUE); + ClearStdWindowAndFrameToTransparent(gUnknown_0203AB5E, TRUE); RemoveWindow(gUnknown_0203AB5E); } @@ -2644,7 +2644,7 @@ static void sub_813A570(u8 taskId) sub_813A738(taskId); DestroyListMenuTask(task->data[14], NULL, NULL); Free(gUnknown_0203AB64); - sub_8198070(task->data[13], 1); + ClearStdWindowAndFrameToTransparent(task->data[13], 1); FillWindowPixelBuffer(task->data[13], PALETTE_NUM_TO_FILL_VALUE(0)); CopyWindowToVram(task->data[13], 2); RemoveWindow(task->data[13]); @@ -2889,7 +2889,7 @@ void sub_813A958(void) void sub_813A988(void) { - sub_8198070(gUnknown_0203AB6D, TRUE); + ClearStdWindowAndFrameToTransparent(gUnknown_0203AB6D, TRUE); RemoveWindow(gUnknown_0203AB6D); } @@ -2941,7 +2941,7 @@ void sub_813AA18(void) void sub_813AA44(void) { - sub_8198070(gUnknown_0203AB6E, TRUE); + ClearStdWindowAndFrameToTransparent(gUnknown_0203AB6E, TRUE); RemoveWindow(gUnknown_0203AB6E); } @@ -3153,7 +3153,7 @@ static void sub_813AD34(u8 a0, u16 a1) void sub_813ADB8(void) { - sub_8198070(gUnknown_0203AB5E, TRUE); + ClearStdWindowAndFrameToTransparent(gUnknown_0203AB5E, TRUE); RemoveWindow(gUnknown_0203AB5E); } @@ -3225,7 +3225,7 @@ void sub_813AF48(void) struct Task *task = &gTasks[taskId]; DestroyListMenuTask(task->data[14], NULL, NULL); Free(gUnknown_0203AB64); - sub_8198070(task->data[13], TRUE); + ClearStdWindowAndFrameToTransparent(task->data[13], TRUE); FillWindowPixelBuffer(task->data[13], PALETTE_NUM_TO_FILL_VALUE(0)); ClearWindowTilemap(task->data[13]); CopyWindowToVram(task->data[13], 2); diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c index adec780b31..eca7d045b8 100644 --- a/src/fldeff_softboiled.c +++ b/src/fldeff_softboiled.c @@ -86,7 +86,7 @@ static void sub_8161724(u8 taskId) sub_81B0FCC(gUnknown_0203CEC8.unk9, 0); gUnknown_0203CEC8.unk9 = gUnknown_0203CEC8.unkA; sub_81B0FCC(gUnknown_0203CEC8.unkA, 1); - sub_8198070(0x6, FALSE); + ClearStdWindowAndFrameToTransparent(0x6, FALSE); ClearWindowTilemap(0x6); display_pokemon_menu_message(0); gTasks[taskId].func = sub_81B1370; diff --git a/src/frontier_util.c b/src/frontier_util.c index 5846616b71..ec7327ca3f 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -1044,7 +1044,7 @@ static void TowerPrintPrevOrCurrentStreak(u8 battleMode, u8 lvlMode, u8 x1, u8 x static void ShowTowerResultsWindow(u8 battleMode) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); - NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); + DrawStdWindowFrame(gRecordsWindowId, FALSE); FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); if (battleMode == FRONTIER_MODE_SINGLES) StringExpandPlaceholders(gStringVar4, gText_SingleBattleRoomResults); @@ -1115,7 +1115,7 @@ static void DomePrintPrevOrCurrentStreak(u8 battleMode, u8 lvlMode, u8 x1, u8 x2 static void ShowDomeResultsWindow(u8 battleMode) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); - NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); + DrawStdWindowFrame(gRecordsWindowId, FALSE); FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); if (battleMode == FRONTIER_MODE_SINGLES) StringExpandPlaceholders(gStringVar4, gText_SingleBattleTourneyResults); @@ -1191,7 +1191,7 @@ static void PalacePrintPrevOrCurrentStreak(u8 battleMode, u8 lvlMode, u8 x1, u8 static void ShowPalaceResultsWindow(u8 battleMode) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); - NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); + DrawStdWindowFrame(gRecordsWindowId, FALSE); FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); if (battleMode == FRONTIER_MODE_SINGLES) StringExpandPlaceholders(gStringVar4, gText_SingleBattleHallResults); @@ -1247,7 +1247,7 @@ static void PikePrintPrevOrCurrentStreak(u8 lvlMode, u8 x1, u8 x2, u8 y) static void ShowPikeResultsWindow(void) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); - NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); + DrawStdWindowFrame(gRecordsWindowId, FALSE); FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); StringExpandPlaceholders(gStringVar4, gText_BattleChoiceResults); PrintAligned(gStringVar4, 0); @@ -1309,7 +1309,7 @@ static void ArenaPrintPrevOrCurrentStreak(u8 lvlMode, u8 x1, u8 x2, u8 y) static void ShowArenaResultsWindow(void) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); - NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); + DrawStdWindowFrame(gRecordsWindowId, FALSE); FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); PrintHyphens(10); StringExpandPlaceholders(gStringVar4, gText_SetKOTourneyResults); @@ -1395,7 +1395,7 @@ static void FactoryPrintPrevOrCurrentStreak(u8 battleMode, u8 lvlMode, u8 x1, u8 static void ShowFactoryResultsWindow(u8 battleMode) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); - NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); + DrawStdWindowFrame(gRecordsWindowId, FALSE); FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); if (battleMode == FRONTIER_MODE_SINGLES) StringExpandPlaceholders(gStringVar4, gText_BattleSwapSingleResults); @@ -1460,7 +1460,7 @@ static void PyramidPrintPrevOrCurrentStreak(u8 lvlMode, u8 x1, u8 x2, u8 y) static void ShowPyramidResultsWindow(void) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); - NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); + DrawStdWindowFrame(gRecordsWindowId, FALSE); FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); StringExpandPlaceholders(gStringVar4, gText_BattleQuestResults); PrintAligned(gStringVar4, 2); @@ -1483,7 +1483,7 @@ static void ShowLinkContestResultsWindow(void) s32 x; gRecordsWindowId = AddWindow(&gUnknown_08611C7C); - NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); + DrawStdWindowFrame(gRecordsWindowId, FALSE); FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); StringExpandPlaceholders(gStringVar4, gText_LinkContestResults); @@ -2353,7 +2353,7 @@ static void PrintHallRecords(s32 hallFacilityId, s32 lvlMode) void ShowRankingHallRecordsWindow(void) { gRecordsWindowId = AddWindow(&gUnknown_08611C84); - NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE); + DrawStdWindowFrame(gRecordsWindowId, FALSE); FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); PrintHallRecords(gSpecialVar_0x8005, FRONTIER_LVL_50); PutWindowTilemap(gRecordsWindowId); diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index b25342021d..d3b94cff65 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -490,7 +490,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId) } *lastSavedTeam = *sHofMonPtr; - NewMenuHelpers_DrawDialogueFrame(0, 0); + DrawDialogueFrame(0, 0); AddTextPrinterParameterized2(0, 1, gText_SavingDontTurnOffPower, 0, NULL, 2, 1, 3); CopyWindowToVram(0, 3); gTasks[taskId].func = Task_Hof_TrySaveData; @@ -570,7 +570,7 @@ static void Task_Hof_DisplayMon(u8 taskId) gSprites[spriteId].tSpecies = currMon->species; gSprites[spriteId].callback = SpriteCB_GetOnScreenAndAnimate; gTasks[taskId].tMonSpriteId(currMonId) = spriteId; - ClearWindowAndWideBorder(0, TRUE); + ClearDialogWindowAndFrame(0, TRUE); gTasks[taskId].func = Task_Hof_PrintMonInfoAfterAnimating; } @@ -697,7 +697,7 @@ static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId) { FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); HallOfFame_PrintPlayerInfo(1, 2); - NewMenuHelpers_DrawDialogueFrame(0, 0); + DrawDialogueFrame(0, 0); AddTextPrinterParameterized2(0, 1, gText_LeagueChamp, 0, NULL, 2, 1, 3); CopyWindowToVram(0, 3); gTasks[taskId].func = Task_Hof_ExitOnKeyPressed; @@ -1066,7 +1066,7 @@ static void Task_HofPC_HandleExit(u8 taskId) static void Task_HofPC_PrintDataIsCorrupted(u8 taskId) { sub_8198180(gText_UnkCtrlF800Exit, 8, TRUE); - NewMenuHelpers_DrawDialogueFrame(0, 0); + DrawDialogueFrame(0, 0); AddTextPrinterParameterized2(0, 1, gText_HOFCorrupted, 0, NULL, 2, 1, 3); CopyWindowToVram(0, 3); gTasks[taskId].func = Task_HofPC_ExitOnButtonPress; @@ -1182,7 +1182,7 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2) FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(1)); PutWindowTilemap(1); - SetWindowBorderStyle(1, FALSE, 0x21D, 0xD); + DrawStdFrameWithCustomTileAndPalette(1, FALSE, 0x21D, 0xD); AddTextPrinterParameterized3(1, 1, 0, 1, sUnknown_085E538C, -1, gText_Name); width = GetStringRightAlignXOffset(1, gSaveBlock2Ptr->playerName, 0x70); diff --git a/src/item_menu.c b/src/item_menu.c index ae24c8a03a..f561ebb366 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -2306,7 +2306,7 @@ u8 bag_menu_add_window(u8 a) if (*ptr == 0xFF) { *ptr = AddWindow(&gUnknown_086141AC[a]); - SetWindowBorderStyle(*ptr, 0, 1, 14); + DrawStdFrameWithCustomTileAndPalette(*ptr, 0, 1, 14); schedule_bg_copy_tilemap_to_vram(1); } return *ptr; @@ -2317,7 +2317,7 @@ void bag_menu_remove_window(u8 a) u8 *ptr = &gUnknown_0203CE54->windowPointers[a]; if (*ptr != 0xFF) { - sub_8198070(*ptr, 0); + ClearStdWindowAndFrameToTransparent(*ptr, 0); ClearWindowTilemap(*ptr); RemoveWindow(*ptr); schedule_bg_copy_tilemap_to_vram(1); @@ -2338,7 +2338,8 @@ void bag_menu_RemoveBagItem_message_window(u8 a) u8 *ptr = &gUnknown_0203CE54->windowPointers[a]; if (*ptr != 0xFF) { - sub_8197DF8(*ptr, 0); + ClearDialogWindowAndFrameToTransparent(*ptr, FALSE); + // This ClearWindowTilemap call is redundant, since ClearDialogWindowAndFrameToTransparent already calls it. ClearWindowTilemap(*ptr); RemoveWindow(*ptr); schedule_bg_copy_tilemap_to_vram(1); diff --git a/src/item_use.c b/src/item_use.c index 81f4b7b542..2281cc1983 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -188,7 +188,7 @@ void DisplayCannotDismountBikeMessage(u8 taskId, bool8 isUsingRegisteredKeyItemO void CleanUpAfterFailingToUseRegisteredKeyItemOnField(u8 taskId) { - ClearWindowAndWideBorder(0, 1); + ClearDialogWindowAndFrame(0, 1); DestroyTask(taskId); ScriptUnfreezeEventObjects(); ScriptContext2_Disable(); @@ -350,7 +350,7 @@ void sub_80FD504(u8 taskId) void sub_80FD5CC(u8 taskId) { - ClearWindowAndWideBorder(0, 1); + ClearDialogWindowAndFrame(0, 1); ScriptUnfreezeEventObjects(); ScriptContext2_Disable(); DestroyTask(taskId); diff --git a/src/list_menu.c b/src/list_menu.c index 656ab7a157..b8e1863482 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -355,11 +355,11 @@ s32 DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenu switch (arg2) { case 0: // can never be reached, because of the if statement above - ClearWindowAndBorder(sMysteryGiftLinkMenu.windowId, FALSE); + ClearStdWindowAndFrame(sMysteryGiftLinkMenu.windowId, FALSE); break; case 2: case 1: - ClearWindowAndBorder(sMysteryGiftLinkMenu.windowId, FALSE); + ClearStdWindowAndFrame(sMysteryGiftLinkMenu.windowId, FALSE); break; } } diff --git a/src/main_menu.c b/src/main_menu.c index cb39f036ec..6ad1776f8c 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -944,14 +944,14 @@ static void Task_HandleMainMenuAPressed(u8 taskId) { if (gTasks[taskId].tMenuType == HAS_MYSTERY_EVENTS) RemoveScrollIndicatorArrowPair(gTasks[taskId].tScrollArrowTaskId); - ClearWindowAndBorder(0, TRUE); - ClearWindowAndBorder(1, TRUE); - ClearWindowAndBorder(2, TRUE); - ClearWindowAndBorder(3, TRUE); - ClearWindowAndBorder(4, TRUE); - ClearWindowAndBorder(5, TRUE); - ClearWindowAndBorder(6, TRUE); - ClearWindowAndBorder(7, TRUE); + ClearStdWindowAndFrame(0, TRUE); + ClearStdWindowAndFrame(1, TRUE); + ClearStdWindowAndFrame(2, TRUE); + ClearStdWindowAndFrame(3, TRUE); + ClearStdWindowAndFrame(4, TRUE); + ClearStdWindowAndFrame(5, TRUE); + ClearStdWindowAndFrame(6, TRUE); + ClearStdWindowAndFrame(7, TRUE); wirelessAdapterConnected = IsWirelessAdapterConnected(); switch (gTasks[taskId].tMenuType) { diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 30b04c21d0..8936198aeb 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -276,7 +276,7 @@ static void Task_MapNamePopUpWindow(u8 taskId) } break; case 4: - ClearWindowAndBorder(GetMapNamePopUpWindowId(), TRUE); + ClearStdWindowAndFrame(GetMapNamePopUpWindowId(), TRUE); task->data[0] = 5; break; case 5: @@ -290,7 +290,7 @@ void HideMapNamePopUpWindow(void) { if (FuncIsActiveTask(Task_MapNamePopUpWindow)) { - ClearWindowAndBorder(GetMapNamePopUpWindowId(), TRUE); + ClearStdWindowAndFrame(GetMapNamePopUpWindowId(), TRUE); RemoveMapNamePopUpWindow(); SetGpuReg_ForcedBlank(REG_OFFSET_BG0VOFS, 0); DestroyTask(sPopupTaskId); diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index fd8e74c0a7..ec5cb238bc 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -437,7 +437,7 @@ static void BardSong_TextSubPrinter(struct TextPrinterTemplate * printer, u16 a1 static void sub_8120708(const u8 * src) { - NewMenuHelpers_DrawDialogueFrame(0, 0); + DrawDialogueFrame(0, 0); AddTextPrinterParameterized(0, 1, src, 0, 1, 1, BardSong_TextSubPrinter); gUnknown_03002F84 = TRUE; CopyWindowToVram(0, 3); diff --git a/src/menu.c b/src/menu.c index 26ea99de22..39d6f3fd16 100644 --- a/src/menu.c +++ b/src/menu.c @@ -124,14 +124,14 @@ const struct MoveMenuInfoIcon gMoveMenuInfoIcons[] = // Forward declarations extern void sub_81973A4(void); -extern void DrawStandardFrame(u8, u8, u8, u8, u8, u8); -extern void DrawDialogueFrame(u8, u8, u8, u8, u8, u8); -extern void ClearWindowAndBorderTilemap(u8, u8, u8, u8, u8, u8); -extern void ClearWindowAndWideBorderTilemap(u8, u8, u8, u8, u8, u8); -extern void sub_8197BB4(u8, u8, u8, u8, u8, u8); -extern void sub_8197E30(u8, u8, u8, u8, u8, u8); -extern void DrawWindowBorder(u8, u8, u8, u8, u8, u8); -extern void sub_81980A8(u8, u8, u8, u8, u8, u8); +extern void WindowFunc_DrawStandardFrame(u8, u8, u8, u8, u8, u8); +extern void WindowFunc_DrawDialogueFrame(u8, u8, u8, u8, u8, u8); +extern void WindowFunc_ClearStdWindowAndFrame(u8, u8, u8, u8, u8, u8); +extern void WindowFunc_ClearDialogWindowAndFrame(u8, u8, u8, u8, u8, u8); +extern void WindowFunc_DrawDialogFrameWithCustomTileAndPalette(u8, u8, u8, u8, u8, u8); +extern void WindowFunc_ClearDialogWindowAndFrameNullPalette(u8, u8, u8, u8, u8, u8); +extern void WindowFunc_DrawStdFrameWithCustomTileAndPalette(u8, u8, u8, u8, u8, u8); +extern void WindowFunc_ClearStdWindowAndFrameToTransparent(u8, u8, u8, u8, u8, u8); extern u8 Menu_MoveCursor(s8); extern u8 sub_8199134(s8, s8); extern void sub_8198C78(void); @@ -210,43 +210,43 @@ void sub_81973A4(void) LoadUserWindowBorderGfx(0, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM * 0x10); } -void NewMenuHelpers_DrawDialogueFrame(u8 windowId, bool8 copyToVram) +void DrawDialogueFrame(u8 windowId, bool8 copyToVram) { - CallWindowFunction(windowId, DrawDialogueFrame); + CallWindowFunction(windowId, WindowFunc_DrawDialogueFrame); FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); } -void NewMenuHelpers_DrawStdWindowFrame(u8 windowId, bool8 copyToVram) +void DrawStdWindowFrame(u8 windowId, bool8 copyToVram) { - CallWindowFunction(windowId, DrawStandardFrame); + CallWindowFunction(windowId, WindowFunc_DrawStandardFrame); FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); } -void ClearWindowAndWideBorder(u8 windowId, bool8 copyToVram) +void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram) { - CallWindowFunction(windowId, ClearWindowAndWideBorderTilemap); + CallWindowFunction(windowId, WindowFunc_ClearDialogWindowAndFrame); FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); ClearWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); } -void ClearWindowAndBorder(u8 windowId, bool8 copyToVram) +void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram) { - CallWindowFunction(windowId, ClearWindowAndBorderTilemap); + CallWindowFunction(windowId, WindowFunc_ClearStdWindowAndFrame); FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); ClearWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); } -void DrawStandardFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) +void WindowFunc_DrawStandardFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) { int i; @@ -313,7 +313,7 @@ void DrawStandardFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height STD_WINDOW_PALETTE_NUM); } -void DrawDialogueFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) +void WindowFunc_DrawDialogueFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) { FillBgTilemapBufferRect(bg, DLG_WINDOW_BASE_TILE_NUM + 1, @@ -408,28 +408,25 @@ void DrawDialogueFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height DLG_WINDOW_PALETTE_NUM); } -// Clears the given window, and a 1-tile border around the window, to transparent tiles. -void ClearWindowAndBorderTilemap(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) +void WindowFunc_ClearStdWindowAndFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) { FillBgTilemapBufferRect(bg, 0, tilemapLeft - 1, tilemapTop - 1, width + 2, height + 2, STD_WINDOW_PALETTE_NUM); } -// Clears the given window, and a 1-tile border the top and bottom, plus a 3-tile border on the left and right. -// Tiles are set to a transparent tile. -void ClearWindowAndWideBorderTilemap(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) +void WindowFunc_ClearDialogWindowAndFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) { FillBgTilemapBufferRect(bg, 0, tilemapLeft - 3, tilemapTop - 1, width + 6, height + 2, STD_WINDOW_PALETTE_NUM); } void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram) { - SetWindowBorderStyle(windowId, copyToVram, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM); + DrawStdFrameWithCustomTileAndPalette(windowId, copyToVram, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM); } void sub_819786C(u8 windowId, bool8 copyToVram) { LoadMessageBoxGfx(windowId, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM * 0x10); - sub_8197B1C(windowId, copyToVram, DLG_WINDOW_BASE_TILE_NUM, 0xF); + DrawDialogFrameWithCustomTileAndPalette(windowId, copyToVram, DLG_WINDOW_BASE_TILE_NUM, 0xF); } void sub_819789C(void) @@ -461,12 +458,12 @@ void DisplayItemMessageOnField(u8 taskId, const u8 *string, TaskFunc callback) CopyWindowToVram(0, 3); } -void DisplayYesNoMenu(void) +void DisplayYesNoMenuWithDefault(void) { CreateYesNoMenu(&sYesNo_WindowTemplates, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, 0); } -void sub_8197948(u8 initialCursorPos) +void DisplayYesNoMenuWithDefaultDefaultNo(u8 initialCursorPos) { CreateYesNoMenu(&sYesNo_WindowTemplates, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, initialCursorPos); } @@ -552,29 +549,30 @@ void sub_8197AE8(bool8 copyToVram) CopyBgTilemapBufferToVram(0); } -void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 tileNum, u8 paletteNum) +void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 tileNum, u8 paletteNum) { sTileNum = tileNum; sPaletteNum = paletteNum; - CallWindowFunction(windowId, sub_8197BB4); + CallWindowFunction(windowId, WindowFunc_DrawDialogFrameWithCustomTileAndPalette); FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); } -void sub_8197B64(u8 windowId, bool8 copyToVram, u16 tileNum) +// Never used. +void DrawDialogFrameWithCustomTile(u8 windowId, bool8 copyToVram, u16 tileNum) { sTileNum = tileNum; sPaletteNum = GetWindowAttribute(windowId, WINDOW_PALETTE_NUM); - CallWindowFunction(windowId, sub_8197BB4); + CallWindowFunction(windowId, WindowFunc_DrawDialogFrameWithCustomTileAndPalette); FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); } -void sub_8197BB4(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) +void WindowFunc_DrawDialogFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) { FillBgTilemapBufferRect(bg, sTileNum + 1, @@ -669,43 +667,45 @@ void sub_8197BB4(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 p sPaletteNum); } -void sub_8197DF8(u8 windowId, bool8 copyToVram) +void ClearDialogWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram) { - CallWindowFunction(windowId, sub_8197E30); + // The palette slot doesn't matter, since the tiles are transparent. + CallWindowFunction(windowId, WindowFunc_ClearDialogWindowAndFrameNullPalette); FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); ClearWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); } -void sub_8197E30(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) +void WindowFunc_ClearDialogWindowAndFrameNullPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) { FillBgTilemapBufferRect(bg, 0, tilemapLeft - 3, tilemapTop - 1, width + 6, height + 2, 0); } -void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, u16 baseTileNum, u8 paletteNum) +void DrawStdFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 baseTileNum, u8 paletteNum) { sTileNum = baseTileNum; sPaletteNum = paletteNum; - CallWindowFunction(windowId, DrawWindowBorder); + CallWindowFunction(windowId, WindowFunc_DrawStdFrameWithCustomTileAndPalette); FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); } -void sub_8197EC8(u8 windowId, bool8 copyToVram, u16 baseTileNum) +// Never used. +void DrawStdFrameWithCustomTile(u8 windowId, bool8 copyToVram, u16 baseTileNum) { sTileNum = baseTileNum; sPaletteNum = GetWindowAttribute(windowId, WINDOW_PALETTE_NUM); - CallWindowFunction(windowId, DrawWindowBorder); + CallWindowFunction(windowId, WindowFunc_DrawStdFrameWithCustomTileAndPalette); FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); } -void DrawWindowBorder(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) +void WindowFunc_DrawStdFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) { FillBgTilemapBufferRect(bg, sTileNum + 0, @@ -765,16 +765,16 @@ void DrawWindowBorder(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, sPaletteNum); } -void sub_8198070(u8 windowId, bool8 copyToVram) +void ClearStdWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram) { - CallWindowFunction(windowId, sub_81980A8); + CallWindowFunction(windowId, WindowFunc_ClearStdWindowAndFrameToTransparent); FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); ClearWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); } -void sub_81980A8(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) +void WindowFunc_ClearStdWindowAndFrameToTransparent(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) { FillBgTilemapBufferRect(bg, 0, tilemapLeft - 1, tilemapTop - 1, width + 2, height + 2, 0); } @@ -1178,7 +1178,7 @@ void sub_8198AF8(const struct WindowTemplate *window, u8 fontId, u8 left, u8 top struct TextPrinterTemplate printer; sYesNoWindowId = AddWindow(window); - SetWindowBorderStyle(sYesNoWindowId, TRUE, baseTileNum, paletteNum); + DrawStdFrameWithCustomTileAndPalette(sYesNoWindowId, TRUE, baseTileNum, paletteNum); printer.currentChar = gText_YesNo; printer.windowId = sYesNoWindowId; @@ -1214,7 +1214,7 @@ s8 Menu_ProcessInputNoWrapClearOnChoose(void) void sub_8198C78(void) { - sub_8198070(sYesNoWindowId, TRUE); + ClearStdWindowAndFrameToTransparent(sYesNoWindowId, TRUE); RemoveWindow(sYesNoWindowId); } @@ -1643,7 +1643,7 @@ void CreateYesNoMenu(const struct WindowTemplate *window, u16 baseTileNum, u8 pa struct TextPrinterTemplate printer; sYesNoWindowId = AddWindow(window); - SetWindowBorderStyle(sYesNoWindowId, TRUE, baseTileNum, paletteNum); + DrawStdFrameWithCustomTileAndPalette(sYesNoWindowId, TRUE, baseTileNum, paletteNum); printer.currentChar = gText_YesNo; printer.windowId = sYesNoWindowId; diff --git a/src/menu_helpers.c b/src/menu_helpers.c index e6547b3000..49da6bda3c 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -129,7 +129,7 @@ void SetVBlankHBlankCallbacksToNull(void) void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 arg2, u8 arg3, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc) { gUnknown_0203A140 = windowId; - sub_8197B1C(windowId, TRUE, arg2, arg3); + DrawDialogFrameWithCustomTileAndPalette(windowId, TRUE, arg2, arg3); if (string != gStringVar4) StringExpandPlaceholders(gStringVar4, string); diff --git a/src/money.c b/src/money.c index 1b5e298f0e..e7ae6080ce 100644 --- a/src/money.c +++ b/src/money.c @@ -154,7 +154,7 @@ void PrintMoneyAmount(u8 windowId, u8 x, u8 y, int amount, u8 speed) void PrintMoneyAmountInMoneyBoxWithBorder(u8 windowId, u16 tileStart, u8 pallete, int amount) { - SetWindowBorderStyle(windowId, FALSE, tileStart, pallete); + DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, tileStart, pallete); PrintMoneyAmountInMoneyBox(windowId, amount, 0); } @@ -179,7 +179,7 @@ void DrawMoneyBox(int amount, u8 x, u8 y) void HideMoneyBox(void) { RemoveMoneyLabelObject(); - sub_8198070(sMoneyBoxWindowId, FALSE); + ClearStdWindowAndFrameToTransparent(sMoneyBoxWindowId, FALSE); CopyWindowToVram(sMoneyBoxWindowId, 2); RemoveWindow(sMoneyBoxWindowId); } diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index b0f0ba3028..2a16175927 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -133,7 +133,7 @@ static void CB2_MysteryEventMenu(void) switch (gMain.state) { case 0: - SetWindowBorderStyle(0, 1, 1, 0xD); + DrawStdFrameWithCustomTileAndPalette(0, 1, 1, 0xD); PutWindowTilemap(0); CopyWindowToVram(0, 3); ShowBg(0); @@ -180,7 +180,7 @@ static void CB2_MysteryEventMenu(void) { PlaySE(SE_SELECT); sub_800A620(); - SetWindowBorderStyle(1, 1, 1, 0xD); + DrawStdFrameWithCustomTileAndPalette(1, 1, 1, 0xD); PrintMysteryMenuText(1, gText_LoadingEvent, 1, 2, 0); PutWindowTilemap(1); CopyWindowToVram(1, 3); diff --git a/src/naming_screen.c b/src/naming_screen.c index 013eb37ca9..e4159e3beb 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -557,7 +557,7 @@ static void DisplaySentToPCMessage(void) stringToDisplay++; StringExpandPlaceholders(gStringVar4, gUnknown_0858BDB8[stringToDisplay]); - NewMenuHelpers_DrawDialogueFrame(0, 0); + DrawDialogueFrame(0, 0); gTextFlags.canABSpeedUpPrint = TRUE; AddTextPrinterParameterized2(0, 1, gStringVar4, GetPlayerTextSpeedDelay(), 0, 2, 1, 3); CopyWindowToVram(0, 3); diff --git a/src/party_menu.c b/src/party_menu.c index 15128ab0c3..51088af5f3 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -2753,7 +2753,7 @@ static void sub_81B1B8C(u8 taskId) { if (gTasks[taskId].data[0] == 0) { - sub_8198070(6, 0); + ClearStdWindowAndFrameToTransparent(6, 0); ClearWindowTilemap(6); } DestroyTask(taskId); @@ -2778,7 +2778,7 @@ static void sub_81B1C1C(u8 taskId) { if (sub_81B1BD4() != TRUE) { - sub_8198070(6, 0); + ClearStdWindowAndFrameToTransparent(6, 0); ClearWindowTilemap(6); if (sub_81221AC() == TRUE) { @@ -3501,7 +3501,7 @@ static void sub_81B302C(u8 *ptr) { if (*ptr != 0xFF) { - sub_8198070(*ptr, 0); + ClearStdWindowAndFrameToTransparent(*ptr, 0); RemoveWindow(*ptr); *ptr = 0xFF; schedule_bg_copy_tilemap_to_vram(2); @@ -3546,7 +3546,7 @@ void display_pokemon_menu_message(u32 stringID) else if (sub_81B314C() == FALSE) stringID = 1; } - SetWindowBorderStyle(*windowPtr, FALSE, 0x4F, 0xD); + DrawStdFrameWithCustomTileAndPalette(*windowPtr, FALSE, 0x4F, 0xD); StringExpandPlaceholders(gStringVar4, gUnknown_08615AF4[stringID]); AddTextPrinterParameterized(*windowPtr, 1, gStringVar4, 0, 1, 0, 0); schedule_bg_copy_tilemap_to_vram(2); @@ -3596,7 +3596,7 @@ static u8 sub_81B31B0(u8 a) } gUnknown_0203CEC4->unkC[0] = AddWindow(&window); - SetWindowBorderStyle(gUnknown_0203CEC4->unkC[0], FALSE, 0x4F, 13); + DrawStdFrameWithCustomTileAndPalette(gUnknown_0203CEC4->unkC[0], FALSE, 0x4F, 13); if (a == 3) return gUnknown_0203CEC4->unkC[0]; cursorDimension = GetMenuCursorDimensionByFont(1, 0); @@ -3616,7 +3616,7 @@ static u8 sub_81B31B0(u8 a) static void sub_81B3300(const u8 *text) { - SetWindowBorderStyle(6, FALSE, 0x4F, 13); + DrawStdFrameWithCustomTileAndPalette(6, FALSE, 0x4F, 13); gTextFlags.canABSpeedUpPrint = TRUE; AddTextPrinterParameterized2(6, 1, text, GetPlayerTextSpeedDelay(), 0, 2, 1, 3); } @@ -3629,7 +3629,7 @@ static void sub_81B334C(void) static u8 sub_81B3364(void) { gUnknown_0203CEC4->unkC[0] = AddWindow(&gUnknown_08615970); - SetWindowBorderStyle(gUnknown_0203CEC4->unkC[0], FALSE, 0x4F, 13); + DrawStdFrameWithCustomTileAndPalette(gUnknown_0203CEC4->unkC[0], FALSE, 0x4F, 13); return gUnknown_0203CEC4->unkC[0]; } diff --git a/src/player_pc.c b/src/player_pc.c index 607c2a7210..6ba5999ce8 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -361,14 +361,14 @@ static void PlayerPCProcessMenuInput(u8 taskId) break; case MENU_B_PRESSED: PlaySE(SE_SELECT); - sub_8198070(data[4], FALSE); + ClearStdWindowAndFrameToTransparent(data[4], FALSE); ClearWindowTilemap(data[4]); RemoveWindow(data[4]); schedule_bg_copy_tilemap_to_vram(0); gTasks[taskId].func = PlayerPC_TurnOff; break; default: - sub_8198070(data[4], FALSE); + ClearStdWindowAndFrameToTransparent(data[4], FALSE); ClearWindowTilemap(data[4]); RemoveWindow(data[4]); schedule_bg_copy_tilemap_to_vram(0); @@ -403,7 +403,7 @@ static void PlayerPC_Mailbox(u8 taskId) ItemStorage_SetItemAndMailCount(taskId); if (sub_81D1C44(playerPCItemPageInfo.count) == TRUE) { - ClearWindowAndWideBorder(0, 0); + ClearDialogWindowAndFrame(0, 0); Mailbox_DrawMailboxMenu(taskId); gTasks[taskId].func = Mailbox_ProcessInput; } @@ -451,7 +451,7 @@ static void InitItemStorageMenu(u8 taskId, u8 var) static void ItemStorageMenuPrint(const u8 *textPtr) { - NewMenuHelpers_DrawDialogueFrame(0, 0); + DrawDialogueFrame(0, 0); AddTextPrinterParameterized(0, 1, textPtr, 0, 1, 0, 0); } @@ -506,7 +506,7 @@ void sub_816B31C(void) void Mailbox_DoRedrawMailboxMenuAfterReturn(void) { sub_81973A4(); - NewMenuHelpers_DrawDialogueFrame(0, 1); + DrawDialogueFrame(0, 1); InitItemStorageMenu(CreateTask(ItemStorage_HandleReturnToProcessInput, 0), 1); pal_fill_black(); } @@ -560,7 +560,7 @@ static void ItemStorage_WithdrawToss_Helper(u8 taskId, bool8 toss) FreeAndReserveObjectSpritePalettes(); LoadListMenuArrowsGfx(); sub_8122344(gUnknown_0203BCC4->spriteIds, 7); - ClearWindowAndWideBorder(0,0); + ClearDialogWindowAndFrame(0,0); gTasks[taskId].func = ItemStorage_ProcessWithdrawTossInput; } @@ -583,7 +583,7 @@ static void sub_816B4DC(u8 taskId) { u16 *data = gTasks[taskId].data; - sub_8198070(data[4], FALSE); + ClearStdWindowAndFrameToTransparent(data[4], FALSE); ClearWindowTilemap(data[4]); RemoveWindow(data[4]); schedule_bg_copy_tilemap_to_vram(0); @@ -761,7 +761,7 @@ static void Mailbox_MoveToBag(u8 taskId) static void Mailbox_DrawYesNoBeforeMove(u8 taskId) { - DisplayYesNoMenu(); + DisplayYesNoMenuWithDefault(); gTasks[taskId].func = Mailbox_MoveToBagYesNoPrompt; } @@ -863,7 +863,7 @@ static void Mailbox_NoPokemonForMail(u8 taskId) static void Mailbox_Cancel(u8 taskId) { sub_81D1D04(2); - ClearWindowAndWideBorder(0, 0); + ClearDialogWindowAndFrame(0, 0); Mailbox_DrawMailboxMenu(taskId); schedule_bg_copy_tilemap_to_vram(0); gTasks[taskId].func = Mailbox_ProcessInput; @@ -892,7 +892,7 @@ static u8 sub_816BC7C(u8 a) if (*windowIdLoc == 0xFF) { *windowIdLoc = AddWindow(&gUnknown_085DFF5C[a]); - SetWindowBorderStyle(*windowIdLoc, FALSE, 0x214, 0xE); + DrawStdFrameWithCustomTileAndPalette(*windowIdLoc, FALSE, 0x214, 0xE); schedule_bg_copy_tilemap_to_vram(0); } return *windowIdLoc; @@ -903,7 +903,7 @@ static void sub_816BCC4(u8 a) u8 *windowIdLoc = &(gUnknown_0203BCC4->windowIds[a]); if (*windowIdLoc != 0xFF) { - sub_8198070(*windowIdLoc, FALSE); + ClearStdWindowAndFrameToTransparent(*windowIdLoc, FALSE); ClearWindowTilemap(*windowIdLoc); schedule_bg_copy_tilemap_to_vram(0); RemoveWindow(*windowIdLoc); @@ -1170,7 +1170,7 @@ static void ItemStorage_GoBackToPlayerPCMenu_InitStorage(u8 taskId) data = gTasks[taskId].data; if (!IsDma3ManagerBusyWithBgCopy()) { - NewMenuHelpers_DrawDialogueFrame(0, 0); + DrawDialogueFrame(0, 0); if (!data[3]) InitItemStorageMenu(taskId, ITEMPC_MENU_WITHDRAW); else diff --git a/src/pokeblock.c b/src/pokeblock.c index 95f91a74da..4bd4a8ccb1 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -1120,7 +1120,7 @@ static void PutPokeblockOptionsWindow(u8 taskId) data[1] = 9; sub_8136418(); - SetWindowBorderStyle(data[1], 0, 1, 0xE); + DrawStdFrameWithCustomTileAndPalette(data[1], 0, 1, 0xE); sub_81995E4(data[1], sPokeblockMenu->optionsNo, sPokeblockMenuActions, sPokeblockMenu->pokeblockOptionsIds); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(data[1], sPokeblockMenu->optionsNo, 0); PutWindowTilemap(data[1]); @@ -1173,7 +1173,7 @@ static void PokeblockAction_Toss(u8 taskId) { s16 *data = gTasks[taskId].data; - sub_8198070(data[1], FALSE); + ClearStdWindowAndFrameToTransparent(data[1], FALSE); StringCopy(gStringVar1, gPokeblockNames[gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId].color]); StringExpandPlaceholders(gStringVar4, gText_ThrowAwayVar1); DisplayMessageAndContinueTask(taskId, 10, 10, 13, 1, GetPlayerTextSpeedDelay(), gStringVar4, CreateTossPokeblockYesNoMenu); @@ -1219,7 +1219,7 @@ static void HandleErasePokeblock(u8 taskId) static void TossPokeblockChoice_No(u8 taskId) { - sub_8197DF8(10, FALSE); + ClearDialogWindowAndFrameToTransparent(10, FALSE); schedule_bg_copy_tilemap_to_vram(1); sub_81363BC(); gTasks[taskId].func = Task_HandlePokeblockMenuInput; @@ -1266,7 +1266,7 @@ static void PokeblockAction_Cancel(u8 taskId) { s16 *data = gTasks[taskId].data; - sub_8198070(data[1], FALSE); + ClearStdWindowAndFrameToTransparent(data[1], FALSE); schedule_bg_copy_tilemap_to_vram(1); sub_81363BC(); gTasks[taskId].func = Task_HandlePokeblockMenuInput; diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index 0a110120d3..908aec1c09 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -581,7 +581,7 @@ static bool8 TransitionToPokeblockFeedScene(void) gMain.state++; break; case 10: - SetWindowBorderStyle(0, 1, 1, 14); + DrawStdFrameWithCustomTileAndPalette(0, 1, 1, 14); gMain.state++; break; case 11: diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index d4c4c52248..a99a473eba 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -1218,7 +1218,7 @@ static const u16 gWallpaperPalettes_Plain[][16] = static const u32 gWallpaperTiles_Plain[] = INCBIN_U32("graphics/pokemon_storage/plain.4bpp.lz"); static const u32 gWallpaperTilemap_Plain[] = INCBIN_U32("graphics/pokemon_storage/plain.bin.lz"); -// 12�18 tilemap +// 12x18 tilemap static const u32 gUnknown_085773C4[] = INCBIN_U32("graphics/unused/tilemap_5773C4.bin"); static const u16 gUnknown_08577574[][2] = @@ -1736,7 +1736,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) case 0: CreatePCMenu(task->data[1], &task->data[15]); sub_81973A4(); - NewMenuHelpers_DrawDialogueFrame(0, 0); + DrawDialogueFrame(0, 0); FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, TEXT_SPEED_FF, NULL, 2, 1, 3); CopyWindowToVram(0, 3); @@ -1769,7 +1769,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) break; case MENU_B_PRESSED: case 4: - ClearWindowAndBorder(task->data[15], TRUE); + ClearStdWindowAndFrame(task->data[15], TRUE); ScriptContext2_Disable(); EnableBothScriptContexts(); RemoveWindow(task->data[15]); @@ -1865,7 +1865,7 @@ static void CreatePCMenu(u8 whichMenu, s16 *windowIdPtr) winTemplate.width = GetMaxWidthInMenuTable((void *)gUnknown_085716C0, ARRAY_COUNT(gUnknown_085716C0)); windowId = AddWindow(&winTemplate); - NewMenuHelpers_DrawStdWindowFrame(windowId, FALSE); + DrawStdWindowFrame(windowId, FALSE); PrintMenuTable(windowId, ARRAY_COUNT(gUnknown_085716C0), (void *)gUnknown_085716C0); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(windowId, ARRAY_COUNT(gUnknown_085716C0), whichMenu); *windowIdPtr = windowId; @@ -4432,7 +4432,7 @@ static void ShowYesNoWindow(s8 cursorPos) static void ClearBottomWindow(void) { - sub_8198070(1, FALSE); + ClearStdWindowAndFrameToTransparent(1, FALSE); schedule_bg_copy_tilemap_to_vram(0); } @@ -8733,7 +8733,7 @@ static void AddMenu(void) sPSSData->menuWindow.tilemapTop = 15 - sPSSData->menuWindow.height; sPSSData->field_CB0 = AddWindow(&sPSSData->menuWindow); ClearWindowTilemap(sPSSData->field_CB0); - SetWindowBorderStyle(sPSSData->field_CB0, FALSE, 11, 14); + DrawStdFrameWithCustomTileAndPalette(sPSSData->field_CB0, FALSE, 11, 14); PrintMenuTable(sPSSData->field_CB0, sPSSData->menuItemsCount, (void*)sPSSData->menuItems); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(sPSSData->field_CB0, sPSSData->menuItemsCount, 0); schedule_bg_copy_tilemap_to_vram(0); @@ -8787,7 +8787,7 @@ static s16 sub_80D00AC(void) static void sub_80D013C(void) { - sub_8198070(sPSSData->field_CB0, TRUE); + ClearStdWindowAndFrameToTransparent(sPSSData->field_CB0, TRUE); RemoveWindow(sPSSData->field_CB0); } diff --git a/src/record_mixing.c b/src/record_mixing.c index 7f091c4dfc..2ac5f9e4c7 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -292,7 +292,7 @@ static void ReceiveExchangePacket(u32 which) static void PrintTextOnRecordMixing(const u8 *src) { - NewMenuHelpers_DrawDialogueFrame(0, 0); + DrawDialogueFrame(0, 0); AddTextPrinterParameterized(0, 1, src, 0, 1, 0, NULL); CopyWindowToVram(0, 3); } @@ -370,7 +370,7 @@ static void Task_RecordMixing_Main(u8 taskId) { CreateTask(sub_80AF2B4, 10); } - ClearWindowAndWideBorder(0, 1); + ClearDialogWindowAndFrame(0, 1); DestroyTask(taskId); EnableBothScriptContexts(); } diff --git a/src/region_map.c b/src/region_map.c index fa5e26b111..6d5224821c 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1687,8 +1687,8 @@ static void sub_8124904(void) { StringLength(gUnknown_085A1EDC[i].name[sFlyMap->regionMap.posWithinMapSec]); flag = TRUE; - sub_8198070(0, FALSE); - SetWindowBorderStyle(1, FALSE, 0x65, 0x0d); + ClearStdWindowAndFrameToTransparent(0, FALSE); + DrawStdFrameWithCustomTileAndPalette(1, FALSE, 0x65, 0x0d); AddTextPrinterParameterized(1, 1, sFlyMap->regionMap.mapSecName, 0, 1, 0, NULL); name = gUnknown_085A1EDC[i].name[sFlyMap->regionMap.posWithinMapSec]; AddTextPrinterParameterized(1, 1, name, GetStringRightAlignXOffset(1, name, 0x60), 0x11, 0, NULL); @@ -1702,8 +1702,8 @@ static void sub_8124904(void) { if (gUnknown_03001180 == TRUE) { - sub_8198070(1, FALSE); - SetWindowBorderStyle(0, FALSE, 0x65, 0x0d); + ClearStdWindowAndFrameToTransparent(1, FALSE); + DrawStdFrameWithCustomTileAndPalette(0, FALSE, 0x65, 0x0d); } else { @@ -1718,8 +1718,8 @@ static void sub_8124904(void) { if (gUnknown_03001180 == TRUE) { - sub_8198070(1, FALSE); - SetWindowBorderStyle(0, FALSE, 0x65, 0x0d); + ClearStdWindowAndFrameToTransparent(1, FALSE); + DrawStdFrameWithCustomTileAndPalette(0, FALSE, 0x65, 0x0d); } FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); CopyWindowToVram(0, 2); diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index 34444cbf49..ce9f5b98b3 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -290,7 +290,7 @@ static void FreeCursorPalette(void) static void HideChooseTimeWindow(u8 windowId) { - sub_8198070(windowId, FALSE); + ClearStdWindowAndFrameToTransparent(windowId, FALSE); RemoveWindow(windowId); schedule_bg_copy_tilemap_to_vram(0); } @@ -319,7 +319,7 @@ static void PrintTime(u8 windowId, u8 x, u8 y, u16 days, u8 hours, u8 minutes, u static void ShowChooseTimeWindow(u8 windowId, u16 days, u8 hours, u8 minutes, u8 seconds) { - SetWindowBorderStyle(windowId, FALSE, 0x214, 0xE); + DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, 0x214, 0xE); PrintTime(windowId, 0, 1, days, hours, minutes, seconds); AddTextPrinterParameterized(windowId, 1, gText_Confirm2, 126, 1, 0, NULL); schedule_bg_copy_tilemap_to_vram(0); @@ -495,7 +495,7 @@ static void VBlankCB(void) static void ShowMessage(const u8 *str) { - sub_8197B1C(1, FALSE, 0x200, 0xF); + DrawDialogFrameWithCustomTileAndPalette(1, FALSE, 0x200, 0xF); AddTextPrinterParameterized(1, 1, str, 0, 1, 0, NULL); schedule_bg_copy_tilemap_to_vram(0); } @@ -507,7 +507,7 @@ static void Task_ShowResetRtcPrompt(u8 taskId) switch (data[0]) { case 0: - SetWindowBorderStyle(0, FALSE, 0x214, 0xE); + DrawStdFrameWithCustomTileAndPalette(0, FALSE, 0x214, 0xE); AddTextPrinterParameterized(0, 1, gText_PresentTime, 0, 1, TEXT_SPEED_FF, 0); PrintTime( 0, @@ -574,7 +574,7 @@ static void Task_ResetRtcScreen(u8 taskId) case 2: if (gTasks[data[1]].isActive != TRUE) { - sub_8198070(0, FALSE); + ClearStdWindowAndFrameToTransparent(0, FALSE); ShowMessage(gText_PleaseResetTime); gLocalTime = gSaveBlock2Ptr->lastBerryTreeUpdate; data[1] = CreateTask(Task_ResetRtc_0, 80); diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 466ef430d0..88e0bf4acb 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -511,12 +511,12 @@ void sub_8012780(u8 taskId) PutWindowTilemap(data->field_10); CopyWindowToVram(data->field_10, 2); - NewMenuHelpers_DrawStdWindowFrame(data->listWindowId, FALSE); + DrawStdWindowFrame(data->listWindowId, FALSE); gMultiuseListMenuTemplate = gUnknown_082F015C; gMultiuseListMenuTemplate.windowId = data->listWindowId; data->listTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); - NewMenuHelpers_DrawStdWindowFrame(data->field_11, FALSE); + DrawStdWindowFrame(data->field_11, FALSE); PutWindowTilemap(data->field_11); CopyWindowToVram(data->field_11, 2); @@ -786,10 +786,10 @@ void sub_8012780(u8 taskId) void sub_8012F64(struct UnkStruct_Leader *data) { ClearWindowTilemap(data->field_11); - ClearWindowAndBorder(data->field_11, FALSE); + ClearStdWindowAndFrame(data->field_11, FALSE); DestroyListMenuTask(data->listTaskId, 0, 0); ClearWindowTilemap(data->field_10); - ClearWindowAndBorder(data->listWindowId, FALSE); + ClearStdWindowAndFrame(data->listWindowId, FALSE); CopyBgTilemapBufferToVram(0); RemoveWindow(data->field_11); RemoveWindow(data->listWindowId); @@ -1080,12 +1080,12 @@ void sub_80134E8(u8 taskId) PutWindowTilemap(data->field_C); CopyWindowToVram(data->field_C, 2); - NewMenuHelpers_DrawStdWindowFrame(data->listWindowId, FALSE); + DrawStdWindowFrame(data->listWindowId, FALSE); gMultiuseListMenuTemplate = gUnknown_082F0204; gMultiuseListMenuTemplate.windowId = data->listWindowId; data->listTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); - NewMenuHelpers_DrawStdWindowFrame(data->field_D, FALSE); + DrawStdWindowFrame(data->field_D, FALSE); PutWindowTilemap(data->field_D); sub_80125BC(data->field_D); CopyWindowToVram(data->field_D, 2); @@ -1254,10 +1254,10 @@ void sub_80134E8(u8 taskId) case 18: case 20: ClearWindowTilemap(data->field_D); - ClearWindowAndBorder(data->field_D, FALSE); + ClearStdWindowAndFrame(data->field_D, FALSE); DestroyListMenuTask(data->listTaskId, 0, 0); ClearWindowTilemap(data->field_C); - ClearWindowAndBorder(data->listWindowId, FALSE); + ClearStdWindowAndFrame(data->listWindowId, FALSE); CopyBgTilemapBufferToVram(0); RemoveWindow(data->field_D); RemoveWindow(data->listWindowId); diff --git a/src/roulette.c b/src/roulette.c index 7826c13531..4723e06878 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -973,7 +973,7 @@ static void sub_81405CC(void) sub_814372C(6); sub_81436D0(0); sub_81424FC(0); - NewMenuHelpers_DrawStdWindowFrame(gUnknown_0203AB8C, FALSE); + DrawStdWindowFrame(gUnknown_0203AB8C, FALSE); AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5B89, 0, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(gUnknown_0203AB8C, 3); gSpriteCoordOffsetX = -60; @@ -1043,8 +1043,8 @@ static void sub_81408A8(u8 taskId) static void sub_8140914(u8 taskId) { - DisplayYesNoMenu(); - NewMenuHelpers_DrawStdWindowFrame(gUnknown_0203AB8C, 0); + DisplayYesNoMenuWithDefault(); + DrawStdWindowFrame(gUnknown_0203AB8C, 0); AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5C13, 0, 1, TEXT_SPEED_FF, 0); CopyWindowToVram(gUnknown_0203AB8C, 3); DoYesNoFuncWithChoice(taskId, &gUnknown_085B6410); @@ -1052,7 +1052,7 @@ static void sub_8140914(u8 taskId) static void sub_8140968(u8 taskId) { - ClearWindowAndBorder(0, TRUE); + ClearStdWindowAndFrame(0, TRUE); gTasks[taskId].func = sub_8140BD0; } @@ -1808,14 +1808,14 @@ static void sub_814189C(u8 taskId) if (gTasks[taskId].data[2] == 12) { PlayFanfare(MUS_ME_B_BIG); - NewMenuHelpers_DrawStdWindowFrame(gUnknown_0203AB8C, FALSE); + DrawStdWindowFrame(gUnknown_0203AB8C, FALSE); AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5BD7, 0, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(gUnknown_0203AB8C, 3); } else { PlayFanfare(MUS_ME_B_SMALL); - NewMenuHelpers_DrawStdWindowFrame(gUnknown_0203AB8C, FALSE); + DrawStdWindowFrame(gUnknown_0203AB8C, FALSE); AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5BCB, 0, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(gUnknown_0203AB8C, 3); } @@ -1823,7 +1823,7 @@ static void sub_814189C(u8 taskId) case 0: default: m4aSongNumStart(SE_HAZURE); - NewMenuHelpers_DrawStdWindowFrame(gUnknown_0203AB8C, FALSE); + DrawStdWindowFrame(gUnknown_0203AB8C, FALSE); AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5BE0, 0, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(gUnknown_0203AB8C, 3); break; @@ -1867,7 +1867,7 @@ static void sub_8141A18(u8 taskId) { ConvertIntToDecimalStringN(gStringVar1, (gUnknown_0203AB88->var19 * gTasks[taskId].data[2]), STR_CONV_MODE_LEFT_ALIGN, 2); StringExpandPlaceholders(gStringVar4, gUnknown_082A5BEF); - NewMenuHelpers_DrawStdWindowFrame(gUnknown_0203AB8C, FALSE); + DrawStdWindowFrame(gUnknown_0203AB8C, FALSE); AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gStringVar4, 0, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(gUnknown_0203AB8C, 3); gTasks[taskId].data[1] = (gUnknown_0203AB88->var19 * gTasks[taskId].data[2]); @@ -1900,14 +1900,14 @@ static void sub_8141B58(u8 taskId) { if (gTasks[taskId].data[6] == 6) { - NewMenuHelpers_DrawStdWindowFrame(gUnknown_0203AB8C, FALSE); + DrawStdWindowFrame(gUnknown_0203AB8C, FALSE); AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5C21, 0, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(gUnknown_0203AB8C, 3); sub_8141F7C(taskId, dp01t_12_3_battle_menu, 0xFFFF, 3); } else if (gTasks[taskId].data[13] == 9999) { - NewMenuHelpers_DrawStdWindowFrame(gUnknown_0203AB8C, FALSE); + DrawStdWindowFrame(gUnknown_0203AB8C, FALSE); AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5C61, 0, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(gUnknown_0203AB8C, 3); sub_8141F7C(taskId, sub_8140914, 0xFFFF, 0x3); @@ -1919,7 +1919,7 @@ static void sub_8141B58(u8 taskId) } else { - NewMenuHelpers_DrawStdWindowFrame(gUnknown_0203AB8C, FALSE); + DrawStdWindowFrame(gUnknown_0203AB8C, FALSE); AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5C04, 0, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(gUnknown_0203AB8C, 3); sub_8141F7C(taskId, sub_8140994, 0x3C, 0x3); @@ -1944,7 +1944,7 @@ static void dp01t_12_3_battle_menu(u8 taskId) if (gTasks[taskId].data[13] == 9999) { - NewMenuHelpers_DrawStdWindowFrame(gUnknown_0203AB8C, FALSE); + DrawStdWindowFrame(gUnknown_0203AB8C, FALSE); AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5C61, 0, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(gUnknown_0203AB8C, 3); sub_8141F7C(taskId, sub_8140914, 0xFFFF, 3); @@ -3256,7 +3256,7 @@ static const struct SpriteTemplate gUnknown_085B7AEC = static void sub_81428C4(u8 r0) { - DisplayYesNoMenu(); + DisplayYesNoMenuWithDefault(); DoYesNoFuncWithChoice(r0, &gUnknown_085B6408); } @@ -3272,7 +3272,7 @@ static void sub_81428E4(u8 taskId) static void sub_8142918(u8 taskId) { - ClearWindowAndBorder(0, TRUE); + ClearStdWindowAndFrame(0, TRUE); HideCoinsWindow(); FreeAllWindowBuffers(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); @@ -3283,7 +3283,7 @@ static void sub_8142918(u8 taskId) static void sub_814297C(u8 taskId) { - ClearWindowAndBorder(0, FALSE); + ClearStdWindowAndFrame(0, FALSE); HideCoinsWindow(); ScriptContext2_Disable(); DestroyTask(taskId); @@ -3296,7 +3296,7 @@ static void sub_81429A0(u8 taskId) { gSpecialVar_0x8004 = 1; HideCoinsWindow(); - ClearWindowAndBorder(0, TRUE); + ClearStdWindowAndFrame(0, TRUE); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -3309,7 +3309,7 @@ static void sub_81429F0(u8 taskId) u32 temp = gUnknown_085B6344[(gSpecialVar_0x8004 & 1) + (gSpecialVar_0x8004 >> 7 << 1)]; ConvertIntToDecimalStringN(gStringVar1, temp, STR_CONV_MODE_LEADING_ZEROS, 1); StringExpandPlaceholders(gStringVar4, gUnknown_082A5B12); - NewMenuHelpers_DrawStdWindowFrame(0, FALSE); + DrawStdWindowFrame(0, FALSE); AddTextPrinterParameterized(0, 1, gStringVar4, 0, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(0, 3); gTasks[taskId].func = sub_81428C4; @@ -3326,7 +3326,7 @@ static void Task_Roulette_0(u8 taskId) { if ((gSpecialVar_0x8004 & 0x80) && (gSpecialVar_0x8004 & 1)) { - NewMenuHelpers_DrawStdWindowFrame(0, FALSE); + DrawStdWindowFrame(0, FALSE); AddTextPrinterParameterized(0, 1, gUnknown_082A5B6B, 0, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(0, 3); gTasks[taskId].func = sub_81429F0; @@ -3334,7 +3334,7 @@ static void Task_Roulette_0(u8 taskId) else { StringExpandPlaceholders(gStringVar4, gUnknown_082A5B12); - NewMenuHelpers_DrawStdWindowFrame(0, FALSE); + DrawStdWindowFrame(0, FALSE); AddTextPrinterParameterized(0, 1, gStringVar4, 0, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(0, 3); gTasks[taskId].func = sub_81428C4; @@ -3343,7 +3343,7 @@ static void Task_Roulette_0(u8 taskId) else { StringExpandPlaceholders(gStringVar4, gUnknown_082A5B4E); - NewMenuHelpers_DrawStdWindowFrame(0, FALSE); + DrawStdWindowFrame(0, FALSE); AddTextPrinterParameterized(0, 1, gStringVar4, 0, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(0, 3); gTasks[taskId].func = sub_81429A0; diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 62d6f9e3e7..1f0fe69c99 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -229,8 +229,8 @@ static void CB2_SaveFailedScreen(void) LoadPalette(sSaveFailedClockPal, 0x100, 0x20); LoadPalette(gTextWindowFrame1_Pal, 0xE0, 0x20); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); - SetWindowBorderStyle(gSaveFailedWindowIds[TEXT_WIN_ID], FALSE, 0x214, 0xE); - SetWindowBorderStyle(gSaveFailedWindowIds[CLOCK_WIN_ID], FALSE, 0x214, 0xE); + DrawStdFrameWithCustomTileAndPalette(gSaveFailedWindowIds[TEXT_WIN_ID], FALSE, 0x214, 0xE); + DrawStdFrameWithCustomTileAndPalette(gSaveFailedWindowIds[CLOCK_WIN_ID], FALSE, 0x214, 0xE); FillWindowPixelBuffer(gSaveFailedWindowIds[CLOCK_WIN_ID], PALETTE_NUM_TO_FILL_VALUE(1)); // backwards? FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PALETTE_NUM_TO_FILL_VALUE(1)); CopyWindowToVram(gSaveFailedWindowIds[CLOCK_WIN_ID], 2); // again? diff --git a/src/scrcmd.c b/src/scrcmd.c index 145437a2a8..b42b3e5f7b 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1302,7 +1302,7 @@ bool8 ScrCmd_cmdDB(struct ScriptContext *ctx) if (msg == NULL) msg = (const u8 *)ctx->data[0]; sub_81973A4(); - NewMenuHelpers_DrawDialogueFrame(0, 1); + DrawDialogueFrame(0, 1); AddTextPrinterParameterized(0, 1, msg, 0, 1, 0, 0); return FALSE; } @@ -1517,7 +1517,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) winTemplate = CreateWindowTemplate(0, xWindow, yWindow + 1, width, height, 0xF, 0x1); gUnknown_03000F30 = AddWindow(&winTemplate); LoadUserWindowBorderGfx(gUnknown_03000F30, 0x214, 0xE0); - NewMenuHelpers_DrawStdWindowFrame(gUnknown_03000F30, 0); + DrawStdWindowFrame(gUnknown_03000F30, 0); PutWindowTilemap(gUnknown_03000F30); FillWindowPixelBuffer(gUnknown_03000F30, PALETTE_NUM_TO_FILL_VALUE(1)); AddTextPrinterParameterized(gUnknown_03000F30, 6, gStringVar4, xText, yText, 0xFF, 0x0); @@ -2254,7 +2254,7 @@ bool8 ScrCmd_setmonmetlocation(struct ScriptContext *ctx) void sub_809BDB4(void) { - ClearWindowAndBorder(gUnknown_03000F30, 1); + ClearStdWindowAndFrame(gUnknown_03000F30, 1); RemoveWindow(gUnknown_03000F30); } diff --git a/src/script_menu.c b/src/script_menu.c index 8831d65c66..ccbbcdfe16 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1202,7 +1202,7 @@ bool8 ScriptMenu_YesNo(u8 left, u8 top) else { gSpecialVar_Result = 0xFF; - DisplayYesNoMenu(); + DisplayYesNoMenuWithDefault(); taskId = CreateTask(Task_HandleYesNoInput, 0x50); return TRUE; } @@ -1630,7 +1630,7 @@ u8 CreateWindowFromRect(u8 x, u8 y, u8 width, u8 height) void sub_80E2A78(u8 windowId) { - sub_8198070(windowId, TRUE); + ClearStdWindowAndFrameToTransparent(windowId, TRUE); RemoveWindow(windowId); } diff --git a/src/secret_base.c b/src/secret_base.c index 74d9ac9b00..342a9960ad 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -871,7 +871,7 @@ void sub_80E9C9C(u8 taskId) { data[1] = 0; data[2] = 0; - ClearWindowAndWideBorder(0, 0); + ClearDialogWindowAndFrame(0, 0); gUnknown_0203A020 = calloc(1, sizeof(struct SecretBaseListMenuBuffer)); data[6] = AddWindow(&gUnknown_0858D06C[0]); game_continue(taskId); @@ -963,7 +963,7 @@ void sub_80E9E90(u8 taskId) PlaySE(SE_SELECT); DestroyListMenuTask(data[5], NULL, NULL); RemoveScrollIndicatorArrowPair(data[8]); - ClearWindowAndBorder(data[6], 0); + ClearStdWindowAndFrame(data[6], 0); ClearWindowTilemap(data[6]); RemoveWindow(data[6]); schedule_bg_copy_tilemap_to_vram(0); @@ -1020,8 +1020,8 @@ void sub_80E9FFC(u8 taskId) s16 *data; data = gTasks[taskId].data; - ClearWindowAndBorder(data[6], FALSE); - ClearWindowAndBorder(data[7], FALSE); + ClearStdWindowAndFrame(data[6], FALSE); + ClearStdWindowAndFrame(data[7], FALSE); ClearWindowTilemap(data[6]); ClearWindowTilemap(data[7]); RemoveWindow(data[7]); @@ -1033,7 +1033,7 @@ void sub_80E9FFC(u8 taskId) void sub_80EA06C(u8 taskId) { - DisplayYesNoMenu(); + DisplayYesNoMenuWithDefault(); DoYesNoFuncWithChoice(taskId, &gUnknown_0858D058); } @@ -1042,7 +1042,7 @@ void sub_80EA08C(u8 taskId) s16 *data; data = gTasks[taskId].data; - ClearWindowAndWideBorder(0, 0); + ClearDialogWindowAndFrame(0, 0); DestroyListMenuTask(data[5], &data[2], &data[1]); gSaveBlock1Ptr->secretBases[data[4]].sbr_field_1_6 = 0; game_continue(taskId); @@ -1061,7 +1061,7 @@ void sub_80EA13C(u8 taskId) s16 *data; data = gTasks[taskId].data; - ClearWindowAndWideBorder(0, 0); + ClearDialogWindowAndFrame(0, 0); DestroyListMenuTask(data[5], &data[2], &data[1]); sub_80E9E00(taskId); gTasks[taskId].func = sub_80E9E90; @@ -1073,7 +1073,7 @@ void sub_80EA18C(u8 taskId) data = gTasks[taskId].data; sub_80E9E44(taskId); - ClearWindowAndBorder(data[7], 0); + ClearStdWindowAndFrame(data[7], 0); ClearWindowTilemap(data[7]); RemoveWindow(data[7]); schedule_bg_copy_tilemap_to_vram(0); diff --git a/src/shop.c b/src/shop.c index 8c530e0d33..55a7a20f76 100755 --- a/src/shop.c +++ b/src/shop.c @@ -366,7 +366,7 @@ void CB2_ExitSellMenu(void) static void Task_HandleShopMenuQuit(u8 taskId) { - sub_8198070(gMartInfo.windowId, 2); + ClearStdWindowAndFrameToTransparent(gMartInfo.windowId, 2); RemoveWindow(gMartInfo.windowId); SaveRecordedItemPurchasesForTVShow(); ScriptContext2_Disable(); @@ -981,12 +981,12 @@ static void Task_BuyHowManyDialogueInit(u8 taskId) u16 quantityInBag = CountTotalItemQuantityInBag(tItemId); u16 maxQuantity; - SetWindowBorderStyle(3, FALSE, 1, 13); + DrawStdFrameWithCustomTileAndPalette(3, FALSE, 1, 13); ConvertIntToDecimalStringN(gStringVar1, quantityInBag, STR_CONV_MODE_RIGHT_ALIGN, 4); StringExpandPlaceholders(gStringVar4, gText_InBagVar1); BuyMenuPrint(3, gStringVar4, 0, 1, 0, 0); tItemCount = 1; - SetWindowBorderStyle(4, FALSE, 1, 13); + DrawStdFrameWithCustomTileAndPalette(4, FALSE, 1, 13); BuyMenuPrintItemQuantityAndPrice(taskId); schedule_bg_copy_tilemap_to_vram(0); @@ -1018,8 +1018,8 @@ static void Task_BuyHowManyDialogueHandleInput(u8 taskId) if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - sub_8198070(4, 0); - sub_8198070(3, 0); + ClearStdWindowAndFrameToTransparent(4, 0); + ClearStdWindowAndFrameToTransparent(3, 0); ClearWindowTilemap(4); ClearWindowTilemap(3); PutWindowTilemap(1); @@ -1031,8 +1031,8 @@ static void Task_BuyHowManyDialogueHandleInput(u8 taskId) else if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); - sub_8198070(4, 0); - sub_8198070(3, 0); + ClearStdWindowAndFrameToTransparent(4, 0); + ClearStdWindowAndFrameToTransparent(3, 0); ClearWindowTilemap(4); ClearWindowTilemap(3); BuyMenuReturnToItemList(taskId); @@ -1131,7 +1131,7 @@ static void BuyMenuReturnToItemList(u8 taskId) { s16 *data = gTasks[taskId].data; - sub_8197DF8(5, 0); + ClearDialogWindowAndFrameToTransparent(5, 0); BuyMenuPrintCursor(tListTaskId, 1); PutWindowTilemap(1); PutWindowTilemap(2); diff --git a/src/slot_machine.c b/src/slot_machine.c index f603f468c3..189bca80f4 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -1015,7 +1015,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) /*static */bool8 sub_8101F44(struct Task *task) { - NewMenuHelpers_DrawDialogueFrame(0, 0); + DrawDialogueFrame(0, 0); AddTextPrinterParameterized(0, 1, gText_YouDontHaveThreeCoins, 0, 1, 0, 0); CopyWindowToVram(0, 3); sSlotMachine->state = 7; @@ -1026,7 +1026,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - ClearWindowAndWideBorder(0, TRUE); + ClearDialogWindowAndFrame(0, TRUE); sSlotMachine->state = 5; } return FALSE; @@ -1256,7 +1256,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) /*static */bool8 sub_8102318(struct Task *task) { - NewMenuHelpers_DrawDialogueFrame(0, 0); + DrawDialogueFrame(0, 0); AddTextPrinterParameterized(0, 1, gText_QuitTheGame, 0, 1, 0, 0); CopyWindowToVram(0, 3); CreateYesNoMenuParameterized(0x15, 7, 0x214, 0x180, 0xE, 0xF); @@ -1269,7 +1269,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) s8 input = Menu_ProcessInputNoWrapClearOnChoose(); if (input == 0) { - ClearWindowAndWideBorder(0, TRUE); + ClearDialogWindowAndFrame(0, TRUE); sub_8103D8C(0); sub_8103D8C(1); sub_8103D8C(2); @@ -1278,7 +1278,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) } else if (input == 1 || input == -1) { - ClearWindowAndWideBorder(0, TRUE); + ClearDialogWindowAndFrame(0, TRUE); sSlotMachine->state = 5; } return FALSE; @@ -1286,7 +1286,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) /*static */bool8 sub_810239C(struct Task *task) { - NewMenuHelpers_DrawDialogueFrame(0, 0); + DrawDialogueFrame(0, 0); AddTextPrinterParameterized(0, 1, gText_YouveGot9999Coins, 0, 1, 0, 0); CopyWindowToVram(0, 3); sSlotMachine->state = 24; @@ -1297,7 +1297,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - ClearWindowAndWideBorder(0, TRUE); + ClearDialogWindowAndFrame(0, TRUE); sSlotMachine->state = 5; } return FALSE; @@ -1305,7 +1305,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) /*static */bool8 sub_81023E0_(struct Task *task) { - NewMenuHelpers_DrawDialogueFrame(0, 0); + DrawDialogueFrame(0, 0); AddTextPrinterParameterized(0, 1, gText_YouveRunOutOfCoins, 0, 1, 0, 0); CopyWindowToVram(0, 3); sSlotMachine->state = 26; @@ -1316,7 +1316,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - ClearWindowAndWideBorder(0, TRUE); + ClearDialogWindowAndFrame(0, TRUE); sSlotMachine->state = 27; } return FALSE; diff --git a/src/start_menu.c b/src/start_menu.c index c61269c9cd..f88630aee7 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -123,7 +123,7 @@ static u8 SaveConfirmSaveCallback(void); static u8 SaveYesNoCallback(void); static u8 SaveConfirmInputCallback(void); static u8 SaveFileExistsCallback(void); -static u8 SaveConfirmOverwriteNoCallback(void); +static u8 SaveConfirmOverwriteDefaultNoCallback(void); static u8 SaveConfirmOverwriteCallback(void); static u8 SaveOverwriteInputCallback(void); static u8 SaveSavingMessageCallback(void); @@ -376,7 +376,7 @@ static void ShowSafariBallsWindow(void) { sSafariBallsWindowId = AddWindow(&sSafariBallsWindowTemplate); PutWindowTilemap(sSafariBallsWindowId); - NewMenuHelpers_DrawStdWindowFrame(sSafariBallsWindowId, FALSE); + DrawStdWindowFrame(sSafariBallsWindowId, FALSE); ConvertIntToDecimalStringN(gStringVar1, gNumSafariBalls, STR_CONV_MODE_RIGHT_ALIGN, 2); StringExpandPlaceholders(gStringVar4, gText_SafariBallStock); AddTextPrinterParameterized(sSafariBallsWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL); @@ -391,7 +391,7 @@ static void ShowPyramidFloorWindow(void) sBattlePyramidFloorWindowId = AddWindow(&sPyramidFloorWindowTemplate_2); PutWindowTilemap(sBattlePyramidFloorWindowId); - NewMenuHelpers_DrawStdWindowFrame(sBattlePyramidFloorWindowId, FALSE); + DrawStdWindowFrame(sBattlePyramidFloorWindowId, FALSE); StringCopy(gStringVar1, sPyramindFloorNames[gSaveBlock2Ptr->frontier.curChallengeBattleNum]); StringExpandPlaceholders(gStringVar4, gText_BattlePyramidFloor); AddTextPrinterParameterized(sBattlePyramidFloorWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL); @@ -402,13 +402,13 @@ static void RemoveExtraStartMenuWindows(void) { if (GetSafariZoneFlag()) { - sub_8198070(sSafariBallsWindowId, FALSE); + ClearStdWindowAndFrameToTransparent(sSafariBallsWindowId, FALSE); CopyWindowToVram(sSafariBallsWindowId, 2); RemoveWindow(sSafariBallsWindowId); } if (InBattlePyramid()) { - sub_8198070(sBattlePyramidFloorWindowId, FALSE); + ClearStdWindowAndFrameToTransparent(sBattlePyramidFloorWindowId, FALSE); RemoveWindow(sBattlePyramidFloorWindowId); } } @@ -459,7 +459,7 @@ static bool32 InitStartMenuStep(void) break; case 2: sub_81973A4(); - NewMenuHelpers_DrawStdWindowFrame(sub_81979C4(sNumStartMenuActions), FALSE); + DrawStdWindowFrame(sub_81979C4(sNumStartMenuActions), FALSE); sUnknown_02037619[1] = 0; sUnknown_02037619[0]++; break; @@ -751,7 +751,7 @@ static bool8 StartMenuBattlePyramidRetireCallback(void) void sub_809FDD4(void) { - sub_8197DF8(0, FALSE); + ClearDialogWindowAndFrameToTransparent(0, FALSE); ScriptUnfreezeEventObjects(); CreateStartMenuTask(sub_809FA34); ScriptContext2_Enable(); @@ -787,13 +787,13 @@ static bool8 SaveCallback(void) case SAVE_IN_PROGRESS: return FALSE; case SAVE_CANCELED: // Back to start menu - sub_8197DF8(0, FALSE); + ClearDialogWindowAndFrameToTransparent(0, FALSE); InitStartMenu(); gMenuCallback = HandleStartMenuInput; return FALSE; case SAVE_SUCCESS: case SAVE_ERROR: // Close start menu - sub_8197DF8(0, TRUE); + ClearDialogWindowAndFrameToTransparent(0, TRUE); ScriptUnfreezeEventObjects(); ScriptContext2_Disable(); SoftResetInBattlePyramid(); @@ -830,7 +830,7 @@ static bool8 BattlePyramidRetireCallback(void) case SAVE_IN_PROGRESS: return FALSE; case SAVE_CANCELED: // Yes (Retire from battle pyramid) - sub_8197DF8(0, TRUE); + ClearDialogWindowAndFrameToTransparent(0, TRUE); ScriptUnfreezeEventObjects(); ScriptContext2_Disable(); ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88); @@ -897,7 +897,7 @@ static void SaveGameTask(u8 taskId) static void sub_80A0014(void) { - ClearWindowAndWideBorder(0, TRUE); + ClearDialogWindowAndFrame(0, TRUE); } static void HideSaveInfoWindow(void) @@ -943,7 +943,7 @@ static bool8 SaveErrorTimer(void) static u8 SaveConfirmSaveCallback(void) { - ClearWindowAndBorder(GetStartMenuWindowId(), FALSE); + ClearStdWindowAndFrame(GetStartMenuWindowId(), FALSE); RemoveStartMenuWindow(); ShowSaveInfoWindow(); @@ -961,7 +961,7 @@ static u8 SaveConfirmSaveCallback(void) static u8 SaveYesNoCallback(void) { - DisplayYesNoMenu(); // Show Yes/No menu + DisplayYesNoMenuWithDefault(); // Show Yes/No menu sSaveDialogCallback = SaveConfirmInputCallback; return SAVE_IN_PROGRESS; } @@ -1002,7 +1002,7 @@ static u8 SaveFileExistsCallback(void) { if (gDifferentSaveFile == TRUE) { - ShowSaveMessage(gText_DifferentSaveFile, SaveConfirmOverwriteNoCallback); + ShowSaveMessage(gText_DifferentSaveFile, SaveConfirmOverwriteDefaultNoCallback); } else { @@ -1012,16 +1012,16 @@ static u8 SaveFileExistsCallback(void) return SAVE_IN_PROGRESS; } -static u8 SaveConfirmOverwriteNoCallback(void) +static u8 SaveConfirmOverwriteDefaultNoCallback(void) { - sub_8197948(1); // Show Yes/No menu (No selected as default) + DisplayYesNoMenuWithDefaultDefaultNo(1); // Show Yes/No menu (No selected as default) sSaveDialogCallback = SaveOverwriteInputCallback; return SAVE_IN_PROGRESS; } static u8 SaveConfirmOverwriteCallback(void) { - DisplayYesNoMenu(); // Show Yes/No menu + DisplayYesNoMenuWithDefault(); // Show Yes/No menu sSaveDialogCallback = SaveOverwriteInputCallback; return SAVE_IN_PROGRESS; } @@ -1135,7 +1135,7 @@ static void InitBattlePyramidRetire(void) static u8 BattlePyramidConfirmRetireCallback(void) { - ClearWindowAndBorder(GetStartMenuWindowId(), FALSE); + ClearStdWindowAndFrame(GetStartMenuWindowId(), FALSE); RemoveStartMenuWindow(); ShowSaveMessage(gText_BattlePyramidConfirmRetire, BattlePyramidRetireYesNoCallback); @@ -1144,7 +1144,7 @@ static u8 BattlePyramidConfirmRetireCallback(void) static u8 BattlePyramidRetireYesNoCallback(void) { - sub_8197948(1); // Show Yes/No menu (No selected as default) + DisplayYesNoMenuWithDefaultDefaultNo(1); // Show Yes/No menu (No selected as default) sSaveDialogCallback = BattlePyramidRetireInputCallback; return SAVE_IN_PROGRESS; @@ -1313,7 +1313,7 @@ static void ShowSaveInfoWindow(void) } sSaveInfoWindowId = AddWindow(&saveInfoWindow); - NewMenuHelpers_DrawStdWindowFrame(sSaveInfoWindowId, FALSE); + DrawStdWindowFrame(sSaveInfoWindowId, FALSE); gender = gSaveBlock2Ptr->playerGender; color = TEXT_COLOR_RED; // Red when female, blue when male. @@ -1364,7 +1364,7 @@ static void ShowSaveInfoWindow(void) static void RemoveSaveInfoWindow(void) { - ClearWindowAndBorder(sSaveInfoWindowId, FALSE); + ClearStdWindowAndFrame(sSaveInfoWindowId, FALSE); RemoveWindow(sSaveInfoWindowId); } @@ -1386,7 +1386,7 @@ void sub_80A08CC(void) // Referenced in data/specials.inc and data/scripts/maps/ static void HideStartMenuWindow(void) { - ClearWindowAndBorder(GetStartMenuWindowId(), TRUE); + ClearStdWindowAndFrame(GetStartMenuWindowId(), TRUE); RemoveStartMenuWindow(); ScriptUnfreezeEventObjects(); ScriptContext2_Disable(); diff --git a/src/starter_choose.c b/src/starter_choose.c index 4e21c1845a..3ffc8e2860 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -469,7 +469,7 @@ static void MainCallback2_StarterChoose(void) static void Task_StarterChoose1(u8 taskId) { CreateStarterPokemonLabel(gTasks[taskId].tStarterSelection); - SetWindowBorderStyle(0, FALSE, 0x2A8, 0xD); + DrawStdFrameWithCustomTileAndPalette(0, FALSE, 0x2A8, 0xD); AddTextPrinterParameterized(0, 1, gText_BirchInTrouble, 0, 1, 0, NULL); PutWindowTilemap(0); schedule_bg_copy_tilemap_to_vram(0); diff --git a/src/trader.c b/src/trader.c index b5c159fb96..97bc4626f1 100644 --- a/src/trader.c +++ b/src/trader.c @@ -73,7 +73,7 @@ void CreateAvailableDecorationsMenu(u8 taskId) } windowTemplate.width = convert_pixel_width_to_tile_width(windowWidth); data[3] = AddWindow(&windowTemplate); - SetWindowBorderStyle(data[3], FALSE, 0x214, 14); + DrawStdFrameWithCustomTileAndPalette(data[3], FALSE, 0x214, 14); for (i = 0; i < 4; i++) { if (trader->decorIds[i] > NUM_DECORATIONS) @@ -98,7 +98,7 @@ void sub_8133BE4(u8 taskId, u8 decorationId) gSpecialVar_0x8004 = decorationId; } - sub_8198070(data[3], FALSE); + ClearStdWindowAndFrameToTransparent(data[3], FALSE); ClearWindowTilemap(data[3]); RemoveWindow(data[3]); schedule_bg_copy_tilemap_to_vram(0); diff --git a/src/trainer_card.c b/src/trainer_card.c index c8f0df0db3..1f91916320 100755 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -469,7 +469,7 @@ static void sub_80C2760(u8 taskId) break; case 15: sub_800AC34(); - NewMenuHelpers_DrawDialogueFrame(0, 1); + DrawDialogueFrame(0, 1); AddTextPrinterParameterized(0, 1, gText_WaitingTrainerFinishReading, 0, 1, 255, 0); CopyWindowToVram(0, 3); sData->var_0 = 16; diff --git a/src/wallclock.c b/src/wallclock.c index 546750ba66..d3bbcf7a20 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -793,7 +793,7 @@ static void Task_SetClock2(u8 taskId) static void Task_SetClock3(u8 taskId) { - SetWindowBorderStyle(0, FALSE, 0x250, 0x0d); + DrawStdFrameWithCustomTileAndPalette(0, FALSE, 0x250, 0x0d); AddTextPrinterParameterized(0, 1, gText_IsThisTheCorrectTime, 0, 1, 0, NULL); PutWindowTilemap(0); schedule_bg_copy_tilemap_to_vram(0); @@ -812,7 +812,7 @@ static void Task_SetClock4(u8 taskId) case 1: //B button case -1: //NO PlaySE(SE_SELECT); - sub_8198070(0, FALSE); + ClearStdWindowAndFrameToTransparent(0, FALSE); ClearWindowTilemap(0); gTasks[taskId].func = Task_SetClock2; break; diff --git a/src/window.c b/src/window.c index 94e68cae5f..fbce57743d 100644 --- a/src/window.c +++ b/src/window.c @@ -6,6 +6,7 @@ u32 filler_03002F58; u32 filler_03002F5C; +// This global is set to 0 and never changed. u8 gTransparentTileNumber; u32 filler_03002F64; void *gUnknown_03002F70[4]; From e12a7790cf294db7fd656eba85ec4bbfb3bc211e Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 04:01:38 -0500 Subject: [PATCH 099/217] Start porting pokeruby vars to pokeemerald --- data/event_scripts.s | 30 ++++----- data/maps/DewfordTown/scripts.inc | 6 +- data/maps/DewfordTown_Gym/scripts.inc | 4 +- .../EverGrandeCity_DrakesRoom/scripts.inc | 6 +- .../EverGrandeCity_GlaciasRoom/scripts.inc | 6 +- .../EverGrandeCity_PhoebesRoom/scripts.inc | 6 +- .../EverGrandeCity_SidneysRoom/scripts.inc | 6 +- data/maps/FallarborTown/scripts.inc | 2 +- data/maps/InsideOfTruck/map.json | 6 +- data/maps/InsideOfTruck/scripts.inc | 8 +-- data/maps/LavaridgeTown/scripts.inc | 8 +-- data/maps/LavaridgeTown_Gym_1F/scripts.inc | 6 +- data/maps/LilycoveCity/scripts.inc | 2 +- .../LilycoveCity_ContestLobby/scripts.inc | 32 +++++----- .../scripts.inc | 4 +- data/maps/LinkContestRoom1/scripts.inc | 8 +-- data/maps/LittlerootTown/scripts.inc | 18 +++--- .../LittlerootTown_BrendansHouse_1F/map.json | 8 +-- .../scripts.inc | 22 +++---- .../scripts.inc | 14 ++-- .../maps/LittlerootTown_MaysHouse_1F/map.json | 8 +-- .../LittlerootTown_MaysHouse_1F/scripts.inc | 24 +++---- .../LittlerootTown_MaysHouse_2F/scripts.inc | 14 ++-- .../scripts.inc | 18 +++--- data/maps/MagmaHideout_4F/scripts.inc | 2 +- data/maps/MauvilleCity/scripts.inc | 2 +- data/maps/MauvilleCity_Gym/scripts.inc | 22 +++---- .../MossdeepCity_GameCorner_1F/scripts.inc | 4 +- data/maps/OldaleTown/map.json | 2 +- data/maps/OldaleTown/scripts.inc | 2 +- data/maps/PetalburgCity/map.json | 8 +-- data/maps/PetalburgCity/scripts.inc | 18 +++--- data/maps/PetalburgCity_Gym/scripts.inc | 32 +++++----- .../PetalburgCity_WallysHouse/scripts.inc | 6 +- data/maps/PetalburgWoods/map.json | 4 +- data/maps/PetalburgWoods/scripts.inc | 2 +- data/maps/Route101/map.json | 18 +++--- data/maps/Route101/scripts.inc | 10 +-- data/maps/Route103/scripts.inc | 2 +- data/maps/Route104/scripts.inc | 10 +-- data/maps/Route104_MrBrineysHouse/scripts.inc | 6 +- data/maps/Route109/scripts.inc | 2 +- data/maps/Route110/map.json | 6 +- data/maps/Route110/scripts.inc | 2 +- data/maps/Route116/map.json | 2 +- data/maps/Route116/scripts.inc | 4 +- data/maps/Route118/map.json | 6 +- data/maps/Route118/scripts.inc | 2 +- data/maps/Route119/map.json | 4 +- data/maps/Route119/scripts.inc | 2 +- data/maps/Route121/map.json | 8 +-- data/maps/Route121/scripts.inc | 2 +- data/maps/Route128/scripts.inc | 4 +- data/maps/RustboroCity/map.json | 42 ++++++------ data/maps/RustboroCity/scripts.inc | 20 +++--- .../RustboroCity_DevonCorp_2F/scripts.inc | 2 +- .../RustboroCity_DevonCorp_3F/scripts.inc | 12 ++-- data/maps/RustboroCity_Gym/scripts.inc | 6 +- data/maps/RusturfTunnel/scripts.inc | 4 +- data/maps/SeafloorCavern_Room9/scripts.inc | 2 +- data/maps/SlateportCity/scripts.inc | 20 +++--- data/maps/VerdanturfTown/scripts.inc | 2 +- data/scripts/cable_club.inc | 64 +++++++++---------- data/scripts/contest_hall.inc | 52 +++++++-------- data/scripts/players_house.inc | 18 +++--- include/constants/vars.h | 64 +++++++++---------- src/contest_link_80F57C4.c | 6 +- src/rom_8011DC0.c | 4 +- 68 files changed, 389 insertions(+), 389 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 1b8807ed76..b3ad9f771f 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1148,8 +1148,8 @@ EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F return EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843 - setvar VAR_0x4082, 3 - setvar VAR_0x408C, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3 clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD return @@ -1163,11 +1163,11 @@ EventScript_WhiteOut:: @ 8271857 end EventScript_271862:: @ 8271862 - compare VAR_0x4096, 1 + compare VAR_BRINEY_LOCATION, 1 goto_if_eq EverGrandeCity_HallOfFame_EventScript_271884 - compare VAR_0x4096, 2 + compare VAR_BRINEY_LOCATION, 2 goto_if_eq EverGrandeCity_HallOfFame_EventScript_27189A - compare VAR_0x4096, 3 + compare VAR_BRINEY_LOCATION, 3 goto_if_eq EverGrandeCity_HallOfFame_EventScript_2718B3 end @@ -1208,7 +1208,7 @@ EverGrandeCity_HallOfFame_EventScript_2718CC:: @ 82718CC clearflag FLAG_DEFEATED_ELITE_4_PHOEBE clearflag FLAG_DEFEATED_ELITE_4_GLACIA clearflag FLAG_DEFEATED_ELITE_4_DRAKE - setvar VAR_0x409C, 0 + setvar VAR_ELITE_4_STATE, 0 return DewfordTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE @@ -1228,15 +1228,15 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE return OldaleTown_PokemonCenter_1F_EventScript_27190C:: @ 827190C - setvar VAR_0x4096, 1 + setvar VAR_BRINEY_LOCATION, 1 return OldaleTown_PokemonCenter_1F_EventScript_271912:: @ 8271912 - setvar VAR_0x4096, 2 + setvar VAR_BRINEY_LOCATION, 2 return OldaleTown_PokemonCenter_1F_EventScript_271918:: @ 8271918 - setvar VAR_0x4096, 3 + setvar VAR_BRINEY_LOCATION, 3 return BattleFrontier_PokemonCenter_1F_EventScript_27191E:: @ 827191E @@ -1756,8 +1756,8 @@ DewfordTown_Hall_EventScript_271E8B:: @ 8271E8B DewfordTown_EventScript_271E95:: @ 8271E95 Route104_MrBrineysHouse_EventScript_271E95:: @ 8271E95 Route109_EventScript_271E95:: @ 8271E95 - copyvar VAR_0x8008, VAR_0x4096 - setvar VAR_0x4096, 0 + copyvar VAR_0x8008, VAR_BRINEY_LOCATION + setvar VAR_BRINEY_LOCATION, 0 return EventScript_UseSurf:: @ 8271EA0 @@ -2085,7 +2085,7 @@ Route109_EventScript_2720A8:: @ 82720A8 LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD Route101_EventScript_2720AD:: @ 82720AD Route103_EventScript_2720AD:: @ 82720AD - compare VAR_0x4085, 0 + compare VAR_PETALBURG_GYM_STATE, 0 goto_if_eq Route101_EventScript_27374E goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A compare VAR_BIRCH_STATE, 0 @@ -2204,7 +2204,7 @@ PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO - setvar VAR_0x4096, 0 + setvar VAR_BRINEY_LOCATION, 0 return RusturfTunnel_EventScript_272216:: @ 8272216 @@ -4467,13 +4467,13 @@ LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21 end LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B - compare VAR_0x4086, 2 + compare VAR_LINK_CONTEST_ROOM_STATE, 2 goto_if_ne LilycoveCity_ContestLobby_EventScript_28CB95 setvar VAR_0x8005, 6 special InterviewBefore compare VAR_RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB95 - switch VAR_0x4088 + switch VAR_CONTEST_LOCATION case 0, LilycoveCity_ContestLobby_EventScript_28CB95 case 2, LilycoveCity_ContestLobby_EventScript_28CB91 case 1, LilycoveCity_ContestLobby_EventScript_28CB91 diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 6c66f48609..92946cb67c 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -138,10 +138,10 @@ DewfordTown_EventScript_1E9660:: @ 81E9660 clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN hideobjectat 4, MAP_DEWFORD_TOWN - setvar VAR_0x408E, 2 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 - copyvar VAR_0x4096, VAR_0x8008 + copyvar VAR_BRINEY_LOCATION, VAR_0x8008 waitstate release end @@ -177,7 +177,7 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9790 call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9799 closemessage - copyvar VAR_0x4096, VAR_0x8008 + copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 90fd3d4ae4..4419dc28f5 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -173,8 +173,8 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 msgbox DewfordTown_Gym_Text_1FD0A8, MSGBOX_DEFAULT setflag FLAG_DEFEATED_DEWFORD_GYM setflag FLAG_BADGE02_GET - addvar VAR_0x4085, 1 - compare VAR_0x4085, 6 + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq DewfordTown_Gym_EventScript_271E84 setvar VAR_0x8008, 2 call DewfordTown_Gym_EventScript_271F43 diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 2c09498428..d16560f048 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -13,19 +13,19 @@ EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6 end EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB - map_script_2 VAR_0x409C, 3, EverGrandeCity_DrakesRoom_EventScript_2286C5 + map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_2286C5 .2byte 0 EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5 lockall call EverGrandeCity_DrakesRoom_EventScript_272475 - setvar VAR_0x409C, 4 + setvar VAR_ELITE_4_STATE, 4 releaseall end EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2 call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_2286E7 - compare VAR_0x409C, 4 + compare VAR_ELITE_4_STATE, 4 call_if_eq EverGrandeCity_DrakesRoom_EventScript_2286ED end diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 7510f468fd..e60a364a80 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -13,19 +13,19 @@ EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C end EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431 - map_script_2 VAR_0x409C, 2, EverGrandeCity_GlaciasRoom_EventScript_22843B + map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_22843B .2byte 0 EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B lockall call EverGrandeCity_GlaciasRoom_EventScript_272475 - setvar VAR_0x409C, 3 + setvar VAR_ELITE_4_STATE, 3 releaseall end EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448 call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_22845D - compare VAR_0x409C, 3 + compare VAR_ELITE_4_STATE, 3 call_if_eq EverGrandeCity_GlaciasRoom_EventScript_228463 end diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 77f951d76b..e369d2c3f7 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -13,19 +13,19 @@ EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E end EverGrandeCity_PhoebesRoom_MapScript2_228193: @ 8228193 - map_script_2 VAR_0x409C, 1, EverGrandeCity_PhoebesRoom_EventScript_22819D + map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_22819D .2byte 0 EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D lockall call EverGrandeCity_PhoebesRoom_EventScript_272475 - setvar VAR_0x409C, 2 + setvar VAR_ELITE_4_STATE, 2 releaseall end EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281BF - compare VAR_0x409C, 2 + compare VAR_ELITE_4_STATE, 2 call_if_eq EverGrandeCity_PhoebesRoom_EventScript_2281C5 end diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 9152254b31..5be612a6fc 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -12,7 +12,7 @@ EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16 EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32 - compare VAR_0x409C, 1 + compare VAR_ELITE_4_STATE, 1 call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38 end @@ -34,13 +34,13 @@ EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48 end EverGrandeCity_SidneysRoom_MapScript2_227F4D: @ 8227F4D - map_script_2 VAR_0x409C, 0, EverGrandeCity_SidneysRoom_EventScript_227F57 + map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_227F57 .2byte 0 EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57 lockall call EverGrandeCity_SidneysRoom_EventScript_272475 - setvar VAR_0x409C, 1 + setvar VAR_ELITE_4_STATE, 1 releaseall end diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 5e06ed4cbe..dbb554814e 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -4,7 +4,7 @@ FallarborTown_MapScripts:: @ 81EB1FA FallarborTown_MapScript1_1EB200: @ 81EB200 setflag FLAG_VISITED_FALLARBOR_TOWN - setvar VAR_0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 clearflag FLAG_CONTEST_SKETCH_CREATED end diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index d6bbd2f46e..eefeed3654 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -83,7 +83,7 @@ "x": 3, "y": 1, "elevation": 3, - "var": "VAR_0x4092", + "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "0", "script": "InsideOfTruck_EventScript_23BF04" }, @@ -92,7 +92,7 @@ "x": 3, "y": 2, "elevation": 3, - "var": "VAR_0x4092", + "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "0", "script": "InsideOfTruck_EventScript_23BF04" }, @@ -101,7 +101,7 @@ "x": 3, "y": 3, "elevation": 3, - "var": "VAR_0x4092", + "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "0", "script": "InsideOfTruck_EventScript_23BF04" } diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 858975d7af..b61e2e0c95 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -25,26 +25,26 @@ InsideOfTruck_EventScript_23BF04:: @ 823BF04 InsideOfTruck_EventScript_23BF20:: @ 823BF20 setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F - setvar VAR_0x4092, 1 + setvar VAR_LITTLEROOT_INTRO_STATE, 1 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL - setvar VAR_0x408C, 1 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 releaseall end InsideOfTruck_EventScript_23BF46:: @ 823BF46 setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F - setvar VAR_0x4092, 2 + setvar VAR_LITTLEROOT_INTRO_STATE, 2 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL - setvar VAR_0x4082, 1 + setvar VAR_LITTLEROOT_HOUSES_STATE, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 releaseall end diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 899df4d2cd..84f04055fd 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -9,9 +9,9 @@ LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F call LavaridgeTown_EventScript_271ED7 call LavaridgeTown_EventScript_271EFB - compare VAR_0x4053, 1 + compare VAR_LAVARIDGE_RIVAL_STATE, 1 call_if_eq LavaridgeTown_EventScript_1EA518 - compare VAR_0x4053, 1 + compare VAR_LAVARIDGE_RIVAL_STATE, 1 call_if_eq LavaridgeTown_EventScript_1EA543 end @@ -41,7 +41,7 @@ LavaridgeTown_EventScript_1EA543:: @ 81EA543 return LavaridgeTown_MapScript2_1EA547: @ 81EA547 - map_script_2 VAR_0x4053, 1, LavaridgeTown_EventScript_1EA551 + map_script_2 VAR_LAVARIDGE_RIVAL_STATE, 1, LavaridgeTown_EventScript_1EA551 .2byte 0 LavaridgeTown_EventScript_1EA551:: @ 81EA551 @@ -94,7 +94,7 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF compare VAR_0x8008, 9 call_if_ne LavaridgeTown_EventScript_1EA6C9 removeobject 7 - setvar VAR_0x4053, 2 + setvar VAR_LAVARIDGE_RIVAL_STATE, 2 clearflag FLAG_SPECIAL_FLAG_0x4000 savebgm MUS_DUMMY fadedefaultbgm diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index bf48225eca..0c3741f201 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -76,13 +76,13 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 setflag FLAG_FLANNERY_GIVES_BADGE_INFO setflag FLAG_DEFEATED_LAVARIDGE_GYM setflag FLAG_BADGE04_GET - addvar VAR_0x4085, 1 - compare VAR_0x4085, 6 + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq LavaridgeTown_Gym_1F_EventScript_271E84 setvar VAR_0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_271F43 setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY - setvar VAR_0x4053, 1 + setvar VAR_LAVARIDGE_RIVAL_STATE, 1 call LavaridgeTown_Gym_1F_EventScript_1FE841 closemessage delay 30 diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index cfa6b38675..a6ec91e62b 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -5,7 +5,7 @@ LilycoveCity_MapScripts:: @ 81E2B3C LilycoveCity_MapScript1_1E2B47: @ 81E2B47 setflag FLAG_VISITED_LILYCOVE_CITY - setvar VAR_0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_27207A call LilycoveCity_EventScript_271ED7 diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 42ce7beeb0..3d6ac6c4ff 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -22,13 +22,13 @@ LilycoveCity_ContestLobby_EventScript_21A23C:: @ 821A23C return LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243 - map_script_2 VAR_0x4099, 1, LilycoveCity_ContestLobby_EventScript_21A255 - map_script_2 VAR_0x4099, 2, LilycoveCity_ContestLobby_EventScript_21A427 + map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_21A255 + map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_21A427 .2byte 0 LilycoveCity_ContestLobby_EventScript_21A255:: @ 821A255 goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A264 - setvar VAR_0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 @@ -55,7 +55,7 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT closemessage special sub_80F88DC - setvar VAR_0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar VAR_RESULT, GiveMonArtistRibbon compare VAR_RESULT, 1 call_if_eq LilycoveCity_ContestLobby_EventScript_21A314 @@ -75,7 +75,7 @@ LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4 closemessage applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F waitmovement 0 - setvar VAR_0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 removeobject 4 releaseall end @@ -202,7 +202,7 @@ LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427 goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A436 - setvar VAR_0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 @@ -227,7 +227,7 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT closemessage special sub_80F88DC - setvar VAR_0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar VAR_RESULT, GiveMonArtistRibbon compare VAR_RESULT, 1 call_if_eq LilycoveCity_ContestLobby_EventScript_21A4E4 @@ -247,7 +247,7 @@ LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4 closemessage applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C waitmovement 0 - setvar VAR_0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 removeobject 11 releaseall end @@ -338,28 +338,28 @@ LilycoveCity_ContestLobby_EventScript_21A585:: @ 821A585 return LilycoveCity_ContestLobby_EventScript_21A5B7:: @ 821A5B7 - setvar VAR_0x4088, 1 + setvar VAR_CONTEST_LOCATION, 1 return LilycoveCity_ContestLobby_EventScript_21A5BD:: @ 821A5BD - setvar VAR_0x4088, 2 + setvar VAR_CONTEST_LOCATION, 2 return LilycoveCity_ContestLobby_EventScript_21A5C3:: @ 821A5C3 - setvar VAR_0x4088, 3 + setvar VAR_CONTEST_LOCATION, 3 return LilycoveCity_ContestLobby_EventScript_21A5C9:: @ 821A5C9 - setvar VAR_0x4088, 4 + setvar VAR_CONTEST_LOCATION, 4 return LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - copyvar VAR_0x4094, 0x1 + copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 giveitem ITEM_CONTEST_PASS, 1 setvar VAR_0x800B, 8 setvar VAR_CONTEST_RANK, 3 - setvar VAR_0x4099, 1 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 setflag FLAG_SYS_RIBBON_GET end @@ -833,9 +833,9 @@ LilycoveCity_ContestLobby_EventScript_21AB17:: @ 821AB17 waitmessage subvar VAR_0x8004, 1 call LilycoveCity_ContestLobby_EventScript_21AC49 - setvar VAR_0x4086, 1 + setvar VAR_LINK_CONTEST_ROOM_STATE, 1 special sub_80F8AFC - setvar VAR_0x4088, 5 + setvar VAR_CONTEST_LOCATION, 5 setvar VAR_CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_21A5EF end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index f73fbf092e..6d37e13c1d 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -57,7 +57,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB:: @ 82197EB end LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE - map_script_2 VAR_0x4094, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219808 + map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219808 .2byte 0 LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 @@ -76,7 +76,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, MSGBOX_SIGN - copyvar VAR_0x4094, 0x1 + copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 releaseall end diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc index e756c2bc6d..fa3f2d9484 100644 --- a/data/maps/LinkContestRoom1/scripts.inc +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -61,11 +61,11 @@ LinkContestRoom1_EventScript_23B80F:: @ 823B80F return LinkContestRoom1_MapScript2_23B815: @ 823B815 - map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B829 + map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_23B829 .2byte 0 LinkContestRoom1_MapScript2_23B81F: @ 823B81F - map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B834 + map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_23B834 .2byte 0 LinkContestRoom1_EventScript_23B829:: @ 823B829 @@ -303,7 +303,7 @@ LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B specialvar VAR_RESULT, sub_80F9160 compare VAR_RESULT, 1 goto_if_eq LinkContestRoom1_EventScript_23BD86 - switch VAR_0x4088 + switch VAR_CONTEST_LOCATION case 1, LinkContestRoom1_EventScript_23BB78 case 2, LinkContestRoom1_EventScript_23BB8B case 3, LinkContestRoom1_EventScript_23BBE6 @@ -407,7 +407,7 @@ LinkContestRoom1_EventScript_23BD86:: @ 823BD86 LinkContestRoom1_EventScript_23BE44:: @ 823BE44 special sub_80F9154 - switch VAR_0x4088 + switch VAR_CONTEST_LOCATION case 1, LinkContestRoom1_EventScript_23BE84 case 2, LinkContestRoom1_EventScript_23BE8E case 3, LinkContestRoom1_EventScript_23BE98 diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 5d9161cb42..10ff40cb12 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -7,18 +7,18 @@ LittlerootTown_MapScripts:: @ 81E7DCB LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB setflag FLAG_VISITED_LITTLEROOT_TOWN call LittlerootTown_EventScript_271ED7 - compare VAR_0x4092, 2 + compare VAR_LITTLEROOT_INTRO_STATE, 2 call_if_eq LittlerootTown_EventScript_1E7E67 call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F compare VAR_0x4050, 3 call_if_eq LittlerootTown_EventScript_1E7E92 - compare VAR_0x4082, 4 + compare VAR_LITTLEROOT_HOUSES_STATE, 4 call_if_eq LittlerootTown_EventScript_1E7E5C - compare VAR_0x408C, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 call_if_eq LittlerootTown_EventScript_1E7E5C compare VAR_0x40C7, 1 call_if_eq LittlerootTown_EventScript_1E7E53 - compare VAR_0x408D, 3 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 call_if_eq LittlerootTown_EventScript_1E7E4F compare VAR_0x40D3, 1 call_if_eq LittlerootTown_EventScript_1E7E4B @@ -44,8 +44,8 @@ LittlerootTown_EventScript_1E7E53:: @ 81E7E53 return LittlerootTown_EventScript_1E7E5C:: @ 81E7E5C - setvar VAR_0x4082, 5 - setvar VAR_0x408C, 5 + setvar VAR_LITTLEROOT_HOUSES_STATE, 5 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 5 return LittlerootTown_EventScript_1E7E67:: @ 81E7E67 @@ -83,8 +83,8 @@ LittlerootTown_EventScript_1E7EB9:: @ 81E7EB9 return LittlerootTown_MapScript2_1E7EC1: @ 81E7EC1 - map_script_2 VAR_0x4092, 1, LittlerootTown_EventScript_1E7EDB - map_script_2 VAR_0x4092, 2, LittlerootTown_EventScript_1E7EF9 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_1E7EDB + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_1E7EF9 map_script_2 VAR_0x40D3, 1, LittlerootTown_EventScript_1E7FB1 .2byte 0 @@ -136,7 +136,7 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FA9 waitmovement 0 setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE - setvar VAR_0x4092, 3 + setvar VAR_LITTLEROOT_INTRO_STATE, 3 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index ca5ee92de9..d6d4af86c3 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -135,7 +135,7 @@ "x": 8, "y": 8, "elevation": 0, - "var": "VAR_0x4092", + "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "4", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78A3" }, @@ -144,7 +144,7 @@ "x": 7, "y": 3, "elevation": 0, - "var": "VAR_0x408D", + "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78BE" }, @@ -153,7 +153,7 @@ "x": 8, "y": 4, "elevation": 0, - "var": "VAR_0x408D", + "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78CA" }, @@ -162,7 +162,7 @@ "x": 9, "y": 3, "elevation": 0, - "var": "VAR_0x408D", + "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78D6" } diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 42cfe308b3..728cf099dc 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755 .byte 0 LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765 - compare VAR_0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_1F777A call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_1F778D end @@ -26,11 +26,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A return LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4 - compare VAR_0x4092, 3 + compare VAR_LITTLEROOT_INTRO_STATE, 3 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77DE - compare VAR_0x4092, 5 + compare VAR_LITTLEROOT_INTRO_STATE, 5 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77C6 - compare VAR_0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77D2 end @@ -50,11 +50,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F77DE:: @ 81F77DE return LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA - map_script_2 VAR_0x4092, 3, LittlerootTown_BrendansHouse_1F_EventScript_1F783C - map_script_2 VAR_0x4092, 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7814 - map_script_2 VAR_0x4092, 6, LittlerootTown_BrendansHouse_1F_EventScript_1F784D - map_script_2 VAR_0x4082, 1, LittlerootTown_BrendansHouse_1F_EventScript_1F785E - map_script_2 VAR_0x4082, 3, LittlerootTown_BrendansHouse_1F_EventScript_292AF2 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_1F783C + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7814 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_1F784D + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_1F785E + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_292AF2 .2byte 0 LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814 @@ -100,7 +100,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT setflag FLAG_MET_RIVAL_MOM - setvar VAR_0x4082, 2 + setvar VAR_LITTLEROOT_HOUSES_STATE, 2 releaseall end @@ -173,7 +173,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM delay 30 - setvar VAR_0x408D, 3 + setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_0x4050, 1 savebgm MUS_DUMMY fadedefaultbgm diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index ea00693a83..fc0a68a276 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -4,11 +4,11 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3 .byte 0 LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE - compare VAR_0x408D, 2 + compare VAR_LITTLEROOT_RIVAL_STATE, 2 call_if_lt LittlerootTown_BrendansHouse_2F_EventScript_1F8457 - compare VAR_0x408D, 3 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 call_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F841A - compare VAR_0x4092, 4 + compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2926FE call LittlerootTown_BrendansHouse_2F_EventScript_275CE1 setvar VAR_0x4089, 0 @@ -16,7 +16,7 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F8433 - compare VAR_0x4084, 2 + compare VAR_BIRCH_LAB_STATE, 2 goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F8456 goto LittlerootTown_BrendansHouse_2F_EventScript_1F8433 @@ -40,7 +40,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8457:: @ 81F8457 return LittlerootTown_BrendansHouse_2F_EventScript_1F8464:: @ 81F8464 - setvar VAR_0x408D, 2 + setvar VAR_LITTLEROOT_RIVAL_STATE, 2 return LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A @@ -55,7 +55,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474 LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481 lockall - compare VAR_0x408D, 2 + compare VAR_LITTLEROOT_RIVAL_STATE, 2 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497 msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, MSGBOX_DEFAULT releaseall @@ -81,7 +81,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8565 compare VAR_FACING, 4 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8594 - setvar VAR_0x408D, 3 + setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM setvar VAR_0x4050, 1 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index e1f7d823ac..0938e69660 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -135,7 +135,7 @@ "x": 2, "y": 8, "elevation": 0, - "var": "VAR_0x4092", + "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "4", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A4C" }, @@ -144,7 +144,7 @@ "x": 1, "y": 3, "elevation": 0, - "var": "VAR_0x408D", + "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A67" }, @@ -153,7 +153,7 @@ "x": 2, "y": 4, "elevation": 0, - "var": "VAR_0x408D", + "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A73" }, @@ -162,7 +162,7 @@ "x": 3, "y": 3, "elevation": 0, - "var": "VAR_0x408D", + "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A7F" } diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 36bda7e036..185a1f6a37 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5 .byte 0 LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5 - compare VAR_0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if_lt LittlerootTown_MaysHouse_1F_EventScript_1F88CA call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_1F88DD end @@ -26,11 +26,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA return LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4 - compare VAR_0x4092, 3 + compare VAR_LITTLEROOT_INTRO_STATE, 3 call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F892E - compare VAR_0x4092, 5 + compare VAR_LITTLEROOT_INTRO_STATE, 5 call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8916 - compare VAR_0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8922 end @@ -50,11 +50,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1F892E:: @ 81F892E return LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A - map_script_2 VAR_0x4092, 3, LittlerootTown_MaysHouse_1F_EventScript_1F898C - map_script_2 VAR_0x4092, 5, LittlerootTown_MaysHouse_1F_EventScript_1F8964 - map_script_2 VAR_0x4092, 6, LittlerootTown_MaysHouse_1F_EventScript_1F899D - map_script_2 VAR_0x408C, 1, LittlerootTown_MaysHouse_1F_EventScript_1F89AE - map_script_2 VAR_0x4082, 3, LittlerootTown_MaysHouse_1F_EventScript_292AF2 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_1F898C + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_1F8964 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_1F899D + map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_1F89AE + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_292AF2 .2byte 0 LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964 @@ -100,7 +100,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE special GetRivalSonDaughterString msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT setflag FLAG_MET_RIVAL_MOM - setvar VAR_0x408C, 2 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 2 releaseall end @@ -119,7 +119,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3 faceplayer goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_1F8A33 goto_if_set FLAG_SYS_POKEMON_GET, LittlerootTown_BrendansHouse_1F_EventScript_1F8A29 - compare VAR_0x408D, 3 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, MSGBOX_DEFAULT @@ -210,7 +210,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM delay 30 - setvar VAR_0x408D, 3 + setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_0x4050, 1 savebgm MUS_DUMMY fadedefaultbgm diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 353437ad4f..2217d12cd1 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -4,11 +4,11 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296 .byte 0 LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 - compare VAR_0x408D, 2 + compare VAR_LITTLEROOT_RIVAL_STATE, 2 call_if_lt LittlerootTown_MaysHouse_2F_EventScript_1F930A - compare VAR_0x408D, 3 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 call_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F92CD - compare VAR_0x4092, 4 + compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_2926FE call LittlerootTown_MaysHouse_2F_EventScript_275CE1 setvar VAR_0x4089, 0 @@ -16,7 +16,7 @@ LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_MaysHouse_2F_EventScript_1F92E6 - compare VAR_0x4084, 2 + compare VAR_BIRCH_LAB_STATE, 2 goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309 goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6 @@ -41,7 +41,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A return LittlerootTown_MaysHouse_2F_EventScript_1F9317:: @ 81F9317 - setvar VAR_0x408D, 2 + setvar VAR_LITTLEROOT_RIVAL_STATE, 2 return LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D @@ -56,7 +56,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327 LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334 lockall - compare VAR_0x408D, 2 + compare VAR_LITTLEROOT_RIVAL_STATE, 2 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, MSGBOX_DEFAULT releaseall @@ -82,7 +82,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9418 compare VAR_FACING, 4 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9440 - setvar VAR_0x408D, 3 + setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM setvar VAR_0x4050, 1 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 5c762743ca..f035702430 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -38,7 +38,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7 end LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06: @ 81F9D06 - map_script_2 VAR_0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40 + map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40 map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45 map_script_2 VAR_0x40D3, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45 map_script_2 VAR_0x40D3, 3, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71 @@ -85,8 +85,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75:: @ 81F9D75 end LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9: @ 81F9DB9 - map_script_2 VAR_0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB - map_script_2 VAR_0x4084, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67 + map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB + map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67 map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80 map_script_2 VAR_0x40D3, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62 .2byte 0 @@ -122,7 +122,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA9D5, MSGBOX_DEFAULT clearflag FLAG_HIDE_ROUTE_101_BOY - setvar VAR_0x4084, 3 + setvar VAR_BIRCH_LAB_STATE, 3 releaseall end @@ -264,7 +264,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84 lock faceplayer - compare VAR_0x4084, 3 + compare VAR_BIRCH_LAB_STATE, 3 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1 goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, MSGBOX_DEFAULT @@ -502,7 +502,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141 compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_272141 - compare VAR_0x4084, 5 + compare VAR_BIRCH_LAB_STATE, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT release @@ -537,10 +537,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA352 compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F - setvar VAR_0x4084, 5 + setvar VAR_BIRCH_LAB_STATE, 5 setflag FLAG_ADVENTURE_STARTED - setvar VAR_0x4051, 1 - setvar VAR_0x408D, 4 + setvar VAR_ROUTE102_ACCESSIBLE, 1 + setvar VAR_LITTLEROOT_RIVAL_STATE, 4 setvar VAR_0x4050, 3 releaseall end diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index ba585c98a3..1bca8dac78 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -62,7 +62,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 closemessage clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY - setvar VAR_0x4058, 1 + setvar VAR_SLATEPORT_STATE, 1 setflag FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT setvar VAR_0x40A0, 1 fadescreen 1 diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 21f654888c..8d2971c438 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -8,7 +8,7 @@ MauvilleCity_MapScript1_1DF38B: @ 81DF38B clearflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION setflag FLAG_SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE - setvar VAR_0x4093, 0 + setvar VAR_MAUVILLE_GYM_STATE, 0 call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF3A9 end diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 76bceae56d..a095e8ff32 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -4,7 +4,7 @@ MauvilleCity_Gym_MapScripts:: @ 820DD6E MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74 goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20DEE7 - switch VAR_0x4093 + switch VAR_MAUVILLE_GYM_STATE case 0, MauvilleCity_Gym_EventScript_20DDBA case 1, MauvilleCity_Gym_EventScript_20DEAF case 2, MauvilleCity_Gym_EventScript_20DEBD @@ -94,8 +94,8 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT setflag FLAG_DEFEATED_MAUVILLE_GYM setflag FLAG_BADGE03_GET - addvar VAR_0x4085, 1 - compare VAR_0x4085, 6 + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq MauvilleCity_Gym_EventScript_271E84 setvar VAR_0x8008, 3 call MauvilleCity_Gym_EventScript_271F43 @@ -144,9 +144,9 @@ MauvilleCity_Gym_EventScript_20DFDE:: @ 820DFDE MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 lockall goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD - compare VAR_0x4093, 1 + compare VAR_MAUVILLE_GYM_STATE, 1 goto_if_eq MauvilleCity_Gym_EventScript_20E0AD - setvar VAR_0x4093, 1 + setvar VAR_MAUVILLE_GYM_STATE, 1 setvar VAR_0x8004, 0 goto MauvilleCity_Gym_EventScript_20E08D end @@ -154,9 +154,9 @@ MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E lockall goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD - compare VAR_0x4093, 2 + compare VAR_MAUVILLE_GYM_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_20E0AD - setvar VAR_0x4093, 2 + setvar VAR_MAUVILLE_GYM_STATE, 2 setvar VAR_0x8004, 1 goto MauvilleCity_Gym_EventScript_20E08D end @@ -164,9 +164,9 @@ MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E MauvilleCity_Gym_EventScript_20E043:: @ 820E043 lockall goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD - compare VAR_0x4093, 3 + compare VAR_MAUVILLE_GYM_STATE, 3 goto_if_eq MauvilleCity_Gym_EventScript_20E0AD - setvar VAR_0x4093, 3 + setvar VAR_MAUVILLE_GYM_STATE, 3 setvar VAR_0x8004, 2 goto MauvilleCity_Gym_EventScript_20E08D end @@ -174,9 +174,9 @@ MauvilleCity_Gym_EventScript_20E043:: @ 820E043 MauvilleCity_Gym_EventScript_20E068:: @ 820E068 lockall goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD - compare VAR_0x4093, 4 + compare VAR_MAUVILLE_GYM_STATE, 4 goto_if_eq MauvilleCity_Gym_EventScript_20E0AD - setvar VAR_0x4093, 4 + setvar VAR_MAUVILLE_GYM_STATE, 4 setvar VAR_0x8004, 3 goto MauvilleCity_Gym_EventScript_20E08D end diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index ed10a83099..a68774e345 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -5,11 +5,11 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27 .byte 0 MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37 - map_script_2 VAR_0x4087, 8, MossdeepCity_GameCorner_1F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 8, MossdeepCity_GameCorner_1F_EventScript_276BAE .2byte 0 MossdeepCity_GameCorner_1F_MapScript2_224B41: @ 8224B41 - map_script_2 VAR_0x4087, 8, MossdeepCity_GameCorner_1F_EventScript_276C9D + map_script_2 VAR_CABLE_CLUB_STATE, 8, MossdeepCity_GameCorner_1F_EventScript_276C9D .2byte 0 MossdeepCity_GameCorner_1F_EventScript_224B4B:: @ 8224B4B diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 164cd3eae0..279960febb 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -119,7 +119,7 @@ "x": 0, "y": 10, "elevation": 3, - "var": "VAR_0x4051", + "var": "VAR_ROUTE102_ACCESSIBLE", "var_value": "0", "script": "OldaleTown_EventScript_1E903F" }, diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 7431cbf2aa..2c4cd2bd18 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -11,7 +11,7 @@ OldaleTown_MapScript1_1E8EA8: @ 81E8EA8 end OldaleTown_EventScript_1E8ECC:: @ 81E8ECC - setvar VAR_0x4051, 1 + setvar VAR_ROUTE102_ACCESSIBLE, 1 return OldaleTown_EventScript_1E8ED2:: @ 81E8ED2 diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index d8f77168b2..50e1a55610 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -193,7 +193,7 @@ "x": 8, "y": 10, "elevation": 3, - "var": "VAR_0x4057", + "var": "VAR_PETALBURG_STATE", "var_value": "0", "script": "PetalburgCity_EventScript_1DC49A" }, @@ -202,7 +202,7 @@ "x": 8, "y": 11, "elevation": 3, - "var": "VAR_0x4057", + "var": "VAR_PETALBURG_STATE", "var_value": "0", "script": "PetalburgCity_EventScript_1DC4A6" }, @@ -211,7 +211,7 @@ "x": 8, "y": 12, "elevation": 3, - "var": "VAR_0x4057", + "var": "VAR_PETALBURG_STATE", "var_value": "0", "script": "PetalburgCity_EventScript_1DC4B2" }, @@ -220,7 +220,7 @@ "x": 8, "y": 13, "elevation": 3, - "var": "VAR_0x4057", + "var": "VAR_PETALBURG_STATE", "var_value": "0", "script": "PetalburgCity_EventScript_1DC4BE" }, diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index f69eb3a3a1..3d9c018b94 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -5,13 +5,13 @@ PetalburgCity_MapScripts:: PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7 setflag FLAG_VISITED_PETALBURG_CITY - compare VAR_0x4057, 0 + compare VAR_PETALBURG_STATE, 0 call_if_eq PetalburgCity_EventScript_1DC307 - compare VAR_0x4057, 2 + compare VAR_PETALBURG_STATE, 2 call_if_eq PetalburgCity_EventScript_1DC30F - compare VAR_0x4057, 4 + compare VAR_PETALBURG_STATE, 4 call_if_eq PetalburgCity_EventScript_1DC30F - compare VAR_0x4085, 8 + compare VAR_PETALBURG_GYM_STATE, 8 call_if_eq PetalburgCity_EventScript_1DC316 end @@ -25,12 +25,12 @@ PetalburgCity_EventScript_1DC30F:: @ 81DC30F return PetalburgCity_EventScript_1DC316:: @ 81DC316 - setvar VAR_0x4085, 7 + setvar VAR_PETALBURG_GYM_STATE, 7 return PetalburgCity_MapScript2_1DC31C: @ 81DC31C - map_script_2 VAR_0x4057, 2, PetalburgCity_EventScript_1DC32E - map_script_2 VAR_0x4057, 4, PetalburgCity_EventScript_1DC390 + map_script_2 VAR_PETALBURG_STATE, 2, PetalburgCity_EventScript_1DC32E + map_script_2 VAR_PETALBURG_STATE, 4, PetalburgCity_EventScript_1DC390 .2byte 0 PetalburgCity_EventScript_1DC32E:: @ 81DC32E @@ -49,11 +49,11 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT closemessage clearflag FLAG_SPECIAL_FLAG_0x4000 - setvar VAR_0x4057, 3 + setvar VAR_PETALBURG_STATE, 3 fadedefaultbgm clearflag FLAG_SPECIAL_FLAG_0x4001 special LoadPlayerParty - setvar VAR_0x4085, 1 + setvar VAR_PETALBURG_GYM_STATE, 1 warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 waitstate releaseall diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 915cdc93e1..89eb7e51e1 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -6,9 +6,9 @@ PetalburgCity_Gym_MapScripts:: @ 8204889 .byte 0 PetalburgCity_Gym_MapScript1_20489E: @ 820489E - compare VAR_0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 goto_if_eq PetalburgCity_Gym_EventScript_2048B5 - compare VAR_0x4085, 7 + compare VAR_PETALBURG_GYM_STATE, 7 call_if_ge PetalburgCity_Gym_EventScript_2048FF end @@ -44,9 +44,9 @@ PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF return PetalburgCity_Gym_MapScript1_20492D: @ 820492D - compare VAR_0x4085, 1 + compare VAR_PETALBURG_GYM_STATE, 1 call_if_eq PetalburgCity_Gym_EventScript_20494D - compare VAR_0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 call_if_lt PetalburgCity_Gym_EventScript_204955 call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_20495D end @@ -64,17 +64,17 @@ PetalburgCity_Gym_EventScript_20495D:: @ 820495D specialvar VAR_RESULT, IsTrainerReadyForRematch compare VAR_RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_204985 - compare VAR_0x4085, 8 + compare VAR_PETALBURG_GYM_STATE, 8 goto_if_eq PetalburgCity_Gym_EventScript_204985 setobjectxyperm 1, 4, 107 return PetalburgCity_Gym_EventScript_204985:: @ 8204985 - setvar VAR_0x4085, 8 + setvar VAR_PETALBURG_GYM_STATE, 8 end PetalburgCity_Gym_MapScript2_20498B: @ 820498B - map_script_2 VAR_0x4085, 1, PetalburgCity_Gym_EventScript_204995 + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_204995 .2byte 0 PetalburgCity_Gym_EventScript_204995:: @ 8204995 @@ -82,7 +82,7 @@ PetalburgCity_Gym_EventScript_204995:: @ 8204995 end PetalburgCity_Gym_MapScript2_20499A: @ 820499A - map_script_2 VAR_0x4085, 1, PetalburgCity_Gym_EventScript_2049A4 + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_2049A4 .2byte 0 PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 @@ -100,7 +100,7 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A6 waitmovement 0 msgbox PetalburgCity_Gym_Text_205C40, MSGBOX_DEFAULT - setvar VAR_0x4085, 2 + setvar VAR_PETALBURG_GYM_STATE, 2 releaseall end @@ -114,7 +114,7 @@ PetalburgCity_Gym_Movement_2049EC: @ 82049EC PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1 lock faceplayer - switch VAR_0x4085 + switch VAR_PETALBURG_GYM_STATE case 2, PetalburgCity_Gym_EventScript_204D4A case 3, PetalburgCity_Gym_EventScript_204D54 case 4, PetalburgCity_Gym_EventScript_204D5E @@ -216,8 +216,8 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC call_if_eq PetalburgCity_Gym_EventScript_204CB5 removeobject 10 setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT - setvar VAR_0x4085, 1 - setvar VAR_0x4057, 2 + setvar VAR_PETALBURG_GYM_STATE, 1 + setvar VAR_PETALBURG_STATE, 2 clearflag FLAG_HIDE_PETALBURG_CITY_WALLY clearflag FLAG_HIDE_PETALBURG_GYM_WALLY setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL @@ -416,7 +416,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B call PetalburgCity_Gym_EventScript_27207E msgbox PetalburgCity_Gym_Text_20618A, MSGBOX_DEFAULT setflag FLAG_DEFEATED_PETALBURG_GYM - setvar VAR_0x4085, 7 + setvar VAR_PETALBURG_GYM_STATE, 7 setflag FLAG_BADGE05_GET special sub_813B9A0 call PetalburgCity_Gym_EventScript_2721F8 @@ -496,7 +496,7 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 compare VAR_0x8008, 3 call_if_eq PetalburgCity_Gym_EventScript_20506C removeobject 11 - setvar VAR_0x4057, 4 + setvar VAR_PETALBURG_STATE, 4 clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE warp MAP_PETALBURG_CITY, 255, 15, 8 waitstate @@ -783,7 +783,7 @@ PetalburgCity_Gym_EventScript_20512D:: @ 820512D PetalburgCity_Gym_EventScript_205137:: @ 8205137 lockall - compare VAR_0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 85 @@ -813,7 +813,7 @@ PetalburgCity_Gym_EventScript_20517D:: @ 820517D PetalburgCity_Gym_EventScript_205187:: @ 8205187 lockall - compare VAR_0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 98 diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index ac41aaa28f..d410e1f5a1 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -4,7 +4,7 @@ PetalburgCity_WallysHouse_MapScripts:: @ 8204229 .byte 0 PetalburgCity_WallysHouse_MapScript2_204234: @ 8204234 - map_script_2 VAR_0x4057, 4, PetalburgCity_WallysHouse_EventScript_20423E + map_script_2 VAR_PETALBURG_STATE, 4, PetalburgCity_WallysHouse_EventScript_20423E .2byte 0 PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E @@ -13,7 +13,7 @@ PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E end PetalburgCity_WallysHouse_MapScript2_204247: @ 8204247 - map_script_2 VAR_0x4057, 4, PetalburgCity_WallysHouse_EventScript_204251 + map_script_2 VAR_PETALBURG_STATE, 4, PetalburgCity_WallysHouse_EventScript_204251 .2byte 0 PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251 @@ -22,7 +22,7 @@ PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251 giveitem_std ITEM_HM03 setflag FLAG_RECEIVED_HM03 msgbox PetalburgCity_WallysHouse_Text_20461A, MSGBOX_DEFAULT - setvar VAR_0x4057, 5 + setvar VAR_PETALBURG_STATE, 5 releaseall end diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index 4921b88ae8..4bca7bb5ef 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -234,7 +234,7 @@ "x": 26, "y": 23, "elevation": 3, - "var": "VAR_0x4098", + "var": "VAR_PETALBURG_WOODS_STATE", "var_value": "0", "script": "PetalburgWoods_EventScript_22DFD7" }, @@ -243,7 +243,7 @@ "x": 27, "y": 23, "elevation": 3, - "var": "VAR_0x4098", + "var": "VAR_PETALBURG_WOODS_STATE", "var_value": "0", "script": "PetalburgWoods_EventScript_22E079" } diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index eec9100f1a..493800afc3 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -109,7 +109,7 @@ PetalburgWoods_EventScript_22E18B:: @ 822E18B PetalburgWoods_EventScript_22E1A7:: @ 822E1A7 removeobject 4 - setvar VAR_0x4098, 1 + setvar VAR_PETALBURG_WOODS_STATE, 1 releaseall end diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 97c303c1ce..44d8b2137d 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -111,7 +111,7 @@ "x": 10, "y": 19, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "1", "script": "Route101_EventScript_1EBCDE" }, @@ -120,7 +120,7 @@ "x": 11, "y": 19, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "1", "script": "Route101_EventScript_1EBCDE" }, @@ -129,7 +129,7 @@ "x": 10, "y": 18, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD4E" }, @@ -138,7 +138,7 @@ "x": 11, "y": 18, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD4E" }, @@ -147,7 +147,7 @@ "x": 6, "y": 16, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD64" }, @@ -156,7 +156,7 @@ "x": 6, "y": 15, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD64" }, @@ -165,7 +165,7 @@ "x": 6, "y": 17, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD64" }, @@ -174,7 +174,7 @@ "x": 6, "y": 18, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD64" }, @@ -183,7 +183,7 @@ "x": 7, "y": 13, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD7A" } diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 15722a3f33..06a9cd52ed 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -8,12 +8,12 @@ Route101_MapScript1_1EBCC5: @ 81EBCC5 end Route101_MapScript2_1EBCCB: @ 81EBCCB - map_script_2 VAR_0x4060, 0, Route101_EventScript_1EBCD5 + map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_1EBCD5 .2byte 0 Route101_EventScript_1EBCD5:: @ 81EBCD5 setflag FLAG_SPECIAL_FLAG_0x4000 - setvar VAR_0x4060, 1 + setvar VAR_ROUTE101_STATE, 1 end Route101_EventScript_1EBCDE:: @ 81EBCDE @@ -37,7 +37,7 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE waitmovement 0 msgbox Route101_Text_1EBE9A, MSGBOX_DEFAULT closemessage - setvar VAR_0x4060, 2 + setvar VAR_ROUTE101_STATE, 2 releaseall end @@ -234,8 +234,8 @@ Route101_EventScript_1EBE16:: @ 81EBE16 setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH setflag FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG - setvar VAR_0x4084, 2 - setvar VAR_0x4060, 3 + setvar VAR_BIRCH_LAB_STATE, 2 + setvar VAR_ROUTE101_STATE, 3 clearflag FLAG_SPECIAL_FLAG_0x4000 checkplayergender compare VAR_RESULT, MALE diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index e13bad76df..208f1cb5a1 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -140,7 +140,7 @@ Route103_EventScript_1EC585:: @ 81EC585 Route103_EventScript_1EC5A2:: @ 81EC5A2 removeobject 2 - setvar VAR_0x4084, 4 + setvar VAR_BIRCH_LAB_STATE, 4 clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL setflag FLAG_DEFEATED_RIVAL_ROUTE103 setvar VAR_0x40C7, 1 diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index e904f69b74..525b7d327d 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -4,7 +4,7 @@ Route104_MapScripts:: @ 81ECC32 .byte 0 Route104_MapScript2_1ECC3D: @ 81ECC3D - map_script_2 VAR_0x408E, 1, Route104_EventScript_1ECC47 + map_script_2 VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1, Route104_EventScript_1ECC47 .2byte 0 Route104_EventScript_1ECC47:: @ 81ECC47 @@ -29,7 +29,7 @@ Route104_EventScript_1ECC74:: @ 81ECC74 return Route104_EventScript_1ECC78:: @ 81ECC78 - compare VAR_0x408E, 1 + compare VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1 goto_if_ge Route104_EventScript_1ECC9D goto_if_set FLAG_MET_RIVAL_RUSTBORO, Route104_EventScript_1ECC9D goto_if_unset FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECC9D @@ -49,7 +49,7 @@ Route104_EventScript_1ECC9E:: @ 81ECC9E Route104_EventScript_1ECCB3:: @ 81ECCB3 lockall setflag FLAG_HIDE_RUSBORO_CITY_RIVAL - setvar VAR_0x405A, 8 + setvar VAR_RUSTBORO_STATE, 8 setvar VAR_0x4063, 2 applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_2725A6 waitmovement 0 @@ -413,11 +413,11 @@ Route104_EventScript_1ED139:: @ 81ED139 call Route104_EventScript_2720A8 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT hideobjectat 7, MAP_ROUTE104 - copyvar VAR_0x4096, VAR_0x8008 + copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 - setvar VAR_0x408E, 0 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0 goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1B4 goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1BE end diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index 17ed47206a..44eeca81f2 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -4,7 +4,7 @@ Route104_MrBrineysHouse_MapScripts:: @ 8229D2E Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34 setflag FLAG_LANDMARK_MR_BRINEY_HOUSE - compare VAR_0x4090, 1 + compare VAR_BRINEY_HOUSE_STATE, 1 call_if_eq Route104_MrBrineysHouse_EventScript_229D50 call_if_set FLAG_RECEIVED_POKENAV, Route104_MrBrineysHouse_EventScript_229D4C end @@ -75,11 +75,11 @@ Route104_MrBrineysHouse_EventScript_229E1D:: @ 8229E1D Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27 msgbox Route104_MrBrineysHouse_Text_229FE9, MSGBOX_DEFAULT call Route104_MrBrineysHouse_EventScript_271E95 - setvar VAR_0x408E, 1 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1 clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO - setvar VAR_0x405A, 8 + setvar VAR_RUSTBORO_STATE, 8 setvar VAR_0x4063, 2 setflag FLAG_HIDE_RUSBORO_CITY_RIVAL setflag FLAG_HIDE_ROUTE_104_RIVAL diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index ebf9398d13..63c3bb629e 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -55,7 +55,7 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5 hideobjectat 1, MAP_ROUTE109 msgbox Route109_Text_1E9C1D, MSGBOX_DEFAULT closemessage - copyvar VAR_0x4096, VAR_0x8008 + copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index 404155652e..a9ac7796a8 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -567,7 +567,7 @@ "x": 33, "y": 56, "elevation": 3, - "var": "VAR_0x4069", + "var": "VAR_ROUTE110_STATE", "var_value": "0", "script": "Route110_EventScript_1EF74D" }, @@ -576,7 +576,7 @@ "x": 34, "y": 56, "elevation": 3, - "var": "VAR_0x4069", + "var": "VAR_ROUTE110_STATE", "var_value": "0", "script": "Route110_EventScript_1EF758" }, @@ -585,7 +585,7 @@ "x": 35, "y": 56, "elevation": 3, - "var": "VAR_0x4069", + "var": "VAR_ROUTE110_STATE", "var_value": "0", "script": "Route110_EventScript_1EF763" }, diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 7c98cc6035..0446ac09ef 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -496,7 +496,7 @@ Route110_EventScript_1EF8EC:: @ 81EF8EC compare VAR_0x8008, 3 call_if_eq Route110_EventScript_1EF985 removeobject 29 - setvar VAR_0x4069, 1 + setvar VAR_ROUTE110_STATE, 1 savebgm MUS_DUMMY fadedefaultbgm releaseall diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 79aa60e75a..27eb381d0c 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -433,7 +433,7 @@ "x": 47, "y": 9, "elevation": 3, - "var": "VAR_0x406F", + "var": "VAR_ROUTE116_STATE", "var_value": "1", "script": "Route116_EventScript_1F2D95" } diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 623c74e3ca..fd1e77af12 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -145,7 +145,7 @@ Route116_EventScript_1F2D84:: @ 81F2D84 lock faceplayer msgbox Route116_Text_1F309D, MSGBOX_DEFAULT - setvar VAR_0x406F, 2 + setvar VAR_ROUTE116_STATE, 2 release end @@ -155,7 +155,7 @@ Route116_EventScript_1F2D95:: @ 81F2D95 applymovement EVENT_OBJ_ID_PLAYER, Route116_Movement_2725A4 waitmovement 0 msgbox Route116_Text_1F309D, MSGBOX_DEFAULT - setvar VAR_0x406F, 2 + setvar VAR_ROUTE116_STATE, 2 releaseall end diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index 66b7a17899..7fc1e45c73 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -326,7 +326,7 @@ "x": 43, "y": 11, "elevation": 3, - "var": "VAR_0x4071", + "var": "VAR_ROUTE118_STATE", "var_value": "0", "script": "Route118_EventScript_1F3E8E" }, @@ -335,7 +335,7 @@ "x": 44, "y": 11, "elevation": 3, - "var": "VAR_0x4071", + "var": "VAR_ROUTE118_STATE", "var_value": "0", "script": "Route118_EventScript_1F3EAE" }, @@ -344,7 +344,7 @@ "x": 45, "y": 11, "elevation": 3, - "var": "VAR_0x4071", + "var": "VAR_ROUTE118_STATE", "var_value": "0", "script": "Route118_EventScript_1F3EC4" } diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 45b8665b0d..fac602f7e8 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -107,7 +107,7 @@ Route118_EventScript_1F3EE4:: @ 81F3EE4 call_if_eq Route118_EventScript_1F3F3A compare VAR_0x8008, 2 call_if_eq Route118_EventScript_1F3F4C - setvar VAR_0x4071, 1 + setvar VAR_ROUTE118_STATE, 1 removeobject 19 releaseall end diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index bdb3e923d3..2146d5ec7a 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -607,7 +607,7 @@ "x": 25, "y": 31, "elevation": 0, - "var": "VAR_0x4072", + "var": "VAR_ROUTE119_STATE", "var_value": "0", "script": "Route119_EventScript_1F4472" }, @@ -616,7 +616,7 @@ "x": 26, "y": 31, "elevation": 0, - "var": "VAR_0x4072", + "var": "VAR_ROUTE119_STATE", "var_value": "0", "script": "Route119_EventScript_1F447D" }, diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index dee76d71d5..4a5e60ada9 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -156,7 +156,7 @@ Route119_EventScript_1F460F:: @ 81F460F compare VAR_TEMP_1, 2 call_if_eq Route119_EventScript_1F46EE removeobject 25 - setvar VAR_0x4072, 1 + setvar VAR_ROUTE119_STATE, 1 savebgm MUS_DUMMY fadedefaultbgm delay 60 diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index ad20a81197..4339b149dc 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -423,7 +423,7 @@ "x": 25, "y": 5, "elevation": 3, - "var": "VAR_0x4074", + "var": "VAR_ROUTE121_STATE", "var_value": "0", "script": "Route121_EventScript_1F5E18" }, @@ -432,7 +432,7 @@ "x": 25, "y": 6, "elevation": 3, - "var": "VAR_0x4074", + "var": "VAR_ROUTE121_STATE", "var_value": "0", "script": "Route121_EventScript_1F5E18" }, @@ -441,7 +441,7 @@ "x": 25, "y": 7, "elevation": 3, - "var": "VAR_0x4074", + "var": "VAR_ROUTE121_STATE", "var_value": "0", "script": "Route121_EventScript_1F5E18" }, @@ -450,7 +450,7 @@ "x": 25, "y": 8, "elevation": 3, - "var": "VAR_0x4074", + "var": "VAR_ROUTE121_STATE", "var_value": "0", "script": "Route121_EventScript_1F5E18" } diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index ee361d30cf..edca585c92 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -28,7 +28,7 @@ Route121_EventScript_1F5E18:: @ 81F5E18 removeobject 12 removeobject 13 removeobject 14 - setvar VAR_0x4074, 1 + setvar VAR_ROUTE121_STATE, 1 releaseall end diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index bb4f8d1505..19f0acdae5 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -8,7 +8,7 @@ Route128_MapScript1_1F6B43: @ 81F6B43 end Route128_MapScript2_1F6B4D: @ 81F6B4D - map_script_2 VAR_0x407B, 1, Route128_EventScript_1F6B57 + map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_1F6B57 .2byte 0 Route128_EventScript_1F6B57:: @ 81F6B57 @@ -74,7 +74,7 @@ Route128_EventScript_1F6B57:: @ 81F6B57 removeobject 3 waitfieldeffect 30 clearflag FLAG_SPECIAL_FLAG_0x4000 - setvar VAR_0x407B, 2 + setvar VAR_ROUTE128_STATE, 2 releaseall end diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index d43f7c33b5..1dcaaa3823 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -331,7 +331,7 @@ "x": 23, "y": 20, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "1", "script": "RustboroCity_EventScript_1E095A" }, @@ -340,7 +340,7 @@ "x": 23, "y": 21, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "1", "script": "RustboroCity_EventScript_1E0971" }, @@ -349,7 +349,7 @@ "x": 23, "y": 22, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "1", "script": "RustboroCity_EventScript_1E0988" }, @@ -358,7 +358,7 @@ "x": 23, "y": 23, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "1", "script": "RustboroCity_EventScript_1E099F" }, @@ -367,7 +367,7 @@ "x": 23, "y": 24, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "1", "script": "RustboroCity_EventScript_1E09B6" }, @@ -376,7 +376,7 @@ "x": 30, "y": 9, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "2", "script": "RustboroCity_EventScript_1E0AFE" }, @@ -385,7 +385,7 @@ "x": 29, "y": 10, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "2", "script": "RustboroCity_EventScript_1E0B0A" }, @@ -394,7 +394,7 @@ "x": 30, "y": 11, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "2", "script": "RustboroCity_EventScript_1E0B16" }, @@ -403,7 +403,7 @@ "x": 30, "y": 12, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "2", "script": "RustboroCity_EventScript_1E0B22" }, @@ -412,7 +412,7 @@ "x": 30, "y": 9, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "4", "script": "RustboroCity_EventScript_1E0C2B" }, @@ -421,7 +421,7 @@ "x": 31, "y": 10, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "4", "script": "RustboroCity_EventScript_1E0C37" }, @@ -430,7 +430,7 @@ "x": 30, "y": 11, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "4", "script": "RustboroCity_EventScript_1E0C43" }, @@ -439,7 +439,7 @@ "x": 30, "y": 12, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "4", "script": "RustboroCity_EventScript_1E0C4F" }, @@ -448,7 +448,7 @@ "x": 12, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0DF3" }, @@ -457,7 +457,7 @@ "x": 13, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0E33" }, @@ -466,7 +466,7 @@ "x": 14, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0E73" }, @@ -475,7 +475,7 @@ "x": 15, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0EB3" }, @@ -484,7 +484,7 @@ "x": 16, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0EF3" }, @@ -493,7 +493,7 @@ "x": 17, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0F33" }, @@ -502,7 +502,7 @@ "x": 18, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0F73" }, @@ -511,7 +511,7 @@ "x": 19, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0FB3" } diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 8ffbf8373d..8686bc18ed 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -6,10 +6,10 @@ RustboroCity_MapScripts:: @ 81E06BD RustboroCity_MapScript1_1E06C8: @ 81E06C8 setflag FLAG_VISITED_RUSTBORO_CITY call RustboroCity_EventScript_271ED7 - compare VAR_0x405A, 6 + compare VAR_RUSTBORO_STATE, 6 call_if_eq RustboroCity_EventScript_1E0707 getplayerxy VAR_TEMP_0, VAR_TEMP_1 - compare VAR_0x405A, 6 + compare VAR_RUSTBORO_STATE, 6 goto_if_eq RustboroCity_EventScript_1E06EC end @@ -28,7 +28,7 @@ RustboroCity_EventScript_1E0707:: @ 81E0707 return RustboroCity_MapScript2_1E070B: @ 81E070B - map_script_2 VAR_0x405A, 6, RustboroCity_EventScript_1E0715 + map_script_2 VAR_RUSTBORO_STATE, 6, RustboroCity_EventScript_1E0715 .2byte 0 RustboroCity_EventScript_1E0715:: @ 81E0715 @@ -99,7 +99,7 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD playse SE_KAIDAN removeobject 15 setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST - setvar VAR_0x405A, 7 + setvar VAR_RUSTBORO_STATE, 7 clearflag FLAG_SPECIAL_FLAG_0x4000 releaseall end @@ -302,9 +302,9 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD setobjectxyperm 9, 30, 10 clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 setflag FLAG_DEVON_GOODS_STOLEN - setvar VAR_0x405A, 2 + setvar VAR_RUSTBORO_STATE, 2 setvar VAR_RUSTURF_TUNNEL_STATE, 2 - setvar VAR_0x406F, 1 + setvar VAR_ROUTE116_STATE, 1 clearflag FLAG_HIDE_ROUTE_116_MR_BRINEY clearflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO clearflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT @@ -493,7 +493,7 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E compare VAR_TEMP_1, 3 call_if_eq RustboroCity_EventScript_1E0BF3 setflag FLAG_INTERACTED_WITH_DEVON_EMPLOYEE_GOODS_STOLEN - setvar VAR_0x405A, 3 + setvar VAR_RUSTBORO_STATE, 3 moveobjectoffscreen 9 msgbox RustboroCity_Text_1E183E, MSGBOX_DEFAULT releaseall @@ -596,7 +596,7 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B closemessage setflag FLAG_RETURNED_DEVON_GOODS setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 - setvar VAR_0x405A, 5 + setvar VAR_RUSTBORO_STATE, 5 delay 30 warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 waitstate @@ -840,7 +840,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B closemessage delay 30 setflag FLAG_ENABLE_RIVAL_MATCH_CALL - setvar VAR_0x405A, 8 + setvar VAR_RUSTBORO_STATE, 8 setvar VAR_0x4063, 2 setvar VAR_0x8008, 0 msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO @@ -911,7 +911,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114 closemessage delay 30 setflag FLAG_ENABLE_RIVAL_MATCH_CALL - setvar VAR_0x405A, 8 + setvar VAR_RUSTBORO_STATE, 8 setvar VAR_0x4063, 2 msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO compare VAR_RESULT, 1 diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index cce9ae394b..cd088382d0 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -281,7 +281,7 @@ RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF faceplayer compare VAR_0x40C4, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 - compare VAR_0x405A, 6 + compare VAR_RUSTBORO_STATE, 6 goto_if_ge RustboroCity_DevonCorp_2F_EventScript_211BF1 msgbox RustboroCity_DevonCorp_2F_Text_212338, MSGBOX_DEFAULT release diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 9d5fbe58bc..3478717838 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D .byte 0 RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D - compare VAR_0x408F, 0 + compare VAR_DEVON_CORP_3F_STATE, 0 call_if_eq RustboroCity_DevonCorp_3F_EventScript_212449 end @@ -15,7 +15,7 @@ RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449 return RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455 - map_script_2 VAR_0x408F, 0, RustboroCity_DevonCorp_3F_EventScript_21245F + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_21245F .2byte 0 RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F @@ -23,7 +23,7 @@ RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F end RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464 - map_script_2 VAR_0x408F, 0, RustboroCity_DevonCorp_3F_EventScript_21246E + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_21246E .2byte 0 RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E @@ -65,10 +65,10 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO - setvar VAR_0x4096, 1 + setvar VAR_BRINEY_LOCATION, 1 clearflag FLAG_HIDE_RUSBORO_CITY_RIVAL - setvar VAR_0x408F, 1 - setvar VAR_0x405A, 6 + setvar VAR_DEVON_CORP_3F_STATE, 1 + setvar VAR_RUSTBORO_STATE, 6 releaseall end diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 4581707ce7..6e844b0002 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -18,11 +18,11 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66 msgbox RustboroCity_Gym_Text_213816, MSGBOX_DEFAULT setflag FLAG_DEFEATED_RUSTBORO_GYM setflag FLAG_BADGE01_GET - setvar VAR_0x405A, 1 - addvar VAR_0x4085, 1 + setvar VAR_RUSTBORO_STATE, 1 + addvar VAR_PETALBURG_GYM_STATE, 1 setvar VAR_0x8008, 1 call RustboroCity_Gym_EventScript_271F43 - compare VAR_0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq RustboroCity_Gym_EventScript_271E84 goto RustboroCity_Gym_EventScript_212FA4 end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 59d0789ba6..f10ae75bac 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -345,8 +345,8 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 removeobject 7 clearflag FLAG_DEVON_GOODS_STOLEN setflag FLAG_RECOVERED_DEVON_GOODS - setvar VAR_0x405A, 4 - setvar VAR_0x4090, 1 + setvar VAR_RUSTBORO_STATE, 4 + setvar VAR_BRINEY_HOUSE_STATE, 1 setflag FLAG_HIDE_ROUTE_116_MR_BRINEY release end diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 6ab802ee48..151550dec0 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -118,7 +118,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23503A waitmovement 0 msgbox SeafloorCavern_Room9_Text_235723, MSGBOX_DEFAULT - setvar VAR_0x407B, 1 + setvar VAR_ROUTE128_STATE, 1 setvar VAR_0x405E, 1 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN clearflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 2e7859fba2..05e4bc0307 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -6,7 +6,7 @@ SlateportCity_MapScripts:: @ 81DCC61 SlateportCity_MapScript1_1DCC6C: @ 81DCC6C setvar VAR_0x40AA, 0 call SlateportCity_EventScript_1DCC8D - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCC99 compare VAR_0x40D2, 1 call_if_eq SlateportCity_EventScript_1DCCE7 @@ -14,7 +14,7 @@ SlateportCity_MapScript1_1DCC6C: @ 81DCC6C SlateportCity_EventScript_1DCC8D:: @ 81DCC8D setflag FLAG_VISITED_SLATEPORT_CITY - setvar VAR_0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER return @@ -170,7 +170,7 @@ SlateportCity_EventScript_1DCE38:: @ 81DCE38 SlateportCity_EventScript_1DCE42:: @ 81DCE42 lock faceplayer - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCE59 msgbox SlateportCity_Text_1DD81A, MSGBOX_DEFAULT release @@ -184,7 +184,7 @@ SlateportCity_EventScript_1DCE59:: @ 81DCE59 SlateportCity_EventScript_1DCE63:: @ 81DCE63 lock faceplayer - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCE7A msgbox SlateportCity_Text_1DD8A6, MSGBOX_DEFAULT release @@ -198,7 +198,7 @@ SlateportCity_EventScript_1DCE7A:: @ 81DCE7A SlateportCity_EventScript_1DCE84:: @ 81DCE84 lock faceplayer - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCEA4 goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_1DCEAE msgbox SlateportCity_Text_1DD93D, MSGBOX_DEFAULT @@ -218,7 +218,7 @@ SlateportCity_EventScript_1DCEAE:: @ 81DCEAE SlateportCity_EventScript_1DCEB8:: @ 81DCEB8 lock faceplayer - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCECF msgbox SlateportCity_Text_1DDA34, MSGBOX_DEFAULT release @@ -230,7 +230,7 @@ SlateportCity_EventScript_1DCECF:: @ 81DCECF end SlateportCity_EventScript_1DCED9:: @ 81DCED9 - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 goto_if_eq SlateportCity_EventScript_1DCEED msgbox SlateportCity_Text_1DDA9A, MSGBOX_NPC end @@ -242,7 +242,7 @@ SlateportCity_EventScript_1DCEED:: @ 81DCEED SlateportCity_EventScript_1DCEF6:: @ 81DCEF6 lock faceplayer - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCF0D msgbox SlateportCity_Text_1DDB21, MSGBOX_DEFAULT release @@ -323,7 +323,7 @@ SlateportCity_EventScript_1DCFB2:: @ 81DCFB2 SlateportCity_EventScript_1DCFBB:: @ 81DCFBB lock faceplayer - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCFD2 msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT release @@ -609,7 +609,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE - setvar VAR_0x4058, 2 + setvar VAR_SLATEPORT_STATE, 2 warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 waitstate releaseall diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index c929633dd0..5c3fe86dbb 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -4,7 +4,7 @@ VerdanturfTown_MapScripts:: @ 81EB566 VerdanturfTown_MapScript1_1EB56C: @ 81EB56C setflag FLAG_VISITED_VERDANTURF_TOWN - setvar VAR_0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 end VerdanturfTown_EventScript_1EB575:: @ 81EB575 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index b73d7e1fac..94c883363c 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -101,14 +101,14 @@ RustboroCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C SlateportCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C SootopolisCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C - map_script_2 VAR_0x4087, 1, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 2, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 5, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 3, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 4, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 6, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 7, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 8, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 6, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 7, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 8, OldaleTown_PokemonCenter_2F_EventScript_276BAE .2byte 0 MossdeepCity_GameCorner_1F_EventScript_276BAE:: @ 8276BAE @@ -138,21 +138,21 @@ RustboroCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE SlateportCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE SootopolisCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE - compare VAR_0x4087, 1 + compare VAR_CABLE_CLUB_STATE, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare VAR_0x4087, 2 + compare VAR_CABLE_CLUB_STATE, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare VAR_0x4087, 5 + compare VAR_CABLE_CLUB_STATE, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare VAR_0x4087, 3 + compare VAR_CABLE_CLUB_STATE, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C1D - compare VAR_0x4087, 4 + compare VAR_CABLE_CLUB_STATE, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C23 - compare VAR_0x4087, 6 + compare VAR_CABLE_CLUB_STATE, 6 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C29 - compare VAR_0x4087, 7 + compare VAR_CABLE_CLUB_STATE, 7 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C2F - compare VAR_0x4087, 8 + compare VAR_CABLE_CLUB_STATE, 8 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C35 end @@ -198,14 +198,14 @@ SlateportCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B SootopolisCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B map_script_2 VAR_0x40CD, 1, OldaleTown_PokemonCenter_2F_EventScript_276DE0 - map_script_2 VAR_0x4087, 1, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_0x4087, 2, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_0x4087, 5, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_0x4087, 3, OldaleTown_PokemonCenter_2F_EventScript_276CE7 - map_script_2 VAR_0x4087, 4, OldaleTown_PokemonCenter_2F_EventScript_276D2C - map_script_2 VAR_0x4087, 6, OldaleTown_PokemonCenter_2F_EventScript_276D6C - map_script_2 VAR_0x4087, 7, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_0x4087, 8, OldaleTown_PokemonCenter_2F_EventScript_276C9D + map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276C85 + map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276C85 + map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276C85 + map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_276CE7 + map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_276D2C + map_script_2 VAR_CABLE_CLUB_STATE, 6, OldaleTown_PokemonCenter_2F_EventScript_276D6C + map_script_2 VAR_CABLE_CLUB_STATE, 7, OldaleTown_PokemonCenter_2F_EventScript_276C85 + map_script_2 VAR_CABLE_CLUB_STATE, 8, OldaleTown_PokemonCenter_2F_EventScript_276C9D .2byte 0 OldaleTown_PokemonCenter_2F_EventScript_276C85:: @ 8276C85 @@ -231,7 +231,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276C9D:: @ 8276C9D OldaleTown_PokemonCenter_2F_EventScript_276CB5:: @ 8276CB5 special CloseLink - setvar VAR_0x4087, 0 + setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D @@ -254,7 +254,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276CE7:: @ 8276CE7 OldaleTown_PokemonCenter_2F_EventScript_276CFF:: @ 8276CFF special CloseLink - setvar VAR_0x4087, 0 + setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E @@ -276,7 +276,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D2C:: @ 8276D2C OldaleTown_PokemonCenter_2F_EventScript_276D44:: @ 8276D44 special CloseLink - setvar VAR_0x4087, 0 + setvar VAR_CABLE_CLUB_STATE, 0 applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F waitmovement 0 compare VAR_0x8007, 0 @@ -298,7 +298,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D6C:: @ 8276D6C end OldaleTown_PokemonCenter_2F_EventScript_276D84:: @ 8276D84 - setvar VAR_0x4087, 0 + setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E @@ -450,7 +450,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD special HealPlayerParty special SavePlayerParty special LoadPlayerBag - copyvar VAR_0x4087, VAR_0x8004 + copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 waitmessage call OldaleTown_PokemonCenter_2F_EventScript_277BE4 @@ -554,7 +554,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2 OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A setvar VAR_0x8004, 3 - copyvar VAR_0x4087, VAR_0x8004 + copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 waitmessage call OldaleTown_PokemonCenter_2F_EventScript_277BE4 @@ -629,7 +629,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C setvar VAR_0x8004, 4 - copyvar VAR_0x4087, VAR_0x8004 + copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 waitmessage call OldaleTown_PokemonCenter_2F_EventScript_277BE4 @@ -1030,7 +1030,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F closemessage special HealPlayerParty setvar VAR_0x8004, 6 - copyvar VAR_0x4087, VAR_0x8004 + copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 call OldaleTown_PokemonCenter_2F_EventScript_277BBE special DrawWholeMapView playse SE_TK_KASYA diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index f85ebd3d2a..b42b6505ff 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1,7 +1,7 @@ LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5 lock faceplayer - compare VAR_0x408A, 0 + compare VAR_CONTEST_PRIZE_PICKUP, 0 goto_if_ne LilycoveCity_ContestLobby_EventScript_279D13 call_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CEA call_if_unset FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CF3 @@ -21,7 +21,7 @@ LilycoveCity_ContestLobby_EventScript_279CF3:: @ 8279CF3 LilycoveCity_ContestLobby_EventScript_279D13:: @ 8279D13 msgbox LilycoveCity_ContestLobby_Text_27B67B, MSGBOX_DEFAULT - switch VAR_0x408A + switch VAR_CONTEST_PRIZE_PICKUP case 4, LilycoveCity_ContestLobby_EventScript_279D2C end @@ -29,7 +29,7 @@ LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C giveitem_std ITEM_LUXURY_BALL compare VAR_RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_279D4B - setvar VAR_0x408A, 0 + setvar VAR_CONTEST_PRIZE_PICKUP, 0 closemessage release end @@ -181,7 +181,7 @@ LilycoveCity_ContestLobby_EventScript_279F87:: @ 8279F87 msgbox LilycoveCity_ContestLobby_Text_27B5E2, MSGBOX_DEFAULT closemessage releaseall - setvar VAR_0x4086, 1 + setvar VAR_LINK_CONTEST_ROOM_STATE, 1 return LinkContestRoom1_EventScript_279F97:: @ 8279F97 @@ -204,7 +204,7 @@ LinkContestRoom1_EventScript_279F97:: @ 8279F97 call LinkContestRoom1_EventScript_27A9D4 call LinkContestRoom1_EventScript_27AA1B call LinkContestRoom1_EventScript_27AB36 - setvar VAR_0x4086, 2 + setvar VAR_LINK_CONTEST_ROOM_STATE, 2 return LinkContestRoom1_EventScript_279FF2:: @ 8279FF2 @@ -271,7 +271,7 @@ LinkContestRoom1_EventScript_27A097:: @ 827A097 return LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A0C7 lockall msgbox LinkContestRoom1_Text_27B711, MSGBOX_DEFAULT @@ -391,7 +391,7 @@ LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2 return LinkContestRoom1_EventScript_27A217:: @ 827A217 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A229 message LinkContestRoom1_Text_27B815 waitmessage @@ -419,7 +419,7 @@ LinkContestRoom1_EventScript_27A230:: @ 827A230 return LinkContestRoom1_EventScript_27A26C:: @ 827A26C - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A280 msgbox LinkContestRoom1_Text_27B830, MSGBOX_DEFAULT return @@ -445,7 +445,7 @@ LinkContestRoom1_EventScript_27A297:: @ 827A297 return LinkContestRoom1_EventScript_27A2B9:: @ 827A2B9 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A2CA message LinkContestRoom1_Text_27B8F2 return @@ -483,15 +483,15 @@ LinkContestRoom1_EventScript_27A2D5:: @ 827A2D5 LinkContestRoom1_EventScript_27A34F:: @ 827A34F special sub_80F82FC - compare VAR_0x4088, 1 + compare VAR_CONTEST_LOCATION, 1 call_if_eq LinkContestRoom1_EventScript_27A454 - compare VAR_0x4088, 2 + compare VAR_CONTEST_LOCATION, 2 call_if_eq LinkContestRoom1_EventScript_27A4B2 - compare VAR_0x4088, 3 + compare VAR_CONTEST_LOCATION, 3 call_if_eq LinkContestRoom1_EventScript_27A510 - compare VAR_0x4088, 4 + compare VAR_CONTEST_LOCATION, 4 call_if_eq LinkContestRoom1_EventScript_27A56E - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 call_if_eq LinkContestRoom1_EventScript_27A5CC setvar VAR_TEMP_1, 9 setvar VAR_TEMP_2, 9 @@ -843,7 +843,7 @@ LinkContestRoom1_EventScript_27A801:: @ 827A801 return LinkContestRoom1_EventScript_27A853:: @ 827A853 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A867 msgbox LinkContestRoom1_Text_27B904, MSGBOX_DEFAULT return @@ -893,7 +893,7 @@ LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5 return LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A90F msgbox LinkContestRoom1_Text_27BA15, MSGBOX_DEFAULT return @@ -906,7 +906,7 @@ LinkContestRoom1_EventScript_27A90F:: @ 827A90F return LinkContestRoom1_EventScript_27A91E:: @ 827A91E - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A932 msgbox LinkContestRoom1_Text_27BA30, MSGBOX_DEFAULT return @@ -919,7 +919,7 @@ LinkContestRoom1_EventScript_27A932:: @ 827A932 return LinkContestRoom1_EventScript_27A941:: @ 827A941 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A955 msgbox LinkContestRoom1_Text_27BAAC, MSGBOX_DEFAULT return @@ -932,7 +932,7 @@ LinkContestRoom1_EventScript_27A955:: @ 827A955 return LinkContestRoom1_EventScript_27A964:: @ 827A964 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A978 msgbox LinkContestRoom1_Text_27BB25, MSGBOX_DEFAULT return @@ -983,7 +983,7 @@ LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4 return LinkContestRoom1_EventScript_27AA00:: @ 827AA00 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27AA14 msgbox LinkContestRoom1_Text_27BB4C, MSGBOX_DEFAULT return @@ -996,7 +996,7 @@ LinkContestRoom1_EventScript_27AA14:: @ 827AA14 LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B addvar VAR_TEMP_1, 1 lockall - compare VAR_0x4088, 1 + compare VAR_CONTEST_LOCATION, 1 call_if_gt LinkContestRoom1_EventScript_27AA6F applymovement 9, LinkContestRoom1_Movement_27AD3B applymovement 12, LinkContestRoom1_Movement_27AD3F @@ -1081,7 +1081,7 @@ LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F return LinkContestRoom1_EventScript_27AB36:: @ 827AB36 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27ABD8 call LinkContestRoom1_EventScript_27AB9E goto_if_set FLAG_TEMP_2, LinkContestRoom1_EventScript_27AB82 @@ -1135,7 +1135,7 @@ LinkContestRoom1_EventScript_27ABCE:: @ 827ABCE return LinkContestRoom1_EventScript_27ABD2:: @ 827ABD2 - setvar VAR_0x4099, 1 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 return LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8 @@ -1149,7 +1149,7 @@ LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8 return LinkContestRoom1_EventScript_27ABF1:: @ 827ABF1 - setvar VAR_0x4099, 2 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2 return LinkContestRoom1_EventScript_27ABF7:: @ 827ABF7 @@ -1201,7 +1201,7 @@ LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E return LinkContestRoom1_EventScript_27AC77:: @ 827AC77 - compare VAR_0x4088, 2 + compare VAR_CONTEST_LOCATION, 2 call_if_eq LinkContestRoom1_EventScript_27ABCE specialvar VAR_RESULT, sub_80F7F7C compare VAR_RESULT, 0 @@ -1218,7 +1218,7 @@ LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8 call LinkContestRoom1_EventScript_27205E msgbox LinkContestRoom1_Text_27BC2F, MSGBOX_DEFAULT releaseall - setvar VAR_0x408A, 4 + setvar VAR_CONTEST_PRIZE_PICKUP, 4 return LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index eb29ef6e07..7214d43727 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -1,6 +1,6 @@ LittlerootTown_BrendansHouse_2F_EventScript_2926FE:: @ 82926FE LittlerootTown_MaysHouse_2F_EventScript_2926FE:: @ 82926FE - setvar VAR_0x4092, 5 + setvar VAR_LITTLEROOT_INTRO_STATE, 5 return LittlerootTown_BrendansHouse_1F_EventScript_292704:: @ 8292704 @@ -14,7 +14,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292758 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, MSGBOX_DEFAULT closemessage - setvar VAR_0x4092, 4 + setvar VAR_LITTLEROOT_INTRO_STATE, 4 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763 applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6 waitmovement 0 @@ -63,7 +63,7 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, MSGBOX_DEFAULT call LittlerootTown_BrendansHouse_2F_EventScript_292849 delay 30 - setvar VAR_0x4092, 6 + setvar VAR_LITTLEROOT_INTRO_STATE, 6 setflag FLAG_SET_WALL_CLOCK setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 @@ -149,7 +149,7 @@ LittlerootTown_BrendansHouse_2F_Movement_292862: @ 8292862 LittlerootTown_BrendansHouse_1F_EventScript_292866:: @ 8292866 LittlerootTown_MaysHouse_1F_EventScript_292866:: @ 8292866 - setvar VAR_0x4092, 7 + setvar VAR_LITTLEROOT_INTRO_STATE, 7 releaseall end @@ -313,15 +313,15 @@ LittlerootTown_BrendansHouse_1F_EventScript_2929C5:: @ 82929C5 LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5 lock faceplayer - compare VAR_0x4082, 4 + compare VAR_LITTLEROOT_HOUSES_STATE, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F - compare VAR_0x408C, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F goto_if_set FLAG_HAS_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A19 goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_BrendansHouse_1F_EventScript_292A86 compare VAR_TEMP_1, 1 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94 - compare VAR_0x4092, 7 + compare VAR_LITTLEROOT_INTRO_STATE, 7 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT release @@ -513,8 +513,8 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 copyvar VAR_0x40D5, VAR_RESULT msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, MSGBOX_DEFAULT closemessage - setvar VAR_0x4082, 4 - setvar VAR_0x408C, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4 releaseall end diff --git a/include/constants/vars.h b/include/constants/vars.h index fedc856572..a66b72cd0b 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -60,7 +60,7 @@ #define VAR_POISON_STEP_COUNTER 0x402B #define VAR_RESET_RTC_ENABLE 0x402C #define VAR_ENIGMA_BERRY_AVAILABLE 0x402D -#define VAR_0x402E 0x402E +#define VAR_0x402E 0x402E // Seems to be unused. #define VAR_FRONTIER_MANIAC_FACILITY 0x402F #define VAR_FRONTIER_GAMBLER_FACILITY 0x4030 @@ -97,22 +97,22 @@ #define VAR_0x404E 0x404E #define VAR_LOTAD_SIZE_RECORD 0x404F #define VAR_0x4050 0x4050 -#define VAR_0x4051 0x4051 +#define VAR_ROUTE102_ACCESSIBLE 0x4051 #define VAR_0x4052 0x4052 -#define VAR_0x4053 0x4053 +#define VAR_LAVARIDGE_RIVAL_STATE 0x4053 #define VAR_CURRENT_SECRET_BASE 0x4054 #define VAR_0x4055 0x4055 #define VAR_0x4056 0x4056 -#define VAR_0x4057 0x4057 -#define VAR_0x4058 0x4058 +#define VAR_PETALBURG_STATE 0x4057 +#define VAR_SLATEPORT_STATE 0x4058 #define VAR_0x4059 0x4059 -#define VAR_0x405A 0x405A +#define VAR_RUSTBORO_STATE 0x405A #define VAR_0x405B 0x405B #define VAR_0x405C 0x405C #define VAR_0x405D 0x405D #define VAR_0x405E 0x405E #define VAR_0x405F 0x405F -#define VAR_0x4060 0x4060 +#define VAR_ROUTE101_STATE 0x4060 #define VAR_0x4061 0x4061 #define VAR_0x4062 0x4062 #define VAR_0x4063 0x4063 @@ -121,58 +121,58 @@ #define VAR_0x4066 0x4066 #define VAR_0x4067 0x4067 #define VAR_0x4068 0x4068 -#define VAR_0x4069 0x4069 +#define VAR_ROUTE110_STATE 0x4069 #define VAR_0x406A 0x406A #define VAR_0x406B 0x406B #define VAR_0x406C 0x406C #define VAR_0x406D 0x406D #define VAR_0x406E 0x406E -#define VAR_0x406F 0x406F +#define VAR_ROUTE116_STATE 0x406F #define VAR_0x4070 0x4070 -#define VAR_0x4071 0x4071 -#define VAR_0x4072 0x4072 +#define VAR_ROUTE118_STATE 0x4071 +#define VAR_ROUTE119_STATE 0x4072 #define VAR_0x4073 0x4073 -#define VAR_0x4074 0x4074 +#define VAR_ROUTE121_STATE 0x4074 #define VAR_0x4075 0x4075 #define VAR_0x4076 0x4076 #define VAR_0x4077 0x4077 #define VAR_0x4078 0x4078 #define VAR_0x4079 0x4079 #define VAR_0x407A 0x407A -#define VAR_0x407B 0x407B +#define VAR_ROUTE128_STATE 0x407B #define VAR_0x407C 0x407C #define VAR_0x407D 0x407D #define VAR_0x407E 0x407E #define VAR_0x407F 0x407F #define VAR_0x4080 0x4080 #define VAR_0x4081 0x4081 -#define VAR_0x4082 0x4082 +#define VAR_LITTLEROOT_HOUSES_STATE 0x4082 #define VAR_0x4083 0x4083 -#define VAR_0x4084 0x4084 -#define VAR_0x4085 0x4085 -#define VAR_0x4086 0x4086 -#define VAR_0x4087 0x4087 -#define VAR_0x4088 0x4088 +#define VAR_BIRCH_LAB_STATE 0x4084 +#define VAR_PETALBURG_GYM_STATE 0x4085 +#define VAR_LINK_CONTEST_ROOM_STATE 0x4086 +#define VAR_CABLE_CLUB_STATE 0x4087 +#define VAR_CONTEST_LOCATION 0x4088 #define VAR_0x4089 0x4089 -#define VAR_0x408A 0x408A +#define VAR_CONTEST_PRIZE_PICKUP 0x408A #define VAR_0x408B 0x408B -#define VAR_0x408C 0x408C -#define VAR_0x408D 0x408D -#define VAR_0x408E 0x408E -#define VAR_0x408F 0x408F -#define VAR_0x4090 0x4090 +#define VAR_LITTLEROOT_HOUSES_STATE_2 0x408C +#define VAR_LITTLEROOT_RIVAL_STATE 0x408D +#define VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE 0x408E +#define VAR_DEVON_CORP_3F_STATE 0x408F +#define VAR_BRINEY_HOUSE_STATE 0x4090 #define VAR_0x4091 0x4091 -#define VAR_0x4092 0x4092 -#define VAR_0x4093 0x4093 -#define VAR_0x4094 0x4094 +#define VAR_LITTLEROOT_INTRO_STATE 0x4092 +#define VAR_MAUVILLE_GYM_STATE 0x4093 +#define VAR_LILYCOVE_MUSEUM_2F_STATE 0x4094 #define VAR_LILYCOVE_FAN_CLUB_STATE 0x4095 -#define VAR_0x4096 0x4096 +#define VAR_BRINEY_LOCATION 0x4096 #define VAR_0x4097 0x4097 -#define VAR_0x4098 0x4098 -#define VAR_0x4099 0x4099 +#define VAR_PETALBURG_WOODS_STATE 0x4098 +#define VAR_LILYCOVE_CONTEST_LOBBY_STATE 0x4099 #define VAR_RUSTURF_TUNNEL_STATE 0x409A #define VAR_0x409B 0x409B -#define VAR_0x409C 0x409C +#define VAR_ELITE_4_STATE 0x409C #define VAR_0x409D 0x409D #define VAR_0x409E 0x409E #define VAR_0x409F 0x409F diff --git a/src/contest_link_80F57C4.c b/src/contest_link_80F57C4.c index 485065d714..c0a79af814 100644 --- a/src/contest_link_80F57C4.c +++ b/src/contest_link_80F57C4.c @@ -372,12 +372,12 @@ static void sub_80F5CE4(u8 taskId) sub_80DEDA8(0xFE); gUnknown_02039F5C = 1; gUnknown_02039F5D = sub_80DEFA8(0xFE, 0); - var = VarGet(VAR_0x4086); - VarSet(VAR_0x4086, 0); + var = VarGet(VAR_LINK_CONTEST_ROOM_STATE); + VarSet(VAR_LINK_CONTEST_ROOM_STATE, 0); SetContinueGameWarpStatusToDynamicWarp(); TrySavingData(SAVE_LINK); ClearContinueGameWarpStatus2(); - VarSet(VAR_0x4086, var); + VarSet(VAR_LINK_CONTEST_ROOM_STATE, var); gTasks[taskId].data[0]++; break; case 1: diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index baed26cf81..c8adfbe0bc 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -1630,7 +1630,7 @@ void sub_8014210(u16 battleFlags) void sub_8014290(u16 arg0, u16 x, u16 y) { - VarSet(VAR_0x4087, arg0); + VarSet(VAR_CABLE_CLUB_STATE, arg0); SetWarpDestination(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x, y); SetDynamicWarpWithCoords(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x, y); WarpIntoMap(); @@ -1639,7 +1639,7 @@ void sub_8014290(u16 arg0, u16 x, u16 y) void sub_8014304(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 arg4) { gSpecialVar_0x8004 = arg4; - VarSet(VAR_0x4087, arg4); + VarSet(VAR_CABLE_CLUB_STATE, arg4); gFieldLinkPlayerCount = GetLinkPlayerCount(); gUnknown_03005DB4 = GetMultiplayerId(); SetCableClubWarp(); From cea5696f238acc7c2b868e46e92775f4a05ae1f4 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 04:18:43 -0500 Subject: [PATCH 100/217] Finish moving pokeruby vars --- data/event_scripts.s | 4 +- .../scripts.inc | 12 +- .../BattleFrontier_OutsideEast/scripts.inc | 2 +- .../BattleFrontier_OutsideWest/scripts.inc | 2 +- data/maps/JaggedPass/scripts.inc | 2 +- data/maps/LittlerootTown/scripts.inc | 4 +- data/maps/MagmaHideout_1F/scripts.inc | 2 +- data/maps/MagmaHideout_4F/scripts.inc | 2 +- data/maps/MauvilleCity/scripts.inc | 2 +- data/maps/MauvilleCity_Gym/scripts.inc | 2 +- data/maps/MeteorFalls_1F_1R/map.json | 2 +- data/maps/MeteorFalls_1F_1R/scripts.inc | 2 +- .../MossdeepCity_SpaceCenter_2F/scripts.inc | 2 +- .../MossdeepCity_StevensHouse/scripts.inc | 6 +- data/maps/MtChimney/scripts.inc | 2 +- .../MtChimney_CableCarStation/scripts.inc | 8 +- data/maps/MtPyre_Summit/map.json | 12 +- data/maps/MtPyre_Summit/scripts.inc | 8 +- data/maps/NewMauville_Entrance/map.json | 2 +- data/maps/NewMauville_Entrance/scripts.inc | 4 +- data/maps/NewMauville_Inside/map.json | 2 +- data/maps/NewMauville_Inside/scripts.inc | 6 +- data/maps/OldaleTown/map.json | 6 +- data/maps/OldaleTown/scripts.inc | 2 +- data/maps/Route103/scripts.inc | 2 +- .../Route110_TrickHouseCorridor/scripts.inc | 2 +- data/maps/Route110_TrickHouseEnd/scripts.inc | 20 ++-- .../maps/Route110_TrickHouseEntrance/map.json | 8 +- .../Route110_TrickHouseEntrance/scripts.inc | 110 +++++++++--------- .../Route110_TrickHousePuzzle1/scripts.inc | 6 +- .../Route110_TrickHousePuzzle2/scripts.inc | 4 +- .../Route110_TrickHousePuzzle3/scripts.inc | 4 +- .../Route110_TrickHousePuzzle4/scripts.inc | 4 +- .../Route110_TrickHousePuzzle5/scripts.inc | 4 +- .../Route110_TrickHousePuzzle6/scripts.inc | 4 +- .../Route110_TrickHousePuzzle7/scripts.inc | 14 +-- .../Route110_TrickHousePuzzle8/scripts.inc | 4 +- data/maps/Route112/scripts.inc | 2 +- .../maps/Route112_CableCarStation/scripts.inc | 8 +- data/maps/Route113_GlassWorkshop/scripts.inc | 32 ++--- .../Route121_SafariZoneEntrance/scripts.inc | 6 +- .../RustboroCity_DevonCorp_2F/scripts.inc | 34 +++--- data/maps/SafariZone_South/scripts.inc | 8 +- data/maps/SeafloorCavern_Room9/map.json | 2 +- data/maps/SeafloorCavern_Room9/scripts.inc | 4 +- data/maps/SlateportCity/scripts.inc | 2 +- data/maps/SlateportCity_Harbor/map.json | 8 +- data/maps/SlateportCity_Harbor/scripts.inc | 6 +- .../SlateportCity_OceanicMuseum_1F/map.json | 4 +- .../scripts.inc | 4 +- .../SlateportCity_PokemonFanClub/scripts.inc | 8 +- data/maps/SootopolisCity/scripts.inc | 2 +- .../scripts.inc | 16 +-- .../scripts.inc | 6 +- data/maps/VictoryRoad_1F/map.json | 4 +- data/maps/VictoryRoad_1F/scripts.inc | 6 +- data/scripts/safari_zone.inc | 4 +- include/constants/vars.h | 64 +++++----- src/tv.c | 2 +- 59 files changed, 258 insertions(+), 258 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index b3ad9f771f..88a0f52ea1 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1114,7 +1114,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY - setvar VAR_0x40C6, 2 + setvar VAR_STEVENS_HOUSE_STATE, 2 setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL @@ -4560,7 +4560,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A end BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84 - compare VAR_0x40BC, 0 + compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 setvar VAR_0x8005, 7 special InterviewBefore diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index e1bec2c213..53c3335c31 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -231,7 +231,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE end BattleFrontier_BattleTowerLobby_EventScript_23E930:: @ 823E930 - setvar VAR_0x40BC, 1 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 return BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936 @@ -305,7 +305,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 - setvar VAR_0x40BC, 1 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 end @@ -385,7 +385,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 - setvar VAR_0x40BC, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 end @@ -466,7 +466,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 - setvar VAR_0x40BC, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 end @@ -995,7 +995,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3A6:: @ 823F3A6 BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF incrementgamestat 30 - setvar VAR_0x40BC, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 message BattleFrontier_BattleTowerLobby_Text_24144D waitmessage setvar VAR_0x8004, 6 @@ -1058,7 +1058,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463 BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496 incrementgamestat 30 - setvar VAR_0x40BC, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 message BattleFrontier_BattleTowerLobby_Text_24144D waitmessage setvar VAR_0x8004, 6 diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 9a90f23f95..2016df74cd 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -15,7 +15,7 @@ BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 return BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D - setvar VAR_0x40BC, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 setflag FLAG_HIDE_BATTLE_TOWER_REPORTER call_if_unset FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_242C3F end diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index da57242597..e1ff2d0880 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -3,7 +3,7 @@ BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1 .byte 0 BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7 - setvar VAR_0x40BC, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 setflag FLAG_HIDE_BATTLE_TOWER_REPORTER end diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 93788a7032..630b04b338 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -21,7 +21,7 @@ JaggedPass_EventScript_230685:: @ 8230685 return JaggedPass_MapScript1_23068B: @ 823068B - compare VAR_0x40BD, 1 + compare VAR_JAGGED_PASS_ASH_WEATHER, 1 call_if_eq JaggedPass_EventScript_230697 end diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 10ff40cb12..1487f999f6 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -16,7 +16,7 @@ LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB call_if_eq LittlerootTown_EventScript_1E7E5C compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 call_if_eq LittlerootTown_EventScript_1E7E5C - compare VAR_0x40C7, 1 + compare VAR_OLDALE_STATE, 1 call_if_eq LittlerootTown_EventScript_1E7E53 compare VAR_LITTLEROOT_RIVAL_STATE, 3 call_if_eq LittlerootTown_EventScript_1E7E4F @@ -39,7 +39,7 @@ LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F return LittlerootTown_EventScript_1E7E53:: @ 81E7E53 - setvar VAR_0x40C7, 2 + setvar VAR_OLDALE_STATE, 2 setflag FLAG_HIDE_OLDALE_TOWN_RIVAL return diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc index 56ad204a93..59bc42a7df 100644 --- a/data/maps/MagmaHideout_1F/scripts.inc +++ b/data/maps/MagmaHideout_1F/scripts.inc @@ -3,7 +3,7 @@ MagmaHideout_1F_MapScripts:: @ 8239880 .byte 0 MagmaHideout_1F_MapScript1_239886: @ 8239886 - setvar VAR_0x40BD, 0 + setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 end MagmaHideout_1F_EventScript_23988C:: @ 823988C diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index 1bca8dac78..1fc5e777b3 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -64,7 +64,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY setvar VAR_SLATEPORT_STATE, 1 setflag FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT - setvar VAR_0x40A0, 1 + setvar VAR_SLATEPORT_HARBOR_STATE, 1 fadescreen 1 removeobject 6 removeobject 2 diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 8d2971c438..5274d40db6 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -421,7 +421,7 @@ MauvilleCity_EventScript_1DF73A:: @ 81DF73A lock faceplayer goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF7B0 - compare VAR_0x40BA, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_EventScript_1DF784 goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_1DF77A msgbox MauvilleCity_Text_1DFFE4, MSGBOX_DEFAULT diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index a095e8ff32..6611248e47 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -79,7 +79,7 @@ MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB compare VAR_RESULT, 1 goto_if_eq MauvilleCity_Gym_EventScript_20DFDE goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_20DF8D - compare VAR_0x40BA, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_20DFD4 msgbox MauvilleCity_Gym_Text_20E8E3, MSGBOX_DEFAULT release diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index 3492e05bc6..586de013f4 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -195,7 +195,7 @@ "x": 14, "y": 18, "elevation": 4, - "var": "VAR_0x40BF", + "var": "VAR_METEOR_FALLS_STATE", "var_value": "0", "script": "MeteorFalls_1F_1R_EventScript_22BD5F" } diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index ea161ba232..07a0911b02 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -86,7 +86,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F setflag FLAG_HIDE_ROUTE_112_TEAM_MAGMA setflag FLAG_MET_ARCHIE_METEOR_FALLS setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT - setvar VAR_0x40BF, 1 + setvar VAR_METEOR_FALLS_STATE, 1 releaseall end diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 0602c9dad1..9ee00e67c4 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -315,7 +315,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 removeobject 4 setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN - setvar VAR_0x40C6, 1 + setvar VAR_STEVENS_HOUSE_STATE, 1 setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT removeobject 3 setobjectxyperm 3, 5, 6 diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 51f1ac16e1..0f6470de84 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -13,7 +13,7 @@ MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E return MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8 - compare VAR_0x40C6, 2 + compare VAR_STEVENS_HOUSE_STATE, 2 call_if_eq MossdeepCity_StevensHouse_EventScript_2227B4 end @@ -23,7 +23,7 @@ MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4 return MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0 - map_script_2 VAR_0x40C6, 1, MossdeepCity_StevensHouse_EventScript_2227CA + map_script_2 VAR_STEVENS_HOUSE_STATE, 1, MossdeepCity_StevensHouse_EventScript_2227CA .2byte 0 MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA @@ -48,7 +48,7 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA waitmovement 0 setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT setflag FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT - setvar VAR_0x40C6, 2 + setvar VAR_STEVENS_HOUSE_STATE, 2 releaseall end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 3bfc33f6ab..65d1bf77d4 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -4,7 +4,7 @@ MtChimney_MapScripts:: @ 822EDC1 .byte 0 MtChimney_MapScript1_22EDCC: @ 822EDCC - setvar VAR_0x40BD, 1 + setvar VAR_JAGGED_PASS_ASH_WEATHER, 1 end MtChimney_MapScript1_22EDD2: @ 822EDD2 diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 6c389e2ad3..850fd44d5b 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -4,7 +4,7 @@ MtChimney_CableCarStation_MapScripts:: @ 822ABFA .byte 0 MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05 - compare VAR_0x40A3, 1 + compare VAR_CABLE_CAR_STATION_STATE, 1 call_if_eq MtChimney_CableCarStation_EventScript_22AC11 end @@ -14,7 +14,7 @@ MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11 return MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D - map_script_2 VAR_0x40A3, 1, MtChimney_CableCarStation_EventScript_22AC27 + map_script_2 VAR_CABLE_CAR_STATION_STATE, 1, MtChimney_CableCarStation_EventScript_22AC27 .2byte 0 MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 @@ -22,7 +22,7 @@ MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACB4 applymovement 1, MtChimney_CableCarStation_Movement_22ACAA waitmovement 0 - setvar VAR_0x40A3, 0 + setvar VAR_CABLE_CAR_STATION_STATE, 0 setobjectxyperm 1, 6, 7 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN releaseall @@ -45,7 +45,7 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACAF waitmovement 0 setvar VAR_0x8004, 1 - setvar VAR_0x40A3, 2 + setvar VAR_CABLE_CAR_STATION_STATE, 2 incrementgamestat 48 special CableCarWarp special CableCar diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index fedde68e80..78780ba195 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -148,7 +148,7 @@ "x": 22, "y": 7, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "0", "script": "MtPyre_Summit_EventScript_232018" }, @@ -157,7 +157,7 @@ "x": 23, "y": 7, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "0", "script": "MtPyre_Summit_EventScript_232024" }, @@ -166,7 +166,7 @@ "x": 24, "y": 7, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "0", "script": "MtPyre_Summit_EventScript_232030" }, @@ -175,7 +175,7 @@ "x": 22, "y": 9, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "2", "script": "MtPyre_Summit_EventScript_2321EC" }, @@ -184,7 +184,7 @@ "x": 23, "y": 9, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "2", "script": "MtPyre_Summit_EventScript_2321F8" }, @@ -193,7 +193,7 @@ "x": 24, "y": 9, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "2", "script": "MtPyre_Summit_EventScript_232204" } diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 6eaf6265f0..8c83b1c56a 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -3,7 +3,7 @@ MtPyre_Summit_MapScripts:: @ 8231FF7 .byte 0 MtPyre_Summit_MapScript1_231FFD: @ 8231FFD - compare VAR_0x40B9, 2 + compare VAR_MT_PYRE_STATE, 2 call_if_eq MtPyre_Summit_EventScript_232009 end @@ -56,7 +56,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C fadedefaultbgm fadescreen 0 delay 20 - setvar VAR_0x40B9, 1 + setvar VAR_MT_PYRE_STATE, 1 compare VAR_0x8008, 0 call_if_eq MtPyre_Summit_EventScript_2320F7 compare VAR_0x8008, 1 @@ -165,7 +165,7 @@ MtPyre_Summit_EventScript_2321A2:: @ 82321A2 lock faceplayer goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_2321E2 - compare VAR_0x40B9, 3 + compare VAR_MT_PYRE_STATE, 3 call_if_ge MtPyre_Summit_EventScript_2321CB goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_2321D8 msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT @@ -242,7 +242,7 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 waitmovement 0 removeobject 2 removeobject 8 - setvar VAR_0x40B9, 3 + setvar VAR_MT_PYRE_STATE, 3 releaseall end diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json index 00467c1d9d..d36763350a 100644 --- a/data/maps/NewMauville_Entrance/map.json +++ b/data/maps/NewMauville_Entrance/map.json @@ -36,7 +36,7 @@ "x": 4, "y": 2, "elevation": 3, - "var": "VAR_0x40BA", + "var": "VAR_NEW_MAUVILLE_STATE", "var_value": "0", "script": "NewMauville_Entrance_EventScript_2372FF" } diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index d841f0374c..cc64f9eea1 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -4,7 +4,7 @@ NewMauville_Entrance_MapScripts:: @ 82372AD .byte 0 NewMauville_Entrance_MapScript1_2372B8: @ 82372B8 - compare VAR_0x40BA, 0 + compare VAR_NEW_MAUVILLE_STATE, 0 call_if_eq NewMauville_Entrance_EventScript_2372C4 end @@ -41,7 +41,7 @@ NewMauville_Entrance_EventScript_2372FF:: @ 82372FF setmetatile 5, 1, 717, 1 special DrawWholeMapView playse SE_BAN - setvar VAR_0x40BA, 1 + setvar VAR_NEW_MAUVILLE_STATE, 1 releaseall end diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index fe79597031..b13d6059d5 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -215,7 +215,7 @@ "x": 33, "y": 6, "elevation": 3, - "var": "VAR_0x40BA", + "var": "VAR_NEW_MAUVILLE_STATE", "var_value": "1", "script": "NewMauville_Inside_EventScript_237725" } diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index b3d9d868f9..1736617e96 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -40,7 +40,7 @@ NewMauville_Inside_EventScript_237449:: @ 8237449 return NewMauville_Inside_MapScript1_23744D: @ 823744D - compare VAR_0x40BA, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 call_if_eq NewMauville_Inside_EventScript_23773A end @@ -148,7 +148,7 @@ NewMauville_Inside_EventScript_237725:: @ 8237725 lockall msgbox NewMauville_Inside_Text_237932, MSGBOX_DEFAULT call NewMauville_Inside_EventScript_23773A - setvar VAR_0x40BA, 2 + setvar VAR_NEW_MAUVILLE_STATE, 2 releaseall end @@ -167,7 +167,7 @@ NewMauville_Inside_EventScript_23773A:: @ 823773A NewMauville_Inside_EventScript_23778F:: @ 823778F lockall - compare VAR_0x40BA, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq NewMauville_Inside_EventScript_2377A5 msgbox NewMauville_Inside_Text_237896, MSGBOX_DEFAULT releaseall diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 279960febb..98dcc9cf31 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -128,7 +128,7 @@ "x": 8, "y": 19, "elevation": 3, - "var": "VAR_0x40C7", + "var": "VAR_OLDALE_STATE", "var_value": "1", "script": "OldaleTown_EventScript_1E9086" }, @@ -137,7 +137,7 @@ "x": 9, "y": 19, "elevation": 3, - "var": "VAR_0x40C7", + "var": "VAR_OLDALE_STATE", "var_value": "1", "script": "OldaleTown_EventScript_1E90A6" }, @@ -146,7 +146,7 @@ "x": 10, "y": 19, "elevation": 3, - "var": "VAR_0x40C7", + "var": "VAR_OLDALE_STATE", "var_value": "1", "script": "OldaleTown_EventScript_1E90C6" } diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 2c4cd2bd18..c112899131 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -280,7 +280,7 @@ OldaleTown_EventScript_1E911A:: @ 81E911A applymovement 4, OldaleTown_Movement_1E9177 waitmovement 0 removeobject 4 - setvar VAR_0x40C7, 2 + setvar VAR_OLDALE_STATE, 2 setflag FLAG_HIDE_OLDALE_TOWN_RIVAL releaseall end diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 208f1cb5a1..94644f69b3 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -143,7 +143,7 @@ Route103_EventScript_1EC5A2:: @ 81EC5A2 setvar VAR_BIRCH_LAB_STATE, 4 clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL setflag FLAG_DEFEATED_RIVAL_ROUTE103 - setvar VAR_0x40C7, 1 + setvar VAR_OLDALE_STATE, 1 clearflag FLAG_HIDE_OLDALE_TOWN_RIVAL savebgm MUS_DUMMY fadedefaultbgm diff --git a/data/maps/Route110_TrickHouseCorridor/scripts.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc index cf520c81f7..fee9476fa3 100644 --- a/data/maps/Route110_TrickHouseCorridor/scripts.inc +++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc @@ -3,6 +3,6 @@ Route110_TrickHouseCorridor_MapScripts:: @ 826B903 .byte 0 Route110_TrickHouseCorridor_MapScript1_26B909: @ 826B909 - setvar VAR_0x40B5, 1 + setvar VAR_TRICK_HOUSE_STATE, 1 end diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 8326a7c02e..71766659ad 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -59,7 +59,7 @@ Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17 Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84 msgbox Route110_TrickHouseEnd_Text_26B0BC, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_RARE_CANDY compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -72,7 +72,7 @@ Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84 Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0 msgbox Route110_TrickHouseEnd_Text_26B13B, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TIMER_BALL compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -85,7 +85,7 @@ Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0 Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC msgbox Route110_TrickHouseEnd_Text_26B1AD, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_HARD_STONE compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -98,7 +98,7 @@ Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38 msgbox Route110_TrickHouseEnd_Text_26B223, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_SMOKE_BALL compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -111,7 +111,7 @@ Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38 Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74 msgbox Route110_TrickHouseEnd_Text_26B293, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TM12 compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -124,7 +124,7 @@ Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74 Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0 msgbox Route110_TrickHouseEnd_Text_26B315, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_MAGNET compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -137,7 +137,7 @@ Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0 Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC msgbox Route110_TrickHouseEnd_Text_26B365, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_PP_MAX compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -165,7 +165,7 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 waitmovement 0 delay 30 msgbox Route110_TrickHouseEnd_Text_26B485, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 call Route110_TrickHouseEnd_EventScript_26AFA5 compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26B002 @@ -202,13 +202,13 @@ Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF call Route110_TrickHouseEnd_EventScript_27205E msgbox Route110_TrickHouseEnd_Text_26B760, MSGBOX_DEFAULT - setvar VAR_0x40C1, 1 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002 call Route110_TrickHouseEnd_EventScript_272071 msgbox Route110_TrickHouseEnd_Text_26B615, MSGBOX_DEFAULT - setvar VAR_0x40C1, 1 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015 diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index 59280848e1..ce188feecf 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -57,7 +57,7 @@ "x": 4, "y": 7, "elevation": 3, - "var": "VAR_0x40A5", + "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1", "var_value": "0", "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" }, @@ -66,7 +66,7 @@ "x": 5, "y": 6, "elevation": 3, - "var": "VAR_0x40A5", + "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1", "var_value": "0", "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" }, @@ -75,7 +75,7 @@ "x": 6, "y": 6, "elevation": 3, - "var": "VAR_0x40A5", + "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1", "var_value": "0", "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" }, @@ -84,7 +84,7 @@ "x": 7, "y": 7, "elevation": 3, - "var": "VAR_0x40A5", + "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1", "var_value": "0", "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" } diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index b2aa22f6c1..898d8d3742 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -6,19 +6,19 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8269A50 Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 setflag FLAG_LANDMARK_TRICK_HOUSE - compare VAR_0x40B5, 1 + compare VAR_TRICK_HOUSE_STATE, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_269AF3 - compare VAR_0x40C1, 1 + compare VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_269AD7 - compare VAR_0x40A6, 1 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_269BB3 - compare VAR_0x40A7, 5 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 - compare VAR_0x40A7, 3 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 - compare VAR_0x40A7, 0 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 - switch VAR_0x40A7 + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_269BBB case 1, Route110_TrickHouseEntrance_EventScript_269BC1 case 3, Route110_TrickHouseEntrance_EventScript_269BC7 @@ -26,24 +26,24 @@ Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 end Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7 - setvar VAR_0x40A5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 compare VAR_0x4044, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_269AED - setvar VAR_0x40A7, 2 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2 end Route110_TrickHouseEntrance_EventScript_269AED:: @ 8269AED - setvar VAR_0x40A7, 6 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6 end Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3 - setvar VAR_0x40B5, 0 - setvar VAR_0x40A7, 5 - setvar VAR_0x40A5, 1 + setvar VAR_TRICK_HOUSE_STATE, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 end Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03 - setvar VAR_0x40A7, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 compare VAR_0x4044, 1 call_if_eq Route110_TrickHouseEntrance_EventScript_269B61 compare VAR_0x4044, 2 @@ -91,11 +91,11 @@ Route110_TrickHouseEntrance_EventScript_269B9D:: @ 8269B9D return Route110_TrickHouseEntrance_EventScript_269BA7:: @ 8269BA7 - setvar VAR_0x40A7, 4 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4 return Route110_TrickHouseEntrance_EventScript_269BAD:: @ 8269BAD - setvar VAR_0x40A7, 3 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 return Route110_TrickHouseEntrance_EventScript_269BB3:: @ 8269BB3 @@ -103,30 +103,30 @@ Route110_TrickHouseEntrance_EventScript_269BB3:: @ 8269BB3 end Route110_TrickHouseEntrance_EventScript_269BBB:: @ 8269BBB - setvar VAR_0x40A5, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 0 end Route110_TrickHouseEntrance_EventScript_269BC1:: @ 8269BC1 - setvar VAR_0x40A5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 end Route110_TrickHouseEntrance_EventScript_269BC7:: @ 8269BC7 - setvar VAR_0x40A5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 end Route110_TrickHouseEntrance_EventScript_269BCD:: @ 8269BCD - setvar VAR_0x40A5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 end Route110_TrickHouseEntrance_MapScript2_269BD3: @ 8269BD3 - map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269C15 - map_script_2 VAR_0x40A7, 0, Route110_TrickHouseEntrance_EventScript_269C26 - map_script_2 VAR_0x40A7, 1, Route110_TrickHouseEntrance_EventScript_269CCC - map_script_2 VAR_0x40A7, 2, Route110_TrickHouseEntrance_EventScript_269CD0 - map_script_2 VAR_0x40A7, 3, Route110_TrickHouseEntrance_EventScript_269CD0 - map_script_2 VAR_0x40A7, 4, Route110_TrickHouseEntrance_EventScript_269CCC - map_script_2 VAR_0x40A7, 5, Route110_TrickHouseEntrance_EventScript_269CCC - map_script_2 VAR_0x40A7, 6, Route110_TrickHouseEntrance_EventScript_269CDF + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_269C15 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0, Route110_TrickHouseEntrance_EventScript_269C26 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1, Route110_TrickHouseEntrance_EventScript_269CCC + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2, Route110_TrickHouseEntrance_EventScript_269CD0 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3, Route110_TrickHouseEntrance_EventScript_269CD0 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4, Route110_TrickHouseEntrance_EventScript_269CCC + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5, Route110_TrickHouseEntrance_EventScript_269CCC + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6, Route110_TrickHouseEntrance_EventScript_269CDF .2byte 0 Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15 @@ -199,7 +199,7 @@ Route110_TrickHouseEntrance_EventScript_269CDF:: @ 8269CDF end Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE - map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269CF8 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_269CF8 .2byte 0 Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8 @@ -216,8 +216,8 @@ Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8 applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F waitmovement 0 removeobject 1 - setvar VAR_0x40A7, 1 - setvar VAR_0x40A6, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 0 releaseall end @@ -227,7 +227,7 @@ Route110_TrickHouseEntrance_EventScript_269D39:: @ 8269D39 Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B lockall - switch VAR_0x40A7 + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_269D6E case 2, Route110_TrickHouseEntrance_EventScript_269E8F case 3, Route110_TrickHouseEntrance_EventScript_269E51 @@ -257,7 +257,7 @@ Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E compare VAR_0x4044, 7 call_if_eq Route110_TrickHouseEntrance_EventScript_269E2D closemessage - setvar VAR_0x40A6, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 waitstate releaseall @@ -430,8 +430,8 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 end Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023 - setvar VAR_0x40C1, 0 - setvar VAR_0x40A7, 3 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6 waitmovement 0 releaseall @@ -475,14 +475,14 @@ Route110_TrickHouseEntrance_EventScript_26A09A:: @ 826A09A applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F waitmovement 0 removeobject 1 - setvar VAR_0x40C1, 0 - setvar VAR_0x40A7, 5 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 releaseall end Route110_TrickHouseEntrance_EventScript_26A0D3:: @ 826A0D3 lockall - switch VAR_0x40A7 + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_26A106 case 1, Route110_TrickHouseEntrance_EventScript_26A110 case 4, Route110_TrickHouseEntrance_EventScript_26A201 @@ -604,88 +604,88 @@ Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A end Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 - compare VAR_0x40AB, 0 + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle1_Text_26B98D, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40AB, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 - compare VAR_0x40AC, 0 + compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle2_Text_26BCBA, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40AC, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB - compare VAR_0x40AD, 0 + compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle3_Text_26C609, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40AD, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 - compare VAR_0x40AE, 0 + compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle4_Text_26C8C3, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40AE, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D - compare VAR_0x40AF, 0 + compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle5_Text_26D660, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40AF, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 - compare VAR_0x40B0, 0 + compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle6_Text_26DE26, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40B0, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F - compare VAR_0x40B1, 0 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle7_EventScript_26E413, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40B1, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8 - compare VAR_0x40B2, 0 + compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle8_EventScript_26E864, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40B2, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall @@ -733,7 +733,7 @@ Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8 call_if_eq Route110_TrickHouseEntrance_EventScript_26A439 compare VAR_0x4044, 2 call_if_eq Route110_TrickHouseEntrance_EventScript_26A449 - setvar VAR_0x40A5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 end Route110_TrickHouseEntrance_EventScript_26A429:: @ 826A429 diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index b34a9d5552..163f89e17f 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 826B90F .byte 0 Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915 - compare VAR_0x40AB, 2 + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2 goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B921 end @@ -13,13 +13,13 @@ Route110_TrickHousePuzzle1_EventScript_26B921:: @ 826B921 Route110_TrickHousePuzzle1_EventScript_26B92B:: @ 826B92B lockall - compare VAR_0x40AB, 0 + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0 goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B93D goto Route110_TrickHousePuzzle1_EventScript_26A3DB end Route110_TrickHousePuzzle1_EventScript_26B93D:: @ 826B93D - setvar VAR_0x40AB, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 1 goto Route110_TrickHousePuzzle1_EventScript_26A3E5 end diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index 560d100601..8e13c9c8a3 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -23,13 +23,13 @@ Route110_TrickHousePuzzle2_MapScript1_26BBAB: @ 826BBAB Route110_TrickHousePuzzle2_EventScript_26BBC0:: @ 826BBC0 lockall - compare VAR_0x40AC, 0 + compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0 goto_if_eq Route110_TrickHousePuzzle2_EventScript_26BBD2 goto Route110_TrickHousePuzzle2_EventScript_26A3DB end Route110_TrickHousePuzzle2_EventScript_26BBD2:: @ 826BBD2 - setvar VAR_0x40AC, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 1 goto Route110_TrickHousePuzzle2_EventScript_26A3E5 end diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index b26c5473d3..40aea279f8 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -291,13 +291,13 @@ Route110_TrickHousePuzzle3_EventScript_26C5A0:: @ 826C5A0 Route110_TrickHousePuzzle3_EventScript_26C5A7:: @ 826C5A7 lockall - compare VAR_0x40AD, 0 + compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C5B9 goto Route110_TrickHousePuzzle3_EventScript_26A3DB end Route110_TrickHousePuzzle3_EventScript_26C5B9:: @ 826C5B9 - setvar VAR_0x40AD, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 1 goto Route110_TrickHousePuzzle3_EventScript_26A3E5 end diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc index 71bb32db8a..fcb10b3abc 100644 --- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -3,13 +3,13 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 826C860 Route110_TrickHousePuzzle4_EventScript_26C861:: @ 826C861 lockall - compare VAR_0x40AE, 0 + compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0 goto_if_eq Route110_TrickHousePuzzle4_EventScript_26C873 goto Route110_TrickHousePuzzle4_EventScript_26A3DB end Route110_TrickHousePuzzle4_EventScript_26C873:: @ 826C873 - setvar VAR_0x40AE, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 1 goto Route110_TrickHousePuzzle4_EventScript_26A3E5 end diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 4c199a9933..acdf1279d7 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -13,13 +13,13 @@ Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6 Route110_TrickHousePuzzle5_EventScript_26CB15:: @ 826CB15 lockall - compare VAR_0x40AF, 0 + compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26CB27 goto Route110_TrickHousePuzzle5_EventScript_26A3DB end Route110_TrickHousePuzzle5_EventScript_26CB27:: @ 826CB27 - setvar VAR_0x40AF, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 1 goto Route110_TrickHousePuzzle5_EventScript_26A3E5 end diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 2cb784b505..7e675b1e61 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -17,13 +17,13 @@ Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0 Route110_TrickHousePuzzle6_EventScript_26DDC4:: @ 826DDC4 lockall - compare VAR_0x40B0, 0 + compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0 goto_if_eq Route110_TrickHousePuzzle6_EventScript_26DDD6 goto Route110_TrickHousePuzzle6_EventScript_26A3DB end Route110_TrickHousePuzzle6_EventScript_26DDD6:: @ 826DDD6 - setvar VAR_0x40B0, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 1 goto Route110_TrickHousePuzzle6_EventScript_26A3E5 end diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 3babdbd453..293621def7 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -68,7 +68,7 @@ Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185 return Route110_TrickHousePuzzle7_MapScript1_26E198: @ 826E198 - compare VAR_0x40B6, 1 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1B3 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 @@ -81,33 +81,33 @@ Route110_TrickHousePuzzle7_EventScript_26E1B3:: @ 826E1B3 end Route110_TrickHousePuzzle7_MapScript1_26E1B4: @ 826E1B4 - compare VAR_0x40B6, 1 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 call_if_eq Route110_TrickHousePuzzle7_EventScript_26E0AC end Route110_TrickHousePuzzle7_MapScript2_26E1C0: @ 826E1C0 - map_script_2 VAR_0x40B6, 1, Route110_TrickHousePuzzle7_EventScript_26E1CA + map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_26E1CA .2byte 0 Route110_TrickHousePuzzle7_EventScript_26E1CA:: @ 826E1CA - setvar VAR_0x40B6, 0 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 0 end Route110_TrickHousePuzzle7_EventScript_26E1D0:: @ 826E1D0 lockall - compare VAR_0x40B1, 0 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0 goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1E2 goto Route110_TrickHousePuzzle7_EventScript_26A3DB end Route110_TrickHousePuzzle7_EventScript_26E1E2:: @ 826E1E2 - setvar VAR_0x40B1, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 1 goto Route110_TrickHousePuzzle7_EventScript_26A3E5 end Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED lockall - setvar VAR_0x40B6, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19 waitstate releaseall diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc index 7efb9f67bb..dcb12e3663 100644 --- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -3,13 +3,13 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 826E801 Route110_TrickHousePuzzle8_EventScript_26E802:: @ 826E802 lockall - compare VAR_0x40B2, 0 + compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0 goto_if_eq Route110_TrickHousePuzzle8_EventScript_26E814 goto Route110_TrickHousePuzzle8_EventScript_26A3DB end Route110_TrickHousePuzzle8_EventScript_26E814:: @ 826E814 - setvar VAR_0x40B2, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 1 goto Route110_TrickHousePuzzle8_EventScript_26A3E5 end diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 995102fe73..787f680fb3 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -4,7 +4,7 @@ Route112_MapScripts:: @ 81F1DA8 Route112_MapScript1_1F1DAE: @ 81F1DAE clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE - setvar VAR_0x40BD, 0 + setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 end Route112_EventScript_1F1DB7:: @ 81F1DB7 diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index a430a497e5..7a8fc9e8c4 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -5,7 +5,7 @@ Route112_CableCarStation_MapScripts:: @ 822AABE Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 setescapewarp MAP_ROUTE112, 255, 28, 28 - compare VAR_0x40A3, 2 + compare VAR_CABLE_CAR_STATION_STATE, 2 call_if_eq Route112_CableCarStation_EventScript_22AADD end @@ -15,7 +15,7 @@ Route112_CableCarStation_EventScript_22AADD:: @ 822AADD return Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9 - map_script_2 VAR_0x40A3, 2, Route112_CableCarStation_EventScript_22AAF3 + map_script_2 VAR_CABLE_CAR_STATION_STATE, 2, Route112_CableCarStation_EventScript_22AAF3 .2byte 0 Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 @@ -23,7 +23,7 @@ Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB80 applymovement 1, Route112_CableCarStation_Movement_22AB76 waitmovement 0 - setvar VAR_0x40A3, 0 + setvar VAR_CABLE_CAR_STATION_STATE, 0 setobjectxyperm 1, 6, 7 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN releaseall @@ -46,7 +46,7 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB7B waitmovement 0 setvar VAR_0x8004, 0 - setvar VAR_0x40A3, 1 + setvar VAR_CABLE_CAR_STATION_STATE, 1 incrementgamestat 48 special CableCarWarp special CableCar diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index 959c277995..a42f92fc7d 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -4,26 +4,26 @@ Route113_GlassWorkshop_MapScripts:: @ 826ED03 Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09 setflag FLAG_LANDMARK_GLASS_WORKSHOP - compare VAR_0x40BE, 1 + compare VAR_GLASS_WORKSHOP_STATE, 1 call_if_eq Route113_GlassWorkshop_EventScript_26ED18 end Route113_GlassWorkshop_EventScript_26ED18:: @ 826ED18 - setvar VAR_0x40BE, 2 + setvar VAR_GLASS_WORKSHOP_STATE, 2 return Route113_GlassWorkshop_EventScript_26ED1E:: @ 826ED1E lock faceplayer - compare VAR_0x40BE, 10 + compare VAR_GLASS_WORKSHOP_STATE, 10 goto_if_ge Route113_GlassWorkshop_EventScript_26F090 - compare VAR_0x40BE, 2 + compare VAR_GLASS_WORKSHOP_STATE, 2 goto_if_eq Route113_GlassWorkshop_EventScript_26ED6E - compare VAR_0x40BE, 1 + compare VAR_GLASS_WORKSHOP_STATE, 1 goto_if_eq Route113_GlassWorkshop_EventScript_26ED64 msgbox Route113_GlassWorkshop_Text_26F19D, MSGBOX_DEFAULT giveitem_std ITEM_SOOT_SACK - setvar VAR_0x40BE, 1 + setvar VAR_GLASS_WORKSHOP_STATE, 1 msgbox Route113_GlassWorkshop_Text_26F252, MSGBOX_DEFAULT release end @@ -76,7 +76,7 @@ Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 10 + setvar VAR_GLASS_WORKSHOP_STATE, 10 subvar VAR_ASH_GATHER_COUNT, 250 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -90,7 +90,7 @@ Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 11 + setvar VAR_GLASS_WORKSHOP_STATE, 11 subvar VAR_ASH_GATHER_COUNT, 500 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -104,7 +104,7 @@ Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96 msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 12 + setvar VAR_GLASS_WORKSHOP_STATE, 12 subvar VAR_ASH_GATHER_COUNT, 500 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -118,7 +118,7 @@ Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2 msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 13 + setvar VAR_GLASS_WORKSHOP_STATE, 13 subvar VAR_ASH_GATHER_COUNT, 1000 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -132,7 +132,7 @@ Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 14 + setvar VAR_GLASS_WORKSHOP_STATE, 14 subvar VAR_ASH_GATHER_COUNT, 1000 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -147,7 +147,7 @@ Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 15 + setvar VAR_GLASS_WORKSHOP_STATE, 15 subvar VAR_ASH_GATHER_COUNT, 6000 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -162,7 +162,7 @@ Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 16 + setvar VAR_GLASS_WORKSHOP_STATE, 16 subvar VAR_ASH_GATHER_COUNT, 8000 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -206,7 +206,7 @@ Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F call_if_eq Route113_GlassWorkshop_EventScript_26F047 compare VAR_0x8009, 1 call_if_eq Route113_GlassWorkshop_EventScript_26F05F - setvar VAR_0x40BE, 2 + setvar VAR_GLASS_WORKSHOP_STATE, 2 release end @@ -235,7 +235,7 @@ Route113_GlassWorkshop_EventScript_26F081:: @ 826F081 end Route113_GlassWorkshop_EventScript_26F090:: @ 826F090 - switch VAR_0x40BE + switch VAR_GLASS_WORKSHOP_STATE case 10, Route113_GlassWorkshop_EventScript_26F0E3 case 11, Route113_GlassWorkshop_EventScript_26F0F7 case 12, Route113_GlassWorkshop_EventScript_26F10B @@ -300,7 +300,7 @@ Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F call_if_eq Route113_GlassWorkshop_EventScript_26F047 compare VAR_0x8009, 1 call_if_eq Route113_GlassWorkshop_EventScript_26F05F - setvar VAR_0x40BE, 2 + setvar VAR_GLASS_WORKSHOP_STATE, 2 release end diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index d4ef73f9b1..d5afabfff2 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -3,14 +3,14 @@ Route121_SafariZoneEntrance_MapScripts:: @ 822BBBB .byte 0 Route121_SafariZoneEntrance_MapScript2_22BBC1: @ 822BBC1 - map_script_2 VAR_0x40A4, 1, Route121_SafariZoneEntrance_EventScript_22BBCB + map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_22BBCB .2byte 0 Route121_SafariZoneEntrance_EventScript_22BBCB:: @ 822BBCB lockall applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BBDD waitmovement 0 - setvar VAR_0x40A4, 0 + setvar VAR_SAFARI_ZONE_STATE, 0 releaseall end @@ -81,7 +81,7 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BD18 waitmovement 0 special EnterSafariMode - setvar VAR_0x40A4, 2 + setvar VAR_SAFARI_ZONE_STATE, 2 clearflag FLAG_GOOD_LUCK_SAFARI_ZONE warp MAP_SAFARI_ZONE_SOUTH, 255, 32, 33 waitstate diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index cd088382d0..d5f50c25f5 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -3,18 +3,18 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857 .byte 0 RustboroCity_DevonCorp_2F_MapScript1_21185D: @ 821185D - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 end RustboroCity_DevonCorp_2F_EventScript_211869:: @ 8211869 - setvar VAR_0x40C4, 2 + setvar VAR_FOSSIL_RESURRECTION_STATE, 2 return RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F lock faceplayer - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 msgbox RustboroCity_DevonCorp_2F_Text_211BFB, MSGBOX_DEFAULT release @@ -23,7 +23,7 @@ RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886 lock faceplayer - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_2118A6 msgbox RustboroCity_DevonCorp_2F_Text_211C50, MSGBOX_DEFAULT @@ -38,7 +38,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118A6:: @ 82118A6 RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0 lock faceplayer - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_2118D0 msgbox RustboroCity_DevonCorp_2F_Text_211D9F, MSGBOX_DEFAULT @@ -53,7 +53,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118D0:: @ 82118D0 RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA lock faceplayer - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 msgbox RustboroCity_DevonCorp_2F_Text_211EE0, MSGBOX_DEFAULT release @@ -62,9 +62,9 @@ RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1 lock faceplayer - compare VAR_0x40C4, 2 + compare VAR_FOSSIL_RESURRECTION_STATE, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A03 - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119F9 msgbox RustboroCity_DevonCorp_2F_Text_211F48, MSGBOX_DEFAULT checkitem ITEM_ROOT_FOSSIL, 1 @@ -96,8 +96,8 @@ RustboroCity_DevonCorp_2F_EventScript_211974:: @ 8211974 bufferitemname 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT takeitem ITEM_ROOT_FOSSIL, 1 - setvar VAR_0x40C4, 1 - setvar VAR_0x40C5, 1 + setvar VAR_FOSSIL_RESURRECTION_STATE, 1 + setvar VAR_WHICH_FOSSIL_REVIVED, 1 release end @@ -121,8 +121,8 @@ RustboroCity_DevonCorp_2F_EventScript_2119D2:: @ 82119D2 bufferitemname 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT takeitem ITEM_CLAW_FOSSIL, 1 - setvar VAR_0x40C4, 1 - setvar VAR_0x40C5, 2 + setvar VAR_FOSSIL_RESURRECTION_STATE, 1 + setvar VAR_WHICH_FOSSIL_REVIVED, 2 release end @@ -137,9 +137,9 @@ RustboroCity_DevonCorp_2F_EventScript_2119F9:: @ 82119F9 end RustboroCity_DevonCorp_2F_EventScript_211A03:: @ 8211A03 - compare VAR_0x40C5, 1 + compare VAR_WHICH_FOSSIL_REVIVED, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A1A - compare VAR_0x40C5, 2 + compare VAR_WHICH_FOSSIL_REVIVED, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A2C end @@ -199,7 +199,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AC4:: @ 8211AC4 return RustboroCity_DevonCorp_2F_EventScript_211AD7:: @ 8211AD7 - setvar VAR_0x40C4, 0 + setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON release end @@ -248,7 +248,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B67:: @ 8211B67 return RustboroCity_DevonCorp_2F_EventScript_211B7A:: @ 8211B7A - setvar VAR_0x40C4, 0 + setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON release end @@ -279,7 +279,7 @@ RustboroCity_DevonCorp_2F_EventScript_211BCD:: @ 8211BCD RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF lock faceplayer - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 compare VAR_RUSTBORO_STATE, 6 goto_if_ge RustboroCity_DevonCorp_2F_EventScript_211BF1 diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index ab6f70f865..f43c4cb220 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -4,7 +4,7 @@ SafariZone_South_MapScripts:: @ 823D279 .byte 0 SafariZone_South_MapScript2_23D284: @ 823D284 - map_script_2 VAR_0x40A4, 2, SafariZone_South_EventScript_23D28E + map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_South_EventScript_23D28E .2byte 0 SafariZone_South_EventScript_23D28E:: @ 823D28E @@ -14,12 +14,12 @@ SafariZone_South_EventScript_23D28E:: @ 823D28E applymovement 1, SafariZone_South_Movement_23D2C7 waitmovement 0 setobjectxyperm 1, 32, 34 - setvar VAR_0x40A4, 0 + setvar VAR_SAFARI_ZONE_STATE, 0 releaseall end SafariZone_South_MapScript1_23D2B1: @ 823D2B1 - compare VAR_0x40A4, 2 + compare VAR_SAFARI_ZONE_STATE, 2 call_if_eq SafariZone_South_EventScript_23D2BD end @@ -90,7 +90,7 @@ SafariZone_South_EventScript_23D359:: @ 823D359 end SafariZone_South_EventScript_23D373:: @ 823D373 - setvar VAR_0x40A4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index fe02ad28b6..f4f7fd3362 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -121,7 +121,7 @@ "x": 17, "y": 42, "elevation": 3, - "var": "VAR_0x40A2", + "var": "VAR_SEAFLOOR_CAVERN_STATE", "var_value": "0", "script": "SeafloorCavern_Room9_EventScript_234DC9" } diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 151550dec0..cc13e7dc6a 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -133,8 +133,8 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setflag FLAG_SYS_WEATHER_CTRL setflag FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN - setvar VAR_0x40C6, 2 - setvar VAR_0x40A2, 1 + setvar VAR_STEVENS_HOUSE_STATE, 2 + setvar VAR_SEAFLOOR_CAVERN_STATE, 1 setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 05e4bc0307..a19696ecf8 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -4,7 +4,7 @@ SlateportCity_MapScripts:: @ 81DCC61 .byte 0 SlateportCity_MapScript1_1DCC6C: @ 81DCC6C - setvar VAR_0x40AA, 0 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0 call SlateportCity_EventScript_1DCC8D compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCC99 diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index 4c9b45683e..c61c5a5e66 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -155,7 +155,7 @@ "x": 8, "y": 11, "elevation": 3, - "var": "VAR_0x40A0", + "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", "script": "SlateportCity_Harbor_EventScript_20C9BB" }, @@ -164,7 +164,7 @@ "x": 8, "y": 12, "elevation": 3, - "var": "VAR_0x40A0", + "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", "script": "SlateportCity_Harbor_EventScript_20C9C7" }, @@ -173,7 +173,7 @@ "x": 8, "y": 13, "elevation": 3, - "var": "VAR_0x40A0", + "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", "script": "SlateportCity_Harbor_EventScript_20C9D3" }, @@ -182,7 +182,7 @@ "x": 8, "y": 14, "elevation": 3, - "var": "VAR_0x40A0", + "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", "script": "SlateportCity_Harbor_EventScript_20C9DF" } diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 24e139edfd..33f07f15b2 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -5,7 +5,7 @@ SlateportCity_Harbor_MapScripts:: @ 820C97D SlateportCity_Harbor_MapScript1_20C983: @ 820C983 setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar VAR_TEMP_1, 0 - compare VAR_0x40A0, 1 + compare VAR_SLATEPORT_HARBOR_STATE, 1 call_if_eq SlateportCity_Harbor_EventScript_20C9A9 call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20C9A5 end @@ -62,7 +62,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 removeobject 6 removeobject 7 removeobject 8 - setvar VAR_0x40A0, 2 + setvar VAR_SLATEPORT_HARBOR_STATE, 2 setflag FLAG_MET_TEAM_AQUA_HARBOR setflag FLAG_HIDE_LILCOVE_MOTEL_SCOTT compare VAR_0x8008, 0 @@ -296,7 +296,7 @@ SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_20CD00 goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_20CCF6 goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_20CCE9 - compare VAR_0x40A0, 2 + compare VAR_SLATEPORT_HARBOR_STATE, 2 goto_if_eq SlateportCity_Harbor_EventScript_20CCDF msgbox SlateportCity_Harbor_Text_20D232, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index 517647bd10..eefb843f41 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -226,7 +226,7 @@ "x": 9, "y": 7, "elevation": 3, - "var": "VAR_0x40AA", + "var": "VAR_SLATEPORT_MUSEUM_1F_STATE", "var_value": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD9F" }, @@ -235,7 +235,7 @@ "x": 10, "y": 7, "elevation": 3, - "var": "VAR_0x40AA", + "var": "VAR_SLATEPORT_MUSEUM_1F_STATE", "var_value": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20ADB0" } diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index b574ce4489..a886905c03 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -42,7 +42,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 updatemoneybox 0, 0 nop msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_DEFAULT - setvar VAR_0x40AA, 1 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox nop nop @@ -63,7 +63,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18 SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39 msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, MSGBOX_DEFAULT - setvar VAR_0x40AA, 1 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox nop nop diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 3faf350fc4..be411211a3 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -6,7 +6,7 @@ SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96 faceplayer goto_if_unset FLAG_ENTERED_LINK_CONTEST, SlateportCity_PokemonFanClub_EventScript_20A152 call_if_unset FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_20A172 - switch VAR_0x40B7 + switch VAR_SLATEPORT_FAN_CLUB_STATE case 0, SlateportCity_PokemonFanClub_EventScript_209ED2 case 1, SlateportCity_PokemonFanClub_EventScript_209EE5 case 2, SlateportCity_PokemonFanClub_EventScript_209F3B @@ -14,7 +14,7 @@ SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96 end SlateportCity_PokemonFanClub_EventScript_209ED2:: @ 8209ED2 - setvar VAR_0x40B7, 1 + setvar VAR_SLATEPORT_FAN_CLUB_STATE, 1 msgbox SlateportCity_PokemonFanClub_Text_20A445, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_209F45 end @@ -28,7 +28,7 @@ SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5 call_if_set FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0 compare VAR_TEMP_2, 5 call_if_eq SlateportCity_PokemonFanClub_EventScript_209FCA - compare VAR_0x40B7, 2 + compare VAR_SLATEPORT_FAN_CLUB_STATE, 2 goto_if_eq SlateportCity_PokemonFanClub_EventScript_209F3B msgbox SlateportCity_PokemonFanClub_Text_20A62A, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_209F45 @@ -59,7 +59,7 @@ SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45 end SlateportCity_PokemonFanClub_EventScript_209FCA:: @ 8209FCA - setvar VAR_0x40B7, 2 + setvar VAR_SLATEPORT_FAN_CLUB_STATE, 2 return SlateportCity_PokemonFanClub_EventScript_209FD0:: @ 8209FD0 diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 1cd4611e9e..dd85149128 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -1435,7 +1435,7 @@ SootopolisCity_EventScript_1E654C:: @ 81E654C setflag FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE clearflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE clearflag FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE - setvar VAR_0x40B9, 2 + setvar VAR_MT_PYRE_STATE, 2 warpsilent MAP_SOOTOPOLIS_CITY, 255, 31, 34 waitstate releaseall diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 5db2042935..36e4ac18d3 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -8,7 +8,7 @@ SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E special CallFrontierUtilFunc compare VAR_RESULT, 0 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D - compare VAR_0x40C0, 0 + compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 0 call_if_ne SootopolisCity_MysteryEventsHouse_1F_EventScript_227991 end @@ -25,9 +25,9 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991 return SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D - map_script_2 VAR_0x40C0, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 - map_script_2 VAR_0x40C0, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 - map_script_2 VAR_0x40C0, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 + map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 + map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 + map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 .2byte 0 SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 @@ -39,14 +39,14 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 moveobjectoffscreen 1 applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6 waitmovement 0 - compare VAR_0x40C0, 1 + compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04 - compare VAR_0x40C0, 2 + compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D - compare VAR_0x40C0, 3 + compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16 special LoadPlayerParty - setvar VAR_0x40C0, 0 + setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 0 releaseall end diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index 0de8651d7f..69c5412b8b 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -40,19 +40,19 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 end SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF:: @ 8227ECF - setvar VAR_0x40C0, 3 + setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3 msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_227D40, MSGBOX_DEFAULT return SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD:: @ 8227EDD - setvar VAR_0x40C0, 1 + setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1 special ShowFieldMessageStringVar4 waitmessage waitbuttonpress return SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8 - setvar VAR_0x40C0, 2 + setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2 special ShowFieldMessageStringVar4 waitmessage waitbuttonpress diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 65636a49e1..05eb2b7959 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -175,7 +175,7 @@ "x": 2, "y": 23, "elevation": 4, - "var": "VAR_0x40C3", + "var": "VAR_VICTORY_ROAD_1F_STATE", "var_value": "0", "script": "VictoryRoad_1F_EventScript_235DAF" }, @@ -184,7 +184,7 @@ "x": 3, "y": 23, "elevation": 4, - "var": "VAR_0x40C3", + "var": "VAR_VICTORY_ROAD_1F_STATE", "var_value": "0", "script": "VictoryRoad_1F_EventScript_235DC8" } diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 2d1c630273..20002c6c9e 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -3,9 +3,9 @@ VictoryRoad_1F_MapScripts:: @ 8235D7A .byte 0 VictoryRoad_1F_MapScript1_235D80: @ 8235D80 - compare VAR_0x40C3, 1 + compare VAR_VICTORY_ROAD_1F_STATE, 1 call_if_eq VictoryRoad_1F_EventScript_235D97 - compare VAR_0x40C3, 2 + compare VAR_VICTORY_ROAD_1F_STATE, 2 call_if_eq VictoryRoad_1F_EventScript_235DA3 end @@ -46,7 +46,7 @@ VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY moveobjectoffscreen 4 setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD - copyvar VAR_0x40C3, VAR_0x8008 + copyvar VAR_VICTORY_ROAD_1F_STATE, VAR_0x8008 releaseall end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 1fcf5d1662..3539e09706 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,11 +1,11 @@ EventScript_2A4B4C:: @ 82A4B4C - setvar VAR_0x40A4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 end EventScript_2A4B5D:: @ 82A4B5D - setvar VAR_0x40A4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate diff --git a/include/constants/vars.h b/include/constants/vars.h index a66b72cd0b..889b6692e5 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -176,46 +176,46 @@ #define VAR_0x409D 0x409D #define VAR_0x409E 0x409E #define VAR_0x409F 0x409F -#define VAR_0x40A0 0x40A0 +#define VAR_SLATEPORT_HARBOR_STATE 0x40A0 #define VAR_0x40A1 0x40A1 -#define VAR_0x40A2 0x40A2 -#define VAR_0x40A3 0x40A3 -#define VAR_0x40A4 0x40A4 -#define VAR_0x40A5 0x40A5 -#define VAR_0x40A6 0x40A6 -#define VAR_0x40A7 0x40A7 +#define VAR_SEAFLOOR_CAVERN_STATE 0x40A2 +#define VAR_CABLE_CAR_STATION_STATE 0x40A3 +#define VAR_SAFARI_ZONE_STATE 0x40A4 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE_1 0x40A5 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE_2 0x40A6 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE_3 0x40A7 #define VAR_0x40A8 0x40A8 #define VAR_CYCLING_CHALLENGE_STATE 0x40A9 -#define VAR_0x40AA 0x40AA -#define VAR_0x40AB 0x40AB -#define VAR_0x40AC 0x40AC -#define VAR_0x40AD 0x40AD -#define VAR_0x40AE 0x40AE -#define VAR_0x40AF 0x40AF -#define VAR_0x40B0 0x40B0 -#define VAR_0x40B1 0x40B1 -#define VAR_0x40B2 0x40B2 +#define VAR_SLATEPORT_MUSEUM_1F_STATE 0x40AA +#define VAR_TRICK_HOUSE_PUZZLE_1_STATE 0x40AB +#define VAR_TRICK_HOUSE_PUZZLE_2_STATE 0x40AC +#define VAR_TRICK_HOUSE_PUZZLE_3_STATE 0x40AD +#define VAR_TRICK_HOUSE_PUZZLE_4_STATE 0x40AE +#define VAR_TRICK_HOUSE_PUZZLE_5_STATE 0x40AF +#define VAR_TRICK_HOUSE_PUZZLE_6_STATE 0x40B0 +#define VAR_TRICK_HOUSE_PUZZLE_7_STATE 0x40B1 +#define VAR_TRICK_HOUSE_PUZZLE_8_STATE 0x40B2 #define VAR_WEATHER_INSTITUTE_STATE 0x40B3 #define VAR_PORTHOLE_STATE 0x40B4 -#define VAR_0x40B5 0x40B5 -#define VAR_0x40B6 0x40B6 -#define VAR_0x40B7 0x40B7 +#define VAR_TRICK_HOUSE_STATE 0x40B5 // TODO: needs some further investigation +#define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2 0x40B6 +#define VAR_SLATEPORT_FAN_CLUB_STATE 0x40B7 #define VAR_0x40B8 0x40B8 -#define VAR_0x40B9 0x40B9 -#define VAR_0x40BA 0x40BA +#define VAR_MT_PYRE_STATE 0x40B9 +#define VAR_NEW_MAUVILLE_STATE 0x40BA #define VAR_0x40BB 0x40BB -#define VAR_0x40BC 0x40BC -#define VAR_0x40BD 0x40BD -#define VAR_0x40BE 0x40BE -#define VAR_0x40BF 0x40BF -#define VAR_0x40C0 0x40C0 -#define VAR_0x40C1 0x40C1 +#define VAR_BRAVO_TRAINER_BATTLE_TOWER_ON 0x40BC +#define VAR_JAGGED_PASS_ASH_WEATHER 0x40BD +#define VAR_GLASS_WORKSHOP_STATE 0x40BE +#define VAR_METEOR_FALLS_STATE 0x40BF +#define VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE 0x40C0 +#define VAR_TRICK_HOUSE_PRIZE_PICKUP 0x40C1 #define VAR_PACIFIDLOG_TM_RECEIVED_DAY 0x40C2 -#define VAR_0x40C3 0x40C3 -#define VAR_0x40C4 0x40C4 -#define VAR_0x40C5 0x40C5 -#define VAR_0x40C6 0x40C6 -#define VAR_0x40C7 0x40C7 +#define VAR_VICTORY_ROAD_1F_STATE 0x40C3 +#define VAR_FOSSIL_RESURRECTION_STATE 0x40C4 +#define VAR_WHICH_FOSSIL_REVIVED 0x40C5 +#define VAR_STEVENS_HOUSE_STATE 0x40C6 +#define VAR_OLDALE_STATE 0x40C7 #define VAR_0x40C8 0x40C8 #define VAR_0x40C9 0x40C9 #define VAR_0x40CA 0x40CA diff --git a/src/tv.c b/src/tv.c index 5904efeb8d..2487210837 100644 --- a/src/tv.c +++ b/src/tv.c @@ -3603,7 +3603,7 @@ void GetMomOrDadStringForTVMessage(void) void sub_80F01B8(void) { - VarSet(VAR_0x40BC, 0); + VarSet(VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0); RemoveEventObjectByLocalIdAndMap(5, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); FlagSet(FLAG_HIDE_BATTLE_TOWER_REPORTER); } From d3f66a98ff76e35050138d79764eeb6a87e58a22 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 22 Feb 2019 11:40:32 -0600 Subject: [PATCH 101/217] Decompile more easy_chat --- asm/easy_chat.s | 1799 -------------------------------------------- data/easy_chat.s | 9 +- include/graphics.h | 3 + src/easy_chat.c | 984 +++++++++++++++++++++++- 4 files changed, 990 insertions(+), 1805 deletions(-) diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 271d1bce1c..caf096f092 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5,1805 +5,6 @@ .text - thumb_func_start sub_811BFA4 -sub_811BFA4: @ 811BFA4 - push {r4,lr} - sub sp, 0x8 - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - ldrh r0, [r0] - cmp r0, 0x5 - bls _0811BFB4 - b _0811C120 -_0811BFB4: - lsls r0, 2 - ldr r1, =_0811BFC8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0811BFC8: - .4byte _0811BFE0 - .4byte _0811C044 - .4byte _0811C090 - .4byte _0811C0AC - .4byte _0811C0BE - .4byte _0811C0D4 -_0811BFE0: - movs r0, 0 - bl ResetBgsAndClearDma3BusyFlags - ldr r1, =gUnknown_08597C54 - movs r0, 0 - movs r2, 0x4 - bl InitBgsFromTemplates - ldr r4, =gUnknown_0203A11C - ldr r1, [r4] - movs r0, 0xB0 - lsls r0, 4 - adds r1, r0 - movs r0, 0x3 - bl SetBgTilemapBuffer - ldr r1, [r4] - movs r0, 0xC0 - lsls r0, 2 - adds r1, r0 - movs r0, 0x1 - bl SetBgTilemapBuffer - ldr r0, =gUnknown_08597C64 - bl InitWindows - bl DeactivateAllTextPrinters - bl sub_811CF64 - bl sub_811CF04 - movs r0, 0 - str r0, [sp, 0x4] - movs r1, 0xE0 - lsls r1, 19 - ldr r2, =0x01000100 - add r0, sp, 0x4 - bl CpuFastSet - b _0811C124 - .pool -_0811C044: - ldr r1, =gEasyChatWindow_Gfx - movs r0, 0 - str r0, [sp] - movs r0, 0x3 - movs r2, 0 - movs r3, 0 - bl DecompressAndLoadBgGfxUsingHeap - ldr r1, =gEasyChatWindow_Tilemap - movs r0, 0x3 - movs r2, 0 - movs r3, 0 - bl CopyToBgTilemapBuffer - bl sub_811D60C - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - movs r1, 0xC0 - lsls r1, 2 - adds r0, r1 - bl sub_811D424 - bl sub_811D230 - bl sub_811E948 - movs r0, 0x3 - bl CopyBgTilemapBufferToVram - b _0811C124 - .pool -_0811C090: - ldr r1, =gUnknown_08597B54 - movs r0, 0 - str r0, [sp] - movs r0, 0x1 - movs r2, 0 - movs r3, 0 - bl DecompressAndLoadBgGfxUsingHeap - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - b _0811C124 - .pool -_0811C0AC: - bl sub_811CFCC - bl sub_811D0BC - bl sub_811D2C8 - bl sub_811D684 - b _0811C124 -_0811C0BE: - bl sub_811DE90 - bl sub_811BA5C - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x10 - beq _0811C124 - bl sub_811DEC4 - b _0811C124 -_0811C0D4: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - bne _0811C12E - movs r0, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_811DE5C - movs r0, 0x48 - movs r1, 0x3F - bl SetGpuReg - movs r0, 0x4A - movs r1, 0x3B - bl SetGpuReg - movs r0, 0x3 - bl ShowBg - movs r0, 0x1 - bl ShowBg - movs r0, 0x2 - bl ShowBg - movs r0, 0 - bl ShowBg - bl sub_811E5D4 - bl sub_811E720 - bl sub_811E828 - b _0811C124 -_0811C120: - movs r0, 0 - b _0811C130 -_0811C124: - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_0811C12E: - movs r0, 0x1 -_0811C130: - add sp, 0x8 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811BFA4 - - thumb_func_start sub_811C13C -sub_811C13C: @ 811C13C - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r0, [r4] - cmp r0, 0 - beq _0811C14E - bl Free - movs r0, 0 - str r0, [r4] -_0811C14E: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811C13C - - thumb_func_start sub_811C158 -sub_811C158: @ 811C158 - push {lr} - ldr r1, =gUnknown_0203A11C - ldr r1, [r1] - movs r2, 0 - strh r0, [r1, 0x4] - strh r2, [r1] - bl sub_811C170 - pop {r0} - bx r0 - .pool - thumb_func_end sub_811C158 - - thumb_func_start sub_811C170 -sub_811C170: @ 811C170 - push {lr} - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - ldrh r0, [r0, 0x4] - cmp r0, 0x22 - bls _0811C17E - b _0811C2CE -_0811C17E: - lsls r0, 2 - ldr r1, =_0811C190 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0811C190: - .4byte _0811C2CE - .4byte _0811C21C - .4byte _0811C222 - .4byte _0811C228 - .4byte _0811C22E - .4byte _0811C234 - .4byte _0811C23A - .4byte _0811C240 - .4byte _0811C246 - .4byte _0811C24C - .4byte _0811C252 - .4byte _0811C258 - .4byte _0811C25E - .4byte _0811C264 - .4byte _0811C26A - .4byte _0811C270 - .4byte _0811C276 - .4byte _0811C27C - .4byte _0811C282 - .4byte _0811C288 - .4byte _0811C28E - .4byte _0811C294 - .4byte _0811C29A - .4byte _0811C2A0 - .4byte _0811C2CE - .4byte _0811C2CE - .4byte _0811C2CE - .4byte _0811C2CE - .4byte _0811C2CE - .4byte _0811C2A6 - .4byte _0811C2AC - .4byte _0811C2B2 - .4byte _0811C2B8 - .4byte _0811C2BE - .4byte _0811C2C4 -_0811C21C: - bl sub_811C2D4 - b _0811C2C8 -_0811C222: - bl sub_811C30C - b _0811C2C8 -_0811C228: - bl sub_811C3E4 - b _0811C2C8 -_0811C22E: - bl sub_811C48C - b _0811C2C8 -_0811C234: - bl sub_811C404 - b _0811C2C8 -_0811C23A: - bl sub_811C448 - b _0811C2C8 -_0811C240: - bl sub_811C4D0 - b _0811C2C8 -_0811C246: - bl sub_811C518 - b _0811C2C8 -_0811C24C: - bl sub_811C554 - b _0811C2C8 -_0811C252: - bl sub_811C620 - b _0811C2C8 -_0811C258: - bl sub_811C830 - b _0811C2C8 -_0811C25E: - bl sub_811C8F0 - b _0811C2C8 -_0811C264: - bl sub_811C99C - b _0811C2C8 -_0811C26A: - bl sub_811CA5C - b _0811C2C8 -_0811C270: - bl sub_811C780 - b _0811C2C8 -_0811C276: - bl sub_811C78C - b _0811C2C8 -_0811C27C: - bl sub_811C7D4 - b _0811C2C8 -_0811C282: - bl sub_811CB18 - b _0811C2C8 -_0811C288: - bl sub_811CB98 - b _0811C2C8 -_0811C28E: - bl sub_811CB24 - b _0811C2C8 -_0811C294: - bl sub_811CC90 - b _0811C2C8 -_0811C29A: - bl sub_811CC08 - b _0811C2C8 -_0811C2A0: - bl sub_811C6C0 - b _0811C2C8 -_0811C2A6: - bl sub_811CD14 - b _0811C2C8 -_0811C2AC: - bl sub_811CD54 - b _0811C2C8 -_0811C2B2: - bl sub_811CD94 - b _0811C2C8 -_0811C2B8: - bl sub_811CDD4 - b _0811C2C8 -_0811C2BE: - bl sub_811CE14 - b _0811C2C8 -_0811C2C4: - bl sub_811CE54 -_0811C2C8: - lsls r0, 24 - lsrs r0, 24 - b _0811C2D0 -_0811C2CE: - movs r0, 0 -_0811C2D0: - pop {r1} - bx r1 - thumb_func_end sub_811C170 - - thumb_func_start sub_811C2D4 -sub_811C2D4: @ 811C2D4 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r0, [r4] - ldrh r0, [r0] - cmp r0, 0 - beq _0811C2EC - cmp r0, 0x1 - beq _0811C2FA - b _0811C304 - .pool -_0811C2EC: - bl sub_811D2C8 - ldr r1, [r4] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811C304 -_0811C2FA: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - lsrs r0, 24 - b _0811C306 -_0811C304: - movs r0, 0x1 -_0811C306: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811C2D4 - - thumb_func_start sub_811C30C -sub_811C30C: @ 811C30C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x40 - bl sub_811BA94 - adds r4, r0, 0 - bl sub_811BA68 - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - bl sub_811BAB8 - lsls r0, 24 - lsrs r7, r0, 24 - bl sub_811BAC4 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - bl sub_811BAAC - lsls r0, 24 - lsrs r0, 24 - mov r1, r9 - muls r1, r0 - adds r0, r1, 0 - lsls r0, 1 - adds r4, r0 - ldr r1, =gUnknown_08597C30 - mov r2, r10 - lsls r0, r2, 2 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 27 - lsrs r0, 8 - movs r1, 0xD0 - lsls r1, 12 - adds r0, r1 - lsrs r6, r0, 16 - movs r5, 0 - cmp r5, r7 - bcs _0811C3AA - ldr r2, =0x0000ffff - mov r8, r2 -_0811C36C: - ldrh r0, [r4] - cmp r0, r8 - bne _0811C380 - movs r0, 0x48 - b _0811C392 - .pool -_0811C380: - ldrh r1, [r4] - mov r0, sp - bl CopyEasyChatWord - movs r0, 0x1 - mov r1, sp - movs r2, 0 - bl GetStringWidth -_0811C392: - adds r0, 0x11 - lsls r1, r6, 16 - asrs r1, 16 - adds r1, r0 - lsls r1, 16 - lsrs r6, r1, 16 - adds r4, 0x2 - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, r7 - bcc _0811C36C -_0811C3AA: - ldr r1, =gUnknown_08597C30 - mov r2, r10 - lsls r0, r2, 2 - adds r0, r1 - ldrb r1, [r0] - lsrs r1, 5 - mov r2, r9 - lsls r0, r2, 1 - adds r1, r0 - lsls r1, 27 - lsls r0, r6, 24 - lsrs r0, 24 - movs r2, 0x80 - lsls r2, 20 - adds r1, r2 - lsrs r1, 24 - bl sub_811DF60 - movs r0, 0 - add sp, 0x40 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811C30C - - thumb_func_start sub_811C3E4 -sub_811C3E4: @ 811C3E4 - push {lr} - bl sub_811BAB8 - lsls r0, 24 - lsrs r0, 24 - bl sub_811E920 - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x60 - bl sub_811DF60 - movs r0, 0 - pop {r1} - bx r1 - thumb_func_end sub_811C3E4 - - thumb_func_start sub_811C404 -sub_811C404: @ 811C404 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r0, [r4] - ldrh r0, [r0] - cmp r0, 0 - beq _0811C41C - cmp r0, 0x1 - beq _0811C436 - b _0811C440 - .pool -_0811C41C: - bl sub_811DF90 - movs r0, 0x2 - bl sub_811D104 - movs r0, 0x1 - bl sub_811D214 - ldr r1, [r4] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811C440 -_0811C436: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - lsrs r0, 24 - b _0811C442 -_0811C440: - movs r0, 0x1 -_0811C442: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811C404 - - thumb_func_start sub_811C448 -sub_811C448: @ 811C448 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r0, [r4] - ldrh r0, [r0] - cmp r0, 0 - beq _0811C460 - cmp r0, 0x1 - beq _0811C47A - b _0811C484 - .pool -_0811C460: - bl sub_811DF90 - movs r0, 0x3 - bl sub_811D104 - movs r0, 0 - bl sub_811D214 - ldr r1, [r4] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811C484 -_0811C47A: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - lsrs r0, 24 - b _0811C486 -_0811C484: - movs r0, 0x1 -_0811C486: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811C448 - - thumb_func_start sub_811C48C -sub_811C48C: @ 811C48C - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r0, [r4] - ldrh r0, [r0] - cmp r0, 0 - beq _0811C4A4 - cmp r0, 0x1 - beq _0811C4BE - b _0811C4C8 - .pool -_0811C4A4: - bl sub_811DF90 - movs r0, 0x1 - bl sub_811D104 - movs r0, 0x1 - bl sub_811D214 - ldr r1, [r4] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811C4C8 -_0811C4BE: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - lsrs r0, 24 - b _0811C4CA -_0811C4C8: - movs r0, 0x1 -_0811C4CA: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811C48C - - thumb_func_start sub_811C4D0 -sub_811C4D0: @ 811C4D0 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r0, [r4] - ldrh r0, [r0] - cmp r0, 0 - beq _0811C4E8 - cmp r0, 0x1 - beq _0811C506 - b _0811C510 - .pool -_0811C4E8: - bl sub_811DFB0 - movs r0, 0 - bl sub_811D104 - bl sub_811D2C8 - movs r0, 0 - bl ShowBg - ldr r1, [r4] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811C510 -_0811C506: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - lsrs r0, 24 - b _0811C512 -_0811C510: - movs r0, 0x1 -_0811C512: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811C4D0 - - thumb_func_start sub_811C518 -sub_811C518: @ 811C518 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r0, [r4] - ldrh r0, [r0] - cmp r0, 0 - beq _0811C530 - cmp r0, 0x1 - beq _0811C546 - movs r0, 0x1 - b _0811C54E - .pool -_0811C530: - bl sub_811DFB0 - movs r0, 0 - bl sub_811D104 - bl sub_811D2C8 - ldr r1, [r4] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_0811C546: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - lsrs r0, 24 -_0811C54E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811C518 - - thumb_func_start sub_811C554 -sub_811C554: @ 811C554 - push {lr} - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - ldrh r0, [r0] - cmp r0, 0x4 - bhi _0811C60E - lsls r0, 2 - ldr r1, =_0811C574 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0811C574: - .4byte _0811C588 - .4byte _0811C5A4 - .4byte _0811C5B6 - .4byte _0811C5CC - .4byte _0811C5EC -_0811C588: - bl sub_811DF90 - movs r0, 0 - bl HideBg - movs r0, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_811DE5C - bl sub_811D6D4 - b _0811C5DA -_0811C5A4: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - bne _0811C618 - movs r0, 0 - bl sub_811D9CC - b _0811C5DA -_0811C5B6: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - bne _0811C618 - bl sub_811DAA4 - lsls r0, 24 - cmp r0, 0 - bne _0811C618 - b _0811C5DA -_0811C5CC: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - bne _0811C618 - bl sub_811E3AC -_0811C5DA: - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811C618 - .pool -_0811C5EC: - bl sub_811E418 - lsls r0, 24 - cmp r0, 0 - bne _0811C618 - bl sub_811DFC8 - movs r0, 0 - bl sub_811E6E0 - bl sub_811E64C - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_0811C60E: - movs r0, 0 - b _0811C61A - .pool -_0811C618: - movs r0, 0x1 -_0811C61A: - pop {r1} - bx r1 - thumb_func_end sub_811C554 - - thumb_func_start sub_811C620 -sub_811C620: @ 811C620 - push {lr} - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - ldrh r0, [r0] - cmp r0, 0x4 - bhi _0811C6B8 - lsls r0, 2 - ldr r1, =_0811C640 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0811C640: - .4byte _0811C654 - .4byte _0811C662 - .4byte _0811C67E - .4byte _0811C690 - .4byte _0811C6B4 -_0811C654: - bl sub_811E050 - bl sub_811E4AC - bl sub_811E6B0 - b _0811C6A4 -_0811C662: - bl sub_811E4D0 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _0811C6B8 - movs r0, 0x1 - bl sub_811D9CC - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_0811C67E: - bl sub_811DAA4 - lsls r0, 24 - cmp r0, 0 - bne _0811C6B8 - b _0811C6A4 - .pool -_0811C690: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - bne _0811C6B8 - bl sub_811DFB0 - movs r0, 0 - bl ShowBg -_0811C6A4: - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811C6B8 - .pool -_0811C6B4: - movs r0, 0 - b _0811C6BA -_0811C6B8: - movs r0, 0x1 -_0811C6BA: - pop {r1} - bx r1 - thumb_func_end sub_811C620 - - thumb_func_start sub_811C6C0 -sub_811C6C0: @ 811C6C0 - push {lr} - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - ldrh r0, [r0] - cmp r0, 0x4 - bhi _0811C778 - lsls r0, 2 - ldr r1, =_0811C6E0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0811C6E0: - .4byte _0811C6F4 - .4byte _0811C708 - .4byte _0811C722 - .4byte _0811C748 - .4byte _0811C76E -_0811C6F4: - bl sub_811E050 - bl sub_811E6B0 - bl sub_811E55C - movs r0, 0x5 - bl sub_811D9CC - b _0811C736 -_0811C708: - bl sub_811DAA4 - lsls r0, 24 - cmp r0, 0 - bne _0811C778 - bl sub_811E5B8 - lsls r0, 24 - cmp r0, 0 - bne _0811C778 - bl sub_811D6D4 - b _0811C736 -_0811C722: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - bne _0811C778 - movs r0, 0x6 - bl sub_811D9CC - bl sub_811E578 -_0811C736: - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811C778 - .pool -_0811C748: - bl sub_811DAA4 - lsls r0, 24 - cmp r0, 0 - bne _0811C778 - bl sub_811E5B8 - lsls r0, 24 - cmp r0, 0 - bne _0811C778 - bl sub_811E64C - bl sub_811DFC8 - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_0811C76E: - movs r0, 0 - b _0811C77A - .pool -_0811C778: - movs r0, 0x1 -_0811C77A: - pop {r1} - bx r1 - thumb_func_end sub_811C6C0 - - thumb_func_start sub_811C780 -sub_811C780: @ 811C780 - push {lr} - bl sub_811E088 - movs r0, 0 - pop {r1} - bx r1 - thumb_func_end sub_811C780 - - thumb_func_start sub_811C78C -sub_811C78C: @ 811C78C - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r0, [r4] - ldrh r0, [r0] - cmp r0, 0 - beq _0811C7A4 - cmp r0, 0x1 - beq _0811C7B4 - b _0811C7CA - .pool -_0811C7A4: - movs r0, 0x1 - movs r1, 0x4 - bl sub_811DDAC - ldr r1, [r4] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_0811C7B4: - bl sub_811DE10 - lsls r0, 24 - cmp r0, 0 - bne _0811C7CA - bl sub_811E088 - bl sub_811E64C - movs r0, 0 - b _0811C7CC -_0811C7CA: - movs r0, 0x1 -_0811C7CC: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811C78C - - thumb_func_start sub_811C7D4 -sub_811C7D4: @ 811C7D4 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r0, [r4] - ldrh r0, [r0] - cmp r0, 0x1 - beq _0811C808 - cmp r0, 0x1 - bgt _0811C7F0 - cmp r0, 0 - beq _0811C7F6 - b _0811C828 - .pool -_0811C7F0: - cmp r0, 0x2 - beq _0811C820 - b _0811C828 -_0811C7F6: - movs r0, 0x1 - negs r0, r0 - movs r1, 0x4 - bl sub_811DDAC - ldr r1, [r4] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_0811C808: - bl sub_811DE10 - lsls r0, 24 - cmp r0, 0 - bne _0811C828 - bl sub_811E64C - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_0811C820: - movs r0, 0 - b _0811C82A - .pool -_0811C828: - movs r0, 0x1 -_0811C82A: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811C7D4 - - thumb_func_start sub_811C830 -sub_811C830: @ 811C830 - push {lr} - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - ldrh r0, [r0] - cmp r0, 0x5 - bhi _0811C8E8 - lsls r0, 2 - ldr r1, =_0811C850 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0811C850: - .4byte _0811C868 - .4byte _0811C876 - .4byte _0811C886 - .4byte _0811C898 - .4byte _0811C8B8 - .4byte _0811C8DE -_0811C868: - bl sub_811E050 - bl sub_811E4AC - bl sub_811E6B0 - b _0811C8A8 -_0811C876: - bl sub_811E4D0 - lsls r0, 24 - cmp r0, 0 - bne _0811C8E8 - bl sub_811D9B4 - b _0811C8A8 -_0811C886: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - bne _0811C8E8 - movs r0, 0x2 - bl sub_811D9CC - b _0811C8A8 -_0811C898: - bl sub_811DAA4 - lsls r0, 24 - cmp r0, 0 - bne _0811C8E8 - movs r0, 0x2 - bl sub_811D698 -_0811C8A8: - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811C8E8 - .pool -_0811C8B8: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - bne _0811C8E8 - bl sub_811E288 - movs r0, 0x1 - bl sub_811E6E0 - bl sub_811E64C - bl sub_811E794 - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_0811C8DE: - movs r0, 0 - b _0811C8EA - .pool -_0811C8E8: - movs r0, 0x1 -_0811C8EA: - pop {r1} - bx r1 - thumb_func_end sub_811C830 - - thumb_func_start sub_811C8F0 -sub_811C8F0: @ 811C8F0 - push {lr} - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - ldrh r0, [r0] - cmp r0, 0x5 - bhi _0811C994 - lsls r0, 2 - ldr r1, =_0811C910 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0811C910: - .4byte _0811C928 - .4byte _0811C92E - .4byte _0811C940 - .4byte _0811C952 - .4byte _0811C974 - .4byte _0811C98C -_0811C928: - bl sub_811D2C8 - b _0811C962 -_0811C92E: - bl sub_811E380 - bl sub_811E6B0 - bl sub_811E7F8 - bl sub_811D9B4 - b _0811C962 -_0811C940: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - bne _0811C994 - movs r0, 0x3 - bl sub_811D9CC - b _0811C962 -_0811C952: - bl sub_811DAA4 - lsls r0, 24 - cmp r0, 0 - bne _0811C994 - movs r0, 0 - bl ShowBg -_0811C962: - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811C994 - .pool -_0811C974: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - bne _0811C994 - bl sub_811DFB0 - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_0811C98C: - movs r0, 0 - b _0811C996 - .pool -_0811C994: - movs r0, 0x1 -_0811C996: - pop {r1} - bx r1 - thumb_func_end sub_811C8F0 - - thumb_func_start sub_811C99C -sub_811C99C: @ 811C99C - push {lr} - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - ldrh r0, [r0] - cmp r0, 0x6 - bhi _0811CA54 - lsls r0, 2 - ldr r1, =_0811C9BC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0811C9BC: - .4byte _0811C9D8 - .4byte _0811C9DE - .4byte _0811C9F0 - .4byte _0811CA02 - .4byte _0811CA14 - .4byte _0811CA34 - .4byte _0811CA4C -_0811C9D8: - bl sub_811D2C8 - b _0811CA24 -_0811C9DE: - bl sub_811E380 - bl sub_811E6B0 - bl sub_811E7F8 - bl sub_811D9B4 - b _0811CA24 -_0811C9F0: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - bne _0811CA54 - movs r0, 0x3 - bl sub_811D9CC - b _0811CA24 -_0811CA02: - bl sub_811DAA4 - lsls r0, 24 - cmp r0, 0 - bne _0811CA54 - movs r0, 0x3 - bl sub_811D104 - b _0811CA24 -_0811CA14: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - bne _0811CA54 - movs r0, 0 - bl ShowBg -_0811CA24: - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811CA54 - .pool -_0811CA34: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - bne _0811CA54 - bl sub_811DFB0 - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_0811CA4C: - movs r0, 0 - b _0811CA56 - .pool -_0811CA54: - movs r0, 0x1 -_0811CA56: - pop {r1} - bx r1 - thumb_func_end sub_811C99C - - thumb_func_start sub_811CA5C -sub_811CA5C: @ 811CA5C - push {lr} - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - ldrh r0, [r0] - cmp r0, 0x4 - bhi _0811CB10 - lsls r0, 2 - ldr r1, =_0811CA7C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0811CA7C: - .4byte _0811CA90 - .4byte _0811CAA2 - .4byte _0811CAB4 - .4byte _0811CAC4 - .4byte _0811CAE4 -_0811CA90: - bl sub_811E380 - bl sub_811E6B0 - bl sub_811E7F8 - bl sub_811D9B4 - b _0811CAD2 -_0811CAA2: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - bne _0811CB10 - movs r0, 0x4 - bl sub_811D9CC - b _0811CAD2 -_0811CAB4: - bl sub_811DAA4 - lsls r0, 24 - cmp r0, 0 - bne _0811CB10 - bl sub_811D6D4 - b _0811CAD2 -_0811CAC4: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - bne _0811CB10 - bl sub_811E3AC -_0811CAD2: - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811CB10 - .pool -_0811CAE4: - bl sub_811E418 - lsls r0, 24 - cmp r0, 0 - bne _0811CB10 - bl sub_811DFC8 - movs r0, 0 - bl sub_811E6E0 - bl sub_811E64C - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - movs r0, 0 - b _0811CB12 - .pool -_0811CB10: - movs r0, 0x1 -_0811CB12: - pop {r1} - bx r1 - thumb_func_end sub_811CA5C - - thumb_func_start sub_811CB18 -sub_811CB18: @ 811CB18 - push {lr} - bl sub_811E30C - movs r0, 0 - pop {r1} - bx r1 - thumb_func_end sub_811CB18 - - thumb_func_start sub_811CB24 -sub_811CB24: @ 811CB24 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r0, [r4] - ldrh r0, [r0] - cmp r0, 0x1 - beq _0811CB50 - cmp r0, 0x1 - bgt _0811CB40 - cmp r0, 0 - beq _0811CB4A - b _0811CB8E - .pool -_0811CB40: - cmp r0, 0x2 - beq _0811CB6C - cmp r0, 0x3 - beq _0811CB8A - b _0811CB8E -_0811CB4A: - bl sub_811D7A4 - b _0811CB62 -_0811CB50: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - bne _0811CB8E - movs r0, 0x1 - movs r1, 0x4 - bl sub_811DDAC -_0811CB62: - ldr r1, [r4] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811CB8E -_0811CB6C: - bl sub_811DE10 - lsls r0, 24 - cmp r0, 0 - bne _0811CB8E - bl sub_811E30C - bl sub_811E64C - bl sub_811E794 - ldr r1, [r4] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_0811CB8A: - movs r0, 0 - b _0811CB90 -_0811CB8E: - movs r0, 0x1 -_0811CB90: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811CB24 - - thumb_func_start sub_811CB98 -sub_811CB98: @ 811CB98 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r0, [r4] - ldrh r0, [r0] - cmp r0, 0x1 - beq _0811CBC4 - cmp r0, 0x1 - bgt _0811CBB4 - cmp r0, 0 - beq _0811CBBE - b _0811CC00 - .pool -_0811CBB4: - cmp r0, 0x2 - beq _0811CBE2 - cmp r0, 0x3 - beq _0811CBFC - b _0811CC00 -_0811CBBE: - bl sub_811D7C8 - b _0811CBD8 -_0811CBC4: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - bne _0811CC00 - movs r0, 0x1 - negs r0, r0 - movs r1, 0x4 - bl sub_811DDAC -_0811CBD8: - ldr r1, [r4] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811CC00 -_0811CBE2: - bl sub_811DE10 - lsls r0, 24 - cmp r0, 0 - bne _0811CC00 - bl sub_811E64C - bl sub_811E794 - ldr r1, [r4] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_0811CBFC: - movs r0, 0 - b _0811CC02 -_0811CC00: - movs r0, 0x1 -_0811CC02: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811CB98 - - thumb_func_start sub_811CC08 -sub_811CC08: @ 811CC08 - push {r4,r5,lr} - ldr r5, =gUnknown_0203A11C - ldr r0, [r5] - ldrh r0, [r0] - cmp r0, 0x1 - beq _0811CC34 - cmp r0, 0x1 - bgt _0811CC24 - cmp r0, 0 - beq _0811CC2E - b _0811CC86 - .pool -_0811CC24: - cmp r0, 0x2 - beq _0811CC64 - cmp r0, 0x3 - beq _0811CC82 - b _0811CC86 -_0811CC2E: - bl sub_811D7EC - b _0811CC5A -_0811CC34: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - bne _0811CC86 - bl sub_811BBDC - adds r4, r0, 0 - bl sub_811DE48 - lsls r4, 24 - lsrs r4, 24 - subs r4, r0 - lsls r4, 16 - asrs r4, 16 - adds r0, r4, 0 - movs r1, 0x8 - bl sub_811DDAC -_0811CC5A: - ldr r1, [r5] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811CC86 -_0811CC64: - bl sub_811DE10 - lsls r0, 24 - cmp r0, 0 - bne _0811CC86 - bl sub_811E30C - bl sub_811E64C - bl sub_811E794 - ldr r1, [r5] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_0811CC82: - movs r0, 0 - b _0811CC88 -_0811CC86: - movs r0, 0x1 -_0811CC88: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_811CC08 - - thumb_func_start sub_811CC90 -sub_811CC90: @ 811CC90 - push {r4,r5,lr} - ldr r5, =gUnknown_0203A11C - ldr r0, [r5] - ldrh r0, [r0] - cmp r0, 0x1 - beq _0811CCBC - cmp r0, 0x1 - bgt _0811CCAC - cmp r0, 0 - beq _0811CCB6 - b _0811CD0A - .pool -_0811CCAC: - cmp r0, 0x2 - beq _0811CCEC - cmp r0, 0x3 - beq _0811CD06 - b _0811CD0A -_0811CCB6: - bl sub_811D830 - b _0811CCE2 -_0811CCBC: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - cmp r0, 0 - bne _0811CD0A - bl sub_811BBDC - adds r4, r0, 0 - bl sub_811DE48 - lsls r4, 24 - lsrs r4, 24 - subs r4, r0 - lsls r4, 16 - asrs r4, 16 - adds r0, r4, 0 - movs r1, 0x8 - bl sub_811DDAC -_0811CCE2: - ldr r1, [r5] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811CD0A -_0811CCEC: - bl sub_811DE10 - lsls r0, 24 - cmp r0, 0 - bne _0811CD0A - bl sub_811E64C - bl sub_811E794 - ldr r1, [r5] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_0811CD06: - movs r0, 0 - b _0811CD0C -_0811CD0A: - movs r0, 0x1 -_0811CD0C: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_811CC90 - - thumb_func_start sub_811CD14 -sub_811CD14: @ 811CD14 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r0, [r4] - ldrh r0, [r0] - cmp r0, 0 - beq _0811CD2C - cmp r0, 0x1 - beq _0811CD40 - b _0811CD4A - .pool -_0811CD2C: - bl sub_811DF90 - movs r0, 0x4 - bl sub_811D104 - ldr r1, [r4] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811CD4A -_0811CD40: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - lsrs r0, 24 - b _0811CD4C -_0811CD4A: - movs r0, 0x1 -_0811CD4C: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811CD14 - - thumb_func_start sub_811CD54 -sub_811CD54: @ 811CD54 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r0, [r4] - ldrh r0, [r0] - cmp r0, 0 - beq _0811CD6C - cmp r0, 0x1 - beq _0811CD80 - b _0811CD8A - .pool -_0811CD6C: - bl sub_811DF90 - movs r0, 0x5 - bl sub_811D104 - ldr r1, [r4] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811CD8A -_0811CD80: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - lsrs r0, 24 - b _0811CD8C -_0811CD8A: - movs r0, 0x1 -_0811CD8C: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811CD54 - - thumb_func_start sub_811CD94 -sub_811CD94: @ 811CD94 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r0, [r4] - ldrh r0, [r0] - cmp r0, 0 - beq _0811CDAC - cmp r0, 0x1 - beq _0811CDC0 - b _0811CDCA - .pool -_0811CDAC: - bl sub_811DF90 - movs r0, 0x6 - bl sub_811D104 - ldr r1, [r4] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811CDCA -_0811CDC0: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - lsrs r0, 24 - b _0811CDCC -_0811CDCA: - movs r0, 0x1 -_0811CDCC: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811CD94 - - thumb_func_start sub_811CDD4 -sub_811CDD4: @ 811CDD4 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r0, [r4] - ldrh r0, [r0] - cmp r0, 0 - beq _0811CDEC - cmp r0, 0x1 - beq _0811CE00 - b _0811CE0A - .pool -_0811CDEC: - bl sub_811DF90 - movs r0, 0x7 - bl sub_811D104 - ldr r1, [r4] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811CE0A -_0811CE00: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - lsrs r0, 24 - b _0811CE0C -_0811CE0A: - movs r0, 0x1 -_0811CE0C: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811CDD4 - - thumb_func_start sub_811CE14 -sub_811CE14: @ 811CE14 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r0, [r4] - ldrh r0, [r0] - cmp r0, 0 - beq _0811CE2C - cmp r0, 0x1 - beq _0811CE40 - b _0811CE4A - .pool -_0811CE2C: - bl sub_811DF90 - movs r0, 0x8 - bl sub_811D104 - ldr r1, [r4] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811CE4A -_0811CE40: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - lsrs r0, 24 - b _0811CE4C -_0811CE4A: - movs r0, 0x1 -_0811CE4C: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811CE14 - - thumb_func_start sub_811CE54 -sub_811CE54: @ 811CE54 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r0, [r4] - ldrh r0, [r0] - cmp r0, 0 - beq _0811CE6C - cmp r0, 0x1 - beq _0811CE80 - b _0811CE8A - .pool -_0811CE6C: - bl sub_811DF90 - movs r0, 0x9 - bl sub_811D104 - ldr r1, [r4] - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0811CE8A -_0811CE80: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - lsrs r0, 24 - b _0811CE8C -_0811CE8A: - movs r0, 0x1 -_0811CE8C: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811CE54 - thumb_func_start sub_811CE94 sub_811CE94: @ 811CE94 push {r4,lr} diff --git a/data/easy_chat.s b/data/easy_chat.s index 4725f15d9d..b8df93d7a2 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -268,7 +268,14 @@ gUnknown_08597C24:: @ 8597C24 .incbin "graphics/misc/8597C24.gbapal" gUnknown_08597C30:: @ 8597C30 - .byte 0x83, 0x18, 0x04, 0x00, 0x63, 0x18, 0x06, 0x00, 0x03, 0x18, 0x0a, 0x00, 0xa3, 0x18, 0x02, 0x00, 0xb0, 0x0c, 0x02, 0x00, 0x83, 0x18, 0x04, 0x00, 0x89, 0x0c, 0x02, 0x01, 0x65, 0x14, 0x0a, 0x03 + .byte 0x83, 0x18, 0x04, 0x00 + .byte 0x63, 0x18, 0x06, 0x00 + .byte 0x03, 0x18, 0x0a, 0x00 + .byte 0xa3, 0x18, 0x02, 0x00 + .byte 0xb0, 0x0c, 0x02, 0x00 + .byte 0x83, 0x18, 0x04, 0x00 + .byte 0x89, 0x0c, 0x02, 0x01 + .byte 0x65, 0x14, 0x0a, 0x03 .byte 0x03, 0x18, 0x0a, 0x02 .align 2 diff --git a/include/graphics.h b/include/graphics.h index 48c00943b1..6a1933ddd8 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4889,5 +4889,8 @@ extern const u16 gFrontierPassMedalsGold_Pal[]; extern const u16 gFrontierPassMedalsSilver_Pal[]; extern const u16 gFrontierPassMapCursor_Pal[]; +// Easy Chat Screen +extern const u32 gEasyChatWindow_Gfx[]; +extern const u32 gEasyChatWindow_Tilemap[]; #endif //GUARD_GRAPHICS_H diff --git a/src/easy_chat.c b/src/easy_chat.c index 5f5d20e166..741064c5ba 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -2,11 +2,14 @@ // Includes #include "global.h" #include "alloc.h" +#include "bg.h" #include "dewford_trend.h" #include "dynamic_placeholder_text_util.h" #include "easy_chat.h" #include "event_data.h" #include "field_weather.h" +#include "gpu_regs.h" +#include "graphics.h" #include "international_string_util.h" #include "link.h" #include "main.h" @@ -70,8 +73,27 @@ struct EasyChatScreen /*0x3C*/ u16 ecWordBuffer[9]; }; +struct Unk203A11C +{ + u16 unk0; + u8 filler2[0x2]; + u16 unk4; + u8 filler6[0x2FA]; + u8 unk300[BG_SCREEN_SIZE]; + u8 unkB00[BG_SCREEN_SIZE]; +}; + +struct Unk08597C30 +{ + u8 unk0_0:5; + u8 unk0_5:3; + u8 unk1; + u8 unk2; + u8 unk3; +}; + EWRAM_DATA struct EasyChatScreen *gEasyChatScreen = NULL; -EWRAM_DATA void *gUnknown_0203A11C = 0; +EWRAM_DATA struct Unk203A11C *gUnknown_0203A11C = 0; EWRAM_DATA void *gUnknown_0203A120 = 0; static void sub_811A2C0(u8); @@ -103,10 +125,10 @@ static u8 sub_811BCC8(u8); static void sub_811BDF0(u8 *); void sub_811BF78(void); static bool8 sub_811BF8C(void); -bool8 sub_811BFA4(void); -void sub_811C13C(void); -/*static*/ void sub_811C158(u16); -/*static*/ bool8 sub_811C170(void); +static bool8 sub_811BFA4(void); +static void sub_811C13C(void); +static void sub_811C158(u16); +static bool8 sub_811C170(void); bool8 sub_811F28C(void); void sub_811F2B8(void); u8 sub_811F3AC(void); @@ -153,6 +175,87 @@ static u8 sub_811BA1C(void); static int sub_811BF20(void); static u16 sub_811BF40(void); u8 sub_811CE94(void); +void sub_811CF64(void); +void sub_811CF04(void); +void sub_811D60C(void); +void sub_811D424(u8 *); +void sub_811D230(void); +void sub_811E948(void); +void sub_811CFCC(void); +void sub_811D0BC(void); +void sub_811D2C8(void); +void sub_811D684(void); +void sub_811DE90(void); +void sub_811DEC4(void); +void sub_811DE5C(u8, u8, u8, u8); +void sub_811E5D4(void); +void sub_811E720(void); +void sub_811E828(void); +static bool8 sub_811C2D4(void); +static bool8 sub_811C30C(void); +static bool8 sub_811C3E4(void); +static bool8 sub_811C48C(void); +static bool8 sub_811C404(void); +static bool8 sub_811C448(void); +static bool8 sub_811C4D0(void); +static bool8 sub_811C518(void); +static bool8 sub_811C554(void); +static bool8 sub_811C620(void); +static bool8 sub_811C830(void); +static bool8 sub_811C8F0(void); +static bool8 sub_811C99C(void); +static bool8 sub_811CA5C(void); +static bool8 sub_811C780(void); +static bool8 sub_811C78C(void); +static bool8 sub_811C7D4(void); +static bool8 sub_811CB18(void); +static bool8 sub_811CB98(void); +static bool8 sub_811CB24(void); +static bool8 sub_811CC90(void); +static bool8 sub_811CC08(void); +static bool8 sub_811C6C0(void); +static bool8 sub_811CD14(void); +static bool8 sub_811CD54(void); +static bool8 sub_811CD94(void); +static bool8 sub_811CDD4(void); +static bool8 sub_811CE14(void); +static bool8 sub_811CE54(void); +void sub_811DF60(u8, u8); +int sub_811E920(int); +void sub_811DF90(void); +void sub_811D104(u8); +void sub_811D214(u8); +void sub_811DFB0(void); +void sub_811D6D4(void); +void sub_811D9CC(int); +void sub_811E3AC(void); +bool8 sub_811E418(void); +void sub_811DFC8(void); +void sub_811E6E0(int); +bool8 sub_811DAA4(void); +void sub_811E64C(void); +void sub_811E050(void); +void sub_811E4AC(void); +void sub_811E6B0(void); +void sub_811E55C(void); +bool8 sub_811E4D0(void); +bool8 sub_811E5B8(void); +void sub_811E578(void); +void sub_811E088(void); +void sub_811DDAC(s16, u8); +bool8 sub_811DE10(void); +void sub_811D9B4(void); +void sub_811D698(int); +void sub_811E288(void); +void sub_811E794(void); +void sub_811E380(void); +void sub_811E7F8(void); +void sub_811E30C(void); +void sub_811D7A4(void); +void sub_811D7C8(void); +int sub_811DE48(void); +void sub_811D7EC(void); +void sub_811D830(void); u8 *CopyEasyChatWordPadded(u8 *, u16, u16); extern const struct { @@ -164,6 +267,10 @@ extern const struct EasyChatScreenTemplate gEasyChatScreenTemplates[21]; extern const u8 gUnknown_08597748[][7]; extern const u16 gUnknown_08597764[]; extern const u16 gUnknown_0859776C[][2]; +extern const struct BgTemplate gUnknown_08597C54[4]; +extern const struct WindowTemplate gUnknown_08597C64[]; +extern const u32 gUnknown_08597B54[]; +extern const struct Unk08597C30 gUnknown_08597C30[]; void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam) { @@ -2213,3 +2320,870 @@ static bool8 sub_811BF8C(void) else return 1; } + +static bool8 sub_811BFA4(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + ResetBgsAndClearDma3BusyFlags(0); + InitBgsFromTemplates(0, gUnknown_08597C54, ARRAY_COUNT(gUnknown_08597C54)); + SetBgTilemapBuffer(3, gUnknown_0203A11C->unkB00); + SetBgTilemapBuffer(1, gUnknown_0203A11C->unk300); + InitWindows(gUnknown_08597C64); + DeactivateAllTextPrinters(); + sub_811CF64(); + sub_811CF04(); + CpuFastFill(0, (void *)VRAM + 0x1000000, 0x400); + break; + case 1: + DecompressAndLoadBgGfxUsingHeap(3, gEasyChatWindow_Gfx, 0, 0, 0); + CopyToBgTilemapBuffer(3, gEasyChatWindow_Tilemap, 0, 0); + sub_811D60C(); + sub_811D424(gUnknown_0203A11C->unk300); + sub_811D230(); + sub_811E948(); + CopyBgTilemapBufferToVram(3); + break; + case 2: + DecompressAndLoadBgGfxUsingHeap(1, gUnknown_08597B54, 0, 0, 0); + CopyBgTilemapBufferToVram(1); + break; + case 3: + sub_811CFCC(); + sub_811D0BC(); + sub_811D2C8(); + sub_811D684(); + break; + case 4: + sub_811DE90(); + if (sub_811BA5C() != 16) + sub_811DEC4(); + break; + case 5: + if (IsDma3ManagerBusyWithBgCopy()) + { + return TRUE; + } + else + { + sub_811DE5C(0, 0, 0, 0); + SetGpuReg(REG_OFFSET_WININ, WIN_RANGE(0, 63)); + SetGpuReg(REG_OFFSET_WINOUT, WIN_RANGE(0, 59)); + ShowBg(3); + ShowBg(1); + ShowBg(2); + ShowBg(0); + sub_811E5D4(); + sub_811E720(); + sub_811E828(); + } + break; + default: + return FALSE; + } + + gUnknown_0203A11C->unk0++; + return TRUE; +} + +static void sub_811C13C(void) +{ + if (gUnknown_0203A11C) + FREE_AND_SET_NULL(gUnknown_0203A11C); +} + +static void sub_811C158(u16 arg0) +{ + gUnknown_0203A11C->unk4 = arg0; + gUnknown_0203A11C->unk0 = 0; + sub_811C170(); +} + +static bool8 sub_811C170(void) +{ + switch (gUnknown_0203A11C->unk4) + { + case 0: return FALSE; + case 1: return sub_811C2D4(); + case 2: return sub_811C30C(); + case 3: return sub_811C3E4(); + case 4: return sub_811C48C(); + case 5: return sub_811C404(); + case 6: return sub_811C448(); + case 7: return sub_811C4D0(); + case 8: return sub_811C518(); + case 9: return sub_811C554(); + case 10: return sub_811C620(); + case 11: return sub_811C830(); + case 12: return sub_811C8F0(); + case 13: return sub_811C99C(); + case 14: return sub_811CA5C(); + case 15: return sub_811C780(); + case 16: return sub_811C78C(); + case 17: return sub_811C7D4(); + case 18: return sub_811CB18(); + case 19: return sub_811CB98(); + case 20: return sub_811CB24(); + case 21: return sub_811CC90(); + case 22: return sub_811CC08(); + case 23: return sub_811C6C0(); + case 24: return FALSE; + case 25: return FALSE; + case 26: return FALSE; + case 27: return FALSE; + case 28: return FALSE; + case 29: return sub_811CD14(); + case 30: return sub_811CD54(); + case 31: return sub_811CD94(); + case 32: return sub_811CDD4(); + case 33: return sub_811CE14(); + case 34: return sub_811CE54(); + default: return FALSE; + } +} + +static bool8 sub_811C2D4(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811D2C8(); + gUnknown_0203A11C->unk0++; + break; + case 1: + return IsDma3ManagerBusyWithBgCopy(); + } + + return TRUE; +} + +static bool8 sub_811C30C(void) +{ + u8 i; + u16 *ecWordBuffer; + u16 *ecWord; + u8 var0; + u8 cursorColumn, cursorRow, numColumns; + s16 var1; + int stringWidth; + int trueStringWidth; + u8 var2; + u8 sp0[64]; + + ecWordBuffer = sub_811BA94(); + var0 = sub_811BA68(); + cursorColumn = sub_811BAB8(); + cursorRow = sub_811BAC4(); + numColumns = sub_811BAAC(); + ecWord = &ecWordBuffer[cursorRow * numColumns]; + var1 = 8 * gUnknown_08597C30[var0].unk0_0 + 13; + for (i = 0; i < cursorColumn; i++) + { + if (*ecWord == 0xFFFF) + { + stringWidth = 72; + } + else + { + CopyEasyChatWord(sp0, *ecWord); + stringWidth = GetStringWidth(1, sp0, 0); + } + + trueStringWidth = stringWidth + 17; + var1 += trueStringWidth; + ecWord++; + } + + var2 = 8 * (gUnknown_08597C30[var0].unk0_5 + cursorRow * 2); + sub_811DF60(var1, var2 + 8); + return FALSE; +} + +static bool8 sub_811C3E4(void) +{ + u8 var0 = sub_811E920(sub_811BAB8()); + sub_811DF60(var0, 96); + return FALSE; +} + +static bool8 sub_811C404(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811DF90(); + sub_811D104(2); + sub_811D214(1); + gUnknown_0203A11C->unk0++; + break; + case 1: + return IsDma3ManagerBusyWithBgCopy(); + } + + return TRUE; +} + +static bool8 sub_811C448(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811DF90(); + sub_811D104(3); + sub_811D214(0); + gUnknown_0203A11C->unk0++; + break; + case 1: + return IsDma3ManagerBusyWithBgCopy(); + } + + return TRUE; +} + +static bool8 sub_811C48C(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811DF90(); + sub_811D104(1); + sub_811D214(1); + gUnknown_0203A11C->unk0++; + break; + case 1: + return IsDma3ManagerBusyWithBgCopy(); + } + + return TRUE; +} + +static bool8 sub_811C4D0(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811DFB0(); + sub_811D104(0); + sub_811D2C8(); + ShowBg(0); + gUnknown_0203A11C->unk0++; + break; + case 1: + return IsDma3ManagerBusyWithBgCopy(); + } + + return TRUE; +} + +static bool8 sub_811C518(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811DFB0(); + sub_811D104(0); + sub_811D2C8(); + gUnknown_0203A11C->unk0++; + // Fall through + case 1: + return IsDma3ManagerBusyWithBgCopy(); + } + + return TRUE; +} + +static bool8 sub_811C554(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811DF90(); + HideBg(0); + sub_811DE5C(0, 0, 0, 0); + sub_811D6D4(); + gUnknown_0203A11C->unk0++; + break; + case 1: + if (!IsDma3ManagerBusyWithBgCopy()) + { + sub_811D9CC(0); + gUnknown_0203A11C->unk0++; + } + break; + case 2: + if (!IsDma3ManagerBusyWithBgCopy() && !sub_811DAA4()) + gUnknown_0203A11C->unk0++; + break; + case 3: + if (!IsDma3ManagerBusyWithBgCopy()) + { + sub_811E3AC(); + gUnknown_0203A11C->unk0++; + } + break; + case 4: + if (!sub_811E418()) + { + sub_811DFC8(); + sub_811E6E0(0); + sub_811E64C(); + gUnknown_0203A11C->unk0++; + return FALSE; + } + break; + default: + return FALSE; + } + + return TRUE; +} + +static bool8 sub_811C620(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811E050(); + sub_811E4AC(); + sub_811E6B0(); + gUnknown_0203A11C->unk0++; + break; + case 1: + if (sub_811E4D0() == TRUE) + break; + + sub_811D9CC(1); + gUnknown_0203A11C->unk0++; + // Fall through + case 2: + if (!sub_811DAA4()) + gUnknown_0203A11C->unk0++; + break; + case 3: + if (!IsDma3ManagerBusyWithBgCopy()) + { + sub_811DFB0(); + ShowBg(0); + gUnknown_0203A11C->unk0++; + } + break; + case 4: + return FALSE; + } + + return TRUE; +} + +static bool8 sub_811C6C0(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811E050(); + sub_811E6B0(); + sub_811E55C(); + sub_811D9CC(5); + gUnknown_0203A11C->unk0++; + break; + case 1: + if (!sub_811DAA4() && !sub_811E5B8()) + { + sub_811D6D4(); + gUnknown_0203A11C->unk0++; + } + break; + case 2: + if (!IsDma3ManagerBusyWithBgCopy()) + { + sub_811D9CC(6); + sub_811E578(); + gUnknown_0203A11C->unk0++; + } + break; + case 3: + if (!sub_811DAA4() && !sub_811E5B8()) + { + sub_811E64C(); + sub_811DFC8(); + gUnknown_0203A11C->unk0++; + return FALSE; + } + break; + case 4: + return FALSE; + } + + return TRUE; +} + +static bool8 sub_811C780(void) +{ + sub_811E088(); + return FALSE; +} + +static bool8 sub_811C78C(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811DDAC(1, 4); + gUnknown_0203A11C->unk0++; + // Fall through + case 1: + if (!sub_811DE10()) + { + sub_811E088(); + sub_811E64C(); + return FALSE; + } + break; + } + + return TRUE; +} + +static bool8 sub_811C7D4(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811DDAC(-1, 4); + gUnknown_0203A11C->unk0++; + // Fall through + case 1: + if (!sub_811DE10()) + { + sub_811E64C(); + gUnknown_0203A11C->unk0++; + return FALSE; + } + break; + case 2: + return FALSE; + } + + return TRUE; +} + +static bool8 sub_811C830(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811E050(); + sub_811E4AC(); + sub_811E6B0(); + gUnknown_0203A11C->unk0++; + break; + case 1: + if (!sub_811E4D0()) + { + sub_811D9B4(); + gUnknown_0203A11C->unk0++; + } + break; + case 2: + if (!IsDma3ManagerBusyWithBgCopy()) + { + sub_811D9CC(2); + gUnknown_0203A11C->unk0++; + } + break; + case 3: + if (!sub_811DAA4()) + { + sub_811D698(2); + gUnknown_0203A11C->unk0++; + } + break; + case 4: + if (!IsDma3ManagerBusyWithBgCopy()) + { + sub_811E288(); + sub_811E6E0(1); + sub_811E64C(); + sub_811E794(); + gUnknown_0203A11C->unk0++; + return FALSE; + } + break; + case 5: + return FALSE; + } + + return TRUE; +} + +static bool8 sub_811C8F0(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811D2C8(); + gUnknown_0203A11C->unk0++; + break; + case 1: + sub_811E380(); + sub_811E6B0(); + sub_811E7F8(); + sub_811D9B4(); + gUnknown_0203A11C->unk0++; + break; + case 2: + if (!IsDma3ManagerBusyWithBgCopy()) + { + sub_811D9CC(3); + gUnknown_0203A11C->unk0++; + } + break; + case 3: + if (!sub_811DAA4()) + { + ShowBg(0); + gUnknown_0203A11C->unk0++; + } + break; + case 4: + if (!IsDma3ManagerBusyWithBgCopy()) + { + sub_811DFB0(); + gUnknown_0203A11C->unk0++; + return FALSE; + } + break; + case 5: + return FALSE; + } + + return TRUE; +} + +static bool8 sub_811C99C(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811D2C8(); + gUnknown_0203A11C->unk0++; + break; + case 1: + sub_811E380(); + sub_811E6B0(); + sub_811E7F8(); + sub_811D9B4(); + gUnknown_0203A11C->unk0++; + break; + case 2: + if (!IsDma3ManagerBusyWithBgCopy()) + { + sub_811D9CC(3); + gUnknown_0203A11C->unk0++; + } + break; + case 3: + if (!sub_811DAA4()) + { + sub_811D104(3); + gUnknown_0203A11C->unk0++; + } + break; + case 4: + if (!IsDma3ManagerBusyWithBgCopy()) + { + ShowBg(0); + gUnknown_0203A11C->unk0++; + } + break; + case 5: + if (!IsDma3ManagerBusyWithBgCopy()) + { + sub_811DFB0(); + gUnknown_0203A11C->unk0++; + return FALSE; + } + break; + case 6: + return FALSE; + } + + return TRUE; +} + +static bool8 sub_811CA5C(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811E380(); + sub_811E6B0(); + sub_811E7F8(); + sub_811D9B4(); + gUnknown_0203A11C->unk0++; + break; + case 1: + if (!IsDma3ManagerBusyWithBgCopy()) + { + sub_811D9CC(4); + gUnknown_0203A11C->unk0++; + } + break; + case 2: + if (!sub_811DAA4()) + { + sub_811D6D4(); + gUnknown_0203A11C->unk0++; + } + break; + case 3: + if (!IsDma3ManagerBusyWithBgCopy()) + { + sub_811E3AC(); + gUnknown_0203A11C->unk0++; + } + break; + case 4: + if (!sub_811E418()) + { + sub_811DFC8(); + sub_811E6E0(0); + sub_811E64C(); + gUnknown_0203A11C->unk0++; + return FALSE; + } + break; + } + + return TRUE; +} + +static bool8 sub_811CB18(void) +{ + sub_811E30C(); + return FALSE; +} + +static bool8 sub_811CB24(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811D7A4(); + gUnknown_0203A11C->unk0++; + break; + case 1: + if (!IsDma3ManagerBusyWithBgCopy()) + { + sub_811DDAC(1, 4); + gUnknown_0203A11C->unk0++; + } + break; + case 2: + if (!sub_811DE10()) + { + sub_811E30C(); + sub_811E64C(); + sub_811E794(); + gUnknown_0203A11C->unk0++; + return FALSE; + } + break; + case 3: + return FALSE; + } + + return TRUE; +} + +static bool8 sub_811CB98(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811D7C8(); + gUnknown_0203A11C->unk0++; + break; + case 1: + if (!IsDma3ManagerBusyWithBgCopy()) + { + sub_811DDAC(-1, 4); + gUnknown_0203A11C->unk0++; + } + break; + case 2: + if (!sub_811DE10()) + { + sub_811E64C(); + sub_811E794(); + gUnknown_0203A11C->unk0++; + return FALSE; + } + break; + case 3: + return FALSE; + } + + return TRUE; +} + +static bool8 sub_811CC08(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811D7EC(); + gUnknown_0203A11C->unk0++; + break; + case 1: + if (!IsDma3ManagerBusyWithBgCopy()) + { + s16 var0 = sub_811BBDC() - sub_811DE48(); + sub_811DDAC(var0, 8); + gUnknown_0203A11C->unk0++; + } + break; + case 2: + if (!sub_811DE10()) + { + sub_811E30C(); + sub_811E64C(); + sub_811E794(); + gUnknown_0203A11C->unk0++; + return FALSE; + } + break; + case 3: + return FALSE; + } + + return TRUE; +} + +static bool8 sub_811CC90(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811D830(); + gUnknown_0203A11C->unk0++; + break; + case 1: + if (!IsDma3ManagerBusyWithBgCopy()) + { + s16 var0 = sub_811BBDC() - sub_811DE48(); + sub_811DDAC(var0, 8); + gUnknown_0203A11C->unk0++; + } + break; + case 2: + if (!sub_811DE10()) + { + sub_811E64C(); + sub_811E794(); + gUnknown_0203A11C->unk0++; + return FALSE; + } + break; + case 3: + return FALSE; + } + + return TRUE; +} + +static bool8 sub_811CD14(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811DF90(); + sub_811D104(4); + gUnknown_0203A11C->unk0++; + break; + case 1: + return IsDma3ManagerBusyWithBgCopy(); + } + + return TRUE; +} + +static bool8 sub_811CD54(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811DF90(); + sub_811D104(5); + gUnknown_0203A11C->unk0++; + break; + case 1: + return IsDma3ManagerBusyWithBgCopy(); + } + + return TRUE; +} + +static bool8 sub_811CD94(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811DF90(); + sub_811D104(6); + gUnknown_0203A11C->unk0++; + break; + case 1: + return IsDma3ManagerBusyWithBgCopy(); + } + + return TRUE; +} + +static bool8 sub_811CDD4(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811DF90(); + sub_811D104(7); + gUnknown_0203A11C->unk0++; + break; + case 1: + return IsDma3ManagerBusyWithBgCopy(); + } + + return TRUE; +} + +static bool8 sub_811CE14(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811DF90(); + sub_811D104(8); + gUnknown_0203A11C->unk0++; + break; + case 1: + return IsDma3ManagerBusyWithBgCopy(); + } + + return TRUE; +} + +static bool8 sub_811CE54(void) +{ + switch (gUnknown_0203A11C->unk0) + { + case 0: + sub_811DF90(); + sub_811D104(9); + gUnknown_0203A11C->unk0++; + break; + case 1: + return IsDma3ManagerBusyWithBgCopy(); + } + + return TRUE; +} From b2866fae2126012f7d7b4db8b60e07ba344a5f97 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 22:20:42 -0500 Subject: [PATCH 102/217] Document the weather state functions All weather types are now documented (including WEATHER_15) --- data/event_scripts.s | 8 +-- data/maps/SkyPillar_Outside/scripts.inc | 2 +- data/maps/SootopolisCity/scripts.inc | 4 +- data/specials.inc | 2 +- include/constants/weather.h | 2 +- include/field_weather.h | 10 ++-- src/cable_car.c | 8 +-- src/egg_hatch.c | 2 +- src/field_screen_effect.c | 10 ++-- src/field_specials.c | 5 +- src/field_weather.c | 15 +++--- src/field_weather_effect.c | 71 +++++++++++++------------ src/overworld.c | 2 +- src/start_menu.c | 18 +++---- 14 files changed, 81 insertions(+), 78 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 1b8807ed76..4e7fa16223 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -2031,7 +2031,7 @@ Route130_EventScript_27207A:: @ 827207A Route131_EventScript_27207A:: @ 827207A SkyPillar_Outside_EventScript_27207A:: @ 827207A SootopolisCity_EventScript_27207A:: @ 827207A - setweather 15 + setweather WEATHER_ALTERNATING return DewfordTown_Gym_EventScript_27207E:: @ 827207E @@ -3655,14 +3655,14 @@ Route105_EventScript_273D17:: @ 8273D17 Route125_EventScript_273D17:: @ 8273D17 Route127_EventScript_273D17:: @ 8273D17 Route129_EventScript_273D17:: @ 8273D17 - setweather 13 + setweather WEATHER_RAIN_HEAVY return Route114_EventScript_273D1B:: @ 8273D1B Route115_EventScript_273D1B:: @ 8273D1B Route116_EventScript_273D1B:: @ 8273D1B Route118_EventScript_273D1B:: @ 8273D1B - setweather 12 + setweather WEATHER_DROUGHT return gUnknown_08273D1F:: @ 8273D1F @@ -3677,7 +3677,7 @@ gUnknown_08273D1F:: @ 8273D1F Route105_EventScript_273D31:: @ 8273D31 closemessage fadescreenswapbuffers 1 - setweather 2 + setweather WEATHER_SUNNY doweather call Route105_EventScript_273D6D special DrawWholeMapView diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index eb57d12277..abf8a6730a 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -72,7 +72,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT closemessage setflag FLAG_SYS_WEATHER_CTRL - setweather WEATHER_15 + setweather WEATHER_ALTERNATING doweather special WaitWeather waitstate diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 1cd4611e9e..3ec8ebb808 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -214,7 +214,7 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 special RemoveCameraObject delay 60 fadescreenspeed 1, 8 - setweather WEATHER_15 + setweather WEATHER_ALTERNATING doweather setvar VAR_0x8004, 0 special sub_813B7D8 @@ -314,7 +314,7 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 special RemoveCameraObject delay 60 fadescreenspeed 1, 8 - setweather WEATHER_15 + setweather WEATHER_ALTERNATING doweather setvar VAR_0x8004, 0 special sub_813B7D8 diff --git a/data/specials.inc b/data/specials.inc index cbbd81dc1a..965bef117f 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -503,7 +503,7 @@ gSpecials:: @ 81DBA64 def_special sub_813B374 def_special sub_813B490 def_special sub_80A08CC - def_special sub_813B484 + def_special Unused_SetWeatherSunny def_special sub_81AFDA0 def_special sub_813B4E0 def_special ShouldDoBrailleRegicePuzzle diff --git a/include/constants/weather.h b/include/constants/weather.h index d0a81c34cc..d62e07474a 100644 --- a/include/constants/weather.h +++ b/include/constants/weather.h @@ -16,7 +16,7 @@ #define WEATHER_DROUGHT 12 #define WEATHER_RAIN_HEAVY 13 #define WEATHER_BUBBLES 14 -#define WEATHER_15 15 +#define WEATHER_ALTERNATING 15 #define WEATHER_ROUTE119_CYCLE 20 #define WEATHER_ROUTE123_CYCLE 21 diff --git a/include/field_weather.h b/include/field_weather.h index 2d73f2b949..ced8e255cc 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -140,9 +140,9 @@ extern const u16 gUnknown_083970E8[]; extern const u8 gWeatherFog1Tiles[]; void StartWeather(void); -void ChangeWeather(u8 weather); -void sub_80AB104(u8 weather); -void sub_80AB130(u8 weather); +void SetNextWeather(u8 weather); +void SetCurrentAndNextWeather(u8 weather); +void SetCurrentAndNextWeatherNoDelay(u8 weather); void sub_80ABC48(s8 gammaIndex); void sub_80ABC7C(u8 gammaIndex, u8 gammaTargetIndex, u8 gammaStepDelay); void FadeScreen(u8 mode, s8 delay); @@ -162,7 +162,7 @@ bool8 Weather_UpdateBlend(void); void sub_80AC274(u8 a); u8 GetCurrentWeather(void); void SetRainStrengthFromSoundEffect(u16 soundEffect); -void PlayRainSoundEffect(void); +void PlayRainStoppingSoundEffect(void); u8 IsWeatherChangeComplete(void); void SetWeatherScreenFadeOut(void); void sub_80AC3E4(void); @@ -233,6 +233,6 @@ void SetSav1WeatherFromCurrMapHeader(void); void SetWeather(u32 weather); void DoCurrentWeather(void); void UpdateWeatherPerDay(u16 increment); -void sub_80AEE84(void); +void DoPausedWeather(void); #endif // GUARD_WEATHER_H diff --git a/src/cable_car.c b/src/cable_car.c index 207a0c22d2..420bdd30f6 100755 --- a/src/cable_car.c +++ b/src/cable_car.c @@ -358,7 +358,7 @@ static void CleanupCableCar(void) HideBg(3); sub_8150B6C(0); gSpriteCoordOffsetX = 0; - sub_80AB130(WEATHER_NONE); + SetCurrentAndNextWeatherNoDelay(WEATHER_NONE); for (i = 0; i < 20; i++) gWeatherPtr->sprites.s2.ashSprites[i] = NULL; @@ -394,7 +394,7 @@ static void sub_81503E4(u8 taskId) case 0: if (sCableCar->timer == sCableCar->unk4) { - ChangeWeather(sCableCar->weather); + SetNextWeather(sCableCar->weather); sCableCar->state = 1; } break; @@ -798,7 +798,7 @@ static void LoadCableCarSprites(void) gSprites[spriteId].data[1] = 99; sCableCar->weather = WEATHER_ASH; sCableCar->unk4 = 0x15e; - sub_80AB130(WEATHER_SUNNY); + SetCurrentAndNextWeatherNoDelay(WEATHER_SUNNY); break; case 1: CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x24, 24, 26, 12, 3, 17); @@ -822,7 +822,7 @@ static void LoadCableCarSprites(void) gSprites[spriteId].data[1] = 0x41; sCableCar->weather = WEATHER_SUNNY; sCableCar->unk4 = 0x109; - sub_80AB130(WEATHER_ASH); + SetCurrentAndNextWeatherNoDelay(WEATHER_ASH); break; } for (i = 0; i < 9; i++) diff --git a/src/egg_hatch.c b/src/egg_hatch.c index e1d94889a8..ba10206696 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -574,7 +574,7 @@ static void Task_EggHatchPlayBGM(u8 taskID) if (gTasks[taskID].data[0] == 0) { StopMapMusic(); - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); } if (gTasks[taskID].data[0] == 1) PlayBGM(MUS_ME_SHINKA); diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 93017f1251..0a4f3212b6 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -503,7 +503,7 @@ void DoWarp(void) ScriptContext2_Enable(); TryFadeOutOldMapMusic(); WarpFadeScreen(); - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); PlaySE(SE_KAIDAN); gFieldCallback = mapldr_default; CreateTask(sub_80AFA0C, 10); @@ -514,7 +514,7 @@ void DoDiveWarp(void) ScriptContext2_Enable(); TryFadeOutOldMapMusic(); WarpFadeScreen(); - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); gFieldCallback = mapldr_default; CreateTask(sub_80AFA0C, 10); } @@ -524,7 +524,7 @@ void sub_80AF79C(void) ScriptContext2_Enable(); TryFadeOutOldMapMusic(); FadeScreen(FADE_TO_WHITE, 8); - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); gFieldCallback = sub_80AF3B0; CreateTask(sub_80AFA0C, 10); } @@ -734,7 +734,7 @@ static void sub_80AFA88(u8 taskId) case 4: TryFadeOutOldMapMusic(); WarpFadeScreen(); - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); task->data[0] = 0; task->func = sub_80AFA0C; break; @@ -771,7 +771,7 @@ void sub_80AFC60(void) ScriptContext2_Enable(); TryFadeOutOldMapMusic(); WarpFadeScreen(); - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); PlaySE(SE_KAIDAN); gFieldCallback = sub_80AF3C8; CreateTask(task0A_fade_n_map_maybe, 10); diff --git a/src/field_specials.c b/src/field_specials.c index 3c26085dde..307f813992 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -54,6 +54,7 @@ #include "constants/moves.h" #include "constants/vars.h" #include "constants/battle_frontier.h" +#include "constants/weather.h" EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE; EWRAM_DATA u8 gBikeCollisions = 0; @@ -3527,9 +3528,9 @@ bool8 sub_813B3B0(void) } } -void sub_813B484(void) +void Unused_SetWeatherSunny(void) { - sub_80AB104(2); + SetCurrentAndNextWeather(WEATHER_SUNNY); } bool32 sub_813B490(void) diff --git a/src/field_weather.c b/src/field_weather.c index 0db635c604..9913e9a617 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -186,11 +186,11 @@ void StartWeather(void) } } -void ChangeWeather(u8 weather) +void SetNextWeather(u8 weather) { if (weather != WEATHER_RAIN_LIGHT && weather != WEATHER_RAIN_MED && weather != WEATHER_RAIN_HEAVY) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); } if (gWeatherPtr->nextWeather != weather && gWeatherPtr->currWeather == weather) @@ -203,18 +203,19 @@ void ChangeWeather(u8 weather) gWeatherPtr->finishStep = 0; } -void sub_80AB104(u8 weather) +void SetCurrentAndNextWeather(u8 weather) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); gWeatherPtr->currWeather = weather; gWeatherPtr->nextWeather = weather; } -void sub_80AB130(u8 weather) +void SetCurrentAndNextWeatherNoDelay(u8 weather) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); gWeatherPtr->currWeather = weather; gWeatherPtr->nextWeather = weather; + // Overrides the normal delay during screen fading. gWeatherPtr->readyForInit = TRUE; } @@ -1053,7 +1054,7 @@ void SetRainStrengthFromSoundEffect(u16 soundEffect) } } -void PlayRainSoundEffect(void) +void PlayRainStoppingSoundEffect(void) { if (IsSpecialSEPlaying()) { diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c index 2ec51a7223..b81a8f5d25 100644 --- a/src/field_weather_effect.c +++ b/src/field_weather_effect.c @@ -16,8 +16,8 @@ void sub_80AC6B4(struct Sprite *); // EWRAM -EWRAM_DATA static u8 gUnknown_02038BC4 = 0; -EWRAM_DATA static u16 gUnknown_02038BC6 = 0; +EWRAM_DATA static u8 gCurrentAlternatingWeather = 0; +EWRAM_DATA static u16 gUnusedWeatherRelated = 0; // CONST const u16 gUnknown_0854C290[] = INCBIN_U16("graphics/weather/1.gbapal"); @@ -2286,13 +2286,14 @@ void unc_0807DAB4(struct Sprite *sprite) //------------------------------------------------------------------------------ -static void sub_80AEC94(u32 a0, u32 a1) +// Unused function. +static void UnusedSetCurrentAlternatingWeather(u32 a0, u32 a1) { - gUnknown_02038BC4 = a0; - gUnknown_02038BC6 = a1; + gCurrentAlternatingWeather = a0; + gUnusedWeatherRelated = a1; } -static void sub_80AECA8(u8 taskId) +static void Task_DoAlternatingWeather(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -2301,8 +2302,8 @@ static void sub_80AECA8(u8 taskId) case 0: if (data[15]-- <= 0) { - ChangeWeather(data[1]); - gUnknown_02038BC4 = data[1]; + SetNextWeather(data[1]); + gCurrentAlternatingWeather = data[1]; data[15] = 600; data[0]++; } @@ -2310,8 +2311,8 @@ static void sub_80AECA8(u8 taskId) case 1: if (data[15]-- <= 0) { - ChangeWeather(data[2]); - gUnknown_02038BC4 = data[2]; + SetNextWeather(data[2]); + gCurrentAlternatingWeather = data[2]; data[15] = 600; data[0] = 0; } @@ -2319,25 +2320,25 @@ static void sub_80AECA8(u8 taskId) } } -static void sub_80AED28(void) +static void CreateAlternatingWeatherTask(void) { - u8 taskId = CreateTask(sub_80AECA8, 0); + u8 taskId = CreateTask(Task_DoAlternatingWeather, 0); s16 *data = gTasks[taskId].data; data[15] = 600; - if (gUnknown_02038BC4 == WEATHER_RAIN_HEAVY) + if (gCurrentAlternatingWeather == WEATHER_RAIN_HEAVY) { data[1] = WEATHER_DROUGHT; data[2] = WEATHER_RAIN_HEAVY; } - else if (gUnknown_02038BC4 == WEATHER_DROUGHT) + else if (gCurrentAlternatingWeather == WEATHER_DROUGHT) { data[1] = WEATHER_RAIN_HEAVY; data[2] = WEATHER_DROUGHT; } else { - gUnknown_02038BC4 = WEATHER_RAIN_HEAVY; + gCurrentAlternatingWeather = WEATHER_RAIN_HEAVY; data[1] = WEATHER_DROUGHT; data[2] = WEATHER_RAIN_HEAVY; } @@ -2368,51 +2369,51 @@ void SetSav1WeatherFromCurrMapHeader(void) void SetWeather(u32 weather) { SetSav1Weather(weather); - ChangeWeather(GetSav1Weather()); + SetNextWeather(GetSav1Weather()); } void SetWeather_Unused(u32 weather) { SetSav1Weather(weather); - sub_80AB104(GetSav1Weather()); + SetCurrentAndNextWeather(GetSav1Weather()); } void DoCurrentWeather(void) { u8 weather = GetSav1Weather(); - if (weather == WEATHER_15) + if (weather == WEATHER_ALTERNATING) { - if (!FuncIsActiveTask(sub_80AECA8)) - sub_80AED28(); - weather = gUnknown_02038BC4; + if (!FuncIsActiveTask(Task_DoAlternatingWeather)) + CreateAlternatingWeatherTask(); + weather = gCurrentAlternatingWeather; } else { - if (FuncIsActiveTask(sub_80AECA8)) - DestroyTask(FindTaskIdByFunc(sub_80AECA8)); - gUnknown_02038BC4 = WEATHER_RAIN_HEAVY; + if (FuncIsActiveTask(Task_DoAlternatingWeather)) + DestroyTask(FindTaskIdByFunc(Task_DoAlternatingWeather)); + gCurrentAlternatingWeather = WEATHER_RAIN_HEAVY; } - ChangeWeather(weather); + SetNextWeather(weather); } -void sub_80AEE84(void) +void DoPausedWeather(void) { u8 weather = GetSav1Weather(); - if (weather == WEATHER_15) + if (weather == WEATHER_ALTERNATING) { - if (!FuncIsActiveTask(sub_80AECA8)) - sub_80AED28(); - weather = gUnknown_02038BC4; + if (!FuncIsActiveTask(Task_DoAlternatingWeather)) + CreateAlternatingWeatherTask(); + weather = gCurrentAlternatingWeather; } else { - if (FuncIsActiveTask(sub_80AECA8)) - DestroyTask(FindTaskIdByFunc(sub_80AECA8)); - gUnknown_02038BC4 = WEATHER_RAIN_HEAVY; + if (FuncIsActiveTask(Task_DoAlternatingWeather)) + DestroyTask(FindTaskIdByFunc(Task_DoAlternatingWeather)); + gCurrentAlternatingWeather = WEATHER_RAIN_HEAVY; } - sub_80AB104(weather); + SetCurrentAndNextWeather(weather); } static const u8 sWeatherCycleRoute119[] = @@ -2449,7 +2450,7 @@ static u8 TranslateWeatherNum(u8 weather) case WEATHER_DROUGHT: return WEATHER_DROUGHT; case WEATHER_RAIN_HEAVY: return WEATHER_RAIN_HEAVY; case WEATHER_BUBBLES: return WEATHER_BUBBLES; - case WEATHER_15: return WEATHER_15; + case WEATHER_ALTERNATING: return WEATHER_ALTERNATING; case WEATHER_ROUTE119_CYCLE: return sWeatherCycleRoute119[gSaveBlock1Ptr->weatherCycleStage]; case WEATHER_ROUTE123_CYCLE: return sWeatherCycleRoute123[gSaveBlock1Ptr->weatherCycleStage]; default: return WEATHER_NONE; diff --git a/src/overworld.c b/src/overworld.c index 08fd94c1be..6f973f16be 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -2123,7 +2123,7 @@ static void sub_8086988(u32 a1) FieldEffectActiveListClear(); StartWeather(); - sub_80AEE84(); + DoPausedWeather(); if (!a1) SetUpFieldTasks(); mapheader_run_script_with_tag_x5(); diff --git a/src/start_menu.c b/src/start_menu.c index d5eec76d23..6efd7a04a1 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -91,7 +91,7 @@ extern void sub_80AF688(void); extern void var_800D_set_xB(void); extern void sub_808B864(void); extern void CB2_Pokedex(void); -extern void PlayRainSoundEffect(void); +extern void PlayRainStoppingSoundEffect(void); extern void CB2_PokeNav(void); extern void ScriptUnfreezeEventObjects(void); extern void save_serialize_map(void); @@ -608,7 +608,7 @@ static bool8 StartMenuPokedexCallback(void) if (!gPaletteFade.active) { IncrementGameStat(GAME_STAT_CHECKED_POKEDEX); - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); RemoveExtraStartMenuWindows(); CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_Pokedex); @@ -623,7 +623,7 @@ static bool8 StartMenuPokemonCallback(void) { if (!gPaletteFade.active) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); RemoveExtraStartMenuWindows(); CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_PartyMenuFromStartMenu); // Display party menu @@ -638,7 +638,7 @@ static bool8 StartMenuBagCallback(void) { if (!gPaletteFade.active) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); RemoveExtraStartMenuWindows(); CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_BagMenuFromStartMenu); // Display bag menu @@ -653,7 +653,7 @@ static bool8 StartMenuPokeNavCallback(void) { if (!gPaletteFade.active) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); RemoveExtraStartMenuWindows(); CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_PokeNav); // Display PokeNav @@ -668,7 +668,7 @@ static bool8 StartMenuPlayerNameCallback(void) { if (!gPaletteFade.active) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); RemoveExtraStartMenuWindows(); CleanupOverworldWindowsAndTilemaps(); @@ -699,7 +699,7 @@ static bool8 StartMenuOptionCallback(void) { if (!gPaletteFade.active) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); RemoveExtraStartMenuWindows(); CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_InitOptionMenu); // Display option menu @@ -732,7 +732,7 @@ static bool8 StartMenuLinkModePlayerNameCallback(void) { if (!gPaletteFade.active) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); CleanupOverworldWindowsAndTilemaps(); ShowTrainerCardInLink(gUnknown_03005DB4, CB2_ReturnToFieldWithOpenMenu); @@ -761,7 +761,7 @@ static bool8 StartMenuBattlePyramidBagCallback(void) { if (!gPaletteFade.active) { - PlayRainSoundEffect(); + PlayRainStoppingSoundEffect(); RemoveExtraStartMenuWindows(); CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_PyramidBagMenuFromStartMenu); From 788caa4fe2fcc7bd4673e947f8f30a0a0d3899ef Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 23 Feb 2019 13:34:01 +0100 Subject: [PATCH 103/217] pokenav --- asm/pokenav.s | 1204 +++++++++++--------------------------------- include/graphics.h | 1 + src/pokenav.c | 734 +++++++++++++++++---------- 3 files changed, 763 insertions(+), 1176 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 01ba420aa2..d568f4281f 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,645 +5,9 @@ .text - thumb_func_start sub_81C7CE4 -sub_81C7CE4: @ 81C7CE4 - push {r4,lr} - movs r0, 0 - bl sub_81C763C - ldr r2, [r0, 0x18] - movs r4, 0 - movs r1, 0xDC - strh r1, [r2, 0x20] - ldr r2, [r0, 0x18] - movs r1, 0xC - strh r1, [r2, 0x22] - ldr r2, [r0, 0x18] - ldr r1, =sub_81C7CB4 - str r1, [r2, 0x1C] - adds r2, 0x3E - ldrb r3, [r2] - movs r1, 0x5 - negs r1, r1 - ands r1, r3 - strb r1, [r2] - ldr r3, [r0, 0x18] - ldrb r2, [r3, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - strb r1, [r3, 0x5] - ldr r0, [r0, 0x18] - adds r0, 0x43 - strb r4, [r0] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C7CE4 - thumb_func_start sub_81C7D28 -sub_81C7D28: @ 81C7D28 - push {r4-r7,lr} - mov r7, r8 - push {r7} - movs r0, 0 - bl sub_81C763C - adds r6, r0, 0 - ldr r0, =gUnknown_0861FA64 - bl LoadCompressedSpriteSheet - movs r0, 0x1 - bl AllocSpritePalette - movs r0, 0x2 - bl AllocSpritePalette - movs r5, 0 - ldr r0, =gSprites - mov r8, r0 - movs r7, 0x4 -_081C7D50: - ldr r0, =gUnknown_0861FB2C - movs r1, 0 - movs r2, 0 - movs r3, 0x1 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - lsls r4, r5, 2 - adds r2, r6, 0 - adds r2, 0x1C - adds r2, r4 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - add r0, r8 - str r0, [r2] - adds r0, 0x3E - ldrb r1, [r0] - orrs r1, r7 - strb r1, [r0] - ldr r1, [r2] - lsls r0, r5, 6 - strh r0, [r1, 0x24] - ldr r0, =gUnknown_0861FB44 - movs r1, 0 - movs r2, 0 - movs r3, 0x2 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - adds r2, r6, 0 - adds r2, 0x24 - adds r2, r4 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - add r0, r8 - str r0, [r2] - adds r0, 0x3E - ldrb r1, [r0] - orrs r1, r7 - strb r1, [r0] - ldr r1, [r2] - lsls r0, r5, 5 - strh r0, [r1, 0x24] - ldr r1, [r2] - movs r0, 0x12 - strh r0, [r1, 0x26] - ldr r3, [r2] - ldrh r2, [r3, 0x4] - lsls r1, r2, 22 - lsrs r1, 22 - lsls r0, r5, 3 - adds r0, 0x40 - adds r1, r0 - ldr r4, =0x000003ff - adds r0, r4, 0 - ands r1, r0 - ldr r4, =0xfffffc00 - adds r0, r4, 0 - ands r2, r0 - orrs r2, r1 - strh r2, [r3, 0x4] - adds r5, 0x1 - cmp r5, 0x1 - ble _081C7D50 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C7D28 - thumb_func_start sub_81C7DFC -sub_81C7DFC: @ 81C7DFC - push {lr} - cmp r0, 0x5 - bhi _081C7E08 - bl sub_81C7E58 - b _081C7E0E -_081C7E08: - subs r0, 0x6 - bl sub_81C7F24 -_081C7E0E: - pop {r0} - bx r0 - thumb_func_end sub_81C7DFC - thumb_func_start sub_81C7E14 -sub_81C7E14: @ 81C7E14 - push {r4,r5,lr} - adds r4, r0, 0 - movs r0, 0 - bl sub_81C763C - adds r5, r0, 0 - cmp r4, 0x4 - bne _081C7E30 - movs r0, 0x2 - bl GetSpriteTileStartByTag - ldr r3, [r5, 0x20] - adds r0, 0x20 - b _081C7E3A -_081C7E30: - movs r0, 0x2 - bl GetSpriteTileStartByTag - ldr r3, [r5, 0x20] - adds r0, 0x40 -_081C7E3A: - ldr r2, =0x000003ff - adds r1, r2, 0 - ands r0, r1 - ldrh r2, [r3, 0x4] - ldr r1, =0xfffffc00 - ands r1, r2 - orrs r1, r0 - strh r1, [r3, 0x4] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C7E14 - - thumb_func_start sub_81C7E58 -sub_81C7E58: @ 81C7E58 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - mov r9, r0 - cmp r0, 0x5 - bhi _081C7F16 - movs r0, 0 - bl sub_81C763C - adds r7, r0, 0 - ldr r0, =gUnknown_0861FA6C - mov r1, r9 - lsls r6, r1, 3 - adds r6, r0 - ldrh r4, [r6, 0x6] - ldr r2, [r6] - mov r8, r2 - mov r0, r8 - bl GetDecompressedDataSize - adds r5, r0, 0 - lsls r4, 5 - ldr r0, =gPokenavLeftHeader_Pal - adds r4, r0 - movs r0, 0x1 - bl IndexOfSpritePaletteTag - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 4 - movs r0, 0x80 - lsls r0, 17 - adds r1, r0 - lsrs r1, 16 - adds r0, r4, 0 - movs r2, 0x20 - bl LoadPalette - ldr r4, =gDecompressionBuffer - mov r0, r8 - adds r1, r4, 0 - bl LZ77UnCompWram - movs r0, 0x2 - bl GetSpriteTileStartByTag - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 11 - ldr r2, =0x06010000 - adds r1, r2 - lsls r5, 16 - lsrs r5, 16 - adds r0, r4, 0 - adds r2, r5, 0 - movs r3, 0x1 - bl RequestDma3Copy - movs r0, 0x2 - bl GetSpriteTileStartByTag - ldr r3, [r7, 0x20] - ldrh r1, [r6, 0x4] - adds r0, r1 - ldr r2, =0x000003ff - adds r1, r2, 0 - ands r0, r1 - ldrh r2, [r3, 0x4] - ldr r1, =0xfffffc00 - ands r1, r2 - orrs r1, r0 - strh r1, [r3, 0x4] - mov r0, r9 - subs r0, 0x4 - cmp r0, 0x1 - bhi _081C7F10 - ldr r1, [r7, 0x20] - movs r0, 0x38 - b _081C7F14 - .pool -_081C7F10: - ldr r1, [r7, 0x20] - movs r0, 0x40 -_081C7F14: - strh r0, [r1, 0x24] -_081C7F16: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81C7E58 - - thumb_func_start sub_81C7F24 -sub_81C7F24: @ 81C7F24 - push {r4-r6,lr} - cmp r0, 0x6 - bhi _081C7F8A - ldr r2, =gUnknown_0861FA9C - lsls r1, r0, 3 - adds r0, r2, 0x4 - adds r0, r1, r0 - ldr r4, [r0] - adds r1, r2 - ldr r6, [r1] - adds r0, r6, 0 - bl GetDecompressedDataSize - adds r5, r0, 0 - lsls r4, 5 - ldr r0, =gPokenavLeftHeader_Pal - adds r4, r0 - movs r0, 0x2 - bl IndexOfSpritePaletteTag - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 4 - movs r0, 0x80 - lsls r0, 17 - adds r1, r0 - lsrs r1, 16 - adds r0, r4, 0 - movs r2, 0x20 - bl LoadPalette - ldr r4, =gDecompressionBuffer+0x1000 - adds r0, r6, 0 - adds r1, r4, 0 - bl LZ77UnCompWram - movs r0, 0x2 - bl GetSpriteTileStartByTag - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 11 - ldr r0, =0x06010800 - adds r1, r0 - lsls r5, 16 - lsrs r5, 16 - adds r0, r4, 0 - adds r2, r5, 0 - movs r3, 0x1 - bl RequestDma3Copy -_081C7F8A: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C7F24 - - thumb_func_start sub_81C7FA0 -sub_81C7FA0: @ 81C7FA0 - push {lr} - adds r3, r0, 0 - movs r0, 0x10 - cmp r1, 0 - bne _081C7FAC - movs r0, 0x30 -_081C7FAC: - cmp r3, 0x5 - bhi _081C7FB8 - adds r1, r2, 0 - bl sub_81C803C - b _081C7FBE -_081C7FB8: - adds r1, r2, 0 - bl sub_81C8088 -_081C7FBE: - pop {r0} - bx r0 - thumb_func_end sub_81C7FA0 - - thumb_func_start sub_81C7FC4 -sub_81C7FC4: @ 81C7FC4 - push {lr} - cmp r0, 0x5 - bhi _081C7FD2 - adds r0, r1, 0 - bl sub_81C80D4 - b _081C7FD8 -_081C7FD2: - adds r0, r1, 0 - bl sub_81C8110 -_081C7FD8: - pop {r0} - bx r0 - thumb_func_end sub_81C7FC4 - - thumb_func_start sub_81C7FDC -sub_81C7FDC: @ 81C7FDC - push {r4,lr} - movs r0, 0 - bl sub_81C763C - movs r4, 0x4 - adds r2, r0, 0 - adds r2, 0x1C - movs r3, 0x1 -_081C7FEC: - ldr r1, [r2] - adds r1, 0x3E - ldrb r0, [r1] - orrs r0, r4 - strb r0, [r1] - ldr r1, [r2, 0x8] - adds r1, 0x3E - ldrb r0, [r1] - orrs r0, r4 - strb r0, [r1] - adds r2, 0x4 - subs r3, 0x1 - cmp r3, 0 - bge _081C7FEC - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81C7FDC - - thumb_func_start sub_81C8010 -sub_81C8010: @ 81C8010 - push {lr} - movs r0, 0 - bl sub_81C763C - adds r1, r0, 0 - ldr r0, [r1, 0x1C] - ldr r2, [r0, 0x1C] - ldr r0, =SpriteCallbackDummy - cmp r2, r0 - bne _081C8034 - ldr r0, [r1, 0x24] - ldr r0, [r0, 0x1C] - cmp r0, r2 - bne _081C8034 - movs r0, 0 - b _081C8036 - .pool -_081C8034: - movs r0, 0x1 -_081C8036: - pop {r1} - bx r1 - thumb_func_end sub_81C8010 - - thumb_func_start sub_81C803C -sub_81C803C: @ 81C803C - push {r4-r7,lr} - mov r7, r8 - push {r7} - mov r8, r0 - adds r4, r1, 0 - movs r0, 0 - bl sub_81C763C - cmp r4, 0 - bne _081C8058 - movs r7, 0x60 - negs r7, r7 - movs r6, 0x20 - b _081C805E -_081C8058: - movs r7, 0x80 - lsls r7, 1 - movs r6, 0xA0 -_081C805E: - adds r4, r0, 0 - adds r4, 0x1C - movs r5, 0x1 -_081C8064: - ldr r0, [r4] - mov r1, r8 - strh r1, [r0, 0x22] - ldm r4!, {r0} - adds r1, r7, 0 - adds r2, r6, 0 - movs r3, 0xC - bl sub_81C814C - subs r5, 0x1 - cmp r5, 0 - bge _081C8064 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81C803C - - thumb_func_start sub_81C8088 -sub_81C8088: @ 81C8088 - push {r4-r7,lr} - mov r7, r8 - push {r7} - mov r8, r0 - adds r4, r1, 0 - movs r0, 0 - bl sub_81C763C - cmp r4, 0 - bne _081C80A4 - movs r7, 0x60 - negs r7, r7 - movs r6, 0x10 - b _081C80AA -_081C80A4: - movs r7, 0x80 - lsls r7, 1 - movs r6, 0xC0 -_081C80AA: - adds r4, r0, 0 - adds r4, 0x24 - movs r5, 0x1 -_081C80B0: - ldr r0, [r4] - mov r1, r8 - strh r1, [r0, 0x22] - ldm r4!, {r0} - adds r1, r7, 0 - adds r2, r6, 0 - movs r3, 0xC - bl sub_81C814C - subs r5, 0x1 - cmp r5, 0 - bge _081C80B0 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81C8088 - - thumb_func_start sub_81C80D4 -sub_81C80D4: @ 81C80D4 - push {r4-r7,lr} - adds r4, r0, 0 - movs r0, 0 - bl sub_81C763C - cmp r4, 0 - bne _081C80EA - movs r6, 0x20 - movs r5, 0x60 - negs r5, r5 - b _081C80F0 -_081C80EA: - movs r6, 0xC0 - movs r5, 0x80 - lsls r5, 1 -_081C80F0: - adds r7, r0, 0 - adds r7, 0x1C - movs r4, 0x1 -_081C80F6: - ldm r7!, {r0} - adds r1, r6, 0 - adds r2, r5, 0 - movs r3, 0xC - bl sub_81C814C - subs r4, 0x1 - cmp r4, 0 - bge _081C80F6 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81C80D4 - - thumb_func_start sub_81C8110 -sub_81C8110: @ 81C8110 - push {r4-r7,lr} - adds r4, r0, 0 - movs r0, 0 - bl sub_81C763C - cmp r4, 0 - bne _081C8126 - movs r6, 0x10 - movs r5, 0x60 - negs r5, r5 - b _081C812C -_081C8126: - movs r6, 0xC0 - movs r5, 0x80 - lsls r5, 1 -_081C812C: - adds r7, r0, 0 - adds r7, 0x24 - movs r4, 0x1 -_081C8132: - ldm r7!, {r0} - adds r1, r6, 0 - adds r2, r5, 0 - movs r3, 0xC - bl sub_81C814C - subs r4, 0x1 - cmp r4, 0 - bge _081C8132 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81C8110 - - thumb_func_start sub_81C814C -sub_81C814C: @ 81C814C - push {r4-r6,lr} - adds r4, r0, 0 - adds r0, r1, 0 - adds r6, r2, 0 - adds r5, r3, 0 - strh r0, [r4, 0x20] - lsls r1, r0, 4 - strh r1, [r4, 0x2E] - subs r0, r6, r0 - lsls r0, 4 - adds r1, r5, 0 - bl __divsi3 - strh r0, [r4, 0x30] - strh r5, [r4, 0x32] - strh r6, [r4, 0x3C] - ldr r0, =sub_81C817C - str r0, [r4, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C814C - - thumb_func_start sub_81C817C -sub_81C817C: @ 81C817C - push {lr} - adds r2, r0, 0 - ldrh r1, [r2, 0x32] - movs r3, 0x32 - ldrsh r0, [r2, r3] - cmp r0, 0 - beq _081C81C4 - subs r0, r1, 0x1 - strh r0, [r2, 0x32] - ldrh r0, [r2, 0x30] - ldrh r1, [r2, 0x2E] - adds r0, r1 - strh r0, [r2, 0x2E] - lsls r0, 16 - asrs r0, 20 - strh r0, [r2, 0x20] - adds r0, 0x10 - lsls r0, 16 - movs r1, 0x88 - lsls r1, 17 - cmp r0, r1 - bls _081C81B6 - adds r0, r2, 0 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - b _081C81CC -_081C81B6: - adds r2, 0x3E - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - b _081C81CC -_081C81C4: - ldrh r0, [r2, 0x3C] - strh r0, [r2, 0x20] - ldr r0, =SpriteCallbackDummy - str r0, [r2, 0x1C] -_081C81CC: - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C817C thumb_func_start sub_81C81D4 sub_81C81D4: @ 81C81D4 @@ -653,7 +17,7 @@ sub_81C81D4: @ 81C81D4 adds r7, r2, 0 ldr r1, =0x000008a4 movs r0, 0x11 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081C821C @@ -696,13 +60,13 @@ sub_81C8224: @ 81C8224 sub_81C8234: @ 81C8234 push {r4,lr} movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81C8FE0 ldrb r0, [r4, 0x8] bl RemoveWindow movs r0, 0x11 - bl sub_81C7650 + bl FreeSubstruct pop {r4} pop {r0} bx r0 @@ -717,7 +81,7 @@ sub_81C8254: @ 81C8254 cmp r0, 0 bne _081C82C0 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r2, r0, 0 cmp r4, 0x4 bhi _081C82D6 @@ -921,7 +285,7 @@ sub_81C83F0: @ 81C83F0 sub sp, 0xC adds r6, r0, 0 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 cmp r6, 0 beq _081C8408 @@ -1014,7 +378,7 @@ _081C849C: sub_81C84A4: @ 81C84A4 push {lr} movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x00000888 adds r0, r1 ldrh r1, [r0] @@ -1030,7 +394,7 @@ sub_81C84A4: @ 81C84A4 sub_81C84C0: @ 81C84C0 push {lr} movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x00000888 adds r0, r1 movs r3, 0 @@ -1055,7 +419,7 @@ sub_81C84E8: @ 81C84E8 adds r6, r0, 0 adds r4, r1, 0 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r7, r0, 0 ldr r0, =0x00000888 adds r5, r7, r0 @@ -1149,7 +513,7 @@ sub_81C85A0: @ 81C85A0 push {r4-r6,lr} adds r5, r0, 0 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 cmp r5, 0 beq _081C85B8 @@ -1228,7 +592,7 @@ _081C862A: sub_81C8630: @ 81C8630 push {lr} movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x28] bl sub_81C70D8 pop {r1} @@ -1239,7 +603,7 @@ sub_81C8630: @ 81C8630 sub_81C8644: @ 81C8644 push {lr} movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x00000888 adds r0, r1 pop {r1} @@ -1423,7 +787,7 @@ sub_81C8770: @ 81C8770 sub_81C877C: @ 81C877C push {r4,lr} movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldr r0, =0x0000089c adds r1, r4, r0 @@ -1449,7 +813,7 @@ sub_81C87AC: @ 81C87AC lsls r4, 16 lsrs r4, 16 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r0, =0x00000888 adds r1, r5, r0 @@ -1477,7 +841,7 @@ sub_81C87AC: @ 81C87AC sub_81C87F0: @ 81C87F0 push {r4,lr} movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldr r0, =0x0000089c adds r1, r4, r0 @@ -1500,7 +864,7 @@ sub_81C87F0: @ 81C87F0 sub_81C8820: @ 81C8820 push {lr} movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr movs r1, 0x8A lsls r1, 4 adds r0, r1 @@ -1514,7 +878,7 @@ sub_81C8820: @ 81C8820 sub_81C8838: @ 81C8838 push {r4,lr} movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldr r0, =0x00000888 adds r2, r4, r0 @@ -1542,7 +906,7 @@ sub_81C8870: @ 81C8870 push {r4,r5,lr} adds r5, r0, 0 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 cmp r5, 0x4 bhi _081C894C @@ -1651,7 +1015,7 @@ sub_81C8958: @ 81C8958 push {r4,r5,lr} adds r5, r0, 0 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 @@ -1753,7 +1117,7 @@ sub_81C8A28: @ 81C8A28 cmp r0, 0 bne _081C8AA6 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldr r0, =0x00000888 adds r6, r4, r0 @@ -2525,7 +1889,7 @@ sub_81C9080: @ 81C9080 push {r4,lr} adds r4, r0, 0 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x0000088e adds r0, r1 ldrh r0, [r0] @@ -2637,7 +2001,7 @@ sub_81C9148: @ 81C9148 push {r4,lr} adds r4, r0, 0 movs r0, 0x11 - bl sub_81C763C + bl GetSubstructPtr ldr r1, [r0, 0x40] strh r4, [r1, 0x3C] ldr r0, [r0, 0x44] @@ -2812,7 +2176,7 @@ sub_81C9298: @ 81C9298 push {r4,lr} movs r0, 0x1 movs r1, 0x10 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081C92C4 @@ -2841,7 +2205,7 @@ sub_81C92CC: @ 81C92CC push {r4,lr} movs r0, 0x1 movs r1, 0x10 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081C92FA @@ -2871,7 +2235,7 @@ sub_81C9304: @ 81C9304 push {r4,lr} movs r0, 0x1 movs r1, 0x10 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081C932E @@ -2899,7 +2263,7 @@ sub_81C9338: @ 81C9338 push {lr} movs r0, 0x1 movs r1, 0x10 - bl sub_81C761C + bl AllocSubstruct adds r2, r0, 0 cmp r2, 0 beq _081C9360 @@ -2926,7 +2290,7 @@ sub_81C9368: @ 81C9368 push {r4,r5,lr} movs r0, 0x1 movs r1, 0x10 - bl sub_81C761C + bl AllocSubstruct adds r5, r0, 0 cmp r5, 0 beq _081C9394 @@ -2972,7 +2336,7 @@ _081C93B4: .4byte _081C93DC _081C93C8: movs r0, 0 - bl sub_81C7688 + bl SetPokenavMode _081C93CE: bl sub_81C93EC b _081C93DE @@ -2994,7 +2358,7 @@ _081C93E0: thumb_func_start sub_81C93EC sub_81C93EC: @ 81C93EC push {lr} - bl sub_81C767C + bl GetPokenavMode cmp r0, 0x1 beq _081C9408 cmp r0, 0x1 @@ -3021,7 +2385,7 @@ _081C9412: sub_81C941C: @ 81C941C push {lr} movs r0, 0x1 - bl sub_81C763C + bl GetSubstructPtr ldr r1, [r0, 0xC] bl _call_via_r1 pop {r1} @@ -3032,7 +2396,7 @@ sub_81C941C: @ 81C941C sub_81C9430: @ 81C9430 push {lr} movs r0, 0x1 - bl sub_81C7650 + bl FreeSubstruct pop {r0} bx r0 thumb_func_end sub_81C9430 @@ -3113,7 +2477,7 @@ _081C94D4: b _081C94EE .pool _081C94E0: - bl sub_81C76B8 + bl CanViewRibbonsMenu cmp r0, 0 beq _081C94FC movs r0, 0x9 @@ -3601,7 +2965,7 @@ _081C988E: sub_81C9894: @ 81C9894 push {lr} movs r0, 0x1 - bl sub_81C763C + bl GetSubstructPtr ldrh r0, [r0] pop {r1} bx r1 @@ -3611,7 +2975,7 @@ sub_81C9894: @ 81C9894 sub_81C98A4: @ 81C98A4 push {lr} movs r0, 0x1 - bl sub_81C763C + bl GetSubstructPtr movs r1, 0x2 ldrsh r0, [r0, r1] pop {r1} @@ -3622,7 +2986,7 @@ sub_81C98A4: @ 81C98A4 sub_81C98B4: @ 81C98B4 push {lr} movs r0, 0x1 - bl sub_81C763C + bl GetSubstructPtr ldrh r0, [r0, 0x4] pop {r1} bx r1 @@ -3632,7 +2996,7 @@ sub_81C98B4: @ 81C98B4 sub_81C98C4: @ 81C98C4 push {lr} movs r0, 0x1 - bl sub_81C763C + bl GetSubstructPtr ldrh r0, [r0, 0x6] pop {r1} bx r1 @@ -3717,7 +3081,7 @@ sub_81C9958: @ 81C9958 push {r4,lr} ldr r1, =0x0000088c movs r0, 0x2 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081C997A @@ -3742,7 +3106,7 @@ sub_81C9990: @ 81C9990 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r0, =gUnknown_086201A0 lsls r4, 2 @@ -3763,7 +3127,7 @@ sub_81C9990: @ 81C9990 sub_81C99C0: @ 81C99C0 push {lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0] bl _call_via_r0 pop {r1} @@ -3774,7 +3138,7 @@ sub_81C99C0: @ 81C99C0 sub_81C99D4: @ 81C99D4 push {r4,lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81CA7F4 ldrb r0, [r4, 0x8] @@ -3782,7 +3146,7 @@ sub_81C99D4: @ 81C99D4 bl sub_81C9FEC bl sub_81CA994 movs r0, 0x2 - bl sub_81C7650 + bl FreeSubstruct pop {r4} pop {r0} bx r0 @@ -3792,7 +3156,7 @@ sub_81C99D4: @ 81C99D4 sub_81C99FC: @ 81C99FC push {lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x4] bl sub_81C70D8 pop {r1} @@ -3805,7 +3169,7 @@ sub_81C9A10: @ 81C9A10 sub sp, 0x4 adds r4, r0, 0 movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x9 bls _081C9A24 @@ -3832,7 +3196,7 @@ _081C9A34: _081C9A5C: ldr r0, =gUnknown_08620194 movs r1, 0x3 - bl sub_81C7B54 + bl InitBgTemplates ldr r1, =gPokenavMessageBox_Gfx movs r0, 0 str r0, [sp] @@ -4428,7 +3792,7 @@ _081C9F42: movs r0, 0 b _081C9FBE _081C9F52: - bl sub_81C7BE8 + bl IsDma3ManagerBusyWithBgCopy_ cmp r0, 0 bne _081C9FB8 bl sub_81C7880 @@ -4532,7 +3896,7 @@ sub_81CA02C: @ 81CA02C mov r7, r8 push {r7} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr movs r2, 0 adds r0, 0x2C mov r8, r0 @@ -4582,7 +3946,7 @@ _081CA054: sub_81CA094: @ 81CA094 push {r4-r7,lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr movs r1, 0 adds r7, r0, 0 adds r7, 0x2C @@ -4638,7 +4002,7 @@ sub_81CA0EC: @ 81CA0EC str r1, [sp, 0x14] str r2, [sp] movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr mov r10, r0 movs r0, 0x3 bl GetSpriteTileStartByTag @@ -4778,7 +4142,7 @@ sub_81CA20C: @ 81CA20C mov r7, r8 push {r7} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r6, r0, 0 bl sub_81C98A4 mov r8, r0 @@ -4833,7 +4197,7 @@ _081CA264: sub_81CA278: @ 81CA278 push {r4,r5,lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81C98A4 adds r3, r0, 0 @@ -4886,7 +4250,7 @@ _081CA2B2: sub_81CA2DC: @ 81CA2DC push {r4-r6,lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r6, r0, 0 movs r5, 0 adds r4, r6, 0 @@ -4926,7 +4290,7 @@ _081CA316: sub_81CA324: @ 81CA324 push {r4,lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r3, r0, 0 movs r2, 0 ldr r4, =SpriteCallbackDummy @@ -5008,7 +4372,7 @@ sub_81CA3B4: @ 81CA3B4 push {r7} adds r4, r0, 0 movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r7, r0, 0 movs r5, 0 mov r8, r5 @@ -5321,7 +4685,7 @@ _081CA5F6: cmp r0, 0xC bne _081CA638 movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr ldrb r1, [r0, 0xC] subs r1, 0x1 strb r1, [r0, 0xC] @@ -5345,7 +4709,7 @@ _081CA638: sub_81CA640: @ 81CA640 push {r4,lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldr r0, =gUnknown_0862036C movs r1, 0x10 @@ -5385,7 +4749,7 @@ _081CA690: sub_81CA698: @ 81CA698 push {lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x28] bl DestroySprite pop {r0} @@ -5426,7 +4790,7 @@ _081CA6DA: sub_81CA6E0: @ 81CA6E0 push {r4,lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldr r0, =gUnknown_086202CC bl AddWindow @@ -5451,7 +4815,7 @@ sub_81CA714: @ 81CA714 push {r4-r6,lr} sub sp, 0xC movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 bl sub_81C98B4 ldr r1, =gUnknown_086202D4 @@ -5493,7 +4857,7 @@ sub_81CA770: @ 81CA770 push {r4-r6,lr} sub sp, 0xC movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r6, =gText_NoRibbonWinners movs r2, 0x1 @@ -5540,7 +4904,7 @@ sub_81CA7C4: @ 81CA7C4 sub_81CA7D4: @ 81CA7D4 push {r4,lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldr r0, =sub_81CA808 movs r1, 0x2 @@ -5556,7 +4920,7 @@ sub_81CA7D4: @ 81CA7D4 sub_81CA7F4: @ 81CA7F4 push {lr} movs r0, 0x2 - bl sub_81C763C + bl GetSubstructPtr ldrb r0, [r0, 0xA] bl DestroyTask pop {r0} @@ -5738,7 +5102,7 @@ titlescreen_0: @ 81CA92C ldr r2, [r2, 0x8] bl ScanlineEffect_SetParams ldr r0, =sub_81CA914 - bl IndirectSetVBlankCallback + bl SetVBlankCallback_ ldr r0, =sub_81CA9EC movs r1, 0x3 bl CreateTask @@ -5763,7 +5127,7 @@ sub_81CA994: @ 81CA994 lsls r0, 24 lsrs r0, 24 bl DestroyTask - bl sub_81C760C + bl SetPokenavVBlankCallback pop {r0} bx r0 .pool @@ -5913,7 +5277,7 @@ sub_81CAAE8: @ 81CAAE8 movs r1, 0xD4 lsls r1, 1 movs r0, 0x5 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CAB1C @@ -5941,7 +5305,7 @@ _081CAB1E: sub_81CAB24: @ 81CAB24 push {lr} movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr ldr r1, [r0, 0x18] bl _call_via_r1 pop {r1} @@ -5952,7 +5316,7 @@ sub_81CAB24: @ 81CAB24 sub_81CAB38: @ 81CAB38 push {lr} movs r0, 0x5 - bl sub_81C7650 + bl FreeSubstruct pop {r0} bx r0 thumb_func_end sub_81CAB38 @@ -6033,7 +5397,7 @@ _081CABD0: ands r0, r1 cmp r0, 0 beq _081CABF2 - bl sub_81C767C + bl GetPokenavMode cmp r0, 0x1 beq _081CABEC ldr r0, =sub_81CABFC @@ -6112,11 +5476,11 @@ _081CAC5E: bne _081CAC98 b _081CACA6 _081CAC64: - bl sub_81C767C + bl GetPokenavMode cmp r0, 0x1 bne _081CAC72 movs r0, 0x2 - bl sub_81C7688 + bl SetPokenavMode _081CAC72: ldr r0, =sub_81CACF8 str r0, [r4, 0x18] @@ -6220,7 +5584,7 @@ sub_81CAD20: @ 81CAD20 push {r4-r7,lr} adds r5, r0, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 cmp r5, 0x1 beq _081CAD4C @@ -6367,7 +5731,7 @@ _081CAE24: sub_81CAE28: @ 81CAE28 push {lr} movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x10] pop {r1} bx r1 @@ -6377,7 +5741,7 @@ sub_81CAE28: @ 81CAE28 sub_81CAE38: @ 81CAE38 push {lr} movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr ldrh r0, [r0, 0xA] pop {r1} bx r1 @@ -6387,7 +5751,7 @@ sub_81CAE38: @ 81CAE38 sub_81CAE48: @ 81CAE48 push {lr} movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr ldrh r0, [r0, 0xC] pop {r1} bx r1 @@ -6397,7 +5761,7 @@ sub_81CAE48: @ 81CAE48 sub_81CAE58: @ 81CAE58 push {lr} movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr adds r1, r0, 0 ldrh r0, [r1, 0xA] ldrh r1, [r1, 0xC] @@ -6411,7 +5775,7 @@ sub_81CAE6C: @ 81CAE6C push {r4,lr} adds r4, r0, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr adds r1, r0, 0 ldrh r0, [r1, 0xC] adds r4, r0 @@ -6434,7 +5798,7 @@ _081CAE8C: sub_81CAE94: @ 81CAE94 push {lr} movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr adds r0, 0x1C pop {r1} bx r1 @@ -6445,7 +5809,7 @@ sub_81CAEA4: @ 81CAEA4 push {r4,lr} adds r4, r0, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr lsls r4, 2 adds r0, r4 ldrb r0, [r0, 0x1D] @@ -6459,7 +5823,7 @@ sub_81CAEBC: @ 81CAEBC push {r4,lr} adds r4, r0, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr lsls r1, r4, 2 adds r1, r0, r1 ldrb r0, [r1, 0x1C] @@ -6498,7 +5862,7 @@ sub_81CAF04: @ 81CAF04 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr lsls r1, r4, 2 adds r1, r0, r1 ldrb r0, [r1, 0x1C] @@ -6553,7 +5917,7 @@ sub_81CAF78: @ 81CAF78 adds r5, r0, 0 adds r6, r1, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 movs r0, 0 strb r0, [r6] @@ -6598,7 +5962,7 @@ sub_81CAFD8: @ 81CAFD8 adds r4, r0, 0 adds r5, r1, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr lsls r4, 2 adds r4, r0, r4 ldrb r0, [r4, 0x1C] @@ -6633,7 +5997,7 @@ _081CB012: sub_81CB01C: @ 81CB01C push {lr} movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr ldrh r0, [r0] pop {r1} bx r1 @@ -6644,7 +6008,7 @@ sub_81CB02C: @ 81CB02C push {r4,lr} adds r4, r0, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr adds r1, r0, 0 ldrh r0, [r1, 0x2] cmp r0, r4 @@ -6742,7 +6106,7 @@ sub_81CB0E4: @ 81CB0E4 push {r4-r7,lr} adds r5, r0, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr adds r7, r0, 0 movs r6, 0x1 adds r5, 0x1 @@ -6783,7 +6147,7 @@ sub_81CB128: @ 81CB128 push {r4-r6,lr} adds r5, r0, 0 movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr adds r1, r0, 0 movs r6, 0x1 negs r6, r6 @@ -6874,7 +6238,7 @@ _081CB1C8: sub_81CB1D0: @ 81CB1D0 push {r4,lr} movs r0, 0x5 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81C875C adds r1, r0, 0 @@ -6940,7 +6304,7 @@ sub_81CB260: @ 81CB260 push {r4,lr} ldr r1, =0x00002048 movs r0, 0x6 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CB294 @@ -6968,7 +6332,7 @@ sub_81CB29C: @ 81CB29C push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r0, =gUnknown_08622798 lsls r4, 2 @@ -6989,7 +6353,7 @@ sub_81CB29C: @ 81CB29C sub_81CB2CC: @ 81CB2CC push {lr} movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0] bl _call_via_r0 pop {r1} @@ -7000,7 +6364,7 @@ sub_81CB2CC: @ 81CB2CC sub_81CB2E0: @ 81CB2E0 push {r4,lr} movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81CC2B4 bl sub_81CBC1C @@ -7011,7 +6375,7 @@ sub_81CB2E0: @ 81CB2E0 ldrb r0, [r4, 0x14] bl RemoveWindow movs r0, 0x6 - bl sub_81C7650 + bl FreeSubstruct pop {r4} pop {r0} bx r0 @@ -7021,7 +6385,7 @@ sub_81CB2E0: @ 81CB2E0 sub_81CB310: @ 81CB310 push {lr} movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x4] bl sub_81C70D8 pop {r1} @@ -7034,7 +6398,7 @@ sub_81CB324: @ 81CB324 sub sp, 0x8 adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x7 bls _081CB338 @@ -7059,7 +6423,7 @@ _081CB348: _081CB368: ldr r0, =gUnknown_0862278C movs r1, 0x3 - bl sub_81C7B54 + bl InitBgTemplates movs r0, 0x2 movs r1, 0 movs r2, 0 @@ -7234,7 +6598,7 @@ sub_81CB510: @ 81CB510 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CB55E @@ -7303,7 +6667,7 @@ sub_81CB588: @ 81CB588 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CB5D6 @@ -7372,7 +6736,7 @@ sub_81CB600: @ 81CB600 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CB64E @@ -7441,7 +6805,7 @@ sub_81CB678: @ 81CB678 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CB6C6 @@ -7510,7 +6874,7 @@ sub_81CB6F0: @ 81CB6F0 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0 beq _081CB706 @@ -7547,7 +6911,7 @@ sub_81CB734: @ 81CB734 movs r0, 0x5 bl PlaySE movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81CB01C adds r1, r0, 0 @@ -7566,7 +6930,7 @@ sub_81CB75C: @ 81CB75C push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0 beq _081CB772 @@ -7602,7 +6966,7 @@ sub_81CB7A0: @ 81CB7A0 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CB7D4 @@ -7668,7 +7032,7 @@ sub_81CB824: @ 81CB824 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CB85E @@ -7722,7 +7086,7 @@ sub_81CB888: @ 81CB888 push {r4-r6,lr} adds r5, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 movs r6, 0 cmp r5, 0x6 @@ -7780,7 +7144,7 @@ _081CB904: bl sub_81C7BA4 b _081CB934 _081CB90C: - bl sub_81C7BE8 + bl IsDma3ManagerBusyWithBgCopy_ cmp r0, 0 bne _081CB8EC ldrb r0, [r4, 0xF] @@ -7810,7 +7174,7 @@ sub_81CB93C: @ 81CB93C push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CB974 @@ -7860,7 +7224,7 @@ _081CB9A0: bl sub_81CC42C cmp r0, 0 bne _081CB9BA - bl sub_81C7BE8 + bl IsDma3ManagerBusyWithBgCopy_ cmp r0, 0 beq _081CB9BE _081CB9BA: @@ -7879,7 +7243,7 @@ sub_81CB9C8: @ 81CB9C8 push {r4,r5,lr} adds r5, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 cmp r5, 0x4 bhi _081CBA60 @@ -7955,7 +7319,7 @@ sub_81CBA68: @ 81CBA68 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CBA9C @@ -8011,7 +7375,7 @@ sub_81CBAD4: @ 81CBAD4 push {r4,r5,lr} adds r5, r0, 0 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 cmp r5, 0x4 bhi _081CBB6C @@ -8933,7 +8297,7 @@ sub_81CC214: @ 81CC214 push {r4-r6,lr} sub sp, 0x8 movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r6, r0, 0 movs r5, 0 ldr r4, =gUnknown_08622810 @@ -8998,7 +8362,7 @@ _081CC224: sub_81CC2B4: @ 81CC2B4 push {r4,lr} movs r0, 0x6 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldr r0, [r4, 0x1C] cmp r0, 0 @@ -9279,13 +8643,13 @@ sub_81CC4D4: @ 81CC4D4 push {r4,lr} movs r0, 0x3 movs r1, 0x14 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CC4F0 ldr r1, =0x00000884 movs r0, 0x10 - bl sub_81C761C + bl AllocSubstruct cmp r0, 0 bne _081CC4F8 _081CC4F0: @@ -9330,9 +8694,9 @@ sub_81CC524: @ 81CC524 orrs r0, r1 strb r0, [r3, 0x15] movs r0, 0x10 - bl sub_81C7650 + bl FreeSubstruct movs r0, 0x3 - bl sub_81C7650 + bl FreeSubstruct pop {r0} bx r0 .pool @@ -9342,7 +8706,7 @@ sub_81CC524: @ 81CC524 sub_81CC554: @ 81CC554 push {lr} movs r0, 0x3 - bl sub_81C763C + bl GetSubstructPtr ldr r1, [r0, 0x10] bl _call_via_r1 pop {r1} @@ -9428,7 +8792,7 @@ sub_81CC5DC: @ 81CC5DC sub_81CC5E4: @ 81CC5E4 push {lr} movs r0, 0x3 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0xC] pop {r1} bx r1 @@ -9439,7 +8803,7 @@ sub_81CC5F4: @ 81CC5F4 push {r4,lr} ldr r1, =0x00001948 movs r0, 0x4 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CC624 @@ -9465,7 +8829,7 @@ sub_81CC62C: @ 81CC62C push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r0, =gUnknown_086230E4 lsls r4, 2 @@ -9486,7 +8850,7 @@ sub_81CC62C: @ 81CC62C sub_81CC65C: @ 81CC65C push {lr} movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0] bl _call_via_r0 pop {r1} @@ -9497,17 +8861,17 @@ sub_81CC65C: @ 81CC65C sub_81CC670: @ 81CC670 push {r4,lr} movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl FreeRegionMapIconResources bl sub_81CC9EC ldrb r0, [r4, 0x8] bl RemoveWindow movs r0, 0x10 - bl sub_81C7650 + bl FreeSubstruct movs r0, 0x4 - bl sub_81C7650 - bl sub_81C760C + bl FreeSubstruct + bl SetPokenavVBlankCallback movs r0, 0 bl SetBgMode pop {r4} @@ -9530,7 +8894,7 @@ sub_81CC6A4: @ 81CC6A4 sub_81CC6BC: @ 81CC6BC push {lr} movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x4] bl sub_81C70D8 pop {r1} @@ -9563,7 +8927,7 @@ sub_81CC6F4: @ 81CC6F4 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x7 bls _081CC706 @@ -9587,7 +8951,7 @@ _081CC714: .4byte _081CC82A _081CC734: movs r0, 0 - bl IndirectSetVBlankCallback + bl SetVBlankCallback_ movs r0, 0x1 bl HideBg movs r0, 0x2 @@ -9599,9 +8963,9 @@ _081CC734: ldr r4, =gUnknown_086230D8 adds r0, r4, 0 movs r1, 0x2 - bl sub_81C7B54 + bl InitBgTemplates movs r0, 0x10 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 adds r4, 0x4 bl sub_81CC6D0 @@ -9667,7 +9031,7 @@ _081CC7E2: movs r0, 0x2 bl ShowBg ldr r0, =sub_81CC6A4 - bl IndirectSetVBlankCallback + bl SetVBlankCallback_ b _081CC77C .pool _081CC804: @@ -9710,7 +9074,7 @@ sub_81CC848: @ 81CC848 push {r4,lr} adds r4, r0, 0 movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr cmp r4, 0 beq _081CC85C cmp r4, 0x1 @@ -9769,7 +9133,7 @@ _081CC8A2: movs r0, 0 b _081CC8D2 _081CC8BE: - bl sub_81C7BE8 + bl IsDma3ManagerBusyWithBgCopy_ cmp r0, 0 beq _081CC8CA _081CC8C6: @@ -9790,7 +9154,7 @@ sub_81CC8D8: @ 81CC8D8 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CC90C @@ -9835,7 +9199,7 @@ _081CC924: movs r0, 0 b _081CC954 _081CC940: - bl sub_81C7BE8 + bl IsDma3ManagerBusyWithBgCopy_ cmp r0, 0 beq _081CC94C _081CC948: @@ -9929,7 +9293,7 @@ _081CC9C6: sub_81CC9EC: @ 81CC9EC push {r4,r5,lr} movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 movs r0, 0x6 bl FreeSpriteTilesByTag @@ -10055,7 +9419,7 @@ sub_81CCB0C: @ 81CCB0C sub sp, 0xC adds r4, r0, 0 movs r0, 0x10 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldrb r0, [r5, 0x2] cmp r0, 0x4 @@ -10318,7 +9682,7 @@ sub_81CCD34: @ 81CCD34 push {r4,lr} adds r4, r0, 0 movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr adds r2, r0, 0 cmp r4, 0x15 ble _081CCD48 @@ -10467,7 +9831,7 @@ sub_81CCE58: @ 81CCE58 mov r7, r8 push {r7} movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_8124658 lsls r0, 24 @@ -10612,7 +9976,7 @@ _081CCF70: sub_81CCF78: @ 81CCF78 push {r4,lr} movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 movs r0, 0x1 bl GetBgY @@ -10637,7 +10001,7 @@ sub_81CCFA4: @ 81CCFA4 push {r4-r6,lr} adds r4, r0, 0 movs r0, 0x4 - bl sub_81C763C + bl GetSubstructPtr movs r1, 0x1 ands r4, r1 lsls r5, r4, 2 @@ -10667,7 +10031,7 @@ sub_81CCFD8: @ 81CCFD8 push {r4,lr} ldr r1, =0x0000678c movs r0, 0xB - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CD01C @@ -10698,7 +10062,7 @@ sub_81CD024: @ 81CD024 push {r4,lr} ldr r1, =0x0000678c movs r0, 0xB - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CD068 @@ -10728,7 +10092,7 @@ _081CD06A: sub_81CD070: @ 81CD070 push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr ldr r2, =0x00006304 adds r1, r0, r2 ldr r1, [r1] @@ -10743,7 +10107,7 @@ sub_81CD08C: @ 81CD08C push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 adds r0, r4, 0 bl sub_81CD1E4 @@ -10818,7 +10182,7 @@ sub_81CD110: @ 81CD110 adds r1, r4, r1 strb r0, [r1] movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr ldrh r1, [r0, 0x2] lsls r1, 2 adds r0, r1 @@ -10886,7 +10250,7 @@ _081CD1B6: sub_81CD1C0: @ 81CD1C0 push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr movs r1, 0xC6 lsls r1, 7 adds r0, r1 @@ -10894,10 +10258,10 @@ sub_81CD1C0: @ 81CD1C0 cmp r0, 0 bne _081CD1DA movs r0, 0x12 - bl sub_81C7650 + bl FreeSubstruct _081CD1DA: movs r0, 0xB - bl sub_81C7650 + bl FreeSubstruct pop {r0} bx r0 thumb_func_end sub_81CD1C0 @@ -10907,7 +10271,7 @@ sub_81CD1E4: @ 81CD1E4 push {r4,lr} adds r4, r0, 0 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr adds r2, r0, 0 movs r3, 0 ldr r0, =gMain @@ -10971,10 +10335,10 @@ sub_81CD258: @ 81CD258 lsrs r0, 24 mov r8, r0 movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 mov r0, r8 cmp r0, 0 @@ -11141,10 +10505,10 @@ _081CD3BA: sub_81CD3C4: @ 81CD3C4 push {r4,lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr adds r2, r0, 0 ldr r1, =0x0000678a adds r0, r4, r1 @@ -11329,7 +10693,7 @@ sub_81CD548: @ 81CD548 lsrs r4, r0, 24 adds r5, r4, 0 movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr adds r1, r0, 0 cmp r4, 0x1 beq _081CD588 @@ -11449,7 +10813,7 @@ sub_81CD624: @ 81CD624 lsrs r2, 24 mov r10, r2 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr lsls r4, 2 adds r0, r4 ldrb r4, [r0, 0x4] @@ -11697,10 +11061,10 @@ sub_81CD824: @ 81CD824 lsls r1, 24 lsrs r6, r1, 24 movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr adds r7, r0, 0 mov r1, r8 lsls r0, r1, 16 @@ -11841,11 +11205,11 @@ _081CD95C: sub_81CD970: @ 81CD970 push {r4-r7,lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr adds r7, r0, 0 ldr r1, =0x000006ac movs r0, 0x12 - bl sub_81C761C + bl AllocSubstruct adds r6, r0, 0 movs r0, 0xC6 lsls r0, 7 @@ -11908,7 +11272,7 @@ _081CD9C4: sub_81CD9F8: @ 81CD9F8 push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr movs r1, 0xC6 lsls r1, 7 adds r2, r0, r1 @@ -11935,10 +11299,10 @@ sub_81CDA1C: @ 81CDA1C lsrs r1, 24 mov r9, r1 movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr mov r8, r0 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 lsls r0, r6, 16 asrs r5, r0, 16 @@ -12107,10 +11471,10 @@ sub_81CDB98: @ 81CDB98 lsrs r1, 24 mov r9, r1 movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr adds r7, r0, 0 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 lsls r0, r6, 16 asrs r5, r0, 16 @@ -12187,7 +11551,7 @@ _081CDC3E: sub_81CDC50: @ 81CDC50 push {lr} movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr ldrh r0, [r0] pop {r1} bx r1 @@ -12197,7 +11561,7 @@ sub_81CDC50: @ 81CDC50 sub_81CDC60: @ 81CDC60 push {lr} movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr ldrh r0, [r0, 0x2] pop {r1} bx r1 @@ -12207,7 +11571,7 @@ sub_81CDC60: @ 81CDC60 sub_81CDC70: @ 81CDC70 push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x00006428 adds r0, r1 pop {r1} @@ -12219,7 +11583,7 @@ sub_81CDC70: @ 81CDC70 sub_81CDC84: @ 81CDC84 push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x00006786 adds r0, r1 ldrb r0, [r0] @@ -12232,7 +11596,7 @@ sub_81CDC84: @ 81CDC84 sub_81CDC9C: @ 81CDC9C push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x00006302 adds r0, r1 ldrb r0, [r0] @@ -12248,7 +11612,7 @@ sub_81CDCB4: @ 81CDCB4 lsls r4, 24 lsrs r4, 24 movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr lsls r4, 13 movs r1, 0xC0 lsls r1, 2 @@ -12266,7 +11630,7 @@ sub_81CDCD4: @ 81CDCD4 lsls r4, 24 lsrs r4, 24 movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr lsls r4, 7 adds r0, r4 pop {r4} @@ -12278,7 +11642,7 @@ sub_81CDCD4: @ 81CDCD4 sub_81CDCEC: @ 81CDCEC push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x00006789 adds r0, r1 ldrb r0, [r0] @@ -12294,7 +11658,7 @@ sub_81CDD04: @ 81CDD04 lsls r4, 24 lsrs r4, 24 movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr lsls r4, 6 ldr r1, =0x00006368 adds r4, r1 @@ -12312,7 +11676,7 @@ sub_81CDD24: @ 81CDD24 lsls r4, 24 lsrs r4, 24 movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr lsls r1, r4, 1 adds r1, r4 lsls r1, 3 @@ -12329,7 +11693,7 @@ sub_81CDD24: @ 81CDD24 sub_81CDD48: @ 81CDD48 push {lr} movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr ldrh r1, [r0, 0x2] lsls r1, 2 adds r0, r1 @@ -12342,7 +11706,7 @@ sub_81CDD48: @ 81CDD48 sub_81CDD5C: @ 81CDD5C push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr movs r1, 0xC6 lsls r1, 7 adds r0, r1 @@ -12362,7 +11726,7 @@ _081CDD76: sub_81CDD7C: @ 81CDD7C push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr adds r2, r0, 0 movs r1, 0xC6 lsls r1, 7 @@ -12391,7 +11755,7 @@ _081CDDA6: sub_81CDDB0: @ 81CDDB0 push {lr} movs r0, 0xB - bl sub_81C763C + bl GetSubstructPtr ldr r2, =0x00006786 adds r1, r0, r2 ldrb r1, [r1] @@ -12411,7 +11775,7 @@ sub_81CDDD4: @ 81CDDD4 push {r4,lr} ldr r1, =0x000038ac movs r0, 0xC - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CDE24 @@ -12447,7 +11811,7 @@ sub_81CDE2C: @ 81CDE2C push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r0, =gUnknown_08623384 lsls r4, 2 @@ -12470,7 +11834,7 @@ sub_81CDE2C: @ 81CDE2C sub_81CDE64: @ 81CDE64 push {lr} movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x00001810 adds r0, r1 ldr r0, [r0] @@ -12484,7 +11848,7 @@ sub_81CDE64: @ 81CDE64 sub_81CDE80: @ 81CDE80 push {lr} movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0] bl sub_81C70D8 pop {r1} @@ -12497,7 +11861,7 @@ sub_81CDE94: @ 81CDE94 sub sp, 0xC adds r4, r0, 0 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x14 bls _081CDEA8 @@ -12542,7 +11906,7 @@ _081CDF16: _081CDF18: ldr r0, =gUnknown_08623358 movs r1, 0x3 - bl sub_81C7B54 + bl InitBgTemplates movs r0, 0x1 movs r1, 0 movs r2, 0 @@ -12853,7 +12217,7 @@ _081CE218: bne _081CE2C0 _081CE230: ldr r0, =sub_81CEE44 - bl IndirectSetVBlankCallback + bl SetVBlankCallback_ b _081CDFB0 .pool _081CE23C: @@ -12924,7 +12288,7 @@ sub_81CE2D0: @ 81CE2D0 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CE308 @@ -13006,7 +12370,7 @@ sub_81CE37C: @ 81CE37C push {r4-r6,lr} adds r4, r0, 0 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r6, r0, 0 bl sub_81CDC70 adds r2, r0, 0 @@ -13160,7 +12524,7 @@ sub_81CE4D8: @ 81CE4D8 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x8 bhi _081CE5DC @@ -13282,7 +12646,7 @@ sub_81CE5E4: @ 81CE5E4 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x7 bhi _081CE6B2 @@ -13408,7 +12772,7 @@ _081CE6E6: bl sub_81C7BA4 b _081CE6E2 _081CE6EE: - bl sub_81C7BE8 + bl IsDma3ManagerBusyWithBgCopy_ cmp r0, 0x1 bne _081CE6E2 movs r0, 0x2 @@ -13444,7 +12808,7 @@ _081CE71E: bl sub_81C7BA4 b _081CE71A _081CE726: - bl sub_81C7BE8 + bl IsDma3ManagerBusyWithBgCopy_ cmp r0, 0x1 bne _081CE71A movs r0, 0x2 @@ -13486,7 +12850,7 @@ sub_81CE754: @ 81CE754 lsls r2, 24 lsrs r5, r2, 24 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r6, r0, 0 cmp r4, 0x1 beq _081CE7B8 @@ -13700,7 +13064,7 @@ _081CE926: sub_81CE934: @ 81CE934 push {r4,lr} movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldr r1, =0x00001822 adds r0, r4, r1 @@ -13798,7 +13162,7 @@ sub_81CE9E4: @ 81CE9E4 push {r5-r7} sub sp, 0x58 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r6, r0, 0 add r4, sp, 0x20 add r5, sp, 0x38 @@ -14101,7 +13465,7 @@ _081CEC8E: sub_81CECA0: @ 81CECA0 push {r4,lr} movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 movs r1, 0xC1 lsls r1, 5 @@ -14136,7 +13500,7 @@ _081CECF0: bl sub_81CEBF4 bl sub_81CEE68 movs r0, 0xC - bl sub_81C7650 + bl FreeSubstruct pop {r4} pop {r0} bx r0 @@ -14147,7 +13511,7 @@ sub_81CED10: @ 81CED10 push {r4,lr} adds r4, r0, 0 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr ldr r1, =0x00001814 adds r0, r1 ldrh r0, [r0] @@ -14168,7 +13532,7 @@ sub_81CED30: @ 81CED30 lsls r0, 24 lsrs r6, r0, 24 movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr mov r8, r0 ldr r7, =0x00001816 add r7, r8 @@ -14291,7 +13655,7 @@ sub_81CEE44: @ 81CEE44 thumb_func_start sub_81CEE68 sub_81CEE68: @ 81CEE68 push {lr} - bl sub_81C760C + bl SetPokenavVBlankCallback pop {r0} bx r0 thumb_func_end sub_81CEE68 @@ -14381,7 +13745,7 @@ _081CEF0C: sub_81CEF14: @ 81CEF14 push {r4,lr} movs r0, 0xC - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81CDD5C cmp r0, 0x1 @@ -14404,13 +13768,13 @@ sub_81CEF3C: @ 81CEF3C push {r4,lr} movs r0, 0x7 movs r1, 0x24 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CEF90 ldr r1, =0x000006ac movs r0, 0x12 - bl sub_81C761C + bl AllocSubstruct str r0, [r4, 0x20] cmp r0, 0 beq _081CEF90 @@ -14444,12 +13808,12 @@ sub_81CEF98: @ 81CEF98 push {r4,lr} movs r0, 0x7 movs r1, 0x24 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CEFD4 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr str r0, [r4, 0x20] ldr r0, =sub_81CF030 str r0, [r4] @@ -14476,7 +13840,7 @@ _081CEFD6: sub_81CEFDC: @ 81CEFDC push {lr} movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr ldr r1, [r0] bl _call_via_r1 pop {r1} @@ -14487,15 +13851,15 @@ sub_81CEFDC: @ 81CEFDC sub_81CEFF0: @ 81CEFF0 push {lr} movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x1C] cmp r0, 0 bne _081CF004 movs r0, 0x12 - bl sub_81C7650 + bl FreeSubstruct _081CF004: movs r0, 0x7 - bl sub_81C7650 + bl FreeSubstruct pop {r0} bx r0 thumb_func_end sub_81CEFF0 @@ -14607,7 +13971,7 @@ sub_81CF0B8: @ 81CF0B8 sub_81CF0C0: @ 81CF0C0 push {lr} movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x18] pop {r1} bx r1 @@ -14617,7 +13981,7 @@ sub_81CF0C0: @ 81CF0C0 sub_81CF0D0: @ 81CF0D0 push {lr} movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x20] adds r0, 0x4 pop {r1} @@ -14628,7 +13992,7 @@ sub_81CF0D0: @ 81CF0D0 sub_81CF0E0: @ 81CF0E0 push {lr} movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x20] ldrh r0, [r0] pop {r1} @@ -14639,7 +14003,7 @@ sub_81CF0E0: @ 81CF0E0 sub_81CF0F0: @ 81CF0F0 push {r4,lr} movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81C875C ldr r1, [r4, 0x20] @@ -14655,7 +14019,7 @@ sub_81CF0F0: @ 81CF0F0 sub_81CF10C: @ 81CF10C push {lr} movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x20] ldrh r0, [r0, 0x2] pop {r1} @@ -14680,7 +14044,7 @@ sub_81CF134: @ 81CF134 push {r4-r6,lr} sub sp, 0x4 movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr adds r6, r0, 0 ldr r0, [r6, 0x20] movs r1, 0 @@ -14746,7 +14110,7 @@ _081CF1AA: sub_81CF1C4: @ 81CF1C4 push {lr} movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr movs r1, 0 str r1, [r0, 0x10] str r1, [r0, 0xC] @@ -14762,7 +14126,7 @@ sub_81CF1D8: @ 81CF1D8 push {r7} sub sp, 0x4 movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr adds r6, r0, 0 ldr r5, [r6, 0xC] ldr r4, [r6, 0x10] @@ -14839,7 +14203,7 @@ _081CF26A: sub_81CF278: @ 81CF278 push {r4-r6,lr} movs r0, 0x7 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r0, [r5, 0x20] ldrh r6, [r0] @@ -14950,7 +14314,7 @@ sub_81CF330: @ 81CF330 movs r1, 0x81 lsls r1, 4 movs r0, 0x8 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CF360 @@ -14979,7 +14343,7 @@ sub_81CF368: @ 81CF368 movs r1, 0x81 lsls r1, 4 movs r0, 0x8 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CF398 @@ -15006,7 +14370,7 @@ sub_81CF3A0: @ 81CF3A0 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x8 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r0, =gUnknown_08623598 lsls r4, 2 @@ -15027,7 +14391,7 @@ sub_81CF3A0: @ 81CF3A0 sub_81CF3D0: @ 81CF3D0 push {lr} movs r0, 0x8 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0] bl _call_via_r0 pop {r1} @@ -15038,7 +14402,7 @@ sub_81CF3D0: @ 81CF3D0 sub_81CF3E4: @ 81CF3E4 push {lr} movs r0, 0x8 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x4] bl sub_81C70D8 pop {r1} @@ -15049,13 +14413,13 @@ sub_81CF3E4: @ 81CF3E4 sub_81CF3F8: @ 81CF3F8 push {r4,lr} movs r0, 0x8 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81C8234 ldrb r0, [r4, 0x8] bl RemoveWindow movs r0, 0x8 - bl sub_81C7650 + bl FreeSubstruct pop {r4} pop {r0} bx r0 @@ -15067,7 +14431,7 @@ sub_81CF418: @ 81CF418 sub sp, 0x4 adds r4, r0, 0 movs r0, 0x8 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x5 bls _081CF42C @@ -15090,7 +14454,7 @@ _081CF43C: _081CF454: ldr r0, =gUnknown_08623590 movs r1, 0x2 - bl sub_81C7B54 + bl InitBgTemplates ldr r1, =gUnknown_086233E4 movs r0, 0 str r0, [sp] @@ -15214,7 +14578,7 @@ sub_81CF578: @ 81CF578 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x8 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CF5C6 @@ -15282,7 +14646,7 @@ sub_81CF5F0: @ 81CF5F0 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x8 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CF63E @@ -15350,7 +14714,7 @@ sub_81CF668: @ 81CF668 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x8 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CF6B6 @@ -15418,7 +14782,7 @@ sub_81CF6E0: @ 81CF6E0 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0x8 - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081CF72E @@ -15773,13 +15137,13 @@ sub_81CF9BC: @ 81CF9BC push {r4,lr} movs r0, 0x9 movs r1, 0x20 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CF9FC ldr r1, =0x000006ac movs r0, 0x12 - bl sub_81C761C + bl AllocSubstruct str r0, [r4, 0x1C] cmp r0, 0 beq _081CF9FC @@ -15807,12 +15171,12 @@ sub_81CFA04: @ 81CFA04 push {r4,lr} movs r0, 0x9 movs r1, 0x20 - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CFA2C movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr str r0, [r4, 0x1C] ldr r0, =sub_81CFA88 str r0, [r4] @@ -15832,7 +15196,7 @@ _081CFA2E: sub_81CFA34: @ 81CFA34 push {lr} movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr ldr r1, [r0] bl _call_via_r1 pop {r1} @@ -15843,15 +15207,15 @@ sub_81CFA34: @ 81CFA34 sub_81CFA48: @ 81CFA48 push {lr} movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x18] cmp r0, 0 bne _081CFA5C movs r0, 0x12 - bl sub_81C7650 + bl FreeSubstruct _081CFA5C: movs r0, 0x9 - bl sub_81C7650 + bl FreeSubstruct pop {r0} bx r0 thumb_func_end sub_81CFA48 @@ -15963,7 +15327,7 @@ sub_81CFB10: @ 81CFB10 sub_81CFB18: @ 81CFB18 push {lr} movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x14] pop {r1} bx r1 @@ -15973,7 +15337,7 @@ sub_81CFB18: @ 81CFB18 sub_81CFB28: @ 81CFB28 push {lr} movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x1C] adds r0, 0x4 pop {r1} @@ -15984,7 +15348,7 @@ sub_81CFB28: @ 81CFB28 sub_81CFB38: @ 81CFB38 push {lr} movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x1C] ldrh r0, [r0] pop {r1} @@ -15995,7 +15359,7 @@ sub_81CFB38: @ 81CFB38 sub_81CFB48: @ 81CFB48 push {r4,lr} movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81C875C ldr r1, [r4, 0x1C] @@ -16011,7 +15375,7 @@ sub_81CFB48: @ 81CFB48 sub_81CFB64: @ 81CFB64 push {lr} movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x1C] ldrh r0, [r0, 0x2] pop {r1} @@ -16036,7 +15400,7 @@ sub_81CFB8C: @ 81CFB8C push {r4-r6,lr} sub sp, 0x4 movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr adds r6, r0, 0 ldr r0, [r6, 0x1C] movs r1, 0 @@ -16108,7 +15472,7 @@ _081CFC10: sub_81CFC2C: @ 81CFC2C push {lr} movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr movs r1, 0 str r1, [r0, 0x10] str r1, [r0, 0xC] @@ -16125,7 +15489,7 @@ sub_81CFC40: @ 81CFC40 push {r6,r7} sub sp, 0x4 movs r0, 0x9 - bl sub_81C763C + bl GetSubstructPtr mov r8, r0 ldr r7, [r0, 0xC] ldr r6, [r0, 0x10] @@ -16336,7 +15700,7 @@ sub_81CFDD0: @ 81CFDD0 movs r1, 0x81 lsls r1, 4 movs r0, 0xA - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CFE00 @@ -16365,7 +15729,7 @@ sub_81CFE08: @ 81CFE08 movs r1, 0x81 lsls r1, 4 movs r0, 0xA - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081CFE38 @@ -16392,7 +15756,7 @@ sub_81CFE40: @ 81CFE40 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xA - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r0, =gUnknown_086237B8 lsls r4, 2 @@ -16413,7 +15777,7 @@ sub_81CFE40: @ 81CFE40 sub_81CFE70: @ 81CFE70 push {lr} movs r0, 0xA - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0] bl _call_via_r0 pop {r1} @@ -16424,7 +15788,7 @@ sub_81CFE70: @ 81CFE70 sub_81CFE84: @ 81CFE84 push {lr} movs r0, 0xA - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x4] bl sub_81C70D8 pop {r1} @@ -16435,13 +15799,13 @@ sub_81CFE84: @ 81CFE84 sub_81CFE98: @ 81CFE98 push {r4,lr} movs r0, 0xA - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 bl sub_81C8234 ldrb r0, [r4, 0x8] bl RemoveWindow movs r0, 0xA - bl sub_81C7650 + bl FreeSubstruct pop {r4} pop {r0} bx r0 @@ -16453,7 +15817,7 @@ sub_81CFEB8: @ 81CFEB8 sub sp, 0x4 adds r4, r0, 0 movs r0, 0xA - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x5 bls _081CFECC @@ -16476,7 +15840,7 @@ _081CFEDC: _081CFEF4: ldr r0, =gUnknown_086237B0 movs r1, 0x2 - bl sub_81C7B54 + bl InitBgTemplates ldr r1, =gUnknown_08623604 movs r0, 0 str r0, [sp] @@ -16588,7 +15952,7 @@ sub_81CFFFC: @ 81CFFFC push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xA - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081D004A @@ -16656,7 +16020,7 @@ sub_81D0074: @ 81D0074 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xA - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081D00C2 @@ -16724,7 +16088,7 @@ sub_81D00EC: @ 81D00EC push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xA - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081D013A @@ -16792,7 +16156,7 @@ sub_81D0164: @ 81D0164 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xA - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081D01B2 @@ -17158,12 +16522,12 @@ sub_81D0450: @ 81D0450 push {r4,lr} movs r0, 0xD movs r1, 0x9C - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081D0498 movs r0, 0x12 - bl sub_81C763C + bl GetSubstructPtr str r0, [r4, 0x8] cmp r0, 0 beq _081D0498 @@ -17194,7 +16558,7 @@ _081D049A: sub_81D04A0: @ 81D04A0 push {lr} movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr adds r1, r0, 0 adds r1, 0x98 ldr r1, [r1] @@ -17207,7 +16571,7 @@ sub_81D04A0: @ 81D04A0 sub_81D04B8: @ 81D04B8 push {lr} movs r0, 0xD - bl sub_81C7650 + bl FreeSubstruct pop {r0} bx r0 thumb_func_end sub_81D04B8 @@ -17513,7 +16877,7 @@ _081D06BE: sub_81D06C4: @ 81D06C4 push {lr} movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x8] ldrh r0, [r0, 0x2] pop {r1} @@ -17524,7 +16888,7 @@ sub_81D06C4: @ 81D06C4 sub_81D06D4: @ 81D06D4 push {lr} movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x8] ldrh r0, [r0] pop {r1} @@ -17538,7 +16902,7 @@ sub_81D06E4: @ 81D06E4 adds r7, r1, 0 adds r6, r2, 0 movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr ldr r1, [r0, 0x8] ldrh r0, [r1, 0x2] lsls r0, 2 @@ -17594,7 +16958,7 @@ sub_81D0760: @ 81D0760 adds r6, r1, 0 adds r7, r2, 0 movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr ldr r1, [r0, 0x8] ldrh r0, [r1, 0x2] lsls r0, 2 @@ -17648,7 +17012,7 @@ _081D07D0: sub_81D07D8: @ 81D07D8 push {lr} movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr ldr r1, [r0, 0x8] ldrh r0, [r1, 0x2] lsls r0, 2 @@ -17815,7 +17179,7 @@ sub_81D0914: @ 81D0914 push {r4,lr} adds r4, r0, 0 movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr ldrh r1, [r0, 0x10] str r1, [r4] adds r0, 0x14 @@ -17829,7 +17193,7 @@ sub_81D092C: @ 81D092C push {r4,lr} adds r4, r0, 0 movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr ldrh r1, [r0, 0x12] str r1, [r4] adds r0, 0x78 @@ -17842,7 +17206,7 @@ sub_81D092C: @ 81D092C sub_81D0944: @ 81D0944 push {lr} movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr ldrh r0, [r0, 0xC] pop {r1} bx r1 @@ -17852,7 +17216,7 @@ sub_81D0944: @ 81D0944 sub_81D0954: @ 81D0954 push {lr} movs r0, 0xD - bl sub_81C763C + bl GetSubstructPtr adds r1, r0, 0 ldrh r0, [r1, 0xC] cmp r0, 0x18 @@ -17876,7 +17240,7 @@ sub_81D0978: @ 81D0978 push {r4,lr} ldr r1, =0x0000101c movs r0, 0xE - bl sub_81C761C + bl AllocSubstruct adds r4, r0, 0 cmp r4, 0 beq _081D09A8 @@ -17902,7 +17266,7 @@ sub_81D09B0: @ 81D09B0 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xE - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 ldr r0, =gUnknown_08624BA0 lsls r4, 2 @@ -17923,7 +17287,7 @@ sub_81D09B0: @ 81D09B0 sub_81D09E0: @ 81D09E0 push {lr} movs r0, 0xE - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0] bl _call_via_r0 pop {r1} @@ -17934,7 +17298,7 @@ sub_81D09E0: @ 81D09E0 sub_81D09F4: @ 81D09F4 push {r4,lr} movs r0, 0xE - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 ldrb r0, [r4, 0xA] bl RemoveWindow @@ -17963,7 +17327,7 @@ sub_81D09F4: @ 81D09F4 ldr r0, [r4, 0x14] bl DestroySprite movs r0, 0xE - bl sub_81C7650 + bl FreeSubstruct pop {r4} pop {r0} bx r0 @@ -17973,7 +17337,7 @@ sub_81D09F4: @ 81D09F4 sub_81D0A58: @ 81D0A58 push {lr} movs r0, 0xE - bl sub_81C763C + bl GetSubstructPtr ldr r0, [r0, 0x4] bl sub_81C70D8 pop {r1} @@ -17986,7 +17350,7 @@ sub_81D0A6C: @ 81D0A6C sub sp, 0x8 adds r4, r0, 0 movs r0, 0xE - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x9 bls _081D0A80 @@ -18013,7 +17377,7 @@ _081D0A90: _081D0AB8: ldr r0, =gUnknown_08624B98 movs r1, 0x2 - bl sub_81C7B54 + bl InitBgTemplates ldr r1, =gUnknown_08DDE030 movs r0, 0 str r0, [sp] @@ -18215,7 +17579,7 @@ sub_81D0C84: @ 81D0C84 push {r4,r5,lr} adds r5, r0, 0 movs r0, 0xE - bl sub_81C763C + bl GetSubstructPtr adds r4, r0, 0 cmp r5, 0x6 bhi _081D0D24 @@ -18295,7 +17659,7 @@ sub_81D0D2C: @ 81D0D2C push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xE - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081D0D5C @@ -18347,7 +17711,7 @@ sub_81D0D8C: @ 81D0D8C push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xE - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081D0DC0 @@ -18408,7 +17772,7 @@ sub_81D0E00: @ 81D0E00 push {r4,r5,lr} adds r4, r0, 0 movs r0, 0xE - bl sub_81C763C + bl GetSubstructPtr adds r5, r0, 0 cmp r4, 0x1 beq _081D0E30 diff --git a/include/graphics.h b/include/graphics.h index 48c00943b1..d4696bc8b1 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4010,6 +4010,7 @@ extern const u32 gCreditsCopyrightEnd_Gfx[]; //pokenav extern const u8 gPokenavConditionMarker_Gfx[]; extern const u16 gPokenavConditionMarker_Pal[]; +extern const u16 gPokenavLeftHeader_Pal[]; extern const u16 gPokenavHeader_Pal[]; extern const u32 gPokenavHeader_Gfx[]; extern const u32 gPokenavHeader_Tilemap[]; diff --git a/src/pokenav.c b/src/pokenav.c index ff687e8dc5..d09c3da94b 100644 --- a/src/pokenav.c +++ b/src/pokenav.c @@ -13,26 +13,45 @@ #include "bg.h" #include "menu.h" #include "graphics.h" +#include "dma3.h" #include "gba/macro.h" #include "decompress.h" #include "strings.h" #include "constants/rgb.h" +enum +{ + MODE_NORMAL, // Chosen from Start menu. + MODE_FORCE_CALL_1, // Used for the script's special. Has to choose Match Call and make a call. + MODE_FORCE_CALL_2, // Set after making a call, has to exit Pokenav. +}; + #define UNKNOWN_OFFSET 100000 +struct UnknownSubStruct_0203CF40 +{ + void (*unk0)(u32); + u32 (*unk4)(void); + u32 unk8; + u32 unkC; + u32 unk10; + u32 unk14; + struct Sprite *unk18; + struct Sprite *unk1C[2]; + struct Sprite *unk24[2]; + u8 tilemapBuffer[0x1000]; +}; + +#define SUBSTRUCT_COUNT 19 + struct UnknownStruct_0203CF40 { u32 (*field0)(void); u32 field4; - u16 field8; + u16 mode; u16 fieldA; - u32 fieldC; - void *field10[19]; -}; - -struct UnknownStruct_sub_81C76C4 -{ - u32 data[523]; + bool32 hasAnyRibbons; + struct UnknownSubStruct_0203CF40 *field10[SUBSTRUCT_COUNT]; }; extern u32 sub_81C9430(void); @@ -101,34 +120,42 @@ extern u32 sub_81CFE08(void); u32 sub_81C791C(s32 a0); bool32 sub_81C756C(u32 a0); bool32 sub_81C76C4(void); -u32 AnyMonHasRibbon(void); +static bool32 AnyMonHasRibbon(void); u32 sub_81C75E0(void); u32 sub_81C75D4(void); u32 sub_81C76FC(void); u32 sub_81C786C(void); u32 sub_81C7764(s32 a0); -u32 atk47_cmd47(s32 a0); +u32 sub_81C78D4(s32 a0); bool32 sub_81C7738(void); void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 a1, u32 a2); -void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)); -void sub_81C7360(struct UnknownStruct_0203CF40 *a0); -void sub_81C7650(u32 index); +void sub_81C7834(void *func1, void *func2); +static void InitMainStruct(struct UnknownStruct_0203CF40 *a0); +void FreeSubstruct(u32 index); void sub_81C7850(u32 a0); void sub_81C7BF8(u32 a0); void sub_81C71E4(u8 a0); -void sub_81C7170(u8 a0); +void sub_81C7170(u8 taskId); void sub_81C742C(u8 taskId); void sub_81C7710(void); -void sub_81C75F4(void); -void sub_81C7334(void); -void sub_81C7418(void); -void sub_81C7400(void); +static void InitKeys_(void); +static void FreeVars(void); +static void VblankCb_Pokenav(void); +static void Cb2_Pokenav(void); void sub_81C7C28(void); void sub_81C72BC(void); void sub_81C7B74(void); void sub_81C7C94(void); +void sub_81C7F24(u32 arg0); +void sub_81C7E58(u32 arg0); +void sub_81C8110(bool32 arg0); +void sub_81C80D4(bool32 arg0); +void sub_81C803C(u32 arg0, bool32 arg1); +void sub_81C8088(u32 arg0, bool32 arg1); +void sub_81C814C(struct Sprite *sprite, s32 arg1, s32 arg2, s32 arg3); +void sub_81C817C(struct Sprite *sprite); - +// Const rom data. u32 (*const gUnknown_0861F3EC[15][7])(void) = { { @@ -272,15 +299,17 @@ const u16 gUnknown_0861F590[] = INCBIN_U16("graphics/pokenav/icon2.gbapal"); const u32 gUnknown_0861F5B0[] = INCBIN_U32("graphics/pokenav/icon2.4bpp.lz"); const u32 gUnknown_0861F994[] = INCBIN_U32("graphics/pokenav/icon2_unused.4bpp.lz"); -const struct BgTemplate gUnknown_0861FA04 = +const struct BgTemplate gUnknown_0861FA04[] = { - .bg = 0, - .charBaseIndex = 0, - .mapBaseIndex = 5, - .screenSize = 0, - .paletteMode = 0, - .priority = 0, - .baseTile = 0, + { + .bg = 0, + .charBaseIndex = 0, + .mapBaseIndex = 5, + .screenSize = 0, + .paletteMode = 0, + .priority = 0, + .baseTile = 0, + } }; const struct WindowTemplate gUnknown_0861FA08[2] = @@ -305,7 +334,7 @@ const struct WindowTemplate gUnknown_0861FA08[2] = }, }; -const u8 *const (MenuButtonReminders[12]) = +const u8 *const (sMenuButtonReminders[12]) = { gText_Navgear_ClearButtonList, gText_NavgearMap_ZoomedOutButtons, @@ -341,10 +370,6 @@ const struct SpritePalette gUnknown_0861FA54[2] = .data = gUnknown_0861F590, .tag = 0, }, - { - .data = NULL, - .tag = 0, - } }; const struct CompressedSpriteSheet gUnknown_0861FA64 = @@ -358,16 +383,17 @@ extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40; extern u8 gUnknown_0203CF3C; extern const struct SpriteTemplate gUnknown_0861FB04; -u32 sub_81C7078(u32 (*a0)(s32), u32 a1) +// code +u32 sub_81C7078(u32 (*func)(s32), u32 priority) { u16 taskId; if (!is_c1_link_related_active()) - taskId = CreateTask(sub_81C7170, a1); + taskId = CreateTask(sub_81C7170, priority); else - taskId = CreateTask(sub_81C71E4, a1); + taskId = CreateTask(sub_81C71E4, priority); - SetWordTaskArg(taskId, 1, (u32)a0); + SetWordTaskArg(taskId, 1, (u32)func); gTasks[taskId].data[3] = gUnknown_0203CF3C; return ((gUnknown_0203CF3C++) << 16) | taskId; @@ -375,62 +401,52 @@ u32 sub_81C7078(u32 (*a0)(s32), u32 a1) bool32 sub_81C70D8(u32 a0) { - u32 v1 = a0 & 0xFFFF; + u32 taskId = a0 & 0xFFFF; u32 v2 = a0 >> 16; - if (gTasks[v1].isActive - && (gTasks[v1].func == sub_81C7170 || gTasks[v1].func == sub_81C71E4) - && gTasks[v1].data[3] == v2) - { - + + if (gTasks[taskId].isActive + && (gTasks[taskId].func == sub_81C7170 || gTasks[taskId].func == sub_81C71E4) + && gTasks[taskId].data[3] == v2) return TRUE; - } else - { return FALSE; - } } bool32 sub_81C7124(u32 a0) { s32 i; - for (i = 0; i < 16; i++) + for (i = 0; i < NUM_TASKS; i++) { if (gTasks[i].isActive - && (gTasks[i].func == sub_81C7170 || gTasks[i].func == sub_81C71E4)) - { - u32 arg = GetWordTaskArg((u8)i, 1); - if (arg == a0) - return TRUE; - } + && (gTasks[i].func == sub_81C7170 || gTasks[i].func == sub_81C71E4) + && GetWordTaskArg(i, 1) == a0) + return TRUE; } return FALSE; } void sub_81C7170(u8 taskId) { - s16 *dataPtr; - u32 (*func)(u32); - bool32 exitLoop; + u32 (*func)(s32) = (void *)GetWordTaskArg(taskId, 1); + s16 *data = gTasks[taskId].data; + bool32 exitLoop = FALSE; - func = (u32 (*)(u32))GetWordTaskArg(taskId, 1); - dataPtr = gTasks[taskId].data; - exitLoop = FALSE; while (!exitLoop) { - u32 v1 =((u32 (*)(u32))func)(dataPtr[0]); - switch (v1) + u32 var = func(data[0]); + switch (var) { case 1: - dataPtr[0] = dataPtr[0] + 1; + data[0] = data[0] + 1; break; case 0: - dataPtr[0]++; + data[0]++; return; case 4: DestroyTask(taskId); return; default: - dataPtr[0] = v1 - 5; + data[0] = var - 5; break; case 3: break; @@ -471,91 +487,81 @@ void sub_81C71E4(u8 taskId) void CB2_PokeNav(void) { - gUnknown_0203CF40 = Alloc(sizeof(struct UnknownStruct_0203CF40)); + gUnknown_0203CF40 = Alloc(sizeof(*gUnknown_0203CF40)); if (gUnknown_0203CF40 == NULL) { SetMainCallback2(CB2_ReturnToFieldWithOpenMenu); } else { - sub_81C7360(gUnknown_0203CF40); + InitMainStruct(gUnknown_0203CF40); ResetTasks(); SetVBlankCallback(NULL); CreateTask(sub_81C742C, 0); - SetMainCallback2(sub_81C7400); - SetVBlankCallback(sub_81C7418); + SetMainCallback2(Cb2_Pokenav); + SetVBlankCallback(VblankCb_Pokenav); } } -void sub_81C72A4() +void sub_81C72A4(void) { SetMainCallback2(sub_81C72BC); FadeScreen(1, 0); } -void sub_81C72BC() +void sub_81C72BC(void) { UpdatePaletteFade(); - if (!gPaletteFade.active) + if (gPaletteFade.active) + return; + + gUnknown_0203CF40 = Alloc(sizeof(*gUnknown_0203CF40)); + if (gUnknown_0203CF40 == NULL) { - gUnknown_0203CF40 = Alloc(sizeof(struct UnknownStruct_0203CF40)); - if (gUnknown_0203CF40 == NULL) - { - SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); - } - else - { - sub_81C7360(gUnknown_0203CF40); - gUnknown_0203CF40->field8 = 1; - ResetTasks(); - ResetSpriteData(); - FreeAllSpritePalettes(); - SetVBlankCallback(NULL); - CreateTask(sub_81C742C, 0); - SetMainCallback2(sub_81C7400); - SetVBlankCallback(sub_81C7418); - } + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); + } + else + { + InitMainStruct(gUnknown_0203CF40); + gUnknown_0203CF40->mode = MODE_FORCE_CALL_1; + ResetTasks(); + ResetSpriteData(); + FreeAllSpritePalettes(); + SetVBlankCallback(NULL); + CreateTask(sub_81C742C, 0); + SetMainCallback2(Cb2_Pokenav); + SetVBlankCallback(VblankCb_Pokenav); } } -void sub_81C7334() +static void FreeVars(void) { s32 i; - for (i = 0; i < 19; i++) - { - sub_81C7650(i); - } - Free(gUnknown_0203CF40); - gUnknown_0203CF40 = NULL; + for (i = 0; i < SUBSTRUCT_COUNT; i++) + FreeSubstruct(i); + + FREE_AND_SET_NULL(gUnknown_0203CF40); InitKeys(); } // Clears UnknownStruct_0203CF40 -void sub_81C7360(struct UnknownStruct_0203CF40 *a0) +static void InitMainStruct(struct UnknownStruct_0203CF40 *a0) { s32 i; - void **arrayPtr; - void *fill; - fill = NULL; - i = 18; - arrayPtr = &(a0->field10[18]); - for (i; i >= 0; i--) - { - *arrayPtr = fill; - arrayPtr -= 1; - } - a0->field8 = 0; + for (i = 0; i < SUBSTRUCT_COUNT; i++) + a0->field10[i] = NULL; + + a0->mode = MODE_NORMAL; a0->field4 = 0; - a0->fieldC = AnyMonHasRibbon(); + a0->hasAnyRibbons = AnyMonHasRibbon(); a0->field0 = NULL; } -bool32 AnyMonHasRibbon() +static bool32 AnyMonHasRibbon(void) { - s32 i; - s32 j; + s32 i, j; for (i = 0; i < PARTY_SIZE; i++) { @@ -569,7 +575,7 @@ bool32 AnyMonHasRibbon() for (j = 0; j < TOTAL_BOXES_COUNT; j++) { - for (i = 0; i < IN_BOX_COUNT; i++) + for (i = 0; i < IN_BOX_COUNT; i++) { if (CheckBoxMonSanityAt(j, i) && GetBoxMonDataAt(j, i, MON_DATA_RIBBON_COUNT) != 0) @@ -582,7 +588,7 @@ bool32 AnyMonHasRibbon() return FALSE; } -void sub_81C7400() +static void Cb2_Pokenav(void) { RunTasks(); AnimateSprites(); @@ -590,7 +596,7 @@ void sub_81C7400() UpdatePaletteFade(); } -void sub_81C7418() +static void VblankCb_Pokenav(void) { TransferPlttBuffer(); LoadOam(); @@ -599,34 +605,31 @@ void sub_81C7418() void sub_81C742C(u8 taskId) { - s16 *dataPtr; u32 v1; - bool32 v2; + s16 *data = gTasks[taskId].data; - dataPtr = gTasks[taskId].data; - - switch (dataPtr[0]) + switch (data[0]) { case 0: sub_81C76C4(); - dataPtr[0] = 1; + data[0] = 1; break; case 1: if (sub_81C76FC()) break; sub_81C756C(UNKNOWN_OFFSET); - dataPtr[0] = 4; + data[0] = 4; break; case 2: if (sub_81C786C()) break; - dataPtr[0] = 3; + data[0] = 3; case 3: v1 = sub_81C75E0(); if (v1 == -1) { sub_81C7710(); - dataPtr[0] = 5; + data[0] = 5; } else if (v1 >= UNKNOWN_OFFSET) { @@ -634,32 +637,33 @@ void sub_81C742C(u8 taskId) gUnknown_0861F3EC[gUnknown_0203CF40->field4][5](); if (sub_81C756C(v1)) { - dataPtr[0] = 4; + data[0] = 4; } else { sub_81C7710(); - dataPtr[0] = 5; + data[0] = 5; } } else if (v1 != 0) { sub_81C7850(v1); if (sub_81C786C()) - dataPtr[0] = 2; + data[0] = 2; } break; case 4: if (!sub_81C75D4()) - dataPtr[0] = 3; + data[0] = 3; break; case 5: if (!sub_81C7738()) { - v2 = gUnknown_0203CF40->field8 != 0; + bool32 calledFromScript = (gUnknown_0203CF40->mode != MODE_NORMAL); + sub_81C9430(); - sub_81C7334(); - if (v2) + FreeVars(); + if (calledFromScript) SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); else SetMainCallback2(CB2_ReturnToFieldWithOpenMenu); @@ -670,14 +674,14 @@ void sub_81C742C(u8 taskId) bool32 sub_81C756C(u32 a0) { - u32 index; + u32 index = a0 - UNKNOWN_OFFSET; - index = a0 - UNKNOWN_OFFSET; - sub_81C75F4(); + InitKeys_(); if (!gUnknown_0861F3EC[index][0]()) return FALSE; if (!gUnknown_0861F3EC[index][2]()) return FALSE; + sub_81C7834(gUnknown_0861F3EC[index][3], gUnknown_0861F3EC[index][4]); gUnknown_0203CF40->field0 = gUnknown_0861F3EC[index][1]; gUnknown_0203CF40->field4 = index; @@ -694,52 +698,52 @@ u32 sub_81C75E0(void) return gUnknown_0203CF40->field0(); } -void sub_81C75F4(void) +static void InitKeys_(void) { InitKeys(); } -void IndirectSetVBlankCallback(IntrCallback callback) +void SetVBlankCallback_(IntrCallback callback) { SetVBlankCallback(callback); } -void sub_81C760C(void) +void SetPokenavVBlankCallback(void) { - SetVBlankCallback(sub_81C7418); + SetVBlankCallback(VblankCb_Pokenav); } -void *sub_81C761C(u32 index, u32 size) +void *AllocSubstruct(u32 index, u32 size) { - return gUnknown_0203CF40->field10[index] = (void*)Alloc(size); + return gUnknown_0203CF40->field10[index] = Alloc(size); } -void *sub_81C763C(u32 index) +struct UnknownSubStruct_0203CF40 *GetSubstructPtr(u32 index) { return gUnknown_0203CF40->field10[index]; } -void sub_81C7650(u32 index) +void FreeSubstruct(u32 index) { if (gUnknown_0203CF40->field10[index] != NULL) FREE_AND_SET_NULL(gUnknown_0203CF40->field10[index]); } -u16 sub_81C767C(void) +u16 GetPokenavMode(void) { - return gUnknown_0203CF40->field8; + return gUnknown_0203CF40->mode; } -void sub_81C7688(u16 a0) +void SetPokenavMode(u16 mode) { - gUnknown_0203CF40->field8 = a0; + gUnknown_0203CF40->mode = mode; } void sub_81C7694(u32 a0) { - u32 value; - value = a0; - if (a0 > 4) + u32 value = a0; + + if (value > 4) value = 0; gUnknown_0203CF40->fieldA = value; } @@ -749,34 +753,27 @@ u16 sub_81C76AC(void) return gUnknown_0203CF40->fieldA; } -u32 sub_81C76B8(void) +bool32 CanViewRibbonsMenu(void) { - return gUnknown_0203CF40->fieldC; + return gUnknown_0203CF40->hasAnyRibbons; } bool32 sub_81C76C4(void) { - struct UnknownStruct_sub_81C76C4 *v1; - - v1 = (struct UnknownStruct_sub_81C76C4*)sub_81C761C(0, sizeof(struct UnknownStruct_sub_81C76C4)); - if (v1 == NULL) - { + struct UnknownSubStruct_0203CF40 *structPtr = AllocSubstruct(0, 0x82C); + if (structPtr == NULL) return FALSE; - } - else - { - ResetSpriteData(); - FreeAllSpritePalettes(); - v1->data[3] = sub_81C7078(sub_81C7764, 1); - return TRUE; - } + + ResetSpriteData(); + FreeAllSpritePalettes(); + structPtr->unkC = sub_81C7078(sub_81C7764, 1); + return TRUE; } u32 sub_81C76FC(void) { - u32 *v1; - v1 = sub_81C763C(0); - return sub_81C70D8(v1[3]); + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + return sub_81C70D8(structPtr->unkC); } void sub_81C7710(void) @@ -794,15 +791,14 @@ bool32 sub_81C7738(void) sub_81C7C94(); FreeAllWindowBuffers(); return FALSE; - } else - { - return TRUE; } + + return TRUE; } u32 sub_81C7764(s32 a0) { - u32 *v1; + struct UnknownSubStruct_0203CF40 *structPtr; switch (a0) { @@ -810,14 +806,14 @@ u32 sub_81C7764(s32 a0) SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); FreeAllWindowBuffers(); ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, &gUnknown_0861FA04, 1); + InitBgsFromTemplates(0, gUnknown_0861FA04, ARRAY_COUNT(gUnknown_0861FA04)); sub_8199D98(); reset_temp_tile_data_buffers(); return 1; case 1: - v1 = sub_81C763C(0); + structPtr = GetSubstructPtr(0); decompress_and_copy_tile_data_to_vram(0, &gPokenavHeader_Gfx, 0, 0, 0); - SetBgTilemapBuffer(0, &v1[11]); + SetBgTilemapBuffer(0, structPtr->tilemapBuffer); CopyToBgTilemapBuffer(0, &gPokenavHeader_Tilemap, 0, 0); CopyPaletteIntoBufferUnfaded(gPokenavHeader_Pal, 0, 0x20); CopyBgTilemapBufferToVram(0); @@ -825,7 +821,7 @@ u32 sub_81C7764(s32 a0) case 2: if (free_temp_tile_data_buffers_if_possible()) return 2; - + sub_81C7B74(); return 0; case 3: @@ -841,58 +837,46 @@ u32 sub_81C7764(s32 a0) } } -void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)) +void sub_81C7834(void *func1, void *func2) // Fix types later. { - u32 (**v1)(void); - - v1 = sub_81C763C(0); - v1[0] = a0; - v1[1] = a1; - v1[2] = NULL; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + structPtr->unk0 = func1; + structPtr->unk4 = func2; + structPtr->unk8 = 0; } void sub_81C7850(u32 a0) { - void (**v1)(u32); - - v1 = sub_81C763C(0); - v1[2] = NULL; - v1[0](a0); + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + structPtr->unk8 = 0; + structPtr->unk0(a0); } u32 sub_81C786C(void) { - u32 (**v1)(void); - - v1 = sub_81C763C(0); - return v1[1](); + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + return structPtr->unk4(); } void sub_81C7880(void) { - u32 *v1; - - v1 = sub_81C763C(0); - v1[3] = sub_81C7078(atk47_cmd47, 4); + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + structPtr->unkC = sub_81C7078(sub_81C78D4, 4); } void sub_81C78A0(void) { - u32 *v1; - - v1 = sub_81C763C(0); - v1[3] = sub_81C7078(sub_81C791C, 4); + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + structPtr->unkC = sub_81C7078(sub_81C791C, 4); } bool32 sub_81C78C0(void) { - u32 *v1; - - v1 = sub_81C763C(0); - return sub_81C70D8(v1[3]); + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + return sub_81C70D8(structPtr->unkC); } -u32 atk47_cmd47(s32 a0) +u32 sub_81C78D4(s32 a0) { switch (a0) { @@ -903,12 +887,12 @@ u32 atk47_cmd47(s32 a0) case 0: return 0; case 2: - if ((u32)ChangeBgY(0, 384, 1) >= 0x2000) + if (ChangeBgY(0, 384, 1) >= 0x2000u) { ChangeBgY(0, 0x2000, 0); return 4; } - + return 2; } } @@ -923,7 +907,8 @@ u32 sub_81C791C(s32 a0) return 2; } -void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 bufferOffset, u32 size) { +void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 bufferOffset, u32 size) +{ CpuCopy16(palette, gPlttBufferUnfaded + bufferOffset, size); } @@ -932,7 +917,7 @@ void sub_81C795C(const struct SpritePalette *palettes) const struct SpritePalette *current; u32 index; - for (current = palettes; current->data != NULL; current++) + for (current = palettes; current->data != NULL; current++) { index = AllocSpritePalette(current->tag); if (index == 0xFF) @@ -953,7 +938,7 @@ void sub_81C7990(u32 a0, u16 a1) } __attribute__((naked)) -void sub_81C79BC(u16 *a0, u16 *a1, u32 a2, u32 a3, u32 unused, u32 a5, u32 a6) +void sub_81C79BC(u16 *a0, u16 *a1, u32 a2, u32 a3, u32 a4, u32 a5) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -1090,15 +1075,15 @@ _081C7AAE:\n\ void sub_81C7AC0(s32 a0) { - u32 *v1; - v1 = sub_81C763C(0); + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + switch (a0) { case 0: - BeginNormalPaletteFade(v1[5], -2, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(structPtr->unk14, -2, 0, 16, RGB_BLACK); break; case 1: - BeginNormalPaletteFade(v1[5], -2, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(structPtr->unk14, -2, 16, 0, RGB_BLACK); break; case 2: BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK); @@ -1119,93 +1104,330 @@ void sub_81C7B40(void) BlendPalettes(0xFFFEFFFE, 16, RGB_BLACK); } -void sub_81C7B54(const struct BgTemplate *a0, s32 a1) +void InitBgTemplates(const struct BgTemplate *templates, s32 count) { s32 i; - if (a1 <= 0) - return; - for (i = a1; i != 0; i--) - { - InitBgFromTemplate(a0++); - } + + for (i = 0; i < count; i++) + InitBgFromTemplate(templates++); } void sub_81C7B74(void) { - u32 *v1; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); - v1 = sub_81C763C(0); InitWindows(&gUnknown_0861FA08[0]); - v1[4] = 0; - sub_81C7BF8(0); - PutWindowTilemap(v1[4]); - CopyWindowToVram(v1[4], 3); // TODO: Use a defined constant here. + structPtr->unk10 = 0; + sub_81C7BF8(structPtr->unk10); + PutWindowTilemap(structPtr->unk10); + CopyWindowToVram(structPtr->unk10, 3); // TODO: Use a defined constant here. } void sub_81C7BA4(u32 a0) { - u32 *v1; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); - v1 = sub_81C763C(0); - sub_81C7BF8(v1[4]); - AddTextPrinterParameterized3(v1[4], 1, 0, 1, gMenuButtonReminderColor, 0, MenuButtonReminders[a0]); + sub_81C7BF8(structPtr->unk10); + AddTextPrinterParameterized3(structPtr->unk10, 1, 0, 1, gMenuButtonReminderColor, 0, sMenuButtonReminders[a0]); } -bool8 sub_81C7BE8(void) +bool32 IsDma3ManagerBusyWithBgCopy_(void) { return IsDma3ManagerBusyWithBgCopy(); } -void sub_81C7BF8(u32 a0) +void sub_81C7BF8(u32 windowId) { - FillWindowPixelBuffer(a0, 0x44); - FillWindowPixelRect(a0, 0x55, 0, 0, 0x80, 1); + FillWindowPixelBuffer(windowId, 0x44); + FillWindowPixelRect(windowId, 0x55, 0, 0, 0x80, 1); } void sub_81C7C28(void) { - u32 *v1; - u32 i; - u8 v2; - u32 v3; - u32 v4; + s32 i; u8 spriteId; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); - v1 = sub_81C763C(0); for (i = 0; i < ARRAY_COUNT(gUnknown_0861FA4C); i++) - { LoadCompressedSpriteSheet(&gUnknown_0861FA4C[i]); - } sub_81C795C(gUnknown_0861FA54); - v2 = IndexOfSpritePaletteTag(0); - v1[5] = ~1 & ~(0x10000 << v2); + structPtr->unk14 = ~1 & ~(0x10000 << IndexOfSpritePaletteTag(0)); spriteId = CreateSprite(&gUnknown_0861FB04, 220, 12, 0); - v1[6] = (u32)(&gSprites[spriteId]); + structPtr->unk18 = &gSprites[spriteId]; } void sub_81C7C94(void) { - void **v1; - v1 = sub_81C763C(0); - DestroySprite(v1[6]); + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + DestroySprite(structPtr->unk18); FreeSpriteTilesByTag(0); FreeSpritePaletteByTag(0); } -void sub_81C7CB4(u16 *a0) +void sub_81C7CB4(struct Sprite *sprite) { - u32 v1; - v1 = GetBgY(0); - a0[19] = (v1 >> 8) * -1; + sprite->pos2.y = (GetBgY(0) / 256u) * -1; } struct Sprite *sub_81C7CCC(void) { - struct Sprite **v1; - struct Sprite *v2; - v1 = sub_81C763C(0); - v2 = v1[6]; - v2->callback = SpriteCallbackDummy; - return v2; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + structPtr->unk18->callback = SpriteCallbackDummy; + return structPtr->unk18; } + +void sub_81C7CE4(void) +{ + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + structPtr->unk18->pos1.x = 220; + structPtr->unk18->pos1.y = 12; + structPtr->unk18->callback = sub_81C7CB4; + structPtr->unk18->invisible = FALSE; + structPtr->unk18->oam.priority = 0; + structPtr->unk18->subpriority = 0; +} + +extern const struct SpriteTemplate gUnknown_0861FB2C; +extern const struct SpriteTemplate gUnknown_0861FB44; +extern const struct CompressedSpriteSheet gUnknown_0861FA6C[]; + +void sub_81C7D28(void) +{ + s32 i, spriteId; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + LoadCompressedSpriteSheet(&gUnknown_0861FA64); + AllocSpritePalette(1); + AllocSpritePalette(2); + for (i = 0; i < 2; i++) + { + spriteId = CreateSprite(&gUnknown_0861FB2C, 0, 0, 1); + structPtr->unk1C[i] = &gSprites[spriteId]; + structPtr->unk1C[i]->invisible = TRUE; + structPtr->unk1C[i]->pos2.x = i * 64; + + spriteId = CreateSprite(&gUnknown_0861FB44, 0, 0, 2); + structPtr->unk24[i] = &gSprites[spriteId]; + structPtr->unk24[i]->invisible = TRUE; + structPtr->unk24[i]->pos2.x = i * 32; + structPtr->unk24[i]->pos2.y = 18; + structPtr->unk24[i]->oam.tileNum += (i * 8) + 64; + } +} + +void sub_81C7DFC(u32 arg0) +{ + if (arg0 < 6) + sub_81C7E58(arg0); + else + sub_81C7F24(arg0 - 6); +} + +void sub_81C7E14(u32 arg0) +{ + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + if (arg0 == 4) + structPtr->unk1C[1]->oam.tileNum = GetSpriteTileStartByTag(2) + 32; + else + structPtr->unk1C[1]->oam.tileNum = GetSpriteTileStartByTag(2) + 64; +} + +void sub_81C7E58(u32 arg0) +{ + struct UnknownSubStruct_0203CF40 *structPtr; + u32 size, tag; + + if (arg0 >= 6) + return; + + structPtr = GetSubstructPtr(0); + tag = gUnknown_0861FA6C[arg0].tag; + size = GetDecompressedDataSize(gUnknown_0861FA6C[arg0].data); + LoadPalette(&gPokenavLeftHeader_Pal[tag * 16], (IndexOfSpritePaletteTag(1) * 16) + 0x100, 0x20); + LZ77UnCompWram(gUnknown_0861FA6C[arg0].data, gDecompressionBuffer); + RequestDma3Copy(gDecompressionBuffer, (void *)VRAM + 0x10000 + (GetSpriteTileStartByTag(2) * 32), size, 1); + structPtr->unk1C[1]->oam.tileNum = GetSpriteTileStartByTag(2) + gUnknown_0861FA6C[arg0].size; + + if (arg0 == 4 || arg0 == 5) + structPtr->unk1C[1]->pos2.x = 56; + else + structPtr->unk1C[1]->pos2.x = 64; +} + +// Needed to match u32/u16 tag field difference. +struct CompressedSpritePalette_ +{ + const u32 *data; // LZ77 compressed palette data + u32 tag; +}; + +extern const struct CompressedSpritePalette_ gUnknown_0861FA9C[]; + +void sub_81C7F24(u32 arg0) +{ + u32 size, tag; + + if (arg0 >= 7) + return; + + tag = gUnknown_0861FA9C[arg0].tag; + size = GetDecompressedDataSize(gUnknown_0861FA9C[arg0].data); + LoadPalette(&gPokenavLeftHeader_Pal[tag * 16], (IndexOfSpritePaletteTag(2) * 16) + 0x100, 0x20); + LZ77UnCompWram(gUnknown_0861FA9C[arg0].data, &gDecompressionBuffer[0x1000]); + RequestDma3Copy(&gDecompressionBuffer[0x1000], (void *)VRAM + 0x10800 + (GetSpriteTileStartByTag(2) * 32), size, 1); +} + +void sub_81C7FA0(u32 arg0, bool32 arg1, bool32 arg2) +{ + u32 var; + + if (!arg1) + var = 0x30; + else + var = 0x10; + + if (arg0 < 6) + sub_81C803C(var, arg2); + else + sub_81C8088(var, arg2); +} + +void sub_81C7FC4(u32 arg0, bool32 arg1) +{ + if (arg0 < 6) + sub_81C80D4(arg1); + else + sub_81C8110(arg1); +} + +void sub_81C7FDC(void) +{ + s32 i; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + for (i = 0; i < 2; i++) + { + structPtr->unk1C[i]->invisible = TRUE; + structPtr->unk24[i]->invisible = TRUE; + } +} + +bool32 sub_81C8010(void) +{ + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + if (structPtr->unk1C[0]->callback == SpriteCallbackDummy && structPtr->unk24[0]->callback == SpriteCallbackDummy) + return FALSE; + else + return TRUE; +} + +void sub_81C803C(u32 arg0, bool32 arg1) +{ + s32 var1, var2, i; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + if (!arg1) + var1 = -96, var2 = 32; + else + var1 = 256, var2 = 160; + + for (i = 0; i < 2; i++) + { + structPtr->unk1C[i]->pos1.y = arg0; + sub_81C814C(structPtr->unk1C[i], var1, var2, 12); + } +} + +void sub_81C8088(u32 arg0, bool32 arg1) +{ + s32 var1, var2, i; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + if (!arg1) + var1 = -96, var2 = 16; + else + var1 = 256, var2 = 192; + + for (i = 0; i < 2; i++) + { + structPtr->unk24[i]->pos1.y = arg0; + sub_81C814C(structPtr->unk24[i], var1, var2, 12); + } +} + +void sub_81C80D4(bool32 arg0) +{ + s32 var1, var2, i; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + if (!arg0) + var1 = 32, var2 = -96; + else + var1 = 192, var2 = 256; + + for (i = 0; i < 2; i++) + { + sub_81C814C(structPtr->unk1C[i], var1, var2, 12); + } +} + +void sub_81C8110(bool32 arg0) +{ + s32 var1, var2, i; + struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0); + + if (!arg0) + var1 = 16, var2 = -96; + else + var1 = 192, var2 = 256; + + for (i = 0; i < 2; i++) + { + sub_81C814C(structPtr->unk24[i], var1, var2, 12); + } +} + +void sub_81C814C(struct Sprite *sprite, s32 arg1, s32 arg2, s32 arg3) +{ + sprite->pos1.x = arg1; + sprite->data[0] = arg1 * 16; + sprite->data[1] = (arg2 - arg1) * 16 / arg3; + sprite->data[2] = arg3; + sprite->data[7] = arg2; + sprite->callback = sub_81C817C; +} + +void sub_81C817C(struct Sprite *sprite) +{ + if (sprite->data[2] != 0) + { + sprite->data[2]--; + sprite->data[0] += sprite->data[1]; + sprite->pos1.x = sprite->data[0] >> 4; + if (sprite->pos1.x < -16 || sprite->pos1.x > 256) + sprite->invisible = TRUE; + else + sprite->invisible = FALSE; + } + else + { + sprite->pos1.x = sprite->data[7]; + sprite->callback = SpriteCallbackDummy; + } +} + +/* +bool32 sub_81C81D4(const void *arg0, void *arg1, s32 arg3) +{ + struct UnknownSubStruct_0203CF40 *structPtr = AllocSubstruct(0x11, 0x8A4); + + if (structPtr == NULL) + return FALSE; +} +*/ From f34903bc45b157bb5fe2bb7074122713eadb920b Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 23 Feb 2019 12:59:20 -0600 Subject: [PATCH 104/217] Decompile more easy_chat.c --- asm/easy_chat.s | 1538 -------------------------------------------- include/graphics.h | 1 + include/strings.h | 8 + src/easy_chat.c | 625 +++++++++++++++++- 4 files changed, 604 insertions(+), 1568 deletions(-) diff --git a/asm/easy_chat.s b/asm/easy_chat.s index caf096f092..50e707ac37 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5,1544 +5,6 @@ .text - thumb_func_start sub_811CE94 -sub_811CE94: @ 811CE94 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - movs r0, 0x98 - lsls r0, 5 - bl Alloc - adds r2, r0, 0 - str r2, [r4] - cmp r2, 0 - beq _0811CEFC - movs r1, 0 - strh r1, [r2] - movs r3, 0xB6 - lsls r3, 2 - adds r0, r2, r3 - str r1, [r0] - adds r3, 0x4 - adds r0, r2, r3 - str r1, [r0] - adds r3, 0x4 - adds r0, r2, r3 - str r1, [r0] - adds r3, 0x4 - adds r0, r2, r3 - str r1, [r0] - adds r3, 0x4 - adds r0, r2, r3 - str r1, [r0] - adds r3, 0x4 - adds r0, r2, r3 - str r1, [r0] - adds r3, 0x4 - adds r0, r2, r3 - str r1, [r0] - adds r3, 0x4 - adds r0, r2, r3 - str r1, [r0] - adds r3, 0x4 - adds r0, r2, r3 - str r1, [r0] - adds r3, 0x4 - adds r0, r2, r3 - str r1, [r0] - bl sub_811BC70 - ldr r1, [r4] - strb r0, [r1, 0xA] - movs r0, 0x1 - b _0811CEFE - .pool -_0811CEFC: - movs r0, 0 -_0811CEFE: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811CE94 - - thumb_func_start sub_811CF04 -sub_811CF04: @ 811CF04 - push {lr} - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r1, 0xC1 - lsls r1, 6 - movs r0, 0 - bl SetGpuReg - pop {r0} - bx r0 - thumb_func_end sub_811CF04 - - thumb_func_start sub_811CF64 -sub_811CF64: @ 811CF64 - push {r4,lr} - bl ResetPaletteFade - ldr r0, =gEasyChatMode_Pal - movs r1, 0 - movs r2, 0x20 - bl LoadPalette - ldr r0, =gUnknown_08597B14 - movs r1, 0x10 - movs r2, 0x20 - bl LoadPalette - ldr r0, =gUnknown_08597B34 - movs r1, 0x40 - movs r2, 0x20 - bl LoadPalette - ldr r0, =gUnknown_08597C1C - movs r1, 0xA0 - movs r2, 0x8 - bl LoadPalette - ldr r4, =gUnknown_08597C24 - adds r0, r4, 0 - movs r1, 0xB0 - movs r2, 0xC - bl LoadPalette - adds r0, r4, 0 - movs r1, 0xF0 - movs r2, 0xC - bl LoadPalette - adds r0, r4, 0 - movs r1, 0x30 - movs r2, 0xC - bl LoadPalette - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811CF64 - - thumb_func_start sub_811CFCC -sub_811CFCC: @ 811CFCC - push {r4,r5,lr} - sub sp, 0x14 - bl sub_811BA88 - adds r5, r0, 0 - cmp r5, 0 - beq _0811D020 - movs r0, 0x1 - adds r1, r5, 0 - movs r2, 0x90 - bl GetStringCenterAlignXOffset - adds r4, r0, 0 - movs r0, 0 - movs r1, 0 - bl FillWindowPixelBuffer - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x1 - str r0, [sp] - movs r0, 0xFF - str r0, [sp, 0x4] - movs r0, 0 - str r0, [sp, 0x8] - movs r0, 0x2 - str r0, [sp, 0xC] - movs r0, 0x3 - str r0, [sp, 0x10] - movs r0, 0 - movs r1, 0x1 - adds r2, r5, 0 - adds r3, r4, 0 - bl sub_811D058 - movs r0, 0 - bl PutWindowTilemap - movs r0, 0 - movs r1, 0x3 - bl CopyWindowToVram -_0811D020: - add sp, 0x14 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_811CFCC - - thumb_func_start sub_811D028 -sub_811D028: @ 811D028 - push {r4-r6,lr} - sub sp, 0xC - ldr r4, [sp, 0x1C] - ldr r5, [sp, 0x20] - ldr r6, [sp, 0x24] - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - lsls r3, 24 - lsrs r3, 24 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r5, 24 - str r4, [sp] - str r5, [sp, 0x4] - str r6, [sp, 0x8] - bl AddTextPrinterParameterized - add sp, 0xC - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_811D028 - - thumb_func_start sub_811D058 -sub_811D058: @ 811D058 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x10 - mov r9, r3 - ldr r3, [sp, 0x30] - ldr r4, [sp, 0x34] - mov r8, r4 - ldr r7, [sp, 0x38] - mov r10, r7 - ldr r5, [sp, 0x3C] - ldr r6, [sp, 0x40] - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - mov r4, r9 - lsls r4, 24 - lsrs r4, 24 - mov r9, r4 - lsls r3, 24 - lsrs r3, 24 - lsls r5, 24 - lsrs r5, 24 - lsls r6, 24 - lsrs r6, 24 - add r4, sp, 0xC - mov r7, r10 - strb r7, [r4] - strb r5, [r4, 0x1] - strb r6, [r4, 0x2] - str r4, [sp] - mov r4, r8 - lsls r4, 24 - asrs r4, 24 - str r4, [sp, 0x4] - str r2, [sp, 0x8] - mov r2, r9 - bl AddTextPrinterParameterized3 - add sp, 0x10 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_811D058 - - thumb_func_start sub_811D0BC -sub_811D0BC: @ 811D0BC - push {lr} - sub sp, 0xC - movs r0, 0x20 - str r0, [sp] - movs r0, 0x14 - str r0, [sp, 0x4] - movs r0, 0x11 - str r0, [sp, 0x8] - movs r0, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect - movs r0, 0x1 - movs r1, 0x1 - movs r2, 0xE0 - bl LoadUserWindowBorderGfx - movs r0, 0x1 - movs r1, 0x1 - movs r2, 0xE - bl sub_8098858 - movs r0, 0 - bl sub_811D104 - movs r0, 0x1 - bl PutWindowTilemap - movs r0, 0 - bl CopyBgTilemapBufferToVram - add sp, 0xC - pop {r0} - bx r0 - thumb_func_end sub_811D0BC - - thumb_func_start sub_811D104 -sub_811D104: @ 811D104 - push {lr} - sub sp, 0x14 - lsls r0, 24 - lsrs r1, r0, 24 - movs r0, 0 - str r0, [sp, 0x10] - str r0, [sp, 0xC] - cmp r1, 0x9 - bhi _0811D1BC - lsls r0, r1, 2 - ldr r1, =_0811D124 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0811D124: - .4byte _0811D14C - .4byte _0811D16A - .4byte _0811D156 - .4byte _0811D160 - .4byte _0811D174 - .4byte _0811D180 - .4byte _0811D18C - .4byte _0811D19C - .4byte _0811D1A8 - .4byte _0811D1B4 -_0811D14C: - add r1, sp, 0x10 - add r0, sp, 0xC - bl sub_811BAD0 - b _0811D1BC -_0811D156: - add r1, sp, 0x10 - add r0, sp, 0xC - bl sub_811BB40 - b _0811D1BC -_0811D160: - add r1, sp, 0x10 - add r0, sp, 0xC - bl sub_811BB08 - b _0811D1BC -_0811D16A: - add r1, sp, 0x10 - add r0, sp, 0xC - bl sub_811BB88 - b _0811D1BC -_0811D174: - ldr r0, =gText_CreateAQuiz - str r0, [sp, 0xC] - b _0811D1BC - .pool -_0811D180: - ldr r0, =gText_SelectTheAnswer - str r0, [sp, 0xC] - b _0811D1BC - .pool -_0811D18C: - ldr r0, =gText_OnlyOnePhrase - str r0, [sp, 0xC] - ldr r0, =gText_OriginalSongWillBeUsed - b _0811D1BA - .pool -_0811D19C: - ldr r0, =gText_LyricsCantBeDeleted - str r0, [sp, 0xC] - b _0811D1BC - .pool -_0811D1A8: - ldr r0, =gText_CombineTwoWordsOrPhrases3 - str r0, [sp, 0xC] - b _0811D1BC - .pool -_0811D1B4: - ldr r0, =gText_YouCannotQuitHere - str r0, [sp, 0xC] - ldr r0, =gText_SectionMustBeCompleted -_0811D1BA: - str r0, [sp, 0x10] -_0811D1BC: - movs r0, 0x1 - movs r1, 0x11 - bl FillWindowPixelBuffer - ldr r2, [sp, 0xC] - cmp r2, 0 - beq _0811D1E0 - movs r0, 0x1 - str r0, [sp] - movs r0, 0xFF - str r0, [sp, 0x4] - movs r0, 0 - str r0, [sp, 0x8] - movs r0, 0x1 - movs r1, 0x1 - movs r3, 0 - bl sub_811D028 -_0811D1E0: - ldr r2, [sp, 0x10] - cmp r2, 0 - beq _0811D1FC - movs r0, 0x11 - str r0, [sp] - movs r0, 0xFF - str r0, [sp, 0x4] - movs r0, 0 - str r0, [sp, 0x8] - movs r0, 0x1 - movs r1, 0x1 - movs r3, 0 - bl sub_811D028 -_0811D1FC: - movs r0, 0x1 - movs r1, 0x3 - bl CopyWindowToVram - add sp, 0x14 - pop {r0} - bx r0 - .pool - thumb_func_end sub_811D104 - - thumb_func_start sub_811D214 -sub_811D214: @ 811D214 - push {lr} - adds r3, r0, 0 - lsls r3, 24 - lsrs r3, 24 - ldr r0, =gUnknown_08597C84 - movs r1, 0x1 - movs r2, 0xE - bl CreateYesNoMenu - pop {r0} - bx r0 - .pool - thumb_func_end sub_811D214 - - thumb_func_start sub_811D230 -sub_811D230: @ 811D230 - push {r4-r6,lr} - sub sp, 0x8 - bl sub_811BA68 - lsls r0, 24 - ldr r6, =0xffffff00 - ldr r4, [sp] - ands r4, r6 - movs r1, 0x3 - orrs r4, r1 - str r4, [sp] - ldr r1, =gUnknown_08597C30 - lsrs r0, 22 - adds r0, r1 - ldrb r3, [r0] - lsls r1, r3, 27 - lsrs r1, 19 - ldr r5, =0xffff00ff - adds r2, r5, 0 - ands r2, r4 - orrs r2, r1 - lsrs r3, 5 - lsls r3, 16 - ldr r1, =0xff00ffff - ands r2, r1 - orrs r2, r3 - str r2, [sp] - ldrb r3, [r0, 0x1] - lsls r3, 24 - ldr r1, =0x00ffffff - ands r1, r2 - orrs r1, r3 - str r1, [sp] - ldrb r1, [r0, 0x2] - ldr r0, [sp, 0x4] - ands r0, r6 - orrs r0, r1 - ands r0, r5 - movs r1, 0xB0 - lsls r1, 4 - orrs r0, r1 - ldr r1, =0x0000ffff - ands r0, r1 - movs r1, 0xD8 - lsls r1, 15 - orrs r0, r1 - str r0, [sp, 0x4] - mov r0, sp - bl AddWindow - ldr r1, =gUnknown_0203A11C - ldr r1, [r1] - strh r0, [r1, 0x2] - lsls r0, 24 - lsrs r0, 24 - bl PutWindowTilemap - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811D230 - - thumb_func_start sub_811D2C8 -sub_811D2C8: @ 811D2C8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x18 - bl sub_811BA94 - adds r4, r0, 0 - bl sub_811BAAC - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x10] - bl sub_811BAA0 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x14] - bl sub_811BA68 - lsls r0, 24 - lsrs r6, r0, 24 - movs r0, 0 - mov r8, r0 - cmp r6, 0x7 - bne _0811D302 - movs r1, 0x1 - mov r8, r1 -_0811D302: - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - ldrb r0, [r0, 0x2] - movs r1, 0x11 - bl FillWindowPixelBuffer - movs r7, 0 - ldr r0, [sp, 0x14] - cmp r7, r0 - bge _0811D402 -_0811D316: - add r0, sp, 0xC - ldr r1, =gUnknown_08597C8C - movs r2, 0x4 - bl memcpy - mov r1, r8 - cmp r1, 0 - beq _0811D32C - add r1, sp, 0xC - movs r0, 0x6 - strb r0, [r1, 0x2] -_0811D32C: - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - adds r2, r1, 0 - adds r2, 0xB - movs r0, 0xFF - strb r0, [r1, 0xB] - adds r0, r2, 0 - add r1, sp, 0xC - bl StringAppend - adds r2, r0, 0 - movs r5, 0 - lsls r0, r7, 4 - mov r9, r0 - adds r1, r7, 0x1 - mov r10, r1 - b _0811D3CE - .pool -_0811D358: - ldrh r0, [r4] - ldr r1, =0x0000ffff - cmp r0, r1 - beq _0811D374 - adds r1, r0, 0 - adds r0, r2, 0 - bl CopyEasyChatWord - adds r2, r0, 0 - adds r4, 0x2 - b _0811D3A2 - .pool -_0811D374: - adds r4, 0x2 - mov r0, r8 - cmp r0, 0 - bne _0811D3A8 - adds r0, r2, 0 - movs r1, 0 - movs r2, 0x4 - bl WriteColorChangeControlCode - adds r2, r0, 0 - movs r1, 0xAE - movs r0, 0xB -_0811D38C: - strb r1, [r2] - adds r2, 0x1 - subs r0, 0x1 - cmp r0, 0 - bge _0811D38C - adds r0, r2, 0 - movs r1, 0 - movs r2, 0x2 - bl WriteColorChangeControlCode - adds r2, r0, 0 -_0811D3A2: - mov r1, r8 - cmp r1, 0 - beq _0811D3AE -_0811D3A8: - add r1, sp, 0xC - movs r0, 0x3 - strb r0, [r1, 0x2] -_0811D3AE: - adds r0, r2, 0 - add r1, sp, 0xC - bl StringAppend - adds r2, r0, 0 - cmp r6, 0x2 - beq _0811D3C4 - cmp r6, 0x7 - beq _0811D3C4 - cmp r6, 0x8 - bne _0811D3CC -_0811D3C4: - cmp r5, 0 - bne _0811D3CC - cmp r7, 0x4 - beq _0811D3D4 -_0811D3CC: - adds r5, 0x1 -_0811D3CE: - ldr r0, [sp, 0x10] - cmp r5, r0 - blt _0811D358 -_0811D3D4: - movs r0, 0xFF - strb r0, [r2] - ldr r0, =gUnknown_0203A11C - ldr r2, [r0] - ldrb r0, [r2, 0x2] - adds r2, 0xB - mov r1, r9 - adds r1, 0x1 - lsls r1, 24 - lsrs r1, 24 - str r1, [sp] - movs r1, 0xFF - str r1, [sp, 0x4] - movs r1, 0 - str r1, [sp, 0x8] - movs r1, 0x1 - movs r3, 0 - bl sub_811D028 - mov r7, r10 - ldr r1, [sp, 0x14] - cmp r7, r1 - blt _0811D316 -_0811D402: - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - ldrb r0, [r0, 0x2] - movs r1, 0x3 - bl CopyWindowToVram - add sp, 0x18 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811D2C8 - - thumb_func_start sub_811D424 -sub_811D424: @ 811D424 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - mov r8, r0 - bl sub_811BA68 - lsls r0, 24 - lsrs r6, r0, 24 - movs r0, 0 - str r0, [sp] - ldr r2, =0x01000200 - mov r0, sp - mov r1, r8 - bl CpuFastSet - cmp r6, 0x2 - beq _0811D450 - cmp r6, 0x8 - bne _0811D4D4 -_0811D450: - ldr r0, =gUnknown_08597C30 - lsls r2, r6, 2 - adds r2, r0 - ldrb r1, [r2] - lsls r3, r1, 27 - lsrs r0, r3, 27 - ldrb r4, [r2, 0x1] - adds r5, r0, r4 - lsls r1, 24 - lsrs r0, r1, 29 - ldrb r2, [r2, 0x2] - adds r2, r0 - mov r12, r2 - adds r6, r0, 0 - cmp r6, r12 - blt _0811D472 - b _0811D5D6 -_0811D472: - mov r9, r3 -_0811D474: - mov r0, r9 - lsrs r3, r0, 27 - subs r7, r3, 0x1 - lsls r2, r6, 5 - adds r0, r2, r7 - lsls r0, 1 - add r0, r8 - ldr r4, =0x00001005 - adds r1, r4, 0 - strh r1, [r0] - adds r7, r3, 0 - adds r3, r2, 0 - adds r4, r6, 0x1 - cmp r7, r5 - bge _0811D4AE - movs r0, 0x80 - lsls r0, 5 - adds r2, r0, 0 - lsls r1, r7, 1 - lsls r0, r6, 6 - add r0, r8 - adds r0, r1, r0 - subs r7, r5, r7 -_0811D4A2: - strh r2, [r0] - adds r0, 0x2 - subs r7, 0x1 - cmp r7, 0 - bne _0811D4A2 - adds r7, r5, 0 -_0811D4AE: - adds r0, r3, r7 - lsls r0, 1 - add r0, r8 - ldr r2, =0x00001007 - adds r1, r2, 0 - strh r1, [r0] - adds r6, r4, 0 - cmp r6, r12 - blt _0811D474 - b _0811D5D6 - .pool -_0811D4D4: - ldr r4, =gUnknown_08597C30 - mov r10, r4 - lsls r6, 2 - mov r9, r6 - mov r3, r9 - add r3, r10 - ldrb r0, [r3] - lsls r2, r0, 24 - lsrs r1, r2, 29 - subs r6, r1, 0x1 - lsls r0, 27 - lsrs r4, r0, 27 - subs r7, r4, 0x1 - adds r0, r4, 0 - ldrb r1, [r3, 0x1] - adds r5, r0, r1 - lsrs r2, 29 - ldrb r3, [r3, 0x2] - adds r3, r2 - mov r12, r3 - lsls r0, r6, 5 - adds r0, r7 - lsls r0, 1 - add r0, r8 - ldr r2, =0x00001001 - adds r1, r2, 0 - strh r1, [r0] - adds r7, r4, 0 - cmp r7, r5 - bge _0811D52A - ldr r4, =0x00001002 - adds r2, r4, 0 - lsls r1, r7, 1 - lsls r0, r6, 6 - add r0, r8 - adds r1, r0 - subs r7, r5, r7 -_0811D51E: - strh r2, [r1] - adds r1, 0x2 - subs r7, 0x1 - cmp r7, 0 - bne _0811D51E - adds r7, r5, 0 -_0811D52A: - lsls r0, r6, 5 - adds r0, r7 - lsls r0, 1 - add r0, r8 - ldr r2, =0x00001003 - adds r1, r2, 0 - strh r1, [r0] - adds r6, 0x1 - cmp r6, r12 - bge _0811D590 - ldr r0, =gUnknown_08597C30 - add r0, r9 - ldrb r0, [r0] - lsls r3, r0, 27 -_0811D546: - lsrs r0, r3, 27 - subs r7, r0, 0x1 - lsls r1, r6, 5 - adds r1, r7 - lsls r1, 1 - add r1, r8 - ldr r4, =0x00001005 - adds r2, r4, 0 - strh r2, [r1] - adds r7, r0, 0 - adds r4, r6, 0x1 - cmp r7, r5 - bge _0811D57C - movs r0, 0x80 - lsls r0, 5 - adds r2, r0, 0 - lsls r1, r7, 1 - lsls r0, r6, 6 - add r0, r8 - adds r1, r0 - subs r7, r5, r7 -_0811D570: - strh r2, [r1] - adds r1, 0x2 - subs r7, 0x1 - cmp r7, 0 - bne _0811D570 - adds r7, r5, 0 -_0811D57C: - lsls r0, r6, 5 - adds r0, r7 - lsls r0, 1 - add r0, r8 - ldr r2, =0x00001007 - adds r1, r2, 0 - strh r1, [r0] - adds r6, r4, 0 - cmp r6, r12 - blt _0811D546 -_0811D590: - mov r0, r9 - add r0, r10 - ldrb r2, [r0] - lsls r2, 27 - lsrs r2, 27 - subs r7, r2, 0x1 - lsls r3, r6, 5 - adds r0, r3, r7 - lsls r0, 1 - add r0, r8 - ldr r4, =0x00001009 - adds r1, r4, 0 - strh r1, [r0] - adds r7, r2, 0 - cmp r7, r5 - bge _0811D5CA - ldr r0, =0x0000100a - adds r2, r0, 0 - lsls r1, r7, 1 - lsls r0, r6, 6 - add r0, r8 - adds r0, r1, r0 - subs r7, r5, r7 -_0811D5BE: - strh r2, [r0] - adds r0, 0x2 - subs r7, 0x1 - cmp r7, 0 - bne _0811D5BE - adds r7, r5, 0 -_0811D5CA: - adds r0, r3, r7 - lsls r0, 1 - add r0, r8 - ldr r2, =0x0000100b - adds r1, r2, 0 - strh r1, [r0] -_0811D5D6: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811D424 - - thumb_func_start sub_811D60C -sub_811D60C: @ 811D60C - push {r4,lr} - sub sp, 0x8 - movs r0, 0x3 - bl GetBgTilemapBuffer - adds r4, r0, 0 - bl sub_811BA68 - lsls r0, 24 - ldr r1, =gUnknown_08597C30 - lsrs r0, 22 - adds r0, r1 - ldrb r1, [r0, 0x3] - cmp r1, 0x2 - beq _0811D63E - cmp r1, 0x2 - bgt _0811D638 - cmp r1, 0x1 - beq _0811D64C - b _0811D67C - .pool -_0811D638: - cmp r1, 0x3 - beq _0811D668 - b _0811D67C -_0811D63E: - movs r0, 0xA8 - lsls r0, 3 - adds r4, r0 - movs r0, 0x20 - str r0, [sp] - str r1, [sp, 0x4] - b _0811D65A -_0811D64C: - movs r0, 0xC0 - lsls r0, 3 - adds r4, r0 - movs r0, 0x20 - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] -_0811D65A: - movs r0, 0x3 - adds r1, r4, 0 - movs r2, 0 - movs r3, 0xB - bl CopyToBgTilemapBufferRect - b _0811D67C -_0811D668: - movs r0, 0x20 - str r0, [sp] - movs r0, 0x4 - str r0, [sp, 0x4] - movs r0, 0x3 - adds r1, r4, 0 - movs r2, 0 - movs r3, 0xA - bl CopyToBgTilemapBufferRect -_0811D67C: - add sp, 0x8 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_811D60C - - thumb_func_start sub_811D684 -sub_811D684: @ 811D684 - push {lr} - movs r0, 0x2 - bl PutWindowTilemap - movs r0, 0x2 - bl CopyBgTilemapBufferToVram - pop {r0} - bx r0 - thumb_func_end sub_811D684 - - thumb_func_start sub_811D698 -sub_811D698: @ 811D698 - push {r4,lr} - adds r4, r0, 0 - bl sub_811DD84 - movs r0, 0x2 - movs r1, 0x11 - bl FillWindowPixelBuffer - cmp r4, 0x1 - beq _0811D6BC - cmp r4, 0x1 - bcc _0811D6B6 - cmp r4, 0x2 - beq _0811D6C2 - b _0811D6C6 -_0811D6B6: - bl sub_811D6F4 - b _0811D6C6 -_0811D6BC: - bl sub_811D758 - b _0811D6C6 -_0811D6C2: - bl sub_811D794 -_0811D6C6: - movs r0, 0x2 - movs r1, 0x2 - bl CopyWindowToVram - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_811D698 - - thumb_func_start sub_811D6D4 -sub_811D6D4: @ 811D6D4 - push {lr} - bl sub_811BBB0 - lsls r0, 24 - cmp r0, 0 - bne _0811D6E8 - movs r0, 0 - bl sub_811D698 - b _0811D6EE -_0811D6E8: - movs r0, 0x1 - bl sub_811D698 -_0811D6EE: - pop {r0} - bx r0 - thumb_func_end sub_811D6D4 - - thumb_func_start sub_811D6F4 -sub_811D6F4: @ 811D6F4 - push {r4-r7,lr} - sub sp, 0xC - movs r5, 0 - movs r7, 0x61 -_0811D6FC: - movs r4, 0 - lsls r0, r7, 24 - lsrs r6, r0, 24 -_0811D702: - lsls r0, r5, 24 - lsrs r0, 24 - adds r5, 0x1 - bl sub_811F3B8 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x16 - beq _0811D742 - bl sub_811F424 - adds r2, r0, 0 - movs r0, 0x54 - adds r3, r4, 0 - muls r3, r0 - adds r3, 0xA - lsls r3, 24 - lsrs r3, 24 - str r6, [sp] - movs r0, 0xFF - str r0, [sp, 0x4] - movs r0, 0 - str r0, [sp, 0x8] - movs r0, 0x2 - movs r1, 0x1 - bl sub_811D028 - adds r4, 0x1 - cmp r4, 0x1 - ble _0811D702 - adds r7, 0x10 - b _0811D6FC -_0811D742: - bl sub_811BBBC - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl sub_811DDAC - add sp, 0xC - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_811D6F4 - - thumb_func_start sub_811D758 -sub_811D758: @ 811D758 - push {r4-r6,lr} - sub sp, 0xC - movs r5, 0 - movs r4, 0xC2 - lsls r4, 23 - ldr r6, =gUnknown_08597C90 -_0811D764: - ldm r6!, {r2} - lsrs r0, r4, 24 - str r0, [sp] - movs r0, 0xFF - str r0, [sp, 0x4] - movs r0, 0 - str r0, [sp, 0x8] - movs r0, 0x2 - movs r1, 0x1 - movs r3, 0xA - bl sub_811D028 - movs r0, 0x80 - lsls r0, 21 - adds r4, r0 - adds r5, 0x1 - cmp r5, 0x3 - bls _0811D764 - add sp, 0xC - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811D758 - - thumb_func_start sub_811D794 -sub_811D794: @ 811D794 - push {lr} - movs r0, 0 - movs r1, 0x4 - bl sub_811D864 - pop {r0} - bx r0 - thumb_func_end sub_811D794 - - thumb_func_start sub_811D7A4 -sub_811D7A4: @ 811D7A4 - push {r4,lr} - bl sub_811BBDC - adds r4, r0, 0 - adds r4, 0x3 - lsls r4, 24 - lsrs r4, 24 - adds r0, r4, 0 - movs r1, 0x1 - bl sub_811D950 - adds r0, r4, 0 - movs r1, 0x1 - bl sub_811D864 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_811D7A4 - - thumb_func_start sub_811D7C8 -sub_811D7C8: @ 811D7C8 - push {r4,lr} - bl sub_811BBDC - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r4, 0 - movs r1, 0x1 - bl sub_811D950 - adds r0, r4, 0 - movs r1, 0x1 - bl sub_811D864 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_811D7C8 - - thumb_func_start sub_811D7EC -sub_811D7EC: @ 811D7EC - push {r4,r5,lr} - bl sub_811BBDC - lsls r0, 24 - lsrs r0, 24 - adds r5, r0, 0 - adds r0, r5, 0x4 - lsls r0, 24 - lsrs r4, r0, 24 - bl sub_811BBE8 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - cmp r4, r0 - bls _0811D80E - adds r4, r0, 0 -_0811D80E: - cmp r5, r4 - bcs _0811D828 - subs r4, r5 - lsls r4, 24 - lsrs r4, 24 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_811D950 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_811D864 -_0811D828: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_811D7EC - - thumb_func_start sub_811D830 -sub_811D830: @ 811D830 - push {r4,r5,lr} - bl sub_811BBDC - lsls r0, 24 - lsrs r5, r0, 24 - bl sub_811DE48 - lsls r0, 24 - lsrs r0, 24 - cmp r5, r0 - bcs _0811D85C - subs r4, r0, r5 - lsls r4, 24 - lsrs r4, 24 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_811D950 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_811D864 -_0811D85C: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_811D830 - - thumb_func_start sub_811D864 -sub_811D864: @ 811D864 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x18 - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - str r1, [sp, 0x14] - lsls r1, r0, 1 - mov r8, r1 - lsls r0, 4 - adds r1, r0, 0 - adds r1, 0x60 - movs r0, 0xFF - ands r1, r0 - adds r1, 0x1 - movs r0, 0 - b _0811D930 -_0811D88E: - movs r6, 0 - movs r2, 0x10 - adds r2, r1 - mov r9, r2 - adds r0, 0x1 - mov r10, r0 - lsls r0, r1, 24 - lsrs r7, r0, 24 -_0811D89E: - mov r1, r8 - lsls r0, r1, 16 - lsrs r0, 16 - movs r2, 0x1 - add r8, r2 - bl sub_811F578 - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, =0x0000ffff - cmp r4, r0 - beq _0811D926 - ldr r5, =gUnknown_0203A11C - ldr r0, [r5] - adds r0, 0xCC - adds r1, r4, 0 - movs r2, 0 - bl CopyEasyChatWordPadded - adds r0, r4, 0 - bl sub_811BF88 - adds r1, r0, 0 - cmp r1, 0 - bne _0811D8FC - ldr r2, [r5] - adds r2, 0xCC - movs r0, 0xD - adds r3, r6, 0 - muls r3, r0 - adds r3, 0x3 - lsls r3, 27 - lsrs r3, 24 - str r7, [sp] - movs r0, 0xFF - str r0, [sp, 0x4] - str r1, [sp, 0x8] - movs r0, 0x2 - movs r1, 0x1 - bl sub_811D028 - b _0811D926 - .pool -_0811D8FC: - ldr r2, [r5] - adds r2, 0xCC - movs r0, 0xD - adds r3, r6, 0 - muls r3, r0 - adds r3, 0x3 - lsls r3, 27 - lsrs r3, 24 - str r7, [sp] - movs r0, 0xFF - str r0, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - movs r0, 0x5 - str r0, [sp, 0xC] - movs r0, 0x3 - str r0, [sp, 0x10] - movs r0, 0x2 - movs r1, 0x1 - bl sub_811D058 -_0811D926: - adds r6, 0x1 - cmp r6, 0x1 - ble _0811D89E - mov r1, r9 - mov r0, r10 -_0811D930: - ldr r2, [sp, 0x14] - cmp r0, r2 - blt _0811D88E - movs r0, 0x2 - movs r1, 0x2 - bl CopyWindowToVram - add sp, 0x18 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_811D864 - - thumb_func_start sub_811D950 -sub_811D950: @ 811D950 - push {r4,r5,lr} - sub sp, 0x8 - lsls r0, 24 - lsls r1, 24 - lsrs r0, 20 - adds r3, r0, 0 - adds r3, 0x60 - movs r0, 0xFF - ands r3, r0 - lsrs r0, r1, 20 - adds r1, r3, r0 - cmp r1, 0xFF - ble _0811D97C - ldr r0, =0xffffff00 - adds r4, r1, r0 - movs r0, 0x80 - lsls r0, 1 - subs r0, r3 - b _0811D97E - .pool -_0811D97C: - movs r4, 0 -_0811D97E: - movs r5, 0xE0 - str r5, [sp] - lsls r0, 16 - lsrs r0, 16 - str r0, [sp, 0x4] - movs r0, 0x2 - movs r1, 0x11 - movs r2, 0 - bl FillWindowPixelRect - cmp r4, 0 - beq _0811D9AA - str r5, [sp] - lsls r0, r4, 16 - lsrs r0, 16 - str r0, [sp, 0x4] - movs r0, 0x2 - movs r1, 0x11 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect -_0811D9AA: - add sp, 0x8 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_811D950 - - thumb_func_start sub_811D9B4 -sub_811D9B4: @ 811D9B4 - push {lr} - movs r0, 0x2 - movs r1, 0x11 - bl FillWindowPixelBuffer - movs r0, 0x2 - movs r1, 0x2 - bl CopyWindowToVram - pop {r0} - bx r0 - thumb_func_end sub_811D9B4 - - thumb_func_start sub_811D9CC -sub_811D9CC: @ 811D9CC - push {lr} - ldr r1, =gUnknown_0203A11C - cmp r0, 0x6 - bhi _0811DA86 - lsls r0, 2 - ldr r1, =_0811D9E8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0811D9E8: - .4byte _0811DA04 - .4byte _0811DA18 - .4byte _0811DA28 - .4byte _0811DA3C - .4byte _0811DA50 - .4byte _0811DA64 - .4byte _0811DA78 -_0811DA04: - ldr r1, =gUnknown_0203A11C - ldr r2, [r1] - movs r0, 0 - strb r0, [r2, 0x6] - ldr r2, [r1] - movs r0, 0xA - b _0811DA84 - .pool -_0811DA18: - ldr r1, =gUnknown_0203A11C - ldr r2, [r1] - movs r3, 0 - movs r0, 0x9 - b _0811DA44 - .pool -_0811DA28: - ldr r1, =gUnknown_0203A11C - ldr r2, [r1] - movs r0, 0xB - strb r0, [r2, 0x6] - ldr r2, [r1] - movs r0, 0x11 - b _0811DA84 - .pool -_0811DA3C: - ldr r1, =gUnknown_0203A11C - ldr r2, [r1] - movs r3, 0 - movs r0, 0x11 -_0811DA44: - strb r0, [r2, 0x6] - ldr r0, [r1] - strb r3, [r0, 0x7] - b _0811DA86 - .pool -_0811DA50: - ldr r1, =gUnknown_0203A11C - ldr r2, [r1] - movs r0, 0x11 - strb r0, [r2, 0x6] - ldr r2, [r1] - movs r0, 0xA - b _0811DA84 - .pool -_0811DA64: - ldr r1, =gUnknown_0203A11C - ldr r2, [r1] - movs r0, 0x12 - strb r0, [r2, 0x6] - ldr r2, [r1] - movs r0, 0x16 - b _0811DA84 - .pool -_0811DA78: - ldr r1, =gUnknown_0203A11C - ldr r2, [r1] - movs r0, 0x16 - strb r0, [r2, 0x6] - ldr r2, [r1] - movs r0, 0x12 -_0811DA84: - strb r0, [r2, 0x7] -_0811DA86: - ldr r1, [r1] - ldrb r0, [r1, 0x6] - movs r3, 0x1 - negs r3, r3 - adds r2, r3, 0 - ldrb r3, [r1, 0x7] - cmp r0, r3 - bcs _0811DA98 - movs r2, 0x1 -_0811DA98: - strb r2, [r1, 0x8] - pop {r0} - bx r0 - .pool - thumb_func_end sub_811D9CC - - thumb_func_start sub_811DAA4 -sub_811DAA4: @ 811DAA4 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r1, [r4] - ldrb r2, [r1, 0x6] - ldrb r0, [r1, 0x7] - cmp r2, r0 - beq _0811DAD4 - ldrb r0, [r1, 0x8] - adds r0, r2, r0 - strb r0, [r1, 0x6] - ldr r0, [r4] - ldrb r0, [r0, 0x6] - bl sub_811DADC - ldr r0, [r4] - ldrb r1, [r0, 0x6] - ldrb r0, [r0, 0x7] - eors r1, r0 - negs r0, r1 - orrs r0, r1 - lsrs r0, 31 - b _0811DAD6 - .pool -_0811DAD4: - movs r0, 0 -_0811DAD6: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811DAA4 - thumb_func_start sub_811DADC sub_811DADC: @ 811DADC push {r4,lr} diff --git a/include/graphics.h b/include/graphics.h index 6a1933ddd8..7cc8475243 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4892,5 +4892,6 @@ extern const u16 gFrontierPassMapCursor_Pal[]; // Easy Chat Screen extern const u32 gEasyChatWindow_Gfx[]; extern const u32 gEasyChatWindow_Tilemap[]; +extern const u16 gEasyChatMode_Pal[]; #endif //GUARD_GRAPHICS_H diff --git a/include/strings.h b/include/strings.h index af16251400..a3e7439430 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2422,5 +2422,13 @@ extern const u8 gText_AllTextBeingEditedWill[]; extern const u8 gText_BeDeletedThatOkay[]; extern const u8 gText_Lady[]; extern const u8 gText_F700sQuiz[]; +extern const u8 gText_CreateAQuiz[]; +extern const u8 gText_SelectTheAnswer[]; +extern const u8 gText_OriginalSongWillBeUsed[]; +extern const u8 gText_LyricsCantBeDeleted[]; +extern const u8 gText_CombineTwoWordsOrPhrases3[]; +extern const u8 gText_OnlyOnePhrase[]; +extern const u8 gText_YouCannotQuitHere[]; +extern const u8 gText_SectionMustBeCompleted[]; #endif // GUARD_STRINGS_H diff --git a/src/easy_chat.c b/src/easy_chat.c index 741064c5ba..5c55cd2ca5 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -20,6 +20,7 @@ #include "string_util.h" #include "strings.h" #include "task.h" +#include "text_window.h" #include "window.h" #include "constants/flags.h" #include "constants/songs.h" @@ -76,11 +77,27 @@ struct EasyChatScreen struct Unk203A11C { u16 unk0; - u8 filler2[0x2]; + u16 windowId; u16 unk4; - u8 filler6[0x2FA]; - u8 unk300[BG_SCREEN_SIZE]; - u8 unkB00[BG_SCREEN_SIZE]; + u8 unk6; + u8 unk7; + s8 unk8; + u8 filler9[0x1]; + u8 unkA; + u8 unkB[0xC1]; + u8 unkCC[0x20C]; + int unk2D8; + int unk2DC; + int unk2E0; + int unk2E4; + int unk2E8; + int unk2EC; + int unk2F0; + int unk2F4; + int unk2F8; + int unk2FC; + u16 unk300[BG_SCREEN_SIZE / 2]; + u16 unkB00[BG_SCREEN_SIZE / 2]; }; struct Unk08597C30 @@ -174,17 +191,17 @@ static void sub_811B9A0(void); static u8 sub_811BA1C(void); static int sub_811BF20(void); static u16 sub_811BF40(void); -u8 sub_811CE94(void); -void sub_811CF64(void); -void sub_811CF04(void); -void sub_811D60C(void); -void sub_811D424(u8 *); -void sub_811D230(void); +static bool8 sub_811CE94(void); +static void sub_811CF64(void); +static void sub_811CF04(void); +static void sub_811D60C(void); +static void sub_811D424(u16 *); +static void sub_811D230(void); void sub_811E948(void); -void sub_811CFCC(void); -void sub_811D0BC(void); -void sub_811D2C8(void); -void sub_811D684(void); +static void sub_811CFCC(void); +static void sub_811D0BC(void); +static void sub_811D2C8(void); +static void sub_811D684(void); void sub_811DE90(void); void sub_811DEC4(void); void sub_811DE5C(u8, u8, u8, u8); @@ -223,16 +240,16 @@ static bool8 sub_811CE54(void); void sub_811DF60(u8, u8); int sub_811E920(int); void sub_811DF90(void); -void sub_811D104(u8); -void sub_811D214(u8); +static void sub_811D104(u8); +static void sub_811D214(u8); void sub_811DFB0(void); -void sub_811D6D4(void); -void sub_811D9CC(int); +static void sub_811D6D4(void); +static void sub_811D9CC(int); void sub_811E3AC(void); bool8 sub_811E418(void); void sub_811DFC8(void); void sub_811E6E0(int); -bool8 sub_811DAA4(void); +static bool8 sub_811DAA4(void); void sub_811E64C(void); void sub_811E050(void); void sub_811E4AC(void); @@ -244,18 +261,27 @@ void sub_811E578(void); void sub_811E088(void); void sub_811DDAC(s16, u8); bool8 sub_811DE10(void); -void sub_811D9B4(void); -void sub_811D698(int); +static void sub_811D9B4(void); +static void sub_811D698(u32); void sub_811E288(void); void sub_811E794(void); void sub_811E380(void); void sub_811E7F8(void); void sub_811E30C(void); -void sub_811D7A4(void); -void sub_811D7C8(void); +static void sub_811D7A4(void); +static void sub_811D7C8(void); int sub_811DE48(void); -void sub_811D7EC(void); -void sub_811D830(void); +static void sub_811D7EC(void); +static void sub_811D830(void); +void sub_811D058(u8, u8, const u8 *, u8, u8, u8, u8, u8, u8); +void sub_811DD84(void); +static void sub_811D6F4(void); +static void sub_811D758(void); +static void sub_811D794(void); +const u8 *sub_811F424(u8); +static void sub_811D864(u8, u8); +static void sub_811D950(u8, u8); +void sub_811DADC(u8); u8 *CopyEasyChatWordPadded(u8 *, u16, u16); extern const struct { @@ -271,6 +297,13 @@ extern const struct BgTemplate gUnknown_08597C54[4]; extern const struct WindowTemplate gUnknown_08597C64[]; extern const u32 gUnknown_08597B54[]; extern const struct Unk08597C30 gUnknown_08597C30[]; +extern const u16 gUnknown_08597B14[]; +extern const u16 gUnknown_08597B34[]; +extern const u16 gUnknown_08597C1C[]; +extern const u16 gUnknown_08597C24[]; +extern const struct WindowTemplate gUnknown_08597C84; +extern const u8 gUnknown_08597C8C[4]; +extern const u8 *const gUnknown_08597C90[4]; void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam) { @@ -2023,19 +2056,19 @@ u8 sub_811BAC4(void) return gEasyChatScreen->mainCursorRow; } -void sub_811BAD0(const u8 **str1, const u8 **str2) +static void GetEasyChatInstructionsText(const u8 **str1, const u8 **str2) { *str1 = gEasyChatScreenTemplates[gEasyChatScreen->templateId].instructionsText1; *str2 = gEasyChatScreenTemplates[gEasyChatScreen->templateId].instructionsText2; } -void sub_811BB08(const u8 **str1, const u8 **str2) +static void GetEasyChatConfirmText(const u8 **str1, const u8 **str2) { *str1 = gEasyChatScreenTemplates[gEasyChatScreen->templateId].confirmText1; *str2 = gEasyChatScreenTemplates[gEasyChatScreen->templateId].confirmText2; } -void sub_811BB40(const u8 **str1, const u8 **str2) +static void sub_811BB40(const u8 **str1, const u8 **str2) { switch (gEasyChatScreen->kind) { @@ -2056,7 +2089,7 @@ void sub_811BB40(const u8 **str1, const u8 **str2) } -void sub_811BB88(const u8 **str1, const u8 **str2) +static void GetEasyChatConfirmDeletionText(const u8 **str1, const u8 **str2) { *str1 = gText_AllTextBeingEditedWill; *str2 = gText_BeDeletedThatOkay; @@ -2133,7 +2166,7 @@ int sub_811BC2C(void) return 0; } -int sub_811BC70(void) +static int sub_811BC70(void) { return sub_811BA3C(); } @@ -3187,3 +3220,535 @@ static bool8 sub_811CE54(void) return TRUE; } + +static bool8 sub_811CE94(void) +{ + gUnknown_0203A11C = Alloc(sizeof(*gUnknown_0203A11C)); + if (!gUnknown_0203A11C) + return FALSE; + + gUnknown_0203A11C->unk0 = 0; + gUnknown_0203A11C->unk2D8 = 0; + gUnknown_0203A11C->unk2DC = 0; + gUnknown_0203A11C->unk2E0 = 0; + gUnknown_0203A11C->unk2E4 = 0; + gUnknown_0203A11C->unk2E8 = 0; + gUnknown_0203A11C->unk2EC = 0; + gUnknown_0203A11C->unk2F0 = 0; + gUnknown_0203A11C->unk2F4 = 0; + gUnknown_0203A11C->unk2F8 = 0; + gUnknown_0203A11C->unk2FC = 0; + gUnknown_0203A11C->unkA = sub_811BC70(); + return TRUE; +} + +static void sub_811CF04(void) +{ + ChangeBgX(3, 0, 0); + ChangeBgY(3, 0, 0); + ChangeBgX(1, 0, 0); + ChangeBgY(1, 0, 0); + ChangeBgX(2, 0, 0); + ChangeBgY(2, 0, 0); + ChangeBgX(0, 0, 0); + ChangeBgY(0, 0, 0); + SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON); +} + +static void sub_811CF64(void) +{ + ResetPaletteFade(); + LoadPalette(gEasyChatMode_Pal, 0, 32); + LoadPalette(gUnknown_08597B14, 1 * 16, 32); + LoadPalette(gUnknown_08597B34, 4 * 16, 32); + LoadPalette(gUnknown_08597C1C, 10 * 16, 8); + LoadPalette(gUnknown_08597C24, 11 * 16, 12); + LoadPalette(gUnknown_08597C24, 15 * 16, 12); + LoadPalette(gUnknown_08597C24, 3 * 16, 12); +} + +static void sub_811CFCC(void) +{ + int xOffset; + const u8 *titleText = sub_811BA88(); + if (!titleText) + return; + + xOffset = GetStringCenterAlignXOffset(1, titleText, 144); + FillWindowPixelBuffer(0, 0); + sub_811D058(0, 1, titleText, xOffset, 1, 0xFF, 0, 2, 3); + PutWindowTilemap(0); + CopyWindowToVram(0, 3); +} + +void sub_811D028(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16)) +{ + AddTextPrinterParameterized(windowId, fontId, str, x, y, speed, callback); +} + +void sub_811D058(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, u8 red, u8 green, u8 blue) +{ + u8 color[3]; + color[0] = red; + color[1] = green; + color[2] = blue; + AddTextPrinterParameterized3(windowId, fontId, left, top, color, speed, str); +} + +static void sub_811D0BC(void) +{ + FillBgTilemapBufferRect(0, 0, 0, 0, 32, 20, 17); + LoadUserWindowBorderGfx(1, 1, 0xE0); + sub_8098858(1, 1, 14); + sub_811D104(0); + PutWindowTilemap(1); + CopyBgTilemapBufferToVram(0); +} + +static void sub_811D104(u8 arg0) +{ + const u8 *text2 = NULL; + const u8 *text1 = NULL; + switch (arg0) + { + case 0: + GetEasyChatInstructionsText(&text1, &text2); + break; + case 2: + sub_811BB40(&text1, &text2); + break; + case 3: + GetEasyChatConfirmText(&text1, &text2); + break; + case 1: + GetEasyChatConfirmDeletionText(&text1, &text2); + break; + case 4: + text1 = gText_CreateAQuiz; + break; + case 5: + text1 = gText_SelectTheAnswer; + break; + case 6: + text1 = gText_OnlyOnePhrase; + text2 = gText_OriginalSongWillBeUsed; + break; + case 7: + text1 = gText_LyricsCantBeDeleted; + break; + case 8: + text1 = gText_CombineTwoWordsOrPhrases3; + break; + case 9: + text1 = gText_YouCannotQuitHere; + text2 = gText_SectionMustBeCompleted; + break; + } + + FillWindowPixelBuffer(1, 0x11); + if (text1) + sub_811D028(1, 1, text1, 0, 1, 0xFF, 0); + + if (text2) + sub_811D028(1, 1, text2, 0, 17, 0xFF, 0); + + CopyWindowToVram(1, 3); +} + +static void sub_811D214(u8 initialCursorPos) +{ + CreateYesNoMenu(&gUnknown_08597C84, 1, 14, initialCursorPos); +} + +static void sub_811D230(void) +{ + u8 var0; + struct WindowTemplate template; + + var0 = sub_811BA68(); + template.bg = 3; + template.tilemapLeft = gUnknown_08597C30[var0].unk0_0; + template.tilemapTop = gUnknown_08597C30[var0].unk0_5; + template.width = gUnknown_08597C30[var0].unk1; + template.height = gUnknown_08597C30[var0].unk2; + template.paletteNum = 11; + template.baseBlock = 0x6C; + gUnknown_0203A11C->windowId = AddWindow(&template); + PutWindowTilemap(gUnknown_0203A11C->windowId); +} + +static void sub_811D2C8(void) +{ + u8 spC[4]; + u16 *ecWord; + u8 numColumns, numRows; + u8 *str; + int var0; + int var1; + int i, j, k; + + ecWord = sub_811BA94(); + numColumns = sub_811BAAC(); + numRows = sub_811BAA0(); + var0 = sub_811BA68(); + var1 = 0; + if (var0 == 7) + var1 = 1; + + FillWindowPixelBuffer(gUnknown_0203A11C->windowId, 0x11); + for (i = 0; i < numRows; i++) + { + memcpy(spC, gUnknown_08597C8C, sizeof(gUnknown_08597C8C)); + if (var1) + spC[2] = 6; + + str = gUnknown_0203A11C->unkB; + gUnknown_0203A11C->unkB[0] = EOS; + str = StringAppend(str, spC); + for (j = 0; j < numColumns; j++) + { + if (*ecWord != 0xFFFF) + { + str = CopyEasyChatWord(str, *ecWord); + ecWord++; + } + else + { + ecWord++; + if (!var1) + { + str = WriteColorChangeControlCode(str, 0, 4); + for (k = 0; k < 12; k++) + { + *str = CHAR_HYPHEN; + str++; + } + + str = WriteColorChangeControlCode(str, 0, 2); + } + } + + if (var1) + spC[2] = 3; + + str = StringAppend(str, spC); + if (var0 == 2 || var0 == 7 || var0 == 8) + { + if (j == 0 && i == 4) + break; + } + } + + *str = EOS; + sub_811D028(gUnknown_0203A11C->windowId, 1, gUnknown_0203A11C->unkB, 0, i * 16 + 1, 0xFF, 0); + } + + CopyWindowToVram(gUnknown_0203A11C->windowId, 3); +} + +static void sub_811D424(u16 *tilemap) +{ + u8 var0; + int right, bottom; + int x, y; + + var0 = sub_811BA68(); + CpuFastFill(0, tilemap, BG_SCREEN_SIZE); + if (var0 == 2 || var0 == 8) + { + right = gUnknown_08597C30[var0].unk0_0 + gUnknown_08597C30[var0].unk1; + bottom = gUnknown_08597C30[var0].unk0_5 + gUnknown_08597C30[var0].unk2; + for (y = gUnknown_08597C30[var0].unk0_5; y < bottom; y++) + { + x = gUnknown_08597C30[var0].unk0_0 - 1; + tilemap[y * 32 + x] = 0x1005; + x++; + for (; x < right; x++) + tilemap[y * 32 + x] = 0x1000; + + tilemap[y* 32 + x] = 0x1007; + } + } + else + { + y = gUnknown_08597C30[var0].unk0_5 - 1; + x = gUnknown_08597C30[var0].unk0_0 - 1; + right = gUnknown_08597C30[var0].unk0_0 + gUnknown_08597C30[var0].unk1; + bottom = gUnknown_08597C30[var0].unk0_5 + gUnknown_08597C30[var0].unk2; + tilemap[y * 32 + x] = 0x1001; + x++; + for (; x < right; x++) + tilemap[y * 32 + x] = 0x1002; + + tilemap[y * 32 + x] = 0x1003; + y++; + for (; y < bottom; y++) + { + x = gUnknown_08597C30[var0].unk0_0 - 1; + tilemap[y * 32 + x] = 0x1005; + x++; + for (; x < right; x++) + tilemap[y * 32 + x] = 0x1000; + + tilemap[y* 32 + x] = 0x1007; + } + + x = gUnknown_08597C30[var0].unk0_0 - 1; + tilemap[y * 32 + x] = 0x1009; + x++; + for (; x < right; x++) + tilemap[y * 32 + x] = 0x100A; + + tilemap[y * 32 + x] = 0x100B; + } +} + +static void sub_811D60C(void) +{ + u8 var0; + u16 *tilemap; + + tilemap = GetBgTilemapBuffer(3); + var0 = sub_811BA68(); + switch (gUnknown_08597C30[var0].unk3) + { + case 2: + tilemap += 0x2A0; + CopyToBgTilemapBufferRect(3, tilemap, 0, 11, 32, 2); + break; + case 1: + tilemap += 0x300; + CopyToBgTilemapBufferRect(3, tilemap, 0, 11, 32, 2); + break; + case 3: + CopyToBgTilemapBufferRect(3, tilemap, 0, 10, 32, 4); + break; + } +} + +static void sub_811D684(void) +{ + PutWindowTilemap(2); + CopyBgTilemapBufferToVram(2); +} + +static void sub_811D698(u32 arg0) +{ + sub_811DD84(); + FillWindowPixelBuffer(2, 0x11); + switch (arg0) + { + case 0: + sub_811D6F4(); + break; + case 1: + sub_811D758(); + break; + case 2: + sub_811D794(); + break; + } + + CopyWindowToVram(2, 2); +} + +static void sub_811D6D4(void) +{ + if (!sub_811BBB0()) + sub_811D698(0); + else + sub_811D698(1); +} + +static void sub_811D6F4(void) +{ + int i; + int x, y; + + i = 0; + y = 97; + while (1) + { + for (x = 0; x < 2; x++) + { + u8 index = sub_811F3B8(i++); + if (index == 22) + { + sub_811DDAC(sub_811BBBC(), 0); + return; + } + + sub_811D028(2, 1, sub_811F424(index), x * 84 + 10, y, 0xFF, NULL); + } + + y += 16; + } +} + +static void sub_811D758(void) +{ + u32 i; + + for (i = 0; i < 4; i++) + sub_811D028(2, 1, gUnknown_08597C90[i], 10, 97 + i * 16, 0xFF, NULL); +} + +static void sub_811D794(void) +{ + sub_811D864(0, 4); +} + +static void sub_811D7A4(void) +{ + u8 var0 = sub_811BBDC() + 3; + sub_811D950(var0, 1); + sub_811D864(var0, 1); +} + +static void sub_811D7C8(void) +{ + u8 var0 = sub_811BBDC(); + sub_811D950(var0, 1); + sub_811D864(var0, 1); +} + +static void sub_811D7EC(void) +{ + u8 var0 = sub_811BBDC(); + u8 var1 = var0 + 4; + u8 var2 = sub_811BBE8() + 1; + if (var1 > var2) + var1 = var2; + + if (var0 < var1) + { + u8 var3 = var1 - var0; + sub_811D950(var0, var3); + sub_811D864(var0, var3); + } +} + +static void sub_811D830(void) +{ + u8 var0 = sub_811BBDC(); + u8 var1 = sub_811DE48(); + if (var0 < var1) + { + u8 var2 = var1 - var0; + sub_811D950(var0, var2); + sub_811D864(var0, var2); + } +} + +static void sub_811D864(u8 arg0, u8 arg1) +{ + int i, j; + u16 easyChatWord; + u8 *str; + int y; + int var0; + + var0 = arg0 * 2; + y = (arg0 * 16 + 96) & 0xFF; + y++; + for (i = 0; i < arg1; i++) + { + for (j = 0; j < 2; j++) + { + easyChatWord = sub_811F578(var0++); + if (easyChatWord != 0xFFFF) + { + CopyEasyChatWordPadded(gUnknown_0203A11C->unkCC, easyChatWord, 0); + if (!sub_811BF88(easyChatWord)) + sub_811D028(2, 1, gUnknown_0203A11C->unkCC, (j * 13 + 3) * 8, y, 0xFF, NULL); + else + sub_811D058(2, 1, gUnknown_0203A11C->unkCC, (j * 13 + 3) * 8, y, 0xFF, 1, 5, 3); + } + } + + y += 16; + } + + CopyWindowToVram(2, 2); +} + +static void sub_811D950(u8 arg0, u8 arg1) +{ + int y; + int var0; + int var1; + int var2; + + y = (arg0 * 16 + 96) & 0xFF; + var2 = arg1 * 16; + var0 = y + var2; + if (var0 > 255) + { + var1 = var0 - 256; + var2 = 256 - y; + } + else + { + var1 = 0; + } + + FillWindowPixelRect(2, 0x11, 0, y, 224, var2); + if (var1) + FillWindowPixelRect(2, 0x11, 0, 0, 224, var1); +} + +static void sub_811D9B4(void) +{ + FillWindowPixelBuffer(2, 0x11); + CopyWindowToVram(2, 2); +} + +static void sub_811D9CC(int arg0) +{ + switch (arg0) + { + case 0: + gUnknown_0203A11C->unk6 = 0; + gUnknown_0203A11C->unk7 = 10; + break; + case 1: + gUnknown_0203A11C->unk6 = 9; + gUnknown_0203A11C->unk7 = 0; + break; + case 2: + gUnknown_0203A11C->unk6 = 11; + gUnknown_0203A11C->unk7 = 17; + break; + case 3: + gUnknown_0203A11C->unk6 = 17; + gUnknown_0203A11C->unk7 = 0; + break; + case 4: + gUnknown_0203A11C->unk6 = 17; + gUnknown_0203A11C->unk7 = 10; + break; + case 5: + gUnknown_0203A11C->unk6 = 18; + gUnknown_0203A11C->unk7 = 22; + break; + case 6: + gUnknown_0203A11C->unk6 = 22; + gUnknown_0203A11C->unk7 = 18; + break; + } + + gUnknown_0203A11C->unk8 = gUnknown_0203A11C->unk6 < gUnknown_0203A11C->unk7 ? 1 : -1; +} + +static bool8 sub_811DAA4(void) +{ + u8 var0, var1; + if (gUnknown_0203A11C->unk6 == gUnknown_0203A11C->unk7) + return FALSE; + + gUnknown_0203A11C->unk6 += gUnknown_0203A11C->unk8; + sub_811DADC(gUnknown_0203A11C->unk6); + var0 = gUnknown_0203A11C->unk6; + var1 = gUnknown_0203A11C->unk7; + return (var0 ^ var1) > 0; +} From 74a3c062706c3889c08a567ee9d9803a8a689592 Mon Sep 17 00:00:00 2001 From: Ariel Antonitis Date: Tue, 19 Feb 2019 04:09:42 -0500 Subject: [PATCH 105/217] Documented/polished pokemon_summary_screen.c Mostly variables mislabeled as global and some formerly unknown stuff. --- include/graphics.h | 14 +- include/pokemon.h | 8 +- include/pokemon_summary_screen.h | 2 +- src/battle_factory_screen.c | 4 +- src/graphics.c | 14 +- src/party_menu.c | 6 +- src/pokemon.c | 24 +- src/pokemon_storage_system.c | 4 +- src/pokemon_summary_screen.c | 426 ++++++++++++++++--------------- src/trade.c | 4 +- 10 files changed, 254 insertions(+), 252 deletions(-) diff --git a/include/graphics.h b/include/graphics.h index d313bae118..6e6d2b4fc0 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4020,22 +4020,22 @@ extern const u32 gPokenavLeftHeaderCondition_Gfx[]; extern const u32 gPokenavLeftHeaderRibbons_Gfx[]; extern const u32 gPokenavLeftHeaderMatchCall_Gfx[]; -extern const u32 gUnknown_08D9862C[]; +extern const u32 gPageInfoTilemap[]; extern const u32 gUnknown_08D98CC8[]; -extern const u32 gUnknown_08D987FC[]; -extern const u32 gUnknown_08D9898C[]; -extern const u32 gUnknown_08D98B28[]; -extern const u32 gUnknown_08D9853C[]; +extern const u32 gPageSkillsTilemap[]; +extern const u32 gPageBattleMovesTilemap[]; +extern const u32 gPageContestMovesTilemap[]; +extern const u32 gStatusScreenPalette[]; extern const u16 gUnknown_08D85620[]; extern const u16 gSummaryScreenWindow_Tilemap[]; extern const u32 gMoveTypes_Pal[]; -extern const u32 gUnknown_08D97D0C[]; +extern const u32 gStatusScreenBitmap[]; extern const u16 gSummaryScreenPowAcc_Tilemap[]; extern const u16 gUnknown_08DC3C34[]; extern const u32 gMoveTypes_Gfx[]; -extern const u32 gUnknown_08D97BEC[]; +extern const u32 gMoveSelectorBitmap[]; extern const u32 gUnknown_08D97CF4[]; extern const u32 gStatusGfx_Icons[]; extern const u32 gStatusPal_Icons[]; diff --git a/include/pokemon.h b/include/pokemon.h index 5074976838..60ccb27f41 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -431,9 +431,9 @@ extern const u8 *const gItemEffectTable[]; extern const struct Evolution gEvolutionTable[][EVOS_PER_MON]; extern const u32 gExperienceTables[][MAX_LEVEL + 1]; extern const u16 *const gLevelUpLearnsets[]; -extern const u8 gUnknown_08329D22[]; -extern const u8 gUnknown_08329D26[]; -extern const u8 gUnknown_08329D2A[]; +extern const u8 gPPUpGetMask[]; +extern const u8 gPPUpSetMask[]; +extern const u8 gPPUpAddMask[]; extern const u8 gStatStageRatios[][2]; extern const u16 gUnknown_08329D54[]; extern const struct SpriteTemplate gUnknown_08329D98[]; @@ -583,7 +583,7 @@ const u8 *GetTrainerPartnerName(void); void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3); void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3); void PokemonSummaryDoMonAnimation(struct Sprite* sprite, u16 species, bool8 oneFrame); -void sub_806EE98(void); +void StopPokemonAnimationDelayTask(void); void BattleAnimateBackSprite(struct Sprite* sprite, u16 species); u8 sub_806EF08(u8 arg0); u8 sub_806EF84(u8 arg0, u8 arg1); diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index e2226b1e19..bd99fed0ec 100755 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -1,7 +1,7 @@ #ifndef GUARD_POKEMON_SUMMARY_SCREEN_H #define GUARD_POKEMON_SUMMARY_SCREEN_H -extern u8 gUnknown_0203CF20; +extern u8 gLastViewedMonIndex; void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)); void sub_81C4F98(u8, void(*)(void)); diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index bb9fe8e280..e48dbd30b8 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -1183,7 +1183,7 @@ static void CB2_InitSelectScreen(void) break; case 5: if (sFactorySelectScreen->fromSummaryScreen == TRUE) - sFactorySelectScreen->cursorPos = gUnknown_0203CF20; + sFactorySelectScreen->cursorPos = gLastViewedMonIndex; Select_InitMonsData(); Select_InitAllSprites(); if (sFactorySelectScreen->fromSummaryScreen == TRUE) @@ -3172,7 +3172,7 @@ static void CB2_InitSwapScreen(void) break; case 5: if (sFactorySwapScreen->fromSummaryScreen == TRUE) - sFactorySwapScreen->cursorPos = gUnknown_0203CF20; + sFactorySwapScreen->cursorPos = gLastViewedMonIndex; gMain.state++; break; case 6: diff --git a/src/graphics.c b/src/graphics.c index c6af134770..a3b9eb9131 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1152,16 +1152,16 @@ const u32 gStatusPal_Icons[] = INCBIN_U32("graphics/interface/status_icons.gbapa const u32 gMoveTypes_Gfx[] = INCBIN_U32("graphics/types/move_types.4bpp.lz"); const u32 gMoveTypes_Pal[] = INCBIN_U32("graphics/types/move_types.gbapal.lz"); -const u32 gUnknown_08D97BEC[] = INCBIN_U32("graphics/interface/summary_frames.4bpp.lz"); +const u32 gMoveSelectorBitmap[] = INCBIN_U32("graphics/interface/summary_frames.4bpp.lz"); const u32 gUnknown_08D97CF4[] = INCBIN_U32("graphics/interface/summary_frames.gbapal.lz"); -const u32 gUnknown_08D97D0C[] = INCBIN_U32("graphics/interface/status_screen.4bpp.lz"); -const u32 gUnknown_08D9853C[] = INCBIN_U32("graphics/interface/status_screen.gbapal.lz"); -const u32 gUnknown_08D9862C[] = INCBIN_U32("graphics/interface/status_screen.bin.lz"); +const u32 gStatusScreenBitmap[] = INCBIN_U32("graphics/interface/status_screen.4bpp.lz"); +const u32 gStatusScreenPalette[] = INCBIN_U32("graphics/interface/status_screen.gbapal.lz"); +const u32 gPageInfoTilemap[] = INCBIN_U32("graphics/interface/status_screen.bin.lz"); -const u32 gUnknown_08D987FC[] = INCBIN_U32("graphics/interface/status_tilemap1.bin.lz"); -const u32 gUnknown_08D9898C[] = INCBIN_U32("graphics/interface/status_tilemap2.bin.lz"); -const u32 gUnknown_08D98B28[] = INCBIN_U32("graphics/interface/status_tilemap3.bin.lz"); +const u32 gPageSkillsTilemap[] = INCBIN_U32("graphics/interface/status_tilemap1.bin.lz"); +const u32 gPageBattleMovesTilemap[] = INCBIN_U32("graphics/interface/status_tilemap2.bin.lz"); +const u32 gPageContestMovesTilemap[] = INCBIN_U32("graphics/interface/status_tilemap3.bin.lz"); const u32 gUnknown_08D98CC8[] = INCBIN_U32("graphics/interface/status_tilemap0.bin.lz"); const u32 gBagMaleTiles[] = INCBIN_U32("graphics/misc/bag_male.4bpp.lz"); diff --git a/src/party_menu.c b/src/party_menu.c index 15b5d24d8e..645390affd 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -3833,7 +3833,7 @@ static void sub_81B3828(void) static void sub_81B3894(void) { gPaletteFade.bufferTransferDisabled = TRUE; - gUnknown_0203CEC8.unk9 = gUnknown_0203CF20; + gUnknown_0203CEC8.unk9 = gLastViewedMonIndex; InitPartyMenu(gUnknown_0203CEC8.unk8_0, 0xFF, gUnknown_0203CEC8.unkB, 1, 21, sub_81B36FC, gUnknown_0203CEC8.exitCallback); } @@ -7319,9 +7319,9 @@ static void sub_81B97DC(struct Pokemon *mon, u8 slotTo, u8 slotFrom) u8 pp1 = GetMonData(mon, MON_DATA_PP1 + slotTo); u8 pp0 = GetMonData(mon, MON_DATA_PP1 + slotFrom); u8 ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES); - u8 ppBonusMask1 = gUnknown_08329D22[slotTo]; + u8 ppBonusMask1 = gPPUpGetMask[slotTo]; u8 ppBonusMove1 = (ppBonuses & ppBonusMask1) >> (slotTo * 2); - u8 ppBonusMask2 = gUnknown_08329D22[slotFrom]; + u8 ppBonusMask2 = gPPUpGetMask[slotFrom]; u8 ppBonusMove2 = (ppBonuses & ppBonusMask2) >> (slotFrom * 2); ppBonuses &= ~ppBonusMask1; ppBonuses &= ~ppBonusMask2; diff --git a/src/pokemon.c b/src/pokemon.c index 9553fdf17f..a35033d498 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2227,9 +2227,9 @@ static const u8 sMonAnimationDelayTable[] = [SPECIES_CHIMECHO - 1] = 0x00, }; -const u8 gUnknown_08329D22[] = {0x03, 0x0c, 0x30, 0xc0}; // Masks for getting PP Up count, also PP Max values -const u8 gUnknown_08329D26[] = {0xfc, 0xf3, 0xcf, 0x3f}; // Masks for setting PP Up count -const u8 gUnknown_08329D2A[] = {0x01, 0x04, 0x10, 0x40}; // Values added to PP Up count +const u8 gPPUpGetMask[] = {0x03, 0x0c, 0x30, 0xc0}; // Masks for getting PP Up count, also PP Max values +const u8 gPPUpSetMask[] = {0xfc, 0xf3, 0xcf, 0x3f}; // Masks for setting PP Up count +const u8 gPPUpAddMask[] = {0x01, 0x04, 0x10, 0x40}; // Values added to PP Up count const u8 gStatStageRatios[][2] = { @@ -4914,19 +4914,19 @@ void GetSpeciesName(u8 *name, u16 species) u8 CalculatePPWithBonus(u16 move, u8 ppBonuses, u8 moveIndex) { u8 basePP = gBattleMoves[move].pp; - return basePP + ((basePP * 20 * ((gUnknown_08329D22[moveIndex] & ppBonuses) >> (2 * moveIndex))) / 100); + return basePP + ((basePP * 20 * ((gPPUpGetMask[moveIndex] & ppBonuses) >> (2 * moveIndex))) / 100); } void RemoveMonPPBonus(struct Pokemon *mon, u8 moveIndex) { u8 ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES, NULL); - ppBonuses &= gUnknown_08329D26[moveIndex]; + ppBonuses &= gPPUpSetMask[moveIndex]; SetMonData(mon, MON_DATA_PP_BONUSES, &ppBonuses); } void RemoveBattleMonPPBonus(struct BattlePokemon *mon, u8 moveIndex) { - mon->ppBonuses &= gUnknown_08329D26[moveIndex]; + mon->ppBonuses &= gPPUpSetMask[moveIndex]; } void CopyPlayerPartyMonToBattleData(u8 battlerId, u8 partyIndex) @@ -5169,11 +5169,11 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov if (r10 & 0x20) { r10 &= ~0x20; - dataUnsigned = (GetMonData(mon, MON_DATA_PP_BONUSES, NULL) & gUnknown_08329D22[moveIndex]) >> (moveIndex * 2); + dataUnsigned = (GetMonData(mon, MON_DATA_PP_BONUSES, NULL) & gPPUpGetMask[moveIndex]) >> (moveIndex * 2); var_38 = CalculatePPWithBonus(GetMonData(mon, MON_DATA_MOVE1 + moveIndex, NULL), GetMonData(mon, MON_DATA_PP_BONUSES, NULL), moveIndex); if (dataUnsigned <= 2 && var_38 > 4) { - dataUnsigned = GetMonData(mon, MON_DATA_PP_BONUSES, NULL) + gUnknown_08329D2A[moveIndex]; + dataUnsigned = GetMonData(mon, MON_DATA_PP_BONUSES, NULL) + gPPUpAddMask[moveIndex]; SetMonData(mon, MON_DATA_PP_BONUSES, &dataUnsigned); dataUnsigned = CalculatePPWithBonus(GetMonData(mon, MON_DATA_MOVE1 + moveIndex, NULL), dataUnsigned, moveIndex) - var_38; @@ -5429,13 +5429,13 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov var_3C++; break; case 4: - dataUnsigned = (GetMonData(mon, MON_DATA_PP_BONUSES, NULL) & gUnknown_08329D22[moveIndex]) >> (moveIndex * 2); + dataUnsigned = (GetMonData(mon, MON_DATA_PP_BONUSES, NULL) & gPPUpGetMask[moveIndex]) >> (moveIndex * 2); r5 = CalculatePPWithBonus(GetMonData(mon, MON_DATA_MOVE1 + moveIndex, NULL), GetMonData(mon, MON_DATA_PP_BONUSES, NULL), moveIndex); if (dataUnsigned < 3 && r5 > 4) { dataUnsigned = GetMonData(mon, MON_DATA_PP_BONUSES, NULL); - dataUnsigned &= gUnknown_08329D26[moveIndex]; - dataUnsigned += gUnknown_08329D2A[moveIndex] * 3; + dataUnsigned &= gPPUpSetMask[moveIndex]; + dataUnsigned += gPPUpAddMask[moveIndex] * 3; SetMonData(mon, MON_DATA_PP_BONUSES, &dataUnsigned); dataUnsigned = CalculatePPWithBonus(GetMonData(mon, MON_DATA_MOVE1 + moveIndex, NULL), dataUnsigned, moveIndex) - r5; @@ -7025,7 +7025,7 @@ void PokemonSummaryDoMonAnimation(struct Sprite* sprite, u16 species, bool8 oneF } } -void sub_806EE98(void) +void StopPokemonAnimationDelayTask(void) { u8 delayTaskId = FindTaskIdByFunc(Task_PokemonSummaryAnimateAfterDelay); if (delayTaskId != 0xFF) diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index c1ebe91b47..6f2382290d 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -1218,7 +1218,7 @@ static const u16 gWallpaperPalettes_Plain[][16] = static const u32 gWallpaperTiles_Plain[] = INCBIN_U32("graphics/pokemon_storage/plain.4bpp.lz"); static const u32 gWallpaperTilemap_Plain[] = INCBIN_U32("graphics/pokemon_storage/plain.bin.lz"); -// 12×18 tilemap +// 12�18 tilemap static const u32 gUnknown_085773C4[] = INCBIN_U32("graphics/unused/tilemap_5773C4.bin"); static const u16 gUnknown_08577574[][2] = @@ -6654,7 +6654,7 @@ static void sub_80CE8E4(void) if (sIsMonBeingMoved) sub_80CE790(); else - sBoxCursorPosition = gUnknown_0203CF20; + sBoxCursorPosition = gLastViewedMonIndex; } s16 CompactPartySlots(void) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 46bdc9ef36..bb49e6dc1e 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -97,24 +97,24 @@ static EWRAM_DATA struct PssData u8 currPageIndex; u8 minPageIndex; u8 maxPageIndex; - bool8 unk40C3; + bool8 lockMonFlag; // This is used to prevent the player from changing pokemon in the move deleter select, etc, but it is not needed because the input is handled differently there u16 newMove; u8 firstMoveIndex; u8 secondMoveIndex; bool8 unk40C8; - u8 unk40C9; + u8 bgDisplayOrder; // Determines the order page backgrounds are loaded while scrolling between them u8 filler40CA; u8 windowIds[8]; u8 spriteIds[28]; bool8 unk40EF; - s16 unk40F0; + s16 switchCounter; // Used for various switch statement cases that decompress/load graphics or pokemon data u8 unk_filler4[6]; } *pssData = NULL; -EWRAM_DATA u8 gUnknown_0203CF20 = 0; -static EWRAM_DATA u8 gUnknown_0203CF21 = 0; -static EWRAM_DATA u8 gFiller_0203CF22[2] = {0}; +EWRAM_DATA u8 gLastViewedMonIndex = 0; +static EWRAM_DATA u8 sUnknown_0203CF21 = 0; +static EWRAM_DATA u8 sFiller_0203CF22[2] = {0}; static EWRAM_DATA u8 sUnknownTaskId = 0; -static EWRAM_DATA u8 gFiller_0203CF25[3] = {0}; +static EWRAM_DATA u8 sFiller_0203CF25[3] = {0}; extern const struct CompressedSpriteSheet gMonFrontPicTable[]; @@ -144,11 +144,11 @@ static s8 sub_81C08F8(s8 a); static s8 sub_81C09B4(s8 a); static bool8 sub_81C0A50(struct Pokemon* mon); static void ChangePage(u8 taskId, s8 a); -static void sub_81C0B8C(u8 taskId); -static void sub_81C0C68(u8 taskId); -static void sub_81C0CC4(u8 taskId); -static void sub_81C0D44(u8 taskId); -static void sub_81C0E24(void); +static void PssScrollRight(u8 taskId); +static void PssScrollRightEnd(u8 taskId); +static void PssScrollLeft(u8 taskId); +static void PssScrollLeftEnd(u8 taskId); +static void CheckExperienceProgressBar(void); static void sub_81C0E48(u8 taskId); static void HandleInput_MoveSelect(u8 taskId); static bool8 sub_81C1040(void); @@ -160,11 +160,11 @@ static void sub_81C13B0(u8 taskId, bool8 b); static void SwapMonMoves(struct Pokemon *mon, u8 moveIndex1, u8 moveIndex2); static void SwapBoxMonMoves(struct BoxPokemon *mon, u8 moveIndex1, u8 moveIndex2); static void sub_81C171C(u8 taskId); -static void sub_81C174C(u8 taskId); -static bool8 sub_81C18A8(void); -static void sub_81C18F4(u8 a); -static void sub_81C1940(u8 taskId); -static void sub_81C1BA0(void); +static void HandleReplaceMoveInput(u8 taskId); +static bool8 CanReplaceMove(void); +static void ShowHMMovesCantBeForgottenWindow(u8 a); +static void HandleHMMovesCantBeForgottenInput(u8 taskId); +static void DrawPagination(void); static void sub_81C1DA4(u16 a, s16 b); static void sub_81C1E20(u8 taskId); static void sub_81C1EFC(u16 a, s16 b, u16 c); @@ -172,10 +172,10 @@ static void sub_81C1F80(u8 taskId); static void sub_81C2074(u16 a, s16 b); static void sub_81C20F0(u8 taskId); static void sub_81C2194(u16 *a, u16 b, u8 c); -static void sub_81C2228(struct Pokemon* mon); +static void DrawPokerusCuredSymbol(struct Pokemon* mon); static void DrawExperienceProgressBar(struct Pokemon* mon); static void DrawContestMoveHearts(u16 move); -static void sub_81C2524(void); +static void LimitEggSummaryPageDisplay(void); static void ResetWindows(void); static void sub_81C25E8(void); static void sub_81C2628(void); @@ -237,7 +237,7 @@ static void sub_81C4568(u8 a, u8 b); static u8 CreatePokemonSprite(struct Pokemon *a, s16 *b); static u8 sub_81C47B4(struct Pokemon *unused); static void SpriteCB_Pokemon(struct Sprite *); -static void sub_81C48F0(void); +static void StopPokemonAnimations(void); static void CreateMonMarkingsSprite(struct Pokemon *mon); static void RemoveAndCreateMonMarkingsSprite(struct Pokemon *mon); static void CreateCaughtBallSprite(struct Pokemon *mon); @@ -252,7 +252,7 @@ static void sub_81C4D18(u8 a); #include "data/text/move_descriptions.h" #include "data/text/nature_names.h" -static const struct BgTemplate gUnknown_0861CBB4[] = +static const struct BgTemplate sUnknown_0861CBB4[] = { { .bg = 0, @@ -292,25 +292,25 @@ static const struct BgTemplate gUnknown_0861CBB4[] = }, }; -static const u16 gUnknown_0861CBC4[] = INCBIN_U16("graphics/interface/unk_tilemap2.bin"); -static const struct UnkStruct_61CC04 gUnknown_0861CBEC = +static const u16 sUnknown_0861CBC4[] = INCBIN_U16("graphics/interface/unk_tilemap2.bin"); +static const struct UnkStruct_61CC04 sUnknown_0861CBEC = { - gUnknown_0861CBC4, 1, 10, 2, 0, 18 + sUnknown_0861CBC4, 1, 10, 2, 0, 18 }; -static const struct UnkStruct_61CC04 gUnknown_0861CBF8 = +static const struct UnkStruct_61CC04 sUnknown_0861CBF8 = { - gUnknown_0861CBC4, 1, 10, 2, 0, 50 + sUnknown_0861CBC4, 1, 10, 2, 0, 50 }; -static const struct UnkStruct_61CC04 gUnknown_0861CC04 = +static const struct UnkStruct_61CC04 sUnknown_0861CC04 = { gSummaryScreenPowAcc_Tilemap, 0, 10, 7, 0, 45 }; -static const struct UnkStruct_61CC04 gUnknown_0861CC10 = +static const struct UnkStruct_61CC04 sUnknown_0861CC10 = { gUnknown_08DC3C34, 0, 10, 7, 0, 45 }; static const s8 gUnknown_0861CC1C[] = {0, 2, 3, 1, 4, 5}; -static const struct WindowTemplate gUnknown_0861CC24[] = +static const struct WindowTemplate sSummaryTemplate[] = { {//Text for Pokemon Info .bg = 0, @@ -494,7 +494,7 @@ static const struct WindowTemplate gUnknown_0861CC24[] = }, DUMMY_WIN_TEMPLATE }; -static const struct WindowTemplate gUnknown_0861CCCC[] = +static const struct WindowTemplate sPageInfoTemplate[] = { {//Original Trainer .bg = 0, @@ -533,7 +533,7 @@ static const struct WindowTemplate gUnknown_0861CCCC[] = .baseBlock = 557, }, }; -static const struct WindowTemplate gUnknown_0861CCEC[] = +static const struct WindowTemplate sPageSkillsTemplate[] = { {//Held Item string .bg = 0, @@ -581,7 +581,7 @@ static const struct WindowTemplate gUnknown_0861CCEC[] = .baseBlock = 543, }, }; -static const struct WindowTemplate gUnknown_0861CD14[] = +static const struct WindowTemplate sPageMovesTemplate[] = // This is used for both battle and contest moves { {//Move names? .bg = 0, @@ -628,8 +628,8 @@ static const u8 sTextColors_861CD2C[][3] = {0, 7, 8} }; -static const u8 gUnknown_0861CD53[] = INCBIN_U8("graphics/interface/summary_a_button.4bpp"); -static const u8 gUnknown_0861CDD3[] = INCBIN_U8("graphics/interface/summary_b_button.4bpp"); +static const u8 sSummaryAButtonBitmap[] = INCBIN_U8("graphics/interface/summary_a_button.4bpp"); +static const u8 sSummaryBButtonBitmap[] = INCBIN_U8("graphics/interface/summary_b_button.4bpp"); static void (*const sTextPrinterFunctions[])(void) = { @@ -647,11 +647,11 @@ static void (*const sTextPrinterTasks[])(u8 taskId) = Task_PrintContestMoves }; -static const u8 gUnknown_0861CE74[] = _("{COLOR LIGHT_RED}{SHADOW GREEN}"); -static const u8 gUnknown_0861CE7B[] = _("{COLOR WHITE}{SHADOW DARK_GREY}"); -static const u8 gUnknown_0861CE82[] = _("{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}\n{SPECIAL_F7 0x02}\n{SPECIAL_F7 0x03}"); -static const u8 gUnknown_0861CE8E[] = _("{SPECIAL_F7 0x00}\n{SPECIAL_F7 0x01}\n{SPECIAL_F7 0x02}"); -static const u8 gUnknown_0861CE97[] = _("{PP}{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}"); +static const u8 sMemoNatureTextColor[] = _("{COLOR LIGHT_RED}{SHADOW GREEN}"); +static const u8 sMemoMiscTextColor[] = _("{COLOR WHITE}{SHADOW DARK_GREY}"); // This is also affected by palettes, apparently +static const u8 sStatsLeftColumnLayout[] = _("{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}\n{SPECIAL_F7 0x02}\n{SPECIAL_F7 0x03}"); +static const u8 sStatsRightColumnLayout[] = _("{SPECIAL_F7 0x00}\n{SPECIAL_F7 0x01}\n{SPECIAL_F7 0x02}"); +static const u8 sMovesPPLayout[] = _("{PP}{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}"); #define TAG_MOVE_TYPES 30002 @@ -847,61 +847,61 @@ static const struct OamData gOamData_861CFF4 = .paletteNum = 0, .affineParam = 0, }; -static const union AnimCmd gSpriteAnim_861CFFC[] = { +static const union AnimCmd sSpriteAnim_861CFFC[] = { ANIMCMD_FRAME(0, 0, FALSE, FALSE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_861D004[] = { +static const union AnimCmd sSpriteAnim_861D004[] = { ANIMCMD_FRAME(4, 0, FALSE, FALSE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_861D00C[] = { +static const union AnimCmd sSpriteAnim_861D00C[] = { ANIMCMD_FRAME(8, 0, FALSE, FALSE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_861D014[] = { +static const union AnimCmd sSpriteAnim_861D014[] = { ANIMCMD_FRAME(12, 0, FALSE, FALSE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_861D01C[] = { +static const union AnimCmd sSpriteAnim_861D01C[] = { ANIMCMD_FRAME(16, 0, FALSE, FALSE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_861D024[] = { +static const union AnimCmd sSpriteAnim_861D024[] = { ANIMCMD_FRAME(16, 0, TRUE, FALSE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_861D02C[] = { +static const union AnimCmd sSpriteAnim_861D02C[] = { ANIMCMD_FRAME(20, 0, FALSE, FALSE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_861D034[] = { +static const union AnimCmd sSpriteAnim_861D034[] = { ANIMCMD_FRAME(24, 0, FALSE, FALSE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_861D03C[] = { +static const union AnimCmd sSpriteAnim_861D03C[] = { ANIMCMD_FRAME(24, 0, TRUE, FALSE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_861D044[] = { +static const union AnimCmd sSpriteAnim_861D044[] = { ANIMCMD_FRAME(28, 0, FALSE, FALSE), ANIMCMD_END }; -static const union AnimCmd *const gSpriteAnimTable_861D04C[] = { - gSpriteAnim_861CFFC, - gSpriteAnim_861D004, - gSpriteAnim_861D00C, - gSpriteAnim_861D014, - gSpriteAnim_861D01C, - gSpriteAnim_861D024, - gSpriteAnim_861D02C, - gSpriteAnim_861D034, - gSpriteAnim_861D03C, - gSpriteAnim_861D044, +static const union AnimCmd *const sSpriteAnimTable_861D04C[] = { + sSpriteAnim_861CFFC, + sSpriteAnim_861D004, + sSpriteAnim_861D00C, + sSpriteAnim_861D014, + sSpriteAnim_861D01C, + sSpriteAnim_861D024, + sSpriteAnim_861D02C, + sSpriteAnim_861D034, + sSpriteAnim_861D03C, + sSpriteAnim_861D044, }; -static const struct CompressedSpriteSheet gUnknown_0861D074 = +static const struct CompressedSpriteSheet sMoveSelectorSpriteSheet = { - .data = gUnknown_08D97BEC, + .data = gMoveSelectorBitmap, .size = 0x400, .tag = 30000 }; @@ -915,7 +915,7 @@ static const struct SpriteTemplate gUnknown_0861D084 = .tileTag = 30000, .paletteTag = 30000, .oam = &gOamData_861CFF4, - .anims = gSpriteAnimTable_861D04C, + .anims = sSpriteAnimTable_861D04C, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy @@ -994,7 +994,7 @@ static const struct SpriteTemplate sSpriteTemplate_StatusCondition = .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy }; -static const u16 gUnknown_0861D120[] = INCBIN_U16("graphics/interface/summary_markings.gbapal"); +static const u16 sSummaryMarkingsPalette[] = INCBIN_U16("graphics/interface/summary_markings.gbapal"); // code void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)) @@ -1026,7 +1026,7 @@ void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, case PSS_MODE_SELECT_MOVE: pssData->minPageIndex = 2; pssData->maxPageIndex = 3; - pssData->unk40C3 = TRUE; + pssData->lockMonFlag = TRUE; break; } @@ -1101,7 +1101,7 @@ static bool8 SummaryScreen_LoadGraphics(void) break; case 5: InitBGs(); - pssData->unk40F0 = 0; + pssData->switchCounter = 0; gMain.state++; break; case 6: @@ -1113,12 +1113,12 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 8: - sub_81C1BA0(); + DrawPagination(); gMain.state++; break; case 9: CopyMonToSummaryStruct(&pssData->currentMon); - pssData->unk40F0 = 0; + pssData->switchCounter = 0; gMain.state++; break; case 10: @@ -1148,14 +1148,14 @@ static bool8 SummaryScreen_LoadGraphics(void) case 16: ResetSpriteIds(); CreateMoveTypeIcons(); - pssData->unk40F0 = 0; + pssData->switchCounter = 0; gMain.state++; break; case 17: - pssData->spriteIds[0] = CreatePokemonSprite(&pssData->currentMon, &pssData->unk40F0); + pssData->spriteIds[0] = CreatePokemonSprite(&pssData->currentMon, &pssData->switchCounter); if (pssData->spriteIds[0] != 0xFF) { - pssData->unk40F0 = 0; + pssData->switchCounter = 0; gMain.state++; } break; @@ -1202,7 +1202,7 @@ static bool8 SummaryScreen_LoadGraphics(void) static void InitBGs(void) { ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, gUnknown_0861CBB4, ARRAY_COUNT(gUnknown_0861CBB4)); + InitBgsFromTemplates(0, sUnknown_0861CBB4, ARRAY_COUNT(sUnknown_0861CBB4)); SetBgTilemapBuffer(1, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0]); SetBgTilemapBuffer(2, pssData->bgTilemapBuffers[PSS_PAGE_SKILLS][0]); SetBgTilemapBuffer(3, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0]); @@ -1220,64 +1220,64 @@ static void InitBGs(void) static bool8 SummaryScreen_DecompressGraphics(void) { - switch (pssData->unk40F0) + switch (pssData->switchCounter) { case 0: reset_temp_tile_data_buffers(); - decompress_and_copy_tile_data_to_vram(1, &gUnknown_08D97D0C, 0, 0, 0); - pssData->unk40F0++; + decompress_and_copy_tile_data_to_vram(1, &gStatusScreenBitmap, 0, 0, 0); + pssData->switchCounter++; break; case 1: if (free_temp_tile_data_buffers_if_possible() != 1) { - LZDecompressWram(gUnknown_08D9862C, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0]); - pssData->unk40F0++; + LZDecompressWram(gPageInfoTilemap, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0]); + pssData->switchCounter++; } break; case 2: LZDecompressWram(gUnknown_08D98CC8, pssData->bgTilemapBuffers[PSS_PAGE_INFO][1]); - pssData->unk40F0++; + pssData->switchCounter++; break; case 3: - LZDecompressWram(gUnknown_08D987FC, pssData->bgTilemapBuffers[PSS_PAGE_SKILLS][1]); - pssData->unk40F0++; + LZDecompressWram(gPageSkillsTilemap, pssData->bgTilemapBuffers[PSS_PAGE_SKILLS][1]); + pssData->switchCounter++; break; case 4: - LZDecompressWram(gUnknown_08D9898C, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][1]); - pssData->unk40F0++; + LZDecompressWram(gPageBattleMovesTilemap, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][1]); + pssData->switchCounter++; break; case 5: - LZDecompressWram(gUnknown_08D98B28, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1]); - pssData->unk40F0++; + LZDecompressWram(gPageContestMovesTilemap, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1]); + pssData->switchCounter++; break; case 6: - LoadCompressedPalette(gUnknown_08D9853C, 0, 0x100); + LoadCompressedPalette(gStatusScreenPalette, 0, 0x100); LoadPalette(&gUnknown_08D85620, 0x81, 0x1E); - pssData->unk40F0++; + pssData->switchCounter++; break; case 7: LoadCompressedSpriteSheet(&sSpriteSheet_MoveTypes); - pssData->unk40F0++; + pssData->switchCounter++; break; case 8: - LoadCompressedSpriteSheet(&gUnknown_0861D074); - pssData->unk40F0++; + LoadCompressedSpriteSheet(&sMoveSelectorSpriteSheet); + pssData->switchCounter++; break; case 9: LoadCompressedSpriteSheet(&sStatusIconsSpriteSheet); - pssData->unk40F0++; + pssData->switchCounter++; break; case 10: LoadCompressedSpritePalette(&sStatusIconsSpritePalette); - pssData->unk40F0++; + pssData->switchCounter++; break; case 11: LoadCompressedSpritePalette(&gUnknown_0861D07C); - pssData->unk40F0++; + pssData->switchCounter++; break; case 12: LoadCompressedPalette(gMoveTypes_Pal, 0x1D0, 0x60); - pssData->unk40F0 = 0; + pssData->switchCounter = 0; return TRUE; } return FALSE; @@ -1301,7 +1301,7 @@ static bool8 ExtractMonDataToSummaryStruct(struct Pokemon *a) { u32 i; struct PokeSummary *sum = &pssData->summary; - switch (pssData->unk40F0) + switch (pssData->switchCounter) { case 0: sum->species = GetMonData(a, MON_DATA_SPECIES); @@ -1366,7 +1366,7 @@ static bool8 ExtractMonDataToSummaryStruct(struct Pokemon *a) sum->ribbonCount = GetMonData(a, MON_DATA_RIBBON_COUNT); return TRUE; } - pssData->unk40F0++; + pssData->switchCounter++; return FALSE; } @@ -1397,8 +1397,8 @@ static void sub_81C0348(void) if (pssData->currPageIndex != PSS_PAGE_BATTLE_MOVES && pssData->currPageIndex != PSS_PAGE_CONTEST_MOVES) PutWindowTilemap(13); } - sub_81C2524(); - sub_81C2228(&pssData->currentMon); + LimitEggSummaryPageDisplay(); + DrawPokerusCuredSymbol(&pssData->currentMon); } static void sub_81C0434(void) @@ -1418,7 +1418,7 @@ static void CloseSummaryScreen(u8 taskId) if (sub_81221EC() != TRUE && !gPaletteFade.active) { SetMainCallback2(pssData->callback); - gUnknown_0203CF20 = pssData->curMonIndex; + gLastViewedMonIndex = pssData->curMonIndex; SummaryScreen_DestroyUnknownTask(); ResetSpriteData(); FreeAllSpritePalettes(); @@ -1457,7 +1457,7 @@ static void HandleInput(u8 taskId) { if (pssData->currPageIndex == PSS_PAGE_INFO) { - sub_81C48F0(); + StopPokemonAnimations(); PlaySE(SE_SELECT); BeginCloseSummaryScreen(taskId); } @@ -1470,7 +1470,7 @@ static void HandleInput(u8 taskId) } else if (gMain.newKeys & B_BUTTON) { - sub_81C48F0(); + StopPokemonAnimations(); PlaySE(SE_SELECT); BeginCloseSummaryScreen(taskId); } @@ -1481,7 +1481,7 @@ static void ChangePokemon(u8 taskId, s8 a) { s8 r4_2; - if (!pssData->unk40C3) + if (!pssData->lockMonFlag) { if (pssData->isBoxMon == TRUE) { @@ -1545,7 +1545,7 @@ static void sub_81C0704(u8 taskId) break; case 3: CopyMonToSummaryStruct(&pssData->currentMon); - pssData->unk40F0 = 0; + pssData->switchCounter = 0; break; case 4: if (ExtractMonDataToSummaryStruct(&pssData->currentMon) == FALSE) @@ -1560,7 +1560,7 @@ static void sub_81C0704(u8 taskId) case 7: if (pssData->summary.unk7) sub_81C2074(10, -2); - sub_81C2228(&pssData->currentMon); + DrawPokerusCuredSymbol(&pssData->currentMon); data[1] = 0; break; case 8: @@ -1568,7 +1568,7 @@ static void sub_81C0704(u8 taskId) if (pssData->spriteIds[0] == 0xFF) return; gSprites[pssData->spriteIds[0]].data[2] = 1; - sub_81C0E24(); + CheckExperienceProgressBar(); data[1] = 0; break; case 9: @@ -1579,7 +1579,7 @@ static void sub_81C0704(u8 taskId) break; case 11: PrintPageSpecificText(pssData->currPageIndex); - sub_81C2524(); + LimitEggSummaryPageDisplay(); break; case 12: gSprites[pssData->spriteIds[0]].data[2] = 0; @@ -1678,19 +1678,19 @@ static void ChangePage(u8 taskId, s8 b) pssData->currPageIndex += b; data[0] = 0; if (b == 1) - SetTaskFuncWithFollowupFunc(taskId, sub_81C0B8C, gTasks[taskId].func); + SetTaskFuncWithFollowupFunc(taskId, PssScrollRight, gTasks[taskId].func); else - SetTaskFuncWithFollowupFunc(taskId, sub_81C0CC4, gTasks[taskId].func); + SetTaskFuncWithFollowupFunc(taskId, PssScrollLeft, gTasks[taskId].func); CreateTextPrinterTask(pssData->currPageIndex); HidePageSpecificSprites(); } -static void sub_81C0B8C(u8 taskId) +static void PssScrollRight(u8 taskId) // Scroll right { s16 *data = gTasks[taskId].data; if (data[0] == 0) { - if (pssData->unk40C9 == 0) + if (pssData->bgDisplayOrder == 0) { data[1] = 1; SetBgAttribute(1, BG_ATTR_PRIORITY, 1); @@ -1712,28 +1712,28 @@ static void sub_81C0B8C(u8 taskId) ChangeBgX(data[1], 0x2000, 1); data[0] += 32; if (data[0] > 0xFF) - gTasks[taskId].func = sub_81C0C68; + gTasks[taskId].func = PssScrollRightEnd; } -static void sub_81C0C68(u8 taskId) +static void PssScrollRightEnd(u8 taskId) // display right { s16 *data = gTasks[taskId].data; - pssData->unk40C9 ^= 1; + pssData->bgDisplayOrder ^= 1; data[1] = 0; data[0] = 0; - sub_81C1BA0(); + DrawPagination(); CreatePageWindowTilemaps(pssData->currPageIndex); SetTypeIcons(); - sub_81C0E24(); + CheckExperienceProgressBar(); SwitchTaskToFollowupFunc(taskId); } -static void sub_81C0CC4(u8 taskId) +static void PssScrollLeft(u8 taskId) // Scroll left { s16 *data = gTasks[taskId].data; if (data[0] == 0) { - if (pssData->unk40C9 == 0) + if (pssData->bgDisplayOrder == 0) data[1] = 2; else data[1] = 1; @@ -1742,13 +1742,13 @@ static void sub_81C0CC4(u8 taskId) ChangeBgX(data[1], 0x2000, 2); data[0] += 32; if (data[0] > 0xFF) - gTasks[taskId].func = sub_81C0D44; + gTasks[taskId].func = PssScrollLeftEnd; } -static void sub_81C0D44(u8 taskId) +static void PssScrollLeftEnd(u8 taskId) // display left { s16 *data = gTasks[taskId].data; - if (pssData->unk40C9 == 0) + if (pssData->bgDisplayOrder == 0) { SetBgAttribute(1, BG_ATTR_PRIORITY, 1); SetBgAttribute(2, BG_ATTR_PRIORITY, 2); @@ -1767,17 +1767,17 @@ static void sub_81C0D44(u8 taskId) } ShowBg(1); ShowBg(2); - pssData->unk40C9 ^= 1; + pssData->bgDisplayOrder ^= 1; data[1] = 0; data[0] = 0; - sub_81C1BA0(); + DrawPagination(); CreatePageWindowTilemaps(pssData->currPageIndex); SetTypeIcons(); - sub_81C0E24(); + CheckExperienceProgressBar(); SwitchTaskToFollowupFunc(taskId); } -static void sub_81C0E24(void) +static void CheckExperienceProgressBar(void) { if (pssData->currPageIndex == 1) DrawExperienceProgressBar(&pssData->currentMon); @@ -2025,9 +2025,9 @@ static void SwapMonMoves(struct Pokemon *mon, u8 moveIndex1, u8 moveIndex2) u8 ppBonuses = summary->ppBonuses; // Calculate PP bonuses - u8 ppUpMask1 = gUnknown_08329D22[moveIndex1]; + u8 ppUpMask1 = gPPUpGetMask[moveIndex1]; u8 ppBonusMove1 = (ppBonuses & ppUpMask1) >> (moveIndex1 * 2); - u8 ppUpMask2 = gUnknown_08329D22[moveIndex2]; + u8 ppUpMask2 = gPPUpGetMask[moveIndex2]; u8 ppBonusMove2 = (ppBonuses & ppUpMask2) >> (moveIndex2 * 2); ppBonuses &= ~ppUpMask1; ppBonuses &= ~ppUpMask2; @@ -2060,9 +2060,9 @@ static void SwapBoxMonMoves(struct BoxPokemon *mon, u8 moveIndex1, u8 moveIndex2 u8 ppBonuses = summary->ppBonuses; // Calculate PP bonuses - u8 ppUpMask1 = gUnknown_08329D22[moveIndex1]; + u8 ppUpMask1 = gPPUpGetMask[moveIndex1]; u8 ppBonusMove1 = (ppBonuses & ppUpMask1) >> (moveIndex1 * 2); - u8 ppUpMask2 = gUnknown_08329D22[moveIndex2]; + u8 ppUpMask2 = gPPUpGetMask[moveIndex2]; u8 ppBonusMove2 = (ppBonuses & ppUpMask2) >> (moveIndex2 * 2); ppBonuses &= ~ppUpMask1; ppBonuses &= ~ppUpMask2; @@ -2088,10 +2088,10 @@ static void sub_81C171C(u8 taskId) { SetNewMoveTypeIcon(); sub_81C4AF8(8); - gTasks[taskId].func = sub_81C174C; + gTasks[taskId].func = HandleReplaceMoveInput; } -static void sub_81C174C(u8 taskId) +static void HandleReplaceMoveInput(u8 taskId) { s16* data = gTasks[taskId].data; @@ -2119,26 +2119,26 @@ static void sub_81C174C(u8 taskId) } else if (gMain.newKeys & A_BUTTON) { - if (sub_81C18A8() == TRUE) + if (CanReplaceMove() == TRUE) { - sub_81C48F0(); + StopPokemonAnimations(); PlaySE(SE_SELECT); - gUnknown_0203CF21 = pssData->firstMoveIndex; - gSpecialVar_0x8005 = gUnknown_0203CF21; + sUnknown_0203CF21 = pssData->firstMoveIndex; + gSpecialVar_0x8005 = sUnknown_0203CF21; BeginCloseSummaryScreen(taskId); } else { PlaySE(SE_HAZURE); - sub_81C18F4(taskId); + ShowHMMovesCantBeForgottenWindow(taskId); } } else if (gMain.newKeys & B_BUTTON) { u32 var1; - sub_81C48F0(); + StopPokemonAnimations(); PlaySE(SE_SELECT); - gUnknown_0203CF21 = 4; + sUnknown_0203CF21 = 4; gSpecialVar_0x8005 = 4; BeginCloseSummaryScreen(taskId); } @@ -2146,7 +2146,7 @@ static void sub_81C174C(u8 taskId) } } -static bool8 sub_81C18A8(void) +static bool8 CanReplaceMove(void) { if (pssData->firstMoveIndex == MAX_MON_MOVES || pssData->newMove == MOVE_NONE || IsMoveHm(pssData->summary.moves[pssData->firstMoveIndex]) != 1) return TRUE; @@ -2154,7 +2154,7 @@ static bool8 sub_81C18A8(void) return FALSE; } -static void sub_81C18F4(u8 taskId) +static void ShowHMMovesCantBeForgottenWindow(u8 taskId) { ClearWindowTilemap(14); ClearWindowTilemap(15); @@ -2162,10 +2162,11 @@ static void sub_81C18F4(u8 taskId) sub_81C1DA4(0, 3); sub_81C1EFC(0, 3, 0); PrintHMMovesCantBeForgotten(); - gTasks[taskId].func = sub_81C1940; + gTasks[taskId].func = HandleHMMovesCantBeForgottenInput; } -static void sub_81C1940(u8 taskId) +// This redraws the power/accuracy window when the player scrolls out of the "HM Moves can't be forgotten" message +static void HandleHMMovesCantBeForgottenInput(u8 taskId) { s16* data = gTasks[taskId].data; u16 move; @@ -2177,7 +2178,7 @@ static void sub_81C1940(u8 taskId) data[0] = 4; sub_81C1070(&data[0], -1, &pssData->firstMoveIndex); data[1] = 0; - gTasks[taskId].func = sub_81C174C; + gTasks[taskId].func = HandleReplaceMoveInput; } else if (gMain.newKeys & DPAD_DOWN) { @@ -2185,7 +2186,7 @@ static void sub_81C1940(u8 taskId) data[0] = 4; sub_81C1070(&data[0], 1, &pssData->firstMoveIndex); data[1] = 0; - gTasks[taskId].func = sub_81C174C; + gTasks[taskId].func = HandleReplaceMoveInput; } else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1) { @@ -2195,7 +2196,7 @@ static void sub_81C1940(u8 taskId) if (!gSprites[pssData->spriteIds[2]].invisible) ClearWindowTilemap(13); move = pssData->summary.moves[pssData->firstMoveIndex]; - gTasks[taskId].func = sub_81C174C; + gTasks[taskId].func = HandleReplaceMoveInput; ChangePage(taskId, -1); sub_81C1DA4(9, -2); sub_81C1EFC(9, -2, move); @@ -2209,7 +2210,7 @@ static void sub_81C1940(u8 taskId) if (!gSprites[pssData->spriteIds[2]].invisible) ClearWindowTilemap(13); move = pssData->summary.moves[pssData->firstMoveIndex]; - gTasks[taskId].func = sub_81C174C; + gTasks[taskId].func = HandleReplaceMoveInput; ChangePage(taskId, 1); sub_81C1DA4(9, -2); sub_81C1EFC(9, -2, move); @@ -2225,17 +2226,17 @@ static void sub_81C1940(u8 taskId) schedule_bg_copy_tilemap_to_vram(0); sub_81C1DA4(9, -3); sub_81C1EFC(9, -3, move); - gTasks[taskId].func = sub_81C174C; + gTasks[taskId].func = HandleReplaceMoveInput; } } } u8 sub_81C1B94(void) { - return gUnknown_0203CF21; + return sUnknown_0203CF21; } -static void sub_81C1BA0(void) +static void DrawPagination(void) // Updates the pagination dots at the top of the summary screen { u16 *alloced = Alloc(32); u8 i; @@ -2333,11 +2334,11 @@ static void sub_81C1CB0(const struct UnkStruct_61CC04 *unkStruct, u16 *dest, u8 static void sub_81C1DA4(u16 a, s16 b) { - if (b > gUnknown_0861CC04.field_6) - b = gUnknown_0861CC04.field_6; - if (b == 0 || b == gUnknown_0861CC04.field_6) + if (b > sUnknown_0861CC04.field_6) + b = sUnknown_0861CC04.field_6; + if (b == 0 || b == sUnknown_0861CC04.field_6) { - sub_81C1CB0(&gUnknown_0861CC04, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], b, 1); + sub_81C1CB0(&sUnknown_0861CC04, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], b, 1); } else { @@ -2359,12 +2360,12 @@ static void sub_81C1E20(u8 taskId) { data[1] = 0; } - else if (data[1] > gUnknown_0861CC04.field_6) + else if (data[1] > sUnknown_0861CC04.field_6) { - data[1] = gUnknown_0861CC04.field_6; + data[1] = sUnknown_0861CC04.field_6; } - sub_81C1CB0(&gUnknown_0861CC04, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], data[1], 1); - if (data[1] <= 0 || data[1] >= gUnknown_0861CC04.field_6) + sub_81C1CB0(&sUnknown_0861CC04, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], data[1], 1); + if (data[1] <= 0 || data[1] >= sUnknown_0861CC04.field_6) { if (data[0] < 0) { @@ -2386,10 +2387,10 @@ static void sub_81C1E20(u8 taskId) static void sub_81C1EFC(u16 a, s16 b, u16 move) { - if (b > gUnknown_0861CC10.field_6) - b = gUnknown_0861CC10.field_6; - if (b == 0 || b == gUnknown_0861CC10.field_6) - sub_81C1CB0(&gUnknown_0861CC10, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], b, 1); + if (b > sUnknown_0861CC10.field_6) + b = sUnknown_0861CC10.field_6; + if (b == 0 || b == sUnknown_0861CC10.field_6) + sub_81C1CB0(&sUnknown_0861CC10, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], b, 1); else { u8 taskId = FindTaskIdByFunc(sub_81C1F80); @@ -2409,16 +2410,16 @@ static void sub_81C1F80(u8 taskId) { data[1] = 0; } - else if (data[1] > gUnknown_0861CC10.field_6) + else if (data[1] > sUnknown_0861CC10.field_6) { - data[1] = gUnknown_0861CC10.field_6; + data[1] = sUnknown_0861CC10.field_6; } - sub_81C1CB0(&gUnknown_0861CC10, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], data[1], 1); - if (data[1] <= 0 || data[1] >= gUnknown_0861CC10.field_6) + sub_81C1CB0(&sUnknown_0861CC10, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], data[1], 1); + if (data[1] <= 0 || data[1] >= sUnknown_0861CC10.field_6) { if (data[0] < 0) { - if (pssData->currPageIndex == 3 && FuncIsActiveTask(sub_81C0B8C) == 0) + if (pssData->currPageIndex == 3 && FuncIsActiveTask(PssScrollRight) == 0) PutWindowTilemap(15); DrawContestMoveHearts(data[2]); } @@ -2439,12 +2440,12 @@ static void sub_81C1F80(u8 taskId) static void sub_81C2074(u16 a, s16 b) { - if (b > gUnknown_0861CBEC.field_6) - b = gUnknown_0861CBEC.field_6; - if (b == 0 || b == gUnknown_0861CBEC.field_6) + if (b > sUnknown_0861CBEC.field_6) + b = sUnknown_0861CBEC.field_6; + if (b == 0 || b == sUnknown_0861CBEC.field_6) { - sub_81C1CB0(&gUnknown_0861CBEC, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0); - sub_81C1CB0(&gUnknown_0861CBF8, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0); + sub_81C1CB0(&sUnknown_0861CBEC, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0); + sub_81C1CB0(&sUnknown_0861CBF8, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0); } else { @@ -2460,12 +2461,12 @@ static void sub_81C20F0(u8 taskId) data[1] += data[0]; if (data[1] < 0) data[1] = 0; - else if (data[1] > gUnknown_0861CBEC.field_6) - data[1] = gUnknown_0861CBEC.field_6; - sub_81C1CB0(&gUnknown_0861CBEC, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0); - sub_81C1CB0(&gUnknown_0861CBF8, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0); + else if (data[1] > sUnknown_0861CBEC.field_6) + data[1] = sUnknown_0861CBEC.field_6; + sub_81C1CB0(&sUnknown_0861CBEC, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0); + sub_81C1CB0(&sUnknown_0861CBF8, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0); schedule_bg_copy_tilemap_to_vram(3); - if (data[1] <= 0 || data[1] >= gUnknown_0861CBEC.field_6) + if (data[1] <= 0 || data[1] >= sUnknown_0861CBEC.field_6) { if (data[0] < 0) { @@ -2505,9 +2506,9 @@ static void sub_81C2194(u16 *output, u16 palette, bool8 c) } } -static void sub_81C2228(struct Pokemon *mon) +static void DrawPokerusCuredSymbol(struct Pokemon *mon) // This checks if the mon has been cured of pokerus { - if (!CheckPartyPokerus(mon, 0) && CheckPartyHasHadPokerus(mon, 0)) + if (!CheckPartyPokerus(mon, 0) && CheckPartyHasHadPokerus(mon, 0)) // If yes it draws the cured symbol { pssData->bgTilemapBuffers[PSS_PAGE_INFO][0][0x223] = 0x2C; pssData->bgTilemapBuffers[PSS_PAGE_INFO][1][0x223] = 0x2C; @@ -2615,7 +2616,7 @@ static void DrawContestMoveHearts(u16 move) } } -static void sub_81C2524(void) +static void LimitEggSummaryPageDisplay(void) // If the pokemon is an egg, limit the number of pages displayed to 1 { if (pssData->summary.isEgg) ChangeBgX(3, 0x10000, 0); @@ -2626,7 +2627,7 @@ static void sub_81C2524(void) static void ResetWindows(void) { u8 i; - InitWindows(gUnknown_0861CC24); + InitWindows(sSummaryTemplate); DeactivateAllTextPrinters(); for (i = 0; i < 20; i++) @@ -2729,7 +2730,8 @@ static void sub_81C27DC(struct Pokemon *mon, u16 species) static void PrintAOrBButtonIcon(u8 windowId, bool8 bButton, u32 x) { - BlitBitmapToWindow(windowId, (bButton) ? gUnknown_0861CDD3 : gUnknown_0861CDD3 - 0x80, x, 0, 16, 16); + // sSummaryBButtonBitmap - 0x80 = sSummaryAButtonBitmap + BlitBitmapToWindow(windowId, (bButton) ? sSummaryBButtonBitmap : sSummaryBButtonBitmap - 0x80, x, 0, 16, 16); } static void PrintPageNamesAndStatsPageToWindows(void) @@ -2987,7 +2989,7 @@ static void PrintMonOTName(void) int x; if (InBattleFactory() != TRUE && sub_81B9E94() != TRUE) { - windowId = AddWindowFromTemplateList(gUnknown_0861CCCC, 0); + windowId = AddWindowFromTemplateList(sPageInfoTemplate, 0); SummaryScreen_PrintTextOnWindow(windowId, gText_OTSlash, 0, 1, 0, 1); x = GetStringWidth(1, gText_OTSlash, 0); if (pssData->summary.OTGender == 0) @@ -3004,20 +3006,20 @@ static void PrintMonOTID(void) { ConvertIntToDecimalStringN(StringCopy(gStringVar1, gText_UnkCtrlF907F908), (u16)pssData->summary.OTID, 2, 5); xPos = GetStringRightAlignXOffset(1, gStringVar1, 56); - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCCC, 1), gStringVar1, xPos, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 1), gStringVar1, xPos, 1, 0, 1); } } static void PrintMonAbilityName(void) { u8 ability = GetAbilityBySpecies(pssData->summary.species, pssData->summary.altAbility); - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCCC, 2), gAbilityNames[ability], 0, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 2), gAbilityNames[ability], 0, 1, 0, 1); } static void PrintMonAbilityDescription(void) { u8 ability = GetAbilityBySpecies(pssData->summary.species, pssData->summary.altAbility); - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCCC, 2), gAbilityDescriptionPointers[ability], 0, 17, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 2), gAbilityDescriptionPointers[ability], 0, 17, 0, 0); } static void BufferMonTrainerMemo(void) @@ -3026,8 +3028,8 @@ static void BufferMonTrainerMemo(void) const u8 *text; DynamicPlaceholderTextUtil_Reset(); - DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gUnknown_0861CE74); - DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gUnknown_0861CE7B); + DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sMemoNatureTextColor); + DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, sMemoMiscTextColor); BufferNatureString(); if (InBattleFactory() == TRUE || sub_81B9E94() == TRUE || IsInGamePartnerMon() == TRUE) @@ -3074,7 +3076,7 @@ static void BufferMonTrainerMemo(void) static void PrintMonTrainerMemo(void) { - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCCC, 3), gStringVar4, 0, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 3), gStringVar4, 0, 1, 0, 0); } static void BufferNatureString(void) @@ -3147,7 +3149,7 @@ static bool8 IsInGamePartnerMon(void) static void PrintEggOTName(void) { - u32 windowId = AddWindowFromTemplateList(gUnknown_0861CCCC, 0); + u32 windowId = AddWindowFromTemplateList(sPageInfoTemplate, 0); u32 width = GetStringWidth(1, gText_OTSlash, 0); SummaryScreen_PrintTextOnWindow(windowId, gText_OTSlash, 0, 1, 0, 1); SummaryScreen_PrintTextOnWindow(windowId, gText_FiveMarks, width, 1, 0, 1); @@ -3159,7 +3161,7 @@ static void PrintEggOTID(void) StringCopy(gStringVar1, gText_UnkCtrlF907F908); StringAppend(gStringVar1, gText_FiveMarks); x = GetStringRightAlignXOffset(1, gStringVar1, 56); - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCCC, 1), gStringVar1, x, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 1), gStringVar1, x, 1, 0, 1); } static void PrintEggState(void) @@ -3178,7 +3180,7 @@ static void PrintEggState(void) else text = gText_EggWillTakeALongTime; - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCCC, 2), text, 0, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 2), text, 0, 1, 0, 0); } static void PrintEggMemo(void) @@ -3202,7 +3204,7 @@ static void PrintEggMemo(void) text = gText_OddEggFoundByCouple; } - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCCC, 3), text, 0, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 3), text, 0, 1, 0, 0); } static void PrintSkillsPageText(void) @@ -3270,7 +3272,7 @@ static void PrintHeldItemName(void) } offset = GetStringCenterAlignXOffset(1, text, 72) + 6; - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCEC, 0), text, offset, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, 0), text, offset, 1, 0, 0); } static void PrintRibbonCount(void) @@ -3290,7 +3292,7 @@ static void PrintRibbonCount(void) } offset = GetStringCenterAlignXOffset(1, text, 70) + 6; - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCEC, 1), text, offset, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, 1), text, offset, 1, 0, 0); } static void BufferLeftColumnStats(void) @@ -3310,7 +3312,7 @@ static void BufferLeftColumnStats(void) DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, maxHPString); DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, attackString); DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, defenseString); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gUnknown_0861CE82); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, sStatsLeftColumnLayout); Free(currentHPString); Free(maxHPString); @@ -3320,7 +3322,7 @@ static void BufferLeftColumnStats(void) static void PrintLeftColumnStats(void) { - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCEC, 2), gStringVar4, 4, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, 2), gStringVar4, 4, 1, 0, 0); } static void BufferRightColumnStats(void) @@ -3333,18 +3335,18 @@ static void BufferRightColumnStats(void) DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar2); DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gStringVar3); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gUnknown_0861CE8E); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, sStatsRightColumnLayout); } static void PrintRightColumnStats(void) { - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(gUnknown_0861CCEC, 3), gStringVar4, 2, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, 3), gStringVar4, 2, 1, 0, 0); } static void PrintExpPointsNextLevel(void) { struct PokeSummary *sum = &pssData->summary; - u8 windowId = AddWindowFromTemplateList(gUnknown_0861CCEC, 4); + u8 windowId = AddWindowFromTemplateList(sPageSkillsTemplate, 4); int offset; u32 expToNextLevel; @@ -3436,8 +3438,8 @@ static void PrintMoveNameAndPP(u8 moveIndex) const u8 *text; u32 offset; struct PssData *summaryStruct = pssData; - u8 moveNameWindowId = AddWindowFromTemplateList(gUnknown_0861CD14, 0); - u8 ppValueWindowId = AddWindowFromTemplateList(gUnknown_0861CD14, 1); + u8 moveNameWindowId = AddWindowFromTemplateList(sPageMovesTemplate, 0); + u8 ppValueWindowId = AddWindowFromTemplateList(sPageMovesTemplate, 1); u16 move = summaryStruct->summary.moves[moveIndex]; if (move != 0) @@ -3449,7 +3451,7 @@ static void PrintMoveNameAndPP(u8 moveIndex) DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar2); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gUnknown_0861CE97); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, sMovesPPLayout); text = gStringVar4; ppState = GetCurrentPpToMaxPpState(summaryStruct->summary.pp[moveIndex], pp) + 9; offset = GetStringRightAlignXOffset(1, text, 44); @@ -3560,14 +3562,14 @@ static void PrintContestMoveDescription(u8 moveSlot) if (move != MOVE_NONE) { - u8 windowId = AddWindowFromTemplateList(gUnknown_0861CD14, 2); + u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 2); SummaryScreen_PrintTextOnWindow(windowId, gContestEffectDescriptionPointers[gContestMoves[move].effect], 6, 1, 0, 0); } } static void PrintMoveDetails(u16 move) { - u8 windowId = AddWindowFromTemplateList(gUnknown_0861CD14, 2); + u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 2); FillWindowPixelBuffer(windowId, 0); if (move != MOVE_NONE) { @@ -3592,8 +3594,8 @@ static void PrintMoveDetails(u16 move) static void PrintNewMoveDetailsOrCancelText(void) { - u8 windowId1 = AddWindowFromTemplateList(gUnknown_0861CD14, 0); - u8 windowId2 = AddWindowFromTemplateList(gUnknown_0861CD14, 1); + u8 windowId1 = AddWindowFromTemplateList(sPageMovesTemplate, 0); + u8 windowId2 = AddWindowFromTemplateList(sPageMovesTemplate, 1); if (pssData->newMove == MOVE_NONE) { @@ -3612,22 +3614,22 @@ static void PrintNewMoveDetailsOrCancelText(void) DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar1); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gUnknown_0861CE97); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, sMovesPPLayout); SummaryScreen_PrintTextOnWindow(windowId2, gStringVar4, GetStringRightAlignXOffset(1, gStringVar4, 0x2C), 0x41, 0, 12); } } static void sub_81C4064(void) { - u8 windowId = AddWindowFromTemplateList(gUnknown_0861CD14, 0); + u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 0); FillWindowPixelRect(windowId, 0, 0, 66, 72, 16); CopyWindowToVram(windowId, 2); } static void sub_81C40A0(u8 moveIndex1, u8 moveIndex2) { - u8 windowId1 = AddWindowFromTemplateList(gUnknown_0861CD14, 0); - u8 windowId2 = AddWindowFromTemplateList(gUnknown_0861CD14, 1); + u8 windowId1 = AddWindowFromTemplateList(sPageMovesTemplate, 0); + u8 windowId2 = AddWindowFromTemplateList(sPageMovesTemplate, 1); FillWindowPixelRect(windowId1, 0, 0, moveIndex1 * 16, 0x48, 0x10); FillWindowPixelRect(windowId1, 0, 0, moveIndex2 * 16, 0x48, 0x10); @@ -3641,7 +3643,7 @@ static void sub_81C40A0(u8 moveIndex1, u8 moveIndex2) static void PrintHMMovesCantBeForgotten(void) { - u8 windowId = AddWindowFromTemplateList(gUnknown_0861CD14, 2); + u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 2); FillWindowPixelBuffer(windowId, 0); SummaryScreen_PrintTextOnWindow(windowId, gText_HMMovesCantBeForgotten2, 6, 1, 0, 0); } @@ -3942,14 +3944,14 @@ static bool32 SummaryScreen_DoesSpriteHaveCallback(void) } } -static void sub_81C48F0(void) +static void StopPokemonAnimations(void) // A subtle effect, this function stops pokemon animations when leaving the PSS { u16 i; u16 paletteIndex; gSprites[pssData->spriteIds[0]].animPaused = TRUE; gSprites[pssData->spriteIds[0]].callback = SpriteCallbackDummy; - sub_806EE98(); + StopPokemonAnimationDelayTask(); paletteIndex = (gSprites[pssData->spriteIds[0]].oam.paletteNum * 16) | 0x100; @@ -3961,7 +3963,7 @@ static void sub_81C48F0(void) static void CreateMonMarkingsSprite(struct Pokemon *mon) { - struct Sprite *sprite = sub_811FF94(30003, 30003, gUnknown_0861D120); + struct Sprite *sprite = sub_811FF94(30003, 30003, sSummaryMarkingsPalette); pssData->markingsSprite = sprite; diff --git a/src/trade.c b/src/trade.c index 70b57fbc77..6dfb6e2c4e 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1834,9 +1834,9 @@ static void sub_8077B74(void) } if (gUnknown_0203229C->tradeMenuCursorPosition < PARTY_SIZE) - gUnknown_0203229C->tradeMenuCursorPosition = gUnknown_0203CF20; + gUnknown_0203229C->tradeMenuCursorPosition = gLastViewedMonIndex; else - gUnknown_0203229C->tradeMenuCursorPosition = gUnknown_0203CF20 + PARTY_SIZE; + gUnknown_0203229C->tradeMenuCursorPosition = gLastViewedMonIndex + PARTY_SIZE; gUnknown_0203229C->tradeMenuCursorSpriteIdx = CreateSprite(&gSpriteTemplate_832DC94, gTradeMonSpriteCoords[gUnknown_0203229C->tradeMenuCursorPosition][0] * 8 + 32, gTradeMonSpriteCoords[gUnknown_0203229C->tradeMenuCursorPosition][1] * 8, 2); gMain.state = 16; From 42bb5dc53de366c0b22bf220cc382f7cc86d7f35 Mon Sep 17 00:00:00 2001 From: Ariel Antonitis Date: Sat, 23 Feb 2019 21:55:24 -0500 Subject: [PATCH 106/217] Removed unused filler by aligning adjacent variables --- src/pokemon_summary_screen.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index bb49e6dc1e..367ff2aff8 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -112,11 +112,8 @@ static EWRAM_DATA struct PssData } *pssData = NULL; EWRAM_DATA u8 gLastViewedMonIndex = 0; static EWRAM_DATA u8 sUnknown_0203CF21 = 0; -static EWRAM_DATA u8 sFiller_0203CF22[2] = {0}; -static EWRAM_DATA u8 sUnknownTaskId = 0; -static EWRAM_DATA u8 sFiller_0203CF25[3] = {0}; - -extern const struct CompressedSpriteSheet gMonFrontPicTable[]; +ALIGNED(4) static EWRAM_DATA u8 sUnknownTaskId = 0; +ALIGNED(4) extern const struct CompressedSpriteSheet gMonFrontPicTable[]; struct UnkStruct_61CC04 { From d24cd4f0a8d810ec225a4b76a7fa2099092560e1 Mon Sep 17 00:00:00 2001 From: Ariel Antonitis Date: Sat, 23 Feb 2019 22:04:21 -0500 Subject: [PATCH 107/217] Fixed broken encoding. --- src/pokemon_storage_system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 6f2382290d..cdfc4ba6b8 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -1218,7 +1218,7 @@ static const u16 gWallpaperPalettes_Plain[][16] = static const u32 gWallpaperTiles_Plain[] = INCBIN_U32("graphics/pokemon_storage/plain.4bpp.lz"); static const u32 gWallpaperTilemap_Plain[] = INCBIN_U32("graphics/pokemon_storage/plain.bin.lz"); -// 12�18 tilemap +// 12x18 tilemap static const u32 gUnknown_085773C4[] = INCBIN_U32("graphics/unused/tilemap_5773C4.bin"); static const u16 gUnknown_08577574[][2] = From 0c47744a63a324fe92e8dddcbc07c33292524635 Mon Sep 17 00:00:00 2001 From: Ariel Antonitis Date: Sat, 23 Feb 2019 22:22:38 -0500 Subject: [PATCH 108/217] Moved ALIGNED(4) from extern to unknown struct. --- src/pokemon_summary_screen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 367ff2aff8..bd1ae78027 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -113,7 +113,7 @@ static EWRAM_DATA struct PssData EWRAM_DATA u8 gLastViewedMonIndex = 0; static EWRAM_DATA u8 sUnknown_0203CF21 = 0; ALIGNED(4) static EWRAM_DATA u8 sUnknownTaskId = 0; -ALIGNED(4) extern const struct CompressedSpriteSheet gMonFrontPicTable[]; +extern const struct CompressedSpriteSheet gMonFrontPicTable[]; struct UnkStruct_61CC04 { @@ -249,7 +249,7 @@ static void sub_81C4D18(u8 a); #include "data/text/move_descriptions.h" #include "data/text/nature_names.h" -static const struct BgTemplate sUnknown_0861CBB4[] = +ALIGNED(4) static const struct BgTemplate sUnknown_0861CBB4[] = { { .bg = 0, From bb508ade64bd152fa146b71e6734a4ea704b31f3 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 24 Feb 2019 10:04:40 -0600 Subject: [PATCH 109/217] Decompile more of easy_chat.c --- asm/easy_chat.s | 1862 ---------------------------------------------- data/easy_chat.s | 4 +- src/easy_chat.c | 731 ++++++++++++++++-- 3 files changed, 679 insertions(+), 1918 deletions(-) diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 50e707ac37..10536929e6 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5,1868 +5,6 @@ .text - thumb_func_start sub_811DADC -sub_811DADC: @ 811DADC - push {r4,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r4, r0, 24 - movs r0, 0x1E - str r0, [sp] - movs r0, 0xA - str r0, [sp, 0x4] - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - movs r3, 0xA - bl FillBgTilemapBufferRect_Palette0 - cmp r4, 0x16 - bls _0811DAFE - b _0811DC1A -_0811DAFE: - lsls r0, r4, 2 - ldr r1, =_0811DB0C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0811DB0C: - .4byte _0811DC1A - .4byte _0811DB68 - .4byte _0811DB70 - .4byte _0811DB78 - .4byte _0811DB80 - .4byte _0811DB88 - .4byte _0811DB90 - .4byte _0811DC00 - .4byte _0811DBF2 - .4byte _0811DBE4 - .4byte _0811DBD6 - .4byte _0811DB9E - .4byte _0811DBA6 - .4byte _0811DBAE - .4byte _0811DBB6 - .4byte _0811DBBE - .4byte _0811DBC6 - .4byte _0811DBCE - .4byte _0811DBD6 - .4byte _0811DBE4 - .4byte _0811DBF2 - .4byte _0811DC00 - .4byte _0811DC0E -_0811DB68: - movs r0, 0xB - movs r1, 0xE - movs r2, 0x3 - b _0811DB96 -_0811DB70: - movs r0, 0x9 - movs r1, 0xE - movs r2, 0x7 - b _0811DB96 -_0811DB78: - movs r0, 0x7 - movs r1, 0xE - movs r2, 0xB - b _0811DB96 -_0811DB80: - movs r0, 0x5 - movs r1, 0xE - movs r2, 0xF - b _0811DB96 -_0811DB88: - movs r0, 0x3 - movs r1, 0xE - movs r2, 0x13 - b _0811DB96 -_0811DB90: - movs r0, 0x1 - movs r1, 0xE - movs r2, 0x17 -_0811DB96: - movs r3, 0x2 - bl sub_811DC28 - b _0811DC1A -_0811DB9E: - movs r0, 0x1 - movs r1, 0xA - movs r2, 0x18 - b _0811DBDC -_0811DBA6: - movs r0, 0x1 - movs r1, 0xA - movs r2, 0x19 - b _0811DBDC -_0811DBAE: - movs r0, 0x1 - movs r1, 0xA - movs r2, 0x1A - b _0811DBDC -_0811DBB6: - movs r0, 0x1 - movs r1, 0xA - movs r2, 0x1B - b _0811DBDC -_0811DBBE: - movs r0, 0x1 - movs r1, 0xA - movs r2, 0x1C - b _0811DBDC -_0811DBC6: - movs r0, 0x1 - movs r1, 0xA - movs r2, 0x1D - b _0811DBDC -_0811DBCE: - movs r0, 0 - movs r1, 0xA - movs r2, 0x1E - b _0811DBDC -_0811DBD6: - movs r0, 0x1 - movs r1, 0xA - movs r2, 0x17 -_0811DBDC: - movs r3, 0xA - bl sub_811DC28 - b _0811DC1A -_0811DBE4: - movs r0, 0x1 - movs r1, 0xB - movs r2, 0x17 - movs r3, 0x8 - bl sub_811DC28 - b _0811DC1A -_0811DBF2: - movs r0, 0x1 - movs r1, 0xC - movs r2, 0x17 - movs r3, 0x6 - bl sub_811DC28 - b _0811DC1A -_0811DC00: - movs r0, 0x1 - movs r1, 0xD - movs r2, 0x17 - movs r3, 0x4 - bl sub_811DC28 - b _0811DC1A -_0811DC0E: - movs r0, 0x1 - movs r1, 0xE - movs r2, 0x17 - movs r3, 0x2 - bl sub_811DC28 -_0811DC1A: - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - add sp, 0x8 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_811DADC - - thumb_func_start sub_811DC28 -sub_811DC28: @ 811DC28 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - mov r12, r0 - adds r7, r1, 0 - mov r9, r2 - mov r10, r3 - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - movs r1, 0xC0 - lsls r1, 2 - adds r6, r0, r1 - mov r0, r12 - add r0, r9 - subs r5, r0, 0x1 - adds r0, r7, r3 - subs r0, 0x1 - mov r8, r0 - mov r2, r12 - adds r3, r7, 0 - lsls r0, r3, 5 - adds r0, r2 - lsls r0, 1 - adds r0, r6 - ldr r4, =0x00004001 - adds r1, r4, 0 - strh r1, [r0] - adds r2, 0x1 - cmp r2, r5 - bge _0811DC84 - ldr r0, =0x00004002 - adds r4, r0, 0 - lsls r1, r2, 1 - lsls r0, r3, 6 - adds r0, r6 - adds r1, r0 - subs r2, r5, r2 -_0811DC78: - strh r4, [r1] - adds r1, 0x2 - subs r2, 0x1 - cmp r2, 0 - bne _0811DC78 - adds r2, r5, 0 -_0811DC84: - lsls r0, r3, 5 - adds r0, r2 - lsls r0, 1 - adds r0, r6 - ldr r2, =0x00004003 - adds r1, r2, 0 - strh r1, [r0] - adds r3, 0x1 - mov r4, r12 - adds r4, 0x1 - adds r0, r7, 0x1 - str r0, [sp, 0x4] - mov r1, r9 - subs r1, 0x2 - str r1, [sp] - movs r2, 0x2 - negs r2, r2 - add r10, r2 - cmp r3, r8 - bge _0811DCF4 - lsls r7, r4, 1 - mov r9, r7 -_0811DCB0: - lsls r0, r3, 5 - add r0, r12 - lsls r0, 1 - adds r0, r6 - ldr r2, =0x00004005 - adds r1, r2, 0 - strh r1, [r0] - adds r2, r4, 0 - adds r7, r3, 0x1 - cmp r4, r5 - bge _0811DCE0 - movs r0, 0x80 - lsls r0, 7 - adds r1, r0, 0 - lsls r0, r3, 6 - adds r0, r6 - add r0, r9 - subs r2, r5, r4 -_0811DCD4: - strh r1, [r0] - adds r0, 0x2 - subs r2, 0x1 - cmp r2, 0 - bne _0811DCD4 - adds r2, r5, 0 -_0811DCE0: - lsls r0, r3, 5 - adds r0, r2 - lsls r0, 1 - adds r0, r6 - ldr r2, =0x00004007 - adds r1, r2, 0 - strh r1, [r0] - adds r3, r7, 0 - cmp r3, r8 - blt _0811DCB0 -_0811DCF4: - lsls r0, r3, 5 - mov r7, r12 - adds r1, r0, r7 - lsls r1, 1 - adds r1, r6 - ldr r7, =0x00004009 - adds r2, r7, 0 - strh r2, [r1] - adds r2, r4, 0 - mov r12, r0 - cmp r4, r5 - bge _0811DD26 - ldr r0, =0x0000400a - adds r7, r0, 0 - lsls r1, r4, 1 - lsls r0, r3, 6 - adds r0, r6 - adds r0, r1, r0 - subs r2, r5, r4 -_0811DD1A: - strh r7, [r0] - adds r0, 0x2 - subs r2, 0x1 - cmp r2, 0 - bne _0811DD1A - adds r2, r5, 0 -_0811DD26: - mov r1, r12 - adds r0, r1, r2 - lsls r0, 1 - adds r0, r6 - ldr r2, =0x0000400b - adds r1, r2, 0 - strh r1, [r0] - lsls r0, r4, 27 - lsrs r0, 24 - ldr r3, [sp, 0x4] - lsls r1, r3, 27 - lsrs r1, 24 - ldr r4, [sp] - lsls r2, r4, 27 - lsrs r2, 24 - mov r7, r10 - lsls r3, r7, 27 - lsrs r3, 24 - bl sub_811DE5C - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811DC28 - - thumb_func_start sub_811DD84 -sub_811DD84: @ 811DD84 - push {lr} - movs r1, 0x80 - lsls r1, 4 - movs r0, 0x2 - movs r2, 0 - bl ChangeBgY - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - ldr r1, =0x000002ce - adds r0, r1 - movs r1, 0 - strh r1, [r0] - pop {r0} - bx r0 - .pool - thumb_func_end sub_811DD84 - - thumb_func_start sub_811DDAC -sub_811DDAC: @ 811DDAC - push {r4,r5,lr} - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - lsls r1, 24 - lsrs r5, r1, 24 - movs r0, 0x2 - bl GetBgY - adds r2, r0, 0 - ldr r0, =gUnknown_0203A11C - ldr r3, [r0] - ldr r0, =0x000002ce - adds r1, r3, r0 - ldrh r0, [r1] - adds r0, r4 - strh r0, [r1] - lsls r4, 20 - asrs r4, 16 - lsls r0, r4, 8 - adds r2, r0 - cmp r5, 0 - beq _0811DE00 - movs r1, 0xB4 - lsls r1, 2 - adds r0, r3, r1 - str r2, [r0] - movs r0, 0xB5 - lsls r0, 2 - adds r1, r3, r0 - lsls r0, r5, 8 - str r0, [r1] - cmp r4, 0 - bge _0811DE0A - negs r0, r0 - str r0, [r1] - b _0811DE0A - .pool -_0811DE00: - movs r0, 0x2 - adds r1, r2, 0 - movs r2, 0 - bl ChangeBgY -_0811DE0A: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_811DDAC - - thumb_func_start sub_811DE10 -sub_811DE10: @ 811DE10 - push {lr} - movs r0, 0x2 - bl GetBgY - ldr r1, =gUnknown_0203A11C - ldr r2, [r1] - movs r3, 0xB4 - lsls r3, 2 - adds r1, r2, r3 - ldr r1, [r1] - cmp r0, r1 - beq _0811DE40 - movs r1, 0xB5 - lsls r1, 2 - adds r0, r2, r1 - ldr r1, [r0] - movs r0, 0x2 - movs r2, 0x1 - bl ChangeBgY - movs r0, 0x1 - b _0811DE42 - .pool -_0811DE40: - movs r0, 0 -_0811DE42: - pop {r1} - bx r1 - thumb_func_end sub_811DE10 - - thumb_func_start sub_811DE48 -sub_811DE48: @ 811DE48 - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - ldr r1, =0x000002ce - adds r0, r1 - ldrh r0, [r0] - bx lr - .pool - thumb_func_end sub_811DE48 - - thumb_func_start sub_811DE5C -sub_811DE5C: @ 811DE5C - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - lsls r2, 24 - lsrs r2, 24 - lsls r3, 24 - lsrs r3, 24 - lsls r4, r0, 8 - adds r0, r2 - orrs r4, r0 - lsls r5, r1, 8 - adds r1, r3 - orrs r5, r1 - movs r0, 0x40 - adds r1, r4, 0 - bl SetGpuReg - movs r0, 0x44 - adds r1, r5, 0 - bl SetGpuReg - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_811DE5C - - thumb_func_start sub_811DE90 -sub_811DE90: @ 811DE90 - push {r4,r5,lr} - ldr r0, =gUnknown_08597CA0 - bl LoadSpriteSheets - ldr r0, =gUnknown_08597CC0 - bl LoadSpritePalettes - movs r5, 0 - ldr r4, =gUnknown_08597CE8 -_0811DEA2: - adds r0, r4, 0 - bl LoadCompressedSpriteSheet - adds r4, 0x8 - adds r5, 0x1 - cmp r5, 0x3 - bls _0811DEA2 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811DE90 - - thumb_func_start sub_811DEC4 -sub_811DEC4: @ 811DEC4 - push {lr} - bl sub_811BA68 - lsls r0, 24 - ldr r1, =gUnknown_08597C30 - lsrs r0, 22 - adds r0, r1 - ldrb r2, [r0] - lsls r1, r2, 27 - lsrs r1, 8 - lsrs r2, 5 - lsls r2, 19 - ldr r0, =gUnknown_08597D18 - movs r3, 0xD0 - lsls r3, 12 - adds r1, r3 - asrs r1, 16 - movs r3, 0x80 - lsls r3, 12 - adds r2, r3 - asrs r2, 16 - movs r3, 0x2 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gUnknown_0203A11C - ldr r2, [r1] - movs r1, 0xB6 - lsls r1, 2 - adds r2, r1 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r0, =gSprites - adds r1, r0 - str r1, [r2] - movs r0, 0x1 - strh r0, [r1, 0x30] - pop {r0} - bx r0 - .pool - thumb_func_end sub_811DEC4 - - thumb_func_start sub_811DF28 -sub_811DF28: @ 811DF28 - push {lr} - adds r1, r0, 0 - movs r2, 0x30 - ldrsh r0, [r1, r2] - cmp r0, 0 - beq _0811DF56 - ldrh r0, [r1, 0x2E] - adds r0, 0x1 - strh r0, [r1, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - ble _0811DF56 - movs r0, 0 - strh r0, [r1, 0x2E] - ldrh r0, [r1, 0x24] - adds r0, 0x1 - strh r0, [r1, 0x24] - lsls r0, 16 - cmp r0, 0 - ble _0811DF56 - ldr r0, =0x0000fffa - strh r0, [r1, 0x24] -_0811DF56: - pop {r0} - bx r0 - .pool - thumb_func_end sub_811DF28 - - thumb_func_start sub_811DF60 -sub_811DF60: @ 811DF60 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - ldr r2, =gUnknown_0203A11C - ldr r2, [r2] - movs r3, 0xB6 - lsls r3, 2 - adds r2, r3 - ldr r3, [r2] - movs r4, 0 - strh r0, [r3, 0x20] - ldr r0, [r2] - strh r1, [r0, 0x22] - ldr r0, [r2] - strh r4, [r0, 0x24] - ldr r0, [r2] - strh r4, [r0, 0x2E] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811DF60 - - thumb_func_start sub_811DF90 -sub_811DF90: @ 811DF90 - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - movs r0, 0xB6 - lsls r0, 2 - adds r1, r0 - ldr r0, [r1] - movs r2, 0 - strh r2, [r0, 0x2E] - ldr r0, [r1] - strh r2, [r0, 0x30] - ldr r0, [r1] - strh r2, [r0, 0x24] - bx lr - .pool - thumb_func_end sub_811DF90 - - thumb_func_start sub_811DFB0 -sub_811DFB0: @ 811DFB0 - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - movs r1, 0xB6 - lsls r1, 2 - adds r0, r1 - ldr r1, [r0] - movs r0, 0x1 - strh r0, [r1, 0x30] - bx lr - .pool - thumb_func_end sub_811DFB0 - - thumb_func_start sub_811DFC8 -sub_811DFC8: @ 811DFC8 - push {r4-r6,lr} - mov r6, r8 - push {r6} - ldr r6, =gUnknown_08597D68 - adds r0, r6, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0x3 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0203A11C - ldr r2, [r5] - movs r1, 0xB7 - lsls r1, 2 - mov r8, r1 - add r2, r8 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r4, =gSprites - adds r1, r4 - str r1, [r2] - movs r0, 0x20 - strh r0, [r1, 0x24] - adds r0, r6, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0x3 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r2, [r5] - movs r1, 0xB8 - lsls r1, 2 - adds r3, r2, r1 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - str r1, [r3] - ldr r0, =0x0000ffe0 - strh r0, [r1, 0x24] - add r2, r8 - ldr r1, [r2] - adds r1, 0x3F - ldrb r0, [r1] - movs r2, 0x1 - orrs r0, r2 - strb r0, [r1] - bl sub_811E088 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811DFC8 - - thumb_func_start sub_811E050 -sub_811E050: @ 811E050 - push {r4-r6,lr} - ldr r5, =gUnknown_0203A11C - ldr r0, [r5] - movs r4, 0xB7 - lsls r4, 2 - adds r0, r4 - ldr r0, [r0] - bl DestroySprite - ldr r0, [r5] - adds r4, r0, r4 - movs r6, 0 - str r6, [r4] - movs r4, 0xB8 - lsls r4, 2 - adds r0, r4 - ldr r0, [r0] - bl DestroySprite - ldr r0, [r5] - adds r0, r4 - str r6, [r0] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E050 - - thumb_func_start sub_811E088 -sub_811E088: @ 811E088 - push {r4,lr} - sub sp, 0x4 - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - movs r2, 0xB7 - lsls r2, 2 - adds r0, r1, r2 - ldr r0, [r0] - cmp r0, 0 - beq _0811E0E4 - adds r2, 0x4 - adds r0, r1, r2 - ldr r0, [r0] - cmp r0, 0 - beq _0811E0E4 - mov r4, sp - adds r4, 0x1 - mov r0, sp - adds r1, r4, 0 - bl sub_811BB9C - bl sub_811BBB0 - lsls r0, 24 - cmp r0, 0 - bne _0811E0D4 - mov r0, sp - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - movs r1, 0 - ldrsb r1, [r4, r1] - bl sub_811E0EC - b _0811E0E4 - .pool -_0811E0D4: - mov r0, sp - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - movs r1, 0 - ldrsb r1, [r4, r1] - bl sub_811E1A4 -_0811E0E4: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_811E088 - - thumb_func_start sub_811E0EC -sub_811E0EC: @ 811E0EC - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r1, 24 - lsrs r7, r1, 24 - lsls r0, 24 - asrs r5, r0, 24 - movs r0, 0x1 - negs r0, r0 - cmp r5, r0 - beq _0811E150 - ldr r0, =gUnknown_0203A11C - mov r8, r0 - ldr r0, [r0] - movs r4, 0xB7 - lsls r4, 2 - adds r0, r4 - ldr r0, [r0] - movs r1, 0 - bl StartSpriteAnim - mov r2, r8 - ldr r1, [r2] - adds r4, r1, r4 - ldr r2, [r4] - movs r0, 0x54 - muls r5, r0 - adds r5, 0x3A - strh r5, [r2, 0x20] - ldr r0, [r4] - lsls r4, r7, 24 - asrs r4, 20 - adds r4, 0x60 - strh r4, [r0, 0x22] - movs r6, 0xB8 - lsls r6, 2 - adds r1, r6 - ldr r0, [r1] - movs r1, 0 - bl StartSpriteAnim - mov r1, r8 - ldr r0, [r1] - adds r0, r6 - ldr r1, [r0] - strh r5, [r1, 0x20] - b _0811E192 - .pool -_0811E150: - ldr r6, =gUnknown_0203A11C - ldr r0, [r6] - movs r4, 0xB7 - lsls r4, 2 - adds r0, r4 - ldr r0, [r0] - movs r1, 0x1 - bl StartSpriteAnim - ldr r1, [r6] - adds r4, r1, r4 - ldr r0, [r4] - movs r2, 0xD8 - mov r8, r2 - mov r2, r8 - strh r2, [r0, 0x20] - ldr r0, [r4] - lsls r4, r7, 24 - asrs r4, 20 - adds r4, 0x70 - strh r4, [r0, 0x22] - movs r5, 0xB8 - lsls r5, 2 - adds r1, r5 - ldr r0, [r1] - movs r1, 0x1 - bl StartSpriteAnim - ldr r0, [r6] - adds r0, r5 - ldr r1, [r0] - mov r2, r8 - strh r2, [r1, 0x20] -_0811E192: - ldr r0, [r0] - strh r4, [r0, 0x22] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E0EC - - thumb_func_start sub_811E1A4 -sub_811E1A4: @ 811E1A4 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsls r1, 24 - lsrs r5, r1, 24 - lsrs r4, r0, 24 - asrs r2, r0, 24 - movs r0, 0x1 - negs r0, r0 - cmp r2, r0 - beq _0811E234 - lsls r0, r5, 24 - asrs r1, r0, 24 - lsls r0, r1, 4 - adds r0, 0x60 - mov r8, r0 - movs r7, 0x20 - cmp r2, 0x6 - bne _0811E1D6 - cmp r1, 0 - bne _0811E1D6 - movs r7, 0x9E - movs r6, 0x2 - b _0811E1EC -_0811E1D6: - ldr r3, =gUnknown_08597D08 - lsls r1, r4, 24 - lsrs r0, r1, 24 - movs r2, 0 - cmp r0, 0x6 - bhi _0811E1E4 - asrs r2, r1, 24 -_0811E1E4: - adds r0, r2, r3 - ldrb r0, [r0] - adds r7, r0 - movs r6, 0x3 -_0811E1EC: - ldr r5, =gUnknown_0203A11C - ldr r0, [r5] - movs r4, 0xB7 - lsls r4, 2 - adds r0, r4 - ldr r0, [r0] - adds r1, r6, 0 - bl StartSpriteAnim - ldr r1, [r5] - adds r4, r1, r4 - ldr r0, [r4] - strh r7, [r0, 0x20] - ldr r0, [r4] - mov r2, r8 - strh r2, [r0, 0x22] - movs r4, 0xB8 - lsls r4, 2 - adds r1, r4 - ldr r0, [r1] - adds r1, r6, 0 - bl StartSpriteAnim - ldr r0, [r5] - adds r0, r4 - ldr r1, [r0] - strh r7, [r1, 0x20] - ldr r0, [r0] - mov r1, r8 - strh r1, [r0, 0x22] - b _0811E27A - .pool -_0811E234: - ldr r6, =gUnknown_0203A11C - ldr r0, [r6] - movs r4, 0xB7 - lsls r4, 2 - adds r0, r4 - ldr r0, [r0] - movs r1, 0x1 - bl StartSpriteAnim - ldr r1, [r6] - adds r4, r1, r4 - ldr r0, [r4] - movs r2, 0xD8 - mov r8, r2 - mov r2, r8 - strh r2, [r0, 0x20] - ldr r0, [r4] - lsls r4, r5, 24 - asrs r4, 20 - adds r4, 0x70 - strh r4, [r0, 0x22] - movs r5, 0xB8 - lsls r5, 2 - adds r1, r5 - ldr r0, [r1] - movs r1, 0x1 - bl StartSpriteAnim - ldr r0, [r6] - adds r0, r5 - ldr r1, [r0] - mov r2, r8 - strh r2, [r1, 0x20] - ldr r0, [r0] - strh r4, [r0, 0x22] -_0811E27A: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E1A4 - - thumb_func_start sub_811E288 -sub_811E288: @ 811E288 - push {lr} - ldr r0, =gUnknown_08597D18 - movs r1, 0 - movs r2, 0 - movs r3, 0x4 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gUnknown_0203A11C - ldr r2, [r1] - movs r1, 0xB9 - lsls r1, 2 - adds r2, r1 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r0, =gSprites - adds r1, r0 - str r1, [r2] - ldr r0, =sub_811E2DC - str r0, [r1, 0x1C] - ldrb r2, [r1, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - movs r2, 0x8 - orrs r0, r2 - strb r0, [r1, 0x5] - bl sub_811E30C - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E288 - - thumb_func_start sub_811E2DC -sub_811E2DC: @ 811E2DC - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0x2E] - adds r0, 0x1 - strh r0, [r1, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - ble _0811E302 - movs r0, 0 - strh r0, [r1, 0x2E] - ldrh r0, [r1, 0x24] - adds r0, 0x1 - strh r0, [r1, 0x24] - lsls r0, 16 - cmp r0, 0 - ble _0811E302 - ldr r0, =0x0000fffa - strh r0, [r1, 0x24] -_0811E302: - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E2DC - - thumb_func_start sub_811E30C -sub_811E30C: @ 811E30C - push {r4,lr} - sub sp, 0x4 - mov r4, sp - adds r4, 0x1 - mov r0, sp - adds r1, r4, 0 - bl sub_811BBC8 - mov r0, sp - movs r1, 0 - ldrsb r1, [r0, r1] - movs r0, 0xD - muls r0, r1 - lsls r0, 27 - movs r1, 0 - ldrsb r1, [r4, r1] - lsls r1, 28 - movs r2, 0xE0 - lsls r2, 21 - adds r0, r2 - lsrs r0, 24 - movs r2, 0xC0 - lsls r2, 23 - adds r1, r2 - lsrs r1, 24 - bl sub_811E34C - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_811E30C - - thumb_func_start sub_811E34C -sub_811E34C: @ 811E34C - push {r4,lr} - lsls r0, 24 - lsrs r3, r0, 24 - lsls r1, 24 - lsrs r4, r1, 24 - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - movs r1, 0xB9 - lsls r1, 2 - adds r2, r0, r1 - ldr r0, [r2] - cmp r0, 0 - beq _0811E376 - movs r1, 0 - strh r3, [r0, 0x20] - ldr r0, [r2] - strh r4, [r0, 0x22] - ldr r0, [r2] - strh r1, [r0, 0x24] - ldr r0, [r2] - strh r1, [r0, 0x2E] -_0811E376: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E34C - - thumb_func_start sub_811E380 -sub_811E380: @ 811E380 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r0, [r4] - movs r1, 0xB9 - lsls r1, 2 - adds r0, r1 - ldr r0, [r0] - cmp r0, 0 - beq _0811E3A2 - bl DestroySprite - ldr r0, [r4] - movs r1, 0xB9 - lsls r1, 2 - adds r0, r1 - movs r1, 0 - str r1, [r0] -_0811E3A2: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E380 - - thumb_func_start sub_811E3AC -sub_811E3AC: @ 811E3AC - push {r4-r6,lr} - ldr r0, =gUnknown_08597DF0 - movs r1, 0xD0 - movs r2, 0x80 - movs r3, 0x6 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gUnknown_0203A11C - ldr r2, [r5] - movs r1, 0xBA - lsls r1, 2 - adds r2, r1 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r4, =gSprites - adds r1, r4 - str r1, [r2] - movs r6, 0 - ldr r0, =0x0000ffc0 - strh r0, [r1, 0x24] - ldr r0, =gUnknown_08597DD0 - movs r1, 0xD0 - movs r2, 0x50 - movs r3, 0x5 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r2, [r5] - movs r1, 0xBB - lsls r1, 2 - adds r3, r2, r1 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - str r1, [r3] - strb r6, [r2, 0x9] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E3AC - - thumb_func_start sub_811E418 -sub_811E418: @ 811E418 - push {r4,lr} - ldr r4, =gUnknown_0203A11C - ldr r2, [r4] - ldrb r3, [r2, 0x9] - cmp r3, 0 - beq _0811E430 - cmp r3, 0x1 - beq _0811E488 - movs r0, 0 - b _0811E4A6 - .pool -_0811E430: - movs r0, 0xBA - lsls r0, 2 - adds r2, r0 - ldr r1, [r2] - ldrh r0, [r1, 0x24] - adds r0, 0x8 - strh r0, [r1, 0x24] - ldr r2, [r2] - movs r1, 0x24 - ldrsh r0, [r2, r1] - cmp r0, 0 - blt _0811E4A4 - strh r3, [r2, 0x24] - bl sub_811BBB0 - lsls r0, 24 - cmp r0, 0 - bne _0811E466 - ldr r0, [r4] - movs r1, 0xBB - lsls r1, 2 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x1 - bl StartSpriteAnim - b _0811E476 -_0811E466: - ldr r0, [r4] - movs r1, 0xBB - lsls r1, 2 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x2 - bl StartSpriteAnim -_0811E476: - ldr r0, =gUnknown_0203A11C - ldr r1, [r0] - ldrb r0, [r1, 0x9] - adds r0, 0x1 - strb r0, [r1, 0x9] - b _0811E4A4 - .pool -_0811E488: - movs r1, 0xBB - lsls r1, 2 - adds r0, r2, r1 - ldr r0, [r0] - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _0811E4A4 - movs r0, 0x2 - strb r0, [r2, 0x9] - movs r0, 0 - b _0811E4A6 -_0811E4A4: - movs r0, 0x1 -_0811E4A6: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811E418 - - thumb_func_start sub_811E4AC -sub_811E4AC: @ 811E4AC - push {lr} - ldr r2, =gUnknown_0203A11C - ldr r1, [r2] - movs r0, 0 - strb r0, [r1, 0x9] - ldr r0, [r2] - movs r1, 0xBB - lsls r1, 2 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x3 - bl StartSpriteAnim - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E4AC - - thumb_func_start sub_811E4D0 -sub_811E4D0: @ 811E4D0 - push {r4-r6,lr} - ldr r5, =gUnknown_0203A11C - ldr r3, [r5] - ldrb r0, [r3, 0x9] - cmp r0, 0 - beq _0811E4E8 - cmp r0, 0x1 - beq _0811E502 - movs r0, 0 - b _0811E554 - .pool -_0811E4E8: - movs r1, 0xBB - lsls r1, 2 - adds r0, r3, r1 - ldr r0, [r0] - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _0811E552 - movs r0, 0x1 - strb r0, [r3, 0x9] - b _0811E552 -_0811E502: - movs r0, 0xBA - lsls r0, 2 - adds r2, r3, r0 - ldr r1, [r2] - ldrh r0, [r1, 0x24] - subs r0, 0x8 - movs r6, 0 - strh r0, [r1, 0x24] - ldr r0, [r2] - movs r2, 0x24 - ldrsh r1, [r0, r2] - movs r0, 0x40 - negs r0, r0 - cmp r1, r0 - bgt _0811E552 - movs r4, 0xBB - lsls r4, 2 - adds r0, r3, r4 - ldr r0, [r0] - bl DestroySprite - ldr r0, [r5] - movs r1, 0xBA - lsls r1, 2 - adds r0, r1 - ldr r0, [r0] - bl DestroySprite - ldr r1, [r5] - adds r4, r1, r4 - str r6, [r4] - movs r2, 0xBA - lsls r2, 2 - adds r0, r1, r2 - str r6, [r0] - ldrb r0, [r1, 0x9] - adds r0, 0x1 - strb r0, [r1, 0x9] - movs r0, 0 - b _0811E554 -_0811E552: - movs r0, 0x1 -_0811E554: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_811E4D0 - - thumb_func_start sub_811E55C -sub_811E55C: @ 811E55C - push {lr} - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - movs r1, 0xBB - lsls r1, 2 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x4 - bl StartSpriteAnim - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E55C - - thumb_func_start sub_811E578 -sub_811E578: @ 811E578 - push {lr} - bl sub_811BBB0 - lsls r0, 24 - cmp r0, 0 - bne _0811E59C - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - movs r1, 0xBB - lsls r1, 2 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x1 - bl StartSpriteAnim - b _0811E5AE - .pool -_0811E59C: - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - movs r1, 0xBB - lsls r1, 2 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x2 - bl StartSpriteAnim -_0811E5AE: - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E578 - - thumb_func_start sub_811E5B8 -sub_811E5B8: @ 811E5B8 - ldr r0, =gUnknown_0203A11C - ldr r0, [r0] - movs r1, 0xBB - lsls r1, 2 - adds r0, r1 - ldr r0, [r0] - adds r0, 0x3F - ldrb r1, [r0] - lsrs r1, 4 - movs r0, 0x1 - bics r0, r1 - bx lr - .pool - thumb_func_end sub_811E5B8 - - thumb_func_start sub_811E5D4 -sub_811E5D4: @ 811E5D4 - push {r4,lr} - ldr r4, =gUnknown_08597E48 - adds r0, r4, 0 - movs r1, 0x60 - movs r2, 0x50 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _0811E602 - ldr r0, =gUnknown_0203A11C - ldr r2, [r0] - movs r0, 0xBC - lsls r0, 2 - adds r2, r0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - str r0, [r2] -_0811E602: - adds r0, r4, 0 - movs r1, 0x60 - movs r2, 0x9C - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _0811E636 - ldr r0, =gUnknown_0203A11C - ldr r2, [r0] - movs r0, 0xBD - lsls r0, 2 - adds r2, r0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - str r0, [r2] - adds r0, 0x3F - ldrb r1, [r0] - movs r2, 0x2 - orrs r1, r2 - strb r1, [r0] -_0811E636: - bl sub_811E6B0 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E5D4 - - thumb_func_start sub_811E64C -sub_811E64C: @ 811E64C - push {r4-r6,lr} - bl sub_811BBF8 - ldr r6, =gUnknown_0203A11C - ldr r1, [r6] - movs r2, 0xBC - lsls r2, 2 - adds r1, r2 - ldr r1, [r1] - movs r2, 0 - cmp r0, 0 - bne _0811E666 - movs r2, 0x1 -_0811E666: - adds r3, r1, 0 - adds r3, 0x3E - movs r4, 0x1 - lsls r2, 2 - ldrb r1, [r3] - movs r5, 0x5 - negs r5, r5 - adds r0, r5, 0 - ands r0, r1 - orrs r0, r2 - strb r0, [r3] - bl sub_811BC2C - ldr r1, [r6] - movs r2, 0xBD - lsls r2, 2 - adds r1, r2 - ldr r1, [r1] - movs r2, 0 - cmp r0, 0 - bne _0811E692 - movs r2, 0x1 -_0811E692: - adds r3, r1, 0 - adds r3, 0x3E - adds r1, r4, 0 - ands r1, r2 - lsls r1, 2 - ldrb r2, [r3] - adds r0, r5, 0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E64C - - thumb_func_start sub_811E6B0 -sub_811E6B0: @ 811E6B0 - ldr r3, =gUnknown_0203A11C - ldr r0, [r3] - movs r1, 0xBC - lsls r1, 2 - adds r0, r1 - ldr r1, [r0] - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] - ldr r0, [r3] - movs r1, 0xBD - lsls r1, 2 - adds r0, r1 - ldr r1, [r0] - adds r1, 0x3E - ldrb r0, [r1] - orrs r0, r2 - strb r0, [r1] - bx lr - .pool - thumb_func_end sub_811E6B0 - - thumb_func_start sub_811E6E0 -sub_811E6E0: @ 811E6E0 - push {lr} - cmp r0, 0 - bne _0811E6FC - ldr r0, =gUnknown_0203A11C - ldr r2, [r0] - movs r1, 0xBC - lsls r1, 2 - adds r0, r2, r1 - ldr r0, [r0] - movs r1, 0x60 - b _0811E70A - .pool -_0811E6FC: - ldr r0, =gUnknown_0203A11C - ldr r2, [r0] - movs r1, 0xBC - lsls r1, 2 - adds r0, r2, r1 - ldr r0, [r0] - movs r1, 0x78 -_0811E70A: - strh r1, [r0, 0x20] - movs r3, 0xBD - lsls r3, 2 - adds r0, r2, r3 - ldr r0, [r0] - strh r1, [r0, 0x20] - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E6E0 - - thumb_func_start sub_811E720 -sub_811E720: @ 811E720 - push {r4,lr} - ldr r4, =gUnknown_08597E30 - adds r0, r4, 0 - movs r1, 0xDC - movs r2, 0x54 - movs r3, 0x1 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _0811E74E - ldr r0, =gUnknown_0203A11C - ldr r2, [r0] - movs r0, 0xBE - lsls r0, 2 - adds r2, r0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - str r0, [r2] -_0811E74E: - adds r0, r4, 0 - movs r1, 0xDC - movs r2, 0x9C - movs r3, 0x1 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _0811E77E - ldr r0, =gUnknown_0203A11C - ldr r2, [r0] - movs r0, 0xBF - lsls r0, 2 - adds r2, r0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - str r0, [r2] - movs r1, 0x1 - bl StartSpriteAnim -_0811E77E: - bl sub_811E7F8 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E720 - - thumb_func_start sub_811E794 -sub_811E794: @ 811E794 - push {r4-r6,lr} - bl sub_811BBF8 - ldr r6, =gUnknown_0203A11C - ldr r1, [r6] - movs r2, 0xBE - lsls r2, 2 - adds r1, r2 - ldr r1, [r1] - movs r2, 0 - cmp r0, 0 - bne _0811E7AE - movs r2, 0x1 -_0811E7AE: - adds r3, r1, 0 - adds r3, 0x3E - movs r4, 0x1 - lsls r2, 2 - ldrb r1, [r3] - movs r5, 0x5 - negs r5, r5 - adds r0, r5, 0 - ands r0, r1 - orrs r0, r2 - strb r0, [r3] - bl sub_811BC2C - ldr r1, [r6] - movs r2, 0xBF - lsls r2, 2 - adds r1, r2 - ldr r1, [r1] - movs r2, 0 - cmp r0, 0 - bne _0811E7DA - movs r2, 0x1 -_0811E7DA: - adds r3, r1, 0 - adds r3, 0x3E - adds r1, r4, 0 - ands r1, r2 - lsls r1, 2 - ldrb r2, [r3] - adds r0, r5, 0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E794 - - thumb_func_start sub_811E7F8 -sub_811E7F8: @ 811E7F8 - ldr r3, =gUnknown_0203A11C - ldr r0, [r3] - movs r1, 0xBE - lsls r1, 2 - adds r0, r1 - ldr r1, [r0] - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] - ldr r0, [r3] - movs r1, 0xBF - lsls r1, 2 - adds r0, r1 - ldr r1, [r0] - adds r1, 0x3E - ldrb r0, [r1] - orrs r0, r2 - strb r0, [r1] - bx lr - .pool - thumb_func_end sub_811E7F8 - - thumb_func_start sub_811E828 -sub_811E828: @ 811E828 - push {r4,r5,lr} - sub sp, 0x4 - bl sub_811BCBC - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _0811E84C - cmp r0, 0x1 - bgt _0811E842 - cmp r0, 0 - beq _0811E848 - b _0811E8D0 -_0811E842: - cmp r0, 0x2 - beq _0811E850 - b _0811E8D0 -_0811E848: - movs r4, 0x43 - b _0811E852 -_0811E84C: - movs r4, 0x44 - b _0811E852 -_0811E850: - movs r4, 0x7 -_0811E852: - bl sub_811BA68 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bne _0811E8D0 - adds r0, r4, 0 - ldr r5, =SpriteCallbackDummy - movs r4, 0 - str r4, [sp] - adds r1, r5, 0 - movs r2, 0x4C - movs r3, 0x28 - bl AddPseudoEventObject - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x40 - beq _0811E892 - ldr r1, =gSprites - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - adds r0, r1 - ldrb r2, [r0, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - strb r1, [r0, 0x5] - movs r1, 0x2 - bl StartSpriteAnim -_0811E892: - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r0, [r0, 0x8] - movs r1, 0x69 - cmp r0, 0 - bne _0811E8A0 - movs r1, 0x64 -_0811E8A0: - str r4, [sp] - adds r0, r1, 0 - adds r1, r5, 0 - movs r2, 0x34 - movs r3, 0x28 - bl AddPseudoEventObject - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x40 - beq _0811E8D0 - ldr r1, =gSprites - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - adds r0, r1 - ldrb r2, [r0, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - strb r1, [r0, 0x5] - movs r1, 0x3 - bl StartSpriteAnim -_0811E8D0: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E828 - - thumb_func_start sub_811E8E4 -sub_811E8E4: @ 811E8E4 - push {lr} - bl sub_811BA68 - lsls r0, 24 - ldr r1, =gUnknown_08597C30 - lsrs r0, 22 - adds r0, r1 - ldrb r0, [r0, 0x3] - cmp r0, 0x1 - beq _0811E90E - cmp r0, 0x1 - bgt _0811E908 - cmp r0, 0 - beq _0811E916 - b _0811E91A - .pool -_0811E908: - cmp r0, 0x2 - beq _0811E912 - b _0811E91A -_0811E90E: - movs r0, 0x1 - b _0811E91C -_0811E912: - movs r0, 0x2 - b _0811E91C -_0811E916: - movs r0, 0 - b _0811E91C -_0811E91A: - movs r0, 0x3 -_0811E91C: - pop {r1} - bx r1 - thumb_func_end sub_811E8E4 - - thumb_func_start sub_811E920 -sub_811E920: @ 811E920 - push {r4,lr} - adds r4, r0, 0 - bl sub_811E8E4 - adds r1, r0, 0 - cmp r1, 0x2 - ble _0811E932 - movs r0, 0 - b _0811E93E -_0811E932: - ldr r0, =gUnknown_08597E60 - lsls r1, 2 - adds r1, r4, r1 - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x4 -_0811E93E: - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811E920 - thumb_func_start sub_811E948 sub_811E948: @ 811E948 push {r4-r7,lr} diff --git a/data/easy_chat.s b/data/easy_chat.s index b8df93d7a2..ef632c69f9 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -443,7 +443,9 @@ gUnknown_08597E48:: @ 8597E48 spr_template 0x0002, 0x0002, gUnknown_08597E10, gUnknown_08597E28, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_08597E60:: @ 8597E60 - .byte 0x10, 0x6f, 0xc4, 0x00, 0x10, 0x4e, 0x82, 0xa0, 0x10, 0x50, 0x86, 0xaa + .byte 0x10, 0x6f, 0xc4, 0x00 + .byte 0x10, 0x4e, 0x82, 0xa0 + .byte 0x10, 0x50, 0x86, 0xaa .align 2 gUnknown_08597E6C:: @ 8597E6C diff --git a/src/easy_chat.c b/src/easy_chat.c index 5c55cd2ca5..1b1bd105b5 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -3,10 +3,12 @@ #include "global.h" #include "alloc.h" #include "bg.h" +#include "decompress.h" #include "dewford_trend.h" #include "dynamic_placeholder_text_util.h" #include "easy_chat.h" #include "event_data.h" +#include "event_object_movement.h" #include "field_weather.h" #include "gpu_regs.h" #include "graphics.h" @@ -22,6 +24,7 @@ #include "task.h" #include "text_window.h" #include "window.h" +#include "constants/event_objects.h" #include "constants/flags.h" #include "constants/songs.h" @@ -82,20 +85,23 @@ struct Unk203A11C u8 unk6; u8 unk7; s8 unk8; - u8 filler9[0x1]; + u8 unk9; u8 unkA; u8 unkB[0xC1]; - u8 unkCC[0x20C]; - int unk2D8; - int unk2DC; - int unk2E0; - int unk2E4; - int unk2E8; - int unk2EC; - int unk2F0; - int unk2F4; - int unk2F8; - int unk2FC; + u8 unkCC[0x202]; + u16 unk2CE; + int unk2D0; + int unk2D4; + struct Sprite *unk2D8; + struct Sprite *unk2DC; + struct Sprite *unk2E0; + struct Sprite *unk2E4; + struct Sprite *unk2E8; + struct Sprite *unk2EC; + struct Sprite *unk2F0; + struct Sprite *unk2F4; + struct Sprite *unk2F8; + struct Sprite *unk2FC; u16 unk300[BG_SCREEN_SIZE / 2]; u16 unkB00[BG_SCREEN_SIZE / 2]; }; @@ -202,12 +208,12 @@ static void sub_811CFCC(void); static void sub_811D0BC(void); static void sub_811D2C8(void); static void sub_811D684(void); -void sub_811DE90(void); -void sub_811DEC4(void); -void sub_811DE5C(u8, u8, u8, u8); -void sub_811E5D4(void); -void sub_811E720(void); -void sub_811E828(void); +static void sub_811DE90(void); +static void sub_811DEC4(void); +static void sub_811DE5C(u8, u8, u8, u8); +static void sub_811E5D4(void); +static void sub_811E720(void); +static void sub_811E828(void); static bool8 sub_811C2D4(void); static bool8 sub_811C30C(void); static bool8 sub_811C3E4(void); @@ -237,51 +243,56 @@ static bool8 sub_811CD94(void); static bool8 sub_811CDD4(void); static bool8 sub_811CE14(void); static bool8 sub_811CE54(void); -void sub_811DF60(u8, u8); -int sub_811E920(int); -void sub_811DF90(void); +static void sub_811DF60(u8, u8); +static int sub_811E920(int); +static void sub_811DF90(void); static void sub_811D104(u8); static void sub_811D214(u8); -void sub_811DFB0(void); +static void sub_811DFB0(void); static void sub_811D6D4(void); static void sub_811D9CC(int); -void sub_811E3AC(void); -bool8 sub_811E418(void); -void sub_811DFC8(void); -void sub_811E6E0(int); +static void sub_811E3AC(void); +static bool8 sub_811E418(void); +static void sub_811DFC8(void); +static void sub_811E6E0(int); static bool8 sub_811DAA4(void); -void sub_811E64C(void); -void sub_811E050(void); -void sub_811E4AC(void); -void sub_811E6B0(void); -void sub_811E55C(void); -bool8 sub_811E4D0(void); -bool8 sub_811E5B8(void); -void sub_811E578(void); -void sub_811E088(void); -void sub_811DDAC(s16, u8); -bool8 sub_811DE10(void); +static void sub_811E64C(void); +static void sub_811E050(void); +static void sub_811E4AC(void); +static void sub_811E6B0(void); +static void sub_811E55C(void); +static bool8 sub_811E4D0(void); +static bool8 sub_811E5B8(void); +static void sub_811E578(void); +static void sub_811E088(void); +static void sub_811DDAC(s16, u8); +static bool8 sub_811DE10(void); static void sub_811D9B4(void); static void sub_811D698(u32); -void sub_811E288(void); -void sub_811E794(void); -void sub_811E380(void); -void sub_811E7F8(void); -void sub_811E30C(void); +static void sub_811E288(void); +static void sub_811E794(void); +static void sub_811E380(void); +static void sub_811E7F8(void); +static void sub_811E30C(void); static void sub_811D7A4(void); static void sub_811D7C8(void); -int sub_811DE48(void); +static int sub_811DE48(void); static void sub_811D7EC(void); static void sub_811D830(void); void sub_811D058(u8, u8, const u8 *, u8, u8, u8, u8, u8, u8); -void sub_811DD84(void); +static void sub_811DD84(void); static void sub_811D6F4(void); static void sub_811D758(void); static void sub_811D794(void); const u8 *sub_811F424(u8); static void sub_811D864(u8, u8); static void sub_811D950(u8, u8); -void sub_811DADC(u8); +static void sub_811DADC(u8); +static void sub_811DC28(int, int, int, int); +static void sub_811E0EC(s8, s8); +static void sub_811E1A4(s8, s8); +static void sub_811E2DC(struct Sprite *); +static void sub_811E34C(u8, u8); u8 *CopyEasyChatWordPadded(u8 *, u16, u16); extern const struct { @@ -304,6 +315,17 @@ extern const u16 gUnknown_08597C24[]; extern const struct WindowTemplate gUnknown_08597C84; extern const u8 gUnknown_08597C8C[4]; extern const u8 *const gUnknown_08597C90[4]; +extern const struct SpriteSheet gUnknown_08597CA0[]; +extern const struct SpritePalette gUnknown_08597CC0[]; +extern const struct CompressedSpriteSheet gUnknown_08597CE8[]; +extern const struct SpriteTemplate gUnknown_08597D18; +extern const struct SpriteTemplate gUnknown_08597D68; +extern const struct SpriteTemplate gUnknown_08597DF0; +extern const struct SpriteTemplate gUnknown_08597DD0; +extern const struct SpriteTemplate gUnknown_08597E48; +extern const struct SpriteTemplate gUnknown_08597E30; +extern const u8 gUnknown_08597D08[]; +extern const u8 gUnknown_08597E60[][4]; void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam) { @@ -3228,16 +3250,16 @@ static bool8 sub_811CE94(void) return FALSE; gUnknown_0203A11C->unk0 = 0; - gUnknown_0203A11C->unk2D8 = 0; - gUnknown_0203A11C->unk2DC = 0; - gUnknown_0203A11C->unk2E0 = 0; - gUnknown_0203A11C->unk2E4 = 0; - gUnknown_0203A11C->unk2E8 = 0; - gUnknown_0203A11C->unk2EC = 0; - gUnknown_0203A11C->unk2F0 = 0; - gUnknown_0203A11C->unk2F4 = 0; - gUnknown_0203A11C->unk2F8 = 0; - gUnknown_0203A11C->unk2FC = 0; + gUnknown_0203A11C->unk2D8 = NULL; + gUnknown_0203A11C->unk2DC = NULL; + gUnknown_0203A11C->unk2E0 = NULL; + gUnknown_0203A11C->unk2E4 = NULL; + gUnknown_0203A11C->unk2E8 = NULL; + gUnknown_0203A11C->unk2EC = NULL; + gUnknown_0203A11C->unk2F0 = NULL; + gUnknown_0203A11C->unk2F4 = NULL; + gUnknown_0203A11C->unk2F8 = NULL; + gUnknown_0203A11C->unk2FC = NULL; gUnknown_0203A11C->unkA = sub_811BC70(); return TRUE; } @@ -3752,3 +3774,602 @@ static bool8 sub_811DAA4(void) var1 = gUnknown_0203A11C->unk7; return (var0 ^ var1) > 0; } + +static void sub_811DADC(u8 arg0) +{ + FillBgTilemapBufferRect_Palette0(1, 0, 0, 10, 30, 10); + switch (arg0) + { + case 0: + break; + case 1: + sub_811DC28(11, 14, 3, 2); + break; + case 2: + sub_811DC28(9, 14, 7, 2); + break; + case 3: + sub_811DC28(7, 14, 11, 2); + break; + case 4: + sub_811DC28(5, 14, 15, 2); + break; + case 5: + sub_811DC28(3, 14, 19, 2); + break; + case 6: + sub_811DC28(1, 14, 23, 2); + break; + case 11: + sub_811DC28(1, 10, 24, 10); + break; + case 12: + sub_811DC28(1, 10, 25, 10); + break; + case 13: + sub_811DC28(1, 10, 26, 10); + break; + case 14: + sub_811DC28(1, 10, 27, 10); + break; + case 15: + sub_811DC28(1, 10, 28, 10); + break; + case 16: + sub_811DC28(1, 10, 29, 10); + break; + case 17: + sub_811DC28(0, 10, 30, 10); + break; + case 10: + case 18: + sub_811DC28(1, 10, 23, 10); + break; + case 9: + case 19: + sub_811DC28(1, 11, 23, 8); + break; + case 8: + case 20: + sub_811DC28(1, 12, 23, 6); + break; + case 7: + case 21: + sub_811DC28(1, 13, 23, 4); + break; + case 22: + sub_811DC28(1, 14, 23, 2); + break; + } + + CopyBgTilemapBufferToVram(1); +} + +static void sub_811DC28(int left, int top, int width, int height) +{ + u16 *tilemap; + int right; + int bottom; + int x, y; + + tilemap = gUnknown_0203A11C->unk300; + right = left + width - 1; + bottom = top + height - 1; + x = left; + y = top; + tilemap[y * 32 + x] = 0x4001; + x++; + for (; x < right; x++) + tilemap[y * 32 + x] = 0x4002; + + tilemap[y * 32 + x] = 0x4003; + y++; + for (; y < bottom; y++) + { + tilemap[y * 32 + left] = 0x4005; + x = left + 1; + for (; x < right; x++) + tilemap[y * 32 + x] = 0x4000; + + tilemap[y * 32 + x] = 0x4007; + } + + tilemap[y * 32 + left] = 0x4009; + x = left + 1; + for (; x < right; x++) + tilemap[y * 32 + x] = 0x400A; + + tilemap[y * 32 + x] = 0x400B; + sub_811DE5C((left + 1) * 8, (top + 1) * 8, (width - 2) * 8, (height - 2) * 8); +} + +static void sub_811DD84(void) +{ + ChangeBgY(2, 0x800, 0); + gUnknown_0203A11C->unk2CE = 0; +} + +static void sub_811DDAC(s16 arg0, u8 arg1) +{ + int bgY; + s16 var0; + + bgY = GetBgY(2); + gUnknown_0203A11C->unk2CE += arg0; + var0 = arg0 * 16; + bgY += var0 << 8; + if (arg1) + { + gUnknown_0203A11C->unk2D0 = bgY; + gUnknown_0203A11C->unk2D4 = arg1 * 256; + if (var0 < 0) + gUnknown_0203A11C->unk2D4 = -gUnknown_0203A11C->unk2D4; + } + else + { + ChangeBgY(2, bgY, 0); + } +} + +static bool8 sub_811DE10(void) +{ + int bgY; + + bgY = GetBgY(2); + if (bgY == gUnknown_0203A11C->unk2D0) + { + return FALSE; + } + else + { + ChangeBgY(2, gUnknown_0203A11C->unk2D4, 1); + return TRUE; + } +} + +static int sub_811DE48(void) +{ + return gUnknown_0203A11C->unk2CE; +} + +static void sub_811DE5C(u8 left, u8 top, u8 width, u8 height) +{ + u16 horizontalDimensions = WIN_RANGE(left, left + width); + u16 verticalDimensions = WIN_RANGE(top, top + height); + SetGpuReg(REG_OFFSET_WIN0H, horizontalDimensions); + SetGpuReg(REG_OFFSET_WIN0V, verticalDimensions); +} + +static void sub_811DE90(void) +{ + u32 i; + + LoadSpriteSheets(gUnknown_08597CA0); + LoadSpritePalettes(gUnknown_08597CC0); + for (i = 0; i < 4; i++) + LoadCompressedSpriteSheet(&gUnknown_08597CE8[i]); +} + +static void sub_811DEC4(void) +{ + u8 var0 = sub_811BA68(); + int x = gUnknown_08597C30[var0].unk0_0 * 8 + 13; + int y = gUnknown_08597C30[var0].unk0_5 * 8 + 8; + u8 spriteId = CreateSprite(&gUnknown_08597D18, x, y, 2); + gUnknown_0203A11C->unk2D8 = &gSprites[spriteId]; + gSprites[spriteId].data[1] = 1; +} + +void sub_811DF28(struct Sprite *sprite) +{ + if (sprite->data[1]) + { + if (++sprite->data[0] > 2) + { + sprite->data[0] = 0; + if (++sprite->pos2.x > 0) + sprite->pos2.x = -6; + } + } +} + +static void sub_811DF60(u8 x, u8 y) +{ + gUnknown_0203A11C->unk2D8->pos1.x = x; + gUnknown_0203A11C->unk2D8->pos1.y = y; + gUnknown_0203A11C->unk2D8->pos2.x = 0; + gUnknown_0203A11C->unk2D8->data[0] = 0; +} + +static void sub_811DF90(void) +{ + gUnknown_0203A11C->unk2D8->data[0] = 0; + gUnknown_0203A11C->unk2D8->data[1] = 0; + gUnknown_0203A11C->unk2D8->pos2.x = 0; +} + +static void sub_811DFB0(void) +{ + gUnknown_0203A11C->unk2D8->data[1] = 1; +} + +static void sub_811DFC8(void) +{ + u8 spriteId = CreateSprite(&gUnknown_08597D68, 0, 0, 3); + gUnknown_0203A11C->unk2DC = &gSprites[spriteId]; + gUnknown_0203A11C->unk2DC->pos2.x = 32; + + spriteId = CreateSprite(&gUnknown_08597D68, 0, 0, 3); + gUnknown_0203A11C->unk2E0 = &gSprites[spriteId]; + gUnknown_0203A11C->unk2E0->pos2.x = -32; + + gUnknown_0203A11C->unk2DC->hFlip = 1; + sub_811E088(); +} + +static void sub_811E050(void) +{ + DestroySprite(gUnknown_0203A11C->unk2DC); + gUnknown_0203A11C->unk2DC = NULL; + DestroySprite(gUnknown_0203A11C->unk2E0); + gUnknown_0203A11C->unk2E0 = NULL; +} + +static void sub_811E088(void) +{ + u8 var0; + u8 var1; + + if (gUnknown_0203A11C->unk2DC && gUnknown_0203A11C->unk2E0) + { + sub_811BB9C(&var0, &var1); + if (!sub_811BBB0()) + sub_811E0EC(var0, var1); + else + sub_811E1A4(var0, var1); + } +} + +static void sub_811E0EC(s8 arg0, s8 arg1) +{ + if (arg0 != -1) + { + StartSpriteAnim(gUnknown_0203A11C->unk2DC, 0); + gUnknown_0203A11C->unk2DC->pos1.x = arg0 * 84 + 58; + gUnknown_0203A11C->unk2DC->pos1.y = arg1 * 16 + 96; + + StartSpriteAnim(gUnknown_0203A11C->unk2E0, 0); + gUnknown_0203A11C->unk2E0->pos1.x = arg0 * 84 + 58; + gUnknown_0203A11C->unk2E0->pos1.y = arg1 * 16 + 96; + } + else + { + StartSpriteAnim(gUnknown_0203A11C->unk2DC, 1); + gUnknown_0203A11C->unk2DC->pos1.x = 216; + gUnknown_0203A11C->unk2DC->pos1.y = arg1 * 16 + 112; + + StartSpriteAnim(gUnknown_0203A11C->unk2E0, 1); + gUnknown_0203A11C->unk2E0->pos1.x = 216; + gUnknown_0203A11C->unk2E0->pos1.y = arg1 * 16 + 112; + } +} + +static void sub_811E1A4(s8 arg0, s8 arg1) +{ + int anim; + int x, y; + + if (arg0 != -1) + { + y = arg1 * 16 + 96; + x = 32; + if (arg0 == 6 && arg1 == 0) + { + x = 158; + anim = 2; + } + else + { + x += gUnknown_08597D08[(u8)arg0 < 7 ? arg0 : 0]; + anim = 3; + } + + StartSpriteAnim(gUnknown_0203A11C->unk2DC, anim); + gUnknown_0203A11C->unk2DC->pos1.x = x; + gUnknown_0203A11C->unk2DC->pos1.y = y; + + StartSpriteAnim(gUnknown_0203A11C->unk2E0, anim); + gUnknown_0203A11C->unk2E0->pos1.x = x; + gUnknown_0203A11C->unk2E0->pos1.y = y; + } + else + { + StartSpriteAnim(gUnknown_0203A11C->unk2DC, 1); + gUnknown_0203A11C->unk2DC->pos1.x = 216; + gUnknown_0203A11C->unk2DC->pos1.y = arg1 * 16 + 112; + + StartSpriteAnim(gUnknown_0203A11C->unk2E0, 1); + gUnknown_0203A11C->unk2E0->pos1.x = 216; + gUnknown_0203A11C->unk2E0->pos1.y = arg1 * 16 + 112; + } +} + +static void sub_811E288(void) +{ + u8 spriteId = CreateSprite(&gUnknown_08597D18, 0, 0, 4); + gUnknown_0203A11C->unk2E4 = &gSprites[spriteId]; + gUnknown_0203A11C->unk2E4->callback = sub_811E2DC; + gUnknown_0203A11C->unk2E4->oam.priority = 2; + sub_811E30C(); +} + +static void sub_811E2DC(struct Sprite *sprite) +{ + if (++sprite->data[0] > 2) + { + sprite->data[0] = 0; + if (++sprite->pos2.x > 0) + sprite->pos2.x = -6; + } +} + +static void sub_811E30C(void) +{ + s8 var0, var1, x, y; + + sub_811BBC8(&var0, &var1); + x = var0 * 13; + x = x * 8 + 28; + y = var1 * 16 + 96; + sub_811E34C(x, y); +} + +static void sub_811E34C(u8 x, u8 y) +{ + if (gUnknown_0203A11C->unk2E4) + { + gUnknown_0203A11C->unk2E4->pos1.x = x; + gUnknown_0203A11C->unk2E4->pos1.y = y; + gUnknown_0203A11C->unk2E4->pos2.x = 0; + gUnknown_0203A11C->unk2E4->data[0] = 0; + } +} + +static void sub_811E380(void) +{ + if (gUnknown_0203A11C->unk2E4) + { + DestroySprite(gUnknown_0203A11C->unk2E4); + gUnknown_0203A11C->unk2E4 = NULL; + } +} + +static void sub_811E3AC(void) +{ + u8 spriteId = CreateSprite(&gUnknown_08597DF0, 208, 128, 6); + gUnknown_0203A11C->unk2E8 = &gSprites[spriteId]; + gUnknown_0203A11C->unk2E8->pos2.x = -64; + + spriteId = CreateSprite(&gUnknown_08597DD0, 208, 80, 5); + gUnknown_0203A11C->unk2EC = &gSprites[spriteId]; + gUnknown_0203A11C->unk9 = 0; +} + +static bool8 sub_811E418(void) +{ + switch (gUnknown_0203A11C->unk9) + { + default: + return FALSE; + case 0: + gUnknown_0203A11C->unk2E8->pos2.x += 8; + if (gUnknown_0203A11C->unk2E8->pos2.x >= 0) + { + gUnknown_0203A11C->unk2E8->pos2.x = 0; + if (!sub_811BBB0()) + StartSpriteAnim(gUnknown_0203A11C->unk2EC, 1); + else + StartSpriteAnim(gUnknown_0203A11C->unk2EC, 2); + + gUnknown_0203A11C->unk9++; + } + break; + case 1: + if (gUnknown_0203A11C->unk2EC->animEnded) + { + gUnknown_0203A11C->unk9 = 2; + return FALSE; + } + } + + return TRUE; +} + +static void sub_811E4AC(void) +{ + gUnknown_0203A11C->unk9 = 0; + StartSpriteAnim(gUnknown_0203A11C->unk2EC, 3); +} + +static bool8 sub_811E4D0(void) +{ + switch (gUnknown_0203A11C->unk9) + { + default: + return FALSE; + case 0: + if (gUnknown_0203A11C->unk2EC->animEnded) + gUnknown_0203A11C->unk9 = 1; + break; + case 1: + gUnknown_0203A11C->unk2E8->pos2.x -= 8; + if (gUnknown_0203A11C->unk2E8->pos2.x <= -64) + { + DestroySprite(gUnknown_0203A11C->unk2EC); + DestroySprite(gUnknown_0203A11C->unk2E8); + gUnknown_0203A11C->unk2EC = NULL; + gUnknown_0203A11C->unk2E8 = NULL; + gUnknown_0203A11C->unk9++; + return FALSE; + } + } + + return TRUE; +} + +static void sub_811E55C(void) +{ + StartSpriteAnim(gUnknown_0203A11C->unk2EC, 4); +} + +static void sub_811E578(void) +{ + if (!sub_811BBB0()) + StartSpriteAnim(gUnknown_0203A11C->unk2EC, 1); + else + StartSpriteAnim(gUnknown_0203A11C->unk2EC, 2); +} + +static bool8 sub_811E5B8(void) +{ + return !gUnknown_0203A11C->unk2EC->animEnded; +} + +static void sub_811E5D4(void) +{ + u8 spriteId = CreateSprite(&gUnknown_08597E48, 96, 80, 0); + if (spriteId != MAX_SPRITES) + gUnknown_0203A11C->unk2F0 = &gSprites[spriteId]; + + spriteId = CreateSprite(&gUnknown_08597E48, 96, 156, 0); + if (spriteId != MAX_SPRITES) + { + gUnknown_0203A11C->unk2F4 = &gSprites[spriteId]; + gUnknown_0203A11C->unk2F4->vFlip = 1; + } + + sub_811E6B0(); +} + +static void sub_811E64C(void) +{ + gUnknown_0203A11C->unk2F0->invisible = !sub_811BBF8(); + gUnknown_0203A11C->unk2F4->invisible = !sub_811BC2C(); +} + +static void sub_811E6B0(void) +{ + gUnknown_0203A11C->unk2F0->invisible = 1; + gUnknown_0203A11C->unk2F4->invisible = 1; +} + +static void sub_811E6E0(int arg0) +{ + if (!arg0) + { + gUnknown_0203A11C->unk2F0->pos1.x = 96; + gUnknown_0203A11C->unk2F4->pos1.x = 96; + } + else + { + gUnknown_0203A11C->unk2F0->pos1.x = 120; + gUnknown_0203A11C->unk2F4->pos1.x = 120; + } +} + +static void sub_811E720(void) +{ + u8 spriteId = CreateSprite(&gUnknown_08597E30, 220, 84, 1); + if (spriteId != MAX_SPRITES) + gUnknown_0203A11C->unk2F8 = &gSprites[spriteId]; + + spriteId = CreateSprite(&gUnknown_08597E30, 220, 156, 1); + if (spriteId != MAX_SPRITES) + { + gUnknown_0203A11C->unk2FC = &gSprites[spriteId]; + StartSpriteAnim(gUnknown_0203A11C->unk2FC, 1); + } + + sub_811E7F8(); +} + +static void sub_811E794(void) +{ + gUnknown_0203A11C->unk2F8->invisible = !sub_811BBF8(); + gUnknown_0203A11C->unk2FC->invisible = !sub_811BC2C(); +} + +static void sub_811E7F8(void) +{ + gUnknown_0203A11C->unk2F8->invisible = 1; + gUnknown_0203A11C->unk2FC->invisible = 1; +} + +static void sub_811E828(void) +{ + int graphicsId; + u8 spriteId; + + switch (sub_811BCBC()) + { + case 0: + graphicsId = EVENT_OBJ_GFX_REPORTER_M; + break; + case 1: + graphicsId = EVENT_OBJ_GFX_REPORTER_F; + break; + case 2: + graphicsId = EVENT_OBJ_GFX_BOY_1; + break; + default: + return; + } + + if (sub_811BA68() != 4) + return; + + spriteId = AddPseudoEventObject(graphicsId, SpriteCallbackDummy, 76, 40, 0); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].oam.priority = 0; + StartSpriteAnim(&gSprites[spriteId], 2); + } + + spriteId = AddPseudoEventObject( + gSaveBlock2Ptr->playerGender == MALE ? EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL : EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, + SpriteCallbackDummy, + 52, + 40, + 0); + + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].oam.priority = 0; + StartSpriteAnim(&gSprites[spriteId], 3); + } +} + +int sub_811E8E4(void) +{ + u8 var0 = sub_811BA68(); + switch (gUnknown_08597C30[var0].unk3) + { + case 1: + return 1; + case 2: + return 2; + case 0: + return 0; + default: + return 3; + } +} + +static int sub_811E920(int arg0) +{ + int var0 = sub_811E8E4(); + if (var0 < 3) + return gUnknown_08597E60[var0][arg0] + 4; + else + return 0; +} From 4582fd15456e2c84588026cdfbe70d6b6e558a35 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 19:52:11 -0500 Subject: [PATCH 110/217] Name a ton of commonly used event scripts --- data/event_scripts.s | 196 +++--------------- .../scripts.inc | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 8 +- data/maps/BattleFrontier_OutsideEast/map.json | 4 +- data/maps/BattleFrontier_OutsideWest/map.json | 4 +- data/maps/DewfordTown/map.json | 4 +- data/maps/DewfordTown_Gym/scripts.inc | 6 +- data/maps/DewfordTown_Hall/scripts.inc | 2 +- data/maps/EverGrandeCity/map.json | 4 +- data/maps/EverGrandeCity/scripts.inc | 2 +- .../EverGrandeCity_ChampionsRoom/scripts.inc | 2 +- data/maps/FallarborTown/map.json | 8 +- .../FallarborTown_BattleTentLobby/scripts.inc | 2 +- data/maps/FallarborTown_House1/scripts.inc | 2 +- data/maps/FortreeCity/map.json | 8 +- data/maps/FortreeCity_Gym/scripts.inc | 6 +- data/maps/FortreeCity_House2/scripts.inc | 2 +- data/maps/FortreeCity_House4/scripts.inc | 2 +- data/maps/LavaridgeTown/map.json | 8 +- data/maps/LavaridgeTown/scripts.inc | 4 +- data/maps/LavaridgeTown_Gym_1F/scripts.inc | 6 +- data/maps/LavaridgeTown_HerbShop/scripts.inc | 2 +- data/maps/LilycoveCity/map.json | 4 +- data/maps/LilycoveCity/scripts.inc | 6 +- .../LilycoveCity_ContestLobby/scripts.inc | 2 +- .../LilycoveCity_CoveLilyMotel_2F/scripts.inc | 2 +- data/maps/LilycoveCity_House2/scripts.inc | 2 +- .../scripts.inc | 2 +- data/maps/LittlerootTown/scripts.inc | 2 +- .../scripts.inc | 2 +- .../scripts.inc | 10 +- data/maps/MauvilleCity/map.json | 8 +- data/maps/MauvilleCity/scripts.inc | 2 +- data/maps/MauvilleCity_GameCorner/scripts.inc | 6 +- data/maps/MauvilleCity_Gym/scripts.inc | 6 +- data/maps/MossdeepCity/map.json | 8 +- data/maps/MossdeepCity/scripts.inc | 4 +- data/maps/MossdeepCity_Gym/scripts.inc | 6 +- .../MossdeepCity_SpaceCenter_1F/scripts.inc | 4 +- .../MossdeepCity_StevensHouse/scripts.inc | 2 +- data/maps/MtChimney/scripts.inc | 2 +- data/maps/MtPyre_1F/scripts.inc | 2 +- data/maps/OldaleTown/map.json | 8 +- data/maps/OldaleTown/scripts.inc | 4 +- data/maps/PacifidlogTown/map.json | 4 +- data/maps/PacifidlogTown_House2/scripts.inc | 4 +- data/maps/PetalburgCity/map.json | 8 +- data/maps/PetalburgCity_Gym/scripts.inc | 6 +- data/maps/PetalburgWoods/scripts.inc | 2 +- data/maps/Route103/scripts.inc | 2 +- data/maps/Route104/scripts.inc | 8 +- .../scripts.inc | 2 +- data/maps/Route109/scripts.inc | 2 +- data/maps/Route109_SeashoreHouse/scripts.inc | 2 +- data/maps/Route110/scripts.inc | 4 +- data/maps/Route110_TrickHouseEnd/scripts.inc | 4 +- .../Route110_TrickHouseEntrance/scripts.inc | 16 +- data/maps/Route111/scripts.inc | 2 +- .../Route111_OldLadysRestStop/scripts.inc | 2 +- .../scripts.inc | 2 +- data/maps/Route113_GlassWorkshop/scripts.inc | 4 +- data/maps/Route114/scripts.inc | 4 +- .../Route114_FossilManiacsHouse/scripts.inc | 2 +- data/maps/Route119/scripts.inc | 4 +- .../Route119_WeatherInstitute_1F/scripts.inc | 2 +- .../Route119_WeatherInstitute_2F/scripts.inc | 2 +- data/maps/Route120/scripts.inc | 2 +- data/maps/Route123/scripts.inc | 2 +- .../Route123_BerryMastersHouse/scripts.inc | 16 +- data/maps/Route124/scripts.inc | 2 +- data/maps/Route125/scripts.inc | 2 +- data/maps/Route126/scripts.inc | 2 +- data/maps/Route127/scripts.inc | 2 +- data/maps/Route128/scripts.inc | 2 +- data/maps/Route129/scripts.inc | 2 +- data/maps/Route130/scripts.inc | 2 +- data/maps/Route131/scripts.inc | 2 +- data/maps/RustboroCity/map.json | 8 +- data/maps/RustboroCity/scripts.inc | 2 +- .../RustboroCity_DevonCorp_2F/scripts.inc | 4 +- .../RustboroCity_DevonCorp_3F/scripts.inc | 4 +- data/maps/RustboroCity_Flat2_2F/scripts.inc | 2 +- data/maps/RustboroCity_Gym/scripts.inc | 4 +- .../RustboroCity_PokemonSchool/scripts.inc | 2 +- data/maps/SSTidalRooms/scripts.inc | 4 +- .../ShoalCave_LowTideEntranceRoom/scripts.inc | 2 +- .../ShoalCave_LowTideInnerRoom/scripts.inc | 12 +- .../ShoalCave_LowTideLowerRoom/scripts.inc | 4 +- .../ShoalCave_LowTideStairsRoom/scripts.inc | 2 +- data/maps/SkyPillar_Outside/scripts.inc | 2 +- data/maps/SlateportCity/map.json | 8 +- .../SlateportCity_BattleTentLobby/scripts.inc | 4 +- data/maps/SlateportCity_Harbor/scripts.inc | 4 +- data/maps/SlateportCity_House1/scripts.inc | 2 +- .../SlateportCity_PokemonFanClub/scripts.inc | 2 +- data/maps/SootopolisCity/map.json | 8 +- data/maps/SootopolisCity/scripts.inc | 8 +- data/maps/SootopolisCity_Gym_1F/scripts.inc | 6 +- data/maps/SootopolisCity_House1/scripts.inc | 2 +- data/maps/SootopolisCity_House6/scripts.inc | 2 +- .../scripts.inc | 2 +- data/maps/TrainerHill_Entrance/scripts.inc | 2 +- data/maps/VerdanturfTown/map.json | 8 +- .../scripts.inc | 4 +- data/scripts/cable_club.inc | 14 +- data/scripts/contest_hall.inc | 4 +- data/scripts/players_house.inc | 4 +- data/scripts/pokeblocks.inc | 2 +- data/scripts/secret_base.inc | 20 +- 114 files changed, 264 insertions(+), 406 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 1b8807ed76..76b2866982 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -824,27 +824,12 @@ Std_10: @ 8271347 EventScript_27134E: @ 827134E return -BattleFrontier_BattleArenaLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattleDomeLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattleFactoryLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattlePalaceLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattlePikeLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattlePyramidLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattleTowerLobby_EventScript_27134F:: @ 827134F -FallarborTown_BattleTentLobby_EventScript_27134F:: @ 827134F -LilycoveCity_ContestLobby_EventScript_27134F:: @ 827134F -MossdeepCity_GameCorner_1F_EventScript_27134F:: @ 827134F -OldaleTown_PokemonCenter_2F_EventScript_27134F:: @ 827134F -SecretBase_RedCave1_EventScript_27134F:: @ 827134F -SlateportCity_BattleTentLobby_EventScript_27134F:: @ 827134F -SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F:: @ 827134F -TrainerHill_Entrance_EventScript_27134F:: @ 827134F -VerdanturfTown_BattleTentLobby_EventScript_27134F:: @ 827134F +Common_EventScript_SaveGame:: @ 827134F special SaveGame waitstate return - EventScript_271354:: @ 8271354 +EventScript_271354:: @ 8271354 cmdD8 cmdD9 @@ -1542,7 +1527,7 @@ EventScript_271C9B:: @ 8271C9B EventScript_271CA1:: @ 8271CA1 msgbox gUnknown_08272A78, MSGBOX_DEFAULT - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return @@ -1594,7 +1579,7 @@ EventScript_271D2A:: @ 8271D2A EventScript_271D47:: @ 8271D47 msgbox gUnknown_08272ABF, MSGBOX_DEFAULT - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT setvar VAR_RESULT, 0 releaseall end @@ -1689,38 +1674,12 @@ EventScript_271E54:: @ 8271E54 goto EventScript_271DBC end -BattleFrontier_OutsideWest_EventScript_271E6A:: @ 8271E6A -FallarborTown_EventScript_271E6A:: @ 8271E6A -FortreeCity_EventScript_271E6A:: @ 8271E6A -LavaridgeTown_EventScript_271E6A:: @ 8271E6A -MauvilleCity_EventScript_271E6A:: @ 8271E6A -MossdeepCity_EventScript_271E6A:: @ 8271E6A -OldaleTown_EventScript_271E6A:: @ 8271E6A -PetalburgCity_EventScript_271E6A:: @ 8271E6A -RustboroCity_EventScript_271E6A:: @ 8271E6A -SlateportCity_EventScript_271E6A:: @ 8271E6A -SootopolisCity_EventScript_271E6A:: @ 8271E6A -VerdanturfTown_EventScript_271E6A:: @ 8271E6A - msgbox gUnknown_08272B6A, MSGBOX_SIGN +Common_EventScript_ShowPokemartSign:: @ 8271E6A + msgbox gText_PokemartSign, MSGBOX_SIGN end -BattleFrontier_OutsideEast_EventScript_271E73:: @ 8271E73 -DewfordTown_EventScript_271E73:: @ 8271E73 -EverGrandeCity_EventScript_271E73:: @ 8271E73 -FallarborTown_EventScript_271E73:: @ 8271E73 -FortreeCity_EventScript_271E73:: @ 8271E73 -LavaridgeTown_EventScript_271E73:: @ 8271E73 -LilycoveCity_EventScript_271E73:: @ 8271E73 -MauvilleCity_EventScript_271E73:: @ 8271E73 -MossdeepCity_EventScript_271E73:: @ 8271E73 -OldaleTown_EventScript_271E73:: @ 8271E73 -PacifidlogTown_EventScript_271E73:: @ 8271E73 -PetalburgCity_EventScript_271E73:: @ 8271E73 -RustboroCity_EventScript_271E73:: @ 8271E73 -SlateportCity_EventScript_271E73:: @ 8271E73 -SootopolisCity_EventScript_271E73:: @ 8271E73 -VerdanturfTown_EventScript_271E73:: @ 8271E73 - msgbox gUnknown_08272B9E, MSGBOX_SIGN +Common_EventScript_ShowPokemonCenterSign:: @ 8271E73 + msgbox gText_PokemonCenterSign, MSGBOX_SIGN end BattleFrontier_BattleTowerLobby_EventScript_271E7C:: @ 8271E7C @@ -1779,17 +1738,7 @@ EventScript_271ED5:: @ 8271ED5 EventScript_271ED6:: @ 8271ED6 end -EverGrandeCity_ChampionsRoom_EventScript_271ED7:: @ 8271ED7 -LavaridgeTown_EventScript_271ED7:: @ 8271ED7 -LilycoveCity_EventScript_271ED7:: @ 8271ED7 -LittlerootTown_EventScript_271ED7:: @ 8271ED7 -LittlerootTown_ProfessorBirchsLab_EventScript_271ED7:: @ 8271ED7 -OldaleTown_EventScript_271ED7:: @ 8271ED7 -Route103_EventScript_271ED7:: @ 8271ED7 -Route104_EventScript_271ED7:: @ 8271ED7 -Route110_EventScript_271ED7:: @ 8271ED7 -Route119_EventScript_271ED7:: @ 8271ED7 -RustboroCity_EventScript_271ED7:: @ 8271ED7 +Common_EventScript_SetupRivalGender:: @ 8271ED7 checkplayergender compare VAR_RESULT, MALE goto_if_eq RustboroCity_EventScript_271EEF @@ -1805,9 +1754,7 @@ RustboroCity_EventScript_271EF5:: @ 8271EF5 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return -LavaridgeTown_EventScript_271EFB:: @ 8271EFB -Route110_EventScript_271EFB:: @ 8271EFB -Route119_EventScript_271EFB:: @ 8271EFB +Common_EventScript_SetupRivalOnBikeGender:: @ 8271EFB checkplayergender compare VAR_RESULT, MALE goto_if_eq LavaridgeTown_EventScript_271F13 @@ -1939,119 +1886,34 @@ DewfordTown_Gym_EventScript_272035:: @ 8272035 settrainerflag TRAINER_DAPHNE return -DewfordTown_Gym_EventScript_272054:: @ 8272054 -DewfordTown_Hall_EventScript_272054:: @ 8272054 -FallarborTown_House1_EventScript_272054:: @ 8272054 -FortreeCity_Gym_EventScript_272054:: @ 8272054 -FortreeCity_House2_EventScript_272054:: @ 8272054 -FortreeCity_House4_EventScript_272054:: @ 8272054 -LavaridgeTown_Gym_1F_EventScript_272054:: @ 8272054 -LavaridgeTown_HerbShop_EventScript_272054:: @ 8272054 -LilycoveCity_EventScript_272054:: @ 8272054 -LilycoveCity_House2_EventScript_272054:: @ 8272054 -LittlerootTown_BrendansHouse_1F_EventScript_272054:: @ 8272054 -MauvilleCity_EventScript_272054:: @ 8272054 -MauvilleCity_Gym_EventScript_272054:: @ 8272054 -MossdeepCity_EventScript_272054:: @ 8272054 -MossdeepCity_Gym_EventScript_272054:: @ 8272054 -MossdeepCity_SpaceCenter_1F_EventScript_272054:: @ 8272054 -MtPyre_1F_EventScript_272054:: @ 8272054 -PacifidlogTown_House2_EventScript_272054:: @ 8272054 -PetalburgCity_Gym_EventScript_272054:: @ 8272054 -PetalburgWoods_EventScript_272054:: @ 8272054 -Route104_EventScript_272054:: @ 8272054 -Route104_PrettyPetalFlowerShop_EventScript_272054:: @ 8272054 -Route109_EventScript_272054:: @ 8272054 -Route111_EventScript_272054:: @ 8272054 -Route111_WinstrateFamilysHouse_EventScript_272054:: @ 8272054 -Route114_EventScript_272054:: @ 8272054 -Route114_FossilManiacsHouse_EventScript_272054:: @ 8272054 -Route120_EventScript_272054:: @ 8272054 -Route123_BerryMastersHouse_EventScript_272054:: @ 8272054 -Route123_EventScript_272054:: @ 8272054 -RustboroCity_DevonCorp_3F_EventScript_272054:: @ 8272054 -RustboroCity_Flat2_2F_EventScript_272054:: @ 8272054 -RustboroCity_Gym_EventScript_272054:: @ 8272054 -RustboroCity_PokemonSchool_EventScript_272054:: @ 8272054 -SSTidalRooms_EventScript_272054:: @ 8272054 -ShoalCave_LowTideEntranceRoom_EventScript_272054:: @ 8272054 -ShoalCave_LowTideInnerRoom_EventScript_272054:: @ 8272054 -ShoalCave_LowTideLowerRoom_EventScript_272054:: @ 8272054 -ShoalCave_LowTideStairsRoom_EventScript_272054:: @ 8272054 -SlateportCity_BattleTentLobby_EventScript_272054:: @ 8272054 -SlateportCity_Harbor_EventScript_272054:: @ 8272054 -SlateportCity_PokemonFanClub_EventScript_272054:: @ 8272054 -SootopolisCity_EventScript_272054:: @ 8272054 -SootopolisCity_Gym_1F_EventScript_272054:: @ 8272054 -SootopolisCity_House1_EventScript_272054:: @ 8272054 -VerdanturfTown_BattleTentLobby_EventScript_272054:: @ 8272054 - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT +Common_EventScript_ShowBagIsFull:: @ 8272054 + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT release end -DewfordTown_Gym_EventScript_27205E:: @ 827205E -FortreeCity_Gym_EventScript_27205E:: @ 827205E -LavaridgeTown_Gym_1F_EventScript_27205E:: @ 827205E -LilycoveCity_ContestLobby_EventScript_27205E:: @ 827205E -LinkContestRoom1_EventScript_27205E:: @ 827205E -MauvilleCity_GameCorner_EventScript_27205E:: @ 827205E -MauvilleCity_Gym_EventScript_27205E:: @ 827205E -MossdeepCity_Gym_EventScript_27205E:: @ 827205E -PetalburgCity_Gym_EventScript_27205E:: @ 827205E -Route110_TrickHouseEnd_EventScript_27205E:: @ 827205E -Route110_TrickHouseEntrance_EventScript_27205E:: @ 827205E -Route113_GlassWorkshop_EventScript_27205E:: @ 827205E -SootopolisCity_Gym_1F_EventScript_27205E:: @ 827205E - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT +Common_EventScript_BagIsFull:: @ 827205E + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT return Route114_LanettesHouse_EventScript_272067:: @ 8272067 - msgbox gUnknown_08272B1A, MSGBOX_DEFAULT + msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT release end -LilycoveCity_LilycoveMuseum_2F_EventScript_272071:: @ 8272071 -MauvilleCity_GameCorner_EventScript_272071:: @ 8272071 -Route110_TrickHouseEnd_EventScript_272071:: @ 8272071 -Route110_TrickHouseEntrance_EventScript_272071:: @ 8272071 -Route113_GlassWorkshop_EventScript_272071:: @ 8272071 - msgbox gUnknown_08272B1A, MSGBOX_DEFAULT +Common_EventScript_NoRoomLeftForAnother:: @ 8272071 + msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT return -EverGrandeCity_EventScript_27207A:: @ 827207A -LilycoveCity_EventScript_27207A:: @ 827207A -MossdeepCity_EventScript_27207A:: @ 827207A -Route124_EventScript_27207A:: @ 827207A -Route125_EventScript_27207A:: @ 827207A -Route126_EventScript_27207A:: @ 827207A -Route127_EventScript_27207A:: @ 827207A -Route128_EventScript_27207A:: @ 827207A -Route129_EventScript_27207A:: @ 827207A -Route130_EventScript_27207A:: @ 827207A -Route131_EventScript_27207A:: @ 827207A -SkyPillar_Outside_EventScript_27207A:: @ 827207A -SootopolisCity_EventScript_27207A:: @ 827207A - setweather 15 +Common_EventScript_SetWeather15:: @ 827207A + setweather WEATHER_15 return -DewfordTown_Gym_EventScript_27207E:: @ 827207E -FortreeCity_Gym_EventScript_27207E:: @ 827207E -LavaridgeTown_Gym_1F_EventScript_27207E:: @ 827207E -LilycoveCity_CoveLilyMotel_2F_EventScript_27207E:: @ 827207E -MauvilleCity_Gym_EventScript_27207E:: @ 827207E -MossdeepCity_Gym_EventScript_27207E:: @ 827207E -PetalburgCity_Gym_EventScript_27207E:: @ 827207E -RustboroCity_Gym_EventScript_27207E:: @ 827207E -SootopolisCity_Gym_1F_EventScript_27207E:: @ 827207E +Common_EventScript_PlayGymBadgeFanfare:: @ 827207E playfanfare MUS_ME_BACHI waitfanfare return -LittlerootTown_BrendansHouse_1F_EventScript_272083:: @ 8272083 -Route111_OldLadysRestStop_EventScript_272083:: @ 8272083 -Route119_WeatherInstitute_1F_EventScript_272083:: @ 8272083 -RustboroCity_DevonCorp_3F_EventScript_272083:: @ 8272083 -SSTidalRooms_EventScript_272083:: @ 8272083 +Common_EventScript_OutOfCenterPartyHeal:: @ 8272083 fadescreen 1 playfanfare MUS_ME_ASA waitfanfare @@ -2061,7 +1923,7 @@ SSTidalRooms_EventScript_272083:: @ 8272083 EventScript_RegionMap:: @ 827208F lockall - msgbox LittlerootTown_BrendansHouse_2F_Text_1F8820, MSGBOX_DEFAULT + msgbox Common_Text_LookCloserAtMap, MSGBOX_DEFAULT fadescreen 1 special FieldShowRegionMap waitstate @@ -2413,11 +2275,7 @@ Route120_Movement_2723C7: @ 82723C7 set_visible step_end -LittlerootTown_ProfessorBirchsLab_EventScript_2723DD:: @ 82723DD -MossdeepCity_StevensHouse_EventScript_2723DD:: @ 82723DD -Route119_WeatherInstitute_2F_EventScript_2723DD:: @ 82723DD -RustboroCity_DevonCorp_2F_EventScript_2723DD:: @ 82723DD -SlateportCity_House1_EventScript_2723DD:: @ 82723DD +Common_EventScript_NameReceivedPokemon:: @ 82723DD fadescreen 1 special ChangePokemonNickname waitstate @@ -3033,7 +2891,7 @@ gUnknown_08272A9A:: @ 8272A9A gUnknown_08272ABF:: @ 8272ABF .string "{PLAYER} found one {STR_VAR_2}!$" -gUnknown_08272AD0:: @ 8272AD0 +gText_TooBadBagIsFull:: @ 8272AD0 .string "Too bad!\nThe BAG is full…$" gUnknown_08272AEA:: @ 8272AEA @@ -3042,16 +2900,16 @@ gUnknown_08272AEA:: @ 8272AEA gUnknown_08272B09:: @ 8272B09 .string "Obtained the {STR_VAR_2}!$" -gUnknown_08272B1A:: @ 8272B1A +gText_NoRoomLeftForAnother:: @ 8272B1A .string "Too bad! There's no room left for\nanother {STR_VAR_2}…$" gUnknown_08272B48:: @ 8272B48 .string "The {STR_VAR_2} was transferred\nto the PC.$" -gUnknown_08272B6A:: @ 8272B6A +gText_PokemartSign:: @ 8272B6A .string "“Selected items for your convenience!â€\nPOKéMON MART$" -gUnknown_08272B9E:: @ 8272B9E +gText_PokemonCenterSign:: @ 8272B9E .string "“Rejuvenate your tired partners!â€\nPOKéMON CENTER$" gUnknown_08272BCF:: @ 8272BCF diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 2c53b7ed65..9d588b6663 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -199,7 +199,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleArenaLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 35c32c3fa4..8b01eba0ab 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -248,7 +248,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleDomeLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index 39d7298469..956cede17f 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -208,7 +208,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 special CallFrontierUtilFunc closemessage delay 2 - call BattleFrontier_BattleFactoryLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258783 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 56edda8ada..5d7f7aaf5f 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -223,7 +223,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattlePalaceLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index 70d7f3c6cd..ab53d4c23b 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -195,7 +195,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattlePikeLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 setvar VAR_0x8004, 26 special CallBattlePikeFunction diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 686a1bfb29..bafe61ae66 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -200,7 +200,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattlePyramidLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index e1bec2c213..29be452300 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -300,7 +300,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleTowerLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 @@ -380,7 +380,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleTowerLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 @@ -461,7 +461,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleTowerLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 @@ -544,7 +544,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 setvar VAR_0x8004, 6 setvar VAR_0x8005, 0 special sub_8161F74 - call BattleFrontier_BattleTowerLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json index e119f89a0f..341b203218 100644 --- a/data/maps/BattleFrontier_OutsideEast/map.json +++ b/data/maps/BattleFrontier_OutsideEast/map.json @@ -515,7 +515,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_OutsideEast_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -523,7 +523,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_OutsideEast_EventScript_271E73" + "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 6f97192ed0..a2972e0b40 100644 --- a/data/maps/BattleFrontier_OutsideWest/map.json +++ b/data/maps/BattleFrontier_OutsideWest/map.json @@ -444,7 +444,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_OutsideWest_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -452,7 +452,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_OutsideWest_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" } ] } \ No newline at end of file diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 8cd8635887..32fe0c313b 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -152,7 +152,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "DewfordTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -160,7 +160,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "DewfordTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 90fd3d4ae4..bafdc6c231 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -169,7 +169,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 call DewfordTown_Gym_EventScript_1FC75D message DewfordTown_Gym_Text_1FD07D waitmessage - call DewfordTown_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox DewfordTown_Gym_Text_1FD0A8, MSGBOX_DEFAULT setflag FLAG_DEFEATED_DEWFORD_GYM setflag FLAG_BADGE02_GET @@ -195,7 +195,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 - goto_if_eq DewfordTown_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM08 return @@ -203,7 +203,7 @@ DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 DewfordTown_Gym_EventScript_1FC878:: @ 81FC878 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 - goto_if_eq DewfordTown_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM08 release diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 0d9cf514cd..a89b7f0247 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -256,7 +256,7 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT giveitem_std ITEM_TM36 compare VAR_RESULT, 0 - goto_if_eq DewfordTown_Hall_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM36 release end diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 502aae2fc6..90175db1d1 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -166,7 +166,7 @@ "y": 48, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "EverGrandeCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -190,7 +190,7 @@ "y": 48, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "EverGrandeCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" } ] } \ No newline at end of file diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index 75327b839b..99d5ab8112 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -3,7 +3,7 @@ EverGrandeCity_MapScripts:: @ 81E7D1B .byte 0 EverGrandeCity_MapScript1_1E7D21: @ 81E7D21 - call_if_set FLAG_SYS_WEATHER_CTRL, EverGrandeCity_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 149c54cd8b..f1db8df846 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -5,7 +5,7 @@ EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF .byte 0 EverGrandeCity_ChampionsRoom_MapScript1_2289FF: @ 82289FF - call EverGrandeCity_ChampionsRoom_EventScript_271ED7 + call Common_EventScript_SetupRivalGender end EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05 diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 4afffa73c2..8633191843 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -123,7 +123,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -131,7 +131,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -147,7 +147,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -163,7 +163,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 5d05570cc4..1128540e9c 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -191,7 +191,7 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 special LoadPlayerParty closemessage delay 2 - call FallarborTown_BattleTentLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq FallarborTown_BattleTentLobby_EventScript_2001AB diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index caf915e858..2255f90d3e 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -20,7 +20,7 @@ FallarborTown_House1_EventScript_200F38:: @ 8200F38 msgbox FallarborTown_House1_Text_201159, MSGBOX_DEFAULT giveitem_std ITEM_TM27 compare VAR_RESULT, 0 - goto_if_eq FallarborTown_House1_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setvar VAR_0x8004, 280 call FallarborTown_House1_EventScript_2723E4 setflag FLAG_RECEIVED_TM27 diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index d66ec1f4b3..454fc34d39 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -198,7 +198,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -206,7 +206,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -222,7 +222,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -230,7 +230,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" } ] } \ No newline at end of file diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 17633c0d57..59cbfefa6b 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -28,7 +28,7 @@ FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 FortreeCity_Gym_EventScript_2165FD:: @ 82165FD message FortreeCity_Gym_Text_216EEC waitmessage - call FortreeCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox FortreeCity_Gym_Text_216F17, MSGBOX_DEFAULT setflag FLAG_DEFEATED_FORTREE_GYM setflag FLAG_BADGE06_GET @@ -51,7 +51,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD FortreeCity_Gym_EventScript_216646:: @ 8216646 giveitem_std ITEM_TM40 compare VAR_RESULT, 0 - goto_if_eq FortreeCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM40 release @@ -60,7 +60,7 @@ FortreeCity_Gym_EventScript_216646:: @ 8216646 FortreeCity_Gym_EventScript_21666A:: @ 821666A giveitem_std ITEM_TM40 compare VAR_RESULT, 0 - goto_if_eq FortreeCity_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM40 return diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index cebd18884c..34344bca36 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -21,7 +21,7 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB msgbox FortreeCity_House2_Text_217A28, MSGBOX_DEFAULT giveitem_std ITEM_TM10 compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House2_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM10 msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT release diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index fe4aefe5fc..43db341d99 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -33,7 +33,7 @@ FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 msgbox FortreeCity_House4_Text_217E05, MSGBOX_DEFAULT giveitem_std ITEM_MENTAL_HERB compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House4_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MENTAL_HERB releaseall end diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index 9bec14bd1a..65a6a25d38 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -216,7 +216,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -232,7 +232,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -240,7 +240,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -248,7 +248,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "hidden_item", diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 899df4d2cd..9109008b27 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -7,8 +7,8 @@ LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE setflag FLAG_VISITED_LAVARIDGE_TOWN call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, LavaridgeTown_EventScript_1EA514 call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F - call LavaridgeTown_EventScript_271ED7 - call LavaridgeTown_EventScript_271EFB + call Common_EventScript_SetupRivalGender + call Common_EventScript_SetupRivalOnBikeGender compare VAR_0x4053, 1 call_if_eq LavaridgeTown_EventScript_1EA518 compare VAR_0x4053, 1 diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index bf48225eca..89dc30f474 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -71,7 +71,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 message LavaridgeTown_Gym_1F_Text_1FF32F waitmessage - call LavaridgeTown_Gym_1F_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox LavaridgeTown_Gym_1F_Text_1FF359, MSGBOX_DEFAULT setflag FLAG_FLANNERY_GIVES_BADGE_INFO setflag FLAG_DEFEATED_LAVARIDGE_GYM @@ -98,7 +98,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D giveitem_std ITEM_TM50 compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_Gym_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM50 release @@ -107,7 +107,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841 giveitem_std ITEM_TM50 compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_Gym_1F_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM50 return diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index e579963185..f6ad8e26bc 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -32,7 +32,7 @@ LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 msgbox LavaridgeTown_HerbShop_Text_1FE584, MSGBOX_DEFAULT giveitem_std ITEM_CHARCOAL compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_HerbShop_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLFLAG_RECEIVED_CHARCOAL release end diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 63c5925fdd..ea771c3b58 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -428,7 +428,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LilycoveCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -444,7 +444,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LilycoveCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index cfa6b38675..5a4ef5d431 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -7,8 +7,8 @@ LilycoveCity_MapScript1_1E2B47: @ 81E2B47 setflag FLAG_VISITED_LILYCOVE_CITY setvar VAR_0x4086, 0 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER - call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_27207A - call LilycoveCity_EventScript_271ED7 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 + call Common_EventScript_SetupRivalGender end LilycoveCity_MapScript1_1E2B61: @ 81E2B61 @@ -40,7 +40,7 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_LILYCOVE_RECEIVED_BERRY msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT release diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 42ce7beeb0..f57aae096e 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -642,7 +642,7 @@ LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 msgbox LilycoveCity_ContestLobby_Text_27BD17, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F - call LilycoveCity_ContestLobby_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F message LilycoveCity_ContestLobby_Text_27C8FD diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index 03ac733f98..4a761a7061 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -26,7 +26,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_218702:: @ 8218702 LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F message LilycoveCity_CoveLilyMotel_2F_Text_21881C waitmessage - call LilycoveCity_CoveLilyMotel_2F_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare special Special_ShowDiploma waitstate release diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc index 92adafe5a4..0a0792bfda 100644 --- a/data/maps/LilycoveCity_House2/scripts.inc +++ b/data/maps/LilycoveCity_House2/scripts.inc @@ -8,7 +8,7 @@ LilycoveCity_House2_EventScript_21ED75:: @ 821ED75 msgbox LilycoveCity_House2_Text_21EDB6, MSGBOX_DEFAULT giveitem_std ITEM_TM44 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_House2_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM44 msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT release diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index f73fbf092e..204b2cee3b 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -127,7 +127,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA end LilycoveCity_LilycoveMuseum_2F_EventScript_219911:: @ 8219911 - call LilycoveCity_LilycoveMuseum_2F_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, MSGBOX_DEFAULT closemessage releaseall diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 5d9161cb42..c7bb25ba77 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -6,7 +6,7 @@ LittlerootTown_MapScripts:: @ 81E7DCB LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB setflag FLAG_VISITED_LITTLEROOT_TOWN - call LittlerootTown_EventScript_271ED7 + call Common_EventScript_SetupRivalGender compare VAR_0x4092, 2 call_if_eq LittlerootTown_EventScript_1E7E67 call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index ea00693a83..ca57959de6 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -307,7 +307,7 @@ LittlerootTown_BrendansHouse_2F_Text_1F877F: @ 81F877F .string "Record your progress with SAVE.\p" .string "The remaining pages are blank…$" -LittlerootTown_BrendansHouse_2F_Text_1F8820: @ 81F8820 +Common_Text_LookCloserAtMap: @ 81F8820 .string "{PLAYER} took a closer look at the\n" .string "HOENN region map.$" diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 5c762743ca..5565d2934c 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -5,7 +5,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91 .byte 0 LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1 - call LittlerootTown_ProfessorBirchsLab_EventScript_271ED7 + call Common_EventScript_SetupRivalGender call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7 @@ -107,7 +107,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07 setvar VAR_0x8004, 0 - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 end @@ -351,7 +351,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD end @@ -396,7 +396,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E end @@ -441,7 +441,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F end diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index f3bde6eb96..e44bc78dd0 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -238,7 +238,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -254,7 +254,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -262,7 +262,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -270,7 +270,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 21f654888c..454adb60d1 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -440,7 +440,7 @@ MauvilleCity_EventScript_1DF784:: @ 81DF784 msgbox MauvilleCity_Text_1E020E, MSGBOX_DEFAULT giveitem_std ITEM_TM24 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_GOT_TM24_FROM_WATTSON msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT release diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 34125b421d..3b1a5fe084 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -215,7 +215,7 @@ MauvilleCity_GameCorner_EventScript_20FE79:: @ 820FE79 end MauvilleCity_GameCorner_EventScript_20FE87:: @ 820FE87 - call MauvilleCity_GameCorner_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother goto MauvilleCity_GameCorner_EventScript_20FD20 end @@ -383,7 +383,7 @@ MauvilleCity_GameCorner_EventScript_2100FF:: @ 82100FF end MauvilleCity_GameCorner_EventScript_21010D:: @ 821010D - call MauvilleCity_GameCorner_EventScript_27205E + call Common_EventScript_BagIsFull goto MauvilleCity_GameCorner_EventScript_20FECE end @@ -448,7 +448,7 @@ MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 end MauvilleCity_GameCorner_EventScript_2101FA:: @ 82101FA - call MauvilleCity_GameCorner_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother msgbox MauvilleCity_GameCorner_Text_2107A9, MSGBOX_DEFAULT release end diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 76bceae56d..4d555fe79b 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -88,7 +88,7 @@ MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B message MauvilleCity_Gym_Text_20E77F waitmessage - call MauvilleCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox MauvilleCity_Gym_Text_20E7AA, MSGBOX_DEFAULT setvar VAR_0x40D2, 3 clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT @@ -117,7 +117,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D giveitem_std ITEM_TM34 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM34 release @@ -126,7 +126,7 @@ MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D MauvilleCity_Gym_EventScript_20DFB1:: @ 820DFB1 giveitem_std ITEM_TM34 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM34 return diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index 767a99584c..952ff253ca 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -439,7 +439,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -447,7 +447,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -463,7 +463,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -471,7 +471,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index b504d70048..3e4da5776c 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -7,7 +7,7 @@ MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2 @@ -231,7 +231,7 @@ MossdeepCity_EventScript_1E4C26:: @ 81E4C26 msgbox MossdeepCity_Text_1E4D5B, MSGBOX_DEFAULT giveitem_std ITEM_KINGS_ROCK compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_KINGS_ROCK release end diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index fc1a73b4dc..6e5b461cd6 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -57,7 +57,7 @@ MossdeepCity_Gym_EventScript_220898:: @ 8220898 MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 message MossdeepCity_Gym_Text_22196A waitmessage - call MossdeepCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox MossdeepCity_Gym_Text_221999, MSGBOX_DEFAULT setflag FLAG_DEFEATED_MOSSDEEP_GYM setflag FLAG_BADGE07_GET @@ -89,7 +89,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 MossdeepCity_Gym_EventScript_220937:: @ 8220937 giveitem_std ITEM_TM04 compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM04 release @@ -98,7 +98,7 @@ MossdeepCity_Gym_EventScript_220937:: @ 8220937 MossdeepCity_Gym_EventScript_22095B:: @ 822095B giveitem_std ITEM_TM04 compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM04 return diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 6d9022065e..b20524262f 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -120,7 +120,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT release @@ -136,7 +136,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 51f1ac16e1..16da558c8d 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -99,7 +99,7 @@ MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 compare VAR_RESULT, 0 goto_if_eq MossdeepCity_StevensHouse_EventScript_222901 call MossdeepCity_StevensHouse_EventScript_27378B - call MossdeepCity_StevensHouse_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto MossdeepCity_StevensHouse_EventScript_222901 end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 3bfc33f6ab..aa1d947be1 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -121,7 +121,7 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3 end MtChimney_EventScript_22EF51:: @ 822EF51 - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT hidemoneybox nop nop diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc index 676df4aee6..a06f34a298 100644 --- a/data/maps/MtPyre_1F/scripts.inc +++ b/data/maps/MtPyre_1F/scripts.inc @@ -8,7 +8,7 @@ MtPyre_1F_EventScript_230F3F:: @ 8230F3F msgbox MtPyre_1F_Text_230F8A, MSGBOX_DEFAULT giveitem_std ITEM_CLEANSE_TAG compare VAR_RESULT, 0 - goto_if_eq MtPyre_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_CLEANSE_TAG release end diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 164cd3eae0..6826155ed3 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -166,7 +166,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -174,7 +174,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -182,7 +182,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -190,7 +190,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" } ] } \ No newline at end of file diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 7431cbf2aa..73b3e4d959 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -3,7 +3,7 @@ OldaleTown_MapScripts:: @ 81E8EA2 .byte 0 OldaleTown_MapScript1_1E8EA8: @ 81E8EA8 - call OldaleTown_EventScript_271ED7 + call Common_EventScript_SetupRivalGender setflag FLAG_VISITED_OLDALE_TOWN call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ED2 call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_1E8EDE @@ -85,7 +85,7 @@ OldaleTown_EventScript_1E8FB9:: @ 81E8FB9 end OldaleTown_EventScript_1E8FC3:: @ 81E8FC3 - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT fadedefaultbgm release end diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index 971bf5b860..3070d9c07a 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -117,7 +117,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PacifidlogTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -133,7 +133,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PacifidlogTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" } ] } \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index c7c04c0bd8..57169cc170 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -43,7 +43,7 @@ PacifidlogTown_House2_EventScript_203816:: @ 8203816 msgbox PacifidlogTown_House2_Text_20396D, MSGBOX_DEFAULT giveitem_std ITEM_TM27 compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_House2_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT @@ -59,7 +59,7 @@ PacifidlogTown_House2_EventScript_20384F:: @ 820384F msgbox PacifidlogTown_House2_Text_203A2F, MSGBOX_DEFAULT giveitem_std ITEM_TM21 compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_House2_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index d8f77168b2..0b01b5ddb9 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -276,7 +276,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -284,7 +284,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -300,7 +300,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -308,7 +308,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 915cdc93e1..b4733ab090 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -403,7 +403,7 @@ PetalburgCity_Gym_EventScript_204E17:: @ 8204E17 PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D giveitem_std ITEM_ENIGMA_BERRY compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setvar VAR_ENIGMA_BERRY_AVAILABLE, 0 release end @@ -413,7 +413,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B trainerbattle_no_intro TRAINER_NORMAN_1, PetalburgCity_Gym_Text_206107 message PetalburgCity_Gym_Text_206162 waitmessage - call PetalburgCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox PetalburgCity_Gym_Text_20618A, MSGBOX_DEFAULT setflag FLAG_DEFEATED_PETALBURG_GYM setvar VAR_0x4085, 7 @@ -444,7 +444,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2 giveitem_std ITEM_TM42 compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull setflag FLAG_RECEIVED_TM42 msgbox PetalburgCity_Gym_Text_206254, MSGBOX_DEFAULT return diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index eec9100f1a..e296b8447f 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -253,7 +253,7 @@ PetalburgWoods_EventScript_22E222:: @ 822E222 msgbox PetalburgWoods_Text_22EAFE, MSGBOX_DEFAULT giveitem_std ITEM_MIRACLE_SEED compare VAR_RESULT, 0 - goto_if_eq PetalburgWoods_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MIRACLE_SEED release end diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index e13bad76df..1cb912bd0d 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -4,7 +4,7 @@ Route103_MapScripts:: @ 81EC38E .byte 0 Route103_MapScript1_1EC399: @ 81EC399 - call Route103_EventScript_271ED7 + call Common_EventScript_SetupRivalGender call Route103_EventScript_2720AD end diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index e904f69b74..d50a8a9a39 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -13,7 +13,7 @@ Route104_EventScript_1ECC47:: @ 81ECC47 end Route104_MapScript1_1ECC4E: @ 81ECC4E - call Route104_EventScript_271ED7 + call Common_EventScript_SetupRivalGender call Route104_EventScript_1ECC78 call Route104_EventScript_1ECC5E end @@ -270,7 +270,7 @@ Route104_EventScript_1ECF8C:: @ 81ECF8C msgbox Route104_Text_2A6D86, MSGBOX_DEFAULT giveitem_std ITEM_CHESTO_BERRY compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104 msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT release @@ -288,7 +288,7 @@ Route104_EventScript_1ECFCD:: @ 81ECFCD msgbox Route104_Text_1ED96A, MSGBOX_DEFAULT giveitem_std ITEM_WHITE_HERB compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_WHITE_HERB release end @@ -341,7 +341,7 @@ Route104_EventScript_1ED057:: @ 81ED057 msgbox Route104_Text_1ED838, MSGBOX_DEFAULT giveitem_std ITEM_TM09 compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM09 release end diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index 7f5e352876..a1f0706510 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -91,7 +91,7 @@ Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT release diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index ebf9398d13..490f1d2552 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -332,7 +332,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT giveitem_std ITEM_SOFT_SAND compare VAR_RESULT, 0 - goto_if_eq Route109_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull closemessage applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 waitmovement 0 diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index 951356409d..89e31d639b 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -75,7 +75,7 @@ Route109_SeashoreHouse_EventScript_2694C8:: @ 82694C8 end Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5 - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT hidemoneybox nop nop diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 7c98cc6035..958f3a36a0 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -9,8 +9,8 @@ Route110_MapScript1_1EF279: @ 81EF279 end Route110_MapScript1_1EF27D: @ 81EF27D - call Route110_EventScript_271ED7 - call Route110_EventScript_271EFB + call Common_EventScript_SetupRivalGender + call Common_EventScript_SetupRivalOnBikeGender compare VAR_CYCLING_CHALLENGE_STATE, 1 call_if_eq Route110_EventScript_1EF293 end diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 8326a7c02e..de6aa2119d 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -200,13 +200,13 @@ Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF return Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF - call Route110_TrickHouseEnd_EventScript_27205E + call Common_EventScript_BagIsFull msgbox Route110_TrickHouseEnd_Text_26B760, MSGBOX_DEFAULT setvar VAR_0x40C1, 1 return Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002 - call Route110_TrickHouseEnd_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother msgbox Route110_TrickHouseEnd_Text_26B615, MSGBOX_DEFAULT setvar VAR_0x40C1, 1 return diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index b2aa22f6c1..ac27d3af62 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -364,7 +364,7 @@ Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -374,7 +374,7 @@ Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -384,7 +384,7 @@ Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -394,7 +394,7 @@ Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -404,7 +404,7 @@ Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -414,7 +414,7 @@ Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -424,7 +424,7 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -445,7 +445,7 @@ Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A09A compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_272071 + call_if_eq Common_EventScript_NoRoomLeftForAnother msgbox Route110_TrickHouseEntrance_Text_26ABBD, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 74ee42c646..d9d5ea7ea9 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -164,7 +164,7 @@ Route111_EventScript_1F0EB9:: @ 81F0EB9 msgbox Route111_Text_2A6EBD, MSGBOX_DEFAULT giveitem_std ITEM_RAZZ_BERRY compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_111_RECEIVED_BERRY special GetPlayerBigGuyGirlString msgbox Route111_Text_2A6F3D, MSGBOX_DEFAULT diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc index 5a89f40ed5..23dca6f0b3 100644 --- a/data/maps/Route111_OldLadysRestStop/scripts.inc +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -19,7 +19,7 @@ Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 msgbox Route111_OldLadysRestStop_Text_22A9EC, MSGBOX_DEFAULT closemessage - call Route111_OldLadysRestStop_EventScript_272083 + call Common_EventScript_OutOfCenterPartyHeal msgbox Route111_OldLadysRestStop_Text_22AA16, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq Route111_OldLadysRestStop_EventScript_22A941 diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index b54fe564e2..2890011b40 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -17,7 +17,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2 msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, MSGBOX_DEFAULT giveitem_std ITEM_MACHO_BRACE compare VAR_RESULT, 0 - goto_if_eq Route111_WinstrateFamilysHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MACHO_BRACE goto Route111_WinstrateFamilysHouse_EventScript_22A52C end diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index 959c277995..b5b082d4d1 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -223,13 +223,13 @@ Route113_GlassWorkshop_EventScript_26F05F:: @ 826F05F return Route113_GlassWorkshop_EventScript_26F072:: @ 826F072 - call Route113_GlassWorkshop_EventScript_27205E + call Common_EventScript_BagIsFull msgbox Route113_GlassWorkshop_Text_26F6B7, MSGBOX_DEFAULT release end Route113_GlassWorkshop_EventScript_26F081:: @ 826F081 - call Route113_GlassWorkshop_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother msgbox Route113_GlassWorkshop_Text_26F715, MSGBOX_DEFAULT release end diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index cccc8de5fa..3c07facf3d 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -35,7 +35,7 @@ Route114_EventScript_1F2582:: @ 81F2582 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route114_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_114_RECEIVED_BERRY msgbox Route114_Text_2A7034, MSGBOX_DEFAULT release @@ -53,7 +53,7 @@ Route114_EventScript_1F25D1:: @ 81F25D1 msgbox Route114_Text_1F2809, MSGBOX_DEFAULT giveitem_std ITEM_TM05 compare VAR_RESULT, 0 - goto_if_eq Route114_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM05 msgbox Route114_Text_1F2872, MSGBOX_DEFAULT release diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index e229c756d1..0d942e4469 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -13,7 +13,7 @@ Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A msgbox Route114_FossilManiacsHouse_Text_22AD85, MSGBOX_DEFAULT giveitem_std ITEM_TM28 compare VAR_RESULT, 0 - goto_if_eq Route114_FossilManiacsHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM28 release end diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index dee76d71d5..15f124bb0e 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -15,8 +15,8 @@ Route119_EventScript_1F4439:: @ 81F4439 return Route119_MapScript1_1F444D: @ 81F444D - call Route119_EventScript_271ED7 - call Route119_EventScript_271EFB + call Common_EventScript_SetupRivalGender + call Common_EventScript_SetupRivalOnBikeGender compare VAR_WEATHER_INSTITUTE_STATE, 1 call_if_eq Route119_EventScript_1F4466 special SetRoute119Weather diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index ae0fea2591..8d57356fdf 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -57,7 +57,7 @@ Route119_WeatherInstitute_1F_EventScript_26FB18:: @ 826FB18 lockall msgbox Route119_WeatherInstitute_1F_Text_26FEFC, MSGBOX_DEFAULT closemessage - call Route119_WeatherInstitute_1F_EventScript_272083 + call Common_EventScript_OutOfCenterPartyHeal releaseall end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index bbee65df8a..6826e5fe04 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -98,7 +98,7 @@ Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 compare VAR_RESULT, 0 goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700EA call Route119_WeatherInstitute_2F_EventScript_27378B - call Route119_WeatherInstitute_2F_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto Route119_WeatherInstitute_2F_EventScript_2700EA end diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index a66026283e..88a950be79 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -147,7 +147,7 @@ Route120_EventScript_1F55F6:: @ 81F55F6 Route120_EventScript_1F5601:: @ 81F5601 giveitem_std VAR_0x8004 compare VAR_RESULT, 0 - goto_if_eq Route120_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_120_RECEIVED_BERRY msgbox Route120_Text_2A71D5, MSGBOX_DEFAULT release diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index 86a6e767ed..132a068e36 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -17,7 +17,7 @@ Route123_EventScript_1F6151:: @ 81F6151 msgbox Route123_Text_1F645D, MSGBOX_DEFAULT giveitem_std ITEM_TM19 compare VAR_RESULT, 0 - goto_if_eq Route123_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM19 msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT release diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index a7175e6981..3500578efa 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -17,7 +17,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT random 10 @@ -25,7 +25,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox Route123_BerryMastersHouse_Text_2A7445, MSGBOX_DEFAULT release end @@ -78,7 +78,7 @@ Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull goto Route123_BerryMastersHouse_EventScript_26FA79 release end @@ -88,7 +88,7 @@ Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_SPELON_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SPELON_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end @@ -98,7 +98,7 @@ Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_PAMTRE_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_PAMTRE_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end @@ -108,7 +108,7 @@ Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_WATMEL_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_WATMEL_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end @@ -118,7 +118,7 @@ Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_DURIN_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_DURIN_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end @@ -128,7 +128,7 @@ Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_BELUE_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_BELUE_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 97aa6f4be0..9968d3a040 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -3,7 +3,7 @@ Route124_MapScripts:: @ 81F656C .byte 0 Route124_MapScript1_1F6572: @ 81F6572 - call_if_set FLAG_SYS_WEATHER_CTRL, Route124_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end Route124_EventScript_1F657C:: @ 81F657C diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index e5ad32697e..c979577d85 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -5,7 +5,7 @@ Route125_MapScripts:: @ 81F6748 .byte 0 Route125_MapScript1_1F6758: @ 81F6758 - call_if_set FLAG_SYS_WEATHER_CTRL, Route125_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 compare VAR_0x4039, 1 call_if_eq Route125_EventScript_273D13 compare VAR_0x4037, 11 diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 4fa47e0bb6..29846af227 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -3,7 +3,7 @@ Route126_MapScripts:: @ 81F68C6 .byte 0 Route126_MapScript1_1F68CC: @ 81F68CC - call_if_set FLAG_SYS_WEATHER_CTRL, Route126_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end Route126_EventScript_1F68D6:: @ 81F68D6 diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 28f20bfb3c..76ade14f3f 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -5,7 +5,7 @@ Route127_MapScripts:: @ 81F69D9 .byte 0 Route127_MapScript1_1F69E9: @ 81F69E9 - call_if_set FLAG_SYS_WEATHER_CTRL, Route127_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 compare VAR_0x4039, 1 call_if_eq Route127_EventScript_273D13 compare VAR_0x4037, 13 diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index bb4f8d1505..5d32a7bdf5 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -4,7 +4,7 @@ Route128_MapScripts:: @ 81F6B38 .byte 0 Route128_MapScript1_1F6B43: @ 81F6B43 - call_if_set FLAG_SYS_WEATHER_CTRL, Route128_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end Route128_MapScript2_1F6B4D: @ 81F6B4D diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index 177dc626aa..c1bd91f0a2 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -23,7 +23,7 @@ Route129_MapScript1_1F72AB: @ 81F72AB end Route129_EventScript_1F72D8:: @ 81F72D8 - call_if_set FLAG_SYS_WEATHER_CTRL, Route129_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 return Route129_MapScript2_1F72E2: @ 81F72E2 diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 8ca9dcbb0d..797cc302c6 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -31,7 +31,7 @@ Route130_EventScript_1F73B1:: @ 81F73B1 end Route130_EventScript_1F73B5:: @ 81F73B5 - call_if_set FLAG_SYS_WEATHER_CTRL, Route130_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 return Route130_EventScript_1F73BF:: @ 81F73BF diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index e709a14ef1..9cbd6eb6d3 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -13,7 +13,7 @@ Route131_EventScript_1F741B:: @ 81F741B return Route131_EventScript_1F741F:: @ 81F741F - call_if_set FLAG_SYS_WEATHER_CTRL, Route131_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 return Route131_EventScript_1F7429:: @ 81F7429 diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index d43f7c33b5..8b8f8fd04b 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -539,7 +539,7 @@ "y": 45, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -547,7 +547,7 @@ "y": 38, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -563,7 +563,7 @@ "y": 45, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -571,7 +571,7 @@ "y": 38, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 8ffbf8373d..e5f034f1de 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -5,7 +5,7 @@ RustboroCity_MapScripts:: @ 81E06BD RustboroCity_MapScript1_1E06C8: @ 81E06C8 setflag FLAG_VISITED_RUSTBORO_CITY - call RustboroCity_EventScript_271ED7 + call Common_EventScript_SetupRivalGender compare VAR_0x405A, 6 call_if_eq RustboroCity_EventScript_1E0707 getplayerxy VAR_TEMP_0, VAR_TEMP_1 diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index cce9ae394b..d9fe5819f6 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -171,7 +171,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E compare VAR_RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AD7 call RustboroCity_DevonCorp_2F_EventScript_27378B - call RustboroCity_DevonCorp_2F_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto RustboroCity_DevonCorp_2F_EventScript_211AD7 end @@ -220,7 +220,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 compare VAR_RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B7A call RustboroCity_DevonCorp_2F_EventScript_27378B - call RustboroCity_DevonCorp_2F_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto RustboroCity_DevonCorp_2F_EventScript_211B7A end diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 9d5fbe58bc..b2f13ea865 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -58,7 +58,7 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E setflag FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT msgbox RustboroCity_DevonCorp_3F_Text_212837, MSGBOX_DEFAULT closemessage - call RustboroCity_DevonCorp_3F_EventScript_272083 + call Common_EventScript_OutOfCenterPartyHeal msgbox RustboroCity_DevonCorp_3F_Text_2129D2, MSGBOX_DEFAULT setflag FLAG_HIDE_ROUTE_116_TUNNELER clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN @@ -163,7 +163,7 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 msgbox RustboroCity_DevonCorp_3F_Text_212A29, MSGBOX_DEFAULT giveitem_std ITEM_EXP_SHARE compare VAR_RESULT, 0 - goto_if_eq RustboroCity_DevonCorp_3F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_EXP_SHARE msgbox RustboroCity_DevonCorp_3F_Text_212A9E, MSGBOX_DEFAULT closemessage diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc index 639e938849..d4b940c9fa 100644 --- a/data/maps/RustboroCity_Flat2_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -12,7 +12,7 @@ RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 msgbox RustboroCity_Flat2_2F_Text_21605A, MSGBOX_DEFAULT giveitem_std ITEM_PREMIER_BALL compare VAR_RESULT, 0 - goto_if_eq RustboroCity_Flat2_2F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO release end diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 4581707ce7..d35f7787c0 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -14,7 +14,7 @@ RustboroCity_Gym_EventScript_212F31:: @ 8212F31 RustboroCity_Gym_EventScript_212F66:: @ 8212F66 message RustboroCity_Gym_Text_2137EC waitmessage - call RustboroCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox RustboroCity_Gym_Text_213816, MSGBOX_DEFAULT setflag FLAG_DEFEATED_RUSTBORO_GYM setflag FLAG_BADGE01_GET @@ -30,7 +30,7 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66 RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4 giveitem_std ITEM_TM39 compare VAR_RESULT, 0 - goto_if_eq RustboroCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM39 msgbox RustboroCity_Gym_Text_2138B1, MSGBOX_DEFAULT release diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index c01e4a4365..2d3c6a8f94 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -85,7 +85,7 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT giveitem_std ITEM_QUICK_CLAW compare VAR_RESULT, 0 - goto_if_eq RustboroCity_PokemonSchool_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull closemessage applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA waitmovement 0 diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index a021f5272d..3b8df90a3c 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -8,7 +8,7 @@ SSTidalRooms_EventScript_23C9F2:: @ 823C9F2 msgbox SSTidalRooms_Text_23D098, MSGBOX_DEFAULT giveitem_std ITEM_TM49 compare VAR_RESULT, 0 - goto_if_eq SSTidalRooms_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM49 msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT release @@ -23,7 +23,7 @@ SSTidalRooms_EventScript_23CA33:: @ 823CA33 lockall msgbox SSTidalRooms_Text_23CAF2, MSGBOX_DEFAULT closemessage - call SSTidalRooms_EventScript_272083 + call Common_EventScript_OutOfCenterPartyHeal call SSTidalRooms_EventScript_23C0A7 releaseall end diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index 2874da9633..fa2aca8e0d 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -39,7 +39,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 takeitem ITEM_SHOAL_SHELL, 4 giveitem_std ITEM_SHELL_BELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, MSGBOX_DEFAULT setflag FLAG_TEMP_2 release diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index c54aa1d4ff..7a7c3e337a 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -64,7 +64,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 41, 20, 859, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SHELL_1 @@ -81,7 +81,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6 goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 41, 10, 859, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SHELL_2 @@ -93,7 +93,7 @@ ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028 goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 6, 9, 859, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SHELL_3 @@ -105,7 +105,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 16, 13, 859, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SHELL_4 @@ -117,7 +117,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_2370BE giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 31, 8, 858, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_1 @@ -134,7 +134,7 @@ ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8 goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_2370BE giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 14, 26, 858, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_2 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index 60a6039be5..d493469fab 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -19,7 +19,7 @@ ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176 goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_2371A8 giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 18, 2, 858, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_4 @@ -38,7 +38,7 @@ ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, MSGBOX_DEFAULT giveitem_std ITEM_FOCUS_BAND compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FOCUS_BAND release end diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index 40275d809f..6e3bb63fe4 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -19,7 +19,7 @@ ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_23714C giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 11, 11, 858, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_3 diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index eb57d12277..f65d0d4ecb 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -16,7 +16,7 @@ SkyPillar_Outside_EventScript_2392CF:: @ 82392CF return SkyPillar_Outside_EventScript_2392D3:: @ 82392D3 - call_if_set FLAG_SYS_WEATHER_CTRL, SkyPillar_Outside_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 return SkyPillar_Outside_MapScript1_2392DD: @ 82392DD diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index ee9f3c379c..1265190969 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -591,7 +591,7 @@ "y": 19, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -599,7 +599,7 @@ "y": 19, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -607,7 +607,7 @@ "y": 26, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -623,7 +623,7 @@ "y": 26, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 8851c5fa8a..bf84162954 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -165,7 +165,7 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 special CallFrontierUtilFunc closemessage delay 2 - call SlateportCity_BattleTentLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq SlateportCity_BattleTentLobby_EventScript_208A14 @@ -249,7 +249,7 @@ SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D msgbox SlateportCity_BattleTentLobby_Text_208B4E, MSGBOX_DEFAULT giveitem_std ITEM_TM41 compare VAR_RESULT, 0 - goto_if_eq SlateportCity_BattleTentLobby_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM41 msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT release diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 24e139edfd..771cc149f2 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -358,7 +358,7 @@ SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B goto_if_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_TOOTH compare VAR_RESULT, 0 - goto_if_eq SlateportCity_Harbor_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT setflag FLAG_EXCHANGED_SCANNER @@ -371,7 +371,7 @@ SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB goto_if_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_SCALE compare VAR_RESULT, 0 - goto_if_eq SlateportCity_Harbor_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT setflag FLAG_EXCHANGED_SCANNER diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc index 2e973663bc..155081a1bd 100644 --- a/data/maps/SlateportCity_House1/scripts.inc +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -57,7 +57,7 @@ SlateportCity_House1_EventScript_209B50:: @ 8209B50 SlateportCity_House1_EventScript_209B5A:: @ 8209B5A msgbox SlateportCity_House1_Text_209CA4, MSGBOX_DEFAULT - call SlateportCity_House1_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 3faf350fc4..c63ef37067 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -218,7 +218,7 @@ SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 msgbox SlateportCity_PokemonFanClub_Text_20AB63, MSGBOX_DEFAULT giveitem_std ITEM_SOOTHE_BELL compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SOOTHE_BELL release end diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index 76ababed86..183c3ce46a 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -358,7 +358,7 @@ "y": 29, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -366,7 +366,7 @@ "y": 31, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -374,7 +374,7 @@ "y": 31, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -382,7 +382,7 @@ "y": 29, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 1cd4611e9e..bdc36c4689 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -110,7 +110,7 @@ SootopolisCity_EventScript_1E5805:: @ 81E5805 compare VAR_0x40CA, 1 goto_if_eq SootopolisCity_EventScript_1E583E compare VAR_0x40CA, 1 - goto_if_le SootopolisCity_EventScript_27207A + goto_if_le Common_EventScript_SetWeather15 return SootopolisCity_EventScript_1E583D:: @ 81E583D @@ -751,7 +751,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY msgbox SootopolisCity_Text_2A7C7C, MSGBOX_DEFAULT random 2 @@ -764,7 +764,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B SootopolisCity_EventScript_1E5F79:: @ 81E5F79 giveitem_std ITEM_FIGY_BERRY compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT release end @@ -772,7 +772,7 @@ SootopolisCity_EventScript_1E5F79:: @ 81E5F79 SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A giveitem_std ITEM_IAPAPA_BERRY compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 22cd864cfc..d5bb3d790e 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -99,7 +99,7 @@ SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 message SootopolisCity_Gym_1F_Text_225598 waitmessage - call SootopolisCity_Gym_1F_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox SootopolisCity_Gym_1F_Text_2255BE, MSGBOX_DEFAULT setflag FLAG_DEFEATED_SOOTOPOLIS_GYM setflag FLAG_BADGE08_GET @@ -125,7 +125,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_Gym_1F_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM03 return @@ -133,7 +133,7 @@ SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_Gym_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM03 release diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc index 9dcc1031d2..13b581c717 100644 --- a/data/maps/SootopolisCity_House1/scripts.inc +++ b/data/maps/SootopolisCity_House1/scripts.inc @@ -8,7 +8,7 @@ SootopolisCity_House1_EventScript_22694D:: @ 822694D msgbox SootopolisCity_House1_Text_2269A1, MSGBOX_DEFAULT giveitem_std ITEM_TM31 compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_House1_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM31 msgbox SootopolisCity_House1_Text_226A13, MSGBOX_DEFAULT release diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc index efa197c8de..0f175478af 100644 --- a/data/maps/SootopolisCity_House6/scripts.inc +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -28,7 +28,7 @@ SootopolisCity_House6_EventScript_226FA3:: @ 8226FA3 SootopolisCity_House6_EventScript_226FAD:: @ 8226FAD bufferdecorationname 1, 117 - msgbox gUnknown_08272B1A, MSGBOX_DEFAULT + msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT msgbox SootopolisCity_House6_Text_22704A, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 5db2042935..0eb4ffaef7 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -102,7 +102,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 compare VAR_RESULT, 0 goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special LoadPlayerParty - call SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special SavePlayerParty diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 846b7f6c3e..57dbbe13d1 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -194,7 +194,7 @@ TrainerHill_Entrance_EventScript_26832E:: @ 826832E setvar VAR_0x8004, 14 special CallTrainerHillFunction setvar VAR_TEMP_5, 1 - call TrainerHill_Entrance_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq TrainerHill_Entrance_EventScript_26835C setvar VAR_0x8004, 14 diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index 3f8f4fe455..7aef487242 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -137,7 +137,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -153,7 +153,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -169,7 +169,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -177,7 +177,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index df56f41ed5..e699e6427d 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -192,7 +192,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 special LoadPlayerParty closemessage delay 2 - call VerdanturfTown_BattleTentLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D @@ -281,7 +281,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, MSGBOX_DEFAULT giveitem_std ITEM_TM45 compare VAR_RESULT, 0 - goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM45 msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT release diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index b73d7e1fac..79747540d1 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -425,7 +425,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F55:: @ 8276F55 end OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60 - call OldaleTown_PokemonCenter_2F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message gText_PleaseWaitForLink @@ -527,7 +527,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2 call OldaleTown_PokemonCenter_2F_EventScript_277199 compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - call OldaleTown_PokemonCenter_2F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message gText_PleaseWaitForLink @@ -602,7 +602,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771CD:: @ 82771CD OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB copyvar VAR_0x8007, VAR_LAST_TALKED - call OldaleTown_PokemonCenter_2F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message gText_PleaseWaitForLink @@ -1023,7 +1023,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F call OldaleTown_PokemonCenter_2F_EventScript_277626 compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - call OldaleTown_PokemonCenter_2F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC msgbox OldaleTown_PokemonCenter_2F_Text_27961C, MSGBOX_DEFAULT @@ -1234,7 +1234,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277923:: @ 8277923 end OldaleTown_PokemonCenter_2F_EventScript_277931:: @ 8277931 - call OldaleTown_PokemonCenter_2F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC switch VAR_0x8004 @@ -1513,7 +1513,7 @@ MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9 waitstate compare VAR_0x8004, 6 goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9 - call MossdeepCity_GameCorner_1F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 setvar VAR_0x8004, 4 @@ -1532,7 +1532,7 @@ MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35 waitstate compare VAR_0x8004, 6 goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9 - call MossdeepCity_GameCorner_1F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 setvar VAR_0x8004, 6 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index f85ebd3d2a..fa09c5e156 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -35,7 +35,7 @@ LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C end LilycoveCity_ContestLobby_EventScript_279D4B:: @ 8279D4B - call LilycoveCity_ContestLobby_EventScript_27205E + call Common_EventScript_BagIsFull msgbox LilycoveCity_ContestLobby_Text_27B6E7, MSGBOX_DEFAULT release end @@ -1215,7 +1215,7 @@ LinkContestRoom1_EventScript_27AC77:: @ 827AC77 LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8 lockall - call LinkContestRoom1_EventScript_27205E + call Common_EventScript_BagIsFull msgbox LinkContestRoom1_Text_27BC2F, MSGBOX_DEFAULT releaseall setvar VAR_0x408A, 4 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index eb29ef6e07..985a2f93ad 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -355,7 +355,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, MSGBOX_DEFAULT giveitem_std ITEM_AMULET_COIN compare VAR_RESULT, 0 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT setflag FLAG_MOM_SAYS_GOODBYE release @@ -373,7 +373,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A94:: @ 8292A94 LittlerootTown_BrendansHouse_1F_EventScript_292A9E:: @ 8292A9E closemessage - call LittlerootTown_BrendansHouse_1F_EventScript_272083 + call Common_EventScript_OutOfCenterPartyHeal incrementgamestat 16 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, MSGBOX_DEFAULT release diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index c2a580a617..7b8b52cd00 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -602,7 +602,7 @@ EventScript_PblocLink_NoBerries: @ 82940B1 end EventScript_PblocLink_TryConnect: @ 82940BB - call LilycoveCity_ContestLobby_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq EventScript_PblocLink_End specialvar VAR_RESULT, IsWirelessAdapterConnected diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index db8aece85b..770bc9a5b5 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -660,7 +660,7 @@ SecretBase_RedCave1_EventScript_275DD6:: @ 8275DD6 goto_if_eq SecretBase_RedCave1_EventScript_275E2F setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_275E2F msgbox SecretBase_RedCave1_Text_274939, MSGBOX_DEFAULT @@ -696,7 +696,7 @@ SecretBase_RedCave1_EventScript_275E4E:: @ 8275E4E goto_if_eq SecretBase_RedCave1_EventScript_275EA7 setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_275EA7 msgbox SecretBase_RedCave1_Text_274CB0, MSGBOX_DEFAULT @@ -732,7 +732,7 @@ SecretBase_RedCave1_EventScript_275EC6:: @ 8275EC6 goto_if_eq SecretBase_RedCave1_EventScript_275F1F setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_275F1F msgbox SecretBase_RedCave1_Text_274FCA, MSGBOX_DEFAULT @@ -768,7 +768,7 @@ SecretBase_RedCave1_EventScript_275F3E:: @ 8275F3E goto_if_eq SecretBase_RedCave1_EventScript_275F97 setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_275F97 msgbox SecretBase_RedCave1_Text_275315, MSGBOX_DEFAULT @@ -804,7 +804,7 @@ SecretBase_RedCave1_EventScript_275FB6:: @ 8275FB6 goto_if_eq SecretBase_RedCave1_EventScript_27600F setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_27600F msgbox SecretBase_RedCave1_Text_275679, MSGBOX_DEFAULT @@ -840,7 +840,7 @@ SecretBase_RedCave1_EventScript_27602E:: @ 827602E goto_if_eq SecretBase_RedCave1_EventScript_276087 setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_276087 msgbox SecretBase_RedCave1_Text_274AFA, MSGBOX_DEFAULT @@ -876,7 +876,7 @@ SecretBase_RedCave1_EventScript_2760A6:: @ 82760A6 goto_if_eq SecretBase_RedCave1_EventScript_2760FF setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_2760FF msgbox SecretBase_RedCave1_Text_274E41, MSGBOX_DEFAULT @@ -912,7 +912,7 @@ SecretBase_RedCave1_EventScript_27611E:: @ 827611E goto_if_eq SecretBase_RedCave1_EventScript_276177 setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_276177 msgbox SecretBase_RedCave1_Text_2751AF, MSGBOX_DEFAULT @@ -948,7 +948,7 @@ SecretBase_RedCave1_EventScript_276196:: @ 8276196 goto_if_eq SecretBase_RedCave1_EventScript_2761EF setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_2761EF msgbox SecretBase_RedCave1_Text_2754B2, MSGBOX_DEFAULT @@ -984,7 +984,7 @@ SecretBase_RedCave1_EventScript_27620E:: @ 827620E goto_if_eq SecretBase_RedCave1_EventScript_276267 setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_276267 msgbox SecretBase_RedCave1_Text_275884, MSGBOX_DEFAULT From 0de831fd290b44b6b7236fb849e2e0318f9ebe3f Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 20:09:14 -0500 Subject: [PATCH 111/217] Name some common single-entry movements --- data/event_scripts.s | 367 ++---------------- data/maps/AquaHideout_B2F/scripts.inc | 12 +- .../scripts.inc | 12 +- .../scripts.inc | 8 +- .../scripts.inc | 2 +- .../scripts.inc | 4 +- .../scripts.inc | 4 +- .../scripts.inc | 4 +- data/maps/BattleFrontier_Lounge3/scripts.inc | 2 +- data/maps/BattleFrontier_Mart/scripts.inc | 2 +- .../BattleFrontier_OutsideWest/scripts.inc | 16 +- .../BattleFrontier_ReceptionGate/scripts.inc | 16 +- .../BattleFrontier_ScottsHouse/scripts.inc | 10 +- data/maps/BirthIsland_Harbor/scripts.inc | 2 +- data/maps/CaveOfOrigin_B1F/scripts.inc | 8 +- data/maps/DewfordTown_Hall/scripts.inc | 12 +- .../EverGrandeCity_ChampionsRoom/scripts.inc | 20 +- .../EverGrandeCity_HallOfFame/scripts.inc | 12 +- .../scripts.inc | 4 +- data/maps/FallarborTown_House2/scripts.inc | 2 +- data/maps/FarawayIsland_Entrance/scripts.inc | 2 +- data/maps/FarawayIsland_Interior/scripts.inc | 4 +- data/maps/FortreeCity_House4/scripts.inc | 6 +- data/maps/JaggedPass/scripts.inc | 12 +- data/maps/LavaridgeTown/scripts.inc | 14 +- data/maps/LilycoveCity/scripts.inc | 10 +- .../maps/LilycoveCity_ContestHall/scripts.inc | 56 +-- .../LilycoveCity_ContestLobby/scripts.inc | 6 +- .../LilycoveCity_CoveLilyMotel_1F/scripts.inc | 18 +- .../scripts.inc | 2 +- .../scripts.inc | 4 +- .../scripts.inc | 4 +- data/maps/LilycoveCity_Harbor/scripts.inc | 26 +- data/maps/LilycoveCity_House3/scripts.inc | 6 +- .../scripts.inc | 4 +- .../scripts.inc | 8 +- .../scripts.inc | 2 +- .../scripts.inc | 6 +- data/maps/LittlerootTown/scripts.inc | 36 +- .../scripts.inc | 14 +- .../scripts.inc | 12 +- .../LittlerootTown_MaysHouse_1F/scripts.inc | 14 +- .../LittlerootTown_MaysHouse_2F/scripts.inc | 14 +- .../scripts.inc | 16 +- data/maps/MagmaHideout_4F/scripts.inc | 6 +- data/maps/MarineCave_End/scripts.inc | 2 +- data/maps/MauvilleCity/scripts.inc | 26 +- data/maps/MauvilleCity_GameCorner/scripts.inc | 2 +- data/maps/MauvilleCity_House2/scripts.inc | 4 +- data/maps/MeteorFalls_1F_1R/scripts.inc | 24 +- data/maps/MeteorFalls_StevensCave/scripts.inc | 8 +- data/maps/MossdeepCity/scripts.inc | 2 +- .../MossdeepCity_SpaceCenter_1F/scripts.inc | 16 +- .../MossdeepCity_SpaceCenter_2F/scripts.inc | 24 +- .../MossdeepCity_StevensHouse/scripts.inc | 6 +- data/maps/MtChimney/scripts.inc | 10 +- data/maps/MtPyre_Summit/scripts.inc | 20 +- data/maps/NavelRock_Harbor/scripts.inc | 2 +- data/maps/NewMauville_Entrance/scripts.inc | 2 +- data/maps/OldaleTown/scripts.inc | 10 +- data/maps/PetalburgCity/scripts.inc | 30 +- data/maps/PetalburgCity_Gym/scripts.inc | 68 ++-- data/maps/PetalburgWoods/scripts.inc | 10 +- data/maps/Route101/scripts.inc | 4 +- data/maps/Route103/scripts.inc | 12 +- data/maps/Route104/scripts.inc | 8 +- data/maps/Route109/scripts.inc | 6 +- data/maps/Route110/scripts.inc | 26 +- data/maps/Route110_TrickHouseEnd/scripts.inc | 14 +- .../Route110_TrickHouseEntrance/scripts.inc | 18 +- .../Route110_TrickHousePuzzle5/scripts.inc | 30 +- data/maps/Route111/scripts.inc | 12 +- .../scripts.inc | 2 +- data/maps/Route112/scripts.inc | 16 +- .../Route114_FossilManiacsTunnel/scripts.inc | 4 +- data/maps/Route116/scripts.inc | 4 +- data/maps/Route118/scripts.inc | 6 +- data/maps/Route119/scripts.inc | 6 +- .../Route119_WeatherInstitute_2F/scripts.inc | 4 +- data/maps/Route120/scripts.inc | 12 +- .../Route121_SafariZoneEntrance/scripts.inc | 2 +- data/maps/Route128/scripts.inc | 14 +- data/maps/RustboroCity/scripts.inc | 148 +++---- .../RustboroCity_DevonCorp_2F/scripts.inc | 8 +- .../RustboroCity_DevonCorp_3F/scripts.inc | 6 +- data/maps/RustboroCity_Flat1_2F/scripts.inc | 2 +- .../RustboroCity_PokemonSchool/scripts.inc | 4 +- data/maps/RusturfTunnel/scripts.inc | 20 +- data/maps/SSTidalCorridor/scripts.inc | 2 +- data/maps/SeafloorCavern_Entrance/scripts.inc | 14 +- data/maps/SeafloorCavern_Room9/scripts.inc | 22 +- data/maps/SkyPillar_Outside/scripts.inc | 8 +- data/maps/SkyPillar_Top/scripts.inc | 2 +- data/maps/SlateportCity/scripts.inc | 56 +-- .../scripts.inc | 2 +- data/maps/SlateportCity_Harbor/scripts.inc | 16 +- .../scripts.inc | 8 +- .../scripts.inc | 12 +- .../SlateportCity_PokemonFanClub/scripts.inc | 4 +- .../scripts.inc | 14 +- data/maps/SootopolisCity/scripts.inc | 44 +-- .../scripts.inc | 2 +- data/maps/SouthernIsland_Exterior/scripts.inc | 2 +- data/maps/TerraCave_End/scripts.inc | 2 +- data/maps/VerdanturfTown/scripts.inc | 4 +- .../scripts.inc | 8 +- data/maps/VictoryRoad_1F/scripts.inc | 2 +- data/scripts/cable_club.inc | 2 +- data/scripts/gabby_and_ty.inc | 4 +- data/scripts/players_house.inc | 46 +-- data/scripts/pokeblocks.inc | 6 +- 111 files changed, 719 insertions(+), 1038 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 76b2866982..415541475a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1280,11 +1280,11 @@ OldaleTown_PokemonCenter_1F_EventScript_27198D:: @ 827198D return OldaleTown_PokemonCenter_1F_EventScript_271993:: @ 8271993 - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_2725A4 + applymovement VAR_0x800B, Common_Movement_WalkInPlaceLeft waitmovement 0 dofieldeffect FLDEFF_POKECENTER_HEAL waitfieldeffect FLDEFF_POKECENTER_HEAL - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_2725AA + applymovement VAR_0x800B, Common_Movement_WalkInPlaceDown waitmovement 0 special HealPlayerParty return @@ -1348,9 +1348,9 @@ OldaleTown_PokemonCenter_1F_EventScript_271A68:: @ 8271A68 setflag FLAG_OLDALE_NURSE_MENTIONS_GOLD_CARD msgbox gUnknown_082727F5, MSGBOX_DEFAULT playse SE_PIN - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_272598 + applymovement VAR_0x800B, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_27259A + applymovement VAR_0x800B, Common_Movement_Delay48 waitmovement 0 msgbox gUnknown_08272860, MSGBOX_YESNO compare VAR_RESULT, 1 @@ -2080,7 +2080,7 @@ RusturfTunnel_EventScript_272216:: @ 8272216 EventScript_27222B:: @ 827222B delay 30 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 showobjectat 255, MAP_PETALBURG_CITY delay 30 @@ -2223,7 +2223,7 @@ Route119_EventScript_272350:: @ 8272350 Route119_EventScript_272365:: @ 8272365 msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 applymovement VAR_LAST_TALKED, Route119_Movement_2723C7 waitmovement 0 @@ -2370,354 +2370,41 @@ SlateportCity_Movement_272596: @ 8272596 emote_question_mark step_end -AquaHideout_B2F_Movement_272598: @ 8272598 -BattleFrontier_BattleTowerBattleRoom_Movement_272598: @ 8272598 -BattleFrontier_ReceptionGate_Movement_272598: @ 8272598 -CaveOfOrigin_B1F_Movement_272598: @ 8272598 -EverGrandeCity_ChampionsRoom_Movement_272598: @ 8272598 -FarawayIsland_Interior_Movement_272598: @ 8272598 -JaggedPass_Movement_272598: @ 8272598 -LavaridgeTown_Movement_272598: @ 8272598 -LilycoveCity_ContestLobby_Movement_272598: @ 8272598 -LilycoveCity_CoveLilyMotel_1F_Movement_272598: @ 8272598 -LilycoveCity_Harbor_Movement_272598: @ 8272598 -LittlerootTown_BrendansHouse_1F_Movement_272598: @ 8272598 -LittlerootTown_BrendansHouse_2F_Movement_272598: @ 8272598 -LittlerootTown_MaysHouse_1F_Movement_272598: @ 8272598 -LittlerootTown_MaysHouse_2F_Movement_272598: @ 8272598 -LittlerootTown_Movement_272598: @ 8272598 -MauvilleCity_House2_Movement_272598: @ 8272598 -MauvilleCity_Movement_272598: @ 8272598 -MeteorFalls_1F_1R_Movement_272598: @ 8272598 -MeteorFalls_StevensCave_Movement_272598: @ 8272598 -MossdeepCity_SpaceCenter_2F_Movement_272598: @ 8272598 -MossdeepCity_StevensHouse_Movement_272598: @ 8272598 -MtChimney_Movement_272598: @ 8272598 -MtPyre_Summit_Movement_272598: @ 8272598 -OldaleTown_PokemonCenter_1F_Movement_272598: @ 8272598 -PetalburgCity_Gym_Movement_272598: @ 8272598 -PetalburgCity_Movement_272598: @ 8272598 -Route103_Movement_272598: @ 8272598 -Route104_Movement_272598: @ 8272598 -Route110_Movement_272598: @ 8272598 -Route110_TrickHouseEnd_Movement_272598: @ 8272598 -Route110_TrickHouseEntrance_Movement_272598: @ 8272598 -Route110_TrickHousePuzzle5_Movement_272598: @ 8272598 -Route119_WeatherInstitute_2F_Movement_272598: @ 8272598 -RustboroCity_DevonCorp_2F_Movement_272598: @ 8272598 -RustboroCity_Movement_272598: @ 8272598 -RusturfTunnel_Movement_272598: @ 8272598 -SeafloorCavern_Entrance_Movement_272598: @ 8272598 -SeafloorCavern_Room9_Movement_272598: @ 8272598 -SlateportCity_Movement_272598: @ 8272598 -SlateportCity_OceanicMuseum_1F_Movement_272598: @ 8272598 -SlateportCity_PokemonFanClub_Movement_272598: @ 8272598 +Common_Movement_ExclamationMark: @ 8272598 emote_exclamation_mark step_end -BattleFrontier_BattleTowerBattleRoom_Movement_27259A: @ 827259A -BattleFrontier_ReceptionGate_Movement_27259A: @ 827259A -CaveOfOrigin_B1F_Movement_27259A: @ 827259A -EverGrandeCity_ChampionsRoom_Movement_27259A: @ 827259A -FarawayIsland_Interior_Movement_27259A: @ 827259A -JaggedPass_Movement_27259A: @ 827259A -LavaridgeTown_Movement_27259A: @ 827259A -LilycoveCity_CoveLilyMotel_1F_Movement_27259A: @ 827259A -LilycoveCity_Harbor_Movement_27259A: @ 827259A -LittlerootTown_BrendansHouse_1F_Movement_27259A: @ 827259A -LittlerootTown_BrendansHouse_2F_Movement_27259A: @ 827259A -LittlerootTown_MaysHouse_1F_Movement_27259A: @ 827259A -LittlerootTown_MaysHouse_2F_Movement_27259A: @ 827259A -MauvilleCity_House2_Movement_27259A: @ 827259A -MauvilleCity_Movement_27259A: @ 827259A -MeteorFalls_1F_1R_Movement_27259A: @ 827259A -MeteorFalls_StevensCave_Movement_27259A: @ 827259A -MossdeepCity_SpaceCenter_2F_Movement_27259A: @ 827259A -MossdeepCity_StevensHouse_Movement_27259A: @ 827259A -MtChimney_Movement_27259A: @ 827259A -MtPyre_Summit_Movement_27259A: @ 827259A -OldaleTown_PokemonCenter_1F_Movement_27259A: @ 827259A -PetalburgCity_Gym_Movement_27259A: @ 827259A -PetalburgCity_Movement_27259A: @ 827259A -Route103_Movement_27259A: @ 827259A -Route104_Movement_27259A: @ 827259A -Route110_Movement_27259A: @ 827259A -Route110_TrickHouseEntrance_Movement_27259A: @ 827259A -Route110_TrickHousePuzzle5_Movement_27259A: @ 827259A -Route119_WeatherInstitute_2F_Movement_27259A: @ 827259A -RustboroCity_DevonCorp_2F_Movement_27259A: @ 827259A -RustboroCity_Movement_27259A: @ 827259A -RusturfTunnel_Movement_27259A: @ 827259A -SeafloorCavern_Entrance_Movement_27259A: @ 827259A -SeafloorCavern_Room9_Movement_27259A: @ 827259A -SlateportCity_Movement_27259A: @ 827259A -SlateportCity_OceanicMuseum_1F_Movement_27259A: @ 827259A -SlateportCity_PokemonFanClub_Movement_27259A: @ 827259A +Common_Movement_Delay48: @ 827259A delay_16 delay_16 delay_16 step_end -AquaHideout_B2F_Movement_27259E: @ 827259E -BattleFrontier_BattlePyramidLobby_Movement_27259E: @ 827259E -BattleFrontier_ScottsHouse_Movement_27259E: @ 827259E -CaveOfOrigin_B1F_Movement_27259E: @ 827259E -EverGrandeCity_PokemonLeague_1F_Movement_27259E: @ 827259E -FallarborTown_House2_Movement_27259E: @ 827259E -FortreeCity_House4_Movement_27259E: @ 827259E -JaggedPass_Movement_27259E: @ 827259E -LilycoveCity_ContestHall_Movement_27259E: @ 827259E -LilycoveCity_CoveLilyMotel_1F_Movement_27259E: @ 827259E -LilycoveCity_DepartmentStore_1F_Movement_27259E: @ 827259E -LilycoveCity_DepartmentStore_5F_Movement_27259E: @ 827259E -LilycoveCity_Harbor_Movement_27259E: @ 827259E -LilycoveCity_LilycoveMuseum_1F_Movement_27259E: @ 827259E -LilycoveCity_LilycoveMuseum_2F_Movement_27259E: @ 827259E -LilycoveCity_MoveDeletersHouse_Movement_27259E: @ 827259E -LilycoveCity_Movement_27259E: @ 827259E -LittlerootTown_BrendansHouse_1F_Movement_27259E: @ 827259E -LittlerootTown_BrendansHouse_2F_Movement_27259E: @ 827259E -MagmaHideout_4F_Movement_27259E: @ 827259E -MauvilleCity_Movement_27259E: @ 827259E -MeteorFalls_StevensCave_Movement_27259E: @ 827259E -MossdeepCity_SpaceCenter_2F_Movement_27259E: @ 827259E -MtChimney_Movement_27259E: @ 827259E -OldaleTown_Movement_27259E: @ 827259E -PetalburgCity_Gym_Movement_27259E: @ 827259E -PetalburgCity_Movement_27259E: @ 827259E -Route103_Movement_27259E: @ 827259E -Route104_Movement_27259E: @ 827259E -Route110_TrickHouseEnd_Movement_27259E: @ 827259E -Route110_TrickHouseEntrance_Movement_27259E: @ 827259E -Route110_TrickHousePuzzle5_Movement_27259E: @ 827259E -Route111_Movement_27259E: @ 827259E -Route119_Movement_27259E: @ 827259E -RustboroCity_Flat1_2F_Movement_27259E: @ 827259E -RustboroCity_Movement_27259E: @ 827259E -RusturfTunnel_Movement_27259E: @ 827259E -SeafloorCavern_Room9_Movement_27259E: @ 827259E -SlateportCity_Movement_27259E: @ 827259E -SlateportCity_SternsShipyard_1F_Movement_27259E: @ 827259E -SootopolisCity_Movement_27259E: @ 827259E +Common_Movement_FacePlayer: @ 827259E face_player step_end -BattleFrontier_OutsideWest_Movement_2725A0: @ 82725A0 +Common_Movement_FaceAwayPlayer: @ 82725A0 face_away_player step_end -BattleFrontier_Lounge3_Movement_2725A2: @ 82725A2 -BattleFrontier_OutsideWest_Movement_2725A2: @ 82725A2 -EverGrandeCity_PokemonLeague_1F_Movement_2725A2: @ 82725A2 -JaggedPass_Movement_2725A2: @ 82725A2 -LilycoveCity_ContestHall_Movement_2725A2: @ 82725A2 -LilycoveCity_ContestLobby_Movement_2725A2: @ 82725A2 -LilycoveCity_CoveLilyMotel_1F_Movement_2725A2: @ 82725A2 -LilycoveCity_House3_Movement_2725A2: @ 82725A2 -LilycoveCity_LilycoveMuseum_1F_Movement_2725A2: @ 82725A2 -LilycoveCity_Movement_2725A2: @ 82725A2 -LittlerootTown_Movement_2725A2: @ 82725A2 -MauvilleCity_GameCorner_Movement_2725A2: @ 82725A2 -MauvilleCity_Movement_2725A2: @ 82725A2 -MossdeepCity_Movement_2725A2: @ 82725A2 -MossdeepCity_SpaceCenter_1F_Movement_2725A2: @ 82725A2 -MossdeepCity_SpaceCenter_2F_Movement_2725A2: @ 82725A2 -MtChimney_Movement_2725A2: @ 82725A2 -OldaleTown_Movement_2725A2: @ 82725A2 -PetalburgCity_Movement_2725A2: @ 82725A2 -Route109_Movement_2725A2: @ 82725A2 -Route110_Movement_2725A2: @ 82725A2 -Route111_Movement_2725A2: @ 82725A2 -Route111_WinstrateFamilysHouse_Movement_2725A2: @ 82725A2 -Route112_Movement_2725A2: @ 82725A2 -Route119_Movement_2725A2: @ 82725A2 -RustboroCity_DevonCorp_3F_Movement_2725A2: @ 82725A2 -RustboroCity_Movement_2725A2: @ 82725A2 -RusturfTunnel_Movement_2725A2: @ 82725A2 -SlateportCity_Harbor_Movement_2725A2: @ 82725A2 -SlateportCity_Movement_2725A2: @ 82725A2 -SlateportCity_OceanicMuseum_2F_Movement_2725A2: @ 82725A2 -SlateportCity_SternsShipyard_1F_Movement_2725A2: @ 82725A2 -SootopolisCity_Movement_2725A2: @ 82725A2 -VerdanturfTown_Movement_2725A2: @ 82725A2 +Common_Movement_FaceOriginalDirection: @ 82725A2 face_original_direction step_end -AquaHideout_B2F_Movement_2725A4: @ 82725A4 -BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4: @ 82725A4 -BattleFrontier_OutsideWest_Movement_2725A4: @ 82725A4 -BattleFrontier_ScottsHouse_Movement_2725A4: @ 82725A4 -DewfordTown_Hall_Movement_2725A4: @ 82725A4 -EverGrandeCity_ChampionsRoom_Movement_2725A4: @ 82725A4 -EverGrandeCity_HallOfFame_Movement_2725A4: @ 82725A4 -LavaridgeTown_Movement_2725A4: @ 82725A4 -LilycoveCity_Harbor_Movement_2725A4: @ 82725A4 -LilycoveCity_PokemonTrainerFanClub_Movement_2725A4: @ 82725A4 -LittlerootTown_BrendansHouse_1F_Movement_2725A4: @ 82725A4 -LittlerootTown_BrendansHouse_2F_Movement_2725A4: @ 82725A4 -LittlerootTown_MaysHouse_1F_Movement_2725A4: @ 82725A4 -LittlerootTown_MaysHouse_2F_Movement_2725A4: @ 82725A4 -LittlerootTown_Movement_2725A4: @ 82725A4 -LittlerootTown_ProfessorBirchsLab_Movement_2725A4: @ 82725A4 -MeteorFalls_1F_1R_Movement_2725A4: @ 82725A4 -MossdeepCity_SpaceCenter_2F_Movement_2725A4: @ 82725A4 -MossdeepCity_StevensHouse_Movement_2725A4: @ 82725A4 -MtChimney_Movement_2725A4: @ 82725A4 -MtPyre_Summit_Movement_2725A4: @ 82725A4 -OldaleTown_PokemonCenter_1F_Movement_2725A4: @ 82725A4 -PetalburgCity_Gym_Movement_2725A4: @ 82725A4 -PetalburgCity_Movement_2725A4: @ 82725A4 -PetalburgWoods_Movement_2725A4: @ 82725A4 -Route101_Movement_2725A4: @ 82725A4 -Route110_Movement_2725A4: @ 82725A4 -Route110_TrickHouseEnd_Movement_2725A4: @ 82725A4 -Route111_Movement_2725A4: @ 82725A4 -Route112_Movement_2725A4: @ 82725A4 -Route116_Movement_2725A4: @ 82725A4 -Route120_Movement_2725A4: @ 82725A4 -Route128_Movement_2725A4: @ 82725A4 -RustboroCity_Movement_2725A4: @ 82725A4 -SeafloorCavern_Entrance_Movement_2725A4: @ 82725A4 -SeafloorCavern_Room9_Movement_2725A4: @ 82725A4 -SkyPillar_Outside_Movement_2725A4: @ 82725A4 -SlateportCity_Movement_2725A4: @ 82725A4 -SlateportCity_OceanicMuseum_1F_Movement_2725A4: @ 82725A4 -SlateportCity_OceanicMuseum_2F_Movement_2725A4: @ 82725A4 -SootopolisCity_Movement_2725A4: @ 82725A4 +Common_Movement_WalkInPlaceLeft: @ 82725A4 walk_in_place_fastest_left step_end -BattleFrontier_BattleTowerCorridor2_Movement_2725A6: @ 82725A6 -BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6: @ 82725A6 -BattleFrontier_OutsideWest_Movement_2725A6: @ 82725A6 -BattleFrontier_ReceptionGate_Movement_2725A6: @ 82725A6 -BattleFrontier_ScottsHouse_Movement_2725A6: @ 82725A6 -CaveOfOrigin_B1F_Movement_2725A6: @ 82725A6 -DewfordTown_Hall_Movement_2725A6: @ 82725A6 -EverGrandeCity_ChampionsRoom_Movement_2725A6: @ 82725A6 -EverGrandeCity_HallOfFame_Movement_2725A6: @ 82725A6 -LavaridgeTown_Movement_2725A6: @ 82725A6 -LilycoveCity_DepartmentStore_5F_Movement_2725A6: @ 82725A6 -LilycoveCity_Harbor_Movement_2725A6: @ 82725A6 -LittlerootTown_BrendansHouse_1F_Movement_2725A6: @ 82725A6 -LittlerootTown_BrendansHouse_2F_Movement_2725A6: @ 82725A6 -LittlerootTown_MaysHouse_2F_Movement_2725A6: @ 82725A6 -LittlerootTown_Movement_2725A6: @ 82725A6 -LittlerootTown_ProfessorBirchsLab_Movement_2725A6: @ 82725A6 -MagmaHideout_4F_Movement_2725A6: @ 82725A6 -MeteorFalls_1F_1R_Movement_2725A6: @ 82725A6 -MossdeepCity_SpaceCenter_2F_Movement_2725A6: @ 82725A6 -MtPyre_Summit_Movement_2725A6: @ 82725A6 -NewMauville_Entrance_Movement_2725A6: @ 82725A6 -OldaleTown_PokemonCenter_2F_Movement_2725A6: @ 82725A6 -PetalburgCity_Gym_Movement_2725A6: @ 82725A6 -PetalburgCity_Movement_2725A6: @ 82725A6 -PetalburgWoods_Movement_2725A6: @ 82725A6 -Route104_Movement_2725A6: @ 82725A6 -Route110_TrickHouseEnd_Movement_2725A6: @ 82725A6 -Route110_TrickHouseEntrance_Movement_2725A6: @ 82725A6 -Route111_Movement_2725A6: @ 82725A6 -Route114_FossilManiacsTunnel_Movement_2725A6: @ 82725A6 -Route120_Movement_2725A6: @ 82725A6 -Route121_SafariZoneEntrance_Movement_2725A6: @ 82725A6 -Route128_Movement_2725A6: @ 82725A6 -RustboroCity_Movement_2725A6: @ 82725A6 -RusturfTunnel_Movement_2725A6: @ 82725A6 -SeafloorCavern_Entrance_Movement_2725A6: @ 82725A6 -SeafloorCavern_Room9_Movement_2725A6: @ 82725A6 -SlateportCity_BattleTentCorridor_Movement_2725A6: @ 82725A6 -SlateportCity_Harbor_Movement_2725A6: @ 82725A6 -SlateportCity_Movement_2725A6: @ 82725A6 -SlateportCity_OceanicMuseum_2F_Movement_2725A6: @ 82725A6 -SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6: @ 82725A6 -VerdanturfTown_BattleTentBattleRoom_Movement_2725A6: @ 82725A6 +Common_Movement_WalkInPlaceUp: @ 82725A6 walk_in_place_fastest_up step_end -BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8: @ 82725A8 -BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8: @ 82725A8 -BattleFrontier_OutsideWest_Movement_2725A8: @ 82725A8 -BattleFrontier_ScottsHouse_Movement_2725A8: @ 82725A8 -DewfordTown_Hall_Movement_2725A8: @ 82725A8 -EverGrandeCity_ChampionsRoom_Movement_2725A8: @ 82725A8 -EverGrandeCity_HallOfFame_Movement_2725A8: @ 82725A8 -LavaridgeTown_Movement_2725A8: @ 82725A8 -LilycoveCity_DepartmentStore_1F_Movement_2725A8: @ 82725A8 -LilycoveCity_PokemonTrainerFanClub_Movement_2725A8: @ 82725A8 -LittlerootTown_BrendansHouse_1F_Movement_2725A8: @ 82725A8 -LittlerootTown_BrendansHouse_2F_Movement_2725A8: @ 82725A8 -LittlerootTown_MaysHouse_1F_Movement_2725A8: @ 82725A8 -LittlerootTown_Movement_2725A8: @ 82725A8 -LittlerootTown_ProfessorBirchsLab_Movement_2725A8: @ 82725A8 -MagmaHideout_4F_Movement_2725A8: @ 82725A8 -MauvilleCity_Movement_2725A8: @ 82725A8 -MossdeepCity_SpaceCenter_1F_Movement_2725A8: @ 82725A8 -MossdeepCity_SpaceCenter_2F_Movement_2725A8: @ 82725A8 -MtPyre_Summit_Movement_2725A8: @ 82725A8 -OldaleTown_Movement_2725A8: @ 82725A8 -PetalburgCity_Gym_Movement_2725A8: @ 82725A8 -PetalburgCity_Movement_2725A8: @ 82725A8 -Route101_Movement_2725A8: @ 82725A8 -Route110_Movement_2725A8: @ 82725A8 -Route110_TrickHouseEnd_Movement_2725A8: @ 82725A8 -Route112_Movement_2725A8: @ 82725A8 -Route116_Movement_2725A8: @ 82725A8 -Route120_Movement_2725A8: @ 82725A8 -Route128_Movement_2725A8: @ 82725A8 -RustboroCity_Movement_2725A8: @ 82725A8 -SSTidalCorridor_Movement_2725A8: @ 82725A8 -SeafloorCavern_Entrance_Movement_2725A8: @ 82725A8 -SkyPillar_Outside_Movement_2725A8: @ 82725A8 -SlateportCity_Harbor_Movement_2725A8: @ 82725A8 -SlateportCity_Movement_2725A8: @ 82725A8 -SlateportCity_OceanicMuseum_1F_Movement_2725A8: @ 82725A8 -SlateportCity_OceanicMuseum_2F_Movement_2725A8: @ 82725A8 -SootopolisCity_Movement_2725A8: @ 82725A8 -VerdanturfTown_BattleTentBattleRoom_Movement_2725A8: @ 82725A8 +Common_Movement_WalkInPlaceRight: @ 82725A8 walk_in_place_fastest_right step_end -BattleFrontier_OutsideWest_Movement_2725AA: @ 82725AA -BattleFrontier_ScottsHouse_Movement_2725AA: @ 82725AA -BirthIsland_Harbor_Movement_2725AA: @ 82725AA -DewfordTown_Hall_Movement_2725AA: @ 82725AA -EverGrandeCity_ChampionsRoom_Movement_2725AA: @ 82725AA -FarawayIsland_Entrance_Movement_2725AA: @ 82725AA -LilycoveCity_CoveLilyMotel_1F_Movement_2725AA: @ 82725AA -LilycoveCity_DepartmentStoreElevator_Movement_2725AA: @ 82725AA -LilycoveCity_Harbor_Movement_2725AA: @ 82725AA -LilycoveCity_Movement_2725AA: @ 82725AA -LilycoveCity_PokemonTrainerFanClub_Movement_2725AA: @ 82725AA -LittlerootTown_BrendansHouse_1F_Movement_2725AA: @ 82725AA -LittlerootTown_MaysHouse_1F_Movement_2725AA: @ 82725AA -LittlerootTown_Movement_2725AA: @ 82725AA -MauvilleCity_Movement_2725AA: @ 82725AA -MeteorFalls_1F_1R_Movement_2725AA: @ 82725AA -MossdeepCity_SpaceCenter_2F_Movement_2725AA: @ 82725AA -MtPyre_Summit_Movement_2725AA: @ 82725AA -NavelRock_Harbor_Movement_2725AA: @ 82725AA -OldaleTown_PokemonCenter_1F_Movement_2725AA: @ 82725AA -PetalburgCity_Gym_Movement_2725AA: @ 82725AA -PetalburgCity_Movement_2725AA: @ 82725AA -PetalburgWoods_Movement_2725AA: @ 82725AA -Route110_Movement_2725AA: @ 82725AA -Route110_TrickHouseEnd_Movement_2725AA: @ 82725AA -Route114_FossilManiacsTunnel_Movement_2725AA: @ 82725AA -Route119_Movement_2725AA: @ 82725AA -Route120_Movement_2725AA: @ 82725AA -Route128_Movement_2725AA: @ 82725AA -RustboroCity_Movement_2725AA: @ 82725AA -RustboroCity_PokemonSchool_Movement_2725AA: @ 82725AA -RusturfTunnel_Movement_2725AA: @ 82725AA -SeafloorCavern_Entrance_Movement_2725AA: @ 82725AA -SeafloorCavern_Room9_Movement_2725AA: @ 82725AA -SkyPillar_Outside_Movement_2725AA: @ 82725AA -SlateportCity_Harbor_Movement_2725AA: @ 82725AA -SlateportCity_Movement_2725AA: @ 82725AA -SlateportCity_OceanicMuseum_2F_Movement_2725AA: @ 82725AA -SouthernIsland_Exterior_Movement_2725AA: @ 82725AA -VerdanturfTown_BattleTentBattleRoom_Movement_2725AA: @ 82725AA -VictoryRoad_1F_Movement_2725AA: @ 82725AA +Common_Movement_WalkInPlaceDown: @ 82725AA walk_in_place_fastest_down step_end @@ -2729,17 +2416,11 @@ RustboroCity_Movement_2725AE: @ 82725AE face_left step_end -BattleFrontier_Mart_Movement_2725B0: @ 82725B0 -MeteorFalls_1F_1R_Movement_2725B0: @ 82725B0 +Common_Movement_FaceDown: @ 82725B0 face_down step_end -MarineCave_End_Movement_2725B2: @ 82725B2 -MtPyre_Summit_Movement_2725B2: @ 82725B2 -Route118_Movement_2725B2: @ 82725B2 -SkyPillar_Top_Movement_2725B2: @ 82725B2 -SlateportCity_Movement_2725B2: @ 82725B2 -TerraCave_End_Movement_2725B2: @ 82725B2 +Common_Movement_FaceUp: @ 82725B2 face_up step_end @@ -3298,12 +2979,12 @@ EventScript_Questionnaire:: @ 827381B EventScript_27386D:: @ 827386D goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, EventScript_2738FF - applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0 + applymovement VAR_0x8008, Common_Movement_FaceDown waitmovement 0 playse SE_PIN - applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_272598 + applymovement VAR_0x8008, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_27259A + applymovement VAR_0x8008, Common_Movement_Delay48 waitmovement 0 msgbox gUnknown_08273506, MSGBOX_DEFAULT setflag FLAG_SYS_MYSTERY_EVENT_ENABLE @@ -3314,12 +2995,12 @@ EventScript_27386D:: @ 827386D EventScript_2738B5:: @ 82738B5 goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, EventScript_2738FF - applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0 + applymovement VAR_0x8008, Common_Movement_FaceDown waitmovement 0 playse SE_PIN - applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_272598 + applymovement VAR_0x8008, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_27259A + applymovement VAR_0x8008, Common_Movement_Delay48 waitmovement 0 msgbox gUnknown_08273446, MSGBOX_DEFAULT setflag FLAG_SYS_MYSTERY_GIFT_ENABLE @@ -3332,7 +3013,7 @@ EventScript_2738FD:: @ 82738FD end EventScript_2738FF:: @ 82738FF - applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0 + applymovement VAR_0x8008, Common_Movement_FaceDown waitmovement 0 msgbox gUnknown_082733D8, MSGBOX_DEFAULT releaseall diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index ba20cb681a..daa508d321 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -14,9 +14,9 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5 lockall setvar VAR_0x8008, 1 playse SE_PIN - applymovement VAR_0x8008, AquaHideout_B2F_Movement_272598 + applymovement VAR_0x8008, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E + applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 setvar VAR_TEMP_1, 1 releaseall @@ -31,19 +31,19 @@ AquaHideout_B2F_EventScript_233E09:: @ 8233E09 AquaHideout_B2F_EventScript_233E25:: @ 8233E25 setvar VAR_0x8008, 1 setvar VAR_0x8009, 4 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4 + applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E + applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 msgbox AquaHideout_B2F_Text_233FA6, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4 + applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80 waitmovement 0 removeobject VAR_0x8009 delay 20 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E + applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT setflag FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 8c22a9bc97..5ed2e97daa 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -304,12 +304,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA end BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4 - applymovement 1, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 - applymovement 3, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 - applymovement 4, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 - applymovement 5, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 - applymovement 6, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 - applymovement 7, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 3, Common_Movement_WalkInPlaceRight + applymovement 4, Common_Movement_WalkInPlaceRight + applymovement 5, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceLeft + applymovement 7, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 529bcd0c33..be11039dfd 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -280,8 +280,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 waitmovement 0 - applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 - applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 3, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 @@ -323,8 +323,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 waitmovement 0 - applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 - applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 3, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index bafe61ae66..14e1a5557d 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -260,7 +260,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE lockall - applymovement 2, BattleFrontier_BattlePyramidLobby_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidLobby_EventScript_250AF0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index b89d2e061d..cf646a3d39 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -233,9 +233,9 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2725B6 waitmovement 0 playse SE_PIN - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A6 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_2421AB diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc index 73b14fc2e5..545ea04b2b 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -68,8 +68,8 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5 waitmovement 0 delay 40 - applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_2725A6 - applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp + applymovement 2, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor 7, 1 waitdooranim diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 7dbfbbc138..ce0c9b3a48 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -64,7 +64,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77 waitmovement 0 moveobjectoffscreen 1 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT special HealPlayerParty @@ -104,7 +104,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, MSGBOX_DEFAULT closemessage - applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor 10, 1 waitdooranim diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc index 6a817d50af..7977e75b4b 100644 --- a/data/maps/BattleFrontier_Lounge3/scripts.inc +++ b/data/maps/BattleFrontier_Lounge3/scripts.inc @@ -198,7 +198,7 @@ BattleFrontier_Lounge3_EventScript_261FE1:: @ 8261FE1 BattleFrontier_Lounge3_EventScript_261FF1:: @ 8261FF1 closemessage - applymovement VAR_LAST_TALKED, BattleFrontier_Lounge3_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc index 725fce8632..d84b2cb0ad 100644 --- a/data/maps/BattleFrontier_Mart/scripts.inc +++ b/data/maps/BattleFrontier_Mart/scripts.inc @@ -36,7 +36,7 @@ BattleFrontier_Mart_EventScript_267B02:: @ 8267B02 BattleFrontier_Mart_EventScript_267B0B:: @ 8267B0B lock - applymovement 2, BattleFrontier_Mart_Movement_2725B0 + applymovement 2, Common_Movement_FaceDown waitmovement 0 msgbox BattleFrontier_Mart_Text_267B8F, MSGBOX_DEFAULT release diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index da57242597..b2b2a8d415 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -63,7 +63,7 @@ BattleFrontier_OutsideWest_EventScript_23D4AE:: @ 823D4AE BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA closemessage - applymovement VAR_LAST_TALKED, BattleFrontier_OutsideWest_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST @@ -105,7 +105,7 @@ BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518 faceplayer message BattleFrontier_OutsideWest_Text_23DA60 waitmessage - applymovement 18, BattleFrontier_OutsideWest_Movement_2725A0 + applymovement 18, Common_Movement_FaceAwayPlayer waitmovement 0 waitbuttonpress release @@ -126,16 +126,16 @@ BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D end BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544 - applymovement 9, BattleFrontier_OutsideWest_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox BattleFrontier_OutsideWest_Text_23DB7D, MSGBOX_DEFAULT - applymovement 10, BattleFrontier_OutsideWest_Movement_2725A4 + applymovement 10, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox BattleFrontier_OutsideWest_Text_23DBCE, MSGBOX_DEFAULT closemessage delay 25 - applymovement 9, BattleFrontier_OutsideWest_Movement_2725A6 - applymovement 10, BattleFrontier_OutsideWest_Movement_2725A6 + applymovement 9, Common_Movement_WalkInPlaceUp + applymovement 10, Common_Movement_WalkInPlaceUp waitmovement 0 release end @@ -157,7 +157,7 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F end BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA - applymovement 14, BattleFrontier_OutsideWest_Movement_2725A6 + applymovement 14, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -298,7 +298,7 @@ BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7 faceplayer msgbox BattleFrontier_OutsideWest_Text_23E410, MSGBOX_DEFAULT closemessage - applymovement 23, BattleFrontier_OutsideWest_Movement_2725A2 + applymovement 23, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index 5ed97bd60f..89f0ee8e9c 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -15,9 +15,9 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 lockall setvar VAR_0x40D0, 1 playse SE_PIN - applymovement 1, BattleFrontier_ReceptionGate_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, BattleFrontier_ReceptionGate_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_266580, MSGBOX_DEFAULT closemessage @@ -38,14 +38,14 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT msgbox BattleFrontier_ReceptionGate_Text_266703, MSGBOX_DEFAULT closemessage - applymovement 1, BattleFrontier_ReceptionGate_Movement_2725A6 - applymovement 2, BattleFrontier_ReceptionGate_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 2, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 1, BattleFrontier_ReceptionGate_Movement_272598 - applymovement 2, BattleFrontier_ReceptionGate_Movement_272598 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark + applymovement 2, Common_Movement_ExclamationMark + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_266733, MSGBOX_DEFAULT closemessage diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index 6f8d6ee4b6..9278252e6d 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -181,7 +181,7 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 compare VAR_FACING, 3 call_if_eq BattleFrontier_ScottsHouse_EventScript_263A34 msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT - applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT compare VAR_0x40D1, 13 @@ -227,22 +227,22 @@ BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8 end BattleFrontier_ScottsHouse_EventScript_263A13:: @ 8263A13 - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A1E:: @ 8263A1E - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A29:: @ 8263A29 - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A34:: @ 8263A34 - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index 1a5ef87ecb..5f850ed7be 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -9,7 +9,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D goto_if_eq BirthIsland_Harbor_EventScript_2680A2 msgbox BirthIsland_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index 371ea1ba53..c36b60111f 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -6,16 +6,16 @@ CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9 faceplayer msgbox CaveOfOrigin_B1F_Text_23586E, MSGBOX_DEFAULT closemessage - applymovement 1, CaveOfOrigin_B1F_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 delay 60 playse SE_PIN - applymovement 1, CaveOfOrigin_B1F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, CaveOfOrigin_B1F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 30 - applymovement 1, CaveOfOrigin_B1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 message CaveOfOrigin_B1F_Text_235ACE waitmessage diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index a89b7f0247..22bf5ed6ab 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -53,7 +53,7 @@ DewfordTown_Hall_EventScript_1FD547:: @ 81FD547 call DewfordTown_Hall_EventScript_271E8B msgbox DewfordTown_Hall_Text_1FDA5C, MSGBOX_DEFAULT closemessage - applymovement 4, DewfordTown_Hall_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 release end @@ -64,7 +64,7 @@ DewfordTown_Hall_EventScript_1FD563:: @ 81FD563 call DewfordTown_Hall_EventScript_271E8B msgbox DewfordTown_Hall_Text_1FDA99, MSGBOX_DEFAULT closemessage - applymovement 5, DewfordTown_Hall_Movement_2725A6 + applymovement 5, Common_Movement_WalkInPlaceUp waitmovement 0 release end @@ -200,7 +200,7 @@ DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B compare VAR_FACING, 4 goto_if_eq DewfordTown_Hall_EventScript_1FD739 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -224,19 +224,19 @@ DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 return DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 compare VAR_FACING, 3 goto_if_eq DewfordTown_Hall_EventScript_1FD739 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index f1db8df846..31a9b91b84 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -78,9 +78,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6 msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, MSGBOX_DEFAULT delay 40 playse SE_PIN - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_228C12 msgbox EverGrandeCity_ChampionsRoom_Text_22910B, MSGBOX_DEFAULT @@ -91,9 +91,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB msgbox EverGrandeCity_ChampionsRoom_Text_229152, MSGBOX_DEFAULT delay 40 playse SE_PIN - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_228C12 msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, MSGBOX_DEFAULT @@ -105,26 +105,26 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 addobject 3 applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT call EverGrandeCity_ChampionsRoom_EventScript_272184 msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 delay 20 - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_229399, MSGBOX_DEFAULT closemessage delay 30 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C1D - applymovement 3, EverGrandeCity_ChampionsRoom_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38 waitmovement 0 delay 20 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT checkplayergender @@ -153,7 +153,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4 EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C26 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index ddb9ade89d..04134d30f0 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -20,8 +20,8 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 applymovement 1, EverGrandeCity_HallOfFame_Movement_229901 applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229901 waitmovement 0 - applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT closemessage @@ -29,13 +29,13 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229908 waitmovement 0 delay 20 - applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT closemessage - applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 20 dofieldeffect 62 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index ce4be66f86..4794fb99e4 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -90,11 +90,11 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2296AE:: @ 82296AE end EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB - applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index 962c4f64e3..2f2ec1b3fb 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -3,7 +3,7 @@ FallarborTown_House2_MapScripts:: @ 8201382 FallarborTown_House2_EventScript_201383:: @ 8201383 lockall - applymovement 1, FallarborTown_House2_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_2013A8 msgbox FallarborTown_House2_Text_20145C, MSGBOX_DEFAULT diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index 37c16885f8..7c68dd2466 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -24,7 +24,7 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 goto_if_eq FarawayIsland_Entrance_EventScript_267CE7 msgbox FarawayIsland_Entrance_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index a1038edac3..b541ac081f 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -56,9 +56,9 @@ FarawayIsland_Interior_MapScript2_267D98: @ 8267D98 FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2 lockall playse SE_PIN - applymovement 1, FarawayIsland_Interior_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, FarawayIsland_Interior_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 applymovement 1, FarawayIsland_Interior_Movement_267DCE waitmovement 0 diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index 43db341d99..5dc9d769ac 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -21,14 +21,14 @@ FortreeCity_House4_EventScript_217C8A:: @ 8217C8A end FortreeCity_House4_EventScript_217CC4:: @ 8217CC4 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox FortreeCity_House4_Text_217DD2, MSGBOX_DEFAULT releaseall end FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox FortreeCity_House4_Text_217E05, MSGBOX_DEFAULT giveitem_std ITEM_MENTAL_HERB @@ -39,7 +39,7 @@ FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 end FortreeCity_House4_EventScript_217D06:: @ 8217D06 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox FortreeCity_House4_Text_217EA8, MSGBOX_DEFAULT releaseall diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 93788a7032..fd9947ac4c 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -71,27 +71,27 @@ JaggedPass_EventScript_230718:: @ 8230718 goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_230766 waitse playse SE_PIN - applymovement 5, JaggedPass_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, JaggedPass_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 - applymovement 5, JaggedPass_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT closemessage trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_230D2D setflag FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS - applymovement 5, JaggedPass_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end JaggedPass_EventScript_230766:: @ 8230766 - applymovement 5, JaggedPass_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 msgbox JaggedPass_Text_230D65, MSGBOX_DEFAULT closemessage - applymovement 5, JaggedPass_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 9109008b27..aaf550d0d4 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -110,12 +110,12 @@ LavaridgeTown_EventScript_1EA635:: @ 81EA635 return LavaridgeTown_EventScript_1EA63A:: @ 81EA63A - applymovement 8, LavaridgeTown_Movement_2725A6 + applymovement 8, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 8, LavaridgeTown_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, LavaridgeTown_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 return @@ -127,14 +127,14 @@ LavaridgeTown_EventScript_1EA65C:: @ 81EA65C waitmovement 0 closedoor 12, 15 waitdooranim - applymovement 8, LavaridgeTown_Movement_2725A4 + applymovement 8, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 8, LavaridgeTown_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, LavaridgeTown_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 5a4ef5d431..02d88bf5a1 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -134,13 +134,13 @@ LilycoveCity_EventScript_1E2CD4:: @ 81E2CD4 LilycoveCity_EventScript_1E2CDD:: @ 81E2CDD lockall msgbox LilycoveCity_Text_1E494D, MSGBOX_NPC - applymovement 20, LilycoveCity_Movement_2725A2 + applymovement 20, Common_Movement_FaceOriginalDirection end LilycoveCity_EventScript_1E2CEE:: @ 81E2CEE lockall msgbox LilycoveCity_Text_1E49F4, MSGBOX_NPC - applymovement 19, LilycoveCity_Movement_2725A2 + applymovement 19, Common_Movement_FaceOriginalDirection end LilycoveCity_EventScript_1E2CFF:: @ 81E2CFF @@ -197,10 +197,10 @@ LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D lockall goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_1E2DB0 msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_Text_1E3D4A, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_MET_WAILMER_TRAINER releaseall @@ -387,7 +387,7 @@ LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD LilycoveCity_EventScript_1E3006:: @ 81E3006 closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc index f6a53cc5e5..5823b6da4c 100644 --- a/data/maps/LilycoveCity_ContestHall/scripts.inc +++ b/data/maps/LilycoveCity_ContestHall/scripts.inc @@ -22,7 +22,7 @@ LilycoveCity_ContestHall_EventScript_21B4A9:: @ 821B4A9 faceplayer msgbox LilycoveCity_ContestHall_Text_21B977, MSGBOX_DEFAULT closemessage - applymovement 4, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 4, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -32,7 +32,7 @@ LilycoveCity_ContestHall_EventScript_21B4C0:: @ 821B4C0 faceplayer msgbox LilycoveCity_ContestHall_Text_21B9DC, MSGBOX_DEFAULT closemessage - applymovement 5, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -42,7 +42,7 @@ LilycoveCity_ContestHall_EventScript_21B4D7:: @ 821B4D7 faceplayer msgbox LilycoveCity_ContestHall_Text_21BA44, MSGBOX_DEFAULT closemessage - applymovement 6, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -52,7 +52,7 @@ LilycoveCity_ContestHall_EventScript_21B4EE:: @ 821B4EE faceplayer msgbox LilycoveCity_ContestHall_Text_21BAD5, MSGBOX_DEFAULT closemessage - applymovement 7, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -62,7 +62,7 @@ LilycoveCity_ContestHall_EventScript_21B505:: @ 821B505 faceplayer msgbox LilycoveCity_ContestHall_Text_21BB84, MSGBOX_DEFAULT closemessage - applymovement 8, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -72,7 +72,7 @@ LilycoveCity_ContestHall_EventScript_21B51C:: @ 821B51C faceplayer msgbox LilycoveCity_ContestHall_Text_21BBDD, MSGBOX_DEFAULT closemessage - applymovement 9, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 9, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -86,7 +86,7 @@ LilycoveCity_ContestHall_EventScript_21B53C:: @ 821B53C faceplayer msgbox LilycoveCity_ContestHall_Text_21BC89, MSGBOX_DEFAULT closemessage - applymovement 12, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 12, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -96,7 +96,7 @@ LilycoveCity_ContestHall_EventScript_21B553:: @ 821B553 faceplayer msgbox LilycoveCity_ContestHall_Text_21BD30, MSGBOX_DEFAULT closemessage - applymovement 22, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 22, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -106,7 +106,7 @@ LilycoveCity_ContestHall_EventScript_21B56A:: @ 821B56A faceplayer msgbox LilycoveCity_ContestHall_Text_21BD70, MSGBOX_DEFAULT closemessage - applymovement 11, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 11, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -116,7 +116,7 @@ LilycoveCity_ContestHall_EventScript_21B581:: @ 821B581 faceplayer msgbox LilycoveCity_ContestHall_Text_21BDDD, MSGBOX_DEFAULT closemessage - applymovement 13, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 13, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -126,7 +126,7 @@ LilycoveCity_ContestHall_EventScript_21B598:: @ 821B598 faceplayer msgbox LilycoveCity_ContestHall_Text_21BE16, MSGBOX_DEFAULT closemessage - applymovement 14, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 14, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -136,7 +136,7 @@ LilycoveCity_ContestHall_EventScript_21B5AF:: @ 821B5AF faceplayer msgbox LilycoveCity_ContestHall_Text_21BE77, MSGBOX_DEFAULT closemessage - applymovement 15, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 15, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -146,7 +146,7 @@ LilycoveCity_ContestHall_EventScript_21B5C6:: @ 821B5C6 faceplayer msgbox LilycoveCity_ContestHall_Text_21BEDE, MSGBOX_DEFAULT closemessage - applymovement 16, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 16, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -156,7 +156,7 @@ LilycoveCity_ContestHall_EventScript_21B5DD:: @ 821B5DD faceplayer msgbox LilycoveCity_ContestHall_Text_21BF6E, MSGBOX_DEFAULT closemessage - applymovement 17, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 17, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -166,7 +166,7 @@ LilycoveCity_ContestHall_EventScript_21B5F4:: @ 821B5F4 faceplayer msgbox LilycoveCity_ContestHall_Text_21BFE3, MSGBOX_DEFAULT closemessage - applymovement 18, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 18, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -176,7 +176,7 @@ LilycoveCity_ContestHall_EventScript_21B60B:: @ 821B60B faceplayer msgbox LilycoveCity_ContestHall_Text_21C07F, MSGBOX_DEFAULT closemessage - applymovement 19, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 19, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -186,7 +186,7 @@ LilycoveCity_ContestHall_EventScript_21B622:: @ 821B622 faceplayer msgbox LilycoveCity_ContestHall_Text_21C0D8, MSGBOX_DEFAULT closemessage - applymovement 21, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 21, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -196,7 +196,7 @@ LilycoveCity_ContestHall_EventScript_21B639:: @ 821B639 faceplayer msgbox LilycoveCity_ContestHall_Text_21C137, MSGBOX_DEFAULT closemessage - applymovement 20, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 20, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -206,7 +206,7 @@ LilycoveCity_ContestHall_EventScript_21B650:: @ 821B650 faceplayer msgbox LilycoveCity_ContestHall_Text_21C1A4, MSGBOX_DEFAULT closemessage - applymovement 23, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 23, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -216,7 +216,7 @@ LilycoveCity_ContestHall_EventScript_21B667:: @ 821B667 faceplayer msgbox LilycoveCity_ContestHall_Text_21C215, MSGBOX_DEFAULT closemessage - applymovement 24, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 24, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -226,7 +226,7 @@ LilycoveCity_ContestHall_EventScript_21B67E:: @ 821B67E faceplayer msgbox LilycoveCity_ContestHall_Text_21C27F, MSGBOX_DEFAULT closemessage - applymovement 25, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 25, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -236,7 +236,7 @@ LilycoveCity_ContestHall_EventScript_21B695:: @ 821B695 faceplayer msgbox LilycoveCity_ContestHall_Text_21C2BB, MSGBOX_DEFAULT closemessage - applymovement 26, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 26, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -246,7 +246,7 @@ LilycoveCity_ContestHall_EventScript_21B6AC:: @ 821B6AC faceplayer msgbox LilycoveCity_ContestHall_Text_21C307, MSGBOX_DEFAULT closemessage - applymovement 27, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 27, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -256,18 +256,18 @@ LilycoveCity_ContestHall_EventScript_21B6C3:: @ 821B6C3 faceplayer msgbox LilycoveCity_ContestHall_Text_21C365, MSGBOX_DEFAULT closemessage - applymovement 28, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 28, Common_Movement_FaceOriginalDirection waitmovement 0 release end LilycoveCity_ContestHall_EventScript_21B6DA:: @ 821B6DA lockall - applymovement 29, LilycoveCity_ContestHall_Movement_27259E + applymovement 29, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_ContestHall_Text_21C3F4, MSGBOX_DEFAULT closemessage - applymovement 29, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 29, Common_Movement_FaceOriginalDirection waitmovement 0 delay 25 msgbox LilycoveCity_ContestHall_Text_21C411, MSGBOX_DEFAULT @@ -279,7 +279,7 @@ LilycoveCity_ContestHall_EventScript_21B705:: @ 821B705 faceplayer msgbox LilycoveCity_ContestHall_Text_21C4B1, MSGBOX_DEFAULT closemessage - applymovement 31, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -289,7 +289,7 @@ LilycoveCity_ContestHall_EventScript_21B71C:: @ 821B71C faceplayer msgbox LilycoveCity_ContestHall_Text_21C445, MSGBOX_DEFAULT closemessage - applymovement 30, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 30, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index f57aae096e..ae276cf9c3 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -86,7 +86,7 @@ LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314 applymovement 4, LilycoveCity_ContestLobby_Movement_21A41A waitmovement 0 playse SE_PIN - applymovement 4, LilycoveCity_ContestLobby_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 applymovement 4, LilycoveCity_ContestLobby_Movement_21A41E waitmovement 0 @@ -259,7 +259,7 @@ LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4 applymovement 11, LilycoveCity_ContestLobby_Movement_21A547 waitmovement 0 playse SE_PIN - applymovement 11, LilycoveCity_ContestLobby_Movement_272598 + applymovement 11, Common_Movement_ExclamationMark waitmovement 0 applymovement 11, LilycoveCity_ContestLobby_Movement_21A54B waitmovement 0 @@ -614,7 +614,7 @@ LilycoveCity_ContestLobby_EventScript_21A7E9:: @ 821A7E9 LilycoveCity_ContestLobby_EventScript_21A7F9:: @ 821A7F9 closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_ContestLobby_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index 7ccc8b82fa..87e4c0afdb 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -6,33 +6,33 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189 goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3 msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, MSGBOX_DEFAULT closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3 msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, MSGBOX_DEFAULT closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, MSGBOX_DEFAULT closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -40,11 +40,11 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211 lockall playse SE_PIN - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT closemessage diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc index 80a93df47e..18fc0404bf 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -114,7 +114,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0 LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5 special sub_8139C10 closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 waitse special ShakeScreenInElevator diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index ffa2244f4c..ec1d89b66f 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -22,7 +22,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C copyvar VAR_0x8008, VAR_RESULT special BufferLottoTicketNumber msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, MSGBOX_DEFAULT - applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 playse SE_PC_ON special DoLotteryCornerComputerEffect @@ -30,7 +30,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C delay 220 special EndLotteryCornerComputerEffect delay 10 - applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x8004, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index b278d3e141..899ea98f04 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -123,7 +123,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22006C:: @ 822006C LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 lockall - applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_27259E + applymovement 7, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 0 goto_if_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C @@ -141,7 +141,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22009C:: @ 822009C LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7 msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, MSGBOX_DEFAULT closemessage - applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_2725A6 + applymovement 7, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 5e91578262..c1126d5753 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -246,12 +246,12 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 call LilycoveCity_Harbor_EventScript_21E4EE msgbox LilycoveCity_Harbor_Text_2C68A5, MSGBOX_DEFAULT closemessage - applymovement 4, LilycoveCity_Harbor_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 4, LilycoveCity_Harbor_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, LilycoveCity_Harbor_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 compare VAR_FACING, 2 call_if_eq LilycoveCity_Harbor_EventScript_21E656 @@ -328,12 +328,12 @@ LilycoveCity_Harbor_EventScript_21E44D:: @ 821E44D LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 msgbox LilycoveCity_Harbor_Text_2A6A82, MSGBOX_DEFAULT closemessage - applymovement 4, LilycoveCity_Harbor_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 removeobject 4 delay 30 - applymovement 1, LilycoveCity_Harbor_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 showobjectat 1, MAP_LILYCOVE_CITY_HARBOR delay 30 @@ -342,19 +342,19 @@ LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 end LilycoveCity_Harbor_EventScript_21E4EE:: @ 821E4EE - applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR delay 60 addobject 4 delay 30 - applymovement 4, LilycoveCity_Harbor_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 return LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 - applymovement 4, LilycoveCity_Harbor_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 removeobject 4 @@ -415,7 +415,7 @@ LilycoveCity_Harbor_EventScript_21E5C0:: @ 821E5C0 LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC msgbox LilycoveCity_Harbor_Text_21E89D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR @@ -494,22 +494,22 @@ LilycoveCity_Harbor_Movement_21E671: @ 821E671 step_end LilycoveCity_Harbor_EventScript_21E675:: @ 821E675 - applymovement 5, LilycoveCity_Harbor_Movement_2725A4 + applymovement 5, Common_Movement_WalkInPlaceLeft waitmovement 0 return LilycoveCity_Harbor_EventScript_21E680:: @ 821E680 - applymovement 5, LilycoveCity_Harbor_Movement_2725AA + applymovement 5, Common_Movement_WalkInPlaceDown waitmovement 0 return LilycoveCity_Harbor_EventScript_21E68B:: @ 821E68B - applymovement 5, LilycoveCity_Harbor_Movement_2725AA + applymovement 5, Common_Movement_WalkInPlaceDown waitmovement 0 return LilycoveCity_Harbor_EventScript_21E696:: @ 821E696 - applymovement 5, LilycoveCity_Harbor_Movement_2725A4 + applymovement 5, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 644c501135..3f5b349d27 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -15,7 +15,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B goto_if_eq LilycoveCity_House3_EventScript_21EE75 msgbox LilycoveCity_House3_Text_21F0F8, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -23,7 +23,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B LilycoveCity_House3_EventScript_21EE75:: @ 821EE75 msgbox LilycoveCity_House3_Text_21F0A9, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -33,7 +33,7 @@ LilycoveCity_House3_EventScript_21EE8A:: @ 821EE8A faceplayer msgbox LilycoveCity_House3_Text_21F430, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index 89ac90dc68..8f2cdde28d 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -7,7 +7,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9:: @ 8218CB9 LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2 lockall - applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_27259E + applymovement 2, Common_Movement_FacePlayer message LilycoveCity_LilycoveMuseum_1F_Text_218EBC waitmessage multichoice 20, 8, 16, 1 @@ -154,7 +154,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B faceplayer msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, MSGBOX_DEFAULT closemessage - applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 204b2cee3b..0669b74613 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -62,7 +62,7 @@ LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 lockall - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, MSGBOX_SIGN @@ -71,7 +71,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219863 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, MSGBOX_SIGN - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 @@ -107,7 +107,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA:: @ 82198BA end LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3 - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, MSGBOX_DEFAULT applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863 @@ -116,7 +116,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3 end LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, MSGBOX_DEFAULT givedecoration_std 44 compare VAR_RESULT, 0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index c5c2188e52..e94fa43f12 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -3,7 +3,7 @@ LilycoveCity_MoveDeletersHouse_MapScripts:: @ 821EA0A LilycoveCity_MoveDeletersHouse_EventScript_21EA0B:: @ 821EA0B lockall - applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_MoveDeletersHouse_Text_21EAFD, MSGBOX_YESNO switch VAR_RESULT diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 77bc40635b..698ef95f24 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -9,18 +9,18 @@ LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790 LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A lockall - applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_PokemonTrainerFanClub_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_PokemonTrainerFanClub_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807 waitmovement 0 diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index c7bb25ba77..e4b69eb133 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -186,7 +186,7 @@ LittlerootTown_Movement_1E7FAC: @ 81E7FAC LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 lockall playse SE_PIN - applymovement 8, LittlerootTown_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 delay 80 msgbox LittlerootTown_Text_1E8DA2, MSGBOX_DEFAULT @@ -246,7 +246,7 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setvar VAR_0x4050, 2 release @@ -357,14 +357,14 @@ LittlerootTown_Movement_1E8118: @ 81E8118 LittlerootTown_EventScript_1E811F:: @ 81E811F lockall - applymovement 1, LittlerootTown_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setvar VAR_0x4050, 2 releaseall @@ -490,12 +490,12 @@ LittlerootTown_EventScript_1E828C:: @ 81E828C return LittlerootTown_EventScript_1E8297:: @ 81E8297 - applymovement 4, LittlerootTown_Movement_2725A8 + applymovement 4, Common_Movement_WalkInPlaceRight waitmovement 0 return LittlerootTown_EventScript_1E82A2:: @ 81E82A2 - applymovement 4, LittlerootTown_Movement_2725A4 + applymovement 4, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -530,70 +530,70 @@ LittlerootTown_EventScript_1E82F0:: @ 81E82F0 return LittlerootTown_EventScript_1E8333:: @ 81E8333 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D1 waitmovement 0 return LittlerootTown_EventScript_1E8348:: @ 81E8348 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D8 waitmovement 0 return LittlerootTown_EventScript_1E835D:: @ 81E835D - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85DF waitmovement 0 return LittlerootTown_EventScript_1E8372:: @ 81E8372 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85E4 waitmovement 0 return LittlerootTown_EventScript_1E8387:: @ 81E8387 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85EA waitmovement 0 return LittlerootTown_EventScript_1E839C:: @ 81E839C - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85ED waitmovement 0 return LittlerootTown_EventScript_1E83B1:: @ 81E83B1 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F1 waitmovement 0 return LittlerootTown_EventScript_1E83C6:: @ 81E83C6 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F5 waitmovement 0 return LittlerootTown_EventScript_1E83DB:: @ 81E83DB - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F8 waitmovement 0 return LittlerootTown_EventScript_1E83F0:: @ 81E83F0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85FE waitmovement 0 @@ -894,7 +894,7 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_EventScript_1E828C call LittlerootTown_EventScript_1E8693 - applymovement 4, LittlerootTown_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 42cfe308b3..13736130f9 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -90,11 +90,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F784D:: @ 81F784D LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E lockall playse SE_PIN - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C waitmovement 0 special GetRivalSonDaughterString @@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3 lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 0 - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_292765 end @@ -146,9 +146,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 addobject 7 delay 30 playse SE_PIN - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_272598 + applymovement 7, Common_Movement_ExclamationMark waitmovement 0 - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_27259A + applymovement 7, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_1F7981 @@ -181,7 +181,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 end LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index ca57959de6..9758ba2503 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -67,9 +67,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85BC waitmovement 0 playse SE_PIN - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 10 playbgm MUS_BOY_SUP, 1 @@ -93,7 +93,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage @@ -105,7 +105,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85D7 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage @@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85E8 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage @@ -129,7 +129,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85FD waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 36bda7e036..8f40d7c13f 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -90,11 +90,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1F899D:: @ 81F899D LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE lockall playse SE_PIN - applymovement 4, LittlerootTown_MaysHouse_1F_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, LittlerootTown_MaysHouse_1F_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC waitmovement 0 special GetRivalSonDaughterString @@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A4C:: @ 81F8A4C lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - applymovement VAR_0x8004, LittlerootTown_MaysHouse_1F_Movement_2725A8 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceRight waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_292765 end @@ -183,9 +183,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B addobject 7 delay 30 playse SE_PIN - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_272598 + applymovement 7, Common_Movement_ExclamationMark waitmovement 0 - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_27259A + applymovement 7, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 call_if_ne LittlerootTown_MaysHouse_1F_EventScript_1F8B2A @@ -218,7 +218,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B end LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 353437ad4f..b946201efb 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -68,9 +68,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F946F waitmovement 0 playse SE_PIN - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 10 playbgm MUS_GIRL_SUP, 1 @@ -94,7 +94,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9473 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -106,7 +106,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -118,7 +118,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F949D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -129,7 +129,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94AD waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -268,7 +268,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94ED:: @ 81F94ED end LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7 - applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 checkplayergender compare VAR_RESULT, MALE diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 5565d2934c..1bf27c0bd0 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -167,8 +167,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 delay 10 playse SE_TK_KASYA delay 20 - applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A4 + applymovement 3, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 checkplayergender compare VAR_RESULT, MALE @@ -180,8 +180,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 delay 20 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58 waitmovement 0 - applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT playfanfare MUS_FANFA4 @@ -286,7 +286,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB release compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 drawmonpic SPECIES_CYNDAQUIL, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO @@ -299,7 +299,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF release compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 drawmonpic SPECIES_TOTODILE, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO @@ -312,7 +312,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023 release compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 drawmonpic SPECIES_CHIKORITA, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO @@ -530,7 +530,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 closemessage applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 checkplayergender compare VAR_RESULT, MALE diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index ba585c98a3..f43222d151 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -18,7 +18,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80B0534 - applymovement EVENT_OBJ_ID_PLAYER, MagmaHideout_4F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 150 removeobject 7 @@ -50,10 +50,10 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 waitmovement 0 msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MagmaHideout_4F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 delay 30 - applymovement 6, MagmaHideout_4F_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox MagmaHideout_4F_Text_23AB33, MSGBOX_DEFAULT closemessage diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index aae89cb8a2..c2c90d5c2f 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -25,7 +25,7 @@ MarineCave_End_EventScript_23B012:: @ 823B012 MarineCave_End_EventScript_23B01B:: @ 823B01B lockall - applymovement EVENT_OBJ_ID_PLAYER, MarineCave_End_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 1, MarineCave_End_Movement_23B09D waitmovement 0 diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 454adb60d1..6c2ae69fc9 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -70,7 +70,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF43D msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT closemessage - applymovement 7, MauvilleCity_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -78,7 +78,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D MauvilleCity_EventScript_1DF43D:: @ 81DF43D msgbox MauvilleCity_Text_1DFAA5, MSGBOX_DEFAULT closemessage - applymovement 7, MauvilleCity_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -86,17 +86,17 @@ MauvilleCity_EventScript_1DF43D:: @ 81DF43D MauvilleCity_EventScript_1DF452:: @ 81DF452 lockall goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF690 - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DF963, MSGBOX_DEFAULT - applymovement 6, MauvilleCity_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 6, MauvilleCity_Movement_272598 + applymovement 6, Common_Movement_ExclamationMark waitmovement 0 - applymovement 6, MauvilleCity_Movement_27259A + applymovement 6, Common_Movement_Delay48 waitmovement 0 msgbox MauvilleCity_Text_1DF9B2, MSGBOX_YESNO goto MauvilleCity_EventScript_1DF4AD @@ -118,7 +118,7 @@ MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 applymovement 6, MauvilleCity_Movement_1DF6A8 applymovement 7, MauvilleCity_Movement_1DF6E2 waitmovement 0 - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 delay 30 applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6EE @@ -138,7 +138,7 @@ MauvilleCity_EventScript_1DF53D:: @ 81DF53D applymovement 6, MauvilleCity_Movement_1DF6AE applymovement 7, MauvilleCity_Movement_1DF6E8 waitmovement 0 - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 delay 30 applymovement 7, MauvilleCity_Movement_1DF6F7 @@ -164,7 +164,7 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 call_if_eq MauvilleCity_EventScript_1DF5F3 compare VAR_FACING, 4 call_if_eq MauvilleCity_EventScript_1DF601 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT closemessage @@ -205,13 +205,13 @@ MauvilleCity_EventScript_1DF628:: @ 81DF628 MauvilleCity_EventScript_1DF63A:: @ 81DF63A msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96 - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT - applymovement 6, MauvilleCity_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT return @@ -223,7 +223,7 @@ MauvilleCity_EventScript_1DF683:: @ 81DF683 end MauvilleCity_EventScript_1DF690:: @ 81DF690 - applymovement 6, MauvilleCity_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox MauvilleCity_Text_1DFB42, MSGBOX_YESNO goto MauvilleCity_EventScript_1DF4AD diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 3b1a5fe084..88b1ded163 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -513,7 +513,7 @@ MauvilleCity_GameCorner_EventScript_210299:: @ 8210299 MauvilleCity_GameCorner_EventScript_2102A9:: @ 82102A9 closemessage - applymovement VAR_LAST_TALKED, MauvilleCity_GameCorner_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index c49052914f..b683b8c155 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -14,9 +14,9 @@ MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D MauvilleCity_House2_EventScript_210C82:: @ 8210C82 playse SE_PIN - applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_272598 + applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_27259A + applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 msgbox MauvilleCity_House2_Text_210D76, MSGBOX_YESNO compare VAR_RESULT, 1 diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index ea161ba232..466b1ee3ba 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -16,20 +16,20 @@ MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F lockall playbgm MUS_MGM0, 0 - applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_2725B0 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceDown waitmovement 0 delay 30 applymovement 5, MeteorFalls_1F_1R_Movement_2725B4 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BF47, MSGBOX_DEFAULT closemessage - applymovement 5, MeteorFalls_1F_1R_Movement_2725A6 - applymovement 6, MeteorFalls_1F_1R_Movement_2725A6 + applymovement 5, Common_Movement_WalkInPlaceUp + applymovement 6, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 5, MeteorFalls_1F_1R_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, MeteorFalls_1F_1R_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BF84, MSGBOX_DEFAULT closemessage @@ -37,9 +37,9 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_2725A4 - applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 - applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement 5, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 addobject 7 addobject 8 @@ -49,8 +49,8 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0 applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8 waitmovement 0 - applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 - applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 + applymovement 5, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT closemessage @@ -68,10 +68,10 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F applymovement 9, MeteorFalls_1F_1R_Movement_22BF18 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C268, MSGBOX_DEFAULT - applymovement 7, MeteorFalls_1F_1R_Movement_2725AA + applymovement 7, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C292, MSGBOX_DEFAULT - applymovement 7, MeteorFalls_1F_1R_Movement_2725A4 + applymovement 7, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C2FC, MSGBOX_DEFAULT closemessage diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc index ba8d807c5b..31baad43c4 100644 --- a/data/maps/MeteorFalls_StevensCave/scripts.inc +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -6,11 +6,11 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_23B1CD waitse playse SE_PIN - applymovement 1, MeteorFalls_StevensCave_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, MeteorFalls_StevensCave_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 - applymovement 1, MeteorFalls_StevensCave_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox MeteorFalls_StevensCave_Text_23B1E1, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_23B32D @@ -20,7 +20,7 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 end MeteorFalls_StevensCave_EventScript_23B1CD:: @ 823B1CD - applymovement 1, MeteorFalls_StevensCave_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT release diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 3e4da5776c..3e2bd4cf9c 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -216,7 +216,7 @@ MossdeepCity_EventScript_1E4C10:: @ 81E4C10 lock faceplayer msgbox MossdeepCity_Text_1E5213, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index b20524262f..662774d64f 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -60,7 +60,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 compare VAR_RESULT, 1 call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22301B closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -82,7 +82,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 compare VAR_RESULT, 1 call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22305A closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight waitmovement 0 release end @@ -106,7 +106,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight waitmovement 0 release end @@ -139,14 +139,14 @@ MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight waitmovement 0 release end MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119 msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight waitmovement 0 release end @@ -186,7 +186,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168 MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -194,7 +194,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4 msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -203,7 +203,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9 lock faceplayer msgbox MossdeepCity_SpaceCenter_1F_Text_223849, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 0602c9dad1..bfc33a10f5 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -32,9 +32,9 @@ MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5 MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF playse SE_PIN - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_272598 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_27259A + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, MSGBOX_YESNO compare VAR_RESULT, 1 @@ -57,13 +57,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_224461 applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_224499 applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1 @@ -173,7 +173,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59 lock faceplayer msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -231,20 +231,20 @@ MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF step_end MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C msgbox MossdeepCity_SpaceCenter_2F_Text_224854, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 releaseall end MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 special SavePlayerParty fadescreen 1 @@ -277,12 +277,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, MSGBOX_DEFAULT closemessage delay 20 - applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A4 - applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceLeft + applymovement 8, Common_Movement_WalkInPlaceDown waitmovement 0 delay 60 - applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A6 - applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceUp + applymovement 8, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 16da558c8d..d669302922 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -28,12 +28,12 @@ MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0 MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA lockall - applymovement 1, MossdeepCity_StevensHouse_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 1, MossdeepCity_StevensHouse_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, MossdeepCity_StevensHouse_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 applymovement 1, MossdeepCity_StevensHouse_Movement_222833 waitmovement 0 diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index aa1d947be1..7282ca944d 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -17,7 +17,7 @@ MtChimney_EventScript_22EDD5:: @ 822EDD5 call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EDF9 call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EE02 closemessage - applymovement 1, MtChimney_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_EVIL_LEADER_PLEASE_STOP release @@ -35,12 +35,12 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B lockall playbgm MUS_MGM0, 0 msgbox MtChimney_Text_22F26A, MSGBOX_DEFAULT - applymovement 2, MtChimney_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 2, MtChimney_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, MtChimney_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox MtChimney_Text_22F32E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_22F5CF @@ -60,7 +60,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B call_if_eq MtChimney_EventScript_22EEC7 compare VAR_FACING, 2 call_if_eq MtChimney_EventScript_22EED2 - applymovement EVENT_OBJ_ID_PLAYER, MtChimney_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT closemessage diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 6eaf6265f0..6b9805fbf4 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -32,9 +32,9 @@ MtPyre_Summit_EventScript_232030:: @ 8232030 MtPyre_Summit_EventScript_23203C:: @ 823203C playbgm MUS_AQA_0, 0 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725AA + applymovement 2, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 compare VAR_0x8008, 0 @@ -86,7 +86,7 @@ MtPyre_Summit_EventScript_2320EC:: @ 82320EC MtPyre_Summit_EventScript_2320F7:: @ 82320F7 applymovement 3, MtPyre_Summit_Movement_23212C waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -98,7 +98,7 @@ MtPyre_Summit_EventScript_23210C:: @ 823210C MtPyre_Summit_EventScript_232117:: @ 8232117 applymovement 3, MtPyre_Summit_Movement_232132 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -207,7 +207,7 @@ MtPyre_Summit_EventScript_232204:: @ 8232204 end MtPyre_Summit_EventScript_232210:: @ 8232210 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 60 compare VAR_0x8008, 0 @@ -217,9 +217,9 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 compare VAR_0x8008, 2 call_if_eq MtPyre_Summit_EventScript_2322F6 playse SE_PIN - applymovement 8, MtPyre_Summit_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, MtPyre_Summit_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 delay 30 compare VAR_0x8008, 0 @@ -292,7 +292,7 @@ MtPyre_Summit_EventScript_23235A:: @ 823235A applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323ED waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -300,7 +300,7 @@ MtPyre_Summit_EventScript_232376:: @ 8232376 applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323F3 waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -308,7 +308,7 @@ MtPyre_Summit_EventScript_232392:: @ 8232392 applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323F8 waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 return diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index 4df8343fbd..332e6dbea9 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -9,7 +9,7 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD goto_if_eq NavelRock_Harbor_EventScript_269102 msgbox NavelRock_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, NavelRock_Harbor_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_NAVEL_ROCK_HARBOR diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index d841f0374c..9d0452b6b6 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -23,7 +23,7 @@ NewMauville_Entrance_MapScript1_2372FB: @ 82372FB NewMauville_Entrance_EventScript_2372FF:: @ 82372FF lockall - applymovement EVENT_OBJ_ID_PLAYER, NewMauville_Entrance_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY, 1 diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 73b3e4d959..a635b2f5cb 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -193,7 +193,7 @@ OldaleTown_EventScript_1E901F:: @ 81E901F goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E9066 msgbox OldaleTown_Text_1E939A, MSGBOX_DEFAULT closemessage - applymovement 3, OldaleTown_Movement_2725A2 + applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -217,7 +217,7 @@ OldaleTown_EventScript_1E9066:: @ 81E9066 OldaleTown_EventScript_1E9070:: @ 81E9070 lockall - applymovement 4, OldaleTown_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 setvar VAR_0x8009, 0 goto OldaleTown_EventScript_1E90E6 @@ -227,7 +227,7 @@ OldaleTown_EventScript_1E9086:: @ 81E9086 lockall applymovement 4, OldaleTown_Movement_1E9170 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 @@ -237,7 +237,7 @@ OldaleTown_EventScript_1E90A6:: @ 81E90A6 lockall applymovement 4, OldaleTown_Movement_1E9173 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 @@ -247,7 +247,7 @@ OldaleTown_EventScript_1E90C6:: @ 81E90C6 lockall applymovement 4, OldaleTown_Movement_1E9175 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index f69eb3a3a1..0253a799fc 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -44,7 +44,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E special StartWallyTutorialBattle waitstate msgbox PetalburgCity_Text_1EC271, MSGBOX_DEFAULT - applymovement 2, PetalburgCity_Movement_2725A4, MAP_PETALBURG_CITY + applymovement 2, Common_Movement_WalkInPlaceLeft, MAP_PETALBURG_CITY waitmovement 2, MAP_PETALBURG_CITY msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT closemessage @@ -89,7 +89,7 @@ PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6 faceplayer msgbox PetalburgCity_Text_1DC985, MSGBOX_DEFAULT closemessage - applymovement 3, PetalburgCity_Movement_2725A2 + applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -263,13 +263,13 @@ PetalburgCity_EventScript_1DC4BE:: @ 81DC4BE end PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA - applymovement 8, PetalburgCity_Movement_27259E + applymovement 8, Common_Movement_FacePlayer waitmovement 0 playbgm MUS_TSURETEK, 0 playse SE_PIN - applymovement 8, PetalburgCity_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, PetalburgCity_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 0 call_if_eq PetalburgCity_EventScript_1DC57F @@ -290,8 +290,8 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA compare VAR_0x8008, 3 call_if_eq PetalburgCity_EventScript_1DC5FF msgbox PetalburgCity_Text_1DC91B, MSGBOX_DEFAULT - applymovement 8, PetalburgCity_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A8 + applymovement 8, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox PetalburgCity_Text_1DC93E, MSGBOX_DEFAULT closemessage @@ -304,7 +304,7 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA PetalburgCity_EventScript_1DC57F:: @ 81DC57F applymovement 8, PetalburgCity_Movement_1DC615 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -316,14 +316,14 @@ PetalburgCity_EventScript_1DC594:: @ 81DC594 PetalburgCity_EventScript_1DC59F:: @ 81DC59F applymovement 8, PetalburgCity_Movement_1DC61D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_EventScript_1DC5B4:: @ 81DC5B4 applymovement 8, PetalburgCity_Movement_1DC622 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -543,23 +543,23 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 applymovement 9, PetalburgCity_Movement_1DC7D6 waitmovement 0 playse SE_PIN - applymovement 9, PetalburgCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, PetalburgCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement 9, PetalburgCity_Movement_1DC7DB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 setvar VAR_0x40D1, 1 msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT closemessage - applymovement 9, PetalburgCity_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 delay 30 msgbox PetalburgCity_Text_1DCB82, MSGBOX_DEFAULT closemessage - applymovement 9, PetalburgCity_Movement_2725A4 + applymovement 9, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 30 msgbox PetalburgCity_Text_1DCC09, MSGBOX_DEFAULT diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index b4733ab090..474fe0df56 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -90,14 +90,14 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 msgbox PetalburgCity_Gym_Text_205B32, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_205B4C, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement 10, PetalburgCity_Gym_Movement_2049EC waitmovement 0 playse SE_KAIDAN removeobject 10 setflag FLAG_HIDE_PETALBURG_CITY_WALLY delay 30 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox PetalburgCity_Gym_Text_205C40, MSGBOX_DEFAULT setvar VAR_0x4085, 2 @@ -228,7 +228,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC end PetalburgCity_Gym_EventScript_204C31:: @ 8204C31 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown applymovement 10, PetalburgCity_Gym_Movement_2050EB waitmovement 0 return @@ -236,20 +236,20 @@ PetalburgCity_Gym_EventScript_204C31:: @ 8204C31 PetalburgCity_Gym_EventScript_204C43:: @ 8204C43 applymovement 10, PetalburgCity_Gym_Movement_2050E1 waitmovement 0 - applymovement 1, PetalburgCity_Gym_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F - applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement 10, PetalburgCity_Gym_Movement_2050EB waitmovement 0 return PetalburgCity_Gym_EventScript_204C78:: @ 8204C78 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown applymovement 10, PetalburgCity_Gym_Movement_205102 applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205111 waitmovement 0 @@ -274,55 +274,55 @@ PetalburgCity_Gym_EventScript_204CB5:: @ 8204CB5 return PetalburgCity_Gym_EventScript_204CC7:: @ 8204CC7 - applymovement 1, PetalburgCity_Gym_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_Gym_EventScript_204CD2:: @ 8204CD2 - applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_Gym_EventScript_204CE4:: @ 8204CE4 - applymovement 1, PetalburgCity_Gym_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return PetalburgCity_Gym_EventScript_204CF6:: @ 8204CF6 - applymovement 1, PetalburgCity_Gym_Movement_2725A4 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204D08:: @ 8204D08 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_204D13:: @ 8204D13 - applymovement 1, PetalburgCity_Gym_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204D1E:: @ 8204D1E - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_204D29:: @ 8204D29 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_204D34:: @ 8204D34 - applymovement 10, PetalburgCity_Gym_Movement_27259E + applymovement 10, Common_Movement_FacePlayer waitmovement 0 return PetalburgCity_Gym_EventScript_204D3F:: @ 8204D3F - applymovement 10, PetalburgCity_Gym_Movement_2725AA + applymovement 10, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -350,7 +350,7 @@ PetalburgCity_Gym_EventScript_204D72:: @ 8204D72 return PetalburgCity_Gym_EventScript_204D73:: @ 8204D73 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -465,9 +465,9 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 applymovement 11, PetalburgCity_Gym_Movement_2050BB waitmovement 0 playse SE_PIN - applymovement 11, PetalburgCity_Gym_Movement_272598 + applymovement 11, Common_Movement_ExclamationMark waitmovement 0 - applymovement 11, PetalburgCity_Gym_Movement_27259A + applymovement 11, Common_Movement_Delay48 waitmovement 0 delay 10 compare VAR_0x8008, 1 @@ -504,47 +504,47 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 end PetalburgCity_Gym_EventScript_204FCC:: @ 8204FCC - applymovement 11, PetalburgCity_Gym_Movement_2725A6 + applymovement 11, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_Gym_EventScript_204FD7:: @ 8204FD7 - applymovement 11, PetalburgCity_Gym_Movement_2725A8 + applymovement 11, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204FE2:: @ 8204FE2 - applymovement 11, PetalburgCity_Gym_Movement_2725A4 + applymovement 11, Common_Movement_WalkInPlaceLeft waitmovement 0 return PetalburgCity_Gym_EventScript_204FED:: @ 8204FED applymovement 11, PetalburgCity_Gym_Movement_2050C3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A4 - applymovement 1, PetalburgCity_Gym_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return PetalburgCity_Gym_EventScript_205009:: @ 8205009 applymovement 11, PetalburgCity_Gym_Movement_2050CA waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_205025:: @ 8205025 applymovement 11, PetalburgCity_Gym_Movement_2050D0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_205041:: @ 8205041 applymovement 11, PetalburgCity_Gym_Movement_20507E - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050A1 waitmovement 0 return diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index e296b8447f..7efad7dc1a 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -15,7 +15,7 @@ PetalburgWoods_EventScript_22DFD7:: @ 822DFD7 closemessage applymovement 3, PetalburgWoods_Movement_22E1F6 waitmovement 0 - applymovement 4, PetalburgWoods_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT closemessage @@ -41,7 +41,7 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 call PetalburgWoods_EventScript_22E124 applymovement 4, PetalburgWoods_Movement_22E1D0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT closemessage @@ -52,14 +52,14 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 closemessage applymovement 3, PetalburgWoods_Movement_22E205 waitmovement 0 - applymovement 4, PetalburgWoods_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT closemessage applymovement 4, PetalburgWoods_Movement_22E1EA waitmovement 0 msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542 @@ -85,7 +85,7 @@ PetalburgWoods_EventScript_22E138:: @ 822E138 applymovement 3, PetalburgWoods_Movement_22E1FD waitmovement 0 removeobject 3 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox PetalburgWoods_Text_22E63D, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 15722a3f33..ca9d94127c 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -30,7 +30,7 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE applymovement 4, Route101_Movement_1EBD96 applymovement 2, Route101_Movement_1EBDC8 waitmovement 0 - applymovement 2, Route101_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, Route101_Movement_1EBDBD applymovement 2, Route101_Movement_1EBDEF @@ -223,7 +223,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16 fadescreen 1 removeobject 4 setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13 - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 special ChooseStarter waitstate diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 1cb912bd0d..798e32715a 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -30,11 +30,11 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA msgbox Route103_Text_1EC7A6, MSGBOX_DEFAULT closemessage playbgm MUS_GIRL_SUP, 1 - applymovement 2, Route103_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 - applymovement 2, Route103_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route103_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox Route103_Text_1EC7DE, MSGBOX_DEFAULT switch VAR_STARTER_MON @@ -47,11 +47,11 @@ Route103_EventScript_1EC434:: @ 81EC434 msgbox Route103_Text_1EC989, MSGBOX_DEFAULT closemessage playbgm MUS_BOY_SUP, 1 - applymovement 2, Route103_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 - applymovement 2, Route103_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route103_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox Route103_Text_1EC9CE, MSGBOX_DEFAULT switch VAR_STARTER_MON diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index d50a8a9a39..7d2e06876e 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -42,7 +42,7 @@ Route104_EventScript_1ECC9D:: @ 81ECC9D Route104_EventScript_1ECC9E:: @ 81ECC9E lockall setvar VAR_0x8008, 1 - applymovement 34, Route104_Movement_27259E + applymovement 34, Common_Movement_FacePlayer waitmovement 0 goto Route104_EventScript_1ECD33 @@ -51,7 +51,7 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 setflag FLAG_HIDE_RUSBORO_CITY_RIVAL setvar VAR_0x405A, 8 setvar VAR_0x4063, 2 - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 10 addobject 34 @@ -64,9 +64,9 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 setvar VAR_0x8008, 0 call Route104_EventScript_1E0DD1 playse SE_PIN - applymovement 34, Route104_Movement_272598 + applymovement 34, Common_Movement_ExclamationMark waitmovement 0 - applymovement 34, Route104_Movement_27259A + applymovement 34, Common_Movement_Delay48 waitmovement 0 goto Route104_EventScript_1ECD33 diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 490f1d2552..f0719c2e8b 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -319,7 +319,7 @@ Route109_EventScript_1EE99E:: @ 81EE99E faceplayer msgbox Route109_Text_1EEFB0, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -334,7 +334,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull closemessage - applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_RECEIVED_SOFT_SAND release @@ -342,7 +342,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 Route109_EventScript_1EE9F2:: @ 81EE9F2 msgbox Route109_Text_1EEFF1, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 958f3a36a0..578a19a21a 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -32,7 +32,7 @@ Route110_EventScript_1EF2AA:: @ 81EF2AA lock faceplayer msgbox Route110_Text_1EFB5D, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -41,7 +41,7 @@ Route110_EventScript_1EF2C0:: @ 81EF2C0 lock faceplayer msgbox Route110_Text_1EFB93, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -50,7 +50,7 @@ Route110_EventScript_1EF2D6:: @ 81EF2D6 lock faceplayer msgbox Route110_Text_1EFBCA, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -59,7 +59,7 @@ Route110_EventScript_1EF2EC:: @ 81EF2EC lock faceplayer msgbox Route110_Text_1EFC0D, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -307,7 +307,7 @@ Route110_EventScript_1EF64A:: @ 81EF64A Route110_EventScript_1EF661:: @ 81EF661 lockall - applymovement 21, Route110_Movement_2725A8 + applymovement 21, Common_Movement_WalkInPlaceRight waitmovement 0 call Route110_EventScript_1EF673 releaseall @@ -383,11 +383,11 @@ Route110_EventScript_1EF76E:: @ 81EF76E call_if_eq Route110_EventScript_1EF7E1 compare VAR_RESULT, FEMALE call_if_eq Route110_EventScript_1EF7E6 - applymovement 28, Route110_Movement_2725AA + applymovement 28, Common_Movement_WalkInPlaceDown waitmovement 0 - applymovement 28, Route110_Movement_272598 + applymovement 28, Common_Movement_ExclamationMark waitmovement 0 - applymovement 28, Route110_Movement_27259A + applymovement 28, Common_Movement_Delay48 waitmovement 0 delay 30 compare VAR_0x8008, 1 @@ -616,9 +616,9 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 applymovement 36, Route110_Movement_1EFB30 waitmovement 0 playse SE_PIN - applymovement 36, Route110_Movement_272598 + applymovement 36, Common_Movement_ExclamationMark waitmovement 0 - applymovement 36, Route110_Movement_27259A + applymovement 36, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 call_if_eq Route110_EventScript_1EFAD8 @@ -631,13 +631,13 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 msgbox Route110_Text_1F0AB5, MSGBOX_DEFAULT closemessage delay 20 - applymovement 36, Route110_Movement_2725A4 + applymovement 36, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 10 - applymovement 36, Route110_Movement_2725A8 + applymovement 36, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 - applymovement 36, Route110_Movement_2725AA + applymovement 36, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 msgbox Route110_Text_1F0AFF, MSGBOX_DEFAULT diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index de6aa2119d..770c397682 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -161,7 +161,7 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 delay 30 msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT closemessage - applymovement 1, Route110_TrickHouseEnd_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 delay 30 msgbox Route110_TrickHouseEnd_Text_26B485, MSGBOX_DEFAULT @@ -212,22 +212,22 @@ Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002 return Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015 - applymovement 1, Route110_TrickHouseEnd_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B020:: @ 826B020 - applymovement 1, Route110_TrickHouseEnd_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B02B:: @ 826B02B - applymovement 1, Route110_TrickHouseEnd_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036 - applymovement 1, Route110_TrickHouseEnd_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -235,13 +235,13 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041 lockall turnobject 1, 3 playse SE_PIN - applymovement 1, Route110_TrickHouseEnd_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 delay 20 applymovement 1, Route110_TrickHouseEnd_Movement_26B08B waitmovement 0 playse SE_W153 - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox Route110_TrickHouseEnd_Text_26B8BD, MSGBOX_DEFAULT closemessage diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index ac27d3af62..7dc918f2d4 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -236,9 +236,9 @@ Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E playse SE_PIN - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_272598 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_27259A + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 compare VAR_0x4044, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_269DEE @@ -326,21 +326,21 @@ Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48 Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 msgbox Route110_TrickHouseEntrance_Text_26A921, MSGBOX_DEFAULT closemessage - applymovement 1, Route110_TrickHouseEntrance_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 1, Route110_TrickHouseEntrance_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, Route110_TrickHouseEntrance_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26A9AF, MSGBOX_DEFAULT - applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F - applymovement 1, Route110_TrickHouseEntrance_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT compare VAR_0x4044, 1 @@ -432,13 +432,13 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023 setvar VAR_0x40C1, 0 setvar VAR_0x40A7, 3 - applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 - applymovement 1, Route110_TrickHouseEntrance_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26AB2C, MSGBOX_DEFAULT call Route110_TrickHouseEntrance_EventScript_26A070 diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 4c199a9933..48ce6be8c2 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -25,7 +25,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB27:: @ 826CB27 Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32 lockall - applymovement 1, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_1, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -35,7 +35,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32 Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53 lockall - applymovement 2, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_2, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -45,7 +45,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53 Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74 lockall - applymovement 3, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 3, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_3, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -55,7 +55,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74 Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95 lockall - applymovement 4, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_4, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -65,7 +65,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95 Route110_TrickHousePuzzle5_EventScript_26CBB6:: @ 826CBB6 lockall - applymovement 5, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_5, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -215,9 +215,9 @@ Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB setvar VAR_TEMP_1, 1 setvar VAR_TEMP_8, 1 playse SE_PIN - applymovement 1, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 @@ -239,9 +239,9 @@ Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A setvar VAR_TEMP_2, 1 setvar VAR_TEMP_8, 2 playse SE_PIN - applymovement 2, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D2CC @@ -265,9 +265,9 @@ Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_8, 3 playse SE_PIN - applymovement 3, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 3, Common_Movement_ExclamationMark waitmovement 0 - applymovement 3, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 3, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 @@ -289,9 +289,9 @@ Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73 setvar VAR_TEMP_4, 1 setvar VAR_TEMP_8, 4 playse SE_PIN - applymovement 4, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 @@ -313,9 +313,9 @@ Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2 setvar VAR_TEMP_5, 1 setvar VAR_TEMP_8, 5 playse SE_PIN - applymovement 5, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox Route110_TrickHousePuzzle5_Text_26DC78, MSGBOX_DEFAULT random 3 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index d9d5ea7ea9..c33dc6f115 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -285,7 +285,7 @@ Route111_EventScript_1F0FC5:: @ 81F0FC5 Route111_EventScript_1F0FE7:: @ 81F0FE7 msgbox Route111_Text_1F1523, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_1F1542 - applymovement 1, Route111_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 call Route111_EventScript_1F113C msgbox Route111_Text_1F156F, MSGBOX_DEFAULT @@ -303,7 +303,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 call Route111_EventScript_1F1143 msgbox Route111_Text_1F159D, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_1F1616 - applymovement 2, Route111_Movement_2725A6 + applymovement 2, Common_Movement_WalkInPlaceUp waitmovement 0 call Route111_EventScript_1F113C msgbox Route111_Text_1F1645, MSGBOX_DEFAULT @@ -321,7 +321,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 call Route111_EventScript_1F1143 msgbox Route111_Text_1F167E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VIVI, Route111_Text_1F16C6 - applymovement 3, Route111_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp waitmovement 0 call Route111_EventScript_1F113C msgbox Route111_Text_1F16DC, MSGBOX_DEFAULT @@ -341,7 +341,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 trainerbattle_no_intro TRAINER_VICKY, Route111_Text_1F1756 msgbox Route111_Text_1F1788, MSGBOX_DEFAULT closemessage - applymovement 4, Route111_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 call Route111_EventScript_1F113C applymovement 4, Route111_Movement_1F114A @@ -437,11 +437,11 @@ Route111_EventScript_1F11DA:: @ 81F11DA Route111_EventScript_1F11E4:: @ 81F11E4 lockall - applymovement 46, Route111_Movement_27259E + applymovement 46, Common_Movement_FacePlayer waitmovement 0 msgbox Route111_Text_1F1CCA, MSGBOX_DEFAULT closemessage - applymovement 46, Route111_Movement_2725A2 + applymovement 46, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index 2890011b40..312bf739f2 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -52,7 +52,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A51E:: @ 822A51E Route111_WinstrateFamilysHouse_EventScript_22A52C:: @ 822A52C closemessage - applymovement VAR_0x8008, Route111_WinstrateFamilysHouse_Movement_2725A2 + applymovement VAR_0x8008, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 995102fe73..7f479d9f25 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -10,36 +10,36 @@ Route112_MapScript1_1F1DAE: @ 81F1DAE Route112_EventScript_1F1DB7:: @ 81F1DB7 lockall delay 40 - applymovement 1, Route112_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT closemessage - applymovement 1, Route112_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 6, Route112_Movement_2725A4 + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT closemessage - applymovement 6, Route112_Movement_2725A2 + applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 1, Route112_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT closemessage - applymovement 1, Route112_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 6, Route112_Movement_2725A4 + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 msgbox Route112_Text_1F2003, MSGBOX_DEFAULT closemessage - applymovement 6, Route112_Movement_2725A2 + applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 96d591d2da..c36abfe3b5 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -23,8 +23,8 @@ Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53 Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 lockall - applymovement 1, Route114_FossilManiacsTunnel_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, Route114_FossilManiacsTunnel_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT setvar VAR_0x40CC, 2 diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 623c74e3ca..1addad5ecb 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -151,8 +151,8 @@ Route116_EventScript_1F2D84:: @ 81F2D84 Route116_EventScript_1F2D95:: @ 81F2D95 lockall - applymovement 11, Route116_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, Route116_Movement_2725A4 + applymovement 11, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox Route116_Text_1F309D, MSGBOX_DEFAULT setvar VAR_0x406F, 2 diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 45b8665b0d..4e5279510e 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -69,7 +69,7 @@ Route118_EventScript_1F3E85:: @ 81F3E85 Route118_EventScript_1F3E8E:: @ 81F3E8E lockall setvar VAR_0x8008, 0 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 19, Route118_Movement_1F3F61 waitmovement 0 @@ -79,7 +79,7 @@ Route118_EventScript_1F3E8E:: @ 81F3E8E Route118_EventScript_1F3EAE:: @ 81F3EAE lockall setvar VAR_0x8008, 1 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 goto Route118_EventScript_1F3EE4 end @@ -87,7 +87,7 @@ Route118_EventScript_1F3EAE:: @ 81F3EAE Route118_EventScript_1F3EC4:: @ 81F3EC4 lockall setvar VAR_0x8008, 2 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 19, Route118_Movement_1F3F63 waitmovement 0 diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 15f124bb0e..d0ab5f5780 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -51,7 +51,7 @@ Route119_EventScript_1F4488:: @ 81F4488 call_if_eq Route119_EventScript_1F46C6 compare VAR_TEMP_1, 2 call_if_eq Route119_EventScript_1F46D1 - applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 compare VAR_TEMP_1, 1 @@ -459,7 +459,7 @@ Route119_EventScript_1F49A3:: @ 81F49A3 faceplayer msgbox Route119_Text_1F50EB, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -469,7 +469,7 @@ Route119_EventScript_1F49BA:: @ 81F49BA faceplayer msgbox Route119_Text_1F5147, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 6826e5fe04..21d34eed1a 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -55,9 +55,9 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 msgbox Route119_WeatherInstitute_2F_Text_270568, MSGBOX_DEFAULT closemessage playse SE_PIN - applymovement 3, Route119_WeatherInstitute_2F_Movement_272598 + applymovement 3, Common_Movement_ExclamationMark waitmovement 0 - applymovement 3, Route119_WeatherInstitute_2F_Movement_27259A + applymovement 3, Common_Movement_Delay48 waitmovement 0 msgbox Route119_WeatherInstitute_2F_Text_2705DD, MSGBOX_DEFAULT closemessage diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 88a950be79..c16b37691a 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -196,12 +196,12 @@ Route120_EventScript_1F568B:: @ 81F568B call_if_eq Route120_EventScript_1F57A3 compare VAR_FACING, 3 call_if_eq Route120_EventScript_1F57AE - applymovement 31, Route120_Movement_2725A4 + applymovement 31, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 msgbox Route120_Text_1F5B43, MSGBOX_DEFAULT closemessage - applymovement 30, Route120_Movement_2725A8 + applymovement 30, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 30, Route120_Movement_2723C7 waitmovement 0 @@ -233,15 +233,15 @@ Route120_EventScript_1F571C:: @ 81F571C end Route120_EventScript_1F572C:: @ 81F572C - applymovement 31, Route120_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_2725A6 + applymovement 31, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route120_Text_1F5BAF, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_SCOPE setflag FLAG_RECEIVED_DEVON_SCOPE msgbox Route120_Text_1F5C7B, MSGBOX_DEFAULT closemessage - applymovement 31, Route120_Movement_2725AA + applymovement 31, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 @@ -258,7 +258,7 @@ Route120_EventScript_1F572C:: @ 81F572C end Route120_EventScript_1F57A3:: @ 81F57A3 - applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index d4ef73f9b1..f5e2fb088a 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -46,7 +46,7 @@ Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 lockall - applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 showmoneybox 0, 0, 0 msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 5d32a7bdf5..3ec3d2fe7e 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -24,18 +24,18 @@ Route128_EventScript_1F6B57:: @ 81F6B57 closemessage applymovement 5, Route128_Movement_1F6CAD waitmovement 0 - applymovement 4, Route128_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT closemessage applymovement 5, Route128_Movement_1F6CBB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_1F6C96 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement 5, Route128_Movement_1F6CA8 waitmovement 0 msgbox Route128_Text_1F704F, MSGBOX_DEFAULT @@ -53,19 +53,19 @@ Route128_EventScript_1F6B57:: @ 81F6B57 addobject 3 applymovement 3, Route128_Movement_1F6C87 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_1F6C85 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT - applymovement 3, Route128_Movement_2725AA + applymovement 3, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox Route128_Text_1F721B, MSGBOX_DEFAULT closemessage - applymovement 3, Route128_Movement_2725AA + applymovement 3, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index e5f034f1de..f475f02e3b 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -42,18 +42,18 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 applymovement 15, RustboroCity_Movement_1E0852 waitmovement 0 playse SE_PIN - applymovement 15, RustboroCity_Movement_272598 + applymovement 15, Common_Movement_ExclamationMark waitmovement 0 - applymovement 15, RustboroCity_Movement_27259A + applymovement 15, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 applymovement 15, RustboroCity_Movement_1E084E waitmovement 0 msgbox RustboroCity_Text_1E22A5, MSGBOX_DEFAULT closemessage setflag FLAG_HAS_MATCH_CALL - applymovement 15, RustboroCity_Movement_2725A4 + applymovement 15, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_TK_KASYA delay 10 @@ -63,7 +63,7 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 delay 10 playse SE_TK_KASYA delay 20 - applymovement 15, RustboroCity_Movement_2725AA + applymovement 15, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox RustboroCity_Text_1E2331, MSGBOX_DEFAULT closemessage @@ -221,7 +221,7 @@ RustboroCity_EventScript_1E0922:: @ 81E0922 lock faceplayer msgbox RustboroCity_Text_1E16F4, MSGBOX_DEFAULT - applymovement 7, RustboroCity_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -230,7 +230,7 @@ RustboroCity_EventScript_1E0938:: @ 81E0938 lock faceplayer msgbox RustboroCity_Text_1E174B, MSGBOX_DEFAULT - applymovement 8, RustboroCity_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -344,7 +344,7 @@ RustboroCity_EventScript_1E0A6E:: @ 81E0A6E RustboroCity_EventScript_1E0A79:: @ 81E0A79 applymovement 9, RustboroCity_Movement_1E0AD5 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -500,52 +500,52 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E end RustboroCity_EventScript_1E0B6F:: @ 81E0B6F - applymovement 9, RustboroCity_Movement_2725A6 + applymovement 9, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return RustboroCity_EventScript_1E0B9B:: @ 81E0B9B - applymovement 9, RustboroCity_Movement_2725A4 + applymovement 9, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AC waitmovement 0 return RustboroCity_EventScript_1E0BC7:: @ 81E0BC7 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement 9, RustboroCity_Movement_1E0C29 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -608,69 +608,69 @@ RustboroCity_EventScript_1E0CD3:: @ 81E0CD3 return RustboroCity_EventScript_1E0CDC:: @ 81E0CDC - applymovement 9, RustboroCity_Movement_2725A6 + applymovement 9, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return RustboroCity_EventScript_1E0D08:: @ 81E0D08 - applymovement 9, RustboroCity_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AE waitmovement 0 return RustboroCity_EventScript_1E0D34:: @ 81E0D34 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return RustboroCity_EventScript_1E0D60:: @ 81E0D60 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement 9, RustboroCity_Movement_1E0C29 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return RustboroCity_EventScript_1E0D96:: @ 81E0D96 - applymovement 9, RustboroCity_Movement_2725A4 + applymovement 9, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 return RustboroCity_EventScript_1E0DB8:: @ 81E0DB8 lockall call_if_unset FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_27259E + applymovement 14, Common_Movement_FacePlayer waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -694,128 +694,128 @@ RustboroCity_EventScript_1E0DEE:: @ 81E0DEE RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E120E waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0E33:: @ 81E0E33 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1215 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0E73:: @ 81E0E73 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E121B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0EB3:: @ 81E0EB3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1220 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0EF3:: @ 81E0EF3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1224 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0F33:: @ 81E0F33 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1227 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0F73:: @ 81E0F73 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E122B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1230 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index d9fe5819f6..1631d923d4 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -79,9 +79,9 @@ RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1 RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933 closemessage playse SE_PIN - applymovement 5, RustboroCity_DevonCorp_2F_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 @@ -104,9 +104,9 @@ RustboroCity_DevonCorp_2F_EventScript_211974:: @ 8211974 RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991 closemessage playse SE_PIN - applymovement 5, RustboroCity_DevonCorp_2F_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index b2f13ea865..7c45570588 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -154,7 +154,7 @@ RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_212595 msgbox RustboroCity_DevonCorp_3F_Text_212A09, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -167,7 +167,7 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 setflag FLAG_RECEIVED_EXP_SHARE msgbox RustboroCity_DevonCorp_3F_Text_212A9E, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -175,7 +175,7 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC msgbox RustboroCity_DevonCorp_3F_Text_212B78, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc index 7798e72e62..ec59115ef5 100644 --- a/data/maps/RustboroCity_Flat1_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -59,7 +59,7 @@ RustboroCity_Flat1_2F_EventScript_2151F8:: @ 82151F8 msgbox RustboroCity_Flat1_2F_Text_215535, MSGBOX_DEFAULT call RustboroCity_Flat1_2F_EventScript_215238 msgbox RustboroCity_Flat1_2F_Text_215565, MSGBOX_DEFAULT - applymovement 6, RustboroCity_Flat1_2F_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox RustboroCity_Flat1_2F_Text_215792, MSGBOX_DEFAULT release diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index 2d3c6a8f94..74394f9a51 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -87,7 +87,7 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull closemessage - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 setflag FLAG_RECEIVED_QUICK_CLAW release @@ -106,7 +106,7 @@ RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0 RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB msgbox RustboroCity_PokemonSchool_Text_2144C8, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 release end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 59d0789ba6..325e4186b9 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -23,7 +23,7 @@ RusturfTunnel_EventScript_22CE5F:: @ 822CE5F faceplayer msgbox RusturfTunnel_Text_22D7A3, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -35,7 +35,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76 setflag FLAG_TEMP_1 msgbox RusturfTunnel_Text_22D510, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -43,7 +43,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76 RusturfTunnel_EventScript_22CE99:: @ 822CE99 msgbox RusturfTunnel_Text_22D5F3, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -94,7 +94,7 @@ RusturfTunnel_EventScript_22CF6F:: @ 822CF6F applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 applymovement 1, RusturfTunnel_Movement_22D06C waitmovement 0 - applymovement 10, RusturfTunnel_Movement_2725AA + applymovement 10, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -102,14 +102,14 @@ RusturfTunnel_EventScript_22CF8B:: @ 822CF8B applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 applymovement 1, RusturfTunnel_Movement_22D06C waitmovement 0 - applymovement 10, RusturfTunnel_Movement_2725AA + applymovement 10, Common_Movement_WalkInPlaceDown waitmovement 0 return RusturfTunnel_EventScript_22CFA7:: @ 822CFA7 - applymovement 1, RusturfTunnel_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -142,9 +142,9 @@ RusturfTunnel_EventScript_22CFE6:: @ 822CFE6 RusturfTunnel_EventScript_22CFFF:: @ 822CFFF playse SE_PIN - applymovement 1, RusturfTunnel_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, RusturfTunnel_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 return @@ -328,7 +328,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 applymovement 5, RusturfTunnel_Movement_22D1A4 waitmovement 0 msgbox RusturfTunnel_Text_22D395, MSGBOX_DEFAULT - applymovement 5, RusturfTunnel_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 message RusturfTunnel_Text_22D3BA waitmessage diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 204d70e142..20d0c72d48 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -201,7 +201,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 lockall applymovement 5, SSTidalCorridor_Movement_23C26D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index 9bbb9cbdc5..13b65c7227 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -13,9 +13,9 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 goto_if_eq SeafloorCavern_Entrance_EventScript_2344ED waitse playse SE_PIN - applymovement 1, SeafloorCavern_Entrance_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, SeafloorCavern_Entrance_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 20 compare VAR_FACING, 3 @@ -29,7 +29,7 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 moveobjectoffscreen 1 msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT closemessage - applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end @@ -43,23 +43,23 @@ SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED call_if_eq SeafloorCavern_Entrance_EventScript_234539 msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT closemessage - applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end SeafloorCavern_Entrance_EventScript_234523:: @ 8234523 - applymovement 1, SeafloorCavern_Entrance_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return SeafloorCavern_Entrance_EventScript_23452E:: @ 823452E - applymovement 1, SeafloorCavern_Entrance_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return SeafloorCavern_Entrance_EventScript_234539:: @ 8234539 - applymovement 1, SeafloorCavern_Entrance_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 6ab802ee48..f246900d83 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 setvar VAR_0x8007, 5 - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_23505C waitmovement 0 @@ -15,15 +15,15 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 msgbox SeafloorCavern_Room9_Text_23505F, MSGBOX_DEFAULT closemessage addobject VAR_0x8004 - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A waitmovement 0 msgbox SeafloorCavern_Room9_Text_23507C, MSGBOX_DEFAULT - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SeafloorCavern_Room9_Text_2350A6, MSGBOX_DEFAULT - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259E + applymovement VAR_0x8004, Common_Movement_FacePlayer waitmovement 0 msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC @@ -47,8 +47,8 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80B0534 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A6 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 150 removeobject 7 @@ -82,7 +82,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8007, 5 msgbox SeafloorCavern_Room9_Text_2352A7, MSGBOX_DEFAULT playse SE_PC_LOGIN - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox SeafloorCavern_Room9_Text_2352F6, MSGBOX_DEFAULT closemessage @@ -92,7 +92,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 closemessage playse SE_PC_OFF delay 20 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725AA + applymovement VAR_0x8004, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox SeafloorCavern_Room9_Text_23546F, MSGBOX_DEFAULT closemessage @@ -103,13 +103,13 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_235057 applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_23504E waitmovement 0 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A4 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox SeafloorCavern_Room9_Text_2354F0, MSGBOX_DEFAULT playse SE_PIN - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_272598 + applymovement VAR_0x8004, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259A + applymovement VAR_0x8004, Common_Movement_Delay48 waitmovement 0 msgbox SeafloorCavern_Room9_Text_2355C2, MSGBOX_DEFAULT msgbox SeafloorCavern_Room9_Text_235692, MSGBOX_DEFAULT diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index f65d0d4ecb..a6e7b05cc0 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -36,7 +36,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 lockall applymovement 1, SkyPillar_Outside_Movement_2393D3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT closemessage @@ -60,13 +60,13 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 special sub_8139560 waitstate delay 20 - applymovement 1, SkyPillar_Outside_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 10 - applymovement 1, SkyPillar_Outside_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 - applymovement 1, SkyPillar_Outside_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 4ca4c4681d..a878b2efcb 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -94,7 +94,7 @@ SkyPillar_Top_EventScript_239785:: @ 8239785 SkyPillar_Top_EventScript_23979A:: @ 823979A lockall fadeoutbgm 1 - applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Top_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 special SpawnCameraObject applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_239858 diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 2e7859fba2..efce9cde82 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -61,11 +61,11 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C waitmovement 0 msgbox SlateportCity_Text_1DF032, MSGBOX_DEFAULT closemessage - applymovement 35, SlateportCity_Movement_2725A4 + applymovement 35, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 60 msgbox SlateportCity_Text_1DF0FE, MSGBOX_DEFAULT - applymovement 35, SlateportCity_Movement_2725A8 + applymovement 35, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox SlateportCity_Text_1DF12B, MSGBOX_DEFAULT closemessage @@ -359,7 +359,7 @@ SlateportCity_EventScript_1DD009:: @ 81DD009 faceplayer msgbox SlateportCity_Text_1DDC4F, MSGBOX_DEFAULT closemessage - applymovement 5, SlateportCity_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -369,7 +369,7 @@ SlateportCity_EventScript_1DD020:: @ 81DD020 faceplayer msgbox SlateportCity_Text_1DDC8A, MSGBOX_DEFAULT closemessage - applymovement 18, SlateportCity_Movement_2725A2 + applymovement 18, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -379,7 +379,7 @@ SlateportCity_EventScript_1DD037:: @ 81DD037 faceplayer msgbox SlateportCity_Text_1DDCD5, MSGBOX_DEFAULT closemessage - applymovement 19, SlateportCity_Movement_2725A2 + applymovement 19, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -389,7 +389,7 @@ SlateportCity_EventScript_1DD04E:: @ 81DD04E faceplayer msgbox SlateportCity_Text_1DDD18, MSGBOX_DEFAULT closemessage - applymovement 26, SlateportCity_Movement_2725A2 + applymovement 26, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -399,7 +399,7 @@ SlateportCity_EventScript_1DD065:: @ 81DD065 faceplayer msgbox SlateportCity_Text_1DDD7D, MSGBOX_DEFAULT closemessage - applymovement 27, SlateportCity_Movement_2725A2 + applymovement 27, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -409,7 +409,7 @@ SlateportCity_EventScript_1DD07C:: @ 81DD07C faceplayer msgbox SlateportCity_Text_1DDDC0, MSGBOX_DEFAULT closemessage - applymovement 28, SlateportCity_Movement_2725A2 + applymovement 28, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -419,7 +419,7 @@ SlateportCity_EventScript_1DD093:: @ 81DD093 faceplayer msgbox SlateportCity_Text_1DDDDF, MSGBOX_DEFAULT closemessage - applymovement 29, SlateportCity_Movement_2725A2 + applymovement 29, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -429,7 +429,7 @@ SlateportCity_EventScript_1DD0AA:: @ 81DD0AA faceplayer msgbox SlateportCity_Text_1DDE2F, MSGBOX_DEFAULT closemessage - applymovement 30, SlateportCity_Movement_2725A2 + applymovement 30, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -438,31 +438,31 @@ SlateportCity_EventScript_1DD0C1:: @ 81DD0C1 lock faceplayer playse SE_PIN - applymovement 31, SlateportCity_Movement_272598 + applymovement 31, Common_Movement_ExclamationMark waitmovement 0 - applymovement 31, SlateportCity_Movement_27259A + applymovement 31, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_Text_1DDE6E, MSGBOX_DEFAULT closemessage - applymovement 31, SlateportCity_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 applymovement 31, SlateportCity_Movement_1DD147 waitmovement 0 - applymovement 31, SlateportCity_Movement_27259E + applymovement 31, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_Text_1DDE86, MSGBOX_DEFAULT closemessage - applymovement 31, SlateportCity_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 applymovement 31, SlateportCity_Movement_1DD147 waitmovement 0 msgbox SlateportCity_Text_1DDEB8, MSGBOX_DEFAULT closemessage - applymovement 31, SlateportCity_Movement_27259E + applymovement 31, Common_Movement_FacePlayer waitmovement 0 applymovement 31, SlateportCity_Movement_1DD147 waitmovement 0 - applymovement 31, SlateportCity_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -481,7 +481,7 @@ SlateportCity_EventScript_1DD153:: @ 81DD153 faceplayer msgbox SlateportCity_Text_1DDF8D, MSGBOX_DEFAULT closemessage - applymovement 33, SlateportCity_Movement_2725A2 + applymovement 33, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -563,10 +563,10 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 msgbox SlateportCity_Text_1DE502, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE54A, MSGBOX_DEFAULT closemessage - applymovement 10, SlateportCity_Movement_2725A8 + applymovement 10, Common_Movement_WalkInPlaceRight waitmovement 0 delay 10 - applymovement 9, SlateportCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 delay 25 applymovement 11, SlateportCity_Movement_1DD33C @@ -577,26 +577,26 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 removeobject 10 removeobject 9 msgbox SlateportCity_Text_1DE5F7, MSGBOX_DEFAULT - applymovement 11, SlateportCity_Movement_2725A6 + applymovement 11, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SlateportCity_Text_1DE64F, MSGBOX_DEFAULT playbgm MUS_AQA_0, 0 msgbox SlateportCity_Text_1DE724, MSGBOX_DEFAULT - applymovement 6, SlateportCity_Movement_2725A4 - applymovement 1, SlateportCity_Movement_2725A4 + applymovement 6, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceLeft applymovement 7, SlateportCity_Movement_1DD309 applymovement 3, SlateportCity_Movement_272596 applymovement 2, SlateportCity_Movement_1DD311 waitmovement 0 - applymovement 11, SlateportCity_Movement_2725AA + applymovement 11, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox SlateportCity_Text_1DE7F7, MSGBOX_DEFAULT playse SE_PIN - applymovement 11, SlateportCity_Movement_272598 + applymovement 11, Common_Movement_ExclamationMark waitmovement 0 - applymovement 11, SlateportCity_Movement_27259A + applymovement 11, Common_Movement_Delay48 waitmovement 0 - applymovement 11, SlateportCity_Movement_2725A6 + applymovement 11, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SlateportCity_Text_1DE860, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE8A0, MSGBOX_DEFAULT @@ -885,7 +885,7 @@ SlateportCity_EventScript_1DD5CE:: @ 81DD5CE SlateportCity_EventScript_1DD5DC:: @ 81DD5DC lockall - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 opendoor 10, 12 waitdooranim diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 4bd28996b2..400146b3bb 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -44,7 +44,7 @@ SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 msgbox SlateportCity_BattleTentCorridor_Text_25AB96, MSGBOX_DEFAULT closemessage - applymovement 1, SlateportCity_BattleTentCorridor_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor 2, 1 waitdooranim diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 771cc149f2..138ca9859c 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -48,10 +48,10 @@ SlateportCity_Harbor_EventScript_20C9DF:: @ 820C9DF end SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 - applymovement 7, SlateportCity_Harbor_Movement_2725AA + applymovement 7, Common_Movement_WalkInPlaceDown waitmovement 0 - applymovement 6, SlateportCity_Harbor_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A6 + applymovement 6, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SlateportCity_Harbor_Text_20D291, MSGBOX_DEFAULT closemessage @@ -85,21 +85,21 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 SlateportCity_Harbor_EventScript_20CA89:: @ 820CA89 applymovement 4, SlateportCity_Harbor_Movement_20CAE0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return SlateportCity_Harbor_EventScript_20CA9E:: @ 820CA9E applymovement 4, SlateportCity_Harbor_Movement_20CAE6 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3 applymovement 4, SlateportCity_Harbor_Movement_20CAEB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -226,7 +226,7 @@ SlateportCity_Harbor_EventScript_20CBDD:: @ 820CBDD SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 msgbox SlateportCity_Harbor_Text_20CFCB, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A6 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR @@ -300,7 +300,7 @@ SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 goto_if_eq SlateportCity_Harbor_EventScript_20CCDF msgbox SlateportCity_Harbor_Text_20D232, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index b574ce4489..05445cfbfd 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_20AD96:: @ 820AD96 SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F lockall - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 end SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0 lockall - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 end @@ -155,9 +155,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 faceplayer delay 8 playse SE_PIN - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_272598 + applymovement 13, Common_Movement_ExclamationMark waitmovement 0 - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_27259A + applymovement 13, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, MSGBOX_DEFAULT giveitem_std ITEM_TM46 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 204ffb4ebd..641c4dd86f 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -43,8 +43,8 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_20BF66 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF waitmovement 0 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_2725AA - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceDown + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, MSGBOX_DEFAULT closemessage @@ -68,7 +68,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 fadescreen 0 delay 30 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, MSGBOX_DEFAULT setvar VAR_0x8004, 269 @@ -96,12 +96,12 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BC8C:: @ 820BC8C return SlateportCity_OceanicMuseum_2F_EventScript_20BC92:: @ 820BC92 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return SlateportCity_OceanicMuseum_2F_EventScript_20BC9D:: @ 820BC9D - applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -268,7 +268,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BD76:: @ 820BD76 faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_20C4C2, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index c63ef37067..4bc1b86604 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -211,9 +211,9 @@ SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 playse SE_PIN - applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_272598 + applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_27259A + applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_20AB63, MSGBOX_DEFAULT giveitem_std ITEM_SOOTHE_BELL diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc index adf1bd3a26..6c554387af 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc @@ -8,11 +8,11 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FD9 goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FBA msgbox SlateportCity_SternsShipyard_1F_Text_208008, MSGBOX_DEFAULT - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_2080A5, MSGBOX_DEFAULT closemessage - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_DOCK_REJECTED_DEVON_GOODS setflag FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA @@ -20,31 +20,31 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 end SlateportCity_SternsShipyard_1F_EventScript_207F92:: @ 8207F92 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_208323, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FA6:: @ 8207FA6 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_2082A8, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FBA:: @ 8207FBA - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_2081A5, MSGBOX_DEFAULT closemessage - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FD9:: @ 8207FD9 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_208213, MSGBOX_DEFAULT releaseall diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index bdc36c4689..bfebcf0559 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -219,8 +219,8 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 setvar VAR_0x8004, 0 special sub_813B7D8 waitstate - applymovement 10, SootopolisCity_Movement_2725A4 - applymovement 9, SootopolisCity_Movement_2725A8 + applymovement 10, Common_Movement_WalkInPlaceLeft + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 delay 60 waitse @@ -319,8 +319,8 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 setvar VAR_0x8004, 0 special sub_813B7D8 waitstate - applymovement 10, SootopolisCity_Movement_2725A4 - applymovement 9, SootopolisCity_Movement_2725A8 + applymovement 10, Common_Movement_WalkInPlaceLeft + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 delay 60 waitse @@ -730,7 +730,7 @@ SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 goto_if_eq SootopolisCity_EventScript_1E5F10 msgbox SootopolisCity_Text_1E6BFF, MSGBOX_DEFAULT closemessage - applymovement 3, SootopolisCity_Movement_2725A2 + applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -792,13 +792,13 @@ SootopolisCity_EventScript_1E5FD8:: @ 81E5FD8 SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2 lockall - applymovement 2, SootopolisCity_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E600D msgbox SootopolisCity_Text_1E71A1, MSGBOX_DEFAULT closemessage - applymovement 2, SootopolisCity_Movement_2725A2 + applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -838,7 +838,7 @@ SootopolisCity_EventScript_1E6038:: @ 81E6038 SootopolisCity_EventScript_1E6065:: @ 81E6065 msgbox SootopolisCity_Text_1E7078, MSGBOX_DEFAULT closemessage - applymovement 8, SootopolisCity_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -855,7 +855,7 @@ SootopolisCity_EventScript_1E6084:: @ 81E6084 SootopolisCity_EventScript_1E608E:: @ 81E608E lockall - applymovement 4, SootopolisCity_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E60D9 @@ -865,7 +865,7 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E goto_if_le SootopolisCity_EventScript_1E60CF msgbox SootopolisCity_Text_1E690B, MSGBOX_DEFAULT closemessage - applymovement 4, SootopolisCity_Movement_2725A2 + applymovement 4, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -882,7 +882,7 @@ SootopolisCity_EventScript_1E60D9:: @ 81E60D9 SootopolisCity_EventScript_1E60E3:: @ 81E60E3 lockall - applymovement 5, SootopolisCity_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E612D @@ -893,7 +893,7 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3 goto_if_le SootopolisCity_EventScript_1E6141 msgbox SootopolisCity_Text_1E6692, MSGBOX_DEFAULT closemessage - applymovement 5, SootopolisCity_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -927,7 +927,7 @@ EventScript_ClosedSootopolisDoor:: @ 81E615D SootopolisCity_EventScript_1E6166:: @ 81E6166 lockall - applymovement 7, SootopolisCity_Movement_27259E + applymovement 7, Common_Movement_FacePlayer waitmovement 0 call_if_unset FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_1E61CC compare VAR_0x405E, 2 @@ -1261,13 +1261,13 @@ SootopolisCity_Movement_1E635A: @ 81E635A SootopolisCity_EventScript_1E635D:: @ 81E635D lockall - applymovement 15, SootopolisCity_Movement_27259E + applymovement 15, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E6388 msgbox SootopolisCity_Text_1E67DC, MSGBOX_DEFAULT closemessage - applymovement 15, SootopolisCity_Movement_2725A2 + applymovement 15, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -1284,17 +1284,17 @@ SootopolisCity_EventScript_1E6393:: @ 81E6393 goto_if_eq SootopolisCity_EventScript_1E63C7 msgbox SootopolisCity_Text_1E6936, MSGBOX_DEFAULT closemessage - applymovement 14, SootopolisCity_Movement_27259E + applymovement 14, Common_Movement_FacePlayer waitmovement 0 msgbox SootopolisCity_Text_1E696C, MSGBOX_DEFAULT closemessage - applymovement 14, SootopolisCity_Movement_2725A2 + applymovement 14, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end SootopolisCity_EventScript_1E63C7:: @ 81E63C7 - applymovement 14, SootopolisCity_Movement_27259E + applymovement 14, Common_Movement_FacePlayer waitmovement 0 msgbox SootopolisCity_Text_1E69B8, MSGBOX_DEFAULT releaseall @@ -1302,13 +1302,13 @@ SootopolisCity_EventScript_1E63C7:: @ 81E63C7 SootopolisCity_EventScript_1E63DB:: @ 81E63DB lockall - applymovement 13, SootopolisCity_Movement_27259E + applymovement 13, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E6406 msgbox SootopolisCity_Text_1E6C7C, MSGBOX_DEFAULT closemessage - applymovement 13, SootopolisCity_Movement_2725A2 + applymovement 13, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -1321,13 +1321,13 @@ SootopolisCity_EventScript_1E6406:: @ 81E6406 SootopolisCity_EventScript_1E6411:: @ 81E6411 lockall - applymovement 12, SootopolisCity_Movement_27259E + applymovement 12, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E643C msgbox SootopolisCity_Text_1E6A50, MSGBOX_DEFAULT closemessage - applymovement 12, SootopolisCity_Movement_2725A2 + applymovement 12, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 0eb4ffaef7..a44615e9fd 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -37,7 +37,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21 waitmovement 0 moveobjectoffscreen 1 - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 compare VAR_0x40C0, 1 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04 diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index 388410821f..8eb00337f4 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -14,7 +14,7 @@ SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 goto_if_eq SouthernIsland_Exterior_EventScript_242A17 msgbox SouthernIsland_Exterior_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index a3164136dd..7478097bf9 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -25,7 +25,7 @@ TerraCave_End_EventScript_23B0E3:: @ 823B0E3 TerraCave_End_EventScript_23B0EC:: @ 823B0EC lockall - applymovement EVENT_OBJ_ID_PLAYER, TerraCave_End_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 1, TerraCave_End_Movement_23B16E waitmovement 0 diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index c929633dd0..74aa613c78 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -12,14 +12,14 @@ VerdanturfTown_EventScript_1EB575:: @ 81EB575 faceplayer goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_1EB594 msgbox VerdanturfTown_Text_1EB5FD, MSGBOX_DEFAULT - applymovement 2, VerdanturfTown_Movement_2725A2 + applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 release end VerdanturfTown_EventScript_1EB594:: @ 81EB594 msgbox VerdanturfTown_Text_1EB6E0, MSGBOX_DEFAULT - applymovement 2, VerdanturfTown_Movement_2725A2 + applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 52aed76181..c5f3186637 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -77,8 +77,8 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581 waitmovement 0 removeobject 2 - applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725AA - applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, MSGBOX_DEFAULT special LoadPlayerParty @@ -121,8 +121,8 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8:: @ 82024B8 case 127, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA:: @ 82024EA - applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8 - applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8 + applymovement 3, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 closemessage goto VerdanturfTown_BattleTentBattleRoom_EventScript_20236F diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 2d1c630273..fdb0947d8e 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -38,7 +38,7 @@ VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8 end VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 - applymovement EVENT_OBJ_ID_PLAYER, VictoryRoad_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 79747540d1..8499528b7b 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -328,7 +328,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276DD5:: @ 8276DD5 OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0 lockall - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT closemessage diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 39de44ba63..ee0e533bc1 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -232,13 +232,13 @@ Route111_EventScript_28CF94:: @ 828CF94 Route111_EventScript_28CF9F:: @ 828CF9F applymovement VAR_0x8004, Route111_Movement_28D04F - applymovement VAR_0x8005, Route111_Movement_2725A6 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceUp waitmovement 0 return Route111_EventScript_28CFB1:: @ 828CFB1 applymovement VAR_0x8004, Route111_Movement_28D051 - applymovement VAR_0x8005, Route111_Movement_2725A4 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 985a2f93ad..c2abe6eff6 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -6,7 +6,7 @@ LittlerootTown_MaysHouse_2F_EventScript_2926FE:: @ 82926FE LittlerootTown_BrendansHouse_1F_EventScript_292704:: @ 8292704 LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_27259E + applymovement VAR_0x8004, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x8005, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_29274D @@ -16,18 +16,18 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 closemessage setvar VAR_0x4092, 4 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763 - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end LittlerootTown_BrendansHouse_1F_EventScript_29274D:: @ 829274D - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -39,7 +39,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765 LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AF0 waitmovement 0 releaseall @@ -82,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292850 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT closemessage @@ -95,7 +95,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_29285B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT closemessage @@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292866:: @ 8292866 end LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceRight waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_29294B applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE0 @@ -167,7 +167,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE6 waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_29296C - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT @@ -179,7 +179,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D end LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC - applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2725A4 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_29294B applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AE8 @@ -192,7 +192,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AEE waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_29296C - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT @@ -206,9 +206,9 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC LittlerootTown_BrendansHouse_1F_EventScript_29294B:: @ 829294B LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B playse SE_PIN - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_272598 + applymovement VAR_0x8005, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_27259A + applymovement VAR_0x8005, Common_Movement_Delay48 waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B96, MSGBOX_DEFAULT closemessage @@ -216,7 +216,7 @@ LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT fadedefaultbgm @@ -446,12 +446,12 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D08 compare VAR_0x8008, 1 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D13 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_27259E + applymovement VAR_0x8009, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_272598 + applymovement VAR_0x8009, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_27259A + applymovement VAR_0x8009, Common_Movement_Delay48 waitmovement 0 delay 20 compare VAR_0x8008, 0 @@ -585,28 +585,28 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D13:: @ 8292D13 LittlerootTown_BrendansHouse_1F_EventScript_292D1E:: @ 8292D1E applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD7 waitmovement 0 - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement VAR_0x800A, Common_Movement_WalkInPlaceLeft waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DDE waitmovement 0 - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement VAR_0x800A, Common_Movement_WalkInPlaceRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D48:: @ 8292D48 applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292999 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D5D:: @ 8292D5D applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -623,14 +623,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D7D:: @ 8292D7D LittlerootTown_BrendansHouse_1F_EventScript_292D88:: @ 8292D88 applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929AF waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929B3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 7b8b52cd00..a26ecb4c91 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -333,7 +333,7 @@ EventScript_Pblock1_NoPokeblock: @ 8293D43 LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D lockall setvar VAR_0x8009, 2 - applymovement 10, LilycoveCity_ContestLobby_Movement_2725A2 + applymovement 10, Common_Movement_FaceOriginalDirection applymovement 3, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_293201, MSGBOX_YESNO @@ -398,8 +398,8 @@ LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E lockall setvar VAR_0x8008, 15 setvar VAR_0x8009, 3 - applymovement 9, LilycoveCity_ContestLobby_Movement_2725A2 - applymovement 17, LilycoveCity_ContestLobby_Movement_2725A2 + applymovement 9, Common_Movement_FaceOriginalDirection + applymovement 17, Common_Movement_FaceOriginalDirection applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_YESNO From 04db99bb0a5d79b43a22f5b9ba16a3faabf2b914 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 20:21:26 -0500 Subject: [PATCH 112/217] More misc event names --- data/event_scripts.s | 62 +++++-------------- data/maps/AncientTomb/scripts.inc | 2 +- data/maps/AquaHideout_B1F/scripts.inc | 2 +- .../scripts.inc | 4 +- .../BattleFrontier_OutsideEast/scripts.inc | 2 +- data/maps/BirthIsland_Exterior/scripts.inc | 4 +- data/maps/DesertRuins/scripts.inc | 2 +- .../scripts.inc | 2 +- data/maps/FarawayIsland_Interior/scripts.inc | 4 +- data/maps/IslandCave/scripts.inc | 2 +- data/maps/LilycoveCity_Harbor/scripts.inc | 24 +++---- data/maps/MarineCave_End/scripts.inc | 2 +- data/maps/NavelRock_Bottom/scripts.inc | 4 +- data/maps/NavelRock_Top/scripts.inc | 4 +- data/maps/NewMauville_Inside/scripts.inc | 2 +- data/maps/PacifidlogTown_House2/scripts.inc | 2 +- data/maps/Route119/scripts.inc | 2 +- data/maps/Route120/scripts.inc | 4 +- data/maps/SkyPillar_Top/scripts.inc | 2 +- data/maps/SouthernIsland_Interior/scripts.inc | 2 +- data/maps/TerraCave_End/scripts.inc | 2 +- 21 files changed, 53 insertions(+), 83 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 415541475a..cf5695d3bc 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1205,8 +1205,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE RustboroCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE SlateportCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE VerdanturfTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE - goto_if_unset FLAG_RECEIVED_POKENAV, OldaleTown_PokemonCenter_1F_EventScript_27374E - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, OldaleTown_PokemonCenter_1F_EventScript_27374E + goto_if_unset FLAG_RECEIVED_POKENAV, Common_EventScript_NopReturn + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, Common_EventScript_NopReturn goto_if_unset FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT, OldaleTown_PokemonCenter_1F_EventScript_27190C goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, OldaleTown_PokemonCenter_1F_EventScript_271912 goto_if_unset FLAG_HIDE_ROUTE_108_MR_BRINEY, OldaleTown_PokemonCenter_1F_EventScript_271918 @@ -1948,7 +1948,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD Route101_EventScript_2720AD:: @ 82720AD Route103_EventScript_2720AD:: @ 82720AD compare VAR_0x4085, 0 - goto_if_eq Route101_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A compare VAR_BIRCH_STATE, 0 call_if_eq Route101_EventScript_27211A @@ -2029,7 +2029,7 @@ Route101_EventScript_272184:: @ 8272184 msgbox gUnknown_082A5D2C, MSGBOX_DEFAULT call Route101_EventScript_272179 compare VAR_0x800A, 0 - goto_if_eq Route101_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setvar VAR_0x8004, 1 specialvar VAR_RESULT, ScriptGetPokedexInfo copyvar VAR_0x8008, VAR_0x8005 @@ -2768,28 +2768,7 @@ EventScript_2736F8:: @ 82736F8 waitstate end -AncientTomb_EventScript_27374E:: @ 827374E -AquaHideout_B1F_EventScript_27374E:: @ 827374E -BattleFrontier_BattleDomeBattleRoom_EventScript_27374E:: @ 827374E -BattleFrontier_OutsideEast_EventScript_27374E:: @ 827374E -BirthIsland_Exterior_EventScript_27374E:: @ 827374E -DesertRuins_EventScript_27374E:: @ 827374E -EverGrandeCity_PokemonCenter_1F_EventScript_27374E:: @ 827374E -FarawayIsland_Interior_EventScript_27374E:: @ 827374E -IslandCave_EventScript_27374E:: @ 827374E -LilycoveCity_Harbor_EventScript_27374E:: @ 827374E -MarineCave_End_EventScript_27374E:: @ 827374E -NavelRock_Bottom_EventScript_27374E:: @ 827374E -NavelRock_Top_EventScript_27374E:: @ 827374E -NewMauville_Inside_EventScript_27374E:: @ 827374E -OldaleTown_PokemonCenter_1F_EventScript_27374E:: @ 827374E -PacifidlogTown_House2_EventScript_27374E:: @ 827374E -Route101_EventScript_27374E:: @ 827374E -Route119_EventScript_27374E:: @ 827374E -Route120_EventScript_27374E:: @ 827374E -SkyPillar_Top_EventScript_27374E:: @ 827374E -SouthernIsland_Interior_EventScript_27374E:: @ 827374E -TerraCave_End_EventScript_27374E:: @ 827374E +Common_EventScript_NopReturn:: @ 827374E return EventScript_27374F:: @ 827374F @@ -6652,7 +6631,7 @@ SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16 goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A msgbox SlateportCity_PokemonFanClub_Text_2C6F66, MSGBOX_DEFAULT setvar VAR_0x8005, 23 - call SlateportCity_PokemonFanClub_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A setflag FLAG_MOVE_TUTOR_TAUGHT_SWAGGER @@ -6681,7 +6660,7 @@ MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E goto_if_eq MauvilleCity_EventScript_2C7FD2 msgbox MauvilleCity_Text_2C70F3, MSGBOX_DEFAULT setvar VAR_0x8005, 16 - call MauvilleCity_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq MauvilleCity_EventScript_2C7FD2 setflag FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT @@ -6710,7 +6689,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6 goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, MSGBOX_DEFAULT setvar VAR_0x8005, 29 - call VerdanturfTown_PokemonCenter_1F_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A setflag FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER @@ -6739,7 +6718,7 @@ LavaridgeTown_House_EventScript_2C804E:: @ 82C804E goto_if_eq LavaridgeTown_House_EventScript_2C80A2 msgbox LavaridgeTown_House_Text_2C73B1, MSGBOX_DEFAULT setvar VAR_0x8005, 7 - call LavaridgeTown_House_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq LavaridgeTown_House_EventScript_2C80A2 setflag FLAG_MOVE_TUTOR_TAUGHT_MIMIC @@ -6768,7 +6747,7 @@ FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6 goto_if_eq FallarborTown_Mart_EventScript_2C810A msgbox FallarborTown_Mart_Text_2C7582, MSGBOX_DEFAULT setvar VAR_0x8005, 8 - call FallarborTown_Mart_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq FallarborTown_Mart_EventScript_2C810A setflag FLAG_MOVE_TUTOR_TAUGHT_METRONOME @@ -6797,7 +6776,7 @@ FortreeCity_House2_EventScript_2C811E:: @ 82C811E goto_if_eq FortreeCity_House2_EventScript_2C8172 msgbox FortreeCity_House2_Text_2C7721, MSGBOX_DEFAULT setvar VAR_0x8005, 24 - call FortreeCity_House2_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_2C8172 setflag FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK @@ -6826,7 +6805,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, MSGBOX_DEFAULT setvar VAR_0x8005, 14 - call LilycoveCity_DepartmentStoreRooftop_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA setflag FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE @@ -6855,7 +6834,7 @@ MossdeepCity_EventScript_2C81EE:: @ 82C81EE goto_if_eq MossdeepCity_EventScript_2C8242 msgbox MossdeepCity_Text_2C7B0D, MSGBOX_DEFAULT setvar VAR_0x8005, 15 - call MossdeepCity_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq MossdeepCity_EventScript_2C8242 setflag FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH @@ -6884,7 +6863,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256 goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, MSGBOX_DEFAULT setvar VAR_0x8005, 4 - call SootopolisCity_PokemonCenter_1F_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA setflag FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE @@ -6913,7 +6892,7 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, MSGBOX_DEFAULT setvar VAR_0x8005, 12 - call PacifidlogTown_PokemonCenter_1F_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 setflag FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION @@ -6930,16 +6909,7 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2C831C:: @ 82C831C release end -FallarborTown_Mart_EventScript_2C8326:: @ 82C8326 -FortreeCity_House2_EventScript_2C8326:: @ 82C8326 -LavaridgeTown_House_EventScript_2C8326:: @ 82C8326 -LilycoveCity_DepartmentStoreRooftop_EventScript_2C8326:: @ 82C8326 -MauvilleCity_EventScript_2C8326:: @ 82C8326 -MossdeepCity_EventScript_2C8326:: @ 82C8326 -PacifidlogTown_PokemonCenter_1F_EventScript_2C8326:: @ 82C8326 -SlateportCity_PokemonFanClub_EventScript_2C8326:: @ 82C8326 -SootopolisCity_PokemonCenter_1F_EventScript_2C8326:: @ 82C8326 -VerdanturfTown_PokemonCenter_1F_EventScript_2C8326:: @ 82C8326 +EventScript_ShowPartyMenu:: @ 82C8326 special sub_81B892C waitstate lock diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 241cb50f13..9cc369fb4b 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -11,7 +11,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3 AncientTomb_EventScript_238FCD:: @ 8238FCD specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne AncientTomb_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 1763bcd5da..a74c7a33e0 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -10,7 +10,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 AquaHideout_B1F_EventScript_2339BC:: @ 82339BC specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne AquaHideout_B1F_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 7dbeee0427..e1c5991e71 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -966,14 +966,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919 random 2 copyvar VAR_TEMP_D, VAR_RESULT compare VAR_TEMP_D, 0 - goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setobjectxyperm 6, 2, 0 setobjectmovementtype 6, MOVEMENT_TYPE_FACE_RIGHT return BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938 compare VAR_TEMP_D, 0 - goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E return diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 9a90f23f95..0d493d4e75 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -10,7 +10,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne BattleFrontier_OutsideEast_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 5bff32eb63..a7737654be 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -23,7 +23,7 @@ BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E return BirthIsland_Exterior_EventScript_267F55:: @ 8267F55 - goto_if_set FLAG_DEFEATED_DEOXYS, BirthIsland_Exterior_EventScript_27374E + goto_if_set FLAG_DEFEATED_DEOXYS, Common_EventScript_NopReturn clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE clearflag FLAG_DEOXYS_ROCK_COMPLETE return @@ -35,7 +35,7 @@ BirthIsland_Exterior_MapScript1_267F65: @ 8267F65 BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne BirthIsland_Exterior_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 2 return diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 34ae212245..2ae1f9e2e6 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -11,7 +11,7 @@ DesertRuins_MapScript1_22D96B: @ 822D96B DesertRuins_EventScript_22D975:: @ 822D975 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne DesertRuins_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 0ec0acbb21..f63f636cd1 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -9,7 +9,7 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F end EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C - goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonCenter_1F_EventScript_27374E + goto_if_unset FLAG_BADGE06_GET, Common_EventScript_NopReturn clearflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT return diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index b541ac081f..fdb13d19db 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -33,7 +33,7 @@ FarawayIsland_Interior_MapScript1_267D54: @ 8267D54 FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne FarawayIsland_Interior_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -44,7 +44,7 @@ FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 end FarawayIsland_Interior_EventScript_267D86:: @ 8267D86 - goto_if_set FLAG_DEFEATED_MEW, FarawayIsland_Interior_EventScript_27374E + goto_if_set FLAG_DEFEATED_MEW, Common_EventScript_NopReturn clearflag FLAG_HIDE_MEW setvar VAR_TEMP_1, 0 return diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 3d0efa1ca8..33ae51f8d8 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -11,7 +11,7 @@ IslandCave_MapScript1_238E3A: @ 8238E3A IslandCave_EventScript_238E44:: @ 8238E44 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne IslandCave_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index c1126d5753..ea70156aaa 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -107,45 +107,45 @@ LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 LilycoveCity_Harbor_EventScript_21E194:: @ 821E194 setvar VAR_TEMP_E, 0 - goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_SYS_HAS_EON_TICKET, Common_EventScript_NopReturn checkitem ITEM_EON_TICKET, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setvar VAR_TEMP_E, 1 - goto_if_set FLAG_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_EON_TICKET, Common_EventScript_NopReturn setvar VAR_TEMP_E, 2 return LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6 setvar VAR_TEMP_D, 0 - goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, Common_EventScript_NopReturn checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setvar VAR_TEMP_D, 1 - goto_if_set FLAG_HAS_AURORA_TICKET, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_AURORA_TICKET, Common_EventScript_NopReturn setvar VAR_TEMP_D, 2 return LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8 setvar VAR_TEMP_C, 0 - goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, Common_EventScript_NopReturn checkitem ITEM_OLD_SEA_MAP, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setvar VAR_TEMP_C, 1 - goto_if_set FLAG_HAS_OLD_SEA_MAP, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_OLD_SEA_MAP, Common_EventScript_NopReturn setvar VAR_TEMP_C, 2 return LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A setvar VAR_TEMP_9, 0 - goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, Common_EventScript_NopReturn checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setvar VAR_TEMP_9, 1 - goto_if_set FLAG_HAS_MYSTIC_TICKET, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_MYSTIC_TICKET, Common_EventScript_NopReturn setvar VAR_TEMP_9, 2 return diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index c2c90d5c2f..b66ab17c43 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -10,7 +10,7 @@ MarineCave_End_MapScript1_23AFEA: @ 823AFEA MarineCave_End_EventScript_23AFF4:: @ 823AFF4 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne MarineCave_End_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 1 return diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index cd26de91de..83185bc4d3 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -13,7 +13,7 @@ NavelRock_Bottom_EventScript_269273:: @ 8269273 return NavelRock_Bottom_EventScript_269277:: @ 8269277 - goto_if_set FLAG_DEFEATED_LUGIA, NavelRock_Bottom_EventScript_27374E + goto_if_set FLAG_DEFEATED_LUGIA, Common_EventScript_NopReturn clearflag FLAG_HIDE_LUGIA return @@ -24,7 +24,7 @@ NavelRock_Bottom_MapScript1_269284: @ 8269284 NavelRock_Bottom_EventScript_26928E:: @ 826928E specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne NavelRock_Bottom_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 1 return diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index 423d998a7b..795bcf0e5f 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -15,7 +15,7 @@ NavelRock_Top_EventScript_269131:: @ 8269131 NavelRock_Top_EventScript_26913A:: @ 826913A setvar VAR_TEMP_1, 1 - goto_if_set FLAG_DEFEATED_HO_OH, NavelRock_Top_EventScript_27374E + goto_if_set FLAG_DEFEATED_HO_OH, Common_EventScript_NopReturn setvar VAR_TEMP_1, 0 clearflag FLAG_HIDE_HO_OH return @@ -27,7 +27,7 @@ NavelRock_Top_MapScript1_269151: @ 8269151 NavelRock_Top_EventScript_26915B:: @ 826915B specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne NavelRock_Top_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 1 return diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index b3d9d868f9..38bacbde3b 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -15,7 +15,7 @@ NewMauville_Inside_MapScript1_2373E7: @ 82373E7 NewMauville_Inside_EventScript_237407:: @ 8237407 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne NewMauville_Inside_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index 57169cc170..4f646ff435 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -20,7 +20,7 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792 end PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE - goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_27374E + goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, Common_EventScript_NopReturn specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable compare VAR_RESULT, 0 call_if_eq PacifidlogTown_House2_EventScript_203812 diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index d0ab5f5780..8356df0635 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -10,7 +10,7 @@ Route119_MapScript1_1F442F: @ 81F442F Route119_EventScript_1F4439:: @ 81F4439 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne Route119_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index c16b37691a..5a29c1bb72 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -26,7 +26,7 @@ Route120_EventScript_1F5406:: @ 81F5406 Route120_EventScript_1F5449:: @ 81F5449 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne Route120_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 30 removeobject 36 return @@ -34,7 +34,7 @@ Route120_EventScript_1F5449:: @ 81F5449 Route120_EventScript_1F5460:: @ 81F5460 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne Route120_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index a878b2efcb..de4706f847 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -11,7 +11,7 @@ SkyPillar_Top_MapScript1_2396C8: @ 82396C8 SkyPillar_Top_EventScript_2396D2:: @ 82396D2 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne SkyPillar_Top_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 4f8dba7e58..c5cbe0f5e0 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -10,7 +10,7 @@ SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne SouthernIsland_Interior_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 2 return diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index 7478097bf9..9e88be494e 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -10,7 +10,7 @@ TerraCave_End_MapScript1_23B0BB: @ 823B0BB TerraCave_End_EventScript_23B0C5:: @ 823B0C5 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne TerraCave_End_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 1 return From 8711bc5156f0acda34ed651c78092e0a4f534722 Mon Sep 17 00:00:00 2001 From: tustin2121 Date: Sat, 16 Feb 2019 23:33:00 -0500 Subject: [PATCH 113/217] Document HEALTHBOX_GRX_* in battle_interface.c Most of these are referenced via offsets, like the HP bar, which uses [0 pixels] + (number of pixels) to reference which chunk to draw. Each corresponds to a 16x16 pixel in the graphic named. Up to you guys if you want to rename the constants. --- src/battle_interface.c | 162 ++++++++++++++++++++--------------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/src/battle_interface.c b/src/battle_interface.c index 0eb494db4b..eab91b3480 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -35,125 +35,125 @@ struct TestingBar }; enum -{ - HEALTHBOX_GFX_0, - HEALTHBOX_GFX_1, - HEALTHBOX_GFX_2, - HEALTHBOX_GFX_HP_BAR_GREEN, - HEALTHBOX_GFX_4, - HEALTHBOX_GFX_5, - HEALTHBOX_GFX_6, - HEALTHBOX_GFX_7, - HEALTHBOX_GFX_8, - HEALTHBOX_GFX_9, - HEALTHBOX_GFX_10, - HEALTHBOX_GFX_11, - HEALTHBOX_GFX_12, - HEALTHBOX_GFX_13, - HEALTHBOX_GFX_14, - HEALTHBOX_GFX_15, - HEALTHBOX_GFX_16, - HEALTHBOX_GFX_17, - HEALTHBOX_GFX_18, - HEALTHBOX_GFX_19, - HEALTHBOX_GFX_20, - HEALTHBOX_GFX_STATUS_PSN_BATTLER0, - HEALTHBOX_GFX_22, - HEALTHBOX_GFX_23, - HEALTHBOX_GFX_STATUS_PRZ_BATTLER0, +{ // Corresponds to gHealthboxElementsGfxTable (and the tables after it) in graphics.c + HEALTHBOX_GFX_0, //hpbar.png + HEALTHBOX_GFX_1, //hpbar.png "H" + HEALTHBOX_GFX_2, //hpbar.png "P" + HEALTHBOX_GFX_HP_BAR_GREEN, //hpbar.png [0 pixels] + HEALTHBOX_GFX_4, //hpbar.png [1 pixels] + HEALTHBOX_GFX_5, //hpbar.png [2 pixels] + HEALTHBOX_GFX_6, //hpbar.png [3 pixels] + HEALTHBOX_GFX_7, //hpbar.png [4 pixels] + HEALTHBOX_GFX_8, //hpbar.png [5 pixels] + HEALTHBOX_GFX_9, //hpbar.png [6 pixels] + HEALTHBOX_GFX_10, //hpbar.png [7 pixels] + HEALTHBOX_GFX_11, //hpbar.png [8 pixels] + HEALTHBOX_GFX_12, //expbar.png [0 pixels] + HEALTHBOX_GFX_13, //expbar.png [1 pixels] + HEALTHBOX_GFX_14, //expbar.png [2 pixels] + HEALTHBOX_GFX_15, //expbar.png [3 pixels] + HEALTHBOX_GFX_16, //expbar.png [4 pixels] + HEALTHBOX_GFX_17, //expbar.png [5 pixels] + HEALTHBOX_GFX_18, //expbar.png [6 pixels] + HEALTHBOX_GFX_19, //expbar.png [7 pixels] + HEALTHBOX_GFX_20, //expbar.png [8 pixels] + HEALTHBOX_GFX_STATUS_PSN_BATTLER0, //status_psn.png "(P" + HEALTHBOX_GFX_22, //status_psn.png "SN" + HEALTHBOX_GFX_23, //status_psn.png "|)"" + HEALTHBOX_GFX_STATUS_PRZ_BATTLER0, //status_prz.png HEALTHBOX_GFX_25, HEALTHBOX_GFX_26, - HEALTHBOX_GFX_STATUS_SLP_BATTLER0, + HEALTHBOX_GFX_STATUS_SLP_BATTLER0, //status_slp.png HEALTHBOX_GFX_28, HEALTHBOX_GFX_29, - HEALTHBOX_GFX_STATUS_FRZ_BATTLER0, + HEALTHBOX_GFX_STATUS_FRZ_BATTLER0, //status_frz.png HEALTHBOX_GFX_31, HEALTHBOX_GFX_32, - HEALTHBOX_GFX_STATUS_BRN_BATTLER0, + HEALTHBOX_GFX_STATUS_BRN_BATTLER0, //status_brn.png HEALTHBOX_GFX_34, HEALTHBOX_GFX_35, - HEALTHBOX_GFX_36, - HEALTHBOX_GFX_37, - HEALTHBOX_GFX_38, - HEALTHBOX_GFX_39, - HEALTHBOX_GFX_40, - HEALTHBOX_GFX_41, - HEALTHBOX_GFX_42, - HEALTHBOX_GFX_43, - HEALTHBOX_GFX_44, - HEALTHBOX_GFX_45, - HEALTHBOX_GFX_46, - HEALTHBOX_GFX_HP_BAR_YELLOW, - HEALTHBOX_GFX_48, - HEALTHBOX_GFX_49, - HEALTHBOX_GFX_50, - HEALTHBOX_GFX_51, - HEALTHBOX_GFX_52, - HEALTHBOX_GFX_53, - HEALTHBOX_GFX_54, - HEALTHBOX_GFX_55, - HEALTHBOX_GFX_HP_BAR_RED, - HEALTHBOX_GFX_57, - HEALTHBOX_GFX_58, - HEALTHBOX_GFX_59, - HEALTHBOX_GFX_60, - HEALTHBOX_GFX_61, - HEALTHBOX_GFX_62, - HEALTHBOX_GFX_63, - HEALTHBOX_GFX_64, - HEALTHBOX_GFX_65, - HEALTHBOX_GFX_66, - HEALTHBOX_GFX_67, - HEALTHBOX_GFX_68, - HEALTHBOX_GFX_69, - HEALTHBOX_GFX_70, - HEALTHBOX_GFX_STATUS_PSN_BATTLER1, + HEALTHBOX_GFX_36, //misc.png [Black] + HEALTHBOX_GFX_37, //misc.png [Black] + HEALTHBOX_GFX_38, //misc.png [Black] + HEALTHBOX_GFX_39, //misc.png [Blank Health Window] + HEALTHBOX_GFX_40, //misc.png [Blank Health Window] + HEALTHBOX_GFX_41, //misc.png [Blank Health Window] + HEALTHBOX_GFX_42, //misc.png [Blank Health Window] + HEALTHBOX_GFX_43, //misc.png [Top of Health Window] + HEALTHBOX_GFX_44, //misc.png [Top of Health Window] + HEALTHBOX_GFX_45, //misc.png [Top of Health Window] + HEALTHBOX_GFX_46, //misc.png [Blank Health Window] + HEALTHBOX_GFX_HP_BAR_YELLOW, //hpbar_anim.png [0 pixels] + HEALTHBOX_GFX_48, //hpbar_anim.png [1 pixels] + HEALTHBOX_GFX_49, //hpbar_anim.png [2 pixels] + HEALTHBOX_GFX_50, //hpbar_anim.png [3 pixels] + HEALTHBOX_GFX_51, //hpbar_anim.png [4 pixels] + HEALTHBOX_GFX_52, //hpbar_anim.png [5 pixels] + HEALTHBOX_GFX_53, //hpbar_anim.png [6 pixels] + HEALTHBOX_GFX_54, //hpbar_anim.png [7 pixels] + HEALTHBOX_GFX_55, //hpbar_anim.png [8 pixels] + HEALTHBOX_GFX_HP_BAR_RED, //hpbar_anim.png [0 pixels yellow] + HEALTHBOX_GFX_57, //hpbar_anim.png [1 pixels yellow] + HEALTHBOX_GFX_58, //hpbar_anim.png [2 pixels yellow] + HEALTHBOX_GFX_59, //hpbar_anim.png [3 pixels yellow] + HEALTHBOX_GFX_60, //hpbar_anim.png [4 pixels yellow] + HEALTHBOX_GFX_61, //hpbar_anim.png [5 pixels yellow] + HEALTHBOX_GFX_62, //hpbar_anim.png [6 pixels yellow] + HEALTHBOX_GFX_63, //hpbar_anim.png [7 pixels yellow] + HEALTHBOX_GFX_64, //hpbar_anim.png [8 pixels yellow] + HEALTHBOX_GFX_65, //misc_frameend.png + HEALTHBOX_GFX_66, //ball_display.png [full] + HEALTHBOX_GFX_67, //ball_display.png [empty] + HEALTHBOX_GFX_68, //ball_display.png [fainted] + HEALTHBOX_GFX_69, //ball_display.png [statused] + HEALTHBOX_GFX_70, //ball_display_unused_extra.png + HEALTHBOX_GFX_STATUS_PSN_BATTLER1, //status2.png "PSN" HEALTHBOX_GFX_72, HEALTHBOX_GFX_73, - HEALTHBOX_GFX_STATUS_PRZ_BATTLER1, + HEALTHBOX_GFX_STATUS_PRZ_BATTLER1, //status2.png "PRZ" HEALTHBOX_GFX_75, HEALTHBOX_GFX_76, - HEALTHBOX_GFX_STATUS_SLP_BATTLER1, + HEALTHBOX_GFX_STATUS_SLP_BATTLER1, //status2.png "SLP" HEALTHBOX_GFX_78, HEALTHBOX_GFX_79, - HEALTHBOX_GFX_STATUS_FRZ_BATTLER1, + HEALTHBOX_GFX_STATUS_FRZ_BATTLER1, //status2.png "FRZ" HEALTHBOX_GFX_81, HEALTHBOX_GFX_82, - HEALTHBOX_GFX_STATUS_BRN_BATTLER1, + HEALTHBOX_GFX_STATUS_BRN_BATTLER1, //status2.png "BRN" HEALTHBOX_GFX_84, HEALTHBOX_GFX_85, - HEALTHBOX_GFX_STATUS_PSN_BATTLER2, + HEALTHBOX_GFX_STATUS_PSN_BATTLER2, //status3.png "PSN" HEALTHBOX_GFX_87, HEALTHBOX_GFX_88, - HEALTHBOX_GFX_STATUS_PRZ_BATTLER2, + HEALTHBOX_GFX_STATUS_PRZ_BATTLER2, //status3.png "PRZ" HEALTHBOX_GFX_90, HEALTHBOX_GFX_91, - HEALTHBOX_GFX_STATUS_SLP_BATTLER2, + HEALTHBOX_GFX_STATUS_SLP_BATTLER2, //status3.png "SLP" HEALTHBOX_GFX_93, HEALTHBOX_GFX_94, - HEALTHBOX_GFX_STATUS_FRZ_BATTLER2, + HEALTHBOX_GFX_STATUS_FRZ_BATTLER2, //status3.png "FRZ" HEALTHBOX_GFX_96, HEALTHBOX_GFX_97, - HEALTHBOX_GFX_STATUS_BRN_BATTLER2, + HEALTHBOX_GFX_STATUS_BRN_BATTLER2, //status3.png "BRN" HEALTHBOX_GFX_99, HEALTHBOX_GFX_100, - HEALTHBOX_GFX_STATUS_PSN_BATTLER3, + HEALTHBOX_GFX_STATUS_PSN_BATTLER3, //status4.png "PSN" HEALTHBOX_GFX_102, HEALTHBOX_GFX_103, - HEALTHBOX_GFX_STATUS_PRZ_BATTLER3, + HEALTHBOX_GFX_STATUS_PRZ_BATTLER3, //status4.png "PRZ" HEALTHBOX_GFX_105, HEALTHBOX_GFX_106, - HEALTHBOX_GFX_STATUS_SLP_BATTLER3, + HEALTHBOX_GFX_STATUS_SLP_BATTLER3, //status4.png "SLP" HEALTHBOX_GFX_108, HEALTHBOX_GFX_109, - HEALTHBOX_GFX_STATUS_FRZ_BATTLER3, + HEALTHBOX_GFX_STATUS_FRZ_BATTLER3, //status4.png "FRZ" HEALTHBOX_GFX_111, HEALTHBOX_GFX_112, - HEALTHBOX_GFX_STATUS_BRN_BATTLER3, + HEALTHBOX_GFX_STATUS_BRN_BATTLER3, //status4.png "BRN" HEALTHBOX_GFX_114, HEALTHBOX_GFX_115, - HEALTHBOX_GFX_116, - HEALTHBOX_GFX_117, + HEALTHBOX_GFX_116, //unknown_D12FEC.png + HEALTHBOX_GFX_117, //unknown_D1300C.png }; extern const u8 *const gNatureNamePointers[]; From 4a785e66ba0d7f5f5b48705a72895a8a9a934363 Mon Sep 17 00:00:00 2001 From: Tustin2121 Date: Sat, 23 Feb 2019 20:01:48 -0500 Subject: [PATCH 114/217] Changing descriptions to not be file names --- src/battle_interface.c | 161 +++++++++++++++++++++-------------------- 1 file changed, 81 insertions(+), 80 deletions(-) diff --git a/src/battle_interface.c b/src/battle_interface.c index eab91b3480..4a6ac67f1f 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -36,124 +36,125 @@ struct TestingBar enum { // Corresponds to gHealthboxElementsGfxTable (and the tables after it) in graphics.c - HEALTHBOX_GFX_0, //hpbar.png - HEALTHBOX_GFX_1, //hpbar.png "H" - HEALTHBOX_GFX_2, //hpbar.png "P" - HEALTHBOX_GFX_HP_BAR_GREEN, //hpbar.png [0 pixels] - HEALTHBOX_GFX_4, //hpbar.png [1 pixels] - HEALTHBOX_GFX_5, //hpbar.png [2 pixels] - HEALTHBOX_GFX_6, //hpbar.png [3 pixels] - HEALTHBOX_GFX_7, //hpbar.png [4 pixels] - HEALTHBOX_GFX_8, //hpbar.png [5 pixels] - HEALTHBOX_GFX_9, //hpbar.png [6 pixels] - HEALTHBOX_GFX_10, //hpbar.png [7 pixels] - HEALTHBOX_GFX_11, //hpbar.png [8 pixels] - HEALTHBOX_GFX_12, //expbar.png [0 pixels] - HEALTHBOX_GFX_13, //expbar.png [1 pixels] - HEALTHBOX_GFX_14, //expbar.png [2 pixels] - HEALTHBOX_GFX_15, //expbar.png [3 pixels] - HEALTHBOX_GFX_16, //expbar.png [4 pixels] - HEALTHBOX_GFX_17, //expbar.png [5 pixels] - HEALTHBOX_GFX_18, //expbar.png [6 pixels] - HEALTHBOX_GFX_19, //expbar.png [7 pixels] - HEALTHBOX_GFX_20, //expbar.png [8 pixels] - HEALTHBOX_GFX_STATUS_PSN_BATTLER0, //status_psn.png "(P" - HEALTHBOX_GFX_22, //status_psn.png "SN" - HEALTHBOX_GFX_23, //status_psn.png "|)"" - HEALTHBOX_GFX_STATUS_PRZ_BATTLER0, //status_prz.png + // These are indexes into the tables, which are filled with 8x8 square pixel data. + HEALTHBOX_GFX_0, //hp bar [black section] + HEALTHBOX_GFX_1, //hp bar "H" + HEALTHBOX_GFX_2, //hp bar "P" + HEALTHBOX_GFX_HP_BAR_GREEN, //hp bar [0 pixels] + HEALTHBOX_GFX_4, //hp bar [1 pixels] + HEALTHBOX_GFX_5, //hp bar [2 pixels] + HEALTHBOX_GFX_6, //hp bar [3 pixels] + HEALTHBOX_GFX_7, //hp bar [4 pixels] + HEALTHBOX_GFX_8, //hp bar [5 pixels] + HEALTHBOX_GFX_9, //hp bar [6 pixels] + HEALTHBOX_GFX_10, //hp bar [7 pixels] + HEALTHBOX_GFX_11, //hp bar [8 pixels] + HEALTHBOX_GFX_12, //exp bar [0 pixels] + HEALTHBOX_GFX_13, //exp bar [1 pixels] + HEALTHBOX_GFX_14, //exp bar [2 pixels] + HEALTHBOX_GFX_15, //exp bar [3 pixels] + HEALTHBOX_GFX_16, //exp bar [4 pixels] + HEALTHBOX_GFX_17, //exp bar [5 pixels] + HEALTHBOX_GFX_18, //exp bar [6 pixels] + HEALTHBOX_GFX_19, //exp bar [7 pixels] + HEALTHBOX_GFX_20, //exp bar [8 pixels] + HEALTHBOX_GFX_STATUS_PSN_BATTLER0, //status psn "(P" + HEALTHBOX_GFX_22, //status psn "SN" + HEALTHBOX_GFX_23, //status psn "|)"" + HEALTHBOX_GFX_STATUS_PRZ_BATTLER0, //status prz HEALTHBOX_GFX_25, HEALTHBOX_GFX_26, - HEALTHBOX_GFX_STATUS_SLP_BATTLER0, //status_slp.png + HEALTHBOX_GFX_STATUS_SLP_BATTLER0, //status slp HEALTHBOX_GFX_28, HEALTHBOX_GFX_29, - HEALTHBOX_GFX_STATUS_FRZ_BATTLER0, //status_frz.png + HEALTHBOX_GFX_STATUS_FRZ_BATTLER0, //status frz HEALTHBOX_GFX_31, HEALTHBOX_GFX_32, - HEALTHBOX_GFX_STATUS_BRN_BATTLER0, //status_brn.png + HEALTHBOX_GFX_STATUS_BRN_BATTLER0, //status brn HEALTHBOX_GFX_34, HEALTHBOX_GFX_35, - HEALTHBOX_GFX_36, //misc.png [Black] - HEALTHBOX_GFX_37, //misc.png [Black] - HEALTHBOX_GFX_38, //misc.png [Black] - HEALTHBOX_GFX_39, //misc.png [Blank Health Window] - HEALTHBOX_GFX_40, //misc.png [Blank Health Window] - HEALTHBOX_GFX_41, //misc.png [Blank Health Window] - HEALTHBOX_GFX_42, //misc.png [Blank Health Window] - HEALTHBOX_GFX_43, //misc.png [Top of Health Window] - HEALTHBOX_GFX_44, //misc.png [Top of Health Window] - HEALTHBOX_GFX_45, //misc.png [Top of Health Window] - HEALTHBOX_GFX_46, //misc.png [Blank Health Window] - HEALTHBOX_GFX_HP_BAR_YELLOW, //hpbar_anim.png [0 pixels] - HEALTHBOX_GFX_48, //hpbar_anim.png [1 pixels] - HEALTHBOX_GFX_49, //hpbar_anim.png [2 pixels] - HEALTHBOX_GFX_50, //hpbar_anim.png [3 pixels] - HEALTHBOX_GFX_51, //hpbar_anim.png [4 pixels] - HEALTHBOX_GFX_52, //hpbar_anim.png [5 pixels] - HEALTHBOX_GFX_53, //hpbar_anim.png [6 pixels] - HEALTHBOX_GFX_54, //hpbar_anim.png [7 pixels] - HEALTHBOX_GFX_55, //hpbar_anim.png [8 pixels] - HEALTHBOX_GFX_HP_BAR_RED, //hpbar_anim.png [0 pixels yellow] - HEALTHBOX_GFX_57, //hpbar_anim.png [1 pixels yellow] - HEALTHBOX_GFX_58, //hpbar_anim.png [2 pixels yellow] - HEALTHBOX_GFX_59, //hpbar_anim.png [3 pixels yellow] - HEALTHBOX_GFX_60, //hpbar_anim.png [4 pixels yellow] - HEALTHBOX_GFX_61, //hpbar_anim.png [5 pixels yellow] - HEALTHBOX_GFX_62, //hpbar_anim.png [6 pixels yellow] - HEALTHBOX_GFX_63, //hpbar_anim.png [7 pixels yellow] - HEALTHBOX_GFX_64, //hpbar_anim.png [8 pixels yellow] - HEALTHBOX_GFX_65, //misc_frameend.png - HEALTHBOX_GFX_66, //ball_display.png [full] - HEALTHBOX_GFX_67, //ball_display.png [empty] - HEALTHBOX_GFX_68, //ball_display.png [fainted] - HEALTHBOX_GFX_69, //ball_display.png [statused] - HEALTHBOX_GFX_70, //ball_display_unused_extra.png - HEALTHBOX_GFX_STATUS_PSN_BATTLER1, //status2.png "PSN" + HEALTHBOX_GFX_36, //misc [Black section] + HEALTHBOX_GFX_37, //misc [Black section] + HEALTHBOX_GFX_38, //misc [Black section] + HEALTHBOX_GFX_39, //misc [Blank Health Window?] + HEALTHBOX_GFX_40, //misc [Blank Health Window?] + HEALTHBOX_GFX_41, //misc [Blank Health Window?] + HEALTHBOX_GFX_42, //misc [Blank Health Window?] + HEALTHBOX_GFX_43, //misc [Top of Health Window?] + HEALTHBOX_GFX_44, //misc [Top of Health Window?] + HEALTHBOX_GFX_45, //misc [Top of Health Window?] + HEALTHBOX_GFX_46, //misc [Blank Health Window?] + HEALTHBOX_GFX_HP_BAR_YELLOW, //hp bar yellow [0 pixels] + HEALTHBOX_GFX_48, //hp bar yellow [1 pixels] + HEALTHBOX_GFX_49, //hp bar yellow [2 pixels] + HEALTHBOX_GFX_50, //hp bar yellow [3 pixels] + HEALTHBOX_GFX_51, //hp bar yellow [4 pixels] + HEALTHBOX_GFX_52, //hp bar yellow [5 pixels] + HEALTHBOX_GFX_53, //hp bar yellow [6 pixels] + HEALTHBOX_GFX_54, //hp bar yellow [7 pixels] + HEALTHBOX_GFX_55, //hp bar yellow [8 pixels] + HEALTHBOX_GFX_HP_BAR_RED, //hp bar red [0 pixels] + HEALTHBOX_GFX_57, //hp bar red [1 pixels] + HEALTHBOX_GFX_58, //hp bar red [2 pixels] + HEALTHBOX_GFX_59, //hp bar red [3 pixels] + HEALTHBOX_GFX_60, //hp bar red [4 pixels] + HEALTHBOX_GFX_61, //hp bar red [5 pixels] + HEALTHBOX_GFX_62, //hp bar red [6 pixels] + HEALTHBOX_GFX_63, //hp bar red [7 pixels] + HEALTHBOX_GFX_64, //hp bar red [8 pixels] + HEALTHBOX_GFX_65, //hp bar frame end + HEALTHBOX_GFX_66, //status ball [full] + HEALTHBOX_GFX_67, //status ball [empty] + HEALTHBOX_GFX_68, //status ball [fainted] + HEALTHBOX_GFX_69, //status ball [statused] + HEALTHBOX_GFX_70, //status ball [unused extra] + HEALTHBOX_GFX_STATUS_PSN_BATTLER1, //status2 "PSN" HEALTHBOX_GFX_72, HEALTHBOX_GFX_73, - HEALTHBOX_GFX_STATUS_PRZ_BATTLER1, //status2.png "PRZ" + HEALTHBOX_GFX_STATUS_PRZ_BATTLER1, //status2 "PRZ" HEALTHBOX_GFX_75, HEALTHBOX_GFX_76, - HEALTHBOX_GFX_STATUS_SLP_BATTLER1, //status2.png "SLP" + HEALTHBOX_GFX_STATUS_SLP_BATTLER1, //status2 "SLP" HEALTHBOX_GFX_78, HEALTHBOX_GFX_79, - HEALTHBOX_GFX_STATUS_FRZ_BATTLER1, //status2.png "FRZ" + HEALTHBOX_GFX_STATUS_FRZ_BATTLER1, //status2 "FRZ" HEALTHBOX_GFX_81, HEALTHBOX_GFX_82, - HEALTHBOX_GFX_STATUS_BRN_BATTLER1, //status2.png "BRN" + HEALTHBOX_GFX_STATUS_BRN_BATTLER1, //status2 "BRN" HEALTHBOX_GFX_84, HEALTHBOX_GFX_85, - HEALTHBOX_GFX_STATUS_PSN_BATTLER2, //status3.png "PSN" + HEALTHBOX_GFX_STATUS_PSN_BATTLER2, //status3 "PSN" HEALTHBOX_GFX_87, HEALTHBOX_GFX_88, - HEALTHBOX_GFX_STATUS_PRZ_BATTLER2, //status3.png "PRZ" + HEALTHBOX_GFX_STATUS_PRZ_BATTLER2, //status3 "PRZ" HEALTHBOX_GFX_90, HEALTHBOX_GFX_91, - HEALTHBOX_GFX_STATUS_SLP_BATTLER2, //status3.png "SLP" + HEALTHBOX_GFX_STATUS_SLP_BATTLER2, //status3 "SLP" HEALTHBOX_GFX_93, HEALTHBOX_GFX_94, - HEALTHBOX_GFX_STATUS_FRZ_BATTLER2, //status3.png "FRZ" + HEALTHBOX_GFX_STATUS_FRZ_BATTLER2, //status3 "FRZ" HEALTHBOX_GFX_96, HEALTHBOX_GFX_97, - HEALTHBOX_GFX_STATUS_BRN_BATTLER2, //status3.png "BRN" + HEALTHBOX_GFX_STATUS_BRN_BATTLER2, //status3 "BRN" HEALTHBOX_GFX_99, HEALTHBOX_GFX_100, - HEALTHBOX_GFX_STATUS_PSN_BATTLER3, //status4.png "PSN" + HEALTHBOX_GFX_STATUS_PSN_BATTLER3, //status4 "PSN" HEALTHBOX_GFX_102, HEALTHBOX_GFX_103, - HEALTHBOX_GFX_STATUS_PRZ_BATTLER3, //status4.png "PRZ" + HEALTHBOX_GFX_STATUS_PRZ_BATTLER3, //status4 "PRZ" HEALTHBOX_GFX_105, HEALTHBOX_GFX_106, - HEALTHBOX_GFX_STATUS_SLP_BATTLER3, //status4.png "SLP" + HEALTHBOX_GFX_STATUS_SLP_BATTLER3, //status4 "SLP" HEALTHBOX_GFX_108, HEALTHBOX_GFX_109, - HEALTHBOX_GFX_STATUS_FRZ_BATTLER3, //status4.png "FRZ" + HEALTHBOX_GFX_STATUS_FRZ_BATTLER3, //status4 "FRZ" HEALTHBOX_GFX_111, HEALTHBOX_GFX_112, - HEALTHBOX_GFX_STATUS_BRN_BATTLER3, //status4.png "BRN" + HEALTHBOX_GFX_STATUS_BRN_BATTLER3, //status4 "BRN" HEALTHBOX_GFX_114, HEALTHBOX_GFX_115, - HEALTHBOX_GFX_116, //unknown_D12FEC.png - HEALTHBOX_GFX_117, //unknown_D1300C.png + HEALTHBOX_GFX_116, //unknown_D12FEC + HEALTHBOX_GFX_117, //unknown_D1300C }; extern const u8 *const gNatureNamePointers[]; From a589d4a630a130e78bdf0819b807a133562d4449 Mon Sep 17 00:00:00 2001 From: huderlem Date: Sun, 24 Feb 2019 10:22:11 -0600 Subject: [PATCH 115/217] Delete porymap.project.cfg --- porymap.project.cfg | 1 - 1 file changed, 1 deletion(-) delete mode 100755 porymap.project.cfg diff --git a/porymap.project.cfg b/porymap.project.cfg deleted file mode 100755 index c6ba8781eb..0000000000 --- a/porymap.project.cfg +++ /dev/null @@ -1 +0,0 @@ -base_game_version=pokeemerald From 87859a655b810aeaad7e7e1f5b066731f7e79ece Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 25 Feb 2019 02:20:38 -0500 Subject: [PATCH 116/217] Fix flag formatting for fun --- include/constants/vars.h | 444 +++++++++++++++++++-------------------- 1 file changed, 222 insertions(+), 222 deletions(-) diff --git a/include/constants/vars.h b/include/constants/vars.h index 889b6692e5..fc3b3263d5 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -46,232 +46,232 @@ #define VAR_OBJ_GFX_ID_F 0x401F // general purpose vars -#define VAR_RECYCLE_GOODS 0x4020 -#define VAR_REPEL_STEP_COUNT 0x4021 -#define VAR_ICE_STEP_COUNT 0x4022 -#define VAR_STARTER_MON 0x4023 // 0=Treecko, 1=Torchic, 2=Mudkip -#define VAR_MIRAGE_RND_H 0x4024 -#define VAR_MIRAGE_RND_L 0x4025 -#define VAR_SECRET_BASE_MAP 0x4026 -#define VAR_CYCLING_ROAD_RECORD_COLLISIONS 0x4027 -#define VAR_CYCLING_ROAD_RECORD_TIME_L 0x4028 -#define VAR_CYCLING_ROAD_RECORD_TIME_H 0x4029 -#define VAR_HAPPINESS_STEP_COUNTER 0x402A -#define VAR_POISON_STEP_COUNTER 0x402B -#define VAR_RESET_RTC_ENABLE 0x402C -#define VAR_ENIGMA_BERRY_AVAILABLE 0x402D -#define VAR_0x402E 0x402E // Seems to be unused. +#define VAR_RECYCLE_GOODS 0x4020 +#define VAR_REPEL_STEP_COUNT 0x4021 +#define VAR_ICE_STEP_COUNT 0x4022 +#define VAR_STARTER_MON 0x4023 // 0=Treecko, 1=Torchic, 2=Mudkip +#define VAR_MIRAGE_RND_H 0x4024 +#define VAR_MIRAGE_RND_L 0x4025 +#define VAR_SECRET_BASE_MAP 0x4026 +#define VAR_CYCLING_ROAD_RECORD_COLLISIONS 0x4027 +#define VAR_CYCLING_ROAD_RECORD_TIME_L 0x4028 +#define VAR_CYCLING_ROAD_RECORD_TIME_H 0x4029 +#define VAR_HAPPINESS_STEP_COUNTER 0x402A +#define VAR_POISON_STEP_COUNTER 0x402B +#define VAR_RESET_RTC_ENABLE 0x402C +#define VAR_ENIGMA_BERRY_AVAILABLE 0x402D +#define VAR_0x402E 0x402E // Seems to be unused. -#define VAR_FRONTIER_MANIAC_FACILITY 0x402F -#define VAR_FRONTIER_GAMBLER_FACILITY 0x4030 -#define VAR_FRONTIER_GAMBLER_SET_FACILITY_F 0x4031 -#define VAR_FRONTIER_GAMBLER_AMOUNT_BET 0x4032 -#define VAR_FRONTIER_GAMBLER_PLACED_BET_F 0x4033 +#define VAR_FRONTIER_MANIAC_FACILITY 0x402F +#define VAR_FRONTIER_GAMBLER_FACILITY 0x4030 +#define VAR_FRONTIER_GAMBLER_SET_FACILITY_F 0x4031 +#define VAR_FRONTIER_GAMBLER_AMOUNT_BET 0x4032 +#define VAR_FRONTIER_GAMBLER_PLACED_BET_F 0x4033 -#define VAR_DEOXYS_ROCK_STEP_COUNT 0x4034 -#define VAR_DEOXYS_ROCK_LEVEL 0x4035 -#define VAR_STORAGE_UNKNOWN 0x4036 -#define VAR_0x4037 0x4037 -#define VAR_0x4038 0x4038 -#define VAR_0x4039 0x4039 -#define VAR_0x403A 0x403A -#define VAR_REGICE_STEPS_1 0x403B -#define VAR_REGICE_STEPS_2 0x403C -#define VAR_REGICE_STEPS_3 0x403D -#define VAR_ALTERING_CAVE_WILD_SET 0x403E -#define VAR_0x403F 0x403F -#define VAR_DAYS 0x4040 -#define VAR_FANCLUB_UNKNOWN_1 0x4041 -#define VAR_FANCLUB_UNKNOWN_2 0x4042 -#define VAR_DEPT_STORE_FLOOR 0x4043 -#define VAR_0x4044 0x4044 -#define VAR_POKELOT_PRIZE 0x4045 -#define VAR_NATIONAL_DEX 0x4046 -#define VAR_SEEDOT_SIZE_RECORD 0x4047 -#define VAR_ASH_GATHER_COUNT 0x4048 -#define VAR_BIRCH_STATE 0x4049 -#define VAR_CRUISE_STEP_COUNT 0x404A -#define VAR_POKELOT_RND1 0x404B -#define VAR_POKELOT_RND2 0x404C -#define VAR_0x404D 0x404D -#define VAR_0x404E 0x404E -#define VAR_LOTAD_SIZE_RECORD 0x404F -#define VAR_0x4050 0x4050 -#define VAR_ROUTE102_ACCESSIBLE 0x4051 -#define VAR_0x4052 0x4052 -#define VAR_LAVARIDGE_RIVAL_STATE 0x4053 -#define VAR_CURRENT_SECRET_BASE 0x4054 -#define VAR_0x4055 0x4055 -#define VAR_0x4056 0x4056 -#define VAR_PETALBURG_STATE 0x4057 -#define VAR_SLATEPORT_STATE 0x4058 -#define VAR_0x4059 0x4059 -#define VAR_RUSTBORO_STATE 0x405A -#define VAR_0x405B 0x405B -#define VAR_0x405C 0x405C -#define VAR_0x405D 0x405D -#define VAR_0x405E 0x405E -#define VAR_0x405F 0x405F -#define VAR_ROUTE101_STATE 0x4060 -#define VAR_0x4061 0x4061 -#define VAR_0x4062 0x4062 -#define VAR_0x4063 0x4063 -#define VAR_0x4064 0x4064 -#define VAR_0x4065 0x4065 -#define VAR_0x4066 0x4066 -#define VAR_0x4067 0x4067 -#define VAR_0x4068 0x4068 -#define VAR_ROUTE110_STATE 0x4069 -#define VAR_0x406A 0x406A -#define VAR_0x406B 0x406B -#define VAR_0x406C 0x406C -#define VAR_0x406D 0x406D -#define VAR_0x406E 0x406E -#define VAR_ROUTE116_STATE 0x406F -#define VAR_0x4070 0x4070 -#define VAR_ROUTE118_STATE 0x4071 -#define VAR_ROUTE119_STATE 0x4072 -#define VAR_0x4073 0x4073 -#define VAR_ROUTE121_STATE 0x4074 -#define VAR_0x4075 0x4075 -#define VAR_0x4076 0x4076 -#define VAR_0x4077 0x4077 -#define VAR_0x4078 0x4078 -#define VAR_0x4079 0x4079 -#define VAR_0x407A 0x407A -#define VAR_ROUTE128_STATE 0x407B -#define VAR_0x407C 0x407C -#define VAR_0x407D 0x407D -#define VAR_0x407E 0x407E -#define VAR_0x407F 0x407F -#define VAR_0x4080 0x4080 -#define VAR_0x4081 0x4081 -#define VAR_LITTLEROOT_HOUSES_STATE 0x4082 -#define VAR_0x4083 0x4083 -#define VAR_BIRCH_LAB_STATE 0x4084 -#define VAR_PETALBURG_GYM_STATE 0x4085 -#define VAR_LINK_CONTEST_ROOM_STATE 0x4086 +#define VAR_DEOXYS_ROCK_STEP_COUNT 0x4034 +#define VAR_DEOXYS_ROCK_LEVEL 0x4035 +#define VAR_STORAGE_UNKNOWN 0x4036 +#define VAR_0x4037 0x4037 +#define VAR_0x4038 0x4038 +#define VAR_0x4039 0x4039 +#define VAR_0x403A 0x403A +#define VAR_REGICE_STEPS_1 0x403B +#define VAR_REGICE_STEPS_2 0x403C +#define VAR_REGICE_STEPS_3 0x403D +#define VAR_ALTERING_CAVE_WILD_SET 0x403E +#define VAR_0x403F 0x403F +#define VAR_DAYS 0x4040 +#define VAR_FANCLUB_UNKNOWN_1 0x4041 +#define VAR_FANCLUB_UNKNOWN_2 0x4042 +#define VAR_DEPT_STORE_FLOOR 0x4043 +#define VAR_0x4044 0x4044 +#define VAR_POKELOT_PRIZE 0x4045 +#define VAR_NATIONAL_DEX 0x4046 +#define VAR_SEEDOT_SIZE_RECORD 0x4047 +#define VAR_ASH_GATHER_COUNT 0x4048 +#define VAR_BIRCH_STATE 0x4049 +#define VAR_CRUISE_STEP_COUNT 0x404A +#define VAR_POKELOT_RND1 0x404B +#define VAR_POKELOT_RND2 0x404C +#define VAR_0x404D 0x404D +#define VAR_0x404E 0x404E +#define VAR_LOTAD_SIZE_RECORD 0x404F +#define VAR_0x4050 0x4050 +#define VAR_ROUTE102_ACCESSIBLE 0x4051 +#define VAR_0x4052 0x4052 +#define VAR_LAVARIDGE_RIVAL_STATE 0x4053 +#define VAR_CURRENT_SECRET_BASE 0x4054 +#define VAR_0x4055 0x4055 +#define VAR_0x4056 0x4056 +#define VAR_PETALBURG_STATE 0x4057 +#define VAR_SLATEPORT_STATE 0x4058 +#define VAR_0x4059 0x4059 +#define VAR_RUSTBORO_STATE 0x405A +#define VAR_0x405B 0x405B +#define VAR_0x405C 0x405C +#define VAR_0x405D 0x405D +#define VAR_0x405E 0x405E +#define VAR_0x405F 0x405F +#define VAR_ROUTE101_STATE 0x4060 +#define VAR_0x4061 0x4061 +#define VAR_0x4062 0x4062 +#define VAR_0x4063 0x4063 +#define VAR_0x4064 0x4064 +#define VAR_0x4065 0x4065 +#define VAR_0x4066 0x4066 +#define VAR_0x4067 0x4067 +#define VAR_0x4068 0x4068 +#define VAR_ROUTE110_STATE 0x4069 +#define VAR_0x406A 0x406A +#define VAR_0x406B 0x406B +#define VAR_0x406C 0x406C +#define VAR_0x406D 0x406D +#define VAR_0x406E 0x406E +#define VAR_ROUTE116_STATE 0x406F +#define VAR_0x4070 0x4070 +#define VAR_ROUTE118_STATE 0x4071 +#define VAR_ROUTE119_STATE 0x4072 +#define VAR_0x4073 0x4073 +#define VAR_ROUTE121_STATE 0x4074 +#define VAR_0x4075 0x4075 +#define VAR_0x4076 0x4076 +#define VAR_0x4077 0x4077 +#define VAR_0x4078 0x4078 +#define VAR_0x4079 0x4079 +#define VAR_0x407A 0x407A +#define VAR_ROUTE128_STATE 0x407B +#define VAR_0x407C 0x407C +#define VAR_0x407D 0x407D +#define VAR_0x407E 0x407E +#define VAR_0x407F 0x407F +#define VAR_0x4080 0x4080 +#define VAR_0x4081 0x4081 +#define VAR_LITTLEROOT_HOUSES_STATE 0x4082 +#define VAR_0x4083 0x4083 +#define VAR_BIRCH_LAB_STATE 0x4084 +#define VAR_PETALBURG_GYM_STATE 0x4085 +#define VAR_LINK_CONTEST_ROOM_STATE 0x4086 #define VAR_CABLE_CLUB_STATE 0x4087 #define VAR_CONTEST_LOCATION 0x4088 -#define VAR_0x4089 0x4089 -#define VAR_CONTEST_PRIZE_PICKUP 0x408A -#define VAR_0x408B 0x408B -#define VAR_LITTLEROOT_HOUSES_STATE_2 0x408C -#define VAR_LITTLEROOT_RIVAL_STATE 0x408D -#define VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE 0x408E -#define VAR_DEVON_CORP_3F_STATE 0x408F -#define VAR_BRINEY_HOUSE_STATE 0x4090 -#define VAR_0x4091 0x4091 -#define VAR_LITTLEROOT_INTRO_STATE 0x4092 -#define VAR_MAUVILLE_GYM_STATE 0x4093 -#define VAR_LILYCOVE_MUSEUM_2F_STATE 0x4094 -#define VAR_LILYCOVE_FAN_CLUB_STATE 0x4095 -#define VAR_BRINEY_LOCATION 0x4096 -#define VAR_0x4097 0x4097 -#define VAR_PETALBURG_WOODS_STATE 0x4098 -#define VAR_LILYCOVE_CONTEST_LOBBY_STATE 0x4099 -#define VAR_RUSTURF_TUNNEL_STATE 0x409A -#define VAR_0x409B 0x409B -#define VAR_ELITE_4_STATE 0x409C -#define VAR_0x409D 0x409D -#define VAR_0x409E 0x409E -#define VAR_0x409F 0x409F -#define VAR_SLATEPORT_HARBOR_STATE 0x40A0 -#define VAR_0x40A1 0x40A1 -#define VAR_SEAFLOOR_CAVERN_STATE 0x40A2 -#define VAR_CABLE_CAR_STATION_STATE 0x40A3 -#define VAR_SAFARI_ZONE_STATE 0x40A4 -#define VAR_TRICK_HOUSE_ENTRANCE_STATE_1 0x40A5 -#define VAR_TRICK_HOUSE_ENTRANCE_STATE_2 0x40A6 -#define VAR_TRICK_HOUSE_ENTRANCE_STATE_3 0x40A7 -#define VAR_0x40A8 0x40A8 -#define VAR_CYCLING_CHALLENGE_STATE 0x40A9 -#define VAR_SLATEPORT_MUSEUM_1F_STATE 0x40AA -#define VAR_TRICK_HOUSE_PUZZLE_1_STATE 0x40AB -#define VAR_TRICK_HOUSE_PUZZLE_2_STATE 0x40AC -#define VAR_TRICK_HOUSE_PUZZLE_3_STATE 0x40AD -#define VAR_TRICK_HOUSE_PUZZLE_4_STATE 0x40AE -#define VAR_TRICK_HOUSE_PUZZLE_5_STATE 0x40AF -#define VAR_TRICK_HOUSE_PUZZLE_6_STATE 0x40B0 -#define VAR_TRICK_HOUSE_PUZZLE_7_STATE 0x40B1 -#define VAR_TRICK_HOUSE_PUZZLE_8_STATE 0x40B2 -#define VAR_WEATHER_INSTITUTE_STATE 0x40B3 -#define VAR_PORTHOLE_STATE 0x40B4 -#define VAR_TRICK_HOUSE_STATE 0x40B5 // TODO: needs some further investigation -#define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2 0x40B6 -#define VAR_SLATEPORT_FAN_CLUB_STATE 0x40B7 -#define VAR_0x40B8 0x40B8 -#define VAR_MT_PYRE_STATE 0x40B9 -#define VAR_NEW_MAUVILLE_STATE 0x40BA -#define VAR_0x40BB 0x40BB -#define VAR_BRAVO_TRAINER_BATTLE_TOWER_ON 0x40BC -#define VAR_JAGGED_PASS_ASH_WEATHER 0x40BD -#define VAR_GLASS_WORKSHOP_STATE 0x40BE -#define VAR_METEOR_FALLS_STATE 0x40BF -#define VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE 0x40C0 -#define VAR_TRICK_HOUSE_PRIZE_PICKUP 0x40C1 -#define VAR_PACIFIDLOG_TM_RECEIVED_DAY 0x40C2 -#define VAR_VICTORY_ROAD_1F_STATE 0x40C3 -#define VAR_FOSSIL_RESURRECTION_STATE 0x40C4 -#define VAR_WHICH_FOSSIL_REVIVED 0x40C5 -#define VAR_STEVENS_HOUSE_STATE 0x40C6 -#define VAR_OLDALE_STATE 0x40C7 -#define VAR_0x40C8 0x40C8 -#define VAR_0x40C9 0x40C9 -#define VAR_0x40CA 0x40CA -#define VAR_0x40CB 0x40CB -#define VAR_0x40CC 0x40CC -#define VAR_0x40CD 0x40CD -#define VAR_FRONTIER_BATTLE_MODE 0x40CE -#define VAR_FRONTIER_FACILITY 0x40CF -#define VAR_0x40D0 0x40D0 -#define VAR_0x40D1 0x40D1 -#define VAR_0x40D2 0x40D2 -#define VAR_0x40D3 0x40D3 -#define VAR_0x40D4 0x40D4 -#define VAR_0x40D5 0x40D5 -#define VAR_0x40D6 0x40D6 -#define VAR_0x40D7 0x40D7 -#define VAR_0x40D8 0x40D8 -#define VAR_0x40D9 0x40D9 -#define VAR_0x40DA 0x40DA -#define VAR_0x40DB 0x40DB -#define VAR_0x40DC 0x40DC -#define VAR_EVENT_PICHU_SLOT 0x40DD -#define VAR_0x40DE 0x40DE -#define VAR_0x40DF 0x40DF -#define VAR_0x40E0 0x40E0 -#define VAR_0x40E1 0x40E1 -#define VAR_0x40E2 0x40E2 -#define VAR_0x40E3 0x40E3 -#define VAR_0x40E4 0x40E4 -#define VAR_0x40E5 0x40E5 -#define VAR_DAILY_SLOTS 0x40E6 -#define VAR_DAILY_WILDS 0x40E7 -#define VAR_DAILY_BLENDER 0x40E8 -#define VAR_DAILY_PLANTED_BERRIES 0x40E9 -#define VAR_DAILY_PICKED_BERRIES 0x40EA -#define VAR_DAILY_ROULETTE 0x40EB -#define VAR_0x40EC 0x40EC -#define VAR_0x40ED 0x40ED -#define VAR_0x40EE 0x40EE -#define VAR_0x40EF 0x40EF -#define VAR_0x40F0 0x40F0 -#define VAR_DAILY_BP 0x40F1 -#define VAR_0x40F2 0x40F2 -#define VAR_0x40F3 0x40F3 -#define VAR_0x40F4 0x40F4 -#define VAR_0x40F5 0x40F5 -#define VAR_0x40F6 0x40F6 -#define VAR_0x40F7 0x40F7 -#define VAR_0x40F8 0x40F8 -#define VAR_0x40F9 0x40F9 -#define VAR_0x40FA 0x40FA -#define VAR_0x40FB 0x40FB -#define VAR_0x40FC 0x40FC -#define VAR_0x40FD 0x40FD -#define VAR_0x40FE 0x40FE -#define VAR_0x40FF 0x40FF +#define VAR_0x4089 0x4089 +#define VAR_CONTEST_PRIZE_PICKUP 0x408A +#define VAR_0x408B 0x408B +#define VAR_LITTLEROOT_HOUSES_STATE_2 0x408C +#define VAR_LITTLEROOT_RIVAL_STATE 0x408D +#define VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE 0x408E +#define VAR_DEVON_CORP_3F_STATE 0x408F +#define VAR_BRINEY_HOUSE_STATE 0x4090 +#define VAR_0x4091 0x4091 +#define VAR_LITTLEROOT_INTRO_STATE 0x4092 +#define VAR_MAUVILLE_GYM_STATE 0x4093 +#define VAR_LILYCOVE_MUSEUM_2F_STATE 0x4094 +#define VAR_LILYCOVE_FAN_CLUB_STATE 0x4095 +#define VAR_BRINEY_LOCATION 0x4096 +#define VAR_0x4097 0x4097 +#define VAR_PETALBURG_WOODS_STATE 0x4098 +#define VAR_LILYCOVE_CONTEST_LOBBY_STATE 0x4099 +#define VAR_RUSTURF_TUNNEL_STATE 0x409A +#define VAR_0x409B 0x409B +#define VAR_ELITE_4_STATE 0x409C +#define VAR_0x409D 0x409D +#define VAR_0x409E 0x409E +#define VAR_0x409F 0x409F +#define VAR_SLATEPORT_HARBOR_STATE 0x40A0 +#define VAR_0x40A1 0x40A1 +#define VAR_SEAFLOOR_CAVERN_STATE 0x40A2 +#define VAR_CABLE_CAR_STATION_STATE 0x40A3 +#define VAR_SAFARI_ZONE_STATE 0x40A4 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE_1 0x40A5 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE_2 0x40A6 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE_3 0x40A7 +#define VAR_0x40A8 0x40A8 +#define VAR_CYCLING_CHALLENGE_STATE 0x40A9 +#define VAR_SLATEPORT_MUSEUM_1F_STATE 0x40AA +#define VAR_TRICK_HOUSE_PUZZLE_1_STATE 0x40AB +#define VAR_TRICK_HOUSE_PUZZLE_2_STATE 0x40AC +#define VAR_TRICK_HOUSE_PUZZLE_3_STATE 0x40AD +#define VAR_TRICK_HOUSE_PUZZLE_4_STATE 0x40AE +#define VAR_TRICK_HOUSE_PUZZLE_5_STATE 0x40AF +#define VAR_TRICK_HOUSE_PUZZLE_6_STATE 0x40B0 +#define VAR_TRICK_HOUSE_PUZZLE_7_STATE 0x40B1 +#define VAR_TRICK_HOUSE_PUZZLE_8_STATE 0x40B2 +#define VAR_WEATHER_INSTITUTE_STATE 0x40B3 +#define VAR_PORTHOLE_STATE 0x40B4 +#define VAR_TRICK_HOUSE_STATE 0x40B5 // TODO: needs some further investigation +#define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2 0x40B6 +#define VAR_SLATEPORT_FAN_CLUB_STATE 0x40B7 +#define VAR_0x40B8 0x40B8 +#define VAR_MT_PYRE_STATE 0x40B9 +#define VAR_NEW_MAUVILLE_STATE 0x40BA +#define VAR_0x40BB 0x40BB +#define VAR_BRAVO_TRAINER_BATTLE_TOWER_ON 0x40BC +#define VAR_JAGGED_PASS_ASH_WEATHER 0x40BD +#define VAR_GLASS_WORKSHOP_STATE 0x40BE +#define VAR_METEOR_FALLS_STATE 0x40BF +#define VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE 0x40C0 +#define VAR_TRICK_HOUSE_PRIZE_PICKUP 0x40C1 +#define VAR_PACIFIDLOG_TM_RECEIVED_DAY 0x40C2 +#define VAR_VICTORY_ROAD_1F_STATE 0x40C3 +#define VAR_FOSSIL_RESURRECTION_STATE 0x40C4 +#define VAR_WHICH_FOSSIL_REVIVED 0x40C5 +#define VAR_STEVENS_HOUSE_STATE 0x40C6 +#define VAR_OLDALE_STATE 0x40C7 +#define VAR_0x40C8 0x40C8 +#define VAR_0x40C9 0x40C9 +#define VAR_0x40CA 0x40CA +#define VAR_0x40CB 0x40CB +#define VAR_0x40CC 0x40CC +#define VAR_0x40CD 0x40CD +#define VAR_FRONTIER_BATTLE_MODE 0x40CE +#define VAR_FRONTIER_FACILITY 0x40CF +#define VAR_0x40D0 0x40D0 +#define VAR_0x40D1 0x40D1 +#define VAR_0x40D2 0x40D2 +#define VAR_0x40D3 0x40D3 +#define VAR_0x40D4 0x40D4 +#define VAR_0x40D5 0x40D5 +#define VAR_0x40D6 0x40D6 +#define VAR_0x40D7 0x40D7 +#define VAR_0x40D8 0x40D8 +#define VAR_0x40D9 0x40D9 +#define VAR_0x40DA 0x40DA +#define VAR_0x40DB 0x40DB +#define VAR_0x40DC 0x40DC +#define VAR_EVENT_PICHU_SLOT 0x40DD +#define VAR_0x40DE 0x40DE +#define VAR_0x40DF 0x40DF +#define VAR_0x40E0 0x40E0 +#define VAR_0x40E1 0x40E1 +#define VAR_0x40E2 0x40E2 +#define VAR_0x40E3 0x40E3 +#define VAR_0x40E4 0x40E4 +#define VAR_0x40E5 0x40E5 +#define VAR_DAILY_SLOTS 0x40E6 +#define VAR_DAILY_WILDS 0x40E7 +#define VAR_DAILY_BLENDER 0x40E8 +#define VAR_DAILY_PLANTED_BERRIES 0x40E9 +#define VAR_DAILY_PICKED_BERRIES 0x40EA +#define VAR_DAILY_ROULETTE 0x40EB +#define VAR_0x40EC 0x40EC +#define VAR_0x40ED 0x40ED +#define VAR_0x40EE 0x40EE +#define VAR_0x40EF 0x40EF +#define VAR_0x40F0 0x40F0 +#define VAR_DAILY_BP 0x40F1 +#define VAR_0x40F2 0x40F2 +#define VAR_0x40F3 0x40F3 +#define VAR_0x40F4 0x40F4 +#define VAR_0x40F5 0x40F5 +#define VAR_0x40F6 0x40F6 +#define VAR_0x40F7 0x40F7 +#define VAR_0x40F8 0x40F8 +#define VAR_0x40F9 0x40F9 +#define VAR_0x40FA 0x40FA +#define VAR_0x40FB 0x40FB +#define VAR_0x40FC 0x40FC +#define VAR_0x40FD 0x40FD +#define VAR_0x40FE 0x40FE +#define VAR_0x40FF 0x40FF #define SPECIAL_VARS_START 0x8000 // special vars From e1b2460748dfd9d1a4b3c6eb760e86fb616a7ce6 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 25 Feb 2019 02:28:41 -0500 Subject: [PATCH 117/217] Adjust formatting, rename function --- include/field_weather.h | 2 +- src/field_weather_effect.c | 36 ++++++++++++++++++------------------ src/overworld.c | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/field_weather.h b/include/field_weather.h index ced8e255cc..76399200d1 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -233,6 +233,6 @@ void SetSav1WeatherFromCurrMapHeader(void); void SetWeather(u32 weather); void DoCurrentWeather(void); void UpdateWeatherPerDay(u16 increment); -void DoPausedWeather(void); +void ResumePausedWeather(void); #endif // GUARD_WEATHER_H diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c index b81a8f5d25..be8fdc6cb2 100644 --- a/src/field_weather_effect.c +++ b/src/field_weather_effect.c @@ -2397,7 +2397,7 @@ void DoCurrentWeather(void) SetNextWeather(weather); } -void DoPausedWeather(void) +void ResumePausedWeather(void) { u8 weather = GetSav1Weather(); @@ -2435,25 +2435,25 @@ static u8 TranslateWeatherNum(u8 weather) { switch (weather) { - case WEATHER_NONE: return WEATHER_NONE; - case WEATHER_CLOUDS: return WEATHER_CLOUDS; - case WEATHER_SUNNY: return WEATHER_SUNNY; - case WEATHER_RAIN_LIGHT: return WEATHER_RAIN_LIGHT; - case WEATHER_SNOW: return WEATHER_SNOW; - case WEATHER_RAIN_MED: return WEATHER_RAIN_MED; - case WEATHER_FOG_1: return WEATHER_FOG_1; - case WEATHER_ASH: return WEATHER_ASH; - case WEATHER_SANDSTORM: return WEATHER_SANDSTORM; - case WEATHER_FOG_2: return WEATHER_FOG_2; - case WEATHER_FOG_3: return WEATHER_FOG_3; - case WEATHER_SHADE: return WEATHER_SHADE; - case WEATHER_DROUGHT: return WEATHER_DROUGHT; - case WEATHER_RAIN_HEAVY: return WEATHER_RAIN_HEAVY; - case WEATHER_BUBBLES: return WEATHER_BUBBLES; - case WEATHER_ALTERNATING: return WEATHER_ALTERNATING; + case WEATHER_NONE: return WEATHER_NONE; + case WEATHER_CLOUDS: return WEATHER_CLOUDS; + case WEATHER_SUNNY: return WEATHER_SUNNY; + case WEATHER_RAIN_LIGHT: return WEATHER_RAIN_LIGHT; + case WEATHER_SNOW: return WEATHER_SNOW; + case WEATHER_RAIN_MED: return WEATHER_RAIN_MED; + case WEATHER_FOG_1: return WEATHER_FOG_1; + case WEATHER_ASH: return WEATHER_ASH; + case WEATHER_SANDSTORM: return WEATHER_SANDSTORM; + case WEATHER_FOG_2: return WEATHER_FOG_2; + case WEATHER_FOG_3: return WEATHER_FOG_3; + case WEATHER_SHADE: return WEATHER_SHADE; + case WEATHER_DROUGHT: return WEATHER_DROUGHT; + case WEATHER_RAIN_HEAVY: return WEATHER_RAIN_HEAVY; + case WEATHER_BUBBLES: return WEATHER_BUBBLES; + case WEATHER_ALTERNATING: return WEATHER_ALTERNATING; case WEATHER_ROUTE119_CYCLE: return sWeatherCycleRoute119[gSaveBlock1Ptr->weatherCycleStage]; case WEATHER_ROUTE123_CYCLE: return sWeatherCycleRoute123[gSaveBlock1Ptr->weatherCycleStage]; - default: return WEATHER_NONE; + default: return WEATHER_NONE; } } diff --git a/src/overworld.c b/src/overworld.c index 6f973f16be..2650a619c3 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -2123,7 +2123,7 @@ static void sub_8086988(u32 a1) FieldEffectActiveListClear(); StartWeather(); - DoPausedWeather(); + ResumePausedWeather(); if (!a1) SetUpFieldTasks(); mapheader_run_script_with_tag_x5(); From 5f7a9713134d7694120dac27bef5ac14467f2734 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 02:23:46 -0500 Subject: [PATCH 118/217] Source file part of map script renaming --- data/event_scripts.s | 1 + data/map_events.s | 1 + data/mystery_event_msg.s | 1 + include/constants/map_scripts.h | 12 ++++++++++ include/overworld.h | 2 +- include/script.h | 20 ++++++++-------- src/battle_pyramid.c | 2 +- src/field_control_avatar.c | 2 +- src/fieldmap.c | 6 ++--- src/overworld.c | 18 +++++++------- src/script.c | 42 ++++++++++++++++----------------- src/trainer_hill.c | 2 +- 12 files changed, 62 insertions(+), 47 deletions(-) create mode 100644 include/constants/map_scripts.h diff --git a/data/event_scripts.s b/data/event_scripts.s index cf5695d3bc..5e8a35f982 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -8,6 +8,7 @@ #include "constants/items.h" #include "constants/heal_locations.h" #include "constants/layouts.h" +#include "constants/map_scripts.h" #include "constants/maps.h" #include "constants/moves.h" #include "constants/songs.h" diff --git a/data/map_events.s b/data/map_events.s index c6f88d305c..cd42bfe759 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -3,6 +3,7 @@ #include "constants/event_objects.h" #include "constants/flags.h" #include "constants/items.h" +#include "constants/map_scripts.h" #include "constants/maps.h" #include "constants/secret_bases.h" #include "constants/vars.h" diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index aa904b0bf3..24a075181f 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -1,5 +1,6 @@ #include "constants/flags.h" #include "constants/items.h" +#include "constants/map_scripts.h" #include "constants/moves.h" #include "constants/songs.h" #include "constants/species.h" diff --git a/include/constants/map_scripts.h b/include/constants/map_scripts.h new file mode 100644 index 0000000000..d5fd40156d --- /dev/null +++ b/include/constants/map_scripts.h @@ -0,0 +1,12 @@ +#ifndef GUARD_CONSTANTS_MAP_SCRIPTS_H +#define GUARD_CONSTANTS_MAP_SCRIPTS_H + +#define MAP_SCRIPT_ON_LOAD 1 +#define MAP_SCRIPT_ON_FRAME_TABLE 2 +#define MAP_SCRIPT_ON_TRANSITION 3 +#define MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE 4 +#define MAP_SCRIPT_ON_RESUME 5 +#define MAP_SCRIPT_ON_DIVE_WARP 6 +#define MAP_SCRIPT_ON_RETURN_TO_FIELD 7 + +#endif // GUARD_CONSTANTS_MAP_SCRIPTS_H \ No newline at end of file diff --git a/include/overworld.h b/include/overworld.h index 79cbf1da32..8caba06736 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -68,7 +68,7 @@ void SetContinueGameWarpToDynamicWarp(int unused); const struct MapConnection *GetMapConnection(u8 dir); bool8 SetDiveWarpEmerge(u16 x, u16 y); bool8 SetDiveWarpDive(u16 x, u16 y); -void mliX_load_map(u8 mapGroup, u8 mapNum); +void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum); void ResetInitialPlayerAvatarState(void); void StoreInitialPlayerAvatarState(void); bool32 Overworld_IsBikingAllowed(void); diff --git a/include/script.h b/include/script.h index 755ff19a38..386b388d02 100644 --- a/include/script.h +++ b/include/script.h @@ -43,16 +43,16 @@ void ScriptContext1_SetupScript(const u8 *ptr); void ScriptContext1_Stop(void); void EnableBothScriptContexts(void); void ScriptContext2_RunNewScript(const u8 *ptr); -u8 *mapheader_get_tagged_pointer(u8 tag); -void mapheader_run_script_by_tag(u8 tag); -u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag); -void mapheader_run_script_with_tag_x1(void); -void mapheader_run_script_with_tag_x3(void); -void mapheader_run_script_with_tag_x5(void); -void mapheader_run_script_with_tag_x7(void); -void mapheader_run_script_with_tag_x6(void); -bool8 mapheader_run_first_tag2_script_list_match(void); -void mapheader_run_first_tag4_script_list_match(void); +u8 *MapHeaderGetScriptTable(u8 tag); +void MapHeaderRunScriptType(u8 tag); +u8 *MapHeaderCheckScriptTable(u8 tag); +void RunOnLoadMapScript(void); +void RunOnTransitionMapScript(void); +void RunOnResumeMapScript(void); +void RunOnReturnToFieldMapScript(void); +void RunOnDiveWarpMapScript(void); +bool8 TryRunOnFrameMapScript(void); +void TryRunOnWarpIntoMapScript(void); u32 CalculateRamScriptChecksum(void); void ClearRamScript(void); bool8 InitRamScript(const u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId); diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index a2fa4120f4..340c17c597 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -1590,7 +1590,7 @@ void GenerateBattlePyramidFloorLayout(u16 *backupMapData, bool8 setPlayerPositio layoutMap += mapLayout->width; } } - mapheader_run_script_with_tag_x1(); + RunOnLoadMapScript(); free(floorLayoutOffsets); } diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 00dce4c7d0..cffafaf9f7 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -147,7 +147,7 @@ int ProcessPlayerFieldInput(struct FieldInput *input) if (CheckForTrainersWantingBattle() == TRUE) return TRUE; - if (mapheader_run_first_tag2_script_list_match() == 1) + if (TryRunOnFrameMapScript() == TRUE) return TRUE; if (input->pressedBButton && TrySetupDiveEmergeScript() == TRUE) diff --git a/src/fieldmap.c b/src/fieldmap.c index 7d9d079fc3..cf5f0356e1 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -53,7 +53,7 @@ void InitMap(void) { InitMapLayoutData(&gMapHeader); sub_80E8EE0(gMapHeader.events); - mapheader_run_script_with_tag_x1(); + RunOnLoadMapScript(); } void InitMapFromSavedGame(void) @@ -62,7 +62,7 @@ void InitMapFromSavedGame(void) sub_80E9238(0); sub_80E8EE0(gMapHeader.events); LoadSavedMapView(); - mapheader_run_script_with_tag_x1(); + RunOnLoadMapScript(); UpdateTVScreensOnMap(gBackupMapLayout.width, gBackupMapLayout.height); } @@ -775,7 +775,7 @@ bool8 CameraMove(int x, int y) old_y = gSaveBlock1Ptr->pos.y; connection = sub_8088950(direction, gSaveBlock1Ptr->pos.x, gSaveBlock1Ptr->pos.y); sub_80887F8(connection, direction, x, y); - mliX_load_map(connection->mapGroup, connection->mapNum); + LoadMapFromCameraTransition(connection->mapGroup, connection->mapNum); gCamera.active = TRUE; gCamera.x = old_x - gSaveBlock1Ptr->pos.x; gCamera.y = old_y - gSaveBlock1Ptr->pos.y; diff --git a/src/overworld.c b/src/overworld.c index 08fd94c1be..d5584efc38 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -761,7 +761,7 @@ static bool8 SetDiveWarp(u8 dir, u16 x, u16 y) } else { - mapheader_run_script_with_tag_x6(); + RunOnDiveWarpMapScript(); if (IsDummyWarp(&gFixedDiveWarp)) return FALSE; SetWarpDestinationToDiveWarp(); @@ -779,7 +779,7 @@ bool8 SetDiveWarpDive(u16 x, u16 y) return SetDiveWarp(CONNECTION_DIVE, x, y); } -void mliX_load_map(u8 mapGroup, u8 mapNum) +void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum) { s32 paletteIndex; @@ -800,7 +800,7 @@ void mliX_load_map(u8 mapGroup, u8 mapNum) ChooseAmbientCrySpecies(); SetDefaultFlashLevel(); Overworld_ClearSavedMusic(); - mapheader_run_script_with_tag_x3(); + RunOnTransitionMapScript(); InitMap(); copy_map_tileset2_to_vram_2(gMapHeader.mapLayout); apply_map_tileset2_palette(gMapHeader.mapLayout); @@ -813,7 +813,7 @@ void mliX_load_map(u8 mapGroup, u8 mapNum) RoamerMove(); DoCurrentWeather(); ResetFieldTasksArgs(); - mapheader_run_script_with_tag_x5(); + RunOnResumeMapScript(); if (gMapHeader.regionMapSectionId != MAPSEC_BATTLE_FRONTIER || gMapHeader.regionMapSectionId != sLastMapSectionId) ShowMapNamePopup(); @@ -852,7 +852,7 @@ static void mli0_load_map(u32 a1) FlagClear(FLAG_SYS_USE_FLASH); SetDefaultFlashLevel(); Overworld_ClearSavedMusic(); - mapheader_run_script_with_tag_x3(); + RunOnTransitionMapScript(); UpdateLocationHistoryForRoamer(); RoamerMoveToOtherLocationSet(); if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) @@ -2126,7 +2126,7 @@ static void sub_8086988(u32 a1) sub_80AEE84(); if (!a1) SetUpFieldTasks(); - mapheader_run_script_with_tag_x5(); + RunOnResumeMapScript(); TryStartMirageTowerPulseBlendEffect(); } @@ -2136,7 +2136,7 @@ static void sub_80869DC(void) gTotalCameraPixelOffsetY = 0; ResetEventObjects(); TrySpawnEventObjects(0, 0); - mapheader_run_first_tag4_script_list_match(); + TryRunOnWarpIntoMapScript(); } static void mli4_mapscripts_and_other(void) @@ -2153,14 +2153,14 @@ static void mli4_mapscripts_and_other(void) SetPlayerAvatarTransitionFlags(player->transitionFlags); ResetInitialPlayerAvatarState(); TrySpawnEventObjects(0, 0); - mapheader_run_first_tag4_script_list_match(); + TryRunOnWarpIntoMapScript(); } static void sub_8086A68(void) { sub_808E16C(0, 0); RotatingGate_InitPuzzleAndGraphics(); - mapheader_run_script_with_tag_x7(); + RunOnReturnToFieldMapScript(); } static void sub_8086A80(void) diff --git a/src/script.c b/src/script.c index c61ae71838..dff99609bd 100644 --- a/src/script.c +++ b/src/script.c @@ -241,7 +241,7 @@ void ScriptContext2_RunNewScript(const u8 *ptr) while (RunScriptCommand(&sScriptContext2) == TRUE); } -u8 *mapheader_get_tagged_pointer(u8 tag) +u8 *MapHeaderGetScriptTable(u8 tag) { const u8 *mapScripts = gMapHeader.mapScripts; @@ -261,16 +261,16 @@ u8 *mapheader_get_tagged_pointer(u8 tag) } } -void mapheader_run_script_by_tag(u8 tag) +void MapHeaderRunScriptType(u8 tag) { - u8 *ptr = mapheader_get_tagged_pointer(tag); + u8 *ptr = MapHeaderGetScriptTable(tag); if (ptr) ScriptContext2_RunNewScript(ptr); } -u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag) +u8 *MapHeaderCheckScriptTable(u8 tag) { - u8 *ptr = mapheader_get_tagged_pointer(tag); + u8 *ptr = MapHeaderGetScriptTable(tag); if (!ptr) return NULL; @@ -291,45 +291,45 @@ u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag) } } -void mapheader_run_script_with_tag_x1(void) +void RunOnLoadMapScript(void) { - mapheader_run_script_by_tag(1); + MapHeaderRunScriptType(1); } -void mapheader_run_script_with_tag_x3(void) +void RunOnTransitionMapScript(void) { - mapheader_run_script_by_tag(3); + MapHeaderRunScriptType(3); } -void mapheader_run_script_with_tag_x5(void) +void RunOnResumeMapScript(void) { - mapheader_run_script_by_tag(5); + MapHeaderRunScriptType(5); } -void mapheader_run_script_with_tag_x7(void) +void RunOnReturnToFieldMapScript(void) { - mapheader_run_script_by_tag(7); + MapHeaderRunScriptType(7); } -void mapheader_run_script_with_tag_x6(void) +void RunOnDiveWarpMapScript(void) { - mapheader_run_script_by_tag(6); + MapHeaderRunScriptType(6); } -bool8 mapheader_run_first_tag2_script_list_match(void) +bool8 TryRunOnFrameMapScript(void) { - u8 *ptr = mapheader_get_first_match_from_tagged_ptr_list(2); + u8 *ptr = MapHeaderCheckScriptTable(2); if (!ptr) - return 0; + return FALSE; ScriptContext1_SetupScript(ptr); - return 1; + return TRUE; } -void mapheader_run_first_tag4_script_list_match(void) +void TryRunOnWarpIntoMapScript(void) { - u8 *ptr = mapheader_get_first_match_from_tagged_ptr_list(4); + u8 *ptr = MapHeaderCheckScriptTable(4); if (ptr) ScriptContext2_RunNewScript(ptr); } diff --git a/src/trainer_hill.c b/src/trainer_hill.c index efe11b0c7d..42b196abd7 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -796,7 +796,7 @@ void sub_81D5FB4(u16 *mapArg) dst += 31; } - mapheader_run_script_with_tag_x1(); + RunOnLoadMapScript(); FreeDataStruct(); } From 8816aa527d7f3adfa10988ac661b9842bf78e64b Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 02:28:32 -0500 Subject: [PATCH 119/217] Update map script files --- data/event_scripts.s | 4 ++-- data/maps/AbandonedShip_Corridors_B1F/scripts.inc | 4 ++-- data/maps/AbandonedShip_Deck/scripts.inc | 2 +- .../AbandonedShip_HiddenFloorCorridors/scripts.inc | 4 ++-- data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc | 2 +- data/maps/AbandonedShip_Rooms_B1F/scripts.inc | 2 +- data/maps/AbandonedShip_Underwater1/scripts.inc | 2 +- data/maps/AbandonedShip_Underwater2/scripts.inc | 2 +- data/maps/AlteringCave/scripts.inc | 2 +- data/maps/AncientTomb/scripts.inc | 6 +++--- data/maps/AquaHideout_B1F/scripts.inc | 4 ++-- data/maps/AquaHideout_B2F/scripts.inc | 2 +- data/maps/ArtisanCave_B1F/scripts.inc | 2 +- .../BattleFrontier_BattleArenaBattleRoom/scripts.inc | 8 ++++---- .../BattleFrontier_BattleArenaCorridor/scripts.inc | 2 +- data/maps/BattleFrontier_BattleArenaLobby/scripts.inc | 4 ++-- .../BattleFrontier_BattleDomeBattleRoom/scripts.inc | 8 ++++---- .../maps/BattleFrontier_BattleDomeCorridor/scripts.inc | 2 +- data/maps/BattleFrontier_BattleDomeLobby/scripts.inc | 6 +++--- .../BattleFrontier_BattleDomePreBattleRoom/scripts.inc | 4 ++-- .../BattleFrontier_BattleFactoryBattleRoom/scripts.inc | 6 +++--- .../maps/BattleFrontier_BattleFactoryLobby/scripts.inc | 4 ++-- .../scripts.inc | 4 ++-- .../BattleFrontier_BattlePalaceBattleRoom/scripts.inc | 6 +++--- .../BattleFrontier_BattlePalaceCorridor/scripts.inc | 2 +- data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc | 4 ++-- .../maps/BattleFrontier_BattlePikeCorridor/scripts.inc | 4 ++-- data/maps/BattleFrontier_BattlePikeLobby/scripts.inc | 4 ++-- .../BattleFrontier_BattlePikeRandomRoom1/scripts.inc | 8 ++++---- .../BattleFrontier_BattlePikeRandomRoom2/scripts.inc | 4 ++-- .../BattleFrontier_BattlePikeRandomRoom3/scripts.inc | 6 +++--- .../BattleFrontier_BattlePikeThreePathRoom/scripts.inc | 6 +++--- .../scripts.inc | 6 +++--- .../maps/BattleFrontier_BattlePyramidLobby/scripts.inc | 4 ++-- data/maps/BattleFrontier_BattlePyramidTop/scripts.inc | 8 ++++---- .../BattleFrontier_BattleTowerBattleRoom/scripts.inc | 4 ++-- .../BattleFrontier_BattleTowerBattleRoom2/scripts.inc | 6 +++--- .../BattleFrontier_BattleTowerCorridor/scripts.inc | 4 ++-- .../BattleFrontier_BattleTowerCorridor2/scripts.inc | 6 +++--- .../BattleFrontier_BattleTowerElevator/scripts.inc | 4 ++-- data/maps/BattleFrontier_BattleTowerLobby/scripts.inc | 8 ++++---- .../scripts.inc | 8 ++++---- data/maps/BattleFrontier_OutsideEast/scripts.inc | 4 ++-- data/maps/BattleFrontier_OutsideWest/scripts.inc | 2 +- data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/BattleFrontier_ReceptionGate/scripts.inc | 4 ++-- data/maps/BirthIsland_Exterior/scripts.inc | 6 +++--- data/maps/CaveOfOrigin_1F/scripts.inc | 2 +- data/maps/CaveOfOrigin_Entrance/scripts.inc | 2 +- .../CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc | 2 +- .../CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc | 2 +- .../CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc | 2 +- data/maps/DesertRuins/scripts.inc | 6 +++--- data/maps/DesertUnderpass/scripts.inc | 2 +- data/maps/DewfordTown/scripts.inc | 2 +- data/maps/DewfordTown_Gym/scripts.inc | 2 +- data/maps/DewfordTown_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/DewfordTown_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/EverGrandeCity/scripts.inc | 2 +- data/maps/EverGrandeCity_ChampionsRoom/scripts.inc | 6 +++--- data/maps/EverGrandeCity_DrakesRoom/scripts.inc | 6 +++--- data/maps/EverGrandeCity_GlaciasRoom/scripts.inc | 6 +++--- 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/scripts.inc | 4 ++-- data/maps/EverGrandeCity_PhoebesRoom/scripts.inc | 6 +++--- data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc | 4 ++-- data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc | 8 ++++---- data/maps/EverGrandeCity_SidneysRoom/scripts.inc | 8 ++++---- data/maps/FallarborTown/scripts.inc | 2 +- .../FallarborTown_BattleTentBattleRoom/scripts.inc | 6 +++--- data/maps/FallarborTown_BattleTentCorridor/scripts.inc | 2 +- data/maps/FallarborTown_BattleTentLobby/scripts.inc | 4 ++-- data/maps/FallarborTown_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/FallarborTown_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/FarawayIsland_Entrance/scripts.inc | 2 +- data/maps/FarawayIsland_Interior/scripts.inc | 8 ++++---- data/maps/FieryPath/scripts.inc | 2 +- data/maps/FortreeCity/scripts.inc | 4 ++-- data/maps/FortreeCity_Gym/scripts.inc | 4 ++-- data/maps/FortreeCity_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/FortreeCity_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/GraniteCave_B1F/scripts.inc | 6 +++--- data/maps/InsideOfTruck/scripts.inc | 4 ++-- data/maps/IslandCave/scripts.inc | 6 +++--- data/maps/JaggedPass/scripts.inc | 6 +++--- data/maps/LavaridgeTown/scripts.inc | 4 ++-- data/maps/LavaridgeTown_Gym_1F/scripts.inc | 2 +- data/maps/LavaridgeTown_Gym_B1F/scripts.inc | 2 +- data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/LilycoveCity/scripts.inc | 4 ++-- data/maps/LilycoveCity_ContestLobby/scripts.inc | 4 ++-- .../LilycoveCity_DepartmentStoreRooftop/scripts.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc | 2 +- data/maps/LilycoveCity_Harbor/scripts.inc | 2 +- data/maps/LilycoveCity_House3/scripts.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc | 4 ++-- data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc | 8 ++++---- .../LilycoveCity_PokemonTrainerFanClub/scripts.inc | 4 ++-- data/maps/LinkContestRoom1/scripts.inc | 10 +++++----- data/maps/LittlerootTown/scripts.inc | 6 +++--- data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc | 6 +++--- data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc | 4 ++-- data/maps/LittlerootTown_MaysHouse_1F/scripts.inc | 6 +++--- data/maps/LittlerootTown_MaysHouse_2F/scripts.inc | 4 ++-- .../maps/LittlerootTown_ProfessorBirchsLab/scripts.inc | 6 +++--- data/maps/MagmaHideout_1F/scripts.inc | 2 +- data/maps/MarineCave_End/scripts.inc | 4 ++-- data/maps/MarineCave_Entrance/scripts.inc | 2 +- data/maps/MauvilleCity/scripts.inc | 2 +- data/maps/MauvilleCity_Gym/scripts.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/MeteorFalls_1F_1R/scripts.inc | 2 +- data/maps/MirageTower_1F/scripts.inc | 2 +- data/maps/MirageTower_2F/scripts.inc | 6 +++--- data/maps/MirageTower_3F/scripts.inc | 6 +++--- data/maps/MossdeepCity/scripts.inc | 2 +- data/maps/MossdeepCity_GameCorner_1F/scripts.inc | 6 +++--- data/maps/MossdeepCity_Gym/scripts.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc | 4 ++-- data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc | 4 ++-- data/maps/MossdeepCity_StevensHouse/scripts.inc | 6 +++--- data/maps/MtChimney/scripts.inc | 4 ++-- data/maps/MtChimney_CableCarStation/scripts.inc | 4 ++-- data/maps/MtPyre_2F/scripts.inc | 6 +++--- data/maps/MtPyre_Exterior/scripts.inc | 2 +- data/maps/MtPyre_Summit/scripts.inc | 2 +- data/maps/NavelRock_Bottom/scripts.inc | 4 ++-- data/maps/NavelRock_Exterior/scripts.inc | 2 +- data/maps/NavelRock_Top/scripts.inc | 4 ++-- data/maps/NewMauville_Entrance/scripts.inc | 4 ++-- data/maps/NewMauville_Inside/scripts.inc | 6 +++--- data/maps/OldaleTown/scripts.inc | 2 +- data/maps/OldaleTown_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/OldaleTown_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/PacifidlogTown/scripts.inc | 4 ++-- data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/PetalburgCity/scripts.inc | 4 ++-- data/maps/PetalburgCity_Gym/scripts.inc | 8 ++++---- data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/PetalburgCity_WallysHouse/scripts.inc | 4 ++-- data/maps/Route101/scripts.inc | 4 ++-- data/maps/Route103/scripts.inc | 4 ++-- data/maps/Route104/scripts.inc | 4 ++-- data/maps/Route104_MrBrineysHouse/scripts.inc | 2 +- data/maps/Route104_PrettyPetalFlowerShop/scripts.inc | 2 +- data/maps/Route105/scripts.inc | 6 +++--- data/maps/Route109_SeashoreHouse/scripts.inc | 2 +- data/maps/Route110/scripts.inc | 6 +++--- .../scripts.inc | 2 +- data/maps/Route110_TrickHouseCorridor/scripts.inc | 2 +- data/maps/Route110_TrickHouseEnd/scripts.inc | 8 ++++---- data/maps/Route110_TrickHouseEntrance/scripts.inc | 6 +++--- data/maps/Route110_TrickHousePuzzle1/scripts.inc | 2 +- data/maps/Route110_TrickHousePuzzle2/scripts.inc | 4 ++-- data/maps/Route110_TrickHousePuzzle3/scripts.inc | 4 ++-- data/maps/Route110_TrickHousePuzzle5/scripts.inc | 2 +- data/maps/Route110_TrickHousePuzzle6/scripts.inc | 4 ++-- data/maps/Route110_TrickHousePuzzle7/scripts.inc | 8 ++++---- data/maps/Route111/scripts.inc | 8 ++++---- data/maps/Route111_OldLadysRestStop/scripts.inc | 2 +- data/maps/Route112/scripts.inc | 2 +- data/maps/Route112_CableCarStation/scripts.inc | 4 ++-- data/maps/Route113/scripts.inc | 4 ++-- data/maps/Route113_GlassWorkshop/scripts.inc | 2 +- data/maps/Route114/scripts.inc | 6 +++--- data/maps/Route114_FossilManiacsHouse/scripts.inc | 2 +- data/maps/Route114_FossilManiacsTunnel/scripts.inc | 4 ++-- data/maps/Route114_LanettesHouse/scripts.inc | 2 +- data/maps/Route115/scripts.inc | 6 +++--- data/maps/Route116/scripts.inc | 6 +++--- data/maps/Route116_TunnelersRestHouse/scripts.inc | 2 +- data/maps/Route117/scripts.inc | 2 +- data/maps/Route117_PokemonDayCare/scripts.inc | 2 +- data/maps/Route118/scripts.inc | 6 +++--- data/maps/Route119/scripts.inc | 4 ++-- data/maps/Route119_WeatherInstitute_1F/scripts.inc | 2 +- data/maps/Route119_WeatherInstitute_2F/scripts.inc | 2 +- data/maps/Route120/scripts.inc | 6 +++--- data/maps/Route121_SafariZoneEntrance/scripts.inc | 2 +- data/maps/Route123/scripts.inc | 2 +- data/maps/Route123_BerryMastersHouse/scripts.inc | 2 +- data/maps/Route124/scripts.inc | 2 +- .../Route124_DivingTreasureHuntersHouse/scripts.inc | 2 +- data/maps/Route125/scripts.inc | 6 +++--- data/maps/Route126/scripts.inc | 2 +- data/maps/Route127/scripts.inc | 6 +++--- data/maps/Route128/scripts.inc | 4 ++-- data/maps/Route129/scripts.inc | 6 +++--- data/maps/Route130/scripts.inc | 2 +- data/maps/Route131/scripts.inc | 2 +- data/maps/Route134/scripts.inc | 2 +- data/maps/RustboroCity/scripts.inc | 4 ++-- data/maps/RustboroCity_DevonCorp_1F/scripts.inc | 2 +- data/maps/RustboroCity_DevonCorp_2F/scripts.inc | 2 +- data/maps/RustboroCity_DevonCorp_3F/scripts.inc | 6 +++--- data/maps/RustboroCity_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/RustboroCity_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/RusturfTunnel/scripts.inc | 4 ++-- data/maps/SSTidalCorridor/scripts.inc | 2 +- data/maps/SafariZone_South/scripts.inc | 4 ++-- data/maps/ScorchedSlab/scripts.inc | 2 +- data/maps/SeafloorCavern_Entrance/scripts.inc | 2 +- data/maps/SealedChamber_OuterRoom/scripts.inc | 6 +++--- data/maps/SecretBase_YellowCave4/scripts.inc | 8 ++++---- data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc | 2 +- data/maps/ShoalCave_LowTideInnerRoom/scripts.inc | 4 ++-- data/maps/ShoalCave_LowTideLowerRoom/scripts.inc | 2 +- data/maps/ShoalCave_LowTideStairsRoom/scripts.inc | 2 +- data/maps/SkyPillar_1F/scripts.inc | 2 +- data/maps/SkyPillar_2F/scripts.inc | 6 +++--- data/maps/SkyPillar_3F/scripts.inc | 2 +- data/maps/SkyPillar_4F/scripts.inc | 6 +++--- data/maps/SkyPillar_5F/scripts.inc | 2 +- data/maps/SkyPillar_Entrance/scripts.inc | 2 +- data/maps/SkyPillar_Outside/scripts.inc | 6 +++--- data/maps/SkyPillar_Top/scripts.inc | 6 +++--- data/maps/SlateportCity/scripts.inc | 4 ++-- .../SlateportCity_BattleTentBattleRoom/scripts.inc | 6 +++--- data/maps/SlateportCity_BattleTentCorridor/scripts.inc | 4 ++-- data/maps/SlateportCity_BattleTentLobby/scripts.inc | 4 ++-- data/maps/SlateportCity_Harbor/scripts.inc | 2 +- data/maps/SlateportCity_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/SlateportCity_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/SootopolisCity/scripts.inc | 10 +++++----- data/maps/SootopolisCity_Gym_1F/scripts.inc | 8 ++++---- .../SootopolisCity_MysteryEventsHouse_1F/scripts.inc | 4 ++-- .../SootopolisCity_MysteryEventsHouse_B1F/scripts.inc | 4 ++-- data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/SouthernIsland_Exterior/scripts.inc | 2 +- data/maps/SouthernIsland_Interior/scripts.inc | 4 ++-- data/maps/TerraCave_End/scripts.inc | 4 ++-- data/maps/TerraCave_Entrance/scripts.inc | 2 +- data/maps/TrainerHill_1F/scripts.inc | 6 +++--- data/maps/TrainerHill_2F/scripts.inc | 6 +++--- data/maps/TrainerHill_3F/scripts.inc | 4 ++-- data/maps/TrainerHill_4F/scripts.inc | 4 ++-- data/maps/TrainerHill_Elevator/scripts.inc | 2 +- data/maps/TrainerHill_Entrance/scripts.inc | 10 +++++----- data/maps/TrainerHill_Roof/scripts.inc | 4 ++-- data/maps/Underwater3/scripts.inc | 2 +- data/maps/Underwater5/scripts.inc | 2 +- data/maps/Underwater6/scripts.inc | 2 +- data/maps/Underwater7/scripts.inc | 2 +- data/maps/Underwater_MarineCave/scripts.inc | 4 ++-- data/maps/Underwater_Route134/scripts.inc | 2 +- data/maps/Underwater_SeafloorCavern/scripts.inc | 6 +++--- data/maps/Underwater_SealedChamber/scripts.inc | 2 +- data/maps/Underwater_SootopolisCity/scripts.inc | 2 +- data/maps/UnionRoom/scripts.inc | 4 ++-- data/maps/VerdanturfTown/scripts.inc | 2 +- .../VerdanturfTown_BattleTentBattleRoom/scripts.inc | 6 +++--- .../maps/VerdanturfTown_BattleTentCorridor/scripts.inc | 2 +- data/maps/VerdanturfTown_BattleTentLobby/scripts.inc | 4 ++-- data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc | 8 ++++---- data/maps/VictoryRoad_1F/scripts.inc | 2 +- 271 files changed, 564 insertions(+), 564 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 5e8a35f982..328bff8484 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -5493,8 +5493,8 @@ gBattleDomeMatchNumberText15:: .string "Final Match$" BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B - map_script 3, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 - map_script 4, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25: @ 82C3E25 setvar VAR_0x8004, 4 diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index e89d72c236..e696661201 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -1,6 +1,6 @@ AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84 - map_script 5, AbandonedShip_Corridors_B1F_MapScript1_237D8F - map_script 1, AbandonedShip_Corridors_B1F_MapScript1_237D98 + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_MapScript1_237D8F + map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_MapScript1_237D98 .byte 0 AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F diff --git a/data/maps/AbandonedShip_Deck/scripts.inc b/data/maps/AbandonedShip_Deck/scripts.inc index 1f0c0e2f2b..041c545938 100644 --- a/data/maps/AbandonedShip_Deck/scripts.inc +++ b/data/maps/AbandonedShip_Deck/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_Deck_MapScripts:: @ 823799A - map_script 3, AbandonedShip_Deck_MapScript1_2379A0 + map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_MapScript1_2379A0 .byte 0 AbandonedShip_Deck_MapScript1_2379A0: @ 82379A0 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index f8b5bcc656..1c495c377e 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -1,6 +1,6 @@ AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C - map_script 5, AbandonedShip_HiddenFloorCorridors_MapScript1_238977 - map_script 1, AbandonedShip_HiddenFloorCorridors_MapScript1_238980 + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_MapScript1_238977 + map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_MapScript1_238980 .byte 0 AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index f8ecc9001d..1c517735ee 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_HiddenFloorRooms_MapScripts:: @ 8238C49 - map_script 2, AbandonedShip_HiddenFloorRooms_MapScript2_238C4F + map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_MapScript2_238C4F .byte 0 AbandonedShip_HiddenFloorRooms_MapScript2_238C4F: @ 8238C4F diff --git a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc index 470ae89872..05223592ee 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms_B1F_MapScripts:: @ 8237FB7 - map_script 5, AbandonedShip_Rooms_B1F_MapScript1_237FBD + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_MapScript1_237FBD .byte 0 AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD diff --git a/data/maps/AbandonedShip_Underwater1/scripts.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc index 7e39b1939f..b957bb6bef 100644 --- a/data/maps/AbandonedShip_Underwater1/scripts.inc +++ b/data/maps/AbandonedShip_Underwater1/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater1_MapScripts:: @ 8238096 - map_script 5, AbandonedShip_Underwater1_MapScript1_23809C + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_MapScript1_23809C .byte 0 AbandonedShip_Underwater1_MapScript1_23809C: @ 823809C diff --git a/data/maps/AbandonedShip_Underwater2/scripts.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc index 17f52c6918..cc000b09c7 100644 --- a/data/maps/AbandonedShip_Underwater2/scripts.inc +++ b/data/maps/AbandonedShip_Underwater2/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater2_MapScripts:: @ 823895D - map_script 5, AbandonedShip_Underwater2_MapScript1_238963 + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_MapScript1_238963 .byte 0 AbandonedShip_Underwater2_MapScript1_238963: @ 8238963 diff --git a/data/maps/AlteringCave/scripts.inc b/data/maps/AlteringCave/scripts.inc index a9faddc36e..185466c80a 100644 --- a/data/maps/AlteringCave/scripts.inc +++ b/data/maps/AlteringCave/scripts.inc @@ -1,5 +1,5 @@ AlteringCave_MapScripts:: @ 823B177 - map_script 3, AlteringCave_MapScript1_23B17D + map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_MapScript1_23B17D .byte 0 AlteringCave_MapScript1_23B17D: @ 823B17D diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 9cc369fb4b..8d1c029c36 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -1,7 +1,7 @@ AncientTomb_MapScripts:: @ 8238FB3 - map_script 5, AncientTomb_MapScript1_238FC3 - map_script 1, AncientTomb_MapScript1_238FF2 - map_script 3, AncientTomb_MapScript1_238FE1 + map_script MAP_SCRIPT_ON_RESUME, AncientTomb_MapScript1_238FC3 + map_script MAP_SCRIPT_ON_LOAD, AncientTomb_MapScript1_238FF2 + map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_MapScript1_238FE1 .byte 0 AncientTomb_MapScript1_238FC3: @ 8238FC3 diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index a74c7a33e0..2995f48dc5 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -1,6 +1,6 @@ AquaHideout_B1F_MapScripts:: @ 82339A7 - map_script 5, AquaHideout_B1F_MapScript1_2339B2 - map_script 3, AquaHideout_B1F_MapScript1_2339D0 + map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_MapScript1_2339B2 + map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_MapScript1_2339D0 .byte 0 AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index daa508d321..cdfe3f58ef 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -1,5 +1,5 @@ AquaHideout_B2F_MapScripts:: @ 8233DCF - map_script 3, AquaHideout_B2F_MapScript1_233DD5 + map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_MapScript1_233DD5 .byte 0 AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5 diff --git a/data/maps/ArtisanCave_B1F/scripts.inc b/data/maps/ArtisanCave_B1F/scripts.inc index e46737583a..433991beae 100644 --- a/data/maps/ArtisanCave_B1F/scripts.inc +++ b/data/maps/ArtisanCave_B1F/scripts.inc @@ -1,5 +1,5 @@ ArtisanCave_B1F_MapScripts:: @ 823AFAD - map_script 3, ArtisanCave_B1F_MapScript1_23AFB3 + map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_MapScript1_23AFB3 .byte 0 ArtisanCave_B1F_MapScript1_23AFB3: @ 823AFB3 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index cec596b2da..f3a0ecfb46 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleArenaBattleRoom_MapScripts:: @ 8257487 - map_script 3, BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0 - map_script 2, BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2 - map_script 4, BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C - map_script 5, BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C .byte 0 BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc index f83f6f3394..cc362f5f04 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleArenaCorridor_MapScripts:: @ 82573B9 - map_script 2, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF .byte 0 BattleFrontier_BattleArenaCorridor_MapScript2_2573BF: @ 82573BF diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 9d588b6663..5df47aed16 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleArenaLobby_MapScripts:: @ 8255C36 - map_script 2, BattleFrontier_BattleArenaLobby_MapScript2_255C55 - map_script 4, BattleFrontier_BattleArenaLobby_MapScript2_255C41 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaLobby_MapScript2_255C55 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaLobby_MapScript2_255C41 .byte 0 BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index e1c5991e71..e50ad9f0a1 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C - map_script 3, BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1 - map_script 2, BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00 - map_script 4, BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481 - map_script 5, BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0 .byte 0 BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc index ac43ee9a41..c777f7a7a0 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomeCorridor_MapScripts:: @ 824B0FE - map_script 2, BattleFrontier_BattleDomeCorridor_MapScript2_24B104 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeCorridor_MapScript2_24B104 .byte 0 BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 8b01eba0ab..68ecf802bd 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2 - map_script 5, BattleFrontier_BattleDomeLobby_MapScript1_2497F2 - map_script 2, BattleFrontier_BattleDomeLobby_MapScript2_24980F - map_script 4, BattleFrontier_BattleDomeLobby_MapScript2_2497FB + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_MapScript1_2497F2 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_24980F + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_2497FB .byte 0 BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 6cf1c78177..3901201bb2 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleDomePreBattleRoom_MapScripts:: @ 824B1F9 - map_script 2, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218 - map_script 4, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204 .byte 0 BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 5ed2e97daa..9c76544f67 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB - map_script 3, BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB - map_script 4, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00 - map_script 2, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31 .byte 0 BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index 956cede17f..a9e57dde6d 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleFactoryLobby_MapScripts:: @ 82583E8 - map_script 2, BattleFrontier_BattleFactoryLobby_MapScript2_258407 - map_script 4, BattleFrontier_BattleFactoryLobby_MapScript2_2583F3 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryLobby_MapScript2_258407 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryLobby_MapScript2_2583F3 .byte 0 BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index 21681b70ac..0049b3f58c 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleFactoryPreBattleRoom_MapScripts:: @ 8259ABA - map_script 2, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF - map_script 4, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5 .byte 0 BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5: @ 8259AC5 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index be11039dfd..bdd4a9ff4f 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815 - map_script 3, BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825 - map_script 2, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861 - map_script 4, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34 .byte 0 BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc index 071f61a09b..d5219636c5 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePalaceCorridor_MapScripts:: @ 824F4A3 - map_script 2, BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9 .byte 0 BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9: @ 824F4A9 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 5d7f7aaf5f..40205e9b5d 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePalaceLobby_MapScripts:: @ 824D77E - map_script 2, BattleFrontier_BattlePalaceLobby_MapScript2_24D79D - map_script 4, BattleFrontier_BattlePalaceLobby_MapScript2_24D789 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceLobby_MapScript2_24D79D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceLobby_MapScript2_24D789 .byte 0 BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789 diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index 1155cd67bd..c7421c2c86 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeCorridor_MapScripts:: @ 825C771 - map_script 2, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C - map_script 4, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7 .byte 0 BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index ab53d4c23b..51d6023c8c 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeLobby_MapScripts:: @ 825B6C6 - map_script 2, BattleFrontier_BattlePikeLobby_MapScript2_25B6D1 - map_script 4, BattleFrontier_BattlePikeLobby_MapScript2_25B6F3 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeLobby_MapScript2_25B6D1 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeLobby_MapScript2_25B6F3 .byte 0 BattleFrontier_BattlePikeLobby_MapScript2_25B6D1: @ 825B6D1 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index 1c810900ce..87f83371c8 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattlePikeRandomRoom1_MapScripts:: @ 825D152 - map_script 5, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E - map_script 3, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 - map_script 2, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167 - map_script 4, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE .byte 0 BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc index f46760e17b..5d438d8bd8 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeRandomRoom2_MapScripts:: @ 825E392 - map_script 2, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D - map_script 4, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE .byte 0 BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D: @ 825E39D diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc index 4beb26724f..9f2dfec16c 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScripts:: @ 825E41A - map_script 5, BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A - map_script 2, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A - map_script 4, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466 .byte 0 BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index cac5945167..54f11f071e 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843 - map_script 5, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E - map_script 2, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853 - map_script 4, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D .byte 0 BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853: @ 825C853 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index 43586bba0d..723c666d81 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScripts:: @ 8252A33 - map_script 5, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2 - map_script 2, BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43 - map_script 3, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA .byte 0 BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43: @ 8252A43 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 14e1a5557d..667c4847e6 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePyramidLobby_MapScripts:: @ 8250716 - map_script 2, BattleFrontier_BattlePyramidLobby_MapScript2_250735 - map_script 4, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidLobby_MapScript2_250735 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB .byte 0 BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index d04fe23f23..39bb39f498 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1 - map_script 5, BattleFrontier_BattlePyramidTop_MapScript1_2550F4 - map_script 2, BattleFrontier_BattlePyramidTop_MapScript2_25516E - map_script 3, BattleFrontier_BattlePyramidTop_MapScript1_2550B6 - map_script 4, BattleFrontier_BattlePyramidTop_MapScript2_2550CE + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidTop_MapScript1_2550F4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_25516E + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidTop_MapScript1_2550B6 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_2550CE .byte 0 BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index cf646a3d39..6e3f0c8fa1 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleTowerBattleRoom_MapScripts:: @ 8241B40 - map_script 2, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62 - map_script 4, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B .byte 0 BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B: @ 8241B4B diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index 2699fe9d60..8ebb7ed25c 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8 - map_script 3, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8 - map_script 4, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33 - map_script 2, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43 + 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 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc index 55e21dedbf..cf0a50e98e 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA - map_script 1, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5 - map_script 2, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6 + map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6 .byte 0 BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc index 545ea04b2b..efab7be70d 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A - map_script 3, BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A - map_script 4, BattleFrontier_BattleTowerCorridor2_MapScript2_248D95 - map_script 2, BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2 + 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 diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc index 3dbd5eca3f..0d07f5be22 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleTowerElevator_MapScripts:: @ 82419DB - map_script 2, BattleFrontier_BattleTowerElevator_MapScript2_2419E6 - map_script 4, BattleFrontier_BattleTowerElevator_MapScript2_241A96 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_2419E6 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_241A96 .byte 0 BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 29be452300..af76ee5740 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B - map_script 5, BattleFrontier_BattleTowerLobby_MapScript1_23E690 - map_script 3, BattleFrontier_BattleTowerLobby_MapScript1_23E694 - map_script 2, BattleFrontier_BattleTowerLobby_MapScript2_23E6DD - map_script 4, BattleFrontier_BattleTowerLobby_MapScript2_23E6C9 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerLobby_MapScript1_23E690 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerLobby_MapScript1_23E694 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerLobby_MapScript2_23E6DD + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerLobby_MapScript2_23E6C9 .byte 0 BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index ce0c9b3a48..0bc74b1bd9 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92 - map_script 5, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7 - map_script 3, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0 - map_script 4, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14 - map_script 2, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23 + 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 .byte 0 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7 diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 0d493d4e75..32ef121125 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_OutsideEast_MapScripts:: @ 8242C04 - map_script 5, BattleFrontier_OutsideEast_MapScript1_242C0F - map_script 3, BattleFrontier_OutsideEast_MapScript1_242C2D + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_OutsideEast_MapScript1_242C0F + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideEast_MapScript1_242C2D .byte 0 BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index b2b2a8d415..926a3c1091 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -1,5 +1,5 @@ BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1 - map_script 3, BattleFrontier_OutsideWest_MapScript1_23D3E7 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideWest_MapScript1_23D3E7 .byte 0 BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7 diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc index 42c6db053a..c99a0de381 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9 - map_script 3, BattleFrontier_PokemonCenter_1F_MapScript1_267904 - map_script 5, BattleFrontier_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_PokemonCenter_1F_MapScript1_277C30 .byte 0 BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904 diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc index 7d3c3a2f1e..c6ae8da2a5 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4 - map_script 2, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B - map_script 4, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C - map_script 1, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE - map_script 3, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF .byte 0 BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9 diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index 89f0ee8e9c..574415c4cb 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA - map_script 2, BattleFrontier_ReceptionGate_MapScript2_2661E9 - map_script 3, BattleFrontier_ReceptionGate_MapScript1_2661E5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_MapScript2_2661E9 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_MapScript1_2661E5 .byte 0 BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5 diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index a7737654be..594790ff3f 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -1,7 +1,7 @@ BirthIsland_Exterior_MapScripts:: @ 8267F15 - map_script 3, BirthIsland_Exterior_MapScript1_267F29 - map_script 5, BirthIsland_Exterior_MapScript1_267F65 - map_script 7, BirthIsland_Exterior_MapScript1_267F25 + map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_MapScript1_267F29 + map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_MapScript1_267F65 + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_MapScript1_267F25 .byte 0 BirthIsland_Exterior_MapScript1_267F25: @ 8267F25 diff --git a/data/maps/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc index 1804e58eaa..e8d722dee9 100644 --- a/data/maps/CaveOfOrigin_1F/scripts.inc +++ b/data/maps/CaveOfOrigin_1F/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_1F_MapScripts:: @ 8235768 - map_script 3, CaveOfOrigin_1F_MapScript1_23576E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_MapScript1_23576E .byte 0 CaveOfOrigin_1F_MapScript1_23576E: @ 823576E diff --git a/data/maps/CaveOfOrigin_Entrance/scripts.inc b/data/maps/CaveOfOrigin_Entrance/scripts.inc index 1a771ae82e..53228f63c8 100644 --- a/data/maps/CaveOfOrigin_Entrance/scripts.inc +++ b/data/maps/CaveOfOrigin_Entrance/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_Entrance_MapScripts:: @ 8235759 - map_script 5, CaveOfOrigin_Entrance_MapScript1_23575F + map_script MAP_SCRIPT_ON_RESUME, CaveOfOrigin_Entrance_MapScript1_23575F .byte 0 CaveOfOrigin_Entrance_MapScript1_23575F: @ 823575F diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc index 79c00f28ca..e3e2969453 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778 - map_script 3, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E .byte 0 CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc index 6f9812c385..417a7369a1 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788 - map_script 3, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E .byte 0 CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc index baa40934a9..51d9b86546 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798 - map_script 3, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E .byte 0 CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 2ae1f9e2e6..75fcf061c3 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -1,7 +1,7 @@ DesertRuins_MapScripts:: @ 822D95B - map_script 5, DesertRuins_MapScript1_22D96B - map_script 1, DesertRuins_MapScript1_22D989 - map_script 3, DesertRuins_MapScript1_22D9CA + map_script MAP_SCRIPT_ON_RESUME, DesertRuins_MapScript1_22D96B + map_script MAP_SCRIPT_ON_LOAD, DesertRuins_MapScript1_22D989 + map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_MapScript1_22D9CA .byte 0 DesertRuins_MapScript1_22D96B: @ 822D96B diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc index c64597d6ca..9c5e831805 100644 --- a/data/maps/DesertUnderpass/scripts.inc +++ b/data/maps/DesertUnderpass/scripts.inc @@ -1,5 +1,5 @@ DesertUnderpass_MapScripts:: @ 823AF37 - map_script 3, DesertUnderpass_MapScript1_23AF3D + map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_MapScript1_23AF3D .byte 0 DesertUnderpass_MapScript1_23AF3D: @ 823AF3D diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 6c66f48609..2e283ef70b 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -1,5 +1,5 @@ DewfordTown_MapScripts:: @ 81E9507 - map_script 3, DewfordTown_MapScript1_1E950D + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_MapScript1_1E950D .byte 0 DewfordTown_MapScript1_1E950D: @ 81E950D diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index bafdc6c231..63279937ea 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -1,5 +1,5 @@ DewfordTown_Gym_MapScripts:: @ 81FC63C - map_script 3, DewfordTown_Gym_MapScript1_1FC642 + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_MapScript1_1FC642 .byte 0 DewfordTown_Gym_MapScript1_1FC642: @ 81FC642 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index e21fd13afd..b4f5fc4c67 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523 - map_script 3, DewfordTown_PokemonCenter_1F_MapScript1_1FC52E - map_script 5, DewfordTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_MapScript1_1FC52E + map_script MAP_SCRIPT_ON_RESUME, DewfordTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 DewfordTown_PokemonCenter_1F_MapScript1_1FC52E: @ 81FC52E diff --git a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc index f2a30ecd2d..58b0b63a1a 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615 - map_script 2, DewfordTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, DewfordTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, DewfordTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, DewfordTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, DewfordTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 DewfordTown_PokemonCenter_2F_EventScript_1FC62A:: @ 81FC62A diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index 99d5ab8112..ffbf5a6cda 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_MapScripts:: @ 81E7D1B - map_script 3, EverGrandeCity_MapScript1_1E7D21 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_MapScript1_1E7D21 .byte 0 EverGrandeCity_MapScript1_1E7D21: @ 81E7D21 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 31a9b91b84..49411aeb46 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF - map_script 3, EverGrandeCity_ChampionsRoom_MapScript1_2289FF - map_script 4, EverGrandeCity_ChampionsRoom_MapScript2_228A05 - map_script 2, EverGrandeCity_ChampionsRoom_MapScript2_228A14 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_MapScript1_2289FF + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A05 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A14 .byte 0 EverGrandeCity_ChampionsRoom_MapScript1_2289FF: @ 82289FF diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 2c09498428..a9f5835adf 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 822869C - map_script 2, EverGrandeCity_DrakesRoom_MapScript2_2286BB - map_script 1, EverGrandeCity_DrakesRoom_MapScript1_2286D2 - map_script 4, EverGrandeCity_DrakesRoom_MapScript2_227F3E + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_MapScript2_2286BB + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_MapScript1_2286D2 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_DrakesRoom_MapScript2_227F3E .byte 0 EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 7510f468fd..e4a2a36947 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_GlaciasRoom_MapScripts:: @ 8228412 - map_script 2, EverGrandeCity_GlaciasRoom_MapScript2_228431 - map_script 1, EverGrandeCity_GlaciasRoom_MapScript1_228448 - map_script 4, EverGrandeCity_GlaciasRoom_MapScript2_228422 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228431 + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_MapScript1_228448 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228422 .byte 0 EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422 diff --git a/data/maps/EverGrandeCity_Hall1/scripts.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc index a5b7764d74..d9a7adfe32 100644 --- a/data/maps/EverGrandeCity_Hall1/scripts.inc +++ b/data/maps/EverGrandeCity_Hall1/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall1_MapScripts:: @ 8229569 - map_script 4, EverGrandeCity_Hall1_MapScript2_22956F + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall1_MapScript2_22956F .byte 0 EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F diff --git a/data/maps/EverGrandeCity_Hall2/scripts.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc index 565d681686..b831d0fd58 100644 --- a/data/maps/EverGrandeCity_Hall2/scripts.inc +++ b/data/maps/EverGrandeCity_Hall2/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall2_MapScripts:: @ 822957E - map_script 4, EverGrandeCity_Hall2_MapScript2_229584 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall2_MapScript2_229584 .byte 0 EverGrandeCity_Hall2_MapScript2_229584: @ 8229584 diff --git a/data/maps/EverGrandeCity_Hall3/scripts.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc index 85d0bb2f6c..d75cf95b60 100644 --- a/data/maps/EverGrandeCity_Hall3/scripts.inc +++ b/data/maps/EverGrandeCity_Hall3/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall3_MapScripts:: @ 8229593 - map_script 4, EverGrandeCity_Hall3_MapScript2_229599 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall3_MapScript2_229599 .byte 0 EverGrandeCity_Hall3_MapScript2_229599: @ 8229599 diff --git a/data/maps/EverGrandeCity_Hall4/scripts.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc index 29f56829a8..faf20646aa 100644 --- a/data/maps/EverGrandeCity_Hall4/scripts.inc +++ b/data/maps/EverGrandeCity_Hall4/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall4_MapScripts:: @ 82295A8 - map_script 4, EverGrandeCity_Hall4_MapScript2_2295AE + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall4_MapScript2_2295AE .byte 0 EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE diff --git a/data/maps/EverGrandeCity_Hall5/scripts.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc index d492c28d26..e586958c2a 100644 --- a/data/maps/EverGrandeCity_Hall5/scripts.inc +++ b/data/maps/EverGrandeCity_Hall5/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall5_MapScripts:: @ 82295BD - map_script 4, EverGrandeCity_Hall5_MapScript2_2295C3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall5_MapScript2_2295C3 .byte 0 EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3 diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 04134d30f0..f61547c148 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -1,6 +1,6 @@ EverGrandeCity_HallOfFame_MapScripts:: @ 822982C - map_script 2, EverGrandeCity_HallOfFame_MapScript2_229846 - map_script 4, EverGrandeCity_HallOfFame_MapScript2_229837 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_HallOfFame_MapScript2_229846 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_HallOfFame_MapScript2_229837 .byte 0 EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 77f951d76b..4eef4ba583 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_PhoebesRoom_MapScripts:: @ 8228174 - map_script 1, EverGrandeCity_PhoebesRoom_MapScript1_2281AA - map_script 4, EverGrandeCity_PhoebesRoom_MapScript2_228184 - map_script 2, EverGrandeCity_PhoebesRoom_MapScript2_228193 + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_MapScript1_2281AA + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228184 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228193 .byte 0 EverGrandeCity_PhoebesRoom_MapScript2_228184: @ 8228184 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index f63f636cd1..827c08e547 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34 - map_script 3, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F - map_script 5, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F + map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc index 09d382b2b3..40408c1f84 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0 - map_script 2, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 EverGrandeCity_PokemonCenter_2F_EventScript_229CF5:: @ 8229CF5 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index 4794fb99e4..95345af5cc 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -1,6 +1,6 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2 - map_script 3, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD - map_script 5, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD + map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30 .byte 0 EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc index d3a77a0511..2d2d916a3b 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07 - map_script 2, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B - map_script 4, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C - map_script 1, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE - map_script 3, EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF .byte 0 EverGrandeCity_PokemonLeague_2F_EventScript_229D1C:: @ 8229D1C diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 9152254b31..f917e4bd88 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -1,8 +1,8 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01 - map_script 1, EverGrandeCity_SidneysRoom_MapScript1_227F1D - map_script 4, EverGrandeCity_SidneysRoom_MapScript2_227F3E - map_script 3, EverGrandeCity_SidneysRoom_MapScript1_227F16 - map_script 2, EverGrandeCity_SidneysRoom_MapScript2_227F4D + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_MapScript1_227F1D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F3E + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_SidneysRoom_MapScript1_227F16 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F4D .byte 0 EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16 diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 5e06ed4cbe..b59d4c2207 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -1,5 +1,5 @@ FallarborTown_MapScripts:: @ 81EB1FA - map_script 3, FallarborTown_MapScript1_1EB200 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_MapScript1_1EB200 .byte 0 FallarborTown_MapScript1_1EB200: @ 81EB200 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index dff1d26e02..b376f72e4d 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -1,7 +1,7 @@ FallarborTown_BattleTentBattleRoom_MapScripts:: @ 8200899 - map_script 3, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9 - map_script 2, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD - map_script 4, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0 .byte 0 FallarborTown_BattleTentBattleRoom_MapScript1_2008A9: @ 82008A9 diff --git a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc index f3d0a924e9..3270338295 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc @@ -1,5 +1,5 @@ FallarborTown_BattleTentCorridor_MapScripts:: @ 82006A7 - map_script 2, FallarborTown_BattleTentCorridor_MapScript2_2006AD + map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentCorridor_MapScript2_2006AD .byte 0 FallarborTown_BattleTentCorridor_MapScript2_2006AD: @ 82006AD diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 1128540e9c..6d7ea6be5e 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -1,6 +1,6 @@ FallarborTown_BattleTentLobby_MapScripts:: @ 81FFE66 - map_script 2, FallarborTown_BattleTentLobby_MapScript2_1FFE85 - map_script 4, FallarborTown_BattleTentLobby_MapScript2_1FFE71 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentLobby_MapScript2_1FFE85 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentLobby_MapScript2_1FFE71 .byte 0 FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index c9a7ef27c5..d34e139eb3 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD - map_script 3, FallarborTown_PokemonCenter_1F_MapScript1_200BD8 - map_script 5, FallarborTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_MapScript1_200BD8 + map_script MAP_SCRIPT_ON_RESUME, FallarborTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc index 93482e860c..8fce8e7297 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB - map_script 2, FallarborTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, FallarborTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, FallarborTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, FallarborTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, FallarborTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00 diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index 7c68dd2466..347c89aa0f 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -1,5 +1,5 @@ FarawayIsland_Entrance_MapScripts:: @ 8267C8E - map_script 3, FarawayIsland_Entrance_MapScript1_267C94 + map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Entrance_MapScript1_267C94 .byte 0 FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94 diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index fdb13d19db..7051d376c9 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -1,8 +1,8 @@ FarawayIsland_Interior_MapScripts:: @ 8267CFA - map_script 5, FarawayIsland_Interior_MapScript1_267D54 - map_script 3, FarawayIsland_Interior_MapScript1_267D72 - map_script 2, FarawayIsland_Interior_MapScript2_267D98 - map_script 7, FarawayIsland_Interior_MapScript1_267D0F + map_script MAP_SCRIPT_ON_RESUME, FarawayIsland_Interior_MapScript1_267D54 + map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Interior_MapScript1_267D72 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FarawayIsland_Interior_MapScript2_267D98 + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, FarawayIsland_Interior_MapScript1_267D0F .byte 0 FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc index 3888c61efd..ddba0dc0b7 100644 --- a/data/maps/FieryPath/scripts.inc +++ b/data/maps/FieryPath/scripts.inc @@ -1,5 +1,5 @@ FieryPath_MapScripts:: @ 8230F24 - map_script 3, FieryPath_MapScript1_230F2A + map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_MapScript1_230F2A .byte 0 FieryPath_MapScript1_230F2A: @ 8230F2A diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index d5c1ab29e9..1c464df9d3 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -1,6 +1,6 @@ FortreeCity_MapScripts:: @ 81E25A4 - map_script 3, FortreeCity_MapScript1_1E25AF - map_script 5, FortreeCity_MapScript1_1E25B3 + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_MapScript1_1E25AF + map_script MAP_SCRIPT_ON_RESUME, FortreeCity_MapScript1_1E25B3 .byte 0 FortreeCity_MapScript1_1E25AF: @ 81E25AF diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 59cbfefa6b..30cf8736a3 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -1,6 +1,6 @@ FortreeCity_Gym_MapScripts:: @ 82165AB - map_script 3, FortreeCity_Gym_MapScript1_2165B6 - map_script 4, FortreeCity_Gym_MapScript2_2165BA + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_MapScript1_2165B6 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_MapScript2_2165BA .byte 0 FortreeCity_Gym_MapScript1_2165B6: @ 82165B6 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index 339cae9eb1..0709565909 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8 - map_script 3, FortreeCity_PokemonCenter_1F_MapScript1_2173E3 - map_script 5, FortreeCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_MapScript1_2173E3 + map_script MAP_SCRIPT_ON_RESUME, FortreeCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 FortreeCity_PokemonCenter_1F_MapScript1_2173E3: @ 82173E3 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc index f631aa3c63..dbe2e31ecf 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E - map_script 2, FortreeCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, FortreeCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, FortreeCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, FortreeCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, FortreeCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 FortreeCity_PokemonCenter_2F_EventScript_217653:: @ 8217653 diff --git a/data/maps/GraniteCave_B1F/scripts.inc b/data/maps/GraniteCave_B1F/scripts.inc index 360b10a08b..099e5a501c 100644 --- a/data/maps/GraniteCave_B1F/scripts.inc +++ b/data/maps/GraniteCave_B1F/scripts.inc @@ -1,7 +1,7 @@ GraniteCave_B1F_MapScripts:: @ 822DC5E - map_script 2, GraniteCave_B1F_MapScript2_2A8327 - map_script 3, GraniteCave_B1F_MapScript1_2A8331 - map_script 5, GraniteCave_B1F_MapScript1_22DC6E + map_script MAP_SCRIPT_ON_FRAME_TABLE, GraniteCave_B1F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, GraniteCave_B1F_MapScript1_2A8331 + map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_MapScript1_22DC6E .byte 0 GraniteCave_B1F_MapScript1_22DC6E: @ 822DC6E diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 858975d7af..d4f0c0b5de 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -1,6 +1,6 @@ InsideOfTruck_MapScripts:: @ 823BEDA - map_script 1, InsideOfTruck_MapScript1_23BEE5 - map_script 5, InsideOfTruck_MapScript1_23BF01 + map_script MAP_SCRIPT_ON_LOAD, InsideOfTruck_MapScript1_23BEE5 + map_script MAP_SCRIPT_ON_RESUME, InsideOfTruck_MapScript1_23BF01 .byte 0 InsideOfTruck_MapScript1_23BEE5: @ 823BEE5 diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 33ae51f8d8..cb400e817f 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -1,7 +1,7 @@ IslandCave_MapScripts:: @ 8238E2A - map_script 5, IslandCave_MapScript1_238E3A - map_script 1, IslandCave_MapScript1_238E58 - map_script 3, IslandCave_MapScript1_238E99 + map_script MAP_SCRIPT_ON_RESUME, IslandCave_MapScript1_238E3A + map_script MAP_SCRIPT_ON_LOAD, IslandCave_MapScript1_238E58 + map_script MAP_SCRIPT_ON_TRANSITION, IslandCave_MapScript1_238E99 .byte 0 IslandCave_MapScript1_238E3A: @ 8238E3A diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index fd9947ac4c..79aaae9633 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -1,7 +1,7 @@ JaggedPass_MapScripts:: @ 8230656 - map_script 5, JaggedPass_MapScript1_230666 - map_script 3, JaggedPass_MapScript1_23068B - map_script 1, JaggedPass_MapScript1_23069C + map_script MAP_SCRIPT_ON_RESUME, JaggedPass_MapScript1_230666 + map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_MapScript1_23068B + map_script MAP_SCRIPT_ON_LOAD, JaggedPass_MapScript1_23069C .byte 0 JaggedPass_MapScript1_230666: @ 8230666 diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index aaf550d0d4..3910c4978b 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -1,6 +1,6 @@ LavaridgeTown_MapScripts:: @ 81EA4D3 - map_script 3, LavaridgeTown_MapScript1_1EA4DE - map_script 2, LavaridgeTown_MapScript2_1EA547 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_MapScript1_1EA4DE + map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_MapScript2_1EA547 .byte 0 LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 89dc30f474..06714058ed 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -1,5 +1,5 @@ LavaridgeTown_Gym_1F_MapScripts:: @ 81FE6F4 - map_script 3, LavaridgeTown_Gym_1F_MapScript1_1FE6FA + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_1F_MapScript1_1FE6FA .byte 0 LavaridgeTown_Gym_1F_MapScript1_1FE6FA: @ 81FE6FA diff --git a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc index a8a6eaa545..d2e8d90b54 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc @@ -1,5 +1,5 @@ LavaridgeTown_Gym_B1F_MapScripts:: @ 81FF87E - map_script 3, LavaridgeTown_Gym_B1F_MapScript1_1FF884 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_B1F_MapScript1_1FF884 .byte 0 LavaridgeTown_Gym_B1F_MapScript1_1FF884: @ 81FF884 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index f4fabbf721..2a0cb4a1ef 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA - map_script 3, LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05 - map_script 5, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05 + map_script MAP_SCRIPT_ON_RESUME, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05: @ 81FFB05 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc index b1491f6216..b022df141e 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97 - map_script 2, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, LavaridgeTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 LavaridgeTown_PokemonCenter_2F_EventScript_1FFCAC:: @ 81FFCAC diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 02d88bf5a1..977581f80d 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_MapScripts:: @ 81E2B3C - map_script 3, LilycoveCity_MapScript1_1E2B47 - map_script 1, LilycoveCity_MapScript1_1E2B61 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_MapScript1_1E2B47 + map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_MapScript1_1E2B61 .byte 0 LilycoveCity_MapScript1_1E2B47: @ 81E2B47 diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index ae276cf9c3..83a2644d87 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_ContestLobby_MapScripts:: @ 821A211 - map_script 3, LilycoveCity_ContestLobby_MapScript1_21A21C - map_script 2, LilycoveCity_ContestLobby_MapScript2_21A243 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_ContestLobby_MapScript1_21A21C + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_ContestLobby_MapScript2_21A243 .byte 0 LilycoveCity_ContestLobby_MapScript1_21A21C: @ 821A21C diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index d5379f96a3..f1c974dd9d 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207 - map_script 3, LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D .byte 0 LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D: @ 822020D diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index 899ea98f04..e625374220 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStore_5F_MapScripts:: @ 821FF7A - map_script 4, LilycoveCity_DepartmentStore_5F_MapScript2_21FF80 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_DepartmentStore_5F_MapScript2_21FF80 .byte 0 LilycoveCity_DepartmentStore_5F_MapScript2_21FF80: @ 821FF80 diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index ea70156aaa..67b05c692b 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_Harbor_MapScripts:: @ 821E000 - map_script 3, LilycoveCity_Harbor_MapScript1_21E006 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_Harbor_MapScript1_21E006 .byte 0 LilycoveCity_Harbor_MapScript1_21E006: @ 821E006 diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 3f5b349d27..ad8989b4cc 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_House3_MapScripts:: @ 821EE3C - map_script 3, LilycoveCity_House3_MapScript1_21EE42 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_House3_MapScript1_21EE42 .byte 0 LilycoveCity_House3_MapScript1_21EE42: @ 821EE42 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 0669b74613..f568a98976 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 821973A - map_script 1, LilycoveCity_LilycoveMuseum_2F_MapScript1_219745 - map_script 2, LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE + map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_LilycoveMuseum_2F_MapScript1_219745 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE .byte 0 LilycoveCity_LilycoveMuseum_2F_MapScript1_219745: @ 8219745 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index dd0dff376e..0d8da38d5c 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2 - map_script 3, LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD - map_script 5, LilycoveCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD + map_script MAP_SCRIPT_ON_RESUME, LilycoveCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD: @ 821C5BD diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc index f4a25f1377..1e80354837 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D - map_script 2, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, LilycoveCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 LilycoveCity_PokemonCenter_2F_EventScript_21C772:: @ 821C772 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 698ef95f24..f65d901bb5 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785 - map_script 2, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790 - map_script 3, LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D .byte 0 LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790 diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc index e756c2bc6d..8d5101a952 100644 --- a/data/maps/LinkContestRoom1/scripts.inc +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -1,9 +1,9 @@ LinkContestRoom1_MapScripts:: @ 823B781 - map_script 4, LinkContestRoom1_MapScript2_23B81F - map_script 2, LinkContestRoom1_MapScript2_23B815 - map_script 3, LinkContestRoom1_MapScript1_23B79F - map_script 5, LinkContestRoom1_MapScript1_23B803 - map_script 7, LinkContestRoom1_MapScript1_23B79B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LinkContestRoom1_MapScript2_23B81F + map_script MAP_SCRIPT_ON_FRAME_TABLE, LinkContestRoom1_MapScript2_23B815 + map_script MAP_SCRIPT_ON_TRANSITION, LinkContestRoom1_MapScript1_23B79F + map_script MAP_SCRIPT_ON_RESUME, LinkContestRoom1_MapScript1_23B803 + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, LinkContestRoom1_MapScript1_23B79B .byte 0 LinkContestRoom1_MapScript1_23B79B: @ 823B79B diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index e4b69eb133..67eab89865 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -1,7 +1,7 @@ LittlerootTown_MapScripts:: @ 81E7DCB - map_script 3, LittlerootTown_MapScript1_1E7DDB - map_script 2, LittlerootTown_MapScript2_1E7EC1 - map_script 4, LittlerootTown_MapScript2_1E7FE2 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MapScript1_1E7DDB + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MapScript2_1E7EC1 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MapScript2_1E7FE2 .byte 0 LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 13736130f9..3aba7f4a9f 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -1,7 +1,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755 - map_script 1, LittlerootTown_BrendansHouse_1F_MapScript1_1F7765 - map_script 3, LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4 - map_script 2, LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA + map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_BrendansHouse_1F_MapScript1_1F7765 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA .byte 0 LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 9758ba2503..087310211c 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -1,6 +1,6 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3 - map_script 3, LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE - map_script 4, LittlerootTown_BrendansHouse_2F_MapScript2_1F846A + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_BrendansHouse_2F_MapScript2_1F846A .byte 0 LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 8f40d7c13f..ff8c965a41 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -1,7 +1,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5 - map_script 1, LittlerootTown_MaysHouse_1F_MapScript1_1F88B5 - map_script 3, LittlerootTown_MaysHouse_1F_MapScript1_1F88F4 - map_script 2, LittlerootTown_MaysHouse_1F_MapScript2_1F893A + map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_MaysHouse_1F_MapScript1_1F88B5 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_1F_MapScript1_1F88F4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MaysHouse_1F_MapScript2_1F893A .byte 0 LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index b946201efb..a639643a54 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -1,6 +1,6 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296 - map_script 3, LittlerootTown_MaysHouse_2F_MapScript1_1F92A1 - map_script 4, LittlerootTown_MaysHouse_2F_MapScript2_1F931D + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_2F_MapScript1_1F92A1 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MaysHouse_2F_MapScript2_1F931D .byte 0 LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 1bf27c0bd0..adfe3c3870 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -1,7 +1,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91 - map_script 3, LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1 - map_script 4, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06 - map_script 2, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9 .byte 0 LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1 diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc index 56ad204a93..c67cbd4474 100644 --- a/data/maps/MagmaHideout_1F/scripts.inc +++ b/data/maps/MagmaHideout_1F/scripts.inc @@ -1,5 +1,5 @@ MagmaHideout_1F_MapScripts:: @ 8239880 - map_script 3, MagmaHideout_1F_MapScript1_239886 + map_script MAP_SCRIPT_ON_TRANSITION, MagmaHideout_1F_MapScript1_239886 .byte 0 MagmaHideout_1F_MapScript1_239886: @ 8239886 diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index b66ab17c43..036fa77247 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -1,6 +1,6 @@ MarineCave_End_MapScripts:: @ 823AFDF - map_script 5, MarineCave_End_MapScript1_23AFEA - map_script 3, MarineCave_End_MapScript1_23B008 + map_script MAP_SCRIPT_ON_RESUME, MarineCave_End_MapScript1_23AFEA + map_script MAP_SCRIPT_ON_TRANSITION, MarineCave_End_MapScript1_23B008 .byte 0 MarineCave_End_MapScript1_23AFEA: @ 823AFEA diff --git a/data/maps/MarineCave_Entrance/scripts.inc b/data/maps/MarineCave_Entrance/scripts.inc index 24b288050f..82ff756e1d 100644 --- a/data/maps/MarineCave_Entrance/scripts.inc +++ b/data/maps/MarineCave_Entrance/scripts.inc @@ -1,5 +1,5 @@ MarineCave_Entrance_MapScripts:: @ 823AFD0 - map_script 5, MarineCave_Entrance_MapScript1_23AFD6 + map_script MAP_SCRIPT_ON_RESUME, MarineCave_Entrance_MapScript1_23AFD6 .byte 0 MarineCave_Entrance_MapScript1_23AFD6: @ 823AFD6 diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 6c2ae69fc9..344ccfa416 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -1,5 +1,5 @@ MauvilleCity_MapScripts:: @ 81DF385 - map_script 3, MauvilleCity_MapScript1_1DF38B + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_MapScript1_1DF38B .byte 0 MauvilleCity_MapScript1_1DF38B: @ 81DF38B diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 4d555fe79b..e3c3f5369a 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -1,5 +1,5 @@ MauvilleCity_Gym_MapScripts:: @ 820DD6E - map_script 1, MauvilleCity_Gym_MapScript1_20DD74 + map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_Gym_MapScript1_20DD74 .byte 0 MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index 1eac0efc90..a866e6aa4f 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B - map_script 3, MauvilleCity_PokemonCenter_1F_MapScript1_210E66 - map_script 5, MauvilleCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_MapScript1_210E66 + map_script MAP_SCRIPT_ON_RESUME, MauvilleCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc index 196d49a261..a289886a33 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008 - map_script 2, MauvilleCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, MauvilleCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, MauvilleCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, MauvilleCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 MauvilleCity_PokemonCenter_2F_EventScript_21101D:: @ 821101D diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index 466b1ee3ba..8522df0a57 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -1,5 +1,5 @@ MeteorFalls_1F_1R_MapScripts:: @ 822BD2A - map_script 1, MeteorFalls_1F_1R_MapScript1_22BD30 + map_script MAP_SCRIPT_ON_LOAD, MeteorFalls_1F_1R_MapScript1_22BD30 .byte 0 MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30 diff --git a/data/maps/MirageTower_1F/scripts.inc b/data/maps/MirageTower_1F/scripts.inc index 94aed55d0f..9f6c35a844 100644 --- a/data/maps/MirageTower_1F/scripts.inc +++ b/data/maps/MirageTower_1F/scripts.inc @@ -1,5 +1,5 @@ MirageTower_1F_MapScripts:: @ 823AD01 - map_script 3, MirageTower_1F_MapScript1_23AD07 + map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_1F_MapScript1_23AD07 .byte 0 MirageTower_1F_MapScript1_23AD07: @ 823AD07 diff --git a/data/maps/MirageTower_2F/scripts.inc b/data/maps/MirageTower_2F/scripts.inc index 79f3cce2a1..d22a7c6fff 100644 --- a/data/maps/MirageTower_2F/scripts.inc +++ b/data/maps/MirageTower_2F/scripts.inc @@ -1,7 +1,7 @@ MirageTower_2F_MapScripts:: @ 823AD11 - map_script 2, MirageTower_2F_MapScript2_2A8327 - map_script 3, MirageTower_2F_MapScript1_2A8331 - map_script 5, MirageTower_2F_MapScript1_23AD21 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MirageTower_2F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_2F_MapScript1_2A8331 + map_script MAP_SCRIPT_ON_RESUME, MirageTower_2F_MapScript1_23AD21 .byte 0 MirageTower_2F_MapScript1_23AD21: @ 823AD21 diff --git a/data/maps/MirageTower_3F/scripts.inc b/data/maps/MirageTower_3F/scripts.inc index 1ec82de55e..f29f542fc4 100644 --- a/data/maps/MirageTower_3F/scripts.inc +++ b/data/maps/MirageTower_3F/scripts.inc @@ -1,7 +1,7 @@ MirageTower_3F_MapScripts:: @ 823AD2C - map_script 2, MirageTower_3F_MapScript2_2A8327 - map_script 3, MirageTower_3F_MapScript1_2A8331 - map_script 5, MirageTower_3F_MapScript1_23AD3C + map_script MAP_SCRIPT_ON_FRAME_TABLE, MirageTower_3F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_3F_MapScript1_2A8331 + map_script MAP_SCRIPT_ON_RESUME, MirageTower_3F_MapScript1_23AD3C .byte 0 MirageTower_3F_MapScript1_23AD3C: @ 823AD3C diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 3e2bd4cf9c..b01e9cae8d 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -1,5 +1,5 @@ MossdeepCity_MapScripts:: @ 81E4A96 - map_script 3, MossdeepCity_MapScript1_1E4A9C + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_MapScript1_1E4A9C .byte 0 MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index ed10a83099..4b40cd74ec 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -1,7 +1,7 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27 - map_script 2, MossdeepCity_GameCorner_1F_MapScript2_224B41 - map_script 4, MossdeepCity_GameCorner_1F_MapScript2_224B37 - map_script 1, MossdeepCity_GameCorner_1F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B41 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B37 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_GameCorner_1F_MapScript1_276BBE .byte 0 MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37 diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 6e5b461cd6..7638f6119a 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -1,5 +1,5 @@ MossdeepCity_Gym_MapScripts:: @ 8220800 - map_script 1, MossdeepCity_Gym_MapScript1_220806 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_Gym_MapScript1_220806 .byte 0 MossdeepCity_Gym_MapScript1_220806: @ 8220806 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index 28573a3c1e..9dbead25e7 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F - map_script 3, MossdeepCity_PokemonCenter_1F_MapScript1_22224A - map_script 5, MossdeepCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_MapScript1_22224A + map_script MAP_SCRIPT_ON_RESUME, MossdeepCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 MossdeepCity_PokemonCenter_1F_MapScript1_22224A: @ 822224A diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc index e8fbb6e026..922c9a064e 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334 - map_script 2, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, MossdeepCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 MossdeepCity_PokemonCenter_2F_EventScript_222349:: @ 8222349 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 662774d64f..43bd56d3ae 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -1,6 +1,6 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41 - map_script 1, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2 - map_script 3, MossdeepCity_SpaceCenter_1F_MapScript1_222F4C + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_1F_MapScript1_222F4C .byte 0 MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index bfc33a10f5..7ce0efef38 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -1,6 +1,6 @@ MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58 - map_script 3, MossdeepCity_SpaceCenter_2F_MapScript1_223D63 - map_script 2, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_2F_MapScript1_223D63 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5 .byte 0 MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63 diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index d669302922..e59c217d36 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -1,7 +1,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 8222784 - map_script 1, MossdeepCity_StevensHouse_MapScript1_222794 - map_script 3, MossdeepCity_StevensHouse_MapScript1_2227A8 - map_script 2, MossdeepCity_StevensHouse_MapScript2_2227C0 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_StevensHouse_MapScript1_222794 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_StevensHouse_MapScript1_2227A8 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_StevensHouse_MapScript2_2227C0 .byte 0 MossdeepCity_StevensHouse_MapScript1_222794: @ 8222794 diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 7282ca944d..38b223ab0b 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -1,6 +1,6 @@ MtChimney_MapScripts:: @ 822EDC1 - map_script 5, MtChimney_MapScript1_22EDD2 - map_script 3, MtChimney_MapScript1_22EDCC + map_script MAP_SCRIPT_ON_RESUME, MtChimney_MapScript1_22EDD2 + map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_MapScript1_22EDCC .byte 0 MtChimney_MapScript1_22EDCC: @ 822EDCC diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 6c389e2ad3..9e85729b74 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -1,6 +1,6 @@ MtChimney_CableCarStation_MapScripts:: @ 822ABFA - map_script 3, MtChimney_CableCarStation_MapScript1_22AC05 - map_script 2, MtChimney_CableCarStation_MapScript2_22AC1D + map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_CableCarStation_MapScript1_22AC05 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MtChimney_CableCarStation_MapScript2_22AC1D .byte 0 MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05 diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index cdf2cb98ba..150c08df4e 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -1,7 +1,7 @@ MtPyre_2F_MapScripts:: @ 82310FB - map_script 2, MtPyre_2F_MapScript2_2A8327 - map_script 3, MtPyre_2F_MapScript1_2A8331 - map_script 5, MtPyre_2F_MapScript1_23110B + map_script MAP_SCRIPT_ON_FRAME_TABLE, MtPyre_2F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_2F_MapScript1_2A8331 + map_script MAP_SCRIPT_ON_RESUME, MtPyre_2F_MapScript1_23110B .byte 0 MtPyre_2F_MapScript1_23110B: @ 823110B diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc index fe51946dcb..e24f8ea682 100644 --- a/data/maps/MtPyre_Exterior/scripts.inc +++ b/data/maps/MtPyre_Exterior/scripts.inc @@ -1,5 +1,5 @@ MtPyre_Exterior_MapScripts:: @ 8231FCC - map_script 3, MtPyre_Exterior_MapScript1_231FD2 + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Exterior_MapScript1_231FD2 .byte 0 MtPyre_Exterior_MapScript1_231FD2: @ 8231FD2 diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 6b9805fbf4..b7f6d73fc1 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -1,5 +1,5 @@ MtPyre_Summit_MapScripts:: @ 8231FF7 - map_script 3, MtPyre_Summit_MapScript1_231FFD + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Summit_MapScript1_231FFD .byte 0 MtPyre_Summit_MapScript1_231FFD: @ 8231FFD diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index 83185bc4d3..8a617236c5 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -1,6 +1,6 @@ NavelRock_Bottom_MapScripts:: @ 8269255 - map_script 3, NavelRock_Bottom_MapScript1_269260 - map_script 5, NavelRock_Bottom_MapScript1_269284 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Bottom_MapScript1_269260 + map_script MAP_SCRIPT_ON_RESUME, NavelRock_Bottom_MapScript1_269284 .byte 0 NavelRock_Bottom_MapScript1_269260: @ 8269260 diff --git a/data/maps/NavelRock_Exterior/scripts.inc b/data/maps/NavelRock_Exterior/scripts.inc index 21034a4e06..33bbb63915 100644 --- a/data/maps/NavelRock_Exterior/scripts.inc +++ b/data/maps/NavelRock_Exterior/scripts.inc @@ -1,5 +1,5 @@ NavelRock_Exterior_MapScripts:: @ 82690B2 - map_script 3, NavelRock_Exterior_MapScript1_2690B8 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Exterior_MapScript1_2690B8 .byte 0 NavelRock_Exterior_MapScript1_2690B8: @ 82690B8 diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index 795bcf0e5f..af011e0589 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -1,6 +1,6 @@ NavelRock_Top_MapScripts:: @ 8269113 - map_script 3, NavelRock_Top_MapScript1_26911E - map_script 5, NavelRock_Top_MapScript1_269151 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Top_MapScript1_26911E + map_script MAP_SCRIPT_ON_RESUME, NavelRock_Top_MapScript1_269151 .byte 0 NavelRock_Top_MapScript1_26911E: @ 826911E diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index 9d0452b6b6..d45661fc11 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -1,6 +1,6 @@ NewMauville_Entrance_MapScripts:: @ 82372AD - map_script 1, NewMauville_Entrance_MapScript1_2372B8 - map_script 3, NewMauville_Entrance_MapScript1_2372FB + map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_MapScript1_2372B8 + map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_MapScript1_2372FB .byte 0 NewMauville_Entrance_MapScript1_2372B8: @ 82372B8 diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index 38bacbde3b..0245018204 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -1,7 +1,7 @@ NewMauville_Inside_MapScripts:: @ 82373D7 - map_script 5, NewMauville_Inside_MapScript1_2373E7 - map_script 3, NewMauville_Inside_MapScript1_23741B - map_script 1, NewMauville_Inside_MapScript1_23744D + map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_MapScript1_2373E7 + map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Inside_MapScript1_23741B + map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_MapScript1_23744D .byte 0 NewMauville_Inside_MapScript1_2373E7: @ 82373E7 diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index a635b2f5cb..6f550a8b03 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -1,5 +1,5 @@ OldaleTown_MapScripts:: @ 81E8EA2 - map_script 3, OldaleTown_MapScript1_1E8EA8 + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_MapScript1_1E8EA8 .byte 0 OldaleTown_MapScript1_1E8EA8: @ 81E8EA8 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index 19f7d8f670..49452da71c 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006 - map_script 3, OldaleTown_PokemonCenter_1F_MapScript1_1FC011 - map_script 5, OldaleTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_MapScript1_1FC011 + map_script MAP_SCRIPT_ON_RESUME, OldaleTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 OldaleTown_PokemonCenter_1F_MapScript1_1FC011: @ 81FC011 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc index 788157bebf..b6795876b8 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218 - map_script 2, OldaleTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, OldaleTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, OldaleTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, OldaleTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, OldaleTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 OldaleTown_PokemonCenter_2F_EventScript_1FC22D:: @ 81FC22D diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc index 6125ed3865..0ae0a53a81 100644 --- a/data/maps/PacifidlogTown/scripts.inc +++ b/data/maps/PacifidlogTown/scripts.inc @@ -1,6 +1,6 @@ PacifidlogTown_MapScripts:: @ 81EBAB1 - map_script 3, PacifidlogTown_MapScript1_1EBABC - map_script 5, PacifidlogTown_MapScript1_1EBAC0 + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_MapScript1_1EBABC + map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_MapScript1_1EBAC0 .byte 0 PacifidlogTown_MapScript1_1EBABC: @ 81EBABC diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index ddad843fbe..89fec7f6bf 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7 - map_script 3, PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2 - map_script 5, PacifidlogTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2 + map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2: @ 82034B2 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc index 0199c22153..cb28d577ee 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635 - map_script 2, PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, PacifidlogTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 PacifidlogTown_PokemonCenter_2F_EventScript_20364A:: @ 820364A diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 0253a799fc..83ec1aa23c 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -1,6 +1,6 @@ PetalburgCity_MapScripts:: - map_script 3, PetalburgCity_MapScript1_1DC2D7 - map_script 2, PetalburgCity_MapScript2_1DC31C + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_MapScript1_1DC2D7 + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_MapScript2_1DC31C .byte 0 PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7 diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 474fe0df56..09f20ecf40 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -1,8 +1,8 @@ PetalburgCity_Gym_MapScripts:: @ 8204889 - map_script 1, PetalburgCity_Gym_MapScript1_20489E - map_script 3, PetalburgCity_Gym_MapScript1_20492D - map_script 4, PetalburgCity_Gym_MapScript2_20498B - map_script 2, PetalburgCity_Gym_MapScript2_20499A + map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_MapScript1_20489E + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_MapScript1_20492D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_Gym_MapScript2_20498B + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_Gym_MapScript2_20499A .byte 0 PetalburgCity_Gym_MapScript1_20489E: @ 820489E diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 1bbeb8fadb..382847bc7d 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8 - map_script 3, PetalburgCity_PokemonCenter_1F_MapScript1_2079F3 - map_script 5, PetalburgCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_MapScript1_2079F3 + map_script MAP_SCRIPT_ON_RESUME, PetalburgCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 PetalburgCity_PokemonCenter_1F_MapScript1_2079F3: @ 82079F3 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc index 38d01972af..7b5f5af558 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41 - map_script 2, PetalburgCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, PetalburgCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, PetalburgCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, PetalburgCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 PetalburgCity_PokemonCenter_2F_EventScript_207D56:: @ 8207D56 diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index ac41aaa28f..1a47543749 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -1,6 +1,6 @@ PetalburgCity_WallysHouse_MapScripts:: @ 8204229 - map_script 2, PetalburgCity_WallysHouse_MapScript2_204247 - map_script 4, PetalburgCity_WallysHouse_MapScript2_204234 + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_MapScript2_204247 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_WallysHouse_MapScript2_204234 .byte 0 PetalburgCity_WallysHouse_MapScript2_204234: @ 8204234 diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index ca9d94127c..8ee9ea05e7 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -1,6 +1,6 @@ Route101_MapScripts:: @ 81EBCBA - map_script 3, Route101_MapScript1_1EBCC5 - map_script 2, Route101_MapScript2_1EBCCB + map_script MAP_SCRIPT_ON_TRANSITION, Route101_MapScript1_1EBCC5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_MapScript2_1EBCCB .byte 0 Route101_MapScript1_1EBCC5: @ 81EBCC5 diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 798e32715a..f863e6dc76 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -1,6 +1,6 @@ Route103_MapScripts:: @ 81EC38E - map_script 3, Route103_MapScript1_1EC399 - map_script 1, Route103_MapScript1_1EC3A4 + map_script MAP_SCRIPT_ON_TRANSITION, Route103_MapScript1_1EC399 + map_script MAP_SCRIPT_ON_LOAD, Route103_MapScript1_1EC3A4 .byte 0 Route103_MapScript1_1EC399: @ 81EC399 diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 7d2e06876e..159fff9abc 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -1,6 +1,6 @@ Route104_MapScripts:: @ 81ECC32 - map_script 2, Route104_MapScript2_1ECC3D - map_script 3, Route104_MapScript1_1ECC4E + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_MapScript2_1ECC3D + map_script MAP_SCRIPT_ON_TRANSITION, Route104_MapScript1_1ECC4E .byte 0 Route104_MapScript2_1ECC3D: @ 81ECC3D diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index 17ed47206a..ef3e92e569 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -1,5 +1,5 @@ Route104_MrBrineysHouse_MapScripts:: @ 8229D2E - map_script 3, Route104_MrBrineysHouse_MapScript1_229D34 + map_script MAP_SCRIPT_ON_TRANSITION, Route104_MrBrineysHouse_MapScript1_229D34 .byte 0 Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index a1f0706510..26dfe7f8a4 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -1,5 +1,5 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C - map_script 3, Route104_PrettyPetalFlowerShop_MapScript1_22A352 + map_script MAP_SCRIPT_ON_TRANSITION, Route104_PrettyPetalFlowerShop_MapScript1_22A352 .byte 0 Route104_PrettyPetalFlowerShop_MapScript1_22A352: @ 822A352 diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index b4213af5bc..6ad11bc523 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -1,7 +1,7 @@ Route105_MapScripts:: @ 81EE1DB - map_script 1, Route105_MapScript1_1EE1EB - map_script 3, Route105_MapScript1_1EE21E - map_script 2, Route105_MapScript2_1EE240 + map_script MAP_SCRIPT_ON_LOAD, Route105_MapScript1_1EE1EB + map_script MAP_SCRIPT_ON_TRANSITION, Route105_MapScript1_1EE21E + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route105_MapScript2_1EE240 .byte 0 Route105_MapScript1_1EE1EB: @ 81EE1EB diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index 89e31d639b..ed27e32ff6 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -1,5 +1,5 @@ Route109_SeashoreHouse_MapScripts:: @ 82693F4 - map_script 3, Route109_SeashoreHouse_MapScript1_2693FA + map_script MAP_SCRIPT_ON_TRANSITION, Route109_SeashoreHouse_MapScript1_2693FA .byte 0 Route109_SeashoreHouse_MapScript1_2693FA: @ 82693FA diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 578a19a21a..1a45bee608 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -1,7 +1,7 @@ Route110_MapScripts:: @ 81EF269 - map_script 5, Route110_MapScript1_1EF279 - map_script 3, Route110_MapScript1_1EF27D - map_script 2, Route110_MapScript2_1EF297 + map_script MAP_SCRIPT_ON_RESUME, Route110_MapScript1_1EF279 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_MapScript1_1EF27D + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_MapScript2_1EF297 .byte 0 Route110_MapScript1_1EF279: @ 81EF279 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index a993364e6a..1d353dcdd1 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1 - map_script 3, Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7 .byte 0 Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7: @ 826EBA7 diff --git a/data/maps/Route110_TrickHouseCorridor/scripts.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc index cf520c81f7..f15c8c7069 100644 --- a/data/maps/Route110_TrickHouseCorridor/scripts.inc +++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc @@ -1,5 +1,5 @@ Route110_TrickHouseCorridor_MapScripts:: @ 826B903 - map_script 3, Route110_TrickHouseCorridor_MapScript1_26B909 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseCorridor_MapScript1_26B909 .byte 0 Route110_TrickHouseCorridor_MapScript1_26B909: @ 826B909 diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 770c397682..749e6fbb2b 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -1,8 +1,8 @@ Route110_TrickHouseEnd_MapScripts:: @ 826ACAF - map_script 5, Route110_TrickHouseEnd_MapScript1_26ACC4 - map_script 3, Route110_TrickHouseEnd_MapScript1_26ACD0 - map_script 2, Route110_TrickHouseEnd_MapScript2_26ACF5 - map_script 4, Route110_TrickHouseEnd_MapScript2_26ACDE + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHouseEnd_MapScript1_26ACC4 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEnd_MapScript1_26ACD0 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEnd_MapScript2_26ACF5 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEnd_MapScript2_26ACDE .byte 0 Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4 diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 7dc918f2d4..b97c257814 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -1,7 +1,7 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8269A50 - map_script 3, Route110_TrickHouseEntrance_MapScript1_269A60 - map_script 2, Route110_TrickHouseEntrance_MapScript2_269CEE - map_script 4, Route110_TrickHouseEntrance_MapScript2_269BD3 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEntrance_MapScript1_269A60 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_MapScript2_269CEE + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_MapScript2_269BD3 .byte 0 Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index b34a9d5552..3ec5ac82ce 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 826B90F - map_script 1, Route110_TrickHousePuzzle1_MapScript1_26B915 + map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle1_MapScript1_26B915 .byte 0 Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915 diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index 560d100601..0e84817340 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 826BB73 - map_script 5, Route110_TrickHousePuzzle2_MapScript1_26BB7E - map_script 3, Route110_TrickHousePuzzle2_MapScript1_26BBAB + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle2_MapScript1_26BB7E + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle2_MapScript1_26BBAB .byte 0 Route110_TrickHousePuzzle2_MapScript1_26BB7E: @ 826BB7E diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index b26c5473d3..3968adce27 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 826BED8 - map_script 5, Route110_TrickHousePuzzle3_MapScript1_26BEE3 - map_script 3, Route110_TrickHousePuzzle3_MapScript1_26BEFF + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle3_MapScript1_26BEE3 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle3_MapScript1_26BEFF .byte 0 Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3 diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 48ce6be8c2..7f400760a8 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle5_MapScripts:: @ 826CAF0 - map_script 3, Route110_TrickHousePuzzle5_MapScript1_26CAF6 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle5_MapScript1_26CAF6 .byte 0 Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6 diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 2cb784b505..d5725bbd8a 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle6_MapScripts:: @ 826DDA7 - map_script 3, Route110_TrickHousePuzzle6_MapScript1_26DDB2 - map_script 4, Route110_TrickHousePuzzle6_MapScript2_26DDB6 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle6_MapScript1_26DDB2 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHousePuzzle6_MapScript2_26DDB6 .byte 0 Route110_TrickHousePuzzle6_MapScript1_26DDB2: @ 826DDB2 diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 3babdbd453..55fdec0fb0 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle7_MapScripts:: @ 826E091 - map_script 5, Route110_TrickHousePuzzle7_MapScript1_26E0A6 - map_script 3, Route110_TrickHousePuzzle7_MapScript1_26E198 - map_script 1, Route110_TrickHousePuzzle7_MapScript1_26E1B4 - map_script 2, Route110_TrickHousePuzzle7_MapScript2_26E1C0 + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle7_MapScript1_26E0A6 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle7_MapScript1_26E198 + map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle7_MapScript1_26E1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHousePuzzle7_MapScript2_26E1C0 .byte 0 Route110_TrickHousePuzzle7_MapScript1_26E0A6: @ 826E0A6 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index c33dc6f115..7543690148 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -1,8 +1,8 @@ Route111_MapScripts:: @ 81F0CA7 - map_script 1, Route111_MapScript1_1F0CBC - map_script 3, Route111_MapScript1_1F0D87 - map_script 4, Route111_MapScript2_1F0E46 - map_script 2, Route111_MapScript2_1F0E56 + map_script MAP_SCRIPT_ON_LOAD, Route111_MapScript1_1F0CBC + map_script MAP_SCRIPT_ON_TRANSITION, Route111_MapScript1_1F0D87 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route111_MapScript2_1F0E46 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route111_MapScript2_1F0E56 .byte 0 Route111_MapScript1_1F0CBC: @ 81F0CBC diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc index 23dca6f0b3..9427e8692d 100644 --- a/data/maps/Route111_OldLadysRestStop/scripts.inc +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -1,5 +1,5 @@ Route111_OldLadysRestStop_MapScripts:: @ 822A916 - map_script 3, Route111_OldLadysRestStop_MapScript1_22A91C + map_script MAP_SCRIPT_ON_TRANSITION, Route111_OldLadysRestStop_MapScript1_22A91C .byte 0 Route111_OldLadysRestStop_MapScript1_22A91C: @ 822A91C diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 7f479d9f25..8c624fb214 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -1,5 +1,5 @@ Route112_MapScripts:: @ 81F1DA8 - map_script 3, Route112_MapScript1_1F1DAE + map_script MAP_SCRIPT_ON_TRANSITION, Route112_MapScript1_1F1DAE .byte 0 Route112_MapScript1_1F1DAE: @ 81F1DAE diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index a430a497e5..1f2f83589e 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -1,6 +1,6 @@ Route112_CableCarStation_MapScripts:: @ 822AABE - map_script 3, Route112_CableCarStation_MapScript1_22AAC9 - map_script 2, Route112_CableCarStation_MapScript2_22AAE9 + map_script MAP_SCRIPT_ON_TRANSITION, Route112_CableCarStation_MapScript1_22AAC9 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route112_CableCarStation_MapScript2_22AAE9 .byte 0 Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index ac27784da4..6efd05d6ec 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -1,6 +1,6 @@ Route113_MapScripts:: @ 81F2153 - map_script 5, Route113_MapScript1_1F215E - map_script 3, Route113_MapScript1_1F2161 + map_script MAP_SCRIPT_ON_RESUME, Route113_MapScript1_1F215E + map_script MAP_SCRIPT_ON_TRANSITION, Route113_MapScript1_1F2161 .byte 0 Route113_MapScript1_1F215E: @ 81F215E diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index b5b082d4d1..cbe1c210e1 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -1,5 +1,5 @@ Route113_GlassWorkshop_MapScripts:: @ 826ED03 - map_script 3, Route113_GlassWorkshop_MapScript1_26ED09 + map_script MAP_SCRIPT_ON_TRANSITION, Route113_GlassWorkshop_MapScript1_26ED09 .byte 0 Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09 diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 3c07facf3d..d4327a2f45 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -1,7 +1,7 @@ Route114_MapScripts:: @ 81F252F - map_script 3, Route114_MapScript1_1F253F - map_script 1, Route114_MapScript1_1F2561 - map_script 2, Route114_MapScript2_1F2578 + map_script MAP_SCRIPT_ON_TRANSITION, Route114_MapScript1_1F253F + map_script MAP_SCRIPT_ON_LOAD, Route114_MapScript1_1F2561 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_MapScript2_1F2578 .byte 0 Route114_MapScript1_1F253F: @ 81F253F diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index 0d942e4469..c6b63d8da3 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsHouse_MapScripts:: @ 822AD30 - map_script 3, Route114_FossilManiacsHouse_MapScript1_22AD36 + map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsHouse_MapScript1_22AD36 .byte 0 Route114_FossilManiacsHouse_MapScript1_22AD36: @ 822AD36 diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index c36abfe3b5..1a84082abd 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -1,6 +1,6 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 822AF28 - map_script 3, Route114_FossilManiacsTunnel_MapScript1_22AF33 - map_script 1, Route114_FossilManiacsTunnel_MapScript1_22AF49 + map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsTunnel_MapScript1_22AF33 + map_script MAP_SCRIPT_ON_LOAD, Route114_FossilManiacsTunnel_MapScript1_22AF49 .byte 0 Route114_FossilManiacsTunnel_MapScript1_22AF33: @ 822AF33 diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index b54365523f..1cf7ffb470 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -1,5 +1,5 @@ Route114_LanettesHouse_MapScripts:: @ 822B2C8 - map_script 3, Route114_LanettesHouse_MapScript1_22B2CE + map_script MAP_SCRIPT_ON_TRANSITION, Route114_LanettesHouse_MapScript1_22B2CE .byte 0 Route114_LanettesHouse_MapScript1_22B2CE: @ 822B2CE diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 560c360af3..9cb3ea2e01 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -1,7 +1,7 @@ Route115_MapScripts:: @ 81F2920 - map_script 1, Route115_MapScript1_1F2930 - map_script 3, Route115_MapScript1_1F2947 - map_script 2, Route115_MapScript2_1F2969 + map_script MAP_SCRIPT_ON_LOAD, Route115_MapScript1_1F2930 + map_script MAP_SCRIPT_ON_TRANSITION, Route115_MapScript1_1F2947 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route115_MapScript2_1F2969 .byte 0 Route115_MapScript1_1F2930: @ 81F2930 diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 1addad5ecb..fc8b49b305 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -1,7 +1,7 @@ Route116_MapScripts:: @ 81F2C0C - map_script 3, Route116_MapScript1_1F2C1C - map_script 1, Route116_MapScript1_1F2C4F - map_script 2, Route116_MapScript2_1F2C66 + map_script MAP_SCRIPT_ON_TRANSITION, Route116_MapScript1_1F2C1C + map_script MAP_SCRIPT_ON_LOAD, Route116_MapScript1_1F2C4F + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_MapScript2_1F2C66 .byte 0 Route116_MapScript1_1F2C1C: @ 81F2C1C diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc index 89ccdce8df..bdd22aadd9 100644 --- a/data/maps/Route116_TunnelersRestHouse/scripts.inc +++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc @@ -1,5 +1,5 @@ Route116_TunnelersRestHouse_MapScripts:: @ 822B850 - map_script 3, Route116_TunnelersRestHouse_MapScript1_22B856 + map_script MAP_SCRIPT_ON_TRANSITION, Route116_TunnelersRestHouse_MapScript1_22B856 .byte 0 Route116_TunnelersRestHouse_MapScript1_22B856: @ 822B856 diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 4a51c17d8e..08571690fe 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -1,5 +1,5 @@ Route117_MapScripts:: @ 81F397D - map_script 3, Route117_MapScript1_1F3983 + map_script MAP_SCRIPT_ON_TRANSITION, Route117_MapScript1_1F3983 .byte 0 Route117_MapScript1_1F3983: @ 81F3983 diff --git a/data/maps/Route117_PokemonDayCare/scripts.inc b/data/maps/Route117_PokemonDayCare/scripts.inc index b2e9ddfaaf..ea9894ffca 100644 --- a/data/maps/Route117_PokemonDayCare/scripts.inc +++ b/data/maps/Route117_PokemonDayCare/scripts.inc @@ -1,5 +1,5 @@ Route117_PokemonDayCare_MapScripts:: @ 822BBB1 - map_script 3, Route117_PokemonDayCare_MapScript1_22BBB7 + map_script MAP_SCRIPT_ON_TRANSITION, Route117_PokemonDayCare_MapScript1_22BBB7 .byte 0 Route117_PokemonDayCare_MapScript1_22BBB7: @ 822BBB7 diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 4e5279510e..5ba60d5cdf 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -1,7 +1,7 @@ Route118_MapScripts:: @ 81F3DBC - map_script 3, Route118_MapScript1_1F3DCC - map_script 1, Route118_MapScript1_1F3DF3 - map_script 2, Route118_MapScript2_1F3E0A + map_script MAP_SCRIPT_ON_TRANSITION, Route118_MapScript1_1F3DCC + map_script MAP_SCRIPT_ON_LOAD, Route118_MapScript1_1F3DF3 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_MapScript2_1F3E0A .byte 0 Route118_MapScript1_1F3DCC: @ 81F3DCC diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 8356df0635..91208f052f 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -1,6 +1,6 @@ Route119_MapScripts:: @ 81F4424 - map_script 5, Route119_MapScript1_1F442F - map_script 3, Route119_MapScript1_1F444D + map_script MAP_SCRIPT_ON_RESUME, Route119_MapScript1_1F442F + map_script MAP_SCRIPT_ON_TRANSITION, Route119_MapScript1_1F444D .byte 0 Route119_MapScript1_1F442F: @ 81F442F diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index 8d57356fdf..09ed3c4f5c 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -1,5 +1,5 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86 - map_script 3, Route119_WeatherInstitute_1F_MapScript1_26FA8C + map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_1F_MapScript1_26FA8C .byte 0 Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 21d34eed1a..7d557fdef5 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -1,5 +1,5 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E - map_script 3, Route119_WeatherInstitute_2F_MapScript1_26FF24 + map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_2F_MapScript1_26FF24 .byte 0 Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 5a29c1bb72..40c9ee09ad 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -1,7 +1,7 @@ Route120_MapScripts:: @ 81F53EC - map_script 5, Route120_MapScript1_1F53FC - map_script 3, Route120_MapScript1_1F54CD - map_script 1, Route120_MapScript1_1F5474 + map_script MAP_SCRIPT_ON_RESUME, Route120_MapScript1_1F53FC + map_script MAP_SCRIPT_ON_TRANSITION, Route120_MapScript1_1F54CD + map_script MAP_SCRIPT_ON_LOAD, Route120_MapScript1_1F5474 .byte 0 Route120_MapScript1_1F53FC: @ 81F53FC diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index f5e2fb088a..e7339f0080 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -1,5 +1,5 @@ Route121_SafariZoneEntrance_MapScripts:: @ 822BBBB - map_script 2, Route121_SafariZoneEntrance_MapScript2_22BBC1 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route121_SafariZoneEntrance_MapScript2_22BBC1 .byte 0 Route121_SafariZoneEntrance_MapScript2_22BBC1: @ 822BBC1 diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index 132a068e36..8e1692114b 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -1,5 +1,5 @@ Route123_MapScripts:: @ 81F6147 - map_script 3, Route123_MapScript1_1F614D + map_script MAP_SCRIPT_ON_TRANSITION, Route123_MapScript1_1F614D .byte 0 Route123_MapScript1_1F614D: @ 81F614D diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index 3500578efa..6d4afa30a7 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -1,5 +1,5 @@ Route123_BerryMastersHouse_MapScripts:: @ 826F83B - map_script 3, Route123_BerryMastersHouse_MapScript1_26F841 + map_script MAP_SCRIPT_ON_TRANSITION, Route123_BerryMastersHouse_MapScript1_26F841 .byte 0 Route123_BerryMastersHouse_MapScript1_26F841: @ 826F841 diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 9968d3a040..34e3157928 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -1,5 +1,5 @@ Route124_MapScripts:: @ 81F656C - map_script 3, Route124_MapScript1_1F6572 + map_script MAP_SCRIPT_ON_TRANSITION, Route124_MapScript1_1F6572 .byte 0 Route124_MapScript1_1F6572: @ 81F6572 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc index 934c6757d3..250a5ba513 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -1,5 +1,5 @@ Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8270A28 - map_script 3, Route124_DivingTreasureHuntersHouse_MapScript1_270A2E + map_script MAP_SCRIPT_ON_TRANSITION, Route124_DivingTreasureHuntersHouse_MapScript1_270A2E .byte 0 Route124_DivingTreasureHuntersHouse_MapScript1_270A2E: @ 8270A2E diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index c979577d85..4812b96919 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -1,7 +1,7 @@ Route125_MapScripts:: @ 81F6748 - map_script 3, Route125_MapScript1_1F6758 - map_script 1, Route125_MapScript1_1F6783 - map_script 2, Route125_MapScript2_1F679A + map_script MAP_SCRIPT_ON_TRANSITION, Route125_MapScript1_1F6758 + map_script MAP_SCRIPT_ON_LOAD, Route125_MapScript1_1F6783 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route125_MapScript2_1F679A .byte 0 Route125_MapScript1_1F6758: @ 81F6758 diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 29846af227..71bc77b28f 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -1,5 +1,5 @@ Route126_MapScripts:: @ 81F68C6 - map_script 3, Route126_MapScript1_1F68CC + map_script MAP_SCRIPT_ON_TRANSITION, Route126_MapScript1_1F68CC .byte 0 Route126_MapScript1_1F68CC: @ 81F68CC diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 76ade14f3f..7d5eee844c 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -1,7 +1,7 @@ Route127_MapScripts:: @ 81F69D9 - map_script 3, Route127_MapScript1_1F69E9 - map_script 1, Route127_MapScript1_1F6A14 - map_script 2, Route127_MapScript2_1F6A2B + map_script MAP_SCRIPT_ON_TRANSITION, Route127_MapScript1_1F69E9 + map_script MAP_SCRIPT_ON_LOAD, Route127_MapScript1_1F6A14 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route127_MapScript2_1F6A2B .byte 0 Route127_MapScript1_1F69E9: @ 81F69E9 diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 3ec3d2fe7e..b12443756d 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -1,6 +1,6 @@ Route128_MapScripts:: @ 81F6B38 - map_script 3, Route128_MapScript1_1F6B43 - map_script 2, Route128_MapScript2_1F6B4D + map_script MAP_SCRIPT_ON_TRANSITION, Route128_MapScript1_1F6B43 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route128_MapScript2_1F6B4D .byte 0 Route128_MapScript1_1F6B43: @ 81F6B43 diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index c1bd91f0a2..8aec4bc289 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -1,7 +1,7 @@ Route129_MapScripts:: @ 81F7284 - map_script 3, Route129_MapScript1_1F72AB - map_script 1, Route129_MapScript1_1F7294 - map_script 2, Route129_MapScript2_1F72E2 + map_script MAP_SCRIPT_ON_TRANSITION, Route129_MapScript1_1F72AB + map_script MAP_SCRIPT_ON_LOAD, Route129_MapScript1_1F7294 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_MapScript2_1F72E2 .byte 0 Route129_MapScript1_1F7294: @ 81F7294 diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 797cc302c6..18dce324d9 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -1,5 +1,5 @@ Route130_MapScripts:: @ 81F735F - map_script 3, Route130_MapScript1_1F7365 + map_script MAP_SCRIPT_ON_TRANSITION, Route130_MapScript1_1F7365 .byte 0 Route130_MapScript1_1F7365: @ 81F7365 diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index 9cbd6eb6d3..7f50b2273a 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -1,5 +1,5 @@ Route131_MapScripts:: @ 81F7404 - map_script 3, Route131_MapScript1_1F740A + map_script MAP_SCRIPT_ON_TRANSITION, Route131_MapScript1_1F740A .byte 0 Route131_MapScript1_1F740A: @ 81F740A diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index f6f4feee3a..a941e19b50 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -1,5 +1,5 @@ Route134_MapScripts:: @ 81F7644 - map_script 5, Route134_MapScript1_1F764A + map_script MAP_SCRIPT_ON_RESUME, Route134_MapScript1_1F764A .byte 0 Route134_MapScript1_1F764A: @ 81F764A diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index f475f02e3b..a3bd8f5970 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -1,6 +1,6 @@ RustboroCity_MapScripts:: @ 81E06BD - map_script 3, RustboroCity_MapScript1_1E06C8 - map_script 2, RustboroCity_MapScript2_1E070B + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_MapScript1_1E06C8 + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_MapScript2_1E070B .byte 0 RustboroCity_MapScript1_1E06C8: @ 81E06C8 diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index a7a84335b9..4f1971c80b 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -1,5 +1,5 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8211245 - map_script 3, RustboroCity_DevonCorp_1F_MapScript1_21124B + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_1F_MapScript1_21124B .byte 0 RustboroCity_DevonCorp_1F_MapScript1_21124B: @ 821124B diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 1631d923d4..622ea9cf77 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -1,5 +1,5 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857 - map_script 3, RustboroCity_DevonCorp_2F_MapScript1_21185D + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_2F_MapScript1_21185D .byte 0 RustboroCity_DevonCorp_2F_MapScript1_21185D: @ 821185D diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 7c45570588..d53119e69c 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -1,7 +1,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D - map_script 3, RustboroCity_DevonCorp_3F_MapScript1_21243D - map_script 4, RustboroCity_DevonCorp_3F_MapScript2_212455 - map_script 2, RustboroCity_DevonCorp_3F_MapScript2_212464 + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_MapScript1_21243D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212455 + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212464 .byte 0 RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index f76603dbde..e7bea0f0df 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62 - map_script 3, RustboroCity_PokemonCenter_1F_MapScript1_214D6D - map_script 5, RustboroCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_MapScript1_214D6D + map_script MAP_SCRIPT_ON_RESUME, RustboroCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 RustboroCity_PokemonCenter_1F_MapScript1_214D6D: @ 8214D6D diff --git a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc index a1bdeba5bf..fac3cb0590 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE - map_script 2, RustboroCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, RustboroCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, RustboroCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, RustboroCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, RustboroCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 RustboroCity_PokemonCenter_2F_EventScript_214EF3:: @ 8214EF3 diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 325e4186b9..de0d07ec9f 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -1,6 +1,6 @@ RusturfTunnel_MapScripts:: @ 822CE27 - map_script 3, RusturfTunnel_MapScript1_22CE44 - map_script 2, RusturfTunnel_MapScript2_22CE32 + map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_MapScript1_22CE44 + map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_MapScript2_22CE32 .byte 0 RusturfTunnel_MapScript2_22CE32: @ 822CE32 diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 20d0c72d48..ededf1e5f7 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -1,5 +1,5 @@ SSTidalCorridor_MapScripts:: @ 823BFCF - map_script 2, SSTidalCorridor_MapScript2_23BFD5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_MapScript2_23BFD5 .byte 0 SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5 diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index ab6f70f865..8ba86b3c83 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -1,6 +1,6 @@ SafariZone_South_MapScripts:: @ 823D279 - map_script 3, SafariZone_South_MapScript1_23D2B1 - map_script 2, SafariZone_South_MapScript2_23D284 + map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_South_MapScript1_23D2B1 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SafariZone_South_MapScript2_23D284 .byte 0 SafariZone_South_MapScript2_23D284: @ 823D284 diff --git a/data/maps/ScorchedSlab/scripts.inc b/data/maps/ScorchedSlab/scripts.inc index f83724ec57..62a5467807 100644 --- a/data/maps/ScorchedSlab/scripts.inc +++ b/data/maps/ScorchedSlab/scripts.inc @@ -1,5 +1,5 @@ ScorchedSlab_MapScripts:: @ 8239291 - map_script 3, ScorchedSlab_MapScript1_239297 + map_script MAP_SCRIPT_ON_TRANSITION, ScorchedSlab_MapScript1_239297 .byte 0 ScorchedSlab_MapScript1_239297: @ 8239297 diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index 13b65c7227..045c0e0652 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -1,5 +1,5 @@ SeafloorCavern_Entrance_MapScripts:: @ 823446E - map_script 5, SeafloorCavern_Entrance_MapScript1_234474 + map_script MAP_SCRIPT_ON_RESUME, SeafloorCavern_Entrance_MapScript1_234474 .byte 0 SeafloorCavern_Entrance_MapScript1_234474: @ 8234474 diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc index 4b461a684b..71e6426fe2 100644 --- a/data/maps/SealedChamber_OuterRoom/scripts.inc +++ b/data/maps/SealedChamber_OuterRoom/scripts.inc @@ -1,7 +1,7 @@ SealedChamber_OuterRoom_MapScripts:: @ 8239106 - map_script 5, SealedChamber_OuterRoom_MapScript1_239116 - map_script 3, SealedChamber_OuterRoom_MapScript1_239127 - map_script 1, SealedChamber_OuterRoom_MapScript1_23912B + map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_MapScript1_239116 + map_script MAP_SCRIPT_ON_TRANSITION, SealedChamber_OuterRoom_MapScript1_239127 + map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_MapScript1_23912B .byte 0 SealedChamber_OuterRoom_MapScript1_239116: @ 8239116 diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc index 32da393883..cb26f924e1 100644 --- a/data/maps/SecretBase_YellowCave4/scripts.inc +++ b/data/maps/SecretBase_YellowCave4/scripts.inc @@ -1,8 +1,8 @@ SecretBase_YellowCave4_MapScripts:: @ 823B483 - map_script 4, SecretBase_RedCave1_MapScript2_23B498 - map_script 3, SecretBase_RedCave1_MapScript1_23B4A2 - map_script 2, SecretBase_RedCave1_MapScript2_23B4AE - map_script 5, SecretBase_RedCave1_MapScript1_23B4B8 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_RedCave1_MapScript2_23B498 + map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_RedCave1_MapScript1_23B4A2 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_RedCave1_MapScript2_23B4AE + map_script MAP_SCRIPT_ON_RESUME, SecretBase_RedCave1_MapScript1_23B4B8 .byte 0 SecretBase_RedCave1_MapScript2_23B498: @ 823B498 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index fa2aca8e0d..218cabc677 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA - map_script 3, ShoalCave_LowTideEntranceRoom_MapScript1_236DC0 + map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideEntranceRoom_MapScript1_236DC0 .byte 0 ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index 7a7c3e337a..f1a29b28a5 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 8236EF5 - map_script 1, ShoalCave_LowTideInnerRoom_MapScript1_236F16 - map_script 3, ShoalCave_LowTideInnerRoom_MapScript1_236F00 + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideInnerRoom_MapScript1_236F16 + map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideInnerRoom_MapScript1_236F00 .byte 0 ShoalCave_LowTideInnerRoom_MapScript1_236F00: @ 8236F00 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index d493469fab..8492afe5b5 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideLowerRoom_MapScripts:: @ 8237156 - map_script 1, ShoalCave_LowTideLowerRoom_MapScript1_23715C + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideLowerRoom_MapScript1_23715C .byte 0 ShoalCave_LowTideLowerRoom_MapScript1_23715C: @ 823715C diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index 6e3bb63fe4..74b653a5f9 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideStairsRoom_MapScripts:: @ 82370FA - map_script 1, ShoalCave_LowTideStairsRoom_MapScript1_237100 + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideStairsRoom_MapScript1_237100 .byte 0 ShoalCave_LowTideStairsRoom_MapScript1_237100: @ 8237100 diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc index a0b62df258..b1ec3b74a5 100644 --- a/data/maps/SkyPillar_1F/scripts.inc +++ b/data/maps/SkyPillar_1F/scripts.inc @@ -1,5 +1,5 @@ SkyPillar_1F_MapScripts:: @ 8239615 - map_script 3, SkyPillar_1F_MapScript1_23961B + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_1F_MapScript1_23961B .byte 0 SkyPillar_1F_MapScript1_23961B: @ 823961B diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index a0a4aeaf33..8c1424fd93 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_2F_MapScripts:: @ 823962B - map_script 2, SkyPillar_2F_MapScript2_2A8327 - map_script 3, SkyPillar_2F_MapScript1_23963B - map_script 5, SkyPillar_2F_MapScript1_239650 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_2F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_2F_MapScript1_23963B + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_2F_MapScript1_239650 .byte 0 SkyPillar_2F_MapScript1_23963B: @ 823963B diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc index d78ee62665..9bc7eda27d 100644 --- a/data/maps/SkyPillar_3F/scripts.inc +++ b/data/maps/SkyPillar_3F/scripts.inc @@ -1,5 +1,5 @@ SkyPillar_3F_MapScripts:: @ 823965B - map_script 3, SkyPillar_3F_MapScript1_239661 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_3F_MapScript1_239661 .byte 0 SkyPillar_3F_MapScript1_239661: @ 8239661 diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index 3904e954f4..254d61a59f 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_4F_MapScripts:: @ 8239671 - map_script 2, SkyPillar_4F_MapScript2_2A8327 - map_script 3, SkyPillar_4F_MapScript1_239681 - map_script 5, SkyPillar_4F_MapScript1_239696 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_4F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_4F_MapScript1_239681 + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_4F_MapScript1_239696 .byte 0 SkyPillar_4F_MapScript1_239681: @ 8239681 diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc index 20478e77e4..af5a5ffe12 100644 --- a/data/maps/SkyPillar_5F/scripts.inc +++ b/data/maps/SkyPillar_5F/scripts.inc @@ -1,5 +1,5 @@ SkyPillar_5F_MapScripts:: @ 82396A2 - map_script 3, SkyPillar_5F_MapScript1_2396A8 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_5F_MapScript1_2396A8 .byte 0 SkyPillar_5F_MapScript1_2396A8: @ 82396A8 diff --git a/data/maps/SkyPillar_Entrance/scripts.inc b/data/maps/SkyPillar_Entrance/scripts.inc index 09ee9eae24..40d57a4851 100644 --- a/data/maps/SkyPillar_Entrance/scripts.inc +++ b/data/maps/SkyPillar_Entrance/scripts.inc @@ -1,5 +1,5 @@ SkyPillar_Entrance_MapScripts:: @ 823929E - map_script 3, SkyPillar_Entrance_MapScript1_2392A4 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Entrance_MapScript1_2392A4 .byte 0 SkyPillar_Entrance_MapScript1_2392A4: @ 82392A4 diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index a6e7b05cc0..7b826d5765 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_Outside_MapScripts:: @ 82392A8 - map_script 3, SkyPillar_Outside_MapScript1_2392B8 - map_script 1, SkyPillar_Outside_MapScript1_2392DD - map_script 2, SkyPillar_Outside_MapScript2_2392FA + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Outside_MapScript1_2392B8 + map_script MAP_SCRIPT_ON_LOAD, SkyPillar_Outside_MapScript1_2392DD + map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_Outside_MapScript2_2392FA .byte 0 SkyPillar_Outside_MapScript1_2392B8: @ 82392B8 diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index de4706f847..3d031293db 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_Top_MapScripts:: @ 82396B8 - map_script 5, SkyPillar_Top_MapScript1_2396C8 - map_script 3, SkyPillar_Top_MapScript1_2396E6 - map_script 4, SkyPillar_Top_MapScript2_239713 + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_Top_MapScript1_2396C8 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Top_MapScript1_2396E6 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SkyPillar_Top_MapScript2_239713 .byte 0 SkyPillar_Top_MapScript1_2396C8: @ 82396C8 diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index efce9cde82..640725f33e 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -1,6 +1,6 @@ SlateportCity_MapScripts:: @ 81DCC61 - map_script 3, SlateportCity_MapScript1_1DCC6C - map_script 2, SlateportCity_MapScript2_1DCD12 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_MapScript1_1DCC6C + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_MapScript2_1DCD12 .byte 0 SlateportCity_MapScript1_1DCC6C: @ 81DCC6C diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index 9df0e0a6a5..a5e2a493c4 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -1,7 +1,7 @@ SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960 - map_script 3, SlateportCity_BattleTentBattleRoom_MapScript1_209970 - map_script 4, SlateportCity_BattleTentBattleRoom_MapScript2_20999A - map_script 2, SlateportCity_BattleTentBattleRoom_MapScript2_2099B4 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_BattleTentBattleRoom_MapScript1_209970 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentBattleRoom_MapScript2_20999A + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentBattleRoom_MapScript2_2099B4 .byte 0 SlateportCity_BattleTentBattleRoom_MapScript1_209970: @ 8209970 diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 400146b3bb..27f7fa3b99 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -1,6 +1,6 @@ SlateportCity_BattleTentCorridor_MapScripts:: @ 8208E26 - map_script 2, SlateportCity_BattleTentCorridor_MapScript2_208E5B - map_script 4, SlateportCity_BattleTentCorridor_MapScript2_208E31 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentCorridor_MapScript2_208E5B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentCorridor_MapScript2_208E31 .byte 0 SlateportCity_BattleTentCorridor_MapScript2_208E31: @ 8208E31 diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index bf84162954..19416c91b3 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -1,6 +1,6 @@ SlateportCity_BattleTentLobby_MapScripts:: @ 8208730 - map_script 2, SlateportCity_BattleTentLobby_MapScript2_20874F - map_script 4, SlateportCity_BattleTentLobby_MapScript2_20873B + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentLobby_MapScript2_20874F + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentLobby_MapScript2_20873B .byte 0 SlateportCity_BattleTentLobby_MapScript2_20873B: @ 820873B diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 138ca9859c..d69842ece4 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -1,5 +1,5 @@ SlateportCity_Harbor_MapScripts:: @ 820C97D - map_script 3, SlateportCity_Harbor_MapScript1_20C983 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_Harbor_MapScript1_20C983 .byte 0 SlateportCity_Harbor_MapScript1_20C983: @ 820C983 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index db8cc19d75..8c1f87e636 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF - map_script 3, SlateportCity_PokemonCenter_1F_MapScript1_20DACA - map_script 5, SlateportCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_MapScript1_20DACA + map_script MAP_SCRIPT_ON_RESUME, SlateportCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 SlateportCity_PokemonCenter_1F_MapScript1_20DACA: @ 820DACA diff --git a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc index 3138f20d65..1ddbcc0bed 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ SlateportCity_PokemonCenter_2F_MapScripts:: @ 820DC21 - map_script 2, SlateportCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, SlateportCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, SlateportCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, SlateportCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, SlateportCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 SlateportCity_PokemonCenter_2F_EventScript_20DC36:: @ 820DC36 diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index bfebcf0559..fb7dae6c9a 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -1,9 +1,9 @@ SootopolisCity_MapScripts:: @ 81E565C - map_script 1, SootopolisCity_MapScript1_1E5676 - map_script 3, SootopolisCity_MapScript1_1E56EF - map_script 5, SootopolisCity_MapScript1_1E590B - map_script 2, SootopolisCity_MapScript2_1E5914 - map_script 4, SootopolisCity_MapScript2_1E58DB + map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_MapScript1_1E5676 + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MapScript1_1E56EF + map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_MapScript1_1E590B + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MapScript2_1E5914 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_MapScript2_1E58DB .byte 0 SootopolisCity_MapScript1_1E5676: @ 81E5676 diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index d5bb3d790e..06bc91f218 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -1,8 +1,8 @@ SootopolisCity_Gym_1F_MapScripts:: @ 8224E4C - map_script 2, SootopolisCity_Gym_1F_MapScript2_224ECB - map_script 5, SootopolisCity_Gym_1F_MapScript1_224E67 - map_script 1, SootopolisCity_Gym_1F_MapScript1_224E6A - map_script 3, SootopolisCity_Gym_1F_MapScript1_224E61 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_MapScript2_224ECB + map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_MapScript1_224E67 + map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_MapScript1_224E6A + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_Gym_1F_MapScript1_224E61 .byte 0 SootopolisCity_Gym_1F_MapScript1_224E61: @ 8224E61 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index a44615e9fd..76ec3a59ff 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -1,6 +1,6 @@ SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953 - map_script 3, SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E - map_script 2, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D .byte 0 SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index 0de8651d7f..33cb5db8e2 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -1,6 +1,6 @@ SootopolisCity_MysteryEventsHouse_B1F_MapScripts:: @ 8227E4F - map_script 3, SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A - map_script 2, SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E .byte 0 SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A: @ 8227E5A diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index 2e7e804ce4..96f766f7b3 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1 - map_script 3, SootopolisCity_PokemonCenter_1F_MapScript1_2264FC - map_script 5, SootopolisCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_MapScript1_2264FC + map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 SootopolisCity_PokemonCenter_1F_MapScript1_2264FC: @ 82264FC diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc index 43d8a9d2ff..275fe30467 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ SootopolisCity_PokemonCenter_2F_MapScripts:: @ 822676D - map_script 2, SootopolisCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, SootopolisCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, SootopolisCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, SootopolisCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 SootopolisCity_PokemonCenter_2F_EventScript_226782:: @ 8226782 diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index 8eb00337f4..618ce864a8 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -1,5 +1,5 @@ SouthernIsland_Exterior_MapScripts:: @ 82429C8 - map_script 3, SouthernIsland_Exterior_MapScript1_2429CE + map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Exterior_MapScript1_2429CE .byte 0 SouthernIsland_Exterior_MapScript1_2429CE: @ 82429CE diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index c5cbe0f5e0..a24bc772f2 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -1,6 +1,6 @@ SouthernIsland_Interior_MapScripts:: @ 8242A45 - map_script 5, SouthernIsland_Interior_MapScript1_242A50 - map_script 3, SouthernIsland_Interior_MapScript1_242A6E + map_script MAP_SCRIPT_ON_RESUME, SouthernIsland_Interior_MapScript1_242A50 + map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Interior_MapScript1_242A6E .byte 0 SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index 9e88be494e..3f892315d1 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -1,6 +1,6 @@ TerraCave_End_MapScripts:: @ 823B0B0 - map_script 5, TerraCave_End_MapScript1_23B0BB - map_script 3, TerraCave_End_MapScript1_23B0D9 + map_script MAP_SCRIPT_ON_RESUME, TerraCave_End_MapScript1_23B0BB + map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_End_MapScript1_23B0D9 .byte 0 TerraCave_End_MapScript1_23B0BB: @ 823B0BB diff --git a/data/maps/TerraCave_Entrance/scripts.inc b/data/maps/TerraCave_Entrance/scripts.inc index b9a17701bd..b9e3e59104 100644 --- a/data/maps/TerraCave_Entrance/scripts.inc +++ b/data/maps/TerraCave_Entrance/scripts.inc @@ -1,5 +1,5 @@ TerraCave_Entrance_MapScripts:: @ 823B0A6 - map_script 3, TerraCave_Entrance_MapScript1_23B0AC + map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_Entrance_MapScript1_23B0AC .byte 0 TerraCave_Entrance_MapScript1_23B0AC: @ 823B0AC diff --git a/data/maps/TrainerHill_1F/scripts.inc b/data/maps/TrainerHill_1F/scripts.inc index 465a6d7812..e726f85660 100644 --- a/data/maps/TrainerHill_1F/scripts.inc +++ b/data/maps/TrainerHill_1F/scripts.inc @@ -1,6 +1,6 @@ TrainerHill_1F_MapScripts:: @ 8268F71 - map_script 5, TrainerHill_1F_MapScript1_2C8336 - map_script 4, TrainerHill_1F_MapScript2_2C8372 - map_script 2, TrainerHill_1F_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_1F_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_1F_MapScript2_2C8372 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_1F_MapScript2_2C8381 .byte 0 diff --git a/data/maps/TrainerHill_2F/scripts.inc b/data/maps/TrainerHill_2F/scripts.inc index ca8eeff72c..dd1f356de2 100644 --- a/data/maps/TrainerHill_2F/scripts.inc +++ b/data/maps/TrainerHill_2F/scripts.inc @@ -1,6 +1,6 @@ TrainerHill_2F_MapScripts:: @ 8268F81 - map_script 5, TrainerHill_2F_MapScript1_2C8336 - map_script 4, TrainerHill_2F_MapScript2_2C8372 - map_script 2, TrainerHill_2F_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_2F_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_2F_MapScript2_2C8372 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_2F_MapScript2_2C8381 .byte 0 diff --git a/data/maps/TrainerHill_3F/scripts.inc b/data/maps/TrainerHill_3F/scripts.inc index 921a8d808f..b4793f457a 100644 --- a/data/maps/TrainerHill_3F/scripts.inc +++ b/data/maps/TrainerHill_3F/scripts.inc @@ -1,5 +1,5 @@ TrainerHill_3F_MapScripts:: @ 8268F91 - map_script 5, TrainerHill_3F_MapScript1_2C8336 - map_script 2, TrainerHill_3F_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_3F_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_3F_MapScript2_2C8381 .byte 0 diff --git a/data/maps/TrainerHill_4F/scripts.inc b/data/maps/TrainerHill_4F/scripts.inc index 0f710152c8..66b8ed3bb1 100644 --- a/data/maps/TrainerHill_4F/scripts.inc +++ b/data/maps/TrainerHill_4F/scripts.inc @@ -1,5 +1,5 @@ TrainerHill_4F_MapScripts:: @ 8268F9C - map_script 5, TrainerHill_4F_MapScript1_2C8336 - map_script 2, TrainerHill_4F_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_4F_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_4F_MapScript2_2C8381 .byte 0 diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc index c3a71d4929..ecc48a9e9b 100644 --- a/data/maps/TrainerHill_Elevator/scripts.inc +++ b/data/maps/TrainerHill_Elevator/scripts.inc @@ -1,5 +1,5 @@ TrainerHill_Elevator_MapScripts:: @ 826934F - map_script 2, TrainerHill_Elevator_MapScript2_269355 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Elevator_MapScript2_269355 .byte 0 TrainerHill_Elevator_MapScript2_269355: @ 8269355 diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 57dbbe13d1..5339f49e3a 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -1,9 +1,9 @@ TrainerHill_Entrance_MapScripts:: @ 82680AC - map_script 5, TrainerHill_Entrance_MapScript1_2680D0 - map_script 7, TrainerHill_Entrance_MapScript1_26811B - map_script 3, TrainerHill_Entrance_MapScript1_2680C6 - map_script 1, TrainerHill_Entrance_MapScript1_268128 - map_script 2, TrainerHill_Entrance_MapScript2_26813E + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Entrance_MapScript1_2680D0 + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerHill_Entrance_MapScript1_26811B + map_script MAP_SCRIPT_ON_TRANSITION, TrainerHill_Entrance_MapScript1_2680C6 + map_script MAP_SCRIPT_ON_LOAD, TrainerHill_Entrance_MapScript1_268128 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Entrance_MapScript2_26813E .byte 0 TrainerHill_Entrance_MapScript1_2680C6: @ 82680C6 diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc index b959481f22..fc1ca200f1 100644 --- a/data/maps/TrainerHill_Roof/scripts.inc +++ b/data/maps/TrainerHill_Roof/scripts.inc @@ -1,6 +1,6 @@ TrainerHill_Roof_MapScripts:: @ 8268FA7 - map_script 5, TrainerHill_Roof_MapScript1_2C8336 - map_script 2, TrainerHill_Roof_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Roof_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Roof_MapScript2_2C8381 .byte 0 TrainerHill_Roof_EventScript_268FB2:: @ 8268FB2 diff --git a/data/maps/Underwater3/scripts.inc b/data/maps/Underwater3/scripts.inc index 463f7a0ff7..99f0efcf02 100644 --- a/data/maps/Underwater3/scripts.inc +++ b/data/maps/Underwater3/scripts.inc @@ -1,5 +1,5 @@ Underwater3_MapScripts:: @ 81F7724 - map_script 5, Underwater3_MapScript1_1F772A + map_script MAP_SCRIPT_ON_RESUME, Underwater3_MapScript1_1F772A .byte 0 Underwater3_MapScript1_1F772A: @ 81F772A diff --git a/data/maps/Underwater5/scripts.inc b/data/maps/Underwater5/scripts.inc index 9d0cc373c3..ea37514eb6 100644 --- a/data/maps/Underwater5/scripts.inc +++ b/data/maps/Underwater5/scripts.inc @@ -1,5 +1,5 @@ Underwater5_MapScripts:: @ 81F7731 - map_script 5, Underwater5_MapScript1_1F7737 + map_script MAP_SCRIPT_ON_RESUME, Underwater5_MapScript1_1F7737 .byte 0 Underwater5_MapScript1_1F7737: @ 81F7737 diff --git a/data/maps/Underwater6/scripts.inc b/data/maps/Underwater6/scripts.inc index 047628c9c0..fee91dc757 100644 --- a/data/maps/Underwater6/scripts.inc +++ b/data/maps/Underwater6/scripts.inc @@ -1,5 +1,5 @@ Underwater6_MapScripts:: @ 81F773D - map_script 5, Underwater6_MapScript1_1F7743 + map_script MAP_SCRIPT_ON_RESUME, Underwater6_MapScript1_1F7743 .byte 0 Underwater6_MapScript1_1F7743: @ 81F7743 diff --git a/data/maps/Underwater7/scripts.inc b/data/maps/Underwater7/scripts.inc index dd757f98a4..a0eba386a0 100644 --- a/data/maps/Underwater7/scripts.inc +++ b/data/maps/Underwater7/scripts.inc @@ -1,5 +1,5 @@ Underwater7_MapScripts:: @ 81F7749 - map_script 5, Underwater7_MapScript1_1F774F + map_script MAP_SCRIPT_ON_RESUME, Underwater7_MapScript1_1F774F .byte 0 Underwater7_MapScript1_1F774F: @ 81F774F diff --git a/data/maps/Underwater_MarineCave/scripts.inc b/data/maps/Underwater_MarineCave/scripts.inc index d6a3aa0db2..9309d51f45 100644 --- a/data/maps/Underwater_MarineCave/scripts.inc +++ b/data/maps/Underwater_MarineCave/scripts.inc @@ -1,6 +1,6 @@ Underwater_MarineCave_MapScripts:: @ 823AFB8 - map_script 5, Underwater_MarineCave_MapScript1_23AFC7 - map_script 3, Underwater_MarineCave_MapScript1_23AFC3 + map_script MAP_SCRIPT_ON_RESUME, Underwater_MarineCave_MapScript1_23AFC7 + map_script MAP_SCRIPT_ON_TRANSITION, Underwater_MarineCave_MapScript1_23AFC3 .byte 0 Underwater_MarineCave_MapScript1_23AFC3: @ 823AFC3 diff --git a/data/maps/Underwater_Route134/scripts.inc b/data/maps/Underwater_Route134/scripts.inc index 786de17572..acffa23a28 100644 --- a/data/maps/Underwater_Route134/scripts.inc +++ b/data/maps/Underwater_Route134/scripts.inc @@ -1,5 +1,5 @@ Underwater_Route134_MapScripts:: @ 82390B5 - map_script 5, Underwater_Route134_MapScript1_2390BB + map_script MAP_SCRIPT_ON_RESUME, Underwater_Route134_MapScript1_2390BB .byte 0 Underwater_Route134_MapScript1_2390BB: @ 82390BB diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc index efd2e94386..9dc5b406ac 100644 --- a/data/maps/Underwater_SeafloorCavern/scripts.inc +++ b/data/maps/Underwater_SeafloorCavern/scripts.inc @@ -1,7 +1,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 823433B - map_script 5, Underwater_SeafloorCavern_MapScript1_2343D3 - map_script 3, Underwater_SeafloorCavern_MapScript1_23434B - map_script 1, Underwater_SeafloorCavern_MapScript1_23435C + map_script MAP_SCRIPT_ON_RESUME, Underwater_SeafloorCavern_MapScript1_2343D3 + map_script MAP_SCRIPT_ON_TRANSITION, Underwater_SeafloorCavern_MapScript1_23434B + map_script MAP_SCRIPT_ON_LOAD, Underwater_SeafloorCavern_MapScript1_23435C .byte 0 Underwater_SeafloorCavern_MapScript1_23434B: @ 823434B diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc index de6ed50d18..9ec884781a 100644 --- a/data/maps/Underwater_SealedChamber/scripts.inc +++ b/data/maps/Underwater_SealedChamber/scripts.inc @@ -1,5 +1,5 @@ Underwater_SealedChamber_MapScripts:: @ 82390C4 - map_script 6, Underwater_SealedChamber_MapScript1_2390CA + map_script MAP_SCRIPT_ON_DIVE_WARP, Underwater_SealedChamber_MapScript1_2390CA .byte 0 Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA diff --git a/data/maps/Underwater_SootopolisCity/scripts.inc b/data/maps/Underwater_SootopolisCity/scripts.inc index cbeefcb1d6..d5040dba0a 100644 --- a/data/maps/Underwater_SootopolisCity/scripts.inc +++ b/data/maps/Underwater_SootopolisCity/scripts.inc @@ -1,5 +1,5 @@ Underwater_SootopolisCity_MapScripts:: @ 822D94C - map_script 5, Underwater_SootopolisCity_MapScript1_22D952 + map_script MAP_SCRIPT_ON_RESUME, Underwater_SootopolisCity_MapScript1_22D952 .byte 0 Underwater_SootopolisCity_MapScript1_22D952: @ 822D952 diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc index f71c40e3d2..0871ae0335 100644 --- a/data/maps/UnionRoom/scripts.inc +++ b/data/maps/UnionRoom/scripts.inc @@ -1,6 +1,6 @@ UnionRoom_MapScripts:: @ 823D1A6 - map_script 5, UnionRoom_MapScript1_23D1B1 - map_script 3, UnionRoom_MapScript1_23D1E5 + map_script MAP_SCRIPT_ON_RESUME, UnionRoom_MapScript1_23D1B1 + map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_MapScript1_23D1E5 .byte 0 UnionRoom_MapScript1_23D1B1: @ 823D1B1 diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index 74aa613c78..f940af2f93 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -1,5 +1,5 @@ VerdanturfTown_MapScripts:: @ 81EB566 - map_script 3, VerdanturfTown_MapScript1_1EB56C + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_MapScript1_1EB56C .byte 0 VerdanturfTown_MapScript1_1EB56C: @ 81EB56C diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index c5f3186637..9d98e790c3 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -1,7 +1,7 @@ VerdanturfTown_BattleTentBattleRoom_MapScripts:: @ 82022FA - map_script 3, VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A - map_script 2, VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E - map_script 4, VerdanturfTown_BattleTentBattleRoom_MapScript2_202541 + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A + map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentBattleRoom_MapScript2_202541 .byte 0 VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A: @ 820230A diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc index e5d7e45e9d..907ef3fd62 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc @@ -1,5 +1,5 @@ VerdanturfTown_BattleTentCorridor_MapScripts:: @ 820208A - map_script 2, VerdanturfTown_BattleTentCorridor_MapScript2_202090 + map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentCorridor_MapScript2_202090 .byte 0 VerdanturfTown_BattleTentCorridor_MapScript2_202090: @ 8202090 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index e699e6427d..f6bb194a3e 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -1,6 +1,6 @@ VerdanturfTown_BattleTentLobby_MapScripts:: @ 82016D0 - map_script 2, VerdanturfTown_BattleTentLobby_MapScript2_2016EF - map_script 4, VerdanturfTown_BattleTentLobby_MapScript2_2016DB + map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentLobby_MapScript2_2016EF + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentLobby_MapScript2_2016DB .byte 0 VerdanturfTown_BattleTentLobby_MapScript2_2016DB: @ 82016DB diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index da8676aec0..474448132a 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726 - map_script 3, VerdanturfTown_PokemonCenter_1F_MapScript1_202731 - map_script 5, VerdanturfTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_MapScript1_202731 + map_script MAP_SCRIPT_ON_RESUME, VerdanturfTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 VerdanturfTown_PokemonCenter_1F_MapScript1_202731: @ 8202731 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc index 9e93a628ee..b09335fb26 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8202897 - map_script 2, VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 VerdanturfTown_PokemonCenter_2F_EventScript_2028AC:: @ 82028AC diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index fdb0947d8e..f5efbe38ad 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -1,5 +1,5 @@ VictoryRoad_1F_MapScripts:: @ 8235D7A - map_script 3, VictoryRoad_1F_MapScript1_235D80 + map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_MapScript1_235D80 .byte 0 VictoryRoad_1F_MapScript1_235D80: @ 8235D80 From a5cf2b8090fb6638857b91f4f2a58c5584ca9335 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 25 Feb 2019 02:09:02 -0500 Subject: [PATCH 120/217] Use map script constants in map script functions --- src/script.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/script.c b/src/script.c index dff99609bd..c95a1141fd 100644 --- a/src/script.c +++ b/src/script.c @@ -2,6 +2,7 @@ #include "script.h" #include "event_data.h" #include "util.h" +#include "constants/map_scripts.h" #define RAM_SCRIPT_MAGIC 51 @@ -293,32 +294,32 @@ u8 *MapHeaderCheckScriptTable(u8 tag) void RunOnLoadMapScript(void) { - MapHeaderRunScriptType(1); + MapHeaderRunScriptType(MAP_SCRIPT_ON_LOAD); } void RunOnTransitionMapScript(void) { - MapHeaderRunScriptType(3); + MapHeaderRunScriptType(MAP_SCRIPT_ON_TRANSITION); } void RunOnResumeMapScript(void) { - MapHeaderRunScriptType(5); + MapHeaderRunScriptType(MAP_SCRIPT_ON_RESUME); } void RunOnReturnToFieldMapScript(void) { - MapHeaderRunScriptType(7); + MapHeaderRunScriptType(MAP_SCRIPT_ON_RETURN_TO_FIELD); } void RunOnDiveWarpMapScript(void) { - MapHeaderRunScriptType(6); + MapHeaderRunScriptType(MAP_SCRIPT_ON_DIVE_WARP); } bool8 TryRunOnFrameMapScript(void) { - u8 *ptr = MapHeaderCheckScriptTable(2); + u8 *ptr = MapHeaderCheckScriptTable(MAP_SCRIPT_ON_FRAME_TABLE); if (!ptr) return FALSE; @@ -329,7 +330,7 @@ bool8 TryRunOnFrameMapScript(void) void TryRunOnWarpIntoMapScript(void) { - u8 *ptr = MapHeaderCheckScriptTable(4); + u8 *ptr = MapHeaderCheckScriptTable(MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE); if (ptr) ScriptContext2_RunNewScript(ptr); } From 7ea05431a58d63c2e0594d15e552979d20092cf6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 25 Feb 2019 14:03:13 -0600 Subject: [PATCH 121/217] Decompile more easy_chat.c --- asm/easy_chat.s | 912 ---------------------------------- include/bard_music.h | 1 + include/constants/easy_chat.h | 2 + include/easy_chat.h | 4 +- include/strings.h | 1 + src/easy_chat.c | 414 ++++++++++++++- src/mail.c | 2 +- 7 files changed, 420 insertions(+), 916 deletions(-) diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 10536929e6..2051e67e15 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5,918 +5,6 @@ .text - thumb_func_start sub_811E948 -sub_811E948: @ 811E948 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - bl sub_811E8E4 - mov r8, r0 - cmp r0, 0x3 - beq _0811E9FA - ldr r3, =0xffffff00 - ldr r0, [sp, 0xC] - ands r0, r3 - movs r1, 0x3 - orrs r0, r1 - ldr r2, =0xffff00ff - ands r0, r2 - adds r1, 0xFD - orrs r0, r1 - ldr r1, =0xff00ffff - ands r0, r1 - movs r1, 0xB0 - lsls r1, 12 - orrs r0, r1 - ldr r1, =0x00ffffff - ands r0, r1 - movs r1, 0xE0 - lsls r1, 21 - orrs r0, r1 - str r0, [sp, 0xC] - ldr r0, [sp, 0x10] - ands r0, r3 - movs r1, 0x2 - orrs r0, r1 - ands r0, r2 - movs r1, 0xB0 - lsls r1, 4 - orrs r0, r1 - ldr r1, =0x0000ffff - ands r0, r1 - movs r1, 0xD0 - lsls r1, 14 - orrs r0, r1 - str r0, [sp, 0x10] - add r0, sp, 0xC - bl AddWindow - lsls r0, 16 - lsrs r7, r0, 16 - lsls r4, r7, 24 - lsrs r0, r4, 24 - movs r1, 0x11 - bl FillWindowPixelBuffer - movs r6, 0 - mov r0, r8 - lsls r1, r0, 4 - ldr r0, =gUnknown_08597E6C - adds r5, r1, r0 - ldr r1, =gUnknown_08597E60 - mov r10, r1 - mov r9, r4 -_0811E9C6: - ldr r2, [r5] - lsls r4, r7, 24 - cmp r2, 0 - beq _0811E9EC - mov r1, r8 - lsls r0, r1, 2 - adds r0, r6, r0 - add r0, r10 - ldrb r3, [r0] - movs r0, 0x1 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - str r0, [sp, 0x8] - mov r1, r9 - lsrs r0, r1, 24 - movs r1, 0x1 - bl sub_811D028 -_0811E9EC: - adds r5, 0x4 - adds r6, 0x1 - cmp r6, 0x3 - ble _0811E9C6 - lsrs r0, r4, 24 - bl PutWindowTilemap -_0811E9FA: - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811E948 - - thumb_func_start sub_811EA28 -sub_811EA28: @ 811EA28 - push {lr} - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0 - cmp r0, 0x14 - beq _0811EA4E - cmp r0, 0x14 - bgt _0811EA48 - cmp r0, 0x11 - blt _0811EA66 - ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR - bl FlagGet - b _0811EA60 - .pool -_0811EA48: - cmp r1, 0x15 - beq _0811EA5C - b _0811EA66 -_0811EA4E: - ldr r0, =0x00000866 - bl FlagGet - b _0811EA60 - .pool -_0811EA5C: - bl sub_811F0F8 -_0811EA60: - lsls r0, 24 - lsrs r0, 24 - b _0811EA68 -_0811EA66: - movs r0, 0x1 -_0811EA68: - pop {r1} - bx r1 - thumb_func_end sub_811EA28 - - thumb_func_start EasyChat_GetNumWordsInGroup -EasyChat_GetNumWordsInGroup: @ 811EA6C - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - adds r4, r0, 0 - cmp r0, 0 - bne _0811EA84 - movs r0, 0 - bl GetNationalPokedexCount - lsls r0, 16 - lsrs r0, 16 - b _0811EA9A -_0811EA84: - bl sub_811EA28 - lsls r0, 24 - cmp r0, 0 - bne _0811EA92 - movs r0, 0 - b _0811EA9A -_0811EA92: - ldr r0, =gEasyChatGroups - lsls r1, r4, 3 - adds r1, r0 - ldrh r0, [r1, 0x6] -_0811EA9A: - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end EasyChat_GetNumWordsInGroup - - thumb_func_start sub_811EAA4 -sub_811EAA4: @ 811EAA4 - push {r4,r5,lr} - lsls r2, r0, 16 - lsrs r1, r2, 16 - ldr r0, =0x0000ffff - cmp r1, r0 - beq _0811EB04 - lsrs r3, r2, 25 - ldr r5, =0x000001ff - ands r5, r1 - cmp r3, 0x15 - bhi _0811EB08 - ldr r0, =gEasyChatGroups - lsls r2, r3, 3 - adds r1, r2, r0 - ldrh r4, [r1, 0x4] - cmp r3, 0x13 - bgt _0811EADC - cmp r3, 0x12 - bge _0811EAE0 - cmp r3, 0 - beq _0811EAE0 - b _0811EB00 - .pool -_0811EADC: - cmp r3, 0x15 - bne _0811EB00 -_0811EAE0: - adds r0, r2, r0 - ldr r2, [r0] - movs r1, 0 - cmp r1, r4 - bcs _0811EB08 -_0811EAEA: - lsls r0, r1, 1 - adds r0, r2 - ldrh r0, [r0] - cmp r5, r0 - beq _0811EB04 - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, r4 - bcc _0811EAEA - b _0811EB08 -_0811EB00: - cmp r5, r4 - bcs _0811EB08 -_0811EB04: - movs r0, 0 - b _0811EB0A -_0811EB08: - movs r0, 0x1 -_0811EB0A: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_811EAA4 - - thumb_func_start ECWord_CheckIfOutsideOfValidRange -ECWord_CheckIfOutsideOfValidRange: @ 811EB10 - push {lr} - lsls r0, 16 - lsrs r2, r0, 25 - lsls r0, 7 - lsrs r3, r0, 23 - cmp r2, 0x15 - bhi _0811EB5C - cmp r2, 0x13 - bgt _0811EB2C - cmp r2, 0x12 - bge _0811EB3C - cmp r2, 0 - beq _0811EB30 - b _0811EB48 -_0811EB2C: - cmp r2, 0x15 - bne _0811EB48 -_0811EB30: - ldr r0, =gUnknown_085F5490 - ldrh r0, [r0] - b _0811EB50 - .pool -_0811EB3C: - ldr r0, =gUnknown_085FA1D4 - ldrh r0, [r0] - b _0811EB50 - .pool -_0811EB48: - ldr r1, =gEasyChatGroups - lsls r0, r2, 3 - adds r0, r1 - ldrh r0, [r0, 0x4] -_0811EB50: - cmp r0, r3 - bls _0811EB5C - movs r0, 0 - b _0811EB5E - .pool -_0811EB5C: - movs r0, 0x1 -_0811EB5E: - pop {r1} - bx r1 - thumb_func_end ECWord_CheckIfOutsideOfValidRange - - thumb_func_start GetEasyChatWord -@ char *GetEasyChatWord(u8 groupId, u16 wordId) -GetEasyChatWord: @ 811EB64 - push {lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 16 - lsrs r2, r1, 16 - cmp r0, 0x13 - bgt _0811EB7C - cmp r0, 0x12 - bge _0811EB90 - cmp r0, 0 - beq _0811EB80 - b _0811EBA0 -_0811EB7C: - cmp r0, 0x15 - bne _0811EBA0 -_0811EB80: - movs r0, 0xB - muls r0, r2 - ldr r1, =gSpeciesNames - adds r0, r1 - b _0811EBB2 - .pool -_0811EB90: - movs r0, 0xD - muls r0, r2 - ldr r1, =gMoveNames - adds r0, r1 - b _0811EBB2 - .pool -_0811EBA0: - ldr r1, =gEasyChatGroups - lsls r0, 3 - adds r0, r1 - ldr r1, [r0] - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] -_0811EBB2: - pop {r1} - bx r1 - .pool - thumb_func_end GetEasyChatWord - - thumb_func_start CopyEasyChatWord -@ char *CopyEasyChatWord(char *dest, u16 groupIdWordIdPair) -CopyEasyChatWord: @ 811EBBC - push {r4-r6,lr} - adds r5, r0, 0 - lsls r6, r1, 16 - lsrs r0, r6, 16 - adds r4, r0, 0 - bl sub_811EAA4 - lsls r0, 24 - cmp r0, 0 - beq _0811EBD8 - ldr r1, =gText_ThreeQuestionMarks - b _0811EBEA - .pool -_0811EBD8: - ldr r0, =0x0000ffff - cmp r4, r0 - beq _0811EBFC - ldr r1, =0x000001ff - ands r1, r4 - lsrs r0, r6, 25 - bl GetEasyChatWord - adds r1, r0, 0 -_0811EBEA: - adds r0, r5, 0 - bl StringCopy - b _0811EC02 - .pool -_0811EBFC: - movs r0, 0xFF - strb r0, [r5] - adds r0, r5, 0 -_0811EC02: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end CopyEasyChatWord - - thumb_func_start ConvertEasyChatWordsToString -ConvertEasyChatWordsToString: @ 811EC08 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x4 - adds r4, r0, 0 - adds r5, r1, 0 - lsls r2, 16 - lsls r3, 16 - lsrs r3, 16 - mov r9, r3 - ldr r0, =0xffff0000 - adds r2, r0 - lsrs r7, r2, 16 - movs r0, 0 - cmp r0, r9 - bcs _0811EC78 -_0811EC2A: - movs r6, 0 - adds r0, 0x1 - mov r8, r0 - cmp r6, r7 - bcs _0811EC5C - ldr r2, =0x0000ffff -_0811EC36: - ldrh r1, [r5] - adds r0, r4, 0 - str r2, [sp] - bl CopyEasyChatWord - adds r4, r0, 0 - ldrh r0, [r5] - ldr r2, [sp] - cmp r0, r2 - beq _0811EC50 - movs r0, 0 - strb r0, [r4] - adds r4, 0x1 -_0811EC50: - adds r5, 0x2 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, r7 - bcc _0811EC36 -_0811EC5C: - ldrh r1, [r5] - adds r5, 0x2 - adds r0, r4, 0 - bl CopyEasyChatWord - adds r4, r0, 0 - movs r0, 0xFE - strb r0, [r4] - adds r4, 0x1 - mov r1, r8 - lsls r0, r1, 16 - lsrs r0, 16 - cmp r0, r9 - bcc _0811EC2A -_0811EC78: - subs r4, 0x1 - movs r0, 0xFF - strb r0, [r4] - adds r0, r4, 0 - add sp, 0x4 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end ConvertEasyChatWordsToString - - thumb_func_start sub_811EC98 -sub_811EC98: @ 811EC98 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - adds r4, r0, 0 - adds r5, r1, 0 - lsls r2, 16 - lsrs r2, 16 - mov r8, r2 - lsls r3, 16 - lsrs r3, 16 - str r3, [sp] - mov r7, r8 - movs r0, 0 - str r0, [sp, 0x4] - subs r0, r7, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - movs r0, 0 - cmp r0, r3 - bcs _0811ED62 -_0811ECC8: - adds r3, r5, 0 - movs r2, 0 - movs r1, 0 - adds r0, 0x1 - mov r10, r0 - cmp r2, r7 - bcs _0811ECEE - ldr r6, =0x0000ffff -_0811ECD8: - lsls r0, r1, 1 - adds r0, r3 - ldrh r0, [r0] - cmp r0, r6 - beq _0811ECE4 - movs r2, 0x1 -_0811ECE4: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, r7 - bcc _0811ECD8 -_0811ECEE: - cmp r2, 0 - bne _0811ECFC - lsls r0, r7, 1 - adds r5, r0 - b _0811ED56 - .pool -_0811ECFC: - movs r6, 0 - ldr r1, [sp, 0x4] - adds r1, 0x1 - mov r9, r1 - cmp r6, r8 - bcs _0811ED30 - ldr r2, =0x0000ffff -_0811ED0A: - ldrh r1, [r5] - adds r0, r4, 0 - str r2, [sp, 0x8] - bl CopyEasyChatWord - adds r4, r0, 0 - ldrh r0, [r5] - ldr r2, [sp, 0x8] - cmp r0, r2 - beq _0811ED24 - movs r0, 0 - strb r0, [r4] - adds r4, 0x1 -_0811ED24: - adds r5, 0x2 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, r8 - bcc _0811ED0A -_0811ED30: - ldrh r1, [r5] - adds r5, 0x2 - adds r0, r4, 0 - bl CopyEasyChatWord - adds r4, r0, 0 - ldr r0, [sp, 0x4] - cmp r0, 0 - bne _0811ED4C - movs r0, 0xFE - b _0811ED4E - .pool -_0811ED4C: - movs r0, 0xFA -_0811ED4E: - strb r0, [r4] - adds r4, 0x1 - mov r1, r9 - str r1, [sp, 0x4] -_0811ED56: - mov r1, r10 - lsls r0, r1, 16 - lsrs r0, 16 - ldr r1, [sp] - cmp r0, r1 - bcc _0811ECC8 -_0811ED62: - subs r4, 0x1 - movs r0, 0xFF - strb r0, [r4] - adds r0, r4, 0 - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_811EC98 - - thumb_func_start sub_811ED7C -sub_811ED7C: @ 811ED7C - push {r4,r5,lr} - lsls r5, r0, 16 - lsrs r0, r5, 16 - adds r4, r0, 0 - ldr r0, =0x0000ffff - cmp r4, r0 - bne _0811ED94 - movs r0, 0 - b _0811EDBA - .pool -_0811ED94: - adds r0, r4, 0 - bl sub_811EAA4 - lsls r0, 24 - cmp r0, 0 - bne _0811EDB0 - ldr r1, =0x000001ff - ands r1, r4 - lsrs r0, r5, 25 - bl GetEasyChatWord - b _0811EDB2 - .pool -_0811EDB0: - ldr r0, =gText_ThreeQuestionMarks -_0811EDB2: - bl StringLength - lsls r0, 16 - lsrs r0, 16 -_0811EDBA: - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811ED7C - - thumb_func_start sub_811EDC4 -sub_811EDC4: @ 811EDC4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - adds r6, r0, 0 - lsls r1, 24 - lsrs r1, 24 - lsls r2, 24 - lsrs r2, 24 - mov r8, r2 - lsls r3, 16 - lsrs r3, 16 - mov r10, r3 - movs r7, 0 - cmp r7, r8 - bcs _0811EE26 - subs r0, r1, 0x1 - lsls r0, 16 - mov r9, r0 -_0811EDEE: - mov r0, r9 - lsrs r4, r0, 16 - movs r5, 0 - cmp r5, r1 - bcs _0811EE14 -_0811EDF8: - ldrh r0, [r6] - adds r6, 0x2 - str r1, [sp] - bl sub_811ED7C - adds r0, r4, r0 - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, [sp] - cmp r5, r1 - bcc _0811EDF8 -_0811EE14: - cmp r4, r10 - bls _0811EE1C - movs r0, 0x1 - b _0811EE28 -_0811EE1C: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, r8 - bcc _0811EDEE -_0811EE26: - movs r0, 0 -_0811EE28: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_811EDC4 - - thumb_func_start sub_811EE38 -sub_811EE38: @ 811EE38 - push {r4,lr} - lsls r0, 16 - lsrs r4, r0, 16 - bl Random - ldr r2, =gEasyChatGroups - lsls r1, r4, 3 - adds r1, r2 - lsls r0, 16 - lsrs r0, 16 - ldrh r1, [r1, 0x4] - bl __umodsi3 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r4, 0 - beq _0811EE66 - cmp r4, 0x15 - beq _0811EE66 - cmp r4, 0x12 - beq _0811EE66 - cmp r4, 0x13 - bne _0811EE74 -_0811EE66: - ldr r1, =gEasyChatGroups - lsls r0, r4, 3 - adds r0, r1 - ldr r1, [r0] - lsls r0, r2, 1 - adds r0, r1 - ldrh r2, [r0] -_0811EE74: - movs r0, 0x7F - ands r0, r4 - lsls r0, 9 - ldr r1, =0x000001ff - ands r2, r1 - orrs r0, r2 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811EE38 - - thumb_func_start sub_811EE90 -sub_811EE90: @ 811EE90 - push {r4,lr} - lsls r0, 16 - lsrs r0, 16 - adds r4, r0, 0 - lsls r0, r4, 24 - lsrs r0, 24 - bl sub_811EA28 - lsls r0, 24 - cmp r0, 0 - bne _0811EEB0 - ldr r0, =0x0000ffff - b _0811EEC4 - .pool -_0811EEB0: - cmp r4, 0 - beq _0811EEBC - adds r0, r4, 0 - bl sub_811EE38 - b _0811EEC0 -_0811EEBC: - bl sub_811F108 -_0811EEC0: - lsls r0, 16 - lsrs r0, 16 -_0811EEC4: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811EE90 - - thumb_func_start sub_811EECC -sub_811EECC: @ 811EECC - push {r4,r5,lr} - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0x1 - beq _0811EF04 - cmp r0, 0x1 - bgt _0811EEE4 - cmp r0, 0 - beq _0811EEEE - b _0811EF58 - .pool -_0811EEE4: - cmp r0, 0x2 - beq _0811EF2C - cmp r0, 0x3 - beq _0811EF3C - b _0811EF58 -_0811EEEE: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00002bb0 - adds r5, r0, r1 - movs r2, 0x2 - b _0811EF46 - .pool -_0811EF04: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00002bbc - adds r5, r0, r1 - adds r0, r5, 0 - movs r1, 0x3 - movs r2, 0x2 - movs r3, 0x12 - bl sub_811EDC4 - lsls r0, 24 - cmp r0, 0 - beq _0811EF44 - movs r2, 0x2 - movs r3, 0x3 - b _0811EF48 - .pool -_0811EF2C: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00002bc8 - b _0811EF42 - .pool -_0811EF3C: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00002bd4 -_0811EF42: - adds r5, r0, r1 -_0811EF44: - movs r2, 0x3 -_0811EF46: - movs r3, 0x2 -_0811EF48: - ldr r4, =gStringVar4 - adds r0, r4, 0 - adds r1, r5, 0 - bl ConvertEasyChatWordsToString - adds r0, r4, 0 - bl ShowFieldAutoScrollMessage -_0811EF58: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811EECC - - thumb_func_start sub_811EF6C -sub_811EF6C: @ 811EF6C - push {lr} - bl Random - movs r1, 0x1 - ands r1, r0 - movs r0, 0xC - cmp r1, 0 - beq _0811EF7E - movs r0, 0xD -_0811EF7E: - bl sub_811EE90 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - ldr r0, =gStringVar2 - bl CopyEasyChatWord - pop {r0} - bx r0 - .pool - thumb_func_end sub_811EF6C - - thumb_func_start sub_811EF98 -sub_811EF98: @ 811EF98 - lsls r0, 24 - lsrs r2, r0, 27 - movs r1, 0xE0 - lsls r1, 19 - ands r1, r0 - lsrs r1, 24 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r3, =0x00002e20 - adds r0, r3 - adds r0, r2 - ldrb r0, [r0] - asrs r0, r1 - movs r1, 0x1 - ands r0, r1 - bx lr - .pool - thumb_func_end sub_811EF98 - - thumb_func_start sub_811EFC0 -sub_811EFC0: @ 811EFC0 - push {lr} - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x20 - bhi _0811EFE4 - lsrs r3, r0, 27 - movs r2, 0x7 - ands r2, r1 - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, =0x00002e20 - adds r1, r0 - adds r1, r3 - movs r0, 0x1 - lsls r0, r2 - ldrb r2, [r1] - orrs r0, r2 - strb r0, [r1] -_0811EFE4: - pop {r0} - bx r0 - .pool - thumb_func_end sub_811EFC0 - - thumb_func_start sub_811EFF0 -sub_811EFF0: @ 811EFF0 - push {r4,r5,lr} - movs r4, 0 - movs r5, 0 -_0811EFF6: - adds r0, r4, 0 - bl sub_811EF98 - lsls r0, 24 - cmp r0, 0 - beq _0811F008 - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 -_0811F008: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x20 - bls _0811EFF6 - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_811EFF0 - thumb_func_start sub_811F01C sub_811F01C: @ 811F01C push {r4-r6,lr} diff --git a/include/bard_music.h b/include/bard_music.h index 9d3d0ad229..4882054057 100644 --- a/include/bard_music.h +++ b/include/bard_music.h @@ -39,6 +39,7 @@ struct BardSong // Exported ROM declarations extern const u16 gUnknown_085F5490; +extern const u16 gUnknown_085FA1D4; const struct BardSound *GetWordSounds(u16 word); void GetWordPhonemes(struct BardSong *song, u16 word); diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h index 2c437c88e7..1c8866bc36 100644 --- a/include/constants/easy_chat.h +++ b/include/constants/easy_chat.h @@ -23,6 +23,7 @@ #define EC_GROUP_MOVE_2 0x13 #define EC_GROUP_TRENDY_SAYING 0x14 #define EC_GROUP_POKEMON_2 0x15 +#define EC_NUM_GROUPS 0x16 // TRAINER #define EC_WORD_I_CHOOSE_YOU (EC_GROUP_TRAINER << 9) | 0x0 @@ -1075,5 +1076,6 @@ #define EC_GROUP(word) ((word) >> 9) #define EC_INDEX(word) ((word) & 0x1FF) +#define EC_WORD(group, index) ((((group) & 0x7F) << 9) | ((index) & 0x1FF)) #endif // GUARD_CONSTANTS_EASY_CHAT_H diff --git a/include/easy_chat.h b/include/easy_chat.h index 23fd9ed839..c55fca81bf 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -8,11 +8,11 @@ void easy_chat_input_maybe(void); u8 * CopyEasyChatWord(u8 *dest, u16 word); bool32 sub_811F8D8(u16 word); void InitializeEasyChatWordArray(u16 *words, u16 length); -void ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2); +u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows); bool8 ECWord_CheckIfOutsideOfValidRange(u16 word); u16 sub_811EE38(u16 group); u16 sub_811F01C(void); -bool16 EasyChat_GetNumWordsInGroup(u8); +u16 EasyChat_GetNumWordsInGroup(u8); u16 sub_811EE90(u16); void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam); diff --git a/include/strings.h b/include/strings.h index a3e7439430..591c5ce338 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2430,5 +2430,6 @@ extern const u8 gText_CombineTwoWordsOrPhrases3[]; extern const u8 gText_OnlyOnePhrase[]; extern const u8 gText_YouCannotQuitHere[]; extern const u8 gText_SectionMustBeCompleted[]; +extern const u8 gText_ThreeQuestionMarks[]; #endif // GUARD_STRINGS_H diff --git a/src/easy_chat.c b/src/easy_chat.c index 1b1bd105b5..51b25c42a8 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -2,13 +2,16 @@ // Includes #include "global.h" #include "alloc.h" +#include "bard_music.h" #include "bg.h" +#include "data2.h" #include "decompress.h" #include "dewford_trend.h" #include "dynamic_placeholder_text_util.h" #include "easy_chat.h" #include "event_data.h" #include "event_object_movement.h" +#include "field_message_box.h" #include "field_weather.h" #include "gpu_regs.h" #include "graphics.h" @@ -18,12 +21,15 @@ #include "menu.h" #include "overworld.h" #include "palette.h" +#include "pokedex.h" +#include "random.h" #include "sound.h" #include "string_util.h" #include "strings.h" #include "task.h" #include "text_window.h" #include "window.h" +#include "constants/easy_chat.h" #include "constants/event_objects.h" #include "constants/flags.h" #include "constants/songs.h" @@ -115,6 +121,26 @@ struct Unk08597C30 u8 unk3; }; +struct EasyChatWordInfo +{ + const u8 *text; + int alphabeticalOrder; + int enabled; +}; + +typedef union +{ + const u16 *valueList; + const struct EasyChatWordInfo *words; +} EasyChatGroupWordData; + +struct EasyChatGroup +{ + EasyChatGroupWordData wordData; + u16 numWords; + u16 numEnabledWords; +}; + EWRAM_DATA struct EasyChatScreen *gEasyChatScreen = NULL; EWRAM_DATA struct Unk203A11C *gUnknown_0203A11C = 0; EWRAM_DATA void *gUnknown_0203A120 = 0; @@ -203,7 +229,7 @@ static void sub_811CF04(void); static void sub_811D60C(void); static void sub_811D424(u16 *); static void sub_811D230(void); -void sub_811E948(void); +static void sub_811E948(void); static void sub_811CFCC(void); static void sub_811D0BC(void); static void sub_811D2C8(void); @@ -293,6 +319,8 @@ static void sub_811E0EC(s8, s8); static void sub_811E1A4(s8, s8); static void sub_811E2DC(struct Sprite *); static void sub_811E34C(u8, u8); +bool8 sub_811F0F8(void); +u16 sub_811F108(void); u8 *CopyEasyChatWordPadded(u8 *, u16, u16); extern const struct { @@ -326,6 +354,8 @@ extern const struct SpriteTemplate gUnknown_08597E48; extern const struct SpriteTemplate gUnknown_08597E30; extern const u8 gUnknown_08597D08[]; extern const u8 gUnknown_08597E60[][4]; +extern const u8 *const gUnknown_08597E6C[][4]; +extern const struct EasyChatGroup gEasyChatGroups[]; void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam) { @@ -4373,3 +4403,385 @@ static int sub_811E920(int arg0) else return 0; } + +static void sub_811E948(void) +{ + int i; + u16 windowId; + struct WindowTemplate template; + int var0 = sub_811E8E4(); + if (var0 == 3) + return; + + template.bg = 3; + template.tilemapLeft = 1; + template.tilemapTop = 11; + template.width = 28; + template.height = 2; + template.paletteNum = 11; + template.baseBlock = 0x34; + windowId = AddWindow(&template); + FillWindowPixelBuffer(windowId, 0x11); + for (i = 0; i < 4; i++) + { + const u8 *str = gUnknown_08597E6C[var0][i]; + if (str) + { + int x = gUnknown_08597E60[var0][i]; + sub_811D028(windowId, 1, str, x, 1, 0, NULL); + } + } + + PutWindowTilemap(windowId); +} + +bool8 sub_811EA28(u8 groupId) +{ + switch (groupId) + { + case EC_GROUP_TRENDY_SAYING: + return FlagGet(FLAG_SYS_HIPSTER_MEET); + case EC_GROUP_EVENTS: + case EC_GROUP_MOVE_1: + case EC_GROUP_MOVE_2: + return FlagGet(FLAG_SYS_GAME_CLEAR); + case EC_GROUP_POKEMON_2: + return sub_811F0F8(); + default: + return TRUE; + } +} + +u16 EasyChat_GetNumWordsInGroup(u8 groupId) +{ + if (groupId == EC_GROUP_POKEMON) + return GetNationalPokedexCount(FLAG_GET_SEEN); + + if (sub_811EA28(groupId)) + return gEasyChatGroups[groupId].numEnabledWords; + + return 0; +} + +bool8 sub_811EAA4(u16 easyChatWord) +{ + u16 i; + u8 groupId; + u32 index; + u16 numWords; + const u16 *list; + if (easyChatWord == 0xFFFF) + return FALSE; + + groupId = EC_GROUP(easyChatWord); + index = EC_INDEX(easyChatWord); + if (groupId >= EC_NUM_GROUPS) + return TRUE; + + numWords = gEasyChatGroups[groupId].numWords; + switch (groupId) + { + case EC_GROUP_POKEMON: + case EC_GROUP_POKEMON_2: + case EC_GROUP_MOVE_1: + case EC_GROUP_MOVE_2: + list = gEasyChatGroups[groupId].wordData.valueList; + for (i = 0; i < numWords; i++) + { + if (index == list[i]) + return FALSE; + } + return TRUE; + default: + if (index >= numWords) + return TRUE; + else + return FALSE; + } +} + +bool8 ECWord_CheckIfOutsideOfValidRange(u16 easyChatWord) +{ + int numWordsInGroup; + u8 groupId = EC_GROUP(easyChatWord); + u32 index = EC_INDEX(easyChatWord); + if (groupId >= EC_NUM_GROUPS) + return TRUE; + + switch (groupId) + { + case EC_GROUP_POKEMON: + case EC_GROUP_POKEMON_2: + numWordsInGroup = gUnknown_085F5490; + break; + case EC_GROUP_MOVE_1: + case EC_GROUP_MOVE_2: + numWordsInGroup = gUnknown_085FA1D4; + break; + default: + numWordsInGroup = gEasyChatGroups[groupId].numWords; + break; + } + + if (numWordsInGroup <= index) + return TRUE; + else + return FALSE; +} + +const u8 *GetEasyChatWord(u8 groupId, u16 index) +{ + switch (groupId) + { + case EC_GROUP_POKEMON: + case EC_GROUP_POKEMON_2: + return gSpeciesNames[index]; + case EC_GROUP_MOVE_1: + case EC_GROUP_MOVE_2: + return gMoveNames[index]; + default: + return gEasyChatGroups[groupId].wordData.words[index].text; + } +} + +u8 *CopyEasyChatWord(u8 *dest, u16 easyChatWord) +{ + u8 *resultStr; + if (sub_811EAA4(easyChatWord)) + { + resultStr = StringCopy(dest, gText_ThreeQuestionMarks); + } + else if (easyChatWord != 0xFFFF) + { + u16 index = EC_INDEX(easyChatWord); + u8 groupId = EC_GROUP(easyChatWord); + resultStr = StringCopy(dest, GetEasyChatWord(groupId, index)); + } + else + { + *dest = EOS; + resultStr = dest; + } + + return resultStr; +} + +u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows) +{ + u16 i, j; + u16 numColumns = columns - 1; + + for (i = 0; i < rows; i++) + { + for (j = 0; j < numColumns; j++) + { + dest = CopyEasyChatWord(dest, *src); + if (*src != 0xFFFF) + { + *dest = CHAR_SPACE; + dest++; + } + + src++; + } + + dest = CopyEasyChatWord(dest, *(src++)); + *dest = CHAR_NEWLINE; + dest++; + } + + dest--; + *dest = EOS; + return dest; +} + +u8 *unref_sub_811EC98(u8 *dest, const u16 *src, u16 columns, u16 rows) +{ + u16 i, j, k; + u16 numColumns; + int var0, var1; + + numColumns = columns; + var1 = 0; + columns--; + for (i = 0; i < rows; i++) + { + const u16 *var2 = src; + var0 = 0; + for (j = 0; j < numColumns; j++) + { + if (var2[j] != 0xFFFF) + var0 = 1; + } + + if (!var0) + { + src += numColumns; + continue; + } + + for (k = 0; k < columns; k++) + { + dest = CopyEasyChatWord(dest, *src); + if (*src != 0xFFFF) + { + *dest = CHAR_SPACE; + dest++; + } + + src++; + } + + dest = CopyEasyChatWord(dest, *(src++)); + if (var1 == 0) + *dest = CHAR_NEWLINE; + else + *dest = CHAR_PROMPT_SCROLL; + + dest++; + var1++; + } + + dest--; + *dest = EOS; + return dest; +} + +static u16 GetEasyChatWordStringLength(u16 easyChatWord) +{ + if (easyChatWord == 0xFFFF) + return 0; + + if (sub_811EAA4(easyChatWord)) + { + return StringLength(gText_ThreeQuestionMarks); + } + else + { + u16 index = EC_INDEX(easyChatWord); + u8 groupId = EC_GROUP(easyChatWord); + return StringLength(GetEasyChatWord(groupId, index)); + } +} + +bool8 sub_811EDC4(const u16 *easyChatWords, u8 arg1, u8 arg2, u16 arg3) +{ + u8 i, j; + + for (i = 0; i < arg2; i++) + { + u16 totalLength = arg1 - 1; + for (j = 0; j < arg1; j++) + totalLength += GetEasyChatWordStringLength(*(easyChatWords++)); + + if (totalLength > arg3) + return TRUE; + } + + return FALSE; +} + +u16 sub_811EE38(u16 groupId) +{ + u16 index = Random() % gEasyChatGroups[groupId].numWords; + if (groupId == EC_GROUP_POKEMON + || groupId == EC_GROUP_POKEMON_2 + || groupId == EC_GROUP_MOVE_1 + || groupId == EC_GROUP_MOVE_2) + { + index = gEasyChatGroups[groupId].wordData.valueList[index]; + } + + return EC_WORD(groupId, index); +} + +u16 sub_811EE90(u16 groupId) +{ + if (!sub_811EA28(groupId)) + return 0xFFFF; + + if (groupId == EC_GROUP_POKEMON) + return sub_811F108(); + + return sub_811EE38(groupId); +} + +void sub_811EECC(void) +{ + u16 *easyChatWords; + int columns, rows; + switch (gSpecialVar_0x8004) + { + case 0: + easyChatWords = gSaveBlock1Ptr->unk2BB0; + columns = 2; + rows = 2; + break; + case 1: + easyChatWords = gSaveBlock1Ptr->unk2BBC; + if (sub_811EDC4(gSaveBlock1Ptr->unk2BBC, 3, 2, 18)) + { + columns = 2; + rows = 3; + } + else + { + columns = 3; + rows = 2; + } + break; + case 2: + easyChatWords = gSaveBlock1Ptr->unk2BC8; + columns = 3; + rows = 2; + break; + case 3: + easyChatWords = gSaveBlock1Ptr->unk2BD4; + columns = 3; + rows = 2; + break; + default: + return; + } + + ConvertEasyChatWordsToString(gStringVar4, easyChatWords, columns, rows); + ShowFieldAutoScrollMessage(gStringVar4); +} + +void sub_811EF6C(void) +{ + int groupId = Random() & 1 ? EC_GROUP_HOBBIES : EC_GROUP_LIFESTYLE; + u16 easyChatWord = sub_811EE90(groupId); + CopyEasyChatWord(gStringVar2, easyChatWord); +} + +u8 sub_811EF98(u8 additionalPhraseId) +{ + int byteOffset = additionalPhraseId / 8; + int shift = additionalPhraseId & 0x7; + return (gSaveBlock1Ptr->additionalPhrases[byteOffset] >> shift) & 1; +} + +void sub_811EFC0(u8 additionalPhraseId) +{ + if (additionalPhraseId < 33) + { + int byteOffset = additionalPhraseId / 8; + int shift = additionalPhraseId & 0x7; + gSaveBlock1Ptr->additionalPhrases[byteOffset] |= 1 << shift; + } +} + +u8 sub_811EFF0(void) +{ + u8 i; + u8 numAdditionalPhrasesUnlocked; + + for (i = 0, numAdditionalPhrasesUnlocked = 0; i < 33; i++) + { + if (sub_811EF98(i)) + numAdditionalPhrasesUnlocked++; + } + + return numAdditionalPhrasesUnlocked; +} diff --git a/src/mail.c b/src/mail.c index 45e96e85e5..aa4ba571f1 100644 --- a/src/mail.c +++ b/src/mail.c @@ -102,7 +102,7 @@ struct MailRead /*0x021d*/ u8 language; /*0x021e*/ bool8 playerIsSender; /*0x0220*/ u8 * (*parserSingle)(u8 *dest, u16 word); - /*0x0224*/ void (*parserMultiple)(u8 *dest, const u16 *src, u16 length1, u16 length2); + /*0x0224*/ u8 * (*parserMultiple)(u8 *dest, const u16 *src, u16 length1, u16 length2); /*0x0228*/ const struct MailLayout *layout; /*0x022c*/ u8 bg1TilemapBuffer[0x1000]; /*0x122c*/ u8 bg2TilemapBuffer[0x1000]; From 7742e28dad96fd908d87a3412d0127be10f65ed0 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 25 Feb 2019 22:20:00 +0100 Subject: [PATCH 122/217] Easy chat nonmatchings fix do {} while(0); --- src/easy_chat.c | 552 +++++++++--------------------------------------- 1 file changed, 97 insertions(+), 455 deletions(-) diff --git a/src/easy_chat.c b/src/easy_chat.c index 51b25c42a8..3fdc888234 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -790,47 +790,51 @@ bool32 sub_811AB44(void) return FALSE; } -#ifdef NONMATCHING static u16 sub_811AB68(void) { - if (gMain.newKeys & A_BUTTON) - { - sub_811BF78(); - gEasyChatScreen->state = 2; - gEasyChatScreen->unk_0a = 0; - gEasyChatScreen->unk_0b = 0; - gEasyChatScreen->unk_0c = 0; - return 9; - } - else if (gMain.newKeys & B_BUTTON) - { - return sub_811B150(); - } - else if (gMain.newKeys & START_BUTTON) - { - return sub_811B1B4(); - } - else if (gMain.newKeys & DPAD_UP) - { - gEasyChatScreen->mainCursorRow--; - } - else if (gMain.newKeys & DPAD_LEFT) - { - gEasyChatScreen->mainCursorColumn--; - } - else if (gMain.newKeys & DPAD_DOWN) - { - gEasyChatScreen->mainCursorRow++; - } - else if (gMain.newKeys & DPAD_RIGHT) - { - gEasyChatScreen->mainCursorColumn++; - } - else + do { + if (gMain.newKeys & A_BUTTON) + { + sub_811BF78(); + gEasyChatScreen->state = 2; + gEasyChatScreen->unk_0a = 0; + gEasyChatScreen->unk_0b = 0; + gEasyChatScreen->unk_0c = 0; + return 9; + } + else if (gMain.newKeys & B_BUTTON) + { + return sub_811B150(); + } + else if (gMain.newKeys & START_BUTTON) + { + return sub_811B1B4(); + } + else if (gMain.newKeys & DPAD_UP) + { + gEasyChatScreen->mainCursorRow--; + break; + } + else if (gMain.newKeys & DPAD_LEFT) + { + gEasyChatScreen->mainCursorColumn--; + break; + } + else if (gMain.newKeys & DPAD_DOWN) + { + gEasyChatScreen->mainCursorRow++; + break; + } + else if (gMain.newKeys & DPAD_RIGHT) + { + gEasyChatScreen->mainCursorColumn++; + break; + } + return 0; - } - + } while (0); + if (gEasyChatScreen->mainCursorRow < 0) gEasyChatScreen->mainCursorRow = gEasyChatScreenTemplates[gEasyChatScreen->templateId].numRows; @@ -857,238 +861,61 @@ static u16 sub_811AB68(void) return 2; } -#else -NAKED -static u16 sub_811AB68(void) -{ - asm_unified("\n\ - push {r4-r7,lr}\n\ - ldr r0, =gMain\n\ - ldrh r1, [r0, 0x2E]\n\ - movs r0, 0x1\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0811ABB8\n\ - bl sub_811BF78\n\ - ldr r1, =gEasyChatScreen\n\ - ldr r3, [r1]\n\ - movs r2, 0\n\ - movs r0, 0x2\n\ - strb r0, [r3, 0x4]\n\ - ldr r0, [r1]\n\ - strb r2, [r0, 0xA]\n\ - ldr r0, [r1]\n\ - strb r2, [r0, 0xB]\n\ - ldr r0, [r1]\n\ - strb r2, [r0, 0xC]\n\ - movs r0, 0x9\n\ - b RETURN\n\ - .pool\n\ -_0811AB9C:\n\ - movs r0, 0x20\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _0811AC68_dpad_left\n\ - movs r0, 0x80\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _0811AC58_dpad_down\n\ - movs r0, 0x10\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _0811AC48_dpad_right\n\ - movs r0, 0\n\ - b RETURN\n\ -_0811ABB8:\n\ - movs r0, 0x2\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _0811AC78_b_button\n\ - movs r0, 0x8\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _0811AC7E_start_button\n\ - movs r0, 0x40\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0811AB9C\n\ - ldr r2, =gEasyChatScreen\n\ - ldr r1, [r2]\n\ - ldrb r0, [r1, 0x6]\n\ - subs r0, 0x1\n\ -_0811ABD8:\n\ - strb r0, [r1, 0x6]\n\ -_0811ABDA:\n\ - adds r7, r2, 0\n\ - adds r4, r7, 0\n\ - ldr r2, [r4]\n\ - movs r0, 0x6\n\ - ldrsb r0, [r2, r0]\n\ - ldr r6, =gEasyChatScreenTemplates\n\ - cmp r0, 0\n\ - bge _0811ABF8\n\ - ldrb r0, [r2, 0x1]\n\ - lsls r1, r0, 1\n\ - adds r1, r0\n\ - lsls r1, 3\n\ - adds r1, r6\n\ - ldrb r0, [r1, 0x2]\n\ - strb r0, [r2, 0x6]\n\ -_0811ABF8:\n\ - ldr r3, [r4]\n\ - movs r2, 0x6\n\ - ldrsb r2, [r3, r2]\n\ - adds r5, r6, 0\n\ - ldrb r1, [r3, 0x1]\n\ - lsls r0, r1, 1\n\ - adds r0, r1\n\ - lsls r0, 3\n\ - adds r0, r5\n\ - ldrb r0, [r0, 0x2]\n\ - cmp r2, r0\n\ - ble _0811AC14\n\ - movs r0, 0\n\ - strb r0, [r3, 0x6]\n\ -_0811AC14:\n\ - ldr r3, [r4]\n\ - movs r2, 0x6\n\ - ldrsb r2, [r3, r2]\n\ - ldrb r1, [r3, 0x1]\n\ - lsls r0, r1, 1\n\ - adds r0, r1\n\ - lsls r0, 3\n\ - adds r1, r0, r5\n\ - ldrb r0, [r1, 0x2]\n\ - cmp r2, r0\n\ - bne _0811AC88\n\ - movs r0, 0x5\n\ - ldrsb r0, [r3, r0]\n\ - cmp r0, 0x2\n\ - ble _0811AC36\n\ - movs r0, 0x2\n\ - strb r0, [r3, 0x5]\n\ -_0811AC36:\n\ - ldr r1, [r4]\n\ - movs r0, 0x1\n\ - strb r0, [r1, 0x4]\n\ - movs r0, 0x3\n\ - b RETURN\n\ - .pool\n\ -_0811AC48_dpad_right:\n\ - ldr r2, =gEasyChatScreen\n\ - ldr r1, [r2]\n\ - ldrb r0, [r1, 0x5]\n\ - adds r0, 0x1\n\ - strb r0, [r1, 0x5]\n\ - b _0811ABDA\n\ - .pool\n\ -_0811AC58_dpad_down:\n\ - ldr r2, =gEasyChatScreen\n\ - ldr r1, [r2]\n\ - ldrb r0, [r1, 0x6]\n\ - adds r0, 0x1\n\ - b _0811ABD8\n\ - .pool\n\ -_0811AC68_dpad_left:\n\ - ldr r2, =gEasyChatScreen\n\ - ldr r1, [r2]\n\ - ldrb r0, [r1, 0x5]\n\ - subs r0, 0x1\n\ - strb r0, [r1, 0x5]\n\ - b _0811ABDA\n\ - .pool\n\ -_0811AC78_b_button:\n\ - bl sub_811B150\n\ - b _0811AC82\n\ -_0811AC7E_start_button:\n\ - bl sub_811B1B4\n\ -_0811AC82:\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - b RETURN\n\ -_0811AC88:\n\ - movs r0, 0x5\n\ - ldrsb r0, [r3, r0]\n\ - cmp r0, 0\n\ - bge _0811AC96\n\ - ldrb r0, [r1, 0x1]\n\ - subs r0, 0x1\n\ - strb r0, [r3, 0x5]\n\ -_0811AC96:\n\ - ldr r3, [r4]\n\ - movs r2, 0x5\n\ - ldrsb r2, [r3, r2]\n\ - ldrb r1, [r3, 0x1]\n\ - lsls r0, r1, 1\n\ - adds r0, r1\n\ - lsls r0, 3\n\ - adds r0, r6\n\ - ldrb r0, [r0, 0x1]\n\ - cmp r2, r0\n\ - blt _0811ACB0\n\ - movs r0, 0\n\ - strb r0, [r3, 0x5]\n\ -_0811ACB0:\n\ - bl sub_811AB44\n\ - cmp r0, 0\n\ - beq _0811ACCA\n\ - ldr r2, [r7]\n\ - ldr r0, [r2, 0x4]\n\ - ldr r1, =0x00ffff00\n\ - ands r0, r1\n\ - ldr r1, =0x00040100\n\ - cmp r0, r1\n\ - bne _0811ACCA\n\ - movs r0, 0\n\ - strb r0, [r2, 0x5]\n\ -_0811ACCA:\n\ - movs r0, 0x2\n\ -RETURN:\n\ - pop {r4-r7}\n\ - pop {r1}\n\ - bx r1\n\ - .pool"); -} -#endif // NONMATCHING -#ifdef NONMATCHING static u16 sub_811ACDC(void) { - int numFooterColumns; - - if (gMain.newKeys & A_BUTTON) + do { - switch (gEasyChatScreen->mainCursorColumn) + if (gMain.newKeys & A_BUTTON) { - case 0: - return sub_811B184(); - case 1: - return sub_811B150(); - case 2: - return sub_811B1B4(); - case 3: - return sub_811B264(); + switch (gEasyChatScreen->mainCursorColumn) + { + case 0: + return sub_811B184(); + case 1: + return sub_811B150(); + case 2: + return sub_811B1B4(); + case 3: + return sub_811B264(); + } + } + + if (gMain.newKeys & B_BUTTON) + { + return sub_811B150(); + } + else if (gMain.newKeys & START_BUTTON) + { + return sub_811B1B4(); + } + else if (gMain.newKeys & DPAD_UP) + { + gEasyChatScreen->mainCursorRow--; + break; + } + else if (gMain.newKeys & DPAD_LEFT) + { + gEasyChatScreen->mainCursorColumn--; + break; + } + else if (gMain.newKeys & DPAD_DOWN) + { + gEasyChatScreen->mainCursorRow = 0; + break; + } + else if (gMain.newKeys & DPAD_RIGHT) + { + gEasyChatScreen->mainCursorColumn++; + break; } - } - if (gMain.newKeys & B_BUTTON) - return sub_811B150(); - else if (gMain.newKeys & START_BUTTON) - return sub_811B1B4(); - else if (gMain.newKeys & DPAD_UP) - gEasyChatScreen->mainCursorRow--; - else if (gMain.newKeys & DPAD_LEFT) - gEasyChatScreen->mainCursorColumn--; - else if (gMain.newKeys & DPAD_DOWN) - gEasyChatScreen->mainCursorRow = 0; - else if (gMain.newKeys & DPAD_RIGHT) - gEasyChatScreen->mainCursorColumn++; - else return 0; + } while (0); if (gEasyChatScreen->mainCursorRow == gEasyChatScreenTemplates[gEasyChatScreen->templateId].numRows) { - numFooterColumns = sub_811BA3C() ? 4 : 3; + int numFooterColumns = sub_811BA3C() ? 4 : 3; if (gEasyChatScreen->mainCursorColumn < 0) gEasyChatScreen->mainCursorColumn = numFooterColumns - 1; @@ -1100,198 +927,13 @@ static u16 sub_811ACDC(void) if (gEasyChatScreen->mainCursorColumn >= gEasyChatScreenTemplates[gEasyChatScreen->templateId].numColumns) gEasyChatScreen->mainCursorColumn = gEasyChatScreenTemplates[gEasyChatScreen->templateId].numColumns - 1; - + if (sub_811AB44() && gEasyChatScreen->mainCursorColumn == 1 && gEasyChatScreen->mainCursorRow == 4) gEasyChatScreen->mainCursorColumn = 0; gEasyChatScreen->state = 0; return 2; } -#else -NAKED -static u16 sub_811ACDC(void) -{ - asm_unified("\n\ - push {r4-r6,lr}\n\ - ldr r2, =gMain\n\ - ldrh r1, [r2, 0x2E]\n\ - movs r0, 0x1\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0811AD4A\n\ - ldr r0, =gEasyChatScreen\n\ - ldr r0, [r0]\n\ - ldrb r0, [r0, 0x5]\n\ - lsls r0, 24\n\ - asrs r0, 24\n\ - cmp r0, 0x1\n\ - beq _0811AD3E\n\ - b _0811AD24\n\ - .pool\n\ -_0811AD04:\n\ - movs r0, 0x20\n\ - ands r0, r2\n\ - lsls r0, 16\n\ - lsrs r3, r0, 16\n\ - cmp r3, 0\n\ - bne _0811ADE0\n\ - movs r0, 0x80\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - bne _0811ADD0\n\ - movs r0, 0x10\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - bne _0811ADC0\n\ - movs r0, 0\n\ - b _0811AE32\n\ -_0811AD24:\n\ - cmp r0, 0x1\n\ - bgt _0811AD2E\n\ - cmp r0, 0\n\ - beq _0811AD38\n\ - b _0811AD4A\n\ -_0811AD2E:\n\ - cmp r0, 0x2\n\ - beq _0811ADF6\n\ - cmp r0, 0x3\n\ - beq _0811AD44\n\ - b _0811AD4A\n\ -_0811AD38:\n\ - bl sub_811B184\n\ - b _0811ADFA\n\ -_0811AD3E:\n\ - bl sub_811B150\n\ - b _0811ADFA\n\ -_0811AD44:\n\ - bl sub_811B264\n\ - b _0811ADFA\n\ -_0811AD4A:\n\ - ldrh r2, [r2, 0x2E]\n\ - movs r0, 0x2\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - bne _0811ADF0\n\ - movs r0, 0x8\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - bne _0811ADF6\n\ - movs r0, 0x40\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - beq _0811AD04\n\ - ldr r2, =gEasyChatScreen\n\ - ldr r1, [r2]\n\ - ldrb r0, [r1, 0x6]\n\ - subs r0, 0x1\n\ - strb r0, [r1, 0x6]\n\ -_0811AD6E:\n\ - adds r6, r2, 0\n\ -_0811AD70:\n\ - adds r5, r6, 0\n\ - ldr r4, [r5]\n\ - movs r3, 0x6\n\ - ldrsb r3, [r4, r3]\n\ - ldr r2, =gEasyChatScreenTemplates\n\ - ldrb r1, [r4, 0x1]\n\ - lsls r0, r1, 1\n\ - adds r0, r1\n\ - lsls r0, 3\n\ - adds r1, r0, r2\n\ - ldrb r0, [r1, 0x2]\n\ - cmp r3, r0\n\ - bne _0811AE00\n\ - bl sub_811BA3C\n\ - movs r2, 0x3\n\ - cmp r0, 0\n\ - beq _0811AD96\n\ - movs r2, 0x4\n\ -_0811AD96:\n\ - ldr r1, [r5]\n\ - movs r0, 0x5\n\ - ldrsb r0, [r1, r0]\n\ - cmp r0, 0\n\ - bge _0811ADA4\n\ - subs r0, r2, 0x1\n\ - strb r0, [r1, 0x5]\n\ -_0811ADA4:\n\ - ldr r1, [r5]\n\ - movs r0, 0x5\n\ - ldrsb r0, [r1, r0]\n\ - cmp r0, r2\n\ - blt _0811ADB2\n\ - movs r0, 0\n\ - strb r0, [r1, 0x5]\n\ -_0811ADB2:\n\ - movs r0, 0x3\n\ - b _0811AE32\n\ - .pool\n\ -_0811ADC0:\n\ - ldr r2, =gEasyChatScreen\n\ - ldr r1, [r2]\n\ - ldrb r0, [r1, 0x5]\n\ - adds r0, 0x1\n\ - strb r0, [r1, 0x5]\n\ - b _0811AD6E\n\ - .pool\n\ -_0811ADD0:\n\ - ldr r1, =gEasyChatScreen\n\ - ldr r0, [r1]\n\ - strb r3, [r0, 0x6]\n\ - adds r6, r1, 0\n\ - b _0811AD70\n\ - .pool\n\ -_0811ADE0:\n\ - ldr r2, =gEasyChatScreen\n\ - ldr r1, [r2]\n\ - ldrb r0, [r1, 0x5]\n\ - subs r0, 0x1\n\ - strb r0, [r1, 0x5]\n\ - b _0811AD6E\n\ - .pool\n\ -_0811ADF0:\n\ - bl sub_811B150\n\ - b _0811ADFA\n\ -_0811ADF6:\n\ - bl sub_811B1B4\n\ -_0811ADFA:\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - b _0811AE32\n\ -_0811AE00:\n\ - movs r0, 0x5\n\ - ldrsb r0, [r4, r0]\n\ - ldrb r1, [r1, 0x1]\n\ - cmp r0, r1\n\ - blt _0811AE0E\n\ - subs r0, r1, 0x1\n\ - strb r0, [r4, 0x5]\n\ -_0811AE0E:\n\ - bl sub_811AB44\n\ - cmp r0, 0\n\ - beq _0811AE28\n\ - ldr r2, [r6]\n\ - ldr r0, [r2, 0x4]\n\ - ldr r1, =0x00ffff00\n\ - ands r0, r1\n\ - ldr r1, =0x00040100\n\ - cmp r0, r1\n\ - bne _0811AE28\n\ - movs r0, 0\n\ - strb r0, [r2, 0x5]\n\ -_0811AE28:\n\ - ldr r0, =gEasyChatScreen\n\ - ldr r1, [r0]\n\ - movs r0, 0\n\ - strb r0, [r1, 0x4]\n\ - movs r0, 0x2\n\ -_0811AE32:\n\ - pop {r4-r6}\n\ - pop {r1}\n\ - bx r1\n\ - .pool"); -} -#endif // NONMATCHING static u16 sub_811AE44(void) { @@ -1617,7 +1259,7 @@ static int sub_811B2B0(void) var1 = sub_811F5B0(); if (var1 == 0) return 0; - + gEasyChatScreen->unk_0f = (var1 - 1) / 2; gEasyChatScreen->unk_0e = 0; gEasyChatScreen->unk_10 = 0; @@ -1984,7 +1626,7 @@ static u16 sub_811B794(u32 arg0) gEasyChatScreen->unk_0e += 4; if (gEasyChatScreen->unk_0e > gEasyChatScreen->unk_0f - 3) gEasyChatScreen->unk_0e = gEasyChatScreen->unk_0f + 0xFD; - + sub_811B9A0(); return 22; } @@ -2287,7 +1929,7 @@ static int sub_811BD64(void) if (gEasyChatScreen->kind == 17) return sub_811BCF4(); - + saveBlock1 = gSaveBlock1Ptr; for (i = 0; i < 9; i++) { @@ -2401,7 +2043,7 @@ int sub_811BF88(int easyChatWord) static bool8 sub_811BF8C(void) { if (!sub_811CE94()) - return 0; + return 0; else return 1; } @@ -2555,7 +2197,7 @@ static bool8 sub_811C30C(void) int trueStringWidth; u8 var2; u8 sp0[64]; - + ecWordBuffer = sub_811BA94(); var0 = sub_811BA68(); cursorColumn = sub_811BAB8(); @@ -2775,7 +2417,7 @@ static bool8 sub_811C6C0(void) if (!sub_811DAA4() && !sub_811E5B8()) { sub_811D6D4(); - gUnknown_0203A11C->unk0++; + gUnknown_0203A11C->unk0++; } break; case 2: @@ -3517,7 +3159,7 @@ static void sub_811D424(u16 *tilemap) x++; for (; x < right; x++) tilemap[y * 32 + x] = 0x1000; - + tilemap[y* 32 + x] = 0x1007; } } @@ -4456,10 +4098,10 @@ u16 EasyChat_GetNumWordsInGroup(u8 groupId) { if (groupId == EC_GROUP_POKEMON) return GetNationalPokedexCount(FLAG_GET_SEEN); - + if (sub_811EA28(groupId)) - return gEasyChatGroups[groupId].numEnabledWords; - + return gEasyChatGroups[groupId].numEnabledWords; + return 0; } @@ -4472,7 +4114,7 @@ bool8 sub_811EAA4(u16 easyChatWord) const u16 *list; if (easyChatWord == 0xFFFF) return FALSE; - + groupId = EC_GROUP(easyChatWord); index = EC_INDEX(easyChatWord); if (groupId >= EC_NUM_GROUPS) From b60611c38e904dac5c83f76fc2fbb880baaf0d33 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 26 Feb 2019 11:17:41 -0600 Subject: [PATCH 123/217] Finish decompiling easy_chat.c code --- asm/easy_chat.s | 1179 ------------------------------------------- include/easy_chat.h | 3 +- include/global.h | 3 +- ld_script.txt | 2 +- src/easy_chat.c | 464 ++++++++++++++++- 5 files changed, 447 insertions(+), 1204 deletions(-) delete mode 100644 asm/easy_chat.s diff --git a/asm/easy_chat.s b/asm/easy_chat.s deleted file mode 100644 index 2051e67e15..0000000000 --- a/asm/easy_chat.s +++ /dev/null @@ -1,1179 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_811F01C -sub_811F01C: @ 811F01C - push {r4-r6,lr} - bl sub_811EFF0 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x21 - bne _0811F048 - b _0811F082 -_0811F02C: - adds r0, r5, 0 - bl sub_811EFC0 - ldr r0, =0x000001ff - ands r4, r0 - movs r1, 0xA0 - lsls r1, 6 - adds r0, r1, 0 - orrs r4, r0 - adds r0, r4, 0 - b _0811F084 - .pool -_0811F048: - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x21 - subs r1, r4 - bl __modsi3 - lsls r0, 16 - lsrs r6, r0, 16 - movs r4, 0 -_0811F05E: - lsls r0, r4, 24 - lsrs r5, r0, 24 - adds r0, r5, 0 - bl sub_811EF98 - lsls r0, 24 - cmp r0, 0 - bne _0811F078 - cmp r6, 0 - beq _0811F02C - subs r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 -_0811F078: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x20 - bls _0811F05E -_0811F082: - ldr r0, =0x0000ffff -_0811F084: - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811F01C - - thumb_func_start sub_811F090 -sub_811F090: @ 811F090 - push {r4,r5,lr} - bl sub_811EFF0 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0 - bne _0811F0B4 - b _0811F0EA -_0811F0A0: - ldr r0, =0x000001ff - ands r4, r0 - movs r1, 0xA0 - lsls r1, 6 - adds r0, r1, 0 - orrs r4, r0 - adds r0, r4, 0 - b _0811F0EC - .pool -_0811F0B4: - bl Random - lsls r0, 16 - lsrs r0, 16 - adds r1, r5, 0 - bl __umodsi3 - lsls r0, 16 - lsrs r5, r0, 16 - movs r4, 0 -_0811F0C8: - lsls r0, r4, 24 - lsrs r0, 24 - bl sub_811EF98 - lsls r0, 24 - cmp r0, 0 - beq _0811F0E0 - cmp r5, 0 - beq _0811F0A0 - subs r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 -_0811F0E0: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x20 - bls _0811F0C8 -_0811F0EA: - ldr r0, =0x0000ffff -_0811F0EC: - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811F090 - - thumb_func_start sub_811F0F8 -sub_811F0F8: @ 811F0F8 - push {lr} - bl IsNationalPokedexEnabled - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - thumb_func_end sub_811F0F8 - - thumb_func_start sub_811F108 -sub_811F108: @ 811F108 - push {r4-r7,lr} - movs r0, 0 - bl EasyChat_GetNumWordsInGroup - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0 - bne _0811F128 - b _0811F172 -_0811F11A: - ldrh r1, [r5] - ldr r0, =0x000001ff - ands r0, r1 - b _0811F174 - .pool -_0811F128: - bl Random - lsls r0, 16 - lsrs r0, 16 - adds r1, r4, 0 - bl __umodsi3 - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, =gEasyChatGroups - ldr r5, [r0] - ldrh r7, [r0, 0x4] - movs r6, 0 - cmp r6, r7 - bcs _0811F172 -_0811F146: - ldrh r0, [r5] - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0 - bl GetSetPokedexFlag - lsls r0, 24 - cmp r0, 0 - beq _0811F166 - cmp r4, 0 - beq _0811F11A - subs r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 -_0811F166: - adds r5, 0x2 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, r7 - bcc _0811F146 -_0811F172: - ldr r0, =0x0000ffff -_0811F174: - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811F108 - - thumb_func_start InitEasyChatPhrases -InitEasyChatPhrases: @ 811F184 - push {r4-r7,lr} - movs r2, 0 - ldr r5, =gSaveBlock1Ptr - ldr r4, =0x00002bb0 - ldr r3, =gUnknown_0859E62C -_0811F18E: - ldr r1, [r5] - lsls r0, r2, 1 - adds r1, r4 - adds r1, r0 - adds r0, r3 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x3 - bls _0811F18E - movs r2, 0 - ldr r5, =gSaveBlock1Ptr - ldr r4, =0x00002bbc - ldr r3, =gUnknown_0859E634 -_0811F1AE: - ldr r1, [r5] - lsls r0, r2, 1 - adds r1, r4 - adds r1, r0 - adds r0, r3 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x5 - bls _0811F1AE - movs r2, 0 - ldr r5, =gSaveBlock1Ptr - ldr r4, =0x00002bc8 - ldr r3, =gUnknown_0859E640 -_0811F1CE: - ldr r1, [r5] - lsls r0, r2, 1 - adds r1, r4 - adds r1, r0 - adds r0, r3 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x5 - bls _0811F1CE - movs r2, 0 - ldr r5, =gSaveBlock1Ptr - ldr r4, =0x00002bd4 - ldr r3, =gUnknown_0859E64C -_0811F1EE: - ldr r1, [r5] - lsls r0, r2, 1 - adds r1, r4 - adds r1, r0 - adds r0, r3 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x5 - bls _0811F1EE - movs r2, 0 - ldr r7, =gSaveBlock1Ptr - ldr r6, =0x00002be0 - ldr r0, =0x0000ffff - adds r5, r0, 0 -_0811F210: - movs r3, 0 - lsls r0, r2, 3 - adds r0, r2 - lsls r4, r0, 2 -_0811F218: - ldr r1, [r7] - lsls r0, r3, 1 - adds r0, r4 - adds r1, r6 - adds r1, r0 - ldrh r0, [r1] - orrs r0, r5 - strh r0, [r1] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x8 - bls _0811F218 - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0xF - bls _0811F210 - movs r2, 0 - ldr r4, =gSaveBlock1Ptr - ldr r3, =0x00002e20 - movs r1, 0 -_0811F244: - ldr r0, [r4] - adds r0, r3 - adds r0, r2 - strb r1, [r0] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x3F - bls _0811F244 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end InitEasyChatPhrases - - thumb_func_start sub_811F28C -sub_811F28C: @ 811F28C - push {r4,lr} - ldr r4, =gUnknown_0203A120 - ldr r0, =0x00003ba4 - bl Alloc - str r0, [r4] - cmp r0, 0 - beq _0811F2B0 - bl sub_811F2D4 - bl sub_811F46C - movs r0, 0x1 - b _0811F2B2 - .pool -_0811F2B0: - movs r0, 0 -_0811F2B2: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811F28C - - thumb_func_start sub_811F2B8 -sub_811F2B8: @ 811F2B8 - push {r4,lr} - ldr r4, =gUnknown_0203A120 - ldr r0, [r4] - cmp r0, 0 - beq _0811F2CA - bl Free - movs r0, 0 - str r0, [r4] -_0811F2CA: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811F2B8 - - thumb_func_start sub_811F2D4 -sub_811F2D4: @ 811F2D4 - push {r4,r5,lr} - ldr r4, =gUnknown_0203A120 - ldr r0, [r4] - movs r5, 0 - strh r5, [r0] - movs r0, 0 - bl GetNationalPokedexCount - lsls r0, 16 - cmp r0, 0 - beq _0811F2FC - ldr r0, [r4] - ldrh r1, [r0] - adds r2, r1, 0x1 - strh r2, [r0] - lsls r1, 16 - lsrs r1, 15 - adds r0, 0x2 - adds r0, r1 - strh r5, [r0] -_0811F2FC: - movs r3, 0x1 -_0811F2FE: - ldr r0, [r4] - ldrh r2, [r0] - adds r1, r2, 0x1 - strh r1, [r0] - lsls r2, 16 - lsrs r2, 15 - adds r0, 0x2 - adds r0, r2 - strh r3, [r0] - adds r3, 0x1 - cmp r3, 0x10 - ble _0811F2FE - ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _0811F358 - ldr r0, =gUnknown_0203A120 - ldr r2, [r0] - ldrh r0, [r2] - adds r1, r0, 0x1 - strh r1, [r2] - lsls r0, 16 - lsrs r0, 15 - adds r3, r2, 0x2 - adds r0, r3, r0 - movs r1, 0x11 - strh r1, [r0] - ldrh r0, [r2] - adds r1, r0, 0x1 - strh r1, [r2] - lsls r0, 16 - lsrs r0, 15 - adds r0, r3, r0 - movs r1, 0x12 - strh r1, [r0] - ldrh r0, [r2] - adds r1, r0, 0x1 - strh r1, [r2] - lsls r0, 16 - lsrs r0, 15 - adds r3, r0 - movs r0, 0x13 - strh r0, [r3] -_0811F358: - ldr r0, =0x00000866 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _0811F37A - ldr r0, =gUnknown_0203A120 - ldr r0, [r0] - ldrh r1, [r0] - adds r2, r1, 0x1 - strh r2, [r0] - lsls r1, 16 - lsrs r1, 15 - adds r0, 0x2 - adds r0, r1 - movs r1, 0x14 - strh r1, [r0] -_0811F37A: - bl IsNationalPokedexEnabled - cmp r0, 0 - beq _0811F398 - ldr r0, =gUnknown_0203A120 - ldr r0, [r0] - ldrh r1, [r0] - adds r2, r1, 0x1 - strh r2, [r0] - lsls r1, 16 - lsrs r1, 15 - adds r0, 0x2 - adds r0, r1 - movs r1, 0x15 - strh r1, [r0] -_0811F398: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811F2D4 - - thumb_func_start sub_811F3AC -sub_811F3AC: @ 811F3AC - ldr r0, =gUnknown_0203A120 - ldr r0, [r0] - ldrb r0, [r0] - bx lr - .pool - thumb_func_end sub_811F3AC - - thumb_func_start sub_811F3B8 -sub_811F3B8: @ 811F3B8 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =gUnknown_0203A120 - ldr r1, [r0] - ldrh r0, [r1] - cmp r2, r0 - bcs _0811F3D8 - lsls r0, r2, 1 - adds r1, 0x2 - adds r1, r0 - ldrb r0, [r1] - b _0811F3DA - .pool -_0811F3D8: - movs r0, 0x16 -_0811F3DA: - pop {r1} - bx r1 - thumb_func_end sub_811F3B8 - - thumb_func_start sub_811F3E0 -sub_811F3E0: @ 811F3E0 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r1, 24 - lsls r2, 16 - lsrs r5, r2, 16 - ldr r0, =gEasyChatGroupNamePointers - lsrs r1, 22 - adds r1, r0 - ldr r1, [r1] - adds r0, r4, 0 - bl StringCopy - adds r1, r0, 0 - subs r4, r1, r4 - lsls r4, 16 - lsrs r0, r4, 16 - cmp r0, r5 - bcs _0811F414 - movs r2, 0 -_0811F406: - strb r2, [r1] - adds r1, 0x1 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, r5 - bcc _0811F406 -_0811F414: - movs r0, 0xFF - strb r0, [r1] - adds r0, r1, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811F3E0 - - thumb_func_start sub_811F424 -sub_811F424: @ 811F424 - lsls r0, 24 - ldr r1, =gEasyChatGroupNamePointers - lsrs r0, 22 - adds r0, r1 - ldr r0, [r0] - bx lr - .pool - thumb_func_end sub_811F424 - - thumb_func_start CopyEasyChatWordPadded -@ char *CopyEasyChatWordPadded(char *dest, u16 groupIdWordIdPair, u16 minLength) -CopyEasyChatWordPadded: @ 811F434 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r1, 16 - lsrs r1, 16 - lsls r2, 16 - lsrs r5, r2, 16 - bl CopyEasyChatWord - adds r1, r0, 0 - subs r4, r1, r4 - lsls r4, 16 - lsrs r0, r4, 16 - cmp r0, r5 - bcs _0811F460 - movs r2, 0 -_0811F452: - strb r2, [r1] - adds r1, 0x1 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, r5 - bcc _0811F452 -_0811F460: - movs r0, 0xFF - strb r0, [r1] - adds r0, r1, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end CopyEasyChatWordPadded - - thumb_func_start sub_811F46C -sub_811F46C: @ 811F46C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x10 - movs r3, 0 -_0811F47A: - ldr r2, =gEasyChatWordsByLetterPointers - lsls r1, r3, 3 - adds r0, r2, 0x4 - adds r0, r1, r0 - ldr r0, [r0] - str r0, [sp] - adds r1, r2 - ldr r7, [r1] - ldr r0, =gUnknown_0203A120 - ldr r1, [r0] - lsls r2, r3, 1 - adds r1, 0x2E - adds r1, r2 - movs r0, 0 - strh r0, [r1] - mov r10, r0 - movs r1, 0 - str r2, [sp, 0x4] - adds r0, r3, 0x1 - str r0, [sp, 0x8] - ldr r2, [sp] - cmp r1, r2 - bge _0811F530 -_0811F4A8: - ldrh r0, [r7] - ldr r2, =0x0000ffff - cmp r0, r2 - bne _0811F4FC - adds r7, 0x2 - ldrh r4, [r7] - adds r7, 0x2 - adds r0, r1, 0x1 - adds r1, r0, r4 - b _0811F4FE - .pool -_0811F4C8: - ldr r0, =gUnknown_0203A120 - ldr r2, [r0] - mov r0, r10 - lsls r1, r0, 1 - lsls r0, r3, 4 - adds r0, r3 - lsls r0, 3 - subs r0, r3 - lsls r0, 2 - adds r1, r0 - adds r0, r2, 0 - adds r0, 0x64 - adds r0, r1 - ldrh r1, [r5] - strh r1, [r0] - movs r0, 0x1 - add r10, r0 - adds r2, 0x2E - ldr r0, [sp, 0x4] - adds r2, r0 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - b _0811F526 - .pool -_0811F4FC: - movs r4, 0x1 -_0811F4FE: - movs r6, 0 - adds r1, 0x1 - mov r9, r1 - lsls r2, r4, 1 - mov r8, r2 - cmp r6, r4 - bge _0811F526 - adds r5, r7, 0 -_0811F50E: - ldrh r0, [r5] - str r3, [sp, 0xC] - bl sub_811F860 - lsls r0, 24 - ldr r3, [sp, 0xC] - cmp r0, 0 - bne _0811F4C8 - adds r5, 0x2 - adds r6, 0x1 - cmp r6, r4 - blt _0811F50E -_0811F526: - add r7, r8 - mov r1, r9 - ldr r0, [sp] - cmp r1, r0 - blt _0811F4A8 -_0811F530: - ldr r3, [sp, 0x8] - cmp r3, 0x1A - ble _0811F47A - add sp, 0x10 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_811F46C - - thumb_func_start sub_811F548 -sub_811F548: @ 811F548 - push {lr} - lsls r1, 16 - lsrs r1, 16 - cmp r0, 0 - bne _0811F55A - adds r0, r1, 0 - bl sub_811F5C4 - b _0811F560 -_0811F55A: - adds r0, r1, 0 - bl sub_811F6B8 -_0811F560: - ldr r1, =gUnknown_0203A120 - ldr r1, [r1] - ldr r2, =0x00003ba0 - adds r1, r2 - strh r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end sub_811F548 - - thumb_func_start sub_811F578 -sub_811F578: @ 811F578 - push {lr} - lsls r0, 16 - lsrs r2, r0, 16 - ldr r0, =gUnknown_0203A120 - ldr r1, [r0] - ldr r3, =0x00003ba0 - adds r0, r1, r3 - ldrh r0, [r0] - cmp r2, r0 - bcs _0811F5A4 - lsls r0, r2, 1 - ldr r2, =0x00003984 - adds r1, r2 - adds r1, r0 - ldrh r0, [r1] - b _0811F5A6 - .pool -_0811F5A4: - ldr r0, =0x0000ffff -_0811F5A6: - pop {r1} - bx r1 - .pool - thumb_func_end sub_811F578 - - thumb_func_start sub_811F5B0 -sub_811F5B0: @ 811F5B0 - ldr r0, =gUnknown_0203A120 - ldr r0, [r0] - ldr r1, =0x00003ba0 - adds r0, r1 - ldrh r0, [r0] - bx lr - .pool - thumb_func_end sub_811F5B0 - - thumb_func_start sub_811F5C4 -sub_811F5C4: @ 811F5C4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 16 - lsrs r2, r0, 16 - ldr r1, =gEasyChatGroups - lsls r0, r2, 3 - adds r0, r1 - ldrh r3, [r0, 0x4] - mov r8, r3 - cmp r2, 0 - beq _0811F5EC - cmp r2, 0x15 - beq _0811F5EC - cmp r2, 0x12 - beq _0811F5EC - cmp r2, 0x13 - bne _0811F64C -_0811F5EC: - lsls r0, r2, 3 - adds r0, r1 - ldr r1, [r0] - movs r7, 0 - movs r5, 0 - cmp r5, r8 - bcs _0811F698 - movs r0, 0x7F - ands r0, r2 - lsls r0, 9 - mov r9, r0 - adds r4, r1, 0 - lsls r6, r2, 24 -_0811F606: - ldrh r0, [r4] - lsrs r1, r6, 24 - bl sub_811F764 - lsls r0, 24 - cmp r0, 0 - beq _0811F630 - ldr r0, =gUnknown_0203A120 - ldr r2, [r0] - lsls r0, r5, 1 - ldr r1, =0x00003984 - adds r2, r1 - adds r2, r0 - ldrh r0, [r4] - ldr r3, =0x000001ff - adds r1, r3, 0 - ands r0, r1 - mov r1, r9 - orrs r0, r1 - strh r0, [r2] - adds r5, 0x1 -_0811F630: - adds r4, 0x2 - adds r7, 0x1 - cmp r7, r8 - bcc _0811F606 - b _0811F698 - .pool -_0811F64C: - ldr r1, [r0] - movs r7, 0 - movs r5, 0 - cmp r5, r8 - bcs _0811F698 - movs r0, 0x7F - ands r0, r2 - lsls r0, 9 - mov r10, r0 - adds r6, r1, 0 - lsls r2, 24 - mov r9, r2 -_0811F664: - ldrh r4, [r6, 0x4] - adds r0, r4, 0 - mov r2, r9 - lsrs r1, r2, 24 - bl sub_811F764 - lsls r0, 24 - cmp r0, 0 - beq _0811F690 - ldr r0, =gUnknown_0203A120 - ldr r1, [r0] - lsls r0, r5, 1 - ldr r3, =0x00003984 - adds r1, r3 - adds r1, r0 - ldr r2, =0x000001ff - adds r0, r2, 0 - ands r4, r0 - mov r3, r10 - orrs r4, r3 - strh r4, [r1] - adds r5, 0x1 -_0811F690: - adds r6, 0xC - adds r7, 0x1 - cmp r7, r8 - bcc _0811F664 -_0811F698: - lsls r0, r5, 16 - lsrs r0, 16 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811F5C4 - - thumb_func_start sub_811F6B8 -sub_811F6B8: @ 811F6B8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 16 - lsrs r1, r0, 16 - movs r4, 0 - movs r6, 0 - ldr r3, =gUnknown_0203A120 - ldr r0, [r3] - lsls r5, r1, 1 - adds r0, 0x2E - adds r0, r5 - ldrh r0, [r0] - cmp r6, r0 - bcs _0811F718 - mov r8, r3 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 3 - subs r0, r1 - lsls r7, r0, 2 - ldr r0, =0x00003984 - mov r12, r0 -_0811F6E6: - mov r0, r8 - ldr r3, [r0] - adds r1, r6, 0 - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - lsls r1, 1 - mov r0, r12 - adds r2, r3, r0 - adds r2, r1 - lsls r1, r4, 1 - adds r1, r7 - adds r0, r3, 0 - adds r0, 0x64 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r2] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - adds r3, 0x2E - adds r3, r5 - ldrh r3, [r3] - cmp r4, r3 - bcc _0811F6E6 -_0811F718: - adds r0, r6, 0 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811F6B8 - - thumb_func_start sub_811F72C -sub_811F72C: @ 811F72C - push {r4,lr} - lsls r0, 24 - lsrs r3, r0, 24 - movs r2, 0 - ldr r0, =gUnknown_0203A120 - ldr r0, [r0] - ldrh r1, [r0] - cmp r2, r1 - bge _0811F75C - adds r4, r3, 0 - adds r3, r1, 0 - adds r1, r0, 0x2 -_0811F744: - ldrh r0, [r1] - cmp r0, r4 - bne _0811F754 - movs r0, 0x1 - b _0811F75E - .pool -_0811F754: - adds r1, 0x2 - adds r2, 0x1 - cmp r2, r3 - blt _0811F744 -_0811F75C: - movs r0, 0 -_0811F75E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811F72C - - thumb_func_start sub_811F764 -sub_811F764: @ 811F764 - push {r4,lr} - lsls r0, 16 - lsrs r4, r0, 16 - lsls r1, 24 - lsrs r2, r1, 24 - cmp r2, 0x15 - bhi _0811F81A - lsls r0, r2, 2 - ldr r1, =_0811F780 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0811F780: - .4byte _0811F7D8 - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F81A - .4byte _0811F808 - .4byte _0811F808 - .4byte _0811F80C - .4byte _0811F7EE -_0811F7D8: - adds r0, r4, 0 - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0 - bl GetSetPokedexFlag - lsls r0, 24 - lsrs r0, 24 - b _0811F82C -_0811F7EE: - adds r0, r4, 0 - bl sub_811F838 - cmp r0, 0 - beq _0811F808 - adds r0, r4, 0 - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0 - bl GetSetPokedexFlag -_0811F808: - movs r0, 0x1 - b _0811F82C -_0811F80C: - lsls r0, r4, 24 - lsrs r0, 24 - bl sub_811EF98 - lsls r0, 24 - lsrs r0, 24 - b _0811F82C -_0811F81A: - ldr r1, =gEasyChatGroups - lsls r0, r2, 3 - adds r0, r1 - ldr r1, [r0] - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 2 - adds r0, r1 - ldrb r0, [r0, 0x8] -_0811F82C: - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_811F764 - - thumb_func_start sub_811F838 -sub_811F838: @ 811F838 - push {lr} - lsls r0, 16 - lsrs r3, r0, 16 - movs r2, 0 - ldr r1, =gUnknown_0859E658 -_0811F842: - ldrh r0, [r1] - cmp r0, r3 - bne _0811F850 - movs r0, 0x1 - b _0811F85A - .pool -_0811F850: - adds r1, 0x2 - adds r2, 0x1 - cmp r2, 0 - beq _0811F842 - movs r0, 0 -_0811F85A: - pop {r1} - bx r1 - thumb_func_end sub_811F838 - - thumb_func_start sub_811F860 -sub_811F860: @ 811F860 - push {r4,r5,lr} - lsls r0, 16 - lsrs r5, r0, 25 - lsls r0, 7 - lsrs r4, r0, 23 - adds r0, r5, 0 - bl sub_811F72C - lsls r0, 24 - cmp r0, 0 - beq _0811F884 - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_811F764 - lsls r0, 24 - lsrs r0, 24 - b _0811F886 -_0811F884: - movs r0, 0 -_0811F886: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_811F860 - - thumb_func_start InitializeEasyChatWordArray -InitializeEasyChatWordArray: @ 811F88C - push {lr} - adds r2, r0, 0 - lsls r1, 16 - ldr r0, =0xffff0000 - adds r1, r0 - lsrs r0, r1, 16 - ldr r1, =0x0000ffff - cmp r0, r1 - beq _0811F8AE - adds r3, r1, 0 -_0811F8A0: - strh r3, [r2] - adds r2, 0x2 - subs r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, r1 - bne _0811F8A0 -_0811F8AE: - pop {r0} - bx r0 - .pool - thumb_func_end InitializeEasyChatWordArray - -@void sub_811F8BC() { -@ s16* v; -@ s16* ptr; -@ v = GetSaveBlock1Field3564(); -@ for (ptr = v + 3; ptr >= v; ptr--) { -@ *ptr = -1; -@ } -@} - thumb_func_start sub_811F8BC -sub_811F8BC: @ 811F8BC - push {lr} - bl GetSaveBlock1Field3564 - ldr r1, =0x0000ffff - adds r2, r1, 0 - adds r1, r0, 0x6 -_0811F8C8: - strh r2, [r1] - subs r1, 0x2 - cmp r1, r0 - bge _0811F8C8 - pop {r0} - bx r0 - .pool - thumb_func_end sub_811F8BC - - thumb_func_start sub_811F8D8 -sub_811F8D8: @ 811F8D8 - push {r4,r5,lr} - asrs r4, r0, 9 - movs r1, 0x7F - ldr r5, =0x000001ff - ands r5, r0 - ands r4, r1 - adds r0, r4, 0 - bl sub_811EA28 - lsls r0, 24 - cmp r0, 0 - beq _0811F904 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_811F764 - lsls r0, 24 - lsrs r0, 24 - b _0811F906 - .pool -_0811F904: - movs r0, 0 -_0811F906: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_811F8D8 - - .align 2, 0 @ Don't pad with nop. diff --git a/include/easy_chat.h b/include/easy_chat.h index c55fca81bf..b3639af217 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -6,7 +6,7 @@ void InitEasyChatPhrases(void); void easy_chat_input_maybe(void); u8 * CopyEasyChatWord(u8 *dest, u16 word); -bool32 sub_811F8D8(u16 word); +bool32 sub_811F8D8(int word); void InitializeEasyChatWordArray(u16 *words, u16 length); u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows); bool8 ECWord_CheckIfOutsideOfValidRange(u16 word); @@ -15,5 +15,6 @@ u16 sub_811F01C(void); u16 EasyChat_GetNumWordsInGroup(u8); u16 sub_811EE90(u16); void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam); +void sub_811F8BC(void); #endif // GUARD_EASYCHAT_H diff --git a/include/global.h b/include/global.h index cc308c3c99..ee0ba68931 100644 --- a/include/global.h +++ b/include/global.h @@ -875,8 +875,7 @@ struct SaveBlock1 /*0x2BC8*/ u16 unk2BC8[6]; /*0x2BD4*/ u16 unk2BD4[6]; /*0x2BE0*/ struct MailStruct mail[MAIL_COUNT]; - /*0x2E20*/ u8 additionalPhrases[5]; // bitfield for 33 additional phrases in easy chat system - /*0x2E25*/ u8 unk2E25[3]; // possibly padding? + /*0x2E20*/ u8 additionalPhrases[8]; // bitfield for 33 additional phrases in easy chat system /*0x2E28*/ OldMan oldMan; /*0x2e64*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff /*0x2e90*/ struct ContestWinner contestWinners[13]; // 0 - 5 used in contest hall, 6 - 7 unused?, 8 - 12 museum diff --git a/ld_script.txt b/ld_script.txt index eaf75c3dec..1076068334 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -178,7 +178,6 @@ SECTIONS { src/battle_intro.o(.text); src/bike.o(.text); src/easy_chat.o(.text); - asm/easy_chat.o(.text); src/mon_markings.o(.text); src/mauville_old_man.o(.text); src/mail.o(.text); @@ -501,6 +500,7 @@ SECTIONS { src/battle_anim_utility_funcs.o(.rodata); src/battle_intro.o(.rodata); src/bike.o(.rodata); + src/easy_chat.o(.rodata); data/easy_chat.o(.rodata); src/mon_markings.o(.rodata); src/mauville_old_man.o(.rodata); diff --git a/src/easy_chat.c b/src/easy_chat.c index 3fdc888234..6a103dd7b0 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -141,9 +141,26 @@ struct EasyChatGroup u16 numEnabledWords; }; +struct Unk203A120 +{ + u16 unk0; + u16 unk2[EC_NUM_GROUPS]; + u16 unk2E[27]; + u16 unk64[27][270]; + u8 filler3958[0x2C]; + u16 unk3984[0x10E]; + u16 unk3BA0; +}; /*size = 0x3BA4*/ + +struct EasyChatWordsByLetter +{ + const u16 *words; + int numWords; +}; + EWRAM_DATA struct EasyChatScreen *gEasyChatScreen = NULL; EWRAM_DATA struct Unk203A11C *gUnknown_0203A11C = 0; -EWRAM_DATA void *gUnknown_0203A120 = 0; +EWRAM_DATA struct Unk203A120 *gUnknown_0203A120 = 0; static void sub_811A2C0(u8); static void sub_811A278(void); @@ -178,9 +195,9 @@ static bool8 sub_811BFA4(void); static void sub_811C13C(void); static void sub_811C158(u16); static bool8 sub_811C170(void); -bool8 sub_811F28C(void); -void sub_811F2B8(void); -u8 sub_811F3AC(void); +static bool8 sub_811F28C(void); +static void sub_811F2B8(void); +static u8 sub_811F3AC(void); int sub_811BA3C(void); int sub_811B184(void); int sub_811B264(void); @@ -202,13 +219,13 @@ static int sub_811BDB0(void); static int sub_811BD2C(void); int sub_811BCF4(void); static u16 sub_811B8E8(void); -int sub_811F3B8(u8); -void sub_811F548(int, u16); +static u8 sub_811F3B8(u8); +static void sub_811F548(int, u16); static int sub_811B908(void); -u16 sub_811F5B0(void); +static u16 sub_811F5B0(void); static void sub_811B488(u16); u16 sub_811B940(void); -u16 sub_811F578(u16); +static u16 sub_811F578(u16); int sub_811BF88(int); static u16 sub_811B8C8(void); static int sub_811B568(u32); @@ -310,7 +327,7 @@ static void sub_811DD84(void); static void sub_811D6F4(void); static void sub_811D758(void); static void sub_811D794(void); -const u8 *sub_811F424(u8); +static const u8 *GetEasyChatWordGroupName(u8); static void sub_811D864(u8, u8); static void sub_811D950(u8, u8); static void sub_811DADC(u8); @@ -319,9 +336,16 @@ static void sub_811E0EC(s8, s8); static void sub_811E1A4(s8, s8); static void sub_811E2DC(struct Sprite *); static void sub_811E34C(u8, u8); -bool8 sub_811F0F8(void); -u16 sub_811F108(void); -u8 *CopyEasyChatWordPadded(u8 *, u16, u16); +static bool8 sub_811F0F8(void); +static u16 sub_811F108(void); +static void sub_811F2D4(void); +static void sub_811F46C(void); +static u8 *CopyEasyChatWordPadded(u8 *, u16, u16); +static u8 sub_811F860(u16); +static u16 sub_811F5C4(u16); +static u16 sub_811F6B8(u16); +bool8 sub_811F764(u16, u8); +static int sub_811F838(u16); extern const struct { u16 word; @@ -356,6 +380,13 @@ extern const u8 gUnknown_08597D08[]; extern const u8 gUnknown_08597E60[][4]; extern const u8 *const gUnknown_08597E6C[][4]; extern const struct EasyChatGroup gEasyChatGroups[]; +extern const u16 gUnknown_0859E62C[]; +extern const u16 gUnknown_0859E634[]; +extern const u16 gUnknown_0859E640[]; +extern const u16 gUnknown_0859E64C[]; +extern const u8 *const gEasyChatGroupNamePointers[]; +extern const struct EasyChatWordsByLetter gEasyChatWordsByLetterPointers[]; +extern const u16 gUnknown_0859E658[1]; void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam) { @@ -1248,8 +1279,8 @@ static int sub_811B2B0(void) if (gEasyChatScreen->unk_09 == 0) { - u8 var0 = sub_811F3B8(sub_811B8E8()); - sub_811F548(0, var0); + u8 groupId = sub_811F3B8(sub_811B8E8()); + sub_811F548(0, groupId); } else { @@ -3265,14 +3296,14 @@ static void sub_811D6F4(void) { for (x = 0; x < 2; x++) { - u8 index = sub_811F3B8(i++); - if (index == 22) + u8 groupId = sub_811F3B8(i++); + if (groupId == EC_NUM_GROUPS) { sub_811DDAC(sub_811BBBC(), 0); return; } - sub_811D028(2, 1, sub_811F424(index), x * 84 + 10, y, 0xFF, NULL); + sub_811D028(2, 1, GetEasyChatWordGroupName(groupId), x * 84 + 10, y, 0xFF, NULL); } y += 16; @@ -4077,7 +4108,7 @@ static void sub_811E948(void) PutWindowTilemap(windowId); } -bool8 sub_811EA28(u8 groupId) +static bool8 sub_811EA28(u8 groupId) { switch (groupId) { @@ -4397,10 +4428,10 @@ void sub_811EF6C(void) CopyEasyChatWord(gStringVar2, easyChatWord); } -u8 sub_811EF98(u8 additionalPhraseId) +static bool8 sub_811EF98(u8 additionalPhraseId) { int byteOffset = additionalPhraseId / 8; - int shift = additionalPhraseId & 0x7; + int shift = additionalPhraseId % 8; return (gSaveBlock1Ptr->additionalPhrases[byteOffset] >> shift) & 1; } @@ -4409,7 +4440,7 @@ void sub_811EFC0(u8 additionalPhraseId) if (additionalPhraseId < 33) { int byteOffset = additionalPhraseId / 8; - int shift = additionalPhraseId & 0x7; + int shift = additionalPhraseId % 8; gSaveBlock1Ptr->additionalPhrases[byteOffset] |= 1 << shift; } } @@ -4427,3 +4458,394 @@ u8 sub_811EFF0(void) return numAdditionalPhrasesUnlocked; } + +u16 sub_811F01C(void) +{ + u16 i; + u16 additionalPhraseId; + u8 numAdditionalPhrasesUnlocked = sub_811EFF0(); + if (numAdditionalPhrasesUnlocked == 33) + return 0xFFFF; + + additionalPhraseId = Random() % (33 - numAdditionalPhrasesUnlocked); + for (i = 0; i < 33; i++) + { + if (!sub_811EF98(i)) + { + if (additionalPhraseId) + { + additionalPhraseId--; + } + else + { + sub_811EFC0(i); + return EC_WORD(EC_GROUP_TRENDY_SAYING, i); + } + } + } + + return 0xFFFF; +} + +u16 sub_811F090(void) +{ + u16 i; + u16 additionalPhraseId = sub_811EFF0(); + if (additionalPhraseId == 0) + return 0xFFFF; + + additionalPhraseId = Random() % additionalPhraseId; + for (i = 0; i < 33; i++) + { + if (sub_811EF98(i)) + { + if (additionalPhraseId) + additionalPhraseId--; + else + return EC_WORD(EC_GROUP_TRENDY_SAYING, i); + } + } + + return 0xFFFF; +} + +static bool8 sub_811F0F8(void) +{ + return IsNationalPokedexEnabled(); +} + +static u16 sub_811F108(void) +{ + u16 i; + u16 numWords; + const u16 *species; + u16 index = EasyChat_GetNumWordsInGroup(EC_GROUP_POKEMON); + if (index == 0) + return 0xFFFF; + + index = Random() % index; + species = gEasyChatGroups[EC_GROUP_POKEMON].wordData.valueList; + numWords = gEasyChatGroups[EC_GROUP_POKEMON].numWords; + for (i = 0; i < numWords; i++) + { + u16 dexNum = SpeciesToNationalPokedexNum(*species); + if (GetSetPokedexFlag(dexNum, FLAG_GET_SEEN)) + { + if (index) + index--; + else + return EC_WORD(EC_GROUP_POKEMON, *species); + } + + species++; + } + + return 0xFFFF; +} + +void InitEasyChatPhrases(void) +{ + u16 i, j; + + for (i = 0; i < 4; i++) + gSaveBlock1Ptr->unk2BB0[i] = gUnknown_0859E62C[i]; + + for (i = 0; i < 6; i++) + gSaveBlock1Ptr->unk2BBC[i] = gUnknown_0859E634[i]; + + for (i = 0; i < 6; i++) + gSaveBlock1Ptr->unk2BC8[i] = gUnknown_0859E640[i]; + + for (i = 0; i < 6; i++) + gSaveBlock1Ptr->unk2BD4[i] = gUnknown_0859E64C[i]; + + for (i = 0; i < MAIL_COUNT; i++) + { + for (j = 0; j < MAIL_WORDS_COUNT; j++) + gSaveBlock1Ptr->mail[i].words[j] = 0xFFFF; + } + + // BUG: This is supposed to clear 64 bits, but this loop is clearing 64 bytes. + // However, this bug has no resulting effect on gameplay because only the + // Mauville old man data is corrupted, which is initialized directly after + // this function is called when starting a new game. + for (i = 0; i < 64; i++) + gSaveBlock1Ptr->additionalPhrases[i] = 0; +} + +static bool8 sub_811F28C(void) +{ + gUnknown_0203A120 = Alloc(sizeof(*gUnknown_0203A120)); + if (!gUnknown_0203A120) + return FALSE; + + sub_811F2D4(); + sub_811F46C(); + return TRUE; +} + +static void sub_811F2B8(void) +{ + if (gUnknown_0203A120) + FREE_AND_SET_NULL(gUnknown_0203A120); +} + +static void sub_811F2D4(void) +{ + int i; + + gUnknown_0203A120->unk0 = 0; + if (GetNationalPokedexCount(FLAG_GET_SEEN)) + gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_POKEMON; + + for (i = EC_GROUP_TRAINER; i <= EC_GROUP_ADJECTIVES; i++) + gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = i; + + if (FlagGet(FLAG_SYS_GAME_CLEAR)) + { + gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_EVENTS; + gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_MOVE_1; + gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_MOVE_2; + } + + if (FlagGet(FLAG_SYS_HIPSTER_MEET)) + gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_TRENDY_SAYING; + + if (IsNationalPokedexEnabled()) + gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_POKEMON_2; +} + +static u8 sub_811F3AC(void) +{ + return gUnknown_0203A120->unk0; +} + +static u8 sub_811F3B8(u8 index) +{ + if (index >= gUnknown_0203A120->unk0) + return EC_NUM_GROUPS; + else + return gUnknown_0203A120->unk2[index]; +} + +u8 *unref_sub_811F3E0(u8 *dest, u8 groupId, u16 totalChars) +{ + u16 i; + u8 *str = StringCopy(dest, gEasyChatGroupNamePointers[groupId]); + for (i = str - dest; i < totalChars; i++) + { + *str = CHAR_SPACE; + str++; + } + + *str = EOS; + return str; +} + +static const u8 *GetEasyChatWordGroupName(u8 groupId) +{ + return gEasyChatGroupNamePointers[groupId]; +} + +static u8 *CopyEasyChatWordPadded(u8 *dest, u16 easyChatWord, u16 totalChars) +{ + u16 i; + u8 *str = CopyEasyChatWord(dest, easyChatWord); + for (i = str - dest; i < totalChars; i++) + { + *str = CHAR_SPACE; + str++; + } + + *str = EOS; + return str; +} + +static void sub_811F46C(void) +{ + int i, j, k; + int numWords; + const u16 *words; + u16 numToProcess; + int index; + + for (i = 0; i < 27; i++) + { + numWords = gEasyChatWordsByLetterPointers[i].numWords; + words = gEasyChatWordsByLetterPointers[i].words; + gUnknown_0203A120->unk2E[i] = 0; + index = 0; + for (j = 0; j < numWords; j++) + { + if (*words == 0xFFFF) + { + words++; + numToProcess = *words; + words++; + j += 1 + numToProcess; + } + else + { + numToProcess = 1; + } + + for (k = 0; k < numToProcess; k++) + { + if (sub_811F860(words[k])) + { + gUnknown_0203A120->unk64[i][index++] = words[k]; + gUnknown_0203A120->unk2E[i]++; + break; + } + } + + words += numToProcess; + } + } +} + +static void sub_811F548(int arg0, u16 groupId) +{ + if (!arg0) + gUnknown_0203A120->unk3BA0 = sub_811F5C4(groupId); + else + gUnknown_0203A120->unk3BA0 = sub_811F6B8(groupId); +} + +static u16 sub_811F578(u16 arg0) +{ + if (arg0 >= gUnknown_0203A120->unk3BA0) + return 0xFFFF; + else + return gUnknown_0203A120->unk3984[arg0]; +} + +static u16 sub_811F5B0(void) +{ + return gUnknown_0203A120->unk3BA0; +} + +static u16 sub_811F5C4(u16 groupId) +{ + u32 i; + int totalWords; + const u16 *list; + const struct EasyChatWordInfo *wordInfo; + u16 numWords = gEasyChatGroups[groupId].numWords; + + if (groupId == EC_GROUP_POKEMON || groupId == EC_GROUP_POKEMON_2 + || groupId == EC_GROUP_MOVE_1 || groupId == EC_GROUP_MOVE_2) + { + list = gEasyChatGroups[groupId].wordData.valueList; + for (i = 0, totalWords = 0; i < numWords; i++) + { + if (sub_811F764(list[i], groupId)) + gUnknown_0203A120->unk3984[totalWords++] = EC_WORD(groupId, list[i]); + } + + return totalWords; + } + else + { + wordInfo = gEasyChatGroups[groupId].wordData.words; + for (i = 0, totalWords = 0; i < numWords; i++) + { + u16 alphabeticalOrder = wordInfo[i].alphabeticalOrder; + if (sub_811F764(alphabeticalOrder, groupId)) + gUnknown_0203A120->unk3984[totalWords++] = EC_WORD(groupId, alphabeticalOrder); + } + + return totalWords; + } +} + +static u16 sub_811F6B8(u16 alphabeticalGroup) +{ + u16 i; + u16 totalWords; + + for (i = 0, totalWords = 0; i < gUnknown_0203A120->unk2E[alphabeticalGroup]; i++) + gUnknown_0203A120->unk3984[totalWords++] = gUnknown_0203A120->unk64[alphabeticalGroup][i]; + + return totalWords; +} + +static bool8 sub_811F72C(u8 arg0) +{ + int i; + for (i = 0; i < gUnknown_0203A120->unk0; i++) + { + if (gUnknown_0203A120->unk2[i] == arg0) + return TRUE; + } + + return FALSE; +} + +bool8 sub_811F764(u16 wordIndex, u8 groupId) +{ + switch (groupId) + { + case EC_GROUP_POKEMON: + return GetSetPokedexFlag(SpeciesToNationalPokedexNum(wordIndex), FLAG_GET_SEEN); + case EC_GROUP_POKEMON_2: + if (sub_811F838(wordIndex)) + GetSetPokedexFlag(SpeciesToNationalPokedexNum(wordIndex), FLAG_GET_SEEN); + return TRUE; + case EC_GROUP_MOVE_1: + case EC_GROUP_MOVE_2: + return TRUE; + case EC_GROUP_TRENDY_SAYING: + return sub_811EF98(wordIndex); + default: + return gEasyChatGroups[groupId].wordData.words[wordIndex].enabled; + } +} + +static int sub_811F838(u16 species) +{ + u32 i; + for (i = 0; i < ARRAY_COUNT(gUnknown_0859E658); i++) + { + if (gUnknown_0859E658[i] == species) + return TRUE; + } + + return FALSE; +} + +static u8 sub_811F860(u16 easyChatWord) +{ + u8 groupId = EC_GROUP(easyChatWord); + u32 index = EC_INDEX(easyChatWord); + if (!sub_811F72C(groupId)) + return FALSE; + else + return sub_811F764(index, groupId); +} + +void InitializeEasyChatWordArray(u16 *words, u16 length) +{ + u16 i; + for (i = length - 1; i != 0xFFFF; i--) + *(words++) = 0xFFFF; +} + +void sub_811F8BC(void) +{ + int i; + u16 *words = GetSaveBlock1Field3564(); + for (i = 0; i < 4; i++) + words[i] = 0xFFFF; +} + +bool32 sub_811F8D8(int easyChatWord) +{ + int groupId = EC_GROUP(easyChatWord); + int mask = 0x7F; + int index = EC_INDEX(easyChatWord); + if (!sub_811EA28(groupId & mask)) + return FALSE; + else + return sub_811F764(index, groupId & mask); +} From 231355f84dccd11329d81d074fa36135cfad4f94 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 26 Feb 2019 11:24:12 -0600 Subject: [PATCH 124/217] Decompile easy_chat data --- data/easy_chat.s | 489 --- data/text/easy_chat/easy_chat_group_actions.s | 547 ---- .../easy_chat/easy_chat_group_adjectives.s | 253 -- data/text/easy_chat/easy_chat_group_battle.s | 442 --- .../easy_chat/easy_chat_group_conditions.s | 484 --- data/text/easy_chat/easy_chat_group_endings.s | 484 --- data/text/easy_chat/easy_chat_group_events.s | 204 -- .../text/easy_chat/easy_chat_group_feelings.s | 484 --- .../easy_chat/easy_chat_group_greetings.s | 295 -- data/text/easy_chat/easy_chat_group_hobbies.s | 379 --- .../easy_chat/easy_chat_group_lifestyle.s | 316 -- data/text/easy_chat/easy_chat_group_misc.s | 295 -- data/text/easy_chat/easy_chat_group_move_1.s | 156 - data/text/easy_chat/easy_chat_group_move_2.s | 202 -- .../easy_chat_group_name_pointers.inc | 24 - data/text/easy_chat/easy_chat_group_people.s | 526 ---- data/text/easy_chat/easy_chat_group_pokemon.s | 204 -- .../text/easy_chat/easy_chat_group_pokemon2.s | 253 -- data/text/easy_chat/easy_chat_group_speech.s | 421 --- data/text/easy_chat/easy_chat_group_status.s | 764 ----- data/text/easy_chat/easy_chat_group_time.s | 316 -- data/text/easy_chat/easy_chat_group_trainer.s | 190 -- .../easy_chat/easy_chat_group_trendy_saying.s | 232 -- data/text/easy_chat/easy_chat_group_voices.s | 442 --- data/text/easy_chat/easy_chat_groups.inc | 112 - .../easy_chat/easy_chat_words_by_letter.inc | 2656 ---------------- include/easy_chat.h | 118 + include/graphics.h | 5 + include/strings.h | 124 + ld_script.txt | 1 - src/data/easy_chat/easy_chat_group_actions.h | 471 +++ .../easy_chat/easy_chat_group_adjectives.h | 219 ++ src/data/easy_chat/easy_chat_group_battle.h | 381 +++ .../easy_chat/easy_chat_group_conditions.h | 417 +++ src/data/easy_chat/easy_chat_group_endings.h | 417 +++ src/data/easy_chat/easy_chat_group_events.h | 177 ++ src/data/easy_chat/easy_chat_group_feelings.h | 417 +++ .../easy_chat/easy_chat_group_greetings.h | 255 ++ src/data/easy_chat/easy_chat_group_hobbies.h | 327 ++ .../easy_chat/easy_chat_group_lifestyle.h | 273 ++ src/data/easy_chat/easy_chat_group_misc.h | 255 ++ src/data/easy_chat/easy_chat_group_move_1.h | 158 + src/data/easy_chat/easy_chat_group_move_2.h | 204 ++ src/data/easy_chat/easy_chat_group_people.h | 453 +++ src/data/easy_chat/easy_chat_group_pokemon.h | 206 ++ src/data/easy_chat/easy_chat_group_pokemon2.h | 255 ++ src/data/easy_chat/easy_chat_group_speech.h | 363 +++ src/data/easy_chat/easy_chat_group_status.h | 657 ++++ src/data/easy_chat/easy_chat_group_time.h | 273 ++ src/data/easy_chat/easy_chat_group_trainer.h | 165 + .../easy_chat/easy_chat_group_trendy_saying.h | 201 ++ src/data/easy_chat/easy_chat_group_voices.h | 381 +++ src/data/easy_chat/easy_chat_groups.h | 137 + .../easy_chat/easy_chat_words_by_letter.h | 2750 +++++++++++++++++ src/easy_chat.c | 1143 +++++-- 55 files changed, 10975 insertions(+), 11398 deletions(-) delete mode 100644 data/easy_chat.s delete mode 100644 data/text/easy_chat/easy_chat_group_actions.s delete mode 100644 data/text/easy_chat/easy_chat_group_adjectives.s delete mode 100644 data/text/easy_chat/easy_chat_group_battle.s delete mode 100644 data/text/easy_chat/easy_chat_group_conditions.s delete mode 100644 data/text/easy_chat/easy_chat_group_endings.s delete mode 100644 data/text/easy_chat/easy_chat_group_events.s delete mode 100644 data/text/easy_chat/easy_chat_group_feelings.s delete mode 100644 data/text/easy_chat/easy_chat_group_greetings.s delete mode 100644 data/text/easy_chat/easy_chat_group_hobbies.s delete mode 100644 data/text/easy_chat/easy_chat_group_lifestyle.s delete mode 100644 data/text/easy_chat/easy_chat_group_misc.s delete mode 100644 data/text/easy_chat/easy_chat_group_move_1.s delete mode 100644 data/text/easy_chat/easy_chat_group_move_2.s delete mode 100644 data/text/easy_chat/easy_chat_group_name_pointers.inc delete mode 100644 data/text/easy_chat/easy_chat_group_people.s delete mode 100644 data/text/easy_chat/easy_chat_group_pokemon.s delete mode 100644 data/text/easy_chat/easy_chat_group_pokemon2.s delete mode 100644 data/text/easy_chat/easy_chat_group_speech.s delete mode 100644 data/text/easy_chat/easy_chat_group_status.s delete mode 100644 data/text/easy_chat/easy_chat_group_time.s delete mode 100644 data/text/easy_chat/easy_chat_group_trainer.s delete mode 100644 data/text/easy_chat/easy_chat_group_trendy_saying.s delete mode 100644 data/text/easy_chat/easy_chat_group_voices.s delete mode 100644 data/text/easy_chat/easy_chat_groups.inc delete mode 100644 data/text/easy_chat/easy_chat_words_by_letter.inc create mode 100755 src/data/easy_chat/easy_chat_group_actions.h create mode 100755 src/data/easy_chat/easy_chat_group_adjectives.h create mode 100755 src/data/easy_chat/easy_chat_group_battle.h create mode 100755 src/data/easy_chat/easy_chat_group_conditions.h create mode 100755 src/data/easy_chat/easy_chat_group_endings.h create mode 100755 src/data/easy_chat/easy_chat_group_events.h create mode 100755 src/data/easy_chat/easy_chat_group_feelings.h create mode 100755 src/data/easy_chat/easy_chat_group_greetings.h create mode 100755 src/data/easy_chat/easy_chat_group_hobbies.h create mode 100755 src/data/easy_chat/easy_chat_group_lifestyle.h create mode 100755 src/data/easy_chat/easy_chat_group_misc.h create mode 100755 src/data/easy_chat/easy_chat_group_move_1.h create mode 100755 src/data/easy_chat/easy_chat_group_move_2.h create mode 100755 src/data/easy_chat/easy_chat_group_people.h create mode 100755 src/data/easy_chat/easy_chat_group_pokemon.h create mode 100755 src/data/easy_chat/easy_chat_group_pokemon2.h create mode 100755 src/data/easy_chat/easy_chat_group_speech.h create mode 100755 src/data/easy_chat/easy_chat_group_status.h create mode 100755 src/data/easy_chat/easy_chat_group_time.h create mode 100755 src/data/easy_chat/easy_chat_group_trainer.h create mode 100755 src/data/easy_chat/easy_chat_group_trendy_saying.h create mode 100755 src/data/easy_chat/easy_chat_group_voices.h create mode 100755 src/data/easy_chat/easy_chat_groups.h create mode 100755 src/data/easy_chat/easy_chat_words_by_letter.h diff --git a/data/easy_chat.s b/data/easy_chat.s deleted file mode 100644 index ef632c69f9..0000000000 --- a/data/easy_chat.s +++ /dev/null @@ -1,489 +0,0 @@ -#include "constants/easy_chat.h" -#include "constants/moves.h" -#include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_08597530:: @ 8597530 - .4byte 0x0000001a - .4byte sub_811A8CC - .4byte 0x00000019 - .4byte sub_811A8F0 - .4byte 0x0000001c - .4byte sub_811A914 - .4byte 0x0000001b - .4byte sub_811A938 - -gEasyChatScreenTemplates:: @ 8597550 - .byte 0x00, 0x02, 0x02, 0x00 - - .align 2 - .4byte gText_Profile - .4byte gText_CombineFourWordsOrPhrases - .4byte gText_AndMakeYourProfile - .4byte gText_YourProfile - .4byte gText_IsAsShownOkay - - .byte 0x01, 0x02, 0x03, 0x01 - - .align 2 - .4byte gText_AtTheBattlesStart - .4byte gText_CombineSixWordsOrPhrases - .4byte gText_AndMakeAMessage - .4byte gText_YourFeelingAtTheBattlesStart - .4byte gText_IsAsShownOkay - - .byte 0x02, 0x02, 0x03, 0x01 - - .align 2 - .4byte gText_UponWinningABattle - .4byte gText_CombineSixWordsOrPhrases - .4byte gText_AndMakeAMessage - .4byte gText_WhatYouSayIfYouWin - .4byte gText_IsAsShownOkay - - .byte 0x03, 0x02, 0x03, 0x01 - - .align 2 - .4byte gText_UponLosingABattle - .4byte gText_CombineSixWordsOrPhrases - .4byte gText_AndMakeAMessage - .4byte gText_WhatYouSayIfYouLose - .4byte gText_IsAsShownOkay - - .byte 0x04, 0x02, 0x05, 0x02 - - .align 2 - .4byte NULL - .4byte gText_CombineNineWordsOrPhrases - .4byte gText_AndMakeAMessage2 - .4byte gText_TheMailMessage - .4byte gText_IsAsShownOkay - - .byte 0x05, 0x02, 0x02, 0x05 - - .align 2 - .4byte gText_Interview - .4byte gText_CombineFourWordsOrPhrases - .4byte gText_LetsReplyToTheInterview - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - - .byte 0x06, 0x02, 0x03, 0x01 - - .align 2 - .4byte gText_TheBardsSong - .4byte gText_ChangeJustOneWordOrPhrase - .4byte gText_AndImproveTheBardsSong - .4byte gText_TheBardsSong2 - .4byte gText_IsAsShownOkay - - .byte 0x07, 0x01, 0x01, 0x04 - - .align 2 - .4byte gText_Interview - .4byte gText_FindWordsThatDescribeYour - .4byte gText_FeelingsRightNow - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - - .byte 0x09, 0x02, 0x01, 0x03 - - .align 2 - .4byte gText_WhatsHipAndHappening - .4byte gText_CombineTwoWordsOrPhrases - .4byte gText_AndMakeATrendySaying - .4byte gText_TheTrendySaying - .4byte gText_IsAsShownOkay - - .byte 0x10, 0x02, 0x05, 0x87 - - .align 2 - .4byte NULL - .4byte gText_AfterYouHaveReadTheQuiz - .4byte gText_QuestionPressTheAButton - .4byte NULL - .4byte NULL - - .byte 0x0f, 0x01, 0x01, 0x86 - - .align 2 - .4byte gText_TheQuizAnswerIs - .4byte gText_OutOfTheListedChoices - .4byte gText_SelectTheAnswerToTheQuiz - .4byte gText_TheAnswerColon - .4byte gText_IsAsShownOkay - - .byte 0x11, 0x02, 0x05, 0x88 - - .align 2 - .4byte NULL - .4byte gText_CombineNineWordsOrPhrases - .4byte gText_AndCreateAQuiz - .4byte gText_IsThisQuizOK - .4byte NULL - - .byte 0x12, 0x01, 0x01, 0x86 - - .align 2 - .4byte gText_TheQuizAnswerIs - .4byte gText_PickAWordOrPhraseAnd - .4byte gText_SetTheQuizAnswer - .4byte gText_IsThisQuizOK - .4byte NULL - - .byte 0x06, 0x02, 0x03, 0x01 - - .align 2 - .4byte gText_TheBardsSong - .4byte gText_ChangeJustOneWordOrPhrase - .4byte gText_AndImproveTheBardsSong - .4byte gText_TheBardsSong2 - .4byte gText_IsAsShownOkay - - .byte 0x13, 0x02, 0x03, 0x01 - - .align 2 - .4byte gText_ApprenticesPhrase - .4byte gText_FindWordsWhichFit - .4byte gText_TheTrainersImage - .4byte gText_ApprenticePhrase - .4byte gText_IsAsShownOkay - - .byte 0x0d, 0x02, 0x01, 0x03 - - .align 2 - .4byte gText_GoodSaying - .4byte gText_CombineTwoWordsOrPhrases2 - .4byte gText_ToTeachHerAGoodSaying - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - - .byte 0x0a, 0x01, 0x01, 0x04 - - .align 2 - .4byte gText_Interview - .4byte gText_FindWordsThatDescribeYour - .4byte gText_FeelingsRightNow - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - - .byte 0x0c, 0x01, 0x01, 0x04 - - .align 2 - .4byte gText_Interview - .4byte gText_FindWordsThatDescribeYour - .4byte gText_FeelingsRightNow - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - - .byte 0x0b, 0x01, 0x01, 0x04 - - .align 2 - .4byte gText_Interview - .4byte gText_FindWordsThatDescribeYour - .4byte gText_FeelingsRightNow - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - - .byte 0x0e, 0x01, 0x01, 0x04 - - .align 2 - .4byte gText_FansQuestion - .4byte gText_FindWordsWhichFit - .4byte gText_TheTrainersImage - .4byte gText_TheImage - .4byte gText_IsAsShownOkay - - .byte 0x14, 0x02, 0x02, 0x00 - - .align 2 - .4byte gText_Questionnaire - .4byte gText_CombineFourWordsOrPhrases - .4byte gText_AndFillOutTheQuestionnaire - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - -gUnknown_08597748:: @ 8597748 - .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00 - .byte 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00 - .byte 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13 - .byte 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a - -gUnknown_08597764:: @ 8597764 - .2byte 0x0209, 0x140b, 0x1030, 0x102a - -gUnknown_0859776C:: @ 859776C - .2byte 0x1240, 0x0628 - .2byte 0x061f, 0x2204 - .2byte 0x1422, 0x0197 - .2byte 0x0415, 0x0198 - .2byte 0x2207, 0x0449 - - .align 2 -gUnknown_08597780:: @ 8597780 - .incbin "graphics/misc/interview_triangle_cursor.gbapal" - - .align 2 -gUnknown_085977A0:: @ 85977A0 - .incbin "graphics/misc/interview_triangle_cursor.4bpp" - - .align 2 -gUnknown_085977C0:: @ 85977C0 - .incbin "graphics/misc/interview_arrow.4bpp" - - .align 2 -gUnknown_085978C0:: @ 85978C0 - .incbin "graphics/misc/interview_buttons.4bpp" - - .align 2 -gUnknown_085979C0:: @ 85979C0 - .incbin "graphics/misc/interview_frame.gbapal" - - .align 2 -gUnknown_085979E0:: @ 85979E0 - .incbin "graphics/misc/interview_frame.4bpp.lz" - - .align 2 -gUnknown_08597B14:: @ 8597B14 - .incbin "graphics/misc/interview_frame_orange.gbapal" - - .align 2 -gUnknown_08597B34:: @ 8597B34 - .incbin "graphics/misc/interview_frame_green.gbapal" - - .align 2 -gUnknown_08597B54:: @ 8597B54 - .incbin "graphics/misc/interview_frame_2.4bpp.lz" - - .align 2 -gUnknown_08597C1C:: @ 8597C1C - .incbin "graphics/misc/8597C1C.gbapal" - - .align 2 -gUnknown_08597C24:: @ 8597C24 - .incbin "graphics/misc/8597C24.gbapal" - -gUnknown_08597C30:: @ 8597C30 - .byte 0x83, 0x18, 0x04, 0x00 - .byte 0x63, 0x18, 0x06, 0x00 - .byte 0x03, 0x18, 0x0a, 0x00 - .byte 0xa3, 0x18, 0x02, 0x00 - .byte 0xb0, 0x0c, 0x02, 0x00 - .byte 0x83, 0x18, 0x04, 0x00 - .byte 0x89, 0x0c, 0x02, 0x01 - .byte 0x65, 0x14, 0x0a, 0x03 - .byte 0x03, 0x18, 0x0a, 0x02 - - .align 2 -gUnknown_08597C54:: @ 8597C54 - .4byte 0x000001c0, 0x000011dd, 0x002021e2, 0x000031fb - - .align 2 -gUnknown_08597C64:: @ 8597C64 - window_template 0x01, 0x06, 0x00, 0x12, 0x02, 0x0a, 0x0010 - window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0f, 0x000a - window_template 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000 - null_window_template - - .align 2 -gUnknown_08597C84:: @ 8597C84 - window_template 0x00, 0x16, 0x09, 0x05, 0x04, 0x0f, 0x006a - -gUnknown_08597C8C:: @ 8597C8C - .string "{CLEAR 17}$" - - .align 2 -gUnknown_08597C90:: @ 8597C90 - .4byte gUnknown_862B810 - .4byte gUnknown_862B832 - .4byte gUnknown_862B84B - .4byte gUnknown_862B86C - - .align 2 -gUnknown_08597CA0:: @ 8597CA0 - obj_tiles gUnknown_085977A0, 0x0020, 0x0000 - obj_tiles gUnknown_085977C0, 0x0100, 0x0002 - obj_tiles gUnknown_085978C0, 0x0100, 0x0003 - null_obj_tiles - - .align 2 -gUnknown_08597CC0:: @ 8597CC0 - obj_pal gUnknown_08597780, 0x0000 - obj_pal gEasyChatCursor_Pal, 0x0001 - obj_pal gEasyChatRightWindow_Pal, 0x0002 - obj_pal gUnknown_085979C0, 0x0003 - null_obj_pal - - .align 2 -gUnknown_08597CE8:: @ 8597CE8 - obj_tiles gUnknown_085979E0, 0x0800, 0x0005 - obj_tiles gEasyChatCursor_Gfx, 0x1000, 0x0001 - obj_tiles gEasyChatRightWindow_Gfx, 0x0800, 0x0006 - obj_tiles gEasyChatMode_Gfx, 0x1000, 0x0004 - -gUnknown_08597D08:: @ 8597D08 - .byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x00 - - .align 2 -gOamData_8597D10:: @ 8597D10 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0C00 - - .align 2 -gUnknown_08597D18:: @ 8597D18 - spr_template 0x0000, 0x0000, gOamData_8597D10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_811DF28 - - .align 2 -gUnknown_08597D30:: @ 8597D30 - .2byte 0x4000, 0xc000, 0x0400, 0x0000 - - .align 2 -gUnknown_08597D38:: @ 8597D38 - .2byte 0x0000, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597D40:: @ 8597D40 - .2byte 0x0020, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597D48:: @ 8597D48 - .2byte 0x0040, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597D50:: @ 8597D50 - .2byte 0x0060, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597D58:: @ 8597D58 - .4byte gUnknown_08597D38 - .4byte gUnknown_08597D40 - .4byte gUnknown_08597D48 - .4byte gUnknown_08597D50 - - .align 2 -gUnknown_08597D68:: @ 8597D68 - spr_template 0x0001, 0x0001, gUnknown_08597D30, gUnknown_08597D58, NULL, gDummySpriteAffineAnimTable, sub_811DF28 - - .align 2 -gUnknown_08597D80:: @ 8597D80 - .2byte 0x4000, 0xc000, 0x0400, 0x0000 - - .align 2 -gUnknown_08597D88:: @ 8597D88 - .2byte 0x0060, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597D90:: @ 8597D90 - .2byte 0x0040, 0x0004, 0x0020, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_08597D9C:: @ 8597D9C - .2byte 0x0040, 0x0004, 0x0000, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_08597DA8:: @ 8597DA8 - .2byte 0x0040, 0x0004, 0x0060, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597DB4:: @ 8597DB4 - .2byte 0x0040, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_08597DBC:: @ 8597DBC - .4byte gUnknown_08597D88 - .4byte gUnknown_08597D90 - .4byte gUnknown_08597D9C - .4byte gUnknown_08597DA8 - .4byte gUnknown_08597DB4 - - .align 2 -gUnknown_08597DD0:: @ 8597DD0 - spr_template 0x0004, 0x0002, gUnknown_08597D80, gUnknown_08597DBC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_08597DE8:: @ 8597DE8 - .2byte 0x0000, 0xc000, 0x0c00, 0x0000 - - .align 2 -gUnknown_08597DF0:: @ 8597DF0 - spr_template 0x0006, 0x0002, gUnknown_08597DE8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_08597E08:: @ 8597E08 - .2byte 0x4000, 0x4000, 0x0400, 0x0000 - - .align 2 -gUnknown_08597E10:: @ 8597E10 - .2byte 0x0000, 0x4000, 0x0400, 0x0000 - - .align 2 -gUnknown_08597E18:: @ 8597E18 - .2byte 0x0000, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597E20:: @ 8597E20 - .2byte 0x0004, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597E28:: @ 8597E28 - .4byte gUnknown_08597E18 - .4byte gUnknown_08597E20 - - .align 2 -gUnknown_08597E30:: @ 8597E30 - spr_template 0x0003, 0x0002, gUnknown_08597E08, gUnknown_08597E28, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_08597E48:: @ 8597E48 - spr_template 0x0002, 0x0002, gUnknown_08597E10, gUnknown_08597E28, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_08597E60:: @ 8597E60 - .byte 0x10, 0x6f, 0xc4, 0x00 - .byte 0x10, 0x4e, 0x82, 0xa0 - .byte 0x10, 0x50, 0x86, 0xaa - - .align 2 -gUnknown_08597E6C:: @ 8597E6C - .4byte gText_DelAll - .4byte gText_Cancel5 - .4byte gText_Ok2 - .4byte NULL - - .4byte gText_DelAll - .4byte gText_Cancel5 - .4byte gText_Ok2 - .4byte gText_Quiz - - .4byte gText_DelAll - .4byte gText_Cancel5 - .4byte gText_Ok2 - .4byte gText_Answer - -@ 8597E9C - .include "data/text/easy_chat/easy_chat_groups.inc" - -@ 859D0B4 - .include "data/text/easy_chat/easy_chat_words_by_letter.inc" - -@ 859E5D4 - .include "data/text/easy_chat/easy_chat_group_name_pointers.inc" - -gUnknown_0859E62C:: @ 859E62C - .2byte 0x0a29, 0x1020, 0x020e, 0x0a33 - -gUnknown_0859E634:: @ 859E634 - .2byte 0x100f, 0x0a02, 0x0e25, 0x0c03, 0x0803, 0x0c00 - -gUnknown_0859E640:: @ 859E640 - .2byte 0x0c3a, 0x0c3a, 0x0c01, 0x0a2a, 0x0607, 0x0c01 - -gUnknown_0859E64C:: @ 859E64C - .2byte 0x1039, 0x122e, 0x0c04, 0x0a3d, 0x0630, 0x0c04 - -gUnknown_0859E658:: @ 859E658 - .2byte 0x019a, 0x0000 diff --git a/data/text/easy_chat/easy_chat_group_actions.s b/data/text/easy_chat/easy_chat_group_actions.s deleted file mode 100644 index 432323e959..0000000000 --- a/data/text/easy_chat/easy_chat_group_actions.s +++ /dev/null @@ -1,547 +0,0 @@ -gEasyChatWord_Meets:: @ 859B058 - .string "MEETS$" - -gEasyChatWord_Concede:: @ 859B05E - .string "CONCEDE$" - -gEasyChatWord_Give:: @ 859B066 - .string "GIVE$" - -gEasyChatWord_Gives:: @ 859B06B - .string "GIVES$" - -gEasyChatWord_Played:: @ 859B071 - .string "PLAYED$" - -gEasyChatWord_Plays:: @ 859B078 - .string "PLAYS$" - -gEasyChatWord_Collect:: @ 859B07E - .string "COLLECT$" - -gEasyChatWord_Walking:: @ 859B086 - .string "WALKING$" - -gEasyChatWord_Walks:: @ 859B08E - .string "WALKS$" - -gEasyChatWord_Says:: @ 859B094 - .string "SAYS$" - -gEasyChatWord_Went:: @ 859B099 - .string "WENT$" - -gEasyChatWord_Said:: @ 859B09E - .string "SAID$" - -gEasyChatWord_WakeUp:: @ 859B0A3 - .string "WAKE UP$" - -gEasyChatWord_WakesUp:: @ 859B0AB - .string "WAKES UP$" - -gEasyChatWord_Angers:: @ 859B0B4 - .string "ANGERS$" - -gEasyChatWord_Teach:: @ 859B0BB - .string "TEACH$" - -gEasyChatWord_Teaches:: @ 859B0C1 - .string "TEACHES$" - -gEasyChatWord_Please:: @ 859B0C9 - .string "PLEASE$" - -gEasyChatWord_Learn:: @ 859B0D0 - .string "LEARN$" - -gEasyChatWord_Change:: @ 859B0D6 - .string "CHANGE$" - -gEasyChatWord_Story:: @ 859B0DD - .string "STORY$" - -gEasyChatWord_Trust:: @ 859B0E3 - .string "TRUST$" - -gEasyChatWord_Lavish:: @ 859B0E9 - .string "LAVISH$" - -gEasyChatWord_Listens:: @ 859B0F0 - .string "LISTENS$" - -gEasyChatWord_Hearing:: @ 859B0F8 - .string "HEARING$" - -gEasyChatWord_Trains:: @ 859B100 - .string "TRAINS$" - -gEasyChatWord_Choose:: @ 859B107 - .string "CHOOSE$" - -gEasyChatWord_Come:: @ 859B10E - .string "COME$" - -gEasyChatWord_Came:: @ 859B113 - .string "CAME$" - -gEasyChatWord_Search:: @ 859B118 - .string "SEARCH$" - -gEasyChatWord_Make:: @ 859B11F - .string "MAKE$" - -gEasyChatWord_Cause:: @ 859B124 - .string "CAUSE$" - -gEasyChatWord_Know:: @ 859B12A - .string "KNOW$" - -gEasyChatWord_Knows:: @ 859B12F - .string "KNOWS$" - -gEasyChatWord_Refuse:: @ 859B135 - .string "REFUSE$" - -gEasyChatWord_Stores:: @ 859B13C - .string "STORES$" - -gEasyChatWord_Brag:: @ 859B143 - .string "BRAG$" - -gEasyChatWord_Ignorant:: @ 859B148 - .string "IGNORANT$" - -gEasyChatWord_Thinks:: @ 859B151 - .string "THINKS$" - -gEasyChatWord_Believe:: @ 859B158 - .string "BELIEVE$" - -gEasyChatWord_Slide:: @ 859B160 - .string "SLIDE$" - -gEasyChatWord_Eats:: @ 859B166 - .string "EATS$" - -gEasyChatWord_Use:: @ 859B16B - .string "USE$" - -gEasyChatWord_Uses:: @ 859B16F - .string "USES$" - -gEasyChatWord_Using:: @ 859B174 - .string "USING$" - -gEasyChatWord_Couldnt:: @ 859B17A - .string "COULDN'T$" - -gEasyChatWord_Capable:: @ 859B183 - .string "CAPABLE$" - -gEasyChatWord_Disappear:: @ 859B18B - .string "DISAPPEAR$" - -gEasyChatWord_Appear:: @ 859B195 - .string "APPEAR$" - -gEasyChatWord_Throw:: @ 859B19C - .string "THROW$" - -gEasyChatWord_Worry:: @ 859B1A2 - .string "WORRY$" - -gEasyChatWord_Slept:: @ 859B1A8 - .string "SLEPT$" - -gEasyChatWord_Sleep:: @ 859B1AE - .string "SLEEP$" - -gEasyChatWord_Release:: @ 859B1B4 - .string "RELEASE$" - -gEasyChatWord_Drinks:: @ 859B1BC - .string "DRINKS$" - -gEasyChatWord_Runs:: @ 859B1C3 - .string "RUNS$" - -gEasyChatWord_Run:: @ 859B1C8 - .string "RUN$" - -gEasyChatWord_Works:: @ 859B1CC - .string "WORKS$" - -gEasyChatWord_Working:: @ 859B1D2 - .string "WORKING$" - -gEasyChatWord_Talking:: @ 859B1DA - .string "TALKING$" - -gEasyChatWord_Talk:: @ 859B1E2 - .string "TALK$" - -gEasyChatWord_Sink:: @ 859B1E7 - .string "SINK$" - -gEasyChatWord_Smack:: @ 859B1EC - .string "SMACK$" - -gEasyChatWord_Pretend:: @ 859B1F2 - .string "PRETEND$" - -gEasyChatWord_Praise:: @ 859B1FA - .string "PRAISE$" - -gEasyChatWord_Overdo:: @ 859B201 - .string "OVERDO$" - -gEasyChatWord_Show:: @ 859B208 - .string "SHOW$" - -gEasyChatWord_Looks:: @ 859B20D - .string "LOOKS$" - -gEasyChatWord_Sees:: @ 859B213 - .string "SEES$" - -gEasyChatWord_Seek:: @ 859B218 - .string "SEEK$" - -gEasyChatWord_Own:: @ 859B21D - .string "OWN$" - -gEasyChatWord_Take:: @ 859B221 - .string "TAKE$" - -gEasyChatWord_Allow:: @ 859B226 - .string "ALLOW$" - -gEasyChatWord_Forget:: @ 859B22C - .string "FORGET$" - -gEasyChatWord_Forgets:: @ 859B233 - .string "FORGETS$" - -gEasyChatWord_Appears:: @ 859B23B - .string "APPEARS$" - -gEasyChatWord_Faint:: @ 859B243 - .string "FAINT$" - -gEasyChatWord_Fainted:: @ 859B249 - .string "FAINTED$" - - .align 2 -gEasyChatGroup_Actions:: @ 859B254 - .4byte gEasyChatWord_Meets - .4byte 72 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Concede - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Give - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gives - .4byte 75 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Played - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Plays - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Collect - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Walking - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Walks - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Says - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Went - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Said - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WakeUp - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WakesUp - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Angers - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Teach - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Teaches - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Please - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Learn - .4byte 76 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Change - .4byte 77 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Story - .4byte 73 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Trust - .4byte 74 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lavish - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Listens - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hearing - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Trains - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Choose - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Come - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Came - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Search - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Make - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cause - .4byte 67 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Know - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Knows - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Refuse - .4byte 65 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Stores - .4byte 70 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Brag - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ignorant - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thinks - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Believe - .4byte 64 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Slide - .4byte 63 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Eats - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Use - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Uses - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Using - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Couldnt - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Capable - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Disappear - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Appear - .4byte 69 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Throw - .4byte 68 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Worry - .4byte 66 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Slept - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sleep - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Release - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Drinks - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Runs - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Run - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Works - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Working - .4byte 71 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Talking - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Talk - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sink - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Smack - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pretend - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Praise - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Overdo - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Show - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Looks - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sees - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Seek - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Own - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Take - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Allow - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Forget - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Forgets - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Appears - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Faint - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fainted - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_adjectives.s b/data/text/easy_chat/easy_chat_group_adjectives.s deleted file mode 100644 index 08142d41c6..0000000000 --- a/data/text/easy_chat/easy_chat_group_adjectives.s +++ /dev/null @@ -1,253 +0,0 @@ -gEasyChatWord_Wandering:: @ 859C3B8 - .string "WANDERING$" - -gEasyChatWord_Rickety:: @ 859C3C2 - .string "RICKETY$" - -gEasyChatWord_RockSolid:: @ 859C3CA - .string "ROCK-SOLID$" - -gEasyChatWord_Hungry:: @ 859C3D5 - .string "HUNGRY$" - -gEasyChatWord_Tight:: @ 859C3DC - .string "TIGHT$" - -gEasyChatWord_Ticklish:: @ 859C3E2 - .string "TICKLISH$" - -gEasyChatWord_Twirling:: @ 859C3EB - .string "TWIRLING$" - -gEasyChatWord_Spiraling:: @ 859C3F4 - .string "SPIRALING$" - -gEasyChatWord_Thirsty:: @ 859C3FE - .string "THIRSTY$" - -gEasyChatWord_Lolling:: @ 859C406 - .string "LOLLING$" - -gEasyChatWord_Silky:: @ 859C40E - .string "SILKY$" - -gEasyChatWord_Sadly:: @ 859C414 - .string "SADLY$" - -gEasyChatWord_Hopeless:: @ 859C41A - .string "HOPELESS$" - -gEasyChatWord_Useless:: @ 859C423 - .string "USELESS$" - -gEasyChatWord_Drooling:: @ 859C42B - .string "DROOLING$" - -gEasyChatWord_Exciting:: @ 859C434 - .string "EXCITING$" - -gEasyChatWord_Thick:: @ 859C43D - .string "THICK$" - -gEasyChatWord_Smooth:: @ 859C443 - .string "SMOOTH$" - -gEasyChatWord_Slimy:: @ 859C44A - .string "SLIMY$" - -gEasyChatWord_Thin:: @ 859C450 - .string "THIN$" - -gEasyChatWord_Break:: @ 859C455 - .string "BREAK$" - -gEasyChatWord_Voracious:: @ 859C45B - .string "VORACIOUS$" - -gEasyChatWord_Scatter:: @ 859C465 - .string "SCATTER$" - -gEasyChatWord_Awesome:: @ 859C46D - .string "AWESOME$" - -gEasyChatWord_Wimpy:: @ 859C475 - .string "WIMPY$" - -gEasyChatWord_Wobbly:: @ 859C47B - .string "WOBBLY$" - -gEasyChatWord_Shaky:: @ 859C482 - .string "SHAKY$" - -gEasyChatWord_Ripped:: @ 859C488 - .string "RIPPED$" - -gEasyChatWord_Shredded:: @ 859C48F - .string "SHREDDED$" - -gEasyChatWord_Increasing:: @ 859C498 - .string "INCREASING$" - -gEasyChatWord_Yet:: @ 859C4A3 - .string "YET$" - -gEasyChatWord_Destroyed:: @ 859C4A7 - .string "DESTROYED$" - -gEasyChatWord_Fiery:: @ 859C4B1 - .string "FIERY$" - -gEasyChatWord_LoveyDovey:: @ 859C4B7 - .string "LOVEY-DOVEY$" - -gEasyChatWord_Happily:: @ 859C4C3 - .string "HAPPILY$" - -gEasyChatWord_Anticipation:: @ 859C4CB - .string "ANTICIPATION$" - - .align 2 -gEasyChatGroup_Adjectives:: @ 859C4D8 - .4byte gEasyChatWord_Wandering - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rickety - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_RockSolid - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hungry - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tight - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ticklish - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Twirling - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Spiraling - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thirsty - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lolling - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Silky - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sadly - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hopeless - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Useless - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Drooling - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Exciting - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thick - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Smooth - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Slimy - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thin - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Break - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Voracious - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Scatter - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Awesome - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wimpy - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wobbly - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shaky - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ripped - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shredded - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Increasing - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yet - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Destroyed - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fiery - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_LoveyDovey - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Happily - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Anticipation - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_battle.s b/data/text/easy_chat/easy_chat_group_battle.s deleted file mode 100644 index 1f1175980c..0000000000 --- a/data/text/easy_chat/easy_chat_group_battle.s +++ /dev/null @@ -1,442 +0,0 @@ -gEasyChatWord_MatchUp:: @ 8598B3C - .string "MATCH UP$" - -gEasyChatWord_Go:: @ 8598B45 - .string "GO$" - -gEasyChatWord_No1:: @ 8598B48 - .string "NO. 1$" - -gEasyChatWord_Decide:: @ 8598B4E - .string "DECIDE$" - -gEasyChatWord_LetMeWin:: @ 8598B55 - .string "LET ME WIN$" - -gEasyChatWord_Wins:: @ 8598B60 - .string "WINS$" - -gEasyChatWord_Win:: @ 8598B65 - .string "WIN$" - -gEasyChatWord_Won:: @ 8598B69 - .string "WON$" - -gEasyChatWord_IfIWin:: @ 8598B6D - .string "IF I WIN$" - -gEasyChatWord_WhenIWin:: @ 8598B76 - .string "WHEN I WIN$" - -gEasyChatWord_CantWin:: @ 8598B81 - .string "CAN'T WIN$" - -gEasyChatWord_CanWin:: @ 8598B8B - .string "CAN WIN$" - -gEasyChatWord_NoMatch:: @ 8598B93 - .string "NO MATCH$" - -gEasyChatWord_Spirit:: @ 8598B9C - .string "SPIRIT$" - -gEasyChatWord_Decided:: @ 8598BA3 - .string "DECIDED$" - -gEasyChatWord_TrumpCard:: @ 8598BAB - .string "TRUMP CARD$" - -gEasyChatWord_TakeThat:: @ 8598BB6 - .string "TAKE THAT$" - -gEasyChatWord_ComeOn:: @ 8598BC0 - .string "COME ON$" - -gEasyChatWord_Attack:: @ 8598BC8 - .string "ATTACK$" - -gEasyChatWord_Surrender:: @ 8598BCF - .string "SURRENDER$" - -gEasyChatWord_Gutsy:: @ 8598BD9 - .string "GUTSY$" - -gEasyChatWord_Talent:: @ 8598BDF - .string "TALENT$" - -gEasyChatWord_Strategy:: @ 8598BE6 - .string "STRATEGY$" - -gEasyChatWord_Smite:: @ 8598BEF - .string "SMITE$" - -gEasyChatWord_Match:: @ 8598BF5 - .string "MATCH$" - -gEasyChatWord_Victory:: @ 8598BFB - .string "VICTORY$" - -gEasyChatWord_Offensive:: @ 8598C03 - .string "OFFENSIVE$" - -gEasyChatWord_Sense:: @ 8598C0D - .string "SENSE$" - -gEasyChatWord_Versus:: @ 8598C13 - .string "VERSUS$" - -gEasyChatWord_Fights:: @ 8598C1A - .string "FIGHTS$" - -gEasyChatWord_Power:: @ 8598C21 - .string "POWER$" - -gEasyChatWord_Challenge:: @ 8598C27 - .string "CHALLENGE$" - -gEasyChatWord_Strong:: @ 8598C31 - .string "STRONG$" - -gEasyChatWord_TooStrong:: @ 8598C38 - .string "TOO STRONG$" - -gEasyChatWord_GoEasy:: @ 8598C43 - .string "GO EASY$" - -gEasyChatWord_Foe:: @ 8598C4B - .string "FOE$" - -gEasyChatWord_Genius:: @ 8598C4F - .string "GENIUS$" - -gEasyChatWord_Legend:: @ 8598C56 - .string "LEGEND$" - -gEasyChatWord_Escape:: @ 8598C5D - .string "ESCAPE$" - -gEasyChatWord_Aim:: @ 8598C64 - .string "AIM$" - -gEasyChatWord_Battle:: @ 8598C68 - .string "BATTLE$" - -gEasyChatWord_Fight:: @ 8598C6F - .string "FIGHT$" - -gEasyChatWord_Resuscitate:: @ 8598C75 - .string "RESUSCITATE$" - -gEasyChatWord_Points:: @ 8598C81 - .string "POINTS$" - -gEasyChatWord_Serious:: @ 8598C88 - .string "SERIOUS$" - -gEasyChatWord_GiveUp:: @ 8598C90 - .string "GIVE UP$" - -gEasyChatWord_Loss:: @ 8598C98 - .string "LOSS$" - -gEasyChatWord_IfILose:: @ 8598C9D - .string "IF I LOSE$" - -gEasyChatWord_Lost:: @ 8598CA7 - .string "LOST$" - -gEasyChatWord_Lose:: @ 8598CAC - .string "LOSE$" - -gEasyChatWord_Guard:: @ 8598CB1 - .string "GUARD$" - -gEasyChatWord_Partner:: @ 8598CB7 - .string "PARTNER$" - -gEasyChatWord_Reject:: @ 8598CBF - .string "REJECT$" - -gEasyChatWord_Accept:: @ 8598CC6 - .string "ACCEPT$" - -gEasyChatWord_Invincible:: @ 8598CCD - .string "INVINCIBLE$" - -gEasyChatWord_Received:: @ 8598CD8 - .string "RECEIVED$" - -gEasyChatWord_Easy:: @ 8598CE1 - .string "EASY$" - -gEasyChatWord_Weak:: @ 8598CE6 - .string "WEAK$" - -gEasyChatWord_TooWeak:: @ 8598CEB - .string "TOO WEAK$" - -gEasyChatWord_Pushover:: @ 8598CF4 - .string "PUSHOVER$" - -gEasyChatWord_Leader:: @ 8598CFD - .string "LEADER$" - -gEasyChatWord_Rule:: @ 8598D04 - .string "RULE$" - -gEasyChatWord_Move:: @ 8598D09 - .string "MOVE$" - - .align 2 -gEasyChatGroup_Battle:: @ 8598D10 - .4byte gEasyChatWord_MatchUp - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Go - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_No1 - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Decide - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_LetMeWin - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wins - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Win - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Won - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IfIWin - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WhenIWin - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_CantWin - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_CanWin - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_NoMatch - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Spirit - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Decided - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TrumpCard - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TakeThat - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ComeOn - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Attack - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Surrender - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gutsy - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Talent - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Strategy - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Smite - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Match - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Victory - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Offensive - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sense - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Versus - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fights - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Power - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Challenge - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Strong - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TooStrong - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_GoEasy - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Foe - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Genius - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Legend - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Escape - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Aim - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Battle - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fight - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Resuscitate - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Points - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Serious - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_GiveUp - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Loss - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IfILose - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lost - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lose - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Guard - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Partner - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Reject - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Accept - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Invincible - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Received - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Easy - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Weak - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TooWeak - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pushover - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Leader - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rule - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Move - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_conditions.s b/data/text/easy_chat/easy_chat_group_conditions.s deleted file mode 100644 index 2afbca0204..0000000000 --- a/data/text/easy_chat/easy_chat_group_conditions.s +++ /dev/null @@ -1,484 +0,0 @@ -gEasyChatWord_Hot:: @ 859AB2C - .string "HOT$" - -gEasyChatWord_Exists:: @ 859AB30 - .string "EXISTS$" - -gEasyChatWord_Excess:: @ 859AB37 - .string "EXCESS$" - -gEasyChatWord_Approved:: @ 859AB3E - .string "APPROVED$" - -gEasyChatWord_Has:: @ 859AB47 - .string "HAS$" - -gEasyChatWord_Good:: @ 859AB4B - .string "GOOD$" - -gEasyChatWord_Less:: @ 859AB50 - .string "LESS$" - -gEasyChatWord_Momentum:: @ 859AB55 - .string "MOMENTUM$" - -gEasyChatWord_Going:: @ 859AB5E - .string "GOING$" - -gEasyChatWord_Weird:: @ 859AB64 - .string "WEIRD$" - -gEasyChatWord_Busy:: @ 859AB6A - .string "BUSY$" - -gEasyChatWord_Together:: @ 859AB6F - .string "TOGETHER$" - -gEasyChatWord_Full:: @ 859AB78 - .string "FULL$" - -gEasyChatWord_Absent:: @ 859AB7D - .string "ABSENT$" - -gEasyChatWord_Being:: @ 859AB84 - .string "BEING$" - -gEasyChatWord_Need:: @ 859AB8A - .string "NEED$" - -gEasyChatWord_Tasty:: @ 859AB8F - .string "TASTY$" - -gEasyChatWord_Skilled:: @ 859AB95 - .string "SKILLED$" - -gEasyChatWord_Noisy:: @ 859AB9D - .string "NOISY$" - -gEasyChatWord_Big:: @ 859ABA3 - .string "BIG$" - -gEasyChatWord_Late:: @ 859ABA7 - .string "LATE$" - -gEasyChatWord_Close:: @ 859ABAC - .string "CLOSE$" - -gEasyChatWord_Docile:: @ 859ABB2 - .string "DOCILE$" - -gEasyChatWord_Amusing:: @ 859ABB9 - .string "AMUSING$" - -gEasyChatWord_Entertaining:: @ 859ABC1 - .string "ENTERTAINING$" - -gEasyChatWord_Perfection:: @ 859ABCE - .string "PERFECTION$" - -gEasyChatWord_Pretty:: @ 859ABD9 - .string "PRETTY$" - -gEasyChatWord_Healthy:: @ 859ABE0 - .string "HEALTHY$" - -gEasyChatWord_Excellent:: @ 859ABE8 - .string "EXCELLENT$" - -gEasyChatWord_UpsideDown:: @ 859ABF2 - .string "UPSIDE DOWN$" - -gEasyChatWord_Cold:: @ 859ABFE - .string "COLD$" - -gEasyChatWord_Refreshing:: @ 859AC03 - .string "REFRESHING$" - -gEasyChatWord_Unavoidable:: @ 859AC0E - .string "UNAVOIDABLE$" - -gEasyChatWord_Much:: @ 859AC1A - .string "MUCH$" - -gEasyChatWord_Overwhelming:: @ 859AC1F - .string "OVERWHELMING$" - -gEasyChatWord_Fabulous:: @ 859AC2C - .string "FABULOUS$" - -gEasyChatWord_Else:: @ 859AC35 - .string "ELSE$" - -gEasyChatWord_Expensive:: @ 859AC3A - .string "EXPENSIVE$" - -gEasyChatWord_Correct:: @ 859AC44 - .string "CORRECT$" - -gEasyChatWord_Impossible:: @ 859AC4C - .string "IMPOSSIBLE$" - -gEasyChatWord_Small:: @ 859AC57 - .string "SMALL$" - -gEasyChatWord_Different:: @ 859AC5D - .string "DIFFERENT$" - -gEasyChatWord_Tired:: @ 859AC67 - .string "TIRED$" - -gEasyChatWord_Skill:: @ 859AC6D - .string "SKILL$" - -gEasyChatWord_Top:: @ 859AC73 - .string "TOP$" - -gEasyChatWord_NonStop:: @ 859AC77 - .string "NON-STOP$" - -gEasyChatWord_Preposterous:: @ 859AC80 - .string "PREPOSTEROUS$" - -gEasyChatWord_None:: @ 859AC8D - .string "NONE$" - -gEasyChatWord_Nothing:: @ 859AC92 - .string "NOTHING$" - -gEasyChatWord_Natural:: @ 859AC9A - .string "NATURAL$" - -gEasyChatWord_Becomes:: @ 859ACA2 - .string "BECOMES$" - -gEasyChatWord_Lukewarm:: @ 859ACAA - .string "LUKEWARM$" - -gEasyChatWord_Fast:: @ 859ACB3 - .string "FAST$" - -gEasyChatWord_Low:: @ 859ACB8 - .string "LOW$" - -gEasyChatWord_Awful:: @ 859ACBC - .string "AWFUL$" - -gEasyChatWord_Alone:: @ 859ACC2 - .string "ALONE$" - -gEasyChatWord_Bored:: @ 859ACC8 - .string "BORED$" - -gEasyChatWord_Secret:: @ 859ACCE - .string "SECRET$" - -gEasyChatWord_Mystery:: @ 859ACD5 - .string "MYSTERY$" - -gEasyChatWord_Lacks:: @ 859ACDD - .string "LACKS$" - -gEasyChatWord_Best:: @ 859ACE3 - .string "BEST$" - -gEasyChatWord_Lousy:: @ 859ACE8 - .string "LOUSY$" - -gEasyChatWord_Mistake:: @ 859ACEE - .string "MISTAKE$" - -gEasyChatWord_Kind:: @ 859ACF6 - .string "KIND$" - -gEasyChatWord_Well:: @ 859ACFB - .string "WELL$" - -gEasyChatWord_Weakened:: @ 859AD00 - .string "WEAKENED$" - -gEasyChatWord_Simple:: @ 859AD09 - .string "SIMPLE$" - -gEasyChatWord_Seems:: @ 859AD10 - .string "SEEMS$" - -gEasyChatWord_Badly:: @ 859AD16 - .string "BADLY$" - - .align 2 -gEasyChatGroup_Conditions:: @ 859AD1C - .4byte gEasyChatWord_Hot - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Exists - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Excess - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Approved - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Has - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Good - .4byte 68 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Less - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Momentum - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Going - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Weird - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Busy - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Together - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Full - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Absent - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Being - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Need - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tasty - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Skilled - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Noisy - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Big - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Late - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Close - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Docile - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Amusing - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Entertaining - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Perfection - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pretty - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Healthy - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Excellent - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_UpsideDown - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cold - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Refreshing - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Unavoidable - .4byte 63 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Much - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Overwhelming - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fabulous - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Else - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Expensive - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Correct - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Impossible - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Small - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Different - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tired - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Skill - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Top - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_NonStop - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Preposterous - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_None - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nothing - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Natural - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Becomes - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lukewarm - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fast - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Low - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Awful - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Alone - .4byte 67 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Bored - .4byte 66 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Secret - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mystery - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lacks - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Best - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lousy - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mistake - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Kind - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Well - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Weakened - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Simple - .4byte 65 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Seems - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Badly - .4byte 64 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_endings.s b/data/text/easy_chat/easy_chat_group_endings.s deleted file mode 100644 index 4d79c9a69e..0000000000 --- a/data/text/easy_chat/easy_chat_group_endings.s +++ /dev/null @@ -1,484 +0,0 @@ -gEasyChatWord_Will:: @ 859A158 - .string "WILL$" - -gEasyChatWord_WillBeHere:: @ 859A15D - .string "WILL BE HERE$" - -gEasyChatWord_Or:: @ 859A16A - .string "OR$" - -gEasyChatWord_Times:: @ 859A16D - .string "TIMES$" - -gEasyChatWord_Wonder:: @ 859A173 - .string "WONDER$" - -gEasyChatWord_IsItQues:: @ 859A17A - .string "IS IT?$" - -gEasyChatWord_Be:: @ 859A181 - .string "BE$" - -gEasyChatWord_Gimme:: @ 859A184 - .string "GIMME$" - -gEasyChatWord_Could:: @ 859A18A - .string "COULD$" - -gEasyChatWord_LikelyTo:: @ 859A190 - .string "LIKELY TO$" - -gEasyChatWord_Would:: @ 859A19A - .string "WOULD$" - -gEasyChatWord_Is:: @ 859A1A0 - .string "IS$" - -gEasyChatWord_IsntItQues:: @ 859A1A3 - .string "ISN'T IT?$" - -gEasyChatWord_Lets:: @ 859A1AD - .string "LET'S$" - -gEasyChatWord_Other:: @ 859A1B3 - .string "OTHER$" - -gEasyChatWord_Are:: @ 859A1B9 - .string "ARE$" - -gEasyChatWord_Was:: @ 859A1BD - .string "WAS$" - -gEasyChatWord_Were:: @ 859A1C1 - .string "WERE$" - -gEasyChatWord_Those:: @ 859A1C6 - .string "THOSE$" - -gEasyChatWord_Isnt:: @ 859A1CC - .string "ISN'T$" - -gEasyChatWord_Wont:: @ 859A1D2 - .string "WON'T$" - -gEasyChatWord_Cant:: @ 859A1D8 - .string "CAN'T$" - -gEasyChatWord_Can:: @ 859A1DE - .string "CAN$" - -gEasyChatWord_Dont:: @ 859A1E2 - .string "DON'T$" - -gEasyChatWord_Do:: @ 859A1E8 - .string "DO$" - -gEasyChatWord_Does:: @ 859A1EB - .string "DOES$" - -gEasyChatWord_Whom:: @ 859A1F0 - .string "WHOM$" - -gEasyChatWord_Which:: @ 859A1F5 - .string "WHICH$" - -gEasyChatWord_Wasnt:: @ 859A1FB - .string "WASN'T$" - -gEasyChatWord_Werent:: @ 859A202 - .string "WEREN'T$" - -gEasyChatWord_Have:: @ 859A20A - .string "HAVE$" - -gEasyChatWord_Havent:: @ 859A20F - .string "HAVEN'T$" - -gEasyChatWord_A:: @ 859A217 - .string "A$" - -gEasyChatWord_An:: @ 859A219 - .string "AN$" - -gEasyChatWord_Not:: @ 859A21C - .string "NOT$" - -gEasyChatWord_There:: @ 859A220 - .string "THERE$" - -gEasyChatWord_OkQues:: @ 859A226 - .string "OK?$" - -gEasyChatWord_So:: @ 859A22A - .string "SO$" - -gEasyChatWord_Maybe:: @ 859A22D - .string "MAYBE$" - -gEasyChatWord_About:: @ 859A233 - .string "ABOUT$" - -gEasyChatWord_Over:: @ 859A239 - .string "OVER$" - -gEasyChatWord_It:: @ 859A23E - .string "IT$" - -gEasyChatWord_All:: @ 859A241 - .string "ALL$" - -gEasyChatWord_For:: @ 859A245 - .string "FOR$" - -gEasyChatWord_On:: @ 859A249 - .string "ON$" - -gEasyChatWord_Off:: @ 859A24C - .string "OFF$" - -gEasyChatWord_As:: @ 859A250 - .string "AS$" - -gEasyChatWord_To:: @ 859A253 - .string "TO$" - -gEasyChatWord_With:: @ 859A256 - .string "WITH$" - -gEasyChatWord_Better:: @ 859A25B - .string "BETTER$" - -gEasyChatWord_Ever:: @ 859A262 - .string "EVER$" - -gEasyChatWord_Since:: @ 859A267 - .string "SINCE$" - -gEasyChatWord_Of:: @ 859A26D - .string "OF$" - -gEasyChatWord_BelongsTo:: @ 859A270 - .string "BELONGS TO$" - -gEasyChatWord_At:: @ 859A27B - .string "AT$" - -gEasyChatWord_In:: @ 859A27E - .string "IN$" - -gEasyChatWord_Out:: @ 859A281 - .string "OUT$" - -gEasyChatWord_Too:: @ 859A285 - .string "TOO$" - -gEasyChatWord_Like:: @ 859A289 - .string "LIKE$" - -gEasyChatWord_Did:: @ 859A28E - .string "DID$" - -gEasyChatWord_Didnt:: @ 859A292 - .string "DIDN'T$" - -gEasyChatWord_Doesnt:: @ 859A299 - .string "DOESN'T$" - -gEasyChatWord_Without:: @ 859A2A1 - .string "WITHOUT$" - -gEasyChatWord_After:: @ 859A2A9 - .string "AFTER$" - -gEasyChatWord_Before:: @ 859A2AF - .string "BEFORE$" - -gEasyChatWord_While:: @ 859A2B6 - .string "WHILE$" - -gEasyChatWord_Than:: @ 859A2BC - .string "THAN$" - -gEasyChatWord_Once:: @ 859A2C1 - .string "ONCE$" - -gEasyChatWord_Anywhere:: @ 859A2C6 - .string "ANYWHERE$" - - .align 2 -gEasyChatGroup_Endings:: @ 859A2D0 - .4byte gEasyChatWord_Will - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WillBeHere - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Or - .4byte 63 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Times - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wonder - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IsItQues - .4byte 68 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Be - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gimme - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Could - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_LikelyTo - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Would - .4byte 64 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Is - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IsntItQues - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lets - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Other - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Are - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Was - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Were - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Those - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Isnt - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wont - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cant - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Can - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dont - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Do - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Does - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Whom - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Which - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wasnt - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Werent - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Have - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Havent - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_A - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_An - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Not - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_There - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OkQues - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_So - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Maybe - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_About - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Over - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_It - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_All - .4byte 67 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_For - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_On - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Off - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_As - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_To - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_With - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Better - .4byte 66 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ever - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Since - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Of - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_BelongsTo - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_At - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_In - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Out - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Too - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Like - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Did - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Didnt - .4byte 65 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Doesnt - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Without - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_After - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Before - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_While - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Than - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Once - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Anywhere - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_events.s b/data/text/easy_chat/easy_chat_group_events.s deleted file mode 100644 index f603908b7d..0000000000 --- a/data/text/easy_chat/easy_chat_group_events.s +++ /dev/null @@ -1,204 +0,0 @@ -gEasyChatWord_Appeal:: @ 859C688 - .string "APPEAL$" - -gEasyChatWord_Events:: @ 859C68F - .string "EVENTS$" - -gEasyChatWord_StayAtHome:: @ 859C696 - .string "STAY-AT-HOME$" - -gEasyChatWord_Berry:: @ 859C6A3 - .string "BERRY$" - -gEasyChatWord_Contest:: @ 859C6A9 - .string "CONTEST$" - -gEasyChatWord_Mc:: @ 859C6B1 - .string "MC$" - -gEasyChatWord_Judge:: @ 859C6B4 - .string "JUDGE$" - -gEasyChatWord_Super:: @ 859C6BA - .string "SUPER$" - -gEasyChatWord_Stage:: @ 859C6C0 - .string "STAGE$" - -gEasyChatWord_HallOfFame:: @ 859C6C6 - .string "HALL OF FAME$" - -gEasyChatWord_Evolution:: @ 859C6D3 - .string "EVOLUTION$" - -gEasyChatWord_Hyper:: @ 859C6DD - .string "HYPER$" - -gEasyChatWord_BattleTower:: @ 859C6E3 - .string "BATTLE TOWER$" - -gEasyChatWord_Leaders:: @ 859C6F0 - .string "LEADERS$" - -gEasyChatWord_BattleRoom:: @ 859C6F8 - .string "BATTLE ROOM$" - -gEasyChatWord_Hidden:: @ 859C704 - .string "HIDDEN$" - -gEasyChatWord_SecretBase:: @ 859C70B - .string "SECRET BASE$" - -gEasyChatWord_Blend:: @ 859C717 - .string "BLEND$" - -gEasyChatWord_POKEBLOCK:: @ 859C71D - .string "{POKEBLOCK}$" - -gEasyChatWord_Master:: @ 859C723 - .string "MASTER$" - -gEasyChatWord_Rank:: @ 859C72A - .string "RANK$" - -gEasyChatWord_Ribbon:: @ 859C72F - .string "RIBBON$" - -gEasyChatWord_Crush:: @ 859C736 - .string "CRUSH$" - -gEasyChatWord_Direct:: @ 859C73C - .string "DIRECT$" - -gEasyChatWord_Tower:: @ 859C743 - .string "TOWER$" - -gEasyChatWord_Union:: @ 859C749 - .string "UNION$" - -gEasyChatWord_Room:: @ 859C74F - .string "ROOM$" - -gEasyChatWord_Wireless:: @ 859C754 - .string "WIRELESS$" - -gEasyChatWord_Frontier:: @ 859C75D - .string "FRONTIER$" - - .align 2 -gEasyChatGroup_Events:: @ 859C768 - .4byte gEasyChatWord_Appeal - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Events - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_StayAtHome - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Berry - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Contest - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mc - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Judge - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Super - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Stage - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HallOfFame - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Evolution - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hyper - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_BattleTower - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Leaders - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_BattleRoom - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hidden - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SecretBase - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Blend - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_POKEBLOCK - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Master - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rank - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ribbon - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Crush - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Direct - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tower - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Union - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Room - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wireless - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Frontier - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_feelings.s b/data/text/easy_chat/easy_chat_group_feelings.s deleted file mode 100644 index 4cda319cca..0000000000 --- a/data/text/easy_chat/easy_chat_group_feelings.s +++ /dev/null @@ -1,484 +0,0 @@ -gEasyChatWord_Meet:: @ 859A60C - .string "MEET$" - -gEasyChatWord_Play:: @ 859A611 - .string "PLAY$" - -gEasyChatWord_Hurried:: @ 859A616 - .string "HURRIED$" - -gEasyChatWord_Goes:: @ 859A61E - .string "GOES$" - -gEasyChatWord_Giddy:: @ 859A623 - .string "GIDDY$" - -gEasyChatWord_Happy:: @ 859A629 - .string "HAPPY$" - -gEasyChatWord_Happiness:: @ 859A62F - .string "HAPPINESS$" - -gEasyChatWord_Excite:: @ 859A639 - .string "EXCITE$" - -gEasyChatWord_Important:: @ 859A640 - .string "IMPORTANT$" - -gEasyChatWord_Funny:: @ 859A64A - .string "FUNNY$" - -gEasyChatWord_Got:: @ 859A650 - .string "GOT$" - -gEasyChatWord_GoHome:: @ 859A654 - .string "GO HOME$" - -gEasyChatWord_Disappointed:: @ 859A65C - .string "DISAPPOINTED$" - -gEasyChatWord_Disappoints:: @ 859A669 - .string "DISAPPOINTS$" - -gEasyChatWord_Sad:: @ 859A675 - .string "SAD$" - -gEasyChatWord_Try:: @ 859A679 - .string "TRY$" - -gEasyChatWord_Tries:: @ 859A67D - .string "TRIES$" - -gEasyChatWord_Hears:: @ 859A683 - .string "HEARS$" - -gEasyChatWord_Think:: @ 859A689 - .string "THINK$" - -gEasyChatWord_Hear:: @ 859A68F - .string "HEAR$" - -gEasyChatWord_Wants:: @ 859A694 - .string "WANTS$" - -gEasyChatWord_Misheard:: @ 859A69A - .string "MISHEARD$" - -gEasyChatWord_Dislike:: @ 859A6A3 - .string "DISLIKE$" - -gEasyChatWord_Angry:: @ 859A6AB - .string "ANGRY$" - -gEasyChatWord_Anger:: @ 859A6B1 - .string "ANGER$" - -gEasyChatWord_Scary:: @ 859A6B7 - .string "SCARY$" - -gEasyChatWord_Lonesome:: @ 859A6BD - .string "LONESOME$" - -gEasyChatWord_Disappoint:: @ 859A6C6 - .string "DISAPPOINT$" - -gEasyChatWord_Joy:: @ 859A6D1 - .string "JOY$" - -gEasyChatWord_Gets:: @ 859A6D5 - .string "GETS$" - -gEasyChatWord_Never:: @ 859A6DA - .string "NEVER$" - -gEasyChatWord_Darn:: @ 859A6E0 - .string "DARN$" - -gEasyChatWord_Downcast:: @ 859A6E5 - .string "DOWNCAST$" - -gEasyChatWord_Incredible:: @ 859A6EE - .string "INCREDIBLE$" - -gEasyChatWord_Likes:: @ 859A6F9 - .string "LIKES$" - -gEasyChatWord_Dislikes:: @ 859A6FF - .string "DISLIKES$" - -gEasyChatWord_Boring:: @ 859A708 - .string "BORING$" - -gEasyChatWord_Care:: @ 859A70F - .string "CARE$" - -gEasyChatWord_Cares:: @ 859A714 - .string "CARES$" - -gEasyChatWord_AllRight:: @ 859A71A - .string "ALL RIGHT$" - -gEasyChatWord_Adore:: @ 859A724 - .string "ADORE$" - -gEasyChatWord_Disaster:: @ 859A72A - .string "DISASTER$" - -gEasyChatWord_Enjoy:: @ 859A733 - .string "ENJOY$" - -gEasyChatWord_Enjoys:: @ 859A739 - .string "ENJOYS$" - -gEasyChatWord_Eat:: @ 859A740 - .string "EAT$" - -gEasyChatWord_Lacking:: @ 859A744 - .string "LACKING$" - -gEasyChatWord_Bad:: @ 859A74C - .string "BAD$" - -gEasyChatWord_Hard:: @ 859A750 - .string "HARD$" - -gEasyChatWord_Terrible:: @ 859A755 - .string "TERRIBLE$" - -gEasyChatWord_Should:: @ 859A75E - .string "SHOULD$" - -gEasyChatWord_Nice:: @ 859A765 - .string "NICE$" - -gEasyChatWord_Drink:: @ 859A76A - .string "DRINK$" - -gEasyChatWord_Surprise:: @ 859A770 - .string "SURPRISE$" - -gEasyChatWord_Fear:: @ 859A779 - .string "FEAR$" - -gEasyChatWord_Want:: @ 859A77E - .string "WANT$" - -gEasyChatWord_Wait:: @ 859A783 - .string "WAIT$" - -gEasyChatWord_Satisfied:: @ 859A788 - .string "SATISFIED$" - -gEasyChatWord_See:: @ 859A792 - .string "SEE$" - -gEasyChatWord_Rare:: @ 859A796 - .string "RARE$" - -gEasyChatWord_Negative:: @ 859A79B - .string "NEGATIVE$" - -gEasyChatWord_Done:: @ 859A7A4 - .string "DONE$" - -gEasyChatWord_Danger:: @ 859A7A9 - .string "DANGER$" - -gEasyChatWord_Defeated:: @ 859A7B0 - .string "DEFEATED$" - -gEasyChatWord_Beat:: @ 859A7B9 - .string "BEAT$" - -gEasyChatWord_Great:: @ 859A7BE - .string "GREAT$" - -gEasyChatWord_Romantic:: @ 859A7C4 - .string "ROMANTIC$" - -gEasyChatWord_Question:: @ 859A7CD - .string "QUESTION$" - -gEasyChatWord_Understand:: @ 859A7D6 - .string "UNDERSTAND$" - -gEasyChatWord_Understands:: @ 859A7E1 - .string "UNDERSTANDS$" - - .align 2 -gEasyChatGroup_Feelings:: @ 859A7F0 - .4byte gEasyChatWord_Meet - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Play - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hurried - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Goes - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Giddy - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Happy - .4byte 63 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Happiness - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Excite - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Important - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Funny - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Got - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_GoHome - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Disappointed - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Disappoints - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sad - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Try - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tries - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hears - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Think - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hear - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wants - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Misheard - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dislike - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Angry - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Anger - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Scary - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lonesome - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Disappoint - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Joy - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gets - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Never - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Darn - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Downcast - .4byte 64 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Incredible - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Likes - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dislikes - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Boring - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Care - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cares - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_AllRight - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Adore - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Disaster - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Enjoy - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Enjoys - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Eat - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lacking - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Bad - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hard - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Terrible - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Should - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nice - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Drink - .4byte 66 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Surprise - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fear - .4byte 65 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Want - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wait - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Satisfied - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_See - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rare - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Negative - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Done - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Danger - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Defeated - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Beat - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Great - .4byte 67 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Romantic - .4byte 68 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Question - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Understand - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Understands - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_greetings.s b/data/text/easy_chat/easy_chat_group_greetings.s deleted file mode 100644 index 98db7acea3..0000000000 --- a/data/text/easy_chat/easy_chat_group_greetings.s +++ /dev/null @@ -1,295 +0,0 @@ -gEasyChatWord_Thanks:: @ 8599004 - .string "THANKS$" - -gEasyChatWord_Yes:: @ 859900B - .string "YES$" - -gEasyChatWord_HereGoes:: @ 859900F - .string "HERE GOES$" - -gEasyChatWord_HereICome:: @ 8599019 - .string "HERE I COME$" - -gEasyChatWord_HereItIs:: @ 8599025 - .string "HERE IT IS$" - -gEasyChatWord_Yeah:: @ 8599030 - .string "YEAH$" - -gEasyChatWord_Welcome:: @ 8599035 - .string "WELCOME$" - -gEasyChatWord_Oi:: @ 859903D - .string "OI$" - -gEasyChatWord_HowDo:: @ 8599040 - .string "HOW DO$" - -gEasyChatWord_Congrats:: @ 8599047 - .string "CONGRATS$" - -gEasyChatWord_GiveMe:: @ 8599050 - .string "GIVE ME$" - -gEasyChatWord_Sorry:: @ 8599058 - .string "SORRY$" - -gEasyChatWord_Apologize:: @ 859905E - .string "APOLOGIZE$" - -gEasyChatWord_Forgive:: @ 8599068 - .string "FORGIVE$" - -gEasyChatWord_HeyThere:: @ 8599070 - .string "HEY, THERE$" - -gEasyChatWord_Hello:: @ 859907B - .string "HELLO$" - -gEasyChatWord_GoodBye:: @ 8599081 - .string "GOOD-BYE$" - -gEasyChatWord_ThankYou:: @ 859908A - .string "THANK YOU$" - -gEasyChatWord_IveArrived:: @ 8599094 - .string "I'VE ARRIVED$" - -gEasyChatWord_Pardon:: @ 85990A1 - .string "PARDON$" - -gEasyChatWord_Excuse:: @ 85990A8 - .string "EXCUSE$" - -gEasyChatWord_SeeYa:: @ 85990AF - .string "SEE YA$" - -gEasyChatWord_ExcuseMe:: @ 85990B6 - .string "EXCUSE ME$" - -gEasyChatWord_WellThen:: @ 85990C0 - .string "WELL, THEN$" - -gEasyChatWord_GoAhead:: @ 85990CB - .string "GO AHEAD$" - -gEasyChatWord_Appreciate:: @ 85990D4 - .string "APPRECIATE$" - -gEasyChatWord_HeyQues:: @ 85990DF - .string "HEY?$" - -gEasyChatWord_WhatsUpQues:: @ 85990E4 - .string "WHAT'S UP?$" - -gEasyChatWord_HuhQues:: @ 85990EF - .string "HUH?$" - -gEasyChatWord_No:: @ 85990F4 - .string "NO$" - -gEasyChatWord_Hi:: @ 85990F7 - .string "HI$" - -gEasyChatWord_YeahYeah:: @ 85990FA - .string "YEAH, YEAH$" - -gEasyChatWord_ByeBye:: @ 8599105 - .string "BYE-BYE$" - -gEasyChatWord_MeetYou:: @ 859910D - .string "MEET YOU$" - -gEasyChatWord_Hey:: @ 8599116 - .string "HEY$" - -gEasyChatWord_Smell:: @ 859911A - .string "SMELL$" - -gEasyChatWord_Listening:: @ 8599120 - .string "LISTENING$" - -gEasyChatWord_HooHah:: @ 859912A - .string "HOO-HAH$" - -gEasyChatWord_Yahoo:: @ 8599132 - .string "YAHOO$" - -gEasyChatWord_Yo:: @ 8599138 - .string "YO$" - -gEasyChatWord_ComeOver:: @ 859913B - .string "COME OVER$" - -gEasyChatWord_CountOn:: @ 8599145 - .string "COUNT ON$" - - .align 2 -gEasyChatGroup_Greetings:: @ 8599150 - .4byte gEasyChatWord_Thanks - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yes - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HereGoes - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HereICome - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HereItIs - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yeah - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Welcome - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Oi - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HowDo - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Congrats - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_GiveMe - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sorry - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Apologize - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Forgive - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HeyThere - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hello - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_GoodBye - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThankYou - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IveArrived - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pardon - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Excuse - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SeeYa - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ExcuseMe - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WellThen - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_GoAhead - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Appreciate - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HeyQues - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WhatsUpQues - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HuhQues - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_No - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hi - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_YeahYeah - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ByeBye - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_MeetYou - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hey - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Smell - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Listening - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HooHah - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yahoo - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yo - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ComeOver - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_CountOn - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_hobbies.s b/data/text/easy_chat/easy_chat_group_hobbies.s deleted file mode 100644 index f3fb02b0b9..0000000000 --- a/data/text/easy_chat/easy_chat_group_hobbies.s +++ /dev/null @@ -1,379 +0,0 @@ -gEasyChatWord_Idol:: @ 859B960 - .string "IDOL$" - -gEasyChatWord_Anime:: @ 859B965 - .string "ANIME$" - -gEasyChatWord_Song:: @ 859B96B - .string "SONG$" - -gEasyChatWord_Movie:: @ 859B970 - .string "MOVIE$" - -gEasyChatWord_Sweets:: @ 859B976 - .string "SWEETS$" - -gEasyChatWord_Chat:: @ 859B97D - .string "CHAT$" - -gEasyChatWord_ChildsPlay:: @ 859B982 - .string "CHILD'S PLAY$" - -gEasyChatWord_Toys:: @ 859B98F - .string "TOYS$" - -gEasyChatWord_Music:: @ 859B994 - .string "MUSIC$" - -gEasyChatWord_Cards:: @ 859B99A - .string "CARDS$" - -gEasyChatWord_Shopping:: @ 859B9A0 - .string "SHOPPING$" - -gEasyChatWord_Camera:: @ 859B9A9 - .string "CAMERA$" - -gEasyChatWord_Viewing:: @ 859B9B0 - .string "VIEWING$" - -gEasyChatWord_Spectator:: @ 859B9B8 - .string "SPECTATOR$" - -gEasyChatWord_Gourmet:: @ 859B9C2 - .string "GOURMET$" - -gEasyChatWord_Game:: @ 859B9CA - .string "GAME$" - -gEasyChatWord_Rpg:: @ 859B9CF - .string "RPG$" - -gEasyChatWord_Collection:: @ 859B9D3 - .string "COLLECTION$" - -gEasyChatWord_Complete:: @ 859B9DE - .string "COMPLETE$" - -gEasyChatWord_Magazine:: @ 859B9E7 - .string "MAGAZINE$" - -gEasyChatWord_Walk:: @ 859B9F0 - .string "WALK$" - -gEasyChatWord_Bike:: @ 859B9F5 - .string "BIKE$" - -gEasyChatWord_Hobby:: @ 859B9FA - .string "HOBBY$" - -gEasyChatWord_Sports:: @ 859BA00 - .string "SPORTS$" - -gEasyChatWord_Software:: @ 859BA07 - .string "SOFTWARE$" - -gEasyChatWord_Songs:: @ 859BA10 - .string "SONGS$" - -gEasyChatWord_Diet:: @ 859BA16 - .string "DIET$" - -gEasyChatWord_Treasure:: @ 859BA1B - .string "TREASURE$" - -gEasyChatWord_Travel:: @ 859BA24 - .string "TRAVEL$" - -gEasyChatWord_Dance:: @ 859BA2B - .string "DANCE$" - -gEasyChatWord_Channel:: @ 859BA31 - .string "CHANNEL$" - -gEasyChatWord_Making:: @ 859BA39 - .string "MAKING$" - -gEasyChatWord_Fishing:: @ 859BA40 - .string "FISHING$" - -gEasyChatWord_Date:: @ 859BA48 - .string "DATE$" - -gEasyChatWord_Design:: @ 859BA4D - .string "DESIGN$" - -gEasyChatWord_Locomotive:: @ 859BA54 - .string "LOCOMOTIVE$" - -gEasyChatWord_PlushDoll:: @ 859BA5F - .string "PLUSH DOLL$" - -gEasyChatWord_Pc:: @ 859BA6A - .string "PC$" - -gEasyChatWord_Flowers:: @ 859BA6D - .string "FLOWERS$" - -gEasyChatWord_Hero:: @ 859BA75 - .string "HERO$" - -gEasyChatWord_Nap:: @ 859BA7A - .string "NAP$" - -gEasyChatWord_Heroine:: @ 859BA7E - .string "HEROINE$" - -gEasyChatWord_Fashion:: @ 859BA86 - .string "FASHION$" - -gEasyChatWord_Adventure:: @ 859BA8E - .string "ADVENTURE$" - -gEasyChatWord_Board:: @ 859BA98 - .string "BOARD$" - -gEasyChatWord_Ball:: @ 859BA9E - .string "BALL$" - -gEasyChatWord_Book:: @ 859BAA3 - .string "BOOK$" - -gEasyChatWord_Festival:: @ 859BAA8 - .string "FESTIVAL$" - -gEasyChatWord_Comics:: @ 859BAB1 - .string "COMICS$" - -gEasyChatWord_Holiday:: @ 859BAB8 - .string "HOLIDAY$" - -gEasyChatWord_Plans:: @ 859BAC0 - .string "PLANS$" - -gEasyChatWord_Trendy:: @ 859BAC6 - .string "TRENDY$" - -gEasyChatWord_Vacation:: @ 859BACD - .string "VACATION$" - -gEasyChatWord_Look:: @ 859BAD6 - .string "LOOK$" - - .align 2 -gEasyChatGroup_Hobbies:: @ 859BADC - .4byte gEasyChatWord_Idol - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Anime - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Song - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Movie - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sweets - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Chat - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ChildsPlay - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Toys - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Music - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cards - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shopping - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Camera - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Viewing - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Spectator - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gourmet - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Game - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rpg - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Collection - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Complete - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Magazine - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Walk - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Bike - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hobby - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sports - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Software - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Songs - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Diet - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Treasure - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Travel - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dance - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Channel - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Making - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fishing - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Date - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Design - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Locomotive - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_PlushDoll - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pc - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Flowers - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hero - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nap - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Heroine - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fashion - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Adventure - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Board - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ball - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Book - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Festival - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Comics - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Holiday - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Plans - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Trendy - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Vacation - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Look - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_lifestyle.s b/data/text/easy_chat/easy_chat_group_lifestyle.s deleted file mode 100644 index 356095cd54..0000000000 --- a/data/text/easy_chat/easy_chat_group_lifestyle.s +++ /dev/null @@ -1,316 +0,0 @@ -gEasyChatWord_Chores:: @ 859B5FC - .string "CHORES$" - -gEasyChatWord_Home:: @ 859B603 - .string "HOME$" - -gEasyChatWord_Money:: @ 859B608 - .string "MONEY$" - -gEasyChatWord_Allowance:: @ 859B60E - .string "ALLOWANCE$" - -gEasyChatWord_Bath:: @ 859B618 - .string "BATH$" - -gEasyChatWord_Conversation:: @ 859B61D - .string "CONVERSATION$" - -gEasyChatWord_School:: @ 859B62A - .string "SCHOOL$" - -gEasyChatWord_Commemorate:: @ 859B631 - .string "COMMEMORATE$" - -gEasyChatWord_Habit:: @ 859B63D - .string "HABIT$" - -gEasyChatWord_Group:: @ 859B643 - .string "GROUP$" - -gEasyChatWord_Word:: @ 859B649 - .string "WORD$" - -gEasyChatWord_Store:: @ 859B64E - .string "STORE$" - -gEasyChatWord_Service:: @ 859B654 - .string "SERVICE$" - -gEasyChatWord_Work:: @ 859B65C - .string "WORK$" - -gEasyChatWord_System:: @ 859B661 - .string "SYSTEM$" - -gEasyChatWord_Train:: @ 859B668 - .string "TRAIN$" - -gEasyChatWord_Class:: @ 859B66E - .string "CLASS$" - -gEasyChatWord_Lessons:: @ 859B674 - .string "LESSONS$" - -gEasyChatWord_Information:: @ 859B67C - .string "INFORMATION$" - -gEasyChatWord_Living:: @ 859B688 - .string "LIVING$" - -gEasyChatWord_Teacher:: @ 859B68F - .string "TEACHER$" - -gEasyChatWord_Tournament:: @ 859B697 - .string "TOURNAMENT$" - -gEasyChatWord_Letter:: @ 859B6A2 - .string "LETTER$" - -gEasyChatWord_Event:: @ 859B6A9 - .string "EVENT$" - -gEasyChatWord_Digital:: @ 859B6AF - .string "DIGITAL$" - -gEasyChatWord_Test:: @ 859B6B7 - .string "TEST$" - -gEasyChatWord_DeptStore:: @ 859B6BC - .string "DEPT. STORE$" - -gEasyChatWord_Television:: @ 859B6C8 - .string "TELEVISION$" - -gEasyChatWord_Phone:: @ 859B6D3 - .string "PHONE$" - -gEasyChatWord_Item:: @ 859B6D9 - .string "ITEM$" - -gEasyChatWord_Name:: @ 859B6DE - .string "NAME$" - -gEasyChatWord_News:: @ 859B6E3 - .string "NEWS$" - -gEasyChatWord_Popular:: @ 859B6E8 - .string "POPULAR$" - -gEasyChatWord_Party:: @ 859B6F0 - .string "PARTY$" - -gEasyChatWord_Study:: @ 859B6F6 - .string "STUDY$" - -gEasyChatWord_Machine:: @ 859B6FC - .string "MACHINE$" - -gEasyChatWord_Mail:: @ 859B704 - .string "MAIL$" - -gEasyChatWord_Message:: @ 859B709 - .string "MESSAGE$" - -gEasyChatWord_Promise:: @ 859B711 - .string "PROMISE$" - -gEasyChatWord_Dream:: @ 859B719 - .string "DREAM$" - -gEasyChatWord_Kindergarten:: @ 859B71F - .string "KINDERGARTEN$" - -gEasyChatWord_Life:: @ 859B72C - .string "LIFE$" - -gEasyChatWord_Radio:: @ 859B731 - .string "RADIO$" - -gEasyChatWord_Rental:: @ 859B737 - .string "RENTAL$" - -gEasyChatWord_World:: @ 859B73E - .string "WORLD$" - - .align 2 -gEasyChatGroup_Lifestyle:: @ 859B744 - .4byte gEasyChatWord_Chores - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Home - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Money - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Allowance - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Bath - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Conversation - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_School - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Commemorate - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Habit - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Group - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Word - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Store - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Service - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Work - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_System - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Train - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Class - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lessons - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Information - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Living - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Teacher - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tournament - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Letter - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Event - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Digital - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Test - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_DeptStore - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Television - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Phone - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Item - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Name - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_News - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Popular - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Party - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Study - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Machine - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mail - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Message - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Promise - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dream - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Kindergarten - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Life - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Radio - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rental - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_World - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_misc.s b/data/text/easy_chat/easy_chat_group_misc.s deleted file mode 100644 index 19ca730d54..0000000000 --- a/data/text/easy_chat/easy_chat_group_misc.s +++ /dev/null @@ -1,295 +0,0 @@ -gEasyChatWord_Highs:: @ 859C0B4 - .string "HIGHS$" - -gEasyChatWord_Lows:: @ 859C0BA - .string "LOWS$" - -gEasyChatWord_Um:: @ 859C0BF - .string "UM$" - -gEasyChatWord_Rear:: @ 859C0C2 - .string "REAR$" - -gEasyChatWord_Things:: @ 859C0C7 - .string "THINGS$" - -gEasyChatWord_Thing:: @ 859C0CE - .string "THING$" - -gEasyChatWord_Below:: @ 859C0D4 - .string "BELOW$" - -gEasyChatWord_Above:: @ 859C0DA - .string "ABOVE$" - -gEasyChatWord_Back:: @ 859C0E0 - .string "BACK$" - -gEasyChatWord_High:: @ 859C0E5 - .string "HIGH$" - -gEasyChatWord_Here:: @ 859C0EA - .string "HERE$" - -gEasyChatWord_Inside:: @ 859C0EF - .string "INSIDE$" - -gEasyChatWord_Outside:: @ 859C0F6 - .string "OUTSIDE$" - -gEasyChatWord_Beside:: @ 859C0FE - .string "BESIDE$" - -gEasyChatWord_ThisIsItExcl:: @ 859C105 - .string "THIS IS IT!$" - -gEasyChatWord_This:: @ 859C111 - .string "THIS$" - -gEasyChatWord_Every:: @ 859C116 - .string "EVERY$" - -gEasyChatWord_These:: @ 859C11C - .string "THESE$" - -gEasyChatWord_TheseWere:: @ 859C122 - .string "THESE WERE$" - -gEasyChatWord_Down:: @ 859C12D - .string "DOWN$" - -gEasyChatWord_That:: @ 859C132 - .string "THAT$" - -gEasyChatWord_ThoseAre:: @ 859C137 - .string "THOSE ARE$" - -gEasyChatWord_ThoseWere:: @ 859C141 - .string "THOSE WERE$" - -gEasyChatWord_ThatsItExcl:: @ 859C14C - .string "THAT'S IT!$" - -gEasyChatWord_Am:: @ 859C157 - .string "AM$" - -gEasyChatWord_ThatWas:: @ 859C15A - .string "THAT WAS$" - -gEasyChatWord_Front:: @ 859C163 - .string "FRONT$" - -gEasyChatWord_Up:: @ 859C169 - .string "UP$" - -gEasyChatWord_Choice:: @ 859C16C - .string "CHOICE$" - -gEasyChatWord_Far:: @ 859C173 - .string "FAR$" - -gEasyChatWord_Away:: @ 859C177 - .string "AWAY$" - -gEasyChatWord_Near:: @ 859C17C - .string "NEAR$" - -gEasyChatWord_Where:: @ 859C181 - .string "WHERE$" - -gEasyChatWord_When:: @ 859C187 - .string "WHEN$" - -gEasyChatWord_What:: @ 859C18C - .string "WHAT$" - -gEasyChatWord_Deep:: @ 859C191 - .string "DEEP$" - -gEasyChatWord_Shallow:: @ 859C196 - .string "SHALLOW$" - -gEasyChatWord_Why:: @ 859C19E - .string "WHY$" - -gEasyChatWord_Confused:: @ 859C1A2 - .string "CONFUSED$" - -gEasyChatWord_Opposite:: @ 859C1AB - .string "OPPOSITE$" - -gEasyChatWord_Left:: @ 859C1B4 - .string "LEFT$" - -gEasyChatWord_Right:: @ 859C1B9 - .string "RIGHT$" - - .align 2 -gEasyChatGroup_Misc:: @ 859C1C0 - .4byte gEasyChatWord_Highs - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lows - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Um - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rear - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Things - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thing - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Below - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Above - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Back - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_High - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Here - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Inside - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Outside - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Beside - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThisIsItExcl - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_This - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Every - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_These - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TheseWere - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Down - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_That - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThoseAre - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThoseWere - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThatsItExcl - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Am - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThatWas - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Front - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Up - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Choice - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Far - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Away - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Near - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Where - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_When - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_What - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Deep - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shallow - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Why - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Confused - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Opposite - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Left - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Right - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_move_1.s b/data/text/easy_chat/easy_chat_group_move_1.s deleted file mode 100644 index 595dfd1589..0000000000 --- a/data/text/easy_chat/easy_chat_group_move_1.s +++ /dev/null @@ -1,156 +0,0 @@ - .align 2 -gEasyChatGroup_Move1:: @ 859C8C4 - .2byte MOVE_ABSORB - .2byte MOVE_AEROBLAST - .2byte MOVE_AGILITY - .2byte MOVE_AIR_CUTTER - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_AROMATHERAPY - .2byte MOVE_ASTONISH - .2byte MOVE_AURORA_BEAM - .2byte MOVE_BIDE - .2byte MOVE_BIND - .2byte MOVE_BITE - .2byte MOVE_BRICK_BREAK - .2byte MOVE_BUBBLE - .2byte MOVE_CHARGE - .2byte MOVE_CHARM - .2byte MOVE_CLAMP - .2byte MOVE_CONFUSE_RAY - .2byte MOVE_CONSTRICT - .2byte MOVE_COSMIC_POWER - .2byte MOVE_COUNTER - .2byte MOVE_CRABHAMMER - .2byte MOVE_CROSS_CHOP - .2byte MOVE_CRUNCH - .2byte MOVE_CUT - .2byte MOVE_DIG - .2byte MOVE_DISABLE - .2byte MOVE_DOUBLE_TEAM - .2byte MOVE_DOUBLE_EDGE - .2byte MOVE_DOUBLE_SLAP - .2byte MOVE_EARTHQUAKE - .2byte MOVE_ENCORE - .2byte MOVE_ENDEAVOR - .2byte MOVE_ENDURE - .2byte MOVE_EXTRASENSORY - .2byte MOVE_EXTREME_SPEED - .2byte MOVE_FACADE - .2byte MOVE_FAKE_TEARS - .2byte MOVE_FISSURE - .2byte MOVE_FLAIL - .2byte MOVE_FLAME_WHEEL - .2byte MOVE_FLAMETHROWER - .2byte MOVE_FLATTER - .2byte MOVE_FLY - .2byte MOVE_FOCUS_ENERGY - .2byte MOVE_FOCUS_PUNCH - .2byte MOVE_FOLLOW_ME - .2byte MOVE_GIGA_DRAIN - .2byte MOVE_GRASS_WHISTLE - .2byte MOVE_GROWTH - .2byte MOVE_GRUDGE - .2byte MOVE_GUST - .2byte MOVE_HAIL - .2byte MOVE_HARDEN - .2byte MOVE_HAZE - .2byte MOVE_HEADBUTT - .2byte MOVE_HEAL_BELL - .2byte MOVE_HYPNOSIS - .2byte MOVE_ICE_BALL - .2byte MOVE_ICY_WIND - .2byte MOVE_IRON_TAIL - .2byte MOVE_KARATE_CHOP - .2byte MOVE_KINESIS - .2byte MOVE_LEECH_LIFE - .2byte MOVE_LICK - .2byte MOVE_LOVELY_KISS - .2byte MOVE_LOW_KICK - .2byte MOVE_MEAN_LOOK - .2byte MOVE_MEMENTO - .2byte MOVE_METAL_SOUND - .2byte MOVE_METEOR_MASH - .2byte MOVE_MIND_READER - .2byte MOVE_MIRROR_MOVE - .2byte MOVE_MIST - .2byte MOVE_MORNING_SUN - .2byte MOVE_NATURE_POWER - .2byte MOVE_NIGHTMARE - .2byte MOVE_OCTAZOOKA - .2byte MOVE_ODOR_SLEUTH - .2byte MOVE_OUTRAGE - .2byte MOVE_OVERHEAT - .2byte MOVE_PAIN_SPLIT - .2byte MOVE_POWDER_SNOW - .2byte MOVE_PSYBEAM - .2byte MOVE_PSYCH_UP - .2byte MOVE_PSYCHIC - .2byte MOVE_PSYCHO_BOOST - .2byte MOVE_PSYWAVE - .2byte MOVE_PURSUIT - .2byte MOVE_RAGE - .2byte MOVE_RAIN_DANCE - .2byte MOVE_RAPID_SPIN - .2byte MOVE_RAZOR_WIND - .2byte MOVE_RECOVER - .2byte MOVE_RETURN - .2byte MOVE_REVERSAL - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_ROCK_SMASH - .2byte MOVE_ROCK_THROW - .2byte MOVE_ROCK_TOMB - .2byte MOVE_ROLLOUT - .2byte MOVE_SACRED_FIRE - .2byte MOVE_SAFEGUARD - .2byte MOVE_SAND_TOMB - .2byte MOVE_SAND_ATTACK - .2byte MOVE_SANDSTORM - .2byte MOVE_SCARY_FACE - .2byte MOVE_SCREECH - .2byte MOVE_SELF_DESTRUCT - .2byte MOVE_SHADOW_BALL - .2byte MOVE_SHADOW_PUNCH - .2byte MOVE_SHARPEN - .2byte MOVE_SHEER_COLD - .2byte MOVE_SIGNAL_BEAM - .2byte MOVE_SILVER_WIND - .2byte MOVE_SING - .2byte MOVE_SKETCH - .2byte MOVE_SKILL_SWAP - .2byte MOVE_SKY_ATTACK - .2byte MOVE_SKY_UPPERCUT - .2byte MOVE_SLASH - .2byte MOVE_SMELLING_SALT - .2byte MOVE_SMOG - .2byte MOVE_SMOKESCREEN - .2byte MOVE_SNORE - .2byte MOVE_SOLAR_BEAM - .2byte MOVE_SONIC_BOOM - .2byte MOVE_SPARK - .2byte MOVE_SPIDER_WEB - .2byte MOVE_SPITE - .2byte MOVE_SPORE - .2byte MOVE_STRENGTH - .2byte MOVE_STRING_SHOT - .2byte MOVE_STUN_SPORE - .2byte MOVE_SUBMISSION - .2byte MOVE_SUPER_FANG - .2byte MOVE_SWAGGER - .2byte MOVE_SWEET_SCENT - .2byte MOVE_SWIFT - .2byte MOVE_SYNTHESIS - .2byte MOVE_TAIL_WHIP - .2byte MOVE_THRASH - .2byte MOVE_THUNDER - .2byte MOVE_THUNDERBOLT - .2byte MOVE_THUNDER_PUNCH - .2byte MOVE_TICKLE - .2byte MOVE_TORMENT - .2byte MOVE_UPROAR - .2byte MOVE_VITAL_THROW - .2byte MOVE_WATER_SPOUT - .2byte MOVE_WEATHER_BALL - .2byte MOVE_WHIRLPOOL - .2byte MOVE_WILL_O_WISP - .2byte MOVE_WITHDRAW - .2byte MOVE_YAWN diff --git a/data/text/easy_chat/easy_chat_group_move_2.s b/data/text/easy_chat/easy_chat_group_move_2.s deleted file mode 100644 index e08a077679..0000000000 --- a/data/text/easy_chat/easy_chat_group_move_2.s +++ /dev/null @@ -1,202 +0,0 @@ - .align 2 -gEasyChatGroup_Move2:: @ 859C9F8 - .2byte MOVE_ACID - .2byte MOVE_ACID_ARMOR - .2byte MOVE_AERIAL_ACE - .2byte MOVE_AMNESIA - .2byte MOVE_ARM_THRUST - .2byte MOVE_ASSIST - .2byte MOVE_ATTRACT - .2byte MOVE_BARRAGE - .2byte MOVE_BARRIER - .2byte MOVE_BATON_PASS - .2byte MOVE_BEAT_UP - .2byte MOVE_BELLY_DRUM - .2byte MOVE_BLAST_BURN - .2byte MOVE_BLAZE_KICK - .2byte MOVE_BLIZZARD - .2byte MOVE_BLOCK - .2byte MOVE_BODY_SLAM - .2byte MOVE_BONE_CLUB - .2byte MOVE_BONE_RUSH - .2byte MOVE_BONEMERANG - .2byte MOVE_BOUNCE - .2byte MOVE_BUBBLE_BEAM - .2byte MOVE_BULK_UP - .2byte MOVE_BULLET_SEED - .2byte MOVE_CALM_MIND - .2byte MOVE_CAMOUFLAGE - .2byte MOVE_COMET_PUNCH - .2byte MOVE_CONFUSION - .2byte MOVE_CONVERSION - .2byte MOVE_CONVERSION_2 - .2byte MOVE_COTTON_SPORE - .2byte MOVE_COVET - .2byte MOVE_CRUSH_CLAW - .2byte MOVE_CURSE - .2byte MOVE_DEFENSE_CURL - .2byte MOVE_DESTINY_BOND - .2byte MOVE_DETECT - .2byte MOVE_DIVE - .2byte MOVE_DIZZY_PUNCH - .2byte MOVE_DOOM_DESIRE - .2byte MOVE_DOUBLE_KICK - .2byte MOVE_DRAGON_CLAW - .2byte MOVE_DRAGON_DANCE - .2byte MOVE_DRAGON_RAGE - .2byte MOVE_DRAGON_BREATH - .2byte MOVE_DREAM_EATER - .2byte MOVE_DRILL_PECK - .2byte MOVE_DYNAMIC_PUNCH - .2byte MOVE_EGG_BOMB - .2byte MOVE_EMBER - .2byte MOVE_ERUPTION - .2byte MOVE_EXPLOSION - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_FAKE_OUT - .2byte MOVE_FALSE_SWIPE - .2byte MOVE_FEATHER_DANCE - .2byte MOVE_FIRE_BLAST - .2byte MOVE_FIRE_PUNCH - .2byte MOVE_FIRE_SPIN - .2byte MOVE_FLASH - .2byte MOVE_FORESIGHT - .2byte MOVE_FRENZY_PLANT - .2byte MOVE_FRUSTRATION - .2byte MOVE_FURY_ATTACK - .2byte MOVE_FURY_CUTTER - .2byte MOVE_FURY_SWIPES - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_GLARE - .2byte MOVE_GROWL - .2byte MOVE_GUILLOTINE - .2byte MOVE_HEAT_WAVE - .2byte MOVE_HELPING_HAND - .2byte MOVE_HI_JUMP_KICK - .2byte MOVE_HIDDEN_POWER - .2byte MOVE_HORN_ATTACK - .2byte MOVE_HORN_DRILL - .2byte MOVE_HOWL - .2byte MOVE_HYDRO_CANNON - .2byte MOVE_HYDRO_PUMP - .2byte MOVE_HYPER_BEAM - .2byte MOVE_HYPER_FANG - .2byte MOVE_HYPER_VOICE - .2byte MOVE_ICE_BEAM - .2byte MOVE_ICE_PUNCH - .2byte MOVE_ICICLE_SPEAR - .2byte MOVE_IMPRISON - .2byte MOVE_INGRAIN - .2byte MOVE_IRON_DEFENSE - .2byte MOVE_JUMP_KICK - .2byte MOVE_KNOCK_OFF - .2byte MOVE_LEAF_BLADE - .2byte MOVE_LEECH_SEED - .2byte MOVE_LEER - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_LOCK_ON - .2byte MOVE_LUSTER_PURGE - .2byte MOVE_MACH_PUNCH - .2byte MOVE_MAGIC_COAT - .2byte MOVE_MAGICAL_LEAF - .2byte MOVE_MAGNITUDE - .2byte MOVE_MEDITATE - .2byte MOVE_MEGA_DRAIN - .2byte MOVE_MEGA_KICK - .2byte MOVE_MEGA_PUNCH - .2byte MOVE_MEGAHORN - .2byte MOVE_METAL_CLAW - .2byte MOVE_METRONOME - .2byte MOVE_MILK_DRINK - .2byte MOVE_MIMIC - .2byte MOVE_MINIMIZE - .2byte MOVE_MIRROR_COAT - .2byte MOVE_MIST_BALL - .2byte MOVE_MOONLIGHT - .2byte MOVE_MUD_SHOT - .2byte MOVE_MUD_SPORT - .2byte MOVE_MUD_SLAP - .2byte MOVE_MUDDY_WATER - .2byte MOVE_NEEDLE_ARM - .2byte MOVE_NIGHT_SHADE - .2byte MOVE_PAY_DAY - .2byte MOVE_PECK - .2byte MOVE_PERISH_SONG - .2byte MOVE_PETAL_DANCE - .2byte MOVE_PIN_MISSILE - .2byte MOVE_POISON_FANG - .2byte MOVE_POISON_GAS - .2byte MOVE_POISON_STING - .2byte MOVE_POISON_TAIL - .2byte MOVE_POISON_POWDER - .2byte MOVE_POUND - .2byte MOVE_PRESENT - .2byte MOVE_PROTECT - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_RAZOR_LEAF - .2byte MOVE_RECYCLE - .2byte MOVE_REFLECT - .2byte MOVE_REFRESH - .2byte MOVE_REST - .2byte MOVE_REVENGE - .2byte MOVE_ROAR - .2byte MOVE_ROCK_BLAST - .2byte MOVE_ROLE_PLAY - .2byte MOVE_ROLLING_KICK - .2byte MOVE_SCRATCH - .2byte MOVE_SECRET_POWER - .2byte MOVE_SEISMIC_TOSS - .2byte MOVE_SHOCK_WAVE - .2byte MOVE_SKULL_BASH - .2byte MOVE_SLACK_OFF - .2byte MOVE_SLAM - .2byte MOVE_SLEEP_POWDER - .2byte MOVE_SLEEP_TALK - .2byte MOVE_SLUDGE - .2byte MOVE_SLUDGE_BOMB - .2byte MOVE_SNATCH - .2byte MOVE_SOFT_BOILED - .2byte MOVE_SPIKE_CANNON - .2byte MOVE_SPIKES - .2byte MOVE_SPIT_UP - .2byte MOVE_SPLASH - .2byte MOVE_STEEL_WING - .2byte MOVE_STOCKPILE - .2byte MOVE_STOMP - .2byte MOVE_STRUGGLE - .2byte MOVE_SUBSTITUTE - .2byte MOVE_SUNNY_DAY - .2byte MOVE_SUPERPOWER - .2byte MOVE_SUPERSONIC - .2byte MOVE_SURF - .2byte MOVE_SWALLOW - .2byte MOVE_SWEET_KISS - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_TACKLE - .2byte MOVE_TAIL_GLOW - .2byte MOVE_TAKE_DOWN - .2byte MOVE_TAUNT - .2byte MOVE_TEETER_DANCE - .2byte MOVE_TELEPORT - .2byte MOVE_THIEF - .2byte MOVE_THUNDER_WAVE - .2byte MOVE_THUNDER_SHOCK - .2byte MOVE_TOXIC - .2byte MOVE_TRANSFORM - .2byte MOVE_TRI_ATTACK - .2byte MOVE_TRICK - .2byte MOVE_TRIPLE_KICK - .2byte MOVE_TWINEEDLE - .2byte MOVE_TWISTER - .2byte MOVE_VICE_GRIP - .2byte MOVE_VINE_WHIP - .2byte MOVE_VOLT_TACKLE - .2byte MOVE_WATER_GUN - .2byte MOVE_WATER_PULSE - .2byte MOVE_WATER_SPORT - .2byte MOVE_WATERFALL - .2byte MOVE_WHIRLWIND - .2byte MOVE_WING_ATTACK - .2byte MOVE_WISH - .2byte MOVE_WRAP - .2byte MOVE_ZAP_CANNON diff --git a/data/text/easy_chat/easy_chat_group_name_pointers.inc b/data/text/easy_chat/easy_chat_group_name_pointers.inc deleted file mode 100644 index 375614b86c..0000000000 --- a/data/text/easy_chat/easy_chat_group_name_pointers.inc +++ /dev/null @@ -1,24 +0,0 @@ - .align 2 -gEasyChatGroupNamePointers:: @ 859E5D4 - .4byte gEasyChatGroupName_Pokemon - .4byte gEasyChatGroupName_Trainer - .4byte gEasyChatGroupName_Status - .4byte gEasyChatGroupName_Battle - .4byte gEasyChatGroupName_Greetings - .4byte gEasyChatGroupName_People - .4byte gEasyChatGroupName_Voices - .4byte gEasyChatGroupName_Speech - .4byte gEasyChatGroupName_Endings - .4byte gEasyChatGroupName_Feelings - .4byte gEasyChatGroupName_Conditions - .4byte gEasyChatGroupName_Actions - .4byte gEasyChatGroupName_Lifestyle - .4byte gEasyChatGroupName_Hobbies - .4byte gEasyChatGroupName_Time - .4byte gEasyChatGroupName_Misc - .4byte gEasyChatGroupName_Adjectives - .4byte gEasyChatGroupName_Events - .4byte gEasyChatGroupName_Move1 - .4byte gEasyChatGroupName_Move2 - .4byte gEasyChatGroupName_TrendySaying - .4byte gEasyChatGroupName_Pokemon2 diff --git a/data/text/easy_chat/easy_chat_group_people.s b/data/text/easy_chat/easy_chat_group_people.s deleted file mode 100644 index fb74aba912..0000000000 --- a/data/text/easy_chat/easy_chat_group_people.s +++ /dev/null @@ -1,526 +0,0 @@ -gEasyChatWord_Opponent:: @ 8599348 - .string "OPPONENT$" - -gEasyChatWord_I:: @ 8599351 - .string "I$" - -gEasyChatWord_You:: @ 8599353 - .string "YOU$" - -gEasyChatWord_Yours:: @ 8599357 - .string "YOURS$" - -gEasyChatWord_Son:: @ 859935D - .string "SON$" - -gEasyChatWord_Your:: @ 8599361 - .string "YOUR$" - -gEasyChatWord_Youre:: @ 8599366 - .string "YOU'RE$" - -gEasyChatWord_Youve:: @ 859936D - .string "YOU'VE$" - -gEasyChatWord_Mother:: @ 8599374 - .string "MOTHER$" - -gEasyChatWord_Grandfather:: @ 859937B - .string "GRANDFATHER$" - -gEasyChatWord_Uncle:: @ 8599387 - .string "UNCLE$" - -gEasyChatWord_Father:: @ 859938D - .string "FATHER$" - -gEasyChatWord_Boy:: @ 8599394 - .string "BOY$" - -gEasyChatWord_Adult:: @ 8599398 - .string "ADULT$" - -gEasyChatWord_Brother:: @ 859939E - .string "BROTHER$" - -gEasyChatWord_Sister:: @ 85993A6 - .string "SISTER$" - -gEasyChatWord_Grandmother:: @ 85993AD - .string "GRANDMOTHER$" - -gEasyChatWord_Aunt:: @ 85993B9 - .string "AUNT$" - -gEasyChatWord_Parent:: @ 85993BE - .string "PARENT$" - -gEasyChatWord_Man:: @ 85993C5 - .string "MAN$" - -gEasyChatWord_Me:: @ 85993C9 - .string "ME$" - -gEasyChatWord_Girl:: @ 85993CC - .string "GIRL$" - -gEasyChatWord_Babe:: @ 85993D1 - .string "BABE$" - -gEasyChatWord_Family:: @ 85993D6 - .string "FAMILY$" - -gEasyChatWord_Her:: @ 85993DD - .string "HER$" - -gEasyChatWord_Him:: @ 85993E1 - .string "HIM$" - -gEasyChatWord_He:: @ 85993E5 - .string "HE$" - -gEasyChatWord_Place:: @ 85993E8 - .string "PLACE$" - -gEasyChatWord_Daughter:: @ 85993EE - .string "DAUGHTER$" - -gEasyChatWord_His:: @ 85993F7 - .string "HIS$" - -gEasyChatWord_Hes:: @ 85993FB - .string "HE'S$" - -gEasyChatWord_Arent:: @ 8599400 - .string "AREN'T$" - -gEasyChatWord_Siblings:: @ 8599407 - .string "SIBLINGS$" - -gEasyChatWord_Kid:: @ 8599410 - .string "KID$" - -gEasyChatWord_Children:: @ 8599414 - .string "CHILDREN$" - -gEasyChatWord_Mr:: @ 859941D - .string "MR.$" - -gEasyChatWord_Mrs:: @ 8599421 - .string "MRS.$" - -gEasyChatWord_Myself:: @ 8599426 - .string "MYSELF$" - -gEasyChatWord_IWas:: @ 859942D - .string "I WAS$" - -gEasyChatWord_ToMe:: @ 8599433 - .string "TO ME$" - -gEasyChatWord_My:: @ 8599439 - .string "MY$" - -gEasyChatWord_IAm:: @ 859943C - .string "I AM$" - -gEasyChatWord_Ive:: @ 8599441 - .string "I'VE$" - -gEasyChatWord_Who:: @ 8599446 - .string "WHO$" - -gEasyChatWord_Someone:: @ 859944A - .string "SOMEONE$" - -gEasyChatWord_WhoWas:: @ 8599452 - .string "WHO WAS$" - -gEasyChatWord_ToWhom:: @ 859945A - .string "TO WHOM$" - -gEasyChatWord_Whose:: @ 8599462 - .string "WHOSE$" - -gEasyChatWord_WhoIs:: @ 8599468 - .string "WHO IS$" - -gEasyChatWord_Its:: @ 859946F - .string "IT'S$" - -gEasyChatWord_Lady:: @ 8599474 - .string "LADY$" - -gEasyChatWord_Friend:: @ 8599479 - .string "FRIEND$" - -gEasyChatWord_Ally:: @ 8599480 - .string "ALLY$" - -gEasyChatWord_Person:: @ 8599485 - .string "PERSON$" - -gEasyChatWord_Dude:: @ 859948C - .string "DUDE$" - -gEasyChatWord_They:: @ 8599491 - .string "THEY$" - -gEasyChatWord_TheyWere:: @ 8599496 - .string "THEY WERE$" - -gEasyChatWord_ToThem:: @ 85994A0 - .string "TO THEM$" - -gEasyChatWord_Their:: @ 85994A8 - .string "THEIR$" - -gEasyChatWord_Theyre:: @ 85994AE - .string "THEY'RE$" - -gEasyChatWord_Theyve:: @ 85994B6 - .string "THEY'VE$" - -gEasyChatWord_We:: @ 85994BE - .string "WE$" - -gEasyChatWord_Been:: @ 85994C1 - .string "BEEN$" - -gEasyChatWord_ToUs:: @ 85994C6 - .string "TO US$" - -gEasyChatWord_Our:: @ 85994CC - .string "OUR$" - -gEasyChatWord_WeAre:: @ 85994D0 - .string "WE'RE$" - -gEasyChatWord_Rival:: @ 85994D6 - .string "RIVAL$" - -gEasyChatWord_Weve:: @ 85994DC - .string "WE'VE$" - -gEasyChatWord_Woman:: @ 85994E2 - .string "WOMAN$" - -gEasyChatWord_She:: @ 85994E8 - .string "SHE$" - -gEasyChatWord_SheWas:: @ 85994EC - .string "SHE WAS$" - -gEasyChatWord_ToHer:: @ 85994F4 - .string "TO HER$" - -gEasyChatWord_Hers:: @ 85994FB - .string "HERS$" - -gEasyChatWord_SheIs:: @ 8599500 - .string "SHE IS$" - -gEasyChatWord_Some:: @ 8599507 - .string "SOME$" - - .align 2 -gEasyChatGroup_People:: @ 859950C - .4byte gEasyChatWord_Opponent - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_I - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_You - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yours - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Son - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Your - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Youre - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Youve - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mother - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Grandfather - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Uncle - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Father - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Boy - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Adult - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Brother - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sister - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Grandmother - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Aunt - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Parent - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Man - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Me - .4byte 72 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Girl - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Babe - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Family - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Her - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Him - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_He - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Place - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Daughter - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_His - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hes - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Arent - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Siblings - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Kid - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Children - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mr - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mrs - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Myself - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IWas - .4byte 64 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ToMe - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_My - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IAm - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ive - .4byte 66 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Who - .4byte 69 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Someone - .4byte 73 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WhoWas - .4byte 70 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ToWhom - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Whose - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WhoIs - .4byte 74 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Its - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lady - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Friend - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ally - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Person - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dude - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_They - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TheyWere - .4byte 71 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ToThem - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Their - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Theyre - .4byte 63 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Theyve - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_We - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Been - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ToUs - .4byte 65 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Our - .4byte 67 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WeAre - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rival - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Weve - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Woman - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_She - .4byte 68 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SheWas - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ToHer - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hers - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SheIs - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Some - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_pokemon.s b/data/text/easy_chat/easy_chat_group_pokemon.s deleted file mode 100644 index 571c687367..0000000000 --- a/data/text/easy_chat/easy_chat_group_pokemon.s +++ /dev/null @@ -1,204 +0,0 @@ - .align 2 -gEasyChatGroup_Pokemon:: @ 8597E9C - .2byte SPECIES_ABRA - .2byte SPECIES_ABSOL - .2byte SPECIES_AGGRON - .2byte SPECIES_ALAKAZAM - .2byte SPECIES_ALTARIA - .2byte SPECIES_ANORITH - .2byte SPECIES_ARMALDO - .2byte SPECIES_ARON - .2byte SPECIES_AZUMARILL - .2byte SPECIES_AZURILL - .2byte SPECIES_BAGON - .2byte SPECIES_BALTOY - .2byte SPECIES_BANETTE - .2byte SPECIES_BARBOACH - .2byte SPECIES_BEAUTIFLY - .2byte SPECIES_BELDUM - .2byte SPECIES_BELLOSSOM - .2byte SPECIES_BLAZIKEN - .2byte SPECIES_BRELOOM - .2byte SPECIES_CACNEA - .2byte SPECIES_CACTURNE - .2byte SPECIES_CAMERUPT - .2byte SPECIES_CARVANHA - .2byte SPECIES_CASCOON - .2byte SPECIES_CASTFORM - .2byte SPECIES_CHIMECHO - .2byte SPECIES_CHINCHOU - .2byte SPECIES_CLAMPERL - .2byte SPECIES_CLAYDOL - .2byte SPECIES_COMBUSKEN - .2byte SPECIES_CORPHISH - .2byte SPECIES_CORSOLA - .2byte SPECIES_CRADILY - .2byte SPECIES_CRAWDAUNT - .2byte SPECIES_CROBAT - .2byte SPECIES_DELCATTY - .2byte SPECIES_DEOXYS - .2byte SPECIES_DODRIO - .2byte SPECIES_DODUO - .2byte SPECIES_DONPHAN - .2byte SPECIES_DUSCLOPS - .2byte SPECIES_DUSKULL - .2byte SPECIES_DUSTOX - .2byte SPECIES_ELECTRIKE - .2byte SPECIES_ELECTRODE - .2byte SPECIES_EXPLOUD - .2byte SPECIES_FEEBAS - .2byte SPECIES_FLYGON - .2byte SPECIES_GARDEVOIR - .2byte SPECIES_GEODUDE - .2byte SPECIES_GIRAFARIG - .2byte SPECIES_GLALIE - .2byte SPECIES_GLOOM - .2byte SPECIES_GOLBAT - .2byte SPECIES_GOLDEEN - .2byte SPECIES_GOLDUCK - .2byte SPECIES_GOLEM - .2byte SPECIES_GOREBYSS - .2byte SPECIES_GRAVELER - .2byte SPECIES_GRIMER - .2byte SPECIES_GROUDON - .2byte SPECIES_GROVYLE - .2byte SPECIES_GRUMPIG - .2byte SPECIES_GULPIN - .2byte SPECIES_GYARADOS - .2byte SPECIES_HARIYAMA - .2byte SPECIES_HERACROSS - .2byte SPECIES_HORSEA - .2byte SPECIES_HUNTAIL - .2byte SPECIES_IGGLYBUFF - .2byte SPECIES_ILLUMISE - .2byte SPECIES_JIGGLYPUFF - .2byte SPECIES_JIRACHI - .2byte SPECIES_KADABRA - .2byte SPECIES_KECLEON - .2byte SPECIES_KINGDRA - .2byte SPECIES_KIRLIA - .2byte SPECIES_KOFFING - .2byte SPECIES_KYOGRE - .2byte SPECIES_LAIRON - .2byte SPECIES_LANTURN - .2byte SPECIES_LATIAS - .2byte SPECIES_LATIOS - .2byte SPECIES_LILEEP - .2byte SPECIES_LINOONE - .2byte SPECIES_LOMBRE - .2byte SPECIES_LOTAD - .2byte SPECIES_LOUDRED - .2byte SPECIES_LUDICOLO - .2byte SPECIES_LUNATONE - .2byte SPECIES_LUVDISC - .2byte SPECIES_MACHAMP - .2byte SPECIES_MACHOKE - .2byte SPECIES_MACHOP - .2byte SPECIES_MAGCARGO - .2byte SPECIES_MAGIKARP - .2byte SPECIES_MAGNEMITE - .2byte SPECIES_MAGNETON - .2byte SPECIES_MAKUHITA - .2byte SPECIES_MANECTRIC - .2byte SPECIES_MARILL - .2byte SPECIES_MARSHTOMP - .2byte SPECIES_MASQUERAIN - .2byte SPECIES_MAWILE - .2byte SPECIES_MEDICHAM - .2byte SPECIES_MEDITITE - .2byte SPECIES_METAGROSS - .2byte SPECIES_METANG - .2byte SPECIES_MIGHTYENA - .2byte SPECIES_MILOTIC - .2byte SPECIES_MINUN - .2byte SPECIES_MUDKIP - .2byte SPECIES_MUK - .2byte SPECIES_NATU - .2byte SPECIES_NINCADA - .2byte SPECIES_NINETALES - .2byte SPECIES_NINJASK - .2byte SPECIES_NOSEPASS - .2byte SPECIES_NUMEL - .2byte SPECIES_NUZLEAF - .2byte SPECIES_ODDISH - .2byte SPECIES_PELIPPER - .2byte SPECIES_PHANPY - .2byte SPECIES_PICHU - .2byte SPECIES_PIKACHU - .2byte SPECIES_PINSIR - .2byte SPECIES_PLUSLE - .2byte SPECIES_POOCHYENA - .2byte SPECIES_PSYDUCK - .2byte SPECIES_RAICHU - .2byte SPECIES_RALTS - .2byte SPECIES_RAYQUAZA - .2byte SPECIES_REGICE - .2byte SPECIES_REGIROCK - .2byte SPECIES_REGISTEEL - .2byte SPECIES_RELICANTH - .2byte SPECIES_RHYDON - .2byte SPECIES_RHYHORN - .2byte SPECIES_ROSELIA - .2byte SPECIES_SABLEYE - .2byte SPECIES_SALAMENCE - .2byte SPECIES_SANDSHREW - .2byte SPECIES_SANDSLASH - .2byte SPECIES_SCEPTILE - .2byte SPECIES_SEADRA - .2byte SPECIES_SEAKING - .2byte SPECIES_SEALEO - .2byte SPECIES_SEEDOT - .2byte SPECIES_SEVIPER - .2byte SPECIES_SHARPEDO - .2byte SPECIES_SHEDINJA - .2byte SPECIES_SHELGON - .2byte SPECIES_SHIFTRY - .2byte SPECIES_SHROOMISH - .2byte SPECIES_SHUPPET - .2byte SPECIES_SILCOON - .2byte SPECIES_SKARMORY - .2byte SPECIES_SKITTY - .2byte SPECIES_SLAKING - .2byte SPECIES_SLAKOTH - .2byte SPECIES_SLUGMA - .2byte SPECIES_SNORUNT - .2byte SPECIES_SOLROCK - .2byte SPECIES_SPHEAL - .2byte SPECIES_SPINDA - .2byte SPECIES_SPOINK - .2byte SPECIES_STARMIE - .2byte SPECIES_STARYU - .2byte SPECIES_SURSKIT - .2byte SPECIES_SWABLU - .2byte SPECIES_SWALOT - .2byte SPECIES_SWAMPERT - .2byte SPECIES_SWELLOW - .2byte SPECIES_TAILLOW - .2byte SPECIES_TENTACOOL - .2byte SPECIES_TENTACRUEL - .2byte SPECIES_TORCHIC - .2byte SPECIES_TORKOAL - .2byte SPECIES_TRAPINCH - .2byte SPECIES_TREECKO - .2byte SPECIES_TROPIUS - .2byte SPECIES_VIBRAVA - .2byte SPECIES_VIGOROTH - .2byte SPECIES_VILEPLUME - .2byte SPECIES_VOLBEAT - .2byte SPECIES_VOLTORB - .2byte SPECIES_VULPIX - .2byte SPECIES_WAILMER - .2byte SPECIES_WAILORD - .2byte SPECIES_WALREIN - .2byte SPECIES_WEEZING - .2byte SPECIES_WHISCASH - .2byte SPECIES_WHISMUR - .2byte SPECIES_WIGGLYTUFF - .2byte SPECIES_WINGULL - .2byte SPECIES_WOBBUFFET - .2byte SPECIES_WURMPLE - .2byte SPECIES_WYNAUT - .2byte SPECIES_XATU - .2byte SPECIES_ZANGOOSE - .2byte SPECIES_ZIGZAGOON - .2byte SPECIES_ZUBAT diff --git a/data/text/easy_chat/easy_chat_group_pokemon2.s b/data/text/easy_chat/easy_chat_group_pokemon2.s deleted file mode 100644 index e2f58e4967..0000000000 --- a/data/text/easy_chat/easy_chat_group_pokemon2.s +++ /dev/null @@ -1,253 +0,0 @@ - .align 2 -gEasyChatGroup_Pokemon2:: @ 859CE0C - .2byte SPECIES_ABRA - .2byte SPECIES_AERODACTYL - .2byte SPECIES_AIPOM - .2byte SPECIES_ALAKAZAM - .2byte SPECIES_AMPHAROS - .2byte SPECIES_ARBOK - .2byte SPECIES_ARCANINE - .2byte SPECIES_ARIADOS - .2byte SPECIES_ARTICUNO - .2byte SPECIES_AZUMARILL - .2byte SPECIES_BAYLEEF - .2byte SPECIES_BEEDRILL - .2byte SPECIES_BELLOSSOM - .2byte SPECIES_BELLSPROUT - .2byte SPECIES_BLASTOISE - .2byte SPECIES_BLISSEY - .2byte SPECIES_BULBASAUR - .2byte SPECIES_BUTTERFREE - .2byte SPECIES_CATERPIE - .2byte SPECIES_CELEBI - .2byte SPECIES_CHANSEY - .2byte SPECIES_CHARIZARD - .2byte SPECIES_CHARMANDER - .2byte SPECIES_CHARMELEON - .2byte SPECIES_CHIKORITA - .2byte SPECIES_CHINCHOU - .2byte SPECIES_CLEFABLE - .2byte SPECIES_CLEFAIRY - .2byte SPECIES_CLEFFA - .2byte SPECIES_CLOYSTER - .2byte SPECIES_CORSOLA - .2byte SPECIES_CROBAT - .2byte SPECIES_CROCONAW - .2byte SPECIES_CUBONE - .2byte SPECIES_CYNDAQUIL - .2byte SPECIES_DELIBIRD - .2byte SPECIES_DEWGONG - .2byte SPECIES_DIGLETT - .2byte SPECIES_DITTO - .2byte SPECIES_DODRIO - .2byte SPECIES_DODUO - .2byte SPECIES_DONPHAN - .2byte SPECIES_DRAGONAIR - .2byte SPECIES_DRAGONITE - .2byte SPECIES_DRATINI - .2byte SPECIES_DROWZEE - .2byte SPECIES_DUGTRIO - .2byte SPECIES_DUNSPARCE - .2byte SPECIES_EEVEE - .2byte SPECIES_EKANS - .2byte SPECIES_ELECTABUZZ - .2byte SPECIES_ELECTRODE - .2byte SPECIES_ELEKID - .2byte SPECIES_ENTEI - .2byte SPECIES_ESPEON - .2byte SPECIES_EXEGGCUTE - .2byte SPECIES_EXEGGUTOR - .2byte SPECIES_FARFETCHD - .2byte SPECIES_FEAROW - .2byte SPECIES_FERALIGATR - .2byte SPECIES_FLAAFFY - .2byte SPECIES_FLAREON - .2byte SPECIES_FORRETRESS - .2byte SPECIES_FURRET - .2byte SPECIES_GASTLY - .2byte SPECIES_GENGAR - .2byte SPECIES_GEODUDE - .2byte SPECIES_GIRAFARIG - .2byte SPECIES_GLIGAR - .2byte SPECIES_GLOOM - .2byte SPECIES_GOLBAT - .2byte SPECIES_GOLDEEN - .2byte SPECIES_GOLDUCK - .2byte SPECIES_GOLEM - .2byte SPECIES_GRANBULL - .2byte SPECIES_GRAVELER - .2byte SPECIES_GRIMER - .2byte SPECIES_GROWLITHE - .2byte SPECIES_GYARADOS - .2byte SPECIES_HAUNTER - .2byte SPECIES_HERACROSS - .2byte SPECIES_HITMONCHAN - .2byte SPECIES_HITMONLEE - .2byte SPECIES_HITMONTOP - .2byte SPECIES_HO_OH - .2byte SPECIES_HOOTHOOT - .2byte SPECIES_HOPPIP - .2byte SPECIES_HORSEA - .2byte SPECIES_HOUNDOOM - .2byte SPECIES_HOUNDOUR - .2byte SPECIES_HYPNO - .2byte SPECIES_IGGLYBUFF - .2byte SPECIES_IVYSAUR - .2byte SPECIES_JIGGLYPUFF - .2byte SPECIES_JOLTEON - .2byte SPECIES_JUMPLUFF - .2byte SPECIES_JYNX - .2byte SPECIES_KABUTO - .2byte SPECIES_KABUTOPS - .2byte SPECIES_KADABRA - .2byte SPECIES_KAKUNA - .2byte SPECIES_KANGASKHAN - .2byte SPECIES_KINGDRA - .2byte SPECIES_KINGLER - .2byte SPECIES_KOFFING - .2byte SPECIES_KRABBY - .2byte SPECIES_LANTURN - .2byte SPECIES_LAPRAS - .2byte SPECIES_LARVITAR - .2byte SPECIES_LEDIAN - .2byte SPECIES_LEDYBA - .2byte SPECIES_LICKITUNG - .2byte SPECIES_LUGIA - .2byte SPECIES_MACHAMP - .2byte SPECIES_MACHOKE - .2byte SPECIES_MACHOP - .2byte SPECIES_MAGBY - .2byte SPECIES_MAGCARGO - .2byte SPECIES_MAGIKARP - .2byte SPECIES_MAGMAR - .2byte SPECIES_MAGNEMITE - .2byte SPECIES_MAGNETON - .2byte SPECIES_MANKEY - .2byte SPECIES_MANTINE - .2byte SPECIES_MAREEP - .2byte SPECIES_MARILL - .2byte SPECIES_MAROWAK - .2byte SPECIES_MEGANIUM - .2byte SPECIES_MEOWTH - .2byte SPECIES_METAPOD - .2byte SPECIES_MEW - .2byte SPECIES_MEWTWO - .2byte SPECIES_MILTANK - .2byte SPECIES_MISDREAVUS - .2byte SPECIES_MOLTRES - .2byte SPECIES_MR_MIME - .2byte SPECIES_MUK - .2byte SPECIES_MURKROW - .2byte SPECIES_NATU - .2byte SPECIES_NIDOKING - .2byte SPECIES_NIDOQUEEN - .2byte SPECIES_NIDORAN_F - .2byte SPECIES_NIDORAN_M - .2byte SPECIES_NIDORINA - .2byte SPECIES_NIDORINO - .2byte SPECIES_NINETALES - .2byte SPECIES_NOCTOWL - .2byte SPECIES_OCTILLERY - .2byte SPECIES_ODDISH - .2byte SPECIES_OMANYTE - .2byte SPECIES_OMASTAR - .2byte SPECIES_ONIX - .2byte SPECIES_PARAS - .2byte SPECIES_PARASECT - .2byte SPECIES_PERSIAN - .2byte SPECIES_PHANPY - .2byte SPECIES_PICHU - .2byte SPECIES_PIDGEOT - .2byte SPECIES_PIDGEOTTO - .2byte SPECIES_PIDGEY - .2byte SPECIES_PIKACHU - .2byte SPECIES_PILOSWINE - .2byte SPECIES_PINECO - .2byte SPECIES_PINSIR - .2byte SPECIES_POLITOED - .2byte SPECIES_POLIWAG - .2byte SPECIES_POLIWHIRL - .2byte SPECIES_POLIWRATH - .2byte SPECIES_PONYTA - .2byte SPECIES_PORYGON - .2byte SPECIES_PORYGON2 - .2byte SPECIES_PRIMEAPE - .2byte SPECIES_PSYDUCK - .2byte SPECIES_PUPITAR - .2byte SPECIES_QUAGSIRE - .2byte SPECIES_QUILAVA - .2byte SPECIES_QWILFISH - .2byte SPECIES_RAICHU - .2byte SPECIES_RAIKOU - .2byte SPECIES_RAPIDASH - .2byte SPECIES_RATICATE - .2byte SPECIES_RATTATA - .2byte SPECIES_REMORAID - .2byte SPECIES_RHYDON - .2byte SPECIES_RHYHORN - .2byte SPECIES_SANDSHREW - .2byte SPECIES_SANDSLASH - .2byte SPECIES_SCIZOR - .2byte SPECIES_SCYTHER - .2byte SPECIES_SEADRA - .2byte SPECIES_SEAKING - .2byte SPECIES_SEEL - .2byte SPECIES_SENTRET - .2byte SPECIES_SHELLDER - .2byte SPECIES_SHUCKLE - .2byte SPECIES_SKARMORY - .2byte SPECIES_SKIPLOOM - .2byte SPECIES_SLOWBRO - .2byte SPECIES_SLOWKING - .2byte SPECIES_SLOWPOKE - .2byte SPECIES_SLUGMA - .2byte SPECIES_SMEARGLE - .2byte SPECIES_SMOOCHUM - .2byte SPECIES_SNEASEL - .2byte SPECIES_SNORLAX - .2byte SPECIES_SNUBBULL - .2byte SPECIES_SPEAROW - .2byte SPECIES_SPINARAK - .2byte SPECIES_SQUIRTLE - .2byte SPECIES_STANTLER - .2byte SPECIES_STARMIE - .2byte SPECIES_STARYU - .2byte SPECIES_STEELIX - .2byte SPECIES_SUDOWOODO - .2byte SPECIES_SUICUNE - .2byte SPECIES_SUNFLORA - .2byte SPECIES_SUNKERN - .2byte SPECIES_SWINUB - .2byte SPECIES_TANGELA - .2byte SPECIES_TAUROS - .2byte SPECIES_TEDDIURSA - .2byte SPECIES_TENTACOOL - .2byte SPECIES_TENTACRUEL - .2byte SPECIES_TOGEPI - .2byte SPECIES_TOGETIC - .2byte SPECIES_TOTODILE - .2byte SPECIES_TYPHLOSION - .2byte SPECIES_TYRANITAR - .2byte SPECIES_TYROGUE - .2byte SPECIES_UMBREON - .2byte SPECIES_UNOWN - .2byte SPECIES_URSARING - .2byte SPECIES_VAPOREON - .2byte SPECIES_VENOMOTH - .2byte SPECIES_VENONAT - .2byte SPECIES_VENUSAUR - .2byte SPECIES_VICTREEBEL - .2byte SPECIES_VILEPLUME - .2byte SPECIES_VOLTORB - .2byte SPECIES_VULPIX - .2byte SPECIES_WARTORTLE - .2byte SPECIES_WEEDLE - .2byte SPECIES_WEEPINBELL - .2byte SPECIES_WEEZING - .2byte SPECIES_WIGGLYTUFF - .2byte SPECIES_WOBBUFFET - .2byte SPECIES_WOOPER - .2byte SPECIES_XATU - .2byte SPECIES_YANMA - .2byte SPECIES_ZAPDOS - .2byte SPECIES_ZUBAT diff --git a/data/text/easy_chat/easy_chat_group_speech.s b/data/text/easy_chat/easy_chat_group_speech.s deleted file mode 100644 index 4cfea7eca9..0000000000 --- a/data/text/easy_chat/easy_chat_group_speech.s +++ /dev/null @@ -1,421 +0,0 @@ -gEasyChatWord_Listen:: @ 8599CE8 - .string "LISTEN$" - -gEasyChatWord_NotVery:: @ 8599CEF - .string "NOT VERY$" - -gEasyChatWord_Mean:: @ 8599CF8 - .string "MEAN$" - -gEasyChatWord_Lie:: @ 8599CFD - .string "LIE$" - -gEasyChatWord_Lay:: @ 8599D01 - .string "LAY$" - -gEasyChatWord_Recommend:: @ 8599D05 - .string "RECOMMEND$" - -gEasyChatWord_Nitwit:: @ 8599D0F - .string "NITWIT$" - -gEasyChatWord_Quite:: @ 8599D16 - .string "QUITE$" - -gEasyChatWord_From:: @ 8599D1C - .string "FROM$" - -gEasyChatWord_Feeling:: @ 8599D21 - .string "FEELING$" - -gEasyChatWord_But:: @ 8599D29 - .string "BUT$" - -gEasyChatWord_However:: @ 8599D2D - .string "HOWEVER$" - -gEasyChatWord_Case:: @ 8599D35 - .string "CASE$" - -gEasyChatWord_The:: @ 8599D3A - .string "THE$" - -gEasyChatWord_Miss:: @ 8599D3E - .string "MISS$" - -gEasyChatWord_How:: @ 8599D43 - .string "HOW$" - -gEasyChatWord_Hit:: @ 8599D47 - .string "HIT$" - -gEasyChatWord_Enough:: @ 8599D4B - .string "ENOUGH$" - -gEasyChatWord_ALot:: @ 8599D52 - .string "A LOT$" - -gEasyChatWord_ALittle:: @ 8599D58 - .string "A LITTLE$" - -gEasyChatWord_Absolutely:: @ 8599D61 - .string "ABSOLUTELY$" - -gEasyChatWord_And:: @ 8599D6C - .string "AND$" - -gEasyChatWord_Only:: @ 8599D70 - .string "ONLY$" - -gEasyChatWord_Around:: @ 8599D75 - .string "AROUND$" - -gEasyChatWord_Probably:: @ 8599D7C - .string "PROBABLY$" - -gEasyChatWord_If:: @ 8599D85 - .string "IF$" - -gEasyChatWord_Very:: @ 8599D88 - .string "VERY$" - -gEasyChatWord_ATinyBit:: @ 8599D8D - .string "A TINY BIT$" - -gEasyChatWord_Wild:: @ 8599D98 - .string "WILD$" - -gEasyChatWord_Thats:: @ 8599D9D - .string "THAT'S$" - -gEasyChatWord_Just:: @ 8599DA4 - .string "JUST$" - -gEasyChatWord_EvenSo:: @ 8599DA9 - .string "EVEN SO,$" - -gEasyChatWord_MustBe:: @ 8599DB2 - .string "MUST BE$" - -gEasyChatWord_Naturally:: @ 8599DBA - .string "NATURALLY$" - -gEasyChatWord_ForNow:: @ 8599DC4 - .string "FOR NOW,$" - -gEasyChatWord_Understood:: @ 8599DCD - .string "UNDERSTOOD$" - -gEasyChatWord_Joking:: @ 8599DD8 - .string "JOKING$" - -gEasyChatWord_Ready:: @ 8599DDF - .string "READY$" - -gEasyChatWord_Something:: @ 8599DE5 - .string "SOMETHING$" - -gEasyChatWord_Somehow:: @ 8599DEF - .string "SOMEHOW$" - -gEasyChatWord_Although:: @ 8599DF7 - .string "ALTHOUGH$" - -gEasyChatWord_Also:: @ 8599E00 - .string "ALSO$" - -gEasyChatWord_Perfect:: @ 8599E05 - .string "PERFECT$" - -gEasyChatWord_AsMuchAs:: @ 8599E0D - .string "AS MUCH AS$" - -gEasyChatWord_Really:: @ 8599E18 - .string "REALLY$" - -gEasyChatWord_Truly:: @ 8599E1F - .string "TRULY$" - -gEasyChatWord_Seriously:: @ 8599E25 - .string "SERIOUSLY$" - -gEasyChatWord_Totally:: @ 8599E2F - .string "TOTALLY$" - -gEasyChatWord_Until:: @ 8599E37 - .string "UNTIL$" - -gEasyChatWord_AsIf:: @ 8599E3D - .string "AS IF$" - -gEasyChatWord_Mood:: @ 8599E43 - .string "MOOD$" - -gEasyChatWord_Rather:: @ 8599E48 - .string "RATHER$" - -gEasyChatWord_Awfully:: @ 8599E4F - .string "AWFULLY$" - -gEasyChatWord_Mode:: @ 8599E57 - .string "MODE$" - -gEasyChatWord_More:: @ 8599E5C - .string "MORE$" - -gEasyChatWord_TooLate:: @ 8599E61 - .string "TOO LATE$" - -gEasyChatWord_Finally:: @ 8599E6A - .string "FINALLY$" - -gEasyChatWord_Any:: @ 8599E72 - .string "ANY$" - -gEasyChatWord_Instead:: @ 8599E76 - .string "INSTEAD$" - -gEasyChatWord_Fantastic:: @ 8599E7E - .string "FANTASTIC$" - - .align 2 -gEasyChatGroup_Speech:: @ 8599E88 - .4byte gEasyChatWord_Listen - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_NotVery - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mean - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lie - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lay - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Recommend - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nitwit - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Quite - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_From - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Feeling - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_But - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_However - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Case - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_The - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Miss - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_How - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hit - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Enough - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ALot - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ALittle - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Absolutely - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_And - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Only - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Around - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Probably - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_If - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Very - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ATinyBit - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wild - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thats - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Just - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_EvenSo - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_MustBe - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Naturally - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ForNow - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Understood - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Joking - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ready - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Something - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Somehow - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Although - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Also - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Perfect - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_AsMuchAs - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Really - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Truly - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Seriously - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Totally - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Until - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_AsIf - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mood - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rather - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Awfully - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mode - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_More - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TooLate - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Finally - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Any - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Instead - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fantastic - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_status.s b/data/text/easy_chat/easy_chat_group_status.s deleted file mode 100644 index db945423f7..0000000000 --- a/data/text/easy_chat/easy_chat_group_status.s +++ /dev/null @@ -1,764 +0,0 @@ -gEasyChatWord_Dark:: @ 8598234 - .string "DARK$" - -gEasyChatWord_Stench:: @ 8598239 - .string "STENCH$" - -gEasyChatWord_ThickFat:: @ 8598240 - .string "THICK FAT$" - -gEasyChatWord_RainDish:: @ 859824A - .string "RAIN DISH$" - -gEasyChatWord_Drizzle:: @ 8598254 - .string "DRIZZLE$" - -gEasyChatWord_ArenaTrap:: @ 859825C - .string "ARENA TRAP$" - -gEasyChatWord_Intimidate:: @ 8598267 - .string "INTIMIDATE$" - -gEasyChatWord_RockHead:: @ 8598272 - .string "ROCK HEAD$" - -gEasyChatWord_Color:: @ 859827C - .string "COLOR$" - -gEasyChatWord_AltColor:: @ 8598282 - .string "ALT. COLOR$" - -gEasyChatWord_Rock:: @ 859828D - .string "ROCK$" - -gEasyChatWord_Beautiful:: @ 8598292 - .string "BEAUTIFUL$" - -gEasyChatWord_Beauty:: @ 859829C - .string "BEAUTY$" - -gEasyChatWord_AirLock:: @ 85982A3 - .string "AIR LOCK$" - -gEasyChatWord_Psychic:: @ 85982AC - .string "PSYCHIC$" - -gEasyChatWord_HyperCutter:: @ 85982B4 - .string "HYPER CUTTER$" - -gEasyChatWord_Fighting:: @ 85982C1 - .string "FIGHTING$" - -gEasyChatWord_ShadowTag:: @ 85982CA - .string "SHADOW TAG$" - -gEasyChatWord_Smart:: @ 85982D5 - .string "SMART$" - -gEasyChatWord_Smartness:: @ 85982DB - .string "SMARTNESS$" - -gEasyChatWord_SpeedBoost:: @ 85982E5 - .string "SPEED BOOST$" - -gEasyChatWord_Cool:: @ 85982F1 - .string "COOL$" - -gEasyChatWord_Coolness:: @ 85982F6 - .string "COOLNESS$" - -gEasyChatWord_BattleArmor:: @ 85982FF - .string "BATTLE ARMOR$" - -gEasyChatWord_Cute:: @ 859830C - .string "CUTE$" - -gEasyChatWord_Cuteness:: @ 8598311 - .string "CUTENESS$" - -gEasyChatWord_Sturdy:: @ 859831A - .string "STURDY$" - -gEasyChatWord_SuctionCups:: @ 8598321 - .string "SUCTION CUPS$" - -gEasyChatWord_Grass:: @ 859832E - .string "GRASS$" - -gEasyChatWord_ClearBody:: @ 8598334 - .string "CLEAR BODY$" - -gEasyChatWord_Torrent:: @ 859833F - .string "TORRENT$" - -gEasyChatWord_Ghost:: @ 8598347 - .string "GHOST$" - -gEasyChatWord_Ice:: @ 859834D - .string "ICE$" - -gEasyChatWord_Guts:: @ 8598351 - .string "GUTS$" - -gEasyChatWord_RoughSkin:: @ 8598356 - .string "ROUGH SKIN$" - -gEasyChatWord_ShellArmor:: @ 8598361 - .string "SHELL ARMOR$" - -gEasyChatWord_NaturalCure:: @ 859836D - .string "NATURAL CURE$" - -gEasyChatWord_Damp:: @ 859837A - .string "DAMP$" - -gEasyChatWord_Ground:: @ 859837F - .string "GROUND$" - -gEasyChatWord_Limber:: @ 8598386 - .string "LIMBER$" - -gEasyChatWord_MagnetPull:: @ 859838D - .string "MAGNET PULL$" - -gEasyChatWord_WhiteSmoke:: @ 8598399 - .string "WHITE SMOKE$" - -gEasyChatWord_Synchronize:: @ 85983A5 - .string "SYNCHRONIZE$" - -gEasyChatWord_Overgrow:: @ 85983B1 - .string "OVERGROW$" - -gEasyChatWord_SwiftSwim:: @ 85983BA - .string "SWIFT SWIM$" - -gEasyChatWord_SandStream:: @ 85983C5 - .string "SAND STREAM$" - -gEasyChatWord_SandVeil:: @ 85983D1 - .string "SAND VEIL$" - -gEasyChatWord_KeenEye:: @ 85983DB - .string "KEEN EYE$" - -gEasyChatWord_InnerFocus:: @ 85983E4 - .string "INNER FOCUS$" - -gEasyChatWord_Static:: @ 85983F0 - .string "STATIC$" - -gEasyChatWord_Type:: @ 85983F7 - .string "TYPE$" - -gEasyChatWord_Tough:: @ 85983FC - .string "TOUGH$" - -gEasyChatWord_Toughness:: @ 8598402 - .string "TOUGHNESS$" - -gEasyChatWord_ShedSkin:: @ 859840C - .string "SHED SKIN$" - -gEasyChatWord_HugePower:: @ 8598416 - .string "HUGE POWER$" - -gEasyChatWord_VoltAbsorb:: @ 8598421 - .string "VOLT ABSORB$" - -gEasyChatWord_WaterAbsorb:: @ 859842D - .string "WATER ABSORB$" - -gEasyChatWord_Electric:: @ 859843A - .string "ELECTRIC$" - -gEasyChatWord_Forecast:: @ 8598443 - .string "FORECAST$" - -gEasyChatWord_SereneGrace:: @ 859844C - .string "SERENE GRACE$" - -gEasyChatWord_Poison:: @ 8598459 - .string "POISON$" - -gEasyChatWord_PoisonPoint:: @ 8598460 - .string "POISON POINT$" - -gEasyChatWord_Dragon:: @ 859846D - .string "DRAGON$" - -gEasyChatWord_Trace:: @ 8598474 - .string "TRACE$" - -gEasyChatWord_Oblivious:: @ 859847A - .string "OBLIVIOUS$" - -gEasyChatWord_Truant:: @ 8598484 - .string "TRUANT$" - -gEasyChatWord_RunAway:: @ 859848B - .string "RUN AWAY$" - -gEasyChatWord_StickyHold:: @ 8598494 - .string "STICKY HOLD$" - -gEasyChatWord_CloudNine:: @ 85984A0 - .string "CLOUD NINE$" - -gEasyChatWord_Normal:: @ 85984AB - .string "NORMAL$" - -gEasyChatWord_Steel:: @ 85984B2 - .string "STEEL$" - -gEasyChatWord_Illuminate:: @ 85984B8 - .string "ILLUMINATE$" - -gEasyChatWord_EarlyBird:: @ 85984C3 - .string "EARLY BIRD$" - -gEasyChatWord_Hustle:: @ 85984CE - .string "HUSTLE$" - -gEasyChatWord_Shine:: @ 85984D5 - .string "SHINE$" - -gEasyChatWord_Flying:: @ 85984DB - .string "FLYING$" - -gEasyChatWord_Drought:: @ 85984E2 - .string "DROUGHT$" - -gEasyChatWord_Lightningrod:: @ 85984EA - .string "LIGHTNINGROD$" - -gEasyChatWord_Compoundeyes:: @ 85984F7 - .string "COMPOUNDEYES$" - -gEasyChatWord_MarvelScale:: @ 8598504 - .string "MARVEL SCALE$" - -gEasyChatWord_WonderGuard:: @ 8598511 - .string "WONDER GUARD$" - -gEasyChatWord_Insomnia:: @ 859851E - .string "INSOMNIA$" - -gEasyChatWord_Levitate:: @ 8598527 - .string "LEVITATE$" - -gEasyChatWord_Plus:: @ 8598530 - .string "PLUS$" - -gEasyChatWord_Pressure:: @ 8598535 - .string "PRESSURE$" - -gEasyChatWord_LiquidOoze:: @ 859853E - .string "LIQUID OOZE$" - -gEasyChatWord_ColorChange:: @ 859854A - .string "COLOR CHANGE$" - -gEasyChatWord_Soundproof:: @ 8598557 - .string "SOUNDPROOF$" - -gEasyChatWord_EffectSpore:: @ 8598562 - .string "EFFECT SPORE$" - -gEasyChatWord_Pkrs:: @ 859856F - .string "{PK}RS$" - -gEasyChatWord_Fire:: @ 8598573 - .string "FIRE$" - -gEasyChatWord_FlameBody:: @ 8598578 - .string "FLAME BODY$" - -gEasyChatWord_Minus:: @ 8598583 - .string "MINUS$" - -gEasyChatWord_OwnTempo:: @ 8598589 - .string "OWN TEMPO$" - -gEasyChatWord_MagmaArmor:: @ 8598593 - .string "MAGMA ARMOR$" - -gEasyChatWord_Water:: @ 859859F - .string "WATER$" - -gEasyChatWord_WaterVeil:: @ 85985A5 - .string "WATER VEIL$" - -gEasyChatWord_Bug:: @ 85985B0 - .string "BUG$" - -gEasyChatWord_Swarm:: @ 85985B4 - .string "SWARM$" - -gEasyChatWord_CuteCharm:: @ 85985BA - .string "CUTE CHARM$" - -gEasyChatWord_Immunity:: @ 85985C5 - .string "IMMUNITY$" - -gEasyChatWord_Blaze:: @ 85985CE - .string "BLAZE$" - -gEasyChatWord_Pickup:: @ 85985D4 - .string "PICKUP$" - -gEasyChatWord_Pattern:: @ 85985DB - .string "PATTERN$" - -gEasyChatWord_FlashFire:: @ 85985E3 - .string "FLASH FIRE$" - -gEasyChatWord_VitalSpirit:: @ 85985EE - .string "VITAL SPIRIT$" - -gEasyChatWord_Chlorophyll:: @ 85985FB - .string "CHLOROPHYLL$" - -gEasyChatWord_PurePower:: @ 8598607 - .string "PURE POWER$" - -gEasyChatWord_ShieldDust:: @ 8598612 - .string "SHIELD DUST$" - - .align 2 -gEasyChatGroup_Status:: @ 8598620 - .4byte gEasyChatWord_Dark - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Stench - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThickFat - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_RainDish - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Drizzle - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ArenaTrap - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Intimidate - .4byte 101 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_RockHead - .4byte 97 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Color - .4byte 106 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_AltColor - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rock - .4byte 68 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Beautiful - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Beauty - .4byte 86 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_AirLock - .4byte 78 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Psychic - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HyperCutter - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fighting - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ShadowTag - .4byte 99 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Smart - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Smartness - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SpeedBoost - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cool - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Coolness - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_BattleArmor - .4byte 76 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cute - .4byte 72 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cuteness - .4byte 88 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sturdy - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SuctionCups - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Grass - .4byte 90 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ClearBody - .4byte 91 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Torrent - .4byte 104 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ghost - .4byte 75 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ice - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Guts - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_RoughSkin - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ShellArmor - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_NaturalCure - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Damp - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ground - .4byte 73 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Limber - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_MagnetPull - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WhiteSmoke - .4byte 71 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Synchronize - .4byte 100 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Overgrow - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SwiftSwim - .4byte 81 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SandStream - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SandVeil - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_KeenEye - .4byte 82 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_InnerFocus - .4byte 77 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Static - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Type - .4byte 85 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tough - .4byte 94 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Toughness - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ShedSkin - .4byte 79 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HugePower - .4byte 92 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_VoltAbsorb - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WaterAbsorb - .4byte 69 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Electric - .4byte 64 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Forecast - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SereneGrace - .4byte 93 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Poison - .4byte 103 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_PoisonPoint - .4byte 102 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dragon - .4byte 89 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Trace - .4byte 83 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Oblivious - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Truant - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_RunAway - .4byte 84 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_StickyHold - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_CloudNine - .4byte 107 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Normal - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Steel - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Illuminate - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_EarlyBird - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hustle - .4byte 66 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shine - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Flying - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Drought - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lightningrod - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Compoundeyes - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_MarvelScale - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WonderGuard - .4byte 108 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Insomnia - .4byte 74 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Levitate - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Plus - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pressure - .4byte 87 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_LiquidOoze - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ColorChange - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Soundproof - .4byte 70 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_EffectSpore - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pkrs - .4byte 67 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fire - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_FlameBody - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Minus - .4byte 98 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OwnTempo - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_MagmaArmor - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Water - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WaterVeil - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Bug - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Swarm - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_CuteCharm - .4byte 63 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Immunity - .4byte 65 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Blaze - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pickup - .4byte 105 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pattern - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_FlashFire - .4byte 95 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_VitalSpirit - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Chlorophyll - .4byte 96 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_PurePower - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ShieldDust - .4byte 80 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_time.s b/data/text/easy_chat/easy_chat_group_time.s deleted file mode 100644 index 1604eaf501..0000000000 --- a/data/text/easy_chat/easy_chat_group_time.s +++ /dev/null @@ -1,316 +0,0 @@ -gEasyChatWord_Fall:: @ 859BD64 - .string "FALL$" - -gEasyChatWord_Morning:: @ 859BD69 - .string "MORNING$" - -gEasyChatWord_Tomorrow:: @ 859BD71 - .string "TOMORROW$" - -gEasyChatWord_Last:: @ 859BD7A - .string "LAST$" - -gEasyChatWord_Day:: @ 859BD7F - .string "DAY$" - -gEasyChatWord_Sometime:: @ 859BD83 - .string "SOMETIME$" - -gEasyChatWord_Always:: @ 859BD8C - .string "ALWAYS$" - -gEasyChatWord_Current:: @ 859BD93 - .string "CURRENT$" - -gEasyChatWord_Forever:: @ 859BD9B - .string "FOREVER$" - -gEasyChatWord_Days:: @ 859BDA3 - .string "DAYS$" - -gEasyChatWord_End:: @ 859BDA8 - .string "END$" - -gEasyChatWord_Tuesday:: @ 859BDAC - .string "TUESDAY$" - -gEasyChatWord_Yesterday:: @ 859BDB4 - .string "YESTERDAY$" - -gEasyChatWord_Today:: @ 859BDBE - .string "TODAY$" - -gEasyChatWord_Friday:: @ 859BDC4 - .string "FRIDAY$" - -gEasyChatWord_Monday:: @ 859BDCB - .string "MONDAY$" - -gEasyChatWord_Later:: @ 859BDD2 - .string "LATER$" - -gEasyChatWord_Earlier:: @ 859BDD8 - .string "EARLIER$" - -gEasyChatWord_Another:: @ 859BDE0 - .string "ANOTHER$" - -gEasyChatWord_Time:: @ 859BDE8 - .string "TIME$" - -gEasyChatWord_Finish:: @ 859BDED - .string "FINISH$" - -gEasyChatWord_Wednesday:: @ 859BDF4 - .string "WEDNESDAY$" - -gEasyChatWord_Soon:: @ 859BDFE - .string "SOON$" - -gEasyChatWord_Start:: @ 859BE03 - .string "START$" - -gEasyChatWord_Month:: @ 859BE09 - .string "MONTH$" - -gEasyChatWord_Stop:: @ 859BE0F - .string "STOP$" - -gEasyChatWord_Now:: @ 859BE14 - .string "NOW$" - -gEasyChatWord_Final:: @ 859BE18 - .string "FINAL$" - -gEasyChatWord_Next:: @ 859BE1E - .string "NEXT$" - -gEasyChatWord_Age:: @ 859BE23 - .string "AGE$" - -gEasyChatWord_Saturday:: @ 859BE27 - .string "SATURDAY$" - -gEasyChatWord_Summer:: @ 859BE30 - .string "SUMMER$" - -gEasyChatWord_Sunday:: @ 859BE37 - .string "SUNDAY$" - -gEasyChatWord_Beginning:: @ 859BE3E - .string "BEGINNING$" - -gEasyChatWord_Spring:: @ 859BE48 - .string "SPRING$" - -gEasyChatWord_Daytime:: @ 859BE4F - .string "DAYTIME$" - -gEasyChatWord_Winter:: @ 859BE57 - .string "WINTER$" - -gEasyChatWord_Daily:: @ 859BE5E - .string "DAILY$" - -gEasyChatWord_Olden:: @ 859BE64 - .string "OLDEN$" - -gEasyChatWord_Almost:: @ 859BE6A - .string "ALMOST$" - -gEasyChatWord_Nearly:: @ 859BE71 - .string "NEARLY$" - -gEasyChatWord_Thursday:: @ 859BE78 - .string "THURSDAY$" - -gEasyChatWord_Nighttime:: @ 859BE81 - .string "NIGHTTIME$" - -gEasyChatWord_Night:: @ 859BE8B - .string "NIGHT$" - -gEasyChatWord_Week:: @ 859BE91 - .string "WEEK$" - - .align 2 -gEasyChatGroup_Time:: @ 859BE98 - .4byte gEasyChatWord_Fall - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Morning - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tomorrow - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Last - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Day - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sometime - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Always - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Current - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Forever - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Days - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_End - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tuesday - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yesterday - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Today - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Friday - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Monday - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Later - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Earlier - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Another - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Time - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Finish - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wednesday - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Soon - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Start - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Month - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Stop - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Now - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Final - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Next - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Age - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Saturday - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Summer - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sunday - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Beginning - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Spring - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Daytime - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Winter - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Daily - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Olden - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Almost - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nearly - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thursday - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nighttime - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Night - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Week - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_trainer.s b/data/text/easy_chat/easy_chat_group_trainer.s deleted file mode 100644 index 23a3b0b6a4..0000000000 --- a/data/text/easy_chat/easy_chat_group_trainer.s +++ /dev/null @@ -1,190 +0,0 @@ -gEasyChatWord_IChooseYou:: @ 8598030 - .string "I CHOOSE YOU$" - -gEasyChatWord_Gotcha:: @ 859803D - .string "GOTCHA$" - -gEasyChatWord_Trade:: @ 8598044 - .string "TRADE$" - -gEasyChatWord_Sapphire:: @ 859804A - .string "SAPPHIRE$" - -gEasyChatWord_Evolve:: @ 8598053 - .string "EVOLVE$" - -gEasyChatWord_Encyclopedia:: @ 859805A - .string "ENCYCLOPEDIA$" - -gEasyChatWord_Nature:: @ 8598067 - .string "NATURE$" - -gEasyChatWord_Center:: @ 859806E - .string "CENTER$" - -gEasyChatWord_Egg:: @ 8598075 - .string "EGG$" - -gEasyChatWord_Link:: @ 8598079 - .string "LINK$" - -gEasyChatWord_SpAbility:: @ 859807E - .string "SP. ABILITY$" - -gEasyChatWord_Trainer:: @ 859808A - .string "TRAINER$" - -gEasyChatWord_Version:: @ 8598092 - .string "VERSION$" - -gEasyChatWord_Pokenav:: @ 859809A - .string "POKéNAV$" - -gEasyChatWord_Pokemon:: @ 85980A2 - .string "POKéMON$" - -gEasyChatWord_Get:: @ 85980AA - .string "GET$" - -gEasyChatWord_Pokedex:: @ 85980AE - .string "POKéDEX$" - -gEasyChatWord_Ruby:: @ 85980B6 - .string "RUBY$" - -gEasyChatWord_Level:: @ 85980BB - .string "LEVEL$" - -gEasyChatWord_Red:: @ 85980C1 - .string "RED$" - -gEasyChatWord_Green:: @ 85980C5 - .string "GREEN$" - -gEasyChatWord_Bag:: @ 85980CB - .string "BAG$" - -gEasyChatWord_Flame:: @ 85980CF - .string "FLAME$" - -gEasyChatWord_Gold:: @ 85980D5 - .string "GOLD$" - -gEasyChatWord_Leaf:: @ 85980DA - .string "LEAF$" - -gEasyChatWord_Silver:: @ 85980DF - .string "SILVER$" - -gEasyChatWord_Emerald:: @ 85980E6 - .string "EMERALD$" - - .align 2 -gEasyChatGroup_Trainer:: @ 85980F0 - .4byte gEasyChatWord_IChooseYou - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gotcha - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Trade - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sapphire - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Evolve - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Encyclopedia - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nature - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Center - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Egg - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Link - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SpAbility - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Trainer - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Version - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pokenav - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pokemon - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Get - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pokedex - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ruby - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Level - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Red - .4byte 19 @ alphabetical order - .4byte FALSE @ enabled - - .4byte gEasyChatWord_Green - .4byte 17 @ alphabetical order - .4byte FALSE @ enabled - - .4byte gEasyChatWord_Bag - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Flame - .4byte 25 @ alphabetical order - .4byte FALSE @ enabled - - .4byte gEasyChatWord_Gold - .4byte 10 @ alphabetical order - .4byte FALSE @ enabled - - .4byte gEasyChatWord_Leaf - .4byte 2 @ alphabetical order - .4byte FALSE @ enabled - - .4byte gEasyChatWord_Silver - .4byte 11 @ alphabetical order - .4byte FALSE @ enabled - - .4byte gEasyChatWord_Emerald - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_trendy_saying.s b/data/text/easy_chat/easy_chat_group_trendy_saying.s deleted file mode 100644 index 3e9f7291e3..0000000000 --- a/data/text/easy_chat/easy_chat_group_trendy_saying.s +++ /dev/null @@ -1,232 +0,0 @@ -gEasyChatWord_KthxBye:: @ 859CB88 - .string "KTHX, BYE.$" - -gEasyChatWord_YesSirExcl:: @ 859CB93 - .string "YES, SIR!$" - -gEasyChatWord_AvantGarde:: @ 859CB9D - .string "AVANT GARDE$" - -gEasyChatWord_Couple:: @ 859CBA9 - .string "COUPLE$" - -gEasyChatWord_MuchObliged:: @ 859CBB0 - .string "MUCH OBLIGED$" - -gEasyChatWord_YeehawExcl:: @ 859CBBD - .string "YEEHAW!$" - -gEasyChatWord_Mega:: @ 859CBC5 - .string "MEGA$" - -gEasyChatWord_1HitKOExcl:: @ 859CBCA - .string "1-HIT KO!$" - -gEasyChatWord_Destiny:: @ 859CBD4 - .string "DESTINY$" - -gEasyChatWord_Cancel:: @ 859CBDC - .string "CANCEL$" - -gEasyChatWord_New:: @ 859CBE3 - .string "NEW$" - -gEasyChatWord_Flatten:: @ 859CBE7 - .string "FLATTEN$" - -gEasyChatWord_Kidding:: @ 859CBEF - .string "KIDDING$" - -gEasyChatWord_Loser:: @ 859CBF7 - .string "LOSER$" - -gEasyChatWord_Losing:: @ 859CBFD - .string "LOSING$" - -gEasyChatWord_Happening:: @ 859CC04 - .string "HAPPENING$" - -gEasyChatWord_HipAnd:: @ 859CC0E - .string "HIP AND$" - -gEasyChatWord_Shake:: @ 859CC16 - .string "SHAKE$" - -gEasyChatWord_Shady:: @ 859CC1C - .string "SHADY$" - -gEasyChatWord_Upbeat:: @ 859CC22 - .string "UPBEAT$" - -gEasyChatWord_Modern:: @ 859CC29 - .string "MODERN$" - -gEasyChatWord_SmellYa:: @ 859CC30 - .string "SMELL YA$" - -gEasyChatWord_Bang:: @ 859CC39 - .string "BANG$" - -gEasyChatWord_Knockout:: @ 859CC3E - .string "KNOCKOUT$" - -gEasyChatWord_Hassle:: @ 859CC47 - .string "HASSLE$" - -gEasyChatWord_Winner:: @ 859CC4E - .string "WINNER$" - -gEasyChatWord_Fever:: @ 859CC55 - .string "FEVER$" - -gEasyChatWord_Wannabe:: @ 859CC5B - .string "WANNABE$" - -gEasyChatWord_Baby:: @ 859CC63 - .string "BABY$" - -gEasyChatWord_Heart:: @ 859CC68 - .string "HEART$" - -gEasyChatWord_Old:: @ 859CC6E - .string "OLD$" - -gEasyChatWord_Young:: @ 859CC72 - .string "YOUNG$" - -gEasyChatWord_Ugly:: @ 859CC78 - .string "UGLY$" - - .align 2 -gEasyChatGroup_TrendySaying:: @ 859CC80 - .4byte gEasyChatWord_KthxBye - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_YesSirExcl - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_AvantGarde - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Couple - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_MuchObliged - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_YeehawExcl - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mega - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_1HitKOExcl - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Destiny - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cancel - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_New - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Flatten - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Kidding - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Loser - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Losing - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Happening - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HipAnd - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shake - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shady - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Upbeat - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Modern - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SmellYa - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Bang - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Knockout - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hassle - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Winner - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fever - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wannabe - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Baby - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Heart - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Old - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Young - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ugly - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_voices.s b/data/text/easy_chat/easy_chat_group_voices.s deleted file mode 100644 index 548576fd32..0000000000 --- a/data/text/easy_chat/easy_chat_group_voices.s +++ /dev/null @@ -1,442 +0,0 @@ -gEasyChatWord_Excl:: @ 8599890 - .string "!$" - -gEasyChatWord_ExclExcl:: @ 8599892 - .string "!!$" - -gEasyChatWord_QuesExcl:: @ 8599895 - .string "?!$" - -gEasyChatWord_Ques:: @ 8599898 - .string "?$" - -gEasyChatWord_Ellipsis:: @ 859989A - .string "…$" - -gEasyChatWord_EllipsisExcl:: @ 859989C - .string "…!$" - -gEasyChatWord_EllipsisEllipsisEllipsis:: @ 859989F - .string "………$" - -gEasyChatWord_Dash:: @ 85998A3 - .string "-$" - -gEasyChatWord_DashDashDash:: @ 85998A5 - .string "- - -$" - -gEasyChatWord_UhOh:: @ 85998AB - .string "UH-OH$" - -gEasyChatWord_Waaah:: @ 85998B1 - .string "WAAAH$" - -gEasyChatWord_Ahaha:: @ 85998B7 - .string "AHAHA$" - -gEasyChatWord_OhQues:: @ 85998BD - .string "OH?$" - -gEasyChatWord_Nope:: @ 85998C1 - .string "NOPE$" - -gEasyChatWord_Urgh:: @ 85998C6 - .string "URGH$" - -gEasyChatWord_Hmm:: @ 85998CB - .string "HMM$" - -gEasyChatWord_Whoah:: @ 85998CF - .string "WHOAH$" - -gEasyChatWord_WroooaarExcl:: @ 85998D5 - .string "WROOOAAR!$" - -gEasyChatWord_Wow:: @ 85998DF - .string "WOW$" - -gEasyChatWord_Giggle:: @ 85998E3 - .string "GIGGLE$" - -gEasyChatWord_Sigh:: @ 85998EA - .string "SIGH$" - -gEasyChatWord_Unbelievable:: @ 85998EF - .string "UNBELIEVABLE$" - -gEasyChatWord_Cries:: @ 85998FC - .string "CRIES$" - -gEasyChatWord_Agree:: @ 8599902 - .string "AGREE$" - -gEasyChatWord_EhQues:: @ 8599908 - .string "EH?$" - -gEasyChatWord_Cry:: @ 859990C - .string "CRY$" - -gEasyChatWord_Ehehe:: @ 8599910 - .string "EHEHE$" - -gEasyChatWord_OiOiOi:: @ 8599916 - .string "OI, OI, OI$" - -gEasyChatWord_OhYeah:: @ 8599921 - .string "OH, YEAH$" - -gEasyChatWord_Oh:: @ 859992A - .string "OH$" - -gEasyChatWord_Oops:: @ 859992D - .string "OOPS$" - -gEasyChatWord_Shocked:: @ 8599932 - .string "SHOCKED$" - -gEasyChatWord_Eek:: @ 859993A - .string "EEK$" - -gEasyChatWord_Graaah:: @ 859993E - .string "GRAAAH$" - -gEasyChatWord_Gwahahaha:: @ 8599945 - .string "GWAHAHAHA$" - -gEasyChatWord_Way:: @ 859994F - .string "WAY$" - -gEasyChatWord_Tch:: @ 8599953 - .string "TCH$" - -gEasyChatWord_Hehe:: @ 8599957 - .string "HEHE$" - -gEasyChatWord_Hah:: @ 859995C - .string "HAH$" - -gEasyChatWord_Yup:: @ 8599960 - .string "YUP$" - -gEasyChatWord_Hahaha:: @ 8599964 - .string "HAHAHA$" - -gEasyChatWord_Aiyeeh:: @ 859996B - .string "AIYEEH$" - -gEasyChatWord_Hiyah:: @ 8599972 - .string "HIYAH$" - -gEasyChatWord_Fufufu:: @ 8599978 - .string "FUFUFU$" - -gEasyChatWord_Lol:: @ 859997F - .string "LOL$" - -gEasyChatWord_Snort:: @ 8599983 - .string "SNORT$" - -gEasyChatWord_Humph:: @ 8599989 - .string "HUMPH$" - -gEasyChatWord_Hehehe:: @ 859998F - .string "HEHEHE$" - -gEasyChatWord_Heh:: @ 8599996 - .string "HEH$" - -gEasyChatWord_Hohoho:: @ 859999A - .string "HOHOHO$" - -gEasyChatWord_UhHuh:: @ 85999A1 - .string "UH-HUH$" - -gEasyChatWord_OhDear:: @ 85999A8 - .string "OH, DEAR$" - -gEasyChatWord_Arrgh:: @ 85999B1 - .string "ARRGH$" - -gEasyChatWord_Mufufu:: @ 85999B7 - .string "MUFUFU$" - -gEasyChatWord_Mmm:: @ 85999BE - .string "MMM$" - -gEasyChatWord_OhKay:: @ 85999C2 - .string "OH-KAY$" - -gEasyChatWord_Okay:: @ 85999C9 - .string "OKAY$" - -gEasyChatWord_Lalala:: @ 85999CE - .string "LALALA$" - -gEasyChatWord_Yay:: @ 85999D5 - .string "YAY$" - -gEasyChatWord_Aww:: @ 85999D9 - .string "AWW$" - -gEasyChatWord_Wowee:: @ 85999DD - .string "WOWEE$" - -gEasyChatWord_Gwah:: @ 85999E3 - .string "GWAH$" - -gEasyChatWord_Wahahaha:: @ 85999E8 - .string "WAHAHAHA$" - - .align 2 -gEasyChatGroup_Voices:: @ 85999F4 - .4byte gEasyChatWord_Excl - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ExclExcl - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_QuesExcl - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ques - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ellipsis - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_EllipsisExcl - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_EllipsisEllipsisEllipsis - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dash - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_DashDashDash - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_UhOh - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Waaah - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ahaha - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OhQues - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nope - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Urgh - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hmm - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Whoah - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WroooaarExcl - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wow - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Giggle - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sigh - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Unbelievable - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cries - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Agree - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_EhQues - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cry - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ehehe - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OiOiOi - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OhYeah - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Oh - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Oops - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shocked - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Eek - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Graaah - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gwahahaha - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Way - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tch - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hehe - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hah - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yup - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hahaha - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Aiyeeh - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hiyah - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fufufu - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lol - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Snort - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Humph - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hehehe - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Heh - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hohoho - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_UhHuh - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OhDear - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Arrgh - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mufufu - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mmm - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OhKay - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Okay - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lalala - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yay - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Aww - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wowee - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gwah - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wahahaha - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_groups.inc b/data/text/easy_chat/easy_chat_groups.inc deleted file mode 100644 index 94636c7fe5..0000000000 --- a/data/text/easy_chat/easy_chat_groups.inc +++ /dev/null @@ -1,112 +0,0 @@ - .include "data/text/easy_chat/easy_chat_group_pokemon.s" - .include "data/text/easy_chat/easy_chat_group_trainer.s" - .include "data/text/easy_chat/easy_chat_group_status.s" - .include "data/text/easy_chat/easy_chat_group_battle.s" - .include "data/text/easy_chat/easy_chat_group_greetings.s" - .include "data/text/easy_chat/easy_chat_group_people.s" - .include "data/text/easy_chat/easy_chat_group_voices.s" - .include "data/text/easy_chat/easy_chat_group_speech.s" - .include "data/text/easy_chat/easy_chat_group_endings.s" - .include "data/text/easy_chat/easy_chat_group_feelings.s" - .include "data/text/easy_chat/easy_chat_group_conditions.s" - .include "data/text/easy_chat/easy_chat_group_actions.s" - .include "data/text/easy_chat/easy_chat_group_lifestyle.s" - .include "data/text/easy_chat/easy_chat_group_hobbies.s" - .include "data/text/easy_chat/easy_chat_group_time.s" - .include "data/text/easy_chat/easy_chat_group_misc.s" - .include "data/text/easy_chat/easy_chat_group_adjectives.s" - .include "data/text/easy_chat/easy_chat_group_events.s" - .include "data/text/easy_chat/easy_chat_group_move_1.s" - .include "data/text/easy_chat/easy_chat_group_move_2.s" - .include "data/text/easy_chat/easy_chat_group_trendy_saying.s" - .include "data/text/easy_chat/easy_chat_group_pokemon2.s" - - .align 2 -gEasyChatGroups:: @ 859D004 - .4byte gEasyChatGroup_Pokemon - .2byte 202 @ total number of entries - .2byte 202 @ number of enabled entries - - .4byte gEasyChatGroup_Trainer - .2byte 27 @ total number of entries - .2byte 21 @ number of enabled entries - - .4byte gEasyChatGroup_Status - .2byte 109 @ total number of entries - .2byte 109 @ number of enabled entries - - .4byte gEasyChatGroup_Battle - .2byte 63 @ total number of entries - .2byte 63 @ number of enabled entries - - .4byte gEasyChatGroup_Greetings - .2byte 42 @ total number of entries - .2byte 42 @ number of enabled entries - - .4byte gEasyChatGroup_People - .2byte 75 @ total number of entries - .2byte 75 @ number of enabled entries - - .4byte gEasyChatGroup_Voices - .2byte 63 @ total number of entries - .2byte 63 @ number of enabled entries - - .4byte gEasyChatGroup_Speech - .2byte 60 @ total number of entries - .2byte 60 @ number of enabled entries - - .4byte gEasyChatGroup_Endings - .2byte 69 @ total number of entries - .2byte 69 @ number of enabled entries - - .4byte gEasyChatGroup_Feelings - .2byte 69 @ total number of entries - .2byte 69 @ number of enabled entries - - .4byte gEasyChatGroup_Conditions - .2byte 69 @ total number of entries - .2byte 69 @ number of enabled entries - - .4byte gEasyChatGroup_Actions - .2byte 78 @ total number of entries - .2byte 78 @ number of enabled entries - - .4byte gEasyChatGroup_Lifestyle - .2byte 45 @ total number of entries - .2byte 45 @ number of enabled entries - - .4byte gEasyChatGroup_Hobbies - .2byte 54 @ total number of entries - .2byte 54 @ number of enabled entries - - .4byte gEasyChatGroup_Time - .2byte 45 @ total number of entries - .2byte 45 @ number of enabled entries - - .4byte gEasyChatGroup_Misc - .2byte 42 @ total number of entries - .2byte 42 @ number of enabled entries - - .4byte gEasyChatGroup_Adjectives - .2byte 36 @ total number of entries - .2byte 36 @ number of enabled entries - - .4byte gEasyChatGroup_Events - .2byte 29 @ total number of entries - .2byte 29 @ number of enabled entries - - .4byte gEasyChatGroup_Move1 - .2byte 154 @ total number of entries - .2byte 154 @ number of enabled entries - - .4byte gEasyChatGroup_Move2 - .2byte 200 @ total number of entries - .2byte 200 @ number of enabled entries - - .4byte gEasyChatGroup_TrendySaying - .2byte 33 @ total number of entries - .2byte 33 @ number of enabled entries - - .4byte gEasyChatGroup_Pokemon2 - .2byte 251 @ total number of entries - .2byte 251 @ number of enabled entries diff --git a/data/text/easy_chat/easy_chat_words_by_letter.inc b/data/text/easy_chat/easy_chat_words_by_letter.inc deleted file mode 100644 index bce4be347a..0000000000 --- a/data/text/easy_chat/easy_chat_words_by_letter.inc +++ /dev/null @@ -1,2656 +0,0 @@ -gEasyChatWordsByLetter_Others:: @ 859D0B4 - .2byte EC_WORD_EXCL - .2byte EC_WORD_EXCL_EXCL - .2byte EC_WORD_DASH - .2byte EC_WORD_DASH_DASH_DASH - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_ELLIPSIS_EXCL - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_1_HIT_KO_EXCL - .2byte EC_WORD_QUES - .2byte EC_WORD_QUES_EXCL - -gEasyChatWordsByLetter_A:: @ 859D0C8 - .2byte EC_WORD_A - .2byte EC_WORD_A_LITTLE - .2byte EC_WORD_A_LOT - .2byte EC_WORD_A_TINY_BIT - .2byte EC_WORD_ABOUT - .2byte EC_WORD_ABOVE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(ABRA) - .2byte EC_POKEMON2(ABRA) - .2byte EC_WORD_ABSENT - .2byte EC_POKEMON(ABSOL) - .2byte EC_WORD_ABSOLUTELY - .2byte EC_MOVE(ABSORB) - .2byte EC_WORD_ACCEPT - .2byte EC_MOVE2(ACID) - .2byte EC_MOVE2(ACID_ARMOR) - .2byte EC_WORD_ADORE - .2byte EC_WORD_ADULT - .2byte EC_WORD_ADVENTURE - .2byte EC_MOVE2(AERIAL_ACE) - .2byte EC_MOVE(AEROBLAST) - .2byte EC_POKEMON2(AERODACTYL) - .2byte EC_WORD_AFTER - .2byte EC_WORD_AGE - .2byte EC_POKEMON(AGGRON) - .2byte EC_MOVE(AGILITY) - .2byte EC_WORD_AGREE - .2byte EC_WORD_AHAHA - .2byte EC_WORD_AIM - .2byte EC_POKEMON2(AIPOM) - .2byte EC_MOVE(AIR_CUTTER) - .2byte EC_WORD_AIR_LOCK - .2byte EC_WORD_AIYEEH - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(ALAKAZAM) - .2byte EC_POKEMON2(ALAKAZAM) - .2byte EC_WORD_ALL - .2byte EC_WORD_ALL_RIGHT - .2byte EC_WORD_ALLOW - .2byte EC_WORD_ALLOWANCE - .2byte EC_WORD_ALLY - .2byte EC_WORD_ALMOST - .2byte EC_WORD_ALONE - .2byte EC_WORD_ALSO - .2byte EC_WORD_ALT_COLOR - .2byte EC_POKEMON(ALTARIA) - .2byte EC_WORD_ALTHOUGH - .2byte EC_WORD_ALWAYS - .2byte EC_WORD_AM - .2byte EC_MOVE2(AMNESIA) - .2byte EC_POKEMON2(AMPHAROS) - .2byte EC_WORD_AMUSING - .2byte EC_WORD_AN - .2byte EC_MOVE(ANCIENT_POWER) - .2byte EC_WORD_AND - .2byte EC_WORD_ANGER - .2byte EC_WORD_ANGERS - .2byte EC_WORD_ANGRY - .2byte EC_WORD_ANIME - .2byte EC_POKEMON(ANORITH) - .2byte EC_WORD_ANOTHER - .2byte EC_WORD_ANTICIPATION - .2byte EC_WORD_ANY - .2byte EC_WORD_ANYWHERE - .2byte EC_WORD_APOLOGIZE - .2byte EC_WORD_APPEAL - .2byte EC_WORD_APPEAR - .2byte EC_WORD_APPEARS - .2byte EC_WORD_APPRECIATE - .2byte EC_WORD_APPROVED - .2byte EC_POKEMON2(ARBOK) - .2byte EC_POKEMON2(ARCANINE) - .2byte EC_WORD_ARE - .2byte EC_WORD_AREN_T - .2byte EC_WORD_ARENA_TRAP - .2byte EC_POKEMON2(ARIADOS) - .2byte EC_MOVE2(ARM_THRUST) - .2byte EC_POKEMON(ARMALDO) - .2byte EC_MOVE(AROMATHERAPY) - .2byte EC_POKEMON(ARON) - .2byte EC_WORD_AROUND - .2byte EC_WORD_ARRGH - .2byte EC_POKEMON2(ARTICUNO) - .2byte EC_WORD_AS - .2byte EC_WORD_AS_IF - .2byte EC_WORD_AS_MUCH_AS - .2byte EC_MOVE2(ASSIST) - .2byte EC_MOVE(ASTONISH) - .2byte EC_WORD_AT - .2byte EC_WORD_ATTACK - .2byte EC_MOVE2(ATTRACT) - .2byte EC_WORD_AUNT - .2byte EC_MOVE(AURORA_BEAM) - .2byte EC_WORD_AVANT_GARDE - .2byte EC_WORD_AWAY - .2byte EC_WORD_AWESOME - .2byte EC_WORD_AWFUL - .2byte EC_WORD_AWFULLY - .2byte EC_WORD_AWW - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(AZUMARILL) - .2byte EC_POKEMON2(AZUMARILL) - .2byte EC_POKEMON(AZURILL) - -gEasyChatWordsByLetter_B:: @ 859D19C - .2byte EC_WORD_BABE - .2byte EC_WORD_BABY - .2byte EC_WORD_BACK - .2byte EC_WORD_BAD - .2byte EC_WORD_BADLY - .2byte EC_WORD_BAG - .2byte EC_POKEMON(BAGON) - .2byte EC_WORD_BALL - .2byte EC_POKEMON(BALTOY) - .2byte EC_POKEMON(BANETTE) - .2byte EC_WORD_BANG - .2byte EC_POKEMON(BARBOACH) - .2byte EC_MOVE2(BARRAGE) - .2byte EC_MOVE2(BARRIER) - .2byte EC_WORD_BATH - .2byte EC_MOVE2(BATON_PASS) - .2byte EC_WORD_BATTLE - .2byte EC_WORD_BATTLE_ARMOR - .2byte EC_WORD_BATTLE_ROOM - .2byte EC_WORD_BATTLE_TOWER - .2byte EC_POKEMON2(BAYLEEF) - .2byte EC_WORD_BE - .2byte EC_WORD_BEAT - .2byte EC_MOVE2(BEAT_UP) - .2byte EC_POKEMON(BEAUTIFLY) - .2byte EC_WORD_BEAUTIFUL - .2byte EC_WORD_BEAUTY - .2byte EC_WORD_BECOMES - .2byte EC_POKEMON2(BEEDRILL) - .2byte EC_WORD_BEEN - .2byte EC_WORD_BEFORE - .2byte EC_WORD_BEGINNING - .2byte EC_WORD_BEING - .2byte EC_POKEMON(BELDUM) - .2byte EC_WORD_BELIEVE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(BELLOSSOM) - .2byte EC_POKEMON2(BELLOSSOM) - .2byte EC_POKEMON2(BELLSPROUT) - .2byte EC_MOVE2(BELLY_DRUM) - .2byte EC_WORD_BELONGS_TO - .2byte EC_WORD_BELOW - .2byte EC_WORD_BERRY - .2byte EC_WORD_BESIDE - .2byte EC_WORD_BEST - .2byte EC_WORD_BETTER - .2byte EC_MOVE(BIDE) - .2byte EC_WORD_BIG - .2byte EC_WORD_BIKE - .2byte EC_MOVE(BIND) - .2byte EC_MOVE(BITE) - .2byte EC_MOVE2(BLAST_BURN) - .2byte EC_POKEMON2(BLASTOISE) - .2byte EC_WORD_BLAZE - .2byte EC_MOVE2(BLAZE_KICK) - .2byte EC_POKEMON(BLAZIKEN) - .2byte EC_WORD_BLEND - .2byte EC_POKEMON2(BLISSEY) - .2byte EC_MOVE2(BLIZZARD) - .2byte EC_MOVE2(BLOCK) - .2byte EC_WORD_BOARD - .2byte EC_MOVE2(BODY_SLAM) - .2byte EC_MOVE2(BONE_CLUB) - .2byte EC_MOVE2(BONE_RUSH) - .2byte EC_MOVE2(BONEMERANG) - .2byte EC_WORD_BOOK - .2byte EC_WORD_BORED - .2byte EC_WORD_BORING - .2byte EC_MOVE2(BOUNCE) - .2byte EC_WORD_BOY - .2byte EC_WORD_BRAG - .2byte EC_WORD_BREAK - .2byte EC_POKEMON(BRELOOM) - .2byte EC_MOVE(BRICK_BREAK) - .2byte EC_WORD_BROTHER - .2byte EC_MOVE(BUBBLE) - .2byte EC_MOVE2(BUBBLE_BEAM) - .2byte EC_WORD_BUG - .2byte EC_POKEMON2(BULBASAUR) - .2byte EC_MOVE2(BULK_UP) - .2byte EC_MOVE2(BULLET_SEED) - .2byte EC_WORD_BUSY - .2byte EC_WORD_BUT - .2byte EC_POKEMON2(BUTTERFREE) - .2byte EC_WORD_BYE_BYE - -gEasyChatWordsByLetter_C:: @ 859D248 - .2byte EC_POKEMON(CACNEA) - .2byte EC_POKEMON(CACTURNE) - .2byte EC_MOVE2(CALM_MIND) - .2byte EC_WORD_CAME - .2byte EC_WORD_CAMERA - .2byte EC_POKEMON(CAMERUPT) - .2byte EC_MOVE2(CAMOUFLAGE) - .2byte EC_WORD_CAN - .2byte EC_WORD_CAN_WIN - .2byte EC_WORD_CAN_T - .2byte EC_WORD_CAN_T_WIN - .2byte EC_WORD_CANCEL - .2byte EC_WORD_CAPABLE - .2byte EC_WORD_CARDS - .2byte EC_WORD_CARE - .2byte EC_WORD_CARES - .2byte EC_POKEMON(CARVANHA) - .2byte EC_POKEMON(CASCOON) - .2byte EC_WORD_CASE - .2byte EC_POKEMON(CASTFORM) - .2byte EC_POKEMON2(CATERPIE) - .2byte EC_WORD_CAUSE - .2byte EC_POKEMON2(CELEBI) - .2byte EC_WORD_CENTER - .2byte EC_WORD_CHALLENGE - .2byte EC_WORD_CHANGE - .2byte EC_WORD_CHANNEL - .2byte EC_POKEMON2(CHANSEY) - .2byte EC_MOVE(CHARGE) - .2byte EC_POKEMON2(CHARIZARD) - .2byte EC_MOVE(CHARM) - .2byte EC_POKEMON2(CHARMANDER) - .2byte EC_POKEMON2(CHARMELEON) - .2byte EC_WORD_CHAT - .2byte EC_POKEMON2(CHIKORITA) - .2byte EC_WORD_CHILD_S_PLAY - .2byte EC_WORD_CHILDREN - .2byte EC_POKEMON(CHIMECHO) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(CHINCHOU) - .2byte EC_POKEMON2(CHINCHOU) - .2byte EC_WORD_CHLOROPHYLL - .2byte EC_WORD_CHOICE - .2byte EC_WORD_CHOOSE - .2byte EC_WORD_CHORES - .2byte EC_MOVE(CLAMP) - .2byte EC_POKEMON(CLAMPERL) - .2byte EC_WORD_CLASS - .2byte EC_POKEMON(CLAYDOL) - .2byte EC_WORD_CLEAR_BODY - .2byte EC_POKEMON2(CLEFABLE) - .2byte EC_POKEMON2(CLEFAIRY) - .2byte EC_POKEMON2(CLEFFA) - .2byte EC_WORD_CLOSE - .2byte EC_WORD_CLOUD_NINE - .2byte EC_POKEMON2(CLOYSTER) - .2byte EC_WORD_COLD - .2byte EC_WORD_COLLECT - .2byte EC_WORD_COLLECTION - .2byte EC_WORD_COLOR - .2byte EC_WORD_COLOR_CHANGE - .2byte EC_POKEMON(COMBUSKEN) - .2byte EC_WORD_COME - .2byte EC_WORD_COME_ON - .2byte EC_WORD_COME_OVER - .2byte EC_MOVE2(COMET_PUNCH) - .2byte EC_WORD_COMICS - .2byte EC_WORD_COMMEMORATE - .2byte EC_WORD_COMPLETE - .2byte EC_WORD_COMPOUNDEYES - .2byte EC_WORD_CONCEDE - .2byte EC_MOVE(CONFUSE_RAY) - .2byte EC_WORD_CONFUSED - .2byte EC_MOVE2(CONFUSION) - .2byte EC_WORD_CONGRATS - .2byte EC_MOVE(CONSTRICT) - .2byte EC_WORD_CONTEST - .2byte EC_WORD_CONVERSATION - .2byte EC_MOVE2(CONVERSION) - .2byte EC_MOVE2(CONVERSION_2) - .2byte EC_WORD_COOL - .2byte EC_WORD_COOLNESS - .2byte EC_POKEMON(CORPHISH) - .2byte EC_WORD_CORRECT - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(CORSOLA) - .2byte EC_POKEMON2(CORSOLA) - .2byte EC_MOVE(COSMIC_POWER) - .2byte EC_MOVE2(COTTON_SPORE) - .2byte EC_WORD_COULD - .2byte EC_WORD_COULDN_T - .2byte EC_WORD_COUNT_ON - .2byte EC_MOVE(COUNTER) - .2byte EC_WORD_COUPLE - .2byte EC_MOVE2(COVET) - .2byte EC_MOVE(CRABHAMMER) - .2byte EC_POKEMON(CRADILY) - .2byte EC_POKEMON(CRAWDAUNT) - .2byte EC_WORD_CRIES - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(CROBAT) - .2byte EC_POKEMON2(CROBAT) - .2byte EC_POKEMON2(CROCONAW) - .2byte EC_MOVE(CROSS_CHOP) - .2byte EC_MOVE(CRUNCH) - .2byte EC_WORD_CRUSH - .2byte EC_MOVE2(CRUSH_CLAW) - .2byte EC_WORD_CRY - .2byte EC_POKEMON2(CUBONE) - .2byte EC_WORD_CURRENT - .2byte EC_MOVE2(CURSE) - .2byte EC_MOVE(CUT) - .2byte EC_WORD_CUTE - .2byte EC_WORD_CUTE_CHARM - .2byte EC_WORD_CUTENESS - .2byte EC_POKEMON2(CYNDAQUIL) - -gEasyChatWordsByLetter_D:: @ 859D336 - .2byte EC_WORD_DAILY - .2byte EC_WORD_DAMP - .2byte EC_WORD_DANCE - .2byte EC_WORD_DANGER - .2byte EC_WORD_DARK - .2byte EC_WORD_DARN - .2byte EC_WORD_DATE - .2byte EC_WORD_DAUGHTER - .2byte EC_WORD_DAY - .2byte EC_WORD_DAYS - .2byte EC_WORD_DAYTIME - .2byte EC_WORD_DECIDE - .2byte EC_WORD_DECIDED - .2byte EC_WORD_DEEP - .2byte EC_WORD_DEFEATED - .2byte EC_MOVE2(DEFENSE_CURL) - .2byte EC_POKEMON(DELCATTY) - .2byte EC_POKEMON2(DELIBIRD) - .2byte EC_POKEMON(DEOXYS) - .2byte EC_WORD_DEPT_STORE - .2byte EC_WORD_DESIGN - .2byte EC_WORD_DESTINY - .2byte EC_MOVE2(DESTINY_BOND) - .2byte EC_WORD_DESTROYED - .2byte EC_MOVE2(DETECT) - .2byte EC_POKEMON2(DEWGONG) - .2byte EC_WORD_DID - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_DIET - .2byte EC_WORD_DIFFERENT - .2byte EC_MOVE(DIG) - .2byte EC_WORD_DIGITAL - .2byte EC_POKEMON2(DIGLETT) - .2byte EC_WORD_DIRECT - .2byte EC_MOVE(DISABLE) - .2byte EC_WORD_DISAPPEAR - .2byte EC_WORD_DISAPPOINT - .2byte EC_WORD_DISAPPOINTED - .2byte EC_WORD_DISAPPOINTS - .2byte EC_WORD_DISASTER - .2byte EC_WORD_DISLIKE - .2byte EC_WORD_DISLIKES - .2byte EC_POKEMON2(DITTO) - .2byte EC_MOVE2(DIVE) - .2byte EC_MOVE2(DIZZY_PUNCH) - .2byte EC_WORD_DO - .2byte EC_WORD_DOCILE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(DODRIO) - .2byte EC_POKEMON2(DODRIO) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(DODUO) - .2byte EC_POKEMON2(DODUO) - .2byte EC_WORD_DOES - .2byte EC_WORD_DOESN_T - .2byte EC_WORD_DON_T - .2byte EC_WORD_DONE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(DONPHAN) - .2byte EC_POKEMON2(DONPHAN) - .2byte EC_MOVE2(DOOM_DESIRE) - .2byte EC_MOVE2(DOUBLE_KICK) - .2byte EC_MOVE(DOUBLE_TEAM) - .2byte EC_MOVE(DOUBLE_EDGE) - .2byte EC_MOVE(DOUBLE_SLAP) - .2byte EC_WORD_DOWN - .2byte EC_WORD_DOWNCAST - .2byte EC_WORD_DRAGON - .2byte EC_MOVE2(DRAGON_CLAW) - .2byte EC_MOVE2(DRAGON_DANCE) - .2byte EC_MOVE2(DRAGON_RAGE) - .2byte EC_POKEMON2(DRAGONAIR) - .2byte EC_MOVE2(DRAGON_BREATH) - .2byte EC_POKEMON2(DRAGONITE) - .2byte EC_POKEMON2(DRATINI) - .2byte EC_WORD_DREAM - .2byte EC_MOVE2(DREAM_EATER) - .2byte EC_MOVE2(DRILL_PECK) - .2byte EC_WORD_DRINK - .2byte EC_WORD_DRINKS - .2byte EC_WORD_DRIZZLE - .2byte EC_WORD_DROOLING - .2byte EC_WORD_DROUGHT - .2byte EC_POKEMON2(DROWZEE) - .2byte EC_WORD_DUDE - .2byte EC_POKEMON2(DUGTRIO) - .2byte EC_POKEMON2(DUNSPARCE) - .2byte EC_POKEMON(DUSCLOPS) - .2byte EC_POKEMON(DUSKULL) - .2byte EC_POKEMON(DUSTOX) - .2byte EC_MOVE2(DYNAMIC_PUNCH) - -gEasyChatWordsByLetter_E:: @ 859D3F2 - .2byte EC_WORD_EARLIER - .2byte EC_WORD_EARLY_BIRD - .2byte EC_MOVE(EARTHQUAKE) - .2byte EC_WORD_EASY - .2byte EC_WORD_EAT - .2byte EC_WORD_EATS - .2byte EC_WORD_EEK - .2byte EC_POKEMON2(EEVEE) - .2byte EC_WORD_EFFECT_SPORE - .2byte EC_WORD_EGG - .2byte EC_MOVE2(EGG_BOMB) - .2byte EC_WORD_EH_QUES - .2byte EC_WORD_EHEHE - .2byte EC_POKEMON2(EKANS) - .2byte EC_POKEMON2(ELECTABUZZ) - .2byte EC_WORD_ELECTRIC - .2byte EC_POKEMON(ELECTRIKE) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(ELECTRODE) - .2byte EC_POKEMON2(ELECTRODE) - .2byte EC_POKEMON2(ELEKID) - .2byte EC_WORD_ELSE - .2byte EC_MOVE2(EMBER) - .2byte EC_WORD_EMERALD - .2byte EC_MOVE(ENCORE) - .2byte EC_WORD_ENCYCLOPEDIA - .2byte EC_WORD_END - .2byte EC_MOVE(ENDEAVOR) - .2byte EC_MOVE(ENDURE) - .2byte EC_WORD_ENJOY - .2byte EC_WORD_ENJOYS - .2byte EC_WORD_ENOUGH - .2byte EC_POKEMON2(ENTEI) - .2byte EC_WORD_ENTERTAINING - .2byte EC_MOVE2(ERUPTION) - .2byte EC_WORD_ESCAPE - .2byte EC_POKEMON2(ESPEON) - .2byte EC_WORD_EVEN_SO - .2byte EC_WORD_EVENT - .2byte EC_WORD_EVENTS - .2byte EC_WORD_EVER - .2byte EC_WORD_EVERY - .2byte EC_WORD_EVOLUTION - .2byte EC_WORD_EVOLVE - .2byte EC_WORD_EXCELLENT - .2byte EC_WORD_EXCESS - .2byte EC_WORD_EXCITE - .2byte EC_WORD_EXCITING - .2byte EC_WORD_EXCUSE - .2byte EC_WORD_EXCUSE_ME - .2byte EC_POKEMON2(EXEGGCUTE) - .2byte EC_POKEMON2(EXEGGUTOR) - .2byte EC_WORD_EXISTS - .2byte EC_WORD_EXPENSIVE - .2byte EC_MOVE2(EXPLOSION) - .2byte EC_POKEMON(EXPLOUD) - .2byte EC_MOVE(EXTRASENSORY) - .2byte EC_MOVE(EXTREME_SPEED) - -gEasyChatWordsByLetter_F:: @ 859D468 - .2byte EC_WORD_FABULOUS - .2byte EC_MOVE(FACADE) - .2byte EC_WORD_FAINT - .2byte EC_MOVE2(FAINT_ATTACK) - .2byte EC_WORD_FAINTED - .2byte EC_MOVE2(FAKE_OUT) - .2byte EC_MOVE(FAKE_TEARS) - .2byte EC_WORD_FALL - .2byte EC_MOVE2(FALSE_SWIPE) - .2byte EC_WORD_FAMILY - .2byte EC_WORD_FANTASTIC - .2byte EC_WORD_FAR - .2byte EC_POKEMON2(FARFETCHD) - .2byte EC_WORD_FASHION - .2byte EC_WORD_FAST - .2byte EC_WORD_FATHER - .2byte EC_WORD_FEAR - .2byte EC_POKEMON2(FEAROW) - .2byte EC_MOVE2(FEATHER_DANCE) - .2byte EC_POKEMON(FEEBAS) - .2byte EC_WORD_FEELING - .2byte EC_POKEMON2(FERALIGATR) - .2byte EC_WORD_FESTIVAL - .2byte EC_WORD_FEVER - .2byte EC_WORD_FIERY - .2byte EC_WORD_FIGHT - .2byte EC_WORD_FIGHTING - .2byte EC_WORD_FIGHTS - .2byte EC_WORD_FINAL - .2byte EC_WORD_FINALLY - .2byte EC_WORD_FINISH - .2byte EC_WORD_FIRE - .2byte EC_MOVE2(FIRE_BLAST) - .2byte EC_MOVE2(FIRE_PUNCH) - .2byte EC_MOVE2(FIRE_SPIN) - .2byte EC_WORD_FISHING - .2byte EC_MOVE(FISSURE) - .2byte EC_POKEMON2(FLAAFFY) - .2byte EC_MOVE(FLAIL) - .2byte EC_WORD_FLAME - .2byte EC_WORD_FLAME_BODY - .2byte EC_MOVE(FLAME_WHEEL) - .2byte EC_MOVE(FLAMETHROWER) - .2byte EC_POKEMON2(FLAREON) - .2byte EC_MOVE2(FLASH) - .2byte EC_WORD_FLASH_FIRE - .2byte EC_WORD_FLATTEN - .2byte EC_MOVE(FLATTER) - .2byte EC_WORD_FLOWERS - .2byte EC_MOVE(FLY) - .2byte EC_POKEMON(FLYGON) - .2byte EC_WORD_FLYING - .2byte EC_MOVE(FOCUS_ENERGY) - .2byte EC_MOVE(FOCUS_PUNCH) - .2byte EC_WORD_FOE - .2byte EC_MOVE(FOLLOW_ME) - .2byte EC_WORD_FOR - .2byte EC_WORD_FOR_NOW - .2byte EC_WORD_FORECAST - .2byte EC_MOVE2(FORESIGHT) - .2byte EC_WORD_FOREVER - .2byte EC_WORD_FORGET - .2byte EC_WORD_FORGETS - .2byte EC_WORD_FORGIVE - .2byte EC_POKEMON2(FORRETRESS) - .2byte EC_MOVE2(FRENZY_PLANT) - .2byte EC_WORD_FRIDAY - .2byte EC_WORD_FRIEND - .2byte EC_WORD_FROM - .2byte EC_WORD_FRONT - .2byte EC_WORD_FRONTIER - .2byte EC_MOVE2(FRUSTRATION) - .2byte EC_WORD_FUFUFU - .2byte EC_WORD_FULL - .2byte EC_WORD_FUNNY - .2byte EC_POKEMON2(FURRET) - .2byte EC_MOVE2(FURY_ATTACK) - .2byte EC_MOVE2(FURY_CUTTER) - .2byte EC_MOVE2(FURY_SWIPES) - .2byte EC_MOVE2(FUTURE_SIGHT) - -gEasyChatWordsByLetter_G:: @ 859D508 - .2byte EC_WORD_GAME - .2byte EC_POKEMON(GARDEVOIR) - .2byte EC_POKEMON2(GASTLY) - .2byte EC_POKEMON2(GENGAR) - .2byte EC_WORD_GENIUS - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GEODUDE) - .2byte EC_POKEMON2(GEODUDE) - .2byte EC_WORD_GET - .2byte EC_WORD_GETS - .2byte EC_WORD_GHOST - .2byte EC_WORD_GIDDY - .2byte EC_MOVE(GIGA_DRAIN) - .2byte EC_WORD_GIGGLE - .2byte EC_WORD_GIMME - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GIRAFARIG) - .2byte EC_POKEMON2(GIRAFARIG) - .2byte EC_WORD_GIRL - .2byte EC_WORD_GIVE - .2byte EC_WORD_GIVE_ME - .2byte EC_WORD_GIVE_UP - .2byte EC_WORD_GIVES - .2byte EC_POKEMON(GLALIE) - .2byte EC_MOVE2(GLARE) - .2byte EC_POKEMON2(GLIGAR) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GLOOM) - .2byte EC_POKEMON2(GLOOM) - .2byte EC_WORD_GO - .2byte EC_WORD_GO_AHEAD - .2byte EC_WORD_GO_EASY - .2byte EC_WORD_GO_HOME - .2byte EC_WORD_GOES - .2byte EC_WORD_GOING - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GOLBAT) - .2byte EC_POKEMON2(GOLBAT) - .2byte EC_WORD_GOLD - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GOLDEEN) - .2byte EC_POKEMON2(GOLDEEN) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GOLDUCK) - .2byte EC_POKEMON2(GOLDUCK) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GOLEM) - .2byte EC_POKEMON2(GOLEM) - .2byte EC_WORD_GOOD - .2byte EC_WORD_GOOD_BYE - .2byte EC_POKEMON(GOREBYSS) - .2byte EC_WORD_GOT - .2byte EC_WORD_GOTCHA - .2byte EC_WORD_GOURMET - .2byte EC_WORD_GRAAAH - .2byte EC_POKEMON2(GRANBULL) - .2byte EC_WORD_GRANDFATHER - .2byte EC_WORD_GRANDMOTHER - .2byte EC_WORD_GRASS - .2byte EC_MOVE(GRASS_WHISTLE) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GRAVELER) - .2byte EC_POKEMON2(GRAVELER) - .2byte EC_WORD_GREAT - .2byte EC_WORD_GREEN - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GRIMER) - .2byte EC_POKEMON2(GRIMER) - .2byte EC_POKEMON(GROUDON) - .2byte EC_WORD_GROUND - .2byte EC_WORD_GROUP - .2byte EC_POKEMON(GROVYLE) - .2byte EC_MOVE2(GROWL) - .2byte EC_POKEMON2(GROWLITHE) - .2byte EC_MOVE(GROWTH) - .2byte EC_MOVE(GRUDGE) - .2byte EC_POKEMON(GRUMPIG) - .2byte EC_WORD_GUARD - .2byte EC_MOVE2(GUILLOTINE) - .2byte EC_POKEMON(GULPIN) - .2byte EC_MOVE(GUST) - .2byte EC_WORD_GUTS - .2byte EC_WORD_GUTSY - .2byte EC_WORD_GWAH - .2byte EC_WORD_GWAHAHAHA - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GYARADOS) - .2byte EC_POKEMON2(GYARADOS) - -gEasyChatWordsByLetter_H:: @ 859D5CC - .2byte EC_WORD_HABIT - .2byte EC_WORD_HAH - .2byte EC_WORD_HAHAHA - .2byte EC_MOVE(HAIL) - .2byte EC_WORD_HALL_OF_FAME - .2byte EC_WORD_HAPPENING - .2byte EC_WORD_HAPPILY - .2byte EC_WORD_HAPPINESS - .2byte EC_WORD_HAPPY - .2byte EC_WORD_HARD - .2byte EC_MOVE(HARDEN) - .2byte EC_POKEMON(HARIYAMA) - .2byte EC_WORD_HAS - .2byte EC_WORD_HASSLE - .2byte EC_POKEMON2(HAUNTER) - .2byte EC_WORD_HAVE - .2byte EC_WORD_HAVEN_T - .2byte EC_MOVE(HAZE) - .2byte EC_WORD_HE - .2byte EC_WORD_HE_S - .2byte EC_MOVE(HEADBUTT) - .2byte EC_MOVE(HEAL_BELL) - .2byte EC_WORD_HEALTHY - .2byte EC_WORD_HEAR - .2byte EC_WORD_HEARING - .2byte EC_WORD_HEARS - .2byte EC_WORD_HEART - .2byte EC_MOVE2(HEAT_WAVE) - .2byte EC_WORD_HEH - .2byte EC_WORD_HEHE - .2byte EC_WORD_HEHEHE - .2byte EC_WORD_HELLO - .2byte EC_MOVE2(HELPING_HAND) - .2byte EC_WORD_HER - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(HERACROSS) - .2byte EC_POKEMON2(HERACROSS) - .2byte EC_WORD_HERE - .2byte EC_WORD_HERE_GOES - .2byte EC_WORD_HERE_I_COME - .2byte EC_WORD_HERE_IT_IS - .2byte EC_WORD_HERO - .2byte EC_WORD_HEROINE - .2byte EC_WORD_HERS - .2byte EC_WORD_HEY - .2byte EC_WORD_HEY_THERE - .2byte EC_WORD_HEY_QUES - .2byte EC_WORD_HI - .2byte EC_MOVE2(HI_JUMP_KICK) - .2byte EC_WORD_HIDDEN - .2byte EC_MOVE2(HIDDEN_POWER) - .2byte EC_WORD_HIGH - .2byte EC_WORD_HIGHS - .2byte EC_WORD_HIM - .2byte EC_WORD_HIP_AND - .2byte EC_WORD_HIS - .2byte EC_WORD_HIT - .2byte EC_POKEMON2(HITMONCHAN) - .2byte EC_POKEMON2(HITMONLEE) - .2byte EC_POKEMON2(HITMONTOP) - .2byte EC_WORD_HIYAH - .2byte EC_WORD_HMM - .2byte EC_POKEMON2(HO_OH) - .2byte EC_WORD_HOBBY - .2byte EC_WORD_HOHOHO - .2byte EC_WORD_HOLIDAY - .2byte EC_WORD_HOME - .2byte EC_WORD_HOO_HAH - .2byte EC_POKEMON2(HOOTHOOT) - .2byte EC_WORD_HOPELESS - .2byte EC_POKEMON2(HOPPIP) - .2byte EC_MOVE2(HORN_ATTACK) - .2byte EC_MOVE2(HORN_DRILL) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(HORSEA) - .2byte EC_POKEMON2(HORSEA) - .2byte EC_WORD_HOT - .2byte EC_POKEMON2(HOUNDOOM) - .2byte EC_POKEMON2(HOUNDOUR) - .2byte EC_WORD_HOW - .2byte EC_WORD_HOW_DO - .2byte EC_WORD_HOWEVER - .2byte EC_MOVE2(HOWL) - .2byte EC_WORD_HUGE_POWER - .2byte EC_WORD_HUH_QUES - .2byte EC_WORD_HUMPH - .2byte EC_WORD_HUNGRY - .2byte EC_POKEMON(HUNTAIL) - .2byte EC_WORD_HURRIED - .2byte EC_WORD_HUSTLE - .2byte EC_MOVE2(HYDRO_CANNON) - .2byte EC_MOVE2(HYDRO_PUMP) - .2byte EC_WORD_HYPER - .2byte EC_MOVE2(HYPER_BEAM) - .2byte EC_WORD_HYPER_CUTTER - .2byte EC_MOVE2(HYPER_FANG) - .2byte EC_MOVE2(HYPER_VOICE) - .2byte EC_POKEMON2(HYPNO) - .2byte EC_MOVE(HYPNOSIS) - -gEasyChatWordsByLetter_I:: @ 859D696 - .2byte EC_WORD_I - .2byte EC_WORD_I_AM - .2byte EC_WORD_I_CHOOSE_YOU - .2byte EC_WORD_I_WAS - .2byte EC_WORD_I_VE - .2byte EC_WORD_I_VE_ARRIVED - .2byte EC_WORD_ICE - .2byte EC_MOVE(ICE_BALL) - .2byte EC_MOVE2(ICE_BEAM) - .2byte EC_MOVE2(ICE_PUNCH) - .2byte EC_MOVE2(ICICLE_SPEAR) - .2byte EC_MOVE(ICY_WIND) - .2byte EC_WORD_IDOL - .2byte EC_WORD_IF - .2byte EC_WORD_IF_I_LOSE - .2byte EC_WORD_IF_I_WIN - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(IGGLYBUFF) - .2byte EC_POKEMON2(IGGLYBUFF) - .2byte EC_WORD_IGNORANT - .2byte EC_WORD_ILLUMINATE - .2byte EC_POKEMON(ILLUMISE) - .2byte EC_WORD_IMMUNITY - .2byte EC_WORD_IMPORTANT - .2byte EC_WORD_IMPOSSIBLE - .2byte EC_MOVE2(IMPRISON) - .2byte EC_WORD_IN - .2byte EC_WORD_INCREASING - .2byte EC_WORD_INCREDIBLE - .2byte EC_WORD_INFORMATION - .2byte EC_MOVE2(INGRAIN) - .2byte EC_WORD_INNER_FOCUS - .2byte EC_WORD_INSIDE - .2byte EC_WORD_INSOMNIA - .2byte EC_WORD_INSTEAD - .2byte EC_WORD_INTIMIDATE - .2byte EC_WORD_INVINCIBLE - .2byte EC_MOVE2(IRON_DEFENSE) - .2byte EC_MOVE(IRON_TAIL) - .2byte EC_WORD_IS - .2byte EC_WORD_IS_IT_QUES - .2byte EC_WORD_ISN_T - .2byte EC_WORD_ISN_T_IT_QUES - .2byte EC_WORD_IT - .2byte EC_WORD_IT_S - .2byte EC_WORD_ITEM - .2byte EC_POKEMON2(IVYSAUR) - -gEasyChatWordsByLetter_J:: @ 859D6F6 - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(JIGGLYPUFF) - .2byte EC_POKEMON2(JIGGLYPUFF) - .2byte EC_POKEMON(JIRACHI) - .2byte EC_WORD_JOKING - .2byte EC_POKEMON2(JOLTEON) - .2byte EC_WORD_JOY - .2byte EC_WORD_JUDGE - .2byte EC_MOVE2(JUMP_KICK) - .2byte EC_POKEMON2(JUMPLUFF) - .2byte EC_WORD_JUST - .2byte EC_POKEMON2(JYNX) - -gEasyChatWordsByLetter_K:: @ 859D710 - .2byte EC_POKEMON2(KABUTO) - .2byte EC_POKEMON2(KABUTOPS) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(KADABRA) - .2byte EC_POKEMON2(KADABRA) - .2byte EC_POKEMON2(KAKUNA) - .2byte EC_POKEMON2(KANGASKHAN) - .2byte EC_MOVE(KARATE_CHOP) - .2byte EC_POKEMON(KECLEON) - .2byte EC_WORD_KEEN_EYE - .2byte EC_WORD_KID - .2byte EC_WORD_KIDDING - .2byte EC_WORD_KIND - .2byte EC_WORD_KINDERGARTEN - .2byte EC_MOVE(KINESIS) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(KINGDRA) - .2byte EC_POKEMON2(KINGDRA) - .2byte EC_POKEMON2(KINGLER) - .2byte EC_POKEMON(KIRLIA) - .2byte EC_MOVE2(KNOCK_OFF) - .2byte EC_WORD_KNOCKOUT - .2byte EC_WORD_KNOW - .2byte EC_WORD_KNOWS - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(KOFFING) - .2byte EC_POKEMON2(KOFFING) - .2byte EC_POKEMON2(KRABBY) - .2byte EC_WORD_KTHX_BYE - .2byte EC_POKEMON(KYOGRE) - -gEasyChatWordsByLetter_L:: @ 859D752 - .2byte EC_WORD_LACKING - .2byte EC_WORD_LACKS - .2byte EC_WORD_LADY - .2byte EC_POKEMON(LAIRON) - .2byte EC_WORD_LALALA - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(LANTURN) - .2byte EC_POKEMON2(LANTURN) - .2byte EC_POKEMON2(LAPRAS) - .2byte EC_POKEMON2(LARVITAR) - .2byte EC_WORD_LAST - .2byte EC_WORD_LATE - .2byte EC_WORD_LATER - .2byte EC_POKEMON(LATIAS) - .2byte EC_POKEMON(LATIOS) - .2byte EC_WORD_LAVISH - .2byte EC_WORD_LAY - .2byte EC_WORD_LEADER - .2byte EC_WORD_LEADERS - .2byte EC_WORD_LEAF - .2byte EC_MOVE2(LEAF_BLADE) - .2byte EC_WORD_LEARN - .2byte EC_POKEMON2(LEDIAN) - .2byte EC_POKEMON2(LEDYBA) - .2byte EC_MOVE(LEECH_LIFE) - .2byte EC_MOVE2(LEECH_SEED) - .2byte EC_MOVE2(LEER) - .2byte EC_WORD_LEFT - .2byte EC_WORD_LEGEND - .2byte EC_WORD_LESS - .2byte EC_WORD_LESSONS - .2byte EC_WORD_LET_ME_WIN - .2byte EC_WORD_LET_S - .2byte EC_WORD_LETTER - .2byte EC_WORD_LEVEL - .2byte EC_WORD_LEVITATE - .2byte EC_MOVE(LICK) - .2byte EC_POKEMON2(LICKITUNG) - .2byte EC_WORD_LIE - .2byte EC_WORD_LIFE - .2byte EC_MOVE2(LIGHT_SCREEN) - .2byte EC_WORD_LIGHTNINGROD - .2byte EC_WORD_LIKE - .2byte EC_WORD_LIKELY_TO - .2byte EC_WORD_LIKES - .2byte EC_POKEMON(LILEEP) - .2byte EC_WORD_LIMBER - .2byte EC_WORD_LINK - .2byte EC_POKEMON(LINOONE) - .2byte EC_WORD_LIQUID_OOZE - .2byte EC_WORD_LISTEN - .2byte EC_WORD_LISTENING - .2byte EC_WORD_LISTENS - .2byte EC_WORD_LIVING - .2byte EC_MOVE2(LOCK_ON) - .2byte EC_WORD_LOCOMOTIVE - .2byte EC_WORD_LOL - .2byte EC_WORD_LOLLING - .2byte EC_POKEMON(LOMBRE) - .2byte EC_WORD_LONESOME - .2byte EC_WORD_LOOK - .2byte EC_WORD_LOOKS - .2byte EC_WORD_LOSE - .2byte EC_WORD_LOSER - .2byte EC_WORD_LOSING - .2byte EC_WORD_LOSS - .2byte EC_WORD_LOST - .2byte EC_POKEMON(LOTAD) - .2byte EC_POKEMON(LOUDRED) - .2byte EC_WORD_LOUSY - .2byte EC_MOVE(LOVELY_KISS) - .2byte EC_WORD_LOVEY_DOVEY - .2byte EC_WORD_LOW - .2byte EC_MOVE(LOW_KICK) - .2byte EC_WORD_LOWS - .2byte EC_POKEMON(LUDICOLO) - .2byte EC_POKEMON2(LUGIA) - .2byte EC_WORD_LUKEWARM - .2byte EC_POKEMON(LUNATONE) - .2byte EC_MOVE2(LUSTER_PURGE) - .2byte EC_POKEMON(LUVDISC) - -gEasyChatWordsByLetter_M:: @ 859D7F6 - .2byte EC_MOVE2(MACH_PUNCH) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MACHAMP) - .2byte EC_POKEMON2(MACHAMP) - .2byte EC_WORD_MACHINE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MACHOKE) - .2byte EC_POKEMON2(MACHOKE) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MACHOP) - .2byte EC_POKEMON2(MACHOP) - .2byte EC_WORD_MAGAZINE - .2byte EC_POKEMON2(MAGBY) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MAGCARGO) - .2byte EC_POKEMON2(MAGCARGO) - .2byte EC_MOVE2(MAGIC_COAT) - .2byte EC_MOVE2(MAGICAL_LEAF) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MAGIKARP) - .2byte EC_POKEMON2(MAGIKARP) - .2byte EC_WORD_MAGMA_ARMOR - .2byte EC_POKEMON2(MAGMAR) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MAGNEMITE) - .2byte EC_POKEMON2(MAGNEMITE) - .2byte EC_WORD_MAGNET_PULL - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MAGNETON) - .2byte EC_POKEMON2(MAGNETON) - .2byte EC_MOVE2(MAGNITUDE) - .2byte EC_WORD_MAIL - .2byte EC_WORD_MAKE - .2byte EC_WORD_MAKING - .2byte EC_POKEMON(MAKUHITA) - .2byte EC_WORD_MAN - .2byte EC_POKEMON(MANECTRIC) - .2byte EC_POKEMON2(MANKEY) - .2byte EC_POKEMON2(MANTINE) - .2byte EC_POKEMON2(MAREEP) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MARILL) - .2byte EC_POKEMON2(MARILL) - .2byte EC_POKEMON2(MAROWAK) - .2byte EC_POKEMON(MARSHTOMP) - .2byte EC_WORD_MARVEL_SCALE - .2byte EC_POKEMON(MASQUERAIN) - .2byte EC_WORD_MASTER - .2byte EC_WORD_MATCH - .2byte EC_WORD_MATCH_UP - .2byte EC_POKEMON(MAWILE) - .2byte EC_WORD_MAYBE - .2byte EC_WORD_MC - .2byte EC_WORD_ME - .2byte EC_WORD_MEAN - .2byte EC_MOVE(MEAN_LOOK) - .2byte EC_POKEMON(MEDICHAM) - .2byte EC_MOVE2(MEDITATE) - .2byte EC_POKEMON(MEDITITE) - .2byte EC_WORD_MEET - .2byte EC_WORD_MEET_YOU - .2byte EC_WORD_MEETS - .2byte EC_WORD_MEGA - .2byte EC_MOVE2(MEGA_DRAIN) - .2byte EC_MOVE2(MEGA_KICK) - .2byte EC_MOVE2(MEGA_PUNCH) - .2byte EC_MOVE2(MEGAHORN) - .2byte EC_POKEMON2(MEGANIUM) - .2byte EC_MOVE(MEMENTO) - .2byte EC_POKEMON2(MEOWTH) - .2byte EC_WORD_MESSAGE - .2byte EC_POKEMON(METAGROSS) - .2byte EC_MOVE2(METAL_CLAW) - .2byte EC_MOVE(METAL_SOUND) - .2byte EC_POKEMON(METANG) - .2byte EC_POKEMON2(METAPOD) - .2byte EC_MOVE(METEOR_MASH) - .2byte EC_MOVE2(METRONOME) - .2byte EC_POKEMON2(MEW) - .2byte EC_POKEMON2(MEWTWO) - .2byte EC_POKEMON(MIGHTYENA) - .2byte EC_MOVE2(MILK_DRINK) - .2byte EC_POKEMON(MILOTIC) - .2byte EC_POKEMON2(MILTANK) - .2byte EC_MOVE2(MIMIC) - .2byte EC_MOVE(MIND_READER) - .2byte EC_MOVE2(MINIMIZE) - .2byte EC_POKEMON(MINUN) - .2byte EC_WORD_MINUS - .2byte EC_MOVE2(MIRROR_COAT) - .2byte EC_MOVE(MIRROR_MOVE) - .2byte EC_POKEMON2(MISDREAVUS) - .2byte EC_WORD_MISHEARD - .2byte EC_WORD_MISS - .2byte EC_MOVE(MIST) - .2byte EC_MOVE2(MIST_BALL) - .2byte EC_WORD_MISTAKE - .2byte EC_WORD_MMM - .2byte EC_WORD_MODE - .2byte EC_WORD_MODERN - .2byte EC_POKEMON2(MOLTRES) - .2byte EC_WORD_MOMENTUM - .2byte EC_WORD_MONDAY - .2byte EC_WORD_MONEY - .2byte EC_WORD_MONTH - .2byte EC_WORD_MOOD - .2byte EC_MOVE2(MOONLIGHT) - .2byte EC_WORD_MORE - .2byte EC_WORD_MORNING - .2byte EC_MOVE(MORNING_SUN) - .2byte EC_WORD_MOTHER - .2byte EC_WORD_MOVE - .2byte EC_WORD_MOVIE - .2byte EC_WORD_MR - .2byte EC_POKEMON2(MR_MIME) - .2byte EC_WORD_MRS - .2byte EC_WORD_MUCH - .2byte EC_WORD_MUCH_OBLIGED - .2byte EC_MOVE2(MUD_SHOT) - .2byte EC_MOVE2(MUD_SPORT) - .2byte EC_MOVE2(MUD_SLAP) - .2byte EC_MOVE2(MUDDY_WATER) - .2byte EC_POKEMON(MUDKIP) - .2byte EC_WORD_MUFUFU - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MUK) - .2byte EC_POKEMON2(MUK) - .2byte EC_POKEMON2(MURKROW) - .2byte EC_WORD_MUSIC - .2byte EC_WORD_MUST_BE - .2byte EC_WORD_MY - .2byte EC_WORD_MYSELF - .2byte EC_WORD_MYSTERY - -gEasyChatWordsByLetter_N:: @ 859D912 - .2byte EC_WORD_NAME - .2byte EC_WORD_NAP - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(NATU) - .2byte EC_POKEMON2(NATU) - .2byte EC_WORD_NATURAL - .2byte EC_WORD_NATURAL_CURE - .2byte EC_WORD_NATURALLY - .2byte EC_WORD_NATURE - .2byte EC_MOVE(NATURE_POWER) - .2byte EC_WORD_NEAR - .2byte EC_WORD_NEARLY - .2byte EC_WORD_NEED - .2byte EC_MOVE2(NEEDLE_ARM) - .2byte EC_WORD_NEGATIVE - .2byte EC_WORD_NEVER - .2byte EC_WORD_NEW - .2byte EC_WORD_NEWS - .2byte EC_WORD_NEXT - .2byte EC_WORD_NICE - .2byte EC_POKEMON2(NIDOKING) - .2byte EC_POKEMON2(NIDOQUEEN) - .2byte EC_POKEMON2(NIDORAN_F) - .2byte EC_POKEMON2(NIDORAN_M) - .2byte EC_POKEMON2(NIDORINA) - .2byte EC_POKEMON2(NIDORINO) - .2byte EC_WORD_NIGHT - .2byte EC_MOVE2(NIGHT_SHADE) - .2byte EC_MOVE(NIGHTMARE) - .2byte EC_WORD_NIGHTTIME - .2byte EC_POKEMON(NINCADA) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(NINETALES) - .2byte EC_POKEMON2(NINETALES) - .2byte EC_POKEMON(NINJASK) - .2byte EC_WORD_NITWIT - .2byte EC_WORD_NO - .2byte EC_WORD_NO_MATCH - .2byte EC_WORD_NO_1 - .2byte EC_POKEMON2(NOCTOWL) - .2byte EC_WORD_NOISY - .2byte EC_WORD_NON_STOP - .2byte EC_WORD_NONE - .2byte EC_WORD_NOPE - .2byte EC_WORD_NORMAL - .2byte EC_POKEMON(NOSEPASS) - .2byte EC_WORD_NOT - .2byte EC_WORD_NOT_VERY - .2byte EC_WORD_NOTHING - .2byte EC_WORD_NOW - .2byte EC_POKEMON(NUMEL) - .2byte EC_POKEMON(NUZLEAF) - -gEasyChatWordsByLetter_O:: @ 859D97E - .2byte EC_WORD_OBLIVIOUS - .2byte EC_MOVE(OCTAZOOKA) - .2byte EC_POKEMON2(OCTILLERY) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(ODDISH) - .2byte EC_POKEMON2(ODDISH) - .2byte EC_MOVE(ODOR_SLEUTH) - .2byte EC_WORD_OF - .2byte EC_WORD_OFF - .2byte EC_WORD_OFFENSIVE - .2byte EC_WORD_OH - .2byte EC_WORD_OH_DEAR - .2byte EC_WORD_OH_YEAH - .2byte EC_WORD_OH_KAY - .2byte EC_WORD_OH_QUES - .2byte EC_WORD_OI - .2byte EC_WORD_OI_OI_OI - .2byte EC_WORD_OK_QUES - .2byte EC_WORD_OKAY - .2byte EC_WORD_OLD - .2byte EC_WORD_OLDEN - .2byte EC_POKEMON2(OMANYTE) - .2byte EC_POKEMON2(OMASTAR) - .2byte EC_WORD_ON - .2byte EC_WORD_ONCE - .2byte EC_POKEMON2(ONIX) - .2byte EC_WORD_ONLY - .2byte EC_WORD_OOPS - .2byte EC_WORD_OPPONENT - .2byte EC_WORD_OPPOSITE - .2byte EC_WORD_OR - .2byte EC_WORD_OTHER - .2byte EC_WORD_OUR - .2byte EC_WORD_OUT - .2byte EC_MOVE(OUTRAGE) - .2byte EC_WORD_OUTSIDE - .2byte EC_WORD_OVER - .2byte EC_WORD_OVERDO - .2byte EC_WORD_OVERGROW - .2byte EC_MOVE(OVERHEAT) - .2byte EC_WORD_OVERWHELMING - .2byte EC_WORD_OWN - .2byte EC_WORD_OWN_TEMPO - -gEasyChatWordsByLetter_P:: @ 859D9D6 - .2byte EC_MOVE(PAIN_SPLIT) - .2byte EC_POKEMON2(PARAS) - .2byte EC_POKEMON2(PARASECT) - .2byte EC_WORD_PARDON - .2byte EC_WORD_PARENT - .2byte EC_WORD_PARTNER - .2byte EC_WORD_PARTY - .2byte EC_WORD_PATTERN - .2byte EC_MOVE2(PAY_DAY) - .2byte EC_WORD_PC - .2byte EC_MOVE2(PECK) - .2byte EC_POKEMON(PELIPPER) - .2byte EC_WORD_PERFECT - .2byte EC_WORD_PERFECTION - .2byte EC_MOVE2(PERISH_SONG) - .2byte EC_POKEMON2(PERSIAN) - .2byte EC_WORD_PERSON - .2byte EC_MOVE2(PETAL_DANCE) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(PHANPY) - .2byte EC_POKEMON2(PHANPY) - .2byte EC_WORD_PHONE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(PICHU) - .2byte EC_POKEMON2(PICHU) - .2byte EC_WORD_PICKUP - .2byte EC_POKEMON2(PIDGEOT) - .2byte EC_POKEMON2(PIDGEOTTO) - .2byte EC_POKEMON2(PIDGEY) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(PIKACHU) - .2byte EC_POKEMON2(PIKACHU) - .2byte EC_POKEMON2(PILOSWINE) - .2byte EC_MOVE2(PIN_MISSILE) - .2byte EC_POKEMON2(PINECO) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(PINSIR) - .2byte EC_POKEMON2(PINSIR) - .2byte EC_WORD_PKRS - .2byte EC_WORD_PLACE - .2byte EC_WORD_PLANS - .2byte EC_WORD_PLAY - .2byte EC_WORD_PLAYED - .2byte EC_WORD_PLAYS - .2byte EC_WORD_PLEASE - .2byte EC_WORD_PLUS - .2byte EC_WORD_PLUSH_DOLL - .2byte EC_POKEMON(PLUSLE) - .2byte EC_WORD_POINTS - .2byte EC_WORD_POISON - .2byte EC_MOVE2(POISON_FANG) - .2byte EC_MOVE2(POISON_GAS) - .2byte EC_WORD_POISON_POINT - .2byte EC_MOVE2(POISON_STING) - .2byte EC_MOVE2(POISON_TAIL) - .2byte EC_MOVE2(POISON_POWDER) - .2byte EC_WORD_POKEBLOCK - .2byte EC_WORD_POKEDEX - .2byte EC_WORD_POKEMON - .2byte EC_WORD_POKENAV - .2byte EC_POKEMON2(POLITOED) - .2byte EC_POKEMON2(POLIWAG) - .2byte EC_POKEMON2(POLIWHIRL) - .2byte EC_POKEMON2(POLIWRATH) - .2byte EC_POKEMON2(PONYTA) - .2byte EC_POKEMON(POOCHYENA) - .2byte EC_WORD_POPULAR - .2byte EC_POKEMON2(PORYGON) - .2byte EC_POKEMON2(PORYGON2) - .2byte EC_MOVE2(POUND) - .2byte EC_MOVE(POWDER_SNOW) - .2byte EC_WORD_POWER - .2byte EC_WORD_PRAISE - .2byte EC_WORD_PREPOSTEROUS - .2byte EC_MOVE2(PRESENT) - .2byte EC_WORD_PRESSURE - .2byte EC_WORD_PRETEND - .2byte EC_WORD_PRETTY - .2byte EC_POKEMON2(PRIMEAPE) - .2byte EC_WORD_PROBABLY - .2byte EC_WORD_PROMISE - .2byte EC_MOVE2(PROTECT) - .2byte EC_MOVE(PSYBEAM) - .2byte EC_MOVE(PSYCH_UP) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_WORD_PSYCHIC - .2byte EC_MOVE(PSYCHIC) - .2byte EC_MOVE(PSYCHO_BOOST) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(PSYDUCK) - .2byte EC_POKEMON2(PSYDUCK) - .2byte EC_MOVE(PSYWAVE) - .2byte EC_POKEMON2(PUPITAR) - .2byte EC_WORD_PURE_POWER - .2byte EC_MOVE(PURSUIT) - .2byte EC_WORD_PUSHOVER - -gEasyChatWordsByLetter_Q:: @ 859DAA2 - .2byte EC_POKEMON2(QUAGSIRE) - .2byte EC_WORD_QUESTION - .2byte EC_MOVE2(QUICK_ATTACK) - .2byte EC_POKEMON2(QUILAVA) - .2byte EC_WORD_QUITE - .2byte EC_POKEMON2(QWILFISH) - -gEasyChatWordsByLetter_R:: @ 859DAAE - .2byte EC_WORD_RADIO - .2byte EC_MOVE(RAGE) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(RAICHU) - .2byte EC_POKEMON2(RAICHU) - .2byte EC_POKEMON2(RAIKOU) - .2byte EC_MOVE(RAIN_DANCE) - .2byte EC_WORD_RAIN_DISH - .2byte EC_POKEMON(RALTS) - .2byte EC_WORD_RANK - .2byte EC_MOVE(RAPID_SPIN) - .2byte EC_POKEMON2(RAPIDASH) - .2byte EC_WORD_RARE - .2byte EC_WORD_RATHER - .2byte EC_POKEMON2(RATICATE) - .2byte EC_POKEMON2(RATTATA) - .2byte EC_POKEMON(RAYQUAZA) - .2byte EC_MOVE2(RAZOR_LEAF) - .2byte EC_MOVE(RAZOR_WIND) - .2byte EC_WORD_READY - .2byte EC_WORD_REALLY - .2byte EC_WORD_REAR - .2byte EC_WORD_RECEIVED - .2byte EC_WORD_RECOMMEND - .2byte EC_MOVE(RECOVER) - .2byte EC_MOVE2(RECYCLE) - .2byte EC_WORD_RED - .2byte EC_MOVE2(REFLECT) - .2byte EC_MOVE2(REFRESH) - .2byte EC_WORD_REFRESHING - .2byte EC_WORD_REFUSE - .2byte EC_POKEMON(REGICE) - .2byte EC_POKEMON(REGIROCK) - .2byte EC_POKEMON(REGISTEEL) - .2byte EC_WORD_REJECT - .2byte EC_WORD_RELEASE - .2byte EC_POKEMON(RELICANTH) - .2byte EC_POKEMON2(REMORAID) - .2byte EC_WORD_RENTAL - .2byte EC_MOVE2(REST) - .2byte EC_WORD_RESUSCITATE - .2byte EC_MOVE(RETURN) - .2byte EC_MOVE2(REVENGE) - .2byte EC_MOVE(REVERSAL) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(RHYDON) - .2byte EC_POKEMON2(RHYDON) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(RHYHORN) - .2byte EC_POKEMON2(RHYHORN) - .2byte EC_WORD_RIBBON - .2byte EC_WORD_RICKETY - .2byte EC_WORD_RIGHT - .2byte EC_WORD_RIPPED - .2byte EC_WORD_RIVAL - .2byte EC_MOVE2(ROAR) - .2byte EC_WORD_ROCK - .2byte EC_MOVE2(ROCK_BLAST) - .2byte EC_WORD_ROCK_HEAD - .2byte EC_MOVE(ROCK_SLIDE) - .2byte EC_MOVE(ROCK_SMASH) - .2byte EC_MOVE(ROCK_THROW) - .2byte EC_MOVE(ROCK_TOMB) - .2byte EC_WORD_ROCK_SOLID - .2byte EC_MOVE2(ROLE_PLAY) - .2byte EC_MOVE2(ROLLING_KICK) - .2byte EC_MOVE(ROLLOUT) - .2byte EC_WORD_ROMANTIC - .2byte EC_WORD_ROOM - .2byte EC_POKEMON(ROSELIA) - .2byte EC_WORD_ROUGH_SKIN - .2byte EC_WORD_RPG - .2byte EC_WORD_RUBY - .2byte EC_WORD_RULE - .2byte EC_WORD_RUN - .2byte EC_WORD_RUN_AWAY - .2byte EC_WORD_RUNS - -gEasyChatWordsByLetter_S:: @ 859DB4E - .2byte EC_POKEMON(SABLEYE) - .2byte EC_MOVE(SACRED_FIRE) - .2byte EC_WORD_SAD - .2byte EC_WORD_SADLY - .2byte EC_MOVE(SAFEGUARD) - .2byte EC_WORD_SAID - .2byte EC_POKEMON(SALAMENCE) - .2byte EC_WORD_SAND_STREAM - .2byte EC_MOVE(SAND_TOMB) - .2byte EC_WORD_SAND_VEIL - .2byte EC_MOVE(SAND_ATTACK) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(SANDSHREW) - .2byte EC_POKEMON2(SANDSHREW) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(SANDSLASH) - .2byte EC_POKEMON2(SANDSLASH) - .2byte EC_MOVE(SANDSTORM) - .2byte EC_WORD_SAPPHIRE - .2byte EC_WORD_SATISFIED - .2byte EC_WORD_SATURDAY - .2byte EC_WORD_SAYS - .2byte EC_WORD_SCARY - .2byte EC_MOVE(SCARY_FACE) - .2byte EC_WORD_SCATTER - .2byte EC_POKEMON(SCEPTILE) - .2byte EC_WORD_SCHOOL - .2byte EC_POKEMON2(SCIZOR) - .2byte EC_MOVE2(SCRATCH) - .2byte EC_MOVE(SCREECH) - .2byte EC_POKEMON2(SCYTHER) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(SEADRA) - .2byte EC_POKEMON2(SEADRA) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(SEAKING) - .2byte EC_POKEMON2(SEAKING) - .2byte EC_POKEMON(SEALEO) - .2byte EC_WORD_SEARCH - .2byte EC_WORD_SECRET - .2byte EC_WORD_SECRET_BASE - .2byte EC_MOVE2(SECRET_POWER) - .2byte EC_WORD_SEE - .2byte EC_WORD_SEE_YA - .2byte EC_POKEMON(SEEDOT) - .2byte EC_WORD_SEEK - .2byte EC_POKEMON2(SEEL) - .2byte EC_WORD_SEEMS - .2byte EC_WORD_SEES - .2byte EC_MOVE2(SEISMIC_TOSS) - .2byte EC_MOVE(SELF_DESTRUCT) - .2byte EC_WORD_SENSE - .2byte EC_POKEMON2(SENTRET) - .2byte EC_WORD_SERENE_GRACE - .2byte EC_WORD_SERIOUS - .2byte EC_WORD_SERIOUSLY - .2byte EC_WORD_SERVICE - .2byte EC_POKEMON(SEVIPER) - .2byte EC_MOVE(SHADOW_BALL) - .2byte EC_MOVE(SHADOW_PUNCH) - .2byte EC_WORD_SHADOW_TAG - .2byte EC_WORD_SHADY - .2byte EC_WORD_SHAKE - .2byte EC_WORD_SHAKY - .2byte EC_WORD_SHALLOW - .2byte EC_POKEMON(SHARPEDO) - .2byte EC_MOVE(SHARPEN) - .2byte EC_WORD_SHE - .2byte EC_WORD_SHE_IS - .2byte EC_WORD_SHE_WAS - .2byte EC_WORD_SHED_SKIN - .2byte EC_POKEMON(SHEDINJA) - .2byte EC_MOVE(SHEER_COLD) - .2byte EC_POKEMON(SHELGON) - .2byte EC_WORD_SHELL_ARMOR - .2byte EC_POKEMON2(SHELLDER) - .2byte EC_WORD_SHIELD_DUST - .2byte EC_POKEMON(SHIFTRY) - .2byte EC_WORD_SHINE - .2byte EC_MOVE2(SHOCK_WAVE) - .2byte EC_WORD_SHOCKED - .2byte EC_WORD_SHOPPING - .2byte EC_WORD_SHOULD - .2byte EC_WORD_SHOW - .2byte EC_WORD_SHREDDED - .2byte EC_POKEMON(SHROOMISH) - .2byte EC_POKEMON2(SHUCKLE) - .2byte EC_POKEMON(SHUPPET) - .2byte EC_WORD_SIBLINGS - .2byte EC_WORD_SIGH - .2byte EC_MOVE(SIGNAL_BEAM) - .2byte EC_POKEMON(SILCOON) - .2byte EC_WORD_SILKY - .2byte EC_WORD_SILVER - .2byte EC_MOVE(SILVER_WIND) - .2byte EC_WORD_SIMPLE - .2byte EC_WORD_SINCE - .2byte EC_MOVE(SING) - .2byte EC_WORD_SINK - .2byte EC_WORD_SISTER - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(SKARMORY) - .2byte EC_POKEMON2(SKARMORY) - .2byte EC_MOVE(SKETCH) - .2byte EC_WORD_SKILL - .2byte EC_MOVE(SKILL_SWAP) - .2byte EC_WORD_SKILLED - .2byte EC_POKEMON2(SKIPLOOM) - .2byte EC_POKEMON(SKITTY) - .2byte EC_MOVE2(SKULL_BASH) - .2byte EC_MOVE(SKY_ATTACK) - .2byte EC_MOVE(SKY_UPPERCUT) - .2byte EC_MOVE2(SLACK_OFF) - .2byte EC_POKEMON(SLAKING) - .2byte EC_POKEMON(SLAKOTH) - .2byte EC_MOVE2(SLAM) - .2byte EC_MOVE(SLASH) - .2byte EC_WORD_SLEEP - .2byte EC_MOVE2(SLEEP_POWDER) - .2byte EC_MOVE2(SLEEP_TALK) - .2byte EC_WORD_SLEPT - .2byte EC_WORD_SLIDE - .2byte EC_WORD_SLIMY - .2byte EC_POKEMON2(SLOWBRO) - .2byte EC_POKEMON2(SLOWKING) - .2byte EC_POKEMON2(SLOWPOKE) - .2byte EC_MOVE2(SLUDGE) - .2byte EC_MOVE2(SLUDGE_BOMB) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(SLUGMA) - .2byte EC_POKEMON2(SLUGMA) - .2byte EC_WORD_SMACK - .2byte EC_WORD_SMALL - .2byte EC_WORD_SMART - .2byte EC_WORD_SMARTNESS - .2byte EC_POKEMON2(SMEARGLE) - .2byte EC_WORD_SMELL - .2byte EC_WORD_SMELL_YA - .2byte EC_MOVE(SMELLING_SALT) - .2byte EC_WORD_SMITE - .2byte EC_MOVE(SMOG) - .2byte EC_MOVE(SMOKESCREEN) - .2byte EC_POKEMON2(SMOOCHUM) - .2byte EC_WORD_SMOOTH - .2byte EC_MOVE2(SNATCH) - .2byte EC_POKEMON2(SNEASEL) - .2byte EC_MOVE(SNORE) - .2byte EC_POKEMON2(SNORLAX) - .2byte EC_WORD_SNORT - .2byte EC_POKEMON(SNORUNT) - .2byte EC_POKEMON2(SNUBBULL) - .2byte EC_WORD_SO - .2byte EC_MOVE2(SOFT_BOILED) - .2byte EC_WORD_SOFTWARE - .2byte EC_MOVE(SOLAR_BEAM) - .2byte EC_POKEMON(SOLROCK) - .2byte EC_WORD_SOME - .2byte EC_WORD_SOMEHOW - .2byte EC_WORD_SOMEONE - .2byte EC_WORD_SOMETHING - .2byte EC_WORD_SOMETIME - .2byte EC_WORD_SON - .2byte EC_WORD_SONG - .2byte EC_WORD_SONGS - .2byte EC_MOVE(SONIC_BOOM) - .2byte EC_WORD_SOON - .2byte EC_WORD_SORRY - .2byte EC_WORD_SOUNDPROOF - .2byte EC_WORD_SP_ABILITY - .2byte EC_MOVE(SPARK) - .2byte EC_POKEMON2(SPEAROW) - .2byte EC_WORD_SPECTATOR - .2byte EC_WORD_SPEED_BOOST - .2byte EC_POKEMON(SPHEAL) - .2byte EC_MOVE(SPIDER_WEB) - .2byte EC_MOVE2(SPIKE_CANNON) - .2byte EC_MOVE2(SPIKES) - .2byte EC_POKEMON2(SPINARAK) - .2byte EC_POKEMON(SPINDA) - .2byte EC_WORD_SPIRALING - .2byte EC_WORD_SPIRIT - .2byte EC_MOVE2(SPIT_UP) - .2byte EC_MOVE(SPITE) - .2byte EC_MOVE2(SPLASH) - .2byte EC_POKEMON(SPOINK) - .2byte EC_MOVE(SPORE) - .2byte EC_WORD_SPORTS - .2byte EC_WORD_SPRING - .2byte EC_POKEMON2(SQUIRTLE) - .2byte EC_WORD_STAGE - .2byte EC_POKEMON2(STANTLER) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(STARMIE) - .2byte EC_POKEMON2(STARMIE) - .2byte EC_WORD_START - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(STARYU) - .2byte EC_POKEMON2(STARYU) - .2byte EC_WORD_STATIC - .2byte EC_WORD_STAY_AT_HOME - .2byte EC_WORD_STEEL - .2byte EC_MOVE2(STEEL_WING) - .2byte EC_POKEMON2(STEELIX) - .2byte EC_WORD_STENCH - .2byte EC_WORD_STICKY_HOLD - .2byte EC_MOVE2(STOCKPILE) - .2byte EC_MOVE2(STOMP) - .2byte EC_WORD_STOP - .2byte EC_WORD_STORE - .2byte EC_WORD_STORES - .2byte EC_WORD_STORY - .2byte EC_WORD_STRATEGY - .2byte EC_MOVE(STRENGTH) - .2byte EC_MOVE(STRING_SHOT) - .2byte EC_WORD_STRONG - .2byte EC_MOVE2(STRUGGLE) - .2byte EC_WORD_STUDY - .2byte EC_MOVE(STUN_SPORE) - .2byte EC_WORD_STURDY - .2byte EC_MOVE(SUBMISSION) - .2byte EC_MOVE2(SUBSTITUTE) - .2byte EC_WORD_SUCTION_CUPS - .2byte EC_POKEMON2(SUDOWOODO) - .2byte EC_POKEMON2(SUICUNE) - .2byte EC_WORD_SUMMER - .2byte EC_WORD_SUNDAY - .2byte EC_POKEMON2(SUNFLORA) - .2byte EC_POKEMON2(SUNKERN) - .2byte EC_MOVE2(SUNNY_DAY) - .2byte EC_WORD_SUPER - .2byte EC_MOVE(SUPER_FANG) - .2byte EC_MOVE2(SUPERPOWER) - .2byte EC_MOVE2(SUPERSONIC) - .2byte EC_MOVE2(SURF) - .2byte EC_WORD_SURPRISE - .2byte EC_WORD_SURRENDER - .2byte EC_POKEMON(SURSKIT) - .2byte EC_POKEMON(SWABLU) - .2byte EC_MOVE(SWAGGER) - .2byte EC_MOVE2(SWALLOW) - .2byte EC_POKEMON(SWALOT) - .2byte EC_POKEMON(SWAMPERT) - .2byte EC_WORD_SWARM - .2byte EC_MOVE2(SWEET_KISS) - .2byte EC_MOVE(SWEET_SCENT) - .2byte EC_WORD_SWEETS - .2byte EC_POKEMON(SWELLOW) - .2byte EC_MOVE(SWIFT) - .2byte EC_WORD_SWIFT_SWIM - .2byte EC_POKEMON2(SWINUB) - .2byte EC_MOVE2(SWORDS_DANCE) - .2byte EC_WORD_SYNCHRONIZE - .2byte EC_MOVE(SYNTHESIS) - .2byte EC_WORD_SYSTEM - -gEasyChatWordsByLetter_T:: @ 859DD5A - .2byte EC_MOVE2(TACKLE) - .2byte EC_MOVE2(TAIL_GLOW) - .2byte EC_MOVE(TAIL_WHIP) - .2byte EC_POKEMON(TAILLOW) - .2byte EC_WORD_TAKE - .2byte EC_MOVE2(TAKE_DOWN) - .2byte EC_WORD_TAKE_THAT - .2byte EC_WORD_TALENT - .2byte EC_WORD_TALK - .2byte EC_WORD_TALKING - .2byte EC_POKEMON2(TANGELA) - .2byte EC_WORD_TASTY - .2byte EC_MOVE2(TAUNT) - .2byte EC_POKEMON2(TAUROS) - .2byte EC_WORD_TCH - .2byte EC_WORD_TEACH - .2byte EC_WORD_TEACHER - .2byte EC_WORD_TEACHES - .2byte EC_POKEMON2(TEDDIURSA) - .2byte EC_MOVE2(TEETER_DANCE) - .2byte EC_MOVE2(TELEPORT) - .2byte EC_WORD_TELEVISION - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(TENTACOOL) - .2byte EC_POKEMON2(TENTACOOL) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(TENTACRUEL) - .2byte EC_POKEMON2(TENTACRUEL) - .2byte EC_WORD_TERRIBLE - .2byte EC_WORD_TEST - .2byte EC_WORD_THAN - .2byte EC_WORD_THANK_YOU - .2byte EC_WORD_THANKS - .2byte EC_WORD_THAT - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_THAT_S - .2byte EC_WORD_THAT_S_IT_EXCL - .2byte EC_WORD_THE - .2byte EC_WORD_THEIR - .2byte EC_WORD_THERE - .2byte EC_WORD_THESE - .2byte EC_WORD_THESE_WERE - .2byte EC_WORD_THEY - .2byte EC_WORD_THEY_WERE - .2byte EC_WORD_THEY_RE - .2byte EC_WORD_THEY_VE - .2byte EC_WORD_THICK - .2byte EC_WORD_THICK_FAT - .2byte EC_MOVE2(THIEF) - .2byte EC_WORD_THIN - .2byte EC_WORD_THING - .2byte EC_WORD_THINGS - .2byte EC_WORD_THINK - .2byte EC_WORD_THINKS - .2byte EC_WORD_THIRSTY - .2byte EC_WORD_THIS - .2byte EC_WORD_THIS_IS_IT_EXCL - .2byte EC_WORD_THOSE - .2byte EC_WORD_THOSE_ARE - .2byte EC_WORD_THOSE_WERE - .2byte EC_MOVE(THRASH) - .2byte EC_WORD_THROW - .2byte EC_MOVE(THUNDER) - .2byte EC_MOVE2(THUNDER_WAVE) - .2byte EC_MOVE(THUNDERBOLT) - .2byte EC_MOVE(THUNDER_PUNCH) - .2byte EC_MOVE2(THUNDER_SHOCK) - .2byte EC_WORD_THURSDAY - .2byte EC_MOVE(TICKLE) - .2byte EC_WORD_TICKLISH - .2byte EC_WORD_TIGHT - .2byte EC_WORD_TIME - .2byte EC_WORD_TIMES - .2byte EC_WORD_TIRED - .2byte EC_WORD_TO - .2byte EC_WORD_TO_HER - .2byte EC_WORD_TO_ME - .2byte EC_WORD_TO_THEM - .2byte EC_WORD_TO_US - .2byte EC_WORD_TO_WHOM - .2byte EC_WORD_TODAY - .2byte EC_POKEMON2(TOGEPI) - .2byte EC_WORD_TOGETHER - .2byte EC_POKEMON2(TOGETIC) - .2byte EC_WORD_TOMORROW - .2byte EC_WORD_TOO - .2byte EC_WORD_TOO_LATE - .2byte EC_WORD_TOO_STRONG - .2byte EC_WORD_TOO_WEAK - .2byte EC_WORD_TOP - .2byte EC_POKEMON(TORCHIC) - .2byte EC_POKEMON(TORKOAL) - .2byte EC_MOVE(TORMENT) - .2byte EC_WORD_TORRENT - .2byte EC_WORD_TOTALLY - .2byte EC_POKEMON2(TOTODILE) - .2byte EC_WORD_TOUGH - .2byte EC_WORD_TOUGHNESS - .2byte EC_WORD_TOURNAMENT - .2byte EC_WORD_TOWER - .2byte EC_MOVE2(TOXIC) - .2byte EC_WORD_TOYS - .2byte EC_WORD_TRACE - .2byte EC_WORD_TRADE - .2byte EC_WORD_TRAIN - .2byte EC_WORD_TRAINER - .2byte EC_WORD_TRAINS - .2byte EC_MOVE2(TRANSFORM) - .2byte EC_POKEMON(TRAPINCH) - .2byte EC_WORD_TRAVEL - .2byte EC_WORD_TREASURE - .2byte EC_POKEMON(TREECKO) - .2byte EC_WORD_TRENDY - .2byte EC_MOVE2(TRI_ATTACK) - .2byte EC_MOVE2(TRICK) - .2byte EC_WORD_TRIES - .2byte EC_MOVE2(TRIPLE_KICK) - .2byte EC_POKEMON(TROPIUS) - .2byte EC_WORD_TRUANT - .2byte EC_WORD_TRULY - .2byte EC_WORD_TRUMP_CARD - .2byte EC_WORD_TRUST - .2byte EC_WORD_TRY - .2byte EC_WORD_TUESDAY - .2byte EC_MOVE2(TWINEEDLE) - .2byte EC_WORD_TWIRLING - .2byte EC_MOVE2(TWISTER) - .2byte EC_WORD_TYPE - .2byte EC_POKEMON2(TYPHLOSION) - .2byte EC_POKEMON2(TYRANITAR) - .2byte EC_POKEMON2(TYROGUE) - -gEasyChatWordsByLetter_U:: @ 859DE64 - .2byte EC_WORD_UGLY - .2byte EC_WORD_UH_HUH - .2byte EC_WORD_UH_OH - .2byte EC_WORD_UM - .2byte EC_POKEMON2(UMBREON) - .2byte EC_WORD_UNAVOIDABLE - .2byte EC_WORD_UNBELIEVABLE - .2byte EC_WORD_UNCLE - .2byte EC_WORD_UNDERSTAND - .2byte EC_WORD_UNDERSTANDS - .2byte EC_WORD_UNDERSTOOD - .2byte EC_WORD_UNION - .2byte EC_POKEMON2(UNOWN) - .2byte EC_WORD_UNTIL - .2byte EC_WORD_UP - .2byte EC_WORD_UPBEAT - .2byte EC_MOVE(UPROAR) - .2byte EC_WORD_UPSIDE_DOWN - .2byte EC_WORD_URGH - .2byte EC_POKEMON2(URSARING) - .2byte EC_WORD_USE - .2byte EC_WORD_USELESS - .2byte EC_WORD_USES - .2byte EC_WORD_USING - -gEasyChatWordsByLetter_V:: @ 859DE94 - .2byte EC_WORD_VACATION - .2byte EC_POKEMON2(VAPOREON) - .2byte EC_POKEMON2(VENOMOTH) - .2byte EC_POKEMON2(VENONAT) - .2byte EC_POKEMON2(VENUSAUR) - .2byte EC_WORD_VERSION - .2byte EC_WORD_VERSUS - .2byte EC_WORD_VERY - .2byte EC_POKEMON(VIBRAVA) - .2byte EC_MOVE2(VICE_GRIP) - .2byte EC_WORD_VICTORY - .2byte EC_POKEMON2(VICTREEBEL) - .2byte EC_WORD_VIEWING - .2byte EC_POKEMON(VIGOROTH) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(VILEPLUME) - .2byte EC_POKEMON2(VILEPLUME) - .2byte EC_MOVE2(VINE_WHIP) - .2byte EC_WORD_VITAL_SPIRIT - .2byte EC_MOVE(VITAL_THROW) - .2byte EC_POKEMON(VOLBEAT) - .2byte EC_WORD_VOLT_ABSORB - .2byte EC_MOVE2(VOLT_TACKLE) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(VOLTORB) - .2byte EC_POKEMON2(VOLTORB) - .2byte EC_WORD_VORACIOUS - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(VULPIX) - .2byte EC_POKEMON2(VULPIX) - -gEasyChatWordsByLetter_W:: @ 859DED6 - .2byte EC_WORD_WAAAH - .2byte EC_WORD_WAHAHAHA - .2byte EC_POKEMON(WAILMER) - .2byte EC_POKEMON(WAILORD) - .2byte EC_WORD_WAIT - .2byte EC_WORD_WAKE_UP - .2byte EC_WORD_WAKES_UP - .2byte EC_WORD_WALK - .2byte EC_WORD_WALKING - .2byte EC_WORD_WALKS - .2byte EC_POKEMON(WALREIN) - .2byte EC_WORD_WANDERING - .2byte EC_WORD_WANNABE - .2byte EC_WORD_WANT - .2byte EC_WORD_WANTS - .2byte EC_POKEMON2(WARTORTLE) - .2byte EC_WORD_WAS - .2byte EC_WORD_WASN_T - .2byte EC_WORD_WATER - .2byte EC_WORD_WATER_ABSORB - .2byte EC_MOVE2(WATER_GUN) - .2byte EC_MOVE2(WATER_PULSE) - .2byte EC_MOVE2(WATER_SPORT) - .2byte EC_MOVE(WATER_SPOUT) - .2byte EC_WORD_WATER_VEIL - .2byte EC_MOVE2(WATERFALL) - .2byte EC_WORD_WAY - .2byte EC_WORD_WE - .2byte EC_WORD_WE_RE - .2byte EC_WORD_WE_VE - .2byte EC_WORD_WEAK - .2byte EC_WORD_WEAKENED - .2byte EC_MOVE(WEATHER_BALL) - .2byte EC_WORD_WEDNESDAY - .2byte EC_POKEMON2(WEEDLE) - .2byte EC_WORD_WEEK - .2byte EC_POKEMON2(WEEPINBELL) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(WEEZING) - .2byte EC_POKEMON2(WEEZING) - .2byte EC_WORD_WEIRD - .2byte EC_WORD_WELCOME - .2byte EC_WORD_WELL - .2byte EC_WORD_WELL_THEN - .2byte EC_WORD_WENT - .2byte EC_WORD_WERE - .2byte EC_WORD_WEREN_T - .2byte EC_WORD_WHAT - .2byte EC_WORD_WHAT_S_UP_QUES - .2byte EC_WORD_WHEN - .2byte EC_WORD_WHEN_I_WIN - .2byte EC_WORD_WHERE - .2byte EC_WORD_WHICH - .2byte EC_WORD_WHILE - .2byte EC_MOVE(WHIRLPOOL) - .2byte EC_MOVE2(WHIRLWIND) - .2byte EC_POKEMON(WHISCASH) - .2byte EC_POKEMON(WHISMUR) - .2byte EC_WORD_WHITE_SMOKE - .2byte EC_WORD_WHO - .2byte EC_WORD_WHO_IS - .2byte EC_WORD_WHO_WAS - .2byte EC_WORD_WHOAH - .2byte EC_WORD_WHOM - .2byte EC_WORD_WHOSE - .2byte EC_WORD_WHY - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(WIGGLYTUFF) - .2byte EC_POKEMON2(WIGGLYTUFF) - .2byte EC_WORD_WILD - .2byte EC_WORD_WILL - .2byte EC_WORD_WILL_BE_HERE - .2byte EC_MOVE(WILL_O_WISP) - .2byte EC_WORD_WIMPY - .2byte EC_WORD_WIN - .2byte EC_MOVE2(WING_ATTACK) - .2byte EC_POKEMON(WINGULL) - .2byte EC_WORD_WINNER - .2byte EC_WORD_WINS - .2byte EC_WORD_WINTER - .2byte EC_WORD_WIRELESS - .2byte EC_MOVE2(WISH) - .2byte EC_WORD_WITH - .2byte EC_MOVE(WITHDRAW) - .2byte EC_WORD_WITHOUT - .2byte EC_WORD_WOBBLY - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(WOBBUFFET) - .2byte EC_POKEMON2(WOBBUFFET) - .2byte EC_WORD_WOMAN - .2byte EC_WORD_WON - .2byte EC_WORD_WON_T - .2byte EC_WORD_WONDER - .2byte EC_WORD_WONDER_GUARD - .2byte EC_POKEMON2(WOOPER) - .2byte EC_WORD_WORD - .2byte EC_WORD_WORK - .2byte EC_WORD_WORKING - .2byte EC_WORD_WORKS - .2byte EC_WORD_WORLD - .2byte EC_WORD_WORRY - .2byte EC_WORD_WOULD - .2byte EC_WORD_WOW - .2byte EC_WORD_WOWEE - .2byte EC_MOVE2(WRAP) - .2byte EC_WORD_WROOOAAR_EXCL - .2byte EC_POKEMON(WURMPLE) - .2byte EC_POKEMON(WYNAUT) - -gEasyChatWordsByLetter_X:: @ 859DFB4 - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(XATU) - .2byte EC_POKEMON2(XATU) - -gEasyChatWordsByLetter_Y:: @ 859DFBC - .2byte EC_WORD_YAHOO - .2byte EC_POKEMON2(YANMA) - .2byte EC_MOVE(YAWN) - .2byte EC_WORD_YAY - .2byte EC_WORD_YEAH - .2byte EC_WORD_YEAH_YEAH - .2byte EC_WORD_YEEHAW_EXCL - .2byte EC_WORD_YES - .2byte EC_WORD_YES_SIR_EXCL - .2byte EC_WORD_YESTERDAY - .2byte EC_WORD_YET - .2byte EC_WORD_YO - .2byte EC_WORD_YOU - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_YOU_VE - .2byte EC_WORD_YOUNG - .2byte EC_WORD_YOUR - .2byte EC_WORD_YOURS - .2byte EC_WORD_YUP - -gEasyChatWordsByLetter_Z:: @ 859DFE2 - .2byte EC_POKEMON(ZANGOOSE) - .2byte EC_MOVE2(ZAP_CANNON) - .2byte EC_POKEMON2(ZAPDOS) - .2byte EC_POKEMON(ZIGZAGOON) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(ZUBAT) - .2byte EC_POKEMON2(ZUBAT) - -gEasyChatWordsByLetter_UnusedJapaneseHi:: @ 859DFF2 - .2byte EC_POKEMON2(CLEFFA) - .2byte EC_WORD_AIYEEH - .2byte EC_POKEMON2(WEEDLE) - .2byte EC_WORD_HERO - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(PIKACHU) - .2byte EC_POKEMON(PIKACHU) - .2byte EC_MOVE2(LIGHT_SCREEN) - .2byte EC_WORD_SHINE - .2byte EC_WORD_LOW - .2byte EC_POKEMON2(CLEFABLE) - .2byte EC_WORD_FLYING - .2byte EC_POKEMON2(PIDGEOT) - .2byte EC_POKEMON2(PIDGEOTTO) - .2byte EC_WORD_LEFT - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(PICHU) - .2byte EC_POKEMON(PICHU) - .2byte EC_MOVE2(SCRATCH) - .2byte EC_WORD_SURPRISE - .2byte EC_MOVE2(HYPER_FANG) - .2byte EC_POKEMON2(CLEFAIRY) - .2byte EC_WORD_DROUGHT - .2byte EC_WORD_HIDDEN - .2byte EC_WORD_PERSON - .2byte EC_WORD_AWFUL - .2byte EC_POKEMON2(CHARMANDER) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(STARYU) - .2byte EC_POKEMON(STARYU) - .2byte EC_WORD_ALONE - .2byte EC_POKEMON2(CYNDAQUIL) - .2byte EC_MOVE2(EMBER) - .2byte EC_POKEMON(VIBRAVA) - .2byte EC_WORD_BORED - .2byte EC_POKEMON2(SUNKERN) - .2byte EC_WORD_SECRET - .2byte EC_WORD_SECRET_BASE - .2byte EC_MOVE2(SECRET_POWER) - .2byte EC_POKEMON2(TEDDIURSA) - .2byte EC_WORD_HIYAH - .2byte EC_MOVE2(DIZZY_PUNCH) - .2byte EC_WORD_LIGHTNINGROD - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(VOLTORB) - .2byte EC_POKEMON(VOLTORB) - .2byte EC_WORD_DAYTIME - .2byte EC_MOVE2(BULK_UP) - .2byte EC_WORD_NAP - .2byte EC_WORD_HEROINE - .2byte EC_POKEMON(FEEBAS) - -gEasyChatWordsByLetter_UnusedJapaneseFu:: @ 859E060 - .2byte EC_WORD_FIGHT - .2byte EC_POKEMON2(MOLTRES) - .2byte EC_WORD_FASHION - .2byte EC_WORD_FEAR - .2byte EC_WORD_FEVER - .2byte EC_MOVE2(IMPRISON) - .2byte EC_POKEMON2(FLAREON) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(ALAKAZAM) - .2byte EC_POKEMON(ALAKAZAM) - .2byte EC_POKEMON2(MAGMAR) - .2byte EC_POKEMON(GRUMPIG) - .2byte EC_MOVE2(FEATHER_DANCE) - .2byte EC_POKEMON2(FORRETRESS) - .2byte EC_MOVE2(WHIRLWIND) - .2byte EC_WORD_COMPOUNDEYES - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(WIGGLYTUFF) - .2byte EC_POKEMON(WIGGLYTUFF) - .2byte EC_MOVE2(BEAT_UP) - .2byte EC_WORD_MYSTERY - .2byte EC_POKEMON2(IVYSAUR) - .2byte EC_POKEMON2(BULBASAUR) - .2byte EC_WORD_MARVEL_SCALE - .2byte EC_WORD_WONDER_GUARD - .2byte EC_POKEMON2(VENUSAUR) - .2byte EC_WORD_LACKS - .2byte EC_WORD_RESUSCITATE - .2byte EC_WORD_SMACK - .2byte EC_WORD_FUFUFU - .2byte EC_POKEMON2(AERODACTYL) - .2byte EC_WORD_WIMPY - .2byte EC_POKEMON2(MAGBY) - .2byte EC_WORD_LOL - .2byte EC_MOVE2(BLIZZARD) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(IGGLYBUFF) - .2byte EC_POKEMON(IGGLYBUFF) - .2byte EC_WORD_SNORT - .2byte EC_MOVE2(STOMP) - .2byte EC_WORD_INSOMNIA - .2byte EC_WORD_WINTER - .2byte EC_WORD_LEVITATE - .2byte EC_POKEMON(FLYGON) - .2byte EC_WORD_PLUS - .2byte EC_MOVE2(BLAST_BURN) - .2byte EC_POKEMON(PLUSLE) - .2byte EC_POKEMON2(UMBREON) - .2byte EC_MOVE2(FLASH) - .2byte EC_WORD_WOBBLY - .2byte EC_MOVE2(TEETER_DANCE) - .2byte EC_WORD_PRETEND - .2byte EC_POKEMON2(ARTICUNO) - .2byte EC_WORD_WANNABE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(JIGGLYPUFF) - .2byte EC_POKEMON(JIGGLYPUFF) - .2byte EC_POKEMON2(SNUBBULL) - .2byte EC_WORD_SHAKY - .2byte EC_MOVE2(CRUSH_CLAW) - .2byte EC_MOVE2(BLAZE_KICK) - .2byte EC_MOVE2(PRESENT) - .2byte EC_WORD_PRESSURE - .2byte EC_WORD_BLEND - .2byte EC_WORD_FRONTIER - .2byte EC_WORD_HUMPH - .2byte EC_MOVE2(ERUPTION) - -gEasyChatWordsByLetter_UnusedJapaneseHe:: @ 859E0EE - .2byte EC_WORD_HEY - .2byte EC_POKEMON(CORPHISH) - .2byte EC_WORD_BABY - .2byte EC_POKEMON2(BAYLEEF) - .2byte EC_WORD_BEST - .2byte EC_WORD_LOUSY - .2byte EC_WORD_HEHEHE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(GRIMER) - .2byte EC_POKEMON(GRIMER) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(MUK) - .2byte EC_POKEMON(MUK) - .2byte EC_WORD_LIQUID_OOZE - .2byte EC_MOVE2(SLUDGE) - .2byte EC_MOVE2(SLUDGE_BOMB) - .2byte EC_MOVE2(GLARE) - .2byte EC_WORD_HEH - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(HERACROSS) - .2byte EC_POKEMON(HERACROSS) - .2byte EC_POKEMON(PELIPPER) - .2byte EC_POKEMON2(HOUNDOOM) - .2byte EC_POKEMON2(PERSIAN) - .2byte EC_WORD_RIPPED - .2byte EC_POKEMON2(LICKITUNG) - .2byte EC_WORD_STUDY - .2byte EC_WORD_COLOR_CHANGE - .2byte EC_MOVE2(TRANSFORM) - -gEasyChatWordsByLetter_UnusedJapaneseHo:: @ 859E12E - .2byte EC_MOVE2(POISON_TAIL) - .2byte EC_WORD_POINTS - .2byte EC_POKEMON2(HO_OH) - .2byte EC_WORD_SOUNDPROOF - .2byte EC_WORD_ADVENTURE - .2byte EC_WORD_EFFECT_SPORE - .2byte EC_MOVE2(ROAR) - .2byte EC_POKEMON(WAILORD) - .2byte EC_POKEMON(WAILMER) - .2byte EC_WORD_DUDE - .2byte EC_WORD_BOARD - .2byte EC_POKEMON2(HOOTHOOT) - .2byte EC_POKEMON(SALAMENCE) - .2byte EC_WORD_BALL - .2byte EC_MOVE2(BONE_RUSH) - .2byte EC_WORD_THEY - .2byte EC_WORD_THEY_WERE - .2byte EC_WORD_TO_THEM - .2byte EC_WORD_THEIR - .2byte EC_WORD_THEY_RE - .2byte EC_WORD_THEY_VE - .2byte EC_WORD_POKENAV - .2byte EC_WORD_POKEMON - .2byte EC_WORD_GET - .2byte EC_WORD_POKEDEX - .2byte EC_WORD_PKRS - .2byte EC_MOVE2(CAMOUFLAGE) - .2byte EC_WORD_WANT - .2byte EC_MOVE2(COVET) - .2byte EC_POKEMON(AGGRON) - .2byte EC_MOVE2(TAIL_GLOW) - .2byte EC_POKEMON(POOCHYENA) - .2byte EC_POKEMON2(PIDGEY) - .2byte EC_WORD_AS_MUCH_AS - .2byte EC_POKEMON2(PONYTA) - .2byte EC_MOVE2(BONE_CLUB) - .2byte EC_MOVE2(BONEMERANG) - .2byte EC_WORD_FIRE - .2byte EC_MOVE2(FIRE_SPIN) - .2byte EC_WORD_FLAME_BODY - .2byte EC_MOVE2(FIRE_PUNCH) - .2byte EC_POKEMON2(SKIPLOOM) - .2byte EC_WORD_HOHOHO - .2byte EC_WORD_PRAISE - .2byte EC_WORD_UH_HUH - .2byte EC_POKEMON2(PORYGON) - .2byte EC_POKEMON2(PORYGON2) - .2byte EC_MOVE2(VOLT_TACKLE) - .2byte EC_WORD_POKEBLOCK - .2byte EC_MOVE2(PERISH_SONG) - .2byte EC_WORD_SHREDDED - .2byte EC_POKEMON(CASTFORM) - .2byte EC_WORD_BOOK - .2byte EC_WORD_SERIOUS - .2byte EC_WORD_REALLY - -gEasyChatWordsByLetter_UnusedJapaneseMa:: @ 859E19C - .2byte EC_WORD_OH_DEAR - .2byte EC_WORD_IN - .2byte EC_WORD_GIVE_UP - .2byte EC_WORD_MINUS - .2byte EC_POKEMON(MINUN) - .2byte EC_WORD_DAILY - .2byte EC_WORD_OWN_TEMPO - .2byte EC_MOVE2(WRAP) - .2byte EC_MOVE2(SPIKES) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(MAGCARGO) - .2byte EC_POKEMON(MAGCARGO) - .2byte EC_MOVE2(MAGNITUDE) - .2byte EC_POKEMON(MAKUHITA) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(SLUGMA) - .2byte EC_POKEMON(SLUGMA) - .2byte EC_WORD_MAGMA_ARMOR - .2byte EC_POKEMON2(QUILAVA) - .2byte EC_WORD_OVERDO - .2byte EC_WORD_LOSS - .2byte EC_WORD_IF_I_LOSE - .2byte EC_WORD_LOST - .2byte EC_WORD_LOSE - .2byte EC_WORD_TRULY - .2byte EC_WORD_SERIOUSLY - .2byte EC_MOVE2(MAGICAL_LEAF) - .2byte EC_MOVE2(MAGIC_COAT) - .2byte EC_WORD_MACHINE - .2byte EC_WORD_OUT - .2byte EC_WORD_MASTER - .2byte EC_WORD_INCREASING - .2byte EC_WORD_TOO - .2byte EC_WORD_LIKE - .2byte EC_POKEMON2(BELLSPROUT) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(WEEZING) - .2byte EC_POKEMON(WEEZING) - .2byte EC_WORD_SMELL - .2byte EC_WORD_YET - .2byte EC_WORD_MISTAKE - .2byte EC_POKEMON(LINOONE) - .2byte EC_WORD_TOTALLY - .2byte EC_MOVE2(MUD_SHOT) - .2byte EC_MOVE2(MACH_PUNCH) - .2byte EC_WORD_FESTIVAL - .2byte EC_WORD_UNTIL - .2byte EC_WORD_WAIT - .2byte EC_WORD_GUARD - .2byte EC_MOVE2(PROTECT) - .2byte EC_POKEMON(CASCOON) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(MARILL) - .2byte EC_POKEMON(MARILL) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(AZUMARILL) - .2byte EC_POKEMON(AZUMARILL) - .2byte EC_MOVE2(DEFENSE_CURL) - .2byte EC_WORD_AS_IF - .2byte EC_POKEMON(SWALOT) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(ELECTRODE) - .2byte EC_POKEMON(ELECTRODE) - .2byte EC_MOVE2(ROLLING_KICK) - .2byte EC_WORD_COMICS - .2byte EC_POKEMON2(MANKEY) - .2byte EC_WORD_SATISFIED - .2byte EC_POKEMON2(MANTINE) - -gEasyChatWordsByLetter_UnusedJapaneseMi:: @ 859E230 - .2byte EC_WORD_PARTNER - .2byte EC_MOVE2(SUBSTITUTE) - .2byte EC_WORD_RIGHT - .2byte EC_MOVE2(DETECT) - .2byte EC_MOVE2(PIN_MISSILE) - .2byte EC_WORD_WATER - .2byte EC_MOVE2(WATER_SPORT) - .2byte EC_POKEMON(MUDKIP) - .2byte EC_MOVE2(WATER_GUN) - .2byte EC_MOVE2(MIST_BALL) - .2byte EC_MOVE2(WATER_PULSE) - .2byte EC_WORD_WATER_VEIL - .2byte EC_WORD_SHOW - .2byte EC_WORD_SEE - .2byte EC_WORD_DID - .2byte EC_MOVE2(FURY_ATTACK) - .2byte EC_MOVE2(FURY_SWIPES) - .2byte EC_MOVE2(DESTINY_BOND) - .2byte EC_WORD_LOOKS - .2byte EC_WORD_REJECT - .2byte EC_WORD_ACCEPT - .2byte EC_POKEMON2(DRATINI) - .2byte EC_MOVE2(FALSE_SWIPE) - .2byte EC_MOVE2(FORESIGHT) - .2byte EC_POKEMON2(MEW) - .2byte EC_POKEMON2(MEWTWO) - .2byte EC_MOVE2(MIRROR_COAT) - .2byte EC_MOVE2(FUTURE_SIGHT) - .2byte EC_WORD_SEES - .2byte EC_MOVE2(MILK_DRINK) - .2byte EC_POKEMON2(MILTANK) - .2byte EC_POKEMON(MILOTIC) - .2byte EC_WORD_WE - .2byte EC_WORD_BEEN - .2byte EC_WORD_TO_US - .2byte EC_WORD_OUR - .2byte EC_WORD_WE_RE - -gEasyChatWordsByLetter_UnusedJapaneseMu:: @ 859E27A - .2byte EC_WORD_MOOD - .2byte EC_POKEMON2(MISDREAVUS) - .2byte EC_WORD_OLDEN - .2byte EC_WORD_ARRGH - .2byte EC_WORD_BUG - .2byte EC_WORD_SWARM - .2byte EC_WORD_RATHER - .2byte EC_POKEMON2(SMOOCHUM) - .2byte EC_WORD_INVINCIBLE - .2byte EC_WORD_HEART - .2byte EC_WORD_MUFUFU - .2byte EC_WORD_MMM - -gEasyChatWordsByLetter_UnusedJapaneseMe:: @ 859E292 - .2byte EC_MOVE2(CALM_MIND) - .2byte EC_WORD_MAIL - .2byte EC_MOVE2(MEGA_DRAIN) - .2byte EC_MOVE2(MEGA_KICK) - .2byte EC_MOVE2(MEGA_PUNCH) - .2byte EC_POKEMON2(MEGANIUM) - .2byte EC_MOVE2(MEGAHORN) - .2byte EC_WORD_SEEK - .2byte EC_MOVE2(HIDDEN_POWER) - .2byte EC_WORD_RARE - .2byte EC_POKEMON(METAGROSS) - .2byte EC_POKEMON2(DITTO) - .2byte EC_MOVE2(METAL_CLAW) - .2byte EC_POKEMON(METANG) - .2byte EC_WORD_DESTROYED - .2byte EC_WORD_MESSAGE - .2byte EC_WORD_AWFULLY - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(TENTACOOL) - .2byte EC_POKEMON(TENTACOOL) - .2byte EC_WORD_FIERY - .2byte EC_POKEMON2(MAREEP) - .2byte EC_MOVE2(ATTRACT) - .2byte EC_WORD_CUTE_CHARM - .2byte EC_WORD_IMMUNITY - -gEasyChatWordsByLetter_UnusedJapaneseMo:: @ 859E2C6 - .2byte EC_WORD_ALMOST - .2byte EC_WORD_BLAZE - .2byte EC_WORD_NEARLY - .2byte EC_WORD_MODE - .2byte EC_WORD_OLD - .2byte EC_WORD_THURSDAY - .2byte EC_POKEMON2(FLAAFFY) - .2byte EC_WORD_LISTENING - .2byte EC_WORD_OWN - .2byte EC_WORD_MORE - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_PICKUP - .2byte EC_MOVE2(MIMIC) - .2byte EC_WORD_TOO_LATE - .2byte EC_WORD_PATTERN - .2byte EC_WORD_FLASH_FIRE - .2byte EC_WORD_RECEIVED - .2byte EC_POKEMON2(VENOMOTH) - .2byte EC_WORD_DOESN_T - .2byte EC_POKEMON2(TANGELA) - -gEasyChatWordsByLetter_UnusedJapaneseYa:: @ 859E2EE - .2byte EC_WORD_HOO_HAH - .2byte EC_WORD_PROMISE - .2byte EC_WORD_KIND - .2byte EC_POKEMON(BALTOY) - .2byte EC_WORD_HOLIDAY - .2byte EC_WORD_NEGATIVE - .2byte EC_MOVE2(FRUSTRATION) - .2byte EC_WORD_DONE - .2byte EC_WORD_FINALLY - .2byte EC_WORD_ANY - .2byte EC_WORD_YAHOO - .2byte EC_POKEMON2(SLOWKING) - .2byte EC_POKEMON2(SLOWBRO) - .2byte EC_MOVE2(LEECH_SEED) - .2byte EC_POKEMON2(SLOWPOKE) - .2byte EC_WORD_DANGER - .2byte EC_POKEMON2(MURKROW) - .2byte EC_POKEMON(SABLEYE) - .2byte EC_WORD_DEFEATED - .2byte EC_WORD_BEAT - .2byte EC_WORD_VITAL_SPIRIT - .2byte EC_POKEMON(VIGOROTH) - .2byte EC_WORD_YOUNG - .2byte EC_POKEMON2(YANMA) - -gEasyChatWordsByLetter_UnusedJapaneseYu:: @ 859E31E - .2byte EC_POKEMON(SNORUNT) - .2byte EC_WORD_TAKE - .2byte EC_WORD_UNION - .2byte EC_MOVE2(METRONOME) - .2byte EC_WORD_DREAM - .2byte EC_MOVE2(DREAM_EATER) - .2byte EC_WORD_ALLOW - .2byte EC_WORD_FORGET - .2byte EC_POKEMON(CRADILY) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(KADABRA) - .2byte EC_POKEMON(KADABRA) - -gEasyChatWordsByLetter_UnusedJapaneseYo:: @ 859E338 - .2byte EC_WORD_WITHOUT - .2byte EC_WORD_YO - .2byte EC_MOVE2(ACID) - .2byte EC_WORD_COME_OVER - .2byte EC_WORD_KINDERGARTEN - .2byte EC_WORD_CHLOROPHYLL - .2byte EC_WORD_AFTER - .2byte EC_POKEMON2(LARVITAR) - .2byte EC_WORD_OH_KAY - .2byte EC_WORD_BEFORE - .2byte EC_WORD_GREAT - .2byte EC_MOVE2(MEDITATE) - .2byte EC_WORD_PURE_POWER - .2byte EC_WORD_WELL - .2byte EC_MOVE2(SNATCH) - .2byte EC_WORD_OKAY - .2byte EC_WORD_PLANS - .2byte EC_WORD_NIGHTTIME - .2byte EC_WORD_WHILE - .2byte EC_POKEMON(DUSKULL) - .2byte EC_WORD_EASY - .2byte EC_WORD_INSTEAD - .2byte EC_WORD_NIGHT - .2byte EC_POKEMON2(NOCTOWL) - .2byte EC_WORD_COUNT_ON - .2byte EC_WORD_WEAK - .2byte EC_WORD_TOO_WEAK - .2byte EC_WORD_WEAKENED - -gEasyChatWordsByLetter_UnusedJapaneseRa:: @ 859E370 - .2byte EC_POKEMON2(RAIKOU) - .2byte EC_WORD_WEEK - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(RAICHU) - .2byte EC_POKEMON(RAICHU) - .2byte EC_WORD_RIVAL - .2byte EC_WORD_LIFE - .2byte EC_POKEMON(MANECTRIC) - .2byte EC_WORD_SIMPLE - .2byte EC_WORD_PUSHOVER - .2byte EC_POKEMON(SWAMPERT) - .2byte EC_POKEMON(ELECTRIKE) - .2byte EC_WORD_SEEMS - .2byte EC_WORD_RADIO - .2byte EC_MOVE2(LUSTER_PURGE) - .2byte EC_POKEMON2(CHANSEY) - .2byte EC_POKEMON2(RATICATE) - .2byte EC_POKEMON(LATIAS) - .2byte EC_POKEMON(LATIOS) - .2byte EC_POKEMON(LUVDISC) - .2byte EC_POKEMON2(LAPRAS) - .2byte EC_WORD_LOVEY_DOVEY - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(VILEPLUME) - .2byte EC_POKEMON(VILEPLUME) - .2byte EC_WORD_LALALA - .2byte EC_POKEMON(RALTS) - .2byte EC_WORD_FORGETS - .2byte EC_WORD_APPEARS - .2byte EC_WORD_RANK - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(LANTURN) - .2byte EC_POKEMON(LANTURN) - -gEasyChatWordsByLetter_UnusedJapaneseRi:: @ 859E3B8 - .2byte EC_WORD_LEADER - .2byte EC_MOVE2(LEAF_BLADE) - .2byte EC_POKEMON2(CHARMELEON) - .2byte EC_POKEMON2(CHARIZARD) - .2byte EC_MOVE2(RECYCLE) - .2byte EC_MOVE2(REFLECT) - .2byte EC_MOVE2(REFRESH) - .2byte EC_MOVE2(REVENGE) - .2byte EC_WORD_RIBBON - .2byte EC_WORD_TRENDY - .2byte EC_MOVE2(DRAGON_RAGE) - .2byte EC_MOVE2(DRAGON_BREATH) - .2byte EC_MOVE2(DRAGON_DANCE) - .2byte EC_WORD_VACATION - .2byte EC_POKEMON(LILEEP) - .2byte EC_POKEMON2(URSARING) - .2byte EC_WORD_SHIELD_DUST - -gEasyChatWordsByLetter_UnusedJapaneseRu:: @ 859E3DA - .2byte EC_POKEMON2(JYNX) - .2byte EC_WORD_ROOM - .2byte EC_WORD_RULE - .2byte EC_POKEMON2(LUGIA) - .2byte EC_WORD_LOOK - .2byte EC_POKEMON(LUNATONE) - .2byte EC_WORD_RUBY - .2byte EC_WORD_THAN - .2byte EC_POKEMON(AZURILL) - .2byte EC_POKEMON(LUDICOLO) - .2byte EC_WORD_HAPPILY - -gEasyChatWordsByLetter_UnusedJapaneseRe:: @ 859E3F0 - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(MAGNETON) - .2byte EC_POKEMON(MAGNETON) - .2byte EC_MOVE2(ICE_PUNCH) - .2byte EC_MOVE2(ICE_BEAM) - .2byte EC_POKEMON(REGICE) - .2byte EC_POKEMON(REGISTEEL) - .2byte EC_POKEMON(REGIROCK) - .2byte EC_POKEMON(RAYQUAZA) - .2byte EC_WORD_UGLY - .2byte EC_POKEMON2(LEDIAN) - .2byte EC_POKEMON2(LEDYBA) - .2byte EC_WORD_FANTASTIC - .2byte EC_WORD_LEVEL - .2byte EC_MOVE2(FURY_CUTTER) - .2byte EC_MOVE2(COMET_PUNCH) - .2byte EC_WORD_RENTAL - -gEasyChatWordsByLetter_UnusedJapaneseRo:: @ 859E414 - .2byte EC_MOVE2(SKULL_BASH) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(VULPIX) - .2byte EC_POKEMON(VULPIX) - .2byte EC_POKEMON(ROSELIA) - .2byte EC_MOVE2(LOCK_ON) - .2byte EC_MOVE2(ROCK_BLAST) - .2byte EC_WORD_ROMANTIC - .2byte EC_WORD_QUESTION - -gEasyChatWordsByLetter_UnusedJapaneseWa:: @ 859E428 - .2byte EC_WORD_YAY - .2byte EC_WORD_WORLD - .2byte EC_WORD_AWW - .2byte EC_WORD_WIRELESS - .2byte EC_WORD_WOWEE - .2byte EC_POKEMON(COMBUSKEN) - .2byte EC_WORD_UNDERSTAND - .2byte EC_WORD_UNDERSTANDS - .2byte EC_WORD_FAINT - .2byte EC_WORD_ANTICIPATION - .2byte EC_WORD_ONCE - .2byte EC_WORD_MOVE - .2byte EC_WORD_WE_VE - .2byte EC_WORD_FAINTED - .2byte EC_WORD_WOMAN - .2byte EC_WORD_SHE - .2byte EC_WORD_SHE_WAS - .2byte EC_WORD_TO_HER - .2byte EC_WORD_HERS - .2byte EC_WORD_SHE_IS - .2byte EC_WORD_SOME - .2byte EC_POKEMON2(JUMPLUFF) - .2byte EC_MOVE2(COTTON_SPORE) - .2byte EC_WORD_GWAH - .2byte EC_POKEMON2(TOTODILE) - .2byte EC_WORD_WAHAHAHA - .2byte EC_WORD_ANYWHERE - .2byte EC_MOVE2(STRUGGLE) - .2byte EC_WORD_BADLY - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(MACHOP) - .2byte EC_POKEMON(MACHOP) - - .align 2 -gEasyChatWordsByLetterPointers:: @ 859E46C - .4byte gEasyChatWordsByLetter_Others - .4byte 10 @ number of entries - - .4byte gEasyChatWordsByLetter_A - .4byte 106 @ number of entries - - .4byte gEasyChatWordsByLetter_B - .4byte 86 @ number of entries - - .4byte gEasyChatWordsByLetter_C - .4byte 119 @ number of entries - - .4byte gEasyChatWordsByLetter_D - .4byte 94 @ number of entries - - .4byte gEasyChatWordsByLetter_E - .4byte 59 @ number of entries - - .4byte gEasyChatWordsByLetter_F - .4byte 80 @ number of entries - - .4byte gEasyChatWordsByLetter_G - .4byte 98 @ number of entries - - .4byte gEasyChatWordsByLetter_H - .4byte 101 @ number of entries - - .4byte gEasyChatWordsByLetter_I - .4byte 48 @ number of entries - - .4byte gEasyChatWordsByLetter_J - .4byte 13 @ number of entries - - .4byte gEasyChatWordsByLetter_K - .4byte 33 @ number of entries - - .4byte gEasyChatWordsByLetter_L - .4byte 82 @ number of entries - - .4byte gEasyChatWordsByLetter_M - .4byte 142 @ number of entries - - .4byte gEasyChatWordsByLetter_N - .4byte 54 @ number of entries - - .4byte gEasyChatWordsByLetter_O - .4byte 44 @ number of entries - - .4byte gEasyChatWordsByLetter_P - .4byte 102 @ number of entries - - .4byte gEasyChatWordsByLetter_Q - .4byte 6 @ number of entries - - .4byte gEasyChatWordsByLetter_R - .4byte 80 @ number of entries - - .4byte gEasyChatWordsByLetter_S - .4byte 262 @ number of entries - - .4byte gEasyChatWordsByLetter_T - .4byte 133 @ number of entries - - .4byte gEasyChatWordsByLetter_U - .4byte 24 @ number of entries - - .4byte gEasyChatWordsByLetter_V - .4byte 33 @ number of entries - - .4byte gEasyChatWordsByLetter_W - .4byte 111 @ number of entries - - .4byte gEasyChatWordsByLetter_X - .4byte 4 @ number of entries - - .4byte gEasyChatWordsByLetter_Y - .4byte 19 @ number of entries - - .4byte gEasyChatWordsByLetter_Z - .4byte 8 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseHi - .4byte 55 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseFu - .4byte 71 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseHe - .4byte 32 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseHo - .4byte 55 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseMa - .4byte 74 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseMi - .4byte 37 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseMu - .4byte 12 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseMe - .4byte 26 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseMo - .4byte 20 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseYa - .4byte 24 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseYu - .4byte 13 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseYo - .4byte 28 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseRa - .4byte 36 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseRi - .4byte 17 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseRu - .4byte 11 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseRe - .4byte 18 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseRo - .4byte 10 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseWa - .4byte 33 @ number of entries diff --git a/include/easy_chat.h b/include/easy_chat.h index b3639af217..b7685e48cb 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -2,6 +2,124 @@ #define GUARD_EASYCHAT_H #include "main.h" +#include "constants/easy_chat.h" + +struct EasyChatScreenTemplate +{ + u8 unk_00; + u8 numColumns; + u8 numRows; + u8 unk_03_0:7; + u8 unk_03_7:1; + const u8 *titleText; + const u8 *instructionsText1; + const u8 *instructionsText2; + const u8 *confirmText1; + const u8 *confirmText2; +}; + +struct EasyChatScreen +{ + /*0x00*/ u8 kind; + /*0x01*/ u8 templateId; + /*0x02*/ u8 numColumns; + /*0x03*/ u8 numRows; + /*0x04*/ u8 state; + /*0x05*/ s8 mainCursorColumn; + /*0x06*/ s8 mainCursorRow; + /*0x07*/ u8 unk_07; + /*0x08*/ u8 unk_08; + /*0x09*/ u8 unk_09; + /*0x0A*/ s8 unk_0a; + /*0x0B*/ s8 unk_0b; + /*0x0C*/ u8 unk_0c; + /*0x0D*/ u8 unk_0d; + /*0x0E*/ u8 unk_0e; + /*0x0F*/ u8 unk_0f; + /*0x10*/ s8 unk_10; + /*0x11*/ s8 unk_11; + /*0x12*/ u8 sizeParam; + /*0x13*/ u8 unk_13; + /*0x14*/ u8 unk_14[0x20]; + /*0x34*/ const u8 *titleText; + /*0x38*/ u16 *words; + /*0x3C*/ u16 ecWordBuffer[9]; +}; + +struct Unk203A11C +{ + u16 unk0; + u16 windowId; + u16 unk4; + u8 unk6; + u8 unk7; + s8 unk8; + u8 unk9; + u8 unkA; + u8 unkB[0xC1]; + u8 unkCC[0x202]; + u16 unk2CE; + int unk2D0; + int unk2D4; + struct Sprite *unk2D8; + struct Sprite *unk2DC; + struct Sprite *unk2E0; + struct Sprite *unk2E4; + struct Sprite *unk2E8; + struct Sprite *unk2EC; + struct Sprite *unk2F0; + struct Sprite *unk2F4; + struct Sprite *unk2F8; + struct Sprite *unk2FC; + u16 unk300[BG_SCREEN_SIZE / 2]; + u16 unkB00[BG_SCREEN_SIZE / 2]; +}; + +struct Unk08597C30 +{ + u8 unk0_0:5; + u8 unk0_5:3; + u8 unk1; + u8 unk2; + u8 unk3; +}; + +struct EasyChatWordInfo +{ + const u8 *text; + int alphabeticalOrder; + int enabled; +}; + +typedef union +{ + const u16 *valueList; + const struct EasyChatWordInfo *words; +} EasyChatGroupWordData; + +struct EasyChatGroup +{ + EasyChatGroupWordData wordData; + u16 numWords; + u16 numEnabledWords; +}; + +struct Unk203A120 +{ + u16 unk0; + u16 unk2[EC_NUM_GROUPS]; + u16 unk2E[27]; + u16 unk64[27][270]; + u8 filler3958[0x2C]; + u16 unk3984[0x10E]; + u16 unk3BA0; +}; /*size = 0x3BA4*/ + +struct EasyChatWordsByLetter +{ + const u16 *words; + int numWords; +}; void InitEasyChatPhrases(void); void easy_chat_input_maybe(void); diff --git a/include/graphics.h b/include/graphics.h index 6e6d2b4fc0..c651268ca5 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4893,6 +4893,11 @@ extern const u16 gFrontierPassMapCursor_Pal[]; // Easy Chat Screen extern const u32 gEasyChatWindow_Gfx[]; extern const u32 gEasyChatWindow_Tilemap[]; +extern const u32 gEasyChatMode_Gfx[]; extern const u16 gEasyChatMode_Pal[]; +extern const u32 gEasyChatCursor_Gfx[]; +extern const u16 gEasyChatCursor_Pal[]; +extern const u32 gEasyChatRightWindow_Gfx[]; +extern const u16 gEasyChatRightWindow_Pal[]; #endif //GUARD_GRAPHICS_H diff --git a/include/strings.h b/include/strings.h index 591c5ce338..3899b63aa5 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2431,5 +2431,129 @@ extern const u8 gText_OnlyOnePhrase[]; extern const u8 gText_YouCannotQuitHere[]; extern const u8 gText_SectionMustBeCompleted[]; extern const u8 gText_ThreeQuestionMarks[]; +extern const u8 gText_Profile[]; +extern const u8 gText_CombineFourWordsOrPhrases[]; +extern const u8 gText_AndMakeYourProfile[]; +extern const u8 gText_YourProfile[]; +extern const u8 gText_IsAsShownOkay[]; +extern const u8 gText_AtTheBattlesStart[]; +extern const u8 gText_CombineSixWordsOrPhrases[]; +extern const u8 gText_AndMakeAMessage[]; +extern const u8 gText_YourFeelingAtTheBattlesStart[]; +extern const u8 gText_UponWinningABattle[]; +extern const u8 gText_WhatYouSayIfYouWin[]; +extern const u8 gText_UponLosingABattle[]; +extern const u8 gText_WhatYouSayIfYouLose[]; +extern const u8 gText_CombineNineWordsOrPhrases[]; +extern const u8 gText_AndMakeAMessage2[]; +extern const u8 gText_TheMailMessage[]; +extern const u8 gText_Interview[]; +extern const u8 gText_LetsReplyToTheInterview[]; +extern const u8 gText_TheAnswer[]; +extern const u8 gText_TheBardsSong[]; +extern const u8 gText_ChangeJustOneWordOrPhrase[]; +extern const u8 gText_AndImproveTheBardsSong[]; +extern const u8 gText_TheBardsSong2[]; +extern const u8 gText_FindWordsThatDescribeYour[]; +extern const u8 gText_FeelingsRightNow[]; +extern const u8 gText_WhatsHipAndHappening[]; +extern const u8 gText_CombineTwoWordsOrPhrases[]; +extern const u8 gText_AndMakeATrendySaying[]; +extern const u8 gText_TheTrendySaying[]; +extern const u8 gText_AfterYouHaveReadTheQuiz[]; +extern const u8 gText_QuestionPressTheAButton[]; +extern const u8 gText_TheQuizAnswerIs[]; +extern const u8 gText_OutOfTheListedChoices[]; +extern const u8 gText_SelectTheAnswerToTheQuiz[]; +extern const u8 gText_TheAnswerColon[]; +extern const u8 gText_AndCreateAQuiz[]; +extern const u8 gText_IsThisQuizOK[]; +extern const u8 gText_PickAWordOrPhraseAnd[]; +extern const u8 gText_SetTheQuizAnswer[]; +extern const u8 gText_ApprenticesPhrase[]; +extern const u8 gText_FindWordsWhichFit[]; +extern const u8 gText_TheTrainersImage[]; +extern const u8 gText_ApprenticePhrase[]; +extern const u8 gText_GoodSaying[]; +extern const u8 gText_CombineTwoWordsOrPhrases2[]; +extern const u8 gText_ToTeachHerAGoodSaying[]; +extern const u8 gText_FansQuestion[]; +extern const u8 gText_TheImage[]; +extern const u8 gText_Questionnaire[]; +extern const u8 gText_AndFillOutTheQuestionnaire[]; +extern const u8 gText_DelAll[]; +extern const u8 gText_Cancel5[]; +extern const u8 gText_Ok2[]; +extern const u8 gText_Quiz[]; +extern const u8 gText_Answer[]; +extern const u8 gEasyChatGroupName_Pokemon[]; +extern const u8 gEasyChatGroupName_Trainer[]; +extern const u8 gEasyChatGroupName_Status[]; +extern const u8 gEasyChatGroupName_Battle[]; +extern const u8 gEasyChatGroupName_Greetings[]; +extern const u8 gEasyChatGroupName_People[]; +extern const u8 gEasyChatGroupName_Voices[]; +extern const u8 gEasyChatGroupName_Speech[]; +extern const u8 gEasyChatGroupName_Endings[]; +extern const u8 gEasyChatGroupName_Feelings[]; +extern const u8 gEasyChatGroupName_Conditions[]; +extern const u8 gEasyChatGroupName_Actions[]; +extern const u8 gEasyChatGroupName_Lifestyle[]; +extern const u8 gEasyChatGroupName_Hobbies[]; +extern const u8 gEasyChatGroupName_Time[]; +extern const u8 gEasyChatGroupName_Misc[]; +extern const u8 gEasyChatGroupName_Adjectives[]; +extern const u8 gEasyChatGroupName_Events[]; +extern const u8 gEasyChatGroupName_Move1[]; +extern const u8 gEasyChatGroupName_Move2[]; +extern const u8 gEasyChatGroupName_TrendySaying[]; +extern const u8 gEasyChatGroupName_Pokemon2[]; + +extern const u8 gUnknown_862B810[]; +extern const u8 gUnknown_862B832[]; +extern const u8 gUnknown_862B84B[]; +extern const u8 gUnknown_862B86C[]; +extern const u8 gUnknown_0862B88D[]; +extern const u8 gUnknown_0862B8AE[]; +extern const u8 gUnknown_0862B8CF[]; +extern const u8 gUnknown_0862B8F0[]; +extern const u8 gUnknown_0862B911[]; +extern const u8 gUnknown_0862B932[]; +extern const u8 gUnknown_0862B953[]; +extern const u8 gUnknown_0862B974[]; +extern const u8 gUnknown_0862B995[]; +extern const u8 gUnknown_0862B9AE[]; +extern const u8 gUnknown_0862B9C7[]; +extern const u8 gUnknown_0862B9E0[]; +extern const u8 gUnknown_0862B9F9[]; +extern const u8 gUnknown_0862B9FF[]; +extern const u8 gUnknown_0862BA05[]; +extern const u8 gUnknown_0862BA0B[]; +extern const u8 gUnknown_0862BA11[]; +extern const u8 gUnknown_0862BA17[]; +extern const u8 gUnknown_0862BA1D[]; +extern const u8 gUnknown_0862BA23[]; +extern const u8 gUnknown_0862BA29[]; +extern const u8 gUnknown_0862BA2F[]; +extern const u8 gUnknown_0862BA35[]; +extern const u8 gUnknown_0862BA3B[]; +extern const u8 gUnknown_0862BA41[]; +extern const u8 gUnknown_0862BA47[]; +extern const u8 gUnknown_0862BA4D[]; +extern const u8 gUnknown_0862BA53[]; +extern const u8 gUnknown_0862BA59[]; +extern const u8 gUnknown_0862BA5F[]; +extern const u8 gUnknown_0862BA65[]; +extern const u8 gUnknown_0862BA6B[]; +extern const u8 gUnknown_0862BA79[]; +extern const u8 gUnknown_0862BA84[]; +extern const u8 gUnknown_0862BA8F[]; +extern const u8 gUnknown_0862BA9A[]; +extern const u8 gUnknown_0862BAA3[]; +extern const u8 gUnknown_0862BAAE[]; +extern const u8 gUnknown_0862BAB9[]; +extern const u8 gUnknown_0862BAC4[]; +extern const u8 gUnknown_0862BACF[]; +extern const u8 gUnknown_0862BADA[]; #endif // GUARD_STRINGS_H diff --git a/ld_script.txt b/ld_script.txt index 1076068334..acfd535f89 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -501,7 +501,6 @@ SECTIONS { src/battle_intro.o(.rodata); src/bike.o(.rodata); src/easy_chat.o(.rodata); - data/easy_chat.o(.rodata); src/mon_markings.o(.rodata); src/mauville_old_man.o(.rodata); src/mail.o(.rodata); diff --git a/src/data/easy_chat/easy_chat_group_actions.h b/src/data/easy_chat/easy_chat_group_actions.h new file mode 100755 index 0000000000..06a8e73030 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_actions.h @@ -0,0 +1,471 @@ +const u8 gEasyChatWord_Meets[] = _("MEETS"); +const u8 gEasyChatWord_Concede[] = _("CONCEDE"); +const u8 gEasyChatWord_Give[] = _("GIVE"); +const u8 gEasyChatWord_Gives[] = _("GIVES"); +const u8 gEasyChatWord_Played[] = _("PLAYED"); +const u8 gEasyChatWord_Plays[] = _("PLAYS"); +const u8 gEasyChatWord_Collect[] = _("COLLECT"); +const u8 gEasyChatWord_Walking[] = _("WALKING"); +const u8 gEasyChatWord_Walks[] = _("WALKS"); +const u8 gEasyChatWord_Says[] = _("SAYS"); +const u8 gEasyChatWord_Went[] = _("WENT"); +const u8 gEasyChatWord_Said[] = _("SAID"); +const u8 gEasyChatWord_WakeUp[] = _("WAKE UP"); +const u8 gEasyChatWord_WakesUp[] = _("WAKES UP"); +const u8 gEasyChatWord_Angers[] = _("ANGERS"); +const u8 gEasyChatWord_Teach[] = _("TEACH"); +const u8 gEasyChatWord_Teaches[] = _("TEACHES"); +const u8 gEasyChatWord_Please[] = _("PLEASE"); +const u8 gEasyChatWord_Learn[] = _("LEARN"); +const u8 gEasyChatWord_Change[] = _("CHANGE"); +const u8 gEasyChatWord_Story[] = _("STORY"); +const u8 gEasyChatWord_Trust[] = _("TRUST"); +const u8 gEasyChatWord_Lavish[] = _("LAVISH"); +const u8 gEasyChatWord_Listens[] = _("LISTENS"); +const u8 gEasyChatWord_Hearing[] = _("HEARING"); +const u8 gEasyChatWord_Trains[] = _("TRAINS"); +const u8 gEasyChatWord_Choose[] = _("CHOOSE"); +const u8 gEasyChatWord_Come[] = _("COME"); +const u8 gEasyChatWord_Came[] = _("CAME"); +const u8 gEasyChatWord_Search[] = _("SEARCH"); +const u8 gEasyChatWord_Make[] = _("MAKE"); +const u8 gEasyChatWord_Cause[] = _("CAUSE"); +const u8 gEasyChatWord_Know[] = _("KNOW"); +const u8 gEasyChatWord_Knows[] = _("KNOWS"); +const u8 gEasyChatWord_Refuse[] = _("REFUSE"); +const u8 gEasyChatWord_Stores[] = _("STORES"); +const u8 gEasyChatWord_Brag[] = _("BRAG"); +const u8 gEasyChatWord_Ignorant[] = _("IGNORANT"); +const u8 gEasyChatWord_Thinks[] = _("THINKS"); +const u8 gEasyChatWord_Believe[] = _("BELIEVE"); +const u8 gEasyChatWord_Slide[] = _("SLIDE"); +const u8 gEasyChatWord_Eats[] = _("EATS"); +const u8 gEasyChatWord_Use[] = _("USE"); +const u8 gEasyChatWord_Uses[] = _("USES"); +const u8 gEasyChatWord_Using[] = _("USING"); +const u8 gEasyChatWord_Couldnt[] = _("COULDN'T"); +const u8 gEasyChatWord_Capable[] = _("CAPABLE"); +const u8 gEasyChatWord_Disappear[] = _("DISAPPEAR"); +const u8 gEasyChatWord_Appear[] = _("APPEAR"); +const u8 gEasyChatWord_Throw[] = _("THROW"); +const u8 gEasyChatWord_Worry[] = _("WORRY"); +const u8 gEasyChatWord_Slept[] = _("SLEPT"); +const u8 gEasyChatWord_Sleep[] = _("SLEEP"); +const u8 gEasyChatWord_Release[] = _("RELEASE"); +const u8 gEasyChatWord_Drinks[] = _("DRINKS"); +const u8 gEasyChatWord_Runs[] = _("RUNS"); +const u8 gEasyChatWord_Run[] = _("RUN"); +const u8 gEasyChatWord_Works[] = _("WORKS"); +const u8 gEasyChatWord_Working[] = _("WORKING"); +const u8 gEasyChatWord_Talking[] = _("TALKING"); +const u8 gEasyChatWord_Talk[] = _("TALK"); +const u8 gEasyChatWord_Sink[] = _("SINK"); +const u8 gEasyChatWord_Smack[] = _("SMACK"); +const u8 gEasyChatWord_Pretend[] = _("PRETEND"); +const u8 gEasyChatWord_Praise[] = _("PRAISE"); +const u8 gEasyChatWord_Overdo[] = _("OVERDO"); +const u8 gEasyChatWord_Show[] = _("SHOW"); +const u8 gEasyChatWord_Looks[] = _("LOOKS"); +const u8 gEasyChatWord_Sees[] = _("SEES"); +const u8 gEasyChatWord_Seek[] = _("SEEK"); +const u8 gEasyChatWord_Own[] = _("OWN"); +const u8 gEasyChatWord_Take[] = _("TAKE"); +const u8 gEasyChatWord_Allow[] = _("ALLOW"); +const u8 gEasyChatWord_Forget[] = _("FORGET"); +const u8 gEasyChatWord_Forgets[] = _("FORGETS"); +const u8 gEasyChatWord_Appears[] = _("APPEARS"); +const u8 gEasyChatWord_Faint[] = _("FAINT"); +const u8 gEasyChatWord_Fainted[] = _("FAINTED"); + +const struct EasyChatWordInfo gEasyChatGroup_Actions[] = { + { + .text = gEasyChatWord_Meets, + .alphabeticalOrder = 72, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Concede, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Give, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Gives, + .alphabeticalOrder = 75, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Played, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Plays, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Collect, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Walking, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Walks, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Says, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Went, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Said, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WakeUp, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WakesUp, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Angers, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Teach, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Teaches, + .alphabeticalOrder = 54, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Please, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Learn, + .alphabeticalOrder = 76, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Change, + .alphabeticalOrder = 77, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Story, + .alphabeticalOrder = 73, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Trust, + .alphabeticalOrder = 74, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lavish, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Listens, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hearing, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Trains, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Choose, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Come, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Came, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Search, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Make, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cause, + .alphabeticalOrder = 67, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Know, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Knows, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Refuse, + .alphabeticalOrder = 65, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Stores, + .alphabeticalOrder = 70, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Brag, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ignorant, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Thinks, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Believe, + .alphabeticalOrder = 64, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Slide, + .alphabeticalOrder = 63, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Eats, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Use, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Uses, + .alphabeticalOrder = 56, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Using, + .alphabeticalOrder = 55, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Couldnt, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Capable, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Disappear, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Appear, + .alphabeticalOrder = 69, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Throw, + .alphabeticalOrder = 68, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Worry, + .alphabeticalOrder = 66, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Slept, + .alphabeticalOrder = 61, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sleep, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Release, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Drinks, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Runs, + .alphabeticalOrder = 62, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Run, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Works, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Working, + .alphabeticalOrder = 71, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Talking, + .alphabeticalOrder = 60, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Talk, + .alphabeticalOrder = 59, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sink, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Smack, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pretend, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Praise, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Overdo, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Show, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Looks, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sees, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Seek, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Own, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Take, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Allow, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Forget, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Forgets, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Appears, + .alphabeticalOrder = 58, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Faint, + .alphabeticalOrder = 57, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fainted, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_adjectives.h b/src/data/easy_chat/easy_chat_group_adjectives.h new file mode 100755 index 0000000000..1c74741180 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_adjectives.h @@ -0,0 +1,219 @@ +const u8 gEasyChatWord_Wandering[] = _("WANDERING"); +const u8 gEasyChatWord_Rickety[] = _("RICKETY"); +const u8 gEasyChatWord_RockSolid[] = _("ROCK-SOLID"); +const u8 gEasyChatWord_Hungry[] = _("HUNGRY"); +const u8 gEasyChatWord_Tight[] = _("TIGHT"); +const u8 gEasyChatWord_Ticklish[] = _("TICKLISH"); +const u8 gEasyChatWord_Twirling[] = _("TWIRLING"); +const u8 gEasyChatWord_Spiraling[] = _("SPIRALING"); +const u8 gEasyChatWord_Thirsty[] = _("THIRSTY"); +const u8 gEasyChatWord_Lolling[] = _("LOLLING"); +const u8 gEasyChatWord_Silky[] = _("SILKY"); +const u8 gEasyChatWord_Sadly[] = _("SADLY"); +const u8 gEasyChatWord_Hopeless[] = _("HOPELESS"); +const u8 gEasyChatWord_Useless[] = _("USELESS"); +const u8 gEasyChatWord_Drooling[] = _("DROOLING"); +const u8 gEasyChatWord_Exciting[] = _("EXCITING"); +const u8 gEasyChatWord_Thick[] = _("THICK"); +const u8 gEasyChatWord_Smooth[] = _("SMOOTH"); +const u8 gEasyChatWord_Slimy[] = _("SLIMY"); +const u8 gEasyChatWord_Thin[] = _("THIN"); +const u8 gEasyChatWord_Break[] = _("BREAK"); +const u8 gEasyChatWord_Voracious[] = _("VORACIOUS"); +const u8 gEasyChatWord_Scatter[] = _("SCATTER"); +const u8 gEasyChatWord_Awesome[] = _("AWESOME"); +const u8 gEasyChatWord_Wimpy[] = _("WIMPY"); +const u8 gEasyChatWord_Wobbly[] = _("WOBBLY"); +const u8 gEasyChatWord_Shaky[] = _("SHAKY"); +const u8 gEasyChatWord_Ripped[] = _("RIPPED"); +const u8 gEasyChatWord_Shredded[] = _("SHREDDED"); +const u8 gEasyChatWord_Increasing[] = _("INCREASING"); +const u8 gEasyChatWord_Yet[] = _("YET"); +const u8 gEasyChatWord_Destroyed[] = _("DESTROYED"); +const u8 gEasyChatWord_Fiery[] = _("FIERY"); +const u8 gEasyChatWord_LoveyDovey[] = _("LOVEY-DOVEY"); +const u8 gEasyChatWord_Happily[] = _("HAPPILY"); +const u8 gEasyChatWord_Anticipation[] = _("ANTICIPATION"); + +const struct EasyChatWordInfo gEasyChatGroup_Adjectives[] = { + { + .text = gEasyChatWord_Wandering, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rickety, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_RockSolid, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hungry, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tight, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ticklish, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Twirling, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Spiraling, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Thirsty, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lolling, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Silky, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sadly, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hopeless, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Useless, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Drooling, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Exciting, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Thick, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Smooth, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Slimy, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Thin, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Break, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Voracious, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Scatter, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Awesome, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wimpy, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wobbly, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Shaky, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ripped, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Shredded, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Increasing, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Yet, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Destroyed, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fiery, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_LoveyDovey, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Happily, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Anticipation, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_battle.h b/src/data/easy_chat/easy_chat_group_battle.h new file mode 100755 index 0000000000..0f97f50c93 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_battle.h @@ -0,0 +1,381 @@ +const u8 gEasyChatWord_MatchUp[] = _("MATCH UP"); +const u8 gEasyChatWord_Go[] = _("GO"); +const u8 gEasyChatWord_No1[] = _("NO. 1"); +const u8 gEasyChatWord_Decide[] = _("DECIDE"); +const u8 gEasyChatWord_LetMeWin[] = _("LET ME WIN"); +const u8 gEasyChatWord_Wins[] = _("WINS"); +const u8 gEasyChatWord_Win[] = _("WIN"); +const u8 gEasyChatWord_Won[] = _("WON"); +const u8 gEasyChatWord_IfIWin[] = _("IF I WIN"); +const u8 gEasyChatWord_WhenIWin[] = _("WHEN I WIN"); +const u8 gEasyChatWord_CantWin[] = _("CAN'T WIN"); +const u8 gEasyChatWord_CanWin[] = _("CAN WIN"); +const u8 gEasyChatWord_NoMatch[] = _("NO MATCH"); +const u8 gEasyChatWord_Spirit[] = _("SPIRIT"); +const u8 gEasyChatWord_Decided[] = _("DECIDED"); +const u8 gEasyChatWord_TrumpCard[] = _("TRUMP CARD"); +const u8 gEasyChatWord_TakeThat[] = _("TAKE THAT"); +const u8 gEasyChatWord_ComeOn[] = _("COME ON"); +const u8 gEasyChatWord_Attack[] = _("ATTACK"); +const u8 gEasyChatWord_Surrender[] = _("SURRENDER"); +const u8 gEasyChatWord_Gutsy[] = _("GUTSY"); +const u8 gEasyChatWord_Talent[] = _("TALENT"); +const u8 gEasyChatWord_Strategy[] = _("STRATEGY"); +const u8 gEasyChatWord_Smite[] = _("SMITE"); +const u8 gEasyChatWord_Match[] = _("MATCH"); +const u8 gEasyChatWord_Victory[] = _("VICTORY"); +const u8 gEasyChatWord_Offensive[] = _("OFFENSIVE"); +const u8 gEasyChatWord_Sense[] = _("SENSE"); +const u8 gEasyChatWord_Versus[] = _("VERSUS"); +const u8 gEasyChatWord_Fights[] = _("FIGHTS"); +const u8 gEasyChatWord_Power[] = _("POWER"); +const u8 gEasyChatWord_Challenge[] = _("CHALLENGE"); +const u8 gEasyChatWord_Strong[] = _("STRONG"); +const u8 gEasyChatWord_TooStrong[] = _("TOO STRONG"); +const u8 gEasyChatWord_GoEasy[] = _("GO EASY"); +const u8 gEasyChatWord_Foe[] = _("FOE"); +const u8 gEasyChatWord_Genius[] = _("GENIUS"); +const u8 gEasyChatWord_Legend[] = _("LEGEND"); +const u8 gEasyChatWord_Escape[] = _("ESCAPE"); +const u8 gEasyChatWord_Aim[] = _("AIM"); +const u8 gEasyChatWord_Battle[] = _("BATTLE"); +const u8 gEasyChatWord_Fight[] = _("FIGHT"); +const u8 gEasyChatWord_Resuscitate[] = _("RESUSCITATE"); +const u8 gEasyChatWord_Points[] = _("POINTS"); +const u8 gEasyChatWord_Serious[] = _("SERIOUS"); +const u8 gEasyChatWord_GiveUp[] = _("GIVE UP"); +const u8 gEasyChatWord_Loss[] = _("LOSS"); +const u8 gEasyChatWord_IfILose[] = _("IF I LOSE"); +const u8 gEasyChatWord_Lost[] = _("LOST"); +const u8 gEasyChatWord_Lose[] = _("LOSE"); +const u8 gEasyChatWord_Guard[] = _("GUARD"); +const u8 gEasyChatWord_Partner[] = _("PARTNER"); +const u8 gEasyChatWord_Reject[] = _("REJECT"); +const u8 gEasyChatWord_Accept[] = _("ACCEPT"); +const u8 gEasyChatWord_Invincible[] = _("INVINCIBLE"); +const u8 gEasyChatWord_Received[] = _("RECEIVED"); +const u8 gEasyChatWord_Easy[] = _("EASY"); +const u8 gEasyChatWord_Weak[] = _("WEAK"); +const u8 gEasyChatWord_TooWeak[] = _("TOO WEAK"); +const u8 gEasyChatWord_Pushover[] = _("PUSHOVER"); +const u8 gEasyChatWord_Leader[] = _("LEADER"); +const u8 gEasyChatWord_Rule[] = _("RULE"); +const u8 gEasyChatWord_Move[] = _("MOVE"); + +const struct EasyChatWordInfo gEasyChatGroup_Battle[] = { + { + .text = gEasyChatWord_MatchUp, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Go, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_No1, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Decide, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_LetMeWin, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wins, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Win, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Won, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_IfIWin, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WhenIWin, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_CantWin, + .alphabeticalOrder = 56, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_CanWin, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_NoMatch, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Spirit, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Decided, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_TrumpCard, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_TakeThat, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ComeOn, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Attack, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Surrender, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Gutsy, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Talent, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Strategy, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Smite, + .alphabeticalOrder = 54, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Match, + .alphabeticalOrder = 60, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Victory, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Offensive, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sense, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Versus, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fights, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Power, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Challenge, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Strong, + .alphabeticalOrder = 62, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_TooStrong, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_GoEasy, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Foe, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Genius, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Legend, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Escape, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Aim, + .alphabeticalOrder = 59, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Battle, + .alphabeticalOrder = 55, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fight, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Resuscitate, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Points, + .alphabeticalOrder = 61, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Serious, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_GiveUp, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Loss, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_IfILose, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lost, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lose, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Guard, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Partner, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Reject, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Accept, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Invincible, + .alphabeticalOrder = 58, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Received, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Easy, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Weak, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_TooWeak, + .alphabeticalOrder = 57, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pushover, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Leader, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rule, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Move, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_conditions.h b/src/data/easy_chat/easy_chat_group_conditions.h new file mode 100755 index 0000000000..a8d8ee8740 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_conditions.h @@ -0,0 +1,417 @@ +const u8 gEasyChatWord_Hot[] = _("HOT"); +const u8 gEasyChatWord_Exists[] = _("EXISTS"); +const u8 gEasyChatWord_Excess[] = _("EXCESS"); +const u8 gEasyChatWord_Approved[] = _("APPROVED"); +const u8 gEasyChatWord_Has[] = _("HAS"); +const u8 gEasyChatWord_Good[] = _("GOOD"); +const u8 gEasyChatWord_Less[] = _("LESS"); +const u8 gEasyChatWord_Momentum[] = _("MOMENTUM"); +const u8 gEasyChatWord_Going[] = _("GOING"); +const u8 gEasyChatWord_Weird[] = _("WEIRD"); +const u8 gEasyChatWord_Busy[] = _("BUSY"); +const u8 gEasyChatWord_Together[] = _("TOGETHER"); +const u8 gEasyChatWord_Full[] = _("FULL"); +const u8 gEasyChatWord_Absent[] = _("ABSENT"); +const u8 gEasyChatWord_Being[] = _("BEING"); +const u8 gEasyChatWord_Need[] = _("NEED"); +const u8 gEasyChatWord_Tasty[] = _("TASTY"); +const u8 gEasyChatWord_Skilled[] = _("SKILLED"); +const u8 gEasyChatWord_Noisy[] = _("NOISY"); +const u8 gEasyChatWord_Big[] = _("BIG"); +const u8 gEasyChatWord_Late[] = _("LATE"); +const u8 gEasyChatWord_Close[] = _("CLOSE"); +const u8 gEasyChatWord_Docile[] = _("DOCILE"); +const u8 gEasyChatWord_Amusing[] = _("AMUSING"); +const u8 gEasyChatWord_Entertaining[] = _("ENTERTAINING"); +const u8 gEasyChatWord_Perfection[] = _("PERFECTION"); +const u8 gEasyChatWord_Pretty[] = _("PRETTY"); +const u8 gEasyChatWord_Healthy[] = _("HEALTHY"); +const u8 gEasyChatWord_Excellent[] = _("EXCELLENT"); +const u8 gEasyChatWord_UpsideDown[] = _("UPSIDE DOWN"); +const u8 gEasyChatWord_Cold[] = _("COLD"); +const u8 gEasyChatWord_Refreshing[] = _("REFRESHING"); +const u8 gEasyChatWord_Unavoidable[] = _("UNAVOIDABLE"); +const u8 gEasyChatWord_Much[] = _("MUCH"); +const u8 gEasyChatWord_Overwhelming[] = _("OVERWHELMING"); +const u8 gEasyChatWord_Fabulous[] = _("FABULOUS"); +const u8 gEasyChatWord_Else[] = _("ELSE"); +const u8 gEasyChatWord_Expensive[] = _("EXPENSIVE"); +const u8 gEasyChatWord_Correct[] = _("CORRECT"); +const u8 gEasyChatWord_Impossible[] = _("IMPOSSIBLE"); +const u8 gEasyChatWord_Small[] = _("SMALL"); +const u8 gEasyChatWord_Different[] = _("DIFFERENT"); +const u8 gEasyChatWord_Tired[] = _("TIRED"); +const u8 gEasyChatWord_Skill[] = _("SKILL"); +const u8 gEasyChatWord_Top[] = _("TOP"); +const u8 gEasyChatWord_NonStop[] = _("NON-STOP"); +const u8 gEasyChatWord_Preposterous[] = _("PREPOSTEROUS"); +const u8 gEasyChatWord_None[] = _("NONE"); +const u8 gEasyChatWord_Nothing[] = _("NOTHING"); +const u8 gEasyChatWord_Natural[] = _("NATURAL"); +const u8 gEasyChatWord_Becomes[] = _("BECOMES"); +const u8 gEasyChatWord_Lukewarm[] = _("LUKEWARM"); +const u8 gEasyChatWord_Fast[] = _("FAST"); +const u8 gEasyChatWord_Low[] = _("LOW"); +const u8 gEasyChatWord_Awful[] = _("AWFUL"); +const u8 gEasyChatWord_Alone[] = _("ALONE"); +const u8 gEasyChatWord_Bored[] = _("BORED"); +const u8 gEasyChatWord_Secret[] = _("SECRET"); +const u8 gEasyChatWord_Mystery[] = _("MYSTERY"); +const u8 gEasyChatWord_Lacks[] = _("LACKS"); +const u8 gEasyChatWord_Best[] = _("BEST"); +const u8 gEasyChatWord_Lousy[] = _("LOUSY"); +const u8 gEasyChatWord_Mistake[] = _("MISTAKE"); +const u8 gEasyChatWord_Kind[] = _("KIND"); +const u8 gEasyChatWord_Well[] = _("WELL"); +const u8 gEasyChatWord_Weakened[] = _("WEAKENED"); +const u8 gEasyChatWord_Simple[] = _("SIMPLE"); +const u8 gEasyChatWord_Seems[] = _("SEEMS"); +const u8 gEasyChatWord_Badly[] = _("BADLY"); + +const struct EasyChatWordInfo gEasyChatGroup_Conditions[] = { + { + .text = gEasyChatWord_Hot, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Exists, + .alphabeticalOrder = 55, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Excess, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Approved, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Has, + .alphabeticalOrder = 54, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Good, + .alphabeticalOrder = 68, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Less, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Momentum, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Going, + .alphabeticalOrder = 60, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Weird, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Busy, + .alphabeticalOrder = 56, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Together, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Full, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Absent, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Being, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Need, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tasty, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Skilled, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Noisy, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Big, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Late, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Close, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Docile, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Amusing, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Entertaining, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Perfection, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pretty, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Healthy, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Excellent, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_UpsideDown, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cold, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Refreshing, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Unavoidable, + .alphabeticalOrder = 63, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Much, + .alphabeticalOrder = 59, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Overwhelming, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fabulous, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Else, + .alphabeticalOrder = 61, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Expensive, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Correct, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Impossible, + .alphabeticalOrder = 62, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Small, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Different, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tired, + .alphabeticalOrder = 58, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Skill, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Top, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_NonStop, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Preposterous, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_None, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Nothing, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Natural, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Becomes, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lukewarm, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fast, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Low, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Awful, + .alphabeticalOrder = 57, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Alone, + .alphabeticalOrder = 67, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Bored, + .alphabeticalOrder = 66, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Secret, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mystery, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lacks, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Best, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lousy, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mistake, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Kind, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Well, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Weakened, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Simple, + .alphabeticalOrder = 65, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Seems, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Badly, + .alphabeticalOrder = 64, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_endings.h b/src/data/easy_chat/easy_chat_group_endings.h new file mode 100755 index 0000000000..afaea48cb1 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_endings.h @@ -0,0 +1,417 @@ +const u8 gEasyChatWord_Will[] = _("WILL"); +const u8 gEasyChatWord_WillBeHere[] = _("WILL BE HERE"); +const u8 gEasyChatWord_Or[] = _("OR"); +const u8 gEasyChatWord_Times[] = _("TIMES"); +const u8 gEasyChatWord_Wonder[] = _("WONDER"); +const u8 gEasyChatWord_IsItQues[] = _("IS IT?"); +const u8 gEasyChatWord_Be[] = _("BE"); +const u8 gEasyChatWord_Gimme[] = _("GIMME"); +const u8 gEasyChatWord_Could[] = _("COULD"); +const u8 gEasyChatWord_LikelyTo[] = _("LIKELY TO"); +const u8 gEasyChatWord_Would[] = _("WOULD"); +const u8 gEasyChatWord_Is[] = _("IS"); +const u8 gEasyChatWord_IsntItQues[] = _("ISN'T IT?"); +const u8 gEasyChatWord_Lets[] = _("LET'S"); +const u8 gEasyChatWord_Other[] = _("OTHER"); +const u8 gEasyChatWord_Are[] = _("ARE"); +const u8 gEasyChatWord_Was[] = _("WAS"); +const u8 gEasyChatWord_Were[] = _("WERE"); +const u8 gEasyChatWord_Those[] = _("THOSE"); +const u8 gEasyChatWord_Isnt[] = _("ISN'T"); +const u8 gEasyChatWord_Wont[] = _("WON'T"); +const u8 gEasyChatWord_Cant[] = _("CAN'T"); +const u8 gEasyChatWord_Can[] = _("CAN"); +const u8 gEasyChatWord_Dont[] = _("DON'T"); +const u8 gEasyChatWord_Do[] = _("DO"); +const u8 gEasyChatWord_Does[] = _("DOES"); +const u8 gEasyChatWord_Whom[] = _("WHOM"); +const u8 gEasyChatWord_Which[] = _("WHICH"); +const u8 gEasyChatWord_Wasnt[] = _("WASN'T"); +const u8 gEasyChatWord_Werent[] = _("WEREN'T"); +const u8 gEasyChatWord_Have[] = _("HAVE"); +const u8 gEasyChatWord_Havent[] = _("HAVEN'T"); +const u8 gEasyChatWord_A[] = _("A"); +const u8 gEasyChatWord_An[] = _("AN"); +const u8 gEasyChatWord_Not[] = _("NOT"); +const u8 gEasyChatWord_There[] = _("THERE"); +const u8 gEasyChatWord_OkQues[] = _("OK?"); +const u8 gEasyChatWord_So[] = _("SO"); +const u8 gEasyChatWord_Maybe[] = _("MAYBE"); +const u8 gEasyChatWord_About[] = _("ABOUT"); +const u8 gEasyChatWord_Over[] = _("OVER"); +const u8 gEasyChatWord_It[] = _("IT"); +const u8 gEasyChatWord_All[] = _("ALL"); +const u8 gEasyChatWord_For[] = _("FOR"); +const u8 gEasyChatWord_On[] = _("ON"); +const u8 gEasyChatWord_Off[] = _("OFF"); +const u8 gEasyChatWord_As[] = _("AS"); +const u8 gEasyChatWord_To[] = _("TO"); +const u8 gEasyChatWord_With[] = _("WITH"); +const u8 gEasyChatWord_Better[] = _("BETTER"); +const u8 gEasyChatWord_Ever[] = _("EVER"); +const u8 gEasyChatWord_Since[] = _("SINCE"); +const u8 gEasyChatWord_Of[] = _("OF"); +const u8 gEasyChatWord_BelongsTo[] = _("BELONGS TO"); +const u8 gEasyChatWord_At[] = _("AT"); +const u8 gEasyChatWord_In[] = _("IN"); +const u8 gEasyChatWord_Out[] = _("OUT"); +const u8 gEasyChatWord_Too[] = _("TOO"); +const u8 gEasyChatWord_Like[] = _("LIKE"); +const u8 gEasyChatWord_Did[] = _("DID"); +const u8 gEasyChatWord_Didnt[] = _("DIDN'T"); +const u8 gEasyChatWord_Doesnt[] = _("DOESN'T"); +const u8 gEasyChatWord_Without[] = _("WITHOUT"); +const u8 gEasyChatWord_After[] = _("AFTER"); +const u8 gEasyChatWord_Before[] = _("BEFORE"); +const u8 gEasyChatWord_While[] = _("WHILE"); +const u8 gEasyChatWord_Than[] = _("THAN"); +const u8 gEasyChatWord_Once[] = _("ONCE"); +const u8 gEasyChatWord_Anywhere[] = _("ANYWHERE"); + +const struct EasyChatWordInfo gEasyChatGroup_Endings[] = { + { + .text = gEasyChatWord_Will, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WillBeHere, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Or, + .alphabeticalOrder = 63, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Times, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wonder, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_IsItQues, + .alphabeticalOrder = 68, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Be, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Gimme, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Could, + .alphabeticalOrder = 54, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_LikelyTo, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Would, + .alphabeticalOrder = 64, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Is, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_IsntItQues, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lets, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Other, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Are, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Was, + .alphabeticalOrder = 59, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Were, + .alphabeticalOrder = 60, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Those, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Isnt, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wont, + .alphabeticalOrder = 61, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cant, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Can, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Dont, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Do, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Does, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Whom, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Which, + .alphabeticalOrder = 55, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wasnt, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Werent, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Have, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Havent, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_A, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_An, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Not, + .alphabeticalOrder = 58, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_There, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_OkQues, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_So, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Maybe, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_About, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Over, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_It, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_All, + .alphabeticalOrder = 67, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_For, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_On, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Off, + .alphabeticalOrder = 56, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_As, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_To, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_With, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Better, + .alphabeticalOrder = 66, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ever, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Since, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Of, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_BelongsTo, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_At, + .alphabeticalOrder = 57, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_In, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Out, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Too, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Like, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Did, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Didnt, + .alphabeticalOrder = 65, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Doesnt, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Without, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_After, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Before, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_While, + .alphabeticalOrder = 62, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Than, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Once, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Anywhere, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_events.h b/src/data/easy_chat/easy_chat_group_events.h new file mode 100755 index 0000000000..8d9cf7e24c --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_events.h @@ -0,0 +1,177 @@ +const u8 gEasyChatWord_Appeal[] = _("APPEAL"); +const u8 gEasyChatWord_Events[] = _("EVENTS"); +const u8 gEasyChatWord_StayAtHome[] = _("STAY-AT-HOME"); +const u8 gEasyChatWord_Berry[] = _("BERRY"); +const u8 gEasyChatWord_Contest[] = _("CONTEST"); +const u8 gEasyChatWord_Mc[] = _("MC"); +const u8 gEasyChatWord_Judge[] = _("JUDGE"); +const u8 gEasyChatWord_Super[] = _("SUPER"); +const u8 gEasyChatWord_Stage[] = _("STAGE"); +const u8 gEasyChatWord_HallOfFame[] = _("HALL OF FAME"); +const u8 gEasyChatWord_Evolution[] = _("EVOLUTION"); +const u8 gEasyChatWord_Hyper[] = _("HYPER"); +const u8 gEasyChatWord_BattleTower[] = _("BATTLE TOWER"); +const u8 gEasyChatWord_Leaders[] = _("LEADERS"); +const u8 gEasyChatWord_BattleRoom[] = _("BATTLE ROOM"); +const u8 gEasyChatWord_Hidden[] = _("HIDDEN"); +const u8 gEasyChatWord_SecretBase[] = _("SECRET BASE"); +const u8 gEasyChatWord_Blend[] = _("BLEND"); +const u8 gEasyChatWord_POKEBLOCK[] = _("{POKEBLOCK}"); +const u8 gEasyChatWord_Master[] = _("MASTER"); +const u8 gEasyChatWord_Rank[] = _("RANK"); +const u8 gEasyChatWord_Ribbon[] = _("RIBBON"); +const u8 gEasyChatWord_Crush[] = _("CRUSH"); +const u8 gEasyChatWord_Direct[] = _("DIRECT"); +const u8 gEasyChatWord_Tower[] = _("TOWER"); +const u8 gEasyChatWord_Union[] = _("UNION"); +const u8 gEasyChatWord_Room[] = _("ROOM"); +const u8 gEasyChatWord_Wireless[] = _("WIRELESS"); +const u8 gEasyChatWord_Frontier[] = _("FRONTIER"); + +const struct EasyChatWordInfo gEasyChatGroup_Events[] = { + { + .text = gEasyChatWord_Appeal, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Events, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_StayAtHome, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Berry, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Contest, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mc, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Judge, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Super, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Stage, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HallOfFame, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Evolution, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hyper, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_BattleTower, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Leaders, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_BattleRoom, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hidden, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SecretBase, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Blend, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_POKEBLOCK, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Master, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rank, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ribbon, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Crush, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Direct, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tower, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Union, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Room, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wireless, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Frontier, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_feelings.h b/src/data/easy_chat/easy_chat_group_feelings.h new file mode 100755 index 0000000000..2dda718081 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_feelings.h @@ -0,0 +1,417 @@ +const u8 gEasyChatWord_Meet[] = _("MEET"); +const u8 gEasyChatWord_Play[] = _("PLAY"); +const u8 gEasyChatWord_Hurried[] = _("HURRIED"); +const u8 gEasyChatWord_Goes[] = _("GOES"); +const u8 gEasyChatWord_Giddy[] = _("GIDDY"); +const u8 gEasyChatWord_Happy[] = _("HAPPY"); +const u8 gEasyChatWord_Happiness[] = _("HAPPINESS"); +const u8 gEasyChatWord_Excite[] = _("EXCITE"); +const u8 gEasyChatWord_Important[] = _("IMPORTANT"); +const u8 gEasyChatWord_Funny[] = _("FUNNY"); +const u8 gEasyChatWord_Got[] = _("GOT"); +const u8 gEasyChatWord_GoHome[] = _("GO HOME"); +const u8 gEasyChatWord_Disappointed[] = _("DISAPPOINTED"); +const u8 gEasyChatWord_Disappoints[] = _("DISAPPOINTS"); +const u8 gEasyChatWord_Sad[] = _("SAD"); +const u8 gEasyChatWord_Try[] = _("TRY"); +const u8 gEasyChatWord_Tries[] = _("TRIES"); +const u8 gEasyChatWord_Hears[] = _("HEARS"); +const u8 gEasyChatWord_Think[] = _("THINK"); +const u8 gEasyChatWord_Hear[] = _("HEAR"); +const u8 gEasyChatWord_Wants[] = _("WANTS"); +const u8 gEasyChatWord_Misheard[] = _("MISHEARD"); +const u8 gEasyChatWord_Dislike[] = _("DISLIKE"); +const u8 gEasyChatWord_Angry[] = _("ANGRY"); +const u8 gEasyChatWord_Anger[] = _("ANGER"); +const u8 gEasyChatWord_Scary[] = _("SCARY"); +const u8 gEasyChatWord_Lonesome[] = _("LONESOME"); +const u8 gEasyChatWord_Disappoint[] = _("DISAPPOINT"); +const u8 gEasyChatWord_Joy[] = _("JOY"); +const u8 gEasyChatWord_Gets[] = _("GETS"); +const u8 gEasyChatWord_Never[] = _("NEVER"); +const u8 gEasyChatWord_Darn[] = _("DARN"); +const u8 gEasyChatWord_Downcast[] = _("DOWNCAST"); +const u8 gEasyChatWord_Incredible[] = _("INCREDIBLE"); +const u8 gEasyChatWord_Likes[] = _("LIKES"); +const u8 gEasyChatWord_Dislikes[] = _("DISLIKES"); +const u8 gEasyChatWord_Boring[] = _("BORING"); +const u8 gEasyChatWord_Care[] = _("CARE"); +const u8 gEasyChatWord_Cares[] = _("CARES"); +const u8 gEasyChatWord_AllRight[] = _("ALL RIGHT"); +const u8 gEasyChatWord_Adore[] = _("ADORE"); +const u8 gEasyChatWord_Disaster[] = _("DISASTER"); +const u8 gEasyChatWord_Enjoy[] = _("ENJOY"); +const u8 gEasyChatWord_Enjoys[] = _("ENJOYS"); +const u8 gEasyChatWord_Eat[] = _("EAT"); +const u8 gEasyChatWord_Lacking[] = _("LACKING"); +const u8 gEasyChatWord_Bad[] = _("BAD"); +const u8 gEasyChatWord_Hard[] = _("HARD"); +const u8 gEasyChatWord_Terrible[] = _("TERRIBLE"); +const u8 gEasyChatWord_Should[] = _("SHOULD"); +const u8 gEasyChatWord_Nice[] = _("NICE"); +const u8 gEasyChatWord_Drink[] = _("DRINK"); +const u8 gEasyChatWord_Surprise[] = _("SURPRISE"); +const u8 gEasyChatWord_Fear[] = _("FEAR"); +const u8 gEasyChatWord_Want[] = _("WANT"); +const u8 gEasyChatWord_Wait[] = _("WAIT"); +const u8 gEasyChatWord_Satisfied[] = _("SATISFIED"); +const u8 gEasyChatWord_See[] = _("SEE"); +const u8 gEasyChatWord_Rare[] = _("RARE"); +const u8 gEasyChatWord_Negative[] = _("NEGATIVE"); +const u8 gEasyChatWord_Done[] = _("DONE"); +const u8 gEasyChatWord_Danger[] = _("DANGER"); +const u8 gEasyChatWord_Defeated[] = _("DEFEATED"); +const u8 gEasyChatWord_Beat[] = _("BEAT"); +const u8 gEasyChatWord_Great[] = _("GREAT"); +const u8 gEasyChatWord_Romantic[] = _("ROMANTIC"); +const u8 gEasyChatWord_Question[] = _("QUESTION"); +const u8 gEasyChatWord_Understand[] = _("UNDERSTAND"); +const u8 gEasyChatWord_Understands[] = _("UNDERSTANDS"); + +const struct EasyChatWordInfo gEasyChatGroup_Feelings[] = { + { + .text = gEasyChatWord_Meet, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Play, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hurried, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Goes, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Giddy, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Happy, + .alphabeticalOrder = 63, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Happiness, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Excite, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Important, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Funny, + .alphabeticalOrder = 61, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Got, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_GoHome, + .alphabeticalOrder = 62, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Disappointed, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Disappoints, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sad, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Try, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tries, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hears, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Think, + .alphabeticalOrder = 60, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hear, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wants, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Misheard, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Dislike, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Angry, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Anger, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Scary, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lonesome, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Disappoint, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Joy, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Gets, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Never, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Darn, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Downcast, + .alphabeticalOrder = 64, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Incredible, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Likes, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Dislikes, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Boring, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Care, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cares, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_AllRight, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Adore, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Disaster, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Enjoy, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Enjoys, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Eat, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lacking, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Bad, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hard, + .alphabeticalOrder = 59, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Terrible, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Should, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Nice, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Drink, + .alphabeticalOrder = 66, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Surprise, + .alphabeticalOrder = 58, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fear, + .alphabeticalOrder = 65, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Want, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wait, + .alphabeticalOrder = 56, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Satisfied, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_See, + .alphabeticalOrder = 57, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rare, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Negative, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Done, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Danger, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Defeated, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Beat, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Great, + .alphabeticalOrder = 67, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Romantic, + .alphabeticalOrder = 68, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Question, + .alphabeticalOrder = 55, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Understand, + .alphabeticalOrder = 54, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Understands, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_greetings.h b/src/data/easy_chat/easy_chat_group_greetings.h new file mode 100755 index 0000000000..4df08bf7dc --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_greetings.h @@ -0,0 +1,255 @@ +const u8 gEasyChatWord_Thanks[] = _("THANKS"); +const u8 gEasyChatWord_Yes[] = _("YES"); +const u8 gEasyChatWord_HereGoes[] = _("HERE GOES"); +const u8 gEasyChatWord_HereICome[] = _("HERE I COME"); +const u8 gEasyChatWord_HereItIs[] = _("HERE IT IS"); +const u8 gEasyChatWord_Yeah[] = _("YEAH"); +const u8 gEasyChatWord_Welcome[] = _("WELCOME"); +const u8 gEasyChatWord_Oi[] = _("OI"); +const u8 gEasyChatWord_HowDo[] = _("HOW DO"); +const u8 gEasyChatWord_Congrats[] = _("CONGRATS"); +const u8 gEasyChatWord_GiveMe[] = _("GIVE ME"); +const u8 gEasyChatWord_Sorry[] = _("SORRY"); +const u8 gEasyChatWord_Apologize[] = _("APOLOGIZE"); +const u8 gEasyChatWord_Forgive[] = _("FORGIVE"); +const u8 gEasyChatWord_HeyThere[] = _("HEY, THERE"); +const u8 gEasyChatWord_Hello[] = _("HELLO"); +const u8 gEasyChatWord_GoodBye[] = _("GOOD-BYE"); +const u8 gEasyChatWord_ThankYou[] = _("THANK YOU"); +const u8 gEasyChatWord_IveArrived[] = _("I'VE ARRIVED"); +const u8 gEasyChatWord_Pardon[] = _("PARDON"); +const u8 gEasyChatWord_Excuse[] = _("EXCUSE"); +const u8 gEasyChatWord_SeeYa[] = _("SEE YA"); +const u8 gEasyChatWord_ExcuseMe[] = _("EXCUSE ME"); +const u8 gEasyChatWord_WellThen[] = _("WELL, THEN"); +const u8 gEasyChatWord_GoAhead[] = _("GO AHEAD"); +const u8 gEasyChatWord_Appreciate[] = _("APPRECIATE"); +const u8 gEasyChatWord_HeyQues[] = _("HEY?"); +const u8 gEasyChatWord_WhatsUpQues[] = _("WHAT'S UP?"); +const u8 gEasyChatWord_HuhQues[] = _("HUH?"); +const u8 gEasyChatWord_No[] = _("NO"); +const u8 gEasyChatWord_Hi[] = _("HI"); +const u8 gEasyChatWord_YeahYeah[] = _("YEAH, YEAH"); +const u8 gEasyChatWord_ByeBye[] = _("BYE-BYE"); +const u8 gEasyChatWord_MeetYou[] = _("MEET YOU"); +const u8 gEasyChatWord_Hey[] = _("HEY"); +const u8 gEasyChatWord_Smell[] = _("SMELL"); +const u8 gEasyChatWord_Listening[] = _("LISTENING"); +const u8 gEasyChatWord_HooHah[] = _("HOO-HAH"); +const u8 gEasyChatWord_Yahoo[] = _("YAHOO"); +const u8 gEasyChatWord_Yo[] = _("YO"); +const u8 gEasyChatWord_ComeOver[] = _("COME OVER"); +const u8 gEasyChatWord_CountOn[] = _("COUNT ON"); + +const struct EasyChatWordInfo gEasyChatGroup_Greetings[] = { + { + .text = gEasyChatWord_Thanks, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Yes, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HereGoes, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HereICome, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HereItIs, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Yeah, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Welcome, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Oi, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HowDo, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Congrats, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_GiveMe, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sorry, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Apologize, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Forgive, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HeyThere, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hello, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_GoodBye, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ThankYou, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_IveArrived, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pardon, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Excuse, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SeeYa, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ExcuseMe, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WellThen, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_GoAhead, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Appreciate, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HeyQues, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WhatsUpQues, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HuhQues, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_No, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hi, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_YeahYeah, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ByeBye, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_MeetYou, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hey, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Smell, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Listening, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HooHah, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Yahoo, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Yo, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ComeOver, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_CountOn, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_hobbies.h b/src/data/easy_chat/easy_chat_group_hobbies.h new file mode 100755 index 0000000000..fcd73d0174 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_hobbies.h @@ -0,0 +1,327 @@ +const u8 gEasyChatWord_Idol[] = _("IDOL"); +const u8 gEasyChatWord_Anime[] = _("ANIME"); +const u8 gEasyChatWord_Song[] = _("SONG"); +const u8 gEasyChatWord_Movie[] = _("MOVIE"); +const u8 gEasyChatWord_Sweets[] = _("SWEETS"); +const u8 gEasyChatWord_Chat[] = _("CHAT"); +const u8 gEasyChatWord_ChildsPlay[] = _("CHILD'S PLAY"); +const u8 gEasyChatWord_Toys[] = _("TOYS"); +const u8 gEasyChatWord_Music[] = _("MUSIC"); +const u8 gEasyChatWord_Cards[] = _("CARDS"); +const u8 gEasyChatWord_Shopping[] = _("SHOPPING"); +const u8 gEasyChatWord_Camera[] = _("CAMERA"); +const u8 gEasyChatWord_Viewing[] = _("VIEWING"); +const u8 gEasyChatWord_Spectator[] = _("SPECTATOR"); +const u8 gEasyChatWord_Gourmet[] = _("GOURMET"); +const u8 gEasyChatWord_Game[] = _("GAME"); +const u8 gEasyChatWord_Rpg[] = _("RPG"); +const u8 gEasyChatWord_Collection[] = _("COLLECTION"); +const u8 gEasyChatWord_Complete[] = _("COMPLETE"); +const u8 gEasyChatWord_Magazine[] = _("MAGAZINE"); +const u8 gEasyChatWord_Walk[] = _("WALK"); +const u8 gEasyChatWord_Bike[] = _("BIKE"); +const u8 gEasyChatWord_Hobby[] = _("HOBBY"); +const u8 gEasyChatWord_Sports[] = _("SPORTS"); +const u8 gEasyChatWord_Software[] = _("SOFTWARE"); +const u8 gEasyChatWord_Songs[] = _("SONGS"); +const u8 gEasyChatWord_Diet[] = _("DIET"); +const u8 gEasyChatWord_Treasure[] = _("TREASURE"); +const u8 gEasyChatWord_Travel[] = _("TRAVEL"); +const u8 gEasyChatWord_Dance[] = _("DANCE"); +const u8 gEasyChatWord_Channel[] = _("CHANNEL"); +const u8 gEasyChatWord_Making[] = _("MAKING"); +const u8 gEasyChatWord_Fishing[] = _("FISHING"); +const u8 gEasyChatWord_Date[] = _("DATE"); +const u8 gEasyChatWord_Design[] = _("DESIGN"); +const u8 gEasyChatWord_Locomotive[] = _("LOCOMOTIVE"); +const u8 gEasyChatWord_PlushDoll[] = _("PLUSH DOLL"); +const u8 gEasyChatWord_Pc[] = _("PC"); +const u8 gEasyChatWord_Flowers[] = _("FLOWERS"); +const u8 gEasyChatWord_Hero[] = _("HERO"); +const u8 gEasyChatWord_Nap[] = _("NAP"); +const u8 gEasyChatWord_Heroine[] = _("HEROINE"); +const u8 gEasyChatWord_Fashion[] = _("FASHION"); +const u8 gEasyChatWord_Adventure[] = _("ADVENTURE"); +const u8 gEasyChatWord_Board[] = _("BOARD"); +const u8 gEasyChatWord_Ball[] = _("BALL"); +const u8 gEasyChatWord_Book[] = _("BOOK"); +const u8 gEasyChatWord_Festival[] = _("FESTIVAL"); +const u8 gEasyChatWord_Comics[] = _("COMICS"); +const u8 gEasyChatWord_Holiday[] = _("HOLIDAY"); +const u8 gEasyChatWord_Plans[] = _("PLANS"); +const u8 gEasyChatWord_Trendy[] = _("TRENDY"); +const u8 gEasyChatWord_Vacation[] = _("VACATION"); +const u8 gEasyChatWord_Look[] = _("LOOK"); + +const struct EasyChatWordInfo gEasyChatGroup_Hobbies[] = { + { + .text = gEasyChatWord_Idol, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Anime, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Song, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Movie, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sweets, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Chat, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ChildsPlay, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Toys, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Music, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cards, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Shopping, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Camera, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Viewing, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Spectator, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Gourmet, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Game, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rpg, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Collection, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Complete, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Magazine, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Walk, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Bike, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hobby, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sports, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Software, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Songs, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Diet, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Treasure, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Travel, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Dance, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Channel, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Making, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fishing, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Date, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Design, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Locomotive, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_PlushDoll, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pc, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Flowers, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hero, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Nap, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Heroine, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fashion, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Adventure, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Board, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ball, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Book, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Festival, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Comics, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Holiday, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Plans, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Trendy, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Vacation, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Look, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_lifestyle.h b/src/data/easy_chat/easy_chat_group_lifestyle.h new file mode 100755 index 0000000000..9ed60025d2 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_lifestyle.h @@ -0,0 +1,273 @@ +const u8 gEasyChatWord_Chores[] = _("CHORES"); +const u8 gEasyChatWord_Home[] = _("HOME"); +const u8 gEasyChatWord_Money[] = _("MONEY"); +const u8 gEasyChatWord_Allowance[] = _("ALLOWANCE"); +const u8 gEasyChatWord_Bath[] = _("BATH"); +const u8 gEasyChatWord_Conversation[] = _("CONVERSATION"); +const u8 gEasyChatWord_School[] = _("SCHOOL"); +const u8 gEasyChatWord_Commemorate[] = _("COMMEMORATE"); +const u8 gEasyChatWord_Habit[] = _("HABIT"); +const u8 gEasyChatWord_Group[] = _("GROUP"); +const u8 gEasyChatWord_Word[] = _("WORD"); +const u8 gEasyChatWord_Store[] = _("STORE"); +const u8 gEasyChatWord_Service[] = _("SERVICE"); +const u8 gEasyChatWord_Work[] = _("WORK"); +const u8 gEasyChatWord_System[] = _("SYSTEM"); +const u8 gEasyChatWord_Train[] = _("TRAIN"); +const u8 gEasyChatWord_Class[] = _("CLASS"); +const u8 gEasyChatWord_Lessons[] = _("LESSONS"); +const u8 gEasyChatWord_Information[] = _("INFORMATION"); +const u8 gEasyChatWord_Living[] = _("LIVING"); +const u8 gEasyChatWord_Teacher[] = _("TEACHER"); +const u8 gEasyChatWord_Tournament[] = _("TOURNAMENT"); +const u8 gEasyChatWord_Letter[] = _("LETTER"); +const u8 gEasyChatWord_Event[] = _("EVENT"); +const u8 gEasyChatWord_Digital[] = _("DIGITAL"); +const u8 gEasyChatWord_Test[] = _("TEST"); +const u8 gEasyChatWord_DeptStore[] = _("DEPT. STORE"); +const u8 gEasyChatWord_Television[] = _("TELEVISION"); +const u8 gEasyChatWord_Phone[] = _("PHONE"); +const u8 gEasyChatWord_Item[] = _("ITEM"); +const u8 gEasyChatWord_Name[] = _("NAME"); +const u8 gEasyChatWord_News[] = _("NEWS"); +const u8 gEasyChatWord_Popular[] = _("POPULAR"); +const u8 gEasyChatWord_Party[] = _("PARTY"); +const u8 gEasyChatWord_Study[] = _("STUDY"); +const u8 gEasyChatWord_Machine[] = _("MACHINE"); +const u8 gEasyChatWord_Mail[] = _("MAIL"); +const u8 gEasyChatWord_Message[] = _("MESSAGE"); +const u8 gEasyChatWord_Promise[] = _("PROMISE"); +const u8 gEasyChatWord_Dream[] = _("DREAM"); +const u8 gEasyChatWord_Kindergarten[] = _("KINDERGARTEN"); +const u8 gEasyChatWord_Life[] = _("LIFE"); +const u8 gEasyChatWord_Radio[] = _("RADIO"); +const u8 gEasyChatWord_Rental[] = _("RENTAL"); +const u8 gEasyChatWord_World[] = _("WORLD"); + +const struct EasyChatWordInfo gEasyChatGroup_Lifestyle[] = { + { + .text = gEasyChatWord_Chores, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Home, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Money, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Allowance, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Bath, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Conversation, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_School, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Commemorate, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Habit, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Group, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Word, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Store, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Service, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Work, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_System, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Train, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Class, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lessons, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Information, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Living, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Teacher, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tournament, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Letter, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Event, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Digital, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Test, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_DeptStore, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Television, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Phone, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Item, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Name, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_News, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Popular, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Party, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Study, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Machine, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mail, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Message, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Promise, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Dream, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Kindergarten, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Life, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Radio, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rental, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_World, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_misc.h b/src/data/easy_chat/easy_chat_group_misc.h new file mode 100755 index 0000000000..fbc9a70698 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_misc.h @@ -0,0 +1,255 @@ +const u8 gEasyChatWord_Highs[] = _("HIGHS"); +const u8 gEasyChatWord_Lows[] = _("LOWS"); +const u8 gEasyChatWord_Um[] = _("UM"); +const u8 gEasyChatWord_Rear[] = _("REAR"); +const u8 gEasyChatWord_Things[] = _("THINGS"); +const u8 gEasyChatWord_Thing[] = _("THING"); +const u8 gEasyChatWord_Below[] = _("BELOW"); +const u8 gEasyChatWord_Above[] = _("ABOVE"); +const u8 gEasyChatWord_Back[] = _("BACK"); +const u8 gEasyChatWord_High[] = _("HIGH"); +const u8 gEasyChatWord_Here[] = _("HERE"); +const u8 gEasyChatWord_Inside[] = _("INSIDE"); +const u8 gEasyChatWord_Outside[] = _("OUTSIDE"); +const u8 gEasyChatWord_Beside[] = _("BESIDE"); +const u8 gEasyChatWord_ThisIsItExcl[] = _("THIS IS IT!"); +const u8 gEasyChatWord_This[] = _("THIS"); +const u8 gEasyChatWord_Every[] = _("EVERY"); +const u8 gEasyChatWord_These[] = _("THESE"); +const u8 gEasyChatWord_TheseWere[] = _("THESE WERE"); +const u8 gEasyChatWord_Down[] = _("DOWN"); +const u8 gEasyChatWord_That[] = _("THAT"); +const u8 gEasyChatWord_ThoseAre[] = _("THOSE ARE"); +const u8 gEasyChatWord_ThoseWere[] = _("THOSE WERE"); +const u8 gEasyChatWord_ThatsItExcl[] = _("THAT'S IT!"); +const u8 gEasyChatWord_Am[] = _("AM"); +const u8 gEasyChatWord_ThatWas[] = _("THAT WAS"); +const u8 gEasyChatWord_Front[] = _("FRONT"); +const u8 gEasyChatWord_Up[] = _("UP"); +const u8 gEasyChatWord_Choice[] = _("CHOICE"); +const u8 gEasyChatWord_Far[] = _("FAR"); +const u8 gEasyChatWord_Away[] = _("AWAY"); +const u8 gEasyChatWord_Near[] = _("NEAR"); +const u8 gEasyChatWord_Where[] = _("WHERE"); +const u8 gEasyChatWord_When[] = _("WHEN"); +const u8 gEasyChatWord_What[] = _("WHAT"); +const u8 gEasyChatWord_Deep[] = _("DEEP"); +const u8 gEasyChatWord_Shallow[] = _("SHALLOW"); +const u8 gEasyChatWord_Why[] = _("WHY"); +const u8 gEasyChatWord_Confused[] = _("CONFUSED"); +const u8 gEasyChatWord_Opposite[] = _("OPPOSITE"); +const u8 gEasyChatWord_Left[] = _("LEFT"); +const u8 gEasyChatWord_Right[] = _("RIGHT"); + +const struct EasyChatWordInfo gEasyChatGroup_Misc[] = { + { + .text = gEasyChatWord_Highs, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lows, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Um, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rear, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Things, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Thing, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Below, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Above, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Back, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_High, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Here, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Inside, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Outside, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Beside, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ThisIsItExcl, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_This, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Every, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_These, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_TheseWere, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Down, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_That, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ThoseAre, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ThoseWere, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ThatsItExcl, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Am, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ThatWas, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Front, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Up, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Choice, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Far, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Away, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Near, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Where, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_When, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_What, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Deep, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Shallow, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Why, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Confused, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Opposite, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Left, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Right, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_move_1.h b/src/data/easy_chat/easy_chat_group_move_1.h new file mode 100755 index 0000000000..3b0e8acca3 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_move_1.h @@ -0,0 +1,158 @@ +#include "constants/moves.h" + +const u16 gEasyChatGroup_Move1[] = { + MOVE_ABSORB, + MOVE_AEROBLAST, + MOVE_AGILITY, + MOVE_AIR_CUTTER, + MOVE_ANCIENT_POWER, + MOVE_AROMATHERAPY, + MOVE_ASTONISH, + MOVE_AURORA_BEAM, + MOVE_BIDE, + MOVE_BIND, + MOVE_BITE, + MOVE_BRICK_BREAK, + MOVE_BUBBLE, + MOVE_CHARGE, + MOVE_CHARM, + MOVE_CLAMP, + MOVE_CONFUSE_RAY, + MOVE_CONSTRICT, + MOVE_COSMIC_POWER, + MOVE_COUNTER, + MOVE_CRABHAMMER, + MOVE_CROSS_CHOP, + MOVE_CRUNCH, + MOVE_CUT, + MOVE_DIG, + MOVE_DISABLE, + MOVE_DOUBLE_TEAM, + MOVE_DOUBLE_EDGE, + MOVE_DOUBLE_SLAP, + MOVE_EARTHQUAKE, + MOVE_ENCORE, + MOVE_ENDEAVOR, + MOVE_ENDURE, + MOVE_EXTRASENSORY, + MOVE_EXTREME_SPEED, + MOVE_FACADE, + MOVE_FAKE_TEARS, + MOVE_FISSURE, + MOVE_FLAIL, + MOVE_FLAME_WHEEL, + MOVE_FLAMETHROWER, + MOVE_FLATTER, + MOVE_FLY, + MOVE_FOCUS_ENERGY, + MOVE_FOCUS_PUNCH, + MOVE_FOLLOW_ME, + MOVE_GIGA_DRAIN, + MOVE_GRASS_WHISTLE, + MOVE_GROWTH, + MOVE_GRUDGE, + MOVE_GUST, + MOVE_HAIL, + MOVE_HARDEN, + MOVE_HAZE, + MOVE_HEADBUTT, + MOVE_HEAL_BELL, + MOVE_HYPNOSIS, + MOVE_ICE_BALL, + MOVE_ICY_WIND, + MOVE_IRON_TAIL, + MOVE_KARATE_CHOP, + MOVE_KINESIS, + MOVE_LEECH_LIFE, + MOVE_LICK, + MOVE_LOVELY_KISS, + MOVE_LOW_KICK, + MOVE_MEAN_LOOK, + MOVE_MEMENTO, + MOVE_METAL_SOUND, + MOVE_METEOR_MASH, + MOVE_MIND_READER, + MOVE_MIRROR_MOVE, + MOVE_MIST, + MOVE_MORNING_SUN, + MOVE_NATURE_POWER, + MOVE_NIGHTMARE, + MOVE_OCTAZOOKA, + MOVE_ODOR_SLEUTH, + MOVE_OUTRAGE, + MOVE_OVERHEAT, + MOVE_PAIN_SPLIT, + MOVE_POWDER_SNOW, + MOVE_PSYBEAM, + MOVE_PSYCH_UP, + MOVE_PSYCHIC, + MOVE_PSYCHO_BOOST, + MOVE_PSYWAVE, + MOVE_PURSUIT, + MOVE_RAGE, + MOVE_RAIN_DANCE, + MOVE_RAPID_SPIN, + MOVE_RAZOR_WIND, + MOVE_RECOVER, + MOVE_RETURN, + MOVE_REVERSAL, + MOVE_ROCK_SLIDE, + MOVE_ROCK_SMASH, + MOVE_ROCK_THROW, + MOVE_ROCK_TOMB, + MOVE_ROLLOUT, + MOVE_SACRED_FIRE, + MOVE_SAFEGUARD, + MOVE_SAND_TOMB, + MOVE_SAND_ATTACK, + MOVE_SANDSTORM, + MOVE_SCARY_FACE, + MOVE_SCREECH, + MOVE_SELF_DESTRUCT, + MOVE_SHADOW_BALL, + MOVE_SHADOW_PUNCH, + MOVE_SHARPEN, + MOVE_SHEER_COLD, + MOVE_SIGNAL_BEAM, + MOVE_SILVER_WIND, + MOVE_SING, + MOVE_SKETCH, + MOVE_SKILL_SWAP, + MOVE_SKY_ATTACK, + MOVE_SKY_UPPERCUT, + MOVE_SLASH, + MOVE_SMELLING_SALT, + MOVE_SMOG, + MOVE_SMOKESCREEN, + MOVE_SNORE, + MOVE_SOLAR_BEAM, + MOVE_SONIC_BOOM, + MOVE_SPARK, + MOVE_SPIDER_WEB, + MOVE_SPITE, + MOVE_SPORE, + MOVE_STRENGTH, + MOVE_STRING_SHOT, + MOVE_STUN_SPORE, + MOVE_SUBMISSION, + MOVE_SUPER_FANG, + MOVE_SWAGGER, + MOVE_SWEET_SCENT, + MOVE_SWIFT, + MOVE_SYNTHESIS, + MOVE_TAIL_WHIP, + MOVE_THRASH, + MOVE_THUNDER, + MOVE_THUNDERBOLT, + MOVE_THUNDER_PUNCH, + MOVE_TICKLE, + MOVE_TORMENT, + MOVE_UPROAR, + MOVE_VITAL_THROW, + MOVE_WATER_SPOUT, + MOVE_WEATHER_BALL, + MOVE_WHIRLPOOL, + MOVE_WILL_O_WISP, + MOVE_WITHDRAW, + MOVE_YAWN, +}; diff --git a/src/data/easy_chat/easy_chat_group_move_2.h b/src/data/easy_chat/easy_chat_group_move_2.h new file mode 100755 index 0000000000..e0a0cd3795 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_move_2.h @@ -0,0 +1,204 @@ +#include "constants/moves.h" + +const u16 gEasyChatGroup_Move2[] = { + MOVE_ACID, + MOVE_ACID_ARMOR, + MOVE_AERIAL_ACE, + MOVE_AMNESIA, + MOVE_ARM_THRUST, + MOVE_ASSIST, + MOVE_ATTRACT, + MOVE_BARRAGE, + MOVE_BARRIER, + MOVE_BATON_PASS, + MOVE_BEAT_UP, + MOVE_BELLY_DRUM, + MOVE_BLAST_BURN, + MOVE_BLAZE_KICK, + MOVE_BLIZZARD, + MOVE_BLOCK, + MOVE_BODY_SLAM, + MOVE_BONE_CLUB, + MOVE_BONE_RUSH, + MOVE_BONEMERANG, + MOVE_BOUNCE, + MOVE_BUBBLE_BEAM, + MOVE_BULK_UP, + MOVE_BULLET_SEED, + MOVE_CALM_MIND, + MOVE_CAMOUFLAGE, + MOVE_COMET_PUNCH, + MOVE_CONFUSION, + MOVE_CONVERSION, + MOVE_CONVERSION_2, + MOVE_COTTON_SPORE, + MOVE_COVET, + MOVE_CRUSH_CLAW, + MOVE_CURSE, + MOVE_DEFENSE_CURL, + MOVE_DESTINY_BOND, + MOVE_DETECT, + MOVE_DIVE, + MOVE_DIZZY_PUNCH, + MOVE_DOOM_DESIRE, + MOVE_DOUBLE_KICK, + MOVE_DRAGON_CLAW, + MOVE_DRAGON_DANCE, + MOVE_DRAGON_RAGE, + MOVE_DRAGON_BREATH, + MOVE_DREAM_EATER, + MOVE_DRILL_PECK, + MOVE_DYNAMIC_PUNCH, + MOVE_EGG_BOMB, + MOVE_EMBER, + MOVE_ERUPTION, + MOVE_EXPLOSION, + MOVE_FAINT_ATTACK, + MOVE_FAKE_OUT, + MOVE_FALSE_SWIPE, + MOVE_FEATHER_DANCE, + MOVE_FIRE_BLAST, + MOVE_FIRE_PUNCH, + MOVE_FIRE_SPIN, + MOVE_FLASH, + MOVE_FORESIGHT, + MOVE_FRENZY_PLANT, + MOVE_FRUSTRATION, + MOVE_FURY_ATTACK, + MOVE_FURY_CUTTER, + MOVE_FURY_SWIPES, + MOVE_FUTURE_SIGHT, + MOVE_GLARE, + MOVE_GROWL, + MOVE_GUILLOTINE, + MOVE_HEAT_WAVE, + MOVE_HELPING_HAND, + MOVE_HI_JUMP_KICK, + MOVE_HIDDEN_POWER, + MOVE_HORN_ATTACK, + MOVE_HORN_DRILL, + MOVE_HOWL, + MOVE_HYDRO_CANNON, + MOVE_HYDRO_PUMP, + MOVE_HYPER_BEAM, + MOVE_HYPER_FANG, + MOVE_HYPER_VOICE, + MOVE_ICE_BEAM, + MOVE_ICE_PUNCH, + MOVE_ICICLE_SPEAR, + MOVE_IMPRISON, + MOVE_INGRAIN, + MOVE_IRON_DEFENSE, + MOVE_JUMP_KICK, + MOVE_KNOCK_OFF, + MOVE_LEAF_BLADE, + MOVE_LEECH_SEED, + MOVE_LEER, + MOVE_LIGHT_SCREEN, + MOVE_LOCK_ON, + MOVE_LUSTER_PURGE, + MOVE_MACH_PUNCH, + MOVE_MAGIC_COAT, + MOVE_MAGICAL_LEAF, + MOVE_MAGNITUDE, + MOVE_MEDITATE, + MOVE_MEGA_DRAIN, + MOVE_MEGA_KICK, + MOVE_MEGA_PUNCH, + MOVE_MEGAHORN, + MOVE_METAL_CLAW, + MOVE_METRONOME, + MOVE_MILK_DRINK, + MOVE_MIMIC, + MOVE_MINIMIZE, + MOVE_MIRROR_COAT, + MOVE_MIST_BALL, + MOVE_MOONLIGHT, + MOVE_MUD_SHOT, + MOVE_MUD_SPORT, + MOVE_MUD_SLAP, + MOVE_MUDDY_WATER, + MOVE_NEEDLE_ARM, + MOVE_NIGHT_SHADE, + MOVE_PAY_DAY, + MOVE_PECK, + MOVE_PERISH_SONG, + MOVE_PETAL_DANCE, + MOVE_PIN_MISSILE, + MOVE_POISON_FANG, + MOVE_POISON_GAS, + MOVE_POISON_STING, + MOVE_POISON_TAIL, + MOVE_POISON_POWDER, + MOVE_POUND, + MOVE_PRESENT, + MOVE_PROTECT, + MOVE_QUICK_ATTACK, + MOVE_RAZOR_LEAF, + MOVE_RECYCLE, + MOVE_REFLECT, + MOVE_REFRESH, + MOVE_REST, + MOVE_REVENGE, + MOVE_ROAR, + MOVE_ROCK_BLAST, + MOVE_ROLE_PLAY, + MOVE_ROLLING_KICK, + MOVE_SCRATCH, + MOVE_SECRET_POWER, + MOVE_SEISMIC_TOSS, + MOVE_SHOCK_WAVE, + MOVE_SKULL_BASH, + MOVE_SLACK_OFF, + MOVE_SLAM, + MOVE_SLEEP_POWDER, + MOVE_SLEEP_TALK, + MOVE_SLUDGE, + MOVE_SLUDGE_BOMB, + MOVE_SNATCH, + MOVE_SOFT_BOILED, + MOVE_SPIKE_CANNON, + MOVE_SPIKES, + MOVE_SPIT_UP, + MOVE_SPLASH, + MOVE_STEEL_WING, + MOVE_STOCKPILE, + MOVE_STOMP, + MOVE_STRUGGLE, + MOVE_SUBSTITUTE, + MOVE_SUNNY_DAY, + MOVE_SUPERPOWER, + MOVE_SUPERSONIC, + MOVE_SURF, + MOVE_SWALLOW, + MOVE_SWEET_KISS, + MOVE_SWORDS_DANCE, + MOVE_TACKLE, + MOVE_TAIL_GLOW, + MOVE_TAKE_DOWN, + MOVE_TAUNT, + MOVE_TEETER_DANCE, + MOVE_TELEPORT, + MOVE_THIEF, + MOVE_THUNDER_WAVE, + MOVE_THUNDER_SHOCK, + MOVE_TOXIC, + MOVE_TRANSFORM, + MOVE_TRI_ATTACK, + MOVE_TRICK, + MOVE_TRIPLE_KICK, + MOVE_TWINEEDLE, + MOVE_TWISTER, + MOVE_VICE_GRIP, + MOVE_VINE_WHIP, + MOVE_VOLT_TACKLE, + MOVE_WATER_GUN, + MOVE_WATER_PULSE, + MOVE_WATER_SPORT, + MOVE_WATERFALL, + MOVE_WHIRLWIND, + MOVE_WING_ATTACK, + MOVE_WISH, + MOVE_WRAP, + MOVE_ZAP_CANNON, +}; diff --git a/src/data/easy_chat/easy_chat_group_people.h b/src/data/easy_chat/easy_chat_group_people.h new file mode 100755 index 0000000000..17d2d53393 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_people.h @@ -0,0 +1,453 @@ +const u8 gEasyChatWord_Opponent[] = _("OPPONENT"); +const u8 gEasyChatWord_I[] = _("I"); +const u8 gEasyChatWord_You[] = _("YOU"); +const u8 gEasyChatWord_Yours[] = _("YOURS"); +const u8 gEasyChatWord_Son[] = _("SON"); +const u8 gEasyChatWord_Your[] = _("YOUR"); +const u8 gEasyChatWord_Youre[] = _("YOU'RE"); +const u8 gEasyChatWord_Youve[] = _("YOU'VE"); +const u8 gEasyChatWord_Mother[] = _("MOTHER"); +const u8 gEasyChatWord_Grandfather[] = _("GRANDFATHER"); +const u8 gEasyChatWord_Uncle[] = _("UNCLE"); +const u8 gEasyChatWord_Father[] = _("FATHER"); +const u8 gEasyChatWord_Boy[] = _("BOY"); +const u8 gEasyChatWord_Adult[] = _("ADULT"); +const u8 gEasyChatWord_Brother[] = _("BROTHER"); +const u8 gEasyChatWord_Sister[] = _("SISTER"); +const u8 gEasyChatWord_Grandmother[] = _("GRANDMOTHER"); +const u8 gEasyChatWord_Aunt[] = _("AUNT"); +const u8 gEasyChatWord_Parent[] = _("PARENT"); +const u8 gEasyChatWord_Man[] = _("MAN"); +const u8 gEasyChatWord_Me[] = _("ME"); +const u8 gEasyChatWord_Girl[] = _("GIRL"); +const u8 gEasyChatWord_Babe[] = _("BABE"); +const u8 gEasyChatWord_Family[] = _("FAMILY"); +const u8 gEasyChatWord_Her[] = _("HER"); +const u8 gEasyChatWord_Him[] = _("HIM"); +const u8 gEasyChatWord_He[] = _("HE"); +const u8 gEasyChatWord_Place[] = _("PLACE"); +const u8 gEasyChatWord_Daughter[] = _("DAUGHTER"); +const u8 gEasyChatWord_His[] = _("HIS"); +const u8 gEasyChatWord_Hes[] = _("HE'S"); +const u8 gEasyChatWord_Arent[] = _("AREN'T"); +const u8 gEasyChatWord_Siblings[] = _("SIBLINGS"); +const u8 gEasyChatWord_Kid[] = _("KID"); +const u8 gEasyChatWord_Children[] = _("CHILDREN"); +const u8 gEasyChatWord_Mr[] = _("MR."); +const u8 gEasyChatWord_Mrs[] = _("MRS."); +const u8 gEasyChatWord_Myself[] = _("MYSELF"); +const u8 gEasyChatWord_IWas[] = _("I WAS"); +const u8 gEasyChatWord_ToMe[] = _("TO ME"); +const u8 gEasyChatWord_My[] = _("MY"); +const u8 gEasyChatWord_IAm[] = _("I AM"); +const u8 gEasyChatWord_Ive[] = _("I'VE"); +const u8 gEasyChatWord_Who[] = _("WHO"); +const u8 gEasyChatWord_Someone[] = _("SOMEONE"); +const u8 gEasyChatWord_WhoWas[] = _("WHO WAS"); +const u8 gEasyChatWord_ToWhom[] = _("TO WHOM"); +const u8 gEasyChatWord_Whose[] = _("WHOSE"); +const u8 gEasyChatWord_WhoIs[] = _("WHO IS"); +const u8 gEasyChatWord_Its[] = _("IT'S"); +const u8 gEasyChatWord_Lady[] = _("LADY"); +const u8 gEasyChatWord_Friend[] = _("FRIEND"); +const u8 gEasyChatWord_Ally[] = _("ALLY"); +const u8 gEasyChatWord_Person[] = _("PERSON"); +const u8 gEasyChatWord_Dude[] = _("DUDE"); +const u8 gEasyChatWord_They[] = _("THEY"); +const u8 gEasyChatWord_TheyWere[] = _("THEY WERE"); +const u8 gEasyChatWord_ToThem[] = _("TO THEM"); +const u8 gEasyChatWord_Their[] = _("THEIR"); +const u8 gEasyChatWord_Theyre[] = _("THEY'RE"); +const u8 gEasyChatWord_Theyve[] = _("THEY'VE"); +const u8 gEasyChatWord_We[] = _("WE"); +const u8 gEasyChatWord_Been[] = _("BEEN"); +const u8 gEasyChatWord_ToUs[] = _("TO US"); +const u8 gEasyChatWord_Our[] = _("OUR"); +const u8 gEasyChatWord_WeAre[] = _("WE'RE"); +const u8 gEasyChatWord_Rival[] = _("RIVAL"); +const u8 gEasyChatWord_Weve[] = _("WE'VE"); +const u8 gEasyChatWord_Woman[] = _("WOMAN"); +const u8 gEasyChatWord_She[] = _("SHE"); +const u8 gEasyChatWord_SheWas[] = _("SHE WAS"); +const u8 gEasyChatWord_ToHer[] = _("TO HER"); +const u8 gEasyChatWord_Hers[] = _("HERS"); +const u8 gEasyChatWord_SheIs[] = _("SHE IS"); +const u8 gEasyChatWord_Some[] = _("SOME"); + +const struct EasyChatWordInfo gEasyChatGroup_People[] = { + { + .text = gEasyChatWord_Opponent, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_I, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_You, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Yours, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Son, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Your, + .alphabeticalOrder = 62, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Youre, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Youve, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mother, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Grandfather, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Uncle, + .alphabeticalOrder = 54, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Father, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Boy, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Adult, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Brother, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sister, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Grandmother, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Aunt, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Parent, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Man, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Me, + .alphabeticalOrder = 72, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Girl, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Babe, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Family, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Her, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Him, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_He, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Place, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Daughter, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_His, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hes, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Arent, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Siblings, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Kid, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Children, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mr, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mrs, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Myself, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_IWas, + .alphabeticalOrder = 64, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ToMe, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_My, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_IAm, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ive, + .alphabeticalOrder = 66, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Who, + .alphabeticalOrder = 69, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Someone, + .alphabeticalOrder = 73, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WhoWas, + .alphabeticalOrder = 70, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ToWhom, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Whose, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WhoIs, + .alphabeticalOrder = 74, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Its, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lady, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Friend, + .alphabeticalOrder = 58, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ally, + .alphabeticalOrder = 55, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Person, + .alphabeticalOrder = 56, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Dude, + .alphabeticalOrder = 59, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_They, + .alphabeticalOrder = 60, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_TheyWere, + .alphabeticalOrder = 71, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ToThem, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Their, + .alphabeticalOrder = 57, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Theyre, + .alphabeticalOrder = 63, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Theyve, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_We, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Been, + .alphabeticalOrder = 61, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ToUs, + .alphabeticalOrder = 65, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Our, + .alphabeticalOrder = 67, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WeAre, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rival, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Weve, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Woman, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_She, + .alphabeticalOrder = 68, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SheWas, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ToHer, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hers, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SheIs, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Some, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_pokemon.h b/src/data/easy_chat/easy_chat_group_pokemon.h new file mode 100755 index 0000000000..9993a51446 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_pokemon.h @@ -0,0 +1,206 @@ +#include "constants/species.h" + +const u16 gEasyChatGroup_Pokemon[] = { + SPECIES_ABRA, + SPECIES_ABSOL, + SPECIES_AGGRON, + SPECIES_ALAKAZAM, + SPECIES_ALTARIA, + SPECIES_ANORITH, + SPECIES_ARMALDO, + SPECIES_ARON, + SPECIES_AZUMARILL, + SPECIES_AZURILL, + SPECIES_BAGON, + SPECIES_BALTOY, + SPECIES_BANETTE, + SPECIES_BARBOACH, + SPECIES_BEAUTIFLY, + SPECIES_BELDUM, + SPECIES_BELLOSSOM, + SPECIES_BLAZIKEN, + SPECIES_BRELOOM, + SPECIES_CACNEA, + SPECIES_CACTURNE, + SPECIES_CAMERUPT, + SPECIES_CARVANHA, + SPECIES_CASCOON, + SPECIES_CASTFORM, + SPECIES_CHIMECHO, + SPECIES_CHINCHOU, + SPECIES_CLAMPERL, + SPECIES_CLAYDOL, + SPECIES_COMBUSKEN, + SPECIES_CORPHISH, + SPECIES_CORSOLA, + SPECIES_CRADILY, + SPECIES_CRAWDAUNT, + SPECIES_CROBAT, + SPECIES_DELCATTY, + SPECIES_DEOXYS, + SPECIES_DODRIO, + SPECIES_DODUO, + SPECIES_DONPHAN, + SPECIES_DUSCLOPS, + SPECIES_DUSKULL, + SPECIES_DUSTOX, + SPECIES_ELECTRIKE, + SPECIES_ELECTRODE, + SPECIES_EXPLOUD, + SPECIES_FEEBAS, + SPECIES_FLYGON, + SPECIES_GARDEVOIR, + SPECIES_GEODUDE, + SPECIES_GIRAFARIG, + SPECIES_GLALIE, + SPECIES_GLOOM, + SPECIES_GOLBAT, + SPECIES_GOLDEEN, + SPECIES_GOLDUCK, + SPECIES_GOLEM, + SPECIES_GOREBYSS, + SPECIES_GRAVELER, + SPECIES_GRIMER, + SPECIES_GROUDON, + SPECIES_GROVYLE, + SPECIES_GRUMPIG, + SPECIES_GULPIN, + SPECIES_GYARADOS, + SPECIES_HARIYAMA, + SPECIES_HERACROSS, + SPECIES_HORSEA, + SPECIES_HUNTAIL, + SPECIES_IGGLYBUFF, + SPECIES_ILLUMISE, + SPECIES_JIGGLYPUFF, + SPECIES_JIRACHI, + SPECIES_KADABRA, + SPECIES_KECLEON, + SPECIES_KINGDRA, + SPECIES_KIRLIA, + SPECIES_KOFFING, + SPECIES_KYOGRE, + SPECIES_LAIRON, + SPECIES_LANTURN, + SPECIES_LATIAS, + SPECIES_LATIOS, + SPECIES_LILEEP, + SPECIES_LINOONE, + SPECIES_LOMBRE, + SPECIES_LOTAD, + SPECIES_LOUDRED, + SPECIES_LUDICOLO, + SPECIES_LUNATONE, + SPECIES_LUVDISC, + SPECIES_MACHAMP, + SPECIES_MACHOKE, + SPECIES_MACHOP, + SPECIES_MAGCARGO, + SPECIES_MAGIKARP, + SPECIES_MAGNEMITE, + SPECIES_MAGNETON, + SPECIES_MAKUHITA, + SPECIES_MANECTRIC, + SPECIES_MARILL, + SPECIES_MARSHTOMP, + SPECIES_MASQUERAIN, + SPECIES_MAWILE, + SPECIES_MEDICHAM, + SPECIES_MEDITITE, + SPECIES_METAGROSS, + SPECIES_METANG, + SPECIES_MIGHTYENA, + SPECIES_MILOTIC, + SPECIES_MINUN, + SPECIES_MUDKIP, + SPECIES_MUK, + SPECIES_NATU, + SPECIES_NINCADA, + SPECIES_NINETALES, + SPECIES_NINJASK, + SPECIES_NOSEPASS, + SPECIES_NUMEL, + SPECIES_NUZLEAF, + SPECIES_ODDISH, + SPECIES_PELIPPER, + SPECIES_PHANPY, + SPECIES_PICHU, + SPECIES_PIKACHU, + SPECIES_PINSIR, + SPECIES_PLUSLE, + SPECIES_POOCHYENA, + SPECIES_PSYDUCK, + SPECIES_RAICHU, + SPECIES_RALTS, + SPECIES_RAYQUAZA, + SPECIES_REGICE, + SPECIES_REGIROCK, + SPECIES_REGISTEEL, + SPECIES_RELICANTH, + SPECIES_RHYDON, + SPECIES_RHYHORN, + SPECIES_ROSELIA, + SPECIES_SABLEYE, + SPECIES_SALAMENCE, + SPECIES_SANDSHREW, + SPECIES_SANDSLASH, + SPECIES_SCEPTILE, + SPECIES_SEADRA, + SPECIES_SEAKING, + SPECIES_SEALEO, + SPECIES_SEEDOT, + SPECIES_SEVIPER, + SPECIES_SHARPEDO, + SPECIES_SHEDINJA, + SPECIES_SHELGON, + SPECIES_SHIFTRY, + SPECIES_SHROOMISH, + SPECIES_SHUPPET, + SPECIES_SILCOON, + SPECIES_SKARMORY, + SPECIES_SKITTY, + SPECIES_SLAKING, + SPECIES_SLAKOTH, + SPECIES_SLUGMA, + SPECIES_SNORUNT, + SPECIES_SOLROCK, + SPECIES_SPHEAL, + SPECIES_SPINDA, + SPECIES_SPOINK, + SPECIES_STARMIE, + SPECIES_STARYU, + SPECIES_SURSKIT, + SPECIES_SWABLU, + SPECIES_SWALOT, + SPECIES_SWAMPERT, + SPECIES_SWELLOW, + SPECIES_TAILLOW, + SPECIES_TENTACOOL, + SPECIES_TENTACRUEL, + SPECIES_TORCHIC, + SPECIES_TORKOAL, + SPECIES_TRAPINCH, + SPECIES_TREECKO, + SPECIES_TROPIUS, + SPECIES_VIBRAVA, + SPECIES_VIGOROTH, + SPECIES_VILEPLUME, + SPECIES_VOLBEAT, + SPECIES_VOLTORB, + SPECIES_VULPIX, + SPECIES_WAILMER, + SPECIES_WAILORD, + SPECIES_WALREIN, + SPECIES_WEEZING, + SPECIES_WHISCASH, + SPECIES_WHISMUR, + SPECIES_WIGGLYTUFF, + SPECIES_WINGULL, + SPECIES_WOBBUFFET, + SPECIES_WURMPLE, + SPECIES_WYNAUT, + SPECIES_XATU, + SPECIES_ZANGOOSE, + SPECIES_ZIGZAGOON, + SPECIES_ZUBAT, +}; diff --git a/src/data/easy_chat/easy_chat_group_pokemon2.h b/src/data/easy_chat/easy_chat_group_pokemon2.h new file mode 100755 index 0000000000..35b0a03cbb --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_pokemon2.h @@ -0,0 +1,255 @@ +#include "constants/species.h" + +const u16 gEasyChatGroup_Pokemon2[] = { + SPECIES_ABRA, + SPECIES_AERODACTYL, + SPECIES_AIPOM, + SPECIES_ALAKAZAM, + SPECIES_AMPHAROS, + SPECIES_ARBOK, + SPECIES_ARCANINE, + SPECIES_ARIADOS, + SPECIES_ARTICUNO, + SPECIES_AZUMARILL, + SPECIES_BAYLEEF, + SPECIES_BEEDRILL, + SPECIES_BELLOSSOM, + SPECIES_BELLSPROUT, + SPECIES_BLASTOISE, + SPECIES_BLISSEY, + SPECIES_BULBASAUR, + SPECIES_BUTTERFREE, + SPECIES_CATERPIE, + SPECIES_CELEBI, + SPECIES_CHANSEY, + SPECIES_CHARIZARD, + SPECIES_CHARMANDER, + SPECIES_CHARMELEON, + SPECIES_CHIKORITA, + SPECIES_CHINCHOU, + SPECIES_CLEFABLE, + SPECIES_CLEFAIRY, + SPECIES_CLEFFA, + SPECIES_CLOYSTER, + SPECIES_CORSOLA, + SPECIES_CROBAT, + SPECIES_CROCONAW, + SPECIES_CUBONE, + SPECIES_CYNDAQUIL, + SPECIES_DELIBIRD, + SPECIES_DEWGONG, + SPECIES_DIGLETT, + SPECIES_DITTO, + SPECIES_DODRIO, + SPECIES_DODUO, + SPECIES_DONPHAN, + SPECIES_DRAGONAIR, + SPECIES_DRAGONITE, + SPECIES_DRATINI, + SPECIES_DROWZEE, + SPECIES_DUGTRIO, + SPECIES_DUNSPARCE, + SPECIES_EEVEE, + SPECIES_EKANS, + SPECIES_ELECTABUZZ, + SPECIES_ELECTRODE, + SPECIES_ELEKID, + SPECIES_ENTEI, + SPECIES_ESPEON, + SPECIES_EXEGGCUTE, + SPECIES_EXEGGUTOR, + SPECIES_FARFETCHD, + SPECIES_FEAROW, + SPECIES_FERALIGATR, + SPECIES_FLAAFFY, + SPECIES_FLAREON, + SPECIES_FORRETRESS, + SPECIES_FURRET, + SPECIES_GASTLY, + SPECIES_GENGAR, + SPECIES_GEODUDE, + SPECIES_GIRAFARIG, + SPECIES_GLIGAR, + SPECIES_GLOOM, + SPECIES_GOLBAT, + SPECIES_GOLDEEN, + SPECIES_GOLDUCK, + SPECIES_GOLEM, + SPECIES_GRANBULL, + SPECIES_GRAVELER, + SPECIES_GRIMER, + SPECIES_GROWLITHE, + SPECIES_GYARADOS, + SPECIES_HAUNTER, + SPECIES_HERACROSS, + SPECIES_HITMONCHAN, + SPECIES_HITMONLEE, + SPECIES_HITMONTOP, + SPECIES_HO_OH, + SPECIES_HOOTHOOT, + SPECIES_HOPPIP, + SPECIES_HORSEA, + SPECIES_HOUNDOOM, + SPECIES_HOUNDOUR, + SPECIES_HYPNO, + SPECIES_IGGLYBUFF, + SPECIES_IVYSAUR, + SPECIES_JIGGLYPUFF, + SPECIES_JOLTEON, + SPECIES_JUMPLUFF, + SPECIES_JYNX, + SPECIES_KABUTO, + SPECIES_KABUTOPS, + SPECIES_KADABRA, + SPECIES_KAKUNA, + SPECIES_KANGASKHAN, + SPECIES_KINGDRA, + SPECIES_KINGLER, + SPECIES_KOFFING, + SPECIES_KRABBY, + SPECIES_LANTURN, + SPECIES_LAPRAS, + SPECIES_LARVITAR, + SPECIES_LEDIAN, + SPECIES_LEDYBA, + SPECIES_LICKITUNG, + SPECIES_LUGIA, + SPECIES_MACHAMP, + SPECIES_MACHOKE, + SPECIES_MACHOP, + SPECIES_MAGBY, + SPECIES_MAGCARGO, + SPECIES_MAGIKARP, + SPECIES_MAGMAR, + SPECIES_MAGNEMITE, + SPECIES_MAGNETON, + SPECIES_MANKEY, + SPECIES_MANTINE, + SPECIES_MAREEP, + SPECIES_MARILL, + SPECIES_MAROWAK, + SPECIES_MEGANIUM, + SPECIES_MEOWTH, + SPECIES_METAPOD, + SPECIES_MEW, + SPECIES_MEWTWO, + SPECIES_MILTANK, + SPECIES_MISDREAVUS, + SPECIES_MOLTRES, + SPECIES_MR_MIME, + SPECIES_MUK, + SPECIES_MURKROW, + SPECIES_NATU, + SPECIES_NIDOKING, + SPECIES_NIDOQUEEN, + SPECIES_NIDORAN_F, + SPECIES_NIDORAN_M, + SPECIES_NIDORINA, + SPECIES_NIDORINO, + SPECIES_NINETALES, + SPECIES_NOCTOWL, + SPECIES_OCTILLERY, + SPECIES_ODDISH, + SPECIES_OMANYTE, + SPECIES_OMASTAR, + SPECIES_ONIX, + SPECIES_PARAS, + SPECIES_PARASECT, + SPECIES_PERSIAN, + SPECIES_PHANPY, + SPECIES_PICHU, + SPECIES_PIDGEOT, + SPECIES_PIDGEOTTO, + SPECIES_PIDGEY, + SPECIES_PIKACHU, + SPECIES_PILOSWINE, + SPECIES_PINECO, + SPECIES_PINSIR, + SPECIES_POLITOED, + SPECIES_POLIWAG, + SPECIES_POLIWHIRL, + SPECIES_POLIWRATH, + SPECIES_PONYTA, + SPECIES_PORYGON, + SPECIES_PORYGON2, + SPECIES_PRIMEAPE, + SPECIES_PSYDUCK, + SPECIES_PUPITAR, + SPECIES_QUAGSIRE, + SPECIES_QUILAVA, + SPECIES_QWILFISH, + SPECIES_RAICHU, + SPECIES_RAIKOU, + SPECIES_RAPIDASH, + SPECIES_RATICATE, + SPECIES_RATTATA, + SPECIES_REMORAID, + SPECIES_RHYDON, + SPECIES_RHYHORN, + SPECIES_SANDSHREW, + SPECIES_SANDSLASH, + SPECIES_SCIZOR, + SPECIES_SCYTHER, + SPECIES_SEADRA, + SPECIES_SEAKING, + SPECIES_SEEL, + SPECIES_SENTRET, + SPECIES_SHELLDER, + SPECIES_SHUCKLE, + SPECIES_SKARMORY, + SPECIES_SKIPLOOM, + SPECIES_SLOWBRO, + SPECIES_SLOWKING, + SPECIES_SLOWPOKE, + SPECIES_SLUGMA, + SPECIES_SMEARGLE, + SPECIES_SMOOCHUM, + SPECIES_SNEASEL, + SPECIES_SNORLAX, + SPECIES_SNUBBULL, + SPECIES_SPEAROW, + SPECIES_SPINARAK, + SPECIES_SQUIRTLE, + SPECIES_STANTLER, + SPECIES_STARMIE, + SPECIES_STARYU, + SPECIES_STEELIX, + SPECIES_SUDOWOODO, + SPECIES_SUICUNE, + SPECIES_SUNFLORA, + SPECIES_SUNKERN, + SPECIES_SWINUB, + SPECIES_TANGELA, + SPECIES_TAUROS, + SPECIES_TEDDIURSA, + SPECIES_TENTACOOL, + SPECIES_TENTACRUEL, + SPECIES_TOGEPI, + SPECIES_TOGETIC, + SPECIES_TOTODILE, + SPECIES_TYPHLOSION, + SPECIES_TYRANITAR, + SPECIES_TYROGUE, + SPECIES_UMBREON, + SPECIES_UNOWN, + SPECIES_URSARING, + SPECIES_VAPOREON, + SPECIES_VENOMOTH, + SPECIES_VENONAT, + SPECIES_VENUSAUR, + SPECIES_VICTREEBEL, + SPECIES_VILEPLUME, + SPECIES_VOLTORB, + SPECIES_VULPIX, + SPECIES_WARTORTLE, + SPECIES_WEEDLE, + SPECIES_WEEPINBELL, + SPECIES_WEEZING, + SPECIES_WIGGLYTUFF, + SPECIES_WOBBUFFET, + SPECIES_WOOPER, + SPECIES_XATU, + SPECIES_YANMA, + SPECIES_ZAPDOS, + SPECIES_ZUBAT, +}; diff --git a/src/data/easy_chat/easy_chat_group_speech.h b/src/data/easy_chat/easy_chat_group_speech.h new file mode 100755 index 0000000000..013b454c0b --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_speech.h @@ -0,0 +1,363 @@ +const u8 gEasyChatWord_Listen[] = _("LISTEN"); +const u8 gEasyChatWord_NotVery[] = _("NOT VERY"); +const u8 gEasyChatWord_Mean[] = _("MEAN"); +const u8 gEasyChatWord_Lie[] = _("LIE"); +const u8 gEasyChatWord_Lay[] = _("LAY"); +const u8 gEasyChatWord_Recommend[] = _("RECOMMEND"); +const u8 gEasyChatWord_Nitwit[] = _("NITWIT"); +const u8 gEasyChatWord_Quite[] = _("QUITE"); +const u8 gEasyChatWord_From[] = _("FROM"); +const u8 gEasyChatWord_Feeling[] = _("FEELING"); +const u8 gEasyChatWord_But[] = _("BUT"); +const u8 gEasyChatWord_However[] = _("HOWEVER"); +const u8 gEasyChatWord_Case[] = _("CASE"); +const u8 gEasyChatWord_The[] = _("THE"); +const u8 gEasyChatWord_Miss[] = _("MISS"); +const u8 gEasyChatWord_How[] = _("HOW"); +const u8 gEasyChatWord_Hit[] = _("HIT"); +const u8 gEasyChatWord_Enough[] = _("ENOUGH"); +const u8 gEasyChatWord_ALot[] = _("A LOT"); +const u8 gEasyChatWord_ALittle[] = _("A LITTLE"); +const u8 gEasyChatWord_Absolutely[] = _("ABSOLUTELY"); +const u8 gEasyChatWord_And[] = _("AND"); +const u8 gEasyChatWord_Only[] = _("ONLY"); +const u8 gEasyChatWord_Around[] = _("AROUND"); +const u8 gEasyChatWord_Probably[] = _("PROBABLY"); +const u8 gEasyChatWord_If[] = _("IF"); +const u8 gEasyChatWord_Very[] = _("VERY"); +const u8 gEasyChatWord_ATinyBit[] = _("A TINY BIT"); +const u8 gEasyChatWord_Wild[] = _("WILD"); +const u8 gEasyChatWord_Thats[] = _("THAT'S"); +const u8 gEasyChatWord_Just[] = _("JUST"); +const u8 gEasyChatWord_EvenSo[] = _("EVEN SO,"); +const u8 gEasyChatWord_MustBe[] = _("MUST BE"); +const u8 gEasyChatWord_Naturally[] = _("NATURALLY"); +const u8 gEasyChatWord_ForNow[] = _("FOR NOW,"); +const u8 gEasyChatWord_Understood[] = _("UNDERSTOOD"); +const u8 gEasyChatWord_Joking[] = _("JOKING"); +const u8 gEasyChatWord_Ready[] = _("READY"); +const u8 gEasyChatWord_Something[] = _("SOMETHING"); +const u8 gEasyChatWord_Somehow[] = _("SOMEHOW"); +const u8 gEasyChatWord_Although[] = _("ALTHOUGH"); +const u8 gEasyChatWord_Also[] = _("ALSO"); +const u8 gEasyChatWord_Perfect[] = _("PERFECT"); +const u8 gEasyChatWord_AsMuchAs[] = _("AS MUCH AS"); +const u8 gEasyChatWord_Really[] = _("REALLY"); +const u8 gEasyChatWord_Truly[] = _("TRULY"); +const u8 gEasyChatWord_Seriously[] = _("SERIOUSLY"); +const u8 gEasyChatWord_Totally[] = _("TOTALLY"); +const u8 gEasyChatWord_Until[] = _("UNTIL"); +const u8 gEasyChatWord_AsIf[] = _("AS IF"); +const u8 gEasyChatWord_Mood[] = _("MOOD"); +const u8 gEasyChatWord_Rather[] = _("RATHER"); +const u8 gEasyChatWord_Awfully[] = _("AWFULLY"); +const u8 gEasyChatWord_Mode[] = _("MODE"); +const u8 gEasyChatWord_More[] = _("MORE"); +const u8 gEasyChatWord_TooLate[] = _("TOO LATE"); +const u8 gEasyChatWord_Finally[] = _("FINALLY"); +const u8 gEasyChatWord_Any[] = _("ANY"); +const u8 gEasyChatWord_Instead[] = _("INSTEAD"); +const u8 gEasyChatWord_Fantastic[] = _("FANTASTIC"); + +const struct EasyChatWordInfo gEasyChatGroup_Speech[] = { + { + .text = gEasyChatWord_Listen, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_NotVery, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mean, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lie, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lay, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Recommend, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Nitwit, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Quite, + .alphabeticalOrder = 57, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_From, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Feeling, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_But, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_However, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Case, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_The, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Miss, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_How, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hit, + .alphabeticalOrder = 59, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Enough, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ALot, + .alphabeticalOrder = 56, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ALittle, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Absolutely, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_And, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Only, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Around, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Probably, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_If, + .alphabeticalOrder = 58, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Very, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ATinyBit, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wild, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Thats, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Just, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_EvenSo, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_MustBe, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Naturally, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ForNow, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Understood, + .alphabeticalOrder = 54, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Joking, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ready, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Something, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Somehow, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Although, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Also, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Perfect, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_AsMuchAs, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Really, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Truly, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Seriously, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Totally, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Until, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_AsIf, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mood, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rather, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Awfully, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mode, + .alphabeticalOrder = 55, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_More, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_TooLate, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Finally, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Any, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Instead, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fantastic, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_status.h b/src/data/easy_chat/easy_chat_group_status.h new file mode 100755 index 0000000000..d4958c3ad7 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_status.h @@ -0,0 +1,657 @@ +const u8 gEasyChatWord_Dark[] = _("DARK"); +const u8 gEasyChatWord_Stench[] = _("STENCH"); +const u8 gEasyChatWord_ThickFat[] = _("THICK FAT"); +const u8 gEasyChatWord_RainDish[] = _("RAIN DISH"); +const u8 gEasyChatWord_Drizzle[] = _("DRIZZLE"); +const u8 gEasyChatWord_ArenaTrap[] = _("ARENA TRAP"); +const u8 gEasyChatWord_Intimidate[] = _("INTIMIDATE"); +const u8 gEasyChatWord_RockHead[] = _("ROCK HEAD"); +const u8 gEasyChatWord_Color[] = _("COLOR"); +const u8 gEasyChatWord_AltColor[] = _("ALT. COLOR"); +const u8 gEasyChatWord_Rock[] = _("ROCK"); +const u8 gEasyChatWord_Beautiful[] = _("BEAUTIFUL"); +const u8 gEasyChatWord_Beauty[] = _("BEAUTY"); +const u8 gEasyChatWord_AirLock[] = _("AIR LOCK"); +const u8 gEasyChatWord_Psychic[] = _("PSYCHIC"); +const u8 gEasyChatWord_HyperCutter[] = _("HYPER CUTTER"); +const u8 gEasyChatWord_Fighting[] = _("FIGHTING"); +const u8 gEasyChatWord_ShadowTag[] = _("SHADOW TAG"); +const u8 gEasyChatWord_Smart[] = _("SMART"); +const u8 gEasyChatWord_Smartness[] = _("SMARTNESS"); +const u8 gEasyChatWord_SpeedBoost[] = _("SPEED BOOST"); +const u8 gEasyChatWord_Cool[] = _("COOL"); +const u8 gEasyChatWord_Coolness[] = _("COOLNESS"); +const u8 gEasyChatWord_BattleArmor[] = _("BATTLE ARMOR"); +const u8 gEasyChatWord_Cute[] = _("CUTE"); +const u8 gEasyChatWord_Cuteness[] = _("CUTENESS"); +const u8 gEasyChatWord_Sturdy[] = _("STURDY"); +const u8 gEasyChatWord_SuctionCups[] = _("SUCTION CUPS"); +const u8 gEasyChatWord_Grass[] = _("GRASS"); +const u8 gEasyChatWord_ClearBody[] = _("CLEAR BODY"); +const u8 gEasyChatWord_Torrent[] = _("TORRENT"); +const u8 gEasyChatWord_Ghost[] = _("GHOST"); +const u8 gEasyChatWord_Ice[] = _("ICE"); +const u8 gEasyChatWord_Guts[] = _("GUTS"); +const u8 gEasyChatWord_RoughSkin[] = _("ROUGH SKIN"); +const u8 gEasyChatWord_ShellArmor[] = _("SHELL ARMOR"); +const u8 gEasyChatWord_NaturalCure[] = _("NATURAL CURE"); +const u8 gEasyChatWord_Damp[] = _("DAMP"); +const u8 gEasyChatWord_Ground[] = _("GROUND"); +const u8 gEasyChatWord_Limber[] = _("LIMBER"); +const u8 gEasyChatWord_MagnetPull[] = _("MAGNET PULL"); +const u8 gEasyChatWord_WhiteSmoke[] = _("WHITE SMOKE"); +const u8 gEasyChatWord_Synchronize[] = _("SYNCHRONIZE"); +const u8 gEasyChatWord_Overgrow[] = _("OVERGROW"); +const u8 gEasyChatWord_SwiftSwim[] = _("SWIFT SWIM"); +const u8 gEasyChatWord_SandStream[] = _("SAND STREAM"); +const u8 gEasyChatWord_SandVeil[] = _("SAND VEIL"); +const u8 gEasyChatWord_KeenEye[] = _("KEEN EYE"); +const u8 gEasyChatWord_InnerFocus[] = _("INNER FOCUS"); +const u8 gEasyChatWord_Static[] = _("STATIC"); +const u8 gEasyChatWord_Type[] = _("TYPE"); +const u8 gEasyChatWord_Tough[] = _("TOUGH"); +const u8 gEasyChatWord_Toughness[] = _("TOUGHNESS"); +const u8 gEasyChatWord_ShedSkin[] = _("SHED SKIN"); +const u8 gEasyChatWord_HugePower[] = _("HUGE POWER"); +const u8 gEasyChatWord_VoltAbsorb[] = _("VOLT ABSORB"); +const u8 gEasyChatWord_WaterAbsorb[] = _("WATER ABSORB"); +const u8 gEasyChatWord_Electric[] = _("ELECTRIC"); +const u8 gEasyChatWord_Forecast[] = _("FORECAST"); +const u8 gEasyChatWord_SereneGrace[] = _("SERENE GRACE"); +const u8 gEasyChatWord_Poison[] = _("POISON"); +const u8 gEasyChatWord_PoisonPoint[] = _("POISON POINT"); +const u8 gEasyChatWord_Dragon[] = _("DRAGON"); +const u8 gEasyChatWord_Trace[] = _("TRACE"); +const u8 gEasyChatWord_Oblivious[] = _("OBLIVIOUS"); +const u8 gEasyChatWord_Truant[] = _("TRUANT"); +const u8 gEasyChatWord_RunAway[] = _("RUN AWAY"); +const u8 gEasyChatWord_StickyHold[] = _("STICKY HOLD"); +const u8 gEasyChatWord_CloudNine[] = _("CLOUD NINE"); +const u8 gEasyChatWord_Normal[] = _("NORMAL"); +const u8 gEasyChatWord_Steel[] = _("STEEL"); +const u8 gEasyChatWord_Illuminate[] = _("ILLUMINATE"); +const u8 gEasyChatWord_EarlyBird[] = _("EARLY BIRD"); +const u8 gEasyChatWord_Hustle[] = _("HUSTLE"); +const u8 gEasyChatWord_Shine[] = _("SHINE"); +const u8 gEasyChatWord_Flying[] = _("FLYING"); +const u8 gEasyChatWord_Drought[] = _("DROUGHT"); +const u8 gEasyChatWord_Lightningrod[] = _("LIGHTNINGROD"); +const u8 gEasyChatWord_Compoundeyes[] = _("COMPOUNDEYES"); +const u8 gEasyChatWord_MarvelScale[] = _("MARVEL SCALE"); +const u8 gEasyChatWord_WonderGuard[] = _("WONDER GUARD"); +const u8 gEasyChatWord_Insomnia[] = _("INSOMNIA"); +const u8 gEasyChatWord_Levitate[] = _("LEVITATE"); +const u8 gEasyChatWord_Plus[] = _("PLUS"); +const u8 gEasyChatWord_Pressure[] = _("PRESSURE"); +const u8 gEasyChatWord_LiquidOoze[] = _("LIQUID OOZE"); +const u8 gEasyChatWord_ColorChange[] = _("COLOR CHANGE"); +const u8 gEasyChatWord_Soundproof[] = _("SOUNDPROOF"); +const u8 gEasyChatWord_EffectSpore[] = _("EFFECT SPORE"); +const u8 gEasyChatWord_Pkrs[] = _("{PK}RS"); +const u8 gEasyChatWord_Fire[] = _("FIRE"); +const u8 gEasyChatWord_FlameBody[] = _("FLAME BODY"); +const u8 gEasyChatWord_Minus[] = _("MINUS"); +const u8 gEasyChatWord_OwnTempo[] = _("OWN TEMPO"); +const u8 gEasyChatWord_MagmaArmor[] = _("MAGMA ARMOR"); +const u8 gEasyChatWord_Water[] = _("WATER"); +const u8 gEasyChatWord_WaterVeil[] = _("WATER VEIL"); +const u8 gEasyChatWord_Bug[] = _("BUG"); +const u8 gEasyChatWord_Swarm[] = _("SWARM"); +const u8 gEasyChatWord_CuteCharm[] = _("CUTE CHARM"); +const u8 gEasyChatWord_Immunity[] = _("IMMUNITY"); +const u8 gEasyChatWord_Blaze[] = _("BLAZE"); +const u8 gEasyChatWord_Pickup[] = _("PICKUP"); +const u8 gEasyChatWord_Pattern[] = _("PATTERN"); +const u8 gEasyChatWord_FlashFire[] = _("FLASH FIRE"); +const u8 gEasyChatWord_VitalSpirit[] = _("VITAL SPIRIT"); +const u8 gEasyChatWord_Chlorophyll[] = _("CHLOROPHYLL"); +const u8 gEasyChatWord_PurePower[] = _("PURE POWER"); +const u8 gEasyChatWord_ShieldDust[] = _("SHIELD DUST"); + +const struct EasyChatWordInfo gEasyChatGroup_Status[] = { + { + .text = gEasyChatWord_Dark, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Stench, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ThickFat, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_RainDish, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Drizzle, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ArenaTrap, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Intimidate, + .alphabeticalOrder = 101, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_RockHead, + .alphabeticalOrder = 97, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Color, + .alphabeticalOrder = 106, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_AltColor, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Rock, + .alphabeticalOrder = 68, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Beautiful, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Beauty, + .alphabeticalOrder = 86, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_AirLock, + .alphabeticalOrder = 78, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Psychic, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HyperCutter, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fighting, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ShadowTag, + .alphabeticalOrder = 99, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Smart, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Smartness, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SpeedBoost, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cool, + .alphabeticalOrder = 62, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Coolness, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_BattleArmor, + .alphabeticalOrder = 76, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cute, + .alphabeticalOrder = 72, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cuteness, + .alphabeticalOrder = 88, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sturdy, + .alphabeticalOrder = 57, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SuctionCups, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Grass, + .alphabeticalOrder = 90, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ClearBody, + .alphabeticalOrder = 91, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Torrent, + .alphabeticalOrder = 104, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ghost, + .alphabeticalOrder = 75, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ice, + .alphabeticalOrder = 58, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Guts, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_RoughSkin, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ShellArmor, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_NaturalCure, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Damp, + .alphabeticalOrder = 54, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ground, + .alphabeticalOrder = 73, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Limber, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_MagnetPull, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WhiteSmoke, + .alphabeticalOrder = 71, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Synchronize, + .alphabeticalOrder = 100, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Overgrow, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SwiftSwim, + .alphabeticalOrder = 81, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SandStream, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SandVeil, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_KeenEye, + .alphabeticalOrder = 82, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_InnerFocus, + .alphabeticalOrder = 77, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Static, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Type, + .alphabeticalOrder = 85, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tough, + .alphabeticalOrder = 94, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Toughness, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ShedSkin, + .alphabeticalOrder = 79, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HugePower, + .alphabeticalOrder = 92, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_VoltAbsorb, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WaterAbsorb, + .alphabeticalOrder = 69, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Electric, + .alphabeticalOrder = 64, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Forecast, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SereneGrace, + .alphabeticalOrder = 93, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Poison, + .alphabeticalOrder = 103, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_PoisonPoint, + .alphabeticalOrder = 102, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Dragon, + .alphabeticalOrder = 89, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Trace, + .alphabeticalOrder = 83, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Oblivious, + .alphabeticalOrder = 60, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Truant, + .alphabeticalOrder = 61, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_RunAway, + .alphabeticalOrder = 84, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_StickyHold, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_CloudNine, + .alphabeticalOrder = 107, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Normal, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Steel, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Illuminate, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_EarlyBird, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hustle, + .alphabeticalOrder = 66, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Shine, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Flying, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Drought, + .alphabeticalOrder = 59, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lightningrod, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Compoundeyes, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_MarvelScale, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WonderGuard, + .alphabeticalOrder = 108, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Insomnia, + .alphabeticalOrder = 74, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Levitate, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Plus, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pressure, + .alphabeticalOrder = 87, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_LiquidOoze, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ColorChange, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Soundproof, + .alphabeticalOrder = 70, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_EffectSpore, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pkrs, + .alphabeticalOrder = 67, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fire, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_FlameBody, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Minus, + .alphabeticalOrder = 98, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_OwnTempo, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_MagmaArmor, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Water, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WaterVeil, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Bug, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Swarm, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_CuteCharm, + .alphabeticalOrder = 63, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Immunity, + .alphabeticalOrder = 65, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Blaze, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pickup, + .alphabeticalOrder = 105, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pattern, + .alphabeticalOrder = 55, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_FlashFire, + .alphabeticalOrder = 95, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_VitalSpirit, + .alphabeticalOrder = 56, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Chlorophyll, + .alphabeticalOrder = 96, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_PurePower, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ShieldDust, + .alphabeticalOrder = 80, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_time.h b/src/data/easy_chat/easy_chat_group_time.h new file mode 100755 index 0000000000..691dde70c0 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_time.h @@ -0,0 +1,273 @@ +const u8 gEasyChatWord_Fall[] = _("FALL"); +const u8 gEasyChatWord_Morning[] = _("MORNING"); +const u8 gEasyChatWord_Tomorrow[] = _("TOMORROW"); +const u8 gEasyChatWord_Last[] = _("LAST"); +const u8 gEasyChatWord_Day[] = _("DAY"); +const u8 gEasyChatWord_Sometime[] = _("SOMETIME"); +const u8 gEasyChatWord_Always[] = _("ALWAYS"); +const u8 gEasyChatWord_Current[] = _("CURRENT"); +const u8 gEasyChatWord_Forever[] = _("FOREVER"); +const u8 gEasyChatWord_Days[] = _("DAYS"); +const u8 gEasyChatWord_End[] = _("END"); +const u8 gEasyChatWord_Tuesday[] = _("TUESDAY"); +const u8 gEasyChatWord_Yesterday[] = _("YESTERDAY"); +const u8 gEasyChatWord_Today[] = _("TODAY"); +const u8 gEasyChatWord_Friday[] = _("FRIDAY"); +const u8 gEasyChatWord_Monday[] = _("MONDAY"); +const u8 gEasyChatWord_Later[] = _("LATER"); +const u8 gEasyChatWord_Earlier[] = _("EARLIER"); +const u8 gEasyChatWord_Another[] = _("ANOTHER"); +const u8 gEasyChatWord_Time[] = _("TIME"); +const u8 gEasyChatWord_Finish[] = _("FINISH"); +const u8 gEasyChatWord_Wednesday[] = _("WEDNESDAY"); +const u8 gEasyChatWord_Soon[] = _("SOON"); +const u8 gEasyChatWord_Start[] = _("START"); +const u8 gEasyChatWord_Month[] = _("MONTH"); +const u8 gEasyChatWord_Stop[] = _("STOP"); +const u8 gEasyChatWord_Now[] = _("NOW"); +const u8 gEasyChatWord_Final[] = _("FINAL"); +const u8 gEasyChatWord_Next[] = _("NEXT"); +const u8 gEasyChatWord_Age[] = _("AGE"); +const u8 gEasyChatWord_Saturday[] = _("SATURDAY"); +const u8 gEasyChatWord_Summer[] = _("SUMMER"); +const u8 gEasyChatWord_Sunday[] = _("SUNDAY"); +const u8 gEasyChatWord_Beginning[] = _("BEGINNING"); +const u8 gEasyChatWord_Spring[] = _("SPRING"); +const u8 gEasyChatWord_Daytime[] = _("DAYTIME"); +const u8 gEasyChatWord_Winter[] = _("WINTER"); +const u8 gEasyChatWord_Daily[] = _("DAILY"); +const u8 gEasyChatWord_Olden[] = _("OLDEN"); +const u8 gEasyChatWord_Almost[] = _("ALMOST"); +const u8 gEasyChatWord_Nearly[] = _("NEARLY"); +const u8 gEasyChatWord_Thursday[] = _("THURSDAY"); +const u8 gEasyChatWord_Nighttime[] = _("NIGHTTIME"); +const u8 gEasyChatWord_Night[] = _("NIGHT"); +const u8 gEasyChatWord_Week[] = _("WEEK"); + +const struct EasyChatWordInfo gEasyChatGroup_Time[] = { + { + .text = gEasyChatWord_Fall, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Morning, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tomorrow, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Last, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Day, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sometime, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Always, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Current, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Forever, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Days, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_End, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tuesday, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Yesterday, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Today, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Friday, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Monday, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Later, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Earlier, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Another, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Time, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Finish, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wednesday, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Soon, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Start, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Month, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Stop, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Now, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Final, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Next, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Age, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Saturday, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Summer, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sunday, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Beginning, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Spring, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Daytime, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Winter, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Daily, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Olden, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Almost, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Nearly, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Thursday, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Nighttime, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Night, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Week, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_trainer.h b/src/data/easy_chat/easy_chat_group_trainer.h new file mode 100755 index 0000000000..a4e1ddfd6b --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_trainer.h @@ -0,0 +1,165 @@ +const u8 gEasyChatWord_IChooseYou[] = _("I CHOOSE YOU"); +const u8 gEasyChatWord_Gotcha[] = _("GOTCHA"); +const u8 gEasyChatWord_Trade[] = _("TRADE"); +const u8 gEasyChatWord_Sapphire[] = _("SAPPHIRE"); +const u8 gEasyChatWord_Evolve[] = _("EVOLVE"); +const u8 gEasyChatWord_Encyclopedia[] = _("ENCYCLOPEDIA"); +const u8 gEasyChatWord_Nature[] = _("NATURE"); +const u8 gEasyChatWord_Center[] = _("CENTER"); +const u8 gEasyChatWord_Egg[] = _("EGG"); +const u8 gEasyChatWord_Link[] = _("LINK"); +const u8 gEasyChatWord_SpAbility[] = _("SP. ABILITY"); +const u8 gEasyChatWord_Trainer[] = _("TRAINER"); +const u8 gEasyChatWord_Version[] = _("VERSION"); +const u8 gEasyChatWord_Pokenav[] = _("POKéNAV"); +const u8 gEasyChatWord_Pokemon[] = _("POKéMON"); +const u8 gEasyChatWord_Get[] = _("GET"); +const u8 gEasyChatWord_Pokedex[] = _("POKéDEX"); +const u8 gEasyChatWord_Ruby[] = _("RUBY"); +const u8 gEasyChatWord_Level[] = _("LEVEL"); +const u8 gEasyChatWord_Red[] = _("RED"); +const u8 gEasyChatWord_Green[] = _("GREEN"); +const u8 gEasyChatWord_Bag[] = _("BAG"); +const u8 gEasyChatWord_Flame[] = _("FLAME"); +const u8 gEasyChatWord_Gold[] = _("GOLD"); +const u8 gEasyChatWord_Leaf[] = _("LEAF"); +const u8 gEasyChatWord_Silver[] = _("SILVER"); +const u8 gEasyChatWord_Emerald[] = _("EMERALD"); + +const struct EasyChatWordInfo gEasyChatGroup_Trainer[] = { + { + .text = gEasyChatWord_IChooseYou, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Gotcha, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Trade, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sapphire, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Evolve, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Encyclopedia, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Nature, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Center, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Egg, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Link, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SpAbility, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Trainer, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Version, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pokenav, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pokemon, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Get, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Pokedex, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ruby, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Level, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Red, + .alphabeticalOrder = 19, + .enabled = FALSE, + }, + { + .text = gEasyChatWord_Green, + .alphabeticalOrder = 17, + .enabled = FALSE, + }, + { + .text = gEasyChatWord_Bag, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Flame, + .alphabeticalOrder = 25, + .enabled = FALSE, + }, + { + .text = gEasyChatWord_Gold, + .alphabeticalOrder = 10, + .enabled = FALSE, + }, + { + .text = gEasyChatWord_Leaf, + .alphabeticalOrder = 2, + .enabled = FALSE, + }, + { + .text = gEasyChatWord_Silver, + .alphabeticalOrder = 11, + .enabled = FALSE, + }, + { + .text = gEasyChatWord_Emerald, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_trendy_saying.h b/src/data/easy_chat/easy_chat_group_trendy_saying.h new file mode 100755 index 0000000000..46ce1201ae --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_trendy_saying.h @@ -0,0 +1,201 @@ +const u8 gEasyChatWord_KthxBye[] = _("KTHX, BYE."); +const u8 gEasyChatWord_YesSirExcl[] = _("YES, SIR!"); +const u8 gEasyChatWord_AvantGarde[] = _("AVANT GARDE"); +const u8 gEasyChatWord_Couple[] = _("COUPLE"); +const u8 gEasyChatWord_MuchObliged[] = _("MUCH OBLIGED"); +const u8 gEasyChatWord_YeehawExcl[] = _("YEEHAW!"); +const u8 gEasyChatWord_Mega[] = _("MEGA"); +const u8 gEasyChatWord_1HitKOExcl[] = _("1-HIT KO!"); +const u8 gEasyChatWord_Destiny[] = _("DESTINY"); +const u8 gEasyChatWord_Cancel[] = _("CANCEL"); +const u8 gEasyChatWord_New[] = _("NEW"); +const u8 gEasyChatWord_Flatten[] = _("FLATTEN"); +const u8 gEasyChatWord_Kidding[] = _("KIDDING"); +const u8 gEasyChatWord_Loser[] = _("LOSER"); +const u8 gEasyChatWord_Losing[] = _("LOSING"); +const u8 gEasyChatWord_Happening[] = _("HAPPENING"); +const u8 gEasyChatWord_HipAnd[] = _("HIP AND"); +const u8 gEasyChatWord_Shake[] = _("SHAKE"); +const u8 gEasyChatWord_Shady[] = _("SHADY"); +const u8 gEasyChatWord_Upbeat[] = _("UPBEAT"); +const u8 gEasyChatWord_Modern[] = _("MODERN"); +const u8 gEasyChatWord_SmellYa[] = _("SMELL YA"); +const u8 gEasyChatWord_Bang[] = _("BANG"); +const u8 gEasyChatWord_Knockout[] = _("KNOCKOUT"); +const u8 gEasyChatWord_Hassle[] = _("HASSLE"); +const u8 gEasyChatWord_Winner[] = _("WINNER"); +const u8 gEasyChatWord_Fever[] = _("FEVER"); +const u8 gEasyChatWord_Wannabe[] = _("WANNABE"); +const u8 gEasyChatWord_Baby[] = _("BABY"); +const u8 gEasyChatWord_Heart[] = _("HEART"); +const u8 gEasyChatWord_Old[] = _("OLD"); +const u8 gEasyChatWord_Young[] = _("YOUNG"); +const u8 gEasyChatWord_Ugly[] = _("UGLY"); + +const struct EasyChatWordInfo gEasyChatGroup_TrendySaying[] = { + { + .text = gEasyChatWord_KthxBye, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_YesSirExcl, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_AvantGarde, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Couple, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_MuchObliged, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_YeehawExcl, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mega, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_1HitKOExcl, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Destiny, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cancel, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_New, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Flatten, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Kidding, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Loser, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Losing, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Happening, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_HipAnd, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Shake, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Shady, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Upbeat, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Modern, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_SmellYa, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Bang, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Knockout, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hassle, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Winner, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fever, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wannabe, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Baby, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Heart, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Old, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Young, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ugly, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_group_voices.h b/src/data/easy_chat/easy_chat_group_voices.h new file mode 100755 index 0000000000..6dad874ec3 --- /dev/null +++ b/src/data/easy_chat/easy_chat_group_voices.h @@ -0,0 +1,381 @@ +const u8 gEasyChatWord_Excl[] = _("!"); +const u8 gEasyChatWord_ExclExcl[] = _("!!"); +const u8 gEasyChatWord_QuesExcl[] = _("?!"); +const u8 gEasyChatWord_Ques[] = _("?"); +const u8 gEasyChatWord_Ellipsis[] = _("…"); +const u8 gEasyChatWord_EllipsisExcl[] = _("…!"); +const u8 gEasyChatWord_EllipsisEllipsisEllipsis[] = _("………"); +const u8 gEasyChatWord_Dash[] = _("-"); +const u8 gEasyChatWord_DashDashDash[] = _("- - -"); +const u8 gEasyChatWord_UhOh[] = _("UH-OH"); +const u8 gEasyChatWord_Waaah[] = _("WAAAH"); +const u8 gEasyChatWord_Ahaha[] = _("AHAHA"); +const u8 gEasyChatWord_OhQues[] = _("OH?"); +const u8 gEasyChatWord_Nope[] = _("NOPE"); +const u8 gEasyChatWord_Urgh[] = _("URGH"); +const u8 gEasyChatWord_Hmm[] = _("HMM"); +const u8 gEasyChatWord_Whoah[] = _("WHOAH"); +const u8 gEasyChatWord_WroooaarExcl[] = _("WROOOAAR!"); +const u8 gEasyChatWord_Wow[] = _("WOW"); +const u8 gEasyChatWord_Giggle[] = _("GIGGLE"); +const u8 gEasyChatWord_Sigh[] = _("SIGH"); +const u8 gEasyChatWord_Unbelievable[] = _("UNBELIEVABLE"); +const u8 gEasyChatWord_Cries[] = _("CRIES"); +const u8 gEasyChatWord_Agree[] = _("AGREE"); +const u8 gEasyChatWord_EhQues[] = _("EH?"); +const u8 gEasyChatWord_Cry[] = _("CRY"); +const u8 gEasyChatWord_Ehehe[] = _("EHEHE"); +const u8 gEasyChatWord_OiOiOi[] = _("OI, OI, OI"); +const u8 gEasyChatWord_OhYeah[] = _("OH, YEAH"); +const u8 gEasyChatWord_Oh[] = _("OH"); +const u8 gEasyChatWord_Oops[] = _("OOPS"); +const u8 gEasyChatWord_Shocked[] = _("SHOCKED"); +const u8 gEasyChatWord_Eek[] = _("EEK"); +const u8 gEasyChatWord_Graaah[] = _("GRAAAH"); +const u8 gEasyChatWord_Gwahahaha[] = _("GWAHAHAHA"); +const u8 gEasyChatWord_Way[] = _("WAY"); +const u8 gEasyChatWord_Tch[] = _("TCH"); +const u8 gEasyChatWord_Hehe[] = _("HEHE"); +const u8 gEasyChatWord_Hah[] = _("HAH"); +const u8 gEasyChatWord_Yup[] = _("YUP"); +const u8 gEasyChatWord_Hahaha[] = _("HAHAHA"); +const u8 gEasyChatWord_Aiyeeh[] = _("AIYEEH"); +const u8 gEasyChatWord_Hiyah[] = _("HIYAH"); +const u8 gEasyChatWord_Fufufu[] = _("FUFUFU"); +const u8 gEasyChatWord_Lol[] = _("LOL"); +const u8 gEasyChatWord_Snort[] = _("SNORT"); +const u8 gEasyChatWord_Humph[] = _("HUMPH"); +const u8 gEasyChatWord_Hehehe[] = _("HEHEHE"); +const u8 gEasyChatWord_Heh[] = _("HEH"); +const u8 gEasyChatWord_Hohoho[] = _("HOHOHO"); +const u8 gEasyChatWord_UhHuh[] = _("UH-HUH"); +const u8 gEasyChatWord_OhDear[] = _("OH, DEAR"); +const u8 gEasyChatWord_Arrgh[] = _("ARRGH"); +const u8 gEasyChatWord_Mufufu[] = _("MUFUFU"); +const u8 gEasyChatWord_Mmm[] = _("MMM"); +const u8 gEasyChatWord_OhKay[] = _("OH-KAY"); +const u8 gEasyChatWord_Okay[] = _("OKAY"); +const u8 gEasyChatWord_Lalala[] = _("LALALA"); +const u8 gEasyChatWord_Yay[] = _("YAY"); +const u8 gEasyChatWord_Aww[] = _("AWW"); +const u8 gEasyChatWord_Wowee[] = _("WOWEE"); +const u8 gEasyChatWord_Gwah[] = _("GWAH"); +const u8 gEasyChatWord_Wahahaha[] = _("WAHAHAHA"); + +const struct EasyChatWordInfo gEasyChatGroup_Voices[] = { + { + .text = gEasyChatWord_Excl, + .alphabeticalOrder = 0, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_ExclExcl, + .alphabeticalOrder = 1, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_QuesExcl, + .alphabeticalOrder = 7, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ques, + .alphabeticalOrder = 8, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ellipsis, + .alphabeticalOrder = 4, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_EllipsisExcl, + .alphabeticalOrder = 5, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_EllipsisEllipsisEllipsis, + .alphabeticalOrder = 6, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Dash, + .alphabeticalOrder = 3, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_DashDashDash, + .alphabeticalOrder = 2, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_UhOh, + .alphabeticalOrder = 23, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Waaah, + .alphabeticalOrder = 11, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ahaha, + .alphabeticalOrder = 41, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_OhQues, + .alphabeticalOrder = 52, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Nope, + .alphabeticalOrder = 59, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Urgh, + .alphabeticalOrder = 22, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hmm, + .alphabeticalOrder = 25, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Whoah, + .alphabeticalOrder = 32, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_WroooaarExcl, + .alphabeticalOrder = 24, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wow, + .alphabeticalOrder = 26, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Giggle, + .alphabeticalOrder = 43, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Sigh, + .alphabeticalOrder = 19, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Unbelievable, + .alphabeticalOrder = 33, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cries, + .alphabeticalOrder = 61, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Agree, + .alphabeticalOrder = 34, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_EhQues, + .alphabeticalOrder = 38, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Cry, + .alphabeticalOrder = 40, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Ehehe, + .alphabeticalOrder = 48, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_OiOiOi, + .alphabeticalOrder = 37, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_OhYeah, + .alphabeticalOrder = 47, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Oh, + .alphabeticalOrder = 42, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Oops, + .alphabeticalOrder = 15, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Shocked, + .alphabeticalOrder = 49, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Eek, + .alphabeticalOrder = 46, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Graaah, + .alphabeticalOrder = 57, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Gwahahaha, + .alphabeticalOrder = 44, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Way, + .alphabeticalOrder = 54, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Tch, + .alphabeticalOrder = 53, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hehe, + .alphabeticalOrder = 13, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hah, + .alphabeticalOrder = 29, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Yup, + .alphabeticalOrder = 51, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hahaha, + .alphabeticalOrder = 28, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Aiyeeh, + .alphabeticalOrder = 55, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hiyah, + .alphabeticalOrder = 12, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Fufufu, + .alphabeticalOrder = 27, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lol, + .alphabeticalOrder = 56, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Snort, + .alphabeticalOrder = 30, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Humph, + .alphabeticalOrder = 31, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hehehe, + .alphabeticalOrder = 20, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Heh, + .alphabeticalOrder = 45, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Hohoho, + .alphabeticalOrder = 36, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_UhHuh, + .alphabeticalOrder = 50, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_OhDear, + .alphabeticalOrder = 9, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Arrgh, + .alphabeticalOrder = 21, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mufufu, + .alphabeticalOrder = 14, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Mmm, + .alphabeticalOrder = 10, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_OhKay, + .alphabeticalOrder = 62, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Okay, + .alphabeticalOrder = 35, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Lalala, + .alphabeticalOrder = 16, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Yay, + .alphabeticalOrder = 18, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Aww, + .alphabeticalOrder = 60, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wowee, + .alphabeticalOrder = 17, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Gwah, + .alphabeticalOrder = 58, + .enabled = TRUE, + }, + { + .text = gEasyChatWord_Wahahaha, + .alphabeticalOrder = 39, + .enabled = TRUE, + }, +}; diff --git a/src/data/easy_chat/easy_chat_groups.h b/src/data/easy_chat/easy_chat_groups.h new file mode 100755 index 0000000000..df114d9803 --- /dev/null +++ b/src/data/easy_chat/easy_chat_groups.h @@ -0,0 +1,137 @@ +#include "easy_chat.h" + +#include "easy_chat_group_pokemon.h" +#include "easy_chat_group_trainer.h" +#include "easy_chat_group_status.h" +#include "easy_chat_group_battle.h" +#include "easy_chat_group_greetings.h" +#include "easy_chat_group_people.h" +#include "easy_chat_group_voices.h" +#include "easy_chat_group_speech.h" +#include "easy_chat_group_endings.h" +#include "easy_chat_group_feelings.h" +#include "easy_chat_group_conditions.h" +#include "easy_chat_group_actions.h" +#include "easy_chat_group_lifestyle.h" +#include "easy_chat_group_hobbies.h" +#include "easy_chat_group_time.h" +#include "easy_chat_group_misc.h" +#include "easy_chat_group_adjectives.h" +#include "easy_chat_group_events.h" +#include "easy_chat_group_move_1.h" +#include "easy_chat_group_move_2.h" +#include "easy_chat_group_trendy_saying.h" +#include "easy_chat_group_pokemon2.h" + +const struct EasyChatGroup gEasyChatGroups[] = { + { + .wordData = {.valueList = gEasyChatGroup_Pokemon}, + .numWords = 202, + .numEnabledWords = 202, + }, + { + .wordData = {.words = gEasyChatGroup_Trainer}, + .numWords = 27, + .numEnabledWords = 21, + }, + { + .wordData = {.words = gEasyChatGroup_Status}, + .numWords = 109, + .numEnabledWords = 109, + }, + { + .wordData = {.words = gEasyChatGroup_Battle}, + .numWords = 63, + .numEnabledWords = 63, + }, + { + .wordData = {.words = gEasyChatGroup_Greetings}, + .numWords = 42, + .numEnabledWords = 42, + }, + { + .wordData = {.words = gEasyChatGroup_People}, + .numWords = 75, + .numEnabledWords = 75, + }, + { + .wordData = {.words = gEasyChatGroup_Voices}, + .numWords = 63, + .numEnabledWords = 63, + }, + { + .wordData = {.words = gEasyChatGroup_Speech}, + .numWords = 60, + .numEnabledWords = 60, + }, + { + .wordData = {.words = gEasyChatGroup_Endings}, + .numWords = 69, + .numEnabledWords = 69, + }, + { + .wordData = {.words = gEasyChatGroup_Feelings}, + .numWords = 69, + .numEnabledWords = 69, + }, + { + .wordData = {.words = gEasyChatGroup_Conditions}, + .numWords = 69, + .numEnabledWords = 69, + }, + { + .wordData = {.words = gEasyChatGroup_Actions}, + .numWords = 78, + .numEnabledWords = 78, + }, + { + .wordData = {.words = gEasyChatGroup_Lifestyle}, + .numWords = 45, + .numEnabledWords = 45, + }, + { + .wordData = {.words = gEasyChatGroup_Hobbies}, + .numWords = 54, + .numEnabledWords = 54, + }, + { + .wordData = {.words = gEasyChatGroup_Time}, + .numWords = 45, + .numEnabledWords = 45, + }, + { + .wordData = {.words = gEasyChatGroup_Misc}, + .numWords = 42, + .numEnabledWords = 42, + }, + { + .wordData = {.words = gEasyChatGroup_Adjectives}, + .numWords = 36, + .numEnabledWords = 36, + }, + { + .wordData = {.words = gEasyChatGroup_Events}, + .numWords = 29, + .numEnabledWords = 29, + }, + { + .wordData = {.valueList = gEasyChatGroup_Move1}, + .numWords = 154, + .numEnabledWords = 154, + }, + { + .wordData = {.valueList = gEasyChatGroup_Move2}, + .numWords = 200, + .numEnabledWords = 200, + }, + { + .wordData = {.words = gEasyChatGroup_TrendySaying}, + .numWords = 33, + .numEnabledWords = 33, + }, + { + .wordData = {.valueList = gEasyChatGroup_Pokemon2}, + .numWords = 251, + .numEnabledWords = 251, + }, +}; diff --git a/src/data/easy_chat/easy_chat_words_by_letter.h b/src/data/easy_chat/easy_chat_words_by_letter.h new file mode 100755 index 0000000000..927b9db2f0 --- /dev/null +++ b/src/data/easy_chat/easy_chat_words_by_letter.h @@ -0,0 +1,2750 @@ +#include "easy_chat.h" +#include "constants/easy_chat.h" + +const u16 gEasyChatWordsByLetter_Others[] = { + EC_WORD_EXCL, + EC_WORD_EXCL_EXCL, + EC_WORD_DASH, + EC_WORD_DASH_DASH_DASH, + EC_WORD_ELLIPSIS, + EC_WORD_ELLIPSIS_EXCL, + EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, + EC_WORD_1_HIT_KO_EXCL, + EC_WORD_QUES, + EC_WORD_QUES_EXCL, +}; + +const u16 gEasyChatWordsByLetter_A[] = { + EC_WORD_A, + EC_WORD_A_LITTLE, + EC_WORD_A_LOT, + EC_WORD_A_TINY_BIT, + EC_WORD_ABOUT, + EC_WORD_ABOVE, + -1, 2, // Doubled pokemon species name + EC_POKEMON(ABRA), + EC_POKEMON2(ABRA), + EC_WORD_ABSENT, + EC_POKEMON(ABSOL), + EC_WORD_ABSOLUTELY, + EC_MOVE(ABSORB), + EC_WORD_ACCEPT, + EC_MOVE2(ACID), + EC_MOVE2(ACID_ARMOR), + EC_WORD_ADORE, + EC_WORD_ADULT, + EC_WORD_ADVENTURE, + EC_MOVE2(AERIAL_ACE), + EC_MOVE(AEROBLAST), + EC_POKEMON2(AERODACTYL), + EC_WORD_AFTER, + EC_WORD_AGE, + EC_POKEMON(AGGRON), + EC_MOVE(AGILITY), + EC_WORD_AGREE, + EC_WORD_AHAHA, + EC_WORD_AIM, + EC_POKEMON2(AIPOM), + EC_MOVE(AIR_CUTTER), + EC_WORD_AIR_LOCK, + EC_WORD_AIYEEH, + -1, 2, // Doubled pokemon species name + EC_POKEMON(ALAKAZAM), + EC_POKEMON2(ALAKAZAM), + EC_WORD_ALL, + EC_WORD_ALL_RIGHT, + EC_WORD_ALLOW, + EC_WORD_ALLOWANCE, + EC_WORD_ALLY, + EC_WORD_ALMOST, + EC_WORD_ALONE, + EC_WORD_ALSO, + EC_WORD_ALT_COLOR, + EC_POKEMON(ALTARIA), + EC_WORD_ALTHOUGH, + EC_WORD_ALWAYS, + EC_WORD_AM, + EC_MOVE2(AMNESIA), + EC_POKEMON2(AMPHAROS), + EC_WORD_AMUSING, + EC_WORD_AN, + EC_MOVE(ANCIENT_POWER), + EC_WORD_AND, + EC_WORD_ANGER, + EC_WORD_ANGERS, + EC_WORD_ANGRY, + EC_WORD_ANIME, + EC_POKEMON(ANORITH), + EC_WORD_ANOTHER, + EC_WORD_ANTICIPATION, + EC_WORD_ANY, + EC_WORD_ANYWHERE, + EC_WORD_APOLOGIZE, + EC_WORD_APPEAL, + EC_WORD_APPEAR, + EC_WORD_APPEARS, + EC_WORD_APPRECIATE, + EC_WORD_APPROVED, + EC_POKEMON2(ARBOK), + EC_POKEMON2(ARCANINE), + EC_WORD_ARE, + EC_WORD_AREN_T, + EC_WORD_ARENA_TRAP, + EC_POKEMON2(ARIADOS), + EC_MOVE2(ARM_THRUST), + EC_POKEMON(ARMALDO), + EC_MOVE(AROMATHERAPY), + EC_POKEMON(ARON), + EC_WORD_AROUND, + EC_WORD_ARRGH, + EC_POKEMON2(ARTICUNO), + EC_WORD_AS, + EC_WORD_AS_IF, + EC_WORD_AS_MUCH_AS, + EC_MOVE2(ASSIST), + EC_MOVE(ASTONISH), + EC_WORD_AT, + EC_WORD_ATTACK, + EC_MOVE2(ATTRACT), + EC_WORD_AUNT, + EC_MOVE(AURORA_BEAM), + EC_WORD_AVANT_GARDE, + EC_WORD_AWAY, + EC_WORD_AWESOME, + EC_WORD_AWFUL, + EC_WORD_AWFULLY, + EC_WORD_AWW, + -1, 2, // Doubled pokemon species name + EC_POKEMON(AZUMARILL), + EC_POKEMON2(AZUMARILL), + EC_POKEMON(AZURILL), +}; + +const u16 gEasyChatWordsByLetter_B[] = { + EC_WORD_BABE, + EC_WORD_BABY, + EC_WORD_BACK, + EC_WORD_BAD, + EC_WORD_BADLY, + EC_WORD_BAG, + EC_POKEMON(BAGON), + EC_WORD_BALL, + EC_POKEMON(BALTOY), + EC_POKEMON(BANETTE), + EC_WORD_BANG, + EC_POKEMON(BARBOACH), + EC_MOVE2(BARRAGE), + EC_MOVE2(BARRIER), + EC_WORD_BATH, + EC_MOVE2(BATON_PASS), + EC_WORD_BATTLE, + EC_WORD_BATTLE_ARMOR, + EC_WORD_BATTLE_ROOM, + EC_WORD_BATTLE_TOWER, + EC_POKEMON2(BAYLEEF), + EC_WORD_BE, + EC_WORD_BEAT, + EC_MOVE2(BEAT_UP), + EC_POKEMON(BEAUTIFLY), + EC_WORD_BEAUTIFUL, + EC_WORD_BEAUTY, + EC_WORD_BECOMES, + EC_POKEMON2(BEEDRILL), + EC_WORD_BEEN, + EC_WORD_BEFORE, + EC_WORD_BEGINNING, + EC_WORD_BEING, + EC_POKEMON(BELDUM), + EC_WORD_BELIEVE, + -1, 2, // Doubled pokemon species name + EC_POKEMON(BELLOSSOM), + EC_POKEMON2(BELLOSSOM), + EC_POKEMON2(BELLSPROUT), + EC_MOVE2(BELLY_DRUM), + EC_WORD_BELONGS_TO, + EC_WORD_BELOW, + EC_WORD_BERRY, + EC_WORD_BESIDE, + EC_WORD_BEST, + EC_WORD_BETTER, + EC_MOVE(BIDE), + EC_WORD_BIG, + EC_WORD_BIKE, + EC_MOVE(BIND), + EC_MOVE(BITE), + EC_MOVE2(BLAST_BURN), + EC_POKEMON2(BLASTOISE), + EC_WORD_BLAZE, + EC_MOVE2(BLAZE_KICK), + EC_POKEMON(BLAZIKEN), + EC_WORD_BLEND, + EC_POKEMON2(BLISSEY), + EC_MOVE2(BLIZZARD), + EC_MOVE2(BLOCK), + EC_WORD_BOARD, + EC_MOVE2(BODY_SLAM), + EC_MOVE2(BONE_CLUB), + EC_MOVE2(BONE_RUSH), + EC_MOVE2(BONEMERANG), + EC_WORD_BOOK, + EC_WORD_BORED, + EC_WORD_BORING, + EC_MOVE2(BOUNCE), + EC_WORD_BOY, + EC_WORD_BRAG, + EC_WORD_BREAK, + EC_POKEMON(BRELOOM), + EC_MOVE(BRICK_BREAK), + EC_WORD_BROTHER, + EC_MOVE(BUBBLE), + EC_MOVE2(BUBBLE_BEAM), + EC_WORD_BUG, + EC_POKEMON2(BULBASAUR), + EC_MOVE2(BULK_UP), + EC_MOVE2(BULLET_SEED), + EC_WORD_BUSY, + EC_WORD_BUT, + EC_POKEMON2(BUTTERFREE), + EC_WORD_BYE_BYE, +}; + +const u16 gEasyChatWordsByLetter_C[] = { + EC_POKEMON(CACNEA), + EC_POKEMON(CACTURNE), + EC_MOVE2(CALM_MIND), + EC_WORD_CAME, + EC_WORD_CAMERA, + EC_POKEMON(CAMERUPT), + EC_MOVE2(CAMOUFLAGE), + EC_WORD_CAN, + EC_WORD_CAN_WIN, + EC_WORD_CAN_T, + EC_WORD_CAN_T_WIN, + EC_WORD_CANCEL, + EC_WORD_CAPABLE, + EC_WORD_CARDS, + EC_WORD_CARE, + EC_WORD_CARES, + EC_POKEMON(CARVANHA), + EC_POKEMON(CASCOON), + EC_WORD_CASE, + EC_POKEMON(CASTFORM), + EC_POKEMON2(CATERPIE), + EC_WORD_CAUSE, + EC_POKEMON2(CELEBI), + EC_WORD_CENTER, + EC_WORD_CHALLENGE, + EC_WORD_CHANGE, + EC_WORD_CHANNEL, + EC_POKEMON2(CHANSEY), + EC_MOVE(CHARGE), + EC_POKEMON2(CHARIZARD), + EC_MOVE(CHARM), + EC_POKEMON2(CHARMANDER), + EC_POKEMON2(CHARMELEON), + EC_WORD_CHAT, + EC_POKEMON2(CHIKORITA), + EC_WORD_CHILD_S_PLAY, + EC_WORD_CHILDREN, + EC_POKEMON(CHIMECHO), + -1, 2, // Doubled pokemon species name + EC_POKEMON(CHINCHOU), + EC_POKEMON2(CHINCHOU), + EC_WORD_CHLOROPHYLL, + EC_WORD_CHOICE, + EC_WORD_CHOOSE, + EC_WORD_CHORES, + EC_MOVE(CLAMP), + EC_POKEMON(CLAMPERL), + EC_WORD_CLASS, + EC_POKEMON(CLAYDOL), + EC_WORD_CLEAR_BODY, + EC_POKEMON2(CLEFABLE), + EC_POKEMON2(CLEFAIRY), + EC_POKEMON2(CLEFFA), + EC_WORD_CLOSE, + EC_WORD_CLOUD_NINE, + EC_POKEMON2(CLOYSTER), + EC_WORD_COLD, + EC_WORD_COLLECT, + EC_WORD_COLLECTION, + EC_WORD_COLOR, + EC_WORD_COLOR_CHANGE, + EC_POKEMON(COMBUSKEN), + EC_WORD_COME, + EC_WORD_COME_ON, + EC_WORD_COME_OVER, + EC_MOVE2(COMET_PUNCH), + EC_WORD_COMICS, + EC_WORD_COMMEMORATE, + EC_WORD_COMPLETE, + EC_WORD_COMPOUNDEYES, + EC_WORD_CONCEDE, + EC_MOVE(CONFUSE_RAY), + EC_WORD_CONFUSED, + EC_MOVE2(CONFUSION), + EC_WORD_CONGRATS, + EC_MOVE(CONSTRICT), + EC_WORD_CONTEST, + EC_WORD_CONVERSATION, + EC_MOVE2(CONVERSION), + EC_MOVE2(CONVERSION_2), + EC_WORD_COOL, + EC_WORD_COOLNESS, + EC_POKEMON(CORPHISH), + EC_WORD_CORRECT, + -1, 2, // Doubled pokemon species name + EC_POKEMON(CORSOLA), + EC_POKEMON2(CORSOLA), + EC_MOVE(COSMIC_POWER), + EC_MOVE2(COTTON_SPORE), + EC_WORD_COULD, + EC_WORD_COULDN_T, + EC_WORD_COUNT_ON, + EC_MOVE(COUNTER), + EC_WORD_COUPLE, + EC_MOVE2(COVET), + EC_MOVE(CRABHAMMER), + EC_POKEMON(CRADILY), + EC_POKEMON(CRAWDAUNT), + EC_WORD_CRIES, + -1, 2, // Doubled pokemon species name + EC_POKEMON(CROBAT), + EC_POKEMON2(CROBAT), + EC_POKEMON2(CROCONAW), + EC_MOVE(CROSS_CHOP), + EC_MOVE(CRUNCH), + EC_WORD_CRUSH, + EC_MOVE2(CRUSH_CLAW), + EC_WORD_CRY, + EC_POKEMON2(CUBONE), + EC_WORD_CURRENT, + EC_MOVE2(CURSE), + EC_MOVE(CUT), + EC_WORD_CUTE, + EC_WORD_CUTE_CHARM, + EC_WORD_CUTENESS, + EC_POKEMON2(CYNDAQUIL), +}; + +const u16 gEasyChatWordsByLetter_D[] = { + EC_WORD_DAILY, + EC_WORD_DAMP, + EC_WORD_DANCE, + EC_WORD_DANGER, + EC_WORD_DARK, + EC_WORD_DARN, + EC_WORD_DATE, + EC_WORD_DAUGHTER, + EC_WORD_DAY, + EC_WORD_DAYS, + EC_WORD_DAYTIME, + EC_WORD_DECIDE, + EC_WORD_DECIDED, + EC_WORD_DEEP, + EC_WORD_DEFEATED, + EC_MOVE2(DEFENSE_CURL), + EC_POKEMON(DELCATTY), + EC_POKEMON2(DELIBIRD), + EC_POKEMON(DEOXYS), + EC_WORD_DEPT_STORE, + EC_WORD_DESIGN, + EC_WORD_DESTINY, + EC_MOVE2(DESTINY_BOND), + EC_WORD_DESTROYED, + EC_MOVE2(DETECT), + EC_POKEMON2(DEWGONG), + EC_WORD_DID, + EC_WORD_DIDN_T, + EC_WORD_DIET, + EC_WORD_DIFFERENT, + EC_MOVE(DIG), + EC_WORD_DIGITAL, + EC_POKEMON2(DIGLETT), + EC_WORD_DIRECT, + EC_MOVE(DISABLE), + EC_WORD_DISAPPEAR, + EC_WORD_DISAPPOINT, + EC_WORD_DISAPPOINTED, + EC_WORD_DISAPPOINTS, + EC_WORD_DISASTER, + EC_WORD_DISLIKE, + EC_WORD_DISLIKES, + EC_POKEMON2(DITTO), + EC_MOVE2(DIVE), + EC_MOVE2(DIZZY_PUNCH), + EC_WORD_DO, + EC_WORD_DOCILE, + -1, 2, // Doubled pokemon species name + EC_POKEMON(DODRIO), + EC_POKEMON2(DODRIO), + -1, 2, // Doubled pokemon species name + EC_POKEMON(DODUO), + EC_POKEMON2(DODUO), + EC_WORD_DOES, + EC_WORD_DOESN_T, + EC_WORD_DON_T, + EC_WORD_DONE, + -1, 2, // Doubled pokemon species name + EC_POKEMON(DONPHAN), + EC_POKEMON2(DONPHAN), + EC_MOVE2(DOOM_DESIRE), + EC_MOVE2(DOUBLE_KICK), + EC_MOVE(DOUBLE_TEAM), + EC_MOVE(DOUBLE_EDGE), + EC_MOVE(DOUBLE_SLAP), + EC_WORD_DOWN, + EC_WORD_DOWNCAST, + EC_WORD_DRAGON, + EC_MOVE2(DRAGON_CLAW), + EC_MOVE2(DRAGON_DANCE), + EC_MOVE2(DRAGON_RAGE), + EC_POKEMON2(DRAGONAIR), + EC_MOVE2(DRAGON_BREATH), + EC_POKEMON2(DRAGONITE), + EC_POKEMON2(DRATINI), + EC_WORD_DREAM, + EC_MOVE2(DREAM_EATER), + EC_MOVE2(DRILL_PECK), + EC_WORD_DRINK, + EC_WORD_DRINKS, + EC_WORD_DRIZZLE, + EC_WORD_DROOLING, + EC_WORD_DROUGHT, + EC_POKEMON2(DROWZEE), + EC_WORD_DUDE, + EC_POKEMON2(DUGTRIO), + EC_POKEMON2(DUNSPARCE), + EC_POKEMON(DUSCLOPS), + EC_POKEMON(DUSKULL), + EC_POKEMON(DUSTOX), + EC_MOVE2(DYNAMIC_PUNCH), +}; + +const u16 gEasyChatWordsByLetter_E[] = { + EC_WORD_EARLIER, + EC_WORD_EARLY_BIRD, + EC_MOVE(EARTHQUAKE), + EC_WORD_EASY, + EC_WORD_EAT, + EC_WORD_EATS, + EC_WORD_EEK, + EC_POKEMON2(EEVEE), + EC_WORD_EFFECT_SPORE, + EC_WORD_EGG, + EC_MOVE2(EGG_BOMB), + EC_WORD_EH_QUES, + EC_WORD_EHEHE, + EC_POKEMON2(EKANS), + EC_POKEMON2(ELECTABUZZ), + EC_WORD_ELECTRIC, + EC_POKEMON(ELECTRIKE), + -1, 2, // Doubled pokemon species name + EC_POKEMON(ELECTRODE), + EC_POKEMON2(ELECTRODE), + EC_POKEMON2(ELEKID), + EC_WORD_ELSE, + EC_MOVE2(EMBER), + EC_WORD_EMERALD, + EC_MOVE(ENCORE), + EC_WORD_ENCYCLOPEDIA, + EC_WORD_END, + EC_MOVE(ENDEAVOR), + EC_MOVE(ENDURE), + EC_WORD_ENJOY, + EC_WORD_ENJOYS, + EC_WORD_ENOUGH, + EC_POKEMON2(ENTEI), + EC_WORD_ENTERTAINING, + EC_MOVE2(ERUPTION), + EC_WORD_ESCAPE, + EC_POKEMON2(ESPEON), + EC_WORD_EVEN_SO, + EC_WORD_EVENT, + EC_WORD_EVENTS, + EC_WORD_EVER, + EC_WORD_EVERY, + EC_WORD_EVOLUTION, + EC_WORD_EVOLVE, + EC_WORD_EXCELLENT, + EC_WORD_EXCESS, + EC_WORD_EXCITE, + EC_WORD_EXCITING, + EC_WORD_EXCUSE, + EC_WORD_EXCUSE_ME, + EC_POKEMON2(EXEGGCUTE), + EC_POKEMON2(EXEGGUTOR), + EC_WORD_EXISTS, + EC_WORD_EXPENSIVE, + EC_MOVE2(EXPLOSION), + EC_POKEMON(EXPLOUD), + EC_MOVE(EXTRASENSORY), + EC_MOVE(EXTREME_SPEED), +}; + +const u16 gEasyChatWordsByLetter_F[] = { + EC_WORD_FABULOUS, + EC_MOVE(FACADE), + EC_WORD_FAINT, + EC_MOVE2(FAINT_ATTACK), + EC_WORD_FAINTED, + EC_MOVE2(FAKE_OUT), + EC_MOVE(FAKE_TEARS), + EC_WORD_FALL, + EC_MOVE2(FALSE_SWIPE), + EC_WORD_FAMILY, + EC_WORD_FANTASTIC, + EC_WORD_FAR, + EC_POKEMON2(FARFETCHD), + EC_WORD_FASHION, + EC_WORD_FAST, + EC_WORD_FATHER, + EC_WORD_FEAR, + EC_POKEMON2(FEAROW), + EC_MOVE2(FEATHER_DANCE), + EC_POKEMON(FEEBAS), + EC_WORD_FEELING, + EC_POKEMON2(FERALIGATR), + EC_WORD_FESTIVAL, + EC_WORD_FEVER, + EC_WORD_FIERY, + EC_WORD_FIGHT, + EC_WORD_FIGHTING, + EC_WORD_FIGHTS, + EC_WORD_FINAL, + EC_WORD_FINALLY, + EC_WORD_FINISH, + EC_WORD_FIRE, + EC_MOVE2(FIRE_BLAST), + EC_MOVE2(FIRE_PUNCH), + EC_MOVE2(FIRE_SPIN), + EC_WORD_FISHING, + EC_MOVE(FISSURE), + EC_POKEMON2(FLAAFFY), + EC_MOVE(FLAIL), + EC_WORD_FLAME, + EC_WORD_FLAME_BODY, + EC_MOVE(FLAME_WHEEL), + EC_MOVE(FLAMETHROWER), + EC_POKEMON2(FLAREON), + EC_MOVE2(FLASH), + EC_WORD_FLASH_FIRE, + EC_WORD_FLATTEN, + EC_MOVE(FLATTER), + EC_WORD_FLOWERS, + EC_MOVE(FLY), + EC_POKEMON(FLYGON), + EC_WORD_FLYING, + EC_MOVE(FOCUS_ENERGY), + EC_MOVE(FOCUS_PUNCH), + EC_WORD_FOE, + EC_MOVE(FOLLOW_ME), + EC_WORD_FOR, + EC_WORD_FOR_NOW, + EC_WORD_FORECAST, + EC_MOVE2(FORESIGHT), + EC_WORD_FOREVER, + EC_WORD_FORGET, + EC_WORD_FORGETS, + EC_WORD_FORGIVE, + EC_POKEMON2(FORRETRESS), + EC_MOVE2(FRENZY_PLANT), + EC_WORD_FRIDAY, + EC_WORD_FRIEND, + EC_WORD_FROM, + EC_WORD_FRONT, + EC_WORD_FRONTIER, + EC_MOVE2(FRUSTRATION), + EC_WORD_FUFUFU, + EC_WORD_FULL, + EC_WORD_FUNNY, + EC_POKEMON2(FURRET), + EC_MOVE2(FURY_ATTACK), + EC_MOVE2(FURY_CUTTER), + EC_MOVE2(FURY_SWIPES), + EC_MOVE2(FUTURE_SIGHT), +}; + +const u16 gEasyChatWordsByLetter_G[] = { + EC_WORD_GAME, + EC_POKEMON(GARDEVOIR), + EC_POKEMON2(GASTLY), + EC_POKEMON2(GENGAR), + EC_WORD_GENIUS, + -1, 2, // Doubled pokemon species name + EC_POKEMON(GEODUDE), + EC_POKEMON2(GEODUDE), + EC_WORD_GET, + EC_WORD_GETS, + EC_WORD_GHOST, + EC_WORD_GIDDY, + EC_MOVE(GIGA_DRAIN), + EC_WORD_GIGGLE, + EC_WORD_GIMME, + -1, 2, // Doubled pokemon species name + EC_POKEMON(GIRAFARIG), + EC_POKEMON2(GIRAFARIG), + EC_WORD_GIRL, + EC_WORD_GIVE, + EC_WORD_GIVE_ME, + EC_WORD_GIVE_UP, + EC_WORD_GIVES, + EC_POKEMON(GLALIE), + EC_MOVE2(GLARE), + EC_POKEMON2(GLIGAR), + -1, 2, // Doubled pokemon species name + EC_POKEMON(GLOOM), + EC_POKEMON2(GLOOM), + EC_WORD_GO, + EC_WORD_GO_AHEAD, + EC_WORD_GO_EASY, + EC_WORD_GO_HOME, + EC_WORD_GOES, + EC_WORD_GOING, + -1, 2, // Doubled pokemon species name + EC_POKEMON(GOLBAT), + EC_POKEMON2(GOLBAT), + EC_WORD_GOLD, + -1, 2, // Doubled pokemon species name + EC_POKEMON(GOLDEEN), + EC_POKEMON2(GOLDEEN), + -1, 2, // Doubled pokemon species name + EC_POKEMON(GOLDUCK), + EC_POKEMON2(GOLDUCK), + -1, 2, // Doubled pokemon species name + EC_POKEMON(GOLEM), + EC_POKEMON2(GOLEM), + EC_WORD_GOOD, + EC_WORD_GOOD_BYE, + EC_POKEMON(GOREBYSS), + EC_WORD_GOT, + EC_WORD_GOTCHA, + EC_WORD_GOURMET, + EC_WORD_GRAAAH, + EC_POKEMON2(GRANBULL), + EC_WORD_GRANDFATHER, + EC_WORD_GRANDMOTHER, + EC_WORD_GRASS, + EC_MOVE(GRASS_WHISTLE), + -1, 2, // Doubled pokemon species name + EC_POKEMON(GRAVELER), + EC_POKEMON2(GRAVELER), + EC_WORD_GREAT, + EC_WORD_GREEN, + -1, 2, // Doubled pokemon species name + EC_POKEMON(GRIMER), + EC_POKEMON2(GRIMER), + EC_POKEMON(GROUDON), + EC_WORD_GROUND, + EC_WORD_GROUP, + EC_POKEMON(GROVYLE), + EC_MOVE2(GROWL), + EC_POKEMON2(GROWLITHE), + EC_MOVE(GROWTH), + EC_MOVE(GRUDGE), + EC_POKEMON(GRUMPIG), + EC_WORD_GUARD, + EC_MOVE2(GUILLOTINE), + EC_POKEMON(GULPIN), + EC_MOVE(GUST), + EC_WORD_GUTS, + EC_WORD_GUTSY, + EC_WORD_GWAH, + EC_WORD_GWAHAHAHA, + -1, 2, // Doubled pokemon species name + EC_POKEMON(GYARADOS), + EC_POKEMON2(GYARADOS), +}; + +const u16 gEasyChatWordsByLetter_H[] = { + EC_WORD_HABIT, + EC_WORD_HAH, + EC_WORD_HAHAHA, + EC_MOVE(HAIL), + EC_WORD_HALL_OF_FAME, + EC_WORD_HAPPENING, + EC_WORD_HAPPILY, + EC_WORD_HAPPINESS, + EC_WORD_HAPPY, + EC_WORD_HARD, + EC_MOVE(HARDEN), + EC_POKEMON(HARIYAMA), + EC_WORD_HAS, + EC_WORD_HASSLE, + EC_POKEMON2(HAUNTER), + EC_WORD_HAVE, + EC_WORD_HAVEN_T, + EC_MOVE(HAZE), + EC_WORD_HE, + EC_WORD_HE_S, + EC_MOVE(HEADBUTT), + EC_MOVE(HEAL_BELL), + EC_WORD_HEALTHY, + EC_WORD_HEAR, + EC_WORD_HEARING, + EC_WORD_HEARS, + EC_WORD_HEART, + EC_MOVE2(HEAT_WAVE), + EC_WORD_HEH, + EC_WORD_HEHE, + EC_WORD_HEHEHE, + EC_WORD_HELLO, + EC_MOVE2(HELPING_HAND), + EC_WORD_HER, + -1, 2, // Doubled pokemon species name + EC_POKEMON(HERACROSS), + EC_POKEMON2(HERACROSS), + EC_WORD_HERE, + EC_WORD_HERE_GOES, + EC_WORD_HERE_I_COME, + EC_WORD_HERE_IT_IS, + EC_WORD_HERO, + EC_WORD_HEROINE, + EC_WORD_HERS, + EC_WORD_HEY, + EC_WORD_HEY_THERE, + EC_WORD_HEY_QUES, + EC_WORD_HI, + EC_MOVE2(HI_JUMP_KICK), + EC_WORD_HIDDEN, + EC_MOVE2(HIDDEN_POWER), + EC_WORD_HIGH, + EC_WORD_HIGHS, + EC_WORD_HIM, + EC_WORD_HIP_AND, + EC_WORD_HIS, + EC_WORD_HIT, + EC_POKEMON2(HITMONCHAN), + EC_POKEMON2(HITMONLEE), + EC_POKEMON2(HITMONTOP), + EC_WORD_HIYAH, + EC_WORD_HMM, + EC_POKEMON2(HO_OH), + EC_WORD_HOBBY, + EC_WORD_HOHOHO, + EC_WORD_HOLIDAY, + EC_WORD_HOME, + EC_WORD_HOO_HAH, + EC_POKEMON2(HOOTHOOT), + EC_WORD_HOPELESS, + EC_POKEMON2(HOPPIP), + EC_MOVE2(HORN_ATTACK), + EC_MOVE2(HORN_DRILL), + -1, 2, // Doubled pokemon species name + EC_POKEMON(HORSEA), + EC_POKEMON2(HORSEA), + EC_WORD_HOT, + EC_POKEMON2(HOUNDOOM), + EC_POKEMON2(HOUNDOUR), + EC_WORD_HOW, + EC_WORD_HOW_DO, + EC_WORD_HOWEVER, + EC_MOVE2(HOWL), + EC_WORD_HUGE_POWER, + EC_WORD_HUH_QUES, + EC_WORD_HUMPH, + EC_WORD_HUNGRY, + EC_POKEMON(HUNTAIL), + EC_WORD_HURRIED, + EC_WORD_HUSTLE, + EC_MOVE2(HYDRO_CANNON), + EC_MOVE2(HYDRO_PUMP), + EC_WORD_HYPER, + EC_MOVE2(HYPER_BEAM), + EC_WORD_HYPER_CUTTER, + EC_MOVE2(HYPER_FANG), + EC_MOVE2(HYPER_VOICE), + EC_POKEMON2(HYPNO), + EC_MOVE(HYPNOSIS), +}; + +const u16 gEasyChatWordsByLetter_I[] = { + EC_WORD_I, + EC_WORD_I_AM, + EC_WORD_I_CHOOSE_YOU, + EC_WORD_I_WAS, + EC_WORD_I_VE, + EC_WORD_I_VE_ARRIVED, + EC_WORD_ICE, + EC_MOVE(ICE_BALL), + EC_MOVE2(ICE_BEAM), + EC_MOVE2(ICE_PUNCH), + EC_MOVE2(ICICLE_SPEAR), + EC_MOVE(ICY_WIND), + EC_WORD_IDOL, + EC_WORD_IF, + EC_WORD_IF_I_LOSE, + EC_WORD_IF_I_WIN, + -1, 2, // Doubled pokemon species name + EC_POKEMON(IGGLYBUFF), + EC_POKEMON2(IGGLYBUFF), + EC_WORD_IGNORANT, + EC_WORD_ILLUMINATE, + EC_POKEMON(ILLUMISE), + EC_WORD_IMMUNITY, + EC_WORD_IMPORTANT, + EC_WORD_IMPOSSIBLE, + EC_MOVE2(IMPRISON), + EC_WORD_IN, + EC_WORD_INCREASING, + EC_WORD_INCREDIBLE, + EC_WORD_INFORMATION, + EC_MOVE2(INGRAIN), + EC_WORD_INNER_FOCUS, + EC_WORD_INSIDE, + EC_WORD_INSOMNIA, + EC_WORD_INSTEAD, + EC_WORD_INTIMIDATE, + EC_WORD_INVINCIBLE, + EC_MOVE2(IRON_DEFENSE), + EC_MOVE(IRON_TAIL), + EC_WORD_IS, + EC_WORD_IS_IT_QUES, + EC_WORD_ISN_T, + EC_WORD_ISN_T_IT_QUES, + EC_WORD_IT, + EC_WORD_IT_S, + EC_WORD_ITEM, + EC_POKEMON2(IVYSAUR), +}; + +const u16 gEasyChatWordsByLetter_J[] = { + -1, 2, // Doubled pokemon species name + EC_POKEMON(JIGGLYPUFF), + EC_POKEMON2(JIGGLYPUFF), + EC_POKEMON(JIRACHI), + EC_WORD_JOKING, + EC_POKEMON2(JOLTEON), + EC_WORD_JOY, + EC_WORD_JUDGE, + EC_MOVE2(JUMP_KICK), + EC_POKEMON2(JUMPLUFF), + EC_WORD_JUST, + EC_POKEMON2(JYNX), +}; + +const u16 gEasyChatWordsByLetter_K[] = { + EC_POKEMON2(KABUTO), + EC_POKEMON2(KABUTOPS), + -1, 2, // Doubled pokemon species name + EC_POKEMON(KADABRA), + EC_POKEMON2(KADABRA), + EC_POKEMON2(KAKUNA), + EC_POKEMON2(KANGASKHAN), + EC_MOVE(KARATE_CHOP), + EC_POKEMON(KECLEON), + EC_WORD_KEEN_EYE, + EC_WORD_KID, + EC_WORD_KIDDING, + EC_WORD_KIND, + EC_WORD_KINDERGARTEN, + EC_MOVE(KINESIS), + -1, 2, // Doubled pokemon species name + EC_POKEMON(KINGDRA), + EC_POKEMON2(KINGDRA), + EC_POKEMON2(KINGLER), + EC_POKEMON(KIRLIA), + EC_MOVE2(KNOCK_OFF), + EC_WORD_KNOCKOUT, + EC_WORD_KNOW, + EC_WORD_KNOWS, + -1, 2, // Doubled pokemon species name + EC_POKEMON(KOFFING), + EC_POKEMON2(KOFFING), + EC_POKEMON2(KRABBY), + EC_WORD_KTHX_BYE, + EC_POKEMON(KYOGRE), +}; + +const u16 gEasyChatWordsByLetter_L[] = { + EC_WORD_LACKING, + EC_WORD_LACKS, + EC_WORD_LADY, + EC_POKEMON(LAIRON), + EC_WORD_LALALA, + -1, 2, // Doubled pokemon species name + EC_POKEMON(LANTURN), + EC_POKEMON2(LANTURN), + EC_POKEMON2(LAPRAS), + EC_POKEMON2(LARVITAR), + EC_WORD_LAST, + EC_WORD_LATE, + EC_WORD_LATER, + EC_POKEMON(LATIAS), + EC_POKEMON(LATIOS), + EC_WORD_LAVISH, + EC_WORD_LAY, + EC_WORD_LEADER, + EC_WORD_LEADERS, + EC_WORD_LEAF, + EC_MOVE2(LEAF_BLADE), + EC_WORD_LEARN, + EC_POKEMON2(LEDIAN), + EC_POKEMON2(LEDYBA), + EC_MOVE(LEECH_LIFE), + EC_MOVE2(LEECH_SEED), + EC_MOVE2(LEER), + EC_WORD_LEFT, + EC_WORD_LEGEND, + EC_WORD_LESS, + EC_WORD_LESSONS, + EC_WORD_LET_ME_WIN, + EC_WORD_LET_S, + EC_WORD_LETTER, + EC_WORD_LEVEL, + EC_WORD_LEVITATE, + EC_MOVE(LICK), + EC_POKEMON2(LICKITUNG), + EC_WORD_LIE, + EC_WORD_LIFE, + EC_MOVE2(LIGHT_SCREEN), + EC_WORD_LIGHTNINGROD, + EC_WORD_LIKE, + EC_WORD_LIKELY_TO, + EC_WORD_LIKES, + EC_POKEMON(LILEEP), + EC_WORD_LIMBER, + EC_WORD_LINK, + EC_POKEMON(LINOONE), + EC_WORD_LIQUID_OOZE, + EC_WORD_LISTEN, + EC_WORD_LISTENING, + EC_WORD_LISTENS, + EC_WORD_LIVING, + EC_MOVE2(LOCK_ON), + EC_WORD_LOCOMOTIVE, + EC_WORD_LOL, + EC_WORD_LOLLING, + EC_POKEMON(LOMBRE), + EC_WORD_LONESOME, + EC_WORD_LOOK, + EC_WORD_LOOKS, + EC_WORD_LOSE, + EC_WORD_LOSER, + EC_WORD_LOSING, + EC_WORD_LOSS, + EC_WORD_LOST, + EC_POKEMON(LOTAD), + EC_POKEMON(LOUDRED), + EC_WORD_LOUSY, + EC_MOVE(LOVELY_KISS), + EC_WORD_LOVEY_DOVEY, + EC_WORD_LOW, + EC_MOVE(LOW_KICK), + EC_WORD_LOWS, + EC_POKEMON(LUDICOLO), + EC_POKEMON2(LUGIA), + EC_WORD_LUKEWARM, + EC_POKEMON(LUNATONE), + EC_MOVE2(LUSTER_PURGE), + EC_POKEMON(LUVDISC), +}; + +const u16 gEasyChatWordsByLetter_M[] = { + EC_MOVE2(MACH_PUNCH), + -1, 2, // Doubled pokemon species name + EC_POKEMON(MACHAMP), + EC_POKEMON2(MACHAMP), + EC_WORD_MACHINE, + -1, 2, // Doubled pokemon species name + EC_POKEMON(MACHOKE), + EC_POKEMON2(MACHOKE), + -1, 2, // Doubled pokemon species name + EC_POKEMON(MACHOP), + EC_POKEMON2(MACHOP), + EC_WORD_MAGAZINE, + EC_POKEMON2(MAGBY), + -1, 2, // Doubled pokemon species name + EC_POKEMON(MAGCARGO), + EC_POKEMON2(MAGCARGO), + EC_MOVE2(MAGIC_COAT), + EC_MOVE2(MAGICAL_LEAF), + -1, 2, // Doubled pokemon species name + EC_POKEMON(MAGIKARP), + EC_POKEMON2(MAGIKARP), + EC_WORD_MAGMA_ARMOR, + EC_POKEMON2(MAGMAR), + -1, 2, // Doubled pokemon species name + EC_POKEMON(MAGNEMITE), + EC_POKEMON2(MAGNEMITE), + EC_WORD_MAGNET_PULL, + -1, 2, // Doubled pokemon species name + EC_POKEMON(MAGNETON), + EC_POKEMON2(MAGNETON), + EC_MOVE2(MAGNITUDE), + EC_WORD_MAIL, + EC_WORD_MAKE, + EC_WORD_MAKING, + EC_POKEMON(MAKUHITA), + EC_WORD_MAN, + EC_POKEMON(MANECTRIC), + EC_POKEMON2(MANKEY), + EC_POKEMON2(MANTINE), + EC_POKEMON2(MAREEP), + -1, 2, // Doubled pokemon species name + EC_POKEMON(MARILL), + EC_POKEMON2(MARILL), + EC_POKEMON2(MAROWAK), + EC_POKEMON(MARSHTOMP), + EC_WORD_MARVEL_SCALE, + EC_POKEMON(MASQUERAIN), + EC_WORD_MASTER, + EC_WORD_MATCH, + EC_WORD_MATCH_UP, + EC_POKEMON(MAWILE), + EC_WORD_MAYBE, + EC_WORD_MC, + EC_WORD_ME, + EC_WORD_MEAN, + EC_MOVE(MEAN_LOOK), + EC_POKEMON(MEDICHAM), + EC_MOVE2(MEDITATE), + EC_POKEMON(MEDITITE), + EC_WORD_MEET, + EC_WORD_MEET_YOU, + EC_WORD_MEETS, + EC_WORD_MEGA, + EC_MOVE2(MEGA_DRAIN), + EC_MOVE2(MEGA_KICK), + EC_MOVE2(MEGA_PUNCH), + EC_MOVE2(MEGAHORN), + EC_POKEMON2(MEGANIUM), + EC_MOVE(MEMENTO), + EC_POKEMON2(MEOWTH), + EC_WORD_MESSAGE, + EC_POKEMON(METAGROSS), + EC_MOVE2(METAL_CLAW), + EC_MOVE(METAL_SOUND), + EC_POKEMON(METANG), + EC_POKEMON2(METAPOD), + EC_MOVE(METEOR_MASH), + EC_MOVE2(METRONOME), + EC_POKEMON2(MEW), + EC_POKEMON2(MEWTWO), + EC_POKEMON(MIGHTYENA), + EC_MOVE2(MILK_DRINK), + EC_POKEMON(MILOTIC), + EC_POKEMON2(MILTANK), + EC_MOVE2(MIMIC), + EC_MOVE(MIND_READER), + EC_MOVE2(MINIMIZE), + EC_POKEMON(MINUN), + EC_WORD_MINUS, + EC_MOVE2(MIRROR_COAT), + EC_MOVE(MIRROR_MOVE), + EC_POKEMON2(MISDREAVUS), + EC_WORD_MISHEARD, + EC_WORD_MISS, + EC_MOVE(MIST), + EC_MOVE2(MIST_BALL), + EC_WORD_MISTAKE, + EC_WORD_MMM, + EC_WORD_MODE, + EC_WORD_MODERN, + EC_POKEMON2(MOLTRES), + EC_WORD_MOMENTUM, + EC_WORD_MONDAY, + EC_WORD_MONEY, + EC_WORD_MONTH, + EC_WORD_MOOD, + EC_MOVE2(MOONLIGHT), + EC_WORD_MORE, + EC_WORD_MORNING, + EC_MOVE(MORNING_SUN), + EC_WORD_MOTHER, + EC_WORD_MOVE, + EC_WORD_MOVIE, + EC_WORD_MR, + EC_POKEMON2(MR_MIME), + EC_WORD_MRS, + EC_WORD_MUCH, + EC_WORD_MUCH_OBLIGED, + EC_MOVE2(MUD_SHOT), + EC_MOVE2(MUD_SPORT), + EC_MOVE2(MUD_SLAP), + EC_MOVE2(MUDDY_WATER), + EC_POKEMON(MUDKIP), + EC_WORD_MUFUFU, + -1, 2, // Doubled pokemon species name + EC_POKEMON(MUK), + EC_POKEMON2(MUK), + EC_POKEMON2(MURKROW), + EC_WORD_MUSIC, + EC_WORD_MUST_BE, + EC_WORD_MY, + EC_WORD_MYSELF, + EC_WORD_MYSTERY, +}; + +const u16 gEasyChatWordsByLetter_N[] = { + EC_WORD_NAME, + EC_WORD_NAP, + -1, 2, // Doubled pokemon species name + EC_POKEMON(NATU), + EC_POKEMON2(NATU), + EC_WORD_NATURAL, + EC_WORD_NATURAL_CURE, + EC_WORD_NATURALLY, + EC_WORD_NATURE, + EC_MOVE(NATURE_POWER), + EC_WORD_NEAR, + EC_WORD_NEARLY, + EC_WORD_NEED, + EC_MOVE2(NEEDLE_ARM), + EC_WORD_NEGATIVE, + EC_WORD_NEVER, + EC_WORD_NEW, + EC_WORD_NEWS, + EC_WORD_NEXT, + EC_WORD_NICE, + EC_POKEMON2(NIDOKING), + EC_POKEMON2(NIDOQUEEN), + EC_POKEMON2(NIDORAN_F), + EC_POKEMON2(NIDORAN_M), + EC_POKEMON2(NIDORINA), + EC_POKEMON2(NIDORINO), + EC_WORD_NIGHT, + EC_MOVE2(NIGHT_SHADE), + EC_MOVE(NIGHTMARE), + EC_WORD_NIGHTTIME, + EC_POKEMON(NINCADA), + -1, 2, // Doubled pokemon species name + EC_POKEMON(NINETALES), + EC_POKEMON2(NINETALES), + EC_POKEMON(NINJASK), + EC_WORD_NITWIT, + EC_WORD_NO, + EC_WORD_NO_MATCH, + EC_WORD_NO_1, + EC_POKEMON2(NOCTOWL), + EC_WORD_NOISY, + EC_WORD_NON_STOP, + EC_WORD_NONE, + EC_WORD_NOPE, + EC_WORD_NORMAL, + EC_POKEMON(NOSEPASS), + EC_WORD_NOT, + EC_WORD_NOT_VERY, + EC_WORD_NOTHING, + EC_WORD_NOW, + EC_POKEMON(NUMEL), + EC_POKEMON(NUZLEAF), +}; + +const u16 gEasyChatWordsByLetter_O[] = { + EC_WORD_OBLIVIOUS, + EC_MOVE(OCTAZOOKA), + EC_POKEMON2(OCTILLERY), + -1, 2, // Doubled pokemon species name + EC_POKEMON(ODDISH), + EC_POKEMON2(ODDISH), + EC_MOVE(ODOR_SLEUTH), + EC_WORD_OF, + EC_WORD_OFF, + EC_WORD_OFFENSIVE, + EC_WORD_OH, + EC_WORD_OH_DEAR, + EC_WORD_OH_YEAH, + EC_WORD_OH_KAY, + EC_WORD_OH_QUES, + EC_WORD_OI, + EC_WORD_OI_OI_OI, + EC_WORD_OK_QUES, + EC_WORD_OKAY, + EC_WORD_OLD, + EC_WORD_OLDEN, + EC_POKEMON2(OMANYTE), + EC_POKEMON2(OMASTAR), + EC_WORD_ON, + EC_WORD_ONCE, + EC_POKEMON2(ONIX), + EC_WORD_ONLY, + EC_WORD_OOPS, + EC_WORD_OPPONENT, + EC_WORD_OPPOSITE, + EC_WORD_OR, + EC_WORD_OTHER, + EC_WORD_OUR, + EC_WORD_OUT, + EC_MOVE(OUTRAGE), + EC_WORD_OUTSIDE, + EC_WORD_OVER, + EC_WORD_OVERDO, + EC_WORD_OVERGROW, + EC_MOVE(OVERHEAT), + EC_WORD_OVERWHELMING, + EC_WORD_OWN, + EC_WORD_OWN_TEMPO, +}; + +const u16 gEasyChatWordsByLetter_P[] = { + EC_MOVE(PAIN_SPLIT), + EC_POKEMON2(PARAS), + EC_POKEMON2(PARASECT), + EC_WORD_PARDON, + EC_WORD_PARENT, + EC_WORD_PARTNER, + EC_WORD_PARTY, + EC_WORD_PATTERN, + EC_MOVE2(PAY_DAY), + EC_WORD_PC, + EC_MOVE2(PECK), + EC_POKEMON(PELIPPER), + EC_WORD_PERFECT, + EC_WORD_PERFECTION, + EC_MOVE2(PERISH_SONG), + EC_POKEMON2(PERSIAN), + EC_WORD_PERSON, + EC_MOVE2(PETAL_DANCE), + -1, 2, // Doubled pokemon species name + EC_POKEMON(PHANPY), + EC_POKEMON2(PHANPY), + EC_WORD_PHONE, + -1, 2, // Doubled pokemon species name + EC_POKEMON(PICHU), + EC_POKEMON2(PICHU), + EC_WORD_PICKUP, + EC_POKEMON2(PIDGEOT), + EC_POKEMON2(PIDGEOTTO), + EC_POKEMON2(PIDGEY), + -1, 2, // Doubled pokemon species name + EC_POKEMON(PIKACHU), + EC_POKEMON2(PIKACHU), + EC_POKEMON2(PILOSWINE), + EC_MOVE2(PIN_MISSILE), + EC_POKEMON2(PINECO), + -1, 2, // Doubled pokemon species name + EC_POKEMON(PINSIR), + EC_POKEMON2(PINSIR), + EC_WORD_PKRS, + EC_WORD_PLACE, + EC_WORD_PLANS, + EC_WORD_PLAY, + EC_WORD_PLAYED, + EC_WORD_PLAYS, + EC_WORD_PLEASE, + EC_WORD_PLUS, + EC_WORD_PLUSH_DOLL, + EC_POKEMON(PLUSLE), + EC_WORD_POINTS, + EC_WORD_POISON, + EC_MOVE2(POISON_FANG), + EC_MOVE2(POISON_GAS), + EC_WORD_POISON_POINT, + EC_MOVE2(POISON_STING), + EC_MOVE2(POISON_TAIL), + EC_MOVE2(POISON_POWDER), + EC_WORD_POKEBLOCK, + EC_WORD_POKEDEX, + EC_WORD_POKEMON, + EC_WORD_POKENAV, + EC_POKEMON2(POLITOED), + EC_POKEMON2(POLIWAG), + EC_POKEMON2(POLIWHIRL), + EC_POKEMON2(POLIWRATH), + EC_POKEMON2(PONYTA), + EC_POKEMON(POOCHYENA), + EC_WORD_POPULAR, + EC_POKEMON2(PORYGON), + EC_POKEMON2(PORYGON2), + EC_MOVE2(POUND), + EC_MOVE(POWDER_SNOW), + EC_WORD_POWER, + EC_WORD_PRAISE, + EC_WORD_PREPOSTEROUS, + EC_MOVE2(PRESENT), + EC_WORD_PRESSURE, + EC_WORD_PRETEND, + EC_WORD_PRETTY, + EC_POKEMON2(PRIMEAPE), + EC_WORD_PROBABLY, + EC_WORD_PROMISE, + EC_MOVE2(PROTECT), + EC_MOVE(PSYBEAM), + EC_MOVE(PSYCH_UP), + -1, 2, // Doubled pokemon species name + EC_WORD_PSYCHIC, + EC_MOVE(PSYCHIC), + EC_MOVE(PSYCHO_BOOST), + -1, 2, // Doubled pokemon species name + EC_POKEMON(PSYDUCK), + EC_POKEMON2(PSYDUCK), + EC_MOVE(PSYWAVE), + EC_POKEMON2(PUPITAR), + EC_WORD_PURE_POWER, + EC_MOVE(PURSUIT), + EC_WORD_PUSHOVER, +}; + +const u16 gEasyChatWordsByLetter_Q[] = { + EC_POKEMON2(QUAGSIRE), + EC_WORD_QUESTION, + EC_MOVE2(QUICK_ATTACK), + EC_POKEMON2(QUILAVA), + EC_WORD_QUITE, + EC_POKEMON2(QWILFISH), +}; + +const u16 gEasyChatWordsByLetter_R[] = { + EC_WORD_RADIO, + EC_MOVE(RAGE), + -1, 2, // Doubled pokemon species name + EC_POKEMON(RAICHU), + EC_POKEMON2(RAICHU), + EC_POKEMON2(RAIKOU), + EC_MOVE(RAIN_DANCE), + EC_WORD_RAIN_DISH, + EC_POKEMON(RALTS), + EC_WORD_RANK, + EC_MOVE(RAPID_SPIN), + EC_POKEMON2(RAPIDASH), + EC_WORD_RARE, + EC_WORD_RATHER, + EC_POKEMON2(RATICATE), + EC_POKEMON2(RATTATA), + EC_POKEMON(RAYQUAZA), + EC_MOVE2(RAZOR_LEAF), + EC_MOVE(RAZOR_WIND), + EC_WORD_READY, + EC_WORD_REALLY, + EC_WORD_REAR, + EC_WORD_RECEIVED, + EC_WORD_RECOMMEND, + EC_MOVE(RECOVER), + EC_MOVE2(RECYCLE), + EC_WORD_RED, + EC_MOVE2(REFLECT), + EC_MOVE2(REFRESH), + EC_WORD_REFRESHING, + EC_WORD_REFUSE, + EC_POKEMON(REGICE), + EC_POKEMON(REGIROCK), + EC_POKEMON(REGISTEEL), + EC_WORD_REJECT, + EC_WORD_RELEASE, + EC_POKEMON(RELICANTH), + EC_POKEMON2(REMORAID), + EC_WORD_RENTAL, + EC_MOVE2(REST), + EC_WORD_RESUSCITATE, + EC_MOVE(RETURN), + EC_MOVE2(REVENGE), + EC_MOVE(REVERSAL), + -1, 2, // Doubled pokemon species name + EC_POKEMON(RHYDON), + EC_POKEMON2(RHYDON), + -1, 2, // Doubled pokemon species name + EC_POKEMON(RHYHORN), + EC_POKEMON2(RHYHORN), + EC_WORD_RIBBON, + EC_WORD_RICKETY, + EC_WORD_RIGHT, + EC_WORD_RIPPED, + EC_WORD_RIVAL, + EC_MOVE2(ROAR), + EC_WORD_ROCK, + EC_MOVE2(ROCK_BLAST), + EC_WORD_ROCK_HEAD, + EC_MOVE(ROCK_SLIDE), + EC_MOVE(ROCK_SMASH), + EC_MOVE(ROCK_THROW), + EC_MOVE(ROCK_TOMB), + EC_WORD_ROCK_SOLID, + EC_MOVE2(ROLE_PLAY), + EC_MOVE2(ROLLING_KICK), + EC_MOVE(ROLLOUT), + EC_WORD_ROMANTIC, + EC_WORD_ROOM, + EC_POKEMON(ROSELIA), + EC_WORD_ROUGH_SKIN, + EC_WORD_RPG, + EC_WORD_RUBY, + EC_WORD_RULE, + EC_WORD_RUN, + EC_WORD_RUN_AWAY, + EC_WORD_RUNS, +}; + +const u16 gEasyChatWordsByLetter_S[] = { + EC_POKEMON(SABLEYE), + EC_MOVE(SACRED_FIRE), + EC_WORD_SAD, + EC_WORD_SADLY, + EC_MOVE(SAFEGUARD), + EC_WORD_SAID, + EC_POKEMON(SALAMENCE), + EC_WORD_SAND_STREAM, + EC_MOVE(SAND_TOMB), + EC_WORD_SAND_VEIL, + EC_MOVE(SAND_ATTACK), + -1, 2, // Doubled pokemon species name + EC_POKEMON(SANDSHREW), + EC_POKEMON2(SANDSHREW), + -1, 2, // Doubled pokemon species name + EC_POKEMON(SANDSLASH), + EC_POKEMON2(SANDSLASH), + EC_MOVE(SANDSTORM), + EC_WORD_SAPPHIRE, + EC_WORD_SATISFIED, + EC_WORD_SATURDAY, + EC_WORD_SAYS, + EC_WORD_SCARY, + EC_MOVE(SCARY_FACE), + EC_WORD_SCATTER, + EC_POKEMON(SCEPTILE), + EC_WORD_SCHOOL, + EC_POKEMON2(SCIZOR), + EC_MOVE2(SCRATCH), + EC_MOVE(SCREECH), + EC_POKEMON2(SCYTHER), + -1, 2, // Doubled pokemon species name + EC_POKEMON(SEADRA), + EC_POKEMON2(SEADRA), + -1, 2, // Doubled pokemon species name + EC_POKEMON(SEAKING), + EC_POKEMON2(SEAKING), + EC_POKEMON(SEALEO), + EC_WORD_SEARCH, + EC_WORD_SECRET, + EC_WORD_SECRET_BASE, + EC_MOVE2(SECRET_POWER), + EC_WORD_SEE, + EC_WORD_SEE_YA, + EC_POKEMON(SEEDOT), + EC_WORD_SEEK, + EC_POKEMON2(SEEL), + EC_WORD_SEEMS, + EC_WORD_SEES, + EC_MOVE2(SEISMIC_TOSS), + EC_MOVE(SELF_DESTRUCT), + EC_WORD_SENSE, + EC_POKEMON2(SENTRET), + EC_WORD_SERENE_GRACE, + EC_WORD_SERIOUS, + EC_WORD_SERIOUSLY, + EC_WORD_SERVICE, + EC_POKEMON(SEVIPER), + EC_MOVE(SHADOW_BALL), + EC_MOVE(SHADOW_PUNCH), + EC_WORD_SHADOW_TAG, + EC_WORD_SHADY, + EC_WORD_SHAKE, + EC_WORD_SHAKY, + EC_WORD_SHALLOW, + EC_POKEMON(SHARPEDO), + EC_MOVE(SHARPEN), + EC_WORD_SHE, + EC_WORD_SHE_IS, + EC_WORD_SHE_WAS, + EC_WORD_SHED_SKIN, + EC_POKEMON(SHEDINJA), + EC_MOVE(SHEER_COLD), + EC_POKEMON(SHELGON), + EC_WORD_SHELL_ARMOR, + EC_POKEMON2(SHELLDER), + EC_WORD_SHIELD_DUST, + EC_POKEMON(SHIFTRY), + EC_WORD_SHINE, + EC_MOVE2(SHOCK_WAVE), + EC_WORD_SHOCKED, + EC_WORD_SHOPPING, + EC_WORD_SHOULD, + EC_WORD_SHOW, + EC_WORD_SHREDDED, + EC_POKEMON(SHROOMISH), + EC_POKEMON2(SHUCKLE), + EC_POKEMON(SHUPPET), + EC_WORD_SIBLINGS, + EC_WORD_SIGH, + EC_MOVE(SIGNAL_BEAM), + EC_POKEMON(SILCOON), + EC_WORD_SILKY, + EC_WORD_SILVER, + EC_MOVE(SILVER_WIND), + EC_WORD_SIMPLE, + EC_WORD_SINCE, + EC_MOVE(SING), + EC_WORD_SINK, + EC_WORD_SISTER, + -1, 2, // Doubled pokemon species name + EC_POKEMON(SKARMORY), + EC_POKEMON2(SKARMORY), + EC_MOVE(SKETCH), + EC_WORD_SKILL, + EC_MOVE(SKILL_SWAP), + EC_WORD_SKILLED, + EC_POKEMON2(SKIPLOOM), + EC_POKEMON(SKITTY), + EC_MOVE2(SKULL_BASH), + EC_MOVE(SKY_ATTACK), + EC_MOVE(SKY_UPPERCUT), + EC_MOVE2(SLACK_OFF), + EC_POKEMON(SLAKING), + EC_POKEMON(SLAKOTH), + EC_MOVE2(SLAM), + EC_MOVE(SLASH), + EC_WORD_SLEEP, + EC_MOVE2(SLEEP_POWDER), + EC_MOVE2(SLEEP_TALK), + EC_WORD_SLEPT, + EC_WORD_SLIDE, + EC_WORD_SLIMY, + EC_POKEMON2(SLOWBRO), + EC_POKEMON2(SLOWKING), + EC_POKEMON2(SLOWPOKE), + EC_MOVE2(SLUDGE), + EC_MOVE2(SLUDGE_BOMB), + -1, 2, // Doubled pokemon species name + EC_POKEMON(SLUGMA), + EC_POKEMON2(SLUGMA), + EC_WORD_SMACK, + EC_WORD_SMALL, + EC_WORD_SMART, + EC_WORD_SMARTNESS, + EC_POKEMON2(SMEARGLE), + EC_WORD_SMELL, + EC_WORD_SMELL_YA, + EC_MOVE(SMELLING_SALT), + EC_WORD_SMITE, + EC_MOVE(SMOG), + EC_MOVE(SMOKESCREEN), + EC_POKEMON2(SMOOCHUM), + EC_WORD_SMOOTH, + EC_MOVE2(SNATCH), + EC_POKEMON2(SNEASEL), + EC_MOVE(SNORE), + EC_POKEMON2(SNORLAX), + EC_WORD_SNORT, + EC_POKEMON(SNORUNT), + EC_POKEMON2(SNUBBULL), + EC_WORD_SO, + EC_MOVE2(SOFT_BOILED), + EC_WORD_SOFTWARE, + EC_MOVE(SOLAR_BEAM), + EC_POKEMON(SOLROCK), + EC_WORD_SOME, + EC_WORD_SOMEHOW, + EC_WORD_SOMEONE, + EC_WORD_SOMETHING, + EC_WORD_SOMETIME, + EC_WORD_SON, + EC_WORD_SONG, + EC_WORD_SONGS, + EC_MOVE(SONIC_BOOM), + EC_WORD_SOON, + EC_WORD_SORRY, + EC_WORD_SOUNDPROOF, + EC_WORD_SP_ABILITY, + EC_MOVE(SPARK), + EC_POKEMON2(SPEAROW), + EC_WORD_SPECTATOR, + EC_WORD_SPEED_BOOST, + EC_POKEMON(SPHEAL), + EC_MOVE(SPIDER_WEB), + EC_MOVE2(SPIKE_CANNON), + EC_MOVE2(SPIKES), + EC_POKEMON2(SPINARAK), + EC_POKEMON(SPINDA), + EC_WORD_SPIRALING, + EC_WORD_SPIRIT, + EC_MOVE2(SPIT_UP), + EC_MOVE(SPITE), + EC_MOVE2(SPLASH), + EC_POKEMON(SPOINK), + EC_MOVE(SPORE), + EC_WORD_SPORTS, + EC_WORD_SPRING, + EC_POKEMON2(SQUIRTLE), + EC_WORD_STAGE, + EC_POKEMON2(STANTLER), + -1, 2, // Doubled pokemon species name + EC_POKEMON(STARMIE), + EC_POKEMON2(STARMIE), + EC_WORD_START, + -1, 2, // Doubled pokemon species name + EC_POKEMON(STARYU), + EC_POKEMON2(STARYU), + EC_WORD_STATIC, + EC_WORD_STAY_AT_HOME, + EC_WORD_STEEL, + EC_MOVE2(STEEL_WING), + EC_POKEMON2(STEELIX), + EC_WORD_STENCH, + EC_WORD_STICKY_HOLD, + EC_MOVE2(STOCKPILE), + EC_MOVE2(STOMP), + EC_WORD_STOP, + EC_WORD_STORE, + EC_WORD_STORES, + EC_WORD_STORY, + EC_WORD_STRATEGY, + EC_MOVE(STRENGTH), + EC_MOVE(STRING_SHOT), + EC_WORD_STRONG, + EC_MOVE2(STRUGGLE), + EC_WORD_STUDY, + EC_MOVE(STUN_SPORE), + EC_WORD_STURDY, + EC_MOVE(SUBMISSION), + EC_MOVE2(SUBSTITUTE), + EC_WORD_SUCTION_CUPS, + EC_POKEMON2(SUDOWOODO), + EC_POKEMON2(SUICUNE), + EC_WORD_SUMMER, + EC_WORD_SUNDAY, + EC_POKEMON2(SUNFLORA), + EC_POKEMON2(SUNKERN), + EC_MOVE2(SUNNY_DAY), + EC_WORD_SUPER, + EC_MOVE(SUPER_FANG), + EC_MOVE2(SUPERPOWER), + EC_MOVE2(SUPERSONIC), + EC_MOVE2(SURF), + EC_WORD_SURPRISE, + EC_WORD_SURRENDER, + EC_POKEMON(SURSKIT), + EC_POKEMON(SWABLU), + EC_MOVE(SWAGGER), + EC_MOVE2(SWALLOW), + EC_POKEMON(SWALOT), + EC_POKEMON(SWAMPERT), + EC_WORD_SWARM, + EC_MOVE2(SWEET_KISS), + EC_MOVE(SWEET_SCENT), + EC_WORD_SWEETS, + EC_POKEMON(SWELLOW), + EC_MOVE(SWIFT), + EC_WORD_SWIFT_SWIM, + EC_POKEMON2(SWINUB), + EC_MOVE2(SWORDS_DANCE), + EC_WORD_SYNCHRONIZE, + EC_MOVE(SYNTHESIS), + EC_WORD_SYSTEM, +}; + +const u16 gEasyChatWordsByLetter_T[] = { + EC_MOVE2(TACKLE), + EC_MOVE2(TAIL_GLOW), + EC_MOVE(TAIL_WHIP), + EC_POKEMON(TAILLOW), + EC_WORD_TAKE, + EC_MOVE2(TAKE_DOWN), + EC_WORD_TAKE_THAT, + EC_WORD_TALENT, + EC_WORD_TALK, + EC_WORD_TALKING, + EC_POKEMON2(TANGELA), + EC_WORD_TASTY, + EC_MOVE2(TAUNT), + EC_POKEMON2(TAUROS), + EC_WORD_TCH, + EC_WORD_TEACH, + EC_WORD_TEACHER, + EC_WORD_TEACHES, + EC_POKEMON2(TEDDIURSA), + EC_MOVE2(TEETER_DANCE), + EC_MOVE2(TELEPORT), + EC_WORD_TELEVISION, + -1, 2, // Doubled pokemon species name + EC_POKEMON(TENTACOOL), + EC_POKEMON2(TENTACOOL), + -1, 2, // Doubled pokemon species name + EC_POKEMON(TENTACRUEL), + EC_POKEMON2(TENTACRUEL), + EC_WORD_TERRIBLE, + EC_WORD_TEST, + EC_WORD_THAN, + EC_WORD_THANK_YOU, + EC_WORD_THANKS, + EC_WORD_THAT, + EC_WORD_THAT_WAS, + EC_WORD_THAT_S, + EC_WORD_THAT_S_IT_EXCL, + EC_WORD_THE, + EC_WORD_THEIR, + EC_WORD_THERE, + EC_WORD_THESE, + EC_WORD_THESE_WERE, + EC_WORD_THEY, + EC_WORD_THEY_WERE, + EC_WORD_THEY_RE, + EC_WORD_THEY_VE, + EC_WORD_THICK, + EC_WORD_THICK_FAT, + EC_MOVE2(THIEF), + EC_WORD_THIN, + EC_WORD_THING, + EC_WORD_THINGS, + EC_WORD_THINK, + EC_WORD_THINKS, + EC_WORD_THIRSTY, + EC_WORD_THIS, + EC_WORD_THIS_IS_IT_EXCL, + EC_WORD_THOSE, + EC_WORD_THOSE_ARE, + EC_WORD_THOSE_WERE, + EC_MOVE(THRASH), + EC_WORD_THROW, + EC_MOVE(THUNDER), + EC_MOVE2(THUNDER_WAVE), + EC_MOVE(THUNDERBOLT), + EC_MOVE(THUNDER_PUNCH), + EC_MOVE2(THUNDER_SHOCK), + EC_WORD_THURSDAY, + EC_MOVE(TICKLE), + EC_WORD_TICKLISH, + EC_WORD_TIGHT, + EC_WORD_TIME, + EC_WORD_TIMES, + EC_WORD_TIRED, + EC_WORD_TO, + EC_WORD_TO_HER, + EC_WORD_TO_ME, + EC_WORD_TO_THEM, + EC_WORD_TO_US, + EC_WORD_TO_WHOM, + EC_WORD_TODAY, + EC_POKEMON2(TOGEPI), + EC_WORD_TOGETHER, + EC_POKEMON2(TOGETIC), + EC_WORD_TOMORROW, + EC_WORD_TOO, + EC_WORD_TOO_LATE, + EC_WORD_TOO_STRONG, + EC_WORD_TOO_WEAK, + EC_WORD_TOP, + EC_POKEMON(TORCHIC), + EC_POKEMON(TORKOAL), + EC_MOVE(TORMENT), + EC_WORD_TORRENT, + EC_WORD_TOTALLY, + EC_POKEMON2(TOTODILE), + EC_WORD_TOUGH, + EC_WORD_TOUGHNESS, + EC_WORD_TOURNAMENT, + EC_WORD_TOWER, + EC_MOVE2(TOXIC), + EC_WORD_TOYS, + EC_WORD_TRACE, + EC_WORD_TRADE, + EC_WORD_TRAIN, + EC_WORD_TRAINER, + EC_WORD_TRAINS, + EC_MOVE2(TRANSFORM), + EC_POKEMON(TRAPINCH), + EC_WORD_TRAVEL, + EC_WORD_TREASURE, + EC_POKEMON(TREECKO), + EC_WORD_TRENDY, + EC_MOVE2(TRI_ATTACK), + EC_MOVE2(TRICK), + EC_WORD_TRIES, + EC_MOVE2(TRIPLE_KICK), + EC_POKEMON(TROPIUS), + EC_WORD_TRUANT, + EC_WORD_TRULY, + EC_WORD_TRUMP_CARD, + EC_WORD_TRUST, + EC_WORD_TRY, + EC_WORD_TUESDAY, + EC_MOVE2(TWINEEDLE), + EC_WORD_TWIRLING, + EC_MOVE2(TWISTER), + EC_WORD_TYPE, + EC_POKEMON2(TYPHLOSION), + EC_POKEMON2(TYRANITAR), + EC_POKEMON2(TYROGUE), +}; + +const u16 gEasyChatWordsByLetter_U[] = { + EC_WORD_UGLY, + EC_WORD_UH_HUH, + EC_WORD_UH_OH, + EC_WORD_UM, + EC_POKEMON2(UMBREON), + EC_WORD_UNAVOIDABLE, + EC_WORD_UNBELIEVABLE, + EC_WORD_UNCLE, + EC_WORD_UNDERSTAND, + EC_WORD_UNDERSTANDS, + EC_WORD_UNDERSTOOD, + EC_WORD_UNION, + EC_POKEMON2(UNOWN), + EC_WORD_UNTIL, + EC_WORD_UP, + EC_WORD_UPBEAT, + EC_MOVE(UPROAR), + EC_WORD_UPSIDE_DOWN, + EC_WORD_URGH, + EC_POKEMON2(URSARING), + EC_WORD_USE, + EC_WORD_USELESS, + EC_WORD_USES, + EC_WORD_USING, +}; + +const u16 gEasyChatWordsByLetter_V[] = { + EC_WORD_VACATION, + EC_POKEMON2(VAPOREON), + EC_POKEMON2(VENOMOTH), + EC_POKEMON2(VENONAT), + EC_POKEMON2(VENUSAUR), + EC_WORD_VERSION, + EC_WORD_VERSUS, + EC_WORD_VERY, + EC_POKEMON(VIBRAVA), + EC_MOVE2(VICE_GRIP), + EC_WORD_VICTORY, + EC_POKEMON2(VICTREEBEL), + EC_WORD_VIEWING, + EC_POKEMON(VIGOROTH), + -1, 2, // Doubled pokemon species name + EC_POKEMON(VILEPLUME), + EC_POKEMON2(VILEPLUME), + EC_MOVE2(VINE_WHIP), + EC_WORD_VITAL_SPIRIT, + EC_MOVE(VITAL_THROW), + EC_POKEMON(VOLBEAT), + EC_WORD_VOLT_ABSORB, + EC_MOVE2(VOLT_TACKLE), + -1, 2, // Doubled pokemon species name + EC_POKEMON(VOLTORB), + EC_POKEMON2(VOLTORB), + EC_WORD_VORACIOUS, + -1, 2, // Doubled pokemon species name + EC_POKEMON(VULPIX), + EC_POKEMON2(VULPIX), +}; + +const u16 gEasyChatWordsByLetter_W[] = { + EC_WORD_WAAAH, + EC_WORD_WAHAHAHA, + EC_POKEMON(WAILMER), + EC_POKEMON(WAILORD), + EC_WORD_WAIT, + EC_WORD_WAKE_UP, + EC_WORD_WAKES_UP, + EC_WORD_WALK, + EC_WORD_WALKING, + EC_WORD_WALKS, + EC_POKEMON(WALREIN), + EC_WORD_WANDERING, + EC_WORD_WANNABE, + EC_WORD_WANT, + EC_WORD_WANTS, + EC_POKEMON2(WARTORTLE), + EC_WORD_WAS, + EC_WORD_WASN_T, + EC_WORD_WATER, + EC_WORD_WATER_ABSORB, + EC_MOVE2(WATER_GUN), + EC_MOVE2(WATER_PULSE), + EC_MOVE2(WATER_SPORT), + EC_MOVE(WATER_SPOUT), + EC_WORD_WATER_VEIL, + EC_MOVE2(WATERFALL), + EC_WORD_WAY, + EC_WORD_WE, + EC_WORD_WE_RE, + EC_WORD_WE_VE, + EC_WORD_WEAK, + EC_WORD_WEAKENED, + EC_MOVE(WEATHER_BALL), + EC_WORD_WEDNESDAY, + EC_POKEMON2(WEEDLE), + EC_WORD_WEEK, + EC_POKEMON2(WEEPINBELL), + -1, 2, // Doubled pokemon species name + EC_POKEMON(WEEZING), + EC_POKEMON2(WEEZING), + EC_WORD_WEIRD, + EC_WORD_WELCOME, + EC_WORD_WELL, + EC_WORD_WELL_THEN, + EC_WORD_WENT, + EC_WORD_WERE, + EC_WORD_WEREN_T, + EC_WORD_WHAT, + EC_WORD_WHAT_S_UP_QUES, + EC_WORD_WHEN, + EC_WORD_WHEN_I_WIN, + EC_WORD_WHERE, + EC_WORD_WHICH, + EC_WORD_WHILE, + EC_MOVE(WHIRLPOOL), + EC_MOVE2(WHIRLWIND), + EC_POKEMON(WHISCASH), + EC_POKEMON(WHISMUR), + EC_WORD_WHITE_SMOKE, + EC_WORD_WHO, + EC_WORD_WHO_IS, + EC_WORD_WHO_WAS, + EC_WORD_WHOAH, + EC_WORD_WHOM, + EC_WORD_WHOSE, + EC_WORD_WHY, + -1, 2, // Doubled pokemon species name + EC_POKEMON(WIGGLYTUFF), + EC_POKEMON2(WIGGLYTUFF), + EC_WORD_WILD, + EC_WORD_WILL, + EC_WORD_WILL_BE_HERE, + EC_MOVE(WILL_O_WISP), + EC_WORD_WIMPY, + EC_WORD_WIN, + EC_MOVE2(WING_ATTACK), + EC_POKEMON(WINGULL), + EC_WORD_WINNER, + EC_WORD_WINS, + EC_WORD_WINTER, + EC_WORD_WIRELESS, + EC_MOVE2(WISH), + EC_WORD_WITH, + EC_MOVE(WITHDRAW), + EC_WORD_WITHOUT, + EC_WORD_WOBBLY, + -1, 2, // Doubled pokemon species name + EC_POKEMON(WOBBUFFET), + EC_POKEMON2(WOBBUFFET), + EC_WORD_WOMAN, + EC_WORD_WON, + EC_WORD_WON_T, + EC_WORD_WONDER, + EC_WORD_WONDER_GUARD, + EC_POKEMON2(WOOPER), + EC_WORD_WORD, + EC_WORD_WORK, + EC_WORD_WORKING, + EC_WORD_WORKS, + EC_WORD_WORLD, + EC_WORD_WORRY, + EC_WORD_WOULD, + EC_WORD_WOW, + EC_WORD_WOWEE, + EC_MOVE2(WRAP), + EC_WORD_WROOOAAR_EXCL, + EC_POKEMON(WURMPLE), + EC_POKEMON(WYNAUT), +}; + +const u16 gEasyChatWordsByLetter_X[] = { + -1, 2, // Doubled pokemon species name + EC_POKEMON(XATU), + EC_POKEMON2(XATU), +}; + +const u16 gEasyChatWordsByLetter_Y[] = { + EC_WORD_YAHOO, + EC_POKEMON2(YANMA), + EC_MOVE(YAWN), + EC_WORD_YAY, + EC_WORD_YEAH, + EC_WORD_YEAH_YEAH, + EC_WORD_YEEHAW_EXCL, + EC_WORD_YES, + EC_WORD_YES_SIR_EXCL, + EC_WORD_YESTERDAY, + EC_WORD_YET, + EC_WORD_YO, + EC_WORD_YOU, + EC_WORD_YOU_RE, + EC_WORD_YOU_VE, + EC_WORD_YOUNG, + EC_WORD_YOUR, + EC_WORD_YOURS, + EC_WORD_YUP, +}; + +const u16 gEasyChatWordsByLetter_Z[] = { + EC_POKEMON(ZANGOOSE), + EC_MOVE2(ZAP_CANNON), + EC_POKEMON2(ZAPDOS), + EC_POKEMON(ZIGZAGOON), + -1, 2, // Doubled pokemon species name + EC_POKEMON(ZUBAT), + EC_POKEMON2(ZUBAT), +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseHi[] = { + EC_POKEMON2(CLEFFA), + EC_WORD_AIYEEH, + EC_POKEMON2(WEEDLE), + EC_WORD_HERO, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(PIKACHU), + EC_POKEMON(PIKACHU), + EC_MOVE2(LIGHT_SCREEN), + EC_WORD_SHINE, + EC_WORD_LOW, + EC_POKEMON2(CLEFABLE), + EC_WORD_FLYING, + EC_POKEMON2(PIDGEOT), + EC_POKEMON2(PIDGEOTTO), + EC_WORD_LEFT, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(PICHU), + EC_POKEMON(PICHU), + EC_MOVE2(SCRATCH), + EC_WORD_SURPRISE, + EC_MOVE2(HYPER_FANG), + EC_POKEMON2(CLEFAIRY), + EC_WORD_DROUGHT, + EC_WORD_HIDDEN, + EC_WORD_PERSON, + EC_WORD_AWFUL, + EC_POKEMON2(CHARMANDER), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(STARYU), + EC_POKEMON(STARYU), + EC_WORD_ALONE, + EC_POKEMON2(CYNDAQUIL), + EC_MOVE2(EMBER), + EC_POKEMON(VIBRAVA), + EC_WORD_BORED, + EC_POKEMON2(SUNKERN), + EC_WORD_SECRET, + EC_WORD_SECRET_BASE, + EC_MOVE2(SECRET_POWER), + EC_POKEMON2(TEDDIURSA), + EC_WORD_HIYAH, + EC_MOVE2(DIZZY_PUNCH), + EC_WORD_LIGHTNINGROD, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(VOLTORB), + EC_POKEMON(VOLTORB), + EC_WORD_DAYTIME, + EC_MOVE2(BULK_UP), + EC_WORD_NAP, + EC_WORD_HEROINE, + EC_POKEMON(FEEBAS), +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseFu[] = { + EC_WORD_FIGHT, + EC_POKEMON2(MOLTRES), + EC_WORD_FASHION, + EC_WORD_FEAR, + EC_WORD_FEVER, + EC_MOVE2(IMPRISON), + EC_POKEMON2(FLAREON), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(ALAKAZAM), + EC_POKEMON(ALAKAZAM), + EC_POKEMON2(MAGMAR), + EC_POKEMON(GRUMPIG), + EC_MOVE2(FEATHER_DANCE), + EC_POKEMON2(FORRETRESS), + EC_MOVE2(WHIRLWIND), + EC_WORD_COMPOUNDEYES, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(WIGGLYTUFF), + EC_POKEMON(WIGGLYTUFF), + EC_MOVE2(BEAT_UP), + EC_WORD_MYSTERY, + EC_POKEMON2(IVYSAUR), + EC_POKEMON2(BULBASAUR), + EC_WORD_MARVEL_SCALE, + EC_WORD_WONDER_GUARD, + EC_POKEMON2(VENUSAUR), + EC_WORD_LACKS, + EC_WORD_RESUSCITATE, + EC_WORD_SMACK, + EC_WORD_FUFUFU, + EC_POKEMON2(AERODACTYL), + EC_WORD_WIMPY, + EC_POKEMON2(MAGBY), + EC_WORD_LOL, + EC_MOVE2(BLIZZARD), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(IGGLYBUFF), + EC_POKEMON(IGGLYBUFF), + EC_WORD_SNORT, + EC_MOVE2(STOMP), + EC_WORD_INSOMNIA, + EC_WORD_WINTER, + EC_WORD_LEVITATE, + EC_POKEMON(FLYGON), + EC_WORD_PLUS, + EC_MOVE2(BLAST_BURN), + EC_POKEMON(PLUSLE), + EC_POKEMON2(UMBREON), + EC_MOVE2(FLASH), + EC_WORD_WOBBLY, + EC_MOVE2(TEETER_DANCE), + EC_WORD_PRETEND, + EC_POKEMON2(ARTICUNO), + EC_WORD_WANNABE, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(JIGGLYPUFF), + EC_POKEMON(JIGGLYPUFF), + EC_POKEMON2(SNUBBULL), + EC_WORD_SHAKY, + EC_MOVE2(CRUSH_CLAW), + EC_MOVE2(BLAZE_KICK), + EC_MOVE2(PRESENT), + EC_WORD_PRESSURE, + EC_WORD_BLEND, + EC_WORD_FRONTIER, + EC_WORD_HUMPH, + EC_MOVE2(ERUPTION), +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseHe[] = { + EC_WORD_HEY, + EC_POKEMON(CORPHISH), + EC_WORD_BABY, + EC_POKEMON2(BAYLEEF), + EC_WORD_BEST, + EC_WORD_LOUSY, + EC_WORD_HEHEHE, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(GRIMER), + EC_POKEMON(GRIMER), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(MUK), + EC_POKEMON(MUK), + EC_WORD_LIQUID_OOZE, + EC_MOVE2(SLUDGE), + EC_MOVE2(SLUDGE_BOMB), + EC_MOVE2(GLARE), + EC_WORD_HEH, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(HERACROSS), + EC_POKEMON(HERACROSS), + EC_POKEMON(PELIPPER), + EC_POKEMON2(HOUNDOOM), + EC_POKEMON2(PERSIAN), + EC_WORD_RIPPED, + EC_POKEMON2(LICKITUNG), + EC_WORD_STUDY, + EC_WORD_COLOR_CHANGE, + EC_MOVE2(TRANSFORM), +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseHo[] = { + EC_MOVE2(POISON_TAIL), + EC_WORD_POINTS, + EC_POKEMON2(HO_OH), + EC_WORD_SOUNDPROOF, + EC_WORD_ADVENTURE, + EC_WORD_EFFECT_SPORE, + EC_MOVE2(ROAR), + EC_POKEMON(WAILORD), + EC_POKEMON(WAILMER), + EC_WORD_DUDE, + EC_WORD_BOARD, + EC_POKEMON2(HOOTHOOT), + EC_POKEMON(SALAMENCE), + EC_WORD_BALL, + EC_MOVE2(BONE_RUSH), + EC_WORD_THEY, + EC_WORD_THEY_WERE, + EC_WORD_TO_THEM, + EC_WORD_THEIR, + EC_WORD_THEY_RE, + EC_WORD_THEY_VE, + EC_WORD_POKENAV, + EC_WORD_POKEMON, + EC_WORD_GET, + EC_WORD_POKEDEX, + EC_WORD_PKRS, + EC_MOVE2(CAMOUFLAGE), + EC_WORD_WANT, + EC_MOVE2(COVET), + EC_POKEMON(AGGRON), + EC_MOVE2(TAIL_GLOW), + EC_POKEMON(POOCHYENA), + EC_POKEMON2(PIDGEY), + EC_WORD_AS_MUCH_AS, + EC_POKEMON2(PONYTA), + EC_MOVE2(BONE_CLUB), + EC_MOVE2(BONEMERANG), + EC_WORD_FIRE, + EC_MOVE2(FIRE_SPIN), + EC_WORD_FLAME_BODY, + EC_MOVE2(FIRE_PUNCH), + EC_POKEMON2(SKIPLOOM), + EC_WORD_HOHOHO, + EC_WORD_PRAISE, + EC_WORD_UH_HUH, + EC_POKEMON2(PORYGON), + EC_POKEMON2(PORYGON2), + EC_MOVE2(VOLT_TACKLE), + EC_WORD_POKEBLOCK, + EC_MOVE2(PERISH_SONG), + EC_WORD_SHREDDED, + EC_POKEMON(CASTFORM), + EC_WORD_BOOK, + EC_WORD_SERIOUS, + EC_WORD_REALLY, +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseMa[] = { + EC_WORD_OH_DEAR, + EC_WORD_IN, + EC_WORD_GIVE_UP, + EC_WORD_MINUS, + EC_POKEMON(MINUN), + EC_WORD_DAILY, + EC_WORD_OWN_TEMPO, + EC_MOVE2(WRAP), + EC_MOVE2(SPIKES), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(MAGCARGO), + EC_POKEMON(MAGCARGO), + EC_MOVE2(MAGNITUDE), + EC_POKEMON(MAKUHITA), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(SLUGMA), + EC_POKEMON(SLUGMA), + EC_WORD_MAGMA_ARMOR, + EC_POKEMON2(QUILAVA), + EC_WORD_OVERDO, + EC_WORD_LOSS, + EC_WORD_IF_I_LOSE, + EC_WORD_LOST, + EC_WORD_LOSE, + EC_WORD_TRULY, + EC_WORD_SERIOUSLY, + EC_MOVE2(MAGICAL_LEAF), + EC_MOVE2(MAGIC_COAT), + EC_WORD_MACHINE, + EC_WORD_OUT, + EC_WORD_MASTER, + EC_WORD_INCREASING, + EC_WORD_TOO, + EC_WORD_LIKE, + EC_POKEMON2(BELLSPROUT), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(WEEZING), + EC_POKEMON(WEEZING), + EC_WORD_SMELL, + EC_WORD_YET, + EC_WORD_MISTAKE, + EC_POKEMON(LINOONE), + EC_WORD_TOTALLY, + EC_MOVE2(MUD_SHOT), + EC_MOVE2(MACH_PUNCH), + EC_WORD_FESTIVAL, + EC_WORD_UNTIL, + EC_WORD_WAIT, + EC_WORD_GUARD, + EC_MOVE2(PROTECT), + EC_POKEMON(CASCOON), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(MARILL), + EC_POKEMON(MARILL), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(AZUMARILL), + EC_POKEMON(AZUMARILL), + EC_MOVE2(DEFENSE_CURL), + EC_WORD_AS_IF, + EC_POKEMON(SWALOT), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(ELECTRODE), + EC_POKEMON(ELECTRODE), + EC_MOVE2(ROLLING_KICK), + EC_WORD_COMICS, + EC_POKEMON2(MANKEY), + EC_WORD_SATISFIED, + EC_POKEMON2(MANTINE), +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseMi[] = { + EC_WORD_PARTNER, + EC_MOVE2(SUBSTITUTE), + EC_WORD_RIGHT, + EC_MOVE2(DETECT), + EC_MOVE2(PIN_MISSILE), + EC_WORD_WATER, + EC_MOVE2(WATER_SPORT), + EC_POKEMON(MUDKIP), + EC_MOVE2(WATER_GUN), + EC_MOVE2(MIST_BALL), + EC_MOVE2(WATER_PULSE), + EC_WORD_WATER_VEIL, + EC_WORD_SHOW, + EC_WORD_SEE, + EC_WORD_DID, + EC_MOVE2(FURY_ATTACK), + EC_MOVE2(FURY_SWIPES), + EC_MOVE2(DESTINY_BOND), + EC_WORD_LOOKS, + EC_WORD_REJECT, + EC_WORD_ACCEPT, + EC_POKEMON2(DRATINI), + EC_MOVE2(FALSE_SWIPE), + EC_MOVE2(FORESIGHT), + EC_POKEMON2(MEW), + EC_POKEMON2(MEWTWO), + EC_MOVE2(MIRROR_COAT), + EC_MOVE2(FUTURE_SIGHT), + EC_WORD_SEES, + EC_MOVE2(MILK_DRINK), + EC_POKEMON2(MILTANK), + EC_POKEMON(MILOTIC), + EC_WORD_WE, + EC_WORD_BEEN, + EC_WORD_TO_US, + EC_WORD_OUR, + EC_WORD_WE_RE, +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseMu[] = { + EC_WORD_MOOD, + EC_POKEMON2(MISDREAVUS), + EC_WORD_OLDEN, + EC_WORD_ARRGH, + EC_WORD_BUG, + EC_WORD_SWARM, + EC_WORD_RATHER, + EC_POKEMON2(SMOOCHUM), + EC_WORD_INVINCIBLE, + EC_WORD_HEART, + EC_WORD_MUFUFU, + EC_WORD_MMM, +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseMe[] = { + EC_MOVE2(CALM_MIND), + EC_WORD_MAIL, + EC_MOVE2(MEGA_DRAIN), + EC_MOVE2(MEGA_KICK), + EC_MOVE2(MEGA_PUNCH), + EC_POKEMON2(MEGANIUM), + EC_MOVE2(MEGAHORN), + EC_WORD_SEEK, + EC_MOVE2(HIDDEN_POWER), + EC_WORD_RARE, + EC_POKEMON(METAGROSS), + EC_POKEMON2(DITTO), + EC_MOVE2(METAL_CLAW), + EC_POKEMON(METANG), + EC_WORD_DESTROYED, + EC_WORD_MESSAGE, + EC_WORD_AWFULLY, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(TENTACOOL), + EC_POKEMON(TENTACOOL), + EC_WORD_FIERY, + EC_POKEMON2(MAREEP), + EC_MOVE2(ATTRACT), + EC_WORD_CUTE_CHARM, + EC_WORD_IMMUNITY, +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseMo[] = { + EC_WORD_ALMOST, + EC_WORD_BLAZE, + EC_WORD_NEARLY, + EC_WORD_MODE, + EC_WORD_OLD, + EC_WORD_THURSDAY, + EC_POKEMON2(FLAAFFY), + EC_WORD_LISTENING, + EC_WORD_OWN, + EC_WORD_MORE, + EC_WORD_DIDN_T, + EC_WORD_PICKUP, + EC_MOVE2(MIMIC), + EC_WORD_TOO_LATE, + EC_WORD_PATTERN, + EC_WORD_FLASH_FIRE, + EC_WORD_RECEIVED, + EC_POKEMON2(VENOMOTH), + EC_WORD_DOESN_T, + EC_POKEMON2(TANGELA), +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseYa[] = { + EC_WORD_HOO_HAH, + EC_WORD_PROMISE, + EC_WORD_KIND, + EC_POKEMON(BALTOY), + EC_WORD_HOLIDAY, + EC_WORD_NEGATIVE, + EC_MOVE2(FRUSTRATION), + EC_WORD_DONE, + EC_WORD_FINALLY, + EC_WORD_ANY, + EC_WORD_YAHOO, + EC_POKEMON2(SLOWKING), + EC_POKEMON2(SLOWBRO), + EC_MOVE2(LEECH_SEED), + EC_POKEMON2(SLOWPOKE), + EC_WORD_DANGER, + EC_POKEMON2(MURKROW), + EC_POKEMON(SABLEYE), + EC_WORD_DEFEATED, + EC_WORD_BEAT, + EC_WORD_VITAL_SPIRIT, + EC_POKEMON(VIGOROTH), + EC_WORD_YOUNG, + EC_POKEMON2(YANMA), +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseYu[] = { + EC_POKEMON(SNORUNT), + EC_WORD_TAKE, + EC_WORD_UNION, + EC_MOVE2(METRONOME), + EC_WORD_DREAM, + EC_MOVE2(DREAM_EATER), + EC_WORD_ALLOW, + EC_WORD_FORGET, + EC_POKEMON(CRADILY), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(KADABRA), + EC_POKEMON(KADABRA), +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseYo[] = { + EC_WORD_WITHOUT, + EC_WORD_YO, + EC_MOVE2(ACID), + EC_WORD_COME_OVER, + EC_WORD_KINDERGARTEN, + EC_WORD_CHLOROPHYLL, + EC_WORD_AFTER, + EC_POKEMON2(LARVITAR), + EC_WORD_OH_KAY, + EC_WORD_BEFORE, + EC_WORD_GREAT, + EC_MOVE2(MEDITATE), + EC_WORD_PURE_POWER, + EC_WORD_WELL, + EC_MOVE2(SNATCH), + EC_WORD_OKAY, + EC_WORD_PLANS, + EC_WORD_NIGHTTIME, + EC_WORD_WHILE, + EC_POKEMON(DUSKULL), + EC_WORD_EASY, + EC_WORD_INSTEAD, + EC_WORD_NIGHT, + EC_POKEMON2(NOCTOWL), + EC_WORD_COUNT_ON, + EC_WORD_WEAK, + EC_WORD_TOO_WEAK, + EC_WORD_WEAKENED, +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseRa[] = { + EC_POKEMON2(RAIKOU), + EC_WORD_WEEK, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(RAICHU), + EC_POKEMON(RAICHU), + EC_WORD_RIVAL, + EC_WORD_LIFE, + EC_POKEMON(MANECTRIC), + EC_WORD_SIMPLE, + EC_WORD_PUSHOVER, + EC_POKEMON(SWAMPERT), + EC_POKEMON(ELECTRIKE), + EC_WORD_SEEMS, + EC_WORD_RADIO, + EC_MOVE2(LUSTER_PURGE), + EC_POKEMON2(CHANSEY), + EC_POKEMON2(RATICATE), + EC_POKEMON(LATIAS), + EC_POKEMON(LATIOS), + EC_POKEMON(LUVDISC), + EC_POKEMON2(LAPRAS), + EC_WORD_LOVEY_DOVEY, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(VILEPLUME), + EC_POKEMON(VILEPLUME), + EC_WORD_LALALA, + EC_POKEMON(RALTS), + EC_WORD_FORGETS, + EC_WORD_APPEARS, + EC_WORD_RANK, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(LANTURN), + EC_POKEMON(LANTURN), +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseRi[] = { + EC_WORD_LEADER, + EC_MOVE2(LEAF_BLADE), + EC_POKEMON2(CHARMELEON), + EC_POKEMON2(CHARIZARD), + EC_MOVE2(RECYCLE), + EC_MOVE2(REFLECT), + EC_MOVE2(REFRESH), + EC_MOVE2(REVENGE), + EC_WORD_RIBBON, + EC_WORD_TRENDY, + EC_MOVE2(DRAGON_RAGE), + EC_MOVE2(DRAGON_BREATH), + EC_MOVE2(DRAGON_DANCE), + EC_WORD_VACATION, + EC_POKEMON(LILEEP), + EC_POKEMON2(URSARING), + EC_WORD_SHIELD_DUST, +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseRu[] = { + EC_POKEMON2(JYNX), + EC_WORD_ROOM, + EC_WORD_RULE, + EC_POKEMON2(LUGIA), + EC_WORD_LOOK, + EC_POKEMON(LUNATONE), + EC_WORD_RUBY, + EC_WORD_THAN, + EC_POKEMON(AZURILL), + EC_POKEMON(LUDICOLO), + EC_WORD_HAPPILY, +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseRe[] = { + -1, 2, // Doubled pokemon species name + EC_POKEMON2(MAGNETON), + EC_POKEMON(MAGNETON), + EC_MOVE2(ICE_PUNCH), + EC_MOVE2(ICE_BEAM), + EC_POKEMON(REGICE), + EC_POKEMON(REGISTEEL), + EC_POKEMON(REGIROCK), + EC_POKEMON(RAYQUAZA), + EC_WORD_UGLY, + EC_POKEMON2(LEDIAN), + EC_POKEMON2(LEDYBA), + EC_WORD_FANTASTIC, + EC_WORD_LEVEL, + EC_MOVE2(FURY_CUTTER), + EC_MOVE2(COMET_PUNCH), + EC_WORD_RENTAL, +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseRo[] = { + EC_MOVE2(SKULL_BASH), + -1, 2, // Doubled pokemon species name + EC_POKEMON2(VULPIX), + EC_POKEMON(VULPIX), + EC_POKEMON(ROSELIA), + EC_MOVE2(LOCK_ON), + EC_MOVE2(ROCK_BLAST), + EC_WORD_ROMANTIC, + EC_WORD_QUESTION, +}; + +const u16 gEasyChatWordsByLetter_UnusedJapaneseWa[] = { + EC_WORD_YAY, + EC_WORD_WORLD, + EC_WORD_AWW, + EC_WORD_WIRELESS, + EC_WORD_WOWEE, + EC_POKEMON(COMBUSKEN), + EC_WORD_UNDERSTAND, + EC_WORD_UNDERSTANDS, + EC_WORD_FAINT, + EC_WORD_ANTICIPATION, + EC_WORD_ONCE, + EC_WORD_MOVE, + EC_WORD_WE_VE, + EC_WORD_FAINTED, + EC_WORD_WOMAN, + EC_WORD_SHE, + EC_WORD_SHE_WAS, + EC_WORD_TO_HER, + EC_WORD_HERS, + EC_WORD_SHE_IS, + EC_WORD_SOME, + EC_POKEMON2(JUMPLUFF), + EC_MOVE2(COTTON_SPORE), + EC_WORD_GWAH, + EC_POKEMON2(TOTODILE), + EC_WORD_WAHAHAHA, + EC_WORD_ANYWHERE, + EC_MOVE2(STRUGGLE), + EC_WORD_BADLY, + -1, 2, // Doubled pokemon species name + EC_POKEMON2(MACHOP), + EC_POKEMON(MACHOP), +}; + +const struct EasyChatWordsByLetter gEasyChatWordsByLetterPointers[] = { + { + .words = gEasyChatWordsByLetter_Others, + .numWords = 10, + }, + { + .words = gEasyChatWordsByLetter_A, + .numWords = 106, + }, + { + .words = gEasyChatWordsByLetter_B, + .numWords = 86, + }, + { + .words = gEasyChatWordsByLetter_C, + .numWords = 119, + }, + { + .words = gEasyChatWordsByLetter_D, + .numWords = 94, + }, + { + .words = gEasyChatWordsByLetter_E, + .numWords = 59, + }, + { + .words = gEasyChatWordsByLetter_F, + .numWords = 80, + }, + { + .words = gEasyChatWordsByLetter_G, + .numWords = 98, + }, + { + .words = gEasyChatWordsByLetter_H, + .numWords = 101, + }, + { + .words = gEasyChatWordsByLetter_I, + .numWords = 48, + }, + { + .words = gEasyChatWordsByLetter_J, + .numWords = 13, + }, + { + .words = gEasyChatWordsByLetter_K, + .numWords = 33, + }, + { + .words = gEasyChatWordsByLetter_L, + .numWords = 82, + }, + { + .words = gEasyChatWordsByLetter_M, + .numWords = 142, + }, + { + .words = gEasyChatWordsByLetter_N, + .numWords = 54, + }, + { + .words = gEasyChatWordsByLetter_O, + .numWords = 44, + }, + { + .words = gEasyChatWordsByLetter_P, + .numWords = 102, + }, + { + .words = gEasyChatWordsByLetter_Q, + .numWords = 6, + }, + { + .words = gEasyChatWordsByLetter_R, + .numWords = 80, + }, + { + .words = gEasyChatWordsByLetter_S, + .numWords = 262, + }, + { + .words = gEasyChatWordsByLetter_T, + .numWords = 133, + }, + { + .words = gEasyChatWordsByLetter_U, + .numWords = 24, + }, + { + .words = gEasyChatWordsByLetter_V, + .numWords = 33, + }, + { + .words = gEasyChatWordsByLetter_W, + .numWords = 111, + }, + { + .words = gEasyChatWordsByLetter_X, + .numWords = 4, + }, + { + .words = gEasyChatWordsByLetter_Y, + .numWords = 19, + }, + { + .words = gEasyChatWordsByLetter_Z, + .numWords = 8, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseHi, + .numWords = 55, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseFu, + .numWords = 71, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseHe, + .numWords = 32, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseHo, + .numWords = 55, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseMa, + .numWords = 74, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseMi, + .numWords = 37, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseMu, + .numWords = 12, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseMe, + .numWords = 26, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseMo, + .numWords = 20, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseYa, + .numWords = 24, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseYu, + .numWords = 13, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseYo, + .numWords = 28, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseRa, + .numWords = 36, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseRi, + .numWords = 17, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseRu, + .numWords = 11, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseRe, + .numWords = 18, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseRo, + .numWords = 10, + }, + { + .words = gEasyChatWordsByLetter_UnusedJapaneseWa, + .numWords = 33, + }, +}; diff --git a/src/easy_chat.c b/src/easy_chat.c index 6a103dd7b0..3c436246db 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -1,5 +1,3 @@ - -// Includes #include "global.h" #include "alloc.h" #include "bard_music.h" @@ -33,6 +31,7 @@ #include "constants/event_objects.h" #include "constants/flags.h" #include "constants/songs.h" +#include "constants/species.h" #define EZCHAT_TASK_STATE 0 #define EZCHAT_TASK_KIND 1 @@ -41,123 +40,6 @@ #define EZCHAT_TASK_UNK06 6 #define EZCHAT_TASK_SIZE 7 -struct EasyChatScreenTemplate -{ - u8 unk_00; - u8 numColumns; - u8 numRows; - u8 unk_03_0:7; - u8 unk_03_7:1; - const u8 *titleText; - const u8 *instructionsText1; - const u8 *instructionsText2; - const u8 *confirmText1; - const u8 *confirmText2; -}; - -struct EasyChatScreen -{ - /*0x00*/ u8 kind; - /*0x01*/ u8 templateId; - /*0x02*/ u8 numColumns; - /*0x03*/ u8 numRows; - /*0x04*/ u8 state; - /*0x05*/ s8 mainCursorColumn; - /*0x06*/ s8 mainCursorRow; - /*0x07*/ u8 unk_07; - /*0x08*/ u8 unk_08; - /*0x09*/ u8 unk_09; - /*0x0A*/ s8 unk_0a; - /*0x0B*/ s8 unk_0b; - /*0x0C*/ u8 unk_0c; - /*0x0D*/ u8 unk_0d; - /*0x0E*/ u8 unk_0e; - /*0x0F*/ u8 unk_0f; - /*0x10*/ s8 unk_10; - /*0x11*/ s8 unk_11; - /*0x12*/ u8 sizeParam; - /*0x13*/ u8 unk_13; - /*0x14*/ u8 unk_14[0x20]; - /*0x34*/ const u8 *titleText; - /*0x38*/ u16 *words; - /*0x3C*/ u16 ecWordBuffer[9]; -}; - -struct Unk203A11C -{ - u16 unk0; - u16 windowId; - u16 unk4; - u8 unk6; - u8 unk7; - s8 unk8; - u8 unk9; - u8 unkA; - u8 unkB[0xC1]; - u8 unkCC[0x202]; - u16 unk2CE; - int unk2D0; - int unk2D4; - struct Sprite *unk2D8; - struct Sprite *unk2DC; - struct Sprite *unk2E0; - struct Sprite *unk2E4; - struct Sprite *unk2E8; - struct Sprite *unk2EC; - struct Sprite *unk2F0; - struct Sprite *unk2F4; - struct Sprite *unk2F8; - struct Sprite *unk2FC; - u16 unk300[BG_SCREEN_SIZE / 2]; - u16 unkB00[BG_SCREEN_SIZE / 2]; -}; - -struct Unk08597C30 -{ - u8 unk0_0:5; - u8 unk0_5:3; - u8 unk1; - u8 unk2; - u8 unk3; -}; - -struct EasyChatWordInfo -{ - const u8 *text; - int alphabeticalOrder; - int enabled; -}; - -typedef union -{ - const u16 *valueList; - const struct EasyChatWordInfo *words; -} EasyChatGroupWordData; - -struct EasyChatGroup -{ - EasyChatGroupWordData wordData; - u16 numWords; - u16 numEnabledWords; -}; - -struct Unk203A120 -{ - u16 unk0; - u16 unk2[EC_NUM_GROUPS]; - u16 unk2E[27]; - u16 unk64[27][270]; - u8 filler3958[0x2C]; - u16 unk3984[0x10E]; - u16 unk3BA0; -}; /*size = 0x3BA4*/ - -struct EasyChatWordsByLetter -{ - const u16 *words; - int numWords; -}; - EWRAM_DATA struct EasyChatScreen *gEasyChatScreen = NULL; EWRAM_DATA struct Unk203A11C *gUnknown_0203A11C = 0; EWRAM_DATA struct Unk203A120 *gUnknown_0203A120 = 0; @@ -169,7 +51,6 @@ static void sub_811A2FC(u8); static void sub_811A4D0(MainCallback); static bool32 sub_811A88C(u16); static void sub_811A8A4(u16); -void sub_811A8F0(void); static bool8 EasyChat_AllocateResources(u8, u16 *, u8); static void EasyChat_FreeResources(void); static u16 sub_811AAAC(void); @@ -185,11 +66,11 @@ static u16 sub_811B0BC(void); static u16 sub_811B0E8(void); static u16 sub_811B0F8(void); static u16 sub_811B150(void); -u16 sub_811B1B4(void); -u8 sub_811BA68(void); +static u16 sub_811B1B4(void); +static u8 sub_811BA68(void); static u8 sub_811BCC8(u8); static void sub_811BDF0(u8 *); -void sub_811BF78(void); +static void sub_811BF78(void); static bool8 sub_811BF8C(void); static bool8 sub_811BFA4(void); static void sub_811C13C(void); @@ -198,9 +79,9 @@ static bool8 sub_811C170(void); static bool8 sub_811F28C(void); static void sub_811F2B8(void); static u8 sub_811F3AC(void); -int sub_811BA3C(void); -int sub_811B184(void); -int sub_811B264(void); +static int sub_811BA3C(void); +static int sub_811B184(void); +static int sub_811B264(void); static int sub_811B32C(void); static int sub_811B2B0(void); static int sub_811B33C(void); @@ -217,16 +98,16 @@ static void sub_811B454(void); static int sub_811BD64(void); static int sub_811BDB0(void); static int sub_811BD2C(void); -int sub_811BCF4(void); +static int sub_811BCF4(void); static u16 sub_811B8E8(void); static u8 sub_811F3B8(u8); static void sub_811F548(int, u16); static int sub_811B908(void); static u16 sub_811F5B0(void); static void sub_811B488(u16); -u16 sub_811B940(void); +static u16 sub_811B940(void); static u16 sub_811F578(u16); -int sub_811BF88(int); +static int sub_811BF88(int); static u16 sub_811B8C8(void); static int sub_811B568(u32); static int sub_811B634(u32); @@ -253,6 +134,7 @@ static void sub_811D2C8(void); static void sub_811D684(void); static void sub_811DE90(void); static void sub_811DEC4(void); +static void sub_811DF28(struct Sprite *); static void sub_811DE5C(u8, u8, u8, u8); static void sub_811E5D4(void); static void sub_811E720(void); @@ -322,7 +204,7 @@ static void sub_811D7C8(void); static int sub_811DE48(void); static void sub_811D7EC(void); static void sub_811D830(void); -void sub_811D058(u8, u8, const u8 *, u8, u8, u8, u8, u8, u8); +static void sub_811D058(u8, u8, const u8 *, u8, u8, u8, u8, u8, u8); static void sub_811DD84(void); static void sub_811D6F4(void); static void sub_811D758(void); @@ -344,49 +226,856 @@ static u8 *CopyEasyChatWordPadded(u8 *, u16, u16); static u8 sub_811F860(u16); static u16 sub_811F5C4(u16); static u16 sub_811F6B8(u16); -bool8 sub_811F764(u16, u8); +static bool8 sub_811F764(u16, u8); static int sub_811F838(u16); +static void sub_811A8CC(void); +static void sub_811A8F0(void); +static void sub_811A914(void); +static void sub_811A938(void); -extern const struct { +struct Unk8597530 +{ u16 word; MainCallback callback; -} gUnknown_08597530[4]; +}; -extern const struct EasyChatScreenTemplate gEasyChatScreenTemplates[21]; -extern const u8 gUnknown_08597748[][7]; -extern const u16 gUnknown_08597764[]; -extern const u16 gUnknown_0859776C[][2]; -extern const struct BgTemplate gUnknown_08597C54[4]; -extern const struct WindowTemplate gUnknown_08597C64[]; -extern const u32 gUnknown_08597B54[]; -extern const struct Unk08597C30 gUnknown_08597C30[]; -extern const u16 gUnknown_08597B14[]; -extern const u16 gUnknown_08597B34[]; -extern const u16 gUnknown_08597C1C[]; -extern const u16 gUnknown_08597C24[]; -extern const struct WindowTemplate gUnknown_08597C84; -extern const u8 gUnknown_08597C8C[4]; -extern const u8 *const gUnknown_08597C90[4]; -extern const struct SpriteSheet gUnknown_08597CA0[]; -extern const struct SpritePalette gUnknown_08597CC0[]; -extern const struct CompressedSpriteSheet gUnknown_08597CE8[]; -extern const struct SpriteTemplate gUnknown_08597D18; -extern const struct SpriteTemplate gUnknown_08597D68; -extern const struct SpriteTemplate gUnknown_08597DF0; -extern const struct SpriteTemplate gUnknown_08597DD0; -extern const struct SpriteTemplate gUnknown_08597E48; -extern const struct SpriteTemplate gUnknown_08597E30; -extern const u8 gUnknown_08597D08[]; -extern const u8 gUnknown_08597E60[][4]; -extern const u8 *const gUnknown_08597E6C[][4]; -extern const struct EasyChatGroup gEasyChatGroups[]; -extern const u16 gUnknown_0859E62C[]; -extern const u16 gUnknown_0859E634[]; -extern const u16 gUnknown_0859E640[]; -extern const u16 gUnknown_0859E64C[]; -extern const u8 *const gEasyChatGroupNamePointers[]; -extern const struct EasyChatWordsByLetter gEasyChatWordsByLetterPointers[]; -extern const u16 gUnknown_0859E658[1]; +static const struct Unk8597530 sUnknown_08597530[] = { + { + .word = 26, + .callback = sub_811A8CC, + }, + { + .word = 25, + .callback = sub_811A8F0, + }, + { + .word = 28, + .callback = sub_811A914, + }, + { + .word = 27, + .callback = sub_811A938, + }, +}; +static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { + { + .unk_00 = 0, + .numColumns = 2, + .numRows = 2, + .unk_03_0 = 0, + .unk_03_7 = 0, + .titleText = gText_Profile, + .instructionsText1 = gText_CombineFourWordsOrPhrases, + .instructionsText2 = gText_AndMakeYourProfile, + .confirmText1 = gText_YourProfile, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 1, + .numColumns = 2, + .numRows = 3, + .unk_03_0 = 1, + .unk_03_7 = 0, + .titleText = gText_AtTheBattlesStart, + .instructionsText1 = gText_CombineSixWordsOrPhrases, + .instructionsText2 = gText_AndMakeAMessage, + .confirmText1 = gText_YourFeelingAtTheBattlesStart, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 2, + .numColumns = 2, + .numRows = 3, + .unk_03_0 = 1, + .unk_03_7 = 0, + .titleText = gText_UponWinningABattle, + .instructionsText1 = gText_CombineSixWordsOrPhrases, + .instructionsText2 = gText_AndMakeAMessage, + .confirmText1 = gText_WhatYouSayIfYouWin, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 3, + .numColumns = 2, + .numRows = 3, + .unk_03_0 = 1, + .unk_03_7 = 0, + .titleText = gText_UponLosingABattle, + .instructionsText1 = gText_CombineSixWordsOrPhrases, + .instructionsText2 = gText_AndMakeAMessage, + .confirmText1 = gText_WhatYouSayIfYouLose, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 4, + .numColumns = 2, + .numRows = 5, + .unk_03_0 = 2, + .unk_03_7 = 0, + .titleText = NULL, + .instructionsText1 = gText_CombineNineWordsOrPhrases, + .instructionsText2 = gText_AndMakeAMessage2, + .confirmText1 = gText_TheMailMessage, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 5, + .numColumns = 2, + .numRows = 2, + .unk_03_0 = 5, + .unk_03_7 = 0, + .titleText = gText_Interview, + .instructionsText1 = gText_CombineFourWordsOrPhrases, + .instructionsText2 = gText_LetsReplyToTheInterview, + .confirmText1 = gText_TheAnswer, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 6, + .numColumns = 2, + .numRows = 3, + .unk_03_0 = 1, + .unk_03_7 = 0, + .titleText = gText_TheBardsSong, + .instructionsText1 = gText_ChangeJustOneWordOrPhrase, + .instructionsText2 = gText_AndImproveTheBardsSong, + .confirmText1 = gText_TheBardsSong2, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 7, + .numColumns = 1, + .numRows = 1, + .unk_03_0 = 4, + .unk_03_7 = 0, + .titleText = gText_Interview, + .instructionsText1 = gText_FindWordsThatDescribeYour, + .instructionsText2 = gText_FeelingsRightNow, + .confirmText1 = gText_TheAnswer, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 9, + .numColumns = 2, + .numRows = 1, + .unk_03_0 = 3, + .unk_03_7 = 0, + .titleText = gText_WhatsHipAndHappening, + .instructionsText1 = gText_CombineTwoWordsOrPhrases, + .instructionsText2 = gText_AndMakeATrendySaying, + .confirmText1 = gText_TheTrendySaying, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 16, + .numColumns = 2, + .numRows = 5, + .unk_03_0 = 7, + .unk_03_7 = 1, + .titleText = NULL, + .instructionsText1 = gText_AfterYouHaveReadTheQuiz, + .instructionsText2 = gText_QuestionPressTheAButton, + .confirmText1 = NULL, + .confirmText2 = NULL, + }, + { + .unk_00 = 15, + .numColumns = 1, + .numRows = 1, + .unk_03_0 = 6, + .unk_03_7 = 1, + .titleText = gText_TheQuizAnswerIs, + .instructionsText1 = gText_OutOfTheListedChoices, + .instructionsText2 = gText_SelectTheAnswerToTheQuiz, + .confirmText1 = gText_TheAnswerColon, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 17, + .numColumns = 2, + .numRows = 5, + .unk_03_0 = 8, + .unk_03_7 = 1, + .titleText = NULL, + .instructionsText1 = gText_CombineNineWordsOrPhrases, + .instructionsText2 = gText_AndCreateAQuiz, + .confirmText1 = gText_IsThisQuizOK, + .confirmText2 = NULL, + }, + { + .unk_00 = 18, + .numColumns = 1, + .numRows = 1, + .unk_03_0 = 6, + .unk_03_7 = 1, + .titleText = gText_TheQuizAnswerIs, + .instructionsText1 = gText_PickAWordOrPhraseAnd, + .instructionsText2 = gText_SetTheQuizAnswer, + .confirmText1 = gText_IsThisQuizOK, + .confirmText2 = NULL, + }, + { + .unk_00 = 6, + .numColumns = 2, + .numRows = 3, + .unk_03_0 = 1, + .unk_03_7 = 0, + .titleText = gText_TheBardsSong, + .instructionsText1 = gText_ChangeJustOneWordOrPhrase, + .instructionsText2 = gText_AndImproveTheBardsSong, + .confirmText1 = gText_TheBardsSong2, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 19, + .numColumns = 2, + .numRows = 3, + .unk_03_0 = 1, + .unk_03_7 = 0, + .titleText = gText_ApprenticesPhrase, + .instructionsText1 = gText_FindWordsWhichFit, + .instructionsText2 = gText_TheTrainersImage, + .confirmText1 = gText_ApprenticePhrase, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 13, + .numColumns = 2, + .numRows = 1, + .unk_03_0 = 3, + .unk_03_7 = 0, + .titleText = gText_GoodSaying, + .instructionsText1 = gText_CombineTwoWordsOrPhrases2, + .instructionsText2 = gText_ToTeachHerAGoodSaying, + .confirmText1 = gText_TheAnswer, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 10, + .numColumns = 1, + .numRows = 1, + .unk_03_0 = 4, + .unk_03_7 = 0, + .titleText = gText_Interview, + .instructionsText1 = gText_FindWordsThatDescribeYour, + .instructionsText2 = gText_FeelingsRightNow, + .confirmText1 = gText_TheAnswer, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 12, + .numColumns = 1, + .numRows = 1, + .unk_03_0 = 4, + .unk_03_7 = 0, + .titleText = gText_Interview, + .instructionsText1 = gText_FindWordsThatDescribeYour, + .instructionsText2 = gText_FeelingsRightNow, + .confirmText1 = gText_TheAnswer, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 11, + .numColumns = 1, + .numRows = 1, + .unk_03_0 = 4, + .unk_03_7 = 0, + .titleText = gText_Interview, + .instructionsText1 = gText_FindWordsThatDescribeYour, + .instructionsText2 = gText_FeelingsRightNow, + .confirmText1 = gText_TheAnswer, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 14, + .numColumns = 1, + .numRows = 1, + .unk_03_0 = 4, + .unk_03_7 = 0, + .titleText = gText_FansQuestion, + .instructionsText1 = gText_FindWordsWhichFit, + .instructionsText2 = gText_TheTrainersImage, + .confirmText1 = gText_TheImage, + .confirmText2 = gText_IsAsShownOkay, + }, + { + .unk_00 = 20, + .numColumns = 2, + .numRows = 2, + .unk_03_0 = 0, + .unk_03_7 = 0, + .titleText = gText_Questionnaire, + .instructionsText1 = gText_CombineFourWordsOrPhrases, + .instructionsText2 = gText_AndFillOutTheQuestionnaire, + .confirmText1 = gText_TheAnswer, + .confirmText2 = gText_IsAsShownOkay, + }, +}; + +static const u8 sUnknown_08597748[][7] = { + { 1, 2, 3, 4, 5, 6, 0}, + { 7, 8, 9, 10, 11, 12, 0}, + {13, 14, 15, 16, 17, 18, 19}, + {20, 21, 22, 23, 24, 25, 26}, +}; + +static const u16 sMysteryGiftPhrase[] = { + EC_WORD_LINK, + EC_WORD_TOGETHER, + EC_WORD_WITH, + EC_WORD_ALL, +}; + +static const u16 sBerryMasterWifePhrases[][2] = { + {EC_WORD_GREAT, EC_WORD_BATTLE}, + {EC_WORD_CHALLENGE, EC_WORD_CONTEST}, + {EC_WORD_OVERWHELMING, EC_POKEMON(LATIAS)}, + {EC_WORD_COOL, EC_POKEMON(LATIOS)}, + {EC_WORD_SUPER, EC_WORD_HUSTLE}, +}; + +static const u16 sUnknown_08597780[] = INCBIN_U16("graphics/misc/interview_triangle_cursor.gbapal"); +static const u32 sUnknown_085977A0[] = INCBIN_U32("graphics/misc/interview_triangle_cursor.4bpp"); +static const u32 sUnknown_085977C0[] = INCBIN_U32("graphics/misc/interview_arrow.4bpp"); +static const u32 sUnknown_085978C0[] = INCBIN_U32("graphics/misc/interview_buttons.4bpp"); +static const u16 sUnknown_085979C0[] = INCBIN_U16("graphics/misc/interview_frame.gbapal"); +static const u32 sUnknown_085979E0[] = INCBIN_U32("graphics/misc/interview_frame.4bpp.lz"); +static const u16 sUnknown_08597B14[] = INCBIN_U16("graphics/misc/interview_frame_orange.gbapal"); +static const u16 sUnknown_08597B34[] = INCBIN_U16("graphics/misc/interview_frame_green.gbapal"); +static const u32 sUnknown_08597B54[] = INCBIN_U32("graphics/misc/interview_frame_2.4bpp.lz"); +static const u16 sUnknown_08597C1C[] = INCBIN_U16("graphics/misc/8597C1C.gbapal"); +static const u16 sUnknown_08597C24[] = INCBIN_U16("graphics/misc/8597C24.gbapal"); + +static const struct Unk08597C30 gUnknown_08597C30[] = { + { + .unk0_0 = 3, + .unk0_5 = 4, + .unk1 = 24, + .unk2 = 4, + .unk3 = 0, + }, + { + .unk0_0 = 3, + .unk0_5 = 3, + .unk1 = 24, + .unk2 = 6, + .unk3 = 0, + }, + { + .unk0_0 = 3, + .unk0_5 = 0, + .unk1 = 24, + .unk2 = 10, + .unk3 = 0, + }, + { + .unk0_0 = 3, + .unk0_5 = 5, + .unk1 = 24, + .unk2 = 2, + .unk3 = 0, + }, + { + .unk0_0 = 16, + .unk0_5 = 5, + .unk1 = 12, + .unk2 = 2, + .unk3 = 0, + }, + { + .unk0_0 = 3, + .unk0_5 = 4, + .unk1 = 24, + .unk2 = 4, + .unk3 = 0, + }, + { + .unk0_0 = 9, + .unk0_5 = 4, + .unk1 = 12, + .unk2 = 2, + .unk3 = 1, + }, + { + .unk0_0 = 5, + .unk0_5 = 3, + .unk1 = 0x14, + .unk2 = 10, + .unk3 = 3, + }, + { + .unk0_0 = 3, + .unk0_5 = 0, + .unk1 = 24, + .unk2 = 10, + .unk3 = 2, + }, +}; + +static const struct BgTemplate sEasyChatBgTemplates[] = { + { + .bg = 0, + .charBaseIndex = 0, + .mapBaseIndex = 28, + .screenSize = 0, + .paletteMode = 0, + .priority = 0, + .baseTile = 0, + }, + { + .bg = 1, + .charBaseIndex = 3, + .mapBaseIndex = 29, + .screenSize = 0, + .paletteMode = 0, + .priority = 1, + .baseTile = 0, + }, + { + .bg = 2, + .charBaseIndex = 0, + .mapBaseIndex = 30, + .screenSize = 0, + .paletteMode = 0, + .priority = 2, + .baseTile = 0x80, + }, + { + .bg = 3, + .charBaseIndex = 2, + .mapBaseIndex = 31, + .screenSize = 0, + .paletteMode = 0, + .priority = 3, + .baseTile = 0, + }, +}; + +static const struct WindowTemplate sEasyChatWindowTemplates[] = { + { + .bg = 1, + .tilemapLeft = 6, + .tilemapTop = 0, + .width = 18, + .height = 2, + .paletteNum = 10, + .baseBlock = 0x10, + }, + { + .bg = 0, + .tilemapLeft = 3, + .tilemapTop = 15, + .width = 24, + .height = 4, + .paletteNum = 15, + .baseBlock = 0xA, + }, + { + .bg = 2, + .tilemapLeft = 1, + .tilemapTop = 0, + .width = 28, + .height = 32, + .paletteNum = 3, + .baseBlock = 0, + }, + DUMMY_WIN_TEMPLATE, +}; + +static const struct WindowTemplate sEasyChatYesNoWindowTemplate = { + .bg = 0, + .tilemapLeft = 22, + .tilemapTop = 9, + .width = 5, + .height = 4, + .paletteNum = 15, + .baseBlock = 0x6A, +}; + +static const u8 sText_Clear17[] = _("{CLEAR 17}"); + +static const u8 *const sUnknown_08597C90[] = { + gUnknown_862B810, + gUnknown_862B832, + gUnknown_862B84B, + gUnknown_862B86C, +}; + +static const struct SpriteSheet sUnknown_08597CA0[] = { + { + .data = sUnknown_085977A0, + .size = 0x0020, + .tag = 0 + }, + { + .data = sUnknown_085977C0, + .size = 0x0100, + .tag = 2 + }, + { + .data = sUnknown_085978C0, + .size = 0x0100, + .tag = 3 + }, + {0} +}; + +static const struct SpritePalette sUnknown_08597CC0[] = { + { + .data = sUnknown_08597780, + .tag = 0, + }, + { + .data = gEasyChatCursor_Pal, + .tag = 1, + }, + { + .data = gEasyChatRightWindow_Pal, + .tag = 2, + }, + { + .data = sUnknown_085979C0, + .tag = 3, + }, + {0} +}; + +static const struct CompressedSpriteSheet sUnknown_08597CE8[] = { + { + .data = sUnknown_085979E0, + .size = 0x0800, + .tag = 5, + }, + { + .data = gEasyChatCursor_Gfx, + .size = 0x1000, + .tag = 1, + }, + { + .data = gEasyChatRightWindow_Gfx, + .size = 0x0800, + .tag = 6, + }, + { + .data = gEasyChatMode_Gfx, + .size = 0x1000, + .tag = 4, + }, +}; + +static const u8 sUnknown_08597D08[] = {0, 12, 24, 56, 68, 80, 92}; + +static const struct OamData sOamData_8597D10 = { + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_SQUARE, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 3, + .paletteNum = 0, + .affineParam = 0, +}; + +static const struct SpriteTemplate sUnknown_08597D18 = { + .tileTag = 0, + .paletteTag = 0, + .oam = &sOamData_8597D10, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_811DF28, +}; + +static const struct OamData sUnknown_08597D30 = { + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_H_RECTANGLE, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0, +}; + +static const union AnimCmd sUnknown_08597D38[] = { + ANIMCMD_FRAME(0, 0), + ANIMCMD_END, +}; + +static const union AnimCmd sUnknown_08597D40[] = { + ANIMCMD_FRAME(32, 0), + ANIMCMD_END, +}; + +static const union AnimCmd sUnknown_08597D48[] = { + ANIMCMD_FRAME(64, 0), + ANIMCMD_END, +}; + +static const union AnimCmd sUnknown_08597D50[] = { + ANIMCMD_FRAME(96, 0), + ANIMCMD_END, +}; + +static const union AnimCmd *const sUnknown_08597D58[] = { + sUnknown_08597D38, + sUnknown_08597D40, + sUnknown_08597D48, + sUnknown_08597D50, +}; + +static const struct SpriteTemplate sUnknown_08597D68 = { + .tileTag = 1, + .paletteTag = 1, + .oam = &sUnknown_08597D30, + .anims = sUnknown_08597D58, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_811DF28, +}; + +static const struct OamData sUnknown_08597D80 = { + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_H_RECTANGLE, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0, +}; + +static const union AnimCmd sUnknown_08597D88[] = { + ANIMCMD_FRAME(96, 0), + ANIMCMD_END, +}; + +static const union AnimCmd sUnknown_08597D90[] = { + ANIMCMD_FRAME(64, 4), + ANIMCMD_FRAME(32, 4), + ANIMCMD_END, +}; + +static const union AnimCmd sUnknown_08597D9C[] = { + ANIMCMD_FRAME(64, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END, +}; + +static const union AnimCmd sUnknown_08597DA8[] = { + ANIMCMD_FRAME(64, 4), + ANIMCMD_FRAME(96, 0), + ANIMCMD_END, +}; + +static const union AnimCmd sUnknown_08597DB4[] = { + ANIMCMD_FRAME(64, 4), + ANIMCMD_END, +}; + +static const union AnimCmd *const sUnknown_08597DBC[] = { + sUnknown_08597D88, + sUnknown_08597D90, + sUnknown_08597D9C, + sUnknown_08597DA8, + sUnknown_08597DB4, +}; + +static const struct SpriteTemplate sUnknown_08597DD0 = { + .tileTag = 4, + .paletteTag = 2, + .oam = &sUnknown_08597D80, + .anims = sUnknown_08597DBC, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +static const struct OamData sUnknown_08597DE8 = { + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_SQUARE, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 3, + .paletteNum = 0, + .affineParam = 0, +}; + +static const struct SpriteTemplate sUnknown_08597DF0 = { + .tileTag = 6, + .paletteTag = 2, + .oam = &sUnknown_08597DE8, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +static const struct OamData sUnknown_08597E08 = { + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_H_RECTANGLE, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0, +}; + +static const struct OamData gUnknown_08597E10 = { + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_SQUARE, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0, +}; + +static const union AnimCmd sUnknown_08597E18[] = { + ANIMCMD_FRAME(0, 0), + ANIMCMD_END, +}; + +static const union AnimCmd sUnknown_08597E20[] = { + ANIMCMD_FRAME(4, 0), + ANIMCMD_END, +}; + +static const union AnimCmd *const sUnknown_08597E28[] = { + sUnknown_08597E18, + sUnknown_08597E20, +}; + +static const struct SpriteTemplate sUnknown_08597E30 = { + .tileTag = 3, + .paletteTag = 2, + .oam = &sUnknown_08597E08, + .anims = sUnknown_08597E28, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +static const struct SpriteTemplate sUnknown_08597E48 = { + .tileTag = 2, + .paletteTag = 2, + .oam = &gUnknown_08597E10, + .anims = sUnknown_08597E28, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +static const u8 sUnknown_08597E60[][4] = { + {16, 111, 196, 0}, + {16, 78, 130, 160}, + {16, 80, 134, 170}, +}; + +static const u8 *const sFooterTextOptions[][4] = { + {gText_DelAll, gText_Cancel5, gText_Ok2, NULL}, + {gText_DelAll, gText_Cancel5, gText_Ok2, gText_Quiz}, + {gText_DelAll, gText_Cancel5, gText_Ok2, gText_Answer}, +}; + +#include "data/easy_chat/easy_chat_groups.h" +#include "data/easy_chat/easy_chat_words_by_letter.h" + +const u8 *const gEasyChatGroupNamePointers[] = { + [EC_GROUP_POKEMON] = gEasyChatGroupName_Pokemon, + [EC_GROUP_TRAINER] = gEasyChatGroupName_Trainer, + [EC_GROUP_STATUS] = gEasyChatGroupName_Status, + [EC_GROUP_BATTLE] = gEasyChatGroupName_Battle, + [EC_GROUP_GREETINGS] = gEasyChatGroupName_Greetings, + [EC_GROUP_PEOPLE] = gEasyChatGroupName_People, + [EC_GROUP_VOICES] = gEasyChatGroupName_Voices, + [EC_GROUP_SPEECH] = gEasyChatGroupName_Speech, + [EC_GROUP_ENDINGS] = gEasyChatGroupName_Endings, + [EC_GROUP_FEELINGS] = gEasyChatGroupName_Feelings, + [EC_GROUP_CONDITIONS] = gEasyChatGroupName_Conditions, + [EC_GROUP_ACTIONS] = gEasyChatGroupName_Actions, + [EC_GROUP_LIFESTYLE] = gEasyChatGroupName_Lifestyle, + [EC_GROUP_HOBBIES] = gEasyChatGroupName_Hobbies, + [EC_GROUP_TIME] = gEasyChatGroupName_Time, + [EC_GROUP_MISC] = gEasyChatGroupName_Misc, + [EC_GROUP_ADJECTIVES] = gEasyChatGroupName_Adjectives, + [EC_GROUP_EVENTS] = gEasyChatGroupName_Events, + [EC_GROUP_MOVE_1] = gEasyChatGroupName_Move1, + [EC_GROUP_MOVE_2] = gEasyChatGroupName_Move2, + [EC_GROUP_TRENDY_SAYING] = gEasyChatGroupName_TrendySaying, + [EC_GROUP_POKEMON_2] = gEasyChatGroupName_Pokemon2, +}; + +static const u16 sUnknown_0859E62C[] = { + EC_WORD_I_AM, + EC_WORD_A, + EC_WORD_POKEMON, + EC_WORD_FRIEND, +}; + +static const u16 sUnknown_0859E634[] = { + EC_WORD_ARE, + EC_WORD_YOU, + EC_WORD_READY, + EC_WORD_QUES, + EC_WORD_HERE_I_COME, + EC_WORD_EXCL, +}; + +static const u16 sUnknown_0859E640[] = { + EC_WORD_YAY, + EC_WORD_YAY, + EC_WORD_EXCL_EXCL, + EC_WORD_I_VE, + EC_WORD_WON, + EC_WORD_EXCL_EXCL, +}; + +static const u16 sUnknown_0859E64C[] = { + EC_WORD_TOO, + EC_WORD_BAD, + EC_WORD_ELLIPSIS, + EC_WORD_WE, + EC_WORD_LOST, + EC_WORD_ELLIPSIS, +}; + +static const u16 sUnknown_0859E658[] = { + SPECIES_DEOXYS, +}; void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam) { @@ -678,9 +1367,9 @@ static int sub_811A868(u16 word) { int i; - for (i = 0; i < ARRAY_COUNT(gUnknown_08597530); i ++) + for (i = 0; i < ARRAY_COUNT(sUnknown_08597530); i ++) { - if (word == gUnknown_08597530[i].word) + if (word == sUnknown_08597530[i].word) return i; } return -1; @@ -697,25 +1386,25 @@ static void sub_811A8A4(u16 word) i = sub_811A868(word); ResetTasks(); - sub_811A4D0(gUnknown_08597530[i].callback); + sub_811A4D0(sUnknown_08597530[i].callback); } -void sub_811A8CC(void) +static void sub_811A8CC(void) { sub_811A20C(0xF, &gSaveBlock1Ptr->lilycoveLady.quiz.unk_016, CB2_ReturnToFieldContinueScript, 3); } -void sub_811A8F0(void) +static void sub_811A8F0(void) { sub_811A20C(0x10, gSaveBlock1Ptr->lilycoveLady.quiz.unk_002, CB2_ReturnToFieldContinueScript, 3); } -void sub_811A914(void) +static void sub_811A914(void) { sub_811A20C(0x12, &gSaveBlock1Ptr->lilycoveLady.quiz.unk_014, CB2_ReturnToFieldContinueScript, 3); } -void sub_811A938(void) +static void sub_811A938(void) { sub_811A20C(0x11, gSaveBlock1Ptr->lilycoveLady.quiz.unk_002, CB2_ReturnToFieldContinueScript, 3); } @@ -1157,7 +1846,7 @@ static u16 sub_811B150(void) } } -int sub_811B184(void) +static int sub_811B184(void) { gEasyChatScreen->unk_08 = gEasyChatScreen->state; if (gEasyChatScreen->kind != 6) @@ -1173,7 +1862,7 @@ int sub_811B184(void) } } -u16 sub_811B1B4(void) +static u16 sub_811B1B4(void) { gEasyChatScreen->unk_08 = gEasyChatScreen->state; if (gEasyChatScreen->kind == 17) @@ -1250,7 +1939,7 @@ u16 sub_811B1B4(void) } } -int sub_811B264(void) +static int sub_811B264(void) { gEasyChatScreen->unk_08 = gEasyChatScreen->state; switch (gEasyChatScreen->kind) @@ -1681,10 +2370,10 @@ static int sub_811B908(void) { int var0 = (u8)gEasyChatScreen->unk_0a < 7 ? gEasyChatScreen->unk_0a : 0; int var1 = (u8)gEasyChatScreen->unk_0b < 4 ? gEasyChatScreen->unk_0b : 0; - return gUnknown_08597748[var1][var0]; + return sUnknown_08597748[var1][var0]; } -u16 sub_811B940(void) +static u16 sub_811B940(void) { return 2 * (gEasyChatScreen->unk_11 + gEasyChatScreen->unk_0e) + gEasyChatScreen->unk_10; } @@ -1736,7 +2425,7 @@ static u8 sub_811BA1C(void) return sub_811B940() >= sub_811F5B0() ? 1 : 0; } -int sub_811BA3C(void) +static int sub_811BA3C(void) { return gEasyChatScreenTemplates[gEasyChatScreen->templateId].unk_03_7; } @@ -1746,7 +2435,7 @@ u8 sub_811BA5C(void) return gEasyChatScreen->kind; } -u8 sub_811BA68(void) +static u8 sub_811BA68(void) { return gEasyChatScreenTemplates[gEasyChatScreen->templateId].unk_03_0; } @@ -1927,7 +2616,7 @@ static u8 sub_811BCC8(u8 entryType) return 0; } -int sub_811BCF4(void) +static int sub_811BCF4(void) { int i; @@ -2046,7 +2735,7 @@ static void sub_811BE9C(void) static int sub_811BF20(void) { - return sub_811BC7C(gUnknown_08597764, 4) == 0; + return sub_811BC7C(sMysteryGiftPhrase, ARRAY_COUNT(sMysteryGiftPhrase)) == 0; } static u16 sub_811BF40(void) @@ -2054,19 +2743,19 @@ static u16 sub_811BF40(void) int i; for (i = 0; i < 5; i++) { - if (!sub_811BC7C(gUnknown_0859776C[i], 2)) + if (!sub_811BC7C(sBerryMasterWifePhrases[i], ARRAY_COUNT(*sBerryMasterWifePhrases))) return i + 1; } return 0; } -void sub_811BF78(void) +static void sub_811BF78(void) { gEasyChatScreen->unk_13 = 0; } -int sub_811BF88(int easyChatWord) +static int sub_811BF88(int easyChatWord) { return 0; } @@ -2085,10 +2774,10 @@ static bool8 sub_811BFA4(void) { case 0: ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, gUnknown_08597C54, ARRAY_COUNT(gUnknown_08597C54)); + InitBgsFromTemplates(0, sEasyChatBgTemplates, ARRAY_COUNT(sEasyChatBgTemplates)); SetBgTilemapBuffer(3, gUnknown_0203A11C->unkB00); SetBgTilemapBuffer(1, gUnknown_0203A11C->unk300); - InitWindows(gUnknown_08597C64); + InitWindows(sEasyChatWindowTemplates); DeactivateAllTextPrinters(); sub_811CF64(); sub_811CF04(); @@ -2104,7 +2793,7 @@ static bool8 sub_811BFA4(void) CopyBgTilemapBufferToVram(3); break; case 2: - DecompressAndLoadBgGfxUsingHeap(1, gUnknown_08597B54, 0, 0, 0); + DecompressAndLoadBgGfxUsingHeap(1, sUnknown_08597B54, 0, 0, 0); CopyBgTilemapBufferToVram(1); break; case 3: @@ -2984,12 +3673,12 @@ static void sub_811CF64(void) { ResetPaletteFade(); LoadPalette(gEasyChatMode_Pal, 0, 32); - LoadPalette(gUnknown_08597B14, 1 * 16, 32); - LoadPalette(gUnknown_08597B34, 4 * 16, 32); - LoadPalette(gUnknown_08597C1C, 10 * 16, 8); - LoadPalette(gUnknown_08597C24, 11 * 16, 12); - LoadPalette(gUnknown_08597C24, 15 * 16, 12); - LoadPalette(gUnknown_08597C24, 3 * 16, 12); + LoadPalette(sUnknown_08597B14, 1 * 16, 32); + LoadPalette(sUnknown_08597B34, 4 * 16, 32); + LoadPalette(sUnknown_08597C1C, 10 * 16, 8); + LoadPalette(sUnknown_08597C24, 11 * 16, 12); + LoadPalette(sUnknown_08597C24, 15 * 16, 12); + LoadPalette(sUnknown_08597C24, 3 * 16, 12); } static void sub_811CFCC(void) @@ -3011,7 +3700,7 @@ void sub_811D028(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, vo AddTextPrinterParameterized(windowId, fontId, str, x, y, speed, callback); } -void sub_811D058(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, u8 red, u8 green, u8 blue) +static void sub_811D058(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, u8 red, u8 green, u8 blue) { u8 color[3]; color[0] = red; @@ -3082,7 +3771,7 @@ static void sub_811D104(u8 arg0) static void sub_811D214(u8 initialCursorPos) { - CreateYesNoMenu(&gUnknown_08597C84, 1, 14, initialCursorPos); + CreateYesNoMenu(&sEasyChatYesNoWindowTemplate, 1, 14, initialCursorPos); } static void sub_811D230(void) @@ -3123,7 +3812,7 @@ static void sub_811D2C8(void) FillWindowPixelBuffer(gUnknown_0203A11C->windowId, 0x11); for (i = 0; i < numRows; i++) { - memcpy(spC, gUnknown_08597C8C, sizeof(gUnknown_08597C8C)); + memcpy(spC, sText_Clear17, sizeof(sText_Clear17)); if (var1) spC[2] = 6; @@ -3314,8 +4003,8 @@ static void sub_811D758(void) { u32 i; - for (i = 0; i < 4; i++) - sub_811D028(2, 1, gUnknown_08597C90[i], 10, 97 + i * 16, 0xFF, NULL); + for (i = 0; i < ARRAY_COUNT(sUnknown_08597C90); i++) + sub_811D028(2, 1, sUnknown_08597C90[i], 10, 97 + i * 16, 0xFF, NULL); } static void sub_811D794(void) @@ -3647,10 +4336,10 @@ static void sub_811DE90(void) { u32 i; - LoadSpriteSheets(gUnknown_08597CA0); - LoadSpritePalettes(gUnknown_08597CC0); - for (i = 0; i < 4; i++) - LoadCompressedSpriteSheet(&gUnknown_08597CE8[i]); + LoadSpriteSheets(sUnknown_08597CA0); + LoadSpritePalettes(sUnknown_08597CC0); + for (i = 0; i < ARRAY_COUNT(sUnknown_08597CE8); i++) + LoadCompressedSpriteSheet(&sUnknown_08597CE8[i]); } static void sub_811DEC4(void) @@ -3658,12 +4347,12 @@ static void sub_811DEC4(void) u8 var0 = sub_811BA68(); int x = gUnknown_08597C30[var0].unk0_0 * 8 + 13; int y = gUnknown_08597C30[var0].unk0_5 * 8 + 8; - u8 spriteId = CreateSprite(&gUnknown_08597D18, x, y, 2); + u8 spriteId = CreateSprite(&sUnknown_08597D18, x, y, 2); gUnknown_0203A11C->unk2D8 = &gSprites[spriteId]; gSprites[spriteId].data[1] = 1; } -void sub_811DF28(struct Sprite *sprite) +static void sub_811DF28(struct Sprite *sprite) { if (sprite->data[1]) { @@ -3698,11 +4387,11 @@ static void sub_811DFB0(void) static void sub_811DFC8(void) { - u8 spriteId = CreateSprite(&gUnknown_08597D68, 0, 0, 3); + u8 spriteId = CreateSprite(&sUnknown_08597D68, 0, 0, 3); gUnknown_0203A11C->unk2DC = &gSprites[spriteId]; gUnknown_0203A11C->unk2DC->pos2.x = 32; - spriteId = CreateSprite(&gUnknown_08597D68, 0, 0, 3); + spriteId = CreateSprite(&sUnknown_08597D68, 0, 0, 3); gUnknown_0203A11C->unk2E0 = &gSprites[spriteId]; gUnknown_0203A11C->unk2E0->pos2.x = -32; @@ -3773,7 +4462,7 @@ static void sub_811E1A4(s8 arg0, s8 arg1) } else { - x += gUnknown_08597D08[(u8)arg0 < 7 ? arg0 : 0]; + x += sUnknown_08597D08[arg0 < ARRAY_COUNT(sUnknown_08597D08) ? arg0 : 0]; anim = 3; } @@ -3799,7 +4488,7 @@ static void sub_811E1A4(s8 arg0, s8 arg1) static void sub_811E288(void) { - u8 spriteId = CreateSprite(&gUnknown_08597D18, 0, 0, 4); + u8 spriteId = CreateSprite(&sUnknown_08597D18, 0, 0, 4); gUnknown_0203A11C->unk2E4 = &gSprites[spriteId]; gUnknown_0203A11C->unk2E4->callback = sub_811E2DC; gUnknown_0203A11C->unk2E4->oam.priority = 2; @@ -3849,11 +4538,11 @@ static void sub_811E380(void) static void sub_811E3AC(void) { - u8 spriteId = CreateSprite(&gUnknown_08597DF0, 208, 128, 6); + u8 spriteId = CreateSprite(&sUnknown_08597DF0, 208, 128, 6); gUnknown_0203A11C->unk2E8 = &gSprites[spriteId]; gUnknown_0203A11C->unk2E8->pos2.x = -64; - spriteId = CreateSprite(&gUnknown_08597DD0, 208, 80, 5); + spriteId = CreateSprite(&sUnknown_08597DD0, 208, 80, 5); gUnknown_0203A11C->unk2EC = &gSprites[spriteId]; gUnknown_0203A11C->unk9 = 0; } @@ -3940,11 +4629,11 @@ static bool8 sub_811E5B8(void) static void sub_811E5D4(void) { - u8 spriteId = CreateSprite(&gUnknown_08597E48, 96, 80, 0); + u8 spriteId = CreateSprite(&sUnknown_08597E48, 96, 80, 0); if (spriteId != MAX_SPRITES) gUnknown_0203A11C->unk2F0 = &gSprites[spriteId]; - spriteId = CreateSprite(&gUnknown_08597E48, 96, 156, 0); + spriteId = CreateSprite(&sUnknown_08597E48, 96, 156, 0); if (spriteId != MAX_SPRITES) { gUnknown_0203A11C->unk2F4 = &gSprites[spriteId]; @@ -3982,11 +4671,11 @@ static void sub_811E6E0(int arg0) static void sub_811E720(void) { - u8 spriteId = CreateSprite(&gUnknown_08597E30, 220, 84, 1); + u8 spriteId = CreateSprite(&sUnknown_08597E30, 220, 84, 1); if (spriteId != MAX_SPRITES) gUnknown_0203A11C->unk2F8 = &gSprites[spriteId]; - spriteId = CreateSprite(&gUnknown_08597E30, 220, 156, 1); + spriteId = CreateSprite(&sUnknown_08597E30, 220, 156, 1); if (spriteId != MAX_SPRITES) { gUnknown_0203A11C->unk2FC = &gSprites[spriteId]; @@ -4072,7 +4761,7 @@ static int sub_811E920(int arg0) { int var0 = sub_811E8E4(); if (var0 < 3) - return gUnknown_08597E60[var0][arg0] + 4; + return sUnknown_08597E60[var0][arg0] + 4; else return 0; } @@ -4097,10 +4786,10 @@ static void sub_811E948(void) FillWindowPixelBuffer(windowId, 0x11); for (i = 0; i < 4; i++) { - const u8 *str = gUnknown_08597E6C[var0][i]; + const u8 *str = sFooterTextOptions[var0][i]; if (str) { - int x = gUnknown_08597E60[var0][i]; + int x = sUnknown_08597E60[var0][i]; sub_811D028(windowId, 1, str, x, 1, 0, NULL); } } @@ -4548,16 +5237,16 @@ void InitEasyChatPhrases(void) u16 i, j; for (i = 0; i < 4; i++) - gSaveBlock1Ptr->unk2BB0[i] = gUnknown_0859E62C[i]; + gSaveBlock1Ptr->unk2BB0[i] = sUnknown_0859E62C[i]; for (i = 0; i < 6; i++) - gSaveBlock1Ptr->unk2BBC[i] = gUnknown_0859E634[i]; + gSaveBlock1Ptr->unk2BBC[i] = sUnknown_0859E634[i]; for (i = 0; i < 6; i++) - gSaveBlock1Ptr->unk2BC8[i] = gUnknown_0859E640[i]; + gSaveBlock1Ptr->unk2BC8[i] = sUnknown_0859E640[i]; for (i = 0; i < 6; i++) - gSaveBlock1Ptr->unk2BD4[i] = gUnknown_0859E64C[i]; + gSaveBlock1Ptr->unk2BD4[i] = sUnknown_0859E64C[i]; for (i = 0; i < MAIL_COUNT; i++) { @@ -4782,7 +5471,7 @@ static bool8 sub_811F72C(u8 arg0) return FALSE; } -bool8 sub_811F764(u16 wordIndex, u8 groupId) +static bool8 sub_811F764(u16 wordIndex, u8 groupId) { switch (groupId) { @@ -4805,9 +5494,9 @@ bool8 sub_811F764(u16 wordIndex, u8 groupId) static int sub_811F838(u16 species) { u32 i; - for (i = 0; i < ARRAY_COUNT(gUnknown_0859E658); i++) + for (i = 0; i < ARRAY_COUNT(sUnknown_0859E658); i++) { - if (gUnknown_0859E658[i] == species) + if (sUnknown_0859E658[i] == species) return TRUE; } From accea672f16cb74b0ec16e0e740cf9f67a651dfb Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 26 Feb 2019 22:04:44 -0500 Subject: [PATCH 125/217] Incorporate feedback --- common_syms/overworld.txt | 2 +- data/maps/TradeCenter/map.json | 1 - include/link.h | 2 +- include/overworld.h | 2 +- include/save.h | 4 ++-- src/berry_blender.c | 9 ++------- src/cable_club.c | 8 ++++---- src/link.c | 2 +- src/overworld.c | 30 +++++++++++++++--------------- src/record_mixing.c | 2 +- src/rom_8011DC0.c | 4 ++-- src/start_menu.c | 4 ++-- 12 files changed, 32 insertions(+), 38 deletions(-) diff --git a/common_syms/overworld.txt b/common_syms/overworld.txt index 1ba43d7cff..e136f54449 100644 --- a/common_syms/overworld.txt +++ b/common_syms/overworld.txt @@ -4,5 +4,5 @@ gBGTilemapBuffers3 gHeldKeyCodeToSend gFieldCallback gFieldCallback2 -LocalLinkPlayerId +gLocalLinkPlayerId gFieldLinkPlayerCount diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 9d196c7629..3e47ca41bf 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -46,7 +46,6 @@ ], "coord_events": [ { - "comment": "This is trade seat #1.", "type": "trigger", "x": 4, "y": 5, diff --git a/include/link.h b/include/link.h index 83deab88f7..182ee68f44 100644 --- a/include/link.h +++ b/include/link.h @@ -299,7 +299,7 @@ extern struct LinkPlayer gLocalLinkPlayer; bool32 Link_AnyPartnersPlayingRubyOrSapphire(void); bool32 sub_800A03C(void); -void SetLocalLinkPlayerId(u8); +void SetgLocalLinkPlayerId(u8); u8 GetSavedPlayerCount(void); void sub_8009FAC(void); bool8 sub_800A4D8(u8 a0); diff --git a/include/overworld.h b/include/overworld.h index ea361e25b5..bf1d93901c 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -48,7 +48,7 @@ extern u16 *gBGTilemapBuffers3; extern u16 gHeldKeyCodeToSend; extern void (*gFieldCallback)(void); extern bool8 (*gFieldCallback2)(void); -extern u8 LocalLinkPlayerId; +extern u8 gLocalLinkPlayerId; extern u8 gFieldLinkPlayerCount; // Exported ROM declarations diff --git a/include/save.h b/include/save.h index de2dd5129e..7ce86de705 100644 --- a/include/save.h +++ b/include/save.h @@ -83,8 +83,8 @@ bool8 sub_8153380(void); bool8 sub_81533AC(void); u8 sub_81533E0(void); u8 sub_8153408(void); -u8 FullSaveGame(void); //FullSaveGame -bool8 CheckSaveFile(void); //CheckSaveFile +u8 FullSaveGame(void); +bool8 CheckSaveFile(void); u8 Save_LoadGameData(u8 a1); u16 sub_815355C(void); u8 sub_81534D0(u8); diff --git a/src/berry_blender.c b/src/berry_blender.c index dd8117f08e..87d24e7175 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -34,6 +34,8 @@ #include "battle_records.h" #include "graphics.h" #include "new_game.h" +#include "save.h" +#include "link.h" #define BLENDER_SCORE_BEST 0 #define BLENDER_SCORE_GOOD 1 @@ -140,15 +142,8 @@ extern const u8 gText_Space[]; extern const u8 gText_BlenderMaxSpeedRecord[]; extern const u8 gText_234Players[]; -extern void sub_800A418(void); -extern u8 sub_800A9D8(void); extern void sub_81AABF0(void (*callback)(void)); extern void sub_800B4C0(void); -extern void ClearLinkCallback(void); -extern void sub_8009F8C(void); -extern void FullSaveGame(void); -extern bool8 CheckSaveFile(void); -extern void sub_80EECEC(void); // this file's functions static void BerryBlender_SetBackgroundsPos(void); diff --git a/src/cable_club.c b/src/cable_club.c index 83e1e55dd9..f504ad8a82 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -352,7 +352,7 @@ static void sub_80B2918(u8 taskId) else { gFieldLinkPlayerCount = GetLinkPlayerCount_2(); - LocalLinkPlayerId = GetMultiplayerId(); + gLocalLinkPlayerId = GetMultiplayerId(); sub_800AA04(gFieldLinkPlayerCount); card = (struct TrainerCard *)gBlockSendBuffer; TrainerCard_GenerateCardForPlayer(card); @@ -399,7 +399,7 @@ static void sub_80B2A08(u8 taskId) else { gFieldLinkPlayerCount = GetLinkPlayerCount_2(); - LocalLinkPlayerId = GetMultiplayerId(); + gLocalLinkPlayerId = GetMultiplayerId(); sub_800AA04(gFieldLinkPlayerCount); card = (struct TrainerCard *)gBlockSendBuffer; TrainerCard_GenerateCardForPlayer(card); @@ -972,7 +972,7 @@ void sub_80B360C(void) if (gSpecialVar_0x8004 == 1 || gSpecialVar_0x8004 == 2) { - UpdatePlayerLinkBattleRecords(LocalLinkPlayerId ^ 1); + UpdatePlayerLinkBattleRecords(gLocalLinkPlayerId ^ 1); if (gWirelessCommType) { switch (gBattleOutcome) @@ -1028,7 +1028,7 @@ static void sub_80B3728(u8 taskId) if (IsFieldMessageBoxHidden()) { sub_8087288(); - SetLocalLinkPlayerId(gSpecialVar_0x8005); + SetgLocalLinkPlayerId(gSpecialVar_0x8005); task->data[0] = 2; } break; diff --git a/src/link.c b/src/link.c index 72ac3e8787..cf06e49585 100644 --- a/src/link.c +++ b/src/link.c @@ -302,7 +302,7 @@ void LinkTestScreen(void) SetMainCallback2(CB2_LinkTest); } -void SetLocalLinkPlayerId(u8 playerId) +void SetgLocalLinkPlayerId(u8 playerId) { gLocalLinkPlayer.id = playerId; } diff --git a/src/overworld.c b/src/overworld.c index 95766805c5..63143b7b4b 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -203,7 +203,7 @@ u16 *gBGTilemapBuffers3; u16 gHeldKeyCodeToSend; void (*gFieldCallback)(void); bool8 (*gFieldCallback2)(void); -u8 LocalLinkPlayerId; // This is our player id in a multiplayer mode. +u8 gLocalLinkPlayerId; // This is our player id in a multiplayer mode. u8 gFieldLinkPlayerCount; // EWRAM vars @@ -2194,13 +2194,13 @@ static void sub_8086A80(void) static void SetCameraToTrackGuestPlayer(void) { - InitCameraUpdateCallback(GetSpriteForLinkedPlayer(LocalLinkPlayerId)); + InitCameraUpdateCallback(GetSpriteForLinkedPlayer(gLocalLinkPlayerId)); } // Duplicate function. static void SetCameraToTrackGuestPlayer_2(void) { - InitCameraUpdateCallback(GetSpriteForLinkedPlayer(LocalLinkPlayerId)); + InitCameraUpdateCallback(GetSpriteForLinkedPlayer(gLocalLinkPlayerId)); } static void sub_8086AE4(void) @@ -2210,7 +2210,7 @@ static void sub_8086AE4(void) // This is a hack of some kind; it's undone in sub_8086B14, which is called // soon after this function. - sub_8088B3C(x + LocalLinkPlayerId, y); + sub_8088B3C(x + gLocalLinkPlayerId, y); } static void sub_8086B14(void) @@ -2219,7 +2219,7 @@ static void sub_8086B14(void) u16 x, y; GetCameraFocusCoords(&x, &y); - x -= LocalLinkPlayerId; + x -= gLocalLinkPlayerId; for (i = 0; i < gFieldLinkPlayerCount; i++) { @@ -2242,7 +2242,7 @@ static void CB1_UpdateLinkState(void) { if (gWirelessCommType == 0 || !IsRfuRecvQueueEmpty() || !IsSendingKeysToLink()) { - u8 selfId = LocalLinkPlayerId; + u8 selfId = gLocalLinkPlayerId; UpdateAllLinkPlayers(gLinkPartnersHeldKeys, selfId); // Note: Because guestId is between 0 and 4, while the smallest key code is @@ -2296,7 +2296,7 @@ static void ResetAllTradingStates(void) } // Returns true if all connected players are in tradingState. -static bool32 AreAllPlayersInState(u16 tradingState) +static bool32 AreAllPlayersInTradingState(u16 tradingState) { s32 i; s32 count = gFieldLinkPlayerCount; @@ -2307,7 +2307,7 @@ static bool32 AreAllPlayersInState(u16 tradingState) return TRUE; } -static bool32 AreAnyPlayersInTradingState(u16 tradingState) +static bool32 IsAnyPlayerInTradingState(u16 tradingState) { s32 i; s32 count = gFieldLinkPlayerCount; @@ -2336,7 +2336,7 @@ static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlay } return; } - if (AreAnyPlayersInTradingState(PLAYER_TRADING_STATE_EXITING_ROOM) == TRUE) + if (IsAnyPlayerInTradingState(PLAYER_TRADING_STATE_EXITING_ROOM) == TRUE) { sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; if (trainer->isLocalPlayer) @@ -2629,7 +2629,7 @@ static u16 KeyInterCB_WaitForPlayersToExit(u32 keyOrPlayerId) // CB1_UpdateLinkState. if (sPlayerTradingStates[keyOrPlayerId] != PLAYER_TRADING_STATE_EXITING_ROOM) CheckRfuKeepAliveTimer(); - if (AreAllPlayersInState(PLAYER_TRADING_STATE_EXITING_ROOM) == TRUE) + if (AreAllPlayersInTradingState(PLAYER_TRADING_STATE_EXITING_ROOM) == TRUE) { ScriptContext1_SetupScript(EventScript_DoLinkRoomExit); SetKeyInterceptCallback(KeyInterCB_SendNothing); @@ -2651,20 +2651,20 @@ static u16 KeyInterCB_SendNothing_2(u32 key) u32 sub_8087214(void) { - if (AreAnyPlayersInTradingState(PLAYER_TRADING_STATE_EXITING_ROOM) == TRUE) + if (IsAnyPlayerInTradingState(PLAYER_TRADING_STATE_EXITING_ROOM) == TRUE) return 2; - if (sPlayerKeyInterceptCallback == sub_8087170 && sPlayerTradingStates[LocalLinkPlayerId] != PLAYER_TRADING_STATE_UNK_2) + if (sPlayerKeyInterceptCallback == sub_8087170 && sPlayerTradingStates[gLocalLinkPlayerId] != PLAYER_TRADING_STATE_UNK_2) return 0; - if (sPlayerKeyInterceptCallback == KeyInterCB_DoNothingAndKeepAlive && sPlayerTradingStates[LocalLinkPlayerId] == PLAYER_TRADING_STATE_BUSY) + if (sPlayerKeyInterceptCallback == KeyInterCB_DoNothingAndKeepAlive && sPlayerTradingStates[gLocalLinkPlayerId] == PLAYER_TRADING_STATE_BUSY) return 2; - if (AreAllPlayersInState(PLAYER_TRADING_STATE_UNK_2) != FALSE) + if (AreAllPlayersInTradingState(PLAYER_TRADING_STATE_UNK_2) != FALSE) return 1; return 0; } bool32 sub_808727C(void) { - return AreAnyPlayersInTradingState(PLAYER_TRADING_STATE_EXITING_ROOM); + return IsAnyPlayerInTradingState(PLAYER_TRADING_STATE_EXITING_ROOM); } u16 sub_8087288(void) diff --git a/src/record_mixing.c b/src/record_mixing.c index aafd7284ba..e58fdcc4e3 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -324,7 +324,7 @@ static void Task_RecordMixing_Main(u8 taskId) case 0: // init sSentRecord = malloc(sizeof(union PlayerRecords)); sReceivedRecords = malloc(sizeof(union PlayerRecords) * 4); - SetLocalLinkPlayerId(gSpecialVar_0x8005); + SetgLocalLinkPlayerId(gSpecialVar_0x8005); VarSet(VAR_TEMP_0, 1); gUnknown_03001130 = FALSE; PrepareExchangePacket(); diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 0f3ebe6333..3d85a9d1d1 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -188,7 +188,7 @@ extern u8 gUnknown_02022C3E; extern u16 gUnknown_02022C3C; extern u8 gUnknown_02022C20[]; extern u8 gFieldLinkPlayerCount; -extern u8 LocalLinkPlayerId; +extern u8 gLocalLinkPlayerId; // IWRAM vars IWRAM_DATA struct UnkStruct_Leader *gUnknown_03000DA0; @@ -1641,7 +1641,7 @@ void sub_8014304(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 arg4) gSpecialVar_0x8004 = arg4; VarSet(VAR_0x4087, arg4); gFieldLinkPlayerCount = GetLinkPlayerCount(); - LocalLinkPlayerId = GetMultiplayerId(); + gLocalLinkPlayerId = GetMultiplayerId(); SetCableClubWarp(); SetWarpDestination(mapGroup, mapNum, -1, x, y); WarpIntoMap(); diff --git a/src/start_menu.c b/src/start_menu.c index 352f94bff8..fb94fb3f76 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -84,7 +84,7 @@ EWRAM_DATA static bool8 sSavingComplete = FALSE; EWRAM_DATA static u8 sSaveInfoWindowId = 0; // Extern variables. -extern u8 LocalLinkPlayerId; +extern u8 gLocalLinkPlayerId; // Extern functions in not decompiled files. extern void sub_80AF688(void); @@ -734,7 +734,7 @@ static bool8 StartMenuLinkModePlayerNameCallback(void) { PlayRainSoundEffect(); CleanupOverworldWindowsAndTilemaps(); - ShowTrainerCardInLink(LocalLinkPlayerId, CB2_ReturnToFieldWithOpenMenu); + ShowTrainerCardInLink(gLocalLinkPlayerId, CB2_ReturnToFieldWithOpenMenu); return TRUE; } From b8a60b055b9261210874fef3cac7696d6a97f45f Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 26 Feb 2019 22:11:43 -0500 Subject: [PATCH 126/217] Fix previous merge --- data/event_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 257143ef57..d6bc782c4d 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1148,7 +1148,7 @@ EventScript_WhiteOut:: @ 8271857 goto EventScript_ResetMrBriney end -EventScript_271862:: @ 8271862 +EventScript_ResetMrBriney:: @ 8271862 compare VAR_BRINEY_LOCATION, 1 goto_if_eq EventScript_MoveMrBrineyToHouse compare VAR_BRINEY_LOCATION, 2 From 6cb4c677cdf156d9d78f5f27bf3168882c1447ec Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 26 Feb 2019 22:30:40 -0500 Subject: [PATCH 127/217] Fix backwards names --- asm/rom_8011DC0.s | 4 ++-- include/menu.h | 4 ++-- src/decoration.c | 10 +++++----- src/menu.c | 4 ++-- src/player_pc.c | 2 +- src/roulette.c | 4 ++-- src/script_menu.c | 2 +- src/secret_base.c | 2 +- src/start_menu.c | 8 ++++---- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index 9a77545a7a..c13ab9a96e 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -563,7 +563,7 @@ _080170CA: negs r0, r0 b _08017110 _080170D4: - bl DisplayYesNoMenuWithDefault + bl DisplayYesNoMenuDefaultYes ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -26550,7 +26550,7 @@ _08024246: strb r0, [r5, 0xC] b _080242D8 _0802426A: - bl DisplayYesNoMenuWithDefault + bl DisplayYesNoMenuDefaultYes b _080242D0 _08024270: bl Menu_ProcessInputNoWrapClearOnChoose diff --git a/include/menu.h b/include/menu.h index ae89a1ab46..947f97a688 100644 --- a/include/menu.h +++ b/include/menu.h @@ -32,7 +32,7 @@ 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 a0, u8 a1); -void DisplayYesNoMenuWithDefault(void); +void DisplayYesNoMenuDefaultYes(void); u32 GetPlayerTextSpeed(void); u8 GetPlayerTextSpeedDelay(void); void sub_81978B0(u16 arg0); @@ -81,7 +81,7 @@ u8 sub_81983AC(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numC void sub_819786C(u8 windowId, bool8 copyToVram); void AddTextPrinterForMessage_2(bool8 allowSkippingDelayWithButtonPress); void RemoveStartMenuWindow(void); -void DisplayYesNoMenuWithDefaultDefaultNo(u8 initialCursorPos); +void DisplayYesNoMenuWithDefault(u8 initialCursorPos); void sub_819A344(u8 a0, u8 *dest, u8 color); void RemoveMapNamePopUpWindow(void); u8 GetMapNamePopUpWindowId(void); diff --git a/src/decoration.c b/src/decoration.c index 98c3ef0289..207cb1bf00 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1628,7 +1628,7 @@ void sub_8128950(u8 taskId) void sub_81289D0(u8 taskId) { - DisplayYesNoMenuWithDefault(); + DisplayYesNoMenuDefaultYes(); DoYesNoFuncWithChoice(taskId, &gUnknown_085A72C4); } @@ -1693,7 +1693,7 @@ void sub_8128AAC(u8 taskId) void sub_8128B80(u8 taskId) { - DisplayYesNoMenuWithDefault(); + DisplayYesNoMenuDefaultYes(); DoYesNoFuncWithChoice(taskId, &gUnknown_085A72CC); } @@ -2588,7 +2588,7 @@ void sub_812A0E8(u8 taskId) void sub_812A1A0(u8 taskId) { - DisplayYesNoMenuWithDefault(); + DisplayYesNoMenuDefaultYes(); DoYesNoFuncWithChoice(taskId, &gUnknown_085A7348); } @@ -2601,7 +2601,7 @@ void sub_812A1C0(u8 taskId) void sub_812A1F0(u8 taskId) { - DisplayYesNoMenuWithDefault(); + DisplayYesNoMenuDefaultYes(); DoYesNoFuncWithChoice(taskId, &gUnknown_085A7350); } @@ -2725,7 +2725,7 @@ void sub_812A3D4(u8 taskId) void sub_812A458(u8 taskId) { - DisplayYesNoMenuWithDefault(); + DisplayYesNoMenuDefaultYes(); DoYesNoFuncWithChoice(taskId, &gUnknown_085A741C); } diff --git a/src/menu.c b/src/menu.c index 39d6f3fd16..753bd52a97 100644 --- a/src/menu.c +++ b/src/menu.c @@ -458,12 +458,12 @@ void DisplayItemMessageOnField(u8 taskId, const u8 *string, TaskFunc callback) CopyWindowToVram(0, 3); } -void DisplayYesNoMenuWithDefault(void) +void DisplayYesNoMenuDefaultYes(void) { CreateYesNoMenu(&sYesNo_WindowTemplates, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, 0); } -void DisplayYesNoMenuWithDefaultDefaultNo(u8 initialCursorPos) +void DisplayYesNoMenuWithDefault(u8 initialCursorPos) { CreateYesNoMenu(&sYesNo_WindowTemplates, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, initialCursorPos); } diff --git a/src/player_pc.c b/src/player_pc.c index 6ba5999ce8..028101edb9 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -761,7 +761,7 @@ static void Mailbox_MoveToBag(u8 taskId) static void Mailbox_DrawYesNoBeforeMove(u8 taskId) { - DisplayYesNoMenuWithDefault(); + DisplayYesNoMenuDefaultYes(); gTasks[taskId].func = Mailbox_MoveToBagYesNoPrompt; } diff --git a/src/roulette.c b/src/roulette.c index 4723e06878..e099e878cb 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -1043,7 +1043,7 @@ static void sub_81408A8(u8 taskId) static void sub_8140914(u8 taskId) { - DisplayYesNoMenuWithDefault(); + DisplayYesNoMenuDefaultYes(); DrawStdWindowFrame(gUnknown_0203AB8C, 0); AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5C13, 0, 1, TEXT_SPEED_FF, 0); CopyWindowToVram(gUnknown_0203AB8C, 3); @@ -3256,7 +3256,7 @@ static const struct SpriteTemplate gUnknown_085B7AEC = static void sub_81428C4(u8 r0) { - DisplayYesNoMenuWithDefault(); + DisplayYesNoMenuDefaultYes(); DoYesNoFuncWithChoice(r0, &gUnknown_085B6408); } diff --git a/src/script_menu.c b/src/script_menu.c index ccbbcdfe16..4091918037 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1202,7 +1202,7 @@ bool8 ScriptMenu_YesNo(u8 left, u8 top) else { gSpecialVar_Result = 0xFF; - DisplayYesNoMenuWithDefault(); + DisplayYesNoMenuDefaultYes(); taskId = CreateTask(Task_HandleYesNoInput, 0x50); return TRUE; } diff --git a/src/secret_base.c b/src/secret_base.c index 342a9960ad..f8480fef0b 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1033,7 +1033,7 @@ void sub_80E9FFC(u8 taskId) void sub_80EA06C(u8 taskId) { - DisplayYesNoMenuWithDefault(); + DisplayYesNoMenuDefaultYes(); DoYesNoFuncWithChoice(taskId, &gUnknown_0858D058); } diff --git a/src/start_menu.c b/src/start_menu.c index f88630aee7..3fe1b7d614 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -961,7 +961,7 @@ static u8 SaveConfirmSaveCallback(void) static u8 SaveYesNoCallback(void) { - DisplayYesNoMenuWithDefault(); // Show Yes/No menu + DisplayYesNoMenuDefaultYes(); // Show Yes/No menu sSaveDialogCallback = SaveConfirmInputCallback; return SAVE_IN_PROGRESS; } @@ -1014,14 +1014,14 @@ static u8 SaveFileExistsCallback(void) static u8 SaveConfirmOverwriteDefaultNoCallback(void) { - DisplayYesNoMenuWithDefaultDefaultNo(1); // Show Yes/No menu (No selected as default) + DisplayYesNoMenuWithDefault(1); // Show Yes/No menu (No selected as default) sSaveDialogCallback = SaveOverwriteInputCallback; return SAVE_IN_PROGRESS; } static u8 SaveConfirmOverwriteCallback(void) { - DisplayYesNoMenuWithDefault(); // Show Yes/No menu + DisplayYesNoMenuDefaultYes(); // Show Yes/No menu sSaveDialogCallback = SaveOverwriteInputCallback; return SAVE_IN_PROGRESS; } @@ -1144,7 +1144,7 @@ static u8 BattlePyramidConfirmRetireCallback(void) static u8 BattlePyramidRetireYesNoCallback(void) { - DisplayYesNoMenuWithDefaultDefaultNo(1); // Show Yes/No menu (No selected as default) + DisplayYesNoMenuWithDefault(1); // Show Yes/No menu (No selected as default) sSaveDialogCallback = BattlePyramidRetireInputCallback; return SAVE_IN_PROGRESS; From b2c92ee8c5d8ea934b5c6c36cc4b06b66779d0fe Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 26 Feb 2019 22:45:39 -0500 Subject: [PATCH 128/217] Missed some fill values Must have forgotten to check FillWindowPixelRect. --- src/battle_pyramid_bag.c | 2 +- src/easy_chat.c | 4 ++-- src/field_specials.c | 4 ++-- src/item_menu.c | 2 +- src/menu.c | 4 ++-- src/party_menu.c | 5 +++-- src/player_pc.c | 2 +- src/pokedex.c | 6 +++--- src/pokemon_summary_screen.c | 12 ++++++------ src/trainer_card.c | 2 +- 10 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index 20029b2845..dec8d4bcad 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -804,7 +804,7 @@ static void sub_81C5A98(u8 listMenuTaskId, u8 arg1) static void sub_81C5AB8(u8 y, u8 arg1) { if (arg1 == 0xFF) - FillWindowPixelRect(0, 0, 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); + FillWindowPixelRect(0, PALETTE_NUM_TO_FILL_VALUE(0), 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); else PrintOnWindow_Font1(0, gText_SelectorArrow2, 0, y, 0, 0, 0, arg1); } diff --git a/src/easy_chat.c b/src/easy_chat.c index afc4c6c5b5..5a3ebf69c9 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -4106,9 +4106,9 @@ static void sub_811D950(u8 arg0, u8 arg1) var1 = 0; } - FillWindowPixelRect(2, 0x11, 0, y, 224, var2); + FillWindowPixelRect(2, PALETTE_NUM_TO_FILL_VALUE(1), 0, y, 224, var2); if (var1) - FillWindowPixelRect(2, 0x11, 0, 0, 224, var1); + FillWindowPixelRect(2, PALETTE_NUM_TO_FILL_VALUE(1), 0, 0, 224, var1); } static void sub_811D9B4(void) diff --git a/src/field_specials.c b/src/field_specials.c index 1cf16e74ca..b4017f0ef5 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -3001,7 +3001,7 @@ static void sub_813AA60(u16 a0, u16 a1) if (a0 > 2 && a0 < 7) { - FillWindowPixelRect(0, 0x11, 0, 0, 216, 32); + FillWindowPixelRect(0, PALETTE_NUM_TO_FILL_VALUE(1), 0, 0, 216, 32); switch (a0) { case 3: @@ -3140,7 +3140,7 @@ static void sub_813AD34(u8 a0, u16 a1) if (a0 == 9 || a0 == 10) { - FillWindowPixelRect(gUnknown_0203AB5E, 0x11, 0, 0, 96, 48); + FillWindowPixelRect(gUnknown_0203AB5E, PALETTE_NUM_TO_FILL_VALUE(1), 0, 0, 96, 48); if (a0 == 10) { AddTextPrinterParameterized(gUnknown_0203AB5E, 1, gUnknown_085B3254[a1], 0, 1, 0, NULL); diff --git a/src/item_menu.c b/src/item_menu.c index f561ebb366..8ade67614d 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -896,7 +896,7 @@ void bag_menu_print_cursor_(u8 a, u8 b) void bag_menu_print_cursor(u8 a, u8 b) { if (b == 0xFF) - FillWindowPixelRect(0, 0, 0, a, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); + FillWindowPixelRect(0, PALETTE_NUM_TO_FILL_VALUE(0), 0, a, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); else bag_menu_print(0, 1, gText_SelectorArrow2, 0, a, 0, 0, 0, b); diff --git a/src/menu.c b/src/menu.c index 753bd52a97..6a181532ed 100644 --- a/src/menu.c +++ b/src/menu.c @@ -934,7 +934,7 @@ void RedrawMenuCursor(u8 oldPos, u8 newPos) width = GetMenuCursorDimensionByFont(sMenu.fontId, 0); height = GetMenuCursorDimensionByFont(sMenu.fontId, 1); - FillWindowPixelRect(sMenu.windowId, 0x11, sMenu.left, sMenu.optionHeight * oldPos + sMenu.top, width, height); + FillWindowPixelRect(sMenu.windowId, PALETTE_NUM_TO_FILL_VALUE(1), sMenu.left, sMenu.optionHeight * oldPos + sMenu.top, width, height); AddTextPrinterParameterized(sMenu.windowId, sMenu.fontId, gText_SelectorArrow3, sMenu.left, sMenu.optionHeight * newPos + sMenu.top, 0, 0); } @@ -1313,7 +1313,7 @@ void sub_8199060(u8 oldCursorPos, u8 newCursorPos) u8 xPos = (oldCursorPos % sMenu.horizontalCount) * sMenu.optionWidth + sMenu.left; u8 yPos = (oldCursorPos / sMenu.horizontalCount) * sMenu.optionHeight + sMenu.top; FillWindowPixelRect(sMenu.windowId, - 0x11, + PALETTE_NUM_TO_FILL_VALUE(1), xPos, yPos, cursorWidth, diff --git a/src/party_menu.c b/src/party_menu.c index ceb89ae305..03e267e74f 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -3479,8 +3479,9 @@ static void DisplayPartyPokemonHPBar(u16 hp, u16 maxhp, struct Struct203CEDC *pt FillWindowPixelRect(ptr->windowId, gUnknown_08615AB8[0], ptr->unk0->unk4[20], ptr->unk0->unk4[21] + 1, hpFraction, 2); if (hpFraction != ptr->unk0->unk4[22]) { - FillWindowPixelRect(ptr->windowId, 13, ptr->unk0->unk4[20] + hpFraction, ptr->unk0->unk4[21], ptr->unk0->unk4[22] - hpFraction, 1); - FillWindowPixelRect(ptr->windowId, 2, ptr->unk0->unk4[20] + hpFraction, ptr->unk0->unk4[21] + 1, ptr->unk0->unk4[22] - hpFraction, 2); + // This appears to be an alternating fill + FillWindowPixelRect(ptr->windowId, 0x0D, ptr->unk0->unk4[20] + hpFraction, ptr->unk0->unk4[21], ptr->unk0->unk4[22] - hpFraction, 1); + FillWindowPixelRect(ptr->windowId, 0x02, ptr->unk0->unk4[20] + hpFraction, ptr->unk0->unk4[21] + 1, ptr->unk0->unk4[22] - hpFraction, 2); } CopyWindowToVram(ptr->windowId, 2); } diff --git a/src/player_pc.c b/src/player_pc.c index 028101edb9..c088a6ce7f 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -1005,7 +1005,7 @@ static void sub_816BFE0(u8 y, u8 b, u8 speed) { u8 windowId = gUnknown_0203BCC4->windowIds[0]; if (b == 0xFF) - FillWindowPixelRect(windowId, 17, 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); + FillWindowPixelRect(windowId, PALETTE_NUM_TO_FILL_VALUE(1), 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); else AddTextPrinterParameterized4(windowId, 1, 0, y, 0, 0, gUnknown_085DFF8C, speed, gText_SelectorArrow2); } diff --git a/src/pokedex.c b/src/pokedex.c index 2e5e8f213d..f54fdbd295 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -2152,7 +2152,7 @@ static void CreateCaughtBall(u16 a, u8 x, u8 y, u16 unused) if (a) BlitBitmapToWindow(0, gUnknown_0855D2BE, x * 8, y * 8, 8, 16); else - FillWindowPixelRect(0, 0, x * 8, y * 8, 8, 16); + FillWindowPixelRect(0, PALETTE_NUM_TO_FILL_VALUE(0), x * 8, y * 8, 8, 16); } static u8 CreateMonName(u16 num, u8 left, u8 top) @@ -2170,7 +2170,7 @@ static u8 CreateMonName(u16 num, u8 left, u8 top) void sub_80BD28C(u8 x, u8 y, u16 unused) { - FillWindowPixelRect(0, 0, x * 8, y * 8, 0x60, 16); + FillWindowPixelRect(0, PALETTE_NUM_TO_FILL_VALUE(0), x * 8, y * 8, 0x60, 16); } static void CreateInitialPokemonSprites(u16 selectedMon, u16 b) @@ -4784,7 +4784,7 @@ void sub_80C1270(const u8 *str, u32 left, u32 top) void sub_80C12B0(u32 x, u32 y, u32 width, u32 height) { - FillWindowPixelRect(0, 0, x, y, width, height); + FillWindowPixelRect(0, PALETTE_NUM_TO_FILL_VALUE(0), x, y, width, height); } void sub_80C12E0(u8 taskId) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 0f88b7d732..f0c68e7d0e 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -3469,7 +3469,7 @@ static void PrintMovePowerAndAccuracy(u16 moveIndex) const u8 *text; if (moveIndex != 0) { - FillWindowPixelRect(14, 0, 53, 0, 19, 32); + FillWindowPixelRect(14, PALETTE_NUM_TO_FILL_VALUE(0), 53, 0, 19, 32); if (gBattleMoves[moveIndex].power < 2) { @@ -3619,7 +3619,7 @@ static void PrintNewMoveDetailsOrCancelText(void) static void sub_81C4064(void) { u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 0); - FillWindowPixelRect(windowId, 0, 0, 66, 72, 16); + FillWindowPixelRect(windowId, PALETTE_NUM_TO_FILL_VALUE(0), 0, 66, 72, 16); CopyWindowToVram(windowId, 2); } @@ -3628,11 +3628,11 @@ static void sub_81C40A0(u8 moveIndex1, u8 moveIndex2) u8 windowId1 = AddWindowFromTemplateList(sPageMovesTemplate, 0); u8 windowId2 = AddWindowFromTemplateList(sPageMovesTemplate, 1); - FillWindowPixelRect(windowId1, 0, 0, moveIndex1 * 16, 0x48, 0x10); - FillWindowPixelRect(windowId1, 0, 0, moveIndex2 * 16, 0x48, 0x10); + FillWindowPixelRect(windowId1, PALETTE_NUM_TO_FILL_VALUE(0), 0, moveIndex1 * 16, 0x48, 0x10); + FillWindowPixelRect(windowId1, PALETTE_NUM_TO_FILL_VALUE(0), 0, moveIndex2 * 16, 0x48, 0x10); - FillWindowPixelRect(windowId2, 0, 0, moveIndex1 * 16, 0x30, 0x10); - FillWindowPixelRect(windowId2, 0, 0, moveIndex2 * 16, 0x30, 0x10); + FillWindowPixelRect(windowId2, PALETTE_NUM_TO_FILL_VALUE(0), 0, moveIndex1 * 16, 0x30, 0x10); + FillWindowPixelRect(windowId2, PALETTE_NUM_TO_FILL_VALUE(0), 0, moveIndex2 * 16, 0x30, 0x10); PrintMoveNameAndPP(moveIndex1); PrintMoveNameAndPP(moveIndex2); diff --git a/src/trainer_card.c b/src/trainer_card.c index 1f91916320..8d244d6563 100755 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -1103,7 +1103,7 @@ static void PrintTimeOnCard(void) r10 = width + 30; r7 -= r10; - FillWindowPixelRect(1, 0, r7, r4, r10, 15); + FillWindowPixelRect(1, PALETTE_NUM_TO_FILL_VALUE(0), r7, r4, r10, 15); ConvertIntToDecimalStringN(gStringVar4, hours, 1, 3); AddTextPrinterParameterized3(1, 1, r7, r4, gUnknown_0856FB0C, TEXT_SPEED_FF, gStringVar4); r7 += 18; From fe55580fe1e51c669033939125c939ed13a555d0 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 27 Feb 2019 03:42:04 -0500 Subject: [PATCH 129/217] Reverse engineer unusual weather events --- data/event_scripts.s | 56 +++++++++---------- data/maps/Route105/scripts.inc | 8 +-- data/maps/Route114/scripts.inc | 8 +-- data/maps/Route115/scripts.inc | 8 +-- data/maps/Route116/scripts.inc | 8 +-- data/maps/Route118/scripts.inc | 8 +-- .../Route119_WeatherInstitute_2F/scripts.inc | 18 +++--- data/maps/Route125/scripts.inc | 8 +-- data/maps/Route127/scripts.inc | 8 +-- data/maps/Route129/scripts.inc | 8 +-- data/specials.inc | 2 +- include/constants/flags.h | 2 +- include/constants/vars.h | 4 +- include/constants/weather.h | 26 +++++++++ src/field_specials.c | 22 ++++---- src/match_call.c | 2 +- src/overworld.c | 2 +- src/region_map.c | 4 +- 18 files changed, 115 insertions(+), 87 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 55bbb76185..adecc3fcf8 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -3188,7 +3188,7 @@ gUnknown_08273D1F:: @ 8273D1F gUnknown_08273D1F:: @ 8273D1F lockall - compare VAR_0x4037, 9 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START goto_if_ge Route105_EventScript_273D51 goto Route105_EventScript_273D5F end @@ -3200,7 +3200,7 @@ Route105_EventScript_273D31:: @ 8273D31 doweather call Route105_EventScript_273D6D special DrawWholeMapView - setvar VAR_0x4037, 0 + setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE setvar VAR_0x4039, 0 clearflag FLAG_SPECIAL_FLAG_0x4000 fadescreenswapbuffers 0 @@ -3218,23 +3218,23 @@ Route105_EventScript_273D5F:: @ 8273D5F end Route105_EventScript_273D6D:: @ 8273D6D - switch VAR_0x4037 - case 1, Route105_EventScript_273E23 - case 2, Route105_EventScript_273E36 - case 3, Route105_EventScript_273E49 - case 4, Route105_EventScript_273E5C - case 5, Route105_EventScript_273E6F - case 6, Route105_EventScript_273E82 - case 7, Route105_EventScript_273E95 - case 8, Route105_EventScript_273EA8 - case 9, Route105_EventScript_273EBB - case 10, Route105_EventScript_273F28 - case 11, Route105_EventScript_273F95 - case 12, Route105_EventScript_274002 - case 13, Route105_EventScript_27406F - case 14, Route105_EventScript_2740DC - case 15, Route105_EventScript_274149 - case 16, Route105_EventScript_2741B6 + switch VAR_UNUSUAL_WEATHER_LOCATION + case UNUSUAL_WEATHER_ROUTE_114_NORTH, Route105_EventScript_273E23 + case UNUSUAL_WEATHER_ROUTE_114_SOUTH, Route105_EventScript_273E36 + case UNUSUAL_WEATHER_ROUTE_115_WEST, Route105_EventScript_273E49 + case UNUSUAL_WEATHER_ROUTE_115_EAST, Route105_EventScript_273E5C + case UNUSUAL_WEATHER_ROUTE_116_NORTH, Route105_EventScript_273E6F + case UNUSUAL_WEATHER_ROUTE_116_SOUTH, Route105_EventScript_273E82 + case UNUSUAL_WEATHER_ROUTE_118_EAST, Route105_EventScript_273E95 + case UNUSUAL_WEATHER_ROUTE_118_WEST, Route105_EventScript_273EA8 + case UNUSUAL_WEATHER_ROUTE_105_NORTH, Route105_EventScript_273EBB + case UNUSUAL_WEATHER_ROUTE_105_SOUTH, Route105_EventScript_273F28 + case UNUSUAL_WEATHER_ROUTE_125_WEST, Route105_EventScript_273F95 + case UNUSUAL_WEATHER_ROUTE_125_EAST, Route105_EventScript_274002 + case UNUSUAL_WEATHER_ROUTE_127_NORTH, Route105_EventScript_27406F + case UNUSUAL_WEATHER_ROUTE_127_SOUTH, Route105_EventScript_2740DC + case UNUSUAL_WEATHER_ROUTE_129_WEST, Route105_EventScript_274149 + case UNUSUAL_WEATHER_ROUTE_129_EAST, Route105_EventScript_2741B6 return Route105_EventScript_273E23:: @ 8273E23 @@ -3401,15 +3401,15 @@ Underwater3_EventScript_274223:: @ 8274223 Underwater5_EventScript_274223:: @ 8274223 Underwater6_EventScript_274223:: @ 8274223 Underwater7_EventScript_274223:: @ 8274223 - switch VAR_0x4037 - case 9, Underwater3_EventScript_274281 - case 10, Underwater3_EventScript_27428A - case 11, Underwater3_EventScript_274293 - case 12, Underwater3_EventScript_27429C - case 13, Underwater3_EventScript_2742A5 - case 14, Underwater3_EventScript_2742AE - case 15, Underwater3_EventScript_2742B7 - case 16, Underwater3_EventScript_2742C0 + switch VAR_UNUSUAL_WEATHER_LOCATION + case UNUSUAL_WEATHER_ROUTE_105_NORTH, Underwater3_EventScript_274281 + case UNUSUAL_WEATHER_ROUTE_105_SOUTH, Underwater3_EventScript_27428A + case UNUSUAL_WEATHER_ROUTE_125_WEST, Underwater3_EventScript_274293 + case UNUSUAL_WEATHER_ROUTE_125_EAST, Underwater3_EventScript_27429C + case UNUSUAL_WEATHER_ROUTE_127_NORTH, Underwater3_EventScript_2742A5 + case UNUSUAL_WEATHER_ROUTE_127_SOUTH, Underwater3_EventScript_2742AE + case UNUSUAL_WEATHER_ROUTE_129_WEST, Underwater3_EventScript_2742B7 + case UNUSUAL_WEATHER_ROUTE_129_EAST, Underwater3_EventScript_2742C0 return Underwater3_EventScript_274281:: @ 8274281 diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 6ad11bc523..74416f1535 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -6,9 +6,9 @@ Route105_MapScripts:: @ 81EE1DB Route105_MapScript1_1EE1EB: @ 81EE1EB call_if_unset FLAG_REGI_DOORS_OPENED, Route105_EventScript_1EE20B - compare VAR_0x4037, 9 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH call_if_eq Route105_EventScript_2739AB - compare VAR_0x4037, 10 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH call_if_eq Route105_EventScript_273A18 end @@ -20,9 +20,9 @@ Route105_EventScript_1EE20B:: @ 81EE20B Route105_MapScript1_1EE21E: @ 81EE21E compare VAR_0x4039, 1 call_if_eq Route105_EventScript_273D13 - compare VAR_0x4037, 9 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH call_if_eq Route105_EventScript_273D17 - compare VAR_0x4037, 10 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH call_if_eq Route105_EventScript_273D17 end diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index d4327a2f45..856a0f1e4c 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -7,16 +7,16 @@ Route114_MapScripts:: @ 81F252F Route114_MapScript1_1F253F: @ 81F253F compare VAR_0x4039, 1 call_if_eq Route114_EventScript_273D13 - compare VAR_0x4037, 1 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH call_if_eq Route114_EventScript_273D1B - compare VAR_0x4037, 2 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH call_if_eq Route114_EventScript_273D1B end Route114_MapScript1_1F2561: @ 81F2561 - compare VAR_0x4037, 1 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH call_if_eq Route114_EventScript_273913 - compare VAR_0x4037, 2 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH call_if_eq Route114_EventScript_273926 end diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 9cb3ea2e01..42cf643af1 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -5,18 +5,18 @@ Route115_MapScripts:: @ 81F2920 .byte 0 Route115_MapScript1_1F2930: @ 81F2930 - compare VAR_0x4037, 3 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST call_if_eq Route115_EventScript_273939 - compare VAR_0x4037, 4 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST call_if_eq Route115_EventScript_27394C end Route115_MapScript1_1F2947: @ 81F2947 compare VAR_0x4039, 1 call_if_eq Route115_EventScript_273D13 - compare VAR_0x4037, 3 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST call_if_eq Route115_EventScript_273D1B - compare VAR_0x4037, 4 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST call_if_eq Route115_EventScript_273D1B end diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 90ae29f5bc..afb0505c83 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -8,9 +8,9 @@ Route116_MapScript1_1F2C1C: @ 81F2C1C call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C47 compare VAR_0x4039, 1 call_if_eq Route116_EventScript_273D13 - compare VAR_0x4037, 5 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH call_if_eq Route116_EventScript_273D1B - compare VAR_0x4037, 6 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH call_if_eq Route116_EventScript_273D1B end @@ -19,9 +19,9 @@ Route116_EventScript_1F2C47:: @ 81F2C47 return Route116_MapScript1_1F2C4F: @ 81F2C4F - compare VAR_0x4037, 5 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH call_if_eq Route116_EventScript_27395F - compare VAR_0x4037, 6 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH call_if_eq Route116_EventScript_273972 end diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 7588041371..88c4e12756 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -8,16 +8,16 @@ Route118_MapScript1_1F3DCC: @ 81F3DCC call Route118_EventScript_28CCC7 compare VAR_0x4039, 1 call_if_eq Route118_EventScript_273D13 - compare VAR_0x4037, 7 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST call_if_eq Route118_EventScript_273D1B - compare VAR_0x4037, 8 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST call_if_eq Route118_EventScript_273D1B end Route118_MapScript1_1F3DF3: @ 81F3DF3 - compare VAR_0x4037, 7 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST call_if_eq Route118_EventScript_273985 - compare VAR_0x4037, 8 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST call_if_eq Route118_EventScript_273998 end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 7d557fdef5..2eaeceb2f2 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -137,11 +137,13 @@ Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7 end Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A + @ This code uses VAR_0x8004 to count the number of legendaries the player has defeated + @ already. setvar VAR_0x8004, 0 - call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_2F_EventScript_270160 - call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_2F_EventScript_270160 + call_if_set FLAG_DEFEATED_KYOGRE, WeatherInstitute_UnusualWeather_IncrementLegendCount + call_if_set FLAG_DEFEATED_GROUDON, WeatherInstitute_UnusualWeather_IncrementLegendCount compare VAR_0x8004, 2 - goto_if_eq Route119_WeatherInstitute_2F_EventScript_270166 + goto_if_eq WeatherInstitute_UnusualWeather_LegendariesAlreadyDefeated call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_270159 specialvar VAR_RESULT, sub_813B374 compare VAR_RESULT, 1 @@ -156,16 +158,16 @@ Route119_WeatherInstitute_2F_EventScript_27014F:: @ 827014F end Route119_WeatherInstitute_2F_EventScript_270159:: @ 8270159 - special sub_813B2E4 + special CreateUnusualWeatherEvent setflag FLAG_TEMP_2 return -Route119_WeatherInstitute_2F_EventScript_270160:: @ 8270160 +WeatherInstitute_UnusualWeather_IncrementLegendCount:: @ 8270160 addvar VAR_0x8004, 1 return -Route119_WeatherInstitute_2F_EventScript_270166:: @ 8270166 - msgbox Route119_WeatherInstitute_2F_Text_2708FC, MSGBOX_DEFAULT +WeatherInstitute_UnusualWeather_LegendariesAlreadyDefeated:: @ 8270166 + msgbox WeatherInstitute_UnusualWeather_LegendariesAlreadyDefeatedText, MSGBOX_DEFAULT release end @@ -325,7 +327,7 @@ Route119_WeatherInstitute_2F_Text_270873: @ 8270873 .string "Could that mean, somewhere near\n" .string "{STR_VAR_1}…$" -Route119_WeatherInstitute_2F_Text_2708FC: @ 82708FC +WeatherInstitute_UnusualWeather_LegendariesAlreadyDefeatedText: @ 82708FC .string "Abnormal weather conditions are\n" .string "no longer being reported.\p" .string "The occasional rainfall is a blessing,\n" diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index 4812b96919..d1046e6a42 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -8,16 +8,16 @@ Route125_MapScript1_1F6758: @ 81F6758 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 compare VAR_0x4039, 1 call_if_eq Route125_EventScript_273D13 - compare VAR_0x4037, 11 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST call_if_eq Route125_EventScript_273D17 - compare VAR_0x4037, 12 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST call_if_eq Route125_EventScript_273D17 end Route125_MapScript1_1F6783: @ 81F6783 - compare VAR_0x4037, 11 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST call_if_eq Route125_EventScript_273A85 - compare VAR_0x4037, 12 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST call_if_eq Route125_EventScript_273AF2 end diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 7d5eee844c..9f2018e8fe 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -8,16 +8,16 @@ Route127_MapScript1_1F69E9: @ 81F69E9 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 compare VAR_0x4039, 1 call_if_eq Route127_EventScript_273D13 - compare VAR_0x4037, 13 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH call_if_eq Route127_EventScript_273D17 - compare VAR_0x4037, 14 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH call_if_eq Route127_EventScript_273D17 end Route127_MapScript1_1F6A14: @ 81F6A14 - compare VAR_0x4037, 13 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH call_if_eq Route127_EventScript_273B5F - compare VAR_0x4037, 14 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH call_if_eq Route127_EventScript_273BCC end diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index 8aec4bc289..5f65712d79 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -5,9 +5,9 @@ Route129_MapScripts:: @ 81F7284 .byte 0 Route129_MapScript1_1F7294: @ 81F7294 - compare VAR_0x4037, 15 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST call_if_eq Route129_EventScript_273C39 - compare VAR_0x4037, 16 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST call_if_eq Route129_EventScript_273CA6 end @@ -16,9 +16,9 @@ Route129_MapScript1_1F72AB: @ 81F72AB call_if_eq Route129_EventScript_273D13 compare VAR_0x405E, 4 call_if_ge Route129_EventScript_1F72D8 - compare VAR_0x4037, 15 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST call_if_eq Route129_EventScript_273D17 - compare VAR_0x4037, 16 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST call_if_eq Route129_EventScript_273D17 end diff --git a/data/specials.inc b/data/specials.inc index 965bef117f..193af9e86f 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -499,7 +499,7 @@ gSpecials:: @ 81DBA64 def_special sub_813B21C def_special SetMatchCallRegisteredFlag def_special sub_8175280 - def_special sub_813B2E4 + def_special CreateUnusualWeatherEvent def_special sub_813B374 def_special sub_813B490 def_special sub_80A08CC diff --git a/include/constants/flags.h b/include/constants/flags.h index b440ba78b5..f0759389fd 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -236,7 +236,7 @@ #define FLAG_MET_WAILMER_TRAINER 0xDA #define FLAG_EVIL_LEADER_PLEASE_STOP 0xDB -#define FLAG_UNUSED_0x0DC 0xDC // Unused Flag +#define FLAG_NEVER_SET_0x0DC 0xDC // This flag is read, but never written to #define FLAG_RECEIVED_GO_GOGGLES 0xDD #define FLAG_WINGULL_SENT_ON_ERRAND 0xDE diff --git a/include/constants/vars.h b/include/constants/vars.h index fc3b3263d5..9f364416ca 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -60,7 +60,7 @@ #define VAR_POISON_STEP_COUNTER 0x402B #define VAR_RESET_RTC_ENABLE 0x402C #define VAR_ENIGMA_BERRY_AVAILABLE 0x402D -#define VAR_0x402E 0x402E // Seems to be unused. +#define VAR_UNUSED_0x402E 0x402E // Unused Var #define VAR_FRONTIER_MANIAC_FACILITY 0x402F #define VAR_FRONTIER_GAMBLER_FACILITY 0x4030 @@ -71,7 +71,7 @@ #define VAR_DEOXYS_ROCK_STEP_COUNT 0x4034 #define VAR_DEOXYS_ROCK_LEVEL 0x4035 #define VAR_STORAGE_UNKNOWN 0x4036 -#define VAR_0x4037 0x4037 +#define VAR_UNUSUAL_WEATHER_LOCATION 0x4037 #define VAR_0x4038 0x4038 #define VAR_0x4039 0x4039 #define VAR_0x403A 0x403A diff --git a/include/constants/weather.h b/include/constants/weather.h index d62e07474a..b01cfb390f 100644 --- a/include/constants/weather.h +++ b/include/constants/weather.h @@ -37,4 +37,30 @@ #define COORD_EVENT_WEATHER_ROUTE119_CYCLE 20 #define COORD_EVENT_WEATHER_ROUTE123_CYCLE 21 +// These are the "unusual weather events" that are used +// to find Kyogre and Groudon. +#define UNUSUAL_WEATHER_COUNT_PER_LEGENDARY 8 +#define UNUSUAL_WEATHER_GROUDON_LOCATIONS_START 1 +#define UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START 1 + UNUSUAL_WEATHER_COUNT_PER_LEGENDARY + +#define UNUSUAL_WEATHER_NONE 0 +// Groudon locations +#define UNUSUAL_WEATHER_ROUTE_114_NORTH 1 +#define UNUSUAL_WEATHER_ROUTE_114_SOUTH 2 +#define UNUSUAL_WEATHER_ROUTE_115_WEST 3 +#define UNUSUAL_WEATHER_ROUTE_115_EAST 4 +#define UNUSUAL_WEATHER_ROUTE_116_NORTH 5 +#define UNUSUAL_WEATHER_ROUTE_116_SOUTH 6 +#define UNUSUAL_WEATHER_ROUTE_118_EAST 7 +#define UNUSUAL_WEATHER_ROUTE_118_WEST 8 +// Kyogre locations +#define UNUSUAL_WEATHER_ROUTE_105_NORTH 9 +#define UNUSUAL_WEATHER_ROUTE_105_SOUTH 10 +#define UNUSUAL_WEATHER_ROUTE_125_WEST 11 +#define UNUSUAL_WEATHER_ROUTE_125_EAST 12 +#define UNUSUAL_WEATHER_ROUTE_127_NORTH 13 +#define UNUSUAL_WEATHER_ROUTE_127_SOUTH 14 +#define UNUSUAL_WEATHER_ROUTE_129_WEST 15 +#define UNUSUAL_WEATHER_ROUTE_129_EAST 16 + #endif // GUARD_CONSTANTS_WEATHER_H diff --git a/src/field_specials.c b/src/field_specials.c index 307f813992..1accaa5e5f 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -3421,28 +3421,28 @@ bool8 sub_813B260(void) return FALSE; } -void sub_813B2E4(void) +void CreateUnusualWeatherEvent(void) { u16 randomValue = Random(); VarSet(VAR_0x4038, 0); if (FlagGet(FLAG_DEFEATED_KYOGRE) == TRUE) { - VarSet(VAR_0x4037, (randomValue & 7) + 1); + VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue & (UNUSUAL_WEATHER_COUNT_PER_LEGENDARY - 1)) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START); } else if (FlagGet(FLAG_DEFEATED_GROUDON) == TRUE) { - VarSet(VAR_0x4037, (randomValue & 7) + 9); + VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue & (UNUSUAL_WEATHER_COUNT_PER_LEGENDARY - 1)) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START); } else if ((randomValue & 1) == 0) { randomValue = Random(); - VarSet(VAR_0x4037, (randomValue & 7) + 1); + VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue & (UNUSUAL_WEATHER_COUNT_PER_LEGENDARY - 1)) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START); } else { randomValue = Random(); - VarSet(VAR_0x4037, (randomValue & 7) + 9); + VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue & (UNUSUAL_WEATHER_COUNT_PER_LEGENDARY - 1)) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START); } } @@ -3450,7 +3450,7 @@ bool32 sub_813B374(void) { static const u8 gUnknown_085B3400[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c }; - u16 var = VarGet(VAR_0x4037); + u16 var = VarGet(VAR_UNUSUAL_WEATHER_LOCATION); GetMapName(gStringVar1, gUnknown_085B3400[var - 1], 0); @@ -3466,12 +3466,12 @@ bool32 sub_813B374(void) bool8 sub_813B3B0(void) { - static const u8 gUnknown_085B3410[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c }; + static const u8 sUnusualWeatherMapNumbers[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c }; u16 var1 = VarGet(VAR_0x4038); - u16 var2 = VarGet(VAR_0x4037); + u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION); - if (!var2) + if (unusualWeather == UNUSUAL_WEATHER_NONE) { return FALSE; } @@ -3510,14 +3510,14 @@ bool8 sub_813B3B0(void) } } - if (gSaveBlock1Ptr->location.mapNum == gUnknown_085B3410[var2 - 1] && + if (gSaveBlock1Ptr->location.mapNum == sUnusualWeatherMapNumbers[unusualWeather - 1] && gSaveBlock1Ptr->location.mapGroup == 0) { return TRUE; } else { - VarSet(VAR_0x4037, 0); + VarSet(VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE); return FALSE; } } diff --git a/src/match_call.c b/src/match_call.c index e7e91969f1..de1181e8b7 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1016,7 +1016,7 @@ static bool32 MapAllowsMatchCall(void) if (gMapHeader.regionMapSectionId == MAPSEC_SOOTOPOLIS_CITY && FlagGet(FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA) == TRUE - && FlagGet(FLAG_UNUSED_0x0DC) == FALSE) + && FlagGet(FLAG_NEVER_SET_0x0DC) == FALSE) return FALSE; if (gMapHeader.regionMapSectionId == MAPSEC_MT_CHIMNEY diff --git a/src/overworld.c b/src/overworld.c index a10d1e17a5..edc4d402c4 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -411,7 +411,7 @@ static void Overworld_ResetStateAfterWhiteOut(void) if (VarGet(VAR_0x4039) == 1) { VarSet(VAR_0x4039, 0); - VarSet(VAR_0x4037, 0); + VarSet(VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE); } } diff --git a/src/region_map.c b/src/region_map.c index ff0c191673..5c85606a85 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1159,7 +1159,7 @@ static u16 RegionMap_GetTerraCaveMapSecId(void) { s16 idx; - idx = VarGet(VAR_0x4037) - 1; + idx = VarGet(VAR_UNUSUAL_WEATHER_LOCATION) - 1; if (idx < 0 || idx > 15) { idx = 0; @@ -1171,7 +1171,7 @@ static void RegionMap_GetMarineCaveCoords(u16 *x, u16 *y) { u16 idx; - idx = VarGet(VAR_0x4037); + idx = VarGet(VAR_UNUSUAL_WEATHER_LOCATION); if (idx < 9 || idx > 16) { idx = 9; From c1348d22f3d85cbc7425e8498a023b9b525f7207 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 27 Feb 2019 04:27:54 -0500 Subject: [PATCH 130/217] Name most event scripts related to unusual weather --- data/event_scripts.s | 173 ++++++++---------- data/maps/Route105/scripts.inc | 10 +- data/maps/Route114/scripts.inc | 10 +- data/maps/Route115/scripts.inc | 10 +- data/maps/Route116/scripts.inc | 10 +- data/maps/Route118/scripts.inc | 10 +- .../Route119_WeatherInstitute_2F/scripts.inc | 36 ++-- data/maps/Route125/scripts.inc | 10 +- data/maps/Route127/scripts.inc | 10 +- data/maps/Route129/scripts.inc | 10 +- data/maps/Underwater3/scripts.inc | 2 +- data/maps/Underwater5/scripts.inc | 2 +- data/maps/Underwater6/scripts.inc | 2 +- data/maps/Underwater7/scripts.inc | 2 +- data/specials.inc | 2 +- include/event_scripts.h | 2 +- src/field_control_avatar.c | 2 +- src/field_specials.c | 17 +- 18 files changed, 156 insertions(+), 164 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index adecc3fcf8..19b4949eb8 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -2707,10 +2707,10 @@ gUnknown_08273594:: @ 8273594 gUnknown_082735F2:: @ 82735F2 .string "It appears to be for use at\nthe LILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" -gUnknown_08273656:: @ 8273656 +gText_UnusualWeatherEnded_Rain:: @ 8273656 .string "The massive downpour appears to\nhave stopped…$" -gUnknown_08273684:: @ 8273684 +gText_UnusualWeatherEnded_Sun:: @ 8273684 .string "The intense sunshine appears to\nhave subsided…$" EventScript_2736B3:: @ 82736B3 @@ -2999,47 +2999,47 @@ EventScript_2738FF:: @ 82738FF releaseall end -Route114_EventScript_273913:: @ 8273913 +UnusualWeather_EventScript_PlaceTilesRoute114North:: @ 8273913 setmetatile 7, 3, 839, 1 setmetatile 7, 4, 847, 0 return -Route114_EventScript_273926:: @ 8273926 +UnusualWeather_EventScript_PlaceTilesRoute114South:: @ 8273926 setmetatile 6, 45, 601, 1 setmetatile 6, 46, 609, 0 return -Route115_EventScript_273939:: @ 8273939 +UnusualWeather_EventScript_PlaceTilesRoute115West:: @ 8273939 setmetatile 21, 5, 601, 1 setmetatile 21, 6, 609, 0 return -Route115_EventScript_27394C:: @ 827394C +UnusualWeather_EventScript_PlaceTilesRoute115East:: @ 827394C setmetatile 36, 9, 601, 1 setmetatile 36, 10, 609, 0 return -Route116_EventScript_27395F:: @ 827395F +UnusualWeather_EventScript_PlaceTilesRoute116North:: @ 827395F setmetatile 59, 12, 159, 1 setmetatile 59, 13, 167, 0 return -Route116_EventScript_273972:: @ 8273972 +UnusualWeather_EventScript_PlaceTilesRoute116South:: @ 8273972 setmetatile 79, 5, 159, 1 setmetatile 79, 6, 167, 0 return -Route118_EventScript_273985:: @ 8273985 +UnusualWeather_EventScript_PlaceTilesRoute118East:: @ 8273985 setmetatile 42, 5, 159, 1 setmetatile 42, 6, 167, 0 return -Route118_EventScript_273998:: @ 8273998 +UnusualWeather_EventScript_PlaceTilesRoute118West:: @ 8273998 setmetatile 9, 5, 159, 1 setmetatile 9, 6, 167, 0 return -Route105_EventScript_2739AB:: @ 82739AB +UnusualWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB setmetatile 10, 28, 334, 0 setmetatile 11, 28, 334, 0 setmetatile 9, 29, 334, 0 @@ -3054,7 +3054,7 @@ Route105_EventScript_2739AB:: @ 82739AB setmetatile 11, 31, 334, 0 return -Route105_EventScript_273A18:: @ 8273A18 +UnusualWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18 setmetatile 20, 53, 334, 0 setmetatile 21, 53, 334, 0 setmetatile 19, 54, 334, 0 @@ -3069,7 +3069,7 @@ Route105_EventScript_273A18:: @ 8273A18 setmetatile 21, 56, 334, 0 return -Route125_EventScript_273A85:: @ 8273A85 +UnusualWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85 setmetatile 8, 16, 334, 0 setmetatile 9, 16, 334, 0 setmetatile 7, 17, 334, 0 @@ -3084,7 +3084,7 @@ Route125_EventScript_273A85:: @ 8273A85 setmetatile 9, 19, 334, 0 return -Route125_EventScript_273AF2:: @ 8273AF2 +UnusualWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2 setmetatile 53, 18, 334, 0 setmetatile 54, 18, 334, 0 setmetatile 52, 19, 334, 0 @@ -3099,7 +3099,7 @@ Route125_EventScript_273AF2:: @ 8273AF2 setmetatile 54, 21, 334, 0 return -Route127_EventScript_273B5F:: @ 8273B5F +UnusualWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F setmetatile 57, 9, 334, 0 setmetatile 58, 9, 334, 0 setmetatile 56, 10, 334, 0 @@ -3114,7 +3114,7 @@ Route127_EventScript_273B5F:: @ 8273B5F setmetatile 58, 12, 334, 0 return -Route127_EventScript_273BCC:: @ 8273BCC +UnusualWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC setmetatile 61, 30, 334, 0 setmetatile 62, 30, 334, 0 setmetatile 60, 31, 334, 0 @@ -3129,7 +3129,7 @@ Route127_EventScript_273BCC:: @ 8273BCC setmetatile 62, 33, 334, 0 return -Route129_EventScript_273C39:: @ 8273C39 +UnusualWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39 setmetatile 16, 14, 334, 0 setmetatile 17, 14, 334, 0 setmetatile 15, 15, 334, 0 @@ -3144,7 +3144,7 @@ Route129_EventScript_273C39:: @ 8273C39 setmetatile 17, 17, 334, 0 return -Route129_EventScript_273CA6:: @ 8273CA6 +UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6 setmetatile 42, 19, 334, 0 setmetatile 43, 19, 334, 0 setmetatile 41, 20, 334, 0 @@ -3170,35 +3170,27 @@ Route129_EventScript_273D13:: @ 8273D13 setflag FLAG_SPECIAL_FLAG_0x4000 return -Route105_EventScript_273D17:: @ 8273D17 -Route125_EventScript_273D17:: @ 8273D17 -Route127_EventScript_273D17:: @ 8273D17 -Route129_EventScript_273D17:: @ 8273D17 +UnusualWeather_StartKyogreWeather:: @ 8273D17 setweather WEATHER_RAIN_HEAVY return -Route114_EventScript_273D1B:: @ 8273D1B -Route115_EventScript_273D1B:: @ 8273D1B -Route116_EventScript_273D1B:: @ 8273D1B -Route118_EventScript_273D1B:: @ 8273D1B +UnusualWeather_StartGroudonWeather:: @ 8273D1B setweather WEATHER_DROUGHT return -gUnknown_08273D1F:: @ 8273D1F - -gUnknown_08273D1F:: @ 8273D1F +UnusualWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F lockall compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START - goto_if_ge Route105_EventScript_273D51 - goto Route105_EventScript_273D5F + goto_if_ge UnusualWeather_EventScript_ShowRainEndedMessage + goto UnusualWeather_EventScript_ShowSunEndedMessage end -Route105_EventScript_273D31:: @ 8273D31 +UnusualWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31 closemessage fadescreenswapbuffers 1 setweather WEATHER_SUNNY doweather - call Route105_EventScript_273D6D + call UnusualWeather_EventScript_CleanupMapTiles special DrawWholeMapView setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE setvar VAR_0x4039, 0 @@ -3207,77 +3199,77 @@ Route105_EventScript_273D31:: @ 8273D31 releaseall end -Route105_EventScript_273D51:: @ 8273D51 - msgbox gUnknown_08273656, MSGBOX_DEFAULT - goto Route105_EventScript_273D31 +UnusualWeather_EventScript_ShowRainEndedMessage:: @ 8273D51 + msgbox gText_UnusualWeatherEnded_Rain, MSGBOX_DEFAULT + goto UnusualWeather_EventScript_EndEventAndCleanup_2 end -Route105_EventScript_273D5F:: @ 8273D5F - msgbox gUnknown_08273684, MSGBOX_DEFAULT - goto Route105_EventScript_273D31 +UnusualWeather_EventScript_ShowSunEndedMessage:: @ 8273D5F + msgbox gText_UnusualWeatherEnded_Sun, MSGBOX_DEFAULT + goto UnusualWeather_EventScript_EndEventAndCleanup_2 end -Route105_EventScript_273D6D:: @ 8273D6D +UnusualWeather_EventScript_CleanupMapTiles:: @ 8273D6D switch VAR_UNUSUAL_WEATHER_LOCATION - case UNUSUAL_WEATHER_ROUTE_114_NORTH, Route105_EventScript_273E23 - case UNUSUAL_WEATHER_ROUTE_114_SOUTH, Route105_EventScript_273E36 - case UNUSUAL_WEATHER_ROUTE_115_WEST, Route105_EventScript_273E49 - case UNUSUAL_WEATHER_ROUTE_115_EAST, Route105_EventScript_273E5C - case UNUSUAL_WEATHER_ROUTE_116_NORTH, Route105_EventScript_273E6F - case UNUSUAL_WEATHER_ROUTE_116_SOUTH, Route105_EventScript_273E82 - case UNUSUAL_WEATHER_ROUTE_118_EAST, Route105_EventScript_273E95 - case UNUSUAL_WEATHER_ROUTE_118_WEST, Route105_EventScript_273EA8 - case UNUSUAL_WEATHER_ROUTE_105_NORTH, Route105_EventScript_273EBB - case UNUSUAL_WEATHER_ROUTE_105_SOUTH, Route105_EventScript_273F28 - case UNUSUAL_WEATHER_ROUTE_125_WEST, Route105_EventScript_273F95 - case UNUSUAL_WEATHER_ROUTE_125_EAST, Route105_EventScript_274002 - case UNUSUAL_WEATHER_ROUTE_127_NORTH, Route105_EventScript_27406F - case UNUSUAL_WEATHER_ROUTE_127_SOUTH, Route105_EventScript_2740DC - case UNUSUAL_WEATHER_ROUTE_129_WEST, Route105_EventScript_274149 - case UNUSUAL_WEATHER_ROUTE_129_EAST, Route105_EventScript_2741B6 + case UNUSUAL_WEATHER_ROUTE_114_NORTH, UnusualWeather_EventScript_CleanupRoute114North + case UNUSUAL_WEATHER_ROUTE_114_SOUTH, UnusualWeather_EventScript_CleanupRoute114South + case UNUSUAL_WEATHER_ROUTE_115_WEST, UnusualWeather_EventScript_CleanupRoute115West + case UNUSUAL_WEATHER_ROUTE_115_EAST, UnusualWeather_EventScript_CleanupRoute115East + case UNUSUAL_WEATHER_ROUTE_116_NORTH, UnusualWeather_EventScript_CleanupRoute116North + case UNUSUAL_WEATHER_ROUTE_116_SOUTH, UnusualWeather_EventScript_CleanupRoute116South + case UNUSUAL_WEATHER_ROUTE_118_EAST, UnusualWeather_EventScript_CleanupRoute118East + case UNUSUAL_WEATHER_ROUTE_118_WEST, UnusualWeather_EventScript_CleanupRoute118West + case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_EventScript_CleanupRoute105North + case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_EventScript_CleanupRoute105South + case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_EventScript_CleanupRoute125West + case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_EventScript_CleanupRoute125East + case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_EventScript_CleanupRoute127North + case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_EventScript_CleanupRoute127South + case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_EventScript_CleanupRoute129West + case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_EventScript_CleanupRoute129East return -Route105_EventScript_273E23:: @ 8273E23 +UnusualWeather_EventScript_CleanupRoute114North:: @ 8273E23 setmetatile 7, 3, 617, 1 setmetatile 7, 4, 617, 1 return -Route105_EventScript_273E36:: @ 8273E36 +UnusualWeather_EventScript_CleanupRoute114South:: @ 8273E36 setmetatile 6, 45, 613, 1 setmetatile 6, 46, 613, 1 return -Route105_EventScript_273E49:: @ 8273E49 +UnusualWeather_EventScript_CleanupRoute115West:: @ 8273E49 setmetatile 21, 5, 613, 1 setmetatile 21, 6, 613, 1 return -Route105_EventScript_273E5C:: @ 8273E5C +UnusualWeather_EventScript_CleanupRoute115East:: @ 8273E5C setmetatile 36, 9, 613, 1 setmetatile 36, 10, 613, 1 return -Route105_EventScript_273E6F:: @ 8273E6F +UnusualWeather_EventScript_CleanupRoute116North:: @ 8273E6F setmetatile 59, 12, 124, 1 setmetatile 59, 13, 124, 1 return -Route105_EventScript_273E82:: @ 8273E82 +UnusualWeather_EventScript_CleanupRoute116South:: @ 8273E82 setmetatile 79, 5, 124, 1 setmetatile 79, 6, 124, 1 return -Route105_EventScript_273E95:: @ 8273E95 +UnusualWeather_EventScript_CleanupRoute118East:: @ 8273E95 setmetatile 42, 5, 124, 1 setmetatile 42, 6, 121, 1 return -Route105_EventScript_273EA8:: @ 8273EA8 +UnusualWeather_EventScript_CleanupRoute118West:: @ 8273EA8 setmetatile 9, 5, 124, 1 setmetatile 9, 6, 121, 1 return -Route105_EventScript_273EBB:: @ 8273EBB +UnusualWeather_EventScript_CleanupRoute105North:: @ 8273EBB setmetatile 10, 28, 368, 0 setmetatile 11, 28, 368, 0 setmetatile 9, 29, 368, 0 @@ -3292,7 +3284,7 @@ Route105_EventScript_273EBB:: @ 8273EBB setmetatile 11, 31, 368, 0 return -Route105_EventScript_273F28:: @ 8273F28 +UnusualWeather_EventScript_CleanupRoute105South:: @ 8273F28 setmetatile 20, 53, 368, 0 setmetatile 21, 53, 368, 0 setmetatile 19, 54, 368, 0 @@ -3307,7 +3299,7 @@ Route105_EventScript_273F28:: @ 8273F28 setmetatile 21, 56, 368, 0 return -Route105_EventScript_273F95:: @ 8273F95 +UnusualWeather_EventScript_CleanupRoute125West:: @ 8273F95 setmetatile 8, 16, 368, 0 setmetatile 9, 16, 368, 0 setmetatile 7, 17, 368, 0 @@ -3322,7 +3314,7 @@ Route105_EventScript_273F95:: @ 8273F95 setmetatile 9, 19, 368, 0 return -Route105_EventScript_274002:: @ 8274002 +UnusualWeather_EventScript_CleanupRoute125East:: @ 8274002 setmetatile 53, 18, 368, 0 setmetatile 54, 18, 368, 0 setmetatile 52, 19, 368, 0 @@ -3337,7 +3329,7 @@ Route105_EventScript_274002:: @ 8274002 setmetatile 54, 21, 368, 0 return -Route105_EventScript_27406F:: @ 827406F +UnusualWeather_EventScript_CleanupRoute127North:: @ 827406F setmetatile 57, 9, 368, 0 setmetatile 58, 9, 368, 0 setmetatile 56, 10, 368, 0 @@ -3352,7 +3344,7 @@ Route105_EventScript_27406F:: @ 827406F setmetatile 58, 12, 368, 0 return -Route105_EventScript_2740DC:: @ 82740DC +UnusualWeather_EventScript_CleanupRoute127South:: @ 82740DC setmetatile 61, 30, 368, 0 setmetatile 62, 30, 368, 0 setmetatile 60, 31, 368, 0 @@ -3367,7 +3359,7 @@ Route105_EventScript_2740DC:: @ 82740DC setmetatile 62, 33, 368, 0 return -Route105_EventScript_274149:: @ 8274149 +UnusualWeather_EventScript_CleanupRoute129West:: @ 8274149 setmetatile 16, 14, 368, 0 setmetatile 17, 14, 368, 0 setmetatile 15, 15, 368, 0 @@ -3382,7 +3374,7 @@ Route105_EventScript_274149:: @ 8274149 setmetatile 17, 17, 368, 0 return -Route105_EventScript_2741B6:: @ 82741B6 +UnusualWeather_EventScript_CleanupRoute129East:: @ 82741B6 setmetatile 42, 19, 368, 0 setmetatile 43, 19, 368, 0 setmetatile 41, 20, 368, 0 @@ -3397,50 +3389,47 @@ Route105_EventScript_2741B6:: @ 82741B6 setmetatile 43, 22, 368, 0 return -Underwater3_EventScript_274223:: @ 8274223 -Underwater5_EventScript_274223:: @ 8274223 -Underwater6_EventScript_274223:: @ 8274223 -Underwater7_EventScript_274223:: @ 8274223 +UnusualWeather_Underwater_SetupEscapeWarp:: @ 8274223 switch VAR_UNUSUAL_WEATHER_LOCATION - case UNUSUAL_WEATHER_ROUTE_105_NORTH, Underwater3_EventScript_274281 - case UNUSUAL_WEATHER_ROUTE_105_SOUTH, Underwater3_EventScript_27428A - case UNUSUAL_WEATHER_ROUTE_125_WEST, Underwater3_EventScript_274293 - case UNUSUAL_WEATHER_ROUTE_125_EAST, Underwater3_EventScript_27429C - case UNUSUAL_WEATHER_ROUTE_127_NORTH, Underwater3_EventScript_2742A5 - case UNUSUAL_WEATHER_ROUTE_127_SOUTH, Underwater3_EventScript_2742AE - case UNUSUAL_WEATHER_ROUTE_129_WEST, Underwater3_EventScript_2742B7 - case UNUSUAL_WEATHER_ROUTE_129_EAST, Underwater3_EventScript_2742C0 + case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105North + case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105South + case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute125West + case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute125East + case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127North + case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127South + case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute129West + case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute129East return -Underwater3_EventScript_274281:: @ 8274281 +UnusualWeather_Underwater_SetupEscapeWarpRoute105North:: @ 8274281 setescapewarp MAP_ROUTE105, 255, 11, 29 return -Underwater3_EventScript_27428A:: @ 827428A +UnusualWeather_Underwater_SetupEscapeWarpRoute105South:: @ 827428A setescapewarp MAP_ROUTE105, 255, 21, 54 return -Underwater3_EventScript_274293:: @ 8274293 +UnusualWeather_Underwater_SetupEscapeWarpRoute125West:: @ 8274293 setescapewarp MAP_ROUTE125, 255, 9, 17 return -Underwater3_EventScript_27429C:: @ 827429C +UnusualWeather_Underwater_SetupEscapeWarpRoute125East:: @ 827429C setescapewarp MAP_ROUTE125, 255, 54, 19 return -Underwater3_EventScript_2742A5:: @ 82742A5 +UnusualWeather_Underwater_SetupEscapeWarpRoute127North:: @ 82742A5 setescapewarp MAP_ROUTE127, 255, 58, 10 return -Underwater3_EventScript_2742AE:: @ 82742AE +UnusualWeather_Underwater_SetupEscapeWarpRoute127South:: @ 82742AE setescapewarp MAP_ROUTE127, 255, 62, 31 return -Underwater3_EventScript_2742B7:: @ 82742B7 +UnusualWeather_Underwater_SetupEscapeWarpRoute129West:: @ 82742B7 setescapewarp MAP_ROUTE129, 255, 17, 15 return -Underwater3_EventScript_2742C0:: @ 82742C0 +UnusualWeather_Underwater_SetupEscapeWarpRoute129East:: @ 82742C0 setescapewarp MAP_ROUTE129, 255, 43, 20 return diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 74416f1535..1f4202ec47 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -7,9 +7,9 @@ Route105_MapScripts:: @ 81EE1DB Route105_MapScript1_1EE1EB: @ 81EE1EB call_if_unset FLAG_REGI_DOORS_OPENED, Route105_EventScript_1EE20B compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH - call_if_eq Route105_EventScript_2739AB + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105North compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH - call_if_eq Route105_EventScript_273A18 + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105South end Route105_EventScript_1EE20B:: @ 81EE20B @@ -21,13 +21,13 @@ Route105_MapScript1_1EE21E: @ 81EE21E compare VAR_0x4039, 1 call_if_eq Route105_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH - call_if_eq Route105_EventScript_273D17 + call_if_eq UnusualWeather_StartKyogreWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH - call_if_eq Route105_EventScript_273D17 + call_if_eq UnusualWeather_StartKyogreWeather end Route105_MapScript2_1EE240: @ 81EE240 - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route105_EventScript_1EE24A:: @ 81EE24A diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 856a0f1e4c..6a2f8b1740 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -8,20 +8,20 @@ Route114_MapScript1_1F253F: @ 81F253F compare VAR_0x4039, 1 call_if_eq Route114_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH - call_if_eq Route114_EventScript_273D1B + call_if_eq UnusualWeather_StartGroudonWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH - call_if_eq Route114_EventScript_273D1B + call_if_eq UnusualWeather_StartGroudonWeather end Route114_MapScript1_1F2561: @ 81F2561 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH - call_if_eq Route114_EventScript_273913 + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114North compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH - call_if_eq Route114_EventScript_273926 + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114South end Route114_MapScript2_1F2578: @ 81F2578 - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route114_EventScript_1F2582:: @ 81F2582 diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 42cf643af1..be3a98f420 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -6,22 +6,22 @@ Route115_MapScripts:: @ 81F2920 Route115_MapScript1_1F2930: @ 81F2930 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST - call_if_eq Route115_EventScript_273939 + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115West compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST - call_if_eq Route115_EventScript_27394C + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115East end Route115_MapScript1_1F2947: @ 81F2947 compare VAR_0x4039, 1 call_if_eq Route115_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST - call_if_eq Route115_EventScript_273D1B + call_if_eq UnusualWeather_StartGroudonWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST - call_if_eq Route115_EventScript_273D1B + call_if_eq UnusualWeather_StartGroudonWeather end Route115_MapScript2_1F2969: @ 81F2969 - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route115_EventScript_1F2973:: @ 81F2973 diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index afb0505c83..193b701575 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -9,9 +9,9 @@ Route116_MapScript1_1F2C1C: @ 81F2C1C compare VAR_0x4039, 1 call_if_eq Route116_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH - call_if_eq Route116_EventScript_273D1B + call_if_eq UnusualWeather_StartGroudonWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH - call_if_eq Route116_EventScript_273D1B + call_if_eq UnusualWeather_StartGroudonWeather end Route116_EventScript_1F2C47:: @ 81F2C47 @@ -20,13 +20,13 @@ Route116_EventScript_1F2C47:: @ 81F2C47 Route116_MapScript1_1F2C4F: @ 81F2C4F compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH - call_if_eq Route116_EventScript_27395F + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116North compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH - call_if_eq Route116_EventScript_273972 + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116South end Route116_MapScript2_1F2C66: @ 81F2C66 - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route116_EventScript_1F2C70:: @ 81F2C70 diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 88c4e12756..a2784b2988 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -9,20 +9,20 @@ Route118_MapScript1_1F3DCC: @ 81F3DCC compare VAR_0x4039, 1 call_if_eq Route118_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST - call_if_eq Route118_EventScript_273D1B + call_if_eq UnusualWeather_StartGroudonWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST - call_if_eq Route118_EventScript_273D1B + call_if_eq UnusualWeather_StartGroudonWeather end Route118_MapScript1_1F3DF3: @ 81F3DF3 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST - call_if_eq Route118_EventScript_273985 + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118East compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST - call_if_eq Route118_EventScript_273998 + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118West end Route118_MapScript2_1F3E0A: @ 81F3E0A - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route118_EventScript_1F3E14:: @ 81F3E14 diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 2eaeceb2f2..fa2664d686 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -131,43 +131,43 @@ Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA end Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7 - goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_27010A + goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather msgbox Route119_WeatherInstitute_2F_Text_27077E, MSGBOX_DEFAULT release end -Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A +Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather:: @ 827010A @ This code uses VAR_0x8004 to count the number of legendaries the player has defeated @ already. setvar VAR_0x8004, 0 - call_if_set FLAG_DEFEATED_KYOGRE, WeatherInstitute_UnusualWeather_IncrementLegendCount - call_if_set FLAG_DEFEATED_GROUDON, WeatherInstitute_UnusualWeather_IncrementLegendCount + call_if_set FLAG_DEFEATED_KYOGRE, WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount + call_if_set FLAG_DEFEATED_GROUDON, WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount compare VAR_0x8004, 2 - goto_if_eq WeatherInstitute_UnusualWeather_LegendariesAlreadyDefeated - call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_270159 - specialvar VAR_RESULT, sub_813B374 + goto_if_eq WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeated + call_if_unset FLAG_TEMP_2, WeatherInstitute_UnusualWeather_EventScript_DoCreateUnusualWeather + specialvar VAR_RESULT, GetUnusualWeatherMapNameAndType compare VAR_RESULT, 1 - goto_if_eq Route119_WeatherInstitute_2F_EventScript_27014F - msgbox Route119_WeatherInstitute_2F_Text_2707F1, MSGBOX_DEFAULT + goto_if_eq WeatherInstitute_UnusualWeather_EventScript_ShowKyogreWeatherMessage + msgbox WeatherInstitute_UnusualWeather_GroudonWeatherText, MSGBOX_DEFAULT release end -Route119_WeatherInstitute_2F_EventScript_27014F:: @ 827014F - msgbox Route119_WeatherInstitute_2F_Text_270873, MSGBOX_DEFAULT +WeatherInstitute_UnusualWeather_EventScript_ShowKyogreWeatherMessage:: @ 827014F + msgbox WeatherInstitute_UnusualWeather_KyogreWeatherText, MSGBOX_DEFAULT release end -Route119_WeatherInstitute_2F_EventScript_270159:: @ 8270159 +WeatherInstitute_UnusualWeather_EventScript_DoCreateUnusualWeather:: @ 8270159 special CreateUnusualWeatherEvent setflag FLAG_TEMP_2 return -WeatherInstitute_UnusualWeather_IncrementLegendCount:: @ 8270160 +WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount:: @ 8270160 addvar VAR_0x8004, 1 return -WeatherInstitute_UnusualWeather_LegendariesAlreadyDefeated:: @ 8270166 - msgbox WeatherInstitute_UnusualWeather_LegendariesAlreadyDefeatedText, MSGBOX_DEFAULT +WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeated:: @ 8270166 + msgbox WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeatedText, MSGBOX_DEFAULT release end @@ -311,7 +311,7 @@ Route119_WeatherInstitute_2F_Text_27077E: @ 827077E .string "years, but it's ridiculous to think that\l" .string "humans can freely change the weather.$" -Route119_WeatherInstitute_2F_Text_2707F1: @ 82707F1 +WeatherInstitute_UnusualWeather_GroudonWeatherText: @ 82707F1 .string "I track weather patterns over\n" .string "the HOENN region.\p" .string "Presently, a drought has been recorded\n" @@ -319,7 +319,7 @@ Route119_WeatherInstitute_2F_Text_2707F1: @ 82707F1 .string "Could that mean, somewhere near\n" .string "{STR_VAR_1}…$" -Route119_WeatherInstitute_2F_Text_270873: @ 8270873 +WeatherInstitute_UnusualWeather_KyogreWeatherText: @ 8270873 .string "I track weather patterns over\n" .string "the HOENN region.\p" .string "Presently, heavy rainfall has been\n" @@ -327,7 +327,7 @@ Route119_WeatherInstitute_2F_Text_270873: @ 8270873 .string "Could that mean, somewhere near\n" .string "{STR_VAR_1}…$" -WeatherInstitute_UnusualWeather_LegendariesAlreadyDefeatedText: @ 82708FC +WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeatedText: @ 82708FC .string "Abnormal weather conditions are\n" .string "no longer being reported.\p" .string "The occasional rainfall is a blessing,\n" diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index d1046e6a42..a2e9f1d40c 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -9,20 +9,20 @@ Route125_MapScript1_1F6758: @ 81F6758 compare VAR_0x4039, 1 call_if_eq Route125_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST - call_if_eq Route125_EventScript_273D17 + call_if_eq UnusualWeather_StartKyogreWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST - call_if_eq Route125_EventScript_273D17 + call_if_eq UnusualWeather_StartKyogreWeather end Route125_MapScript1_1F6783: @ 81F6783 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST - call_if_eq Route125_EventScript_273A85 + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125West compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST - call_if_eq Route125_EventScript_273AF2 + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125East end Route125_MapScript2_1F679A: @ 81F679A - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route125_EventScript_1F67A4:: @ 81F67A4 diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 9f2018e8fe..27b17d340f 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -9,20 +9,20 @@ Route127_MapScript1_1F69E9: @ 81F69E9 compare VAR_0x4039, 1 call_if_eq Route127_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH - call_if_eq Route127_EventScript_273D17 + call_if_eq UnusualWeather_StartKyogreWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH - call_if_eq Route127_EventScript_273D17 + call_if_eq UnusualWeather_StartKyogreWeather end Route127_MapScript1_1F6A14: @ 81F6A14 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH - call_if_eq Route127_EventScript_273B5F + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127North compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH - call_if_eq Route127_EventScript_273BCC + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127South end Route127_MapScript2_1F6A2B: @ 81F6A2B - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route127_EventScript_1F6A35:: @ 81F6A35 diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index 5f65712d79..3fc30cf913 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -6,9 +6,9 @@ Route129_MapScripts:: @ 81F7284 Route129_MapScript1_1F7294: @ 81F7294 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST - call_if_eq Route129_EventScript_273C39 + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129West compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST - call_if_eq Route129_EventScript_273CA6 + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129East end Route129_MapScript1_1F72AB: @ 81F72AB @@ -17,9 +17,9 @@ Route129_MapScript1_1F72AB: @ 81F72AB compare VAR_0x405E, 4 call_if_ge Route129_EventScript_1F72D8 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST - call_if_eq Route129_EventScript_273D17 + call_if_eq UnusualWeather_StartKyogreWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST - call_if_eq Route129_EventScript_273D17 + call_if_eq UnusualWeather_StartKyogreWeather end Route129_EventScript_1F72D8:: @ 81F72D8 @@ -27,7 +27,7 @@ Route129_EventScript_1F72D8:: @ 81F72D8 return Route129_MapScript2_1F72E2: @ 81F72E2 - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route129_EventScript_1F72EC:: @ 81F72EC diff --git a/data/maps/Underwater3/scripts.inc b/data/maps/Underwater3/scripts.inc index 99f0efcf02..53b80053f5 100644 --- a/data/maps/Underwater3/scripts.inc +++ b/data/maps/Underwater3/scripts.inc @@ -3,6 +3,6 @@ Underwater3_MapScripts:: @ 81F7724 .byte 0 Underwater3_MapScript1_1F772A: @ 81F772A - call Underwater3_EventScript_274223 + call UnusualWeather_Underwater_SetupEscapeWarp end diff --git a/data/maps/Underwater5/scripts.inc b/data/maps/Underwater5/scripts.inc index ea37514eb6..fe068207e9 100644 --- a/data/maps/Underwater5/scripts.inc +++ b/data/maps/Underwater5/scripts.inc @@ -3,6 +3,6 @@ Underwater5_MapScripts:: @ 81F7731 .byte 0 Underwater5_MapScript1_1F7737: @ 81F7737 - call Underwater5_EventScript_274223 + call UnusualWeather_Underwater_SetupEscapeWarp end diff --git a/data/maps/Underwater6/scripts.inc b/data/maps/Underwater6/scripts.inc index fee91dc757..d5a11c1bfe 100644 --- a/data/maps/Underwater6/scripts.inc +++ b/data/maps/Underwater6/scripts.inc @@ -3,6 +3,6 @@ Underwater6_MapScripts:: @ 81F773D .byte 0 Underwater6_MapScript1_1F7743: @ 81F7743 - call Underwater6_EventScript_274223 + call UnusualWeather_Underwater_SetupEscapeWarp end diff --git a/data/maps/Underwater7/scripts.inc b/data/maps/Underwater7/scripts.inc index a0eba386a0..c3bee154ee 100644 --- a/data/maps/Underwater7/scripts.inc +++ b/data/maps/Underwater7/scripts.inc @@ -3,6 +3,6 @@ Underwater7_MapScripts:: @ 81F7749 .byte 0 Underwater7_MapScript1_1F774F: @ 81F774F - call Underwater7_EventScript_274223 + call UnusualWeather_Underwater_SetupEscapeWarp end diff --git a/data/specials.inc b/data/specials.inc index 193af9e86f..eddf9a08b6 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -500,7 +500,7 @@ gSpecials:: @ 81DBA64 def_special SetMatchCallRegisteredFlag def_special sub_8175280 def_special CreateUnusualWeatherEvent - def_special sub_813B374 + def_special GetUnusualWeatherMapNameAndType def_special sub_813B490 def_special sub_80A08CC def_special Unused_SetWeatherSunny diff --git a/include/event_scripts.h b/include/event_scripts.h index 65e2c74b74..e3ec8afb48 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -564,7 +564,7 @@ extern const u8 EventScript_FallDownHole[]; extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8[]; extern const u8 EventScript_Poison[]; extern const u8 EventScript_EggHatch[]; -extern const u8 gUnknown_08273D1F[]; +extern const u8 UnusualWeather_EventScript_EndEventAndCleanup_1[]; extern const u8 IslandCave_EventScript_238EAF[]; extern const u8 MauvilleCity_EventScript_1DF7BA[]; extern const u8 Route119_EventScript_1F49EC[]; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index cffafaf9f7..90f7f4d5e1 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -559,7 +559,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) } if (sub_813B3B0() == TRUE) { - ScriptContext1_SetupScript(gUnknown_08273D1F); + ScriptContext1_SetupScript(UnusualWeather_EventScript_EndEventAndCleanup_1); return TRUE; } if (ShouldDoBrailleRegicePuzzle() == TRUE) diff --git a/src/field_specials.c b/src/field_specials.c index 1accaa5e5f..a5edb0122c 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -3446,15 +3446,17 @@ void CreateUnusualWeatherEvent(void) } } -bool32 sub_813B374(void) +// Saves the map name for the current unusual weather location in gStringVar1, then +// returns TRUE if the weather is for Kyogre, and FALSE if it's for Groudon. +bool32 GetUnusualWeatherMapNameAndType(void) { - static const u8 gUnknown_085B3400[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c }; + static const u8 sUnusualWeatherMapNumbers[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c }; - u16 var = VarGet(VAR_UNUSUAL_WEATHER_LOCATION); + u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION); - GetMapName(gStringVar1, gUnknown_085B3400[var - 1], 0); + GetMapName(gStringVar1, sUnusualWeatherMapNumbers[unusualWeather - 1], 0); - if (var < 9) + if (unusualWeather < UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START) { return FALSE; } @@ -3466,7 +3468,8 @@ bool32 sub_813B374(void) bool8 sub_813B3B0(void) { - static const u8 sUnusualWeatherMapNumbers[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c }; + // Duplicate array. + static const u8 sUnusualWeatherMapNumbers_2[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c }; u16 var1 = VarGet(VAR_0x4038); u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION); @@ -3510,7 +3513,7 @@ bool8 sub_813B3B0(void) } } - if (gSaveBlock1Ptr->location.mapNum == sUnusualWeatherMapNumbers[unusualWeather - 1] && + if (gSaveBlock1Ptr->location.mapNum == sUnusualWeatherMapNumbers_2[unusualWeather - 1] && gSaveBlock1Ptr->location.mapGroup == 0) { return TRUE; From 4b9e93850c50a2fbd380c061e129c76d33f6e452 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 27 Feb 2019 12:45:31 -0600 Subject: [PATCH 131/217] Document easy chat screen types --- data/event_scripts.s | 50 +- .../scripts.inc | 12 +- data/maps/DewfordTown/scripts.inc | 4 +- .../scripts.inc | 8 +- .../Route123_BerryMastersHouse/scripts.inc | 4 +- data/scripts/apprentice.inc | 4 +- data/scripts/gabby_and_ty.inc | 4 +- data/scripts/mauville_man.inc | 4 +- data/scripts/mystery_event_club.inc | 8 +- data/specials.inc | 2 +- .../scroll_indicator.png} | Bin .../start_select_buttons.png} | Bin .../triangle_cursor.png} | Bin include/constants/easy_chat.h | 27 + include/easy_chat.h | 28 +- include/global.h | 8 +- src/battle_tower.c | 8 +- src/easy_chat.c | 1694 +++++++++-------- src/lilycove_lady.c | 6 +- src/party_menu.c | 13 +- src/trainer_card.c | 2 +- src/tv.c | 4 +- 22 files changed, 963 insertions(+), 927 deletions(-) rename graphics/{misc/interview_arrow.png => easy_chat/scroll_indicator.png} (100%) rename graphics/{misc/interview_buttons.png => easy_chat/start_select_buttons.png} (100%) rename graphics/{misc/interview_triangle_cursor.png => easy_chat/triangle_cursor.png} (100%) diff --git a/data/event_scripts.s b/data/event_scripts.s index 55bbb76185..1453175b50 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,6 +1,7 @@ #include "constants/global.h" #include "constants/battle_frontier.h" #include "constants/battle_setup.h" +#include "constants/easy_chat.h" #include "constants/event_objects.h" #include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" @@ -1683,18 +1684,9 @@ Common_EventScript_ShowPokemonCenterSign:: @ 8271E73 msgbox gText_PokemonCenterSign, MSGBOX_SIGN end -BattleFrontier_BattleTowerLobby_EventScript_271E7C:: @ 8271E7C -DewfordTown_EventScript_271E7C:: @ 8271E7C -LilycoveCity_ContestLobby_EventScript_271E7C:: @ 8271E7C -LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C:: @ 8271E7C -MauvilleCity_PokemonCenter_1F_EventScript_271E7C:: @ 8271E7C -PetalburgCity_PokemonCenter_1F_EventScript_271E7C:: @ 8271E7C -Route111_EventScript_271E7C:: @ 8271E7C -Route123_BerryMastersHouse_EventScript_271E7C:: @ 8271E7C -SlateportCity_OceanicMuseum_1F_EventScript_271E7C:: @ 8271E7C -SlateportCity_PokemonFanClub_EventScript_271E7C:: @ 8271E7C +Common_ShowEasyChatScreen:: @ 8271E7C fadescreen 1 - special easy_chat_input_maybe + special ShowEasyChatScreen fadescreen 0 return @@ -2941,8 +2933,8 @@ EventScript_Questionnaire:: @ 827381B msgbox gUnknown_0827339F, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_2738FD - setvar VAR_0x8004, 20 - call MauvilleCity_PokemonCenter_1F_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE + call Common_ShowEasyChatScreen lock faceplayer specialvar VAR_0x8008, sub_813B490 @@ -3769,10 +3761,10 @@ SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0 SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 msgbox SlateportCity_PokemonFanClub_Text_28073B, MSGBOX_DEFAULT - setvar VAR_0x8004, 5 + setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 - setvar VAR_0x8006, 1 - call SlateportCity_PokemonFanClub_EventScript_271E7C + setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_FEMALE + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -3824,10 +3816,10 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8 SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, MSGBOX_DEFAULT - setvar VAR_0x8004, 5 + setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 - setvar VAR_0x8006, 0 - call SlateportCity_OceanicMuseum_1F_EventScript_271E7C + setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_MALE + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -3896,17 +3888,17 @@ SlateportCity_PokemonFanClub_EventScript_28C9DF:: @ 828C9DF end SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED - setvar VAR_0x8004, 7 + setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_CLUB copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 0 - call SlateportCity_PokemonFanClub_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT setvar VAR_0x8006, 1 - call SlateportCity_PokemonFanClub_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 @@ -3945,10 +3937,10 @@ LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59 LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B msgbox LilycoveCity_ContestLobby_Text_27EFE7, MSGBOX_DEFAULT - setvar VAR_0x8004, 11 + setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 0 - call LilycoveCity_ContestLobby_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -3966,10 +3958,10 @@ LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA setvar VAR_0x8004, 24 special SetContestCategoryStringVarForInterview msgbox LilycoveCity_ContestLobby_Text_27F03E, MSGBOX_DEFAULT - setvar VAR_0x8004, 11 + setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 1 - call LilycoveCity_ContestLobby_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 @@ -4034,9 +4026,9 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 compare VAR_RESULT, 1 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41 msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT - setvar VAR_0x8004, 12 + setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 - call BattleFrontier_BattleTowerLobby_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -4506,7 +4498,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A861C:: @ 82A861C special sub_818E3BC compare VAR_0x8004, 0 goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C - compare VAR_0x8004, 15 + compare VAR_0x8004, EASY_CHAT_TYPE_QUIZ_ANSWER goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8656 LilycoveCity_PokemonCenter_1F_EventScript_2A8635:: @ 82A8635 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 8d407ac1de..6d53a33e16 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -572,8 +572,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EEE7:: @ 823EEE7 BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32 msgbox BattleFrontier_BattleTowerLobby_Text_23F969, MSGBOX_DEFAULT - setvar VAR_0x8004, 1 - call BattleFrontier_BattleTowerLobby_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_START + call Common_ShowEasyChatScreen lock faceplayer goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A @@ -581,8 +581,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32 BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, MSGBOX_DEFAULT - setvar VAR_0x8004, 2 - call BattleFrontier_BattleTowerLobby_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_WON + call Common_ShowEasyChatScreen lock faceplayer goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A @@ -590,8 +590,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66 msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, MSGBOX_DEFAULT - setvar VAR_0x8004, 3 - call BattleFrontier_BattleTowerLobby_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_LOST + call Common_ShowEasyChatScreen lock faceplayer goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index d1f382e36b..ed8acea17c 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -608,8 +608,8 @@ DewfordTown_EventScript_1E9948:: @ 81E9948 DewfordTown_EventScript_1E9952:: @ 81E9952 msgbox DewfordTown_Text_1EA242, MSGBOX_DEFAULT - setvar VAR_0x8004, 9 - call DewfordTown_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_TRENDY_PHRASE + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index f65d901bb5..f83be42b9c 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -512,9 +512,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 setvar VAR_0x8004, 8 special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, MSGBOX_DEFAULT - setvar VAR_0x8004, 14 + setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION copyvar VAR_0x8005, VAR_0x800A - call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -542,9 +542,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 setvar VAR_0x8004, 8 special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, MSGBOX_DEFAULT - setvar VAR_0x8004, 14 + setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION copyvar VAR_0x8005, VAR_0x800A - call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index 6d4afa30a7..31158782da 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -41,8 +41,8 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 dotimebasedevents goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_26FA6F msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT - setvar VAR_0x8004, 13 - call Route123_BerryMastersHouse_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_GOOD_SAYING + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index ac4bd19790..d6713cde4f 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -269,8 +269,8 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4: apprentice_msg TRUE, 11 setvar VAR_0x8004, 25 special CallApprenticeFunction - setvar VAR_0x8004, 19 - call BattleFrontier_BattleTowerLobby_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_APPRENTICE + call Common_ShowEasyChatScreen lock faceplayer setvar VAR_0x8004, 21 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index ee0e533bc1..31000539c5 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -313,8 +313,8 @@ Route111_EventScript_28D0A7:: @ 828D0A7 compare VAR_RESULT, 0 goto_if_eq Route111_EventScript_28D0E1 msgbox Route111_Text_28B433, MSGBOX_DEFAULT - setvar VAR_0x8004, 10 - call Route111_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_GABBY_AND_TY + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 2791e5d9fb..0ab47ea80a 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -43,8 +43,8 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0F4:: @ 828E0F4 end MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113 - setvar VAR_0x8004, 6 - call MauvilleCity_PokemonCenter_1F_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_BARD_SONG + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index ea805edc4b..cc189a96b4 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -24,8 +24,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_291591:: @ 8291591 PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F msgbox PetalburgCity_PokemonCenter_1F_Text_291969, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, 0 - call PetalburgCity_PokemonCenter_1F_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 @@ -76,8 +76,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_291642:: @ 8291642 PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650 msgbox PetalburgCity_PokemonCenter_1F_Text_291A6B, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, 0 - call PetalburgCity_PokemonCenter_1F_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 diff --git a/data/specials.inc b/data/specials.inc index 965bef117f..e7f5e60723 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -106,7 +106,7 @@ gSpecials:: @ 81DBA64 def_special sub_80B3000 def_special SaveGame def_special DoWateringBerryTreeAnim - def_special easy_chat_input_maybe + def_special ShowEasyChatScreen def_special sub_811EECC def_special ScrSpecial_GetCurrentMauvilleMan def_special ScrSpecial_HasBardSongBeenChanged diff --git a/graphics/misc/interview_arrow.png b/graphics/easy_chat/scroll_indicator.png similarity index 100% rename from graphics/misc/interview_arrow.png rename to graphics/easy_chat/scroll_indicator.png diff --git a/graphics/misc/interview_buttons.png b/graphics/easy_chat/start_select_buttons.png similarity index 100% rename from graphics/misc/interview_buttons.png rename to graphics/easy_chat/start_select_buttons.png diff --git a/graphics/misc/interview_triangle_cursor.png b/graphics/easy_chat/triangle_cursor.png similarity index 100% rename from graphics/misc/interview_triangle_cursor.png rename to graphics/easy_chat/triangle_cursor.png diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h index 1c8866bc36..50f5994f4e 100644 --- a/include/constants/easy_chat.h +++ b/include/constants/easy_chat.h @@ -1,6 +1,33 @@ #ifndef GUARD_CONSTANTS_EASY_CHAT_H #define GUARD_CONSTANTS_EASY_CHAT_H +#define EASY_CHAT_TYPE_PROFILE 0 +#define EASY_CHAT_TYPE_BATTLE_START 1 +#define EASY_CHAT_TYPE_BATTLE_WON 2 +#define EASY_CHAT_TYPE_BATTLE_LOST 3 +#define EASY_CHAT_TYPE_MAIL 4 +#define EASY_CHAT_TYPE_INTERVIEW 5 +#define EASY_CHAT_TYPE_BARD_SONG 6 +#define EASY_CHAT_TYPE_FAN_CLUB 7 +#define EASY_CHAT_TYPE_UNK_8 8 +#define EASY_CHAT_TYPE_TRENDY_PHRASE 9 +#define EASY_CHAT_TYPE_GABBY_AND_TY 10 +#define EASY_CHAT_TYPE_CONTEST_INTERVIEW 11 +#define EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW 12 +#define EASY_CHAT_TYPE_GOOD_SAYING 13 +#define EASY_CHAT_TYPE_FAN_QUESTION 14 +#define EASY_CHAT_TYPE_QUIZ_ANSWER 15 +#define EASY_CHAT_TYPE_QUIZ_QUESTION 16 +#define EASY_CHAT_TYPE_QUIZ_SET_QUESTION 17 +#define EASY_CHAT_TYPE_QUIZ_SET_ANSWER 18 +#define EASY_CHAT_TYPE_APPRENTICE 19 +#define EASY_CHAT_TYPE_QUESTIONNAIRE 20 + +#define EASY_CHAT_PERSON_REPORTER_MALE 0 +#define EASY_CHAT_PERSON_REPORTER_FEMALE 1 +#define EASY_CHAT_PERSON_BOY 2 +#define EASY_CHAT_PERSON_DISPLAY_NONE 3 + #define EC_GROUP_POKEMON 0x0 #define EC_GROUP_TRAINER 0x1 #define EC_GROUP_STATUS 0x2 diff --git a/include/easy_chat.h b/include/easy_chat.h index b7685e48cb..2efdc4e5d6 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -6,11 +6,11 @@ struct EasyChatScreenTemplate { - u8 unk_00; + u8 type; u8 numColumns; u8 numRows; - u8 unk_03_0:7; - u8 unk_03_7:1; + u8 frameId:7; + u8 fourFooterOptions:1; const u8 *titleText; const u8 *instructionsText1; const u8 *instructionsText2; @@ -20,7 +20,7 @@ struct EasyChatScreenTemplate struct EasyChatScreen { - /*0x00*/ u8 kind; + /*0x00*/ u8 type; /*0x01*/ u8 templateId; /*0x02*/ u8 numColumns; /*0x03*/ u8 numRows; @@ -28,7 +28,7 @@ struct EasyChatScreen /*0x05*/ s8 mainCursorColumn; /*0x06*/ s8 mainCursorRow; /*0x07*/ u8 unk_07; - /*0x08*/ u8 unk_08; + /*0x08*/ u8 stateBackup; /*0x09*/ u8 unk_09; /*0x0A*/ s8 unk_0a; /*0x0B*/ s8 unk_0b; @@ -38,7 +38,7 @@ struct EasyChatScreen /*0x0F*/ u8 unk_0f; /*0x10*/ s8 unk_10; /*0x11*/ s8 unk_11; - /*0x12*/ u8 sizeParam; + /*0x12*/ u8 displayedPersonType; /*0x13*/ u8 unk_13; /*0x14*/ u8 unk_14[0x20]; /*0x34*/ const u8 *titleText; @@ -75,13 +75,13 @@ struct Unk203A11C u16 unkB00[BG_SCREEN_SIZE / 2]; }; -struct Unk08597C30 +struct EasyChatPhraseFrameDimensions { - u8 unk0_0:5; - u8 unk0_5:3; - u8 unk1; - u8 unk2; - u8 unk3; + u8 left:5; + u8 top:3; + u8 width; + u8 height; + u8 footerId; }; struct EasyChatWordInfo @@ -122,7 +122,7 @@ struct EasyChatWordsByLetter }; void InitEasyChatPhrases(void); -void easy_chat_input_maybe(void); +void ShowEasyChatScreen(void); u8 * CopyEasyChatWord(u8 *dest, u16 word); bool32 sub_811F8D8(int word); void InitializeEasyChatWordArray(u16 *words, u16 length); @@ -132,7 +132,7 @@ u16 sub_811EE38(u16 group); u16 sub_811F01C(void); u16 EasyChat_GetNumWordsInGroup(u8); u16 sub_811EE90(u16); -void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam); +void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback, u8 displayedPersonType); void sub_811F8BC(void); #endif // GUARD_EASYCHAT_H diff --git a/include/global.h b/include/global.h index ee0ba68931..cc026f36a1 100644 --- a/include/global.h +++ b/include/global.h @@ -870,10 +870,10 @@ struct SaveBlock1 /*0x2BA1*/ u8 outbreakPokemonProbability; /*0x2BA2*/ u16 outbreakDaysLeft; /*0x2BA4*/ struct GabbyAndTyData gabbyAndTyData; - /*0x2BB0*/ u16 unk2BB0[6]; - /*0x2BBC*/ u16 unk2BBC[6]; - /*0x2BC8*/ u16 unk2BC8[6]; - /*0x2BD4*/ u16 unk2BD4[6]; + /*0x2BB0*/ u16 easyChatProfile[6]; + /*0x2BBC*/ u16 easyChatBattleStart[6]; + /*0x2BC8*/ u16 easyChatBattleWon[6]; + /*0x2BD4*/ u16 easyChatBattleLost[6]; /*0x2BE0*/ struct MailStruct mail[MAIL_COUNT]; /*0x2E20*/ u8 additionalPhrases[8]; // bitfield for 33 additional phrases in easy chat system /*0x2E28*/ OldMan oldMan; diff --git a/src/battle_tower.c b/src/battle_tower.c index fbb77789e0..06aaef48d5 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -2401,9 +2401,9 @@ static void sub_8163EE4(void) for (i = 0; i < 6; i++) { - playerRecord->greeting[i] = gSaveBlock1Ptr->unk2BBC[i]; - playerRecord->speechWon[i] = gSaveBlock1Ptr->unk2BC8[i]; - playerRecord->speechLost[i] = gSaveBlock1Ptr->unk2BD4[i]; + playerRecord->greeting[i] = gSaveBlock1Ptr->easyChatBattleStart[i]; + playerRecord->speechWon[i] = gSaveBlock1Ptr->easyChatBattleWon[i]; + playerRecord->speechLost[i] = gSaveBlock1Ptr->easyChatBattleLost[i]; } for (i = 0; i < 4; i++) @@ -3059,7 +3059,7 @@ static void FillEReaderTrainerWithPlayerData(void) j = 7; for (i = 0; i < 6; i++) { - ereaderTrainer->greeting[i] = gSaveBlock1Ptr->unk2BBC[i]; + ereaderTrainer->greeting[i] = gSaveBlock1Ptr->easyChatBattleStart[i]; ereaderTrainer->farewellPlayerLost[i] = j; ereaderTrainer->farewellPlayerWon[i] = j + 6; j++; diff --git a/src/easy_chat.c b/src/easy_chat.c index 3c436246db..aa681eebaf 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -34,18 +34,18 @@ #include "constants/species.h" #define EZCHAT_TASK_STATE 0 -#define EZCHAT_TASK_KIND 1 +#define EZCHAT_TASK_TYPE 1 #define EZCHAT_TASK_WORDS 2 #define EZCHAT_TASK_MAINCALLBACK 4 #define EZCHAT_TASK_UNK06 6 #define EZCHAT_TASK_SIZE 7 -EWRAM_DATA struct EasyChatScreen *gEasyChatScreen = NULL; -EWRAM_DATA struct Unk203A11C *gUnknown_0203A11C = 0; -EWRAM_DATA struct Unk203A120 *gUnknown_0203A120 = 0; +static EWRAM_DATA struct EasyChatScreen *sEasyChatScreen = NULL; +static EWRAM_DATA struct Unk203A11C *sUnknown_0203A11C = NULL; +static EWRAM_DATA struct Unk203A120 *sUnknown_0203A120 = NULL; static void sub_811A2C0(u8); -static void sub_811A278(void); +static void MainCallback_EasyChatScreen(void); static bool8 sub_811A428(u8); static void sub_811A2FC(u8); static void sub_811A4D0(MainCallback); @@ -67,8 +67,8 @@ static u16 sub_811B0E8(void); static u16 sub_811B0F8(void); static u16 sub_811B150(void); static u16 sub_811B1B4(void); -static u8 sub_811BA68(void); -static u8 sub_811BCC8(u8); +static u8 GetEasyChatScreenFrameId(void); +static u8 GetEachChatScreenTemplateId(u8); static void sub_811BDF0(u8 *); static void sub_811BF78(void); static bool8 sub_811BF8C(void); @@ -79,7 +79,7 @@ static bool8 sub_811C170(void); static bool8 sub_811F28C(void); static void sub_811F2B8(void); static u8 sub_811F3AC(void); -static int sub_811BA3C(void); +static int FooterHasFourOptions(void); static int sub_811B184(void); static int sub_811B264(void); static int sub_811B32C(void); @@ -169,7 +169,7 @@ static bool8 sub_811CDD4(void); static bool8 sub_811CE14(void); static bool8 sub_811CE54(void); static void sub_811DF60(u8, u8); -static int sub_811E920(int); +static int GetFooterOptionXOffset(int); static void sub_811DF90(void); static void sub_811D104(u8); static void sub_811D214(u8); @@ -228,10 +228,10 @@ static u16 sub_811F5C4(u16); static u16 sub_811F6B8(u16); static bool8 sub_811F764(u16, u8); static int sub_811F838(u16); -static void sub_811A8CC(void); -static void sub_811A8F0(void); -static void sub_811A914(void); -static void sub_811A938(void); +static void DoQuizAnswerEasyChatScreen(void); +static void DoQuizQuestionEasyChatScreen(void); +static void DoQuizSetAnswerEasyChatScreen(void); +static void DoQuizSetQuestionEasyChatScreen(void); struct Unk8597530 { @@ -242,28 +242,29 @@ struct Unk8597530 static const struct Unk8597530 sUnknown_08597530[] = { { .word = 26, - .callback = sub_811A8CC, + .callback = DoQuizAnswerEasyChatScreen, }, { .word = 25, - .callback = sub_811A8F0, + .callback = DoQuizQuestionEasyChatScreen, }, { .word = 28, - .callback = sub_811A914, + .callback = DoQuizSetAnswerEasyChatScreen, }, { .word = 27, - .callback = sub_811A938, + .callback = DoQuizSetQuestionEasyChatScreen, }, }; -static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { + +static const struct EasyChatScreenTemplate sEasyChatScreenTemplates[] = { { - .unk_00 = 0, + .type = EASY_CHAT_TYPE_PROFILE, .numColumns = 2, .numRows = 2, - .unk_03_0 = 0, - .unk_03_7 = 0, + .frameId = 0, + .fourFooterOptions = FALSE, .titleText = gText_Profile, .instructionsText1 = gText_CombineFourWordsOrPhrases, .instructionsText2 = gText_AndMakeYourProfile, @@ -271,11 +272,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 1, + .type = EASY_CHAT_TYPE_BATTLE_START, .numColumns = 2, .numRows = 3, - .unk_03_0 = 1, - .unk_03_7 = 0, + .frameId = 1, + .fourFooterOptions = FALSE, .titleText = gText_AtTheBattlesStart, .instructionsText1 = gText_CombineSixWordsOrPhrases, .instructionsText2 = gText_AndMakeAMessage, @@ -283,11 +284,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 2, + .type = EASY_CHAT_TYPE_BATTLE_WON, .numColumns = 2, .numRows = 3, - .unk_03_0 = 1, - .unk_03_7 = 0, + .frameId = 1, + .fourFooterOptions = FALSE, .titleText = gText_UponWinningABattle, .instructionsText1 = gText_CombineSixWordsOrPhrases, .instructionsText2 = gText_AndMakeAMessage, @@ -295,11 +296,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 3, + .type = EASY_CHAT_TYPE_BATTLE_LOST, .numColumns = 2, .numRows = 3, - .unk_03_0 = 1, - .unk_03_7 = 0, + .frameId = 1, + .fourFooterOptions = FALSE, .titleText = gText_UponLosingABattle, .instructionsText1 = gText_CombineSixWordsOrPhrases, .instructionsText2 = gText_AndMakeAMessage, @@ -307,11 +308,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 4, + .type = EASY_CHAT_TYPE_MAIL, .numColumns = 2, .numRows = 5, - .unk_03_0 = 2, - .unk_03_7 = 0, + .frameId = 2, + .fourFooterOptions = FALSE, .titleText = NULL, .instructionsText1 = gText_CombineNineWordsOrPhrases, .instructionsText2 = gText_AndMakeAMessage2, @@ -319,11 +320,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 5, + .type = EASY_CHAT_TYPE_INTERVIEW, .numColumns = 2, .numRows = 2, - .unk_03_0 = 5, - .unk_03_7 = 0, + .frameId = 5, + .fourFooterOptions = FALSE, .titleText = gText_Interview, .instructionsText1 = gText_CombineFourWordsOrPhrases, .instructionsText2 = gText_LetsReplyToTheInterview, @@ -331,11 +332,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 6, + .type = EASY_CHAT_TYPE_BARD_SONG, .numColumns = 2, .numRows = 3, - .unk_03_0 = 1, - .unk_03_7 = 0, + .frameId = 1, + .fourFooterOptions = FALSE, .titleText = gText_TheBardsSong, .instructionsText1 = gText_ChangeJustOneWordOrPhrase, .instructionsText2 = gText_AndImproveTheBardsSong, @@ -343,11 +344,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 7, + .type = EASY_CHAT_TYPE_FAN_CLUB, .numColumns = 1, .numRows = 1, - .unk_03_0 = 4, - .unk_03_7 = 0, + .frameId = 4, + .fourFooterOptions = FALSE, .titleText = gText_Interview, .instructionsText1 = gText_FindWordsThatDescribeYour, .instructionsText2 = gText_FeelingsRightNow, @@ -355,11 +356,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 9, + .type = EASY_CHAT_TYPE_TRENDY_PHRASE, .numColumns = 2, .numRows = 1, - .unk_03_0 = 3, - .unk_03_7 = 0, + .frameId = 3, + .fourFooterOptions = FALSE, .titleText = gText_WhatsHipAndHappening, .instructionsText1 = gText_CombineTwoWordsOrPhrases, .instructionsText2 = gText_AndMakeATrendySaying, @@ -367,11 +368,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 16, + .type = EASY_CHAT_TYPE_QUIZ_QUESTION, .numColumns = 2, .numRows = 5, - .unk_03_0 = 7, - .unk_03_7 = 1, + .frameId = 7, + .fourFooterOptions = TRUE, .titleText = NULL, .instructionsText1 = gText_AfterYouHaveReadTheQuiz, .instructionsText2 = gText_QuestionPressTheAButton, @@ -379,11 +380,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = NULL, }, { - .unk_00 = 15, + .type = EASY_CHAT_TYPE_QUIZ_ANSWER, .numColumns = 1, .numRows = 1, - .unk_03_0 = 6, - .unk_03_7 = 1, + .frameId = 6, + .fourFooterOptions = TRUE, .titleText = gText_TheQuizAnswerIs, .instructionsText1 = gText_OutOfTheListedChoices, .instructionsText2 = gText_SelectTheAnswerToTheQuiz, @@ -391,11 +392,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 17, + .type = EASY_CHAT_TYPE_QUIZ_SET_QUESTION, .numColumns = 2, .numRows = 5, - .unk_03_0 = 8, - .unk_03_7 = 1, + .frameId = 8, + .fourFooterOptions = TRUE, .titleText = NULL, .instructionsText1 = gText_CombineNineWordsOrPhrases, .instructionsText2 = gText_AndCreateAQuiz, @@ -403,11 +404,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = NULL, }, { - .unk_00 = 18, + .type = EASY_CHAT_TYPE_QUIZ_SET_ANSWER, .numColumns = 1, .numRows = 1, - .unk_03_0 = 6, - .unk_03_7 = 1, + .frameId = 6, + .fourFooterOptions = TRUE, .titleText = gText_TheQuizAnswerIs, .instructionsText1 = gText_PickAWordOrPhraseAnd, .instructionsText2 = gText_SetTheQuizAnswer, @@ -415,11 +416,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = NULL, }, { - .unk_00 = 6, + .type = EASY_CHAT_TYPE_BARD_SONG, .numColumns = 2, .numRows = 3, - .unk_03_0 = 1, - .unk_03_7 = 0, + .frameId = 1, + .fourFooterOptions = FALSE, .titleText = gText_TheBardsSong, .instructionsText1 = gText_ChangeJustOneWordOrPhrase, .instructionsText2 = gText_AndImproveTheBardsSong, @@ -427,11 +428,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 19, + .type = EASY_CHAT_TYPE_APPRENTICE, .numColumns = 2, .numRows = 3, - .unk_03_0 = 1, - .unk_03_7 = 0, + .frameId = 1, + .fourFooterOptions = FALSE, .titleText = gText_ApprenticesPhrase, .instructionsText1 = gText_FindWordsWhichFit, .instructionsText2 = gText_TheTrainersImage, @@ -439,11 +440,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 13, + .type = EASY_CHAT_TYPE_GOOD_SAYING, .numColumns = 2, .numRows = 1, - .unk_03_0 = 3, - .unk_03_7 = 0, + .frameId = 3, + .fourFooterOptions = FALSE, .titleText = gText_GoodSaying, .instructionsText1 = gText_CombineTwoWordsOrPhrases2, .instructionsText2 = gText_ToTeachHerAGoodSaying, @@ -451,11 +452,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 10, + .type = EASY_CHAT_TYPE_GABBY_AND_TY, .numColumns = 1, .numRows = 1, - .unk_03_0 = 4, - .unk_03_7 = 0, + .frameId = 4, + .fourFooterOptions = FALSE, .titleText = gText_Interview, .instructionsText1 = gText_FindWordsThatDescribeYour, .instructionsText2 = gText_FeelingsRightNow, @@ -463,11 +464,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 12, + .type = EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW, .numColumns = 1, .numRows = 1, - .unk_03_0 = 4, - .unk_03_7 = 0, + .frameId = 4, + .fourFooterOptions = FALSE, .titleText = gText_Interview, .instructionsText1 = gText_FindWordsThatDescribeYour, .instructionsText2 = gText_FeelingsRightNow, @@ -475,11 +476,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 11, + .type = EASY_CHAT_TYPE_CONTEST_INTERVIEW, .numColumns = 1, .numRows = 1, - .unk_03_0 = 4, - .unk_03_7 = 0, + .frameId = 4, + .fourFooterOptions = FALSE, .titleText = gText_Interview, .instructionsText1 = gText_FindWordsThatDescribeYour, .instructionsText2 = gText_FeelingsRightNow, @@ -487,11 +488,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 14, + .type = EASY_CHAT_TYPE_FAN_QUESTION, .numColumns = 1, .numRows = 1, - .unk_03_0 = 4, - .unk_03_7 = 0, + .frameId = 4, + .fourFooterOptions = FALSE, .titleText = gText_FansQuestion, .instructionsText1 = gText_FindWordsWhichFit, .instructionsText2 = gText_TheTrainersImage, @@ -499,11 +500,11 @@ static const struct EasyChatScreenTemplate gEasyChatScreenTemplates[] = { .confirmText2 = gText_IsAsShownOkay, }, { - .unk_00 = 20, + .type = EASY_CHAT_TYPE_QUESTIONNAIRE, .numColumns = 2, .numRows = 2, - .unk_03_0 = 0, - .unk_03_7 = 0, + .frameId = 0, + .fourFooterOptions = FALSE, .titleText = gText_Questionnaire, .instructionsText1 = gText_CombineFourWordsOrPhrases, .instructionsText2 = gText_AndFillOutTheQuestionnaire, @@ -534,10 +535,10 @@ static const u16 sBerryMasterWifePhrases[][2] = { {EC_WORD_SUPER, EC_WORD_HUSTLE}, }; -static const u16 sUnknown_08597780[] = INCBIN_U16("graphics/misc/interview_triangle_cursor.gbapal"); -static const u32 sUnknown_085977A0[] = INCBIN_U32("graphics/misc/interview_triangle_cursor.4bpp"); -static const u32 sUnknown_085977C0[] = INCBIN_U32("graphics/misc/interview_arrow.4bpp"); -static const u32 sUnknown_085978C0[] = INCBIN_U32("graphics/misc/interview_buttons.4bpp"); +static const u16 sEasyChatTriangleCursorPalette[] = INCBIN_U16("graphics/easy_chat/triangle_cursor.gbapal"); +static const u32 sEasyChatTriangleCursorGfx[] = INCBIN_U32("graphics/easy_chat/triangle_cursor.4bpp"); +static const u32 sEasyChatScrollIndicatorGfx[] = INCBIN_U32("graphics/easy_chat/scroll_indicator.4bpp"); +static const u32 sEasyChatStartSelectButtonsGfx[] = INCBIN_U32("graphics/easy_chat/start_select_buttons.4bpp"); static const u16 sUnknown_085979C0[] = INCBIN_U16("graphics/misc/interview_frame.gbapal"); static const u32 sUnknown_085979E0[] = INCBIN_U32("graphics/misc/interview_frame.4bpp.lz"); static const u16 sUnknown_08597B14[] = INCBIN_U16("graphics/misc/interview_frame_orange.gbapal"); @@ -546,69 +547,69 @@ static const u32 sUnknown_08597B54[] = INCBIN_U32("graphics/misc/interview_frame static const u16 sUnknown_08597C1C[] = INCBIN_U16("graphics/misc/8597C1C.gbapal"); static const u16 sUnknown_08597C24[] = INCBIN_U16("graphics/misc/8597C24.gbapal"); -static const struct Unk08597C30 gUnknown_08597C30[] = { +static const struct EasyChatPhraseFrameDimensions sPhraseFrameDimensions[] = { { - .unk0_0 = 3, - .unk0_5 = 4, - .unk1 = 24, - .unk2 = 4, - .unk3 = 0, + .left = 3, + .top = 4, + .width = 24, + .height = 4, + .footerId = 0, }, { - .unk0_0 = 3, - .unk0_5 = 3, - .unk1 = 24, - .unk2 = 6, - .unk3 = 0, + .left = 3, + .top = 3, + .width = 24, + .height = 6, + .footerId = 0, }, { - .unk0_0 = 3, - .unk0_5 = 0, - .unk1 = 24, - .unk2 = 10, - .unk3 = 0, + .left = 3, + .top = 0, + .width = 24, + .height = 10, + .footerId = 0, }, { - .unk0_0 = 3, - .unk0_5 = 5, - .unk1 = 24, - .unk2 = 2, - .unk3 = 0, + .left = 3, + .top = 5, + .width = 24, + .height = 2, + .footerId = 0, }, { - .unk0_0 = 16, - .unk0_5 = 5, - .unk1 = 12, - .unk2 = 2, - .unk3 = 0, + .left = 16, + .top = 5, + .width = 12, + .height = 2, + .footerId = 0, }, { - .unk0_0 = 3, - .unk0_5 = 4, - .unk1 = 24, - .unk2 = 4, - .unk3 = 0, + .left = 3, + .top = 4, + .width = 24, + .height = 4, + .footerId = 0, }, { - .unk0_0 = 9, - .unk0_5 = 4, - .unk1 = 12, - .unk2 = 2, - .unk3 = 1, + .left = 9, + .top = 4, + .width = 12, + .height = 2, + .footerId = 1, }, { - .unk0_0 = 5, - .unk0_5 = 3, - .unk1 = 0x14, - .unk2 = 10, - .unk3 = 3, + .left = 5, + .top = 3, + .width = 0x14, + .height = 10, + .footerId = 3, }, { - .unk0_0 = 3, - .unk0_5 = 0, - .unk1 = 24, - .unk2 = 10, - .unk3 = 2, + .left = 3, + .top = 0, + .width = 24, + .height = 10, + .footerId = 2, }, }; @@ -701,28 +702,28 @@ static const u8 *const sUnknown_08597C90[] = { gUnknown_862B86C, }; -static const struct SpriteSheet sUnknown_08597CA0[] = { +static const struct SpriteSheet sEasyChatSpriteSheets[] = { { - .data = sUnknown_085977A0, + .data = sEasyChatTriangleCursorGfx, .size = 0x0020, .tag = 0 }, { - .data = sUnknown_085977C0, + .data = sEasyChatScrollIndicatorGfx, .size = 0x0100, .tag = 2 }, { - .data = sUnknown_085978C0, + .data = sEasyChatStartSelectButtonsGfx, .size = 0x0100, .tag = 3 }, {0} }; -static const struct SpritePalette sUnknown_08597CC0[] = { +static const struct SpritePalette sEasyChatSpritePalettes[] = { { - .data = sUnknown_08597780, + .data = sEasyChatTriangleCursorPalette, .tag = 0, }, { @@ -999,7 +1000,7 @@ static const struct SpriteTemplate sUnknown_08597E48 = { .callback = SpriteCallbackDummy, }; -static const u8 sUnknown_08597E60[][4] = { +static const u8 sFooterOptionXOffsets[][4] = { {16, 111, 196, 0}, {16, 78, 130, 160}, {16, 80, 134, 170}, @@ -1039,14 +1040,14 @@ const u8 *const gEasyChatGroupNamePointers[] = { [EC_GROUP_POKEMON_2] = gEasyChatGroupName_Pokemon2, }; -static const u16 sUnknown_0859E62C[] = { +static const u16 sDefaultProfileWords[] = { EC_WORD_I_AM, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_FRIEND, }; -static const u16 sUnknown_0859E634[] = { +static const u16 sDefaultBattleStartWords[] = { EC_WORD_ARE, EC_WORD_YOU, EC_WORD_READY, @@ -1077,20 +1078,20 @@ static const u16 sUnknown_0859E658[] = { SPECIES_DEOXYS, }; -void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam) +void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback, u8 displayedPersonType) { u8 taskId; ResetTasks(); taskId = CreateTask(sub_811A2C0, 0); - gTasks[taskId].data[EZCHAT_TASK_KIND] = kind; - gTasks[taskId].data[EZCHAT_TASK_SIZE] = sizeParam; + gTasks[taskId].data[EZCHAT_TASK_TYPE] = type; + gTasks[taskId].data[EZCHAT_TASK_SIZE] = displayedPersonType; SetWordTaskArg(taskId, EZCHAT_TASK_WORDS, (u32)words); SetWordTaskArg(taskId, EZCHAT_TASK_MAINCALLBACK, (u32)callback); - SetMainCallback2(sub_811A278); + SetMainCallback2(MainCallback_EasyChatScreen); } -static void sub_811A278(void) +static void MainCallback_EasyChatScreen(void) { RunTasks(); AnimateSprites(); @@ -1098,7 +1099,7 @@ static void sub_811A278(void) UpdatePaletteFade(); } -static void sub_811A290(void) +static void VBlankCallback_EasyChatScreen(void) { TransferPlttBuffer(); LoadOam(); @@ -1136,22 +1137,22 @@ static void sub_811A2FC(u8 taskId) switch (data[EZCHAT_TASK_STATE]) { case 0: - SetVBlankCallback(sub_811A290); + SetVBlankCallback(VBlankCallback_EasyChatScreen); BlendPalettes(0xFFFFFFFF, 16, 0); - BeginNormalPaletteFade(-1, -1, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, 0); data[EZCHAT_TASK_STATE] = 5; break; case 1: v0 = sub_811AAAC(); if (sub_811A88C(v0)) { - BeginNormalPaletteFade(-1, -2, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, 0); data[EZCHAT_TASK_STATE] = 3; data[EZCHAT_TASK_UNK06] = v0; } else if (v0 == 0x18) { - BeginNormalPaletteFade(-1, -1, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, 0); data[EZCHAT_TASK_STATE] = 4; } else if (v0 != 0) @@ -1163,27 +1164,19 @@ static void sub_811A2FC(u8 taskId) break; case 2: if (!sub_811C170()) - { data[EZCHAT_TASK_STATE] = 1; - } break; case 3: if (!gPaletteFade.active) - { sub_811A8A4(data[EZCHAT_TASK_UNK06]); - } break; case 4: if (!gPaletteFade.active) - { sub_811A4D0((MainCallback)GetWordTaskArg(taskId, EZCHAT_TASK_MAINCALLBACK)); - } break; case 5: if (!gPaletteFade.active) - { data[EZCHAT_TASK_STATE] = 1; - } break; } } @@ -1208,7 +1201,7 @@ static bool8 sub_811A428(u8 taskId) } break; case 2: - if (!EasyChat_AllocateResources(data[EZCHAT_TASK_KIND], (u16 *)GetWordTaskArg(taskId, EZCHAT_TASK_WORDS), data[EZCHAT_TASK_SIZE])) + if (!EasyChat_AllocateResources(data[EZCHAT_TASK_TYPE], (u16 *)GetWordTaskArg(taskId, EZCHAT_TASK_WORDS), data[EZCHAT_TASK_SIZE])) { sub_811A4D0((MainCallback)GetWordTaskArg(taskId, EZCHAT_TASK_MAINCALLBACK)); } @@ -1241,98 +1234,98 @@ static void sub_811A4D0(MainCallback callback) SetMainCallback2(callback); } -void easy_chat_input_maybe(void) +void ShowEasyChatScreen(void) { int i; u16 *words; struct MauvilleManBard *bard; - u8 sizeParam = 3; + u8 displayedPersonType = EASY_CHAT_PERSON_DISPLAY_NONE; switch (gSpecialVar_0x8004) { - case 0: - words = gSaveBlock1Ptr->unk2BB0; + case EASY_CHAT_TYPE_PROFILE: + words = gSaveBlock1Ptr->easyChatProfile; break; - case 1: - words = gSaveBlock1Ptr->unk2BBC; + case EASY_CHAT_TYPE_BATTLE_START: + words = gSaveBlock1Ptr->easyChatBattleStart; break; - case 2: - words = gSaveBlock1Ptr->unk2BC8; + case EASY_CHAT_TYPE_BATTLE_WON: + words = gSaveBlock1Ptr->easyChatBattleWon; break; - case 3: - words = gSaveBlock1Ptr->unk2BD4; + case EASY_CHAT_TYPE_BATTLE_LOST: + words = gSaveBlock1Ptr->easyChatBattleLost; break; - case 4: + case EASY_CHAT_TYPE_MAIL: words = gSaveBlock1Ptr->mail[gSpecialVar_0x8005].words; break; - case 6: + case EASY_CHAT_TYPE_BARD_SONG: bard = &gSaveBlock1Ptr->oldMan.bard; for (i = 0; i < 6; i ++) - { bard->temporaryLyrics[i] = bard->songLyrics[i]; - } + words = bard->temporaryLyrics; break; - case 5: + case EASY_CHAT_TYPE_INTERVIEW: words = gSaveBlock1Ptr->tvShows[gSpecialVar_0x8005].bravoTrainer.words; - sizeParam = gSpecialVar_0x8006; + displayedPersonType = gSpecialVar_0x8006; break; - case 7: + case EASY_CHAT_TYPE_FAN_CLUB: words = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8005].fanclubOpinions.words[gSpecialVar_0x8006]; - sizeParam = 1; + displayedPersonType = EASY_CHAT_PERSON_REPORTER_FEMALE; break; - case 8: + case EASY_CHAT_TYPE_UNK_8: words = gSaveBlock1Ptr->tvShows[gSpecialVar_0x8005].unkShow04.words; - sizeParam = 0; + displayedPersonType = EASY_CHAT_PERSON_REPORTER_MALE; break; - case 9: + case EASY_CHAT_TYPE_TRENDY_PHRASE: words = (u16 *)gStringVar3; words[0] = gSaveBlock1Ptr->easyChatPairs[0].words[0]; words[1] = gSaveBlock1Ptr->easyChatPairs[0].words[1]; break; - case 10: + case EASY_CHAT_TYPE_GABBY_AND_TY: words = gSaveBlock1Ptr->gabbyAndTyData.quote; *words = -1; - sizeParam = 1; + displayedPersonType = EASY_CHAT_PERSON_REPORTER_FEMALE; break; - case 11: + case EASY_CHAT_TYPE_CONTEST_INTERVIEW: words = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8005].bravoTrainer.words[gSpecialVar_0x8006]; - sizeParam = 0; + displayedPersonType = EASY_CHAT_PERSON_REPORTER_MALE; break; - case 12: + case EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW: words = gSaveBlock1Ptr->tvShows[gSpecialVar_0x8005].fanclubOpinions.words18; - sizeParam = 1; + displayedPersonType = EASY_CHAT_PERSON_REPORTER_FEMALE; break; - case 13: + case EASY_CHAT_TYPE_GOOD_SAYING: words = (u16 *)gStringVar3; InitializeEasyChatWordArray(words, 2); break; - case 14: + case EASY_CHAT_TYPE_FAN_QUESTION: words = gSaveBlock1Ptr->tvShows[gSpecialVar_0x8005].fanClubSpecial.words; words[0] = -1; - sizeParam = 2; + displayedPersonType = EASY_CHAT_PERSON_BOY; break; - case 15: + case EASY_CHAT_TYPE_QUIZ_ANSWER: words = &gSaveBlock1Ptr->lilycoveLady.quiz.unk_016; break; - case 16: + case EASY_CHAT_TYPE_QUIZ_QUESTION: return; - case 17: + case EASY_CHAT_TYPE_QUIZ_SET_QUESTION: words = gSaveBlock1Ptr->lilycoveLady.quiz.unk_002; break; - case 18: + case EASY_CHAT_TYPE_QUIZ_SET_ANSWER: words = &gSaveBlock1Ptr->lilycoveLady.quiz.unk_014; break; - case 19: + case EASY_CHAT_TYPE_APPRENTICE: words = gSaveBlock2Ptr->apprentices[0].easyChatWords; break; - case 20: + case EASY_CHAT_TYPE_QUESTIONNAIRE: words = GetSaveBlock1Field3564(); break; default: return; } + CleanupOverworldWindowsAndTilemaps(); - sub_811A20C(gSpecialVar_0x8004, words, CB2_ReturnToFieldContinueScript, sizeParam); + DoEasyChatScreen(gSpecialVar_0x8004, words, CB2_ReturnToFieldContinueScript, displayedPersonType); } static void sub_811A7E4(void) @@ -1351,7 +1344,7 @@ static void sub_811A7E4(void) lilycoveLady = &gSaveBlock1Ptr->lilycoveLady; lilycoveLady->quiz.unk_016 = -1; CleanupOverworldWindowsAndTilemaps(); - sub_811A8F0(); + DoQuizQuestionEasyChatScreen(); } return; } @@ -1389,88 +1382,100 @@ static void sub_811A8A4(u16 word) sub_811A4D0(sUnknown_08597530[i].callback); } -static void sub_811A8CC(void) +static void DoQuizAnswerEasyChatScreen(void) { - sub_811A20C(0xF, &gSaveBlock1Ptr->lilycoveLady.quiz.unk_016, CB2_ReturnToFieldContinueScript, 3); + DoEasyChatScreen( + EASY_CHAT_TYPE_QUIZ_ANSWER, + &gSaveBlock1Ptr->lilycoveLady.quiz.unk_016, + CB2_ReturnToFieldContinueScript, + EASY_CHAT_PERSON_DISPLAY_NONE); } -static void sub_811A8F0(void) +static void DoQuizQuestionEasyChatScreen(void) { - sub_811A20C(0x10, gSaveBlock1Ptr->lilycoveLady.quiz.unk_002, CB2_ReturnToFieldContinueScript, 3); + DoEasyChatScreen(EASY_CHAT_TYPE_QUIZ_QUESTION, + gSaveBlock1Ptr->lilycoveLady.quiz.unk_002, + CB2_ReturnToFieldContinueScript, + EASY_CHAT_PERSON_DISPLAY_NONE); } -static void sub_811A914(void) +static void DoQuizSetAnswerEasyChatScreen(void) { - sub_811A20C(0x12, &gSaveBlock1Ptr->lilycoveLady.quiz.unk_014, CB2_ReturnToFieldContinueScript, 3); + DoEasyChatScreen(EASY_CHAT_TYPE_QUIZ_SET_ANSWER, + &gSaveBlock1Ptr->lilycoveLady.quiz.unk_014, + CB2_ReturnToFieldContinueScript, + EASY_CHAT_PERSON_DISPLAY_NONE); } -static void sub_811A938(void) +static void DoQuizSetQuestionEasyChatScreen(void) { - sub_811A20C(0x11, gSaveBlock1Ptr->lilycoveLady.quiz.unk_002, CB2_ReturnToFieldContinueScript, 3); + DoEasyChatScreen(EASY_CHAT_TYPE_QUIZ_SET_QUESTION, + gSaveBlock1Ptr->lilycoveLady.quiz.unk_002, + CB2_ReturnToFieldContinueScript, + EASY_CHAT_PERSON_DISPLAY_NONE); } -static bool8 EasyChat_AllocateResources(u8 kind, u16 *words, u8 sizeParam) +static bool8 EasyChat_AllocateResources(u8 type, u16 *words, u8 displayedPersonType) { u8 templateId; int i; - gEasyChatScreen = malloc(sizeof(*gEasyChatScreen)); - if (gEasyChatScreen == NULL) - { + sEasyChatScreen = malloc(sizeof(*sEasyChatScreen)); + if (sEasyChatScreen == NULL) return FALSE; - } - gEasyChatScreen->kind = kind; - gEasyChatScreen->words = words; - gEasyChatScreen->mainCursorColumn = 0; - gEasyChatScreen->mainCursorRow = 0; - gEasyChatScreen->unk_09 = 0; - gEasyChatScreen->sizeParam = sizeParam; - gEasyChatScreen->unk_13 = 0; - templateId = sub_811BCC8(kind); - if (kind == 0x10) + + sEasyChatScreen->type = type; + sEasyChatScreen->words = words; + sEasyChatScreen->mainCursorColumn = 0; + sEasyChatScreen->mainCursorRow = 0; + sEasyChatScreen->unk_09 = 0; + sEasyChatScreen->displayedPersonType = displayedPersonType; + sEasyChatScreen->unk_13 = 0; + templateId = GetEachChatScreenTemplateId(type); + if (type == EASY_CHAT_TYPE_QUIZ_QUESTION) { - sub_811BDF0(gEasyChatScreen->unk_14); - gEasyChatScreen->titleText = gEasyChatScreen->unk_14; - gEasyChatScreen->state = 7; + sub_811BDF0(sEasyChatScreen->unk_14); + sEasyChatScreen->titleText = sEasyChatScreen->unk_14; + sEasyChatScreen->state = 7; } else { - gEasyChatScreen->state = 0; - gEasyChatScreen->titleText = gEasyChatScreenTemplates[templateId].titleText; - } - gEasyChatScreen->numColumns = gEasyChatScreenTemplates[templateId].numColumns; - gEasyChatScreen->numRows = gEasyChatScreenTemplates[templateId].numRows; - gEasyChatScreen->unk_07 = gEasyChatScreen->numColumns * gEasyChatScreen->numRows; - gEasyChatScreen->templateId = templateId; - if (gEasyChatScreen->unk_07 > 9) - { - gEasyChatScreen->unk_07 = 9; + sEasyChatScreen->state = 0; + sEasyChatScreen->titleText = sEasyChatScreenTemplates[templateId].titleText; } + + sEasyChatScreen->numColumns = sEasyChatScreenTemplates[templateId].numColumns; + sEasyChatScreen->numRows = sEasyChatScreenTemplates[templateId].numRows; + sEasyChatScreen->unk_07 = sEasyChatScreen->numColumns * sEasyChatScreen->numRows; + sEasyChatScreen->templateId = templateId; + if (sEasyChatScreen->unk_07 > 9) + sEasyChatScreen->unk_07 = 9; + if (words != NULL) { - CpuCopy16(words, gEasyChatScreen->ecWordBuffer, gEasyChatScreen->unk_07 * sizeof(u16)); + CpuCopy16(words, sEasyChatScreen->ecWordBuffer, sEasyChatScreen->unk_07 * sizeof(u16)); } else { - for (i = 0; i < gEasyChatScreen->unk_07; i ++) - { - gEasyChatScreen->ecWordBuffer[i] = -1; - } - gEasyChatScreen->words = gEasyChatScreen->ecWordBuffer; + for (i = 0; i < sEasyChatScreen->unk_07; i ++) + sEasyChatScreen->ecWordBuffer[i] = -1; + + sEasyChatScreen->words = sEasyChatScreen->ecWordBuffer; } - gEasyChatScreen->unk_0d = (sub_811F3AC() - 1) / 2 + 1; + + sEasyChatScreen->unk_0d = (sub_811F3AC() - 1) / 2 + 1; return TRUE; } static void EasyChat_FreeResources(void) { - if (gEasyChatScreen != NULL) - FREE_AND_SET_NULL(gEasyChatScreen); + if (sEasyChatScreen != NULL) + FREE_AND_SET_NULL(sEasyChatScreen); } static u16 sub_811AAAC(void) { - switch (gEasyChatScreen->state) + switch (sEasyChatScreen->state) { case 0: return sub_811AB68(); @@ -1500,7 +1505,7 @@ static u16 sub_811AAAC(void) bool32 sub_811AB44(void) { - switch (sub_811BA68()) + switch (GetEasyChatScreenFrameId()) { case 2: case 7: @@ -1517,10 +1522,10 @@ static u16 sub_811AB68(void) if (gMain.newKeys & A_BUTTON) { sub_811BF78(); - gEasyChatScreen->state = 2; - gEasyChatScreen->unk_0a = 0; - gEasyChatScreen->unk_0b = 0; - gEasyChatScreen->unk_0c = 0; + sEasyChatScreen->state = 2; + sEasyChatScreen->unk_0a = 0; + sEasyChatScreen->unk_0b = 0; + sEasyChatScreen->unk_0c = 0; return 9; } else if (gMain.newKeys & B_BUTTON) @@ -1533,51 +1538,51 @@ static u16 sub_811AB68(void) } else if (gMain.newKeys & DPAD_UP) { - gEasyChatScreen->mainCursorRow--; + sEasyChatScreen->mainCursorRow--; break; } else if (gMain.newKeys & DPAD_LEFT) { - gEasyChatScreen->mainCursorColumn--; + sEasyChatScreen->mainCursorColumn--; break; } else if (gMain.newKeys & DPAD_DOWN) { - gEasyChatScreen->mainCursorRow++; + sEasyChatScreen->mainCursorRow++; break; } else if (gMain.newKeys & DPAD_RIGHT) { - gEasyChatScreen->mainCursorColumn++; + sEasyChatScreen->mainCursorColumn++; break; } return 0; } while (0); - if (gEasyChatScreen->mainCursorRow < 0) - gEasyChatScreen->mainCursorRow = gEasyChatScreenTemplates[gEasyChatScreen->templateId].numRows; + if (sEasyChatScreen->mainCursorRow < 0) + sEasyChatScreen->mainCursorRow = sEasyChatScreenTemplates[sEasyChatScreen->templateId].numRows; - if (gEasyChatScreen->mainCursorRow > gEasyChatScreenTemplates[gEasyChatScreen->templateId].numRows) - gEasyChatScreen->mainCursorRow = 0; + if (sEasyChatScreen->mainCursorRow > sEasyChatScreenTemplates[sEasyChatScreen->templateId].numRows) + sEasyChatScreen->mainCursorRow = 0; - if (gEasyChatScreen->mainCursorRow == gEasyChatScreenTemplates[gEasyChatScreen->templateId].numRows) + if (sEasyChatScreen->mainCursorRow == sEasyChatScreenTemplates[sEasyChatScreen->templateId].numRows) { - if (gEasyChatScreen->mainCursorColumn > 2) - gEasyChatScreen->mainCursorColumn = 2; + if (sEasyChatScreen->mainCursorColumn > 2) + sEasyChatScreen->mainCursorColumn = 2; - gEasyChatScreen->state = 1; + sEasyChatScreen->state = 1; return 3; } - if (gEasyChatScreen->mainCursorColumn < 0) - gEasyChatScreen->mainCursorColumn = gEasyChatScreenTemplates[gEasyChatScreen->templateId].numColumns - 1; + if (sEasyChatScreen->mainCursorColumn < 0) + sEasyChatScreen->mainCursorColumn = sEasyChatScreenTemplates[sEasyChatScreen->templateId].numColumns - 1; - if (gEasyChatScreen->mainCursorColumn >= gEasyChatScreenTemplates[gEasyChatScreen->templateId].numColumns) - gEasyChatScreen->mainCursorColumn = 0; + if (sEasyChatScreen->mainCursorColumn >= sEasyChatScreenTemplates[sEasyChatScreen->templateId].numColumns) + sEasyChatScreen->mainCursorColumn = 0; - if (sub_811AB44() && gEasyChatScreen->mainCursorColumn == 1 && gEasyChatScreen->mainCursorRow == 4) - gEasyChatScreen->mainCursorColumn = 0; + if (sub_811AB44() && sEasyChatScreen->mainCursorColumn == 1 && sEasyChatScreen->mainCursorRow == 4) + sEasyChatScreen->mainCursorColumn = 0; return 2; } @@ -1588,7 +1593,7 @@ static u16 sub_811ACDC(void) { if (gMain.newKeys & A_BUTTON) { - switch (gEasyChatScreen->mainCursorColumn) + switch (sEasyChatScreen->mainCursorColumn) { case 0: return sub_811B184(); @@ -1611,47 +1616,47 @@ static u16 sub_811ACDC(void) } else if (gMain.newKeys & DPAD_UP) { - gEasyChatScreen->mainCursorRow--; + sEasyChatScreen->mainCursorRow--; break; } else if (gMain.newKeys & DPAD_LEFT) { - gEasyChatScreen->mainCursorColumn--; + sEasyChatScreen->mainCursorColumn--; break; } else if (gMain.newKeys & DPAD_DOWN) { - gEasyChatScreen->mainCursorRow = 0; + sEasyChatScreen->mainCursorRow = 0; break; } else if (gMain.newKeys & DPAD_RIGHT) { - gEasyChatScreen->mainCursorColumn++; + sEasyChatScreen->mainCursorColumn++; break; } return 0; } while (0); - if (gEasyChatScreen->mainCursorRow == gEasyChatScreenTemplates[gEasyChatScreen->templateId].numRows) + if (sEasyChatScreen->mainCursorRow == sEasyChatScreenTemplates[sEasyChatScreen->templateId].numRows) { - int numFooterColumns = sub_811BA3C() ? 4 : 3; - if (gEasyChatScreen->mainCursorColumn < 0) - gEasyChatScreen->mainCursorColumn = numFooterColumns - 1; + int numFooterColumns = FooterHasFourOptions() ? 4 : 3; + if (sEasyChatScreen->mainCursorColumn < 0) + sEasyChatScreen->mainCursorColumn = numFooterColumns - 1; - if (gEasyChatScreen->mainCursorColumn >= numFooterColumns) - gEasyChatScreen->mainCursorColumn = 0; + if (sEasyChatScreen->mainCursorColumn >= numFooterColumns) + sEasyChatScreen->mainCursorColumn = 0; return 3; } - if (gEasyChatScreen->mainCursorColumn >= gEasyChatScreenTemplates[gEasyChatScreen->templateId].numColumns) - gEasyChatScreen->mainCursorColumn = gEasyChatScreenTemplates[gEasyChatScreen->templateId].numColumns - 1; + if (sEasyChatScreen->mainCursorColumn >= sEasyChatScreenTemplates[sEasyChatScreen->templateId].numColumns) + sEasyChatScreen->mainCursorColumn = sEasyChatScreenTemplates[sEasyChatScreen->templateId].numColumns - 1; - if (sub_811AB44() && gEasyChatScreen->mainCursorColumn == 1 && gEasyChatScreen->mainCursorRow == 4) - gEasyChatScreen->mainCursorColumn = 0; + if (sub_811AB44() && sEasyChatScreen->mainCursorColumn == 1 && sEasyChatScreen->mainCursorRow == 4) + sEasyChatScreen->mainCursorColumn = 0; - gEasyChatScreen->state = 0; + sEasyChatScreen->state = 0; return 2; } @@ -1662,10 +1667,10 @@ static u16 sub_811AE44(void) if (gMain.newKeys & A_BUTTON) { - if (gEasyChatScreen->unk_0a != -1) + if (sEasyChatScreen->unk_0a != -1) return sub_811B2B0(); - switch (gEasyChatScreen->unk_0b) + switch (sEasyChatScreen->unk_0b) { case 0: return sub_811B33C(); @@ -1698,7 +1703,7 @@ static u16 sub_811AF00(void) { if (gMain.newKeys & B_BUTTON) { - gEasyChatScreen->state = 2; + sEasyChatScreen->state = 2; return 14; } @@ -1734,11 +1739,11 @@ static u16 sub_811AF8C(void) { case MENU_B_PRESSED: // B Button case 1: // No - gEasyChatScreen->state = sub_811B2A4(); + sEasyChatScreen->state = sub_811B2A4(); return 7; case 0: // Yes gSpecialVar_Result = 0; - var0 = gEasyChatScreen->kind - 17; + var0 = sEasyChatScreen->type - EASY_CHAT_TYPE_QUIZ_SET_QUESTION; if (var0 < 2) sub_811B3E4(); @@ -1754,7 +1759,7 @@ static u16 sub_811AFEC(void) { case MENU_B_PRESSED: // B Button case 1: // No - gEasyChatScreen->state = sub_811B2A4(); + sEasyChatScreen->state = sub_811B2A4(); return 7; case 0: // Yes sub_811BE9C(); @@ -1772,11 +1777,11 @@ static u16 sub_811B040(void) { case MENU_B_PRESSED: // B Button case 1: // No - gEasyChatScreen->state = 1; + sEasyChatScreen->state = 1; return 7; case 0: // Yes sub_811B418(); - gEasyChatScreen->state = 1; + sEasyChatScreen->state = 1; return 8; default: return 0; @@ -1798,7 +1803,7 @@ static u16 sub_811B0BC(void) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - gEasyChatScreen->state = sub_811B2A4(); + sEasyChatScreen->state = sub_811B2A4(); return 7; } @@ -1807,7 +1812,7 @@ static u16 sub_811B0BC(void) static u16 sub_811B0E8(void) { - gEasyChatScreen->state = 10; + sEasyChatScreen->state = 10; return 6; } @@ -1818,8 +1823,8 @@ static u16 sub_811B0F8(void) case MENU_B_PRESSED: // B Button case 1: // No sub_811B454(); - gEasyChatScreen->unk_08 = 0; - gEasyChatScreen->state = 8; + sEasyChatScreen->stateBackup = 0; + sEasyChatScreen->state = 8; return 31; case 0: // Yes gSpecialVar_Result = sub_811B4EC(); @@ -1832,124 +1837,127 @@ static u16 sub_811B0F8(void) static u16 sub_811B150(void) { - if (gEasyChatScreen->kind == 19 || gEasyChatScreen->kind == 11) + if (sEasyChatScreen->type == EASY_CHAT_TYPE_APPRENTICE + || sEasyChatScreen->type == EASY_CHAT_TYPE_CONTEST_INTERVIEW) { - gEasyChatScreen->unk_08 = gEasyChatScreen->state; - gEasyChatScreen->state = 8; + sEasyChatScreen->stateBackup = sEasyChatScreen->state; + sEasyChatScreen->state = 8; return 34; } else { - gEasyChatScreen->unk_08 = gEasyChatScreen->state; - gEasyChatScreen->state = 4; + sEasyChatScreen->stateBackup = sEasyChatScreen->state; + sEasyChatScreen->state = 4; return 5; } } static int sub_811B184(void) { - gEasyChatScreen->unk_08 = gEasyChatScreen->state; - if (gEasyChatScreen->kind != 6) + sEasyChatScreen->stateBackup = sEasyChatScreen->state; + if (sEasyChatScreen->type != EASY_CHAT_TYPE_BARD_SONG) { - gEasyChatScreen->state = 5; + sEasyChatScreen->state = 5; return 4; } else { - gEasyChatScreen->unk_08 = gEasyChatScreen->state; - gEasyChatScreen->state = 8; + sEasyChatScreen->stateBackup = sEasyChatScreen->state; + sEasyChatScreen->state = 8; return 32; } } static u16 sub_811B1B4(void) { - gEasyChatScreen->unk_08 = gEasyChatScreen->state; - if (gEasyChatScreen->kind == 17) + sEasyChatScreen->stateBackup = sEasyChatScreen->state; + if (sEasyChatScreen->type == EASY_CHAT_TYPE_QUIZ_SET_QUESTION) { if (sub_811BD64()) { - gEasyChatScreen->state = 8; + sEasyChatScreen->state = 8; return 29; } if (sub_811BDB0()) { - gEasyChatScreen->state = 8; + sEasyChatScreen->state = 8; return 30; } - gEasyChatScreen->state = 6; + sEasyChatScreen->state = 6; return 6; } - else if (gEasyChatScreen->kind == 18) + else if (sEasyChatScreen->type == EASY_CHAT_TYPE_QUIZ_SET_ANSWER) { if (sub_811BDB0()) { - gEasyChatScreen->state = 8; + sEasyChatScreen->state = 8; return 30; } if (sub_811BD64()) { - gEasyChatScreen->state = 8; + sEasyChatScreen->state = 8; return 29; } - gEasyChatScreen->state = 6; + sEasyChatScreen->state = 6; return 6; } - else if (gEasyChatScreen->kind == 9 || gEasyChatScreen->kind == 13) + else if (sEasyChatScreen->type == EASY_CHAT_TYPE_TRENDY_PHRASE + || sEasyChatScreen->type == EASY_CHAT_TYPE_GOOD_SAYING) { if (!sub_811BD2C()) { - gEasyChatScreen->state = 8; + sEasyChatScreen->state = 8; return 33; } - gEasyChatScreen->state = 6; + sEasyChatScreen->state = 6; return 6; } - else if (gEasyChatScreen->kind == 19 || gEasyChatScreen->kind == 11) + else if (sEasyChatScreen->type == EASY_CHAT_TYPE_APPRENTICE + || sEasyChatScreen->type == EASY_CHAT_TYPE_CONTEST_INTERVIEW) { if (sub_811BCF4()) { - gEasyChatScreen->state = 8; + sEasyChatScreen->state = 8; return 34; } - gEasyChatScreen->state = 6; + sEasyChatScreen->state = 6; return 6; } - else if (gEasyChatScreen->kind == 20) + else if (sEasyChatScreen->type == EASY_CHAT_TYPE_QUESTIONNAIRE) { - gEasyChatScreen->state = 6; + sEasyChatScreen->state = 6; return 6; } else { if (sub_811BCF4() == 1 || !sub_811B4EC()) { - gEasyChatScreen->state = 4; + sEasyChatScreen->state = 4; return 5; } - gEasyChatScreen->state = 6; + sEasyChatScreen->state = 6; return 6; } } static int sub_811B264(void) { - gEasyChatScreen->unk_08 = gEasyChatScreen->state; - switch (gEasyChatScreen->kind) + sEasyChatScreen->stateBackup = sEasyChatScreen->state; + switch (sEasyChatScreen->type) { - case 15: + case EASY_CHAT_TYPE_QUIZ_ANSWER: return 25; - case 17: + case EASY_CHAT_TYPE_QUIZ_SET_QUESTION: sub_811B3E4(); return 28; - case 18: + case EASY_CHAT_TYPE_QUIZ_SET_ANSWER: sub_811B3E4(); return 27; default: @@ -1959,14 +1967,14 @@ static int sub_811B264(void) static u8 sub_811B2A4(void) { - return gEasyChatScreen->unk_08; + return sEasyChatScreen->stateBackup; } static int sub_811B2B0(void) { u16 var1; - if (gEasyChatScreen->unk_09 == 0) + if (sEasyChatScreen->unk_09 == 0) { u8 groupId = sub_811F3B8(sub_811B8E8()); sub_811F548(0, groupId); @@ -1980,36 +1988,36 @@ static int sub_811B2B0(void) if (var1 == 0) return 0; - gEasyChatScreen->unk_0f = (var1 - 1) / 2; - gEasyChatScreen->unk_0e = 0; - gEasyChatScreen->unk_10 = 0; - gEasyChatScreen->unk_11 = 0; - gEasyChatScreen->state = 3; + sEasyChatScreen->unk_0f = (var1 - 1) / 2; + sEasyChatScreen->unk_0e = 0; + sEasyChatScreen->unk_10 = 0; + sEasyChatScreen->unk_11 = 0; + sEasyChatScreen->state = 3; return 11; } static int sub_811B32C(void) { - gEasyChatScreen->state = 0; + sEasyChatScreen->state = 0; return 10; } static int sub_811B33C(void) { - gEasyChatScreen->unk_0a = 0; - gEasyChatScreen->unk_0b = 0; - gEasyChatScreen->unk_0c = 0; - if (!gEasyChatScreen->unk_09) - gEasyChatScreen->unk_09 = 1; + sEasyChatScreen->unk_0a = 0; + sEasyChatScreen->unk_0b = 0; + sEasyChatScreen->unk_0c = 0; + if (!sEasyChatScreen->unk_09) + sEasyChatScreen->unk_09 = 1; else - gEasyChatScreen->unk_09 = 0; + sEasyChatScreen->unk_09 = 0; return 23; } static int sub_811B368(void) { - if (gEasyChatScreen->kind == 6) + if (sEasyChatScreen->type == EASY_CHAT_TYPE_BARD_SONG) { PlaySE(SE_HAZURE); return 0; @@ -2032,14 +2040,14 @@ static int sub_811B394(void) else { sub_811B488(easyChatWord); - if (gEasyChatScreen->kind != 6) + if (sEasyChatScreen->type != EASY_CHAT_TYPE_BARD_SONG) { - gEasyChatScreen->state = 0; + sEasyChatScreen->state = 0; return 12; } else { - gEasyChatScreen->state = 9; + sEasyChatScreen->state = 9; return 13; } } @@ -2048,36 +2056,36 @@ static int sub_811B394(void) static void sub_811B3E4(void) { int i; - for (i = 0; i < gEasyChatScreen->unk_07; i++) - gEasyChatScreen->words[i] = gEasyChatScreen->ecWordBuffer[i]; + for (i = 0; i < sEasyChatScreen->unk_07; i++) + sEasyChatScreen->words[i] = sEasyChatScreen->ecWordBuffer[i]; } static void sub_811B418(void) { int i; - for (i = 0; i < gEasyChatScreen->unk_07; i++) - gEasyChatScreen->ecWordBuffer[i] = 0xFFFF; + for (i = 0; i < sEasyChatScreen->unk_07; i++) + sEasyChatScreen->ecWordBuffer[i] = 0xFFFF; } static void sub_811B454(void) { int i; - for (i = 0; i < gEasyChatScreen->unk_07; i++) - gEasyChatScreen->ecWordBuffer[i] = gEasyChatScreen->words[i]; + for (i = 0; i < sEasyChatScreen->unk_07; i++) + sEasyChatScreen->ecWordBuffer[i] = sEasyChatScreen->words[i]; } static void sub_811B488(u16 easyChatWord) { u16 index = sub_811B8C8(); - gEasyChatScreen->ecWordBuffer[index] = easyChatWord; + sEasyChatScreen->ecWordBuffer[index] = easyChatWord; } static u8 sub_811B4AC(void) { u16 i; - for (i = 0; i < gEasyChatScreen->unk_07; i++) + for (i = 0; i < sEasyChatScreen->unk_07; i++) { - if (gEasyChatScreen->ecWordBuffer[i] != gEasyChatScreen->words[i]) + if (sEasyChatScreen->ecWordBuffer[i] != sEasyChatScreen->words[i]) return 1; } @@ -2086,7 +2094,7 @@ static u8 sub_811B4AC(void) static int sub_811B4EC(void) { - u8 var0 = gEasyChatScreen->kind - 17; + u8 var0 = sEasyChatScreen->type - EASY_CHAT_TYPE_QUIZ_SET_QUESTION; if (var0 < 2) { if (sub_811BD64()) @@ -2105,9 +2113,9 @@ static int sub_811B4EC(void) static u16 sub_811B528(int arg0) { - if (gEasyChatScreen->unk_0a != -1) + if (sEasyChatScreen->unk_0a != -1) { - if (gEasyChatScreen->unk_09 == 0) + if (sEasyChatScreen->unk_09 == 0) return sub_811B568(arg0); else return sub_811B634(arg0); @@ -2123,32 +2131,32 @@ static int sub_811B568(u32 arg0) switch (arg0) { case 2: - if (gEasyChatScreen->unk_0b != -gEasyChatScreen->unk_0c) + if (sEasyChatScreen->unk_0b != -sEasyChatScreen->unk_0c) { - if (gEasyChatScreen->unk_0b) + if (sEasyChatScreen->unk_0b) { - gEasyChatScreen->unk_0b--; + sEasyChatScreen->unk_0b--; return 15; } else { - gEasyChatScreen->unk_0c--; + sEasyChatScreen->unk_0c--; return 17; } } break; case 3: - if (gEasyChatScreen->unk_0b + gEasyChatScreen->unk_0c < gEasyChatScreen->unk_0d - 1) + if (sEasyChatScreen->unk_0b + sEasyChatScreen->unk_0c < sEasyChatScreen->unk_0d - 1) { int var0; - if (gEasyChatScreen->unk_0b < 3) + if (sEasyChatScreen->unk_0b < 3) { - gEasyChatScreen->unk_0b++; + sEasyChatScreen->unk_0b++; var0 = 15; } else { - gEasyChatScreen->unk_0c++; + sEasyChatScreen->unk_0c++; var0 = 16; } @@ -2157,16 +2165,16 @@ static int sub_811B568(u32 arg0) } break; case 1: - if (gEasyChatScreen->unk_0a) - gEasyChatScreen->unk_0a--; + if (sEasyChatScreen->unk_0a) + sEasyChatScreen->unk_0a--; else sub_811B744(); return 15; case 0: - if (gEasyChatScreen->unk_0a < 1) + if (sEasyChatScreen->unk_0a < 1) { - gEasyChatScreen->unk_0a++; + sEasyChatScreen->unk_0a++; if (sub_811B9C8()) sub_811B744(); } @@ -2185,30 +2193,30 @@ static int sub_811B634(u32 arg0) switch (arg0) { case 2: - if (gEasyChatScreen->unk_0b > 0) - gEasyChatScreen->unk_0b--; + if (sEasyChatScreen->unk_0b > 0) + sEasyChatScreen->unk_0b--; else - gEasyChatScreen->unk_0b = 3; + sEasyChatScreen->unk_0b = 3; sub_811B978(); return 15; case 3: - if (gEasyChatScreen->unk_0b < 3) - gEasyChatScreen->unk_0b++; + if (sEasyChatScreen->unk_0b < 3) + sEasyChatScreen->unk_0b++; else - gEasyChatScreen->unk_0b = 0; + sEasyChatScreen->unk_0b = 0; sub_811B978(); return 15; case 0: - gEasyChatScreen->unk_0a++; + sEasyChatScreen->unk_0a++; if (sub_811B9C8()) sub_811B744(); return 15; case 1: - gEasyChatScreen->unk_0a--; - if (gEasyChatScreen->unk_0a < 0) + sEasyChatScreen->unk_0a--; + if (sEasyChatScreen->unk_0a < 0) sub_811B744(); return 15; @@ -2222,26 +2230,26 @@ static int sub_811B6C4(u32 arg0) switch (arg0) { case 2: - if (gEasyChatScreen->unk_0b) - gEasyChatScreen->unk_0b--; + if (sEasyChatScreen->unk_0b) + sEasyChatScreen->unk_0b--; else - gEasyChatScreen->unk_0b = 2; + sEasyChatScreen->unk_0b = 2; return 15; case 3: - if (gEasyChatScreen->unk_0b < 2) - gEasyChatScreen->unk_0b++; + if (sEasyChatScreen->unk_0b < 2) + sEasyChatScreen->unk_0b++; else - gEasyChatScreen->unk_0b = 0; + sEasyChatScreen->unk_0b = 0; return 15; case 1: - gEasyChatScreen->unk_0b++; + sEasyChatScreen->unk_0b++; sub_811B768(); return 15; case 0: - gEasyChatScreen->unk_0a = 0; - gEasyChatScreen->unk_0b++; + sEasyChatScreen->unk_0a = 0; + sEasyChatScreen->unk_0b++; return 15; } @@ -2250,21 +2258,21 @@ static int sub_811B6C4(u32 arg0) static void sub_811B744(void) { - gEasyChatScreen->unk_0a = 0xFF; - if (gEasyChatScreen->unk_0b) - gEasyChatScreen->unk_0b--; + sEasyChatScreen->unk_0a = 0xFF; + if (sEasyChatScreen->unk_0b) + sEasyChatScreen->unk_0b--; } static void sub_811B768(void) { - if (gEasyChatScreen->unk_09 == 0) + if (sEasyChatScreen->unk_09 == 0) { - gEasyChatScreen->unk_0a = 1; + sEasyChatScreen->unk_0a = 1; sub_811B978(); } else { - gEasyChatScreen->unk_0a = sub_811B960(gEasyChatScreen->unk_0b); + sEasyChatScreen->unk_0a = sub_811B960(sEasyChatScreen->unk_0b); } } @@ -2274,16 +2282,16 @@ static u16 sub_811B794(u32 arg0) switch (arg0) { case 2: - if (gEasyChatScreen->unk_11 + gEasyChatScreen->unk_0e > 0) + if (sEasyChatScreen->unk_11 + sEasyChatScreen->unk_0e > 0) { - if (gEasyChatScreen->unk_11 > 0) + if (sEasyChatScreen->unk_11 > 0) { - gEasyChatScreen->unk_11--; + sEasyChatScreen->unk_11--; result = 18; } else { - gEasyChatScreen->unk_0e--; + sEasyChatScreen->unk_0e--; result = 19; } @@ -2292,16 +2300,16 @@ static u16 sub_811B794(u32 arg0) } break; case 3: - if (gEasyChatScreen->unk_11 + gEasyChatScreen->unk_0e < gEasyChatScreen->unk_0f) + if (sEasyChatScreen->unk_11 + sEasyChatScreen->unk_0e < sEasyChatScreen->unk_0f) { - if (gEasyChatScreen->unk_11 < 3) + if (sEasyChatScreen->unk_11 < 3) { - gEasyChatScreen->unk_11++; + sEasyChatScreen->unk_11++; result = 18; } else { - gEasyChatScreen->unk_0e++; + sEasyChatScreen->unk_0e++; result = 20; } @@ -2310,42 +2318,42 @@ static u16 sub_811B794(u32 arg0) } break; case 1: - if (gEasyChatScreen->unk_10 > 0) - gEasyChatScreen->unk_10--; + if (sEasyChatScreen->unk_10 > 0) + sEasyChatScreen->unk_10--; else - gEasyChatScreen->unk_10 = 1; + sEasyChatScreen->unk_10 = 1; sub_811B9A0(); return 18; case 0: - if (gEasyChatScreen->unk_10 < 1) + if (sEasyChatScreen->unk_10 < 1) { - gEasyChatScreen->unk_10++; + sEasyChatScreen->unk_10++; if (sub_811BA1C()) - gEasyChatScreen->unk_10 = 0; + sEasyChatScreen->unk_10 = 0; } else { - gEasyChatScreen->unk_10 = 0; + sEasyChatScreen->unk_10 = 0; } return 18; case 4: - if (gEasyChatScreen->unk_0e) + if (sEasyChatScreen->unk_0e) { - if (gEasyChatScreen->unk_0e > 3) - gEasyChatScreen->unk_0e -= 4; + if (sEasyChatScreen->unk_0e > 3) + sEasyChatScreen->unk_0e -= 4; else - gEasyChatScreen->unk_0e = 0; + sEasyChatScreen->unk_0e = 0; return 21; } break; case 5: - if (gEasyChatScreen->unk_0e <= gEasyChatScreen->unk_0f - 4) + if (sEasyChatScreen->unk_0e <= sEasyChatScreen->unk_0f - 4) { - gEasyChatScreen->unk_0e += 4; - if (gEasyChatScreen->unk_0e > gEasyChatScreen->unk_0f - 3) - gEasyChatScreen->unk_0e = gEasyChatScreen->unk_0f + 0xFD; + sEasyChatScreen->unk_0e += 4; + if (sEasyChatScreen->unk_0e > sEasyChatScreen->unk_0f - 3) + sEasyChatScreen->unk_0e = sEasyChatScreen->unk_0f + 0xFD; sub_811B9A0(); return 22; @@ -2358,24 +2366,24 @@ static u16 sub_811B794(u32 arg0) static u16 sub_811B8C8(void) { - return (gEasyChatScreen->mainCursorRow * gEasyChatScreen->numColumns) + gEasyChatScreen->mainCursorColumn; + return (sEasyChatScreen->mainCursorRow * sEasyChatScreen->numColumns) + sEasyChatScreen->mainCursorColumn; } static u16 sub_811B8E8(void) { - return 2 * (gEasyChatScreen->unk_0b + gEasyChatScreen->unk_0c) + gEasyChatScreen->unk_0a; + return 2 * (sEasyChatScreen->unk_0b + sEasyChatScreen->unk_0c) + sEasyChatScreen->unk_0a; } static int sub_811B908(void) { - int var0 = (u8)gEasyChatScreen->unk_0a < 7 ? gEasyChatScreen->unk_0a : 0; - int var1 = (u8)gEasyChatScreen->unk_0b < 4 ? gEasyChatScreen->unk_0b : 0; + int var0 = (u8)sEasyChatScreen->unk_0a < 7 ? sEasyChatScreen->unk_0a : 0; + int var1 = (u8)sEasyChatScreen->unk_0b < 4 ? sEasyChatScreen->unk_0b : 0; return sUnknown_08597748[var1][var0]; } static u16 sub_811B940(void) { - return 2 * (gEasyChatScreen->unk_11 + gEasyChatScreen->unk_0e) + gEasyChatScreen->unk_10; + return 2 * (sEasyChatScreen->unk_11 + sEasyChatScreen->unk_0e) + sEasyChatScreen->unk_10; } static u8 sub_811B960(u8 arg0) @@ -2394,8 +2402,8 @@ static void sub_811B978(void) { while (sub_811B9C8()) { - if (gEasyChatScreen->unk_0a) - gEasyChatScreen->unk_0a--; + if (sEasyChatScreen->unk_0a) + sEasyChatScreen->unk_0a--; else break; } @@ -2405,8 +2413,8 @@ static void sub_811B9A0(void) { while (sub_811BA1C()) { - if (gEasyChatScreen->unk_10) - gEasyChatScreen->unk_10--; + if (sEasyChatScreen->unk_10) + sEasyChatScreen->unk_10--; else break; } @@ -2414,10 +2422,10 @@ static void sub_811B9A0(void) static u8 sub_811B9C8(void) { - if (gEasyChatScreen->unk_09 == 0) + if (sEasyChatScreen->unk_09 == 0) return sub_811B8E8() >= sub_811F3AC() ? 1 : 0; else - return gEasyChatScreen->unk_0a > sub_811B960(gEasyChatScreen->unk_0b) ? 1 : 0; + return sEasyChatScreen->unk_0a > sub_811B960(sEasyChatScreen->unk_0b) ? 1 : 0; } static u8 sub_811BA1C(void) @@ -2425,73 +2433,73 @@ static u8 sub_811BA1C(void) return sub_811B940() >= sub_811F5B0() ? 1 : 0; } -static int sub_811BA3C(void) +static int FooterHasFourOptions(void) { - return gEasyChatScreenTemplates[gEasyChatScreen->templateId].unk_03_7; + return sEasyChatScreenTemplates[sEasyChatScreen->templateId].fourFooterOptions; } -u8 sub_811BA5C(void) +static u8 GetEasyChatScreenType(void) { - return gEasyChatScreen->kind; + return sEasyChatScreen->type; } -static u8 sub_811BA68(void) +static u8 GetEasyChatScreenFrameId(void) { - return gEasyChatScreenTemplates[gEasyChatScreen->templateId].unk_03_0; + return sEasyChatScreenTemplates[sEasyChatScreen->templateId].frameId; } -const u8 *sub_811BA88(void) +const u8 *GetTitleText(void) { - return gEasyChatScreen->titleText; + return sEasyChatScreen->titleText; } -u16 *sub_811BA94(void) +static u16 *GetEasyChatWordBuffer(void) { - return gEasyChatScreen->ecWordBuffer; + return sEasyChatScreen->ecWordBuffer; } -u8 sub_811BAA0(void) +static u8 GetNumRows(void) { - return gEasyChatScreen->numRows; + return sEasyChatScreen->numRows; } -u8 sub_811BAAC(void) +static u8 GetNumColumns(void) { - return gEasyChatScreen->numColumns; + return sEasyChatScreen->numColumns; } -u8 sub_811BAB8(void) +static u8 GetMainCursorColumn(void) { - return gEasyChatScreen->mainCursorColumn; + return sEasyChatScreen->mainCursorColumn; } -u8 sub_811BAC4(void) +static u8 GetMainCursorRow(void) { - return gEasyChatScreen->mainCursorRow; + return sEasyChatScreen->mainCursorRow; } static void GetEasyChatInstructionsText(const u8 **str1, const u8 **str2) { - *str1 = gEasyChatScreenTemplates[gEasyChatScreen->templateId].instructionsText1; - *str2 = gEasyChatScreenTemplates[gEasyChatScreen->templateId].instructionsText2; + *str1 = sEasyChatScreenTemplates[sEasyChatScreen->templateId].instructionsText1; + *str2 = sEasyChatScreenTemplates[sEasyChatScreen->templateId].instructionsText2; } static void GetEasyChatConfirmText(const u8 **str1, const u8 **str2) { - *str1 = gEasyChatScreenTemplates[gEasyChatScreen->templateId].confirmText1; - *str2 = gEasyChatScreenTemplates[gEasyChatScreen->templateId].confirmText2; + *str1 = sEasyChatScreenTemplates[sEasyChatScreen->templateId].confirmText1; + *str2 = sEasyChatScreenTemplates[sEasyChatScreen->templateId].confirmText2; } static void sub_811BB40(const u8 **str1, const u8 **str2) { - switch (gEasyChatScreen->kind) + switch (sEasyChatScreen->type) { - case 4: + case EASY_CHAT_TYPE_MAIL: *str1 = gText_StopGivingPkmnMail; *str2 = NULL; break; - case 15: - case 16: + case EASY_CHAT_TYPE_QUIZ_ANSWER: + case EASY_CHAT_TYPE_QUIZ_QUESTION: *str1 = gText_LikeToQuitQuiz; *str2 = gText_ChallengeQuestionMark; break; @@ -2511,34 +2519,34 @@ static void GetEasyChatConfirmDeletionText(const u8 **str1, const u8 **str2) void sub_811BB9C(u8 *arg0, u8 *arg1) { - *arg0 = gEasyChatScreen->unk_0a; - *arg1 = gEasyChatScreen->unk_0b; + *arg0 = sEasyChatScreen->unk_0a; + *arg1 = sEasyChatScreen->unk_0b; } u8 sub_811BBB0(void) { - return gEasyChatScreen->unk_09; + return sEasyChatScreen->unk_09; } u8 sub_811BBBC(void) { - return gEasyChatScreen->unk_0c; + return sEasyChatScreen->unk_0c; } void sub_811BBC8(u8 *arg0, u8 *arg1) { - *arg0 = gEasyChatScreen->unk_10; - *arg1 = gEasyChatScreen->unk_11; + *arg0 = sEasyChatScreen->unk_10; + *arg1 = sEasyChatScreen->unk_11; } u8 sub_811BBDC(void) { - return gEasyChatScreen->unk_0e; + return sEasyChatScreen->unk_0e; } u8 sub_811BBE8(void) { - return gEasyChatScreen->unk_0f; + return sEasyChatScreen->unk_0f; } static u8 unref_sub_811BBF4(void) @@ -2548,14 +2556,14 @@ static u8 unref_sub_811BBF4(void) int sub_811BBF8(void) { - switch (gEasyChatScreen->state) + switch (sEasyChatScreen->state) { case 2: - if (gEasyChatScreen->unk_09 == 0 && gEasyChatScreen->unk_0c) + if (sEasyChatScreen->unk_09 == 0 && sEasyChatScreen->unk_0c) return 1; break; case 3: - if (gEasyChatScreen->unk_0e) + if (sEasyChatScreen->unk_0e) return 1; break; } @@ -2565,14 +2573,14 @@ int sub_811BBF8(void) int sub_811BC2C(void) { - switch (gEasyChatScreen->state) + switch (sEasyChatScreen->state) { case 2: - if (gEasyChatScreen->unk_09 == 0 && gEasyChatScreen->unk_0c + 4 <= gEasyChatScreen->unk_0d - 1) + if (sEasyChatScreen->unk_09 == 0 && sEasyChatScreen->unk_0c + 4 <= sEasyChatScreen->unk_0d - 1) return 1; break; case 3: - if (gEasyChatScreen->unk_0e + 4 <= gEasyChatScreen->unk_0f) + if (sEasyChatScreen->unk_0e + 4 <= sEasyChatScreen->unk_0f) return 1; break; } @@ -2580,9 +2588,9 @@ int sub_811BC2C(void) return 0; } -static int sub_811BC70(void) +static int FooterHasFourOptions_(void) { - return sub_811BA3C(); + return FooterHasFourOptions(); } u8 sub_811BC7C(const u16 *arg0, u8 arg1) @@ -2591,25 +2599,25 @@ u8 sub_811BC7C(const u16 *arg0, u8 arg1) for (i = 0; i < arg1; i++) { - if (arg0[i] != gEasyChatScreen->ecWordBuffer[i]) + if (arg0[i] != sEasyChatScreen->ecWordBuffer[i]) return 1; } return 0; } -u8 sub_811BCBC(void) +static u8 GetDisplayedPersonType(void) { - return gEasyChatScreen->sizeParam; + return sEasyChatScreen->displayedPersonType; } -static u8 sub_811BCC8(u8 entryType) +static u8 GetEachChatScreenTemplateId(u8 type) { u32 i; - for (i = 0; i < ARRAY_COUNT(gEasyChatScreenTemplates); i++) + for (i = 0; i < ARRAY_COUNT(sEasyChatScreenTemplates); i++) { - if (gEasyChatScreenTemplates[i].unk_00 == entryType) + if (sEasyChatScreenTemplates[i].type == type) return i; } @@ -2620,9 +2628,9 @@ static int sub_811BCF4(void) { int i; - for (i = 0; i < gEasyChatScreen->unk_07; i++) + for (i = 0; i < sEasyChatScreen->unk_07; i++) { - if (gEasyChatScreen->ecWordBuffer[i] != 0xFFFF) + if (sEasyChatScreen->ecWordBuffer[i] != 0xFFFF) return 0; } @@ -2633,9 +2641,9 @@ static int sub_811BD2C(void) { int i; - for (i = 0; i < gEasyChatScreen->unk_07; i++) + for (i = 0; i < sEasyChatScreen->unk_07; i++) { - if (gEasyChatScreen->ecWordBuffer[i] == 0xFFFF) + if (sEasyChatScreen->ecWordBuffer[i] == 0xFFFF) return 0; } @@ -2647,7 +2655,7 @@ static int sub_811BD64(void) int i; struct SaveBlock1 *saveBlock1; - if (gEasyChatScreen->kind == 17) + if (sEasyChatScreen->type == EASY_CHAT_TYPE_QUIZ_SET_QUESTION) return sub_811BCF4(); saveBlock1 = gSaveBlock1Ptr; @@ -2663,7 +2671,7 @@ static int sub_811BD64(void) static int sub_811BDB0(void) { struct LilycoveLadyQuiz *quiz; - if (gEasyChatScreen->kind == 18) + if (sEasyChatScreen->type == EASY_CHAT_TYPE_QUIZ_SET_ANSWER) return sub_811BCF4(); quiz = &gSaveBlock1Ptr->lilycoveLady.quiz; @@ -2694,10 +2702,10 @@ static void sub_811BE54(void) u16 *ecWord; u8 *str; - ecWord = gEasyChatScreen->ecWordBuffer; + ecWord = sEasyChatScreen->ecWordBuffer; str = gStringVar2; i = 0; - while (i < gEasyChatScreen->unk_07) + while (i < sEasyChatScreen->unk_07) { str = CopyEasyChatWordPadded(str, *ecWord, 0); *str = 0; @@ -2712,22 +2720,22 @@ static void sub_811BE54(void) static void sub_811BE9C(void) { - switch (gEasyChatScreen->kind) + switch (sEasyChatScreen->type) { - case 0: + case EASY_CHAT_TYPE_PROFILE: FlagSet(FLAG_SYS_CHAT_USED); break; - case 20: + case EASY_CHAT_TYPE_QUESTIONNAIRE: if (sub_811BF20()) gSpecialVar_0x8004 = 2; else gSpecialVar_0x8004 = 0; break; - case 9: + case EASY_CHAT_TYPE_TRENDY_PHRASE: sub_811BE54(); - gSpecialVar_0x8004 = sub_81226D8(gEasyChatScreen->ecWordBuffer); + gSpecialVar_0x8004 = sub_81226D8(sEasyChatScreen->ecWordBuffer); break; - case 13: + case EASY_CHAT_TYPE_GOOD_SAYING: gSpecialVar_0x8004 = sub_811BF40(); break; } @@ -2752,7 +2760,7 @@ static u16 sub_811BF40(void) static void sub_811BF78(void) { - gEasyChatScreen->unk_13 = 0; + sEasyChatScreen->unk_13 = 0; } static int sub_811BF88(int easyChatWord) @@ -2770,13 +2778,13 @@ static bool8 sub_811BF8C(void) static bool8 sub_811BFA4(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sEasyChatBgTemplates, ARRAY_COUNT(sEasyChatBgTemplates)); - SetBgTilemapBuffer(3, gUnknown_0203A11C->unkB00); - SetBgTilemapBuffer(1, gUnknown_0203A11C->unk300); + SetBgTilemapBuffer(3, sUnknown_0203A11C->unkB00); + SetBgTilemapBuffer(1, sUnknown_0203A11C->unk300); InitWindows(sEasyChatWindowTemplates); DeactivateAllTextPrinters(); sub_811CF64(); @@ -2787,7 +2795,7 @@ static bool8 sub_811BFA4(void) DecompressAndLoadBgGfxUsingHeap(3, gEasyChatWindow_Gfx, 0, 0, 0); CopyToBgTilemapBuffer(3, gEasyChatWindow_Tilemap, 0, 0); sub_811D60C(); - sub_811D424(gUnknown_0203A11C->unk300); + sub_811D424(sUnknown_0203A11C->unk300); sub_811D230(); sub_811E948(); CopyBgTilemapBufferToVram(3); @@ -2804,7 +2812,7 @@ static bool8 sub_811BFA4(void) break; case 4: sub_811DE90(); - if (sub_811BA5C() != 16) + if (GetEasyChatScreenType() != EASY_CHAT_TYPE_QUIZ_QUESTION) sub_811DEC4(); break; case 5: @@ -2830,26 +2838,26 @@ static bool8 sub_811BFA4(void) return FALSE; } - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return TRUE; } static void sub_811C13C(void) { - if (gUnknown_0203A11C) - FREE_AND_SET_NULL(gUnknown_0203A11C); + if (sUnknown_0203A11C) + FREE_AND_SET_NULL(sUnknown_0203A11C); } static void sub_811C158(u16 arg0) { - gUnknown_0203A11C->unk4 = arg0; - gUnknown_0203A11C->unk0 = 0; + sUnknown_0203A11C->unk4 = arg0; + sUnknown_0203A11C->unk0 = 0; sub_811C170(); } static bool8 sub_811C170(void) { - switch (gUnknown_0203A11C->unk4) + switch (sUnknown_0203A11C->unk4) { case 0: return FALSE; case 1: return sub_811C2D4(); @@ -2892,11 +2900,11 @@ static bool8 sub_811C170(void) static bool8 sub_811C2D4(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811D2C8(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -2910,21 +2918,21 @@ static bool8 sub_811C30C(void) u8 i; u16 *ecWordBuffer; u16 *ecWord; - u8 var0; + u8 frameId; u8 cursorColumn, cursorRow, numColumns; s16 var1; int stringWidth; int trueStringWidth; u8 var2; - u8 sp0[64]; + u8 str[64]; - ecWordBuffer = sub_811BA94(); - var0 = sub_811BA68(); - cursorColumn = sub_811BAB8(); - cursorRow = sub_811BAC4(); - numColumns = sub_811BAAC(); + ecWordBuffer = GetEasyChatWordBuffer(); + frameId = GetEasyChatScreenFrameId(); + cursorColumn = GetMainCursorColumn(); + cursorRow = GetMainCursorRow(); + numColumns = GetNumColumns(); ecWord = &ecWordBuffer[cursorRow * numColumns]; - var1 = 8 * gUnknown_08597C30[var0].unk0_0 + 13; + var1 = 8 * sPhraseFrameDimensions[frameId].left + 13; for (i = 0; i < cursorColumn; i++) { if (*ecWord == 0xFFFF) @@ -2933,8 +2941,8 @@ static bool8 sub_811C30C(void) } else { - CopyEasyChatWord(sp0, *ecWord); - stringWidth = GetStringWidth(1, sp0, 0); + CopyEasyChatWord(str, *ecWord); + stringWidth = GetStringWidth(1, str, 0); } trueStringWidth = stringWidth + 17; @@ -2942,27 +2950,27 @@ static bool8 sub_811C30C(void) ecWord++; } - var2 = 8 * (gUnknown_08597C30[var0].unk0_5 + cursorRow * 2); + var2 = 8 * (sPhraseFrameDimensions[frameId].top + cursorRow * 2); sub_811DF60(var1, var2 + 8); return FALSE; } static bool8 sub_811C3E4(void) { - u8 var0 = sub_811E920(sub_811BAB8()); - sub_811DF60(var0, 96); + u8 xOffset = GetFooterOptionXOffset(GetMainCursorColumn()); + sub_811DF60(xOffset, 96); return FALSE; } static bool8 sub_811C404(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); sub_811D104(2); sub_811D214(1); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -2973,13 +2981,13 @@ static bool8 sub_811C404(void) static bool8 sub_811C448(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); sub_811D104(3); sub_811D214(0); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -2990,13 +2998,13 @@ static bool8 sub_811C448(void) static bool8 sub_811C48C(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); sub_811D104(1); sub_811D214(1); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -3007,14 +3015,14 @@ static bool8 sub_811C48C(void) static bool8 sub_811C4D0(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DFB0(); sub_811D104(0); sub_811D2C8(); ShowBg(0); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -3025,13 +3033,13 @@ static bool8 sub_811C4D0(void) static bool8 sub_811C518(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DFB0(); sub_811D104(0); sub_811D2C8(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; // Fall through case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -3042,31 +3050,31 @@ static bool8 sub_811C518(void) static bool8 sub_811C554(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); HideBg(0); sub_811DE5C(0, 0, 0, 0); sub_811D6D4(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811D9CC(0); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 2: if (!IsDma3ManagerBusyWithBgCopy() && !sub_811DAA4()) - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 3: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811E3AC(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 4: @@ -3075,7 +3083,7 @@ static bool8 sub_811C554(void) sub_811DFC8(); sub_811E6E0(0); sub_811E64C(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3088,31 +3096,31 @@ static bool8 sub_811C554(void) static bool8 sub_811C620(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811E050(); sub_811E4AC(); sub_811E6B0(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: if (sub_811E4D0() == TRUE) break; sub_811D9CC(1); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; // Fall through case 2: if (!sub_811DAA4()) - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 3: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811DFB0(); ShowBg(0); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 4: @@ -3124,20 +3132,20 @@ static bool8 sub_811C620(void) static bool8 sub_811C6C0(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811E050(); sub_811E6B0(); sub_811E55C(); sub_811D9CC(5); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: if (!sub_811DAA4() && !sub_811E5B8()) { sub_811D6D4(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 2: @@ -3145,7 +3153,7 @@ static bool8 sub_811C6C0(void) { sub_811D9CC(6); sub_811E578(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 3: @@ -3153,7 +3161,7 @@ static bool8 sub_811C6C0(void) { sub_811E64C(); sub_811DFC8(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3172,11 +3180,11 @@ static bool8 sub_811C780(void) static bool8 sub_811C78C(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DDAC(1, 4); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; // Fall through case 1: if (!sub_811DE10()) @@ -3193,17 +3201,17 @@ static bool8 sub_811C78C(void) static bool8 sub_811C7D4(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DDAC(-1, 4); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; // Fall through case 1: if (!sub_811DE10()) { sub_811E64C(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3216,33 +3224,33 @@ static bool8 sub_811C7D4(void) static bool8 sub_811C830(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811E050(); sub_811E4AC(); sub_811E6B0(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: if (!sub_811E4D0()) { sub_811D9B4(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 2: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811D9CC(2); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 3: if (!sub_811DAA4()) { sub_811D698(2); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 4: @@ -3252,7 +3260,7 @@ static bool8 sub_811C830(void) sub_811E6E0(1); sub_811E64C(); sub_811E794(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3265,38 +3273,38 @@ static bool8 sub_811C830(void) static bool8 sub_811C8F0(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811D2C8(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: sub_811E380(); sub_811E6B0(); sub_811E7F8(); sub_811D9B4(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 2: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811D9CC(3); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 3: if (!sub_811DAA4()) { ShowBg(0); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 4: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811DFB0(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3309,45 +3317,45 @@ static bool8 sub_811C8F0(void) static bool8 sub_811C99C(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811D2C8(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: sub_811E380(); sub_811E6B0(); sub_811E7F8(); sub_811D9B4(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 2: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811D9CC(3); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 3: if (!sub_811DAA4()) { sub_811D104(3); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 4: if (!IsDma3ManagerBusyWithBgCopy()) { ShowBg(0); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 5: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811DFB0(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3360,34 +3368,34 @@ static bool8 sub_811C99C(void) static bool8 sub_811CA5C(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811E380(); sub_811E6B0(); sub_811E7F8(); sub_811D9B4(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811D9CC(4); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 2: if (!sub_811DAA4()) { sub_811D6D4(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 3: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811E3AC(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 4: @@ -3396,7 +3404,7 @@ static bool8 sub_811CA5C(void) sub_811DFC8(); sub_811E6E0(0); sub_811E64C(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3413,17 +3421,17 @@ static bool8 sub_811CB18(void) static bool8 sub_811CB24(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811D7A4(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811DDAC(1, 4); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 2: @@ -3432,7 +3440,7 @@ static bool8 sub_811CB24(void) sub_811E30C(); sub_811E64C(); sub_811E794(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3445,17 +3453,17 @@ static bool8 sub_811CB24(void) static bool8 sub_811CB98(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811D7C8(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) { sub_811DDAC(-1, 4); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 2: @@ -3463,7 +3471,7 @@ static bool8 sub_811CB98(void) { sub_811E64C(); sub_811E794(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3476,18 +3484,18 @@ static bool8 sub_811CB98(void) static bool8 sub_811CC08(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811D7EC(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) { s16 var0 = sub_811BBDC() - sub_811DE48(); sub_811DDAC(var0, 8); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 2: @@ -3496,7 +3504,7 @@ static bool8 sub_811CC08(void) sub_811E30C(); sub_811E64C(); sub_811E794(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3509,18 +3517,18 @@ static bool8 sub_811CC08(void) static bool8 sub_811CC90(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811D830(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) { s16 var0 = sub_811BBDC() - sub_811DE48(); sub_811DDAC(var0, 8); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; } break; case 2: @@ -3528,7 +3536,7 @@ static bool8 sub_811CC90(void) { sub_811E64C(); sub_811E794(); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; return FALSE; } break; @@ -3541,12 +3549,12 @@ static bool8 sub_811CC90(void) static bool8 sub_811CD14(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); sub_811D104(4); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -3557,12 +3565,12 @@ static bool8 sub_811CD14(void) static bool8 sub_811CD54(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); sub_811D104(5); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -3573,12 +3581,12 @@ static bool8 sub_811CD54(void) static bool8 sub_811CD94(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); sub_811D104(6); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -3589,12 +3597,12 @@ static bool8 sub_811CD94(void) static bool8 sub_811CDD4(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); sub_811D104(7); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -3605,12 +3613,12 @@ static bool8 sub_811CDD4(void) static bool8 sub_811CE14(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); sub_811D104(8); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -3621,12 +3629,12 @@ static bool8 sub_811CE14(void) static bool8 sub_811CE54(void) { - switch (gUnknown_0203A11C->unk0) + switch (sUnknown_0203A11C->unk0) { case 0: sub_811DF90(); sub_811D104(9); - gUnknown_0203A11C->unk0++; + sUnknown_0203A11C->unk0++; break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -3637,22 +3645,22 @@ static bool8 sub_811CE54(void) static bool8 sub_811CE94(void) { - gUnknown_0203A11C = Alloc(sizeof(*gUnknown_0203A11C)); - if (!gUnknown_0203A11C) + sUnknown_0203A11C = Alloc(sizeof(*sUnknown_0203A11C)); + if (!sUnknown_0203A11C) return FALSE; - gUnknown_0203A11C->unk0 = 0; - gUnknown_0203A11C->unk2D8 = NULL; - gUnknown_0203A11C->unk2DC = NULL; - gUnknown_0203A11C->unk2E0 = NULL; - gUnknown_0203A11C->unk2E4 = NULL; - gUnknown_0203A11C->unk2E8 = NULL; - gUnknown_0203A11C->unk2EC = NULL; - gUnknown_0203A11C->unk2F0 = NULL; - gUnknown_0203A11C->unk2F4 = NULL; - gUnknown_0203A11C->unk2F8 = NULL; - gUnknown_0203A11C->unk2FC = NULL; - gUnknown_0203A11C->unkA = sub_811BC70(); + sUnknown_0203A11C->unk0 = 0; + sUnknown_0203A11C->unk2D8 = NULL; + sUnknown_0203A11C->unk2DC = NULL; + sUnknown_0203A11C->unk2E0 = NULL; + sUnknown_0203A11C->unk2E4 = NULL; + sUnknown_0203A11C->unk2E8 = NULL; + sUnknown_0203A11C->unk2EC = NULL; + sUnknown_0203A11C->unk2F0 = NULL; + sUnknown_0203A11C->unk2F4 = NULL; + sUnknown_0203A11C->unk2F8 = NULL; + sUnknown_0203A11C->unk2FC = NULL; + sUnknown_0203A11C->unkA = FooterHasFourOptions_(); return TRUE; } @@ -3684,7 +3692,7 @@ static void sub_811CF64(void) static void sub_811CFCC(void) { int xOffset; - const u8 *titleText = sub_811BA88(); + const u8 *titleText = GetTitleText(); if (!titleText) return; @@ -3776,19 +3784,19 @@ static void sub_811D214(u8 initialCursorPos) static void sub_811D230(void) { - u8 var0; + u8 frameId; struct WindowTemplate template; - var0 = sub_811BA68(); + frameId = GetEasyChatScreenFrameId(); template.bg = 3; - template.tilemapLeft = gUnknown_08597C30[var0].unk0_0; - template.tilemapTop = gUnknown_08597C30[var0].unk0_5; - template.width = gUnknown_08597C30[var0].unk1; - template.height = gUnknown_08597C30[var0].unk2; + template.tilemapLeft = sPhraseFrameDimensions[frameId].left; + template.tilemapTop = sPhraseFrameDimensions[frameId].top; + template.width = sPhraseFrameDimensions[frameId].width; + template.height = sPhraseFrameDimensions[frameId].height; template.paletteNum = 11; template.baseBlock = 0x6C; - gUnknown_0203A11C->windowId = AddWindow(&template); - PutWindowTilemap(gUnknown_0203A11C->windowId); + sUnknown_0203A11C->windowId = AddWindow(&template); + PutWindowTilemap(sUnknown_0203A11C->windowId); } static void sub_811D2C8(void) @@ -3797,27 +3805,27 @@ static void sub_811D2C8(void) u16 *ecWord; u8 numColumns, numRows; u8 *str; - int var0; + int frameId; int var1; int i, j, k; - ecWord = sub_811BA94(); - numColumns = sub_811BAAC(); - numRows = sub_811BAA0(); - var0 = sub_811BA68(); + ecWord = GetEasyChatWordBuffer(); + numColumns = GetNumColumns(); + numRows = GetNumRows(); + frameId = GetEasyChatScreenFrameId(); var1 = 0; - if (var0 == 7) + if (frameId == 7) var1 = 1; - FillWindowPixelBuffer(gUnknown_0203A11C->windowId, 0x11); + FillWindowPixelBuffer(sUnknown_0203A11C->windowId, 0x11); for (i = 0; i < numRows; i++) { memcpy(spC, sText_Clear17, sizeof(sText_Clear17)); if (var1) spC[2] = 6; - str = gUnknown_0203A11C->unkB; - gUnknown_0203A11C->unkB[0] = EOS; + str = sUnknown_0203A11C->unkB; + sUnknown_0203A11C->unkB[0] = EOS; str = StringAppend(str, spC); for (j = 0; j < numColumns; j++) { @@ -3846,7 +3854,7 @@ static void sub_811D2C8(void) spC[2] = 3; str = StringAppend(str, spC); - if (var0 == 2 || var0 == 7 || var0 == 8) + if (frameId == 2 || frameId == 7 || frameId == 8) { if (j == 0 && i == 4) break; @@ -3854,27 +3862,27 @@ static void sub_811D2C8(void) } *str = EOS; - sub_811D028(gUnknown_0203A11C->windowId, 1, gUnknown_0203A11C->unkB, 0, i * 16 + 1, 0xFF, 0); + sub_811D028(sUnknown_0203A11C->windowId, 1, sUnknown_0203A11C->unkB, 0, i * 16 + 1, 0xFF, 0); } - CopyWindowToVram(gUnknown_0203A11C->windowId, 3); + CopyWindowToVram(sUnknown_0203A11C->windowId, 3); } static void sub_811D424(u16 *tilemap) { - u8 var0; + u8 frameId; int right, bottom; int x, y; - var0 = sub_811BA68(); + frameId = GetEasyChatScreenFrameId(); CpuFastFill(0, tilemap, BG_SCREEN_SIZE); - if (var0 == 2 || var0 == 8) + if (frameId == 2 || frameId == 8) { - right = gUnknown_08597C30[var0].unk0_0 + gUnknown_08597C30[var0].unk1; - bottom = gUnknown_08597C30[var0].unk0_5 + gUnknown_08597C30[var0].unk2; - for (y = gUnknown_08597C30[var0].unk0_5; y < bottom; y++) + right = sPhraseFrameDimensions[frameId].left + sPhraseFrameDimensions[frameId].width; + bottom = sPhraseFrameDimensions[frameId].top + sPhraseFrameDimensions[frameId].height; + for (y = sPhraseFrameDimensions[frameId].top; y < bottom; y++) { - x = gUnknown_08597C30[var0].unk0_0 - 1; + x = sPhraseFrameDimensions[frameId].left - 1; tilemap[y * 32 + x] = 0x1005; x++; for (; x < right; x++) @@ -3885,10 +3893,10 @@ static void sub_811D424(u16 *tilemap) } else { - y = gUnknown_08597C30[var0].unk0_5 - 1; - x = gUnknown_08597C30[var0].unk0_0 - 1; - right = gUnknown_08597C30[var0].unk0_0 + gUnknown_08597C30[var0].unk1; - bottom = gUnknown_08597C30[var0].unk0_5 + gUnknown_08597C30[var0].unk2; + y = sPhraseFrameDimensions[frameId].top - 1; + x = sPhraseFrameDimensions[frameId].left - 1; + right = sPhraseFrameDimensions[frameId].left + sPhraseFrameDimensions[frameId].width; + bottom = sPhraseFrameDimensions[frameId].top + sPhraseFrameDimensions[frameId].height; tilemap[y * 32 + x] = 0x1001; x++; for (; x < right; x++) @@ -3898,7 +3906,7 @@ static void sub_811D424(u16 *tilemap) y++; for (; y < bottom; y++) { - x = gUnknown_08597C30[var0].unk0_0 - 1; + x = sPhraseFrameDimensions[frameId].left - 1; tilemap[y * 32 + x] = 0x1005; x++; for (; x < right; x++) @@ -3907,7 +3915,7 @@ static void sub_811D424(u16 *tilemap) tilemap[y* 32 + x] = 0x1007; } - x = gUnknown_08597C30[var0].unk0_0 - 1; + x = sPhraseFrameDimensions[frameId].left - 1; tilemap[y * 32 + x] = 0x1009; x++; for (; x < right; x++) @@ -3919,12 +3927,12 @@ static void sub_811D424(u16 *tilemap) static void sub_811D60C(void) { - u8 var0; + u8 frameId; u16 *tilemap; tilemap = GetBgTilemapBuffer(3); - var0 = sub_811BA68(); - switch (gUnknown_08597C30[var0].unk3) + frameId = GetEasyChatScreenFrameId(); + switch (sPhraseFrameDimensions[frameId].footerId) { case 2: tilemap += 0x2A0; @@ -4072,11 +4080,11 @@ static void sub_811D864(u8 arg0, u8 arg1) easyChatWord = sub_811F578(var0++); if (easyChatWord != 0xFFFF) { - CopyEasyChatWordPadded(gUnknown_0203A11C->unkCC, easyChatWord, 0); + CopyEasyChatWordPadded(sUnknown_0203A11C->unkCC, easyChatWord, 0); if (!sub_811BF88(easyChatWord)) - sub_811D028(2, 1, gUnknown_0203A11C->unkCC, (j * 13 + 3) * 8, y, 0xFF, NULL); + sub_811D028(2, 1, sUnknown_0203A11C->unkCC, (j * 13 + 3) * 8, y, 0xFF, NULL); else - sub_811D058(2, 1, gUnknown_0203A11C->unkCC, (j * 13 + 3) * 8, y, 0xFF, 1, 5, 3); + sub_811D058(2, 1, sUnknown_0203A11C->unkCC, (j * 13 + 3) * 8, y, 0xFF, 1, 5, 3); } } @@ -4122,48 +4130,48 @@ static void sub_811D9CC(int arg0) switch (arg0) { case 0: - gUnknown_0203A11C->unk6 = 0; - gUnknown_0203A11C->unk7 = 10; + sUnknown_0203A11C->unk6 = 0; + sUnknown_0203A11C->unk7 = 10; break; case 1: - gUnknown_0203A11C->unk6 = 9; - gUnknown_0203A11C->unk7 = 0; + sUnknown_0203A11C->unk6 = 9; + sUnknown_0203A11C->unk7 = 0; break; case 2: - gUnknown_0203A11C->unk6 = 11; - gUnknown_0203A11C->unk7 = 17; + sUnknown_0203A11C->unk6 = 11; + sUnknown_0203A11C->unk7 = 17; break; case 3: - gUnknown_0203A11C->unk6 = 17; - gUnknown_0203A11C->unk7 = 0; + sUnknown_0203A11C->unk6 = 17; + sUnknown_0203A11C->unk7 = 0; break; case 4: - gUnknown_0203A11C->unk6 = 17; - gUnknown_0203A11C->unk7 = 10; + sUnknown_0203A11C->unk6 = 17; + sUnknown_0203A11C->unk7 = 10; break; case 5: - gUnknown_0203A11C->unk6 = 18; - gUnknown_0203A11C->unk7 = 22; + sUnknown_0203A11C->unk6 = 18; + sUnknown_0203A11C->unk7 = 22; break; case 6: - gUnknown_0203A11C->unk6 = 22; - gUnknown_0203A11C->unk7 = 18; + sUnknown_0203A11C->unk6 = 22; + sUnknown_0203A11C->unk7 = 18; break; } - gUnknown_0203A11C->unk8 = gUnknown_0203A11C->unk6 < gUnknown_0203A11C->unk7 ? 1 : -1; + sUnknown_0203A11C->unk8 = sUnknown_0203A11C->unk6 < sUnknown_0203A11C->unk7 ? 1 : -1; } static bool8 sub_811DAA4(void) { u8 var0, var1; - if (gUnknown_0203A11C->unk6 == gUnknown_0203A11C->unk7) + if (sUnknown_0203A11C->unk6 == sUnknown_0203A11C->unk7) return FALSE; - gUnknown_0203A11C->unk6 += gUnknown_0203A11C->unk8; - sub_811DADC(gUnknown_0203A11C->unk6); - var0 = gUnknown_0203A11C->unk6; - var1 = gUnknown_0203A11C->unk7; + sUnknown_0203A11C->unk6 += sUnknown_0203A11C->unk8; + sub_811DADC(sUnknown_0203A11C->unk6); + var0 = sUnknown_0203A11C->unk6; + var1 = sUnknown_0203A11C->unk7; return (var0 ^ var1) > 0; } @@ -4244,7 +4252,7 @@ static void sub_811DC28(int left, int top, int width, int height) int bottom; int x, y; - tilemap = gUnknown_0203A11C->unk300; + tilemap = sUnknown_0203A11C->unk300; right = left + width - 1; bottom = top + height - 1; x = left; @@ -4278,7 +4286,7 @@ static void sub_811DC28(int left, int top, int width, int height) static void sub_811DD84(void) { ChangeBgY(2, 0x800, 0); - gUnknown_0203A11C->unk2CE = 0; + sUnknown_0203A11C->unk2CE = 0; } static void sub_811DDAC(s16 arg0, u8 arg1) @@ -4287,15 +4295,15 @@ static void sub_811DDAC(s16 arg0, u8 arg1) s16 var0; bgY = GetBgY(2); - gUnknown_0203A11C->unk2CE += arg0; + sUnknown_0203A11C->unk2CE += arg0; var0 = arg0 * 16; bgY += var0 << 8; if (arg1) { - gUnknown_0203A11C->unk2D0 = bgY; - gUnknown_0203A11C->unk2D4 = arg1 * 256; + sUnknown_0203A11C->unk2D0 = bgY; + sUnknown_0203A11C->unk2D4 = arg1 * 256; if (var0 < 0) - gUnknown_0203A11C->unk2D4 = -gUnknown_0203A11C->unk2D4; + sUnknown_0203A11C->unk2D4 = -sUnknown_0203A11C->unk2D4; } else { @@ -4308,20 +4316,20 @@ static bool8 sub_811DE10(void) int bgY; bgY = GetBgY(2); - if (bgY == gUnknown_0203A11C->unk2D0) + if (bgY == sUnknown_0203A11C->unk2D0) { return FALSE; } else { - ChangeBgY(2, gUnknown_0203A11C->unk2D4, 1); + ChangeBgY(2, sUnknown_0203A11C->unk2D4, 1); return TRUE; } } static int sub_811DE48(void) { - return gUnknown_0203A11C->unk2CE; + return sUnknown_0203A11C->unk2CE; } static void sub_811DE5C(u8 left, u8 top, u8 width, u8 height) @@ -4336,19 +4344,19 @@ static void sub_811DE90(void) { u32 i; - LoadSpriteSheets(sUnknown_08597CA0); - LoadSpritePalettes(sUnknown_08597CC0); + LoadSpriteSheets(sEasyChatSpriteSheets); + LoadSpritePalettes(sEasyChatSpritePalettes); for (i = 0; i < ARRAY_COUNT(sUnknown_08597CE8); i++) LoadCompressedSpriteSheet(&sUnknown_08597CE8[i]); } static void sub_811DEC4(void) { - u8 var0 = sub_811BA68(); - int x = gUnknown_08597C30[var0].unk0_0 * 8 + 13; - int y = gUnknown_08597C30[var0].unk0_5 * 8 + 8; + u8 frameId = GetEasyChatScreenFrameId(); + int x = sPhraseFrameDimensions[frameId].left * 8 + 13; + int y = sPhraseFrameDimensions[frameId].top * 8 + 8; u8 spriteId = CreateSprite(&sUnknown_08597D18, x, y, 2); - gUnknown_0203A11C->unk2D8 = &gSprites[spriteId]; + sUnknown_0203A11C->unk2D8 = &gSprites[spriteId]; gSprites[spriteId].data[1] = 1; } @@ -4367,44 +4375,44 @@ static void sub_811DF28(struct Sprite *sprite) static void sub_811DF60(u8 x, u8 y) { - gUnknown_0203A11C->unk2D8->pos1.x = x; - gUnknown_0203A11C->unk2D8->pos1.y = y; - gUnknown_0203A11C->unk2D8->pos2.x = 0; - gUnknown_0203A11C->unk2D8->data[0] = 0; + sUnknown_0203A11C->unk2D8->pos1.x = x; + sUnknown_0203A11C->unk2D8->pos1.y = y; + sUnknown_0203A11C->unk2D8->pos2.x = 0; + sUnknown_0203A11C->unk2D8->data[0] = 0; } static void sub_811DF90(void) { - gUnknown_0203A11C->unk2D8->data[0] = 0; - gUnknown_0203A11C->unk2D8->data[1] = 0; - gUnknown_0203A11C->unk2D8->pos2.x = 0; + sUnknown_0203A11C->unk2D8->data[0] = 0; + sUnknown_0203A11C->unk2D8->data[1] = 0; + sUnknown_0203A11C->unk2D8->pos2.x = 0; } static void sub_811DFB0(void) { - gUnknown_0203A11C->unk2D8->data[1] = 1; + sUnknown_0203A11C->unk2D8->data[1] = 1; } static void sub_811DFC8(void) { u8 spriteId = CreateSprite(&sUnknown_08597D68, 0, 0, 3); - gUnknown_0203A11C->unk2DC = &gSprites[spriteId]; - gUnknown_0203A11C->unk2DC->pos2.x = 32; + sUnknown_0203A11C->unk2DC = &gSprites[spriteId]; + sUnknown_0203A11C->unk2DC->pos2.x = 32; spriteId = CreateSprite(&sUnknown_08597D68, 0, 0, 3); - gUnknown_0203A11C->unk2E0 = &gSprites[spriteId]; - gUnknown_0203A11C->unk2E0->pos2.x = -32; + sUnknown_0203A11C->unk2E0 = &gSprites[spriteId]; + sUnknown_0203A11C->unk2E0->pos2.x = -32; - gUnknown_0203A11C->unk2DC->hFlip = 1; + sUnknown_0203A11C->unk2DC->hFlip = 1; sub_811E088(); } static void sub_811E050(void) { - DestroySprite(gUnknown_0203A11C->unk2DC); - gUnknown_0203A11C->unk2DC = NULL; - DestroySprite(gUnknown_0203A11C->unk2E0); - gUnknown_0203A11C->unk2E0 = NULL; + DestroySprite(sUnknown_0203A11C->unk2DC); + sUnknown_0203A11C->unk2DC = NULL; + DestroySprite(sUnknown_0203A11C->unk2E0); + sUnknown_0203A11C->unk2E0 = NULL; } static void sub_811E088(void) @@ -4412,7 +4420,7 @@ static void sub_811E088(void) u8 var0; u8 var1; - if (gUnknown_0203A11C->unk2DC && gUnknown_0203A11C->unk2E0) + if (sUnknown_0203A11C->unk2DC && sUnknown_0203A11C->unk2E0) { sub_811BB9C(&var0, &var1); if (!sub_811BBB0()) @@ -4426,23 +4434,23 @@ static void sub_811E0EC(s8 arg0, s8 arg1) { if (arg0 != -1) { - StartSpriteAnim(gUnknown_0203A11C->unk2DC, 0); - gUnknown_0203A11C->unk2DC->pos1.x = arg0 * 84 + 58; - gUnknown_0203A11C->unk2DC->pos1.y = arg1 * 16 + 96; + StartSpriteAnim(sUnknown_0203A11C->unk2DC, 0); + sUnknown_0203A11C->unk2DC->pos1.x = arg0 * 84 + 58; + sUnknown_0203A11C->unk2DC->pos1.y = arg1 * 16 + 96; - StartSpriteAnim(gUnknown_0203A11C->unk2E0, 0); - gUnknown_0203A11C->unk2E0->pos1.x = arg0 * 84 + 58; - gUnknown_0203A11C->unk2E0->pos1.y = arg1 * 16 + 96; + StartSpriteAnim(sUnknown_0203A11C->unk2E0, 0); + sUnknown_0203A11C->unk2E0->pos1.x = arg0 * 84 + 58; + sUnknown_0203A11C->unk2E0->pos1.y = arg1 * 16 + 96; } else { - StartSpriteAnim(gUnknown_0203A11C->unk2DC, 1); - gUnknown_0203A11C->unk2DC->pos1.x = 216; - gUnknown_0203A11C->unk2DC->pos1.y = arg1 * 16 + 112; + StartSpriteAnim(sUnknown_0203A11C->unk2DC, 1); + sUnknown_0203A11C->unk2DC->pos1.x = 216; + sUnknown_0203A11C->unk2DC->pos1.y = arg1 * 16 + 112; - StartSpriteAnim(gUnknown_0203A11C->unk2E0, 1); - gUnknown_0203A11C->unk2E0->pos1.x = 216; - gUnknown_0203A11C->unk2E0->pos1.y = arg1 * 16 + 112; + StartSpriteAnim(sUnknown_0203A11C->unk2E0, 1); + sUnknown_0203A11C->unk2E0->pos1.x = 216; + sUnknown_0203A11C->unk2E0->pos1.y = arg1 * 16 + 112; } } @@ -4466,32 +4474,32 @@ static void sub_811E1A4(s8 arg0, s8 arg1) anim = 3; } - StartSpriteAnim(gUnknown_0203A11C->unk2DC, anim); - gUnknown_0203A11C->unk2DC->pos1.x = x; - gUnknown_0203A11C->unk2DC->pos1.y = y; + StartSpriteAnim(sUnknown_0203A11C->unk2DC, anim); + sUnknown_0203A11C->unk2DC->pos1.x = x; + sUnknown_0203A11C->unk2DC->pos1.y = y; - StartSpriteAnim(gUnknown_0203A11C->unk2E0, anim); - gUnknown_0203A11C->unk2E0->pos1.x = x; - gUnknown_0203A11C->unk2E0->pos1.y = y; + StartSpriteAnim(sUnknown_0203A11C->unk2E0, anim); + sUnknown_0203A11C->unk2E0->pos1.x = x; + sUnknown_0203A11C->unk2E0->pos1.y = y; } else { - StartSpriteAnim(gUnknown_0203A11C->unk2DC, 1); - gUnknown_0203A11C->unk2DC->pos1.x = 216; - gUnknown_0203A11C->unk2DC->pos1.y = arg1 * 16 + 112; + StartSpriteAnim(sUnknown_0203A11C->unk2DC, 1); + sUnknown_0203A11C->unk2DC->pos1.x = 216; + sUnknown_0203A11C->unk2DC->pos1.y = arg1 * 16 + 112; - StartSpriteAnim(gUnknown_0203A11C->unk2E0, 1); - gUnknown_0203A11C->unk2E0->pos1.x = 216; - gUnknown_0203A11C->unk2E0->pos1.y = arg1 * 16 + 112; + StartSpriteAnim(sUnknown_0203A11C->unk2E0, 1); + sUnknown_0203A11C->unk2E0->pos1.x = 216; + sUnknown_0203A11C->unk2E0->pos1.y = arg1 * 16 + 112; } } static void sub_811E288(void) { u8 spriteId = CreateSprite(&sUnknown_08597D18, 0, 0, 4); - gUnknown_0203A11C->unk2E4 = &gSprites[spriteId]; - gUnknown_0203A11C->unk2E4->callback = sub_811E2DC; - gUnknown_0203A11C->unk2E4->oam.priority = 2; + sUnknown_0203A11C->unk2E4 = &gSprites[spriteId]; + sUnknown_0203A11C->unk2E4->callback = sub_811E2DC; + sUnknown_0203A11C->unk2E4->oam.priority = 2; sub_811E30C(); } @@ -4518,58 +4526,58 @@ static void sub_811E30C(void) static void sub_811E34C(u8 x, u8 y) { - if (gUnknown_0203A11C->unk2E4) + if (sUnknown_0203A11C->unk2E4) { - gUnknown_0203A11C->unk2E4->pos1.x = x; - gUnknown_0203A11C->unk2E4->pos1.y = y; - gUnknown_0203A11C->unk2E4->pos2.x = 0; - gUnknown_0203A11C->unk2E4->data[0] = 0; + sUnknown_0203A11C->unk2E4->pos1.x = x; + sUnknown_0203A11C->unk2E4->pos1.y = y; + sUnknown_0203A11C->unk2E4->pos2.x = 0; + sUnknown_0203A11C->unk2E4->data[0] = 0; } } static void sub_811E380(void) { - if (gUnknown_0203A11C->unk2E4) + if (sUnknown_0203A11C->unk2E4) { - DestroySprite(gUnknown_0203A11C->unk2E4); - gUnknown_0203A11C->unk2E4 = NULL; + DestroySprite(sUnknown_0203A11C->unk2E4); + sUnknown_0203A11C->unk2E4 = NULL; } } static void sub_811E3AC(void) { u8 spriteId = CreateSprite(&sUnknown_08597DF0, 208, 128, 6); - gUnknown_0203A11C->unk2E8 = &gSprites[spriteId]; - gUnknown_0203A11C->unk2E8->pos2.x = -64; + sUnknown_0203A11C->unk2E8 = &gSprites[spriteId]; + sUnknown_0203A11C->unk2E8->pos2.x = -64; spriteId = CreateSprite(&sUnknown_08597DD0, 208, 80, 5); - gUnknown_0203A11C->unk2EC = &gSprites[spriteId]; - gUnknown_0203A11C->unk9 = 0; + sUnknown_0203A11C->unk2EC = &gSprites[spriteId]; + sUnknown_0203A11C->unk9 = 0; } static bool8 sub_811E418(void) { - switch (gUnknown_0203A11C->unk9) + switch (sUnknown_0203A11C->unk9) { default: return FALSE; case 0: - gUnknown_0203A11C->unk2E8->pos2.x += 8; - if (gUnknown_0203A11C->unk2E8->pos2.x >= 0) + sUnknown_0203A11C->unk2E8->pos2.x += 8; + if (sUnknown_0203A11C->unk2E8->pos2.x >= 0) { - gUnknown_0203A11C->unk2E8->pos2.x = 0; + sUnknown_0203A11C->unk2E8->pos2.x = 0; if (!sub_811BBB0()) - StartSpriteAnim(gUnknown_0203A11C->unk2EC, 1); + StartSpriteAnim(sUnknown_0203A11C->unk2EC, 1); else - StartSpriteAnim(gUnknown_0203A11C->unk2EC, 2); + StartSpriteAnim(sUnknown_0203A11C->unk2EC, 2); - gUnknown_0203A11C->unk9++; + sUnknown_0203A11C->unk9++; } break; case 1: - if (gUnknown_0203A11C->unk2EC->animEnded) + if (sUnknown_0203A11C->unk2EC->animEnded) { - gUnknown_0203A11C->unk9 = 2; + sUnknown_0203A11C->unk9 = 2; return FALSE; } } @@ -4579,29 +4587,29 @@ static bool8 sub_811E418(void) static void sub_811E4AC(void) { - gUnknown_0203A11C->unk9 = 0; - StartSpriteAnim(gUnknown_0203A11C->unk2EC, 3); + sUnknown_0203A11C->unk9 = 0; + StartSpriteAnim(sUnknown_0203A11C->unk2EC, 3); } static bool8 sub_811E4D0(void) { - switch (gUnknown_0203A11C->unk9) + switch (sUnknown_0203A11C->unk9) { default: return FALSE; case 0: - if (gUnknown_0203A11C->unk2EC->animEnded) - gUnknown_0203A11C->unk9 = 1; + if (sUnknown_0203A11C->unk2EC->animEnded) + sUnknown_0203A11C->unk9 = 1; break; case 1: - gUnknown_0203A11C->unk2E8->pos2.x -= 8; - if (gUnknown_0203A11C->unk2E8->pos2.x <= -64) + sUnknown_0203A11C->unk2E8->pos2.x -= 8; + if (sUnknown_0203A11C->unk2E8->pos2.x <= -64) { - DestroySprite(gUnknown_0203A11C->unk2EC); - DestroySprite(gUnknown_0203A11C->unk2E8); - gUnknown_0203A11C->unk2EC = NULL; - gUnknown_0203A11C->unk2E8 = NULL; - gUnknown_0203A11C->unk9++; + DestroySprite(sUnknown_0203A11C->unk2EC); + DestroySprite(sUnknown_0203A11C->unk2E8); + sUnknown_0203A11C->unk2EC = NULL; + sUnknown_0203A11C->unk2E8 = NULL; + sUnknown_0203A11C->unk9++; return FALSE; } } @@ -4611,33 +4619,33 @@ static bool8 sub_811E4D0(void) static void sub_811E55C(void) { - StartSpriteAnim(gUnknown_0203A11C->unk2EC, 4); + StartSpriteAnim(sUnknown_0203A11C->unk2EC, 4); } static void sub_811E578(void) { if (!sub_811BBB0()) - StartSpriteAnim(gUnknown_0203A11C->unk2EC, 1); + StartSpriteAnim(sUnknown_0203A11C->unk2EC, 1); else - StartSpriteAnim(gUnknown_0203A11C->unk2EC, 2); + StartSpriteAnim(sUnknown_0203A11C->unk2EC, 2); } static bool8 sub_811E5B8(void) { - return !gUnknown_0203A11C->unk2EC->animEnded; + return !sUnknown_0203A11C->unk2EC->animEnded; } static void sub_811E5D4(void) { u8 spriteId = CreateSprite(&sUnknown_08597E48, 96, 80, 0); if (spriteId != MAX_SPRITES) - gUnknown_0203A11C->unk2F0 = &gSprites[spriteId]; + sUnknown_0203A11C->unk2F0 = &gSprites[spriteId]; spriteId = CreateSprite(&sUnknown_08597E48, 96, 156, 0); if (spriteId != MAX_SPRITES) { - gUnknown_0203A11C->unk2F4 = &gSprites[spriteId]; - gUnknown_0203A11C->unk2F4->vFlip = 1; + sUnknown_0203A11C->unk2F4 = &gSprites[spriteId]; + sUnknown_0203A11C->unk2F4->vFlip = 1; } sub_811E6B0(); @@ -4645,27 +4653,27 @@ static void sub_811E5D4(void) static void sub_811E64C(void) { - gUnknown_0203A11C->unk2F0->invisible = !sub_811BBF8(); - gUnknown_0203A11C->unk2F4->invisible = !sub_811BC2C(); + sUnknown_0203A11C->unk2F0->invisible = !sub_811BBF8(); + sUnknown_0203A11C->unk2F4->invisible = !sub_811BC2C(); } static void sub_811E6B0(void) { - gUnknown_0203A11C->unk2F0->invisible = 1; - gUnknown_0203A11C->unk2F4->invisible = 1; + sUnknown_0203A11C->unk2F0->invisible = 1; + sUnknown_0203A11C->unk2F4->invisible = 1; } static void sub_811E6E0(int arg0) { if (!arg0) { - gUnknown_0203A11C->unk2F0->pos1.x = 96; - gUnknown_0203A11C->unk2F4->pos1.x = 96; + sUnknown_0203A11C->unk2F0->pos1.x = 96; + sUnknown_0203A11C->unk2F4->pos1.x = 96; } else { - gUnknown_0203A11C->unk2F0->pos1.x = 120; - gUnknown_0203A11C->unk2F4->pos1.x = 120; + sUnknown_0203A11C->unk2F0->pos1.x = 120; + sUnknown_0203A11C->unk2F4->pos1.x = 120; } } @@ -4673,13 +4681,13 @@ static void sub_811E720(void) { u8 spriteId = CreateSprite(&sUnknown_08597E30, 220, 84, 1); if (spriteId != MAX_SPRITES) - gUnknown_0203A11C->unk2F8 = &gSprites[spriteId]; + sUnknown_0203A11C->unk2F8 = &gSprites[spriteId]; spriteId = CreateSprite(&sUnknown_08597E30, 220, 156, 1); if (spriteId != MAX_SPRITES) { - gUnknown_0203A11C->unk2FC = &gSprites[spriteId]; - StartSpriteAnim(gUnknown_0203A11C->unk2FC, 1); + sUnknown_0203A11C->unk2FC = &gSprites[spriteId]; + StartSpriteAnim(sUnknown_0203A11C->unk2FC, 1); } sub_811E7F8(); @@ -4687,14 +4695,14 @@ static void sub_811E720(void) static void sub_811E794(void) { - gUnknown_0203A11C->unk2F8->invisible = !sub_811BBF8(); - gUnknown_0203A11C->unk2FC->invisible = !sub_811BC2C(); + sUnknown_0203A11C->unk2F8->invisible = !sub_811BBF8(); + sUnknown_0203A11C->unk2FC->invisible = !sub_811BC2C(); } static void sub_811E7F8(void) { - gUnknown_0203A11C->unk2F8->invisible = 1; - gUnknown_0203A11C->unk2FC->invisible = 1; + sUnknown_0203A11C->unk2F8->invisible = 1; + sUnknown_0203A11C->unk2FC->invisible = 1; } static void sub_811E828(void) @@ -4702,22 +4710,22 @@ static void sub_811E828(void) int graphicsId; u8 spriteId; - switch (sub_811BCBC()) + switch (GetDisplayedPersonType()) { - case 0: + case EASY_CHAT_PERSON_REPORTER_MALE: graphicsId = EVENT_OBJ_GFX_REPORTER_M; break; - case 1: + case EASY_CHAT_PERSON_REPORTER_FEMALE: graphicsId = EVENT_OBJ_GFX_REPORTER_F; break; - case 2: + case EASY_CHAT_PERSON_BOY: graphicsId = EVENT_OBJ_GFX_BOY_1; break; default: return; } - if (sub_811BA68() != 4) + if (GetEasyChatScreenFrameId() != 4) return; spriteId = AddPseudoEventObject(graphicsId, SpriteCallbackDummy, 76, 40, 0); @@ -4741,10 +4749,10 @@ static void sub_811E828(void) } } -int sub_811E8E4(void) +int GetFooterIndex(void) { - u8 var0 = sub_811BA68(); - switch (gUnknown_08597C30[var0].unk3) + u8 frameId = GetEasyChatScreenFrameId(); + switch (sPhraseFrameDimensions[frameId].footerId) { case 1: return 1; @@ -4757,11 +4765,11 @@ int sub_811E8E4(void) } } -static int sub_811E920(int arg0) +static int GetFooterOptionXOffset(int option) { - int var0 = sub_811E8E4(); - if (var0 < 3) - return sUnknown_08597E60[var0][arg0] + 4; + int footerIndex = GetFooterIndex(); + if (footerIndex < 3) + return sFooterOptionXOffsets[footerIndex][option] + 4; else return 0; } @@ -4771,8 +4779,8 @@ static void sub_811E948(void) int i; u16 windowId; struct WindowTemplate template; - int var0 = sub_811E8E4(); - if (var0 == 3) + int footerId = GetFooterIndex(); + if (footerId == 3) return; template.bg = 3; @@ -4786,10 +4794,10 @@ static void sub_811E948(void) FillWindowPixelBuffer(windowId, 0x11); for (i = 0; i < 4; i++) { - const u8 *str = sFooterTextOptions[var0][i]; + const u8 *str = sFooterTextOptions[footerId][i]; if (str) { - int x = sUnknown_08597E60[var0][i]; + int x = sFooterOptionXOffsets[footerId][i]; sub_811D028(windowId, 1, str, x, 1, 0, NULL); } } @@ -5075,13 +5083,13 @@ void sub_811EECC(void) switch (gSpecialVar_0x8004) { case 0: - easyChatWords = gSaveBlock1Ptr->unk2BB0; + easyChatWords = gSaveBlock1Ptr->easyChatProfile; columns = 2; rows = 2; break; case 1: - easyChatWords = gSaveBlock1Ptr->unk2BBC; - if (sub_811EDC4(gSaveBlock1Ptr->unk2BBC, 3, 2, 18)) + easyChatWords = gSaveBlock1Ptr->easyChatBattleStart; + if (sub_811EDC4(gSaveBlock1Ptr->easyChatBattleStart, 3, 2, 18)) { columns = 2; rows = 3; @@ -5093,12 +5101,12 @@ void sub_811EECC(void) } break; case 2: - easyChatWords = gSaveBlock1Ptr->unk2BC8; + easyChatWords = gSaveBlock1Ptr->easyChatBattleWon; columns = 3; rows = 2; break; case 3: - easyChatWords = gSaveBlock1Ptr->unk2BD4; + easyChatWords = gSaveBlock1Ptr->easyChatBattleLost; columns = 3; rows = 2; break; @@ -5237,16 +5245,16 @@ void InitEasyChatPhrases(void) u16 i, j; for (i = 0; i < 4; i++) - gSaveBlock1Ptr->unk2BB0[i] = sUnknown_0859E62C[i]; + gSaveBlock1Ptr->easyChatProfile[i] = sDefaultProfileWords[i]; for (i = 0; i < 6; i++) - gSaveBlock1Ptr->unk2BBC[i] = sUnknown_0859E634[i]; + gSaveBlock1Ptr->easyChatBattleStart[i] = sDefaultBattleStartWords[i]; for (i = 0; i < 6; i++) - gSaveBlock1Ptr->unk2BC8[i] = sUnknown_0859E640[i]; + gSaveBlock1Ptr->easyChatBattleWon[i] = sUnknown_0859E640[i]; for (i = 0; i < 6; i++) - gSaveBlock1Ptr->unk2BD4[i] = sUnknown_0859E64C[i]; + gSaveBlock1Ptr->easyChatBattleLost[i] = sUnknown_0859E64C[i]; for (i = 0; i < MAIL_COUNT; i++) { @@ -5264,8 +5272,8 @@ void InitEasyChatPhrases(void) static bool8 sub_811F28C(void) { - gUnknown_0203A120 = Alloc(sizeof(*gUnknown_0203A120)); - if (!gUnknown_0203A120) + sUnknown_0203A120 = Alloc(sizeof(*sUnknown_0203A120)); + if (!sUnknown_0203A120) return FALSE; sub_811F2D4(); @@ -5275,46 +5283,46 @@ static bool8 sub_811F28C(void) static void sub_811F2B8(void) { - if (gUnknown_0203A120) - FREE_AND_SET_NULL(gUnknown_0203A120); + if (sUnknown_0203A120) + FREE_AND_SET_NULL(sUnknown_0203A120); } static void sub_811F2D4(void) { int i; - gUnknown_0203A120->unk0 = 0; + sUnknown_0203A120->unk0 = 0; if (GetNationalPokedexCount(FLAG_GET_SEEN)) - gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_POKEMON; + sUnknown_0203A120->unk2[sUnknown_0203A120->unk0++] = EC_GROUP_POKEMON; for (i = EC_GROUP_TRAINER; i <= EC_GROUP_ADJECTIVES; i++) - gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = i; + sUnknown_0203A120->unk2[sUnknown_0203A120->unk0++] = i; if (FlagGet(FLAG_SYS_GAME_CLEAR)) { - gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_EVENTS; - gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_MOVE_1; - gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_MOVE_2; + sUnknown_0203A120->unk2[sUnknown_0203A120->unk0++] = EC_GROUP_EVENTS; + sUnknown_0203A120->unk2[sUnknown_0203A120->unk0++] = EC_GROUP_MOVE_1; + sUnknown_0203A120->unk2[sUnknown_0203A120->unk0++] = EC_GROUP_MOVE_2; } if (FlagGet(FLAG_SYS_HIPSTER_MEET)) - gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_TRENDY_SAYING; + sUnknown_0203A120->unk2[sUnknown_0203A120->unk0++] = EC_GROUP_TRENDY_SAYING; if (IsNationalPokedexEnabled()) - gUnknown_0203A120->unk2[gUnknown_0203A120->unk0++] = EC_GROUP_POKEMON_2; + sUnknown_0203A120->unk2[sUnknown_0203A120->unk0++] = EC_GROUP_POKEMON_2; } static u8 sub_811F3AC(void) { - return gUnknown_0203A120->unk0; + return sUnknown_0203A120->unk0; } static u8 sub_811F3B8(u8 index) { - if (index >= gUnknown_0203A120->unk0) + if (index >= sUnknown_0203A120->unk0) return EC_NUM_GROUPS; else - return gUnknown_0203A120->unk2[index]; + return sUnknown_0203A120->unk2[index]; } u8 *unref_sub_811F3E0(u8 *dest, u8 groupId, u16 totalChars) @@ -5362,7 +5370,7 @@ static void sub_811F46C(void) { numWords = gEasyChatWordsByLetterPointers[i].numWords; words = gEasyChatWordsByLetterPointers[i].words; - gUnknown_0203A120->unk2E[i] = 0; + sUnknown_0203A120->unk2E[i] = 0; index = 0; for (j = 0; j < numWords; j++) { @@ -5382,8 +5390,8 @@ static void sub_811F46C(void) { if (sub_811F860(words[k])) { - gUnknown_0203A120->unk64[i][index++] = words[k]; - gUnknown_0203A120->unk2E[i]++; + sUnknown_0203A120->unk64[i][index++] = words[k]; + sUnknown_0203A120->unk2E[i]++; break; } } @@ -5396,22 +5404,22 @@ static void sub_811F46C(void) static void sub_811F548(int arg0, u16 groupId) { if (!arg0) - gUnknown_0203A120->unk3BA0 = sub_811F5C4(groupId); + sUnknown_0203A120->unk3BA0 = sub_811F5C4(groupId); else - gUnknown_0203A120->unk3BA0 = sub_811F6B8(groupId); + sUnknown_0203A120->unk3BA0 = sub_811F6B8(groupId); } static u16 sub_811F578(u16 arg0) { - if (arg0 >= gUnknown_0203A120->unk3BA0) + if (arg0 >= sUnknown_0203A120->unk3BA0) return 0xFFFF; else - return gUnknown_0203A120->unk3984[arg0]; + return sUnknown_0203A120->unk3984[arg0]; } static u16 sub_811F5B0(void) { - return gUnknown_0203A120->unk3BA0; + return sUnknown_0203A120->unk3BA0; } static u16 sub_811F5C4(u16 groupId) @@ -5429,7 +5437,7 @@ static u16 sub_811F5C4(u16 groupId) for (i = 0, totalWords = 0; i < numWords; i++) { if (sub_811F764(list[i], groupId)) - gUnknown_0203A120->unk3984[totalWords++] = EC_WORD(groupId, list[i]); + sUnknown_0203A120->unk3984[totalWords++] = EC_WORD(groupId, list[i]); } return totalWords; @@ -5441,7 +5449,7 @@ static u16 sub_811F5C4(u16 groupId) { u16 alphabeticalOrder = wordInfo[i].alphabeticalOrder; if (sub_811F764(alphabeticalOrder, groupId)) - gUnknown_0203A120->unk3984[totalWords++] = EC_WORD(groupId, alphabeticalOrder); + sUnknown_0203A120->unk3984[totalWords++] = EC_WORD(groupId, alphabeticalOrder); } return totalWords; @@ -5453,8 +5461,8 @@ static u16 sub_811F6B8(u16 alphabeticalGroup) u16 i; u16 totalWords; - for (i = 0, totalWords = 0; i < gUnknown_0203A120->unk2E[alphabeticalGroup]; i++) - gUnknown_0203A120->unk3984[totalWords++] = gUnknown_0203A120->unk64[alphabeticalGroup][i]; + for (i = 0, totalWords = 0; i < sUnknown_0203A120->unk2E[alphabeticalGroup]; i++) + sUnknown_0203A120->unk3984[totalWords++] = sUnknown_0203A120->unk64[alphabeticalGroup][i]; return totalWords; } @@ -5462,9 +5470,9 @@ static u16 sub_811F6B8(u16 alphabeticalGroup) static bool8 sub_811F72C(u8 arg0) { int i; - for (i = 0; i < gUnknown_0203A120->unk0; i++) + for (i = 0; i < sUnknown_0203A120->unk0; i++) { - if (gUnknown_0203A120->unk2[i] == arg0) + if (sUnknown_0203A120->unk2[i] == arg0) return TRUE; } diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 3d4f8a90d2..dc38d88485 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -695,7 +695,7 @@ u8 sub_818E2D8(void) void sub_818E2FC(void) { - easy_chat_input_maybe(); + ShowEasyChatScreen(); } bool8 sub_818E308(void) @@ -763,8 +763,8 @@ void sub_818E430(void) void sub_818E47C(void) { - gSpecialVar_0x8004 = 0x11; - easy_chat_input_maybe(); + gSpecialVar_0x8004 = EASY_CHAT_TYPE_QUIZ_SET_QUESTION; + ShowEasyChatScreen(); } void sub_818E490(void) diff --git a/src/party_menu.c b/src/party_menu.c index 645390affd..4103c212ca 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -63,6 +63,7 @@ #include "window.h" #include "constants/battle.h" #include "constants/battle_frontier.h" +#include "constants/easy_chat.h" #include "constants/field_effects.h" #include "constants/flags.h" #include "constants/items.h" @@ -4211,7 +4212,11 @@ static void sub_81B452C(void) { u8 mail = GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_MAIL); - sub_811A20C(4, gSaveBlock1Ptr->mail[mail].words, sub_81B4578, 3); + DoEasyChatScreen( + EASY_CHAT_TYPE_MAIL, + gSaveBlock1Ptr->mail[mail].words, + sub_81B4578, + EASY_CHAT_PERSON_DISPLAY_NONE); } static void sub_81B4578(void) @@ -6385,7 +6390,11 @@ static void sub_81B814C(void) sub_81B1DB8(&gPlayerParty[gUnknown_0203CEC8.unk9], gUnknown_0203CEC8.unkC); mail = GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_MAIL); - sub_811A20C(4, gSaveBlock1Ptr->mail[mail].words, sub_81B81A8, 3); + DoEasyChatScreen( + EASY_CHAT_TYPE_MAIL, + gSaveBlock1Ptr->mail[mail].words, + sub_81B81A8, + EASY_CHAT_PERSON_DISPLAY_NONE); } static void sub_81B81A8(void) diff --git a/src/trainer_card.c b/src/trainer_card.c index 49a62284f9..4019ef0bd9 100755 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -695,7 +695,7 @@ static void SetPlayerCardData(struct TrainerCard *trainerCard, u8 cardType) trainerCard->money = GetMoney(&gSaveBlock1Ptr->money); for (i = 0; i < 4; i++) - trainerCard->var_28[i] = gSaveBlock1Ptr->unk2BB0[i]; + trainerCard->var_28[i] = gSaveBlock1Ptr->easyChatProfile[i]; StringCopy(trainerCard->playerName, gSaveBlock2Ptr->playerName); diff --git a/src/tv.c b/src/tv.c index 2487210837..f282b09f0d 100644 --- a/src/tv.c +++ b/src/tv.c @@ -2448,8 +2448,8 @@ void sub_80EE72C(void) show->trainerFanClub.kind = TVSHOW_TRAINER_FAN_CLUB; show->trainerFanClub.active = FALSE; StringCopy(show->trainerFanClub.playerName, gSaveBlock2Ptr->playerName); - show->trainerFanClub.words[0] = gSaveBlock1Ptr->unk2BB0[0]; - show->trainerFanClub.words[1] = gSaveBlock1Ptr->unk2BB0[1]; + show->trainerFanClub.words[0] = gSaveBlock1Ptr->easyChatProfile[0]; + show->trainerFanClub.words[1] = gSaveBlock1Ptr->easyChatProfile[1]; tv_store_id_3x(show); show->trainerFanClub.language = gGameLanguage; } From 4137dd7b0bd6dd661831856e4ca30b958d4beac9 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 27 Feb 2019 14:42:32 -0500 Subject: [PATCH 132/217] Identify unused, never read, and never written vars --- data/event_scripts.s | 2 +- data/maps/FarawayIsland_Interior/scripts.inc | 2 +- data/maps/MarineCave_End/scripts.inc | 4 +- data/maps/PetalburgCity_Gym/scripts.inc | 2 +- data/maps/Route105/scripts.inc | 4 +- data/maps/Route114/scripts.inc | 4 +- data/maps/Route115/scripts.inc | 4 +- data/maps/Route116/scripts.inc | 4 +- data/maps/Route118/scripts.inc | 4 +- data/maps/Route125/scripts.inc | 4 +- data/maps/Route127/scripts.inc | 4 +- data/maps/Route129/scripts.inc | 4 +- data/maps/TerraCave_End/scripts.inc | 4 +- include/constants/vars.h | 136 +++++++++---------- include/field_specials.h | 2 +- src/event_data.c | 14 +- src/field_control_avatar.c | 2 +- src/field_specials.c | 16 +-- src/overworld.c | 6 +- 19 files changed, 112 insertions(+), 110 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 19b4949eb8..abc60dd181 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -3193,7 +3193,7 @@ UnusualWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31 call UnusualWeather_EventScript_CleanupMapTiles special DrawWholeMapView setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE - setvar VAR_0x4039, 0 + setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 0 clearflag FLAG_SPECIAL_FLAG_0x4000 fadescreenswapbuffers 0 releaseall diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index 7051d376c9..bee33ae079 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -38,7 +38,7 @@ FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E return FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 - setvar VAR_0x403A, 0 + setvar VAR_NEVER_READ_0x403A, 0 setvar VAR_TEMP_1, 1 call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_267D86 end diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index 036fa77247..028075648f 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -47,13 +47,13 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B goto_if_eq MarineCave_End_EventScript_23B092 compare VAR_RESULT, 5 goto_if_eq MarineCave_End_EventScript_23B092 - setvar VAR_0x4039, 1 + setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 setflag FLAG_DEFEATED_KYOGRE releaseall end MarineCave_End_EventScript_23B084:: @ 823B084 - setvar VAR_0x4039, 1 + setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 setflag FLAG_DEFEATED_KYOGRE goto MarineCave_End_EventScript_27376D end diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 1f0fdd91c7..fef5c40481 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -60,7 +60,7 @@ PetalburgCity_Gym_EventScript_204955:: @ 8204955 return PetalburgCity_Gym_EventScript_20495D:: @ 820495D - setorcopyvar VAR_0x8015, 269 + setorcopyvar VAR_NEVER_READ_0x8015, 269 specialvar VAR_RESULT, IsTrainerReadyForRematch compare VAR_RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_204985 diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 1f4202ec47..2b8ebe3052 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -18,7 +18,7 @@ Route105_EventScript_1EE20B:: @ 81EE20B return Route105_MapScript1_1EE21E: @ 81EE21E - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route105_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH call_if_eq UnusualWeather_StartKyogreWeather @@ -27,7 +27,7 @@ Route105_MapScript1_1EE21E: @ 81EE21E end Route105_MapScript2_1EE240: @ 81EE240 - map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route105_EventScript_1EE24A:: @ 81EE24A diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 6a2f8b1740..b03a2f2281 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -5,7 +5,7 @@ Route114_MapScripts:: @ 81F252F .byte 0 Route114_MapScript1_1F253F: @ 81F253F - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route114_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH call_if_eq UnusualWeather_StartGroudonWeather @@ -21,7 +21,7 @@ Route114_MapScript1_1F2561: @ 81F2561 end Route114_MapScript2_1F2578: @ 81F2578 - map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route114_EventScript_1F2582:: @ 81F2582 diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index be3a98f420..259cd5904a 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -12,7 +12,7 @@ Route115_MapScript1_1F2930: @ 81F2930 end Route115_MapScript1_1F2947: @ 81F2947 - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route115_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST call_if_eq UnusualWeather_StartGroudonWeather @@ -21,7 +21,7 @@ Route115_MapScript1_1F2947: @ 81F2947 end Route115_MapScript2_1F2969: @ 81F2969 - map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route115_EventScript_1F2973:: @ 81F2973 diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 193b701575..4542013079 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -6,7 +6,7 @@ Route116_MapScripts:: @ 81F2C0C Route116_MapScript1_1F2C1C: @ 81F2C1C call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C47 - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route116_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH call_if_eq UnusualWeather_StartGroudonWeather @@ -26,7 +26,7 @@ Route116_MapScript1_1F2C4F: @ 81F2C4F end Route116_MapScript2_1F2C66: @ 81F2C66 - map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route116_EventScript_1F2C70:: @ 81F2C70 diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index a2784b2988..9c1ec46cac 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -6,7 +6,7 @@ Route118_MapScripts:: @ 81F3DBC Route118_MapScript1_1F3DCC: @ 81F3DCC call Route118_EventScript_28CCC7 - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route118_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST call_if_eq UnusualWeather_StartGroudonWeather @@ -22,7 +22,7 @@ Route118_MapScript1_1F3DF3: @ 81F3DF3 end Route118_MapScript2_1F3E0A: @ 81F3E0A - map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route118_EventScript_1F3E14:: @ 81F3E14 diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index a2e9f1d40c..8abcbe7875 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -6,7 +6,7 @@ Route125_MapScripts:: @ 81F6748 Route125_MapScript1_1F6758: @ 81F6758 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route125_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST call_if_eq UnusualWeather_StartKyogreWeather @@ -22,7 +22,7 @@ Route125_MapScript1_1F6783: @ 81F6783 end Route125_MapScript2_1F679A: @ 81F679A - map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route125_EventScript_1F67A4:: @ 81F67A4 diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 27b17d340f..91fab2b617 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -6,7 +6,7 @@ Route127_MapScripts:: @ 81F69D9 Route127_MapScript1_1F69E9: @ 81F69E9 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route127_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH call_if_eq UnusualWeather_StartKyogreWeather @@ -22,7 +22,7 @@ Route127_MapScript1_1F6A14: @ 81F6A14 end Route127_MapScript2_1F6A2B: @ 81F6A2B - map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route127_EventScript_1F6A35:: @ 81F6A35 diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index 3fc30cf913..0cd5f838a6 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -12,7 +12,7 @@ Route129_MapScript1_1F7294: @ 81F7294 end Route129_MapScript1_1F72AB: @ 81F72AB - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route129_EventScript_273D13 compare VAR_0x405E, 4 call_if_ge Route129_EventScript_1F72D8 @@ -27,7 +27,7 @@ Route129_EventScript_1F72D8:: @ 81F72D8 return Route129_MapScript2_1F72E2: @ 81F72E2 - map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route129_EventScript_1F72EC:: @ 81F72EC diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index 3f892315d1..b5a664a760 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -47,13 +47,13 @@ TerraCave_End_EventScript_23B0EC:: @ 823B0EC goto_if_eq TerraCave_End_EventScript_23B163 compare VAR_RESULT, 5 goto_if_eq TerraCave_End_EventScript_23B163 - setvar VAR_0x4039, 1 + setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 setflag FLAG_DEFEATED_GROUDON releaseall end TerraCave_End_EventScript_23B155:: @ 823B155 - setvar VAR_0x4039, 1 + setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 setflag FLAG_DEFEATED_GROUDON goto TerraCave_End_EventScript_27376D end diff --git a/include/constants/vars.h b/include/constants/vars.h index 9f364416ca..1ca36b8ad2 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -71,10 +71,10 @@ #define VAR_DEOXYS_ROCK_STEP_COUNT 0x4034 #define VAR_DEOXYS_ROCK_LEVEL 0x4035 #define VAR_STORAGE_UNKNOWN 0x4036 -#define VAR_UNUSUAL_WEATHER_LOCATION 0x4037 -#define VAR_0x4038 0x4038 -#define VAR_0x4039 0x4039 -#define VAR_0x403A 0x403A +#define VAR_UNUSUAL_WEATHER_LOCATION 0x4037 +#define VAR_UNUSUAL_WEATHER_STEP_COUNTER 0x4038 +#define VAR_SHOULD_END_UNUSUAL_WEATHER 0x4039 +#define VAR_NEVER_READ_0x403A 0x403A // Var is written to, but never checked #define VAR_REGICE_STEPS_1 0x403B #define VAR_REGICE_STEPS_2 0x403C #define VAR_REGICE_STEPS_3 0x403D @@ -94,60 +94,60 @@ #define VAR_POKELOT_RND1 0x404B #define VAR_POKELOT_RND2 0x404C #define VAR_0x404D 0x404D -#define VAR_0x404E 0x404E +#define VAR_UNUSED_0x404E 0x404E // Unused Var #define VAR_LOTAD_SIZE_RECORD 0x404F #define VAR_0x4050 0x4050 #define VAR_ROUTE102_ACCESSIBLE 0x4051 -#define VAR_0x4052 0x4052 +#define VAR_UNUSED_0x4052 0x4052 // Unused Var #define VAR_LAVARIDGE_RIVAL_STATE 0x4053 #define VAR_CURRENT_SECRET_BASE 0x4054 -#define VAR_0x4055 0x4055 -#define VAR_0x4056 0x4056 +#define VAR_UNUSED_0x4055 0x4055 // Unused Var +#define VAR_UNUSED_0x4056 0x4056 // Unused Var #define VAR_PETALBURG_STATE 0x4057 #define VAR_SLATEPORT_STATE 0x4058 -#define VAR_0x4059 0x4059 +#define VAR_UNUSED_0x4059 0x4059 // Unused Var #define VAR_RUSTBORO_STATE 0x405A -#define VAR_0x405B 0x405B -#define VAR_0x405C 0x405C +#define VAR_UNUSED_0x405B 0x405B // Unused Var +#define VAR_UNUSED_0x405C 0x405C // Unused Var #define VAR_0x405D 0x405D #define VAR_0x405E 0x405E -#define VAR_0x405F 0x405F +#define VAR_UNUSED_0x405F 0x405F // Unused Var #define VAR_ROUTE101_STATE 0x4060 -#define VAR_0x4061 0x4061 -#define VAR_0x4062 0x4062 +#define VAR_UNUSED_0x4061 0x4061 // Unused Var +#define VAR_UNUSED_0x4062 0x4062 // Unused Var #define VAR_0x4063 0x4063 -#define VAR_0x4064 0x4064 -#define VAR_0x4065 0x4065 -#define VAR_0x4066 0x4066 -#define VAR_0x4067 0x4067 -#define VAR_0x4068 0x4068 +#define VAR_UNUSED_0x4064 0x4064 // Unused Var +#define VAR_UNUSED_0x4065 0x4065 // Unused Var +#define VAR_UNUSED_0x4066 0x4066 // Unused Var +#define VAR_UNUSED_0x4067 0x4067 // Unused Var +#define VAR_UNUSED_0x4068 0x4068 // Unused Var #define VAR_ROUTE110_STATE 0x4069 -#define VAR_0x406A 0x406A -#define VAR_0x406B 0x406B -#define VAR_0x406C 0x406C -#define VAR_0x406D 0x406D -#define VAR_0x406E 0x406E +#define VAR_UNUSED_0x406A 0x406A // Unused Var +#define VAR_UNUSED_0x406B 0x406B // Unused Var +#define VAR_UNUSED_0x406C 0x406C // Unused Var +#define VAR_UNUSED_0x406D 0x406D // Unused Var +#define VAR_UNUSED_0x406E 0x406E // Unused Var #define VAR_ROUTE116_STATE 0x406F -#define VAR_0x4070 0x4070 +#define VAR_UNUSED_0x4070 0x4070 // Unused Var #define VAR_ROUTE118_STATE 0x4071 #define VAR_ROUTE119_STATE 0x4072 -#define VAR_0x4073 0x4073 +#define VAR_UNUSED_0x4073 0x4073 // Unused Var #define VAR_ROUTE121_STATE 0x4074 -#define VAR_0x4075 0x4075 -#define VAR_0x4076 0x4076 -#define VAR_0x4077 0x4077 -#define VAR_0x4078 0x4078 -#define VAR_0x4079 0x4079 -#define VAR_0x407A 0x407A +#define VAR_UNUSED_0x4075 0x4075 // Unused Var +#define VAR_UNUSED_0x4076 0x4076 // Unused Var +#define VAR_UNUSED_0x4077 0x4077 // Unused Var +#define VAR_UNUSED_0x4078 0x4078 // Unused Var +#define VAR_UNUSED_0x4079 0x4079 // Unused Var +#define VAR_UNUSED_0x407A 0x407A // Unused Var #define VAR_ROUTE128_STATE 0x407B -#define VAR_0x407C 0x407C -#define VAR_0x407D 0x407D -#define VAR_0x407E 0x407E -#define VAR_0x407F 0x407F -#define VAR_0x4080 0x4080 -#define VAR_0x4081 0x4081 +#define VAR_UNUSED_0x407C 0x407C // Unused Var +#define VAR_UNUSED_0x407D 0x407D // Unused Var +#define VAR_UNUSED_0x407E 0x407E // Unused Var +#define VAR_UNUSED_0x407F 0x407F // Unused Var +#define VAR_UNUSED_0x4080 0x4080 // Unused Var +#define VAR_UNUSED_0x4081 0x4081 // Unused Var #define VAR_LITTLEROOT_HOUSES_STATE 0x4082 -#define VAR_0x4083 0x4083 +#define VAR_UNUSED_0x4083 0x4083 // Unused Var #define VAR_BIRCH_LAB_STATE 0x4084 #define VAR_PETALBURG_GYM_STATE 0x4085 #define VAR_LINK_CONTEST_ROOM_STATE 0x4086 @@ -155,13 +155,13 @@ #define VAR_CONTEST_LOCATION 0x4088 #define VAR_0x4089 0x4089 #define VAR_CONTEST_PRIZE_PICKUP 0x408A -#define VAR_0x408B 0x408B +#define VAR_UNUSED_0x408B 0x408B // Unused Var #define VAR_LITTLEROOT_HOUSES_STATE_2 0x408C #define VAR_LITTLEROOT_RIVAL_STATE 0x408D #define VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE 0x408E #define VAR_DEVON_CORP_3F_STATE 0x408F #define VAR_BRINEY_HOUSE_STATE 0x4090 -#define VAR_0x4091 0x4091 +#define VAR_UNUSED_0x4091 0x4091 // Unused Var #define VAR_LITTLEROOT_INTRO_STATE 0x4092 #define VAR_MAUVILLE_GYM_STATE 0x4093 #define VAR_LILYCOVE_MUSEUM_2F_STATE 0x4094 @@ -171,20 +171,20 @@ #define VAR_PETALBURG_WOODS_STATE 0x4098 #define VAR_LILYCOVE_CONTEST_LOBBY_STATE 0x4099 #define VAR_RUSTURF_TUNNEL_STATE 0x409A -#define VAR_0x409B 0x409B +#define VAR_UNUSED_0x409B 0x409B // Unused Var #define VAR_ELITE_4_STATE 0x409C -#define VAR_0x409D 0x409D +#define VAR_UNUSED_0x409D 0x409D // Unused Var #define VAR_0x409E 0x409E #define VAR_0x409F 0x409F #define VAR_SLATEPORT_HARBOR_STATE 0x40A0 -#define VAR_0x40A1 0x40A1 +#define VAR_UNUSED_0x40A1 0x40A1 // Unused var #define VAR_SEAFLOOR_CAVERN_STATE 0x40A2 #define VAR_CABLE_CAR_STATION_STATE 0x40A3 #define VAR_SAFARI_ZONE_STATE 0x40A4 #define VAR_TRICK_HOUSE_ENTRANCE_STATE_1 0x40A5 #define VAR_TRICK_HOUSE_ENTRANCE_STATE_2 0x40A6 #define VAR_TRICK_HOUSE_ENTRANCE_STATE_3 0x40A7 -#define VAR_0x40A8 0x40A8 +#define VAR_UNUSED_0x40A8 0x40A8 // Unused Var #define VAR_CYCLING_CHALLENGE_STATE 0x40A9 #define VAR_SLATEPORT_MUSEUM_1F_STATE 0x40AA #define VAR_TRICK_HOUSE_PUZZLE_1_STATE 0x40AB @@ -197,13 +197,13 @@ #define VAR_TRICK_HOUSE_PUZZLE_8_STATE 0x40B2 #define VAR_WEATHER_INSTITUTE_STATE 0x40B3 #define VAR_PORTHOLE_STATE 0x40B4 -#define VAR_TRICK_HOUSE_STATE 0x40B5 // TODO: needs some further investigation +#define VAR_TRICK_HOUSE_STATE 0x40B5 // TODO: needs some further investigation #define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2 0x40B6 #define VAR_SLATEPORT_FAN_CLUB_STATE 0x40B7 -#define VAR_0x40B8 0x40B8 +#define VAR_UNUSED_0x40B8 0x40B8 // Unused Var #define VAR_MT_PYRE_STATE 0x40B9 #define VAR_NEW_MAUVILLE_STATE 0x40BA -#define VAR_0x40BB 0x40BB +#define VAR_UNUSED_0x40BB 0x40BB // Unused Var #define VAR_BRAVO_TRAINER_BATTLE_TOWER_ON 0x40BC #define VAR_JAGGED_PASS_ASH_WEATHER 0x40BD #define VAR_GLASS_WORKSHOP_STATE 0x40BE @@ -235,17 +235,17 @@ #define VAR_0x40D8 0x40D8 #define VAR_0x40D9 0x40D9 #define VAR_0x40DA 0x40DA -#define VAR_0x40DB 0x40DB -#define VAR_0x40DC 0x40DC +#define VAR_UNUSED_0x40DB 0x40DB // Unused Var +#define VAR_UNUSED_0x40DC 0x40DC // Unused Var #define VAR_EVENT_PICHU_SLOT 0x40DD -#define VAR_0x40DE 0x40DE -#define VAR_0x40DF 0x40DF -#define VAR_0x40E0 0x40E0 -#define VAR_0x40E1 0x40E1 -#define VAR_0x40E2 0x40E2 -#define VAR_0x40E3 0x40E3 -#define VAR_0x40E4 0x40E4 -#define VAR_0x40E5 0x40E5 +#define VAR_NEVER_READ_0x40DE 0x40DE // Var is written to, but never read +#define VAR_NEVER_READ_0x40DF 0x40DF // Var is written to, but never read +#define VAR_NEVER_READ_0x40E0 0x40E0 // Var is written to, but never read +#define VAR_NEVER_READ_0x40E1 0x40E1 // Var is written to, but never read +#define VAR_NEVER_READ_0x40E2 0x40E2 // Var is written to, but never read +#define VAR_NEVER_READ_0x40E3 0x40E3 // Var is written to, but never read +#define VAR_NEVER_READ_0x40E4 0x40E4 // var is written to, but never read +#define VAR_UNUSED_0x40E5 0x40E5 // Unused Var #define VAR_DAILY_SLOTS 0x40E6 #define VAR_DAILY_WILDS 0x40E7 #define VAR_DAILY_BLENDER 0x40E8 @@ -263,15 +263,15 @@ #define VAR_0x40F4 0x40F4 #define VAR_0x40F5 0x40F5 #define VAR_0x40F6 0x40F6 -#define VAR_0x40F7 0x40F7 -#define VAR_0x40F8 0x40F8 -#define VAR_0x40F9 0x40F9 -#define VAR_0x40FA 0x40FA -#define VAR_0x40FB 0x40FB -#define VAR_0x40FC 0x40FC -#define VAR_0x40FD 0x40FD -#define VAR_0x40FE 0x40FE -#define VAR_0x40FF 0x40FF +#define VAR_UNUSED_0x40F7 0x40F7 // Unused Var +#define VAR_UNUSED_0x40F8 0x40F8 // Unused Var +#define VAR_UNUSED_0x40F9 0x40F9 // Unused Var +#define VAR_UNUSED_0x40FA 0x40FA // Unused Var +#define VAR_UNUSED_0x40FB 0x40FB // Unused Var +#define VAR_UNUSED_0x40FC 0x40FC // Unused Var +#define VAR_UNUSED_0x40FD 0x40FD // Unused Var +#define VAR_UNUSED_0x40FE 0x40FE // Unused Var +#define VAR_UNUSED_0x40FF 0x40FF // Unused Var #define SPECIAL_VARS_START 0x8000 // special vars @@ -297,6 +297,6 @@ #define VAR_MON_BOX_ID 0x8012 #define VAR_MON_BOX_POS 0x8013 #define VAR_0x8014 0x8014 -#define VAR_0x8015 0x8015 +#define VAR_NEVER_READ_0x8015 0x8015 // Written to, but never read #endif // GUARD_CONSTANTS_VARS_H diff --git a/include/field_specials.h b/include/field_specials.h index bff04a7397..1ab2b7eb4c 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -7,7 +7,7 @@ u16 get_unknown_box_id(void); bool8 InMultiBattleRoom(void); void sub_813BF10(void); void IncrementBirthIslandRockStepCount(void); -bool8 sub_813B3B0(void); +bool8 UnusualWeatherHasExpired(void); bool8 ShouldDoBrailleRegicePuzzle(void); bool32 is_tile_that_overrides_player_control(void); bool32 sub_8138120(void); diff --git a/src/event_data.c b/src/event_data.c index e75c377732..5ca288e7b5 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -131,13 +131,13 @@ void sub_809D4D8(void) void sub_809D570(void) { VarSet(VAR_EVENT_PICHU_SLOT, 0); - VarSet(VAR_0x40DE, 0); - VarSet(VAR_0x40DF, 0); - VarSet(VAR_0x40E0, 0); - VarSet(VAR_0x40E1, 0); - VarSet(VAR_0x40E2, 0); - VarSet(VAR_0x40E3, 0); - VarSet(VAR_0x40E4, 0); + VarSet(VAR_NEVER_READ_0x40DE, 0); + VarSet(VAR_NEVER_READ_0x40DF, 0); + VarSet(VAR_NEVER_READ_0x40E0, 0); + VarSet(VAR_NEVER_READ_0x40E1, 0); + VarSet(VAR_NEVER_READ_0x40E2, 0); + VarSet(VAR_NEVER_READ_0x40E3, 0); + VarSet(VAR_NEVER_READ_0x40E4, 0); } void DisableResetRTC(void) diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 90f7f4d5e1..7bb2b257df 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -557,7 +557,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) ScriptContext1_SetupScript(EventScript_EggHatch); return TRUE; } - if (sub_813B3B0() == TRUE) + if (UnusualWeatherHasExpired() == TRUE) { ScriptContext1_SetupScript(UnusualWeather_EventScript_EndEventAndCleanup_1); return TRUE; diff --git a/src/field_specials.c b/src/field_specials.c index a5edb0122c..7bfce8dd91 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -3424,7 +3424,7 @@ bool8 sub_813B260(void) void CreateUnusualWeatherEvent(void) { u16 randomValue = Random(); - VarSet(VAR_0x4038, 0); + VarSet(VAR_UNUSUAL_WEATHER_STEP_COUNTER, 0); if (FlagGet(FLAG_DEFEATED_KYOGRE) == TRUE) { @@ -3466,12 +3466,12 @@ bool32 GetUnusualWeatherMapNameAndType(void) } } -bool8 sub_813B3B0(void) +bool8 UnusualWeatherHasExpired(void) { // Duplicate array. static const u8 sUnusualWeatherMapNumbers_2[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c }; - u16 var1 = VarGet(VAR_0x4038); + u16 steps = VarGet(VAR_UNUSUAL_WEATHER_STEP_COUNTER); u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION); if (unusualWeather == UNUSUAL_WEATHER_NONE) @@ -3479,9 +3479,9 @@ bool8 sub_813B3B0(void) return FALSE; } - if (++var1 > 999) + if (++steps > 999) { - VarSet(VAR_0x4038, 0); + VarSet(VAR_UNUSUAL_WEATHER_STEP_COUNTER, 0); if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(UNDERWATER_MARINE_CAVE)) { switch (gSaveBlock1Ptr->location.mapNum) @@ -3491,7 +3491,7 @@ bool8 sub_813B3B0(void) case MAP_NUM(MARINE_CAVE_END): case MAP_NUM(TERRA_CAVE_ENTRANCE): case MAP_NUM(TERRA_CAVE_END): - VarSet(VAR_0x4039, 1); + VarSet(VAR_SHOULD_END_UNUSUAL_WEATHER, 1); return FALSE; default: break; @@ -3506,7 +3506,7 @@ bool8 sub_813B3B0(void) case MAP_NUM(UNDERWATER5): case MAP_NUM(UNDERWATER6): case MAP_NUM(UNDERWATER7): - VarSet(VAR_0x4039, 1); + VarSet(VAR_SHOULD_END_UNUSUAL_WEATHER, 1); return FALSE; default: break; @@ -3526,7 +3526,7 @@ bool8 sub_813B3B0(void) } else { - VarSet(VAR_0x4038, var1); + VarSet(VAR_UNUSUAL_WEATHER_STEP_COUNTER, steps); return FALSE; } } diff --git a/src/overworld.c b/src/overworld.c index edc4d402c4..4206be4482 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -408,9 +408,11 @@ static void Overworld_ResetStateAfterWhiteOut(void) FlagClear(FLAG_SYS_SAFARI_MODE); FlagClear(FLAG_SYS_USE_STRENGTH); FlagClear(FLAG_SYS_USE_FLASH); - if (VarGet(VAR_0x4039) == 1) + // If you were defeated by Kyogre/Groudon and the step counter has + // maxed out, end the unusual weather. + if (VarGet(VAR_SHOULD_END_UNUSUAL_WEATHER) == 1) { - VarSet(VAR_0x4039, 0); + VarSet(VAR_SHOULD_END_UNUSUAL_WEATHER, 0); VarSet(VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE); } } From 648fc3d4f33b0df553b0fd3737843a1495351993 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 27 Feb 2019 15:18:56 -0500 Subject: [PATCH 133/217] Name more unknown vars --- data/maps/CaveOfOrigin_B1F/scripts.inc | 2 +- .../scripts.inc | 16 +-- .../scripts.inc | 10 +- .../scripts.inc | 4 +- .../LittlerootTown_MaysHouse_2F/scripts.inc | 4 +- data/maps/MossdeepCity/map.json | 12 +-- data/maps/MossdeepCity/scripts.inc | 2 +- data/maps/MossdeepCity_Gym/scripts.inc | 4 +- .../MossdeepCity_SpaceCenter_1F/scripts.inc | 30 +++--- .../MossdeepCity_SpaceCenter_2F/scripts.inc | 24 ++--- data/maps/Route129/scripts.inc | 2 +- data/maps/Route130/scripts.inc | 2 +- data/maps/Route131/scripts.inc | 2 +- data/maps/SeafloorCavern_Room9/scripts.inc | 2 +- data/maps/SecretBase_YellowCave4/scripts.inc | 4 +- data/maps/SkyPillar_Outside/scripts.inc | 8 +- data/maps/SkyPillar_Top/scripts.inc | 2 +- data/maps/SootopolisCity/scripts.inc | 102 +++++++++--------- data/maps/SootopolisCity_Gym_1F/scripts.inc | 2 +- data/scripts/cable_club.inc | 2 +- data/scripts/secret_base.inc | 14 +-- include/constants/vars.h | 18 ++-- src/field_specials.c | 2 +- src/lottery_corner.c | 2 +- src/overworld.c | 6 +- src/secret_base.c | 4 +- 26 files changed, 141 insertions(+), 141 deletions(-) diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index c36b60111f..0e554a9452 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -52,7 +52,7 @@ CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D playse SE_KAIDAN fadescreenspeed 1, 4 setflag FLAG_WALLACE_GOES_TO_SKY_PILLAR - setvar VAR_0x405E, 3 + setvar VAR_RAYQUAZA_STATE, 3 removeobject 1 clearflag FLAG_HIDE_SKY_PILLAR_WALLACE fadescreen 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index ec1d89b66f..1e01fc1687 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -9,7 +9,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C lock faceplayer dotimebasedevents - compare VAR_POKELOT_PRIZE, 0 + compare VAR_POKELOT_PRIZE_ITEM, 0 goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_21F7F7 goto_if_set FLAG_DAILY_PICKED_LOTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_21F78D msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, MSGBOX_YESNO @@ -100,8 +100,8 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F7D4:: @ 821F7D4 return LilycoveCity_DepartmentStore_1F_EventScript_21F7DD:: @ 821F7DD - copyvar VAR_0x404D, VAR_0x8004 - copyvar VAR_POKELOT_PRIZE, VAR_0x8005 + copyvar VAR_POKELOT_PRIZE_PLACE, VAR_0x8004 + copyvar VAR_POKELOT_PRIZE_ITEM, VAR_0x8005 goto LilycoveCity_DepartmentStore_1F_EventScript_21F7ED end @@ -112,14 +112,14 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F7ED:: @ 821F7ED LilycoveCity_DepartmentStore_1F_EventScript_21F7F7:: @ 821F7F7 msgbox LilycoveCity_DepartmentStore_1F_Text_2A67E1, MSGBOX_DEFAULT - giveitem_std VAR_POKELOT_PRIZE + giveitem_std VAR_POKELOT_PRIZE_ITEM compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7ED - copyvar VAR_0x8004, VAR_0x404D - copyvar VAR_0x8005, VAR_POKELOT_PRIZE + copyvar VAR_0x8004, VAR_POKELOT_PRIZE_PLACE + copyvar VAR_0x8005, VAR_POKELOT_PRIZE_ITEM special sub_80EE2CC - setvar VAR_POKELOT_PRIZE, 0 - setvar VAR_0x404D, 0 + setvar VAR_POKELOT_PRIZE_ITEM, 0 + setvar VAR_POKELOT_PRIZE_PLACE, 0 release end diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index e625374220..7cab0f1fa0 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -3,9 +3,9 @@ LilycoveCity_DepartmentStore_5F_MapScripts:: @ 821FF7A .byte 0 LilycoveCity_DepartmentStore_5F_MapScript2_21FF80: @ 821FF80 - map_script_2 VAR_0x405E, 1, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A - map_script_2 VAR_0x405E, 2, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A - map_script_2 VAR_0x405E, 3, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A + map_script_2 VAR_RAYQUAZA_STATE, 1, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A + map_script_2 VAR_RAYQUAZA_STATE, 2, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A + map_script_2 VAR_RAYQUAZA_STATE, 3, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A .2byte 0 LilycoveCity_DepartmentStore_5F_EventScript_21FF9A:: @ 821FF9A @@ -125,9 +125,9 @@ LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 lockall applymovement 7, Common_Movement_FacePlayer waitmovement 0 - compare VAR_0x405E, 0 + compare VAR_RAYQUAZA_STATE, 0 goto_if_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 goto_if_ge LilycoveCity_DepartmentStore_5F_EventScript_22009C goto LilycoveCity_DepartmentStore_5F_EventScript_2200A7 end diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 87e0e58cc1..b553cf65b5 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -11,7 +11,7 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2926FE call LittlerootTown_BrendansHouse_2F_EventScript_275CE1 - setvar VAR_0x4089, 0 + setvar VAR_SECRET_BASE_INITIALIZED, 0 end LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A @@ -44,7 +44,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8464:: @ 81F8464 return LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A - map_script_2 VAR_0x4089, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8474 + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8474 .2byte 0 LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index e11d2a9918..49a9523e01 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -11,7 +11,7 @@ LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_2926FE call LittlerootTown_MaysHouse_2F_EventScript_275CE1 - setvar VAR_0x4089, 0 + setvar VAR_SECRET_BASE_INITIALIZED, 0 end LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD @@ -45,7 +45,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9317:: @ 81F9317 return LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D - map_script_2 VAR_0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9327 + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9327 .2byte 0 LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327 diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index 952ff253ca..99d7ae01c1 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -366,7 +366,7 @@ "x": 42, "y": 21, "elevation": 5, - "var": "VAR_0x405D", + "var": "VAR_MOSSDEEP_STATE", "var_value": "1", "script": "MossdeepCity_EventScript_1E4B41" }, @@ -375,7 +375,7 @@ "x": 41, "y": 22, "elevation": 5, - "var": "VAR_0x405D", + "var": "VAR_MOSSDEEP_STATE", "var_value": "1", "script": "MossdeepCity_EventScript_1E4B41" }, @@ -384,7 +384,7 @@ "x": 41, "y": 23, "elevation": 5, - "var": "VAR_0x405D", + "var": "VAR_MOSSDEEP_STATE", "var_value": "1", "script": "MossdeepCity_EventScript_1E4B41" }, @@ -393,7 +393,7 @@ "x": 41, "y": 24, "elevation": 5, - "var": "VAR_0x405D", + "var": "VAR_MOSSDEEP_STATE", "var_value": "1", "script": "MossdeepCity_EventScript_1E4B41" }, @@ -402,7 +402,7 @@ "x": 40, "y": 25, "elevation": 5, - "var": "VAR_0x405D", + "var": "VAR_MOSSDEEP_STATE", "var_value": "1", "script": "MossdeepCity_EventScript_1E4B41" }, @@ -411,7 +411,7 @@ "x": 40, "y": 26, "elevation": 5, - "var": "VAR_0x405D", + "var": "VAR_MOSSDEEP_STATE", "var_value": "1", "script": "MossdeepCity_EventScript_1E4B41" } diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index b01e9cae8d..31995542db 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -94,7 +94,7 @@ MossdeepCity_EventScript_1E4B41:: @ 81E4B41 removeobject 12 removeobject 13 delay 30 - setvar VAR_0x405D, 2 + setvar VAR_MOSSDEEP_STATE, 2 setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA releaseall end diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 7638f6119a..7fc98dc546 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -71,9 +71,9 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN - setvar VAR_0x405D, 1 + setvar VAR_MOSSDEEP_STATE, 1 setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN - setvar VAR_0x409F, 1 + setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1 call MossdeepCity_Gym_EventScript_22095B closemessage delay 30 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 43bd56d3ae..13bf111baf 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -4,7 +4,7 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41 .byte 0 MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58 end @@ -18,11 +18,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58 setobjectxyperm 1, 3, 4 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT - compare VAR_0x409E, 1 + compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 1 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA - compare VAR_0x409E, 2 + compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 2 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FB2 - compare VAR_0x409E, 3 + compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 3 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FBA end @@ -39,7 +39,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FBA:: @ 8222FBA end MossdeepCity_SpaceCenter_1F_MapScript1_222FC2: @ 8222FC2 - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_le MossdeepCity_SpaceCenter_1F_EventScript_222FCE end @@ -50,7 +50,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FCE:: @ 8222FCE MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 lock faceplayer - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223024 dotimebasedevents specialvar VAR_RESULT, GetWeekCount @@ -98,7 +98,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22305A:: @ 822305A MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 lock faceplayer - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, MSGBOX_DEFAULT release @@ -114,7 +114,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E lock faceplayer - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_2230D0 msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT @@ -155,9 +155,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_22312D:: @ 822312D lock faceplayer goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_223154 - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22315E - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_223154 goto MossdeepCity_SpaceCenter_1F_EventScript_22315E end @@ -176,9 +176,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168 lock faceplayer goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_22318F - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2231A4 - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_22318F goto MossdeepCity_SpaceCenter_1F_EventScript_2231A4 end @@ -242,7 +242,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F case 3, MossdeepCity_SpaceCenter_1F_EventScript_223289 applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_2232A2 waitmovement 0 - setvar VAR_0x409E, 2 + setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 2 release end @@ -254,14 +254,14 @@ MossdeepCity_SpaceCenter_1F_EventScript_22326E:: @ 822326E MossdeepCity_SpaceCenter_1F_EventScript_223278:: @ 8223278 applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329A waitmovement 0 - setvar VAR_0x409E, 1 + setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 1 release end MossdeepCity_SpaceCenter_1F_EventScript_223289:: @ 8223289 applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329E waitmovement 0 - setvar VAR_0x409E, 3 + setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 3 release end diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index d9727235f8..aa570010ef 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -4,9 +4,9 @@ MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58 .byte 0 MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63 - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D7A - compare VAR_0x409F, 2 + compare VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2 call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D9F end @@ -27,7 +27,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223D9F:: @ 8223D9F return MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5 - map_script_2 VAR_0x409F, 1, MossdeepCity_SpaceCenter_2F_EventScript_223DBF + map_script_2 VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1, MossdeepCity_SpaceCenter_2F_EventScript_223DBF .2byte 0 MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF @@ -69,7 +69,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1 applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_223E89 waitmovement 0 - setvar VAR_0x409F, 2 + setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2 moveobjectoffscreen 5 moveobjectoffscreen 7 moveobjectoffscreen 6 @@ -98,9 +98,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D lock faceplayer goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EB4 - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EBE - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EB4 goto MossdeepCity_SpaceCenter_2F_EventScript_223EBE end @@ -119,9 +119,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223EC8:: @ 8223EC8 lock faceplayer goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EEF - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EF9 - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EEF goto MossdeepCity_SpaceCenter_2F_EventScript_223EF9 end @@ -140,9 +140,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F03:: @ 8223F03 lock faceplayer goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223F2A - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223F34 - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223F2A goto MossdeepCity_SpaceCenter_2F_EventScript_223F34 end @@ -287,10 +287,10 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 delay 20 msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT closemessage - setvar VAR_0x405D, 3 + setvar VAR_MOSSDEEP_STATE, 3 fadedefaultbgm fadescreen 1 - setvar VAR_0x409F, 3 + setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 3 setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index 0cd5f838a6..25aa675a6c 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -14,7 +14,7 @@ Route129_MapScript1_1F7294: @ 81F7294 Route129_MapScript1_1F72AB: @ 81F72AB compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route129_EventScript_273D13 - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 call_if_ge Route129_EventScript_1F72D8 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST call_if_eq UnusualWeather_StartKyogreWeather diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 18dce324d9..cdcc615506 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -3,7 +3,7 @@ Route130_MapScripts:: @ 81F735F .byte 0 Route130_MapScript1_1F7365: @ 81F7365 - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 call_if_ge Route130_EventScript_1F73B5 specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index 7f50b2273a..0d178e9699 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -3,7 +3,7 @@ Route131_MapScripts:: @ 81F7404 .byte 0 Route131_MapScript1_1F740A: @ 81F740A - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 call_if_ge Route131_EventScript_1F741F call Route131_EventScript_1F741B end diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 7fe6386c37..38a10a0043 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -119,7 +119,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 waitmovement 0 msgbox SeafloorCavern_Room9_Text_235723, MSGBOX_DEFAULT setvar VAR_ROUTE128_STATE, 1 - setvar VAR_0x405E, 1 + setvar VAR_RAYQUAZA_STATE, 1 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN clearflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc index cb26f924e1..40f1e5a15f 100644 --- a/data/maps/SecretBase_YellowCave4/scripts.inc +++ b/data/maps/SecretBase_YellowCave4/scripts.inc @@ -6,7 +6,7 @@ SecretBase_YellowCave4_MapScripts:: @ 823B483 .byte 0 SecretBase_RedCave1_MapScript2_23B498: @ 823B498 - map_script_2 VAR_0x4089, 0, EventScript_275D0C + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, EventScript_275D0C .2byte 0 SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2 @@ -16,7 +16,7 @@ SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2 end SecretBase_RedCave1_MapScript2_23B4AE: @ 823B4AE - map_script_2 VAR_0x4097, 0, SecretBase_RedCave1_EventScript_275B81 + map_script_2 VAR_SECRET_BASE_SHOULD_BE_INIT, 0, SecretBase_RedCave1_EventScript_275B81 .2byte 0 SecretBase_RedCave1_MapScript1_23B4B8: @ 823B4B8 diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index c68dc03e3e..93d4e42c39 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -5,9 +5,9 @@ SkyPillar_Outside_MapScripts:: @ 82392A8 .byte 0 SkyPillar_Outside_MapScript1_2392B8: @ 82392B8 - compare VAR_0x405E, 3 + compare VAR_RAYQUAZA_STATE, 3 call_if_eq SkyPillar_Outside_EventScript_2392CF - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 call_if_ge SkyPillar_Outside_EventScript_2392D3 end @@ -29,7 +29,7 @@ SkyPillar_Outside_EventScript_2392E7:: @ 82392E7 return SkyPillar_Outside_MapScript2_2392FA: @ 82392FA - map_script_2 VAR_0x405E, 3, SkyPillar_Outside_EventScript_239304 + map_script_2 VAR_RAYQUAZA_STATE, 3, SkyPillar_Outside_EventScript_239304 .2byte 0 SkyPillar_Outside_EventScript_239304:: @ 8239304 @@ -82,7 +82,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 playse SE_KAIDAN fadescreenswapbuffers 1 clearflag FLAG_SPECIAL_FLAG_0x4000 - setvar VAR_0x405E, 4 + setvar VAR_RAYQUAZA_STATE, 4 removeobject 1 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE fadescreenswapbuffers 0 diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 3d031293db..df2b2118e1 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -130,7 +130,7 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_23985C waitmovement 0 special RemoveCameraObject - setvar VAR_0x405E, 5 + setvar VAR_RAYQUAZA_STATE, 5 setvar VAR_0x40CA, 1 setvar VAR_0x40D7, 1 releaseall diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 98c9af1eee..cad6d7db86 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -33,31 +33,31 @@ SootopolisCity_EventScript_1E56E5:: @ 81E56E5 SootopolisCity_MapScript1_1E56EF: @ 81E56EF setflag FLAG_VISITED_SOOTOPOLIS_CITY - compare VAR_0x405E, 1 + compare VAR_RAYQUAZA_STATE, 1 call_if_eq SootopolisCity_EventScript_1E5781 compare VAR_0x40CA, 1 call_if_eq SootopolisCity_EventScript_1E5781 call SootopolisCity_EventScript_1E5805 call SootopolisCity_EventScript_1E57B2 - compare VAR_0x405E, 1 + compare VAR_RAYQUAZA_STATE, 1 call_if_eq SootopolisCity_EventScript_1E5785 - compare VAR_0x405E, 2 + compare VAR_RAYQUAZA_STATE, 2 call_if_eq SootopolisCity_EventScript_1E5785 - compare VAR_0x405E, 3 + compare VAR_RAYQUAZA_STATE, 3 call_if_eq SootopolisCity_EventScript_1E5785 - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 call_if_eq SootopolisCity_EventScript_1E5785 - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 call_if_eq SootopolisCity_EventScript_1E5785 - compare VAR_0x405E, 2 + compare VAR_RAYQUAZA_STATE, 2 call_if_eq SootopolisCity_EventScript_1E5842 - compare VAR_0x405E, 3 + compare VAR_RAYQUAZA_STATE, 3 call_if_eq SootopolisCity_EventScript_1E5842 - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 call_if_eq SootopolisCity_EventScript_1E585B - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 call_if_eq SootopolisCity_EventScript_1E5871 - compare VAR_0x405E, 6 + compare VAR_RAYQUAZA_STATE, 6 call_if_eq SootopolisCity_EventScript_1E58D3 end @@ -77,17 +77,17 @@ SootopolisCity_EventScript_1E5785:: @ 81E5785 return SootopolisCity_EventScript_1E57B2:: @ 81E57B2 - compare VAR_0x405E, 0 + compare VAR_RAYQUAZA_STATE, 0 goto_if_eq SootopolisCity_EventScript_1E5800 - compare VAR_0x405E, 6 + compare VAR_RAYQUAZA_STATE, 6 goto_if_ge SootopolisCity_EventScript_1E5800 - compare VAR_0x405E, 1 + compare VAR_RAYQUAZA_STATE, 1 goto_if_eq SootopolisCity_EventScript_1E5801 - compare VAR_0x405E, 2 + compare VAR_RAYQUAZA_STATE, 2 goto_if_eq SootopolisCity_EventScript_1E5801 - compare VAR_0x405E, 3 + compare VAR_RAYQUAZA_STATE, 3 goto_if_eq SootopolisCity_EventScript_1E5801 - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 goto_if_eq SootopolisCity_EventScript_1E5801 compare VAR_0x40CA, 1 goto_if_le SootopolisCity_EventScript_1E5801 @@ -101,11 +101,11 @@ SootopolisCity_EventScript_1E5801:: @ 81E5801 return SootopolisCity_EventScript_1E5805:: @ 81E5805 - compare VAR_0x405E, 0 + compare VAR_RAYQUAZA_STATE, 0 goto_if_eq SootopolisCity_EventScript_1E583D - compare VAR_0x405E, 6 + compare VAR_RAYQUAZA_STATE, 6 goto_if_ge SootopolisCity_EventScript_1E583D - compare VAR_0x405E, 1 + compare VAR_RAYQUAZA_STATE, 1 goto_if_eq SootopolisCity_EventScript_1E583E compare VAR_0x40CA, 1 goto_if_eq SootopolisCity_EventScript_1E583E @@ -168,7 +168,7 @@ SootopolisCity_EventScript_1E58D3:: @ 81E58D3 return SootopolisCity_MapScript2_1E58DB: @ 81E58DB - map_script_2 VAR_0x405E, 5, SootopolisCity_EventScript_1E58E5 + map_script_2 VAR_RAYQUAZA_STATE, 5, SootopolisCity_EventScript_1E58E5 .2byte 0 SootopolisCity_EventScript_1E58E5:: @ 81E58E5 @@ -192,7 +192,7 @@ SootopolisCity_MapScript1_1E590B: @ 81E590B end SootopolisCity_MapScript2_1E5914: @ 81E5914 - map_script_2 VAR_0x405E, 1, SootopolisCity_EventScript_1E5926 + map_script_2 VAR_RAYQUAZA_STATE, 1, SootopolisCity_EventScript_1E5926 map_script_2 VAR_0x40CA, 1, SootopolisCity_EventScript_1E5BFE .2byte 0 @@ -271,7 +271,7 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A75 waitmovement 0 special RemoveCameraObject - setvar VAR_0x405E, 2 + setvar VAR_RAYQUAZA_STATE, 2 clearflag FLAG_SPECIAL_FLAG_0x4000 releaseall end @@ -371,7 +371,7 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BAE waitmovement 0 special RemoveCameraObject - setvar VAR_0x405E, 2 + setvar VAR_RAYQUAZA_STATE, 2 clearflag FLAG_SPECIAL_FLAG_0x4000 releaseall end @@ -694,11 +694,11 @@ SootopolisCity_Movement_1E5E7F: @ 81E5E7F SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D lock faceplayer - compare VAR_0x405E, 6 + compare VAR_RAYQUAZA_STATE, 6 goto_if_ge SootopolisCity_EventScript_1E5EC4 - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E5ECE - compare VAR_0x405E, 2 + compare VAR_RAYQUAZA_STATE, 2 goto_if_ge SootopolisCity_EventScript_1E5EBA msgbox SootopolisCity_Text_1E6D77, MSGBOX_DEFAULT release @@ -722,11 +722,11 @@ SootopolisCity_EventScript_1E5ECE:: @ 81E5ECE SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 lock faceplayer - compare VAR_0x405E, 1 + compare VAR_RAYQUAZA_STATE, 1 goto_if_le SootopolisCity_EventScript_1E5F1B - compare VAR_0x405E, 6 + compare VAR_RAYQUAZA_STATE, 6 goto_if_ge SootopolisCity_EventScript_1E5F1B - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E5F10 msgbox SootopolisCity_Text_1E6BFF, MSGBOX_DEFAULT closemessage @@ -794,7 +794,7 @@ SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2 lockall applymovement 2, Common_Movement_FacePlayer waitmovement 0 - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E600D msgbox SootopolisCity_Text_1E71A1, MSGBOX_DEFAULT closemessage @@ -811,7 +811,7 @@ SootopolisCity_EventScript_1E600D:: @ 81E600D SootopolisCity_EventScript_1E6017:: @ 81E6017 lock faceplayer - compare VAR_0x405E, 6 + compare VAR_RAYQUAZA_STATE, 6 goto_if_ge SootopolisCity_EventScript_1E602E msgbox SootopolisCity_Text_1E6CCA, MSGBOX_DEFAULT release @@ -825,11 +825,11 @@ SootopolisCity_EventScript_1E602E:: @ 81E602E SootopolisCity_EventScript_1E6038:: @ 81E6038 lock faceplayer - compare VAR_0x405E, 6 + compare VAR_RAYQUAZA_STATE, 6 goto_if_ge SootopolisCity_EventScript_1E607A - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E6084 - compare VAR_0x405E, 2 + compare VAR_RAYQUAZA_STATE, 2 goto_if_ge SootopolisCity_EventScript_1E6065 msgbox SootopolisCity_Text_1E6F90, MSGBOX_DEFAULT release @@ -857,11 +857,11 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E lockall applymovement 4, Common_Movement_FacePlayer waitmovement 0 - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E60D9 - compare VAR_0x405E, 6 + compare VAR_RAYQUAZA_STATE, 6 goto_if_ge SootopolisCity_EventScript_1E60CF - compare VAR_0x405E, 1 + compare VAR_RAYQUAZA_STATE, 1 goto_if_le SootopolisCity_EventScript_1E60CF msgbox SootopolisCity_Text_1E690B, MSGBOX_DEFAULT closemessage @@ -884,12 +884,12 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3 lockall applymovement 5, Common_Movement_FacePlayer waitmovement 0 - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E612D goto_if_set FLAG_SYS_GAME_CLEAR, SootopolisCity_EventScript_1E6137 - compare VAR_0x405E, 6 + compare VAR_RAYQUAZA_STATE, 6 goto_if_ge SootopolisCity_EventScript_1E6141 - compare VAR_0x405E, 1 + compare VAR_RAYQUAZA_STATE, 1 goto_if_le SootopolisCity_EventScript_1E6141 msgbox SootopolisCity_Text_1E6692, MSGBOX_DEFAULT closemessage @@ -930,11 +930,11 @@ SootopolisCity_EventScript_1E6166:: @ 81E6166 applymovement 7, Common_Movement_FacePlayer waitmovement 0 call_if_unset FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_1E61CC - compare VAR_0x405E, 2 + compare VAR_RAYQUAZA_STATE, 2 goto_if_eq SootopolisCity_EventScript_1E61AE - compare VAR_0x405E, 3 + compare VAR_RAYQUAZA_STATE, 3 goto_if_eq SootopolisCity_EventScript_1E61C2 - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 goto_if_eq SootopolisCity_EventScript_1E61C2 goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E61B8 msgbox SootopolisCity_Text_1E78E5, MSGBOX_DEFAULT @@ -1263,7 +1263,7 @@ SootopolisCity_EventScript_1E635D:: @ 81E635D lockall applymovement 15, Common_Movement_FacePlayer waitmovement 0 - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E6388 msgbox SootopolisCity_Text_1E67DC, MSGBOX_DEFAULT closemessage @@ -1280,7 +1280,7 @@ SootopolisCity_EventScript_1E6388:: @ 81E6388 SootopolisCity_EventScript_1E6393:: @ 81E6393 lockall - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E63C7 msgbox SootopolisCity_Text_1E6936, MSGBOX_DEFAULT closemessage @@ -1304,7 +1304,7 @@ SootopolisCity_EventScript_1E63DB:: @ 81E63DB lockall applymovement 13, Common_Movement_FacePlayer waitmovement 0 - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E6406 msgbox SootopolisCity_Text_1E6C7C, MSGBOX_DEFAULT closemessage @@ -1323,7 +1323,7 @@ SootopolisCity_EventScript_1E6411:: @ 81E6411 lockall applymovement 12, Common_Movement_FacePlayer waitmovement 0 - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E643C msgbox SootopolisCity_Text_1E6A50, MSGBOX_DEFAULT closemessage @@ -1340,7 +1340,7 @@ SootopolisCity_EventScript_1E643C:: @ 81E643C SootopolisCity_EventScript_1E6446:: @ 81E6446 lock faceplayer - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 goto_if_eq SootopolisCity_EventScript_1E64D8 goto_if_set FLAG_RECEIVED_HM07, SootopolisCity_EventScript_1E64E2 goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E646F @@ -1399,7 +1399,7 @@ SootopolisCity_Movement_1E64EF: @ 81E64EF SootopolisCity_EventScript_1E64F2:: @ 81E64F2 lockall - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E6509 msgbox SootopolisCity_Text_1E72DB, MSGBOX_DEFAULT closemessage @@ -1415,7 +1415,7 @@ SootopolisCity_EventScript_1E6509:: @ 81E6509 SootopolisCity_EventScript_1E651F:: @ 81E651F lockall - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E6536 msgbox SootopolisCity_Text_1E7460, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 06bc91f218..b9abdf6569 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -106,7 +106,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS setflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN setflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE - setvar VAR_0x405E, 6 + setvar VAR_RAYQUAZA_STATE, 6 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1 setvar VAR_0x8008, 8 call SootopolisCity_Gym_1F_EventScript_271F43 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 0858dfabbf..7293cdad39 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -74,7 +74,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 msgbox gUnknown_08273594, MSGBOX_DEFAULT giveitem_std ITEM_EON_TICKET setflag FLAG_SYS_HAS_EON_TICKET - setvar VAR_0x403F, 0 + setvar VAR_ALWAYS_ZERO_0x403F, 0 msgbox gUnknown_082735F2, MSGBOX_DEFAULT release end diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 770bc9a5b5..95e9a2fc5d 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -430,21 +430,21 @@ EventScript_275B4D:: @ 8275B4D EventScript_275B5B:: @ 8275B5B closemessage playse SE_KAIDAN - setvar VAR_0x4097, 0 + setvar VAR_SECRET_BASE_SHOULD_BE_INIT, 0 setflag FLAG_DECORATION_0 special sub_80E8E18 special sub_80E9068 setvar VAR_0x8004, 0 setvar VAR_0x8005, 0 special sub_80E933C - setvar VAR_0x4089, 1 + setvar VAR_SECRET_BASE_INITIALIZED, 1 waitstate end SecretBase_RedCave1_EventScript_275B81:: @ 8275B81 applymovement EVENT_OBJ_ID_PLAYER, SecretBase_RedCave1_Movement_275BB4 waitmovement 0 - setvar VAR_0x4097, 1 + setvar VAR_SECRET_BASE_SHOULD_BE_INIT, 1 msgbox SecretBase_RedCave1_Text_23B759, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_275BAB @@ -467,21 +467,21 @@ SecretBase_RedCave1_Movement_275BB4: @ 8275BB4 EventScript_275BB7:: @ 8275BB7 lockall - setvar VAR_0x4097, 1 + setvar VAR_SECRET_BASE_SHOULD_BE_INIT, 1 playse SE_KAIDAN special sub_80E9744 compare VAR_RESULT, 0 goto_if_eq EventScript_275BDB clearflag FLAG_DECORATION_0 special sub_80E9068 - setvar VAR_0x4089, 0 + setvar VAR_SECRET_BASE_INITIALIZED, 0 waitstate end EventScript_275BDB:: @ 8275BDB setflag FLAG_DECORATION_0 special sub_80E9068 - setvar VAR_0x4089, 0 + setvar VAR_SECRET_BASE_INITIALIZED, 0 waitstate end @@ -570,7 +570,7 @@ EventScript_275D0C:: @ 8275D0C setvar VAR_0x8004, 0 setvar VAR_0x8005, 0 special sub_80E933C - setvar VAR_0x4089, 1 + setvar VAR_SECRET_BASE_INITIALIZED, 1 end EventScript_275D1F:: @ 8275D1F diff --git a/include/constants/vars.h b/include/constants/vars.h index 1ca36b8ad2..1aacf8b75f 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -79,13 +79,13 @@ #define VAR_REGICE_STEPS_2 0x403C #define VAR_REGICE_STEPS_3 0x403D #define VAR_ALTERING_CAVE_WILD_SET 0x403E -#define VAR_0x403F 0x403F +#define VAR_ALWAYS_ZERO_0x403F 0x403F // This var is read and written, but is always zero. #define VAR_DAYS 0x4040 #define VAR_FANCLUB_UNKNOWN_1 0x4041 #define VAR_FANCLUB_UNKNOWN_2 0x4042 #define VAR_DEPT_STORE_FLOOR 0x4043 #define VAR_0x4044 0x4044 -#define VAR_POKELOT_PRIZE 0x4045 +#define VAR_POKELOT_PRIZE_ITEM 0x4045 #define VAR_NATIONAL_DEX 0x4046 #define VAR_SEEDOT_SIZE_RECORD 0x4047 #define VAR_ASH_GATHER_COUNT 0x4048 @@ -93,7 +93,7 @@ #define VAR_CRUISE_STEP_COUNT 0x404A #define VAR_POKELOT_RND1 0x404B #define VAR_POKELOT_RND2 0x404C -#define VAR_0x404D 0x404D +#define VAR_POKELOT_PRIZE_PLACE 0x404D #define VAR_UNUSED_0x404E 0x404E // Unused Var #define VAR_LOTAD_SIZE_RECORD 0x404F #define VAR_0x4050 0x4050 @@ -109,8 +109,8 @@ #define VAR_RUSTBORO_STATE 0x405A #define VAR_UNUSED_0x405B 0x405B // Unused Var #define VAR_UNUSED_0x405C 0x405C // Unused Var -#define VAR_0x405D 0x405D -#define VAR_0x405E 0x405E +#define VAR_MOSSDEEP_STATE 0x405D +#define VAR_RAYQUAZA_STATE 0x405E #define VAR_UNUSED_0x405F 0x405F // Unused Var #define VAR_ROUTE101_STATE 0x4060 #define VAR_UNUSED_0x4061 0x4061 // Unused Var @@ -153,7 +153,7 @@ #define VAR_LINK_CONTEST_ROOM_STATE 0x4086 #define VAR_CABLE_CLUB_STATE 0x4087 #define VAR_CONTEST_LOCATION 0x4088 -#define VAR_0x4089 0x4089 +#define VAR_SECRET_BASE_INITIALIZED 0x4089 #define VAR_CONTEST_PRIZE_PICKUP 0x408A #define VAR_UNUSED_0x408B 0x408B // Unused Var #define VAR_LITTLEROOT_HOUSES_STATE_2 0x408C @@ -167,15 +167,15 @@ #define VAR_LILYCOVE_MUSEUM_2F_STATE 0x4094 #define VAR_LILYCOVE_FAN_CLUB_STATE 0x4095 #define VAR_BRINEY_LOCATION 0x4096 -#define VAR_0x4097 0x4097 +#define VAR_SECRET_BASE_SHOULD_BE_INIT 0x4097 #define VAR_PETALBURG_WOODS_STATE 0x4098 #define VAR_LILYCOVE_CONTEST_LOBBY_STATE 0x4099 #define VAR_RUSTURF_TUNNEL_STATE 0x409A #define VAR_UNUSED_0x409B 0x409B // Unused Var #define VAR_ELITE_4_STATE 0x409C #define VAR_UNUSED_0x409D 0x409D // Unused Var -#define VAR_0x409E 0x409E -#define VAR_0x409F 0x409F +#define VAR_MOSSDEEP_SPACE_CENTER_STATE_1 0x409E +#define VAR_MOSSDEEP_SPACE_CENTER_STATE_2 0x409F #define VAR_SLATEPORT_HARBOR_STATE 0x40A0 #define VAR_UNUSED_0x40A1 0x40A1 // Unused var #define VAR_SEAFLOOR_CAVERN_STATE 0x40A2 diff --git a/src/field_specials.c b/src/field_specials.c index 7bfce8dd91..a07e987eb4 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -3580,7 +3580,7 @@ bool32 sub_813B4E0(void) bool32 sub_813B514(void) { - if (!VarGet(VAR_0x403F)) + if (!VarGet(VAR_ALWAYS_ZERO_0x403F)) { return FALSE; } diff --git a/src/lottery_corner.c b/src/lottery_corner.c index bd7d17ef75..bb3bb7a5c9 100644 --- a/src/lottery_corner.c +++ b/src/lottery_corner.c @@ -27,7 +27,7 @@ void ResetLotteryCorner(void) u16 rand = Random(); SetLotteryNumber((Random() << 16) | rand); - VarSet(VAR_POKELOT_PRIZE, 0); + VarSet(VAR_POKELOT_PRIZE_ITEM, 0); } void SetRandomLotteryNumber(u16 i) diff --git a/src/overworld.c b/src/overworld.c index 4206be4482..8ca10a33bc 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1018,7 +1018,7 @@ static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp) case MAP_NUM(ROUTE128): return TRUE; default: - if (VarGet(VAR_0x405E) < 4) + if (VarGet(VAR_RAYQUAZA_STATE) < 4) return FALSE; switch (warp->mapNum) { @@ -1059,9 +1059,9 @@ static bool16 IsInfiltratedWeatherInstitute(struct WarpData *warp) static bool16 IsInflitratedSpaceCenter(struct WarpData *warp) { - if (VarGet(VAR_0x405D) == 0) + if (VarGet(VAR_MOSSDEEP_STATE) == 0) return FALSE; - else if (VarGet(VAR_0x405D) > 2) + else if (VarGet(VAR_MOSSDEEP_STATE) > 2) return FALSE; else if (warp->mapGroup != MAP_GROUP(MOSSDEEP_CITY_SPACE_CENTER_1F)) return FALSE; diff --git a/src/secret_base.c b/src/secret_base.c index adcab9cbc3..7ff83dec8b 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -407,7 +407,7 @@ void sub_80E9068(void) bool8 sub_80E909C(void) { - if (gMapHeader.mapType == MAP_TYPE_SECRET_BASE && VarGet(VAR_0x4097) == 0) + if (gMapHeader.mapType == MAP_TYPE_SECRET_BASE && VarGet(VAR_SECRET_BASE_SHOULD_BE_INIT) == 0) { return FALSE; } @@ -494,7 +494,7 @@ void sub_80E9238(u8 flagIn) sub_80E8CB0(&x, &y, 0x220); MapGridSetMetatileIdAt(x + 7, y + 7, 0x221 | 0xc00); } - else if (flagIn == 1 && VarGet(VAR_0x4089) == 1) + else if (flagIn == 1 && VarGet(VAR_SECRET_BASE_INITIALIZED) == 1) { sub_80E8CB0(&x, &y, 0x220); MapGridSetMetatileIdAt(x + 7, y + 7, 0x20a | 0xc00); From e77e7844ea6b6cdba1a6386f144aa712aea1807b Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 27 Feb 2019 20:25:09 -0500 Subject: [PATCH 134/217] Name several vars, document some related events --- asm/macros/event.inc | 6 +++--- data/event_scripts.s | 4 ++-- .../BattleFrontier_ReceptionGate/scripts.inc | 4 ++-- .../BattleFrontier_ScottsHouse/scripts.inc | 6 +++--- .../scripts.inc | 2 +- .../FallarborTown_BattleTentLobby/scripts.inc | 2 +- data/maps/JaggedPass/map.json | 10 +++++----- data/maps/JaggedPass/scripts.inc | 8 ++++---- .../LilycoveCity_CoveLilyMotel_2F/scripts.inc | 2 +- .../scripts.inc | 2 +- data/maps/MauvilleCity/scripts.inc | 2 +- data/maps/MauvilleCity_Gym/scripts.inc | 2 +- data/maps/MirageTower_4F/scripts.inc | 2 +- data/maps/MossdeepCity/scripts.inc | 2 +- data/maps/PetalburgCity/scripts.inc | 2 +- data/maps/Route111/scripts.inc | 18 ++++++++--------- .../Route114_FossilManiacsTunnel/map.json | 4 ++-- .../Route114_FossilManiacsTunnel/scripts.inc | 2 +- data/maps/Route119/scripts.inc | 4 ++-- .../RustboroCity_PokemonSchool/scripts.inc | 4 ++-- data/maps/SSTidalCorridor/scripts.inc | 4 ++-- data/maps/SkyPillar_1F/scripts.inc | 2 +- data/maps/SkyPillar_2F/scripts.inc | 2 +- data/maps/SkyPillar_3F/scripts.inc | 2 +- data/maps/SkyPillar_4F/scripts.inc | 2 +- data/maps/SkyPillar_5F/scripts.inc | 2 +- data/maps/SkyPillar_Top/scripts.inc | 8 ++++---- data/maps/SlateportCity/map.json | 2 +- data/maps/SlateportCity/scripts.inc | 12 +++++------ .../scripts.inc | 2 +- data/maps/SootopolisCity/scripts.inc | 20 +++++++++---------- data/maps/SootopolisCity_Mart/scripts.inc | 4 ++-- .../scripts.inc | 4 ++-- data/maps/SouthernIsland_Interior/scripts.inc | 8 ++++---- data/maps/TrainerHill_Entrance/scripts.inc | 1 + .../scripts.inc | 2 +- data/scripts/cable_club.inc | 4 ++-- data/scripts/players_house.inc | 3 ++- data/scripts/tv.inc | 3 +++ include/constants/vars.h | 20 +++++++++---------- src/mirage_tower.c | 2 +- src/overworld.c | 4 ++-- 42 files changed, 103 insertions(+), 98 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index fa0b3fa065..d8251a358a 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -824,7 +824,7 @@ .byte \y .endm - @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. + @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (gMultichoiceLists) and the one to be used is specified with list. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. .macro multichoice x:req, y:req, list:req, b:req .byte 0x6f .byte \x @@ -833,7 +833,7 @@ .byte \b .endm - @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. + @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (gMultichoiceLists) and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. .macro multichoicedefault x:req, y:req, list:req, default:req, b:req .byte 0x70 .byte \x @@ -843,7 +843,7 @@ .byte \b .endm - @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box. + @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (gMultichoiceLists) and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box. .macro multichoicegrid x:req, y:req, list:req, per_row:req, B:req .byte 0x71 .byte \x diff --git a/data/event_scripts.s b/data/event_scripts.s index abc60dd181..8cbb3fd2e0 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1093,7 +1093,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 special sub_81AFDD0 setflag FLAG_IS_CHAMPION call EverGrandeCity_HallOfFame_EventScript_271829 - compare VAR_0x40CC, 0 + compare VAR_FOSSIL_MANIAC_STATE, 0 call_if_eq EverGrandeCity_HallOfFame_EventScript_271839 clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS call EverGrandeCity_HallOfFame_EventScript_2718CC @@ -1126,7 +1126,7 @@ EverGrandeCity_HallOfFame_EventScript_271829:: @ 8271829 return EverGrandeCity_HallOfFame_EventScript_271839:: @ 8271839 - setvar VAR_0x40CC, 1 + setvar VAR_FOSSIL_MANIAC_STATE, 1 return EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index 574415c4cb..8ce438d752 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -8,12 +8,12 @@ BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5 end BattleFrontier_ReceptionGate_MapScript2_2661E9: @ 82661E9 - map_script_2 VAR_0x40D0, 0, BattleFrontier_ReceptionGate_EventScript_2661F3 + map_script_2 VAR_HAS_ENTERED_BATTLE_FRONTIER, 0, BattleFrontier_ReceptionGate_EventScript_2661F3 .2byte 0 BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 lockall - setvar VAR_0x40D0, 1 + setvar VAR_HAS_ENTERED_BATTLE_FRONTIER, 1 playse SE_PIN applymovement 1, Common_Movement_ExclamationMark waitmovement 0 diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index 9278252e6d..52863d4740 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -184,11 +184,11 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT - compare VAR_0x40D1, 13 + compare VAR_SCOTT_STATE, 13 goto_if_eq BattleFrontier_ScottsHouse_EventScript_2639BC - compare VAR_0x40D1, 9 + compare VAR_SCOTT_STATE, 9 goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639CB - compare VAR_0x40D1, 6 + compare VAR_SCOTT_STATE, 6 goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639DA goto BattleFrontier_ScottsHouse_EventScript_2639E9 end diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 827c08e547..12c6bbb77a 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -40,7 +40,7 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79 call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 compare VAR_FACING, 3 call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_IN_EVERGRANDE playse SE_KAIDAN waitse diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 6d7ea6be5e..f6b7e10973 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -296,7 +296,7 @@ FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228 faceplayer goto_if_set FLAG_MET_SCOTT_IN_FALLARBOR, FallarborTown_BattleTentLobby_EventScript_200245 msgbox FallarborTown_BattleTentLobby_Text_200501, MSGBOX_DEFAULT - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_IN_FALLARBOR release end diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index 1b9c5471d6..3ec89fce6c 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -184,7 +184,7 @@ "x": 21, "y": 15, "elevation": 3, - "var": "VAR_0x40C8", + "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", "script": "JaggedPass_EventScript_2306BB" }, @@ -193,7 +193,7 @@ "x": 22, "y": 20, "elevation": 3, - "var": "VAR_0x40C8", + "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", "script": "JaggedPass_EventScript_2306BB" }, @@ -202,7 +202,7 @@ "x": 21, "y": 20, "elevation": 3, - "var": "VAR_0x40C8", + "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", "script": "JaggedPass_EventScript_2306BB" }, @@ -211,7 +211,7 @@ "x": 14, "y": 15, "elevation": 3, - "var": "VAR_0x40C8", + "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", "script": "JaggedPass_EventScript_2306BB" }, @@ -220,7 +220,7 @@ "x": 13, "y": 15, "elevation": 3, - "var": "VAR_0x40C8", + "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", "script": "JaggedPass_EventScript_2306BB" } diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 3df62fc7d0..c51a5ec261 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -6,7 +6,7 @@ JaggedPass_MapScripts:: @ 8230656 JaggedPass_MapScript1_230666: @ 8230666 setstepcallback 1 - compare VAR_0x40C8, 0 + compare VAR_JAGGED_PASS_STATE, 0 call_if_eq JaggedPass_EventScript_230674 end @@ -17,7 +17,7 @@ JaggedPass_EventScript_230674:: @ 8230674 return JaggedPass_EventScript_230685:: @ 8230685 - setvar VAR_0x40C8, 1 + setvar VAR_JAGGED_PASS_STATE, 1 return JaggedPass_MapScript1_23068B: @ 823068B @@ -31,7 +31,7 @@ JaggedPass_EventScript_230697:: @ 8230697 return JaggedPass_MapScript1_23069C: @ 823069C - compare VAR_0x40C8, 1 + compare VAR_JAGGED_PASS_STATE, 1 goto_if_le JaggedPass_EventScript_2306A8 end @@ -61,7 +61,7 @@ JaggedPass_EventScript_2306BB:: @ 82306BB setmetatile 16, 18, 606, 0 special DrawWholeMapView delay 30 - setvar VAR_0x40C8, 2 + setvar VAR_JAGGED_PASS_STATE, 2 waitse releaseall end diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index 4a761a7061..fd6aa34bd7 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -57,7 +57,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D faceplayer goto_if_set FLAG_MET_SCOTT_IN_LILYCOVE, LilycoveCity_CoveLilyMotel_2F_EventScript_21876A msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, MSGBOX_DEFAULT - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_IN_LILYCOVE release end diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 88b1c6929b..51ace147dc 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -570,7 +570,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC:: @ 81FA3AC setflag FLAG_SYS_POKEDEX_GET special sub_81AFDA0 setflag FLAG_RECEIVED_POKEDEX_FROM_BIRCH - setvar VAR_0x40CD, 1 + setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 1 return LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4:: @ 81FA3C4 diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 120fc9f517..62c2219ea0 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -168,7 +168,7 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 waitmovement 0 msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT closemessage - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 compare VAR_FACING, 2 call_if_eq MauvilleCity_EventScript_1DF616 compare VAR_FACING, 4 diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index de4bd0ddf0..e23d48332f 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -90,7 +90,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B waitmessage call Common_EventScript_PlayGymBadgeFanfare msgbox MauvilleCity_Gym_Text_20E7AA, MSGBOX_DEFAULT - setvar VAR_0x40D2, 3 + setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 3 clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT setflag FLAG_DEFEATED_MAUVILLE_GYM setflag FLAG_BADGE03_GET diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc index 3128525863..3d8dd80d0a 100644 --- a/data/maps/MirageTower_4F/scripts.inc +++ b/data/maps/MirageTower_4F/scripts.inc @@ -52,7 +52,7 @@ MirageTower_4F_EventScript_23ADCA:: @ 823ADCA waitstate special DoMirageTowerCeilingCrumble waitstate - setvar VAR_0x40CB, 1 + setvar VAR_ROUTE_111_STATE, 1 clearflag FLAG_LANDMARK_MIRAGE_TOWER warp MAP_ROUTE111, 255, 19, 59 waitstate diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 31995542db..493cded0a8 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -259,7 +259,7 @@ MossdeepCity_EventScript_1E4C85:: @ 81E4C85 call_if_eq MossdeepCity_EventScript_1E4CB0 compare VAR_FACING, 4 call_if_eq MossdeepCity_EventScript_1E4CC2 - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 removeobject 16 release end diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index e2f5d2a86e..0520fe044c 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -551,7 +551,7 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 - setvar VAR_0x40D1, 1 + setvar VAR_SCOTT_STATE, 1 msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT closemessage applymovement 9, Common_Movement_WalkInPlaceRight diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 7543690148..4c8fce8b61 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -7,7 +7,7 @@ Route111_MapScripts:: @ 81F0CA7 Route111_MapScript1_1F0CBC: @ 81F0CBC call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_1F0CD1 - compare VAR_0x40CB, 1 + compare VAR_ROUTE_111_STATE, 1 call_if_eq Route111_EventScript_1F0CE4 end @@ -41,9 +41,9 @@ Route111_MapScript1_1F0D87: @ 81F0D87 setvar VAR_0x40D6, 0 special SetMirageTowerVisibility call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F0E3C - compare VAR_0x40CB, 1 + compare VAR_ROUTE_111_STATE, 1 call_if_eq Route111_EventScript_1F0DC2 - compare VAR_0x40CB, 2 + compare VAR_ROUTE_111_STATE, 2 call_if_eq Route111_EventScript_1F0E40 call Route111_EventScript_1F0DE6 call Route111_EventScript_28CCC7 @@ -101,11 +101,11 @@ Route111_EventScript_1F0E3C:: @ 81F0E3C return Route111_EventScript_1F0E40:: @ 81F0E40 - setvar VAR_0x40CB, 3 + setvar VAR_ROUTE_111_STATE, 3 return Route111_MapScript2_1F0E46: @ 81F0E46 - map_script_2 VAR_0x40CB, 1, Route111_EventScript_1F0E50 + map_script_2 VAR_ROUTE_111_STATE, 1, Route111_EventScript_1F0E50 .2byte 0 Route111_EventScript_1F0E50:: @ 81F0E50 @@ -113,7 +113,7 @@ Route111_EventScript_1F0E50:: @ 81F0E50 end Route111_MapScript2_1F0E56: @ 81F0E56 - map_script_2 VAR_0x40CB, 1, Route111_EventScript_1F0E60 + map_script_2 VAR_ROUTE_111_STATE, 1, Route111_EventScript_1F0E60 .2byte 0 Route111_EventScript_1F0E60:: @ 81F0E60 @@ -134,7 +134,7 @@ Route111_EventScript_1F0E60:: @ 81F0E60 waitstate special StartMirageTowerFossilFallAndSink waitstate - setvar VAR_0x40CB, 2 + setvar VAR_ROUTE_111_STATE, 2 clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL goto_if_set FLAG_CHOSE_ROOT_FOSSIL, Route111_EventScript_1F0EA7 msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT @@ -411,9 +411,9 @@ Route111_EventScript_1F1192:: @ 81F1192 Route111_EventScript_1F119B:: @ 81F119B lock faceplayer - compare VAR_0x40CB, 3 + compare VAR_ROUTE_111_STATE, 3 goto_if_eq Route111_EventScript_1F11C6 - compare VAR_0x40CB, 2 + compare VAR_ROUTE_111_STATE, 2 goto_if_eq Route111_EventScript_1F11D0 goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F11DA msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index 0582198dbf..d0992f8fa0 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -57,7 +57,7 @@ "x": 5, "y": 4, "elevation": 3, - "var": "VAR_0x40CC", + "var": "VAR_FOSSIL_MANIAC_STATE", "var_value": "1", "script": "Route114_FossilManiacsTunnel_EventScript_22AF66" }, @@ -66,7 +66,7 @@ "x": 6, "y": 4, "elevation": 3, - "var": "VAR_0x40CC", + "var": "VAR_FOSSIL_MANIAC_STATE", "var_value": "1", "script": "Route114_FossilManiacsTunnel_EventScript_22AF66" } diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 1a84082abd..8ab83a4418 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -27,7 +27,7 @@ Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT - setvar VAR_0x40CC, 2 + setvar VAR_FOSSIL_MANIAC_STATE, 2 releaseall end diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 83ff4707fd..22a73b74b1 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -167,7 +167,7 @@ Route119_EventScript_1F460F:: @ 81F460F addobject 43 applymovement 43, Route119_Movement_1F4752 waitmovement 0 - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 msgbox Route119_Text_1F4E60, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 @@ -491,7 +491,7 @@ Route119_EventScript_1F49EC:: @ 81F49EC pokenavcall Route119_Text_1F4FBA waitmessage clearflag FLAG_REGISTER_WINONA_POKENAV - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 releaseall end diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index 74394f9a51..ff52ee5ac1 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -170,7 +170,7 @@ RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040 goto_if_set FLAG_MET_SCOTT_RUSTBORO, RustboroCity_PokemonSchool_EventScript_21406F goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_214082 msgbox RustboroCity_PokemonSchool_Text_2148C0, MSGBOX_DEFAULT - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_RUSTBORO release end @@ -192,7 +192,7 @@ RustboroCity_PokemonSchool_EventScript_214090:: @ 8214090 end RustboroCity_PokemonSchool_EventScript_21409E:: @ 821409E - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE release end diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index ededf1e5f7..ec231ccdd3 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -3,7 +3,7 @@ SSTidalCorridor_MapScripts:: @ 823BFCF .byte 0 SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5 - map_script_2 VAR_0x40D4, 0, SSTidalCorridor_EventScript_23C219 + map_script_2 VAR_SS_TIDAL_SCOTT_STATE, 0, SSTidalCorridor_EventScript_23C219 map_script_2 VAR_PORTHOLE_STATE, 1, SSTidalCorridor_EventScript_23BFFF map_script_2 VAR_PORTHOLE_STATE, 5, SSTidalCorridor_EventScript_23C015 map_script_2 VAR_PORTHOLE_STATE, 9, SSTidalCorridor_EventScript_23C067 @@ -216,7 +216,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 waitmovement 0 delay 30 setflag FLAG_MET_SCOTT_ON_SS_TIDAL - setvar VAR_0x40D4, 1 + setvar VAR_SS_TIDAL_SCOTT_STATE, 1 releaseall end diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc index b1ec3b74a5..18ec43ad65 100644 --- a/data/maps/SkyPillar_1F/scripts.inc +++ b/data/maps/SkyPillar_1F/scripts.inc @@ -3,7 +3,7 @@ SkyPillar_1F_MapScripts:: @ 8239615 .byte 0 SkyPillar_1F_MapScript1_23961B: @ 823961B - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_1F_EventScript_239627 end diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index 8c1424fd93..9059bd246c 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -5,7 +5,7 @@ SkyPillar_2F_MapScripts:: @ 823962B .byte 0 SkyPillar_2F_MapScript1_23963B: @ 823963B - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_2F_EventScript_23964C copyvar VAR_ICE_STEP_COUNT, 0x1 end diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc index 9bc7eda27d..ba6a5128dd 100644 --- a/data/maps/SkyPillar_3F/scripts.inc +++ b/data/maps/SkyPillar_3F/scripts.inc @@ -3,7 +3,7 @@ SkyPillar_3F_MapScripts:: @ 823965B .byte 0 SkyPillar_3F_MapScript1_239661: @ 8239661 - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_3F_EventScript_23966D end diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index 254d61a59f..355530fdce 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -5,7 +5,7 @@ SkyPillar_4F_MapScripts:: @ 8239671 .byte 0 SkyPillar_4F_MapScript1_239681: @ 8239681 - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_4F_EventScript_239692 copyvar VAR_ICE_STEP_COUNT, 0x1 end diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc index af5a5ffe12..ba35e16f2b 100644 --- a/data/maps/SkyPillar_5F/scripts.inc +++ b/data/maps/SkyPillar_5F/scripts.inc @@ -3,7 +3,7 @@ SkyPillar_5F_MapScripts:: @ 82396A2 .byte 0 SkyPillar_5F_MapScript1_2396A8: @ 82396A8 - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_5F_EventScript_2396B4 return diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index df2b2118e1..5a69001a15 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -16,9 +16,9 @@ SkyPillar_Top_EventScript_2396D2:: @ 82396D2 return SkyPillar_Top_MapScript1_2396E6: @ 82396E6 - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_Top_EventScript_2396FD - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 call_if_ge SkyPillar_Top_EventScript_239705 end @@ -36,7 +36,7 @@ SkyPillar_Top_EventScript_23970F:: @ 823970F return SkyPillar_Top_MapScript2_239713: @ 8239713 - map_script_2 VAR_0x40CA, 0, SkyPillar_Top_EventScript_23971D + map_script_2 VAR_SKY_PILLAR_STATE, 0, SkyPillar_Top_EventScript_23971D .2byte 0 SkyPillar_Top_EventScript_23971D:: @ 823971D @@ -131,7 +131,7 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A waitmovement 0 special RemoveCameraObject setvar VAR_RAYQUAZA_STATE, 5 - setvar VAR_0x40CA, 1 + setvar VAR_SKY_PILLAR_STATE, 1 setvar VAR_0x40D7, 1 releaseall end diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index 1265190969..f548b73495 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -571,7 +571,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x40D2", + "var": "VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE", "var_value": "2", "script": "SlateportCity_EventScript_1DD5DC" } diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 9f4310c4aa..acf66d2bdb 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -8,7 +8,7 @@ SlateportCity_MapScript1_1DCC6C: @ 81DCC6C call SlateportCity_EventScript_1DCC8D compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCC99 - compare VAR_0x40D2, 1 + compare VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1 call_if_eq SlateportCity_EventScript_1DCCE7 end @@ -50,7 +50,7 @@ SlateportCity_EventScript_1DCD06:: @ 81DCD06 return SlateportCity_MapScript2_1DCD12: @ 81DCD12 - map_script_2 VAR_0x40D2, 1, SlateportCity_EventScript_1DCD1C + map_script_2 VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1, SlateportCity_EventScript_1DCD1C .2byte 0 SlateportCity_EventScript_1DCD1C:: @ 81DCD1C @@ -84,8 +84,8 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C setobjectxyperm 35, 10, 12 setobjectmovementtype 35, MOVEMENT_TYPE_FACE_DOWN clearflag FLAG_SPECIAL_FLAG_0x4000 - setvar VAR_0x40D2, 2 - addvar VAR_0x40D1, 1 + setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 2 + addvar VAR_SCOTT_STATE, 1 releaseall end @@ -901,8 +901,8 @@ SlateportCity_EventScript_1DD5DC:: @ 81DD5DC applymovement 35, SlateportCity_Movement_1DD63A waitmovement 0 removeobject 35 - addvar VAR_0x40D1, 1 - setvar VAR_0x40D2, 3 + addvar VAR_SCOTT_STATE, 1 + setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 3 releaseall end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 641c4dd86f..96ae966859 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -86,7 +86,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 setflag FLAG_DELIVERED_DEVON_GOODS clearflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE - setvar VAR_0x40D2, 1 + setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1 fadescreen 0 release end diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index cad6d7db86..9b5524a36f 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -35,7 +35,7 @@ SootopolisCity_MapScript1_1E56EF: @ 81E56EF setflag FLAG_VISITED_SOOTOPOLIS_CITY compare VAR_RAYQUAZA_STATE, 1 call_if_eq SootopolisCity_EventScript_1E5781 - compare VAR_0x40CA, 1 + compare VAR_SKY_PILLAR_STATE, 1 call_if_eq SootopolisCity_EventScript_1E5781 call SootopolisCity_EventScript_1E5805 call SootopolisCity_EventScript_1E57B2 @@ -89,7 +89,7 @@ SootopolisCity_EventScript_1E57B2:: @ 81E57B2 goto_if_eq SootopolisCity_EventScript_1E5801 compare VAR_RAYQUAZA_STATE, 4 goto_if_eq SootopolisCity_EventScript_1E5801 - compare VAR_0x40CA, 1 + compare VAR_SKY_PILLAR_STATE, 1 goto_if_le SootopolisCity_EventScript_1E5801 return @@ -107,9 +107,9 @@ SootopolisCity_EventScript_1E5805:: @ 81E5805 goto_if_ge SootopolisCity_EventScript_1E583D compare VAR_RAYQUAZA_STATE, 1 goto_if_eq SootopolisCity_EventScript_1E583E - compare VAR_0x40CA, 1 + compare VAR_SKY_PILLAR_STATE, 1 goto_if_eq SootopolisCity_EventScript_1E583E - compare VAR_0x40CA, 1 + compare VAR_SKY_PILLAR_STATE, 1 goto_if_le Common_EventScript_SetWeather15 return @@ -172,9 +172,9 @@ SootopolisCity_MapScript2_1E58DB: @ 81E58DB .2byte 0 SootopolisCity_EventScript_1E58E5:: @ 81E58E5 - compare VAR_0x40CA, 1 + compare VAR_SKY_PILLAR_STATE, 1 call_if_eq SootopolisCity_EventScript_1E58FC - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 call_if_eq SootopolisCity_EventScript_1E5901 end @@ -184,7 +184,7 @@ SootopolisCity_EventScript_1E58FC:: @ 81E58FC SootopolisCity_EventScript_1E5901:: @ 81E5901 turnobject EVENT_OBJ_ID_PLAYER, 2 - setvar VAR_0x40CA, 3 + setvar VAR_SKY_PILLAR_STATE, 3 return SootopolisCity_MapScript1_1E590B: @ 81E590B @@ -193,7 +193,7 @@ SootopolisCity_MapScript1_1E590B: @ 81E590B SootopolisCity_MapScript2_1E5914: @ 81E5914 map_script_2 VAR_RAYQUAZA_STATE, 1, SootopolisCity_EventScript_1E5926 - map_script_2 VAR_0x40CA, 1, SootopolisCity_EventScript_1E5BFE + map_script_2 VAR_SKY_PILLAR_STATE, 1, SootopolisCity_EventScript_1E5BFE .2byte 0 SootopolisCity_EventScript_1E5926:: @ 81E5926 @@ -540,7 +540,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E special WaitWeather waitstate clearflag FLAG_SYS_WEATHER_CTRL - setvar VAR_0x40CA, 3 + setvar VAR_SKY_PILLAR_STATE, 3 clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS fadenewbgm MUS_RUNECITY delay 120 @@ -593,7 +593,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE special WaitWeather waitstate clearflag FLAG_SYS_WEATHER_CTRL - setvar VAR_0x40CA, 2 + setvar VAR_SKY_PILLAR_STATE, 2 clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS fadenewbgm MUS_NAMINORI delay 120 diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc index 4a152bcf06..fe0270d62d 100644 --- a/data/maps/SootopolisCity_Mart/scripts.inc +++ b/data/maps/SootopolisCity_Mart/scripts.inc @@ -28,7 +28,7 @@ SootopolisCity_Mart_Pokemart_2267AC: @ 82267AC SootopolisCity_Mart_EventScript_2267C2:: @ 82267C2 lock faceplayer - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 goto_if_ge SootopolisCity_Mart_EventScript_2267E2 goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_2267E2 msgbox SootopolisCity_Mart_Text_22685D, MSGBOX_DEFAULT @@ -43,7 +43,7 @@ SootopolisCity_Mart_EventScript_2267E2:: @ 82267E2 SootopolisCity_Mart_EventScript_2267EC:: @ 82267EC lock faceplayer - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 goto_if_ge SootopolisCity_Mart_EventScript_22680C goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_22680C msgbox SootopolisCity_Mart_Text_226928, MSGBOX_DEFAULT diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index 96f766f7b3..97cb2d4d70 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -18,7 +18,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500 SootopolisCity_PokemonCenter_1F_EventScript_22650E:: @ 822650E lock faceplayer - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_22652E goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_22652E msgbox SootopolisCity_PokemonCenter_1F_Text_22664B, MSGBOX_DEFAULT @@ -33,7 +33,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_22652E:: @ 822652E SootopolisCity_PokemonCenter_1F_EventScript_226538:: @ 8226538 lock faceplayer - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_226558 goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_226558 msgbox SootopolisCity_PokemonCenter_1F_Text_22672F, MSGBOX_DEFAULT diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index a24bc772f2..958c5f5463 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -15,9 +15,9 @@ SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A return SouthernIsland_Interior_MapScript1_242A6E: @ 8242A6E - compare VAR_0x40D5, 0 + compare VAR_ROAMER_POKEMON, 0 call_if_eq SouthernIsland_Interior_EventScript_242A8A - compare VAR_0x40D5, 0 + compare VAR_ROAMER_POKEMON, 0 call_if_ne SouthernIsland_Interior_EventScript_242A95 call SouthernIsland_Interior_EventScript_242AA0 end @@ -77,9 +77,9 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 delay 50 special RemoveCameraObject setvar VAR_LAST_TALKED, 2 - compare VAR_0x40D5, 0 + compare VAR_ROAMER_POKEMON, 0 call_if_eq SouthernIsland_Interior_EventScript_242BA4 - compare VAR_0x40D5, 0 + compare VAR_ROAMER_POKEMON, 0 call_if_ne SouthernIsland_Interior_EventScript_242BB7 setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLatiBattle diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 5339f49e3a..a37a23395b 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -91,6 +91,7 @@ TrainerHill_Entrance_EventScript_2681CA:: @ 82681CA lockall applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F msgbox TrainerHill_Entrance_Text_268712, MSGBOX_DEFAULT + @ No "end" command; intentional fall-through to TrainerHill_Entrance_EventScript_2681DA. TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA closemessage diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index f6bb194a3e..daaaaea1b6 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -307,7 +307,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201AD0:: @ 8201AD0 faceplayer goto_if_set FLAG_MET_SCOTT_IN_VERDANTURF, VerdanturfTown_BattleTentLobby_EventScript_201AED msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, MSGBOX_DEFAULT - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_IN_VERDANTURF release end diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 7293cdad39..9cf435ade7 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -197,7 +197,7 @@ RustboroCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B SlateportCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B SootopolisCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B - map_script_2 VAR_0x40CD, 1, OldaleTown_PokemonCenter_2F_EventScript_276DE0 + map_script_2 VAR_CABLE_CLUB_TUTORIAL_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276DE0 map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276C85 map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276C85 map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276C85 @@ -336,7 +336,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0 waitmovement 0 delay 30 msgbox OldaleTown_PokemonCenter_2F_Text_279718, MSGBOX_DEFAULT - setvar VAR_0x40CD, 2 + setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 2 releaseall end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 3061575611..c4a5ffe865 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -510,7 +510,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 multichoice 22, 8, 108, 1 copyvar VAR_0x8004, VAR_RESULT special InitRoamer - copyvar VAR_0x40D5, VAR_RESULT + copyvar VAR_ROAMER_POKEMON, VAR_RESULT msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, MSGBOX_DEFAULT closemessage setvar VAR_LITTLEROOT_HOUSES_STATE, 4 @@ -518,6 +518,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 releaseall end +@ Never called. LittlerootTown_BrendansHouse_1F_EventScript_292C72:: @ 8292C72 setflag FLAG_SYS_TV_LATIAS_LATIOS return diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index acc75f76aa..9f197515d8 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -42,6 +42,9 @@ EventScript_27EE9A:: @ 827EE9A EventScript_27EEA4:: @ 827EEA4 msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT + @ This is a junk call. Its input var (VAR_0x8004) hasn't been set, and + @ It's called again when Mom actually asks for the color, overwriting + @ whatever it does here. special InitRoamer clearflag FLAG_SYS_TV_LATIAS_LATIOS setflag FLAG_LATIOS_OR_LATIAS_ROAMING diff --git a/include/constants/vars.h b/include/constants/vars.h index 1aacf8b75f..199f714b18 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -216,20 +216,20 @@ #define VAR_WHICH_FOSSIL_REVIVED 0x40C5 #define VAR_STEVENS_HOUSE_STATE 0x40C6 #define VAR_OLDALE_STATE 0x40C7 -#define VAR_0x40C8 0x40C8 +#define VAR_JAGGED_PASS_STATE 0x40C8 #define VAR_0x40C9 0x40C9 -#define VAR_0x40CA 0x40CA -#define VAR_0x40CB 0x40CB -#define VAR_0x40CC 0x40CC -#define VAR_0x40CD 0x40CD +#define VAR_SKY_PILLAR_STATE 0x40CA +#define VAR_ROUTE_111_STATE 0x40CB +#define VAR_FOSSIL_MANIAC_STATE 0x40CC +#define VAR_CABLE_CLUB_TUTORIAL_STATE 0x40CD #define VAR_FRONTIER_BATTLE_MODE 0x40CE #define VAR_FRONTIER_FACILITY 0x40CF -#define VAR_0x40D0 0x40D0 -#define VAR_0x40D1 0x40D1 -#define VAR_0x40D2 0x40D2 +#define VAR_HAS_ENTERED_BATTLE_FRONTIER 0x40D0 // Var is used like a flag. +#define VAR_SCOTT_STATE 0x40D1 +#define VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE 0x40D2 #define VAR_0x40D3 0x40D3 -#define VAR_0x40D4 0x40D4 -#define VAR_0x40D5 0x40D5 +#define VAR_SS_TIDAL_SCOTT_STATE 0x40D4 // Always equal to FLAG_MET_SCOTT_ON_SS_TIDAL +#define VAR_ROAMER_POKEMON 0x40D5 // 0 = Latias, 1 = Latios #define VAR_0x40D6 0x40D6 #define VAR_0x40D7 0x40D7 #define VAR_0x40D8 0x40D8 diff --git a/src/mirage_tower.c b/src/mirage_tower.c index a8dd5d9de8..4f5834db1e 100644 --- a/src/mirage_tower.c +++ b/src/mirage_tower.c @@ -317,7 +317,7 @@ void SetMirageTowerVisibility(void) u16 rand; bool8 visible; - if (VarGet(VAR_0x40CB)) + if (VarGet(VAR_ROUTE_111_STATE)) { FlagClear(FLAG_MIRAGE_TOWER_VISIBLE); return; diff --git a/src/overworld.c b/src/overworld.c index 8ca10a33bc..6055c74bb3 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1034,7 +1034,7 @@ static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp) static bool16 NoMusicInSotopolisWithLegendaries(struct WarpData *warp) { - if (VarGet(VAR_0x40CA) != 1) + if (VarGet(VAR_SKY_PILLAR_STATE) != 1) return FALSE; else if (warp->mapGroup != MAP_GROUP(SOOTOPOLIS_CITY)) return FALSE; @@ -1212,7 +1212,7 @@ void TryFadeOutOldMapMusic(void) if (FlagGet(FLAG_SPECIAL_FLAG_0x4001) != TRUE && warpMusic != GetCurrentMapMusic()) { if (currentMusic == MUS_NAMINORI - && VarGet(VAR_0x40CA) == 2 + && VarGet(VAR_SKY_PILLAR_STATE) == 2 && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SOOTOPOLIS_CITY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SOOTOPOLIS_CITY) && sWarpDestination.mapGroup == MAP_GROUP(SOOTOPOLIS_CITY) From 66f0616a2d3fd3a8e09aabf9e3ee51cd88ae474f Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 27 Feb 2019 21:28:34 -0500 Subject: [PATCH 135/217] I guess I'm documenting Trainer Hill now --- data/event_scripts.s | 15 ++++--- data/map_events.s | 1 + data/maps.s | 2 +- data/maps/TrainerHill_Entrance/scripts.inc | 25 ++++++----- data/maps/TrainerHill_Roof/scripts.inc | 8 ++-- include/constants/trainer_hill.h | 23 ++++++++++ include/global.h | 4 +- include/main.h | 4 +- include/trainer_hill.h | 2 +- src/load_save.c | 2 +- src/main.c | 14 +++--- src/save.c | 6 +-- src/trainer_hill.c | 50 +++++++++++----------- 13 files changed, 90 insertions(+), 66 deletions(-) create mode 100644 include/constants/trainer_hill.h diff --git a/data/event_scripts.s b/data/event_scripts.s index 8cbb3fd2e0..2744824ec0 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -16,6 +16,7 @@ #include "constants/trainers.h" #include "constants/vars.h" #include "constants/weather.h" +#include "constants/trainer_hill.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" @@ -2758,7 +2759,7 @@ EventScript_2736F8:: @ 82736F8 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - setvar VAR_0x8004, 10 + setvar VAR_0x8004, TRAINER_HILL_FUNC_10 special CallTrainerHillFunction compare VAR_RESULT, 1 goto_if_eq TrainerHill_1F_EventScript_2C83C9 @@ -6925,7 +6926,7 @@ TrainerHill_3F_MapScript1_2C8336: @ 82C8336 TrainerHill_4F_MapScript1_2C8336: @ 82C8336 TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, 4 + setvar VAR_0x8004, TRAINER_HILL_FUNC_4 special CallTrainerHillFunction setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 @@ -6958,7 +6959,7 @@ TrainerHill_Roof_MapScript2_2C8381: @ 82C8381 EventScript_TrainerHillTimer:: @ 82C8393 lockall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, TRAINER_HILL_FUNC_7 special CallTrainerHillFunction msgbox TrainerHill_Entrance_Text_268D47, MSGBOX_DEFAULT releaseall @@ -6966,7 +6967,7 @@ EventScript_TrainerHillTimer:: @ 82C8393 TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6 setvar VAR_TEMP_2, 1 - setvar VAR_0x8004, 9 + setvar VAR_0x8004, TRAINER_HILL_FUNC_9 special CallTrainerHillFunction compare VAR_RESULT, 1 goto_if_eq TrainerHill_1F_EventScript_2C83BF @@ -6978,9 +6979,9 @@ TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF end TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9 - setvar VAR_0x8004, 12 + setvar VAR_0x8004, TRAINER_HILL_FUNC_12 special CallTrainerHillFunction - setvar VAR_0x8004, 5 + setvar VAR_0x8004, TRAINER_HILL_FUNC_5 special CallTrainerHillFunction setvar VAR_TEMP_1, 1 end @@ -6998,7 +6999,7 @@ TrainerHill_1F_Movement_2C83EE:: @ 82C83EE EventScript_2C83F0:: @ 82C83F0 trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText - setvar VAR_0x8004, 11 + setvar VAR_0x8004, TRAINER_HILL_FUNC_11 special CallTrainerHillFunction waitmessage waitbuttonpress diff --git a/data/map_events.s b/data/map_events.s index cd42bfe759..ceaa72837a 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -8,6 +8,7 @@ #include "constants/secret_bases.h" #include "constants/vars.h" #include "constants/weather.h" +#include "constants/trainer_hill.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps.s b/data/maps.s index 3334fd103a..beb28ddec8 100644 --- a/data/maps.s +++ b/data/maps.s @@ -4,7 +4,7 @@ #include "constants/weather.h" #include "constants/region_map_sections.h" #include "constants/songs.h" -#include "constants/weather.h" +#include "constants/trainer_hill.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index a37a23395b..a07c4069a2 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -15,10 +15,10 @@ TrainerHill_Entrance_MapScript1_2680CF: @ 82680CF end TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0 - setvar VAR_0x8004, 4 + setvar VAR_0x8004, TRAINER_HILL_FUNC_4 special CallTrainerHillFunction setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 9 + setvar VAR_0x8004, TRAINER_HILL_FUNC_9 special CallTrainerHillFunction compare VAR_RESULT, 0 goto_if_eq TrainerHill_Entrance_EventScript_2680FF @@ -27,7 +27,7 @@ TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0 end TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF - setvar VAR_0x8004, 16 + setvar VAR_0x8004, TRAINER_HILL_FUNC_16 special CallTrainerHillFunction compare VAR_RESULT, 1 goto_if_eq TrainerHill_Entrance_EventScript_26811A @@ -74,7 +74,7 @@ TrainerHill_Entrance_EventScript_268160:: @ 8268160 TrainerHill_Entrance_EventScript_268182:: @ 8268182 setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, 6 + setvar VAR_0x8004, TRAINER_HILL_FUNC_6 special CallTrainerHillFunction switch VAR_RESULT case 0, TrainerHill_Entrance_EventScript_2681B5 @@ -91,7 +91,6 @@ TrainerHill_Entrance_EventScript_2681CA:: @ 82681CA lockall applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F msgbox TrainerHill_Entrance_Text_268712, MSGBOX_DEFAULT - @ No "end" command; intentional fall-through to TrainerHill_Entrance_EventScript_2681DA. TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA closemessage @@ -115,7 +114,7 @@ TrainerHill_Entrance_EventScript_2681EF:: @ 82681EF TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD lock faceplayer - setvar VAR_0x8004, 10 + setvar VAR_0x8004, TRAINER_HILL_FUNC_10 special CallTrainerHillFunction compare VAR_RESULT, 0 goto_if_eq TrainerHill_Entrance_EventScript_26821F @@ -134,11 +133,11 @@ TrainerHill_Entrance_EventScript_268229:: @ 8268229 applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_26836A msgbox TrainerHill_Entrance_Text_2684C6, MSGBOX_DEFAULT - setvar VAR_0x8004, 13 + setvar VAR_0x8004, TRAINER_HILL_FUNC_13 special CallTrainerHillFunction compare VAR_RESULT, 0 call_if_eq TrainerHill_Entrance_EventScript_26832E - setvar VAR_0x8004, 8 + setvar VAR_0x8004, TRAINER_HILL_FUNC_8 special CallTrainerHillFunction compare VAR_RESULT, 1 goto_if_eq TrainerHill_Entrance_EventScript_268275 @@ -169,14 +168,14 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8 switch VAR_RESULT case 4, TrainerHill_Entrance_EventScript_268314 case 127, TrainerHill_Entrance_EventScript_268314 - setvar VAR_0x8004, 17 + setvar VAR_0x8004, TRAINER_HILL_FUNC_17 copyvar VAR_0x8005, VAR_RESULT special CallTrainerHillFunction setvar VAR_0x40D6, 1 setvar VAR_TEMP_5, 0 special HealPlayerParty msgbox TrainerHill_Entrance_Text_26862A, MSGBOX_DEFAULT - setvar VAR_0x8004, 0 + setvar VAR_0x8004, TRAINER_HILL_FUNC_0 special CallTrainerHillFunction releaseall end @@ -192,18 +191,18 @@ TrainerHill_Entrance_EventScript_268314:: @ 8268314 TrainerHill_Entrance_EventScript_26832E:: @ 826832E msgbox TrainerHill_Entrance_Text_26851C, MSGBOX_DEFAULT - setvar VAR_0x8004, 14 + setvar VAR_0x8004, TRAINER_HILL_FUNC_14 special CallTrainerHillFunction setvar VAR_TEMP_5, 1 call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq TrainerHill_Entrance_EventScript_26835C - setvar VAR_0x8004, 14 + setvar VAR_0x8004, TRAINER_HILL_FUNC_14 special CallTrainerHillFunction return TrainerHill_Entrance_EventScript_26835C:: @ 826835C - setvar VAR_0x8004, 15 + setvar VAR_0x8004, TRAINER_HILL_FUNC_15 special CallTrainerHillFunction goto TrainerHill_Entrance_EventScript_268314 end diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc index fc1ca200f1..bf467e1004 100644 --- a/data/maps/TrainerHill_Roof/scripts.inc +++ b/data/maps/TrainerHill_Roof/scripts.inc @@ -4,11 +4,11 @@ TrainerHill_Roof_MapScripts:: @ 8268FA7 .byte 0 TrainerHill_Roof_EventScript_268FB2:: @ 8268FB2 - setvar VAR_0x8004, 12 + setvar VAR_0x8004, TRAINER_HILL_FUNC_12 special CallTrainerHillFunction lock faceplayer - setvar VAR_0x8004, 1 + setvar VAR_0x8004, TRAINER_HILL_FUNC_1 special CallTrainerHillFunction switch VAR_RESULT case 0, TrainerHill_Roof_EventScript_268FEA @@ -19,7 +19,7 @@ TrainerHill_Roof_EventScript_268FEA:: @ 8268FEA msgbox TrainerHill_Roof_Text_268986, MSGBOX_DEFAULT TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, TRAINER_HILL_FUNC_2 special CallTrainerHillFunction switch VAR_RESULT case 0, TrainerHill_Roof_EventScript_269020 @@ -41,7 +41,7 @@ TrainerHill_Roof_EventScript_269037:: @ 8269037 goto TrainerHill_Roof_EventScript_269054 TrainerHill_Roof_EventScript_269054:: @ 8269054 - setvar VAR_0x8004, 3 + setvar VAR_0x8004, TRAINER_HILL_FUNC_3 special CallTrainerHillFunction switch VAR_RESULT case 0, TrainerHill_Roof_EventScript_269082 diff --git a/include/constants/trainer_hill.h b/include/constants/trainer_hill.h new file mode 100644 index 0000000000..01bbd44a50 --- /dev/null +++ b/include/constants/trainer_hill.h @@ -0,0 +1,23 @@ +#ifndef GUARD_CONSTANTS_TRAINER_HILL_H +#define GUARD_CONSTANTS_TRAINER_HILL_H + +#define TRAINER_HILL_FUNC_0 0 +#define TRAINER_HILL_FUNC_1 1 +#define TRAINER_HILL_FUNC_2 2 +#define TRAINER_HILL_FUNC_3 3 +#define TRAINER_HILL_FUNC_4 4 +#define TRAINER_HILL_FUNC_5 5 +#define TRAINER_HILL_FUNC_6 6 +#define TRAINER_HILL_FUNC_7 7 +#define TRAINER_HILL_FUNC_8 8 +#define TRAINER_HILL_FUNC_9 9 +#define TRAINER_HILL_FUNC_10 10 +#define TRAINER_HILL_FUNC_11 11 +#define TRAINER_HILL_FUNC_12 12 +#define TRAINER_HILL_FUNC_13 13 +#define TRAINER_HILL_FUNC_14 14 +#define TRAINER_HILL_FUNC_15 15 +#define TRAINER_HILL_FUNC_16 16 +#define TRAINER_HILL_FUNC_17 17 + +#endif \ No newline at end of file diff --git a/include/global.h b/include/global.h index ee0ba68931..16f67339b1 100644 --- a/include/global.h +++ b/include/global.h @@ -795,14 +795,14 @@ struct TrainerNameRecord struct SaveTrainerHill { - /*0x3D64*/ u32 field_3D64; + /*0x3D64*/ u32 timer; /*0x3D68*/ u32 field_3D68; /*0x3D6C*/ u8 field_3D6C; /*0x3D6D*/ u8 unused; /*0x3D6E*/ u16 field_3D6E_0a:1; // 1 /*0x3D6E*/ u16 field_3D6E_0b:1; // 2 /*0x3D6E*/ u16 field_3D6E_0c:1; // 4 - /*0x3D6E*/ u16 field_3D6E_0d:1; // 8 + /*0x3D6E*/ u16 hasLost:1; // 8 /*0x3D6E*/ u16 field_3D6E_0e:1; // x10 /*0x3D6E*/ u16 field_3D6E_0f:1; // x20 /*0x3D6E*/ u16 tag:2; // x40, x80 = xC0 diff --git a/include/main.h b/include/main.h index 728064288a..014b4942e2 100644 --- a/include/main.h +++ b/include/main.h @@ -61,8 +61,8 @@ void SetHBlankCallback(IntrCallback callback); void SetVCountCallback(IntrCallback callback); void SetSerialCallback(IntrCallback callback); void InitFlashTimer(void); -void sub_80008DC(u32 *var); -void sub_80008E8(void); +void SetVBlankCounterPointer(u32 *var); +void ClearVBlankCounterPointer(void); void DoSoftReset(void); void ClearPokemonCrySongs(void); void RestoreSerialTimer3IntrHandlers(void); diff --git a/include/trainer_hill.h b/include/trainer_hill.h index bbc4f45c5c..35b0c5d6d3 100644 --- a/include/trainer_hill.h +++ b/include/trainer_hill.h @@ -1,7 +1,7 @@ #ifndef GUARD_TRAINER_HILL_H #define GUARD_TRAINER_HILL_H -extern u32 *gUnknown_0203CF5C; +extern u32 *gVBlankCounterPointer; void CallTrainerHillFunction(void); void ResetTrainerHillResults(void); diff --git a/src/load_save.c b/src/load_save.c index 0d19c6dae2..d71e72802b 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -99,7 +99,7 @@ void MoveSaveBlocks_ResetHeap(void) hblankCB = gMain.hblankCallback; gMain.vblankCallback = NULL; gMain.hblankCallback = NULL; - gUnknown_0203CF5C = NULL; + gVBlankCounterPointer = NULL; saveBlock2Copy = (struct SaveBlock2 *)(gHeap); saveBlock1Copy = (struct SaveBlock1 *)(gHeap + sizeof(struct SaveBlock2)); diff --git a/src/main.c b/src/main.c index 61c5e33865..3e282775de 100644 --- a/src/main.c +++ b/src/main.c @@ -163,7 +163,7 @@ static void UpdateLinkAndCallCallbacks(void) static void InitMainCallbacks(void) { gMain.vblankCounter1 = 0; - gUnknown_0203CF5C = NULL; + gVBlankCounterPointer = NULL; gMain.vblankCounter2 = 0; gMain.callback1 = NULL; SetMainCallback2(CB2_InitCopyrightScreenAfterBootup); @@ -324,8 +324,8 @@ static void VBlankIntr(void) gMain.vblankCounter1++; - if (gUnknown_0203CF5C && *gUnknown_0203CF5C < 0xFFFFFFFF) - (*gUnknown_0203CF5C)++; + if (gVBlankCounterPointer && *gVBlankCounterPointer < 0xFFFFFFFF) + (*gVBlankCounterPointer)++; if (gMain.vblankCallback) gMain.vblankCallback(); @@ -393,14 +393,14 @@ static void WaitForVBlank(void) ; } -void sub_80008DC(u32 *var) +void SetVBlankCounterPointer(u32 *var) { - gUnknown_0203CF5C = var; + gVBlankCounterPointer = var; } -void sub_80008E8(void) +void ClearVBlankCounterPointer(void) { - gUnknown_0203CF5C = NULL; + gVBlankCounterPointer = NULL; } void DoSoftReset(void) diff --git a/src/save.c b/src/save.c index a22e20f0b2..593ee8f2c8 100644 --- a/src/save.c +++ b/src/save.c @@ -659,10 +659,10 @@ static void UpdateSaveAddresses(void) u8 HandleSavingData(u8 saveType) { u8 i; - u32 *backupVar = gUnknown_0203CF5C; + u32 *backupVar = gVBlankCounterPointer; u8 *tempAddr; - gUnknown_0203CF5C = NULL; + gVBlankCounterPointer = NULL; UpdateSaveAddresses(); switch (saveType) { @@ -705,7 +705,7 @@ u8 HandleSavingData(u8 saveType) save_write_to_flash(0xFFFF, gRamSaveSectionLocations); break; } - gUnknown_0203CF5C = backupVar; + gVBlankCounterPointer = backupVar; return 0; } diff --git a/src/trainer_hill.c b/src/trainer_hill.c index 42b196abd7..60f67c91d3 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -92,15 +92,15 @@ struct TrHillStruct2 // EWRAM static EWRAM_DATA struct TrHillStruct2 *sHillData = NULL; static EWRAM_DATA struct TrHillRoomTrainers *sRoomTrainers = NULL; -EWRAM_DATA u32 *gUnknown_0203CF5C = NULL; +EWRAM_DATA u32 *gVBlankCounterPointer = NULL; // This file's functions. -static void sub_81D581C(void); +static void TrainerHillStartChallenge(void); static void sub_81D58D8(void); static void sub_81D5924(void); static void sub_81D59D0(void); -static void sub_81D5A70(void); -static void sub_81D5AB4(void); +static void TrainerHillResumeTimer(void); +static void TrainerHillSetPlayerLost(void); static void sub_81D5AD0(void); static void sub_81D5B2C(void); static void sub_81D5BBC(void); @@ -263,12 +263,12 @@ static const u8 *const sFloorStrings[] = static void (* const sHillFunctions[])(void) = { - sub_81D581C, + TrainerHillStartChallenge, sub_81D58D8, sub_81D5924, sub_81D59D0, - sub_81D5A70, - sub_81D5AB4, + TrainerHillResumeTimer, + TrainerHillSetPlayerLost, sub_81D5AD0, sub_81D5B2C, sub_81D5BBC, @@ -371,7 +371,7 @@ void InitTrainerHillBattleStruct(void) } sRoomTrainers->facilityClass[i] = sHillData->tag.floors[sHillData->floorId].trainers[i].facilityClass; } - sub_80008DC(&gSaveBlock1Ptr->trainerHill.field_3D64); + SetVBlankCounterPointer(&gSaveBlock1Ptr->trainerHill.timer); FreeDataStruct(); } @@ -425,7 +425,7 @@ void CopyTrainerHillTrainerText(u8 which, u16 trainerId) FreeDataStruct(); } -static void sub_81D581C(void) +static void TrainerHillStartChallenge(void) { nullsub_2(); if (!sub_81D3B34()) @@ -434,8 +434,8 @@ static void sub_81D581C(void) gSaveBlock1Ptr->trainerHill.field_3D6E_0f = 0; gSaveBlock1Ptr->trainerHill.field_3D6C = 0; - sub_80008DC(&gSaveBlock1Ptr->trainerHill.field_3D64); - gSaveBlock1Ptr->trainerHill.field_3D64 = 0; + SetVBlankCounterPointer(&gSaveBlock1Ptr->trainerHill.timer); + gSaveBlock1Ptr->trainerHill.timer = 0; gSaveBlock1Ptr->trainerHill.field_3D6E_0c = 0; gSaveBlock1Ptr->trainerHill.field_3D6E_0b = 0; gSaveBlock1Ptr->trainerHill.field_3D6E_0e = 0; @@ -446,7 +446,7 @@ static void sub_81D581C(void) static void sub_81D58D8(void) { - sub_80008E8(); + ClearVBlankCounterPointer(); gSpecialVar_Result = 0; if (gSaveBlock1Ptr->trainerHill.field_3D6E_0c) gSpecialVar_Result++; @@ -483,9 +483,9 @@ static void sub_81D59D0(void) { gSpecialVar_Result = 2; } - else if (GetTimerValue(&gSaveBlock1Ptr->trainerHill.field_3D68) > gSaveBlock1Ptr->trainerHill.field_3D64) + else if (GetTimerValue(&gSaveBlock1Ptr->trainerHill.field_3D68) > gSaveBlock1Ptr->trainerHill.timer) { - SetTimerValue(&gSaveBlock1Ptr->trainerHill.field_3D68, gSaveBlock1Ptr->trainerHill.field_3D64); + SetTimerValue(&gSaveBlock1Ptr->trainerHill.field_3D68, gSaveBlock1Ptr->trainerHill.timer); gSaveBlock1Ptr->trainerHillTimes[gSaveBlock1Ptr->trainerHill.tag] = gSaveBlock1Ptr->trainerHill.field_3D68; gSpecialVar_Result = 0; } @@ -497,27 +497,27 @@ static void sub_81D59D0(void) gSaveBlock1Ptr->trainerHill.field_3D6E_0b = 1; } -static void sub_81D5A70(void) +static void TrainerHillResumeTimer(void) { if (!gSaveBlock1Ptr->trainerHill.field_3D6E_0c) { - if (gSaveBlock1Ptr->trainerHill.field_3D64 >= HILL_MAX_TIME) - gSaveBlock1Ptr->trainerHill.field_3D64 = HILL_MAX_TIME; + if (gSaveBlock1Ptr->trainerHill.timer >= HILL_MAX_TIME) + gSaveBlock1Ptr->trainerHill.timer = HILL_MAX_TIME; else - sub_80008DC(&gSaveBlock1Ptr->trainerHill.field_3D64); + SetVBlankCounterPointer(&gSaveBlock1Ptr->trainerHill.timer); } } -static void sub_81D5AB4(void) +static void TrainerHillSetPlayerLost(void) { - gSaveBlock1Ptr->trainerHill.field_3D6E_0d = 1; + gSaveBlock1Ptr->trainerHill.hasLost = 1; } static void sub_81D5AD0(void) { - if (gSaveBlock1Ptr->trainerHill.field_3D6E_0d) + if (gSaveBlock1Ptr->trainerHill.hasLost) { - gSaveBlock1Ptr->trainerHill.field_3D6E_0d = 0; + gSaveBlock1Ptr->trainerHill.hasLost = 0; gSpecialVar_Result = 0; } else if (gSaveBlock1Ptr->trainerHill.field_3D6E_0e) @@ -535,7 +535,7 @@ static void sub_81D5B2C(void) { s32 total, minutes, secondsWhole, secondsFraction; - total = gSaveBlock1Ptr->trainerHill.field_3D64; + total = gSaveBlock1Ptr->trainerHill.timer; if (total >= HILL_MAX_TIME) total = HILL_MAX_TIME; @@ -1048,7 +1048,7 @@ bool32 sub_81D6534(void) static void sub_81D6568(void) { - if (gSaveBlock1Ptr->trainerHill.field_3D6E_0d) + if (gSaveBlock1Ptr->trainerHill.hasLost) gSpecialVar_Result = 0; else gSpecialVar_Result = 1; @@ -1103,7 +1103,7 @@ static u16 sub_81D6640(void) i = (i + 1) % 10; ptr = gUnknown_0862A5CC[var2][i]; - minutes = (signed)(gSaveBlock1Ptr->trainerHill.field_3D64) / (60 * 60); + minutes = (signed)(gSaveBlock1Ptr->trainerHill.timer) / (60 * 60); if (minutes < 12) id = 0; else if (minutes < 13) From 782979f1fc37c358a5c675a1c42afae9b0027805 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 27 Feb 2019 22:16:01 -0500 Subject: [PATCH 136/217] Finish documenting trainer hill Trainer hill isn't anywhere close to done, but I figured out enough to name the VAR. That's all this PR should do. --- data/event_scripts.s | 11 +++--- data/maps/Route111/scripts.inc | 2 +- data/maps/TrainerHill_Entrance/map.json | 2 +- data/maps/TrainerHill_Entrance/scripts.inc | 18 +++++----- include/constants/trainer_hill.h | 16 ++++++--- include/constants/vars.h | 2 +- include/global.h | 4 +-- src/trainer_hill.c | 40 ++++++++++++---------- 8 files changed, 53 insertions(+), 42 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 2744824ec0..364aae31c9 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -17,6 +17,7 @@ #include "constants/vars.h" #include "constants/weather.h" #include "constants/trainer_hill.h" +#include "constants/battle.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" @@ -6926,16 +6927,16 @@ TrainerHill_3F_MapScript1_2C8336: @ 82C8336 TrainerHill_4F_MapScript1_2C8336: @ 82C8336 TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, TRAINER_HILL_FUNC_4 + setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER special CallTrainerHillFunction setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 special CallFrontierUtilFunc - compare VAR_RESULT, 2 + compare VAR_RESULT, B_OUTCOME_LOST goto_if_eq TrainerHill_1F_EventScript_2C83C9 - compare VAR_RESULT, 3 + compare VAR_RESULT, B_OUTCOME_DREW goto_if_eq TrainerHill_1F_EventScript_2C83C9 - compare VAR_RESULT, 9 + compare VAR_RESULT, B_OUTCOME_FORFEITED goto_if_eq TrainerHill_1F_EventScript_2C83C9 end @@ -6981,7 +6982,7 @@ TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9 setvar VAR_0x8004, TRAINER_HILL_FUNC_12 special CallTrainerHillFunction - setvar VAR_0x8004, TRAINER_HILL_FUNC_5 + setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST special CallTrainerHillFunction setvar VAR_TEMP_1, 1 end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 4c8fce8b61..3755ee5e48 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -38,7 +38,7 @@ Route111_EventScript_1F0CE4:: @ 81F0CE4 return Route111_MapScript1_1F0D87: @ 81F0D87 - setvar VAR_0x40D6, 0 + setvar VAR_TRAINER_HILL_IS_ACTIVE, 0 special SetMirageTowerVisibility call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F0E3C compare VAR_ROUTE_111_STATE, 1 diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json index 4b12b1c80b..42f1daa9db 100644 --- a/data/maps/TrainerHill_Entrance/map.json +++ b/data/maps/TrainerHill_Entrance/map.json @@ -109,7 +109,7 @@ "x": 9, "y": 6, "elevation": 3, - "var": "VAR_0x40D6", + "var": "VAR_TRAINER_HILL_IS_ACTIVE", "var_value": "0", "script": "TrainerHill_Entrance_EventScript_268229" } diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index a07c4069a2..63e067a9a1 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -15,7 +15,7 @@ TrainerHill_Entrance_MapScript1_2680CF: @ 82680CF end TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0 - setvar VAR_0x8004, TRAINER_HILL_FUNC_4 + setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER special CallTrainerHillFunction setvar VAR_TEMP_0, 0 setvar VAR_0x8004, TRAINER_HILL_FUNC_9 @@ -74,12 +74,12 @@ TrainerHill_Entrance_EventScript_268160:: @ 8268160 TrainerHill_Entrance_EventScript_268182:: @ 8268182 setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, TRAINER_HILL_FUNC_6 + setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_CHALLENGE_STATUS special CallTrainerHillFunction switch VAR_RESULT - case 0, TrainerHill_Entrance_EventScript_2681B5 - case 1, TrainerHill_Entrance_EventScript_2681CA - case 2, TrainerHill_Entrance_EventScript_2681EE + case TRAINER_HILL_PLAYER_STATUS_LOST, TrainerHill_Entrance_EventScript_2681B5 + case TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED, TrainerHill_Entrance_EventScript_2681CA + case TRAINER_HILL_PLAYER_STATUS_NORMAL, TrainerHill_Entrance_EventScript_2681EE TrainerHill_Entrance_EventScript_2681B5:: @ 82681B5 lockall @@ -96,7 +96,7 @@ TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA closemessage applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268381 waitmovement 0 - setvar VAR_0x40D6, 0 + setvar VAR_TRAINER_HILL_IS_ACTIVE, 0 special HealPlayerParty releaseall @@ -168,14 +168,14 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8 switch VAR_RESULT case 4, TrainerHill_Entrance_EventScript_268314 case 127, TrainerHill_Entrance_EventScript_268314 - setvar VAR_0x8004, TRAINER_HILL_FUNC_17 + setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_TAG copyvar VAR_0x8005, VAR_RESULT special CallTrainerHillFunction - setvar VAR_0x40D6, 1 + setvar VAR_TRAINER_HILL_IS_ACTIVE, 1 setvar VAR_TEMP_5, 0 special HealPlayerParty msgbox TrainerHill_Entrance_Text_26862A, MSGBOX_DEFAULT - setvar VAR_0x8004, TRAINER_HILL_FUNC_0 + setvar VAR_0x8004, TRAINER_HILL_FUNC_START special CallTrainerHillFunction releaseall end diff --git a/include/constants/trainer_hill.h b/include/constants/trainer_hill.h index 01bbd44a50..e231a60430 100644 --- a/include/constants/trainer_hill.h +++ b/include/constants/trainer_hill.h @@ -1,13 +1,13 @@ #ifndef GUARD_CONSTANTS_TRAINER_HILL_H #define GUARD_CONSTANTS_TRAINER_HILL_H -#define TRAINER_HILL_FUNC_0 0 +#define TRAINER_HILL_FUNC_START 0 #define TRAINER_HILL_FUNC_1 1 #define TRAINER_HILL_FUNC_2 2 #define TRAINER_HILL_FUNC_3 3 -#define TRAINER_HILL_FUNC_4 4 -#define TRAINER_HILL_FUNC_5 5 -#define TRAINER_HILL_FUNC_6 6 +#define TRAINER_HILL_FUNC_RESUME_TIMER 4 +#define TRAINER_HILL_FUNC_SET_LOST 5 +#define TRAINER_HILL_FUNC_GET_CHALLENGE_STATUS 6 #define TRAINER_HILL_FUNC_7 7 #define TRAINER_HILL_FUNC_8 8 #define TRAINER_HILL_FUNC_9 9 @@ -18,6 +18,12 @@ #define TRAINER_HILL_FUNC_14 14 #define TRAINER_HILL_FUNC_15 15 #define TRAINER_HILL_FUNC_16 16 -#define TRAINER_HILL_FUNC_17 17 +#define TRAINER_HILL_FUNC_SET_TAG 17 + +// Values returned by the TrainerHillGetChallengeStatus +// function. +#define TRAINER_HILL_PLAYER_STATUS_LOST 0 +#define TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED 1 +#define TRAINER_HILL_PLAYER_STATUS_NORMAL 2 #endif \ No newline at end of file diff --git a/include/constants/vars.h b/include/constants/vars.h index 199f714b18..59489f051e 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -230,7 +230,7 @@ #define VAR_0x40D3 0x40D3 #define VAR_SS_TIDAL_SCOTT_STATE 0x40D4 // Always equal to FLAG_MET_SCOTT_ON_SS_TIDAL #define VAR_ROAMER_POKEMON 0x40D5 // 0 = Latias, 1 = Latios -#define VAR_0x40D6 0x40D6 +#define VAR_TRAINER_HILL_IS_ACTIVE 0x40D6 #define VAR_0x40D7 0x40D7 #define VAR_0x40D8 0x40D8 #define VAR_0x40D9 0x40D9 diff --git a/include/global.h b/include/global.h index 16f67339b1..17e91862f9 100644 --- a/include/global.h +++ b/include/global.h @@ -796,14 +796,14 @@ struct TrainerNameRecord struct SaveTrainerHill { /*0x3D64*/ u32 timer; - /*0x3D68*/ u32 field_3D68; + /*0x3D68*/ u32 bestTime; /*0x3D6C*/ u8 field_3D6C; /*0x3D6D*/ u8 unused; /*0x3D6E*/ u16 field_3D6E_0a:1; // 1 /*0x3D6E*/ u16 field_3D6E_0b:1; // 2 /*0x3D6E*/ u16 field_3D6E_0c:1; // 4 /*0x3D6E*/ u16 hasLost:1; // 8 - /*0x3D6E*/ u16 field_3D6E_0e:1; // x10 + /*0x3D6E*/ u16 maybeECardScanDuringChallenge:1; // x10 /*0x3D6E*/ u16 field_3D6E_0f:1; // x20 /*0x3D6E*/ u16 tag:2; // x40, x80 = xC0 }; diff --git a/src/trainer_hill.c b/src/trainer_hill.c index 60f67c91d3..ee7e2287a1 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -30,6 +30,7 @@ #include "constants/species.h" #include "constants/trainers.h" #include "constants/easy_chat.h" +#include "constants/trainer_hill.h" extern bool32 sub_81D3B34(void); @@ -101,7 +102,7 @@ static void sub_81D5924(void); static void sub_81D59D0(void); static void TrainerHillResumeTimer(void); static void TrainerHillSetPlayerLost(void); -static void sub_81D5AD0(void); +static void TrainerHillGetChallengeStatus(void); static void sub_81D5B2C(void); static void sub_81D5BBC(void); static void sub_81D5C00(void); @@ -112,7 +113,7 @@ static void sub_81D64DC(void); static void sub_81D64FC(void); static void sub_81D6518(void); static void sub_81D6568(void); -static void sub_81D65A0(void); +static void TrainerHillSetTag(void); static void SetUpDataStruct(void); static void FreeDataStruct(void); static void nullsub_2(void); @@ -269,7 +270,7 @@ static void (* const sHillFunctions[])(void) = sub_81D59D0, TrainerHillResumeTimer, TrainerHillSetPlayerLost, - sub_81D5AD0, + TrainerHillGetChallengeStatus, sub_81D5B2C, sub_81D5BBC, sub_81D5C00, @@ -280,7 +281,7 @@ static void (* const sHillFunctions[])(void) = sub_81D64FC, sub_81D6518, sub_81D6568, - sub_81D65A0, + TrainerHillSetTag, }; static const u8 *const sTagMatchStrings[] = @@ -318,7 +319,7 @@ void ResetTrainerHillResults(void) gSaveBlock2Ptr->frontier.field_EF9_1 = 0; gSaveBlock2Ptr->frontier.field_EF9_0 = 0; - gSaveBlock1Ptr->trainerHill.field_3D68 = 0; + gSaveBlock1Ptr->trainerHill.bestTime = 0; for (i = 0; i < 4; i++) SetTimerValue(&gSaveBlock1Ptr->trainerHillTimes[i], HILL_MAX_TIME); } @@ -438,7 +439,7 @@ static void TrainerHillStartChallenge(void) gSaveBlock1Ptr->trainerHill.timer = 0; gSaveBlock1Ptr->trainerHill.field_3D6E_0c = 0; gSaveBlock1Ptr->trainerHill.field_3D6E_0b = 0; - gSaveBlock1Ptr->trainerHill.field_3D6E_0e = 0; + gSaveBlock1Ptr->trainerHill.maybeECardScanDuringChallenge = 0; gSaveBlock2Ptr->frontier.field_EE0 = 0; gBattleOutcome = 0; gSaveBlock1Ptr->trainerHill.field_3D6E_0a = 0; @@ -483,10 +484,10 @@ static void sub_81D59D0(void) { gSpecialVar_Result = 2; } - else if (GetTimerValue(&gSaveBlock1Ptr->trainerHill.field_3D68) > gSaveBlock1Ptr->trainerHill.timer) + else if (GetTimerValue(&gSaveBlock1Ptr->trainerHill.bestTime) > gSaveBlock1Ptr->trainerHill.timer) { - SetTimerValue(&gSaveBlock1Ptr->trainerHill.field_3D68, gSaveBlock1Ptr->trainerHill.timer); - gSaveBlock1Ptr->trainerHillTimes[gSaveBlock1Ptr->trainerHill.tag] = gSaveBlock1Ptr->trainerHill.field_3D68; + SetTimerValue(&gSaveBlock1Ptr->trainerHill.bestTime, gSaveBlock1Ptr->trainerHill.timer); + gSaveBlock1Ptr->trainerHillTimes[gSaveBlock1Ptr->trainerHill.tag] = gSaveBlock1Ptr->trainerHill.bestTime; gSpecialVar_Result = 0; } else @@ -513,21 +514,24 @@ static void TrainerHillSetPlayerLost(void) gSaveBlock1Ptr->trainerHill.hasLost = 1; } -static void sub_81D5AD0(void) +static void TrainerHillGetChallengeStatus(void) { if (gSaveBlock1Ptr->trainerHill.hasLost) { + // The player lost their last match. gSaveBlock1Ptr->trainerHill.hasLost = 0; - gSpecialVar_Result = 0; + gSpecialVar_Result = TRAINER_HILL_PLAYER_STATUS_LOST; } - else if (gSaveBlock1Ptr->trainerHill.field_3D6E_0e) + else if (gSaveBlock1Ptr->trainerHill.maybeECardScanDuringChallenge) { - gSaveBlock1Ptr->trainerHill.field_3D6E_0e = 0; - gSpecialVar_Result = 1; + // Unreachable code. Something relating to eCards? + gSaveBlock1Ptr->trainerHill.maybeECardScanDuringChallenge = 0; + gSpecialVar_Result = TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED; } else { - gSpecialVar_Result = 2; + // Continue playing. + gSpecialVar_Result = TRAINER_HILL_PLAYER_STATUS_NORMAL; } } @@ -575,7 +579,7 @@ static void sub_81D5C00(void) bool8 sub_81D5C18(void) { - if (VarGet(VAR_0x40D6) == 0) + if (VarGet(VAR_TRAINER_HILL_IS_ACTIVE) == 0) return FALSE; else if (gSaveBlock1Ptr->trainerHill.field_3D6E_0c) return FALSE; @@ -1054,10 +1058,10 @@ static void sub_81D6568(void) gSpecialVar_Result = 1; } -static void sub_81D65A0(void) +static void TrainerHillSetTag(void) { gSaveBlock1Ptr->trainerHill.tag = gSpecialVar_0x8005; - gSaveBlock1Ptr->trainerHill.field_3D68 = gSaveBlock1Ptr->trainerHillTimes[gSpecialVar_0x8005]; + gSaveBlock1Ptr->trainerHill.bestTime = gSaveBlock1Ptr->trainerHillTimes[gSpecialVar_0x8005]; } static u8 sub_81D65E8(u8 arg0) From bf45b83c65026a84425e3bc1f99e269653ed8c8b Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 27 Feb 2019 23:54:51 -0500 Subject: [PATCH 137/217] Finish documenting event vars --- data/event_scripts.s | 2 +- data/maps/DewfordTown_Gym/scripts.inc | 2 +- data/maps/FortreeCity_Gym/scripts.inc | 2 +- .../scripts.inc | 2 +- data/maps/MauvilleCity/scripts.inc | 2 +- data/maps/Route124/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/SeafloorCavern_Entrance/scripts.inc | 4 +- data/maps/SkyPillar_Top/map.json | 2 +- data/maps/SkyPillar_Top/scripts.inc | 2 +- data/maps/SootopolisCity/scripts.inc | 10 +- include/constants/map_types.h | 6 +- include/constants/vars.h | 28 ++-- include/event_data.h | 2 +- include/field_specials.h | 10 +- include/overworld.h | 2 +- src/battle_setup.c | 2 +- src/event_data.c | 8 +- src/field_control_avatar.c | 10 +- src/field_effect.c | 2 +- src/field_specials.c | 34 ++--- src/fldeff_misc.c | 10 +- src/item.c | 4 +- src/overworld.c | 12 +- src/region_map.c | 4 +- src/secret_base.c | 144 +++++++++--------- src/time_events.c | 2 +- src/tv.c | 26 ++-- 37 files changed, 178 insertions(+), 178 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 364aae31c9..d2828d5ea7 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -48,7 +48,7 @@ gSpecialVars:: @ 81DBA0C .4byte gSpecialVar_ContestCategory .4byte gSpecialVar_MonBoxId .4byte gSpecialVar_MonBoxPos - .4byte gSpecialVar_0x8014 + .4byte gSpecialVar_Unused_0x8014 .4byte gTrainerBattleOpponent_A .include "data/specials.inc" diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 3b39fc5d0e..eb81835856 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -187,7 +187,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 closemessage delay 30 setflag FLAG_ENABLE_BRAWLY_MATCH_CALL - setvar VAR_0x40F4, 0 + setvar VAR_ROXANNE_CALL_STEP_COUNTER, 0 setflag FLAG_ENABLE_ROXANNE_FIRST_CALL release end diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 30cf8736a3..8192e20393 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -43,7 +43,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD closemessage delay 30 setflag FLAG_ENABLE_WINONA_MATCH_CALL - setvar VAR_0x40F3, 0 + setvar VAR_WINONA_CALL_STEP_COUNTER, 0 setflag FLAG_REGISTER_WINONA_POKENAV release end diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 51ace147dc..c02381982f 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -195,7 +195,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL setvar VAR_0x40D3, 2 - setvar VAR_0x40F5, 0 + setvar VAR_SCOTT_CALL_STEP_COUNTER, 0 setflag FLAG_SCOTT_CALL_NATIONAL_DEX releaseall end diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 62c2219ea0..61839d1082 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -158,7 +158,7 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE setflag FLAG_DEFEATED_WALLY_MAUVILLE - setvar VAR_0x40F2, 0 + setvar VAR_WALLY_CALL_STEP_COUNTER, 0 setflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL compare VAR_FACING, 2 call_if_eq MauvilleCity_EventScript_1DF5F3 diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index 7169a02998..c1a22a2d06 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_124", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index 8071cf2449..0ce520fdde 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_125", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index 1e886a083c..ea63eb80dd 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_126", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index 1b30f7d55f..e4a68c3e19 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_127", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index 826290ff3b..58246c247e 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_128", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index b3e45b2278..3183f98210 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_129", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json index 0a68d442c5..18d168b17c 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_130", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json index 3a48042f9e..379b15b3d3 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_131", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json index ae04ff62dd..15c0de83d8 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_132", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index 2a8941e12e..eed30d7ee3 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_133", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json index 1e9123efeb..8b3a9518e9 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_134", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index 045c0e0652..1bf5705495 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -9,7 +9,7 @@ SeafloorCavern_Entrance_MapScript1_234474: @ 8234474 SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 lockall - compare VAR_0x40D9, 1 + compare VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1 goto_if_eq SeafloorCavern_Entrance_EventScript_2344ED waitse playse SE_PIN @@ -25,7 +25,7 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 compare VAR_FACING, 2 call_if_eq SeafloorCavern_Entrance_EventScript_234539 delay 30 - setvar VAR_0x40D9, 1 + setvar VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1 moveobjectoffscreen 1 msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index 5cb6a1a693..2d1a6fa1a3 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -56,7 +56,7 @@ "x": 14, "y": 9, "elevation": 3, - "var": "VAR_0x40D7", + "var": "VAR_SKY_PILLAR_RAQUAZA_CRY_DONE", "var_value": "0", "script": "SkyPillar_Top_EventScript_23979A" } diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 5a69001a15..d08b0b5545 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -132,7 +132,7 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A special RemoveCameraObject setvar VAR_RAYQUAZA_STATE, 5 setvar VAR_SKY_PILLAR_STATE, 1 - setvar VAR_0x40D7, 1 + setvar VAR_SKY_PILLAR_RAQUAZA_CRY_DONE, 1 releaseall end diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 9b5524a36f..dbfe923f03 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -140,11 +140,11 @@ SootopolisCity_EventScript_1E5871:: @ 81E5871 setobjectxyperm 7, 29, 33 setobjectxyperm 16, 33, 35 setobjectxyperm 17, 34, 35 - compare VAR_0x40D8, 0 + compare VAR_SOOTOPOLIS_STATE, 0 call_if_eq SootopolisCity_EventScript_1E58AF - compare VAR_0x40D8, 1 + compare VAR_SOOTOPOLIS_STATE, 1 call_if_eq SootopolisCity_EventScript_1E58BB - compare VAR_0x40D8, 2 + compare VAR_SOOTOPOLIS_STATE, 2 call_if_eq SootopolisCity_EventScript_1E58C7 return @@ -1367,14 +1367,14 @@ SootopolisCity_EventScript_1E64B2:: @ 81E64B2 applymovement 18, SootopolisCity_Movement_1E64EC waitmovement 0 moveobjectoffscreen 18 - setvar VAR_0x40D8, 1 + setvar VAR_SOOTOPOLIS_STATE, 1 return SootopolisCity_EventScript_1E64C5:: @ 81E64C5 applymovement 18, SootopolisCity_Movement_1E64EF waitmovement 0 moveobjectoffscreen 18 - setvar VAR_0x40D8, 2 + setvar VAR_SOOTOPOLIS_STATE, 2 return SootopolisCity_EventScript_1E64D8:: @ 81E64D8 diff --git a/include/constants/map_types.h b/include/constants/map_types.h index 504575859e..8d071fd41d 100755 --- a/include/constants/map_types.h +++ b/include/constants/map_types.h @@ -1,14 +1,14 @@ #ifndef GUARD_CONSTANTS_MAP_TYPES_H #define GUARD_CONSTANTS_MAP_TYPES_H -#define MAP_TYPE_0 0 +#define MAP_TYPE_UNUSED_1 0 #define MAP_TYPE_TOWN 1 #define MAP_TYPE_CITY 2 #define MAP_TYPE_ROUTE 3 #define MAP_TYPE_UNDERGROUND 4 #define MAP_TYPE_UNDERWATER 5 -#define MAP_TYPE_6 6 -#define MAP_TYPE_7 7 +#define MAP_TYPE_OCEAN_ROUTE 6 +#define MAP_TYPE_UNUSED_2 7 #define MAP_TYPE_INDOOR 8 #define MAP_TYPE_SECRET_BASE 9 diff --git a/include/constants/vars.h b/include/constants/vars.h index 59489f051e..99d1813da5 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -231,9 +231,9 @@ #define VAR_SS_TIDAL_SCOTT_STATE 0x40D4 // Always equal to FLAG_MET_SCOTT_ON_SS_TIDAL #define VAR_ROAMER_POKEMON 0x40D5 // 0 = Latias, 1 = Latios #define VAR_TRAINER_HILL_IS_ACTIVE 0x40D6 -#define VAR_0x40D7 0x40D7 -#define VAR_0x40D8 0x40D8 -#define VAR_0x40D9 0x40D9 +#define VAR_SKY_PILLAR_RAQUAZA_CRY_DONE 0x40D7 +#define VAR_SOOTOPOLIS_STATE 0x40D8 +#define VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT 0x40D9 #define VAR_0x40DA 0x40DA #define VAR_UNUSED_0x40DB 0x40DB // Unused Var #define VAR_UNUSED_0x40DC 0x40DC // Unused Var @@ -252,17 +252,17 @@ #define VAR_DAILY_PLANTED_BERRIES 0x40E9 #define VAR_DAILY_PICKED_BERRIES 0x40EA #define VAR_DAILY_ROULETTE 0x40EB -#define VAR_0x40EC 0x40EC -#define VAR_0x40ED 0x40ED -#define VAR_0x40EE 0x40EE -#define VAR_0x40EF 0x40EF -#define VAR_0x40F0 0x40F0 +#define VAR_SECRET_BASE_STEP_COUNTER 0x40EC // Used by Secret Base TV programs +#define VAR_SECRET_BASE_LAST_ITEM_USED 0x40ED // Used by Secret Base TV programs +#define VAR_SECRET_BASE_LOW_TV_FLAGS 0x40EE // Used by Secret Base TV programs +#define VAR_SECRET_BASE_HIGH_TV_FLAGS 0x40EF // Used by Secret Base TV programs +#define VAR_SECRET_BASE_IS_NOT_LOCAL 0x40F0 // Set to TRUE while in another player's secret base. #define VAR_DAILY_BP 0x40F1 -#define VAR_0x40F2 0x40F2 -#define VAR_0x40F3 0x40F3 -#define VAR_0x40F4 0x40F4 -#define VAR_0x40F5 0x40F5 -#define VAR_0x40F6 0x40F6 +#define VAR_WALLY_CALL_STEP_COUNTER 0x40F2 +#define VAR_WINONA_CALL_STEP_COUNTER 0x40F3 +#define VAR_ROXANNE_CALL_STEP_COUNTER 0x40F4 +#define VAR_SCOTT_CALL_STEP_COUNTER 0x40F5 +#define VAR_RIVAL_RAYQUAZA_CALL_STEP_COUNTER 0x40F6 #define VAR_UNUSED_0x40F7 0x40F7 // Unused Var #define VAR_UNUSED_0x40F8 0x40F8 // Unused Var #define VAR_UNUSED_0x40F9 0x40F9 // Unused Var @@ -296,7 +296,7 @@ #define VAR_CONTEST_CATEGORY 0x8011 #define VAR_MON_BOX_ID 0x8012 #define VAR_MON_BOX_POS 0x8013 -#define VAR_0x8014 0x8014 +#define VAR_UNUSED_0x8014 0x8014 #define VAR_NEVER_READ_0x8015 0x8015 // Written to, but never read #endif // GUARD_CONSTANTS_VARS_H diff --git a/include/event_data.h b/include/event_data.h index 3b8e2701f3..11289c1ab8 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -47,6 +47,6 @@ extern u16 gSpecialVar_LastTalked; extern u16 gSpecialVar_Facing; extern u16 gSpecialVar_MonBoxId; extern u16 gSpecialVar_MonBoxPos; -extern u16 gSpecialVar_0x8014; +extern u16 gSpecialVar_Unused_0x8014; #endif // GUARD_EVENT_DATA_H diff --git a/include/field_specials.h b/include/field_specials.h index 1ab2b7eb4c..28e47fead5 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -9,11 +9,11 @@ void sub_813BF10(void); void IncrementBirthIslandRockStepCount(void); bool8 UnusualWeatherHasExpired(void); bool8 ShouldDoBrailleRegicePuzzle(void); -bool32 is_tile_that_overrides_player_control(void); -bool32 sub_8138120(void); -bool32 sub_8138168(void); -bool32 sub_81381B0(void); -bool32 sub_81381F8(void); +bool32 ShouldDoWallyCall(void); +bool32 ShouldDoWinonaCall(void); +bool32 ShouldDoScottCall(void); +bool32 ShouldDoRoxanneCall(void); +bool32 ShouldDoRivalRayquazaCall(void); bool32 CountSSTidalStep(u16 delta); u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y); void sub_813A128(void); diff --git a/include/overworld.h b/include/overworld.h index 8caba06736..54715ecc08 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -96,7 +96,7 @@ u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum); u8 GetMapTypeByWarpData(struct WarpData *warp); u8 GetCurrentMapType(void); u8 GetLastUsedWarpMapType(void); -bool8 is_map_type_1_2_3_5_or_6(u8 mapType); +bool8 IsMapTypeOutside(u8 mapType); bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType); bool8 Overworld_MapTypeIsIndoors(u8 mapType); u8 GetSavedWarpRegionMapSectionId(void); diff --git a/src/battle_setup.c b/src/battle_setup.c index 7626420e92..40423697e5 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -641,7 +641,7 @@ u8 BattleSetup_GetTerrainId(void) return BATTLE_TERRAIN_BUILDING; case MAP_TYPE_UNDERWATER: return BATTLE_TERRAIN_UNDERWATER; - case MAP_TYPE_6: + case MAP_TYPE_OCEAN_ROUTE: if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior)) return BATTLE_TERRAIN_WATER; return BATTLE_TERRAIN_PLAIN; diff --git a/src/event_data.c b/src/event_data.c index 5ca288e7b5..50628f984d 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -23,8 +23,8 @@ EWRAM_DATA u16 gSpecialVar_LastTalked = 0; EWRAM_DATA u16 gSpecialVar_Facing = 0; EWRAM_DATA u16 gSpecialVar_MonBoxId = 0; EWRAM_DATA u16 gSpecialVar_MonBoxPos = 0; -EWRAM_DATA u16 gSpecialVar_0x8014 = 0; -EWRAM_DATA static u8 gUnknown_020375FC[16] = {0}; +EWRAM_DATA u16 gSpecialVar_Unused_0x8014 = 0; +EWRAM_DATA static u8 gSpecialFlags[16] = {0}; extern u16 *const gSpecialVars[]; @@ -32,7 +32,7 @@ void InitEventData(void) { memset(gSaveBlock1Ptr->flags, 0, sizeof(gSaveBlock1Ptr->flags)); memset(gSaveBlock1Ptr->vars, 0, sizeof(gSaveBlock1Ptr->vars)); - memset(gUnknown_020375FC, 0, sizeof(gUnknown_020375FC)); + memset(gSpecialFlags, 0, sizeof(gSpecialFlags)); } void ClearTempFieldEventData(void) @@ -199,7 +199,7 @@ u8 *GetFlagPointer(u16 id) else if (id < SPECIAL_FLAGS_START) return &gSaveBlock1Ptr->flags[id / 8]; else - return &gUnknown_020375FC[(id - SPECIAL_FLAGS_START) / 8]; + return &gSpecialFlags[(id - SPECIAL_FLAGS_START) / 8]; } u8 FlagSet(u16 id) diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 7bb2b257df..8a70765919 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -567,27 +567,27 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) ScriptContext1_SetupScript(IslandCave_EventScript_238EAF); return TRUE; } - if (is_tile_that_overrides_player_control() == TRUE) + if (ShouldDoWallyCall() == TRUE) { ScriptContext1_SetupScript(MauvilleCity_EventScript_1DF7BA); return TRUE; } - if (sub_8138120() == TRUE) + if (ShouldDoWinonaCall() == TRUE) { ScriptContext1_SetupScript(Route119_EventScript_1F49EC); return TRUE; } - if (sub_8138168() == TRUE) + if (ShouldDoScottCall() == TRUE) { ScriptContext1_SetupScript(LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6); return TRUE; } - if (sub_81381B0() == TRUE) + if (ShouldDoRoxanneCall() == TRUE) { ScriptContext1_SetupScript(RustboroCity_Gym_EventScript_21307B); return TRUE; } - if (sub_81381F8() == TRUE) + if (ShouldDoRivalRayquazaCall() == TRUE) { ScriptContext1_SetupScript(MossdeepCity_SpaceCenter_2F_EventScript_224175); return TRUE; diff --git a/src/field_effect.c b/src/field_effect.c index e7c0b39b92..74f7801bdf 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2443,7 +2443,7 @@ static void sub_80B8410(struct Task *task) bool8 FldEff_FieldMoveShowMon(void) { u8 taskId; - if (is_map_type_1_2_3_5_or_6(GetCurrentMapType()) == TRUE) + if (IsMapTypeOutside(GetCurrentMapType()) == TRUE) { taskId = CreateTask(sub_80B8554, 0xff); } else diff --git a/src/field_specials.c b/src/field_specials.c index a07e987eb4..e603c3ebf7 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -360,17 +360,17 @@ u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y) return 0; } -bool32 is_tile_that_overrides_player_control(void) +bool32 ShouldDoWallyCall(void) { if (FlagGet(FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL)) { switch (gMapHeader.mapType) { - case 1: - case 2: - case 3: - case 6: - if (++(*GetVarPointer(VAR_0x40F2)) < 0xFA) + case MAP_TYPE_TOWN: + case MAP_TYPE_CITY: + case MAP_TYPE_ROUTE: + case MAP_TYPE_OCEAN_ROUTE: + if (++(*GetVarPointer(VAR_WALLY_CALL_STEP_COUNTER)) < 0xFA) { return FALSE; } @@ -387,7 +387,7 @@ bool32 is_tile_that_overrides_player_control(void) return TRUE; } -bool32 sub_8138120(void) +bool32 ShouldDoWinonaCall(void) { if (FlagGet(FLAG_REGISTER_WINONA_POKENAV)) { @@ -396,8 +396,8 @@ bool32 sub_8138120(void) case MAP_TYPE_TOWN: case MAP_TYPE_CITY: case MAP_TYPE_ROUTE: - case MAP_TYPE_6: - if (++(*GetVarPointer(VAR_0x40F3)) < 10) + case MAP_TYPE_OCEAN_ROUTE: + if (++(*GetVarPointer(VAR_WINONA_CALL_STEP_COUNTER)) < 10) { return FALSE; } @@ -414,7 +414,7 @@ bool32 sub_8138120(void) return TRUE; } -bool32 sub_8138168(void) +bool32 ShouldDoScottCall(void) { if (FlagGet(FLAG_SCOTT_CALL_NATIONAL_DEX)) { @@ -424,7 +424,7 @@ bool32 sub_8138168(void) case 2: case 3: case 6: - if (++(*GetVarPointer(VAR_0x40F5)) < 0xA) + if (++(*GetVarPointer(VAR_SCOTT_CALL_STEP_COUNTER)) < 10) { return FALSE; } @@ -441,7 +441,7 @@ bool32 sub_8138168(void) return TRUE; } -bool32 sub_81381B0(void) +bool32 ShouldDoRoxanneCall(void) { if (FlagGet(FLAG_ENABLE_ROXANNE_FIRST_CALL)) { @@ -451,7 +451,7 @@ bool32 sub_81381B0(void) case 2: case 3: case 6: - if (++(*GetVarPointer(VAR_0x40F4)) < 0xFA) + if (++(*GetVarPointer(VAR_ROXANNE_CALL_STEP_COUNTER)) < 0xFA) { return FALSE; } @@ -468,7 +468,7 @@ bool32 sub_81381B0(void) return TRUE; } -bool32 sub_81381F8(void) +bool32 ShouldDoRivalRayquazaCall(void) { if (FlagGet(FLAG_DEFEATED_MAGMA_SPACE_CENTER)) { @@ -478,7 +478,7 @@ bool32 sub_81381F8(void) case 2: case 3: case 6: - if (++(*GetVarPointer(VAR_0x40F6)) < 0xFA) + if (++(*GetVarPointer(VAR_RIVAL_RAYQUAZA_CALL_STEP_COUNTER)) < 0xFA) { return FALSE; } @@ -1516,7 +1516,7 @@ bool8 FoundBlackGlasses(void) void SetRoute119Weather(void) { - if (is_map_type_1_2_3_5_or_6(GetLastUsedWarpMapType()) != TRUE) + if (IsMapTypeOutside(GetLastUsedWarpMapType()) != TRUE) { SetSav1Weather(20); } @@ -1524,7 +1524,7 @@ void SetRoute119Weather(void) void SetRoute123Weather(void) { - if (is_map_type_1_2_3_5_or_6(GetLastUsedWarpMapType()) != TRUE) + if (IsMapTypeOutside(GetLastUsedWarpMapType()) != TRUE) { SetSav1Weather(21); } diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c index df4576a7f8..d4d6075f3d 100644 --- a/src/fldeff_misc.c +++ b/src/fldeff_misc.c @@ -1126,7 +1126,7 @@ void GetShieldToyTVDecorationInfo(void) if (!VarGet(VAR_CURRENT_SECRET_BASE)) return; - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x10); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x10); break; case 734: ConvertIntToDecimalStringN(gStringVar1, 50, STR_CONV_MODE_LEFT_ALIGN, 2); @@ -1137,7 +1137,7 @@ void GetShieldToyTVDecorationInfo(void) if (!VarGet(VAR_CURRENT_SECRET_BASE)) return; - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x20); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x20); break; case 756: gSpecialVar_Result = 1; @@ -1145,7 +1145,7 @@ void GetShieldToyTVDecorationInfo(void) if (!VarGet(VAR_CURRENT_SECRET_BASE)) return; - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x80); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x80); break; case 757: gSpecialVar_Result = 2; @@ -1153,7 +1153,7 @@ void GetShieldToyTVDecorationInfo(void) if (!VarGet(VAR_CURRENT_SECRET_BASE)) return; - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x80); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x80); break; case 758: gSpecialVar_Result = 3; @@ -1161,7 +1161,7 @@ void GetShieldToyTVDecorationInfo(void) if (!VarGet(VAR_CURRENT_SECRET_BASE)) return; - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x80); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x80); break; } } diff --git a/src/item.c b/src/item.c index 71c2dc0f7c..0e13ddf4cd 100644 --- a/src/item.c +++ b/src/item.c @@ -539,8 +539,8 @@ bool8 RemoveBagItem(u16 itemId, u16 count) if (CurrentMapIsSecretBase() == TRUE) { - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x200); - VarSet(VAR_0x40ED, itemId); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x200); + VarSet(VAR_SECRET_BASE_LAST_ITEM_USED, itemId); } var = GetItemListPosition(pocket); diff --git a/src/overworld.c b/src/overworld.c index 6055c74bb3..84eb80a064 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -678,7 +678,7 @@ void UpdateEscapeWarp(s16 x, s16 y) { u8 currMapType = GetCurrentMapType(); u8 destMapType = GetMapTypeByGroupAndId(sWarpDestination.mapGroup, sWarpDestination.mapNum); - if (is_map_type_1_2_3_5_or_6(currMapType) && is_map_type_1_2_3_5_or_6(destMapType) != TRUE) + if (IsMapTypeOutside(currMapType) && IsMapTypeOutside(destMapType) != TRUE) SetEscapeWarp(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x - 7, y - 6); } @@ -837,7 +837,7 @@ static void mli0_load_map(u32 a1) LoadEventObjTemplatesFromHeader(); } - v2 = is_map_type_1_2_3_5_or_6(gMapHeader.mapType); + v2 = IsMapTypeOutside(gMapHeader.mapType); indoors = Overworld_MapTypeIsIndoors(gMapHeader.mapType); sub_80EB218(); @@ -925,7 +925,7 @@ static u8 GetAdjustedInitialTransitionFlags(struct InitialPlayerAvatarState *pla static u8 GetAdjustedInitialDirection(struct InitialPlayerAvatarState *playerStruct, u8 transitionFlags, u16 metatileBehavior, u8 mapType) { - if (FlagGet(FLAG_SYS_CRUISE_MODE) && mapType == MAP_TYPE_6) + if (FlagGet(FLAG_SYS_CRUISE_MODE) && mapType == MAP_TYPE_OCEAN_ROUTE) return DIR_EAST; else if (MetatileBehavior_IsDeepSouthWarp(metatileBehavior) == TRUE) return DIR_NORTH; @@ -1330,13 +1330,13 @@ u8 GetLastUsedWarpMapType(void) return GetMapTypeByWarpData(&gLastUsedWarp); } -bool8 is_map_type_1_2_3_5_or_6(u8 mapType) +bool8 IsMapTypeOutside(u8 mapType) { if (mapType == MAP_TYPE_ROUTE || mapType == MAP_TYPE_TOWN || mapType == MAP_TYPE_UNDERWATER || mapType == MAP_TYPE_CITY - || mapType == MAP_TYPE_6) + || mapType == MAP_TYPE_OCEAN_ROUTE) return TRUE; else return FALSE; @@ -1346,7 +1346,7 @@ bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType) { if (mapType == MAP_TYPE_ROUTE || mapType == MAP_TYPE_TOWN - || mapType == MAP_TYPE_6 + || mapType == MAP_TYPE_OCEAN_ROUTE || mapType == MAP_TYPE_CITY) return TRUE; else diff --git a/src/region_map.c b/src/region_map.c index 5c85606a85..814849bfd9 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -883,7 +883,7 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) case MAP_TYPE_CITY: case MAP_TYPE_ROUTE: case MAP_TYPE_UNDERWATER: - case MAP_TYPE_6: + case MAP_TYPE_OCEAN_ROUTE: gRegionMap->mapSecId = gMapHeader.regionMapSectionId; gRegionMap->playerIsInCave = FALSE; mapWidth = gMapHeader.mapLayout->width; @@ -896,7 +896,7 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) } break; case MAP_TYPE_UNDERGROUND: - case MAP_TYPE_7: + case MAP_TYPE_UNUSED_2: if (gMapHeader.flags & 0x02) { mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->escapeWarp.mapGroup, gSaveBlock1Ptr->escapeWarp.mapNum); diff --git a/src/secret_base.c b/src/secret_base.c index 7ff83dec8b..02d627722b 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -60,7 +60,7 @@ struct SecretBaseRecordMixer { // Static RAM declarations EWRAM_DATA u8 sCurSecretBaseId = 0; -EWRAM_DATA u8 gUnknown_0203A01D = 0; +EWRAM_DATA bool8 gIsInSecretBase = FALSE; EWRAM_DATA struct SecretBaseListMenuBuffer *gUnknown_0203A020 = NULL; // Static ROM declarations @@ -1186,11 +1186,11 @@ void SecretBasePerStepCallback(u8 taskId) case 0: if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - gUnknown_0203A01D = TRUE; + gIsInSecretBase = TRUE; } else { - gUnknown_0203A01D = FALSE; + gIsInSecretBase = FALSE; } PlayerGetDestCoords(&data[2], &data[3]); data[1] = 1; @@ -1201,103 +1201,103 @@ void SecretBasePerStepCallback(u8 taskId) { data[2] = x; data[3] = y; - VarSet(VAR_0x40EC, VarGet(VAR_0x40EC) + 1); + VarSet(VAR_SECRET_BASE_STEP_COUNTER, VarGet(VAR_SECRET_BASE_STEP_COUNTER) + 1); behavior = MapGridGetMetatileBehaviorAt(x, y); tileId = MapGridGetMetatileIdAt(x, y); if (tileId == 0x234 || tileId == 0x23C) { - if (gUnknown_0203A01D == TRUE) + if (gIsInSecretBase == TRUE) { - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x20); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x20); } } else if (tileId == 0x2b8 || tileId == 0x2b9 || tileId == 0x2ba || tileId == 0x2c0 || tileId == 0x2c1 || tileId == 0x2c2 || tileId == 0x2c8 || tileId == 0x2c9 || tileId == 0x2ca) { - if (gUnknown_0203A01D == TRUE) + if (gIsInSecretBase == TRUE) { - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x01); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x01); } } else if (tileId == 0x239 || tileId == 0x241 || tileId == 0x251 || tileId == 0x259) { - if (gUnknown_0203A01D == TRUE) + if (gIsInSecretBase == TRUE) { - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x04); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x04); } } else if ((behavior == 0x34 && tileId == 0x26d) || (behavior == 0x35 && MapGridGetMetatileIdAt(x, y) == 0x26a)) { - if (gUnknown_0203A01D == TRUE) + if (gIsInSecretBase == TRUE) { - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x200); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x200); } } else if (behavior == 0xc1 && tileId == 0x23d) { - if (gUnknown_0203A01D == TRUE) + if (gIsInSecretBase == TRUE) { - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) ^ 0x1000); - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x2000); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) ^ 0x1000); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x2000); } } else if (behavior == 0x47 && tileId == 0x23e) { - if (gUnknown_0203A01D == TRUE) + if (gIsInSecretBase == TRUE) { - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x1000); - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) ^ 0x2000); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x1000); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) ^ 0x2000); } } else if (MetatileBehavior_IsSecretBaseGlitterMat(behavior) == TRUE) { - if (gUnknown_0203A01D == TRUE) + if (gIsInSecretBase == TRUE) { - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x80); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x80); } } else if (MetatileBehavior_IsSecretBaseBalloon(behavior) == TRUE) { PopSecretBaseBalloon(MapGridGetMetatileIdAt(x, y), x, y); - if (gUnknown_0203A01D == TRUE) + if (gIsInSecretBase == TRUE) { switch ((int)MapGridGetMetatileIdAt(x, y)) { case 0x338: case 0x33c: case 0x340: - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x02); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x02); break; case 0x228: - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x100); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x100); break; } } } else if (MetatileBehavior_IsSecretBaseBreakableDoor(behavior) == TRUE) { - if (gUnknown_0203A01D == TRUE) + if (gIsInSecretBase == TRUE) { - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x400); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x400); } ShatterSecretBaseBreakableDoor(x, y); } else if (MetatileBehavior_IsSecretBaseSoundMat(behavior) == TRUE){ - if (gUnknown_0203A01D == TRUE) { - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x8000); + if (gIsInSecretBase == TRUE) { + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x8000); } } else if (MetatileBehavior_IsSecretBaseJumpMat(behavior) == TRUE) { - if (gUnknown_0203A01D == TRUE) + if (gIsInSecretBase == TRUE) { - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x4000); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x4000); } } else if (MetatileBehavior_IsSecretBaseSpinMat(behavior) == TRUE) { - if (gUnknown_0203A01D == TRUE) + if (gIsInSecretBase == TRUE) { - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x02); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x02); } } } @@ -1780,33 +1780,33 @@ void sub_80EB18C(struct SecretBaseRecord *bases) void sub_80EB1AC(void) { - VarSet(VAR_0x40EC, 0); - VarSet(VAR_0x40ED, 0); - VarSet(VAR_0x40EE, 0); - VarSet(VAR_0x40EF, 0); + VarSet(VAR_SECRET_BASE_STEP_COUNTER, 0); + VarSet(VAR_SECRET_BASE_LAST_ITEM_USED, 0); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, 0); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, 0); if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - VarSet(VAR_0x40F0, TRUE); + VarSet(VAR_SECRET_BASE_IS_NOT_LOCAL, TRUE); } else { - VarSet(VAR_0x40F0, FALSE); + VarSet(VAR_SECRET_BASE_IS_NOT_LOCAL, FALSE); } - gUnknown_0203A01D = FALSE; + gIsInSecretBase = FALSE; } void sub_80EB218(void) { - if (VarGet(VAR_0x40F0) && gUnknown_0203A01D == TRUE && !CurrentMapIsSecretBase()) + if (VarGet(VAR_SECRET_BASE_IS_NOT_LOCAL) && gIsInSecretBase == TRUE && !CurrentMapIsSecretBase()) { - VarSet(VAR_0x40F0, FALSE); - gUnknown_0203A01D = FALSE; + VarSet(VAR_SECRET_BASE_IS_NOT_LOCAL, FALSE); + gIsInSecretBase = FALSE; sub_80EEA70(); - VarSet(VAR_0x40EC, 0); - VarSet(VAR_0x40ED, 0); - VarSet(VAR_0x40EE, 0); - VarSet(VAR_0x40EF, 0); - VarSet(VAR_0x40F0, FALSE); + VarSet(VAR_SECRET_BASE_STEP_COUNTER, 0); + VarSet(VAR_SECRET_BASE_LAST_ITEM_USED, 0); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, 0); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, 0); + VarSet(VAR_SECRET_BASE_IS_NOT_LOCAL, FALSE); } } @@ -1814,7 +1814,7 @@ void sub_80EB290(void) { if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x800); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x800); } } @@ -1822,7 +1822,7 @@ void sub_80EB2C8(void) { if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x400); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x400); } } @@ -1830,9 +1830,9 @@ void sub_80EB300(void) { if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) & ~0x3800); - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) & ~0x001); - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x2000); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) & ~0x3800); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) & ~0x001); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x2000); } } @@ -1840,9 +1840,9 @@ void sub_80EB368(void) { if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) & ~0x3800); - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) & ~0x001); - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x800); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) & ~0x3800); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) & ~0x001); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x800); } } @@ -1850,9 +1850,9 @@ void sub_80EB3D0(void) { if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) & ~0x3800); - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) & ~0x001); - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x1000); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) & ~0x3800); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) & ~0x001); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x1000); } } @@ -1860,9 +1860,9 @@ void sub_80EB438(void) { if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) & ~0x3800); - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) & ~0x001); - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x001); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) & ~0x3800); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) & ~0x001); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x001); } } @@ -1891,7 +1891,7 @@ void sub_80EB498(void) case 0x334: if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x4000); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x4000); } break; } @@ -1909,7 +1909,7 @@ void sub_80EB56C(void) case 0x28b: if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x40); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x40); } break; case 0x2d8: @@ -1932,21 +1932,21 @@ void sub_80EB56C(void) case 0x2fb: if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x8); + VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x8); } break; case 0x22c: case 0x233: if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x40); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x40); } break; case 0x288: case 0x289: if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x100); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x100); } break; case 0x22d: @@ -1954,7 +1954,7 @@ void sub_80EB56C(void) case 0x22f: if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x10); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x10); } break; case 0x287: @@ -1982,7 +1982,7 @@ void sub_80EB56C(void) case 0x2cf: if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x8); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x8); } break; } @@ -2009,7 +2009,7 @@ void sub_80EB9E0(void) case 0x2c6: if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x8); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x8); } break; } @@ -2047,14 +2047,14 @@ void sub_80EBB28(void) case 0x2c7: if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x8); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x8); } break; case 0x280: case 0x281: if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x100); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x100); } break; case 0x225: @@ -2062,7 +2062,7 @@ void sub_80EBB28(void) case 0x227: if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x10); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x10); } break; } @@ -2080,7 +2080,7 @@ void sub_80EBE7C(void) case 0x28e: if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x4); + VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x4); } break; } diff --git a/src/time_events.c b/src/time_events.c index 9702d321ff..9263bffac6 100644 --- a/src/time_events.c +++ b/src/time_events.c @@ -81,7 +81,7 @@ void UpdateShoalTideFlag(void) 1, // 23 }; - if (is_map_type_1_2_3_5_or_6(GetLastUsedWarpMapType())) + if (IsMapTypeOutside(GetLastUsedWarpMapType())) { RtcCalcLocalTime(); if (tide[gLocalTime.hours]) diff --git a/src/tv.c b/src/tv.c index 2487210837..d53cec8b29 100644 --- a/src/tv.c +++ b/src/tv.c @@ -2565,13 +2565,13 @@ void sub_80EEA70(void) show->secretBaseSecrets.kind = TVSHOW_SECRET_BASE_SECRETS; show->secretBaseSecrets.active = FALSE; StringCopy(show->secretBaseSecrets.playerName, gSaveBlock2Ptr->playerName); - show->secretBaseSecrets.stepsInBase = VarGet(VAR_0x40EC); + show->secretBaseSecrets.stepsInBase = VarGet(VAR_SECRET_BASE_STEP_COUNTER); sub_80E980C(); StringCopy(strbuf, gStringVar1); StripExtCtrlCodes(strbuf); StringCopy(show->secretBaseSecrets.baseOwnersName, strbuf); - show->secretBaseSecrets.item = VarGet(VAR_0x40ED); - show->secretBaseSecrets.flags = VarGet(VAR_0x40EE) + (VarGet(VAR_0x40EF) << 16); + show->secretBaseSecrets.item = VarGet(VAR_SECRET_BASE_LAST_ITEM_USED); + show->secretBaseSecrets.flags = VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) + (VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) << 16); tv_store_id_3x(show); show->secretBaseSecrets.language = gGameLanguage; if (show->secretBaseSecrets.language == LANGUAGE_JAPANESE || gSaveBlock1Ptr->secretBases[VarGet(VAR_CURRENT_SECRET_BASE)].language == LANGUAGE_JAPANESE) @@ -7350,7 +7350,7 @@ static void DoTVShowWhatsNo1InHoennToday(void) ShowFieldMessage(sTVWhatsNo1InHoennTodayTextGroup[state]); } -u8 sub_80F5180(TVShow *show) +u8 TVShowGetFlagCount(TVShow *show) { u8 i; u8 tot; @@ -7365,7 +7365,7 @@ u8 sub_80F5180(TVShow *show) return tot; } -u8 sub_80F51AC(TVShow *show, u8 a1) +u8 TVShowGetStateForFlagNumber(TVShow *show, u8 a1) { u8 i; u8 tot; @@ -7399,7 +7399,7 @@ static void DoTVShowSecretBaseSecrets(void) case 0: TVShowConvertInternationalString(gStringVar1, show->secretBaseSecrets.baseOwnersName, show->secretBaseSecrets.baseOwnersNameLanguage); TVShowConvertInternationalString(gStringVar2, show->secretBaseSecrets.playerName, show->secretBaseSecrets.language); - bitCount = sub_80F5180(show); + bitCount = TVShowGetFlagCount(show); if (bitCount == 0) { sTVShowState = 8; @@ -7408,12 +7408,12 @@ static void DoTVShowSecretBaseSecrets(void) { show->secretBaseSecrets.savedState = 1; sTVSecretBaseSecretsRandomValues[0] = Random() % bitCount; - sTVShowState = sub_80F51AC(show, sTVSecretBaseSecretsRandomValues[0]); + sTVShowState = TVShowGetStateForFlagNumber(show, sTVSecretBaseSecretsRandomValues[0]); } break; case 1: TVShowConvertInternationalString(gStringVar2, show->secretBaseSecrets.playerName, show->secretBaseSecrets.language); - bitCount = sub_80F5180(show); + bitCount = TVShowGetFlagCount(show); switch (bitCount) { case 1: @@ -7423,11 +7423,11 @@ static void DoTVShowSecretBaseSecrets(void) show->secretBaseSecrets.savedState = 2; if (sTVSecretBaseSecretsRandomValues[0] == 0) { - sTVShowState = sub_80F51AC(show, 1); + sTVShowState = TVShowGetStateForFlagNumber(show, 1); } else { - sTVShowState = sub_80F51AC(show, 0); + sTVShowState = TVShowGetStateForFlagNumber(show, 0); } break; default: @@ -7440,13 +7440,13 @@ static void DoTVShowSecretBaseSecrets(void) } } show->secretBaseSecrets.savedState = 2; - sTVShowState = sub_80F51AC(show, sTVSecretBaseSecretsRandomValues[1]); + sTVShowState = TVShowGetStateForFlagNumber(show, sTVSecretBaseSecretsRandomValues[1]); break; } break; case 2: TVShowConvertInternationalString(gStringVar2, show->secretBaseSecrets.playerName, show->secretBaseSecrets.language); - bitCount = sub_80F5180(show); + bitCount = TVShowGetFlagCount(show); if (bitCount == 2) { sTVShowState = 9; @@ -7462,7 +7462,7 @@ static void DoTVShowSecretBaseSecrets(void) } } show->secretBaseSecrets.savedState = 3; - sTVShowState = sub_80F51AC(show, sTVSecretBaseSecretsRandomValues[2]); + sTVShowState = TVShowGetStateForFlagNumber(show, sTVSecretBaseSecretsRandomValues[2]); } break; case 3: From 373d73eb3b8d28aa217bc6043a29cc44fcf0e45b Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Thu, 28 Feb 2019 00:06:27 -0500 Subject: [PATCH 138/217] Fix last special var --- data/maps/PetalburgCity/map.json | 8 ++--- data/maps/PetalburgCity/scripts.inc | 2 +- data/maps/PetalburgCity_Gym/scripts.inc | 2 +- include/constants/vars.h | 46 ++++++++++++------------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index 3d09ae7068..6a9a6b33d2 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -229,7 +229,7 @@ "x": 4, "y": 10, "elevation": 3, - "var": "VAR_0x40C9", + "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", "script": "PetalburgCity_EventScript_1DC691" }, @@ -238,7 +238,7 @@ "x": 4, "y": 11, "elevation": 3, - "var": "VAR_0x40C9", + "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", "script": "PetalburgCity_EventScript_1DC6A7" }, @@ -247,7 +247,7 @@ "x": 4, "y": 12, "elevation": 3, - "var": "VAR_0x40C9", + "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", "script": "PetalburgCity_EventScript_1DC6BD" }, @@ -256,7 +256,7 @@ "x": 4, "y": 13, "elevation": 3, - "var": "VAR_0x40C9", + "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", "script": "PetalburgCity_EventScript_1DC6D3" } diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 0520fe044c..5a652ab15f 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -572,7 +572,7 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 call_if_eq PetalburgCity_EventScript_1DC7B2 compare VAR_0x8008, 3 call_if_eq PetalburgCity_EventScript_1DC7C4 - setvar VAR_0x40C9, 1 + setvar VAR_SCOTT_PETALBURG_ENCOUNTER, 1 removeobject 9 releaseall end diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index fef5c40481..a256a6547b 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -60,7 +60,7 @@ PetalburgCity_Gym_EventScript_204955:: @ 8204955 return PetalburgCity_Gym_EventScript_20495D:: @ 820495D - setorcopyvar VAR_NEVER_READ_0x8015, 269 + setorcopyvar VAR_TRAINER_BATTLE_OPPONENT_A, 269 specialvar VAR_RESULT, IsTrainerReadyForRematch compare VAR_RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_204985 diff --git a/include/constants/vars.h b/include/constants/vars.h index 99d1813da5..3bd5d8efe7 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -217,7 +217,7 @@ #define VAR_STEVENS_HOUSE_STATE 0x40C6 #define VAR_OLDALE_STATE 0x40C7 #define VAR_JAGGED_PASS_STATE 0x40C8 -#define VAR_0x40C9 0x40C9 +#define VAR_SCOTT_PETALBURG_ENCOUNTER 0x40C9 #define VAR_SKY_PILLAR_STATE 0x40CA #define VAR_ROUTE_111_STATE 0x40CB #define VAR_FOSSIL_MANIAC_STATE 0x40CC @@ -276,27 +276,27 @@ #define SPECIAL_VARS_START 0x8000 // special vars // They are commonly used as parameters to commands, or return values from commands. -#define VAR_0x8000 0x8000 -#define VAR_0x8001 0x8001 -#define VAR_0x8002 0x8002 -#define VAR_0x8003 0x8003 -#define VAR_0x8004 0x8004 -#define VAR_0x8005 0x8005 -#define VAR_0x8006 0x8006 -#define VAR_0x8007 0x8007 -#define VAR_0x8008 0x8008 -#define VAR_0x8009 0x8009 -#define VAR_0x800A 0x800A -#define VAR_0x800B 0x800B -#define VAR_FACING 0x800C -#define VAR_RESULT 0x800D -#define VAR_ITEM_ID 0x800E -#define VAR_LAST_TALKED 0x800F -#define VAR_CONTEST_RANK 0x8010 -#define VAR_CONTEST_CATEGORY 0x8011 -#define VAR_MON_BOX_ID 0x8012 -#define VAR_MON_BOX_POS 0x8013 -#define VAR_UNUSED_0x8014 0x8014 -#define VAR_NEVER_READ_0x8015 0x8015 // Written to, but never read +#define VAR_0x8000 0x8000 +#define VAR_0x8001 0x8001 +#define VAR_0x8002 0x8002 +#define VAR_0x8003 0x8003 +#define VAR_0x8004 0x8004 +#define VAR_0x8005 0x8005 +#define VAR_0x8006 0x8006 +#define VAR_0x8007 0x8007 +#define VAR_0x8008 0x8008 +#define VAR_0x8009 0x8009 +#define VAR_0x800A 0x800A +#define VAR_0x800B 0x800B +#define VAR_FACING 0x800C +#define VAR_RESULT 0x800D +#define VAR_ITEM_ID 0x800E +#define VAR_LAST_TALKED 0x800F +#define VAR_CONTEST_RANK 0x8010 +#define VAR_CONTEST_CATEGORY 0x8011 +#define VAR_MON_BOX_ID 0x8012 +#define VAR_MON_BOX_POS 0x8013 +#define VAR_UNUSED_0x8014 0x8014 +#define VAR_TRAINER_BATTLE_OPPONENT_A 0x8015 // Alias of gTrainerBattleOpponent_A #endif // GUARD_CONSTANTS_VARS_H From 99bfd8c80fcfcafa55166ff65f5264c727b16ed0 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Thu, 28 Feb 2019 00:10:44 -0500 Subject: [PATCH 139/217] VAR_0x3F20 is not a var --- include/constants/vars.h | 2 +- src/decoration.c | 2 +- src/secret_base.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/constants/vars.h b/include/constants/vars.h index 3bd5d8efe7..72b02ee8f8 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -1,7 +1,7 @@ #ifndef GUARD_CONSTANTS_VARS_H #define GUARD_CONSTANTS_VARS_H -#define VAR_0x3F20 0x3F20 +#define UNKNOWN_VAR_OFFSET_3F20 0x3F20 #define VARS_START 0x4000 diff --git a/src/decoration.c b/src/decoration.c index 2ac49b98c1..1635528d9b 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1254,7 +1254,7 @@ void sub_8127E18(void) break; } } - VarSet(VAR_0x3F20 + gMapHeader.events->eventObjects[j].graphicsId, sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]); + VarSet(UNKNOWN_VAR_OFFSET_3F20 + gMapHeader.events->eventObjects[j].graphicsId, sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]); gSpecialVar_0x8005 = gMapHeader.events->eventObjects[j].localId; gSpecialVar_0x8006 = sCurDecorMapX; gSpecialVar_0x8007 = sCurDecorMapY; diff --git a/src/secret_base.c b/src/secret_base.c index 02d627722b..cf35deb072 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -552,7 +552,7 @@ void sub_80E933C(void) metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7); if (MetatileBehavior_IsSecretBaseLargeMatEdge(metatile) == TRUE || MetatileBehavior_IsLargeMatCenter(metatile) == TRUE) { - gSpecialVar_Result = gMapHeader.events->eventObjects[objIdx].graphicsId + VAR_0x3F20; + gSpecialVar_Result = gMapHeader.events->eventObjects[objIdx].graphicsId + UNKNOWN_VAR_OFFSET_3F20; VarSet(gSpecialVar_Result, gDecorations[roomDecor[decorIdx]].tiles[0]); gSpecialVar_Result = gMapHeader.events->eventObjects[objIdx].localId; FlagClear(gSpecialVar_0x8004 + 0xAE); From baf95a8e7ab5bf295f10c4e30d043c9629f2d2a3 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 1 Mar 2019 00:08:37 +0100 Subject: [PATCH 140/217] get rid of ugly cast --- src/battle_anim_effects_2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index 0c6f2ef111..ee6676e644 100755 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -1417,7 +1417,7 @@ static void AnimTask_WithdrawStep(u8 taskId) } } -// Animates a "zap of energy" used in KINESIS. +// Animates a "zap of energy" used in KINESIS. // arg 0: x pixel offset // arg 1: y pixel offset // arg 2: vertical flip @@ -1592,7 +1592,7 @@ void sub_8103AA4(struct Sprite *sprite) sprite->data[3] = sub_8151534(sub_8151534(b, a), sub_8151624(0x1C0)); sprite->data[4] = sub_8151534(sub_8151534(c, a), sub_8151624(0x1C0)); sprite->callback = sub_8103A00; - } + } } static void sub_8103BE4(u8 taskId) @@ -3470,7 +3470,7 @@ void AnimOrbitFast(struct Sprite *sprite) static void AnimOrbitFastStep(struct Sprite *sprite) { - if ((u16)(sprite->data[1] - 64) < 128) + if (sprite->data[1] >= 64 && sprite->data[1] <= 191) sprite->subpriority = sprite->data[7] + 1; else sprite->subpriority = sprite->data[7] - 1; From 5c8cc5225ff7c11533f8421039e6e9e75adcee90 Mon Sep 17 00:00:00 2001 From: hondew Date: Thu, 7 Feb 2019 11:24:09 -0500 Subject: [PATCH 141/217] document slot machine --- data/slot_machine.s | 1144 ++++++++++++------------ include/slot_machine.h | 3 + include/task.h | 3 + include/tv.h | 9 +- src/roulette.c | 4 +- src/slot_machine.c | 1864 +++++++++++++++++++++------------------- src/task.c | 3 - src/tv.c | 16 +- 8 files changed, 1576 insertions(+), 1470 deletions(-) diff --git a/data/slot_machine.s b/data/slot_machine.s index 4a354d71c9..adc65feec5 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -1,841 +1,841 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" +.include "asm/macros.inc" +.include "constants/constants.inc" - .section .rodata +.section .rodata .align 2 gUnknown_085A7A3C:: @ 85A7A3C - .2byte 0 - .2byte 0 - .2byte 0 - .2byte 0 - +.2byte 0 +.2byte 0 +.2byte 0 +.2byte 0 + gUnknown_085A7A44:: @ 85A7A44 - .2byte 0x8000 - .2byte 0 - .2byte 0 - .2byte 0 +.2byte 0x8000 +.2byte 0 +.2byte 0 +.2byte 0 gUnknown_085A7A4C:: @ 85A7A4C - .2byte 0 - .2byte 0x4000 - .2byte 0 - .2byte 0 - +.2byte 0 +.2byte 0x4000 +.2byte 0 +.2byte 0 + gUnknown_085A7A54:: @ 85A7A54 - .2byte 0x8000 - .2byte 0x8000 - .2byte 0 - .2byte 0 - +.2byte 0x8000 +.2byte 0x8000 +.2byte 0 +.2byte 0 + gUnknown_085A7A5C:: @ 85A7A5C - .2byte 0 - .2byte 0x8000 - .2byte 0 - .2byte 0 +.2byte 0 +.2byte 0x8000 +.2byte 0 +.2byte 0 gUnknown_085A7A64:: @ 85A7A64 - .2byte 0x8000 - .2byte 0xC000 - .2byte 0 - .2byte 0 - +.2byte 0x8000 +.2byte 0xC000 +.2byte 0 +.2byte 0 + gUnknown_085A7A6C:: @ 85A7A6C - .2byte 0x4000 - .2byte 0xC000 - .2byte 0 - .2byte 0 +.2byte 0x4000 +.2byte 0xC000 +.2byte 0 +.2byte 0 gUnknown_085A7A74:: @ 85A7A74 - .2byte 0 - .2byte 0xC000 - .2byte 0 - .2byte 0 +.2byte 0 +.2byte 0xC000 +.2byte 0 +.2byte 0 gUnknown_085A7A7C:: @ 85A7A7C - .4byte gSlotMachineReelTimeNumber0 - .2byte 0x80 - .2byte 0 - .4byte gSlotMachineReelTimeNumber1 - .2byte 0x80 - .2byte 0 - .4byte gSlotMachineReelTimeNumber2 - .2byte 0x80 - .2byte 0 - .4byte gSlotMachineReelTimeNumber3 - .2byte 0x80 - .2byte 0 - .4byte gSlotMachineReelTimeNumber4 - .2byte 0x80 - .2byte 0 - .4byte gSlotMachineReelTimeNumber5 - .2byte 0x80 - .2byte 0 +.4byte gSlotMachineReelTimeNumber0 +.2byte 0x80 +.2byte 0 +.4byte gSlotMachineReelTimeNumber1 +.2byte 0x80 +.2byte 0 +.4byte gSlotMachineReelTimeNumber2 +.2byte 0x80 +.2byte 0 +.4byte gSlotMachineReelTimeNumber3 +.2byte 0x80 +.2byte 0 +.4byte gSlotMachineReelTimeNumber4 +.2byte 0x80 +.2byte 0 +.4byte gSlotMachineReelTimeNumber5 +.2byte 0x80 +.2byte 0 gUnknown_085A7AAC:: @ 85A7AAC - .4byte gSlotMachineReelTimeShadow - .2byte 0x200 - .2byte 0 +.4byte gSlotMachineReelTimeShadow +.2byte 0x200 +.2byte 0 gUnknown_085A7AB4:: @ 85A7AB4 - .4byte gUnknown_08DD1A18 - .2byte 0x40 - .2byte 0 +.4byte gUnknown_08DD1A18 +.2byte 0x40 +.2byte 0 gUnknown_085A7ABC:: @ 85A7ABC - .4byte gSlotMachineReelTimeLargeBolt0 - .2byte 0x100 - .2byte 0 - .4byte gSlotMachineReelTimeLargeBolt1 - .2byte 0x100 - .2byte 0 +.4byte gSlotMachineReelTimeLargeBolt0 +.2byte 0x100 +.2byte 0 +.4byte gSlotMachineReelTimeLargeBolt1 +.2byte 0x100 +.2byte 0 gUnknown_085A7ACC:: @ 85A7ACC - .4byte gSlotMachineReelTimePikaAura - .2byte 0x400 - .2byte 0 - +.4byte gSlotMachineReelTimePikaAura +.2byte 0x400 +.2byte 0 + gUnknown_085A7AD4:: @ 85A7CD4 - .4byte gSlotMachineReelTimeExplosion0 - .2byte 0x200 - .2byte 0 - .4byte gSlotMachineReelTimeExplosion1 - .2byte 0x200 - .2byte 0 +.4byte gSlotMachineReelTimeExplosion0 +.2byte 0x200 +.2byte 0 +.4byte gSlotMachineReelTimeExplosion1 +.2byte 0x200 +.2byte 0 gUnknown_085A7AE4:: @ 85A7AE4 - .4byte gSlotMachineReelTimeDuck - .4byte 32 +.4byte gSlotMachineReelTimeDuck +.4byte 32 gUnknown_085A7AEC:: @ 85A7AEC - .4byte gSlotMachineReelTimeSmoke - .4byte 0x80 - +.4byte gSlotMachineReelTimeSmoke +.4byte 0x80 + gUnknown_085A7AF4:: @ 85A7AF4 - .4byte gSlotMachineReelTimeBolt - .4byte 32 +.4byte gSlotMachineReelTimeBolt +.4byte 32 gUnknown_085A7AFC:: @ 85A7AFC - obj_image_anim_frame 0, 1 - obj_image_anim_end +obj_image_anim_frame 0, 1 +obj_image_anim_end gUnknown_085A7B04:: @ 85A7B04 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - +obj_image_anim_frame 0, 1 +obj_image_anim_jump 0 + gUnknown_085A7B0C:: @ 85A7B0C - obj_image_anim_frame 0, 16 - obj_image_anim_end +obj_image_anim_frame 0, 16 +obj_image_anim_end gUnknown_085A7B14:: @ 85A7B14 - obj_image_anim_frame 1, 16 - obj_image_anim_frame 0, 16 - obj_image_anim_jump 0 +obj_image_anim_frame 1, 16 +obj_image_anim_frame 0, 16 +obj_image_anim_jump 0 gUnknown_085A7B20:: @ 85A7B20 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_jump 0 +obj_image_anim_frame 1, 8 +obj_image_anim_frame 0, 8 +obj_image_anim_jump 0 gUnknown_085A7B2C:: @ 85A7B2C - obj_image_anim_frame 1, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_jump 0 +obj_image_anim_frame 1, 4 +obj_image_anim_frame 0, 4 +obj_image_anim_jump 0 gUnknown_085A7B38:: @ 85A7B38 - obj_image_anim_frame 2, 32 - obj_image_anim_frame 3, 32 - obj_image_anim_jump 0 +obj_image_anim_frame 2, 32 +obj_image_anim_frame 3, 32 +obj_image_anim_jump 0 gUnknown_085A7B44:: @ 85A7B44 - obj_image_anim_frame 4, 1 - obj_image_anim_end +obj_image_anim_frame 4, 1 +obj_image_anim_end gUnknown_085A7B4C:: @ 85A7B4C - obj_image_anim_frame 0, 1 - obj_image_anim_end +obj_image_anim_frame 0, 1 +obj_image_anim_end gUnknown_085A7B54:: @ 85A7B54 - obj_image_anim_frame 1, 1 - obj_image_anim_end +obj_image_anim_frame 1, 1 +obj_image_anim_end gUnknown_085A7B5C:: @ 85A7B5C - obj_image_anim_frame 2, 1 - obj_image_anim_end +obj_image_anim_frame 2, 1 +obj_image_anim_end gUnknown_085A7B64:: @ 85A7B64 - obj_image_anim_frame 3, 1 - obj_image_anim_end +obj_image_anim_frame 3, 1 +obj_image_anim_end gUnknown_085A7B6C:: @ 85A7B6C - obj_image_anim_frame 4, 1 - obj_image_anim_end +obj_image_anim_frame 4, 1 +obj_image_anim_end gUnknown_085A7B74:: @ 85A7B74 - obj_image_anim_frame 5, 1 - obj_image_anim_end +obj_image_anim_frame 5, 1 +obj_image_anim_end gUnknown_085A7B7C:: @ 85A7B7C - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_jump 0 +obj_image_anim_frame 0, 4 +obj_image_anim_frame 1, 4 +obj_image_anim_jump 0 gUnknown_085A7B88:: @ 85A7B88 - obj_image_anim_frame 0, 16 - obj_image_anim_frame 1, 16 - obj_image_anim_jump 0 +obj_image_anim_frame 0, 16 +obj_image_anim_frame 1, 16 +obj_image_anim_jump 0 gUnknown_085A7B94:: @ 85A7B94 - obj_image_anim_frame 0, 30 - obj_image_anim_frame 1, 30 - obj_image_anim_jump 0 +obj_image_anim_frame 0, 30 +obj_image_anim_frame 1, 30 +obj_image_anim_jump 0 gUnknown_085A7BA0:: @ 85A7BA0 - obj_image_anim_frame 1, 1 - obj_image_anim_end +obj_image_anim_frame 1, 1 +obj_image_anim_end gUnknown_085A7BA8:: @ 85A7BA8 - obj_image_anim_frame 0, 30 - obj_image_anim_frame 1, 30 - obj_image_anim_jump 0 +obj_image_anim_frame 0, 30 +obj_image_anim_frame 1, 30 +obj_image_anim_jump 0 gUnknown_085A7BB4:: @ 85A7BB4 - obj_image_anim_frame 0, 16 - obj_image_anim_frame 1, 16 - obj_image_anim_frame 0, 16 - obj_image_anim_frame 1, 80 - obj_image_anim_jump 0 +obj_image_anim_frame 0, 16 +obj_image_anim_frame 1, 16 +obj_image_anim_frame 0, 16 +obj_image_anim_frame 1, 80 +obj_image_anim_jump 0 gUnknown_085A7BC8:: @ 85A7BC8 - obj_image_anim_frame 0, 1 - obj_image_anim_end +obj_image_anim_frame 0, 1 +obj_image_anim_end gUnknown_085A7BD0:: @ 85A7BD0 - obj_image_anim_frame 0, 1 - obj_image_anim_end +obj_image_anim_frame 0, 1 +obj_image_anim_end gUnknown_085A7BD8:: @ 85A7BD8 - obj_image_anim_frame 1, 1 - obj_image_anim_end +obj_image_anim_frame 1, 1 +obj_image_anim_end gUnknown_085A7BE0:: @ 85A7BE0 - obj_image_anim_frame 2, 1 - obj_image_anim_end +obj_image_anim_frame 2, 1 +obj_image_anim_end gUnknown_085A7BE8:: @ 85A7BE8 - obj_image_anim_frame 3, 1 - obj_image_anim_end +obj_image_anim_frame 3, 1 +obj_image_anim_end gUnknown_085A7BF0:: @ 85A7BF0 - obj_image_anim_frame 4, 1 - obj_image_anim_end +obj_image_anim_frame 4, 1 +obj_image_anim_end gUnknown_085A7BF8:: @ 85A7BF8 - .4byte gUnknown_085A7AFC +.4byte gUnknown_085A7AFC gUnknown_085A7BFC:: @ 85A7BFC - .4byte gUnknown_085A7B04 +.4byte gUnknown_085A7B04 gUnknown_085A7C00:: @ 85A7C00 - .4byte gUnknown_085A7B0C - .4byte gUnknown_085A7B14 - .4byte gUnknown_085A7B20 - .4byte gUnknown_085A7B2C - .4byte gUnknown_085A7B38 - .4byte gUnknown_085A7B44 +.4byte gUnknown_085A7B0C +.4byte gUnknown_085A7B14 +.4byte gUnknown_085A7B20 +.4byte gUnknown_085A7B2C +.4byte gUnknown_085A7B38 +.4byte gUnknown_085A7B44 gUnknown_085A7C18:: @ 85A7C18 - .4byte gUnknown_085A7B4C - .4byte gUnknown_085A7B54 - .4byte gUnknown_085A7B5C - .4byte gUnknown_085A7B64 - .4byte gUnknown_085A7B6C - .4byte gUnknown_085A7B74 +.4byte gUnknown_085A7B4C +.4byte gUnknown_085A7B54 +.4byte gUnknown_085A7B5C +.4byte gUnknown_085A7B64 +.4byte gUnknown_085A7B6C +.4byte gUnknown_085A7B74 gUnknown_085A7C30:: @ 85A7C30 - .4byte gUnknown_085A7B7C +.4byte gUnknown_085A7B7C gUnknown_085A7C34:: @ 85A7C34 - .4byte gUnknown_085A7B88 - +.4byte gUnknown_085A7B88 + gUnknown_085A7C38:: @ 85A7C38 - .4byte gUnknown_085A7B94 - .4byte gUnknown_085A7BA0 - +.4byte gUnknown_085A7B94 +.4byte gUnknown_085A7BA0 + gUnknown_085A7C40:: @ 85A7C40 - .4byte gUnknown_085A7BA8 - +.4byte gUnknown_085A7BA8 + gUnknown_085A7C44:: @ 85A7C44 - .4byte gUnknown_085A7BB4 - .4byte gUnknown_085A7BC8 - +.4byte gUnknown_085A7BB4 +.4byte gUnknown_085A7BC8 + gUnknown_085A7C4C:: @ 85A7C4C - .4byte gUnknown_085A7BD0 - .4byte gUnknown_085A7BD8 - .4byte gUnknown_085A7BE0 - .4byte gUnknown_085A7BE8 - .4byte gUnknown_085A7BF0 +.4byte gUnknown_085A7BD0 +.4byte gUnknown_085A7BD8 +.4byte gUnknown_085A7BE0 +.4byte gUnknown_085A7BE8 +.4byte gUnknown_085A7BF0 gUnknown_085A7C60:: @ 85A7C60 - obj_rot_scal_anim_frame 16, 16, 0, 0 - obj_rot_scal_anim_loop 0 - obj_rot_scal_anim_frame 1, 1, 0, 1 - obj_rot_scal_anim_loop 0xFF - obj_rot_scal_anim_end - +obj_rot_scal_anim_frame 16, 16, 0, 0 +obj_rot_scal_anim_loop 0 +obj_rot_scal_anim_frame 1, 1, 0, 1 +obj_rot_scal_anim_loop 0xFF +obj_rot_scal_anim_end + gUnknown_085A7C88:: @ 85A7C88 - .4byte gUnknown_085A7C60 +.4byte gUnknown_085A7C60 gUnknown_085A7C8C:: @ 85A7C8C - obj_rot_scal_anim_frame 0, 0, 8, 32 - obj_rot_scal_anim_frame 0, 0, 6, 32 - obj_rot_scal_anim_frame 0, 0, 4, 16 - obj_rot_scal_anim_frame 0, 0, 12, 2 - obj_rot_scal_anim_frame 0, 0, -12, 4 - obj_rot_scal_anim_frame 0, 0, 12, 2 - obj_rot_scal_anim_frame 0, 0, 12, 2 - obj_rot_scal_anim_frame 0, 0, -12, 4 - obj_rot_scal_anim_frame 0, 0, 12, 2 - obj_rot_scal_anim_end +obj_rot_scal_anim_frame 0, 0, 8, 32 +obj_rot_scal_anim_frame 0, 0, 6, 32 +obj_rot_scal_anim_frame 0, 0, 4, 16 +obj_rot_scal_anim_frame 0, 0, 12, 2 +obj_rot_scal_anim_frame 0, 0, -12, 4 +obj_rot_scal_anim_frame 0, 0, 12, 2 +obj_rot_scal_anim_frame 0, 0, 12, 2 +obj_rot_scal_anim_frame 0, 0, -12, 4 +obj_rot_scal_anim_frame 0, 0, 12, 2 +obj_rot_scal_anim_end gUnknown_085A7CDC:: @ 85A7CDC - .4byte gUnknown_085A7C8C - +.4byte gUnknown_085A7C8C + gSpriteTemplate_83ED414:: @ 85A7CE0 - spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_8104F18 +spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_8104F18 gSpriteTemplate_83ED42C:: @ 85A7CF8 - spr_template 7, 4, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_810506C +spr_template 7, 4, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_810506C gSpriteTemplate_83ED444:: @ 85A7D10 - spr_template 17, 0, gUnknown_085A7A74, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +spr_template 17, 0, gUnknown_085A7A74, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gSpriteTemplate_83ED45C:: @ 85A7D28 - spr_template 0xFFFF, 1, gUnknown_085A7A74, gUnknown_085A7C00, NULL, gDummySpriteAffineAnimTable, sub_8105170 +spr_template 0xFFFF, 1, gUnknown_085A7A74, gUnknown_085A7C00, NULL, gDummySpriteAffineAnimTable, sub_8105170 gSpriteTemplate_83ED474:: @ 85A7D40 - spr_template 0xFFFF, 2, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +spr_template 0xFFFF, 2, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gSpriteTemplate_83ED48C:: @ 85A7D58 - spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gSpriteTemplate_83ED4A4:: @ 85A7D70 - spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gSpriteTemplate_83ED4BC:: @ 85A7D88 - spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7C18, gUnknown_085A7A7C, gDummySpriteAffineAnimTable, sub_810535C +spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7C18, gUnknown_085A7A7C, gDummySpriteAffineAnimTable, sub_810535C gSpriteTemplate_83ED4D4:: @ 85A7DA0 - spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AAC, gDummySpriteAffineAnimTable, SpriteCallbackDummy +spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AAC, gDummySpriteAffineAnimTable, SpriteCallbackDummy gSpriteTemplate_83ED4EC:: @ 85A7DB8 - spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AB4, gDummySpriteAffineAnimTable, SpriteCallbackDummy +spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AB4, gDummySpriteAffineAnimTable, SpriteCallbackDummy gSpriteTemplate_83ED504:: @ 85A7DD0 - spr_template 0xFFFF, 4, gUnknown_085A7A54, gUnknown_085A7C30, gUnknown_085A7ABC, gDummySpriteAffineAnimTable, sub_810562C +spr_template 0xFFFF, 4, gUnknown_085A7A54, gUnknown_085A7C30, gUnknown_085A7ABC, gDummySpriteAffineAnimTable, sub_810562C gSpriteTemplate_83ED51C:: @ 85A7DE8 - spr_template 0xFFFF, 7, gUnknown_085A7A64, gUnknown_085A7BF8, gUnknown_085A7ACC, gDummySpriteAffineAnimTable, sub_8105784 +spr_template 0xFFFF, 7, gUnknown_085A7A64, gUnknown_085A7BF8, gUnknown_085A7ACC, gDummySpriteAffineAnimTable, sub_8105784 gSpriteTemplate_83ED534:: @ 85A7E00 - spr_template 0xFFFF, 5, gUnknown_085A7A5C, gUnknown_085A7C34, gUnknown_085A7AD4, gDummySpriteAffineAnimTable, sub_8105894 +spr_template 0xFFFF, 5, gUnknown_085A7A5C, gUnknown_085A7C34, gUnknown_085A7AD4, gDummySpriteAffineAnimTable, sub_8105894 gSpriteTemplate_83ED54C:: @ 85A7E18 - spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BFC, gUnknown_085A7AE4, gDummySpriteAffineAnimTable, sub_810594C +spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BFC, gUnknown_085A7AE4, gDummySpriteAffineAnimTable, sub_810594C gSpriteTemplate_83ED564:: @ 85A7E30 - spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_8105A38 - +spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_8105A38 + gUnknown_085A7E48:: @ 85A7E48 - spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - +spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + gUnknown_085A7E60:: @ 85A7E60 - spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - +spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + gUnknown_085A7E78:: @ 85A7E78 - spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - +spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + gUnknown_085A7E90:: @ 85A7E90 - spr_template 18, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - +spr_template 18, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + gUnknown_085A7EA8:: @ 85A7EA8 - spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - +spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + gUnknown_085A7EC0:: @ 85A7EC0 - spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7ED8:: @ 85A7ED8 - spr_template 19, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - +spr_template 19, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + gUnknown_085A7EF0:: @ 85A7EF0 - spr_template 20, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - +spr_template 20, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + gUnknown_085A7F08:: @ 85A7F08 - spr_template 21, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - +spr_template 21, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + gUnknown_085A7F20:: @ 85A7F20 - spr_template 0xFFFF, 6, gUnknown_085A7A5C, gUnknown_085A7C38, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - +spr_template 0xFFFF, 6, gUnknown_085A7A5C, gUnknown_085A7C38, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + gUnknown_085A7F38:: @ 85A7F38 - spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - +spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + gUnknown_085A7F50:: @ 85A7F50 - spr_template 0xFFFF, 6, gUnknown_085A7A4C, gUnknown_085A7C4C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - +spr_template 0xFFFF, 6, gUnknown_085A7A4C, gUnknown_085A7C4C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + gUnknown_085A7F68:: @ 85A7F68 - spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C44, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - +spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C44, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + gUnknown_085A7F80:: @ 85A7F80 - spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - +spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + gSpriteTemplate_83ED6CC:: @ 85A7F98 - spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_8105B70 - +spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_8105B70 + gUnknown_085A7FB0:: @ 85A7FB0 - subsprite -64, -64, 3, 0, 64x64 - subsprite 0, -64, 3, 0, 64x64 - subsprite -64, 0, 3, 0, 64x64 - subsprite 0, 0, 3, 0, 64x64 +subsprite -64, -64, 3, 0, 64x64 +subsprite 0, -64, 3, 0, 64x64 +subsprite -64, 0, 3, 0, 64x64 +subsprite 0, 0, 3, 0, 64x64 gSubspriteTables_83ED704:: @ 85A7FC0 - .4byte 4, gUnknown_085A7FB0 - +.4byte 4, gUnknown_085A7FB0 + gUnknown_085A7FC8:: @ 85A7FC8 - subsprite -32, -12, 1, 0, 32x8 - subsprite 0, -12, 1, 4, 32x8 - subsprite -32, -4, 1, 8, 32x8 - subsprite 0, -4, 1, 12, 32x8 - subsprite -32, 4, 1, 16, 32x8 - subsprite 0, 4, 1, 20, 32x8 +subsprite -32, -12, 1, 0, 32x8 +subsprite 0, -12, 1, 4, 32x8 +subsprite -32, -4, 1, 8, 32x8 +subsprite 0, -4, 1, 12, 32x8 +subsprite -32, 4, 1, 16, 32x8 +subsprite 0, 4, 1, 20, 32x8 gSubspriteTables_83ED73C:: @ 85A7FE0 - .4byte 6, gUnknown_085A7FC8 +.4byte 6, gUnknown_085A7FC8 gUnknown_085A7FE8:: @ 85A7FE8 - subsprite -32, -20, 1, 0, 64x32 - subsprite -32, 12, 1, 32, 32x8 - subsprite 0, 12, 1, 36, 32x8 - +subsprite -32, -20, 1, 0, 64x32 +subsprite -32, 12, 1, 32, 32x8 +subsprite 0, 12, 1, 36, 32x8 + gSubspriteTables_83ED75C:: @ 85A7FF4 - .4byte 3, gUnknown_085A7FE8 +.4byte 3, gUnknown_085A7FE8 gUnknown_085A7FFC:: @ 85A7FFC - subsprite -32, -24, 1, 0, 64x32 - subsprite -32, 8, 1, 32, 32x8 - subsprite 0, 8, 1, 36, 32x8 - subsprite -32, 16, 1, 40, 32x8 - subsprite 0, 16, 1, 44, 32x8 - +subsprite -32, -24, 1, 0, 64x32 +subsprite -32, 8, 1, 32, 32x8 +subsprite 0, 8, 1, 36, 32x8 +subsprite -32, 16, 1, 40, 32x8 +subsprite 0, 16, 1, 44, 32x8 + gSubspriteTables_83ED78C:: @ 85A8010 - .4byte 5, gUnknown_085A7FFC - +.4byte 5, gUnknown_085A7FFC + gUnknown_085A8018:: @ 85A8018 - subsprite -32, -8, 1, 0, 32x8 - subsprite 0, -8, 1, 4, 32x8 - subsprite -32, 0, 1, 8, 32x8 - subsprite 0, 0, 1, 12, 32x8 +subsprite -32, -8, 1, 0, 32x8 +subsprite 0, -8, 1, 4, 32x8 +subsprite -32, 0, 1, 8, 32x8 +subsprite 0, 0, 1, 12, 32x8 gSubspriteTables_83ED7B4:: @ 85A8028 - .4byte 4, gUnknown_085A8018 - +.4byte 4, gUnknown_085A8018 + gUnknown_085A8030:: @ 85A8030 - subsprite -8, -12, 1, 0, 16x8 - subsprite -8, -4, 1, 0, 16x8 - subsprite -8, 4, 1, 0, 16x8 +subsprite -8, -12, 1, 0, 16x8 +subsprite -8, -4, 1, 0, 16x8 +subsprite -8, 4, 1, 0, 16x8 gSubspriteTables_83ED7D4:: @ 85A803C - .4byte 3, gUnknown_085A8030 +.4byte 3, gUnknown_085A8030 gUnknown_085A8044:: @ 85A8044 - subsprite -32, -24, 3, 0, 64x32 - subsprite -32, 8, 3, 32, 32x8 - subsprite 0, 8, 3, 36, 32x8 - subsprite -32, 16, 3, 40, 32x8 - subsprite 0, 16, 3, 44, 32x8 +subsprite -32, -24, 3, 0, 64x32 +subsprite -32, 8, 3, 32, 32x8 +subsprite 0, 8, 3, 36, 32x8 +subsprite -32, 16, 3, 40, 32x8 +subsprite 0, 16, 3, 44, 32x8 gUnknown_085A8058:: @ 85A8058 - .4byte 5, gUnknown_085A8044 +.4byte 5, gUnknown_085A8044 gUnknown_085A8060:: @ 85A8060 - subsprite -32, -8, 3, 0, 32x8 - subsprite 0, -8, 3, 4, 32x8 - subsprite -32, 0, 3, 8, 32x8 - subsprite 0, 0, 3, 12, 32x8 +subsprite -32, -8, 3, 0, 32x8 +subsprite 0, -8, 3, 4, 32x8 +subsprite -32, 0, 3, 8, 32x8 +subsprite 0, 0, 3, 12, 32x8 gUnknown_085A8070:: @ 85A8070 - .4byte 4, gUnknown_085A8060 +.4byte 4, gUnknown_085A8060 gUnknown_085A8078:: @ 85A8078 - subsprite -32, -8, 3, 0, 32x8 - subsprite 0, -8, 3, 4, 32x8 - subsprite -32, 0, 3, 8, 32x8 - subsprite 0, 0, 3, 12, 32x8 +subsprite -32, -8, 3, 0, 32x8 +subsprite 0, -8, 3, 4, 32x8 +subsprite -32, 0, 3, 8, 32x8 +subsprite 0, 0, 3, 12, 32x8 gUnknown_085A8088:: @ 85A8088 - .4byte 4, gUnknown_085A8078 - +.4byte 4, gUnknown_085A8078 + gUnknown_085A8090:: @ 85A8090 - subsprite -32, -8, 3, 0, 32x8 - subsprite 0, -8, 3, 4, 32x8 - subsprite -32, 0, 3, 8, 32x8 - subsprite 0, 0, 3, 12, 32x8 +subsprite -32, -8, 3, 0, 32x8 +subsprite 0, -8, 3, 4, 32x8 +subsprite -32, 0, 3, 8, 32x8 +subsprite 0, 0, 3, 12, 32x8 gUnknown_085A80A0:: @ 85A80A0 - .4byte 4, gUnknown_085A8090 - +.4byte 4, gUnknown_085A8090 + gUnknown_085A80A8:: @ 85A80A8 - subsprite -32, -12, 3, 0, 32x8 - subsprite 0, -12, 3, 4, 32x8 - subsprite -32, -4, 3, 8, 32x8 - subsprite 0, -4, 3, 12, 32x8 - subsprite -32, 4, 3, 16, 32x8 - subsprite 0, 4, 3, 20, 32x8 +subsprite -32, -12, 3, 0, 32x8 +subsprite 0, -12, 3, 4, 32x8 +subsprite -32, -4, 3, 8, 32x8 +subsprite 0, -4, 3, 12, 32x8 +subsprite -32, 4, 3, 16, 32x8 +subsprite 0, 4, 3, 20, 32x8 gUnknown_085A80C0:: @ 85A80C0 - .4byte 6, gUnknown_085A80A8 - +.4byte 6, gUnknown_085A80A8 + gUnknown_085A80C8:: @ 85A80C8 - subsprite -16, -16, 3, 0, 32x32 - +subsprite -16, -16, 3, 0, 32x32 + gUnknown_085A80CC:: @ 85A80CC - subsprite -8, -8, 3, 16, 16x16 +subsprite -8, -8, 3, 16, 16x16 gUnknown_085A80D0:: @ 85A80D0 - .4byte 1, gUnknown_085A80C8 - +.4byte 1, gUnknown_085A80C8 + gUnknown_085A80D8:: @ 85A80D8 - .4byte 1, gUnknown_085A80CC - +.4byte 1, gUnknown_085A80CC + gUnknown_085A80E0:: @ 85A80E0 - subsprite -24, -24, 3, 0, 32x8 - subsprite 8, -24, 3, 4, 16x8 - subsprite -24, -16, 3, 6, 32x8 - subsprite 8, -16, 3, 10, 16x8 - subsprite -24, -8, 3, 12, 32x8 - subsprite 8, -8, 3, 16, 16x8 - subsprite -24, 0, 3, 18, 32x8 - subsprite 8, 0, 3, 22, 16x8 - subsprite -24, 8, 3, 24, 32x8 - subsprite 8, 8, 3, 28, 16x8 - subsprite -24, 16, 3, 30, 32x8 - subsprite 8, 16, 3, 34, 16x8 +subsprite -24, -24, 3, 0, 32x8 +subsprite 8, -24, 3, 4, 16x8 +subsprite -24, -16, 3, 6, 32x8 +subsprite 8, -16, 3, 10, 16x8 +subsprite -24, -8, 3, 12, 32x8 +subsprite 8, -8, 3, 16, 16x8 +subsprite -24, 0, 3, 18, 32x8 +subsprite 8, 0, 3, 22, 16x8 +subsprite -24, 8, 3, 24, 32x8 +subsprite 8, 8, 3, 28, 16x8 +subsprite -24, 16, 3, 30, 32x8 +subsprite 8, 16, 3, 34, 16x8 gUnknown_085A8110:: @ 85A8110 - .4byte 12, gUnknown_085A80E0 - +.4byte 12, gUnknown_085A80E0 + gUnknown_085A8118:: @ 85A8118 - subsprite -16, -12, 3, 0, 32x16 - subsprite -16, 4, 3, 8, 16x8 - subsprite 0, 4, 3, 10, 16x8 - +subsprite -16, -12, 3, 0, 32x16 +subsprite -16, 4, 3, 8, 16x8 +subsprite 0, 4, 3, 10, 16x8 + gUnknown_085A8124:: @ 85A8124 - .4byte 3, gUnknown_085A8118 - +.4byte 3, gUnknown_085A8118 + gUnknown_085A812C:: @ 85A812C - subsprite -8, -8, 3, 0, 16x8 - subsprite -8, 0, 3, 8, 16x8 - +subsprite -8, -8, 3, 0, 16x8 +subsprite -8, 0, 3, 8, 16x8 + gUnknown_085A8134:: @ 85A8134 - .4byte 2, gUnknown_085A812C - +.4byte 2, gUnknown_085A812C + gUnknown_085A813C:: @ 85A813C - subsprite -8, -8, 3, 2, 16x8 - subsprite -8, 0, 3, 10, 16x8 - +subsprite -8, -8, 3, 2, 16x8 +subsprite -8, 0, 3, 10, 16x8 + gUnknown_085A8144:: @ 85A8144 - .4byte 2, gUnknown_085A813C - +.4byte 2, gUnknown_085A813C + gUnknown_085A814C:: @ 85A814C - subsprite -8, -8, 3, 4, 16x8 - subsprite -8, 0, 3, 12, 16x8 - +subsprite -8, -8, 3, 4, 16x8 +subsprite -8, 0, 3, 12, 16x8 + gUnknown_085A8154:: @ 85A8154 - .4byte 2, gUnknown_085A814C - +.4byte 2, gUnknown_085A814C + gUnknown_085A815C:: @ 85A815C - subsprite -8, -8, 3, 6, 16x8 - subsprite -8, 0, 3, 14, 16x8 - +subsprite -8, -8, 3, 6, 16x8 +subsprite -8, 0, 3, 14, 16x8 + gUnknown_085A8164:: @ 85A8164 - .4byte 2, gUnknown_085A815C - +.4byte 2, gUnknown_085A815C + gUnknown_085A816C:: @ 85A816C - subsprite -8, -8, 3, 0, 16x8 - subsprite -8, 0, 3, 8, 16x8 - +subsprite -8, -8, 3, 0, 16x8 +subsprite -8, 0, 3, 8, 16x8 + gUnknown_085A8174:: @ 85A8174 - .4byte 2, gUnknown_085A816C - +.4byte 2, gUnknown_085A816C + gUnknown_085A817C:: @ 85A817C - subsprite -4, -8, 3, 2, 8x8 - subsprite -4, 0, 3, 10, 8x8 - +subsprite -4, -8, 3, 2, 8x8 +subsprite -4, 0, 3, 10, 8x8 + gUnknown_085A8184:: @ 85A8184 - .4byte 2, gUnknown_085A817C - +.4byte 2, gUnknown_085A817C + gUnknown_085A818C:: @ 85A818C - subsprite -8, -8, 3, 3, 16x8 - subsprite -8, 0, 3, 11, 16x8 - +subsprite -8, -8, 3, 3, 16x8 +subsprite -8, 0, 3, 11, 16x8 + gUnknown_085A8194:: @ 85A8194 - .4byte 2, gUnknown_085A818C - +.4byte 2, gUnknown_085A818C + gUnknown_085A819C:: @ 85A819C - subsprite -4, -8, 3, 5, 8x8 - subsprite -4, 0, 3, 13, 8x8 - +subsprite -4, -8, 3, 5, 8x8 +subsprite -4, 0, 3, 13, 8x8 + gUnknown_085A81A4:: @ 85A81A4 - .4byte 2, gUnknown_085A819C - +.4byte 2, gUnknown_085A819C + gUnknown_085A81AC:: @ 85A81AC - subsprite -8, -8, 3, 6, 16x8 - subsprite -8, 0, 3, 14, 16x8 - +subsprite -8, -8, 3, 6, 16x8 +subsprite -8, 0, 3, 14, 16x8 + gUnknown_085A81B4:: @ 85A81B4 - .4byte 2, gUnknown_085A81AC - +.4byte 2, gUnknown_085A81AC + gUnknown_085A81BC:: @ 85A81BC - subsprite -12, -12, 3, 0, 16x8 - subsprite 4, -12, 3, 2, 8x8 - subsprite -12, -4, 3, 8, 16x8 - subsprite 4, -4, 3, 10, 8x8 - subsprite -12, 4, 3, 16, 16x8 - subsprite 4, 4, 3, 18, 8x8 - +subsprite -12, -12, 3, 0, 16x8 +subsprite 4, -12, 3, 2, 8x8 +subsprite -12, -4, 3, 8, 16x8 +subsprite 4, -4, 3, 10, 8x8 +subsprite -12, 4, 3, 16, 16x8 +subsprite 4, 4, 3, 18, 8x8 + gUnknown_085A81D4:: @ 85A81D4 - .4byte 6, gUnknown_085A81BC - +.4byte 6, gUnknown_085A81BC + gUnknown_085A81DC:: @ 85A81DC - subsprite -8, -12, 3, 3, 16x8 - subsprite -8, -4, 3, 11, 16x8 - subsprite -8, 4, 3, 19, 16x8 - +subsprite -8, -12, 3, 3, 16x8 +subsprite -8, -4, 3, 11, 16x8 +subsprite -8, 4, 3, 19, 16x8 + gUnknown_085A81E8:: @ 85A81E8 - .4byte 3, gUnknown_085A81DC - +.4byte 3, gUnknown_085A81DC + gUnknown_085A81F0:: @ 85A81F0 - subsprite -12, -12, 3, 5, 16x8 - subsprite 4, -12, 3, 7, 8x8 - subsprite -12, -4, 3, 13, 16x8 - subsprite 4, -4, 3, 15, 8x8 - subsprite -12, 4, 3, 21, 16x8 - subsprite 4, 4, 3, 0x17, 8x8 - +subsprite -12, -12, 3, 5, 16x8 +subsprite 4, -12, 3, 7, 8x8 +subsprite -12, -4, 3, 13, 16x8 +subsprite 4, -4, 3, 15, 8x8 +subsprite -12, 4, 3, 21, 16x8 +subsprite 4, 4, 3, 0x17, 8x8 + gUnknown_085A8208:: @ 85A8208 - .4byte 6, gUnknown_085A81F0 - +.4byte 6, gUnknown_085A81F0 + gUnknown_085A8210:: @ 85A8210 - subsprite -12, -12, 3, 0, 16x8 - subsprite 4, -12, 3, 2, 8x8 - subsprite -12, -4, 3, 8, 16x8 - subsprite 4, -4, 3, 10, 8x8 - subsprite -12, 4, 3, 16, 16x8 - subsprite 4, 4, 3, 18, 8x8 - +subsprite -12, -12, 3, 0, 16x8 +subsprite 4, -12, 3, 2, 8x8 +subsprite -12, -4, 3, 8, 16x8 +subsprite 4, -4, 3, 10, 8x8 +subsprite -12, 4, 3, 16, 16x8 +subsprite 4, 4, 3, 18, 8x8 + gUnknown_085A8228:: @ 85A8228 - .4byte 6, gUnknown_085A8210 - +.4byte 6, gUnknown_085A8210 + gUnknown_085A822C:: @ 85A822C - subsprite -8, -12, 3, 3, 16x8 - subsprite -8, -4, 3, 11, 16x8 - subsprite -8, 4, 3, 19, 16x8 - +subsprite -8, -12, 3, 3, 16x8 +subsprite -8, -4, 3, 11, 16x8 +subsprite -8, 4, 3, 19, 16x8 + gUnknown_085A823C:: @ 85A823C - .4byte 3, gUnknown_085A822C - +.4byte 3, gUnknown_085A822C + gUnknown_085A8244:: @ 85A8244 - subsprite -12, -12, 3, 5, 16x8 - subsprite 4, -12, 3, 7, 8x8 - subsprite -12, -4, 3, 13, 16x8 - subsprite 4, -4, 3, 15, 8x8 - subsprite -12, 4, 3, 21, 16x8 - subsprite 4, 4, 3, 23, 8x8 - +subsprite -12, -12, 3, 5, 16x8 +subsprite 4, -12, 3, 7, 8x8 +subsprite -12, -4, 3, 13, 16x8 +subsprite 4, -4, 3, 15, 8x8 +subsprite -12, 4, 3, 21, 16x8 +subsprite 4, 4, 3, 23, 8x8 + gUnknown_085A825C:: @ 85A825C - .4byte 6, gUnknown_085A8244 +.4byte 6, gUnknown_085A8244 gUnknown_083EDB5C:: @ 85A8264 - .4byte gUnknown_085A7E48 - .4byte gUnknown_085A7E60 - .4byte gUnknown_085A7E78 - .4byte gUnknown_085A7EA8 - .4byte gUnknown_085A7EC0 - .4byte gUnknown_085A7F20 - .4byte gUnknown_085A7F38 - .4byte gUnknown_085A7F50 - .4byte gUnknown_085A7F68 - .4byte gUnknown_085A7F80 - .4byte gUnknown_085A7E90 - .4byte gUnknown_085A7E90 - .4byte gUnknown_085A7E90 - .4byte gUnknown_085A7E90 - .4byte gUnknown_085A7ED8 - .4byte gUnknown_085A7ED8 - .4byte gUnknown_085A7ED8 - .4byte gUnknown_085A7ED8 - .4byte gUnknown_085A7ED8 - .4byte gUnknown_085A7EF0 - .4byte gUnknown_085A7EF0 - .4byte gUnknown_085A7EF0 - .4byte gUnknown_085A7F08 - .4byte gUnknown_085A7F08 - .4byte gUnknown_085A7F08 - .4byte gDummySpriteTemplate +.4byte gUnknown_085A7E48 +.4byte gUnknown_085A7E60 +.4byte gUnknown_085A7E78 +.4byte gUnknown_085A7EA8 +.4byte gUnknown_085A7EC0 +.4byte gUnknown_085A7F20 +.4byte gUnknown_085A7F38 +.4byte gUnknown_085A7F50 +.4byte gUnknown_085A7F68 +.4byte gUnknown_085A7F80 +.4byte gUnknown_085A7E90 +.4byte gUnknown_085A7E90 +.4byte gUnknown_085A7E90 +.4byte gUnknown_085A7E90 +.4byte gUnknown_085A7ED8 +.4byte gUnknown_085A7ED8 +.4byte gUnknown_085A7ED8 +.4byte gUnknown_085A7ED8 +.4byte gUnknown_085A7ED8 +.4byte gUnknown_085A7EF0 +.4byte gUnknown_085A7EF0 +.4byte gUnknown_085A7EF0 +.4byte gUnknown_085A7F08 +.4byte gUnknown_085A7F08 +.4byte gUnknown_085A7F08 +.4byte gDummySpriteTemplate gUnknown_083EDBC4:: @ 85A82CC - .4byte gUnknown_085A8058 - .4byte gUnknown_085A8070 - .4byte gUnknown_085A8088 - .4byte gUnknown_085A80C0 - .4byte NULL - .4byte NULL - .4byte gUnknown_085A80D0 - .4byte NULL - .4byte gUnknown_085A8110 - .4byte gUnknown_085A8124 - .4byte gUnknown_085A8134 - .4byte gUnknown_085A8144 - .4byte gUnknown_085A8154 - .4byte gUnknown_085A8164 - .4byte gUnknown_085A8174 - .4byte gUnknown_085A8184 - .4byte gUnknown_085A8194 - .4byte gUnknown_085A81A4 - .4byte gUnknown_085A81B4 - .4byte gUnknown_085A81D4 - .4byte gUnknown_085A81E8 - .4byte gUnknown_085A8208 - .4byte gUnknown_085A8228 - .4byte gUnknown_085A823C - .4byte gUnknown_085A825C - .4byte NULL +.4byte gUnknown_085A8058 +.4byte gUnknown_085A8070 +.4byte gUnknown_085A8088 +.4byte gUnknown_085A80C0 +.4byte NULL +.4byte NULL +.4byte gUnknown_085A80D0 +.4byte NULL +.4byte gUnknown_085A8110 +.4byte gUnknown_085A8124 +.4byte gUnknown_085A8134 +.4byte gUnknown_085A8144 +.4byte gUnknown_085A8154 +.4byte gUnknown_085A8164 +.4byte gUnknown_085A8174 +.4byte gUnknown_085A8184 +.4byte gUnknown_085A8194 +.4byte gUnknown_085A81A4 +.4byte gUnknown_085A81B4 +.4byte gUnknown_085A81D4 +.4byte gUnknown_085A81E8 +.4byte gUnknown_085A8208 +.4byte gUnknown_085A8228 +.4byte gUnknown_085A823C +.4byte gUnknown_085A825C +.4byte NULL - .align 2 +.align 2 sSlotMachineSpriteSheets:: @ 85A8334 - obj_tiles gSlotMachineReelSymbol1Tiles, 0x0200, 0x0000 - obj_tiles gSlotMachineReelSymbol2Tiles, 0x0200, 0x0001 - obj_tiles gSlotMachineReelSymbol3Tiles, 0x0200, 0x0002 - obj_tiles gSlotMachineReelSymbol4Tiles, 0x0200, 0x0003 - obj_tiles gSlotMachineReelSymbol5Tiles, 0x0200, 0x0004 - obj_tiles gSlotMachineReelSymbol6Tiles, 0x0200, 0x0005 - obj_tiles gSlotMachineReelSymbol7Tiles, 0x0200, 0x0006 - obj_tiles gSlotMachineNumber0Tiles, 0x0040, 0x0007 - obj_tiles gSlotMachineNumber1Tiles, 0x0040, 0x0008 - obj_tiles gSlotMachineNumber2Tiles, 0x0040, 0x0009 - obj_tiles gSlotMachineNumber3Tiles, 0x0040, 0x000A - obj_tiles gSlotMachineNumber4Tiles, 0x0040, 0x000B - obj_tiles gSlotMachineNumber5Tiles, 0x0040, 0x000C - obj_tiles gSlotMachineNumber6Tiles, 0x0040, 0x000D - obj_tiles gSlotMachineNumber7Tiles, 0x0040, 0x000E - obj_tiles gSlotMachineNumber8Tiles, 0x0040, 0x000F - obj_tiles gSlotMachineNumber9Tiles, 0x0040, 0x0010 +obj_tiles gSlotMachineReelSymbol1Tiles, 0x0200, 0x0000 +obj_tiles gSlotMachineReelSymbol2Tiles, 0x0200, 0x0001 +obj_tiles gSlotMachineReelSymbol3Tiles, 0x0200, 0x0002 +obj_tiles gSlotMachineReelSymbol4Tiles, 0x0200, 0x0003 +obj_tiles gSlotMachineReelSymbol5Tiles, 0x0200, 0x0004 +obj_tiles gSlotMachineReelSymbol6Tiles, 0x0200, 0x0005 +obj_tiles gSlotMachineReelSymbol7Tiles, 0x0200, 0x0006 +obj_tiles gSlotMachineNumber0Tiles, 0x0040, 0x0007 +obj_tiles gSlotMachineNumber1Tiles, 0x0040, 0x0008 +obj_tiles gSlotMachineNumber2Tiles, 0x0040, 0x0009 +obj_tiles gSlotMachineNumber3Tiles, 0x0040, 0x000A +obj_tiles gSlotMachineNumber4Tiles, 0x0040, 0x000B +obj_tiles gSlotMachineNumber5Tiles, 0x0040, 0x000C +obj_tiles gSlotMachineNumber6Tiles, 0x0040, 0x000D +obj_tiles gSlotMachineNumber7Tiles, 0x0040, 0x000E +obj_tiles gSlotMachineNumber8Tiles, 0x0040, 0x000F +obj_tiles gSlotMachineNumber9Tiles, 0x0040, 0x0010 - .align 2 - .byte 0, 0, 0, 0, 0, 2, 0x12, 0, 0, 0, 0, 0, 0, 2, 0x13, 0, 0, 0, 0, 0, 0, 3, 0x14, 0, 0, 0, 0, 0, 0, 3, 0x15, 0, 0, 0, 0, 0, 0, 0, 0, 0 +.align 2 +.byte 0, 0, 0, 0, 0, 2, 0x12, 0, 0, 0, 0, 0, 0, 2, 0x13, 0, 0, 0, 0, 0, 0, 3, 0x14, 0, 0, 0, 0, 0, 0, 3, 0x15, 0, 0, 0, 0, 0, 0, 0, 0, 0 gUnknown_083EDCDC:: @ 85A83E4 - .4byte gUnknown_08DD19F8 - @ might be a palette idk - .byte 0x7B, 0x6F, 0x68, 0x69, 0xAB, 0x36, 0xFF, 0x7F, 0x50, 0x57, 0xC0, 0x7E, 0xBA, 2, 0xBA, 2, 0xFD, 1, 0xFD, 1 - -gUnknown_085A83FC:: @ 85A83FC - .byte 0x91, 0x7F - -gUnknown_085A83FE:: @ 85A83FE - .byte 0xBF, 0x43 +.4byte gUnknown_08DD19F8 +@ might be a palette idk +.byte 0x7B, 0x6F, 0x68, 0x69, 0xAB, 0x36, 0xFF, 0x7F, 0x50, 0x57, 0xC0, 0x7E, 0xBA, 2, 0xBA, 2, 0xFD, 1, 0xFD, 1 + +gUnknown_085A83FC:: @ 85A83FC +.byte 0x91, 0x7F + +gUnknown_085A83FE:: @ 85A83FE +.byte 0xBF, 0x43 gUnknown_085A8400:: @ 85A8400 - .byte 0xBF, 0x43 - +.byte 0xBF, 0x43 + gUnknown_085A8402:: @ 85A8402 - .byte 0xBF, 0x4A - +.byte 0xBF, 0x4A + gUnknown_085A8404:: @ 85A8404 - .byte 0xBF, 0x4A, 0, 0 +.byte 0xBF, 0x4A, 0, 0 gUnknown_083EDD08:: @ 85A8408 - .4byte gUnknown_085A83FC - .4byte gUnknown_085A83FE - .4byte gUnknown_085A8400 - .4byte gUnknown_085A8402 - .4byte gUnknown_085A8404 +.4byte gUnknown_085A83FC +.4byte gUnknown_085A83FE +.4byte gUnknown_085A8400 +.4byte gUnknown_085A8402 +.4byte gUnknown_085A8404 gUnknown_083EDD1C:: @ 85A841C - .4byte gSlotMachineMenu_Pal + 0x94 - .4byte gSlotMachineMenu_Pal + 0x96 - .4byte gSlotMachineMenu_Pal + 0x98 - .4byte gSlotMachineMenu_Pal + 0x9A - .4byte gSlotMachineMenu_Pal + 0x9C +.4byte gSlotMachineMenu_Pal + 0x94 +.4byte gSlotMachineMenu_Pal + 0x96 +.4byte gSlotMachineMenu_Pal + 0x98 +.4byte gSlotMachineMenu_Pal + 0x9A +.4byte gSlotMachineMenu_Pal + 0x9C gUnknown_083EDD30:: @ 85A8430 - .byte 0x4A, 0x4B, 0x4C, 0x4E, 0x4D +.byte 0x4A, 0x4B, 0x4C, 0x4E, 0x4D -gUnknown_083EDD35:: @ 85A8435 - .byte 0, 0 - .byte 1, 2 - .byte 3, 4 +gBettingTilesId:: @ 85A8435 +.byte 0, 0 +.byte 1, 2 +.byte 3, 4 + +gNumberBettingTiles:: @ 85A843B +.byte 1, 2, 2 -gUnknown_083EDD3B:: @ 85A843B - .byte 1, 2, 2 - gUnknown_085A843E:: @ 85A843E - .incbin "graphics/slot_machine/85A843E.gbapal" - -gUnknown_085A845E:: @ 85A845E - .incbin "graphics/slot_machine/85A845E.gbapal" - -gUnknown_085A847E:: @ 85A847E - .incbin "graphics/slot_machine/85A847E.gbapal" +.incbin "graphics/slot_machine/85A843E.gbapal" - .align 2 +gUnknown_085A845E:: @ 85A845E +.incbin "graphics/slot_machine/85A845E.gbapal" + +gUnknown_085A847E:: @ 85A847E +.incbin "graphics/slot_machine/85A847E.gbapal" + +.align 2 gUnknown_083EDDA0:: @ 85A84A0 - .4byte gUnknown_085A843E - .4byte gUnknown_085A845E - .4byte gUnknown_085A847E +.4byte gUnknown_085A843E +.4byte gUnknown_085A845E +.4byte gUnknown_085A847E gUnknown_083EDDAC:: @ 85A84AC - .4byte gSlotMachineMenu_Pal + 0x20 - +.4byte gSlotMachineMenu_Pal + 0x20 + gUnknown_085A84B0:: @ 85A84B0 - .incbin "graphics/slot_machine/85A84B0.gbapal" - +.incbin "graphics/slot_machine/85A84B0.gbapal" + gUnknown_085A84D0:: @ 85A84D0 - .incbin "graphics/slot_machine/85A84D0.gbapal" - +.incbin "graphics/slot_machine/85A84D0.gbapal" + gUnknown_085A84F0:: @ 85A84F0 - .incbin "graphics/slot_machine/85A84F0.gbapal" +.incbin "graphics/slot_machine/85A84F0.gbapal" gUnknown_083EDE10:: @ 85A8510 - .4byte gUnknown_085A84B0 - .4byte gUnknown_085A84D0 - .4byte gUnknown_085A84F0 - .4byte gUnknown_08DCF230 +.4byte gUnknown_085A84B0 +.4byte gUnknown_085A84D0 +.4byte gUnknown_085A84F0 +.4byte gUnknown_08DCF230 gUnknown_083EDE20:: @ 85A8520 - .4byte gUnknown_08DCF230 +.4byte gUnknown_08DCF230 gPalette_83EDE24:: @ 85A8524 - .incbin "graphics/slot_machine/85A8524.bin" +.incbin "graphics/slot_machine/85A8524.bin" - .align 2 +.align 2 gSlotMachineSpritePalettes:: @ 85A8544 - obj_pal gUnknown_08DCF170, 0 - obj_pal gUnknown_08DCF190, 1 - obj_pal gUnknown_08DCF1B0, 2 - obj_pal gSlotMachineReelTime_Pal, 3 - obj_pal gUnknown_08DCF1F0, 4 - obj_pal gUnknown_08DCF210, 5 - obj_pal gUnknown_08DCF230, 6 - obj_pal gUnknown_08DCF1F0, 7 - null_obj_pal +obj_pal gUnknown_08DCF170, 0 +obj_pal gUnknown_08DCF190, 1 +obj_pal gUnknown_08DCF1B0, 2 +obj_pal gSlotMachineReelTime_Pal, 3 +obj_pal gUnknown_08DCF1F0, 4 +obj_pal gUnknown_08DCF210, 5 +obj_pal gUnknown_08DCF230, 6 +obj_pal gUnknown_08DCF1F0, 7 +null_obj_pal sReelTimeGfx:: @ 85A858C - .incbin "graphics/slot_machine/reel_time_gfx.4bpp.lz" +.incbin "graphics/slot_machine/reel_time_gfx.4bpp.lz" sReelTimeWindowTilemap:: @ 85A96E0 - @if anyone knows what this tilemap is please do share - .incbin "graphics/slot_machine/85A96E0.bin" +@if anyone knows what this tilemap is please do share +.incbin "graphics/slot_machine/85A96E0.bin" gUnknown_085A9898:: @ 85A9898 - .4byte NULL +.4byte NULL diff --git a/include/slot_machine.h b/include/slot_machine.h index 88bbbd91bd..fae937834e 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -1,6 +1,9 @@ #ifndef GUARD_SLOT_MACHINE_H #define GUARD_SLOT_MACHINE_H +#define REEL_NUM_TAGS 21 + + void PlaySlotMachine(u8, void (callback)(void)); #endif // GUARD_SLOT_MACHINE_H diff --git a/include/task.h b/include/task.h index a199ba1287..4852571b44 100644 --- a/include/task.h +++ b/include/task.h @@ -1,6 +1,9 @@ #ifndef GUARD_TASK_H #define GUARD_TASK_H +#define HEAD_SENTINEL 0xFE +#define TAIL_SENTINEL 0xFF + #define NUM_TASKS 16 typedef void (*TaskFunc)(u8 taskId); diff --git a/include/tv.h b/include/tv.h index a7ef3daa8b..0f50f2327b 100644 --- a/include/tv.h +++ b/include/tv.h @@ -1,6 +1,9 @@ #ifndef GUARD_TV_H #define GUARD_TV_H +#define SLOT_MACHINE 0 +#define ROULETTE 1 + extern u8 *const gTVStringVarPtrs[3]; void ClearTVShowData(void); @@ -23,9 +26,9 @@ bool8 GetPriceReduction(u8 newsKind); void sub_80F14F8(TVShow *shows); size_t CountDigits(int value); u8 GetRibbonCount(struct Pokemon *pokemon); -void sub_80EDE70(u16 nCoinsSpent); -void sub_80EDE84(u16 nCoinsSpent); -void sub_80EDD78(u16 nCoinsPaidOut); +void reportPlayedSlotMachine(u16 nCoinsSpent); +void reportPlayedRoulette(u16 nCoinsSpent); +void reportNewCoinTotal(u16 nCoinsPaidOut); void sub_80EEA70(void); void sub_80EDB44(void); void sub_80EDC60(const u16 *words); diff --git a/src/roulette.c b/src/roulette.c index a6a020f396..b19750f2a8 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -996,7 +996,7 @@ static void sub_81405CC(void) taskId = gUnknown_0203AB88->varA4 = CreateTask(sub_81408A8, 0); gTasks[taskId].data[6] = 6; gTasks[taskId].data[13] = GetCoins(); - sub_80EDE84(GetCoins()); + reportPlayedRoulette(GetCoins()); gUnknown_0203AB88->varA5 = CreateTask(sub_8140814, 1); SetMainCallback2(sub_8140238); return; @@ -1964,7 +1964,7 @@ static void sub_8141DE4(u8 taskId) gSpecialVar_0x8004 = TRUE; else gSpecialVar_0x8004 = FALSE; - sub_80EDD78(GetCoins()); + reportNewCoinTotal(GetCoins()); BeginHardwarePaletteFade(0xFF, 0, 0, 16, 0); gTasks[taskId].func = sub_8141E7C; } diff --git a/src/slot_machine.c b/src/slot_machine.c index 0871506cd0..7552e755c6 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -59,34 +59,34 @@ enum struct SlotMachineEwramStruct { - /*0x00*/ u8 state; - /*0x01*/ u8 unk01; + /*0x00*/ u8 slotActionPtr; + /*0x01*/ u8 machineId; /*0x02*/ u8 pikaPower; - /*0x03*/ u8 unk03; - /*0x04*/ u8 unk04; - /*0x05*/ u8 unk05; - /*0x06*/ u8 unk06; - /*0x07*/ u8 unk07; + /*0x03*/ u8 luckyGame; + /*0x04*/ u8 luckyFlags; + /*0x05*/ u8 reelTimeDraw; + /*0x06*/ u8 isBiasTagMatchPossible; // tentative + /*0x07*/ u8 biasTag; /*0x08*/ u16 matchedSymbols; - /*0x0A*/ u8 unk0A; - /*0x0B*/ u8 unk0B; + /*0x0A*/ u8 fairRollsLeft; + /*0x0B*/ u8 fairRollsUsed; /*0x0C*/ s16 coins; /*0x0E*/ s16 payout; - /*0x10*/ s16 unk10; + /*0x10*/ s16 netCoinLoss; // coins lost to machine (but never goes below 0) /*0x12*/ s16 bet; - /*0x14*/ s16 unk14; - /*0x16*/ s16 unk16; - /*0x18*/ s16 unk18; - /*0x1A*/ s16 unk1A; - /*0x1C*/ s16 unk1C[3]; - /*0x22*/ u16 unk22[3]; + /*0x14*/ s16 reelTimePixelOffset; + /*0x16*/ s16 reelTimePosition; + /*0x18*/ s16 currReel; + /*0x1A*/ s16 reelIncrement; + /*0x1C*/ s16 reelPixelOffsets[3]; + /*0x22*/ u16 stopReelPixelOffset[3]; /*0x28*/ s16 reelPositions[3]; - /*0x2E*/ s16 unk2E[3]; - /*0x34*/ s16 unk34[3]; + /*0x2E*/ s16 reelExtraTurns[3]; + /*0x34*/ s16 biasTagFinalPositions[3]; /*0x3A*/ u8 reelTasks[3]; - /*0x3D*/ u8 unk3D; - /*0x3E*/ u8 unk3E; - /*0x3F*/ u8 unk3F; + /*0x3D*/ u8 unkTaskPointer3D; + /*0x3E*/ u8 unkTaskPointer; + /*0x3F*/ u8 reelTimeSprite3F; /*0x40*/ u8 unk40; /*0x41*/ u8 unk41; /*0x42*/ u8 unk42; @@ -95,8 +95,8 @@ struct SlotMachineEwramStruct /*0x49*/ u8 unk49[2]; /*0x49*/ u8 unk4B[3]; /*0x4E*/ u8 unk4E[2]; - /*0x50*/ u8 unk50[2]; - /*0x52*/ u8 unk52[2]; + /*0x50*/ u8 reelTimeSprites1[2]; + /*0x52*/ u8 reelTimeSprites2[2]; /*0x54*/ u8 unk54[4]; /*0x58*/ u16 win0h; /*0x5a*/ u16 win0v; @@ -117,7 +117,7 @@ struct UnkStruct1 /*static */void CB2_SlotMachineSetup(void); /*static */void CB2_SlotMachineLoop(void); -/*static */void PlaySlotMachine_Internal(u8 arg0, MainCallback cb); +/*static */void PlaySlotMachine_Internal(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinueScriptPlayMapMusic); /*static */void SlotMachineDummyTask(u8 taskId); /*static */void SlotMachineSetup_0_0(void); /*static */void SlotMachineSetup_6_2(void); @@ -133,88 +133,88 @@ struct UnkStruct1 /*static */void SlotMachineSetup_8_0(void); /*static */void SlotMachineSetup_9_0(void); /*static */void SlotMachineSetup_10_0(void); -/*static */void SlotMachineSetup_10_1(void); -/*static */void sub_8101D04(void); +/*static */void SlotMachineSetupGameplayTasks(void); +/*static */void GameplayTasks_Slot(void); /*static */void sub_8104DA4(void); -/*static */void sub_8101D24(u8 taskId); -/*static */bool8 sub_8101D5C(struct Task *task); -/*static */bool8 sub_8101D8C(struct Task *task); -/*static */bool8 sub_8101DB0(struct Task *task); -/*static */bool8 sub_8101DF4(struct Task *task); -/*static */bool8 sub_8101E10(struct Task *task); -/*static */bool8 sub_8101E3C(struct Task *task); -/*static */bool8 sub_8101F44(struct Task *task); -/*static */bool8 sub_8101F60(struct Task *task); -/*static */bool8 sub_8101F88(struct Task *task); -/*static */bool8 sub_8101FA4(struct Task *task); -/*static */bool8 sub_8102008(struct Task *task); -/*static */bool8 sub_8102034(struct Task *task); -/*static */bool8 sub_8102058(struct Task *task); -/*static */bool8 sub_8102090(struct Task *task); -/*static */bool8 sub_81020C8(struct Task *task); -/*static */bool8 sub_81021E0(struct Task *task); -/*static */bool8 sub_81021FC(struct Task *task); -/*static */bool8 sub_8102264(struct Task *task); -/*static */bool8 sub_81022A0(struct Task *task); -/*static */bool8 sub_81022CC(struct Task *task); -/*static */bool8 sub_81022F0(struct Task *task); -/*static */bool8 sub_8102318(struct Task *task); -/*static */bool8 sub_8102344(struct Task *task); -/*static */bool8 sub_810239C(struct Task *task); -/*static */bool8 sub_81023B8(struct Task *task); -/*static */bool8 sub_81023E0_(struct Task *task); -/*static */bool8 sub_81023FC(struct Task *task); -/*static */bool8 sub_8102424(struct Task *task); -/*static */bool8 sub_8102460(struct Task *task); -/*static */void sub_8102484(void); -/*static */void sub_81024F0(void); -/*static */bool8 sub_8102540_(void); -/*static */u8 sub_8102578(void); -/*static */u16 dp15_jump_random_unknown(void); -/*static */u8 sub_81025BC(void); +/*static */void RunSlotActions(u8 taskId); +/*static */bool8 SlotAction_UnfadeScreen(struct Task *task); +/*static */bool8 SlotAction_WaitForUnfade(struct Task *task); +/*static */bool8 SlotAction_SetSlotMachineVars(struct Task *task); +/*static */bool8 SlotAction3(struct Task *task); +/*static */bool8 SlotAction4(struct Task *task); +/*static */bool8 SlotAction_AwaitPlayerInput(struct Task *task); +/*static */bool8 SlotAction_PrintYouDontHaveThreeCoins(struct Task *task); +/*static */bool8 SlotAction_PlayerAcceptsNotHavingThreeCoins(struct Task *task); +/*static */bool8 SlotAction_GivingInformation(struct Task *task); +/*static */bool8 SlotAction9(struct Task *task); +/*static */bool8 SlotAction10(struct Task *task); +/*static */bool8 SlotAction11(struct Task *task); +/*static */bool8 SlotAction_AwaitReelStop(struct Task *task); +/*static */bool8 SlotAction_WaitForAllReelsToStop(struct Task *task); +/*static */bool8 SlotAction_CheckMatches(struct Task *task); +/*static */bool8 SlotAction_WaitForPayoutToBeAwarded(struct Task *task); +/*static */bool8 SlotAction_EndOfRoll(struct Task *task); +/*static */bool8 SlotAction17(struct Task *task); +/*static */bool8 SlotAction18(struct Task *task); +/*static */bool8 SlotAction_Loop(struct Task *task); +/*static */bool8 SlotAction_NoMatches(struct Task *task); +/*static */bool8 SlotAction_PrintQuitTheGame(struct Task *task); +/*static */bool8 SlotAction_SeeIfPlayerQuits(struct Task *task); +/*static */bool8 SlotAction_Print9999CoinMessage(struct Task *task); +/*static */bool8 SlotAction_Escape9999CoinMessage(struct Task *task); +/*static */bool8 SlotAction_PrintNoMoreCoins(struct Task *task); +/*static */bool8 SlotAction_EscapeNoMoreCoins(struct Task *task); +/*static */bool8 SlotAction_EndGame(struct Task *task); +/*static */bool8 SlotAction_FreeDataStructures(struct Task *task); +/*static */void DrawForLuckyFlags(void); +/*static */void AnyLuckyFlagsSet(void); +/*static */bool8 IsLuckyRound(void); +/*static */u8 AttemptsAtLuckiness1(void); +/*static */u16 DrawNewReelIncrement(void); +/*static */u8 AttemptsAtLuckiness2(void); /*static */void CheckMatch(void); /*static */void CheckMatch_CenterRow(void); /*static */void CheckMatch_TopAndBottom(void); /*static */void CheckMatch_Diagonals(void); /*static */u8 GetMatchFromSymbolsInRow(u8 c1, u8 c2, u8 c3); -/*static */void sub_8102A24(void); -/*static */void sub_8102A64(u8 taskId); -/*static */bool8 sub_8102A44(void); -/*static */bool8 sub_8102A9C(struct Task *task); -/*static */bool8 sub_8102AD0(struct Task *task); -/*static */bool8 sub_8102B80(struct Task *task); -/*static */u8 GetTagOfReelSymbolOnScreenAtPos(u8 x, s16 y); -/*static */void sub_8102DA8(void); -/*static */void sub_8102DEC(u8 a0); +/*static */void AwardPayout(void); +/*static */void RunAwardPayoutActions(u8 taskId); +/*static */bool8 IsFinalTask_RunAwardPayoutActions(void); +/*static */bool8 AwardPayoutAction1(struct Task *task); +/*static */bool8 AwardPayoutAction_GivePayoutToPlayer(struct Task *task); +/*static */bool8 AwardPayoutAction_FreeTask(struct Task *task); +/*static */u8 GetNearbyTag(u8 x, s16 y); +/*static */void GameplayTask_StopReel(void); +/*static */void ReelTasks_8102DEC(u8 a0); /*static */void sub_8102E1C(u8 a0); -/*static */bool8 sub_8102E40(u8 a0); -/*static */void sub_8102E68(u8 taskId); -/*static */bool8 sub_8102EA0(struct Task *task); -/*static */bool8 sub_8102EA4(struct Task *task); -/*static */bool8 sub_8102EC0(struct Task *task); -/*static */bool8 sub_8102F4C(struct Task *task); -/*static */bool8 sub_8103008(struct Task *task); -/*static */bool8 sub_810305C(void); -/*static */bool8 sub_8103154(u8 a0, u8 a1); -/*static */bool8 sub_81031B4(u8 a0, u8 a1); -/*static */bool8 sub_81032C0(void); -/*static */bool8 sub_81032E8(void); -/*static */bool8 sub_810333C(void); -/*static */bool8 sub_81033DC(void); -/*static */bool8 sub_810341C(u8 a0); -/*static */bool8 sub_810347C(u8 a0); -/*static */void sub_81034F4(void); -/*static */void sub_8103540(void); -/*static */void sub_8103564(void); -/*static */void j5_08111E84(void); -/*static */void sub_8103668(void); -/*static */void sub_810380C(void); +/*static */bool8 IsReelMoving(u8 a0); +/*static */void RunReelActions(u8 taskId); +/*static */bool8 ReelAction_StayStill(struct Task *task); +/*static */bool8 ReelAction_Spin(struct Task *task); +/*static */bool8 ReelAction_DecideWhereToStop(struct Task *task); +/*static */bool8 ReelAction_TurnToSelectedTag(struct Task *task); +/*static */bool8 ReelAction_OscillatingStop(struct Task *task); +/*static */bool8 DecideReelTurns_BiasTag_Reel1(void); +/*static */bool8 DecideReelTurns_BiasTag_Reel1_Bet1(u8 a0, u8 a1); +/*static */bool8 DecideReelTurns_BiasTag_Reel1_Bet2or3(u8 a0, u8 a1); +/*static */bool8 DecideReelTurns_BiasTag_Reel2(void); +/*static */bool8 DecideReelTurns_BiasTag_Reel2_Bet1or2(void); +/*static */bool8 DecideReelTurns_BiasTag_Reel2_Bet3(void); +/*static */bool8 DecideReelTurns_BiasTag_Reel3(void); +/*static */bool8 DecideReelTurns_BiasTag_Reel3_Bet1or2(u8 a0); +/*static */bool8 DecideReelTurns_BiasTag_Reel3_Bet3(u8 a0); +/*static */void DecideReelTurns_NoBiasTag_Reel1(void); +/*static */void DecideReelTurns_NoBiasTag_Reel2(void); +/*static */void DecideReelTurns_NoBiasTag_Reel2_Bet1(void); +/*static */void DecideReelTurns_NoBiasTag_Reel2_Bet2(void); +/*static */void DecideReelTurns_NoBiasTag_Reel2_Bet3(void); +/*static */void DecideReelTurns_NoBiasTag_Reel3(void); /*static */void sub_8103830(void); /*static */void sub_8103910(void); /*static */void sub_8103A78(void); /*static */void sub_8103C14(u8 a0); /*static */void sub_8103C48(u8 taskId); -/*static */void sub_8103D50(u8 a0); +/*static */void LoadBetTiles(u8 a0); /*static */void sub_8103C78(struct Task *task, u8 taskId); /*static */void sub_8103CAC(struct Task *task, u8 taskId); /*static */void sub_8103CC8(struct Task *task, u8 taskId); @@ -229,50 +229,50 @@ struct UnkStruct1 /*static */bool8 sub_8103FA0(void); /*static */void sub_8103FE8_(u8 taskId); /*static */void sub_8104048(void); -/*static */void sub_8104064(u8 pikaPower); +/*static */void DisplayPikaPower(u8 pikaPower); /*static */bool8 sub_81040C8(void); /*static */void sub_81040E8(u8 taskId); /*static */void nullsub_68(struct Task *task); /*static */void sub_810411C(struct Task *task); /*static */void sub_8104144(struct Task *task); /*static */void sub_81041AC(struct Task *task); -/*static */void sub_812D394(struct Task *task); +/*static */void ClearTaskDataFields_2orHigher(struct Task *task); /*static */void sub_810423C(u8 pikaPower); -/*static */void sub_810430C(void); -/*static */bool8 sub_810432C(void); -/*static */void sub_810434C(u8 taskId); -/*static */void sub_810437C(struct Task *task); -/*static */void sub_81043EC(struct Task *task); -/*static */void sub_8104468(struct Task *task); -/*static */void sub_8104498(struct Task *task); -/*static */void sub_8104548(struct Task *task); -/*static */void sub_8104598(struct Task *task); -/*static */void sub_81045CC(struct Task *task); -/*static */void sub_810463C(struct Task *task); -/*static */void sub_81046C0(struct Task *task); -/*static */void sub_8104764(struct Task *task); -/*static */void sub_8104794(struct Task *task); -/*static */void sub_81047EC(struct Task *task); -/*static */void sub_8104860(struct Task *task); -/*static */void sub_81048A8(struct Task *task); -/*static */void sub_81048CC(struct Task *task); -/*static */void sub_8104940(struct Task *task); -/*static */void sub_81049C8(struct Task *task); -/*static */void sub_81049F8(struct Task *task); +/*static */void BeginReelTime(void); +/*static */bool8 IsFinalTask_RunReelTimeActions(void); +/*static */void RunReelTimeActions(u8 taskId); +/*static */void ReelTimeAction1(struct Task *task); +/*static */void ReelTimeAction2(struct Task *task); +/*static */void ReelTimeAction3(struct Task *task); +/*static */void ReelTimeAction4(struct Task *task); +/*static */void ReelTimeAction5(struct Task *task); +/*static */void ReelTimeAction6(struct Task *task); +/*static */void ReelTimeAction7(struct Task *task); +/*static */void ReelTimeAction_LandOnOutcome(struct Task *task); +/*static */void ReelTimeAction9(struct Task *task); +/*static */void ReelTimeAction10(struct Task *task); +/*static */void ReelTimeAction11(struct Task *task); +/*static */void ReelTimeAction12(struct Task *task); +/*static */void ReelTimeAction13(struct Task *task); +/*static */void ReelTimeAction14(struct Task *task); +/*static */void ReelTimeAction15(struct Task *task); +/*static */void ReelTimeAction16(struct Task *task); +/*static */void ReelTimeAction17(struct Task *task); +/*static */void ReelTimeAction18(struct Task *task); /*static */void sub_8104A40(s16 a0, s16 a1); /*static */void sub_8104A88(s16 a0); -/*static */void sub_8104AB8(u8 a0); -/*static */bool8 sub_8104AEC(void); -/*static */void sub_8104B0C(u8 taskId); -/*static */void sub_8104B3C(struct Task *task); -/*static */void sub_8104B60(struct Task *task); -/*static */void sub_8104B80(struct Task *task); -/*static */void sub_8104BC8(struct Task *task); -/*static */void sub_812DD78(struct Task *task); -/*static */void sub_8104BFC(struct Task *task); -/*static */void sub_812DE14(struct Task *task); -/*static */void sub_812DE30(struct Task *task); -/*static */void sub_8104C44(struct Task *task); +/*static */void OpenInfoBox(u8 a0); +/*static */bool8 ClosedInfoBox(void); +/*static */void RunInfoBoxActions(u8 taskId); +/*static */void InfoBox_FadeIn(struct Task *task); +/*static */void InfoBox_WaitForFade(struct Task *task); +/*static */void InfoBox_8104B80(struct Task *task); +/*static */void InfoBox_AwaitPlayerInput(struct Task *task); +/*static */void InfoBox_AddText(struct Task *task); +/*static */void InfoBox_8104BFC(struct Task *task); +/*static */void InfoBox_812DE14(struct Task *task); +/*static */void InfoBox_812DE30(struct Task *task); +/*static */void InfoBox_FreeTask(struct Task *task); /*static */void sub_8104C5C(void); /*static */void sub_8104CAC(u8 arg0); /*static */bool8 sub_8104E18(void); @@ -292,10 +292,10 @@ struct UnkStruct1 /*static */void sub_81054B8(void); /*static */void sub_8105524(void); /*static */void sub_8105554(void); -/*static */void sub_8105578(void); +/*static */void CreateReelTimeSprites1(void); /*static */void sub_8105688(s16 a0); /*static */void sub_81056C0(void); -/*static */void sub_81056F0(void); +/*static */void CreateReelTimeSprite2(void); /*static */void sub_81057E8(s16 a0); /*static */void sub_8105804(void); /*static */void sub_8105854(void); @@ -321,7 +321,7 @@ struct UnkStruct1 // Ewram variables static EWRAM_DATA u16 *gUnknown_0203AAC8 = NULL; -static EWRAM_DATA u16 *gUnknown_0203AACC = NULL; +static EWRAM_DATA u16 *selectedPikaPowerTile = NULL; static EWRAM_DATA u16 *gUnknown_0203AAD0 = NULL; static EWRAM_DATA u8 *gUnknown_0203AAD4 = NULL; static EWRAM_DATA u8 *gUnknown_0203AAD8 = NULL; @@ -355,10 +355,10 @@ static IWRAM_DATA struct SpriteFrameImage *gUnknown_03001188[26]; // Const rom data. extern const struct UnkStruct1 *const gUnknown_083ED048[]; extern const u16 gPalette_83EDE24[]; -extern const u8 gUnknown_083ECD04[][3]; -extern const u8 gUnknown_083ECE3A[]; -extern const u16 gUnknown_083ECE42[]; -extern const u16 gUnknown_083ECE48[]; +extern const u8 sSlotLuckinessTable1[][3]; +extern const u8 LuckyFlagTagOutput[]; +extern const u16 FlagsAttemptAtLuckiness1[]; +extern const u16 FlagsAttemptAtLuckiness2[]; extern const s16 gUnknown_083ECE7E[][2]; extern const SpriteCallback gUnknown_083ECF0C[]; extern const struct SpriteTemplate *const gUnknown_083EDB5C[]; @@ -369,10 +369,10 @@ extern const struct SpriteTemplate gSpriteTemplate_83ED54C; extern const struct SpriteTemplate gSpriteTemplate_83ED534; extern const u8 gUnknown_083ECC58[2]; extern const struct SpriteTemplate gSpriteTemplate_83ED51C; -extern const u16 gUnknown_083ECE12[]; +extern const u16 ProbabilityTable_SkipToReelTimeAction14[]; extern const u16 *const gUnknown_083EDE10[]; -extern const u16 gUnknown_083ECE1C[][2]; -extern const u16 gUnknown_083ECE30[]; +extern const u16 ReelIncrementTable[][2]; +extern const u16 ReelTimeBonusIncrementTable[]; extern const u16 sSlotMatchFlags[]; extern const u16 sSlotPayouts[]; extern const u8 *const gUnknown_083EDCE4; @@ -381,21 +381,21 @@ extern const u32 sReelTimeGfx[]; extern const struct SpriteSheet sSlotMachineSpriteSheets[]; extern const struct SpritePalette gSlotMachineSpritePalettes[]; extern const u16 *const gUnknown_083EDE20; -extern const s16 gUnknown_083ECCF8[][2]; +extern const s16 sInitialReelPositions[][2]; extern const struct BgTemplate gUnknown_085A7424[4]; extern const struct WindowTemplate gUnknown_085A7434[]; -extern const u8 gUnknown_083ECD16[][6]; -extern const u8 gUnknown_083ECD28[][6]; -extern const u8 gUnknown_083ECD46[][17]; -extern const u8 gUnknown_083ECDAC[][17]; +extern const u8 sSlotLuckinessTable2[][6]; +extern const u8 sSlotLuckinessTable3[][6]; +extern const u8 ReelTimeProbabilityTable0[][17]; +extern const u8 ReelTimeProbabilityTable1[][17]; extern const u8 sSym2Match[]; extern const u8 gUnknown_083ECCF1[]; -extern const u8 sReelSymbols[][21]; +extern const u8 sReelSymbols[][REEL_NUM_TAGS]; extern const u16 *const gUnknown_083EDD08[]; extern const u16 *const gUnknown_083EDD1C[]; extern const u8 gUnknown_083EDD30[]; -extern const u8 gUnknown_083EDD35[][2]; -extern const u8 gUnknown_083EDD3B[]; +extern const u8 gBettingTilesId[][2]; +extern const u8 gNumberBettingTiles[]; extern const u16 *const gUnknown_083EDDA0[]; extern const u16 *const gUnknown_083EDDAC; extern const u16 sReelTimeWindowTilemap[]; @@ -453,99 +453,101 @@ const struct WindowTemplate gUnknown_085A7444 = 0, 1, 3, 20, 13, 13, 1 }; -const u8 gUnknown_085A744C[] = {3, 1, 2, 0}; +const u8 gColors_ReelTimeHelp[] = {3, 1, 2, 0}; -bool8 (*const gUnknown_083ECAAC[])(struct Task *task) = +bool8 (*const SlotActions[])(struct Task *task) = { - sub_8101D5C, - sub_8101D8C, - sub_8101DB0, - sub_8101DF4, - sub_8101E10, - sub_8101E3C, - sub_8101F44, - sub_8101F60, - sub_8101F88, - sub_8101FA4, - sub_8102008, - sub_8102034, - sub_8102058, - sub_8102090, - sub_81020C8, - sub_81021E0, - sub_81021FC, - sub_8102264, - sub_81022A0, - sub_81022CC, - sub_81022F0, - sub_8102318, - sub_8102344, - sub_810239C, - sub_81023B8, - sub_81023E0_, - sub_81023FC, - sub_8102424, - sub_8102460, + SlotAction_UnfadeScreen, + SlotAction_WaitForUnfade, + SlotAction_SetSlotMachineVars, + SlotAction3, + SlotAction4, + SlotAction_AwaitPlayerInput, + SlotAction_PrintYouDontHaveThreeCoins, + SlotAction_PlayerAcceptsNotHavingThreeCoins, + SlotAction_GivingInformation, + SlotAction9, + SlotAction10, + SlotAction11, + SlotAction_AwaitReelStop, + SlotAction_WaitForAllReelsToStop, + SlotAction_CheckMatches, + SlotAction_WaitForPayoutToBeAwarded, + SlotAction_EndOfRoll, + SlotAction17, + SlotAction18, + SlotAction_Loop, + SlotAction_NoMatches, + SlotAction_PrintQuitTheGame, + SlotAction_SeeIfPlayerQuits, + SlotAction_Print9999CoinMessage, + SlotAction_Escape9999CoinMessage, + SlotAction_PrintNoMoreCoins, + SlotAction_EscapeNoMoreCoins, + SlotAction_EndGame, + SlotAction_FreeDataStructures, }; -bool8 (*const gUnknown_083ECB20[])(struct Task *task) = +bool8 (*const AwardPayoutActions[])(struct Task *task) = { - sub_8102A9C, - sub_8102AD0, - sub_8102B80 + AwardPayoutAction1, + AwardPayoutAction_GivePayoutToPlayer, + AwardPayoutAction_FreeTask }; -bool8 (*const gUnknown_083ECB2C[])(struct Task *task) = +bool8 (*const ReelActions[])(struct Task *task) = { - sub_8102EA0, - sub_8102EA4, - sub_8102EC0, - sub_8102F4C, - sub_8103008 + ReelAction_StayStill, + ReelAction_Spin, + ReelAction_DecideWhereToStop, + ReelAction_TurnToSelectedTag, + ReelAction_OscillatingStop }; -bool8 (*const gUnknown_083ECB40[])(void) = +// returns True if a match with the biasTag is possible in that reel +// also modifies data in sSlotMachine reel arrays to indicate how to get to the matching state +bool8 (*const DecideReelTurns_BiasTag[])(void) = { - sub_810305C, - sub_81032C0, - sub_81033DC + DecideReelTurns_BiasTag_Reel1, + DecideReelTurns_BiasTag_Reel2, + DecideReelTurns_BiasTag_Reel3 }; -void (*const gUnknown_083ECB4C[])(void) = +void (*const DecideReelTurns_NoBiasTag[])(void) = { - sub_81034F4, - sub_8103540, - sub_810380C + DecideReelTurns_NoBiasTag_Reel1, + DecideReelTurns_NoBiasTag_Reel2, + DecideReelTurns_NoBiasTag_Reel3 }; -const u16 gUnknown_085A74FC[] = {2, 4, 4, 4, 8}; +const u16 ReelStopShocks[] = {2, 4, 4, 4, 8}; -bool8 (*const gUnknown_083ECB64[])(u8 a0, u8 a1) = +bool8 (*const DecideReelTurns_BiasTag_Reel1_Bets[])(u8 tag1, u8 tag2) = { - sub_8103154, - sub_81031B4, - sub_81031B4 + DecideReelTurns_BiasTag_Reel1_Bet1, + DecideReelTurns_BiasTag_Reel1_Bet2or3, + DecideReelTurns_BiasTag_Reel1_Bet2or3 }; -bool8 (*const gUnknown_083ECB70[])(void) = +bool8 (*const DecideReelTurns_BiasTag_Reel2_Bets[])(void) = { - sub_81032E8, - sub_81032E8, - sub_810333C + DecideReelTurns_BiasTag_Reel2_Bet1or2, + DecideReelTurns_BiasTag_Reel2_Bet1or2, + DecideReelTurns_BiasTag_Reel2_Bet3 }; -bool8 (*const gUnknown_083ECB7C[])(u8 a0) = +bool8 (*const DecideReelTurns_BiasTag_Reel3_Bets[])(u8 biasTag) = { - sub_810341C, - sub_810341C, - sub_810347C + DecideReelTurns_BiasTag_Reel3_Bet1or2, + DecideReelTurns_BiasTag_Reel3_Bet1or2, + DecideReelTurns_BiasTag_Reel3_Bet3 }; -void (*const gUnknown_083ECB88[])(void) = +void (*const DecideReelTurns_NoBiasTag_Reel2_Bets[])(void) = { - sub_8103564, - j5_08111E84, - sub_8103668 + DecideReelTurns_NoBiasTag_Reel2_Bet1, + DecideReelTurns_NoBiasTag_Reel2_Bet2, + DecideReelTurns_NoBiasTag_Reel2_Bet3 }; void (*const gUnknown_083ECB94[])(void) = @@ -572,57 +574,57 @@ void (*const gUnknown_083ECBB4[])(struct Task *task) = sub_81041AC }; -const u16 gUnknown_083ECBC4[][2] = +const u16 pikaPowerTileTable[][2] = { - {0x9e, 0x6e}, - {0x9f, 0x6f}, - {0xaf, 0x7f}, + {0x9e, 0x6e}, // {0b10011110, 0b1101110} + {0x9f, 0x6f}, // {0b10011111, 0b1101111} + {0xaf, 0x7f}, // {0b10101111, 0b1111111} }; -void (*const gUnknown_083ECBD0[])(struct Task *task) = +void (*const ReelTimeActions[])(struct Task *task) = { - sub_810437C, - sub_81043EC, - sub_8104468, - sub_8104498, - sub_8104548, - sub_8104598, - sub_81045CC, - sub_810463C, - sub_81046C0, - sub_8104764, - sub_8104794, - sub_81047EC, - sub_8104860, - sub_81048A8, - sub_81048CC, - sub_8104940, - sub_81049C8, - sub_8104794, - sub_81049F8 + ReelTimeAction1, + ReelTimeAction2, + ReelTimeAction3, + ReelTimeAction4, + ReelTimeAction5, + ReelTimeAction6, + ReelTimeAction7, // does stuff with reel time data + ReelTimeAction_LandOnOutcome, + ReelTimeAction9, + ReelTimeAction10, + ReelTimeAction11, + ReelTimeAction12, + ReelTimeAction13, + ReelTimeAction14, + ReelTimeAction15, + ReelTimeAction16, + ReelTimeAction17, + ReelTimeAction11, + ReelTimeAction18 }; const u8 gUnknown_085A75C0[] = {1, 1, 2, 2}; const s16 gUnknown_085A75C4[] = {0x40, 0x30, 0x18, 0x08}; const s16 gUnknown_085A75CC[] = {10, 8, 6, 4}; -void (*const gUnknown_083ECC30[])(struct Task *task) = +void (*const InfoBoxActions[])(struct Task *task) = { - sub_8104B3C, - sub_8104B60, - sub_8104B80, - sub_8104B60, - sub_812DD78, - sub_8104B60, - sub_8104BC8, - sub_8104B60, - sub_812DE14, - sub_8104B60, - sub_812DE30, - sub_8104B60, - sub_8104BFC, - sub_8104B60, - sub_8104C44, + InfoBox_FadeIn, + InfoBox_WaitForFade, + InfoBox_8104B80, + InfoBox_WaitForFade, + InfoBox_AddText, + InfoBox_WaitForFade, + InfoBox_AwaitPlayerInput, + InfoBox_WaitForFade, + InfoBox_812DE14, + InfoBox_WaitForFade, + InfoBox_812DE30, + InfoBox_WaitForFade, + InfoBox_8104BFC, + InfoBox_WaitForFade, + InfoBox_FreeTask, }; void (*const gUnknown_083ECC54[])(struct Task *task) = @@ -669,12 +671,12 @@ extern const struct SpriteTemplate gSpriteTemplate_83ED45C; } } -void PlaySlotMachine(u8 arg0, MainCallback cb) +void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinueScriptPlayMapMusic) { u8 taskId; sSlotMachine = AllocZeroed(sizeof(*sSlotMachine)); - PlaySlotMachine_Internal(arg0, cb); + PlaySlotMachine_Internal(slotMachineIndex, CB2_ReturnToFieldContinueScriptPlayMapMusic); taskId = CreateTask(Task_FadeToSlotMachine, 0); gTasks[taskId].tState = 0; } @@ -733,7 +735,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) break; case 10: SlotMachineSetup_10_0(); - SlotMachineSetup_10_1(); + SlotMachineSetupGameplayTasks(); gMain.state++; break; case 11: @@ -761,17 +763,18 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) SetGpuReg(REG_OFFSET_WINOUT, sSlotMachine->winOut); } -/*static */void PlaySlotMachine_Internal(u8 arg0, MainCallback cb) +/*static */void PlaySlotMachine_Internal(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinueScriptPlayMapMusic) { struct Task *task = gTasks + CreateTask(SlotMachineDummyTask, 0xFF); - task->data[0] = arg0; - StoreWordInTwoHalfwords(task->data + 1, (intptr_t)cb); + task->data[0] = slotMachineIndex; + StoreWordInTwoHalfwords(task->data + 1, (intptr_t)CB2_ReturnToFieldContinueScriptPlayMapMusic); } + /*static */void sub_81019EC(void) { struct Task *task = gTasks + FindTaskIdByFunc(SlotMachineDummyTask); - sSlotMachine->unk01 = task->data[0]; + sSlotMachine->machineId = task->data[0]; LoadWordFromTwoHalfwords((u16 *)(task->data + 1), (u32 *)&sSlotMachine->prevMainCb); } @@ -827,37 +830,40 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(9, 8)); } +// set up initial state of slot machine /*static */void SlotMachineSetup_0_1(void) { u8 i; - sub_81019EC(); - sSlotMachine->state = 0; + sub_81019EC(); // assigns sSlotMachine->machineId and other stuff + sSlotMachine->slotActionPtr = 0; sSlotMachine->pikaPower = 0; - sSlotMachine->unk03 = Random() & 1; - sSlotMachine->unk04 = 0; + sSlotMachine->luckyGame = Random() & 1; + sSlotMachine->luckyFlags = 0; sSlotMachine->matchedSymbols = 0; - sSlotMachine->unk0A = 0; - sSlotMachine->unk0B = 0; + sSlotMachine->fairRollsLeft = 0; + sSlotMachine->fairRollsUsed = 0; sSlotMachine->coins = GetCoins(); sSlotMachine->payout = 0; - sSlotMachine->unk10 = 0; + sSlotMachine->netCoinLoss = 0; sSlotMachine->bet = 0; - sSlotMachine->unk18 = 0; - sSlotMachine->unk1A = 8; + sSlotMachine->currReel = 0; + sSlotMachine->reelIncrement = 8; sSlotMachine->win0h = 0xf0; sSlotMachine->win0v = 0xa0; sSlotMachine->winIn = 0x3f; sSlotMachine->winOut = 0x3f; sSlotMachine->backupMapMusic = GetCurrentMapMusic(); + + // for each reel... for (i = 0; i < 3; i++) { - sSlotMachine->unk22[i] = 0; - sSlotMachine->reelPositions[i] = gUnknown_083ECCF8[i][sSlotMachine->unk03] % 21; - sSlotMachine->unk1C[i] = 0x1f8 - sSlotMachine->reelPositions[i] * 24; - sSlotMachine->unk1C[i] %= 0x1f8; + sSlotMachine->stopReelPixelOffset[i] = 0; + sSlotMachine->reelPositions[i] = sInitialReelPositions[i][sSlotMachine->luckyGame] % REEL_NUM_TAGS; + sSlotMachine->reelPixelOffsets[i] = 0x1f8 - sSlotMachine->reelPositions[i] * 24; + sSlotMachine->reelPixelOffsets[i] %= 0x1f8; // 0x1f8 is 540 } - sub_80EDE70(GetCoins()); + reportPlayedSlotMachine(GetCoins()); } /*static */void SlotMachineSetup_3_0(void) @@ -871,10 +877,11 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) /*static */void SlotMachineSetup_4_0(void) { - gUnknown_0203AACC = Alloc(8); + selectedPikaPowerTile = Alloc(8); gUnknown_0203AAD0 = AllocZeroed(0xE); gUnknown_0203AADC = AllocZeroed(8); + // several of these are 1 bit off from each other gUnknown_0203AAD0[0] = 0x2051; gUnknown_0203AAD0[1] = 0x2851; gUnknown_0203AAD0[2] = 0x2061; @@ -884,6 +891,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) gUnknown_0203AAD0[6] = 0x20BF; } +// machine wheel stuff /*static */void SlotMachineSetup_5_0(void) { sub_8106448(); @@ -902,98 +910,100 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) sub_81050C4(); } -/*static */void SlotMachineSetup_10_1(void) +// create next gameplay task +/*static */void SlotMachineSetupGameplayTasks(void) { sub_8104048(); - sub_8102DA8(); + GameplayTask_StopReel(); sub_8104C5C(); - sub_8101D04(); + GameplayTasks_Slot(); } -/*static */void sub_8101D04(void) +/*static */void GameplayTasks_Slot(void) { - sub_8101D24(CreateTask(sub_8101D24, 0)); + RunSlotActions(CreateTask(RunSlotActions, 0)); } -/*static */void sub_8101D24(u8 taskId) +// task->data[0] is a timer +/*static */void RunSlotActions(u8 taskId) { - while (gUnknown_083ECAAC[sSlotMachine->state](gTasks + taskId)) + while (SlotActions[sSlotMachine->slotActionPtr](gTasks + taskId)) ; } -/*static */bool8 sub_8101D5C(struct Task *task) +/*static */bool8 SlotAction_UnfadeScreen(struct Task *task) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); sub_810423C(sSlotMachine->pikaPower); - sSlotMachine->state++; + sSlotMachine->slotActionPtr++; return FALSE; } -/*static */bool8 sub_8101D8C(struct Task *task) +/*static */bool8 SlotAction_WaitForUnfade(struct Task *task) { if (!gPaletteFade.active) - sSlotMachine->state++; + sSlotMachine->slotActionPtr++; return FALSE; } -/*static */bool8 sub_8101DB0(struct Task *task) +/*static */bool8 SlotAction_SetSlotMachineVars(struct Task *task) { sSlotMachine->payout = 0; sSlotMachine->bet = 0; - sSlotMachine->unk18 = 0; - sSlotMachine->unk04 &= 0xc0; - sSlotMachine->state = 4; + sSlotMachine->currReel = 0; + sSlotMachine->luckyFlags &= 0xc0; // discard all but top 2 flags + sSlotMachine->slotActionPtr = 4; if (sSlotMachine->coins <= 0) { - sSlotMachine->state = 25; + sSlotMachine->slotActionPtr = 25; } - else if (sSlotMachine->unk0A) + else if (sSlotMachine->fairRollsLeft) { - sSlotMachine->state = 3; + sSlotMachine->slotActionPtr = 3; sub_8104CAC(4); } return TRUE; } -/*static */bool8 sub_8101DF4(struct Task *task) +/*static */bool8 SlotAction3(struct Task *task) { if (sub_8104E18()) - sSlotMachine->state = 4; + sSlotMachine->slotActionPtr = 4; return FALSE; } -/*static */bool8 sub_8101E10(struct Task *task) +/*static */bool8 SlotAction4(struct Task *task) { sub_8104CAC(0); - sSlotMachine->state = 5; + sSlotMachine->slotActionPtr = 5; if (sSlotMachine->coins >= 9999) - sSlotMachine->state = 23; + sSlotMachine->slotActionPtr = 23; return TRUE; } -/*static */bool8 sub_8101E3C(struct Task *task) +/*static */bool8 SlotAction_AwaitPlayerInput(struct Task *task) { s16 i; if (gMain.newKeys & SELECT_BUTTON) { - sub_8104AB8(0); - sSlotMachine->state = 8; + OpenInfoBox(0); + sSlotMachine->slotActionPtr = 8; } - else if (gMain.newKeys & R_BUTTON) + else if (gMain.newKeys & R_BUTTON) // bet the max amount { if (sSlotMachine->coins - (3 - sSlotMachine->bet) >= 0) { for (i = sSlotMachine->bet; i < 3; i++) - sub_8103D50(i); + LoadBetTiles(i); sSlotMachine->coins -= (3 - sSlotMachine->bet); sSlotMachine->bet = 3; - sSlotMachine->state = 9; + sSlotMachine->slotActionPtr = 9; PlaySE(SE_REGI); } - else + else // you didn't have enough coins to bet the max { - sSlotMachine->state = 6; + sSlotMachine->slotActionPtr = 6; } } else @@ -1001,135 +1011,145 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) if (gMain.newKeys & DPAD_DOWN && sSlotMachine->coins != 0) { PlaySE(SE_REGI); - sub_8103D50(sSlotMachine->bet); + LoadBetTiles(sSlotMachine->bet); sSlotMachine->coins--; sSlotMachine->bet++; } + // if player maxed out or finished betting if (sSlotMachine->bet >= 3 || (sSlotMachine->bet != 0 && gMain.newKeys & A_BUTTON)) - sSlotMachine->state = 9; + sSlotMachine->slotActionPtr = 9; + // if player wants to quit if (gMain.newKeys & B_BUTTON) - sSlotMachine->state = 21; + sSlotMachine->slotActionPtr = 21; } return FALSE; } -/*static */bool8 sub_8101F44(struct Task *task) +/*static */bool8 SlotAction_PrintYouDontHaveThreeCoins(struct Task *task) { NewMenuHelpers_DrawDialogueFrame(0, 0); AddTextPrinterParameterized(0, 1, gText_YouDontHaveThreeCoins, 0, 1, 0, 0); CopyWindowToVram(0, 3); - sSlotMachine->state = 7; + sSlotMachine->slotActionPtr = 7; return FALSE; } -/*static */bool8 sub_8101F60(struct Task *task) +/*static */bool8 SlotAction_PlayerAcceptsNotHavingThreeCoins(struct Task *task) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { sub_8197434(0, TRUE); - sSlotMachine->state = 5; + sSlotMachine->slotActionPtr = 5; } return FALSE; } -/*static */bool8 sub_8101F88(struct Task *task) +/*static */bool8 SlotAction_GivingInformation(struct Task *task) { - if (sub_8104AEC()) - sSlotMachine->state = 5; + if (ClosedInfoBox()) + sSlotMachine->slotActionPtr = 5; return FALSE; } -/*static */bool8 sub_8101FA4(struct Task *task) +// probably make all the slots roll +/*static */bool8 SlotAction9(struct Task *task) { - sub_8102484(); + DrawForLuckyFlags(); sub_8104DA4(); - sub_8102DEC(0); - sub_8102DEC(1); - sub_8102DEC(2); - sub_80EEC80(); + // for each reel... + //...do a reel task + ReelTasks_8102DEC(0); + ReelTasks_8102DEC(1); + ReelTasks_8102DEC(2); + sub_80EEC80(); // something with daily slot variable task->data[0] = 0; - if (sSlotMachine->unk04 & 0x20) + if (sSlotMachine->luckyFlags & 0x20) // bit 5 of luckyFlag set { - sub_810430C(); - sSlotMachine->state = 10; + // enter into reel time + BeginReelTime(); + sSlotMachine->slotActionPtr = 10; } else { sub_8104CAC(1); - sSlotMachine->state = 11; + sSlotMachine->slotActionPtr = 11; } - sSlotMachine->unk1A = 8; - if (sSlotMachine->unk0A) - sSlotMachine->unk1A = dp15_jump_random_unknown(); + sSlotMachine->reelIncrement = 8; + if (sSlotMachine->fairRollsLeft) + // slow down the reel speed if you're really losing + sSlotMachine->reelIncrement = DrawNewReelIncrement(); return FALSE; } -/*static */bool8 sub_8102008(struct Task *task) +/*static */bool8 SlotAction10(struct Task *task) { - if (sub_810432C()) + if (IsFinalTask_RunReelTimeActions()) { sub_8104CAC(1); - sSlotMachine->unk04 &= 0xDF; - sSlotMachine->state = 11; + // unset enter reel time flag + sSlotMachine->luckyFlags &= 0xDF; + sSlotMachine->slotActionPtr = 11; } return FALSE; } -/*static */bool8 sub_8102034(struct Task *task) +/*static */bool8 SlotAction11(struct Task *task) { if (++task->data[0] >= 30) { - sub_81024F0(); - sSlotMachine->state = 12; + AnyLuckyFlagsSet(); + sSlotMachine->slotActionPtr = 12; } return FALSE; } -/*static */bool8 sub_8102058(struct Task *task) +/*static */bool8 SlotAction_AwaitReelStop(struct Task *task) { if (gMain.newKeys & A_BUTTON) { PlaySE(SE_JYUNI); - sub_8102E1C(sSlotMachine->unk18); - sub_8103C14(sSlotMachine->unk18); - sSlotMachine->state = 13; + sub_8102E1C(sSlotMachine->currReel); + sub_8103C14(sSlotMachine->currReel); + sSlotMachine->slotActionPtr = 13; } return FALSE; } -/*static */bool8 sub_8102090(struct Task *task) +/*static */bool8 SlotAction_WaitForAllReelsToStop(struct Task *task) { - if (!sub_8102E40(sSlotMachine->unk18)) + if (!IsReelMoving(sSlotMachine->currReel)) { - sSlotMachine->unk18++; - sSlotMachine->state = 12; - if (sSlotMachine->unk18 > 2) + sSlotMachine->currReel++; + sSlotMachine->slotActionPtr = 12; + if (sSlotMachine->currReel > 2) { - sSlotMachine->state = 14; + sSlotMachine->slotActionPtr = 14; } return TRUE; } return FALSE; } -/*static */bool8 sub_81020C8(struct Task *task) +// once all reels have stopped +/*static */bool8 SlotAction_CheckMatches(struct Task *task) { - sSlotMachine->unk04 &= 0xc0; + // keep top 2 bits of luckyFlags + sSlotMachine->luckyFlags &= 0xc0; CheckMatch(); - if (sSlotMachine->unk0A) + if (sSlotMachine->fairRollsLeft) { - sSlotMachine->unk0A--; - sSlotMachine->unk0B++; + sSlotMachine->fairRollsLeft--; + sSlotMachine->fairRollsUsed++; } if (sSlotMachine->matchedSymbols) { - sSlotMachine->state = 15; - sub_8102A24(); + sSlotMachine->slotActionPtr = 15; + AwardPayout(); sub_8103F70(); - if ((sSlotMachine->unk10 -= sSlotMachine->payout) < 0) + if ((sSlotMachine->netCoinLoss -= sSlotMachine->payout) < 0) { - sSlotMachine->unk10 = 0; + sSlotMachine->netCoinLoss = 0; } if (sSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED))) { @@ -1148,190 +1168,193 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) } if (sSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_MIXED) | (1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED))) { - sSlotMachine->unk04 &= 0x3f; + // clear top bits 6 and 7 + sSlotMachine->luckyFlags &= 0x3f; if (sSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED))) { - sSlotMachine->unk0A = 0; - sSlotMachine->unk0B = 0; - sSlotMachine->unk03 = 0; + sSlotMachine->fairRollsLeft = 0; + sSlotMachine->fairRollsUsed = 0; + sSlotMachine->luckyGame = 0; if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_777_BLUE)) - sSlotMachine->unk03 = 1; + // this may be a bug, but if you get blue 777, the game becomes lucky + sSlotMachine->luckyGame = 1; } } if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_POWER) && sSlotMachine->pikaPower < 16) { sSlotMachine->pikaPower++; - sub_8104064(sSlotMachine->pikaPower); + DisplayPikaPower(sSlotMachine->pikaPower); } } else { sub_8104CAC(3); - sSlotMachine->state = 20; - if ((sSlotMachine->unk10 += sSlotMachine->bet) > 9999) - sSlotMachine->unk10 = 9999; + sSlotMachine->slotActionPtr = 20; + if ((sSlotMachine->netCoinLoss += sSlotMachine->bet) > 9999) + sSlotMachine->netCoinLoss = 9999; } return FALSE; } -/*static */bool8 sub_81021E0(struct Task *task) +/*static */bool8 SlotAction_WaitForPayoutToBeAwarded(struct Task *task) { - if (sub_8102A44()) - sSlotMachine->state = 16; + if (IsFinalTask_RunAwardPayoutActions()) + sSlotMachine->slotActionPtr = 16; return FALSE; } -/*static */bool8 sub_81021FC(struct Task *task) +/*static */bool8 SlotAction_EndOfRoll(struct Task *task) { if (sub_8103FA0()) { - sSlotMachine->state = 19; + sSlotMachine->slotActionPtr = 19; if (sSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_RED) | (1 << SLOT_MACHINE_MATCHED_777_BLUE))) IncrementGameStat(GAME_STAT_SLOT_JACKPOTS); if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_REPLAY)) { - sSlotMachine->unk18 = 0; - sSlotMachine->state = 9; + sSlotMachine->currReel = 0; + sSlotMachine->slotActionPtr = 9; } if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_POWER)) - sSlotMachine->state = 17; - if (sSlotMachine->unk0A && sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_REPLAY)) + sSlotMachine->slotActionPtr = 17; + if (sSlotMachine->fairRollsLeft && sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_REPLAY)) { sub_8104CAC(4); - sSlotMachine->state = 18; + sSlotMachine->slotActionPtr = 18; } } return FALSE; } -/*static */bool8 sub_8102264(struct Task *task) +/*static */bool8 SlotAction17(struct Task *task) { if (!sub_81040C8()) { - sSlotMachine->state = 19; + sSlotMachine->slotActionPtr = 19; if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_REPLAY)) { - sSlotMachine->state = 9; - if (sSlotMachine->unk0A) + sSlotMachine->slotActionPtr = 9; + if (sSlotMachine->fairRollsLeft) { sub_8104CAC(4); - sSlotMachine->state = 18; + sSlotMachine->slotActionPtr = 18; } } } return FALSE; } -/*static */bool8 sub_81022A0(struct Task *task) +/*static */bool8 SlotAction18(struct Task *task) { if (sub_8104E18()) { - sSlotMachine->state = 19; + sSlotMachine->slotActionPtr = 19; if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_REPLAY)) { - sSlotMachine->state = 9; + sSlotMachine->slotActionPtr = 9; } } return FALSE; } -/*static */bool8 sub_81022CC(struct Task *task) +/*static */bool8 SlotAction_Loop(struct Task *task) { sub_8103D8C(0); sub_8103D8C(1); sub_8103D8C(2); - sSlotMachine->state = 2; + sSlotMachine->slotActionPtr = 2; return FALSE; } -/*static */bool8 sub_81022F0(struct Task *task) +/*static */bool8 SlotAction_NoMatches(struct Task *task) { if (++task->data[1] > 64) { task->data[1] = 0; - sSlotMachine->state = 19; + sSlotMachine->slotActionPtr = 19; } return FALSE; } -/*static */bool8 sub_8102318(struct Task *task) +/*static */bool8 SlotAction_PrintQuitTheGame(struct Task *task) { NewMenuHelpers_DrawDialogueFrame(0, 0); AddTextPrinterParameterized(0, 1, gText_QuitTheGame, 0, 1, 0, 0); CopyWindowToVram(0, 3); CreateYesNoMenuParameterized(0x15, 7, 0x214, 0x180, 0xE, 0xF); - sSlotMachine->state = 22; + sSlotMachine->slotActionPtr = 22; return FALSE; } -/*static */bool8 sub_8102344(struct Task *task) +/*static */bool8 SlotAction_SeeIfPlayerQuits(struct Task *task) { s8 input = Menu_ProcessInputNoWrapClearOnChoose(); - if (input == 0) + if (input == 0) // player chooses to quit { sub_8197434(0, TRUE); sub_8103D8C(0); sub_8103D8C(1); sub_8103D8C(2); sSlotMachine->coins += sSlotMachine->bet; - sSlotMachine->state = 27; + sSlotMachine->slotActionPtr = 27; } - else if (input == 1 || input == -1) + else if (input == 1 || input == -1) // player chooses not to quit { sub_8197434(0, TRUE); - sSlotMachine->state = 5; + sSlotMachine->slotActionPtr = 5; } return FALSE; } -/*static */bool8 sub_810239C(struct Task *task) +/*static */bool8 SlotAction_Print9999CoinMessage(struct Task *task) { NewMenuHelpers_DrawDialogueFrame(0, 0); AddTextPrinterParameterized(0, 1, gText_YouveGot9999Coins, 0, 1, 0, 0); CopyWindowToVram(0, 3); - sSlotMachine->state = 24; + sSlotMachine->slotActionPtr = 24; return FALSE; } -/*static */bool8 sub_81023B8(struct Task *task) +/*static */bool8 SlotAction_Escape9999CoinMessage(struct Task *task) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { sub_8197434(0, TRUE); - sSlotMachine->state = 5; + sSlotMachine->slotActionPtr = 5; } return FALSE; } -/*static */bool8 sub_81023E0_(struct Task *task) +/*static */bool8 SlotAction_PrintNoMoreCoins(struct Task *task) { NewMenuHelpers_DrawDialogueFrame(0, 0); AddTextPrinterParameterized(0, 1, gText_YouveRunOutOfCoins, 0, 1, 0, 0); CopyWindowToVram(0, 3); - sSlotMachine->state = 26; + sSlotMachine->slotActionPtr = 26; return FALSE; } -/*static */bool8 sub_81023FC(struct Task *task) +/*static */bool8 SlotAction_EscapeNoMoreCoins(struct Task *task) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { sub_8197434(0, TRUE); - sSlotMachine->state = 27; + sSlotMachine->slotActionPtr = 27; } return FALSE; } -/*static */bool8 sub_8102424(struct Task *task) +// possibly end game +/*static */bool8 SlotAction_EndGame(struct Task *task) { SetCoins(sSlotMachine->coins); - sub_80EDD78(GetCoins()); + reportNewCoinTotal(GetCoins()); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); - sSlotMachine->state++; + sSlotMachine->slotActionPtr++; return FALSE; } -/*static */bool8 sub_8102460(struct Task *task) +/*static */bool8 SlotAction_FreeDataStructures(struct Task *task) { if (!gPaletteFade.active) { @@ -1359,7 +1382,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) if (gUnknown_0203AAF0 != NULL) FREE_AND_SET_NULL(gUnknown_0203AAF0); FREE_AND_SET_NULL(gUnknown_0203AAC8); - FREE_AND_SET_NULL(gUnknown_0203AACC); + FREE_AND_SET_NULL(selectedPikaPowerTile); FREE_AND_SET_NULL(gUnknown_0203AAD0); FREE_AND_SET_NULL(gUnknown_0203AAD4); FREE_AND_SET_NULL(gUnknown_0203AAD8); @@ -1373,157 +1396,161 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) return FALSE; } -/*static */void sub_8102484(void) +/*static */void DrawForLuckyFlags(void) { - u8 r3; + u8 luckyAttempts; - if (sSlotMachine->unk0A == 0) + if (sSlotMachine->fairRollsLeft == 0) { - if (!(sSlotMachine->unk04 & 0xc0)) + if (!(sSlotMachine->luckyFlags & 0xc0)) // top 2 flags set to 0 { - if (sub_8102540_()) + if (IsLuckyRound()) { - r3 = sub_8102578(); - if (r3 != 3) + luckyAttempts = AttemptsAtLuckiness1(); + if (luckyAttempts != 3) // if you found a lucky number { - sSlotMachine->unk04 |= gUnknown_083ECE42[r3]; - if (r3 != 1) + // luckyAttempts == 1: reelTime flag set + sSlotMachine->luckyFlags |= FlagsAttemptAtLuckiness1[luckyAttempts]; + if (luckyAttempts != 1) { return; } } } - r3 = sub_81025BC(); - if (r3 != 5) + // if you got it your first try, you get to try again for the lower lucky flags + luckyAttempts = AttemptsAtLuckiness2(); + if (luckyAttempts != 5) // if you found a lucky number { - sSlotMachine->unk04 |= gUnknown_083ECE48[r3]; + sSlotMachine->luckyFlags |= FlagsAttemptAtLuckiness2[luckyAttempts]; } } } } -/*static */void sub_81024F0(void) +/*static */void AnyLuckyFlagsSet(void) { - sSlotMachine->unk06 = 0; - if (sSlotMachine->unk04) - sSlotMachine->unk06 = 1; + sSlotMachine->isBiasTagMatchPossible = 0; + if (sSlotMachine->luckyFlags) + sSlotMachine->isBiasTagMatchPossible = 1; } -/*static */u8 sub_810250C(u8 a0) +/*static */u8 GetLuckyFlagTagOutput(u8 luckyFlags) { u8 i; for (i = 0; i < 8; i++) { - if (a0 & 1) - return gUnknown_083ECE3A[i]; - a0 >>= 1; + if (luckyFlags & 1) + return LuckyFlagTagOutput[i]; + luckyFlags >>= 1; } return 0; } -/*static */bool8 sub_8102540_(void) +/*static */bool8 IsLuckyRound(void) { u8 rval = Random(); - if (gUnknown_083ECD04[sSlotMachine->unk01][sSlotMachine->bet - 1] > rval) + if (sSlotLuckinessTable1[sSlotMachine->machineId][sSlotMachine->bet - 1] > rval) return TRUE; return FALSE; } -/*static */u8 sub_8102578(void) +/*static */u8 AttemptsAtLuckiness1(void) { - s16 i; + s16 countAttempts; - for (i = 0; i < 3; i++) + for (countAttempts = 0; countAttempts < 3; countAttempts++) { s16 rval = Random() & 0xff; - s16 value = gUnknown_083ECD16[i][sSlotMachine->unk01]; + s16 value = sSlotLuckinessTable2[countAttempts][sSlotMachine->machineId]; if (value > rval) break; } - return i; + return countAttempts; } -/*static */u8 sub_81025BC(void) +/*static */u8 AttemptsAtLuckiness2(void) { - s16 i; + s16 countAttempts; - for (i = 0; i < 5; i++) + for (countAttempts = 0; countAttempts < 5; countAttempts++) { - s16 rval = Random() & 0xff; - s16 r3 = gUnknown_083ECD28[i][sSlotMachine->unk01]; - if (i == 0 && sSlotMachine->unk03 == 1) + s16 rval = Random() & 0xff; // random byte + s16 value = sSlotLuckinessTable3[countAttempts][sSlotMachine->machineId]; + // make first attempt easier if it's a lucky game + if (countAttempts == 0 && sSlotMachine->luckyGame == 1) { - r3 += 10; - if (r3 > 0x100) - r3 = 0x100; + value += 10; + if (value > 0x100) + value = 0x100; } - else if (i == 4 && sSlotMachine->unk03 == 1) + // make last attempt harder if it's a lucky game + else if (countAttempts == 4 && sSlotMachine->luckyGame == 1) { - r3 -= 10; - if (r3 < 0) - r3 = 0; + value -= 10; + if (value < 0) + value = 0; } - if (r3 > rval) + if (value > rval) break; } - return i; + return countAttempts; } -/*static */u8 sub_810264C(u8 a0) +/*static */u8 GetReelTimeProbability(u8 reelTimeDraw) { - if (sSlotMachine->unk03 == 0) - return gUnknown_083ECD46[a0][sSlotMachine->pikaPower]; + if (sSlotMachine->luckyGame == 0) + return ReelTimeProbabilityTable0[reelTimeDraw][sSlotMachine->pikaPower]; else - return gUnknown_083ECDAC[a0][sSlotMachine->pikaPower]; + return ReelTimeProbabilityTable1[reelTimeDraw][sSlotMachine->pikaPower]; } -/*static */void sub_8102680(void) +/*static */void DrawReelTimeOutcome(void) { u8 rval; - s16 i; + s16 reelTimeDraw; - sSlotMachine->unk05 = 0; + sSlotMachine->reelTimeDraw = 0; rval = Random(); - if (rval < sub_810264C(0)) + if (rval < GetReelTimeProbability(0)) return; - for (i = 5; i > 0; i--) + for (reelTimeDraw = 5; reelTimeDraw > 0; reelTimeDraw--) { rval = Random(); - if (rval < sub_810264C(i)) + if (rval < GetReelTimeProbability(reelTimeDraw)) break; } - sSlotMachine->unk05 = i; + sSlotMachine->reelTimeDraw = reelTimeDraw; } -/*static */bool8 sub_81026DC(u16 a0) +/*static */bool8 SkipToReelTimeAction14(u16 i) { u16 rval = Random() & 0xff; - if (rval < gUnknown_083ECE12[a0]) + if (rval < ProbabilityTable_SkipToReelTimeAction14[i]) return TRUE; else return FALSE; } -/*static */u16 dp15_jump_random_unknown(void) +/*static */u16 DrawNewReelIncrement(void) { - u8 r4 = 0; + u8 i = 0; u8 rval; u8 value; - if (sSlotMachine->unk10 >= 300) - r4 = 4; - else if (sSlotMachine->unk10 >= 250) - r4 = 3; - else if (sSlotMachine->unk10 >= 200) - r4 = 2; - else if (sSlotMachine->unk10 >= 150) - r4 = 1; + if (sSlotMachine->netCoinLoss >= 300) + i = 4; + else if (sSlotMachine->netCoinLoss >= 250) + i = 3; + else if (sSlotMachine->netCoinLoss >= 200) + i = 2; + else if (sSlotMachine->netCoinLoss >= 150) + i = 1; rval = Random() % 100; - value = gUnknown_083ECE1C[r4][0]; + value = ReelIncrementTable[i][0]; if (rval < value) return 4; rval = Random() % 100; - value = gUnknown_083ECE1C[r4][1] + gUnknown_083ECE30[sSlotMachine->unk0B]; + value = ReelIncrementTable[i][1] + ReelTimeBonusIncrementTable[sSlotMachine->fairRollsUsed]; if (rval < value) return 2; return 8; @@ -1543,9 +1570,9 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) { u8 c1, c2, c3, match; - c1 = GetTagOfReelSymbolOnScreenAtPos(0, 2); - c2 = GetTagOfReelSymbolOnScreenAtPos(1, 2); - c3 = GetTagOfReelSymbolOnScreenAtPos(2, 2); + c1 = GetNearbyTag(0, 2); + c2 = GetNearbyTag(1, 2); + c3 = GetNearbyTag(2, 2); match = GetMatchFromSymbolsInRow(c1, c2, c3); if (match != SLOT_MACHINE_MATCHED_NONE) { @@ -1559,9 +1586,9 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) { u8 c1, c2, c3, match; - c1 = GetTagOfReelSymbolOnScreenAtPos(0, 1); - c2 = GetTagOfReelSymbolOnScreenAtPos(1, 1); - c3 = GetTagOfReelSymbolOnScreenAtPos(2, 1); + c1 = GetNearbyTag(0, 1); + c2 = GetNearbyTag(1, 1); + c3 = GetNearbyTag(2, 1); match = GetMatchFromSymbolsInRow(c1, c2, c3); if (match != SLOT_MACHINE_MATCHED_NONE) { @@ -1571,9 +1598,9 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) sSlotMachine->matchedSymbols |= sSlotMatchFlags[match]; sub_8103E04(1); } - c1 = GetTagOfReelSymbolOnScreenAtPos(0, 3); - c2 = GetTagOfReelSymbolOnScreenAtPos(1, 3); - c3 = GetTagOfReelSymbolOnScreenAtPos(2, 3); + c1 = GetNearbyTag(0, 3); + c2 = GetNearbyTag(1, 3); + c3 = GetNearbyTag(2, 3); match = GetMatchFromSymbolsInRow(c1, c2, c3); if (match != SLOT_MACHINE_MATCHED_NONE) { @@ -1589,9 +1616,9 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) { u8 c1, c2, c3, match; - c1 = GetTagOfReelSymbolOnScreenAtPos(0, 1); - c2 = GetTagOfReelSymbolOnScreenAtPos(1, 2); - c3 = GetTagOfReelSymbolOnScreenAtPos(2, 3); + c1 = GetNearbyTag(0, 1); + c2 = GetNearbyTag(1, 2); + c3 = GetNearbyTag(2, 3); match = GetMatchFromSymbolsInRow(c1, c2, c3); if (match != SLOT_MACHINE_MATCHED_NONE) { @@ -1602,9 +1629,9 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) } sub_8103E04(3); } - c1 = GetTagOfReelSymbolOnScreenAtPos(0, 3); - c2 = GetTagOfReelSymbolOnScreenAtPos(1, 2); - c3 = GetTagOfReelSymbolOnScreenAtPos(2, 1); + c1 = GetNearbyTag(0, 3); + c2 = GetNearbyTag(1, 2); + c3 = GetNearbyTag(2, 1); match = GetMatchFromSymbolsInRow(c1, c2, c3); if (match != SLOT_MACHINE_MATCHED_NONE) { @@ -1630,26 +1657,26 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) return SLOT_MACHINE_MATCHED_NONE; } -/*static */void sub_8102A24(void) +/*static */void AwardPayout(void) { - sub_8102A64(CreateTask(sub_8102A64, 4)); + RunAwardPayoutActions(CreateTask(RunAwardPayoutActions, 4)); } -/*static */bool8 sub_8102A44(void) +/*static */bool8 IsFinalTask_RunAwardPayoutActions(void) { - if (FindTaskIdByFunc(sub_8102A64) == 0xFF) + if (FindTaskIdByFunc(RunAwardPayoutActions) == TAIL_SENTINEL) return TRUE; else return FALSE; } -/*static */void sub_8102A64(u8 taskId) +/*static */void RunAwardPayoutActions(u8 taskId) { - while (gUnknown_083ECB20[gTasks[taskId].data[0]](gTasks + taskId)) + while (AwardPayoutActions[gTasks[taskId].data[0]](gTasks + taskId)) ; } -/*static */bool8 sub_8102A9C(struct Task *task) +/*static */bool8 AwardPayoutAction1(struct Task *task) { if (sub_8103E38()) { @@ -1662,8 +1689,8 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) } return FALSE; } - -/*static */bool8 sub_8102AD0(struct Task *task) +// task->data[1]: timer +/*static */bool8 AwardPayoutAction_GivePayoutToPlayer(struct Task *task) { if (!task->data[1]--) { @@ -1689,165 +1716,177 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) return FALSE; } -/*static */bool8 sub_8102B80(struct Task *task) +/*static */bool8 AwardPayoutAction_FreeTask(struct Task *task) { if (sub_8103E7C()) - DestroyTask(FindTaskIdByFunc(sub_8102A64)); + DestroyTask(FindTaskIdByFunc(RunAwardPayoutActions)); return FALSE; } -/*static */u8 GetTagOfReelSymbolOnScreenAtPos(u8 x, s16 y) +/*static */u8 GetNearbyTag(u8 reelIndex, s16 posOffset) { - s16 offset = (sSlotMachine->reelPositions[x] + y) % 21; - if (offset < 0) - offset += 21; - return sReelSymbols[x][offset]; + /* + Returns the tag that is posOffset below the tag at the top of reelIndex's tape + */ + s16 tagIndex = (sSlotMachine->reelPositions[reelIndex] + posOffset) % REEL_NUM_TAGS; + if (tagIndex < 0) + tagIndex += REEL_NUM_TAGS; + return sReelSymbols[reelIndex][tagIndex]; } -/*static */u8 GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(u8 x, s16 y) +// TODO: find out how rounding works +/*static */u8 GetNearbyTag_PixelOffset(u8 reelIndex, s16 posOffset) { - s16 r6 = 0; - s16 result = sSlotMachine->unk1C[x] % 24; + s16 tagOffset = 0; + s16 result = sSlotMachine->reelPixelOffsets[reelIndex] % 24; if (result != 0) - r6 = -1; - return GetTagOfReelSymbolOnScreenAtPos(x, y + r6); + tagOffset = -1; // tag will be posOffset - 1 + return GetNearbyTag(reelIndex, posOffset + tagOffset); } -/*static */u8 sub_8102C48(s16 a0) +// TODO: make sure this is actually what's happening +/*static */u8 GetNthNextReelTimePosition(s16 n) { - s16 r1 = (sSlotMachine->unk16 + a0) % 6; - if (r1 < 0) - r1 += 6; - return gUnknown_083ECCF1[r1]; + s16 newPosition = (sSlotMachine->reelTimePosition + n) % 6; + if (newPosition < 0) + newPosition += 6; + return gUnknown_083ECCF1[newPosition]; } -/*static */void sub_8102C84(u8 a0, s16 a1) +/*static */void IncrementReelPixelOffset(u8 reelIndex, s16 value) { - sSlotMachine->unk1C[a0] += a1; - sSlotMachine->unk1C[a0] %= 504; - sSlotMachine->reelPositions[a0] = 21 - sSlotMachine->unk1C[a0] / 24; + sSlotMachine->reelPixelOffsets[reelIndex] += value; + sSlotMachine->reelPixelOffsets[reelIndex] %= 504; + sSlotMachine->reelPositions[reelIndex] = REEL_NUM_TAGS - sSlotMachine->reelPixelOffsets[reelIndex] / 24; } -s16 sub_8102CCC(u8 a0, s16 a1) +// TODO: make sure that's actually what's happening +s16 AdvanceReelNextTag(u8 reelIndex, s16 reelIncrement) { - s16 r1 = sSlotMachine->unk1C[a0] % 24; - if (r1 != 0) + s16 value = sSlotMachine->reelPixelOffsets[reelIndex] % 24; + if (value != 0) { - if (r1 < a1) - a1 = r1; - sub_8102C84(a0, a1); - r1 = sSlotMachine->unk1C[a0] % 24; + if (value < reelIncrement) + reelIncrement = value; + IncrementReelPixelOffset(reelIndex, reelIncrement); + value = sSlotMachine->reelPixelOffsets[reelIndex] % 24; } - return r1; + return value; } -/*static */void sub_8102D28(s16 a0) +/*static */void IncrementReelTimePixelOffset(s16 value) { - sSlotMachine->unk14 += a0; - sSlotMachine->unk14 %= 120; - sSlotMachine->unk16 = 6 - sSlotMachine->unk14 / 20; + sSlotMachine->reelTimePixelOffset += value; + sSlotMachine->reelTimePixelOffset %= 120; + sSlotMachine->reelTimePosition = 6 - sSlotMachine->reelTimePixelOffset / 20; } -s16 sub_8102D5C(s16 a0) +s16 AdvanceReelTimeNextNumber(s16 reelIncrement) { - s16 r1 = sSlotMachine->unk14 % 20; - if (r1 != 0) + s16 value = sSlotMachine->reelTimePixelOffset % 20; + if (value != 0) { - if (r1 < a0) - a0 = r1; - sub_8102D28(a0); - r1 = sSlotMachine->unk14 % 20; + if (value < reelIncrement) + reelIncrement = value; + IncrementReelTimePixelOffset(reelIncrement); + value = sSlotMachine->reelTimePixelOffset % 20; } - return r1; + return value; } -/*static */void sub_8102DA8(void) +/*static */void GameplayTask_StopReel(void) { u8 i; for (i = 0; i < 3; i++) { - u8 taskId = CreateTask(sub_8102E68, 2); + u8 taskId = CreateTask(RunReelActions, 2); gTasks[taskId].data[15] = i; sSlotMachine->reelTasks[i] = taskId; - sub_8102E68(taskId); + RunReelActions(taskId); } } -/*static */void sub_8102DEC(u8 a0) +/*static */void ReelTasks_8102DEC(u8 reelIndex) { - gTasks[sSlotMachine->reelTasks[a0]].data[0] = 1; - gTasks[sSlotMachine->reelTasks[a0]].data[14] = 1; + gTasks[sSlotMachine->reelTasks[reelIndex]].data[0] = 1; + gTasks[sSlotMachine->reelTasks[reelIndex]].data[14] = 1; } -/*static */void sub_8102E1C(u8 a0) +/*static */void sub_8102E1C(u8 reelIndex) { - gTasks[sSlotMachine->reelTasks[a0]].data[0] = 2; + gTasks[sSlotMachine->reelTasks[reelIndex]].data[0] = 2; } -/*static */bool8 sub_8102E40(u8 a0) +/*static */bool8 IsReelMoving(u8 reelIndex) { - return gTasks[sSlotMachine->reelTasks[a0]].data[14]; + return gTasks[sSlotMachine->reelTasks[reelIndex]].data[14]; } -/*static */void sub_8102E68(u8 taskId) +/*static */void RunReelActions(u8 taskId) { - while (gUnknown_083ECB2C[gTasks[taskId].data[0]](gTasks + taskId)) + while (ReelActions[gTasks[taskId].data[0]](gTasks + taskId)) ; } -/*static */bool8 sub_8102EA0(struct Task *task) +// task->data[1] reel turns +// task->data[15] reelIndex +/*static */bool8 ReelAction_StayStill(struct Task *task) { return FALSE; } -/*static */bool8 sub_8102EA4(struct Task *task) +/*static */bool8 ReelAction_Spin(struct Task *task) { - sub_8102C84(task->data[15], sSlotMachine->unk1A); + IncrementReelPixelOffset(task->data[15], sSlotMachine->reelIncrement); return FALSE; } -/*static */bool8 sub_8102EC0(struct Task *task) +/*static */bool8 ReelAction_DecideWhereToStop(struct Task *task) { task->data[0]++; - sSlotMachine->unk34[task->data[15]] = 0; - sSlotMachine->unk2E[task->data[15]] = 0; - if (sSlotMachine->unk0A == 0 && (sSlotMachine->unk04 == 0 || sSlotMachine->unk06 == 0 || !gUnknown_083ECB40[task->data[15]]())) + // initialize data for that reel --> these will be manipulated if biasTags can be lined up + sSlotMachine->biasTagFinalPositions[task->data[15]] = 0; + sSlotMachine->reelExtraTurns[task->data[15]] = 0; + + if (sSlotMachine->fairRollsLeft == 0 && (sSlotMachine->luckyFlags == 0 || sSlotMachine->isBiasTagMatchPossible == 0 || !DecideReelTurns_BiasTag[task->data[15]]())) { - sSlotMachine->unk06 = 0; - gUnknown_083ECB4C[task->data[15]](); + sSlotMachine->isBiasTagMatchPossible = 0; + DecideReelTurns_NoBiasTag[task->data[15]](); } - task->data[1] = sSlotMachine->unk2E[task->data[15]]; + task->data[1] = sSlotMachine->reelExtraTurns[task->data[15]]; return TRUE; } -/*static */bool8 sub_8102F4C(struct Task *task) +// go to next tag and then do any additional turns +/*static */bool8 ReelAction_TurnToSelectedTag(struct Task *task) { - u16 sp[ARRAY_COUNT(gUnknown_085A74FC)]; - s16 r2; + u16 reelStopShocks[ARRAY_COUNT(ReelStopShocks)]; + s16 reelPixelPos; - memcpy(sp, gUnknown_085A74FC, sizeof(gUnknown_085A74FC)); - r2 = sSlotMachine->unk1C[task->data[15]] % 24; - if (r2 != 0) - r2 = sub_8102CCC(task->data[15], sSlotMachine->unk1A); - else if (sSlotMachine->unk2E[task->data[15]]) + memcpy(reelStopShocks, ReelStopShocks, sizeof(ReelStopShocks)); + reelPixelPos = sSlotMachine->reelPixelOffsets[task->data[15]] % 24; + if (reelPixelPos != 0) + reelPixelPos = AdvanceReelNextTag(task->data[15], sSlotMachine->reelIncrement); + else if (sSlotMachine->reelExtraTurns[task->data[15]]) { - sSlotMachine->unk2E[task->data[15]]--; - sub_8102C84(task->data[15], sSlotMachine->unk1A); - r2 = sSlotMachine->unk1C[task->data[15]] % 24; + sSlotMachine->reelExtraTurns[task->data[15]]--; + IncrementReelPixelOffset(task->data[15], sSlotMachine->reelIncrement); + reelPixelPos = sSlotMachine->reelPixelOffsets[task->data[15]] % 24; } - if (r2 == 0 && sSlotMachine->unk2E[task->data[15]] == 0) + if (reelPixelPos == 0 && sSlotMachine->reelExtraTurns[task->data[15]] == 0) { task->data[0]++; - task->data[1] = sp[task->data[1]]; + task->data[1] = reelStopShocks[task->data[1]]; task->data[2] = 0; } return FALSE; } -/*static */bool8 sub_8103008(struct Task *task) +// make selected tag oscillate before it becomes still +/*static */bool8 ReelAction_OscillatingStop(struct Task *task) { - sSlotMachine->unk22[task->data[15]] = task->data[1]; + sSlotMachine->stopReelPixelOffset[task->data[15]] = task->data[1]; task->data[1] = -task->data[1]; task->data[2]++; if ((task->data[2] & 0x3) == 0) @@ -1856,103 +1895,111 @@ s16 sub_8102D5C(s16 a0) { task->data[0] = 0; task->data[14] = 0; - sSlotMachine->unk22[task->data[15]] = 0; + sSlotMachine->stopReelPixelOffset[task->data[15]] = 0; } return FALSE; } -/*static */bool8 sub_810305C(void) +/*static */bool8 DecideReelTurns_BiasTag_Reel1(void) { - u8 r3 = sub_810250C(sSlotMachine->unk04); - u8 r5 = r3; - if (sSlotMachine->unk04 & 0xc0) + u8 tag2 = GetLuckyFlagTagOutput(sSlotMachine->luckyFlags); + u8 tag1 = tag2; + if (sSlotMachine->luckyFlags & 0xc0) // if either of top 2 bits are set { - r5 = 0; - r3 = 1; + tag1 = SLOT_MACHINE_TAG_7_RED; + tag2 = SLOT_MACHINE_TAG_7_BLUE; } - return gUnknown_083ECB64[sSlotMachine->bet - 1](r5, r3); + return DecideReelTurns_BiasTag_Reel1_Bets[sSlotMachine->bet - 1](tag1, tag2); } -/*static */bool8 sub_81030A4(s16 y, u8 tag1, u8 tag2) +/*static */bool8 IsTag1orTag2AtPosInReel1(s16 pos, u8 tag1, u8 tag2) { - u8 tag = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, y); + u8 tag = GetNearbyTag_PixelOffset(0, pos); if (tag == tag1 || tag == tag2) { - sSlotMachine->unk07 = tag; + sSlotMachine->biasTag = tag; return TRUE; } return FALSE; } -/*static */bool8 sub_81030E0(s16 y) +/*static */bool8 AreCherriesOnScreen_Reel1(s16 offsetFromCenter) { - if (GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, 1 - y) == 4 || GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, 2 - y) == 4 || GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, 3 - y) == 4) + if (GetNearbyTag_PixelOffset(0, 1 - offsetFromCenter) == SLOT_MACHINE_TAG_CHERRY || GetNearbyTag_PixelOffset(0, 2 - offsetFromCenter) == SLOT_MACHINE_TAG_CHERRY || GetNearbyTag_PixelOffset(0, 3 - offsetFromCenter) == SLOT_MACHINE_TAG_CHERRY) return TRUE; else return FALSE; } -/*static */bool8 sub_8103134(void) +/*static */bool8 LuckyFlags_BiasCherryOr7s(void) { - if (sSlotMachine->unk04 & 0xc2) + if (sSlotMachine->luckyFlags & 0xc2) // if any of bits 6, 7, or 1 are set return TRUE; else return FALSE; } -/*static */bool8 sub_8103154(u8 a0, u8 a1) +/*static */bool8 DecideReelTurns_BiasTag_Reel1_Bet1(u8 tag1, u8 tag2) { s16 i; for (i = 0; i < 5; i++) { - if (sub_81030A4(2 - i, a0, a1)) + // if a lucky tag appears in the center row within the next 5 turns + if (IsTag1orTag2AtPosInReel1(2 - i, tag1, tag2)) { - sSlotMachine->unk34[0] = 2; - sSlotMachine->unk2E[0] = i; + sSlotMachine->biasTagFinalPositions[0] = 2; + sSlotMachine->reelExtraTurns[0] = i; return TRUE; } } return FALSE; } -/*static */bool8 sub_81031B4(u8 tag1, u8 tag2) +/*static */bool8 DecideReelTurns_BiasTag_Reel1_Bet2or3(u8 tag1, u8 tag2) { s16 i; - bool8 r6 = sub_8103134(); - if (r6 || !sub_81030E0(0)) + bool8 areLuckyBitsSet = LuckyFlags_BiasCherryOr7s(); + // if lucky numbers or no cherries are currently on screen in reel 1... + if (areLuckyBitsSet || !AreCherriesOnScreen_Reel1(0)) { for (i = 1; i < 4; i++) { - if (sub_81030A4(i, tag1, tag2)) + //...and if a bias tag is currently on the screen + if (IsTag1orTag2AtPosInReel1(i, tag1, tag2)) { - sSlotMachine->unk34[0] = i; - sSlotMachine->unk2E[0] = 0; + sSlotMachine->biasTagFinalPositions[0] = i; + sSlotMachine->reelExtraTurns[0] = 0; return TRUE; } } } for (i = 1; i < 5; i++) { - bool8 r7 = r6; - if (r7 || !sub_81030E0(i)) + bool8 areLuckyBitsSetCopy = areLuckyBitsSet; // redundant + // if lucky numbers or if in the next 4 turns there is a screen with no cherries... + if (areLuckyBitsSetCopy || !AreCherriesOnScreen_Reel1(i)) { - if (sub_81030A4(1 - i, tag1, tag2)) + //...and if a bias tag is in top row of that screen + if (IsTag1orTag2AtPosInReel1(1 - i, tag1, tag2)) { - if (i == 1 && (r7 || !sub_81030E0(3))) + //...and if it only took 1 turn and the lucky tag could also be the bottom row of a screen with no cherries... + if (i == 1 && (areLuckyBitsSetCopy || !AreCherriesOnScreen_Reel1(3))) { - sSlotMachine->unk34[0] = 3; - sSlotMachine->unk2E[0] = 3; + sSlotMachine->biasTagFinalPositions[0] = 3; // maybe how many paths to check + sSlotMachine->reelExtraTurns[0] = 3; // maybe upper limit of turns to advance return TRUE; } - if (i < 4 && (r7 || !sub_81030E0(i + 1))) + //...or if it isn't the last turn and the lucky tag could be in the center row of a screen with no cherries... + if (i < 4 && (areLuckyBitsSetCopy || !AreCherriesOnScreen_Reel1(i + 1))) { - sSlotMachine->unk34[0] = 2; - sSlotMachine->unk2E[0] = i + 1; + sSlotMachine->biasTagFinalPositions[0] = 2; + sSlotMachine->reelExtraTurns[0] = i + 1; return TRUE; } - sSlotMachine->unk34[0] = 1; - sSlotMachine->unk2E[0] = i; + //...else + sSlotMachine->biasTagFinalPositions[0] = 1; + sSlotMachine->reelExtraTurns[0] = i; return TRUE; } } @@ -1960,55 +2007,61 @@ s16 sub_8102D5C(s16 a0) return FALSE; } -/*static */bool8 sub_81032C0(void) +/*static */bool8 DecideReelTurns_BiasTag_Reel2(void) { - return gUnknown_083ECB70[sSlotMachine->bet - 1](); + return DecideReelTurns_BiasTag_Reel2_Bets[sSlotMachine->bet - 1](); } -/*static */bool8 sub_81032E8(void) +/*static */bool8 DecideReelTurns_BiasTag_Reel2_Bet1or2(void) { s16 i; - s16 unk34_0 = sSlotMachine->unk34[0]; + s16 reel1BiasTagFinalPos = sSlotMachine->biasTagFinalPositions[0]; for (i = 0; i < 5; i++) { - if (GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, unk34_0 - i) == sSlotMachine->unk07) + // if biasTag appears in the same row within 5 turns + if (GetNearbyTag_PixelOffset(1, reel1BiasTagFinalPos - i) == sSlotMachine->biasTag) { - sSlotMachine->unk34[1] = unk34_0; - sSlotMachine->unk2E[1] = i; + sSlotMachine->biasTagFinalPositions[1] = reel1BiasTagFinalPos; + sSlotMachine->reelExtraTurns[1] = i; return TRUE; } } return FALSE; } -/*static */bool8 sub_810333C(void) +/*static */bool8 DecideReelTurns_BiasTag_Reel2_Bet3(void) { s16 i; - if (sub_81032E8()) + // if biasTag appears in the same row within 5 turns... + if (DecideReelTurns_BiasTag_Reel2_Bet1or2()) { - if (sSlotMachine->unk34[0] != 2 && sSlotMachine->unk2E[1] > 1 && sSlotMachine->unk2E[1] != 4) + //...and if the biasTag is not in row 2 of reel 1 and if it requires between either 2 or 3 turns to line up the biasTag in row 2... + if (sSlotMachine->biasTagFinalPositions[0] != 2 && sSlotMachine->reelExtraTurns[1] > 1 && sSlotMachine->reelExtraTurns[1] != 4) { for (i = 0; i < 5; i++) { - if (GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, 2 - i) == sSlotMachine->unk07) + //...and if the bias tag will appear in the center row within 5 turns + if (GetNearbyTag_PixelOffset(1, 2 - i) == sSlotMachine->biasTag) { - sSlotMachine->unk34[1] = 2; - sSlotMachine->unk2E[1] = i; + sSlotMachine->biasTagFinalPositions[1] = 2; + sSlotMachine->reelExtraTurns[1] = i; break; } } } return TRUE; } - if (sSlotMachine->unk34[0] != 2) + // else if the biasTag is not in row 2 of reel 1... + if (sSlotMachine->biasTagFinalPositions[0] != 2) { for (i = 0; i < 5; i++) { - if (GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, 2 - i) == sSlotMachine->unk07) + //...and if the biasTag will appear in the center row of reel 2 within 5 turns + if (GetNearbyTag_PixelOffset(1, 2 - i) == sSlotMachine->biasTag) { - sSlotMachine->unk34[1] = 2; - sSlotMachine->unk2E[1] = i; + sSlotMachine->biasTagFinalPositions[1] = 2; + sSlotMachine->reelExtraTurns[1] = i; return TRUE; } } @@ -2016,102 +2069,117 @@ s16 sub_8102D5C(s16 a0) return FALSE; } -/*static */bool8 sub_81033DC(void) +/*static */bool8 DecideReelTurns_BiasTag_Reel3(void) { - u8 r3 = sSlotMachine->unk07; - if (sSlotMachine->unk04 & 0x40) + u8 biasTag = sSlotMachine->biasTag; + // if bit 6 of luckyFlags is set... + if (sSlotMachine->luckyFlags & 0x40) { - r3 = 0; - if (sSlotMachine->unk07 == 0) + // make biasTag the opposite color of the 7 in sSlotMachine->biasTag + biasTag = 0; + if (sSlotMachine->biasTag == 0) { - r3 = 1; + biasTag = 1; } } - return gUnknown_083ECB7C[sSlotMachine->bet - 1](r3); + return DecideReelTurns_BiasTag_Reel3_Bets[sSlotMachine->bet - 1](biasTag); } -/*static */bool8 sub_810341C(u8 a0) +/*static */bool8 DecideReelTurns_BiasTag_Reel3_Bet1or2(u8 biasTag) { s16 i; - s16 unk34_1 = sSlotMachine->unk34[1]; + s16 reel2BiasTagPos = sSlotMachine->biasTagFinalPositions[1]; for (i = 0; i < 5; i++) { - if (GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, unk34_1 - i) == a0) + // if the biasTag appears in the same row as in reel 2 within 5 turns + if (GetNearbyTag_PixelOffset(2, reel2BiasTagPos - i) == biasTag) { - sSlotMachine->unk34[2] = unk34_1; - sSlotMachine->unk2E[2] = i; + sSlotMachine->biasTagFinalPositions[2] = reel2BiasTagPos; + sSlotMachine->reelExtraTurns[2] = i; return TRUE; } } return FALSE; } -/*static */bool8 sub_810347C(u8 a0) +/*static */bool8 DecideReelTurns_BiasTag_Reel3_Bet3(u8 biasTag) { s16 i; - s16 r8; - if (sSlotMachine->unk34[0] == sSlotMachine->unk34[1]) - return sub_810341C(a0); - if (sSlotMachine->unk34[0] == 1) - r8 = 3; + s16 biasTagFinalPos; + // if the final position of the biasTag matches in reel 1 and reel 2... + if (sSlotMachine->biasTagFinalPositions[0] == sSlotMachine->biasTagFinalPositions[1]) + //...then try to line it up in reel 3 + return DecideReelTurns_BiasTag_Reel3_Bet1or2(biasTag); + // else place it in the row opposite reel 1's + if (sSlotMachine->biasTagFinalPositions[0] == 1) + biasTagFinalPos = 3; else - r8 = 1; + biasTagFinalPos = 1; for (i = 0; i < 5; i++) { - if (GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, r8 - i) == a0) + // if in the biasTag lands in that position within the next 5 turns + if (GetNearbyTag_PixelOffset(2, biasTagFinalPos - i) == biasTag) { - sSlotMachine->unk2E[2] = i; - sSlotMachine->unk34[2] = r8; + sSlotMachine->reelExtraTurns[2] = i; + sSlotMachine->biasTagFinalPositions[2] = biasTagFinalPos; return TRUE; } } return FALSE; } -/*static */void sub_81034F4(void) +/* +Advance until there are no cherries on screen in reel 1 +*/ +/*static */void DecideReelTurns_NoBiasTag_Reel1(void) { s16 i = 0; - while (sub_81030E0(i) != 0) + while (AreCherriesOnScreen_Reel1(i) != 0) i++; - sSlotMachine->unk2E[0] = i; + sSlotMachine->reelExtraTurns[0] = i; } -/*static */bool8 sub_8103520(u8 *a0) +/*static */bool8 IsBiasTag7AndIfSoChangeColor(u8 *biasTagPtr) { - if (*a0 == 0) + if (*biasTagPtr == SLOT_MACHINE_TAG_7_RED) { - *a0 = 1; + *biasTagPtr = SLOT_MACHINE_TAG_7_BLUE; return TRUE; } - if (*a0 == 1) + if (*biasTagPtr == SLOT_MACHINE_TAG_7_BLUE) { - *a0 = 0; + *biasTagPtr = SLOT_MACHINE_TAG_7_RED; return TRUE; } return FALSE; } -/*static */void sub_8103540(void) +/*static */void DecideReelTurns_NoBiasTag_Reel2(void) { - gUnknown_083ECB88[sSlotMachine->bet - 1](); + DecideReelTurns_NoBiasTag_Reel2_Bets[sSlotMachine->bet - 1](); } -/*static */void sub_8103564(void) +// only does stuff if the biasTag is one of the 7's, plus other conditions +/*static */void DecideReelTurns_NoBiasTag_Reel2_Bet1(void) { - if (sSlotMachine->unk34[0] != 0 && sSlotMachine->unk04 & 0x80) + // if reel 1 has a biasTag and bit 7 is set in luckyFlags... + if (sSlotMachine->biasTagFinalPositions[0] != 0 && sSlotMachine->luckyFlags & 0x80) { - u8 sp0 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, 2 - sSlotMachine->unk2E[0]); - if (sub_8103520(&sp0)) + u8 biasTag = GetNearbyTag_PixelOffset(0, 2 - sSlotMachine->reelExtraTurns[0]); + //...and if biasTag is one of the 7's... + if (IsBiasTag7AndIfSoChangeColor(&biasTag)) + //...swap the color of the 7... { s16 i; for (i = 0; i < 5; i++) { - if (sp0 == GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, 2 - i)) + //...and if the biasTag appears in the next 5 turns + if (biasTag == GetNearbyTag_PixelOffset(1, 2 - i)) { - sSlotMachine->unk34[1] = 2; - sSlotMachine->unk2E[1] = i; + sSlotMachine->biasTagFinalPositions[1] = 2; + sSlotMachine->reelExtraTurns[1] = i; break; } } @@ -2119,20 +2187,24 @@ s16 sub_8102D5C(s16 a0) } } -/*static */void j5_08111E84(void) +/*static */void DecideReelTurns_NoBiasTag_Reel2_Bet2(void) { - if (sSlotMachine->unk34[0] != 0 && sSlotMachine->unk04 & 0x80) + // if reel 1 has a biasTag and bit 7 is set in luckyFlags... + if (sSlotMachine->biasTagFinalPositions[0] != 0 && sSlotMachine->luckyFlags & 0x80) { - u8 sp0 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, sSlotMachine->unk34[0] - sSlotMachine->unk2E[0]); - if (sub_8103520(&sp0)) + u8 biasTag = GetNearbyTag_PixelOffset(0, sSlotMachine->biasTagFinalPositions[0] - sSlotMachine->reelExtraTurns[0]); + //...and if biasTag is one of the 7's... + if (IsBiasTag7AndIfSoChangeColor(&biasTag)) + //...swap the color of the 7... { s16 i; for (i = 0; i < 5; i++) { - if (sp0 == GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, sSlotMachine->unk34[0] - i)) + //...and if in the next 5 turns the biasTag appears in reel 2 + if (biasTag == GetNearbyTag_PixelOffset(1, sSlotMachine->biasTagFinalPositions[0] - i)) { - sSlotMachine->unk34[1] = sSlotMachine->unk34[0]; - sSlotMachine->unk2E[1] = i; + sSlotMachine->biasTagFinalPositions[1] = sSlotMachine->biasTagFinalPositions[0]; + sSlotMachine->reelExtraTurns[1] = i; break; } } @@ -2140,61 +2212,65 @@ s16 sub_8102D5C(s16 a0) } } -/*static */void sub_8103668(void) +/*static */void DecideReelTurns_NoBiasTag_Reel2_Bet3(void) { s16 i; s16 j; - if (sSlotMachine->unk34[0] != 0 && sSlotMachine->unk04 & 0x80) + // if reel 1 has a biasTag and bit 7 is set in luckyFlags... + if (sSlotMachine->biasTagFinalPositions[0] != 0 && sSlotMachine->luckyFlags & 0x80) { - if (sSlotMachine->unk34[0] == 2) + //...and if biasTag appeared in the center row of reel 1 + if (sSlotMachine->biasTagFinalPositions[0] == 2) { - j5_08111E84(); + DecideReelTurns_NoBiasTag_Reel2_Bet2(); } else { - u8 sp0 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, sSlotMachine->unk34[0] - sSlotMachine->unk2E[0]); - if (sub_8103520(&sp0)) + u8 biasTag = GetNearbyTag_PixelOffset(0, sSlotMachine->biasTagFinalPositions[0] - sSlotMachine->reelExtraTurns[0]); + //...and if biasTag is one of the 7's... + if (IsBiasTag7AndIfSoChangeColor(&biasTag)) + //...swap the color of the 7... { j = 2; - if (sSlotMachine->unk34[0] == 3) + if (sSlotMachine->biasTagFinalPositions[0] == 3) j = 3; for (i = 0; i < 2; i++, j--) { - if (sp0 == GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, j)) + if (biasTag == GetNearbyTag_PixelOffset(1, j)) { - sSlotMachine->unk34[1] = j; - sSlotMachine->unk2E[1] = 0; + sSlotMachine->biasTagFinalPositions[1] = j; + sSlotMachine->reelExtraTurns[1] = 0; return; } } for (j = 1; j < 5; j++) { - if (sp0 == GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, sSlotMachine->unk34[0] - j)) + if (biasTag == GetNearbyTag_PixelOffset(1, sSlotMachine->biasTagFinalPositions[0] - j)) { - if (sSlotMachine->unk34[0] == 1) + if (sSlotMachine->biasTagFinalPositions[0] == 1) { if (j < 3) { - sSlotMachine->unk34[1] = 2; - sSlotMachine->unk2E[1] = j + 1; + sSlotMachine->biasTagFinalPositions[1] = 2; + sSlotMachine->reelExtraTurns[1] = j + 1; } else { - sSlotMachine->unk34[1] = 1; - sSlotMachine->unk2E[1] = j; + sSlotMachine->biasTagFinalPositions[1] = 1; + sSlotMachine->reelExtraTurns[1] = j; } } else { if (j < 3) { - sSlotMachine->unk34[1] = 3; - sSlotMachine->unk2E[1] = j; + sSlotMachine->biasTagFinalPositions[1] = 3; + sSlotMachine->reelExtraTurns[1] = j; } else { - sSlotMachine->unk34[1] = 2; - sSlotMachine->unk2E[1] = j - 1; + sSlotMachine->biasTagFinalPositions[1] = 2; + sSlotMachine->reelExtraTurns[1] = j - 1; } } return; @@ -2234,7 +2310,7 @@ s16 sub_8102D5C(s16 a0) return TRUE; } -/*static */void sub_810380C(void) +/*static */void DecideReelTurns_NoBiasTag_Reel3(void) { gUnknown_083ECB94[sSlotMachine->bet - 1](); } @@ -2242,27 +2318,27 @@ s16 sub_8102D5C(s16 a0) /*static */void sub_8103830(void) { s16 i = 0; - u8 r5 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, 2 - sSlotMachine->unk2E[0]); - u8 r1 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, 2 - sSlotMachine->unk2E[1]); + u8 r5 = GetNearbyTag_PixelOffset(0, 2 - sSlotMachine->reelExtraTurns[0]); + u8 r1 = GetNearbyTag_PixelOffset(1, 2 - sSlotMachine->reelExtraTurns[1]); if (r5 == r1) { while (1) { u8 r0; - if (!(r5 == (r0 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, 2 - i)) || (r5 == 0 && r0 == 1) || (r5 == 1 && r0 == 0))) + if (!(r5 == (r0 = GetNearbyTag_PixelOffset(2, 2 - i)) || (r5 == 0 && r0 == 1) || (r5 == 1 && r0 == 0))) break; i++; } } else if (sub_8103764(r5, r1)) { - if (sSlotMachine->unk04 & 0x80) + if (sSlotMachine->luckyFlags & 0x80) { for (i = 0; i < 5; i++) { - if (r5 == GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, 2 - i)) + if (r5 == GetNearbyTag_PixelOffset(2, 2 - i)) { - sSlotMachine->unk2E[2] = i; + sSlotMachine->reelExtraTurns[2] = i; return; } } @@ -2270,12 +2346,12 @@ s16 sub_8102D5C(s16 a0) i = 0; while (1) { - if (r5 != GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, 2 - i)) + if (r5 != GetNearbyTag_PixelOffset(2, 2 - i)) break; i++; } } - sSlotMachine->unk2E[2] = i; + sSlotMachine->reelExtraTurns[2] = i; } /*static */void sub_8103910(void) @@ -2286,15 +2362,15 @@ s16 sub_8102D5C(s16 a0) u8 r6; u8 r4; - if (sSlotMachine->unk34[1] != 0 && sSlotMachine->unk34[0] == sSlotMachine->unk34[1] && sSlotMachine->unk04 & 0x80) + if (sSlotMachine->biasTagFinalPositions[1] != 0 && sSlotMachine->biasTagFinalPositions[0] == sSlotMachine->biasTagFinalPositions[1] && sSlotMachine->luckyFlags & 0x80) { - r7 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, sSlotMachine->unk34[0] - sSlotMachine->unk2E[0]); - r6 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, sSlotMachine->unk34[1] - sSlotMachine->unk2E[1]); + r7 = GetNearbyTag_PixelOffset(0, sSlotMachine->biasTagFinalPositions[0] - sSlotMachine->reelExtraTurns[0]); + r6 = GetNearbyTag_PixelOffset(1, sSlotMachine->biasTagFinalPositions[1] - sSlotMachine->reelExtraTurns[1]); if (sub_8103764(r7, r6)) { for (i = 0; i < 5; i++) { - r4 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, sSlotMachine->unk34[1] - i); + r4 = GetNearbyTag_PixelOffset(2, sSlotMachine->biasTagFinalPositions[1] - i); if (r7 == r4) { sp0 = i; @@ -2308,10 +2384,10 @@ s16 sub_8102D5C(s16 a0) s16 r8; for (i = 1, r8 = 0; i < 4; i++) { - r7 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, i - sSlotMachine->unk2E[0]); - r6 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, i - sSlotMachine->unk2E[1]); - r4 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, i - sp0); - if (!sub_81037BC(r7, r6, r4) && (!sub_810378C(r7, r6, r4) || !(sSlotMachine->unk04 & 0x80))) + r7 = GetNearbyTag_PixelOffset(0, i - sSlotMachine->reelExtraTurns[0]); + r6 = GetNearbyTag_PixelOffset(1, i - sSlotMachine->reelExtraTurns[1]); + r4 = GetNearbyTag_PixelOffset(2, i - sp0); + if (!sub_81037BC(r7, r6, r4) && (!sub_810378C(r7, r6, r4) || !(sSlotMachine->luckyFlags & 0x80))) { r8++; break; @@ -2321,7 +2397,7 @@ s16 sub_8102D5C(s16 a0) break; sp0++; } - sSlotMachine->unk2E[2] = sp0; + sSlotMachine->reelExtraTurns[2] = sp0; } /*static */void sub_8103A78(void) @@ -2333,21 +2409,21 @@ s16 sub_8102D5C(s16 a0) s16 i; sub_8103910(); - if (sSlotMachine->unk34[1] != 0 && sSlotMachine->unk34[0] != sSlotMachine->unk34[1] && sSlotMachine->unk04 & 0x80) + if (sSlotMachine->biasTagFinalPositions[1] != 0 && sSlotMachine->biasTagFinalPositions[0] != sSlotMachine->biasTagFinalPositions[1] && sSlotMachine->luckyFlags & 0x80) { - r6 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, sSlotMachine->unk34[0] - sSlotMachine->unk2E[0]); - r5 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, sSlotMachine->unk34[1] - sSlotMachine->unk2E[1]); + r6 = GetNearbyTag_PixelOffset(0, sSlotMachine->biasTagFinalPositions[0] - sSlotMachine->reelExtraTurns[0]); + r5 = GetNearbyTag_PixelOffset(1, sSlotMachine->biasTagFinalPositions[1] - sSlotMachine->reelExtraTurns[1]); if (sub_8103764(r6, r5)) { r8 = 1; - if (sSlotMachine->unk34[0] == 1) + if (sSlotMachine->biasTagFinalPositions[0] == 1) r8 = 3; for (i = 0; i < 5; i++) { - r4 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, r8 - (sSlotMachine->unk2E[2] + i)); + r4 = GetNearbyTag_PixelOffset(2, r8 - (sSlotMachine->reelExtraTurns[2] + i)); if (r6 == r4) { - sSlotMachine->unk2E[2] += i; + sSlotMachine->reelExtraTurns[2] += i; break; } } @@ -2355,21 +2431,21 @@ s16 sub_8102D5C(s16 a0) } while (1) { - r6 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, 1 - sSlotMachine->unk2E[0]); - r5 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, 2 - sSlotMachine->unk2E[1]); - r4 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, 3 - sSlotMachine->unk2E[2]); - if (sub_81037BC(r6, r5, r4) || (sub_810378C(r6, r5, r4) && sSlotMachine->unk04 & 0x80)) + r6 = GetNearbyTag_PixelOffset(0, 1 - sSlotMachine->reelExtraTurns[0]); + r5 = GetNearbyTag_PixelOffset(1, 2 - sSlotMachine->reelExtraTurns[1]); + r4 = GetNearbyTag_PixelOffset(2, 3 - sSlotMachine->reelExtraTurns[2]); + if (sub_81037BC(r6, r5, r4) || (sub_810378C(r6, r5, r4) && sSlotMachine->luckyFlags & 0x80)) break; - sSlotMachine->unk2E[2]++; + sSlotMachine->reelExtraTurns[2]++; } while (1) { - r6 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, 3 - sSlotMachine->unk2E[0]); - r5 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, 2 - sSlotMachine->unk2E[1]); - r4 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, 1 - sSlotMachine->unk2E[2]); - if (sub_81037BC(r6, r5, r4) || (sub_810378C(r6, r5, r4) && sSlotMachine->unk04 & 0x80)) + r6 = GetNearbyTag_PixelOffset(0, 3 - sSlotMachine->reelExtraTurns[0]); + r5 = GetNearbyTag_PixelOffset(1, 2 - sSlotMachine->reelExtraTurns[1]); + r4 = GetNearbyTag_PixelOffset(2, 1 - sSlotMachine->reelExtraTurns[2]); + if (sub_81037BC(r6, r5, r4) || (sub_810378C(r6, r5, r4) && sSlotMachine->luckyFlags & 0x80)) break; - sSlotMachine->unk2E[2]++; + sSlotMachine->reelExtraTurns[2]++; } } @@ -2403,9 +2479,9 @@ s16 sub_8102D5C(s16 a0) DestroyTask(taskId); } -/*static */void sub_8103D00(u8 a0) +/*static */void LoadLightedTile(u8 tileId) { - LoadPalette(gUnknown_083EDD08[a0], gUnknown_083EDD30[a0], 2); + LoadPalette(gUnknown_083EDD08[tileId], gUnknown_083EDD30[tileId], 2); } /*static */void sub_8103D28(u8 a0) @@ -2413,18 +2489,19 @@ s16 sub_8102D5C(s16 a0) LoadPalette(gUnknown_083EDD1C[a0], gUnknown_083EDD30[a0], 2); } -/*static */void sub_8103D50(u8 a0) +// probably light the bet number +/*static */void LoadBetTiles(u8 betVal) { u8 i; - for (i = 0; i < gUnknown_083EDD3B[a0]; i++) - sub_8103D00(gUnknown_083EDD35[a0][i]); + for (i = 0; i < gNumberBettingTiles[betVal]; i++) + LoadLightedTile(gBettingTilesId[betVal][i]); } /*static */void sub_8103D8C(u8 a0) { u8 i; - for (i = 0; i < gUnknown_083EDD3B[a0]; i++) - sub_8103D28(gUnknown_083EDD35[a0][i]); + for (i = 0; i < gNumberBettingTiles[a0]; i++) + sub_8103D28(gBettingTilesId[a0][i]); } /*static */void sub_8103DC8(void) @@ -2449,6 +2526,7 @@ s16 sub_8102D5C(s16 a0) sprite->data[7] = 0; } +// something with payout digits /*static */bool8 sub_8103E38(void) { u8 i; @@ -2545,32 +2623,33 @@ s16 sub_8102D5C(s16 a0) /*static */void sub_8104048(void) { - sSlotMachine->unk3E = CreateTask(sub_81040E8, 8); + sSlotMachine->unkTaskPointer = CreateTask(sub_81040E8, 8); } -/*static */void sub_8104064(u8 pikaPower) +// possibly clear pikaPower +/*static */void DisplayPikaPower(u8 pikaPower) { - struct Task *task = gTasks + sSlotMachine->unk3E; - sub_812D394(task); + struct Task *task = gTasks + sSlotMachine->unkTaskPointer; + ClearTaskDataFields_2orHigher(task); task->data[0] = 1; task->data[1]++; - task->data[15] = 1; + task->data[15] = 1; // points to a reelIndex } /*static */void sub_8104098(void) { - struct Task *task = gTasks + sSlotMachine->unk3E; - sub_812D394(task); + struct Task *task = gTasks + sSlotMachine->unkTaskPointer; + ClearTaskDataFields_2orHigher(task); task->data[0] = 3; - task->data[15] = 1; + task->data[15] = 1; // points to a reelIndex } /*static */bool8 sub_81040C8(void) { - return gTasks[sSlotMachine->unk3E].data[15]; + return gTasks[sSlotMachine->unkTaskPointer].data[15]; } -/*static */void sub_81040E8(u8 taskId) +/*static */void sub_81040E8(u8 taskId) // debug to see if taskId is machineId { gUnknown_083ECBB4[gTasks[taskId].data[0]](gTasks + taskId); } @@ -2596,11 +2675,11 @@ s16 sub_8102D5C(s16 a0) r3 = 1, r2 = 1; else if (task->data[1] == 16) r3 = 2, r2 = 2; - gUnknown_0203AACC[r2] = gUnknown_083ECBC4[r3][0]; - LoadBgTilemap(2, &gUnknown_0203AACC[r2], 2, r5 + 0x40); + selectedPikaPowerTile[r2] = pikaPowerTileTable[r3][0]; + LoadBgTilemap(2, &selectedPikaPowerTile[r2], 2, r5 + 0x40); sub_8105B88(task->data[2]); task->data[0] = 0; - task->data[15] = 0; + task->data[15] = 0; // points to a reelIndex } } @@ -2615,8 +2694,8 @@ s16 sub_8102D5C(s16 a0) r3 = 2, r2 = 2; if (task->data[2] == 0) { - gUnknown_0203AACC[r2] = gUnknown_083ECBC4[r3][1]; - LoadBgTilemap(2, &gUnknown_0203AACC[r2], 2, r5 + 0x40); + selectedPikaPowerTile[r2] = pikaPowerTileTable[r3][1]; + LoadBgTilemap(2, &selectedPikaPowerTile[r2], 2, r5 + 0x40); task->data[1]--; } if (++task->data[2] >= 20) @@ -2628,7 +2707,7 @@ s16 sub_8102D5C(s16 a0) } } -/*static */void sub_812D394(struct Task *task) +/*static */void ClearTaskDataFields_2orHigher(struct Task *task) { u8 i; @@ -2636,6 +2715,7 @@ s16 sub_8102D5C(s16 a0) task->data[i] = 0; } +// possibly load tiles for pika power meter /*static */void sub_810423C(u8 pikaPower) { s16 i; @@ -2646,10 +2726,10 @@ s16 sub_8102D5C(s16 a0) r3 = 0, r1 = 0; if (i == 0) r3 = 1, r1 = 1; - else if (i == 15) + else if (i == 15) // pikaPower meter is full r3 = 2, r1 = 2; - gUnknown_0203AACC[r1] = gUnknown_083ECBC4[r3][0]; - LoadBgTilemap(2, &gUnknown_0203AACC[r1], 2, r4 + 0x40); + selectedPikaPowerTile[r1] = pikaPowerTileTable[r3][0]; + LoadBgTilemap(2, &selectedPikaPowerTile[r1], 2, r4 + 0x40); } for (; i < 16; i++, r4++) { @@ -2658,35 +2738,39 @@ s16 sub_8102D5C(s16 a0) r3 = 1, r1 = 1; else if (i == 15) r3 = 2, r1 = 2; - gUnknown_0203AACC[r1] = gUnknown_083ECBC4[r3][1]; - LoadBgTilemap(2, &gUnknown_0203AACC[r1], 2, r4 + 0x40); + selectedPikaPowerTile[r1] = pikaPowerTileTable[r3][1]; + LoadBgTilemap(2, &selectedPikaPowerTile[r1], 2, r4 + 0x40); } - gTasks[sSlotMachine->unk3E].data[1] = pikaPower; + gTasks[sSlotMachine->unkTaskPointer].data[1] = pikaPower; } -/*static */void sub_810430C(void) +/*static */void BeginReelTime(void) { - u8 taskId = CreateTask(sub_810434C, 7); - sub_810434C(taskId); + u8 taskId = CreateTask(RunReelTimeActions, 7); + RunReelTimeActions(taskId); } -/*static */bool8 sub_810432C(void) +/*static */bool8 IsFinalTask_RunReelTimeActions(void) { - if (FindTaskIdByFunc(sub_810434C) == 0xFF) + if (FindTaskIdByFunc(RunReelTimeActions) == TAIL_SENTINEL) return TRUE; return FALSE; } -/*static */void sub_810434C(u8 taskId) +/*static */void RunReelTimeActions(u8 taskId) { - gUnknown_083ECBD0[gTasks[taskId].data[0]](gTasks + taskId); + // task.data[0] points to which ReelTimeAction to do, and starts at 0 + // task.data[1] has something to do with the threshold + // task.data[4] says how many pixels to advance the reel + // task.data[5] is a timer + ReelTimeActions[gTasks[taskId].data[0]](gTasks + taskId); } -/*static */void sub_810437C(struct Task *task) +/*static */void ReelTimeAction1(struct Task *task) { - sSlotMachine->unk0A = 0; - sSlotMachine->unk14 = 0; - sSlotMachine->unk16 = 0; + sSlotMachine->fairRollsLeft = 0; + sSlotMachine->reelTimePixelOffset = 0; + sSlotMachine->reelTimePosition = 0; task->data[0]++; task->data[1] = 0; task->data[2] = 30; @@ -2701,16 +2785,18 @@ s16 sub_8102D5C(s16 a0) sub_81052EC(); sub_81053A0(); sub_810545C(); - sub_8102680(); + DrawReelTimeOutcome(); StopMapMusic(); PlayNewMapMusic(MUS_BD_TIME); } -/*static */void sub_81043EC(struct Task *task) +/*static */void ReelTimeAction2(struct Task *task) { s16 r3; gSpriteCoordOffsetX -= 8; + // boost threshold by 8 task->data[1] += 8; + // only consider lower 8 bits, and then shift them right 3 r3 = ((task->data[1] + 240) & 0xff) >> 3; SetGpuReg(REG_OFFSET_BG1HOFS, task->data[1] & 0x1ff); if (r3 != task->data[2] && task->data[3] <= 18) @@ -2724,21 +2810,22 @@ s16 sub_8102D5C(s16 a0) task->data[0]++; task->data[3] = 0; } - sub_8102D28(task->data[4] >> 8); + // move ReelTime reel by the value in the upper 8 bits of task->data[4] + IncrementReelTimePixelOffset(task->data[4] >> 8); } -/*static */void sub_8104468(struct Task *task) +/*static */void ReelTimeAction3(struct Task *task) { - sub_8102D28(task->data[4] >> 8); + IncrementReelTimePixelOffset(task->data[4] >> 8); if (++task->data[5] >= 60) { task->data[0]++; - sub_8105578(); - sub_81056F0(); + CreateReelTimeSprites1(); + CreateReelTimeSprite2(); } } -/*static */void sub_8104498(struct Task *task) +/*static */void ReelTimeAction4(struct Task *task) { int r5; u8 sp0[ARRAY_COUNT(gUnknown_085A75C0)]; @@ -2749,12 +2836,14 @@ s16 sub_8102D5C(s16 a0) memcpy(sp4, gUnknown_085A75C4, sizeof(gUnknown_085A75C4)); memcpy(spC, gUnknown_085A75CC, sizeof(gUnknown_085A75CC)); - sub_8102D28(task->data[4] >> 8); + IncrementReelTimePixelOffset(task->data[4] >> 8); + // gradually slow down the reel task->data[4] -= 4; r5 = 4 - (task->data[4] >> 8); sub_8105688(sp4[r5]); sub_81057E8(spC[r5]); - StartSpriteAnimIfDifferent(gSprites + sSlotMachine->unk3F, sp0[r5]); + StartSpriteAnimIfDifferent(gSprites + sSlotMachine->reelTimeSprite3F, sp0[r5]); + // once speed goes below 256, go to next ReelTimeAction and keep the speed level if (task->data[4] <= 0x100) { task->data[0]++; @@ -2763,21 +2852,21 @@ s16 sub_8102D5C(s16 a0) } } -/*static */void sub_8104548(struct Task *task) +/*static */void ReelTimeAction5(struct Task *task) { - sub_8102D28(task->data[4] >> 8); + IncrementReelTimePixelOffset(task->data[4] >> 8); if (++task->data[5] >= 80) { task->data[0]++; task->data[5] = 0; sub_81057E8(2); - StartSpriteAnimIfDifferent(gSprites + sSlotMachine->unk3F, 3); + StartSpriteAnimIfDifferent(gSprites + sSlotMachine->reelTimeSprite3F, 3); } } -/*static */void sub_8104598(struct Task *task) +/*static */void ReelTimeAction6(struct Task *task) { - sub_8102D28(task->data[4] >> 8); + IncrementReelTimePixelOffset(task->data[4] >> 8); task->data[4] = (u8)task->data[4] + 0x80; if (++task->data[5] >= 80) { @@ -2786,23 +2875,23 @@ s16 sub_8102D5C(s16 a0) } } -/*static */void sub_81045CC(struct Task *task) +/*static */void ReelTimeAction7(struct Task *task) { - sub_8102D28(task->data[4] >> 8); + IncrementReelTimePixelOffset(task->data[4] >> 8); task->data[4] = (u8)task->data[4] + 0x40; if (++task->data[5] >= 40) { task->data[5] = 0; - if (sSlotMachine->unk05) - { - if (sSlotMachine->unk0A <= task->data[6]) + if (sSlotMachine->reelTimeDraw) + { // TODO: check if fairRollsLeft differs from reelTimeDraw + if (sSlotMachine->fairRollsLeft <= task->data[6]) task->data[0]++; } else if (task->data[6] > 3) { task->data[0]++; } - else if (sub_81026DC(task->data[6])) + else if (SkipToReelTimeAction14(task->data[6])) { task->data[0] = 14; } @@ -2810,28 +2899,28 @@ s16 sub_8102D5C(s16 a0) } } -/*static */void sub_810463C(struct Task *task) +/*static */void ReelTimeAction_LandOnOutcome(struct Task *task) { - s16 r5 = sSlotMachine->unk14 % 20; - if (r5) + s16 reelTimePixelOffset = sSlotMachine->reelTimePixelOffset % 20; + if (reelTimePixelOffset) { - r5 = sub_8102D5C(task->data[4] >> 8); + reelTimePixelOffset = AdvanceReelTimeNextNumber(task->data[4] >> 8); task->data[4] = (u8)task->data[4] + 0x40; } - else if (sub_8102C48(1) != sSlotMachine->unk05) + else if (GetNthNextReelTimePosition(1) != sSlotMachine->reelTimeDraw) { - sub_8102D28(task->data[4] >> 8); - r5 = sSlotMachine->unk14 % 20; + IncrementReelTimePixelOffset(task->data[4] >> 8); + reelTimePixelOffset = sSlotMachine->reelTimePixelOffset % 20; task->data[4] = (u8)task->data[4] + 0x40; } - if (r5 == 0 && sub_8102C48(1) == sSlotMachine->unk05) + if (reelTimePixelOffset == 0 && GetNthNextReelTimePosition(1) == sSlotMachine->reelTimeDraw) { - task->data[4] = 0; + task->data[4] = 0; // stop moving task->data[0]++; } } -/*static */void sub_81046C0(struct Task *task) +/*static */void ReelTimeAction9(struct Task *task) { if (++task->data[4] >= 60) { @@ -2839,17 +2928,17 @@ s16 sub_8102D5C(s16 a0) sub_81056C0(); sub_8105804(); task->data[0]++; - if(sSlotMachine->unk05 == 0) + if(sSlotMachine->reelTimeDraw == 0) { task->data[4] = 0xa0; - StartSpriteAnimIfDifferent(gSprites + sSlotMachine->unk3F, 5); + StartSpriteAnimIfDifferent(gSprites + sSlotMachine->reelTimeSprite3F, 5); PlayFanfare(MUS_ME_ZANNEN); } else { task->data[4] = 0xc0; - StartSpriteAnimIfDifferent(gSprites + sSlotMachine->unk3F, 4); - gSprites[sSlotMachine->unk3F].animCmdIndex = 0; + StartSpriteAnimIfDifferent(gSprites + sSlotMachine->reelTimeSprite3F, 4); + gSprites[sSlotMachine->reelTimeSprite3F].animCmdIndex = 0; if (sSlotMachine->pikaPower) { sub_8104098(); @@ -2860,13 +2949,13 @@ s16 sub_8102D5C(s16 a0) } } -/*static */void sub_8104764(struct Task *task) +/*static */void ReelTimeAction10(struct Task *task) { if ((task->data[4] == 0 || --task->data[4] == 0) && !sub_81040C8()) task->data[0]++; } -/*static */void sub_8104794(struct Task *task) +/*static */void ReelTimeAction11(struct Task *task) { s16 r4; gSpriteCoordOffsetX -= 8; @@ -2880,53 +2969,53 @@ s16 sub_8102D5C(s16 a0) task->data[0]++; } -/*static */void sub_81047EC(struct Task *task) +/*static */void ReelTimeAction12(struct Task *task) { - sSlotMachine->unk0B = 0; - sSlotMachine->unk0A = sSlotMachine->unk05; + sSlotMachine->fairRollsUsed = 0; + sSlotMachine->fairRollsLeft = sSlotMachine->reelTimeDraw; gSpriteCoordOffsetX = 0; SetGpuReg(REG_OFFSET_BG1HOFS, 0); - sSlotMachine->unk1A = 8; + sSlotMachine->reelIncrement = 8; sub_810514C(); sub_81054B8(); sub_8105524(); PlayNewMapMusic(sSlotMachine->backupMapMusic); - if (sSlotMachine->unk0A == 0) + if (sSlotMachine->fairRollsLeft == 0) { - DestroyTask(FindTaskIdByFunc(sub_810434C)); + DestroyTask(FindTaskIdByFunc(RunReelTimeActions)); } else { sub_8104CAC(4); - task->data[1] = dp15_jump_random_unknown(); + task->data[1] = DrawNewReelIncrement(); task->data[2] = 0; task->data[3] = 0; task->data[0]++; } } -/*static */void sub_8104860(struct Task *task) +/*static */void ReelTimeAction13(struct Task *task) { - if (sSlotMachine->unk1A == task->data[1]) + if (sSlotMachine->reelIncrement == task->data[1]) task->data[0]++; - else if (sSlotMachine->unk1C[0] % 24 == 0 && (++task->data[2]& 0x07) == 0) - sSlotMachine->unk1A >>= 1; + else if (sSlotMachine->reelPixelOffsets[0] % 24 == 0 && (++task->data[2]& 0x07) == 0) + sSlotMachine->reelIncrement >>= 1; } -/*static */void sub_81048A8(struct Task *task) +/*static */void ReelTimeAction14(struct Task *task) { if (sub_8104E18()) - DestroyTask(FindTaskIdByFunc(sub_810434C)); + DestroyTask(FindTaskIdByFunc(RunReelTimeActions)); } -/*static */void sub_81048CC(struct Task *task) +/*static */void ReelTimeAction15(struct Task *task) { sub_81054B8(); sub_81056C0(); sub_8105804(); sub_8105854(); gSprites[sSlotMachine->unk4E[0]].invisible = TRUE; - StartSpriteAnimIfDifferent(gSprites + sSlotMachine->unk3F, 5); + StartSpriteAnimIfDifferent(gSprites + sSlotMachine->reelTimeSprite3F, 5); task->data[0]++; task->data[4] = 4; task->data[5] = 0; @@ -2935,7 +3024,7 @@ s16 sub_8102D5C(s16 a0) PlaySE(SE_W153); } -/*static */void sub_8104940(struct Task *task) +/*static */void ReelTimeAction16(struct Task *task) { gSpriteCoordOffsetY = task->data[4]; SetGpuReg(REG_OFFSET_BG1VOFS, task->data[4]); @@ -2955,7 +3044,7 @@ s16 sub_8102D5C(s16 a0) } } -/*static */void sub_81049C8(struct Task *task) +/*static */void ReelTimeAction17(struct Task *task) { gSpriteCoordOffsetY = 0; SetGpuReg(REG_OFFSET_BG1VOFS, 0); @@ -2966,7 +3055,7 @@ s16 sub_8102D5C(s16 a0) } } -/*static */void sub_81049F8(struct Task *task) +/*static */void ReelTimeAction18(struct Task *task) { gSpriteCoordOffsetX = 0; SetGpuReg(REG_OFFSET_BG1HOFS, 0); @@ -2975,7 +3064,7 @@ s16 sub_8102D5C(s16 a0) sub_8105554(); sub_8105524(); sub_81059B8(); - DestroyTask(FindTaskIdByFunc(sub_810434C)); + DestroyTask(FindTaskIdByFunc(RunReelTimeActions)); } /*static */void sub_8104A40(s16 a0, s16 a1) @@ -2998,39 +3087,39 @@ s16 sub_8102D5C(s16 a0) } } -/*static */void sub_8104AB8(u8 a0) +/*static */void OpenInfoBox(u8 seemsUnused) { - u8 taskId = CreateTask(sub_8104B0C, 1); - gTasks[taskId].data[1] = a0; - sub_8104B0C(taskId); + u8 taskId = CreateTask(RunInfoBoxActions, 1); + gTasks[taskId].data[1] = seemsUnused; + RunInfoBoxActions(taskId); } -/*static */bool8 sub_8104AEC(void) +/*static */bool8 ClosedInfoBox(void) { - if (FindTaskIdByFunc(sub_8104B0C) == 0xFF) + if (FindTaskIdByFunc(RunInfoBoxActions) == 0xFF) return TRUE; else return FALSE; } -/*static */void sub_8104B0C(u8 taskId) +/*static */void RunInfoBoxActions(u8 taskId) { - gUnknown_083ECC30[gTasks[taskId].data[0]](gTasks + taskId); + InfoBoxActions[gTasks[taskId].data[0]](gTasks + taskId); } -/*static */void sub_8104B3C(struct Task *task) +/*static */void InfoBox_FadeIn(struct Task *task) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); task->data[0]++; } -/*static */void sub_8104B60(struct Task *task) +/*static */void InfoBox_WaitForFade(struct Task *task) { if (!gPaletteFade.active) task->data[0]++; } -/*static */void sub_8104B80(struct Task *task) +/*static */void InfoBox_8104B80(struct Task *task) { sub_8104DA4(); sub_81065DC(); @@ -3040,15 +3129,15 @@ s16 sub_8102D5C(s16 a0) task->data[0]++; } -/*static */void sub_812DD78(struct Task *task) +/*static */void InfoBox_AddText(struct Task *task) { - AddTextPrinterParameterized3(1, 1, 2, 5, gUnknown_085A744C, 0, gText_ReelTimeHelp); + AddTextPrinterParameterized3(1, 1, 2, 5, gColors_ReelTimeHelp, 0, gText_ReelTimeHelp); CopyWindowToVram(1, 3); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); task->data[0]++; } -/*static */void sub_8104BC8(struct Task *task) +/*static */void InfoBox_AwaitPlayerInput(struct Task *task) { if (gMain.newKeys & (B_BUTTON | SELECT_BUTTON)) { @@ -3061,29 +3150,29 @@ s16 sub_8102D5C(s16 a0) } } -/*static */void sub_812DE14(struct Task *task) +/*static */void InfoBox_812DE14(struct Task *task) { sub_812F968(); ShowBg(3); task->data[0]++; } -/*static */void sub_812DE30(struct Task *task) +/*static */void InfoBox_812DE30(struct Task *task) { sub_8104CAC(task->data[1]); task->data[0]++; } -/*static */void sub_8104BFC(struct Task *task) +/*static */void InfoBox_8104BFC(struct Task *task) { sub_810423C(sSlotMachine->pikaPower); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); task->data[0]++; } -/*static */void sub_8104C44(struct Task *task) +/*static */void InfoBox_FreeTask(struct Task *task) { - DestroyTask(FindTaskIdByFunc(sub_8104B0C)); + DestroyTask(FindTaskIdByFunc(RunInfoBoxActions)); } /*static */void sub_8104C5C(void) @@ -3091,13 +3180,14 @@ s16 sub_8102D5C(s16 a0) u8 i; struct Task *task; i = CreateTask(sub_8104E74_, 3); - sSlotMachine->unk3D = i; + sSlotMachine->unkTaskPointer3D = i; task = gTasks + i; task->data[1] = -1; for (i = 4; i < 16; i++) task->data[i] = MAX_SPRITES; } +// possibly initialize each wheel /*static */void sub_8104CAC(u8 arg0) { u8 i; @@ -3105,7 +3195,7 @@ s16 sub_8102D5C(s16 a0) sub_8104DA4(); - task = gTasks + sSlotMachine->unk3D; + task = gTasks + sSlotMachine->unkTaskPointer3D; task->data[1] = arg0; for (i = 0; gUnknown_083ED048[arg0][i].unk00 != 0xFF; i++) @@ -3123,7 +3213,7 @@ s16 sub_8102D5C(s16 a0) /*static */void sub_8104D30(u8 a0, SpriteCallback a1, s16 a2, s16 a3, s16 a4) { u8 i; - struct Task *task = gTasks + sSlotMachine->unk3D; + struct Task *task = gTasks + sSlotMachine->unkTaskPointer3D; for (i = 4; i < 16; i++) { if (task->data[i] == MAX_SPRITES) @@ -3137,7 +3227,7 @@ s16 sub_8102D5C(s16 a0) /*static */void sub_8104DA4(void) { u8 i; - struct Task *task = gTasks + sSlotMachine->unk3D; + struct Task *task = gTasks + sSlotMachine->unkTaskPointer3D; if ((u16)task->data[1] != 0xFFFF) gUnknown_083ED064[task->data[1]](); for (i = 4; i < 16; i++) @@ -3153,7 +3243,7 @@ s16 sub_8102D5C(s16 a0) /*static */bool8 sub_8104E18(void) { u8 i; - struct Task *task = gTasks + sSlotMachine->unk3D; + struct Task *task = gTasks + sSlotMachine->unkTaskPointer3D; for (i = 4; i < 16; i++) { if (task->data[i] != MAX_SPRITES) @@ -3192,12 +3282,14 @@ s16 sub_8102D5C(s16 a0) } } +// debug this to find out what sprite->data[0] and sprite->data[2] are holding +// I would guess this updates the sprite location in the reel /*static */void sub_8104F18(struct Sprite *sprite) { - sprite->data[2] = sSlotMachine->unk1C[sprite->data[0]] + sprite->data[1]; + sprite->data[2] = sSlotMachine->reelPixelOffsets[sprite->data[0]] + sprite->data[1]; sprite->data[2] %= 120; - sprite->pos1.y = sSlotMachine->unk22[sprite->data[0]] + 28 + sprite->data[2]; - sprite->sheetTileStart = GetSpriteTileStartByTag(GetTagOfReelSymbolOnScreenAtPos(sprite->data[0], sprite->data[2] / 24)); + sprite->pos1.y = sSlotMachine->stopReelPixelOffset[sprite->data[0]] + 28 + sprite->data[2]; + sprite->sheetTileStart = GetSpriteTileStartByTag(GetNearbyTag(sprite->data[0], sprite->data[2] / 24)); SetSpriteSheetFrameTileNum(sprite); } @@ -3268,12 +3360,12 @@ s16 sub_8102D5C(s16 a0) spriteId = CreateSprite(&spriteTemplate, 280, 80, 1); gSprites[spriteId].oam.priority = 1; gSprites[spriteId].coordOffsetEnabled = TRUE; - sSlotMachine->unk3F = spriteId; + sSlotMachine->reelTimeSprite3F = spriteId; } /*static */void sub_810514C(void) { - DestroySprite(gSprites + sSlotMachine->unk3F); + DestroySprite(gSprites + sSlotMachine->reelTimeSprite3F); if (gUnknown_0203AAE4 != NULL) FREE_AND_SET_NULL(gUnknown_0203AAE4); } @@ -3362,10 +3454,10 @@ s16 sub_8102D5C(s16 a0) /*static */void sub_810535C(struct Sprite *sprite) { - s16 r0 = (u16)(sSlotMachine->unk14 + sprite->data[7]); + s16 r0 = (u16)(sSlotMachine->reelTimePixelOffset + sprite->data[7]); r0 %= 40; sprite->pos1.y = r0 + 59; - StartSpriteAnimIfDifferent(sprite, sub_8102C48(r0 / 20)); + StartSpriteAnimIfDifferent(sprite, GetNthNextReelTimePosition(r0 / 20)); } /*static */void sub_81053A0(void) @@ -3427,13 +3519,14 @@ s16 sub_8102D5C(s16 a0) FREE_AND_SET_NULL(gUnknown_0203AAF0); } -/*static */void sub_8105578(void) +// TODO: check if this is true +/*static */void CreateReelTimeSprites1(void) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED504, 0x98, 0x20, 5); struct Sprite *sprite = &gSprites[spriteId]; sprite->oam.priority = 1; sprite->hFlip = TRUE; - sSlotMachine->unk50[0] = spriteId; + sSlotMachine->reelTimeSprites1[0] = spriteId; sprite->data[0] = 8; sprite->data[1] = -1; sprite->data[2] = -1; @@ -3442,7 +3535,7 @@ s16 sub_8102D5C(s16 a0) spriteId = CreateSprite(&gSpriteTemplate_83ED504, 0xb8, 0x20, 5); sprite = &gSprites[spriteId]; sprite->oam.priority = 1; - sSlotMachine->unk50[1] = spriteId; + sSlotMachine->reelTimeSprites1[1] = spriteId; sprite->data[1] = 1; sprite->data[2] = -1; sprite->data[7] = 0x20; @@ -3472,8 +3565,8 @@ s16 sub_8102D5C(s16 a0) /*static */void sub_8105688(s16 a0) { - gSprites[sSlotMachine->unk50[0]].data[7] = a0; - gSprites[sSlotMachine->unk50[1]].data[7] = a0; + gSprites[sSlotMachine->reelTimeSprites1[0]].data[7] = a0; + gSprites[sSlotMachine->reelTimeSprites1[1]].data[7] = a0; } /*static */void sub_81056C0(void) @@ -3481,10 +3574,10 @@ s16 sub_8102D5C(s16 a0) u8 i; for (i = 0; i < 2; i++) - DestroySprite(&gSprites[sSlotMachine->unk50[i]]); + DestroySprite(&gSprites[sSlotMachine->reelTimeSprites1[i]]); } -/*static */void sub_81056F0(void) +/*static */void CreateReelTimeSprite2(void) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED51C, 0x48, 0x50, 3); gSprites[spriteId].oam.priority = 1; @@ -3492,12 +3585,12 @@ s16 sub_8102D5C(s16 a0) gSprites[spriteId].data[5] = 0; gSprites[spriteId].data[6] = 16; gSprites[spriteId].data[7] = 8; - sSlotMachine->unk52[0] = spriteId; + sSlotMachine->reelTimeSprites2[0] = spriteId; spriteId = CreateSprite(&gSpriteTemplate_83ED51C, 0x68, 0x50, 3); gSprites[spriteId].oam.priority = 1; gSprites[spriteId].hFlip = TRUE; - sSlotMachine->unk52[1] = spriteId; + sSlotMachine->reelTimeSprites2[1] = spriteId; } /*static */void sub_8105784(struct Sprite *sprite) @@ -3514,7 +3607,7 @@ s16 sub_8102D5C(s16 a0) /*static */void sub_81057E8(s16 a0) { - gSprites[sSlotMachine->unk52[0]].data[7] = a0; + gSprites[sSlotMachine->reelTimeSprites2[0]].data[7] = a0; } /*static */void sub_8105804(void) @@ -3522,7 +3615,7 @@ s16 sub_8102D5C(s16 a0) u8 i; MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(7) << 4) + 0x103, 0, 0, 0); for (i = 0; i < 2; i++) - DestroySprite(&gSprites[sSlotMachine->unk52[i]]); + DestroySprite(&gSprites[sSlotMachine->reelTimeSprites2[i]]); } /*static */void sub_8105854(void) @@ -3782,7 +3875,7 @@ s16 sub_8102D5C(s16 a0) switch (sprite->data[0]) { case 0: - StartSpriteAnim(sprite, sSlotMachine->unk0A - 1); + StartSpriteAnim(sprite, sSlotMachine->fairRollsLeft - 1); sprite->data[0]++; // fallthrough case 1: @@ -4271,7 +4364,7 @@ extern const u16 gSlotMachineMenu_Pal[]; gUnknown_0203AB28[1].size = 0x180; } -const u8 sReelSymbols[][21] = +const u8 sReelSymbols[][REEL_NUM_TAGS] = { { SLOT_MACHINE_TAG_7_RED, @@ -4348,13 +4441,13 @@ const u8 gUnknown_083ECCF1[] = { 1, 0, 5, 4, 3, 2 }; -const s16 gUnknown_083ECCF8[][2] = { +const s16 sInitialReelPositions[][2] = { {0, 6}, {0, 10}, {0, 2} }; -const u8 gUnknown_083ECD04[][3] = { +const u8 sSlotLuckinessTable1[][3] = { {1, 1, 12}, {1, 1, 14}, {2, 2, 14}, @@ -4363,13 +4456,13 @@ const u8 gUnknown_083ECD04[][3] = { {3, 3, 16} }; -const u8 gUnknown_083ECD16[][6] = { +const u8 sSlotLuckinessTable2[][6] = { {25, 25, 30, 40, 40, 50}, {25, 25, 30, 30, 35, 35}, {25, 25, 30, 25, 25, 30} }; -const u8 gUnknown_083ECD28[][6] = { +const u8 sSlotLuckinessTable3[][6] = { {20, 25, 25, 20, 25, 25}, {12, 15, 15, 18, 19, 22}, {25, 25, 25, 30, 30, 40}, @@ -4377,7 +4470,7 @@ const u8 gUnknown_083ECD28[][6] = { {40, 40, 35, 35, 40, 40} }; -const u8 gUnknown_083ECD46[][17] = { +const u8 ReelTimeProbabilityTable0[][17] = { {243, 243, 243, 80, 80, 80, 80, 40, 40, 40, 40, 40, 40, 5, 5, 5, 5}, { 5, 5, 5, 150, 150, 150, 150, 130, 130, 130, 130, 130, 130, 100, 100, 100, 5}, { 4, 4, 4, 20, 20, 20, 20, 80, 80, 80, 80, 80, 80, 100, 100, 100, 40}, @@ -4386,7 +4479,7 @@ const u8 gUnknown_083ECD46[][17] = { { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6} }; -const u8 gUnknown_083ECDAC[][17] = { +const u8 ReelTimeProbabilityTable1[][17] = { { 243, 243, 243, 200, 200, 200, 200, 160, 160, 160, 160, 160, 160, 70, 70, 70, 5}, { 5, 5, 5, 25, 25, 25, 25, 5, 5, 5, 5, 5, 5, 2, 2, 2, 6}, { 4, 4, 4, 25, 25, 25, 25, 30, 30, 30, 30, 30, 30, 40, 40, 40, 35}, @@ -4395,11 +4488,11 @@ const u8 gUnknown_083ECDAC[][17] = { { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 60} }; -const u16 gUnknown_083ECE12[] = { - 0x80, 0xaf, 0xc8, 0xe1, 0x100 +const u16 ProbabilityTable_SkipToReelTimeAction14[] = { + 128, 175, 200, 225, 256 }; -const u16 gUnknown_083ECE1C[][2] = { +const u16 ReelIncrementTable[][2] = { {10, 5}, {10, 10}, {10, 15}, @@ -4407,19 +4500,26 @@ const u16 gUnknown_083ECE1C[][2] = { {10, 35} }; -const u16 gUnknown_083ECE30[] = { +const u16 ReelTimeBonusIncrementTable[] = { 0, 5, 10, 15, 20 }; -const u8 gUnknown_083ECE3A[] = { - 6, 4, 3, 2, 5, 0, 0, 0 +// tentative name +const u8 LuckyFlagTagOutput[] = { + SLOT_MACHINE_TAG_REPLAY, SLOT_MACHINE_TAG_CHERRY, SLOT_MACHINE_TAG_LOTAD, SLOT_MACHINE_TAG_AZURILL, SLOT_MACHINE_TAG_POWER, SLOT_MACHINE_TAG_7_RED, SLOT_MACHINE_TAG_7_RED, SLOT_MACHINE_TAG_7_RED }; -const u16 gUnknown_083ECE42[] = { +/* +sSlotMachine->luckyFlags: 7, 6, 5, 4, 3, 2, 1, 0 +If you got Lucky2 in 1 attempt, flag 7 gets set. +If you got Lucky2 in 2 attempts, flag 5 gets set. +If you got Lucky2 in 3 attempts, flag 6 gets set. +*/ +const u16 FlagsAttemptAtLuckiness1[] = { // order seems buggy 0x80, 0x20, 0x40 }; -const u16 gUnknown_083ECE48[] = { +const u16 FlagsAttemptAtLuckiness2[] = { 0x10, 0x08, 0x04, 0x02, 0x01 }; diff --git a/src/task.c b/src/task.c index 14b97a361a..a2df66de85 100644 --- a/src/task.c +++ b/src/task.c @@ -1,9 +1,6 @@ #include "global.h" #include "task.h" -#define HEAD_SENTINEL 0xFE -#define TAIL_SENTINEL 0xFF - struct Task gTasks[NUM_TASKS]; static void InsertTask(u8 newTaskId); diff --git a/src/tv.c b/src/tv.c index f282b09f0d..cbeb189a80 100644 --- a/src/tv.c +++ b/src/tv.c @@ -62,7 +62,7 @@ IWRAM_DATA s8 sTVShowMixingCurSlot; EWRAM_DATA u16 sPokemonAnglerSpecies = 0; EWRAM_DATA u16 sPokemonAnglerAttemptCounters = 0; EWRAM_DATA u16 sFindThatGamerCoinsSpent = 0; -EWRAM_DATA bool8 sFindThatGamerWhichGame = FALSE; +EWRAM_DATA bool8 sFindThatGamerWhichGame = SLOT_MACHINE; EWRAM_DATA ALIGNED(4) u8 sRecordMixingPartnersWithoutShowsToShare = 0; EWRAM_DATA ALIGNED(4) u8 sTVShowState = 0; EWRAM_DATA u8 sTVSecretBaseSecretsRandomValues[3] = {}; @@ -2019,7 +2019,7 @@ void sub_80EDCE8(void) } } -void sub_80EDD78(u16 nCoinsPaidOut) +void reportNewCoinTotal(u16 nCoinsPaidOut) { TVShow *show; bool8 flag; @@ -2031,7 +2031,7 @@ void sub_80EDD78(u16 nCoinsPaidOut) flag = FALSE; switch (sFindThatGamerWhichGame) { - case FALSE: + case SLOT_MACHINE: if (nCoinsPaidOut >= sFindThatGamerCoinsSpent + 200) { flag = TRUE; @@ -2044,7 +2044,7 @@ void sub_80EDD78(u16 nCoinsPaidOut) break; } return; - case TRUE: + case ROULETTE: if (nCoinsPaidOut >= sFindThatGamerCoinsSpent + 50) { flag = TRUE; @@ -2072,15 +2072,15 @@ void sub_80EDD78(u16 nCoinsPaidOut) } } -void sub_80EDE70(u16 nCoinsSpent) +void reportPlayedSlotMachine(u16 nCoinsSpent) { - sFindThatGamerWhichGame = FALSE; + sFindThatGamerWhichGame = SLOT_MACHINE; sFindThatGamerCoinsSpent = nCoinsSpent; } -void sub_80EDE84(u16 nCoinsSpent) +void reportPlayedRoulette(u16 nCoinsSpent) { - sFindThatGamerWhichGame = TRUE; + sFindThatGamerWhichGame = ROULETTE; sFindThatGamerCoinsSpent = nCoinsSpent; } From 67fe781ed2fd5f09fdf47a9c8026177e740f3208 Mon Sep 17 00:00:00 2001 From: hondew Date: Thu, 7 Feb 2019 13:39:18 -0500 Subject: [PATCH 142/217] clean up slot machine until AwardPayout --- include/tv.h | 4 +- src/roulette.c | 2 +- src/slot_machine.c | 214 ++++++++++++++++++++++----------------------- src/tv.c | 4 +- 4 files changed, 112 insertions(+), 112 deletions(-) diff --git a/include/tv.h b/include/tv.h index 0f50f2327b..a5c26af0cb 100644 --- a/include/tv.h +++ b/include/tv.h @@ -26,8 +26,8 @@ bool8 GetPriceReduction(u8 newsKind); void sub_80F14F8(TVShow *shows); size_t CountDigits(int value); u8 GetRibbonCount(struct Pokemon *pokemon); -void reportPlayedSlotMachine(u16 nCoinsSpent); -void reportPlayedRoulette(u16 nCoinsSpent); +void AlertTVThatYouPlayedSlotMachine(u16 nCoinsSpent); +void AlertTVThatYouPlayedRoulette(u16 nCoinsSpent); void reportNewCoinTotal(u16 nCoinsPaidOut); void sub_80EEA70(void); void sub_80EDB44(void); diff --git a/src/roulette.c b/src/roulette.c index b19750f2a8..fa2b6c5793 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -996,7 +996,7 @@ static void sub_81405CC(void) taskId = gUnknown_0203AB88->varA4 = CreateTask(sub_81408A8, 0); gTasks[taskId].data[6] = 6; gTasks[taskId].data[13] = GetCoins(); - reportPlayedRoulette(GetCoins()); + AlertTVThatYouPlayedRoulette(GetCoins()); gUnknown_0203AB88->varA5 = CreateTask(sub_8140814, 1); SetMainCallback2(sub_8140238); return; diff --git a/src/slot_machine.c b/src/slot_machine.c index 7552e755c6..9bb12df814 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -65,7 +65,7 @@ struct SlotMachineEwramStruct /*0x03*/ u8 luckyGame; /*0x04*/ u8 luckyFlags; /*0x05*/ u8 reelTimeDraw; - /*0x06*/ u8 isBiasTagMatchPossible; // tentative + /*0x06*/ u8 luckySpinsLeft; // tentative /*0x07*/ u8 biasTag; /*0x08*/ u16 matchedSymbols; /*0x0A*/ u8 fairRollsLeft; @@ -77,15 +77,15 @@ struct SlotMachineEwramStruct /*0x14*/ s16 reelTimePixelOffset; /*0x16*/ s16 reelTimePosition; /*0x18*/ s16 currReel; - /*0x1A*/ s16 reelIncrement; + /*0x1A*/ s16 reelIncrement; // speed of reel /*0x1C*/ s16 reelPixelOffsets[3]; /*0x22*/ u16 stopReelPixelOffset[3]; /*0x28*/ s16 reelPositions[3]; /*0x2E*/ s16 reelExtraTurns[3]; - /*0x34*/ s16 biasTagFinalPositions[3]; + /*0x34*/ s16 biasTagFinalPositions[3]; /*0x3A*/ u8 reelTasks[3]; /*0x3D*/ u8 unkTaskPointer3D; - /*0x3E*/ u8 unkTaskPointer; + /*0x3E*/ u8 unkTaskPointer3E; /*0x3F*/ u8 reelTimeSprite3F; /*0x40*/ u8 unk40; /*0x41*/ u8 unk41; @@ -134,7 +134,7 @@ struct UnkStruct1 /*static */void SlotMachineSetup_9_0(void); /*static */void SlotMachineSetup_10_0(void); /*static */void SlotMachineSetupGameplayTasks(void); -/*static */void GameplayTasks_Slot(void); +/*static */void GameplayTasks_Slots(void); /*static */void sub_8104DA4(void); /*static */void RunSlotActions(u8 taskId); /*static */bool8 SlotAction_UnfadeScreen(struct Task *task); @@ -144,34 +144,34 @@ struct UnkStruct1 /*static */bool8 SlotAction4(struct Task *task); /*static */bool8 SlotAction_AwaitPlayerInput(struct Task *task); /*static */bool8 SlotAction_PrintYouDontHaveThreeCoins(struct Task *task); -/*static */bool8 SlotAction_PlayerAcceptsNotHavingThreeCoins(struct Task *task); +/*static */bool8 SlotAction_ExitYouDontHaveThreeCoinsDialogue(struct Task *task); /*static */bool8 SlotAction_GivingInformation(struct Task *task); /*static */bool8 SlotAction9(struct Task *task); /*static */bool8 SlotAction10(struct Task *task); -/*static */bool8 SlotAction11(struct Task *task); +/*static */bool8 SlotAction_SetLuckySpins(struct Task *task); /*static */bool8 SlotAction_AwaitReelStop(struct Task *task); /*static */bool8 SlotAction_WaitForAllReelsToStop(struct Task *task); /*static */bool8 SlotAction_CheckMatches(struct Task *task); /*static */bool8 SlotAction_WaitForPayoutToBeAwarded(struct Task *task); /*static */bool8 SlotAction_EndOfRoll(struct Task *task); -/*static */bool8 SlotAction17(struct Task *task); +/*static */bool8 SlotAction_MatchedPower(struct Task *task); /*static */bool8 SlotAction18(struct Task *task); /*static */bool8 SlotAction_Loop(struct Task *task); /*static */bool8 SlotAction_NoMatches(struct Task *task); /*static */bool8 SlotAction_PrintQuitTheGame(struct Task *task); /*static */bool8 SlotAction_SeeIfPlayerQuits(struct Task *task); /*static */bool8 SlotAction_Print9999CoinMessage(struct Task *task); -/*static */bool8 SlotAction_Escape9999CoinMessage(struct Task *task); +/*static */bool8 SlotAction_Exit9999CoinMessage(struct Task *task); /*static */bool8 SlotAction_PrintNoMoreCoins(struct Task *task); -/*static */bool8 SlotAction_EscapeNoMoreCoins(struct Task *task); +/*static */bool8 SlotAction_ExitNoMoreCoinsMessage(struct Task *task); /*static */bool8 SlotAction_EndGame(struct Task *task); /*static */bool8 SlotAction_FreeDataStructures(struct Task *task); -/*static */void DrawForLuckyFlags(void); -/*static */void AnyLuckyFlagsSet(void); -/*static */bool8 IsLuckyRound(void); -/*static */u8 AttemptsAtLuckiness1(void); +/*static */void DrawLuckyFlags(void); +/*static */void SetLuckySpins(void); +/*static */bool8 IsThisRoundLucky(void); +/*static */u8 AttemptsAtLuckyflags_Top3(void); /*static */u16 DrawNewReelIncrement(void); -/*static */u8 AttemptsAtLuckiness2(void); +/*static */u8 AttemptsAtLuckyflags_NotTop3(void); /*static */void CheckMatch(void); /*static */void CheckMatch_CenterRow(void); /*static */void CheckMatch_TopAndBottom(void); @@ -185,7 +185,7 @@ struct UnkStruct1 /*static */bool8 AwardPayoutAction_FreeTask(struct Task *task); /*static */u8 GetNearbyTag(u8 x, s16 y); /*static */void GameplayTask_StopReel(void); -/*static */void ReelTasks_8102DEC(u8 a0); +/*static */void ReelTasks_SetUnkTaskData(u8 a0); /*static */void sub_8102E1C(u8 a0); /*static */bool8 IsReelMoving(u8 a0); /*static */void RunReelActions(u8 taskId); @@ -228,7 +228,7 @@ struct UnkStruct1 /*static */void sub_8103F70(void); /*static */bool8 sub_8103FA0(void); /*static */void sub_8103FE8_(u8 taskId); -/*static */void sub_8104048(void); +/*static */void GameplayTasks_PikaPower(void); /*static */void DisplayPikaPower(u8 pikaPower); /*static */bool8 sub_81040C8(void); /*static */void sub_81040E8(u8 taskId); @@ -262,7 +262,7 @@ struct UnkStruct1 /*static */void sub_8104A40(s16 a0, s16 a1); /*static */void sub_8104A88(s16 a0); /*static */void OpenInfoBox(u8 a0); -/*static */bool8 ClosedInfoBox(void); +/*static */bool8 IsInfoBoxClosed(void); /*static */void RunInfoBoxActions(u8 taskId); /*static */void InfoBox_FadeIn(struct Task *task); /*static */void InfoBox_WaitForFade(struct Task *task); @@ -355,10 +355,10 @@ static IWRAM_DATA struct SpriteFrameImage *gUnknown_03001188[26]; // Const rom data. extern const struct UnkStruct1 *const gUnknown_083ED048[]; extern const u16 gPalette_83EDE24[]; -extern const u8 sSlotLuckinessTable1[][3]; -extern const u8 LuckyFlagTagOutput[]; -extern const u16 FlagsAttemptAtLuckiness1[]; -extern const u16 FlagsAttemptAtLuckiness2[]; +extern const u8 LuckyRoundTable[][3]; +extern const u8 LuckyTags[]; +extern const u16 LuckyFlagSettings_Top3[]; +extern const u16 LuckyFlagSettings_NotTop3[]; extern const s16 gUnknown_083ECE7E[][2]; extern const SpriteCallback gUnknown_083ECF0C[]; extern const struct SpriteTemplate *const gUnknown_083EDB5C[]; @@ -384,10 +384,10 @@ extern const u16 *const gUnknown_083EDE20; extern const s16 sInitialReelPositions[][2]; extern const struct BgTemplate gUnknown_085A7424[4]; extern const struct WindowTemplate gUnknown_085A7434[]; -extern const u8 sSlotLuckinessTable2[][6]; -extern const u8 sSlotLuckinessTable3[][6]; -extern const u8 ReelTimeProbabilityTable0[][17]; -extern const u8 ReelTimeProbabilityTable1[][17]; +extern const u8 LuckyFlagsTable_Top3[][6]; +extern const u8 LuckyFlagsTable_NotTop3[][6]; +extern const u8 ReelTimeProbabilityTable_UnluckyGame[][17]; +extern const u8 ReelTimeProbabilityTable_LuckyGame[][17]; extern const u8 sSym2Match[]; extern const u8 gUnknown_083ECCF1[]; extern const u8 sReelSymbols[][REEL_NUM_TAGS]; @@ -464,26 +464,26 @@ bool8 (*const SlotActions[])(struct Task *task) = SlotAction4, SlotAction_AwaitPlayerInput, SlotAction_PrintYouDontHaveThreeCoins, - SlotAction_PlayerAcceptsNotHavingThreeCoins, + SlotAction_ExitYouDontHaveThreeCoinsDialogue, SlotAction_GivingInformation, SlotAction9, SlotAction10, - SlotAction11, + SlotAction_SetLuckySpins, SlotAction_AwaitReelStop, SlotAction_WaitForAllReelsToStop, SlotAction_CheckMatches, SlotAction_WaitForPayoutToBeAwarded, SlotAction_EndOfRoll, - SlotAction17, + SlotAction_MatchedPower, SlotAction18, SlotAction_Loop, SlotAction_NoMatches, SlotAction_PrintQuitTheGame, SlotAction_SeeIfPlayerQuits, SlotAction_Print9999CoinMessage, - SlotAction_Escape9999CoinMessage, + SlotAction_Exit9999CoinMessage, SlotAction_PrintNoMoreCoins, - SlotAction_EscapeNoMoreCoins, + SlotAction_ExitNoMoreCoinsMessage, SlotAction_EndGame, SlotAction_FreeDataStructures, }; @@ -863,7 +863,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue sSlotMachine->reelPixelOffsets[i] = 0x1f8 - sSlotMachine->reelPositions[i] * 24; sSlotMachine->reelPixelOffsets[i] %= 0x1f8; // 0x1f8 is 540 } - reportPlayedSlotMachine(GetCoins()); + AlertTVThatYouPlayedSlotMachine(GetCoins()); } /*static */void SlotMachineSetup_3_0(void) @@ -891,7 +891,6 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue gUnknown_0203AAD0[6] = 0x20BF; } -// machine wheel stuff /*static */void SlotMachineSetup_5_0(void) { sub_8106448(); @@ -910,16 +909,16 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue sub_81050C4(); } -// create next gameplay task +// create gameplay tasks /*static */void SlotMachineSetupGameplayTasks(void) { - sub_8104048(); + GameplayTasks_PikaPower(); GameplayTask_StopReel(); sub_8104C5C(); - GameplayTasks_Slot(); + GameplayTasks_Slots(); } -/*static */void GameplayTasks_Slot(void) +/*static */void GameplayTasks_Slots(void) { RunSlotActions(CreateTask(RunSlotActions, 0)); } @@ -1015,10 +1014,10 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue sSlotMachine->coins--; sSlotMachine->bet++; } - // if player maxed out or finished betting + // player maxed out or finished betting if (sSlotMachine->bet >= 3 || (sSlotMachine->bet != 0 && gMain.newKeys & A_BUTTON)) sSlotMachine->slotActionPtr = 9; - // if player wants to quit + // player wants to quit if (gMain.newKeys & B_BUTTON) sSlotMachine->slotActionPtr = 21; } @@ -1034,7 +1033,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return FALSE; } -/*static */bool8 SlotAction_PlayerAcceptsNotHavingThreeCoins(struct Task *task) +/*static */bool8 SlotAction_ExitYouDontHaveThreeCoinsDialogue(struct Task *task) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { @@ -1046,7 +1045,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue /*static */bool8 SlotAction_GivingInformation(struct Task *task) { - if (ClosedInfoBox()) + if (IsInfoBoxClosed()) sSlotMachine->slotActionPtr = 5; return FALSE; } @@ -1054,14 +1053,16 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue // probably make all the slots roll /*static */bool8 SlotAction9(struct Task *task) { - DrawForLuckyFlags(); + DrawLuckyFlags(); sub_8104DA4(); + // for each reel... - //...do a reel task - ReelTasks_8102DEC(0); - ReelTasks_8102DEC(1); - ReelTasks_8102DEC(2); + ReelTasks_SetUnkTaskData(0); + ReelTasks_SetUnkTaskData(1); + ReelTasks_SetUnkTaskData(2); + sub_80EEC80(); // something with daily slot variable + task->data[0] = 0; if (sSlotMachine->luckyFlags & 0x20) // bit 5 of luckyFlag set { @@ -1093,11 +1094,11 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return FALSE; } -/*static */bool8 SlotAction11(struct Task *task) +/*static */bool8 SlotAction_SetLuckySpins(struct Task *task) { if (++task->data[0] >= 30) { - AnyLuckyFlagsSet(); + SetLuckySpins(); sSlotMachine->slotActionPtr = 12; } return FALSE; @@ -1166,6 +1167,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue PlayFanfare(MUS_ME_B_SMALL); sub_8104CAC(2); } + // if you matched 777... if (sSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_MIXED) | (1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED))) { // clear top bits 6 and 7 @@ -1226,7 +1228,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return FALSE; } -/*static */bool8 SlotAction17(struct Task *task) +/*static */bool8 SlotAction_MatchedPower(struct Task *task) { if (!sub_81040C8()) { @@ -1315,7 +1317,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return FALSE; } -/*static */bool8 SlotAction_Escape9999CoinMessage(struct Task *task) +/*static */bool8 SlotAction_Exit9999CoinMessage(struct Task *task) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { @@ -1334,7 +1336,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return FALSE; } -/*static */bool8 SlotAction_EscapeNoMoreCoins(struct Task *task) +/*static */bool8 SlotAction_ExitNoMoreCoinsMessage(struct Task *task) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { @@ -1344,7 +1346,6 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return FALSE; } -// possibly end game /*static */bool8 SlotAction_EndGame(struct Task *task) { SetCoins(sSlotMachine->coins); @@ -1396,96 +1397,96 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return FALSE; } -/*static */void DrawForLuckyFlags(void) +/*static */void DrawLuckyFlags(void) { - u8 luckyAttempts; + u8 attempts; if (sSlotMachine->fairRollsLeft == 0) { if (!(sSlotMachine->luckyFlags & 0xc0)) // top 2 flags set to 0 { - if (IsLuckyRound()) + if (IsThisRoundLucky()) { - luckyAttempts = AttemptsAtLuckiness1(); - if (luckyAttempts != 3) // if you found a lucky number + attempts = AttemptsAtLuckyflags_Top3(); + if (attempts != 3) // if you found a lucky number { - // luckyAttempts == 1: reelTime flag set - sSlotMachine->luckyFlags |= FlagsAttemptAtLuckiness1[luckyAttempts]; - if (luckyAttempts != 1) + // attempts == 1: reelTime flag set + sSlotMachine->luckyFlags |= LuckyFlagSettings_Top3[attempts]; + if (attempts != 1) { return; } } } // if you got it your first try, you get to try again for the lower lucky flags - luckyAttempts = AttemptsAtLuckiness2(); - if (luckyAttempts != 5) // if you found a lucky number + attempts = AttemptsAtLuckyflags_NotTop3(); + if (attempts != 5) // if you found a lucky number { - sSlotMachine->luckyFlags |= FlagsAttemptAtLuckiness2[luckyAttempts]; + sSlotMachine->luckyFlags |= LuckyFlagSettings_NotTop3[attempts]; } } } } -/*static */void AnyLuckyFlagsSet(void) +/*static */void SetLuckySpins(void) { - sSlotMachine->isBiasTagMatchPossible = 0; + sSlotMachine->luckySpinsLeft = 0; if (sSlotMachine->luckyFlags) - sSlotMachine->isBiasTagMatchPossible = 1; + sSlotMachine->luckySpinsLeft = 1; } -/*static */u8 GetLuckyFlagTagOutput(u8 luckyFlags) +/*static */u8 GetLuckyTag(u8 luckyFlags) { u8 i; for (i = 0; i < 8; i++) { if (luckyFlags & 1) - return LuckyFlagTagOutput[i]; + return LuckyTags[i]; luckyFlags >>= 1; } return 0; } -/*static */bool8 IsLuckyRound(void) +/*static */bool8 IsThisRoundLucky(void) { u8 rval = Random(); - if (sSlotLuckinessTable1[sSlotMachine->machineId][sSlotMachine->bet - 1] > rval) + if (LuckyRoundTable[sSlotMachine->machineId][sSlotMachine->bet - 1] > rval) return TRUE; return FALSE; } -/*static */u8 AttemptsAtLuckiness1(void) +/*static */u8 AttemptsAtLuckyflags_Top3(void) { - s16 countAttempts; + s16 count; - for (countAttempts = 0; countAttempts < 3; countAttempts++) + for (count = 0; count < 3; count++) { s16 rval = Random() & 0xff; - s16 value = sSlotLuckinessTable2[countAttempts][sSlotMachine->machineId]; + s16 value = LuckyFlagsTable_Top3[count][sSlotMachine->machineId]; if (value > rval) break; } - return countAttempts; + return count; } -/*static */u8 AttemptsAtLuckiness2(void) +/*static */u8 AttemptsAtLuckyflags_NotTop3(void) { - s16 countAttempts; + s16 count; - for (countAttempts = 0; countAttempts < 5; countAttempts++) + for (count = 0; count < 5; count++) { s16 rval = Random() & 0xff; // random byte - s16 value = sSlotLuckinessTable3[countAttempts][sSlotMachine->machineId]; + s16 value = LuckyFlagsTable_NotTop3[count][sSlotMachine->machineId]; // make first attempt easier if it's a lucky game - if (countAttempts == 0 && sSlotMachine->luckyGame == 1) + if (count == 0 && sSlotMachine->luckyGame == 1) { value += 10; if (value > 0x100) value = 0x100; } // make last attempt harder if it's a lucky game - else if (countAttempts == 4 && sSlotMachine->luckyGame == 1) + else if (count == 4 && sSlotMachine->luckyGame == 1) { value -= 10; if (value < 0) @@ -1494,15 +1495,15 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue if (value > rval) break; } - return countAttempts; + return count; } /*static */u8 GetReelTimeProbability(u8 reelTimeDraw) { if (sSlotMachine->luckyGame == 0) - return ReelTimeProbabilityTable0[reelTimeDraw][sSlotMachine->pikaPower]; + return ReelTimeProbabilityTable_UnluckyGame[reelTimeDraw][sSlotMachine->pikaPower]; else - return ReelTimeProbabilityTable1[reelTimeDraw][sSlotMachine->pikaPower]; + return ReelTimeProbabilityTable_LuckyGame[reelTimeDraw][sSlotMachine->pikaPower]; } /*static */void DrawReelTimeOutcome(void) @@ -1806,7 +1807,7 @@ s16 AdvanceReelTimeNextNumber(s16 reelIncrement) } } -/*static */void ReelTasks_8102DEC(u8 reelIndex) +/*static */void ReelTasks_SetUnkTaskData(u8 reelIndex) { gTasks[sSlotMachine->reelTasks[reelIndex]].data[0] = 1; gTasks[sSlotMachine->reelTasks[reelIndex]].data[14] = 1; @@ -1845,13 +1846,13 @@ s16 AdvanceReelTimeNextNumber(s16 reelIncrement) /*static */bool8 ReelAction_DecideWhereToStop(struct Task *task) { task->data[0]++; - // initialize data for that reel --> these will be manipulated if biasTags can be lined up + // initialize data for that reel --> these will be changed if biasTags can be lined up sSlotMachine->biasTagFinalPositions[task->data[15]] = 0; sSlotMachine->reelExtraTurns[task->data[15]] = 0; - if (sSlotMachine->fairRollsLeft == 0 && (sSlotMachine->luckyFlags == 0 || sSlotMachine->isBiasTagMatchPossible == 0 || !DecideReelTurns_BiasTag[task->data[15]]())) + if (sSlotMachine->fairRollsLeft == 0 && (sSlotMachine->luckyFlags == 0 || sSlotMachine->luckySpinsLeft == 0 || !DecideReelTurns_BiasTag[task->data[15]]())) { - sSlotMachine->isBiasTagMatchPossible = 0; + sSlotMachine->luckySpinsLeft = 0; DecideReelTurns_NoBiasTag[task->data[15]](); } task->data[1] = sSlotMachine->reelExtraTurns[task->data[15]]; @@ -1902,7 +1903,7 @@ s16 AdvanceReelTimeNextNumber(s16 reelIncrement) /*static */bool8 DecideReelTurns_BiasTag_Reel1(void) { - u8 tag2 = GetLuckyFlagTagOutput(sSlotMachine->luckyFlags); + u8 tag2 = GetLuckyTag(sSlotMachine->luckyFlags); u8 tag1 = tag2; if (sSlotMachine->luckyFlags & 0xc0) // if either of top 2 bits are set { @@ -2489,7 +2490,7 @@ Advance until there are no cherries on screen in reel 1 LoadPalette(gUnknown_083EDD1C[a0], gUnknown_083EDD30[a0], 2); } -// probably light the bet number +// light up the value bet by the player /*static */void LoadBetTiles(u8 betVal) { u8 i; @@ -2621,15 +2622,14 @@ Advance until there are no cherries on screen in reel 1 LoadPalette(gUnknown_083EDDA0[task->data[2]], 0x10, 0x20); } -/*static */void sub_8104048(void) +/*static */void GameplayTasks_PikaPower(void) { - sSlotMachine->unkTaskPointer = CreateTask(sub_81040E8, 8); + sSlotMachine->unkTaskPointer3E = CreateTask(sub_81040E8, 8); } -// possibly clear pikaPower /*static */void DisplayPikaPower(u8 pikaPower) { - struct Task *task = gTasks + sSlotMachine->unkTaskPointer; + struct Task *task = gTasks + sSlotMachine->unkTaskPointer3E; ClearTaskDataFields_2orHigher(task); task->data[0] = 1; task->data[1]++; @@ -2638,7 +2638,7 @@ Advance until there are no cherries on screen in reel 1 /*static */void sub_8104098(void) { - struct Task *task = gTasks + sSlotMachine->unkTaskPointer; + struct Task *task = gTasks + sSlotMachine->unkTaskPointer3E; ClearTaskDataFields_2orHigher(task); task->data[0] = 3; task->data[15] = 1; // points to a reelIndex @@ -2646,10 +2646,10 @@ Advance until there are no cherries on screen in reel 1 /*static */bool8 sub_81040C8(void) { - return gTasks[sSlotMachine->unkTaskPointer].data[15]; + return gTasks[sSlotMachine->unkTaskPointer3E].data[15]; } -/*static */void sub_81040E8(u8 taskId) // debug to see if taskId is machineId +/*static */void sub_81040E8(u8 taskId) { gUnknown_083ECBB4[gTasks[taskId].data[0]](gTasks + taskId); } @@ -2741,7 +2741,7 @@ Advance until there are no cherries on screen in reel 1 selectedPikaPowerTile[r1] = pikaPowerTileTable[r3][1]; LoadBgTilemap(2, &selectedPikaPowerTile[r1], 2, r4 + 0x40); } - gTasks[sSlotMachine->unkTaskPointer].data[1] = pikaPower; + gTasks[sSlotMachine->unkTaskPointer3E].data[1] = pikaPower; } /*static */void BeginReelTime(void) @@ -3094,7 +3094,7 @@ Advance until there are no cherries on screen in reel 1 RunInfoBoxActions(taskId); } -/*static */bool8 ClosedInfoBox(void) +/*static */bool8 IsInfoBoxClosed(void) { if (FindTaskIdByFunc(RunInfoBoxActions) == 0xFF) return TRUE; @@ -4447,7 +4447,7 @@ const s16 sInitialReelPositions[][2] = { {0, 2} }; -const u8 sSlotLuckinessTable1[][3] = { +const u8 LuckyRoundTable[][3] = { {1, 1, 12}, {1, 1, 14}, {2, 2, 14}, @@ -4456,13 +4456,13 @@ const u8 sSlotLuckinessTable1[][3] = { {3, 3, 16} }; -const u8 sSlotLuckinessTable2[][6] = { +const u8 LuckyFlagsTable_Top3[][6] = { {25, 25, 30, 40, 40, 50}, {25, 25, 30, 30, 35, 35}, {25, 25, 30, 25, 25, 30} }; -const u8 sSlotLuckinessTable3[][6] = { +const u8 LuckyFlagsTable_NotTop3[][6] = { {20, 25, 25, 20, 25, 25}, {12, 15, 15, 18, 19, 22}, {25, 25, 25, 30, 30, 40}, @@ -4470,7 +4470,7 @@ const u8 sSlotLuckinessTable3[][6] = { {40, 40, 35, 35, 40, 40} }; -const u8 ReelTimeProbabilityTable0[][17] = { +const u8 ReelTimeProbabilityTable_UnluckyGame[][17] = { {243, 243, 243, 80, 80, 80, 80, 40, 40, 40, 40, 40, 40, 5, 5, 5, 5}, { 5, 5, 5, 150, 150, 150, 150, 130, 130, 130, 130, 130, 130, 100, 100, 100, 5}, { 4, 4, 4, 20, 20, 20, 20, 80, 80, 80, 80, 80, 80, 100, 100, 100, 40}, @@ -4479,7 +4479,7 @@ const u8 ReelTimeProbabilityTable0[][17] = { { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6} }; -const u8 ReelTimeProbabilityTable1[][17] = { +const u8 ReelTimeProbabilityTable_LuckyGame[][17] = { { 243, 243, 243, 200, 200, 200, 200, 160, 160, 160, 160, 160, 160, 70, 70, 70, 5}, { 5, 5, 5, 25, 25, 25, 25, 5, 5, 5, 5, 5, 5, 2, 2, 2, 6}, { 4, 4, 4, 25, 25, 25, 25, 30, 30, 30, 30, 30, 30, 40, 40, 40, 35}, @@ -4505,7 +4505,7 @@ const u16 ReelTimeBonusIncrementTable[] = { }; // tentative name -const u8 LuckyFlagTagOutput[] = { +const u8 LuckyTags[] = { SLOT_MACHINE_TAG_REPLAY, SLOT_MACHINE_TAG_CHERRY, SLOT_MACHINE_TAG_LOTAD, SLOT_MACHINE_TAG_AZURILL, SLOT_MACHINE_TAG_POWER, SLOT_MACHINE_TAG_7_RED, SLOT_MACHINE_TAG_7_RED, SLOT_MACHINE_TAG_7_RED }; @@ -4515,11 +4515,11 @@ If you got Lucky2 in 1 attempt, flag 7 gets set. If you got Lucky2 in 2 attempts, flag 5 gets set. If you got Lucky2 in 3 attempts, flag 6 gets set. */ -const u16 FlagsAttemptAtLuckiness1[] = { // order seems buggy +const u16 LuckyFlagSettings_Top3[] = { // order seems buggy 0x80, 0x20, 0x40 }; -const u16 FlagsAttemptAtLuckiness2[] = { +const u16 LuckyFlagSettings_NotTop3[] = { 0x10, 0x08, 0x04, 0x02, 0x01 }; diff --git a/src/tv.c b/src/tv.c index cbeb189a80..27f779c2db 100644 --- a/src/tv.c +++ b/src/tv.c @@ -2072,13 +2072,13 @@ void reportNewCoinTotal(u16 nCoinsPaidOut) } } -void reportPlayedSlotMachine(u16 nCoinsSpent) +void AlertTVThatYouPlayedSlotMachine(u16 nCoinsSpent) { sFindThatGamerWhichGame = SLOT_MACHINE; sFindThatGamerCoinsSpent = nCoinsSpent; } -void reportPlayedRoulette(u16 nCoinsSpent) +void AlertTVThatYouPlayedRoulette(u16 nCoinsSpent) { sFindThatGamerWhichGame = ROULETTE; sFindThatGamerCoinsSpent = nCoinsSpent; From f8f046c850697a86dae1d244fc80911497bd2d1c Mon Sep 17 00:00:00 2001 From: hondew Date: Thu, 7 Feb 2019 19:13:23 -0500 Subject: [PATCH 143/217] clean up slot machine more --- src/slot_machine.c | 423 ++++++++++++++++++++++----------------------- 1 file changed, 210 insertions(+), 213 deletions(-) diff --git a/src/slot_machine.c b/src/slot_machine.c index 9bb12df814..bb6925bd83 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -79,11 +79,11 @@ struct SlotMachineEwramStruct /*0x18*/ s16 currReel; /*0x1A*/ s16 reelIncrement; // speed of reel /*0x1C*/ s16 reelPixelOffsets[3]; - /*0x22*/ u16 stopReelPixelOffset[3]; - /*0x28*/ s16 reelPositions[3]; + /*0x22*/ u16 reelPixelOffsetsWhileStopping[3]; + /*0x28*/ s16 reelTagOffsets[3]; /*0x2E*/ s16 reelExtraTurns[3]; - /*0x34*/ s16 biasTagFinalPositions[3]; - /*0x3A*/ u8 reelTasks[3]; + /*0x34*/ s16 biasTagLocation[3]; + /*0x3A*/ u8 slotReelTasks[3]; /*0x3D*/ u8 unkTaskPointer3D; /*0x3E*/ u8 unkTaskPointer3E; /*0x3F*/ u8 reelTimeSprite3F; @@ -180,20 +180,20 @@ struct UnkStruct1 /*static */void AwardPayout(void); /*static */void RunAwardPayoutActions(u8 taskId); /*static */bool8 IsFinalTask_RunAwardPayoutActions(void); -/*static */bool8 AwardPayoutAction1(struct Task *task); +/*static */bool8 AwardPayoutAction0(struct Task *task); /*static */bool8 AwardPayoutAction_GivePayoutToPlayer(struct Task *task); /*static */bool8 AwardPayoutAction_FreeTask(struct Task *task); -/*static */u8 GetNearbyTag(u8 x, s16 y); -/*static */void GameplayTask_StopReel(void); +/*static */u8 GetNearbyTag_Quantized(u8 x, s16 y); +/*static */void GameplayTask_StopSlotReel(void); /*static */void ReelTasks_SetUnkTaskData(u8 a0); /*static */void sub_8102E1C(u8 a0); -/*static */bool8 IsReelMoving(u8 a0); -/*static */void RunReelActions(u8 taskId); -/*static */bool8 ReelAction_StayStill(struct Task *task); -/*static */bool8 ReelAction_Spin(struct Task *task); -/*static */bool8 ReelAction_DecideWhereToStop(struct Task *task); -/*static */bool8 ReelAction_TurnToSelectedTag(struct Task *task); -/*static */bool8 ReelAction_OscillatingStop(struct Task *task); +/*static */bool8 IsSlotReelMoving(u8 a0); +/*static */void RunSlotReelActions(u8 taskId); +/*static */bool8 SlotReelAction_StayStill(struct Task *task); +/*static */bool8 SlotReelAction_Spin(struct Task *task); +/*static */bool8 SlotReelAction_DecideWhereToStop(struct Task *task); +/*static */bool8 SlotReelAction_MoveToStop(struct Task *task); +/*static */bool8 SlotReelAction_OscillatingStop(struct Task *task); /*static */bool8 DecideReelTurns_BiasTag_Reel1(void); /*static */bool8 DecideReelTurns_BiasTag_Reel1_Bet1(u8 a0, u8 a1); /*static */bool8 DecideReelTurns_BiasTag_Reel1_Bet2or3(u8 a0, u8 a1); @@ -389,7 +389,7 @@ extern const u8 LuckyFlagsTable_NotTop3[][6]; extern const u8 ReelTimeProbabilityTable_UnluckyGame[][17]; extern const u8 ReelTimeProbabilityTable_LuckyGame[][17]; extern const u8 sSym2Match[]; -extern const u8 gUnknown_083ECCF1[]; +extern const u8 ReelTimeTags[]; extern const u8 sReelSymbols[][REEL_NUM_TAGS]; extern const u16 *const gUnknown_083EDD08[]; extern const u16 *const gUnknown_083EDD1C[]; @@ -490,18 +490,18 @@ bool8 (*const SlotActions[])(struct Task *task) = bool8 (*const AwardPayoutActions[])(struct Task *task) = { - AwardPayoutAction1, + AwardPayoutAction0, AwardPayoutAction_GivePayoutToPlayer, AwardPayoutAction_FreeTask }; -bool8 (*const ReelActions[])(struct Task *task) = +bool8 (*const SlotReelActions[])(struct Task *task) = { - ReelAction_StayStill, - ReelAction_Spin, - ReelAction_DecideWhereToStop, - ReelAction_TurnToSelectedTag, - ReelAction_OscillatingStop + SlotReelAction_StayStill, + SlotReelAction_Spin, + SlotReelAction_DecideWhereToStop, + SlotReelAction_MoveToStop, + SlotReelAction_OscillatingStop }; // returns True if a match with the biasTag is possible in that reel @@ -858,9 +858,9 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue // for each reel... for (i = 0; i < 3; i++) { - sSlotMachine->stopReelPixelOffset[i] = 0; - sSlotMachine->reelPositions[i] = sInitialReelPositions[i][sSlotMachine->luckyGame] % REEL_NUM_TAGS; - sSlotMachine->reelPixelOffsets[i] = 0x1f8 - sSlotMachine->reelPositions[i] * 24; + sSlotMachine->reelPixelOffsetsWhileStopping[i] = 0; + sSlotMachine->reelTagOffsets[i] = sInitialReelPositions[i][sSlotMachine->luckyGame] % REEL_NUM_TAGS; + sSlotMachine->reelPixelOffsets[i] = 0x1f8 - sSlotMachine->reelTagOffsets[i] * 24; sSlotMachine->reelPixelOffsets[i] %= 0x1f8; // 0x1f8 is 540 } AlertTVThatYouPlayedSlotMachine(GetCoins()); @@ -913,7 +913,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue /*static */void SlotMachineSetupGameplayTasks(void) { GameplayTasks_PikaPower(); - GameplayTask_StopReel(); + GameplayTask_StopSlotReel(); sub_8104C5C(); GameplayTasks_Slots(); } @@ -1118,7 +1118,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue /*static */bool8 SlotAction_WaitForAllReelsToStop(struct Task *task) { - if (!IsReelMoving(sSlotMachine->currReel)) + if (!IsSlotReelMoving(sSlotMachine->currReel)) { sSlotMachine->currReel++; sSlotMachine->slotActionPtr = 12; @@ -1571,9 +1571,9 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue { u8 c1, c2, c3, match; - c1 = GetNearbyTag(0, 2); - c2 = GetNearbyTag(1, 2); - c3 = GetNearbyTag(2, 2); + c1 = GetNearbyTag_Quantized(0, 2); + c2 = GetNearbyTag_Quantized(1, 2); + c3 = GetNearbyTag_Quantized(2, 2); match = GetMatchFromSymbolsInRow(c1, c2, c3); if (match != SLOT_MACHINE_MATCHED_NONE) { @@ -1587,9 +1587,9 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue { u8 c1, c2, c3, match; - c1 = GetNearbyTag(0, 1); - c2 = GetNearbyTag(1, 1); - c3 = GetNearbyTag(2, 1); + c1 = GetNearbyTag_Quantized(0, 1); + c2 = GetNearbyTag_Quantized(1, 1); + c3 = GetNearbyTag_Quantized(2, 1); match = GetMatchFromSymbolsInRow(c1, c2, c3); if (match != SLOT_MACHINE_MATCHED_NONE) { @@ -1599,9 +1599,9 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue sSlotMachine->matchedSymbols |= sSlotMatchFlags[match]; sub_8103E04(1); } - c1 = GetNearbyTag(0, 3); - c2 = GetNearbyTag(1, 3); - c3 = GetNearbyTag(2, 3); + c1 = GetNearbyTag_Quantized(0, 3); + c2 = GetNearbyTag_Quantized(1, 3); + c3 = GetNearbyTag_Quantized(2, 3); match = GetMatchFromSymbolsInRow(c1, c2, c3); if (match != SLOT_MACHINE_MATCHED_NONE) { @@ -1617,9 +1617,9 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue { u8 c1, c2, c3, match; - c1 = GetNearbyTag(0, 1); - c2 = GetNearbyTag(1, 2); - c3 = GetNearbyTag(2, 3); + c1 = GetNearbyTag_Quantized(0, 1); + c2 = GetNearbyTag_Quantized(1, 2); + c3 = GetNearbyTag_Quantized(2, 3); match = GetMatchFromSymbolsInRow(c1, c2, c3); if (match != SLOT_MACHINE_MATCHED_NONE) { @@ -1630,9 +1630,9 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue } sub_8103E04(3); } - c1 = GetNearbyTag(0, 3); - c2 = GetNearbyTag(1, 2); - c3 = GetNearbyTag(2, 1); + c1 = GetNearbyTag_Quantized(0, 3); + c2 = GetNearbyTag_Quantized(1, 2); + c3 = GetNearbyTag_Quantized(2, 1); match = GetMatchFromSymbolsInRow(c1, c2, c3); if (match != SLOT_MACHINE_MATCHED_NONE) { @@ -1677,7 +1677,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue ; } -/*static */bool8 AwardPayoutAction1(struct Task *task) +/*static */bool8 AwardPayoutAction0(struct Task *task) { if (sub_8103E38()) { @@ -1724,130 +1724,130 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return FALSE; } -/*static */u8 GetNearbyTag(u8 reelIndex, s16 posOffset) +/* +Returns the tag that is posOffset below the tag at the top of reelIndex's tape +*/ +/*static */u8 GetNearbyTag_Quantized(u8 reelIndex, s16 posOffset) { - /* - Returns the tag that is posOffset below the tag at the top of reelIndex's tape - */ - s16 tagIndex = (sSlotMachine->reelPositions[reelIndex] + posOffset) % REEL_NUM_TAGS; + s16 tagIndex = (sSlotMachine->reelTagOffsets[reelIndex] + posOffset) % REEL_NUM_TAGS; if (tagIndex < 0) tagIndex += REEL_NUM_TAGS; return sReelSymbols[reelIndex][tagIndex]; } -// TODO: find out how rounding works -/*static */u8 GetNearbyTag_PixelOffset(u8 reelIndex, s16 posOffset) +/* +Calculates GetNearbyTag_Quantized as if the reel was snapped downwards into place +/* +/*static */u8 GetNearbyTag(u8 reelIndex, s16 posOffset) { s16 tagOffset = 0; s16 result = sSlotMachine->reelPixelOffsets[reelIndex] % 24; if (result != 0) - tagOffset = -1; // tag will be posOffset - 1 - return GetNearbyTag(reelIndex, posOffset + tagOffset); + tagOffset = -1; + return GetNearbyTag_Quantized(reelIndex, posOffset + tagOffset); } -// TODO: make sure this is actually what's happening -/*static */u8 GetNthNextReelTimePosition(s16 n) +/*static */u8 GetNearbyReelTimeTag(s16 n) { s16 newPosition = (sSlotMachine->reelTimePosition + n) % 6; if (newPosition < 0) newPosition += 6; - return gUnknown_083ECCF1[newPosition]; + return ReelTimeTags[newPosition]; } -/*static */void IncrementReelPixelOffset(u8 reelIndex, s16 value) +/*static */void AdvanceSlotReel(u8 reelIndex, s16 value) { sSlotMachine->reelPixelOffsets[reelIndex] += value; sSlotMachine->reelPixelOffsets[reelIndex] %= 504; - sSlotMachine->reelPositions[reelIndex] = REEL_NUM_TAGS - sSlotMachine->reelPixelOffsets[reelIndex] / 24; + sSlotMachine->reelTagOffsets[reelIndex] = REEL_NUM_TAGS - sSlotMachine->reelPixelOffsets[reelIndex] / 24; } -// TODO: make sure that's actually what's happening -s16 AdvanceReelNextTag(u8 reelIndex, s16 reelIncrement) +s16 AdvanceSlotReelToNextTag(u8 reelIndex, s16 value) { - s16 value = sSlotMachine->reelPixelOffsets[reelIndex] % 24; - if (value != 0) + s16 offset = sSlotMachine->reelPixelOffsets[reelIndex] % 24; + if (offset != 0) { - if (value < reelIncrement) - reelIncrement = value; - IncrementReelPixelOffset(reelIndex, reelIncrement); - value = sSlotMachine->reelPixelOffsets[reelIndex] % 24; + if (offset < value) + value = offset; + AdvanceSlotReel(reelIndex, value); + offset = sSlotMachine->reelPixelOffsets[reelIndex] % 24; } - return value; + return offset; } -/*static */void IncrementReelTimePixelOffset(s16 value) +/*static */void AdvanceReeltimeReel(s16 value) { sSlotMachine->reelTimePixelOffset += value; sSlotMachine->reelTimePixelOffset %= 120; sSlotMachine->reelTimePosition = 6 - sSlotMachine->reelTimePixelOffset / 20; } -s16 AdvanceReelTimeNextNumber(s16 reelIncrement) +s16 AdvanceReeltimeReelToNextTag(s16 value) { - s16 value = sSlotMachine->reelTimePixelOffset % 20; - if (value != 0) + s16 offset = sSlotMachine->reelTimePixelOffset % 20; + if (offset != 0) { - if (value < reelIncrement) - reelIncrement = value; - IncrementReelTimePixelOffset(reelIncrement); - value = sSlotMachine->reelTimePixelOffset % 20; + if (offset < value) + value = offset; + AdvanceReeltimeReel(value); + offset = sSlotMachine->reelTimePixelOffset % 20; } - return value; + return offset; } -/*static */void GameplayTask_StopReel(void) +/*static */void GameplayTask_StopSlotReel(void) { u8 i; for (i = 0; i < 3; i++) { - u8 taskId = CreateTask(RunReelActions, 2); + u8 taskId = CreateTask(RunSlotReelActions, 2); gTasks[taskId].data[15] = i; - sSlotMachine->reelTasks[i] = taskId; - RunReelActions(taskId); + sSlotMachine->slotReelTasks[i] = taskId; + RunSlotReelActions(taskId); } } /*static */void ReelTasks_SetUnkTaskData(u8 reelIndex) { - gTasks[sSlotMachine->reelTasks[reelIndex]].data[0] = 1; - gTasks[sSlotMachine->reelTasks[reelIndex]].data[14] = 1; + gTasks[sSlotMachine->slotReelTasks[reelIndex]].data[0] = 1; + gTasks[sSlotMachine->slotReelTasks[reelIndex]].data[14] = 1; } /*static */void sub_8102E1C(u8 reelIndex) { - gTasks[sSlotMachine->reelTasks[reelIndex]].data[0] = 2; + gTasks[sSlotMachine->slotReelTasks[reelIndex]].data[0] = 2; } -/*static */bool8 IsReelMoving(u8 reelIndex) +/*static */bool8 IsSlotReelMoving(u8 reelIndex) { - return gTasks[sSlotMachine->reelTasks[reelIndex]].data[14]; + return gTasks[sSlotMachine->slotReelTasks[reelIndex]].data[14]; } -/*static */void RunReelActions(u8 taskId) +/*static */void RunSlotReelActions(u8 taskId) { - while (ReelActions[gTasks[taskId].data[0]](gTasks + taskId)) + while (SlotReelActions[gTasks[taskId].data[0]](gTasks + taskId)) ; } // task->data[1] reel turns // task->data[15] reelIndex -/*static */bool8 ReelAction_StayStill(struct Task *task) +/*static */bool8 SlotReelAction_StayStill(struct Task *task) { return FALSE; } -/*static */bool8 ReelAction_Spin(struct Task *task) +/*static */bool8 SlotReelAction_Spin(struct Task *task) { - IncrementReelPixelOffset(task->data[15], sSlotMachine->reelIncrement); + AdvanceSlotReel(task->data[15], sSlotMachine->reelIncrement); return FALSE; } - -/*static */bool8 ReelAction_DecideWhereToStop(struct Task *task) +// As in previous generations, the slot machine often doesn't stop exactly when you press stop +/*static */bool8 SlotReelAction_DecideWhereToStop(struct Task *task) { task->data[0]++; // initialize data for that reel --> these will be changed if biasTags can be lined up - sSlotMachine->biasTagFinalPositions[task->data[15]] = 0; + sSlotMachine->biasTagLocation[task->data[15]] = 0; sSlotMachine->reelExtraTurns[task->data[15]] = 0; if (sSlotMachine->fairRollsLeft == 0 && (sSlotMachine->luckyFlags == 0 || sSlotMachine->luckySpinsLeft == 0 || !DecideReelTurns_BiasTag[task->data[15]]())) @@ -1860,7 +1860,7 @@ s16 AdvanceReelTimeNextNumber(s16 reelIncrement) } // go to next tag and then do any additional turns -/*static */bool8 ReelAction_TurnToSelectedTag(struct Task *task) +/*static */bool8 SlotReelAction_MoveToStop(struct Task *task) { u16 reelStopShocks[ARRAY_COUNT(ReelStopShocks)]; s16 reelPixelPos; @@ -1868,11 +1868,11 @@ s16 AdvanceReelTimeNextNumber(s16 reelIncrement) memcpy(reelStopShocks, ReelStopShocks, sizeof(ReelStopShocks)); reelPixelPos = sSlotMachine->reelPixelOffsets[task->data[15]] % 24; if (reelPixelPos != 0) - reelPixelPos = AdvanceReelNextTag(task->data[15], sSlotMachine->reelIncrement); + reelPixelPos = AdvanceSlotReelToNextTag(task->data[15], sSlotMachine->reelIncrement); else if (sSlotMachine->reelExtraTurns[task->data[15]]) { sSlotMachine->reelExtraTurns[task->data[15]]--; - IncrementReelPixelOffset(task->data[15], sSlotMachine->reelIncrement); + AdvanceSlotReel(task->data[15], sSlotMachine->reelIncrement); reelPixelPos = sSlotMachine->reelPixelOffsets[task->data[15]] % 24; } if (reelPixelPos == 0 && sSlotMachine->reelExtraTurns[task->data[15]] == 0) @@ -1885,9 +1885,9 @@ s16 AdvanceReelTimeNextNumber(s16 reelIncrement) } // make selected tag oscillate before it becomes still -/*static */bool8 ReelAction_OscillatingStop(struct Task *task) +/*static */bool8 SlotReelAction_OscillatingStop(struct Task *task) { - sSlotMachine->stopReelPixelOffset[task->data[15]] = task->data[1]; + sSlotMachine->reelPixelOffsetsWhileStopping[task->data[15]] = task->data[1]; task->data[1] = -task->data[1]; task->data[2]++; if ((task->data[2] & 0x3) == 0) @@ -1896,7 +1896,7 @@ s16 AdvanceReelTimeNextNumber(s16 reelIncrement) { task->data[0] = 0; task->data[14] = 0; - sSlotMachine->stopReelPixelOffset[task->data[15]] = 0; + sSlotMachine->reelPixelOffsetsWhileStopping[task->data[15]] = 0; } return FALSE; } @@ -1913,9 +1913,9 @@ s16 AdvanceReelTimeNextNumber(s16 reelIncrement) return DecideReelTurns_BiasTag_Reel1_Bets[sSlotMachine->bet - 1](tag1, tag2); } -/*static */bool8 IsTag1orTag2AtPosInReel1(s16 pos, u8 tag1, u8 tag2) +/*static */bool8 AreTagsAtPosition_Reel1(s16 pos, u8 tag1, u8 tag2) { - u8 tag = GetNearbyTag_PixelOffset(0, pos); + u8 tag = GetNearbyTag(0, pos); if (tag == tag1 || tag == tag2) { sSlotMachine->biasTag = tag; @@ -1926,13 +1926,13 @@ s16 AdvanceReelTimeNextNumber(s16 reelIncrement) /*static */bool8 AreCherriesOnScreen_Reel1(s16 offsetFromCenter) { - if (GetNearbyTag_PixelOffset(0, 1 - offsetFromCenter) == SLOT_MACHINE_TAG_CHERRY || GetNearbyTag_PixelOffset(0, 2 - offsetFromCenter) == SLOT_MACHINE_TAG_CHERRY || GetNearbyTag_PixelOffset(0, 3 - offsetFromCenter) == SLOT_MACHINE_TAG_CHERRY) + if (GetNearbyTag(0, 1 - offsetFromCenter) == SLOT_MACHINE_TAG_CHERRY || GetNearbyTag(0, 2 - offsetFromCenter) == SLOT_MACHINE_TAG_CHERRY || GetNearbyTag(0, 3 - offsetFromCenter) == SLOT_MACHINE_TAG_CHERRY) return TRUE; else return FALSE; } -/*static */bool8 LuckyFlags_BiasCherryOr7s(void) +/*static */bool8 IsBiasTowardsCherryOr7s(void) { if (sSlotMachine->luckyFlags & 0xc2) // if any of bits 6, 7, or 1 are set return TRUE; @@ -1946,10 +1946,10 @@ s16 AdvanceReelTimeNextNumber(s16 reelIncrement) for (i = 0; i < 5; i++) { - // if a lucky tag appears in the center row within the next 5 turns - if (IsTag1orTag2AtPosInReel1(2 - i, tag1, tag2)) + // if a lucky tag appears in the center row within 4 turns + if (AreTagsAtPosition_Reel1(2 - i, tag1, tag2)) { - sSlotMachine->biasTagFinalPositions[0] = 2; + sSlotMachine->biasTagLocation[0] = 2; sSlotMachine->reelExtraTurns[0] = i; return TRUE; } @@ -1960,16 +1960,15 @@ s16 AdvanceReelTimeNextNumber(s16 reelIncrement) /*static */bool8 DecideReelTurns_BiasTag_Reel1_Bet2or3(u8 tag1, u8 tag2) { s16 i; - bool8 areLuckyBitsSet = LuckyFlags_BiasCherryOr7s(); - // if lucky numbers or no cherries are currently on screen in reel 1... - if (areLuckyBitsSet || !AreCherriesOnScreen_Reel1(0)) + bool8 biased = IsBiasTowardsCherryOr7s(); + if (biased || !AreCherriesOnScreen_Reel1(0)) { for (i = 1; i < 4; i++) { - //...and if a bias tag is currently on the screen - if (IsTag1orTag2AtPosInReel1(i, tag1, tag2)) + // if a bias tag is currently on the screen + if (AreTagsAtPosition_Reel1(i, tag1, tag2)) { - sSlotMachine->biasTagFinalPositions[0] = i; + sSlotMachine->biasTagLocation[0] = i; sSlotMachine->reelExtraTurns[0] = 0; return TRUE; } @@ -1977,29 +1976,29 @@ s16 AdvanceReelTimeNextNumber(s16 reelIncrement) } for (i = 1; i < 5; i++) { - bool8 areLuckyBitsSetCopy = areLuckyBitsSet; // redundant - // if lucky numbers or if in the next 4 turns there is a screen with no cherries... - if (areLuckyBitsSetCopy || !AreCherriesOnScreen_Reel1(i)) + bool8 biasedCopy = biased; // redundant + // if biased or if in the next 4 turns there is a screen with no cherries... + if (biasedCopy || !AreCherriesOnScreen_Reel1(i)) { //...and if a bias tag is in top row of that screen - if (IsTag1orTag2AtPosInReel1(1 - i, tag1, tag2)) + if (AreTagsAtPosition_Reel1(1 - i, tag1, tag2)) { //...and if it only took 1 turn and the lucky tag could also be the bottom row of a screen with no cherries... - if (i == 1 && (areLuckyBitsSetCopy || !AreCherriesOnScreen_Reel1(3))) + if (i == 1 && (biasedCopy || !AreCherriesOnScreen_Reel1(3))) { - sSlotMachine->biasTagFinalPositions[0] = 3; // maybe how many paths to check - sSlotMachine->reelExtraTurns[0] = 3; // maybe upper limit of turns to advance + sSlotMachine->biasTagLocation[0] = 3; + sSlotMachine->reelExtraTurns[0] = 3; return TRUE; } //...or if it isn't the last turn and the lucky tag could be in the center row of a screen with no cherries... - if (i < 4 && (areLuckyBitsSetCopy || !AreCherriesOnScreen_Reel1(i + 1))) + if (i < 4 && (biasedCopy || !AreCherriesOnScreen_Reel1(i + 1))) { - sSlotMachine->biasTagFinalPositions[0] = 2; + sSlotMachine->biasTagLocation[0] = 2; sSlotMachine->reelExtraTurns[0] = i + 1; return TRUE; } //...else - sSlotMachine->biasTagFinalPositions[0] = 1; + sSlotMachine->biasTagLocation[0] = 1; sSlotMachine->reelExtraTurns[0] = i; return TRUE; } @@ -2016,14 +2015,14 @@ s16 AdvanceReelTimeNextNumber(s16 reelIncrement) /*static */bool8 DecideReelTurns_BiasTag_Reel2_Bet1or2(void) { s16 i; - s16 reel1BiasTagFinalPos = sSlotMachine->biasTagFinalPositions[0]; + s16 biasTagLocation_Reel1 = sSlotMachine->biasTagLocation[0]; for (i = 0; i < 5; i++) { - // if biasTag appears in the same row within 5 turns - if (GetNearbyTag_PixelOffset(1, reel1BiasTagFinalPos - i) == sSlotMachine->biasTag) + // if biasTag appears in the same row within 4 turns + if (GetNearbyTag(1, biasTagLocation_Reel1 - i) == sSlotMachine->biasTag) { - sSlotMachine->biasTagFinalPositions[1] = reel1BiasTagFinalPos; + sSlotMachine->biasTagLocation[1] = biasTagLocation_Reel1; sSlotMachine->reelExtraTurns[1] = i; return TRUE; } @@ -2034,18 +2033,18 @@ s16 AdvanceReelTimeNextNumber(s16 reelIncrement) /*static */bool8 DecideReelTurns_BiasTag_Reel2_Bet3(void) { s16 i; - // if biasTag appears in the same row within 5 turns... + // if biasTag appears in the same row within 4 turns... if (DecideReelTurns_BiasTag_Reel2_Bet1or2()) { - //...and if the biasTag is not in row 2 of reel 1 and if it requires between either 2 or 3 turns to line up the biasTag in row 2... - if (sSlotMachine->biasTagFinalPositions[0] != 2 && sSlotMachine->reelExtraTurns[1] > 1 && sSlotMachine->reelExtraTurns[1] != 4) + //...and if the biasTag is not in middle row of reel 1 and if biasTag appears in middle row of reel 2 in 2 or 3 turns... + if (sSlotMachine->biasTagLocation[0] != 2 && sSlotMachine->reelExtraTurns[1] > 1 && sSlotMachine->reelExtraTurns[1] != 4) { for (i = 0; i < 5; i++) { - //...and if the bias tag will appear in the center row within 5 turns - if (GetNearbyTag_PixelOffset(1, 2 - i) == sSlotMachine->biasTag) + //...and if the bias tag will appear in the middle row within 4 turns + if (GetNearbyTag(1, 2 - i) == sSlotMachine->biasTag) { - sSlotMachine->biasTagFinalPositions[1] = 2; + sSlotMachine->biasTagLocation[1] = 2; sSlotMachine->reelExtraTurns[1] = i; break; } @@ -2053,15 +2052,15 @@ s16 AdvanceReelTimeNextNumber(s16 reelIncrement) } return TRUE; } - // else if the biasTag is not in row 2 of reel 1... - if (sSlotMachine->biasTagFinalPositions[0] != 2) + // else if the biasTag is not in middle row of reel 1... + if (sSlotMachine->biasTagLocation[0] != 2) { for (i = 0; i < 5; i++) { - //...and if the biasTag will appear in the center row of reel 2 within 5 turns - if (GetNearbyTag_PixelOffset(1, 2 - i) == sSlotMachine->biasTag) + //...and if the biasTag will appear in the center row of reel 2 within 4 turns + if (GetNearbyTag(1, 2 - i) == sSlotMachine->biasTag) { - sSlotMachine->biasTagFinalPositions[1] = 2; + sSlotMachine->biasTagLocation[1] = 2; sSlotMachine->reelExtraTurns[1] = i; return TRUE; } @@ -2089,14 +2088,14 @@ s16 AdvanceReelTimeNextNumber(s16 reelIncrement) /*static */bool8 DecideReelTurns_BiasTag_Reel3_Bet1or2(u8 biasTag) { s16 i; - s16 reel2BiasTagPos = sSlotMachine->biasTagFinalPositions[1]; + s16 biasTagLocation_Reel2 = sSlotMachine->biasTagLocation[1]; for (i = 0; i < 5; i++) { - // if the biasTag appears in the same row as in reel 2 within 5 turns - if (GetNearbyTag_PixelOffset(2, reel2BiasTagPos - i) == biasTag) + // if the biasTag appears in the same row as in reel 2 within 4 turns + if (GetNearbyTag(2, biasTagLocation_Reel2 - i) == biasTag) { - sSlotMachine->biasTagFinalPositions[2] = reel2BiasTagPos; + sSlotMachine->biasTagLocation[2] = biasTagLocation_Reel2; sSlotMachine->reelExtraTurns[2] = i; return TRUE; } @@ -2109,21 +2108,21 @@ s16 AdvanceReelTimeNextNumber(s16 reelIncrement) s16 i; s16 biasTagFinalPos; // if the final position of the biasTag matches in reel 1 and reel 2... - if (sSlotMachine->biasTagFinalPositions[0] == sSlotMachine->biasTagFinalPositions[1]) + if (sSlotMachine->biasTagLocation[0] == sSlotMachine->biasTagLocation[1]) //...then try to line it up in reel 3 return DecideReelTurns_BiasTag_Reel3_Bet1or2(biasTag); // else place it in the row opposite reel 1's - if (sSlotMachine->biasTagFinalPositions[0] == 1) + if (sSlotMachine->biasTagLocation[0] == 1) biasTagFinalPos = 3; else biasTagFinalPos = 1; for (i = 0; i < 5; i++) { - // if in the biasTag lands in that position within the next 5 turns - if (GetNearbyTag_PixelOffset(2, biasTagFinalPos - i) == biasTag) + // if the biasTag lands in that position within 4 turns + if (GetNearbyTag(2, biasTagFinalPos - i) == biasTag) { sSlotMachine->reelExtraTurns[2] = i; - sSlotMachine->biasTagFinalPositions[2] = biasTagFinalPos; + sSlotMachine->biasTagLocation[2] = biasTagFinalPos; return TRUE; } } @@ -2142,7 +2141,7 @@ Advance until there are no cherries on screen in reel 1 sSlotMachine->reelExtraTurns[0] = i; } -/*static */bool8 IsBiasTag7AndIfSoChangeColor(u8 *biasTagPtr) +/*static */bool8 IsBiasTag7AndIfSoSColor(u8 *biasTagPtr) { if (*biasTagPtr == SLOT_MACHINE_TAG_7_RED) { @@ -2165,21 +2164,21 @@ Advance until there are no cherries on screen in reel 1 // only does stuff if the biasTag is one of the 7's, plus other conditions /*static */void DecideReelTurns_NoBiasTag_Reel2_Bet1(void) { - // if reel 1 has a biasTag and bit 7 is set in luckyFlags... - if (sSlotMachine->biasTagFinalPositions[0] != 0 && sSlotMachine->luckyFlags & 0x80) + // if biasTag is in reel 1 and bit 7 is set in luckyFlags... + if (sSlotMachine->biasTagLocation[0] != 0 && sSlotMachine->luckyFlags & 0x80) { - u8 biasTag = GetNearbyTag_PixelOffset(0, 2 - sSlotMachine->reelExtraTurns[0]); + u8 biasTag = GetNearbyTag(0, 2 - sSlotMachine->reelExtraTurns[0]); //...and if biasTag is one of the 7's... - if (IsBiasTag7AndIfSoChangeColor(&biasTag)) - //...swap the color of the 7... + if (IsBiasTag7AndIfSoSColor(&biasTag)) + //...swap color of biasTag... { s16 i; for (i = 0; i < 5; i++) { - //...and if the biasTag appears in the next 5 turns - if (biasTag == GetNearbyTag_PixelOffset(1, 2 - i)) + //...and if the biasTag appears within 4 turns + if (biasTag == GetNearbyTag(1, 2 - i)) { - sSlotMachine->biasTagFinalPositions[1] = 2; + sSlotMachine->biasTagLocation[1] = 2; sSlotMachine->reelExtraTurns[1] = i; break; } @@ -2191,20 +2190,20 @@ Advance until there are no cherries on screen in reel 1 /*static */void DecideReelTurns_NoBiasTag_Reel2_Bet2(void) { // if reel 1 has a biasTag and bit 7 is set in luckyFlags... - if (sSlotMachine->biasTagFinalPositions[0] != 0 && sSlotMachine->luckyFlags & 0x80) + if (sSlotMachine->biasTagLocation[0] != 0 && sSlotMachine->luckyFlags & 0x80) { - u8 biasTag = GetNearbyTag_PixelOffset(0, sSlotMachine->biasTagFinalPositions[0] - sSlotMachine->reelExtraTurns[0]); + u8 biasTag = GetNearbyTag(0, sSlotMachine->biasTagLocation[0] - sSlotMachine->reelExtraTurns[0]); //...and if biasTag is one of the 7's... - if (IsBiasTag7AndIfSoChangeColor(&biasTag)) - //...swap the color of the 7... + if (IsBiasTag7AndIfSoSColor(&biasTag)) + //...swap color of biasTag... { s16 i; for (i = 0; i < 5; i++) { - //...and if in the next 5 turns the biasTag appears in reel 2 - if (biasTag == GetNearbyTag_PixelOffset(1, sSlotMachine->biasTagFinalPositions[0] - i)) + //...and if the biasTag appears in same row in reel 2 within 4 turns + if (biasTag == GetNearbyTag(1, sSlotMachine->biasTagLocation[0] - i)) { - sSlotMachine->biasTagFinalPositions[1] = sSlotMachine->biasTagFinalPositions[0]; + sSlotMachine->biasTagLocation[1] = sSlotMachine->biasTagLocation[0]; sSlotMachine->reelExtraTurns[1] = i; break; } @@ -2218,46 +2217,46 @@ Advance until there are no cherries on screen in reel 1 s16 i; s16 j; // if reel 1 has a biasTag and bit 7 is set in luckyFlags... - if (sSlotMachine->biasTagFinalPositions[0] != 0 && sSlotMachine->luckyFlags & 0x80) + if (sSlotMachine->biasTagLocation[0] != 0 && sSlotMachine->luckyFlags & 0x80) { //...and if biasTag appeared in the center row of reel 1 - if (sSlotMachine->biasTagFinalPositions[0] == 2) + if (sSlotMachine->biasTagLocation[0] == 2) { DecideReelTurns_NoBiasTag_Reel2_Bet2(); } else { - u8 biasTag = GetNearbyTag_PixelOffset(0, sSlotMachine->biasTagFinalPositions[0] - sSlotMachine->reelExtraTurns[0]); + u8 biasTag = GetNearbyTag(0, sSlotMachine->biasTagLocation[0] - sSlotMachine->reelExtraTurns[0]); //...and if biasTag is one of the 7's... - if (IsBiasTag7AndIfSoChangeColor(&biasTag)) + if (IsBiasTag7AndIfSoSColor(&biasTag)) //...swap the color of the 7... { j = 2; - if (sSlotMachine->biasTagFinalPositions[0] == 3) + if (sSlotMachine->biasTagLocation[0] == 3) j = 3; for (i = 0; i < 2; i++, j--) { - if (biasTag == GetNearbyTag_PixelOffset(1, j)) + if (biasTag == GetNearbyTag(1, j)) { - sSlotMachine->biasTagFinalPositions[1] = j; + sSlotMachine->biasTagLocation[1] = j; sSlotMachine->reelExtraTurns[1] = 0; return; } } for (j = 1; j < 5; j++) { - if (biasTag == GetNearbyTag_PixelOffset(1, sSlotMachine->biasTagFinalPositions[0] - j)) + if (biasTag == GetNearbyTag(1, sSlotMachine->biasTagLocation[0] - j)) { - if (sSlotMachine->biasTagFinalPositions[0] == 1) + if (sSlotMachine->biasTagLocation[0] == 1) { if (j < 3) { - sSlotMachine->biasTagFinalPositions[1] = 2; + sSlotMachine->biasTagLocation[1] = 2; sSlotMachine->reelExtraTurns[1] = j + 1; } else { - sSlotMachine->biasTagFinalPositions[1] = 1; + sSlotMachine->biasTagLocation[1] = 1; sSlotMachine->reelExtraTurns[1] = j; } } @@ -2265,12 +2264,12 @@ Advance until there are no cherries on screen in reel 1 { if (j < 3) { - sSlotMachine->biasTagFinalPositions[1] = 3; + sSlotMachine->biasTagLocation[1] = 3; sSlotMachine->reelExtraTurns[1] = j; } else { - sSlotMachine->biasTagFinalPositions[1] = 2; + sSlotMachine->biasTagLocation[1] = 2; sSlotMachine->reelExtraTurns[1] = j - 1; } } @@ -2319,14 +2318,14 @@ Advance until there are no cherries on screen in reel 1 /*static */void sub_8103830(void) { s16 i = 0; - u8 r5 = GetNearbyTag_PixelOffset(0, 2 - sSlotMachine->reelExtraTurns[0]); - u8 r1 = GetNearbyTag_PixelOffset(1, 2 - sSlotMachine->reelExtraTurns[1]); + u8 r5 = GetNearbyTag(0, 2 - sSlotMachine->reelExtraTurns[0]); + u8 r1 = GetNearbyTag(1, 2 - sSlotMachine->reelExtraTurns[1]); if (r5 == r1) { while (1) { u8 r0; - if (!(r5 == (r0 = GetNearbyTag_PixelOffset(2, 2 - i)) || (r5 == 0 && r0 == 1) || (r5 == 1 && r0 == 0))) + if (!(r5 == (r0 = GetNearbyTag(2, 2 - i)) || (r5 == 0 && r0 == 1) || (r5 == 1 && r0 == 0))) break; i++; } @@ -2337,7 +2336,7 @@ Advance until there are no cherries on screen in reel 1 { for (i = 0; i < 5; i++) { - if (r5 == GetNearbyTag_PixelOffset(2, 2 - i)) + if (r5 == GetNearbyTag(2, 2 - i)) { sSlotMachine->reelExtraTurns[2] = i; return; @@ -2347,7 +2346,7 @@ Advance until there are no cherries on screen in reel 1 i = 0; while (1) { - if (r5 != GetNearbyTag_PixelOffset(2, 2 - i)) + if (r5 != GetNearbyTag(2, 2 - i)) break; i++; } @@ -2363,15 +2362,15 @@ Advance until there are no cherries on screen in reel 1 u8 r6; u8 r4; - if (sSlotMachine->biasTagFinalPositions[1] != 0 && sSlotMachine->biasTagFinalPositions[0] == sSlotMachine->biasTagFinalPositions[1] && sSlotMachine->luckyFlags & 0x80) + if (sSlotMachine->biasTagLocation[1] != 0 && sSlotMachine->biasTagLocation[0] == sSlotMachine->biasTagLocation[1] && sSlotMachine->luckyFlags & 0x80) { - r7 = GetNearbyTag_PixelOffset(0, sSlotMachine->biasTagFinalPositions[0] - sSlotMachine->reelExtraTurns[0]); - r6 = GetNearbyTag_PixelOffset(1, sSlotMachine->biasTagFinalPositions[1] - sSlotMachine->reelExtraTurns[1]); + r7 = GetNearbyTag(0, sSlotMachine->biasTagLocation[0] - sSlotMachine->reelExtraTurns[0]); + r6 = GetNearbyTag(1, sSlotMachine->biasTagLocation[1] - sSlotMachine->reelExtraTurns[1]); if (sub_8103764(r7, r6)) { for (i = 0; i < 5; i++) { - r4 = GetNearbyTag_PixelOffset(2, sSlotMachine->biasTagFinalPositions[1] - i); + r4 = GetNearbyTag(2, sSlotMachine->biasTagLocation[1] - i); if (r7 == r4) { sp0 = i; @@ -2385,9 +2384,9 @@ Advance until there are no cherries on screen in reel 1 s16 r8; for (i = 1, r8 = 0; i < 4; i++) { - r7 = GetNearbyTag_PixelOffset(0, i - sSlotMachine->reelExtraTurns[0]); - r6 = GetNearbyTag_PixelOffset(1, i - sSlotMachine->reelExtraTurns[1]); - r4 = GetNearbyTag_PixelOffset(2, i - sp0); + r7 = GetNearbyTag(0, i - sSlotMachine->reelExtraTurns[0]); + r6 = GetNearbyTag(1, i - sSlotMachine->reelExtraTurns[1]); + r4 = GetNearbyTag(2, i - sp0); if (!sub_81037BC(r7, r6, r4) && (!sub_810378C(r7, r6, r4) || !(sSlotMachine->luckyFlags & 0x80))) { r8++; @@ -2410,18 +2409,18 @@ Advance until there are no cherries on screen in reel 1 s16 i; sub_8103910(); - if (sSlotMachine->biasTagFinalPositions[1] != 0 && sSlotMachine->biasTagFinalPositions[0] != sSlotMachine->biasTagFinalPositions[1] && sSlotMachine->luckyFlags & 0x80) + if (sSlotMachine->biasTagLocation[1] != 0 && sSlotMachine->biasTagLocation[0] != sSlotMachine->biasTagLocation[1] && sSlotMachine->luckyFlags & 0x80) { - r6 = GetNearbyTag_PixelOffset(0, sSlotMachine->biasTagFinalPositions[0] - sSlotMachine->reelExtraTurns[0]); - r5 = GetNearbyTag_PixelOffset(1, sSlotMachine->biasTagFinalPositions[1] - sSlotMachine->reelExtraTurns[1]); + r6 = GetNearbyTag(0, sSlotMachine->biasTagLocation[0] - sSlotMachine->reelExtraTurns[0]); + r5 = GetNearbyTag(1, sSlotMachine->biasTagLocation[1] - sSlotMachine->reelExtraTurns[1]); if (sub_8103764(r6, r5)) { r8 = 1; - if (sSlotMachine->biasTagFinalPositions[0] == 1) + if (sSlotMachine->biasTagLocation[0] == 1) r8 = 3; for (i = 0; i < 5; i++) { - r4 = GetNearbyTag_PixelOffset(2, r8 - (sSlotMachine->reelExtraTurns[2] + i)); + r4 = GetNearbyTag(2, r8 - (sSlotMachine->reelExtraTurns[2] + i)); if (r6 == r4) { sSlotMachine->reelExtraTurns[2] += i; @@ -2432,18 +2431,18 @@ Advance until there are no cherries on screen in reel 1 } while (1) { - r6 = GetNearbyTag_PixelOffset(0, 1 - sSlotMachine->reelExtraTurns[0]); - r5 = GetNearbyTag_PixelOffset(1, 2 - sSlotMachine->reelExtraTurns[1]); - r4 = GetNearbyTag_PixelOffset(2, 3 - sSlotMachine->reelExtraTurns[2]); + r6 = GetNearbyTag(0, 1 - sSlotMachine->reelExtraTurns[0]); + r5 = GetNearbyTag(1, 2 - sSlotMachine->reelExtraTurns[1]); + r4 = GetNearbyTag(2, 3 - sSlotMachine->reelExtraTurns[2]); if (sub_81037BC(r6, r5, r4) || (sub_810378C(r6, r5, r4) && sSlotMachine->luckyFlags & 0x80)) break; sSlotMachine->reelExtraTurns[2]++; } while (1) { - r6 = GetNearbyTag_PixelOffset(0, 3 - sSlotMachine->reelExtraTurns[0]); - r5 = GetNearbyTag_PixelOffset(1, 2 - sSlotMachine->reelExtraTurns[1]); - r4 = GetNearbyTag_PixelOffset(2, 1 - sSlotMachine->reelExtraTurns[2]); + r6 = GetNearbyTag(0, 3 - sSlotMachine->reelExtraTurns[0]); + r5 = GetNearbyTag(1, 2 - sSlotMachine->reelExtraTurns[1]); + r4 = GetNearbyTag(2, 1 - sSlotMachine->reelExtraTurns[2]); if (sub_81037BC(r6, r5, r4) || (sub_810378C(r6, r5, r4) && sSlotMachine->luckyFlags & 0x80)) break; sSlotMachine->reelExtraTurns[2]++; @@ -2811,12 +2810,12 @@ Advance until there are no cherries on screen in reel 1 task->data[3] = 0; } // move ReelTime reel by the value in the upper 8 bits of task->data[4] - IncrementReelTimePixelOffset(task->data[4] >> 8); + AdvanceReeltimeReel(task->data[4] >> 8); } /*static */void ReelTimeAction3(struct Task *task) { - IncrementReelTimePixelOffset(task->data[4] >> 8); + AdvanceReeltimeReel(task->data[4] >> 8); if (++task->data[5] >= 60) { task->data[0]++; @@ -2836,7 +2835,7 @@ Advance until there are no cherries on screen in reel 1 memcpy(sp4, gUnknown_085A75C4, sizeof(gUnknown_085A75C4)); memcpy(spC, gUnknown_085A75CC, sizeof(gUnknown_085A75CC)); - IncrementReelTimePixelOffset(task->data[4] >> 8); + AdvanceReeltimeReel(task->data[4] >> 8); // gradually slow down the reel task->data[4] -= 4; r5 = 4 - (task->data[4] >> 8); @@ -2854,7 +2853,7 @@ Advance until there are no cherries on screen in reel 1 /*static */void ReelTimeAction5(struct Task *task) { - IncrementReelTimePixelOffset(task->data[4] >> 8); + AdvanceReeltimeReel(task->data[4] >> 8); if (++task->data[5] >= 80) { task->data[0]++; @@ -2866,7 +2865,7 @@ Advance until there are no cherries on screen in reel 1 /*static */void ReelTimeAction6(struct Task *task) { - IncrementReelTimePixelOffset(task->data[4] >> 8); + AdvanceReeltimeReel(task->data[4] >> 8); task->data[4] = (u8)task->data[4] + 0x80; if (++task->data[5] >= 80) { @@ -2877,7 +2876,7 @@ Advance until there are no cherries on screen in reel 1 /*static */void ReelTimeAction7(struct Task *task) { - IncrementReelTimePixelOffset(task->data[4] >> 8); + AdvanceReeltimeReel(task->data[4] >> 8); task->data[4] = (u8)task->data[4] + 0x40; if (++task->data[5] >= 40) { @@ -2904,16 +2903,16 @@ Advance until there are no cherries on screen in reel 1 s16 reelTimePixelOffset = sSlotMachine->reelTimePixelOffset % 20; if (reelTimePixelOffset) { - reelTimePixelOffset = AdvanceReelTimeNextNumber(task->data[4] >> 8); + reelTimePixelOffset = AdvanceReeltimeReelToNextTag(task->data[4] >> 8); task->data[4] = (u8)task->data[4] + 0x40; } - else if (GetNthNextReelTimePosition(1) != sSlotMachine->reelTimeDraw) + else if (GetNearbyReelTimeTag(1) != sSlotMachine->reelTimeDraw) { - IncrementReelTimePixelOffset(task->data[4] >> 8); + AdvanceReeltimeReel(task->data[4] >> 8); reelTimePixelOffset = sSlotMachine->reelTimePixelOffset % 20; task->data[4] = (u8)task->data[4] + 0x40; } - if (reelTimePixelOffset == 0 && GetNthNextReelTimePosition(1) == sSlotMachine->reelTimeDraw) + if (reelTimePixelOffset == 0 && GetNearbyReelTimeTag(1) == sSlotMachine->reelTimeDraw) { task->data[4] = 0; // stop moving task->data[0]++; @@ -3282,14 +3281,12 @@ Advance until there are no cherries on screen in reel 1 } } -// debug this to find out what sprite->data[0] and sprite->data[2] are holding -// I would guess this updates the sprite location in the reel /*static */void sub_8104F18(struct Sprite *sprite) { sprite->data[2] = sSlotMachine->reelPixelOffsets[sprite->data[0]] + sprite->data[1]; sprite->data[2] %= 120; - sprite->pos1.y = sSlotMachine->stopReelPixelOffset[sprite->data[0]] + 28 + sprite->data[2]; - sprite->sheetTileStart = GetSpriteTileStartByTag(GetNearbyTag(sprite->data[0], sprite->data[2] / 24)); + sprite->pos1.y = sSlotMachine->reelPixelOffsetsWhileStopping[sprite->data[0]] + 28 + sprite->data[2]; + sprite->sheetTileStart = GetSpriteTileStartByTag(GetNearbyTag_Quantized(sprite->data[0], sprite->data[2] / 24)); SetSpriteSheetFrameTileNum(sprite); } @@ -3457,7 +3454,7 @@ Advance until there are no cherries on screen in reel 1 s16 r0 = (u16)(sSlotMachine->reelTimePixelOffset + sprite->data[7]); r0 %= 40; sprite->pos1.y = r0 + 59; - StartSpriteAnimIfDifferent(sprite, GetNthNextReelTimePosition(r0 / 20)); + StartSpriteAnimIfDifferent(sprite, GetNearbyReelTimeTag(r0 / 20)); } /*static */void sub_81053A0(void) @@ -4437,7 +4434,7 @@ const u8 sReelSymbols[][REEL_NUM_TAGS] = }, }; -const u8 gUnknown_083ECCF1[] = { +const u8 ReelTimeTags[] = { 1, 0, 5, 4, 3, 2 }; From 47a3477ab103e7f25115ead0a8c1ab63578076c1 Mon Sep 17 00:00:00 2001 From: hondew Date: Thu, 14 Feb 2019 17:46:44 -0500 Subject: [PATCH 144/217] finish DecideReelTurns --- src/slot_machine.c | 162 ++++++++++++++++++++++++--------------------- 1 file changed, 88 insertions(+), 74 deletions(-) diff --git a/src/slot_machine.c b/src/slot_machine.c index bb6925bd83..96c9692b38 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -68,7 +68,7 @@ struct SlotMachineEwramStruct /*0x06*/ u8 luckySpinsLeft; // tentative /*0x07*/ u8 biasTag; /*0x08*/ u16 matchedSymbols; - /*0x0A*/ u8 fairRollsLeft; + /*0x0A*/ u8 fairRollsLeft; // only happens if you win reeltime /*0x0B*/ u8 fairRollsUsed; /*0x0C*/ s16 coins; /*0x0E*/ s16 payout; @@ -144,7 +144,7 @@ struct UnkStruct1 /*static */bool8 SlotAction4(struct Task *task); /*static */bool8 SlotAction_AwaitPlayerInput(struct Task *task); /*static */bool8 SlotAction_PrintYouDontHaveThreeCoins(struct Task *task); -/*static */bool8 SlotAction_ExitYouDontHaveThreeCoinsDialogue(struct Task *task); +/*static */bool8 SlotAction_ExitYouDontHaveThreeCoinsMessage(struct Task *task); /*static */bool8 SlotAction_GivingInformation(struct Task *task); /*static */bool8 SlotAction9(struct Task *task); /*static */bool8 SlotAction10(struct Task *task); @@ -209,9 +209,9 @@ struct UnkStruct1 /*static */void DecideReelTurns_NoBiasTag_Reel2_Bet2(void); /*static */void DecideReelTurns_NoBiasTag_Reel2_Bet3(void); /*static */void DecideReelTurns_NoBiasTag_Reel3(void); -/*static */void sub_8103830(void); -/*static */void sub_8103910(void); -/*static */void sub_8103A78(void); +/*static */void DecideReelTurns_NoBiasTag_Reel3_Bet1(void); +/*static */void DecideReelTurns_NoBiasTag_Reel3_Bet2(void); +/*static */void DecideReelTurns_NoBiasTag_Reel3_Bet3(void); /*static */void sub_8103C14(u8 a0); /*static */void sub_8103C48(u8 taskId); /*static */void LoadBetTiles(u8 a0); @@ -464,7 +464,7 @@ bool8 (*const SlotActions[])(struct Task *task) = SlotAction4, SlotAction_AwaitPlayerInput, SlotAction_PrintYouDontHaveThreeCoins, - SlotAction_ExitYouDontHaveThreeCoinsDialogue, + SlotAction_ExitYouDontHaveThreeCoinsMessage, SlotAction_GivingInformation, SlotAction9, SlotAction10, @@ -550,11 +550,11 @@ void (*const DecideReelTurns_NoBiasTag_Reel2_Bets[])(void) = DecideReelTurns_NoBiasTag_Reel2_Bet3 }; -void (*const gUnknown_083ECB94[])(void) = +void (*const DecideReelTurns_NoBiasTag_Reel3_Bets[])(void) = { - sub_8103830, - sub_8103910, - sub_8103A78 + DecideReelTurns_NoBiasTag_Reel3_Bet1, + DecideReelTurns_NoBiasTag_Reel3_Bet2, + DecideReelTurns_NoBiasTag_Reel3_Bet3 }; void (*const gUnknown_083ECBA0[])(struct Task *task, u8 taskId) = @@ -1033,7 +1033,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return FALSE; } -/*static */bool8 SlotAction_ExitYouDontHaveThreeCoinsDialogue(struct Task *task) +/*static */bool8 SlotAction_ExitYouDontHaveThreeCoinsMessage(struct Task *task) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { @@ -1961,6 +1961,7 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) { s16 i; bool8 biased = IsBiasTowardsCherryOr7s(); + // if lucky numbers or no cherries are currently on screen in reel 1... if (biased || !AreCherriesOnScreen_Reel1(0)) { for (i = 1; i < 4; i++) @@ -2281,29 +2282,30 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */bool8 sub_8103764(u8 a0, u8 a1) +/*static */bool8 AreTagsMixed7s_2Tags(u8 tag1, u8 tag2) { - if ((a0 == 0 && a1 == 1) || (a0 == 1 && a1 == 0)) + if ((tag1 == SLOT_MACHINE_TAG_7_RED && tag2 == SLOT_MACHINE_TAG_7_BLUE) || (tag1 == SLOT_MACHINE_TAG_7_BLUE && tag2 == SLOT_MACHINE_TAG_7_RED)) return TRUE; else return FALSE; } -/*static */bool8 sub_810378C(u8 a0, u8 a1, u8 a2) +/*static */bool8 AreTagsMixed7s_3Tags(u8 tag1, u8 tag2, u8 tag3) { - if ((a0 == 0 && a1 == 1 && a2 == 0) || (a0 == 1 && a1 == 0 && a2 == 1)) + if ((tag1 == SLOT_MACHINE_TAG_7_RED && tag2 == SLOT_MACHINE_TAG_7_BLUE && tag3 == SLOT_MACHINE_TAG_7_RED) || + (tag1 == SLOT_MACHINE_TAG_7_BLUE && tag2 == SLOT_MACHINE_TAG_7_RED && tag3 == SLOT_MACHINE_TAG_7_BLUE)) return TRUE; else return FALSE; } -/*static */bool8 sub_81037BC(u8 a0, u8 a1, u8 a2) +/*static */bool8 DoTagsNotMatchOrHaveAny7s(u8 tag1, u8 tag2, u8 tag3) { - if ((a0 == 0 && a1 == 1 && a2 == 0) || - (a0 == 1 && a1 == 0 && a2 == 1) || - (a0 == 0 && a1 == 0 && a2 == 1) || - (a0 == 1 && a1 == 1 && a2 == 0) || - (a0 == a1 && a0 == a2)) + if ((tag1 == SLOT_MACHINE_TAG_7_RED && tag2 == SLOT_MACHINE_TAG_7_BLUE && tag3 == SLOT_MACHINE_TAG_7_RED) || + (tag1 == SLOT_MACHINE_TAG_7_BLUE && tag2 == SLOT_MACHINE_TAG_7_RED && tag3 == SLOT_MACHINE_TAG_7_BLUE) || + (tag1 == SLOT_MACHINE_TAG_7_RED && tag2 == SLOT_MACHINE_TAG_7_RED && tag3 == SLOT_MACHINE_TAG_7_BLUE) || + (tag1 == SLOT_MACHINE_TAG_7_BLUE && tag2 == SLOT_MACHINE_TAG_7_BLUE && tag3 == SLOT_MACHINE_TAG_7_RED) || + (tag1 == tag2 && tag1 == tag3)) { return FALSE; } @@ -2312,41 +2314,46 @@ Advance until there are no cherries on screen in reel 1 /*static */void DecideReelTurns_NoBiasTag_Reel3(void) { - gUnknown_083ECB94[sSlotMachine->bet - 1](); + DecideReelTurns_NoBiasTag_Reel3_Bets[sSlotMachine->bet - 1](); } -/*static */void sub_8103830(void) +/*static */void DecideReelTurns_NoBiasTag_Reel3_Bet1(void) { s16 i = 0; - u8 r5 = GetNearbyTag(0, 2 - sSlotMachine->reelExtraTurns[0]); - u8 r1 = GetNearbyTag(1, 2 - sSlotMachine->reelExtraTurns[1]); - if (r5 == r1) + u8 tag1 = GetNearbyTag(0, 2 - sSlotMachine->reelExtraTurns[0]); + u8 tag2 = GetNearbyTag(1, 2 - sSlotMachine->reelExtraTurns[1]); + // if tags match in first 2 reels... + if (tag1 == tag2) { + //...spin until you get non-matching tag while (1) { - u8 r0; - if (!(r5 == (r0 = GetNearbyTag(2, 2 - i)) || (r5 == 0 && r0 == 1) || (r5 == 1 && r0 == 0))) + u8 tag3; + if (!(tag1 == (tag3 = GetNearbyTag(2, 2 - i)) || (tag1 == SLOT_MACHINE_TAG_7_RED && tag3 == SLOT_MACHINE_TAG_7_BLUE) || (tag1 == SLOT_MACHINE_TAG_7_BLUE && tag3 == SLOT_MACHINE_TAG_7_RED))) break; i++; } } - else if (sub_8103764(r5, r1)) + else if (AreTagsMixed7s_2Tags(tag1, tag2)) { + // if bit 7 of luckyFlags is set... if (sSlotMachine->luckyFlags & 0x80) { + //...see if you can match with reel 1 within 4 turns for (i = 0; i < 5; i++) { - if (r5 == GetNearbyTag(2, 2 - i)) + if (tag1 == GetNearbyTag(2, 2 - i)) { sSlotMachine->reelExtraTurns[2] = i; return; } } } + // turn until you aren't matching with reel 1 i = 0; while (1) { - if (r5 != GetNearbyTag(2, 2 - i)) + if (tag1 != GetNearbyTag(2, 2 - i)) break; i++; } @@ -2354,74 +2361,81 @@ Advance until there are no cherries on screen in reel 1 sSlotMachine->reelExtraTurns[2] = i; } -/*static */void sub_8103910(void) +/*static */void DecideReelTurns_NoBiasTag_Reel3_Bet2(void) { - s16 sp0 = 0; + s16 extraTurns = 0; s16 i; - u8 r7; - u8 r6; - u8 r4; - + u8 tag1; + u8 tag2; + u8 tag3; + // if tags match in first 2 reels and bit 7 of luckyFlags is set... if (sSlotMachine->biasTagLocation[1] != 0 && sSlotMachine->biasTagLocation[0] == sSlotMachine->biasTagLocation[1] && sSlotMachine->luckyFlags & 0x80) { - r7 = GetNearbyTag(0, sSlotMachine->biasTagLocation[0] - sSlotMachine->reelExtraTurns[0]); - r6 = GetNearbyTag(1, sSlotMachine->biasTagLocation[1] - sSlotMachine->reelExtraTurns[1]); - if (sub_8103764(r7, r6)) + tag1 = GetNearbyTag(0, sSlotMachine->biasTagLocation[0] - sSlotMachine->reelExtraTurns[0]); + tag2 = GetNearbyTag(1, sSlotMachine->biasTagLocation[1] - sSlotMachine->reelExtraTurns[1]); + //...and if tags are mixed 7s... + if (AreTagsMixed7s_2Tags(tag1, tag2)) { + //...try to match with reel 1 within 4 turns for (i = 0; i < 5; i++) { - r4 = GetNearbyTag(2, sSlotMachine->biasTagLocation[1] - i); - if (r7 == r4) + tag3 = GetNearbyTag(2, sSlotMachine->biasTagLocation[1] - i); + if (tag1 == tag3) { - sp0 = i; + extraTurns = i; break; } } } } + // GUESS: spin until there's no possible match within 4 turns of you stopping while (1) { - s16 r8; - for (i = 1, r8 = 0; i < 4; i++) + s16 loopExit; + for (i = 1, loopExit = 0; i < 4; i++) { - r7 = GetNearbyTag(0, i - sSlotMachine->reelExtraTurns[0]); - r6 = GetNearbyTag(1, i - sSlotMachine->reelExtraTurns[1]); - r4 = GetNearbyTag(2, i - sp0); - if (!sub_81037BC(r7, r6, r4) && (!sub_810378C(r7, r6, r4) || !(sSlotMachine->luckyFlags & 0x80))) + tag1 = GetNearbyTag(0, i - sSlotMachine->reelExtraTurns[0]); // why does this update with i + tag2 = GetNearbyTag(1, i - sSlotMachine->reelExtraTurns[1]); + tag3 = GetNearbyTag(2, i - extraTurns); + // if bit 7 of luckyFlags is unset... + //...and if all 3 tags match and they're not mixed 7s + if (!DoTagsNotMatchOrHaveAny7s(tag1, tag2, tag3) && (!AreTagsMixed7s_3Tags(tag1, tag2, tag3) || !(sSlotMachine->luckyFlags & 0x80))) { - r8++; + loopExit++; break; } } - if (r8 == 0) + if (loopExit == 0) break; - sp0++; + extraTurns++; } - sSlotMachine->reelExtraTurns[2] = sp0; + sSlotMachine->reelExtraTurns[2] = extraTurns; } -/*static */void sub_8103A78(void) +/*static */void DecideReelTurns_NoBiasTag_Reel3_Bet3(void) { - u8 r6; - u8 r5; - u8 r4; - s16 r8; + u8 tag1; + u8 tag2; + u8 tag3; + s16 j; s16 i; - sub_8103910(); + DecideReelTurns_NoBiasTag_Reel3_Bet2(); + // if tags don't match in first 2 reels and bit 7 of luckyFlags is set... if (sSlotMachine->biasTagLocation[1] != 0 && sSlotMachine->biasTagLocation[0] != sSlotMachine->biasTagLocation[1] && sSlotMachine->luckyFlags & 0x80) { - r6 = GetNearbyTag(0, sSlotMachine->biasTagLocation[0] - sSlotMachine->reelExtraTurns[0]); - r5 = GetNearbyTag(1, sSlotMachine->biasTagLocation[1] - sSlotMachine->reelExtraTurns[1]); - if (sub_8103764(r6, r5)) + tag1 = GetNearbyTag(0, sSlotMachine->biasTagLocation[0] - sSlotMachine->reelExtraTurns[0]); + tag2 = GetNearbyTag(1, sSlotMachine->biasTagLocation[1] - sSlotMachine->reelExtraTurns[1]); + //..and if tags are mixed 7s... + if (AreTagsMixed7s_2Tags(tag1, tag2)) { - r8 = 1; + j = 1; if (sSlotMachine->biasTagLocation[0] == 1) - r8 = 3; + j = 3; for (i = 0; i < 5; i++) { - r4 = GetNearbyTag(2, r8 - (sSlotMachine->reelExtraTurns[2] + i)); - if (r6 == r4) + tag3 = GetNearbyTag(2, j - (sSlotMachine->reelExtraTurns[2] + i)); + if (tag1 == tag3) { sSlotMachine->reelExtraTurns[2] += i; break; @@ -2431,19 +2445,19 @@ Advance until there are no cherries on screen in reel 1 } while (1) { - r6 = GetNearbyTag(0, 1 - sSlotMachine->reelExtraTurns[0]); - r5 = GetNearbyTag(1, 2 - sSlotMachine->reelExtraTurns[1]); - r4 = GetNearbyTag(2, 3 - sSlotMachine->reelExtraTurns[2]); - if (sub_81037BC(r6, r5, r4) || (sub_810378C(r6, r5, r4) && sSlotMachine->luckyFlags & 0x80)) + tag1 = GetNearbyTag(0, 1 - sSlotMachine->reelExtraTurns[0]); + tag2 = GetNearbyTag(1, 2 - sSlotMachine->reelExtraTurns[1]); + tag3 = GetNearbyTag(2, 3 - sSlotMachine->reelExtraTurns[2]); + if (DoTagsNotMatchOrHaveAny7s(tag1, tag2, tag3) || (AreTagsMixed7s_3Tags(tag1, tag2, tag3) && sSlotMachine->luckyFlags & 0x80)) break; sSlotMachine->reelExtraTurns[2]++; } while (1) { - r6 = GetNearbyTag(0, 3 - sSlotMachine->reelExtraTurns[0]); - r5 = GetNearbyTag(1, 2 - sSlotMachine->reelExtraTurns[1]); - r4 = GetNearbyTag(2, 1 - sSlotMachine->reelExtraTurns[2]); - if (sub_81037BC(r6, r5, r4) || (sub_810378C(r6, r5, r4) && sSlotMachine->luckyFlags & 0x80)) + tag1 = GetNearbyTag(0, 3 - sSlotMachine->reelExtraTurns[0]); + tag2 = GetNearbyTag(1, 2 - sSlotMachine->reelExtraTurns[1]); + tag3 = GetNearbyTag(2, 1 - sSlotMachine->reelExtraTurns[2]); + if (DoTagsNotMatchOrHaveAny7s(tag1, tag2, tag3) || (AreTagsMixed7s_3Tags(tag1, tag2, tag3) && sSlotMachine->luckyFlags & 0x80)) break; sSlotMachine->reelExtraTurns[2]++; } From a6eb879267ebad7510b91749e3bbb8b94cdf24d9 Mon Sep 17 00:00:00 2001 From: hondew Date: Thu, 14 Feb 2019 18:06:21 -0500 Subject: [PATCH 145/217] minor reeltime changes --- src/slot_machine.c | 183 ++++++++++++++++++++++----------------------- 1 file changed, 90 insertions(+), 93 deletions(-) diff --git a/src/slot_machine.c b/src/slot_machine.c index 96c9692b38..1d86c94c5f 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -74,8 +74,8 @@ struct SlotMachineEwramStruct /*0x0E*/ s16 payout; /*0x10*/ s16 netCoinLoss; // coins lost to machine (but never goes below 0) /*0x12*/ s16 bet; - /*0x14*/ s16 reelTimePixelOffset; - /*0x16*/ s16 reelTimePosition; + /*0x14*/ s16 reeltimePixelOffset; + /*0x16*/ s16 reeltimePosition; /*0x18*/ s16 currReel; /*0x1A*/ s16 reelIncrement; // speed of reel /*0x1C*/ s16 reelPixelOffsets[3]; @@ -238,27 +238,27 @@ struct UnkStruct1 /*static */void sub_81041AC(struct Task *task); /*static */void ClearTaskDataFields_2orHigher(struct Task *task); /*static */void sub_810423C(u8 pikaPower); -/*static */void BeginReelTime(void); +/*static */void BeginReeltime(void); /*static */bool8 IsFinalTask_RunReelTimeActions(void); -/*static */void RunReelTimeActions(u8 taskId); -/*static */void ReelTimeAction1(struct Task *task); -/*static */void ReelTimeAction2(struct Task *task); -/*static */void ReelTimeAction3(struct Task *task); -/*static */void ReelTimeAction4(struct Task *task); -/*static */void ReelTimeAction5(struct Task *task); -/*static */void ReelTimeAction6(struct Task *task); -/*static */void ReelTimeAction7(struct Task *task); +/*static */void RunReeltimeActions(u8 taskId); +/*static */void ReeltimeAction0(struct Task *task); +/*static */void ReeltimeAction1(struct Task *task); +/*static */void ReeltimeAction2(struct Task *task); +/*static */void ReeltimeAction3(struct Task *task); +/*static */void ReeltimeAction4(struct Task *task); +/*static */void ReeltimeAction5(struct Task *task); +/*static */void ReeltimeAction6(struct Task *task); /*static */void ReelTimeAction_LandOnOutcome(struct Task *task); -/*static */void ReelTimeAction9(struct Task *task); -/*static */void ReelTimeAction10(struct Task *task); -/*static */void ReelTimeAction11(struct Task *task); -/*static */void ReelTimeAction12(struct Task *task); -/*static */void ReelTimeAction13(struct Task *task); -/*static */void ReelTimeAction14(struct Task *task); -/*static */void ReelTimeAction15(struct Task *task); -/*static */void ReelTimeAction16(struct Task *task); -/*static */void ReelTimeAction17(struct Task *task); -/*static */void ReelTimeAction18(struct Task *task); +/*static */void ReeltimeAction8(struct Task *task); +/*static */void ReeltimeAction9(struct Task *task); +/*static */void ReeltimeAction10(struct Task *task); +/*static */void ReeltimeAction11(struct Task *task); +/*static */void ReeltimeAction12(struct Task *task); +/*static */void ReeltimeAction13(struct Task *task); +/*static */void ReeltimeAction14(struct Task *task); +/*static */void ReeltimeAction15(struct Task *task); +/*static */void ReeltimeAction16(struct Task *task); +/*static */void ReeltimeAction17(struct Task *task); /*static */void sub_8104A40(s16 a0, s16 a1); /*static */void sub_8104A88(s16 a0); /*static */void OpenInfoBox(u8 a0); @@ -369,7 +369,7 @@ extern const struct SpriteTemplate gSpriteTemplate_83ED54C; extern const struct SpriteTemplate gSpriteTemplate_83ED534; extern const u8 gUnknown_083ECC58[2]; extern const struct SpriteTemplate gSpriteTemplate_83ED51C; -extern const u16 ProbabilityTable_SkipToReelTimeAction14[]; +extern const u16 ProbabilityTable_SkipToReeltimeAction14[]; extern const u16 *const gUnknown_083EDE10[]; extern const u16 ReelIncrementTable[][2]; extern const u16 ReelTimeBonusIncrementTable[]; @@ -581,27 +581,27 @@ const u16 pikaPowerTileTable[][2] = {0xaf, 0x7f}, // {0b10101111, 0b1111111} }; -void (*const ReelTimeActions[])(struct Task *task) = +void (*const ReeltimeActions[])(struct Task *task) = { - ReelTimeAction1, - ReelTimeAction2, - ReelTimeAction3, - ReelTimeAction4, - ReelTimeAction5, - ReelTimeAction6, - ReelTimeAction7, // does stuff with reel time data + ReeltimeAction0, + ReeltimeAction1, + ReeltimeAction2, + ReeltimeAction3, + ReeltimeAction4, + ReeltimeAction5, + ReeltimeAction6, // does stuff with reel time data ReelTimeAction_LandOnOutcome, - ReelTimeAction9, - ReelTimeAction10, - ReelTimeAction11, - ReelTimeAction12, - ReelTimeAction13, - ReelTimeAction14, - ReelTimeAction15, - ReelTimeAction16, - ReelTimeAction17, - ReelTimeAction11, - ReelTimeAction18 + ReeltimeAction8, + ReeltimeAction9, + ReeltimeAction10, + ReeltimeAction11, + ReeltimeAction12, + ReeltimeAction13, + ReeltimeAction14, + ReeltimeAction15, + ReeltimeAction16, + ReeltimeAction10, + ReeltimeAction17 }; const u8 gUnknown_085A75C0[] = {1, 1, 2, 2}; @@ -1067,7 +1067,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue if (sSlotMachine->luckyFlags & 0x20) // bit 5 of luckyFlag set { // enter into reel time - BeginReelTime(); + BeginReeltime(); sSlotMachine->slotActionPtr = 10; } else @@ -1506,7 +1506,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return ReelTimeProbabilityTable_LuckyGame[reelTimeDraw][sSlotMachine->pikaPower]; } -/*static */void DrawReelTimeOutcome(void) +/*static */void GetReeltimeDraw(void) { u8 rval; s16 reelTimeDraw; @@ -1524,10 +1524,10 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue sSlotMachine->reelTimeDraw = reelTimeDraw; } -/*static */bool8 SkipToReelTimeAction14(u16 i) +/*static */bool8 SkipToReeltimeAction14(u16 i) { u16 rval = Random() & 0xff; - if (rval < ProbabilityTable_SkipToReelTimeAction14[i]) + if (rval < ProbabilityTable_SkipToReeltimeAction14[i]) return TRUE; else return FALSE; @@ -1749,7 +1749,7 @@ Calculates GetNearbyTag_Quantized as if the reel was snapped downwards into plac /*static */u8 GetNearbyReelTimeTag(s16 n) { - s16 newPosition = (sSlotMachine->reelTimePosition + n) % 6; + s16 newPosition = (sSlotMachine->reeltimePosition + n) % 6; if (newPosition < 0) newPosition += 6; return ReelTimeTags[newPosition]; @@ -1777,20 +1777,20 @@ s16 AdvanceSlotReelToNextTag(u8 reelIndex, s16 value) /*static */void AdvanceReeltimeReel(s16 value) { - sSlotMachine->reelTimePixelOffset += value; - sSlotMachine->reelTimePixelOffset %= 120; - sSlotMachine->reelTimePosition = 6 - sSlotMachine->reelTimePixelOffset / 20; + sSlotMachine->reeltimePixelOffset += value; + sSlotMachine->reeltimePixelOffset %= 120; + sSlotMachine->reeltimePosition = 6 - sSlotMachine->reeltimePixelOffset / 20; } s16 AdvanceReeltimeReelToNextTag(s16 value) { - s16 offset = sSlotMachine->reelTimePixelOffset % 20; + s16 offset = sSlotMachine->reeltimePixelOffset % 20; if (offset != 0) { if (offset < value) value = offset; AdvanceReeltimeReel(value); - offset = sSlotMachine->reelTimePixelOffset % 20; + offset = sSlotMachine->reeltimePixelOffset % 20; } return offset; } @@ -2757,37 +2757,37 @@ Advance until there are no cherries on screen in reel 1 gTasks[sSlotMachine->unkTaskPointer3E].data[1] = pikaPower; } -/*static */void BeginReelTime(void) +/*static */void BeginReeltime(void) { - u8 taskId = CreateTask(RunReelTimeActions, 7); - RunReelTimeActions(taskId); + u8 taskId = CreateTask(RunReeltimeActions, 7); + RunReeltimeActions(taskId); } /*static */bool8 IsFinalTask_RunReelTimeActions(void) { - if (FindTaskIdByFunc(RunReelTimeActions) == TAIL_SENTINEL) + if (FindTaskIdByFunc(RunReeltimeActions) == TAIL_SENTINEL) return TRUE; return FALSE; } -/*static */void RunReelTimeActions(u8 taskId) +/*static */void RunReeltimeActions(u8 taskId) { // task.data[0] points to which ReelTimeAction to do, and starts at 0 // task.data[1] has something to do with the threshold // task.data[4] says how many pixels to advance the reel // task.data[5] is a timer - ReelTimeActions[gTasks[taskId].data[0]](gTasks + taskId); + ReeltimeActions[gTasks[taskId].data[0]](gTasks + taskId); } -/*static */void ReelTimeAction1(struct Task *task) +/*static */void ReeltimeAction0(struct Task *task) { sSlotMachine->fairRollsLeft = 0; - sSlotMachine->reelTimePixelOffset = 0; - sSlotMachine->reelTimePosition = 0; + sSlotMachine->reeltimePixelOffset = 0; + sSlotMachine->reeltimePosition = 0; task->data[0]++; task->data[1] = 0; task->data[2] = 30; - task->data[4] = 1280; + task->data[4] = 1280; // reel speed gSpriteCoordOffsetX = 0; gSpriteCoordOffsetY = 0; SetGpuReg(REG_OFFSET_BG1HOFS, 0); @@ -2798,18 +2798,16 @@ Advance until there are no cherries on screen in reel 1 sub_81052EC(); sub_81053A0(); sub_810545C(); - DrawReelTimeOutcome(); + GetReeltimeDraw(); StopMapMusic(); PlayNewMapMusic(MUS_BD_TIME); } -/*static */void ReelTimeAction2(struct Task *task) +/*static */void ReeltimeAction1(struct Task *task) { s16 r3; gSpriteCoordOffsetX -= 8; - // boost threshold by 8 task->data[1] += 8; - // only consider lower 8 bits, and then shift them right 3 r3 = ((task->data[1] + 240) & 0xff) >> 3; SetGpuReg(REG_OFFSET_BG1HOFS, task->data[1] & 0x1ff); if (r3 != task->data[2] && task->data[3] <= 18) @@ -2823,11 +2821,10 @@ Advance until there are no cherries on screen in reel 1 task->data[0]++; task->data[3] = 0; } - // move ReelTime reel by the value in the upper 8 bits of task->data[4] AdvanceReeltimeReel(task->data[4] >> 8); } -/*static */void ReelTimeAction3(struct Task *task) +/*static */void ReeltimeAction2(struct Task *task) { AdvanceReeltimeReel(task->data[4] >> 8); if (++task->data[5] >= 60) @@ -2838,7 +2835,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void ReelTimeAction4(struct Task *task) +/*static */void ReeltimeAction3(struct Task *task) { int r5; u8 sp0[ARRAY_COUNT(gUnknown_085A75C0)]; @@ -2865,7 +2862,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void ReelTimeAction5(struct Task *task) +/*static */void ReeltimeAction4(struct Task *task) { AdvanceReeltimeReel(task->data[4] >> 8); if (++task->data[5] >= 80) @@ -2877,7 +2874,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void ReelTimeAction6(struct Task *task) +/*static */void ReeltimeAction5(struct Task *task) { AdvanceReeltimeReel(task->data[4] >> 8); task->data[4] = (u8)task->data[4] + 0x80; @@ -2888,7 +2885,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void ReelTimeAction7(struct Task *task) +/*static */void ReeltimeAction6(struct Task *task) { AdvanceReeltimeReel(task->data[4] >> 8); task->data[4] = (u8)task->data[4] + 0x40; @@ -2896,7 +2893,7 @@ Advance until there are no cherries on screen in reel 1 { task->data[5] = 0; if (sSlotMachine->reelTimeDraw) - { // TODO: check if fairRollsLeft differs from reelTimeDraw + { if (sSlotMachine->fairRollsLeft <= task->data[6]) task->data[0]++; } @@ -2904,7 +2901,7 @@ Advance until there are no cherries on screen in reel 1 { task->data[0]++; } - else if (SkipToReelTimeAction14(task->data[6])) + else if (SkipToReeltimeAction14(task->data[6])) { task->data[0] = 14; } @@ -2914,26 +2911,26 @@ Advance until there are no cherries on screen in reel 1 /*static */void ReelTimeAction_LandOnOutcome(struct Task *task) { - s16 reelTimePixelOffset = sSlotMachine->reelTimePixelOffset % 20; - if (reelTimePixelOffset) + s16 reeltimePixelOffset = sSlotMachine->reeltimePixelOffset % 20; + if (reeltimePixelOffset) { - reelTimePixelOffset = AdvanceReeltimeReelToNextTag(task->data[4] >> 8); + reeltimePixelOffset = AdvanceReeltimeReelToNextTag(task->data[4] >> 8); task->data[4] = (u8)task->data[4] + 0x40; } else if (GetNearbyReelTimeTag(1) != sSlotMachine->reelTimeDraw) { AdvanceReeltimeReel(task->data[4] >> 8); - reelTimePixelOffset = sSlotMachine->reelTimePixelOffset % 20; + reeltimePixelOffset = sSlotMachine->reeltimePixelOffset % 20; task->data[4] = (u8)task->data[4] + 0x40; } - if (reelTimePixelOffset == 0 && GetNearbyReelTimeTag(1) == sSlotMachine->reelTimeDraw) + if (reeltimePixelOffset == 0 && GetNearbyReelTimeTag(1) == sSlotMachine->reelTimeDraw) { task->data[4] = 0; // stop moving task->data[0]++; } } -/*static */void ReelTimeAction9(struct Task *task) +/*static */void ReeltimeAction8(struct Task *task) { if (++task->data[4] >= 60) { @@ -2962,13 +2959,13 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void ReelTimeAction10(struct Task *task) +/*static */void ReeltimeAction9(struct Task *task) { if ((task->data[4] == 0 || --task->data[4] == 0) && !sub_81040C8()) task->data[0]++; } -/*static */void ReelTimeAction11(struct Task *task) +/*static */void ReeltimeAction10(struct Task *task) { s16 r4; gSpriteCoordOffsetX -= 8; @@ -2982,7 +2979,7 @@ Advance until there are no cherries on screen in reel 1 task->data[0]++; } -/*static */void ReelTimeAction12(struct Task *task) +/*static */void ReeltimeAction11(struct Task *task) { sSlotMachine->fairRollsUsed = 0; sSlotMachine->fairRollsLeft = sSlotMachine->reelTimeDraw; @@ -2995,7 +2992,7 @@ Advance until there are no cherries on screen in reel 1 PlayNewMapMusic(sSlotMachine->backupMapMusic); if (sSlotMachine->fairRollsLeft == 0) { - DestroyTask(FindTaskIdByFunc(RunReelTimeActions)); + DestroyTask(FindTaskIdByFunc(RunReeltimeActions)); } else { @@ -3007,7 +3004,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void ReelTimeAction13(struct Task *task) +/*static */void ReeltimeAction12(struct Task *task) { if (sSlotMachine->reelIncrement == task->data[1]) task->data[0]++; @@ -3015,13 +3012,13 @@ Advance until there are no cherries on screen in reel 1 sSlotMachine->reelIncrement >>= 1; } -/*static */void ReelTimeAction14(struct Task *task) +/*static */void ReeltimeAction13(struct Task *task) { if (sub_8104E18()) - DestroyTask(FindTaskIdByFunc(RunReelTimeActions)); + DestroyTask(FindTaskIdByFunc(RunReeltimeActions)); } -/*static */void ReelTimeAction15(struct Task *task) +/*static */void ReeltimeAction14(struct Task *task) { sub_81054B8(); sub_81056C0(); @@ -3037,7 +3034,7 @@ Advance until there are no cherries on screen in reel 1 PlaySE(SE_W153); } -/*static */void ReelTimeAction16(struct Task *task) +/*static */void ReeltimeAction15(struct Task *task) { gSpriteCoordOffsetY = task->data[4]; SetGpuReg(REG_OFFSET_BG1VOFS, task->data[4]); @@ -3057,7 +3054,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void ReelTimeAction17(struct Task *task) +/*static */void ReeltimeAction16(struct Task *task) { gSpriteCoordOffsetY = 0; SetGpuReg(REG_OFFSET_BG1VOFS, 0); @@ -3068,7 +3065,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void ReelTimeAction18(struct Task *task) +/*static */void ReeltimeAction17(struct Task *task) { gSpriteCoordOffsetX = 0; SetGpuReg(REG_OFFSET_BG1HOFS, 0); @@ -3077,7 +3074,7 @@ Advance until there are no cherries on screen in reel 1 sub_8105554(); sub_8105524(); sub_81059B8(); - DestroyTask(FindTaskIdByFunc(RunReelTimeActions)); + DestroyTask(FindTaskIdByFunc(RunReeltimeActions)); } /*static */void sub_8104A40(s16 a0, s16 a1) @@ -3465,7 +3462,7 @@ Advance until there are no cherries on screen in reel 1 /*static */void sub_810535C(struct Sprite *sprite) { - s16 r0 = (u16)(sSlotMachine->reelTimePixelOffset + sprite->data[7]); + s16 r0 = (u16)(sSlotMachine->reeltimePixelOffset + sprite->data[7]); r0 %= 40; sprite->pos1.y = r0 + 59; StartSpriteAnimIfDifferent(sprite, GetNearbyReelTimeTag(r0 / 20)); @@ -4499,7 +4496,7 @@ const u8 ReelTimeProbabilityTable_LuckyGame[][17] = { { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 60} }; -const u16 ProbabilityTable_SkipToReelTimeAction14[] = { +const u16 ProbabilityTable_SkipToReeltimeAction14[] = { 128, 175, 200, 225, 256 }; From f965f1b13dd30293b99307c869ef5f6f382a374f Mon Sep 17 00:00:00 2001 From: hondew Date: Thu, 14 Feb 2019 23:44:18 -0500 Subject: [PATCH 146/217] label luckyFlags --- include/slot_machine.h | 16 +++++ src/slot_machine.c | 160 +++++++++++++++++++---------------------- 2 files changed, 88 insertions(+), 88 deletions(-) diff --git a/include/slot_machine.h b/include/slot_machine.h index fae937834e..2eb00d92bf 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -3,6 +3,22 @@ #define REEL_NUM_TAGS 21 +// Lucky Flags +#define LUCKY_BIAS_REPLAY 0x0001 +#define LUCKY_BIAS_CHERRY 0x0002 +#define LUCKY_BIAS_LOTAD 0x0004 +#define LUCKY_BIAS_AZURRILL 0x0008 +#define LUCKY_BIAS_POWER 0x0010 +#define LUCKY_BIAS_REELTIME 0x0020 +#define LUCKY_BIAS_MIXED_777 0x0040 +#define LUCKY_BIAS_777 0x0080 + +// Rows +#define SLOT_TOP_ROW 0x0001 +#define SLOT_MIDDLE_ROW 0x0002 +#define SLOT_BOTTOM_ROW 0x0003 + + void PlaySlotMachine(u8, void (callback)(void)); diff --git a/src/slot_machine.c b/src/slot_machine.c index 1d86c94c5f..af162b264b 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -82,7 +82,7 @@ struct SlotMachineEwramStruct /*0x22*/ u16 reelPixelOffsetsWhileStopping[3]; /*0x28*/ s16 reelTagOffsets[3]; /*0x2E*/ s16 reelExtraTurns[3]; - /*0x34*/ s16 biasTagLocation[3]; + /*0x34*/ s16 winnerRows[3]; /*0x3A*/ u8 slotReelTasks[3]; /*0x3D*/ u8 unkTaskPointer3D; /*0x3E*/ u8 unkTaskPointer3E; @@ -950,7 +950,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue sSlotMachine->payout = 0; sSlotMachine->bet = 0; sSlotMachine->currReel = 0; - sSlotMachine->luckyFlags &= 0xc0; // discard all but top 2 flags + sSlotMachine->luckyFlags &= (LUCKY_BIAS_777 | LUCKY_BIAS_MIXED_777); sSlotMachine->slotActionPtr = 4; if (sSlotMachine->coins <= 0) { @@ -1064,7 +1064,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue sub_80EEC80(); // something with daily slot variable task->data[0] = 0; - if (sSlotMachine->luckyFlags & 0x20) // bit 5 of luckyFlag set + if (sSlotMachine->luckyFlags & LUCKY_BIAS_REELTIME) { // enter into reel time BeginReeltime(); @@ -1087,8 +1087,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue if (IsFinalTask_RunReelTimeActions()) { sub_8104CAC(1); - // unset enter reel time flag - sSlotMachine->luckyFlags &= 0xDF; + sSlotMachine->luckyFlags &= ~LUCKY_BIAS_REELTIME; sSlotMachine->slotActionPtr = 11; } return FALSE; @@ -1134,8 +1133,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue // once all reels have stopped /*static */bool8 SlotAction_CheckMatches(struct Task *task) { - // keep top 2 bits of luckyFlags - sSlotMachine->luckyFlags &= 0xc0; + sSlotMachine->luckyFlags &= (LUCKY_BIAS_777 | LUCKY_BIAS_MIXED_777); CheckMatch(); if (sSlotMachine->fairRollsLeft) { @@ -1170,8 +1168,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue // if you matched 777... if (sSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_MIXED) | (1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED))) { - // clear top bits 6 and 7 - sSlotMachine->luckyFlags &= 0x3f; + sSlotMachine->luckyFlags &= ~(LUCKY_BIAS_777 | LUCKY_BIAS_MIXED_777); if (sSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED))) { sSlotMachine->fairRollsLeft = 0; @@ -1403,7 +1400,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue if (sSlotMachine->fairRollsLeft == 0) { - if (!(sSlotMachine->luckyFlags & 0xc0)) // top 2 flags set to 0 + if (!(sSlotMachine->luckyFlags & (LUCKY_BIAS_777 | LUCKY_BIAS_MIXED_777))) { if (IsThisRoundLucky()) { @@ -1847,7 +1844,7 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) { task->data[0]++; // initialize data for that reel --> these will be changed if biasTags can be lined up - sSlotMachine->biasTagLocation[task->data[15]] = 0; + sSlotMachine->winnerRows[task->data[15]] = 0; sSlotMachine->reelExtraTurns[task->data[15]] = 0; if (sSlotMachine->fairRollsLeft == 0 && (sSlotMachine->luckyFlags == 0 || sSlotMachine->luckySpinsLeft == 0 || !DecideReelTurns_BiasTag[task->data[15]]())) @@ -1905,7 +1902,7 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) { u8 tag2 = GetLuckyTag(sSlotMachine->luckyFlags); u8 tag1 = tag2; - if (sSlotMachine->luckyFlags & 0xc0) // if either of top 2 bits are set + if (sSlotMachine->luckyFlags & (LUCKY_BIAS_777 | LUCKY_BIAS_MIXED_777)) { tag1 = SLOT_MACHINE_TAG_7_RED; tag2 = SLOT_MACHINE_TAG_7_BLUE; @@ -1934,7 +1931,7 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) /*static */bool8 IsBiasTowardsCherryOr7s(void) { - if (sSlotMachine->luckyFlags & 0xc2) // if any of bits 6, 7, or 1 are set + if (sSlotMachine->luckyFlags & (LUCKY_BIAS_777 | LUCKY_BIAS_MIXED_777 | LUCKY_BIAS_CHERRY)) return TRUE; else return FALSE; @@ -1949,7 +1946,7 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) // if a lucky tag appears in the center row within 4 turns if (AreTagsAtPosition_Reel1(2 - i, tag1, tag2)) { - sSlotMachine->biasTagLocation[0] = 2; + sSlotMachine->winnerRows[0] = 2; sSlotMachine->reelExtraTurns[0] = i; return TRUE; } @@ -1969,7 +1966,7 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) // if a bias tag is currently on the screen if (AreTagsAtPosition_Reel1(i, tag1, tag2)) { - sSlotMachine->biasTagLocation[0] = i; + sSlotMachine->winnerRows[0] = i; sSlotMachine->reelExtraTurns[0] = 0; return TRUE; } @@ -1987,19 +1984,19 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) //...and if it only took 1 turn and the lucky tag could also be the bottom row of a screen with no cherries... if (i == 1 && (biasedCopy || !AreCherriesOnScreen_Reel1(3))) { - sSlotMachine->biasTagLocation[0] = 3; + sSlotMachine->winnerRows[0] = 3; sSlotMachine->reelExtraTurns[0] = 3; return TRUE; } //...or if it isn't the last turn and the lucky tag could be in the center row of a screen with no cherries... if (i < 4 && (biasedCopy || !AreCherriesOnScreen_Reel1(i + 1))) { - sSlotMachine->biasTagLocation[0] = 2; + sSlotMachine->winnerRows[0] = 2; sSlotMachine->reelExtraTurns[0] = i + 1; return TRUE; } //...else - sSlotMachine->biasTagLocation[0] = 1; + sSlotMachine->winnerRows[0] = 1; sSlotMachine->reelExtraTurns[0] = i; return TRUE; } @@ -2016,14 +2013,14 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) /*static */bool8 DecideReelTurns_BiasTag_Reel2_Bet1or2(void) { s16 i; - s16 biasTagLocation_Reel1 = sSlotMachine->biasTagLocation[0]; + s16 biasTagLocation_Reel1 = sSlotMachine->winnerRows[0]; for (i = 0; i < 5; i++) { // if biasTag appears in the same row within 4 turns if (GetNearbyTag(1, biasTagLocation_Reel1 - i) == sSlotMachine->biasTag) { - sSlotMachine->biasTagLocation[1] = biasTagLocation_Reel1; + sSlotMachine->winnerRows[1] = biasTagLocation_Reel1; sSlotMachine->reelExtraTurns[1] = i; return TRUE; } @@ -2038,14 +2035,14 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) if (DecideReelTurns_BiasTag_Reel2_Bet1or2()) { //...and if the biasTag is not in middle row of reel 1 and if biasTag appears in middle row of reel 2 in 2 or 3 turns... - if (sSlotMachine->biasTagLocation[0] != 2 && sSlotMachine->reelExtraTurns[1] > 1 && sSlotMachine->reelExtraTurns[1] != 4) + if (sSlotMachine->winnerRows[0] != 2 && sSlotMachine->reelExtraTurns[1] > 1 && sSlotMachine->reelExtraTurns[1] != 4) { for (i = 0; i < 5; i++) { //...and if the bias tag will appear in the middle row within 4 turns if (GetNearbyTag(1, 2 - i) == sSlotMachine->biasTag) { - sSlotMachine->biasTagLocation[1] = 2; + sSlotMachine->winnerRows[1] = 2; sSlotMachine->reelExtraTurns[1] = i; break; } @@ -2054,14 +2051,14 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) return TRUE; } // else if the biasTag is not in middle row of reel 1... - if (sSlotMachine->biasTagLocation[0] != 2) + if (sSlotMachine->winnerRows[0] != 2) { for (i = 0; i < 5; i++) { //...and if the biasTag will appear in the center row of reel 2 within 4 turns if (GetNearbyTag(1, 2 - i) == sSlotMachine->biasTag) { - sSlotMachine->biasTagLocation[1] = 2; + sSlotMachine->winnerRows[1] = 2; sSlotMachine->reelExtraTurns[1] = i; return TRUE; } @@ -2073,14 +2070,12 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) /*static */bool8 DecideReelTurns_BiasTag_Reel3(void) { u8 biasTag = sSlotMachine->biasTag; - // if bit 6 of luckyFlags is set... - if (sSlotMachine->luckyFlags & 0x40) + if (sSlotMachine->luckyFlags & LUCKY_BIAS_MIXED_777) { - // make biasTag the opposite color of the 7 in sSlotMachine->biasTag - biasTag = 0; - if (sSlotMachine->biasTag == 0) + biasTag = SLOT_MACHINE_TAG_7_RED; + if (sSlotMachine->biasTag == SLOT_MACHINE_TAG_7_RED) { - biasTag = 1; + biasTag = SLOT_MACHINE_TAG_7_BLUE; } } return DecideReelTurns_BiasTag_Reel3_Bets[sSlotMachine->bet - 1](biasTag); @@ -2089,14 +2084,14 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) /*static */bool8 DecideReelTurns_BiasTag_Reel3_Bet1or2(u8 biasTag) { s16 i; - s16 biasTagLocation_Reel2 = sSlotMachine->biasTagLocation[1]; + s16 biasTagLocation_Reel2 = sSlotMachine->winnerRows[1]; for (i = 0; i < 5; i++) { // if the biasTag appears in the same row as in reel 2 within 4 turns if (GetNearbyTag(2, biasTagLocation_Reel2 - i) == biasTag) { - sSlotMachine->biasTagLocation[2] = biasTagLocation_Reel2; + sSlotMachine->winnerRows[2] = biasTagLocation_Reel2; sSlotMachine->reelExtraTurns[2] = i; return TRUE; } @@ -2109,11 +2104,11 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) s16 i; s16 biasTagFinalPos; // if the final position of the biasTag matches in reel 1 and reel 2... - if (sSlotMachine->biasTagLocation[0] == sSlotMachine->biasTagLocation[1]) + if (sSlotMachine->winnerRows[0] == sSlotMachine->winnerRows[1]) //...then try to line it up in reel 3 return DecideReelTurns_BiasTag_Reel3_Bet1or2(biasTag); // else place it in the row opposite reel 1's - if (sSlotMachine->biasTagLocation[0] == 1) + if (sSlotMachine->winnerRows[0] == 1) biasTagFinalPos = 3; else biasTagFinalPos = 1; @@ -2123,7 +2118,7 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) if (GetNearbyTag(2, biasTagFinalPos - i) == biasTag) { sSlotMachine->reelExtraTurns[2] = i; - sSlotMachine->biasTagLocation[2] = biasTagFinalPos; + sSlotMachine->winnerRows[2] = biasTagFinalPos; return TRUE; } } @@ -2142,7 +2137,7 @@ Advance until there are no cherries on screen in reel 1 sSlotMachine->reelExtraTurns[0] = i; } -/*static */bool8 IsBiasTag7AndIfSoSColor(u8 *biasTagPtr) +/*static */bool8 IsBiasTag777_SwitchColor(u8 *biasTagPtr) { if (*biasTagPtr == SLOT_MACHINE_TAG_7_RED) { @@ -2165,12 +2160,11 @@ Advance until there are no cherries on screen in reel 1 // only does stuff if the biasTag is one of the 7's, plus other conditions /*static */void DecideReelTurns_NoBiasTag_Reel2_Bet1(void) { - // if biasTag is in reel 1 and bit 7 is set in luckyFlags... - if (sSlotMachine->biasTagLocation[0] != 0 && sSlotMachine->luckyFlags & 0x80) + if (sSlotMachine->winnerRows[0] != 0 && sSlotMachine->luckyFlags & LUCKY_BIAS_777) { u8 biasTag = GetNearbyTag(0, 2 - sSlotMachine->reelExtraTurns[0]); //...and if biasTag is one of the 7's... - if (IsBiasTag7AndIfSoSColor(&biasTag)) + if (IsBiasTag777_SwitchColor(&biasTag)) //...swap color of biasTag... { s16 i; @@ -2179,7 +2173,7 @@ Advance until there are no cherries on screen in reel 1 //...and if the biasTag appears within 4 turns if (biasTag == GetNearbyTag(1, 2 - i)) { - sSlotMachine->biasTagLocation[1] = 2; + sSlotMachine->winnerRows[1] = 2; sSlotMachine->reelExtraTurns[1] = i; break; } @@ -2190,21 +2184,20 @@ Advance until there are no cherries on screen in reel 1 /*static */void DecideReelTurns_NoBiasTag_Reel2_Bet2(void) { - // if reel 1 has a biasTag and bit 7 is set in luckyFlags... - if (sSlotMachine->biasTagLocation[0] != 0 && sSlotMachine->luckyFlags & 0x80) + if (sSlotMachine->winnerRows[0] != 0 && sSlotMachine->luckyFlags & LUCKY_BIAS_777) { - u8 biasTag = GetNearbyTag(0, sSlotMachine->biasTagLocation[0] - sSlotMachine->reelExtraTurns[0]); + u8 biasTag = GetNearbyTag(0, sSlotMachine->winnerRows[0] - sSlotMachine->reelExtraTurns[0]); //...and if biasTag is one of the 7's... - if (IsBiasTag7AndIfSoSColor(&biasTag)) + if (IsBiasTag777_SwitchColor(&biasTag)) //...swap color of biasTag... { s16 i; for (i = 0; i < 5; i++) { //...and if the biasTag appears in same row in reel 2 within 4 turns - if (biasTag == GetNearbyTag(1, sSlotMachine->biasTagLocation[0] - i)) + if (biasTag == GetNearbyTag(1, sSlotMachine->winnerRows[0] - i)) { - sSlotMachine->biasTagLocation[1] = sSlotMachine->biasTagLocation[0]; + sSlotMachine->winnerRows[1] = sSlotMachine->winnerRows[0]; sSlotMachine->reelExtraTurns[1] = i; break; } @@ -2218,46 +2211,46 @@ Advance until there are no cherries on screen in reel 1 s16 i; s16 j; // if reel 1 has a biasTag and bit 7 is set in luckyFlags... - if (sSlotMachine->biasTagLocation[0] != 0 && sSlotMachine->luckyFlags & 0x80) + if (sSlotMachine->winnerRows[0] != 0 && sSlotMachine->luckyFlags & LUCKY_BIAS_777) { //...and if biasTag appeared in the center row of reel 1 - if (sSlotMachine->biasTagLocation[0] == 2) + if (sSlotMachine->winnerRows[0] == 2) { DecideReelTurns_NoBiasTag_Reel2_Bet2(); } else { - u8 biasTag = GetNearbyTag(0, sSlotMachine->biasTagLocation[0] - sSlotMachine->reelExtraTurns[0]); + u8 biasTag = GetNearbyTag(0, sSlotMachine->winnerRows[0] - sSlotMachine->reelExtraTurns[0]); //...and if biasTag is one of the 7's... - if (IsBiasTag7AndIfSoSColor(&biasTag)) + if (IsBiasTag777_SwitchColor(&biasTag)) //...swap the color of the 7... { j = 2; - if (sSlotMachine->biasTagLocation[0] == 3) + if (sSlotMachine->winnerRows[0] == 3) j = 3; for (i = 0; i < 2; i++, j--) { if (biasTag == GetNearbyTag(1, j)) { - sSlotMachine->biasTagLocation[1] = j; + sSlotMachine->winnerRows[1] = j; sSlotMachine->reelExtraTurns[1] = 0; return; } } for (j = 1; j < 5; j++) { - if (biasTag == GetNearbyTag(1, sSlotMachine->biasTagLocation[0] - j)) + if (biasTag == GetNearbyTag(1, sSlotMachine->winnerRows[0] - j)) { - if (sSlotMachine->biasTagLocation[0] == 1) + if (sSlotMachine->winnerRows[0] == 1) { if (j < 3) { - sSlotMachine->biasTagLocation[1] = 2; + sSlotMachine->winnerRows[1] = 2; sSlotMachine->reelExtraTurns[1] = j + 1; } else { - sSlotMachine->biasTagLocation[1] = 1; + sSlotMachine->winnerRows[1] = 1; sSlotMachine->reelExtraTurns[1] = j; } } @@ -2265,12 +2258,12 @@ Advance until there are no cherries on screen in reel 1 { if (j < 3) { - sSlotMachine->biasTagLocation[1] = 3; + sSlotMachine->winnerRows[1] = 3; sSlotMachine->reelExtraTurns[1] = j; } else { - sSlotMachine->biasTagLocation[1] = 2; + sSlotMachine->winnerRows[1] = 2; sSlotMachine->reelExtraTurns[1] = j - 1; } } @@ -2282,7 +2275,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */bool8 AreTagsMixed7s_2Tags(u8 tag1, u8 tag2) +/*static */bool8 AreTagsMixed77(u8 tag1, u8 tag2) { if ((tag1 == SLOT_MACHINE_TAG_7_RED && tag2 == SLOT_MACHINE_TAG_7_BLUE) || (tag1 == SLOT_MACHINE_TAG_7_BLUE && tag2 == SLOT_MACHINE_TAG_7_RED)) return TRUE; @@ -2290,7 +2283,7 @@ Advance until there are no cherries on screen in reel 1 return FALSE; } -/*static */bool8 AreTagsMixed7s_3Tags(u8 tag1, u8 tag2, u8 tag3) +/*static */bool8 AreTagsMixed777(u8 tag1, u8 tag2, u8 tag3) { if ((tag1 == SLOT_MACHINE_TAG_7_RED && tag2 == SLOT_MACHINE_TAG_7_BLUE && tag3 == SLOT_MACHINE_TAG_7_RED) || (tag1 == SLOT_MACHINE_TAG_7_BLUE && tag2 == SLOT_MACHINE_TAG_7_RED && tag3 == SLOT_MACHINE_TAG_7_BLUE)) @@ -2299,7 +2292,7 @@ Advance until there are no cherries on screen in reel 1 return FALSE; } -/*static */bool8 DoTagsNotMatchOrHaveAny7s(u8 tag1, u8 tag2, u8 tag3) +/*static */bool8 TagsDontMatchOrHaveAny7s(u8 tag1, u8 tag2, u8 tag3) { if ((tag1 == SLOT_MACHINE_TAG_7_RED && tag2 == SLOT_MACHINE_TAG_7_BLUE && tag3 == SLOT_MACHINE_TAG_7_RED) || (tag1 == SLOT_MACHINE_TAG_7_BLUE && tag2 == SLOT_MACHINE_TAG_7_RED && tag3 == SLOT_MACHINE_TAG_7_BLUE) || @@ -2334,10 +2327,9 @@ Advance until there are no cherries on screen in reel 1 i++; } } - else if (AreTagsMixed7s_2Tags(tag1, tag2)) + else if (AreTagsMixed77(tag1, tag2)) { - // if bit 7 of luckyFlags is set... - if (sSlotMachine->luckyFlags & 0x80) + if (sSlotMachine->luckyFlags & LUCKY_BIAS_777) { //...see if you can match with reel 1 within 4 turns for (i = 0; i < 5; i++) @@ -2368,18 +2360,17 @@ Advance until there are no cherries on screen in reel 1 u8 tag1; u8 tag2; u8 tag3; - // if tags match in first 2 reels and bit 7 of luckyFlags is set... - if (sSlotMachine->biasTagLocation[1] != 0 && sSlotMachine->biasTagLocation[0] == sSlotMachine->biasTagLocation[1] && sSlotMachine->luckyFlags & 0x80) + if (sSlotMachine->winnerRows[1] != 0 && sSlotMachine->winnerRows[0] == sSlotMachine->winnerRows[1] && sSlotMachine->luckyFlags & LUCKY_BIAS_777) { - tag1 = GetNearbyTag(0, sSlotMachine->biasTagLocation[0] - sSlotMachine->reelExtraTurns[0]); - tag2 = GetNearbyTag(1, sSlotMachine->biasTagLocation[1] - sSlotMachine->reelExtraTurns[1]); + tag1 = GetNearbyTag(0, sSlotMachine->winnerRows[0] - sSlotMachine->reelExtraTurns[0]); + tag2 = GetNearbyTag(1, sSlotMachine->winnerRows[1] - sSlotMachine->reelExtraTurns[1]); //...and if tags are mixed 7s... - if (AreTagsMixed7s_2Tags(tag1, tag2)) + if (AreTagsMixed77(tag1, tag2)) { //...try to match with reel 1 within 4 turns for (i = 0; i < 5; i++) { - tag3 = GetNearbyTag(2, sSlotMachine->biasTagLocation[1] - i); + tag3 = GetNearbyTag(2, sSlotMachine->winnerRows[1] - i); if (tag1 == tag3) { extraTurns = i; @@ -2399,7 +2390,7 @@ Advance until there are no cherries on screen in reel 1 tag3 = GetNearbyTag(2, i - extraTurns); // if bit 7 of luckyFlags is unset... //...and if all 3 tags match and they're not mixed 7s - if (!DoTagsNotMatchOrHaveAny7s(tag1, tag2, tag3) && (!AreTagsMixed7s_3Tags(tag1, tag2, tag3) || !(sSlotMachine->luckyFlags & 0x80))) + if (!TagsDontMatchOrHaveAny7s(tag1, tag2, tag3) && (!AreTagsMixed777(tag1, tag2, tag3) || !(sSlotMachine->luckyFlags & LUCKY_BIAS_777))) { loopExit++; break; @@ -2421,16 +2412,15 @@ Advance until there are no cherries on screen in reel 1 s16 i; DecideReelTurns_NoBiasTag_Reel3_Bet2(); - // if tags don't match in first 2 reels and bit 7 of luckyFlags is set... - if (sSlotMachine->biasTagLocation[1] != 0 && sSlotMachine->biasTagLocation[0] != sSlotMachine->biasTagLocation[1] && sSlotMachine->luckyFlags & 0x80) + if (sSlotMachine->winnerRows[1] != 0 && sSlotMachine->winnerRows[0] != sSlotMachine->winnerRows[1] && sSlotMachine->luckyFlags & LUCKY_BIAS_777) { - tag1 = GetNearbyTag(0, sSlotMachine->biasTagLocation[0] - sSlotMachine->reelExtraTurns[0]); - tag2 = GetNearbyTag(1, sSlotMachine->biasTagLocation[1] - sSlotMachine->reelExtraTurns[1]); + tag1 = GetNearbyTag(0, sSlotMachine->winnerRows[0] - sSlotMachine->reelExtraTurns[0]); + tag2 = GetNearbyTag(1, sSlotMachine->winnerRows[1] - sSlotMachine->reelExtraTurns[1]); //..and if tags are mixed 7s... - if (AreTagsMixed7s_2Tags(tag1, tag2)) + if (AreTagsMixed77(tag1, tag2)) { j = 1; - if (sSlotMachine->biasTagLocation[0] == 1) + if (sSlotMachine->winnerRows[0] == 1) j = 3; for (i = 0; i < 5; i++) { @@ -2448,7 +2438,7 @@ Advance until there are no cherries on screen in reel 1 tag1 = GetNearbyTag(0, 1 - sSlotMachine->reelExtraTurns[0]); tag2 = GetNearbyTag(1, 2 - sSlotMachine->reelExtraTurns[1]); tag3 = GetNearbyTag(2, 3 - sSlotMachine->reelExtraTurns[2]); - if (DoTagsNotMatchOrHaveAny7s(tag1, tag2, tag3) || (AreTagsMixed7s_3Tags(tag1, tag2, tag3) && sSlotMachine->luckyFlags & 0x80)) + if (TagsDontMatchOrHaveAny7s(tag1, tag2, tag3) || (AreTagsMixed777(tag1, tag2, tag3) && sSlotMachine->luckyFlags & LUCKY_BIAS_777)) break; sSlotMachine->reelExtraTurns[2]++; } @@ -2457,7 +2447,7 @@ Advance until there are no cherries on screen in reel 1 tag1 = GetNearbyTag(0, 3 - sSlotMachine->reelExtraTurns[0]); tag2 = GetNearbyTag(1, 2 - sSlotMachine->reelExtraTurns[1]); tag3 = GetNearbyTag(2, 1 - sSlotMachine->reelExtraTurns[2]); - if (DoTagsNotMatchOrHaveAny7s(tag1, tag2, tag3) || (AreTagsMixed7s_3Tags(tag1, tag2, tag3) && sSlotMachine->luckyFlags & 0x80)) + if (TagsDontMatchOrHaveAny7s(tag1, tag2, tag3) || (AreTagsMixed777(tag1, tag2, tag3) && sSlotMachine->luckyFlags & LUCKY_BIAS_777)) break; sSlotMachine->reelExtraTurns[2]++; } @@ -4517,18 +4507,12 @@ const u8 LuckyTags[] = { SLOT_MACHINE_TAG_REPLAY, SLOT_MACHINE_TAG_CHERRY, SLOT_MACHINE_TAG_LOTAD, SLOT_MACHINE_TAG_AZURILL, SLOT_MACHINE_TAG_POWER, SLOT_MACHINE_TAG_7_RED, SLOT_MACHINE_TAG_7_RED, SLOT_MACHINE_TAG_7_RED }; -/* -sSlotMachine->luckyFlags: 7, 6, 5, 4, 3, 2, 1, 0 -If you got Lucky2 in 1 attempt, flag 7 gets set. -If you got Lucky2 in 2 attempts, flag 5 gets set. -If you got Lucky2 in 3 attempts, flag 6 gets set. -*/ -const u16 LuckyFlagSettings_Top3[] = { // order seems buggy - 0x80, 0x20, 0x40 +const u16 LuckyFlagSettings_Top3[] = { + LUCKY_BIAS_777, LUCKY_BIAS_REELTIME, LUCKY_BIAS_MIXED_777 }; const u16 LuckyFlagSettings_NotTop3[] = { - 0x10, 0x08, 0x04, 0x02, 0x01 + LUCKY_BIAS_POWER, LUCKY_BIAS_AZURRILL, LUCKY_BIAS_LOTAD, LUCKY_BIAS_CHERRY, LUCKY_BIAS_REPLAY }; const u8 sSym2Match[] = { From dd8ecabe26e5e525306047507d33bc1640040871 Mon Sep 17 00:00:00 2001 From: hondew Date: Fri, 22 Feb 2019 16:03:35 -0500 Subject: [PATCH 147/217] fix mistakes and bad formatting --- include/slot_machine.h | 8 +- include/tv.h | 6 +- src/roulette.c | 4 +- src/slot_machine.c | 1144 ++++++++++++++++++++-------------------- src/tv.c | 8 +- 5 files changed, 582 insertions(+), 588 deletions(-) diff --git a/include/slot_machine.h b/include/slot_machine.h index 2eb00d92bf..bd0af49af0 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -1,13 +1,15 @@ #ifndef GUARD_SLOT_MACHINE_H #define GUARD_SLOT_MACHINE_H -#define REEL_NUM_TAGS 21 +#define NUM_REELS 3 +#define REEL_NUM_TAGS 21 +#define REEL_TAG_HEIGHT 24 // Lucky Flags #define LUCKY_BIAS_REPLAY 0x0001 #define LUCKY_BIAS_CHERRY 0x0002 #define LUCKY_BIAS_LOTAD 0x0004 -#define LUCKY_BIAS_AZURRILL 0x0008 +#define LUCKY_BIAS_AZURILL 0x0008 #define LUCKY_BIAS_POWER 0x0010 #define LUCKY_BIAS_REELTIME 0x0020 #define LUCKY_BIAS_MIXED_777 0x0040 @@ -18,8 +20,6 @@ #define SLOT_MIDDLE_ROW 0x0002 #define SLOT_BOTTOM_ROW 0x0003 - - void PlaySlotMachine(u8, void (callback)(void)); #endif // GUARD_SLOT_MACHINE_H diff --git a/include/tv.h b/include/tv.h index a5c26af0cb..ec01717e26 100644 --- a/include/tv.h +++ b/include/tv.h @@ -26,9 +26,9 @@ bool8 GetPriceReduction(u8 newsKind); void sub_80F14F8(TVShow *shows); size_t CountDigits(int value); u8 GetRibbonCount(struct Pokemon *pokemon); -void AlertTVThatYouPlayedSlotMachine(u16 nCoinsSpent); -void AlertTVThatYouPlayedRoulette(u16 nCoinsSpent); -void reportNewCoinTotal(u16 nCoinsPaidOut); +void AlertTVThatPlayerPlayedSlotMachine(u16 nCoinsSpent); +void AlertTVThatPlayerPlayedRoulette(u16 nCoinsSpent); +void AlertTVOfNewCointTotal(u16 nCoinsPaidOut); void sub_80EEA70(void); void sub_80EDB44(void); void sub_80EDC60(const u16 *words); diff --git a/src/roulette.c b/src/roulette.c index fa2b6c5793..93678fa1cd 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -996,7 +996,7 @@ static void sub_81405CC(void) taskId = gUnknown_0203AB88->varA4 = CreateTask(sub_81408A8, 0); gTasks[taskId].data[6] = 6; gTasks[taskId].data[13] = GetCoins(); - AlertTVThatYouPlayedRoulette(GetCoins()); + AlertTVThatPlayerPlayedRoulette(GetCoins()); gUnknown_0203AB88->varA5 = CreateTask(sub_8140814, 1); SetMainCallback2(sub_8140238); return; @@ -1964,7 +1964,7 @@ static void sub_8141DE4(u8 taskId) gSpecialVar_0x8004 = TRUE; else gSpecialVar_0x8004 = FALSE; - reportNewCoinTotal(GetCoins()); + AlertTVOfNewCointTotal(GetCoins()); BeginHardwarePaletteFade(0xFF, 0, 0, 16, 0); gTasks[taskId].func = sub_8141E7C; } diff --git a/src/slot_machine.c b/src/slot_machine.c index af162b264b..9c07a96f23 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -59,7 +59,7 @@ enum struct SlotMachineEwramStruct { - /*0x00*/ u8 slotActionPtr; + /*0x00*/ u8 state; /*0x01*/ u8 machineId; /*0x02*/ u8 pikaPower; /*0x03*/ u8 luckyGame; @@ -115,209 +115,209 @@ struct UnkStruct1 #define SLOTMACHINE_GFX_TILES 233 -/*static */void CB2_SlotMachineSetup(void); -/*static */void CB2_SlotMachineLoop(void); -/*static */void PlaySlotMachine_Internal(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinueScriptPlayMapMusic); -/*static */void SlotMachineDummyTask(u8 taskId); -/*static */void SlotMachineSetup_0_0(void); -/*static */void SlotMachineSetup_6_2(void); -/*static */void SlotMachineSetup_1_0(void); -/*static */void SlotMachineSetup_2_0(void); -/*static */void SlotMachineSetup_2_1(void); -/*static */void SlotMachineSetup_0_1(void); -/*static */void SlotMachineSetup_3_0(void); -/*static */void SlotMachineSetup_4_0(void); -/*static */void SlotMachineSetup_5_0(void); -/*static */void SlotMachineSetup_6_0(void); -/*static */void SlotMachineSetup_6_1(void); -/*static */void SlotMachineSetup_8_0(void); -/*static */void SlotMachineSetup_9_0(void); -/*static */void SlotMachineSetup_10_0(void); -/*static */void SlotMachineSetupGameplayTasks(void); -/*static */void GameplayTasks_Slots(void); -/*static */void sub_8104DA4(void); -/*static */void RunSlotActions(u8 taskId); -/*static */bool8 SlotAction_UnfadeScreen(struct Task *task); -/*static */bool8 SlotAction_WaitForUnfade(struct Task *task); -/*static */bool8 SlotAction_SetSlotMachineVars(struct Task *task); -/*static */bool8 SlotAction3(struct Task *task); -/*static */bool8 SlotAction4(struct Task *task); -/*static */bool8 SlotAction_AwaitPlayerInput(struct Task *task); -/*static */bool8 SlotAction_PrintYouDontHaveThreeCoins(struct Task *task); -/*static */bool8 SlotAction_ExitYouDontHaveThreeCoinsMessage(struct Task *task); -/*static */bool8 SlotAction_GivingInformation(struct Task *task); -/*static */bool8 SlotAction9(struct Task *task); -/*static */bool8 SlotAction10(struct Task *task); -/*static */bool8 SlotAction_SetLuckySpins(struct Task *task); -/*static */bool8 SlotAction_AwaitReelStop(struct Task *task); -/*static */bool8 SlotAction_WaitForAllReelsToStop(struct Task *task); -/*static */bool8 SlotAction_CheckMatches(struct Task *task); -/*static */bool8 SlotAction_WaitForPayoutToBeAwarded(struct Task *task); -/*static */bool8 SlotAction_EndOfRoll(struct Task *task); -/*static */bool8 SlotAction_MatchedPower(struct Task *task); -/*static */bool8 SlotAction18(struct Task *task); -/*static */bool8 SlotAction_Loop(struct Task *task); -/*static */bool8 SlotAction_NoMatches(struct Task *task); -/*static */bool8 SlotAction_PrintQuitTheGame(struct Task *task); -/*static */bool8 SlotAction_SeeIfPlayerQuits(struct Task *task); -/*static */bool8 SlotAction_Print9999CoinMessage(struct Task *task); -/*static */bool8 SlotAction_Exit9999CoinMessage(struct Task *task); -/*static */bool8 SlotAction_PrintNoMoreCoins(struct Task *task); -/*static */bool8 SlotAction_ExitNoMoreCoinsMessage(struct Task *task); -/*static */bool8 SlotAction_EndGame(struct Task *task); -/*static */bool8 SlotAction_FreeDataStructures(struct Task *task); -/*static */void DrawLuckyFlags(void); -/*static */void SetLuckySpins(void); -/*static */bool8 IsThisRoundLucky(void); -/*static */u8 AttemptsAtLuckyflags_Top3(void); -/*static */u16 DrawNewReelIncrement(void); -/*static */u8 AttemptsAtLuckyflags_NotTop3(void); -/*static */void CheckMatch(void); -/*static */void CheckMatch_CenterRow(void); -/*static */void CheckMatch_TopAndBottom(void); -/*static */void CheckMatch_Diagonals(void); -/*static */u8 GetMatchFromSymbolsInRow(u8 c1, u8 c2, u8 c3); -/*static */void AwardPayout(void); -/*static */void RunAwardPayoutActions(u8 taskId); -/*static */bool8 IsFinalTask_RunAwardPayoutActions(void); -/*static */bool8 AwardPayoutAction0(struct Task *task); -/*static */bool8 AwardPayoutAction_GivePayoutToPlayer(struct Task *task); -/*static */bool8 AwardPayoutAction_FreeTask(struct Task *task); -/*static */u8 GetNearbyTag_Quantized(u8 x, s16 y); -/*static */void GameplayTask_StopSlotReel(void); -/*static */void ReelTasks_SetUnkTaskData(u8 a0); -/*static */void sub_8102E1C(u8 a0); -/*static */bool8 IsSlotReelMoving(u8 a0); -/*static */void RunSlotReelActions(u8 taskId); -/*static */bool8 SlotReelAction_StayStill(struct Task *task); -/*static */bool8 SlotReelAction_Spin(struct Task *task); -/*static */bool8 SlotReelAction_DecideWhereToStop(struct Task *task); -/*static */bool8 SlotReelAction_MoveToStop(struct Task *task); -/*static */bool8 SlotReelAction_OscillatingStop(struct Task *task); -/*static */bool8 DecideReelTurns_BiasTag_Reel1(void); -/*static */bool8 DecideReelTurns_BiasTag_Reel1_Bet1(u8 a0, u8 a1); -/*static */bool8 DecideReelTurns_BiasTag_Reel1_Bet2or3(u8 a0, u8 a1); -/*static */bool8 DecideReelTurns_BiasTag_Reel2(void); -/*static */bool8 DecideReelTurns_BiasTag_Reel2_Bet1or2(void); -/*static */bool8 DecideReelTurns_BiasTag_Reel2_Bet3(void); -/*static */bool8 DecideReelTurns_BiasTag_Reel3(void); -/*static */bool8 DecideReelTurns_BiasTag_Reel3_Bet1or2(u8 a0); -/*static */bool8 DecideReelTurns_BiasTag_Reel3_Bet3(u8 a0); -/*static */void DecideReelTurns_NoBiasTag_Reel1(void); -/*static */void DecideReelTurns_NoBiasTag_Reel2(void); -/*static */void DecideReelTurns_NoBiasTag_Reel2_Bet1(void); -/*static */void DecideReelTurns_NoBiasTag_Reel2_Bet2(void); -/*static */void DecideReelTurns_NoBiasTag_Reel2_Bet3(void); -/*static */void DecideReelTurns_NoBiasTag_Reel3(void); -/*static */void DecideReelTurns_NoBiasTag_Reel3_Bet1(void); -/*static */void DecideReelTurns_NoBiasTag_Reel3_Bet2(void); -/*static */void DecideReelTurns_NoBiasTag_Reel3_Bet3(void); -/*static */void sub_8103C14(u8 a0); -/*static */void sub_8103C48(u8 taskId); -/*static */void LoadBetTiles(u8 a0); -/*static */void sub_8103C78(struct Task *task, u8 taskId); -/*static */void sub_8103CAC(struct Task *task, u8 taskId); -/*static */void sub_8103CC8(struct Task *task, u8 taskId); -/*static */void sub_8103D8C(u8 a0); -/*static */void sub_8103DC8(void); -/*static */void sub_8103E04(u8 a0); -/*static */bool8 sub_8103E38(void); -/*static */bool8 sub_8103E7C(void); -/*static */bool8 sub_8103EAC(u8 spriteId); -/*static */void sub_8103EE4(struct Sprite *sprite); -/*static */void sub_8103F70(void); -/*static */bool8 sub_8103FA0(void); -/*static */void sub_8103FE8_(u8 taskId); -/*static */void GameplayTasks_PikaPower(void); -/*static */void DisplayPikaPower(u8 pikaPower); -/*static */bool8 sub_81040C8(void); -/*static */void sub_81040E8(u8 taskId); -/*static */void nullsub_68(struct Task *task); -/*static */void sub_810411C(struct Task *task); -/*static */void sub_8104144(struct Task *task); -/*static */void sub_81041AC(struct Task *task); -/*static */void ClearTaskDataFields_2orHigher(struct Task *task); -/*static */void sub_810423C(u8 pikaPower); -/*static */void BeginReeltime(void); -/*static */bool8 IsFinalTask_RunReelTimeActions(void); -/*static */void RunReeltimeActions(u8 taskId); -/*static */void ReeltimeAction0(struct Task *task); -/*static */void ReeltimeAction1(struct Task *task); -/*static */void ReeltimeAction2(struct Task *task); -/*static */void ReeltimeAction3(struct Task *task); -/*static */void ReeltimeAction4(struct Task *task); -/*static */void ReeltimeAction5(struct Task *task); -/*static */void ReeltimeAction6(struct Task *task); -/*static */void ReelTimeAction_LandOnOutcome(struct Task *task); -/*static */void ReeltimeAction8(struct Task *task); -/*static */void ReeltimeAction9(struct Task *task); -/*static */void ReeltimeAction10(struct Task *task); -/*static */void ReeltimeAction11(struct Task *task); -/*static */void ReeltimeAction12(struct Task *task); -/*static */void ReeltimeAction13(struct Task *task); -/*static */void ReeltimeAction14(struct Task *task); -/*static */void ReeltimeAction15(struct Task *task); -/*static */void ReeltimeAction16(struct Task *task); -/*static */void ReeltimeAction17(struct Task *task); -/*static */void sub_8104A40(s16 a0, s16 a1); -/*static */void sub_8104A88(s16 a0); -/*static */void OpenInfoBox(u8 a0); -/*static */bool8 IsInfoBoxClosed(void); -/*static */void RunInfoBoxActions(u8 taskId); -/*static */void InfoBox_FadeIn(struct Task *task); -/*static */void InfoBox_WaitForFade(struct Task *task); -/*static */void InfoBox_8104B80(struct Task *task); -/*static */void InfoBox_AwaitPlayerInput(struct Task *task); -/*static */void InfoBox_AddText(struct Task *task); -/*static */void InfoBox_8104BFC(struct Task *task); -/*static */void InfoBox_812DE14(struct Task *task); -/*static */void InfoBox_812DE30(struct Task *task); -/*static */void InfoBox_FreeTask(struct Task *task); -/*static */void sub_8104C5C(void); -/*static */void sub_8104CAC(u8 arg0); -/*static */bool8 sub_8104E18(void); -/*static */void nullsub_69(struct Task *task); -/*static */void sub_8104E74_(u8 taskId); -/*static */void sub_8104EA8(void); -/*static */void sub_8104F8C(void); -/*static */void sub_8104FF4(s16 x, s16 y, u8 a2, s16 a3); -/*static */void sub_81050C4(void); -/*static */void sub_8105100(void); -/*static */void sub_810514C(void); -/*static */void sub_81051C0(void); -/*static */void sub_8105284_(void); -/*static */void sub_81052EC(void); -/*static */void sub_81053A0(void); -/*static */void sub_810545C(void); -/*static */void sub_81054B8(void); -/*static */void sub_8105524(void); -/*static */void sub_8105554(void); -/*static */void CreateReelTimeSprites1(void); -/*static */void sub_8105688(s16 a0); -/*static */void sub_81056C0(void); -/*static */void CreateReelTimeSprite2(void); -/*static */void sub_81057E8(s16 a0); -/*static */void sub_8105804(void); -/*static */void sub_8105854(void); -/*static */void sub_81058A0(void); -/*static */void sub_81058C4(void); -/*static */void sub_81059B8(void); -/*static */void sub_81059E8(void); -/*static */bool8 sub_8105ACC(void); -/*static */void sub_8105AEC(void); -/*static */u8 sub_8105B1C(s16 x, s16 y); -/*static */void sub_8105B88(u8 spriteId); -/*static */u8 sub_8105BF8(u8 templateIdx, void (*callback)(struct Sprite*), s16 x, s16 y, s16 a4); -/*static */void sub_81063C0(void); -/*static */void sub_8106404(void); -/*static */void sub_8106448(void); -/*static */void sub_81064B8(void); -/*static */void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4); -/*static */void sub_81065DC(void); -/*static */void sub_812F958(void); -/*static */void sub_812F968(void); -/*static */void LoadSlotMachineWheelOverlay(void); -/*static */u8 sub_8105BB4(u8 templateIdx, u8 cbAndCoordsIdx, s16 a2); +static void CB2_SlotMachineSetup(void); +static void CB2_SlotMachineLoop(void); +static void PlaySlotMachine_Internal(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinueScriptPlayMapMusic); +static void SlotMachineDummyTask(u8 taskId); +static void SlotMachineSetup_0_0(void); +static void SlotMachineSetup_6_2(void); +static void SlotMachineSetup_1_0(void); +static void SlotMachineSetup_2_0(void); +static void SlotMachineSetup_2_1(void); +static void SlotMachineSetup_0_1(void); +static void SlotMachineSetup_3_0(void); +static void SlotMachineSetup_4_0(void); +static void SlotMachineSetup_5_0(void); +static void SlotMachineSetup_6_0(void); +static void SlotMachineSetup_6_1(void); +static void SlotMachineSetup_8_0(void); +static void SlotMachineSetup_9_0(void); +static void SlotMachineSetup_10_0(void); +static void SlotMachineSetupGameplayTasks(void); +static void GameplayTasks_Slots(void); +static void sub_8104DA4(void); +static void RunSlotActions(u8 taskId); +static bool8 SlotAction_UnfadeScreen(struct Task *task); +static bool8 SlotAction_WaitForUnfade(struct Task *task); +static bool8 SlotAction_SetSlotMachineVars(struct Task *task); +static bool8 SlotAction3(struct Task *task); +static bool8 SlotAction4(struct Task *task); +static bool8 SlotAction_AwaitPlayerInput(struct Task *task); +static bool8 SlotAction_PrintYouDontHaveThreeCoins(struct Task *task); +static bool8 SlotAction_ExitYouDontHaveThreeCoinsMessage(struct Task *task); +static bool8 SlotAction_GivingInformation(struct Task *task); +static bool8 SlotAction9(struct Task *task); +static bool8 SlotAction10(struct Task *task); +static bool8 SlotAction_SetLuckySpins(struct Task *task); +static bool8 SlotAction_AwaitReelStop(struct Task *task); +static bool8 SlotAction_WaitForAllReelsToStop(struct Task *task); +static bool8 SlotAction_CheckMatches(struct Task *task); +static bool8 SlotAction_WaitForPayoutToBeAwarded(struct Task *task); +static bool8 SlotAction_EndOfRoll(struct Task *task); +static bool8 SlotAction_MatchedPower(struct Task *task); +static bool8 SlotAction18(struct Task *task); +static bool8 SlotAction_Loop(struct Task *task); +static bool8 SlotAction_NoMatches(struct Task *task); +static bool8 SlotAction_PrintQuitTheGame(struct Task *task); +static bool8 SlotAction_SeeIfPlayerQuits(struct Task *task); +static bool8 SlotAction_PrintMessage_9999Coins(struct Task *task); +static bool8 SlotAction_ExitMessage_9999Coins(struct Task *task); +static bool8 SlotAction_PrintMessage_NoMoreCoins(struct Task *task); +static bool8 SlotAction_ExitMessage_NoMoreCoins(struct Task *task); +static bool8 SlotAction_EndGame(struct Task *task); +static bool8 SlotAction_FreeDataStructures(struct Task *task); +static void DrawLuckyFlags(void); +static void SetLuckySpins(void); +static bool8 IsThisRoundLucky(void); +static u8 AttemptsAtLuckyflags_Top3(void); +static u16 SlowReelSpeed(void); +static u8 AttemptsAtLuckyflags_NotTop3(void); +static void CheckMatch(void); +static void CheckMatch_CenterRow(void); +static void CheckMatch_TopAndBottom(void); +static void CheckMatch_Diagonals(void); +static u8 GetMatchFromSymbolsInRow(u8 c1, u8 c2, u8 c3); +static void AwardPayout(void); +static void RunAwardPayoutActions(u8 taskId); +static bool8 IsFinalTask_RunAwardPayoutActions(void); +static bool8 AwardPayoutAction0(struct Task *task); +static bool8 AwardPayoutAction_GivePayoutToPlayer(struct Task *task); +static bool8 AwardPayoutAction_FreeTask(struct Task *task); +static u8 GetNearbyTag_Quantized(u8 x, s16 y); +static void GameplayTask_StopSlotReel(void); +static void ReelTasks_SetUnkTaskData(u8 a0); +static void sub_8102E1C(u8 a0); +static bool8 IsSlotReelMoving(u8 a0); +static void RunSlotReelActions(u8 taskId); +static bool8 SlotReelAction_StayStill(struct Task *task); +static bool8 SlotReelAction_Spin(struct Task *task); +static bool8 SlotReelAction_DecideWhereToStop(struct Task *task); +static bool8 SlotReelAction_MoveToStop(struct Task *task); +static bool8 SlotReelAction_OscillatingStop(struct Task *task); +static bool8 DecideReelTurns_BiasTag_Reel1(void); +static bool8 DecideReelTurns_BiasTag_Reel1_Bet1(u8 a0, u8 a1); +static bool8 DecideReelTurns_BiasTag_Reel1_Bet2or3(u8 a0, u8 a1); +static bool8 DecideReelTurns_BiasTag_Reel2(void); +static bool8 DecideReelTurns_BiasTag_Reel2_Bet1or2(void); +static bool8 DecideReelTurns_BiasTag_Reel2_Bet3(void); +static bool8 DecideReelTurns_BiasTag_Reel3(void); +static bool8 DecideReelTurns_BiasTag_Reel3_Bet1or2(u8 a0); +static bool8 DecideReelTurns_BiasTag_Reel3_Bet3(u8 a0); +static void DecideReelTurns_NoBiasTag_Reel1(void); +static void DecideReelTurns_NoBiasTag_Reel2(void); +static void DecideReelTurns_NoBiasTag_Reel2_Bet1(void); +static void DecideReelTurns_NoBiasTag_Reel2_Bet2(void); +static void DecideReelTurns_NoBiasTag_Reel2_Bet3(void); +static void DecideReelTurns_NoBiasTag_Reel3(void); +static void DecideReelTurns_NoBiasTag_Reel3_Bet1(void); +static void DecideReelTurns_NoBiasTag_Reel3_Bet2(void); +static void DecideReelTurns_NoBiasTag_Reel3_Bet3(void); +static void sub_8103C14(u8 a0); +static void sub_8103C48(u8 taskId); +static void LoadBetTiles(u8 a0); +static void sub_8103C78(struct Task *task, u8 taskId); +static void sub_8103CAC(struct Task *task, u8 taskId); +static void sub_8103CC8(struct Task *task, u8 taskId); +static void sub_8103D8C(u8 a0); +static void sub_8103DC8(void); +static void sub_8103E04(u8 a0); +static bool8 sub_8103E38(void); +static bool8 sub_8103E7C(void); +static bool8 sub_8103EAC(u8 spriteId); +static void sub_8103EE4(struct Sprite *sprite); +static void sub_8103F70(void); +static bool8 sub_8103FA0(void); +static void sub_8103FE8_(u8 taskId); +static void GameplayTask_PikaPower(void); +static void DisplayPikaPower(u8 pikaPower); +static bool8 sub_81040C8(void); +static void sub_81040E8(u8 taskId); +static void nullsub_68(struct Task *task); +static void sub_810411C(struct Task *task); +static void sub_8104144(struct Task *task); +static void sub_81041AC(struct Task *task); +static void ClearTaskDataFields_2orHigher(struct Task *task); +static void sub_810423C(u8 pikaPower); +static void BeginReeltime(void); +static bool8 IsFinalTask_RunReelTimeActions(void); +static void RunReeltimeActions(u8 taskId); +static void ReeltimeAction0(struct Task *task); +static void ReeltimeAction1(struct Task *task); +static void ReeltimeAction2(struct Task *task); +static void ReeltimeAction3(struct Task *task); +static void ReeltimeAction4(struct Task *task); +static void ReeltimeAction5(struct Task *task); +static void ReeltimeAction6(struct Task *task); +static void ReelTimeAction_LandOnOutcome(struct Task *task); +static void ReeltimeAction8(struct Task *task); +static void ReeltimeAction9(struct Task *task); +static void ReeltimeAction10(struct Task *task); +static void ReeltimeAction11(struct Task *task); +static void ReeltimeAction12(struct Task *task); +static void ReeltimeAction13(struct Task *task); +static void ReeltimeAction14(struct Task *task); +static void ReeltimeAction15(struct Task *task); +static void ReeltimeAction16(struct Task *task); +static void ReeltimeAction17(struct Task *task); +static void sub_8104A40(s16 a0, s16 a1); +static void sub_8104A88(s16 a0); +static void OpenInfoBox(u8 a0); +static bool8 IsInfoBoxClosed(void); +static void RunInfoBoxActions(u8 taskId); +static void InfoBox_FadeIn(struct Task *task); +static void InfoBox_WaitForFade(struct Task *task); +static void InfoBox_8104B80(struct Task *task); +static void InfoBox_AwaitPlayerInput(struct Task *task); +static void InfoBox_AddText(struct Task *task); +static void InfoBox_8104BFC(struct Task *task); +static void InfoBox_812DE14(struct Task *task); +static void InfoBox_812DE30(struct Task *task); +static void InfoBox_FreeTask(struct Task *task); +static void sub_8104C5C(void); +static void sub_8104CAC(u8 arg0); +static bool8 sub_8104E18(void); +static void nullsub_69(struct Task *task); +static void sub_8104E74_(u8 taskId); +static void sub_8104EA8(void); +static void sub_8104F8C(void); +static void sub_8104FF4(s16 x, s16 y, u8 a2, s16 a3); +static void sub_81050C4(void); +static void sub_8105100(void); +static void sub_810514C(void); +static void sub_81051C0(void); +static void sub_8105284_(void); +static void sub_81052EC(void); +static void sub_81053A0(void); +static void sub_810545C(void); +static void sub_81054B8(void); +static void sub_8105524(void); +static void sub_8105554(void); +static void CreateReelTimeSprites1(void); +static void sub_8105688(s16 a0); +static void sub_81056C0(void); +static void CreateReelTimeSprite2(void); +static void sub_81057E8(s16 a0); +static void sub_8105804(void); +static void sub_8105854(void); +static void sub_81058A0(void); +static void sub_81058C4(void); +static void sub_81059B8(void); +static void sub_81059E8(void); +static bool8 sub_8105ACC(void); +static void sub_8105AEC(void); +static u8 sub_8105B1C(s16 x, s16 y); +static void sub_8105B88(u8 spriteId); +static u8 sub_8105BF8(u8 templateIdx, void (*callback)(struct Sprite*), s16 x, s16 y, s16 a4); +static void sub_81063C0(void); +static void sub_8106404(void); +static void sub_8106448(void); +static void sub_81064B8(void); +static void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4); +static void sub_81065DC(void); +static void sub_812F958(void); +static void sub_812F968(void); +static void LoadSlotMachineWheelOverlay(void); +static u8 sub_8105BB4(u8 templateIdx, u8 cbAndCoordsIdx, s16 a2); // Ewram variables static EWRAM_DATA u16 *gUnknown_0203AAC8 = NULL; @@ -356,7 +356,7 @@ static IWRAM_DATA struct SpriteFrameImage *gUnknown_03001188[26]; extern const struct UnkStruct1 *const gUnknown_083ED048[]; extern const u16 gPalette_83EDE24[]; extern const u8 LuckyRoundTable[][3]; -extern const u8 LuckyTags[]; +extern const u8 BiasTags[]; extern const u16 LuckyFlagSettings_Top3[]; extern const u16 LuckyFlagSettings_NotTop3[]; extern const s16 gUnknown_083ECE7E[][2]; @@ -453,39 +453,39 @@ const struct WindowTemplate gUnknown_085A7444 = 0, 1, 3, 20, 13, 13, 1 }; -const u8 gColors_ReelTimeHelp[] = {3, 1, 2, 0}; +const u8 gColors_ReeltimeHelp[] = {3, 1, 2, 0}; bool8 (*const SlotActions[])(struct Task *task) = { - SlotAction_UnfadeScreen, - SlotAction_WaitForUnfade, - SlotAction_SetSlotMachineVars, - SlotAction3, - SlotAction4, - SlotAction_AwaitPlayerInput, - SlotAction_PrintYouDontHaveThreeCoins, - SlotAction_ExitYouDontHaveThreeCoinsMessage, - SlotAction_GivingInformation, - SlotAction9, - SlotAction10, - SlotAction_SetLuckySpins, - SlotAction_AwaitReelStop, - SlotAction_WaitForAllReelsToStop, - SlotAction_CheckMatches, - SlotAction_WaitForPayoutToBeAwarded, - SlotAction_EndOfRoll, - SlotAction_MatchedPower, - SlotAction18, - SlotAction_Loop, - SlotAction_NoMatches, - SlotAction_PrintQuitTheGame, - SlotAction_SeeIfPlayerQuits, - SlotAction_Print9999CoinMessage, - SlotAction_Exit9999CoinMessage, - SlotAction_PrintNoMoreCoins, - SlotAction_ExitNoMoreCoinsMessage, - SlotAction_EndGame, - SlotAction_FreeDataStructures, + SlotAction_UnfadeScreen, // 0 + SlotAction_WaitForUnfade, // 1 + SlotAction_SetSlotMachineVars, // 2 + SlotAction3, // 3 + SlotAction4, // 4 + SlotAction_AwaitPlayerInput, // 5 + SlotAction_PrintYouDontHaveThreeCoins, // 6 + SlotAction_ExitYouDontHaveThreeCoinsMessage, // 7 + SlotAction_GivingInformation, // 8 + SlotAction9, // 9 + SlotAction10, // 10 + SlotAction_SetLuckySpins, // 11 + SlotAction_AwaitReelStop, // 12 + SlotAction_WaitForAllReelsToStop, // 13 + SlotAction_CheckMatches, // 14 + SlotAction_WaitForPayoutToBeAwarded, // 15 + SlotAction_EndOfRoll, // 16 + SlotAction_MatchedPower, // 17 + SlotAction18, // 18 + SlotAction_Loop, // 19 + SlotAction_NoMatches, // 20 + SlotAction_PrintQuitTheGame, // 21 + SlotAction_SeeIfPlayerQuits, // 22 + SlotAction_PrintMessage_9999Coins, // 23 + SlotAction_ExitMessage_9999Coins, // 24 + SlotAction_PrintMessage_NoMoreCoins, // 25 + SlotAction_ExitMessage_NoMoreCoins, // 26 + SlotAction_EndGame, // 27 + SlotAction_FreeDataStructures, // 28 }; bool8 (*const AwardPayoutActions[])(struct Task *task) = @@ -576,9 +576,9 @@ void (*const gUnknown_083ECBB4[])(struct Task *task) = const u16 pikaPowerTileTable[][2] = { - {0x9e, 0x6e}, // {0b10011110, 0b1101110} - {0x9f, 0x6f}, // {0b10011111, 0b1101111} - {0xaf, 0x7f}, // {0b10101111, 0b1111111} + {0x9e, 0x6e}, + {0x9f, 0x6f}, + {0xaf, 0x7f}, }; void (*const ReeltimeActions[])(struct Task *task) = @@ -589,7 +589,7 @@ void (*const ReeltimeActions[])(struct Task *task) = ReeltimeAction3, ReeltimeAction4, ReeltimeAction5, - ReeltimeAction6, // does stuff with reel time data + ReeltimeAction6, ReelTimeAction_LandOnOutcome, ReeltimeAction8, ReeltimeAction9, @@ -653,7 +653,7 @@ extern const struct SpriteTemplate gSpriteTemplate_83ED45C; // code #define tState data[0] -/*static */void Task_FadeToSlotMachine(u8 taskId) +static void Task_FadeToSlotMachine(u8 taskId) { switch (gTasks[taskId].tState) { @@ -671,19 +671,19 @@ extern const struct SpriteTemplate gSpriteTemplate_83ED45C; } } -void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinueScriptPlayMapMusic) +void PlaySlotMachine(u8 slotMachineIndex, MainCallback cb) { u8 taskId; sSlotMachine = AllocZeroed(sizeof(*sSlotMachine)); - PlaySlotMachine_Internal(slotMachineIndex, CB2_ReturnToFieldContinueScriptPlayMapMusic); + PlaySlotMachine_Internal(slotMachineIndex, cb); taskId = CreateTask(Task_FadeToSlotMachine, 0); gTasks[taskId].tState = 0; } #undef tState -/*static */void CB2_SlotMachineSetup(void) +static void CB2_SlotMachineSetup(void) { switch (gMain.state) { @@ -744,7 +744,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue } } -/*static */void CB2_SlotMachineLoop(void) +static void CB2_SlotMachineLoop(void) { RunTasks(); AnimateSprites(); @@ -752,7 +752,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue UpdatePaletteFade(); } -/*static */void SlotMachine_VBlankCallback(void) +static void SlotMachine_VBlankCallback(void) { LoadOam(); ProcessSpriteCopyRequests(); @@ -763,26 +763,26 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue SetGpuReg(REG_OFFSET_WINOUT, sSlotMachine->winOut); } -/*static */void PlaySlotMachine_Internal(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinueScriptPlayMapMusic) +static void PlaySlotMachine_Internal(u8 slotMachineIndex, MainCallback cb) { - struct Task *task = gTasks + CreateTask(SlotMachineDummyTask, 0xFF); + struct Task *task = &gTasks[CreateTask(SlotMachineDummyTask, 0xFF)]; task->data[0] = slotMachineIndex; - StoreWordInTwoHalfwords(task->data + 1, (intptr_t)CB2_ReturnToFieldContinueScriptPlayMapMusic); + StoreWordInTwoHalfwords(task->data + 1, (intptr_t)cb); } -/*static */void sub_81019EC(void) +static void sub_81019EC(void) { - struct Task *task = gTasks + FindTaskIdByFunc(SlotMachineDummyTask); + struct Task *task = &gTasks[FindTaskIdByFunc(SlotMachineDummyTask)]; sSlotMachine->machineId = task->data[0]; LoadWordFromTwoHalfwords((u16 *)(task->data + 1), (u32 *)&sSlotMachine->prevMainCb); } -/*static */void SlotMachineDummyTask(u8 taskId) +static void SlotMachineDummyTask(u8 taskId) { } -/*static */void SlotMachineSetup_0_0(void) +static void SlotMachineSetup_0_0(void) { SetVBlankCallback(NULL); SetHBlankCallback(NULL); @@ -793,24 +793,24 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue DeactivateAllTextPrinters(); } -/*static */void SlotMachineSetup_6_0(void) +static void SlotMachineSetup_6_0(void) { SetVBlankCallback(SlotMachine_VBlankCallback); EnableInterrupts(INTR_FLAG_VBLANK); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON); } -/*static */void SlotMachineSetup_1_0(void) +static void SlotMachineSetup_1_0(void) { DmaClearLarge16(3, (u16 *)(BG_VRAM), BG_VRAM_SIZE, 0x1000); } -/*static */void SlotMachineSetup_2_0(void) +static void SlotMachineSetup_2_0(void) { DmaClear16(3, (u16 *)OAM, OAM_SIZE); } -/*static */void SlotMachineSetup_2_1(void) +static void SlotMachineSetup_2_1(void) { SetGpuReg(REG_OFFSET_BG0CNT, 0); SetGpuReg(REG_OFFSET_BG1CNT, 0); @@ -831,12 +831,12 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue } // set up initial state of slot machine -/*static */void SlotMachineSetup_0_1(void) +static void SlotMachineSetup_0_1(void) { u8 i; - sub_81019EC(); // assigns sSlotMachine->machineId and other stuff - sSlotMachine->slotActionPtr = 0; + sub_81019EC(); // assigns sSlotMachine->machineId, etc. + sSlotMachine->state = 0; sSlotMachine->pikaPower = 0; sSlotMachine->luckyGame = Random() & 1; sSlotMachine->luckyFlags = 0; @@ -855,18 +855,17 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue sSlotMachine->winOut = 0x3f; sSlotMachine->backupMapMusic = GetCurrentMapMusic(); - // for each reel... - for (i = 0; i < 3; i++) + for (i = 0; i < NUM_REELS; i++) { sSlotMachine->reelPixelOffsetsWhileStopping[i] = 0; sSlotMachine->reelTagOffsets[i] = sInitialReelPositions[i][sSlotMachine->luckyGame] % REEL_NUM_TAGS; - sSlotMachine->reelPixelOffsets[i] = 0x1f8 - sSlotMachine->reelTagOffsets[i] * 24; - sSlotMachine->reelPixelOffsets[i] %= 0x1f8; // 0x1f8 is 540 + sSlotMachine->reelPixelOffsets[i] = REEL_NUM_TAGS * REEL_TAG_HEIGHT - sSlotMachine->reelTagOffsets[i] * REEL_TAG_HEIGHT; + sSlotMachine->reelPixelOffsets[i] %= REEL_NUM_TAGS * REEL_TAG_HEIGHT; } - AlertTVThatYouPlayedSlotMachine(GetCoins()); + AlertTVThatPlayerPlayedSlotMachine(GetCoins()); } -/*static */void SlotMachineSetup_3_0(void) +static void SlotMachineSetup_3_0(void) { ResetPaletteFade(); ResetSpriteData(); @@ -875,7 +874,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue ResetTasks(); } -/*static */void SlotMachineSetup_4_0(void) +static void SlotMachineSetup_4_0(void) { selectedPikaPowerTile = Alloc(8); gUnknown_0203AAD0 = AllocZeroed(0xE); @@ -891,7 +890,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue gUnknown_0203AAD0[6] = 0x20BF; } -/*static */void SlotMachineSetup_5_0(void) +static void SlotMachineSetup_5_0(void) { sub_8106448(); sub_81064B8(); @@ -901,7 +900,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue PutWindowTilemap(0); } -/*static */void SlotMachineSetup_10_0(void) +static void SlotMachineSetup_10_0(void) { sub_8104EA8(); sub_8104F8C(); @@ -910,84 +909,84 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue } // create gameplay tasks -/*static */void SlotMachineSetupGameplayTasks(void) +static void SlotMachineSetupGameplayTasks(void) { - GameplayTasks_PikaPower(); + GameplayTask_PikaPower(); GameplayTask_StopSlotReel(); sub_8104C5C(); GameplayTasks_Slots(); } -/*static */void GameplayTasks_Slots(void) +static void GameplayTasks_Slots(void) { RunSlotActions(CreateTask(RunSlotActions, 0)); } // task->data[0] is a timer -/*static */void RunSlotActions(u8 taskId) +static void RunSlotActions(u8 taskId) { - while (SlotActions[sSlotMachine->slotActionPtr](gTasks + taskId)) + while (SlotActions[sSlotMachine->state](&gTasks[taskId])) ; } -/*static */bool8 SlotAction_UnfadeScreen(struct Task *task) +static bool8 SlotAction_UnfadeScreen(struct Task *task) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); sub_810423C(sSlotMachine->pikaPower); - sSlotMachine->slotActionPtr++; + sSlotMachine->state++; return FALSE; } -/*static */bool8 SlotAction_WaitForUnfade(struct Task *task) +static bool8 SlotAction_WaitForUnfade(struct Task *task) { if (!gPaletteFade.active) - sSlotMachine->slotActionPtr++; + sSlotMachine->state++; return FALSE; } -/*static */bool8 SlotAction_SetSlotMachineVars(struct Task *task) +static bool8 SlotAction_SetSlotMachineVars(struct Task *task) { sSlotMachine->payout = 0; sSlotMachine->bet = 0; sSlotMachine->currReel = 0; sSlotMachine->luckyFlags &= (LUCKY_BIAS_777 | LUCKY_BIAS_MIXED_777); - sSlotMachine->slotActionPtr = 4; + sSlotMachine->state = 4; if (sSlotMachine->coins <= 0) { - sSlotMachine->slotActionPtr = 25; + sSlotMachine->state = 25; } else if (sSlotMachine->fairRollsLeft) { - sSlotMachine->slotActionPtr = 3; + sSlotMachine->state = 3; sub_8104CAC(4); } return TRUE; } -/*static */bool8 SlotAction3(struct Task *task) +static bool8 SlotAction3(struct Task *task) { if (sub_8104E18()) - sSlotMachine->slotActionPtr = 4; + sSlotMachine->state = 4; return FALSE; } -/*static */bool8 SlotAction4(struct Task *task) +static bool8 SlotAction4(struct Task *task) { sub_8104CAC(0); - sSlotMachine->slotActionPtr = 5; + sSlotMachine->state = 5; if (sSlotMachine->coins >= 9999) - sSlotMachine->slotActionPtr = 23; + sSlotMachine->state = 23; return TRUE; } -/*static */bool8 SlotAction_AwaitPlayerInput(struct Task *task) +static bool8 SlotAction_AwaitPlayerInput(struct Task *task) { s16 i; if (gMain.newKeys & SELECT_BUTTON) { OpenInfoBox(0); - sSlotMachine->slotActionPtr = 8; + sSlotMachine->state = 8; } else if (gMain.newKeys & R_BUTTON) // bet the max amount { @@ -997,12 +996,12 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue LoadBetTiles(i); sSlotMachine->coins -= (3 - sSlotMachine->bet); sSlotMachine->bet = 3; - sSlotMachine->slotActionPtr = 9; + sSlotMachine->state = 9; PlaySE(SE_REGI); } else // you didn't have enough coins to bet the max { - sSlotMachine->slotActionPtr = 6; + sSlotMachine->state = 6; } } else @@ -1016,42 +1015,42 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue } // player maxed out or finished betting if (sSlotMachine->bet >= 3 || (sSlotMachine->bet != 0 && gMain.newKeys & A_BUTTON)) - sSlotMachine->slotActionPtr = 9; + sSlotMachine->state = 9; // player wants to quit if (gMain.newKeys & B_BUTTON) - sSlotMachine->slotActionPtr = 21; + sSlotMachine->state = 21; } return FALSE; } -/*static */bool8 SlotAction_PrintYouDontHaveThreeCoins(struct Task *task) +static bool8 SlotAction_PrintYouDontHaveThreeCoins(struct Task *task) { NewMenuHelpers_DrawDialogueFrame(0, 0); AddTextPrinterParameterized(0, 1, gText_YouDontHaveThreeCoins, 0, 1, 0, 0); CopyWindowToVram(0, 3); - sSlotMachine->slotActionPtr = 7; + sSlotMachine->state = 7; return FALSE; } -/*static */bool8 SlotAction_ExitYouDontHaveThreeCoinsMessage(struct Task *task) +static bool8 SlotAction_ExitYouDontHaveThreeCoinsMessage(struct Task *task) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { sub_8197434(0, TRUE); - sSlotMachine->slotActionPtr = 5; + sSlotMachine->state = 5; } return FALSE; } -/*static */bool8 SlotAction_GivingInformation(struct Task *task) +static bool8 SlotAction_GivingInformation(struct Task *task) { if (IsInfoBoxClosed()) - sSlotMachine->slotActionPtr = 5; + sSlotMachine->state = 5; return FALSE; } // probably make all the slots roll -/*static */bool8 SlotAction9(struct Task *task) +static bool8 SlotAction9(struct Task *task) { DrawLuckyFlags(); sub_8104DA4(); @@ -1066,64 +1065,62 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue task->data[0] = 0; if (sSlotMachine->luckyFlags & LUCKY_BIAS_REELTIME) { - // enter into reel time BeginReeltime(); - sSlotMachine->slotActionPtr = 10; + sSlotMachine->state = 10; } else { sub_8104CAC(1); - sSlotMachine->slotActionPtr = 11; + sSlotMachine->state = 11; } sSlotMachine->reelIncrement = 8; if (sSlotMachine->fairRollsLeft) - // slow down the reel speed if you're really losing - sSlotMachine->reelIncrement = DrawNewReelIncrement(); + sSlotMachine->reelIncrement = SlowReelSpeed(); return FALSE; } -/*static */bool8 SlotAction10(struct Task *task) +static bool8 SlotAction10(struct Task *task) { if (IsFinalTask_RunReelTimeActions()) { sub_8104CAC(1); sSlotMachine->luckyFlags &= ~LUCKY_BIAS_REELTIME; - sSlotMachine->slotActionPtr = 11; + sSlotMachine->state = 11; } return FALSE; } -/*static */bool8 SlotAction_SetLuckySpins(struct Task *task) +static bool8 SlotAction_SetLuckySpins(struct Task *task) { if (++task->data[0] >= 30) { SetLuckySpins(); - sSlotMachine->slotActionPtr = 12; + sSlotMachine->state = 12; } return FALSE; } -/*static */bool8 SlotAction_AwaitReelStop(struct Task *task) +static bool8 SlotAction_AwaitReelStop(struct Task *task) { if (gMain.newKeys & A_BUTTON) { PlaySE(SE_JYUNI); sub_8102E1C(sSlotMachine->currReel); sub_8103C14(sSlotMachine->currReel); - sSlotMachine->slotActionPtr = 13; + sSlotMachine->state = 13; } return FALSE; } -/*static */bool8 SlotAction_WaitForAllReelsToStop(struct Task *task) +static bool8 SlotAction_WaitForAllReelsToStop(struct Task *task) { if (!IsSlotReelMoving(sSlotMachine->currReel)) { sSlotMachine->currReel++; - sSlotMachine->slotActionPtr = 12; + sSlotMachine->state = 12; if (sSlotMachine->currReel > 2) { - sSlotMachine->slotActionPtr = 14; + sSlotMachine->state = 14; } return TRUE; } @@ -1131,7 +1128,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue } // once all reels have stopped -/*static */bool8 SlotAction_CheckMatches(struct Task *task) +static bool8 SlotAction_CheckMatches(struct Task *task) { sSlotMachine->luckyFlags &= (LUCKY_BIAS_777 | LUCKY_BIAS_MIXED_777); CheckMatch(); @@ -1143,7 +1140,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue if (sSlotMachine->matchedSymbols) { - sSlotMachine->slotActionPtr = 15; + sSlotMachine->state = 15; AwardPayout(); sub_8103F70(); if ((sSlotMachine->netCoinLoss -= sSlotMachine->payout) < 0) @@ -1175,7 +1172,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue sSlotMachine->fairRollsUsed = 0; sSlotMachine->luckyGame = 0; if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_777_BLUE)) - // this may be a bug, but if you get blue 777, the game becomes lucky + // this may be an error, but if you get blue 777, the game becomes lucky sSlotMachine->luckyGame = 1; } } @@ -1188,104 +1185,104 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue else { sub_8104CAC(3); - sSlotMachine->slotActionPtr = 20; + sSlotMachine->state = 20; if ((sSlotMachine->netCoinLoss += sSlotMachine->bet) > 9999) sSlotMachine->netCoinLoss = 9999; } return FALSE; } -/*static */bool8 SlotAction_WaitForPayoutToBeAwarded(struct Task *task) +static bool8 SlotAction_WaitForPayoutToBeAwarded(struct Task *task) { if (IsFinalTask_RunAwardPayoutActions()) - sSlotMachine->slotActionPtr = 16; + sSlotMachine->state = 16; return FALSE; } -/*static */bool8 SlotAction_EndOfRoll(struct Task *task) +static bool8 SlotAction_EndOfRoll(struct Task *task) { if (sub_8103FA0()) { - sSlotMachine->slotActionPtr = 19; + sSlotMachine->state = 19; if (sSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_RED) | (1 << SLOT_MACHINE_MATCHED_777_BLUE))) IncrementGameStat(GAME_STAT_SLOT_JACKPOTS); if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_REPLAY)) { sSlotMachine->currReel = 0; - sSlotMachine->slotActionPtr = 9; + sSlotMachine->state = 9; } if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_POWER)) - sSlotMachine->slotActionPtr = 17; + sSlotMachine->state = 17; if (sSlotMachine->fairRollsLeft && sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_REPLAY)) { sub_8104CAC(4); - sSlotMachine->slotActionPtr = 18; + sSlotMachine->state = 18; } } return FALSE; } -/*static */bool8 SlotAction_MatchedPower(struct Task *task) +static bool8 SlotAction_MatchedPower(struct Task *task) { if (!sub_81040C8()) { - sSlotMachine->slotActionPtr = 19; + sSlotMachine->state = 19; if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_REPLAY)) { - sSlotMachine->slotActionPtr = 9; + sSlotMachine->state = 9; if (sSlotMachine->fairRollsLeft) { sub_8104CAC(4); - sSlotMachine->slotActionPtr = 18; + sSlotMachine->state = 18; } } } return FALSE; } -/*static */bool8 SlotAction18(struct Task *task) +static bool8 SlotAction18(struct Task *task) { if (sub_8104E18()) { - sSlotMachine->slotActionPtr = 19; + sSlotMachine->state = 19; if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_REPLAY)) { - sSlotMachine->slotActionPtr = 9; + sSlotMachine->state = 9; } } return FALSE; } -/*static */bool8 SlotAction_Loop(struct Task *task) +static bool8 SlotAction_Loop(struct Task *task) { sub_8103D8C(0); sub_8103D8C(1); sub_8103D8C(2); - sSlotMachine->slotActionPtr = 2; + sSlotMachine->state = 2; return FALSE; } -/*static */bool8 SlotAction_NoMatches(struct Task *task) +static bool8 SlotAction_NoMatches(struct Task *task) { if (++task->data[1] > 64) { task->data[1] = 0; - sSlotMachine->slotActionPtr = 19; + sSlotMachine->state = 19; } return FALSE; } -/*static */bool8 SlotAction_PrintQuitTheGame(struct Task *task) +static bool8 SlotAction_PrintQuitTheGame(struct Task *task) { NewMenuHelpers_DrawDialogueFrame(0, 0); AddTextPrinterParameterized(0, 1, gText_QuitTheGame, 0, 1, 0, 0); CopyWindowToVram(0, 3); CreateYesNoMenuParameterized(0x15, 7, 0x214, 0x180, 0xE, 0xF); - sSlotMachine->slotActionPtr = 22; + sSlotMachine->state = 22; return FALSE; } -/*static */bool8 SlotAction_SeeIfPlayerQuits(struct Task *task) +static bool8 SlotAction_SeeIfPlayerQuits(struct Task *task) { s8 input = Menu_ProcessInputNoWrapClearOnChoose(); if (input == 0) // player chooses to quit @@ -1295,64 +1292,64 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue sub_8103D8C(1); sub_8103D8C(2); sSlotMachine->coins += sSlotMachine->bet; - sSlotMachine->slotActionPtr = 27; + sSlotMachine->state = 27; } else if (input == 1 || input == -1) // player chooses not to quit { sub_8197434(0, TRUE); - sSlotMachine->slotActionPtr = 5; + sSlotMachine->state = 5; } return FALSE; } -/*static */bool8 SlotAction_Print9999CoinMessage(struct Task *task) +static bool8 SlotAction_PrintMessage_9999Coins(struct Task *task) { NewMenuHelpers_DrawDialogueFrame(0, 0); AddTextPrinterParameterized(0, 1, gText_YouveGot9999Coins, 0, 1, 0, 0); CopyWindowToVram(0, 3); - sSlotMachine->slotActionPtr = 24; + sSlotMachine->state = 24; return FALSE; } -/*static */bool8 SlotAction_Exit9999CoinMessage(struct Task *task) +static bool8 SlotAction_ExitMessage_9999Coins(struct Task *task) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { sub_8197434(0, TRUE); - sSlotMachine->slotActionPtr = 5; + sSlotMachine->state = 5; } return FALSE; } -/*static */bool8 SlotAction_PrintNoMoreCoins(struct Task *task) +static bool8 SlotAction_PrintMessage_NoMoreCoins(struct Task *task) { NewMenuHelpers_DrawDialogueFrame(0, 0); AddTextPrinterParameterized(0, 1, gText_YouveRunOutOfCoins, 0, 1, 0, 0); CopyWindowToVram(0, 3); - sSlotMachine->slotActionPtr = 26; + sSlotMachine->state = 26; return FALSE; } -/*static */bool8 SlotAction_ExitNoMoreCoinsMessage(struct Task *task) +static bool8 SlotAction_ExitMessage_NoMoreCoins(struct Task *task) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { sub_8197434(0, TRUE); - sSlotMachine->slotActionPtr = 27; + sSlotMachine->state = 27; } return FALSE; } -/*static */bool8 SlotAction_EndGame(struct Task *task) +static bool8 SlotAction_EndGame(struct Task *task) { SetCoins(sSlotMachine->coins); - reportNewCoinTotal(GetCoins()); + AlertTVOfNewCointTotal(GetCoins()); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); - sSlotMachine->slotActionPtr++; + sSlotMachine->state++; return FALSE; } -/*static */bool8 SlotAction_FreeDataStructures(struct Task *task) +static bool8 SlotAction_FreeDataStructures(struct Task *task) { if (!gPaletteFade.active) { @@ -1394,7 +1391,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return FALSE; } -/*static */void DrawLuckyFlags(void) +static void DrawLuckyFlags(void) { u8 attempts; @@ -1425,27 +1422,27 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue } } -/*static */void SetLuckySpins(void) +static void SetLuckySpins(void) { sSlotMachine->luckySpinsLeft = 0; if (sSlotMachine->luckyFlags) sSlotMachine->luckySpinsLeft = 1; } -/*static */u8 GetLuckyTag(u8 luckyFlags) +static u8 GetBiasTag(u8 luckyFlags) { u8 i; for (i = 0; i < 8; i++) { if (luckyFlags & 1) - return LuckyTags[i]; + return BiasTags[i]; luckyFlags >>= 1; } return 0; } -/*static */bool8 IsThisRoundLucky(void) +static bool8 IsThisRoundLucky(void) { u8 rval = Random(); if (LuckyRoundTable[sSlotMachine->machineId][sSlotMachine->bet - 1] > rval) @@ -1453,7 +1450,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return FALSE; } -/*static */u8 AttemptsAtLuckyflags_Top3(void) +static u8 AttemptsAtLuckyflags_Top3(void) { s16 count; @@ -1467,7 +1464,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return count; } -/*static */u8 AttemptsAtLuckyflags_NotTop3(void) +static u8 AttemptsAtLuckyflags_NotTop3(void) { s16 count; @@ -1495,7 +1492,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return count; } -/*static */u8 GetReelTimeProbability(u8 reelTimeDraw) +static u8 GetReelTimeProbability(u8 reelTimeDraw) { if (sSlotMachine->luckyGame == 0) return ReelTimeProbabilityTable_UnluckyGame[reelTimeDraw][sSlotMachine->pikaPower]; @@ -1503,7 +1500,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return ReelTimeProbabilityTable_LuckyGame[reelTimeDraw][sSlotMachine->pikaPower]; } -/*static */void GetReeltimeDraw(void) +static void GetReeltimeDraw(void) { u8 rval; s16 reelTimeDraw; @@ -1521,7 +1518,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue sSlotMachine->reelTimeDraw = reelTimeDraw; } -/*static */bool8 SkipToReeltimeAction14(u16 i) +static bool8 SkipToReeltimeAction14(u16 i) { u16 rval = Random() & 0xff; if (rval < ProbabilityTable_SkipToReeltimeAction14[i]) @@ -1530,7 +1527,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return FALSE; } -/*static */u16 DrawNewReelIncrement(void) +static u16 SlowReelSpeed(void) { u8 i = 0; u8 rval; @@ -1554,7 +1551,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return 8; } -/*static */void CheckMatch(void) +static void CheckMatch(void) { sSlotMachine->matchedSymbols = 0; CheckMatch_CenterRow(); @@ -1564,7 +1561,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue CheckMatch_Diagonals(); } -/*static */void CheckMatch_CenterRow(void) +static void CheckMatch_CenterRow(void) { u8 c1, c2, c3, match; @@ -1580,7 +1577,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue } } -/*static */void CheckMatch_TopAndBottom(void) +static void CheckMatch_TopAndBottom(void) { u8 c1, c2, c3, match; @@ -1610,7 +1607,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue } } -/*static */void CheckMatch_Diagonals(void) +static void CheckMatch_Diagonals(void) { u8 c1, c2, c3, match; @@ -1642,7 +1639,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue } } -/*static */u8 GetMatchFromSymbolsInRow(u8 c1, u8 c2, u8 c3) +static u8 GetMatchFromSymbolsInRow(u8 c1, u8 c2, u8 c3) { if (c1 == c2 && c1 == c3) return sSym2Match[c1]; @@ -1655,12 +1652,12 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return SLOT_MACHINE_MATCHED_NONE; } -/*static */void AwardPayout(void) +static void AwardPayout(void) { RunAwardPayoutActions(CreateTask(RunAwardPayoutActions, 4)); } -/*static */bool8 IsFinalTask_RunAwardPayoutActions(void) +static bool8 IsFinalTask_RunAwardPayoutActions(void) { if (FindTaskIdByFunc(RunAwardPayoutActions) == TAIL_SENTINEL) return TRUE; @@ -1668,13 +1665,13 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return FALSE; } -/*static */void RunAwardPayoutActions(u8 taskId) +static void RunAwardPayoutActions(u8 taskId) { - while (AwardPayoutActions[gTasks[taskId].data[0]](gTasks + taskId)) + while (AwardPayoutActions[gTasks[taskId].data[0]](&gTasks[taskId])) ; } -/*static */bool8 AwardPayoutAction0(struct Task *task) +static bool8 AwardPayoutAction0(struct Task *task) { if (sub_8103E38()) { @@ -1688,7 +1685,7 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return FALSE; } // task->data[1]: timer -/*static */bool8 AwardPayoutAction_GivePayoutToPlayer(struct Task *task) +static bool8 AwardPayoutAction_GivePayoutToPlayer(struct Task *task) { if (!task->data[1]--) { @@ -1714,17 +1711,16 @@ void PlaySlotMachine(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinue return FALSE; } -/*static */bool8 AwardPayoutAction_FreeTask(struct Task *task) +static bool8 AwardPayoutAction_FreeTask(struct Task *task) { if (sub_8103E7C()) DestroyTask(FindTaskIdByFunc(RunAwardPayoutActions)); return FALSE; } -/* -Returns the tag that is posOffset below the tag at the top of reelIndex's tape -*/ -/*static */u8 GetNearbyTag_Quantized(u8 reelIndex, s16 posOffset) + +// Returns the tag that is posOffset below the tag at the top of reelIndex's tape +static u8 GetNearbyTag_Quantized(u8 reelIndex, s16 posOffset) { s16 tagIndex = (sSlotMachine->reelTagOffsets[reelIndex] + posOffset) % REEL_NUM_TAGS; if (tagIndex < 0) @@ -1732,10 +1728,9 @@ Returns the tag that is posOffset below the tag at the top of reelIndex's tape return sReelSymbols[reelIndex][tagIndex]; } -/* -Calculates GetNearbyTag_Quantized as if the reel was snapped downwards into place -/* -/*static */u8 GetNearbyTag(u8 reelIndex, s16 posOffset) + +// Calculates GetNearbyTag_Quantized as if the reel was snapped downwards into place +static u8 GetNearbyTag(u8 reelIndex, s16 posOffset) { s16 tagOffset = 0; s16 result = sSlotMachine->reelPixelOffsets[reelIndex] % 24; @@ -1744,7 +1739,7 @@ Calculates GetNearbyTag_Quantized as if the reel was snapped downwards into plac return GetNearbyTag_Quantized(reelIndex, posOffset + tagOffset); } -/*static */u8 GetNearbyReelTimeTag(s16 n) +static u8 GetNearbyReelTimeTag(s16 n) { s16 newPosition = (sSlotMachine->reeltimePosition + n) % 6; if (newPosition < 0) @@ -1752,7 +1747,7 @@ Calculates GetNearbyTag_Quantized as if the reel was snapped downwards into plac return ReelTimeTags[newPosition]; } -/*static */void AdvanceSlotReel(u8 reelIndex, s16 value) +static void AdvanceSlotReel(u8 reelIndex, s16 value) { sSlotMachine->reelPixelOffsets[reelIndex] += value; sSlotMachine->reelPixelOffsets[reelIndex] %= 504; @@ -1772,7 +1767,7 @@ s16 AdvanceSlotReelToNextTag(u8 reelIndex, s16 value) return offset; } -/*static */void AdvanceReeltimeReel(s16 value) +static void AdvanceReeltimeReel(s16 value) { sSlotMachine->reeltimePixelOffset += value; sSlotMachine->reeltimePixelOffset %= 120; @@ -1792,7 +1787,7 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) return offset; } -/*static */void GameplayTask_StopSlotReel(void) +static void GameplayTask_StopSlotReel(void) { u8 i; for (i = 0; i < 3; i++) @@ -1804,43 +1799,43 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) } } -/*static */void ReelTasks_SetUnkTaskData(u8 reelIndex) +static void ReelTasks_SetUnkTaskData(u8 reelIndex) { gTasks[sSlotMachine->slotReelTasks[reelIndex]].data[0] = 1; gTasks[sSlotMachine->slotReelTasks[reelIndex]].data[14] = 1; } -/*static */void sub_8102E1C(u8 reelIndex) +static void sub_8102E1C(u8 reelIndex) { gTasks[sSlotMachine->slotReelTasks[reelIndex]].data[0] = 2; } -/*static */bool8 IsSlotReelMoving(u8 reelIndex) +static bool8 IsSlotReelMoving(u8 reelIndex) { return gTasks[sSlotMachine->slotReelTasks[reelIndex]].data[14]; } -/*static */void RunSlotReelActions(u8 taskId) +static void RunSlotReelActions(u8 taskId) { - while (SlotReelActions[gTasks[taskId].data[0]](gTasks + taskId)) + while (SlotReelActions[gTasks[taskId].data[0]](&gTasks[taskId])) ; } // task->data[1] reel turns // task->data[15] reelIndex -/*static */bool8 SlotReelAction_StayStill(struct Task *task) +static bool8 SlotReelAction_StayStill(struct Task *task) { return FALSE; } -/*static */bool8 SlotReelAction_Spin(struct Task *task) +static bool8 SlotReelAction_Spin(struct Task *task) { AdvanceSlotReel(task->data[15], sSlotMachine->reelIncrement); return FALSE; } // As in previous generations, the slot machine often doesn't stop exactly when you press stop -/*static */bool8 SlotReelAction_DecideWhereToStop(struct Task *task) +static bool8 SlotReelAction_DecideWhereToStop(struct Task *task) { task->data[0]++; // initialize data for that reel --> these will be changed if biasTags can be lined up @@ -1857,7 +1852,7 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) } // go to next tag and then do any additional turns -/*static */bool8 SlotReelAction_MoveToStop(struct Task *task) +static bool8 SlotReelAction_MoveToStop(struct Task *task) { u16 reelStopShocks[ARRAY_COUNT(ReelStopShocks)]; s16 reelPixelPos; @@ -1882,7 +1877,7 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) } // make selected tag oscillate before it becomes still -/*static */bool8 SlotReelAction_OscillatingStop(struct Task *task) +static bool8 SlotReelAction_OscillatingStop(struct Task *task) { sSlotMachine->reelPixelOffsetsWhileStopping[task->data[15]] = task->data[1]; task->data[1] = -task->data[1]; @@ -1898,9 +1893,9 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) return FALSE; } -/*static */bool8 DecideReelTurns_BiasTag_Reel1(void) +static bool8 DecideReelTurns_BiasTag_Reel1(void) { - u8 tag2 = GetLuckyTag(sSlotMachine->luckyFlags); + u8 tag2 = GetBiasTag(sSlotMachine->luckyFlags); u8 tag1 = tag2; if (sSlotMachine->luckyFlags & (LUCKY_BIAS_777 | LUCKY_BIAS_MIXED_777)) { @@ -1910,7 +1905,7 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) return DecideReelTurns_BiasTag_Reel1_Bets[sSlotMachine->bet - 1](tag1, tag2); } -/*static */bool8 AreTagsAtPosition_Reel1(s16 pos, u8 tag1, u8 tag2) +static bool8 AreTagsAtPosition_Reel1(s16 pos, u8 tag1, u8 tag2) { u8 tag = GetNearbyTag(0, pos); if (tag == tag1 || tag == tag2) @@ -1921,7 +1916,7 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) return FALSE; } -/*static */bool8 AreCherriesOnScreen_Reel1(s16 offsetFromCenter) +static bool8 AreCherriesOnScreen_Reel1(s16 offsetFromCenter) { if (GetNearbyTag(0, 1 - offsetFromCenter) == SLOT_MACHINE_TAG_CHERRY || GetNearbyTag(0, 2 - offsetFromCenter) == SLOT_MACHINE_TAG_CHERRY || GetNearbyTag(0, 3 - offsetFromCenter) == SLOT_MACHINE_TAG_CHERRY) return TRUE; @@ -1929,7 +1924,7 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) return FALSE; } -/*static */bool8 IsBiasTowardsCherryOr7s(void) +static bool8 IsBiasTowardsCherryOr7s(void) { if (sSlotMachine->luckyFlags & (LUCKY_BIAS_777 | LUCKY_BIAS_MIXED_777 | LUCKY_BIAS_CHERRY)) return TRUE; @@ -1937,7 +1932,7 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) return FALSE; } -/*static */bool8 DecideReelTurns_BiasTag_Reel1_Bet1(u8 tag1, u8 tag2) +static bool8 DecideReelTurns_BiasTag_Reel1_Bet1(u8 tag1, u8 tag2) { s16 i; @@ -1954,7 +1949,7 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) return FALSE; } -/*static */bool8 DecideReelTurns_BiasTag_Reel1_Bet2or3(u8 tag1, u8 tag2) +static bool8 DecideReelTurns_BiasTag_Reel1_Bet2or3(u8 tag1, u8 tag2) { s16 i; bool8 biased = IsBiasTowardsCherryOr7s(); @@ -2005,12 +2000,12 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) return FALSE; } -/*static */bool8 DecideReelTurns_BiasTag_Reel2(void) +static bool8 DecideReelTurns_BiasTag_Reel2(void) { return DecideReelTurns_BiasTag_Reel2_Bets[sSlotMachine->bet - 1](); } -/*static */bool8 DecideReelTurns_BiasTag_Reel2_Bet1or2(void) +static bool8 DecideReelTurns_BiasTag_Reel2_Bet1or2(void) { s16 i; s16 biasTagLocation_Reel1 = sSlotMachine->winnerRows[0]; @@ -2028,7 +2023,7 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) return FALSE; } -/*static */bool8 DecideReelTurns_BiasTag_Reel2_Bet3(void) +static bool8 DecideReelTurns_BiasTag_Reel2_Bet3(void) { s16 i; // if biasTag appears in the same row within 4 turns... @@ -2067,7 +2062,7 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) return FALSE; } -/*static */bool8 DecideReelTurns_BiasTag_Reel3(void) +static bool8 DecideReelTurns_BiasTag_Reel3(void) { u8 biasTag = sSlotMachine->biasTag; if (sSlotMachine->luckyFlags & LUCKY_BIAS_MIXED_777) @@ -2081,7 +2076,7 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) return DecideReelTurns_BiasTag_Reel3_Bets[sSlotMachine->bet - 1](biasTag); } -/*static */bool8 DecideReelTurns_BiasTag_Reel3_Bet1or2(u8 biasTag) +static bool8 DecideReelTurns_BiasTag_Reel3_Bet1or2(u8 biasTag) { s16 i; s16 biasTagLocation_Reel2 = sSlotMachine->winnerRows[1]; @@ -2099,7 +2094,7 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) return FALSE; } -/*static */bool8 DecideReelTurns_BiasTag_Reel3_Bet3(u8 biasTag) +static bool8 DecideReelTurns_BiasTag_Reel3_Bet3(u8 biasTag) { s16 i; s16 biasTagFinalPos; @@ -2125,10 +2120,9 @@ s16 AdvanceReeltimeReelToNextTag(s16 value) return FALSE; } -/* -Advance until there are no cherries on screen in reel 1 -*/ -/*static */void DecideReelTurns_NoBiasTag_Reel1(void) +// Advance until there are no cherries on screen in reel 1 + +static void DecideReelTurns_NoBiasTag_Reel1(void) { s16 i = 0; @@ -2137,7 +2131,7 @@ Advance until there are no cherries on screen in reel 1 sSlotMachine->reelExtraTurns[0] = i; } -/*static */bool8 IsBiasTag777_SwitchColor(u8 *biasTagPtr) +static bool8 IsBiasTag777_SwitchColor(u8 *biasTagPtr) { if (*biasTagPtr == SLOT_MACHINE_TAG_7_RED) { @@ -2152,13 +2146,13 @@ Advance until there are no cherries on screen in reel 1 return FALSE; } -/*static */void DecideReelTurns_NoBiasTag_Reel2(void) +static void DecideReelTurns_NoBiasTag_Reel2(void) { DecideReelTurns_NoBiasTag_Reel2_Bets[sSlotMachine->bet - 1](); } // only does stuff if the biasTag is one of the 7's, plus other conditions -/*static */void DecideReelTurns_NoBiasTag_Reel2_Bet1(void) +static void DecideReelTurns_NoBiasTag_Reel2_Bet1(void) { if (sSlotMachine->winnerRows[0] != 0 && sSlotMachine->luckyFlags & LUCKY_BIAS_777) { @@ -2182,7 +2176,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void DecideReelTurns_NoBiasTag_Reel2_Bet2(void) +static void DecideReelTurns_NoBiasTag_Reel2_Bet2(void) { if (sSlotMachine->winnerRows[0] != 0 && sSlotMachine->luckyFlags & LUCKY_BIAS_777) { @@ -2206,7 +2200,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void DecideReelTurns_NoBiasTag_Reel2_Bet3(void) +static void DecideReelTurns_NoBiasTag_Reel2_Bet3(void) { s16 i; s16 j; @@ -2275,7 +2269,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */bool8 AreTagsMixed77(u8 tag1, u8 tag2) +static bool8 AreTagsMixed77(u8 tag1, u8 tag2) { if ((tag1 == SLOT_MACHINE_TAG_7_RED && tag2 == SLOT_MACHINE_TAG_7_BLUE) || (tag1 == SLOT_MACHINE_TAG_7_BLUE && tag2 == SLOT_MACHINE_TAG_7_RED)) return TRUE; @@ -2283,7 +2277,7 @@ Advance until there are no cherries on screen in reel 1 return FALSE; } -/*static */bool8 AreTagsMixed777(u8 tag1, u8 tag2, u8 tag3) +static bool8 AreTagsMixed777(u8 tag1, u8 tag2, u8 tag3) { if ((tag1 == SLOT_MACHINE_TAG_7_RED && tag2 == SLOT_MACHINE_TAG_7_BLUE && tag3 == SLOT_MACHINE_TAG_7_RED) || (tag1 == SLOT_MACHINE_TAG_7_BLUE && tag2 == SLOT_MACHINE_TAG_7_RED && tag3 == SLOT_MACHINE_TAG_7_BLUE)) @@ -2292,7 +2286,7 @@ Advance until there are no cherries on screen in reel 1 return FALSE; } -/*static */bool8 TagsDontMatchOrHaveAny7s(u8 tag1, u8 tag2, u8 tag3) +static bool8 TagsDontMatchOrHaveAny7s(u8 tag1, u8 tag2, u8 tag3) { if ((tag1 == SLOT_MACHINE_TAG_7_RED && tag2 == SLOT_MACHINE_TAG_7_BLUE && tag3 == SLOT_MACHINE_TAG_7_RED) || (tag1 == SLOT_MACHINE_TAG_7_BLUE && tag2 == SLOT_MACHINE_TAG_7_RED && tag3 == SLOT_MACHINE_TAG_7_BLUE) || @@ -2305,12 +2299,12 @@ Advance until there are no cherries on screen in reel 1 return TRUE; } -/*static */void DecideReelTurns_NoBiasTag_Reel3(void) +static void DecideReelTurns_NoBiasTag_Reel3(void) { DecideReelTurns_NoBiasTag_Reel3_Bets[sSlotMachine->bet - 1](); } -/*static */void DecideReelTurns_NoBiasTag_Reel3_Bet1(void) +static void DecideReelTurns_NoBiasTag_Reel3_Bet1(void) { s16 i = 0; u8 tag1 = GetNearbyTag(0, 2 - sSlotMachine->reelExtraTurns[0]); @@ -2353,7 +2347,7 @@ Advance until there are no cherries on screen in reel 1 sSlotMachine->reelExtraTurns[2] = i; } -/*static */void DecideReelTurns_NoBiasTag_Reel3_Bet2(void) +static void DecideReelTurns_NoBiasTag_Reel3_Bet2(void) { s16 extraTurns = 0; s16 i; @@ -2403,7 +2397,7 @@ Advance until there are no cherries on screen in reel 1 sSlotMachine->reelExtraTurns[2] = extraTurns; } -/*static */void DecideReelTurns_NoBiasTag_Reel3_Bet3(void) +static void DecideReelTurns_NoBiasTag_Reel3_Bet3(void) { u8 tag1; u8 tag2; @@ -2453,62 +2447,62 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_8103C14(u8 a0) +static void sub_8103C14(u8 a0) { u8 taskId = CreateTask(sub_8103C48, 5); gTasks[taskId].data[15] = a0; sub_8103C48(taskId); } -/*static */void sub_8103C48(u8 taskId) +static void sub_8103C48(u8 taskId) { - gUnknown_083ECBA0[gTasks[taskId].data[0]](gTasks + taskId, taskId); + gUnknown_083ECBA0[gTasks[taskId].data[0]](&gTasks[taskId], taskId); } -/*static */void sub_8103C78(struct Task *task, u8 taskId) +static void sub_8103C78(struct Task *task, u8 taskId) { sub_81065A8(gUnknown_083ECBAC[task->data[15]], 0x62, 0x63, 0x72, 0x73); task->data[0]++; } -/*static */void sub_8103CAC(struct Task *task, u8 taskId) +static void sub_8103CAC(struct Task *task, u8 taskId) { if (++task->data[1] > 11) task->data[0]++; } -/*static */void sub_8103CC8(struct Task *task, u8 taskId) +static void sub_8103CC8(struct Task *task, u8 taskId) { sub_81065A8(gUnknown_083ECBAC[task->data[15]], 0x42, 0x43, 0x52, 0x53); DestroyTask(taskId); } -/*static */void LoadLightedTile(u8 tileId) +static void LoadLitTile(u8 tileId) { LoadPalette(gUnknown_083EDD08[tileId], gUnknown_083EDD30[tileId], 2); } -/*static */void sub_8103D28(u8 a0) +static void sub_8103D28(u8 a0) { LoadPalette(gUnknown_083EDD1C[a0], gUnknown_083EDD30[a0], 2); } // light up the value bet by the player -/*static */void LoadBetTiles(u8 betVal) +static void LoadBetTiles(u8 betVal) { u8 i; for (i = 0; i < gNumberBettingTiles[betVal]; i++) - LoadLightedTile(gBettingTilesId[betVal][i]); + LoadLitTile(gBettingTilesId[betVal][i]); } -/*static */void sub_8103D8C(u8 a0) +static void sub_8103D8C(u8 a0) { u8 i; for (i = 0; i < gNumberBettingTiles[a0]; i++) sub_8103D28(gBettingTilesId[a0][i]); } -/*static */void sub_8103DC8(void) +static void sub_8103DC8(void) { u8 i; for (i = 0; i < 5; i++) @@ -2519,7 +2513,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_8103E04(u8 a0) +static void sub_8103E04(u8 a0) { struct Sprite *sprite = gSprites + sSlotMachine->unk44[a0]; sprite->data[1] = 1; @@ -2531,7 +2525,7 @@ Advance until there are no cherries on screen in reel 1 } // something with payout digits -/*static */bool8 sub_8103E38(void) +static bool8 sub_8103E38(void) { u8 i; for (i = 0; i < 5; i++) @@ -2543,7 +2537,7 @@ Advance until there are no cherries on screen in reel 1 return TRUE; } -/*static */bool8 sub_8103E7C(void) +static bool8 sub_8103E7C(void) { u8 i; for (i = 0; i < 5; i++) @@ -2554,7 +2548,7 @@ Advance until there are no cherries on screen in reel 1 return TRUE; } -/*static */bool8 sub_8103EAC(u8 spriteId) +static bool8 sub_8103EAC(u8 spriteId) { struct Sprite *sprite = gSprites + spriteId; if (!sprite->data[1]) @@ -2564,7 +2558,7 @@ Advance until there are no cherries on screen in reel 1 return sprite->data[7]; } -/*static */void sub_8103EE4(struct Sprite *sprite) +static void sub_8103EE4(struct Sprite *sprite) { s16 r4; if (sprite->data[1]) @@ -2593,14 +2587,14 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_8103F70(void) +static void sub_8103F70(void) { u8 taskId = CreateTask(sub_8103FE8_, 6); gTasks[taskId].data[3] = 1; sub_8103FE8_(taskId); } -/*static */bool8 sub_8103FA0(void) +static bool8 sub_8103FA0(void) { u8 taskId = FindTaskIdByFunc(sub_8103FE8_); if (!gTasks[taskId].data[2]) @@ -2612,9 +2606,9 @@ Advance until there are no cherries on screen in reel 1 return FALSE; } -/*static */void sub_8103FE8_(u8 taskId) +static void sub_8103FE8_(u8 taskId) { - struct Task *task = gTasks + taskId; + struct Task *task = &gTasks[taskId]; if (!task->data[1]--) { task->data[1] = 4; @@ -2625,49 +2619,49 @@ Advance until there are no cherries on screen in reel 1 LoadPalette(gUnknown_083EDDA0[task->data[2]], 0x10, 0x20); } -/*static */void GameplayTasks_PikaPower(void) +static void GameplayTask_PikaPower(void) { sSlotMachine->unkTaskPointer3E = CreateTask(sub_81040E8, 8); } -/*static */void DisplayPikaPower(u8 pikaPower) +static void DisplayPikaPower(u8 pikaPower) { - struct Task *task = gTasks + sSlotMachine->unkTaskPointer3E; + struct Task *task = &gTasks[sSlotMachine->unkTaskPointer3E]; ClearTaskDataFields_2orHigher(task); task->data[0] = 1; task->data[1]++; task->data[15] = 1; // points to a reelIndex } -/*static */void sub_8104098(void) +static void sub_8104098(void) { - struct Task *task = gTasks + sSlotMachine->unkTaskPointer3E; + struct Task *task = &gTasks[sSlotMachine->unkTaskPointer3E]; ClearTaskDataFields_2orHigher(task); task->data[0] = 3; task->data[15] = 1; // points to a reelIndex } -/*static */bool8 sub_81040C8(void) +static bool8 sub_81040C8(void) { return gTasks[sSlotMachine->unkTaskPointer3E].data[15]; } -/*static */void sub_81040E8(u8 taskId) +static void sub_81040E8(u8 taskId) { - gUnknown_083ECBB4[gTasks[taskId].data[0]](gTasks + taskId); + gUnknown_083ECBB4[gTasks[taskId].data[0]](&gTasks[taskId]); } -/*static */void nullsub_68(struct Task *task) +static void nullsub_68(struct Task *task) { } -/*static */void sub_810411C(struct Task *task) +static void sub_810411C(struct Task *task) { task->data[2] = sub_8105B1C((task->data[1] << 3) + 20, 20); task->data[0]++; } -/*static */void sub_8104144(struct Task *task) +static void sub_8104144(struct Task *task) { if (gSprites[task->data[2]].data[7]) { @@ -2686,7 +2680,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_81041AC(struct Task *task) +static void sub_81041AC(struct Task *task) { s16 r5 = task->data[1] + 2; s16 r3 = 0; @@ -2710,7 +2704,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void ClearTaskDataFields_2orHigher(struct Task *task) +static void ClearTaskDataFields_2orHigher(struct Task *task) { u8 i; @@ -2719,7 +2713,7 @@ Advance until there are no cherries on screen in reel 1 } // possibly load tiles for pika power meter -/*static */void sub_810423C(u8 pikaPower) +static void sub_810423C(u8 pikaPower) { s16 i; s16 r3 = 0, r1 = 0; @@ -2747,29 +2741,29 @@ Advance until there are no cherries on screen in reel 1 gTasks[sSlotMachine->unkTaskPointer3E].data[1] = pikaPower; } -/*static */void BeginReeltime(void) +static void BeginReeltime(void) { u8 taskId = CreateTask(RunReeltimeActions, 7); RunReeltimeActions(taskId); } -/*static */bool8 IsFinalTask_RunReelTimeActions(void) +static bool8 IsFinalTask_RunReelTimeActions(void) { if (FindTaskIdByFunc(RunReeltimeActions) == TAIL_SENTINEL) return TRUE; return FALSE; } -/*static */void RunReeltimeActions(u8 taskId) +static void RunReeltimeActions(u8 taskId) { // task.data[0] points to which ReelTimeAction to do, and starts at 0 // task.data[1] has something to do with the threshold // task.data[4] says how many pixels to advance the reel // task.data[5] is a timer - ReeltimeActions[gTasks[taskId].data[0]](gTasks + taskId); + ReeltimeActions[gTasks[taskId].data[0]](&gTasks[taskId]); } -/*static */void ReeltimeAction0(struct Task *task) +static void ReeltimeAction0(struct Task *task) { sSlotMachine->fairRollsLeft = 0; sSlotMachine->reeltimePixelOffset = 0; @@ -2793,7 +2787,7 @@ Advance until there are no cherries on screen in reel 1 PlayNewMapMusic(MUS_BD_TIME); } -/*static */void ReeltimeAction1(struct Task *task) +static void ReeltimeAction1(struct Task *task) { s16 r3; gSpriteCoordOffsetX -= 8; @@ -2814,7 +2808,7 @@ Advance until there are no cherries on screen in reel 1 AdvanceReeltimeReel(task->data[4] >> 8); } -/*static */void ReeltimeAction2(struct Task *task) +static void ReeltimeAction2(struct Task *task) { AdvanceReeltimeReel(task->data[4] >> 8); if (++task->data[5] >= 60) @@ -2825,7 +2819,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void ReeltimeAction3(struct Task *task) +static void ReeltimeAction3(struct Task *task) { int r5; u8 sp0[ARRAY_COUNT(gUnknown_085A75C0)]; @@ -2852,7 +2846,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void ReeltimeAction4(struct Task *task) +static void ReeltimeAction4(struct Task *task) { AdvanceReeltimeReel(task->data[4] >> 8); if (++task->data[5] >= 80) @@ -2864,7 +2858,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void ReeltimeAction5(struct Task *task) +static void ReeltimeAction5(struct Task *task) { AdvanceReeltimeReel(task->data[4] >> 8); task->data[4] = (u8)task->data[4] + 0x80; @@ -2875,7 +2869,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void ReeltimeAction6(struct Task *task) +static void ReeltimeAction6(struct Task *task) { AdvanceReeltimeReel(task->data[4] >> 8); task->data[4] = (u8)task->data[4] + 0x40; @@ -2899,7 +2893,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void ReelTimeAction_LandOnOutcome(struct Task *task) +static void ReelTimeAction_LandOnOutcome(struct Task *task) { s16 reeltimePixelOffset = sSlotMachine->reeltimePixelOffset % 20; if (reeltimePixelOffset) @@ -2920,7 +2914,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void ReeltimeAction8(struct Task *task) +static void ReeltimeAction8(struct Task *task) { if (++task->data[4] >= 60) { @@ -2949,13 +2943,13 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void ReeltimeAction9(struct Task *task) +static void ReeltimeAction9(struct Task *task) { if ((task->data[4] == 0 || --task->data[4] == 0) && !sub_81040C8()) task->data[0]++; } -/*static */void ReeltimeAction10(struct Task *task) +static void ReeltimeAction10(struct Task *task) { s16 r4; gSpriteCoordOffsetX -= 8; @@ -2969,7 +2963,7 @@ Advance until there are no cherries on screen in reel 1 task->data[0]++; } -/*static */void ReeltimeAction11(struct Task *task) +static void ReeltimeAction11(struct Task *task) { sSlotMachine->fairRollsUsed = 0; sSlotMachine->fairRollsLeft = sSlotMachine->reelTimeDraw; @@ -2987,14 +2981,14 @@ Advance until there are no cherries on screen in reel 1 else { sub_8104CAC(4); - task->data[1] = DrawNewReelIncrement(); + task->data[1] = SlowReelSpeed(); task->data[2] = 0; task->data[3] = 0; task->data[0]++; } } -/*static */void ReeltimeAction12(struct Task *task) +static void ReeltimeAction12(struct Task *task) { if (sSlotMachine->reelIncrement == task->data[1]) task->data[0]++; @@ -3002,13 +2996,13 @@ Advance until there are no cherries on screen in reel 1 sSlotMachine->reelIncrement >>= 1; } -/*static */void ReeltimeAction13(struct Task *task) +static void ReeltimeAction13(struct Task *task) { if (sub_8104E18()) DestroyTask(FindTaskIdByFunc(RunReeltimeActions)); } -/*static */void ReeltimeAction14(struct Task *task) +static void ReeltimeAction14(struct Task *task) { sub_81054B8(); sub_81056C0(); @@ -3024,7 +3018,7 @@ Advance until there are no cherries on screen in reel 1 PlaySE(SE_W153); } -/*static */void ReeltimeAction15(struct Task *task) +static void ReeltimeAction15(struct Task *task) { gSpriteCoordOffsetY = task->data[4]; SetGpuReg(REG_OFFSET_BG1VOFS, task->data[4]); @@ -3044,7 +3038,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void ReeltimeAction16(struct Task *task) +static void ReeltimeAction16(struct Task *task) { gSpriteCoordOffsetY = 0; SetGpuReg(REG_OFFSET_BG1VOFS, 0); @@ -3055,7 +3049,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void ReeltimeAction17(struct Task *task) +static void ReeltimeAction17(struct Task *task) { gSpriteCoordOffsetX = 0; SetGpuReg(REG_OFFSET_BG1HOFS, 0); @@ -3067,7 +3061,7 @@ Advance until there are no cherries on screen in reel 1 DestroyTask(FindTaskIdByFunc(RunReeltimeActions)); } -/*static */void sub_8104A40(s16 a0, s16 a1) +static void sub_8104A40(s16 a0, s16 a1) { s16 i; @@ -3077,7 +3071,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_8104A88(s16 a0) +static void sub_8104A88(s16 a0) { u8 i; @@ -3087,14 +3081,14 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void OpenInfoBox(u8 seemsUnused) +static void OpenInfoBox(u8 seemsUnused) { u8 taskId = CreateTask(RunInfoBoxActions, 1); gTasks[taskId].data[1] = seemsUnused; RunInfoBoxActions(taskId); } -/*static */bool8 IsInfoBoxClosed(void) +static bool8 IsInfoBoxClosed(void) { if (FindTaskIdByFunc(RunInfoBoxActions) == 0xFF) return TRUE; @@ -3102,24 +3096,24 @@ Advance until there are no cherries on screen in reel 1 return FALSE; } -/*static */void RunInfoBoxActions(u8 taskId) +static void RunInfoBoxActions(u8 taskId) { - InfoBoxActions[gTasks[taskId].data[0]](gTasks + taskId); + InfoBoxActions[gTasks[taskId].data[0]](&gTasks[taskId]); } -/*static */void InfoBox_FadeIn(struct Task *task) +static void InfoBox_FadeIn(struct Task *task) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); task->data[0]++; } -/*static */void InfoBox_WaitForFade(struct Task *task) +static void InfoBox_WaitForFade(struct Task *task) { if (!gPaletteFade.active) task->data[0]++; } -/*static */void InfoBox_8104B80(struct Task *task) +static void InfoBox_8104B80(struct Task *task) { sub_8104DA4(); sub_81065DC(); @@ -3129,15 +3123,15 @@ Advance until there are no cherries on screen in reel 1 task->data[0]++; } -/*static */void InfoBox_AddText(struct Task *task) +static void InfoBox_AddText(struct Task *task) { - AddTextPrinterParameterized3(1, 1, 2, 5, gColors_ReelTimeHelp, 0, gText_ReelTimeHelp); + AddTextPrinterParameterized3(1, 1, 2, 5, gColors_ReeltimeHelp, 0, gText_ReelTimeHelp); CopyWindowToVram(1, 3); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); task->data[0]++; } -/*static */void InfoBox_AwaitPlayerInput(struct Task *task) +static void InfoBox_AwaitPlayerInput(struct Task *task) { if (gMain.newKeys & (B_BUTTON | SELECT_BUTTON)) { @@ -3150,52 +3144,52 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void InfoBox_812DE14(struct Task *task) +static void InfoBox_812DE14(struct Task *task) { sub_812F968(); ShowBg(3); task->data[0]++; } -/*static */void InfoBox_812DE30(struct Task *task) +static void InfoBox_812DE30(struct Task *task) { sub_8104CAC(task->data[1]); task->data[0]++; } -/*static */void InfoBox_8104BFC(struct Task *task) +static void InfoBox_8104BFC(struct Task *task) { sub_810423C(sSlotMachine->pikaPower); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); task->data[0]++; } -/*static */void InfoBox_FreeTask(struct Task *task) +static void InfoBox_FreeTask(struct Task *task) { DestroyTask(FindTaskIdByFunc(RunInfoBoxActions)); } -/*static */void sub_8104C5C(void) +static void sub_8104C5C(void) { u8 i; struct Task *task; i = CreateTask(sub_8104E74_, 3); sSlotMachine->unkTaskPointer3D = i; - task = gTasks + i; + task = &gTasks[i]; task->data[1] = -1; for (i = 4; i < 16; i++) task->data[i] = MAX_SPRITES; } // possibly initialize each wheel -/*static */void sub_8104CAC(u8 arg0) +static void sub_8104CAC(u8 arg0) { u8 i; struct Task *task; sub_8104DA4(); - task = gTasks + sSlotMachine->unkTaskPointer3D; + task = &gTasks[sSlotMachine->unkTaskPointer3D]; task->data[1] = arg0; for (i = 0; gUnknown_083ED048[arg0][i].unk00 != 0xFF; i++) @@ -3210,10 +3204,10 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_8104D30(u8 a0, SpriteCallback a1, s16 a2, s16 a3, s16 a4) +static void sub_8104D30(u8 a0, SpriteCallback a1, s16 a2, s16 a3, s16 a4) { u8 i; - struct Task *task = gTasks + sSlotMachine->unkTaskPointer3D; + struct Task *task = &gTasks[sSlotMachine->unkTaskPointer3D]; for (i = 4; i < 16; i++) { if (task->data[i] == MAX_SPRITES) @@ -3224,10 +3218,10 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_8104DA4(void) +static void sub_8104DA4(void) { u8 i; - struct Task *task = gTasks + sSlotMachine->unkTaskPointer3D; + struct Task *task = &gTasks[sSlotMachine->unkTaskPointer3D]; if ((u16)task->data[1] != 0xFFFF) gUnknown_083ED064[task->data[1]](); for (i = 4; i < 16; i++) @@ -3240,10 +3234,10 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */bool8 sub_8104E18(void) +static bool8 sub_8104E18(void) { u8 i; - struct Task *task = gTasks + sSlotMachine->unkTaskPointer3D; + struct Task *task = &gTasks[sSlotMachine->unkTaskPointer3D]; for (i = 4; i < 16; i++) { if (task->data[i] != MAX_SPRITES) @@ -3255,16 +3249,16 @@ Advance until there are no cherries on screen in reel 1 return TRUE; } -/*static */void sub_8104E74_(u8 taskId) +static void sub_8104E74_(u8 taskId) { - gUnknown_083ECC54[gTasks[taskId].data[0]](gTasks + taskId); + gUnknown_083ECC54[gTasks[taskId].data[0]](&gTasks[taskId]); } -/*static */void nullsub_69(struct Task *task) +static void nullsub_69(struct Task *task) { } -/*static */void sub_8104EA8(void) +static void sub_8104EA8(void) { s16 i; s16 j; @@ -3291,7 +3285,7 @@ Advance until there are no cherries on screen in reel 1 SetSpriteSheetFrameTileNum(sprite); } -/*static */void sub_8104F8C(void) +static void sub_8104F8C(void) { s16 i; s16 x; @@ -3302,7 +3296,7 @@ Advance until there are no cherries on screen in reel 1 sub_8104FF4(x, 23, 1, i); } -/*static */void sub_8104FF4(s16 x, s16 y, u8 a2, s16 a3) +static void sub_8104FF4(s16 x, s16 y, u8 a2, s16 a3) { struct Sprite *sprite = gSprites + CreateSprite(&gSpriteTemplate_83ED42C, x, y, 13); sprite->oam.priority = 2; @@ -3328,14 +3322,14 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_81050C4(void) +static void sub_81050C4(void) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED444, 0x58, 0x48, 15); gSprites[spriteId].oam.priority = 3; SetSubspriteTables(gSprites + spriteId, gSubspriteTables_83ED704); } -/*static */void sub_8105100(void) +static void sub_8105100(void) { struct SpriteTemplate spriteTemplate; u8 spriteId; @@ -3361,7 +3355,7 @@ Advance until there are no cherries on screen in reel 1 sSlotMachine->reelTimeSprite3F = spriteId; } -/*static */void sub_810514C(void) +static void sub_810514C(void) { DestroySprite(gSprites + sSlotMachine->reelTimeSprite3F); if (gUnknown_0203AAE4 != NULL) @@ -3379,7 +3373,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_81051C0(void) +static void sub_81051C0(void) { struct SpriteTemplate spriteTemplate; u8 spriteId; @@ -3414,7 +3408,7 @@ Advance until there are no cherries on screen in reel 1 sSlotMachine->unk49[1] = spriteId; } -/*static */void sub_8105284_(void) +static void sub_8105284_(void) { struct SpriteTemplate spriteTemplate; u8 spriteId; @@ -3435,7 +3429,7 @@ Advance until there are no cherries on screen in reel 1 sSlotMachine->unk42 = spriteId; } -/*static */void sub_81052EC(void) +static void sub_81052EC(void) { u8 i; s16 r5; @@ -3458,7 +3452,7 @@ Advance until there are no cherries on screen in reel 1 StartSpriteAnimIfDifferent(sprite, GetNearbyReelTimeTag(r0 / 20)); } -/*static */void sub_81053A0(void) +static void sub_81053A0(void) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED4D4, 0x170, 0x64, 9); struct Sprite *sprite = &gSprites[spriteId]; @@ -3475,7 +3469,7 @@ Advance until there are no cherries on screen in reel 1 sSlotMachine->unk4E[1] = spriteId; } -/*static */void sub_810545C(void) +static void sub_810545C(void) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED4EC, 0x170, 0x4c, 11); struct Sprite *sprite = &gSprites[spriteId]; @@ -3485,7 +3479,7 @@ Advance until there are no cherries on screen in reel 1 sSlotMachine->unk40 = spriteId; } -/*static */void sub_81054B8(void) +static void sub_81054B8(void) { u8 i; @@ -3502,7 +3496,7 @@ Advance until there are no cherries on screen in reel 1 DestroySprite(&gSprites[sSlotMachine->unk4B[i]]); } -/*static */void sub_8105524(void) +static void sub_8105524(void) { u8 i; @@ -3510,7 +3504,7 @@ Advance until there are no cherries on screen in reel 1 DestroySprite(&gSprites[sSlotMachine->unk4E[i]]); } -/*static */void sub_8105554(void) +static void sub_8105554(void) { DestroySprite(&gSprites[sSlotMachine->unk42]); if (gUnknown_0203AAF0 != NULL) @@ -3518,7 +3512,7 @@ Advance until there are no cherries on screen in reel 1 } // TODO: check if this is true -/*static */void CreateReelTimeSprites1(void) +static void CreateReelTimeSprites1(void) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED504, 0x98, 0x20, 5); struct Sprite *sprite = &gSprites[spriteId]; @@ -3561,13 +3555,13 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_8105688(s16 a0) +static void sub_8105688(s16 a0) { gSprites[sSlotMachine->reelTimeSprites1[0]].data[7] = a0; gSprites[sSlotMachine->reelTimeSprites1[1]].data[7] = a0; } -/*static */void sub_81056C0(void) +static void sub_81056C0(void) { u8 i; @@ -3575,7 +3569,7 @@ Advance until there are no cherries on screen in reel 1 DestroySprite(&gSprites[sSlotMachine->reelTimeSprites1[i]]); } -/*static */void CreateReelTimeSprite2(void) +static void CreateReelTimeSprite2(void) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED51C, 0x48, 0x50, 3); gSprites[spriteId].oam.priority = 1; @@ -3603,12 +3597,12 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_81057E8(s16 a0) +static void sub_81057E8(s16 a0) { gSprites[sSlotMachine->reelTimeSprites2[0]].data[7] = a0; } -/*static */void sub_8105804(void) +static void sub_8105804(void) { u8 i; MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(7) << 4) + 0x103, 0, 0, 0); @@ -3616,7 +3610,7 @@ Advance until there are no cherries on screen in reel 1 DestroySprite(&gSprites[sSlotMachine->reelTimeSprites2[i]]); } -/*static */void sub_8105854(void) +static void sub_8105854(void) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED534, 0xa8, 0x50, 6); gSprites[spriteId].oam.priority = 1; @@ -3628,12 +3622,12 @@ Advance until there are no cherries on screen in reel 1 sprite->pos2.y = gSpriteCoordOffsetY; } -/*static */void sub_81058A0(void) +static void sub_81058A0(void) { DestroySprite(&gSprites[sSlotMachine->unk41]); } -/*static */void sub_81058C4(void) +static void sub_81058C4(void) { u8 i; u16 sp[] = {0x0, 0x40, 0x80, 0xC0}; @@ -3666,7 +3660,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_81059B8(void) +static void sub_81059B8(void) { u8 i; for (i = 0; i < 4; i++) @@ -3675,7 +3669,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_81059E8(void) +static void sub_81059E8(void) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED564, 0xa8, 0x3c, 8); struct Sprite *sprite = &gSprites[spriteId]; @@ -3712,19 +3706,19 @@ Advance until there are no cherries on screen in reel 1 sprite->pos2.y -= (sprite->data[1] >> 8); } -/*static */u8 sub_8105ACC(void) +static u8 sub_8105ACC(void) { return gSprites[sSlotMachine->unk43].data[7]; } -/*static */void sub_8105AEC(void) +static void sub_8105AEC(void) { struct Sprite *sprite = &gSprites[sSlotMachine->unk43]; FreeOamMatrix(sprite->oam.matrixNum); DestroySprite(sprite); } -/*static */u8 sub_8105B1C(s16 x, s16 y) +static u8 sub_8105B1C(s16 x, s16 y) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED6CC, x, y, 12); struct Sprite *sprite = &gSprites[spriteId]; @@ -3740,19 +3734,19 @@ Advance until there are no cherries on screen in reel 1 sprite->data[7] = 1; } -/*static */void sub_8105B88(u8 spriteId) +static void sub_8105B88(u8 spriteId) { struct Sprite *sprite = &gSprites[spriteId]; FreeOamMatrix(sprite->oam.matrixNum); DestroySprite(sprite); } -/*static */u8 sub_8105BB4(u8 templateIdx, u8 cbAndCoordsIdx, s16 a2) +static u8 sub_8105BB4(u8 templateIdx, u8 cbAndCoordsIdx, s16 a2) { return sub_8105BF8(templateIdx, gUnknown_083ECF0C[cbAndCoordsIdx], gUnknown_083ECE7E[cbAndCoordsIdx][0], gUnknown_083ECE7E[cbAndCoordsIdx][1], a2); } -/*static */u8 sub_8105BF8(u8 templateIdx, SpriteCallback callback, s16 x, s16 y, s16 a4) +static u8 sub_8105BF8(u8 templateIdx, SpriteCallback callback, s16 x, s16 y, s16 a4) { struct SpriteTemplate spriteTemplate; u8 spriteId; @@ -3771,12 +3765,12 @@ Advance until there are no cherries on screen in reel 1 return spriteId; } -/*static */void sub_8105C64(struct Sprite *sprite) +static void sub_8105C64(struct Sprite *sprite) { sprite->data[7] = 0; } -/*static */void sub_8105C6C(struct Sprite *sprite) +static void sub_8105C6C(struct Sprite *sprite) { s16 sp0[] = {4, -4, 4, -4}; s16 sp8[] = {4, 4, -4, -4}; @@ -3795,26 +3789,26 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_8105CF0(struct Sprite *sprite) +static void sub_8105CF0(struct Sprite *sprite) { sprite->hFlip = TRUE; sub_8105C6C(sprite); } -/*static */void sub_8105D08(struct Sprite *sprite) +static void sub_8105D08(struct Sprite *sprite) { sprite->vFlip = TRUE; sub_8105C6C(sprite); } -/*static */void sub_8105D20(struct Sprite *sprite) +static void sub_8105D20(struct Sprite *sprite) { sprite->hFlip = TRUE; sprite->vFlip = TRUE; sub_8105C6C(sprite); } -/*static */void sub_8105D3C(struct Sprite *sprite) +static void sub_8105D3C(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -3841,7 +3835,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_8105DA4(struct Sprite *sprite) +static void sub_8105DA4(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -3868,7 +3862,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_8105E08(struct Sprite *sprite) +static void sub_8105E08(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -3906,7 +3900,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_8105EB4(struct Sprite *sprite) +static void sub_8105EB4(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -3946,7 +3940,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_8105F54(struct Sprite *sprite) +static void sub_8105F54(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -3966,7 +3960,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_8105F9C(struct Sprite *sprite) +static void sub_8105F9C(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -4000,7 +3994,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_8106058(struct Sprite *sprite) +static void sub_8106058(struct Sprite *sprite) { if (sprite->data[1] < 3) { @@ -4024,7 +4018,7 @@ Advance until there are no cherries on screen in reel 1 sprite->data[7] = 0; } -/*static */void sub_81060FC(struct Sprite *sprite) +static void sub_81060FC(struct Sprite *sprite) { s16 sp00[] = {0, -40, 0, 0, 48, 0, 24, 0}; s16 sp10[] = {-32, 0, -32, -48, 0, -48, 0, -48}; @@ -4059,7 +4053,7 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void sub_81061C8(struct Sprite *sprite) +static void sub_81061C8(struct Sprite *sprite) { s16 sp0[] = {160, 192, 224, 104, 80, 64, 48, 24}; @@ -4074,7 +4068,7 @@ Advance until there are no cherries on screen in reel 1 sprite->data[1]--; } -/*static */void sub_8106230(struct Sprite *sprite) +static void sub_8106230(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -4128,21 +4122,21 @@ Advance until there are no cherries on screen in reel 1 } } -/*static */void nullsub_70(void) +static void nullsub_70(void) { } -/*static */void sub_8106364(void) +static void sub_8106364(void) { SetGpuReg(REG_OFFSET_MOSAIC, 0); } -/*static */void sub_8106370(void) +static void sub_8106370(void) { LoadPalette(gUnknown_083EDE20, (IndexOfSpritePaletteTag(6) << 4) + 0x100, 0x20); } -/*static */void sub_810639C(void) +static void sub_810639C(void) { sSlotMachine->win0h = 0xf0; sSlotMachine->win0v = 0xa0; @@ -4150,7 +4144,7 @@ Advance until there are no cherries on screen in reel 1 sSlotMachine->winOut = 0x3f; } -/*static */void sub_81063C0(void) +static void sub_81063C0(void) { u8 i; @@ -4174,7 +4168,7 @@ Advance until there are no cherries on screen in reel 1 LoadSpritePalettes(gSlotMachineSpritePalettes); } -/*static */void sub_8106404(void) +static void sub_8106404(void) { u8 *dest; u8 i, j; @@ -4198,7 +4192,7 @@ extern const u16 gSlotMachineMenu_Tilemap[]; extern const u16 gUnknown_08DCEC70[]; extern const u16 gSlotMachineMenu_Pal[]; -/*static */void sub_8106448(void) +static void sub_8106448(void) { gUnknown_0203AAC8 = Alloc(0x2200); LZDecompressWram(gSlotMachineMenu_Gfx, gUnknown_0203AAC8); @@ -4207,18 +4201,18 @@ extern const u16 gSlotMachineMenu_Pal[]; LoadPalette(gPalette_83EDE24, 208, 32); } -/*static */void sub_81064B8(void) +static void sub_81064B8(void) { sub_812F968(); LoadSlotMachineWheelOverlay(); } -/*static */void sub_812F968(void) +static void sub_812F968(void) { LoadBgTilemap(2, gSlotMachineMenu_Tilemap, 0x500, 0); } -/*static */void LoadSlotMachineWheelOverlay(void) +static void LoadSlotMachineWheelOverlay(void) { s16 x, y, dx; @@ -4240,7 +4234,7 @@ extern const u16 gSlotMachineMenu_Pal[]; } } -/*static */void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4) +static void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4) { gUnknown_0203AADC[0] = arg1; gUnknown_0203AADC[1] = arg2; @@ -4253,13 +4247,13 @@ extern const u16 gSlotMachineMenu_Pal[]; LoadBgTilemap(2, gUnknown_0203AADC + 3, 2, 16 * 32 + 1 + arg0); } -/*static */void sub_81065DC(void) +static void sub_81065DC(void) { LoadBgTilemap(2, gUnknown_08DCEC70, 0x500, 0); HideBg(3); } -/*static */void SlotMachineSetup_9_0(void) +static void SlotMachineSetup_9_0(void) { gUnknown_03001188[0] = gUnknown_0203AAF4; gUnknown_03001188[1] = gUnknown_0203AAF8; @@ -4289,7 +4283,7 @@ extern const u16 gSlotMachineMenu_Pal[]; gUnknown_03001188[25] = NULL; } -/*static */void SlotMachineSetup_8_0(void) +static void SlotMachineSetup_8_0(void) { gUnknown_0203AAF4 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); gUnknown_0203AAF4[0].data = gUnknown_0203AAD4; @@ -4503,7 +4497,7 @@ const u16 ReelTimeBonusIncrementTable[] = { }; // tentative name -const u8 LuckyTags[] = { +const u8 BiasTags[] = { SLOT_MACHINE_TAG_REPLAY, SLOT_MACHINE_TAG_CHERRY, SLOT_MACHINE_TAG_LOTAD, SLOT_MACHINE_TAG_AZURILL, SLOT_MACHINE_TAG_POWER, SLOT_MACHINE_TAG_7_RED, SLOT_MACHINE_TAG_7_RED, SLOT_MACHINE_TAG_7_RED }; @@ -4512,7 +4506,7 @@ const u16 LuckyFlagSettings_Top3[] = { }; const u16 LuckyFlagSettings_NotTop3[] = { - LUCKY_BIAS_POWER, LUCKY_BIAS_AZURRILL, LUCKY_BIAS_LOTAD, LUCKY_BIAS_CHERRY, LUCKY_BIAS_REPLAY + LUCKY_BIAS_POWER, LUCKY_BIAS_AZURILL, LUCKY_BIAS_LOTAD, LUCKY_BIAS_CHERRY, LUCKY_BIAS_REPLAY }; const u8 sSym2Match[] = { diff --git a/src/tv.c b/src/tv.c index 27f779c2db..4b8ff8664e 100644 --- a/src/tv.c +++ b/src/tv.c @@ -62,7 +62,7 @@ IWRAM_DATA s8 sTVShowMixingCurSlot; EWRAM_DATA u16 sPokemonAnglerSpecies = 0; EWRAM_DATA u16 sPokemonAnglerAttemptCounters = 0; EWRAM_DATA u16 sFindThatGamerCoinsSpent = 0; -EWRAM_DATA bool8 sFindThatGamerWhichGame = SLOT_MACHINE; +EWRAM_DATA u8 sFindThatGamerWhichGame = SLOT_MACHINE; EWRAM_DATA ALIGNED(4) u8 sRecordMixingPartnersWithoutShowsToShare = 0; EWRAM_DATA ALIGNED(4) u8 sTVShowState = 0; EWRAM_DATA u8 sTVSecretBaseSecretsRandomValues[3] = {}; @@ -2019,7 +2019,7 @@ void sub_80EDCE8(void) } } -void reportNewCoinTotal(u16 nCoinsPaidOut) +void AlertTVOfNewCointTotal(u16 nCoinsPaidOut) { TVShow *show; bool8 flag; @@ -2072,13 +2072,13 @@ void reportNewCoinTotal(u16 nCoinsPaidOut) } } -void AlertTVThatYouPlayedSlotMachine(u16 nCoinsSpent) +void AlertTVThatPlayerPlayedSlotMachine(u16 nCoinsSpent) { sFindThatGamerWhichGame = SLOT_MACHINE; sFindThatGamerCoinsSpent = nCoinsSpent; } -void AlertTVThatYouPlayedRoulette(u16 nCoinsSpent) +void AlertTVThatPlayerPlayedRoulette(u16 nCoinsSpent) { sFindThatGamerWhichGame = ROULETTE; sFindThatGamerCoinsSpent = nCoinsSpent; From 1dc0d346d949f858e2aae602ebf60eb81bf6b7d7 Mon Sep 17 00:00:00 2001 From: hondew Date: Fri, 22 Feb 2019 16:12:37 -0500 Subject: [PATCH 148/217] fix spelling error --- include/tv.h | 2 +- src/roulette.c | 2 +- src/slot_machine.c | 2 +- src/tv.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/tv.h b/include/tv.h index ec01717e26..ec7ac1e890 100644 --- a/include/tv.h +++ b/include/tv.h @@ -28,7 +28,7 @@ size_t CountDigits(int value); u8 GetRibbonCount(struct Pokemon *pokemon); void AlertTVThatPlayerPlayedSlotMachine(u16 nCoinsSpent); void AlertTVThatPlayerPlayedRoulette(u16 nCoinsSpent); -void AlertTVOfNewCointTotal(u16 nCoinsPaidOut); +void AlertTVOfNewCoinTotal(u16 nCoinsPaidOut); void sub_80EEA70(void); void sub_80EDB44(void); void sub_80EDC60(const u16 *words); diff --git a/src/roulette.c b/src/roulette.c index 93678fa1cd..4c20bd0fe1 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -1964,7 +1964,7 @@ static void sub_8141DE4(u8 taskId) gSpecialVar_0x8004 = TRUE; else gSpecialVar_0x8004 = FALSE; - AlertTVOfNewCointTotal(GetCoins()); + AlertTVOfNewCoinTotal(GetCoins()); BeginHardwarePaletteFade(0xFF, 0, 0, 16, 0); gTasks[taskId].func = sub_8141E7C; } diff --git a/src/slot_machine.c b/src/slot_machine.c index 9c07a96f23..9b345af1e1 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -1343,7 +1343,7 @@ static bool8 SlotAction_ExitMessage_NoMoreCoins(struct Task *task) static bool8 SlotAction_EndGame(struct Task *task) { SetCoins(sSlotMachine->coins); - AlertTVOfNewCointTotal(GetCoins()); + AlertTVOfNewCoinTotal(GetCoins()); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); sSlotMachine->state++; return FALSE; diff --git a/src/tv.c b/src/tv.c index 4b8ff8664e..ee3614e83d 100644 --- a/src/tv.c +++ b/src/tv.c @@ -2019,7 +2019,7 @@ void sub_80EDCE8(void) } } -void AlertTVOfNewCointTotal(u16 nCoinsPaidOut) +void AlertTVOfNewCoinTotal(u16 nCoinsPaidOut) { TVShow *show; bool8 flag; From 6a4202cdbd139a4c81609748fd2df522eff93e56 Mon Sep 17 00:00:00 2001 From: hondew Date: Fri, 22 Feb 2019 16:27:49 -0500 Subject: [PATCH 149/217] tidied lucky flags --- include/slot_machine.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/slot_machine.h b/include/slot_machine.h index bd0af49af0..84622d9145 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -6,14 +6,14 @@ #define REEL_TAG_HEIGHT 24 // Lucky Flags -#define LUCKY_BIAS_REPLAY 0x0001 -#define LUCKY_BIAS_CHERRY 0x0002 -#define LUCKY_BIAS_LOTAD 0x0004 -#define LUCKY_BIAS_AZURILL 0x0008 -#define LUCKY_BIAS_POWER 0x0010 -#define LUCKY_BIAS_REELTIME 0x0020 -#define LUCKY_BIAS_MIXED_777 0x0040 -#define LUCKY_BIAS_777 0x0080 +#define LUCKY_BIAS_REPLAY (1 << 0) +#define LUCKY_BIAS_CHERRY (1 << 1) +#define LUCKY_BIAS_LOTAD (1 << 2) +#define LUCKY_BIAS_AZURILL (1 << 3) +#define LUCKY_BIAS_POWER (1 << 4) +#define LUCKY_BIAS_REELTIME (1 << 5) +#define LUCKY_BIAS_MIXED_777 (1 << 6) +#define LUCKY_BIAS_777 (1 << 7) // Rows #define SLOT_TOP_ROW 0x0001 From 53d7e21332c24b253eea090cf9ba58968b56af8c Mon Sep 17 00:00:00 2001 From: hondew Date: Thu, 28 Feb 2019 18:56:07 -0500 Subject: [PATCH 150/217] fix formatting in slot_machine.c --- src/slot_machine.c | 619 +++++++++++++++++++++++---------------------- 1 file changed, 310 insertions(+), 309 deletions(-) diff --git a/src/slot_machine.c b/src/slot_machine.c index 9b345af1e1..fb1c880970 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -117,7 +117,7 @@ struct UnkStruct1 static void CB2_SlotMachineSetup(void); static void CB2_SlotMachineLoop(void); -static void PlaySlotMachine_Internal(u8 slotMachineIndex, MainCallback CB2_ReturnToFieldContinueScriptPlayMapMusic); +static void PlaySlotMachine_Internal(u8 slotMachineIndex, MainCallback cb); static void SlotMachineDummyTask(u8 taskId); static void SlotMachineSetup_0_0(void); static void SlotMachineSetup_6_2(void); @@ -169,9 +169,9 @@ static bool8 SlotAction_FreeDataStructures(struct Task *task); static void DrawLuckyFlags(void); static void SetLuckySpins(void); static bool8 IsThisRoundLucky(void); -static u8 AttemptsAtLuckyflags_Top3(void); +static u8 AttemptsAtLuckyFlags_Top3(void); static u16 SlowReelSpeed(void); -static u8 AttemptsAtLuckyflags_NotTop3(void); +static u8 AttemptsAtLuckyFlags_NotTop3(void); static void CheckMatch(void); static void CheckMatch_CenterRow(void); static void CheckMatch_TopAndBottom(void); @@ -320,33 +320,33 @@ static void LoadSlotMachineWheelOverlay(void); static u8 sub_8105BB4(u8 templateIdx, u8 cbAndCoordsIdx, s16 a2); // Ewram variables -static EWRAM_DATA u16 *gUnknown_0203AAC8 = NULL; -static EWRAM_DATA u16 *selectedPikaPowerTile = NULL; -static EWRAM_DATA u16 *gUnknown_0203AAD0 = NULL; -static EWRAM_DATA u8 *gUnknown_0203AAD4 = NULL; -static EWRAM_DATA u8 *gUnknown_0203AAD8 = NULL; -static EWRAM_DATA u16 *gUnknown_0203AADC = NULL; -static EWRAM_DATA u8 *gUnknown_0203AAE0 = NULL; -static EWRAM_DATA struct SpriteFrameImage *gUnknown_0203AAE4 = NULL; -static EWRAM_DATA struct SpriteFrameImage *gUnknown_0203AAE8 = NULL; -static EWRAM_DATA struct SpriteFrameImage *gUnknown_0203AAEC = NULL; -static EWRAM_DATA struct SpriteFrameImage *gUnknown_0203AAF0 = NULL; -static EWRAM_DATA struct SpriteFrameImage *gUnknown_0203AAF4 = NULL; -static EWRAM_DATA struct SpriteFrameImage *gUnknown_0203AAF8 = NULL; -static EWRAM_DATA struct SpriteFrameImage *gUnknown_0203AAFC = NULL; -static EWRAM_DATA struct SpriteFrameImage *gUnknown_0203AB00 = NULL; -static EWRAM_DATA struct SpriteFrameImage *gUnknown_0203AB04 = NULL; -static EWRAM_DATA struct SpriteFrameImage *gUnknown_0203AB08 = NULL; -static EWRAM_DATA struct SpriteFrameImage *gUnknown_0203AB0C = NULL; -static EWRAM_DATA struct SpriteFrameImage *gUnknown_0203AB10 = NULL; -static EWRAM_DATA struct SpriteFrameImage *gUnknown_0203AB14 = NULL; -static EWRAM_DATA struct SpriteFrameImage *gUnknown_0203AB18 = NULL; -static EWRAM_DATA struct SpriteFrameImage *gUnknown_0203AB1C = NULL; -static EWRAM_DATA struct SpriteFrameImage *gUnknown_0203AB20 = NULL; -static EWRAM_DATA struct SpriteFrameImage *gUnknown_0203AB24 = NULL; -static EWRAM_DATA struct SpriteFrameImage *gUnknown_0203AB28 = NULL; -static EWRAM_DATA struct SpriteSheet *gUnknown_0203AB2C = NULL; -static EWRAM_DATA struct SpriteSheet *gUnknown_0203AB30 = NULL; +static EWRAM_DATA u16 *sUnknown_0203AAC8 = NULL; +static EWRAM_DATA u16 *sSelectedPikaPowerTile = NULL; +static EWRAM_DATA u16 *sUnknown_0203AAD0 = NULL; +static EWRAM_DATA u8 *sUnknown_0203AAD4 = NULL; +static EWRAM_DATA u8 *sUnknown_0203AAD8 = NULL; +static EWRAM_DATA u16 *sUnknown_0203AADC = NULL; +static EWRAM_DATA u8 *sUnknown_0203AAE0 = NULL; +static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AAE4 = NULL; +static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AAE8 = NULL; +static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AAEC = NULL; +static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AAF0 = NULL; +static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AAF4 = NULL; +static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AAF8 = NULL; +static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AAFC = NULL; +static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB00 = NULL; +static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB04 = NULL; +static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB08 = NULL; +static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB0C = NULL; +static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB10 = NULL; +static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB14 = NULL; +static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB18 = NULL; +static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB1C = NULL; +static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB20 = NULL; +static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB24 = NULL; +static EWRAM_DATA struct SpriteFrameImage *sUnknown_0203AB28 = NULL; +static EWRAM_DATA struct SpriteSheet *sUnknown_0203AB2C = NULL; +static EWRAM_DATA struct SpriteSheet *sUnknown_0203AB30 = NULL; static EWRAM_DATA struct SlotMachineEwramStruct *sSlotMachine = NULL; // IWRAM bss @@ -355,10 +355,10 @@ static IWRAM_DATA struct SpriteFrameImage *gUnknown_03001188[26]; // Const rom data. extern const struct UnkStruct1 *const gUnknown_083ED048[]; extern const u16 gPalette_83EDE24[]; -extern const u8 LuckyRoundTable[][3]; -extern const u8 BiasTags[]; -extern const u16 LuckyFlagSettings_Top3[]; -extern const u16 LuckyFlagSettings_NotTop3[]; +extern const u8 gLuckyRoundProbabilities[][3]; +extern const u8 gBiasTags[]; +extern const u16 gLuckyFlagSettings_Top3[]; +extern const u16 gLuckyFlagSettings_NotTop3[]; extern const s16 gUnknown_083ECE7E[][2]; extern const SpriteCallback gUnknown_083ECF0C[]; extern const struct SpriteTemplate *const gUnknown_083EDB5C[]; @@ -369,28 +369,28 @@ extern const struct SpriteTemplate gSpriteTemplate_83ED54C; extern const struct SpriteTemplate gSpriteTemplate_83ED534; extern const u8 gUnknown_083ECC58[2]; extern const struct SpriteTemplate gSpriteTemplate_83ED51C; -extern const u16 ProbabilityTable_SkipToReeltimeAction14[]; +extern const u16 gProbabilityTable_SkipToReeltimeAction14[]; extern const u16 *const gUnknown_083EDE10[]; -extern const u16 ReelIncrementTable[][2]; -extern const u16 ReelTimeBonusIncrementTable[]; -extern const u16 sSlotMatchFlags[]; -extern const u16 sSlotPayouts[]; +extern const u16 gReelIncrementTable[][2]; +extern const u16 gReelTimeBonusIncrementTable[]; +extern const u16 gSlotMatchFlags[]; +extern const u16 gSlotPayouts[]; extern const u8 *const gUnknown_083EDCE4; extern const u8 *const gUnknown_083EDCDC; -extern const u32 sReelTimeGfx[]; -extern const struct SpriteSheet sSlotMachineSpriteSheets[]; +extern const u32 gReelTimeGfx[]; +extern const struct SpriteSheet gSlotMachineSpriteSheets[]; extern const struct SpritePalette gSlotMachineSpritePalettes[]; extern const u16 *const gUnknown_083EDE20; -extern const s16 sInitialReelPositions[][2]; +extern const s16 gInitialReelPositions[][2]; extern const struct BgTemplate gUnknown_085A7424[4]; extern const struct WindowTemplate gUnknown_085A7434[]; -extern const u8 LuckyFlagsTable_Top3[][6]; -extern const u8 LuckyFlagsTable_NotTop3[][6]; -extern const u8 ReelTimeProbabilityTable_UnluckyGame[][17]; -extern const u8 ReelTimeProbabilityTable_LuckyGame[][17]; -extern const u8 sSym2Match[]; -extern const u8 ReelTimeTags[]; -extern const u8 sReelSymbols[][REEL_NUM_TAGS]; +extern const u8 gLuckyFlagProbabilities_Top3[][6]; +extern const u8 gLuckyFlagProbabilities_NotTop3[][6]; +extern const u8 gReeltimeProbabilities_UnluckyGame[][17]; +extern const u8 gReelTimeProbabilities_LuckyGame[][17]; +extern const u8 gSym2Match[]; +extern const u8 gReelTimeTags[]; +extern const u8 gReelSymbols[][REEL_NUM_TAGS]; extern const u16 *const gUnknown_083EDD08[]; extern const u16 *const gUnknown_083EDD1C[]; extern const u8 gUnknown_083EDD30[]; @@ -398,7 +398,7 @@ extern const u8 gBettingTilesId[][2]; extern const u8 gNumberBettingTiles[]; extern const u16 *const gUnknown_083EDDA0[]; extern const u16 *const gUnknown_083EDDAC; -extern const u16 sReelTimeWindowTilemap[]; +extern const u16 gReelTimeWindowTilemap[]; extern const u16 gUnknown_085A9898[]; extern void (*const gUnknown_083ED064[])(void); @@ -858,7 +858,7 @@ static void SlotMachineSetup_0_1(void) for (i = 0; i < NUM_REELS; i++) { sSlotMachine->reelPixelOffsetsWhileStopping[i] = 0; - sSlotMachine->reelTagOffsets[i] = sInitialReelPositions[i][sSlotMachine->luckyGame] % REEL_NUM_TAGS; + sSlotMachine->reelTagOffsets[i] = gInitialReelPositions[i][sSlotMachine->luckyGame] % REEL_NUM_TAGS; sSlotMachine->reelPixelOffsets[i] = REEL_NUM_TAGS * REEL_TAG_HEIGHT - sSlotMachine->reelTagOffsets[i] * REEL_TAG_HEIGHT; sSlotMachine->reelPixelOffsets[i] %= REEL_NUM_TAGS * REEL_TAG_HEIGHT; } @@ -876,18 +876,18 @@ static void SlotMachineSetup_3_0(void) static void SlotMachineSetup_4_0(void) { - selectedPikaPowerTile = Alloc(8); - gUnknown_0203AAD0 = AllocZeroed(0xE); - gUnknown_0203AADC = AllocZeroed(8); + sSelectedPikaPowerTile = Alloc(8); + sUnknown_0203AAD0 = AllocZeroed(0xE); + sUnknown_0203AADC = AllocZeroed(8); // several of these are 1 bit off from each other - gUnknown_0203AAD0[0] = 0x2051; - gUnknown_0203AAD0[1] = 0x2851; - gUnknown_0203AAD0[2] = 0x2061; - gUnknown_0203AAD0[3] = 0x2861; - gUnknown_0203AAD0[4] = 0x20BE; - gUnknown_0203AAD0[5] = 0x28BE; - gUnknown_0203AAD0[6] = 0x20BF; + sUnknown_0203AAD0[0] = 0x2051; + sUnknown_0203AAD0[1] = 0x2851; + sUnknown_0203AAD0[2] = 0x2061; + sUnknown_0203AAD0[3] = 0x2861; + sUnknown_0203AAD0[4] = 0x20BE; + sUnknown_0203AAD0[5] = 0x28BE; + sUnknown_0203AAD0[6] = 0x20BF; } static void SlotMachineSetup_5_0(void) @@ -1170,10 +1170,10 @@ static bool8 SlotAction_CheckMatches(struct Task *task) { sSlotMachine->fairRollsLeft = 0; sSlotMachine->fairRollsUsed = 0; - sSlotMachine->luckyGame = 0; + sSlotMachine->luckyGame = FALSE; if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_777_BLUE)) // this may be an error, but if you get blue 777, the game becomes lucky - sSlotMachine->luckyGame = 1; + sSlotMachine->luckyGame = TRUE; } } if (sSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_POWER) && sSlotMachine->pikaPower < 16) @@ -1354,37 +1354,37 @@ static bool8 SlotAction_FreeDataStructures(struct Task *task) if (!gPaletteFade.active) { SetMainCallback2(sSlotMachine->prevMainCb); - FREE_AND_SET_NULL(gUnknown_0203AAF4); - FREE_AND_SET_NULL(gUnknown_0203AAF8); - FREE_AND_SET_NULL(gUnknown_0203AAFC); - FREE_AND_SET_NULL(gUnknown_0203AB00); - FREE_AND_SET_NULL(gUnknown_0203AB04); - FREE_AND_SET_NULL(gUnknown_0203AB08); - FREE_AND_SET_NULL(gUnknown_0203AB0C); - FREE_AND_SET_NULL(gUnknown_0203AB10); - FREE_AND_SET_NULL(gUnknown_0203AB14); - FREE_AND_SET_NULL(gUnknown_0203AB18); - FREE_AND_SET_NULL(gUnknown_0203AB1C); - FREE_AND_SET_NULL(gUnknown_0203AB20); - FREE_AND_SET_NULL(gUnknown_0203AB24); - FREE_AND_SET_NULL(gUnknown_0203AB28); - if (gUnknown_0203AAE4 != NULL) - FREE_AND_SET_NULL(gUnknown_0203AAE4); - if (gUnknown_0203AAE8 != NULL) - FREE_AND_SET_NULL(gUnknown_0203AAE8); - if (gUnknown_0203AAEC != NULL) - FREE_AND_SET_NULL(gUnknown_0203AAEC); - if (gUnknown_0203AAF0 != NULL) - FREE_AND_SET_NULL(gUnknown_0203AAF0); - FREE_AND_SET_NULL(gUnknown_0203AAC8); - FREE_AND_SET_NULL(selectedPikaPowerTile); - FREE_AND_SET_NULL(gUnknown_0203AAD0); - FREE_AND_SET_NULL(gUnknown_0203AAD4); - FREE_AND_SET_NULL(gUnknown_0203AAD8); - FREE_AND_SET_NULL(gUnknown_0203AADC); - FREE_AND_SET_NULL(gUnknown_0203AAE0); - FREE_AND_SET_NULL(gUnknown_0203AB2C); - FREE_AND_SET_NULL(gUnknown_0203AB30); + FREE_AND_SET_NULL(sUnknown_0203AAF4); + FREE_AND_SET_NULL(sUnknown_0203AAF8); + FREE_AND_SET_NULL(sUnknown_0203AAFC); + FREE_AND_SET_NULL(sUnknown_0203AB00); + FREE_AND_SET_NULL(sUnknown_0203AB04); + FREE_AND_SET_NULL(sUnknown_0203AB08); + FREE_AND_SET_NULL(sUnknown_0203AB0C); + FREE_AND_SET_NULL(sUnknown_0203AB10); + FREE_AND_SET_NULL(sUnknown_0203AB14); + FREE_AND_SET_NULL(sUnknown_0203AB18); + FREE_AND_SET_NULL(sUnknown_0203AB1C); + FREE_AND_SET_NULL(sUnknown_0203AB20); + FREE_AND_SET_NULL(sUnknown_0203AB24); + FREE_AND_SET_NULL(sUnknown_0203AB28); + if (sUnknown_0203AAE4 != NULL) + FREE_AND_SET_NULL(sUnknown_0203AAE4); + if (sUnknown_0203AAE8 != NULL) + FREE_AND_SET_NULL(sUnknown_0203AAE8); + if (sUnknown_0203AAEC != NULL) + FREE_AND_SET_NULL(sUnknown_0203AAEC); + if (sUnknown_0203AAF0 != NULL) + FREE_AND_SET_NULL(sUnknown_0203AAF0); + FREE_AND_SET_NULL(sUnknown_0203AAC8); + FREE_AND_SET_NULL(sSelectedPikaPowerTile); + FREE_AND_SET_NULL(sUnknown_0203AAD0); + FREE_AND_SET_NULL(sUnknown_0203AAD4); + FREE_AND_SET_NULL(sUnknown_0203AAD8); + FREE_AND_SET_NULL(sUnknown_0203AADC); + FREE_AND_SET_NULL(sUnknown_0203AAE0); + FREE_AND_SET_NULL(sUnknown_0203AB2C); + FREE_AND_SET_NULL(sUnknown_0203AB30); FREE_AND_SET_NULL(sSlotMachine); } @@ -1401,22 +1401,22 @@ static void DrawLuckyFlags(void) { if (IsThisRoundLucky()) { - attempts = AttemptsAtLuckyflags_Top3(); + attempts = AttemptsAtLuckyFlags_Top3(); if (attempts != 3) // if you found a lucky number { // attempts == 1: reelTime flag set - sSlotMachine->luckyFlags |= LuckyFlagSettings_Top3[attempts]; + sSlotMachine->luckyFlags |= gLuckyFlagSettings_Top3[attempts]; if (attempts != 1) { return; } } } - // if you got it your first try, you get to try again for the lower lucky flags - attempts = AttemptsAtLuckyflags_NotTop3(); + // if it's not a lucky round or you got reel time, roll for the lower lucky flags + attempts = AttemptsAtLuckyFlags_NotTop3(); if (attempts != 5) // if you found a lucky number { - sSlotMachine->luckyFlags |= LuckyFlagSettings_NotTop3[attempts]; + sSlotMachine->luckyFlags |= gLuckyFlagSettings_NotTop3[attempts]; } } } @@ -1436,51 +1436,52 @@ static u8 GetBiasTag(u8 luckyFlags) for (i = 0; i < 8; i++) { if (luckyFlags & 1) - return BiasTags[i]; + return gBiasTags[i]; luckyFlags >>= 1; } return 0; } +// you have way more luck betting 3 coins than anything lower static bool8 IsThisRoundLucky(void) { u8 rval = Random(); - if (LuckyRoundTable[sSlotMachine->machineId][sSlotMachine->bet - 1] > rval) + if (gLuckyRoundProbabilities[sSlotMachine->machineId][sSlotMachine->bet - 1] > rval) return TRUE; return FALSE; } -static u8 AttemptsAtLuckyflags_Top3(void) +static u8 AttemptsAtLuckyFlags_Top3(void) { s16 count; for (count = 0; count < 3; count++) { s16 rval = Random() & 0xff; - s16 value = LuckyFlagsTable_Top3[count][sSlotMachine->machineId]; + s16 value = gLuckyFlagProbabilities_Top3[count][sSlotMachine->machineId]; if (value > rval) break; } return count; } -static u8 AttemptsAtLuckyflags_NotTop3(void) +static u8 AttemptsAtLuckyFlags_NotTop3(void) { s16 count; for (count = 0; count < 5; count++) { s16 rval = Random() & 0xff; // random byte - s16 value = LuckyFlagsTable_NotTop3[count][sSlotMachine->machineId]; + s16 value = gLuckyFlagProbabilities_NotTop3[count][sSlotMachine->machineId]; // make first attempt easier if it's a lucky game - if (count == 0 && sSlotMachine->luckyGame == 1) + if (count == 0 && sSlotMachine->luckyGame == TRUE) { value += 10; if (value > 0x100) value = 0x100; } // make last attempt harder if it's a lucky game - else if (count == 4 && sSlotMachine->luckyGame == 1) + else if (count == 4 && sSlotMachine->luckyGame == TRUE) { value -= 10; if (value < 0) @@ -1494,10 +1495,10 @@ static u8 AttemptsAtLuckyflags_NotTop3(void) static u8 GetReelTimeProbability(u8 reelTimeDraw) { - if (sSlotMachine->luckyGame == 0) - return ReelTimeProbabilityTable_UnluckyGame[reelTimeDraw][sSlotMachine->pikaPower]; + if (sSlotMachine->luckyGame == FALSE) + return gReeltimeProbabilities_UnluckyGame[reelTimeDraw][sSlotMachine->pikaPower]; else - return ReelTimeProbabilityTable_LuckyGame[reelTimeDraw][sSlotMachine->pikaPower]; + return gReelTimeProbabilities_LuckyGame[reelTimeDraw][sSlotMachine->pikaPower]; } static void GetReeltimeDraw(void) @@ -1521,7 +1522,7 @@ static void GetReeltimeDraw(void) static bool8 SkipToReeltimeAction14(u16 i) { u16 rval = Random() & 0xff; - if (rval < ProbabilityTable_SkipToReeltimeAction14[i]) + if (rval < gProbabilityTable_SkipToReeltimeAction14[i]) return TRUE; else return FALSE; @@ -1541,11 +1542,11 @@ static u16 SlowReelSpeed(void) else if (sSlotMachine->netCoinLoss >= 150) i = 1; rval = Random() % 100; - value = ReelIncrementTable[i][0]; + value = gReelIncrementTable[i][0]; if (rval < value) return 4; rval = Random() % 100; - value = ReelIncrementTable[i][1] + ReelTimeBonusIncrementTable[sSlotMachine->fairRollsUsed]; + value = gReelIncrementTable[i][1] + gReelTimeBonusIncrementTable[sSlotMachine->fairRollsUsed]; if (rval < value) return 2; return 8; @@ -1571,8 +1572,8 @@ static void CheckMatch_CenterRow(void) match = GetMatchFromSymbolsInRow(c1, c2, c3); if (match != SLOT_MACHINE_MATCHED_NONE) { - sSlotMachine->payout += sSlotPayouts[match]; - sSlotMachine->matchedSymbols |= sSlotMatchFlags[match]; + sSlotMachine->payout += gSlotPayouts[match]; + sSlotMachine->matchedSymbols |= gSlotMatchFlags[match]; sub_8103E04(0); } } @@ -1589,8 +1590,8 @@ static void CheckMatch_TopAndBottom(void) { if (match == SLOT_MACHINE_MATCHED_1CHERRY) match = SLOT_MACHINE_MATCHED_2CHERRY; - sSlotMachine->payout += sSlotPayouts[match]; - sSlotMachine->matchedSymbols |= sSlotMatchFlags[match]; + sSlotMachine->payout += gSlotPayouts[match]; + sSlotMachine->matchedSymbols |= gSlotMatchFlags[match]; sub_8103E04(1); } c1 = GetNearbyTag_Quantized(0, 3); @@ -1601,8 +1602,8 @@ static void CheckMatch_TopAndBottom(void) { if (match == SLOT_MACHINE_MATCHED_1CHERRY) match = SLOT_MACHINE_MATCHED_2CHERRY; - sSlotMachine->payout += sSlotPayouts[match]; - sSlotMachine->matchedSymbols |= sSlotMatchFlags[match]; + sSlotMachine->payout += gSlotPayouts[match]; + sSlotMachine->matchedSymbols |= gSlotMatchFlags[match]; sub_8103E04(2); } } @@ -1619,8 +1620,8 @@ static void CheckMatch_Diagonals(void) { if (match != SLOT_MACHINE_MATCHED_1CHERRY) { - sSlotMachine->payout += sSlotPayouts[match]; - sSlotMachine->matchedSymbols |= sSlotMatchFlags[match]; + sSlotMachine->payout += gSlotPayouts[match]; + sSlotMachine->matchedSymbols |= gSlotMatchFlags[match]; } sub_8103E04(3); } @@ -1632,8 +1633,8 @@ static void CheckMatch_Diagonals(void) { if (match != SLOT_MACHINE_MATCHED_1CHERRY) { - sSlotMachine->payout += sSlotPayouts[match]; - sSlotMachine->matchedSymbols |= sSlotMatchFlags[match]; + sSlotMachine->payout += gSlotPayouts[match]; + sSlotMachine->matchedSymbols |= gSlotMatchFlags[match]; } sub_8103E04(4); } @@ -1642,7 +1643,7 @@ static void CheckMatch_Diagonals(void) static u8 GetMatchFromSymbolsInRow(u8 c1, u8 c2, u8 c3) { if (c1 == c2 && c1 == c3) - return sSym2Match[c1]; + return gSym2Match[c1]; if (c1 == SLOT_MACHINE_TAG_7_RED && c2 == SLOT_MACHINE_TAG_7_RED && c3 == SLOT_MACHINE_TAG_7_BLUE) return SLOT_MACHINE_MATCHED_777_MIXED; if (c1 == SLOT_MACHINE_TAG_7_BLUE && c2 == SLOT_MACHINE_TAG_7_BLUE && c3 == SLOT_MACHINE_TAG_7_RED) @@ -1725,7 +1726,7 @@ static u8 GetNearbyTag_Quantized(u8 reelIndex, s16 posOffset) s16 tagIndex = (sSlotMachine->reelTagOffsets[reelIndex] + posOffset) % REEL_NUM_TAGS; if (tagIndex < 0) tagIndex += REEL_NUM_TAGS; - return sReelSymbols[reelIndex][tagIndex]; + return gReelSymbols[reelIndex][tagIndex]; } @@ -1744,7 +1745,7 @@ static u8 GetNearbyReelTimeTag(s16 n) s16 newPosition = (sSlotMachine->reeltimePosition + n) % 6; if (newPosition < 0) newPosition += 6; - return ReelTimeTags[newPosition]; + return gReelTimeTags[newPosition]; } static void AdvanceSlotReel(u8 reelIndex, s16 value) @@ -1838,7 +1839,7 @@ static bool8 SlotReelAction_Spin(struct Task *task) static bool8 SlotReelAction_DecideWhereToStop(struct Task *task) { task->data[0]++; - // initialize data for that reel --> these will be changed if biasTags can be lined up + // initialize data for that reel --> these will be changed if gBiasTags can be lined up sSlotMachine->winnerRows[task->data[15]] = 0; sSlotMachine->reelExtraTurns[task->data[15]] = 0; @@ -2672,8 +2673,8 @@ static void sub_8104144(struct Task *task) r3 = 1, r2 = 1; else if (task->data[1] == 16) r3 = 2, r2 = 2; - selectedPikaPowerTile[r2] = pikaPowerTileTable[r3][0]; - LoadBgTilemap(2, &selectedPikaPowerTile[r2], 2, r5 + 0x40); + sSelectedPikaPowerTile[r2] = pikaPowerTileTable[r3][0]; + LoadBgTilemap(2, &sSelectedPikaPowerTile[r2], 2, r5 + 0x40); sub_8105B88(task->data[2]); task->data[0] = 0; task->data[15] = 0; // points to a reelIndex @@ -2691,8 +2692,8 @@ static void sub_81041AC(struct Task *task) r3 = 2, r2 = 2; if (task->data[2] == 0) { - selectedPikaPowerTile[r2] = pikaPowerTileTable[r3][1]; - LoadBgTilemap(2, &selectedPikaPowerTile[r2], 2, r5 + 0x40); + sSelectedPikaPowerTile[r2] = pikaPowerTileTable[r3][1]; + LoadBgTilemap(2, &sSelectedPikaPowerTile[r2], 2, r5 + 0x40); task->data[1]--; } if (++task->data[2] >= 20) @@ -2725,8 +2726,8 @@ static void sub_810423C(u8 pikaPower) r3 = 1, r1 = 1; else if (i == 15) // pikaPower meter is full r3 = 2, r1 = 2; - selectedPikaPowerTile[r1] = pikaPowerTileTable[r3][0]; - LoadBgTilemap(2, &selectedPikaPowerTile[r1], 2, r4 + 0x40); + sSelectedPikaPowerTile[r1] = pikaPowerTileTable[r3][0]; + LoadBgTilemap(2, &sSelectedPikaPowerTile[r1], 2, r4 + 0x40); } for (; i < 16; i++, r4++) { @@ -2735,8 +2736,8 @@ static void sub_810423C(u8 pikaPower) r3 = 1, r1 = 1; else if (i == 15) r3 = 2, r1 = 2; - selectedPikaPowerTile[r1] = pikaPowerTileTable[r3][1]; - LoadBgTilemap(2, &selectedPikaPowerTile[r1], 2, r4 + 0x40); + sSelectedPikaPowerTile[r1] = pikaPowerTileTable[r3][1]; + LoadBgTilemap(2, &sSelectedPikaPowerTile[r1], 2, r4 + 0x40); } gTasks[sSlotMachine->unkTaskPointer3E].data[1] = pikaPower; } @@ -3067,7 +3068,7 @@ static void sub_8104A40(s16 a0, s16 a1) for (i = 4; i < 15; i++) { - LoadBgTilemap(1, &sReelTimeWindowTilemap[a1 + (i - 4) * 20], 2, 32 * i + a0); + LoadBgTilemap(1, &gReelTimeWindowTilemap[a1 + (i - 4) * 20], 2, 32 * i + a0); } } @@ -3228,7 +3229,7 @@ static void sub_8104DA4(void) { if (task->data[i] != MAX_SPRITES) { - DestroySprite(gSprites + task->data[i]); + DestroySprite(&gSprites[task->data[i]]); task->data[i] = MAX_SPRITES; } } @@ -3333,22 +3334,22 @@ static void sub_8105100(void) { struct SpriteTemplate spriteTemplate; u8 spriteId; - if (gUnknown_0203AAE4 == NULL) - gUnknown_0203AAE4 = AllocZeroed(sizeof(struct SpriteFrameImage) * 5); + if (sUnknown_0203AAE4 == NULL) + sUnknown_0203AAE4 = AllocZeroed(sizeof(struct SpriteFrameImage) * 5); - gUnknown_0203AAE4[0].data = gUnknown_0203AAD8 + (0 * 0x800); - gUnknown_0203AAE4[0].size = 0x800; - gUnknown_0203AAE4[1].data = gUnknown_0203AAD8 + (1 * 0x800); - gUnknown_0203AAE4[1].size = 0x800; - gUnknown_0203AAE4[2].data = gUnknown_0203AAD8 + (2 * 0x800); - gUnknown_0203AAE4[2].size = 0x800; - gUnknown_0203AAE4[3].data = gUnknown_0203AAD8 + (3 * 0x800); - gUnknown_0203AAE4[3].size = 0x800; - gUnknown_0203AAE4[4].data = gUnknown_0203AAD8 + (4 * 0x800); - gUnknown_0203AAE4[4].size = 0x800; + sUnknown_0203AAE4[0].data = sUnknown_0203AAD8 + (0 * 0x800); + sUnknown_0203AAE4[0].size = 0x800; + sUnknown_0203AAE4[1].data = sUnknown_0203AAD8 + (1 * 0x800); + sUnknown_0203AAE4[1].size = 0x800; + sUnknown_0203AAE4[2].data = sUnknown_0203AAD8 + (2 * 0x800); + sUnknown_0203AAE4[2].size = 0x800; + sUnknown_0203AAE4[3].data = sUnknown_0203AAD8 + (3 * 0x800); + sUnknown_0203AAE4[3].size = 0x800; + sUnknown_0203AAE4[4].data = sUnknown_0203AAD8 + (4 * 0x800); + sUnknown_0203AAE4[4].size = 0x800; spriteTemplate = gSpriteTemplate_83ED45C; - spriteTemplate.images = gUnknown_0203AAE4; + spriteTemplate.images = sUnknown_0203AAE4; spriteId = CreateSprite(&spriteTemplate, 280, 80, 1); gSprites[spriteId].oam.priority = 1; gSprites[spriteId].coordOffsetEnabled = TRUE; @@ -3358,8 +3359,8 @@ static void sub_8105100(void) static void sub_810514C(void) { DestroySprite(gSprites + sSlotMachine->reelTimeSprite3F); - if (gUnknown_0203AAE4 != NULL) - FREE_AND_SET_NULL(gUnknown_0203AAE4); + if (sUnknown_0203AAE4 != NULL) + FREE_AND_SET_NULL(sUnknown_0203AAE4); } /*static */void sub_8105170(struct Sprite *sprite) @@ -3379,13 +3380,13 @@ static void sub_81051C0(void) u8 spriteId; struct Sprite *sprite; - if (gUnknown_0203AAE8 == NULL) - gUnknown_0203AAE8 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + if (sUnknown_0203AAE8 == NULL) + sUnknown_0203AAE8 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AAE8[0].data = gUnknown_0203AAD8 + 0x2800; - gUnknown_0203AAE8[0].size = 0x300; + sUnknown_0203AAE8[0].data = sUnknown_0203AAD8 + 0x2800; + sUnknown_0203AAE8[0].size = 0x300; spriteTemplate = gSpriteTemplate_83ED474; - spriteTemplate.images = gUnknown_0203AAE8; + spriteTemplate.images = sUnknown_0203AAE8; spriteId = CreateSprite(&spriteTemplate, 368, 52, 7); sprite = &gSprites[spriteId]; sprite->oam.priority = 1; @@ -3393,13 +3394,13 @@ static void sub_81051C0(void) SetSubspriteTables(sprite, gSubspriteTables_83ED73C); sSlotMachine->unk49[0] = spriteId; - if (gUnknown_0203AAEC == NULL) - gUnknown_0203AAEC = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + if (sUnknown_0203AAEC == NULL) + sUnknown_0203AAEC = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AAEC[0].data = gUnknown_0203AAD8 + 0x2800 + 0x300; - gUnknown_0203AAEC[0].size = 0x500; + sUnknown_0203AAEC[0].data = sUnknown_0203AAD8 + 0x2800 + 0x300; + sUnknown_0203AAEC[0].size = 0x500; spriteTemplate = gSpriteTemplate_83ED48C; - spriteTemplate.images = gUnknown_0203AAEC; + spriteTemplate.images = sUnknown_0203AAEC; spriteId = CreateSprite(&spriteTemplate, 368, 84, 7); sprite = &gSprites[spriteId]; sprite->oam.priority = 1; @@ -3414,13 +3415,13 @@ static void sub_8105284_(void) u8 spriteId; struct Sprite *sprite; - if (gUnknown_0203AAF0 == NULL) - gUnknown_0203AAF0 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + if (sUnknown_0203AAF0 == NULL) + sUnknown_0203AAF0 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AAF0[0].data = gUnknown_0203AAD8 + 0x3000; - gUnknown_0203AAF0[0].size = 0x600; + sUnknown_0203AAF0[0].data = sUnknown_0203AAD8 + 0x3000; + sUnknown_0203AAF0[0].size = 0x600; spriteTemplate = gSpriteTemplate_83ED4A4; - spriteTemplate.images = gUnknown_0203AAF0; + spriteTemplate.images = sUnknown_0203AAF0; spriteId = CreateSprite(&spriteTemplate, 0xa8 - gSpriteCoordOffsetX, 0x50, 7); sprite = &gSprites[spriteId]; sprite->oam.priority = 1; @@ -3487,10 +3488,10 @@ static void sub_81054B8(void) for (i = 0; i < 2; i++) DestroySprite(&gSprites[sSlotMachine->unk49[i]]); - if (gUnknown_0203AAE8 != NULL) - FREE_AND_SET_NULL(gUnknown_0203AAE8); - if (gUnknown_0203AAEC != NULL) - FREE_AND_SET_NULL(gUnknown_0203AAEC); + if (sUnknown_0203AAE8 != NULL) + FREE_AND_SET_NULL(sUnknown_0203AAE8); + if (sUnknown_0203AAEC != NULL) + FREE_AND_SET_NULL(sUnknown_0203AAEC); for (i = 0; i < 3; i++) DestroySprite(&gSprites[sSlotMachine->unk4B[i]]); @@ -3507,8 +3508,8 @@ static void sub_8105524(void) static void sub_8105554(void) { DestroySprite(&gSprites[sSlotMachine->unk42]); - if (gUnknown_0203AAF0 != NULL) - FREE_AND_SET_NULL(gUnknown_0203AAF0); + if (sUnknown_0203AAF0 != NULL) + FREE_AND_SET_NULL(sUnknown_0203AAF0); } // TODO: check if this is true @@ -4149,22 +4150,22 @@ static void sub_81063C0(void) u8 i; sub_8106404(); - gUnknown_0203AAD4 = Alloc(0x3200); - LZDecompressWram(gSlotMachineReelTime_Gfx, gUnknown_0203AAD4); - gUnknown_0203AAD8 = Alloc(0x3600); - LZDecompressWram(sReelTimeGfx, gUnknown_0203AAD8); - gUnknown_0203AB30 = AllocZeroed(sizeof(struct SpriteSheet) * 22); + sUnknown_0203AAD4 = Alloc(0x3200); + LZDecompressWram(gSlotMachineReelTime_Gfx, sUnknown_0203AAD4); + sUnknown_0203AAD8 = Alloc(0x3600); + LZDecompressWram(gReelTimeGfx, sUnknown_0203AAD8); + sUnknown_0203AB30 = AllocZeroed(sizeof(struct SpriteSheet) * 22); for (i = 0; i < 22; i++) { - gUnknown_0203AB30[i].data = sSlotMachineSpriteSheets[i].data; - gUnknown_0203AB30[i].size = sSlotMachineSpriteSheets[i].size; - gUnknown_0203AB30[i].tag = sSlotMachineSpriteSheets[i].tag; + sUnknown_0203AB30[i].data = gSlotMachineSpriteSheets[i].data; + sUnknown_0203AB30[i].size = gSlotMachineSpriteSheets[i].size; + sUnknown_0203AB30[i].tag = gSlotMachineSpriteSheets[i].tag; } - gUnknown_0203AB30[17].data = gUnknown_0203AAD4 + 0xA00; - gUnknown_0203AB30[18].data = gUnknown_0203AAD4 + 0x1400; - gUnknown_0203AB30[19].data = gUnknown_0203AAD4 + 0x1600; - gUnknown_0203AB30[20].data = gUnknown_0203AAD4 + 0x1900; - LoadSpriteSheets(gUnknown_0203AB30); + sUnknown_0203AB30[17].data = sUnknown_0203AAD4 + 0xA00; + sUnknown_0203AB30[18].data = sUnknown_0203AAD4 + 0x1400; + sUnknown_0203AB30[19].data = sUnknown_0203AAD4 + 0x1600; + sUnknown_0203AB30[20].data = sUnknown_0203AAD4 + 0x1900; + LoadSpriteSheets(sUnknown_0203AB30); LoadSpritePalettes(gSlotMachineSpritePalettes); } @@ -4173,18 +4174,18 @@ static void sub_8106404(void) u8 *dest; u8 i, j; - gUnknown_0203AB2C = AllocZeroed(sizeof(struct SpriteSheet)); - gUnknown_0203AAE0 = AllocZeroed(0x2000); - dest = gUnknown_0203AAE0; + sUnknown_0203AB2C = AllocZeroed(sizeof(struct SpriteSheet)); + sUnknown_0203AAE0 = AllocZeroed(0x2000); + dest = sUnknown_0203AAE0; for (i = 0; i < 0x40; i++) { for (j = 0; j < 0x20; j++, dest++) *dest = gUnknown_083EDCDC[j]; } - gUnknown_0203AB2C->data = gUnknown_0203AAE0; - gUnknown_0203AB2C->size = 0x800; - gUnknown_0203AB2C->tag = 0x11; - LoadSpriteSheet(gUnknown_0203AB2C); + sUnknown_0203AB2C->data = sUnknown_0203AAE0; + sUnknown_0203AB2C->size = 0x800; + sUnknown_0203AB2C->tag = 0x11; + LoadSpriteSheet(sUnknown_0203AB2C); } extern const u32 gSlotMachineMenu_Gfx[]; @@ -4194,9 +4195,9 @@ extern const u16 gSlotMachineMenu_Pal[]; static void sub_8106448(void) { - gUnknown_0203AAC8 = Alloc(0x2200); - LZDecompressWram(gSlotMachineMenu_Gfx, gUnknown_0203AAC8); - LoadBgTiles(2, gUnknown_0203AAC8, 0x2200, 0); + sUnknown_0203AAC8 = Alloc(0x2200); + LZDecompressWram(gSlotMachineMenu_Gfx, sUnknown_0203AAC8); + LoadBgTiles(2, sUnknown_0203AAC8, 0x2200, 0); LoadPalette(gSlotMachineMenu_Pal, 0, 160); LoadPalette(gPalette_83EDE24, 208, 32); } @@ -4220,31 +4221,31 @@ static void LoadSlotMachineWheelOverlay(void) { for (dx = 0; dx < 4; dx++) { - LoadBgTilemap(3, gUnknown_0203AAD0, 2, x + dx + 5 * 32); - LoadBgTilemap(3, gUnknown_0203AAD0 + 1, 2, x + dx + 13 * 32); - LoadBgTilemap(3, gUnknown_0203AAD0 + 2, 2, x + dx + 6 * 32); - LoadBgTilemap(3, gUnknown_0203AAD0 + 3, 2, x + dx + 12 * 32); + LoadBgTilemap(3, sUnknown_0203AAD0, 2, x + dx + 5 * 32); + LoadBgTilemap(3, sUnknown_0203AAD0 + 1, 2, x + dx + 13 * 32); + LoadBgTilemap(3, sUnknown_0203AAD0 + 2, 2, x + dx + 6 * 32); + LoadBgTilemap(3, sUnknown_0203AAD0 + 3, 2, x + dx + 12 * 32); } - LoadBgTilemap(3, gUnknown_0203AAD0 + 4, 2, x + 6 * 32); - LoadBgTilemap(3, gUnknown_0203AAD0 + 5, 2, x + 12 * 32); + LoadBgTilemap(3, sUnknown_0203AAD0 + 4, 2, x + 6 * 32); + LoadBgTilemap(3, sUnknown_0203AAD0 + 5, 2, x + 12 * 32); for (y = 7; y <= 11; y++) - LoadBgTilemap(3, gUnknown_0203AAD0 + 6, 2, x + y * 32); + LoadBgTilemap(3, sUnknown_0203AAD0 + 6, 2, x + y * 32); } } static void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4) { - gUnknown_0203AADC[0] = arg1; - gUnknown_0203AADC[1] = arg2; - gUnknown_0203AADC[2] = arg3; - gUnknown_0203AADC[3] = arg4; + sUnknown_0203AADC[0] = arg1; + sUnknown_0203AADC[1] = arg2; + sUnknown_0203AADC[2] = arg3; + sUnknown_0203AADC[3] = arg4; - LoadBgTilemap(2, gUnknown_0203AADC, 2, 15 * 32 + arg0); - LoadBgTilemap(2, gUnknown_0203AADC + 1, 2, 15 * 32 + 1 + arg0); - LoadBgTilemap(2, gUnknown_0203AADC + 2, 2, 16 * 32 + arg0); - LoadBgTilemap(2, gUnknown_0203AADC + 3, 2, 16 * 32 + 1 + arg0); + LoadBgTilemap(2, sUnknown_0203AADC, 2, 15 * 32 + arg0); + LoadBgTilemap(2, sUnknown_0203AADC + 1, 2, 15 * 32 + 1 + arg0); + LoadBgTilemap(2, sUnknown_0203AADC + 2, 2, 16 * 32 + arg0); + LoadBgTilemap(2, sUnknown_0203AADC + 3, 2, 16 * 32 + 1 + arg0); } static void sub_81065DC(void) @@ -4255,108 +4256,108 @@ static void sub_81065DC(void) static void SlotMachineSetup_9_0(void) { - gUnknown_03001188[0] = gUnknown_0203AAF4; - gUnknown_03001188[1] = gUnknown_0203AAF8; - gUnknown_03001188[2] = gUnknown_0203AAFC; - gUnknown_03001188[3] = gUnknown_0203AB04; - gUnknown_03001188[4] = gUnknown_0203AB08; - gUnknown_03001188[5] = gUnknown_0203AB18; - gUnknown_03001188[6] = gUnknown_0203AB1C; - gUnknown_03001188[7] = gUnknown_0203AB20; - gUnknown_03001188[8] = gUnknown_0203AB24; - gUnknown_03001188[9] = gUnknown_0203AB28; - gUnknown_03001188[10] = gUnknown_0203AB00; - gUnknown_03001188[11] = gUnknown_0203AB00; - gUnknown_03001188[12] = gUnknown_0203AB00; - gUnknown_03001188[13] = gUnknown_0203AB00; - gUnknown_03001188[14] = gUnknown_0203AB0C; - gUnknown_03001188[15] = gUnknown_0203AB0C; - gUnknown_03001188[16] = gUnknown_0203AB0C; - gUnknown_03001188[17] = gUnknown_0203AB0C; - gUnknown_03001188[18] = gUnknown_0203AB0C; - gUnknown_03001188[19] = gUnknown_0203AB10; - gUnknown_03001188[20] = gUnknown_0203AB10; - gUnknown_03001188[21] = gUnknown_0203AB10; - gUnknown_03001188[22] = gUnknown_0203AB14; - gUnknown_03001188[23] = gUnknown_0203AB14; - gUnknown_03001188[24] = gUnknown_0203AB14; + gUnknown_03001188[0] = sUnknown_0203AAF4; + gUnknown_03001188[1] = sUnknown_0203AAF8; + gUnknown_03001188[2] = sUnknown_0203AAFC; + gUnknown_03001188[3] = sUnknown_0203AB04; + gUnknown_03001188[4] = sUnknown_0203AB08; + gUnknown_03001188[5] = sUnknown_0203AB18; + gUnknown_03001188[6] = sUnknown_0203AB1C; + gUnknown_03001188[7] = sUnknown_0203AB20; + gUnknown_03001188[8] = sUnknown_0203AB24; + gUnknown_03001188[9] = sUnknown_0203AB28; + gUnknown_03001188[10] = sUnknown_0203AB00; + gUnknown_03001188[11] = sUnknown_0203AB00; + gUnknown_03001188[12] = sUnknown_0203AB00; + gUnknown_03001188[13] = sUnknown_0203AB00; + gUnknown_03001188[14] = sUnknown_0203AB0C; + gUnknown_03001188[15] = sUnknown_0203AB0C; + gUnknown_03001188[16] = sUnknown_0203AB0C; + gUnknown_03001188[17] = sUnknown_0203AB0C; + gUnknown_03001188[18] = sUnknown_0203AB0C; + gUnknown_03001188[19] = sUnknown_0203AB10; + gUnknown_03001188[20] = sUnknown_0203AB10; + gUnknown_03001188[21] = sUnknown_0203AB10; + gUnknown_03001188[22] = sUnknown_0203AB14; + gUnknown_03001188[23] = sUnknown_0203AB14; + gUnknown_03001188[24] = sUnknown_0203AB14; gUnknown_03001188[25] = NULL; } static void SlotMachineSetup_8_0(void) { - gUnknown_0203AAF4 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AAF4[0].data = gUnknown_0203AAD4; - gUnknown_0203AAF4[0].size = 0x600; + sUnknown_0203AAF4 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + sUnknown_0203AAF4[0].data = sUnknown_0203AAD4; + sUnknown_0203AAF4[0].size = 0x600; - gUnknown_0203AAF8 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AAF8[0].data = gUnknown_0203AAD4 + 0x600; - gUnknown_0203AAF8[0].size = 0x200; + sUnknown_0203AAF8 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + sUnknown_0203AAF8[0].data = sUnknown_0203AAD4 + 0x600; + sUnknown_0203AAF8[0].size = 0x200; - gUnknown_0203AAFC = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AAFC[0].data = gUnknown_0203AAD4 + 0x800; - gUnknown_0203AAFC[0].size = 0x200; + sUnknown_0203AAFC = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + sUnknown_0203AAFC[0].data = sUnknown_0203AAD4 + 0x800; + sUnknown_0203AAFC[0].size = 0x200; - gUnknown_0203AB00 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB00[0].data = gUnknown_0203AAD4 + 0xA00; - gUnknown_0203AB00[0].size = 0x200; + sUnknown_0203AB00 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + sUnknown_0203AB00[0].data = sUnknown_0203AAD4 + 0xA00; + sUnknown_0203AB00[0].size = 0x200; - gUnknown_0203AB04 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB04[0].data = gUnknown_0203AAD4 + 0xC00; - gUnknown_0203AB04[0].size = 0x300; + sUnknown_0203AB04 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + sUnknown_0203AB04[0].data = sUnknown_0203AAD4 + 0xC00; + sUnknown_0203AB04[0].size = 0x300; - gUnknown_0203AB08 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB08[0].data = gUnknown_0203AAD4 + 0x1000; - gUnknown_0203AB08[0].size = 0x400; + sUnknown_0203AB08 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + sUnknown_0203AB08[0].data = sUnknown_0203AAD4 + 0x1000; + sUnknown_0203AB08[0].size = 0x400; - gUnknown_0203AB0C = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB0C[0].data = gUnknown_0203AAD4 + 0x1400; - gUnknown_0203AB0C[0].size = 0x200; + sUnknown_0203AB0C = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + sUnknown_0203AB0C[0].data = sUnknown_0203AAD4 + 0x1400; + sUnknown_0203AB0C[0].size = 0x200; - gUnknown_0203AB10 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB10[0].data = gUnknown_0203AAD4 + 0x1600; - gUnknown_0203AB10[0].size = 0x300; + sUnknown_0203AB10 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + sUnknown_0203AB10[0].data = sUnknown_0203AAD4 + 0x1600; + sUnknown_0203AB10[0].size = 0x300; - gUnknown_0203AB14 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB14[0].data = gUnknown_0203AAD4 + 0x1900; - gUnknown_0203AB14[0].size = 0x300; + sUnknown_0203AB14 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + sUnknown_0203AB14[0].data = sUnknown_0203AAD4 + 0x1900; + sUnknown_0203AB14[0].size = 0x300; - gUnknown_0203AB18 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2); - gUnknown_0203AB18[0].data = gUnknown_0203AAD4 + 0x1C00; - gUnknown_0203AB18[0].size = 0x200; - gUnknown_0203AB18[1].data = gUnknown_0203AAD4 + 0x1E00; - gUnknown_0203AB18[1].size = 0x200; + sUnknown_0203AB18 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2); + sUnknown_0203AB18[0].data = sUnknown_0203AAD4 + 0x1C00; + sUnknown_0203AB18[0].size = 0x200; + sUnknown_0203AB18[1].data = sUnknown_0203AAD4 + 0x1E00; + sUnknown_0203AB18[1].size = 0x200; - gUnknown_0203AB1C = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB1C[0].data = gUnknown_0203AAD4 + 0x2000; - gUnknown_0203AB1C[0].size = 640; + sUnknown_0203AB1C = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + sUnknown_0203AB1C[0].data = sUnknown_0203AAD4 + 0x2000; + sUnknown_0203AB1C[0].size = 640; - gUnknown_0203AB20 = AllocZeroed(sizeof(struct SpriteFrameImage) * 5); - gUnknown_0203AB20[0].data = gUnknown_0203AAD4 + 0x2280; - gUnknown_0203AB20[0].size = 0x80; - gUnknown_0203AB20[1].data = gUnknown_0203AAD4 + 0x2300; - gUnknown_0203AB20[1].size = 0x80; - gUnknown_0203AB20[2].data = gUnknown_0203AAD4 + 0x2380; - gUnknown_0203AB20[2].size = 0x80; - gUnknown_0203AB20[3].data = gUnknown_0203AAD4 + 0x2400; - gUnknown_0203AB20[3].size = 0x80; - gUnknown_0203AB20[4].data = gUnknown_0203AAD4 + 0x2480; - gUnknown_0203AB20[4].size = 0x80; + sUnknown_0203AB20 = AllocZeroed(sizeof(struct SpriteFrameImage) * 5); + sUnknown_0203AB20[0].data = sUnknown_0203AAD4 + 0x2280; + sUnknown_0203AB20[0].size = 0x80; + sUnknown_0203AB20[1].data = sUnknown_0203AAD4 + 0x2300; + sUnknown_0203AB20[1].size = 0x80; + sUnknown_0203AB20[2].data = sUnknown_0203AAD4 + 0x2380; + sUnknown_0203AB20[2].size = 0x80; + sUnknown_0203AB20[3].data = sUnknown_0203AAD4 + 0x2400; + sUnknown_0203AB20[3].size = 0x80; + sUnknown_0203AB20[4].data = sUnknown_0203AAD4 + 0x2480; + sUnknown_0203AB20[4].size = 0x80; - gUnknown_0203AB24 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2); - gUnknown_0203AB24[0].data = gUnknown_0203AAD4 + 0x2600; - gUnknown_0203AB24[0].size = 0x480; - gUnknown_0203AB24[1].data = gUnknown_0203AAD4 + 10880; - gUnknown_0203AB24[1].size = 0x480; + sUnknown_0203AB24 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2); + sUnknown_0203AB24[0].data = sUnknown_0203AAD4 + 0x2600; + sUnknown_0203AB24[0].size = 0x480; + sUnknown_0203AB24[1].data = sUnknown_0203AAD4 + 10880; + sUnknown_0203AB24[1].size = 0x480; - gUnknown_0203AB28 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2); - gUnknown_0203AB28[0].data = gUnknown_0203AAD4 + 0x2F00; - gUnknown_0203AB28[0].size = 0x180; - gUnknown_0203AB28[1].data = gUnknown_0203AAD4 + 0x3080; - gUnknown_0203AB28[1].size = 0x180; + sUnknown_0203AB28 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2); + sUnknown_0203AB28[0].data = sUnknown_0203AAD4 + 0x2F00; + sUnknown_0203AB28[0].size = 0x180; + sUnknown_0203AB28[1].data = sUnknown_0203AAD4 + 0x3080; + sUnknown_0203AB28[1].size = 0x180; } -const u8 sReelSymbols[][REEL_NUM_TAGS] = +const u8 gReelSymbols[][REEL_NUM_TAGS] = { { SLOT_MACHINE_TAG_7_RED, @@ -4429,17 +4430,17 @@ const u8 sReelSymbols[][REEL_NUM_TAGS] = }, }; -const u8 ReelTimeTags[] = { +const u8 gReelTimeTags[] = { 1, 0, 5, 4, 3, 2 }; -const s16 sInitialReelPositions[][2] = { +const s16 gInitialReelPositions[][2] = { {0, 6}, {0, 10}, {0, 2} }; -const u8 LuckyRoundTable[][3] = { +const u8 gLuckyRoundProbabilities[][3] = { {1, 1, 12}, {1, 1, 14}, {2, 2, 14}, @@ -4448,13 +4449,13 @@ const u8 LuckyRoundTable[][3] = { {3, 3, 16} }; -const u8 LuckyFlagsTable_Top3[][6] = { +const u8 gLuckyFlagProbabilities_Top3[][6] = { {25, 25, 30, 40, 40, 50}, {25, 25, 30, 30, 35, 35}, {25, 25, 30, 25, 25, 30} }; -const u8 LuckyFlagsTable_NotTop3[][6] = { +const u8 gLuckyFlagProbabilities_NotTop3[][6] = { {20, 25, 25, 20, 25, 25}, {12, 15, 15, 18, 19, 22}, {25, 25, 25, 30, 30, 40}, @@ -4462,7 +4463,7 @@ const u8 LuckyFlagsTable_NotTop3[][6] = { {40, 40, 35, 35, 40, 40} }; -const u8 ReelTimeProbabilityTable_UnluckyGame[][17] = { +const u8 gReeltimeProbabilities_UnluckyGame[][17] = { {243, 243, 243, 80, 80, 80, 80, 40, 40, 40, 40, 40, 40, 5, 5, 5, 5}, { 5, 5, 5, 150, 150, 150, 150, 130, 130, 130, 130, 130, 130, 100, 100, 100, 5}, { 4, 4, 4, 20, 20, 20, 20, 80, 80, 80, 80, 80, 80, 100, 100, 100, 40}, @@ -4471,7 +4472,7 @@ const u8 ReelTimeProbabilityTable_UnluckyGame[][17] = { { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6} }; -const u8 ReelTimeProbabilityTable_LuckyGame[][17] = { +const u8 gReelTimeProbabilities_LuckyGame[][17] = { { 243, 243, 243, 200, 200, 200, 200, 160, 160, 160, 160, 160, 160, 70, 70, 70, 5}, { 5, 5, 5, 25, 25, 25, 25, 5, 5, 5, 5, 5, 5, 2, 2, 2, 6}, { 4, 4, 4, 25, 25, 25, 25, 30, 30, 30, 30, 30, 30, 40, 40, 40, 35}, @@ -4480,11 +4481,11 @@ const u8 ReelTimeProbabilityTable_LuckyGame[][17] = { { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 60} }; -const u16 ProbabilityTable_SkipToReeltimeAction14[] = { +const u16 gProbabilityTable_SkipToReeltimeAction14[] = { 128, 175, 200, 225, 256 }; -const u16 ReelIncrementTable[][2] = { +const u16 gReelIncrementTable[][2] = { {10, 5}, {10, 10}, {10, 15}, @@ -4492,24 +4493,24 @@ const u16 ReelIncrementTable[][2] = { {10, 35} }; -const u16 ReelTimeBonusIncrementTable[] = { +const u16 gReelTimeBonusIncrementTable[] = { 0, 5, 10, 15, 20 }; // tentative name -const u8 BiasTags[] = { +const u8 gBiasTags[] = { SLOT_MACHINE_TAG_REPLAY, SLOT_MACHINE_TAG_CHERRY, SLOT_MACHINE_TAG_LOTAD, SLOT_MACHINE_TAG_AZURILL, SLOT_MACHINE_TAG_POWER, SLOT_MACHINE_TAG_7_RED, SLOT_MACHINE_TAG_7_RED, SLOT_MACHINE_TAG_7_RED }; -const u16 LuckyFlagSettings_Top3[] = { +const u16 gLuckyFlagSettings_Top3[] = { LUCKY_BIAS_777, LUCKY_BIAS_REELTIME, LUCKY_BIAS_MIXED_777 }; -const u16 LuckyFlagSettings_NotTop3[] = { +const u16 gLuckyFlagSettings_NotTop3[] = { LUCKY_BIAS_POWER, LUCKY_BIAS_AZURILL, LUCKY_BIAS_LOTAD, LUCKY_BIAS_CHERRY, LUCKY_BIAS_REPLAY }; -const u8 sSym2Match[] = { +const u8 gSym2Match[] = { SLOT_MACHINE_MATCHED_777_RED, SLOT_MACHINE_MATCHED_777_BLUE, SLOT_MACHINE_MATCHED_AZURILL, @@ -4519,7 +4520,7 @@ const u8 sSym2Match[] = { SLOT_MACHINE_MATCHED_REPLAY }; -const u16 sSlotMatchFlags[] = { +const u16 gSlotMatchFlags[] = { 1 << SLOT_MACHINE_MATCHED_1CHERRY, 1 << SLOT_MACHINE_MATCHED_2CHERRY, 1 << SLOT_MACHINE_MATCHED_REPLAY, @@ -4531,7 +4532,7 @@ const u16 sSlotMatchFlags[] = { 1 << SLOT_MACHINE_MATCHED_777_BLUE }; -const u16 sSlotPayouts[] = { +const u16 gSlotPayouts[] = { 2, 4, 0, 6, 12, 3, 90, 300, 300 }; From 9ed0f775289d574a792f20ec37fe24f26e765117 Mon Sep 17 00:00:00 2001 From: hondew Date: Thu, 28 Feb 2019 18:58:35 -0500 Subject: [PATCH 151/217] fixed issues in data and include dirs --- data/slot_machine.s | 976 ++++++++++++++++++++--------------------- include/slot_machine.h | 5 - 2 files changed, 488 insertions(+), 493 deletions(-) mode change 100644 => 100755 data/slot_machine.s diff --git a/data/slot_machine.s b/data/slot_machine.s old mode 100644 new mode 100755 index adc65feec5..a3d502dccf --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -1,841 +1,841 @@ -.include "asm/macros.inc" -.include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" -.section .rodata + .section .rodata .align 2 gUnknown_085A7A3C:: @ 85A7A3C -.2byte 0 -.2byte 0 -.2byte 0 -.2byte 0 + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0 gUnknown_085A7A44:: @ 85A7A44 -.2byte 0x8000 -.2byte 0 -.2byte 0 -.2byte 0 + .2byte 0x8000 + .2byte 0 + .2byte 0 + .2byte 0 gUnknown_085A7A4C:: @ 85A7A4C -.2byte 0 -.2byte 0x4000 -.2byte 0 -.2byte 0 + .2byte 0 + .2byte 0x4000 + .2byte 0 + .2byte 0 gUnknown_085A7A54:: @ 85A7A54 -.2byte 0x8000 -.2byte 0x8000 -.2byte 0 -.2byte 0 + .2byte 0x8000 + .2byte 0x8000 + .2byte 0 + .2byte 0 gUnknown_085A7A5C:: @ 85A7A5C -.2byte 0 -.2byte 0x8000 -.2byte 0 -.2byte 0 + .2byte 0 + .2byte 0x8000 + .2byte 0 + .2byte 0 gUnknown_085A7A64:: @ 85A7A64 -.2byte 0x8000 -.2byte 0xC000 -.2byte 0 -.2byte 0 + .2byte 0x8000 + .2byte 0xC000 + .2byte 0 + .2byte 0 gUnknown_085A7A6C:: @ 85A7A6C -.2byte 0x4000 -.2byte 0xC000 -.2byte 0 -.2byte 0 + .2byte 0x4000 + .2byte 0xC000 + .2byte 0 + .2byte 0 gUnknown_085A7A74:: @ 85A7A74 -.2byte 0 -.2byte 0xC000 -.2byte 0 -.2byte 0 + .2byte 0 + .2byte 0xC000 + .2byte 0 + .2byte 0 gUnknown_085A7A7C:: @ 85A7A7C -.4byte gSlotMachineReelTimeNumber0 -.2byte 0x80 -.2byte 0 -.4byte gSlotMachineReelTimeNumber1 -.2byte 0x80 -.2byte 0 -.4byte gSlotMachineReelTimeNumber2 -.2byte 0x80 -.2byte 0 -.4byte gSlotMachineReelTimeNumber3 -.2byte 0x80 -.2byte 0 -.4byte gSlotMachineReelTimeNumber4 -.2byte 0x80 -.2byte 0 -.4byte gSlotMachineReelTimeNumber5 -.2byte 0x80 -.2byte 0 + .4byte gSlotMachineReelTimeNumber0 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber1 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber2 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber3 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber4 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber5 + .2byte 0x80 + .2byte 0 gUnknown_085A7AAC:: @ 85A7AAC -.4byte gSlotMachineReelTimeShadow -.2byte 0x200 -.2byte 0 + .4byte gSlotMachineReelTimeShadow + .2byte 0x200 + .2byte 0 gUnknown_085A7AB4:: @ 85A7AB4 -.4byte gUnknown_08DD1A18 -.2byte 0x40 -.2byte 0 + .4byte gUnknown_08DD1A18 + .2byte 0x40 + .2byte 0 gUnknown_085A7ABC:: @ 85A7ABC -.4byte gSlotMachineReelTimeLargeBolt0 -.2byte 0x100 -.2byte 0 -.4byte gSlotMachineReelTimeLargeBolt1 -.2byte 0x100 -.2byte 0 + .4byte gSlotMachineReelTimeLargeBolt0 + .2byte 0x100 + .2byte 0 + .4byte gSlotMachineReelTimeLargeBolt1 + .2byte 0x100 + .2byte 0 gUnknown_085A7ACC:: @ 85A7ACC -.4byte gSlotMachineReelTimePikaAura -.2byte 0x400 -.2byte 0 + .4byte gSlotMachineReelTimePikaAura + .2byte 0x400 + .2byte 0 gUnknown_085A7AD4:: @ 85A7CD4 -.4byte gSlotMachineReelTimeExplosion0 -.2byte 0x200 -.2byte 0 -.4byte gSlotMachineReelTimeExplosion1 -.2byte 0x200 -.2byte 0 + .4byte gSlotMachineReelTimeExplosion0 + .2byte 0x200 + .2byte 0 + .4byte gSlotMachineReelTimeExplosion1 + .2byte 0x200 + .2byte 0 gUnknown_085A7AE4:: @ 85A7AE4 -.4byte gSlotMachineReelTimeDuck -.4byte 32 + .4byte gSlotMachineReelTimeDuck + .4byte 32 gUnknown_085A7AEC:: @ 85A7AEC -.4byte gSlotMachineReelTimeSmoke -.4byte 0x80 + .4byte gSlotMachineReelTimeSmoke + .4byte 0x80 gUnknown_085A7AF4:: @ 85A7AF4 -.4byte gSlotMachineReelTimeBolt -.4byte 32 + .4byte gSlotMachineReelTimeBolt + .4byte 32 gUnknown_085A7AFC:: @ 85A7AFC -obj_image_anim_frame 0, 1 -obj_image_anim_end + obj_image_anim_frame 0, 1 + obj_image_anim_end gUnknown_085A7B04:: @ 85A7B04 -obj_image_anim_frame 0, 1 -obj_image_anim_jump 0 + obj_image_anim_frame 0, 1 + obj_image_anim_jump 0 gUnknown_085A7B0C:: @ 85A7B0C -obj_image_anim_frame 0, 16 -obj_image_anim_end + obj_image_anim_frame 0, 16 + obj_image_anim_end gUnknown_085A7B14:: @ 85A7B14 -obj_image_anim_frame 1, 16 -obj_image_anim_frame 0, 16 -obj_image_anim_jump 0 + obj_image_anim_frame 1, 16 + obj_image_anim_frame 0, 16 + obj_image_anim_jump 0 gUnknown_085A7B20:: @ 85A7B20 -obj_image_anim_frame 1, 8 -obj_image_anim_frame 0, 8 -obj_image_anim_jump 0 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 0, 8 + obj_image_anim_jump 0 gUnknown_085A7B2C:: @ 85A7B2C -obj_image_anim_frame 1, 4 -obj_image_anim_frame 0, 4 -obj_image_anim_jump 0 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 0, 4 + obj_image_anim_jump 0 gUnknown_085A7B38:: @ 85A7B38 -obj_image_anim_frame 2, 32 -obj_image_anim_frame 3, 32 -obj_image_anim_jump 0 + obj_image_anim_frame 2, 32 + obj_image_anim_frame 3, 32 + obj_image_anim_jump 0 gUnknown_085A7B44:: @ 85A7B44 -obj_image_anim_frame 4, 1 -obj_image_anim_end + obj_image_anim_frame 4, 1 + obj_image_anim_end gUnknown_085A7B4C:: @ 85A7B4C -obj_image_anim_frame 0, 1 -obj_image_anim_end + obj_image_anim_frame 0, 1 + obj_image_anim_end gUnknown_085A7B54:: @ 85A7B54 -obj_image_anim_frame 1, 1 -obj_image_anim_end + obj_image_anim_frame 1, 1 + obj_image_anim_end gUnknown_085A7B5C:: @ 85A7B5C -obj_image_anim_frame 2, 1 -obj_image_anim_end + obj_image_anim_frame 2, 1 + obj_image_anim_end gUnknown_085A7B64:: @ 85A7B64 -obj_image_anim_frame 3, 1 -obj_image_anim_end + obj_image_anim_frame 3, 1 + obj_image_anim_end gUnknown_085A7B6C:: @ 85A7B6C -obj_image_anim_frame 4, 1 -obj_image_anim_end + obj_image_anim_frame 4, 1 + obj_image_anim_end gUnknown_085A7B74:: @ 85A7B74 -obj_image_anim_frame 5, 1 -obj_image_anim_end + obj_image_anim_frame 5, 1 + obj_image_anim_end gUnknown_085A7B7C:: @ 85A7B7C -obj_image_anim_frame 0, 4 -obj_image_anim_frame 1, 4 -obj_image_anim_jump 0 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_jump 0 gUnknown_085A7B88:: @ 85A7B88 -obj_image_anim_frame 0, 16 -obj_image_anim_frame 1, 16 -obj_image_anim_jump 0 + obj_image_anim_frame 0, 16 + obj_image_anim_frame 1, 16 + obj_image_anim_jump 0 gUnknown_085A7B94:: @ 85A7B94 -obj_image_anim_frame 0, 30 -obj_image_anim_frame 1, 30 -obj_image_anim_jump 0 + obj_image_anim_frame 0, 30 + obj_image_anim_frame 1, 30 + obj_image_anim_jump 0 gUnknown_085A7BA0:: @ 85A7BA0 -obj_image_anim_frame 1, 1 -obj_image_anim_end + obj_image_anim_frame 1, 1 + obj_image_anim_end gUnknown_085A7BA8:: @ 85A7BA8 -obj_image_anim_frame 0, 30 -obj_image_anim_frame 1, 30 -obj_image_anim_jump 0 + obj_image_anim_frame 0, 30 + obj_image_anim_frame 1, 30 + obj_image_anim_jump 0 gUnknown_085A7BB4:: @ 85A7BB4 -obj_image_anim_frame 0, 16 -obj_image_anim_frame 1, 16 -obj_image_anim_frame 0, 16 -obj_image_anim_frame 1, 80 -obj_image_anim_jump 0 + obj_image_anim_frame 0, 16 + obj_image_anim_frame 1, 16 + obj_image_anim_frame 0, 16 + obj_image_anim_frame 1, 80 + obj_image_anim_jump 0 gUnknown_085A7BC8:: @ 85A7BC8 -obj_image_anim_frame 0, 1 -obj_image_anim_end + obj_image_anim_frame 0, 1 + obj_image_anim_end gUnknown_085A7BD0:: @ 85A7BD0 -obj_image_anim_frame 0, 1 -obj_image_anim_end + obj_image_anim_frame 0, 1 + obj_image_anim_end gUnknown_085A7BD8:: @ 85A7BD8 -obj_image_anim_frame 1, 1 -obj_image_anim_end + obj_image_anim_frame 1, 1 + obj_image_anim_end gUnknown_085A7BE0:: @ 85A7BE0 -obj_image_anim_frame 2, 1 -obj_image_anim_end + obj_image_anim_frame 2, 1 + obj_image_anim_end gUnknown_085A7BE8:: @ 85A7BE8 -obj_image_anim_frame 3, 1 -obj_image_anim_end + obj_image_anim_frame 3, 1 + obj_image_anim_end gUnknown_085A7BF0:: @ 85A7BF0 -obj_image_anim_frame 4, 1 -obj_image_anim_end + obj_image_anim_frame 4, 1 + obj_image_anim_end gUnknown_085A7BF8:: @ 85A7BF8 -.4byte gUnknown_085A7AFC + .4byte gUnknown_085A7AFC gUnknown_085A7BFC:: @ 85A7BFC -.4byte gUnknown_085A7B04 + .4byte gUnknown_085A7B04 gUnknown_085A7C00:: @ 85A7C00 -.4byte gUnknown_085A7B0C -.4byte gUnknown_085A7B14 -.4byte gUnknown_085A7B20 -.4byte gUnknown_085A7B2C -.4byte gUnknown_085A7B38 -.4byte gUnknown_085A7B44 + .4byte gUnknown_085A7B0C + .4byte gUnknown_085A7B14 + .4byte gUnknown_085A7B20 + .4byte gUnknown_085A7B2C + .4byte gUnknown_085A7B38 + .4byte gUnknown_085A7B44 gUnknown_085A7C18:: @ 85A7C18 -.4byte gUnknown_085A7B4C -.4byte gUnknown_085A7B54 -.4byte gUnknown_085A7B5C -.4byte gUnknown_085A7B64 -.4byte gUnknown_085A7B6C -.4byte gUnknown_085A7B74 + .4byte gUnknown_085A7B4C + .4byte gUnknown_085A7B54 + .4byte gUnknown_085A7B5C + .4byte gUnknown_085A7B64 + .4byte gUnknown_085A7B6C + .4byte gUnknown_085A7B74 gUnknown_085A7C30:: @ 85A7C30 -.4byte gUnknown_085A7B7C + .4byte gUnknown_085A7B7C gUnknown_085A7C34:: @ 85A7C34 -.4byte gUnknown_085A7B88 + .4byte gUnknown_085A7B88 gUnknown_085A7C38:: @ 85A7C38 -.4byte gUnknown_085A7B94 -.4byte gUnknown_085A7BA0 + .4byte gUnknown_085A7B94 + .4byte gUnknown_085A7BA0 gUnknown_085A7C40:: @ 85A7C40 -.4byte gUnknown_085A7BA8 + .4byte gUnknown_085A7BA8 gUnknown_085A7C44:: @ 85A7C44 -.4byte gUnknown_085A7BB4 -.4byte gUnknown_085A7BC8 + .4byte gUnknown_085A7BB4 + .4byte gUnknown_085A7BC8 gUnknown_085A7C4C:: @ 85A7C4C -.4byte gUnknown_085A7BD0 -.4byte gUnknown_085A7BD8 -.4byte gUnknown_085A7BE0 -.4byte gUnknown_085A7BE8 -.4byte gUnknown_085A7BF0 + .4byte gUnknown_085A7BD0 + .4byte gUnknown_085A7BD8 + .4byte gUnknown_085A7BE0 + .4byte gUnknown_085A7BE8 + .4byte gUnknown_085A7BF0 gUnknown_085A7C60:: @ 85A7C60 -obj_rot_scal_anim_frame 16, 16, 0, 0 -obj_rot_scal_anim_loop 0 -obj_rot_scal_anim_frame 1, 1, 0, 1 -obj_rot_scal_anim_loop 0xFF -obj_rot_scal_anim_end + obj_rot_scal_anim_frame 16, 16, 0, 0 + obj_rot_scal_anim_loop 0 + obj_rot_scal_anim_frame 1, 1, 0, 1 + obj_rot_scal_anim_loop 0xFF + obj_rot_scal_anim_end gUnknown_085A7C88:: @ 85A7C88 -.4byte gUnknown_085A7C60 + .4byte gUnknown_085A7C60 gUnknown_085A7C8C:: @ 85A7C8C -obj_rot_scal_anim_frame 0, 0, 8, 32 -obj_rot_scal_anim_frame 0, 0, 6, 32 -obj_rot_scal_anim_frame 0, 0, 4, 16 -obj_rot_scal_anim_frame 0, 0, 12, 2 -obj_rot_scal_anim_frame 0, 0, -12, 4 -obj_rot_scal_anim_frame 0, 0, 12, 2 -obj_rot_scal_anim_frame 0, 0, 12, 2 -obj_rot_scal_anim_frame 0, 0, -12, 4 -obj_rot_scal_anim_frame 0, 0, 12, 2 -obj_rot_scal_anim_end + obj_rot_scal_anim_frame 0, 0, 8, 32 + obj_rot_scal_anim_frame 0, 0, 6, 32 + obj_rot_scal_anim_frame 0, 0, 4, 16 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_frame 0, 0, -12, 4 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_frame 0, 0, -12, 4 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_end gUnknown_085A7CDC:: @ 85A7CDC -.4byte gUnknown_085A7C8C + .4byte gUnknown_085A7C8C gSpriteTemplate_83ED414:: @ 85A7CE0 -spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_8104F18 + spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_8104F18 gSpriteTemplate_83ED42C:: @ 85A7CF8 -spr_template 7, 4, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_810506C + spr_template 7, 4, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_810506C gSpriteTemplate_83ED444:: @ 85A7D10 -spr_template 17, 0, gUnknown_085A7A74, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 17, 0, gUnknown_085A7A74, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gSpriteTemplate_83ED45C:: @ 85A7D28 -spr_template 0xFFFF, 1, gUnknown_085A7A74, gUnknown_085A7C00, NULL, gDummySpriteAffineAnimTable, sub_8105170 + spr_template 0xFFFF, 1, gUnknown_085A7A74, gUnknown_085A7C00, NULL, gDummySpriteAffineAnimTable, sub_8105170 gSpriteTemplate_83ED474:: @ 85A7D40 -spr_template 0xFFFF, 2, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xFFFF, 2, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gSpriteTemplate_83ED48C:: @ 85A7D58 -spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gSpriteTemplate_83ED4A4:: @ 85A7D70 -spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gSpriteTemplate_83ED4BC:: @ 85A7D88 -spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7C18, gUnknown_085A7A7C, gDummySpriteAffineAnimTable, sub_810535C + spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7C18, gUnknown_085A7A7C, gDummySpriteAffineAnimTable, sub_810535C gSpriteTemplate_83ED4D4:: @ 85A7DA0 -spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AAC, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AAC, gDummySpriteAffineAnimTable, SpriteCallbackDummy gSpriteTemplate_83ED4EC:: @ 85A7DB8 -spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AB4, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AB4, gDummySpriteAffineAnimTable, SpriteCallbackDummy gSpriteTemplate_83ED504:: @ 85A7DD0 -spr_template 0xFFFF, 4, gUnknown_085A7A54, gUnknown_085A7C30, gUnknown_085A7ABC, gDummySpriteAffineAnimTable, sub_810562C + spr_template 0xFFFF, 4, gUnknown_085A7A54, gUnknown_085A7C30, gUnknown_085A7ABC, gDummySpriteAffineAnimTable, sub_810562C gSpriteTemplate_83ED51C:: @ 85A7DE8 -spr_template 0xFFFF, 7, gUnknown_085A7A64, gUnknown_085A7BF8, gUnknown_085A7ACC, gDummySpriteAffineAnimTable, sub_8105784 + spr_template 0xFFFF, 7, gUnknown_085A7A64, gUnknown_085A7BF8, gUnknown_085A7ACC, gDummySpriteAffineAnimTable, sub_8105784 gSpriteTemplate_83ED534:: @ 85A7E00 -spr_template 0xFFFF, 5, gUnknown_085A7A5C, gUnknown_085A7C34, gUnknown_085A7AD4, gDummySpriteAffineAnimTable, sub_8105894 + spr_template 0xFFFF, 5, gUnknown_085A7A5C, gUnknown_085A7C34, gUnknown_085A7AD4, gDummySpriteAffineAnimTable, sub_8105894 gSpriteTemplate_83ED54C:: @ 85A7E18 -spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BFC, gUnknown_085A7AE4, gDummySpriteAffineAnimTable, sub_810594C + spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BFC, gUnknown_085A7AE4, gDummySpriteAffineAnimTable, sub_810594C gSpriteTemplate_83ED564:: @ 85A7E30 -spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_8105A38 + spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_8105A38 gUnknown_085A7E48:: @ 85A7E48 -spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7E60:: @ 85A7E60 -spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7E78:: @ 85A7E78 -spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7E90:: @ 85A7E90 -spr_template 18, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 18, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7EA8:: @ 85A7EA8 -spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7EC0:: @ 85A7EC0 -spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7ED8:: @ 85A7ED8 -spr_template 19, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 19, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7EF0:: @ 85A7EF0 -spr_template 20, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 20, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7F08:: @ 85A7F08 -spr_template 21, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 21, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7F20:: @ 85A7F20 -spr_template 0xFFFF, 6, gUnknown_085A7A5C, gUnknown_085A7C38, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xFFFF, 6, gUnknown_085A7A5C, gUnknown_085A7C38, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7F38:: @ 85A7F38 -spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7F50:: @ 85A7F50 -spr_template 0xFFFF, 6, gUnknown_085A7A4C, gUnknown_085A7C4C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xFFFF, 6, gUnknown_085A7A4C, gUnknown_085A7C4C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7F68:: @ 85A7F68 -spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C44, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C44, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7F80:: @ 85A7F80 -spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gSpriteTemplate_83ED6CC:: @ 85A7F98 -spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_8105B70 + spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_8105B70 gUnknown_085A7FB0:: @ 85A7FB0 -subsprite -64, -64, 3, 0, 64x64 -subsprite 0, -64, 3, 0, 64x64 -subsprite -64, 0, 3, 0, 64x64 -subsprite 0, 0, 3, 0, 64x64 + subsprite -64, -64, 3, 0, 64x64 + subsprite 0, -64, 3, 0, 64x64 + subsprite -64, 0, 3, 0, 64x64 + subsprite 0, 0, 3, 0, 64x64 gSubspriteTables_83ED704:: @ 85A7FC0 -.4byte 4, gUnknown_085A7FB0 + .4byte 4, gUnknown_085A7FB0 gUnknown_085A7FC8:: @ 85A7FC8 -subsprite -32, -12, 1, 0, 32x8 -subsprite 0, -12, 1, 4, 32x8 -subsprite -32, -4, 1, 8, 32x8 -subsprite 0, -4, 1, 12, 32x8 -subsprite -32, 4, 1, 16, 32x8 -subsprite 0, 4, 1, 20, 32x8 + subsprite -32, -12, 1, 0, 32x8 + subsprite 0, -12, 1, 4, 32x8 + subsprite -32, -4, 1, 8, 32x8 + subsprite 0, -4, 1, 12, 32x8 + subsprite -32, 4, 1, 16, 32x8 + subsprite 0, 4, 1, 20, 32x8 gSubspriteTables_83ED73C:: @ 85A7FE0 -.4byte 6, gUnknown_085A7FC8 + .4byte 6, gUnknown_085A7FC8 gUnknown_085A7FE8:: @ 85A7FE8 -subsprite -32, -20, 1, 0, 64x32 -subsprite -32, 12, 1, 32, 32x8 -subsprite 0, 12, 1, 36, 32x8 + subsprite -32, -20, 1, 0, 64x32 + subsprite -32, 12, 1, 32, 32x8 + subsprite 0, 12, 1, 36, 32x8 gSubspriteTables_83ED75C:: @ 85A7FF4 -.4byte 3, gUnknown_085A7FE8 + .4byte 3, gUnknown_085A7FE8 gUnknown_085A7FFC:: @ 85A7FFC -subsprite -32, -24, 1, 0, 64x32 -subsprite -32, 8, 1, 32, 32x8 -subsprite 0, 8, 1, 36, 32x8 -subsprite -32, 16, 1, 40, 32x8 -subsprite 0, 16, 1, 44, 32x8 + subsprite -32, -24, 1, 0, 64x32 + subsprite -32, 8, 1, 32, 32x8 + subsprite 0, 8, 1, 36, 32x8 + subsprite -32, 16, 1, 40, 32x8 + subsprite 0, 16, 1, 44, 32x8 gSubspriteTables_83ED78C:: @ 85A8010 -.4byte 5, gUnknown_085A7FFC + .4byte 5, gUnknown_085A7FFC gUnknown_085A8018:: @ 85A8018 -subsprite -32, -8, 1, 0, 32x8 -subsprite 0, -8, 1, 4, 32x8 -subsprite -32, 0, 1, 8, 32x8 -subsprite 0, 0, 1, 12, 32x8 + subsprite -32, -8, 1, 0, 32x8 + subsprite 0, -8, 1, 4, 32x8 + subsprite -32, 0, 1, 8, 32x8 + subsprite 0, 0, 1, 12, 32x8 gSubspriteTables_83ED7B4:: @ 85A8028 -.4byte 4, gUnknown_085A8018 + .4byte 4, gUnknown_085A8018 gUnknown_085A8030:: @ 85A8030 -subsprite -8, -12, 1, 0, 16x8 -subsprite -8, -4, 1, 0, 16x8 -subsprite -8, 4, 1, 0, 16x8 + subsprite -8, -12, 1, 0, 16x8 + subsprite -8, -4, 1, 0, 16x8 + subsprite -8, 4, 1, 0, 16x8 gSubspriteTables_83ED7D4:: @ 85A803C -.4byte 3, gUnknown_085A8030 + .4byte 3, gUnknown_085A8030 gUnknown_085A8044:: @ 85A8044 -subsprite -32, -24, 3, 0, 64x32 -subsprite -32, 8, 3, 32, 32x8 -subsprite 0, 8, 3, 36, 32x8 -subsprite -32, 16, 3, 40, 32x8 -subsprite 0, 16, 3, 44, 32x8 + subsprite -32, -24, 3, 0, 64x32 + subsprite -32, 8, 3, 32, 32x8 + subsprite 0, 8, 3, 36, 32x8 + subsprite -32, 16, 3, 40, 32x8 + subsprite 0, 16, 3, 44, 32x8 gUnknown_085A8058:: @ 85A8058 -.4byte 5, gUnknown_085A8044 + .4byte 5, gUnknown_085A8044 gUnknown_085A8060:: @ 85A8060 -subsprite -32, -8, 3, 0, 32x8 -subsprite 0, -8, 3, 4, 32x8 -subsprite -32, 0, 3, 8, 32x8 -subsprite 0, 0, 3, 12, 32x8 + subsprite -32, -8, 3, 0, 32x8 + subsprite 0, -8, 3, 4, 32x8 + subsprite -32, 0, 3, 8, 32x8 + subsprite 0, 0, 3, 12, 32x8 gUnknown_085A8070:: @ 85A8070 -.4byte 4, gUnknown_085A8060 + .4byte 4, gUnknown_085A8060 gUnknown_085A8078:: @ 85A8078 -subsprite -32, -8, 3, 0, 32x8 -subsprite 0, -8, 3, 4, 32x8 -subsprite -32, 0, 3, 8, 32x8 -subsprite 0, 0, 3, 12, 32x8 + subsprite -32, -8, 3, 0, 32x8 + subsprite 0, -8, 3, 4, 32x8 + subsprite -32, 0, 3, 8, 32x8 + subsprite 0, 0, 3, 12, 32x8 gUnknown_085A8088:: @ 85A8088 -.4byte 4, gUnknown_085A8078 + .4byte 4, gUnknown_085A8078 gUnknown_085A8090:: @ 85A8090 -subsprite -32, -8, 3, 0, 32x8 -subsprite 0, -8, 3, 4, 32x8 -subsprite -32, 0, 3, 8, 32x8 -subsprite 0, 0, 3, 12, 32x8 + subsprite -32, -8, 3, 0, 32x8 + subsprite 0, -8, 3, 4, 32x8 + subsprite -32, 0, 3, 8, 32x8 + subsprite 0, 0, 3, 12, 32x8 gUnknown_085A80A0:: @ 85A80A0 -.4byte 4, gUnknown_085A8090 + .4byte 4, gUnknown_085A8090 gUnknown_085A80A8:: @ 85A80A8 -subsprite -32, -12, 3, 0, 32x8 -subsprite 0, -12, 3, 4, 32x8 -subsprite -32, -4, 3, 8, 32x8 -subsprite 0, -4, 3, 12, 32x8 -subsprite -32, 4, 3, 16, 32x8 -subsprite 0, 4, 3, 20, 32x8 + subsprite -32, -12, 3, 0, 32x8 + subsprite 0, -12, 3, 4, 32x8 + subsprite -32, -4, 3, 8, 32x8 + subsprite 0, -4, 3, 12, 32x8 + subsprite -32, 4, 3, 16, 32x8 + subsprite 0, 4, 3, 20, 32x8 gUnknown_085A80C0:: @ 85A80C0 -.4byte 6, gUnknown_085A80A8 + .4byte 6, gUnknown_085A80A8 gUnknown_085A80C8:: @ 85A80C8 -subsprite -16, -16, 3, 0, 32x32 + subsprite -16, -16, 3, 0, 32x32 gUnknown_085A80CC:: @ 85A80CC -subsprite -8, -8, 3, 16, 16x16 + subsprite -8, -8, 3, 16, 16x16 gUnknown_085A80D0:: @ 85A80D0 -.4byte 1, gUnknown_085A80C8 + .4byte 1, gUnknown_085A80C8 gUnknown_085A80D8:: @ 85A80D8 -.4byte 1, gUnknown_085A80CC + .4byte 1, gUnknown_085A80CC gUnknown_085A80E0:: @ 85A80E0 -subsprite -24, -24, 3, 0, 32x8 -subsprite 8, -24, 3, 4, 16x8 -subsprite -24, -16, 3, 6, 32x8 -subsprite 8, -16, 3, 10, 16x8 -subsprite -24, -8, 3, 12, 32x8 -subsprite 8, -8, 3, 16, 16x8 -subsprite -24, 0, 3, 18, 32x8 -subsprite 8, 0, 3, 22, 16x8 -subsprite -24, 8, 3, 24, 32x8 -subsprite 8, 8, 3, 28, 16x8 -subsprite -24, 16, 3, 30, 32x8 -subsprite 8, 16, 3, 34, 16x8 + subsprite -24, -24, 3, 0, 32x8 + subsprite 8, -24, 3, 4, 16x8 + subsprite -24, -16, 3, 6, 32x8 + subsprite 8, -16, 3, 10, 16x8 + subsprite -24, -8, 3, 12, 32x8 + subsprite 8, -8, 3, 16, 16x8 + subsprite -24, 0, 3, 18, 32x8 + subsprite 8, 0, 3, 22, 16x8 + subsprite -24, 8, 3, 24, 32x8 + subsprite 8, 8, 3, 28, 16x8 + subsprite -24, 16, 3, 30, 32x8 + subsprite 8, 16, 3, 34, 16x8 gUnknown_085A8110:: @ 85A8110 -.4byte 12, gUnknown_085A80E0 + .4byte 12, gUnknown_085A80E0 gUnknown_085A8118:: @ 85A8118 -subsprite -16, -12, 3, 0, 32x16 -subsprite -16, 4, 3, 8, 16x8 -subsprite 0, 4, 3, 10, 16x8 + subsprite -16, -12, 3, 0, 32x16 + subsprite -16, 4, 3, 8, 16x8 + subsprite 0, 4, 3, 10, 16x8 gUnknown_085A8124:: @ 85A8124 -.4byte 3, gUnknown_085A8118 + .4byte 3, gUnknown_085A8118 gUnknown_085A812C:: @ 85A812C -subsprite -8, -8, 3, 0, 16x8 -subsprite -8, 0, 3, 8, 16x8 + subsprite -8, -8, 3, 0, 16x8 + subsprite -8, 0, 3, 8, 16x8 gUnknown_085A8134:: @ 85A8134 -.4byte 2, gUnknown_085A812C + .4byte 2, gUnknown_085A812C gUnknown_085A813C:: @ 85A813C -subsprite -8, -8, 3, 2, 16x8 -subsprite -8, 0, 3, 10, 16x8 + subsprite -8, -8, 3, 2, 16x8 + subsprite -8, 0, 3, 10, 16x8 gUnknown_085A8144:: @ 85A8144 -.4byte 2, gUnknown_085A813C + .4byte 2, gUnknown_085A813C gUnknown_085A814C:: @ 85A814C -subsprite -8, -8, 3, 4, 16x8 -subsprite -8, 0, 3, 12, 16x8 + subsprite -8, -8, 3, 4, 16x8 + subsprite -8, 0, 3, 12, 16x8 gUnknown_085A8154:: @ 85A8154 -.4byte 2, gUnknown_085A814C + .4byte 2, gUnknown_085A814C gUnknown_085A815C:: @ 85A815C -subsprite -8, -8, 3, 6, 16x8 -subsprite -8, 0, 3, 14, 16x8 + subsprite -8, -8, 3, 6, 16x8 + subsprite -8, 0, 3, 14, 16x8 gUnknown_085A8164:: @ 85A8164 -.4byte 2, gUnknown_085A815C + .4byte 2, gUnknown_085A815C gUnknown_085A816C:: @ 85A816C -subsprite -8, -8, 3, 0, 16x8 -subsprite -8, 0, 3, 8, 16x8 + subsprite -8, -8, 3, 0, 16x8 + subsprite -8, 0, 3, 8, 16x8 gUnknown_085A8174:: @ 85A8174 -.4byte 2, gUnknown_085A816C + .4byte 2, gUnknown_085A816C gUnknown_085A817C:: @ 85A817C -subsprite -4, -8, 3, 2, 8x8 -subsprite -4, 0, 3, 10, 8x8 + subsprite -4, -8, 3, 2, 8x8 + subsprite -4, 0, 3, 10, 8x8 gUnknown_085A8184:: @ 85A8184 -.4byte 2, gUnknown_085A817C + .4byte 2, gUnknown_085A817C gUnknown_085A818C:: @ 85A818C -subsprite -8, -8, 3, 3, 16x8 -subsprite -8, 0, 3, 11, 16x8 + subsprite -8, -8, 3, 3, 16x8 + subsprite -8, 0, 3, 11, 16x8 gUnknown_085A8194:: @ 85A8194 -.4byte 2, gUnknown_085A818C + .4byte 2, gUnknown_085A818C gUnknown_085A819C:: @ 85A819C -subsprite -4, -8, 3, 5, 8x8 -subsprite -4, 0, 3, 13, 8x8 + subsprite -4, -8, 3, 5, 8x8 + subsprite -4, 0, 3, 13, 8x8 gUnknown_085A81A4:: @ 85A81A4 -.4byte 2, gUnknown_085A819C + .4byte 2, gUnknown_085A819C gUnknown_085A81AC:: @ 85A81AC -subsprite -8, -8, 3, 6, 16x8 -subsprite -8, 0, 3, 14, 16x8 + subsprite -8, -8, 3, 6, 16x8 + subsprite -8, 0, 3, 14, 16x8 gUnknown_085A81B4:: @ 85A81B4 -.4byte 2, gUnknown_085A81AC + .4byte 2, gUnknown_085A81AC gUnknown_085A81BC:: @ 85A81BC -subsprite -12, -12, 3, 0, 16x8 -subsprite 4, -12, 3, 2, 8x8 -subsprite -12, -4, 3, 8, 16x8 -subsprite 4, -4, 3, 10, 8x8 -subsprite -12, 4, 3, 16, 16x8 -subsprite 4, 4, 3, 18, 8x8 + subsprite -12, -12, 3, 0, 16x8 + subsprite 4, -12, 3, 2, 8x8 + subsprite -12, -4, 3, 8, 16x8 + subsprite 4, -4, 3, 10, 8x8 + subsprite -12, 4, 3, 16, 16x8 + subsprite 4, 4, 3, 18, 8x8 gUnknown_085A81D4:: @ 85A81D4 -.4byte 6, gUnknown_085A81BC + .4byte 6, gUnknown_085A81BC gUnknown_085A81DC:: @ 85A81DC -subsprite -8, -12, 3, 3, 16x8 -subsprite -8, -4, 3, 11, 16x8 -subsprite -8, 4, 3, 19, 16x8 + subsprite -8, -12, 3, 3, 16x8 + subsprite -8, -4, 3, 11, 16x8 + subsprite -8, 4, 3, 19, 16x8 gUnknown_085A81E8:: @ 85A81E8 -.4byte 3, gUnknown_085A81DC + .4byte 3, gUnknown_085A81DC gUnknown_085A81F0:: @ 85A81F0 -subsprite -12, -12, 3, 5, 16x8 -subsprite 4, -12, 3, 7, 8x8 -subsprite -12, -4, 3, 13, 16x8 -subsprite 4, -4, 3, 15, 8x8 -subsprite -12, 4, 3, 21, 16x8 -subsprite 4, 4, 3, 0x17, 8x8 + subsprite -12, -12, 3, 5, 16x8 + subsprite 4, -12, 3, 7, 8x8 + subsprite -12, -4, 3, 13, 16x8 + subsprite 4, -4, 3, 15, 8x8 + subsprite -12, 4, 3, 21, 16x8 + subsprite 4, 4, 3, 0x17, 8x8 gUnknown_085A8208:: @ 85A8208 -.4byte 6, gUnknown_085A81F0 + .4byte 6, gUnknown_085A81F0 gUnknown_085A8210:: @ 85A8210 -subsprite -12, -12, 3, 0, 16x8 -subsprite 4, -12, 3, 2, 8x8 -subsprite -12, -4, 3, 8, 16x8 -subsprite 4, -4, 3, 10, 8x8 -subsprite -12, 4, 3, 16, 16x8 -subsprite 4, 4, 3, 18, 8x8 + subsprite -12, -12, 3, 0, 16x8 + subsprite 4, -12, 3, 2, 8x8 + subsprite -12, -4, 3, 8, 16x8 + subsprite 4, -4, 3, 10, 8x8 + subsprite -12, 4, 3, 16, 16x8 + subsprite 4, 4, 3, 18, 8x8 gUnknown_085A8228:: @ 85A8228 -.4byte 6, gUnknown_085A8210 + .4byte 6, gUnknown_085A8210 gUnknown_085A822C:: @ 85A822C -subsprite -8, -12, 3, 3, 16x8 -subsprite -8, -4, 3, 11, 16x8 -subsprite -8, 4, 3, 19, 16x8 + subsprite -8, -12, 3, 3, 16x8 + subsprite -8, -4, 3, 11, 16x8 + subsprite -8, 4, 3, 19, 16x8 gUnknown_085A823C:: @ 85A823C -.4byte 3, gUnknown_085A822C + .4byte 3, gUnknown_085A822C gUnknown_085A8244:: @ 85A8244 -subsprite -12, -12, 3, 5, 16x8 -subsprite 4, -12, 3, 7, 8x8 -subsprite -12, -4, 3, 13, 16x8 -subsprite 4, -4, 3, 15, 8x8 -subsprite -12, 4, 3, 21, 16x8 -subsprite 4, 4, 3, 23, 8x8 + subsprite -12, -12, 3, 5, 16x8 + subsprite 4, -12, 3, 7, 8x8 + subsprite -12, -4, 3, 13, 16x8 + subsprite 4, -4, 3, 15, 8x8 + subsprite -12, 4, 3, 21, 16x8 + subsprite 4, 4, 3, 23, 8x8 gUnknown_085A825C:: @ 85A825C -.4byte 6, gUnknown_085A8244 + .4byte 6, gUnknown_085A8244 gUnknown_083EDB5C:: @ 85A8264 -.4byte gUnknown_085A7E48 -.4byte gUnknown_085A7E60 -.4byte gUnknown_085A7E78 -.4byte gUnknown_085A7EA8 -.4byte gUnknown_085A7EC0 -.4byte gUnknown_085A7F20 -.4byte gUnknown_085A7F38 -.4byte gUnknown_085A7F50 -.4byte gUnknown_085A7F68 -.4byte gUnknown_085A7F80 -.4byte gUnknown_085A7E90 -.4byte gUnknown_085A7E90 -.4byte gUnknown_085A7E90 -.4byte gUnknown_085A7E90 -.4byte gUnknown_085A7ED8 -.4byte gUnknown_085A7ED8 -.4byte gUnknown_085A7ED8 -.4byte gUnknown_085A7ED8 -.4byte gUnknown_085A7ED8 -.4byte gUnknown_085A7EF0 -.4byte gUnknown_085A7EF0 -.4byte gUnknown_085A7EF0 -.4byte gUnknown_085A7F08 -.4byte gUnknown_085A7F08 -.4byte gUnknown_085A7F08 -.4byte gDummySpriteTemplate + .4byte gUnknown_085A7E48 + .4byte gUnknown_085A7E60 + .4byte gUnknown_085A7E78 + .4byte gUnknown_085A7EA8 + .4byte gUnknown_085A7EC0 + .4byte gUnknown_085A7F20 + .4byte gUnknown_085A7F38 + .4byte gUnknown_085A7F50 + .4byte gUnknown_085A7F68 + .4byte gUnknown_085A7F80 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7EF0 + .4byte gUnknown_085A7EF0 + .4byte gUnknown_085A7EF0 + .4byte gUnknown_085A7F08 + .4byte gUnknown_085A7F08 + .4byte gUnknown_085A7F08 + .4byte gDummySpriteTemplate gUnknown_083EDBC4:: @ 85A82CC -.4byte gUnknown_085A8058 -.4byte gUnknown_085A8070 -.4byte gUnknown_085A8088 -.4byte gUnknown_085A80C0 -.4byte NULL -.4byte NULL -.4byte gUnknown_085A80D0 -.4byte NULL -.4byte gUnknown_085A8110 -.4byte gUnknown_085A8124 -.4byte gUnknown_085A8134 -.4byte gUnknown_085A8144 -.4byte gUnknown_085A8154 -.4byte gUnknown_085A8164 -.4byte gUnknown_085A8174 -.4byte gUnknown_085A8184 -.4byte gUnknown_085A8194 -.4byte gUnknown_085A81A4 -.4byte gUnknown_085A81B4 -.4byte gUnknown_085A81D4 -.4byte gUnknown_085A81E8 -.4byte gUnknown_085A8208 -.4byte gUnknown_085A8228 -.4byte gUnknown_085A823C -.4byte gUnknown_085A825C -.4byte NULL + .4byte gUnknown_085A8058 + .4byte gUnknown_085A8070 + .4byte gUnknown_085A8088 + .4byte gUnknown_085A80C0 + .4byte NULL + .4byte NULL + .4byte gUnknown_085A80D0 + .4byte NULL + .4byte gUnknown_085A8110 + .4byte gUnknown_085A8124 + .4byte gUnknown_085A8134 + .4byte gUnknown_085A8144 + .4byte gUnknown_085A8154 + .4byte gUnknown_085A8164 + .4byte gUnknown_085A8174 + .4byte gUnknown_085A8184 + .4byte gUnknown_085A8194 + .4byte gUnknown_085A81A4 + .4byte gUnknown_085A81B4 + .4byte gUnknown_085A81D4 + .4byte gUnknown_085A81E8 + .4byte gUnknown_085A8208 + .4byte gUnknown_085A8228 + .4byte gUnknown_085A823C + .4byte gUnknown_085A825C + .4byte NULL -.align 2 -sSlotMachineSpriteSheets:: @ 85A8334 -obj_tiles gSlotMachineReelSymbol1Tiles, 0x0200, 0x0000 -obj_tiles gSlotMachineReelSymbol2Tiles, 0x0200, 0x0001 -obj_tiles gSlotMachineReelSymbol3Tiles, 0x0200, 0x0002 -obj_tiles gSlotMachineReelSymbol4Tiles, 0x0200, 0x0003 -obj_tiles gSlotMachineReelSymbol5Tiles, 0x0200, 0x0004 -obj_tiles gSlotMachineReelSymbol6Tiles, 0x0200, 0x0005 -obj_tiles gSlotMachineReelSymbol7Tiles, 0x0200, 0x0006 -obj_tiles gSlotMachineNumber0Tiles, 0x0040, 0x0007 -obj_tiles gSlotMachineNumber1Tiles, 0x0040, 0x0008 -obj_tiles gSlotMachineNumber2Tiles, 0x0040, 0x0009 -obj_tiles gSlotMachineNumber3Tiles, 0x0040, 0x000A -obj_tiles gSlotMachineNumber4Tiles, 0x0040, 0x000B -obj_tiles gSlotMachineNumber5Tiles, 0x0040, 0x000C -obj_tiles gSlotMachineNumber6Tiles, 0x0040, 0x000D -obj_tiles gSlotMachineNumber7Tiles, 0x0040, 0x000E -obj_tiles gSlotMachineNumber8Tiles, 0x0040, 0x000F -obj_tiles gSlotMachineNumber9Tiles, 0x0040, 0x0010 + .align 2 +gSlotMachineSpriteSheets:: @ 85A8334 + obj_tiles gSlotMachineReelSymbol1Tiles, 0x0200, 0x0000 + obj_tiles gSlotMachineReelSymbol2Tiles, 0x0200, 0x0001 + obj_tiles gSlotMachineReelSymbol3Tiles, 0x0200, 0x0002 + obj_tiles gSlotMachineReelSymbol4Tiles, 0x0200, 0x0003 + obj_tiles gSlotMachineReelSymbol5Tiles, 0x0200, 0x0004 + obj_tiles gSlotMachineReelSymbol6Tiles, 0x0200, 0x0005 + obj_tiles gSlotMachineReelSymbol7Tiles, 0x0200, 0x0006 + obj_tiles gSlotMachineNumber0Tiles, 0x0040, 0x0007 + obj_tiles gSlotMachineNumber1Tiles, 0x0040, 0x0008 + obj_tiles gSlotMachineNumber2Tiles, 0x0040, 0x0009 + obj_tiles gSlotMachineNumber3Tiles, 0x0040, 0x000A + obj_tiles gSlotMachineNumber4Tiles, 0x0040, 0x000B + obj_tiles gSlotMachineNumber5Tiles, 0x0040, 0x000C + obj_tiles gSlotMachineNumber6Tiles, 0x0040, 0x000D + obj_tiles gSlotMachineNumber7Tiles, 0x0040, 0x000E + obj_tiles gSlotMachineNumber8Tiles, 0x0040, 0x000F + obj_tiles gSlotMachineNumber9Tiles, 0x0040, 0x0010 -.align 2 -.byte 0, 0, 0, 0, 0, 2, 0x12, 0, 0, 0, 0, 0, 0, 2, 0x13, 0, 0, 0, 0, 0, 0, 3, 0x14, 0, 0, 0, 0, 0, 0, 3, 0x15, 0, 0, 0, 0, 0, 0, 0, 0, 0 + .align 2 + .byte 0, 0, 0, 0, 0, 2, 0x12, 0, 0, 0, 0, 0, 0, 2, 0x13, 0, 0, 0, 0, 0, 0, 3, 0x14, 0, 0, 0, 0, 0, 0, 3, 0x15, 0, 0, 0, 0, 0, 0, 0, 0, 0 gUnknown_083EDCDC:: @ 85A83E4 -.4byte gUnknown_08DD19F8 -@ might be a palette idk -.byte 0x7B, 0x6F, 0x68, 0x69, 0xAB, 0x36, 0xFF, 0x7F, 0x50, 0x57, 0xC0, 0x7E, 0xBA, 2, 0xBA, 2, 0xFD, 1, 0xFD, 1 + .4byte gUnknown_08DD19F8 + @ might be a palette idk + .byte 0x7B, 0x6F, 0x68, 0x69, 0xAB, 0x36, 0xFF, 0x7F, 0x50, 0x57, 0xC0, 0x7E, 0xBA, 2, 0xBA, 2, 0xFD, 1, 0xFD, 1 gUnknown_085A83FC:: @ 85A83FC -.byte 0x91, 0x7F + .byte 0x91, 0x7F gUnknown_085A83FE:: @ 85A83FE -.byte 0xBF, 0x43 + .byte 0xBF, 0x43 gUnknown_085A8400:: @ 85A8400 -.byte 0xBF, 0x43 + .byte 0xBF, 0x43 gUnknown_085A8402:: @ 85A8402 -.byte 0xBF, 0x4A + .byte 0xBF, 0x4A gUnknown_085A8404:: @ 85A8404 -.byte 0xBF, 0x4A, 0, 0 + .byte 0xBF, 0x4A, 0, 0 gUnknown_083EDD08:: @ 85A8408 -.4byte gUnknown_085A83FC -.4byte gUnknown_085A83FE -.4byte gUnknown_085A8400 -.4byte gUnknown_085A8402 -.4byte gUnknown_085A8404 + .4byte gUnknown_085A83FC + .4byte gUnknown_085A83FE + .4byte gUnknown_085A8400 + .4byte gUnknown_085A8402 + .4byte gUnknown_085A8404 gUnknown_083EDD1C:: @ 85A841C -.4byte gSlotMachineMenu_Pal + 0x94 -.4byte gSlotMachineMenu_Pal + 0x96 -.4byte gSlotMachineMenu_Pal + 0x98 -.4byte gSlotMachineMenu_Pal + 0x9A -.4byte gSlotMachineMenu_Pal + 0x9C + .4byte gSlotMachineMenu_Pal + 0x94 + .4byte gSlotMachineMenu_Pal + 0x96 + .4byte gSlotMachineMenu_Pal + 0x98 + .4byte gSlotMachineMenu_Pal + 0x9A + .4byte gSlotMachineMenu_Pal + 0x9C gUnknown_083EDD30:: @ 85A8430 -.byte 0x4A, 0x4B, 0x4C, 0x4E, 0x4D + .byte 0x4A, 0x4B, 0x4C, 0x4E, 0x4D gBettingTilesId:: @ 85A8435 -.byte 0, 0 -.byte 1, 2 -.byte 3, 4 + .byte 0, 0 + .byte 1, 2 + .byte 3, 4 gNumberBettingTiles:: @ 85A843B -.byte 1, 2, 2 + .byte 1, 2, 2 gUnknown_085A843E:: @ 85A843E -.incbin "graphics/slot_machine/85A843E.gbapal" + .incbin "graphics/slot_machine/85A843E.gbapal" gUnknown_085A845E:: @ 85A845E -.incbin "graphics/slot_machine/85A845E.gbapal" + .incbin "graphics/slot_machine/85A845E.gbapal" gUnknown_085A847E:: @ 85A847E -.incbin "graphics/slot_machine/85A847E.gbapal" + .incbin "graphics/slot_machine/85A847E.gbapal" -.align 2 + .align 2 gUnknown_083EDDA0:: @ 85A84A0 -.4byte gUnknown_085A843E -.4byte gUnknown_085A845E -.4byte gUnknown_085A847E + .4byte gUnknown_085A843E + .4byte gUnknown_085A845E + .4byte gUnknown_085A847E gUnknown_083EDDAC:: @ 85A84AC -.4byte gSlotMachineMenu_Pal + 0x20 + .4byte gSlotMachineMenu_Pal + 0x20 gUnknown_085A84B0:: @ 85A84B0 -.incbin "graphics/slot_machine/85A84B0.gbapal" + .incbin "graphics/slot_machine/85A84B0.gbapal" gUnknown_085A84D0:: @ 85A84D0 -.incbin "graphics/slot_machine/85A84D0.gbapal" + .incbin "graphics/slot_machine/85A84D0.gbapal" gUnknown_085A84F0:: @ 85A84F0 -.incbin "graphics/slot_machine/85A84F0.gbapal" + .incbin "graphics/slot_machine/85A84F0.gbapal" gUnknown_083EDE10:: @ 85A8510 -.4byte gUnknown_085A84B0 -.4byte gUnknown_085A84D0 -.4byte gUnknown_085A84F0 -.4byte gUnknown_08DCF230 + .4byte gUnknown_085A84B0 + .4byte gUnknown_085A84D0 + .4byte gUnknown_085A84F0 + .4byte gUnknown_08DCF230 gUnknown_083EDE20:: @ 85A8520 -.4byte gUnknown_08DCF230 + .4byte gUnknown_08DCF230 gPalette_83EDE24:: @ 85A8524 -.incbin "graphics/slot_machine/85A8524.bin" + .incbin "graphics/slot_machine/85A8524.bin" -.align 2 + .align 2 gSlotMachineSpritePalettes:: @ 85A8544 -obj_pal gUnknown_08DCF170, 0 -obj_pal gUnknown_08DCF190, 1 -obj_pal gUnknown_08DCF1B0, 2 -obj_pal gSlotMachineReelTime_Pal, 3 -obj_pal gUnknown_08DCF1F0, 4 -obj_pal gUnknown_08DCF210, 5 -obj_pal gUnknown_08DCF230, 6 -obj_pal gUnknown_08DCF1F0, 7 -null_obj_pal + obj_pal gUnknown_08DCF170, 0 + obj_pal gUnknown_08DCF190, 1 + obj_pal gUnknown_08DCF1B0, 2 + obj_pal gSlotMachineReelTime_Pal, 3 + obj_pal gUnknown_08DCF1F0, 4 + obj_pal gUnknown_08DCF210, 5 + obj_pal gUnknown_08DCF230, 6 + obj_pal gUnknown_08DCF1F0, 7 + null_obj_pal -sReelTimeGfx:: @ 85A858C -.incbin "graphics/slot_machine/reel_time_gfx.4bpp.lz" +gReelTimeGfx:: @ 85A858C + .incbin "graphics/slot_machine/reel_time_gfx.4bpp.lz" -sReelTimeWindowTilemap:: @ 85A96E0 -@if anyone knows what this tilemap is please do share -.incbin "graphics/slot_machine/85A96E0.bin" +gReelTimeWindowTilemap:: @ 85A96E0 + @if anyone knows what this tilemap is please do share + .incbin "graphics/slot_machine/85A96E0.bin" gUnknown_085A9898:: @ 85A9898 -.4byte NULL + .4byte NULL diff --git a/include/slot_machine.h b/include/slot_machine.h index 84622d9145..d441b74116 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -15,11 +15,6 @@ #define LUCKY_BIAS_MIXED_777 (1 << 6) #define LUCKY_BIAS_777 (1 << 7) -// Rows -#define SLOT_TOP_ROW 0x0001 -#define SLOT_MIDDLE_ROW 0x0002 -#define SLOT_BOTTOM_ROW 0x0003 - void PlaySlotMachine(u8, void (callback)(void)); #endif // GUARD_SLOT_MACHINE_H From 189d387f01104a715d788690fbc76d987ea3d6e1 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 03:08:48 -0500 Subject: [PATCH 152/217] Add macros for metatile manipulation --- asm/macros/event.inc | 4 ++-- include/global.fieldmap.h | 11 +++++++++-- src/battle_pyramid.c | 4 ++-- src/bg.c | 4 ++-- src/decoration.c | 16 ++++++++-------- src/field_effect.c | 2 +- src/field_specials.c | 12 ++++++------ src/fieldmap.c | 37 +++++++++++++++++++------------------ src/fldeff_escalator.c | 14 +++++++------- src/scrcmd.c | 6 +++--- src/secret_base.c | 16 ++++++++-------- src/tv.c | 5 +++-- 12 files changed, 70 insertions(+), 61 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index fa0b3fa065..fa27d049ec 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1163,12 +1163,12 @@ .endm @ Changes the metatile at (x, y) on the current map. - .macro setmetatile x:req, y:req, metatile_number:req, tile_attrib:req + .macro setmetatile x:req, y:req, metatile_number:req, is_impassable:req .byte 0xa2 .2byte \x .2byte \y .2byte \metatile_number - .2byte \tile_attrib + .2byte \is_impassable .endm @ Queues a weather change to the default weather for the map. diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 74a8363bb8..2b85a02d14 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -1,6 +1,13 @@ #ifndef GUARD_GLOBAL_FIELDMAP_H #define GUARD_GLOBAL_FIELDMAP_H +#define MAP_IMPASSABLE_MASK 0x0C00 +#define MAP_METATILE_ID_MASK 0x03FF +#define MAP_UNDEFINED_METATILE_ID 0x03FF +#define MAP_TILE_ELEVATION_SHIFT 12 +#define MAP_IMPASSABLE_SHIFT 10 +#define MAP_TILE_ELEVATION_MASK 0xF000 + enum { CONNECTION_SOUTH = 1, @@ -19,8 +26,8 @@ struct Tileset /*0x01*/ bool8 isSecondary; /*0x04*/ void *tiles; /*0x08*/ void *palettes; - /*0x0c*/ void *metatiles; - /*0x10*/ void *metatileAttributes; + /*0x0c*/ u16 *metatiles; + /*0x10*/ u16 *metatileAttributes; /*0x14*/ TilesetCB callback; }; diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 340c17c597..92ff257b07 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -1267,7 +1267,7 @@ static u8 GetPostBattleDirectionHintTextIndex(int *hintType, u8 minDistanceForEx { for (x = 0; x < 32; x++) { - if ((map[x] & 0x3FF) == FLOOR_EXIT_METATILE) + if ((map[x] & MAP_METATILE_ID_MASK) == FLOOR_EXIT_METATILE) { x += 7 - gEventObjects[gSelectedEventObject].initialCoords.x; y += 7 - gEventObjects[gSelectedEventObject].initialCoords.y; @@ -1568,7 +1568,7 @@ void GenerateBattlePyramidFloorLayout(u16 *backupMapData, bool8 setPlayerPositio { for (x = 0; x < mapLayout->width; x++) { - if ((layoutMap[x] & 0x3FF) != FLOOR_EXIT_METATILE) + if ((layoutMap[x] & MAP_METATILE_ID_MASK) != FLOOR_EXIT_METATILE) { map[x] = layoutMap[x]; } diff --git a/src/bg.c b/src/bg.c index f73f5998d3..571518650f 100644 --- a/src/bg.c +++ b/src/bg.c @@ -1056,7 +1056,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt for (x16 = x; x16 < (x + width); x16++) { CopyTileMapEntry(&firstTileNum, &((u16*)sGpuBgConfigs2[bg].tilemap)[(u16)GetTileMapIndexFromCoords(x16, y16, attribute, mode, mode2)], paletteSlot, 0, 0); - firstTileNum = (firstTileNum & 0xFC00) + ((firstTileNum + tileNumDelta) & 0x3FF); + firstTileNum = (firstTileNum & 0xFC00) + ((firstTileNum + tileNumDelta) & MAP_METATILE_ID_MASK); } } break; @@ -1067,7 +1067,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt for (x16 = x; x16 < (x + width); x16++) { ((u8*)sGpuBgConfigs2[bg].tilemap)[(y16 * mode3) + x16] = firstTileNum; - firstTileNum = (firstTileNum & 0xFC00) + ((firstTileNum + tileNumDelta) & 0x3FF); + firstTileNum = (firstTileNum & 0xFC00) + ((firstTileNum + tileNumDelta) & MAP_METATILE_ID_MASK); } } break; diff --git a/src/decoration.c b/src/decoration.c index 2ac49b98c1..e5f3b6d468 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1158,7 +1158,7 @@ void sub_8127B90(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decor) u16 i; u16 j; u16 behavior; - u16 flags; + u16 impassableFlag; u16 v0; u16 v1; s16 decLeft; @@ -1173,11 +1173,11 @@ void sub_8127B90(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decor) behavior = GetBehaviorByMetatileId(0x200 + gDecorations[decor].tiles[i * decWidth + j]); if (MetatileBehavior_IsSecretBaseImpassable(behavior) == TRUE || (gDecorations[decor].permission != DECORPERM_PASS_FLOOR && (behavior >> 12))) { - flags = 0xc00; + impassableFlag = MAP_IMPASSABLE_MASK; } else { - flags = 0x000; + impassableFlag = 0x000; } if (gDecorations[decor].permission != DECORPERM_NA_WALL && MetatileBehavior_IsSecretBaseNorthWall(MapGridGetMetatileBehaviorAt(decLeft, decBottom)) == TRUE) { @@ -1190,11 +1190,11 @@ void sub_8127B90(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decor) v1 = sub_8127B54(gDecorations[decor].id, i * decWidth + j); if (v1 != 0xFFFF) { - MapGridSetMetatileEntryAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | flags | v1); + MapGridSetMetatileEntryAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | impassableFlag | v1); } else { - MapGridSetMetatileIdAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | flags); + MapGridSetMetatileIdAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | impassableFlag); } } } @@ -1502,7 +1502,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration) { curX = gTasks[taskId].data[0] + j; behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY); - behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & 0xf000; + behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & MAP_TILE_ELEVATION_MASK; if (!sub_81284F4(behaviorAt, decoration)) { return FALSE; @@ -1527,7 +1527,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration) { curX = gTasks[taskId].data[0] + j; behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY); - behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & 0xf000; + behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & MAP_TILE_ELEVATION_MASK; if (!MetatileBehavior_IsNormal(behaviorAt) && !sub_8128484(behaviorAt, behaviorBy)) { return FALSE; @@ -1547,7 +1547,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration) { curX = gTasks[taskId].data[0] + j; behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY); - behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[j]) & 0xf000; + behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[j]) & MAP_TILE_ELEVATION_MASK; if (!MetatileBehavior_IsNormal(behaviorAt) && !MetatileBehavior_IsSecretBaseNorthWall(behaviorAt)) { return FALSE; diff --git a/src/field_effect.c b/src/field_effect.c index e7c0b39b92..07a7f9cafe 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2620,7 +2620,7 @@ static void sub_80B8874(u16 offs) dest = (u16 *)(VRAM + 0x140 + offs); for (i = 0; i < 0x140; i++, dest++) { - *dest = gFieldMoveStreaksTilemap[i] | 0xf000; + *dest = gFieldMoveStreaksTilemap[i] | MAP_TILE_ELEVATION_MASK; } } diff --git a/src/field_specials.c b/src/field_specials.c index 307f813992..c7d1f43678 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -887,8 +887,8 @@ static void PetalburgGymFunc(u8 a0, u16 a1) } for (i = 0; i < nDoors; i++) { - MapGridSetMetatileIdAt(x[i] + 7, y[i] + 7, a1 | 0xc00); - MapGridSetMetatileIdAt(x[i] + 7, y[i] + 8, (a1 + 8) | 0xc00); + MapGridSetMetatileIdAt(x[i] + 7, y[i] + 7, a1 | MAP_IMPASSABLE_MASK); + MapGridSetMetatileIdAt(x[i] + 7, y[i] + 8, (a1 + 8) | MAP_IMPASSABLE_MASK); } DrawWholeMapView(); } @@ -1100,7 +1100,7 @@ static void PCTurnOnEffect_1(s16 flag, s8 dx, s8 dy) tileId = 0x27e; } } - MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + 7, gSaveBlock1Ptr->pos.y + dy + 7, tileId | 0xc00); + MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + 7, gSaveBlock1Ptr->pos.y + dy + 7, tileId | MAP_IMPASSABLE_MASK); } void DoPCTurnOffEffect(void) @@ -1141,7 +1141,7 @@ static void PCTurnOffEffect(void) { tileId = 0x259; } - MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + 7, gSaveBlock1Ptr->pos.y + dy + 7, tileId | 0xc00); + MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + 7, gSaveBlock1Ptr->pos.y + dy + 7, tileId | MAP_IMPASSABLE_MASK); DrawWholeMapView(); } @@ -1892,7 +1892,7 @@ static void sub_8139C80(u8 taskId) { for (x = 0; x < 3; x++) { - MapGridSetMetatileIdAt(x + 8, y + 7, gUnknown_085B2BF4[y][data[0] % 3] | 0xC00); + MapGridSetMetatileIdAt(x + 8, y + 7, gUnknown_085B2BF4[y][data[0] % 3] | MAP_IMPASSABLE_MASK); } } } @@ -1902,7 +1902,7 @@ static void sub_8139C80(u8 taskId) { for (x = 0; x < 3; x++) { - MapGridSetMetatileIdAt(x + 8, y + 7, gUnknown_085B2C06[y][data[0] % 3] | 0xC00); + MapGridSetMetatileIdAt(x + 8, y + 7, gUnknown_085B2C06[y][data[0] % 3] | MAP_IMPASSABLE_MASK); } } } diff --git a/src/fieldmap.c b/src/fieldmap.c index cf5f0356e1..8131fb01b0 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -383,15 +383,15 @@ u8 MapGridGetZCoordAt(int x, int y) i = (x + 1) & 1; i += ((y + 1) & 1) * 2; block = gMapHeader.mapLayout->border[i]; - block |= 0xc00; + block |= MAP_IMPASSABLE_MASK; } - if (block == 0x3ff) + if (block == MAP_UNDEFINED_METATILE_ID) { return 0; } - return block >> 12; + return block >> MAP_TILE_ELEVATION_SHIFT; } u8 MapGridIsImpassableAt(int x, int y) @@ -411,13 +411,13 @@ u8 MapGridIsImpassableAt(int x, int y) i = (x + 1) & 1; i += ((y + 1) & 1) * 2; block = gMapHeader.mapLayout->border[i]; - block |= 0xc00; + block |= MAP_IMPASSABLE_MASK; } - if (block == 0x3ff) + if (block == MAP_UNDEFINED_METATILE_ID) { return 1; } - return (block & 0xc00) >> 10; + return (block & MAP_IMPASSABLE_MASK) >> MAP_IMPASSABLE_SHIFT; } u32 MapGridGetMetatileIdAt(int x, int y) @@ -439,18 +439,19 @@ u32 MapGridGetMetatileIdAt(int x, int y) mapLayout = gMapHeader.mapLayout; i = (x + 1) & 1; i += ((y + 1) & 1) * 2; - block = mapLayout->border[i] | 0xc00; + block = mapLayout->border[i] | MAP_IMPASSABLE_MASK; } - if (block == 0x3ff) + if (block == MAP_UNDEFINED_METATILE_ID) { border = gMapHeader.mapLayout->border; j = (x + 1) & 1; j += ((y + 1) & 1) * 2; block2 = gMapHeader.mapLayout->border[j]; - block2 |= 0xc00; - return block2 & block; + // This OR is completely pointless. + block2 |= MAP_IMPASSABLE_MASK; + return block2 & MAP_METATILE_ID_MASK; } - return block & 0x3ff; + return block & MAP_METATILE_ID_MASK; } u32 MapGridGetMetatileBehaviorAt(int x, int y) @@ -464,7 +465,7 @@ u8 MapGridGetMetatileLayerTypeAt(int x, int y) { u16 metatile; metatile = MapGridGetMetatileIdAt(x, y); - return (GetBehaviorByMetatileId(metatile) & 0xf000) >> 12; + return (GetBehaviorByMetatileId(metatile) & MAP_TILE_ELEVATION_MASK) >> MAP_TILE_ELEVATION_SHIFT; } void MapGridSetMetatileIdAt(int x, int y, u16 metatile) @@ -474,7 +475,7 @@ void MapGridSetMetatileIdAt(int x, int y, u16 metatile) && y >= 0 && y < gBackupMapLayout.height) { i = x + y * gBackupMapLayout.width; - gBackupMapLayout.map[i] = (gBackupMapLayout.map[i] & 0xf000) | (metatile & 0xfff); + gBackupMapLayout.map[i] = (gBackupMapLayout.map[i] & MAP_TILE_ELEVATION_MASK) | (metatile & ~MAP_TILE_ELEVATION_MASK); } } @@ -654,7 +655,7 @@ int GetMapBorderIdAt(int x, int y) i = gBackupMapLayout.width; i *= y; block = gBackupMapLayout.map[x + i]; - if (block == 0x3ff) + if (block == MAP_UNDEFINED_METATILE_ID) { goto fail; } @@ -664,8 +665,8 @@ int GetMapBorderIdAt(int x, int y) mapLayout = gMapHeader.mapLayout; j = (x + 1) & 1; j += ((y + 1) & 1) * 2; - block2 = 0xc00 | mapLayout->border[j]; - if (block2 == 0x3ff) + block2 = MAP_IMPASSABLE_MASK | mapLayout->border[j]; + if (block2 == MAP_UNDEFINED_METATILE_ID) { goto fail; } @@ -921,7 +922,7 @@ void sub_8088B94(int x, int y, int a2) if (x >= 0 && x < gBackupMapLayout.width && y >= 0 && y < gBackupMapLayout.height) { if (a2 != 0) - gBackupMapLayout.map[x + gBackupMapLayout.width * y] |= 0xC00; + gBackupMapLayout.map[x + gBackupMapLayout.width * y] |= MAP_IMPASSABLE_MASK; else gBackupMapLayout.map[x + gBackupMapLayout.width * y] &= 0xF3FF; } @@ -937,7 +938,7 @@ static bool8 SkipCopyingMetatileFromSavedMap(u16* mapMetatilePtr, u16 mapWidth, else mapMetatilePtr += mapWidth; - if (sub_80FADE4(*mapMetatilePtr & 0x3FF, yMode) == 1) + if (sub_80FADE4(*mapMetatilePtr & MAP_METATILE_ID_MASK, yMode) == 1) return TRUE; return FALSE; } diff --git a/src/fldeff_escalator.c b/src/fldeff_escalator.c index 3d00fb162e..4a1fb0fd50 100644 --- a/src/fldeff_escalator.c +++ b/src/fldeff_escalator.c @@ -7,7 +7,7 @@ static EWRAM_DATA u8 sEscalatorAnim_TaskId = 0; -static void sub_80E12E8(u8 taskId, const s16 *list, u16 c) +static void sub_80E12E8(u8 taskId, const s16 *list, u16 isImpassableFlag) { s16 r5 = gTasks[taskId].data[4] - 1; s16 r3 = gTasks[taskId].data[5] - 1; @@ -26,9 +26,9 @@ static void sub_80E12E8(u8 taskId, const s16 *list, u16 c) if (list[r4] == metatileId) { if (r4 != 2) - MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[r4 + 1]); + MapGridSetMetatileIdAt(r5 + x, r3 + y, isImpassableFlag | list[r4 + 1]); else - MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[0]); + MapGridSetMetatileIdAt(r5 + x, r3 + y, isImpassableFlag | list[0]); } } } @@ -44,9 +44,9 @@ static void sub_80E12E8(u8 taskId, const s16 *list, u16 c) if (list[2 - r4] == metatileId) { if (r4 != 2) - MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[1 - r4]); + MapGridSetMetatileIdAt(r5 + x, r3 + y, isImpassableFlag | list[1 - r4]); else - MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[2]); + MapGridSetMetatileIdAt(r5 + x, r3 + y, isImpassableFlag | list[2]); } } } @@ -76,13 +76,13 @@ static void sub_80E1444(u8 taskId) sub_80E12E8(taskId, gUnknown_08589AC0, 0); break; case 2: - sub_80E12E8(taskId, gUnknown_08589AC6, 0xC00); + sub_80E12E8(taskId, gUnknown_08589AC6, MAP_IMPASSABLE_MASK); break; case 3: sub_80E12E8(taskId, gUnknown_08589ACC, 0); break; case 4: - sub_80E12E8(taskId, gUnknown_08589AD2, 0xC00); + sub_80E12E8(taskId, gUnknown_08589AD2, MAP_IMPASSABLE_MASK); break; case 5: sub_80E12E8(taskId, gUnknown_08589AD8, 0); diff --git a/src/scrcmd.c b/src/scrcmd.c index 51d96ff2ef..9bafac41ad 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -2028,14 +2028,14 @@ bool8 ScrCmd_setmetatile(struct ScriptContext *ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); u16 tileId = VarGet(ScriptReadHalfword(ctx)); - u16 v8 = VarGet(ScriptReadHalfword(ctx)); + u16 isImpassable = VarGet(ScriptReadHalfword(ctx)); x += 7; y += 7; - if (!v8) + if (!isImpassable) MapGridSetMetatileIdAt(x, y, tileId); else - MapGridSetMetatileIdAt(x, y, tileId | 0xC00); + MapGridSetMetatileIdAt(x, y, tileId | MAP_IMPASSABLE_MASK); return FALSE; } diff --git a/src/secret_base.c b/src/secret_base.c index adcab9cbc3..488f493771 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -259,7 +259,7 @@ void sub_80E8CB0(s16 *xPtr, s16 *yPtr, u16 tile) { for (x = 0; x < mapLayout->width; x ++) { - if ((mapLayout->map[y * mapLayout->width + x] & 0x3ff) == tile) + if ((mapLayout->map[y * mapLayout->width + x] & MAP_METATILE_ID_MASK) == tile) { *xPtr = x; *yPtr = y; @@ -282,7 +282,7 @@ void sub_80E8D4C(void) { if (gUnknown_0858CFCC[i].tile1 == tile) { - MapGridSetMetatileIdAt(x, y, gUnknown_0858CFCC[i].tile2 | 0xC00); + MapGridSetMetatileIdAt(x, y, gUnknown_0858CFCC[i].tile2 | MAP_IMPASSABLE_MASK); CurrentMapDrawMetatileAt(x, y); return; } @@ -291,7 +291,7 @@ void sub_80E8D4C(void) { if (gUnknown_0858CFCC[i].tile2 == tile) { - MapGridSetMetatileIdAt(x, y, gUnknown_0858CFCC[i].tile1 | 0xC00); + MapGridSetMetatileIdAt(x, y, gUnknown_0858CFCC[i].tile1 | MAP_IMPASSABLE_MASK); CurrentMapDrawMetatileAt(x, y); return; } @@ -352,7 +352,7 @@ void sub_80E8EE0(struct MapEvents const *events) { if (gUnknown_0858CFCC[i].tile1 == tile_id) { - MapGridSetMetatileIdAt(x, y, gUnknown_0858CFCC[i].tile2 | 0xc00); + MapGridSetMetatileIdAt(x, y, gUnknown_0858CFCC[i].tile2 | MAP_IMPASSABLE_MASK); break; } } @@ -434,7 +434,7 @@ void sub_80E9108(void) sub_80E8CB0(&x, &y, 0x220); x += 7; y += 7; - MapGridSetMetatileIdAt(x, y, 0x220 | 0xC00); + MapGridSetMetatileIdAt(x, y, 0x220 | MAP_IMPASSABLE_MASK); CurrentMapDrawMetatileAt(x, y); pal_fill_black(); CreateTask(sub_80E90C8, 0); @@ -492,12 +492,12 @@ void sub_80E9238(u8 flagIn) if (curBaseId != 0) { sub_80E8CB0(&x, &y, 0x220); - MapGridSetMetatileIdAt(x + 7, y + 7, 0x221 | 0xc00); + MapGridSetMetatileIdAt(x + 7, y + 7, 0x221 | MAP_IMPASSABLE_MASK); } else if (flagIn == 1 && VarGet(VAR_0x4089) == 1) { sub_80E8CB0(&x, &y, 0x220); - MapGridSetMetatileIdAt(x + 7, y + 7, 0x20a | 0xc00); + MapGridSetMetatileIdAt(x + 7, y + 7, 0x20a | MAP_IMPASSABLE_MASK); } } } @@ -791,7 +791,7 @@ void sub_80E9AD0(void) { if (gUnknown_0858CFCC[j].tile2 == tile) { - MapGridSetMetatileIdAt(events->bgEvents[i].x + 7, events->bgEvents[i].y + 7, gUnknown_0858CFCC[j].tile1 | 0xc00); + MapGridSetMetatileIdAt(events->bgEvents[i].x + 7, events->bgEvents[i].y + 7, gUnknown_0858CFCC[j].tile1 | MAP_IMPASSABLE_MASK); break; } } diff --git a/src/tv.c b/src/tv.c index ee3614e83d..6ab91ac070 100644 --- a/src/tv.c +++ b/src/tv.c @@ -39,6 +39,7 @@ #include "tv.h" #include "data2.h" #include "constants/layouts.h" +#include "constants/metatile_behaviors.h" // Static type declarations @@ -853,9 +854,9 @@ void SetTVMetatilesOnMap(int width, int height, u16 tileId) { for (x = 0; x < width; x ++) { - if (MapGridGetMetatileBehaviorAt(x, y) == 0x86) // is this tile a TV? + if (MapGridGetMetatileBehaviorAt(x, y) == MB_TELEVISION) { - MapGridSetMetatileIdAt(x, y, tileId | 0xc00); + MapGridSetMetatileIdAt(x, y, tileId | MAP_IMPASSABLE_MASK); } } } From da0687987d8d4f6cb9a331f30553ffb806e74165 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 26 Feb 2019 22:56:22 -0500 Subject: [PATCH 153/217] Pick better names for constants --- asm/macros/event.inc | 4 ++-- include/global.fieldmap.h | 12 ++++++------ src/battle_pyramid.c | 4 ++-- src/bg.c | 4 ++-- src/decoration.c | 8 ++++---- src/field_effect.c | 2 +- src/field_specials.c | 12 ++++++------ src/fieldmap.c | 38 +++++++++++++++++++------------------- src/fldeff_escalator.c | 4 ++-- src/scrcmd.c | 2 +- src/secret_base.c | 16 ++++++++-------- src/tv.c | 2 +- 12 files changed, 54 insertions(+), 54 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index fa27d049ec..708861e323 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1163,12 +1163,12 @@ .endm @ Changes the metatile at (x, y) on the current map. - .macro setmetatile x:req, y:req, metatile_number:req, is_impassable:req + .macro setmetatile x:req, y:req, metatile_number:req, has_collision:req .byte 0xa2 .2byte \x .2byte \y .2byte \metatile_number - .2byte \is_impassable + .2byte \has_collision .endm @ Queues a weather change to the default weather for the map. diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 2b85a02d14..e35d900d80 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -1,12 +1,12 @@ #ifndef GUARD_GLOBAL_FIELDMAP_H #define GUARD_GLOBAL_FIELDMAP_H -#define MAP_IMPASSABLE_MASK 0x0C00 -#define MAP_METATILE_ID_MASK 0x03FF -#define MAP_UNDEFINED_METATILE_ID 0x03FF -#define MAP_TILE_ELEVATION_SHIFT 12 -#define MAP_IMPASSABLE_SHIFT 10 -#define MAP_TILE_ELEVATION_MASK 0xF000 +#define METATILE_COLLISION_MASK 0x0C00 +#define METATILE_ID_MASK 0x03FF +#define METATILE_ID_UNDEFINED 0x03FF +#define METATILE_ELEVATION_SHIFT 12 +#define METATILE_COLLISION_SHIFT 10 +#define METATILE_ELEVATION_MASK 0xF000 enum { diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 92ff257b07..34da3a25d4 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -1267,7 +1267,7 @@ static u8 GetPostBattleDirectionHintTextIndex(int *hintType, u8 minDistanceForEx { for (x = 0; x < 32; x++) { - if ((map[x] & MAP_METATILE_ID_MASK) == FLOOR_EXIT_METATILE) + if ((map[x] & METATILE_ID_MASK) == FLOOR_EXIT_METATILE) { x += 7 - gEventObjects[gSelectedEventObject].initialCoords.x; y += 7 - gEventObjects[gSelectedEventObject].initialCoords.y; @@ -1568,7 +1568,7 @@ void GenerateBattlePyramidFloorLayout(u16 *backupMapData, bool8 setPlayerPositio { for (x = 0; x < mapLayout->width; x++) { - if ((layoutMap[x] & MAP_METATILE_ID_MASK) != FLOOR_EXIT_METATILE) + if ((layoutMap[x] & METATILE_ID_MASK) != FLOOR_EXIT_METATILE) { map[x] = layoutMap[x]; } diff --git a/src/bg.c b/src/bg.c index 571518650f..1826f9a281 100644 --- a/src/bg.c +++ b/src/bg.c @@ -1056,7 +1056,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt for (x16 = x; x16 < (x + width); x16++) { CopyTileMapEntry(&firstTileNum, &((u16*)sGpuBgConfigs2[bg].tilemap)[(u16)GetTileMapIndexFromCoords(x16, y16, attribute, mode, mode2)], paletteSlot, 0, 0); - firstTileNum = (firstTileNum & 0xFC00) + ((firstTileNum + tileNumDelta) & MAP_METATILE_ID_MASK); + firstTileNum = (firstTileNum & (METATILE_COLLISION_MASK | METATILE_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & METATILE_ID_MASK); } } break; @@ -1067,7 +1067,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt for (x16 = x; x16 < (x + width); x16++) { ((u8*)sGpuBgConfigs2[bg].tilemap)[(y16 * mode3) + x16] = firstTileNum; - firstTileNum = (firstTileNum & 0xFC00) + ((firstTileNum + tileNumDelta) & MAP_METATILE_ID_MASK); + firstTileNum = (firstTileNum & (METATILE_COLLISION_MASK | METATILE_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & METATILE_ID_MASK); } } break; diff --git a/src/decoration.c b/src/decoration.c index e5f3b6d468..83ec4bc34b 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1173,7 +1173,7 @@ void sub_8127B90(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decor) behavior = GetBehaviorByMetatileId(0x200 + gDecorations[decor].tiles[i * decWidth + j]); if (MetatileBehavior_IsSecretBaseImpassable(behavior) == TRUE || (gDecorations[decor].permission != DECORPERM_PASS_FLOOR && (behavior >> 12))) { - impassableFlag = MAP_IMPASSABLE_MASK; + impassableFlag = METATILE_COLLISION_MASK; } else { @@ -1502,7 +1502,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration) { curX = gTasks[taskId].data[0] + j; behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY); - behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & MAP_TILE_ELEVATION_MASK; + behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & METATILE_ELEVATION_MASK; if (!sub_81284F4(behaviorAt, decoration)) { return FALSE; @@ -1527,7 +1527,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration) { curX = gTasks[taskId].data[0] + j; behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY); - behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & MAP_TILE_ELEVATION_MASK; + behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & METATILE_ELEVATION_MASK; if (!MetatileBehavior_IsNormal(behaviorAt) && !sub_8128484(behaviorAt, behaviorBy)) { return FALSE; @@ -1547,7 +1547,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration) { curX = gTasks[taskId].data[0] + j; behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY); - behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[j]) & MAP_TILE_ELEVATION_MASK; + behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[j]) & METATILE_ELEVATION_MASK; if (!MetatileBehavior_IsNormal(behaviorAt) && !MetatileBehavior_IsSecretBaseNorthWall(behaviorAt)) { return FALSE; diff --git a/src/field_effect.c b/src/field_effect.c index 07a7f9cafe..7f11a8e582 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2620,7 +2620,7 @@ static void sub_80B8874(u16 offs) dest = (u16 *)(VRAM + 0x140 + offs); for (i = 0; i < 0x140; i++, dest++) { - *dest = gFieldMoveStreaksTilemap[i] | MAP_TILE_ELEVATION_MASK; + *dest = gFieldMoveStreaksTilemap[i] | METATILE_ELEVATION_MASK; } } diff --git a/src/field_specials.c b/src/field_specials.c index c7d1f43678..639d86e685 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -887,8 +887,8 @@ static void PetalburgGymFunc(u8 a0, u16 a1) } for (i = 0; i < nDoors; i++) { - MapGridSetMetatileIdAt(x[i] + 7, y[i] + 7, a1 | MAP_IMPASSABLE_MASK); - MapGridSetMetatileIdAt(x[i] + 7, y[i] + 8, (a1 + 8) | MAP_IMPASSABLE_MASK); + MapGridSetMetatileIdAt(x[i] + 7, y[i] + 7, a1 | METATILE_COLLISION_MASK); + MapGridSetMetatileIdAt(x[i] + 7, y[i] + 8, (a1 + 8) | METATILE_COLLISION_MASK); } DrawWholeMapView(); } @@ -1100,7 +1100,7 @@ static void PCTurnOnEffect_1(s16 flag, s8 dx, s8 dy) tileId = 0x27e; } } - MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + 7, gSaveBlock1Ptr->pos.y + dy + 7, tileId | MAP_IMPASSABLE_MASK); + MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + 7, gSaveBlock1Ptr->pos.y + dy + 7, tileId | METATILE_COLLISION_MASK); } void DoPCTurnOffEffect(void) @@ -1141,7 +1141,7 @@ static void PCTurnOffEffect(void) { tileId = 0x259; } - MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + 7, gSaveBlock1Ptr->pos.y + dy + 7, tileId | MAP_IMPASSABLE_MASK); + MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + 7, gSaveBlock1Ptr->pos.y + dy + 7, tileId | METATILE_COLLISION_MASK); DrawWholeMapView(); } @@ -1892,7 +1892,7 @@ static void sub_8139C80(u8 taskId) { for (x = 0; x < 3; x++) { - MapGridSetMetatileIdAt(x + 8, y + 7, gUnknown_085B2BF4[y][data[0] % 3] | MAP_IMPASSABLE_MASK); + MapGridSetMetatileIdAt(x + 8, y + 7, gUnknown_085B2BF4[y][data[0] % 3] | METATILE_COLLISION_MASK); } } } @@ -1902,7 +1902,7 @@ static void sub_8139C80(u8 taskId) { for (x = 0; x < 3; x++) { - MapGridSetMetatileIdAt(x + 8, y + 7, gUnknown_085B2C06[y][data[0] % 3] | MAP_IMPASSABLE_MASK); + MapGridSetMetatileIdAt(x + 8, y + 7, gUnknown_085B2C06[y][data[0] % 3] | METATILE_COLLISION_MASK); } } } diff --git a/src/fieldmap.c b/src/fieldmap.c index 8131fb01b0..a96b71c0fd 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -383,15 +383,15 @@ u8 MapGridGetZCoordAt(int x, int y) i = (x + 1) & 1; i += ((y + 1) & 1) * 2; block = gMapHeader.mapLayout->border[i]; - block |= MAP_IMPASSABLE_MASK; + block |= METATILE_COLLISION_MASK; } - if (block == MAP_UNDEFINED_METATILE_ID) + if (block == METATILE_ID_UNDEFINED) { return 0; } - return block >> MAP_TILE_ELEVATION_SHIFT; + return block >> METATILE_ELEVATION_SHIFT; } u8 MapGridIsImpassableAt(int x, int y) @@ -411,13 +411,13 @@ u8 MapGridIsImpassableAt(int x, int y) i = (x + 1) & 1; i += ((y + 1) & 1) * 2; block = gMapHeader.mapLayout->border[i]; - block |= MAP_IMPASSABLE_MASK; + block |= METATILE_COLLISION_MASK; } - if (block == MAP_UNDEFINED_METATILE_ID) + if (block == METATILE_ID_UNDEFINED) { return 1; } - return (block & MAP_IMPASSABLE_MASK) >> MAP_IMPASSABLE_SHIFT; + return (block & METATILE_COLLISION_MASK) >> METATILE_COLLISION_SHIFT; } u32 MapGridGetMetatileIdAt(int x, int y) @@ -439,19 +439,19 @@ u32 MapGridGetMetatileIdAt(int x, int y) mapLayout = gMapHeader.mapLayout; i = (x + 1) & 1; i += ((y + 1) & 1) * 2; - block = mapLayout->border[i] | MAP_IMPASSABLE_MASK; + block = mapLayout->border[i] | METATILE_COLLISION_MASK; } - if (block == MAP_UNDEFINED_METATILE_ID) + if (block == METATILE_ID_UNDEFINED) { border = gMapHeader.mapLayout->border; j = (x + 1) & 1; j += ((y + 1) & 1) * 2; block2 = gMapHeader.mapLayout->border[j]; // This OR is completely pointless. - block2 |= MAP_IMPASSABLE_MASK; - return block2 & MAP_METATILE_ID_MASK; + block2 |= METATILE_COLLISION_MASK; + return block2 & METATILE_ID_MASK; } - return block & MAP_METATILE_ID_MASK; + return block & METATILE_ID_MASK; } u32 MapGridGetMetatileBehaviorAt(int x, int y) @@ -465,7 +465,7 @@ u8 MapGridGetMetatileLayerTypeAt(int x, int y) { u16 metatile; metatile = MapGridGetMetatileIdAt(x, y); - return (GetBehaviorByMetatileId(metatile) & MAP_TILE_ELEVATION_MASK) >> MAP_TILE_ELEVATION_SHIFT; + return (GetBehaviorByMetatileId(metatile) & METATILE_ELEVATION_MASK) >> METATILE_ELEVATION_SHIFT; } void MapGridSetMetatileIdAt(int x, int y, u16 metatile) @@ -475,7 +475,7 @@ void MapGridSetMetatileIdAt(int x, int y, u16 metatile) && y >= 0 && y < gBackupMapLayout.height) { i = x + y * gBackupMapLayout.width; - gBackupMapLayout.map[i] = (gBackupMapLayout.map[i] & MAP_TILE_ELEVATION_MASK) | (metatile & ~MAP_TILE_ELEVATION_MASK); + gBackupMapLayout.map[i] = (gBackupMapLayout.map[i] & METATILE_ELEVATION_MASK) | (metatile & ~METATILE_ELEVATION_MASK); } } @@ -655,7 +655,7 @@ int GetMapBorderIdAt(int x, int y) i = gBackupMapLayout.width; i *= y; block = gBackupMapLayout.map[x + i]; - if (block == MAP_UNDEFINED_METATILE_ID) + if (block == METATILE_ID_UNDEFINED) { goto fail; } @@ -665,8 +665,8 @@ int GetMapBorderIdAt(int x, int y) mapLayout = gMapHeader.mapLayout; j = (x + 1) & 1; j += ((y + 1) & 1) * 2; - block2 = MAP_IMPASSABLE_MASK | mapLayout->border[j]; - if (block2 == MAP_UNDEFINED_METATILE_ID) + block2 = METATILE_COLLISION_MASK | mapLayout->border[j]; + if (block2 == METATILE_ID_UNDEFINED) { goto fail; } @@ -922,9 +922,9 @@ void sub_8088B94(int x, int y, int a2) if (x >= 0 && x < gBackupMapLayout.width && y >= 0 && y < gBackupMapLayout.height) { if (a2 != 0) - gBackupMapLayout.map[x + gBackupMapLayout.width * y] |= MAP_IMPASSABLE_MASK; + gBackupMapLayout.map[x + gBackupMapLayout.width * y] |= METATILE_COLLISION_MASK; else - gBackupMapLayout.map[x + gBackupMapLayout.width * y] &= 0xF3FF; + gBackupMapLayout.map[x + gBackupMapLayout.width * y] &= ~METATILE_COLLISION_MASK; } } @@ -938,7 +938,7 @@ static bool8 SkipCopyingMetatileFromSavedMap(u16* mapMetatilePtr, u16 mapWidth, else mapMetatilePtr += mapWidth; - if (sub_80FADE4(*mapMetatilePtr & MAP_METATILE_ID_MASK, yMode) == 1) + if (sub_80FADE4(*mapMetatilePtr & METATILE_ID_MASK, yMode) == 1) return TRUE; return FALSE; } diff --git a/src/fldeff_escalator.c b/src/fldeff_escalator.c index 4a1fb0fd50..7ab2db4db2 100644 --- a/src/fldeff_escalator.c +++ b/src/fldeff_escalator.c @@ -76,13 +76,13 @@ static void sub_80E1444(u8 taskId) sub_80E12E8(taskId, gUnknown_08589AC0, 0); break; case 2: - sub_80E12E8(taskId, gUnknown_08589AC6, MAP_IMPASSABLE_MASK); + sub_80E12E8(taskId, gUnknown_08589AC6, METATILE_COLLISION_MASK); break; case 3: sub_80E12E8(taskId, gUnknown_08589ACC, 0); break; case 4: - sub_80E12E8(taskId, gUnknown_08589AD2, MAP_IMPASSABLE_MASK); + sub_80E12E8(taskId, gUnknown_08589AD2, METATILE_COLLISION_MASK); break; case 5: sub_80E12E8(taskId, gUnknown_08589AD8, 0); diff --git a/src/scrcmd.c b/src/scrcmd.c index 9bafac41ad..b80b2baed4 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -2035,7 +2035,7 @@ bool8 ScrCmd_setmetatile(struct ScriptContext *ctx) if (!isImpassable) MapGridSetMetatileIdAt(x, y, tileId); else - MapGridSetMetatileIdAt(x, y, tileId | MAP_IMPASSABLE_MASK); + MapGridSetMetatileIdAt(x, y, tileId | METATILE_COLLISION_MASK); return FALSE; } diff --git a/src/secret_base.c b/src/secret_base.c index 488f493771..3e591eba2c 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -259,7 +259,7 @@ void sub_80E8CB0(s16 *xPtr, s16 *yPtr, u16 tile) { for (x = 0; x < mapLayout->width; x ++) { - if ((mapLayout->map[y * mapLayout->width + x] & MAP_METATILE_ID_MASK) == tile) + if ((mapLayout->map[y * mapLayout->width + x] & METATILE_ID_MASK) == tile) { *xPtr = x; *yPtr = y; @@ -282,7 +282,7 @@ void sub_80E8D4C(void) { if (gUnknown_0858CFCC[i].tile1 == tile) { - MapGridSetMetatileIdAt(x, y, gUnknown_0858CFCC[i].tile2 | MAP_IMPASSABLE_MASK); + MapGridSetMetatileIdAt(x, y, gUnknown_0858CFCC[i].tile2 | METATILE_COLLISION_MASK); CurrentMapDrawMetatileAt(x, y); return; } @@ -291,7 +291,7 @@ void sub_80E8D4C(void) { if (gUnknown_0858CFCC[i].tile2 == tile) { - MapGridSetMetatileIdAt(x, y, gUnknown_0858CFCC[i].tile1 | MAP_IMPASSABLE_MASK); + MapGridSetMetatileIdAt(x, y, gUnknown_0858CFCC[i].tile1 | METATILE_COLLISION_MASK); CurrentMapDrawMetatileAt(x, y); return; } @@ -352,7 +352,7 @@ void sub_80E8EE0(struct MapEvents const *events) { if (gUnknown_0858CFCC[i].tile1 == tile_id) { - MapGridSetMetatileIdAt(x, y, gUnknown_0858CFCC[i].tile2 | MAP_IMPASSABLE_MASK); + MapGridSetMetatileIdAt(x, y, gUnknown_0858CFCC[i].tile2 | METATILE_COLLISION_MASK); break; } } @@ -434,7 +434,7 @@ void sub_80E9108(void) sub_80E8CB0(&x, &y, 0x220); x += 7; y += 7; - MapGridSetMetatileIdAt(x, y, 0x220 | MAP_IMPASSABLE_MASK); + MapGridSetMetatileIdAt(x, y, 0x220 | METATILE_COLLISION_MASK); CurrentMapDrawMetatileAt(x, y); pal_fill_black(); CreateTask(sub_80E90C8, 0); @@ -492,12 +492,12 @@ void sub_80E9238(u8 flagIn) if (curBaseId != 0) { sub_80E8CB0(&x, &y, 0x220); - MapGridSetMetatileIdAt(x + 7, y + 7, 0x221 | MAP_IMPASSABLE_MASK); + MapGridSetMetatileIdAt(x + 7, y + 7, 0x221 | METATILE_COLLISION_MASK); } else if (flagIn == 1 && VarGet(VAR_0x4089) == 1) { sub_80E8CB0(&x, &y, 0x220); - MapGridSetMetatileIdAt(x + 7, y + 7, 0x20a | MAP_IMPASSABLE_MASK); + MapGridSetMetatileIdAt(x + 7, y + 7, 0x20a | METATILE_COLLISION_MASK); } } } @@ -791,7 +791,7 @@ void sub_80E9AD0(void) { if (gUnknown_0858CFCC[j].tile2 == tile) { - MapGridSetMetatileIdAt(events->bgEvents[i].x + 7, events->bgEvents[i].y + 7, gUnknown_0858CFCC[j].tile1 | MAP_IMPASSABLE_MASK); + MapGridSetMetatileIdAt(events->bgEvents[i].x + 7, events->bgEvents[i].y + 7, gUnknown_0858CFCC[j].tile1 | METATILE_COLLISION_MASK); break; } } diff --git a/src/tv.c b/src/tv.c index 6ab91ac070..cfa49d7df3 100644 --- a/src/tv.c +++ b/src/tv.c @@ -856,7 +856,7 @@ void SetTVMetatilesOnMap(int width, int height, u16 tileId) { if (MapGridGetMetatileBehaviorAt(x, y) == MB_TELEVISION) { - MapGridSetMetatileIdAt(x, y, tileId | MAP_IMPASSABLE_MASK); + MapGridSetMetatileIdAt(x, y, tileId | METATILE_COLLISION_MASK); } } } From 2d0e0083bb454880765a8cff7e45f250f6f22284 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 1 Mar 2019 01:06:27 -0500 Subject: [PATCH 154/217] Improve OK bot's symbol counting --- .travis/calcrom/calcrom.pl | 49 +++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/.travis/calcrom/calcrom.pl b/.travis/calcrom/calcrom.pl index 9eff1c0648..696d228fe6 100755 --- a/.travis/calcrom/calcrom.pl +++ b/.travis/calcrom/calcrom.pl @@ -1,5 +1,7 @@ #!/usr/bin/perl +use IPC::Cmd qw[ run ]; + (@ARGV == 1) or die "ERROR: no map file specified.\n"; open(my $file, $ARGV[0]) @@ -7,7 +9,6 @@ open(my $file, $ARGV[0]) my $src = 0; my $asm = 0; -my $undocumented = 0; while (my $line = <$file>) { if ($line =~ /^ \.(\w+)\s+0x[0-9a-f]+\s+(0x[0-9a-f]+) (\w+)\/.+\.o/) @@ -28,19 +29,49 @@ while (my $line = <$file>) } } } - if($line =~ /^\s+0x([0-9A-f]+)\s+[A-z_]+([0-9A-f]+)/) { - my $thing1 = sprintf("%08X", hex($1)); - my $thing2 = sprintf("%08X", hex($2)); - if($thing1 eq $thing2) { - $undocumented += 1; - } - } } +# It sucks that we have to objdump twice, but I can't figure out how to get +# stdin working for subcommands in perl while still having a timeout. +my $total_syms_as_string; +(run ( + command => "arm-none-eabi-nm pokeemerald.elf | wc -l", + buffer => \$total_syms_as_string, + timeout => 30 +)) + or die "ERROR: Error while getting all symbols: $?"; + +my $undocumented_as_string; +(run ( + command => "arm-none-eabi-nm pokeemerald.elf | grep \"Unknown_\\|sub_\" | wc -l", + buffer => \$undocumented_as_string, + timeout => 30 +)) + or die "ERROR: Error while filtering for undocumented symbols: $?"; + +my $undocumented = $undocumented_as_string + 0; +(($undocumented != 0) and ($undocumented_as_string ne "0")) + or die "ERROR: Cannot convert string to num: '$undocumented_as_string'"; + +my $total_syms = $total_syms_as_string + 0; +(($total_syms != 0) and ($total_syms_as_string ne "0")) + or die "ERROR: Cannot convert string to num: '$total_syms_as_string'"; + +($total_syms != 0) + or die "ERROR: No symbols found."; + my $total = $src + $asm; my $srcPct = sprintf("%.4f", 100 * $src / $total); my $asmPct = sprintf("%.4f", 100 * $asm / $total); + +my $documented = $total_syms - $undocumented; +my $docPct = sprintf("%.4f", 100 * $documented / $total_syms); +my $undocPct = sprintf("%.4f", 100 * $undocumented / $total_syms); + print "$total total bytes of code\n"; print "$src bytes of code in src ($srcPct%)\n"; print "$asm bytes of code in asm ($asmPct%)\n"; -print "$undocumented global symbols undocumented\n"; +print "\n"; +print "$total_syms total symbols\n"; +print "$documented symbols documented ($docPct%)\n"; +print "$undocumented symbols undocumented ($undocPct%)\n"; From d0f665fddcff922390960e98fcd2f83b6890c602 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 1 Mar 2019 01:09:53 -0500 Subject: [PATCH 155/217] Fix tabs --- .travis/calcrom/calcrom.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis/calcrom/calcrom.pl b/.travis/calcrom/calcrom.pl index 696d228fe6..354f9bcee5 100755 --- a/.travis/calcrom/calcrom.pl +++ b/.travis/calcrom/calcrom.pl @@ -35,17 +35,17 @@ while (my $line = <$file>) # stdin working for subcommands in perl while still having a timeout. my $total_syms_as_string; (run ( - command => "arm-none-eabi-nm pokeemerald.elf | wc -l", - buffer => \$total_syms_as_string, - timeout => 30 + command => "arm-none-eabi-nm pokeemerald.elf | wc -l", + buffer => \$total_syms_as_string, + timeout => 30 )) or die "ERROR: Error while getting all symbols: $?"; my $undocumented_as_string; (run ( - command => "arm-none-eabi-nm pokeemerald.elf | grep \"Unknown_\\|sub_\" | wc -l", - buffer => \$undocumented_as_string, - timeout => 30 + command => "arm-none-eabi-nm pokeemerald.elf | grep \"Unknown_\\|sub_\" | wc -l", + buffer => \$undocumented_as_string, + timeout => 30 )) or die "ERROR: Error while filtering for undocumented symbols: $?"; From 459fd93b59795c0c9c888584d38e82577e07c056 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 1 Mar 2019 01:18:58 -0500 Subject: [PATCH 156/217] Fix minor errors --- data/maps/TradeCenter/map.json | 1 - include/link.h | 2 +- src/cable_club.c | 2 +- src/link.c | 2 +- src/record_mixing.c | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 3e47ca41bf..1c409132dd 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -55,7 +55,6 @@ "script": "EventScript_TradeCenter_Chair0" }, { - "comment": "This is trade seat #2.", "type": "trigger", "x": 7, "y": 5, diff --git a/include/link.h b/include/link.h index 182ee68f44..83deab88f7 100644 --- a/include/link.h +++ b/include/link.h @@ -299,7 +299,7 @@ extern struct LinkPlayer gLocalLinkPlayer; bool32 Link_AnyPartnersPlayingRubyOrSapphire(void); bool32 sub_800A03C(void); -void SetgLocalLinkPlayerId(u8); +void SetLocalLinkPlayerId(u8); u8 GetSavedPlayerCount(void); void sub_8009FAC(void); bool8 sub_800A4D8(u8 a0); diff --git a/src/cable_club.c b/src/cable_club.c index f504ad8a82..d835085048 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -1028,7 +1028,7 @@ static void sub_80B3728(u8 taskId) if (IsFieldMessageBoxHidden()) { sub_8087288(); - SetgLocalLinkPlayerId(gSpecialVar_0x8005); + SetLocalLinkPlayerId(gSpecialVar_0x8005); task->data[0] = 2; } break; diff --git a/src/link.c b/src/link.c index cf06e49585..72ac3e8787 100644 --- a/src/link.c +++ b/src/link.c @@ -302,7 +302,7 @@ void LinkTestScreen(void) SetMainCallback2(CB2_LinkTest); } -void SetgLocalLinkPlayerId(u8 playerId) +void SetLocalLinkPlayerId(u8 playerId) { gLocalLinkPlayer.id = playerId; } diff --git a/src/record_mixing.c b/src/record_mixing.c index e58fdcc4e3..aafd7284ba 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -324,7 +324,7 @@ static void Task_RecordMixing_Main(u8 taskId) case 0: // init sSentRecord = malloc(sizeof(union PlayerRecords)); sReceivedRecords = malloc(sizeof(union PlayerRecords) * 4); - SetgLocalLinkPlayerId(gSpecialVar_0x8005); + SetLocalLinkPlayerId(gSpecialVar_0x8005); VarSet(VAR_TEMP_0, 1); gUnknown_03001130 = FALSE; PrepareExchangePacket(); From a7e5852f1d95dd2b438e94fbf31b865196c6e951 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 1 Mar 2019 01:49:11 -0500 Subject: [PATCH 157/217] More minor fixes --- data/maps/SecretBase_YellowCave4/scripts.inc | 2 +- data/scripts/secret_base.inc | 6 +-- include/constants/vars.h | 2 +- include/main.h | 4 +- include/overworld.h | 2 +- include/trainer_hill.h | 2 +- src/field_effect.c | 2 +- src/field_specials.c | 56 ++++++++++++++++---- src/load_save.c | 2 +- src/main.c | 14 ++--- src/overworld.c | 16 +++--- src/save.c | 6 +-- src/secret_base.c | 38 ++++++------- src/time_events.c | 2 +- src/trainer_hill.c | 10 ++-- 15 files changed, 99 insertions(+), 65 deletions(-) diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc index 40f1e5a15f..805d7e299b 100644 --- a/data/maps/SecretBase_YellowCave4/scripts.inc +++ b/data/maps/SecretBase_YellowCave4/scripts.inc @@ -16,7 +16,7 @@ SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2 end SecretBase_RedCave1_MapScript2_23B4AE: @ 823B4AE - map_script_2 VAR_SECRET_BASE_SHOULD_BE_INIT, 0, SecretBase_RedCave1_EventScript_275B81 + map_script_2 VAR_INIT_SECRET_BASE, 0, SecretBase_RedCave1_EventScript_275B81 .2byte 0 SecretBase_RedCave1_MapScript1_23B4B8: @ 823B4B8 diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 95e9a2fc5d..6302a33a84 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -430,7 +430,7 @@ EventScript_275B4D:: @ 8275B4D EventScript_275B5B:: @ 8275B5B closemessage playse SE_KAIDAN - setvar VAR_SECRET_BASE_SHOULD_BE_INIT, 0 + setvar VAR_INIT_SECRET_BASE, 0 setflag FLAG_DECORATION_0 special sub_80E8E18 special sub_80E9068 @@ -444,7 +444,7 @@ EventScript_275B5B:: @ 8275B5B SecretBase_RedCave1_EventScript_275B81:: @ 8275B81 applymovement EVENT_OBJ_ID_PLAYER, SecretBase_RedCave1_Movement_275BB4 waitmovement 0 - setvar VAR_SECRET_BASE_SHOULD_BE_INIT, 1 + setvar VAR_INIT_SECRET_BASE, 1 msgbox SecretBase_RedCave1_Text_23B759, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_275BAB @@ -467,7 +467,7 @@ SecretBase_RedCave1_Movement_275BB4: @ 8275BB4 EventScript_275BB7:: @ 8275BB7 lockall - setvar VAR_SECRET_BASE_SHOULD_BE_INIT, 1 + setvar VAR_INIT_SECRET_BASE, 1 playse SE_KAIDAN special sub_80E9744 compare VAR_RESULT, 0 diff --git a/include/constants/vars.h b/include/constants/vars.h index 72b02ee8f8..c025d62fc5 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -167,7 +167,7 @@ #define VAR_LILYCOVE_MUSEUM_2F_STATE 0x4094 #define VAR_LILYCOVE_FAN_CLUB_STATE 0x4095 #define VAR_BRINEY_LOCATION 0x4096 -#define VAR_SECRET_BASE_SHOULD_BE_INIT 0x4097 +#define VAR_INIT_SECRET_BASE 0x4097 #define VAR_PETALBURG_WOODS_STATE 0x4098 #define VAR_LILYCOVE_CONTEST_LOBBY_STATE 0x4099 #define VAR_RUSTURF_TUNNEL_STATE 0x409A diff --git a/include/main.h b/include/main.h index 014b4942e2..2c241bf97d 100644 --- a/include/main.h +++ b/include/main.h @@ -61,8 +61,8 @@ void SetHBlankCallback(IntrCallback callback); void SetVCountCallback(IntrCallback callback); void SetSerialCallback(IntrCallback callback); void InitFlashTimer(void); -void SetVBlankCounterPointer(u32 *var); -void ClearVBlankCounterPointer(void); +void SetTrainerHillVBlankCounter(u32 *var); +void ClearTrainerHillVBlankCounter(void); void DoSoftReset(void); void ClearPokemonCrySongs(void); void RestoreSerialTimer3IntrHandlers(void); diff --git a/include/overworld.h b/include/overworld.h index 54715ecc08..7ca4429579 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -96,7 +96,7 @@ u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum); u8 GetMapTypeByWarpData(struct WarpData *warp); u8 GetCurrentMapType(void); u8 GetLastUsedWarpMapType(void); -bool8 IsMapTypeOutside(u8 mapType); +bool8 IsMapTypeOutdoors(u8 mapType); bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType); bool8 Overworld_MapTypeIsIndoors(u8 mapType); u8 GetSavedWarpRegionMapSectionId(void); diff --git a/include/trainer_hill.h b/include/trainer_hill.h index 35b0c5d6d3..ad2713316a 100644 --- a/include/trainer_hill.h +++ b/include/trainer_hill.h @@ -1,7 +1,7 @@ #ifndef GUARD_TRAINER_HILL_H #define GUARD_TRAINER_HILL_H -extern u32 *gVBlankCounterPointer; +extern u32 *gTrainerHillVBlankCounter; void CallTrainerHillFunction(void); void ResetTrainerHillResults(void); diff --git a/src/field_effect.c b/src/field_effect.c index 74f7801bdf..a4614b0a03 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2443,7 +2443,7 @@ static void sub_80B8410(struct Task *task) bool8 FldEff_FieldMoveShowMon(void) { u8 taskId; - if (IsMapTypeOutside(GetCurrentMapType()) == TRUE) + if (IsMapTypeOutdoors(GetCurrentMapType()) == TRUE) { taskId = CreateTask(sub_80B8554, 0xff); } else diff --git a/src/field_specials.c b/src/field_specials.c index e603c3ebf7..20125d855b 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -370,7 +370,7 @@ bool32 ShouldDoWallyCall(void) case MAP_TYPE_CITY: case MAP_TYPE_ROUTE: case MAP_TYPE_OCEAN_ROUTE: - if (++(*GetVarPointer(VAR_WALLY_CALL_STEP_COUNTER)) < 0xFA) + if (++(*GetVarPointer(VAR_WALLY_CALL_STEP_COUNTER)) < 250) { return FALSE; } @@ -451,7 +451,7 @@ bool32 ShouldDoRoxanneCall(void) case 2: case 3: case 6: - if (++(*GetVarPointer(VAR_ROXANNE_CALL_STEP_COUNTER)) < 0xFA) + if (++(*GetVarPointer(VAR_ROXANNE_CALL_STEP_COUNTER)) < 250) { return FALSE; } @@ -478,7 +478,7 @@ bool32 ShouldDoRivalRayquazaCall(void) case 2: case 3: case 6: - if (++(*GetVarPointer(VAR_RIVAL_RAYQUAZA_CALL_STEP_COUNTER)) < 0xFA) + if (++(*GetVarPointer(VAR_RIVAL_RAYQUAZA_CALL_STEP_COUNTER)) < 250) { return FALSE; } @@ -1516,7 +1516,7 @@ bool8 FoundBlackGlasses(void) void SetRoute119Weather(void) { - if (IsMapTypeOutside(GetLastUsedWarpMapType()) != TRUE) + if (IsMapTypeOutdoors(GetLastUsedWarpMapType()) != TRUE) { SetSav1Weather(20); } @@ -1524,7 +1524,7 @@ void SetRoute119Weather(void) void SetRoute123Weather(void) { - if (IsMapTypeOutside(GetLastUsedWarpMapType()) != TRUE) + if (IsMapTypeOutdoors(GetLastUsedWarpMapType()) != TRUE) { SetSav1Weather(21); } @@ -3428,21 +3428,21 @@ void CreateUnusualWeatherEvent(void) if (FlagGet(FLAG_DEFEATED_KYOGRE) == TRUE) { - VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue & (UNUSUAL_WEATHER_COUNT_PER_LEGENDARY - 1)) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START); + VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START); } else if (FlagGet(FLAG_DEFEATED_GROUDON) == TRUE) { - VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue & (UNUSUAL_WEATHER_COUNT_PER_LEGENDARY - 1)) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START); + VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START); } else if ((randomValue & 1) == 0) { randomValue = Random(); - VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue & (UNUSUAL_WEATHER_COUNT_PER_LEGENDARY - 1)) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START); + VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START); } else { randomValue = Random(); - VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue & (UNUSUAL_WEATHER_COUNT_PER_LEGENDARY - 1)) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START); + VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START); } } @@ -3450,7 +3450,24 @@ void CreateUnusualWeatherEvent(void) // returns TRUE if the weather is for Kyogre, and FALSE if it's for Groudon. bool32 GetUnusualWeatherMapNameAndType(void) { - static const u8 sUnusualWeatherMapNumbers[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c }; + static const u8 sUnusualWeatherMapNumbers[] = { + MAP_NUM(ROUTE114), + MAP_NUM(ROUTE114), + MAP_NUM(ROUTE115), + MAP_NUM(ROUTE115), + MAP_NUM(ROUTE116), + MAP_NUM(ROUTE116), + MAP_NUM(ROUTE118), + MAP_NUM(ROUTE118), + MAP_NUM(ROUTE105), + MAP_NUM(ROUTE105), + MAP_NUM(ROUTE125), + MAP_NUM(ROUTE125), + MAP_NUM(ROUTE127), + MAP_NUM(ROUTE127), + MAP_NUM(ROUTE129), + MAP_NUM(ROUTE129) + }; u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION); @@ -3469,7 +3486,24 @@ bool32 GetUnusualWeatherMapNameAndType(void) bool8 UnusualWeatherHasExpired(void) { // Duplicate array. - static const u8 sUnusualWeatherMapNumbers_2[] = { 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c }; + static const u8 sUnusualWeatherMapNumbers_2[] = { + MAP_NUM(ROUTE114), + MAP_NUM(ROUTE114), + MAP_NUM(ROUTE115), + MAP_NUM(ROUTE115), + MAP_NUM(ROUTE116), + MAP_NUM(ROUTE116), + MAP_NUM(ROUTE118), + MAP_NUM(ROUTE118), + MAP_NUM(ROUTE105), + MAP_NUM(ROUTE105), + MAP_NUM(ROUTE125), + MAP_NUM(ROUTE125), + MAP_NUM(ROUTE127), + MAP_NUM(ROUTE127), + MAP_NUM(ROUTE129), + MAP_NUM(ROUTE129) + }; u16 steps = VarGet(VAR_UNUSUAL_WEATHER_STEP_COUNTER); u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION); diff --git a/src/load_save.c b/src/load_save.c index d71e72802b..7d307ec1bf 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -99,7 +99,7 @@ void MoveSaveBlocks_ResetHeap(void) hblankCB = gMain.hblankCallback; gMain.vblankCallback = NULL; gMain.hblankCallback = NULL; - gVBlankCounterPointer = NULL; + gTrainerHillVBlankCounter = NULL; saveBlock2Copy = (struct SaveBlock2 *)(gHeap); saveBlock1Copy = (struct SaveBlock1 *)(gHeap + sizeof(struct SaveBlock2)); diff --git a/src/main.c b/src/main.c index 3e282775de..3049f4f90f 100644 --- a/src/main.c +++ b/src/main.c @@ -163,7 +163,7 @@ static void UpdateLinkAndCallCallbacks(void) static void InitMainCallbacks(void) { gMain.vblankCounter1 = 0; - gVBlankCounterPointer = NULL; + gTrainerHillVBlankCounter = NULL; gMain.vblankCounter2 = 0; gMain.callback1 = NULL; SetMainCallback2(CB2_InitCopyrightScreenAfterBootup); @@ -324,8 +324,8 @@ static void VBlankIntr(void) gMain.vblankCounter1++; - if (gVBlankCounterPointer && *gVBlankCounterPointer < 0xFFFFFFFF) - (*gVBlankCounterPointer)++; + if (gTrainerHillVBlankCounter && *gTrainerHillVBlankCounter < 0xFFFFFFFF) + (*gTrainerHillVBlankCounter)++; if (gMain.vblankCallback) gMain.vblankCallback(); @@ -393,14 +393,14 @@ static void WaitForVBlank(void) ; } -void SetVBlankCounterPointer(u32 *var) +void SetTrainerHillVBlankCounter(u32 *counter) { - gVBlankCounterPointer = var; + gTrainerHillVBlankCounter = counter; } -void ClearVBlankCounterPointer(void) +void ClearTrainerHillVBlankCounter(void) { - gVBlankCounterPointer = NULL; + gTrainerHillVBlankCounter = NULL; } void DoSoftReset(void) diff --git a/src/overworld.c b/src/overworld.c index 84eb80a064..8378558779 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -678,7 +678,7 @@ void UpdateEscapeWarp(s16 x, s16 y) { u8 currMapType = GetCurrentMapType(); u8 destMapType = GetMapTypeByGroupAndId(sWarpDestination.mapGroup, sWarpDestination.mapNum); - if (IsMapTypeOutside(currMapType) && IsMapTypeOutside(destMapType) != TRUE) + if (IsMapTypeOutdoors(currMapType) && IsMapTypeOutdoors(destMapType) != TRUE) SetEscapeWarp(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x - 7, y - 6); } @@ -823,8 +823,8 @@ void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum) static void mli0_load_map(u32 a1) { - bool8 v2; - bool8 indoors; + bool8 isOutdoors; + bool8 isIndoors; LoadCurrentMapData(); if (!(sUnknown_020322D8 & 1)) @@ -837,8 +837,8 @@ static void mli0_load_map(u32 a1) LoadEventObjTemplatesFromHeader(); } - v2 = IsMapTypeOutside(gMapHeader.mapType); - indoors = Overworld_MapTypeIsIndoors(gMapHeader.mapType); + isOutdoors = IsMapTypeOutdoors(gMapHeader.mapType); + isIndoors = Overworld_MapTypeIsIndoors(gMapHeader.mapType); sub_80EB218(); TrySetMapSaveWarpStatus(); @@ -850,7 +850,7 @@ static void mli0_load_map(u32 a1) DoTimeBasedEvents(); SetSav1WeatherFromCurrMapHeader(); ChooseAmbientCrySpecies(); - if (v2) + if (isOutdoors) FlagClear(FLAG_SYS_USE_FLASH); SetDefaultFlashLevel(); Overworld_ClearSavedMusic(); @@ -864,7 +864,7 @@ static void mli0_load_map(u32 a1) else InitMap(); - if (a1 != 1 && indoors) + if (a1 != 1 && isIndoors) { UpdateTVScreensOnMap(gBackupMapLayout.width, gBackupMapLayout.height); sub_80E9238(1); @@ -1330,7 +1330,7 @@ u8 GetLastUsedWarpMapType(void) return GetMapTypeByWarpData(&gLastUsedWarp); } -bool8 IsMapTypeOutside(u8 mapType) +bool8 IsMapTypeOutdoors(u8 mapType) { if (mapType == MAP_TYPE_ROUTE || mapType == MAP_TYPE_TOWN diff --git a/src/save.c b/src/save.c index 593ee8f2c8..920a5152ae 100644 --- a/src/save.c +++ b/src/save.c @@ -659,10 +659,10 @@ static void UpdateSaveAddresses(void) u8 HandleSavingData(u8 saveType) { u8 i; - u32 *backupVar = gVBlankCounterPointer; + u32 *backupVar = gTrainerHillVBlankCounter; u8 *tempAddr; - gVBlankCounterPointer = NULL; + gTrainerHillVBlankCounter = NULL; UpdateSaveAddresses(); switch (saveType) { @@ -705,7 +705,7 @@ u8 HandleSavingData(u8 saveType) save_write_to_flash(0xFFFF, gRamSaveSectionLocations); break; } - gVBlankCounterPointer = backupVar; + gTrainerHillVBlankCounter = backupVar; return 0; } diff --git a/src/secret_base.c b/src/secret_base.c index cf35deb072..af8804ec3b 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -60,7 +60,7 @@ struct SecretBaseRecordMixer { // Static RAM declarations EWRAM_DATA u8 sCurSecretBaseId = 0; -EWRAM_DATA bool8 gIsInSecretBase = FALSE; +EWRAM_DATA bool8 gInFriendSecretBase = FALSE; EWRAM_DATA struct SecretBaseListMenuBuffer *gUnknown_0203A020 = NULL; // Static ROM declarations @@ -407,7 +407,7 @@ void sub_80E9068(void) bool8 sub_80E909C(void) { - if (gMapHeader.mapType == MAP_TYPE_SECRET_BASE && VarGet(VAR_SECRET_BASE_SHOULD_BE_INIT) == 0) + if (gMapHeader.mapType == MAP_TYPE_SECRET_BASE && VarGet(VAR_INIT_SECRET_BASE) == 0) { return FALSE; } @@ -1186,11 +1186,11 @@ void SecretBasePerStepCallback(u8 taskId) case 0: if (VarGet(VAR_CURRENT_SECRET_BASE) != 0) { - gIsInSecretBase = TRUE; + gInFriendSecretBase = TRUE; } else { - gIsInSecretBase = FALSE; + gInFriendSecretBase = FALSE; } PlayerGetDestCoords(&data[2], &data[3]); data[1] = 1; @@ -1206,35 +1206,35 @@ void SecretBasePerStepCallback(u8 taskId) tileId = MapGridGetMetatileIdAt(x, y); if (tileId == 0x234 || tileId == 0x23C) { - if (gIsInSecretBase == TRUE) + if (gInFriendSecretBase == TRUE) { VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x20); } } else if (tileId == 0x2b8 || tileId == 0x2b9 || tileId == 0x2ba || tileId == 0x2c0 || tileId == 0x2c1 || tileId == 0x2c2 || tileId == 0x2c8 || tileId == 0x2c9 || tileId == 0x2ca) { - if (gIsInSecretBase == TRUE) + if (gInFriendSecretBase == TRUE) { VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x01); } } else if (tileId == 0x239 || tileId == 0x241 || tileId == 0x251 || tileId == 0x259) { - if (gIsInSecretBase == TRUE) + if (gInFriendSecretBase == TRUE) { VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x04); } } else if ((behavior == 0x34 && tileId == 0x26d) || (behavior == 0x35 && MapGridGetMetatileIdAt(x, y) == 0x26a)) { - if (gIsInSecretBase == TRUE) + if (gInFriendSecretBase == TRUE) { VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x200); } } else if (behavior == 0xc1 && tileId == 0x23d) { - if (gIsInSecretBase == TRUE) + if (gInFriendSecretBase == TRUE) { VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) ^ 0x1000); VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x2000); @@ -1242,7 +1242,7 @@ void SecretBasePerStepCallback(u8 taskId) } else if (behavior == 0x47 && tileId == 0x23e) { - if (gIsInSecretBase == TRUE) + if (gInFriendSecretBase == TRUE) { VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x1000); VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) ^ 0x2000); @@ -1250,7 +1250,7 @@ void SecretBasePerStepCallback(u8 taskId) } else if (MetatileBehavior_IsSecretBaseGlitterMat(behavior) == TRUE) { - if (gIsInSecretBase == TRUE) + if (gInFriendSecretBase == TRUE) { VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x80); } @@ -1258,7 +1258,7 @@ void SecretBasePerStepCallback(u8 taskId) else if (MetatileBehavior_IsSecretBaseBalloon(behavior) == TRUE) { PopSecretBaseBalloon(MapGridGetMetatileIdAt(x, y), x, y); - if (gIsInSecretBase == TRUE) + if (gInFriendSecretBase == TRUE) { switch ((int)MapGridGetMetatileIdAt(x, y)) { @@ -1275,27 +1275,27 @@ void SecretBasePerStepCallback(u8 taskId) } else if (MetatileBehavior_IsSecretBaseBreakableDoor(behavior) == TRUE) { - if (gIsInSecretBase == TRUE) + if (gInFriendSecretBase == TRUE) { VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x400); } ShatterSecretBaseBreakableDoor(x, y); } else if (MetatileBehavior_IsSecretBaseSoundMat(behavior) == TRUE){ - if (gIsInSecretBase == TRUE) { + if (gInFriendSecretBase == TRUE) { VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x8000); } } else if (MetatileBehavior_IsSecretBaseJumpMat(behavior) == TRUE) { - if (gIsInSecretBase == TRUE) + if (gInFriendSecretBase == TRUE) { VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x4000); } } else if (MetatileBehavior_IsSecretBaseSpinMat(behavior) == TRUE) { - if (gIsInSecretBase == TRUE) + if (gInFriendSecretBase == TRUE) { VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x02); } @@ -1792,15 +1792,15 @@ void sub_80EB1AC(void) { VarSet(VAR_SECRET_BASE_IS_NOT_LOCAL, FALSE); } - gIsInSecretBase = FALSE; + gInFriendSecretBase = FALSE; } void sub_80EB218(void) { - if (VarGet(VAR_SECRET_BASE_IS_NOT_LOCAL) && gIsInSecretBase == TRUE && !CurrentMapIsSecretBase()) + if (VarGet(VAR_SECRET_BASE_IS_NOT_LOCAL) && gInFriendSecretBase == TRUE && !CurrentMapIsSecretBase()) { VarSet(VAR_SECRET_BASE_IS_NOT_LOCAL, FALSE); - gIsInSecretBase = FALSE; + gInFriendSecretBase = FALSE; sub_80EEA70(); VarSet(VAR_SECRET_BASE_STEP_COUNTER, 0); VarSet(VAR_SECRET_BASE_LAST_ITEM_USED, 0); diff --git a/src/time_events.c b/src/time_events.c index 9263bffac6..bd51f0c2d6 100644 --- a/src/time_events.c +++ b/src/time_events.c @@ -81,7 +81,7 @@ void UpdateShoalTideFlag(void) 1, // 23 }; - if (IsMapTypeOutside(GetLastUsedWarpMapType())) + if (IsMapTypeOutdoors(GetLastUsedWarpMapType())) { RtcCalcLocalTime(); if (tide[gLocalTime.hours]) diff --git a/src/trainer_hill.c b/src/trainer_hill.c index ee7e2287a1..06ca8615fb 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -93,7 +93,7 @@ struct TrHillStruct2 // EWRAM static EWRAM_DATA struct TrHillStruct2 *sHillData = NULL; static EWRAM_DATA struct TrHillRoomTrainers *sRoomTrainers = NULL; -EWRAM_DATA u32 *gVBlankCounterPointer = NULL; +EWRAM_DATA u32 *gTrainerHillVBlankCounter = NULL; // This file's functions. static void TrainerHillStartChallenge(void); @@ -372,7 +372,7 @@ void InitTrainerHillBattleStruct(void) } sRoomTrainers->facilityClass[i] = sHillData->tag.floors[sHillData->floorId].trainers[i].facilityClass; } - SetVBlankCounterPointer(&gSaveBlock1Ptr->trainerHill.timer); + SetTrainerHillVBlankCounter(&gSaveBlock1Ptr->trainerHill.timer); FreeDataStruct(); } @@ -435,7 +435,7 @@ static void TrainerHillStartChallenge(void) gSaveBlock1Ptr->trainerHill.field_3D6E_0f = 0; gSaveBlock1Ptr->trainerHill.field_3D6C = 0; - SetVBlankCounterPointer(&gSaveBlock1Ptr->trainerHill.timer); + SetTrainerHillVBlankCounter(&gSaveBlock1Ptr->trainerHill.timer); gSaveBlock1Ptr->trainerHill.timer = 0; gSaveBlock1Ptr->trainerHill.field_3D6E_0c = 0; gSaveBlock1Ptr->trainerHill.field_3D6E_0b = 0; @@ -447,7 +447,7 @@ static void TrainerHillStartChallenge(void) static void sub_81D58D8(void) { - ClearVBlankCounterPointer(); + ClearTrainerHillVBlankCounter(); gSpecialVar_Result = 0; if (gSaveBlock1Ptr->trainerHill.field_3D6E_0c) gSpecialVar_Result++; @@ -505,7 +505,7 @@ static void TrainerHillResumeTimer(void) if (gSaveBlock1Ptr->trainerHill.timer >= HILL_MAX_TIME) gSaveBlock1Ptr->trainerHill.timer = HILL_MAX_TIME; else - SetVBlankCounterPointer(&gSaveBlock1Ptr->trainerHill.timer); + SetTrainerHillVBlankCounter(&gSaveBlock1Ptr->trainerHill.timer); } } From 3ceb1667c9b5e81934c7d608efc08905f21c372e Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 1 Mar 2019 22:32:50 -0500 Subject: [PATCH 158/217] Reduce externs --- include/battle_anim.h | 9 +++ include/contest.h | 1 + include/event_obj_lock.h | 1 + include/event_object_movement.h | 3 + include/field_control_avatar.h | 1 + include/field_effect_helpers.h | 1 + include/field_player_avatar.h | 7 +++ include/field_screen_effect.h | 1 + include/field_special_scene.h | 1 + include/field_specials.h | 2 +- include/fieldmap.h | 4 +- include/flying.h | 6 ++ include/item_menu.h | 3 + include/link.h | 1 + include/main.h | 2 +- include/match_call.h | 3 + include/pokedex.h | 1 + include/water.h | 6 ++ src/battle_anim_effects_2.c | 4 +- src/battle_anim_effects_3.c | 4 +- src/battle_controller_link_opponent.c | 5 +- src/battle_controller_link_partner.c | 4 +- src/battle_controller_opponent.c | 4 +- src/battle_controller_player.c | 4 -- src/battle_controller_player_partner.c | 3 - src/battle_controller_recorded_opponent.c | 3 - src/battle_controller_recorded_player.c | 2 - src/battle_controller_safari.c | 2 - src/battle_controller_wally.c | 2 - src/battle_main.c | 4 +- src/battle_records.c | 3 +- src/battle_script_commands.c | 4 +- src/battle_setup.c | 5 +- src/berry.c | 6 +- src/berry_blender.c | 3 - src/bike.c | 6 -- src/contest.c | 2 - src/contest_link_80F57C4.c | 3 +- src/diploma.c | 3 +- src/electric.c | 4 +- src/field_control_avatar.c | 3 +- src/field_effect.c | 6 -- src/field_message_box.c | 4 +- src/field_screen_effect.c | 13 ++-- src/field_specials.c | 2 +- src/fldeff_cut.c | 1 - src/item_menu.c | 2 +- src/item_use.c | 2 +- src/normal.c | 3 +- src/safari_zone.c | 3 +- src/start_menu.c | 76 +++++++++++------------ 51 files changed, 112 insertions(+), 136 deletions(-) create mode 100644 include/flying.h create mode 100644 include/water.h diff --git a/include/battle_anim.h b/include/battle_anim.h index d0d3232160..4e241686fd 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -204,6 +204,9 @@ void sub_80A718C(struct Sprite *sprite); #define STAT_ANIM_MULTIPLE_MINUS2 58 void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId); +// battle_anim_8170478.c +void sub_8172EF0(u8 battler, struct Pokemon *mon); + // ground.c void sub_81152DC(u8 taskId); @@ -216,6 +219,12 @@ u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 selectedPalettes, void sub_8116EB4(u8); void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *arg8, const u32 *arg9, const u32 *palette); +// battle_anim_effects_1.c +void sub_810310C(u8 battler, struct Sprite* sprite); + +// smokescreen.c +u8 sub_807521C(s16 x, s16 y, u8 a3); + u32 UnpackSelectedBattleAnimPalettes(s16); u8 GetBattlerSpriteFinal_Y(u8, u16, u8); diff --git a/include/contest.h b/include/contest.h index e4391a3273..8146486cbf 100644 --- a/include/contest.h +++ b/include/contest.h @@ -478,5 +478,6 @@ bool32 sub_80FC4F4(void *, u16); bool8 sub_80FC55C(void); bool8 sub_80FC530(u8); u8 sub_80F86E0(u8 *); +void sub_80FC9F8(u8 taskId); #endif //GUARD_CONTEST_H diff --git a/include/event_obj_lock.h b/include/event_obj_lock.h index 59532fdcb2..2f09ad36a7 100644 --- a/include/event_obj_lock.h +++ b/include/event_obj_lock.h @@ -7,5 +7,6 @@ bool8 sub_809847C(void); void LockSelectedEventObject(void); void sub_8098630(void); bool8 sub_8098734(void); +void ScriptUnfreezeEventObjects(void); #endif // GUARD_EVENT_OBJ_LOCK_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 284bbe8db5..63ac09f2d3 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -193,6 +193,9 @@ void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible); s16 sub_809773C(s16 a1); s16 sub_8097728(s16 a1); void CameraObjectReset2(void); +u8 EventObjectGetBerryTreeId(u8 eventObjectId); +void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup); +bool8 IsBerryTreeSparkling(u8, u8, u8); void MovementType_None(struct Sprite *); void MovementType_LookAround(struct Sprite *); diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index 738cceb3e6..feb20cef6d 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -39,5 +39,6 @@ int SetCableClubWarp(void); u8 TrySetDiveWarp(void); const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction); u8 *GetCoordEventScriptAtMapPosition(struct MapPosition *position); +void ClearPoisonStepCounter(void); #endif // GUARD_FIELDCONTROLAVATAR_H diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 6022467e49..6ea9771e61 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -34,5 +34,6 @@ void UpdateSparkleFieldEffect(struct Sprite*); void SetSpriteInvisible(u8 spriteId); void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y); void sub_8155604(u8 spriteId, u8 value, s16 data1); +void sub_81555D8(u8 spriteId, u8 value); #endif //GUARD_FIELD_EFFECT_HELPERS_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 45cd0dbd92..ae7aa92d27 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -63,5 +63,12 @@ u8 sub_808BCD0(void); void sub_808B578(void); u8 GetFRLGAvatarGraphicsIdByGender(u8); u8 GetRSAvatarGraphicsIdByGender(u8); +void sub_808B980(u8 direction); +void sub_808B9BC(u8 direction); +void sub_808B9A4(u8 direction); +void sub_808C1B4(u8 direction); +void sub_808B9D4(u8 direction); +void sub_808D194(void); +void sub_808D1C8(void); #endif // GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index 2b8b3a5a3a..b4429c1670 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -41,5 +41,6 @@ void sub_80B0534(void); void sub_80B058C(void); void sub_80B05B4(void); void WriteFlashScanlineEffectBuffer(u8 flashLevel); +bool8 walkrun_is_standing_still(void); #endif // GUARD_FIELD_SCREEN_EFFECT_H diff --git a/include/field_special_scene.h b/include/field_special_scene.h index 240e9ecb60..2219c94332 100644 --- a/include/field_special_scene.h +++ b/include/field_special_scene.h @@ -10,5 +10,6 @@ void Task_HandleTruckSequence(u8 taskId); void ExecuteTruckSequence(void); void EndTruckSequence(u8); void sub_80C791C(void); +void sub_80FB768(void); #endif // GUARD_FIELD_SPECIAL_SCENE_H diff --git a/include/field_specials.h b/include/field_specials.h index bff04a7397..e6ed605936 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -26,6 +26,6 @@ void UpdateFrontierGambler(u16 a0); void ResetCyclingRoadChallengeData(void); bool8 warp0_in_pokecenter(void); void ResetFanClub(void); - +bool8 sub_813B21C(void); #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/fieldmap.h b/include/fieldmap.h index 24bc4989af..8e10240d22 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -37,8 +37,8 @@ void copy_map_tileset1_tileset2_to_vram(struct MapLayout const *mapLayout); void apply_map_tileset1_tileset2_palette(struct MapLayout const *mapLayout); void apply_map_tileset2_palette(struct MapLayout const *mapLayout); void copy_map_tileset2_to_vram_2(struct MapLayout const *mapLayout); -extern void copy_map_tileset1_to_vram(const struct MapLayout *); -extern void copy_map_tileset2_to_vram(const struct MapLayout *); +void copy_map_tileset1_to_vram(const struct MapLayout *); +void copy_map_tileset2_to_vram(const struct MapLayout *); void SpriteCB_PokeballGlow(struct Sprite *); void SpriteCB_PokecenterMonitor(struct Sprite *); diff --git a/include/flying.h b/include/flying.h new file mode 100644 index 0000000000..062320b4d2 --- /dev/null +++ b/include/flying.h @@ -0,0 +1,6 @@ +#ifndef GUARD_FLYING_H +#define GUARD_FLYING_H + +void sub_810E2C8(struct Sprite *sprite); + +#endif // GUARD_FLYING_H \ No newline at end of file diff --git a/include/item_menu.h b/include/item_menu.h index 2ca1af2001..465e5966e6 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -71,6 +71,7 @@ void sub_81AAC14(void); void sub_81AAC50(void); void sub_81AAC70(void); void sub_81AAC28(void); +void sub_81AABB0(void); void SetInitialScrollAndCursorPositions(u8 pocketId); void bag_menu_mail_related(void); void CB2_BagMenuFromStartMenu(void); @@ -80,6 +81,8 @@ void CB2_GoToSellMenu(void); void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)()); void DoWallyTutorialBagMenu(void); void ResetBagScrollPositions(void); +void sub_81AABF0(void (*callback)(void)); +void CB2_ChooseBerry(void); #endif //GUARD_item_menu_H diff --git a/include/link.h b/include/link.h index 83deab88f7..400816fd01 100644 --- a/include/link.h +++ b/include/link.h @@ -261,6 +261,7 @@ void sub_800B3A4(u32 who); bool32 sub_800A07C(void); void sub_800AB98(void); void sub_800AA04(u8 a0); +void sub_800B4C0(void); extern u16 gLinkPartnersHeldKeys[6]; extern u32 gLinkDebugSeed; diff --git a/include/main.h b/include/main.h index 728064288a..1b312550ef 100644 --- a/include/main.h +++ b/include/main.h @@ -68,7 +68,7 @@ void ClearPokemonCrySongs(void); void RestoreSerialTimer3IntrHandlers(void); void StartTimer1(void); void SeedRngAndSetTrainerId(void); -extern u16 GetGeneratedTrainerIdLower(void); +u16 GetGeneratedTrainerIdLower(void); #endif // GUARD_MAIN_H diff --git a/include/match_call.h b/include/match_call.h index 17d40d41cf..1bf654937d 100644 --- a/include/match_call.h +++ b/include/match_call.h @@ -12,5 +12,8 @@ enum { s32 GetRematchIdxByTrainerIdx(s32 trainerIdx); void InitMatchCallCounters(void); +bool32 TryStartMatchCall(void); +bool32 IsMatchCallTaskActive(void); +void StartMatchCallFromScript(u8* script); #endif //GUARD_MATCH_CALL_H diff --git a/include/pokedex.h b/include/pokedex.h index 6136f77861..c3700c8112 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -43,5 +43,6 @@ s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId); u16 CreateMonSpriteFromNationalDexNumber(u16, s16, s16, u16); bool16 HasAllHoennMons(void); void ResetPokedexScrollPositions(void); +u16 sub_80C0944(void); #endif // GUARD_POKEDEX_H diff --git a/include/water.h b/include/water.h new file mode 100644 index 0000000000..9f876021c4 --- /dev/null +++ b/include/water.h @@ -0,0 +1,6 @@ +#ifndef GUARD_WATER_H +#define GUARD_WATER_H + +void sub_8108C94(struct Sprite *sprite); + +#endif // GUARD_WATER_H \ No newline at end of file diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index ee6676e644..a72b2c8dce 100755 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -15,9 +15,7 @@ #include "util.h" #include "constants/rgb.h" #include "constants/songs.h" - -extern void sub_8108C94(struct Sprite *); -extern void sub_810310C(u8, struct Sprite *); +#include "water.h" void sub_8103448(struct Sprite *); void sub_8103498(struct Sprite *); diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index 49fb693421..de00892ba4 100755 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -23,9 +23,7 @@ #include "constants/songs.h" #include "constants/species.h" #include "constants/weather.h" - -extern u8 sub_807521C(s16 x, s16 y, u8 a3); -extern void sub_810E2C8(struct Sprite *); +#include "flying.h" extern const struct SpriteTemplate gUnknown_08593114; extern const union AffineAnimCmd *const gUnknown_082FF6C0[]; diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 05da72e16a..6c0f81d41f 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -26,15 +26,12 @@ #include "constants/battle_anim.h" #include "constants/songs.h" #include "constants/trainers.h" +#include "recorded_battle.h" extern struct MusicPlayerInfo gMPlayInfo_BGM; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; -extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_81851A8(u8 *); -extern u16 sub_8068B48(void); - // this file's functions static void LinkOpponentHandleGetMonData(void); static void LinkOpponentHandleGetRawMonData(void); diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 19d39609fb..59fc2aae58 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -26,13 +26,11 @@ #include "constants/battle_anim.h" #include "constants/songs.h" #include "constants/trainers.h" +#include "recorded_battle.h" extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; -extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_81851A8(u8 *); - // this file's functions static void LinkPartnerHandleGetMonData(void); static void LinkPartnerHandleGetRawMonData(void); diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 99bb0c5887..9fee8134de 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -32,14 +32,12 @@ #include "constants/moves.h" #include "constants/songs.h" #include "constants/trainers.h" +#include "trainer_hill.h" extern struct MusicPlayerInfo gMPlayInfo_BGM; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; -extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern u8 GetTrainerHillTrainerFrontSpriteId(u16 trainerId); - // this file's functions static void OpponentHandleGetMonData(void); static void OpponentHandleGetRawMonData(void); diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 6bcc97c68d..42d29dbbd9 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -39,10 +39,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; -extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_81AABB0(void); -extern void sub_81851A8(u8 *); - // this file's functions static void PlayerHandleGetMonData(void); static void PlayerHandleSetMonData(void); diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index a9b0f376be..95a3f698b7 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -30,9 +30,6 @@ extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; -extern void sub_81358F4(void); -extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); - // this file's functions static void PlayerPartnerHandleGetMonData(void); static void PlayerPartnerHandleGetRawMonData(void); diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 911eb6ce58..c66a1b49cc 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -33,9 +33,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; -extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern u16 sub_8068B48(void); - // this file's functions static void RecordedOpponentHandleGetMonData(void); static void RecordedOpponentHandleGetRawMonData(void); diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index b2dfca6a07..cc40f159ab 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -30,8 +30,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; -extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); - // this file's functions static void RecordedPlayerHandleGetMonData(void); static void RecordedPlayerHandleGetRawMonData(void); diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 54ba04ab4a..b0173df687 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -25,8 +25,6 @@ extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; -extern void sub_81358F4(void); - // this file's functions static void SafariHandleGetMonData(void); static void SafariHandleGetRawMonData(void); diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index d891b96b67..a3dc927574 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -33,8 +33,6 @@ extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; -extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); - // this file's functions static void WallyHandleGetMonData(void); static void WallyHandleGetRawMonData(void); diff --git a/src/battle_main.c b/src/battle_main.c index 043e758087..befef364f7 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -57,6 +57,7 @@ #include "constants/songs.h" #include "constants/species.h" #include "constants/trainers.h" +#include "cable_club.h" extern struct MusicPlayerInfo gMPlayInfo_SE1; extern struct MusicPlayerInfo gMPlayInfo_SE2; @@ -69,9 +70,6 @@ extern const u8 *const gBattlescriptsForRunningByItem[]; extern const u8 *const gBattlescriptsForUsingItem[]; extern const u8 *const gBattlescriptsForSafariActions[]; -// functions -extern void sub_80B3AF8(u8 taskId); // cable club - // this file's functions static void CB2_InitBattleInternal(void); static void CB2_PreInitMultiBattle(void); diff --git a/src/battle_records.c b/src/battle_records.c index f9c40d8de6..d905ccaf38 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -21,8 +21,7 @@ #include "alloc.h" #include "gpu_regs.h" #include "constants/game_stat.h" - -extern void PrintOnTrainerHillRecordsWindow(void); // pokenav.s +#include "trainer_hill.h" // this file's functions static void Task_CloseTrainerHillRecordsOnButton(u8 taskId); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index a53fa30f21..8a4436a3f9 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -48,6 +48,7 @@ #include "battle_pyramid.h" #include "field_specials.h" #include "pokemon_summary_screen.h" +#include "pokenav.h" extern struct MusicPlayerInfo gMPlayInfo_BGM; @@ -55,9 +56,6 @@ extern const u8* const gBattleScriptsForMoveEffects[]; // functions extern void sub_81D388C(struct Pokemon* mon, void* statStoreLocation); // pokenav.s -extern void sub_81D3640(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); // pokenav.s -extern void sub_81D3784(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); // pokenav.s -extern u8 sub_813B21C(void); #define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattlerTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED)) diff --git a/src/battle_setup.c b/src/battle_setup.c index 7626420e92..3d27b517e8 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -44,6 +44,7 @@ #include "mirage_tower.h" #include "constants/map_types.h" #include "constants/battle_frontier.h" +#include "field_screen_effect.h" enum { @@ -62,10 +63,6 @@ struct TrainerBattleParameter u8 ptrType; }; -extern void ClearPoisonStepCounter(void); -extern void sub_808BCF4(void); -extern void sub_80AF6F0(void); - // this file's functions static void DoBattlePikeWildBattle(void); static void DoSafariBattle(void); diff --git a/src/berry.c b/src/berry.c index bd596db7f7..cbac06a3dd 100644 --- a/src/berry.c +++ b/src/berry.c @@ -11,11 +11,9 @@ #include "text.h" #include "constants/event_object_movement_constants.h" #include "constants/items.h" +#include "event_object_movement.h" + -extern u8 EventObjectGetBerryTreeId(u8 eventObjectId); -extern void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup); -extern void CB2_ChooseBerry(void); -extern bool8 IsBerryTreeSparkling(u8, u8, u8); extern const u8 BerryTreeScript[]; diff --git a/src/berry_blender.c b/src/berry_blender.c index 87d24e7175..70e50a72e8 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -142,9 +142,6 @@ extern const u8 gText_Space[]; extern const u8 gText_BlenderMaxSpeedRecord[]; extern const u8 gText_234Players[]; -extern void sub_81AABF0(void (*callback)(void)); -extern void sub_800B4C0(void); - // this file's functions static void BerryBlender_SetBackgroundsPos(void); static void sub_8080EA4(u8 taskId); diff --git a/src/bike.c b/src/bike.c index 1e91baab07..530742bdf6 100644 --- a/src/bike.c +++ b/src/bike.c @@ -14,12 +14,6 @@ extern bool8 gBikeCyclingChallenge; extern u8 gBikeCollisions; -extern u8 sub_808B980(u8 direction); -extern u8 sub_808B9BC(u8 direction); -extern u8 sub_808B9A4(u8 direction); -extern u8 sub_808C1B4(u8 direction); -extern u8 sub_808B9D4(u8 direction); - // this file's functions static void MovePlayerOnMachBike(u8, u16, u16); static u8 GetMachBikeTransition(u8 *); diff --git a/src/contest.c b/src/contest.c index 7be4aa23b5..230ccd1b48 100644 --- a/src/contest.c +++ b/src/contest.c @@ -45,8 +45,6 @@ #include "constants/rgb.h" #include "contest_ai.h" -extern void sub_80FC9F8(u8); // contest_link_80FC4F4.c - // This file's functions. static void sub_80D782C(void); static void sub_80D7C7C(u8 taskId); diff --git a/src/contest_link_80F57C4.c b/src/contest_link_80F57C4.c index c0a79af814..881d9847ee 100644 --- a/src/contest_link_80F57C4.c +++ b/src/contest_link_80F57C4.c @@ -39,6 +39,7 @@ #include "constants/rgb.h" #include "constants/songs.h" #include "constants/vars.h" +#include "contest.h" struct ContestLinkUnk0 { @@ -99,8 +100,6 @@ extern const struct SpriteSheet gUnknown_0858D810[]; extern const struct SpritePalette gUnknown_0858D850; extern const struct SpriteTemplate gSpriteTemplate_858D860; -extern void sub_81D9DE4(u8); - static void sub_80F6A9C(void); static void sub_80F71C8(void); u8 sub_80F7310(u8, u8); diff --git a/src/diploma.c b/src/diploma.c index b3d5a48fa0..78d49527f3 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -13,8 +13,7 @@ #include "text.h" #include "overworld.h" #include "menu.h" - -extern bool16 sub_80C0944(void); +#include "pokedex.h" extern const u8 gText_DexNational[]; extern const u8 gText_DexHoenn[]; diff --git a/src/electric.c b/src/electric.c index 142a9ca090..6c6c337467 100644 --- a/src/electric.c +++ b/src/electric.c @@ -4,9 +4,7 @@ #include "trig.h" #include "constants/songs.h" #include "sound.h" - -extern void sub_810E2C8(struct Sprite *); -extern void TranslateAnimSpriteToTargetMonLocation(struct Sprite *); +#include "flying.h" static void sub_810A1A8(struct Sprite *); static void sub_810A1F8(struct Sprite *); diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index cffafaf9f7..f5961bb48c 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -32,8 +32,7 @@ #include "constants/map_types.h" #include "constants/maps.h" #include "constants/songs.h" - -extern bool32 TryStartMatchCall(void); +#include "match_call.h" static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0; static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0; diff --git a/src/field_effect.c b/src/field_effect.c index 7f11a8e582..fcdc483e69 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -240,12 +240,6 @@ static IWRAM_DATA u8 sActiveList[32]; extern u8 *gFieldEffectScriptPointers[]; extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; -extern void sub_81555D8(u8, u8); -extern void pal_fill_for_maplights(void); -extern void sub_80E1558(u8); -extern void sub_80E1570(void); -extern bool8 sub_80E1584(void); -extern void WarpFadeScreen(void); // .rodata const u32 gNewGameBirchPic[] = INCBIN_U32("graphics/birch_speech/birch.4bpp"); diff --git a/src/field_message_box.c b/src/field_message_box.c index 299aafaf26..fa1aee5660 100755 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -4,9 +4,7 @@ #include "string_util.h" #include "task.h" #include "text.h" - -extern bool32 IsMatchCallTaskActive(void); -extern void StartMatchCallFromScript(u8*); +#include "match_call.h" static EWRAM_DATA u8 sFieldMessageBoxMode = 0; diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index e7476dea3a..3e49656677 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -10,7 +10,6 @@ #include "field_screen_effect.h" #include "field_special_scene.h" #include "field_weather.h" -// #include "fldeff_flash.h" #include "gpu_regs.h" #include "link.h" #include "link_rfu.h" @@ -31,15 +30,9 @@ #include "constants/event_object_movement_constants.h" #include "constants/songs.h" #include "constants/rgb.h" +#include "trainer_hill.h" +#include "event_obj_lock.h" -extern bool32 sub_81D6534(void); -extern bool8 walkrun_is_standing_still(void); -extern void ScriptUnfreezeEventObjects(void); -extern void sub_80FB768(void); -extern void sub_808D194(void); -extern void sub_808D1C8(void); -extern bool32 sub_808D1B4(void); -extern bool32 sub_808D1E8(void); extern void sub_80B6B68(void); extern void sub_80B6E4C(u8, u8); extern void sub_80B75D8(u8); @@ -47,6 +40,8 @@ extern void sub_80B7A74(u8); extern void sub_808C0A8(u8); extern u8 GetMapPairFadeToType(u8, u8); extern u8 GetMapPairFadeFromType(u8, u8); +extern bool32 sub_808D1B4(void); +extern bool32 sub_808D1E8(void); extern const u16 gUnknown_82EC7CC[]; diff --git a/src/field_specials.c b/src/field_specials.c index 639d86e685..3994f8c36a 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -3379,7 +3379,7 @@ u16 get_unknown_box_id(void) return gUnknown_0203AB6F; } -bool32 sub_813B21C(void) +bool8 sub_813B21C(void) { if (FlagGet(FLAG_SYS_STORAGE_UNKNOWN_FLAG) == FALSE) { diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 348a1f46c9..a715608c5c 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -20,7 +20,6 @@ #include "constants/field_effects.h" #include "constants/songs.h" -extern void ScriptUnfreezeEventObjects(void); extern bool8 IsMewPlayingHideAndSeek(void); extern struct MapPosition gPlayerFacingPosition; diff --git a/src/item_menu.c b/src/item_menu.c index 43f2afce34..b3d341c2ee 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -476,7 +476,7 @@ void CB2_ChooseBerry(void) GoToBagMenu(RETURN_LOCATION_FIELD_2, BERRIES_POCKET, CB2_ReturnToFieldContinueScript); } -void sub_81AABF0(void(*callback)(void)) +void sub_81AABF0(void (*callback)(void)) { GoToBagMenu(RETURN_LOCATION_FIELD_3, BERRIES_POCKET, callback); } diff --git a/src/item_use.c b/src/item_use.c index 97d6292c45..16fb22d94d 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -37,10 +37,10 @@ #include "constants/items.h" #include "constants/songs.h" #include "constants/vars.h" +#include "event_obj_lock.h" extern void unknown_ItemMenu_Confirm(u8 taskId); extern void sub_81C5B14(u8 taskId); -extern void ScriptUnfreezeEventObjects(void); extern void ItemUseOutOfBattle_TMHM(u8 a); extern void ItemUseOutOfBattle_EvolutionStone(u8 b); extern bool8 IsPlayerFacingSurfableFishableWater(void); diff --git a/src/normal.c b/src/normal.c index 87c8792f14..cbf0caa83c 100644 --- a/src/normal.c +++ b/src/normal.c @@ -5,6 +5,7 @@ #include "task.h" #include "trig.h" #include "constants/rgb.h" +#include "flying.h" void AnimConfusionDuck(struct Sprite *); void AnimSimplePaletteBlend(struct Sprite *); @@ -36,8 +37,6 @@ static void sub_81162F8(u8); static void sub_81163D0(struct Sprite *); static void sub_81165E4(struct Sprite *); -extern void sub_810E2C8(struct Sprite *); - const union AnimCmd gUnknown_0859722C[] = { ANIMCMD_FRAME(0, 8), diff --git a/src/safari_zone.c b/src/safari_zone.c index accf949817..703c3d0cde 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -10,6 +10,7 @@ #include "string_util.h" #include "tv.h" #include "constants/game_stat.h" +#include "field_screen_effect.h" struct PokeblockFeeder { @@ -27,8 +28,6 @@ extern const u8 EventScript_2A4B6F[]; extern const u8 EventScript_2A4B4C[]; extern const u8 EventScript_2A4B9B[]; -extern void sub_80AF6F0(void); - EWRAM_DATA u8 gNumSafariBalls = 0; EWRAM_DATA static u16 sSafariZoneStepCounter = 0; EWRAM_DATA static u8 sSafariZoneCaughtMons = 0; diff --git a/src/start_menu.c b/src/start_menu.c index 4b71f61474..79404d0b2d 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1,44 +1,45 @@ #include "global.h" -#include "start_menu.h" -#include "menu.h" -#include "safari_zone.h" -#include "event_data.h" -#include "window.h" -#include "string_util.h" -#include "text.h" -#include "strings.h" -#include "bg.h" -#include "field_effect.h" -#include "party_menu.h" -#include "frontier_pass.h" -#include "task.h" -#include "overworld.h" -#include "link.h" -#include "frontier_util.h" -#include "field_specials.h" -#include "event_object_movement.h" -#include "script.h" -#include "main.h" -#include "sound.h" -#include "pokedex.h" -#include "field_weather.h" -#include "palette.h" -#include "item_menu.h" -#include "option_menu.h" -#include "event_scripts.h" -#include "save.h" -#include "gpu_regs.h" -#include "scanline_effect.h" -#include "text_window.h" -#include "load_save.h" -#include "trainer_card.h" -#include "international_string_util.h" -#include "constants/songs.h" -#include "field_player_avatar.h" +#include "battle_pike.h" #include "battle_pyramid.h" #include "battle_pyramid_bag.h" -#include "battle_pike.h" +#include "bg.h" +#include "event_data.h" +#include "event_object_movement.h" +#include "event_obj_lock.h" +#include "event_scripts.h" +#include "field_effect.h" +#include "field_player_avatar.h" +#include "field_specials.h" +#include "field_weather.h" +#include "frontier_pass.h" +#include "frontier_util.h" +#include "gpu_regs.h" +#include "international_string_util.h" +#include "item_menu.h" +#include "link.h" +#include "load_save.h" +#include "main.h" +#include "menu.h" #include "new_game.h" +#include "option_menu.h" +#include "overworld.h" +#include "palette.h" +#include "party_menu.h" +#include "pokedex.h" +#include "safari_zone.h" +#include "save.h" +#include "scanline_effect.h" +#include "script.h" +#include "sound.h" +#include "start_menu.h" +#include "strings.h" +#include "string_util.h" +#include "task.h" +#include "text.h" +#include "text_window.h" +#include "trainer_card.h" +#include "window.h" +#include "constants/songs.h" // Menu actions enum @@ -93,7 +94,6 @@ extern void sub_808B864(void); extern void CB2_Pokedex(void); extern void PlayRainStoppingSoundEffect(void); extern void CB2_PokeNav(void); -extern void ScriptUnfreezeEventObjects(void); extern void save_serialize_map(void); // Menu action callbacks From 0f6cc27e81d4985d61e5caa669027801d520a122 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sat, 2 Mar 2019 00:36:59 -0500 Subject: [PATCH 159/217] Fixed decomp issue around LoadPalette In LoadLinkPartnerEventObjectSpritePalette, using paletteNum += 6 causes GCC to "mark" paletteNum's register as a possible overflow, even though it performs the overflow check. Then, when passing args to LoadPalette, GCC fails to recognize that 0x100 + ((any u8) << 4) can never overflow as a u16. It then does an overflow check before calling LoadPalette. Assigning to a temp variable seems to avoid this "marking" behavior. --- src/field_specials.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/field_specials.c b/src/field_specials.c index 3994f8c36a..629dd80152 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -55,6 +55,7 @@ #include "constants/vars.h" #include "constants/battle_frontier.h" #include "constants/weather.h" +#include "palette.h" EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE; EWRAM_DATA u8 gBikeCollisions = 0; @@ -80,7 +81,6 @@ extern const u16 gEventObjectPalette17[]; extern const u16 gEventObjectPalette33[]; extern const u16 gEventObjectPalette34[]; -extern void LoadPalette(const void *src, u32 offset, u16 size); // incorrect signature, needed to match extern void BlendPalettes(u32, u8, u16); extern void FieldInitRegionMap(MainCallback callback); @@ -591,7 +591,9 @@ void SpawnLinkPartnerEventObject(void) static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum) { - paletteNum += 6; + 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 || @@ -602,21 +604,21 @@ static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEvent { u8 spriteId = gEventObjects[obj].spriteId; struct Sprite *sprite = &gSprites[spriteId]; - sprite->oam.paletteNum = paletteNum; + sprite->oam.paletteNum = adjustedPaletteNum; switch (graphicsId) { case EVENT_OBJ_GFX_LINK_RS_BRENDAN: - LoadPalette(gEventObjectPalette33, 0x100 + paletteNum * 16, 0x20); + LoadPalette(gEventObjectPalette33, 0x100 + (adjustedPaletteNum << 4), 0x20); break; case EVENT_OBJ_GFX_LINK_RS_MAY: - LoadPalette(gEventObjectPalette34, 0x100 + paletteNum * 16, 0x20); + LoadPalette(gEventObjectPalette34, 0x100 + (adjustedPaletteNum << 4), 0x20); break; case EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL: - LoadPalette(gEventObjectPalette8, 0x100 + paletteNum * 16, 0x20); + LoadPalette(gEventObjectPalette8, 0x100 + (adjustedPaletteNum << 4), 0x20); break; case EVENT_OBJ_GFX_RIVAL_MAY_NORMAL: - LoadPalette(gEventObjectPalette17, 0x100 + paletteNum * 16, 0x20); + LoadPalette(gEventObjectPalette17, 0x100 + (adjustedPaletteNum << 4), 0x20); break; } } From ee6942683882e2abd4bde79f8355b71abbd21af9 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sat, 2 Mar 2019 02:44:02 -0500 Subject: [PATCH 160/217] Eliminate more externs --- include/agb_flash.h | 1 + include/easy_chat.h | 1 + include/field_effect.h | 5 ++++ include/field_player_avatar.h | 3 +++ include/field_specials.h | 1 + include/fieldmap.h | 7 ++++++ include/hall_of_fame.h | 3 +++ include/item_menu.h | 4 +++ include/link.h | 1 + include/rom_8011DC0.h | 1 + include/script_menu.h | 2 ++ src/field_player_avatar.c | 4 +-- src/field_screen_effect.c | 11 +------- src/field_specials.c | 2 -- src/frontier_util.c | 5 +--- src/hall_of_fame.c | 2 -- src/hof_pc.c | 4 --- src/ice.c | 47 +++++++++++++++++------------------ src/item_menu.c | 1 - src/item_use.c | 30 ++++++---------------- src/link.c | 2 +- src/link_rfu.c | 2 +- src/load_save.c | 2 +- src/main.c | 5 ---- src/match_call.c | 2 -- src/menu.c | 24 ++++++++---------- src/menu_helpers.c | 2 -- src/mystery_event_script.c | 2 -- src/option_menu.c | 3 +-- src/poison.c | 2 -- src/pokeblock_feed.c | 2 -- src/pokemon.c | 5 +--- src/pokemon_size_record.c | 4 +-- src/script_menu.c | 2 +- src/water.c | 1 - 35 files changed, 82 insertions(+), 113 deletions(-) diff --git a/include/agb_flash.h b/include/agb_flash.h index 27e45e8fa5..3dd60df0f1 100644 --- a/include/agb_flash.h +++ b/include/agb_flash.h @@ -8,5 +8,6 @@ // Exported ROM declarations u16 SetFlashTimerIntr(u8 timerNum, void (**intrFunc)(void)); +u16 IdentifyFlash(void); #endif //GUARD_AGB_FLASH_H diff --git a/include/easy_chat.h b/include/easy_chat.h index 2efdc4e5d6..84ac154227 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -134,5 +134,6 @@ u16 EasyChat_GetNumWordsInGroup(u8); u16 sub_811EE90(u16); void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback, u8 displayedPersonType); void sub_811F8BC(void); +void sub_811EFC0(u8 additionalPhraseId); #endif // GUARD_EASYCHAT_H diff --git a/include/field_effect.h b/include/field_effect.h index 205dbb68a1..1f5f4ee297 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -36,6 +36,10 @@ bool8 FieldEffectCmd_end(u8 **script, u32 *val); bool8 FieldEffectCmd_loadgfx_callnative(u8 **script, u32 *val); bool8 FieldEffectCmd_loadtiles_callnative(u8 **script, u32 *val); bool8 FieldEffectCmd_loadfadedpal_callnative(u8 **script, u32 *val); +void sub_80B6B68(void); +void sub_80B6E4C(u8 a0, u8 priority); +void sub_80B75D8(u8 priority); +void sub_80B7A74(u8 priority); void sub_80B9C28(s16*, u8); void sub_80B9C54(s16*, u8); @@ -47,5 +51,6 @@ void sub_80B7A58(struct Sprite*); void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b); void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId); u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority); +void StartEscapeRopeFieldEffect(void); #endif //GUARD_FIELD_EFFECTS_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index ae7aa92d27..ca3d415468 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -70,5 +70,8 @@ void sub_808C1B4(u8 direction); void sub_808B9D4(u8 direction); void sub_808D194(void); void sub_808D1C8(void); +bool32 sub_808D1B4(void); +bool32 sub_808D1E8(void); +void sub_808C0A8(u8 a); #endif // GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/field_specials.h b/include/field_specials.h index e6ed605936..3131531dc8 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -27,5 +27,6 @@ void ResetCyclingRoadChallengeData(void); bool8 warp0_in_pokecenter(void); void ResetFanClub(void); bool8 sub_813B21C(void); +void set_unknown_box_id(u8 id); #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/fieldmap.h b/include/fieldmap.h index 8e10240d22..bb5b0e290a 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -9,6 +9,8 @@ #define NUM_PALS_TOTAL 13 #define MAX_MAP_DATA_SIZE 0x2800 +#include "main.h" + extern struct BackupMapLayout gBackupMapLayout; u32 MapGridGetMetatileIdAt(int, int); @@ -39,9 +41,14 @@ void apply_map_tileset2_palette(struct MapLayout const *mapLayout); 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); void SpriteCB_PokeballGlow(struct Sprite *); void SpriteCB_PokecenterMonitor(struct Sprite *); void SpriteCB_HallOfFameMonitor(struct Sprite *); +// field_region_map.c +void FieldInitRegionMap(MainCallback callback); + #endif //GUARD_FIELDMAP_H diff --git a/include/hall_of_fame.h b/include/hall_of_fame.h index d35ecf268c..5c8a01bcb6 100644 --- a/include/hall_of_fame.h +++ b/include/hall_of_fame.h @@ -6,4 +6,7 @@ void CB2_DoHallOfFameScreenDontSaveData(void); void CB2_DoHallOfFamePC(void); void sub_8175280(void); +// hof_pc.c +void ReturnFromHallOfFamePC(void); + #endif // GUARD_HALL_OF_FAME_H diff --git a/include/item_menu.h b/include/item_menu.h index 465e5966e6..70d6b5a94d 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -2,6 +2,7 @@ #define GUARD_item_menu_H #include "item.h" +#include "menu_helpers.h" #define RETURN_LOCATION_FIELD 0 #define RETURN_LOCATION_BATTLE 1 @@ -83,6 +84,9 @@ void DoWallyTutorialBagMenu(void); void ResetBagScrollPositions(void); void sub_81AABF0(void (*callback)(void)); void CB2_ChooseBerry(void); +void unknown_ItemMenu_Confirm(u8 taskId); +void bag_menu_yes_no(u8, u8, const struct YesNoFuncTable*); +void sub_81AB9A8(u8 pocketId); #endif //GUARD_item_menu_H diff --git a/include/link.h b/include/link.h index 400816fd01..24a834c686 100644 --- a/include/link.h +++ b/include/link.h @@ -262,6 +262,7 @@ bool32 sub_800A07C(void); void sub_800AB98(void); void sub_800AA04(u8 a0); void sub_800B4C0(void); +bool32 sub_800B504(void); extern u16 gLinkPartnersHeldKeys[6]; extern u32 gLinkDebugSeed; diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h index faffd33752..9940a5b441 100644 --- a/include/rom_8011DC0.h +++ b/include/rom_8011DC0.h @@ -17,5 +17,6 @@ u16 mevent_081445C0(u8); void sub_801B990(u32, u32); u8 sub_8013F78(void); bool32 sub_802C908(u16); +void nullsub_89(u8 taskId); #endif //GUARD_rom_8011DC0_H diff --git a/include/script_menu.h b/include/script_menu.h index a6d52c31e9..1f4e549fec 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -14,5 +14,7 @@ u8 CreateWindowFromRect(u8, u8, u8, u8); void sub_80E2A78(u8); int display_text_and_get_width(const u8*, int); int sub_80E2D5C(int arg0, int tileWidth); +bool16 ScrSpecial_CreatePCMenu(void); +void ScriptMenu_DisplayPCStartupPrompt(void); #endif //GUARD_SCRIPT_MENU_H diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index b1291f0ce1..66f176d39e 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -2125,7 +2125,7 @@ void sub_808D194(void) sub_808D1FC(CreateTask(sub_808D1FC, 0)); } -bool8 sub_808D1B4(void) +bool32 sub_808D1B4(void) { return FuncIsActiveTask(sub_808D1FC); } @@ -2135,7 +2135,7 @@ void sub_808D1C8(void) sub_808D094(CreateTask(sub_808D094, 0)); } -bool8 sub_808D1E8(void) +bool32 sub_808D1E8(void) { return FuncIsActiveTask(sub_808D094); } diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 3e49656677..b6dcf212c0 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -32,16 +32,7 @@ #include "constants/rgb.h" #include "trainer_hill.h" #include "event_obj_lock.h" - -extern void sub_80B6B68(void); -extern void sub_80B6E4C(u8, u8); -extern void sub_80B75D8(u8); -extern void sub_80B7A74(u8); -extern void sub_808C0A8(u8); -extern u8 GetMapPairFadeToType(u8, u8); -extern u8 GetMapPairFadeFromType(u8, u8); -extern bool32 sub_808D1B4(void); -extern bool32 sub_808D1E8(void); +#include "fldeff.h" extern const u16 gUnknown_82EC7CC[]; diff --git a/src/field_specials.c b/src/field_specials.c index 629dd80152..85bc41723c 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -81,8 +81,6 @@ extern const u16 gEventObjectPalette17[]; extern const u16 gEventObjectPalette33[]; extern const u16 gEventObjectPalette34[]; -extern void BlendPalettes(u32, u8, u16); -extern void FieldInitRegionMap(MainCallback callback); void UpdateMovedLilycoveFanClubMembers(void); void sub_813BF60(void); diff --git a/src/frontier_util.c b/src/frontier_util.c index 6fcbd4ffbe..8c190f5223 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -35,8 +35,7 @@ #include "constants/moves.h" #include "constants/items.h" #include "constants/event_objects.h" - -extern u8 gSelectedOrderFromParty[]; +#include "party_menu.h" struct FrontierBrainMon { @@ -48,8 +47,6 @@ struct FrontierBrainMon u16 moves[4]; }; -extern void sub_81B8558(void); - // This file's functions. static void sub_81A17A0(void); static void sub_81A1830(void); diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 3f217b7828..48e4f8bec0 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -66,8 +66,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM; #define HALL_OF_FAME_MAX_TEAMS 50 -extern void ReturnFromHallOfFamePC(void); - // this file's functions static void ClearVramOamPltt_LoadHofPal(void); static void sub_8174F70(void); diff --git a/src/hof_pc.c b/src/hof_pc.c index 2cea5540af..d76f043725 100644 --- a/src/hof_pc.c +++ b/src/hof_pc.c @@ -7,10 +7,6 @@ #include "script_menu.h" #include "task.h" -extern void Overworld_PlaySpecialMapMusic(void); -extern bool16 ScrSpecial_CreatePCMenu(void); -extern void ScriptMenu_DisplayPCStartupPrompt(void); - static void ReshowPCMenuAfterHallOfFamePC(void); static void Task_WaitForPaletteFade(u8); diff --git a/src/ice.c b/src/ice.c index 34ad572e8f..fa1913b967 100644 --- a/src/ice.c +++ b/src/ice.c @@ -21,30 +21,29 @@ struct HailStruct { }; static void sub_810B6C4(struct Sprite *); -extern void sub_810B848(struct Sprite *); -extern void AnimIcePunchSwirlingParticle(struct Sprite *); -extern void AnimIceBeamParticle(struct Sprite *); -extern void AnimIceEffectParticle(struct Sprite *); -extern void AnimFlickerIceEffectParticle(struct Sprite *); -extern void AnimSwirlingSnowball_Step1(struct Sprite *); -extern void AnimSwirlingSnowball_Step2(struct Sprite *); -extern void AnimSwirlingSnowball_Step3(struct Sprite *); -extern void AnimSwirlingSnowball_End(struct Sprite *); -extern void AnimMoveParticleBeyondTarget(struct Sprite *); -extern void AnimWiggleParticleTowardsTarget(struct Sprite *); -extern void AnimWaveFromCenterOfTarget(struct Sprite *); -extern void InitSwirlingFogAnim(struct Sprite *); -extern void AnimSwirlingFogAnim(struct Sprite *); -extern void AnimThrowMistBall(struct Sprite *); -extern void InitPoisonGasCloudAnim(struct Sprite *); -extern void MovePoisonGasCloud(struct Sprite *); -extern void AnimHailBegin(struct Sprite *); -extern void AnimHailContinue(struct Sprite *); -extern void sub_80A8EE4(struct Sprite *); -extern void InitIceBallAnim(struct Sprite *); -extern void AnimThrowIceBall(struct Sprite *); -extern void InitIceBallParticle(struct Sprite *); -extern void AnimIceBallParticle(struct Sprite *); +void sub_810B848(struct Sprite *); +void AnimIcePunchSwirlingParticle(struct Sprite *); +void AnimIceBeamParticle(struct Sprite *); +void AnimIceEffectParticle(struct Sprite *); +void AnimFlickerIceEffectParticle(struct Sprite *); +void AnimSwirlingSnowball_Step1(struct Sprite *); +void AnimSwirlingSnowball_Step2(struct Sprite *); +void AnimSwirlingSnowball_Step3(struct Sprite *); +void AnimSwirlingSnowball_End(struct Sprite *); +void AnimMoveParticleBeyondTarget(struct Sprite *); +void AnimWiggleParticleTowardsTarget(struct Sprite *); +void AnimWaveFromCenterOfTarget(struct Sprite *); +void InitSwirlingFogAnim(struct Sprite *); +void AnimSwirlingFogAnim(struct Sprite *); +void AnimThrowMistBall(struct Sprite *); +void InitPoisonGasCloudAnim(struct Sprite *); +void MovePoisonGasCloud(struct Sprite *); +void AnimHailBegin(struct Sprite *); +void AnimHailContinue(struct Sprite *); +void InitIceBallAnim(struct Sprite *); +void AnimThrowIceBall(struct Sprite *); +void InitIceBallParticle(struct Sprite *); +void AnimIceBallParticle(struct Sprite *); void AnimTask_Haze2(u8); void AnimTask_OverlayFogTiles(u8); void AnimTask_Hail2(u8); diff --git a/src/item_menu.c b/src/item_menu.c index b3d341c2ee..8774445752 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -140,7 +140,6 @@ void unknown_ItemMenu_Confirm2(u8 taskId); void unknown_item_menu_type(u8 taskId); void item_menu_type_2(u8 taskId); void display_sell_item_ask_str(u8 taskId); -void unknown_ItemMenu_Confirm(u8 taskId); void display_deposit_item_ask_str(u8 taskId); void item_menu_type_b(u8 taskId); void BagMenuActuallyToss(u8 taskId); diff --git a/src/item_use.c b/src/item_use.c index 16fb22d94d..f9d81bfc08 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -8,13 +8,15 @@ #include "coins.h" #include "data2.h" #include "event_data.h" -#include "fieldmap.h" #include "event_object_movement.h" +#include "fieldmap.h" +#include "field_effect.h" #include "field_player_avatar.h" #include "field_screen_effect.h" #include "field_weather.h" #include "item.h" #include "item_menu.h" +#include "item_use.h" #include "mail.h" #include "main.h" #include "menu.h" @@ -39,29 +41,13 @@ #include "constants/vars.h" #include "event_obj_lock.h" -extern void unknown_ItemMenu_Confirm(u8 taskId); -extern void sub_81C5B14(u8 taskId); -extern void ItemUseOutOfBattle_TMHM(u8 a); -extern void ItemUseOutOfBattle_EvolutionStone(u8 b); -extern bool8 IsPlayerFacingSurfableFishableWater(void); -extern bool8 sub_81221AC(void); extern u8 Route102_EventScript_274482[]; extern u8 Route102_EventScript_2744C0[]; extern u8 BattleFrontier_OutsideEast_EventScript_242CFC[]; -extern int sub_80247BC(void); -extern struct MapHeader* mapconnection_get_mapheader(struct MapConnection *connection); -extern void SetUpItemUseCallback(u8 taskId); -extern void ItemUseCB_Medicine(u8, TaskFunc); -extern void bag_menu_yes_no(u8, u8, const struct YesNoFuncTable*); -extern void sub_81C5924(void); -extern void sub_81C59BC(void); -extern void sub_81AB9A8(u8); -extern void StartEscapeRopeFieldEffect(void); -extern u8* sub_806CF78(u16); -extern void sub_81B89F0(void); -extern u8 GetItemEffectType(u16); -extern struct MapConnection *sub_8088A8C(s16, s16); +extern s32 sub_80247BC(void); + +void SetUpItemUseCallback(u8 taskId); void MapPostLoadHook_UseItem(void); void sub_80AF6D4(void); void Task_CallItemUseOnFieldCallback(u8 taskId); @@ -404,12 +390,12 @@ bool8 sub_80FD6D4(const struct MapEvents *events, s16 x, s16 y) bool8 sub_80FD730(struct MapConnection *connection, int x, int y) { - struct MapHeader *mapHeader; + u16 localX, localY; u32 localOffset; s32 localLength; - mapHeader = mapconnection_get_mapheader(connection); + struct MapHeader const *const mapHeader = mapconnection_get_mapheader(connection); switch (connection->direction) { diff --git a/src/link.c b/src/link.c index 72ac3e8787..05da4e4588 100644 --- a/src/link.c +++ b/src/link.c @@ -1893,7 +1893,7 @@ u32 GetLinkRecvQueueLength(void) return gLink.recvQueue.count; } -bool8 sub_800B504(void) +bool32 sub_800B504(void) { if (GetLinkRecvQueueLength() > 2) { diff --git a/src/link_rfu.c b/src/link_rfu.c index 8da6b166a8..d80ff2ae91 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -17,9 +17,9 @@ #include "text.h" #include "constants/species.h" #include "save.h" +#include "rom_8011DC0.h" extern u16 gHeldKeyCodeToSend; -extern void nullsub_89(u8 taskId); struct UnkRfuStruct_1 gUnknown_03004140; struct UnkRfuStruct_2 gUnknown_03005000; diff --git a/src/load_save.c b/src/load_save.c index 0d19c6dae2..a0d2568d31 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -11,10 +11,10 @@ #include "trainer_hill.h" #include "gba/flash_internal.h" #include "decoration_inventory.h" +#include "agb_flash.h" static void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey); -extern bool16 IdentifyFlash(void); extern void ApplyNewEncryptionKeyToBerryPowder(u32 key); #define SAVEBLOCK_MOVE_RANGE 128 diff --git a/src/main.c b/src/main.c index 61c5e33865..aa42c59585 100644 --- a/src/main.c +++ b/src/main.c @@ -24,9 +24,6 @@ #include "main.h" #include "trainer_hill.h" -extern void sub_800B9B8(void); -extern u8 gUnknown_03002748; - static void VBlankIntr(void); static void HBlankIntr(void); static void VCountIntr(void); @@ -313,8 +310,6 @@ void SetSerialCallback(IntrCallback callback) gMain.serialCallback = callback; } -extern void CopyBufferedValuesToGpuRegs(void); - static void VBlankIntr(void) { if (gWirelessCommType != 0) diff --git a/src/match_call.c b/src/match_call.c index e7e91969f1..ce15731646 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -111,8 +111,6 @@ static void PopulateSpeciesFromTrainerParty(int, u8 *); static void PopulateBattleFrontierFacilityName(int, u8 *); static void PopulateBattleFrontierStreak(int, u8 *); -extern void sub_81973A4(void); - #define TEXT_ID(topic, id) (((topic) << 8) | ((id) & 0xFF)) static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] = diff --git a/src/menu.c b/src/menu.c index ae589dff4c..e82a6355c0 100644 --- a/src/menu.c +++ b/src/menu.c @@ -122,20 +122,18 @@ const struct MoveMenuInfoIcon gMoveMenuInfoIcons[] = { 8, 8, 0xAF }, // Unused (Small dark pokeball) }; + // Forward declarations -extern void sub_81973A4(void); -extern void DrawStandardFrame(u8, u8, u8, u8, u8, u8); -extern void DrawDialogueFrame(u8, u8, u8, u8, u8, u8); -extern void sub_81977BC(u8, u8, u8, u8, u8, u8); -extern void sub_8197804(u8, u8, u8, u8, u8, u8); -extern void sub_8197BB4(u8, u8, u8, u8, u8, u8); -extern void sub_8197E30(u8, u8, u8, u8, u8, u8); -extern void DrawWindowBorder(u8, u8, u8, u8, u8, u8); -extern void sub_81980A8(u8, u8, u8, u8, u8, u8); -extern u8 Menu_MoveCursor(s8); -extern u8 sub_8199134(s8, s8); -extern void sub_8198C78(void); -extern void task_free_buf_after_copying_tile_data_to_vram(u8 taskId); +void DrawStandardFrame(u8, u8, u8, u8, u8, u8); +void DrawDialogueFrame(u8, u8, u8, u8, u8, u8); +void sub_81977BC(u8, u8, u8, u8, u8, u8); +void sub_8197804(u8, u8, u8, u8, u8, u8); +void sub_8197BB4(u8, u8, u8, u8, u8, u8); +void sub_8197E30(u8, u8, u8, u8, u8, u8); +void DrawWindowBorder(u8, u8, u8, u8, u8, u8); +void sub_81980A8(u8, u8, u8, u8, u8, u8); +void task_free_buf_after_copying_tile_data_to_vram(u8 taskId); +void sub_8198C78(void); void InitStandardTextBoxWindows(void) { diff --git a/src/menu_helpers.c b/src/menu_helpers.c index 846c23b6b6..1f9979ecac 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -18,8 +18,6 @@ #include "constants/items.h" #include "constants/maps.h" -extern bool32 sub_800B504(void); - // this file's functions static void Task_ContinueTaskAfterMessagePrints(u8 taskId); static void Task_CallYesOrNoCallback(u8 taskId); diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c index 4196bb34c2..dba914b512 100644 --- a/src/mystery_event_script.c +++ b/src/mystery_event_script.c @@ -17,8 +17,6 @@ #include "mystery_event_msg.h" #include "pokemon_storage_system.h" -extern void sub_811EFC0(u8); - extern ScrCmdFunc gMysteryEventScriptCmdTable[]; extern ScrCmdFunc gMysteryEventScriptCmdTableEnd[]; diff --git a/src/option_menu.c b/src/option_menu.c index 122ba8d8af..caeb3d5daa 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -13,8 +13,7 @@ #include "text_window.h" #include "international_string_util.h" #include "strings.h" - -extern void SetPokemonCryStereo(u32 val); +#include "gba/m4a_internal.h" // Task data enum diff --git a/src/poison.c b/src/poison.c index c86ec2cd82..9af981694c 100644 --- a/src/poison.c +++ b/src/poison.c @@ -3,8 +3,6 @@ #include "trig.h" #include "constants/rgb.h" -extern void sub_80A77C8(struct Sprite *); - void sub_810DBAC(struct Sprite *); void sub_810DC2C(struct Sprite *); void sub_810DCD0(struct Sprite *); diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index b1f182b660..42a71ad52f 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -55,8 +55,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM; extern const struct CompressedSpriteSheet gMonFrontPicTable[]; extern const u16 gUnknown_0860F074[]; -extern bool8 sub_81221EC(void); - // this file's functions static void HandleInitBackgrounds(void); static void HandleInitWindows(void); diff --git a/src/pokemon.c b/src/pokemon.c index a35033d498..a984abbb98 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -10,6 +10,7 @@ #include "battle_tower.h" #include "event_data.h" #include "evolution_scene.h" +#include "field_specials.h" #include "item.h" #include "link.h" #include "main.h" @@ -72,10 +73,6 @@ extern const struct CompressedSpritePalette gMonPaletteTable[]; extern const struct CompressedSpritePalette gMonShinyPaletteTable[]; extern const u8 gTrainerClassNames[][13]; -extern u16 get_unknown_box_id(void); -extern void set_unknown_box_id(u8); -extern bool8 sub_806F104(void); - // this file's functions static u16 CalculateBoxMonChecksum(struct BoxPokemon *boxMon); static union PokemonSubstruct *GetSubstruct(struct BoxPokemon *boxMon, u32 personality, u8 substructType); diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c index b0e14d2b17..98d83d8ce4 100644 --- a/src/pokemon_size_record.c +++ b/src/pokemon_size_record.c @@ -1,5 +1,6 @@ #include "global.h" #include "event_data.h" +#include "pokedex.h" #include "pokemon.h" #include "pokemon_size_record.h" #include "string_util.h" @@ -15,9 +16,6 @@ struct UnknownStruct u16 unk4; }; -extern u16 GetPokedexHeightWeight(u16 dexNo, bool8 height); -extern u16 SpeciesToNationalPokedexNum(u16 species); - static const struct UnknownStruct sBigMonSizeTable[] = { { 290, 1, 0 }, diff --git a/src/script_menu.c b/src/script_menu.c index 7180bfc607..d9dbc770c2 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1312,7 +1312,7 @@ static void Task_HandleMultichoiceGridInput(u8 taskId) #undef tWindowId -bool8 ScrSpecial_CreatePCMenu(void) +bool16 ScrSpecial_CreatePCMenu(void) { if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE) { diff --git a/src/water.c b/src/water.c index d13b1378e8..c856b9aa45 100644 --- a/src/water.c +++ b/src/water.c @@ -41,7 +41,6 @@ extern void sub_8108BE0(struct Sprite *); extern void sub_8108C08(struct Sprite *); extern void sub_8108C54(struct Sprite *); extern void sub_8108CDC(struct Sprite *); -extern void sub_80A8EE4(struct Sprite *); void sub_810756C(u8); void sub_81076F4(u8); void sub_8107B84(u8); From 49bef258567b8ac6ead607de8ce0ac64581cdb55 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sat, 2 Mar 2019 03:18:08 -0500 Subject: [PATCH 161/217] Clean up the last extern functions --- include/agb_flash.h | 1 + include/battle_anim.h | 1 + include/dewford_trend.h | 2 ++ include/match_call.h | 1 + include/pokedex.h | 1 + include/pokemon_icon.h | 1 + include/pokenav.h | 1 + include/rom_8011DC0.h | 1 + include/save.h | 3 +++ include/script.h | 3 +++ include/secret_base.h | 2 ++ include/text.h | 4 +++ src/dewford_trend.c | 4 +-- src/pokenav.c | 10 +++---- src/pokenav_match_call.c | 4 +-- src/record_mixing.c | 3 +-- src/reshow_battle_screen.c | 3 +-- src/rock.c | 2 -- src/rom_8011DC0.c | 3 +-- src/save.c | 9 +++---- src/secret_base.c | 2 -- src/start_menu.c | 18 ++++--------- src/text.c | 4 --- src/trainer_card.c | 4 +-- src/trainer_see.c | 2 -- src/unk_text_util_2.c | 2 +- src/water.c | 55 +++++++++++++++++++------------------- 27 files changed, 69 insertions(+), 77 deletions(-) diff --git a/include/agb_flash.h b/include/agb_flash.h index 3dd60df0f1..ba5820f016 100644 --- a/include/agb_flash.h +++ b/include/agb_flash.h @@ -9,5 +9,6 @@ u16 SetFlashTimerIntr(u8 timerNum, void (**intrFunc)(void)); u16 IdentifyFlash(void); +u32 ProgramFlashSectorAndVerify(u16 sectorNum, u8 *src); #endif //GUARD_AGB_FLASH_H diff --git a/include/battle_anim.h b/include/battle_anim.h index 4e241686fd..ac47cadf14 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -221,6 +221,7 @@ void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, // battle_anim_effects_1.c void sub_810310C(u8 battler, struct Sprite* sprite); +void AnimMoveTwisterParticle(struct Sprite* sprite); // smokescreen.c u8 sub_807521C(s16 x, s16 y, u8 a3); diff --git a/include/dewford_trend.h b/include/dewford_trend.h index 608a925f57..bdb0fc95cf 100644 --- a/include/dewford_trend.h +++ b/include/dewford_trend.h @@ -5,5 +5,7 @@ void InitDewfordTrend(void); void UpdateDewfordTrendPerDay(u16); void UpdateDewfordTrendPerDay(u16 days); bool8 sub_81226D8(u16 *a); +void ReceiveEasyChatPairsData(struct EasyChatPair *a, size_t b, u8 unused); + #endif // GUARD_DEWFORDTREND_H diff --git a/include/match_call.h b/include/match_call.h index 1bf654937d..6803d2f260 100644 --- a/include/match_call.h +++ b/include/match_call.h @@ -15,5 +15,6 @@ void InitMatchCallCounters(void); bool32 TryStartMatchCall(void); bool32 IsMatchCallTaskActive(void); void StartMatchCallFromScript(u8* script); +void sub_8197080(u8 *destStr); #endif //GUARD_MATCH_CALL_H diff --git a/include/pokedex.h b/include/pokedex.h index c3700c8112..a1b7378bfc 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -44,5 +44,6 @@ u16 CreateMonSpriteFromNationalDexNumber(u16, s16, s16, u16); bool16 HasAllHoennMons(void); void ResetPokedexScrollPositions(void); u16 sub_80C0944(void); +void CB2_Pokedex(void); #endif // GUARD_POKEDEX_H diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index 4f27ef2811..c7b895028c 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -23,5 +23,6 @@ void LoadMonIconPalette(u16 species); void sub_80D328C(struct Sprite *sprite); void sub_80D3014(struct Sprite *sprite); void sub_80D32C8(struct Sprite *sprite, u8 animNum); +u8 sub_80D30A0(u16 species); #endif // GUARD_POKEMON_ICON_H diff --git a/include/pokenav.h b/include/pokenav.h index e5dba8ae09..29ccaec3e5 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -30,5 +30,6 @@ u32 sub_81D427C(void); void sub_81D4998(void); void sub_81D3640(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); void sub_81D3784(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); +void CB2_InitPokeNav(void); #endif //GUARD_POKENAV_H diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h index 9940a5b441..ac9bbb5c30 100644 --- a/include/rom_8011DC0.h +++ b/include/rom_8011DC0.h @@ -18,5 +18,6 @@ void sub_801B990(u32, u32); u8 sub_8013F78(void); bool32 sub_802C908(u16); void nullsub_89(u8 taskId); +void var_800D_set_xB(void); #endif //GUARD_rom_8011DC0_H diff --git a/include/save.h b/include/save.h index 7ce86de705..88e5f22806 100644 --- a/include/save.h +++ b/include/save.h @@ -92,4 +92,7 @@ u32 TryCopySpecialSaveSection(u8 sector, u8* dst); u32 sub_8153634(u8 sector, u8* src); void sub_8153688(u8 taskId); +// save_failed_screen.c +void DoSaveFailedScreen(u8 saveType); + #endif // GUARD_SAVE_H diff --git a/include/script.h b/include/script.h index 386b388d02..34f4635bb3 100644 --- a/include/script.h +++ b/include/script.h @@ -61,4 +61,7 @@ bool32 sub_80991F8(void); u8 *sub_8099244(void); void sub_80992A0(u8 *script, u16 scriptSize); +// srccmd.h +void sub_809BE48(u16 npcId); + #endif // GUARD_SCRIPT_H diff --git a/include/secret_base.h b/include/secret_base.h index 699158d0e6..17efc314d3 100644 --- a/include/secret_base.h +++ b/include/secret_base.h @@ -33,6 +33,8 @@ void sub_80E8B6C(void); void sub_80E8BC8(void); void sub_80E8D4C(void); void EnableBothScriptContexts(void); +void ReceiveSecretBasesData(void *records, size_t recordSize, u8 linkIdx); + #endif //GUARD_SECRET_BASE_H diff --git a/include/text.h b/include/text.h index 96c5a45071..d8f2fd8a35 100644 --- a/include/text.h +++ b/include/text.h @@ -284,4 +284,8 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese); u32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese); void DecompressGlyphFont9(u16 glyphId); +// unk_text_util_2.c +u16 Font6Func(struct TextPrinter *textPrinter); +u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese); + #endif // GUARD_TEXT_H diff --git a/src/dewford_trend.c b/src/dewford_trend.c index cad5ef9c2a..ee310af04a 100644 --- a/src/dewford_trend.c +++ b/src/dewford_trend.c @@ -159,7 +159,7 @@ static void sub_8122804(struct EasyChatPair *s, u16 b, u8 c) } } -void ReceiveEasyChatPairsData(void *a, u32 b, u8 unused) +void ReceiveEasyChatPairsData(struct EasyChatPair *a, size_t size, u8 unused) { u16 i, j, r3, players; struct EasyChatPair *buffer1, *buffer2, *src, *dst, *foo_of_buffer2; @@ -176,7 +176,7 @@ void ReceiveEasyChatPairsData(void *a, u32 b, u8 unused) { players = GetLinkPlayerCount(); for (i = 0; i < players; i++) - memcpy(&(buffer1[i * 5]), (u8 *)a + i * b, 40); + memcpy(&(buffer1[i * 5]), (u8 *)a + i * size, 40); src = buffer1; dst = buffer2; r3 = 0; diff --git a/src/pokenav.c b/src/pokenav.c index 41434606cb..62ec75842b 100644 --- a/src/pokenav.c +++ b/src/pokenav.c @@ -141,7 +141,7 @@ void sub_81C7710(void); static void InitKeys_(void); static void FreeVars(void); static void VblankCb_Pokenav(void); -static void Cb2_Pokenav(void); +static void CB2_Pokenav(void); void sub_81C7C28(void); void sub_81C72BC(void); void sub_81C7B74(void); @@ -485,7 +485,7 @@ void sub_81C71E4(u8 taskId) } } -void CB2_PokeNav(void) +void CB2_InitPokeNav(void) { gUnknown_0203CF40 = Alloc(sizeof(*gUnknown_0203CF40)); if (gUnknown_0203CF40 == NULL) @@ -498,7 +498,7 @@ void CB2_PokeNav(void) ResetTasks(); SetVBlankCallback(NULL); CreateTask(sub_81C742C, 0); - SetMainCallback2(Cb2_Pokenav); + SetMainCallback2(CB2_Pokenav); SetVBlankCallback(VblankCb_Pokenav); } } @@ -529,7 +529,7 @@ void sub_81C72BC(void) FreeAllSpritePalettes(); SetVBlankCallback(NULL); CreateTask(sub_81C742C, 0); - SetMainCallback2(Cb2_Pokenav); + SetMainCallback2(CB2_Pokenav); SetVBlankCallback(VblankCb_Pokenav); } } @@ -588,7 +588,7 @@ static bool32 AnyMonHasRibbon(void) return FALSE; } -static void Cb2_Pokenav(void) +static void CB2_Pokenav(void) { RunTasks(); AnimateSprites(); diff --git a/src/pokenav_match_call.c b/src/pokenav_match_call.c index 53f9f05484..b775ed10e3 100644 --- a/src/pokenav_match_call.c +++ b/src/pokenav_match_call.c @@ -1,13 +1,11 @@ - -// Includes #include "global.h" #include "battle_setup.h" #include "event_data.h" #include "string_util.h" #include "battle.h" #include "gym_leader_rematch.h" +#include "match_call.h" -extern void sub_8197080(u8 *dest); extern const u8 gTrainerClassNames[][13]; // Static type declarations diff --git a/src/record_mixing.c b/src/record_mixing.c index aafd7284ba..ce9bacf4cd 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -34,9 +34,8 @@ #include "daycare.h" #include "international_string_util.h" #include "constants/battle_frontier.h" +#include "dewford_trend.h" -extern void ReceiveSecretBasesData(struct SecretBaseRecord *, size_t, u8); -extern void ReceiveEasyChatPairsData(struct EasyChatPair *, size_t, u8); // Static type declarations diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c index 0926d4569e..dd177f8842 100644 --- a/src/reshow_battle_screen.c +++ b/src/reshow_battle_screen.c @@ -2,6 +2,7 @@ #include "reshow_battle_screen.h" #include "battle.h" #include "palette.h" +#include "pokemon.h" #include "main.h" #include "scanline_effect.h" #include "text.h" @@ -18,8 +19,6 @@ extern const union AnimCmd * const * const gMonAnimationsSpriteAnimsPtrTable[]; -extern void SetMultiuseSpriteTemplateToTrainerBack(u16 backPicId, u8 battlerPosition); - // this file's functions static void CB2_ReshowBattleScreenAfterMenu(void); static bool8 LoadBattlerSpriteGfx(u8 battlerId); diff --git a/src/rock.c b/src/rock.c index 14ffc63e01..814b1d88bf 100644 --- a/src/rock.c +++ b/src/rock.c @@ -12,8 +12,6 @@ extern const union AnimCmd *const gUnknown_085950E0[]; extern const union AnimCmd *const gUnknown_085954D0[]; -extern void AnimMoveTwisterParticle(struct Sprite *); - void sub_81109F0(struct Sprite *); void sub_8110AB4(struct Sprite *); void AnimDirtParticleAcrossScreen(struct Sprite *); diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 27472b6e38..b0e861fac3 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -33,8 +33,7 @@ #include "start_menu.h" #include "data2.h" #include "field_screen_effect.h" - -extern void HealPlayerParty(void); +#include "script_pokemon_util_80F87D8.h" struct UnkStruct_Shared { diff --git a/src/save.c b/src/save.c index d07e597661..ff26ce4606 100644 --- a/src/save.c +++ b/src/save.c @@ -1,5 +1,7 @@ #include "global.h" +#include "agb_flash.h" #include "gba/flash_internal.h" +#include "fieldmap.h" #include "save.h" #include "task.h" #include "decompress.h" @@ -8,6 +10,7 @@ #include "pokemon_storage_system.h" #include "main.h" #include "trainer_hill.h" +#include "link.h" #include "constants/game_stat.h" static u16 CalculateChecksum(void *data, u16 size); @@ -70,12 +73,6 @@ const struct SaveSectionOffsets gSaveSectionOffsets[] = SAVEBLOCK_CHUNK(gPokemonStorage, 8), }; -extern void DoSaveFailedScreen(u8); // save_failed_screen -extern bool32 ProgramFlashSectorAndVerify(u8 sector, u8 *data); -extern void save_serialize_map(void); -extern void sub_800ADF8(void); -extern bool8 IsLinkTaskFinished(void); - // iwram common u16 gLastWrittenSector; u32 gLastSaveCounter; diff --git a/src/secret_base.c b/src/secret_base.c index 3e591eba2c..8bb216452d 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -43,8 +43,6 @@ #include "constants/species.h" #include "constants/trainers.h" -extern void mapldr_default(void); - // Static type declarations struct SecretBaseListMenuBuffer { diff --git a/src/start_menu.c b/src/start_menu.c index 79404d0b2d..1052b640c2 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -7,10 +7,12 @@ #include "event_object_movement.h" #include "event_obj_lock.h" #include "event_scripts.h" +#include "fieldmap.h" #include "field_effect.h" #include "field_player_avatar.h" #include "field_specials.h" #include "field_weather.h" +#include "field_screen_effect.h" #include "frontier_pass.h" #include "frontier_util.h" #include "gpu_regs.h" @@ -26,6 +28,7 @@ #include "palette.h" #include "party_menu.h" #include "pokedex.h" +#include "pokenav.h" #include "safari_zone.h" #include "save.h" #include "scanline_effect.h" @@ -40,6 +43,7 @@ #include "trainer_card.h" #include "window.h" #include "constants/songs.h" +#include "rom_8011DC0.h" // Menu actions enum @@ -84,18 +88,6 @@ EWRAM_DATA static u8 sSaveDialogTimer = 0; EWRAM_DATA static bool8 sSavingComplete = FALSE; EWRAM_DATA static u8 sSaveInfoWindowId = 0; -// Extern variables. -extern u8 gLocalLinkPlayerId; - -// Extern functions in not decompiled files. -extern void sub_80AF688(void); -extern void var_800D_set_xB(void); -extern void sub_808B864(void); -extern void CB2_Pokedex(void); -extern void PlayRainStoppingSoundEffect(void); -extern void CB2_PokeNav(void); -extern void save_serialize_map(void); - // Menu action callbacks static bool8 StartMenuPokedexCallback(void); static bool8 StartMenuPokemonCallback(void); @@ -656,7 +648,7 @@ static bool8 StartMenuPokeNavCallback(void) PlayRainStoppingSoundEffect(); RemoveExtraStartMenuWindows(); CleanupOverworldWindowsAndTilemaps(); - SetMainCallback2(CB2_PokeNav); // Display PokeNav + SetMainCallback2(CB2_InitPokeNav); // Display PokeNav return TRUE; } diff --git a/src/text.c b/src/text.c index a439d3ced8..bdc0f14f79 100644 --- a/src/text.c +++ b/src/text.c @@ -12,10 +12,6 @@ #include "menu.h" #include "dynamic_placeholder_text_util.h" -extern u8 GetKeypadIconWidth(u8 keypadIconId); -extern u16 Font6Func(struct TextPrinter *textPrinter); -extern u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese); - EWRAM_DATA struct TextPrinter gTempTextPrinter = {0}; EWRAM_DATA struct TextPrinter gTextPrinters[NUM_TEXT_PRINTERS] = {0}; diff --git a/src/trainer_card.c b/src/trainer_card.c index 4fb30f616c..41bf71cd33 100755 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -21,6 +21,7 @@ #include "gpu_regs.h" #include "international_string_util.h" #include "pokedex.h" +#include "pokemon_icon.h" #include "graphics.h" #include "pokemon_icon.h" #include "trainer_pokemon_sprites.h" @@ -89,9 +90,6 @@ struct TrainerCardData u8 language; }; -//external functions -extern u8 sub_80D30A0(u16); - // EWRAM EWRAM_DATA struct TrainerCard gTrainerCards[4] = {0}; EWRAM_DATA static struct TrainerCardData *sData = NULL; diff --git a/src/trainer_see.c b/src/trainer_see.c index bc5d9cbc39..16ea88a455 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -17,8 +17,6 @@ #include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" -extern void sub_809BE48(u16 npcId); - // this file's functions static u8 CheckTrainer(u8 eventObjectId); static u8 GetTrainerApproachDistance(struct EventObject *trainerObj); diff --git a/src/unk_text_util_2.c b/src/unk_text_util_2.c index bbc256915f..530bd40852 100644 --- a/src/unk_text_util_2.c +++ b/src/unk_text_util_2.c @@ -214,7 +214,7 @@ static void DecompressGlyphFont6(u16 glyph) gUnknown_03002F90.unk81 = 0x10; } -u8 GetGlyphWidthFont6(void) +u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese) { return 0x10; } diff --git a/src/water.c b/src/water.c index c856b9aa45..20bf2542d3 100644 --- a/src/water.c +++ b/src/water.c @@ -13,34 +13,33 @@ #include "constants/battle.h" #include "constants/rgb.h" -extern void sub_810721C(struct Sprite *); -extern void sub_8107228(struct Sprite *); -extern void sub_8107260(struct Sprite *); -extern void sub_8107380(struct Sprite *); -extern void sub_8107408(struct Sprite *); -extern void sub_8107430(struct Sprite *); -extern void sub_810744C(struct Sprite *); -extern void sub_81074E4(struct Sprite *); -extern void sub_81075EC(struct Sprite *); -extern void sub_8107674(struct Sprite *); -extern void sub_8107730(struct Sprite *); -extern void sub_81077A4(struct Sprite *); -extern void sub_81077C0(struct Sprite *); -extern void sub_80A78AC(struct Sprite *); -extern void sub_8107894(struct Sprite *); -extern void sub_81078D0(struct Sprite *); -extern void sub_810790C(struct Sprite *); -extern void sub_8108034(struct Sprite *); -extern void sub_8108098(struct Sprite *); -extern void sub_810851C(struct Sprite *); -extern void sub_81087C0(struct Sprite *); -extern void sub_810886C(struct Sprite *); -extern void sub_8108B2C(struct Sprite *); -extern void sub_8108B94(struct Sprite *); -extern void sub_8108BE0(struct Sprite *); -extern void sub_8108C08(struct Sprite *); -extern void sub_8108C54(struct Sprite *); -extern void sub_8108CDC(struct Sprite *); +void sub_810721C(struct Sprite *); +void sub_8107228(struct Sprite *); +void sub_8107260(struct Sprite *); +void sub_8107380(struct Sprite *); +void sub_8107408(struct Sprite *); +void sub_8107430(struct Sprite *); +void sub_810744C(struct Sprite *); +void sub_81074E4(struct Sprite *); +void sub_81075EC(struct Sprite *); +void sub_8107674(struct Sprite *); +void sub_8107730(struct Sprite *); +void sub_81077A4(struct Sprite *); +void sub_81077C0(struct Sprite *); +void sub_8107894(struct Sprite *); +void sub_81078D0(struct Sprite *); +void sub_810790C(struct Sprite *); +void sub_8108034(struct Sprite *); +void sub_8108098(struct Sprite *); +void sub_810851C(struct Sprite *); +void sub_81087C0(struct Sprite *); +void sub_810886C(struct Sprite *); +void sub_8108B2C(struct Sprite *); +void sub_8108B94(struct Sprite *); +void sub_8108BE0(struct Sprite *); +void sub_8108C08(struct Sprite *); +void sub_8108C54(struct Sprite *); +void sub_8108CDC(struct Sprite *); void sub_810756C(u8); void sub_81076F4(u8); void sub_8107B84(u8); From 25050b99444538535a67ba51b7aaf3d0bf90c50e Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sat, 2 Mar 2019 04:13:27 -0500 Subject: [PATCH 162/217] Fix tabs, do suggested rename --- data/scripts/tv.inc | 6 +++--- include/overworld.h | 2 +- src/overworld.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 9f197515d8..4a276ffc06 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -42,9 +42,9 @@ EventScript_27EE9A:: @ 827EE9A EventScript_27EEA4:: @ 827EEA4 msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT - @ This is a junk call. Its input var (VAR_0x8004) hasn't been set, and - @ It's called again when Mom actually asks for the color, overwriting - @ whatever it does here. + @ This is a junk call. Its input var (VAR_0x8004) hasn't been set, and + @ It's called again when Mom actually asks for the color, overwriting + @ whatever it does here. special InitRoamer clearflag FLAG_SYS_TV_LATIAS_LATIOS setflag FLAG_LATIOS_OR_LATIAS_ROAMING diff --git a/include/overworld.h b/include/overworld.h index 7ca4429579..3a760ca792 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -98,7 +98,7 @@ u8 GetCurrentMapType(void); u8 GetLastUsedWarpMapType(void); bool8 IsMapTypeOutdoors(u8 mapType); bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType); -bool8 Overworld_MapTypeIsIndoors(u8 mapType); +bool8 IsMapTypeIndoors(u8 mapType); u8 GetSavedWarpRegionMapSectionId(void); u8 GetCurrentRegionMapSectionId(void); u8 GetCurrentMapBattleScene(void); diff --git a/src/overworld.c b/src/overworld.c index 8378558779..731449608f 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -838,7 +838,7 @@ static void mli0_load_map(u32 a1) } isOutdoors = IsMapTypeOutdoors(gMapHeader.mapType); - isIndoors = Overworld_MapTypeIsIndoors(gMapHeader.mapType); + isIndoors = IsMapTypeIndoors(gMapHeader.mapType); sub_80EB218(); TrySetMapSaveWarpStatus(); @@ -1199,7 +1199,7 @@ void Overworld_ChangeMusicTo(u16 newMusic) u8 GetMapMusicFadeoutSpeed(void) { const struct MapHeader *mapHeader = GetDestinationWarpMapHeader(); - if (Overworld_MapTypeIsIndoors(mapHeader->mapType) == TRUE) + if (IsMapTypeIndoors(mapHeader->mapType) == TRUE) return 2; else return 4; @@ -1353,7 +1353,7 @@ bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType) return FALSE; } -bool8 Overworld_MapTypeIsIndoors(u8 mapType) +bool8 IsMapTypeIndoors(u8 mapType) { if (mapType == MAP_TYPE_INDOOR || mapType == MAP_TYPE_SECRET_BASE) From 043071ae12aa6854119a44304a5facbd58fa3624 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 2 Mar 2019 13:34:08 +0100 Subject: [PATCH 163/217] Don't extern gMoveNames --- src/item_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/item_menu.c b/src/item_menu.c index 43f2afce34..7b48a2d5d2 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -8,6 +8,7 @@ #include "bg.h" #include "constants/items.h" #include "constants/songs.h" +#include "data2.h" #include "decompress.h" #include "event_data.h" #include "event_object_movement.h" @@ -446,7 +447,6 @@ EWRAM_DATA u16 gSpecialVar_ItemId = 0; static EWRAM_DATA struct TempWallyStruct *gUnknown_0203CE80 = 0; extern u8 *const gPocketNamesStringsTable[]; -extern const u8 gMoveNames[][0xD]; extern u8* gReturnToXStringsTable[]; extern const u8 EventScript_2736B3[]; extern const u16 gUnknown_0860F074[]; From 80a4ee11457e82092f52a3aef5362f8b59b68633 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sat, 2 Mar 2019 17:23:10 -0500 Subject: [PATCH 164/217] Remove water.h and flying.h --- include/battle_anim.h | 6 ++++++ include/flying.h | 6 ------ include/water.h | 6 ------ src/battle_anim_effects_2.c | 1 - src/battle_anim_effects_3.c | 1 - src/electric.c | 1 - src/normal.c | 1 - 7 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 include/flying.h delete mode 100644 include/water.h diff --git a/include/battle_anim.h b/include/battle_anim.h index ac47cadf14..b3350f893d 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -223,6 +223,12 @@ void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, void sub_810310C(u8 battler, struct Sprite* sprite); void AnimMoveTwisterParticle(struct Sprite* sprite); +// water.c +void sub_8108C94(struct Sprite *sprite); + +// flying.c +void sub_810E2C8(struct Sprite *sprite); + // smokescreen.c u8 sub_807521C(s16 x, s16 y, u8 a3); diff --git a/include/flying.h b/include/flying.h deleted file mode 100644 index 062320b4d2..0000000000 --- a/include/flying.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef GUARD_FLYING_H -#define GUARD_FLYING_H - -void sub_810E2C8(struct Sprite *sprite); - -#endif // GUARD_FLYING_H \ No newline at end of file diff --git a/include/water.h b/include/water.h deleted file mode 100644 index 9f876021c4..0000000000 --- a/include/water.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef GUARD_WATER_H -#define GUARD_WATER_H - -void sub_8108C94(struct Sprite *sprite); - -#endif // GUARD_WATER_H \ No newline at end of file diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index a72b2c8dce..80b3258b45 100755 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -15,7 +15,6 @@ #include "util.h" #include "constants/rgb.h" #include "constants/songs.h" -#include "water.h" void sub_8103448(struct Sprite *); void sub_8103498(struct Sprite *); diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index de00892ba4..efa2620fd5 100755 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -23,7 +23,6 @@ #include "constants/songs.h" #include "constants/species.h" #include "constants/weather.h" -#include "flying.h" extern const struct SpriteTemplate gUnknown_08593114; extern const union AffineAnimCmd *const gUnknown_082FF6C0[]; diff --git a/src/electric.c b/src/electric.c index 6c6c337467..5e77298421 100644 --- a/src/electric.c +++ b/src/electric.c @@ -4,7 +4,6 @@ #include "trig.h" #include "constants/songs.h" #include "sound.h" -#include "flying.h" static void sub_810A1A8(struct Sprite *); static void sub_810A1F8(struct Sprite *); diff --git a/src/normal.c b/src/normal.c index cbf0caa83c..2b592e1998 100644 --- a/src/normal.c +++ b/src/normal.c @@ -5,7 +5,6 @@ #include "task.h" #include "trig.h" #include "constants/rgb.h" -#include "flying.h" void AnimConfusionDuck(struct Sprite *); void AnimSimplePaletteBlend(struct Sprite *); From 3716da5430a976d05afecdf82f43f14fc2584949 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sat, 2 Mar 2019 17:25:39 -0500 Subject: [PATCH 165/217] Rename macro with correct name for pixel values --- include/window.h | 2 +- src/battle_dome.c | 2 +- src/battle_factory_screen.c | 48 +++++++++--------- src/battle_interface.c | 2 +- src/battle_message.c | 94 ++++++++++++++++++------------------ src/battle_pyramid_bag.c | 20 ++++---- src/battle_records.c | 4 +- src/berry_blender.c | 6 +-- src/berry_fix_program.c | 8 +-- src/berry_tag_screen.c | 14 +++--- src/clear_save_data_screen.c | 4 +- src/coins.c | 2 +- src/contest.c | 14 +++--- src/contest_link_80F57C4.c | 2 +- src/contest_painting.c | 2 +- src/credits.c | 2 +- src/decoration.c | 6 +-- src/diploma.c | 2 +- src/easy_chat.c | 16 +++--- src/egg_hatch.c | 4 +- src/field_player_avatar.c | 6 +-- src/field_region_map.c | 4 +- src/field_specials.c | 8 +-- src/frontier_pass.c | 8 +-- src/frontier_util.c | 20 ++++---- src/hall_of_fame.c | 8 +-- src/item_menu.c | 30 ++++++------ src/learn_move.c | 6 +-- src/link.c | 8 +-- src/list_menu.c | 16 +++--- src/mail.c | 4 +- src/main_menu.c | 36 +++++++------- src/match_call.c | 6 +-- src/menu.c | 32 ++++++------ src/money.c | 2 +- src/mystery_event_menu.c | 4 +- src/naming_screen.c | 14 +++--- src/option_menu.c | 4 +- src/party_menu.c | 6 +-- src/player_pc.c | 6 +-- src/pokeblock.c | 4 +- src/pokeblock_feed.c | 2 +- src/pokedex.c | 14 +++--- src/pokemon_storage_system.c | 32 ++++++------ src/pokemon_summary_screen.c | 28 +++++------ src/pokenav.c | 4 +- src/region_map.c | 6 +-- src/rom_8011DC0.c | 8 +-- src/save_failed_screen.c | 16 +++--- src/scrcmd.c | 2 +- src/script_menu.c | 12 ++--- src/shop.c | 4 +- src/slot_machine.c | 4 +- src/start_menu.c | 2 +- src/starter_choose.c | 6 +-- src/text.c | 8 +-- src/trade.c | 18 +++---- src/trainer_card.c | 10 ++-- src/trainer_hill.c | 2 +- src/unk_text_util_2.c | 8 +-- 60 files changed, 336 insertions(+), 336 deletions(-) diff --git a/include/window.h b/include/window.h index ece1ecd21e..10e447789a 100644 --- a/include/window.h +++ b/include/window.h @@ -1,7 +1,7 @@ #ifndef GUARD_WINDOW_H #define GUARD_WINDOW_H -#define PALETTE_NUM_TO_FILL_VALUE(num) ((num) | ((num) << 4)) +#define PIXEL_FILL(num) ((num) | ((num) << 4)) enum { diff --git a/src/battle_dome.c b/src/battle_dome.c index 9ef66aac41..f86faeffb4 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -3794,7 +3794,7 @@ static void sub_8190CD4(u8 taskId) for (i = windowId; i < windowId + 9; i++) { CopyWindowToVram(i, 2); - FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(i, PIXEL_FILL(0)); } gTasks[taskId].data[0] = 3; break; diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index d4abe3c96c..5cbe97702a 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -1786,14 +1786,14 @@ static void sub_819B958(u8 windowId) { gSprites[sFactorySelectScreen->menuCursor1SpriteId].invisible = TRUE; gSprites[sFactorySelectScreen->menuCursor2SpriteId].invisible = TRUE; - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(0)); CopyWindowToVram(windowId, 2); ClearWindowTilemap(windowId); } static void Select_PrintRentalPkmnString(void) { - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); AddTextPrinterParameterized(0, 1, gText_RentalPkmn2, 2, 1, 0, NULL); CopyWindowToVram(0, 3); } @@ -1804,7 +1804,7 @@ static void Select_PrintMonSpecies(void) u8 x; u8 monId = sFactorySelectScreen->cursorPos; - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); species = GetMonData(&sFactorySelectScreen->mons[monId].monData, MON_DATA_SPECIES, NULL); StringCopy(gStringVar4, gSpeciesNames[species]); x = GetStringRightAlignXOffset(1, gStringVar4, 86); @@ -1816,7 +1816,7 @@ static void Select_PrintSelectMonString(void) { const u8 *str = NULL; - FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(2, PIXEL_FILL(0)); if (sFactorySelectScreen->selectingMonsState == 1) str = gText_SelectFirstPkmn; else if (sFactorySelectScreen->selectingMonsState == 2) @@ -1832,7 +1832,7 @@ static void Select_PrintSelectMonString(void) static void Select_PrintCantSelectSameMon(void) { - FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(2, PIXEL_FILL(0)); AddTextPrinterParameterized(2, 1, gText_CantSelectSamePkmn, 2, 5, 0, NULL); CopyWindowToVram(2, 2); } @@ -1842,7 +1842,7 @@ static void Select_PrintMenuOptions(void) u8 selectedId = sFactorySelectScreen->mons[sFactorySelectScreen->cursorPos].selectedId; PutWindowTilemap(3); - FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(3, PIXEL_FILL(0)); AddTextPrinterParameterized3(3, 1, 7, 1, gUnknown_08610476, 0, gText_Summary); if (selectedId != 0) AddTextPrinterParameterized3(3, 1, 7, 17, gUnknown_08610476, 0, gText_Deselect); @@ -1856,7 +1856,7 @@ static void Select_PrintMenuOptions(void) static void Select_PrintYesNoOptions(void) { PutWindowTilemap(4); - FillWindowPixelBuffer(4, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(4, PIXEL_FILL(0)); AddTextPrinterParameterized3(4, 1, 7, 1, gUnknown_08610476, 0, gText_Yes2); AddTextPrinterParameterized3(4, 1, 7, 17, gUnknown_08610476, 0, gText_No2); CopyWindowToVram(4, 3); @@ -1924,7 +1924,7 @@ static void Select_PrintMonCategory(void) if (monId < SELECTABLE_MONS_COUNT) { PutWindowTilemap(5); - FillWindowPixelBuffer(5, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(5, PIXEL_FILL(0)); species = GetMonData(&sFactorySelectScreen->mons[monId].monData, MON_DATA_SPECIES, NULL); CopyMonCategoryText(SpeciesToNationalPokedexNum(species), text); x = GetStringRightAlignXOffset(1, text, 0x76); @@ -2873,7 +2873,7 @@ static void sub_819D588(u8 taskId) case 3: if (!gPaletteFade.active) { - FillWindowPixelBuffer(5, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(5, PIXEL_FILL(0)); CopyWindowToVram(5, 2); if (sFactorySwapScreen->inEnemyScreen == TRUE) { @@ -3002,7 +3002,7 @@ static void sub_819D770(u8 taskId) gTasks[taskId].data[0]++; break; case 6: - FillWindowPixelBuffer(5, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(5, PIXEL_FILL(0)); CopyWindowToVram(5, 2); gTasks[taskId].data[0]++; break; @@ -3546,7 +3546,7 @@ static void sub_819EA64(u8 windowId) { gSprites[sFactorySwapScreen->menuCursor1SpriteId].invisible = TRUE; gSprites[sFactorySwapScreen->menuCursor2SpriteId].invisible = TRUE; - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(0)); CopyWindowToVram(windowId, 2); ClearWindowTilemap(windowId); } @@ -3554,14 +3554,14 @@ static void sub_819EA64(u8 windowId) static void sub_819EAC0(void) { PutWindowTilemap(1); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); CopyWindowToVram(1, 2); } static void sub_819EADC(void) { PutWindowTilemap(7); - FillWindowPixelBuffer(7, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(7, PIXEL_FILL(0)); CopyWindowToVram(7, 2); } @@ -3569,13 +3569,13 @@ static void sub_819EAF8(void) { sub_819EAC0(); PutWindowTilemap(5); - FillWindowPixelBuffer(5, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(5, PIXEL_FILL(0)); CopyWindowToVram(5, 2); } static void Swap_PrintPkmnSwap(void) { - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized(0, 1, gText_PkmnSwap, 2, 1, 0, NULL); CopyWindowToVram(0, 3); } @@ -3585,7 +3585,7 @@ static void Swap_PrintMonSpecies(void) u16 species; u8 x; - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); if (sFactorySwapScreen->cursorPos > 2) { CopyWindowToVram(1, 2); @@ -3606,7 +3606,7 @@ static void Swap_PrintMonSpecies(void) static void Swap_PrintOnInfoWindow(const u8 *str) { - FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(2, PIXEL_FILL(0)); AddTextPrinterParameterized(2, 1, str, 2, 5, 0, NULL); CopyWindowToVram(2, 2); } @@ -3614,7 +3614,7 @@ static void Swap_PrintOnInfoWindow(const u8 *str) static void Swap_PrintMenuOptions(void) { PutWindowTilemap(3); - FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(3, PIXEL_FILL(0)); AddTextPrinterParameterized3(3, 1, 15, 1, gUnknown_08610922, 0, gText_Summary2); AddTextPrinterParameterized3(3, 1, 15, 17, gUnknown_08610922, 0, gText_Swap); AddTextPrinterParameterized3(3, 1, 15, 33, gUnknown_08610922, 0, gText_Rechoose); @@ -3624,7 +3624,7 @@ static void Swap_PrintMenuOptions(void) static void Swap_PrintYesNoOptions(void) { PutWindowTilemap(4); - FillWindowPixelBuffer(4, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(4, PIXEL_FILL(0)); AddTextPrinterParameterized3(4, 1, 7, 1, gUnknown_08610922, 0, gText_Yes3); AddTextPrinterParameterized3(4, 1, 7, 17, gUnknown_08610922, 0, gText_No3); CopyWindowToVram(4, 3); @@ -3638,7 +3638,7 @@ static void Swap_PrintActionString(const u8 *str, u32 y, u32 windowId) static void Swap_PrintActionStrings(void) { - FillWindowPixelBuffer(5, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(5, PIXEL_FILL(0)); switch (sFactorySwapScreen->inEnemyScreen) { case TRUE: @@ -3652,7 +3652,7 @@ static void Swap_PrintActionStrings(void) static void Swap_PrintActionStrings2(void) { - FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(3, PIXEL_FILL(0)); switch (sFactorySwapScreen->inEnemyScreen) { case TRUE: @@ -3693,7 +3693,7 @@ static void Swap_PrintMonSpecies2(void) LoadPalette(pal, 0xF0, 0xA); PutWindowTilemap(7); - FillWindowPixelBuffer(7, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(7, PIXEL_FILL(0)); if (sFactorySwapScreen->cursorPos > 2) { CopyWindowToVram(7, 3); @@ -3745,7 +3745,7 @@ static void Swap_PrintMonCategory(void) u8 x; u8 monId = sFactorySwapScreen->cursorPos; - FillWindowPixelBuffer(8, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(8, PIXEL_FILL(0)); if (monId > 2) { CopyWindowToVram(8, 2); @@ -3940,7 +3940,7 @@ static void Task_SwapCantHaveSameMons(u8 taskId) case 2: if (sFactorySwapScreen->unk30 != TRUE) { - FillWindowPixelBuffer(5, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(5, PIXEL_FILL(0)); CopyWindowToVram(5, 2); gTasks[taskId].data[0]++; } diff --git a/src/battle_interface.c b/src/battle_interface.c index a86f0ea842..f2916012e1 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -2579,7 +2579,7 @@ static u8* AddTextPrinterAndCreateWindowOnHealthbox(const u8 *str, u32 x, u32 y, struct WindowTemplate winTemplate = sHealthboxWindowTemplate; winId = AddWindow(&winTemplate); - FillWindowPixelBuffer(winId, PALETTE_NUM_TO_FILL_VALUE(bgColor)); + FillWindowPixelBuffer(winId, PIXEL_FILL(bgColor)); color[0] = bgColor; color[1] = 1; diff --git a/src/battle_message.c b/src/battle_message.c index b203f0b3e1..6762cd4168 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1357,7 +1357,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = { // The corresponding WindowTemplate is gStandardBattleWindowTemplates[] within src/battle_bg.c { // 0 Standard battle message - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xF), + .fillValue = PIXEL_FILL(0xF), .fontId = 1, .x = 0, .y = 1, @@ -1369,7 +1369,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 6, }, { // 1 "What will (pokemon) do?" - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xF), + .fillValue = PIXEL_FILL(0xF), .fontId = 1, .x = 1, .y = 1, @@ -1381,7 +1381,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 6, }, { // 2 "Fight/Pokemon/Bag/Run" - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = 0, .y = 1, @@ -1393,7 +1393,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 3 Top left move - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1405,7 +1405,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 4 Top right move - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1417,7 +1417,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 5 Bottom left move - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1429,7 +1429,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 6 Bottom right move - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1441,7 +1441,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 7 "PP" - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1453,7 +1453,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 11, }, { // 8 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = 0, .y = 1, @@ -1465,7 +1465,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 9 PP remaining - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = 2, .y = 1, @@ -1477,7 +1477,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 11, }, { // 10 "type" - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1489,7 +1489,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 11 "switch which?" - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1501,7 +1501,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 12 "gText_BattleYesNoChoice" - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = 0, .y = 1, @@ -1513,7 +1513,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 13 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = 0, .y = 1, @@ -1525,7 +1525,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 14 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0), + .fillValue = PIXEL_FILL(0), .fontId = 1, .x = 32, .y = 1, @@ -1537,7 +1537,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 2, }, { // 15 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1549,7 +1549,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 16 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1561,7 +1561,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 17 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1573,7 +1573,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 18 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1585,7 +1585,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 19 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1597,7 +1597,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 20 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1609,7 +1609,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 15, }, { // 21 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0), + .fillValue = PIXEL_FILL(0), .fontId = 1, .x = -1, .y = 1, @@ -1621,7 +1621,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 6, }, { // 22 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0), + .fillValue = PIXEL_FILL(0), .fontId = 1, .x = -1, .y = 1, @@ -1633,7 +1633,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = .shadowColor = 6, }, { // 23 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0x0), + .fillValue = PIXEL_FILL(0x0), .fontId = 1, .x = -1, .y = 1, @@ -1649,7 +1649,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = { { // 0 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xF), + .fillValue = PIXEL_FILL(0xF), .fontId = 1, .x = 0, .y = 1, @@ -1661,7 +1661,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 6, }, { // 1 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xF), + .fillValue = PIXEL_FILL(0xF), .fontId = 1, .x = 1, .y = 1, @@ -1673,7 +1673,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 6, }, { // 2 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = 0, .y = 1, @@ -1685,7 +1685,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 3 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1697,7 +1697,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 4 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1709,7 +1709,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 5 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1721,7 +1721,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 6 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1733,7 +1733,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 7 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1745,7 +1745,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 11, }, { // 8 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = 0, .y = 1, @@ -1757,7 +1757,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 9 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = 2, .y = 1, @@ -1769,7 +1769,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 11, }, { // 10 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1781,7 +1781,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 11 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 7, .x = 0, .y = 1, @@ -1793,7 +1793,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 12 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = 0, .y = 1, @@ -1805,7 +1805,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 13 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = 0, .y = 1, @@ -1817,7 +1817,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 14 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0), + .fillValue = PIXEL_FILL(0), .fontId = 1, .x = 32, .y = 1, @@ -1829,7 +1829,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 2, }, { // 15 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1841,7 +1841,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 16 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1853,7 +1853,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 17 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1865,7 +1865,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 18 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1877,7 +1877,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 19 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1889,7 +1889,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 20 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1901,7 +1901,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 21 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0xE), + .fillValue = PIXEL_FILL(0xE), .fontId = 1, .x = -1, .y = 1, @@ -1913,7 +1913,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = .shadowColor = 15, }, { // 22 - .fillValue = PALETTE_NUM_TO_FILL_VALUE(0x1), + .fillValue = PIXEL_FILL(0x1), .fontId = 1, .x = 0, .y = 1, diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index dec8d4bcad..2e13ea08ba 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -651,7 +651,7 @@ static void PrintItemDescription(s32 listMenuId) StringExpandPlaceholders(gStringVar4, gText_ReturnToVar1); desc = gStringVar4; } - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); PrintOnWindow_Font1(1, desc, 3, 0, 0, 1, 0, 0); } @@ -804,7 +804,7 @@ static void sub_81C5A98(u8 listMenuTaskId, u8 arg1) static void sub_81C5AB8(u8 y, u8 arg1) { if (arg1 == 0xFF) - FillWindowPixelRect(0, PALETTE_NUM_TO_FILL_VALUE(0), 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); + FillWindowPixelRect(0, PIXEL_FILL(0), 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); else PrintOnWindow_Font1(0, gText_SelectorArrow2, 0, y, 0, 0, 0, arg1); } @@ -911,7 +911,7 @@ static void sub_81C5D20(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0); if (gPyramidBagResources->menuActionsCount == 1) sub_81C5EAC(sub_81C6D24(0)); @@ -1048,7 +1048,7 @@ static void BagAction_UseOnField(u8 taskId) else if (ItemId_GetFieldFunc(gSpecialVar_ItemId) != NULL) { sub_81C61A8(); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); schedule_bg_copy_tilemap_to_vram(0); ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId); } @@ -1086,7 +1086,7 @@ static void BagAction_Toss(u8 taskId) { CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_TossHowManyVar1s); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0); sub_81C6404(); gTasks[taskId].func = sub_81C64B4; @@ -1100,7 +1100,7 @@ static void sub_81C6350(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 2); StringExpandPlaceholders(gStringVar4, gText_ConfirmTossItems); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0); sub_81C6DAC(taskId, &sYesNoTossFuncions); } @@ -1168,7 +1168,7 @@ static void TossItem(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 2); StringExpandPlaceholders(gStringVar4, gText_ThrewAwayVar2Var1s); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0); gTasks[taskId].func = sub_81C65CC; } @@ -1265,7 +1265,7 @@ static void Task_BeginItemSwap(u8 taskId) ListMenuSetUnkIndicatorsStructField(data[0], 0x10, 1); CopyItemName(gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.lvlMode][data[1]], gStringVar1); StringExpandPlaceholders(gStringVar4, gText_MoveVar1Where); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0); sub_81C5A98(data[0], 1); sub_81C704C(data[1]); @@ -1395,7 +1395,7 @@ static void sub_81C6BD8(void) LoadPalette(gUnknown_0860F074, 0xF0, 0x20); for (i = 0; i < 5; i++) - FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(i, PIXEL_FILL(0)); PutWindowTilemap(0); PutWindowTilemap(1); @@ -1456,7 +1456,7 @@ static void sub_81C6DAC(u8 taskId, const struct YesNoFuncTable *yesNoTable) void DisplayItemMessageInBattlePyramid(u8 taskId, const u8 *str, void (*callback)(u8 taskId)) { - FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(2, PIXEL_FILL(1)); DisplayMessageAndContinueTask(taskId, 2, 0xA, 0xD, 1, GetPlayerTextSpeedDelay(), str, callback); schedule_bg_copy_tilemap_to_vram(1); } diff --git a/src/battle_records.c b/src/battle_records.c index 03d2088b4f..6997e40dd0 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -321,7 +321,7 @@ void ShowLinkBattleRecords(void) gRecordsWindowId = AddWindow(&sLinkBattleRecordsWindow); DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); StringExpandPlaceholders(gStringVar4, gText_PlayersBattleResults); x = GetStringCenterAlignXOffset(1, gStringVar4, 208); @@ -383,7 +383,7 @@ static void Task_ExitTrainerHillRecords(u8 taskId) static void RemoveTrainerHillRecordsWindow(u8 windowId) { - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(0)); ClearWindowTilemap(windowId); CopyWindowToVram(windowId, 2); RemoveWindow(windowId); diff --git a/src/berry_blender.c b/src/berry_blender.c index 35749db544..0241fa26dc 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -945,7 +945,7 @@ static void InitBerryBlenderWindows(void) DeactivateAllTextPrinters(); for (i = 0; i < 5; i++) - FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(i, PIXEL_FILL(0)); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14); sub_81978B0(0xE0); @@ -3538,7 +3538,7 @@ void ShowBerryBlenderRecordWindow(void) winTemplate = sBlenderRecordWindowTemplate; gRecordsWindowId = AddWindow(&winTemplate); DrawStdWindowFrame(gRecordsWindowId, 0); - FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); xPos = GetStringCenterAlignXOffset(1, gText_BlenderMaxSpeedRecord, 0x90); AddTextPrinterParameterized(gRecordsWindowId, 1, gText_BlenderMaxSpeedRecord, xPos, 1, 0, NULL); @@ -3647,7 +3647,7 @@ static void Blender_AddTextPrinter(u8 windowId, const u8 *string, u8 x, u8 y, s3 if (caseId != 3) { - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(txtColor[0])); + FillWindowPixelBuffer(windowId, PIXEL_FILL(txtColor[0])); } AddTextPrinterParameterized4(windowId, 1, x, y, letterSpacing, 1, txtColor, speed, string); diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index 24198fc870..37be569f8e 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -226,9 +226,9 @@ static void berry_fix_gpu_set(void) DmaCopy32(3, sUnknown_08618138, BG_PLTT + 0x1E0, 0x20); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP); - FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); - FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(0)); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0xA)); + FillWindowPixelBuffer(2, PIXEL_FILL(0)); + FillWindowPixelBuffer(3, PIXEL_FILL(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(0xA)); width = GetStringWidth(0, sUnknown_08617E9B, 0); left = (0x78 - width) / 2; @@ -273,7 +273,7 @@ static int berry_fix_text_update(int checkval) static void berry_fix_text_print(int scene) { FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0xA)); + FillWindowPixelBuffer(1, PIXEL_FILL(0xA)); AddTextPrinterParameterized3(1, 1, 0, 0, sUnknown_08618158, -1, gUnknown_08618160[scene]); PutWindowTilemap(1); CopyWindowToVram(1, 2); diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 7b69357786..a7cf4daf21 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -381,7 +381,7 @@ static void PrintTextInBerryTagScreen(u8 windowId, const u8 *text, u8 x, u8 y, s static void AddBerryTagTextToBg0(void) { memcpy(GetBgTilemapBuffer(0), sBerryTag->tilemapBuffers[2], sizeof(sBerryTag->tilemapBuffers[2])); - FillWindowPixelBuffer(WIN_BERRY_TAG, PALETTE_NUM_TO_FILL_VALUE(15)); + FillWindowPixelBuffer(WIN_BERRY_TAG, PIXEL_FILL(15)); PrintTextInBerryTagScreen(WIN_BERRY_TAG, gText_BerryTag, GetStringCenterAlignXOffset(1, gText_BerryTag, 0x40), 1, 0, 1); PutWindowTilemap(WIN_BERRY_TAG); schedule_bg_copy_tilemap_to_vram(0); @@ -598,7 +598,7 @@ static void Task_DisplayAnotherBerry(u8 taskId) switch (data[0]) { case 0x30: - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); break; case 0x40: PrintBerryNumberAndName(); @@ -608,7 +608,7 @@ static void Task_DisplayAnotherBerry(u8 taskId) CreateBerrySprite(); break; case 0x60: - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); break; case 0x70: PrintBerrySize(); @@ -620,7 +620,7 @@ static void Task_DisplayAnotherBerry(u8 taskId) SetFlavorCirclesVisiblity(); break; case 0xA0: - FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(2, PIXEL_FILL(0)); break; case 0xB0: PrintBerryDescription1(); @@ -635,7 +635,7 @@ static void Task_DisplayAnotherBerry(u8 taskId) switch (data[0]) { case 0x30: - FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(2, PIXEL_FILL(0)); break; case 0x40: PrintBerryDescription2(); @@ -647,7 +647,7 @@ static void Task_DisplayAnotherBerry(u8 taskId) SetFlavorCirclesVisiblity(); break; case 0x70: - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); break; case 0x80: PrintBerryFirmness(); @@ -660,7 +660,7 @@ static void Task_DisplayAnotherBerry(u8 taskId) CreateBerrySprite(); break; case 0xB0: - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); break; case 0xC0: PrintBerryNumberAndName(); diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c index 619b394105..c1d6930c70 100644 --- a/src/clear_save_data_screen.c +++ b/src/clear_save_data_screen.c @@ -90,7 +90,7 @@ static void Task_ClearSaveDataScreenYesNoChoice(u8 taskId) switch (Menu_ProcessInputNoWrapClearOnChoose()) { case 0: - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized(0, 1, gText_ClearingData, 0, 1, 0, 0); gTasks[taskId].func = Task_ClearSaveData; break; @@ -203,7 +203,7 @@ static void InitClearSaveDataScreenWindows(void) { InitWindows(sClearSaveTextWindow); DeactivateAllTextPrinters(); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); LoadWindowGfx(0, 0, 2, 224); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); } diff --git a/src/coins.c b/src/coins.c index a8d8eae065..b838c303ee 100644 --- a/src/coins.c +++ b/src/coins.c @@ -27,7 +27,7 @@ void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y) struct WindowTemplate template; SetWindowTemplateFields(&template, 0, x, y, 8, 2, 0xF, 0x141); sCoinsWindowId = AddWindow(&template); - FillWindowPixelBuffer(sCoinsWindowId, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(sCoinsWindowId, PIXEL_FILL(0)); PutWindowTilemap(sCoinsWindowId); DrawStdFrameWithCustomTileAndPalette(sCoinsWindowId, FALSE, 0x214, 0xE); PrintCoinsString(coinAmount); diff --git a/src/contest.c b/src/contest.c index f668baf922..e9353596b0 100644 --- a/src/contest.c +++ b/src/contest.c @@ -819,7 +819,7 @@ static void sub_80D8490(u8 taskId) } r5 = StringCopy(r5, gMoveNames[move]); - FillWindowPixelBuffer(i + 5, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(i + 5, PIXEL_FILL(0)); Contest_PrintTextToBg0WindowAt(i + 5, sp8, 5, 1, 7); } @@ -941,7 +941,7 @@ static void sub_80D895C(u8 taskId) for (i = 0; i < 4; i++) { - FillWindowPixelBuffer(5 + i, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(5 + i, PIXEL_FILL(0)); PutWindowTilemap(5 + i); CopyWindowToVram(5 + i, 2); } @@ -2258,7 +2258,7 @@ static void sub_80DAEA4(void) for (i = 0; i < 4; i++) { - FillWindowPixelBuffer(gUnknown_02039F26[i], PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(gUnknown_02039F26[i], PIXEL_FILL(0)); sub_80DAF04(i); sub_80DAF88(i); } @@ -2478,7 +2478,7 @@ static void prints_contest_move_description(u16 a) ContestBG_FillBoxWithTile(0, 0x5036, 0x15, 0x20, 0x08, 0x01, 0x11); ContestBG_FillBoxWithTile(0, 0x5014, 0x15, 0x20, numHearts, 0x01, 0x11); - FillWindowPixelBuffer(10, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(10, PIXEL_FILL(0)); Contest_PrintTextToBg0WindowStd(10, gContestEffectDescriptionPointers[gContestMoves[a].effect]); Contest_PrintTextToBg0WindowStd(9, gText_Slash); } @@ -2621,7 +2621,7 @@ static void sub_80DB884(void) static void sub_80DB89C(void) { - FillWindowPixelBuffer(4, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(4, PIXEL_FILL(0)); CopyWindowToVram(4, 2); Contest_SetBgCopyFlags(0); } @@ -3456,7 +3456,7 @@ static void sub_80DCD48(void) break; default: for (i = 0; i < 4; i++) - FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(i, PIXEL_FILL(0)); for (i = 0; i < 4; i++) { value = sContestantStatus[i].unk4; @@ -5038,7 +5038,7 @@ static void sub_80DF750(void) return; for (i = 0; i < 4; i++) - FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(i, PIXEL_FILL(0)); if (gHeap[0x1A000] == 2) { diff --git a/src/contest_link_80F57C4.c b/src/contest_link_80F57C4.c index f2b708db40..b2ce527578 100644 --- a/src/contest_link_80F57C4.c +++ b/src/contest_link_80F57C4.c @@ -935,7 +935,7 @@ static void sub_80F6AE8(void) // windowTemplate.width = 30; // windowTemplate.height = 2; // windowId = AddWindow(&windowTemplate); -// FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); +// FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); // origWidth = GetStringWidth(1, text, 0) + 9; // strWidth = origWidth; // if (strWidth < 0) diff --git a/src/contest_painting.c b/src/contest_painting.c index b961c7a659..931deb01bf 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -279,7 +279,7 @@ static void InitContestPaintingWindow(void) SetBgTilemapBuffer(1, AllocZeroed(BG_SCREEN_SIZE)); gContestPaintingWindowId = AddWindow(&gUnknown_085B07EC); DeactivateAllTextPrinters(); - FillWindowPixelBuffer(gContestPaintingWindowId, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(gContestPaintingWindowId, PIXEL_FILL(0)); PutWindowTilemap(gContestPaintingWindowId); CopyWindowToVram(gContestPaintingWindowId, 3); ShowBg(1); diff --git a/src/credits.c b/src/credits.c index 66f9f7ea87..4483e3160f 100644 --- a/src/credits.c +++ b/src/credits.c @@ -1592,7 +1592,7 @@ static void sub_8175DA0(u8 taskIdB) case 5: if (!gPaletteFade.active) { - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); CopyWindowToVram(0, 2); gTasks[taskIdB].data[TDB_0] = 2; } diff --git a/src/decoration.c b/src/decoration.c index 207cb1bf00..8f6c9c4496 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -543,7 +543,7 @@ void sub_8126B80(u8 taskId) void sub_8126C08(void) { - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 1, sSecretBasePCMenuItemDescriptions[sSecretBasePCMenuCursorPos], 0, 0, 2, 1, 3); } @@ -634,7 +634,7 @@ void sub_8126DFC(u8 taskId) void sub_8126E44(u8 taskId) { - FillWindowPixelBuffer(sDecorMenuWindowIndices[1], PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(sDecorMenuWindowIndices[1], PIXEL_FILL(1)); sub_8126E8C(taskId); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(sDecorMenuWindowIndices[1], 9, sCurDecorationCategory); gTasks[taskId].func = sub_8127088; @@ -968,7 +968,7 @@ void sub_8127744(u32 a0) const u8 *txt; winidx = sDecorMenuWindowIndices[3]; - FillWindowPixelBuffer(winidx, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(winidx, PIXEL_FILL(1)); if (a0 >= sCurDecorCatCount) { txt = gText_GoBackPrevMenu; diff --git a/src/diploma.c b/src/diploma.c index f2c2a965c1..7164950342 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -197,7 +197,7 @@ static void InitDiplomaWindow(void) InitWindows(sDiplomaWinTemplates); DeactivateAllTextPrinters(); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); PutWindowTilemap(0); } diff --git a/src/easy_chat.c b/src/easy_chat.c index 5a3ebf69c9..b602077ad2 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -3689,7 +3689,7 @@ static void sub_811CFCC(void) return; xOffset = GetStringCenterAlignXOffset(1, titleText, 144); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); sub_811D058(0, 1, titleText, xOffset, 1, 0xFF, 0, 2, 3); PutWindowTilemap(0); CopyWindowToVram(0, 3); @@ -3759,7 +3759,7 @@ static void sub_811D104(u8 arg0) break; } - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(1, PIXEL_FILL(1)); if (text1) sub_811D028(1, 1, text1, 0, 1, 0xFF, 0); @@ -3809,7 +3809,7 @@ static void sub_811D2C8(void) if (var0 == 7) var1 = 1; - FillWindowPixelBuffer(gUnknown_0203A11C->windowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gUnknown_0203A11C->windowId, PIXEL_FILL(1)); for (i = 0; i < numRows; i++) { memcpy(spC, sText_Clear17, sizeof(sText_Clear17)); @@ -3949,7 +3949,7 @@ static void sub_811D684(void) static void sub_811D698(u32 arg0) { sub_811DD84(); - FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(2, PIXEL_FILL(1)); switch (arg0) { case 0: @@ -4106,14 +4106,14 @@ static void sub_811D950(u8 arg0, u8 arg1) var1 = 0; } - FillWindowPixelRect(2, PALETTE_NUM_TO_FILL_VALUE(1), 0, y, 224, var2); + FillWindowPixelRect(2, PIXEL_FILL(1), 0, y, 224, var2); if (var1) - FillWindowPixelRect(2, PALETTE_NUM_TO_FILL_VALUE(1), 0, 0, 224, var1); + FillWindowPixelRect(2, PIXEL_FILL(1), 0, 0, 224, var1); } static void sub_811D9B4(void) { - FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(2, PIXEL_FILL(1)); CopyWindowToVram(2, 2); } @@ -4783,7 +4783,7 @@ static void sub_811E948(void) template.paletteNum = 11; template.baseBlock = 0x34; windowId = AddWindow(&template); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); for (i = 0; i < 4; i++) { const u8 *str = sFooterTextOptions[var0][i]; diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 66114f19fb..a9b6001ec7 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -606,7 +606,7 @@ static void CB2_EggHatch_1(void) case 1: if (!gPaletteFade.active) { - FillWindowPixelBuffer(sEggHatchData->windowId, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(sEggHatchData->windowId, PIXEL_FILL(0)); sEggHatchData->CB2_PalCounter = 0; sEggHatchData->CB2_state++; } @@ -857,7 +857,7 @@ static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8 static void EggHatchPrintMessage(u8 windowId, u8* string, u8 x, u8 y, u8 speed) { - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(15)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(15)); sEggHatchData->textColor[0] = 0; sEggHatchData->textColor[1] = 5; sEggHatchData->textColor[2] = 6; diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 4ab3cb21ef..96e679dd7b 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1918,7 +1918,7 @@ static bool8 Fishing9(struct Task *task) static bool8 Fishing10(struct Task *task) { AlignFishingAnimationFrames(); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 1, gText_PokemonOnHook, 1, 0, 2, 1, 3); task->tStep++; task->tFrameCounter = 0; @@ -1966,7 +1966,7 @@ static bool8 Fishing12(struct Task *task) { AlignFishingAnimationFrames(); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection())); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 1, gText_NotEvenANibble, 1, 0, 2, 1, 3); task->tStep = FISHING_SHOW_RESULT; return TRUE; @@ -1977,7 +1977,7 @@ static bool8 Fishing13(struct Task *task) { AlignFishingAnimationFrames(); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection())); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 1, gText_ItGotAway, 1, 0, 2, 1, 3); task->tStep++; return TRUE; diff --git a/src/field_region_map.c b/src/field_region_map.c index 850e845543..1d54333fb6 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -196,13 +196,13 @@ static void PrintRegionMapSecName(void) { if (sFieldRegionMapHandler->regionMap.iconDrawType != MAPSECTYPE_NONE) { - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized(0, 1, sFieldRegionMapHandler->regionMap.mapSecName, 0, 1, 0, NULL); schedule_bg_copy_tilemap_to_vram(0); } else { - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); CopyWindowToVram(0, 3); } } diff --git a/src/field_specials.c b/src/field_specials.c index b4017f0ef5..2e0b032908 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -2646,7 +2646,7 @@ static void sub_813A570(u8 taskId) DestroyListMenuTask(task->data[14], NULL, NULL); Free(gUnknown_0203AB64); ClearStdWindowAndFrameToTransparent(task->data[13], 1); - FillWindowPixelBuffer(task->data[13], PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(task->data[13], PIXEL_FILL(0)); CopyWindowToVram(task->data[13], 2); RemoveWindow(task->data[13]); DestroyTask(taskId); @@ -3001,7 +3001,7 @@ static void sub_813AA60(u16 a0, u16 a1) if (a0 > 2 && a0 < 7) { - FillWindowPixelRect(0, PALETTE_NUM_TO_FILL_VALUE(1), 0, 0, 216, 32); + FillWindowPixelRect(0, PIXEL_FILL(1), 0, 0, 216, 32); switch (a0) { case 3: @@ -3140,7 +3140,7 @@ static void sub_813AD34(u8 a0, u16 a1) if (a0 == 9 || a0 == 10) { - FillWindowPixelRect(gUnknown_0203AB5E, PALETTE_NUM_TO_FILL_VALUE(1), 0, 0, 96, 48); + FillWindowPixelRect(gUnknown_0203AB5E, PIXEL_FILL(1), 0, 0, 96, 48); if (a0 == 10) { AddTextPrinterParameterized(gUnknown_0203AB5E, 1, gUnknown_085B3254[a1], 0, 1, 0, NULL); @@ -3227,7 +3227,7 @@ void sub_813AF48(void) DestroyListMenuTask(task->data[14], NULL, NULL); Free(gUnknown_0203AB64); ClearStdWindowAndFrameToTransparent(task->data[13], TRUE); - FillWindowPixelBuffer(task->data[13], PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(task->data[13], PIXEL_FILL(0)); ClearWindowTilemap(task->data[13]); CopyWindowToVram(task->data[13], 2); RemoveWindow(task->data[13]); diff --git a/src/frontier_pass.c b/src/frontier_pass.c index c449a50f0a..fff93c3c76 100644 --- a/src/frontier_pass.c +++ b/src/frontier_pass.c @@ -1090,7 +1090,7 @@ static void ShowAndPrintWindows(void) for (i = 0; i < WINDOW_COUNT; i++) { PutWindowTilemap(i); - FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(i, PIXEL_FILL(0)); } x = GetStringCenterAlignXOffset(1, gText_SymbolsEarned, 96); @@ -1116,7 +1116,7 @@ static void ShowAndPrintWindows(void) static void PrintAreaDescription(u8 cursorArea) { - FillWindowPixelBuffer(WINDOW_DESCRIPTION, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(WINDOW_DESCRIPTION, PIXEL_FILL(0)); if (cursorArea == CURSOR_AREA_RECORD && !sPassData->hasBattleRecord) AddTextPrinterParameterized3(WINDOW_DESCRIPTION, 1, 2, 0, sTextColors[1], 0, sPassAreaDescriptions[0]); else if (cursorArea != CURSOR_AREA_NOTHING) @@ -1656,7 +1656,7 @@ static void PrintOnFrontierMap(void) for (i = 0; i < MAP_WINDOW_COUNT; i++) { PutWindowTilemap(i); - FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(i, PIXEL_FILL(0)); } for (i = 0; i < NUM_FRONTIER_FACILITIES; i++) @@ -1698,7 +1698,7 @@ static void HandleFrontierMapCursorMove(u8 direction) StartSpriteAnim(sMapData->mapIndicatorSprite, sMapLandmarks[sMapData->cursorPos].animNum); sMapData->mapIndicatorSprite->pos1.x = sMapLandmarks[sMapData->cursorPos].x; sMapData->mapIndicatorSprite->pos1.y = sMapLandmarks[sMapData->cursorPos].y; - FillWindowPixelBuffer(MAP_WINDOW_DESCRIPTION, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(MAP_WINDOW_DESCRIPTION, PIXEL_FILL(0)); AddTextPrinterParameterized3(MAP_WINDOW_DESCRIPTION, 1, 4, 0, sTextColors[0], 0, sMapLandmarks[sMapData->cursorPos].description); for (i = 0; i < 3; i++) diff --git a/src/frontier_util.c b/src/frontier_util.c index ec7327ca3f..0c68bf1198 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -1045,7 +1045,7 @@ static void ShowTowerResultsWindow(u8 battleMode) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); if (battleMode == FRONTIER_MODE_SINGLES) StringExpandPlaceholders(gStringVar4, gText_SingleBattleRoomResults); else if (battleMode == FRONTIER_MODE_DOUBLES) @@ -1116,7 +1116,7 @@ static void ShowDomeResultsWindow(u8 battleMode) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); if (battleMode == FRONTIER_MODE_SINGLES) StringExpandPlaceholders(gStringVar4, gText_SingleBattleTourneyResults); else @@ -1192,7 +1192,7 @@ static void ShowPalaceResultsWindow(u8 battleMode) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); if (battleMode == FRONTIER_MODE_SINGLES) StringExpandPlaceholders(gStringVar4, gText_SingleBattleHallResults); else @@ -1248,7 +1248,7 @@ static void ShowPikeResultsWindow(void) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); StringExpandPlaceholders(gStringVar4, gText_BattleChoiceResults); PrintAligned(gStringVar4, 0); AddTextPrinterParameterized(gRecordsWindowId, 1, gText_Lv502, 8, 33, TEXT_SPEED_FF, NULL); @@ -1310,7 +1310,7 @@ static void ShowArenaResultsWindow(void) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); PrintHyphens(10); StringExpandPlaceholders(gStringVar4, gText_SetKOTourneyResults); PrintAligned(gStringVar4, 2); @@ -1396,7 +1396,7 @@ static void ShowFactoryResultsWindow(u8 battleMode) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); if (battleMode == FRONTIER_MODE_SINGLES) StringExpandPlaceholders(gStringVar4, gText_BattleSwapSingleResults); else @@ -1461,7 +1461,7 @@ static void ShowPyramidResultsWindow(void) { gRecordsWindowId = AddWindow(&gUnknown_08611C74); DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); StringExpandPlaceholders(gStringVar4, gText_BattleQuestResults); PrintAligned(gStringVar4, 2); AddTextPrinterParameterized(gRecordsWindowId, 1, gText_Lv502, 8, 49, TEXT_SPEED_FF, NULL); @@ -1484,7 +1484,7 @@ static void ShowLinkContestResultsWindow(void) gRecordsWindowId = AddWindow(&gUnknown_08611C7C); DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); StringExpandPlaceholders(gStringVar4, gText_LinkContestResults); x = GetStringCenterAlignXOffset(1, gStringVar4, 208); @@ -2354,7 +2354,7 @@ void ShowRankingHallRecordsWindow(void) { gRecordsWindowId = AddWindow(&gUnknown_08611C84); DrawStdWindowFrame(gRecordsWindowId, FALSE); - FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); PrintHallRecords(gSpecialVar_0x8005, FRONTIER_LVL_50); PutWindowTilemap(gRecordsWindowId); CopyWindowToVram(gRecordsWindowId, 3); @@ -2362,7 +2362,7 @@ void ShowRankingHallRecordsWindow(void) void ScrollRankingHallRecordsWindow(void) { - FillWindowPixelBuffer(gRecordsWindowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); PrintHallRecords(gSpecialVar_0x8005, FRONTIER_LVL_OPEN); CopyWindowToVram(gRecordsWindowId, 2); } diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index d3b94cff65..53577e1666 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -649,7 +649,7 @@ static void sub_8173DC0(u8 taskId) gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 1; } BeginNormalPaletteFade(sUnknown_0203BCD4, 0, 12, 12, RGB(16, 29, 24)); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); CopyWindowToVram(0, 3); gTasks[taskId].tFrameCount = 7; gTasks[taskId].func = sub_8173EA4; @@ -1086,7 +1086,7 @@ static void Task_HofPC_ExitOnButtonPress(u8 taskId) static void HallOfFame_PrintWelcomeText(u8 unusedPossiblyWindowId, u8 unused2) { - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); PutWindowTilemap(0); AddTextPrinterParameterized3(0, 1, GetStringCenterAlignXOffset(1, gText_WelcomeToHOF, 0xD0), 1, sUnknown_085E5388, 0, gText_WelcomeToHOF); CopyWindowToVram(0, 3); @@ -1099,7 +1099,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u s32 dexNumber; s32 width; - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); PutWindowTilemap(0); // dex number @@ -1180,7 +1180,7 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2) u32 width; u16 trainerId; - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(1, PIXEL_FILL(1)); PutWindowTilemap(1); DrawStdFrameWithCustomTileAndPalette(1, FALSE, 0x21D, 0xD); AddTextPrinterParameterized3(1, 1, 0, 1, sUnknown_085E538C, -1, gText_Name); diff --git a/src/item_menu.c b/src/item_menu.c index 8ade67614d..ae2b7d47b3 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -884,7 +884,7 @@ void bag_menu_print_description_box_text(int a) StringExpandPlaceholders(gStringVar4, gText_ReturnToVar1); str = gStringVar4; } - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); bag_menu_print(1, 1, str, 3, 1, 0, 0, 0, 0); } @@ -896,7 +896,7 @@ void bag_menu_print_cursor_(u8 a, u8 b) void bag_menu_print_cursor(u8 a, u8 b) { if (b == 0xFF) - FillWindowPixelRect(0, PALETTE_NUM_TO_FILL_VALUE(0), 0, a, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); + FillWindowPixelRect(0, PIXEL_FILL(0), 0, a, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); else bag_menu_print(0, 1, gText_SelectorArrow2, 0, a, 0, 0, 0, b); @@ -1028,7 +1028,7 @@ void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void ( *callback)(u s16* data = gTasks[taskId].data; data[10] = AddItemMessageWindow(4); - FillWindowPixelBuffer(data[10], PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(data[10], PIXEL_FILL(1)); DisplayMessageAndContinueTask(taskId, data[10], 10, 13, fontId, GetPlayerTextSpeedDelay(), str, callback); schedule_bg_copy_tilemap_to_vram(1); } @@ -1293,7 +1293,7 @@ void bag_menu_swap_items(u8 taskId) gUnknown_0203CE54->unk81A = data[1]; CopyItemName(BagGetItemIdByPocketPosition(gUnknown_0203CE58.pocket + 1, data[1]), gStringVar1); StringExpandPlaceholders(gStringVar4, gText_MoveVar1Where); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); sub_80D4FEC(data[1]); sub_81AB89C(); @@ -1505,7 +1505,7 @@ void sub_81AC644(u8 unused) { CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); } if (gUnknown_0203CE54->unk828 == 1) @@ -1646,7 +1646,7 @@ void ItemMenu_UseOutOfBattle(u8 taskId) bag_menu_print_there_is_no_pokemon(taskId); else { - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); schedule_bg_copy_tilemap_to_vram(0); if (gUnknown_0203CE58.pocket != BERRIES_POCKET) ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId); @@ -1670,7 +1670,7 @@ void ItemMenu_Toss(u8 taskId) { CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_TossHowManyVar1s); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); sub_81ABC3C(7); gTasks[taskId].func = Task_ChooseHowManyToToss; @@ -1684,7 +1684,7 @@ void BagMenuConfirmToss(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[8], 0, 3); StringExpandPlaceholders(gStringVar4, gText_ConfirmTossItems); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); bag_menu_yes_no(taskId, 5, &gUnknown_08614084); } @@ -1727,7 +1727,7 @@ void BagMenuActuallyToss(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[8], 0, 3); StringExpandPlaceholders(gStringVar4, gText_ThrewAwayVar2Var1s); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); gTasks[taskId].func = Task_ActuallyToss; } @@ -2043,7 +2043,7 @@ void display_deposit_item_ask_str(u8 taskId) { CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_DepositHowManyVar1); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); bag_menu_print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); sub_81ABC3C(7); gTasks[taskId].func = sub_81ADA7C; @@ -2078,7 +2078,7 @@ void sub_81ADB14(u8 taskId) { s16* data = gTasks[taskId].data; - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); if (ItemId_GetImportance(gSpecialVar_ItemId)) { bag_menu_print(1, 1, gText_CantStoreImportantItems, 3, 1, 0, 0, 0, 0); @@ -2244,7 +2244,7 @@ void bag_menu_print_pocket_names(const u8 *pocketName1, const u8 *pocketName2) window.width = 16; window.height = 2; windowId = AddWindow(&window); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(0)); offset = GetStringCenterAlignXOffset(1, pocketName1, 0x40); bag_menu_print(windowId, 1, pocketName1, offset, 1, 0, 0, -1, 1); if (pocketName2) @@ -2283,7 +2283,7 @@ void setup_bag_menu_textboxes(void) LoadPalette(&gUnknown_0860F074, 0xF0, 0x20); for (i = 0; i < 3; i++) { - FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(i, PIXEL_FILL(0)); PutWindowTilemap(i); } schedule_bg_copy_tilemap_to_vram(0); @@ -2367,7 +2367,7 @@ void bag_menu_remove_money_window(void) void bag_menu_prepare_tmhm_move_window(void) { - FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(3, PIXEL_FILL(0)); blit_move_info_icon(3, 19, 0, 0); blit_move_info_icon(3, 20, 0, 12); blit_move_info_icon(3, 21, 0, 24); @@ -2381,7 +2381,7 @@ void PrintTMHMMoveData(u16 itemId) u16 moveId; const u8* text; - FillWindowPixelBuffer(4, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(4, PIXEL_FILL(0)); if (itemId == ITEM_NONE) { for (i = 0; i < 4; i++) diff --git a/src/learn_move.c b/src/learn_move.c index 5173525553..879acff6d7 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -498,7 +498,7 @@ static void LearnMoveMain(void) case 27: if (!sub_81D2C3C()) { - FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(3, PIXEL_FILL(1)); if (sLearnMoveStruct2.showContestInfo == FALSE) { sLearnMoveStruct->state = 3; @@ -631,7 +631,7 @@ static void HideSpritesAndPrintTeachText(bool8 a) if (!a) { StringExpandPlaceholders(gStringVar4, gText_TeachWhichMoveToPkmn); - FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(3, PIXEL_FILL(1)); AddTextPrinterParameterized(3, 1, gStringVar4, 0, 1, 0, NULL); } } @@ -695,7 +695,7 @@ static void ShowTeachMoveText(bool8 showContest) if (showContest == FALSE) { StringExpandPlaceholders(gStringVar4, gText_TeachWhichMoveToPkmn); - FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(3, PIXEL_FILL(1)); AddTextPrinterParameterized(3, 1, gStringVar4, 0, 1, 0, NULL); } } diff --git a/src/link.c b/src/link.c index 5c7614c1bf..9aedbc961b 100644 --- a/src/link.c +++ b/src/link.c @@ -1683,8 +1683,8 @@ static void sub_800B080(void) CopyToBgTilemapBuffer(1, gWirelessLinkDisplayTilemap, 0, 0); CopyBgTilemapBufferToVram(1); LoadPalette(gWirelessLinkDisplayPal, 0, 0x20); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); - FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); + FillWindowPixelBuffer(2, PIXEL_FILL(0)); AddTextPrinterParameterized3(0, 3, 2, 6, gUnknown_082ED224, 0, gText_CommErrorEllipsis); AddTextPrinterParameterized3(2, 3, 2, 1, gUnknown_082ED224, 0, gText_MoveCloserToLinkPartner); PutWindowTilemap(0); @@ -1696,8 +1696,8 @@ static void sub_800B080(void) static void sub_800B138(void) { LoadBgTiles(0, g2BlankTilesGfx, 0x20, 0); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); - FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); + FillWindowPixelBuffer(2, PIXEL_FILL(0)); AddTextPrinterParameterized3(1, 3, 2, 0, gUnknown_082ED224, 0, gText_CommErrorCheckConnections); PutWindowTilemap(1); PutWindowTilemap(2); diff --git a/src/list_menu.c b/src/list_menu.c index b8e1863482..51d7dcb15a 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -486,7 +486,7 @@ void RedrawListMenu(u8 listTaskId) { struct ListMenu *list = (void*) gTasks[listTaskId].data; - FillWindowPixelBuffer(list->template.windowId, PALETTE_NUM_TO_FILL_VALUE(list->template.fillValue)); + FillWindowPixelBuffer(list->template.windowId, PIXEL_FILL(list->template.fillValue)); ListMenuPrintEntries(list, list->scrollOffset, 0, list->template.maxShowed); ListMenuDrawCursor(list); CopyWindowToVram(list->template.windowId, 2); @@ -584,7 +584,7 @@ static u8 ListMenuInitInternal(struct ListMenuTemplate *listMenuTemplate, u16 sc if (list->template.totalItems < list->template.maxShowed) list->template.maxShowed = list->template.totalItems; - FillWindowPixelBuffer(list->template.windowId, PALETTE_NUM_TO_FILL_VALUE(list->template.fillValue)); + FillWindowPixelBuffer(list->template.windowId, PIXEL_FILL(list->template.fillValue)); ListMenuPrintEntries(list, list->scrollOffset, 0, list->template.maxShowed); ListMenuDrawCursor(list); ListMenuCallSelectionChangedCallback(list, TRUE); @@ -698,7 +698,7 @@ static void ListMenuErasePrintedCursor(struct ListMenu *list, u16 selectedRow) u8 width = GetMenuCursorDimensionByFont(list->template.fontId, 0); u8 height = GetMenuCursorDimensionByFont(list->template.fontId, 1); FillWindowPixelRect(list->template.windowId, - PALETTE_NUM_TO_FILL_VALUE(list->template.fillValue), + PIXEL_FILL(list->template.fillValue), list->template.cursor_X, selectedRow * yMultiplier + list->template.upText_Y, width, @@ -795,7 +795,7 @@ static void ListMenuScroll(struct ListMenu *list, u8 count, bool8 movingDown) { if (count >= list->template.maxShowed) { - FillWindowPixelBuffer(list->template.windowId, PALETTE_NUM_TO_FILL_VALUE(list->template.fillValue)); + FillWindowPixelBuffer(list->template.windowId, PIXEL_FILL(list->template.fillValue)); ListMenuPrintEntries(list, list->scrollOffset, 0, list->template.maxShowed); } else @@ -806,26 +806,26 @@ static void ListMenuScroll(struct ListMenu *list, u8 count, bool8 movingDown) { u16 y, width, height; - ScrollWindow(list->template.windowId, 1, count * yMultiplier, PALETTE_NUM_TO_FILL_VALUE(list->template.fillValue)); + ScrollWindow(list->template.windowId, 1, count * yMultiplier, PIXEL_FILL(list->template.fillValue)); ListMenuPrintEntries(list, list->scrollOffset, 0, count); y = (list->template.maxShowed * yMultiplier) + list->template.upText_Y; width = GetWindowAttribute(list->template.windowId, WINDOW_WIDTH) * 8; height = (GetWindowAttribute(list->template.windowId, WINDOW_HEIGHT) * 8) - y; FillWindowPixelRect(list->template.windowId, - PALETTE_NUM_TO_FILL_VALUE(list->template.fillValue), + PIXEL_FILL(list->template.fillValue), 0, y, width, height); } else { u16 width; - ScrollWindow(list->template.windowId, 0, count * yMultiplier, PALETTE_NUM_TO_FILL_VALUE(list->template.fillValue)); + ScrollWindow(list->template.windowId, 0, count * yMultiplier, PIXEL_FILL(list->template.fillValue)); ListMenuPrintEntries(list, list->scrollOffset + (list->template.maxShowed - count), list->template.maxShowed - count, count); width = GetWindowAttribute(list->template.windowId, WINDOW_WIDTH) * 8; FillWindowPixelRect(list->template.windowId, - PALETTE_NUM_TO_FILL_VALUE(list->template.fillValue), + PIXEL_FILL(list->template.fillValue), 0, 0, width, list->template.upText_Y); } } diff --git a/src/mail.c b/src/mail.c index 27716a3f8b..9cca4492e1 100644 --- a/src/mail.c +++ b/src/mail.c @@ -477,8 +477,8 @@ static void sub_8121B1C(void) y = 0; PutWindowTilemap(0); PutWindowTilemap(1); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); for (i = 0; i < sMailRead->layout->numSubStructs; i ++) { if (sMailRead->strbuf[i][0] == EOS || sMailRead->strbuf[i][0] == CHAR_SPACE) diff --git a/src/main_menu.c b/src/main_menu.c index 6ad1776f8c..e6e29d942a 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -783,8 +783,8 @@ static void Task_DisplayMainMenu(u8 taskId) { case HAS_NO_SAVED_GAME: default: - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0xA)); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0xA)); + FillWindowPixelBuffer(0, PIXEL_FILL(0xA)); + FillWindowPixelBuffer(1, PIXEL_FILL(0xA)); AddTextPrinterParameterized3(0, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuNewGame); AddTextPrinterParameterized3(1, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuOption); PutWindowTilemap(0); @@ -795,9 +795,9 @@ static void Task_DisplayMainMenu(u8 taskId) DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[1], MAIN_MENU_BORDER_TILE); break; case HAS_SAVED_GAME: - FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0xA)); - FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(0xA)); - FillWindowPixelBuffer(4, PALETTE_NUM_TO_FILL_VALUE(0xA)); + FillWindowPixelBuffer(2, PIXEL_FILL(0xA)); + FillWindowPixelBuffer(3, PIXEL_FILL(0xA)); + FillWindowPixelBuffer(4, PIXEL_FILL(0xA)); AddTextPrinterParameterized3(2, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuContinue); AddTextPrinterParameterized3(3, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuNewGame); AddTextPrinterParameterized3(4, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuOption); @@ -813,10 +813,10 @@ static void Task_DisplayMainMenu(u8 taskId) DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[4], MAIN_MENU_BORDER_TILE); break; case HAS_MYSTERY_GIFT: - FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0xA)); - FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(0xA)); - FillWindowPixelBuffer(4, PALETTE_NUM_TO_FILL_VALUE(0xA)); - FillWindowPixelBuffer(5, PALETTE_NUM_TO_FILL_VALUE(0xA)); + FillWindowPixelBuffer(2, PIXEL_FILL(0xA)); + FillWindowPixelBuffer(3, PIXEL_FILL(0xA)); + FillWindowPixelBuffer(4, PIXEL_FILL(0xA)); + FillWindowPixelBuffer(5, PIXEL_FILL(0xA)); AddTextPrinterParameterized3(2, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuContinue); AddTextPrinterParameterized3(3, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuNewGame); AddTextPrinterParameterized3(4, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuMysteryGift); @@ -836,11 +836,11 @@ static void Task_DisplayMainMenu(u8 taskId) DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[5], MAIN_MENU_BORDER_TILE); break; case HAS_MYSTERY_EVENTS: - FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0xA)); - FillWindowPixelBuffer(3, PALETTE_NUM_TO_FILL_VALUE(0xA)); - FillWindowPixelBuffer(4, PALETTE_NUM_TO_FILL_VALUE(0xA)); - FillWindowPixelBuffer(5, PALETTE_NUM_TO_FILL_VALUE(0xA)); - FillWindowPixelBuffer(6, PALETTE_NUM_TO_FILL_VALUE(0xA)); + FillWindowPixelBuffer(2, PIXEL_FILL(0xA)); + FillWindowPixelBuffer(3, PIXEL_FILL(0xA)); + FillWindowPixelBuffer(4, PIXEL_FILL(0xA)); + FillWindowPixelBuffer(5, PIXEL_FILL(0xA)); + FillWindowPixelBuffer(6, PIXEL_FILL(0xA)); AddTextPrinterParameterized3(2, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuContinue); AddTextPrinterParameterized3(3, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuNewGame); AddTextPrinterParameterized3(4, 1, 0, 1, sTextColor_Headers, -1, gText_MainMenuMysteryGift2); @@ -2098,7 +2098,7 @@ static void NewGameBirchSpeech_StartFadePlatformOut(u8 taskId, u8 delay) static void NewGameBirchSpeech_ShowGenderMenu(void) { DrawMainMenuWindowBorder(&gNewGameBirchSpeechTextWindows[1], 0xF3); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(1, PIXEL_FILL(1)); PrintMenuTable(1, 2, sMenuActions_Gender); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(1, 2, 0); PutWindowTilemap(1); @@ -2126,7 +2126,7 @@ static void NewGameBirchSpeech_SetDefaultPlayerName(u8 nameId) static void CreateMainMenuErrorWindow(const u8* str) { - FillWindowPixelBuffer(7, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(7, PIXEL_FILL(1)); AddTextPrinterParameterized(7, 1, str, 0, 1, 2, 0); PutWindowTilemap(7); CopyWindowToVram(7, 2); @@ -2239,7 +2239,7 @@ static void NewGameBirchSpeech_ClearGenderWindowTilemap(u8 a, u8 b, u8 c, u8 d, static void NewGameBirchSpeech_ClearGenderWindow(u8 windowId, bool8 copyToVram) { CallWindowFunction(windowId, NewGameBirchSpeech_ClearGenderWindowTilemap); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); ClearWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -2277,7 +2277,7 @@ void CreateYesNoMenuParameterized(u8 a, u8 b, u16 c, u16 d, u8 e, u8 f) static void NewGameBirchSpeech_ShowDialogueWindow(u8 windowId, u8 copyToVram) { CallWindowFunction(windowId, NewGameBirchSpeech_CreateDialogueWindowBorder); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); diff --git a/src/match_call.c b/src/match_call.c index 76012e0767..d4da8d791b 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1191,7 +1191,7 @@ static bool32 LoadMatchCallWindowGfx(u8 taskId) return FALSE; } - FillWindowPixelBuffer(taskData[2], PALETTE_NUM_TO_FILL_VALUE(8)); + FillWindowPixelBuffer(taskData[2], PIXEL_FILL(8)); LoadPalette(sUnknown_0860EA4C, 0xE0, 0x20); LoadPalette(sPokeNavIconPalette, 0xF0, 0x20); ChangeBgY(0, -0x2000, 0); @@ -1241,7 +1241,7 @@ static bool32 sub_81962D8(u8 taskId) s16 *taskData = gTasks[taskId].data; if (!ExecuteMatchCallTextPrinter(taskData[2])) { - FillWindowPixelBuffer(taskData[2], PALETTE_NUM_TO_FILL_VALUE(8)); + FillWindowPixelBuffer(taskData[2], PIXEL_FILL(8)); if (!gMatchCallState.triggeredFromScript) SelectMatchCallMessage(gMatchCallState.trainerId, gStringVar4); @@ -1257,7 +1257,7 @@ static bool32 sub_8196330(u8 taskId) s16 *taskData = gTasks[taskId].data; if (!ExecuteMatchCallTextPrinter(taskData[2]) && !IsSEPlaying() && gMain.newKeys & (A_BUTTON | B_BUTTON)) { - FillWindowPixelBuffer(taskData[2], PALETTE_NUM_TO_FILL_VALUE(8)); + FillWindowPixelBuffer(taskData[2], PIXEL_FILL(8)); CopyWindowToVram(taskData[2], 2); PlaySE(SE_TOREOFF); return TRUE; diff --git a/src/menu.c b/src/menu.c index 6a181532ed..8cb7ac0b27 100644 --- a/src/menu.c +++ b/src/menu.c @@ -213,7 +213,7 @@ void sub_81973A4(void) void DrawDialogueFrame(u8 windowId, bool8 copyToVram) { CallWindowFunction(windowId, WindowFunc_DrawDialogueFrame); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -222,7 +222,7 @@ void DrawDialogueFrame(u8 windowId, bool8 copyToVram) void DrawStdWindowFrame(u8 windowId, bool8 copyToVram) { CallWindowFunction(windowId, WindowFunc_DrawStandardFrame); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -231,7 +231,7 @@ void DrawStdWindowFrame(u8 windowId, bool8 copyToVram) void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram) { CallWindowFunction(windowId, WindowFunc_ClearDialogWindowAndFrame); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); ClearWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -240,7 +240,7 @@ void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram) void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram) { CallWindowFunction(windowId, WindowFunc_ClearStdWindowAndFrame); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); ClearWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -554,7 +554,7 @@ void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 sTileNum = tileNum; sPaletteNum = paletteNum; CallWindowFunction(windowId, WindowFunc_DrawDialogFrameWithCustomTileAndPalette); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -566,7 +566,7 @@ void DrawDialogFrameWithCustomTile(u8 windowId, bool8 copyToVram, u16 tileNum) sTileNum = tileNum; sPaletteNum = GetWindowAttribute(windowId, WINDOW_PALETTE_NUM); CallWindowFunction(windowId, WindowFunc_DrawDialogFrameWithCustomTileAndPalette); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -671,7 +671,7 @@ void ClearDialogWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram) { // The palette slot doesn't matter, since the tiles are transparent. CallWindowFunction(windowId, WindowFunc_ClearDialogWindowAndFrameNullPalette); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(0)); ClearWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -687,7 +687,7 @@ void DrawStdFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 bas sTileNum = baseTileNum; sPaletteNum = paletteNum; CallWindowFunction(windowId, WindowFunc_DrawStdFrameWithCustomTileAndPalette); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -699,7 +699,7 @@ void DrawStdFrameWithCustomTile(u8 windowId, bool8 copyToVram, u16 baseTileNum) sTileNum = baseTileNum; sPaletteNum = GetWindowAttribute(windowId, WINDOW_PALETTE_NUM); CallWindowFunction(windowId, WindowFunc_DrawStdFrameWithCustomTileAndPalette); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -768,7 +768,7 @@ void WindowFunc_DrawStdFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLeft, u8 t void ClearStdWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram) { CallWindowFunction(windowId, WindowFunc_ClearStdWindowAndFrameToTransparent); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(0)); ClearWindowTilemap(windowId); if (copyToVram == TRUE) CopyWindowToVram(windowId, 3); @@ -814,7 +814,7 @@ void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram) if (sWindowId != 0xFF) { PutWindowTilemap(sWindowId); - FillWindowPixelBuffer(sWindowId, PALETTE_NUM_TO_FILL_VALUE(15)); + FillWindowPixelBuffer(sWindowId, PIXEL_FILL(15)); width = GetStringWidth(0, string, 0); AddTextPrinterParameterized3(sWindowId, 0, @@ -848,7 +848,7 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo color[2] = 2; } PutWindowTilemap(sWindowId); - FillWindowPixelBuffer(sWindowId, PALETTE_NUM_TO_FILL_VALUE(15)); + FillWindowPixelBuffer(sWindowId, PIXEL_FILL(15)); if (string2 != NULL) { width = GetStringWidth(0, string2, 0); @@ -876,7 +876,7 @@ void sub_81982F0(void) { if (sWindowId != 0xFF) { - FillWindowPixelBuffer(sWindowId, PALETTE_NUM_TO_FILL_VALUE(15)); + FillWindowPixelBuffer(sWindowId, PIXEL_FILL(15)); CopyWindowToVram(sWindowId, 3); } } @@ -885,7 +885,7 @@ void sub_8198314(void) { if (sWindowId != 0xFF) { - FillWindowPixelBuffer(sWindowId, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(sWindowId, PIXEL_FILL(0)); ClearWindowTilemap(sWindowId); CopyWindowToVram(sWindowId, 3); RemoveWindow(sWindowId); @@ -934,7 +934,7 @@ void RedrawMenuCursor(u8 oldPos, u8 newPos) width = GetMenuCursorDimensionByFont(sMenu.fontId, 0); height = GetMenuCursorDimensionByFont(sMenu.fontId, 1); - FillWindowPixelRect(sMenu.windowId, PALETTE_NUM_TO_FILL_VALUE(1), sMenu.left, sMenu.optionHeight * oldPos + sMenu.top, width, height); + FillWindowPixelRect(sMenu.windowId, PIXEL_FILL(1), sMenu.left, sMenu.optionHeight * oldPos + sMenu.top, width, height); AddTextPrinterParameterized(sMenu.windowId, sMenu.fontId, gText_SelectorArrow3, sMenu.left, sMenu.optionHeight * newPos + sMenu.top, 0, 0); } @@ -1313,7 +1313,7 @@ void sub_8199060(u8 oldCursorPos, u8 newCursorPos) u8 xPos = (oldCursorPos % sMenu.horizontalCount) * sMenu.optionWidth + sMenu.left; u8 yPos = (oldCursorPos / sMenu.horizontalCount) * sMenu.optionHeight + sMenu.top; FillWindowPixelRect(sMenu.windowId, - PALETTE_NUM_TO_FILL_VALUE(1), + PIXEL_FILL(1), xPos, yPos, cursorWidth, diff --git a/src/money.c b/src/money.c index e7ae6080ce..4ff8086ead 100644 --- a/src/money.c +++ b/src/money.c @@ -169,7 +169,7 @@ void DrawMoneyBox(int amount, u8 x, u8 y) SetWindowTemplateFields(&template, 0, x + 1, y + 1, 10, 2, 15, 8); sMoneyBoxWindowId = AddWindow(&template); - FillWindowPixelBuffer(sMoneyBoxWindowId, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(sMoneyBoxWindowId, PIXEL_FILL(0)); PutWindowTilemap(sMoneyBoxWindowId); CopyWindowToVram(sMoneyBoxWindowId, 1); PrintMoneyAmountInMoneyBoxWithBorder(sMoneyBoxWindowId, 0x214, 14, amount); diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index 2a16175927..1c886565a5 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -90,7 +90,7 @@ void CB2_InitMysteryEventMenu(void) DeactivateAllTextPrinters(); for (i = 0; i < 2; i++) - FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(i, PIXEL_FILL(0)); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14); LoadUserWindowBorderGfx(0, 1u, 0xD0u); @@ -313,6 +313,6 @@ static void PrintMysteryMenuText(u8 windowId, const u8 *text, u8 x, u8 y, s32 sp textColor[1] = 2; textColor[2] = 3; - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(textColor[0])); + FillWindowPixelBuffer(windowId, PIXEL_FILL(textColor[0])); AddTextPrinterParameterized4(windowId, 1, x, y, letterSpacing, lineSpacing, textColor, speed, text); } diff --git a/src/naming_screen.c b/src/naming_screen.c index e4159e3beb..22bbb84d71 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1474,7 +1474,7 @@ static void HandleDpadMovement(struct Task *task) static void sub_80E4894(void) { - FillWindowPixelBuffer(gNamingScreenData->windows[3], PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gNamingScreenData->windows[3], PIXEL_FILL(1)); AddTextPrinterParameterized(gNamingScreenData->windows[3], 1, gNamingScreenData->template->title, 8, 1, 0, 0); PutWindowTilemap(gNamingScreenData->windows[3]); } @@ -1485,7 +1485,7 @@ static void sub_80E48E8(void) StringCopy(buffer, gSpeciesNames[gNamingScreenData->monSpecies]); StringAppendN(buffer, gNamingScreenData->template->title, 15); - FillWindowPixelBuffer(gNamingScreenData->windows[3], PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gNamingScreenData->windows[3], PIXEL_FILL(1)); AddTextPrinterParameterized(gNamingScreenData->windows[3], 1, buffer, 8, 1, 0, 0); PutWindowTilemap(gNamingScreenData->windows[3]); } @@ -1672,7 +1672,7 @@ static void sub_80E4D10(void) u8 maxChars = gNamingScreenData->template->maxChars; u16 unk = gNamingScreenData->inputCharBaseXPos - 0x40; - FillWindowPixelBuffer(gNamingScreenData->windows[2], PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gNamingScreenData->windows[2], PIXEL_FILL(1)); for (i = 0; i < maxChars; i++) { @@ -1704,9 +1704,9 @@ static const struct TextColorThing sUnkColorStruct = static const u8 sFillValues[3] = { - PALETTE_NUM_TO_FILL_VALUE(0xE), - PALETTE_NUM_TO_FILL_VALUE(0xD), - PALETTE_NUM_TO_FILL_VALUE(0xF) + PIXEL_FILL(0xE), + PIXEL_FILL(0xD), + PIXEL_FILL(0xF) }; static const u8 *const sUnkColors[3] = @@ -1768,7 +1768,7 @@ static void sub_80E4EF0(void) { const u8 color[3] = { 15, 1, 2 }; - FillWindowPixelBuffer(gNamingScreenData->windows[4], PALETTE_NUM_TO_FILL_VALUE(15)); + FillWindowPixelBuffer(gNamingScreenData->windows[4], PIXEL_FILL(15)); AddTextPrinterParameterized3(gNamingScreenData->windows[4], 0, 2, 1, color, 0, gText_MoveOkBack); PutWindowTilemap(gNamingScreenData->windows[4]); CopyWindowToVram(gNamingScreenData->windows[4], 3); diff --git a/src/option_menu.c b/src/option_menu.c index 94bbef3063..1766f0bdbe 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -620,7 +620,7 @@ static void ButtonMode_DrawChoices(u8 selection) static void DrawTextOption(void) { - FillWindowPixelBuffer(WIN_TEXT_OPTION, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(WIN_TEXT_OPTION, PIXEL_FILL(1)); AddTextPrinterParameterized(WIN_TEXT_OPTION, 1, gText_Option, 8, 1, TEXT_SPEED_FF, NULL); CopyWindowToVram(WIN_TEXT_OPTION, 3); } @@ -629,7 +629,7 @@ static void DrawOptionMenuTexts(void) { u8 i; - FillWindowPixelBuffer(WIN_OPTIONS, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(WIN_OPTIONS, PIXEL_FILL(1)); for (i = 0; i < MENUITEM_COUNT; i++) { AddTextPrinterParameterized(WIN_OPTIONS, 1, sOptionMenuItemsNames[i], 8, (i * 16) + 1, TEXT_SPEED_FF, NULL); diff --git a/src/party_menu.c b/src/party_menu.c index 03e267e74f..23e4361bcc 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -3108,7 +3108,7 @@ static void sub_81B239C(u8 a) } DeactivateAllTextPrinters(); for (i = 0; i < PARTY_SIZE; i++) - FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(i, PIXEL_FILL(0)); LoadUserWindowBorderGfx(0, 0x4F, 0xD0); LoadPalette(GetOverworldTextboxPalettePtr(), 0xE0, 0x20); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); @@ -3126,7 +3126,7 @@ static void sub_81B2428(bool8 a) if (a == TRUE) { firstWindowId = AddWindow(&gUnknown_08615918); - FillWindowPixelBuffer(firstWindowId, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(firstWindowId, PIXEL_FILL(0)); mainOffset = GetStringCenterAlignXOffset(0, gMenuText_Confirm, 48); AddTextPrinterParameterized4(firstWindowId, 0, mainOffset, 1, 0, 0, gUnknown_086157FC[0], -1, gMenuText_Confirm); PutWindowTilemap(firstWindowId); @@ -3139,7 +3139,7 @@ static void sub_81B2428(bool8 a) windowId = AddWindow(&gUnknown_08615908); offset = 3; } - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(0)); if (gUnknown_0203CEC8.unk8_0 != 10) { mainOffset = GetStringCenterAlignXOffset(0, gText_Cancel, 48); diff --git a/src/player_pc.c b/src/player_pc.c index c088a6ce7f..6e78533e7a 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -977,7 +977,7 @@ static void sub_816BEF0(s32 id) description = (u8 *)ItemId_GetDescription(gSaveBlock1Ptr->pcItems[id].itemId); else description = ItemStorage_GetItemPcResponse(ITEMPC_GO_BACK_TO_PREV); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); AddTextPrinterParameterized(windowId, 1, description, 0, 1, 0, NULL); } @@ -1005,7 +1005,7 @@ static void sub_816BFE0(u8 y, u8 b, u8 speed) { u8 windowId = gUnknown_0203BCC4->windowIds[0]; if (b == 0xFF) - FillWindowPixelRect(windowId, PALETTE_NUM_TO_FILL_VALUE(1), 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); + FillWindowPixelRect(windowId, PIXEL_FILL(1), 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); else AddTextPrinterParameterized4(windowId, 1, 0, y, 0, 0, gUnknown_085DFF8C, speed, gText_SelectorArrow2); } @@ -1123,7 +1123,7 @@ static const u8* ItemStorage_GetItemPcResponse(u16 itemId) static void ItemStorage_PrintItemPcResponse(const u8 *string) { u8 windowId = gUnknown_0203BCC4->windowIds[1]; - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); StringExpandPlaceholders(gStringVar4, string); AddTextPrinterParameterized(windowId, 1, gStringVar4, 0, 1, 0, NULL); } diff --git a/src/pokeblock.c b/src/pokeblock.c index 4bd4a8ccb1..2682754aa2 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -665,7 +665,7 @@ static void HandleInitWindows(void) for (i = 0; i < ARRAY_COUNT(sWindowTemplatesForPokeblockMenu) - 1; i++) { - FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(i, PIXEL_FILL(0)); } schedule_bg_copy_tilemap_to_vram(0); @@ -749,7 +749,7 @@ static void sub_8135FCC(s32 pkblId) struct Pokeblock *pokeblock; u16 rectTilemapSrc[2]; - FillWindowPixelBuffer(7, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(7, PIXEL_FILL(0)); if (pkblId != LIST_B_PRESSED) { diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index 908aec1c09..d72a9ffbe2 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -704,7 +704,7 @@ static void HandleInitWindows(void) DeactivateAllTextPrinters(); LoadUserWindowBorderGfx(0, 1, 0xE0); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); PutWindowTilemap(0); schedule_bg_copy_tilemap_to_vram(0); } diff --git a/src/pokedex.c b/src/pokedex.c index f54fdbd295..4bf8dff6db 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -2152,7 +2152,7 @@ static void CreateCaughtBall(u16 a, u8 x, u8 y, u16 unused) if (a) BlitBitmapToWindow(0, gUnknown_0855D2BE, x * 8, y * 8, 8, 16); else - FillWindowPixelRect(0, PALETTE_NUM_TO_FILL_VALUE(0), x * 8, y * 8, 8, 16); + FillWindowPixelRect(0, PIXEL_FILL(0), x * 8, y * 8, 8, 16); } static u8 CreateMonName(u16 num, u8 left, u8 top) @@ -2170,7 +2170,7 @@ static u8 CreateMonName(u16 num, u8 left, u8 top) void sub_80BD28C(u8 x, u8 y, u16 unused) { - FillWindowPixelRect(0, PALETTE_NUM_TO_FILL_VALUE(0), x * 8, y * 8, 0x60, 16); + FillWindowPixelRect(0, PIXEL_FILL(0), x * 8, y * 8, 0x60, 16); } static void CreateInitialPokemonSprites(u16 selectedMon, u16 b) @@ -2927,7 +2927,7 @@ void sub_80BEA24(u8 taskId) case 1: DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); CopyToBgTilemapBuffer(3, gPokedexTilemap_DescriptionScreen, 0, 0); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); PutWindowTilemap(0); PutWindowTilemap(1); sub_80C0D30(1, sPokedexListItem->dexNum); @@ -3222,7 +3222,7 @@ void sub_80BF250(u8 taskId) case 1: DecompressAndLoadBgGfxUsingHeap(3, &gPokedexMenu_Gfx, 0x2000, 0, 0); CopyToBgTilemapBuffer(3, &gPokedexTilemap_CryScreen, 0, 0); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); PutWindowTilemap(0); PutWindowTilemap(3); PutWindowTilemap(2); @@ -3416,7 +3416,7 @@ void sub_80BF82C(u8 taskId) case 1: DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); CopyToBgTilemapBuffer(3, gPokedexTilemap_SizeScreen, 0, 0); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); PutWindowTilemap(0); gMain.state++; break; @@ -3766,7 +3766,7 @@ void sub_80BFE38(u8 taskId) case 1: DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); CopyToBgTilemapBuffer(3, gPokedexTilemap_DescriptionScreen, 0, 0); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); PutWindowTilemap(0); PutWindowTilemap(1); sub_80C0D30(1, gTasks[taskId].data[1]); @@ -4784,7 +4784,7 @@ void sub_80C1270(const u8 *str, u32 left, u32 top) void sub_80C12B0(u32 x, u32 y, u32 width, u32 height) { - FillWindowPixelRect(0, PALETTE_NUM_TO_FILL_VALUE(0), x, y, width, height); + FillWindowPixelRect(0, PIXEL_FILL(0), x, y, width, height); } void sub_80C12E0(u8 taskId) diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index d18077f21e..9681b72f48 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -1552,7 +1552,7 @@ void sub_80C6D80(const u8 *string, void *dst, u8 arg2, u8 arg3, s32 arg4) winTemplate.width = 24; winTemplate.height = 2; windowId = AddWindow(&winTemplate); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(arg3)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(arg3)); tileData1 = (u8*) GetWindowAttribute(windowId, WINDOW_TILE_DATA); tileData2 = (winTemplate.width * 32) + tileData1; @@ -1599,7 +1599,7 @@ void sub_80C6EAC(const u8 *string, void *dst, u16 arg2, u8 arg3, u8 clr2, u8 clr winTemplate.height = 2; var = winTemplate.width * 32; windowId = AddWindow(&winTemplate); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(arg3)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(arg3)); tileData1 = (u8*) GetWindowAttribute(windowId, WINDOW_TILE_DATA); tileData2 = (winTemplate.width * 32) + tileData1; txtColor[0] = arg3; @@ -1737,7 +1737,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) CreatePCMenu(task->data[1], &task->data[15]); sub_81973A4(); DrawDialogueFrame(0, 0); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, TEXT_SPEED_FF, NULL, 2, 1, 3); CopyWindowToVram(0, 3); CopyWindowToVram(task->data[15], 3); @@ -1763,7 +1763,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) if (task->data[1] != task->data[3]) { task->data[1] = task->data[3]; - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3); } break; @@ -1778,13 +1778,13 @@ static void Task_PokemonStorageSystemPC(u8 taskId) default: if (task->data[2] == 0 && CountPartyMons() == PARTY_SIZE) { - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 1, gText_PartyFull, 0, NULL, 2, 1, 3); task->data[0] = 3; } else if (task->data[2] == 1 && CountPartyMons() == 1) { - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 1, gText_JustOnePkmn, 0, NULL, 2, 1, 3); task->data[0] = 3; } @@ -1799,7 +1799,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) case 3: if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3); task->data[0] = 2; } @@ -1809,7 +1809,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) task->data[1] = 4; Menu_MoveCursor(-1); task->data[1] = Menu_GetCursorPos(); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3); task->data[0] = 2; } @@ -1819,7 +1819,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) task->data[1] = 0; Menu_MoveCursor(1); task->data[1] = Menu_GetCursorPos(); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3); task->data[0] = 2; } @@ -2103,7 +2103,7 @@ static void sub_80C7BE4(void) winTemplate.height = 4; windowId = AddWindow(&winTemplate); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(4)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(4)); center = GetStringCenterAlignXOffset(1, boxName, 64); AddTextPrinterParameterized3(windowId, 1, center, 1, gUnknown_08571734, TEXT_SPEED_FF, boxName); @@ -4107,7 +4107,7 @@ static void LoadCursorMonGfx(u16 species, u32 pid) static void PrintCursorMonInfo(void) { - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) { AddTextPrinterParameterized(0, 1, sPSSData->cursorMonNickText, 6, 0, TEXT_SPEED_FF, NULL); @@ -4416,7 +4416,7 @@ static void PrintStorageActionText(u8 id) } DynamicPlaceholderTextUtil_ExpandPlaceholders(sPSSData->field_2190, gPCStorageActionTexts[id].text); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(1, PIXEL_FILL(1)); AddTextPrinterParameterized(1, 1, sPSSData->field_2190, 0, 1, TEXT_SPEED_FF, NULL); sub_8098858(1, 2, 14); PutWindowTilemap(1); @@ -8835,7 +8835,7 @@ static bool8 sub_80D0164(void) sPSSData->field_2200 = AddWindow8Bit(&gUnknown_0857BB1C); if (sPSSData->field_2200 != 0xFF) { - FillWindowPixelBuffer(sPSSData->field_2200, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(sPSSData->field_2200, PIXEL_FILL(0)); return TRUE; } } @@ -8892,7 +8892,7 @@ static bool8 sub_80D024C(void) ChangeBgX(0, -1024, 0); ChangeBgY(0, -1024, 0); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); - FillWindowPixelBuffer8Bit(sPSSData->field_2200, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer8Bit(sPSSData->field_2200, PIXEL_FILL(0)); sub_80D07B0(sMoveMonsPtr->fromRow, sMoveMonsPtr->fromColumn); SetBgAttribute(0, BG_ATTR_PALETTEMODE, 1); PutWindowTilemap(sPSSData->field_2200); @@ -9194,7 +9194,7 @@ static void sub_80D0834(u8 arg0, u8 arg1) if (species != SPECIES_NONE) { FillWindowPixelRect8Bit(sPSSData->field_2200, - PALETTE_NUM_TO_FILL_VALUE(0), + PIXEL_FILL(0), 24 * arg0, 24 * arg1, 32, @@ -9911,7 +9911,7 @@ static void PrintItemDescription(void) else description = ItemId_GetDescription(sPSSData->cursorMonItem); - FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(2, PIXEL_FILL(1)); AddTextPrinterParameterized5(2, 1, description, 4, 0, 0, NULL, 0, 1); } diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index f0c68e7d0e..91e3441234 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -2629,7 +2629,7 @@ static void ResetWindows(void) for (i = 0; i < 20; i++) { - FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(i, PIXEL_FILL(0)); } for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++) { @@ -2644,9 +2644,9 @@ static void SummaryScreen_PrintTextOnWindow(u8 windowId, const u8 *string, u8 x, static void sub_81C25E8(void) { - FillWindowPixelBuffer(17, PALETTE_NUM_TO_FILL_VALUE(0)); - FillWindowPixelBuffer(18, PALETTE_NUM_TO_FILL_VALUE(0)); - FillWindowPixelBuffer(19, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(17, PIXEL_FILL(0)); + FillWindowPixelBuffer(18, PIXEL_FILL(0)); + FillWindowPixelBuffer(19, PIXEL_FILL(0)); if (!pssData->summary.isEgg) sub_81C2628(); else @@ -2898,7 +2898,7 @@ static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 te if (*windowIdPtr == 0xFF) { *windowIdPtr = AddWindow(&template[templateId]); - FillWindowPixelBuffer(*windowIdPtr, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(*windowIdPtr, PIXEL_FILL(0)); } return *windowIdPtr; } @@ -2920,7 +2920,7 @@ static void PrintPageSpecificText(u8 pageIndex) for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++) { if (pssData->windowIds[i] != 0xFF) - FillWindowPixelBuffer(pssData->windowIds[i], PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(pssData->windowIds[i], PIXEL_FILL(0)); } sTextPrinterFunctions[pageIndex](); } @@ -3469,7 +3469,7 @@ static void PrintMovePowerAndAccuracy(u16 moveIndex) const u8 *text; if (moveIndex != 0) { - FillWindowPixelRect(14, PALETTE_NUM_TO_FILL_VALUE(0), 53, 0, 19, 32); + FillWindowPixelRect(14, PIXEL_FILL(0), 53, 0, 19, 32); if (gBattleMoves[moveIndex].power < 2) { @@ -3567,7 +3567,7 @@ static void PrintContestMoveDescription(u8 moveSlot) static void PrintMoveDetails(u16 move) { u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 2); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(0)); if (move != MOVE_NONE) { if (pssData->currPageIndex == 2) @@ -3619,7 +3619,7 @@ static void PrintNewMoveDetailsOrCancelText(void) static void sub_81C4064(void) { u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 0); - FillWindowPixelRect(windowId, PALETTE_NUM_TO_FILL_VALUE(0), 0, 66, 72, 16); + FillWindowPixelRect(windowId, PIXEL_FILL(0), 0, 66, 72, 16); CopyWindowToVram(windowId, 2); } @@ -3628,11 +3628,11 @@ static void sub_81C40A0(u8 moveIndex1, u8 moveIndex2) u8 windowId1 = AddWindowFromTemplateList(sPageMovesTemplate, 0); u8 windowId2 = AddWindowFromTemplateList(sPageMovesTemplate, 1); - FillWindowPixelRect(windowId1, PALETTE_NUM_TO_FILL_VALUE(0), 0, moveIndex1 * 16, 0x48, 0x10); - FillWindowPixelRect(windowId1, PALETTE_NUM_TO_FILL_VALUE(0), 0, moveIndex2 * 16, 0x48, 0x10); + FillWindowPixelRect(windowId1, PIXEL_FILL(0), 0, moveIndex1 * 16, 0x48, 0x10); + FillWindowPixelRect(windowId1, PIXEL_FILL(0), 0, moveIndex2 * 16, 0x48, 0x10); - FillWindowPixelRect(windowId2, PALETTE_NUM_TO_FILL_VALUE(0), 0, moveIndex1 * 16, 0x30, 0x10); - FillWindowPixelRect(windowId2, PALETTE_NUM_TO_FILL_VALUE(0), 0, moveIndex2 * 16, 0x30, 0x10); + FillWindowPixelRect(windowId2, PIXEL_FILL(0), 0, moveIndex1 * 16, 0x30, 0x10); + FillWindowPixelRect(windowId2, PIXEL_FILL(0), 0, moveIndex2 * 16, 0x30, 0x10); PrintMoveNameAndPP(moveIndex1); PrintMoveNameAndPP(moveIndex2); @@ -3641,7 +3641,7 @@ static void sub_81C40A0(u8 moveIndex1, u8 moveIndex2) static void PrintHMMovesCantBeForgotten(void) { u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 2); - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(0)); SummaryScreen_PrintTextOnWindow(windowId, gText_HMMovesCantBeForgotten2, 6, 1, 0, 0); } diff --git a/src/pokenav.c b/src/pokenav.c index 05aa559ece..217d98132f 100644 --- a/src/pokenav.c +++ b/src/pokenav.c @@ -1138,8 +1138,8 @@ bool32 IsDma3ManagerBusyWithBgCopy_(void) void sub_81C7BF8(u32 windowId) { - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(4)); - FillWindowPixelRect(windowId, PALETTE_NUM_TO_FILL_VALUE(5), 0, 0, 0x80, 1); + FillWindowPixelBuffer(windowId, PIXEL_FILL(4)); + FillWindowPixelRect(windowId, PIXEL_FILL(5), 0, 0, 0x80, 1); } void sub_81C7C28(void) diff --git a/src/region_map.c b/src/region_map.c index 6d5224821c..67cf9cc0fb 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1622,7 +1622,7 @@ void MCB2_FlyMap(void) case 7: LoadPalette(sRegionMapFramePal, 0x10, 0x20); PutWindowTilemap(2); - FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(2, PIXEL_FILL(0)); AddTextPrinterParameterized(2, 1, gText_FlyToWhere, 0, 1, 0, NULL); schedule_bg_copy_tilemap_to_vram(0); gMain.state++; @@ -1707,7 +1707,7 @@ static void sub_8124904(void) } else { - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); } AddTextPrinterParameterized(0, 1, sFlyMap->regionMap.mapSecName, 0, 1, 0, NULL); schedule_bg_copy_tilemap_to_vram(0); @@ -1721,7 +1721,7 @@ static void sub_8124904(void) ClearStdWindowAndFrameToTransparent(1, FALSE); DrawStdFrameWithCustomTileAndPalette(0, FALSE, 0x65, 0x0d); } - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); CopyWindowToVram(0, 2); schedule_bg_copy_tilemap_to_vram(0); gUnknown_03001180 = FALSE; diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 7e9e81e962..b06e5cd619 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -387,7 +387,7 @@ void nullsub_89(void) void sub_80124EC(u8 windowId, u8 arg1, u8 stringId) { - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); switch (arg1 << 8) { case 0x200: @@ -506,7 +506,7 @@ void sub_8012780(u8 taskId) } data->field_11 = AddWindow(&gUnknown_082F012C); - FillWindowPixelBuffer(data->field_10, PALETTE_NUM_TO_FILL_VALUE(2)); + FillWindowPixelBuffer(data->field_10, PIXEL_FILL(2)); sub_80173E0(data->field_10, 0, gUnknown_082EDBC4, 8, 1, 4); PutWindowTilemap(data->field_10); CopyWindowToVram(data->field_10, 2); @@ -1075,7 +1075,7 @@ void sub_80134E8(u8 taskId) data->listWindowId = AddWindow(&gUnknown_082F0174); data->field_D = AddWindow(&gUnknown_082F017C); - FillWindowPixelBuffer(data->field_C, PALETTE_NUM_TO_FILL_VALUE(2)); + FillWindowPixelBuffer(data->field_C, PIXEL_FILL(2)); sub_80173E0(data->field_C, 0, gUnknown_082EF7DC, 8, 1, 4); PutWindowTilemap(data->field_C); CopyWindowToVram(data->field_C, 2); @@ -2155,7 +2155,7 @@ void sub_8014F48(u8 taskId) data->listTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); sub_8018784(data->field_D); - FillWindowPixelBuffer(data->field_D, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(data->field_D, PIXEL_FILL(1)); PutWindowTilemap(data->field_D); sub_80125BC(data->field_D); CopyWindowToVram(data->field_D, 2); diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 1f0fe69c99..08f1938904 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -231,8 +231,8 @@ static void CB2_SaveFailedScreen(void) LoadPalette(gUnknown_0860F074, 0xF0, 0x20); DrawStdFrameWithCustomTileAndPalette(gSaveFailedWindowIds[TEXT_WIN_ID], FALSE, 0x214, 0xE); DrawStdFrameWithCustomTileAndPalette(gSaveFailedWindowIds[CLOCK_WIN_ID], FALSE, 0x214, 0xE); - FillWindowPixelBuffer(gSaveFailedWindowIds[CLOCK_WIN_ID], PALETTE_NUM_TO_FILL_VALUE(1)); // backwards? - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gSaveFailedWindowIds[CLOCK_WIN_ID], PIXEL_FILL(1)); // backwards? + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_FILL(1)); CopyWindowToVram(gSaveFailedWindowIds[CLOCK_WIN_ID], 2); // again? CopyWindowToVram(gSaveFailedWindowIds[TEXT_WIN_ID], 1); SaveFailedScreenTextPrint(gText_SaveFailedCheckingBackup, 1, 0); @@ -265,19 +265,19 @@ static void CB2_WipeSave(void) { if (WipeSectors(gDamagedSaveSectors) != FALSE) { - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_FILL(1)); SaveFailedScreenTextPrint(gText_BackupMemoryDamaged, 1, 0); SetMainCallback2(CB2_GameplayCannotBeContinued); return; } - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_FILL(1)); SaveFailedScreenTextPrint(gText_CheckCompleted, 1, 0); HandleSavingData(gSaveFailedType); if (gDamagedSaveSectors != 0) { - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_FILL(1)); SaveFailedScreenTextPrint(gText_SaveFailedCheckingBackup, 1, 0); } @@ -286,12 +286,12 @@ static void CB2_WipeSave(void) if (wipeTries == 3) { - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_FILL(1)); SaveFailedScreenTextPrint(gText_BackupMemoryDamaged, 1, 0); } else { - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_FILL(1)); if (gGameContinueCallback == NULL) SaveFailedScreenTextPrint(gText_SaveCompleteGameCannotContinue, 1, 0); @@ -308,7 +308,7 @@ static void CB2_GameplayCannotBeContinued(void) if (gMain.newKeys & A_BUTTON) { - FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gSaveFailedWindowIds[TEXT_WIN_ID], PIXEL_FILL(1)); SaveFailedScreenTextPrint(gText_GamePlayCannotBeContinued, 1, 0); SetVBlankCallback(VBlankCB); SetMainCallback2(CB2_FadeAndReturnToTitleScreen); diff --git a/src/scrcmd.c b/src/scrcmd.c index b42b3e5f7b..d60fb071ca 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1519,7 +1519,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) LoadUserWindowBorderGfx(gUnknown_03000F30, 0x214, 0xE0); DrawStdWindowFrame(gUnknown_03000F30, 0); PutWindowTilemap(gUnknown_03000F30); - FillWindowPixelBuffer(gUnknown_03000F30, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(gUnknown_03000F30, PIXEL_FILL(1)); AddTextPrinterParameterized(gUnknown_03000F30, 6, gStringVar4, xText, yText, 0xFF, 0x0); CopyWindowToVram(gUnknown_03000F30, 3); return FALSE; diff --git a/src/script_menu.c b/src/script_menu.c index 4091918037..afb1ef3126 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1639,27 +1639,27 @@ static void sub_80E2A94(u8 multichoiceId) switch (multichoiceId) { case 77: - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 1, gUnknown_0858BBAC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; case 76: - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 1, gUnknown_0858BB9C[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; case 78: - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 1, gUnknown_0858BBBC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; case 79: - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 1, gUnknown_0858BBCC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; case 75: - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 1, gUnknown_0858BBEC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; case 74: - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 1, gUnknown_0858BBE0[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; } diff --git a/src/shop.c b/src/shop.c index 55a7a20f76..e03e2ab0cd 100755 --- a/src/shop.c +++ b/src/shop.c @@ -545,7 +545,7 @@ static void BuyMenuPrintItemDescriptionAndShowItemIcon(int item, bool8 onInit, s description = gText_QuitShopping; } - FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(2, PIXEL_FILL(0)); BuyMenuPrint(2, description, 3, 1, 0, 0); } @@ -1144,7 +1144,7 @@ static void BuyMenuPrintItemQuantityAndPrice(u8 taskId) { s16 *data = gTasks[taskId].data; - FillWindowPixelBuffer(4, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(4, PIXEL_FILL(1)); PrintMoneyAmount(4, 38, 1, gShopDataPtr->totalCost, TEXT_SPEED_FF); ConvertIntToDecimalStringN(gStringVar1, tItemCount, 2, 2); StringExpandPlaceholders(gStringVar4, gText_xVar1); diff --git a/src/slot_machine.c b/src/slot_machine.c index 189bca80f4..759704f2b6 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -3036,7 +3036,7 @@ s16 sub_8102D5C(s16 a0) sub_81065DC(); AddWindow(&gUnknown_085A7444); PutWindowTilemap(1); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); task->data[0]++; } @@ -3052,7 +3052,7 @@ s16 sub_8102D5C(s16 a0) { if (gMain.newKeys & (B_BUTTON | SELECT_BUTTON)) { - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); ClearWindowTilemap(1); CopyWindowToVram(1, 1); RemoveWindow(1); diff --git a/src/start_menu.c b/src/start_menu.c index 94b1c79fce..1be530d3cb 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1232,7 +1232,7 @@ static void sub_80A0550(u8 taskId) switch (*step) { case 0: - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 1, gText_SavingDontTurnOffPower, diff --git a/src/starter_choose.c b/src/starter_choose.c index 3ffc8e2860..4ed53539fe 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -523,7 +523,7 @@ static void Task_StarterChoose3(u8 taskId) static void Task_StarterChoose4(u8 taskId) { PlayCry1(GetStarterPokemon(gTasks[taskId].tStarterSelection), 0); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized(0, 1, gText_ConfirmStarterChoice, 0, 1, 0, NULL); schedule_bg_copy_tilemap_to_vram(0); CreateYesNoMenu(&gUnknown_085B1DDC, 0x2A8, 0xD, 0); @@ -579,7 +579,7 @@ static void CreateStarterPokemonLabel(u8 selection) winTemplate.tilemapTop = gStarterChoose_LabelCoords[selection][1]; sStarterChooseWindowId = AddWindow(&winTemplate); - FillWindowPixelBuffer(sStarterChooseWindowId, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(sStarterChooseWindowId, PIXEL_FILL(0)); width = GetStringCenterAlignXOffset(7, text, 0x68); AddTextPrinterParameterized3(sStarterChooseWindowId, 7, width, 1, gUnknown_085B1E0C, 0, text); @@ -600,7 +600,7 @@ static void CreateStarterPokemonLabel(u8 selection) static void sub_8134604(void) { - FillWindowPixelBuffer(sStarterChooseWindowId, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(sStarterChooseWindowId, PIXEL_FILL(0)); ClearWindowTilemap(sStarterChooseWindowId); RemoveWindow(sStarterChooseWindowId); sStarterChooseWindowId = 0xFF; diff --git a/src/text.c b/src/text.c index dc28d71c89..2d286992d2 100644 --- a/src/text.c +++ b/src/text.c @@ -1581,7 +1581,7 @@ u16 RenderText(struct TextPrinter *textPrinter) textPrinter->printerTemplate.currentChar++; return 2; case 15: - FillWindowPixelBuffer(textPrinter->printerTemplate.windowId, PALETTE_NUM_TO_FILL_VALUE(textPrinter->printerTemplate.bgColor)); + FillWindowPixelBuffer(textPrinter->printerTemplate.windowId, PIXEL_FILL(textPrinter->printerTemplate.bgColor)); textPrinter->printerTemplate.currentX = textPrinter->printerTemplate.x; textPrinter->printerTemplate.currentY = textPrinter->printerTemplate.y; return 2; @@ -1702,7 +1702,7 @@ u16 RenderText(struct TextPrinter *textPrinter) case 2: if (TextPrinterWaitWithDownArrow(textPrinter)) { - FillWindowPixelBuffer(textPrinter->printerTemplate.windowId, PALETTE_NUM_TO_FILL_VALUE(textPrinter->printerTemplate.bgColor)); + FillWindowPixelBuffer(textPrinter->printerTemplate.windowId, PIXEL_FILL(textPrinter->printerTemplate.bgColor)); textPrinter->printerTemplate.currentX = textPrinter->printerTemplate.x; textPrinter->printerTemplate.currentY = textPrinter->printerTemplate.y; textPrinter->state = 0; @@ -1724,12 +1724,12 @@ u16 RenderText(struct TextPrinter *textPrinter) int speed = gWindowVerticalScrollSpeeds[scrollSpeed]; if (textPrinter->scrollDistance < speed) { - ScrollWindow(textPrinter->printerTemplate.windowId, 0, textPrinter->scrollDistance, PALETTE_NUM_TO_FILL_VALUE(textPrinter->printerTemplate.bgColor)); + ScrollWindow(textPrinter->printerTemplate.windowId, 0, textPrinter->scrollDistance, PIXEL_FILL(textPrinter->printerTemplate.bgColor)); textPrinter->scrollDistance = 0; } else { - ScrollWindow(textPrinter->printerTemplate.windowId, 0, speed, PALETTE_NUM_TO_FILL_VALUE(textPrinter->printerTemplate.bgColor)); + ScrollWindow(textPrinter->printerTemplate.windowId, 0, speed, PIXEL_FILL(textPrinter->printerTemplate.bgColor)); textPrinter->scrollDistance -= speed; } CopyWindowToVram(textPrinter->printerTemplate.windowId, 2); diff --git a/src/trade.c b/src/trade.c index 5595cee949..d74b7dfc38 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1418,7 +1418,7 @@ static void sub_80772A4(void) for (i = 0; i < 18; i++) { ClearWindowTilemap(i); - FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(i, PIXEL_FILL(0)); } FillBgTilemapBufferRect(0, 0, 0, 0, 30, 20, 15); @@ -2461,7 +2461,7 @@ static void sub_8078DBC(void) if (gUnknown_0203229C->tradeMenuCursorPosition < 6) { sub_8098858(1, 1, 14); - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(1, PIXEL_FILL(1)); PrintMenuTable(1, 2, gUnknown_0832DEAC); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(1, 2, 0); PutWindowTilemap(1); @@ -2724,7 +2724,7 @@ static void sub_8079408(void) for (i = 0; i < 4; i++) { - FillWindowPixelBuffer(i + 14, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(i + 14, PIXEL_FILL(0)); rbox_fill_rectangle(i + 14); } @@ -3256,7 +3256,7 @@ static void sub_807A0C4(void) static void sub_807A19C(u8 a0) { - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(1)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized(0, 1, gUnknown_0832DEBC[a0], 0, 1, TEXT_SPEED_FF, NULL); sub_8098858(0, 20, 12); PutWindowTilemap(0); @@ -4185,7 +4185,7 @@ void sub_807B140(void) void sub_807B154(void) { - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(15)); + FillWindowPixelBuffer(0, PIXEL_FILL(15)); PutWindowTilemap(0); CopyWindowToVram(0, 3); } @@ -4263,7 +4263,7 @@ static void sub_807B270(void) break; case 8: sub_807ACFC(1, 1); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(15)); + FillWindowPixelBuffer(0, PIXEL_FILL(15)); PutWindowTilemap(0); CopyWindowToVram(0, 3); gMain.state++; @@ -4654,7 +4654,7 @@ static bool8 sub_807BBEC(void) if (!gPaletteFade.active) { sub_807B62C(4); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(15)); + FillWindowPixelBuffer(0, PIXEL_FILL(15)); CopyWindowToVram(0, 3); gUnknown_020322A0->state++; } @@ -5146,7 +5146,7 @@ static bool8 sub_807CFC8(void) if (!gPaletteFade.active) { sub_807B62C(4); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(15)); + FillWindowPixelBuffer(0, PIXEL_FILL(15)); CopyWindowToVram(0, 3); gUnknown_020322A0->state++; } @@ -6085,7 +6085,7 @@ void sub_807F19C(void) void sub_807F1A8(u8 windowId, const u8 *str, u8 speed) { - FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(15)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(15)); gUnknown_020322A0->unk_F6[0] = 15; gUnknown_020322A0->unk_F6[1] = 1; gUnknown_020322A0->unk_F6[2] = 6; diff --git a/src/trainer_card.c b/src/trainer_card.c index 8d244d6563..4a33855594 100755 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -350,7 +350,7 @@ static void sub_80C2760(u8 taskId) case 0: if (!IsDma3ManagerBusyWithBgCopy()) { - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); sData->var_0++; } break; @@ -363,7 +363,7 @@ static void sub_80C2760(u8 taskId) sData->var_0++; break; case 3: - FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(2, PIXEL_FILL(0)); sub_80C4FF0(); sub_80C438C(2); sData->var_0++; @@ -1103,7 +1103,7 @@ static void PrintTimeOnCard(void) r10 = width + 30; r7 -= r10; - FillWindowPixelRect(1, PALETTE_NUM_TO_FILL_VALUE(0), r7, r4, r10, 15); + FillWindowPixelRect(1, PIXEL_FILL(0), r7, r4, r10, 15); ConvertIntToDecimalStringN(gStringVar4, hours, 1, 3); AddTextPrinterParameterized3(1, 1, r7, r4, gUnknown_0856FB0C, TEXT_SPEED_FF, gStringVar4); r7 += 18; @@ -1634,7 +1634,7 @@ static bool8 sub_80C4B08(struct Task* task) switch (sData->var_4) { case 0: - FillWindowPixelBuffer(1, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); FillBgTilemapBufferRect_Palette0(3, 0, 0, 0, 0x20, 0x20); break; case 1: @@ -1659,7 +1659,7 @@ static bool8 sub_80C4B08(struct Task* task) if (!sData->var_8) sub_80C474C(); else - FillWindowPixelBuffer(2, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(2, PIXEL_FILL(0)); break; case 4: if (sData->var_8) diff --git a/src/trainer_hill.c b/src/trainer_hill.c index 2873fdf8f5..bf8482d69c 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -609,7 +609,7 @@ void PrintOnTrainerHillRecordsWindow(void) u32 total, minutes, secondsWhole, secondsFraction; SetUpDataStruct(); - FillWindowPixelBuffer(0, PALETTE_NUM_TO_FILL_VALUE(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); x = GetStringCenterAlignXOffset(1, gText_TimeBoard, 0xD0); AddTextPrinterParameterized3(0, 1, x, 2, sRecordWinColors, TEXT_SPEED_FF, gText_TimeBoard); diff --git a/src/unk_text_util_2.c b/src/unk_text_util_2.c index 6fbe6d04f5..03e049d72c 100644 --- a/src/unk_text_util_2.c +++ b/src/unk_text_util_2.c @@ -114,7 +114,7 @@ u16 Font6Func(struct TextPrinter *textPrinter) textPrinter->printerTemplate.currentY = textPrinter->printerTemplate.y + *textPrinter->printerTemplate.currentChar++; return 2; case 15: - FillWindowPixelBuffer(textPrinter->printerTemplate.windowId, PALETTE_NUM_TO_FILL_VALUE(textPrinter->printerTemplate.bgColor)); + FillWindowPixelBuffer(textPrinter->printerTemplate.windowId, PIXEL_FILL(textPrinter->printerTemplate.bgColor)); return 2; } break; @@ -146,7 +146,7 @@ u16 Font6Func(struct TextPrinter *textPrinter) case 2: if (TextPrinterWaitWithDownArrow(textPrinter)) { - FillWindowPixelBuffer(textPrinter->printerTemplate.windowId, PALETTE_NUM_TO_FILL_VALUE(textPrinter->printerTemplate.bgColor)); + FillWindowPixelBuffer(textPrinter->printerTemplate.windowId, PIXEL_FILL(textPrinter->printerTemplate.bgColor)); textPrinter->printerTemplate.currentX = textPrinter->printerTemplate.x; textPrinter->printerTemplate.currentY = textPrinter->printerTemplate.y; textPrinter->state = 0; @@ -166,12 +166,12 @@ u16 Font6Func(struct TextPrinter *textPrinter) { if (textPrinter->scrollDistance < sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed]) { - ScrollWindow(textPrinter->printerTemplate.windowId, 0, textPrinter->scrollDistance, PALETTE_NUM_TO_FILL_VALUE(textPrinter->printerTemplate.bgColor)); + ScrollWindow(textPrinter->printerTemplate.windowId, 0, textPrinter->scrollDistance, PIXEL_FILL(textPrinter->printerTemplate.bgColor)); textPrinter->scrollDistance = 0; } else { - ScrollWindow(textPrinter->printerTemplate.windowId, 0, sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed], PALETTE_NUM_TO_FILL_VALUE(textPrinter->printerTemplate.bgColor)); + ScrollWindow(textPrinter->printerTemplate.windowId, 0, sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed], PIXEL_FILL(textPrinter->printerTemplate.bgColor)); textPrinter->scrollDistance -= sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed]; } CopyWindowToVram(textPrinter->printerTemplate.windowId, 2); From 4907ce6f7f5e8d73c32f6d8746ba64465502df03 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 3 Mar 2019 02:50:40 -0500 Subject: [PATCH 166/217] Fully document move_tutor (formerly learn_move) --- asm/rom_81D1C44.s | 60 +- data/rom_81D1C44.s | 31 +- include/field_screen_effect.h | 2 +- include/list_menu.h | 2 +- include/{learn_move.h => move_tutor.h} | 2 +- include/pokenav.h | 10 +- include/strings.h | 16 +- ld_script.txt | 4 +- src/battle_pyramid_bag.c | 12 +- src/decoration.c | 2 +- src/egg_hatch.c | 2 +- src/field_screen_effect.c | 26 +- src/field_specials.c | 6 +- src/item_menu.c | 4 +- src/learn_move.c | 833 --------------------- src/list_menu.c | 4 +- src/move_tutor.c | 976 +++++++++++++++++++++++++ src/overworld.c | 2 +- src/party_menu.c | 2 +- src/player_pc.c | 6 +- src/pokeblock.c | 10 +- src/roulette.c | 2 +- src/secret_base.c | 4 +- src/shop.c | 2 +- src/strings.c | 16 +- src/trade.c | 2 +- src/walda_phrase.c | 2 +- sym_ewram.txt | 2 +- 28 files changed, 1090 insertions(+), 952 deletions(-) rename include/{learn_move.h => move_tutor.h} (76%) delete mode 100644 src/learn_move.c create mode 100644 src/move_tutor.c diff --git a/asm/rom_81D1C44.s b/asm/rom_81D1C44.s index a9ef8e4f20..df17e6ae07 100644 --- a/asm/rom_81D1C44.s +++ b/asm/rom_81D1C44.s @@ -1579,12 +1579,12 @@ _081D2800: .pool thumb_func_end sub_81D2754 - thumb_func_start sub_81D2824 -sub_81D2824: @ 81D2824 + thumb_func_start InitMoveTutorWindows +InitMoveTutorWindows: @ 81D2824 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, =gUnknown_08625510 + ldr r0, =gMoveTutorWindowTemplates bl InitWindows bl DeactivateAllTextPrinters movs r0, 0 @@ -1645,21 +1645,21 @@ _081D288E: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_81D2824 + thumb_func_end InitMoveTutorWindows thumb_func_start nullsub_79 nullsub_79: @ 81D28C4 bx lr thumb_func_end nullsub_79 - thumb_func_start sub_81D28C8 -sub_81D28C8: @ 81D28C8 + thumb_func_start LoadMoveTutorMovesList +LoadMoveTutorMovesList: @ 81D28C8 push {r4-r7,lr} lsls r1, 16 lsrs r4, r1, 16 ldr r3, =gMultiuseListMenuTemplate adds r2, r3, 0 - ldr r1, =gUnknown_08625548 + ldr r1, =gMoveTutorMovesListTemplate ldm r1!, {r5-r7} stm r2!, {r5-r7} ldm r1!, {r5-r7} @@ -1679,10 +1679,10 @@ _081D28F4: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_81D28C8 + thumb_func_end LoadMoveTutorMovesList - thumb_func_start sub_81D28FC -sub_81D28FC: @ 81D28FC + thumb_func_start MoveTutorLoadBattleMoveDescription +MoveTutorLoadBattleMoveDescription: @ 81D28FC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1884,16 +1884,16 @@ _081D2AB6: pop {r0} bx r0 .pool - thumb_func_end sub_81D28FC + thumb_func_end MoveTutorLoadBattleMoveDescription - thumb_func_start sub_81D2ACC -sub_81D2ACC: @ 81D2ACC + thumb_func_start MoveTutorMenuLoadContestMoveDescription +MoveTutorMenuLoadContestMoveDescription: @ 81D2ACC push {r4-r7,lr} mov r7, r8 push {r7} sub sp, 0xC adds r4, r0, 0 - bl ShowHideHearts + bl MoveTutorShowHideHearts movs r0, 0x1 movs r1, 0x11 bl FillWindowPixelBuffer @@ -1997,10 +1997,10 @@ _081D2BB8: pop {r0} bx r0 .pool - thumb_func_end sub_81D2ACC + thumb_func_end MoveTutorMenuLoadContestMoveDescription - thumb_func_start sub_81D2BD0 -sub_81D2BD0: @ 81D2BD0 + thumb_func_start MoveTutorCursorCallback +MoveTutorCursorCallback: @ 81D2BD0 push {r4,lr} adds r4, r0, 0 lsls r1, 24 @@ -2011,16 +2011,16 @@ sub_81D2BD0: @ 81D2BD0 bl PlaySE _081D2BE2: adds r0, r4, 0 - bl sub_81D28FC + bl MoveTutorLoadBattleMoveDescription adds r0, r4, 0 - bl sub_81D2ACC + bl MoveTutorMenuLoadContestMoveDescription pop {r4} pop {r0} bx r0 - thumb_func_end sub_81D2BD0 + thumb_func_end MoveTutorCursorCallback - thumb_func_start sub_81D2BF4 -sub_81D2BF4: @ 81D2BF4 + thumb_func_start MoveTutorPrintText +MoveTutorPrintText: @ 81D2BF4 push {r4,lr} sub sp, 0x10 adds r4, r0, 0 @@ -2052,10 +2052,10 @@ sub_81D2BF4: @ 81D2BF4 pop {r0} bx r0 .pool - thumb_func_end sub_81D2BF4 + thumb_func_end MoveTutorPrintText - thumb_func_start sub_81D2C3C -sub_81D2C3C: @ 81D2C3C + thumb_func_start MoveTutorRunTextPrinters +MoveTutorRunTextPrinters: @ 81D2C3C push {lr} bl RunTextPrinters movs r0, 0x3 @@ -2064,12 +2064,12 @@ sub_81D2C3C: @ 81D2C3C lsrs r0, 16 pop {r1} bx r1 - thumb_func_end sub_81D2C3C + thumb_func_end MoveTutorRunTextPrinters - thumb_func_start sub_81D2C50 -sub_81D2C50: @ 81D2C50 + thumb_func_start MoveTutorCreateYesNoMenu +MoveTutorCreateYesNoMenu: @ 81D2C50 push {lr} - ldr r0, =gUnknown_08625540 + ldr r0, =gMoveTutorYesNoMenuTemplate movs r1, 0x1 movs r2, 0xE movs r3, 0 @@ -2077,7 +2077,7 @@ sub_81D2C50: @ 81D2C50 pop {r0} bx r0 .pool - thumb_func_end sub_81D2C50 + thumb_func_end MoveTutorCreateYesNoMenu thumb_func_start sub_81D2C68 sub_81D2C68: @ 81D2C68 diff --git a/data/rom_81D1C44.s b/data/rom_81D1C44.s index 9a012a6a71..f9bd20bad7 100644 --- a/data/rom_81D1C44.s +++ b/data/rom_81D1C44.s @@ -23,27 +23,22 @@ gUnknown_08625404:: @ 8625404 gUnknown_08625410:: @ 8625410 .byte 4, 5, 6, 7, 8, 9, 9, 0xA, 0xA, 0xB, 0xB, 0xC, 0xC, 0xD, 0xD, 0xD, 0xD, 0xE, 0xE, 0xE, 0xE, 0xF, 0xF, 0xF, 0xF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23 -gUnknown_08625510:: @ 8625510 - .4byte 0x10010101 - .4byte 0xA0F0C - .4byte 0x10010101 - .4byte 0xCA0F0C - .4byte 0xA011301 - .4byte 0x18A0F0C - .4byte 0x160F0401 - .4byte 0x2020F04 - .4byte 0x5081600 - .4byte 0x25A0F04 - .4byte 0xFF - .4byte NULL +gMoveTutorWindowTemplates:: @ 8625510s + window_template 1, 1, 1, 16, 12, 0xF, 0x000A + window_template 1, 1, 1, 16, 12, 0xF, 0x00CA + window_template 1, 19, 1, 10, 12, 0xF, 0x018A + window_template 1, 4, 15, 22, 4, 0xF, 0x0202 + window_template 0, 22, 8, 5, 4, 0xF, 0x025A + null_window_template -gUnknown_08625540:: @ 8625540 - .4byte 0x5081600 - .4byte 0x25A0F04 +gMoveTutorYesNoMenuTemplate:: @ 8625540 + window_template 0, 22, 8, 5, 4, 0xF, 0x025A + @.4byte 0x5081600 + @.4byte 0x25A0F04 -gUnknown_08625548:: @ 8625548 +gMoveTutorMovesListTemplate:: @ 8625548 struct ListMenuTemplate .4byte NULL - .4byte sub_81D2BD0 + .4byte MoveTutorCursorCallback .4byte NULL .2byte 0 .2byte 0 diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index 2b8b3a5a3a..a1cf580cdd 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -5,7 +5,7 @@ void pal_fill_for_maplights(void); void pal_fill_black(void); void WarpFadeScreen(void); void sub_80AF128(void); -void sub_80AF168(void); +void FieldCallback_ReturnToEventScript2(void); void sub_80AF188(void); void sub_80AF214(void); void sub_80AF2B4(u8 taskId); diff --git a/include/list_menu.h b/include/list_menu.h index ef23688d85..a301e5b327 100644 --- a/include/list_menu.h +++ b/include/list_menu.h @@ -4,7 +4,7 @@ #include "window.h" #define LIST_NOTHING_CHOSEN -1 -#define LIST_B_PRESSED -2 +#define LIST_CANCEL -2 #define LIST_HEADER -3 #define LIST_NO_MULTIPLE_SCROLL 0 diff --git a/include/learn_move.h b/include/move_tutor.h similarity index 76% rename from include/learn_move.h rename to include/move_tutor.h index 542ae6a5af..e3e5da1d4b 100644 --- a/include/learn_move.h +++ b/include/move_tutor.h @@ -2,6 +2,6 @@ #define GUARD_LEARN_MOVE_H void TeachMoveTutorMove(void); -void ShowHideHearts(s32); +void MoveTutorShowHideHearts(s32); #endif //GUARD_LEARN_MOVE_H diff --git a/include/pokenav.h b/include/pokenav.h index e5dba8ae09..f80123757d 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -20,11 +20,11 @@ void sub_81D1EC0(void); void sub_81D1D04(u8); bool8 sub_81D1C44(u8); bool8 sub_81D4A58(struct EventObject*); -void sub_81D2BF4(u8 *); -u16 sub_81D2C3C(void); -void sub_81D2C50(void); -u8 sub_81D28C8(const struct ListMenuItem *items, u16 numChoices); -void sub_81D2824(u16); +void MoveTutorPrintText(u8 *); +u16 MoveTutorRunTextPrinters(void); +void MoveTutorCreateYesNoMenu(void); +u8 LoadMoveTutorMovesList(const struct ListMenuItem *items, u16 numChoices); +void InitMoveTutorWindows(bool8 useContextWindow); bool8 EventObjectIsFarawayIslandMew(struct EventObject *); u32 sub_81D427C(void); void sub_81D4998(void); diff --git a/include/strings.h b/include/strings.h index 3899b63aa5..bd1a5349c6 100644 --- a/include/strings.h +++ b/include/strings.h @@ -859,15 +859,15 @@ extern const u8 gText_Winona[]; extern const u8 gText_Phoebe[]; extern const u8 gText_Glacia[]; -extern const u8 gText_PkmnLearnedMove4[]; -extern const u8 gText_PkmnTryingToLearnMove[]; -extern const u8 gText_WhichMoveToForget2[]; -extern const u8 gText_StopTryingToTeachMove[]; -extern const u8 gText_12AndPoof[]; -extern const u8 gText_PkmnForgotMoveAndLearnedNew[]; +extern const u8 gText_MoveTutorPkmnLearnedMove[]; +extern const u8 gText_MoveTutorPkmnTryingToLearnMove[]; +extern const u8 gText_MoveTutorWhichMoveToForget[]; +extern const u8 gText_MoveTutorStopTryingToTeachMove[]; +extern const u8 gText_MoveTutorAndPoof[]; +extern const u8 gText_MoveTutorPkmnForgotMoveAndLearnedNew[]; extern const u8 gText_TeachWhichMoveToPkmn[]; -extern const u8 gText_GiveUpTeachingNewMove[]; -extern const u8 gText_TeachX[]; +extern const u8 gText_MoveTutorGiveUp[]; +extern const u8 gText_MoveTutorTeachMoveConfirm[]; extern const u8 gText_Kira[]; extern const u8 gText_Amy[]; diff --git a/ld_script.txt b/ld_script.txt index acfd535f89..12756b5bc5 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -226,7 +226,7 @@ SECTIONS { src/battle_controller_safari.o(.text); src/fldeff_sweetscent.o(.text); src/battle_anim_effects_3.o(.text); - src/learn_move.o(.text); + src/move_tutor.o(.text); src/fldeff_softboiled.o(.text); src/decoration_inventory.o(.text); src/roamer.o(.text); @@ -535,7 +535,7 @@ SECTIONS { src/contest_ai.o(.rodata); src/battle_controller_safari.o(.rodata); src/battle_anim_effects_3.o(.rodata); - src/learn_move.o(.rodata); + src/move_tutor.o(.rodata); src/roamer.o(.rodata); src/battle_tower.o(.rodata); src/use_pokeblock.o(.rodata); diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index 1f0672dcb1..ed25c4a569 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -576,7 +576,7 @@ static void SetBagItemsListTemplate(void) } StringCopy(gPyramidBagResources->itemStrings[i], gText_CloseBag); gPyramidBagResources->bagListItems[i].name = gPyramidBagResources->itemStrings[i]; - gPyramidBagResources->bagListItems[i].id = LIST_B_PRESSED; + gPyramidBagResources->bagListItems[i].id = LIST_CANCEL; gMultiuseListMenuTemplate = gUnknown_0861F2C0; gMultiuseListMenuTemplate.totalItems = gPyramidBagResources->listMenuCount; gMultiuseListMenuTemplate.items = gPyramidBagResources->bagListItems; @@ -607,7 +607,7 @@ static void PyramidBagMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMen if (gPyramidBagResources->unk814 == 0xFF) { sub_81C6FF8(gPyramidBagResources->unk815 ^ 1); - if (itemIndex != LIST_B_PRESSED) + if (itemIndex != LIST_CANCEL) ShowItemImage(gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.lvlMode][itemIndex], gPyramidBagResources->unk815); else ShowItemImage(0xFFFF, gPyramidBagResources->unk815); @@ -619,7 +619,7 @@ static void PyramidBagMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMen static void PrintItemQuantity(u8 windowId, s32 itemIndex, u8 y) { s32 xAlign; - if (itemIndex == LIST_B_PRESSED) + if (itemIndex == LIST_CANCEL) return; if (gPyramidBagResources->unk814 != 0xFF) @@ -641,7 +641,7 @@ static void PrintItemQuantity(u8 windowId, s32 itemIndex, u8 y) static void PrintItemDescription(s32 listMenuId) { const u8 *desc; - if (listMenuId != LIST_B_PRESSED) + if (listMenuId != LIST_CANCEL) { desc = ItemId_GetDescription(gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.lvlMode][listMenuId]); } @@ -859,7 +859,7 @@ static void Task_HandlePyramidBagInput(u8 taskId) { case LIST_NOTHING_CHOSEN: break; - case LIST_B_PRESSED: + case LIST_CANCEL: PlaySE(SE_SELECT); gSpecialVar_ItemId = 0; sub_81C5B14(taskId); @@ -1293,7 +1293,7 @@ static void Task_ItemSwapHandleInput(u8 taskId) { case LIST_NOTHING_CHOSEN: break; - case LIST_B_PRESSED: + case LIST_CANCEL: PlaySE(SE_SELECT); if (gMain.newKeys & A_BUTTON) PerformItemSwap(taskId); diff --git a/src/decoration.c b/src/decoration.c index fb6cbb10a5..3c93336257 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -939,7 +939,7 @@ void sub_812764C(u8 taskId) { case LIST_NOTHING_CHOSEN: break; - case LIST_B_PRESSED: + case LIST_CANCEL: PlaySE(SE_SELECT); SecretBasePC_SelectedDecorActions[data[11]][1](taskId); break; diff --git a/src/egg_hatch.c b/src/egg_hatch.c index ba10206696..e5280a136f 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -469,7 +469,7 @@ static void Task_EggHatch(u8 taskID) { CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_EggHatch_0); - gFieldCallback = sub_80AF168; + gFieldCallback = FieldCallback_ReturnToEventScript2; DestroyTask(taskID); } } diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index e7476dea3a..4027fdffc7 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -58,7 +58,7 @@ static void task0A_fade_n_map_maybe(u8); static void sub_808115C(u8); static void palette_bg_faded_fill_white(void); static void sub_80AF438(u8); -static bool32 sub_80AF71C(void); +static bool32 WaitForWeatherFadeIn(void); static void task0A_mpl_807E31C(u8 taskId); static void sub_80AFA0C(u8 taskId); static void sub_80AFA88(u8 taskId); @@ -133,7 +133,7 @@ static void sub_80AF0F4(u8 arg) static void task0A_nop_for_a_while(u8 taskId) { - if (sub_80AF71C() == TRUE) + if (WaitForWeatherFadeIn() == TRUE) DestroyTask(taskId); } @@ -147,14 +147,14 @@ void sub_80AF128(void) static void task0A_asap_script_env_2_enable_and_set_ctx_running(u8 taskID) { - if (sub_80AF71C() == TRUE) + if (WaitForWeatherFadeIn() == TRUE) { DestroyTask(taskID); EnableBothScriptContexts(); } } -void sub_80AF168(void) +void FieldCallback_ReturnToEventScript2(void) { ScriptContext2_Enable(); Overworld_PlaySpecialMapMusic(); @@ -187,7 +187,7 @@ static void task_mpl_807DD60(u8 taskId) } break; case 2: - if (sub_80AF71C() == TRUE) + if (WaitForWeatherFadeIn() == TRUE) { ScriptContext2_Disable(); DestroyTask(taskId); @@ -227,7 +227,7 @@ static void sub_80AF234(u8 taskId) } break; case 2: - if (sub_80AF71C() == TRUE) + if (WaitForWeatherFadeIn() == TRUE) { sub_8009F18(); ScriptContext2_Disable(); @@ -347,7 +347,7 @@ static void sub_80AF438(u8 taskId) task->data[0] = 1; break; case 1: - if (sub_80AF71C()) + if (WaitForWeatherFadeIn()) { u8 eventObjId; sub_80AF0F4(1); @@ -395,7 +395,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId) task->data[0] = 1; break; case 1: - if (sub_80AF71C()) + if (WaitForWeatherFadeIn()) { u8 eventObjId; sub_80AF0F4(1); @@ -428,7 +428,7 @@ static void task_map_chg_seq_0807E2CC(u8 taskId) gTasks[taskId].data[0]++; break; case 1: - if (sub_80AF71C()) + if (WaitForWeatherFadeIn()) { UnfreezeEventObjects(); ScriptContext2_Disable(); @@ -440,7 +440,7 @@ static void task_map_chg_seq_0807E2CC(u8 taskId) static void sub_80AF660(u8 taskId) { - if (sub_80AF71C() == TRUE) + if (WaitForWeatherFadeIn() == TRUE) { DestroyTask(taskId); CreateTask(sub_809FA34, 80); @@ -462,7 +462,7 @@ bool8 sub_80AF6A4(void) static void task_mpl_807E3C8(u8 taskId) { - if (sub_80AF71C() == 1) + if (WaitForWeatherFadeIn() == 1) { ScriptContext2_Disable(); DestroyTask(taskId); @@ -490,7 +490,7 @@ static bool32 PaletteFadeActive(void) return gPaletteFade.active; } -static bool32 sub_80AF71C(void) +static bool32 WaitForWeatherFadeIn(void) { if (IsWeatherNotFadingIn() == TRUE) return TRUE; @@ -1021,7 +1021,7 @@ static void task0A_mpl_807E31C(u8 taskId) gTasks[taskId].data[0]++; break; case 1: - if (sub_80AF71C() && sub_808D1B4() != TRUE) + if (WaitForWeatherFadeIn() && sub_808D1B4() != TRUE) { UnfreezeEventObjects(); ScriptContext2_Disable(); diff --git a/src/field_specials.c b/src/field_specials.c index 3919855827..0122dc32ce 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -2610,7 +2610,7 @@ static void sub_813A4EC(u8 taskId) { case LIST_NOTHING_CHOSEN: break; - case LIST_B_PRESSED: + case LIST_CANCEL: gSpecialVar_Result = 0x7F; PlaySE(SE_SELECT); sub_813A570(taskId); @@ -2690,10 +2690,10 @@ static void sub_813A664(u8 taskId) static void sub_813A694(u8 taskId) { static const struct ScrollArrowsTemplate gUnknown_085B3030 = { - .firstArrowType = 2, + .firstArrowType = SCROLL_ARROW_UP, .firstX = 0, .firstY = 0, - .secondArrowType = 3, + .secondArrowType = SCROLL_ARROW_DOWN, .secondX = 0, .secondY = 0, .fullyUpThreshold = 0, diff --git a/src/item_menu.c b/src/item_menu.c index 7b48a2d5d2..a3a0d80808 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -1108,7 +1108,7 @@ void Task_BagMenu(u8 taskId) { case LIST_NOTHING_CHOSEN: break; - case LIST_B_PRESSED: + case LIST_CANCEL: if (gUnknown_0203CE58.location == 5) { PlaySE(SE_HAZURE); @@ -1324,7 +1324,7 @@ void sub_81AC3C0(u8 taskId) { case LIST_NOTHING_CHOSEN: break; - case LIST_B_PRESSED: + case LIST_CANCEL: PlaySE(SE_SELECT); if (gMain.newKeys & A_BUTTON) sub_81AC498(taskId); diff --git a/src/learn_move.c b/src/learn_move.c deleted file mode 100644 index 7a6916013a..0000000000 --- a/src/learn_move.c +++ /dev/null @@ -1,833 +0,0 @@ -#include "global.h" -#include "main.h" -#include "battle.h" -#include "bg.h" -#include "contest_effect.h" -#include "data2.h" -#include "event_data.h" -#include "field_screen_effect.h" -#include "gpu_regs.h" -#include "learn_move.h" -#include "list_menu.h" -#include "alloc.h" -#include "menu.h" -#include "menu_helpers.h" -#include "overworld.h" -#include "palette.h" -#include "pokemon_summary_screen.h" -#include "pokenav.h" -#include "script.h" -#include "sound.h" -#include "sprite.h" -#include "string_util.h" -#include "strings.h" -#include "task.h" -#include "constants/rgb.h" -#include "constants/songs.h" - -static EWRAM_DATA struct -{ - u8 state; - u8 spriteIds[16]; /*0x001*/ - u16 movesToLearn[4]; /*0x012*/ - u8 filler1A[0x44 - 0x1A]; /*0x01A*/ - u8 partyMon; /*0x044*/ - u8 moveSlot; /*0x045*/ - struct ListMenuItem menuItems[20]; /*0x048*/ - u8 fillerE8[0x110 - 0xE8]; /*0x0E8*/ - u8 numMenuChoices; /*0x110*/ - u8 numToShowAtOnce; /*0x111*/ - u8 listMenuTask; /*0x112*/ - u8 scrollArrowTaskId1; /*0x113*/ - u8 scrollArrowTaskId2; /*0x114*/ - u16 scrollOffset; /*0x116*/ -} *sLearnMoveStruct = {0}; - -static EWRAM_DATA struct { - u16 listOffset; - u16 listRow; - u8 showContestInfo; -} sLearnMoveStruct2 = {0}; - -const u16 gUnknown_085CE9F8[] = INCBIN_U16("graphics/interface/ui_learn_move.gbapal"); -const u8 gUnknown_085CEA18[] = INCBIN_U8("graphics/interface/ui_learn_move.4bpp"); - -const struct OamData gUnknown_085CEB98 = -{ - .y = 0, - .affineMode = 0, - .objMode = ST_OAM_OBJ_NORMAL, - .mosaic = 0, - .bpp = ST_OAM_4BPP, - .shape = ST_OAM_SQUARE, - .x = 0, - .matrixNum = 0, - .size = 0, - .tileNum = 0, - .priority = 0, - .paletteNum = 0, - .affineParam = 0, -}; - -const struct OamData gUnknown_085CEBA0 = -{ - .y = 0, - .affineMode = 0, - .objMode = ST_OAM_OBJ_NORMAL, - .mosaic = 0, - .bpp = ST_OAM_4BPP, - .shape = ST_OAM_V_RECTANGLE, - .x = 0, - .matrixNum = 0, - .size = 0, - .tileNum = 0, - .priority = 0, - .paletteNum = 0, - .affineParam = 0, -}; - -const struct OamData gUnknown_085CEBA8 = -{ - .y = 0, - .affineMode = 0, - .objMode = ST_OAM_OBJ_NORMAL, - .mosaic = 0, - .bpp = ST_OAM_4BPP, - .shape = ST_OAM_H_RECTANGLE, - .x = 0, - .matrixNum = 0, - .size = 0, - .tileNum = 0, - .priority = 0, - .paletteNum = 0, - .affineParam = 0, -}; - -const struct SpriteSheet gUnknown_085CEBB0 = -{ - .data = gUnknown_085CEA18, - .size = 0x180, - .tag = 5525 -}; - -const struct SpritePalette gUnknown_085CEBB8 = -{ - .data = gUnknown_085CE9F8, - .tag = 5526 -}; - -const struct ScrollArrowsTemplate gUnknown_085CEBC0 = -{ - .firstArrowType = 0, - .firstX = 27, - .firstY = 16, - .secondArrowType = 1, - .secondX = 117, - .secondY = 16, - .fullyUpThreshold = -1, - .fullyDownThreshold = -1, - .tileTag = 5325, - .palTag = 5325, - .palNum = 0, -}; - -const struct ScrollArrowsTemplate gUnknown_085CEBD0 = -{ - .firstArrowType = 2, - .firstX = 192, - .firstY = 8, - .secondArrowType = 3, - .secondX = 192, - .secondY = 104, - .fullyUpThreshold = 0, - .fullyDownThreshold = 0, - .tileTag = 5425, - .palTag = 5425, - .palNum = 0, -}; - -const union AnimCmd gUnknown_085CEBE0[] = -{ - ANIMCMD_FRAME(8, 5, FALSE, FALSE), - ANIMCMD_END -}; - -const union AnimCmd gUnknown_085CEBE8[] = -{ - ANIMCMD_FRAME(9, 5, FALSE, FALSE), - ANIMCMD_END -}; - -const union AnimCmd gUnknown_085CEBF0[] = -{ - ANIMCMD_FRAME(10, 5, FALSE, FALSE), - ANIMCMD_END -}; - -const union AnimCmd gUnknown_085CEBF8[] = -{ - ANIMCMD_FRAME(11, 5, FALSE, FALSE), - ANIMCMD_END -}; - -const union AnimCmd *const gUnknown_085CEC00[] = -{ - gUnknown_085CEBE0, - gUnknown_085CEBE8, - gUnknown_085CEBF0, - gUnknown_085CEBF8, -}; - -const struct SpriteTemplate gUnknown_085CEC10 = -{ - .tileTag = 5525, - .paletteTag = 5526, - .oam = &gUnknown_085CEB98, - .anims = gUnknown_085CEC00, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCallbackDummy -}; - -const struct BgTemplate gUnknown_085CEC28[] = -{ - { - .bg = 0, - .charBaseIndex = 0, - .mapBaseIndex = 31, - .screenSize = 0, - .paletteMode = 0, - .priority = 0, - .baseTile = 0, - }, - { - .bg = 1, - .charBaseIndex = 0, - .mapBaseIndex = 30, - .screenSize = 0, - .paletteMode = 0, - .priority = 1, - .baseTile = 0, - }, -}; - -static void LearnMoveMain(void); -static void CreateMenuItemsList(void); -static void CreateHearts(void); -static void CB2_Main(void); -static void Task_WaitForFadeOut(u8 taskId); -static void CB2_InitLearnMove(void); -static void CB2_InitLearnMoveReturnFromSelectMove(void); -static void InitBGs(void); -static void AddScrollArrows(void); -static void HandleInput(u8); -static void ShowTeachMoveText(u8); -static s32 GetCurrentItemId(void); -static void FreeListMenuResources(void); -static void RemoveScrollArrows(void); -static void HideSpritesAndPrintTeachText(bool8); - -static void VBlankCB_LearnMove(void) -{ - LoadOam(); - ProcessSpriteCopyRequests(); - TransferPlttBuffer(); -} - -void TeachMoveTutorMove(void) -{ - ScriptContext2_Enable(); - CreateTask(Task_WaitForFadeOut, 0xA); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); -} - -static void Task_WaitForFadeOut(u8 taskId) -{ - if (!gPaletteFade.active) - { - SetMainCallback2(CB2_InitLearnMove); - gFieldCallback = sub_80AF168; - DestroyTask(taskId); - } -} - -static void CB2_InitLearnMove(void) -{ - ResetSpriteData(); - FreeAllSpritePalettes(); - ResetTasks(); - clear_scheduled_bg_copies_to_vram(); - sLearnMoveStruct = AllocZeroed(sizeof(*sLearnMoveStruct)); - sLearnMoveStruct->partyMon = gSpecialVar_0x8004; - SetVBlankCallback(VBlankCB_LearnMove); - - InitBGs(); - sub_81D2824(0); - - sLearnMoveStruct2.listOffset = 0; - sLearnMoveStruct2.listRow = 0; - sLearnMoveStruct2.showContestInfo = FALSE; - - CreateMenuItemsList(); - - LoadSpriteSheet(&gUnknown_085CEBB0); - LoadSpritePalette(&gUnknown_085CEBB8); - CreateHearts(); - - sLearnMoveStruct->listMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sLearnMoveStruct2.listOffset, sLearnMoveStruct2.listRow); - FillPalette(RGB_BLACK, 0, 2); - SetMainCallback2(CB2_Main); -} - -static void CB2_InitLearnMoveReturnFromSelectMove(void) -{ - ResetSpriteData(); - FreeAllSpritePalettes(); - ResetTasks(); - clear_scheduled_bg_copies_to_vram(); - sLearnMoveStruct = AllocZeroed(sizeof(*sLearnMoveStruct)); - sLearnMoveStruct->state = 28; - sLearnMoveStruct->partyMon = gSpecialVar_0x8004; - sLearnMoveStruct->moveSlot = gSpecialVar_0x8005; - SetVBlankCallback(VBlankCB_LearnMove); - - InitBGs(); - sub_81D2824(sLearnMoveStruct2.showContestInfo); - CreateMenuItemsList(); - - LoadSpriteSheet(&gUnknown_085CEBB0); - LoadSpritePalette(&gUnknown_085CEBB8); - CreateHearts(); - - sLearnMoveStruct->listMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sLearnMoveStruct2.listOffset, sLearnMoveStruct2.listRow); - FillPalette(RGB_BLACK, 0, 2); - SetMainCallback2(CB2_Main); -} - -static void InitBGs(void) -{ - ResetVramOamAndBgCntRegs(); - ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, gUnknown_085CEC28, 2); - ResetAllBgsCoordinates(); - SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | - DISPCNT_OBJ_1D_MAP | - DISPCNT_OBJ_ON); - ShowBg(0); - ShowBg(1); - SetGpuReg(REG_OFFSET_BLDCNT, 0); -} - -static void CB2_Main(void) -{ - LearnMoveMain(); - RunTasks(); - AnimateSprites(); - BuildOamBuffer(); - do_scheduled_bg_tilemap_copies_to_vram(); - UpdatePaletteFade(); -} - -static void sub_816084C(const u8 *src) -{ - StringExpandPlaceholders(gStringVar4, src); - sub_81D2BF4(gStringVar4); -} - -static void LearnMoveMain(void) -{ - switch (sLearnMoveStruct->state) - { - case 0: - sLearnMoveStruct->state++; - HideSpritesAndPrintTeachText(FALSE); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); - break; - case 1: - if (!gPaletteFade.active) - { - sLearnMoveStruct->state = 4; - } - break; - case 2: - sLearnMoveStruct->state++; - break; - case 3: - HideSpritesAndPrintTeachText(FALSE); - sLearnMoveStruct->state++; - AddScrollArrows(); - break; - case 4: - HandleInput(FALSE); - return; - case 5: - ShowTeachMoveText(FALSE); - sLearnMoveStruct->state++; - AddScrollArrows(); - break; - case 6: - HandleInput(TRUE); - break; - case 8: - if (!sub_81D2C3C()) - { - sub_81D2C50(); - sLearnMoveStruct->state++; - } - break; - case 9: - { - s8 selection = Menu_ProcessInputNoWrapClearOnChoose(); - - if (selection == 0) - { - if (GiveMoveToMon(&gPlayerParty[sLearnMoveStruct->partyMon], GetCurrentItemId()) != 0xFFFF) - { - sub_816084C(gText_PkmnLearnedMove4); - gSpecialVar_0x8004 = 1; - sLearnMoveStruct->state = 31; - } - else - { - sLearnMoveStruct->state = 16; - } - } - else if (selection == -1 || selection == 1) - { - if (sLearnMoveStruct2.showContestInfo == FALSE) - { - sLearnMoveStruct->state = 3; - } - else if (sLearnMoveStruct2.showContestInfo == TRUE) - { - sLearnMoveStruct->state = 5; - } - } - } - break; - case 12: - if (!sub_81D2C3C()) - { - sub_81D2C50(); - sLearnMoveStruct->state++; - } - break; - case 13: - { - s8 selection = Menu_ProcessInputNoWrapClearOnChoose(); - - if (selection == 0) - { - gSpecialVar_0x8004 = selection; - sLearnMoveStruct->state = 14; - } - else if (selection == -1 || selection == 1) - { - if (sLearnMoveStruct2.showContestInfo == FALSE) - { - sLearnMoveStruct->state = 3; - } - else if (sLearnMoveStruct2.showContestInfo == TRUE) - { - sLearnMoveStruct->state = 5; - } - } - } - break; - case 16: - sub_816084C(gText_PkmnTryingToLearnMove); - sLearnMoveStruct->state++; - break; - case 17: - if (!sub_81D2C3C()) - { - sub_81D2C50(); - sLearnMoveStruct->state = 18; - } - break; - case 18: - { - s8 var = Menu_ProcessInputNoWrapClearOnChoose(); - - if (var == 0) - { - sub_816084C(gText_WhichMoveToForget2); - sLearnMoveStruct->state = 19; - } - else if (var == -1 || var == 1) - { - sLearnMoveStruct->state = 24; - } - } - break; - case 24: - StringCopy(gStringVar2, gMoveNames[GetCurrentItemId()]); - sub_816084C(gText_StopTryingToTeachMove); - sLearnMoveStruct->state++; - break; - case 25: - if (!sub_81D2C3C()) - { - sub_81D2C50(); - sLearnMoveStruct->state++; - } - break; - case 26: - { - s8 var = Menu_ProcessInputNoWrapClearOnChoose(); - - if (var == 0) - { - sLearnMoveStruct->state = 27; - } - else if (var == -1 || var == 1) - { - // What's the point? It gets set to 16, anyway. - if (sLearnMoveStruct2.showContestInfo == FALSE) - { - sLearnMoveStruct->state = 3; - } - else if (sLearnMoveStruct2.showContestInfo == TRUE) - { - sLearnMoveStruct->state = 5; - } - sLearnMoveStruct->state = 16; - } - } - break; - case 27: - if (!sub_81D2C3C()) - { - FillWindowPixelBuffer(3, 0x11); - if (sLearnMoveStruct2.showContestInfo == FALSE) - { - sLearnMoveStruct->state = 3; - } - else if (sLearnMoveStruct2.showContestInfo == TRUE) - { - sLearnMoveStruct->state = 5; - } - } - break; - case 19: - if (!sub_81D2C3C()) - { - sLearnMoveStruct->state = 20; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); - } - break; - case 20: - if (!gPaletteFade.active) - { - ShowSelectMovePokemonSummaryScreen(gPlayerParty, sLearnMoveStruct->partyMon, gPlayerPartyCount - 1, CB2_InitLearnMoveReturnFromSelectMove, GetCurrentItemId()); - FreeListMenuResources(); - } - break; - case 21: - if (!sub_81D2C3C()) - { - sLearnMoveStruct->state = 14; - } - break; - case 22: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); - break; - case 14: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); - sLearnMoveStruct->state++; - break; - case 15: - if (!gPaletteFade.active) - { - FreeListMenuResources(); - SetMainCallback2(CB2_ReturnToField); - } - break; - case 28: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); - sLearnMoveStruct->state++; - if (sLearnMoveStruct2.showContestInfo == FALSE) - { - HideSpritesAndPrintTeachText(TRUE); - } - else if (sLearnMoveStruct2.showContestInfo == TRUE) - { - ShowTeachMoveText(TRUE); - } - RemoveScrollArrows(); - CopyWindowToVram(3, 2); - break; - case 29: - if (!gPaletteFade.active) - { - if (sLearnMoveStruct->moveSlot == MAX_MON_MOVES) - { - sLearnMoveStruct->state = 24; - } - else - { - u16 moveId = GetMonData(&gPlayerParty[sLearnMoveStruct->partyMon], MON_DATA_MOVE1 + sLearnMoveStruct->moveSlot); - - StringCopy(gStringVar3, gMoveNames[moveId]); - RemoveMonPPBonus(&gPlayerParty[sLearnMoveStruct->partyMon], sLearnMoveStruct->moveSlot); - SetMonMoveSlot(&gPlayerParty[sLearnMoveStruct->partyMon], GetCurrentItemId(), sLearnMoveStruct->moveSlot); - StringCopy(gStringVar2, gMoveNames[GetCurrentItemId()]); - sub_816084C(gText_12AndPoof); - sLearnMoveStruct->state = 30; - gSpecialVar_0x8004 = 1; - } - } - break; - case 30: - if (!sub_81D2C3C()) - { - sub_816084C(gText_PkmnForgotMoveAndLearnedNew); - sLearnMoveStruct->state = 31; - PlayFanfare(MUS_FANFA1); - } - break; - case 31: - if (!sub_81D2C3C()) - { - PlayFanfare(MUS_FANFA1); - sLearnMoveStruct->state = 32; - } - break; - case 32: - if (IsFanfareTaskInactive()) - { - sLearnMoveStruct->state = 33; - } - break; - case 33: - if (gMain.newKeys & A_BUTTON) - { - PlaySE(SE_SELECT); - sLearnMoveStruct->state = 14; - } - break; - } -} - -static void FreeListMenuResources(void) -{ - RemoveScrollArrows(); - DestroyListMenuTask(sLearnMoveStruct->listMenuTask, &sLearnMoveStruct2.listOffset, &sLearnMoveStruct2.listRow); - FreeAllWindowBuffers(); - FREE_AND_SET_NULL(sLearnMoveStruct); - ResetSpriteData(); - FreeAllSpritePalettes(); -} - -static void HideSpritesAndPrintTeachText(bool8 a) -{ - s32 i; - - for (i = 0; i < 16; i++) - { - gSprites[sLearnMoveStruct->spriteIds[i]].invisible = TRUE; - } - - if (!a) - { - StringExpandPlaceholders(gStringVar4, gText_TeachWhichMoveToPkmn); - FillWindowPixelBuffer(3, 0x11); - AddTextPrinterParameterized(3, 1, gStringVar4, 0, 1, 0, NULL); - } -} - -static void HandleInput(bool8 showContest) -{ - s32 itemId = ListMenu_ProcessInput(sLearnMoveStruct->listMenuTask); - ListMenuGetScrollAndRow(sLearnMoveStruct->listMenuTask, &sLearnMoveStruct2.listOffset, &sLearnMoveStruct2.listRow); - - switch (itemId) - { - case LIST_NOTHING_CHOSEN: - if (!(gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT)) && !GetLRKeysState()) - { - break; - } - - PlaySE(SE_SELECT); - - if (showContest == FALSE) - { - PutWindowTilemap(1); - sLearnMoveStruct->state = 5; - sLearnMoveStruct2.showContestInfo = TRUE; - } - else - { - PutWindowTilemap(0); - sLearnMoveStruct->state = 3; - sLearnMoveStruct2.showContestInfo = FALSE; - } - - schedule_bg_copy_tilemap_to_vram(1); - ShowHideHearts(GetCurrentItemId()); - break; - case LIST_B_PRESSED: - PlaySE(SE_SELECT); - RemoveScrollArrows(); - sLearnMoveStruct->state = 12; - StringExpandPlaceholders(gStringVar4, gText_GiveUpTeachingNewMove); - sub_81D2BF4(gStringVar4); - break; - default: - PlaySE(SE_SELECT); - RemoveScrollArrows(); - sLearnMoveStruct->state = 8; - StringCopy(gStringVar2, gMoveNames[itemId]); - StringExpandPlaceholders(gStringVar4, gText_TeachX); - sub_81D2BF4(gStringVar4); - break; - } -} - -static s32 GetCurrentItemId(void) -{ - return sLearnMoveStruct->menuItems[sLearnMoveStruct2.listRow + sLearnMoveStruct2.listOffset].id; -} - -static void ShowTeachMoveText(bool8 showContest) -{ - if (showContest == FALSE) - { - StringExpandPlaceholders(gStringVar4, gText_TeachWhichMoveToPkmn); - FillWindowPixelBuffer(3, 0x11); - AddTextPrinterParameterized(3, 1, gStringVar4, 0, 1, 0, NULL); - } -} - -static void CreateHearts(void) -{ - int i; - - sLearnMoveStruct->scrollArrowTaskId2 = -1; - sLearnMoveStruct->scrollArrowTaskId1 = -1; - AddScrollArrows(); - - for (i = 0; i < 8; i++) - { - sLearnMoveStruct->spriteIds[i] = CreateSprite(&gUnknown_085CEC10, (i - (i / 4) * 4) * 8 + 104, (i / 4) * 8 + 36, 0); - } - - for (i = 0; i < 8; i++) - { - sLearnMoveStruct->spriteIds[i + 8] = CreateSprite(&gUnknown_085CEC10, (i - (i / 4) * 4) * 8 + 104, (i / 4) * 8 + 52, 0); - StartSpriteAnim(&gSprites[sLearnMoveStruct->spriteIds[i + 8]], 2); - } - - for (i = 0; i < 16; i++) - { - gSprites[sLearnMoveStruct->spriteIds[i]].invisible = TRUE; - } -} - -static void AddScrollArrows(void) -{ - if (sLearnMoveStruct->scrollArrowTaskId2 == 0xFF) - { - sLearnMoveStruct->scrollArrowTaskId2 = AddScrollIndicatorArrowPair(&gUnknown_085CEBC0, &sLearnMoveStruct->scrollOffset); - } - - if (sLearnMoveStruct->scrollArrowTaskId1 == 0xFF) - { - gTempScrollArrowTemplate = gUnknown_085CEBD0; - gTempScrollArrowTemplate.fullyDownThreshold = sLearnMoveStruct->numMenuChoices - sLearnMoveStruct->numToShowAtOnce; - sLearnMoveStruct->scrollArrowTaskId1 = AddScrollIndicatorArrowPair(&gTempScrollArrowTemplate, &sLearnMoveStruct2.listOffset); - } -} - -static void RemoveScrollArrows(void) -{ - if (sLearnMoveStruct->scrollArrowTaskId2 != 0xFF) - { - RemoveScrollIndicatorArrowPair(sLearnMoveStruct->scrollArrowTaskId2); - sLearnMoveStruct->scrollArrowTaskId2 = 0xFF; - } - - if (sLearnMoveStruct->scrollArrowTaskId1 != 0xFF) - { - RemoveScrollIndicatorArrowPair(sLearnMoveStruct->scrollArrowTaskId1); - sLearnMoveStruct->scrollArrowTaskId1 = 0xFF; - } -} - -static void CreateMenuItemsList(void) -{ - s32 i; - u8 nickname[POKEMON_NAME_LENGTH + 1]; - - sLearnMoveStruct->numMenuChoices = GetMoveRelearnerMoves(&gPlayerParty[sLearnMoveStruct->partyMon], sLearnMoveStruct->movesToLearn); - - for (i = 0; i < sLearnMoveStruct->numMenuChoices; i++) - { - sLearnMoveStruct->menuItems[i].name = gMoveNames[sLearnMoveStruct->movesToLearn[i]]; - sLearnMoveStruct->menuItems[i].id = sLearnMoveStruct->movesToLearn[i]; - } - - GetMonData(&gPlayerParty[sLearnMoveStruct->partyMon], MON_DATA_NICKNAME, nickname); - StringCopy10(gStringVar1, nickname); - sLearnMoveStruct->menuItems[sLearnMoveStruct->numMenuChoices].name = gText_Cancel; - sLearnMoveStruct->menuItems[sLearnMoveStruct->numMenuChoices].id = LIST_B_PRESSED; - sLearnMoveStruct->numMenuChoices++; - sLearnMoveStruct->numToShowAtOnce = sub_81D28C8(sLearnMoveStruct->menuItems, sLearnMoveStruct->numMenuChoices); -} - -void ShowHideHearts(s32 item) -{ - u16 numHearts; - u16 i; - - if (!sLearnMoveStruct2.showContestInfo || item == LIST_B_PRESSED) - { - for (i = 0; i < 16; i++) - { - gSprites[sLearnMoveStruct->spriteIds[i]].invisible = TRUE; - } - } - else - { - numHearts = (u8)(gContestEffects[gContestMoves[item].effect].appeal / 10); - - if (numHearts == 0xFF) - { - numHearts = 0; - } - - for (i = 0; i < 8; i++) - { - if (i < numHearts) - { - StartSpriteAnim(&gSprites[sLearnMoveStruct->spriteIds[i]], 1); - } - else - { - StartSpriteAnim(&gSprites[sLearnMoveStruct->spriteIds[i]], 0); - } - gSprites[sLearnMoveStruct->spriteIds[i]].invisible = FALSE; - } - - numHearts = (u8)(gContestEffects[gContestMoves[item].effect].jam / 10); - - if (numHearts == 0xFF) - { - numHearts = 0; - } - - for (i = 0; i < 8; i++) - { - if (i < numHearts) - { - StartSpriteAnim(&gSprites[sLearnMoveStruct->spriteIds[i + 8]], 3); - } - else - { - StartSpriteAnim(&gSprites[sLearnMoveStruct->spriteIds[i + 8]], 2); - } - gSprites[sLearnMoveStruct->spriteIds[i + 8]].invisible = FALSE; - } - } -} diff --git a/src/list_menu.c b/src/list_menu.c index 7a95476614..930e87816e 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -341,7 +341,7 @@ s32 DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenu } if (gMain.newKeys & B_BUTTON) { - sMysteryGiftLinkMenu.currItemId = LIST_B_PRESSED; + sMysteryGiftLinkMenu.currItemId = LIST_CANCEL; sMysteryGiftLinkMenu.state = 2; } if (sMysteryGiftLinkMenu.state == 2) @@ -416,7 +416,7 @@ s32 ListMenu_ProcessInput(u8 listTaskId) } else if (gMain.newKeys & B_BUTTON) { - return LIST_B_PRESSED; + return LIST_CANCEL; } else if (gMain.newAndRepeatedKeys & DPAD_UP) { diff --git a/src/move_tutor.c b/src/move_tutor.c new file mode 100644 index 0000000000..89291a0087 --- /dev/null +++ b/src/move_tutor.c @@ -0,0 +1,976 @@ +#include "global.h" +#include "main.h" +#include "battle.h" +#include "bg.h" +#include "contest_effect.h" +#include "data2.h" +#include "event_data.h" +#include "field_screen_effect.h" +#include "gpu_regs.h" +#include "move_tutor.h" +#include "list_menu.h" +#include "alloc.h" +#include "menu.h" +#include "menu_helpers.h" +#include "overworld.h" +#include "palette.h" +#include "pokemon_summary_screen.h" +#include "pokenav.h" +#include "script.h" +#include "sound.h" +#include "sprite.h" +#include "string_util.h" +#include "strings.h" +#include "task.h" +#include "constants/rgb.h" +#include "constants/songs.h" + +/* + * Move tutor state machine + * ------------------------ + * + * Entry point: TeachMoveTutorMove + * + * TeachMoveTutorMove + * Task_WaitForFadeOut + * CB2_InitLearnMove + * - Creates moveDisplayArrowTask to listen to right/left buttons. + * - Creates moveListScrollArrowTask to listen to up/down buttons. + * - Whenever the selected move changes (and once on init), the MoveTutorCursorCallback + * is called (see gMoveTutorMovesListTemplate). That callback will reload the contest + * display and battle display windows for the new move. Both are always loaded in + * memory, but only the currently active one is copied to VRAM. The exception to this + * is the appeal and jam hearts, which are sprites. MoveTutorShowHideHearts is called + * while reloading the contest display to control them. + * DoMoveTutorMain: MENU_STATE_FADE_TO_BLACK + * DoMoveTutorMain: MENU_STATE_WAIT_FOR_FADE + * - Go to MENU_STATE_IDLE_BATTLE_MODE + * + * DoMoveTutorMain: MENU_STATE_SETUP_BATTLE_MODE + * DoMoveTutorMain: MENU_STATE_IDLE_BATTLE_MODE + * - If the player selected a move (pressed A), go to MENU_STATE_PRINT_TEACH_MOVE_PROMPT. + * - If the player cancelled (pressed B), go to MENU_STATE_PRINT_GIVE_UP_PROMPT. + * - If the player pressed left or right, swap the move display window to contest mode, + * and go to MENU_STATE_SETUP_CONTEST_MODE. + * + * DoMoveTutorMain: MENU_STATE_SETUP_CONTEST_MODE + * DoMoveTutorMain: MENU_STATE_IDLE_CONTEST_MODE + * - If the player selected a move, go to MENU_STATE_PRINT_TEACH_MOVE_PROMPT. + * - If the player cancelled, go to MENU_STATE_PRINT_GIVE_UP_PROMPT + * - If the player pressed left or right, swap the move display window to battle mode, + * and go to MENU_STATE_SETUP_BATTLE_MODE. + * + * DoMoveTutorMain: MENU_STATE_PRINT_TEACH_MOVE_PROMPT + * DoMoveTutorMain: MENU_STATE_TEACH_MOVE_CONFIRM + * - Wait for the player to confirm. + * - If cancelled, go to either MENU_STATE_SETUP_BATTLE_MODE or MENU_STATE_SETUP_CONTEST_MODE. + * - If confirmed and the pokemon had an empty move slot, set VAR_0x8004 to TRUE and go to + * MENU_STATE_PRINT_TEXT_THEN_FANFARE. + * - If confirmed and the pokemon doesn't have an empty move slot, go to + * MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT. + * + * DoMoveTutorMain: MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT + * DoMoveTutorMain: MENU_STATE_WAIT_FOR_TRYING_TO_LEARN + * DoMoveTutorMain: MENU_STATE_CONFIRM_DELETE_OLD_MOVE + * - If the player confirms, go to MENU_STATE_PRINT_WHICH_MOVE_PROMPT. + * - If the player cancels, go to MENU_STATE_PRINT_STOP_TEACHING + * + * DoMoveTutorMain: MENU_STATE_PRINT_STOP_TEACHING + * DoMoveTutorMain: MENU_STATE_WAIT_FOR_STOP_TEACHING + * DoMoveTutorMain: MENU_STATE_CONFIRM_STOP_TEACHING + * - If the player confirms, go to MENU_STATE_CHOOSE_SETUP_STATE. + * - If the player cancels, go back to MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT. + * + * DoMoveTutorMain: MENU_STATE_PRINT_WHICH_MOVE_PROMPT + * DoMoveTutorMain: MENU_STATE_SHOW_MOVE_SUMMARY_SCREEN + * - Go to ShowSelectMovePokemonSummaryScreen. When done, control returns to + * CB2_InitLearnMoveReturnFromSelectMove. + * + * DoMoveTutorMain: MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE + * DoMoveTutorMain: MENU_STATE_PRINT_TEXT_THEN_FANFARE + * DoMoveTutorMain: MENU_STATE_WAIT_FOR_FANFARE + * DoMoveTutorMain: MENU_STATE_WAIT_FOR_A_BUTTON + * DoMoveTutorMain: MENU_STATE_FADE_AND_RETURN + * DoMoveTutorMain: MENU_STATE_RETURN_TO_FIELD + * - Clean up and go to CB2_ReturnToField. + * + * DoMoveTutorMain: MENU_STATE_PRINT_GIVE_UP_PROMPT + * DoMoveTutorMain: MENU_STATE_GIVE_UP_CONFIRM + * - If the player confirms, go to MENU_STATE_FADE_AND_RETURN, and set VAR_0x8004 to FALSE. + * - If the player cancels, go to either MENU_STATE_SETUP_BATTLE_MODE or + * MENU_STATE_SETUP_CONTEST_MODE. + * + * CB2_InitLearnMoveReturnFromSelectMove: + * - Do most of the same stuff as CB2_InitLearnMove. + * DoMoveTutorMain: MENU_STATE_FADE_FROM_SUMMARY_SCREEN + * DoMoveTutorMain: MENU_STATE_TRY_OVERWRITE_MOVE + * - If any of the pokemon's existing moves were chosen, overwrite the move and + * go to MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE and set VAR_0x8004 to TRUE. + * - If the chosen move is the one the player selected before the summary screen, + * go to MENU_STATE_PRINT_STOP_TEACHING. + * + */ + +#define MENU_STATE_FADE_TO_BLACK 0 +#define MENU_STATE_WAIT_FOR_FADE 1 +#define MENU_STATE_UNREACHABLE 2 +#define MENU_STATE_SETUP_BATTLE_MODE 3 +#define MENU_STATE_IDLE_BATTLE_MODE 4 +#define MENU_STATE_SETUP_CONTEST_MODE 5 +#define MENU_STATE_IDLE_CONTEST_MODE 6 +// State 7 is skipped. +#define MENU_STATE_PRINT_TEACH_MOVE_PROMPT 8 +#define MENU_STATE_TEACH_MOVE_CONFIRM 9 +// States 10 and 11 are skipped. +#define MENU_STATE_PRINT_GIVE_UP_PROMPT 12 +#define MENU_STATE_GIVE_UP_CONFIRM 13 +#define MENU_STATE_FADE_AND_RETURN 14 +#define MENU_STATE_RETURN_TO_FIELD 15 +#define MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT 16 +#define MENU_STATE_WAIT_FOR_TRYING_TO_LEARN 17 +#define MENU_STATE_CONFIRM_DELETE_OLD_MOVE 18 +#define MENU_STATE_PRINT_WHICH_MOVE_PROMPT 19 +#define MENU_STATE_SHOW_MOVE_SUMMARY_SCREEN 20 +// States 21, 22, and 23 are skipped. +#define MENU_STATE_PRINT_STOP_TEACHING 24 +#define MENU_STATE_WAIT_FOR_STOP_TEACHING 25 +#define MENU_STATE_CONFIRM_STOP_TEACHING 26 +#define MENU_STATE_CHOOSE_SETUP_STATE 27 +#define MENU_STATE_FADE_FROM_SUMMARY_SCREEN 28 +#define MENU_STATE_TRY_OVERWRITE_MOVE 29 +#define MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE 30 +#define MENU_STATE_PRINT_TEXT_THEN_FANFARE 31 +#define MENU_STATE_WAIT_FOR_FANFARE 32 +#define MENU_STATE_WAIT_FOR_A_BUTTON 33 + +// The different versions of hearts are selected using animation +// commands. +#define APPEAL_HEART_EMPTY 0 +#define APPEAL_HEART_FULL 1 +#define JAM_HEART_EMPTY 2 +#define JAM_HEART_FULL 3 + +static EWRAM_DATA struct +{ + u8 state; + u8 heartSpriteIds[16]; /*0x001*/ + u16 movesToLearn[4]; /*0x012*/ + u8 filler1A[0x44 - 0x1A]; /*0x01A*/ + u8 partyMon; /*0x044*/ + u8 moveSlot; /*0x045*/ + struct ListMenuItem menuItems[20]; /*0x048*/ + u8 fillerE8[0x110 - 0xE8]; /*0x0E8*/ + u8 numMenuChoices; /*0x110*/ + u8 numToShowAtOnce; /*0x111*/ + u8 moveListMenuTask; /*0x112*/ + u8 moveListScrollArrowTask; /*0x113*/ + u8 moveDisplayArrowTask; /*0x114*/ + u16 scrollOffset; /*0x116*/ +} *sMoveTutorStruct = {0}; + +static EWRAM_DATA struct { + u16 listOffset; + u16 listRow; + bool8 showContestInfo; +} sMoveTutorMenuSate = {0}; + +static const u16 sMoveTutorPaletteData[] = INCBIN_U16("graphics/interface/ui_learn_move.gbapal"); + +// The arrow sprites in this spritesheet aren't used. The scroll-arrow system provides its own +// arrow sprites. +static const u8 sMoveTutorSpriteSheetData[] = INCBIN_U8("graphics/interface/ui_learn_move.4bpp"); + +static const struct OamData sHeartSpriteOamData = +{ + .y = 0, + .affineMode = 0, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_SQUARE, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 0, + .paletteNum = 0, + .affineParam = 0, +}; + +static const struct OamData sUnusedOam1 = +{ + .y = 0, + .affineMode = 0, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_V_RECTANGLE, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 0, + .paletteNum = 0, + .affineParam = 0, +}; + +static const struct OamData sUnusedOam2 = +{ + .y = 0, + .affineMode = 0, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_H_RECTANGLE, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 0, + .paletteNum = 0, + .affineParam = 0, +}; + +static const struct SpriteSheet sMoveTutorSpriteSheet = +{ + .data = sMoveTutorSpriteSheetData, + .size = 0x180, + .tag = 5525 +}; + +static const struct SpritePalette sMoveTutorPalette = +{ + .data = sMoveTutorPaletteData, + .tag = 5526 +}; + +static const struct ScrollArrowsTemplate sDisplayModeArrowsTemplate = +{ + .firstArrowType = SCROLL_ARROW_LEFT, + .firstX = 27, + .firstY = 16, + .secondArrowType = SCROLL_ARROW_RIGHT, + .secondX = 117, + .secondY = 16, + .fullyUpThreshold = -1, + .fullyDownThreshold = -1, + .tileTag = 5325, + .palTag = 5325, + .palNum = 0, +}; + +static const struct ScrollArrowsTemplate sMoveListScrollArrowsTemplate = +{ + .firstArrowType = SCROLL_ARROW_UP, + .firstX = 192, + .firstY = 8, + .secondArrowType = SCROLL_ARROW_DOWN, + .secondX = 192, + .secondY = 104, + .fullyUpThreshold = 0, + .fullyDownThreshold = 0, + .tileTag = 5425, + .palTag = 5425, + .palNum = 0, +}; + +static const union AnimCmd sHeartSprite_AppealEmptyFrame[] = +{ + ANIMCMD_FRAME(8, 5, FALSE, FALSE), + ANIMCMD_END +}; + +static const union AnimCmd sHeartSprite_AppealFullFrame[] = +{ + ANIMCMD_FRAME(9, 5, FALSE, FALSE), + ANIMCMD_END +}; + +static const union AnimCmd sHeartSprite_JamEmptyFrame[] = +{ + ANIMCMD_FRAME(10, 5, FALSE, FALSE), + ANIMCMD_END +}; + +static const union AnimCmd sHeartSprite_JamFullFrame[] = +{ + ANIMCMD_FRAME(11, 5, FALSE, FALSE), + ANIMCMD_END +}; + +static const union AnimCmd *const sHeartSpriteAnimationCommands[] = +{ + [APPEAL_HEART_EMPTY] = sHeartSprite_AppealEmptyFrame, + [APPEAL_HEART_FULL] = sHeartSprite_AppealFullFrame, + [JAM_HEART_EMPTY] = sHeartSprite_JamEmptyFrame, + [JAM_HEART_FULL] = sHeartSprite_JamFullFrame, +}; + +static const struct SpriteTemplate sConstestMoveHeartSprite = +{ + .tileTag = 5525, + .paletteTag = 5526, + .oam = &sHeartSpriteOamData, + .anims = sHeartSpriteAnimationCommands, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy +}; + +static const struct BgTemplate sMoveTutorMenuBackgroundTemplates[] = +{ + { + .bg = 0, + .charBaseIndex = 0, + .mapBaseIndex = 31, + .screenSize = 0, + .paletteMode = 0, + .priority = 0, + .baseTile = 0, + }, + { + .bg = 1, + .charBaseIndex = 0, + .mapBaseIndex = 30, + .screenSize = 0, + .paletteMode = 0, + .priority = 1, + .baseTile = 0, + }, +}; + +static void DoMoveTutorMain(void); +static void CreateLearnableMovesList(void); +static void CreateUISprites(void); +static void CB2_MoveTutorMain(void); +static void Task_WaitForFadeOut(u8 taskId); +static void CB2_InitLearnMove(void); +static void CB2_InitLearnMoveReturnFromSelectMove(void); +static void InitMoveTutorBackgroundLayers(void); +static void AddScrollArrows(void); +static void HandleInput(u8); +static void ShowTeachMoveText(u8); +static s32 GetCurrentSelectedMove(void); +static void FreeMoveTutorResources(void); +static void RemoveScrollArrows(void); +static void HideHeartSpritesAndShowTeachMoveText(bool8); + +static void VBlankCB_MoveTutor(void) +{ + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); +} + +// Script arguments: The pokemon to teach is in VAR_0x8004 +void TeachMoveTutorMove(void) +{ + ScriptContext2_Enable(); + CreateTask(Task_WaitForFadeOut, 10); + // Fade to black + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); +} + +static void Task_WaitForFadeOut(u8 taskId) +{ + if (!gPaletteFade.active) + { + SetMainCallback2(CB2_InitLearnMove); + gFieldCallback = FieldCallback_ReturnToEventScript2; + DestroyTask(taskId); + } +} + +static void CB2_InitLearnMove(void) +{ + ResetSpriteData(); + FreeAllSpritePalettes(); + ResetTasks(); + clear_scheduled_bg_copies_to_vram(); + sMoveTutorStruct = AllocZeroed(sizeof(*sMoveTutorStruct)); + sMoveTutorStruct->partyMon = gSpecialVar_0x8004; + SetVBlankCallback(VBlankCB_MoveTutor); + + InitMoveTutorBackgroundLayers(); + InitMoveTutorWindows(FALSE); + + sMoveTutorMenuSate.listOffset = 0; + sMoveTutorMenuSate.listRow = 0; + sMoveTutorMenuSate.showContestInfo = FALSE; + + CreateLearnableMovesList(); + + LoadSpriteSheet(&sMoveTutorSpriteSheet); + LoadSpritePalette(&sMoveTutorPalette); + CreateUISprites(); + + sMoveTutorStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveTutorMenuSate.listOffset, sMoveTutorMenuSate.listRow); + FillPalette(RGB_BLACK, 0, 2); + SetMainCallback2(CB2_MoveTutorMain); +} + +static void CB2_InitLearnMoveReturnFromSelectMove(void) +{ + ResetSpriteData(); + FreeAllSpritePalettes(); + ResetTasks(); + clear_scheduled_bg_copies_to_vram(); + sMoveTutorStruct = AllocZeroed(sizeof(*sMoveTutorStruct)); + sMoveTutorStruct->state = MENU_STATE_FADE_FROM_SUMMARY_SCREEN; + sMoveTutorStruct->partyMon = gSpecialVar_0x8004; + sMoveTutorStruct->moveSlot = gSpecialVar_0x8005; + SetVBlankCallback(VBlankCB_MoveTutor); + + InitMoveTutorBackgroundLayers(); + InitMoveTutorWindows(sMoveTutorMenuSate.showContestInfo); + CreateLearnableMovesList(); + + LoadSpriteSheet(&sMoveTutorSpriteSheet); + LoadSpritePalette(&sMoveTutorPalette); + CreateUISprites(); + + sMoveTutorStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveTutorMenuSate.listOffset, sMoveTutorMenuSate.listRow); + FillPalette(RGB_BLACK, 0, 2); + SetMainCallback2(CB2_MoveTutorMain); +} + +static void InitMoveTutorBackgroundLayers(void) +{ + ResetVramOamAndBgCntRegs(); + ResetBgsAndClearDma3BusyFlags(0); + InitBgsFromTemplates(0, sMoveTutorMenuBackgroundTemplates, ARRAY_COUNT(sMoveTutorMenuBackgroundTemplates)); + ResetAllBgsCoordinates(); + SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | + DISPCNT_OBJ_1D_MAP | + DISPCNT_OBJ_ON); + ShowBg(0); + ShowBg(1); + SetGpuReg(REG_OFFSET_BLDCNT, 0); +} + +static void CB2_MoveTutorMain(void) +{ + DoMoveTutorMain(); + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + do_scheduled_bg_tilemap_copies_to_vram(); + UpdatePaletteFade(); +} + +static void FormatAndPrintText(const u8 *src) +{ + StringExpandPlaceholders(gStringVar4, src); + MoveTutorPrintText(gStringVar4); +} + +// See the state machine doc at the top of the file. +static void DoMoveTutorMain(void) +{ + switch (sMoveTutorStruct->state) + { + case MENU_STATE_FADE_TO_BLACK: + sMoveTutorStruct->state++; + HideHeartSpritesAndShowTeachMoveText(FALSE); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + break; + case MENU_STATE_WAIT_FOR_FADE: + if (!gPaletteFade.active) + { + sMoveTutorStruct->state = MENU_STATE_IDLE_BATTLE_MODE; + } + break; + case MENU_STATE_UNREACHABLE: + sMoveTutorStruct->state++; + break; + case MENU_STATE_SETUP_BATTLE_MODE: + + HideHeartSpritesAndShowTeachMoveText(FALSE); + sMoveTutorStruct->state++; + AddScrollArrows(); + break; + case MENU_STATE_IDLE_BATTLE_MODE: + HandleInput(FALSE); + break; + case MENU_STATE_SETUP_CONTEST_MODE: + ShowTeachMoveText(FALSE); + sMoveTutorStruct->state++; + AddScrollArrows(); + break; + case MENU_STATE_IDLE_CONTEST_MODE: + HandleInput(TRUE); + break; + case MENU_STATE_PRINT_TEACH_MOVE_PROMPT: + if (!MoveTutorRunTextPrinters()) + { + MoveTutorCreateYesNoMenu(); + sMoveTutorStruct->state++; + } + break; + case MENU_STATE_TEACH_MOVE_CONFIRM: + { + s8 selection = Menu_ProcessInputNoWrapClearOnChoose(); + + if (selection == 0) + { + if (GiveMoveToMon(&gPlayerParty[sMoveTutorStruct->partyMon], GetCurrentSelectedMove()) != 0xFFFF) + { + FormatAndPrintText(gText_MoveTutorPkmnLearnedMove); + gSpecialVar_0x8004 = TRUE; + sMoveTutorStruct->state = MENU_STATE_PRINT_TEXT_THEN_FANFARE; + } + else + { + sMoveTutorStruct->state = MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT; + } + } + else if (selection == MENU_B_PRESSED || selection == 1) + { + if (sMoveTutorMenuSate.showContestInfo == FALSE) + { + sMoveTutorStruct->state = MENU_STATE_SETUP_BATTLE_MODE; + } + else if (sMoveTutorMenuSate.showContestInfo == TRUE) + { + sMoveTutorStruct->state = MENU_STATE_SETUP_CONTEST_MODE; + } + } + } + break; + case MENU_STATE_PRINT_GIVE_UP_PROMPT: + if (!MoveTutorRunTextPrinters()) + { + MoveTutorCreateYesNoMenu(); + sMoveTutorStruct->state++; + } + break; + case MENU_STATE_GIVE_UP_CONFIRM: + { + s8 selection = Menu_ProcessInputNoWrapClearOnChoose(); + + if (selection == 0) + { + gSpecialVar_0x8004 = FALSE; + sMoveTutorStruct->state = MENU_STATE_FADE_AND_RETURN; + } + else if (selection == -1 || selection == 1) + { + if (sMoveTutorMenuSate.showContestInfo == FALSE) + { + sMoveTutorStruct->state = MENU_STATE_SETUP_BATTLE_MODE; + } + else if (sMoveTutorMenuSate.showContestInfo == TRUE) + { + sMoveTutorStruct->state = MENU_STATE_SETUP_CONTEST_MODE; + } + } + } + break; + case MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT: + FormatAndPrintText(gText_MoveTutorPkmnTryingToLearnMove); + sMoveTutorStruct->state++; + break; + case MENU_STATE_WAIT_FOR_TRYING_TO_LEARN: + if (!MoveTutorRunTextPrinters()) + { + MoveTutorCreateYesNoMenu(); + sMoveTutorStruct->state = MENU_STATE_CONFIRM_DELETE_OLD_MOVE; + } + break; + case MENU_STATE_CONFIRM_DELETE_OLD_MOVE: + { + s8 var = Menu_ProcessInputNoWrapClearOnChoose(); + + if (var == 0) + { + FormatAndPrintText(gText_MoveTutorWhichMoveToForget); + sMoveTutorStruct->state = MENU_STATE_PRINT_WHICH_MOVE_PROMPT; + } + else if (var == -1 || var == 1) + { + sMoveTutorStruct->state = MENU_STATE_PRINT_STOP_TEACHING; + } + } + break; + case MENU_STATE_PRINT_STOP_TEACHING: + StringCopy(gStringVar2, gMoveNames[GetCurrentSelectedMove()]); + FormatAndPrintText(gText_MoveTutorStopTryingToTeachMove); + sMoveTutorStruct->state++; + break; + case MENU_STATE_WAIT_FOR_STOP_TEACHING: + if (!MoveTutorRunTextPrinters()) + { + MoveTutorCreateYesNoMenu(); + sMoveTutorStruct->state++; + } + break; + case MENU_STATE_CONFIRM_STOP_TEACHING: + { + s8 var = Menu_ProcessInputNoWrapClearOnChoose(); + + if (var == 0) + { + sMoveTutorStruct->state = MENU_STATE_CHOOSE_SETUP_STATE; + } + else if (var == MENU_B_PRESSED || var == 1) + { + // What's the point? It gets set to MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT, anyway. + if (sMoveTutorMenuSate.showContestInfo == FALSE) + { + sMoveTutorStruct->state = MENU_STATE_SETUP_BATTLE_MODE; + } + else if (sMoveTutorMenuSate.showContestInfo == TRUE) + { + sMoveTutorStruct->state = MENU_STATE_SETUP_CONTEST_MODE; + } + sMoveTutorStruct->state = MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT; + } + } + break; + case MENU_STATE_CHOOSE_SETUP_STATE: + if (!MoveTutorRunTextPrinters()) + { + FillWindowPixelBuffer(3, 0x11); + if (sMoveTutorMenuSate.showContestInfo == FALSE) + { + sMoveTutorStruct->state = MENU_STATE_SETUP_BATTLE_MODE; + } + else if (sMoveTutorMenuSate.showContestInfo == TRUE) + { + sMoveTutorStruct->state = MENU_STATE_SETUP_CONTEST_MODE; + } + } + break; + case MENU_STATE_PRINT_WHICH_MOVE_PROMPT: + if (!MoveTutorRunTextPrinters()) + { + sMoveTutorStruct->state = MENU_STATE_SHOW_MOVE_SUMMARY_SCREEN; + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + } + break; + case MENU_STATE_SHOW_MOVE_SUMMARY_SCREEN: + if (!gPaletteFade.active) + { + ShowSelectMovePokemonSummaryScreen(gPlayerParty, sMoveTutorStruct->partyMon, gPlayerPartyCount - 1, CB2_InitLearnMoveReturnFromSelectMove, GetCurrentSelectedMove()); + FreeMoveTutorResources(); + } + break; + case 21: + if (!MoveTutorRunTextPrinters()) + { + sMoveTutorStruct->state = MENU_STATE_FADE_AND_RETURN; + } + break; + case 22: + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + break; + case MENU_STATE_FADE_AND_RETURN: + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + sMoveTutorStruct->state++; + break; + case MENU_STATE_RETURN_TO_FIELD: + if (!gPaletteFade.active) + { + FreeMoveTutorResources(); + SetMainCallback2(CB2_ReturnToField); + } + break; + case MENU_STATE_FADE_FROM_SUMMARY_SCREEN: + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + sMoveTutorStruct->state++; + if (sMoveTutorMenuSate.showContestInfo == FALSE) + { + HideHeartSpritesAndShowTeachMoveText(TRUE); + } + else if (sMoveTutorMenuSate.showContestInfo == TRUE) + { + ShowTeachMoveText(TRUE); + } + RemoveScrollArrows(); + CopyWindowToVram(3, 2); + break; + case MENU_STATE_TRY_OVERWRITE_MOVE: + if (!gPaletteFade.active) + { + if (sMoveTutorStruct->moveSlot == MAX_MON_MOVES) + { + sMoveTutorStruct->state = MENU_STATE_PRINT_STOP_TEACHING; + } + else + { + u16 moveId = GetMonData(&gPlayerParty[sMoveTutorStruct->partyMon], MON_DATA_MOVE1 + sMoveTutorStruct->moveSlot); + + StringCopy(gStringVar3, gMoveNames[moveId]); + RemoveMonPPBonus(&gPlayerParty[sMoveTutorStruct->partyMon], sMoveTutorStruct->moveSlot); + SetMonMoveSlot(&gPlayerParty[sMoveTutorStruct->partyMon], GetCurrentSelectedMove(), sMoveTutorStruct->moveSlot); + StringCopy(gStringVar2, gMoveNames[GetCurrentSelectedMove()]); + FormatAndPrintText(gText_MoveTutorAndPoof); + sMoveTutorStruct->state = MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE; + gSpecialVar_0x8004 = TRUE; + } + } + break; + case MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE: + if (!MoveTutorRunTextPrinters()) + { + FormatAndPrintText(gText_MoveTutorPkmnForgotMoveAndLearnedNew); + sMoveTutorStruct->state = MENU_STATE_PRINT_TEXT_THEN_FANFARE; + PlayFanfare(MUS_FANFA1); + } + break; + case MENU_STATE_PRINT_TEXT_THEN_FANFARE: + if (!MoveTutorRunTextPrinters()) + { + PlayFanfare(MUS_FANFA1); + sMoveTutorStruct->state = MENU_STATE_WAIT_FOR_FANFARE; + } + break; + case MENU_STATE_WAIT_FOR_FANFARE: + if (IsFanfareTaskInactive()) + { + sMoveTutorStruct->state = MENU_STATE_WAIT_FOR_A_BUTTON; + } + break; + case MENU_STATE_WAIT_FOR_A_BUTTON: + if (gMain.newKeys & A_BUTTON) + { + PlaySE(SE_SELECT); + sMoveTutorStruct->state = MENU_STATE_FADE_AND_RETURN; + } + break; + } +} + +static void FreeMoveTutorResources(void) +{ + RemoveScrollArrows(); + DestroyListMenuTask(sMoveTutorStruct->moveListMenuTask, &sMoveTutorMenuSate.listOffset, &sMoveTutorMenuSate.listRow); + FreeAllWindowBuffers(); + FREE_AND_SET_NULL(sMoveTutorStruct); + ResetSpriteData(); + FreeAllSpritePalettes(); +} + +// Note: The hearts are already made invisible by MoveTutorShowHideHearts, +// which is called whenever the cursor in either list changes. +static void HideHeartSpritesAndShowTeachMoveText(bool8 onlyHideSprites) +{ + s32 i; + + for (i = 0; i < 16; i++) + { + gSprites[sMoveTutorStruct->heartSpriteIds[i]].invisible = TRUE; + } + + if (!onlyHideSprites) + { + StringExpandPlaceholders(gStringVar4, gText_TeachWhichMoveToPkmn); + FillWindowPixelBuffer(3, 0x11); + AddTextPrinterParameterized(3, 1, gStringVar4, 0, 1, 0, NULL); + } +} + +static void HandleInput(bool8 showContest) +{ + s32 itemId = ListMenu_ProcessInput(sMoveTutorStruct->moveListMenuTask); + ListMenuGetScrollAndRow(sMoveTutorStruct->moveListMenuTask, &sMoveTutorMenuSate.listOffset, &sMoveTutorMenuSate.listRow); + + switch (itemId) + { + case LIST_NOTHING_CHOSEN: + if (!(gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT)) && !GetLRKeysState()) + { + break; + } + + PlaySE(SE_SELECT); + + if (showContest == FALSE) + { + PutWindowTilemap(1); + sMoveTutorStruct->state = MENU_STATE_SETUP_CONTEST_MODE; + sMoveTutorMenuSate.showContestInfo = TRUE; + } + else + { + PutWindowTilemap(0); + sMoveTutorStruct->state = MENU_STATE_SETUP_BATTLE_MODE; + sMoveTutorMenuSate.showContestInfo = FALSE; + } + + schedule_bg_copy_tilemap_to_vram(1); + MoveTutorShowHideHearts(GetCurrentSelectedMove()); + break; + case LIST_CANCEL: + PlaySE(SE_SELECT); + RemoveScrollArrows(); + sMoveTutorStruct->state = MENU_STATE_PRINT_GIVE_UP_PROMPT; + StringExpandPlaceholders(gStringVar4, gText_MoveTutorGiveUp); + MoveTutorPrintText(gStringVar4); + break; + default: + PlaySE(SE_SELECT); + RemoveScrollArrows(); + sMoveTutorStruct->state = MENU_STATE_PRINT_TEACH_MOVE_PROMPT; + StringCopy(gStringVar2, gMoveNames[itemId]); + StringExpandPlaceholders(gStringVar4, gText_MoveTutorTeachMoveConfirm); + MoveTutorPrintText(gStringVar4); + break; + } +} + +static s32 GetCurrentSelectedMove(void) +{ + return sMoveTutorStruct->menuItems[sMoveTutorMenuSate.listRow + sMoveTutorMenuSate.listOffset].id; +} + +// Theory: This used to make the heart sprites visible again (i.e. +// this was the inverse of HideHeartsAndShowTeachMoveText), but the +// code was commented out. The bool argument would have been named +// "justShowHearts." The code for showing/hiding the heards was moved +// to MoveTutorShowHideHearts, which is called whenever a new move is +// selected and whenever the display mode changes. +static void ShowTeachMoveText(bool8 shouldDoNothingInstead) +{ + if (shouldDoNothingInstead == FALSE) + { + StringExpandPlaceholders(gStringVar4, gText_TeachWhichMoveToPkmn); + FillWindowPixelBuffer(3, 0x11); + AddTextPrinterParameterized(3, 1, gStringVar4, 0, 1, 0, NULL); + } +} + +static void CreateUISprites(void) +{ + int i; + + sMoveTutorStruct->moveDisplayArrowTask = 0xFF; + sMoveTutorStruct->moveListScrollArrowTask = 0xFF; + AddScrollArrows(); + + // These are the appeal hearts. + for (i = 0; i < 8; i++) + { + sMoveTutorStruct->heartSpriteIds[i] = CreateSprite(&sConstestMoveHeartSprite, (i - (i / 4) * 4) * 8 + 104, (i / 4) * 8 + 36, 0); + } + + // These are the jam harts. + // The animation is used to toggle between full/empty heart sprites. + for (i = 0; i < 8; i++) + { + sMoveTutorStruct->heartSpriteIds[i + 8] = CreateSprite(&sConstestMoveHeartSprite, (i - (i / 4) * 4) * 8 + 104, (i / 4) * 8 + 52, 0); + StartSpriteAnim(&gSprites[sMoveTutorStruct->heartSpriteIds[i + 8]], 2); + } + + for (i = 0; i < 16; i++) + { + gSprites[sMoveTutorStruct->heartSpriteIds[i]].invisible = TRUE; + } +} + +static void AddScrollArrows(void) +{ + if (sMoveTutorStruct->moveDisplayArrowTask == 0xFF) + { + sMoveTutorStruct->moveDisplayArrowTask = AddScrollIndicatorArrowPair(&sDisplayModeArrowsTemplate, &sMoveTutorStruct->scrollOffset); + } + + if (sMoveTutorStruct->moveListScrollArrowTask == 0xFF) + { + gTempScrollArrowTemplate = sMoveListScrollArrowsTemplate; + gTempScrollArrowTemplate.fullyDownThreshold = sMoveTutorStruct->numMenuChoices - sMoveTutorStruct->numToShowAtOnce; + sMoveTutorStruct->moveListScrollArrowTask = AddScrollIndicatorArrowPair(&gTempScrollArrowTemplate, &sMoveTutorMenuSate.listOffset); + } +} + +static void RemoveScrollArrows(void) +{ + if (sMoveTutorStruct->moveDisplayArrowTask != 0xFF) + { + RemoveScrollIndicatorArrowPair(sMoveTutorStruct->moveDisplayArrowTask); + sMoveTutorStruct->moveDisplayArrowTask = 0xFF; + } + + if (sMoveTutorStruct->moveListScrollArrowTask != 0xFF) + { + RemoveScrollIndicatorArrowPair(sMoveTutorStruct->moveListScrollArrowTask); + sMoveTutorStruct->moveListScrollArrowTask = 0xFF; + } +} + +static void CreateLearnableMovesList(void) +{ + s32 i; + u8 nickname[POKEMON_NAME_LENGTH + 1]; + + sMoveTutorStruct->numMenuChoices = GetMoveRelearnerMoves(&gPlayerParty[sMoveTutorStruct->partyMon], sMoveTutorStruct->movesToLearn); + + for (i = 0; i < sMoveTutorStruct->numMenuChoices; i++) + { + sMoveTutorStruct->menuItems[i].name = gMoveNames[sMoveTutorStruct->movesToLearn[i]]; + sMoveTutorStruct->menuItems[i].id = sMoveTutorStruct->movesToLearn[i]; + } + + GetMonData(&gPlayerParty[sMoveTutorStruct->partyMon], MON_DATA_NICKNAME, nickname); + StringCopy10(gStringVar1, nickname); + sMoveTutorStruct->menuItems[sMoveTutorStruct->numMenuChoices].name = gText_Cancel; + sMoveTutorStruct->menuItems[sMoveTutorStruct->numMenuChoices].id = LIST_CANCEL; + sMoveTutorStruct->numMenuChoices++; + sMoveTutorStruct->numToShowAtOnce = LoadMoveTutorMovesList(sMoveTutorStruct->menuItems, sMoveTutorStruct->numMenuChoices); +} + +void MoveTutorShowHideHearts(s32 moveId) +{ + u16 numHearts; + u16 i; + + if (!sMoveTutorMenuSate.showContestInfo || moveId == LIST_CANCEL) + { + for (i = 0; i < 16; i++) + { + gSprites[sMoveTutorStruct->heartSpriteIds[i]].invisible = TRUE; + } + } + else + { + numHearts = (u8)(gContestEffects[gContestMoves[moveId].effect].appeal / 10); + + if (numHearts == 0xFF) + { + numHearts = 0; + } + + for (i = 0; i < 8; i++) + { + if (i < numHearts) + { + StartSpriteAnim(&gSprites[sMoveTutorStruct->heartSpriteIds[i]], 1); + } + else + { + StartSpriteAnim(&gSprites[sMoveTutorStruct->heartSpriteIds[i]], 0); + } + gSprites[sMoveTutorStruct->heartSpriteIds[i]].invisible = FALSE; + } + + numHearts = (u8)(gContestEffects[gContestMoves[moveId].effect].jam / 10); + + if (numHearts == 0xFF) + { + numHearts = 0; + } + + for (i = 0; i < 8; i++) + { + if (i < numHearts) + { + StartSpriteAnim(&gSprites[sMoveTutorStruct->heartSpriteIds[i + 8]], 3); + } + else + { + StartSpriteAnim(&gSprites[sMoveTutorStruct->heartSpriteIds[i + 8]], 2); + } + gSprites[sMoveTutorStruct->heartSpriteIds[i + 8]].invisible = FALSE; + } + } +} diff --git a/src/overworld.c b/src/overworld.c index 0ff8d5b7f0..ce1e21ab15 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1688,7 +1688,7 @@ void CB2_ReturnToFieldContinueScript(void) void CB2_ReturnToFieldContinueScriptPlayMapMusic(void) { FieldClearVBlankHBlankCallbacks(); - gFieldCallback = sub_80AF168; + gFieldCallback = FieldCallback_ReturnToEventScript2; CB2_ReturnToField(); } diff --git a/src/party_menu.c b/src/party_menu.c index 10665ad9ef..dad778b49c 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -7287,7 +7287,7 @@ static void sub_81B9640(u8 taskId) void sub_81B968C(void) { ShowPokemonSummaryScreen(PSS_MODE_SELECT_MOVE, gPlayerParty, gSpecialVar_0x8004, gPlayerPartyCount - 1, CB2_ReturnToField); - gFieldCallback = sub_80AF168; + gFieldCallback = FieldCallback_ReturnToEventScript2; } void sub_81B96D0(void) diff --git a/src/player_pc.c b/src/player_pc.c index 0d08a5e7b2..bec763b415 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -645,7 +645,7 @@ static void Mailbox_ProcessInput(u8 taskId) { case LIST_NOTHING_CHOSEN: break; - case LIST_B_PRESSED: + case LIST_CANCEL: PlaySE(SE_SELECT); RemoveScrollIndicatorArrowPair(playerPCItemPageInfo.scrollIndicatorId); Mailbox_ReturnToPlayerPC(taskId); @@ -1151,7 +1151,7 @@ static void ItemStorage_ProcessInput(u8 taskId) { case LIST_NOTHING_CHOSEN: break; - case LIST_B_PRESSED: + case LIST_CANCEL: PlaySE(SE_SELECT); ItemStorage_GoBackToPlayerPCMenu(taskId); break; @@ -1226,7 +1226,7 @@ static void sub_816C4FC(u8 taskId) { case LIST_NOTHING_CHOSEN: break; - case LIST_B_PRESSED: + case LIST_CANCEL: if (gMain.newKeys & A_BUTTON) { ItemStorage_DoItemSwap(taskId, FALSE); diff --git a/src/pokeblock.c b/src/pokeblock.c index 3fd4f34df4..10149c1e73 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -709,7 +709,7 @@ static void HandlePokeblockListMenuItems(void) StringCopy(sPokeblockMenu->menuItemsStrings[i], gText_StowCase); sPokeblockMenu->items[i].name = sPokeblockMenu->menuItemsStrings[i]; - sPokeblockMenu->items[i].id = LIST_B_PRESSED; + sPokeblockMenu->items[i].id = LIST_CANCEL; gMultiuseListMenuTemplate = sPokeblockListMenuTemplate; gMultiuseListMenuTemplate.fontId = 7; @@ -751,7 +751,7 @@ static void sub_8135FCC(s32 pkblId) FillWindowPixelBuffer(7, 0); - if (pkblId != LIST_B_PRESSED) + if (pkblId != LIST_CANCEL) { pokeblock = &gSaveBlock1Ptr->pokeblocks[pkblId]; rectTilemapSrc[0] = 0x17; @@ -959,7 +959,7 @@ static void Task_FreeDataAndExitPokeblockCase(u8 taskId) if (!gPaletteFade.active) { if (sPokeblockMenu->caseId == PBLOCK_CASE_FEEDER || sPokeblockMenu->caseId == PBLOCK_CASE_GIVE) - gFieldCallback = sub_80AF168; + gFieldCallback = FieldCallback_ReturnToEventScript2; DestroyListMenuTask(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos); sub_8136418(); @@ -1011,7 +1011,7 @@ static void Task_HandlePokeblockMenuInput(u8 taskId) { case LIST_NOTHING_CHOSEN: break; - case LIST_B_PRESSED: + case LIST_CANCEL: PlaySE(SE_SELECT); gSpecialVar_Result = 0xFFFF; gSpecialVar_ItemId = 0; @@ -1066,7 +1066,7 @@ static void Task_HandlePokeblocksSwapInput(u8 taskId) { case LIST_NOTHING_CHOSEN: break; - case LIST_B_PRESSED: // same id as STOW CASE field + case LIST_CANCEL: // same id as STOW CASE field PlaySE(SE_SELECT); if (gMain.newKeys & A_BUTTON) HandlePokeblocksSwap(taskId, FALSE); diff --git a/src/roulette.c b/src/roulette.c index 4c20bd0fe1..4663602fac 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -1984,7 +1984,7 @@ static void sub_8141E7C(u8 taskId) // end roulette ? ResetPaletteFade(); ResetSpriteData(); sub_8140418(); - gFieldCallback = sub_80AF168; + gFieldCallback = FieldCallback_ReturnToEventScript2; SetMainCallback2(CB2_ReturnToField); DestroyTask(taskId); } diff --git a/src/secret_base.c b/src/secret_base.c index 33fa0c05ee..b2d6971426 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -391,7 +391,7 @@ void sub_80E8FD0(u8 taskId) } sub_80E8F9C(); WarpIntoMap(); - gFieldCallback = sub_80AF168; + gFieldCallback = FieldCallback_ReturnToEventScript2; SetMainCallback2(CB2_LoadMap); DestroyTask(taskId); break; @@ -959,7 +959,7 @@ void sub_80E9E90(u8 taskId) { case LIST_NOTHING_CHOSEN: break; - case LIST_B_PRESSED: + case LIST_CANCEL: PlaySE(SE_SELECT); DestroyListMenuTask(data[5], NULL, NULL); RemoveScrollIndicatorArrowPair(data[8]); diff --git a/src/shop.c b/src/shop.c index 8eefd5e97f..2c2a28eea7 100755 --- a/src/shop.c +++ b/src/shop.c @@ -918,7 +918,7 @@ static void Task_BuyMenu(u8 taskId) { case LIST_NOTHING_CHOSEN: break; - case LIST_B_PRESSED: + case LIST_CANCEL: PlaySE(SE_SELECT); ExitBuyMenu(taskId); break; diff --git a/src/strings.c b/src/strings.c index f81a19083c..c2f476b585 100644 --- a/src/strings.c +++ b/src/strings.c @@ -1742,15 +1742,15 @@ const u8 gText_TrainerHill2F[] = _("2F"); const u8 gText_TrainerHill3F[] = _("3F"); const u8 gText_TrainerHill4F[] = _("4F"); const u8 gText_TeachWhichMoveToPkmn[] = _("Teach which move to {STR_VAR_1}?"); -const u8 gText_TeachX[] = _("Teach {STR_VAR_2}?"); -const u8 gText_PkmnLearnedMove4[] = _("{STR_VAR_1} learned\n{STR_VAR_2}!"); -const u8 gText_PkmnTryingToLearnMove[] = _("{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can't learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?"); -const u8 gText_StopTryingToTeachMove[] = _("Stop trying to teach\n{STR_VAR_2}?"); -const u8 gText_12AndPoof[] = _("{PAUSE 32}1, {PAUSE 15}2, and {PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p"); -const u8 gText_PkmnForgotMoveAndLearnedNew[] = _("{STR_VAR_1} forgot {STR_VAR_3}.\pAnd…\p{STR_VAR_1} learned {STR_VAR_2}."); +const u8 gText_MoveTutorTeachMoveConfirm[] = _("Teach {STR_VAR_2}?"); +const u8 gText_MoveTutorPkmnLearnedMove[] = _("{STR_VAR_1} learned\n{STR_VAR_2}!"); +const u8 gText_MoveTutorPkmnTryingToLearnMove[] = _("{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can't learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?"); +const u8 gText_MoveTutorStopTryingToTeachMove[] = _("Stop trying to teach\n{STR_VAR_2}?"); +const u8 gText_MoveTutorAndPoof[] = _("{PAUSE 32}1, {PAUSE 15}2, and {PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p"); +const u8 gText_MoveTutorPkmnForgotMoveAndLearnedNew[] = _("{STR_VAR_1} forgot {STR_VAR_3}.\pAnd…\p{STR_VAR_1} learned {STR_VAR_2}."); const u8 gUnknown_085EF9C8[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}."); -const u8 gText_GiveUpTeachingNewMove[] = _("Give up trying to teach a new\nmove to {STR_VAR_1}?"); -const u8 gText_WhichMoveToForget2[] = _("Which move should be\nforgotten?\p"); +const u8 gText_MoveTutorGiveUp[] = _("Give up trying to teach a new\nmove to {STR_VAR_1}?"); +const u8 gText_MoveTutorWhichMoveToForget[] = _("Which move should be\nforgotten?\p"); const u8 gText_BattleMoves2[] = _("BATTLE MOVES"); const u8 gText_ContestMoves2[] = _("CONTEST MOVES"); const u8 gUnknown_085EFA4C[] = _("TYPE/"); diff --git a/src/trade.c b/src/trade.c index 849442ae04..25705b7bb2 100644 --- a/src/trade.c +++ b/src/trade.c @@ -6061,7 +6061,7 @@ static void sub_807F110(u8 taskId) if (!gPaletteFade.active) { SetMainCallback2(sub_807B270); - gFieldCallback = sub_80AF168; + gFieldCallback = FieldCallback_ReturnToEventScript2; DestroyTask(taskId); } } diff --git a/src/walda_phrase.c b/src/walda_phrase.c index 83004777f6..e8c1e4aedb 100644 --- a/src/walda_phrase.c +++ b/src/walda_phrase.c @@ -70,7 +70,7 @@ static void CB2_HandleGivenWaldaPhrase(void) } StringCopy(gStringVar1, GetWaldaPhrasePtr()); - gFieldCallback = sub_80AF168; + gFieldCallback = FieldCallback_ReturnToEventScript2; SetMainCallback2(CB2_ReturnToField); } diff --git a/sym_ewram.txt b/sym_ewram.txt index 361c0921f6..85c81643e7 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -192,7 +192,7 @@ gPlayerFacingPosition: @ 203AB40 .include "src/rom_81520A8.o" .include "src/save.o" .include "src/mystery_event_script.o" - .include "src/learn_move.o" + .include "src/move_tutor.o" .include "src/decoration_inventory.o" .include "src/roamer.o" .include "src/battle_tower.o" From 27aa27a2e9ee59d9afcacf0b893f3622ae07484c Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 3 Mar 2019 02:58:50 -0500 Subject: [PATCH 167/217] Fix tabs --- data/rom_81D1C44.s | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/data/rom_81D1C44.s b/data/rom_81D1C44.s index f9bd20bad7..f9625c9ca9 100644 --- a/data/rom_81D1C44.s +++ b/data/rom_81D1C44.s @@ -24,17 +24,15 @@ gUnknown_08625410:: @ 8625410 .byte 4, 5, 6, 7, 8, 9, 9, 0xA, 0xA, 0xB, 0xB, 0xC, 0xC, 0xD, 0xD, 0xD, 0xD, 0xE, 0xE, 0xE, 0xE, 0xF, 0xF, 0xF, 0xF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23 gMoveTutorWindowTemplates:: @ 8625510s - window_template 1, 1, 1, 16, 12, 0xF, 0x000A - window_template 1, 1, 1, 16, 12, 0xF, 0x00CA - window_template 1, 19, 1, 10, 12, 0xF, 0x018A - window_template 1, 4, 15, 22, 4, 0xF, 0x0202 - window_template 0, 22, 8, 5, 4, 0xF, 0x025A - null_window_template + window_template 1, 1, 1, 16, 12, 0xF, 0x000A + window_template 1, 1, 1, 16, 12, 0xF, 0x00CA + window_template 1, 19, 1, 10, 12, 0xF, 0x018A + window_template 1, 4, 15, 22, 4, 0xF, 0x0202 + window_template 0, 22, 8, 5, 4, 0xF, 0x025A + null_window_template gMoveTutorYesNoMenuTemplate:: @ 8625540 - window_template 0, 22, 8, 5, 4, 0xF, 0x025A - @.4byte 0x5081600 - @.4byte 0x25A0F04 + window_template 0, 22, 8, 5, 4, 0xF, 0x025A gMoveTutorMovesListTemplate:: @ 8625548 struct ListMenuTemplate .4byte NULL From e03595a10d05e6c860fe051976dd19096ba7e18b Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 3 Mar 2019 03:14:08 -0500 Subject: [PATCH 168/217] Bugfixes from #591 --- include/siirtc.h | 8 ++++---- src/battle_factory_screen.c | 2 +- src/pokemon_storage_system.c | 8 ++++---- src/pokemon_summary_screen.c | 2 +- src/siirtc.c | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/siirtc.h b/include/siirtc.h index 5864f95b85..de4fd634df 100644 --- a/include/siirtc.h +++ b/include/siirtc.h @@ -39,10 +39,10 @@ struct SiiRtcInfo u8 alarmMinute; }; -void SiiRtcUnprotect(); -void SiiRtcProtect(); -u8 SiiRtcProbe(); -bool8 SiiRtcReset(); +void SiiRtcUnprotect(void); +void SiiRtcProtect(void); +u8 SiiRtcProbe(void); +bool8 SiiRtcReset(void); bool8 SiiRtcGetStatus(struct SiiRtcInfo *rtc); bool8 SiiRtcSetStatus(struct SiiRtcInfo *rtc); bool8 SiiRtcGetDateTime(struct SiiRtcInfo *rtc); diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 5cbe97702a..85c0b28089 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -1741,7 +1741,7 @@ static void Select_CopyMonsToPlayerParty(void) { gPlayerParty[i] = sFactorySelectScreen->mons[j].monData; gSaveBlock2Ptr->frontier.rentalMons[i].monId = sFactorySelectScreen->mons[j].monSetId; - gSaveBlock2Ptr->frontier.rentalMons[i].personality = GetMonData(&gPlayerParty[i].box, MON_DATA_PERSONALITY, NULL); + gSaveBlock2Ptr->frontier.rentalMons[i].personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY, NULL); gSaveBlock2Ptr->frontier.rentalMons[i].abilityBit = GetBoxMonData(&gPlayerParty[i].box, MON_DATA_ALT_ABILITY, NULL); gSaveBlock2Ptr->frontier.rentalMons[i].ivs = GetBoxMonData(&gPlayerParty[i].box, MON_DATA_ATK_IV, NULL); break; diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 9681b72f48..c5d40877b3 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -6501,7 +6501,7 @@ static void InitCanRelaseMonVars(void) } sub_80CE350(sPSSData->field_2176); - sPSSData->field_2174 = GetMonData(&sPSSData->field_2108, MON_DATA_KNOWN_MOVES, sPSSData->field_2176); + sPSSData->field_2174 = GetMonData(&sPSSData->field_2108, MON_DATA_KNOWN_MOVES, (u8*)sPSSData->field_2176); if (sPSSData->field_2174 != 0) { sPSSData->field_216D = 0; @@ -6559,7 +6559,7 @@ static s8 RunCanReleaseMon(void) { if (sPSSData->field_2170 != TOTAL_BOXES_COUNT || sPSSData->field_2171 != i) { - knownMoves = GetMonData(gPlayerParty + i, MON_DATA_KNOWN_MOVES, sPSSData->field_2176); + knownMoves = GetMonData(gPlayerParty + i, MON_DATA_KNOWN_MOVES, (u8*)sPSSData->field_2176); sPSSData->field_2174 &= ~(knownMoves); } } @@ -6578,7 +6578,7 @@ static s8 RunCanReleaseMon(void) case 1: for (i = 0; i < IN_BOX_COUNT; i++) { - knownMoves = GetAndCopyBoxMonDataAt(sPSSData->field_216E, sPSSData->field_216F, MON_DATA_KNOWN_MOVES, sPSSData->field_2176); + knownMoves = GetAndCopyBoxMonDataAt(sPSSData->field_216E, sPSSData->field_216F, MON_DATA_KNOWN_MOVES, (u8*)sPSSData->field_2176); if (knownMoves != 0 && !(sPSSData->field_2170 == sPSSData->field_216E && sPSSData->field_2171 == sPSSData->field_216F)) { @@ -10357,7 +10357,7 @@ bool32 AnyStorageMonWithMove(u16 moveId) { if (GetBoxMonData(&gPokemonStoragePtr->boxes[i][j], MON_DATA_SANITY_HAS_SPECIES) && !GetBoxMonData(&gPokemonStoragePtr->boxes[i][j], MON_DATA_SANITY_IS_EGG) - && GetBoxMonData(&gPokemonStoragePtr->boxes[i][j], MON_DATA_KNOWN_MOVES, moves)) + && GetBoxMonData(&gPokemonStoragePtr->boxes[i][j], MON_DATA_KNOWN_MOVES, (u8*)moves)) return TRUE; } } diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 91e3441234..0133e40f12 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -1349,7 +1349,7 @@ static bool8 ExtractMonDataToSummaryStruct(struct Pokemon *a) } break; case 3: - GetMonData(a, MON_DATA_OT_NAME, &sum->OTName); + GetMonData(a, MON_DATA_OT_NAME, sum->OTName); ConvertInternationalString((u8*)&sum->OTName, GetMonData(a, MON_DATA_LANGUAGE)); sum->unk7 = sub_81B205C(a); sum->OTGender = GetMonData(a, MON_DATA_OT_GENDER); diff --git a/src/siirtc.c b/src/siirtc.c index f7e85ef4fa..5c153a8413 100644 --- a/src/siirtc.c +++ b/src/siirtc.c @@ -76,19 +76,19 @@ static void DisableGpioPortRead(); static const char AgbLibRtcVersion[] = "SIIRTC_V001"; -void SiiRtcUnprotect() +void SiiRtcUnprotect(void) { EnableGpioPortRead(); sLocked = FALSE; } -void SiiRtcProtect() +void SiiRtcProtect(void) { DisableGpioPortRead(); sLocked = TRUE; } -u8 SiiRtcProbe() +u8 SiiRtcProbe(void) { u8 errorCode; struct SiiRtcInfo rtc; @@ -129,7 +129,7 @@ u8 SiiRtcProbe() return (errorCode << 4) | 1; } -bool8 SiiRtcReset() +bool8 SiiRtcReset(void) { u8 result; struct SiiRtcInfo rtc; From 4ea5e85bed767a8cffea1fdcfac8669dff06c632 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sat, 2 Mar 2019 17:40:38 -0500 Subject: [PATCH 169/217] Fix typos This is an updated version of #554, since it hasn't been updated in two weeks. --- asm/macros/battle_script.inc | 2 +- data/battle_scripts_1.s | 6 +++--- include/battle.h | 2 +- include/battle_scripts.h | 4 ++-- include/battle_util.h | 4 ++-- src/battle_main.c | 2 +- src/battle_script_commands.c | 8 ++++---- src/battle_util.c | 28 ++++++++++++++-------------- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 6370ef5697..ed32e46431 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1078,7 +1078,7 @@ .4byte \param0 .endm - .macro tryimprision param0:req + .macro tryimprison param0:req .byte 0xdb .4byte \param0 .endm diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 8ddf56ef85..0159a3f73d 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2538,7 +2538,7 @@ BattleScript_EffectImprison:: attackcanceler attackstring ppreduce - tryimprision BattleScript_ButItFailed + tryimprison BattleScript_ButItFailed attackanimation waitanimation printstring STRINGID_PKMNSEALEDOPPONENTMOVE @@ -3684,11 +3684,11 @@ BattleScript_MoveUsedIsImprisoned:: waitmessage 0x40 goto BattleScript_MoveEnd -BattleScript_SelectingImprisionedMove:: +BattleScript_SelectingImprisonedMove:: printselectionstring STRINGID_PKMNCANTUSEMOVESEALED endselectionscript -BattleScript_SelectingImprisionedMoveInPalace:: +BattleScript_SelectingImprisonedMoveInPalace:: printstring STRINGID_PKMNCANTUSEMOVESEALED goto BattleScript_SelectingUnusableMoveInPalace diff --git a/include/battle.h b/include/battle.h index 94596c75ea..d155ca5a09 100644 --- a/include/battle.h +++ b/include/battle.h @@ -175,7 +175,7 @@ struct ProtectStruct u32 targetNotAffected:1; u32 chargingTurn:1; u32 fleeFlag:2; // For RunAway and Smoke Ball. - u32 usedImprisionedMove:1; + u32 usedImprisonedMove:1; u32 loveImmobility:1; u32 usedDisabledMove:1; u32 usedTauntedMove:1; diff --git a/include/battle_scripts.h b/include/battle_scripts.h index a23fa6948f..5f314401a9 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -88,8 +88,8 @@ extern const u8 BattleScript_IngrainTurnHeal[]; extern const u8 BattleScript_AtkDefDown[]; extern const u8 BattleScript_KnockedOff[]; extern const u8 BattleScript_MoveUsedIsImprisoned[]; -extern const u8 BattleScript_SelectingImprisionedMove[]; -extern const u8 BattleScript_SelectingImprisionedMoveInPalace[]; +extern const u8 BattleScript_SelectingImprisonedMove[]; +extern const u8 BattleScript_SelectingImprisonedMoveInPalace[]; extern const u8 BattleScript_GrudgeTakesPp[]; extern const u8 BattleScript_MagicCoatBounce[]; extern const u8 BattleScript_SnatchedMove[]; diff --git a/include/battle_util.h b/include/battle_util.h index 71bb22a005..0756a387a2 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -6,7 +6,7 @@ #define MOVE_LIMITATION_DISABLED (1 << 2) #define MOVE_LIMITATION_TORMENTED (1 << 3) #define MOVE_LIMITATION_TAUNT (1 << 4) -#define MOVE_LIMITATION_IMPRISION (1 << 5) +#define MOVE_LIMITATION_IMPRISON (1 << 5) #define ABILITYEFFECT_ON_SWITCHIN 0x0 #define ABILITYEFFECT_ENDTURN 0x1 @@ -44,7 +44,7 @@ u8 GetBattlerForBattleScript(u8 caseId); void PressurePPLose(u8 target, u8 attacker, u16 move); void PressurePPLoseOnUsingPerishSong(u8 attacker); -void PressurePPLoseOnUsingImprision(u8 attacker); +void PressurePPLoseOnUsingImprison(u8 attacker); void MarkAllBattlersForControllerExec(void); // unused void MarkBattlerForControllerExec(u8 battlerId); void sub_803F850(u8 arg0); diff --git a/src/battle_main.c b/src/battle_main.c index 043e758087..853dafe01f 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3279,7 +3279,7 @@ void FaintClearSetData(void) gProtectStructs[gActiveBattler].targetNotAffected = 0; gProtectStructs[gActiveBattler].chargingTurn = 0; gProtectStructs[gActiveBattler].fleeFlag = 0; - gProtectStructs[gActiveBattler].usedImprisionedMove = 0; + gProtectStructs[gActiveBattler].usedImprisonedMove = 0; gProtectStructs[gActiveBattler].loveImmobility = 0; gProtectStructs[gActiveBattler].usedDisabledMove = 0; gProtectStructs[gActiveBattler].usedTauntedMove = 0; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index a53fa30f21..620366b52d 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -297,7 +297,7 @@ static void atkD7_setyawn(void); static void atkD8_setdamagetohealthdifference(void); static void atkD9_scaledamagebyhealthratio(void); static void atkDA_tryswapabilities(void); -static void atkDB_tryimprision(void); +static void atkDB_tryimprison(void); static void atkDC_trysetgrudge(void); static void atkDD_weightdamagecalculation(void); static void atkDE_asistattackselect(void); @@ -549,7 +549,7 @@ void (* const gBattleScriptingCommandsTable[])(void) = atkD8_setdamagetohealthdifference, atkD9_scaledamagebyhealthratio, atkDA_tryswapabilities, - atkDB_tryimprision, + atkDB_tryimprison, atkDC_trysetgrudge, atkDD_weightdamagecalculation, atkDE_asistattackselect, @@ -9611,7 +9611,7 @@ static void atkDA_tryswapabilities(void) // skill swap } } -static void atkDB_tryimprision(void) +static void atkDB_tryimprison(void) { if ((gStatuses3[gBattlerAttacker] & STATUS3_IMPRISONED_OTHERS)) { @@ -9622,7 +9622,7 @@ static void atkDB_tryimprision(void) u8 battlerId, sideAttacker; sideAttacker = GetBattlerSide(gBattlerAttacker); - PressurePPLoseOnUsingImprision(gBattlerAttacker); + PressurePPLoseOnUsingImprison(gBattlerAttacker); for (battlerId = 0; battlerId < gBattlersCount; battlerId++) { if (sideAttacker != GetBattlerSide(battlerId)) diff --git a/src/battle_util.c b/src/battle_util.c index 2f583a9c7e..fc6042b65f 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -106,10 +106,10 @@ void PressurePPLose(u8 target, u8 attacker, u16 move) } } -void PressurePPLoseOnUsingImprision(u8 attacker) +void PressurePPLoseOnUsingImprison(u8 attacker) { int i, j; - int imprisionPos = 4; + int imprisonPos = 4; u8 atkSide = GetBattlerSide(attacker); for (i = 0; i < gBattlersCount; i++) @@ -123,19 +123,19 @@ void PressurePPLoseOnUsingImprision(u8 attacker) } if (j != MAX_MON_MOVES) { - imprisionPos = j; + imprisonPos = j; if (gBattleMons[attacker].pp[j] != 0) gBattleMons[attacker].pp[j]--; } } } - if (imprisionPos != 4 + if (imprisonPos != 4 && !(gBattleMons[attacker].status2 & STATUS2_TRANSFORMED) - && !(gDisableStructs[attacker].mimickedMoves & gBitTable[imprisionPos])) + && !(gDisableStructs[attacker].mimickedMoves & gBitTable[imprisonPos])) { gActiveBattler = attacker; - BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + imprisionPos, 0, 1, &gBattleMons[gActiveBattler].pp[imprisionPos]); + BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + imprisonPos, 0, 1, &gBattleMons[gActiveBattler].pp[imprisonPos]); MarkBattlerForControllerExec(gActiveBattler); } } @@ -224,7 +224,7 @@ bool8 WasUnableToUseMove(u8 battler) { if (gProtectStructs[battler].prlzImmobility || gProtectStructs[battler].targetNotAffected - || gProtectStructs[battler].usedImprisionedMove + || gProtectStructs[battler].usedImprisonedMove || gProtectStructs[battler].loveImmobility || gProtectStructs[battler].usedDisabledMove || gProtectStructs[battler].usedTauntedMove @@ -365,12 +365,12 @@ u8 TrySetCantSelectMoveBattleScript(void) gCurrentMove = move; if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { - gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisionedMoveInPalace; + gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisonedMoveInPalace; gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1; } else { - gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisionedMove; + gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisonedMove; limitations++; } } @@ -438,7 +438,7 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check) unusableMoves |= gBitTable[i]; if (gDisableStructs[battlerId].tauntTimer && check & MOVE_LIMITATION_TAUNT && gBattleMoves[gBattleMons[battlerId].moves[i]].power == 0) unusableMoves |= gBitTable[i]; - if (GetImprisonedMovesCount(battlerId, gBattleMons[battlerId].moves[i]) && check & MOVE_LIMITATION_IMPRISION) + if (GetImprisonedMovesCount(battlerId, gBattleMons[battlerId].moves[i]) && check & MOVE_LIMITATION_IMPRISON) unusableMoves |= gBitTable[i]; if (gDisableStructs[battlerId].encoreTimer && gDisableStructs[battlerId].encoredMove != gBattleMons[battlerId].moves[i]) unusableMoves |= gBitTable[i]; @@ -469,7 +469,7 @@ bool8 AreAllMovesUnusable(void) u8 GetImprisonedMovesCount(u8 battlerId, u16 move) { s32 i; - u8 imprisionedMoves = 0; + u8 imprisonedMoves = 0; u8 battlerSide = GetBattlerSide(battlerId); for (i = 0; i < gBattlersCount; i++) @@ -483,11 +483,11 @@ u8 GetImprisonedMovesCount(u8 battlerId, u16 move) break; } if (j < MAX_MON_MOVES) - imprisionedMoves++; + imprisonedMoves++; } } - return imprisionedMoves; + return imprisonedMoves; } enum @@ -1466,7 +1466,7 @@ u8 AtkCanceller_UnableToUseMove(void) case CANCELLER_IMPRISONED: // imprisoned if (GetImprisonedMovesCount(gBattlerAttacker, gCurrentMove)) { - gProtectStructs[gBattlerAttacker].usedImprisionedMove = 1; + gProtectStructs[gBattlerAttacker].usedImprisonedMove = 1; CancelMultiTurnMoves(gBattlerAttacker); gBattlescriptCurrInstr = BattleScript_MoveUsedIsImprisoned; gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; From 1e7f4a80c77832d952688206bd7c98e11dba25ba Mon Sep 17 00:00:00 2001 From: shinny456 Date: Sun, 3 Mar 2019 03:54:44 -0500 Subject: [PATCH 170/217] port the rest of flying (leave 2 nonmatchings to egg) --- asm/flying.s | 1698 ------------------------------------------------- ld_script.txt | 1 - src/flying.c | 1209 ++++++++++++++++++++++++++++++++++- 3 files changed, 1199 insertions(+), 1709 deletions(-) delete mode 100644 asm/flying.s diff --git a/asm/flying.s b/asm/flying.s deleted file mode 100644 index 37873f17bf..0000000000 --- a/asm/flying.s +++ /dev/null @@ -1,1698 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_810E520 -sub_810E520: @ 810E520 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r5, r0, 0 - movs r6, 0 - adds r4, r5, 0 - adds r4, 0x2E - ldrb r2, [r4] - movs r7, 0x1 - movs r0, 0x1 - mov r9, r0 - ands r0, r2 - cmp r0, 0 - beq _0810E55A - ldrb r0, [r4, 0x1] - adds r1, r0, 0 - adds r1, 0xFF - strb r1, [r4, 0x1] - lsls r0, 24 - cmp r0, 0 - beq _0810E54E - b _0810EA36 -_0810E54E: - movs r0, 0x2 - negs r0, r0 - ands r0, r2 - strb r0, [r4] - strb r6, [r4, 0x1] - b _0810EA36 -_0810E55A: - ldrh r0, [r4, 0x2] - lsrs r1, r0, 6 - mov r12, r0 - cmp r1, 0x1 - bne _0810E566 - b _0810E68A -_0810E566: - cmp r1, 0x1 - bgt _0810E570 - cmp r1, 0 - beq _0810E57E - b _0810E97C -_0810E570: - cmp r1, 0x2 - bne _0810E576 - b _0810E77E -_0810E576: - cmp r1, 0x3 - bne _0810E57C - b _0810E872 -_0810E57C: - b _0810E97C -_0810E57E: - lsls r1, r2, 24 - lsrs r0, r1, 28 - cmp r0, 0x1 - bne _0810E592 - movs r0, 0x8 - orrs r0, r2 - orrs r0, r7 - strb r0, [r4] - strb r6, [r4, 0x1] - b _0810E680 -_0810E592: - lsrs r0, r1, 28 - cmp r0, 0x3 - bne _0810E5B4 - lsls r0, r2, 30 - lsrs r0, 31 - movs r1, 0x1 - eors r0, r1 - ands r0, r7 - lsls r0, 1 - movs r1, 0x3 - negs r1, r1 - ands r1, r2 - orrs r1, r0 - orrs r1, r7 - strb r1, [r4] - strb r6, [r4, 0x1] - b _0810E680 -_0810E5B4: - movs r0, 0x8 - ands r0, r2 - cmp r0, 0 - beq _0810E680 - adds r3, r5, 0 - adds r3, 0x3F - ldrb r2, [r3] - lsls r1, r2, 31 - lsrs r1, 31 - movs r6, 0x1 - eors r1, r6 - ands r1, r7 - movs r0, 0x2 - negs r0, r0 - mov r8, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - lsls r0, 31 - lsrs r0, 31 - adds r1, r5, 0 - adds r1, 0x2A - strb r0, [r1] - ldrb r0, [r3] - movs r1, 0x4 - orrs r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - strb r0, [r3] - ldrb r1, [r4] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0810E672 - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _0810E642 - ldrb r1, [r4, 0xE] - mov r0, r9 - ands r0, r1 - cmp r0, 0 - bne _0810E628 - ldrb r2, [r5, 0x5] - lsls r1, r2, 28 - lsrs r1, 30 - subs r1, 0x1 - movs r0, 0x3 - ands r1, r0 - lsls r1, 2 - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - b _0810E660 -_0810E628: - ldrb r2, [r5, 0x5] - lsls r1, r2, 28 - lsrs r1, 30 - adds r1, 0x1 - movs r0, 0x3 - ands r1, r0 - lsls r1, 2 - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - b _0810E660 -_0810E642: - ldrb r1, [r4, 0xE] - mov r0, r9 - ands r0, r1 - cmp r0, 0 - bne _0810E656 - adds r1, r5, 0 - adds r1, 0x43 - ldrb r0, [r1] - subs r0, 0xC - b _0810E65E -_0810E656: - adds r1, r5, 0 - adds r1, 0x43 - ldrb r0, [r1] - adds r0, 0xC -_0810E65E: - strb r0, [r1] -_0810E660: - ldrb r2, [r4, 0xE] - lsls r0, r2, 31 - lsrs r0, 31 - eors r0, r6 - ands r0, r7 - mov r1, r8 - ands r1, r2 - orrs r1, r0 - strb r1, [r4, 0xE] -_0810E672: - ldrb r1, [r4] - movs r0, 0x9 - negs r0, r0 - ands r0, r1 - strb r0, [r4] - ldrh r1, [r4, 0x2] - mov r12, r1 -_0810E680: - ldrb r1, [r4] - movs r0, 0xF - ands r0, r1 - strb r0, [r4] - b _0810E97C -_0810E68A: - lsls r1, r2, 24 - lsrs r0, r1, 28 - cmp r0, 0 - bne _0810E698 - movs r0, 0x8 - orrs r0, r2 - b _0810E6A0 -_0810E698: - lsrs r0, r1, 28 - cmp r0, 0x2 - bne _0810E6A8 - adds r0, r2, 0 -_0810E6A0: - orrs r0, r7 - strb r0, [r4] - strb r6, [r4, 0x1] - b _0810E774 -_0810E6A8: - movs r0, 0x8 - ands r0, r2 - cmp r0, 0 - beq _0810E774 - adds r3, r5, 0 - adds r3, 0x3F - ldrb r2, [r3] - lsls r1, r2, 31 - lsrs r1, 31 - movs r6, 0x1 - eors r1, r6 - ands r1, r7 - movs r0, 0x2 - negs r0, r0 - mov r8, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - lsls r0, 31 - lsrs r0, 31 - adds r1, r5, 0 - adds r1, 0x2A - strb r0, [r1] - ldrb r0, [r3] - movs r1, 0x4 - orrs r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - strb r0, [r3] - ldrb r1, [r4] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0810E766 - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _0810E736 - ldrb r1, [r4, 0xE] - mov r0, r9 - ands r0, r1 - cmp r0, 0 - bne _0810E71C - ldrb r2, [r5, 0x5] - lsls r1, r2, 28 - lsrs r1, 30 - subs r1, 0x1 - movs r0, 0x3 - ands r1, r0 - lsls r1, 2 - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - b _0810E754 -_0810E71C: - ldrb r2, [r5, 0x5] - lsls r1, r2, 28 - lsrs r1, 30 - adds r1, 0x1 - movs r0, 0x3 - ands r1, r0 - lsls r1, 2 - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - b _0810E754 -_0810E736: - ldrb r1, [r4, 0xE] - mov r0, r9 - ands r0, r1 - cmp r0, 0 - bne _0810E74A - adds r1, r5, 0 - adds r1, 0x43 - ldrb r0, [r1] - subs r0, 0xC - b _0810E752 -_0810E74A: - adds r1, r5, 0 - adds r1, 0x43 - ldrb r0, [r1] - adds r0, 0xC -_0810E752: - strb r0, [r1] -_0810E754: - ldrb r2, [r4, 0xE] - lsls r0, r2, 31 - lsrs r0, 31 - eors r0, r6 - ands r0, r7 - mov r1, r8 - ands r1, r2 - orrs r1, r0 - strb r1, [r4, 0xE] -_0810E766: - ldrb r1, [r4] - movs r0, 0x9 - negs r0, r0 - ands r0, r1 - strb r0, [r4] - ldrh r1, [r4, 0x2] - mov r12, r1 -_0810E774: - ldrb r0, [r4] - movs r1, 0xF - ands r1, r0 - movs r0, 0x10 - b _0810E978 -_0810E77E: - lsls r1, r2, 24 - lsrs r0, r1, 28 - cmp r0, 0x3 - bne _0810E78C - movs r0, 0x8 - orrs r0, r2 - b _0810E794 -_0810E78C: - lsrs r0, r1, 28 - cmp r0, 0x1 - bne _0810E79C - adds r0, r2, 0 -_0810E794: - orrs r0, r7 - strb r0, [r4] - strb r6, [r4, 0x1] - b _0810E868 -_0810E79C: - movs r0, 0x8 - ands r0, r2 - cmp r0, 0 - beq _0810E868 - adds r3, r5, 0 - adds r3, 0x3F - ldrb r2, [r3] - lsls r1, r2, 31 - lsrs r1, 31 - movs r6, 0x1 - eors r1, r6 - ands r1, r7 - movs r0, 0x2 - negs r0, r0 - mov r8, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - lsls r0, 31 - lsrs r0, 31 - adds r1, r5, 0 - adds r1, 0x2A - strb r0, [r1] - ldrb r0, [r3] - movs r1, 0x4 - orrs r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - strb r0, [r3] - ldrb r1, [r4] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0810E85A - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _0810E82A - ldrb r1, [r4, 0xE] - mov r0, r9 - ands r0, r1 - cmp r0, 0 - bne _0810E810 - ldrb r2, [r5, 0x5] - lsls r1, r2, 28 - lsrs r1, 30 - subs r1, 0x1 - movs r0, 0x3 - ands r1, r0 - lsls r1, 2 - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - b _0810E848 -_0810E810: - ldrb r2, [r5, 0x5] - lsls r1, r2, 28 - lsrs r1, 30 - adds r1, 0x1 - movs r0, 0x3 - ands r1, r0 - lsls r1, 2 - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - b _0810E848 -_0810E82A: - ldrb r1, [r4, 0xE] - mov r0, r9 - ands r0, r1 - cmp r0, 0 - bne _0810E83E - adds r1, r5, 0 - adds r1, 0x43 - ldrb r0, [r1] - subs r0, 0xC - b _0810E846 -_0810E83E: - adds r1, r5, 0 - adds r1, 0x43 - ldrb r0, [r1] - adds r0, 0xC -_0810E846: - strb r0, [r1] -_0810E848: - ldrb r2, [r4, 0xE] - lsls r0, r2, 31 - lsrs r0, 31 - eors r0, r6 - ands r0, r7 - mov r1, r8 - ands r1, r2 - orrs r1, r0 - strb r1, [r4, 0xE] -_0810E85A: - ldrb r1, [r4] - movs r0, 0x9 - negs r0, r0 - ands r0, r1 - strb r0, [r4] - ldrh r1, [r4, 0x2] - mov r12, r1 -_0810E868: - ldrb r0, [r4] - movs r1, 0xF - ands r1, r0 - movs r0, 0x20 - b _0810E978 -_0810E872: - lsls r1, r2, 24 - lsrs r0, r1, 28 - cmp r0, 0x2 - bne _0810E882 - movs r0, 0x8 - orrs r0, r2 - strb r0, [r4] - b _0810E970 -_0810E882: - lsrs r0, r1, 28 - cmp r0, 0 - bne _0810E8A4 - lsls r0, r2, 30 - lsrs r0, 31 - movs r1, 0x1 - eors r0, r1 - ands r0, r7 - lsls r0, 1 - movs r1, 0x3 - negs r1, r1 - ands r1, r2 - orrs r1, r0 - orrs r1, r7 - strb r1, [r4] - strb r6, [r4, 0x1] - b _0810E970 -_0810E8A4: - movs r0, 0x8 - ands r0, r2 - cmp r0, 0 - beq _0810E970 - adds r3, r5, 0 - adds r3, 0x3F - ldrb r2, [r3] - lsls r1, r2, 31 - lsrs r1, 31 - movs r6, 0x1 - eors r1, r6 - ands r1, r7 - movs r0, 0x2 - negs r0, r0 - mov r8, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - lsls r0, 31 - lsrs r0, 31 - adds r1, r5, 0 - adds r1, 0x2A - strb r0, [r1] - ldrb r0, [r3] - movs r1, 0x4 - orrs r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - strb r0, [r3] - ldrb r1, [r4] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0810E962 - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _0810E932 - ldrb r1, [r4, 0xE] - mov r0, r9 - ands r0, r1 - cmp r0, 0 - bne _0810E918 - ldrb r2, [r5, 0x5] - lsls r1, r2, 28 - lsrs r1, 30 - subs r1, 0x1 - movs r0, 0x3 - ands r1, r0 - lsls r1, 2 - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - b _0810E950 -_0810E918: - ldrb r2, [r5, 0x5] - lsls r1, r2, 28 - lsrs r1, 30 - adds r1, 0x1 - movs r0, 0x3 - ands r1, r0 - lsls r1, 2 - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - b _0810E950 -_0810E932: - ldrb r1, [r4, 0xE] - mov r0, r9 - ands r0, r1 - cmp r0, 0 - bne _0810E946 - adds r1, r5, 0 - adds r1, 0x43 - ldrb r0, [r1] - subs r0, 0xC - b _0810E94E -_0810E946: - adds r1, r5, 0 - adds r1, 0x43 - ldrb r0, [r1] - adds r0, 0xC -_0810E94E: - strb r0, [r1] -_0810E950: - ldrb r2, [r4, 0xE] - lsls r0, r2, 31 - lsrs r0, 31 - eors r0, r6 - ands r0, r7 - mov r1, r8 - ands r1, r2 - orrs r1, r0 - strb r1, [r4, 0xE] -_0810E962: - ldrb r1, [r4] - movs r0, 0x9 - negs r0, r0 - ands r0, r1 - strb r0, [r4] - ldrh r1, [r4, 0x2] - mov r12, r1 -_0810E970: - ldrb r0, [r4] - movs r1, 0xF - ands r1, r0 - movs r0, 0x30 -_0810E978: - orrs r1, r0 - strb r1, [r4] -_0810E97C: - ldrb r1, [r4] - lsls r1, 30 - lsrs r1, 31 - adds r0, r4, 0 - adds r0, 0xC - adds r0, r1 - ldrb r1, [r0] - ldr r3, =gSineTable - mov r2, r12 - lsls r0, r2, 1 - adds r0, r3 - movs r2, 0 - ldrsh r0, [r0, r2] - muls r0, r1 - asrs r0, 8 - strh r0, [r5, 0x24] - ldrb r2, [r5, 0x3] - lsls r2, 26 - lsrs r2, 27 - movs r1, 0x24 - ldrsh r0, [r5, r1] - negs r0, r0 - asrs r0, 1 - ldrb r1, [r4, 0xA] - adds r0, r1 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 1 - adds r1, r3 - ldrh r6, [r1] - ldr r1, =gOamMatrices - lsls r2, 3 - adds r2, r1 - adds r0, 0x40 - lsls r0, 1 - adds r0, r3 - ldrh r0, [r0] - strh r0, [r2, 0x6] - strh r0, [r2] - strh r6, [r2, 0x2] - lsls r0, r6, 16 - asrs r0, 16 - negs r0, r0 - strh r0, [r2, 0x4] - ldrh r0, [r4, 0x6] - ldrh r2, [r4, 0x8] - adds r0, r2 - strh r0, [r4, 0x8] - lsls r0, 16 - lsrs r0, 24 - strh r0, [r5, 0x22] - movs r1, 0x4 - ldrsh r0, [r4, r1] - movs r1, 0x80 - lsls r1, 8 - ands r0, r1 - cmp r0, 0 - beq _0810EA0C - ldrh r0, [r4, 0x4] - subs r1, 0x1 - ands r1, r0 - ldrh r0, [r4, 0x2] - subs r0, r1 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x2] - b _0810EA1C - .pool -_0810EA0C: - ldrh r0, [r4, 0x4] - ldr r1, =0x00007fff - ands r1, r0 - ldrh r2, [r4, 0x2] - adds r1, r2 - movs r0, 0xFF - ands r1, r0 - strh r1, [r4, 0x2] -_0810EA1C: - movs r0, 0x22 - ldrsh r1, [r5, r0] - movs r2, 0x26 - ldrsh r0, [r5, r2] - adds r1, r0 - ldrh r0, [r4, 0xE] - lsrs r0, 1 - cmp r1, r0 - blt _0810EA36 - movs r0, 0 - strh r0, [r5, 0x2E] - ldr r0, =sub_810E2C8 - str r0, [r5, 0x1C] -_0810EA36: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810E520 - - thumb_func_start sub_810EA4C -sub_810EA4C: @ 810EA4C - push {r4,r5,lr} - adds r4, r0, 0 - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl GetBattlerSpriteBGPriority - movs r1, 0x3 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r4, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r4, 0x5] - ldr r5, =gBattleAnimAttacker - ldrb r0, [r5] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x20] - ldrb r0, [r5] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x22] - ldr r0, =TranslateAnimSpriteToTargetMonLocation - str r0, [r4, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810EA4C - - thumb_func_start sub_810EAA0 -sub_810EAA0: @ 810EAA0 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, =gBattleAnimArgs - movs r1, 0x4 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _0810EABC - adds r0, r5, 0 - movs r1, 0 - bl InitSpritePosToAnimAttacker - b _0810EAC4 - .pool -_0810EABC: - adds r0, r5, 0 - movs r1, 0 - bl InitSpritePosToAnimTarget -_0810EAC4: - ldr r4, =gBattleAnimArgs - movs r2, 0x4 - ldrsh r0, [r4, r2] - cmp r0, 0 - bne _0810EADC - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _0810EAF2 -_0810EADC: - movs r1, 0x4 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - bne _0810EAF8 - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _0810EAF8 -_0810EAF2: - ldrh r0, [r5, 0x20] - adds r0, 0x8 - strh r0, [r5, 0x20] -_0810EAF8: - ldr r4, =gBattleAnimArgs - ldrb r1, [r4, 0x8] - adds r0, r5, 0 - bl SeekSpriteAnim - ldrh r0, [r5, 0x20] - subs r0, 0x20 - strh r0, [r5, 0x20] - ldr r0, =0x00000ccc - strh r0, [r5, 0x30] - ldrh r1, [r4, 0x8] - movs r0, 0xC - adds r2, r0, 0 - muls r2, r1 - adds r0, r2, 0 - ldrh r2, [r5, 0x24] - adds r0, r2 - strh r0, [r5, 0x24] - strh r1, [r5, 0x2E] - ldrh r0, [r4, 0x6] - strh r0, [r5, 0x3C] - ldr r0, =sub_810EB40 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810EAA0 - - thumb_func_start sub_810EB40 -sub_810EB40: @ 810EB40 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 24 - ldrh r1, [r4, 0x24] - adds r0, r1 - movs r1, 0 - strh r0, [r4, 0x24] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x6 - bne _0810EB6A - strh r1, [r4, 0x2E] - strh r1, [r4, 0x24] - adds r0, r4, 0 - bl StartSpriteAnim -_0810EB6A: - ldrh r0, [r4, 0x3C] - subs r0, 0x1 - strh r0, [r4, 0x3C] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _0810EB82 - adds r0, r4, 0 - bl DestroyAnimSprite -_0810EB82: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_810EB40 - - thumb_func_start sub_810EB88 -sub_810EB88: @ 810EB88 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r0, 24 - adds r6, r0, 0 - ldr r1, =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r7, r0, r1 - ldrh r0, [r7, 0x8] - movs r1, 0x1F - ands r0, r1 - cmp r0, 0 - bne _0810EC02 - ldr r1, =gAnimVisualTaskCount - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - movs r1, 0x8 - ldrsh r0, [r7, r1] - movs r5, 0xD - negs r5, r5 - adds r1, r5, 0 - bl Sin - ldr r4, =gBattleAnimArgs - strh r0, [r4] - movs r1, 0x8 - ldrsh r0, [r7, r1] - adds r1, r5, 0 - bl Cos - strh r0, [r4, 0x2] - movs r0, 0x1 - strh r0, [r4, 0x4] - movs r0, 0x3 - strh r0, [r4, 0x6] - ldr r0, =gUnknown_085973E8 - mov r8, r0 - ldr r5, =gBattleAnimTarget - ldrb r0, [r5] - movs r1, 0x2 - bl GetBattlerSpriteCoord - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldrb r0, [r5] - movs r1, 0x3 - bl GetBattlerSpriteCoord - adds r2, r0, 0 - lsls r2, 24 - lsrs r2, 24 - mov r0, r8 - adds r1, r4, 0 - movs r3, 0x3 - bl CreateSpriteAndAnimate -_0810EC02: - ldrh r0, [r7, 0x8] - adds r0, 0x8 - strh r0, [r7, 0x8] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xFF - ble _0810EC16 - adds r0, r6, 0 - bl DestroyAnimVisualTask -_0810EC16: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810EB88 - - thumb_func_start sub_810EC34 -sub_810EC34: @ 810EC34 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _0810EC46 - cmp r0, 0x1 - beq _0810EC78 - b _0810EC8C -_0810EC46: - adds r0, r4, 0 - movs r1, 0x1 - bl InitSpritePosToAnimAttacker - movs r0, 0 - bl GetAnimBattlerSpriteId - ldr r2, =gSprites - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - b _0810EC8C - .pool -_0810EC78: - adds r0, r4, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _0810EC8C - adds r0, r4, 0 - bl DestroyAnimSprite -_0810EC8C: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_810EC34 - - thumb_func_start sub_810EC94 -sub_810EC94: @ 810EC94 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _0810ECCC - cmp r0, 0x1 - bgt _0810ECAA - cmp r0, 0 - beq _0810ECB0 - b _0810ED1E -_0810ECAA: - cmp r0, 0x2 - beq _0810ECE0 - b _0810ED1E -_0810ECB0: - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x22] - negs r0, r0 - subs r0, 0x20 - strh r0, [r4, 0x26] - b _0810ECD8 - .pool -_0810ECCC: - ldrh r0, [r4, 0x26] - adds r0, 0xA - strh r0, [r4, 0x26] - lsls r0, 16 - cmp r0, 0 - blt _0810ED1E -_0810ECD8: - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - b _0810ED1E -_0810ECE0: - ldrh r0, [r4, 0x26] - subs r0, 0xA - strh r0, [r4, 0x26] - movs r2, 0x22 - ldrsh r0, [r4, r2] - movs r2, 0x26 - ldrsh r1, [r4, r2] - adds r0, r1 - movs r1, 0x20 - negs r1, r1 - cmp r0, r1 - bge _0810ED1E - movs r0, 0 - bl GetAnimBattlerSpriteId - ldr r2, =gSprites - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - adds r1, 0x3E - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - adds r0, r4, 0 - bl DestroyAnimSprite -_0810ED1E: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810EC94 - - thumb_func_start sub_810ED28 -sub_810ED28: @ 810ED28 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl InitSpritePosToAnimAttacker - ldr r1, =gBattleAnimArgs - ldrh r0, [r1, 0x4] - strh r0, [r4, 0x2E] - ldrh r0, [r1, 0x6] - strh r0, [r4, 0x30] - ldr r0, =sub_810ED70 - str r0, [r4, 0x1C] - movs r0, 0 - bl GetAnimBattlerSpriteId - ldr r2, =gSprites - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810ED28 - - thumb_func_start sub_810ED70 -sub_810ED70: @ 810ED70 - push {lr} - adds r2, r0, 0 - ldrh r1, [r2, 0x2E] - movs r3, 0x2E - ldrsh r0, [r2, r3] - cmp r0, 0 - ble _0810ED84 - subs r0, r1, 0x1 - strh r0, [r2, 0x2E] - b _0810EDC8 -_0810ED84: - movs r1, 0x22 - ldrsh r0, [r2, r1] - movs r3, 0x26 - ldrsh r1, [r2, r3] - adds r0, r1 - movs r1, 0x20 - negs r1, r1 - cmp r0, r1 - ble _0810EDAA - ldrh r0, [r2, 0x30] - ldrh r1, [r2, 0x32] - adds r0, r1 - strh r0, [r2, 0x32] - lsls r0, 16 - asrs r0, 24 - ldrh r1, [r2, 0x26] - subs r1, r0 - strh r1, [r2, 0x26] - b _0810EDC8 -_0810EDAA: - adds r3, r2, 0 - adds r3, 0x3E - ldrb r0, [r3] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r3] - ldrh r0, [r2, 0x34] - adds r1, r0, 0x1 - strh r1, [r2, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x14 - ble _0810EDC8 - ldr r0, =sub_810EDD0 - str r0, [r2, 0x1C] -_0810EDC8: - pop {r0} - bx r0 - .pool - thumb_func_end sub_810ED70 - - thumb_func_start sub_810EDD0 -sub_810EDD0: @ 810EDD0 - push {lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x32] - lsls r0, 16 - asrs r0, 24 - ldrh r1, [r2, 0x26] - adds r0, r1 - strh r0, [r2, 0x26] - movs r3, 0x22 - ldrsh r0, [r2, r3] - movs r3, 0x26 - ldrsh r1, [r2, r3] - adds r0, r1 - movs r1, 0x20 - negs r1, r1 - cmp r0, r1 - ble _0810EE00 - adds r3, r2, 0 - adds r3, 0x3E - ldrb r1, [r3] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r3] -_0810EE00: - movs r1, 0x26 - ldrsh r0, [r2, r1] - cmp r0, 0 - ble _0810EE0E - adds r0, r2, 0 - bl DestroyAnimSprite -_0810EE0E: - pop {r0} - bx r0 - thumb_func_end sub_810EDD0 - - thumb_func_start sub_810EE14 -sub_810EE14: @ 810EE14 - push {r4,r5,lr} - sub sp, 0x4 - adds r5, r0, 0 - movs r1, 0x2E - ldrsh r0, [r5, r1] - cmp r0, 0 - beq _0810EE28 - cmp r0, 0x1 - beq _0810EE80 - b _0810EEEC -_0810EE28: - ldr r0, =gBattleAnimArgs - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r0, 0 - bne _0810EE40 - ldr r4, =gBattleAnimAttacker - b _0810EE42 - .pool -_0810EE40: - ldr r4, =gBattleAnimTarget -_0810EE42: - ldrb r0, [r4] - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x22] - movs r0, 0 - movs r3, 0x80 - lsls r3, 2 - strh r3, [r5, 0x30] - movs r2, 0x80 - lsls r2, 1 - str r0, [sp] - adds r0, r5, 0 - movs r1, 0 - bl TrySetSpriteRotScale - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] - b _0810EEEC - .pool -_0810EE80: - movs r1, 0x32 - ldrsh r0, [r5, r1] - cmp r0, 0xB - bgt _0810EE8E - ldrh r0, [r5, 0x30] - subs r0, 0x28 - b _0810EE92 -_0810EE8E: - ldrh r0, [r5, 0x30] - adds r0, 0x28 -_0810EE92: - strh r0, [r5, 0x30] - ldrh r0, [r5, 0x32] - adds r0, 0x1 - movs r1, 0 - strh r0, [r5, 0x32] - movs r2, 0x80 - lsls r2, 1 - movs r0, 0x30 - ldrsh r3, [r5, r0] - str r1, [sp] - adds r0, r5, 0 - bl TrySetSpriteRotScale - ldrb r1, [r5, 0x3] - lsls r1, 26 - lsrs r1, 27 - movs r0, 0xF4 - lsls r0, 6 - ldr r2, =gOamMatrices - lsls r1, 3 - adds r1, r2 - movs r2, 0x6 - ldrsh r1, [r1, r2] - bl __divsi3 - adds r1, r0, 0x1 - cmp r1, 0x80 - ble _0810EECC - movs r1, 0x80 -_0810EECC: - movs r0, 0x40 - subs r0, r1 - lsrs r1, r0, 31 - adds r0, r1 - asrs r1, r0, 1 - strh r1, [r5, 0x26] - movs r1, 0x32 - ldrsh r0, [r5, r1] - cmp r0, 0x18 - bne _0810EEEC - adds r0, r5, 0 - bl sub_80A749C - adds r0, r5, 0 - bl DestroyAnimSprite -_0810EEEC: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810EE14 - - thumb_func_start sub_810EEF8 -sub_810EEF8: @ 810EEF8 - push {r4,r5,lr} - adds r5, r0, 0 - bl Random2 - ldr r4, =0x000001ff - ands r4, r0 - bl Random2 - movs r1, 0x7F - ands r1, r0 - movs r0, 0x1 - ands r0, r4 - cmp r0, 0 - beq _0810EF20 - movs r2, 0xB8 - lsls r2, 2 - adds r0, r4, r2 - b _0810EF28 - .pool -_0810EF20: - movs r2, 0xB8 - lsls r2, 2 - adds r0, r2, 0 - subs r0, r4 -_0810EF28: - strh r0, [r5, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0810EF3C - movs r2, 0xE0 - lsls r2, 2 - adds r0, r2, 0 - adds r0, r1, r0 - b _0810EF44 -_0810EF3C: - movs r2, 0xE0 - lsls r2, 2 - adds r0, r2, 0 - subs r0, r1 -_0810EF44: - strh r0, [r5, 0x30] - ldr r2, =gBattleAnimArgs - ldrh r0, [r2] - strh r0, [r5, 0x32] - lsls r0, 16 - cmp r0, 0 - beq _0810EF60 - ldrb r0, [r5, 0x3] - movs r1, 0x3F - negs r1, r1 - ands r1, r0 - movs r0, 0x10 - orrs r1, r0 - strb r1, [r5, 0x3] -_0810EF60: - movs r1, 0x2 - ldrsh r0, [r2, r1] - cmp r0, 0 - bne _0810EF74 - ldr r4, =gBattleAnimAttacker - b _0810EF76 - .pool -_0810EF74: - ldr r4, =gBattleAnimTarget -_0810EF76: - ldrb r0, [r4] - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x20 - strh r0, [r5, 0x22] - ldr r0, =sub_810EFA8 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810EEF8 - - thumb_func_start sub_810EFA8 -sub_810EFA8: @ 810EFA8 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x32 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _0810EFC0 - ldrh r3, [r4, 0x2E] - lsls r0, r3, 16 - asrs r0, 24 - ldrh r1, [r4, 0x24] - adds r0, r1 - b _0810EFCA -_0810EFC0: - ldrh r3, [r4, 0x2E] - lsls r1, r3, 16 - asrs r1, 24 - ldrh r0, [r4, 0x24] - subs r0, r1 -_0810EFCA: - strh r0, [r4, 0x24] - ldrh r2, [r4, 0x30] - lsls r1, r2, 16 - asrs r1, 24 - ldrh r0, [r4, 0x26] - subs r0, r1 - strh r0, [r4, 0x26] - strh r3, [r4, 0x2E] - adds r0, r2, 0 - subs r0, 0x20 - strh r0, [r4, 0x30] - lsls r0, r3, 16 - cmp r0, 0 - bge _0810EFEA - movs r0, 0 - strh r0, [r4, 0x2E] -_0810EFEA: - ldrh r0, [r4, 0x34] - adds r0, 0x1 - strh r0, [r4, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1F - bne _0810EFFE - adds r0, r4, 0 - bl DestroyAnimSprite -_0810EFFE: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_810EFA8 - - thumb_func_start sub_810F004 -sub_810F004: @ 810F004 - movs r1, 0 - strh r1, [r0, 0x3A] - movs r1, 0x40 - strh r1, [r0, 0x3C] - ldr r1, =sub_810F018 - str r1, [r0, 0x1C] - bx lr - .pool - thumb_func_end sub_810F004 - - thumb_func_start sub_810F018 -sub_810F018: @ 810F018 - push {lr} - adds r3, r0, 0 - movs r0, 0x2E - ldrsh r1, [r3, r0] - cmp r1, 0 - beq _0810F02A - cmp r1, 0x1 - beq _0810F078 - b _0810F07E -_0810F02A: - ldrh r0, [r3, 0x30] - adds r0, 0x1 - strh r0, [r3, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x8 - ble _0810F07E - strh r1, [r3, 0x30] - movs r1, 0x3E - adds r1, r3 - mov r12, r1 - ldrb r2, [r1] - lsls r0, r2, 29 - lsrs r0, 31 - movs r1, 0x1 - eors r1, r0 - lsls r1, 2 - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - mov r1, r12 - strb r0, [r1] - ldrh r0, [r3, 0x32] - adds r0, 0x1 - strh r0, [r3, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - ble _0810F07E - ldrb r1, [r1] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0810F07E - ldrh r0, [r3, 0x2E] - adds r0, 0x1 - strh r0, [r3, 0x2E] - b _0810F07E -_0810F078: - adds r0, r3, 0 - bl DestroyAnimSprite -_0810F07E: - pop {r0} - bx r0 - thumb_func_end sub_810F018 - - thumb_func_start sub_810F084 -sub_810F084: @ 810F084 - push {r4-r6,lr} - mov r6, r9 - mov r5, r8 - push {r5,r6} - sub sp, 0x4 - mov r8, r0 - ldrh r4, [r0, 0x20] - ldrh r5, [r0, 0x22] - ldr r6, =gBattleAnimAttacker - ldrb r0, [r6] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - mov r1, r8 - strh r0, [r1, 0x20] - ldrb r0, [r6] - movs r1, 0x3 - bl GetBattlerSpriteCoord - adds r6, r0, 0 - lsls r6, 24 - lsrs r6, 24 - mov r2, r8 - strh r6, [r2, 0x22] - ldrh r0, [r2, 0x20] - mov r9, r0 - mov r1, r9 - lsls r0, r1, 4 - strh r0, [r2, 0x36] - lsls r0, r6, 4 - strh r0, [r2, 0x38] - lsls r4, 16 - asrs r4, 16 - movs r1, 0x20 - ldrsh r0, [r2, r1] - subs r0, r4, r0 - lsls r0, 4 - movs r1, 0xC - bl __divsi3 - mov r2, r8 - strh r0, [r2, 0x3A] - lsls r5, 16 - asrs r5, 16 - movs r1, 0x22 - ldrsh r0, [r2, r1] - subs r0, r5, r0 - lsls r0, 4 - movs r1, 0xC - bl __divsi3 - mov r2, r8 - strh r0, [r2, 0x3C] - mov r0, r9 - subs r4, r0 - lsls r4, 16 - asrs r4, 16 - subs r5, r6 - lsls r5, 16 - asrs r5, 16 - adds r0, r4, 0 - adds r1, r5, 0 - bl ArcTan2Neg - lsls r0, 16 - movs r1, 0xC0 - lsls r1, 24 - adds r0, r1 - lsrs r0, 16 - movs r3, 0x80 - lsls r3, 1 - str r0, [sp] - mov r0, r8 - movs r1, 0x1 - adds r2, r3, 0 - bl TrySetSpriteRotScale - ldr r0, =sub_810F140 - mov r2, r8 - str r0, [r2, 0x1C] - add sp, 0x4 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810F084 - - thumb_func_start sub_810F140 -sub_810F140: @ 810F140 - push {lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x3A] - ldrh r1, [r2, 0x36] - adds r0, r1 - strh r0, [r2, 0x36] - ldrh r1, [r2, 0x3C] - ldrh r3, [r2, 0x38] - adds r1, r3 - strh r1, [r2, 0x38] - lsls r0, 16 - asrs r0, 20 - strh r0, [r2, 0x20] - lsls r1, 16 - asrs r3, r1, 20 - strh r3, [r2, 0x22] - adds r0, 0x2D - lsls r0, 16 - movs r1, 0xA5 - lsls r1, 17 - cmp r0, r1 - bhi _0810F17A - adds r1, r3, 0 - cmp r1, 0x9D - bgt _0810F17A - movs r0, 0x2D - negs r0, r0 - cmp r1, r0 - bge _0810F180 -_0810F17A: - adds r0, r2, 0 - bl DestroySpriteAndMatrix -_0810F180: - pop {r0} - bx r0 - thumb_func_end sub_810F140 - - thumb_func_start sub_810F184 -sub_810F184: @ 810F184 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _0810F1BC - movs r0, 0 - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - b _0810F1DA - .pool -_0810F1BC: - movs r0, 0 - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - adds r1, 0x3E - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 -_0810F1DA: - strb r0, [r1] - adds r0, r4, 0 - bl DestroyAnimVisualTask - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810F184 - - .align 2, 0 diff --git a/ld_script.txt b/ld_script.txt index acfd535f89..e60badcc20 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -165,7 +165,6 @@ SECTIONS { src/fight.o(.text); src/poison.o(.text); src/flying.o(.text); - asm/flying.o(.text); src/psychic.o(.text); src/bug.o(.text); src/rock.o(.text); diff --git a/src/flying.c b/src/flying.c index 48df12a067..7f48e57cbd 100644 --- a/src/flying.c +++ b/src/flying.c @@ -4,6 +4,9 @@ #include "trig.h" #include "constants/battle_anim.h" #include "constants/rgb.h" +#include "random.h" + +extern const struct SpriteTemplate gUnknown_085973E8; void sub_810DE70(struct Sprite *); void sub_810DFA8(struct Sprite *); @@ -11,22 +14,29 @@ void sub_810E044(struct Sprite *); void sub_810E13C(struct Sprite *); void sub_810E1C8(struct Sprite *); void sub_810E314(struct Sprite *); -extern void sub_810EA4C(struct Sprite *); -extern void sub_810EAA0(struct Sprite *); -extern void sub_810EC34(struct Sprite *); -extern void sub_810EC94(struct Sprite *); -extern void sub_810ED28(struct Sprite *); -extern void sub_810EE14(struct Sprite *); -extern void sub_810EEF8(struct Sprite *); -extern void sub_810F004(struct Sprite *); -extern void sub_810F084(struct Sprite *); +void sub_810E520(struct Sprite *); +void sub_810EB40(struct Sprite *); +void sub_810EA4C(struct Sprite *); +void sub_810EAA0(struct Sprite *); +void sub_810EC34(struct Sprite *); +void sub_810EC94(struct Sprite *); +void sub_810ED28(struct Sprite *); +void sub_810ED70(struct Sprite *); +void sub_810EDD0(struct Sprite *); +void sub_810EE14(struct Sprite *); +void sub_810EEF8(struct Sprite *); +void sub_810EFA8(struct Sprite *); +void sub_810F004(struct Sprite *); +void sub_810F018(struct Sprite *); +void sub_810F084(struct Sprite *); +void sub_810F140(struct Sprite *); static void sub_810DE98(struct Sprite *); static void sub_810DF18(u8); static void sub_810E028(struct Sprite *); static void sub_810E184(struct Sprite *); static void sub_810E24C(struct Sprite *); -void sub_810E520(struct Sprite *); + const struct SpriteTemplate gUnknown_08596270 = { @@ -626,3 +636,1182 @@ void sub_810E314(struct Sprite *sprite) sprite->callback = sub_810E520; } + +NAKED +void sub_810E520(struct Sprite *sprite) +{ + asm_unified("push {r4-r7,lr}\n\ + mov r7, r9\n\ + mov r6, r8\n\ + push {r6,r7}\n\ + adds r5, r0, 0\n\ + movs r6, 0\n\ + adds r4, r5, 0\n\ + adds r4, 0x2E\n\ + ldrb r2, [r4]\n\ + movs r7, 0x1\n\ + movs r0, 0x1\n\ + mov r9, r0\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _0810E55A\n\ + ldrb r0, [r4, 0x1]\n\ + adds r1, r0, 0\n\ + adds r1, 0xFF\n\ + strb r1, [r4, 0x1]\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + beq _0810E54E\n\ + b _0810EA36\n\ +_0810E54E:\n\ + movs r0, 0x2\n\ + negs r0, r0\n\ + ands r0, r2\n\ + strb r0, [r4]\n\ + strb r6, [r4, 0x1]\n\ + b _0810EA36\n\ +_0810E55A:\n\ + ldrh r0, [r4, 0x2]\n\ + lsrs r1, r0, 6\n\ + mov r12, r0\n\ + cmp r1, 0x1\n\ + bne _0810E566\n\ + b _0810E68A\n\ +_0810E566:\n\ + cmp r1, 0x1\n\ + bgt _0810E570\n\ + cmp r1, 0\n\ + beq _0810E57E\n\ + b _0810E97C\n\ +_0810E570:\n\ + cmp r1, 0x2\n\ + bne _0810E576\n\ + b _0810E77E\n\ +_0810E576:\n\ + cmp r1, 0x3\n\ + bne _0810E57C\n\ + b _0810E872\n\ +_0810E57C:\n\ + b _0810E97C\n\ +_0810E57E:\n\ + lsls r1, r2, 24\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0x1\n\ + bne _0810E592\n\ + movs r0, 0x8\n\ + orrs r0, r2\n\ + orrs r0, r7\n\ + strb r0, [r4]\n\ + strb r6, [r4, 0x1]\n\ + b _0810E680\n\ +_0810E592:\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0x3\n\ + bne _0810E5B4\n\ + lsls r0, r2, 30\n\ + lsrs r0, 31\n\ + movs r1, 0x1\n\ + eors r0, r1\n\ + ands r0, r7\n\ + lsls r0, 1\n\ + movs r1, 0x3\n\ + negs r1, r1\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + orrs r1, r7\n\ + strb r1, [r4]\n\ + strb r6, [r4, 0x1]\n\ + b _0810E680\n\ +_0810E5B4:\n\ + movs r0, 0x8\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _0810E680\n\ + adds r3, r5, 0\n\ + adds r3, 0x3F\n\ + ldrb r2, [r3]\n\ + lsls r1, r2, 31\n\ + lsrs r1, 31\n\ + movs r6, 0x1\n\ + eors r1, r6\n\ + ands r1, r7\n\ + movs r0, 0x2\n\ + negs r0, r0\n\ + mov r8, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r3]\n\ + lsls r0, 31\n\ + lsrs r0, 31\n\ + adds r1, r5, 0\n\ + adds r1, 0x2A\n\ + strb r0, [r1]\n\ + ldrb r0, [r3]\n\ + movs r1, 0x4\n\ + orrs r0, r1\n\ + movs r1, 0x11\n\ + negs r1, r1\n\ + ands r0, r1\n\ + strb r0, [r3]\n\ + ldrb r1, [r4]\n\ + movs r0, 0x4\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0810E672\n\ + bl IsContest\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + bne _0810E642\n\ + ldrb r1, [r4, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0810E628\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + subs r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + b _0810E660\n\ +_0810E628:\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + adds r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + b _0810E660\n\ +_0810E642:\n\ + ldrb r1, [r4, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0810E656\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + subs r0, 0xC\n\ + b _0810E65E\n\ +_0810E656:\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + adds r0, 0xC\n\ +_0810E65E:\n\ + strb r0, [r1]\n\ +_0810E660:\n\ + ldrb r2, [r4, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r6\n\ + ands r0, r7\n\ + mov r1, r8\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + strb r1, [r4, 0xE]\n\ +_0810E672:\n\ + ldrb r1, [r4]\n\ + movs r0, 0x9\n\ + negs r0, r0\n\ + ands r0, r1\n\ + strb r0, [r4]\n\ + ldrh r1, [r4, 0x2]\n\ + mov r12, r1\n\ +_0810E680:\n\ + ldrb r1, [r4]\n\ + movs r0, 0xF\n\ + ands r0, r1\n\ + strb r0, [r4]\n\ + b _0810E97C\n\ +_0810E68A:\n\ + lsls r1, r2, 24\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0\n\ + bne _0810E698\n\ + movs r0, 0x8\n\ + orrs r0, r2\n\ + b _0810E6A0\n\ +_0810E698:\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0x2\n\ + bne _0810E6A8\n\ + adds r0, r2, 0\n\ +_0810E6A0:\n\ + orrs r0, r7\n\ + strb r0, [r4]\n\ + strb r6, [r4, 0x1]\n\ + b _0810E774\n\ +_0810E6A8:\n\ + movs r0, 0x8\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _0810E774\n\ + adds r3, r5, 0\n\ + adds r3, 0x3F\n\ + ldrb r2, [r3]\n\ + lsls r1, r2, 31\n\ + lsrs r1, 31\n\ + movs r6, 0x1\n\ + eors r1, r6\n\ + ands r1, r7\n\ + movs r0, 0x2\n\ + negs r0, r0\n\ + mov r8, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r3]\n\ + lsls r0, 31\n\ + lsrs r0, 31\n\ + adds r1, r5, 0\n\ + adds r1, 0x2A\n\ + strb r0, [r1]\n\ + ldrb r0, [r3]\n\ + movs r1, 0x4\n\ + orrs r0, r1\n\ + movs r1, 0x11\n\ + negs r1, r1\n\ + ands r0, r1\n\ + strb r0, [r3]\n\ + ldrb r1, [r4]\n\ + movs r0, 0x4\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0810E766\n\ + bl IsContest\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + bne _0810E736\n\ + ldrb r1, [r4, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0810E71C\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + subs r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + b _0810E754\n\ +_0810E71C:\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + adds r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + b _0810E754\n\ +_0810E736:\n\ + ldrb r1, [r4, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0810E74A\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + subs r0, 0xC\n\ + b _0810E752\n\ +_0810E74A:\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + adds r0, 0xC\n\ +_0810E752:\n\ + strb r0, [r1]\n\ +_0810E754:\n\ + ldrb r2, [r4, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r6\n\ + ands r0, r7\n\ + mov r1, r8\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + strb r1, [r4, 0xE]\n\ +_0810E766:\n\ + ldrb r1, [r4]\n\ + movs r0, 0x9\n\ + negs r0, r0\n\ + ands r0, r1\n\ + strb r0, [r4]\n\ + ldrh r1, [r4, 0x2]\n\ + mov r12, r1\n\ +_0810E774:\n\ + ldrb r0, [r4]\n\ + movs r1, 0xF\n\ + ands r1, r0\n\ + movs r0, 0x10\n\ + b _0810E978\n\ +_0810E77E:\n\ + lsls r1, r2, 24\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0x3\n\ + bne _0810E78C\n\ + movs r0, 0x8\n\ + orrs r0, r2\n\ + b _0810E794\n\ +_0810E78C:\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0x1\n\ + bne _0810E79C\n\ + adds r0, r2, 0\n\ +_0810E794:\n\ + orrs r0, r7\n\ + strb r0, [r4]\n\ + strb r6, [r4, 0x1]\n\ + b _0810E868\n\ +_0810E79C:\n\ + movs r0, 0x8\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _0810E868\n\ + adds r3, r5, 0\n\ + adds r3, 0x3F\n\ + ldrb r2, [r3]\n\ + lsls r1, r2, 31\n\ + lsrs r1, 31\n\ + movs r6, 0x1\n\ + eors r1, r6\n\ + ands r1, r7\n\ + movs r0, 0x2\n\ + negs r0, r0\n\ + mov r8, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r3]\n\ + lsls r0, 31\n\ + lsrs r0, 31\n\ + adds r1, r5, 0\n\ + adds r1, 0x2A\n\ + strb r0, [r1]\n\ + ldrb r0, [r3]\n\ + movs r1, 0x4\n\ + orrs r0, r1\n\ + movs r1, 0x11\n\ + negs r1, r1\n\ + ands r0, r1\n\ + strb r0, [r3]\n\ + ldrb r1, [r4]\n\ + movs r0, 0x4\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0810E85A\n\ + bl IsContest\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + bne _0810E82A\n\ + ldrb r1, [r4, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0810E810\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + subs r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + b _0810E848\n\ +_0810E810:\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + adds r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + b _0810E848\n\ +_0810E82A:\n\ + ldrb r1, [r4, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0810E83E\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + subs r0, 0xC\n\ + b _0810E846\n\ +_0810E83E:\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + adds r0, 0xC\n\ +_0810E846:\n\ + strb r0, [r1]\n\ +_0810E848:\n\ + ldrb r2, [r4, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r6\n\ + ands r0, r7\n\ + mov r1, r8\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + strb r1, [r4, 0xE]\n\ +_0810E85A:\n\ + ldrb r1, [r4]\n\ + movs r0, 0x9\n\ + negs r0, r0\n\ + ands r0, r1\n\ + strb r0, [r4]\n\ + ldrh r1, [r4, 0x2]\n\ + mov r12, r1\n\ +_0810E868:\n\ + ldrb r0, [r4]\n\ + movs r1, 0xF\n\ + ands r1, r0\n\ + movs r0, 0x20\n\ + b _0810E978\n\ +_0810E872:\n\ + lsls r1, r2, 24\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0x2\n\ + bne _0810E882\n\ + movs r0, 0x8\n\ + orrs r0, r2\n\ + strb r0, [r4]\n\ + b _0810E970\n\ +_0810E882:\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0\n\ + bne _0810E8A4\n\ + lsls r0, r2, 30\n\ + lsrs r0, 31\n\ + movs r1, 0x1\n\ + eors r0, r1\n\ + ands r0, r7\n\ + lsls r0, 1\n\ + movs r1, 0x3\n\ + negs r1, r1\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + orrs r1, r7\n\ + strb r1, [r4]\n\ + strb r6, [r4, 0x1]\n\ + b _0810E970\n\ +_0810E8A4:\n\ + movs r0, 0x8\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _0810E970\n\ + adds r3, r5, 0\n\ + adds r3, 0x3F\n\ + ldrb r2, [r3]\n\ + lsls r1, r2, 31\n\ + lsrs r1, 31\n\ + movs r6, 0x1\n\ + eors r1, r6\n\ + ands r1, r7\n\ + movs r0, 0x2\n\ + negs r0, r0\n\ + mov r8, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r3]\n\ + lsls r0, 31\n\ + lsrs r0, 31\n\ + adds r1, r5, 0\n\ + adds r1, 0x2A\n\ + strb r0, [r1]\n\ + ldrb r0, [r3]\n\ + movs r1, 0x4\n\ + orrs r0, r1\n\ + movs r1, 0x11\n\ + negs r1, r1\n\ + ands r0, r1\n\ + strb r0, [r3]\n\ + ldrb r1, [r4]\n\ + movs r0, 0x4\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0810E962\n\ + bl IsContest\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + bne _0810E932\n\ + ldrb r1, [r4, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0810E918\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + subs r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + b _0810E950\n\ +_0810E918:\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + adds r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + b _0810E950\n\ +_0810E932:\n\ + ldrb r1, [r4, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0810E946\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + subs r0, 0xC\n\ + b _0810E94E\n\ +_0810E946:\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + adds r0, 0xC\n\ +_0810E94E:\n\ + strb r0, [r1]\n\ +_0810E950:\n\ + ldrb r2, [r4, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r6\n\ + ands r0, r7\n\ + mov r1, r8\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + strb r1, [r4, 0xE]\n\ +_0810E962:\n\ + ldrb r1, [r4]\n\ + movs r0, 0x9\n\ + negs r0, r0\n\ + ands r0, r1\n\ + strb r0, [r4]\n\ + ldrh r1, [r4, 0x2]\n\ + mov r12, r1\n\ +_0810E970:\n\ + ldrb r0, [r4]\n\ + movs r1, 0xF\n\ + ands r1, r0\n\ + movs r0, 0x30\n\ +_0810E978:\n\ + orrs r1, r0\n\ + strb r1, [r4]\n\ +_0810E97C:\n\ + ldrb r1, [r4]\n\ + lsls r1, 30\n\ + lsrs r1, 31\n\ + adds r0, r4, 0\n\ + adds r0, 0xC\n\ + adds r0, r1\n\ + ldrb r1, [r0]\n\ + ldr r3, =gSineTable\n\ + mov r2, r12\n\ + lsls r0, r2, 1\n\ + adds r0, r3\n\ + movs r2, 0\n\ + ldrsh r0, [r0, r2]\n\ + muls r0, r1\n\ + asrs r0, 8\n\ + strh r0, [r5, 0x24]\n\ + ldrb r2, [r5, 0x3]\n\ + lsls r2, 26\n\ + lsrs r2, 27\n\ + movs r1, 0x24\n\ + ldrsh r0, [r5, r1]\n\ + negs r0, r0\n\ + asrs r0, 1\n\ + ldrb r1, [r4, 0xA]\n\ + adds r0, r1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + lsls r1, r0, 1\n\ + adds r1, r3\n\ + ldrh r6, [r1]\n\ + ldr r1, =gOamMatrices\n\ + lsls r2, 3\n\ + adds r2, r1\n\ + adds r0, 0x40\n\ + lsls r0, 1\n\ + adds r0, r3\n\ + ldrh r0, [r0]\n\ + strh r0, [r2, 0x6]\n\ + strh r0, [r2]\n\ + strh r6, [r2, 0x2]\n\ + lsls r0, r6, 16\n\ + asrs r0, 16\n\ + negs r0, r0\n\ + strh r0, [r2, 0x4]\n\ + ldrh r0, [r4, 0x6]\n\ + ldrh r2, [r4, 0x8]\n\ + adds r0, r2\n\ + strh r0, [r4, 0x8]\n\ + lsls r0, 16\n\ + lsrs r0, 24\n\ + strh r0, [r5, 0x22]\n\ + movs r1, 0x4\n\ + ldrsh r0, [r4, r1]\n\ + movs r1, 0x80\n\ + lsls r1, 8\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0810EA0C\n\ + ldrh r0, [r4, 0x4]\n\ + subs r1, 0x1\n\ + ands r1, r0\n\ + ldrh r0, [r4, 0x2]\n\ + subs r0, r1\n\ + movs r1, 0xFF\n\ + ands r0, r1\n\ + strh r0, [r4, 0x2]\n\ + b _0810EA1C\n\ + .pool\n\ +_0810EA0C:\n\ + ldrh r0, [r4, 0x4]\n\ + ldr r1, =0x00007fff\n\ + ands r1, r0\n\ + ldrh r2, [r4, 0x2]\n\ + adds r1, r2\n\ + movs r0, 0xFF\n\ + ands r1, r0\n\ + strh r1, [r4, 0x2]\n\ +_0810EA1C:\n\ + movs r0, 0x22\n\ + ldrsh r1, [r5, r0]\n\ + movs r2, 0x26\n\ + ldrsh r0, [r5, r2]\n\ + adds r1, r0\n\ + ldrh r0, [r4, 0xE]\n\ + lsrs r0, 1\n\ + cmp r1, r0\n\ + blt _0810EA36\n\ + movs r0, 0\n\ + strh r0, [r5, 0x2E]\n\ + ldr r0, =sub_810E2C8\n\ + str r0, [r5, 0x1C]\n\ +_0810EA36:\n\ + pop {r3,r4}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ + "); +} + +void sub_810EA4C(struct Sprite *sprite) +{ + sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->callback = TranslateAnimSpriteToTargetMonLocation; +} + +void sub_810EAA0(struct Sprite * sprite) +{ + u16 arg; + u8 mult; + + if (!gBattleAnimArgs[2]) + InitSpritePosToAnimAttacker(sprite, 0); + else + InitSpritePosToAnimTarget(sprite, FALSE); + + if ((!gBattleAnimArgs[2] && !GetBattlerSide(gBattleAnimAttacker)) + || (gBattleAnimArgs[2] == 1 && !GetBattlerSide(gBattleAnimTarget))) + { + sprite->pos1.x += 8; + } + + SeekSpriteAnim(sprite, gBattleAnimArgs[4]); + sprite->pos1.x -= 32; + sprite->data[1] = 0x0ccc; + + arg = gBattleAnimArgs[4]; + mult = 12; + sprite->pos2.x += mult * arg; + sprite->data[0] = arg; + sprite->data[7] = gBattleAnimArgs[3]; + sprite->callback = sub_810EB40; +} + +void sub_810EB40(struct Sprite *sprite) +{ + sprite->pos2.x += sprite->data[1] >> 8; + + if (++sprite->data[0] == 6) + { + sprite->data[0] = 0; + sprite->pos2.x = 0; + StartSpriteAnim(sprite, 0); + } + + if (--sprite->data[7] == -1) + DestroyAnimSprite(sprite); +} + +void sub_810EB88(u8 task) +{ + if (!(gTasks[task].data[0] % 32)) + { + gAnimVisualTaskCount++; + + gBattleAnimArgs[0] = Sin(gTasks[task].data[0], -13); + gBattleAnimArgs[1] = Cos(gTasks[task].data[0], -13); + gBattleAnimArgs[2] = 1; + gBattleAnimArgs[3] = 3; + + CreateSpriteAndAnimate(&gUnknown_085973E8, + GetBattlerSpriteCoord(gBattleAnimTarget, 2), + GetBattlerSpriteCoord(gBattleAnimTarget, 3), + 3); + } + + gTasks[task].data[0] += 8; + + if (gTasks[task].data[0] > 255) + DestroyAnimVisualTask(task); +} + +void sub_810EC34(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + InitSpritePosToAnimAttacker(sprite, 1); + gSprites[GetAnimBattlerSpriteId(0)].invisible = 1; + ++sprite->data[0]; + break; + case 1: + if (sprite->affineAnimEnded) + DestroyAnimSprite(sprite); + } +} + +void sub_810EC94(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + sprite->pos2.y = -sprite->pos1.y - 32; + sprite->data[0]++; + break; + case 1: + sprite->pos2.y += 10; + if (sprite->pos2.y >= 0) + ++sprite->data[0]; + break; + case 2: + sprite->pos2.y -= 10; + if (sprite->pos1.y + sprite->pos2.y < -32) + { + gSprites[GetAnimBattlerSpriteId(0)].invisible = 0; + DestroyAnimSprite(sprite); + } + } +} + +void sub_810ED28(struct Sprite *sprite) +{ + InitSpritePosToAnimAttacker(sprite, 1); + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->callback = sub_810ED70; + gSprites[GetAnimBattlerSpriteId(0)].invisible = 1; +} + +void sub_810ED70(struct Sprite *sprite) +{ + if (sprite->data[0] > 0) + sprite->data[0]--; + else if (sprite->pos1.y + sprite->pos2.y > -32) + { + sprite->data[2] += sprite->data[1]; + sprite->pos2.y -= (sprite->data[2] >> 8); + } + else + { + sprite->invisible = 1; + if (sprite->data[3]++ > 20) + sprite->callback = sub_810EDD0; + } +} + +void sub_810EDD0(struct Sprite *sprite) +{ + sprite->pos2.y += sprite->data[2] >> 8; + + if (sprite->pos1.y + sprite->pos2.y > -32) + sprite->invisible = 0; + + if (sprite->pos2.y > 0) + DestroyAnimSprite(sprite); +} + +#ifdef NONMATCHING +void sub_810EE14(struct Sprite *sprite) +{ + // NONMATCHING - Functionally equivalent - slight register swap at end + + u32 matrixNum; + int t1, t2; + + switch (sprite->data[0]) + { + case 0: + if (!gBattleAnimArgs[0]) + { + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); + } + else + { + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + } + + sprite->data[1] = 512; + + TrySetSpriteRotScale(sprite, 0, 256, sprite->data[1], 0); + sprite->data[0]++; + break; + case 1: + if (sprite->data[2] <= 11) + sprite->data[1] -= 40; + else + sprite->data[1] += 40; + + sprite->data[2]++; + + TrySetSpriteRotScale(sprite, 0, 256, sprite->data[1], 0); + + matrixNum = sprite->oam.matrixNum; + + t1 = 15616; + t2 = t1 / gOamMatrices[matrixNum].d + 1; + + if (t2 > 128) + t2 = 128; + + + /* NONMATCHING + * compiles to: + * asr r0, r0, #0x1 + strh r0, [r5, #0x26] + * needed: + * asrs r1, r0, 1 + * strh r1, [r5, 0x26] */ + sprite->pos2.y = (64 - t2) / 2; + + if (sprite->data[2] == 24) + { + sub_80A749C(sprite); + DestroyAnimSprite(sprite); + } + } +} + +#else +NAKED +void sub_810EE14(struct Sprite *sprite) +{ + asm_unified("push {r4,r5,lr}\n\ + sub sp, 0x4\n\ + adds r5, r0, 0\n\ + movs r1, 0x2E\n\ + ldrsh r0, [r5, r1]\n\ + cmp r0, 0\n\ + beq _0810EE28\n\ + cmp r0, 0x1\n\ + beq _0810EE80\n\ + b _0810EEEC\n\ +_0810EE28:\n\ + ldr r0, =gBattleAnimArgs\n\ + movs r2, 0\n\ + ldrsh r0, [r0, r2]\n\ + cmp r0, 0\n\ + bne _0810EE40\n\ + ldr r4, =gBattleAnimAttacker\n\ + b _0810EE42\n\ + .pool\n\ +_0810EE40:\n\ + ldr r4, =gBattleAnimTarget\n\ +_0810EE42:\n\ + ldrb r0, [r4]\n\ + movs r1, 0\n\ + bl GetBattlerSpriteCoord\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + strh r0, [r5, 0x20]\n\ + ldrb r0, [r4]\n\ + movs r1, 0x1\n\ + bl GetBattlerSpriteCoord\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + strh r0, [r5, 0x22]\n\ + movs r0, 0\n\ + movs r3, 0x80\n\ + lsls r3, 2\n\ + strh r3, [r5, 0x30]\n\ + movs r2, 0x80\n\ + lsls r2, 1\n\ + str r0, [sp]\n\ + adds r0, r5, 0\n\ + movs r1, 0\n\ + bl TrySetSpriteRotScale\n\ + ldrh r0, [r5, 0x2E]\n\ + adds r0, 0x1\n\ + strh r0, [r5, 0x2E]\n\ + b _0810EEEC\n\ + .pool\n\ +_0810EE80:\n\ + movs r1, 0x32\n\ + ldrsh r0, [r5, r1]\n\ + cmp r0, 0xB\n\ + bgt _0810EE8E\n\ + ldrh r0, [r5, 0x30]\n\ + subs r0, 0x28\n\ + b _0810EE92\n\ +_0810EE8E:\n\ + ldrh r0, [r5, 0x30]\n\ + adds r0, 0x28\n\ +_0810EE92:\n\ + strh r0, [r5, 0x30]\n\ + ldrh r0, [r5, 0x32]\n\ + adds r0, 0x1\n\ + movs r1, 0\n\ + strh r0, [r5, 0x32]\n\ + movs r2, 0x80\n\ + lsls r2, 1\n\ + movs r0, 0x30\n\ + ldrsh r3, [r5, r0]\n\ + str r1, [sp]\n\ + adds r0, r5, 0\n\ + bl TrySetSpriteRotScale\n\ + ldrb r1, [r5, 0x3]\n\ + lsls r1, 26\n\ + lsrs r1, 27\n\ + movs r0, 0xF4\n\ + lsls r0, 6\n\ + ldr r2, =gOamMatrices\n\ + lsls r1, 3\n\ + adds r1, r2\n\ + movs r2, 0x6\n\ + ldrsh r1, [r1, r2]\n\ + bl __divsi3\n\ + adds r1, r0, 0x1\n\ + cmp r1, 0x80\n\ + ble _0810EECC\n\ + movs r1, 0x80\n\ +_0810EECC:\n\ + movs r0, 0x40\n\ + subs r0, r1\n\ + lsrs r1, r0, 31\n\ + adds r0, r1\n\ + asrs r1, r0, 1\n\ + strh r1, [r5, 0x26]\n\ + movs r1, 0x32\n\ + ldrsh r0, [r5, r1]\n\ + cmp r0, 0x18\n\ + bne _0810EEEC\n\ + adds r0, r5, 0\n\ + bl sub_80A749C\n\ + adds r0, r5, 0\n\ + bl DestroyAnimSprite\n\ +_0810EEEC:\n\ + add sp, 0x4\n\ + pop {r4,r5}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n"); +} +#endif + +void sub_810EEF8(struct Sprite *sprite) +{ + int v1, v2; + + v1 = 0x1ff & Random2(); + v2 = 0x7f & Random2(); + + if (v1 % 2) + sprite->data[0] = 736 + v1; + + else + sprite->data[0] = 736 - v1; + + + if (v2 % 2) + sprite->data[1] = 896 + v2; + + else + sprite->data[1] = 896 - v2; + + sprite->data[2] = gBattleAnimArgs[0]; + + if (sprite->data[2]) + sprite->oam.matrixNum = 8; + + + if (gBattleAnimArgs[1] == 0) + { + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 32; + } + else + { + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 32; + } + + sprite->callback = sub_810EFA8; +} + +void sub_810EFA8(struct Sprite *sprite) +{ + if (sprite->data[2] == 0) + { + sprite->pos2.x += sprite->data[0] >> 8; + sprite->pos2.y -= sprite->data[1] >> 8; + } + else + { + sprite->pos2.x -= sprite->data[0] >> 8; + sprite->pos2.y -= sprite->data[1] >> 8; + } + + sprite->data[0] = sprite->data[0]; + sprite->data[1] -= 32; + + if (sprite->data[0] < 0) + sprite->data[0] = 0; + + + if (++sprite->data[3] == 31) + DestroyAnimSprite(sprite); +} + +void sub_810F004(struct Sprite *sprite) +{ + sprite->data[6] = 0; + sprite->data[7] = 64; + sprite->callback = sub_810F018; +} + +void sub_810F018(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + if (++sprite->data[1] > 8) + { + sprite->data[1] = 0; + sprite->invisible ^= 1; + if (++sprite->data[2] > 5 && sprite->invisible) + sprite->data[0]++; + } + break; + case 1: + DestroyAnimSprite(sprite); + } +} + +void sub_810F084(struct Sprite *sprite) +{ + s16 posx, posy; + u16 rotation; + + posx = sprite->pos1.x; + posy = sprite->pos1.y; + + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + + sprite->data[4] = sprite->pos1.x << 4; + sprite->data[5] = sprite->pos1.y << 4; + + sprite->data[6] = ((posx - sprite->pos1.x) << 4) / 12; + sprite->data[7] = ((posy - sprite->pos1.y) << 4) / 12; + + rotation = ArcTan2Neg(posx - sprite->pos1.x, posy - sprite->pos1.y); + rotation += 49152; + + TrySetSpriteRotScale(sprite, 1, 0x100, 0x100, rotation); + + sprite->callback = sub_810F140; +} + +void sub_810F140(struct Sprite *sprite) +{ + sprite->data[4] += sprite->data[6]; + sprite->data[5] += sprite->data[7]; + + sprite->pos1.x = sprite->data[4] >> 4; + sprite->pos1.y = sprite->data[5] >> 4; + + if ((u16) (sprite->pos1.x + 0x2d) > 0x14a || sprite->pos1.y > 0x9d || sprite->pos1.y < -0x2d) + DestroySpriteAndMatrix(sprite); +} + +void unref_sub_810F184(u8 taskId) +{ + if (gBattleAnimArgs[0] == 0) + { + u8 spriteId = GetAnimBattlerSpriteId(0); + gSprites[spriteId].invisible = 1; + } + else + { + u8 spriteId = GetAnimBattlerSpriteId(0); + gSprites[spriteId].invisible = 0; + } + DestroyAnimVisualTask(taskId); +} From f378a5a316682247bc9385594706518461eaacde Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 3 Mar 2019 15:02:26 -0500 Subject: [PATCH 171/217] Fix symbol overcounting, add partial symbols --- .travis/calcrom/calcrom.pl | 57 +++++++++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 7 deletions(-) diff --git a/.travis/calcrom/calcrom.pl b/.travis/calcrom/calcrom.pl index 354f9bcee5..9c48679290 100755 --- a/.travis/calcrom/calcrom.pl +++ b/.travis/calcrom/calcrom.pl @@ -31,28 +31,66 @@ while (my $line = <$file>) } } -# It sucks that we have to objdump twice, but I can't figure out how to get -# stdin working for subcommands in perl while still having a timeout. +# Note that the grep filters out all branch labels. It also requires a minimum +# line length of 5, to filter out a ton of generated symbols (like AcCn). No +# settings to nm seem to remove these symbols. Finally, nm prints out a separate +# entry for whenever a name appears in a file, not just where it's defined. uniq +# removes all the duplicate entries. +# +# +# You'd expect this to take a while, because of uniq. It runs in under a second, +# though. Uniq is pretty fast! +my $base_cmd = "nm pokeemerald.elf | awk '{print \$3}' | grep '^[^_].\\{4\\}' | uniq"; + +# This looks for Unknown_, Unknown_, or sub_, followed by just numbers. Note that +# it matches even if stuff precedes the unknown, like sUnknown/gUnknown. +my $undoc_cmd = "grep '[Uu]nknown_[0-9a-fA-F]*\\|sub_[0-9a-fA-F]*'"; + +# This looks for every symbol with an address at the end of it. Some things are +# given a name based on their type / location, but still have an unknown purpose. +# For example, FooMap_EventScript_FFFFFFF. +my $partial_doc_cmd = "grep '[0-9a-fA-F]\\{6,7\\}'"; + +my $count_cmd = "wc -l"; + +# It sucks that we have to run this three times, but I can't figure out how to get +# stdin working for subcommands in perl while still having a timeout. It's decently +# fast anyway. my $total_syms_as_string; (run ( - command => "arm-none-eabi-nm pokeemerald.elf | wc -l", + command => "$base_cmd | $count_cmd", buffer => \$total_syms_as_string, - timeout => 30 + timeout => 60 )) or die "ERROR: Error while getting all symbols: $?"; my $undocumented_as_string; (run ( - command => "arm-none-eabi-nm pokeemerald.elf | grep \"Unknown_\\|sub_\" | wc -l", + command => "$base_cmd | $undoc_cmd | $count_cmd", buffer => \$undocumented_as_string, - timeout => 30 + timeout => 60 )) or die "ERROR: Error while filtering for undocumented symbols: $?"; +my $partial_documented_as_string; +(run ( + command => "$base_cmd | $partial_doc_cmd | $count_cmd", + buffer => \$partial_documented_as_string, + timeout => 60 +)) + or die "ERROR: Error while filtering for partial symbols: $?"; + +# Performing addition on a string converts it to a number. Any string that fails +# to convert to a number becomes 0. So if our converted number is 0, but our string +# is nonzero, then the conversion was an error. my $undocumented = $undocumented_as_string + 0; (($undocumented != 0) and ($undocumented_as_string ne "0")) or die "ERROR: Cannot convert string to num: '$undocumented_as_string'"; +my $partial_documented = $partial_documented_as_string + 0; +(($partial_documented != 0) and ($partial_documented_as_string ne "0")) + or die "ERROR: Cannot convert string to num: '$partial_documented_as_string'"; + my $total_syms = $total_syms_as_string + 0; (($total_syms != 0) and ($total_syms_as_string ne "0")) or die "ERROR: Cannot convert string to num: '$total_syms_as_string'"; @@ -64,8 +102,12 @@ my $total = $src + $asm; my $srcPct = sprintf("%.4f", 100 * $src / $total); my $asmPct = sprintf("%.4f", 100 * $asm / $total); -my $documented = $total_syms - $undocumented; +# partial_documented is double-counting the unknown_* and sub_* symbols. +$partial_documented = $partial_documented - $undocumented; + +my $documented = $total_syms - ($undocumented + $partial_documented); my $docPct = sprintf("%.4f", 100 * $documented / $total_syms); +my $partialPct = sprintf("%.4f", 100 * $partial_documented / $total_syms); my $undocPct = sprintf("%.4f", 100 * $undocumented / $total_syms); print "$total total bytes of code\n"; @@ -74,4 +116,5 @@ print "$asm bytes of code in asm ($asmPct%)\n"; print "\n"; print "$total_syms total symbols\n"; print "$documented symbols documented ($docPct%)\n"; +print "$partial_documented symbols partially documented ($partialPct%)\n"; print "$undocumented symbols undocumented ($undocPct%)\n"; From 63e700af6c735dc40f8ddb2b46cad9c0c43ad6b3 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 3 Mar 2019 16:50:51 -0500 Subject: [PATCH 172/217] Use macros for summary windows Other minor changes and fixes are included --- include/battle_tent.h | 2 +- include/party_menu.h | 2 +- src/battle_tent.c | 2 +- src/party_menu.c | 6 +- src/pokemon_summary_screen.c | 1184 ++++++++++++++++++---------------- 5 files changed, 627 insertions(+), 569 deletions(-) diff --git a/include/battle_tent.h b/include/battle_tent.h index a894d4cfb2..ca3faa4a6b 100644 --- a/include/battle_tent.h +++ b/include/battle_tent.h @@ -1,6 +1,6 @@ #ifndef GUARD_BATTLE_TENT_H #define GUARD_BATTLE_TENT_H -bool8 sub_81B9E94(void); +bool8 InSlateportBattleTent(void); #endif //GUARD_BATTLE_TENT_H diff --git a/include/party_menu.h b/include/party_menu.h index e67dd56f2c..413a896895 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -62,7 +62,7 @@ u8 sub_81B1B5C(const u8* str, u8 b); bool8 sub_81B1BD4(void); void sub_81B1F18(u8 taskId, u8 slot, s8 c, s16 HPDifference, TaskFunc func); u8 pokemon_ailments_get_primary(u32 status); -u8 sub_81B205C(struct Pokemon *mon); +u8 GetMonAilment(struct Pokemon *mon); void display_pokemon_menu_message(u32 stringID); void sub_81B47E0(u8 taskId); bool8 FieldCallback_PrepareFadeInFromMenu(void); diff --git a/src/battle_tent.c b/src/battle_tent.c index b07020822e..85194417fb 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -269,7 +269,7 @@ static void sub_81B9E88(void) DoBattleFactorySwapScreen(); } -bool8 sub_81B9E94(void) +bool8 InSlateportBattleTent(void) { return gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY && (gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_CORRIDOR || gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_BATTLE_ROOM); diff --git a/src/party_menu.c b/src/party_menu.c index 10665ad9ef..71f4cb6394 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -2936,7 +2936,7 @@ u8 pokemon_ailments_get_primary(u32 status) return AILMENT_NONE; } -u8 sub_81B205C(struct Pokemon *mon) +u8 GetMonAilment(struct Pokemon *mon) { u8 ailment; @@ -3355,7 +3355,7 @@ static void DisplayPartyPokemonLevelCheck(struct Pokemon *mon, struct Struct203C { if (GetMonData(mon, MON_DATA_SPECIES) != SPECIES_NONE) { - u8 ailment = sub_81B205C(mon); + u8 ailment = GetMonAilment(mon); if (ailment == AILMENT_NONE || ailment == AILMENT_PKRS) { if (c != 0) @@ -5183,7 +5183,7 @@ static void party_menu_link_mon_status_condition_object(u16 species, u8 status, static void party_menu_get_status_condition_and_update_object(struct Pokemon *mon, struct Struct203CEDC *ptr) { - party_menu_update_status_condition_object(sub_81B205C(mon), ptr); + party_menu_update_status_condition_object(GetMonAilment(mon), ptr); } static void party_menu_update_status_condition_object(u8 status, struct Struct203CEDC *ptr) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index bd1ae78027..1d35689d0d 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -47,7 +47,62 @@ #include "constants/songs.h" #include "constants/species.h" -static EWRAM_DATA struct PssData +// Screen titles (upper left) +#define PSS_LABEL_WINDOW_POKEMON_INFO_TITLE 0 +#define PSS_LABEL_WINDOW_POKEMON_SKILLS_TITLE 1 +#define PSS_LABEL_WINDOW_BATTLE_MOVES_TITLE 2 +#define PSS_LABEL_WINDOW_CONTEST_MOVES_TITLE 3 + +// Button control text (upper right) +#define PSS_LABEL_WINDOW_PROMPT_CANCEL 4 +#define PSS_LABEL_WINDOW_PROMPT_INFO 5 +#define PSS_LABEL_WINDOW_PROMPT_SWITCH 6 +#define PSS_LABEL_WINDOW_UNUSED1 7 + +// Info screen +#define PSS_LABEL_WINDOW_POKEMON_INFO_RENTAL 8 +#define PSS_LABEL_WINDOW_POKEMON_INFO_TYPE 9 + +// Skills screen +#define PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT 10 // HP, Attack, Defense +#define PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT 11 // Sp. Attack, Sp. Defense, Speed +#define PSS_LABEL_WINDOW_POKEMON_SKILLS_EXP 12 // EXP, Next Level +#define PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS 13 + +// Moves screen +#define PSS_LABEL_WINDOW_MOVES_POWER_ACC 14 // Also contains the power and accuracy values +#define PSS_LABEL_WINDOW_MOVES_APPEAL_JAM 15 +#define PSS_LABEL_WINDOW_UNUSED2 16 + +// Above/below the pokemon's portrait (left) +#define PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER 17 +#define PSS_LABEL_WINDOW_PORTRAIT_NICKNAME 18 // The upper name +#define PSS_LABEL_WINDOW_PORTRAIT_SPECIES 19 // The lower name +#define PSS_LABEL_WINDOW_END 20 + +// Dynamic fields for the Pokemon Info page +#define PSS_DATA_WINDOW_INFO_ORIGINAL_TRAINER 0 +#define PSS_DATA_WINDOW_INFO_ID 1 +#define PSS_DATA_WINDOW_INFO_ABILITY 2 +#define PSS_DATA_WINDOW_INFO_MEMO 3 + +// Dynamic fields for the Pokemon Skills page +#define PSS_DATA_WINDOW_SKILLS_HELD_ITEM 0 +#define PSS_DATA_WINDOW_SKILLS_RIBBON_COUNT 1 +#define PSS_DATA_WINDOW_SKILLS_STATS_LEFT 2 // HP, Attack, Defense +#define PSS_DATA_WINDOW_SKILLS_STATS_RIGHT 3 // Sp. Attack, Sp. Defense, Speed +#define PSS_DATA_WINDOW_EXP 4 // Exp, next level + +// Dynamic fields for the Battle Moves and Contest Moves pages. +#define PSS_DATA_WINDOW_MOVE_NAMES 0 +#define PSS_DATA_WINDOW_MOVE_PP 1 +#define PSS_DATA_WINDOW_MOVE_DESCRIPTION 2 + +// Used for switching between pages, pokemon, and moves. +#define PSS_CHANGE_NEXT 1 +#define PSS_CHANGE_PREV -1 + +static EWRAM_DATA struct PokemonSummaryScreenData { /*0x00*/ union { struct Pokemon *mons; @@ -63,7 +118,7 @@ static EWRAM_DATA struct PssData u8 isEgg; // 0x4 u8 level; // 0x5 u8 ribbonCount; // 0x6 - u8 unk7; // 0x7 + u8 ailment; // 0x7 u8 altAbility; // 0x8 u8 metLocation; // 0x9 u8 metLevel; // 0xA @@ -109,7 +164,7 @@ static EWRAM_DATA struct PssData bool8 unk40EF; s16 switchCounter; // Used for various switch statement cases that decompress/load graphics or pokemon data u8 unk_filler4[6]; -} *pssData = NULL; +} *sMonSummaryScreenData = NULL; EWRAM_DATA u8 gLastViewedMonIndex = 0; static EWRAM_DATA u8 sUnknown_0203CF21 = 0; ALIGNED(4) static EWRAM_DATA u8 sUnknownTaskId = 0; @@ -135,7 +190,7 @@ static bool8 ExtractMonDataToSummaryStruct(struct Pokemon* a); static void sub_81C0348(void); static void CloseSummaryScreen(u8 taskId); static void HandleInput(u8 taskId); -static void ChangePokemon(u8 taskId, s8 a); +static void ChangeSummaryPokemon(u8 taskId, s8 a); static void sub_81C0704(u8 taskId); static s8 sub_81C08F8(s8 a); static s8 sub_81C09B4(s8 a); @@ -309,7 +364,7 @@ static const struct UnkStruct_61CC04 sUnknown_0861CC10 = static const s8 gUnknown_0861CC1C[] = {0, 2, 3, 1, 4, 5}; static const struct WindowTemplate sSummaryTemplate[] = { - {//Text for Pokemon Info + [PSS_LABEL_WINDOW_POKEMON_INFO_TITLE] = { .bg = 0, .tilemapLeft = 0, .tilemapTop = 0, @@ -318,7 +373,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 6, .baseBlock = 1, }, - {//Text for Pokemon Skills + [PSS_LABEL_WINDOW_POKEMON_SKILLS_TITLE] = { .bg = 0, .tilemapLeft = 0, .tilemapTop = 0, @@ -327,7 +382,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 6, .baseBlock = 23, }, - {//Text for Battle Moves + [PSS_LABEL_WINDOW_BATTLE_MOVES_TITLE] = { .bg = 0, .tilemapLeft = 0, .tilemapTop = 0, @@ -336,7 +391,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 6, .baseBlock = 45, }, - {//Text for Contest Moves + [PSS_LABEL_WINDOW_CONTEST_MOVES_TITLE] = { .bg = 0, .tilemapLeft = 0, .tilemapTop = 0, @@ -345,7 +400,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 6, .baseBlock = 67, }, - { //Text on Pokemon Info: Button prompt: Cancel + [PSS_LABEL_WINDOW_PROMPT_CANCEL] = { .bg = 0, .tilemapLeft = 22, .tilemapTop = 0, @@ -354,7 +409,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 7, .baseBlock = 89, }, - {//Info button found under moves + [PSS_LABEL_WINDOW_PROMPT_INFO] = { .bg = 0, .tilemapLeft = 22, .tilemapTop = 0, @@ -363,7 +418,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 7, .baseBlock = 105, }, - {//Switch button under moves when viewing moves + [PSS_LABEL_WINDOW_PROMPT_SWITCH] = { .bg = 0, .tilemapLeft = 22, .tilemapTop = 0, @@ -372,7 +427,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 7, .baseBlock = 121, }, - {//Unknown + [PSS_LABEL_WINDOW_UNUSED1] = { .bg = 0, .tilemapLeft = 11, .tilemapTop = 4, @@ -381,7 +436,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 6, .baseBlock = 137, }, - {//Unknown + [PSS_LABEL_WINDOW_POKEMON_INFO_RENTAL] = { .bg = 0, .tilemapLeft = 11, .tilemapTop = 4, @@ -390,7 +445,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 6, .baseBlock = 137, }, - {//Type on pokemon info page + [PSS_LABEL_WINDOW_POKEMON_INFO_TYPE] = { .bg = 0, .tilemapLeft = 11, .tilemapTop = 6, @@ -399,7 +454,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 6, .baseBlock = 173, }, - {//HP, Attack and Defense text + [PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT] = { .bg = 0, .tilemapLeft = 10, .tilemapTop = 7, @@ -408,7 +463,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 6, .baseBlock = 209, }, - {//Sp. atk, Sp. Def and Speed texxt + [PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT] = { .bg = 0, .tilemapLeft = 22, .tilemapTop = 7, @@ -417,7 +472,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 6, .baseBlock = 245, }, - {//EXP and next lvl. + [PSS_LABEL_WINDOW_POKEMON_SKILLS_EXP] = { .bg = 0, .tilemapLeft = 10, .tilemapTop = 14, @@ -426,7 +481,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 6, .baseBlock = 275, }, - {//Unknown + [PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS] = { .bg = 0, .tilemapLeft = 0, .tilemapTop = 18, @@ -435,7 +490,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 6, .baseBlock = 319, }, - {//move text: Power, Accuracy and their numeric values. + [PSS_LABEL_WINDOW_MOVES_POWER_ACC] = { .bg = 0, .tilemapLeft = 1, .tilemapTop = 15, @@ -444,7 +499,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 6, .baseBlock = 331, }, - {//contest text: appeal and jam + [PSS_LABEL_WINDOW_MOVES_APPEAL_JAM] = { .bg = 0, .tilemapLeft = 1, .tilemapTop = 15, @@ -453,7 +508,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 6, .baseBlock = 367, }, - {//Unknown + [PSS_LABEL_WINDOW_UNUSED2] = { .bg = 0, .tilemapLeft = 22, .tilemapTop = 4, @@ -462,7 +517,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 6, .baseBlock = 387, }, - {//No. + [PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER] = { .bg = 0, .tilemapLeft = 1, .tilemapTop = 2, @@ -471,7 +526,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 7, .baseBlock = 387, }, - {//Upper name + [PSS_LABEL_WINDOW_PORTRAIT_NICKNAME] = { .bg = 0, .tilemapLeft = 1, .tilemapTop = 12, @@ -480,7 +535,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 6, .baseBlock = 395, }, - {//Lower name + [PSS_LABEL_WINDOW_PORTRAIT_SPECIES] = { .bg = 0, .tilemapLeft = 1, .tilemapTop = 14, @@ -489,11 +544,11 @@ static const struct WindowTemplate sSummaryTemplate[] = .paletteNum = 6, .baseBlock = 413, }, - DUMMY_WIN_TEMPLATE + [PSS_LABEL_WINDOW_END] = DUMMY_WIN_TEMPLATE }; static const struct WindowTemplate sPageInfoTemplate[] = { - {//Original Trainer + [PSS_DATA_WINDOW_INFO_ORIGINAL_TRAINER] = { .bg = 0, .tilemapLeft = 11, .tilemapTop = 4, @@ -502,7 +557,7 @@ static const struct WindowTemplate sPageInfoTemplate[] = .paletteNum = 6, .baseBlock = 449, }, - {//ID numbers + [PSS_DATA_WINDOW_INFO_ID] = { .bg = 0, .tilemapLeft = 22, .tilemapTop = 4, @@ -511,7 +566,7 @@ static const struct WindowTemplate sPageInfoTemplate[] = .paletteNum = 6, .baseBlock = 471, }, - {//Ability + [PSS_DATA_WINDOW_INFO_ABILITY] = { .bg = 0, .tilemapLeft = 11, .tilemapTop = 9, @@ -520,7 +575,7 @@ static const struct WindowTemplate sPageInfoTemplate[] = .paletteNum = 6, .baseBlock = 485, }, - {//Trainer Memo + [PSS_DATA_WINDOW_INFO_MEMO] = { .bg = 0, .tilemapLeft = 11, .tilemapTop = 14, @@ -532,7 +587,7 @@ static const struct WindowTemplate sPageInfoTemplate[] = }; static const struct WindowTemplate sPageSkillsTemplate[] = { - {//Held Item string + [PSS_DATA_WINDOW_SKILLS_HELD_ITEM] = { .bg = 0, .tilemapLeft = 10, .tilemapTop = 4, @@ -541,7 +596,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] = .paletteNum = 6, .baseBlock = 449, }, - {//Ribbon string + [PSS_DATA_WINDOW_SKILLS_RIBBON_COUNT] = { .bg = 0, .tilemapLeft = 20, .tilemapTop = 4, @@ -550,7 +605,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] = .paletteNum = 6, .baseBlock = 469, }, - {//Stat numbers left (HP, ATK & DEF) + [PSS_DATA_WINDOW_SKILLS_STATS_LEFT] = { .bg = 0, .tilemapLeft = 16, .tilemapTop = 7, @@ -559,7 +614,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] = .paletteNum = 6, .baseBlock = 489, }, - {//Stat numbers right (SP.ATK, SP.DEF & SPEED) + [PSS_DATA_WINDOW_SKILLS_STATS_RIGHT] = { .bg = 0, .tilemapLeft = 27, .tilemapTop = 7, @@ -568,7 +623,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] = .paletteNum = 6, .baseBlock = 525, }, - {//Exp numbers + [PSS_DATA_WINDOW_EXP] = { .bg = 0, .tilemapLeft = 24, .tilemapTop = 14, @@ -580,7 +635,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] = }; static const struct WindowTemplate sPageMovesTemplate[] = // This is used for both battle and contest moves { - {//Move names? + [PSS_DATA_WINDOW_MOVE_NAMES] = { .bg = 0, .tilemapLeft = 15, .tilemapTop = 4, @@ -589,7 +644,7 @@ static const struct WindowTemplate sPageMovesTemplate[] = // This is used for bo .paletteNum = 6, .baseBlock = 449, }, - {//PP Numbers + [PSS_DATA_WINDOW_MOVE_PP] = { .bg = 0, .tilemapLeft = 24, .tilemapTop = 4, @@ -598,7 +653,7 @@ static const struct WindowTemplate sPageMovesTemplate[] = // This is used for bo .paletteNum = 8, .baseBlock = 539, }, - {//Move description text + [PSS_DATA_WINDOW_MOVE_DESCRIPTION] = { .bg = 0, .tilemapLeft = 10, .tilemapTop = 15, @@ -996,38 +1051,38 @@ static const u16 sSummaryMarkingsPalette[] = INCBIN_U16("graphics/interface/summ // code void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)) { - pssData = AllocZeroed(sizeof(*pssData)); - pssData->mode = mode; - pssData->monList.mons = mons; - pssData->curMonIndex = monIndex; - pssData->maxMonIndex = maxMonIndex; - pssData->callback = callback; + sMonSummaryScreenData = AllocZeroed(sizeof(*sMonSummaryScreenData)); + sMonSummaryScreenData->mode = mode; + sMonSummaryScreenData->monList.mons = mons; + sMonSummaryScreenData->curMonIndex = monIndex; + sMonSummaryScreenData->maxMonIndex = maxMonIndex; + sMonSummaryScreenData->callback = callback; if (mode == PSS_MODE_BOX) - pssData->isBoxMon = TRUE; + sMonSummaryScreenData->isBoxMon = TRUE; else - pssData->isBoxMon = FALSE; + sMonSummaryScreenData->isBoxMon = FALSE; switch (mode) { case PSS_MODE_NORMAL: case PSS_MODE_BOX: - pssData->minPageIndex = 0; - pssData->maxPageIndex = 3; + sMonSummaryScreenData->minPageIndex = 0; + sMonSummaryScreenData->maxPageIndex = 3; break; case PSS_MODE_UNK1: - pssData->minPageIndex = 0; - pssData->maxPageIndex = 3; - pssData->unk40C8 = TRUE; + sMonSummaryScreenData->minPageIndex = 0; + sMonSummaryScreenData->maxPageIndex = 3; + sMonSummaryScreenData->unk40C8 = TRUE; break; case PSS_MODE_SELECT_MOVE: - pssData->minPageIndex = 2; - pssData->maxPageIndex = 3; - pssData->lockMonFlag = TRUE; + sMonSummaryScreenData->minPageIndex = 2; + sMonSummaryScreenData->maxPageIndex = 3; + sMonSummaryScreenData->lockMonFlag = TRUE; break; } - pssData->currPageIndex = pssData->minPageIndex; + sMonSummaryScreenData->currPageIndex = sMonSummaryScreenData->minPageIndex; SummaryScreen_SetUnknownTaskId(-1); if (gMonSpritesGfxPtr == 0) @@ -1039,13 +1094,13 @@ void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void ShowSelectMovePokemonSummaryScreen(struct Pokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void), u16 newMove) { ShowPokemonSummaryScreen(PSS_MODE_SELECT_MOVE, mons, monIndex, maxMonIndex, callback); - pssData->newMove = newMove; + sMonSummaryScreenData->newMove = newMove; } void ShowPokemonSummaryScreenSet40EF(u8 mode, struct BoxPokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)) { ShowPokemonSummaryScreen(mode, mons, monIndex, maxMonIndex, callback); - pssData->unk40EF = TRUE; + sMonSummaryScreenData->unk40EF = TRUE; } static void SummaryScreen_MainCB2(void) @@ -1098,7 +1153,7 @@ static bool8 SummaryScreen_LoadGraphics(void) break; case 5: InitBGs(); - pssData->switchCounter = 0; + sMonSummaryScreenData->switchCounter = 0; gMain.state++; break; case 6: @@ -1114,12 +1169,12 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 9: - CopyMonToSummaryStruct(&pssData->currentMon); - pssData->switchCounter = 0; + CopyMonToSummaryStruct(&sMonSummaryScreenData->currentMon); + sMonSummaryScreenData->switchCounter = 0; gMain.state++; break; case 10: - if (ExtractMonDataToSummaryStruct(&pssData->currentMon) != 0) + if (ExtractMonDataToSummaryStruct(&sMonSummaryScreenData->currentMon) != 0) gMain.state++; break; case 11: @@ -1131,7 +1186,7 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 13: - PrintPageSpecificText(pssData->currPageIndex); + PrintPageSpecificText(sMonSummaryScreenData->currPageIndex); gMain.state++; break; case 14: @@ -1139,29 +1194,29 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 15: - CreatePageWindowTilemaps(pssData->currPageIndex); + CreatePageWindowTilemaps(sMonSummaryScreenData->currPageIndex); gMain.state++; break; case 16: ResetSpriteIds(); CreateMoveTypeIcons(); - pssData->switchCounter = 0; + sMonSummaryScreenData->switchCounter = 0; gMain.state++; break; case 17: - pssData->spriteIds[0] = CreatePokemonSprite(&pssData->currentMon, &pssData->switchCounter); - if (pssData->spriteIds[0] != 0xFF) + sMonSummaryScreenData->spriteIds[0] = CreatePokemonSprite(&sMonSummaryScreenData->currentMon, &sMonSummaryScreenData->switchCounter); + if (sMonSummaryScreenData->spriteIds[0] != 0xFF) { - pssData->switchCounter = 0; + sMonSummaryScreenData->switchCounter = 0; gMain.state++; } break; case 18: - CreateMonMarkingsSprite(&pssData->currentMon); + CreateMonMarkingsSprite(&sMonSummaryScreenData->currentMon); gMain.state++; break; case 19: - CreateCaughtBallSprite(&pssData->currentMon); + CreateCaughtBallSprite(&sMonSummaryScreenData->currentMon); gMain.state++; break; case 20: @@ -1173,7 +1228,7 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 22: - if (pssData->mode != PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreenData->mode != PSS_MODE_SELECT_MOVE) CreateTask(HandleInput, 0); else CreateTask(sub_81C171C, 0); @@ -1200,9 +1255,9 @@ static void InitBGs(void) { ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sUnknown_0861CBB4, ARRAY_COUNT(sUnknown_0861CBB4)); - SetBgTilemapBuffer(1, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0]); - SetBgTilemapBuffer(2, pssData->bgTilemapBuffers[PSS_PAGE_SKILLS][0]); - SetBgTilemapBuffer(3, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0]); + SetBgTilemapBuffer(1, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0]); + SetBgTilemapBuffer(2, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_SKILLS][0]); + SetBgTilemapBuffer(3, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][0]); ResetAllBgsCoordinates(); schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(2); @@ -1217,64 +1272,64 @@ static void InitBGs(void) static bool8 SummaryScreen_DecompressGraphics(void) { - switch (pssData->switchCounter) + switch (sMonSummaryScreenData->switchCounter) { case 0: reset_temp_tile_data_buffers(); decompress_and_copy_tile_data_to_vram(1, &gStatusScreenBitmap, 0, 0, 0); - pssData->switchCounter++; + sMonSummaryScreenData->switchCounter++; break; case 1: if (free_temp_tile_data_buffers_if_possible() != 1) { - LZDecompressWram(gPageInfoTilemap, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0]); - pssData->switchCounter++; + LZDecompressWram(gPageInfoTilemap, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][0]); + sMonSummaryScreenData->switchCounter++; } break; case 2: - LZDecompressWram(gUnknown_08D98CC8, pssData->bgTilemapBuffers[PSS_PAGE_INFO][1]); - pssData->switchCounter++; + LZDecompressWram(gUnknown_08D98CC8, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][1]); + sMonSummaryScreenData->switchCounter++; break; case 3: - LZDecompressWram(gPageSkillsTilemap, pssData->bgTilemapBuffers[PSS_PAGE_SKILLS][1]); - pssData->switchCounter++; + LZDecompressWram(gPageSkillsTilemap, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_SKILLS][1]); + sMonSummaryScreenData->switchCounter++; break; case 4: - LZDecompressWram(gPageBattleMovesTilemap, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][1]); - pssData->switchCounter++; + LZDecompressWram(gPageBattleMovesTilemap, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][1]); + sMonSummaryScreenData->switchCounter++; break; case 5: - LZDecompressWram(gPageContestMovesTilemap, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1]); - pssData->switchCounter++; + LZDecompressWram(gPageContestMovesTilemap, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1]); + sMonSummaryScreenData->switchCounter++; break; case 6: LoadCompressedPalette(gStatusScreenPalette, 0, 0x100); LoadPalette(&gUnknown_08D85620, 0x81, 0x1E); - pssData->switchCounter++; + sMonSummaryScreenData->switchCounter++; break; case 7: LoadCompressedSpriteSheet(&sSpriteSheet_MoveTypes); - pssData->switchCounter++; + sMonSummaryScreenData->switchCounter++; break; case 8: LoadCompressedSpriteSheet(&sMoveSelectorSpriteSheet); - pssData->switchCounter++; + sMonSummaryScreenData->switchCounter++; break; case 9: LoadCompressedSpriteSheet(&sStatusIconsSpriteSheet); - pssData->switchCounter++; + sMonSummaryScreenData->switchCounter++; break; case 10: LoadCompressedSpritePalette(&sStatusIconsSpritePalette); - pssData->switchCounter++; + sMonSummaryScreenData->switchCounter++; break; case 11: LoadCompressedSpritePalette(&gUnknown_0861D07C); - pssData->switchCounter++; + sMonSummaryScreenData->switchCounter++; break; case 12: LoadCompressedPalette(gMoveTypes_Pal, 0x1D0, 0x60); - pssData->switchCounter = 0; + sMonSummaryScreenData->switchCounter = 0; return TRUE; } return FALSE; @@ -1282,126 +1337,127 @@ static bool8 SummaryScreen_DecompressGraphics(void) static void CopyMonToSummaryStruct(struct Pokemon *mon) { - if (!pssData->isBoxMon) + if (!sMonSummaryScreenData->isBoxMon) { - struct Pokemon *partyMon = pssData->monList.mons; - *mon = partyMon[pssData->curMonIndex]; + struct Pokemon *partyMon = sMonSummaryScreenData->monList.mons; + *mon = partyMon[sMonSummaryScreenData->curMonIndex]; } else { - struct BoxPokemon *boxMon = pssData->monList.boxMons; - BoxMonToMon(&boxMon[pssData->curMonIndex], mon); + struct BoxPokemon *boxMon = sMonSummaryScreenData->monList.boxMons; + BoxMonToMon(&boxMon[sMonSummaryScreenData->curMonIndex], mon); } } -static bool8 ExtractMonDataToSummaryStruct(struct Pokemon *a) +static bool8 ExtractMonDataToSummaryStruct(struct Pokemon *mon) { u32 i; - struct PokeSummary *sum = &pssData->summary; - switch (pssData->switchCounter) + struct PokeSummary *sum = &sMonSummaryScreenData->summary; + // Spread the data extraction over multiple frames. + switch (sMonSummaryScreenData->switchCounter) { case 0: - sum->species = GetMonData(a, MON_DATA_SPECIES); - sum->species2 = GetMonData(a, MON_DATA_SPECIES2); - sum->exp = GetMonData(a, MON_DATA_EXP); - sum->level = GetMonData(a, MON_DATA_LEVEL); - sum->altAbility = GetMonData(a, MON_DATA_ALT_ABILITY); - sum->item = GetMonData(a, MON_DATA_HELD_ITEM); - sum->pid = GetMonData(a, MON_DATA_PERSONALITY); - sum->sanity = GetMonData(a, MON_DATA_SANITY_IS_BAD_EGG); + sum->species = GetMonData(mon, MON_DATA_SPECIES); + sum->species2 = GetMonData(mon, MON_DATA_SPECIES2); + sum->exp = GetMonData(mon, MON_DATA_EXP); + sum->level = GetMonData(mon, MON_DATA_LEVEL); + sum->altAbility = GetMonData(mon, MON_DATA_ALT_ABILITY); + sum->item = GetMonData(mon, MON_DATA_HELD_ITEM); + sum->pid = GetMonData(mon, MON_DATA_PERSONALITY); + sum->sanity = GetMonData(mon, MON_DATA_SANITY_IS_BAD_EGG); if (sum->sanity) sum->isEgg = TRUE; else - sum->isEgg = GetMonData(a, MON_DATA_IS_EGG); + sum->isEgg = GetMonData(mon, MON_DATA_IS_EGG); break; case 1: for (i = 0; i < MAX_MON_MOVES; i++) { - sum->moves[i] = GetMonData(a, MON_DATA_MOVE1+i); - sum->pp[i] = GetMonData(a, MON_DATA_PP1+i); + sum->moves[i] = GetMonData(mon, MON_DATA_MOVE1+i); + sum->pp[i] = GetMonData(mon, MON_DATA_PP1+i); } - sum->ppBonuses = GetMonData(a, MON_DATA_PP_BONUSES); + sum->ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES); break; case 2: - if (pssData->monList.mons == gPlayerParty || pssData->mode == PSS_MODE_BOX || pssData->unk40EF == TRUE) + if (sMonSummaryScreenData->monList.mons == gPlayerParty || sMonSummaryScreenData->mode == PSS_MODE_BOX || sMonSummaryScreenData->unk40EF == TRUE) { - sum->nature = GetNature(a); - sum->currentHP = GetMonData(a, MON_DATA_HP); - sum->maxHP = GetMonData(a, MON_DATA_MAX_HP); - sum->atk = GetMonData(a, MON_DATA_ATK); - sum->def = GetMonData(a, MON_DATA_DEF); - sum->spatk = GetMonData(a, MON_DATA_SPATK); - sum->spdef = GetMonData(a, MON_DATA_SPDEF); - sum->speed = GetMonData(a, MON_DATA_SPEED); + sum->nature = GetNature(mon); + sum->currentHP = GetMonData(mon, MON_DATA_HP); + sum->maxHP = GetMonData(mon, MON_DATA_MAX_HP); + sum->atk = GetMonData(mon, MON_DATA_ATK); + sum->def = GetMonData(mon, MON_DATA_DEF); + sum->spatk = GetMonData(mon, MON_DATA_SPATK); + sum->spdef = GetMonData(mon, MON_DATA_SPDEF); + sum->speed = GetMonData(mon, MON_DATA_SPEED); } else { - sum->nature = GetNature(a); - sum->currentHP = GetMonData(a, MON_DATA_HP); - sum->maxHP = GetMonData(a, MON_DATA_MAX_HP); - sum->atk = GetMonData(a, MON_DATA_ATK2); - sum->def = GetMonData(a, MON_DATA_DEF2); - sum->spatk = GetMonData(a, MON_DATA_SPATK2); - sum->spdef = GetMonData(a, MON_DATA_SPDEF2); - sum->speed = GetMonData(a, MON_DATA_SPEED2); + sum->nature = GetNature(mon); + sum->currentHP = GetMonData(mon, MON_DATA_HP); + sum->maxHP = GetMonData(mon, MON_DATA_MAX_HP); + sum->atk = GetMonData(mon, MON_DATA_ATK2); + sum->def = GetMonData(mon, MON_DATA_DEF2); + sum->spatk = GetMonData(mon, MON_DATA_SPATK2); + sum->spdef = GetMonData(mon, MON_DATA_SPDEF2); + sum->speed = GetMonData(mon, MON_DATA_SPEED2); } break; case 3: - GetMonData(a, MON_DATA_OT_NAME, &sum->OTName); - ConvertInternationalString((u8*)&sum->OTName, GetMonData(a, MON_DATA_LANGUAGE)); - sum->unk7 = sub_81B205C(a); - sum->OTGender = GetMonData(a, MON_DATA_OT_GENDER); - sum->OTID = GetMonData(a, MON_DATA_OT_ID); - sum->metLocation = GetMonData(a, MON_DATA_MET_LOCATION); - sum->metLevel = GetMonData(a, MON_DATA_MET_LEVEL); - sum->metGame = GetMonData(a, MON_DATA_MET_GAME); - sum->friendship = GetMonData(a, MON_DATA_FRIENDSHIP); + GetMonData(mon, MON_DATA_OT_NAME, &sum->OTName); + ConvertInternationalString((u8*)&sum->OTName, GetMonData(mon, MON_DATA_LANGUAGE)); + sum->ailment = GetMonAilment(mon); + sum->OTGender = GetMonData(mon, MON_DATA_OT_GENDER); + sum->OTID = GetMonData(mon, MON_DATA_OT_ID); + sum->metLocation = GetMonData(mon, MON_DATA_MET_LOCATION); + sum->metLevel = GetMonData(mon, MON_DATA_MET_LEVEL); + sum->metGame = GetMonData(mon, MON_DATA_MET_GAME); + sum->friendship = GetMonData(mon, MON_DATA_FRIENDSHIP); break; default: - sum->ribbonCount = GetMonData(a, MON_DATA_RIBBON_COUNT); + sum->ribbonCount = GetMonData(mon, MON_DATA_RIBBON_COUNT); return TRUE; } - pssData->switchCounter++; + sMonSummaryScreenData->switchCounter++; return FALSE; } static void sub_81C0348(void) { - if (pssData->currPageIndex != PSS_PAGE_BATTLE_MOVES && pssData->currPageIndex != PSS_PAGE_CONTEST_MOVES) + if (sMonSummaryScreenData->currPageIndex != PSS_PAGE_BATTLE_MOVES && sMonSummaryScreenData->currPageIndex != PSS_PAGE_CONTEST_MOVES) { sub_81C1DA4(0, 255); sub_81C1EFC(0, 255, 0); } else { - DrawContestMoveHearts(pssData->summary.moves[pssData->firstMoveIndex]); - sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 0); - sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 0); - SetBgTilemapBuffer(1, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0]); - SetBgTilemapBuffer(2, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0]); + DrawContestMoveHearts(sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]); + sub_81C2194(sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 0); + sub_81C2194(sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 0); + SetBgTilemapBuffer(1, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0]); + SetBgTilemapBuffer(2, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0]); ChangeBgX(2, 0x10000, 1); - ClearWindowTilemap(19); - ClearWindowTilemap(13); + ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); + ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); } - if (pssData->summary.unk7 == 0) + if (sMonSummaryScreenData->summary.ailment == AILMENT_NONE) { sub_81C2074(0, 0xFF); } else { - if (pssData->currPageIndex != PSS_PAGE_BATTLE_MOVES && pssData->currPageIndex != PSS_PAGE_CONTEST_MOVES) - PutWindowTilemap(13); + if (sMonSummaryScreenData->currPageIndex != PSS_PAGE_BATTLE_MOVES && sMonSummaryScreenData->currPageIndex != PSS_PAGE_CONTEST_MOVES) + PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); } LimitEggSummaryPageDisplay(); - DrawPokerusCuredSymbol(&pssData->currentMon); + DrawPokerusCuredSymbol(&sMonSummaryScreenData->currentMon); } static void sub_81C0434(void) { FreeAllWindowBuffers(); - Free(pssData); + Free(sMonSummaryScreenData); } static void BeginCloseSummaryScreen(u8 taskId) @@ -1414,8 +1470,8 @@ static void CloseSummaryScreen(u8 taskId) { if (sub_81221EC() != TRUE && !gPaletteFade.active) { - SetMainCallback2(pssData->callback); - gLastViewedMonIndex = pssData->curMonIndex; + SetMainCallback2(sMonSummaryScreenData->callback); + gLastViewedMonIndex = sMonSummaryScreenData->curMonIndex; SummaryScreen_DestroyUnknownTask(); ResetSpriteData(); FreeAllSpritePalettes(); @@ -1434,25 +1490,25 @@ static void HandleInput(u8 taskId) { if (gMain.newKeys & DPAD_UP) { - ChangePokemon(taskId, -1); + ChangeSummaryPokemon(taskId, PSS_CHANGE_PREV); } else if (gMain.newKeys & DPAD_DOWN) { - ChangePokemon(taskId, 1); + ChangeSummaryPokemon(taskId, PSS_CHANGE_NEXT); } else if ((gMain.newKeys & DPAD_LEFT) || GetLRKeysState() == 1) { - ChangePage(taskId, -1); + ChangePage(taskId, PSS_CHANGE_PREV); } else if ((gMain.newKeys & DPAD_RIGHT) || GetLRKeysState() == 2) { - ChangePage(taskId, 1); + ChangePage(taskId, PSS_CHANGE_NEXT); } else if (gMain.newKeys & A_BUTTON) { - if (pssData->currPageIndex != PSS_PAGE_SKILLS) + if (sMonSummaryScreenData->currPageIndex != PSS_PAGE_SKILLS) { - if (pssData->currPageIndex == PSS_PAGE_INFO) + if (sMonSummaryScreenData->currPageIndex == PSS_PAGE_INFO) { StopPokemonAnimations(); PlaySE(SE_SELECT); @@ -1474,50 +1530,52 @@ static void HandleInput(u8 taskId) } } -static void ChangePokemon(u8 taskId, s8 a) +static void ChangeSummaryPokemon(u8 taskId, s8 delta) { - s8 r4_2; + s8 v1; + s8 v2; - if (!pssData->lockMonFlag) + if (!sMonSummaryScreenData->lockMonFlag) { - if (pssData->isBoxMon == TRUE) + if (sMonSummaryScreenData->isBoxMon == TRUE) { - if (pssData->currPageIndex != PSS_PAGE_INFO) + + if (sMonSummaryScreenData->currPageIndex != PSS_PAGE_INFO) { - if (a == 1) - a = 0; + if (delta == PSS_CHANGE_NEXT) + delta = 0; else - a = 2; + delta = 2; } else { - if (a == 1) - a = 1; + if (delta == PSS_CHANGE_NEXT) + delta = 1; else - a = 3; + delta = 3; } - r4_2 = sub_80D214C(pssData->monList.boxMons, pssData->curMonIndex, pssData->maxMonIndex, a); + v1 = sub_80D214C(sMonSummaryScreenData->monList.boxMons, sMonSummaryScreenData->curMonIndex, sMonSummaryScreenData->maxMonIndex, delta); } else if (IsMultiBattle() == TRUE) { - r4_2 = sub_81C09B4(a); + v1 = sub_81C09B4(delta); } else { - r4_2 = sub_81C08F8(a); + v1 = sub_81C08F8(delta); } - if (r4_2 != -1) + if (v1 != -1) { PlaySE(SE_SELECT); - if (pssData->summary.unk7 != 0) + if (sMonSummaryScreenData->summary.ailment != AILMENT_NONE) { SetSpriteInvisibility(2, 1); - ClearWindowTilemap(13); + ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); schedule_bg_copy_tilemap_to_vram(0); sub_81C2074(0, 2); } - pssData->curMonIndex = r4_2; + sMonSummaryScreenData->curMonIndex = v1; gTasks[taskId].data[0] = 0; gTasks[taskId].func = sub_81C0704; } @@ -1535,36 +1593,36 @@ static void sub_81C0704(u8 taskId) break; case 1: SummaryScreen_DestroyUnknownTask(); - DestroySpriteAndFreeResources(&gSprites[pssData->spriteIds[0]]); + DestroySpriteAndFreeResources(&gSprites[sMonSummaryScreenData->spriteIds[0]]); break; case 2: - DestroySpriteAndFreeResources(&gSprites[pssData->spriteIds[1]]); + DestroySpriteAndFreeResources(&gSprites[sMonSummaryScreenData->spriteIds[1]]); break; case 3: - CopyMonToSummaryStruct(&pssData->currentMon); - pssData->switchCounter = 0; + CopyMonToSummaryStruct(&sMonSummaryScreenData->currentMon); + sMonSummaryScreenData->switchCounter = 0; break; case 4: - if (ExtractMonDataToSummaryStruct(&pssData->currentMon) == FALSE) + if (ExtractMonDataToSummaryStruct(&sMonSummaryScreenData->currentMon) == FALSE) return; break; case 5: - RemoveAndCreateMonMarkingsSprite(&pssData->currentMon); + RemoveAndCreateMonMarkingsSprite(&sMonSummaryScreenData->currentMon); break; case 6: - CreateCaughtBallSprite(&pssData->currentMon); + CreateCaughtBallSprite(&sMonSummaryScreenData->currentMon); break; case 7: - if (pssData->summary.unk7) + if (sMonSummaryScreenData->summary.ailment != AILMENT_NONE) sub_81C2074(10, -2); - DrawPokerusCuredSymbol(&pssData->currentMon); + DrawPokerusCuredSymbol(&sMonSummaryScreenData->currentMon); data[1] = 0; break; case 8: - pssData->spriteIds[0] = CreatePokemonSprite(&pssData->currentMon, &data[1]); - if (pssData->spriteIds[0] == 0xFF) + sMonSummaryScreenData->spriteIds[0] = CreatePokemonSprite(&sMonSummaryScreenData->currentMon, &data[1]); + if (sMonSummaryScreenData->spriteIds[0] == 0xFF) return; - gSprites[pssData->spriteIds[0]].data[2] = 1; + gSprites[sMonSummaryScreenData->spriteIds[0]].data[2] = 1; CheckExperienceProgressBar(); data[1] = 0; break; @@ -1575,11 +1633,11 @@ static void sub_81C0704(u8 taskId) sub_81C25E8(); break; case 11: - PrintPageSpecificText(pssData->currPageIndex); + PrintPageSpecificText(sMonSummaryScreenData->currPageIndex); LimitEggSummaryPageDisplay(); break; case 12: - gSprites[pssData->spriteIds[0]].data[2] = 0; + gSprites[sMonSummaryScreenData->spriteIds[0]].data[2] = 0; break; default: if (sub_81221EC() == 0 && FuncIsActiveTask(sub_81C20F0) == 0) @@ -1594,25 +1652,25 @@ static void sub_81C0704(u8 taskId) static s8 sub_81C08F8(s8 a) { - struct Pokemon *mon = pssData->monList.mons; + struct Pokemon *mon = sMonSummaryScreenData->monList.mons; - if (pssData->currPageIndex == PSS_PAGE_INFO) + if (sMonSummaryScreenData->currPageIndex == PSS_PAGE_INFO) { - if (a == -1 && pssData->curMonIndex == 0) + if (a == -1 && sMonSummaryScreenData->curMonIndex == 0) return -1; - else if (a == 1 && pssData->curMonIndex >= pssData->maxMonIndex) + else if (a == 1 && sMonSummaryScreenData->curMonIndex >= sMonSummaryScreenData->maxMonIndex) return -1; else - return pssData->curMonIndex + a; + return sMonSummaryScreenData->curMonIndex + a; } else { - s8 index = pssData->curMonIndex; + s8 index = sMonSummaryScreenData->curMonIndex; do { index += a; - if (index < 0 || index > pssData->maxMonIndex) + if (index < 0 || index > sMonSummaryScreenData->maxMonIndex) return -1; } while (GetMonData(&mon[index], MON_DATA_IS_EGG) != 0); return index; @@ -1621,13 +1679,13 @@ static s8 sub_81C08F8(s8 a) static s8 sub_81C09B4(s8 a) { - struct Pokemon *mon = pssData->monList.mons; + struct Pokemon *mon = sMonSummaryScreenData->monList.mons; s8 r5 = 0; u8 i; for (i = 0; i < 6; i++) { - if (gUnknown_0861CC1C[i] == pssData->curMonIndex) + if (gUnknown_0861CC1C[i] == sMonSummaryScreenData->curMonIndex) { r5 = i; break; @@ -1652,33 +1710,33 @@ static bool8 sub_81C0A50(struct Pokemon* mon) { if (GetMonData(mon, MON_DATA_SPECIES) == SPECIES_NONE) return FALSE; - else if (pssData->curMonIndex != 0 || GetMonData(mon, MON_DATA_IS_EGG) == 0) + else if (sMonSummaryScreenData->curMonIndex != 0 || GetMonData(mon, MON_DATA_IS_EGG) == 0) return TRUE; else return FALSE; } -static void ChangePage(u8 taskId, s8 b) +static void ChangePage(u8 taskId, s8 delta) { - struct PokeSummary *summary = &pssData->summary; + struct PokeSummary *summary = &sMonSummaryScreenData->summary; s16 *data = gTasks[taskId].data; if (summary->isEgg) return; - else if (b == -1 && pssData->currPageIndex == pssData->minPageIndex) + else if (delta == PSS_CHANGE_PREV && sMonSummaryScreenData->currPageIndex == sMonSummaryScreenData->minPageIndex) return; - else if (b == 1 && pssData->currPageIndex == pssData->maxPageIndex) + else if (delta == PSS_CHANGE_NEXT && sMonSummaryScreenData->currPageIndex == sMonSummaryScreenData->maxPageIndex) return; PlaySE(SE_SELECT); - ClearPageWindowTilemaps(pssData->currPageIndex); - pssData->currPageIndex += b; + ClearPageWindowTilemaps(sMonSummaryScreenData->currPageIndex); + sMonSummaryScreenData->currPageIndex += delta; data[0] = 0; - if (b == 1) + if (delta == PSS_CHANGE_NEXT) SetTaskFuncWithFollowupFunc(taskId, PssScrollRight, gTasks[taskId].func); else SetTaskFuncWithFollowupFunc(taskId, PssScrollLeft, gTasks[taskId].func); - CreateTextPrinterTask(pssData->currPageIndex); + CreateTextPrinterTask(sMonSummaryScreenData->currPageIndex); HidePageSpecificSprites(); } @@ -1687,7 +1745,7 @@ static void PssScrollRight(u8 taskId) // Scroll right s16 *data = gTasks[taskId].data; if (data[0] == 0) { - if (pssData->bgDisplayOrder == 0) + if (sMonSummaryScreenData->bgDisplayOrder == 0) { data[1] = 1; SetBgAttribute(1, BG_ATTR_PRIORITY, 1); @@ -1702,7 +1760,7 @@ static void PssScrollRight(u8 taskId) // Scroll right schedule_bg_copy_tilemap_to_vram(2); } ChangeBgX(data[1], 0, 0); - SetBgTilemapBuffer(data[1], pssData->bgTilemapBuffers[pssData->currPageIndex][0]); + SetBgTilemapBuffer(data[1], sMonSummaryScreenData->bgTilemapBuffers[sMonSummaryScreenData->currPageIndex][0]); ShowBg(1); ShowBg(2); } @@ -1715,11 +1773,11 @@ static void PssScrollRight(u8 taskId) // Scroll right static void PssScrollRightEnd(u8 taskId) // display right { s16 *data = gTasks[taskId].data; - pssData->bgDisplayOrder ^= 1; + sMonSummaryScreenData->bgDisplayOrder ^= 1; data[1] = 0; data[0] = 0; DrawPagination(); - CreatePageWindowTilemaps(pssData->currPageIndex); + CreatePageWindowTilemaps(sMonSummaryScreenData->currPageIndex); SetTypeIcons(); CheckExperienceProgressBar(); SwitchTaskToFollowupFunc(taskId); @@ -1730,7 +1788,7 @@ static void PssScrollLeft(u8 taskId) // Scroll left s16 *data = gTasks[taskId].data; if (data[0] == 0) { - if (pssData->bgDisplayOrder == 0) + if (sMonSummaryScreenData->bgDisplayOrder == 0) data[1] = 2; else data[1] = 1; @@ -1745,7 +1803,7 @@ static void PssScrollLeft(u8 taskId) // Scroll left static void PssScrollLeftEnd(u8 taskId) // display left { s16 *data = gTasks[taskId].data; - if (pssData->bgDisplayOrder == 0) + if (sMonSummaryScreenData->bgDisplayOrder == 0) { SetBgAttribute(1, BG_ATTR_PRIORITY, 1); SetBgAttribute(2, BG_ATTR_PRIORITY, 2); @@ -1757,18 +1815,18 @@ static void PssScrollLeftEnd(u8 taskId) // display left SetBgAttribute(1, BG_ATTR_PRIORITY, 2); schedule_bg_copy_tilemap_to_vram(1); } - if (pssData->currPageIndex > 1) + if (sMonSummaryScreenData->currPageIndex > 1) { - SetBgTilemapBuffer(data[1], (u8*)pssData + ((pssData->currPageIndex << 12) + 0xFFFFF0BC)); + SetBgTilemapBuffer(data[1], (u8*)sMonSummaryScreenData + ((sMonSummaryScreenData->currPageIndex << 12) + 0xFFFFF0BC)); ChangeBgX(data[1], 0x10000, 0); } ShowBg(1); ShowBg(2); - pssData->bgDisplayOrder ^= 1; + sMonSummaryScreenData->bgDisplayOrder ^= 1; data[1] = 0; data[0] = 0; DrawPagination(); - CreatePageWindowTilemaps(pssData->currPageIndex); + CreatePageWindowTilemaps(sMonSummaryScreenData->currPageIndex); SetTypeIcons(); CheckExperienceProgressBar(); SwitchTaskToFollowupFunc(taskId); @@ -1776,27 +1834,27 @@ static void PssScrollLeftEnd(u8 taskId) // display left static void CheckExperienceProgressBar(void) { - if (pssData->currPageIndex == 1) - DrawExperienceProgressBar(&pssData->currentMon); + if (sMonSummaryScreenData->currPageIndex == 1) + DrawExperienceProgressBar(&sMonSummaryScreenData->currentMon); } static void sub_81C0E48(u8 taskId) { u16 move; - pssData->firstMoveIndex = 0; - move = pssData->summary.moves[pssData->firstMoveIndex]; - ClearWindowTilemap(0x13); - if (gSprites[pssData->spriteIds[2]].invisible == 0) - ClearWindowTilemap(0xD); + sMonSummaryScreenData->firstMoveIndex = 0; + move = sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]; + ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); + if (gSprites[sMonSummaryScreenData->spriteIds[2]].invisible == 0) + ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); sub_81C1DA4(9, -3); sub_81C1EFC(9, -3, move); - if (!pssData->unk40C8) + if (!sMonSummaryScreenData->unk40C8) { - ClearWindowTilemap(5); - PutWindowTilemap(6); + ClearWindowTilemap(PSS_LABEL_WINDOW_PROMPT_INFO); + PutWindowTilemap(PSS_LABEL_WINDOW_PROMPT_SWITCH); } - sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 0); - sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 0); + sub_81C2194(sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 0); + sub_81C2194(sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 0); PrintMoveDetails(move); PrintNewMoveDetailsOrCancelText(); SetNewMoveTypeIcon(); @@ -1817,17 +1875,17 @@ static void HandleInput_MoveSelect(u8 taskId) if (gMain.newKeys & DPAD_UP) { data[0] = 4; - sub_81C1070(data, -1, &pssData->firstMoveIndex); + sub_81C1070(data, -1, &sMonSummaryScreenData->firstMoveIndex); } else if (gMain.newKeys & DPAD_DOWN) { data[0] = 4; - sub_81C1070(data, 1, &pssData->firstMoveIndex); + sub_81C1070(data, 1, &sMonSummaryScreenData->firstMoveIndex); } else if (gMain.newKeys & A_BUTTON) { - if (pssData->unk40C8 == TRUE - || (pssData->newMove == MOVE_NONE && pssData->firstMoveIndex == MAX_MON_MOVES)) + if (sMonSummaryScreenData->unk40C8 == TRUE + || (sMonSummaryScreenData->newMove == MOVE_NONE && sMonSummaryScreenData->firstMoveIndex == MAX_MON_MOVES)) { PlaySE(SE_SELECT); sub_81C11F4(taskId); @@ -1855,7 +1913,7 @@ static bool8 sub_81C1040(void) u8 i; for (i = 1; i < MAX_MON_MOVES; i++) { - if (pssData->summary.moves[i] != 0) + if (sMonSummaryScreenData->summary.moves[i] != 0) return TRUE; } return FALSE; @@ -1878,10 +1936,10 @@ static void sub_81C1070(s16 *a, s8 b, u8 *c) moveIndex = a[0]; if (moveIndex == MAX_MON_MOVES) { - move = pssData->newMove; + move = sMonSummaryScreenData->newMove; break; } - move = pssData->summary.moves[moveIndex]; + move = sMonSummaryScreenData->summary.moves[moveIndex]; if (move != 0) break; } @@ -1889,25 +1947,25 @@ static void sub_81C1070(s16 *a, s8 b, u8 *c) schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(2); PrintMoveDetails(move); - if ((*c == 4 && pssData->newMove == MOVE_NONE) || a[1] == 1) + if ((*c == 4 && sMonSummaryScreenData->newMove == MOVE_NONE) || a[1] == 1) { - ClearWindowTilemap(19); - if (!gSprites[pssData->spriteIds[2]].invisible) - ClearWindowTilemap(13); + ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); + if (!gSprites[sMonSummaryScreenData->spriteIds[2]].invisible) + ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); schedule_bg_copy_tilemap_to_vram(0); sub_81C1DA4(9, -3); sub_81C1EFC(9, -3, move); } - if (*c != 4 && moveIndex == 4 && pssData->newMove == MOVE_NONE) + if (*c != 4 && moveIndex == 4 && sMonSummaryScreenData->newMove == MOVE_NONE) { - ClearWindowTilemap(14); - ClearWindowTilemap(15); + ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC); + ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM); schedule_bg_copy_tilemap_to_vram(0); sub_81C1DA4(0, 3); sub_81C1EFC(0, 3, 0); } *c = moveIndex; - if (c == &pssData->firstMoveIndex) + if (c == &sMonSummaryScreenData->firstMoveIndex) sub_81C4D18(8); else sub_81C4D18(18); @@ -1916,16 +1974,16 @@ static void sub_81C1070(s16 *a, s8 b, u8 *c) static void sub_81C11F4(u8 taskId) { sub_81C4C60(8); - ClearWindowTilemap(6); - PutWindowTilemap(5); + ClearWindowTilemap(PSS_LABEL_WINDOW_PROMPT_SWITCH); + PutWindowTilemap(PSS_LABEL_WINDOW_PROMPT_INFO); PrintMoveDetails(0); - sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 1); - sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 1); + sub_81C2194(sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 1); + sub_81C2194(sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 1); sub_81C4064(); - if (pssData->firstMoveIndex != MAX_MON_MOVES) + if (sMonSummaryScreenData->firstMoveIndex != MAX_MON_MOVES) { - ClearWindowTilemap(14); - ClearWindowTilemap(15); + ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC); + ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM); sub_81C1DA4(0, 3); sub_81C1EFC(0, 3, 0); } @@ -1937,7 +1995,7 @@ static void sub_81C11F4(u8 taskId) static void sub_81C129C(u8 taskId) { - pssData->secondMoveIndex = pssData->firstMoveIndex; + sMonSummaryScreenData->secondMoveIndex = sMonSummaryScreenData->firstMoveIndex; sub_81C4C84(1); sub_81C4AF8(18); gTasks[taskId].func = sub_81C12E4; @@ -1952,16 +2010,16 @@ static void sub_81C12E4(u8 taskId) if (gMain.newKeys & DPAD_UP) { data[0] = 3; - sub_81C1070(&data[0], -1, &pssData->secondMoveIndex); + sub_81C1070(&data[0], -1, &sMonSummaryScreenData->secondMoveIndex); } else if (gMain.newKeys & DPAD_DOWN) { data[0] = 3; - sub_81C1070(&data[0], 1, &pssData->secondMoveIndex); + sub_81C1070(&data[0], 1, &sMonSummaryScreenData->secondMoveIndex); } else if (gMain.newKeys & A_BUTTON) { - if (pssData->firstMoveIndex == pssData->secondMoveIndex) + if (sMonSummaryScreenData->firstMoveIndex == sMonSummaryScreenData->secondMoveIndex) { sub_81C13B0(taskId, 0); } @@ -1987,23 +2045,23 @@ static void sub_81C13B0(u8 taskId, bool8 b) if (b == TRUE) { - if (!pssData->isBoxMon) + if (!sMonSummaryScreenData->isBoxMon) { - struct Pokemon *why = pssData->monList.mons; - SwapMonMoves(&why[pssData->curMonIndex], pssData->firstMoveIndex, pssData->secondMoveIndex); + struct Pokemon *why = sMonSummaryScreenData->monList.mons; + SwapMonMoves(&why[sMonSummaryScreenData->curMonIndex], sMonSummaryScreenData->firstMoveIndex, sMonSummaryScreenData->secondMoveIndex); } else { - struct BoxPokemon *why = pssData->monList.boxMons; - SwapBoxMonMoves(&why[pssData->curMonIndex], pssData->firstMoveIndex, pssData->secondMoveIndex); + struct BoxPokemon *why = sMonSummaryScreenData->monList.boxMons; + SwapBoxMonMoves(&why[sMonSummaryScreenData->curMonIndex], sMonSummaryScreenData->firstMoveIndex, sMonSummaryScreenData->secondMoveIndex); } - CopyMonToSummaryStruct(&pssData->currentMon); - sub_81C40A0(pssData->firstMoveIndex, pssData->secondMoveIndex); - sub_81C4568(pssData->firstMoveIndex, pssData->secondMoveIndex); - pssData->firstMoveIndex = pssData->secondMoveIndex; + CopyMonToSummaryStruct(&sMonSummaryScreenData->currentMon); + sub_81C40A0(sMonSummaryScreenData->firstMoveIndex, sMonSummaryScreenData->secondMoveIndex); + sub_81C4568(sMonSummaryScreenData->firstMoveIndex, sMonSummaryScreenData->secondMoveIndex); + sMonSummaryScreenData->firstMoveIndex = sMonSummaryScreenData->secondMoveIndex; } - move = pssData->summary.moves[pssData->firstMoveIndex]; + move = sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]; PrintMoveDetails(move); DrawContestMoveHearts(move); schedule_bg_copy_tilemap_to_vram(1); @@ -2013,7 +2071,7 @@ static void sub_81C13B0(u8 taskId, bool8 b) static void SwapMonMoves(struct Pokemon *mon, u8 moveIndex1, u8 moveIndex2) { - struct PokeSummary* summary = &pssData->summary; + struct PokeSummary* summary = &sMonSummaryScreenData->summary; u16 move1 = summary->moves[moveIndex1]; u16 move2 = summary->moves[moveIndex2]; @@ -2048,7 +2106,7 @@ static void SwapMonMoves(struct Pokemon *mon, u8 moveIndex1, u8 moveIndex2) static void SwapBoxMonMoves(struct BoxPokemon *mon, u8 moveIndex1, u8 moveIndex2) { - struct PokeSummary* summary = &pssData->summary; + struct PokeSummary* summary = &sMonSummaryScreenData->summary; u16 move1 = summary->moves[moveIndex1]; u16 move2 = summary->moves[moveIndex2]; @@ -2092,27 +2150,27 @@ static void HandleReplaceMoveInput(u8 taskId) { s16* data = gTasks[taskId].data; - if (sub_81221EC() != 1) + if (sub_81221EC() != TRUE) { - if (gPaletteFade.active != 1) + if (gPaletteFade.active != TRUE) { if (gMain.newKeys & DPAD_UP) { data[0] = 4; - sub_81C1070(data, -1, &pssData->firstMoveIndex); + sub_81C1070(data, PSS_CHANGE_PREV, &sMonSummaryScreenData->firstMoveIndex); } else if (gMain.newKeys & DPAD_DOWN) { data[0] = 4; - sub_81C1070(data, 1, &pssData->firstMoveIndex); + sub_81C1070(data, PSS_CHANGE_NEXT, &sMonSummaryScreenData->firstMoveIndex); } else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1) { - ChangePage(taskId, -1); + ChangePage(taskId, PSS_CHANGE_PREV); } else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysState() == 2) { - ChangePage(taskId, 1); + ChangePage(taskId, PSS_CHANGE_NEXT); } else if (gMain.newKeys & A_BUTTON) { @@ -2120,7 +2178,7 @@ static void HandleReplaceMoveInput(u8 taskId) { StopPokemonAnimations(); PlaySE(SE_SELECT); - sUnknown_0203CF21 = pssData->firstMoveIndex; + sUnknown_0203CF21 = sMonSummaryScreenData->firstMoveIndex; gSpecialVar_0x8005 = sUnknown_0203CF21; BeginCloseSummaryScreen(taskId); } @@ -2145,7 +2203,7 @@ static void HandleReplaceMoveInput(u8 taskId) static bool8 CanReplaceMove(void) { - if (pssData->firstMoveIndex == MAX_MON_MOVES || pssData->newMove == MOVE_NONE || IsMoveHm(pssData->summary.moves[pssData->firstMoveIndex]) != 1) + if (sMonSummaryScreenData->firstMoveIndex == MAX_MON_MOVES || sMonSummaryScreenData->newMove == MOVE_NONE || IsMoveHm(sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]) != 1) return TRUE; else return FALSE; @@ -2153,8 +2211,8 @@ static bool8 CanReplaceMove(void) static void ShowHMMovesCantBeForgottenWindow(u8 taskId) { - ClearWindowTilemap(14); - ClearWindowTilemap(15); + ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC); + ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM); schedule_bg_copy_tilemap_to_vram(0); sub_81C1DA4(0, 3); sub_81C1EFC(0, 3, 0); @@ -2173,7 +2231,7 @@ static void HandleHMMovesCantBeForgottenInput(u8 taskId) { data[1] = 1; data[0] = 4; - sub_81C1070(&data[0], -1, &pssData->firstMoveIndex); + sub_81C1070(&data[0], -1, &sMonSummaryScreenData->firstMoveIndex); data[1] = 0; gTasks[taskId].func = HandleReplaceMoveInput; } @@ -2181,44 +2239,44 @@ static void HandleHMMovesCantBeForgottenInput(u8 taskId) { data[1] = 1; data[0] = 4; - sub_81C1070(&data[0], 1, &pssData->firstMoveIndex); + sub_81C1070(&data[0], 1, &sMonSummaryScreenData->firstMoveIndex); data[1] = 0; gTasks[taskId].func = HandleReplaceMoveInput; } else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1) { - if (pssData->currPageIndex != 2) + if (sMonSummaryScreenData->currPageIndex != 2) { - ClearWindowTilemap(19); - if (!gSprites[pssData->spriteIds[2]].invisible) - ClearWindowTilemap(13); - move = pssData->summary.moves[pssData->firstMoveIndex]; + ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); + if (!gSprites[sMonSummaryScreenData->spriteIds[2]].invisible) + ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); + move = sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]; gTasks[taskId].func = HandleReplaceMoveInput; - ChangePage(taskId, -1); + ChangePage(taskId, PSS_CHANGE_PREV); sub_81C1DA4(9, -2); sub_81C1EFC(9, -2, move); } } else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysState() == 2) { - if (pssData->currPageIndex != 3) + if (sMonSummaryScreenData->currPageIndex != 3) { - ClearWindowTilemap(19); - if (!gSprites[pssData->spriteIds[2]].invisible) - ClearWindowTilemap(13); - move = pssData->summary.moves[pssData->firstMoveIndex]; + ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); + if (!gSprites[sMonSummaryScreenData->spriteIds[2]].invisible) + ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); + move = sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]; gTasks[taskId].func = HandleReplaceMoveInput; - ChangePage(taskId, 1); + ChangePage(taskId, PSS_CHANGE_NEXT); sub_81C1DA4(9, -2); sub_81C1EFC(9, -2, move); } } else if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - ClearWindowTilemap(19); - if (!gSprites[pssData->spriteIds[2]].invisible) - ClearWindowTilemap(13); - move = pssData->summary.moves[pssData->firstMoveIndex]; + ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); + if (!gSprites[sMonSummaryScreenData->spriteIds[2]].invisible) + ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); + move = sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]; PrintMoveDetails(move); schedule_bg_copy_tilemap_to_vram(0); sub_81C1DA4(9, -3); @@ -2242,30 +2300,30 @@ static void DrawPagination(void) // Updates the pagination dots at the top of th { u8 j = i * 2; - if (i < pssData->minPageIndex) + if (i < sMonSummaryScreenData->minPageIndex) { alloced[j + 0] = 0x40; alloced[j + 1] = 0x40; alloced[j + 8] = 0x50; alloced[j + 9] = 0x50; } - else if (i > pssData->maxPageIndex) + else if (i > sMonSummaryScreenData->maxPageIndex) { alloced[j + 0] = 0x4A; alloced[j + 1] = 0x4A; alloced[j + 8] = 0x5A; alloced[j + 9] = 0x5A; } - else if (i < pssData->currPageIndex) + else if (i < sMonSummaryScreenData->currPageIndex) { alloced[j + 0] = 0x46; alloced[j + 1] = 0x47; alloced[j + 8] = 0x56; alloced[j + 9] = 0x57; } - else if (i == pssData->currPageIndex) + else if (i == sMonSummaryScreenData->currPageIndex) { - if (i != pssData->maxPageIndex) + if (i != sMonSummaryScreenData->maxPageIndex) { alloced[j + 0] = 0x41; alloced[j + 1] = 0x42; @@ -2280,7 +2338,7 @@ static void DrawPagination(void) // Updates the pagination dots at the top of th alloced[j + 9] = 0x5C; } } - else if (i != pssData->maxPageIndex) + else if (i != sMonSummaryScreenData->maxPageIndex) { alloced[j + 0] = 0x43; alloced[j + 1] = 0x44; @@ -2335,7 +2393,7 @@ static void sub_81C1DA4(u16 a, s16 b) b = sUnknown_0861CC04.field_6; if (b == 0 || b == sUnknown_0861CC04.field_6) { - sub_81C1CB0(&sUnknown_0861CC04, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], b, 1); + sub_81C1CB0(&sUnknown_0861CC04, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], b, 1); } else { @@ -2361,19 +2419,19 @@ static void sub_81C1E20(u8 taskId) { data[1] = sUnknown_0861CC04.field_6; } - sub_81C1CB0(&sUnknown_0861CC04, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], data[1], 1); + sub_81C1CB0(&sUnknown_0861CC04, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], data[1], 1); if (data[1] <= 0 || data[1] >= sUnknown_0861CC04.field_6) { if (data[0] < 0) { - if (pssData->currPageIndex == 2) - PutWindowTilemap(14); + if (sMonSummaryScreenData->currPageIndex == 2) + PutWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC); } else { - if (!gSprites[pssData->spriteIds[2]].invisible) - PutWindowTilemap(13); - PutWindowTilemap(19); + if (!gSprites[sMonSummaryScreenData->spriteIds[2]].invisible) + PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); + PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); } schedule_bg_copy_tilemap_to_vram(0); DestroyTask(taskId); @@ -2387,7 +2445,7 @@ static void sub_81C1EFC(u16 a, s16 b, u16 move) if (b > sUnknown_0861CC10.field_6) b = sUnknown_0861CC10.field_6; if (b == 0 || b == sUnknown_0861CC10.field_6) - sub_81C1CB0(&sUnknown_0861CC10, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], b, 1); + sub_81C1CB0(&sUnknown_0861CC10, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], b, 1); else { u8 taskId = FindTaskIdByFunc(sub_81C1F80); @@ -2411,22 +2469,22 @@ static void sub_81C1F80(u8 taskId) { data[1] = sUnknown_0861CC10.field_6; } - sub_81C1CB0(&sUnknown_0861CC10, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], data[1], 1); + sub_81C1CB0(&sUnknown_0861CC10, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], data[1], 1); if (data[1] <= 0 || data[1] >= sUnknown_0861CC10.field_6) { if (data[0] < 0) { - if (pssData->currPageIndex == 3 && FuncIsActiveTask(PssScrollRight) == 0) - PutWindowTilemap(15); + if (sMonSummaryScreenData->currPageIndex == 3 && FuncIsActiveTask(PssScrollRight) == 0) + PutWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM); DrawContestMoveHearts(data[2]); } else { - if (!gSprites[pssData->spriteIds[2]].invisible) + if (!gSprites[sMonSummaryScreenData->spriteIds[2]].invisible) { - PutWindowTilemap(13); + PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); } - PutWindowTilemap(19); + PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); } schedule_bg_copy_tilemap_to_vram(0); DestroyTask(taskId); @@ -2441,8 +2499,8 @@ static void sub_81C2074(u16 a, s16 b) b = sUnknown_0861CBEC.field_6; if (b == 0 || b == sUnknown_0861CBEC.field_6) { - sub_81C1CB0(&sUnknown_0861CBEC, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0); - sub_81C1CB0(&sUnknown_0861CBF8, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0); + sub_81C1CB0(&sUnknown_0861CBEC, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0); + sub_81C1CB0(&sUnknown_0861CBF8, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0); } else { @@ -2460,15 +2518,15 @@ static void sub_81C20F0(u8 taskId) data[1] = 0; else if (data[1] > sUnknown_0861CBEC.field_6) data[1] = sUnknown_0861CBEC.field_6; - sub_81C1CB0(&sUnknown_0861CBEC, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0); - sub_81C1CB0(&sUnknown_0861CBF8, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0); + sub_81C1CB0(&sUnknown_0861CBEC, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0); + sub_81C1CB0(&sUnknown_0861CBF8, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0); schedule_bg_copy_tilemap_to_vram(3); if (data[1] <= 0 || data[1] >= sUnknown_0861CBEC.field_6) { if (data[0] < 0) { CreateSetStatusSprite(); - PutWindowTilemap(13); + PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); schedule_bg_copy_tilemap_to_vram(0); } DestroyTask(taskId); @@ -2507,13 +2565,13 @@ static void DrawPokerusCuredSymbol(struct Pokemon *mon) // This checks if the mo { if (!CheckPartyPokerus(mon, 0) && CheckPartyHasHadPokerus(mon, 0)) // If yes it draws the cured symbol { - pssData->bgTilemapBuffers[PSS_PAGE_INFO][0][0x223] = 0x2C; - pssData->bgTilemapBuffers[PSS_PAGE_INFO][1][0x223] = 0x2C; + sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][0][0x223] = 0x2C; + sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][1][0x223] = 0x2C; } else { - pssData->bgTilemapBuffers[PSS_PAGE_INFO][0][0x223] = 0x81A; - pssData->bgTilemapBuffers[PSS_PAGE_INFO][1][0x223] = 0x81A; + sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][0][0x223] = 0x81A; + sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][1][0x223] = 0x81A; } schedule_bg_copy_tilemap_to_vram(3); } @@ -2530,7 +2588,7 @@ static void sub_81C228C(bool8 isMonShiny) static void DrawExperienceProgressBar(struct Pokemon *unused) { s64 numExpProgressBarTicks; - struct PokeSummary *summary = &pssData->summary; + struct PokeSummary *summary = &sMonSummaryScreenData->summary; u16 *r9; u8 i; @@ -2551,7 +2609,7 @@ static void DrawExperienceProgressBar(struct Pokemon *unused) numExpProgressBarTicks = 0; } - r9 = &pssData->bgTilemapBuffers[PSS_PAGE_SKILLS][1][0x255]; + r9 = &sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_SKILLS][1][0x255]; for (i = 0; i < 8; i++) { if (numExpProgressBarTicks > 7) @@ -2563,7 +2621,7 @@ static void DrawExperienceProgressBar(struct Pokemon *unused) numExpProgressBarTicks = 0; } - if (GetBgTilemapBuffer(1) == pssData->bgTilemapBuffers[PSS_PAGE_SKILLS][0]) + if (GetBgTilemapBuffer(1) == sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_SKILLS][0]) schedule_bg_copy_tilemap_to_vram(1); else schedule_bg_copy_tilemap_to_vram(2); @@ -2571,7 +2629,7 @@ static void DrawExperienceProgressBar(struct Pokemon *unused) static void DrawContestMoveHearts(u16 move) { - u16 *tilemap = pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1]; + u16 *tilemap = sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1]; u8 i; u8 effectValue; @@ -2615,7 +2673,7 @@ static void DrawContestMoveHearts(u16 move) static void LimitEggSummaryPageDisplay(void) // If the pokemon is an egg, limit the number of pages displayed to 1 { - if (pssData->summary.isEgg) + if (sMonSummaryScreenData->summary.isEgg) ChangeBgX(3, 0x10000, 0); else ChangeBgX(3, 0, 0); @@ -2631,9 +2689,9 @@ static void ResetWindows(void) { FillWindowPixelBuffer(i, 0); } - for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++) + for (i = 0; i < ARRAY_COUNT(sMonSummaryScreenData->windowIds); i++) { - pssData->windowIds[i] = 0xFF; + sMonSummaryScreenData->windowIds[i] = 0xFF; } } @@ -2644,10 +2702,10 @@ static void SummaryScreen_PrintTextOnWindow(u8 windowId, const u8 *string, u8 x, static void sub_81C25E8(void) { - FillWindowPixelBuffer(17, 0); - FillWindowPixelBuffer(18, 0); - FillWindowPixelBuffer(19, 0); - if (!pssData->summary.isEgg) + FillWindowPixelBuffer(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER, 0); + FillWindowPixelBuffer(PSS_LABEL_WINDOW_PORTRAIT_NICKNAME, 0); + FillWindowPixelBuffer(PSS_LABEL_WINDOW_PORTRAIT_SPECIES, 0); + if (!sMonSummaryScreenData->summary.isEgg) sub_81C2628(); else sub_81C2794(); @@ -2657,8 +2715,8 @@ static void sub_81C25E8(void) static void sub_81C2628(void) { u8 strArray[16]; - struct Pokemon *mon = &pssData->currentMon; - struct PokeSummary *summary = &pssData->summary; + struct Pokemon *mon = &sMonSummaryScreenData->currentMon; + struct PokeSummary *summary = &sMonSummaryScreenData->summary; u16 dexNum = SpeciesToPokedexNum(summary->species); if (dexNum != 0xFFFF) { @@ -2667,19 +2725,19 @@ static void sub_81C2628(void) StringAppend(gStringVar1, gStringVar2); if (!IsMonShiny(mon)) { - SummaryScreen_PrintTextOnWindow(17, gStringVar1, 0, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER, gStringVar1, 0, 1, 0, 1); sub_81C228C(FALSE); } else { - SummaryScreen_PrintTextOnWindow(17, gStringVar1, 0, 1, 0, 7); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER, gStringVar1, 0, 1, 0, 7); sub_81C228C(TRUE); } - PutWindowTilemap(17); + PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER); } else { - ClearWindowTilemap(17); + ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER); if (!IsMonShiny(mon)) sub_81C228C(FALSE); else @@ -2688,24 +2746,24 @@ static void sub_81C2628(void) StringCopy(gStringVar1, &gText_LevelSymbol[0]); ConvertIntToDecimalStringN(gStringVar2, summary->level, 0, 3); StringAppend(gStringVar1, gStringVar2); - SummaryScreen_PrintTextOnWindow(19, gStringVar1, 0x18, 17, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_SPECIES, gStringVar1, 0x18, 17, 0, 1); GetMonNickname(mon, gStringVar1); - SummaryScreen_PrintTextOnWindow(18, gStringVar1, 0, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_NICKNAME, gStringVar1, 0, 1, 0, 1); strArray[0] = CHAR_SLASH; StringCopy(&strArray[1], &gSpeciesNames[summary->species2][0]); - SummaryScreen_PrintTextOnWindow(19, &strArray[0], 0, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_SPECIES, &strArray[0], 0, 1, 0, 1); sub_81C27DC(mon, summary->species2); - PutWindowTilemap(18); - PutWindowTilemap(19); + PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_NICKNAME); + PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); } static void sub_81C2794(void) { - GetMonNickname(&pssData->currentMon, gStringVar1); - SummaryScreen_PrintTextOnWindow(18, gStringVar1, 0, 1, 0, 1); - PutWindowTilemap(18); - ClearWindowTilemap(17); - ClearWindowTilemap(19); + GetMonNickname(&sMonSummaryScreenData->currentMon, gStringVar1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_NICKNAME, gStringVar1, 0, 1, 0, 1); + PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_NICKNAME); + ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER); + ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); } static void sub_81C27DC(struct Pokemon *mon, u16 species) @@ -2716,10 +2774,10 @@ static void sub_81C27DC(struct Pokemon *mon, u16 species) switch (gender) { case MON_MALE: - SummaryScreen_PrintTextOnWindow(19, gText_MaleSymbol, 57, 17, 0, 3); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_SPECIES, gText_MaleSymbol, 57, 17, 0, 3); break; case MON_FEMALE: - SummaryScreen_PrintTextOnWindow(19, gText_FemaleSymbol, 57, 17, 0, 4); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_SPECIES, gText_FemaleSymbol, 57, 17, 0, 4); break; } } @@ -2737,108 +2795,108 @@ static void PrintPageNamesAndStatsPageToWindows(void) int iconXPos; int statsXPos; - SummaryScreen_PrintTextOnWindow(0, gText_PkmnInfo, 2, 1, 0, 1); - SummaryScreen_PrintTextOnWindow(1, gText_PkmnSkills, 2, 1, 0, 1); - SummaryScreen_PrintTextOnWindow(2, gText_BattleMoves, 2, 1, 0, 1); - SummaryScreen_PrintTextOnWindow(3, gText_ContestMoves, 2, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_INFO_TITLE, gText_PkmnInfo, 2, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_TITLE, gText_PkmnSkills, 2, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_BATTLE_MOVES_TITLE, gText_BattleMoves, 2, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_CONTEST_MOVES_TITLE, gText_ContestMoves, 2, 1, 0, 1); stringXPos = GetStringRightAlignXOffset(1, gText_Cancel2, 62); iconXPos = stringXPos - 16; if (iconXPos < 0) iconXPos = 0; - PrintAOrBButtonIcon(4, FALSE, iconXPos); - SummaryScreen_PrintTextOnWindow(4, gText_Cancel2, stringXPos, 1, 0, 0); + PrintAOrBButtonIcon(PSS_LABEL_WINDOW_PROMPT_CANCEL, FALSE, iconXPos); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PROMPT_CANCEL, gText_Cancel2, stringXPos, 1, 0, 0); stringXPos = GetStringRightAlignXOffset(1, gText_Info, 0x3E); iconXPos = stringXPos - 16; if (iconXPos < 0) iconXPos = 0; - PrintAOrBButtonIcon(5, FALSE, iconXPos); - SummaryScreen_PrintTextOnWindow(5, gText_Info, stringXPos, 1, 0, 0); + PrintAOrBButtonIcon(PSS_LABEL_WINDOW_PROMPT_INFO, FALSE, iconXPos); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PROMPT_INFO, gText_Info, stringXPos, 1, 0, 0); stringXPos = GetStringRightAlignXOffset(1, gText_Switch, 0x3E); iconXPos = stringXPos - 16; if (iconXPos < 0) iconXPos = 0; - PrintAOrBButtonIcon(6, FALSE, iconXPos); - SummaryScreen_PrintTextOnWindow(6, gText_Switch, stringXPos, 1, 0, 0); + PrintAOrBButtonIcon(PSS_LABEL_WINDOW_PROMPT_SWITCH, FALSE, iconXPos); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PROMPT_SWITCH, gText_Switch, stringXPos, 1, 0, 0); - SummaryScreen_PrintTextOnWindow(8, gText_RentalPkmn, 0, 1, 0, 1); - SummaryScreen_PrintTextOnWindow(9, gText_TypeSlash, 0, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_INFO_RENTAL, gText_RentalPkmn, 0, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_INFO_TYPE, gText_TypeSlash, 0, 1, 0, 0); statsXPos = 6 + GetStringCenterAlignXOffset(1, gText_HP4, 42); - SummaryScreen_PrintTextOnWindow(10, gText_HP4, statsXPos, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT, gText_HP4, statsXPos, 1, 0, 1); statsXPos = 6 + GetStringCenterAlignXOffset(1, gText_Attack3, 42); - SummaryScreen_PrintTextOnWindow(10, gText_Attack3, statsXPos, 17, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT, gText_Attack3, statsXPos, 17, 0, 1); statsXPos = 6 + GetStringCenterAlignXOffset(1, gText_Defense3, 42); - SummaryScreen_PrintTextOnWindow(10, gText_Defense3, statsXPos, 33, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT, gText_Defense3, statsXPos, 33, 0, 1); statsXPos = 2 + GetStringCenterAlignXOffset(1, gText_SpAtk4, 36); - SummaryScreen_PrintTextOnWindow(11, gText_SpAtk4, statsXPos, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT, gText_SpAtk4, statsXPos, 1, 0, 1); statsXPos = 2 + GetStringCenterAlignXOffset(1, gText_SpDef4, 36); - SummaryScreen_PrintTextOnWindow(11, gText_SpDef4, statsXPos, 17, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT, gText_SpDef4, statsXPos, 17, 0, 1); statsXPos = 2 + GetStringCenterAlignXOffset(1, gText_Speed2, 36); - SummaryScreen_PrintTextOnWindow(11, gText_Speed2, statsXPos, 33, 0, 1); - SummaryScreen_PrintTextOnWindow(12, gText_ExpPoints, 6, 1, 0, 1); - SummaryScreen_PrintTextOnWindow(12, gText_NextLv, 6, 17, 0, 1); - SummaryScreen_PrintTextOnWindow(13, gText_Status, 2, 1, 0, 1); - SummaryScreen_PrintTextOnWindow(14, gText_Power, 0, 1, 0, 1); - SummaryScreen_PrintTextOnWindow(14, gText_Accuracy2, 0, 17, 0, 1); - SummaryScreen_PrintTextOnWindow(15, gText_Appeal, 0, 1, 0, 1); - SummaryScreen_PrintTextOnWindow(15, gText_Jam, 0, 17, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT, gText_Speed2, statsXPos, 33, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_EXP, gText_ExpPoints, 6, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_EXP, gText_NextLv, 6, 17, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS, gText_Status, 2, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_MOVES_POWER_ACC, gText_Power, 0, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_MOVES_POWER_ACC, gText_Accuracy2, 0, 17, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM, gText_Appeal, 0, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM, gText_Jam, 0, 17, 0, 1); } static void CreatePageWindowTilemaps(u8 page) { u8 i; - ClearWindowTilemap(0); - ClearWindowTilemap(1); - ClearWindowTilemap(2); - ClearWindowTilemap(3); + ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_INFO_TITLE); + ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_TITLE); + ClearWindowTilemap(PSS_LABEL_WINDOW_BATTLE_MOVES_TITLE); + ClearWindowTilemap(PSS_LABEL_WINDOW_CONTEST_MOVES_TITLE); switch (page) { case PSS_PAGE_INFO: - PutWindowTilemap(0); - PutWindowTilemap(4); - if (InBattleFactory() == TRUE || sub_81B9E94() == TRUE) - PutWindowTilemap(8); - PutWindowTilemap(9); + PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_INFO_TITLE); + PutWindowTilemap(PSS_LABEL_WINDOW_PROMPT_CANCEL); + if (InBattleFactory() == TRUE || InSlateportBattleTent() == TRUE) + PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_INFO_RENTAL); + PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_INFO_TYPE); break; case PSS_PAGE_SKILLS: - PutWindowTilemap(1); - PutWindowTilemap(10); - PutWindowTilemap(11); - PutWindowTilemap(12); + PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_TITLE); + PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT); + PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT); + PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_EXP); break; case PSS_PAGE_BATTLE_MOVES: - PutWindowTilemap(2); - if (pssData->mode == PSS_MODE_SELECT_MOVE) + PutWindowTilemap(PSS_LABEL_WINDOW_BATTLE_MOVES_TITLE); + if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) { - if (pssData->newMove != MOVE_NONE || pssData->firstMoveIndex != MAX_MON_MOVES) - PutWindowTilemap(14); + if (sMonSummaryScreenData->newMove != MOVE_NONE || sMonSummaryScreenData->firstMoveIndex != MAX_MON_MOVES) + PutWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC); } else { - PutWindowTilemap(5); + PutWindowTilemap(PSS_LABEL_WINDOW_PROMPT_INFO); } break; case PSS_PAGE_CONTEST_MOVES: - PutWindowTilemap(3); - if (pssData->mode == PSS_MODE_SELECT_MOVE) + PutWindowTilemap(PSS_LABEL_WINDOW_CONTEST_MOVES_TITLE); + if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) { - if (pssData->newMove != MOVE_NONE || pssData->firstMoveIndex != MAX_MON_MOVES) - PutWindowTilemap(15); + if (sMonSummaryScreenData->newMove != MOVE_NONE || sMonSummaryScreenData->firstMoveIndex != MAX_MON_MOVES) + PutWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM); } else { - PutWindowTilemap(5); + PutWindowTilemap(PSS_LABEL_WINDOW_PROMPT_INFO); } break; } - for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++) + for (i = 0; i < ARRAY_COUNT(sMonSummaryScreenData->windowIds); i++) { - PutWindowTilemap(pssData->windowIds[i]); + PutWindowTilemap(sMonSummaryScreenData->windowIds[i]); } schedule_bg_copy_tilemap_to_vram(0); @@ -2850,41 +2908,41 @@ static void ClearPageWindowTilemaps(u8 page) switch (page) { case PSS_PAGE_INFO: - ClearWindowTilemap(4); - if (InBattleFactory() == TRUE || sub_81B9E94() == TRUE) - ClearWindowTilemap(8); - ClearWindowTilemap(9); + ClearWindowTilemap(PSS_LABEL_WINDOW_PROMPT_CANCEL); + if (InBattleFactory() == TRUE || InSlateportBattleTent() == TRUE) + ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_INFO_RENTAL); + ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_INFO_TYPE); break; case PSS_PAGE_SKILLS: - ClearWindowTilemap(10); - ClearWindowTilemap(11); - ClearWindowTilemap(12); + ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT); + ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT); + ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_EXP); break; case PSS_PAGE_BATTLE_MOVES: - if (pssData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) { - if (pssData->newMove != MOVE_NONE || pssData->firstMoveIndex != MAX_MON_MOVES) - ClearWindowTilemap(14); + if (sMonSummaryScreenData->newMove != MOVE_NONE || sMonSummaryScreenData->firstMoveIndex != MAX_MON_MOVES) + ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC); } else { - ClearWindowTilemap(5); + ClearWindowTilemap(PSS_LABEL_WINDOW_PROMPT_INFO); } break; case PSS_PAGE_CONTEST_MOVES: - if (pssData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) { - if (pssData->newMove != MOVE_NONE || pssData->firstMoveIndex != MAX_MON_MOVES) - ClearWindowTilemap(15); + if (sMonSummaryScreenData->newMove != MOVE_NONE || sMonSummaryScreenData->firstMoveIndex != MAX_MON_MOVES) + ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM); } else { - ClearWindowTilemap(5); + ClearWindowTilemap(PSS_LABEL_WINDOW_PROMPT_INFO); } break; } - for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++) + for (i = 0; i < ARRAY_COUNT(sMonSummaryScreenData->windowIds); i++) { SummaryScreen_RemoveWindowByIndex(i); } @@ -2894,7 +2952,7 @@ static void ClearPageWindowTilemaps(u8 page) static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 templateId) { - u8 *windowIdPtr = &(pssData->windowIds[templateId]); + u8 *windowIdPtr = &(sMonSummaryScreenData->windowIds[templateId]); if (*windowIdPtr == 0xFF) { *windowIdPtr = AddWindow(&template[templateId]); @@ -2905,7 +2963,7 @@ static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 te static void SummaryScreen_RemoveWindowByIndex(u8 windowIndex) { - u8 *windowIdPtr = &(pssData->windowIds[windowIndex]); + u8 *windowIdPtr = &(sMonSummaryScreenData->windowIds[windowIndex]); if (*windowIdPtr != 0xFF) { ClearWindowTilemap(*windowIdPtr); @@ -2917,10 +2975,10 @@ static void SummaryScreen_RemoveWindowByIndex(u8 windowIndex) static void PrintPageSpecificText(u8 pageIndex) { u16 i; - for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++) + for (i = 0; i < ARRAY_COUNT(sMonSummaryScreenData->windowIds); i++) { - if (pssData->windowIds[i] != 0xFF) - FillWindowPixelBuffer(pssData->windowIds[i], 0); + if (sMonSummaryScreenData->windowIds[i] != 0xFF) + FillWindowPixelBuffer(sMonSummaryScreenData->windowIds[i], 0); } sTextPrinterFunctions[pageIndex](); } @@ -2932,7 +2990,7 @@ static void CreateTextPrinterTask(u8 pageIndex) static void PrintInfoPageText(void) { - if (pssData->summary.isEgg) + if (sMonSummaryScreenData->summary.isEgg) { PrintEggOTName(); PrintEggOTID(); @@ -2984,44 +3042,44 @@ static void PrintMonOTName(void) { u8 windowId; int x; - if (InBattleFactory() != TRUE && sub_81B9E94() != TRUE) + if (InBattleFactory() != TRUE && InSlateportBattleTent() != TRUE) { - windowId = AddWindowFromTemplateList(sPageInfoTemplate, 0); + windowId = AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ORIGINAL_TRAINER); SummaryScreen_PrintTextOnWindow(windowId, gText_OTSlash, 0, 1, 0, 1); x = GetStringWidth(1, gText_OTSlash, 0); - if (pssData->summary.OTGender == 0) - SummaryScreen_PrintTextOnWindow(windowId, pssData->summary.OTName, x, 1, 0, 5); + if (sMonSummaryScreenData->summary.OTGender == 0) + SummaryScreen_PrintTextOnWindow(windowId, sMonSummaryScreenData->summary.OTName, x, 1, 0, 5); else - SummaryScreen_PrintTextOnWindow(windowId, pssData->summary.OTName, x, 1, 0, 6); + SummaryScreen_PrintTextOnWindow(windowId, sMonSummaryScreenData->summary.OTName, x, 1, 0, 6); } } static void PrintMonOTID(void) { int xPos; - if (InBattleFactory() != TRUE && sub_81B9E94() != TRUE) + if (InBattleFactory() != TRUE && InSlateportBattleTent() != TRUE) { - ConvertIntToDecimalStringN(StringCopy(gStringVar1, gText_UnkCtrlF907F908), (u16)pssData->summary.OTID, 2, 5); + ConvertIntToDecimalStringN(StringCopy(gStringVar1, gText_UnkCtrlF907F908), (u16)sMonSummaryScreenData->summary.OTID, 2, 5); xPos = GetStringRightAlignXOffset(1, gStringVar1, 56); - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 1), gStringVar1, xPos, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ID), gStringVar1, xPos, 1, 0, 1); } } static void PrintMonAbilityName(void) { - u8 ability = GetAbilityBySpecies(pssData->summary.species, pssData->summary.altAbility); - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 2), gAbilityNames[ability], 0, 1, 0, 1); + u8 ability = GetAbilityBySpecies(sMonSummaryScreenData->summary.species, sMonSummaryScreenData->summary.altAbility); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ABILITY), gAbilityNames[ability], 0, 1, 0, 1); } static void PrintMonAbilityDescription(void) { - u8 ability = GetAbilityBySpecies(pssData->summary.species, pssData->summary.altAbility); - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 2), gAbilityDescriptionPointers[ability], 0, 17, 0, 0); + u8 ability = GetAbilityBySpecies(sMonSummaryScreenData->summary.species, sMonSummaryScreenData->summary.altAbility); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ABILITY), gAbilityDescriptionPointers[ability], 0, 17, 0, 0); } static void BufferMonTrainerMemo(void) { - struct PokeSummary *sum = &pssData->summary; + struct PokeSummary *sum = &sMonSummaryScreenData->summary; const u8 *text; DynamicPlaceholderTextUtil_Reset(); @@ -3029,7 +3087,7 @@ static void BufferMonTrainerMemo(void) DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, sMemoMiscTextColor); BufferNatureString(); - if (InBattleFactory() == TRUE || sub_81B9E94() == TRUE || IsInGamePartnerMon() == TRUE) + if (InBattleFactory() == TRUE || InSlateportBattleTent() == TRUE || IsInGamePartnerMon() == TRUE) { DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_XNature); } @@ -3073,19 +3131,19 @@ static void BufferMonTrainerMemo(void) static void PrintMonTrainerMemo(void) { - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 3), gStringVar4, 0, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_MEMO), gStringVar4, 0, 1, 0, 0); } static void BufferNatureString(void) { - struct PssData *sumStruct = pssData; + struct PokemonSummaryScreenData *sumStruct = sMonSummaryScreenData; DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gNatureNamePointers[sumStruct->summary.nature]); DynamicPlaceholderTextUtil_SetPlaceholderPtr(5, gText_EmptyString5); } static void GetMetLevelString(u8 *output) { - u8 level = pssData->summary.metLevel; + u8 level = sMonSummaryScreenData->summary.metLevel; if (level == 0) level = EGG_HATCH_LEVEL; ConvertIntToDecimalStringN(output, level, 0, 3); @@ -3094,11 +3152,11 @@ static void GetMetLevelString(u8 *output) static bool8 DoesMonOTMatchOwner(void) { - struct PokeSummary *sum = &pssData->summary; + struct PokeSummary *sum = &sMonSummaryScreenData->summary; u32 trainerId; u8 gender; - if (pssData->monList.mons == gEnemyParty) + if (sMonSummaryScreenData->monList.mons == gEnemyParty) { u8 multiID = GetMultiplayerId() ^ 1; trainerId = (u16)gLinkPlayers[multiID].trainerId; @@ -3120,7 +3178,7 @@ static bool8 DoesMonOTMatchOwner(void) static bool8 DidMonComeFromGBAGames(void) { - struct PokeSummary *sum = &pssData->summary; + struct PokeSummary *sum = &sMonSummaryScreenData->summary; if (sum->metGame > 0 && sum->metGame <= VERSION_LEAF_GREEN) return TRUE; return FALSE; @@ -3128,7 +3186,7 @@ static bool8 DidMonComeFromGBAGames(void) bool8 DidMonComeFromRSE(void) { - struct PokeSummary *sum = &pssData->summary; + struct PokeSummary *sum = &sMonSummaryScreenData->summary; if (sum->metGame > 0 && sum->metGame <= VERSION_EMERALD) return TRUE; return FALSE; @@ -3138,7 +3196,7 @@ static bool8 IsInGamePartnerMon(void) { if ((gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) && gMain.inBattle) { - if (pssData->curMonIndex == 1 || pssData->curMonIndex == 4 || pssData->curMonIndex == 5) + if (sMonSummaryScreenData->curMonIndex == 1 || sMonSummaryScreenData->curMonIndex == 4 || sMonSummaryScreenData->curMonIndex == 5) return TRUE; } return FALSE; @@ -3146,7 +3204,7 @@ static bool8 IsInGamePartnerMon(void) static void PrintEggOTName(void) { - u32 windowId = AddWindowFromTemplateList(sPageInfoTemplate, 0); + u32 windowId = AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ORIGINAL_TRAINER); u32 width = GetStringWidth(1, gText_OTSlash, 0); SummaryScreen_PrintTextOnWindow(windowId, gText_OTSlash, 0, 1, 0, 1); SummaryScreen_PrintTextOnWindow(windowId, gText_FiveMarks, width, 1, 0, 1); @@ -3158,15 +3216,15 @@ static void PrintEggOTID(void) StringCopy(gStringVar1, gText_UnkCtrlF907F908); StringAppend(gStringVar1, gText_FiveMarks); x = GetStringRightAlignXOffset(1, gStringVar1, 56); - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 1), gStringVar1, x, 1, 0, 1); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ID), gStringVar1, x, 1, 0, 1); } static void PrintEggState(void) { const u8 *text; - struct PokeSummary *sum = &pssData->summary; + struct PokeSummary *sum = &sMonSummaryScreenData->summary; - if (pssData->summary.sanity == TRUE) + if (sMonSummaryScreenData->summary.sanity == TRUE) text = gText_EggWillTakeALongTime; else if (sum->friendship <= 5) text = gText_EggAboutToHatch; @@ -3177,15 +3235,15 @@ static void PrintEggState(void) else text = gText_EggWillTakeALongTime; - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 2), text, 0, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ABILITY), text, 0, 1, 0, 0); } static void PrintEggMemo(void) { const u8 *text; - struct PokeSummary *sum = &pssData->summary; + struct PokeSummary *sum = &sMonSummaryScreenData->summary; - if (pssData->summary.sanity != 1) + if (sMonSummaryScreenData->summary.sanity != 1) { if (sum->metLocation == METLOC_FATEFUL_ENCOUNTER) text = gText_PeculiarEggNicePlace; @@ -3201,7 +3259,7 @@ static void PrintEggMemo(void) text = gText_OddEggFoundByCouple; } - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 3), text, 0, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_MEMO), text, 0, 1, 0, 0); } static void PrintSkillsPageText(void) @@ -3254,22 +3312,22 @@ static void PrintHeldItemName(void) const u8 *text; int offset; - if (pssData->summary.item == ITEM_ENIGMA_BERRY && IsMultiBattle() == TRUE && (pssData->curMonIndex == 1 || pssData->curMonIndex == 4 || pssData->curMonIndex == 5)) + if (sMonSummaryScreenData->summary.item == ITEM_ENIGMA_BERRY && IsMultiBattle() == TRUE && (sMonSummaryScreenData->curMonIndex == 1 || sMonSummaryScreenData->curMonIndex == 4 || sMonSummaryScreenData->curMonIndex == 5)) { text = ItemId_GetName(ITEM_ENIGMA_BERRY); } - else if (pssData->summary.item == ITEM_NONE) + else if (sMonSummaryScreenData->summary.item == ITEM_NONE) { text = gText_None; } else { - CopyItemName(pssData->summary.item, gStringVar1); + CopyItemName(sMonSummaryScreenData->summary.item, gStringVar1); text = gStringVar1; } offset = GetStringCenterAlignXOffset(1, text, 72) + 6; - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, 0), text, offset, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, PSS_DATA_WINDOW_SKILLS_HELD_ITEM), text, offset, 1, 0, 0); } static void PrintRibbonCount(void) @@ -3277,19 +3335,19 @@ static void PrintRibbonCount(void) const u8 *text; int offset; - if (pssData->summary.ribbonCount == 0) + if (sMonSummaryScreenData->summary.ribbonCount == 0) { text = gText_None; } else { - ConvertIntToDecimalStringN(gStringVar1, pssData->summary.ribbonCount, 1, 2); + ConvertIntToDecimalStringN(gStringVar1, sMonSummaryScreenData->summary.ribbonCount, 1, 2); StringExpandPlaceholders(gStringVar4, gText_RibbonsVar1); text = gStringVar4; } offset = GetStringCenterAlignXOffset(1, text, 70) + 6; - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, 1), text, offset, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, PSS_DATA_WINDOW_SKILLS_RIBBON_COUNT), text, offset, 1, 0, 0); } static void BufferLeftColumnStats(void) @@ -3299,10 +3357,10 @@ static void BufferLeftColumnStats(void) u8 *attackString = Alloc(8); u8 *defenseString = Alloc(8); - ConvertIntToDecimalStringN(currentHPString, pssData->summary.currentHP, 1, 3); - ConvertIntToDecimalStringN(maxHPString, pssData->summary.maxHP, 1, 3); - ConvertIntToDecimalStringN(attackString, pssData->summary.atk, 1, 7); - ConvertIntToDecimalStringN(defenseString, pssData->summary.def, 1, 7); + ConvertIntToDecimalStringN(currentHPString, sMonSummaryScreenData->summary.currentHP, 1, 3); + ConvertIntToDecimalStringN(maxHPString, sMonSummaryScreenData->summary.maxHP, 1, 3); + ConvertIntToDecimalStringN(attackString, sMonSummaryScreenData->summary.atk, 1, 7); + ConvertIntToDecimalStringN(defenseString, sMonSummaryScreenData->summary.def, 1, 7); DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, currentHPString); @@ -3319,14 +3377,14 @@ static void BufferLeftColumnStats(void) static void PrintLeftColumnStats(void) { - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, 2), gStringVar4, 4, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, PSS_DATA_WINDOW_SKILLS_STATS_LEFT), gStringVar4, 4, 1, 0, 0); } static void BufferRightColumnStats(void) { - ConvertIntToDecimalStringN(gStringVar1, pssData->summary.spatk, 1, 3); - ConvertIntToDecimalStringN(gStringVar2, pssData->summary.spdef, 1, 3); - ConvertIntToDecimalStringN(gStringVar3, pssData->summary.speed, 1, 3); + ConvertIntToDecimalStringN(gStringVar1, sMonSummaryScreenData->summary.spatk, 1, 3); + ConvertIntToDecimalStringN(gStringVar2, sMonSummaryScreenData->summary.spdef, 1, 3); + ConvertIntToDecimalStringN(gStringVar3, sMonSummaryScreenData->summary.speed, 1, 3); DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); @@ -3337,13 +3395,13 @@ static void BufferRightColumnStats(void) static void PrintRightColumnStats(void) { - SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, 3), gStringVar4, 2, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, PSS_DATA_WINDOW_SKILLS_STATS_RIGHT), gStringVar4, 2, 1, 0, 0); } static void PrintExpPointsNextLevel(void) { - struct PokeSummary *sum = &pssData->summary; - u8 windowId = AddWindowFromTemplateList(sPageSkillsTemplate, 4); + struct PokeSummary *sum = &sMonSummaryScreenData->summary; + u8 windowId = AddWindowFromTemplateList(sPageSkillsTemplate, PSS_DATA_WINDOW_EXP); int offset; u32 expToNextLevel; @@ -3368,17 +3426,17 @@ static void PrintBattleMoves(void) PrintMoveNameAndPP(2); PrintMoveNameAndPP(3); - if (pssData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) { PrintNewMoveDetailsOrCancelText(); - if (pssData->firstMoveIndex == MAX_MON_MOVES) + if (sMonSummaryScreenData->firstMoveIndex == MAX_MON_MOVES) { - if (pssData->newMove != MOVE_NONE) - PrintMoveDetails(pssData->newMove); + if (sMonSummaryScreenData->newMove != MOVE_NONE) + PrintMoveDetails(sMonSummaryScreenData->newMove); } else { - PrintMoveDetails(pssData->summary.moves[pssData->firstMoveIndex]); + PrintMoveDetails(sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]); } } } @@ -3402,22 +3460,22 @@ static void Task_PrintBattleMoves(u8 taskId) PrintMoveNameAndPP(3); break; case 5: - if (pssData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) PrintNewMoveDetailsOrCancelText(); break; case 6: - if (pssData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) { - if (pssData->firstMoveIndex == MAX_MON_MOVES) - data[1] = pssData->newMove; + if (sMonSummaryScreenData->firstMoveIndex == MAX_MON_MOVES) + data[1] = sMonSummaryScreenData->newMove; else - data[1] = pssData->summary.moves[pssData->firstMoveIndex]; + data[1] = sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]; } break; case 7: - if (pssData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) { - if (pssData->newMove != MOVE_NONE || pssData->firstMoveIndex != MAX_MON_MOVES) + if (sMonSummaryScreenData->newMove != MOVE_NONE || sMonSummaryScreenData->firstMoveIndex != MAX_MON_MOVES) PrintMoveDetails(data[1]); } break; @@ -3434,9 +3492,9 @@ static void PrintMoveNameAndPP(u8 moveIndex) u32 ppState; const u8 *text; u32 offset; - struct PssData *summaryStruct = pssData; - u8 moveNameWindowId = AddWindowFromTemplateList(sPageMovesTemplate, 0); - u8 ppValueWindowId = AddWindowFromTemplateList(sPageMovesTemplate, 1); + struct PokemonSummaryScreenData *summaryStruct = sMonSummaryScreenData; + u8 moveNameWindowId = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_NAMES); + u8 ppValueWindowId = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_PP); u16 move = summaryStruct->summary.moves[moveIndex]; if (move != 0) @@ -3469,7 +3527,7 @@ static void PrintMovePowerAndAccuracy(u16 moveIndex) const u8 *text; if (moveIndex != 0) { - FillWindowPixelRect(14, 0, 53, 0, 19, 32); + FillWindowPixelRect(PSS_LABEL_WINDOW_MOVES_POWER_ACC, 0, 53, 0, 19, 32); if (gBattleMoves[moveIndex].power < 2) { @@ -3481,7 +3539,7 @@ static void PrintMovePowerAndAccuracy(u16 moveIndex) text = gStringVar1; } - SummaryScreen_PrintTextOnWindow(14, text, 53, 1, 0, 0); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_MOVES_POWER_ACC, text, 53, 1, 0, 0); if (gBattleMoves[moveIndex].accuracy == 0) { @@ -3493,7 +3551,7 @@ static void PrintMovePowerAndAccuracy(u16 moveIndex) text = gStringVar1; } - SummaryScreen_PrintTextOnWindow(14, text, 53, 17, 0, 0); + SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_MOVES_POWER_ACC, text, 53, 17, 0, 0); } } @@ -3504,10 +3562,10 @@ static void PrintContestMoves(void) PrintMoveNameAndPP(2); PrintMoveNameAndPP(3); - if (pssData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) { PrintNewMoveDetailsOrCancelText(); - PrintContestMoveDescription(pssData->firstMoveIndex); + PrintContestMoveDescription(sMonSummaryScreenData->firstMoveIndex); } } @@ -3531,14 +3589,14 @@ static void Task_PrintContestMoves(u8 taskId) PrintMoveNameAndPP(3); break; case 4: - if (pssData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) PrintNewMoveDetailsOrCancelText(); break; case 5: - if (pssData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) { - if (pssData->newMove != MOVE_NONE || pssData->firstMoveIndex != MAX_MON_MOVES) - PrintContestMoveDescription(pssData->firstMoveIndex); + if (sMonSummaryScreenData->newMove != MOVE_NONE || sMonSummaryScreenData->firstMoveIndex != MAX_MON_MOVES) + PrintContestMoveDescription(sMonSummaryScreenData->firstMoveIndex); } break; case 6: @@ -3553,24 +3611,24 @@ static void PrintContestMoveDescription(u8 moveSlot) u16 move; if (moveSlot == MAX_MON_MOVES) - move = pssData->newMove; + move = sMonSummaryScreenData->newMove; else - move = pssData->summary.moves[moveSlot]; + move = sMonSummaryScreenData->summary.moves[moveSlot]; if (move != MOVE_NONE) { - u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 2); + u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_DESCRIPTION); SummaryScreen_PrintTextOnWindow(windowId, gContestEffectDescriptionPointers[gContestMoves[move].effect], 6, 1, 0, 0); } } static void PrintMoveDetails(u16 move) { - u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 2); + u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_DESCRIPTION); FillWindowPixelBuffer(windowId, 0); if (move != MOVE_NONE) { - if (pssData->currPageIndex == 2) + if (sMonSummaryScreenData->currPageIndex == PSS_MODE_BOX) { PrintMovePowerAndAccuracy(move); SummaryScreen_PrintTextOnWindow(windowId, gMoveDescriptionPointers[move - 1], 6, 1, 0, 0); @@ -3591,18 +3649,18 @@ static void PrintMoveDetails(u16 move) static void PrintNewMoveDetailsOrCancelText(void) { - u8 windowId1 = AddWindowFromTemplateList(sPageMovesTemplate, 0); - u8 windowId2 = AddWindowFromTemplateList(sPageMovesTemplate, 1); + u8 windowId1 = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_NAMES); + u8 windowId2 = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_PP); - if (pssData->newMove == MOVE_NONE) + if (sMonSummaryScreenData->newMove == MOVE_NONE) { SummaryScreen_PrintTextOnWindow(windowId1, gText_Cancel, 0, 65, 0, 1); } else { - u16 move = pssData->newMove; + u16 move = sMonSummaryScreenData->newMove; - if (pssData->currPageIndex == 2) + if (sMonSummaryScreenData->currPageIndex == 2) SummaryScreen_PrintTextOnWindow(windowId1, gMoveNames[move], 0, 65, 0, 6); else SummaryScreen_PrintTextOnWindow(windowId1, gMoveNames[move], 0, 65, 0, 5); @@ -3618,15 +3676,15 @@ static void PrintNewMoveDetailsOrCancelText(void) static void sub_81C4064(void) { - u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 0); + u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_NAMES); FillWindowPixelRect(windowId, 0, 0, 66, 72, 16); CopyWindowToVram(windowId, 2); } static void sub_81C40A0(u8 moveIndex1, u8 moveIndex2) { - u8 windowId1 = AddWindowFromTemplateList(sPageMovesTemplate, 0); - u8 windowId2 = AddWindowFromTemplateList(sPageMovesTemplate, 1); + u8 windowId1 = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_NAMES); + u8 windowId2 = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_PP); FillWindowPixelRect(windowId1, 0, 0, moveIndex1 * 16, 0x48, 0x10); FillWindowPixelRect(windowId1, 0, 0, moveIndex2 * 16, 0x48, 0x10); @@ -3640,7 +3698,7 @@ static void sub_81C40A0(u8 moveIndex1, u8 moveIndex2) static void PrintHMMovesCantBeForgotten(void) { - u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 2); + u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_DESCRIPTION); FillWindowPixelBuffer(windowId, 0); SummaryScreen_PrintTextOnWindow(windowId, gText_HMMovesCantBeForgotten2, 6, 1, 0, 0); } @@ -3649,24 +3707,24 @@ static void ResetSpriteIds(void) { u8 i; - for (i = 0; i < ARRAY_COUNT(pssData->spriteIds); i++) + for (i = 0; i < ARRAY_COUNT(sMonSummaryScreenData->spriteIds); i++) { - pssData->spriteIds[i] = 0xFF; + sMonSummaryScreenData->spriteIds[i] = 0xFF; } } static void DestroySpriteInArray(u8 spriteArrayId) { - if (pssData->spriteIds[spriteArrayId] != 0xFF) + if (sMonSummaryScreenData->spriteIds[spriteArrayId] != 0xFF) { - DestroySprite(&gSprites[pssData->spriteIds[spriteArrayId]]); - pssData->spriteIds[spriteArrayId] = 0xFF; + DestroySprite(&gSprites[sMonSummaryScreenData->spriteIds[spriteArrayId]]); + sMonSummaryScreenData->spriteIds[spriteArrayId] = 0xFF; } } static void SetSpriteInvisibility(u8 spriteArrayId, bool8 invisible) { - gSprites[pssData->spriteIds[spriteArrayId]].invisible = invisible; + gSprites[sMonSummaryScreenData->spriteIds[spriteArrayId]].invisible = invisible; } static void HidePageSpecificSprites(void) @@ -3674,16 +3732,16 @@ static void HidePageSpecificSprites(void) // Keeps Pokémon, caught ball and status sprites visible. u8 i; - for (i = 3; i < ARRAY_COUNT(pssData->spriteIds); i++) + for (i = 3; i < ARRAY_COUNT(sMonSummaryScreenData->spriteIds); i++) { - if (pssData->spriteIds[i] != 0xFF) + if (sMonSummaryScreenData->spriteIds[i] != 0xFF) SetSpriteInvisibility(i, TRUE); } } static void SetTypeIcons(void) { - switch (pssData->currPageIndex) + switch (sMonSummaryScreenData->currPageIndex) { case PSS_PAGE_INFO: SetMonTypeIcons(); @@ -3705,8 +3763,8 @@ static void CreateMoveTypeIcons(void) for (i = 3; i < 8; i++) { - if (pssData->spriteIds[i] == 0xFF) - pssData->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2); + if (sMonSummaryScreenData->spriteIds[i] == 0xFF) + sMonSummaryScreenData->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2); SetSpriteInvisibility(i, TRUE); } @@ -3714,7 +3772,7 @@ static void CreateMoveTypeIcons(void) static void SetMoveTypeSpritePosAndType(u8 typeId, u8 x, u8 y, u8 spriteArrayId) { - struct Sprite *sprite = &gSprites[pssData->spriteIds[spriteArrayId]]; + struct Sprite *sprite = &gSprites[sMonSummaryScreenData->spriteIds[spriteArrayId]]; StartSpriteAnim(sprite, typeId); sprite->oam.paletteNum = sMoveTypeToOamPaletteNum[typeId]; sprite->pos1.x = x + 16; @@ -3724,7 +3782,7 @@ static void SetMoveTypeSpritePosAndType(u8 typeId, u8 x, u8 y, u8 spriteArrayId) static void SetMonTypeIcons(void) { - struct PokeSummary *summary = &pssData->summary; + struct PokeSummary *summary = &sMonSummaryScreenData->summary; if (summary->isEgg) { SetMoveTypeSpritePosAndType(TYPE_MYSTERY, 120, 48, 3); @@ -3748,7 +3806,7 @@ static void SetMonTypeIcons(void) static void SetMoveTypeIcons(void) { u8 i; - struct PokeSummary *summary = &pssData->summary; + struct PokeSummary *summary = &sMonSummaryScreenData->summary; for (i = 0; i < MAX_MON_MOVES; i++) { if (summary->moves[i] != MOVE_NONE) @@ -3761,7 +3819,7 @@ static void SetMoveTypeIcons(void) static void SetContestMoveTypeIcons(void) { u8 i; - struct PokeSummary *summary = &pssData->summary; + struct PokeSummary *summary = &sMonSummaryScreenData->summary; for (i = 0; i < MAX_MON_MOVES; i++) { if (summary->moves[i] != MOVE_NONE) @@ -3773,23 +3831,23 @@ static void SetContestMoveTypeIcons(void) static void SetNewMoveTypeIcon(void) { - if (pssData->newMove == MOVE_NONE) + if (sMonSummaryScreenData->newMove == MOVE_NONE) { SetSpriteInvisibility(7, TRUE); } else { - if (pssData->currPageIndex == 2) - SetMoveTypeSpritePosAndType(gBattleMoves[pssData->newMove].type, 85, 96, 7); + if (sMonSummaryScreenData->currPageIndex == 2) + SetMoveTypeSpritePosAndType(gBattleMoves[sMonSummaryScreenData->newMove].type, 85, 96, 7); else - SetMoveTypeSpritePosAndType(NUMBER_OF_MON_TYPES + gContestMoves[pssData->newMove].contestCategory, 85, 96, 7); + SetMoveTypeSpritePosAndType(NUMBER_OF_MON_TYPES + gContestMoves[sMonSummaryScreenData->newMove].contestCategory, 85, 96, 7); } } static void sub_81C4568(u8 a0, u8 a1) { - struct Sprite *sprite1 = &gSprites[pssData->spriteIds[a0 + 3]]; - struct Sprite *sprite2 = &gSprites[pssData->spriteIds[a1 + 3]]; + struct Sprite *sprite1 = &gSprites[sMonSummaryScreenData->spriteIds[a0 + 3]]; + struct Sprite *sprite2 = &gSprites[sMonSummaryScreenData->spriteIds[a1 + 3]]; u8 temp = sprite1->animNum; sprite1->animNum = sprite2->animNum; @@ -3808,7 +3866,7 @@ static void sub_81C4568(u8 a0, u8 a1) static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1) { const struct CompressedSpritePalette *pal; - struct PokeSummary *summary = &pssData->summary; + struct PokeSummary *summary = &sMonSummaryScreenData->summary; switch (*a1) { @@ -3817,7 +3875,7 @@ static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1) case 0: if (gMain.inBattle) { - if (sub_80688F8(3, pssData->curMonIndex)) + if (sub_80688F8(3, sMonSummaryScreenData->curMonIndex)) { HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[summary->species2], gMonSpritesGfxPtr->sprites[1], summary->species2, summary->pid); } @@ -3830,7 +3888,7 @@ static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1) { if (gMonSpritesGfxPtr != NULL) { - if (pssData->monList.mons == gPlayerParty || pssData->mode == PSS_MODE_BOX || pssData->unk40EF == TRUE) + if (sMonSummaryScreenData->monList.mons == gPlayerParty || sMonSummaryScreenData->mode == PSS_MODE_BOX || sMonSummaryScreenData->unk40EF == TRUE) { HandleLoadSpecialPokePic_2(&gMonFrontPicTable[summary->species2], gMonSpritesGfxPtr->sprites[1], summary->species2, summary->pid); } @@ -3841,7 +3899,7 @@ static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1) } else { - if (pssData->monList.mons == gPlayerParty || pssData->mode == PSS_MODE_BOX || pssData->unk40EF == TRUE) + if (sMonSummaryScreenData->monList.mons == gPlayerParty || sMonSummaryScreenData->mode == PSS_MODE_BOX || sMonSummaryScreenData->unk40EF == TRUE) { HandleLoadSpecialPokePic_2(&gMonFrontPicTable[summary->species2], sub_806F4F8(0, 1), summary->species2, summary->pid); } @@ -3864,10 +3922,10 @@ static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1) static void PlayMonCry(void) { - struct PokeSummary *summary = &pssData->summary; + struct PokeSummary *summary = &sMonSummaryScreenData->summary; if (!summary->isEgg) { - if (ShouldPlayNormalMonCry(&pssData->currentMon) == TRUE) + if (ShouldPlayNormalMonCry(&sMonSummaryScreenData->currentMon) == TRUE) { PlayCry3(summary->species2, 0, 0); } @@ -3880,7 +3938,7 @@ static void PlayMonCry(void) static u8 sub_81C47B4(struct Pokemon *unused) { - struct PokeSummary *summary = &pssData->summary; + struct PokeSummary *summary = &sMonSummaryScreenData->summary; u8 spriteId = CreateSprite(&gMultiuseSpriteTemplate, 40, 64, 5); struct Sprite *sprite = &gSprites[spriteId]; @@ -3905,7 +3963,7 @@ static u8 sub_81C47B4(struct Pokemon *unused) static void SpriteCB_Pokemon(struct Sprite *sprite) { - struct PokeSummary *summary = &pssData->summary; + struct PokeSummary *summary = &sMonSummaryScreenData->summary; if (!gPaletteFade.active && sprite->data[2] != 1) { @@ -3931,7 +3989,7 @@ void SummaryScreen_DestroyUnknownTask(void) static bool32 SummaryScreen_DoesSpriteHaveCallback(void) { - if (gSprites[pssData->spriteIds[0]].callback == SpriteCallbackDummy) + if (gSprites[sMonSummaryScreenData->spriteIds[0]].callback == SpriteCallbackDummy) { return FALSE; } @@ -3946,11 +4004,11 @@ static void StopPokemonAnimations(void) // A subtle effect, this function stops u16 i; u16 paletteIndex; - gSprites[pssData->spriteIds[0]].animPaused = TRUE; - gSprites[pssData->spriteIds[0]].callback = SpriteCallbackDummy; + gSprites[sMonSummaryScreenData->spriteIds[0]].animPaused = TRUE; + gSprites[sMonSummaryScreenData->spriteIds[0]].callback = SpriteCallbackDummy; StopPokemonAnimationDelayTask(); - paletteIndex = (gSprites[pssData->spriteIds[0]].oam.paletteNum * 16) | 0x100; + paletteIndex = (gSprites[sMonSummaryScreenData->spriteIds[0]].oam.paletteNum * 16) | 0x100; for (i = 0; i < 16; i++) { @@ -3962,20 +4020,20 @@ static void CreateMonMarkingsSprite(struct Pokemon *mon) { struct Sprite *sprite = sub_811FF94(30003, 30003, sSummaryMarkingsPalette); - pssData->markingsSprite = sprite; + sMonSummaryScreenData->markingsSprite = sprite; if (sprite != NULL) { StartSpriteAnim(sprite, GetMonData(mon, MON_DATA_MARKINGS)); - pssData->markingsSprite->pos1.x = 60; - pssData->markingsSprite->pos1.y = 26; - pssData->markingsSprite->oam.priority = 1; + sMonSummaryScreenData->markingsSprite->pos1.x = 60; + sMonSummaryScreenData->markingsSprite->pos1.y = 26; + sMonSummaryScreenData->markingsSprite->oam.priority = 1; } } static void RemoveAndCreateMonMarkingsSprite(struct Pokemon *mon) { - DestroySprite(pssData->markingsSprite); + DestroySprite(sMonSummaryScreenData->markingsSprite); FreeSpriteTilesByTag(30003); CreateMonMarkingsSprite(mon); } @@ -3985,14 +4043,14 @@ static void CreateCaughtBallSprite(struct Pokemon *mon) u8 ball = ItemIdToBallId(GetMonData(mon, MON_DATA_POKEBALL)); LoadBallGfx(ball); - pssData->spriteIds[1] = CreateSprite(&gBallSpriteTemplates[ball], 16, 136, 0); - gSprites[pssData->spriteIds[1]].callback = SpriteCallbackDummy; - gSprites[pssData->spriteIds[1]].oam.priority = 3; + sMonSummaryScreenData->spriteIds[1] = CreateSprite(&gBallSpriteTemplates[ball], 16, 136, 0); + gSprites[sMonSummaryScreenData->spriteIds[1]].callback = SpriteCallbackDummy; + gSprites[sMonSummaryScreenData->spriteIds[1]].oam.priority = 3; } static void CreateSetStatusSprite(void) { - u8 *spriteId = &pssData->spriteIds[2]; + u8 *spriteId = &sMonSummaryScreenData->spriteIds[2]; u8 anim; if (*spriteId == 0xFF) @@ -4000,7 +4058,7 @@ static void CreateSetStatusSprite(void) *spriteId = CreateSprite(&sSpriteTemplate_StatusCondition, 64, 152, 0); } - anim = sub_81B205C(&pssData->currentMon); + anim = GetMonAilment(&sMonSummaryScreenData->currentMon); if (anim != 0) { @@ -4016,9 +4074,9 @@ static void CreateSetStatusSprite(void) static void sub_81C4AF8(u8 a0) { u8 i; - u8 *spriteIds = &pssData->spriteIds[a0]; + u8 *spriteIds = &sMonSummaryScreenData->spriteIds[a0]; - if (pssData->currPageIndex > 1) + if (sMonSummaryScreenData->currPageIndex > 1) { u8 subsprite = 0; if (a0 == 8) @@ -4070,11 +4128,11 @@ static void sub_81C4BE4(struct Sprite *sprite) if (sprite->data[0] == 8) { - sprite->pos2.y = pssData->firstMoveIndex * 16; + sprite->pos2.y = sMonSummaryScreenData->firstMoveIndex * 16; } else { - sprite->pos2.y = pssData->secondMoveIndex * 16; + sprite->pos2.y = sMonSummaryScreenData->secondMoveIndex * 16; } } @@ -4090,7 +4148,7 @@ static void sub_81C4C60(u8 a0) static void sub_81C4C84(u8 a0) { u8 i; - u8 *spriteIds = &pssData->spriteIds[8]; + u8 *spriteIds = &sMonSummaryScreenData->spriteIds[8]; a0 *= 3; for (i = 0; i < 10; i++) @@ -4113,7 +4171,7 @@ static void sub_81C4C84(u8 a0) static void sub_81C4D18(u8 firstSpriteId) { u8 i; - u8 *spriteIds = &pssData->spriteIds[firstSpriteId]; + u8 *spriteIds = &sMonSummaryScreenData->spriteIds[firstSpriteId]; for (i = 0; i < 10; i++) { From 1758eb99dfe13c9fc93284d2bbf55dce315fd2c9 Mon Sep 17 00:00:00 2001 From: garak Date: Sun, 3 Mar 2019 22:08:58 -0500 Subject: [PATCH 173/217] match sub_810EE14 in flying.c --- src/flying.c | 130 +-------------------------------------------------- 1 file changed, 2 insertions(+), 128 deletions(-) diff --git a/src/flying.c b/src/flying.c index 7f48e57cbd..3b7417551c 100644 --- a/src/flying.c +++ b/src/flying.c @@ -1496,11 +1496,8 @@ void sub_810EDD0(struct Sprite *sprite) DestroyAnimSprite(sprite); } -#ifdef NONMATCHING void sub_810EE14(struct Sprite *sprite) { - // NONMATCHING - Functionally equivalent - slight register swap at end - u32 matrixNum; int t1, t2; @@ -1540,16 +1537,9 @@ void sub_810EE14(struct Sprite *sprite) if (t2 > 128) t2 = 128; - - /* NONMATCHING - * compiles to: - * asr r0, r0, #0x1 - strh r0, [r5, #0x26] - * needed: - * asrs r1, r0, 1 - * strh r1, [r5, 0x26] */ - sprite->pos2.y = (64 - t2) / 2; + t2 = (64 - t2) / 2; + sprite->pos2.y = t2; if (sprite->data[2] == 24) { @@ -1559,122 +1549,6 @@ void sub_810EE14(struct Sprite *sprite) } } -#else -NAKED -void sub_810EE14(struct Sprite *sprite) -{ - asm_unified("push {r4,r5,lr}\n\ - sub sp, 0x4\n\ - adds r5, r0, 0\n\ - movs r1, 0x2E\n\ - ldrsh r0, [r5, r1]\n\ - cmp r0, 0\n\ - beq _0810EE28\n\ - cmp r0, 0x1\n\ - beq _0810EE80\n\ - b _0810EEEC\n\ -_0810EE28:\n\ - ldr r0, =gBattleAnimArgs\n\ - movs r2, 0\n\ - ldrsh r0, [r0, r2]\n\ - cmp r0, 0\n\ - bne _0810EE40\n\ - ldr r4, =gBattleAnimAttacker\n\ - b _0810EE42\n\ - .pool\n\ -_0810EE40:\n\ - ldr r4, =gBattleAnimTarget\n\ -_0810EE42:\n\ - ldrb r0, [r4]\n\ - movs r1, 0\n\ - bl GetBattlerSpriteCoord\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - strh r0, [r5, 0x20]\n\ - ldrb r0, [r4]\n\ - movs r1, 0x1\n\ - bl GetBattlerSpriteCoord\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - strh r0, [r5, 0x22]\n\ - movs r0, 0\n\ - movs r3, 0x80\n\ - lsls r3, 2\n\ - strh r3, [r5, 0x30]\n\ - movs r2, 0x80\n\ - lsls r2, 1\n\ - str r0, [sp]\n\ - adds r0, r5, 0\n\ - movs r1, 0\n\ - bl TrySetSpriteRotScale\n\ - ldrh r0, [r5, 0x2E]\n\ - adds r0, 0x1\n\ - strh r0, [r5, 0x2E]\n\ - b _0810EEEC\n\ - .pool\n\ -_0810EE80:\n\ - movs r1, 0x32\n\ - ldrsh r0, [r5, r1]\n\ - cmp r0, 0xB\n\ - bgt _0810EE8E\n\ - ldrh r0, [r5, 0x30]\n\ - subs r0, 0x28\n\ - b _0810EE92\n\ -_0810EE8E:\n\ - ldrh r0, [r5, 0x30]\n\ - adds r0, 0x28\n\ -_0810EE92:\n\ - strh r0, [r5, 0x30]\n\ - ldrh r0, [r5, 0x32]\n\ - adds r0, 0x1\n\ - movs r1, 0\n\ - strh r0, [r5, 0x32]\n\ - movs r2, 0x80\n\ - lsls r2, 1\n\ - movs r0, 0x30\n\ - ldrsh r3, [r5, r0]\n\ - str r1, [sp]\n\ - adds r0, r5, 0\n\ - bl TrySetSpriteRotScale\n\ - ldrb r1, [r5, 0x3]\n\ - lsls r1, 26\n\ - lsrs r1, 27\n\ - movs r0, 0xF4\n\ - lsls r0, 6\n\ - ldr r2, =gOamMatrices\n\ - lsls r1, 3\n\ - adds r1, r2\n\ - movs r2, 0x6\n\ - ldrsh r1, [r1, r2]\n\ - bl __divsi3\n\ - adds r1, r0, 0x1\n\ - cmp r1, 0x80\n\ - ble _0810EECC\n\ - movs r1, 0x80\n\ -_0810EECC:\n\ - movs r0, 0x40\n\ - subs r0, r1\n\ - lsrs r1, r0, 31\n\ - adds r0, r1\n\ - asrs r1, r0, 1\n\ - strh r1, [r5, 0x26]\n\ - movs r1, 0x32\n\ - ldrsh r0, [r5, r1]\n\ - cmp r0, 0x18\n\ - bne _0810EEEC\n\ - adds r0, r5, 0\n\ - bl sub_80A749C\n\ - adds r0, r5, 0\n\ - bl DestroyAnimSprite\n\ -_0810EEEC:\n\ - add sp, 0x4\n\ - pop {r4,r5}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n"); -} -#endif - void sub_810EEF8(struct Sprite *sprite) { int v1, v2; From 05199f8fc7b89bdd401ee112e5f500235e99736b Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 3 Mar 2019 22:27:57 -0500 Subject: [PATCH 174/217] Fix merge issue --- src/pokemon_summary_screen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index edfd481dee..3ed27dcbdf 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -1407,7 +1407,7 @@ static bool8 ExtractMonDataToSummaryStruct(struct Pokemon *mon) case 3: GetMonData(mon, MON_DATA_OT_NAME, sum->OTName); ConvertInternationalString((u8*)&sum->OTName, GetMonData(mon, MON_DATA_LANGUAGE)); - sum->ailment = sub_81B205C(mon); + sum->ailment = GetMonAilment(mon); sum->OTGender = GetMonData(mon, MON_DATA_OT_GENDER); sum->OTID = GetMonData(mon, MON_DATA_OT_ID); sum->metLocation = GetMonData(mon, MON_DATA_MET_LOCATION); From ac7a048380217560b4e8f4f43858112e185ba2ef Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 4 Mar 2019 00:25:07 -0500 Subject: [PATCH 175/217] Removed PREV and NEXT macros, changed summary name --- src/pokemon_summary_screen.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 3ed27dcbdf..01cafb100e 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -98,10 +98,6 @@ #define PSS_DATA_WINDOW_MOVE_PP 1 #define PSS_DATA_WINDOW_MOVE_DESCRIPTION 2 -// Used for switching between pages, pokemon, and moves. -#define PSS_CHANGE_NEXT 1 -#define PSS_CHANGE_PREV -1 - static EWRAM_DATA struct PokemonSummaryScreenData { /*0x00*/ union { @@ -1490,19 +1486,19 @@ static void HandleInput(u8 taskId) { if (gMain.newKeys & DPAD_UP) { - ChangeSummaryPokemon(taskId, PSS_CHANGE_PREV); + ChangeSummaryPokemon(taskId, -1); } else if (gMain.newKeys & DPAD_DOWN) { - ChangeSummaryPokemon(taskId, PSS_CHANGE_NEXT); + ChangeSummaryPokemon(taskId, 1); } else if ((gMain.newKeys & DPAD_LEFT) || GetLRKeysState() == 1) { - ChangePage(taskId, PSS_CHANGE_PREV); + ChangePage(taskId, -1); } else if ((gMain.newKeys & DPAD_RIGHT) || GetLRKeysState() == 2) { - ChangePage(taskId, PSS_CHANGE_NEXT); + ChangePage(taskId, 1); } else if (gMain.newKeys & A_BUTTON) { @@ -1542,14 +1538,14 @@ static void ChangeSummaryPokemon(u8 taskId, s8 delta) if (sMonSummaryScreenData->currPageIndex != PSS_PAGE_INFO) { - if (delta == PSS_CHANGE_NEXT) + if (delta == 1) delta = 0; else delta = 2; } else { - if (delta == PSS_CHANGE_NEXT) + if (delta == 1) delta = 1; else delta = 3; @@ -1723,16 +1719,16 @@ static void ChangePage(u8 taskId, s8 delta) if (summary->isEgg) return; - else if (delta == PSS_CHANGE_PREV && sMonSummaryScreenData->currPageIndex == sMonSummaryScreenData->minPageIndex) + else if (delta == -1&& sMonSummaryScreenData->currPageIndex == sMonSummaryScreenData->minPageIndex) return; - else if (delta == PSS_CHANGE_NEXT && sMonSummaryScreenData->currPageIndex == sMonSummaryScreenData->maxPageIndex) + else if (delta == 1 && sMonSummaryScreenData->currPageIndex == sMonSummaryScreenData->maxPageIndex) return; PlaySE(SE_SELECT); ClearPageWindowTilemaps(sMonSummaryScreenData->currPageIndex); sMonSummaryScreenData->currPageIndex += delta; data[0] = 0; - if (delta == PSS_CHANGE_NEXT) + if (delta == 1) SetTaskFuncWithFollowupFunc(taskId, PssScrollRight, gTasks[taskId].func); else SetTaskFuncWithFollowupFunc(taskId, PssScrollLeft, gTasks[taskId].func); @@ -2157,20 +2153,20 @@ static void HandleReplaceMoveInput(u8 taskId) if (gMain.newKeys & DPAD_UP) { data[0] = 4; - sub_81C1070(data, PSS_CHANGE_PREV, &sMonSummaryScreenData->firstMoveIndex); + sub_81C1070(data, -1, &sMonSummaryScreenData->firstMoveIndex); } else if (gMain.newKeys & DPAD_DOWN) { data[0] = 4; - sub_81C1070(data, PSS_CHANGE_NEXT, &sMonSummaryScreenData->firstMoveIndex); + sub_81C1070(data, 1, &sMonSummaryScreenData->firstMoveIndex); } else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1) { - ChangePage(taskId, PSS_CHANGE_PREV); + ChangePage(taskId, -1); } else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysState() == 2) { - ChangePage(taskId, PSS_CHANGE_NEXT); + ChangePage(taskId, 1); } else if (gMain.newKeys & A_BUTTON) { @@ -2252,7 +2248,7 @@ static void HandleHMMovesCantBeForgottenInput(u8 taskId) ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); move = sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]; gTasks[taskId].func = HandleReplaceMoveInput; - ChangePage(taskId, PSS_CHANGE_PREV); + ChangePage(taskId, -1); sub_81C1DA4(9, -2); sub_81C1EFC(9, -2, move); } @@ -2266,7 +2262,7 @@ static void HandleHMMovesCantBeForgottenInput(u8 taskId) ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); move = sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]; gTasks[taskId].func = HandleReplaceMoveInput; - ChangePage(taskId, PSS_CHANGE_NEXT); + ChangePage(taskId, 1); sub_81C1DA4(9, -2); sub_81C1EFC(9, -2, move); } From cae63cf1c79ed243827e8a9149c1aa652f80d374 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 4 Mar 2019 20:56:39 -0500 Subject: [PATCH 176/217] Rename move tutor to move relearner --- asm/rom_81D1C44.s | 60 +-- data/maps/FallarborTown_House2/scripts.inc | 2 +- data/rom_81D1C44.s | 8 +- data/specials.inc | 2 +- include/move_relearner.h | 7 + include/move_tutor.h | 7 - include/pokenav.h | 10 +- include/strings.h | 16 +- ld_script.txt | 4 +- src/{move_tutor.c => move_relearner.c} | 412 ++++++++++----------- src/strings.c | 16 +- sym_ewram.txt | 2 +- 12 files changed, 273 insertions(+), 273 deletions(-) create mode 100644 include/move_relearner.h delete mode 100644 include/move_tutor.h rename src/{move_tutor.c => move_relearner.c} (58%) diff --git a/asm/rom_81D1C44.s b/asm/rom_81D1C44.s index df17e6ae07..99bd11b0d2 100644 --- a/asm/rom_81D1C44.s +++ b/asm/rom_81D1C44.s @@ -1579,12 +1579,12 @@ _081D2800: .pool thumb_func_end sub_81D2754 - thumb_func_start InitMoveTutorWindows -InitMoveTutorWindows: @ 81D2824 + thumb_func_start InitMoveRelearnerWindows +InitMoveRelearnerWindows: @ 81D2824 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, =gMoveTutorWindowTemplates + ldr r0, =gMoveRelearnerWindowTemplates bl InitWindows bl DeactivateAllTextPrinters movs r0, 0 @@ -1645,21 +1645,21 @@ _081D288E: pop {r4,r5} pop {r0} bx r0 - thumb_func_end InitMoveTutorWindows + thumb_func_end InitMoveRelearnerWindows thumb_func_start nullsub_79 nullsub_79: @ 81D28C4 bx lr thumb_func_end nullsub_79 - thumb_func_start LoadMoveTutorMovesList -LoadMoveTutorMovesList: @ 81D28C8 + thumb_func_start LoadMoveRelearnerMovesList +LoadMoveRelearnerMovesList: @ 81D28C8 push {r4-r7,lr} lsls r1, 16 lsrs r4, r1, 16 ldr r3, =gMultiuseListMenuTemplate adds r2, r3, 0 - ldr r1, =gMoveTutorMovesListTemplate + ldr r1, =gMoveRelearnerMovesListTemplate ldm r1!, {r5-r7} stm r2!, {r5-r7} ldm r1!, {r5-r7} @@ -1679,10 +1679,10 @@ _081D28F4: pop {r4-r7} pop {r1} bx r1 - thumb_func_end LoadMoveTutorMovesList + thumb_func_end LoadMoveRelearnerMovesList - thumb_func_start MoveTutorLoadBattleMoveDescription -MoveTutorLoadBattleMoveDescription: @ 81D28FC + thumb_func_start MoveRelearnerLoadBattleMoveDescription +MoveRelearnerLoadBattleMoveDescription: @ 81D28FC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1884,16 +1884,16 @@ _081D2AB6: pop {r0} bx r0 .pool - thumb_func_end MoveTutorLoadBattleMoveDescription + thumb_func_end MoveRelearnerLoadBattleMoveDescription - thumb_func_start MoveTutorMenuLoadContestMoveDescription -MoveTutorMenuLoadContestMoveDescription: @ 81D2ACC + thumb_func_start MoveRelearnerMenuLoadContestMoveDescription +MoveRelearnerMenuLoadContestMoveDescription: @ 81D2ACC push {r4-r7,lr} mov r7, r8 push {r7} sub sp, 0xC adds r4, r0, 0 - bl MoveTutorShowHideHearts + bl MoveRelearnerShowHideHearts movs r0, 0x1 movs r1, 0x11 bl FillWindowPixelBuffer @@ -1997,10 +1997,10 @@ _081D2BB8: pop {r0} bx r0 .pool - thumb_func_end MoveTutorMenuLoadContestMoveDescription + thumb_func_end MoveRelearnerMenuLoadContestMoveDescription - thumb_func_start MoveTutorCursorCallback -MoveTutorCursorCallback: @ 81D2BD0 + thumb_func_start MoveRelearnerCursorCallback +MoveRelearnerCursorCallback: @ 81D2BD0 push {r4,lr} adds r4, r0, 0 lsls r1, 24 @@ -2011,16 +2011,16 @@ MoveTutorCursorCallback: @ 81D2BD0 bl PlaySE _081D2BE2: adds r0, r4, 0 - bl MoveTutorLoadBattleMoveDescription + bl MoveRelearnerLoadBattleMoveDescription adds r0, r4, 0 - bl MoveTutorMenuLoadContestMoveDescription + bl MoveRelearnerMenuLoadContestMoveDescription pop {r4} pop {r0} bx r0 - thumb_func_end MoveTutorCursorCallback + thumb_func_end MoveRelearnerCursorCallback - thumb_func_start MoveTutorPrintText -MoveTutorPrintText: @ 81D2BF4 + thumb_func_start MoveRelearnerPrintText +MoveRelearnerPrintText: @ 81D2BF4 push {r4,lr} sub sp, 0x10 adds r4, r0, 0 @@ -2052,10 +2052,10 @@ MoveTutorPrintText: @ 81D2BF4 pop {r0} bx r0 .pool - thumb_func_end MoveTutorPrintText + thumb_func_end MoveRelearnerPrintText - thumb_func_start MoveTutorRunTextPrinters -MoveTutorRunTextPrinters: @ 81D2C3C + thumb_func_start MoveRelearnerRunTextPrinters +MoveRelearnerRunTextPrinters: @ 81D2C3C push {lr} bl RunTextPrinters movs r0, 0x3 @@ -2064,12 +2064,12 @@ MoveTutorRunTextPrinters: @ 81D2C3C lsrs r0, 16 pop {r1} bx r1 - thumb_func_end MoveTutorRunTextPrinters + thumb_func_end MoveRelearnerRunTextPrinters - thumb_func_start MoveTutorCreateYesNoMenu -MoveTutorCreateYesNoMenu: @ 81D2C50 + thumb_func_start MoveRelearnerCreateYesNoMenu +MoveRelearnerCreateYesNoMenu: @ 81D2C50 push {lr} - ldr r0, =gMoveTutorYesNoMenuTemplate + ldr r0, =gMoveRelearnerYesNoMenuTemplate movs r1, 0x1 movs r2, 0xE movs r3, 0 @@ -2077,7 +2077,7 @@ MoveTutorCreateYesNoMenu: @ 81D2C50 pop {r0} bx r0 .pool - thumb_func_end MoveTutorCreateYesNoMenu + thumb_func_end MoveRelearnerCreateYesNoMenu thumb_func_start sub_81D2C68 sub_81D2C68: @ 81D2C68 diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index 2f2ec1b3fb..d0305ad4b8 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -37,7 +37,7 @@ FallarborTown_House2_EventScript_2013D6:: @ 82013D6 FallarborTown_House2_EventScript_20140C:: @ 820140C msgbox FallarborTown_House2_Text_2015C3, MSGBOX_DEFAULT - special TeachMoveTutorMove + special TeachMoveRelearnerMove waitstate compare VAR_0x8004, 0 goto_if_eq FallarborTown_House2_EventScript_2013D6 diff --git a/data/rom_81D1C44.s b/data/rom_81D1C44.s index f9625c9ca9..1b54351755 100644 --- a/data/rom_81D1C44.s +++ b/data/rom_81D1C44.s @@ -23,7 +23,7 @@ gUnknown_08625404:: @ 8625404 gUnknown_08625410:: @ 8625410 .byte 4, 5, 6, 7, 8, 9, 9, 0xA, 0xA, 0xB, 0xB, 0xC, 0xC, 0xD, 0xD, 0xD, 0xD, 0xE, 0xE, 0xE, 0xE, 0xF, 0xF, 0xF, 0xF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23 -gMoveTutorWindowTemplates:: @ 8625510s +gMoveRelearnerWindowTemplates:: @ 8625510s window_template 1, 1, 1, 16, 12, 0xF, 0x000A window_template 1, 1, 1, 16, 12, 0xF, 0x00CA window_template 1, 19, 1, 10, 12, 0xF, 0x018A @@ -31,12 +31,12 @@ gMoveTutorWindowTemplates:: @ 8625510s window_template 0, 22, 8, 5, 4, 0xF, 0x025A null_window_template -gMoveTutorYesNoMenuTemplate:: @ 8625540 +gMoveRelearnerYesNoMenuTemplate:: @ 8625540 window_template 0, 22, 8, 5, 4, 0xF, 0x025A -gMoveTutorMovesListTemplate:: @ 8625548 struct ListMenuTemplate +gMoveRelearnerMovesListTemplate:: @ 8625548 struct ListMenuTemplate .4byte NULL - .4byte MoveTutorCursorCallback + .4byte MoveRelearnerCursorCallback .4byte NULL .2byte 0 .2byte 0 diff --git a/data/specials.inc b/data/specials.inc index d57c76bdec..9364dcc466 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -235,7 +235,7 @@ gSpecials:: @ 81DBA64 def_special sub_81B9770 def_special sub_81B9718 def_special sub_81B96D0 - def_special TeachMoveTutorMove + def_special TeachMoveRelearnerMove def_special GetRecordedCyclingRoadResults def_special Special_BeginCyclingRoadChallenge def_special GetPlayerAvatarBike diff --git a/include/move_relearner.h b/include/move_relearner.h new file mode 100644 index 0000000000..51b476d25f --- /dev/null +++ b/include/move_relearner.h @@ -0,0 +1,7 @@ +#ifndef GUARD_MOVE_RELEARNER_H +#define GUARD_MOVE_RELEARNER_H + +void TeachMoveRelearnerMove(void); +void MoveRelearnerShowHideHearts(s32); + +#endif //GUARD_MOVE_RELEARNER_H diff --git a/include/move_tutor.h b/include/move_tutor.h deleted file mode 100644 index e3e5da1d4b..0000000000 --- a/include/move_tutor.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef GUARD_LEARN_MOVE_H -#define GUARD_LEARN_MOVE_H - -void TeachMoveTutorMove(void); -void MoveTutorShowHideHearts(s32); - -#endif //GUARD_LEARN_MOVE_H diff --git a/include/pokenav.h b/include/pokenav.h index f80123757d..e6fa5f40d0 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -20,11 +20,11 @@ void sub_81D1EC0(void); void sub_81D1D04(u8); bool8 sub_81D1C44(u8); bool8 sub_81D4A58(struct EventObject*); -void MoveTutorPrintText(u8 *); -u16 MoveTutorRunTextPrinters(void); -void MoveTutorCreateYesNoMenu(void); -u8 LoadMoveTutorMovesList(const struct ListMenuItem *items, u16 numChoices); -void InitMoveTutorWindows(bool8 useContextWindow); +void MoveRelearnerPrintText(u8 *); +u16 MoveRelearnerRunTextPrinters(void); +void MoveRelearnerCreateYesNoMenu(void); +u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices); +void InitMoveRelearnerWindows(bool8 useContextWindow); bool8 EventObjectIsFarawayIslandMew(struct EventObject *); u32 sub_81D427C(void); void sub_81D4998(void); diff --git a/include/strings.h b/include/strings.h index bd1a5349c6..8fc5ad377e 100644 --- a/include/strings.h +++ b/include/strings.h @@ -859,15 +859,15 @@ extern const u8 gText_Winona[]; extern const u8 gText_Phoebe[]; extern const u8 gText_Glacia[]; -extern const u8 gText_MoveTutorPkmnLearnedMove[]; -extern const u8 gText_MoveTutorPkmnTryingToLearnMove[]; -extern const u8 gText_MoveTutorWhichMoveToForget[]; -extern const u8 gText_MoveTutorStopTryingToTeachMove[]; -extern const u8 gText_MoveTutorAndPoof[]; -extern const u8 gText_MoveTutorPkmnForgotMoveAndLearnedNew[]; +extern const u8 gText_MoveRelearnerPkmnLearnedMove[]; +extern const u8 gText_MoveRelearnerPkmnTryingToLearnMove[]; +extern const u8 gText_MoveRelearnerWhichMoveToForget[]; +extern const u8 gText_MoveRelearnerStopTryingToTeachMove[]; +extern const u8 gText_MoveRelearnerAndPoof[]; +extern const u8 gText_MoveRelearnerPkmnForgotMoveAndLearnedNew[]; extern const u8 gText_TeachWhichMoveToPkmn[]; -extern const u8 gText_MoveTutorGiveUp[]; -extern const u8 gText_MoveTutorTeachMoveConfirm[]; +extern const u8 gText_MoveRelearnerGiveUp[]; +extern const u8 gText_MoveRelearnerTeachMoveConfirm[]; extern const u8 gText_Kira[]; extern const u8 gText_Amy[]; diff --git a/ld_script.txt b/ld_script.txt index 12756b5bc5..53142d3602 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -226,7 +226,7 @@ SECTIONS { src/battle_controller_safari.o(.text); src/fldeff_sweetscent.o(.text); src/battle_anim_effects_3.o(.text); - src/move_tutor.o(.text); + src/move_relearner.o(.text); src/fldeff_softboiled.o(.text); src/decoration_inventory.o(.text); src/roamer.o(.text); @@ -535,7 +535,7 @@ SECTIONS { src/contest_ai.o(.rodata); src/battle_controller_safari.o(.rodata); src/battle_anim_effects_3.o(.rodata); - src/move_tutor.o(.rodata); + src/move_relearner.o(.rodata); src/roamer.o(.rodata); src/battle_tower.o(.rodata); src/use_pokeblock.o(.rodata); diff --git a/src/move_tutor.c b/src/move_relearner.c similarity index 58% rename from src/move_tutor.c rename to src/move_relearner.c index 89291a0087..1766476ccd 100644 --- a/src/move_tutor.c +++ b/src/move_relearner.c @@ -7,7 +7,7 @@ #include "event_data.h" #include "field_screen_effect.h" #include "gpu_regs.h" -#include "move_tutor.h" +#include "move_relearner.h" #include "list_menu.h" #include "alloc.h" #include "menu.h" @@ -26,42 +26,42 @@ #include "constants/songs.h" /* - * Move tutor state machine + * Move relearner state machine * ------------------------ * - * Entry point: TeachMoveTutorMove + * Entry point: TeachMoveRelearnerMove * - * TeachMoveTutorMove + * TeachMoveRelearnerMove * Task_WaitForFadeOut * CB2_InitLearnMove * - Creates moveDisplayArrowTask to listen to right/left buttons. * - Creates moveListScrollArrowTask to listen to up/down buttons. - * - Whenever the selected move changes (and once on init), the MoveTutorCursorCallback - * is called (see gMoveTutorMovesListTemplate). That callback will reload the contest + * - Whenever the selected move changes (and once on init), the MoveRelearnerCursorCallback + * is called (see gMoveRelearnerMovesListTemplate). That callback will reload the contest * display and battle display windows for the new move. Both are always loaded in * memory, but only the currently active one is copied to VRAM. The exception to this - * is the appeal and jam hearts, which are sprites. MoveTutorShowHideHearts is called + * is the appeal and jam hearts, which are sprites. MoveRelearnerShowHideHearts is called * while reloading the contest display to control them. - * DoMoveTutorMain: MENU_STATE_FADE_TO_BLACK - * DoMoveTutorMain: MENU_STATE_WAIT_FOR_FADE + * DoMoveRelearnerMain: MENU_STATE_FADE_TO_BLACK + * DoMoveRelearnerMain: MENU_STATE_WAIT_FOR_FADE * - Go to MENU_STATE_IDLE_BATTLE_MODE * - * DoMoveTutorMain: MENU_STATE_SETUP_BATTLE_MODE - * DoMoveTutorMain: MENU_STATE_IDLE_BATTLE_MODE + * DoMoveRelearnerMain: MENU_STATE_SETUP_BATTLE_MODE + * DoMoveRelearnerMain: MENU_STATE_IDLE_BATTLE_MODE * - If the player selected a move (pressed A), go to MENU_STATE_PRINT_TEACH_MOVE_PROMPT. * - If the player cancelled (pressed B), go to MENU_STATE_PRINT_GIVE_UP_PROMPT. * - If the player pressed left or right, swap the move display window to contest mode, * and go to MENU_STATE_SETUP_CONTEST_MODE. * - * DoMoveTutorMain: MENU_STATE_SETUP_CONTEST_MODE - * DoMoveTutorMain: MENU_STATE_IDLE_CONTEST_MODE + * DoMoveRelearnerMain: MENU_STATE_SETUP_CONTEST_MODE + * DoMoveRelearnerMain: MENU_STATE_IDLE_CONTEST_MODE * - If the player selected a move, go to MENU_STATE_PRINT_TEACH_MOVE_PROMPT. * - If the player cancelled, go to MENU_STATE_PRINT_GIVE_UP_PROMPT * - If the player pressed left or right, swap the move display window to battle mode, * and go to MENU_STATE_SETUP_BATTLE_MODE. * - * DoMoveTutorMain: MENU_STATE_PRINT_TEACH_MOVE_PROMPT - * DoMoveTutorMain: MENU_STATE_TEACH_MOVE_CONFIRM + * DoMoveRelearnerMain: MENU_STATE_PRINT_TEACH_MOVE_PROMPT + * DoMoveRelearnerMain: MENU_STATE_TEACH_MOVE_CONFIRM * - Wait for the player to confirm. * - If cancelled, go to either MENU_STATE_SETUP_BATTLE_MODE or MENU_STATE_SETUP_CONTEST_MODE. * - If confirmed and the pokemon had an empty move slot, set VAR_0x8004 to TRUE and go to @@ -69,41 +69,41 @@ * - If confirmed and the pokemon doesn't have an empty move slot, go to * MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT. * - * DoMoveTutorMain: MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT - * DoMoveTutorMain: MENU_STATE_WAIT_FOR_TRYING_TO_LEARN - * DoMoveTutorMain: MENU_STATE_CONFIRM_DELETE_OLD_MOVE + * DoMoveRelearnerMain: MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT + * DoMoveRelearnerMain: MENU_STATE_WAIT_FOR_TRYING_TO_LEARN + * DoMoveRelearnerMain: MENU_STATE_CONFIRM_DELETE_OLD_MOVE * - If the player confirms, go to MENU_STATE_PRINT_WHICH_MOVE_PROMPT. * - If the player cancels, go to MENU_STATE_PRINT_STOP_TEACHING * - * DoMoveTutorMain: MENU_STATE_PRINT_STOP_TEACHING - * DoMoveTutorMain: MENU_STATE_WAIT_FOR_STOP_TEACHING - * DoMoveTutorMain: MENU_STATE_CONFIRM_STOP_TEACHING + * DoMoveRelearnerMain: MENU_STATE_PRINT_STOP_TEACHING + * DoMoveRelearnerMain: MENU_STATE_WAIT_FOR_STOP_TEACHING + * DoMoveRelearnerMain: MENU_STATE_CONFIRM_STOP_TEACHING * - If the player confirms, go to MENU_STATE_CHOOSE_SETUP_STATE. * - If the player cancels, go back to MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT. * - * DoMoveTutorMain: MENU_STATE_PRINT_WHICH_MOVE_PROMPT - * DoMoveTutorMain: MENU_STATE_SHOW_MOVE_SUMMARY_SCREEN + * DoMoveRelearnerMain: MENU_STATE_PRINT_WHICH_MOVE_PROMPT + * DoMoveRelearnerMain: MENU_STATE_SHOW_MOVE_SUMMARY_SCREEN * - Go to ShowSelectMovePokemonSummaryScreen. When done, control returns to * CB2_InitLearnMoveReturnFromSelectMove. * - * DoMoveTutorMain: MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE - * DoMoveTutorMain: MENU_STATE_PRINT_TEXT_THEN_FANFARE - * DoMoveTutorMain: MENU_STATE_WAIT_FOR_FANFARE - * DoMoveTutorMain: MENU_STATE_WAIT_FOR_A_BUTTON - * DoMoveTutorMain: MENU_STATE_FADE_AND_RETURN - * DoMoveTutorMain: MENU_STATE_RETURN_TO_FIELD + * DoMoveRelearnerMain: MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE + * DoMoveRelearnerMain: MENU_STATE_PRINT_TEXT_THEN_FANFARE + * DoMoveRelearnerMain: MENU_STATE_WAIT_FOR_FANFARE + * DoMoveRelearnerMain: MENU_STATE_WAIT_FOR_A_BUTTON + * DoMoveRelearnerMain: MENU_STATE_FADE_AND_RETURN + * DoMoveRelearnerMain: MENU_STATE_RETURN_TO_FIELD * - Clean up and go to CB2_ReturnToField. * - * DoMoveTutorMain: MENU_STATE_PRINT_GIVE_UP_PROMPT - * DoMoveTutorMain: MENU_STATE_GIVE_UP_CONFIRM + * DoMoveRelearnerMain: MENU_STATE_PRINT_GIVE_UP_PROMPT + * DoMoveRelearnerMain: MENU_STATE_GIVE_UP_CONFIRM * - If the player confirms, go to MENU_STATE_FADE_AND_RETURN, and set VAR_0x8004 to FALSE. * - If the player cancels, go to either MENU_STATE_SETUP_BATTLE_MODE or * MENU_STATE_SETUP_CONTEST_MODE. * * CB2_InitLearnMoveReturnFromSelectMove: * - Do most of the same stuff as CB2_InitLearnMove. - * DoMoveTutorMain: MENU_STATE_FADE_FROM_SUMMARY_SCREEN - * DoMoveTutorMain: MENU_STATE_TRY_OVERWRITE_MOVE + * DoMoveRelearnerMain: MENU_STATE_FADE_FROM_SUMMARY_SCREEN + * DoMoveRelearnerMain: MENU_STATE_TRY_OVERWRITE_MOVE * - If any of the pokemon's existing moves were chosen, overwrite the move and * go to MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE and set VAR_0x8004 to TRUE. * - If the chosen move is the one the player selected before the summary screen, @@ -166,19 +166,19 @@ static EWRAM_DATA struct u8 moveListScrollArrowTask; /*0x113*/ u8 moveDisplayArrowTask; /*0x114*/ u16 scrollOffset; /*0x116*/ -} *sMoveTutorStruct = {0}; +} *sMoveRelearnerStruct = {0}; static EWRAM_DATA struct { u16 listOffset; u16 listRow; bool8 showContestInfo; -} sMoveTutorMenuSate = {0}; +} sMoveRelearnerMenuSate = {0}; -static const u16 sMoveTutorPaletteData[] = INCBIN_U16("graphics/interface/ui_learn_move.gbapal"); +static const u16 sMoveRelearnerPaletteData[] = INCBIN_U16("graphics/interface/ui_learn_move.gbapal"); // The arrow sprites in this spritesheet aren't used. The scroll-arrow system provides its own // arrow sprites. -static const u8 sMoveTutorSpriteSheetData[] = INCBIN_U8("graphics/interface/ui_learn_move.4bpp"); +static const u8 sMoveRelearnerSpriteSheetData[] = INCBIN_U8("graphics/interface/ui_learn_move.4bpp"); static const struct OamData sHeartSpriteOamData = { @@ -231,16 +231,16 @@ static const struct OamData sUnusedOam2 = .affineParam = 0, }; -static const struct SpriteSheet sMoveTutorSpriteSheet = +static const struct SpriteSheet sMoveRelearnerSpriteSheet = { - .data = sMoveTutorSpriteSheetData, + .data = sMoveRelearnerSpriteSheetData, .size = 0x180, .tag = 5525 }; -static const struct SpritePalette sMoveTutorPalette = +static const struct SpritePalette sMoveRelearnerPalette = { - .data = sMoveTutorPaletteData, + .data = sMoveRelearnerPaletteData, .tag = 5526 }; @@ -317,7 +317,7 @@ static const struct SpriteTemplate sConstestMoveHeartSprite = .callback = SpriteCallbackDummy }; -static const struct BgTemplate sMoveTutorMenuBackgroundTemplates[] = +static const struct BgTemplate sMoveRelearnerMenuBackgroundTemplates[] = { { .bg = 0, @@ -339,23 +339,23 @@ static const struct BgTemplate sMoveTutorMenuBackgroundTemplates[] = }, }; -static void DoMoveTutorMain(void); +static void DoMoveRelearnerMain(void); static void CreateLearnableMovesList(void); static void CreateUISprites(void); -static void CB2_MoveTutorMain(void); +static void CB2_MoveRelearnerMain(void); static void Task_WaitForFadeOut(u8 taskId); static void CB2_InitLearnMove(void); static void CB2_InitLearnMoveReturnFromSelectMove(void); -static void InitMoveTutorBackgroundLayers(void); +static void InitMoveRelearnerBackgroundLayers(void); static void AddScrollArrows(void); static void HandleInput(u8); static void ShowTeachMoveText(u8); static s32 GetCurrentSelectedMove(void); -static void FreeMoveTutorResources(void); +static void FreeMoveRelearnerResources(void); static void RemoveScrollArrows(void); static void HideHeartSpritesAndShowTeachMoveText(bool8); -static void VBlankCB_MoveTutor(void) +static void VBlankCB_MoveRelearner(void) { LoadOam(); ProcessSpriteCopyRequests(); @@ -363,7 +363,7 @@ static void VBlankCB_MoveTutor(void) } // Script arguments: The pokemon to teach is in VAR_0x8004 -void TeachMoveTutorMove(void) +void TeachMoveRelearnerMove(void) { ScriptContext2_Enable(); CreateTask(Task_WaitForFadeOut, 10); @@ -387,26 +387,26 @@ static void CB2_InitLearnMove(void) FreeAllSpritePalettes(); ResetTasks(); clear_scheduled_bg_copies_to_vram(); - sMoveTutorStruct = AllocZeroed(sizeof(*sMoveTutorStruct)); - sMoveTutorStruct->partyMon = gSpecialVar_0x8004; - SetVBlankCallback(VBlankCB_MoveTutor); + sMoveRelearnerStruct = AllocZeroed(sizeof(*sMoveRelearnerStruct)); + sMoveRelearnerStruct->partyMon = gSpecialVar_0x8004; + SetVBlankCallback(VBlankCB_MoveRelearner); - InitMoveTutorBackgroundLayers(); - InitMoveTutorWindows(FALSE); + InitMoveRelearnerBackgroundLayers(); + InitMoveRelearnerWindows(FALSE); - sMoveTutorMenuSate.listOffset = 0; - sMoveTutorMenuSate.listRow = 0; - sMoveTutorMenuSate.showContestInfo = FALSE; + sMoveRelearnerMenuSate.listOffset = 0; + sMoveRelearnerMenuSate.listRow = 0; + sMoveRelearnerMenuSate.showContestInfo = FALSE; CreateLearnableMovesList(); - LoadSpriteSheet(&sMoveTutorSpriteSheet); - LoadSpritePalette(&sMoveTutorPalette); + LoadSpriteSheet(&sMoveRelearnerSpriteSheet); + LoadSpritePalette(&sMoveRelearnerPalette); CreateUISprites(); - sMoveTutorStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveTutorMenuSate.listOffset, sMoveTutorMenuSate.listRow); + sMoveRelearnerStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveRelearnerMenuSate.listOffset, sMoveRelearnerMenuSate.listRow); FillPalette(RGB_BLACK, 0, 2); - SetMainCallback2(CB2_MoveTutorMain); + SetMainCallback2(CB2_MoveRelearnerMain); } static void CB2_InitLearnMoveReturnFromSelectMove(void) @@ -415,30 +415,30 @@ static void CB2_InitLearnMoveReturnFromSelectMove(void) FreeAllSpritePalettes(); ResetTasks(); clear_scheduled_bg_copies_to_vram(); - sMoveTutorStruct = AllocZeroed(sizeof(*sMoveTutorStruct)); - sMoveTutorStruct->state = MENU_STATE_FADE_FROM_SUMMARY_SCREEN; - sMoveTutorStruct->partyMon = gSpecialVar_0x8004; - sMoveTutorStruct->moveSlot = gSpecialVar_0x8005; - SetVBlankCallback(VBlankCB_MoveTutor); + sMoveRelearnerStruct = AllocZeroed(sizeof(*sMoveRelearnerStruct)); + sMoveRelearnerStruct->state = MENU_STATE_FADE_FROM_SUMMARY_SCREEN; + sMoveRelearnerStruct->partyMon = gSpecialVar_0x8004; + sMoveRelearnerStruct->moveSlot = gSpecialVar_0x8005; + SetVBlankCallback(VBlankCB_MoveRelearner); - InitMoveTutorBackgroundLayers(); - InitMoveTutorWindows(sMoveTutorMenuSate.showContestInfo); + InitMoveRelearnerBackgroundLayers(); + InitMoveRelearnerWindows(sMoveRelearnerMenuSate.showContestInfo); CreateLearnableMovesList(); - LoadSpriteSheet(&sMoveTutorSpriteSheet); - LoadSpritePalette(&sMoveTutorPalette); + LoadSpriteSheet(&sMoveRelearnerSpriteSheet); + LoadSpritePalette(&sMoveRelearnerPalette); CreateUISprites(); - sMoveTutorStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveTutorMenuSate.listOffset, sMoveTutorMenuSate.listRow); + sMoveRelearnerStruct->moveListMenuTask = ListMenuInit(&gMultiuseListMenuTemplate, sMoveRelearnerMenuSate.listOffset, sMoveRelearnerMenuSate.listRow); FillPalette(RGB_BLACK, 0, 2); - SetMainCallback2(CB2_MoveTutorMain); + SetMainCallback2(CB2_MoveRelearnerMain); } -static void InitMoveTutorBackgroundLayers(void) +static void InitMoveRelearnerBackgroundLayers(void) { ResetVramOamAndBgCntRegs(); ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, sMoveTutorMenuBackgroundTemplates, ARRAY_COUNT(sMoveTutorMenuBackgroundTemplates)); + InitBgsFromTemplates(0, sMoveRelearnerMenuBackgroundTemplates, ARRAY_COUNT(sMoveRelearnerMenuBackgroundTemplates)); ResetAllBgsCoordinates(); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | @@ -448,9 +448,9 @@ static void InitMoveTutorBackgroundLayers(void) SetGpuReg(REG_OFFSET_BLDCNT, 0); } -static void CB2_MoveTutorMain(void) +static void CB2_MoveRelearnerMain(void) { - DoMoveTutorMain(); + DoMoveRelearnerMain(); RunTasks(); AnimateSprites(); BuildOamBuffer(); @@ -461,32 +461,32 @@ static void CB2_MoveTutorMain(void) static void FormatAndPrintText(const u8 *src) { StringExpandPlaceholders(gStringVar4, src); - MoveTutorPrintText(gStringVar4); + MoveRelearnerPrintText(gStringVar4); } // See the state machine doc at the top of the file. -static void DoMoveTutorMain(void) +static void DoMoveRelearnerMain(void) { - switch (sMoveTutorStruct->state) + switch (sMoveRelearnerStruct->state) { case MENU_STATE_FADE_TO_BLACK: - sMoveTutorStruct->state++; + sMoveRelearnerStruct->state++; HideHeartSpritesAndShowTeachMoveText(FALSE); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); break; case MENU_STATE_WAIT_FOR_FADE: if (!gPaletteFade.active) { - sMoveTutorStruct->state = MENU_STATE_IDLE_BATTLE_MODE; + sMoveRelearnerStruct->state = MENU_STATE_IDLE_BATTLE_MODE; } break; case MENU_STATE_UNREACHABLE: - sMoveTutorStruct->state++; + sMoveRelearnerStruct->state++; break; case MENU_STATE_SETUP_BATTLE_MODE: HideHeartSpritesAndShowTeachMoveText(FALSE); - sMoveTutorStruct->state++; + sMoveRelearnerStruct->state++; AddScrollArrows(); break; case MENU_STATE_IDLE_BATTLE_MODE: @@ -494,17 +494,17 @@ static void DoMoveTutorMain(void) break; case MENU_STATE_SETUP_CONTEST_MODE: ShowTeachMoveText(FALSE); - sMoveTutorStruct->state++; + sMoveRelearnerStruct->state++; AddScrollArrows(); break; case MENU_STATE_IDLE_CONTEST_MODE: HandleInput(TRUE); break; case MENU_STATE_PRINT_TEACH_MOVE_PROMPT: - if (!MoveTutorRunTextPrinters()) + if (!MoveRelearnerRunTextPrinters()) { - MoveTutorCreateYesNoMenu(); - sMoveTutorStruct->state++; + MoveRelearnerCreateYesNoMenu(); + sMoveRelearnerStruct->state++; } break; case MENU_STATE_TEACH_MOVE_CONFIRM: @@ -513,35 +513,35 @@ static void DoMoveTutorMain(void) if (selection == 0) { - if (GiveMoveToMon(&gPlayerParty[sMoveTutorStruct->partyMon], GetCurrentSelectedMove()) != 0xFFFF) + if (GiveMoveToMon(&gPlayerParty[sMoveRelearnerStruct->partyMon], GetCurrentSelectedMove()) != 0xFFFF) { - FormatAndPrintText(gText_MoveTutorPkmnLearnedMove); + FormatAndPrintText(gText_MoveRelearnerPkmnLearnedMove); gSpecialVar_0x8004 = TRUE; - sMoveTutorStruct->state = MENU_STATE_PRINT_TEXT_THEN_FANFARE; + sMoveRelearnerStruct->state = MENU_STATE_PRINT_TEXT_THEN_FANFARE; } else { - sMoveTutorStruct->state = MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT; + sMoveRelearnerStruct->state = MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT; } } else if (selection == MENU_B_PRESSED || selection == 1) { - if (sMoveTutorMenuSate.showContestInfo == FALSE) + if (sMoveRelearnerMenuSate.showContestInfo == FALSE) { - sMoveTutorStruct->state = MENU_STATE_SETUP_BATTLE_MODE; + sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE; } - else if (sMoveTutorMenuSate.showContestInfo == TRUE) + else if (sMoveRelearnerMenuSate.showContestInfo == TRUE) { - sMoveTutorStruct->state = MENU_STATE_SETUP_CONTEST_MODE; + sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE; } } } break; case MENU_STATE_PRINT_GIVE_UP_PROMPT: - if (!MoveTutorRunTextPrinters()) + if (!MoveRelearnerRunTextPrinters()) { - MoveTutorCreateYesNoMenu(); - sMoveTutorStruct->state++; + MoveRelearnerCreateYesNoMenu(); + sMoveRelearnerStruct->state++; } break; case MENU_STATE_GIVE_UP_CONFIRM: @@ -551,30 +551,30 @@ static void DoMoveTutorMain(void) if (selection == 0) { gSpecialVar_0x8004 = FALSE; - sMoveTutorStruct->state = MENU_STATE_FADE_AND_RETURN; + sMoveRelearnerStruct->state = MENU_STATE_FADE_AND_RETURN; } else if (selection == -1 || selection == 1) { - if (sMoveTutorMenuSate.showContestInfo == FALSE) + if (sMoveRelearnerMenuSate.showContestInfo == FALSE) { - sMoveTutorStruct->state = MENU_STATE_SETUP_BATTLE_MODE; + sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE; } - else if (sMoveTutorMenuSate.showContestInfo == TRUE) + else if (sMoveRelearnerMenuSate.showContestInfo == TRUE) { - sMoveTutorStruct->state = MENU_STATE_SETUP_CONTEST_MODE; + sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE; } } } break; case MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT: - FormatAndPrintText(gText_MoveTutorPkmnTryingToLearnMove); - sMoveTutorStruct->state++; + FormatAndPrintText(gText_MoveRelearnerPkmnTryingToLearnMove); + sMoveRelearnerStruct->state++; break; case MENU_STATE_WAIT_FOR_TRYING_TO_LEARN: - if (!MoveTutorRunTextPrinters()) + if (!MoveRelearnerRunTextPrinters()) { - MoveTutorCreateYesNoMenu(); - sMoveTutorStruct->state = MENU_STATE_CONFIRM_DELETE_OLD_MOVE; + MoveRelearnerCreateYesNoMenu(); + sMoveRelearnerStruct->state = MENU_STATE_CONFIRM_DELETE_OLD_MOVE; } break; case MENU_STATE_CONFIRM_DELETE_OLD_MOVE: @@ -583,25 +583,25 @@ static void DoMoveTutorMain(void) if (var == 0) { - FormatAndPrintText(gText_MoveTutorWhichMoveToForget); - sMoveTutorStruct->state = MENU_STATE_PRINT_WHICH_MOVE_PROMPT; + FormatAndPrintText(gText_MoveRelearnerWhichMoveToForget); + sMoveRelearnerStruct->state = MENU_STATE_PRINT_WHICH_MOVE_PROMPT; } else if (var == -1 || var == 1) { - sMoveTutorStruct->state = MENU_STATE_PRINT_STOP_TEACHING; + sMoveRelearnerStruct->state = MENU_STATE_PRINT_STOP_TEACHING; } } break; case MENU_STATE_PRINT_STOP_TEACHING: StringCopy(gStringVar2, gMoveNames[GetCurrentSelectedMove()]); - FormatAndPrintText(gText_MoveTutorStopTryingToTeachMove); - sMoveTutorStruct->state++; + FormatAndPrintText(gText_MoveRelearnerStopTryingToTeachMove); + sMoveRelearnerStruct->state++; break; case MENU_STATE_WAIT_FOR_STOP_TEACHING: - if (!MoveTutorRunTextPrinters()) + if (!MoveRelearnerRunTextPrinters()) { - MoveTutorCreateYesNoMenu(); - sMoveTutorStruct->state++; + MoveRelearnerCreateYesNoMenu(); + sMoveRelearnerStruct->state++; } break; case MENU_STATE_CONFIRM_STOP_TEACHING: @@ -610,55 +610,55 @@ static void DoMoveTutorMain(void) if (var == 0) { - sMoveTutorStruct->state = MENU_STATE_CHOOSE_SETUP_STATE; + sMoveRelearnerStruct->state = MENU_STATE_CHOOSE_SETUP_STATE; } else if (var == MENU_B_PRESSED || var == 1) { // What's the point? It gets set to MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT, anyway. - if (sMoveTutorMenuSate.showContestInfo == FALSE) + if (sMoveRelearnerMenuSate.showContestInfo == FALSE) { - sMoveTutorStruct->state = MENU_STATE_SETUP_BATTLE_MODE; + sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE; } - else if (sMoveTutorMenuSate.showContestInfo == TRUE) + else if (sMoveRelearnerMenuSate.showContestInfo == TRUE) { - sMoveTutorStruct->state = MENU_STATE_SETUP_CONTEST_MODE; + sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE; } - sMoveTutorStruct->state = MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT; + sMoveRelearnerStruct->state = MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT; } } break; case MENU_STATE_CHOOSE_SETUP_STATE: - if (!MoveTutorRunTextPrinters()) + if (!MoveRelearnerRunTextPrinters()) { FillWindowPixelBuffer(3, 0x11); - if (sMoveTutorMenuSate.showContestInfo == FALSE) + if (sMoveRelearnerMenuSate.showContestInfo == FALSE) { - sMoveTutorStruct->state = MENU_STATE_SETUP_BATTLE_MODE; + sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE; } - else if (sMoveTutorMenuSate.showContestInfo == TRUE) + else if (sMoveRelearnerMenuSate.showContestInfo == TRUE) { - sMoveTutorStruct->state = MENU_STATE_SETUP_CONTEST_MODE; + sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE; } } break; case MENU_STATE_PRINT_WHICH_MOVE_PROMPT: - if (!MoveTutorRunTextPrinters()) + if (!MoveRelearnerRunTextPrinters()) { - sMoveTutorStruct->state = MENU_STATE_SHOW_MOVE_SUMMARY_SCREEN; + sMoveRelearnerStruct->state = MENU_STATE_SHOW_MOVE_SUMMARY_SCREEN; BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); } break; case MENU_STATE_SHOW_MOVE_SUMMARY_SCREEN: if (!gPaletteFade.active) { - ShowSelectMovePokemonSummaryScreen(gPlayerParty, sMoveTutorStruct->partyMon, gPlayerPartyCount - 1, CB2_InitLearnMoveReturnFromSelectMove, GetCurrentSelectedMove()); - FreeMoveTutorResources(); + ShowSelectMovePokemonSummaryScreen(gPlayerParty, sMoveRelearnerStruct->partyMon, gPlayerPartyCount - 1, CB2_InitLearnMoveReturnFromSelectMove, GetCurrentSelectedMove()); + FreeMoveRelearnerResources(); } break; case 21: - if (!MoveTutorRunTextPrinters()) + if (!MoveRelearnerRunTextPrinters()) { - sMoveTutorStruct->state = MENU_STATE_FADE_AND_RETURN; + sMoveRelearnerStruct->state = MENU_STATE_FADE_AND_RETURN; } break; case 22: @@ -666,23 +666,23 @@ static void DoMoveTutorMain(void) break; case MENU_STATE_FADE_AND_RETURN: BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); - sMoveTutorStruct->state++; + sMoveRelearnerStruct->state++; break; case MENU_STATE_RETURN_TO_FIELD: if (!gPaletteFade.active) { - FreeMoveTutorResources(); + FreeMoveRelearnerResources(); SetMainCallback2(CB2_ReturnToField); } break; case MENU_STATE_FADE_FROM_SUMMARY_SCREEN: BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); - sMoveTutorStruct->state++; - if (sMoveTutorMenuSate.showContestInfo == FALSE) + sMoveRelearnerStruct->state++; + if (sMoveRelearnerMenuSate.showContestInfo == FALSE) { HideHeartSpritesAndShowTeachMoveText(TRUE); } - else if (sMoveTutorMenuSate.showContestInfo == TRUE) + else if (sMoveRelearnerMenuSate.showContestInfo == TRUE) { ShowTeachMoveText(TRUE); } @@ -692,66 +692,66 @@ static void DoMoveTutorMain(void) case MENU_STATE_TRY_OVERWRITE_MOVE: if (!gPaletteFade.active) { - if (sMoveTutorStruct->moveSlot == MAX_MON_MOVES) + if (sMoveRelearnerStruct->moveSlot == MAX_MON_MOVES) { - sMoveTutorStruct->state = MENU_STATE_PRINT_STOP_TEACHING; + sMoveRelearnerStruct->state = MENU_STATE_PRINT_STOP_TEACHING; } else { - u16 moveId = GetMonData(&gPlayerParty[sMoveTutorStruct->partyMon], MON_DATA_MOVE1 + sMoveTutorStruct->moveSlot); + u16 moveId = GetMonData(&gPlayerParty[sMoveRelearnerStruct->partyMon], MON_DATA_MOVE1 + sMoveRelearnerStruct->moveSlot); StringCopy(gStringVar3, gMoveNames[moveId]); - RemoveMonPPBonus(&gPlayerParty[sMoveTutorStruct->partyMon], sMoveTutorStruct->moveSlot); - SetMonMoveSlot(&gPlayerParty[sMoveTutorStruct->partyMon], GetCurrentSelectedMove(), sMoveTutorStruct->moveSlot); + RemoveMonPPBonus(&gPlayerParty[sMoveRelearnerStruct->partyMon], sMoveRelearnerStruct->moveSlot); + SetMonMoveSlot(&gPlayerParty[sMoveRelearnerStruct->partyMon], GetCurrentSelectedMove(), sMoveRelearnerStruct->moveSlot); StringCopy(gStringVar2, gMoveNames[GetCurrentSelectedMove()]); - FormatAndPrintText(gText_MoveTutorAndPoof); - sMoveTutorStruct->state = MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE; + FormatAndPrintText(gText_MoveRelearnerAndPoof); + sMoveRelearnerStruct->state = MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE; gSpecialVar_0x8004 = TRUE; } } break; case MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE: - if (!MoveTutorRunTextPrinters()) + if (!MoveRelearnerRunTextPrinters()) { - FormatAndPrintText(gText_MoveTutorPkmnForgotMoveAndLearnedNew); - sMoveTutorStruct->state = MENU_STATE_PRINT_TEXT_THEN_FANFARE; + FormatAndPrintText(gText_MoveRelearnerPkmnForgotMoveAndLearnedNew); + sMoveRelearnerStruct->state = MENU_STATE_PRINT_TEXT_THEN_FANFARE; PlayFanfare(MUS_FANFA1); } break; case MENU_STATE_PRINT_TEXT_THEN_FANFARE: - if (!MoveTutorRunTextPrinters()) + if (!MoveRelearnerRunTextPrinters()) { PlayFanfare(MUS_FANFA1); - sMoveTutorStruct->state = MENU_STATE_WAIT_FOR_FANFARE; + sMoveRelearnerStruct->state = MENU_STATE_WAIT_FOR_FANFARE; } break; case MENU_STATE_WAIT_FOR_FANFARE: if (IsFanfareTaskInactive()) { - sMoveTutorStruct->state = MENU_STATE_WAIT_FOR_A_BUTTON; + sMoveRelearnerStruct->state = MENU_STATE_WAIT_FOR_A_BUTTON; } break; case MENU_STATE_WAIT_FOR_A_BUTTON: if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - sMoveTutorStruct->state = MENU_STATE_FADE_AND_RETURN; + sMoveRelearnerStruct->state = MENU_STATE_FADE_AND_RETURN; } break; } } -static void FreeMoveTutorResources(void) +static void FreeMoveRelearnerResources(void) { RemoveScrollArrows(); - DestroyListMenuTask(sMoveTutorStruct->moveListMenuTask, &sMoveTutorMenuSate.listOffset, &sMoveTutorMenuSate.listRow); + DestroyListMenuTask(sMoveRelearnerStruct->moveListMenuTask, &sMoveRelearnerMenuSate.listOffset, &sMoveRelearnerMenuSate.listRow); FreeAllWindowBuffers(); - FREE_AND_SET_NULL(sMoveTutorStruct); + FREE_AND_SET_NULL(sMoveRelearnerStruct); ResetSpriteData(); FreeAllSpritePalettes(); } -// Note: The hearts are already made invisible by MoveTutorShowHideHearts, +// Note: The hearts are already made invisible by MoveRelearnerShowHideHearts, // which is called whenever the cursor in either list changes. static void HideHeartSpritesAndShowTeachMoveText(bool8 onlyHideSprites) { @@ -759,7 +759,7 @@ static void HideHeartSpritesAndShowTeachMoveText(bool8 onlyHideSprites) for (i = 0; i < 16; i++) { - gSprites[sMoveTutorStruct->heartSpriteIds[i]].invisible = TRUE; + gSprites[sMoveRelearnerStruct->heartSpriteIds[i]].invisible = TRUE; } if (!onlyHideSprites) @@ -772,8 +772,8 @@ static void HideHeartSpritesAndShowTeachMoveText(bool8 onlyHideSprites) static void HandleInput(bool8 showContest) { - s32 itemId = ListMenu_ProcessInput(sMoveTutorStruct->moveListMenuTask); - ListMenuGetScrollAndRow(sMoveTutorStruct->moveListMenuTask, &sMoveTutorMenuSate.listOffset, &sMoveTutorMenuSate.listRow); + s32 itemId = ListMenu_ProcessInput(sMoveRelearnerStruct->moveListMenuTask); + ListMenuGetScrollAndRow(sMoveRelearnerStruct->moveListMenuTask, &sMoveRelearnerMenuSate.listOffset, &sMoveRelearnerMenuSate.listRow); switch (itemId) { @@ -788,47 +788,47 @@ static void HandleInput(bool8 showContest) if (showContest == FALSE) { PutWindowTilemap(1); - sMoveTutorStruct->state = MENU_STATE_SETUP_CONTEST_MODE; - sMoveTutorMenuSate.showContestInfo = TRUE; + sMoveRelearnerStruct->state = MENU_STATE_SETUP_CONTEST_MODE; + sMoveRelearnerMenuSate.showContestInfo = TRUE; } else { PutWindowTilemap(0); - sMoveTutorStruct->state = MENU_STATE_SETUP_BATTLE_MODE; - sMoveTutorMenuSate.showContestInfo = FALSE; + sMoveRelearnerStruct->state = MENU_STATE_SETUP_BATTLE_MODE; + sMoveRelearnerMenuSate.showContestInfo = FALSE; } schedule_bg_copy_tilemap_to_vram(1); - MoveTutorShowHideHearts(GetCurrentSelectedMove()); + MoveRelearnerShowHideHearts(GetCurrentSelectedMove()); break; case LIST_CANCEL: PlaySE(SE_SELECT); RemoveScrollArrows(); - sMoveTutorStruct->state = MENU_STATE_PRINT_GIVE_UP_PROMPT; - StringExpandPlaceholders(gStringVar4, gText_MoveTutorGiveUp); - MoveTutorPrintText(gStringVar4); + sMoveRelearnerStruct->state = MENU_STATE_PRINT_GIVE_UP_PROMPT; + StringExpandPlaceholders(gStringVar4, gText_MoveRelearnerGiveUp); + MoveRelearnerPrintText(gStringVar4); break; default: PlaySE(SE_SELECT); RemoveScrollArrows(); - sMoveTutorStruct->state = MENU_STATE_PRINT_TEACH_MOVE_PROMPT; + sMoveRelearnerStruct->state = MENU_STATE_PRINT_TEACH_MOVE_PROMPT; StringCopy(gStringVar2, gMoveNames[itemId]); - StringExpandPlaceholders(gStringVar4, gText_MoveTutorTeachMoveConfirm); - MoveTutorPrintText(gStringVar4); + StringExpandPlaceholders(gStringVar4, gText_MoveRelearnerTeachMoveConfirm); + MoveRelearnerPrintText(gStringVar4); break; } } static s32 GetCurrentSelectedMove(void) { - return sMoveTutorStruct->menuItems[sMoveTutorMenuSate.listRow + sMoveTutorMenuSate.listOffset].id; + return sMoveRelearnerStruct->menuItems[sMoveRelearnerMenuSate.listRow + sMoveRelearnerMenuSate.listOffset].id; } // Theory: This used to make the heart sprites visible again (i.e. // this was the inverse of HideHeartsAndShowTeachMoveText), but the // code was commented out. The bool argument would have been named // "justShowHearts." The code for showing/hiding the heards was moved -// to MoveTutorShowHideHearts, which is called whenever a new move is +// to MoveRelearnerShowHideHearts, which is called whenever a new move is // selected and whenever the display mode changes. static void ShowTeachMoveText(bool8 shouldDoNothingInstead) { @@ -844,57 +844,57 @@ static void CreateUISprites(void) { int i; - sMoveTutorStruct->moveDisplayArrowTask = 0xFF; - sMoveTutorStruct->moveListScrollArrowTask = 0xFF; + sMoveRelearnerStruct->moveDisplayArrowTask = 0xFF; + sMoveRelearnerStruct->moveListScrollArrowTask = 0xFF; AddScrollArrows(); // These are the appeal hearts. for (i = 0; i < 8; i++) { - sMoveTutorStruct->heartSpriteIds[i] = CreateSprite(&sConstestMoveHeartSprite, (i - (i / 4) * 4) * 8 + 104, (i / 4) * 8 + 36, 0); + sMoveRelearnerStruct->heartSpriteIds[i] = CreateSprite(&sConstestMoveHeartSprite, (i - (i / 4) * 4) * 8 + 104, (i / 4) * 8 + 36, 0); } // These are the jam harts. // The animation is used to toggle between full/empty heart sprites. for (i = 0; i < 8; i++) { - sMoveTutorStruct->heartSpriteIds[i + 8] = CreateSprite(&sConstestMoveHeartSprite, (i - (i / 4) * 4) * 8 + 104, (i / 4) * 8 + 52, 0); - StartSpriteAnim(&gSprites[sMoveTutorStruct->heartSpriteIds[i + 8]], 2); + sMoveRelearnerStruct->heartSpriteIds[i + 8] = CreateSprite(&sConstestMoveHeartSprite, (i - (i / 4) * 4) * 8 + 104, (i / 4) * 8 + 52, 0); + StartSpriteAnim(&gSprites[sMoveRelearnerStruct->heartSpriteIds[i + 8]], 2); } for (i = 0; i < 16; i++) { - gSprites[sMoveTutorStruct->heartSpriteIds[i]].invisible = TRUE; + gSprites[sMoveRelearnerStruct->heartSpriteIds[i]].invisible = TRUE; } } static void AddScrollArrows(void) { - if (sMoveTutorStruct->moveDisplayArrowTask == 0xFF) + if (sMoveRelearnerStruct->moveDisplayArrowTask == 0xFF) { - sMoveTutorStruct->moveDisplayArrowTask = AddScrollIndicatorArrowPair(&sDisplayModeArrowsTemplate, &sMoveTutorStruct->scrollOffset); + sMoveRelearnerStruct->moveDisplayArrowTask = AddScrollIndicatorArrowPair(&sDisplayModeArrowsTemplate, &sMoveRelearnerStruct->scrollOffset); } - if (sMoveTutorStruct->moveListScrollArrowTask == 0xFF) + if (sMoveRelearnerStruct->moveListScrollArrowTask == 0xFF) { gTempScrollArrowTemplate = sMoveListScrollArrowsTemplate; - gTempScrollArrowTemplate.fullyDownThreshold = sMoveTutorStruct->numMenuChoices - sMoveTutorStruct->numToShowAtOnce; - sMoveTutorStruct->moveListScrollArrowTask = AddScrollIndicatorArrowPair(&gTempScrollArrowTemplate, &sMoveTutorMenuSate.listOffset); + gTempScrollArrowTemplate.fullyDownThreshold = sMoveRelearnerStruct->numMenuChoices - sMoveRelearnerStruct->numToShowAtOnce; + sMoveRelearnerStruct->moveListScrollArrowTask = AddScrollIndicatorArrowPair(&gTempScrollArrowTemplate, &sMoveRelearnerMenuSate.listOffset); } } static void RemoveScrollArrows(void) { - if (sMoveTutorStruct->moveDisplayArrowTask != 0xFF) + if (sMoveRelearnerStruct->moveDisplayArrowTask != 0xFF) { - RemoveScrollIndicatorArrowPair(sMoveTutorStruct->moveDisplayArrowTask); - sMoveTutorStruct->moveDisplayArrowTask = 0xFF; + RemoveScrollIndicatorArrowPair(sMoveRelearnerStruct->moveDisplayArrowTask); + sMoveRelearnerStruct->moveDisplayArrowTask = 0xFF; } - if (sMoveTutorStruct->moveListScrollArrowTask != 0xFF) + if (sMoveRelearnerStruct->moveListScrollArrowTask != 0xFF) { - RemoveScrollIndicatorArrowPair(sMoveTutorStruct->moveListScrollArrowTask); - sMoveTutorStruct->moveListScrollArrowTask = 0xFF; + RemoveScrollIndicatorArrowPair(sMoveRelearnerStruct->moveListScrollArrowTask); + sMoveRelearnerStruct->moveListScrollArrowTask = 0xFF; } } @@ -903,32 +903,32 @@ static void CreateLearnableMovesList(void) s32 i; u8 nickname[POKEMON_NAME_LENGTH + 1]; - sMoveTutorStruct->numMenuChoices = GetMoveRelearnerMoves(&gPlayerParty[sMoveTutorStruct->partyMon], sMoveTutorStruct->movesToLearn); + sMoveRelearnerStruct->numMenuChoices = GetMoveRelearnerMoves(&gPlayerParty[sMoveRelearnerStruct->partyMon], sMoveRelearnerStruct->movesToLearn); - for (i = 0; i < sMoveTutorStruct->numMenuChoices; i++) + for (i = 0; i < sMoveRelearnerStruct->numMenuChoices; i++) { - sMoveTutorStruct->menuItems[i].name = gMoveNames[sMoveTutorStruct->movesToLearn[i]]; - sMoveTutorStruct->menuItems[i].id = sMoveTutorStruct->movesToLearn[i]; + sMoveRelearnerStruct->menuItems[i].name = gMoveNames[sMoveRelearnerStruct->movesToLearn[i]]; + sMoveRelearnerStruct->menuItems[i].id = sMoveRelearnerStruct->movesToLearn[i]; } - GetMonData(&gPlayerParty[sMoveTutorStruct->partyMon], MON_DATA_NICKNAME, nickname); + GetMonData(&gPlayerParty[sMoveRelearnerStruct->partyMon], MON_DATA_NICKNAME, nickname); StringCopy10(gStringVar1, nickname); - sMoveTutorStruct->menuItems[sMoveTutorStruct->numMenuChoices].name = gText_Cancel; - sMoveTutorStruct->menuItems[sMoveTutorStruct->numMenuChoices].id = LIST_CANCEL; - sMoveTutorStruct->numMenuChoices++; - sMoveTutorStruct->numToShowAtOnce = LoadMoveTutorMovesList(sMoveTutorStruct->menuItems, sMoveTutorStruct->numMenuChoices); + sMoveRelearnerStruct->menuItems[sMoveRelearnerStruct->numMenuChoices].name = gText_Cancel; + sMoveRelearnerStruct->menuItems[sMoveRelearnerStruct->numMenuChoices].id = LIST_CANCEL; + sMoveRelearnerStruct->numMenuChoices++; + sMoveRelearnerStruct->numToShowAtOnce = LoadMoveRelearnerMovesList(sMoveRelearnerStruct->menuItems, sMoveRelearnerStruct->numMenuChoices); } -void MoveTutorShowHideHearts(s32 moveId) +void MoveRelearnerShowHideHearts(s32 moveId) { u16 numHearts; u16 i; - if (!sMoveTutorMenuSate.showContestInfo || moveId == LIST_CANCEL) + if (!sMoveRelearnerMenuSate.showContestInfo || moveId == LIST_CANCEL) { for (i = 0; i < 16; i++) { - gSprites[sMoveTutorStruct->heartSpriteIds[i]].invisible = TRUE; + gSprites[sMoveRelearnerStruct->heartSpriteIds[i]].invisible = TRUE; } } else @@ -944,13 +944,13 @@ void MoveTutorShowHideHearts(s32 moveId) { if (i < numHearts) { - StartSpriteAnim(&gSprites[sMoveTutorStruct->heartSpriteIds[i]], 1); + StartSpriteAnim(&gSprites[sMoveRelearnerStruct->heartSpriteIds[i]], 1); } else { - StartSpriteAnim(&gSprites[sMoveTutorStruct->heartSpriteIds[i]], 0); + StartSpriteAnim(&gSprites[sMoveRelearnerStruct->heartSpriteIds[i]], 0); } - gSprites[sMoveTutorStruct->heartSpriteIds[i]].invisible = FALSE; + gSprites[sMoveRelearnerStruct->heartSpriteIds[i]].invisible = FALSE; } numHearts = (u8)(gContestEffects[gContestMoves[moveId].effect].jam / 10); @@ -964,13 +964,13 @@ void MoveTutorShowHideHearts(s32 moveId) { if (i < numHearts) { - StartSpriteAnim(&gSprites[sMoveTutorStruct->heartSpriteIds[i + 8]], 3); + StartSpriteAnim(&gSprites[sMoveRelearnerStruct->heartSpriteIds[i + 8]], 3); } else { - StartSpriteAnim(&gSprites[sMoveTutorStruct->heartSpriteIds[i + 8]], 2); + StartSpriteAnim(&gSprites[sMoveRelearnerStruct->heartSpriteIds[i + 8]], 2); } - gSprites[sMoveTutorStruct->heartSpriteIds[i + 8]].invisible = FALSE; + gSprites[sMoveRelearnerStruct->heartSpriteIds[i + 8]].invisible = FALSE; } } } diff --git a/src/strings.c b/src/strings.c index c2f476b585..bed8f4b682 100644 --- a/src/strings.c +++ b/src/strings.c @@ -1742,15 +1742,15 @@ const u8 gText_TrainerHill2F[] = _("2F"); const u8 gText_TrainerHill3F[] = _("3F"); const u8 gText_TrainerHill4F[] = _("4F"); const u8 gText_TeachWhichMoveToPkmn[] = _("Teach which move to {STR_VAR_1}?"); -const u8 gText_MoveTutorTeachMoveConfirm[] = _("Teach {STR_VAR_2}?"); -const u8 gText_MoveTutorPkmnLearnedMove[] = _("{STR_VAR_1} learned\n{STR_VAR_2}!"); -const u8 gText_MoveTutorPkmnTryingToLearnMove[] = _("{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can't learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?"); -const u8 gText_MoveTutorStopTryingToTeachMove[] = _("Stop trying to teach\n{STR_VAR_2}?"); -const u8 gText_MoveTutorAndPoof[] = _("{PAUSE 32}1, {PAUSE 15}2, and {PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p"); -const u8 gText_MoveTutorPkmnForgotMoveAndLearnedNew[] = _("{STR_VAR_1} forgot {STR_VAR_3}.\pAnd…\p{STR_VAR_1} learned {STR_VAR_2}."); +const u8 gText_MoveRelearnerTeachMoveConfirm[] = _("Teach {STR_VAR_2}?"); +const u8 gText_MoveRelearnerPkmnLearnedMove[] = _("{STR_VAR_1} learned\n{STR_VAR_2}!"); +const u8 gText_MoveRelearnerPkmnTryingToLearnMove[] = _("{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can't learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?"); +const u8 gText_MoveRelearnerStopTryingToTeachMove[] = _("Stop trying to teach\n{STR_VAR_2}?"); +const u8 gText_MoveRelearnerAndPoof[] = _("{PAUSE 32}1, {PAUSE 15}2, and {PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p"); +const u8 gText_MoveRelearnerPkmnForgotMoveAndLearnedNew[] = _("{STR_VAR_1} forgot {STR_VAR_3}.\pAnd…\p{STR_VAR_1} learned {STR_VAR_2}."); const u8 gUnknown_085EF9C8[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}."); -const u8 gText_MoveTutorGiveUp[] = _("Give up trying to teach a new\nmove to {STR_VAR_1}?"); -const u8 gText_MoveTutorWhichMoveToForget[] = _("Which move should be\nforgotten?\p"); +const u8 gText_MoveRelearnerGiveUp[] = _("Give up trying to teach a new\nmove to {STR_VAR_1}?"); +const u8 gText_MoveRelearnerWhichMoveToForget[] = _("Which move should be\nforgotten?\p"); const u8 gText_BattleMoves2[] = _("BATTLE MOVES"); const u8 gText_ContestMoves2[] = _("CONTEST MOVES"); const u8 gUnknown_085EFA4C[] = _("TYPE/"); diff --git a/sym_ewram.txt b/sym_ewram.txt index 85c81643e7..7702739dd9 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -192,7 +192,7 @@ gPlayerFacingPosition: @ 203AB40 .include "src/rom_81520A8.o" .include "src/save.o" .include "src/mystery_event_script.o" - .include "src/move_tutor.o" + .include "src/move_relearner.o" .include "src/decoration_inventory.o" .include "src/roamer.o" .include "src/battle_tower.o" From 907492fd6e724d8dc2e5d2eff372be85e6f0d30c Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 4 Mar 2019 23:26:51 -0500 Subject: [PATCH 177/217] Split rom asm file in half The first half is ui/menu stuff, while the second half is link-related stuff. --- asm/player_pc_ui.s | 3725 ++++++++++++++++++++++++++++++++++ asm/rom_81D1C44.s | 3718 --------------------------------- data/player_pc_ui.s | 196 ++ data/rom_81D1C44.s | 187 -- include/pokenav.h | 4 +- ld_script.txt | 2 + src/battle_script_commands.c | 14 +- src/party_menu.c | 4 +- 8 files changed, 3934 insertions(+), 3916 deletions(-) create mode 100644 asm/player_pc_ui.s create mode 100644 data/player_pc_ui.s diff --git a/asm/player_pc_ui.s b/asm/player_pc_ui.s new file mode 100644 index 0000000000..6b449e7045 --- /dev/null +++ b/asm/player_pc_ui.s @@ -0,0 +1,3725 @@ + + .include "asm/macros.inc" + .include "constants/constants.inc" + + .syntax unified + + .text + + thumb_func_start sub_81D1C44 +sub_81D1C44: @ 81D1C44 + push {r4,lr} + lsls r0, 24 + ldr r4, =gUnknown_0203CF4C + lsrs r0, 21 + adds r0, 0x8 + bl Alloc + str r0, [r4] + cmp r0, 0 + bne _081D1C60 + movs r0, 0 + b _081D1C7A + .pool +_081D1C60: + movs r2, 0 + ldr r4, =gUnknown_0203CF48 + movs r3, 0xFF +_081D1C66: + adds r0, r2, r4 + ldrb r1, [r0] + orrs r1, r3 + strb r1, [r0] + adds r0, r2, 0x1 + lsls r0, 24 + lsrs r2, r0, 24 + cmp r2, 0x2 + bls _081D1C66 + movs r0, 0x1 +_081D1C7A: + pop {r4} + pop {r1} + bx r1 + .pool + thumb_func_end sub_81D1C44 + + thumb_func_start sub_81D1C84 +sub_81D1C84: @ 81D1C84 + push {r4-r6,lr} + sub sp, 0x8 + lsls r0, 24 + lsrs r4, r0, 24 + ldr r6, =gUnknown_0203CF48 + adds r5, r4, r6 + ldrb r0, [r5] + cmp r0, 0xFF + bne _081D1CEC + cmp r4, 0x2 + bne _081D1CD4 + ldr r0, =gUnknown_086253E8 + ldr r1, [r0, 0x14] + ldr r0, [r0, 0x10] + str r0, [sp] + str r1, [sp, 0x4] + ldr r0, =gMailboxMailOptions + movs r1, 0x4 + bl GetMaxWidthInMenuTable + lsls r0, 24 + ldr r2, =0x00ffffff + ldr r1, [sp] + ands r1, r2 + orrs r1, r0 + str r1, [sp] + mov r0, sp + bl AddWindow + strb r0, [r6, 0x2] + b _081D1CE0 + .pool +_081D1CD4: + lsls r0, r4, 3 + ldr r1, =gUnknown_086253E8 + adds r0, r1 + bl AddWindow + strb r0, [r5] +_081D1CE0: + ldr r0, =gUnknown_0203CF48 + adds r0, r4, r0 + ldrb r0, [r0] + movs r1, 0 + bl SetStandardWindowBorderStyle +_081D1CEC: + ldr r0, =gUnknown_0203CF48 + adds r0, r4, r0 + ldrb r0, [r0] + add sp, 0x8 + pop {r4-r6} + pop {r1} + bx r1 + .pool + thumb_func_end sub_81D1C84 + + thumb_func_start sub_81D1D04 +sub_81D1D04: @ 81D1D04 + push {r4,lr} + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + ldr r0, =gUnknown_0203CF48 + adds r4, r0 + ldrb r0, [r4] + movs r1, 0 + bl sub_8198070 + ldrb r0, [r4] + bl ClearWindowTilemap + ldrb r0, [r4] + bl RemoveWindow + movs r0, 0xFF + strb r0, [r4] + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D1D04 + + thumb_func_start sub_81D1D34 +sub_81D1D34: @ 81D1D34 + lsls r0, 24 + lsrs r0, 24 + ldr r1, =gUnknown_0203CF48 + adds r0, r1 + ldrb r0, [r0] + bx lr + .pool + thumb_func_end sub_81D1D34 + + thumb_func_start sub_81D1D44 +sub_81D1D44: @ 81D1D44 + push {r4,r5,lr} + sub sp, 0x34 + adds r3, r1, 0 + lsls r0, 24 + lsrs r4, r0, 24 + lsls r2, 24 + lsrs r5, r2, 24 + movs r0, 0x2 + negs r0, r0 + cmp r3, r0 + beq _081D1DAC + ldr r0, =gSaveBlock1Ptr + lsls r1, r3, 3 + adds r1, r3 + lsls r1, 2 + ldr r0, [r0] + adds r1, r0 + ldr r0, =0x00002cca + adds r1, r0 + add r0, sp, 0x14 + bl StringCopy + add r0, sp, 0x14 + bl sub_81DB52C + add r0, sp, 0x14 + bl StringLength + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0x5 + bhi _081D1D8C + add r0, sp, 0x14 + movs r1, 0x1 + bl ConvertInternationalString +_081D1D8C: + movs r0, 0 + str r0, [sp] + str r0, [sp, 0x4] + ldr r0, =gUnknown_08625400 + str r0, [sp, 0x8] + movs r0, 0x1 + negs r0, r0 + str r0, [sp, 0xC] + add r0, sp, 0x14 + str r0, [sp, 0x10] + adds r0, r4, 0 + movs r1, 0x1 + movs r2, 0x8 + adds r3, r5, 0 + bl AddTextPrinterParameterized4 +_081D1DAC: + add sp, 0x34 + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D1D44 + + thumb_func_start sub_81D1DC0 +sub_81D1DC0: @ 81D1DC0 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + adds r5, r0, 0 + movs r3, 0 + ldr r7, =gUnknown_0203CF4C + ldr r0, =gText_Cancel2 + mov r12, r0 + ldr r4, =gMultiuseListMenuTemplate + ldr r1, =gUnknown_0203CF48 + mov r8, r1 + ldr r2, =sub_81D1E7C + mov r9, r2 + ldr r0, =sub_81D1D44 + mov r10, r0 + ldrb r1, [r5, 0x5] + cmp r3, r1 + bcs _081D1E02 + adds r6, r7, 0 + ldr r2, =gUnknown_08625403 +_081D1DEC: + ldr r1, [r6] + lsls r0, r3, 3 + adds r0, r1 + str r2, [r0] + str r3, [r0, 0x4] + adds r0, r3, 0x1 + lsls r0, 16 + lsrs r3, r0, 16 + ldrb r0, [r5, 0x5] + cmp r3, r0 + bcc _081D1DEC +_081D1E02: + ldr r2, [r7] + lsls r0, r3, 3 + adds r0, r2 + mov r1, r12 + str r1, [r0] + movs r1, 0x2 + negs r1, r1 + str r1, [r0, 0x4] + str r2, [r4] + ldrb r0, [r5, 0x5] + adds r0, 0x1 + movs r1, 0 + strh r0, [r4, 0xC] + mov r2, r8 + ldrb r0, [r2, 0x1] + strb r0, [r4, 0x10] + strb r1, [r4, 0x11] + movs r0, 0x8 + strb r0, [r4, 0x12] + strb r1, [r4, 0x13] + strh r0, [r4, 0xE] + movs r0, 0x29 + strb r0, [r4, 0x14] + movs r0, 0x31 + strb r0, [r4, 0x15] + mov r0, r9 + str r0, [r4, 0x4] + mov r1, r10 + str r1, [r4, 0x8] + movs r0, 0x1 + strb r0, [r4, 0x17] + movs r0, 0 + strb r0, [r4, 0x16] + ldrh r1, [r5, 0x2] + ldrh r2, [r5] + adds r0, r4, 0 + bl ListMenuInit + lsls r0, 24 + lsrs r0, 24 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r1} + bx r1 + .pool + thumb_func_end sub_81D1DC0 + + thumb_func_start sub_81D1E7C +sub_81D1E7C: @ 81D1E7C + push {lr} + lsls r1, 24 + lsrs r1, 24 + cmp r1, 0x1 + beq _081D1E8C + movs r0, 0x5 + bl PlaySE +_081D1E8C: + pop {r0} + bx r0 + thumb_func_end sub_81D1E7C + + thumb_func_start sub_81D1E90 +sub_81D1E90: @ 81D1E90 + push {r4,lr} + sub sp, 0x10 + adds r4, r0, 0 + ldrb r0, [r4, 0x5] + ldrb r1, [r4, 0x4] + subs r0, r1 + adds r0, 0x1 + str r0, [sp] + movs r0, 0x6E + str r0, [sp, 0x4] + str r0, [sp, 0x8] + adds r0, r4, 0x2 + str r0, [sp, 0xC] + movs r0, 0x2 + movs r1, 0xC8 + movs r2, 0xC + movs r3, 0x94 + bl AddScrollIndicatorArrowPairParameterized + strb r0, [r4, 0x9] + add sp, 0x10 + pop {r4} + pop {r0} + bx r0 + thumb_func_end sub_81D1E90 + + thumb_func_start sub_81D1EC0 +sub_81D1EC0: @ 81D1EC0 + push {lr} + ldr r0, =gUnknown_0203CF4C + ldr r0, [r0] + bl Free + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D1EC0 + thumb_func_start sub_81D1ED4 +sub_81D1ED4: @ 81D1ED4 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0x4 + adds r3, r0, 0 + movs r6, 0 + movs r7, 0 +_081D1EE6: + movs r2, 0 + lsls r5, r6, 2 + adds r0, r6, 0x1 + mov r10, r0 + adds r4, r5, 0 +_081D1EF0: + lsls r0, r2, 2 + adds r0, r2 + lsls r0, 2 + adds r0, r4, r0 + adds r0, r3, r0 + adds r1, r0, 0 + adds r1, 0x64 + strh r7, [r1] + adds r0, 0x66 + strh r7, [r0] + adds r0, r2, 0x1 + lsls r0, 24 + lsrs r2, r0, 24 + cmp r2, 0x9 + bls _081D1EF0 + movs r2, 0 + mov r9, r2 + str r5, [sp] + movs r1, 0x9B + mov r8, r1 + movs r4, 0x5B + mov r12, r4 +_081D1F1C: + lsls r0, r2, 2 + adds r0, r2 + adds r1, r6, r0 + adds r1, r3, r1 + mov r4, r9 + strb r4, [r1] + lsls r0, 2 + ldr r1, [sp] + adds r0, r1, r0 + adds r0, r3, r0 + mov r4, r8 + strh r4, [r0, 0x14] + mov r1, r12 + strh r1, [r0, 0x16] + adds r0, r2, 0x1 + lsls r0, 24 + lsrs r2, r0, 24 + cmp r2, 0x3 + bls _081D1F1C + adds r1, r3, r5 + movs r2, 0x96 + lsls r2, 1 + adds r0, r1, r2 + strh r7, [r0] + movs r4, 0x97 + lsls r4, 1 + adds r0, r1, r4 + strh r7, [r0] + mov r1, r10 + lsls r0, r1, 24 + lsrs r6, r0, 24 + cmp r6, 0x4 + bls _081D1EE6 + movs r2, 0xD5 + lsls r2, 2 + adds r0, r3, r2 + movs r1, 0 + strb r1, [r0] + ldr r4, =0x00000352 + adds r0, r3, r4 + strh r1, [r0] + add sp, 0x4 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D1ED4 + + thumb_func_start sub_81D1F84 +sub_81D1F84: @ 81D1F84 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0x8 + mov r8, r0 + str r1, [sp] + mov r9, r2 + movs r7, 0 +_081D1F98: + lsls r4, r7, 2 + ldr r1, [sp] + adds r0, r4, r1 + ldrh r1, [r0] + lsls r5, r1, 8 + mov r2, r9 + adds r0, r4, r2 + ldrh r0, [r0] + subs r0, r1 + lsls r0, 8 + movs r1, 0xA + bl __divsi3 + adds r6, r0, 0 + movs r3, 0 + adds r7, 0x1 + mov r10, r7 + mov r12, r4 +_081D1FBC: + lsls r0, r3, 2 + adds r0, r3 + lsls r0, 2 + add r0, r12 + add r0, r8 + asrs r2, r5, 8 + asrs r1, r5, 7 + movs r7, 0x1 + ands r1, r7 + adds r2, r1 + adds r0, 0x64 + strh r2, [r0] + adds r5, r6 + adds r0, r3, 0x1 + lsls r0, 16 + lsrs r3, r0, 16 + cmp r3, 0x8 + bls _081D1FBC + lsls r0, r3, 2 + adds r0, r3 + lsls r0, 2 + adds r0, r4, r0 + add r0, r8 + mov r1, r9 + adds r2, r4, r1 + ldrh r1, [r2] + adds r0, 0x64 + strh r1, [r0] + ldr r7, [sp] + adds r0, r4, r7 + ldrh r1, [r0, 0x2] + lsls r5, r1, 8 + ldrh r0, [r2, 0x2] + subs r0, r1 + lsls r0, 8 + movs r1, 0xA + bl __divsi3 + adds r6, r0, 0 + movs r3, 0 + str r4, [sp, 0x4] + movs r0, 0x1 + mov r12, r0 +_081D2012: + lsls r0, r3, 2 + adds r0, r3 + lsls r0, 2 + ldr r1, [sp, 0x4] + adds r0, r1, r0 + add r0, r8 + asrs r2, r5, 8 + asrs r1, r5, 7 + mov r7, r12 + ands r1, r7 + adds r2, r1 + adds r0, 0x66 + strh r2, [r0] + adds r5, r6 + adds r0, r3, 0x1 + lsls r0, 16 + lsrs r3, r0, 16 + cmp r3, 0x8 + bls _081D2012 + lsls r0, r3, 2 + adds r0, r3 + lsls r0, 2 + adds r0, r4, r0 + add r0, r8 + mov r2, r9 + adds r1, r4, r2 + ldrh r1, [r1, 0x2] + adds r0, 0x66 + strh r1, [r0] + mov r7, r10 + lsls r0, r7, 16 + lsrs r7, r0, 16 + cmp r7, 0x4 + bls _081D1F98 + ldr r1, =0x00000352 + add r1, r8 + movs r0, 0 + strh r0, [r1] + add sp, 0x8 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D1F84 + + thumb_func_start sub_81D2074 +sub_81D2074: @ 81D2074 + push {r4,lr} + adds r1, r0, 0 + ldr r0, =0x00000352 + adds r4, r1, r0 + ldrh r0, [r4] + cmp r0, 0x9 + bls _081D208C + movs r0, 0 + b _081D20A6 + .pool +_081D208C: + adds r0, r1, 0 + bl sub_81D2230 + ldrh r1, [r4] + adds r1, 0x1 + strh r1, [r4] + lsls r1, 16 + lsrs r1, 16 + movs r0, 0xA + eors r1, r0 + negs r0, r1 + orrs r0, r1 + lsrs r0, 31 +_081D20A6: + pop {r4} + pop {r1} + bx r1 + thumb_func_end sub_81D2074 + + thumb_func_start sub_81D20AC +sub_81D20AC: @ 81D20AC + ldr r1, =0x00000355 + adds r0, r1 + movs r1, 0 + strb r1, [r0] + bx lr + .pool + thumb_func_end sub_81D20AC + + thumb_func_start sub_81D20BC +sub_81D20BC: @ 81D20BC + push {r4,r5,lr} + sub sp, 0xC + ldr r1, =0x00000355 + adds r4, r0, r1 + ldrb r0, [r4] + cmp r0, 0 + beq _081D20D4 + cmp r0, 0x1 + beq _081D20E2 + b _081D20FA + .pool +_081D20D4: + bl ScanlineEffect_Clear + ldrb r0, [r4] + adds r0, 0x1 + strb r0, [r4] + movs r0, 0x1 + b _081D20FC +_081D20E2: + mov r0, sp + ldr r1, =gUnknown_08625404 + ldm r1!, {r2,r3,r5} + stm r0!, {r2,r3,r5} + ldr r0, [sp] + ldr r1, [sp, 0x4] + ldr r2, [sp, 0x8] + bl ScanlineEffect_SetParams + ldrb r0, [r4] + adds r0, 0x1 + strb r0, [r4] +_081D20FA: + movs r0, 0 +_081D20FC: + add sp, 0xC + pop {r4,r5} + pop {r1} + bx r1 + .pool + thumb_func_end sub_81D20BC + + thumb_func_start sub_81D2108 +sub_81D2108: @ 81D2108 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0x10 + adds r6, r0, 0 + movs r1, 0xD5 + lsls r1, 2 + adds r0, r6, r1 + ldrb r0, [r0] + cmp r0, 0 + beq _081D21BE + adds r0, r6, 0 + bl sub_81D24A4 + adds r0, r6, 0 + bl sub_81D2634 + movs r7, 0 + ldr r5, =gScanlineEffectRegBuffers + mov r12, r5 + movs r0, 0xF0 + lsls r0, 3 + add r0, r12 + mov r9, r0 + movs r1, 0xA0 + lsls r1, 1 + adds r1, r6, r1 + str r1, [sp] + ldr r5, =0x0000ffff + mov r8, r5 + movs r0, 0xA1 + lsls r0, 1 + adds r0, r6, r0 + str r0, [sp, 0x4] + movs r1, 0x92 + lsls r1, 2 + adds r1, r6, r1 + str r1, [sp, 0x8] + ldr r5, =0x0000024a + adds r5, r6 + mov r10, r5 +_081D215E: + adds r2, r7, 0 + adds r2, 0x37 + lsls r3, r2, 2 + mov r0, r9 + adds r0, r3, r0 + str r0, [sp, 0xC] + add r3, r12 + lsls r4, r7, 2 + ldr r1, [sp] + adds r0, r1, r4 + ldrh r0, [r0] + lsls r0, 8 + ldr r5, [sp, 0x4] + adds r1, r5, r4 + ldrh r1, [r1] + orrs r0, r1 + strh r0, [r3] + mov r1, r8 + ands r0, r1 + ldr r5, [sp, 0xC] + strh r0, [r5] + lsls r2, 1 + adds r2, 0x1 + lsls r2, 1 + mov r0, r9 + adds r3, r2, r0 + add r2, r12 + ldr r1, [sp, 0x8] + adds r0, r1, r4 + ldrh r0, [r0] + lsls r0, 8 + add r4, r10 + ldrh r1, [r4] + orrs r0, r1 + strh r0, [r2] + mov r5, r8 + ands r0, r5 + strh r0, [r3] + adds r0, r7, 0x1 + lsls r0, 16 + lsrs r7, r0, 16 + cmp r7, 0x41 + bls _081D215E + movs r0, 0xD5 + lsls r0, 2 + adds r1, r6, r0 + movs r0, 0 + strb r0, [r1] +_081D21BE: + add sp, 0x10 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D2108 + + thumb_func_start sub_81D21DC +sub_81D21DC: @ 81D21DC + push {r4,r5,lr} + lsls r0, 24 + lsrs r1, r0, 24 + cmp r1, 0x3 + bls _081D21E8 + movs r1, 0 +_081D21E8: + movs r0, 0x1 + lsls r0, r1 + movs r5, 0x1F + bics r5, r0 + movs r0, 0x40 + movs r1, 0xF0 + bl SetGpuReg + movs r0, 0x42 + movs r1, 0x9B + bl SetGpuReg + ldr r4, =0x00003879 + movs r0, 0x44 + adds r1, r4, 0 + bl SetGpuReg + movs r0, 0x46 + adds r1, r4, 0 + bl SetGpuReg + ldr r1, =0x00003f3f + movs r0, 0x48 + bl SetGpuReg + movs r0, 0x4A + adds r1, r5, 0 + bl SetGpuReg + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D21DC + + thumb_func_start sub_81D2230 +sub_81D2230: @ 81D2230 + push {r4-r7,lr} + mov r12, r0 + movs r4, 0 + movs r7, 0x96 + lsls r7, 1 + add r7, r12 + ldr r6, =0x00000352 + add r6, r12 + mov r5, r12 + adds r5, 0x64 +_081D2244: + lsls r2, r4, 2 + adds r3, r7, r2 + ldrh r1, [r6] + lsls r0, r1, 2 + adds r0, r1 + lsls r0, 2 + adds r2, r0 + adds r2, r5, r2 + ldr r0, [r2] + str r0, [r3] + adds r0, r4, 0x1 + lsls r0, 16 + lsrs r4, r0, 16 + cmp r4, 0x4 + bls _081D2244 + movs r1, 0xD5 + lsls r1, 2 + add r1, r12 + movs r0, 0x1 + strb r0, [r1] + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D2230 + + thumb_func_start sub_81D2278 +sub_81D2278: @ 81D2278 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0x18 + str r0, [sp] + adds r6, r1, 0 + adds r5, r2, 0 + str r3, [sp, 0x4] + ldr r0, [sp, 0x38] + ldr r7, [sp, 0x3C] + lsls r0, 24 + lsrs r0, 24 + mov r9, r0 + movs r0, 0 + str r0, [sp, 0xC] + ldrh r0, [r5, 0x2] + ldrh r1, [r3, 0x2] + cmp r0, r1 + bcs _081D22B2 + adds r2, r0, 0 + mov r10, r2 + ldrh r0, [r3, 0x2] + ldrh r1, [r5] + lsls r4, r1, 10 + ldrh r3, [r3] + str r3, [sp, 0x8] + b _081D22C6 +_081D22B2: + ldrh r0, [r5, 0x2] + ldr r1, [sp, 0x4] + ldrh r1, [r1, 0x2] + mov r10, r1 + ldr r2, [sp, 0x4] + ldrh r1, [r2] + lsls r4, r1, 10 + ldrh r3, [r5] + str r3, [sp, 0x8] + mov r2, r10 +_081D22C6: + subs r0, r2 + lsls r0, 16 + lsrs r0, 16 + mov r8, r0 + cmp r0, 0 + beq _081D22DE + subs r0, r3, r1 + lsls r0, 10 + mov r1, r8 + bl __divsi3 + str r0, [sp, 0xC] +_081D22DE: + mov r0, r8 + adds r0, 0x1 + lsls r0, 16 + lsrs r0, 16 + mov r8, r0 + cmp r7, 0 + bne _081D2328 + mov r0, r10 + subs r0, 0x38 + lsls r0, 2 + adds r6, r0 + movs r5, 0 + mov r3, r9 + lsls r3, 1 + mov r12, r3 + ldr r0, [sp, 0x8] + add r0, r9 + str r0, [sp, 0x10] + cmp r7, r8 + bcs _081D23B6 + movs r7, 0x1 +_081D2308: + adds r2, r3, r6 + asrs r1, r4, 10 + asrs r0, r4, 9 + ands r0, r7 + adds r1, r0 + add r1, r9 + strh r1, [r2] + ldr r1, [sp, 0xC] + adds r4, r1 + adds r6, 0x4 + adds r0, r5, 0x1 + lsls r0, 16 + lsrs r5, r0, 16 + cmp r5, r8 + bcc _081D2308 + b _081D23B6 +_081D2328: + ldr r2, [sp, 0xC] + cmp r2, 0 + ble _081D23C0 + mov r0, r10 + subs r0, 0x38 + lsls r0, 2 + adds r7, r0 + movs r5, 0 + mov r3, r9 + lsls r3, 1 + mov r12, r3 + ldr r0, [sp, 0x8] + add r0, r9 + str r0, [sp, 0x10] + cmp r5, r8 + bcs _081D237A + ldr r0, =0x00026bff + cmp r4, r0 + bgt _081D237A + mov r1, r12 + str r1, [sp, 0x14] +_081D2352: + ldr r3, [sp, 0x14] + adds r2, r3, r7 + asrs r1, r4, 10 + asrs r0, r4, 9 + movs r3, 0x1 + ands r0, r3 + adds r1, r0 + add r1, r9 + strh r1, [r2] + ldr r0, [sp, 0xC] + adds r4, r0 + adds r7, 0x4 + adds r0, r5, 0x1 + lsls r0, 16 + lsrs r5, r0, 16 + cmp r5, r8 + bcs _081D237A + ldr r1, =0x00026bff + cmp r4, r1 + ble _081D2352 +_081D237A: + mov r2, r10 + adds r1, r2, r5 + ldr r3, [sp] + movs r2, 0xD4 + lsls r2, 2 + adds r0, r3, r2 + strh r1, [r0] + ldrh r0, [r0] + subs r0, 0x38 + lsls r0, 2 + adds r6, r0 + cmp r5, r8 + bcs _081D23B6 + mov r3, r12 + movs r7, 0x1 +_081D2398: + adds r2, r3, r6 + asrs r1, r4, 10 + asrs r0, r4, 9 + ands r0, r7 + adds r1, r0 + add r1, r9 + strh r1, [r2] + ldr r0, [sp, 0xC] + adds r4, r0 + adds r6, 0x4 + adds r0, r5, 0x1 + lsls r0, 16 + lsrs r5, r0, 16 + cmp r5, r8 + bcc _081D2398 +_081D23B6: + subs r0, r6, 0x4 + b _081D248C + .pool +_081D23C0: + ldr r1, [sp, 0xC] + cmp r1, 0 + bge _081D2464 + mov r0, r10 + subs r0, 0x38 + lsls r0, 2 + adds r6, r0 + movs r5, 0 + mov r2, r9 + lsls r2, 1 + mov r12, r2 + ldr r3, [sp, 0x8] + add r3, r9 + str r3, [sp, 0x10] + cmp r5, r8 + bcs _081D241E + adds r3, r2, r6 + asrs r1, r4, 10 + asrs r0, r4, 9 + movs r2, 0x1 + ands r0, r2 + adds r1, r0 + add r1, r9 + strh r1, [r3] + b _081D2414 +_081D23F2: + ldr r0, [sp, 0xC] + adds r4, r0 + adds r6, 0x4 + adds r0, r5, 0x1 + lsls r0, 16 + lsrs r5, r0, 16 + cmp r5, r8 + bcs _081D241E + mov r1, r12 + adds r3, r1, r6 + asrs r2, r4, 10 + asrs r0, r4, 9 + movs r1, 0x1 + ands r0, r1 + adds r2, r0 + add r2, r9 + strh r2, [r3] +_081D2414: + ldr r0, =0x00026bff + cmp r4, r0 + bgt _081D23F2 + movs r0, 0x9B + strh r0, [r3] +_081D241E: + mov r2, r10 + adds r1, r2, r5 + ldr r3, [sp] + movs r2, 0xD4 + lsls r2, 2 + adds r0, r3, r2 + strh r1, [r0] + ldrh r0, [r0] + subs r0, 0x38 + lsls r0, 2 + adds r7, r0 + cmp r5, r8 + bcs _081D245A + mov r3, r12 + movs r6, 0x1 +_081D243C: + adds r2, r3, r7 + asrs r1, r4, 10 + asrs r0, r4, 9 + ands r0, r6 + adds r1, r0 + add r1, r9 + strh r1, [r2] + ldr r0, [sp, 0xC] + adds r4, r0 + adds r7, 0x4 + adds r0, r5, 0x1 + lsls r0, 16 + lsrs r5, r0, 16 + cmp r5, r8 + bcc _081D243C +_081D245A: + subs r0, r7, 0x4 + b _081D248C + .pool +_081D2464: + ldr r1, [sp] + movs r2, 0xD4 + lsls r2, 2 + adds r0, r1, r2 + mov r3, r10 + strh r3, [r0] + mov r0, r10 + subs r0, 0x38 + lsls r0, 2 + adds r6, r0 + adds r7, r0 + ldrh r0, [r5] + adds r0, 0x1 + strh r0, [r6, 0x2] + ldr r1, [sp, 0x4] + ldrh r0, [r1] + strh r0, [r7] + movs r0, 0x9B + strh r0, [r7, 0x2] + b _081D2494 +_081D248C: + add r0, r12 + mov r2, sp + ldrh r2, [r2, 0x10] + strh r2, [r0] +_081D2494: + add sp, 0x18 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + thumb_func_end sub_81D2278 + + thumb_func_start sub_81D24A4 +sub_81D24A4: @ 81D24A4 + push {r4-r7,lr} + sub sp, 0x8 + adds r4, r0, 0 + movs r0, 0x97 + lsls r0, 1 + adds r2, r4, r0 + movs r3, 0x99 + lsls r3, 1 + adds r1, r4, r3 + ldrh r0, [r2] + ldrh r3, [r1] + cmp r0, r3 + bcs _081D24E0 + adds r7, r0, 0 + movs r0, 0xA0 + lsls r0, 1 + adds r1, r4, r0 + movs r3, 0x96 + lsls r3, 1 + adds r2, r4, r3 + subs r0, 0x10 + adds r3, r4, r0 + movs r0, 0x1 + str r0, [sp] + movs r0, 0 + str r0, [sp, 0x4] + adds r0, r4, 0 + bl sub_81D2278 + b _081D2500 +_081D24E0: + ldrh r7, [r1] + movs r2, 0xA0 + lsls r2, 1 + adds r1, r4, r2 + movs r3, 0x98 + lsls r3, 1 + adds r2, r4, r3 + movs r0, 0x96 + lsls r0, 1 + adds r3, r4, r0 + movs r0, 0 + str r0, [sp] + str r0, [sp, 0x4] + adds r0, r4, 0 + bl sub_81D2278 +_081D2500: + movs r1, 0xA0 + lsls r1, 1 + adds r5, r4, r1 + movs r3, 0x98 + lsls r3, 1 + adds r2, r4, r3 + movs r0, 0x9A + lsls r0, 1 + adds r6, r4, r0 + movs r0, 0x1 + str r0, [sp] + movs r0, 0 + str r0, [sp, 0x4] + adds r0, r4, 0 + adds r1, r5, 0 + adds r3, r6, 0 + bl sub_81D2278 + movs r2, 0 + movs r1, 0x9B + lsls r1, 1 + adds r0, r4, r1 + movs r3, 0x9D + lsls r3, 1 + adds r1, r4, r3 + ldrh r0, [r0] + ldrh r1, [r1] + cmp r0, r1 + bhi _081D253C + movs r2, 0x1 +_081D253C: + movs r0, 0x9C + lsls r0, 1 + adds r3, r4, r0 + str r2, [sp] + movs r1, 0x92 + lsls r1, 2 + adds r0, r4, r1 + str r0, [sp, 0x4] + adds r0, r4, 0 + adds r1, r5, 0 + adds r2, r6, 0 + bl sub_81D2278 + movs r2, 0x38 + cmp r2, r7 + bcs _081D257E + adds r6, r5, 0 + movs r3, 0 + movs r0, 0xA1 + lsls r0, 1 + adds r5, r4, r0 +_081D2566: + adds r0, r2, 0 + subs r0, 0x38 + lsls r0, 2 + adds r1, r6, r0 + strh r3, [r1] + adds r0, r5, r0 + strh r3, [r0] + adds r0, r2, 0x1 + lsls r0, 16 + lsrs r2, r0, 16 + cmp r2, r7 + bcc _081D2566 +_081D257E: + movs r1, 0x97 + lsls r1, 1 + adds r0, r4, r1 + ldrh r2, [r0] + movs r3, 0xD4 + lsls r3, 2 + adds r0, r4, r3 + ldrh r1, [r0] + cmp r2, r1 + bhi _081D25B2 + movs r1, 0xA0 + lsls r1, 1 + adds r3, r4, r1 + movs r5, 0x9B + adds r1, r0, 0 +_081D259C: + adds r0, r2, 0 + subs r0, 0x38 + lsls r0, 2 + adds r0, r3, r0 + strh r5, [r0] + adds r0, r2, 0x1 + lsls r0, 16 + lsrs r2, r0, 16 + ldrh r0, [r1] + cmp r2, r0 + bls _081D259C +_081D25B2: + movs r2, 0x9B + lsls r2, 1 + adds r1, r4, r2 + movs r3, 0xD4 + lsls r3, 2 + adds r0, r4, r3 + ldrh r0, [r0] + ldrh r1, [r1] + cmp r0, r1 + bcs _081D25C8 + adds r0, r1, 0 +_081D25C8: + adds r0, 0x1 + lsls r0, 16 + lsrs r2, r0, 16 + cmp r2, 0x79 + bhi _081D25F8 + movs r0, 0xA0 + lsls r0, 1 + adds r6, r4, r0 + movs r3, 0 + movs r1, 0xA1 + lsls r1, 1 + adds r5, r4, r1 +_081D25E0: + adds r0, r2, 0 + subs r0, 0x38 + lsls r0, 2 + adds r1, r6, r0 + strh r3, [r1] + adds r0, r5, r0 + strh r3, [r0] + adds r0, r2, 0x1 + lsls r0, 16 + lsrs r2, r0, 16 + cmp r2, 0x79 + bls _081D25E0 +_081D25F8: + movs r2, 0x38 + movs r3, 0xA0 + lsls r3, 1 + adds r5, r4, r3 + movs r0, 0xA1 + lsls r0, 1 + adds r4, r0 + movs r6, 0x9B +_081D2608: + adds r0, r2, 0 + subs r0, 0x38 + lsls r1, r0, 2 + adds r3, r5, r1 + ldrh r0, [r3] + cmp r0, 0 + bne _081D2620 + adds r0, r4, r1 + ldrh r0, [r0] + cmp r0, 0 + beq _081D2620 + strh r6, [r3] +_081D2620: + adds r0, r2, 0x1 + lsls r0, 16 + lsrs r2, r0, 16 + cmp r2, 0x79 + bls _081D2608 + add sp, 0x8 + pop {r4-r7} + pop {r0} + bx r0 + thumb_func_end sub_81D24A4 + + thumb_func_start sub_81D2634 +sub_81D2634: @ 81D2634 + push {r4-r6,lr} + sub sp, 0x8 + adds r4, r0, 0 + movs r0, 0x97 + lsls r0, 1 + adds r2, r4, r0 + movs r3, 0x9F + lsls r3, 1 + adds r1, r4, r3 + ldrh r0, [r2] + ldrh r5, [r1] + cmp r0, r5 + bcs _081D266E + adds r6, r0, 0 + movs r0, 0x92 + lsls r0, 2 + adds r1, r4, r0 + subs r3, 0x12 + adds r2, r4, r3 + movs r5, 0x9E + lsls r5, 1 + adds r3, r4, r5 + movs r0, 0 + str r0, [sp] + str r0, [sp, 0x4] + adds r0, r4, 0 + bl sub_81D2278 + b _081D2690 +_081D266E: + ldrh r6, [r1] + movs r0, 0x92 + lsls r0, 2 + adds r1, r4, r0 + movs r3, 0x9E + lsls r3, 1 + adds r2, r4, r3 + movs r5, 0x96 + lsls r5, 1 + adds r3, r4, r5 + movs r0, 0x1 + str r0, [sp] + movs r0, 0 + str r0, [sp, 0x4] + adds r0, r4, 0 + bl sub_81D2278 +_081D2690: + movs r0, 0x92 + lsls r0, 2 + adds r5, r4, r0 + movs r1, 0x9E + lsls r1, 1 + adds r2, r4, r1 + movs r0, 0x9C + lsls r0, 1 + adds r3, r4, r0 + movs r0, 0 + str r0, [sp] + str r0, [sp, 0x4] + adds r0, r4, 0 + adds r1, r5, 0 + bl sub_81D2278 + cmp r6, 0x38 + ble _081D26C8 + movs r0, 0 + adds r1, r5, 0 + adds r2, r6, 0 + subs r2, 0x38 +_081D26BC: + strh r0, [r1] + strh r0, [r1, 0x2] + adds r1, 0x4 + subs r2, 0x1 + cmp r2, 0 + bne _081D26BC +_081D26C8: + movs r1, 0x97 + lsls r1, 1 + adds r0, r4, r1 + ldrh r2, [r0] + movs r3, 0xD4 + lsls r3, 2 + adds r0, r4, r3 + ldrh r5, [r0] + cmp r2, r5 + bgt _081D26F6 + movs r3, 0x9B + adds r1, r0, 0 + lsls r0, r2, 2 + movs r5, 0xB5 + lsls r5, 1 + adds r0, r5 + adds r0, r4 +_081D26EA: + strh r3, [r0] + adds r0, 0x4 + adds r2, 0x1 + ldrh r5, [r1] + cmp r2, r5 + ble _081D26EA +_081D26F6: + movs r1, 0x9D + lsls r1, 1 + adds r0, r4, r1 + ldrh r0, [r0] + adds r1, r0, 0x1 + movs r2, 0xD4 + lsls r2, 2 + adds r0, r4, r2 + ldrh r0, [r0] + cmp r0, r1 + bge _081D270E + adds r0, r1, 0 +_081D270E: + adds r2, r0, 0 + cmp r2, 0x79 + bgt _081D272C + movs r1, 0 + lsls r0, r2, 2 + movs r3, 0xB4 + lsls r3, 1 + adds r0, r3 + adds r0, r4 +_081D2720: + strh r1, [r0] + strh r1, [r0, 0x2] + adds r0, 0x4 + adds r2, 0x1 + cmp r2, 0x79 + ble _081D2720 +_081D272C: + movs r3, 0 + movs r5, 0x92 + lsls r5, 2 + adds r1, r4, r5 + movs r2, 0x41 +_081D2736: + ldrh r0, [r1] + ldrh r4, [r1, 0x2] + cmp r0, r4 + bcc _081D2742 + strh r3, [r1, 0x2] + strh r3, [r1] +_081D2742: + adds r1, 0x4 + subs r2, 0x1 + cmp r2, 0 + bge _081D2736 + add sp, 0x8 + pop {r4-r6} + pop {r0} + bx r0 + thumb_func_end sub_81D2634 + + thumb_func_start sub_81D2754 +sub_81D2754: @ 81D2754 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + adds r6, r0, 0 + mov r8, r1 + ldr r1, =gUnknown_08625410 + ldrb r0, [r6] + adds r0, r1 + ldrb r2, [r0] + adds r6, 0x1 + movs r0, 0x9B + mov r3, r8 + strh r0, [r3] + movs r0, 0x5B + subs r0, r2 + strh r0, [r3, 0x2] + movs r7, 0x40 + movs r0, 0 + mov r12, r0 + movs r2, 0x1 + mov r9, r2 + ldr r3, =gSineTable + mov r10, r3 +_081D2786: + adds r0, r7, 0 + adds r0, 0x33 + lsls r0, 24 + lsrs r7, r0, 24 + mov r1, r12 + lsls r0, r1, 24 + movs r2, 0xFF + lsls r2, 24 + adds r0, r2 + lsrs r3, r0, 24 + mov r12, r3 + cmp r0, 0 + bge _081D27A4 + movs r0, 0x4 + mov r12, r0 +_081D27A4: + mov r1, r12 + lsls r0, r1, 24 + asrs r4, r0, 24 + cmp r4, 0x2 + bne _081D27B4 + adds r0, r7, 0x1 + lsls r0, 24 + lsrs r7, r0, 24 +_081D27B4: + ldrb r0, [r6] + ldr r2, =gUnknown_08625410 + adds r0, r2 + ldrb r2, [r0] + adds r6, 0x1 + lsls r0, r4, 2 + mov r1, r8 + adds r3, r0, r1 + adds r0, r7, 0 + adds r0, 0x40 + lsls r0, 1 + add r0, r10 + movs r1, 0 + ldrsh r0, [r0, r1] + muls r0, r2 + asrs r5, r0, 8 + adds r0, r5, 0 + adds r0, 0x9B + strh r0, [r3] + lsls r0, r7, 1 + add r0, r10 + movs r1, 0 + ldrsh r0, [r0, r1] + adds r1, r2, 0 + muls r1, r0 + asrs r1, 8 + movs r0, 0x5B + subs r0, r1 + strh r0, [r3, 0x2] + cmp r4, 0x2 + bgt _081D2800 + cmp r2, 0x20 + bne _081D27FA + cmp r4, 0x2 + beq _081D2800 +_081D27FA: + adds r0, r5, 0 + adds r0, 0x9C + strh r0, [r3] +_081D2800: + mov r0, r9 + adds r0, 0x1 + lsls r0, 16 + lsrs r0, 16 + mov r9, r0 + cmp r0, 0x4 + bls _081D2786 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D2754 + + thumb_func_start InitMoveRelearnerWindows +InitMoveRelearnerWindows: @ 81D2824 + push {r4,r5,lr} + lsls r0, 24 + lsrs r5, r0, 24 + ldr r0, =gMoveRelearnerWindowTemplates + bl InitWindows + bl DeactivateAllTextPrinters + movs r0, 0 + movs r1, 0x1 + movs r2, 0xE0 + bl LoadUserWindowBorderGfx + ldr r0, =gUnknown_0860F074 + movs r1, 0xF0 + movs r2, 0x20 + bl LoadPalette + movs r4, 0 +_081D284A: + adds r0, r4, 0 + movs r1, 0x11 + bl FillWindowPixelBuffer + adds r0, r4, 0x1 + lsls r0, 24 + lsrs r4, r0, 24 + cmp r4, 0x4 + bls _081D284A + cmp r5, 0 + bne _081D287C + movs r0, 0 + bl PutWindowTilemap + movs r0, 0 + movs r1, 0 + movs r2, 0x1 + movs r3, 0xE + bl SetWindowBorderStyle + b _081D288E + .pool +_081D287C: + movs r0, 0x1 + bl PutWindowTilemap + movs r0, 0x1 + movs r1, 0 + movs r2, 0x1 + movs r3, 0xE + bl SetWindowBorderStyle +_081D288E: + movs r0, 0x2 + bl PutWindowTilemap + movs r0, 0x3 + bl PutWindowTilemap + movs r0, 0x2 + movs r1, 0 + movs r2, 0x1 + movs r3, 0xE + bl SetWindowBorderStyle + movs r0, 0x3 + movs r1, 0 + movs r2, 0x1 + movs r3, 0xE + bl SetWindowBorderStyle + bl nullsub_79 + movs r0, 0x1 + bl schedule_bg_copy_tilemap_to_vram + pop {r4,r5} + pop {r0} + bx r0 + thumb_func_end InitMoveRelearnerWindows + + thumb_func_start nullsub_79 +nullsub_79: @ 81D28C4 + bx lr + thumb_func_end nullsub_79 + + thumb_func_start LoadMoveRelearnerMovesList +LoadMoveRelearnerMovesList: @ 81D28C8 + push {r4-r7,lr} + lsls r1, 16 + lsrs r4, r1, 16 + ldr r3, =gMultiuseListMenuTemplate + adds r2, r3, 0 + ldr r1, =gMoveRelearnerMovesListTemplate + ldm r1!, {r5-r7} + stm r2!, {r5-r7} + ldm r1!, {r5-r7} + stm r2!, {r5-r7} + strh r4, [r3, 0xC] + str r0, [r3] + cmp r4, 0x5 + bhi _081D28F0 + strh r4, [r3, 0xE] + b _081D28F4 + .pool +_081D28F0: + movs r0, 0x6 + strh r0, [r3, 0xE] +_081D28F4: + ldrb r0, [r3, 0xE] + pop {r4-r7} + pop {r1} + bx r1 + thumb_func_end LoadMoveRelearnerMovesList + + thumb_func_start MoveRelearnerLoadBattleMoveDescription +MoveRelearnerLoadBattleMoveDescription: @ 81D28FC + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0x2C + mov r9, r0 + movs r0, 0 + movs r1, 0x11 + bl FillWindowPixelBuffer + ldr r5, =gText_BattleMoves2 + movs r0, 0x1 + adds r1, r5, 0 + movs r2, 0x80 + bl GetStringCenterAlignXOffset + adds r4, r0, 0 + lsls r3, r4, 24 + lsrs r3, 24 + movs r0, 0x1 + str r0, [sp] + movs r0, 0xFF + mov r8, r0 + str r0, [sp, 0x4] + movs r7, 0 + str r7, [sp, 0x8] + movs r0, 0 + movs r1, 0x1 + adds r2, r5, 0 + bl AddTextPrinterParameterized + ldr r5, =gText_PPSlash + movs r1, 0x29 + mov r10, r1 + str r1, [sp] + mov r0, r8 + str r0, [sp, 0x4] + str r7, [sp, 0x8] + movs r0, 0 + movs r1, 0x1 + adds r2, r5, 0 + movs r3, 0x4 + bl AddTextPrinterParameterized + ldr r5, =gText_PowerSlash + movs r0, 0x1 + adds r1, r5, 0 + movs r2, 0x6A + bl GetStringRightAlignXOffset + adds r4, r0, 0 + lsls r3, r4, 24 + lsrs r3, 24 + movs r1, 0x19 + str r1, [sp] + mov r0, r8 + str r0, [sp, 0x4] + str r7, [sp, 0x8] + movs r0, 0 + movs r1, 0x1 + adds r2, r5, 0 + bl AddTextPrinterParameterized + ldr r5, =gText_AccuracySlash + movs r0, 0x1 + adds r1, r5, 0 + movs r2, 0x6A + bl GetStringRightAlignXOffset + adds r4, r0, 0 + lsls r3, r4, 24 + lsrs r3, 24 + mov r1, r10 + str r1, [sp] + mov r0, r8 + str r0, [sp, 0x4] + str r7, [sp, 0x8] + movs r0, 0 + movs r1, 0x1 + adds r2, r5, 0 + bl AddTextPrinterParameterized + movs r0, 0x2 + negs r0, r0 + cmp r9, r0 + bne _081D29C4 + movs r0, 0 + movs r1, 0x2 + bl CopyWindowToVram + b _081D2AB6 + .pool +_081D29C4: + mov r1, r9 + lsls r0, r1, 1 + add r0, r9 + lsls r0, 2 + ldr r1, =gBattleMoves + adds r6, r0, r1 + ldrb r1, [r6, 0x2] + lsls r0, r1, 3 + subs r0, r1 + ldr r1, =gTypeNames + adds r5, r0, r1 + movs r0, 0x19 + str r0, [sp] + mov r1, r8 + str r1, [sp, 0x4] + str r7, [sp, 0x8] + movs r0, 0 + movs r1, 0x1 + adds r2, r5, 0 + movs r3, 0x4 + bl AddTextPrinterParameterized + ldr r1, =gText_PPSlash + movs r0, 0x1 + movs r2, 0 + bl GetStringWidth + adds r4, r0, 0x4 + ldrb r1, [r6, 0x4] + add r0, sp, 0xC + movs r2, 0 + movs r3, 0x2 + bl ConvertIntToDecimalStringN + lsls r3, r4, 24 + lsrs r3, 24 + mov r0, r10 + str r0, [sp] + mov r1, r8 + str r1, [sp, 0x4] + str r7, [sp, 0x8] + movs r0, 0 + movs r1, 0x1 + add r2, sp, 0xC + bl AddTextPrinterParameterized + ldrb r0, [r6, 0x1] + cmp r0, 0x1 + bhi _081D2A3C + ldr r5, =gText_ThreeDashes + b _081D2A4A + .pool +_081D2A3C: + ldrb r1, [r6, 0x1] + add r0, sp, 0xC + movs r2, 0 + movs r3, 0x3 + bl ConvertIntToDecimalStringN + add r5, sp, 0xC +_081D2A4A: + movs r0, 0x19 + str r0, [sp] + movs r0, 0xFF + str r0, [sp, 0x4] + movs r0, 0 + str r0, [sp, 0x8] + movs r1, 0x1 + adds r2, r5, 0 + movs r3, 0x6A + bl AddTextPrinterParameterized + ldrb r0, [r6, 0x3] + cmp r0, 0 + bne _081D2A70 + ldr r5, =gText_ThreeDashes + b _081D2A7E + .pool +_081D2A70: + ldrb r1, [r6, 0x3] + add r0, sp, 0xC + movs r2, 0 + movs r3, 0x3 + bl ConvertIntToDecimalStringN + add r5, sp, 0xC +_081D2A7E: + movs r0, 0x29 + str r0, [sp] + movs r0, 0xFF + str r0, [sp, 0x4] + movs r4, 0 + str r4, [sp, 0x8] + movs r0, 0 + movs r1, 0x1 + adds r2, r5, 0 + movs r3, 0x6A + bl AddTextPrinterParameterized + ldr r1, =gMoveDescriptionPointers + mov r0, r9 + subs r0, 0x1 + lsls r0, 2 + adds r0, r1 + ldr r5, [r0] + movs r0, 0x41 + str r0, [sp] + str r4, [sp, 0x4] + str r4, [sp, 0x8] + movs r0, 0 + movs r1, 0x7 + adds r2, r5, 0 + movs r3, 0 + bl AddTextPrinterParameterized +_081D2AB6: + add sp, 0x2C + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end MoveRelearnerLoadBattleMoveDescription + + thumb_func_start MoveRelearnerMenuLoadContestMoveDescription +MoveRelearnerMenuLoadContestMoveDescription: @ 81D2ACC + push {r4-r7,lr} + mov r7, r8 + push {r7} + sub sp, 0xC + adds r4, r0, 0 + bl MoveRelearnerShowHideHearts + movs r0, 0x1 + movs r1, 0x11 + bl FillWindowPixelBuffer + ldr r5, =gText_ContestMoves2 + movs r0, 0x1 + adds r1, r5, 0 + movs r2, 0x80 + bl GetStringCenterAlignXOffset + lsls r3, r0, 24 + lsrs r3, 24 + movs r0, 0x1 + str r0, [sp] + movs r7, 0xFF + str r7, [sp, 0x4] + movs r6, 0 + str r6, [sp, 0x8] + movs r1, 0x1 + adds r2, r5, 0 + bl AddTextPrinterParameterized + ldr r5, =gText_Appeal2 + movs r0, 0x1 + adds r1, r5, 0 + movs r2, 0x5C + bl GetStringRightAlignXOffset + lsls r3, r0, 24 + lsrs r3, 24 + movs r0, 0x19 + mov r8, r0 + str r0, [sp] + str r7, [sp, 0x4] + str r6, [sp, 0x8] + movs r0, 0x1 + movs r1, 0x1 + adds r2, r5, 0 + bl AddTextPrinterParameterized + ldr r5, =gText_Jam2 + movs r0, 0x1 + adds r1, r5, 0 + movs r2, 0x5C + bl GetStringRightAlignXOffset + lsls r3, r0, 24 + lsrs r3, 24 + movs r0, 0x29 + str r0, [sp] + str r7, [sp, 0x4] + str r6, [sp, 0x8] + movs r0, 0x1 + movs r1, 0x1 + adds r2, r5, 0 + bl AddTextPrinterParameterized + movs r0, 0x2 + negs r0, r0 + cmp r4, r0 + bne _081D2B6C + movs r0, 0x1 + movs r1, 0x2 + bl CopyWindowToVram + b _081D2BB8 + .pool +_081D2B6C: + lsls r4, 3 + ldr r0, =gContestMoves + adds r4, r0 + ldr r1, =gContestMoveTypeTextPointers + ldrb r0, [r4, 0x1] + lsls r0, 29 + lsrs r0, 27 + adds r0, r1 + ldr r5, [r0] + mov r0, r8 + str r0, [sp] + str r7, [sp, 0x4] + str r6, [sp, 0x8] + movs r0, 0x1 + movs r1, 0x1 + adds r2, r5, 0 + movs r3, 0x4 + bl AddTextPrinterParameterized + ldr r1, =gContestEffectDescriptionPointers + ldrb r0, [r4] + lsls r0, 2 + adds r0, r1 + ldr r5, [r0] + movs r0, 0x41 + str r0, [sp] + str r7, [sp, 0x4] + str r6, [sp, 0x8] + movs r0, 0x1 + movs r1, 0x7 + adds r2, r5, 0 + movs r3, 0 + bl AddTextPrinterParameterized + movs r0, 0x1 + movs r1, 0x2 + bl CopyWindowToVram +_081D2BB8: + add sp, 0xC + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end MoveRelearnerMenuLoadContestMoveDescription + + thumb_func_start MoveRelearnerCursorCallback +MoveRelearnerCursorCallback: @ 81D2BD0 + push {r4,lr} + adds r4, r0, 0 + lsls r1, 24 + lsrs r1, 24 + cmp r1, 0x1 + beq _081D2BE2 + movs r0, 0x5 + bl PlaySE +_081D2BE2: + adds r0, r4, 0 + bl MoveRelearnerLoadBattleMoveDescription + adds r0, r4, 0 + bl MoveRelearnerMenuLoadContestMoveDescription + pop {r4} + pop {r0} + bx r0 + thumb_func_end MoveRelearnerCursorCallback + + thumb_func_start MoveRelearnerPrintText +MoveRelearnerPrintText: @ 81D2BF4 + push {r4,lr} + sub sp, 0x10 + adds r4, r0, 0 + movs r0, 0x3 + movs r1, 0x11 + bl FillWindowPixelBuffer + ldr r2, =gTextFlags + ldrb r0, [r2] + movs r1, 0x1 + orrs r0, r1 + strb r0, [r2] + bl GetPlayerTextSpeedDelay + adds r3, r0, 0 + lsls r3, 24 + lsrs r3, 24 + movs r0, 0 + str r0, [sp] + movs r0, 0x2 + str r0, [sp, 0x4] + movs r0, 0x1 + str r0, [sp, 0x8] + movs r0, 0x3 + str r0, [sp, 0xC] + movs r1, 0x1 + adds r2, r4, 0 + bl AddTextPrinterParameterized2 + add sp, 0x10 + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end MoveRelearnerPrintText + + thumb_func_start MoveRelearnerRunTextPrinters +MoveRelearnerRunTextPrinters: @ 81D2C3C + push {lr} + bl RunTextPrinters + movs r0, 0x3 + bl IsTextPrinterActive + lsls r0, 16 + lsrs r0, 16 + pop {r1} + bx r1 + thumb_func_end MoveRelearnerRunTextPrinters + + thumb_func_start MoveRelearnerCreateYesNoMenu +MoveRelearnerCreateYesNoMenu: @ 81D2C50 + push {lr} + ldr r0, =gMoveRelearnerYesNoMenuTemplate + movs r1, 0x1 + movs r2, 0xE + movs r3, 0 + bl CreateYesNoMenu + pop {r0} + bx r0 + .pool + thumb_func_end MoveRelearnerCreateYesNoMenu + + thumb_func_start sub_81D2C68 +sub_81D2C68: @ 81D2C68 + push {lr} + lsls r0, 16 + lsrs r0, 16 + lsls r1, 16 + lsrs r1, 16 + cmp r0, 0xE + bne _081D2CA8 + cmp r2, 0x2 + beq _081D2C7E + cmp r2, 0x7 + bne _081D2C94 +_081D2C7E: + movs r0, 0x64 + muls r0, r1 + ldr r1, =gPlayerParty + adds r0, r1 + adds r1, r2, 0 + adds r2, r3, 0 + bl GetMonData + b _081D2CCA + .pool +_081D2C94: + movs r0, 0x64 + muls r0, r1 + ldr r1, =gPlayerParty + adds r0, r1 + adds r1, r2, 0 + bl GetMonData + b _081D2CCA + .pool +_081D2CA8: + cmp r2, 0x2 + beq _081D2CB0 + cmp r2, 0x7 + bne _081D2CBE +_081D2CB0: + lsls r0, 24 + lsrs r0, 24 + lsls r1, 24 + lsrs r1, 24 + bl GetAndCopyBoxMonDataAt + b _081D2CCA +_081D2CBE: + lsls r0, 24 + lsrs r0, 24 + lsls r1, 24 + lsrs r1, 24 + bl GetBoxMonDataAt +_081D2CCA: + pop {r1} + bx r1 + thumb_func_end sub_81D2C68 + + thumb_func_start sub_81D2CD0 +sub_81D2CD0: @ 81D2CD0 + push {r4-r7,lr} + mov r7, r8 + push {r7} + adds r5, r0, 0 + lsls r1, 16 + lsrs r4, r1, 16 + lsls r2, 16 + lsrs r6, r2, 16 + movs r0, 0xFC + strb r0, [r5] + adds r5, 0x1 + movs r0, 0x4 + strb r0, [r5] + adds r5, 0x1 + movs r0, 0x8 + strb r0, [r5] + adds r5, 0x1 + movs r0, 0 + strb r0, [r5] + adds r5, 0x1 + movs r0, 0x9 + strb r0, [r5] + adds r5, 0x1 + adds r0, r4, 0 + adds r1, r6, 0 + movs r2, 0x2D + movs r3, 0 + bl sub_81D2C68 + cmp r0, 0 + beq _081D2D20 + ldr r1, =gText_EggNickname + adds r0, r5, 0 + movs r2, 0 + movs r3, 0xC + bl StringCopyPadded + b _081D2E70 + .pool +_081D2D20: + adds r0, r4, 0 + adds r1, r6, 0 + movs r2, 0x2 + adds r3, r5, 0 + bl sub_81D2C68 + adds r0, r5, 0 + bl StringGetEnd10 + adds r0, r4, 0 + adds r1, r6, 0 + movs r2, 0xB + movs r3, 0 + bl sub_81D2C68 + lsls r0, 16 + lsrs r7, r0, 16 + cmp r4, 0xE + bne _081D2D70 + movs r0, 0x64 + adds r4, r6, 0 + muls r4, r0 + ldr r0, =gPlayerParty + adds r4, r0 + adds r0, r4, 0 + movs r1, 0x38 + bl GetMonData + lsls r0, 16 + lsrs r0, 16 + mov r8, r0 + adds r0, r4, 0 + bl GetMonGender + lsls r0, 24 + lsrs r6, r0, 24 + b _081D2D92 + .pool +_081D2D70: + lsls r0, r4, 24 + lsrs r0, 24 + lsls r1, r6, 24 + lsrs r1, 24 + bl GetBoxedMonPtr + adds r4, r0, 0 + bl GetBoxMonGender + lsls r0, 24 + lsrs r6, r0, 24 + adds r0, r4, 0 + bl GetLevelFromBoxMonExp + lsls r0, 24 + lsrs r0, 24 + mov r8, r0 +_081D2D92: + cmp r7, 0x1D + beq _081D2D9A + cmp r7, 0x20 + bne _081D2DB0 +_081D2D9A: + movs r0, 0xB + adds r1, r7, 0 + muls r1, r0 + ldr r0, =gSpeciesNames + adds r1, r0 + adds r0, r5, 0 + bl StringCompare + cmp r0, 0 + bne _081D2DB0 + movs r6, 0xFF +_081D2DB0: + adds r3, r5, 0 + b _081D2DBA + .pool +_081D2DB8: + adds r3, 0x1 +_081D2DBA: + ldrb r0, [r3] + cmp r0, 0xFF + bne _081D2DB8 + movs r1, 0xFC + strb r1, [r3] + adds r3, 0x1 + movs r0, 0x12 + strb r0, [r3] + adds r3, 0x1 + movs r0, 0x3C + strb r0, [r3] + adds r3, 0x1 + cmp r6, 0 + beq _081D2DDE + cmp r6, 0xFE + beq _081D2E02 + movs r0, 0 + b _081D2E24 +_081D2DDE: + strb r1, [r3] + adds r3, 0x1 + movs r0, 0x1 + strb r0, [r3] + adds r3, 0x1 + movs r0, 0x4 + strb r0, [r3] + adds r3, 0x1 + strb r1, [r3] + adds r3, 0x1 + movs r0, 0x3 + strb r0, [r3] + adds r3, 0x1 + movs r0, 0x5 + strb r0, [r3] + adds r3, 0x1 + movs r0, 0xB5 + b _081D2E24 +_081D2E02: + strb r1, [r3] + adds r3, 0x1 + movs r0, 0x1 + strb r0, [r3] + adds r3, 0x1 + movs r0, 0x6 + strb r0, [r3] + adds r3, 0x1 + strb r1, [r3] + adds r3, 0x1 + movs r0, 0x3 + strb r0, [r3] + adds r3, 0x1 + movs r0, 0x7 + strb r0, [r3] + adds r3, 0x1 + movs r0, 0xB6 +_081D2E24: + strb r0, [r3] + adds r3, 0x1 + movs r0, 0xFC + strb r0, [r3] + adds r3, 0x1 + movs r0, 0x4 + strb r0, [r3] + adds r3, 0x1 + movs r0, 0x8 + strb r0, [r3] + adds r3, 0x1 + movs r4, 0 + strb r4, [r3] + adds r3, 0x1 + movs r0, 0x9 + strb r0, [r3] + adds r3, 0x1 + movs r0, 0xBA + strb r0, [r3] + adds r3, 0x1 + movs r0, 0xF9 + strb r0, [r3] + adds r3, 0x1 + movs r0, 0x5 + strb r0, [r3] + adds r3, 0x1 + adds r0, r3, 0 + mov r1, r8 + movs r2, 0 + movs r3, 0x3 + bl ConvertIntToDecimalStringN + adds r3, r0, 0 + strb r4, [r3] + adds r3, 0x1 + movs r0, 0xFF + strb r0, [r3] + adds r0, r3, 0 +_081D2E70: + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r1} + bx r1 + thumb_func_end sub_81D2CD0 + + thumb_func_start sub_81D2E7C +sub_81D2E7C: @ 81D2E7C + push {r4,lr} + adds r4, r0, 0 + lsls r2, 16 + lsrs r2, 16 + b _081D2E94 +_081D2E86: + strb r3, [r4] + adds r1, 0x1 + adds r4, 0x1 + lsls r0, r2, 16 + ldr r2, =0xffff0000 + adds r0, r2 + lsrs r2, r0, 16 +_081D2E94: + ldrb r3, [r1] + adds r0, r3, 0 + cmp r0, 0xFF + bne _081D2E86 + adds r1, r2, 0 + lsls r0, r1, 16 + ldr r2, =0xffff0000 + adds r0, r2 + lsrs r2, r0, 16 + lsls r1, 16 + cmp r1, 0 + ble _081D2EC2 + movs r3, 0 +_081D2EAE: + strb r3, [r4] + adds r4, 0x1 + adds r1, r2, 0 + lsls r0, r1, 16 + ldr r2, =0xffff0000 + adds r0, r2 + lsrs r2, r0, 16 + lsls r1, 16 + cmp r1, 0 + bgt _081D2EAE +_081D2EC2: + movs r0, 0xFF + strb r0, [r4] + adds r0, r4, 0 + pop {r4} + pop {r1} + bx r1 + .pool + thumb_func_end sub_81D2E7C + + thumb_func_start sub_81D2ED4 +sub_81D2ED4: @ 81D2ED4 + push {r4-r7,lr} + adds r5, r0, 0 + adds r6, r1, 0 + ldr r0, [sp, 0x14] + ldr r1, [sp, 0x18] + ldr r4, [sp, 0x1C] + lsls r2, 16 + lsrs r7, r2, 16 + lsls r3, 16 + lsrs r3, 16 + lsls r0, 16 + lsrs r2, r0, 16 + lsls r1, 16 + lsrs r0, r1, 16 + lsls r4, 24 + cmp r4, 0 + bne _081D2EFC + subs r0, 0x1 + lsls r0, 16 + lsrs r0, 16 +_081D2EFC: + cmp r2, r0 + beq _081D2F42 + adds r0, r6, 0 + adds r1, r7, 0 + adds r2, r3, 0 + bl sub_81D2CD0 + movs r0, 0xFC + strb r0, [r5] + movs r0, 0x4 + strb r0, [r5, 0x1] + movs r0, 0x8 + strb r0, [r5, 0x2] + movs r0, 0 + strb r0, [r5, 0x3] + movs r0, 0x9 + strb r0, [r5, 0x4] + cmp r7, 0xE + bne _081D2F2C + adds r0, r5, 0x5 + ldr r1, =gText_InParty + b _081D2F3A + .pool +_081D2F2C: + adds r4, r5, 0x5 + lsls r0, r7, 24 + lsrs r0, 24 + bl GetBoxNamePtr + adds r1, r0, 0 + adds r0, r4, 0 +_081D2F3A: + movs r2, 0x8 + bl sub_81D2E7C + b _081D2F72 +_081D2F42: + movs r1, 0 + movs r2, 0 +_081D2F46: + adds r0, r6, r1 + strb r2, [r0] + adds r0, r1, 0x1 + lsls r0, 16 + lsrs r1, r0, 16 + cmp r1, 0xB + bls _081D2F46 + adds r1, r6, r1 + movs r0, 0xFF + strb r0, [r1] + movs r1, 0 + movs r2, 0 +_081D2F5E: + adds r0, r5, r1 + strb r2, [r0] + adds r0, r1, 0x1 + lsls r0, 16 + lsrs r1, r0, 16 + cmp r1, 0x7 + bls _081D2F5E + adds r1, r5, r1 + movs r0, 0xFF + strb r0, [r1] +_081D2F72: + pop {r4-r7} + pop {r0} + bx r0 + thumb_func_end sub_81D2ED4 + + thumb_func_start sub_81D2F78 +sub_81D2F78: @ 81D2F78 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + mov r8, r0 + mov r10, r1 + ldr r0, [sp, 0x20] + ldr r1, [sp, 0x24] + ldr r4, [sp, 0x28] + ldr r5, [sp, 0x2C] + lsls r2, 16 + lsrs r7, r2, 16 + lsls r3, 16 + lsrs r6, r3, 16 + lsls r0, 16 + lsrs r2, r0, 16 + lsls r1, 16 + lsrs r1, 16 + mov r9, r1 + lsls r4, 16 + lsrs r0, r4, 16 + lsls r5, 24 + cmp r5, 0 + bne _081D2FB0 + subs r0, 0x1 + lsls r0, 16 + lsrs r0, 16 +_081D2FB0: + cmp r2, r0 + beq _081D305C + adds r0, r7, 0 + adds r1, r6, 0 + movs r2, 0x16 + movs r3, 0 + bl sub_81D2C68 + mov r1, r9 + lsls r5, r1, 2 + adds r4, r5, r1 + mov r2, r8 + adds r1, r2, r4 + strb r0, [r1] + adds r0, r7, 0 + adds r1, r6, 0 + movs r2, 0x2F + movs r3, 0 + bl sub_81D2C68 + mov r1, r8 + adds r1, 0x1 + adds r1, r4 + strb r0, [r1] + adds r0, r7, 0 + adds r1, r6, 0 + movs r2, 0x21 + movs r3, 0 + bl sub_81D2C68 + mov r1, r8 + adds r1, 0x2 + adds r1, r4 + strb r0, [r1] + adds r0, r7, 0 + adds r1, r6, 0 + movs r2, 0x18 + movs r3, 0 + bl sub_81D2C68 + mov r1, r8 + adds r1, 0x3 + adds r1, r4 + strb r0, [r1] + adds r0, r7, 0 + adds r1, r6, 0 + movs r2, 0x17 + movs r3, 0 + bl sub_81D2C68 + mov r1, r8 + adds r1, 0x4 + adds r1, r4 + strb r0, [r1] + mov r4, r10 + add r4, r9 + adds r0, r7, 0 + adds r1, r6, 0 + movs r2, 0x30 + movs r3, 0 + bl sub_81D2C68 + cmp r0, 0xFF + beq _081D3044 + adds r0, r7, 0 + adds r1, r6, 0 + movs r2, 0x30 + movs r3, 0 + bl sub_81D2C68 + movs r1, 0x1D + bl __udivsi3 + b _081D3046 +_081D3044: + movs r0, 0x9 +_081D3046: + strb r0, [r4] + mov r0, r9 + adds r1, r5, r0 + mov r2, r8 + adds r0, r2, r1 + lsls r1, 2 + adds r1, 0x14 + add r1, r8 + bl sub_81D2754 + b _081D3086 +_081D305C: + movs r2, 0 + mov r0, r9 + lsls r5, r0, 2 + adds r1, r5, r0 + movs r6, 0 + lsls r3, r1, 2 + movs r5, 0x9B + movs r4, 0x5B +_081D306C: + adds r0, r2, r1 + add r0, r8 + strb r6, [r0] + lsls r0, r2, 2 + adds r0, r3 + add r0, r8 + strh r5, [r0, 0x14] + strh r4, [r0, 0x16] + adds r0, r2, 0x1 + lsls r0, 16 + lsrs r2, r0, 16 + cmp r2, 0x4 + bls _081D306C +_081D3086: + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + thumb_func_end sub_81D2F78 + + thumb_func_start sub_81D3094 +sub_81D3094: @ 81D3094 + push {r4-r7,lr} + mov r7, r9 + mov r6, r8 + push {r6,r7} + sub sp, 0x4 + mov r8, r0 + mov r9, r1 + ldr r0, [sp, 0x20] + ldr r1, [sp, 0x24] + ldr r4, [sp, 0x28] + lsls r2, 16 + lsrs r7, r2, 16 + lsls r3, 16 + lsrs r5, r3, 16 + lsls r0, 16 + lsrs r2, r0, 16 + lsls r1, 16 + lsrs r0, r1, 16 + lsls r4, 24 + cmp r4, 0 + bne _081D30C4 + subs r0, 0x1 + lsls r0, 16 + lsrs r0, 16 +_081D30C4: + cmp r2, r0 + beq _081D311A + adds r0, r7, 0 + adds r1, r5, 0 + movs r2, 0x41 + movs r3, 0 + bl sub_81D2C68 + adds r4, r0, 0 + lsls r4, 16 + lsrs r4, 16 + adds r0, r7, 0 + adds r1, r5, 0 + movs r2, 0x1 + movs r3, 0 + bl sub_81D2C68 + adds r6, r0, 0 + adds r0, r7, 0 + adds r1, r5, 0 + movs r2, 0 + movs r3, 0 + bl sub_81D2C68 + adds r5, r0, 0 + lsls r0, r4, 3 + ldr r1, =gMonFrontPicTable + adds r0, r1 + movs r1, 0x1 + str r1, [sp] + mov r1, r8 + adds r2, r4, 0 + adds r3, r5, 0 + bl LoadSpecialPokePic + adds r0, r4, 0 + adds r1, r6, 0 + adds r2, r5, 0 + bl GetFrontSpritePalFromSpeciesAndPersonality + mov r1, r9 + bl LZ77UnCompWram +_081D311A: + add sp, 0x4 + pop {r3,r4} + mov r8, r3 + mov r9, r4 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D3094 + + thumb_func_start sub_81D312C +sub_81D312C: @ 81D312C + push {lr} + adds r1, r0, 0 + ldrh r0, [r1] + adds r0, 0x18 + strh r0, [r1] + lsls r0, 16 + cmp r0, 0 + ble _081D3140 + movs r0, 0 + strh r0, [r1] +_081D3140: + movs r0, 0 + ldrsh r1, [r1, r0] + negs r0, r1 + orrs r0, r1 + lsrs r0, 31 + pop {r1} + bx r1 + thumb_func_end sub_81D312C + + thumb_func_start sub_81D3150 +sub_81D3150: @ 81D3150 + push {lr} + adds r1, r0, 0 + ldrh r0, [r1] + subs r0, 0x18 + strh r0, [r1] + lsls r0, 16 + asrs r0, 16 + movs r2, 0x50 + negs r2, r2 + cmp r0, r2 + bge _081D3168 + strh r2, [r1] +_081D3168: + movs r0, 0 + ldrsh r1, [r1, r0] + eors r1, r2 + negs r0, r1 + orrs r0, r1 + lsrs r0, 31 + pop {r1} + bx r1 + thumb_func_end sub_81D3150 + + thumb_func_start sub_81D3178 +sub_81D3178: @ 81D3178 + push {r4,r5,lr} + adds r5, r1, 0 + bl sub_81D2074 + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + adds r0, r5, 0 + bl sub_81D312C + lsls r0, 24 + lsrs r0, 24 + movs r1, 0 + cmp r4, 0 + bne _081D319A + cmp r0, 0 + beq _081D319C +_081D319A: + movs r1, 0x1 +_081D319C: + adds r0, r1, 0 + pop {r4,r5} + pop {r1} + bx r1 + thumb_func_end sub_81D3178 + + thumb_func_start sub_81D31A4 +sub_81D31A4: @ 81D31A4 + push {r4,r5,lr} + adds r5, r1, 0 + bl sub_81D2074 + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + adds r0, r5, 0 + bl sub_81D3150 + lsls r0, 24 + lsrs r0, 24 + movs r1, 0 + cmp r4, 0 + bne _081D31C6 + cmp r0, 0 + beq _081D31C8 +_081D31C6: + movs r1, 0x1 +_081D31C8: + adds r0, r1, 0 + pop {r4,r5} + pop {r1} + bx r1 + thumb_func_end sub_81D31A4 + + thumb_func_start sub_81D31D0 +sub_81D31D0: @ 81D31D0 + push {r4-r7,lr} + sub sp, 0x20 + ldr r3, =gUnknown_08625A48 + ldr r4, [r3] + ldr r5, [r3, 0x4] + str r4, [sp, 0x18] + str r5, [sp, 0x1C] + mov r4, sp + ldr r3, =gUnknown_08625A50 + ldm r3!, {r5-r7} + stm r4!, {r5-r7} + ldm r3!, {r5-r7} + stm r4!, {r5-r7} + ldr r3, =gUnknown_08625A68 + ldr r4, [r3, 0x4] + ldr r3, [r3] + ldr r5, [sp, 0x18] + ldr r6, [sp, 0x1C] + str r5, [r0] + str r6, [r0, 0x4] + mov r0, sp + ldm r0!, {r5-r7} + stm r1!, {r5-r7} + ldm r0!, {r5-r7} + stm r1!, {r5-r7} + str r3, [r2] + str r4, [r2, 0x4] + add sp, 0x20 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D31D0 + + thumb_func_start sub_81D321C +sub_81D321C: @ 81D321C + push {r4-r7,lr} + mov r7, r8 + push {r7} + sub sp, 0x50 + adds r5, r0, 0 + mov r12, r1 + mov r8, r2 + mov r1, sp + ldr r0, =gUnknown_08625A70 + ldm r0!, {r2-r4} + stm r1!, {r2-r4} + ldm r0!, {r2,r6,r7} + stm r1!, {r2,r6,r7} + ldm r0!, {r3,r4} + stm r1!, {r3,r4} + add r3, sp, 0x20 + adds r1, r3, 0 + ldr r0, =gUnknown_08625A90 + ldm r0!, {r2,r6,r7} + stm r1!, {r2,r6,r7} + ldm r0!, {r4,r6,r7} + stm r1!, {r4,r6,r7} + add r2, sp, 0x38 + adds r1, r2, 0 + ldr r0, =gUnknown_08625AA8 + ldm r0!, {r4,r6,r7} + stm r1!, {r4,r6,r7} + ldm r0!, {r4,r6,r7} + stm r1!, {r4,r6,r7} + movs r4, 0 +_081D3258: + lsls r0, r4, 3 + add r0, sp + ldr r1, [r0, 0x4] + ldr r0, [r0] + stm r5!, {r0,r1} + adds r0, r4, 0x1 + lsls r0, 24 + lsrs r4, r0, 24 + cmp r4, 0x3 + bls _081D3258 + mov r1, r12 + adds r0, r2, 0 + ldm r0!, {r2,r4,r5} + stm r1!, {r2,r4,r5} + ldm r0!, {r2,r6,r7} + stm r1!, {r2,r6,r7} + movs r4, 0 +_081D327A: + lsls r0, r4, 3 + adds r0, r3, r0 + ldr r1, [r0, 0x4] + ldr r0, [r0] + mov r5, r8 + adds r5, 0x8 + mov r8, r5 + subs r5, 0x8 + stm r5!, {r0,r1} + adds r0, r4, 0x1 + lsls r0, 24 + lsrs r4, r0, 24 + cmp r4, 0x2 + bls _081D327A + add sp, 0x50 + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D321C + + thumb_func_start sub_81D32B0 +sub_81D32B0: @ 81D32B0 + push {r4,r5,lr} + ldr r2, =gUnknown_08625AC0 + ldr r4, [r2] + ldr r5, [r2, 0x4] + ldr r2, =gUnknown_08625AC8 + ldr r3, [r2, 0x4] + ldr r2, [r2] + str r4, [r0] + str r5, [r0, 0x4] + str r2, [r1] + str r3, [r1, 0x4] + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D32B0 + + thumb_func_start sub_81D32D4 +sub_81D32D4: @ 81D32D4 + push {lr} + adds r1, r0, 0 + ldrh r0, [r1, 0x30] + adds r0, 0x1 + strh r0, [r1, 0x30] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x3C + ble _081D32F0 + movs r0, 0 + strh r0, [r1, 0x30] + adds r0, r1, 0 + bl sub_81D3408 +_081D32F0: + pop {r0} + bx r0 + thumb_func_end sub_81D32D4 + + thumb_func_start sub_81D32F4 +sub_81D32F4: @ 81D32F4 + push {lr} + adds r2, r0, 0 + adds r0, 0x3F + ldrb r1, [r0] + movs r0, 0x10 + ands r0, r1 + cmp r0, 0 + beq _081D330C + movs r0, 0 + strh r0, [r2, 0x30] + ldr r0, =sub_81D32D4 + str r0, [r2, 0x1C] +_081D330C: + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D32F4 + + thumb_func_start sub_81D3314 +sub_81D3314: @ 81D3314 + push {r4,r5,lr} + adds r4, r0, 0 + movs r1, 0x36 + ldrsh r0, [r4, r1] + lsls r1, r0, 4 + adds r1, r0 + lsls r1, 2 + ldr r0, =gSprites + adds r3, r1, r0 + cmp r3, 0 + beq _081D3360 + ldrh r1, [r3, 0x24] + ldrh r2, [r3, 0x20] + adds r1, r2 + ldr r2, =gUnknown_08625B2C + movs r5, 0x2E + ldrsh r0, [r4, r5] + lsls r0, 2 + adds r0, r2 + ldrh r0, [r0] + adds r0, r1 + strh r0, [r4, 0x20] + ldrh r1, [r3, 0x26] + ldrh r3, [r3, 0x22] + adds r1, r3 + movs r3, 0x2E + ldrsh r0, [r4, r3] + lsls r0, 2 + adds r2, 0x2 + adds r0, r2 + ldrh r0, [r0] + adds r0, r1 + b _081D337E + .pool +_081D3360: + ldr r1, =gUnknown_08625B2C + movs r5, 0x2E + ldrsh r0, [r4, r5] + lsls r0, 2 + adds r0, r1 + ldrh r0, [r0] + adds r0, 0x28 + strh r0, [r4, 0x20] + movs r2, 0x2E + ldrsh r0, [r4, r2] + lsls r0, 2 + adds r1, 0x2 + adds r0, r1 + ldrh r0, [r0] + adds r0, 0x68 +_081D337E: + strh r0, [r4, 0x22] + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D3314 + + thumb_func_start sub_81D338C +sub_81D338C: @ 81D338C + push {r4-r7,lr} + mov r7, r8 + push {r7} + mov r8, r2 + lsls r0, 24 + lsrs r6, r0, 24 + lsls r1, 24 + lsrs r7, r1, 24 + movs r5, 0 +_081D339E: + lsls r0, r5, 2 + mov r1, r8 + adds r4, r0, r1 + ldr r0, [r4] + cmp r0, 0 + beq _081D33F0 + strh r5, [r0, 0x2E] + ldr r1, [r4] + lsls r0, r5, 4 + adds r0, 0x1 + strh r0, [r1, 0x30] + ldr r0, [r4] + strh r6, [r0, 0x32] + ldr r0, [r4] + strh r5, [r0, 0x34] + cmp r7, 0 + beq _081D33C4 + cmp r6, 0x9 + beq _081D33D0 +_081D33C4: + ldr r1, [r4] + ldr r0, =sub_81D3564 + str r0, [r1, 0x1C] + b _081D33F0 + .pool +_081D33D0: + ldr r0, [r4] + bl sub_81D3314 + ldr r0, [r4] + bl sub_81D35E8 + ldr r2, [r4] + ldr r0, =sub_81D32F4 + str r0, [r2, 0x1C] + adds r2, 0x3E + ldrb r0, [r2] + movs r3, 0x5 + negs r3, r3 + adds r1, r3, 0 + ands r0, r1 + strb r0, [r2] +_081D33F0: + adds r0, r5, 0x1 + lsls r0, 16 + lsrs r5, r0, 16 + cmp r5, 0x9 + bls _081D339E + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D338C + + thumb_func_start sub_81D3408 +sub_81D3408: @ 81D3408 + push {r4-r7,lr} + adds r4, r0, 0 + ldrh r0, [r4, 0x38] + lsls r0, 24 + lsrs r2, r0, 24 + movs r3, 0 + movs r1, 0x32 + ldrsh r0, [r4, r1] + adds r0, 0x1 + cmp r3, r0 + bge _081D3454 + ldr r5, =gSprites + movs r7, 0x1C + adds r7, r5 + mov r12, r7 + ldr r6, =sub_81D3564 +_081D3428: + lsls r1, r2, 4 + adds r1, r2 + lsls r1, 2 + adds r2, r1, r5 + movs r7, 0x2E + ldrsh r0, [r2, r7] + lsls r0, 4 + adds r0, 0x1 + strh r0, [r2, 0x30] + add r1, r12 + str r6, [r1] + ldrh r0, [r2, 0x38] + lsls r0, 24 + lsrs r2, r0, 24 + adds r0, r3, 0x1 + lsls r0, 16 + lsrs r3, r0, 16 + movs r1, 0x32 + ldrsh r0, [r4, r1] + adds r0, 0x1 + cmp r3, r0 + blt _081D3428 +_081D3454: + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D3408 + + thumb_func_start sub_81D3464 +sub_81D3464: @ 81D3464 + push {lr} + adds r2, r0, 0 + movs r1, 0 + movs r3, 0 +_081D346C: + lsls r0, r1, 2 + adds r0, r2 + str r3, [r0] + adds r0, r1, 0x1 + lsls r0, 24 + lsrs r1, r0, 24 + cmp r1, 0x9 + bls _081D346C + pop {r0} + bx r0 + thumb_func_end sub_81D3464 + + thumb_func_start sub_81D3480 +sub_81D3480: @ 81D3480 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + mov r8, r0 + lsls r1, 24 + lsrs r1, 24 + mov r10, r1 + lsls r2, 24 + movs r0, 0 + mov r9, r0 + lsrs r7, r2, 24 + movs r5, 0 + adds r0, r7, 0x1 + cmp r9, r0 + bge _081D34FE +_081D34A2: + ldr r0, =gUnknown_08625B14 + movs r1, 0 + movs r2, 0 + movs r3, 0 + bl CreateSprite + lsls r0, 24 + lsrs r3, r0, 24 + adds r6, r3, 0 + cmp r3, 0x40 + beq _081D34FE + lsls r0, r5, 2 + mov r1, r8 + adds r4, r0, r1 + lsls r0, r3, 4 + adds r0, r3 + lsls r0, 2 + ldr r1, =gSprites + adds r0, r1 + str r0, [r4] + adds r0, 0x3E + ldrb r1, [r0] + movs r2, 0x4 + orrs r1, r2 + strb r1, [r0] + ldr r0, [r4] + mov r1, r10 + strh r1, [r0, 0x36] + cmp r5, 0 + beq _081D34F0 + subs r0, r4, 0x4 + ldr r0, [r0] + strh r3, [r0, 0x38] + b _081D34F2 + .pool +_081D34F0: + mov r9, r6 +_081D34F2: + adds r0, r5, 0x1 + lsls r0, 16 + lsrs r5, r0, 16 + adds r0, r7, 0x1 + cmp r5, r0 + blt _081D34A2 +_081D34FE: + lsls r0, r7, 2 + add r0, r8 + ldr r0, [r0] + mov r1, r9 + strh r1, [r0, 0x38] + adds r0, r7, 0 + movs r1, 0x1 + mov r2, r8 + bl sub_81D338C + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + thumb_func_end sub_81D3480 + + thumb_func_start sub_81D3520 +sub_81D3520: @ 81D3520 + push {r4-r6,lr} + adds r6, r0, 0 + movs r5, 0 +_081D3526: + cmp r5, 0x9 + bhi _081D3544 + lsls r0, r5, 2 + adds r4, r0, r6 + ldr r0, [r4] + cmp r0, 0 + beq _081D3544 + bl DestroySprite + movs r0, 0 + str r0, [r4] + adds r0, r5, 0x1 + lsls r0, 16 + lsrs r5, r0, 16 + b _081D3526 +_081D3544: + pop {r4-r6} + pop {r0} + bx r0 + thumb_func_end sub_81D3520 + + thumb_func_start sub_81D354C +sub_81D354C: @ 81D354C + push {lr} + bl sub_81D3520 + movs r0, 0x68 + bl FreeSpriteTilesByTag + movs r0, 0x68 + bl FreeSpritePaletteByTag + pop {r0} + bx r0 + thumb_func_end sub_81D354C + + thumb_func_start sub_81D3564 +sub_81D3564: @ 81D3564 + push {r4,lr} + adds r4, r0, 0 + ldrh r1, [r4, 0x30] + movs r2, 0x30 + ldrsh r0, [r4, r2] + cmp r0, 0 + beq _081D3592 + subs r0, r1, 0x1 + strh r0, [r4, 0x30] + lsls r0, 16 + cmp r0, 0 + bne _081D35DC + adds r0, r4, 0 + movs r1, 0 + bl SeekSpriteAnim + adds r2, r4, 0 + adds r2, 0x3E + ldrb r1, [r2] + movs r0, 0x5 + negs r0, r0 + ands r0, r1 + strb r0, [r2] +_081D3592: + adds r0, r4, 0 + bl sub_81D3314 + adds r0, r4, 0 + adds r0, 0x3F + ldrb r1, [r0] + movs r0, 0x10 + ands r0, r1 + cmp r0, 0 + beq _081D35DC + adds r2, r4, 0 + adds r2, 0x3E + ldrb r0, [r2] + movs r1, 0x4 + orrs r0, r1 + strb r0, [r2] + movs r0, 0x34 + ldrsh r1, [r4, r0] + movs r2, 0x32 + ldrsh r0, [r4, r2] + cmp r1, r0 + bne _081D35D8 + cmp r1, 0x9 + bne _081D35D0 + adds r0, r4, 0 + bl sub_81D35E8 + ldr r0, =sub_81D32F4 + b _081D35DA + .pool +_081D35D0: + ldr r0, =sub_81D32D4 + b _081D35DA + .pool +_081D35D8: + ldr r0, =SpriteCallbackDummy +_081D35DA: + str r0, [r4, 0x1C] +_081D35DC: + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D3564 + + thumb_func_start sub_81D35E8 +sub_81D35E8: @ 81D35E8 + push {r4-r7,lr} + adds r6, r0, 0 + ldrh r0, [r6, 0x38] + lsls r0, 24 + lsrs r1, r0, 24 + movs r5, 0 + movs r2, 0x32 + ldrsh r0, [r6, r2] + adds r0, 0x1 + cmp r5, r0 + bge _081D3636 + movs r0, 0x5 + negs r0, r0 + adds r7, r0, 0 +_081D3604: + lsls r4, r1, 4 + adds r4, r1 + lsls r4, 2 + ldr r0, =gSprites + adds r4, r0 + adds r0, r4, 0 + movs r1, 0 + bl SeekSpriteAnim + adds r1, r4, 0 + adds r1, 0x3E + ldrb r0, [r1] + ands r0, r7 + strb r0, [r1] + ldrh r0, [r4, 0x38] + lsls r0, 24 + lsrs r1, r0, 24 + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 + movs r2, 0x32 + ldrsh r0, [r6, r2] + adds r0, 0x1 + cmp r5, r0 + blt _081D3604 +_081D3636: + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81D35E8 + + thumb_func_start DrawLevelUpWindowPg1 +DrawLevelUpWindowPg1: @ 81D3640 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0x2C + mov r8, r0 + adds r6, r1, 0 + adds r5, r2, 0 + adds r4, r3, 0 + ldr r3, [sp, 0x4C] + ldr r0, [sp, 0x50] + mov r9, r0 + lsls r4, 24 + lsrs r4, 24 + lsls r3, 24 + lsrs r3, 24 + mov r1, r9 + lsls r1, 24 + lsrs r1, 24 + mov r9, r1 + mov r0, r8 + lsls r0, 24 + lsrs r0, 24 + mov r8, r0 + lsls r1, r4, 4 + orrs r1, r4 + lsls r1, 24 + lsrs r1, 24 + str r3, [sp, 0x28] + bl FillWindowPixelBuffer + add r2, sp, 0xC + ldrh r0, [r5] + ldrh r1, [r6] + subs r0, r1 + strh r0, [r2] + ldrh r0, [r5, 0x2] + ldrh r1, [r6, 0x2] + subs r0, r1 + strh r0, [r2, 0x2] + ldrh r0, [r5, 0x4] + ldrh r1, [r6, 0x4] + subs r0, r1 + strh r0, [r2, 0x4] + ldrh r0, [r5, 0x8] + ldrh r1, [r6, 0x8] + subs r0, r1 + strh r0, [r2, 0x6] + ldrh r0, [r5, 0xA] + ldrh r1, [r6, 0xA] + subs r0, r1 + strh r0, [r2, 0x8] + ldrh r0, [r5, 0x6] + ldrh r1, [r6, 0x6] + subs r0, r1 + strh r0, [r2, 0xA] + add r0, sp, 0x24 + strb r4, [r0] + ldr r3, [sp, 0x28] + strb r3, [r0, 0x1] + mov r1, r9 + strb r1, [r0, 0x2] + movs r7, 0 + mov r10, r0 + movs r0, 0x1 + negs r0, r0 + mov r9, r0 + add r6, sp, 0x18 +_081D36CA: + lsls r0, r7, 4 + subs r0, r7 + lsls r0, 24 + lsrs r5, r0, 24 + mov r1, r10 + str r1, [sp] + mov r0, r9 + str r0, [sp, 0x4] + ldr r1, =gUnknown_08625B54 + lsls r0, r7, 2 + adds r0, r1 + ldr r0, [r0] + str r0, [sp, 0x8] + mov r0, r8 + movs r1, 0x1 + movs r2, 0 + adds r3, r5, 0 + bl AddTextPrinterParameterized3 + lsls r0, r7, 1 + mov r4, sp + adds r4, r0 + adds r4, 0xC + movs r1, 0 + ldrsh r0, [r4, r1] + ldr r1, =gText_Dash + cmp r0, 0 + blt _081D3704 + ldr r1, =gText_UnkCtrlF904 +_081D3704: + adds r0, r6, 0 + bl StringCopy + mov r0, r10 + str r0, [sp] + mov r1, r9 + str r1, [sp, 0x4] + str r6, [sp, 0x8] + mov r0, r8 + movs r1, 0x1 + movs r2, 0x38 + adds r3, r5, 0 + bl AddTextPrinterParameterized3 + movs r0, 0 + ldrsh r1, [r4, r0] + adds r0, r1, 0 + cmp r1, 0 + bge _081D372C + negs r0, r1 +_081D372C: + movs r4, 0xC + cmp r0, 0x9 + bgt _081D3734 + movs r4, 0x12 +_081D3734: + cmp r1, 0 + bge _081D373A + negs r1, r1 +_081D373A: + adds r0, r6, 0 + movs r2, 0 + movs r3, 0x2 + bl ConvertIntToDecimalStringN + adds r2, r4, 0 + adds r2, 0x38 + mov r1, r10 + str r1, [sp] + mov r0, r9 + str r0, [sp, 0x4] + str r6, [sp, 0x8] + mov r0, r8 + movs r1, 0x1 + adds r3, r5, 0 + bl AddTextPrinterParameterized3 + adds r0, r7, 0x1 + lsls r0, 16 + lsrs r7, r0, 16 + cmp r7, 0x5 + bls _081D36CA + add sp, 0x2C + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end DrawLevelUpWindowPg1 + + thumb_func_start DrawLevelUpWindowPg2 +DrawLevelUpWindowPg2: @ 81D3784 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0x2C + mov r8, r0 + adds r5, r1, 0 + adds r4, r2, 0 + adds r6, r3, 0 + ldr r2, [sp, 0x4C] + lsls r4, 24 + lsrs r4, 24 + lsls r6, 24 + lsrs r6, 24 + lsls r2, 24 + lsrs r2, 24 + lsls r0, 24 + lsrs r0, 24 + mov r8, r0 + lsls r1, r4, 4 + orrs r1, r4 + lsls r1, 24 + lsrs r1, 24 + str r2, [sp, 0x28] + bl FillWindowPixelBuffer + add r1, sp, 0xC + ldrh r0, [r5] + strh r0, [r1] + ldrh r0, [r5, 0x2] + strh r0, [r1, 0x2] + ldrh r0, [r5, 0x4] + strh r0, [r1, 0x4] + ldrh r0, [r5, 0x8] + strh r0, [r1, 0x6] + ldrh r0, [r5, 0xA] + strh r0, [r1, 0x8] + ldrh r0, [r5, 0x6] + strh r0, [r1, 0xA] + add r0, sp, 0x24 + strb r4, [r0] + strb r6, [r0, 0x1] + ldr r2, [sp, 0x28] + strb r2, [r0, 0x2] + movs r6, 0 + add r1, sp, 0x18 + mov r9, r1 + mov r7, r8 + mov r10, r0 + movs r2, 0x1 + negs r2, r2 + mov r8, r2 +_081D37EE: + lsls r1, r6, 1 + mov r0, sp + adds r0, r1 + adds r0, 0xC + movs r2, 0 + ldrsh r0, [r0, r2] + movs r4, 0x3 + cmp r0, 0x63 + bgt _081D3808 + movs r4, 0x1 + cmp r0, 0x9 + ble _081D3808 + movs r4, 0x2 +_081D3808: + mov r0, sp + adds r0, r1 + adds r0, 0xC + movs r2, 0 + ldrsh r1, [r0, r2] + mov r0, r9 + movs r2, 0 + adds r3, r4, 0 + bl ConvertIntToDecimalStringN + movs r0, 0x4 + subs r0, r4 + lsls r4, r0, 1 + adds r4, r0 + lsls r4, 17 + lsrs r4, 16 + lsls r5, r6, 4 + subs r5, r6 + lsls r5, 24 + lsrs r5, 24 + mov r0, r10 + str r0, [sp] + mov r1, r8 + str r1, [sp, 0x4] + ldr r1, =gUnknown_08625B54 + lsls r0, r6, 2 + adds r0, r1 + ldr r0, [r0] + str r0, [sp, 0x8] + adds r0, r7, 0 + movs r1, 0x1 + movs r2, 0 + adds r3, r5, 0 + bl AddTextPrinterParameterized3 + adds r4, 0x38 + lsls r4, 24 + lsrs r4, 24 + mov r2, r10 + str r2, [sp] + mov r0, r8 + str r0, [sp, 0x4] + mov r1, r9 + str r1, [sp, 0x8] + adds r0, r7, 0 + movs r1, 0x1 + adds r2, r4, 0 + adds r3, r5, 0 + bl AddTextPrinterParameterized3 + adds r0, r6, 0x1 + lsls r0, 16 + lsrs r6, r0, 16 + cmp r6, 0x5 + bls _081D37EE + add sp, 0x2C + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end DrawLevelUpWindowPg2 + + thumb_func_start GetMonLevelUpWindowStats +GetMonLevelUpWindowStats: @ 81D388C + push {r4,r5,lr} + adds r4, r0, 0 + adds r5, r1, 0 + movs r1, 0x3A @ MON_DATA_MAX_HP + bl GetMonData + strh r0, [r5] + adds r0, r4, 0 + movs r1, 0x3B @ MON_DATA_ATK + bl GetMonData + strh r0, [r5, 0x2] + adds r0, r4, 0 + movs r1, 0x3C @ MON_DATA_DEF + bl GetMonData + strh r0, [r5, 0x4] + adds r0, r4, 0 + movs r1, 0x3D @ MON_DATA_SPEED + bl GetMonData + strh r0, [r5, 0x6] + adds r0, r4, 0 + movs r1, 0x3E @ MON_DATA_SPATK + bl GetMonData + strh r0, [r5, 0x8] + adds r0, r4, 0 + movs r1, 0x3F @ MON_DATA_SPDEF + bl GetMonData + strh r0, [r5, 0xA] + pop {r4,r5} + pop {r0} + bx r0 + thumb_func_end GetMonLevelUpWindowStats + + .align 2, 0 @ Don't pad with nop. diff --git a/asm/rom_81D1C44.s b/asm/rom_81D1C44.s index 99bd11b0d2..001ac1b68f 100644 --- a/asm/rom_81D1C44.s +++ b/asm/rom_81D1C44.s @@ -5,3724 +5,6 @@ .syntax unified .text - - - thumb_func_start sub_81D1C44 -sub_81D1C44: @ 81D1C44 - push {r4,lr} - lsls r0, 24 - ldr r4, =gUnknown_0203CF4C - lsrs r0, 21 - adds r0, 0x8 - bl Alloc - str r0, [r4] - cmp r0, 0 - bne _081D1C60 - movs r0, 0 - b _081D1C7A - .pool -_081D1C60: - movs r2, 0 - ldr r4, =gUnknown_0203CF48 - movs r3, 0xFF -_081D1C66: - adds r0, r2, r4 - ldrb r1, [r0] - orrs r1, r3 - strb r1, [r0] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x2 - bls _081D1C66 - movs r0, 0x1 -_081D1C7A: - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D1C44 - - thumb_func_start sub_81D1C84 -sub_81D1C84: @ 81D1C84 - push {r4-r6,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r6, =gUnknown_0203CF48 - adds r5, r4, r6 - ldrb r0, [r5] - cmp r0, 0xFF - bne _081D1CEC - cmp r4, 0x2 - bne _081D1CD4 - ldr r0, =gUnknown_086253E8 - ldr r1, [r0, 0x14] - ldr r0, [r0, 0x10] - str r0, [sp] - str r1, [sp, 0x4] - ldr r0, =gMailboxMailOptions - movs r1, 0x4 - bl GetMaxWidthInMenuTable - lsls r0, 24 - ldr r2, =0x00ffffff - ldr r1, [sp] - ands r1, r2 - orrs r1, r0 - str r1, [sp] - mov r0, sp - bl AddWindow - strb r0, [r6, 0x2] - b _081D1CE0 - .pool -_081D1CD4: - lsls r0, r4, 3 - ldr r1, =gUnknown_086253E8 - adds r0, r1 - bl AddWindow - strb r0, [r5] -_081D1CE0: - ldr r0, =gUnknown_0203CF48 - adds r0, r4, r0 - ldrb r0, [r0] - movs r1, 0 - bl SetStandardWindowBorderStyle -_081D1CEC: - ldr r0, =gUnknown_0203CF48 - adds r0, r4, r0 - ldrb r0, [r0] - add sp, 0x8 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D1C84 - - thumb_func_start sub_81D1D04 -sub_81D1D04: @ 81D1D04 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, =gUnknown_0203CF48 - adds r4, r0 - ldrb r0, [r4] - movs r1, 0 - bl sub_8198070 - ldrb r0, [r4] - bl ClearWindowTilemap - ldrb r0, [r4] - bl RemoveWindow - movs r0, 0xFF - strb r0, [r4] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D1D04 - - thumb_func_start sub_81D1D34 -sub_81D1D34: @ 81D1D34 - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gUnknown_0203CF48 - adds r0, r1 - ldrb r0, [r0] - bx lr - .pool - thumb_func_end sub_81D1D34 - - thumb_func_start sub_81D1D44 -sub_81D1D44: @ 81D1D44 - push {r4,r5,lr} - sub sp, 0x34 - adds r3, r1, 0 - lsls r0, 24 - lsrs r4, r0, 24 - lsls r2, 24 - lsrs r5, r2, 24 - movs r0, 0x2 - negs r0, r0 - cmp r3, r0 - beq _081D1DAC - ldr r0, =gSaveBlock1Ptr - lsls r1, r3, 3 - adds r1, r3 - lsls r1, 2 - ldr r0, [r0] - adds r1, r0 - ldr r0, =0x00002cca - adds r1, r0 - add r0, sp, 0x14 - bl StringCopy - add r0, sp, 0x14 - bl sub_81DB52C - add r0, sp, 0x14 - bl StringLength - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x5 - bhi _081D1D8C - add r0, sp, 0x14 - movs r1, 0x1 - bl ConvertInternationalString -_081D1D8C: - movs r0, 0 - str r0, [sp] - str r0, [sp, 0x4] - ldr r0, =gUnknown_08625400 - str r0, [sp, 0x8] - movs r0, 0x1 - negs r0, r0 - str r0, [sp, 0xC] - add r0, sp, 0x14 - str r0, [sp, 0x10] - adds r0, r4, 0 - movs r1, 0x1 - movs r2, 0x8 - adds r3, r5, 0 - bl AddTextPrinterParameterized4 -_081D1DAC: - add sp, 0x34 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D1D44 - - thumb_func_start sub_81D1DC0 -sub_81D1DC0: @ 81D1DC0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - adds r5, r0, 0 - movs r3, 0 - ldr r7, =gUnknown_0203CF4C - ldr r0, =gText_Cancel2 - mov r12, r0 - ldr r4, =gMultiuseListMenuTemplate - ldr r1, =gUnknown_0203CF48 - mov r8, r1 - ldr r2, =sub_81D1E7C - mov r9, r2 - ldr r0, =sub_81D1D44 - mov r10, r0 - ldrb r1, [r5, 0x5] - cmp r3, r1 - bcs _081D1E02 - adds r6, r7, 0 - ldr r2, =gUnknown_08625403 -_081D1DEC: - ldr r1, [r6] - lsls r0, r3, 3 - adds r0, r1 - str r2, [r0] - str r3, [r0, 0x4] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - ldrb r0, [r5, 0x5] - cmp r3, r0 - bcc _081D1DEC -_081D1E02: - ldr r2, [r7] - lsls r0, r3, 3 - adds r0, r2 - mov r1, r12 - str r1, [r0] - movs r1, 0x2 - negs r1, r1 - str r1, [r0, 0x4] - str r2, [r4] - ldrb r0, [r5, 0x5] - adds r0, 0x1 - movs r1, 0 - strh r0, [r4, 0xC] - mov r2, r8 - ldrb r0, [r2, 0x1] - strb r0, [r4, 0x10] - strb r1, [r4, 0x11] - movs r0, 0x8 - strb r0, [r4, 0x12] - strb r1, [r4, 0x13] - strh r0, [r4, 0xE] - movs r0, 0x29 - strb r0, [r4, 0x14] - movs r0, 0x31 - strb r0, [r4, 0x15] - mov r0, r9 - str r0, [r4, 0x4] - mov r1, r10 - str r1, [r4, 0x8] - movs r0, 0x1 - strb r0, [r4, 0x17] - movs r0, 0 - strb r0, [r4, 0x16] - ldrh r1, [r5, 0x2] - ldrh r2, [r5] - adds r0, r4, 0 - bl ListMenuInit - lsls r0, 24 - lsrs r0, 24 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D1DC0 - - thumb_func_start sub_81D1E7C -sub_81D1E7C: @ 81D1E7C - push {lr} - lsls r1, 24 - lsrs r1, 24 - cmp r1, 0x1 - beq _081D1E8C - movs r0, 0x5 - bl PlaySE -_081D1E8C: - pop {r0} - bx r0 - thumb_func_end sub_81D1E7C - - thumb_func_start sub_81D1E90 -sub_81D1E90: @ 81D1E90 - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - ldrb r0, [r4, 0x5] - ldrb r1, [r4, 0x4] - subs r0, r1 - adds r0, 0x1 - str r0, [sp] - movs r0, 0x6E - str r0, [sp, 0x4] - str r0, [sp, 0x8] - adds r0, r4, 0x2 - str r0, [sp, 0xC] - movs r0, 0x2 - movs r1, 0xC8 - movs r2, 0xC - movs r3, 0x94 - bl AddScrollIndicatorArrowPairParameterized - strb r0, [r4, 0x9] - add sp, 0x10 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81D1E90 - - thumb_func_start sub_81D1EC0 -sub_81D1EC0: @ 81D1EC0 - push {lr} - ldr r0, =gUnknown_0203CF4C - ldr r0, [r0] - bl Free - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D1EC0 - - thumb_func_start sub_81D1ED4 -sub_81D1ED4: @ 81D1ED4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - adds r3, r0, 0 - movs r6, 0 - movs r7, 0 -_081D1EE6: - movs r2, 0 - lsls r5, r6, 2 - adds r0, r6, 0x1 - mov r10, r0 - adds r4, r5, 0 -_081D1EF0: - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 2 - adds r0, r4, r0 - adds r0, r3, r0 - adds r1, r0, 0 - adds r1, 0x64 - strh r7, [r1] - adds r0, 0x66 - strh r7, [r0] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x9 - bls _081D1EF0 - movs r2, 0 - mov r9, r2 - str r5, [sp] - movs r1, 0x9B - mov r8, r1 - movs r4, 0x5B - mov r12, r4 -_081D1F1C: - lsls r0, r2, 2 - adds r0, r2 - adds r1, r6, r0 - adds r1, r3, r1 - mov r4, r9 - strb r4, [r1] - lsls r0, 2 - ldr r1, [sp] - adds r0, r1, r0 - adds r0, r3, r0 - mov r4, r8 - strh r4, [r0, 0x14] - mov r1, r12 - strh r1, [r0, 0x16] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x3 - bls _081D1F1C - adds r1, r3, r5 - movs r2, 0x96 - lsls r2, 1 - adds r0, r1, r2 - strh r7, [r0] - movs r4, 0x97 - lsls r4, 1 - adds r0, r1, r4 - strh r7, [r0] - mov r1, r10 - lsls r0, r1, 24 - lsrs r6, r0, 24 - cmp r6, 0x4 - bls _081D1EE6 - movs r2, 0xD5 - lsls r2, 2 - adds r0, r3, r2 - movs r1, 0 - strb r1, [r0] - ldr r4, =0x00000352 - adds r0, r3, r4 - strh r1, [r0] - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D1ED4 - - thumb_func_start sub_81D1F84 -sub_81D1F84: @ 81D1F84 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - mov r8, r0 - str r1, [sp] - mov r9, r2 - movs r7, 0 -_081D1F98: - lsls r4, r7, 2 - ldr r1, [sp] - adds r0, r4, r1 - ldrh r1, [r0] - lsls r5, r1, 8 - mov r2, r9 - adds r0, r4, r2 - ldrh r0, [r0] - subs r0, r1 - lsls r0, 8 - movs r1, 0xA - bl __divsi3 - adds r6, r0, 0 - movs r3, 0 - adds r7, 0x1 - mov r10, r7 - mov r12, r4 -_081D1FBC: - lsls r0, r3, 2 - adds r0, r3 - lsls r0, 2 - add r0, r12 - add r0, r8 - asrs r2, r5, 8 - asrs r1, r5, 7 - movs r7, 0x1 - ands r1, r7 - adds r2, r1 - adds r0, 0x64 - strh r2, [r0] - adds r5, r6 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x8 - bls _081D1FBC - lsls r0, r3, 2 - adds r0, r3 - lsls r0, 2 - adds r0, r4, r0 - add r0, r8 - mov r1, r9 - adds r2, r4, r1 - ldrh r1, [r2] - adds r0, 0x64 - strh r1, [r0] - ldr r7, [sp] - adds r0, r4, r7 - ldrh r1, [r0, 0x2] - lsls r5, r1, 8 - ldrh r0, [r2, 0x2] - subs r0, r1 - lsls r0, 8 - movs r1, 0xA - bl __divsi3 - adds r6, r0, 0 - movs r3, 0 - str r4, [sp, 0x4] - movs r0, 0x1 - mov r12, r0 -_081D2012: - lsls r0, r3, 2 - adds r0, r3 - lsls r0, 2 - ldr r1, [sp, 0x4] - adds r0, r1, r0 - add r0, r8 - asrs r2, r5, 8 - asrs r1, r5, 7 - mov r7, r12 - ands r1, r7 - adds r2, r1 - adds r0, 0x66 - strh r2, [r0] - adds r5, r6 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x8 - bls _081D2012 - lsls r0, r3, 2 - adds r0, r3 - lsls r0, 2 - adds r0, r4, r0 - add r0, r8 - mov r2, r9 - adds r1, r4, r2 - ldrh r1, [r1, 0x2] - adds r0, 0x66 - strh r1, [r0] - mov r7, r10 - lsls r0, r7, 16 - lsrs r7, r0, 16 - cmp r7, 0x4 - bls _081D1F98 - ldr r1, =0x00000352 - add r1, r8 - movs r0, 0 - strh r0, [r1] - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D1F84 - - thumb_func_start sub_81D2074 -sub_81D2074: @ 81D2074 - push {r4,lr} - adds r1, r0, 0 - ldr r0, =0x00000352 - adds r4, r1, r0 - ldrh r0, [r4] - cmp r0, 0x9 - bls _081D208C - movs r0, 0 - b _081D20A6 - .pool -_081D208C: - adds r0, r1, 0 - bl sub_81D2230 - ldrh r1, [r4] - adds r1, 0x1 - strh r1, [r4] - lsls r1, 16 - lsrs r1, 16 - movs r0, 0xA - eors r1, r0 - negs r0, r1 - orrs r0, r1 - lsrs r0, 31 -_081D20A6: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81D2074 - - thumb_func_start sub_81D20AC -sub_81D20AC: @ 81D20AC - ldr r1, =0x00000355 - adds r0, r1 - movs r1, 0 - strb r1, [r0] - bx lr - .pool - thumb_func_end sub_81D20AC - - thumb_func_start sub_81D20BC -sub_81D20BC: @ 81D20BC - push {r4,r5,lr} - sub sp, 0xC - ldr r1, =0x00000355 - adds r4, r0, r1 - ldrb r0, [r4] - cmp r0, 0 - beq _081D20D4 - cmp r0, 0x1 - beq _081D20E2 - b _081D20FA - .pool -_081D20D4: - bl ScanlineEffect_Clear - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - movs r0, 0x1 - b _081D20FC -_081D20E2: - mov r0, sp - ldr r1, =gUnknown_08625404 - ldm r1!, {r2,r3,r5} - stm r0!, {r2,r3,r5} - ldr r0, [sp] - ldr r1, [sp, 0x4] - ldr r2, [sp, 0x8] - bl ScanlineEffect_SetParams - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] -_081D20FA: - movs r0, 0 -_081D20FC: - add sp, 0xC - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D20BC - - thumb_func_start sub_81D2108 -sub_81D2108: @ 81D2108 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x10 - adds r6, r0, 0 - movs r1, 0xD5 - lsls r1, 2 - adds r0, r6, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _081D21BE - adds r0, r6, 0 - bl sub_81D24A4 - adds r0, r6, 0 - bl sub_81D2634 - movs r7, 0 - ldr r5, =gScanlineEffectRegBuffers - mov r12, r5 - movs r0, 0xF0 - lsls r0, 3 - add r0, r12 - mov r9, r0 - movs r1, 0xA0 - lsls r1, 1 - adds r1, r6, r1 - str r1, [sp] - ldr r5, =0x0000ffff - mov r8, r5 - movs r0, 0xA1 - lsls r0, 1 - adds r0, r6, r0 - str r0, [sp, 0x4] - movs r1, 0x92 - lsls r1, 2 - adds r1, r6, r1 - str r1, [sp, 0x8] - ldr r5, =0x0000024a - adds r5, r6 - mov r10, r5 -_081D215E: - adds r2, r7, 0 - adds r2, 0x37 - lsls r3, r2, 2 - mov r0, r9 - adds r0, r3, r0 - str r0, [sp, 0xC] - add r3, r12 - lsls r4, r7, 2 - ldr r1, [sp] - adds r0, r1, r4 - ldrh r0, [r0] - lsls r0, 8 - ldr r5, [sp, 0x4] - adds r1, r5, r4 - ldrh r1, [r1] - orrs r0, r1 - strh r0, [r3] - mov r1, r8 - ands r0, r1 - ldr r5, [sp, 0xC] - strh r0, [r5] - lsls r2, 1 - adds r2, 0x1 - lsls r2, 1 - mov r0, r9 - adds r3, r2, r0 - add r2, r12 - ldr r1, [sp, 0x8] - adds r0, r1, r4 - ldrh r0, [r0] - lsls r0, 8 - add r4, r10 - ldrh r1, [r4] - orrs r0, r1 - strh r0, [r2] - mov r5, r8 - ands r0, r5 - strh r0, [r3] - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0x41 - bls _081D215E - movs r0, 0xD5 - lsls r0, 2 - adds r1, r6, r0 - movs r0, 0 - strb r0, [r1] -_081D21BE: - add sp, 0x10 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D2108 - - thumb_func_start sub_81D21DC -sub_81D21DC: @ 81D21DC - push {r4,r5,lr} - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x3 - bls _081D21E8 - movs r1, 0 -_081D21E8: - movs r0, 0x1 - lsls r0, r1 - movs r5, 0x1F - bics r5, r0 - movs r0, 0x40 - movs r1, 0xF0 - bl SetGpuReg - movs r0, 0x42 - movs r1, 0x9B - bl SetGpuReg - ldr r4, =0x00003879 - movs r0, 0x44 - adds r1, r4, 0 - bl SetGpuReg - movs r0, 0x46 - adds r1, r4, 0 - bl SetGpuReg - ldr r1, =0x00003f3f - movs r0, 0x48 - bl SetGpuReg - movs r0, 0x4A - adds r1, r5, 0 - bl SetGpuReg - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D21DC - - thumb_func_start sub_81D2230 -sub_81D2230: @ 81D2230 - push {r4-r7,lr} - mov r12, r0 - movs r4, 0 - movs r7, 0x96 - lsls r7, 1 - add r7, r12 - ldr r6, =0x00000352 - add r6, r12 - mov r5, r12 - adds r5, 0x64 -_081D2244: - lsls r2, r4, 2 - adds r3, r7, r2 - ldrh r1, [r6] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r2, r0 - adds r2, r5, r2 - ldr r0, [r2] - str r0, [r3] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x4 - bls _081D2244 - movs r1, 0xD5 - lsls r1, 2 - add r1, r12 - movs r0, 0x1 - strb r0, [r1] - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D2230 - - thumb_func_start sub_81D2278 -sub_81D2278: @ 81D2278 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x18 - str r0, [sp] - adds r6, r1, 0 - adds r5, r2, 0 - str r3, [sp, 0x4] - ldr r0, [sp, 0x38] - ldr r7, [sp, 0x3C] - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - movs r0, 0 - str r0, [sp, 0xC] - ldrh r0, [r5, 0x2] - ldrh r1, [r3, 0x2] - cmp r0, r1 - bcs _081D22B2 - adds r2, r0, 0 - mov r10, r2 - ldrh r0, [r3, 0x2] - ldrh r1, [r5] - lsls r4, r1, 10 - ldrh r3, [r3] - str r3, [sp, 0x8] - b _081D22C6 -_081D22B2: - ldrh r0, [r5, 0x2] - ldr r1, [sp, 0x4] - ldrh r1, [r1, 0x2] - mov r10, r1 - ldr r2, [sp, 0x4] - ldrh r1, [r2] - lsls r4, r1, 10 - ldrh r3, [r5] - str r3, [sp, 0x8] - mov r2, r10 -_081D22C6: - subs r0, r2 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - cmp r0, 0 - beq _081D22DE - subs r0, r3, r1 - lsls r0, 10 - mov r1, r8 - bl __divsi3 - str r0, [sp, 0xC] -_081D22DE: - mov r0, r8 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - cmp r7, 0 - bne _081D2328 - mov r0, r10 - subs r0, 0x38 - lsls r0, 2 - adds r6, r0 - movs r5, 0 - mov r3, r9 - lsls r3, 1 - mov r12, r3 - ldr r0, [sp, 0x8] - add r0, r9 - str r0, [sp, 0x10] - cmp r7, r8 - bcs _081D23B6 - movs r7, 0x1 -_081D2308: - adds r2, r3, r6 - asrs r1, r4, 10 - asrs r0, r4, 9 - ands r0, r7 - adds r1, r0 - add r1, r9 - strh r1, [r2] - ldr r1, [sp, 0xC] - adds r4, r1 - adds r6, 0x4 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, r8 - bcc _081D2308 - b _081D23B6 -_081D2328: - ldr r2, [sp, 0xC] - cmp r2, 0 - ble _081D23C0 - mov r0, r10 - subs r0, 0x38 - lsls r0, 2 - adds r7, r0 - movs r5, 0 - mov r3, r9 - lsls r3, 1 - mov r12, r3 - ldr r0, [sp, 0x8] - add r0, r9 - str r0, [sp, 0x10] - cmp r5, r8 - bcs _081D237A - ldr r0, =0x00026bff - cmp r4, r0 - bgt _081D237A - mov r1, r12 - str r1, [sp, 0x14] -_081D2352: - ldr r3, [sp, 0x14] - adds r2, r3, r7 - asrs r1, r4, 10 - asrs r0, r4, 9 - movs r3, 0x1 - ands r0, r3 - adds r1, r0 - add r1, r9 - strh r1, [r2] - ldr r0, [sp, 0xC] - adds r4, r0 - adds r7, 0x4 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, r8 - bcs _081D237A - ldr r1, =0x00026bff - cmp r4, r1 - ble _081D2352 -_081D237A: - mov r2, r10 - adds r1, r2, r5 - ldr r3, [sp] - movs r2, 0xD4 - lsls r2, 2 - adds r0, r3, r2 - strh r1, [r0] - ldrh r0, [r0] - subs r0, 0x38 - lsls r0, 2 - adds r6, r0 - cmp r5, r8 - bcs _081D23B6 - mov r3, r12 - movs r7, 0x1 -_081D2398: - adds r2, r3, r6 - asrs r1, r4, 10 - asrs r0, r4, 9 - ands r0, r7 - adds r1, r0 - add r1, r9 - strh r1, [r2] - ldr r0, [sp, 0xC] - adds r4, r0 - adds r6, 0x4 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, r8 - bcc _081D2398 -_081D23B6: - subs r0, r6, 0x4 - b _081D248C - .pool -_081D23C0: - ldr r1, [sp, 0xC] - cmp r1, 0 - bge _081D2464 - mov r0, r10 - subs r0, 0x38 - lsls r0, 2 - adds r6, r0 - movs r5, 0 - mov r2, r9 - lsls r2, 1 - mov r12, r2 - ldr r3, [sp, 0x8] - add r3, r9 - str r3, [sp, 0x10] - cmp r5, r8 - bcs _081D241E - adds r3, r2, r6 - asrs r1, r4, 10 - asrs r0, r4, 9 - movs r2, 0x1 - ands r0, r2 - adds r1, r0 - add r1, r9 - strh r1, [r3] - b _081D2414 -_081D23F2: - ldr r0, [sp, 0xC] - adds r4, r0 - adds r6, 0x4 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, r8 - bcs _081D241E - mov r1, r12 - adds r3, r1, r6 - asrs r2, r4, 10 - asrs r0, r4, 9 - movs r1, 0x1 - ands r0, r1 - adds r2, r0 - add r2, r9 - strh r2, [r3] -_081D2414: - ldr r0, =0x00026bff - cmp r4, r0 - bgt _081D23F2 - movs r0, 0x9B - strh r0, [r3] -_081D241E: - mov r2, r10 - adds r1, r2, r5 - ldr r3, [sp] - movs r2, 0xD4 - lsls r2, 2 - adds r0, r3, r2 - strh r1, [r0] - ldrh r0, [r0] - subs r0, 0x38 - lsls r0, 2 - adds r7, r0 - cmp r5, r8 - bcs _081D245A - mov r3, r12 - movs r6, 0x1 -_081D243C: - adds r2, r3, r7 - asrs r1, r4, 10 - asrs r0, r4, 9 - ands r0, r6 - adds r1, r0 - add r1, r9 - strh r1, [r2] - ldr r0, [sp, 0xC] - adds r4, r0 - adds r7, 0x4 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, r8 - bcc _081D243C -_081D245A: - subs r0, r7, 0x4 - b _081D248C - .pool -_081D2464: - ldr r1, [sp] - movs r2, 0xD4 - lsls r2, 2 - adds r0, r1, r2 - mov r3, r10 - strh r3, [r0] - mov r0, r10 - subs r0, 0x38 - lsls r0, 2 - adds r6, r0 - adds r7, r0 - ldrh r0, [r5] - adds r0, 0x1 - strh r0, [r6, 0x2] - ldr r1, [sp, 0x4] - ldrh r0, [r1] - strh r0, [r7] - movs r0, 0x9B - strh r0, [r7, 0x2] - b _081D2494 -_081D248C: - add r0, r12 - mov r2, sp - ldrh r2, [r2, 0x10] - strh r2, [r0] -_081D2494: - add sp, 0x18 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81D2278 - - thumb_func_start sub_81D24A4 -sub_81D24A4: @ 81D24A4 - push {r4-r7,lr} - sub sp, 0x8 - adds r4, r0, 0 - movs r0, 0x97 - lsls r0, 1 - adds r2, r4, r0 - movs r3, 0x99 - lsls r3, 1 - adds r1, r4, r3 - ldrh r0, [r2] - ldrh r3, [r1] - cmp r0, r3 - bcs _081D24E0 - adds r7, r0, 0 - movs r0, 0xA0 - lsls r0, 1 - adds r1, r4, r0 - movs r3, 0x96 - lsls r3, 1 - adds r2, r4, r3 - subs r0, 0x10 - adds r3, r4, r0 - movs r0, 0x1 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - adds r0, r4, 0 - bl sub_81D2278 - b _081D2500 -_081D24E0: - ldrh r7, [r1] - movs r2, 0xA0 - lsls r2, 1 - adds r1, r4, r2 - movs r3, 0x98 - lsls r3, 1 - adds r2, r4, r3 - movs r0, 0x96 - lsls r0, 1 - adds r3, r4, r0 - movs r0, 0 - str r0, [sp] - str r0, [sp, 0x4] - adds r0, r4, 0 - bl sub_81D2278 -_081D2500: - movs r1, 0xA0 - lsls r1, 1 - adds r5, r4, r1 - movs r3, 0x98 - lsls r3, 1 - adds r2, r4, r3 - movs r0, 0x9A - lsls r0, 1 - adds r6, r4, r0 - movs r0, 0x1 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - adds r0, r4, 0 - adds r1, r5, 0 - adds r3, r6, 0 - bl sub_81D2278 - movs r2, 0 - movs r1, 0x9B - lsls r1, 1 - adds r0, r4, r1 - movs r3, 0x9D - lsls r3, 1 - adds r1, r4, r3 - ldrh r0, [r0] - ldrh r1, [r1] - cmp r0, r1 - bhi _081D253C - movs r2, 0x1 -_081D253C: - movs r0, 0x9C - lsls r0, 1 - adds r3, r4, r0 - str r2, [sp] - movs r1, 0x92 - lsls r1, 2 - adds r0, r4, r1 - str r0, [sp, 0x4] - adds r0, r4, 0 - adds r1, r5, 0 - adds r2, r6, 0 - bl sub_81D2278 - movs r2, 0x38 - cmp r2, r7 - bcs _081D257E - adds r6, r5, 0 - movs r3, 0 - movs r0, 0xA1 - lsls r0, 1 - adds r5, r4, r0 -_081D2566: - adds r0, r2, 0 - subs r0, 0x38 - lsls r0, 2 - adds r1, r6, r0 - strh r3, [r1] - adds r0, r5, r0 - strh r3, [r0] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, r7 - bcc _081D2566 -_081D257E: - movs r1, 0x97 - lsls r1, 1 - adds r0, r4, r1 - ldrh r2, [r0] - movs r3, 0xD4 - lsls r3, 2 - adds r0, r4, r3 - ldrh r1, [r0] - cmp r2, r1 - bhi _081D25B2 - movs r1, 0xA0 - lsls r1, 1 - adds r3, r4, r1 - movs r5, 0x9B - adds r1, r0, 0 -_081D259C: - adds r0, r2, 0 - subs r0, 0x38 - lsls r0, 2 - adds r0, r3, r0 - strh r5, [r0] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - ldrh r0, [r1] - cmp r2, r0 - bls _081D259C -_081D25B2: - movs r2, 0x9B - lsls r2, 1 - adds r1, r4, r2 - movs r3, 0xD4 - lsls r3, 2 - adds r0, r4, r3 - ldrh r0, [r0] - ldrh r1, [r1] - cmp r0, r1 - bcs _081D25C8 - adds r0, r1, 0 -_081D25C8: - adds r0, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x79 - bhi _081D25F8 - movs r0, 0xA0 - lsls r0, 1 - adds r6, r4, r0 - movs r3, 0 - movs r1, 0xA1 - lsls r1, 1 - adds r5, r4, r1 -_081D25E0: - adds r0, r2, 0 - subs r0, 0x38 - lsls r0, 2 - adds r1, r6, r0 - strh r3, [r1] - adds r0, r5, r0 - strh r3, [r0] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x79 - bls _081D25E0 -_081D25F8: - movs r2, 0x38 - movs r3, 0xA0 - lsls r3, 1 - adds r5, r4, r3 - movs r0, 0xA1 - lsls r0, 1 - adds r4, r0 - movs r6, 0x9B -_081D2608: - adds r0, r2, 0 - subs r0, 0x38 - lsls r1, r0, 2 - adds r3, r5, r1 - ldrh r0, [r3] - cmp r0, 0 - bne _081D2620 - adds r0, r4, r1 - ldrh r0, [r0] - cmp r0, 0 - beq _081D2620 - strh r6, [r3] -_081D2620: - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x79 - bls _081D2608 - add sp, 0x8 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81D24A4 - - thumb_func_start sub_81D2634 -sub_81D2634: @ 81D2634 - push {r4-r6,lr} - sub sp, 0x8 - adds r4, r0, 0 - movs r0, 0x97 - lsls r0, 1 - adds r2, r4, r0 - movs r3, 0x9F - lsls r3, 1 - adds r1, r4, r3 - ldrh r0, [r2] - ldrh r5, [r1] - cmp r0, r5 - bcs _081D266E - adds r6, r0, 0 - movs r0, 0x92 - lsls r0, 2 - adds r1, r4, r0 - subs r3, 0x12 - adds r2, r4, r3 - movs r5, 0x9E - lsls r5, 1 - adds r3, r4, r5 - movs r0, 0 - str r0, [sp] - str r0, [sp, 0x4] - adds r0, r4, 0 - bl sub_81D2278 - b _081D2690 -_081D266E: - ldrh r6, [r1] - movs r0, 0x92 - lsls r0, 2 - adds r1, r4, r0 - movs r3, 0x9E - lsls r3, 1 - adds r2, r4, r3 - movs r5, 0x96 - lsls r5, 1 - adds r3, r4, r5 - movs r0, 0x1 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - adds r0, r4, 0 - bl sub_81D2278 -_081D2690: - movs r0, 0x92 - lsls r0, 2 - adds r5, r4, r0 - movs r1, 0x9E - lsls r1, 1 - adds r2, r4, r1 - movs r0, 0x9C - lsls r0, 1 - adds r3, r4, r0 - movs r0, 0 - str r0, [sp] - str r0, [sp, 0x4] - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_81D2278 - cmp r6, 0x38 - ble _081D26C8 - movs r0, 0 - adds r1, r5, 0 - adds r2, r6, 0 - subs r2, 0x38 -_081D26BC: - strh r0, [r1] - strh r0, [r1, 0x2] - adds r1, 0x4 - subs r2, 0x1 - cmp r2, 0 - bne _081D26BC -_081D26C8: - movs r1, 0x97 - lsls r1, 1 - adds r0, r4, r1 - ldrh r2, [r0] - movs r3, 0xD4 - lsls r3, 2 - adds r0, r4, r3 - ldrh r5, [r0] - cmp r2, r5 - bgt _081D26F6 - movs r3, 0x9B - adds r1, r0, 0 - lsls r0, r2, 2 - movs r5, 0xB5 - lsls r5, 1 - adds r0, r5 - adds r0, r4 -_081D26EA: - strh r3, [r0] - adds r0, 0x4 - adds r2, 0x1 - ldrh r5, [r1] - cmp r2, r5 - ble _081D26EA -_081D26F6: - movs r1, 0x9D - lsls r1, 1 - adds r0, r4, r1 - ldrh r0, [r0] - adds r1, r0, 0x1 - movs r2, 0xD4 - lsls r2, 2 - adds r0, r4, r2 - ldrh r0, [r0] - cmp r0, r1 - bge _081D270E - adds r0, r1, 0 -_081D270E: - adds r2, r0, 0 - cmp r2, 0x79 - bgt _081D272C - movs r1, 0 - lsls r0, r2, 2 - movs r3, 0xB4 - lsls r3, 1 - adds r0, r3 - adds r0, r4 -_081D2720: - strh r1, [r0] - strh r1, [r0, 0x2] - adds r0, 0x4 - adds r2, 0x1 - cmp r2, 0x79 - ble _081D2720 -_081D272C: - movs r3, 0 - movs r5, 0x92 - lsls r5, 2 - adds r1, r4, r5 - movs r2, 0x41 -_081D2736: - ldrh r0, [r1] - ldrh r4, [r1, 0x2] - cmp r0, r4 - bcc _081D2742 - strh r3, [r1, 0x2] - strh r3, [r1] -_081D2742: - adds r1, 0x4 - subs r2, 0x1 - cmp r2, 0 - bge _081D2736 - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_81D2634 - - thumb_func_start sub_81D2754 -sub_81D2754: @ 81D2754 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - adds r6, r0, 0 - mov r8, r1 - ldr r1, =gUnknown_08625410 - ldrb r0, [r6] - adds r0, r1 - ldrb r2, [r0] - adds r6, 0x1 - movs r0, 0x9B - mov r3, r8 - strh r0, [r3] - movs r0, 0x5B - subs r0, r2 - strh r0, [r3, 0x2] - movs r7, 0x40 - movs r0, 0 - mov r12, r0 - movs r2, 0x1 - mov r9, r2 - ldr r3, =gSineTable - mov r10, r3 -_081D2786: - adds r0, r7, 0 - adds r0, 0x33 - lsls r0, 24 - lsrs r7, r0, 24 - mov r1, r12 - lsls r0, r1, 24 - movs r2, 0xFF - lsls r2, 24 - adds r0, r2 - lsrs r3, r0, 24 - mov r12, r3 - cmp r0, 0 - bge _081D27A4 - movs r0, 0x4 - mov r12, r0 -_081D27A4: - mov r1, r12 - lsls r0, r1, 24 - asrs r4, r0, 24 - cmp r4, 0x2 - bne _081D27B4 - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 -_081D27B4: - ldrb r0, [r6] - ldr r2, =gUnknown_08625410 - adds r0, r2 - ldrb r2, [r0] - adds r6, 0x1 - lsls r0, r4, 2 - mov r1, r8 - adds r3, r0, r1 - adds r0, r7, 0 - adds r0, 0x40 - lsls r0, 1 - add r0, r10 - movs r1, 0 - ldrsh r0, [r0, r1] - muls r0, r2 - asrs r5, r0, 8 - adds r0, r5, 0 - adds r0, 0x9B - strh r0, [r3] - lsls r0, r7, 1 - add r0, r10 - movs r1, 0 - ldrsh r0, [r0, r1] - adds r1, r2, 0 - muls r1, r0 - asrs r1, 8 - movs r0, 0x5B - subs r0, r1 - strh r0, [r3, 0x2] - cmp r4, 0x2 - bgt _081D2800 - cmp r2, 0x20 - bne _081D27FA - cmp r4, 0x2 - beq _081D2800 -_081D27FA: - adds r0, r5, 0 - adds r0, 0x9C - strh r0, [r3] -_081D2800: - mov r0, r9 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 - cmp r0, 0x4 - bls _081D2786 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D2754 - - thumb_func_start InitMoveRelearnerWindows -InitMoveRelearnerWindows: @ 81D2824 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r0, =gMoveRelearnerWindowTemplates - bl InitWindows - bl DeactivateAllTextPrinters - movs r0, 0 - movs r1, 0x1 - movs r2, 0xE0 - bl LoadUserWindowBorderGfx - ldr r0, =gUnknown_0860F074 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - movs r4, 0 -_081D284A: - adds r0, r4, 0 - movs r1, 0x11 - bl FillWindowPixelBuffer - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x4 - bls _081D284A - cmp r5, 0 - bne _081D287C - movs r0, 0 - bl PutWindowTilemap - movs r0, 0 - movs r1, 0 - movs r2, 0x1 - movs r3, 0xE - bl SetWindowBorderStyle - b _081D288E - .pool -_081D287C: - movs r0, 0x1 - bl PutWindowTilemap - movs r0, 0x1 - movs r1, 0 - movs r2, 0x1 - movs r3, 0xE - bl SetWindowBorderStyle -_081D288E: - movs r0, 0x2 - bl PutWindowTilemap - movs r0, 0x3 - bl PutWindowTilemap - movs r0, 0x2 - movs r1, 0 - movs r2, 0x1 - movs r3, 0xE - bl SetWindowBorderStyle - movs r0, 0x3 - movs r1, 0 - movs r2, 0x1 - movs r3, 0xE - bl SetWindowBorderStyle - bl nullsub_79 - movs r0, 0x1 - bl schedule_bg_copy_tilemap_to_vram - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end InitMoveRelearnerWindows - - thumb_func_start nullsub_79 -nullsub_79: @ 81D28C4 - bx lr - thumb_func_end nullsub_79 - - thumb_func_start LoadMoveRelearnerMovesList -LoadMoveRelearnerMovesList: @ 81D28C8 - push {r4-r7,lr} - lsls r1, 16 - lsrs r4, r1, 16 - ldr r3, =gMultiuseListMenuTemplate - adds r2, r3, 0 - ldr r1, =gMoveRelearnerMovesListTemplate - ldm r1!, {r5-r7} - stm r2!, {r5-r7} - ldm r1!, {r5-r7} - stm r2!, {r5-r7} - strh r4, [r3, 0xC] - str r0, [r3] - cmp r4, 0x5 - bhi _081D28F0 - strh r4, [r3, 0xE] - b _081D28F4 - .pool -_081D28F0: - movs r0, 0x6 - strh r0, [r3, 0xE] -_081D28F4: - ldrb r0, [r3, 0xE] - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end LoadMoveRelearnerMovesList - - thumb_func_start MoveRelearnerLoadBattleMoveDescription -MoveRelearnerLoadBattleMoveDescription: @ 81D28FC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x2C - mov r9, r0 - movs r0, 0 - movs r1, 0x11 - bl FillWindowPixelBuffer - ldr r5, =gText_BattleMoves2 - movs r0, 0x1 - adds r1, r5, 0 - movs r2, 0x80 - bl GetStringCenterAlignXOffset - adds r4, r0, 0 - lsls r3, r4, 24 - lsrs r3, 24 - movs r0, 0x1 - str r0, [sp] - movs r0, 0xFF - mov r8, r0 - str r0, [sp, 0x4] - movs r7, 0 - str r7, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - adds r2, r5, 0 - bl AddTextPrinterParameterized - ldr r5, =gText_PPSlash - movs r1, 0x29 - mov r10, r1 - str r1, [sp] - mov r0, r8 - str r0, [sp, 0x4] - str r7, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - adds r2, r5, 0 - movs r3, 0x4 - bl AddTextPrinterParameterized - ldr r5, =gText_PowerSlash - movs r0, 0x1 - adds r1, r5, 0 - movs r2, 0x6A - bl GetStringRightAlignXOffset - adds r4, r0, 0 - lsls r3, r4, 24 - lsrs r3, 24 - movs r1, 0x19 - str r1, [sp] - mov r0, r8 - str r0, [sp, 0x4] - str r7, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - adds r2, r5, 0 - bl AddTextPrinterParameterized - ldr r5, =gText_AccuracySlash - movs r0, 0x1 - adds r1, r5, 0 - movs r2, 0x6A - bl GetStringRightAlignXOffset - adds r4, r0, 0 - lsls r3, r4, 24 - lsrs r3, 24 - mov r1, r10 - str r1, [sp] - mov r0, r8 - str r0, [sp, 0x4] - str r7, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - adds r2, r5, 0 - bl AddTextPrinterParameterized - movs r0, 0x2 - negs r0, r0 - cmp r9, r0 - bne _081D29C4 - movs r0, 0 - movs r1, 0x2 - bl CopyWindowToVram - b _081D2AB6 - .pool -_081D29C4: - mov r1, r9 - lsls r0, r1, 1 - add r0, r9 - lsls r0, 2 - ldr r1, =gBattleMoves - adds r6, r0, r1 - ldrb r1, [r6, 0x2] - lsls r0, r1, 3 - subs r0, r1 - ldr r1, =gTypeNames - adds r5, r0, r1 - movs r0, 0x19 - str r0, [sp] - mov r1, r8 - str r1, [sp, 0x4] - str r7, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - adds r2, r5, 0 - movs r3, 0x4 - bl AddTextPrinterParameterized - ldr r1, =gText_PPSlash - movs r0, 0x1 - movs r2, 0 - bl GetStringWidth - adds r4, r0, 0x4 - ldrb r1, [r6, 0x4] - add r0, sp, 0xC - movs r2, 0 - movs r3, 0x2 - bl ConvertIntToDecimalStringN - lsls r3, r4, 24 - lsrs r3, 24 - mov r0, r10 - str r0, [sp] - mov r1, r8 - str r1, [sp, 0x4] - str r7, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - add r2, sp, 0xC - bl AddTextPrinterParameterized - ldrb r0, [r6, 0x1] - cmp r0, 0x1 - bhi _081D2A3C - ldr r5, =gText_ThreeDashes - b _081D2A4A - .pool -_081D2A3C: - ldrb r1, [r6, 0x1] - add r0, sp, 0xC - movs r2, 0 - movs r3, 0x3 - bl ConvertIntToDecimalStringN - add r5, sp, 0xC -_081D2A4A: - movs r0, 0x19 - str r0, [sp] - movs r0, 0xFF - str r0, [sp, 0x4] - movs r0, 0 - str r0, [sp, 0x8] - movs r1, 0x1 - adds r2, r5, 0 - movs r3, 0x6A - bl AddTextPrinterParameterized - ldrb r0, [r6, 0x3] - cmp r0, 0 - bne _081D2A70 - ldr r5, =gText_ThreeDashes - b _081D2A7E - .pool -_081D2A70: - ldrb r1, [r6, 0x3] - add r0, sp, 0xC - movs r2, 0 - movs r3, 0x3 - bl ConvertIntToDecimalStringN - add r5, sp, 0xC -_081D2A7E: - movs r0, 0x29 - str r0, [sp] - movs r0, 0xFF - str r0, [sp, 0x4] - movs r4, 0 - str r4, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - adds r2, r5, 0 - movs r3, 0x6A - bl AddTextPrinterParameterized - ldr r1, =gMoveDescriptionPointers - mov r0, r9 - subs r0, 0x1 - lsls r0, 2 - adds r0, r1 - ldr r5, [r0] - movs r0, 0x41 - str r0, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0 - movs r1, 0x7 - adds r2, r5, 0 - movs r3, 0 - bl AddTextPrinterParameterized -_081D2AB6: - add sp, 0x2C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end MoveRelearnerLoadBattleMoveDescription - - thumb_func_start MoveRelearnerMenuLoadContestMoveDescription -MoveRelearnerMenuLoadContestMoveDescription: @ 81D2ACC - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0xC - adds r4, r0, 0 - bl MoveRelearnerShowHideHearts - movs r0, 0x1 - movs r1, 0x11 - bl FillWindowPixelBuffer - ldr r5, =gText_ContestMoves2 - movs r0, 0x1 - adds r1, r5, 0 - movs r2, 0x80 - bl GetStringCenterAlignXOffset - lsls r3, r0, 24 - lsrs r3, 24 - movs r0, 0x1 - str r0, [sp] - movs r7, 0xFF - str r7, [sp, 0x4] - movs r6, 0 - str r6, [sp, 0x8] - movs r1, 0x1 - adds r2, r5, 0 - bl AddTextPrinterParameterized - ldr r5, =gText_Appeal2 - movs r0, 0x1 - adds r1, r5, 0 - movs r2, 0x5C - bl GetStringRightAlignXOffset - lsls r3, r0, 24 - lsrs r3, 24 - movs r0, 0x19 - mov r8, r0 - str r0, [sp] - str r7, [sp, 0x4] - str r6, [sp, 0x8] - movs r0, 0x1 - movs r1, 0x1 - adds r2, r5, 0 - bl AddTextPrinterParameterized - ldr r5, =gText_Jam2 - movs r0, 0x1 - adds r1, r5, 0 - movs r2, 0x5C - bl GetStringRightAlignXOffset - lsls r3, r0, 24 - lsrs r3, 24 - movs r0, 0x29 - str r0, [sp] - str r7, [sp, 0x4] - str r6, [sp, 0x8] - movs r0, 0x1 - movs r1, 0x1 - adds r2, r5, 0 - bl AddTextPrinterParameterized - movs r0, 0x2 - negs r0, r0 - cmp r4, r0 - bne _081D2B6C - movs r0, 0x1 - movs r1, 0x2 - bl CopyWindowToVram - b _081D2BB8 - .pool -_081D2B6C: - lsls r4, 3 - ldr r0, =gContestMoves - adds r4, r0 - ldr r1, =gContestMoveTypeTextPointers - ldrb r0, [r4, 0x1] - lsls r0, 29 - lsrs r0, 27 - adds r0, r1 - ldr r5, [r0] - mov r0, r8 - str r0, [sp] - str r7, [sp, 0x4] - str r6, [sp, 0x8] - movs r0, 0x1 - movs r1, 0x1 - adds r2, r5, 0 - movs r3, 0x4 - bl AddTextPrinterParameterized - ldr r1, =gContestEffectDescriptionPointers - ldrb r0, [r4] - lsls r0, 2 - adds r0, r1 - ldr r5, [r0] - movs r0, 0x41 - str r0, [sp] - str r7, [sp, 0x4] - str r6, [sp, 0x8] - movs r0, 0x1 - movs r1, 0x7 - adds r2, r5, 0 - movs r3, 0 - bl AddTextPrinterParameterized - movs r0, 0x1 - movs r1, 0x2 - bl CopyWindowToVram -_081D2BB8: - add sp, 0xC - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end MoveRelearnerMenuLoadContestMoveDescription - - thumb_func_start MoveRelearnerCursorCallback -MoveRelearnerCursorCallback: @ 81D2BD0 - push {r4,lr} - adds r4, r0, 0 - lsls r1, 24 - lsrs r1, 24 - cmp r1, 0x1 - beq _081D2BE2 - movs r0, 0x5 - bl PlaySE -_081D2BE2: - adds r0, r4, 0 - bl MoveRelearnerLoadBattleMoveDescription - adds r0, r4, 0 - bl MoveRelearnerMenuLoadContestMoveDescription - pop {r4} - pop {r0} - bx r0 - thumb_func_end MoveRelearnerCursorCallback - - thumb_func_start MoveRelearnerPrintText -MoveRelearnerPrintText: @ 81D2BF4 - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - movs r0, 0x3 - movs r1, 0x11 - bl FillWindowPixelBuffer - ldr r2, =gTextFlags - ldrb r0, [r2] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2] - bl GetPlayerTextSpeedDelay - adds r3, r0, 0 - lsls r3, 24 - lsrs r3, 24 - movs r0, 0 - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - movs r0, 0x3 - str r0, [sp, 0xC] - movs r1, 0x1 - adds r2, r4, 0 - bl AddTextPrinterParameterized2 - add sp, 0x10 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end MoveRelearnerPrintText - - thumb_func_start MoveRelearnerRunTextPrinters -MoveRelearnerRunTextPrinters: @ 81D2C3C - push {lr} - bl RunTextPrinters - movs r0, 0x3 - bl IsTextPrinterActive - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - thumb_func_end MoveRelearnerRunTextPrinters - - thumb_func_start MoveRelearnerCreateYesNoMenu -MoveRelearnerCreateYesNoMenu: @ 81D2C50 - push {lr} - ldr r0, =gMoveRelearnerYesNoMenuTemplate - movs r1, 0x1 - movs r2, 0xE - movs r3, 0 - bl CreateYesNoMenu - pop {r0} - bx r0 - .pool - thumb_func_end MoveRelearnerCreateYesNoMenu - - thumb_func_start sub_81D2C68 -sub_81D2C68: @ 81D2C68 - push {lr} - lsls r0, 16 - lsrs r0, 16 - lsls r1, 16 - lsrs r1, 16 - cmp r0, 0xE - bne _081D2CA8 - cmp r2, 0x2 - beq _081D2C7E - cmp r2, 0x7 - bne _081D2C94 -_081D2C7E: - movs r0, 0x64 - muls r0, r1 - ldr r1, =gPlayerParty - adds r0, r1 - adds r1, r2, 0 - adds r2, r3, 0 - bl GetMonData - b _081D2CCA - .pool -_081D2C94: - movs r0, 0x64 - muls r0, r1 - ldr r1, =gPlayerParty - adds r0, r1 - adds r1, r2, 0 - bl GetMonData - b _081D2CCA - .pool -_081D2CA8: - cmp r2, 0x2 - beq _081D2CB0 - cmp r2, 0x7 - bne _081D2CBE -_081D2CB0: - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - bl GetAndCopyBoxMonDataAt - b _081D2CCA -_081D2CBE: - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - bl GetBoxMonDataAt -_081D2CCA: - pop {r1} - bx r1 - thumb_func_end sub_81D2C68 - - thumb_func_start sub_81D2CD0 -sub_81D2CD0: @ 81D2CD0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r5, r0, 0 - lsls r1, 16 - lsrs r4, r1, 16 - lsls r2, 16 - lsrs r6, r2, 16 - movs r0, 0xFC - strb r0, [r5] - adds r5, 0x1 - movs r0, 0x4 - strb r0, [r5] - adds r5, 0x1 - movs r0, 0x8 - strb r0, [r5] - adds r5, 0x1 - movs r0, 0 - strb r0, [r5] - adds r5, 0x1 - movs r0, 0x9 - strb r0, [r5] - adds r5, 0x1 - adds r0, r4, 0 - adds r1, r6, 0 - movs r2, 0x2D - movs r3, 0 - bl sub_81D2C68 - cmp r0, 0 - beq _081D2D20 - ldr r1, =gText_EggNickname - adds r0, r5, 0 - movs r2, 0 - movs r3, 0xC - bl StringCopyPadded - b _081D2E70 - .pool -_081D2D20: - adds r0, r4, 0 - adds r1, r6, 0 - movs r2, 0x2 - adds r3, r5, 0 - bl sub_81D2C68 - adds r0, r5, 0 - bl StringGetEnd10 - adds r0, r4, 0 - adds r1, r6, 0 - movs r2, 0xB - movs r3, 0 - bl sub_81D2C68 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r4, 0xE - bne _081D2D70 - movs r0, 0x64 - adds r4, r6, 0 - muls r4, r0 - ldr r0, =gPlayerParty - adds r4, r0 - adds r0, r4, 0 - movs r1, 0x38 - bl GetMonData - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - adds r0, r4, 0 - bl GetMonGender - lsls r0, 24 - lsrs r6, r0, 24 - b _081D2D92 - .pool -_081D2D70: - lsls r0, r4, 24 - lsrs r0, 24 - lsls r1, r6, 24 - lsrs r1, 24 - bl GetBoxedMonPtr - adds r4, r0, 0 - bl GetBoxMonGender - lsls r0, 24 - lsrs r6, r0, 24 - adds r0, r4, 0 - bl GetLevelFromBoxMonExp - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 -_081D2D92: - cmp r7, 0x1D - beq _081D2D9A - cmp r7, 0x20 - bne _081D2DB0 -_081D2D9A: - movs r0, 0xB - adds r1, r7, 0 - muls r1, r0 - ldr r0, =gSpeciesNames - adds r1, r0 - adds r0, r5, 0 - bl StringCompare - cmp r0, 0 - bne _081D2DB0 - movs r6, 0xFF -_081D2DB0: - adds r3, r5, 0 - b _081D2DBA - .pool -_081D2DB8: - adds r3, 0x1 -_081D2DBA: - ldrb r0, [r3] - cmp r0, 0xFF - bne _081D2DB8 - movs r1, 0xFC - strb r1, [r3] - adds r3, 0x1 - movs r0, 0x12 - strb r0, [r3] - adds r3, 0x1 - movs r0, 0x3C - strb r0, [r3] - adds r3, 0x1 - cmp r6, 0 - beq _081D2DDE - cmp r6, 0xFE - beq _081D2E02 - movs r0, 0 - b _081D2E24 -_081D2DDE: - strb r1, [r3] - adds r3, 0x1 - movs r0, 0x1 - strb r0, [r3] - adds r3, 0x1 - movs r0, 0x4 - strb r0, [r3] - adds r3, 0x1 - strb r1, [r3] - adds r3, 0x1 - movs r0, 0x3 - strb r0, [r3] - adds r3, 0x1 - movs r0, 0x5 - strb r0, [r3] - adds r3, 0x1 - movs r0, 0xB5 - b _081D2E24 -_081D2E02: - strb r1, [r3] - adds r3, 0x1 - movs r0, 0x1 - strb r0, [r3] - adds r3, 0x1 - movs r0, 0x6 - strb r0, [r3] - adds r3, 0x1 - strb r1, [r3] - adds r3, 0x1 - movs r0, 0x3 - strb r0, [r3] - adds r3, 0x1 - movs r0, 0x7 - strb r0, [r3] - adds r3, 0x1 - movs r0, 0xB6 -_081D2E24: - strb r0, [r3] - adds r3, 0x1 - movs r0, 0xFC - strb r0, [r3] - adds r3, 0x1 - movs r0, 0x4 - strb r0, [r3] - adds r3, 0x1 - movs r0, 0x8 - strb r0, [r3] - adds r3, 0x1 - movs r4, 0 - strb r4, [r3] - adds r3, 0x1 - movs r0, 0x9 - strb r0, [r3] - adds r3, 0x1 - movs r0, 0xBA - strb r0, [r3] - adds r3, 0x1 - movs r0, 0xF9 - strb r0, [r3] - adds r3, 0x1 - movs r0, 0x5 - strb r0, [r3] - adds r3, 0x1 - adds r0, r3, 0 - mov r1, r8 - movs r2, 0 - movs r3, 0x3 - bl ConvertIntToDecimalStringN - adds r3, r0, 0 - strb r4, [r3] - adds r3, 0x1 - movs r0, 0xFF - strb r0, [r3] - adds r0, r3, 0 -_081D2E70: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_81D2CD0 - - thumb_func_start sub_81D2E7C -sub_81D2E7C: @ 81D2E7C - push {r4,lr} - adds r4, r0, 0 - lsls r2, 16 - lsrs r2, 16 - b _081D2E94 -_081D2E86: - strb r3, [r4] - adds r1, 0x1 - adds r4, 0x1 - lsls r0, r2, 16 - ldr r2, =0xffff0000 - adds r0, r2 - lsrs r2, r0, 16 -_081D2E94: - ldrb r3, [r1] - adds r0, r3, 0 - cmp r0, 0xFF - bne _081D2E86 - adds r1, r2, 0 - lsls r0, r1, 16 - ldr r2, =0xffff0000 - adds r0, r2 - lsrs r2, r0, 16 - lsls r1, 16 - cmp r1, 0 - ble _081D2EC2 - movs r3, 0 -_081D2EAE: - strb r3, [r4] - adds r4, 0x1 - adds r1, r2, 0 - lsls r0, r1, 16 - ldr r2, =0xffff0000 - adds r0, r2 - lsrs r2, r0, 16 - lsls r1, 16 - cmp r1, 0 - bgt _081D2EAE -_081D2EC2: - movs r0, 0xFF - strb r0, [r4] - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D2E7C - - thumb_func_start sub_81D2ED4 -sub_81D2ED4: @ 81D2ED4 - push {r4-r7,lr} - adds r5, r0, 0 - adds r6, r1, 0 - ldr r0, [sp, 0x14] - ldr r1, [sp, 0x18] - ldr r4, [sp, 0x1C] - lsls r2, 16 - lsrs r7, r2, 16 - lsls r3, 16 - lsrs r3, 16 - lsls r0, 16 - lsrs r2, r0, 16 - lsls r1, 16 - lsrs r0, r1, 16 - lsls r4, 24 - cmp r4, 0 - bne _081D2EFC - subs r0, 0x1 - lsls r0, 16 - lsrs r0, 16 -_081D2EFC: - cmp r2, r0 - beq _081D2F42 - adds r0, r6, 0 - adds r1, r7, 0 - adds r2, r3, 0 - bl sub_81D2CD0 - movs r0, 0xFC - strb r0, [r5] - movs r0, 0x4 - strb r0, [r5, 0x1] - movs r0, 0x8 - strb r0, [r5, 0x2] - movs r0, 0 - strb r0, [r5, 0x3] - movs r0, 0x9 - strb r0, [r5, 0x4] - cmp r7, 0xE - bne _081D2F2C - adds r0, r5, 0x5 - ldr r1, =gText_InParty - b _081D2F3A - .pool -_081D2F2C: - adds r4, r5, 0x5 - lsls r0, r7, 24 - lsrs r0, 24 - bl GetBoxNamePtr - adds r1, r0, 0 - adds r0, r4, 0 -_081D2F3A: - movs r2, 0x8 - bl sub_81D2E7C - b _081D2F72 -_081D2F42: - movs r1, 0 - movs r2, 0 -_081D2F46: - adds r0, r6, r1 - strb r2, [r0] - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0xB - bls _081D2F46 - adds r1, r6, r1 - movs r0, 0xFF - strb r0, [r1] - movs r1, 0 - movs r2, 0 -_081D2F5E: - adds r0, r5, r1 - strb r2, [r0] - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0x7 - bls _081D2F5E - adds r1, r5, r1 - movs r0, 0xFF - strb r0, [r1] -_081D2F72: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81D2ED4 - - thumb_func_start sub_81D2F78 -sub_81D2F78: @ 81D2F78 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - mov r8, r0 - mov r10, r1 - ldr r0, [sp, 0x20] - ldr r1, [sp, 0x24] - ldr r4, [sp, 0x28] - ldr r5, [sp, 0x2C] - lsls r2, 16 - lsrs r7, r2, 16 - lsls r3, 16 - lsrs r6, r3, 16 - lsls r0, 16 - lsrs r2, r0, 16 - lsls r1, 16 - lsrs r1, 16 - mov r9, r1 - lsls r4, 16 - lsrs r0, r4, 16 - lsls r5, 24 - cmp r5, 0 - bne _081D2FB0 - subs r0, 0x1 - lsls r0, 16 - lsrs r0, 16 -_081D2FB0: - cmp r2, r0 - beq _081D305C - adds r0, r7, 0 - adds r1, r6, 0 - movs r2, 0x16 - movs r3, 0 - bl sub_81D2C68 - mov r1, r9 - lsls r5, r1, 2 - adds r4, r5, r1 - mov r2, r8 - adds r1, r2, r4 - strb r0, [r1] - adds r0, r7, 0 - adds r1, r6, 0 - movs r2, 0x2F - movs r3, 0 - bl sub_81D2C68 - mov r1, r8 - adds r1, 0x1 - adds r1, r4 - strb r0, [r1] - adds r0, r7, 0 - adds r1, r6, 0 - movs r2, 0x21 - movs r3, 0 - bl sub_81D2C68 - mov r1, r8 - adds r1, 0x2 - adds r1, r4 - strb r0, [r1] - adds r0, r7, 0 - adds r1, r6, 0 - movs r2, 0x18 - movs r3, 0 - bl sub_81D2C68 - mov r1, r8 - adds r1, 0x3 - adds r1, r4 - strb r0, [r1] - adds r0, r7, 0 - adds r1, r6, 0 - movs r2, 0x17 - movs r3, 0 - bl sub_81D2C68 - mov r1, r8 - adds r1, 0x4 - adds r1, r4 - strb r0, [r1] - mov r4, r10 - add r4, r9 - adds r0, r7, 0 - adds r1, r6, 0 - movs r2, 0x30 - movs r3, 0 - bl sub_81D2C68 - cmp r0, 0xFF - beq _081D3044 - adds r0, r7, 0 - adds r1, r6, 0 - movs r2, 0x30 - movs r3, 0 - bl sub_81D2C68 - movs r1, 0x1D - bl __udivsi3 - b _081D3046 -_081D3044: - movs r0, 0x9 -_081D3046: - strb r0, [r4] - mov r0, r9 - adds r1, r5, r0 - mov r2, r8 - adds r0, r2, r1 - lsls r1, 2 - adds r1, 0x14 - add r1, r8 - bl sub_81D2754 - b _081D3086 -_081D305C: - movs r2, 0 - mov r0, r9 - lsls r5, r0, 2 - adds r1, r5, r0 - movs r6, 0 - lsls r3, r1, 2 - movs r5, 0x9B - movs r4, 0x5B -_081D306C: - adds r0, r2, r1 - add r0, r8 - strb r6, [r0] - lsls r0, r2, 2 - adds r0, r3 - add r0, r8 - strh r5, [r0, 0x14] - strh r4, [r0, 0x16] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x4 - bls _081D306C -_081D3086: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81D2F78 - - thumb_func_start sub_81D3094 -sub_81D3094: @ 81D3094 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x4 - mov r8, r0 - mov r9, r1 - ldr r0, [sp, 0x20] - ldr r1, [sp, 0x24] - ldr r4, [sp, 0x28] - lsls r2, 16 - lsrs r7, r2, 16 - lsls r3, 16 - lsrs r5, r3, 16 - lsls r0, 16 - lsrs r2, r0, 16 - lsls r1, 16 - lsrs r0, r1, 16 - lsls r4, 24 - cmp r4, 0 - bne _081D30C4 - subs r0, 0x1 - lsls r0, 16 - lsrs r0, 16 -_081D30C4: - cmp r2, r0 - beq _081D311A - adds r0, r7, 0 - adds r1, r5, 0 - movs r2, 0x41 - movs r3, 0 - bl sub_81D2C68 - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - adds r0, r7, 0 - adds r1, r5, 0 - movs r2, 0x1 - movs r3, 0 - bl sub_81D2C68 - adds r6, r0, 0 - adds r0, r7, 0 - adds r1, r5, 0 - movs r2, 0 - movs r3, 0 - bl sub_81D2C68 - adds r5, r0, 0 - lsls r0, r4, 3 - ldr r1, =gMonFrontPicTable - adds r0, r1 - movs r1, 0x1 - str r1, [sp] - mov r1, r8 - adds r2, r4, 0 - adds r3, r5, 0 - bl LoadSpecialPokePic - adds r0, r4, 0 - adds r1, r6, 0 - adds r2, r5, 0 - bl GetFrontSpritePalFromSpeciesAndPersonality - mov r1, r9 - bl LZ77UnCompWram -_081D311A: - add sp, 0x4 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D3094 - - thumb_func_start sub_81D312C -sub_81D312C: @ 81D312C - push {lr} - adds r1, r0, 0 - ldrh r0, [r1] - adds r0, 0x18 - strh r0, [r1] - lsls r0, 16 - cmp r0, 0 - ble _081D3140 - movs r0, 0 - strh r0, [r1] -_081D3140: - movs r0, 0 - ldrsh r1, [r1, r0] - negs r0, r1 - orrs r0, r1 - lsrs r0, 31 - pop {r1} - bx r1 - thumb_func_end sub_81D312C - - thumb_func_start sub_81D3150 -sub_81D3150: @ 81D3150 - push {lr} - adds r1, r0, 0 - ldrh r0, [r1] - subs r0, 0x18 - strh r0, [r1] - lsls r0, 16 - asrs r0, 16 - movs r2, 0x50 - negs r2, r2 - cmp r0, r2 - bge _081D3168 - strh r2, [r1] -_081D3168: - movs r0, 0 - ldrsh r1, [r1, r0] - eors r1, r2 - negs r0, r1 - orrs r0, r1 - lsrs r0, 31 - pop {r1} - bx r1 - thumb_func_end sub_81D3150 - - thumb_func_start sub_81D3178 -sub_81D3178: @ 81D3178 - push {r4,r5,lr} - adds r5, r1, 0 - bl sub_81D2074 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r5, 0 - bl sub_81D312C - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - cmp r4, 0 - bne _081D319A - cmp r0, 0 - beq _081D319C -_081D319A: - movs r1, 0x1 -_081D319C: - adds r0, r1, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81D3178 - - thumb_func_start sub_81D31A4 -sub_81D31A4: @ 81D31A4 - push {r4,r5,lr} - adds r5, r1, 0 - bl sub_81D2074 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r5, 0 - bl sub_81D3150 - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - cmp r4, 0 - bne _081D31C6 - cmp r0, 0 - beq _081D31C8 -_081D31C6: - movs r1, 0x1 -_081D31C8: - adds r0, r1, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81D31A4 - - thumb_func_start sub_81D31D0 -sub_81D31D0: @ 81D31D0 - push {r4-r7,lr} - sub sp, 0x20 - ldr r3, =gUnknown_08625A48 - ldr r4, [r3] - ldr r5, [r3, 0x4] - str r4, [sp, 0x18] - str r5, [sp, 0x1C] - mov r4, sp - ldr r3, =gUnknown_08625A50 - ldm r3!, {r5-r7} - stm r4!, {r5-r7} - ldm r3!, {r5-r7} - stm r4!, {r5-r7} - ldr r3, =gUnknown_08625A68 - ldr r4, [r3, 0x4] - ldr r3, [r3] - ldr r5, [sp, 0x18] - ldr r6, [sp, 0x1C] - str r5, [r0] - str r6, [r0, 0x4] - mov r0, sp - ldm r0!, {r5-r7} - stm r1!, {r5-r7} - ldm r0!, {r5-r7} - stm r1!, {r5-r7} - str r3, [r2] - str r4, [r2, 0x4] - add sp, 0x20 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D31D0 - - thumb_func_start sub_81D321C -sub_81D321C: @ 81D321C - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x50 - adds r5, r0, 0 - mov r12, r1 - mov r8, r2 - mov r1, sp - ldr r0, =gUnknown_08625A70 - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldm r0!, {r2,r6,r7} - stm r1!, {r2,r6,r7} - ldm r0!, {r3,r4} - stm r1!, {r3,r4} - add r3, sp, 0x20 - adds r1, r3, 0 - ldr r0, =gUnknown_08625A90 - ldm r0!, {r2,r6,r7} - stm r1!, {r2,r6,r7} - ldm r0!, {r4,r6,r7} - stm r1!, {r4,r6,r7} - add r2, sp, 0x38 - adds r1, r2, 0 - ldr r0, =gUnknown_08625AA8 - ldm r0!, {r4,r6,r7} - stm r1!, {r4,r6,r7} - ldm r0!, {r4,r6,r7} - stm r1!, {r4,r6,r7} - movs r4, 0 -_081D3258: - lsls r0, r4, 3 - add r0, sp - ldr r1, [r0, 0x4] - ldr r0, [r0] - stm r5!, {r0,r1} - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x3 - bls _081D3258 - mov r1, r12 - adds r0, r2, 0 - ldm r0!, {r2,r4,r5} - stm r1!, {r2,r4,r5} - ldm r0!, {r2,r6,r7} - stm r1!, {r2,r6,r7} - movs r4, 0 -_081D327A: - lsls r0, r4, 3 - adds r0, r3, r0 - ldr r1, [r0, 0x4] - ldr r0, [r0] - mov r5, r8 - adds r5, 0x8 - mov r8, r5 - subs r5, 0x8 - stm r5!, {r0,r1} - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x2 - bls _081D327A - add sp, 0x50 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D321C - - thumb_func_start sub_81D32B0 -sub_81D32B0: @ 81D32B0 - push {r4,r5,lr} - ldr r2, =gUnknown_08625AC0 - ldr r4, [r2] - ldr r5, [r2, 0x4] - ldr r2, =gUnknown_08625AC8 - ldr r3, [r2, 0x4] - ldr r2, [r2] - str r4, [r0] - str r5, [r0, 0x4] - str r2, [r1] - str r3, [r1, 0x4] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D32B0 - - thumb_func_start sub_81D32D4 -sub_81D32D4: @ 81D32D4 - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0x30] - adds r0, 0x1 - strh r0, [r1, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3C - ble _081D32F0 - movs r0, 0 - strh r0, [r1, 0x30] - adds r0, r1, 0 - bl sub_81D3408 -_081D32F0: - pop {r0} - bx r0 - thumb_func_end sub_81D32D4 - - thumb_func_start sub_81D32F4 -sub_81D32F4: @ 81D32F4 - push {lr} - adds r2, r0, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _081D330C - movs r0, 0 - strh r0, [r2, 0x30] - ldr r0, =sub_81D32D4 - str r0, [r2, 0x1C] -_081D330C: - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D32F4 - - thumb_func_start sub_81D3314 -sub_81D3314: @ 81D3314 - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0x36 - ldrsh r0, [r4, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r0, =gSprites - adds r3, r1, r0 - cmp r3, 0 - beq _081D3360 - ldrh r1, [r3, 0x24] - ldrh r2, [r3, 0x20] - adds r1, r2 - ldr r2, =gUnknown_08625B2C - movs r5, 0x2E - ldrsh r0, [r4, r5] - lsls r0, 2 - adds r0, r2 - ldrh r0, [r0] - adds r0, r1 - strh r0, [r4, 0x20] - ldrh r1, [r3, 0x26] - ldrh r3, [r3, 0x22] - adds r1, r3 - movs r3, 0x2E - ldrsh r0, [r4, r3] - lsls r0, 2 - adds r2, 0x2 - adds r0, r2 - ldrh r0, [r0] - adds r0, r1 - b _081D337E - .pool -_081D3360: - ldr r1, =gUnknown_08625B2C - movs r5, 0x2E - ldrsh r0, [r4, r5] - lsls r0, 2 - adds r0, r1 - ldrh r0, [r0] - adds r0, 0x28 - strh r0, [r4, 0x20] - movs r2, 0x2E - ldrsh r0, [r4, r2] - lsls r0, 2 - adds r1, 0x2 - adds r0, r1 - ldrh r0, [r0] - adds r0, 0x68 -_081D337E: - strh r0, [r4, 0x22] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D3314 - - thumb_func_start sub_81D338C -sub_81D338C: @ 81D338C - push {r4-r7,lr} - mov r7, r8 - push {r7} - mov r8, r2 - lsls r0, 24 - lsrs r6, r0, 24 - lsls r1, 24 - lsrs r7, r1, 24 - movs r5, 0 -_081D339E: - lsls r0, r5, 2 - mov r1, r8 - adds r4, r0, r1 - ldr r0, [r4] - cmp r0, 0 - beq _081D33F0 - strh r5, [r0, 0x2E] - ldr r1, [r4] - lsls r0, r5, 4 - adds r0, 0x1 - strh r0, [r1, 0x30] - ldr r0, [r4] - strh r6, [r0, 0x32] - ldr r0, [r4] - strh r5, [r0, 0x34] - cmp r7, 0 - beq _081D33C4 - cmp r6, 0x9 - beq _081D33D0 -_081D33C4: - ldr r1, [r4] - ldr r0, =sub_81D3564 - str r0, [r1, 0x1C] - b _081D33F0 - .pool -_081D33D0: - ldr r0, [r4] - bl sub_81D3314 - ldr r0, [r4] - bl sub_81D35E8 - ldr r2, [r4] - ldr r0, =sub_81D32F4 - str r0, [r2, 0x1C] - adds r2, 0x3E - ldrb r0, [r2] - movs r3, 0x5 - negs r3, r3 - adds r1, r3, 0 - ands r0, r1 - strb r0, [r2] -_081D33F0: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x9 - bls _081D339E - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D338C - - thumb_func_start sub_81D3408 -sub_81D3408: @ 81D3408 - push {r4-r7,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x38] - lsls r0, 24 - lsrs r2, r0, 24 - movs r3, 0 - movs r1, 0x32 - ldrsh r0, [r4, r1] - adds r0, 0x1 - cmp r3, r0 - bge _081D3454 - ldr r5, =gSprites - movs r7, 0x1C - adds r7, r5 - mov r12, r7 - ldr r6, =sub_81D3564 -_081D3428: - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - adds r2, r1, r5 - movs r7, 0x2E - ldrsh r0, [r2, r7] - lsls r0, 4 - adds r0, 0x1 - strh r0, [r2, 0x30] - add r1, r12 - str r6, [r1] - ldrh r0, [r2, 0x38] - lsls r0, 24 - lsrs r2, r0, 24 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - movs r1, 0x32 - ldrsh r0, [r4, r1] - adds r0, 0x1 - cmp r3, r0 - blt _081D3428 -_081D3454: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D3408 - - thumb_func_start sub_81D3464 -sub_81D3464: @ 81D3464 - push {lr} - adds r2, r0, 0 - movs r1, 0 - movs r3, 0 -_081D346C: - lsls r0, r1, 2 - adds r0, r2 - str r3, [r0] - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x9 - bls _081D346C - pop {r0} - bx r0 - thumb_func_end sub_81D3464 - - thumb_func_start sub_81D3480 -sub_81D3480: @ 81D3480 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - mov r8, r0 - lsls r1, 24 - lsrs r1, 24 - mov r10, r1 - lsls r2, 24 - movs r0, 0 - mov r9, r0 - lsrs r7, r2, 24 - movs r5, 0 - adds r0, r7, 0x1 - cmp r9, r0 - bge _081D34FE -_081D34A2: - ldr r0, =gUnknown_08625B14 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r3, r0, 24 - adds r6, r3, 0 - cmp r3, 0x40 - beq _081D34FE - lsls r0, r5, 2 - mov r1, r8 - adds r4, r0, r1 - lsls r0, r3, 4 - adds r0, r3 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - str r0, [r4] - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - ldr r0, [r4] - mov r1, r10 - strh r1, [r0, 0x36] - cmp r5, 0 - beq _081D34F0 - subs r0, r4, 0x4 - ldr r0, [r0] - strh r3, [r0, 0x38] - b _081D34F2 - .pool -_081D34F0: - mov r9, r6 -_081D34F2: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - adds r0, r7, 0x1 - cmp r5, r0 - blt _081D34A2 -_081D34FE: - lsls r0, r7, 2 - add r0, r8 - ldr r0, [r0] - mov r1, r9 - strh r1, [r0, 0x38] - adds r0, r7, 0 - movs r1, 0x1 - mov r2, r8 - bl sub_81D338C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81D3480 - - thumb_func_start sub_81D3520 -sub_81D3520: @ 81D3520 - push {r4-r6,lr} - adds r6, r0, 0 - movs r5, 0 -_081D3526: - cmp r5, 0x9 - bhi _081D3544 - lsls r0, r5, 2 - adds r4, r0, r6 - ldr r0, [r4] - cmp r0, 0 - beq _081D3544 - bl DestroySprite - movs r0, 0 - str r0, [r4] - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - b _081D3526 -_081D3544: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_81D3520 - - thumb_func_start sub_81D354C -sub_81D354C: @ 81D354C - push {lr} - bl sub_81D3520 - movs r0, 0x68 - bl FreeSpriteTilesByTag - movs r0, 0x68 - bl FreeSpritePaletteByTag - pop {r0} - bx r0 - thumb_func_end sub_81D354C - - thumb_func_start sub_81D3564 -sub_81D3564: @ 81D3564 - push {r4,lr} - adds r4, r0, 0 - ldrh r1, [r4, 0x30] - movs r2, 0x30 - ldrsh r0, [r4, r2] - cmp r0, 0 - beq _081D3592 - subs r0, r1, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - cmp r0, 0 - bne _081D35DC - adds r0, r4, 0 - movs r1, 0 - bl SeekSpriteAnim - adds r2, r4, 0 - adds r2, 0x3E - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r2] -_081D3592: - adds r0, r4, 0 - bl sub_81D3314 - adds r0, r4, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _081D35DC - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - movs r0, 0x34 - ldrsh r1, [r4, r0] - movs r2, 0x32 - ldrsh r0, [r4, r2] - cmp r1, r0 - bne _081D35D8 - cmp r1, 0x9 - bne _081D35D0 - adds r0, r4, 0 - bl sub_81D35E8 - ldr r0, =sub_81D32F4 - b _081D35DA - .pool -_081D35D0: - ldr r0, =sub_81D32D4 - b _081D35DA - .pool -_081D35D8: - ldr r0, =SpriteCallbackDummy -_081D35DA: - str r0, [r4, 0x1C] -_081D35DC: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D3564 - - thumb_func_start sub_81D35E8 -sub_81D35E8: @ 81D35E8 - push {r4-r7,lr} - adds r6, r0, 0 - ldrh r0, [r6, 0x38] - lsls r0, 24 - lsrs r1, r0, 24 - movs r5, 0 - movs r2, 0x32 - ldrsh r0, [r6, r2] - adds r0, 0x1 - cmp r5, r0 - bge _081D3636 - movs r0, 0x5 - negs r0, r0 - adds r7, r0, 0 -_081D3604: - lsls r4, r1, 4 - adds r4, r1 - lsls r4, 2 - ldr r0, =gSprites - adds r4, r0 - adds r0, r4, 0 - movs r1, 0 - bl SeekSpriteAnim - adds r1, r4, 0 - adds r1, 0x3E - ldrb r0, [r1] - ands r0, r7 - strb r0, [r1] - ldrh r0, [r4, 0x38] - lsls r0, 24 - lsrs r1, r0, 24 - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - movs r2, 0x32 - ldrsh r0, [r6, r2] - adds r0, 0x1 - cmp r5, r0 - blt _081D3604 -_081D3636: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D35E8 - - thumb_func_start sub_81D3640 -sub_81D3640: @ 81D3640 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x2C - mov r8, r0 - adds r6, r1, 0 - adds r5, r2, 0 - adds r4, r3, 0 - ldr r3, [sp, 0x4C] - ldr r0, [sp, 0x50] - mov r9, r0 - lsls r4, 24 - lsrs r4, 24 - lsls r3, 24 - lsrs r3, 24 - mov r1, r9 - lsls r1, 24 - lsrs r1, 24 - mov r9, r1 - mov r0, r8 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - lsls r1, r4, 4 - orrs r1, r4 - lsls r1, 24 - lsrs r1, 24 - str r3, [sp, 0x28] - bl FillWindowPixelBuffer - add r2, sp, 0xC - ldrh r0, [r5] - ldrh r1, [r6] - subs r0, r1 - strh r0, [r2] - ldrh r0, [r5, 0x2] - ldrh r1, [r6, 0x2] - subs r0, r1 - strh r0, [r2, 0x2] - ldrh r0, [r5, 0x4] - ldrh r1, [r6, 0x4] - subs r0, r1 - strh r0, [r2, 0x4] - ldrh r0, [r5, 0x8] - ldrh r1, [r6, 0x8] - subs r0, r1 - strh r0, [r2, 0x6] - ldrh r0, [r5, 0xA] - ldrh r1, [r6, 0xA] - subs r0, r1 - strh r0, [r2, 0x8] - ldrh r0, [r5, 0x6] - ldrh r1, [r6, 0x6] - subs r0, r1 - strh r0, [r2, 0xA] - add r0, sp, 0x24 - strb r4, [r0] - ldr r3, [sp, 0x28] - strb r3, [r0, 0x1] - mov r1, r9 - strb r1, [r0, 0x2] - movs r7, 0 - mov r10, r0 - movs r0, 0x1 - negs r0, r0 - mov r9, r0 - add r6, sp, 0x18 -_081D36CA: - lsls r0, r7, 4 - subs r0, r7 - lsls r0, 24 - lsrs r5, r0, 24 - mov r1, r10 - str r1, [sp] - mov r0, r9 - str r0, [sp, 0x4] - ldr r1, =gUnknown_08625B54 - lsls r0, r7, 2 - adds r0, r1 - ldr r0, [r0] - str r0, [sp, 0x8] - mov r0, r8 - movs r1, 0x1 - movs r2, 0 - adds r3, r5, 0 - bl AddTextPrinterParameterized3 - lsls r0, r7, 1 - mov r4, sp - adds r4, r0 - adds r4, 0xC - movs r1, 0 - ldrsh r0, [r4, r1] - ldr r1, =gText_Dash - cmp r0, 0 - blt _081D3704 - ldr r1, =gText_UnkCtrlF904 -_081D3704: - adds r0, r6, 0 - bl StringCopy - mov r0, r10 - str r0, [sp] - mov r1, r9 - str r1, [sp, 0x4] - str r6, [sp, 0x8] - mov r0, r8 - movs r1, 0x1 - movs r2, 0x38 - adds r3, r5, 0 - bl AddTextPrinterParameterized3 - movs r0, 0 - ldrsh r1, [r4, r0] - adds r0, r1, 0 - cmp r1, 0 - bge _081D372C - negs r0, r1 -_081D372C: - movs r4, 0xC - cmp r0, 0x9 - bgt _081D3734 - movs r4, 0x12 -_081D3734: - cmp r1, 0 - bge _081D373A - negs r1, r1 -_081D373A: - adds r0, r6, 0 - movs r2, 0 - movs r3, 0x2 - bl ConvertIntToDecimalStringN - adds r2, r4, 0 - adds r2, 0x38 - mov r1, r10 - str r1, [sp] - mov r0, r9 - str r0, [sp, 0x4] - str r6, [sp, 0x8] - mov r0, r8 - movs r1, 0x1 - adds r3, r5, 0 - bl AddTextPrinterParameterized3 - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0x5 - bls _081D36CA - add sp, 0x2C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D3640 - - thumb_func_start sub_81D3784 -sub_81D3784: @ 81D3784 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x2C - mov r8, r0 - adds r5, r1, 0 - adds r4, r2, 0 - adds r6, r3, 0 - ldr r2, [sp, 0x4C] - lsls r4, 24 - lsrs r4, 24 - lsls r6, 24 - lsrs r6, 24 - lsls r2, 24 - lsrs r2, 24 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - lsls r1, r4, 4 - orrs r1, r4 - lsls r1, 24 - lsrs r1, 24 - str r2, [sp, 0x28] - bl FillWindowPixelBuffer - add r1, sp, 0xC - ldrh r0, [r5] - strh r0, [r1] - ldrh r0, [r5, 0x2] - strh r0, [r1, 0x2] - ldrh r0, [r5, 0x4] - strh r0, [r1, 0x4] - ldrh r0, [r5, 0x8] - strh r0, [r1, 0x6] - ldrh r0, [r5, 0xA] - strh r0, [r1, 0x8] - ldrh r0, [r5, 0x6] - strh r0, [r1, 0xA] - add r0, sp, 0x24 - strb r4, [r0] - strb r6, [r0, 0x1] - ldr r2, [sp, 0x28] - strb r2, [r0, 0x2] - movs r6, 0 - add r1, sp, 0x18 - mov r9, r1 - mov r7, r8 - mov r10, r0 - movs r2, 0x1 - negs r2, r2 - mov r8, r2 -_081D37EE: - lsls r1, r6, 1 - mov r0, sp - adds r0, r1 - adds r0, 0xC - movs r2, 0 - ldrsh r0, [r0, r2] - movs r4, 0x3 - cmp r0, 0x63 - bgt _081D3808 - movs r4, 0x1 - cmp r0, 0x9 - ble _081D3808 - movs r4, 0x2 -_081D3808: - mov r0, sp - adds r0, r1 - adds r0, 0xC - movs r2, 0 - ldrsh r1, [r0, r2] - mov r0, r9 - movs r2, 0 - adds r3, r4, 0 - bl ConvertIntToDecimalStringN - movs r0, 0x4 - subs r0, r4 - lsls r4, r0, 1 - adds r4, r0 - lsls r4, 17 - lsrs r4, 16 - lsls r5, r6, 4 - subs r5, r6 - lsls r5, 24 - lsrs r5, 24 - mov r0, r10 - str r0, [sp] - mov r1, r8 - str r1, [sp, 0x4] - ldr r1, =gUnknown_08625B54 - lsls r0, r6, 2 - adds r0, r1 - ldr r0, [r0] - str r0, [sp, 0x8] - adds r0, r7, 0 - movs r1, 0x1 - movs r2, 0 - adds r3, r5, 0 - bl AddTextPrinterParameterized3 - adds r4, 0x38 - lsls r4, 24 - lsrs r4, 24 - mov r2, r10 - str r2, [sp] - mov r0, r8 - str r0, [sp, 0x4] - mov r1, r9 - str r1, [sp, 0x8] - adds r0, r7, 0 - movs r1, 0x1 - adds r2, r4, 0 - adds r3, r5, 0 - bl AddTextPrinterParameterized3 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x5 - bls _081D37EE - add sp, 0x2C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D3784 - - thumb_func_start sub_81D388C -sub_81D388C: @ 81D388C - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - movs r1, 0x3A - bl GetMonData - strh r0, [r5] - adds r0, r4, 0 - movs r1, 0x3B - bl GetMonData - strh r0, [r5, 0x2] - adds r0, r4, 0 - movs r1, 0x3C - bl GetMonData - strh r0, [r5, 0x4] - adds r0, r4, 0 - movs r1, 0x3D - bl GetMonData - strh r0, [r5, 0x6] - adds r0, r4, 0 - movs r1, 0x3E - bl GetMonData - strh r0, [r5, 0x8] - adds r0, r4, 0 - movs r1, 0x3F - bl GetMonData - strh r0, [r5, 0xA] - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_81D388C thumb_func_start sub_81D38D4 sub_81D38D4: @ 81D38D4 diff --git a/data/player_pc_ui.s b/data/player_pc_ui.s new file mode 100644 index 0000000000..a9588a713a --- /dev/null +++ b/data/player_pc_ui.s @@ -0,0 +1,196 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +gUnknown_086253E8:: @ 86253E8 + .4byte 0x8010100 + .4byte 0x80F02 + .4byte 0x8011500 + .4byte 0x180F12 + .4byte 0xB010100 + .4byte 0x180F08 + +gUnknown_08625400:: @ 8625400 + .byte 1, 2, 3 + +gUnknown_08625403:: @ 8625403 + .byte 0xFF + +@ ScanlineEffectParams +gUnknown_08625404:: @ 8625404 + .4byte 0x04000040 @ REG_ADDR_WIN0H + .4byte 0xA6600001 @ SCANLINE_EFFECT_DMACNT_32BIT + .byte 1, @ initState + .byte 0, @ unused9 + .byte 0, 0 @ Padding + +gUnknown_08625410:: @ 8625410 + .byte 4, 5, 6, 7, 8, 9, 9, 0xA, 0xA, 0xB, 0xB, 0xC, 0xC, 0xD, 0xD, 0xD, 0xD, 0xE, 0xE, 0xE, 0xE, 0xF, 0xF, 0xF, 0xF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23 + +gMoveRelearnerWindowTemplates:: @ 8625510s + window_template 1, 1, 1, 16, 12, 0xF, 0x000A + window_template 1, 1, 1, 16, 12, 0xF, 0x00CA + window_template 1, 19, 1, 10, 12, 0xF, 0x018A + window_template 1, 4, 15, 22, 4, 0xF, 0x0202 + window_template 0, 22, 8, 5, 4, 0xF, 0x025A + null_window_template + +gMoveRelearnerYesNoMenuTemplate:: @ 8625540 + window_template 0, 22, 8, 5, 4, 0xF, 0x025A + +gMoveRelearnerMovesListTemplate:: @ 8625548 struct ListMenuTemplate + .4byte NULL + .4byte MoveRelearnerCursorCallback + .4byte NULL + .2byte 0 + .2byte 0 + .byte 2 + .byte 0 + .byte 8 + .byte 0 + .4byte 0x1003121 + +gUnknown_08625560:: @ 8625560 + .incbin "graphics/pokenav/pokeball.4bpp" + +gUnknown_08625660:: @ 8625660 + .incbin "graphics/pokenav/8625660.4bpp" + +gUnknown_08625680:: @ 8625680 + .incbin "graphics/pokenav/sparkle.gbapal" + +gUnknown_086256A0:: @ 86255A0 + .incbin "graphics/pokenav/sparkle.4bpp" + +gUnknown_08625A20:: @ 8625A20 + .2byte 0 + .2byte 0xC000 + .2byte 0x400 + .2byte 0 + +gUnknown_08625A28:: @ 8625A28 + .2byte 0 + .2byte 0x4000 + .2byte 0x800 + .2byte 0 + +gUnknown_08625A30:: @ 8625A30 + .2byte 0 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + +gUnknown_08625A38:: @ 8625A38 + .2byte 4 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + +gUnknown_08625A40:: @ 8625A40 + .4byte gUnknown_08625A30 + .4byte gUnknown_08625A38 + +gUnknown_08625A48:: @ 8625A48 + .4byte NULL + .4byte 0x640800 + +gUnknown_08625A50:: @ 8625A50 + spr_template 0x64, 0x64, gUnknown_08625A20, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_08625A68:: @ 8625A68 + .4byte NULL + .4byte 0x64 + +gUnknown_08625A70:: @ 8625A70 + .4byte gUnknown_08625560 + .byte 0, 1, 0x65, 0 + .4byte gUnknown_08625660 + .2byte 0x20, 0x67 + .4byte gPokenavConditionCancel_Gfx + .byte 0, 1, 0x66, 0 + .4byte NULL, NULL + +gUnknown_08625A90:: @ 8625A90 + .4byte gPokenavConditionCancel_Pal + 0x0 + .byte 0x65, 0, 0, 0 + .4byte gPokenavConditionCancel_Pal + 0x20 + .byte 0x66, 0, 0, 0 + .4byte NULL, NULL + +gUnknown_08625AA8:: @ 8625AA8 + spr_template 0x65, 0x65, gUnknown_08625A28, gUnknown_08625A40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_08625AC0:: @ 8625AC0 + .4byte gUnknown_086256A0 + .byte 0x80, 3, 0x68, 0 + +gUnknown_08625AC8:: @ 8625AC8 + .4byte gUnknown_08625680 + .byte 0x68, 0, 0, 0 + +gUnknown_08625AD0:: @ 8625AD0 + .2byte 0 + .2byte 0x4000 + .2byte 0 + .2byte 0 + +gUnknown_08625AD8:: @ 8625AD8 + .2byte 0 + .2byte 5 + .2byte 4 + .2byte 5 + +gUnknown_08625AE0:: @ 8625AE0 + .2byte 8 + .2byte 5 + .2byte 12 + .2byte 5 + +gUnknown_08625AE8:: @ 8625AE8 + .2byte 16 + .2byte 5 + .2byte 20 + .2byte 5 + +gUnknown_08625AF0:: @ 8625AF0 + .2byte 24 + .2byte 5 + .2byte 0xFFFF + .2byte 0 + +gUnknown_08625AF8:: @ 8625AF8 + .4byte gUnknown_08625AD8 + .4byte gUnknown_08625AE0 + +gUnknown_08625B00:: @ 8625B00 + .4byte gUnknown_08625AE8 + .4byte gUnknown_08625AF0 + +gUnknown_08625B08:: @ 8625B08 + .4byte gUnknown_08625AF8 + .4byte gUnknown_08625B00 + .4byte gUnknown_08625B08 + +gUnknown_08625B14:: @ 8625B14 + spr_template 0x68, 0x68, gUnknown_08625AD0, gUnknown_08625AF8, NULL gDummySpriteAffineAnimTable, sub_81D3564 + +gUnknown_08625B2C:: @ 8625B2C + .2byte 0, 0xFFDD + .2byte 20, 0xFFE4 + .2byte 33, 0xFFF6 + .2byte 33, 10 + .2byte 20, 28 + .2byte 0, 35 + .2byte 0xFFEC, 28 + .2byte 0xFFDF, 10 + .2byte 0xFFDF, 0xFFF6 + .2byte 0xFFEC, 0xFFE4 + +gUnknown_08625B54:: @ 8625B54 + .4byte gUnknown_085EEA46 + .4byte gUnknown_085EEA4E + .4byte gUnknown_085EEA55 + .4byte gUnknown_085EEA63 + .4byte gUnknown_085EEA6B + .4byte gUnknown_085EEA5D diff --git a/data/rom_81D1C44.s b/data/rom_81D1C44.s index 1b54351755..5fbab5c3a4 100644 --- a/data/rom_81D1C44.s +++ b/data/rom_81D1C44.s @@ -3,193 +3,6 @@ .section .rodata -gUnknown_086253E8:: @ 86253E8 - .4byte 0x8010100 - .4byte 0x80F02 - .4byte 0x8011500 - .4byte 0x180F12 - .4byte 0xB010100 - .4byte 0x180F08 - -gUnknown_08625400:: @ 8625400 - .byte 1, 2, 3 - -gUnknown_08625403:: @ 8625403 - .byte 0xFF - -gUnknown_08625404:: @ 8625404 - .byte 0x40, 0, 0, 4, 1, 0, 0x60, 0xA6, 1, 0, 0, 0 - -gUnknown_08625410:: @ 8625410 - .byte 4, 5, 6, 7, 8, 9, 9, 0xA, 0xA, 0xB, 0xB, 0xC, 0xC, 0xD, 0xD, 0xD, 0xD, 0xE, 0xE, 0xE, 0xE, 0xF, 0xF, 0xF, 0xF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23 - -gMoveRelearnerWindowTemplates:: @ 8625510s - window_template 1, 1, 1, 16, 12, 0xF, 0x000A - window_template 1, 1, 1, 16, 12, 0xF, 0x00CA - window_template 1, 19, 1, 10, 12, 0xF, 0x018A - window_template 1, 4, 15, 22, 4, 0xF, 0x0202 - window_template 0, 22, 8, 5, 4, 0xF, 0x025A - null_window_template - -gMoveRelearnerYesNoMenuTemplate:: @ 8625540 - window_template 0, 22, 8, 5, 4, 0xF, 0x025A - -gMoveRelearnerMovesListTemplate:: @ 8625548 struct ListMenuTemplate - .4byte NULL - .4byte MoveRelearnerCursorCallback - .4byte NULL - .2byte 0 - .2byte 0 - .byte 2 - .byte 0 - .byte 8 - .byte 0 - .4byte 0x1003121 - -gUnknown_08625560:: @ 8625560 - .incbin "graphics/pokenav/pokeball.4bpp" - -gUnknown_08625660:: @ 8625660 - .incbin "graphics/pokenav/8625660.4bpp" - -gUnknown_08625680:: @ 8625680 - .incbin "graphics/pokenav/sparkle.gbapal" - -gUnknown_086256A0:: @ 86255A0 - .incbin "graphics/pokenav/sparkle.4bpp" - -gUnknown_08625A20:: @ 8625A20 - .2byte 0 - .2byte 0xC000 - .2byte 0x400 - .2byte 0 - -gUnknown_08625A28:: @ 8625A28 - .2byte 0 - .2byte 0x4000 - .2byte 0x800 - .2byte 0 - -gUnknown_08625A30:: @ 8625A30 - .2byte 0 - .2byte 5 - .2byte 0xFFFF - .2byte 0 - -gUnknown_08625A38:: @ 8625A38 - .2byte 4 - .2byte 5 - .2byte 0xFFFF - .2byte 0 - -gUnknown_08625A40:: @ 8625A40 - .4byte gUnknown_08625A30 - .4byte gUnknown_08625A38 - -gUnknown_08625A48:: @ 8625A48 - .4byte NULL - .4byte 0x640800 - -gUnknown_08625A50:: @ 8625A50 - spr_template 0x64, 0x64, gUnknown_08625A20, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_08625A68:: @ 8625A68 - .4byte NULL - .4byte 0x64 - -gUnknown_08625A70:: @ 8625A70 - .4byte gUnknown_08625560 - .byte 0, 1, 0x65, 0 - .4byte gUnknown_08625660 - .2byte 0x20, 0x67 - .4byte gPokenavConditionCancel_Gfx - .byte 0, 1, 0x66, 0 - .4byte NULL, NULL - -gUnknown_08625A90:: @ 8625A90 - .4byte gPokenavConditionCancel_Pal + 0x0 - .byte 0x65, 0, 0, 0 - .4byte gPokenavConditionCancel_Pal + 0x20 - .byte 0x66, 0, 0, 0 - .4byte NULL, NULL - -gUnknown_08625AA8:: @ 8625AA8 - spr_template 0x65, 0x65, gUnknown_08625A28, gUnknown_08625A40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_08625AC0:: @ 8625AC0 - .4byte gUnknown_086256A0 - .byte 0x80, 3, 0x68, 0 - -gUnknown_08625AC8:: @ 8625AC8 - .4byte gUnknown_08625680 - .byte 0x68, 0, 0, 0 - -gUnknown_08625AD0:: @ 8625AD0 - .2byte 0 - .2byte 0x4000 - .2byte 0 - .2byte 0 - -gUnknown_08625AD8:: @ 8625AD8 - .2byte 0 - .2byte 5 - .2byte 4 - .2byte 5 - -gUnknown_08625AE0:: @ 8625AE0 - .2byte 8 - .2byte 5 - .2byte 12 - .2byte 5 - -gUnknown_08625AE8:: @ 8625AE8 - .2byte 16 - .2byte 5 - .2byte 20 - .2byte 5 - -gUnknown_08625AF0:: @ 8625AF0 - .2byte 24 - .2byte 5 - .2byte 0xFFFF - .2byte 0 - -gUnknown_08625AF8:: @ 8625AF8 - .4byte gUnknown_08625AD8 - .4byte gUnknown_08625AE0 - -gUnknown_08625B00:: @ 8625B00 - .4byte gUnknown_08625AE8 - .4byte gUnknown_08625AF0 - -gUnknown_08625B08:: @ 8625B08 - .4byte gUnknown_08625AF8 - .4byte gUnknown_08625B00 - .4byte gUnknown_08625B08 - -gUnknown_08625B14:: @ 8625B14 - spr_template 0x68, 0x68, gUnknown_08625AD0, gUnknown_08625AF8, NULL gDummySpriteAffineAnimTable, sub_81D3564 - -gUnknown_08625B2C:: @ 8625B2C - .2byte 0, 0xFFDD - .2byte 20, 0xFFE4 - .2byte 33, 0xFFF6 - .2byte 33, 10 - .2byte 20, 28 - .2byte 0, 35 - .2byte 0xFFEC, 28 - .2byte 0xFFDF, 10 - .2byte 0xFFDF, 0xFFF6 - .2byte 0xFFEC, 0xFFE4 - -gUnknown_08625B54:: @ 8625B54 - .4byte gUnknown_085EEA46 - .4byte gUnknown_085EEA4E - .4byte gUnknown_085EEA55 - .4byte gUnknown_085EEA63 - .4byte gUnknown_085EEA6B - .4byte gUnknown_085EEA5D - gUnknown_08625B6C:: @ 8625B6C @ apparently e-reader trainer data? idk .byte 0x6f, 0x57, 0x54, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x14, 0x0c, 0x0e, 0x23, 0x10, 0x47, 0x0a, 0x1f, 0x06, 0x24, 0x0e, 0x48, 0x0a, 0x0f, 0x06 diff --git a/include/pokenav.h b/include/pokenav.h index e6fa5f40d0..849c9bf16a 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -28,7 +28,7 @@ void InitMoveRelearnerWindows(bool8 useContextWindow); bool8 EventObjectIsFarawayIslandMew(struct EventObject *); u32 sub_81D427C(void); void sub_81D4998(void); -void sub_81D3640(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); -void sub_81D3784(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); +void DrawLevelUpWindowPg1(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); +void DrawLevelUpWindowPg2(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); #endif //GUARD_POKENAV_H diff --git a/ld_script.txt b/ld_script.txt index 53142d3602..6b3df891ce 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -291,6 +291,7 @@ SECTIONS { src/pokenav.o(.text); asm/pokenav.o(.text); src/pokenav_match_call.o(.text); + asm/player_pc_ui.o(.text); asm/rom_81D1C44.o(.text); src/trainer_hill.o(.text); src/rayquaza_scene.o(.text); @@ -594,6 +595,7 @@ SECTIONS { src/pokenav.o(.rodata); data/pokenav.o(.rodata); src/pokenav_match_call.o(.rodata); + data/player_pc_ui.o(.rodata); data/rom_81D1C44.o(.rodata); src/trainer_hill.o(.rodata); src/rayquaza_scene.o(.rodata); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index a53fa30f21..89c2baca97 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -54,9 +54,9 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM; extern const u8* const gBattleScriptsForMoveEffects[]; // functions -extern void sub_81D388C(struct Pokemon* mon, void* statStoreLocation); // pokenav.s -extern void sub_81D3640(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); // pokenav.s -extern void sub_81D3784(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); // pokenav.s +extern void GetMonLevelUpWindowStats(struct Pokemon* mon, void* statStoreLocation); // pokenav.s +extern void DrawLevelUpWindowPg1(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); // pokenav.s +extern void DrawLevelUpWindowPg2(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); // pokenav.s extern u8 sub_813B21C(void); #define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattlerTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED)) @@ -6321,16 +6321,16 @@ static void sub_804F100(void) { struct StatsArray currentStats; - sub_81D388C(&gPlayerParty[gBattleStruct->expGetterMonId], ¤tStats); - sub_81D3640(0xD, gBattleResources->statsBeforeLvlUp, ¤tStats, 0xE, 0xD, 0xF); + GetMonLevelUpWindowStats(&gPlayerParty[gBattleStruct->expGetterMonId], ¤tStats); + DrawLevelUpWindowPg1(0xD, gBattleResources->statsBeforeLvlUp, ¤tStats, 0xE, 0xD, 0xF); } static void sub_804F144(void) { struct StatsArray currentStats; - sub_81D388C(&gPlayerParty[gBattleStruct->expGetterMonId], ¤tStats); - sub_81D3784(0xD, ¤tStats, 0xE, 0xD, 0xF); + GetMonLevelUpWindowStats(&gPlayerParty[gBattleStruct->expGetterMonId], ¤tStats); + DrawLevelUpWindowPg2(0xD, ¤tStats, 0xE, 0xD, 0xF); } static void sub_804F17C(void) diff --git a/src/party_menu.c b/src/party_menu.c index dad778b49c..7e47e9ced5 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -6005,7 +6005,7 @@ static void sub_81B767C(u8 taskId) s16 *arrayPtr = gUnknown_0203CEC4->data; arrayPtr[12] = sub_81B3364(); - sub_81D3640(arrayPtr[12], arrayPtr, &arrayPtr[6], 1, 2, 3); + DrawLevelUpWindowPg1(arrayPtr[12], arrayPtr, &arrayPtr[6], 1, 2, 3); CopyWindowToVram(arrayPtr[12], 2); schedule_bg_copy_tilemap_to_vram(2); } @@ -6014,7 +6014,7 @@ static void sub_81B76C8(u8 taskId) { s16 *arrayPtr = gUnknown_0203CEC4->data; - sub_81D3784(arrayPtr[12], &arrayPtr[6], 1, 2, 3); + DrawLevelUpWindowPg2(arrayPtr[12], &arrayPtr[6], 1, 2, 3); CopyWindowToVram(arrayPtr[12], 2); schedule_bg_copy_tilemap_to_vram(2); } From 0e3fc4956b0f9381f555100f2f1a24b0e836e68a Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 5 Mar 2019 00:06:43 -0500 Subject: [PATCH 178/217] Rename asm file --- asm/{player_pc_ui.s => menu_unknown.s} | 0 data/{player_pc_ui.s => menu_unknown.s} | 4 ++-- ld_script.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename asm/{player_pc_ui.s => menu_unknown.s} (100%) rename data/{player_pc_ui.s => menu_unknown.s} (99%) diff --git a/asm/player_pc_ui.s b/asm/menu_unknown.s similarity index 100% rename from asm/player_pc_ui.s rename to asm/menu_unknown.s diff --git a/data/player_pc_ui.s b/data/menu_unknown.s similarity index 99% rename from data/player_pc_ui.s rename to data/menu_unknown.s index a9588a713a..6d1bd7ecff 100644 --- a/data/player_pc_ui.s +++ b/data/menu_unknown.s @@ -21,8 +21,8 @@ gUnknown_08625403:: @ 8625403 gUnknown_08625404:: @ 8625404 .4byte 0x04000040 @ REG_ADDR_WIN0H .4byte 0xA6600001 @ SCANLINE_EFFECT_DMACNT_32BIT - .byte 1, @ initState - .byte 0, @ unused9 + .byte 1 @ initState + .byte 0 @ unused9 .byte 0, 0 @ Padding gUnknown_08625410:: @ 8625410 diff --git a/ld_script.txt b/ld_script.txt index 6b3df891ce..31e952cf39 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -291,7 +291,7 @@ SECTIONS { src/pokenav.o(.text); asm/pokenav.o(.text); src/pokenav_match_call.o(.text); - asm/player_pc_ui.o(.text); + asm/menu_unknown.o(.text); asm/rom_81D1C44.o(.text); src/trainer_hill.o(.text); src/rayquaza_scene.o(.text); @@ -595,7 +595,7 @@ SECTIONS { src/pokenav.o(.rodata); data/pokenav.o(.rodata); src/pokenav_match_call.o(.rodata); - data/player_pc_ui.o(.rodata); + data/menu_unknown.o(.rodata); data/rom_81D1C44.o(.rodata); src/trainer_hill.o(.rodata); src/rayquaza_scene.o(.rodata); From 18902219ad0a67f51a443e83973cfe3f03970101 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 5 Mar 2019 01:46:20 -0500 Subject: [PATCH 179/217] Fix make to look for .json files instead of folders Currently, when Make is building the maps, it considers every folder in the data/maps/ directory as a map that needs to be built, even folders that are empty. This can be a problem when modding on a separate branch, because git doesn't always clean up directories when switching branches (usually because of hidden files in those directories), so switching back to an unmodded branch will leave an empty folder that confuses make. This commit changes the makefile so that it only checks directories that have map.json files in them. --- map_data_rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/map_data_rules.mk b/map_data_rules.mk index 5a7d9dd842..0203b383d0 100755 --- a/map_data_rules.mk +++ b/map_data_rules.mk @@ -3,7 +3,7 @@ MAPS_DIR = $(DATA_ASM_SUBDIR)/maps LAYOUTS_DIR = $(DATA_ASM_SUBDIR)/layouts -MAP_DIRS := $(dir $(wildcard $(MAPS_DIR)/*/)) +MAP_DIRS := $(dir $(wildcard $(MAPS_DIR)/*/map.json)) MAP_CONNECTIONS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/connections.inc,$(MAP_DIRS)) MAP_EVENTS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/events.inc,$(MAP_DIRS)) MAP_HEADERS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/header.inc,$(MAP_DIRS)) From 3507ac397415b445f40fd70c48550fe00deb1484 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 5 Mar 2019 09:02:05 +0100 Subject: [PATCH 180/217] Start fixing flying.c --- src/flying.c | 421 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 321 insertions(+), 100 deletions(-) diff --git a/src/flying.c b/src/flying.c index 7f48e57cbd..9519064485 100644 --- a/src/flying.c +++ b/src/flying.c @@ -108,7 +108,7 @@ const union AffineAnimCmd gUnknown_085962EC[] = const union AffineAnimCmd *const gUnknown_08596314[] = { - gUnknown_085962EC, + gUnknown_085962EC, }; const union AffineAnimCmd gUnknown_08596318[] = @@ -357,7 +357,8 @@ void sub_810DE70(struct Sprite *sprite) sprite->callback(sprite); } -static void sub_810DE98(struct Sprite *sprite) { +static void sub_810DE98(struct Sprite *sprite) +{ sprite->pos2.x = Sin(sprite->data[1], 32); sprite->pos2.y = Cos(sprite->data[1], 8); sprite->data[1] += 5; @@ -392,8 +393,7 @@ static void sub_810DF18(u8 taskId) { gPlttBufferFaded[base + 0x101 + i] = gPlttBufferFaded[base + 0x100 + i]; i--; - } - while (i > 0); + } while (i > 0); gPlttBufferFaded[base + 0x101] = temp; } @@ -524,7 +524,9 @@ static void sub_810E24C(struct Sprite *sprite) sprite->data[3] &= 0xFF; } - if ((u32)(sprite->pos1.x + sprite->pos2.x + 32) > 304 || sprite->pos1.y + sprite->pos2.y > 160) + if (sprite->pos1.x + sprite->pos2.x < -32 + || sprite->pos1.x + sprite->pos2.x > 272 + || sprite->pos1.y + sprite->pos2.y > 160) { gSprites[GetAnimBattlerSpriteId(ANIM_ATTACKER)].invisible = 0; DestroyAnimSprite(sprite); @@ -547,55 +549,62 @@ void sub_810E2C8(struct Sprite *sprite) } // FAKEMATCHING +struct FeatherDanceData +{ + u8 unk0_0a:1; + u8 unk0_0b:1; + u8 unk0_0c:1; + u8 unk0_0d:1; + u8 unk0_1:4; + u8 unk1; + u16 unk2; + s16 unk4; + u16 unk6; + u16 unk8; + u16 unkA; + u8 unkC[2]; + u16 unkE_0:1; + u16 unkE_1:15; +}; + void sub_810E314(struct Sprite *sprite) { - s16 *data; - u8 slot; - s16 spriteCoord; - int t1, t2; - u32 arg2; - u32 matrixNum; - u8 sinIndex; - register s16 sinVal asm ("r4"); - register int sinVal2 asm ("r0"); + u8 battler, matrixNum, sinIndex; + s16 spriteCoord, sinVal; - data = sprite->data; + struct FeatherDanceData *data = (struct FeatherDanceData *)sprite->data; if (gBattleAnimArgs[7] & 0x100) - slot = gBattleAnimAttacker; + battler = gBattleAnimAttacker; else - slot = gBattleAnimTarget; + battler = gBattleAnimTarget; - if (GetBattlerSide(slot) == B_SIDE_PLAYER) + if (GetBattlerSide(battler) == B_SIDE_PLAYER) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; - sprite->pos1.x = GetBattlerSpriteCoord(slot, 0) + gBattleAnimArgs[0]; - spriteCoord = GetBattlerSpriteCoord(slot, 1); + sprite->pos1.x = GetBattlerSpriteCoord(battler, BATTLER_COORD_ATTR_HEIGHT) + gBattleAnimArgs[0]; + spriteCoord = GetBattlerSpriteCoord(battler, BATTLER_COORD_ATTR_WIDTH); sprite->pos1.y = spriteCoord + gBattleAnimArgs[1]; - data[4] = sprite->pos1.y << 8; - t1 = (spriteCoord + (u16) gBattleAnimArgs[6]) << 1; - data[7] = (data[7] & 1) | t1; - ((u8 *) data)[0] |= 4; + data->unk8 = sprite->pos1.y << 8; + data->unkE_1 = spriteCoord + gBattleAnimArgs[6]; + data->unk0_0c = 1; + data->unk2 = gBattleAnimArgs[2] & 0xFF; + data->unkA = (gBattleAnimArgs[2] >> 8) & 0xFF; + data->unk4 = gBattleAnimArgs[3]; + data->unk6 = gBattleAnimArgs[4]; + *(u16*)(data->unkC) = gBattleAnimArgs[5]; - arg2 = (u16) gBattleAnimArgs[2]; - data[1] = (u8) gBattleAnimArgs[2]; - arg2 <<= 16; - data[5] = arg2 >> 24; - data[2] = gBattleAnimArgs[3]; - data[3] = gBattleAnimArgs[4]; - data[6] = gBattleAnimArgs[5]; - - if ((u16) (data[1] - 64) <= 0x7f) + if (data->unk2 >= 64 && data->unk2 <= 191) { if (!IsContest()) - sprite->oam.priority = GetBattlerSpriteBGPriority(slot) + 1; + sprite->oam.priority = GetBattlerSpriteBGPriority(battler) + 1; else - sprite->oam.priority = GetBattlerSpriteBGPriority(slot); + sprite->oam.priority = GetBattlerSpriteBGPriority(battler); - ((u8 *) data)[14] = data[7] & -2; + data->unkE_0 = 0; - if (!(data[2] & 0x8000)) + if (!(data->unk4 & 0x8000)) { sprite->hFlip ^= 1; sprite->animNum = sprite->hFlip; @@ -606,10 +615,10 @@ void sub_810E314(struct Sprite *sprite) } else { - sprite->oam.priority = GetBattlerSpriteBGPriority(slot); - ((u8 *) data)[14] |= 1; + sprite->oam.priority = GetBattlerSpriteBGPriority(battler); + data->unkE_0 = 1; - if (data[2] & 0x8000) + if (data->unk4 & 0x8000) { sprite->hFlip ^= 1; sprite->animNum = sprite->hFlip; @@ -619,24 +628,236 @@ void sub_810E314(struct Sprite *sprite) } } - t2 = (u16) data[1] >> 6 << 4; - ((u8 *) data)[0] = (15 & data[0]) | t2; - - sprite->pos2.x = (gSineTable[(u16) data[1]] * (u8) data[6]) >> 8; - + data->unk0_1 = data->unk2 >> 6; + sprite->pos2.x = (gSineTable[data->unk2] * data->unkC[0]) >> 8; matrixNum = sprite->oam.matrixNum; - sinIndex = (-sprite->pos2.x >> 1) + data[5]; + sinIndex = (-sprite->pos2.x >> 1) + data->unkA; sinVal = gSineTable[sinIndex]; gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[sinIndex + 64]; - gOamMatrices[matrixNum].b = sinVal; - sinVal2 = -sinVal; - gOamMatrices[matrixNum].c = sinVal2; + // The comparison below is completely pointless. 'sprite' is sure to be a valid pointer and + // both the 'if' and 'else' parts are exactly the same. + // The only reason for this is making sure the compiler generates the exact ASM. + if (sprite) + { + gOamMatrices[matrixNum].b = sinVal; + gOamMatrices[matrixNum].c = -sinVal; + } + else + { + gOamMatrices[matrixNum].b = sinVal; + gOamMatrices[matrixNum].c = -sinVal; + } sprite->callback = sub_810E520; } +#ifndef NONMATCHING +void sub_810E520(struct Sprite *sprite) +{ + u8 matrixNum, sinIndex, var; + s16 sinVal = 0; + struct FeatherDanceData *data = (struct FeatherDanceData *)sprite->data; + + if (data->unk0_0a) + { + if (data->unk1-- % 256 == 0) + { + data->unk0_0a = 0; + data->unk1 = 0; + } + } + else + { + switch (data->unk2 >> 6) + { + case 0: + if (data->unk0_1 == 1) + { + data->unk0_0d = 1; + data->unk0_0a = 1; + data->unk1 = 0; + } + else if (data->unk0_1 == 3) + { + data->unk0_0b ^= 1; + data->unk1 = 0; + } + else if (data->unk0_0d) + { + sprite->hFlip ^= 1; + sprite->animNum = sprite->hFlip; + sprite->animBeginning = 1; + sprite->animEnded = 0; + if (data->unk0_0c) + { + if (!IsContest()) + { + if (!data->unkE_0) + sprite->oam.priority--; + else + sprite->oam.priority++; + } + else + { + if (!data->unkE_0) + sprite->subpriority -= 12; + else + sprite->subpriority += 12; + } + data->unkE_0 ^= 1; + } + data->unk0_0d = 0; + } + data->unk0_1 = 0; + break; + case 1: + if (data->unk0_1 == 0) + { + data->unk0_0d = 1; + data->unk0_0a = 1; + data->unk1 = 0; + } + else if (data->unk0_1 == 2) + { + data->unk0_0a = 1; + data->unk1 = 0; + } + else if (data->unk0_0d) + { + sprite->hFlip ^= 1; + sprite->animNum = sprite->hFlip; + sprite->animBeginning = 1; + sprite->animEnded = 0; + if (data->unk0_0c) + { + if (!IsContest()) + { + if (!data->unkE_0) + sprite->oam.priority--; + else + sprite->oam.priority++; + } + else + { + if (!data->unkE_0) + sprite->subpriority -= 12; + else + sprite->subpriority += 12; + } + data->unkE_0 ^= 1; + } + data->unk0_0d = 0; + } + data->unk0_1 = 1; + break; + case 2: + if (data->unk0_1 == 0) + { + data->unk0_0d = 1; + data->unk0_0a = 1; + data->unk1 = 0; + } + else if (data->unk0_1 == 2) + { + data->unk0_0a = 1; + data->unk1 = 0; + } + else if (data->unk0_0d) + { + sprite->hFlip ^= 1; + sprite->animNum = sprite->hFlip; + sprite->animBeginning = 1; + sprite->animEnded = 0; + if (data->unk0_0c) + { + if (!IsContest()) + { + if (!data->unkE_0) + sprite->oam.priority--; + else + sprite->oam.priority++; + } + else + { + if (!data->unkE_0) + sprite->subpriority -= 12; + else + sprite->subpriority += 12; + } + data->unkE_0 ^= 1; + } + data->unk0_0d = 0; + } + data->unk0_1 = 2; + break; + case 3: + if (data->unk0_1 == 2) + { + data->unk0_0d = 1; + } + else if (data->unk0_1 == 0) + { + data->unk0_0b ^= 1; + data->unk1 = 0; + } + else if (data->unk0_0d) + { + sprite->hFlip ^= 1; + sprite->animNum = sprite->hFlip; + sprite->animBeginning = 1; + sprite->animEnded = 0; + if (data->unk0_0c) + { + if (!IsContest()) + { + if (!data->unkE_0) + sprite->oam.priority--; + else + sprite->oam.priority++; + } + else + { + if (!data->unkE_0) + sprite->subpriority -= 12; + else + sprite->subpriority += 12; + } + data->unkE_0 ^= 1; + } + data->unk0_0d = 0; + } + data->unk0_1 = 3; + break; + } + + var = data->unkC[data->unk0_0b]; + sprite->pos2.x = (gSineTable[data->unk2] * var) >> 8; + matrixNum = sprite->oam.matrixNum; + + sinIndex = (-sprite->pos2.x >> 1) + data->unkA; + sinVal = gSineTable[sinIndex]; + + gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[sinIndex + 64]; + gOamMatrices[matrixNum].b = sinVal; + gOamMatrices[matrixNum].c = -sinVal; + + data->unk8 += data->unk6; + sprite->pos1.y = data->unk8 >> 8; + if (data->unk4 & 0x8000) + data->unk2 = (data->unk2 - (data->unk4 & 0x7FFF)) & 0xFF; + else + data->unk2 = (data->unk2 + (data->unk4 & 0x7FFF)) & 0xFF; + + if (sprite->pos1.y + sprite->pos2.y > data->unkE_1) + { + sprite->data[0] = 0; + sprite->callback = sub_810E2C8; + } + } +} +#else NAKED void sub_810E520(struct Sprite *sprite) { @@ -1345,6 +1566,7 @@ _0810EA36:\n\ .pool\n\ "); } +#endif void sub_810EA4C(struct Sprite *sprite) { @@ -1363,7 +1585,7 @@ void sub_810EAA0(struct Sprite * sprite) InitSpritePosToAnimAttacker(sprite, 0); else InitSpritePosToAnimTarget(sprite, FALSE); - + if ((!gBattleAnimArgs[2] && !GetBattlerSide(gBattleAnimAttacker)) || (gBattleAnimArgs[2] == 1 && !GetBattlerSide(gBattleAnimTarget))) { @@ -1424,14 +1646,15 @@ void sub_810EC34(struct Sprite *sprite) { switch (sprite->data[0]) { - case 0: - InitSpritePosToAnimAttacker(sprite, 1); - gSprites[GetAnimBattlerSpriteId(0)].invisible = 1; - ++sprite->data[0]; - break; - case 1: - if (sprite->affineAnimEnded) - DestroyAnimSprite(sprite); + case 0: + InitSpritePosToAnimAttacker(sprite, 1); + gSprites[GetAnimBattlerSpriteId(0)].invisible = 1; + ++sprite->data[0]; + break; + case 1: + if (sprite->affineAnimEnded) + DestroyAnimSprite(sprite); + break; } } @@ -1439,23 +1662,24 @@ void sub_810EC94(struct Sprite *sprite) { switch (sprite->data[0]) { - case 0: - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); - sprite->pos2.y = -sprite->pos1.y - 32; - sprite->data[0]++; - break; - case 1: - sprite->pos2.y += 10; - if (sprite->pos2.y >= 0) - ++sprite->data[0]; - break; - case 2: - sprite->pos2.y -= 10; - if (sprite->pos1.y + sprite->pos2.y < -32) - { - gSprites[GetAnimBattlerSpriteId(0)].invisible = 0; - DestroyAnimSprite(sprite); - } + case 0: + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + sprite->pos2.y = -sprite->pos1.y - 32; + sprite->data[0]++; + break; + case 1: + sprite->pos2.y += 10; + if (sprite->pos2.y >= 0) + ++sprite->data[0]; + break; + case 2: + sprite->pos2.y -= 10; + if (sprite->pos1.y + sprite->pos2.y < -32) + { + gSprites[GetAnimBattlerSpriteId(0)].invisible = 0; + DestroyAnimSprite(sprite); + } + break; } } @@ -1471,7 +1695,9 @@ void sub_810ED28(struct Sprite *sprite) void sub_810ED70(struct Sprite *sprite) { if (sprite->data[0] > 0) + { sprite->data[0]--; + } else if (sprite->pos1.y + sprite->pos2.y > -32) { sprite->data[2] += sprite->data[1]; @@ -1503,7 +1729,7 @@ void sub_810EE14(struct Sprite *sprite) u32 matrixNum; int t1, t2; - + switch (sprite->data[0]) { case 0: @@ -1528,7 +1754,7 @@ void sub_810EE14(struct Sprite *sprite) sprite->data[1] -= 40; else sprite->data[1] += 40; - + sprite->data[2]++; TrySetSpriteRotScale(sprite, 0, 256, sprite->data[1], 0); @@ -1540,7 +1766,7 @@ void sub_810EE14(struct Sprite *sprite) if (t2 > 128) t2 = 128; - + /* NONMATCHING * compiles to: @@ -1684,22 +1910,18 @@ void sub_810EEF8(struct Sprite *sprite) if (v1 % 2) sprite->data[0] = 736 + v1; - else sprite->data[0] = 736 - v1; - if (v2 % 2) sprite->data[1] = 896 + v2; - else sprite->data[1] = 896 - v2; - + sprite->data[2] = gBattleAnimArgs[0]; if (sprite->data[2]) sprite->oam.matrixNum = 8; - if (gBattleAnimArgs[1] == 0) { @@ -1733,7 +1955,6 @@ void sub_810EFA8(struct Sprite *sprite) if (sprite->data[0] < 0) sprite->data[0] = 0; - if (++sprite->data[3] == 31) DestroyAnimSprite(sprite); @@ -1750,27 +1971,26 @@ void sub_810F018(struct Sprite *sprite) { switch (sprite->data[0]) { - case 0: - if (++sprite->data[1] > 8) - { - sprite->data[1] = 0; - sprite->invisible ^= 1; - if (++sprite->data[2] > 5 && sprite->invisible) - sprite->data[0]++; - } - break; - case 1: - DestroyAnimSprite(sprite); + case 0: + if (++sprite->data[1] > 8) + { + sprite->data[1] = 0; + sprite->invisible ^= 1; + if (++sprite->data[2] > 5 && sprite->invisible) + sprite->data[0]++; + } + break; + case 1: + DestroyAnimSprite(sprite); + break; } } void sub_810F084(struct Sprite *sprite) { - s16 posx, posy; u16 rotation; - - posx = sprite->pos1.x; - posy = sprite->pos1.y; + s16 posx = sprite->pos1.x; + s16 posy = sprite->pos1.y; sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); @@ -1797,7 +2017,8 @@ void sub_810F140(struct Sprite *sprite) sprite->pos1.x = sprite->data[4] >> 4; sprite->pos1.y = sprite->data[5] >> 4; - if ((u16) (sprite->pos1.x + 0x2d) > 0x14a || sprite->pos1.y > 0x9d || sprite->pos1.y < -0x2d) + if (sprite->pos1.x > 285 || sprite->pos1.x < -45 + || sprite->pos1.y > 157 || sprite->pos1.y < -45) DestroySpriteAndMatrix(sprite); } From 9bea9e1624a30980aa194b076f0324b77c76edc9 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 5 Mar 2019 06:06:20 -0500 Subject: [PATCH 181/217] Start decompiling menu_unknown --- asm/menu_unknown.s | 320 ----------------------------------------- data/menu_unknown.s | 14 -- include/menu.h | 2 +- include/menu_unknown.h | 15 ++ include/pokenav.h | 9 -- ld_script.txt | 2 + src/menu_unknown.c | 186 ++++++++++++++++++++++++ src/party_menu.c | 3 +- src/player_pc.c | 2 +- 9 files changed, 207 insertions(+), 346 deletions(-) create mode 100644 include/menu_unknown.h create mode 100644 src/menu_unknown.c diff --git a/asm/menu_unknown.s b/asm/menu_unknown.s index 6b449e7045..52f4dbee04 100644 --- a/asm/menu_unknown.s +++ b/asm/menu_unknown.s @@ -5,327 +5,7 @@ .syntax unified .text - - thumb_func_start sub_81D1C44 -sub_81D1C44: @ 81D1C44 - push {r4,lr} - lsls r0, 24 - ldr r4, =gUnknown_0203CF4C - lsrs r0, 21 - adds r0, 0x8 - bl Alloc - str r0, [r4] - cmp r0, 0 - bne _081D1C60 - movs r0, 0 - b _081D1C7A - .pool -_081D1C60: - movs r2, 0 - ldr r4, =gUnknown_0203CF48 - movs r3, 0xFF -_081D1C66: - adds r0, r2, r4 - ldrb r1, [r0] - orrs r1, r3 - strb r1, [r0] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x2 - bls _081D1C66 - movs r0, 0x1 -_081D1C7A: - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D1C44 - thumb_func_start sub_81D1C84 -sub_81D1C84: @ 81D1C84 - push {r4-r6,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r6, =gUnknown_0203CF48 - adds r5, r4, r6 - ldrb r0, [r5] - cmp r0, 0xFF - bne _081D1CEC - cmp r4, 0x2 - bne _081D1CD4 - ldr r0, =gUnknown_086253E8 - ldr r1, [r0, 0x14] - ldr r0, [r0, 0x10] - str r0, [sp] - str r1, [sp, 0x4] - ldr r0, =gMailboxMailOptions - movs r1, 0x4 - bl GetMaxWidthInMenuTable - lsls r0, 24 - ldr r2, =0x00ffffff - ldr r1, [sp] - ands r1, r2 - orrs r1, r0 - str r1, [sp] - mov r0, sp - bl AddWindow - strb r0, [r6, 0x2] - b _081D1CE0 - .pool -_081D1CD4: - lsls r0, r4, 3 - ldr r1, =gUnknown_086253E8 - adds r0, r1 - bl AddWindow - strb r0, [r5] -_081D1CE0: - ldr r0, =gUnknown_0203CF48 - adds r0, r4, r0 - ldrb r0, [r0] - movs r1, 0 - bl SetStandardWindowBorderStyle -_081D1CEC: - ldr r0, =gUnknown_0203CF48 - adds r0, r4, r0 - ldrb r0, [r0] - add sp, 0x8 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D1C84 - - thumb_func_start sub_81D1D04 -sub_81D1D04: @ 81D1D04 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, =gUnknown_0203CF48 - adds r4, r0 - ldrb r0, [r4] - movs r1, 0 - bl sub_8198070 - ldrb r0, [r4] - bl ClearWindowTilemap - ldrb r0, [r4] - bl RemoveWindow - movs r0, 0xFF - strb r0, [r4] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D1D04 - - thumb_func_start sub_81D1D34 -sub_81D1D34: @ 81D1D34 - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gUnknown_0203CF48 - adds r0, r1 - ldrb r0, [r0] - bx lr - .pool - thumb_func_end sub_81D1D34 - - thumb_func_start sub_81D1D44 -sub_81D1D44: @ 81D1D44 - push {r4,r5,lr} - sub sp, 0x34 - adds r3, r1, 0 - lsls r0, 24 - lsrs r4, r0, 24 - lsls r2, 24 - lsrs r5, r2, 24 - movs r0, 0x2 - negs r0, r0 - cmp r3, r0 - beq _081D1DAC - ldr r0, =gSaveBlock1Ptr - lsls r1, r3, 3 - adds r1, r3 - lsls r1, 2 - ldr r0, [r0] - adds r1, r0 - ldr r0, =0x00002cca - adds r1, r0 - add r0, sp, 0x14 - bl StringCopy - add r0, sp, 0x14 - bl sub_81DB52C - add r0, sp, 0x14 - bl StringLength - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x5 - bhi _081D1D8C - add r0, sp, 0x14 - movs r1, 0x1 - bl ConvertInternationalString -_081D1D8C: - movs r0, 0 - str r0, [sp] - str r0, [sp, 0x4] - ldr r0, =gUnknown_08625400 - str r0, [sp, 0x8] - movs r0, 0x1 - negs r0, r0 - str r0, [sp, 0xC] - add r0, sp, 0x14 - str r0, [sp, 0x10] - adds r0, r4, 0 - movs r1, 0x1 - movs r2, 0x8 - adds r3, r5, 0 - bl AddTextPrinterParameterized4 -_081D1DAC: - add sp, 0x34 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D1D44 - - thumb_func_start sub_81D1DC0 -sub_81D1DC0: @ 81D1DC0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - adds r5, r0, 0 - movs r3, 0 - ldr r7, =gUnknown_0203CF4C - ldr r0, =gText_Cancel2 - mov r12, r0 - ldr r4, =gMultiuseListMenuTemplate - ldr r1, =gUnknown_0203CF48 - mov r8, r1 - ldr r2, =sub_81D1E7C - mov r9, r2 - ldr r0, =sub_81D1D44 - mov r10, r0 - ldrb r1, [r5, 0x5] - cmp r3, r1 - bcs _081D1E02 - adds r6, r7, 0 - ldr r2, =gUnknown_08625403 -_081D1DEC: - ldr r1, [r6] - lsls r0, r3, 3 - adds r0, r1 - str r2, [r0] - str r3, [r0, 0x4] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - ldrb r0, [r5, 0x5] - cmp r3, r0 - bcc _081D1DEC -_081D1E02: - ldr r2, [r7] - lsls r0, r3, 3 - adds r0, r2 - mov r1, r12 - str r1, [r0] - movs r1, 0x2 - negs r1, r1 - str r1, [r0, 0x4] - str r2, [r4] - ldrb r0, [r5, 0x5] - adds r0, 0x1 - movs r1, 0 - strh r0, [r4, 0xC] - mov r2, r8 - ldrb r0, [r2, 0x1] - strb r0, [r4, 0x10] - strb r1, [r4, 0x11] - movs r0, 0x8 - strb r0, [r4, 0x12] - strb r1, [r4, 0x13] - strh r0, [r4, 0xE] - movs r0, 0x29 - strb r0, [r4, 0x14] - movs r0, 0x31 - strb r0, [r4, 0x15] - mov r0, r9 - str r0, [r4, 0x4] - mov r1, r10 - str r1, [r4, 0x8] - movs r0, 0x1 - strb r0, [r4, 0x17] - movs r0, 0 - strb r0, [r4, 0x16] - ldrh r1, [r5, 0x2] - ldrh r2, [r5] - adds r0, r4, 0 - bl ListMenuInit - lsls r0, 24 - lsrs r0, 24 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D1DC0 - - thumb_func_start sub_81D1E7C -sub_81D1E7C: @ 81D1E7C - push {lr} - lsls r1, 24 - lsrs r1, 24 - cmp r1, 0x1 - beq _081D1E8C - movs r0, 0x5 - bl PlaySE -_081D1E8C: - pop {r0} - bx r0 - thumb_func_end sub_81D1E7C - - thumb_func_start sub_81D1E90 -sub_81D1E90: @ 81D1E90 - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - ldrb r0, [r4, 0x5] - ldrb r1, [r4, 0x4] - subs r0, r1 - adds r0, 0x1 - str r0, [sp] - movs r0, 0x6E - str r0, [sp, 0x4] - str r0, [sp, 0x8] - adds r0, r4, 0x2 - str r0, [sp, 0xC] - movs r0, 0x2 - movs r1, 0xC8 - movs r2, 0xC - movs r3, 0x94 - bl AddScrollIndicatorArrowPairParameterized - strb r0, [r4, 0x9] - add sp, 0x10 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81D1E90 - - thumb_func_start sub_81D1EC0 -sub_81D1EC0: @ 81D1EC0 - push {lr} - ldr r0, =gUnknown_0203CF4C - ldr r0, [r0] - bl Free - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D1EC0 thumb_func_start sub_81D1ED4 sub_81D1ED4: @ 81D1ED4 push {r4-r7,lr} diff --git a/data/menu_unknown.s b/data/menu_unknown.s index 6d1bd7ecff..1ea0786a43 100644 --- a/data/menu_unknown.s +++ b/data/menu_unknown.s @@ -3,20 +3,6 @@ .section .rodata -gUnknown_086253E8:: @ 86253E8 - .4byte 0x8010100 - .4byte 0x80F02 - .4byte 0x8011500 - .4byte 0x180F12 - .4byte 0xB010100 - .4byte 0x180F08 - -gUnknown_08625400:: @ 8625400 - .byte 1, 2, 3 - -gUnknown_08625403:: @ 8625403 - .byte 0xFF - @ ScanlineEffectParams gUnknown_08625404:: @ 8625404 .4byte 0x04000040 @ REG_ADDR_WIN0H diff --git a/include/menu.h b/include/menu.h index aca4624687..af60e51926 100644 --- a/include/menu.h +++ b/include/menu.h @@ -31,7 +31,7 @@ u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed void PrintPlayerNameOnWindow(u8, const u8*, u16, u16); void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback); void sub_8197434(u8 windowId, bool8 copyToVram); -void SetStandardWindowBorderStyle(u8 a0, u8 a1); +void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram); void DisplayYesNoMenu(void); u32 GetPlayerTextSpeed(void); u8 GetPlayerTextSpeedDelay(void); diff --git a/include/menu_unknown.h b/include/menu_unknown.h new file mode 100644 index 0000000000..b4c161dadf --- /dev/null +++ b/include/menu_unknown.h @@ -0,0 +1,15 @@ +#ifndef GUARD_MENU_UNKNOWN_H +#define GUARD_MENU_UNKNOWN_H + +#include "player_pc.h" + +bool8 sub_81D1C44(u8 a0); +u8 sub_81D1C84(u8 a0); +u8 sub_81D1DC0(struct PlayerPCItemPageStruct *a0); +void sub_81D1E90(struct PlayerPCItemPageStruct *a0); +void sub_81D1EC0(void); +void sub_81D1D04(u8 a0); +void DrawLevelUpWindowPg1(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); +void DrawLevelUpWindowPg2(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); + +#endif // GUARD_MENU_UNKNOWN_H \ No newline at end of file diff --git a/include/pokenav.h b/include/pokenav.h index 849c9bf16a..a1f3119445 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -1,6 +1,5 @@ #ifndef GUARD_POKENAV_H #define GUARD_POKENAV_H -#include "player_pc.h" #include "list_menu.h" bool8 sub_81D20BC(void *arg0); @@ -13,12 +12,6 @@ void sub_81D3464(void *arg0); void sub_81D3480(void *arg0, u8 arg1); void sub_81D2754(void *arg0, void *arg1); void sub_81D1F84(void *arg0, void *arg1, void *arg2); -u8 sub_81D1C84(u8); -u8 sub_81D1DC0(struct PlayerPCItemPageStruct *); -void sub_81D1E90(struct PlayerPCItemPageStruct *); -void sub_81D1EC0(void); -void sub_81D1D04(u8); -bool8 sub_81D1C44(u8); bool8 sub_81D4A58(struct EventObject*); void MoveRelearnerPrintText(u8 *); u16 MoveRelearnerRunTextPrinters(void); @@ -28,7 +21,5 @@ void InitMoveRelearnerWindows(bool8 useContextWindow); bool8 EventObjectIsFarawayIslandMew(struct EventObject *); u32 sub_81D427C(void); void sub_81D4998(void); -void DrawLevelUpWindowPg1(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); -void DrawLevelUpWindowPg2(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); #endif //GUARD_POKENAV_H diff --git a/ld_script.txt b/ld_script.txt index 31e952cf39..4c12291fe9 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -291,6 +291,7 @@ SECTIONS { src/pokenav.o(.text); asm/pokenav.o(.text); src/pokenav_match_call.o(.text); + src/menu_unknown.o(.text); asm/menu_unknown.o(.text); asm/rom_81D1C44.o(.text); src/trainer_hill.o(.text); @@ -595,6 +596,7 @@ SECTIONS { src/pokenav.o(.rodata); data/pokenav.o(.rodata); src/pokenav_match_call.o(.rodata); + src/menu_unknown.o(.rodata); data/menu_unknown.o(.rodata); data/rom_81D1C44.o(.rodata); src/trainer_hill.o(.rodata); diff --git a/src/menu_unknown.c b/src/menu_unknown.c new file mode 100644 index 0000000000..21f42d264b --- /dev/null +++ b/src/menu_unknown.c @@ -0,0 +1,186 @@ +#include "global.h" +#include "alloc.h" +#include "international_string_util.h" +#include "menu.h" +#include "menu_unknown.h" +#include "player_pc.h" +#include "sound.h" +#include "strings.h" +#include "string_util.h" +#include "window.h" +#include "constants/songs.h" + +#define WINDOW_UNK_0 0 +#define WINDOW_UNK_1 1 +#define WINDOW_UNK_2 2 + +extern struct ListMenuItem *gUnknown_0203CF4C; +extern u8 gUnknown_0203CF48[3]; + +void sub_81D1E7C(s32 itemIndex, bool8 onInit, struct ListMenu *list); + +const struct WindowTemplate gUnknown_086253E8[] = +{ + [WINDOW_UNK_0] = { + //0x08010100, + .bg = 0, + .tilemapLeft = 1, + .tilemapTop = 1, + .width = 8, + //0x00080F02, + .height = 2, + .paletteNum = 0xF, + .baseBlock = 0x8 + }, + [WINDOW_UNK_1] = { + //0x08 01 15 00, + .bg = 0, + .tilemapLeft = 21, + .tilemapTop = 1, + .width = 8, + //0x0018 0F 12, + .height = 18, + .paletteNum = 0xF, + .baseBlock = 0x18 + }, + [WINDOW_UNK_2] = { + //0x0B 01 01 00 + .bg = 0, + .tilemapLeft = 1, + .tilemapTop = 1, + .width = 11, + //0x0018 0F 08 + .height = 8, + .paletteNum = 0xF, + .baseBlock = 0x18 + } +}; + +const u8 gUnknown_08625400[] = { + 1, 2, 3 +}; + +static const u8 sEmptyItemName[] = _(""); + +bool8 sub_81D1C44(u8 count) +{ + u32 i; + struct ListMenuItem **v1; + v1 = &gUnknown_0203CF4C; + *v1 = Alloc(count * sizeof(struct ListMenuItem) + sizeof(struct ListMenuItem)); + + if (gUnknown_0203CF4C == NULL) + return FALSE; + + for (i = 0; i < ARRAY_COUNT(gUnknown_0203CF48); i = (u8)(i + 1)) + { + gUnknown_0203CF48[i] |= 0xFF; + } + + return TRUE; +} + +u8 sub_81D1C84(u8 a0) +{ + struct WindowTemplate template; + + u8 windowId = gUnknown_0203CF48[a0]; + if (windowId == 0xFF) + { + if (a0 == WINDOW_UNK_2) + { + u32 v1; + u32 v2; + s32 v3; + + template = gUnknown_086253E8[WINDOW_UNK_2]; + v3 = GetMaxWidthInMenuTable(&gMailboxMailOptions[0], 4); + template.width = v3; + gUnknown_0203CF48[WINDOW_UNK_2] = AddWindow(&template); + } + else + { + gUnknown_0203CF48[a0] = AddWindow(&gUnknown_086253E8[a0]); + } + SetStandardWindowBorderStyle(gUnknown_0203CF48[a0], 0); + } + return gUnknown_0203CF48[a0]; +} + +void sub_81D1D04(u8 a0) +{ + sub_8198070(gUnknown_0203CF48[a0], 0); + ClearWindowTilemap(gUnknown_0203CF48[a0]); + RemoveWindow(gUnknown_0203CF48[a0]); + gUnknown_0203CF48[a0] = 0xFF; +} + +u8 sub_81D1D34(u8 a0) +{ + return gUnknown_0203CF48[a0]; +} + +void sub_81D1D44(u8 windowId, s32 itemId, u8 y) +{ + u8 buffer[30]; + u16 length; + + if (itemId == LIST_CANCEL) + return; + + StringCopy(buffer, gSaveBlock1Ptr->mail[6 + itemId].playerName); + sub_81DB52C(buffer); + length = StringLength(buffer); + if (length <= 5) + ConvertInternationalString(buffer, LANGUAGE_JAPANESE); + AddTextPrinterParameterized4(windowId, 1, 8, y, 0, 0, gUnknown_08625400, -1, buffer); +} + +u8 sub_81D1DC0(struct PlayerPCItemPageStruct *page) +{ + u16 i; + for (i = 0; i < page->count; i++) + { + gUnknown_0203CF4C[i].name = sEmptyItemName; + gUnknown_0203CF4C[i].id = i; + } + + gUnknown_0203CF4C[i].name = gText_Cancel2; + gUnknown_0203CF4C[i].id = LIST_CANCEL; + + gMultiuseListMenuTemplate.items = gUnknown_0203CF4C; + gMultiuseListMenuTemplate.totalItems = page->count + 1; + gMultiuseListMenuTemplate.windowId = gUnknown_0203CF48[1]; + gMultiuseListMenuTemplate.header_X = 0; + gMultiuseListMenuTemplate.item_X = 8; + gMultiuseListMenuTemplate.cursor_X = 0; + gMultiuseListMenuTemplate.maxShowed = 8; + gMultiuseListMenuTemplate.upText_Y = 9; + gMultiuseListMenuTemplate.cursorPal = 2; + gMultiuseListMenuTemplate.fillValue = 1; + gMultiuseListMenuTemplate.cursorShadowPal = 3; + gMultiuseListMenuTemplate.moveCursorFunc = sub_81D1E7C; + gMultiuseListMenuTemplate.itemPrintFunc = sub_81D1D44; + gMultiuseListMenuTemplate.fontId = 1; + gMultiuseListMenuTemplate.cursorKind = 0; + gMultiuseListMenuTemplate.lettersSpacing = 0; + gMultiuseListMenuTemplate.itemVerticalPadding = 0; + gMultiuseListMenuTemplate.scrollMultiple = LIST_NO_MULTIPLE_SCROLL; + return ListMenuInit(&gMultiuseListMenuTemplate, page->itemsAbove, page->cursorPos); +} + +void sub_81D1E7C(s32 itemIndex, bool8 onInit, struct ListMenu *list) +{ + if (onInit != TRUE) + PlaySE(SE_SELECT); +} + +void sub_81D1E90(struct PlayerPCItemPageStruct *page) +{ + page->scrollIndicatorId = AddScrollIndicatorArrowPairParameterized(2, 0xC8, 12, 0x94, page->count - page->pageItems + 1, 0x6E, 0x6E, &page->itemsAbove); +} + +void sub_81D1EC0(void) +{ + Free(gUnknown_0203CF4C); +} \ No newline at end of file diff --git a/src/party_menu.c b/src/party_menu.c index 7e47e9ced5..7e47cbf808 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -37,15 +37,16 @@ #include "main.h" #include "menu.h" #include "menu_helpers.h" +#include "menu_unknown.h" #include "metatile_behavior.h" #include "overworld.h" #include "palette.h" #include "party_menu.h" +#include "player_pc.h" #include "pokemon.h" #include "pokemon_icon.h" #include "pokemon_storage_system.h" #include "pokemon_summary_screen.h" -#include "pokenav.h" #include "region_map.h" #include "reshow_battle_screen.h" #include "rom_8011DC0.h" diff --git a/src/player_pc.c b/src/player_pc.c index bec763b415..f167062cb4 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -20,7 +20,6 @@ #include "overworld.h" #include "palette.h" #include "party_menu.h" -#include "pokenav.h" #include "player_pc.h" #include "script.h" #include "sound.h" @@ -29,6 +28,7 @@ #include "strings.h" #include "task.h" #include "window.h" +#include "menu_unknown.h" // structures struct Struct203BCC4 From b150091436a97178675f40bfccf737a08f215ad8 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 5 Mar 2019 17:06:29 +0100 Subject: [PATCH 182/217] Rename an erroneously named battlescript --- data/battle_scripts_1.s | 2 +- include/battle_scripts.h | 2 +- src/battle_util.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 0159a3f73d..b0c753752c 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3876,7 +3876,7 @@ BattleScript_MoveUsedIsInLove:: status2animation BS_ATTACKER, STATUS2_INFATUATION return -BattleScript_MoveUsedIsParalyzedCantAttack:: +BattleScript_MoveUsedIsInLoveCantAttack:: printstring STRINGID_PKMNIMMOBILIZEDBYLOVE waitmessage 0x40 goto BattleScript_MoveEnd diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 5f314401a9..cac3a76523 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -115,7 +115,7 @@ extern const u8 BattleScript_PrintPayDayMoneyString[]; extern const u8 BattleScript_WrapTurnDmg[]; extern const u8 BattleScript_WrapEnds[]; extern const u8 BattleScript_MoveUsedIsInLove[]; -extern const u8 BattleScript_MoveUsedIsParalyzedCantAttack[]; +extern const u8 BattleScript_MoveUsedIsInLoveCantAttack[]; extern const u8 BattleScript_NightmareTurnDmg[]; extern const u8 BattleScript_CurseTurnDmg[]; extern const u8 BattleScript_TargetPRLZHeal[]; diff --git a/src/battle_util.c b/src/battle_util.c index fc6042b65f..aa88cf9522 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1526,7 +1526,7 @@ u8 AtkCanceller_UnableToUseMove(void) } else { - BattleScriptPush(BattleScript_MoveUsedIsParalyzedCantAttack); + BattleScriptPush(BattleScript_MoveUsedIsInLoveCantAttack); gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; gProtectStructs[gBattlerAttacker].loveImmobility = 1; CancelMultiTurnMoves(gBattlerAttacker); From 596d85bcbd13c11ad71307e79e641035811941db Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 5 Mar 2019 17:07:37 +0100 Subject: [PATCH 183/217] What is love, baby dont hurt me --- src/flying.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/flying.c b/src/flying.c index b48538706e..a157582e96 100644 --- a/src/flying.c +++ b/src/flying.c @@ -652,7 +652,7 @@ void sub_810E314(struct Sprite *sprite) sprite->callback = sub_810E520; } -#ifndef NONMATCHING +#ifdef NONMATCHING /* Things I can't get to match: 1. data->unk0_1 bitfield behaviour. The way bits are read is different. From e79b6f747b2095bf78336f4b6e6998d818ce8400 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 5 Mar 2019 20:07:59 +0100 Subject: [PATCH 184/217] Fix Controllers end command function names --- src/battle_controller_link_opponent.c | 9 ++++----- src/battle_controller_link_partner.c | 8 ++++---- src/battle_controller_opponent.c | 6 +++--- src/battle_controller_player.c | 6 +++--- src/battle_controller_player_partner.c | 6 +++--- src/battle_controller_recorded_opponent.c | 7 +++---- src/battle_controller_recorded_player.c | 6 +++--- src/battle_controller_safari.c | 6 +++--- src/battle_controller_wally.c | 6 +++--- 9 files changed, 29 insertions(+), 31 deletions(-) diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 05da72e16a..28ab4c2798 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -16,6 +16,7 @@ #include "palette.h" #include "pokeball.h" #include "pokemon.h" +#include "recorded_battle.h" #include "reshow_battle_screen.h" #include "sound.h" #include "string_util.h" @@ -32,8 +33,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_81851A8(u8 *); -extern u16 sub_8068B48(void); // this file's functions static void LinkOpponentHandleGetMonData(void); @@ -92,7 +91,7 @@ static void LinkOpponentHandleBattleAnimation(void); static void LinkOpponentHandleLinkStandbyMsg(void); static void LinkOpponentHandleResetActionMoveSelection(void); static void LinkOpponentHandleCmd55(void); -static void nullsub_92(void); +static void LinkOpponentCmdEnd(void); static void LinkOpponentBufferRunCommand(void); static void LinkOpponentBufferExecCompleted(void); @@ -164,7 +163,7 @@ static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) = LinkOpponentHandleLinkStandbyMsg, LinkOpponentHandleResetActionMoveSelection, LinkOpponentHandleCmd55, - nullsub_92 + LinkOpponentCmdEnd }; static void nullsub_28(void) @@ -1857,6 +1856,6 @@ static void LinkOpponentHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } -static void nullsub_92(void) +static void LinkOpponentCmdEnd(void) { } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 4eb122d054..06a8d4a6a0 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -16,6 +16,7 @@ #include "palette.h" #include "pokeball.h" #include "pokemon.h" +#include "recorded_battle.h" #include "reshow_battle_screen.h" #include "sound.h" #include "string_util.h" @@ -31,7 +32,6 @@ extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_81851A8(u8 *); // this file's functions static void LinkPartnerHandleGetMonData(void); @@ -90,7 +90,7 @@ static void LinkPartnerHandleBattleAnimation(void); static void LinkPartnerHandleLinkStandbyMsg(void); static void LinkPartnerHandleResetActionMoveSelection(void); static void LinkPartnerHandleCmd55(void); -static void SpriteCB_Null3(void); +static void LinkPartnerCmdEnd(void); static void LinkPartnerBufferRunCommand(void); static void LinkPartnerBufferExecCompleted(void); @@ -161,7 +161,7 @@ static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = LinkPartnerHandleLinkStandbyMsg, LinkPartnerHandleResetActionMoveSelection, LinkPartnerHandleCmd55, - SpriteCB_Null3 + LinkPartnerCmdEnd }; static void SpriteCB_Null2(void) @@ -1687,6 +1687,6 @@ static void LinkPartnerHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } -static void SpriteCB_Null3(void) +static void LinkPartnerCmdEnd(void) { } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 99bb0c5887..cdb886e5d7 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -97,7 +97,7 @@ static void OpponentHandleBattleAnimation(void); static void OpponentHandleLinkStandbyMsg(void); static void OpponentHandleResetActionMoveSelection(void); static void OpponentHandleCmd55(void); -static void nullsub_91(void); +static void OpponentCmdEnd(void); static void OpponentBufferRunCommand(void); static void OpponentBufferExecCompleted(void); @@ -169,7 +169,7 @@ static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) = OpponentHandleLinkStandbyMsg, OpponentHandleResetActionMoveSelection, OpponentHandleCmd55, - nullsub_91 + OpponentCmdEnd }; // unknown unused data @@ -2003,6 +2003,6 @@ static void OpponentHandleCmd55(void) OpponentBufferExecCompleted(); } -static void nullsub_91(void) +static void OpponentCmdEnd(void) { } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 6bcc97c68d..a0d92f23a4 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -99,7 +99,7 @@ static void PlayerHandleBattleAnimation(void); static void PlayerHandleLinkStandbyMsg(void); static void PlayerHandleResetActionMoveSelection(void); static void PlayerHandleCmd55(void); -static void nullsub_22(void); +static void PlayerCmdEnd(void); static void PlayerBufferRunCommand(void); static void HandleInputChooseTarget(void); @@ -186,7 +186,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = PlayerHandleLinkStandbyMsg, PlayerHandleResetActionMoveSelection, PlayerHandleCmd55, - nullsub_22 + PlayerCmdEnd }; static const u8 sTargetIdentities[] = {B_POSITION_PLAYER_LEFT, B_POSITION_PLAYER_RIGHT, B_POSITION_OPPONENT_RIGHT, B_POSITION_OPPONENT_LEFT}; @@ -3105,6 +3105,6 @@ static void PlayerHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } -static void nullsub_22(void) +static void PlayerCmdEnd(void) { } diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index a9b0f376be..787a4f77c6 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -90,7 +90,7 @@ static void PlayerPartnerHandleBattleAnimation(void); static void PlayerPartnerHandleLinkStandbyMsg(void); static void PlayerPartnerHandleResetActionMoveSelection(void); static void PlayerPartnerHandleCmd55(void); -static void nullsub_128(void); +static void PlayerPartnerCmdEnd(void); static void PlayerPartnerBufferRunCommand(void); static void PlayerPartnerBufferExecCompleted(void); @@ -167,7 +167,7 @@ static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = PlayerPartnerHandleLinkStandbyMsg, PlayerPartnerHandleResetActionMoveSelection, PlayerPartnerHandleCmd55, - nullsub_128 + PlayerPartnerCmdEnd }; // unknown unused data @@ -1928,6 +1928,6 @@ static void PlayerPartnerHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } -static void nullsub_128(void) +static void PlayerPartnerCmdEnd(void) { } diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 25e59172d4..79065c2e29 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -34,7 +34,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern u16 sub_8068B48(void); // this file's functions static void RecordedOpponentHandleGetMonData(void); @@ -93,7 +92,7 @@ static void RecordedOpponentHandleBattleAnimation(void); static void RecordedOpponentHandleLinkStandbyMsg(void); static void RecordedOpponentHandleResetActionMoveSelection(void); static void RecordedOpponentHandleCmd55(void); -static void SpriteCB_Null9(void); +static void RecordedOpponentCmdEnd(void); static void RecordedOpponentBufferRunCommand(void); static void RecordedOpponentBufferExecCompleted(void); @@ -165,7 +164,7 @@ static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void RecordedOpponentHandleLinkStandbyMsg, RecordedOpponentHandleResetActionMoveSelection, RecordedOpponentHandleCmd55, - SpriteCB_Null9 + RecordedOpponentCmdEnd }; static void nullsub_70(void) @@ -1791,6 +1790,6 @@ static void RecordedOpponentHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } -static void SpriteCB_Null9(void) +static void RecordedOpponentCmdEnd(void) { } diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index b2dfca6a07..e5e9347613 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -89,7 +89,7 @@ static void RecordedPlayerHandleBattleAnimation(void); static void RecordedPlayerHandleLinkStandbyMsg(void); static void RecordedPlayerHandleResetActionMoveSelection(void); static void RecordedPlayerHandleCmd55(void); -static void nullsub_121(void); +static void RecordedPlayerCmdEnd(void); static void RecordedPlayerBufferRunCommand(void); static void RecordedPlayerBufferExecCompleted(void); @@ -160,7 +160,7 @@ static void (*const sRecordedPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) RecordedPlayerHandleLinkStandbyMsg, RecordedPlayerHandleResetActionMoveSelection, RecordedPlayerHandleCmd55, - nullsub_121 + RecordedPlayerCmdEnd }; static void nullsub_120(void) @@ -1808,6 +1808,6 @@ static void RecordedPlayerHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } -static void nullsub_121(void) +static void RecordedPlayerCmdEnd(void) { } diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index b7223844f1..247f006277 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -84,7 +84,7 @@ static void SafariHandleBattleAnimation(void); static void SafariHandleLinkStandbyMsg(void); static void SafariHandleResetActionMoveSelection(void); static void SafariHandleCmd55(void); -static void SpriteCB_Null5(void); +static void SafariCmdEnd(void); static void SafariBufferRunCommand(void); static void SafariBufferExecCompleted(void); @@ -148,7 +148,7 @@ static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) = SafariHandleLinkStandbyMsg, SafariHandleResetActionMoveSelection, SafariHandleCmd55, - SpriteCB_Null5 + SafariCmdEnd }; static void SpriteCB_Null4(void) @@ -688,6 +688,6 @@ static void SafariHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_81595E4; } -static void SpriteCB_Null5(void) +static void SafariCmdEnd(void) { } diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index a196f8a44b..7f4fe47612 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -92,7 +92,7 @@ static void WallyHandleBattleAnimation(void); static void WallyHandleLinkStandbyMsg(void); static void WallyHandleResetActionMoveSelection(void); static void WallyHandleCmd55(void); -static void SpriteCB_Null8(void); +static void WallyCmdEnd(void); static void WallyBufferRunCommand(void); static void WallyBufferExecCompleted(void); @@ -161,7 +161,7 @@ static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(void) = WallyHandleLinkStandbyMsg, WallyHandleResetActionMoveSelection, WallyHandleCmd55, - SpriteCB_Null8 + WallyCmdEnd }; static void SpriteCB_Null7(void) @@ -1559,6 +1559,6 @@ static void WallyHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } -static void SpriteCB_Null8(void) +static void WallyCmdEnd(void) { } From c3594f982ddd0839aa7b97cb5a54087e198b0326 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 5 Mar 2019 20:32:14 -0500 Subject: [PATCH 185/217] Decompiling pokeblock ui stuff --- asm/menu_unknown.s | 93 ------------------------------------------ include/menu_unknown.h | 26 ++++++++++++ include/pokenav.h | 8 ---- src/menu_unknown.c | 35 ++++++++++++++++ src/use_pokeblock.c | 18 ++++---- 5 files changed, 71 insertions(+), 109 deletions(-) diff --git a/asm/menu_unknown.s b/asm/menu_unknown.s index 52f4dbee04..6b782f5c46 100644 --- a/asm/menu_unknown.s +++ b/asm/menu_unknown.s @@ -6,99 +6,6 @@ .text - thumb_func_start sub_81D1ED4 -sub_81D1ED4: @ 81D1ED4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - adds r3, r0, 0 - movs r6, 0 - movs r7, 0 -_081D1EE6: - movs r2, 0 - lsls r5, r6, 2 - adds r0, r6, 0x1 - mov r10, r0 - adds r4, r5, 0 -_081D1EF0: - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 2 - adds r0, r4, r0 - adds r0, r3, r0 - adds r1, r0, 0 - adds r1, 0x64 - strh r7, [r1] - adds r0, 0x66 - strh r7, [r0] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x9 - bls _081D1EF0 - movs r2, 0 - mov r9, r2 - str r5, [sp] - movs r1, 0x9B - mov r8, r1 - movs r4, 0x5B - mov r12, r4 -_081D1F1C: - lsls r0, r2, 2 - adds r0, r2 - adds r1, r6, r0 - adds r1, r3, r1 - mov r4, r9 - strb r4, [r1] - lsls r0, 2 - ldr r1, [sp] - adds r0, r1, r0 - adds r0, r3, r0 - mov r4, r8 - strh r4, [r0, 0x14] - mov r1, r12 - strh r1, [r0, 0x16] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x3 - bls _081D1F1C - adds r1, r3, r5 - movs r2, 0x96 - lsls r2, 1 - adds r0, r1, r2 - strh r7, [r0] - movs r4, 0x97 - lsls r4, 1 - adds r0, r1, r4 - strh r7, [r0] - mov r1, r10 - lsls r0, r1, 24 - lsrs r6, r0, 24 - cmp r6, 0x4 - bls _081D1EE6 - movs r2, 0xD5 - lsls r2, 2 - adds r0, r3, r2 - movs r1, 0 - strb r1, [r0] - ldr r4, =0x00000352 - adds r0, r3, r4 - strh r1, [r0] - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D1ED4 - thumb_func_start sub_81D1F84 sub_81D1F84: @ 81D1F84 push {r4-r7,lr} diff --git a/include/menu_unknown.h b/include/menu_unknown.h index b4c161dadf..9d398e2b03 100644 --- a/include/menu_unknown.h +++ b/include/menu_unknown.h @@ -3,6 +3,24 @@ #include "player_pc.h" +struct UnknownSubStruct_81D1ED4 +{ + u16 unk0; + u16 unk2; +}; + +struct UnknownStruct_81D1ED4 +{ + u8 unk0[4][5]; + struct UnknownSubStruct_81D1ED4 unk14[4][5]; + struct UnknownSubStruct_81D1ED4 unk64[10][5]; + struct UnknownSubStruct_81D1ED4 unk12C[4]; + u8 unk13C[0x216]; + u16 unk352; + u8 unk354; + u8 unk355[0x23]; +}; + bool8 sub_81D1C44(u8 a0); u8 sub_81D1C84(u8 a0); u8 sub_81D1DC0(struct PlayerPCItemPageStruct *a0); @@ -11,5 +29,13 @@ void sub_81D1EC0(void); void sub_81D1D04(u8 a0); void DrawLevelUpWindowPg1(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); void DrawLevelUpWindowPg2(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); +void sub_81D1ED4(struct UnknownStruct_81D1ED4 *a0); +void sub_81D2108(struct UnknownStruct_81D1ED4 *arg0); +void sub_81D20AC(struct UnknownStruct_81D1ED4 *arg0); +void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0); +void sub_81D3464(void *arg0); +void sub_81D3480(void *arg0, u8 arg1); +void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, void *arg1); +void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]); #endif // GUARD_MENU_UNKNOWN_H \ No newline at end of file diff --git a/include/pokenav.h b/include/pokenav.h index a1f3119445..10f0422255 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -4,14 +4,6 @@ bool8 sub_81D20BC(void *arg0); bool8 sub_81D312C(void *arg0); -void sub_81D1ED4(void *arg0); -void sub_81D2108(void *arg0); -void sub_81D20AC(void *arg0); -void sub_81D2230(void *arg0); -void sub_81D3464(void *arg0); -void sub_81D3480(void *arg0, u8 arg1); -void sub_81D2754(void *arg0, void *arg1); -void sub_81D1F84(void *arg0, void *arg1, void *arg2); bool8 sub_81D4A58(struct EventObject*); void MoveRelearnerPrintText(u8 *); u16 MoveRelearnerRunTextPrinters(void); diff --git a/src/menu_unknown.c b/src/menu_unknown.c index 21f42d264b..303bb7c827 100644 --- a/src/menu_unknown.c +++ b/src/menu_unknown.c @@ -183,4 +183,39 @@ void sub_81D1E90(struct PlayerPCItemPageStruct *page) void sub_81D1EC0(void) { Free(gUnknown_0203CF4C); +} + +void sub_81D1ED4(struct UnknownStruct_81D1ED4 *a0) +{ + u8 j; + u8 i; + u8 v1; + for (j = 0; j < 5; j++) + { + for (i = 0; i < 10; i++) + { + // u16 + a0->unk64[i][j].unk0 = 0; + a0->unk64[i][j].unk2 = 0; + } + for (i = 0; i < 4; i++) + { + // u8 + a0->unk0[i][j] = 0; + + // u16 + a0->unk14[i][j].unk0 = 0x9B; + a0->unk14[i][j].unk2 = 0x5B; + } + + // u16 + a0->unk12C[j].unk0 = 0; + a0->unk12C[j].unk2 = 0; + } + + // u8 + a0->unk354 = 0; + + // u16 + a0->unk352 = 0; } \ No newline at end of file diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 762019ecd7..8b47386082 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -4,6 +4,7 @@ #include "alloc.h" #include "palette.h" #include "pokenav.h" +#include "menu_unknown.h" #include "scanline_effect.h" #include "text.h" #include "bg.h" @@ -33,7 +34,8 @@ struct UsePokeblockSubStruct struct UsePokeblockStruct { u8 field_0[0x7C58]; - u8 field_7C58[0x378]; + //u8 field_7C58[0x378]; + struct UnknownStruct_81D1ED4 field_7C58; struct UsePokeblockSubStruct info; }; @@ -130,7 +132,7 @@ void sub_8166340(void) LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); - sub_81D2108(gUnknown_0203BCAC->field_7C58); + sub_81D2108(&gUnknown_0203BCAC->field_7C58); ScanlineEffect_InitHBlankDmaTransfer(); } @@ -146,7 +148,7 @@ void sub_8166380(void) { case 0: gUnknown_0203BCAC->field_0[0x7B10] = 0xFF; - sub_81D1ED4(gUnknown_0203BCAC->field_7C58); + sub_81D1ED4(&gUnknown_0203BCAC->field_7C58); gUnknown_0203BC90->field_50++; break; case 1: @@ -202,19 +204,19 @@ void sub_8166380(void) gUnknown_0203BC90->field_50++; break; case 11: - sub_81D2754(gUnknown_0203BCAC->field_7C58, &gUnknown_0203BCAC->field_0[0x7C6C]); - sub_81D20AC(gUnknown_0203BCAC->field_7C58); + sub_81D2754(&gUnknown_0203BCAC->field_7C58, &gUnknown_0203BCAC->field_0[0x7C6C]); + sub_81D20AC(&gUnknown_0203BCAC->field_7C58); gUnknown_0203BC90->field_50++; break; case 12: - if (!sub_81D20BC(gUnknown_0203BCAC->field_7C58)) + if (!sub_81D20BC(&gUnknown_0203BCAC->field_7C58)) { - sub_81D1F84(gUnknown_0203BCAC->field_7C58, &gUnknown_0203BCAC->field_7C58[0x14], &gUnknown_0203BCAC->field_7C58[0x14]); + sub_81D1F84(&gUnknown_0203BCAC->field_7C58, gUnknown_0203BCAC->field_7C58.unk14, gUnknown_0203BCAC->field_7C58.unk14); gUnknown_0203BC90->field_50++; } break; case 13: - sub_81D2230(gUnknown_0203BCAC->field_7C58); + sub_81D2230(&gUnknown_0203BCAC->field_7C58); gUnknown_0203BC90->field_50++; break; case 14: From 4345ba8e6cf145a646666b8d2be1a255873ed29a Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 5 Mar 2019 22:32:28 -0500 Subject: [PATCH 186/217] More decompiled and cleanup --- asm/menu_unknown.s | 206 -------------------------------- data/menu_unknown.s | 8 -- include/menu_unknown.h | 4 +- include/pokenav.h | 1 - src/menu_unknown.c | 264 ++++++++++++++++++++++++++++++++++------- sym_ewram.txt | 6 +- 6 files changed, 226 insertions(+), 263 deletions(-) diff --git a/asm/menu_unknown.s b/asm/menu_unknown.s index 6b782f5c46..f534d688e4 100644 --- a/asm/menu_unknown.s +++ b/asm/menu_unknown.s @@ -6,212 +6,6 @@ .text - thumb_func_start sub_81D1F84 -sub_81D1F84: @ 81D1F84 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - mov r8, r0 - str r1, [sp] - mov r9, r2 - movs r7, 0 -_081D1F98: - lsls r4, r7, 2 - ldr r1, [sp] - adds r0, r4, r1 - ldrh r1, [r0] - lsls r5, r1, 8 - mov r2, r9 - adds r0, r4, r2 - ldrh r0, [r0] - subs r0, r1 - lsls r0, 8 - movs r1, 0xA - bl __divsi3 - adds r6, r0, 0 - movs r3, 0 - adds r7, 0x1 - mov r10, r7 - mov r12, r4 -_081D1FBC: - lsls r0, r3, 2 - adds r0, r3 - lsls r0, 2 - add r0, r12 - add r0, r8 - asrs r2, r5, 8 - asrs r1, r5, 7 - movs r7, 0x1 - ands r1, r7 - adds r2, r1 - adds r0, 0x64 - strh r2, [r0] - adds r5, r6 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x8 - bls _081D1FBC - lsls r0, r3, 2 - adds r0, r3 - lsls r0, 2 - adds r0, r4, r0 - add r0, r8 - mov r1, r9 - adds r2, r4, r1 - ldrh r1, [r2] - adds r0, 0x64 - strh r1, [r0] - ldr r7, [sp] - adds r0, r4, r7 - ldrh r1, [r0, 0x2] - lsls r5, r1, 8 - ldrh r0, [r2, 0x2] - subs r0, r1 - lsls r0, 8 - movs r1, 0xA - bl __divsi3 - adds r6, r0, 0 - movs r3, 0 - str r4, [sp, 0x4] - movs r0, 0x1 - mov r12, r0 -_081D2012: - lsls r0, r3, 2 - adds r0, r3 - lsls r0, 2 - ldr r1, [sp, 0x4] - adds r0, r1, r0 - add r0, r8 - asrs r2, r5, 8 - asrs r1, r5, 7 - mov r7, r12 - ands r1, r7 - adds r2, r1 - adds r0, 0x66 - strh r2, [r0] - adds r5, r6 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x8 - bls _081D2012 - lsls r0, r3, 2 - adds r0, r3 - lsls r0, 2 - adds r0, r4, r0 - add r0, r8 - mov r2, r9 - adds r1, r4, r2 - ldrh r1, [r1, 0x2] - adds r0, 0x66 - strh r1, [r0] - mov r7, r10 - lsls r0, r7, 16 - lsrs r7, r0, 16 - cmp r7, 0x4 - bls _081D1F98 - ldr r1, =0x00000352 - add r1, r8 - movs r0, 0 - strh r0, [r1] - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D1F84 - - thumb_func_start sub_81D2074 -sub_81D2074: @ 81D2074 - push {r4,lr} - adds r1, r0, 0 - ldr r0, =0x00000352 - adds r4, r1, r0 - ldrh r0, [r4] - cmp r0, 0x9 - bls _081D208C - movs r0, 0 - b _081D20A6 - .pool -_081D208C: - adds r0, r1, 0 - bl sub_81D2230 - ldrh r1, [r4] - adds r1, 0x1 - strh r1, [r4] - lsls r1, 16 - lsrs r1, 16 - movs r0, 0xA - eors r1, r0 - negs r0, r1 - orrs r0, r1 - lsrs r0, 31 -_081D20A6: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81D2074 - - thumb_func_start sub_81D20AC -sub_81D20AC: @ 81D20AC - ldr r1, =0x00000355 - adds r0, r1 - movs r1, 0 - strb r1, [r0] - bx lr - .pool - thumb_func_end sub_81D20AC - - thumb_func_start sub_81D20BC -sub_81D20BC: @ 81D20BC - push {r4,r5,lr} - sub sp, 0xC - ldr r1, =0x00000355 - adds r4, r0, r1 - ldrb r0, [r4] - cmp r0, 0 - beq _081D20D4 - cmp r0, 0x1 - beq _081D20E2 - b _081D20FA - .pool -_081D20D4: - bl ScanlineEffect_Clear - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - movs r0, 0x1 - b _081D20FC -_081D20E2: - mov r0, sp - ldr r1, =gUnknown_08625404 - ldm r1!, {r2,r3,r5} - stm r0!, {r2,r3,r5} - ldr r0, [sp] - ldr r1, [sp, 0x4] - ldr r2, [sp, 0x8] - bl ScanlineEffect_SetParams - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] -_081D20FA: - movs r0, 0 -_081D20FC: - add sp, 0xC - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D20BC - thumb_func_start sub_81D2108 sub_81D2108: @ 81D2108 push {r4-r7,lr} diff --git a/data/menu_unknown.s b/data/menu_unknown.s index 1ea0786a43..329e000597 100644 --- a/data/menu_unknown.s +++ b/data/menu_unknown.s @@ -3,14 +3,6 @@ .section .rodata -@ ScanlineEffectParams -gUnknown_08625404:: @ 8625404 - .4byte 0x04000040 @ REG_ADDR_WIN0H - .4byte 0xA6600001 @ SCANLINE_EFFECT_DMACNT_32BIT - .byte 1 @ initState - .byte 0 @ unused9 - .byte 0, 0 @ Padding - gUnknown_08625410:: @ 8625410 .byte 4, 5, 6, 7, 8, 9, 9, 0xA, 0xA, 0xB, 0xB, 0xC, 0xC, 0xD, 0xD, 0xD, 0xD, 0xE, 0xE, 0xE, 0xE, 0xF, 0xF, 0xF, 0xF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23 diff --git a/include/menu_unknown.h b/include/menu_unknown.h index 9d398e2b03..744e985ca4 100644 --- a/include/menu_unknown.h +++ b/include/menu_unknown.h @@ -18,7 +18,8 @@ struct UnknownStruct_81D1ED4 u8 unk13C[0x216]; u16 unk352; u8 unk354; - u8 unk355[0x23]; + u8 unk355; + u8 unk356[0x22]; }; bool8 sub_81D1C44(u8 a0); @@ -33,6 +34,7 @@ void sub_81D1ED4(struct UnknownStruct_81D1ED4 *a0); void sub_81D2108(struct UnknownStruct_81D1ED4 *arg0); void sub_81D20AC(struct UnknownStruct_81D1ED4 *arg0); void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0); +bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0); void sub_81D3464(void *arg0); void sub_81D3480(void *arg0, u8 arg1); void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, void *arg1); diff --git a/include/pokenav.h b/include/pokenav.h index 10f0422255..e39373b351 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -2,7 +2,6 @@ #define GUARD_POKENAV_H #include "list_menu.h" -bool8 sub_81D20BC(void *arg0); bool8 sub_81D312C(void *arg0); bool8 sub_81D4A58(struct EventObject*); void MoveRelearnerPrintText(u8 *); diff --git a/src/menu_unknown.c b/src/menu_unknown.c index 303bb7c827..243eb33ffc 100644 --- a/src/menu_unknown.c +++ b/src/menu_unknown.c @@ -9,72 +9,76 @@ #include "string_util.h" #include "window.h" #include "constants/songs.h" +#include "scanline_effect.h" #define WINDOW_UNK_0 0 #define WINDOW_UNK_1 1 #define WINDOW_UNK_2 2 -extern struct ListMenuItem *gUnknown_0203CF4C; -extern u8 gUnknown_0203CF48[3]; +EWRAM_DATA static u8 sUnknown_0203CF48[3] = {0}; +EWRAM_DATA static struct ListMenuItem *sUnknown_0203CF4C = NULL; void sub_81D1E7C(s32 itemIndex, bool8 onInit, struct ListMenu *list); -const struct WindowTemplate gUnknown_086253E8[] = +static const struct WindowTemplate sUnknown_086253E8[] = { [WINDOW_UNK_0] = { - //0x08010100, .bg = 0, .tilemapLeft = 1, .tilemapTop = 1, .width = 8, - //0x00080F02, .height = 2, .paletteNum = 0xF, .baseBlock = 0x8 }, [WINDOW_UNK_1] = { - //0x08 01 15 00, .bg = 0, .tilemapLeft = 21, .tilemapTop = 1, .width = 8, - //0x0018 0F 12, .height = 18, .paletteNum = 0xF, .baseBlock = 0x18 }, [WINDOW_UNK_2] = { - //0x0B 01 01 00 .bg = 0, .tilemapLeft = 1, .tilemapTop = 1, .width = 11, - //0x0018 0F 08 .height = 8, .paletteNum = 0xF, .baseBlock = 0x18 } }; -const u8 gUnknown_08625400[] = { +static const u8 sUnknown_08625400[] = +{ 1, 2, 3 }; static const u8 sEmptyItemName[] = _(""); +static const struct ScanlineEffectParams sUnknown_08625404 = +{ + .dmaDest = (void*)REG_ADDR_WIN0H, + .dmaControl = SCANLINE_EFFECT_DMACNT_32BIT, + .initState = 1, + .unused9 = 0 +}; + bool8 sub_81D1C44(u8 count) { u32 i; struct ListMenuItem **v1; - v1 = &gUnknown_0203CF4C; + v1 = &sUnknown_0203CF4C; *v1 = Alloc(count * sizeof(struct ListMenuItem) + sizeof(struct ListMenuItem)); - if (gUnknown_0203CF4C == NULL) + if (sUnknown_0203CF4C == NULL) return FALSE; - for (i = 0; i < ARRAY_COUNT(gUnknown_0203CF48); i = (u8)(i + 1)) + for (i = 0; i < ARRAY_COUNT(sUnknown_0203CF48); i = (u8)(i + 1)) { - gUnknown_0203CF48[i] |= 0xFF; + sUnknown_0203CF48[i] |= 0xFF; } return TRUE; @@ -84,7 +88,7 @@ u8 sub_81D1C84(u8 a0) { struct WindowTemplate template; - u8 windowId = gUnknown_0203CF48[a0]; + u8 windowId = sUnknown_0203CF48[a0]; if (windowId == 0xFF) { if (a0 == WINDOW_UNK_2) @@ -93,31 +97,31 @@ u8 sub_81D1C84(u8 a0) u32 v2; s32 v3; - template = gUnknown_086253E8[WINDOW_UNK_2]; + template = sUnknown_086253E8[WINDOW_UNK_2]; v3 = GetMaxWidthInMenuTable(&gMailboxMailOptions[0], 4); template.width = v3; - gUnknown_0203CF48[WINDOW_UNK_2] = AddWindow(&template); + sUnknown_0203CF48[WINDOW_UNK_2] = AddWindow(&template); } else { - gUnknown_0203CF48[a0] = AddWindow(&gUnknown_086253E8[a0]); + sUnknown_0203CF48[a0] = AddWindow(&sUnknown_086253E8[a0]); } - SetStandardWindowBorderStyle(gUnknown_0203CF48[a0], 0); + SetStandardWindowBorderStyle(sUnknown_0203CF48[a0], 0); } - return gUnknown_0203CF48[a0]; + return sUnknown_0203CF48[a0]; } void sub_81D1D04(u8 a0) { - sub_8198070(gUnknown_0203CF48[a0], 0); - ClearWindowTilemap(gUnknown_0203CF48[a0]); - RemoveWindow(gUnknown_0203CF48[a0]); - gUnknown_0203CF48[a0] = 0xFF; + sub_8198070(sUnknown_0203CF48[a0], 0); + ClearWindowTilemap(sUnknown_0203CF48[a0]); + RemoveWindow(sUnknown_0203CF48[a0]); + sUnknown_0203CF48[a0] = 0xFF; } u8 sub_81D1D34(u8 a0) { - return gUnknown_0203CF48[a0]; + return sUnknown_0203CF48[a0]; } void sub_81D1D44(u8 windowId, s32 itemId, u8 y) @@ -133,7 +137,7 @@ void sub_81D1D44(u8 windowId, s32 itemId, u8 y) length = StringLength(buffer); if (length <= 5) ConvertInternationalString(buffer, LANGUAGE_JAPANESE); - AddTextPrinterParameterized4(windowId, 1, 8, y, 0, 0, gUnknown_08625400, -1, buffer); + AddTextPrinterParameterized4(windowId, 1, 8, y, 0, 0, sUnknown_08625400, -1, buffer); } u8 sub_81D1DC0(struct PlayerPCItemPageStruct *page) @@ -141,16 +145,16 @@ u8 sub_81D1DC0(struct PlayerPCItemPageStruct *page) u16 i; for (i = 0; i < page->count; i++) { - gUnknown_0203CF4C[i].name = sEmptyItemName; - gUnknown_0203CF4C[i].id = i; + sUnknown_0203CF4C[i].name = sEmptyItemName; + sUnknown_0203CF4C[i].id = i; } - gUnknown_0203CF4C[i].name = gText_Cancel2; - gUnknown_0203CF4C[i].id = LIST_CANCEL; + sUnknown_0203CF4C[i].name = gText_Cancel2; + sUnknown_0203CF4C[i].id = LIST_CANCEL; - gMultiuseListMenuTemplate.items = gUnknown_0203CF4C; + gMultiuseListMenuTemplate.items = sUnknown_0203CF4C; gMultiuseListMenuTemplate.totalItems = page->count + 1; - gMultiuseListMenuTemplate.windowId = gUnknown_0203CF48[1]; + gMultiuseListMenuTemplate.windowId = sUnknown_0203CF48[1]; gMultiuseListMenuTemplate.header_X = 0; gMultiuseListMenuTemplate.item_X = 8; gMultiuseListMenuTemplate.cursor_X = 0; @@ -182,40 +186,216 @@ void sub_81D1E90(struct PlayerPCItemPageStruct *page) void sub_81D1EC0(void) { - Free(gUnknown_0203CF4C); + Free(sUnknown_0203CF4C); } void sub_81D1ED4(struct UnknownStruct_81D1ED4 *a0) { u8 j; u8 i; - u8 v1; for (j = 0; j < 5; j++) { for (i = 0; i < 10; i++) { - // u16 a0->unk64[i][j].unk0 = 0; a0->unk64[i][j].unk2 = 0; } for (i = 0; i < 4; i++) { - // u8 a0->unk0[i][j] = 0; - - // u16 a0->unk14[i][j].unk0 = 0x9B; a0->unk14[i][j].unk2 = 0x5B; } - // u16 a0->unk12C[j].unk0 = 0; a0->unk12C[j].unk2 = 0; } - // u8 a0->unk354 = 0; - - // u16 a0->unk352 = 0; +} + +NAKED +void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]) +{ + /* + u16 j; + u16 i; + s16 v1; + s16 v2; + for (j = 0; j < 5; j++) + { + v1 = arg1[0][j].unk0; + v2 = (arg2[0][j].unk0 - v1) / 10; + + for (i = 0; i < 9; i++) + { + arg0->unk64[i][j].unk0 = v1 + ((v1 << 1) & 1); + } + + for (i = 0; i < 9; i++) + { + + } + } + */ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x8\n\ + mov r8, r0\n\ + str r1, [sp]\n\ + mov r9, r2\n\ + movs r7, 0\n\ +_081D1F98:\n\ + lsls r4, r7, 2\n\ + ldr r1, [sp]\n\ + adds r0, r4, r1\n\ + ldrh r1, [r0]\n\ + lsls r5, r1, 8\n\ + mov r2, r9\n\ + adds r0, r4, r2\n\ + ldrh r0, [r0]\n\ + subs r0, r1\n\ + lsls r0, 8\n\ + movs r1, 0xA\n\ + bl __divsi3\n\ + adds r6, r0, 0\n\ + movs r3, 0\n\ + adds r7, 0x1\n\ + mov r10, r7\n\ + mov r12, r4\n\ +_081D1FBC:\n\ + lsls r0, r3, 2\n\ + adds r0, r3\n\ + lsls r0, 2\n\ + add r0, r12\n\ + add r0, r8\n\ + asrs r2, r5, 8\n\ + asrs r1, r5, 7\n\ + movs r7, 0x1\n\ + ands r1, r7\n\ + adds r2, r1\n\ + adds r0, 0x64\n\ + strh r2, [r0]\n\ + adds r5, r6\n\ + adds r0, r3, 0x1\n\ + lsls r0, 16\n\ + lsrs r3, r0, 16\n\ + cmp r3, 0x8\n\ + bls _081D1FBC\n\ + lsls r0, r3, 2\n\ + adds r0, r3\n\ + lsls r0, 2\n\ + adds r0, r4, r0\n\ + add r0, r8\n\ + mov r1, r9\n\ + adds r2, r4, r1\n\ + ldrh r1, [r2]\n\ + adds r0, 0x64\n\ + strh r1, [r0]\n\ + ldr r7, [sp]\n\ + adds r0, r4, r7\n\ + ldrh r1, [r0, 0x2]\n\ + lsls r5, r1, 8\n\ + ldrh r0, [r2, 0x2]\n\ + subs r0, r1\n\ + lsls r0, 8\n\ + movs r1, 0xA\n\ + bl __divsi3\n\ + adds r6, r0, 0\n\ + movs r3, 0\n\ + str r4, [sp, 0x4]\n\ + movs r0, 0x1\n\ + mov r12, r0\n\ +_081D2012:\n\ + lsls r0, r3, 2\n\ + adds r0, r3\n\ + lsls r0, 2\n\ + ldr r1, [sp, 0x4]\n\ + adds r0, r1, r0\n\ + add r0, r8\n\ + asrs r2, r5, 8\n\ + asrs r1, r5, 7\n\ + mov r7, r12\n\ + ands r1, r7\n\ + adds r2, r1\n\ + adds r0, 0x66\n\ + strh r2, [r0]\n\ + adds r5, r6\n\ + adds r0, r3, 0x1\n\ + lsls r0, 16\n\ + lsrs r3, r0, 16\n\ + cmp r3, 0x8\n\ + bls _081D2012\n\ + lsls r0, r3, 2\n\ + adds r0, r3\n\ + lsls r0, 2\n\ + adds r0, r4, r0\n\ + add r0, r8\n\ + mov r2, r9\n\ + adds r1, r4, r2\n\ + ldrh r1, [r1, 0x2]\n\ + adds r0, 0x66\n\ + strh r1, [r0]\n\ + mov r7, r10\n\ + lsls r0, r7, 16\n\ + lsrs r7, r0, 16\n\ + cmp r7, 0x4\n\ + bls _081D1F98\n\ + ldr r1, =0x00000352\n\ + add r1, r8\n\ + movs r0, 0\n\ + strh r0, [r1]\n\ + add sp, 0x8\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ + .syntax divided"); +} + +bool32 sub_81D2074(struct UnknownStruct_81D1ED4 *a0) +{ + if (a0->unk352 < 10) + { + sub_81D2230(a0); + return ++a0->unk352 != 10; + } + else + { + return FALSE; + } + +} + +void sub_81D20AC(struct UnknownStruct_81D1ED4 *a0) +{ + a0->unk355 = 0; +} + +bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0) +{ + struct ScanlineEffectParams params; + switch (arg0->unk355) + { + case 0: + ScanlineEffect_Clear(); + arg0->unk355++; + return TRUE; + case 1: + params = sUnknown_08625404; + ScanlineEffect_SetParams(params); + arg0->unk355++; + return FALSE; + default: + return FALSE; + } } \ No newline at end of file diff --git a/sym_ewram.txt b/sym_ewram.txt index 7702739dd9..f6db45f6d9 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -237,11 +237,7 @@ gUnknown_0203CF40: @ 203CF40 gUnknown_0203CF44: @ 203CF44 .space 0x4 -gUnknown_0203CF48: @ 203CF48 - .space 0x4 - -gUnknown_0203CF4C: @ 203CF4C - .space 0x4 + .include "src/menu_unknown.o" gUnknown_0203CF50: @ 203CF50 .space 0x4 From 0da83abad297cdc2d07e89aa30dbf86ab6360ac9 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 6 Mar 2019 22:27:30 -0500 Subject: [PATCH 187/217] Several nonmatching functions Huge and difficult. --- asm/menu_unknown.s | 952 ---------------------------------- data/menu_unknown.s | 4 +- include/menu_unknown.h | 8 +- src/menu_unknown.c | 1103 +++++++++++++++++++++++++++++++++++++++- src/use_pokeblock.c | 3 +- 5 files changed, 1110 insertions(+), 960 deletions(-) diff --git a/asm/menu_unknown.s b/asm/menu_unknown.s index f534d688e4..c0026a7423 100644 --- a/asm/menu_unknown.s +++ b/asm/menu_unknown.s @@ -6,958 +6,6 @@ .text - thumb_func_start sub_81D2108 -sub_81D2108: @ 81D2108 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x10 - adds r6, r0, 0 - movs r1, 0xD5 - lsls r1, 2 - adds r0, r6, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _081D21BE - adds r0, r6, 0 - bl sub_81D24A4 - adds r0, r6, 0 - bl sub_81D2634 - movs r7, 0 - ldr r5, =gScanlineEffectRegBuffers - mov r12, r5 - movs r0, 0xF0 - lsls r0, 3 - add r0, r12 - mov r9, r0 - movs r1, 0xA0 - lsls r1, 1 - adds r1, r6, r1 - str r1, [sp] - ldr r5, =0x0000ffff - mov r8, r5 - movs r0, 0xA1 - lsls r0, 1 - adds r0, r6, r0 - str r0, [sp, 0x4] - movs r1, 0x92 - lsls r1, 2 - adds r1, r6, r1 - str r1, [sp, 0x8] - ldr r5, =0x0000024a - adds r5, r6 - mov r10, r5 -_081D215E: - adds r2, r7, 0 - adds r2, 0x37 - lsls r3, r2, 2 - mov r0, r9 - adds r0, r3, r0 - str r0, [sp, 0xC] - add r3, r12 - lsls r4, r7, 2 - ldr r1, [sp] - adds r0, r1, r4 - ldrh r0, [r0] - lsls r0, 8 - ldr r5, [sp, 0x4] - adds r1, r5, r4 - ldrh r1, [r1] - orrs r0, r1 - strh r0, [r3] - mov r1, r8 - ands r0, r1 - ldr r5, [sp, 0xC] - strh r0, [r5] - lsls r2, 1 - adds r2, 0x1 - lsls r2, 1 - mov r0, r9 - adds r3, r2, r0 - add r2, r12 - ldr r1, [sp, 0x8] - adds r0, r1, r4 - ldrh r0, [r0] - lsls r0, 8 - add r4, r10 - ldrh r1, [r4] - orrs r0, r1 - strh r0, [r2] - mov r5, r8 - ands r0, r5 - strh r0, [r3] - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0x41 - bls _081D215E - movs r0, 0xD5 - lsls r0, 2 - adds r1, r6, r0 - movs r0, 0 - strb r0, [r1] -_081D21BE: - add sp, 0x10 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D2108 - - thumb_func_start sub_81D21DC -sub_81D21DC: @ 81D21DC - push {r4,r5,lr} - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x3 - bls _081D21E8 - movs r1, 0 -_081D21E8: - movs r0, 0x1 - lsls r0, r1 - movs r5, 0x1F - bics r5, r0 - movs r0, 0x40 - movs r1, 0xF0 - bl SetGpuReg - movs r0, 0x42 - movs r1, 0x9B - bl SetGpuReg - ldr r4, =0x00003879 - movs r0, 0x44 - adds r1, r4, 0 - bl SetGpuReg - movs r0, 0x46 - adds r1, r4, 0 - bl SetGpuReg - ldr r1, =0x00003f3f - movs r0, 0x48 - bl SetGpuReg - movs r0, 0x4A - adds r1, r5, 0 - bl SetGpuReg - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D21DC - - thumb_func_start sub_81D2230 -sub_81D2230: @ 81D2230 - push {r4-r7,lr} - mov r12, r0 - movs r4, 0 - movs r7, 0x96 - lsls r7, 1 - add r7, r12 - ldr r6, =0x00000352 - add r6, r12 - mov r5, r12 - adds r5, 0x64 -_081D2244: - lsls r2, r4, 2 - adds r3, r7, r2 - ldrh r1, [r6] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r2, r0 - adds r2, r5, r2 - ldr r0, [r2] - str r0, [r3] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x4 - bls _081D2244 - movs r1, 0xD5 - lsls r1, 2 - add r1, r12 - movs r0, 0x1 - strb r0, [r1] - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D2230 - - thumb_func_start sub_81D2278 -sub_81D2278: @ 81D2278 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x18 - str r0, [sp] - adds r6, r1, 0 - adds r5, r2, 0 - str r3, [sp, 0x4] - ldr r0, [sp, 0x38] - ldr r7, [sp, 0x3C] - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - movs r0, 0 - str r0, [sp, 0xC] - ldrh r0, [r5, 0x2] - ldrh r1, [r3, 0x2] - cmp r0, r1 - bcs _081D22B2 - adds r2, r0, 0 - mov r10, r2 - ldrh r0, [r3, 0x2] - ldrh r1, [r5] - lsls r4, r1, 10 - ldrh r3, [r3] - str r3, [sp, 0x8] - b _081D22C6 -_081D22B2: - ldrh r0, [r5, 0x2] - ldr r1, [sp, 0x4] - ldrh r1, [r1, 0x2] - mov r10, r1 - ldr r2, [sp, 0x4] - ldrh r1, [r2] - lsls r4, r1, 10 - ldrh r3, [r5] - str r3, [sp, 0x8] - mov r2, r10 -_081D22C6: - subs r0, r2 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - cmp r0, 0 - beq _081D22DE - subs r0, r3, r1 - lsls r0, 10 - mov r1, r8 - bl __divsi3 - str r0, [sp, 0xC] -_081D22DE: - mov r0, r8 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - cmp r7, 0 - bne _081D2328 - mov r0, r10 - subs r0, 0x38 - lsls r0, 2 - adds r6, r0 - movs r5, 0 - mov r3, r9 - lsls r3, 1 - mov r12, r3 - ldr r0, [sp, 0x8] - add r0, r9 - str r0, [sp, 0x10] - cmp r7, r8 - bcs _081D23B6 - movs r7, 0x1 -_081D2308: - adds r2, r3, r6 - asrs r1, r4, 10 - asrs r0, r4, 9 - ands r0, r7 - adds r1, r0 - add r1, r9 - strh r1, [r2] - ldr r1, [sp, 0xC] - adds r4, r1 - adds r6, 0x4 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, r8 - bcc _081D2308 - b _081D23B6 -_081D2328: - ldr r2, [sp, 0xC] - cmp r2, 0 - ble _081D23C0 - mov r0, r10 - subs r0, 0x38 - lsls r0, 2 - adds r7, r0 - movs r5, 0 - mov r3, r9 - lsls r3, 1 - mov r12, r3 - ldr r0, [sp, 0x8] - add r0, r9 - str r0, [sp, 0x10] - cmp r5, r8 - bcs _081D237A - ldr r0, =0x00026bff - cmp r4, r0 - bgt _081D237A - mov r1, r12 - str r1, [sp, 0x14] -_081D2352: - ldr r3, [sp, 0x14] - adds r2, r3, r7 - asrs r1, r4, 10 - asrs r0, r4, 9 - movs r3, 0x1 - ands r0, r3 - adds r1, r0 - add r1, r9 - strh r1, [r2] - ldr r0, [sp, 0xC] - adds r4, r0 - adds r7, 0x4 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, r8 - bcs _081D237A - ldr r1, =0x00026bff - cmp r4, r1 - ble _081D2352 -_081D237A: - mov r2, r10 - adds r1, r2, r5 - ldr r3, [sp] - movs r2, 0xD4 - lsls r2, 2 - adds r0, r3, r2 - strh r1, [r0] - ldrh r0, [r0] - subs r0, 0x38 - lsls r0, 2 - adds r6, r0 - cmp r5, r8 - bcs _081D23B6 - mov r3, r12 - movs r7, 0x1 -_081D2398: - adds r2, r3, r6 - asrs r1, r4, 10 - asrs r0, r4, 9 - ands r0, r7 - adds r1, r0 - add r1, r9 - strh r1, [r2] - ldr r0, [sp, 0xC] - adds r4, r0 - adds r6, 0x4 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, r8 - bcc _081D2398 -_081D23B6: - subs r0, r6, 0x4 - b _081D248C - .pool -_081D23C0: - ldr r1, [sp, 0xC] - cmp r1, 0 - bge _081D2464 - mov r0, r10 - subs r0, 0x38 - lsls r0, 2 - adds r6, r0 - movs r5, 0 - mov r2, r9 - lsls r2, 1 - mov r12, r2 - ldr r3, [sp, 0x8] - add r3, r9 - str r3, [sp, 0x10] - cmp r5, r8 - bcs _081D241E - adds r3, r2, r6 - asrs r1, r4, 10 - asrs r0, r4, 9 - movs r2, 0x1 - ands r0, r2 - adds r1, r0 - add r1, r9 - strh r1, [r3] - b _081D2414 -_081D23F2: - ldr r0, [sp, 0xC] - adds r4, r0 - adds r6, 0x4 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, r8 - bcs _081D241E - mov r1, r12 - adds r3, r1, r6 - asrs r2, r4, 10 - asrs r0, r4, 9 - movs r1, 0x1 - ands r0, r1 - adds r2, r0 - add r2, r9 - strh r2, [r3] -_081D2414: - ldr r0, =0x00026bff - cmp r4, r0 - bgt _081D23F2 - movs r0, 0x9B - strh r0, [r3] -_081D241E: - mov r2, r10 - adds r1, r2, r5 - ldr r3, [sp] - movs r2, 0xD4 - lsls r2, 2 - adds r0, r3, r2 - strh r1, [r0] - ldrh r0, [r0] - subs r0, 0x38 - lsls r0, 2 - adds r7, r0 - cmp r5, r8 - bcs _081D245A - mov r3, r12 - movs r6, 0x1 -_081D243C: - adds r2, r3, r7 - asrs r1, r4, 10 - asrs r0, r4, 9 - ands r0, r6 - adds r1, r0 - add r1, r9 - strh r1, [r2] - ldr r0, [sp, 0xC] - adds r4, r0 - adds r7, 0x4 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, r8 - bcc _081D243C -_081D245A: - subs r0, r7, 0x4 - b _081D248C - .pool -_081D2464: - ldr r1, [sp] - movs r2, 0xD4 - lsls r2, 2 - adds r0, r1, r2 - mov r3, r10 - strh r3, [r0] - mov r0, r10 - subs r0, 0x38 - lsls r0, 2 - adds r6, r0 - adds r7, r0 - ldrh r0, [r5] - adds r0, 0x1 - strh r0, [r6, 0x2] - ldr r1, [sp, 0x4] - ldrh r0, [r1] - strh r0, [r7] - movs r0, 0x9B - strh r0, [r7, 0x2] - b _081D2494 -_081D248C: - add r0, r12 - mov r2, sp - ldrh r2, [r2, 0x10] - strh r2, [r0] -_081D2494: - add sp, 0x18 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81D2278 - - thumb_func_start sub_81D24A4 -sub_81D24A4: @ 81D24A4 - push {r4-r7,lr} - sub sp, 0x8 - adds r4, r0, 0 - movs r0, 0x97 - lsls r0, 1 - adds r2, r4, r0 - movs r3, 0x99 - lsls r3, 1 - adds r1, r4, r3 - ldrh r0, [r2] - ldrh r3, [r1] - cmp r0, r3 - bcs _081D24E0 - adds r7, r0, 0 - movs r0, 0xA0 - lsls r0, 1 - adds r1, r4, r0 - movs r3, 0x96 - lsls r3, 1 - adds r2, r4, r3 - subs r0, 0x10 - adds r3, r4, r0 - movs r0, 0x1 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - adds r0, r4, 0 - bl sub_81D2278 - b _081D2500 -_081D24E0: - ldrh r7, [r1] - movs r2, 0xA0 - lsls r2, 1 - adds r1, r4, r2 - movs r3, 0x98 - lsls r3, 1 - adds r2, r4, r3 - movs r0, 0x96 - lsls r0, 1 - adds r3, r4, r0 - movs r0, 0 - str r0, [sp] - str r0, [sp, 0x4] - adds r0, r4, 0 - bl sub_81D2278 -_081D2500: - movs r1, 0xA0 - lsls r1, 1 - adds r5, r4, r1 - movs r3, 0x98 - lsls r3, 1 - adds r2, r4, r3 - movs r0, 0x9A - lsls r0, 1 - adds r6, r4, r0 - movs r0, 0x1 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - adds r0, r4, 0 - adds r1, r5, 0 - adds r3, r6, 0 - bl sub_81D2278 - movs r2, 0 - movs r1, 0x9B - lsls r1, 1 - adds r0, r4, r1 - movs r3, 0x9D - lsls r3, 1 - adds r1, r4, r3 - ldrh r0, [r0] - ldrh r1, [r1] - cmp r0, r1 - bhi _081D253C - movs r2, 0x1 -_081D253C: - movs r0, 0x9C - lsls r0, 1 - adds r3, r4, r0 - str r2, [sp] - movs r1, 0x92 - lsls r1, 2 - adds r0, r4, r1 - str r0, [sp, 0x4] - adds r0, r4, 0 - adds r1, r5, 0 - adds r2, r6, 0 - bl sub_81D2278 - movs r2, 0x38 - cmp r2, r7 - bcs _081D257E - adds r6, r5, 0 - movs r3, 0 - movs r0, 0xA1 - lsls r0, 1 - adds r5, r4, r0 -_081D2566: - adds r0, r2, 0 - subs r0, 0x38 - lsls r0, 2 - adds r1, r6, r0 - strh r3, [r1] - adds r0, r5, r0 - strh r3, [r0] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, r7 - bcc _081D2566 -_081D257E: - movs r1, 0x97 - lsls r1, 1 - adds r0, r4, r1 - ldrh r2, [r0] - movs r3, 0xD4 - lsls r3, 2 - adds r0, r4, r3 - ldrh r1, [r0] - cmp r2, r1 - bhi _081D25B2 - movs r1, 0xA0 - lsls r1, 1 - adds r3, r4, r1 - movs r5, 0x9B - adds r1, r0, 0 -_081D259C: - adds r0, r2, 0 - subs r0, 0x38 - lsls r0, 2 - adds r0, r3, r0 - strh r5, [r0] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - ldrh r0, [r1] - cmp r2, r0 - bls _081D259C -_081D25B2: - movs r2, 0x9B - lsls r2, 1 - adds r1, r4, r2 - movs r3, 0xD4 - lsls r3, 2 - adds r0, r4, r3 - ldrh r0, [r0] - ldrh r1, [r1] - cmp r0, r1 - bcs _081D25C8 - adds r0, r1, 0 -_081D25C8: - adds r0, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x79 - bhi _081D25F8 - movs r0, 0xA0 - lsls r0, 1 - adds r6, r4, r0 - movs r3, 0 - movs r1, 0xA1 - lsls r1, 1 - adds r5, r4, r1 -_081D25E0: - adds r0, r2, 0 - subs r0, 0x38 - lsls r0, 2 - adds r1, r6, r0 - strh r3, [r1] - adds r0, r5, r0 - strh r3, [r0] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x79 - bls _081D25E0 -_081D25F8: - movs r2, 0x38 - movs r3, 0xA0 - lsls r3, 1 - adds r5, r4, r3 - movs r0, 0xA1 - lsls r0, 1 - adds r4, r0 - movs r6, 0x9B -_081D2608: - adds r0, r2, 0 - subs r0, 0x38 - lsls r1, r0, 2 - adds r3, r5, r1 - ldrh r0, [r3] - cmp r0, 0 - bne _081D2620 - adds r0, r4, r1 - ldrh r0, [r0] - cmp r0, 0 - beq _081D2620 - strh r6, [r3] -_081D2620: - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x79 - bls _081D2608 - add sp, 0x8 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81D24A4 - - thumb_func_start sub_81D2634 -sub_81D2634: @ 81D2634 - push {r4-r6,lr} - sub sp, 0x8 - adds r4, r0, 0 - movs r0, 0x97 - lsls r0, 1 - adds r2, r4, r0 - movs r3, 0x9F - lsls r3, 1 - adds r1, r4, r3 - ldrh r0, [r2] - ldrh r5, [r1] - cmp r0, r5 - bcs _081D266E - adds r6, r0, 0 - movs r0, 0x92 - lsls r0, 2 - adds r1, r4, r0 - subs r3, 0x12 - adds r2, r4, r3 - movs r5, 0x9E - lsls r5, 1 - adds r3, r4, r5 - movs r0, 0 - str r0, [sp] - str r0, [sp, 0x4] - adds r0, r4, 0 - bl sub_81D2278 - b _081D2690 -_081D266E: - ldrh r6, [r1] - movs r0, 0x92 - lsls r0, 2 - adds r1, r4, r0 - movs r3, 0x9E - lsls r3, 1 - adds r2, r4, r3 - movs r5, 0x96 - lsls r5, 1 - adds r3, r4, r5 - movs r0, 0x1 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - adds r0, r4, 0 - bl sub_81D2278 -_081D2690: - movs r0, 0x92 - lsls r0, 2 - adds r5, r4, r0 - movs r1, 0x9E - lsls r1, 1 - adds r2, r4, r1 - movs r0, 0x9C - lsls r0, 1 - adds r3, r4, r0 - movs r0, 0 - str r0, [sp] - str r0, [sp, 0x4] - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_81D2278 - cmp r6, 0x38 - ble _081D26C8 - movs r0, 0 - adds r1, r5, 0 - adds r2, r6, 0 - subs r2, 0x38 -_081D26BC: - strh r0, [r1] - strh r0, [r1, 0x2] - adds r1, 0x4 - subs r2, 0x1 - cmp r2, 0 - bne _081D26BC -_081D26C8: - movs r1, 0x97 - lsls r1, 1 - adds r0, r4, r1 - ldrh r2, [r0] - movs r3, 0xD4 - lsls r3, 2 - adds r0, r4, r3 - ldrh r5, [r0] - cmp r2, r5 - bgt _081D26F6 - movs r3, 0x9B - adds r1, r0, 0 - lsls r0, r2, 2 - movs r5, 0xB5 - lsls r5, 1 - adds r0, r5 - adds r0, r4 -_081D26EA: - strh r3, [r0] - adds r0, 0x4 - adds r2, 0x1 - ldrh r5, [r1] - cmp r2, r5 - ble _081D26EA -_081D26F6: - movs r1, 0x9D - lsls r1, 1 - adds r0, r4, r1 - ldrh r0, [r0] - adds r1, r0, 0x1 - movs r2, 0xD4 - lsls r2, 2 - adds r0, r4, r2 - ldrh r0, [r0] - cmp r0, r1 - bge _081D270E - adds r0, r1, 0 -_081D270E: - adds r2, r0, 0 - cmp r2, 0x79 - bgt _081D272C - movs r1, 0 - lsls r0, r2, 2 - movs r3, 0xB4 - lsls r3, 1 - adds r0, r3 - adds r0, r4 -_081D2720: - strh r1, [r0] - strh r1, [r0, 0x2] - adds r0, 0x4 - adds r2, 0x1 - cmp r2, 0x79 - ble _081D2720 -_081D272C: - movs r3, 0 - movs r5, 0x92 - lsls r5, 2 - adds r1, r4, r5 - movs r2, 0x41 -_081D2736: - ldrh r0, [r1] - ldrh r4, [r1, 0x2] - cmp r0, r4 - bcc _081D2742 - strh r3, [r1, 0x2] - strh r3, [r1] -_081D2742: - adds r1, 0x4 - subs r2, 0x1 - cmp r2, 0 - bge _081D2736 - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_81D2634 - - thumb_func_start sub_81D2754 -sub_81D2754: @ 81D2754 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - adds r6, r0, 0 - mov r8, r1 - ldr r1, =gUnknown_08625410 - ldrb r0, [r6] - adds r0, r1 - ldrb r2, [r0] - adds r6, 0x1 - movs r0, 0x9B - mov r3, r8 - strh r0, [r3] - movs r0, 0x5B - subs r0, r2 - strh r0, [r3, 0x2] - movs r7, 0x40 - movs r0, 0 - mov r12, r0 - movs r2, 0x1 - mov r9, r2 - ldr r3, =gSineTable - mov r10, r3 -_081D2786: - adds r0, r7, 0 - adds r0, 0x33 - lsls r0, 24 - lsrs r7, r0, 24 - mov r1, r12 - lsls r0, r1, 24 - movs r2, 0xFF - lsls r2, 24 - adds r0, r2 - lsrs r3, r0, 24 - mov r12, r3 - cmp r0, 0 - bge _081D27A4 - movs r0, 0x4 - mov r12, r0 -_081D27A4: - mov r1, r12 - lsls r0, r1, 24 - asrs r4, r0, 24 - cmp r4, 0x2 - bne _081D27B4 - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 -_081D27B4: - ldrb r0, [r6] - ldr r2, =gUnknown_08625410 - adds r0, r2 - ldrb r2, [r0] - adds r6, 0x1 - lsls r0, r4, 2 - mov r1, r8 - adds r3, r0, r1 - adds r0, r7, 0 - adds r0, 0x40 - lsls r0, 1 - add r0, r10 - movs r1, 0 - ldrsh r0, [r0, r1] - muls r0, r2 - asrs r5, r0, 8 - adds r0, r5, 0 - adds r0, 0x9B - strh r0, [r3] - lsls r0, r7, 1 - add r0, r10 - movs r1, 0 - ldrsh r0, [r0, r1] - adds r1, r2, 0 - muls r1, r0 - asrs r1, 8 - movs r0, 0x5B - subs r0, r1 - strh r0, [r3, 0x2] - cmp r4, 0x2 - bgt _081D2800 - cmp r2, 0x20 - bne _081D27FA - cmp r4, 0x2 - beq _081D2800 -_081D27FA: - adds r0, r5, 0 - adds r0, 0x9C - strh r0, [r3] -_081D2800: - mov r0, r9 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 - cmp r0, 0x4 - bls _081D2786 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D2754 - thumb_func_start InitMoveRelearnerWindows InitMoveRelearnerWindows: @ 81D2824 push {r4,r5,lr} diff --git a/data/menu_unknown.s b/data/menu_unknown.s index 329e000597..fc8bf47b9c 100644 --- a/data/menu_unknown.s +++ b/data/menu_unknown.s @@ -3,8 +3,8 @@ .section .rodata -gUnknown_08625410:: @ 8625410 - .byte 4, 5, 6, 7, 8, 9, 9, 0xA, 0xA, 0xB, 0xB, 0xC, 0xC, 0xD, 0xD, 0xD, 0xD, 0xE, 0xE, 0xE, 0xE, 0xF, 0xF, 0xF, 0xF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23 +@gUnknown_08625410:: @ 8625410 +@ .byte 4, 5, 6, 7, 8, 9, 9, 0xA, 0xA, 0xB, 0xB, 0xC, 0xC, 0xD, 0xD, 0xD, 0xD, 0xE, 0xE, 0xE, 0xE, 0xF, 0xF, 0xF, 0xF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23 gMoveRelearnerWindowTemplates:: @ 8625510s window_template 1, 1, 1, 16, 12, 0xF, 0x000A diff --git a/include/menu_unknown.h b/include/menu_unknown.h index 744e985ca4..d63abdc0b9 100644 --- a/include/menu_unknown.h +++ b/include/menu_unknown.h @@ -14,8 +14,10 @@ struct UnknownStruct_81D1ED4 u8 unk0[4][5]; struct UnknownSubStruct_81D1ED4 unk14[4][5]; struct UnknownSubStruct_81D1ED4 unk64[10][5]; - struct UnknownSubStruct_81D1ED4 unk12C[4]; - u8 unk13C[0x216]; + struct UnknownSubStruct_81D1ED4 unk12C[5]; + struct UnknownSubStruct_81D1ED4 unk13C[0x42]; + struct UnknownSubStruct_81D1ED4 unk248[0x42]; + u16 unk350; u16 unk352; u8 unk354; u8 unk355; @@ -37,7 +39,7 @@ void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0); bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0); void sub_81D3464(void *arg0); void sub_81D3480(void *arg0, u8 arg1); -void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, void *arg1); +void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]); #endif // GUARD_MENU_UNKNOWN_H \ No newline at end of file diff --git a/src/menu_unknown.c b/src/menu_unknown.c index 243eb33ffc..dc8351d924 100644 --- a/src/menu_unknown.c +++ b/src/menu_unknown.c @@ -1,15 +1,18 @@ #include "global.h" #include "alloc.h" +#include "gpu_regs.h" #include "international_string_util.h" #include "menu.h" #include "menu_unknown.h" #include "player_pc.h" +#include "scanline_effect.h" #include "sound.h" #include "strings.h" #include "string_util.h" +#include "trig.h" #include "window.h" #include "constants/songs.h" -#include "scanline_effect.h" +#include "gba/io_reg.h" #define WINDOW_UNK_0 0 #define WINDOW_UNK_1 1 @@ -19,6 +22,8 @@ EWRAM_DATA static u8 sUnknown_0203CF48[3] = {0}; EWRAM_DATA static struct ListMenuItem *sUnknown_0203CF4C = NULL; void sub_81D1E7C(s32 itemIndex, bool8 onInit, struct ListMenu *list); +void sub_81D24A4(struct UnknownStruct_81D1ED4 *a0); +void sub_81D2634(struct UnknownStruct_81D1ED4 *a0); static const struct WindowTemplate sUnknown_086253E8[] = { @@ -66,6 +71,44 @@ static const struct ScanlineEffectParams sUnknown_08625404 = .unused9 = 0 }; + +const u8 gUnknown_08625410[] = +{ + 4, + 5, + 6, + 7, + 8, + 9, 9, + 10, 10, + 0xB, 0xB, + 0xC, 0xC, + 0xD, 0xD, + 0xD, 0xD, + 0xE, 0xE, 0xE, 0xE, + 0xF, 0xF, 0xF, 0xF, + 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, + 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, + 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, + 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, + 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, + 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, + 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, + 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, + 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, + 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, + 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, + 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, + 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, + 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, + 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, + 0x23 +}; + bool8 sub_81D1C44(u8 count) { u32 i; @@ -398,4 +441,1062 @@ bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0) default: return FALSE; } +} + +NAKED +void sub_81D2108(struct UnknownStruct_81D1ED4 *arg0) +{ + // Three of the additions are in the wrong order. +#ifdef NONMATCHING + u16 i; + u32 v3; + u32 v4; + u16 *scanBuffer1; + u16 *scanBuffer2; + u32 scanBufferWidth; + u32 mask; + u16 *unkBuff1; + u16 *unkBuff2; + u16 *unkBuff3; + u16 *unkBuff4; + + if (arg0->unk354 == 0) + return; + + sub_81D24A4(arg0); + sub_81D2634(arg0); + + i = 0; + scanBuffer1 = gScanlineEffectRegBuffers[0]; + scanBufferWidth = ARRAY_COUNT(gScanlineEffectRegBuffers[0]); + scanBuffer2 = scanBuffer1 + scanBufferWidth; + + // This function accesses the arrays "manually", where every other entry + // is just handled differently, rather than a pairwise struct. + unkBuff1 = (u16*)&arg0->unk13C[0].unk0; + mask = 0xFFFF; + unkBuff2 = (u16*)&arg0->unk13C[0].unk2; + unkBuff3 = (u16*)&arg0->unk248[0].unk0; + unkBuff4 = (u16*)&arg0->unk248[0].unk2; + + for (; i < 0x42; i++) + { + u32 offset1; + register u32 offset2 asm("r2"); + u32 offset3; + + offset1 = (i + 0x37) * 2; + offset2 = i + 0x37; + scanBuffer2[offset1] = (scanBuffer1[offset1] = (unkBuff1[i * 2] << 8) | unkBuff2[i * 2]) & mask; + + offset3 = offset2 * 2 + 1; + scanBuffer2[offset3] = (scanBuffer1[offset3] = (unkBuff3[i * 2] << 8) | unkBuff4[i * 2]) & mask; + } + + arg0->unk354 = 0; +#else + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x10\n\ + adds r6, r0, 0\n\ + movs r1, 0xD5\n\ + lsls r1, 2\n\ + adds r0, r6, r1\n\ + ldrb r0, [r0]\n\ + cmp r0, 0\n\ + beq _081D21BE\n\ + adds r0, r6, 0\n\ + bl sub_81D24A4\n\ + adds r0, r6, 0\n\ + bl sub_81D2634\n\ + movs r7, 0\n\ + ldr r5, =gScanlineEffectRegBuffers\n\ + mov r12, r5\n\ + movs r0, 0xF0\n\ + lsls r0, 3\n\ + add r0, r12\n\ + mov r9, r0\n\ + movs r1, 0xA0\n\ + lsls r1, 1\n\ + adds r1, r6, r1\n\ + str r1, [sp]\n\ + ldr r5, =0x0000ffff\n\ + mov r8, r5\n\ + movs r0, 0xA1\n\ + lsls r0, 1\n\ + adds r0, r6, r0\n\ + str r0, [sp, 0x4]\n\ + movs r1, 0x92\n\ + lsls r1, 2\n\ + adds r1, r6, r1\n\ + str r1, [sp, 0x8]\n\ + ldr r5, =0x0000024a\n\ + adds r5, r6\n\ + mov r10, r5\n\ +_081D215E:\n\ + adds r2, r7, 0\n\ + adds r2, 0x37\n\ + lsls r3, r2, 2\n\ + mov r0, r9\n\ + adds r0, r3, r0\n\ + str r0, [sp, 0xC]\n\ + add r3, r12\n\ + lsls r4, r7, 2\n\ + ldr r1, [sp]\n\ + adds r0, r1, r4\n\ + ldrh r0, [r0]\n\ + lsls r0, 8\n\ + ldr r5, [sp, 0x4]\n\ + adds r1, r5, r4\n\ + ldrh r1, [r1]\n\ + orrs r0, r1\n\ + strh r0, [r3]\n\ + mov r1, r8\n\ + ands r0, r1\n\ + ldr r5, [sp, 0xC]\n\ + strh r0, [r5]\n\ + lsls r2, 1\n\ + adds r2, 0x1\n\ + lsls r2, 1\n\ + mov r0, r9\n\ + adds r3, r2, r0\n\ + add r2, r12\n\ + ldr r1, [sp, 0x8]\n\ + adds r0, r1, r4\n\ + ldrh r0, [r0]\n\ + lsls r0, 8\n\ + add r4, r10\n\ + ldrh r1, [r4]\n\ + orrs r0, r1\n\ + strh r0, [r2]\n\ + mov r5, r8\n\ + ands r0, r5\n\ + strh r0, [r3]\n\ + adds r0, r7, 0x1\n\ + lsls r0, 16\n\ + lsrs r7, r0, 16\n\ + cmp r7, 0x41\n\ + bls _081D215E\n\ + movs r0, 0xD5\n\ + lsls r0, 2\n\ + adds r1, r6, r0\n\ + movs r0, 0\n\ + strb r0, [r1]\n\ +_081D21BE:\n\ + add sp, 0x10\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ + .syntax divided"); +#endif +} + +void sub_81D21DC(u8 bg) +{ + u8 flags; + + if (bg > 3) + bg = 0; + + // Unset the WINOUT flag for the bg. + flags = (WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ) & ~(1 << bg); + + SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0, 0xF0)); + SetGpuReg(REG_OFFSET_WIN1H, WIN_RANGE(0, 0x9B)); + SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(0x38, 0x79)); + SetGpuReg(REG_OFFSET_WIN1V, WIN_RANGE(0x38, 0x79)); + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR); + SetGpuReg(REG_OFFSET_WINOUT, flags); +} + +void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0) +{ + u16 i; + for (i = 0; i < 5; i++) + { + arg0->unk12C[i] = arg0->unk64[arg0->unk352][i]; + } + arg0->unk354 = 1; +} + +NAKED +void sub_81D2278(void *a0, void *a1, u16 *a2, u16 *a3, u8 a38, u32 a3C) +{ +#ifdef NONMATCHING + // a0 => sp0 + // a1 => r6 + // a2 => r5 + // a3 => sp4 + // a38 => r9 + // a3C => r7 + u32 v1; // r10 + u32 v2; // sp8 + u32 v3; // spC + u32 v4; + u32 v5; + u16 v6; // r8 + u32 v7; + u32 v8; // sp10 + + v3 = 0; + + // v4 => r4 + // v5 => r0 + // v7 => r1 + if (a2[1] < a3[1]) + { + v1 = a2[1]; + v5 = a3[1]; + v7 = a2[0]; + v4 = v7 << 10; + v2 = a3[0]; + } + else + { + v5 = a2[1]; + v1 = a3[1]; + v7 = a3[0]; + v4 = v7 << 10; + v2 = a2[0]; + } + + v6 = v5 - v1; + if (v6 != 0) + { + v3 = (v2 - v7) / v6; + } + v6++; + + if (a3C == 0) + { + v8 = + } +#else + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x18\n\ + str r0, [sp]\n\ + adds r6, r1, 0\n\ + adds r5, r2, 0\n\ + str r3, [sp, 0x4]\n\ + ldr r0, [sp, 0x38]\n\ + ldr r7, [sp, 0x3C]\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r9, r0\n\ + movs r0, 0\n\ + str r0, [sp, 0xC]\n\ + ldrh r0, [r5, 0x2]\n\ + ldrh r1, [r3, 0x2]\n\ + cmp r0, r1\n\ + bcs _081D22B2\n\ + adds r2, r0, 0\n\ + mov r10, r2\n\ + ldrh r0, [r3, 0x2]\n\ + ldrh r1, [r5]\n\ + lsls r4, r1, 10\n\ + ldrh r3, [r3]\n\ + str r3, [sp, 0x8]\n\ + b _081D22C6\n\ +_081D22B2:\n\ + ldrh r0, [r5, 0x2]\n\ + ldr r1, [sp, 0x4]\n\ + ldrh r1, [r1, 0x2]\n\ + mov r10, r1\n\ + ldr r2, [sp, 0x4]\n\ + ldrh r1, [r2]\n\ + lsls r4, r1, 10\n\ + ldrh r3, [r5]\n\ + str r3, [sp, 0x8]\n\ + mov r2, r10\n\ +_081D22C6:\n\ + subs r0, r2\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + mov r8, r0\n\ + cmp r0, 0\n\ + beq _081D22DE\n\ + subs r0, r3, r1\n\ + lsls r0, 10\n\ + mov r1, r8\n\ + bl __divsi3\n\ + str r0, [sp, 0xC]\n\ +_081D22DE:\n\ + mov r0, r8\n\ + adds r0, 0x1\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + mov r8, r0\n\ + cmp r7, 0\n\ + bne _081D2328\n\ + mov r0, r10\n\ + subs r0, 0x38\n\ + lsls r0, 2\n\ + adds r6, r0\n\ + movs r5, 0\n\ + mov r3, r9\n\ + lsls r3, 1\n\ + mov r12, r3\n\ + ldr r0, [sp, 0x8]\n\ + add r0, r9\n\ + str r0, [sp, 0x10]\n\ + cmp r7, r8\n\ + bcs _081D23B6\n\ + movs r7, 0x1\n\ +_081D2308:\n\ + adds r2, r3, r6\n\ + asrs r1, r4, 10\n\ + asrs r0, r4, 9\n\ + ands r0, r7\n\ + adds r1, r0\n\ + add r1, r9\n\ + strh r1, [r2]\n\ + ldr r1, [sp, 0xC]\n\ + adds r4, r1\n\ + adds r6, 0x4\n\ + adds r0, r5, 0x1\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ + cmp r5, r8\n\ + bcc _081D2308\n\ + b _081D23B6\n\ +_081D2328:\n\ + ldr r2, [sp, 0xC]\n\ + cmp r2, 0\n\ + ble _081D23C0\n\ + mov r0, r10\n\ + subs r0, 0x38\n\ + lsls r0, 2\n\ + adds r7, r0\n\ + movs r5, 0\n\ + mov r3, r9\n\ + lsls r3, 1\n\ + mov r12, r3\n\ + ldr r0, [sp, 0x8]\n\ + add r0, r9\n\ + str r0, [sp, 0x10]\n\ + cmp r5, r8\n\ + bcs _081D237A\n\ + ldr r0, =0x00026bff\n\ + cmp r4, r0\n\ + bgt _081D237A\n\ + mov r1, r12\n\ + str r1, [sp, 0x14]\n\ +_081D2352:\n\ + ldr r3, [sp, 0x14]\n\ + adds r2, r3, r7\n\ + asrs r1, r4, 10\n\ + asrs r0, r4, 9\n\ + movs r3, 0x1\n\ + ands r0, r3\n\ + adds r1, r0\n\ + add r1, r9\n\ + strh r1, [r2]\n\ + ldr r0, [sp, 0xC]\n\ + adds r4, r0\n\ + adds r7, 0x4\n\ + adds r0, r5, 0x1\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ + cmp r5, r8\n\ + bcs _081D237A\n\ + ldr r1, =0x00026bff\n\ + cmp r4, r1\n\ + ble _081D2352\n\ +_081D237A:\n\ + mov r2, r10\n\ + adds r1, r2, r5\n\ + ldr r3, [sp]\n\ + movs r2, 0xD4\n\ + lsls r2, 2\n\ + adds r0, r3, r2\n\ + strh r1, [r0]\n\ + ldrh r0, [r0]\n\ + subs r0, 0x38\n\ + lsls r0, 2\n\ + adds r6, r0\n\ + cmp r5, r8\n\ + bcs _081D23B6\n\ + mov r3, r12\n\ + movs r7, 0x1\n\ +_081D2398:\n\ + adds r2, r3, r6\n\ + asrs r1, r4, 10\n\ + asrs r0, r4, 9\n\ + ands r0, r7\n\ + adds r1, r0\n\ + add r1, r9\n\ + strh r1, [r2]\n\ + ldr r0, [sp, 0xC]\n\ + adds r4, r0\n\ + adds r6, 0x4\n\ + adds r0, r5, 0x1\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ + cmp r5, r8\n\ + bcc _081D2398\n\ +_081D23B6:\n\ + subs r0, r6, 0x4\n\ + b _081D248C\n\ + .pool\n\ +_081D23C0:\n\ + ldr r1, [sp, 0xC]\n\ + cmp r1, 0\n\ + bge _081D2464\n\ + mov r0, r10\n\ + subs r0, 0x38\n\ + lsls r0, 2\n\ + adds r6, r0\n\ + movs r5, 0\n\ + mov r2, r9\n\ + lsls r2, 1\n\ + mov r12, r2\n\ + ldr r3, [sp, 0x8]\n\ + add r3, r9\n\ + str r3, [sp, 0x10]\n\ + cmp r5, r8\n\ + bcs _081D241E\n\ + adds r3, r2, r6\n\ + asrs r1, r4, 10\n\ + asrs r0, r4, 9\n\ + movs r2, 0x1\n\ + ands r0, r2\n\ + adds r1, r0\n\ + add r1, r9\n\ + strh r1, [r3]\n\ + b _081D2414\n\ +_081D23F2:\n\ + ldr r0, [sp, 0xC]\n\ + adds r4, r0\n\ + adds r6, 0x4\n\ + adds r0, r5, 0x1\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ + cmp r5, r8\n\ + bcs _081D241E\n\ + mov r1, r12\n\ + adds r3, r1, r6\n\ + asrs r2, r4, 10\n\ + asrs r0, r4, 9\n\ + movs r1, 0x1\n\ + ands r0, r1\n\ + adds r2, r0\n\ + add r2, r9\n\ + strh r2, [r3]\n\ +_081D2414:\n\ + ldr r0, =0x00026bff\n\ + cmp r4, r0\n\ + bgt _081D23F2\n\ + movs r0, 0x9B\n\ + strh r0, [r3]\n\ +_081D241E:\n\ + mov r2, r10\n\ + adds r1, r2, r5\n\ + ldr r3, [sp]\n\ + movs r2, 0xD4\n\ + lsls r2, 2\n\ + adds r0, r3, r2\n\ + strh r1, [r0]\n\ + ldrh r0, [r0]\n\ + subs r0, 0x38\n\ + lsls r0, 2\n\ + adds r7, r0\n\ + cmp r5, r8\n\ + bcs _081D245A\n\ + mov r3, r12\n\ + movs r6, 0x1\n\ +_081D243C:\n\ + adds r2, r3, r7\n\ + asrs r1, r4, 10\n\ + asrs r0, r4, 9\n\ + ands r0, r6\n\ + adds r1, r0\n\ + add r1, r9\n\ + strh r1, [r2]\n\ + ldr r0, [sp, 0xC]\n\ + adds r4, r0\n\ + adds r7, 0x4\n\ + adds r0, r5, 0x1\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ + cmp r5, r8\n\ + bcc _081D243C\n\ +_081D245A:\n\ + subs r0, r7, 0x4\n\ + b _081D248C\n\ + .pool\n\ +_081D2464:\n\ + ldr r1, [sp]\n\ + movs r2, 0xD4\n\ + lsls r2, 2\n\ + adds r0, r1, r2\n\ + mov r3, r10\n\ + strh r3, [r0]\n\ + mov r0, r10\n\ + subs r0, 0x38\n\ + lsls r0, 2\n\ + adds r6, r0\n\ + adds r7, r0\n\ + ldrh r0, [r5]\n\ + adds r0, 0x1\n\ + strh r0, [r6, 0x2]\n\ + ldr r1, [sp, 0x4]\n\ + ldrh r0, [r1]\n\ + strh r0, [r7]\n\ + movs r0, 0x9B\n\ + strh r0, [r7, 0x2]\n\ + b _081D2494\n\ +_081D248C:\n\ + add r0, r12\n\ + mov r2, sp\n\ + ldrh r2, [r2, 0x10]\n\ + strh r2, [r0]\n\ +_081D2494:\n\ + add sp, 0x18\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided"); +#endif +} + +NAKED +void sub_81D24A4(struct UnknownStruct_81D1ED4 *a0) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + sub sp, 0x8\n\ + adds r4, r0, 0\n\ + movs r0, 0x97\n\ + lsls r0, 1\n\ + adds r2, r4, r0\n\ + movs r3, 0x99\n\ + lsls r3, 1\n\ + adds r1, r4, r3\n\ + ldrh r0, [r2]\n\ + ldrh r3, [r1]\n\ + cmp r0, r3\n\ + bcs _081D24E0\n\ + adds r7, r0, 0\n\ + movs r0, 0xA0\n\ + lsls r0, 1\n\ + adds r1, r4, r0\n\ + movs r3, 0x96\n\ + lsls r3, 1\n\ + adds r2, r4, r3\n\ + subs r0, 0x10\n\ + adds r3, r4, r0\n\ + movs r0, 0x1\n\ + str r0, [sp]\n\ + movs r0, 0\n\ + str r0, [sp, 0x4]\n\ + adds r0, r4, 0\n\ + bl sub_81D2278\n\ + b _081D2500\n\ +_081D24E0:\n\ + ldrh r7, [r1]\n\ + movs r2, 0xA0\n\ + lsls r2, 1\n\ + adds r1, r4, r2\n\ + movs r3, 0x98\n\ + lsls r3, 1\n\ + adds r2, r4, r3\n\ + movs r0, 0x96\n\ + lsls r0, 1\n\ + adds r3, r4, r0\n\ + movs r0, 0\n\ + str r0, [sp]\n\ + str r0, [sp, 0x4]\n\ + adds r0, r4, 0\n\ + bl sub_81D2278\n\ +_081D2500:\n\ + movs r1, 0xA0\n\ + lsls r1, 1\n\ + adds r5, r4, r1\n\ + movs r3, 0x98\n\ + lsls r3, 1\n\ + adds r2, r4, r3\n\ + movs r0, 0x9A\n\ + lsls r0, 1\n\ + adds r6, r4, r0\n\ + movs r0, 0x1\n\ + str r0, [sp]\n\ + movs r0, 0\n\ + str r0, [sp, 0x4]\n\ + adds r0, r4, 0\n\ + adds r1, r5, 0\n\ + adds r3, r6, 0\n\ + bl sub_81D2278\n\ + movs r2, 0\n\ + movs r1, 0x9B\n\ + lsls r1, 1\n\ + adds r0, r4, r1\n\ + movs r3, 0x9D\n\ + lsls r3, 1\n\ + adds r1, r4, r3\n\ + ldrh r0, [r0]\n\ + ldrh r1, [r1]\n\ + cmp r0, r1\n\ + bhi _081D253C\n\ + movs r2, 0x1\n\ +_081D253C:\n\ + movs r0, 0x9C\n\ + lsls r0, 1\n\ + adds r3, r4, r0\n\ + str r2, [sp]\n\ + movs r1, 0x92\n\ + lsls r1, 2\n\ + adds r0, r4, r1\n\ + str r0, [sp, 0x4]\n\ + adds r0, r4, 0\n\ + adds r1, r5, 0\n\ + adds r2, r6, 0\n\ + bl sub_81D2278\n\ + movs r2, 0x38\n\ + cmp r2, r7\n\ + bcs _081D257E\n\ + adds r6, r5, 0\n\ + movs r3, 0\n\ + movs r0, 0xA1\n\ + lsls r0, 1\n\ + adds r5, r4, r0\n\ +_081D2566:\n\ + adds r0, r2, 0\n\ + subs r0, 0x38\n\ + lsls r0, 2\n\ + adds r1, r6, r0\n\ + strh r3, [r1]\n\ + adds r0, r5, r0\n\ + strh r3, [r0]\n\ + adds r0, r2, 0x1\n\ + lsls r0, 16\n\ + lsrs r2, r0, 16\n\ + cmp r2, r7\n\ + bcc _081D2566\n\ +_081D257E:\n\ + movs r1, 0x97\n\ + lsls r1, 1\n\ + adds r0, r4, r1\n\ + ldrh r2, [r0]\n\ + movs r3, 0xD4\n\ + lsls r3, 2\n\ + adds r0, r4, r3\n\ + ldrh r1, [r0]\n\ + cmp r2, r1\n\ + bhi _081D25B2\n\ + movs r1, 0xA0\n\ + lsls r1, 1\n\ + adds r3, r4, r1\n\ + movs r5, 0x9B\n\ + adds r1, r0, 0\n\ +_081D259C:\n\ + adds r0, r2, 0\n\ + subs r0, 0x38\n\ + lsls r0, 2\n\ + adds r0, r3, r0\n\ + strh r5, [r0]\n\ + adds r0, r2, 0x1\n\ + lsls r0, 16\n\ + lsrs r2, r0, 16\n\ + ldrh r0, [r1]\n\ + cmp r2, r0\n\ + bls _081D259C\n\ +_081D25B2:\n\ + movs r2, 0x9B\n\ + lsls r2, 1\n\ + adds r1, r4, r2\n\ + movs r3, 0xD4\n\ + lsls r3, 2\n\ + adds r0, r4, r3\n\ + ldrh r0, [r0]\n\ + ldrh r1, [r1]\n\ + cmp r0, r1\n\ + bcs _081D25C8\n\ + adds r0, r1, 0\n\ +_081D25C8:\n\ + adds r0, 0x1\n\ + lsls r0, 16\n\ + lsrs r2, r0, 16\n\ + cmp r2, 0x79\n\ + bhi _081D25F8\n\ + movs r0, 0xA0\n\ + lsls r0, 1\n\ + adds r6, r4, r0\n\ + movs r3, 0\n\ + movs r1, 0xA1\n\ + lsls r1, 1\n\ + adds r5, r4, r1\n\ +_081D25E0:\n\ + adds r0, r2, 0\n\ + subs r0, 0x38\n\ + lsls r0, 2\n\ + adds r1, r6, r0\n\ + strh r3, [r1]\n\ + adds r0, r5, r0\n\ + strh r3, [r0]\n\ + adds r0, r2, 0x1\n\ + lsls r0, 16\n\ + lsrs r2, r0, 16\n\ + cmp r2, 0x79\n\ + bls _081D25E0\n\ +_081D25F8:\n\ + movs r2, 0x38\n\ + movs r3, 0xA0\n\ + lsls r3, 1\n\ + adds r5, r4, r3\n\ + movs r0, 0xA1\n\ + lsls r0, 1\n\ + adds r4, r0\n\ + movs r6, 0x9B\n\ +_081D2608:\n\ + adds r0, r2, 0\n\ + subs r0, 0x38\n\ + lsls r1, r0, 2\n\ + adds r3, r5, r1\n\ + ldrh r0, [r3]\n\ + cmp r0, 0\n\ + bne _081D2620\n\ + adds r0, r4, r1\n\ + ldrh r0, [r0]\n\ + cmp r0, 0\n\ + beq _081D2620\n\ + strh r6, [r3]\n\ +_081D2620:\n\ + adds r0, r2, 0x1\n\ + lsls r0, 16\n\ + lsrs r2, r0, 16\n\ + cmp r2, 0x79\n\ + bls _081D2608\n\ + add sp, 0x8\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided"); +} + +NAKED +void sub_81D2634(struct UnknownStruct_81D1ED4 *a0) +{ + asm(".syntax unified\n\ + push {r4-r6,lr}\n\ + sub sp, 0x8\n\ + adds r4, r0, 0\n\ + movs r0, 0x97\n\ + lsls r0, 1\n\ + adds r2, r4, r0\n\ + movs r3, 0x9F\n\ + lsls r3, 1\n\ + adds r1, r4, r3\n\ + ldrh r0, [r2]\n\ + ldrh r5, [r1]\n\ + cmp r0, r5\n\ + bcs _081D266E\n\ + adds r6, r0, 0\n\ + movs r0, 0x92\n\ + lsls r0, 2\n\ + adds r1, r4, r0\n\ + subs r3, 0x12\n\ + adds r2, r4, r3\n\ + movs r5, 0x9E\n\ + lsls r5, 1\n\ + adds r3, r4, r5\n\ + movs r0, 0\n\ + str r0, [sp]\n\ + str r0, [sp, 0x4]\n\ + adds r0, r4, 0\n\ + bl sub_81D2278\n\ + b _081D2690\n\ +_081D266E:\n\ + ldrh r6, [r1]\n\ + movs r0, 0x92\n\ + lsls r0, 2\n\ + adds r1, r4, r0\n\ + movs r3, 0x9E\n\ + lsls r3, 1\n\ + adds r2, r4, r3\n\ + movs r5, 0x96\n\ + lsls r5, 1\n\ + adds r3, r4, r5\n\ + movs r0, 0x1\n\ + str r0, [sp]\n\ + movs r0, 0\n\ + str r0, [sp, 0x4]\n\ + adds r0, r4, 0\n\ + bl sub_81D2278\n\ +_081D2690:\n\ + movs r0, 0x92\n\ + lsls r0, 2\n\ + adds r5, r4, r0\n\ + movs r1, 0x9E\n\ + lsls r1, 1\n\ + adds r2, r4, r1\n\ + movs r0, 0x9C\n\ + lsls r0, 1\n\ + adds r3, r4, r0\n\ + movs r0, 0\n\ + str r0, [sp]\n\ + str r0, [sp, 0x4]\n\ + adds r0, r4, 0\n\ + adds r1, r5, 0\n\ + bl sub_81D2278\n\ + cmp r6, 0x38\n\ + ble _081D26C8\n\ + movs r0, 0\n\ + adds r1, r5, 0\n\ + adds r2, r6, 0\n\ + subs r2, 0x38\n\ +_081D26BC:\n\ + strh r0, [r1]\n\ + strh r0, [r1, 0x2]\n\ + adds r1, 0x4\n\ + subs r2, 0x1\n\ + cmp r2, 0\n\ + bne _081D26BC\n\ +_081D26C8:\n\ + movs r1, 0x97\n\ + lsls r1, 1\n\ + adds r0, r4, r1\n\ + ldrh r2, [r0]\n\ + movs r3, 0xD4\n\ + lsls r3, 2\n\ + adds r0, r4, r3\n\ + ldrh r5, [r0]\n\ + cmp r2, r5\n\ + bgt _081D26F6\n\ + movs r3, 0x9B\n\ + adds r1, r0, 0\n\ + lsls r0, r2, 2\n\ + movs r5, 0xB5\n\ + lsls r5, 1\n\ + adds r0, r5\n\ + adds r0, r4\n\ +_081D26EA:\n\ + strh r3, [r0]\n\ + adds r0, 0x4\n\ + adds r2, 0x1\n\ + ldrh r5, [r1]\n\ + cmp r2, r5\n\ + ble _081D26EA\n\ +_081D26F6:\n\ + movs r1, 0x9D\n\ + lsls r1, 1\n\ + adds r0, r4, r1\n\ + ldrh r0, [r0]\n\ + adds r1, r0, 0x1\n\ + movs r2, 0xD4\n\ + lsls r2, 2\n\ + adds r0, r4, r2\n\ + ldrh r0, [r0]\n\ + cmp r0, r1\n\ + bge _081D270E\n\ + adds r0, r1, 0\n\ +_081D270E:\n\ + adds r2, r0, 0\n\ + cmp r2, 0x79\n\ + bgt _081D272C\n\ + movs r1, 0\n\ + lsls r0, r2, 2\n\ + movs r3, 0xB4\n\ + lsls r3, 1\n\ + adds r0, r3\n\ + adds r0, r4\n\ +_081D2720:\n\ + strh r1, [r0]\n\ + strh r1, [r0, 0x2]\n\ + adds r0, 0x4\n\ + adds r2, 0x1\n\ + cmp r2, 0x79\n\ + ble _081D2720\n\ +_081D272C:\n\ + movs r3, 0\n\ + movs r5, 0x92\n\ + lsls r5, 2\n\ + adds r1, r4, r5\n\ + movs r2, 0x41\n\ +_081D2736:\n\ + ldrh r0, [r1]\n\ + ldrh r4, [r1, 0x2]\n\ + cmp r0, r4\n\ + bcc _081D2742\n\ + strh r3, [r1, 0x2]\n\ + strh r3, [r1]\n\ +_081D2742:\n\ + adds r1, 0x4\n\ + subs r2, 0x1\n\ + cmp r2, 0\n\ + bge _081D2736\n\ + add sp, 0x8\n\ + pop {r4-r6}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided"); +} + +NAKED +void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1) +{ + // There are some register-renaming issues here. The cause of the problem seems to be that + // GCC tries to save gUnknown_08625410 in a register, instead of loading the constant repeatedly. + // But this is one too many things to keep track of, so GCC is forced to use the stack. +#ifdef NONMATCHING + u8* v1; + u8 v2; + u8 v3; + s8 v4; + u16 v5; + + v1 = arg0->unk0[0]; + v2 = gUnknown_08625410[*v1]; + v1++; + arg1[0].unk0 = 0x9B; + arg1[0].unk2 = 0x5B - v2; + for (v3 = 0x40, v4 = 0, v5 = 1; v5 < 5; v5++) + { + v3 += 0x33; + v4--; + if (v4 < 0) + { + v4 = 4; + } + if (v4 == 2) + { + v3++; + } + + v2 = gUnknown_08625410[*v1]; + v1++; + arg1[v4].unk0 = ((gSineTable[v3 + 0x40] * v2) >> 8) + 0x9B; + arg1[v4].unk2 = ((gSineTable[v3] * v2) >> 8) - 0x5B; + if (v4 <= 2 && (v2 != 0x20 || v4 != 2)) + { + arg1[v4].unk0 = arg1[v4].unk0 + 1; + } + } +#else + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + adds r6, r0, 0\n\ + mov r8, r1\n\ + ldr r1, =gUnknown_08625410\n\ + ldrb r0, [r6]\n\ + adds r0, r1\n\ + ldrb r2, [r0]\n\ + adds r6, 0x1\n\ + movs r0, 0x9B\n\ + mov r3, r8\n\ + strh r0, [r3]\n\ + movs r0, 0x5B\n\ + subs r0, r2\n\ + strh r0, [r3, 0x2]\n\ + movs r7, 0x40\n\ + movs r0, 0\n\ + mov r12, r0\n\ + movs r2, 0x1\n\ + mov r9, r2\n\ + ldr r3, =gSineTable\n\ + mov r10, r3\n\ +_081D2786:\n\ + adds r0, r7, 0\n\ + adds r0, 0x33\n\ + lsls r0, 24\n\ + lsrs r7, r0, 24\n\ + mov r1, r12\n\ + lsls r0, r1, 24\n\ + movs r2, 0xFF\n\ + lsls r2, 24\n\ + adds r0, r2\n\ + lsrs r3, r0, 24\n\ + mov r12, r3\n\ + cmp r0, 0\n\ + bge _081D27A4\n\ + movs r0, 0x4\n\ + mov r12, r0\n\ +_081D27A4:\n\ + mov r1, r12\n\ + lsls r0, r1, 24\n\ + asrs r4, r0, 24\n\ + cmp r4, 0x2\n\ + bne _081D27B4\n\ + adds r0, r7, 0x1\n\ + lsls r0, 24\n\ + lsrs r7, r0, 24\n\ +_081D27B4:\n\ + ldrb r0, [r6]\n\ + ldr r2, =gUnknown_08625410\n\ + adds r0, r2\n\ + ldrb r2, [r0]\n\ + adds r6, 0x1\n\ + lsls r0, r4, 2\n\ + mov r1, r8\n\ + adds r3, r0, r1\n\ + adds r0, r7, 0\n\ + adds r0, 0x40\n\ + lsls r0, 1\n\ + add r0, r10\n\ + movs r1, 0\n\ + ldrsh r0, [r0, r1]\n\ + muls r0, r2\n\ + asrs r5, r0, 8\n\ + adds r0, r5, 0\n\ + adds r0, 0x9B\n\ + strh r0, [r3]\n\ + lsls r0, r7, 1\n\ + add r0, r10\n\ + movs r1, 0\n\ + ldrsh r0, [r0, r1]\n\ + adds r1, r2, 0\n\ + muls r1, r0\n\ + asrs r1, 8\n\ + movs r0, 0x5B\n\ + subs r0, r1\n\ + strh r0, [r3, 0x2]\n\ + cmp r4, 0x2\n\ + bgt _081D2800\n\ + cmp r2, 0x20\n\ + bne _081D27FA\n\ + cmp r4, 0x2\n\ + beq _081D2800\n\ +_081D27FA:\n\ + adds r0, r5, 0\n\ + adds r0, 0x9C\n\ + strh r0, [r3]\n\ +_081D2800:\n\ + mov r0, r9\n\ + adds r0, 0x1\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + mov r9, r0\n\ + cmp r0, 0x4\n\ + bls _081D2786\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ + .syntax divided"); +#endif } \ No newline at end of file diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 8b47386082..75e8da3f87 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -34,7 +34,6 @@ struct UsePokeblockSubStruct struct UsePokeblockStruct { u8 field_0[0x7C58]; - //u8 field_7C58[0x378]; struct UnknownStruct_81D1ED4 field_7C58; struct UsePokeblockSubStruct info; }; @@ -204,7 +203,7 @@ void sub_8166380(void) gUnknown_0203BC90->field_50++; break; case 11: - sub_81D2754(&gUnknown_0203BCAC->field_7C58, &gUnknown_0203BCAC->field_0[0x7C6C]); + sub_81D2754(&gUnknown_0203BCAC->field_7C58, gUnknown_0203BCAC->field_7C58.unk14[0]); sub_81D20AC(&gUnknown_0203BCAC->field_7C58); gUnknown_0203BC90->field_50++; break; From aa7657a82a108321d5112f0ad195132e2c6e6c99 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 6 Mar 2019 22:58:05 -0500 Subject: [PATCH 188/217] Move constants into C Also figured out what one of the graphics files is for. --- data/menu_unknown.s | 28 +---- .../{8625660.png => pokeball_placeholder.png} | Bin src/menu_unknown.c | 98 ++++++++++++++++-- 3 files changed, 93 insertions(+), 33 deletions(-) rename graphics/pokenav/{8625660.png => pokeball_placeholder.png} (100%) diff --git a/data/menu_unknown.s b/data/menu_unknown.s index fc8bf47b9c..e88a68fcc6 100644 --- a/data/menu_unknown.s +++ b/data/menu_unknown.s @@ -2,38 +2,12 @@ .include "constants/constants.inc" .section .rodata - -@gUnknown_08625410:: @ 8625410 -@ .byte 4, 5, 6, 7, 8, 9, 9, 0xA, 0xA, 0xB, 0xB, 0xC, 0xC, 0xD, 0xD, 0xD, 0xD, 0xE, 0xE, 0xE, 0xE, 0xF, 0xF, 0xF, 0xF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23 - -gMoveRelearnerWindowTemplates:: @ 8625510s - window_template 1, 1, 1, 16, 12, 0xF, 0x000A - window_template 1, 1, 1, 16, 12, 0xF, 0x00CA - window_template 1, 19, 1, 10, 12, 0xF, 0x018A - window_template 1, 4, 15, 22, 4, 0xF, 0x0202 - window_template 0, 22, 8, 5, 4, 0xF, 0x025A - null_window_template - -gMoveRelearnerYesNoMenuTemplate:: @ 8625540 - window_template 0, 22, 8, 5, 4, 0xF, 0x025A - -gMoveRelearnerMovesListTemplate:: @ 8625548 struct ListMenuTemplate - .4byte NULL - .4byte MoveRelearnerCursorCallback - .4byte NULL - .2byte 0 - .2byte 0 - .byte 2 - .byte 0 - .byte 8 - .byte 0 - .4byte 0x1003121 gUnknown_08625560:: @ 8625560 .incbin "graphics/pokenav/pokeball.4bpp" gUnknown_08625660:: @ 8625660 - .incbin "graphics/pokenav/8625660.4bpp" + .incbin "graphics/pokenav/pokeball_placeholder.4bpp" gUnknown_08625680:: @ 8625680 .incbin "graphics/pokenav/sparkle.gbapal" diff --git a/graphics/pokenav/8625660.png b/graphics/pokenav/pokeball_placeholder.png similarity index 100% rename from graphics/pokenav/8625660.png rename to graphics/pokenav/pokeball_placeholder.png diff --git a/src/menu_unknown.c b/src/menu_unknown.c index dc8351d924..9a8ea59065 100644 --- a/src/menu_unknown.c +++ b/src/menu_unknown.c @@ -24,6 +24,7 @@ EWRAM_DATA static struct ListMenuItem *sUnknown_0203CF4C = NULL; void sub_81D1E7C(s32 itemIndex, bool8 onInit, struct ListMenu *list); void sub_81D24A4(struct UnknownStruct_81D1ED4 *a0); void sub_81D2634(struct UnknownStruct_81D1ED4 *a0); +void MoveRelearnerCursorCallback(s32 itemIndex, bool8 onInit, struct ListMenu *list); static const struct WindowTemplate sUnknown_086253E8[] = { @@ -72,7 +73,7 @@ static const struct ScanlineEffectParams sUnknown_08625404 = }; -const u8 gUnknown_08625410[] = +static const u8 sUnknown_08625410[] = { 4, 5, @@ -109,6 +110,91 @@ const u8 gUnknown_08625410[] = 0x23 }; + +const struct WindowTemplate gMoveRelearnerWindowTemplates[] = +{ + { + .bg = 1, + .tilemapLeft = 1, + .tilemapTop = 1, + .width = 16, + .height = 12, + .paletteNum = 0xF, + .baseBlock = 0xA + }, + { + .bg = 1, + .tilemapLeft = 1, + .tilemapTop = 1, + .width = 16, + .height = 12, + .paletteNum = 0xF, + .baseBlock = 0xCA + }, + { + .bg = 1, + .tilemapLeft = 19, + .tilemapTop = 1, + .width = 10, + .height = 12, + .paletteNum = 0xF, + .baseBlock = 0x18A + }, + { + .bg = 1, + .tilemapLeft = 4, + .tilemapTop = 15, + .width = 22, + .height = 4, + .paletteNum = 0xF, + .baseBlock = 0x202 + }, + { + .bg = 0, + .tilemapLeft = 22, + .tilemapTop = 8, + .width = 5, + .height = 4, + .paletteNum = 0xF, + .baseBlock = 0x25A + }, + DUMMY_WIN_TEMPLATE +}; + +const struct WindowTemplate gMoveRelearnerYesNoMenuTemplate = +{ + .bg = 0, + .tilemapLeft = 22, + .tilemapTop = 8, + .width = 5, + .height = 4, + .paletteNum = 0xF, + .baseBlock = 0x25A +}; + + +const struct ListMenuTemplate gMoveRelearnerMovesListTemplate = +{ + .items = NULL, + .moveCursorFunc = MoveRelearnerCursorCallback, + .itemPrintFunc = NULL, + .totalItems = 0, + .maxShowed = 0, + .windowId = 2, + .header_X = 0, + .item_X = 8, + .cursor_X = 0, + .upText_Y = 1, + .cursorPal = 2, + .fillValue = 1, + .cursorShadowPal = 3, + .lettersSpacing = 0, + .itemVerticalPadding = 0, + .scrollMultiple = LIST_NO_MULTIPLE_SCROLL, + .fontId = 1, + .cursorKind = 0 +}; + bool8 sub_81D1C44(u8 count) { u32 i; @@ -1353,7 +1439,7 @@ NAKED void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1) { // There are some register-renaming issues here. The cause of the problem seems to be that - // GCC tries to save gUnknown_08625410 in a register, instead of loading the constant repeatedly. + // GCC tries to save sUnknown_08625410 in a register, instead of loading the constant repeatedly. // But this is one too many things to keep track of, so GCC is forced to use the stack. #ifdef NONMATCHING u8* v1; @@ -1363,7 +1449,7 @@ void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D u16 v5; v1 = arg0->unk0[0]; - v2 = gUnknown_08625410[*v1]; + v2 = sUnknown_08625410[*v1]; v1++; arg1[0].unk0 = 0x9B; arg1[0].unk2 = 0x5B - v2; @@ -1380,7 +1466,7 @@ void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D v3++; } - v2 = gUnknown_08625410[*v1]; + v2 = sUnknown_08625410[*v1]; v1++; arg1[v4].unk0 = ((gSineTable[v3 + 0x40] * v2) >> 8) + 0x9B; arg1[v4].unk2 = ((gSineTable[v3] * v2) >> 8) - 0x5B; @@ -1398,7 +1484,7 @@ void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D push {r5-r7}\n\ adds r6, r0, 0\n\ mov r8, r1\n\ - ldr r1, =gUnknown_08625410\n\ + ldr r1, =sUnknown_08625410\n\ ldrb r0, [r6]\n\ adds r0, r1\n\ ldrb r2, [r0]\n\ @@ -1443,7 +1529,7 @@ _081D27A4:\n\ lsrs r7, r0, 24\n\ _081D27B4:\n\ ldrb r0, [r6]\n\ - ldr r2, =gUnknown_08625410\n\ + ldr r2, =sUnknown_08625410\n\ adds r0, r2\n\ ldrb r2, [r0]\n\ adds r6, 0x1\n\ From 105e1721d665d8386afd47882020c51d6d97c522 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 3 Mar 2019 21:59:57 -0500 Subject: [PATCH 189/217] Overhaul scaninc to work recursively This also fixes the bug where scaninc would ignore #include lines in assembly files. --- Makefile | 2 +- src/field_message_box.c | 2 +- src/item_menu.c | 2 +- src/main_menu.c | 2 +- tools/scaninc/Makefile | 4 +- tools/scaninc/asm_file.cpp | 3 +- tools/scaninc/scaninc.cpp | 96 +++++++++----------------- tools/scaninc/scaninc.h | 2 +- tools/scaninc/source_file.cpp | 125 ++++++++++++++++++++++++++++++++++ tools/scaninc/source_file.h | 71 +++++++++++++++++++ 10 files changed, 238 insertions(+), 71 deletions(-) create mode 100644 tools/scaninc/source_file.cpp create mode 100644 tools/scaninc/source_file.h diff --git a/Makefile b/Makefile index c9a7c2e059..e5b35a8302 100644 --- a/Makefile +++ b/Makefile @@ -168,7 +168,7 @@ $(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s $$(asm_dep) ifeq ($(NODEP),1) $(DATA_ASM_BUILDDIR)/%.o: data_dep := else -$(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) $(DATA_ASM_SUBDIR)/$*.s) +$(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) -I include $(DATA_ASM_SUBDIR)/$*.s) endif $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep) diff --git a/src/field_message_box.c b/src/field_message_box.c index ac5e7a4bb7..ca1c05e224 100755 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -1,6 +1,6 @@ +#include #include "global.h" #include "menu.h" -#include "string.h" #include "string_util.h" #include "task.h" #include "text.h" diff --git a/src/item_menu.c b/src/item_menu.c index 5b9946e62e..5d5dfe854a 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -1,3 +1,4 @@ +#include #include "global.h" #include "item_menu.h" #include "battle.h" @@ -40,7 +41,6 @@ #include "shop.h" #include "sound.h" #include "sprite.h" -#include "string.h" #include "strings.h" #include "string_util.h" #include "task.h" diff --git a/src/main_menu.c b/src/main_menu.c index e6e29d942a..1879495f52 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -1,3 +1,4 @@ +#include #include "global.h" #include "trainer_pokemon_sprites.h" #include "bg.h" @@ -30,7 +31,6 @@ #include "scanline_effect.h" #include "sound.h" #include "sprite.h" -#include "string.h" #include "strings.h" #include "string_util.h" #include "task.h" diff --git a/tools/scaninc/Makefile b/tools/scaninc/Makefile index 367a3350b8..53c9d0060d 100644 --- a/tools/scaninc/Makefile +++ b/tools/scaninc/Makefile @@ -2,9 +2,9 @@ CXX = g++ CXXFLAGS = -Wall -Werror -std=c++11 -O2 -SRCS = scaninc.cpp c_file.cpp asm_file.cpp +SRCS = scaninc.cpp c_file.cpp asm_file.cpp source_file.cpp -HEADERS := scaninc.h asm_file.h c_file.h +HEADERS := scaninc.h asm_file.h c_file.h source_file.h .PHONY: clean diff --git a/tools/scaninc/asm_file.cpp b/tools/scaninc/asm_file.cpp index 6322749e20..109e604a22 100644 --- a/tools/scaninc/asm_file.cpp +++ b/tools/scaninc/asm_file.cpp @@ -64,7 +64,8 @@ IncDirectiveType AsmFile::ReadUntilIncDirective(std::string &path) IncDirectiveType incDirectiveType = IncDirectiveType::None; - if (PeekChar() == '.') + char c = PeekChar(); + if (c == '.' || c == '#') { m_pos++; diff --git a/tools/scaninc/scaninc.cpp b/tools/scaninc/scaninc.cpp index 3dc221479c..0d55d11f65 100644 --- a/tools/scaninc/scaninc.cpp +++ b/tools/scaninc/scaninc.cpp @@ -25,8 +25,7 @@ #include #include #include "scaninc.h" -#include "asm_file.h" -#include "c_file.h" +#include "source_file.h" bool CanOpenFile(std::string path) { @@ -46,7 +45,7 @@ int main(int argc, char **argv) std::queue filesToProcess; std::set dependencies; - std::list includeDirs; + std::vector includeDirs; argc--; argv++; @@ -83,79 +82,50 @@ int main(int argc, char **argv) std::string initialPath(argv[0]); - std::size_t pos = initialPath.find_last_of('.'); + filesToProcess.push(initialPath); - if (pos == std::string::npos) - FATAL_ERROR("no file extension in path \"%s\"\n", initialPath.c_str()); - - std::string extension = initialPath.substr(pos + 1); - - std::string srcDir(""); - std::size_t slash = initialPath.rfind('/'); - if (slash != std::string::npos) + while (!filesToProcess.empty()) { - srcDir = initialPath.substr(0, slash + 1); - } - includeDirs.push_back(srcDir); + std::string filePath = filesToProcess.front(); + SourceFile file(filePath); + filesToProcess.pop(); - if (extension == "c" || extension == "h") - { - filesToProcess.push(initialPath); - - while (!filesToProcess.empty()) + includeDirs.push_back(file.GetSrcDir()); + for (auto incbin : file.GetIncbins()) { - CFile file(filesToProcess.front()); - filesToProcess.pop(); - - file.FindIncbins(); - for (auto incbin : file.GetIncbins()) + dependencies.insert(incbin); + } + for (auto include : file.GetIncludes()) + { + bool found = false; + for (auto includeDir : includeDirs) { - dependencies.insert(incbin); - } - for (auto include : file.GetIncludes()) - { - for (auto includeDir : includeDirs) + std::string path(includeDir + include); + if (CanOpenFile(path)) { - std::string path(includeDir + include); - if (CanOpenFile(path)) + bool inserted = dependencies.insert(path).second; + if (inserted) { - bool inserted = dependencies.insert(path).second; - if (inserted) - { - filesToProcess.push(path); - } - break; + filesToProcess.push(path); } + found = true; + break; } } - } - } - else if (extension == "s" || extension == "inc") - { - filesToProcess.push(initialPath); - - while (!filesToProcess.empty()) - { - AsmFile file(filesToProcess.front()); - - filesToProcess.pop(); - - IncDirectiveType incDirectiveType; - std::string path; - - while ((incDirectiveType = file.ReadUntilIncDirective(path)) != IncDirectiveType::None) + if (!found) { - bool inserted = dependencies.insert(path).second; - if (inserted - && incDirectiveType == IncDirectiveType::Include - && CanOpenFile(path)) - filesToProcess.push(path); + if (GetFileType(include) == SourceFileType::Header) + // We don't have any generated .h files... yet. + // Better to give a warning; debugging the makefile when a + // header is missing is very difficult. + fprintf(stderr, "scaninc: warning: C header file \"%s\" not found. (included from \"%s\")\n", + include.c_str(), filePath.c_str()); + + // It's probably a generated file. + dependencies.insert(include); } } - } - else - { - FATAL_ERROR("unknown extension \"%s\"\n", extension.c_str()); + includeDirs.pop_back(); } for (const std::string &path : dependencies) diff --git a/tools/scaninc/scaninc.h b/tools/scaninc/scaninc.h index 30cc9611c1..d6736e01bb 100644 --- a/tools/scaninc/scaninc.h +++ b/tools/scaninc/scaninc.h @@ -1,4 +1,4 @@ -// Copyright(c) 2015-2017 YamaArashi +// Copyright(c) 2019 Phlosioneer // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/tools/scaninc/source_file.cpp b/tools/scaninc/source_file.cpp new file mode 100644 index 0000000000..f23ff6db65 --- /dev/null +++ b/tools/scaninc/source_file.cpp @@ -0,0 +1,125 @@ +// Copyright(c) 2019 Phlosioneer +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include +#include "source_file.h" + + +SourceFileType GetFileType(std::string& path) +{ + std::size_t pos = path.find_last_of('.'); + + if (pos == std::string::npos) + FATAL_ERROR("no file extension in path \"%s\"\n", path.c_str()); + + std::string extension = path.substr(pos + 1); + + if (extension == "c") + return SourceFileType::Cpp; + else if (extension == "s") + return SourceFileType::Asm; + else if (extension == "h") + return SourceFileType::Header; + else if (extension == "inc") + return SourceFileType::Inc; + else + FATAL_ERROR("Unrecognized extension \"%s\"\n", extension.c_str()); + + // Unreachable + return SourceFileType::Cpp; +} + +std::string GetDir(std::string& path) +{ + std::size_t slash = path.rfind('/'); + + if (slash != std::string::npos) + return path.substr(0, slash + 1); + else + return std::string(""); +} + +SourceFile::SourceFile(std::string path) +{ + m_file_type = GetFileType(path); + + m_src_dir = GetDir(path); + + if (m_file_type == SourceFileType::Cpp + || m_file_type == SourceFileType::Header) + { + new (&m_source_file.c_file) CFile(path); + m_source_file.c_file.FindIncbins(); + } + else + { + AsmFile file(path); + std::set incbins; + std::set includes; + + IncDirectiveType incDirectiveType; + std::string outputPath; + + while ((incDirectiveType = file.ReadUntilIncDirective(outputPath)) != IncDirectiveType::None) + { + if (incDirectiveType == IncDirectiveType::Include) + includes.insert(outputPath); + else + incbins.insert(outputPath); + } + + new (&m_source_file.asm_wrapper) SourceFile::InnerUnion::AsmWrapper{incbins, includes}; + } +} + +SourceFile::~SourceFile() +{ + if (m_file_type == SourceFileType::Cpp || m_file_type == SourceFileType::Header) + { + m_source_file.c_file.~CFile(); + } + else + { + m_source_file.asm_wrapper.asm_incbins.~set(); + m_source_file.asm_wrapper.asm_includes.~set(); + } +} + +const std::set& SourceFile::GetIncbins() +{ + if (m_file_type == SourceFileType::Cpp || m_file_type == SourceFileType::Header) + return m_source_file.c_file.GetIncbins(); + else + return m_source_file.asm_wrapper.asm_incbins; +} + +const std::set& SourceFile::GetIncludes() +{ + if (m_file_type == SourceFileType::Cpp || m_file_type == SourceFileType::Header) + return m_source_file.c_file.GetIncludes(); + else + return m_source_file.asm_wrapper.asm_includes; +} + +std::string& SourceFile::GetSrcDir() +{ + return m_src_dir; +} + diff --git a/tools/scaninc/source_file.h b/tools/scaninc/source_file.h new file mode 100644 index 0000000000..15ea50a034 --- /dev/null +++ b/tools/scaninc/source_file.h @@ -0,0 +1,71 @@ +// Copyright(c) 2015-2017 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef SOURCE_FILE_H +#define SOURCE_FILE_H + +#include +#include "scaninc.h" +#include "asm_file.h" +#include "c_file.h" + +enum class SourceFileType +{ + Cpp, + Header, + Asm, + Inc +}; + +SourceFileType GetFileType(std::string& path); + +class SourceFile +{ +public: + + SourceFile(std::string path); + ~SourceFile(); + SourceFile(SourceFile const&) = delete; + SourceFile(SourceFile&&) = delete; + SourceFile& operator =(SourceFile const&) = delete; + SourceFile& operator =(SourceFile&&) = delete; + bool HasIncbins(); + const std::set& GetIncbins(); + const std::set& GetIncludes(); + std::string& GetSrcDir(); + +private: + union InnerUnion { + CFile c_file; + struct AsmWrapper { + std::set asm_incbins; + std::set asm_includes; + } asm_wrapper; + + // Construction and destruction handled by SourceFile. + InnerUnion() {}; + ~InnerUnion() {}; + } m_source_file; + SourceFileType m_file_type; + std::string m_src_dir; +}; + +#endif // SOURCE_FILE_H + From b0c634d5318019f17547a758084fdcfb5a387c24 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 4 Mar 2019 00:21:34 -0500 Subject: [PATCH 190/217] Support absolute paths --- Makefile | 4 ++-- tools/scaninc/scaninc.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e5b35a8302..1bfeebf616 100644 --- a/Makefile +++ b/Makefile @@ -159,7 +159,7 @@ $(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep) ifeq ($(NODEP),1) $(ASM_BUILDDIR)/%.o: asm_dep := else -$(ASM_BUILDDIR)/%.o: asm_dep = $(shell $(SCANINC) $(ASM_SUBDIR)/$*.s) +$(ASM_BUILDDIR)/%.o: asm_dep = $(shell $(SCANINC) -I "" $(ASM_SUBDIR)/$*.s) endif $(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s $$(asm_dep) @@ -168,7 +168,7 @@ $(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s $$(asm_dep) ifeq ($(NODEP),1) $(DATA_ASM_BUILDDIR)/%.o: data_dep := else -$(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) -I include $(DATA_ASM_SUBDIR)/$*.s) +$(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) -I include -I "" $(DATA_ASM_SUBDIR)/$*.s) endif $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep) diff --git a/tools/scaninc/scaninc.cpp b/tools/scaninc/scaninc.cpp index 0d55d11f65..696842dc91 100644 --- a/tools/scaninc/scaninc.cpp +++ b/tools/scaninc/scaninc.cpp @@ -62,7 +62,7 @@ int main(int argc, char **argv) argv++; includeDir = std::string(argv[0]); } - if (includeDir.back() != '/') + if (!includeDir.empty() && includeDir.back() != '/') { includeDir += '/'; } From 6638ebe7fdda1119d8fe0056c8cf0c65cf292c11 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 5 Mar 2019 02:30:08 -0500 Subject: [PATCH 191/217] Fix copyright mixup --- tools/scaninc/scaninc.h | 2 +- tools/scaninc/source_file.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/scaninc/scaninc.h b/tools/scaninc/scaninc.h index d6736e01bb..30cc9611c1 100644 --- a/tools/scaninc/scaninc.h +++ b/tools/scaninc/scaninc.h @@ -1,4 +1,4 @@ -// Copyright(c) 2019 Phlosioneer +// Copyright(c) 2015-2017 YamaArashi // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/tools/scaninc/source_file.h b/tools/scaninc/source_file.h index 15ea50a034..f7b6412bd2 100644 --- a/tools/scaninc/source_file.h +++ b/tools/scaninc/source_file.h @@ -1,4 +1,4 @@ -// Copyright(c) 2015-2017 YamaArashi +// Copyright(c) 2019 Phlosioneer // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal From bd157b301dea3526a4c373737dc8167d9a02b168 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 7 Mar 2019 09:46:14 -0600 Subject: [PATCH 192/217] Scaninc: Don't insert missing headers into dependencies --- src/field_message_box.c | 2 +- src/item_menu.c | 2 +- src/main_menu.c | 2 +- tools/scaninc/scaninc.cpp | 14 -------------- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/field_message_box.c b/src/field_message_box.c index ca1c05e224..ac5e7a4bb7 100755 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -1,6 +1,6 @@ -#include #include "global.h" #include "menu.h" +#include "string.h" #include "string_util.h" #include "task.h" #include "text.h" diff --git a/src/item_menu.c b/src/item_menu.c index 5d5dfe854a..5b9946e62e 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -1,4 +1,3 @@ -#include #include "global.h" #include "item_menu.h" #include "battle.h" @@ -41,6 +40,7 @@ #include "shop.h" #include "sound.h" #include "sprite.h" +#include "string.h" #include "strings.h" #include "string_util.h" #include "task.h" diff --git a/src/main_menu.c b/src/main_menu.c index 1879495f52..e6e29d942a 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -1,4 +1,3 @@ -#include #include "global.h" #include "trainer_pokemon_sprites.h" #include "bg.h" @@ -31,6 +30,7 @@ #include "scanline_effect.h" #include "sound.h" #include "sprite.h" +#include "string.h" #include "strings.h" #include "string_util.h" #include "task.h" diff --git a/tools/scaninc/scaninc.cpp b/tools/scaninc/scaninc.cpp index 696842dc91..b95cbd0337 100644 --- a/tools/scaninc/scaninc.cpp +++ b/tools/scaninc/scaninc.cpp @@ -97,7 +97,6 @@ int main(int argc, char **argv) } for (auto include : file.GetIncludes()) { - bool found = false; for (auto includeDir : includeDirs) { std::string path(includeDir + include); @@ -108,22 +107,9 @@ int main(int argc, char **argv) { filesToProcess.push(path); } - found = true; break; } } - if (!found) - { - if (GetFileType(include) == SourceFileType::Header) - // We don't have any generated .h files... yet. - // Better to give a warning; debugging the makefile when a - // header is missing is very difficult. - fprintf(stderr, "scaninc: warning: C header file \"%s\" not found. (included from \"%s\")\n", - include.c_str(), filePath.c_str()); - - // It's probably a generated file. - dependencies.insert(include); - } } includeDirs.pop_back(); } From 69aec91577659cfe89a63fc4c8d2fc77ab344cbb Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 8 Mar 2019 01:56:38 -0500 Subject: [PATCH 193/217] Decompile move tutor stuff 2 nonmatching. --- asm/menu_unknown.s | 500 ----------------------------- include/contest_effect.h | 1 + include/menu_unknown.h | 6 + include/pokemon_summary_screen.h | 3 + include/pokenav.h | 5 - include/strings.h | 7 + src/menu_unknown.c | 531 +++++++++++++++++++++++++++++++ src/move_relearner.c | 2 +- src/strings.c | 14 +- 9 files changed, 556 insertions(+), 513 deletions(-) diff --git a/asm/menu_unknown.s b/asm/menu_unknown.s index c0026a7423..a08d72aa5d 100644 --- a/asm/menu_unknown.s +++ b/asm/menu_unknown.s @@ -6,506 +6,6 @@ .text - thumb_func_start InitMoveRelearnerWindows -InitMoveRelearnerWindows: @ 81D2824 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r0, =gMoveRelearnerWindowTemplates - bl InitWindows - bl DeactivateAllTextPrinters - movs r0, 0 - movs r1, 0x1 - movs r2, 0xE0 - bl LoadUserWindowBorderGfx - ldr r0, =gUnknown_0860F074 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - movs r4, 0 -_081D284A: - adds r0, r4, 0 - movs r1, 0x11 - bl FillWindowPixelBuffer - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x4 - bls _081D284A - cmp r5, 0 - bne _081D287C - movs r0, 0 - bl PutWindowTilemap - movs r0, 0 - movs r1, 0 - movs r2, 0x1 - movs r3, 0xE - bl SetWindowBorderStyle - b _081D288E - .pool -_081D287C: - movs r0, 0x1 - bl PutWindowTilemap - movs r0, 0x1 - movs r1, 0 - movs r2, 0x1 - movs r3, 0xE - bl SetWindowBorderStyle -_081D288E: - movs r0, 0x2 - bl PutWindowTilemap - movs r0, 0x3 - bl PutWindowTilemap - movs r0, 0x2 - movs r1, 0 - movs r2, 0x1 - movs r3, 0xE - bl SetWindowBorderStyle - movs r0, 0x3 - movs r1, 0 - movs r2, 0x1 - movs r3, 0xE - bl SetWindowBorderStyle - bl nullsub_79 - movs r0, 0x1 - bl schedule_bg_copy_tilemap_to_vram - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end InitMoveRelearnerWindows - - thumb_func_start nullsub_79 -nullsub_79: @ 81D28C4 - bx lr - thumb_func_end nullsub_79 - - thumb_func_start LoadMoveRelearnerMovesList -LoadMoveRelearnerMovesList: @ 81D28C8 - push {r4-r7,lr} - lsls r1, 16 - lsrs r4, r1, 16 - ldr r3, =gMultiuseListMenuTemplate - adds r2, r3, 0 - ldr r1, =gMoveRelearnerMovesListTemplate - ldm r1!, {r5-r7} - stm r2!, {r5-r7} - ldm r1!, {r5-r7} - stm r2!, {r5-r7} - strh r4, [r3, 0xC] - str r0, [r3] - cmp r4, 0x5 - bhi _081D28F0 - strh r4, [r3, 0xE] - b _081D28F4 - .pool -_081D28F0: - movs r0, 0x6 - strh r0, [r3, 0xE] -_081D28F4: - ldrb r0, [r3, 0xE] - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end LoadMoveRelearnerMovesList - - thumb_func_start MoveRelearnerLoadBattleMoveDescription -MoveRelearnerLoadBattleMoveDescription: @ 81D28FC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x2C - mov r9, r0 - movs r0, 0 - movs r1, 0x11 - bl FillWindowPixelBuffer - ldr r5, =gText_BattleMoves2 - movs r0, 0x1 - adds r1, r5, 0 - movs r2, 0x80 - bl GetStringCenterAlignXOffset - adds r4, r0, 0 - lsls r3, r4, 24 - lsrs r3, 24 - movs r0, 0x1 - str r0, [sp] - movs r0, 0xFF - mov r8, r0 - str r0, [sp, 0x4] - movs r7, 0 - str r7, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - adds r2, r5, 0 - bl AddTextPrinterParameterized - ldr r5, =gText_PPSlash - movs r1, 0x29 - mov r10, r1 - str r1, [sp] - mov r0, r8 - str r0, [sp, 0x4] - str r7, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - adds r2, r5, 0 - movs r3, 0x4 - bl AddTextPrinterParameterized - ldr r5, =gText_PowerSlash - movs r0, 0x1 - adds r1, r5, 0 - movs r2, 0x6A - bl GetStringRightAlignXOffset - adds r4, r0, 0 - lsls r3, r4, 24 - lsrs r3, 24 - movs r1, 0x19 - str r1, [sp] - mov r0, r8 - str r0, [sp, 0x4] - str r7, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - adds r2, r5, 0 - bl AddTextPrinterParameterized - ldr r5, =gText_AccuracySlash - movs r0, 0x1 - adds r1, r5, 0 - movs r2, 0x6A - bl GetStringRightAlignXOffset - adds r4, r0, 0 - lsls r3, r4, 24 - lsrs r3, 24 - mov r1, r10 - str r1, [sp] - mov r0, r8 - str r0, [sp, 0x4] - str r7, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - adds r2, r5, 0 - bl AddTextPrinterParameterized - movs r0, 0x2 - negs r0, r0 - cmp r9, r0 - bne _081D29C4 - movs r0, 0 - movs r1, 0x2 - bl CopyWindowToVram - b _081D2AB6 - .pool -_081D29C4: - mov r1, r9 - lsls r0, r1, 1 - add r0, r9 - lsls r0, 2 - ldr r1, =gBattleMoves - adds r6, r0, r1 - ldrb r1, [r6, 0x2] - lsls r0, r1, 3 - subs r0, r1 - ldr r1, =gTypeNames - adds r5, r0, r1 - movs r0, 0x19 - str r0, [sp] - mov r1, r8 - str r1, [sp, 0x4] - str r7, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - adds r2, r5, 0 - movs r3, 0x4 - bl AddTextPrinterParameterized - ldr r1, =gText_PPSlash - movs r0, 0x1 - movs r2, 0 - bl GetStringWidth - adds r4, r0, 0x4 - ldrb r1, [r6, 0x4] - add r0, sp, 0xC - movs r2, 0 - movs r3, 0x2 - bl ConvertIntToDecimalStringN - lsls r3, r4, 24 - lsrs r3, 24 - mov r0, r10 - str r0, [sp] - mov r1, r8 - str r1, [sp, 0x4] - str r7, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - add r2, sp, 0xC - bl AddTextPrinterParameterized - ldrb r0, [r6, 0x1] - cmp r0, 0x1 - bhi _081D2A3C - ldr r5, =gText_ThreeDashes - b _081D2A4A - .pool -_081D2A3C: - ldrb r1, [r6, 0x1] - add r0, sp, 0xC - movs r2, 0 - movs r3, 0x3 - bl ConvertIntToDecimalStringN - add r5, sp, 0xC -_081D2A4A: - movs r0, 0x19 - str r0, [sp] - movs r0, 0xFF - str r0, [sp, 0x4] - movs r0, 0 - str r0, [sp, 0x8] - movs r1, 0x1 - adds r2, r5, 0 - movs r3, 0x6A - bl AddTextPrinterParameterized - ldrb r0, [r6, 0x3] - cmp r0, 0 - bne _081D2A70 - ldr r5, =gText_ThreeDashes - b _081D2A7E - .pool -_081D2A70: - ldrb r1, [r6, 0x3] - add r0, sp, 0xC - movs r2, 0 - movs r3, 0x3 - bl ConvertIntToDecimalStringN - add r5, sp, 0xC -_081D2A7E: - movs r0, 0x29 - str r0, [sp] - movs r0, 0xFF - str r0, [sp, 0x4] - movs r4, 0 - str r4, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - adds r2, r5, 0 - movs r3, 0x6A - bl AddTextPrinterParameterized - ldr r1, =gMoveDescriptionPointers - mov r0, r9 - subs r0, 0x1 - lsls r0, 2 - adds r0, r1 - ldr r5, [r0] - movs r0, 0x41 - str r0, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0 - movs r1, 0x7 - adds r2, r5, 0 - movs r3, 0 - bl AddTextPrinterParameterized -_081D2AB6: - add sp, 0x2C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end MoveRelearnerLoadBattleMoveDescription - - thumb_func_start MoveRelearnerMenuLoadContestMoveDescription -MoveRelearnerMenuLoadContestMoveDescription: @ 81D2ACC - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0xC - adds r4, r0, 0 - bl MoveRelearnerShowHideHearts - movs r0, 0x1 - movs r1, 0x11 - bl FillWindowPixelBuffer - ldr r5, =gText_ContestMoves2 - movs r0, 0x1 - adds r1, r5, 0 - movs r2, 0x80 - bl GetStringCenterAlignXOffset - lsls r3, r0, 24 - lsrs r3, 24 - movs r0, 0x1 - str r0, [sp] - movs r7, 0xFF - str r7, [sp, 0x4] - movs r6, 0 - str r6, [sp, 0x8] - movs r1, 0x1 - adds r2, r5, 0 - bl AddTextPrinterParameterized - ldr r5, =gText_Appeal2 - movs r0, 0x1 - adds r1, r5, 0 - movs r2, 0x5C - bl GetStringRightAlignXOffset - lsls r3, r0, 24 - lsrs r3, 24 - movs r0, 0x19 - mov r8, r0 - str r0, [sp] - str r7, [sp, 0x4] - str r6, [sp, 0x8] - movs r0, 0x1 - movs r1, 0x1 - adds r2, r5, 0 - bl AddTextPrinterParameterized - ldr r5, =gText_Jam2 - movs r0, 0x1 - adds r1, r5, 0 - movs r2, 0x5C - bl GetStringRightAlignXOffset - lsls r3, r0, 24 - lsrs r3, 24 - movs r0, 0x29 - str r0, [sp] - str r7, [sp, 0x4] - str r6, [sp, 0x8] - movs r0, 0x1 - movs r1, 0x1 - adds r2, r5, 0 - bl AddTextPrinterParameterized - movs r0, 0x2 - negs r0, r0 - cmp r4, r0 - bne _081D2B6C - movs r0, 0x1 - movs r1, 0x2 - bl CopyWindowToVram - b _081D2BB8 - .pool -_081D2B6C: - lsls r4, 3 - ldr r0, =gContestMoves - adds r4, r0 - ldr r1, =gContestMoveTypeTextPointers - ldrb r0, [r4, 0x1] - lsls r0, 29 - lsrs r0, 27 - adds r0, r1 - ldr r5, [r0] - mov r0, r8 - str r0, [sp] - str r7, [sp, 0x4] - str r6, [sp, 0x8] - movs r0, 0x1 - movs r1, 0x1 - adds r2, r5, 0 - movs r3, 0x4 - bl AddTextPrinterParameterized - ldr r1, =gContestEffectDescriptionPointers - ldrb r0, [r4] - lsls r0, 2 - adds r0, r1 - ldr r5, [r0] - movs r0, 0x41 - str r0, [sp] - str r7, [sp, 0x4] - str r6, [sp, 0x8] - movs r0, 0x1 - movs r1, 0x7 - adds r2, r5, 0 - movs r3, 0 - bl AddTextPrinterParameterized - movs r0, 0x1 - movs r1, 0x2 - bl CopyWindowToVram -_081D2BB8: - add sp, 0xC - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end MoveRelearnerMenuLoadContestMoveDescription - - thumb_func_start MoveRelearnerCursorCallback -MoveRelearnerCursorCallback: @ 81D2BD0 - push {r4,lr} - adds r4, r0, 0 - lsls r1, 24 - lsrs r1, 24 - cmp r1, 0x1 - beq _081D2BE2 - movs r0, 0x5 - bl PlaySE -_081D2BE2: - adds r0, r4, 0 - bl MoveRelearnerLoadBattleMoveDescription - adds r0, r4, 0 - bl MoveRelearnerMenuLoadContestMoveDescription - pop {r4} - pop {r0} - bx r0 - thumb_func_end MoveRelearnerCursorCallback - - thumb_func_start MoveRelearnerPrintText -MoveRelearnerPrintText: @ 81D2BF4 - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - movs r0, 0x3 - movs r1, 0x11 - bl FillWindowPixelBuffer - ldr r2, =gTextFlags - ldrb r0, [r2] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2] - bl GetPlayerTextSpeedDelay - adds r3, r0, 0 - lsls r3, 24 - lsrs r3, 24 - movs r0, 0 - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - movs r0, 0x3 - str r0, [sp, 0xC] - movs r1, 0x1 - adds r2, r4, 0 - bl AddTextPrinterParameterized2 - add sp, 0x10 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end MoveRelearnerPrintText - - thumb_func_start MoveRelearnerRunTextPrinters -MoveRelearnerRunTextPrinters: @ 81D2C3C - push {lr} - bl RunTextPrinters - movs r0, 0x3 - bl IsTextPrinterActive - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - thumb_func_end MoveRelearnerRunTextPrinters - - thumb_func_start MoveRelearnerCreateYesNoMenu -MoveRelearnerCreateYesNoMenu: @ 81D2C50 - push {lr} - ldr r0, =gMoveRelearnerYesNoMenuTemplate - movs r1, 0x1 - movs r2, 0xE - movs r3, 0 - bl CreateYesNoMenu - pop {r0} - bx r0 - .pool - thumb_func_end MoveRelearnerCreateYesNoMenu - thumb_func_start sub_81D2C68 sub_81D2C68: @ 81D2C68 push {lr} diff --git a/include/contest_effect.h b/include/contest_effect.h index 5f48e1b8bd..0474cb38cc 100644 --- a/include/contest_effect.h +++ b/include/contest_effect.h @@ -19,6 +19,7 @@ struct ContestEffect extern const struct ContestMove gContestMoves[]; extern const struct ContestEffect gContestEffects[]; extern const u8 *const gContestEffectDescriptionPointers[]; +extern const u8 *const gContestMoveTypeTextPointers[]; bool8 AreMovesContestCombo(u16 lastMove, u16 nextMove); diff --git a/include/menu_unknown.h b/include/menu_unknown.h index d63abdc0b9..a442ec3184 100644 --- a/include/menu_unknown.h +++ b/include/menu_unknown.h @@ -2,6 +2,7 @@ #define GUARD_MENU_UNKNOWN_H #include "player_pc.h" +#include "list_menu.h" struct UnknownSubStruct_81D1ED4 { @@ -41,5 +42,10 @@ void sub_81D3464(void *arg0); void sub_81D3480(void *arg0, u8 arg1); void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]); +void MoveRelearnerPrintText(u8 *text); +bool16 MoveRelearnerRunTextPrinters(void); +void MoveRelearnerCreateYesNoMenu(void); +u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices); +void InitMoveRelearnerWindows(bool8 useContextWindow); #endif // GUARD_MENU_UNKNOWN_H \ No newline at end of file diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index bd99fed0ec..19994b77fd 100755 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -1,7 +1,10 @@ #ifndef GUARD_POKEMON_SUMMARY_SCREEN_H #define GUARD_POKEMON_SUMMARY_SCREEN_H +#include "main.h" + extern u8 gLastViewedMonIndex; +extern const u8 *const gMoveDescriptionPointers[]; void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)); void sub_81C4F98(u8, void(*)(void)); diff --git a/include/pokenav.h b/include/pokenav.h index e39373b351..a562b0c7b2 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -4,11 +4,6 @@ bool8 sub_81D312C(void *arg0); bool8 sub_81D4A58(struct EventObject*); -void MoveRelearnerPrintText(u8 *); -u16 MoveRelearnerRunTextPrinters(void); -void MoveRelearnerCreateYesNoMenu(void); -u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices); -void InitMoveRelearnerWindows(bool8 useContextWindow); bool8 EventObjectIsFarawayIslandMew(struct EventObject *); u32 sub_81D427C(void); void sub_81D4998(void); diff --git a/include/strings.h b/include/strings.h index 8fc5ad377e..9e464562d2 100644 --- a/include/strings.h +++ b/include/strings.h @@ -868,6 +868,13 @@ extern const u8 gText_MoveRelearnerPkmnForgotMoveAndLearnedNew[]; extern const u8 gText_TeachWhichMoveToPkmn[]; extern const u8 gText_MoveRelearnerGiveUp[]; extern const u8 gText_MoveRelearnerTeachMoveConfirm[]; +extern const u8 gText_MoveRelearnerBattleMoves[]; +extern const u8 gText_MoveRelearnerPP[]; +extern const u8 gText_MoveRelearnerPower[]; +extern const u8 gText_MoveRelearnerAccuracy[]; +extern const u8 gText_MoveRelearnerContestMovesTitle[]; +extern const u8 gText_MoveRelearnerAppeal[]; +extern const u8 gText_MoveRelearnerJam[]; extern const u8 gText_Kira[]; extern const u8 gText_Amy[]; diff --git a/src/menu_unknown.c b/src/menu_unknown.c index 9a8ea59065..78b2cc8d59 100644 --- a/src/menu_unknown.c +++ b/src/menu_unknown.c @@ -1,14 +1,21 @@ #include "global.h" #include "alloc.h" +#include "battle_main.h" +#include "contest_effect.h" #include "gpu_regs.h" +#include "menu.h" #include "international_string_util.h" #include "menu.h" #include "menu_unknown.h" +#include "move_relearner.h" +#include "palette.h" #include "player_pc.h" +#include "pokemon_summary_screen.h" #include "scanline_effect.h" #include "sound.h" #include "strings.h" #include "string_util.h" +#include "text_window.h" #include "trig.h" #include "window.h" #include "constants/songs.h" @@ -25,6 +32,7 @@ void sub_81D1E7C(s32 itemIndex, bool8 onInit, struct ListMenu *list); void sub_81D24A4(struct UnknownStruct_81D1ED4 *a0); void sub_81D2634(struct UnknownStruct_81D1ED4 *a0); void MoveRelearnerCursorCallback(s32 itemIndex, bool8 onInit, struct ListMenu *list); +extern void nullsub_79(void); static const struct WindowTemplate sUnknown_086253E8[] = { @@ -1585,4 +1593,527 @@ _081D2800:\n\ .pool\n\ .syntax divided"); #endif +} + +void InitMoveRelearnerWindows(bool8 useContextWindow) +{ + u8 i; + + InitWindows(gMoveRelearnerWindowTemplates); + DeactivateAllTextPrinters(); + LoadUserWindowBorderGfx(0, 1, 0xE0); + LoadPalette(gUnknown_0860F074, 0xF0, 0x20); + + for (i = 0; i < 5; i++) + { + FillWindowPixelBuffer(i, 0x11); + } + + if (!useContextWindow) + { + PutWindowTilemap(0); + SetWindowBorderStyle(0, 0, 0x1, 0xE); + } + else + { + PutWindowTilemap(1); + SetWindowBorderStyle(1, 0, 1, 0xE); + } + PutWindowTilemap(2); + PutWindowTilemap(3); + SetWindowBorderStyle(2, 0, 1, 0xE); + SetWindowBorderStyle(3, 0, 1, 0xE); + nullsub_79(); + schedule_bg_copy_tilemap_to_vram(1); +} + +void nullsub_79(void) +{ + +} + +u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices) +{ + gMultiuseListMenuTemplate = gMoveRelearnerMovesListTemplate; + gMultiuseListMenuTemplate.totalItems = numChoices; + gMultiuseListMenuTemplate.items = items; + + if (numChoices < 6) + { + gMultiuseListMenuTemplate.maxShowed = numChoices; + } + else + { + gMultiuseListMenuTemplate.maxShowed = 6; + } + return gMultiuseListMenuTemplate.maxShowed; +} + +NAKED +void MoveRelearnerLoadBattleMoveDescription(u32 chosenMove) +{ + // Two small issues, and a few renamed registers. +#ifdef NONMATCHING + u8 offset; + s32 width; + const struct BattleMove *move; + u8 buffer[0x20]; + const u8 *labelStr; + + FillWindowPixelBuffer(0, 0x11); + labelStr = gText_MoveRelearnerBattleMoves; + offset = GetStringCenterAlignXOffset(1, labelStr, 0x80); + AddTextPrinterParameterized(0, 1, labelStr, offset, 1, TEXT_SPEED_FF, NULL); + + labelStr = gText_MoveRelearnerPP; + AddTextPrinterParameterized(0, 1, labelStr, 4, 0x29, TEXT_SPEED_FF, NULL); + + labelStr = gText_MoveRelearnerPower; + offset = GetStringRightAlignXOffset(1, labelStr, 0x6A); + AddTextPrinterParameterized(0, 1, labelStr, offset, 0x19, TEXT_SPEED_FF, NULL); + + labelStr = gText_MoveRelearnerAccuracy; + offset = GetStringRightAlignXOffset(1, labelStr, 0x6A); + AddTextPrinterParameterized(0, 1, labelStr, offset, 0x29, TEXT_SPEED_FF, NULL); + if (chosenMove == LIST_CANCEL) + { + CopyWindowToVram(0, 2); + return; + } + move = &gBattleMoves[chosenMove]; + labelStr = gTypeNames[move->type]; + // GCC tries to be smart, and preserves the same 0x19 from above for this. + // The original asm just loads the constant 0x19 twice. + AddTextPrinterParameterized(0, 1, labelStr, 4, 0x19, TEXT_SPEED_FF, NULL); + + // GCC tries to generate this as: + // add r4, r0, 0 + // add r4, r4, 4 + // But the original asm is: + // add r4, r0, 4 + width = 4 + GetStringWidth(1, gText_MoveRelearnerPP, 0); + + ConvertIntToDecimalStringN(buffer, move->pp, 0, 2); + AddTextPrinterParameterized(0, 1, buffer, width, 0x29, TEXT_SPEED_FF, NULL); + + + if (move->power < 2) + { + labelStr = gText_ThreeDashes; + } + else + { + ConvertIntToDecimalStringN(buffer, move->power, 0, 3); + labelStr = buffer; + } + AddTextPrinterParameterized(0, 1, labelStr, 0x6A, 0x19, TEXT_SPEED_FF, NULL); + + if (move->accuracy == 0) + { + labelStr = gText_ThreeDashes; + } + else + { + ConvertIntToDecimalStringN(buffer, move->accuracy, 0, 3); + labelStr = buffer; + } + AddTextPrinterParameterized(0, 1, labelStr, 0x6A, 0x29, TEXT_SPEED_FF, NULL); + labelStr = gMoveDescriptionPointers[chosenMove - 1]; + AddTextPrinterParameterized(0, 7, labelStr, 0, 0x41, 0, NULL); +#else + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x2C\n\ + mov r9, r0\n\ + movs r0, 0\n\ + movs r1, 0x11\n\ + bl FillWindowPixelBuffer\n\ + ldr r5, =gText_MoveRelearnerBattleMoves\n\ + movs r0, 0x1\n\ + adds r1, r5, 0\n\ + movs r2, 0x80\n\ + bl GetStringCenterAlignXOffset\n\ + adds r4, r0, 0\n\ + lsls r3, r4, 24\n\ + lsrs r3, 24\n\ + movs r0, 0x1\n\ + str r0, [sp]\n\ + movs r0, 0xFF\n\ + mov r8, r0\n\ + str r0, [sp, 0x4]\n\ + movs r7, 0\n\ + str r7, [sp, 0x8]\n\ + movs r0, 0\n\ + movs r1, 0x1\n\ + adds r2, r5, 0\n\ + bl AddTextPrinterParameterized\n\ + ldr r5, =gText_MoveRelearnerPP\n\ + movs r1, 0x29\n\ + mov r10, r1\n\ + str r1, [sp]\n\ + mov r0, r8\n\ + str r0, [sp, 0x4]\n\ + str r7, [sp, 0x8]\n\ + movs r0, 0\n\ + movs r1, 0x1\n\ + adds r2, r5, 0\n\ + movs r3, 0x4\n\ + bl AddTextPrinterParameterized\n\ + ldr r5, =gText_MoveRelearnerPower\n\ + movs r0, 0x1\n\ + adds r1, r5, 0\n\ + movs r2, 0x6A\n\ + bl GetStringRightAlignXOffset\n\ + adds r4, r0, 0\n\ + lsls r3, r4, 24\n\ + lsrs r3, 24\n\ + movs r1, 0x19\n\ + str r1, [sp]\n\ + mov r0, r8\n\ + str r0, [sp, 0x4]\n\ + str r7, [sp, 0x8]\n\ + movs r0, 0\n\ + movs r1, 0x1\n\ + adds r2, r5, 0\n\ + bl AddTextPrinterParameterized\n\ + ldr r5, =gText_MoveRelearnerAccuracy\n\ + movs r0, 0x1\n\ + adds r1, r5, 0\n\ + movs r2, 0x6A\n\ + bl GetStringRightAlignXOffset\n\ + adds r4, r0, 0\n\ + lsls r3, r4, 24\n\ + lsrs r3, 24\n\ + mov r1, r10\n\ + str r1, [sp]\n\ + mov r0, r8\n\ + str r0, [sp, 0x4]\n\ + str r7, [sp, 0x8]\n\ + movs r0, 0\n\ + movs r1, 0x1\n\ + adds r2, r5, 0\n\ + bl AddTextPrinterParameterized\n\ + movs r0, 0x2\n\ + negs r0, r0\n\ + cmp r9, r0\n\ + bne _081D29C4\n\ + movs r0, 0\n\ + movs r1, 0x2\n\ + bl CopyWindowToVram\n\ + b _081D2AB6\n\ + .pool\n\ +_081D29C4:\n\ + mov r1, r9\n\ + lsls r0, r1, 1\n\ + add r0, r9\n\ + lsls r0, 2\n\ + ldr r1, =gBattleMoves\n\ + adds r6, r0, r1\n\ + ldrb r1, [r6, 0x2]\n\ + lsls r0, r1, 3\n\ + subs r0, r1\n\ + ldr r1, =gTypeNames\n\ + adds r5, r0, r1\n\ + movs r0, 0x19\n\ + str r0, [sp]\n\ + mov r1, r8\n\ + str r1, [sp, 0x4]\n\ + str r7, [sp, 0x8]\n\ + movs r0, 0\n\ + movs r1, 0x1\n\ + adds r2, r5, 0\n\ + movs r3, 0x4\n\ + bl AddTextPrinterParameterized\n\ + ldr r1, =gText_MoveRelearnerPP\n\ + movs r0, 0x1\n\ + movs r2, 0\n\ + bl GetStringWidth\n\ + adds r4, r0, 0x4\n\ + ldrb r1, [r6, 0x4]\n\ + add r0, sp, 0xC\n\ + movs r2, 0\n\ + movs r3, 0x2\n\ + bl ConvertIntToDecimalStringN\n\ + lsls r3, r4, 24\n\ + lsrs r3, 24\n\ + mov r0, r10\n\ + str r0, [sp]\n\ + mov r1, r8\n\ + str r1, [sp, 0x4]\n\ + str r7, [sp, 0x8]\n\ + movs r0, 0\n\ + movs r1, 0x1\n\ + add r2, sp, 0xC\n\ + bl AddTextPrinterParameterized\n\ + ldrb r0, [r6, 0x1]\n\ + cmp r0, 0x1\n\ + bhi _081D2A3C\n\ + ldr r5, =gText_ThreeDashes\n\ + b _081D2A4A\n\ + .pool\n\ +_081D2A3C:\n\ + ldrb r1, [r6, 0x1]\n\ + add r0, sp, 0xC\n\ + movs r2, 0\n\ + movs r3, 0x3\n\ + bl ConvertIntToDecimalStringN\n\ + add r5, sp, 0xC\n\ +_081D2A4A:\n\ + movs r0, 0x19\n\ + str r0, [sp]\n\ + movs r0, 0xFF\n\ + str r0, [sp, 0x4]\n\ + movs r0, 0\n\ + str r0, [sp, 0x8]\n\ + movs r1, 0x1\n\ + adds r2, r5, 0\n\ + movs r3, 0x6A\n\ + bl AddTextPrinterParameterized\n\ + ldrb r0, [r6, 0x3]\n\ + cmp r0, 0\n\ + bne _081D2A70\n\ + ldr r5, =gText_ThreeDashes\n\ + b _081D2A7E\n\ + .pool\n\ +_081D2A70:\n\ + ldrb r1, [r6, 0x3]\n\ + add r0, sp, 0xC\n\ + movs r2, 0\n\ + movs r3, 0x3\n\ + bl ConvertIntToDecimalStringN\n\ + add r5, sp, 0xC\n\ +_081D2A7E:\n\ + movs r0, 0x29\n\ + str r0, [sp]\n\ + movs r0, 0xFF\n\ + str r0, [sp, 0x4]\n\ + movs r4, 0\n\ + str r4, [sp, 0x8]\n\ + movs r0, 0\n\ + movs r1, 0x1\n\ + adds r2, r5, 0\n\ + movs r3, 0x6A\n\ + bl AddTextPrinterParameterized\n\ + ldr r1, =gMoveDescriptionPointers\n\ + mov r0, r9\n\ + subs r0, 0x1\n\ + lsls r0, 2\n\ + adds r0, r1\n\ + ldr r5, [r0]\n\ + movs r0, 0x41\n\ + str r0, [sp]\n\ + str r4, [sp, 0x4]\n\ + str r4, [sp, 0x8]\n\ + movs r0, 0\n\ + movs r1, 0x7\n\ + adds r2, r5, 0\n\ + movs r3, 0\n\ + bl AddTextPrinterParameterized\n\ +_081D2AB6:\n\ + add sp, 0x2C\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ + .syntax divided"); +#endif +} + +NAKED +void MoveRelearnerMenuLoadContestMoveDescription(u32 chosenMove) +{ +#ifdef NONMATCHING + //u8 offset; + const u8 *labelStr; + const struct ContestMove *move; + u8 category; + const u8 **temp; + + MoveRelearnerShowHideHearts(chosenMove); + FillWindowPixelBuffer(1, 0x11); + labelStr = gText_MoveRelearnerContestMovesTitle; + // GCC compiles these as: + // add r3, r0, 0 + // lsls r3, r3, 24 + // lsrs r3, r3, 24 + // But in the original asm: + // lsls r3, r0, 24 + // lsrs r3, r3, 24 + //offset = GetStringCenterAlignXOffset(1, labelStr, 0x80); + AddTextPrinterParameterized(1, 1, labelStr, GetStringCenterAlignXOffset(1, labelStr, 0x80), 1, TEXT_SPEED_FF, NULL); + + labelStr = gText_MoveRelearnerAppeal; + //offset = GetStringRightAlignXOffset(1, labelStr, 0x5C); + AddTextPrinterParameterized(1, 1, labelStr, GetStringCenterAlignXOffset(1, labelStr, 0x5C), 0x19, TEXT_SPEED_FF, NULL); + + labelStr = gText_MoveRelearnerJam; + //offset = GetStringRightAlignXOffset(1, labelStr, 0x5C); + AddTextPrinterParameterized(1, 1, labelStr, GetStringCenterAlignXOffset(1, labelStr, 0x5C), 0x29, TEXT_SPEED_FF, NULL); + + if (chosenMove == MENU_NOTHING_CHOSEN) + { + CopyWindowToVram(1, 2); + return; + } + + move = &gContestMoves[chosenMove]; + temp = (const u8**)gContestMoveTypeTextPointers; + category = move->contestCategory; + labelStr = temp[category]; + AddTextPrinterParameterized(1, 1, labelStr, 4, 0x19, TEXT_SPEED_FF, NULL); + + labelStr = gContestEffectDescriptionPointers[move->effect]; + AddTextPrinterParameterized(1, 1, labelStr, 0, 0x41, TEXT_SPEED_FF, NULL); + + CopyWindowToVram(1, 2); +#else + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r8\n\ + push {r7}\n\ + sub sp, 0xC\n\ + adds r4, r0, 0\n\ + bl MoveRelearnerShowHideHearts\n\ + movs r0, 0x1\n\ + movs r1, 0x11\n\ + bl FillWindowPixelBuffer\n\ + ldr r5, =gText_MoveRelearnerContestMovesTitle\n\ + movs r0, 0x1\n\ + adds r1, r5, 0\n\ + movs r2, 0x80\n\ + bl GetStringCenterAlignXOffset\n\ + lsls r3, r0, 24\n\ + lsrs r3, 24\n\ + movs r0, 0x1\n\ + str r0, [sp]\n\ + movs r7, 0xFF\n\ + str r7, [sp, 0x4]\n\ + movs r6, 0\n\ + str r6, [sp, 0x8]\n\ + movs r1, 0x1\n\ + adds r2, r5, 0\n\ + bl AddTextPrinterParameterized\n\ + ldr r5, =gText_MoveRelearnerAppeal\n\ + movs r0, 0x1\n\ + adds r1, r5, 0\n\ + movs r2, 0x5C\n\ + bl GetStringRightAlignXOffset\n\ + lsls r3, r0, 24\n\ + lsrs r3, 24\n\ + movs r0, 0x19\n\ + mov r8, r0\n\ + str r0, [sp]\n\ + str r7, [sp, 0x4]\n\ + str r6, [sp, 0x8]\n\ + movs r0, 0x1\n\ + movs r1, 0x1\n\ + adds r2, r5, 0\n\ + bl AddTextPrinterParameterized\n\ + ldr r5, =gText_MoveRelearnerJam\n\ + movs r0, 0x1\n\ + adds r1, r5, 0\n\ + movs r2, 0x5C\n\ + bl GetStringRightAlignXOffset\n\ + lsls r3, r0, 24\n\ + lsrs r3, 24\n\ + movs r0, 0x29\n\ + str r0, [sp]\n\ + str r7, [sp, 0x4]\n\ + str r6, [sp, 0x8]\n\ + movs r0, 0x1\n\ + movs r1, 0x1\n\ + adds r2, r5, 0\n\ + bl AddTextPrinterParameterized\n\ + movs r0, 0x2\n\ + negs r0, r0\n\ + cmp r4, r0\n\ + bne _081D2B6C\n\ + movs r0, 0x1\n\ + movs r1, 0x2\n\ + bl CopyWindowToVram\n\ + b _081D2BB8\n\ + .pool\n\ +_081D2B6C:\n\ + lsls r4, 3\n\ + ldr r0, =gContestMoves\n\ + adds r4, r0\n\ + ldr r1, =gContestMoveTypeTextPointers\n\ + ldrb r0, [r4, 0x1]\n\ + lsls r0, 29\n\ + lsrs r0, 27\n\ + adds r0, r1\n\ + ldr r5, [r0]\n\ + mov r0, r8\n\ + str r0, [sp]\n\ + str r7, [sp, 0x4]\n\ + str r6, [sp, 0x8]\n\ + movs r0, 0x1\n\ + movs r1, 0x1\n\ + adds r2, r5, 0\n\ + movs r3, 0x4\n\ + bl AddTextPrinterParameterized\n\ + ldr r1, =gContestEffectDescriptionPointers\n\ + ldrb r0, [r4]\n\ + lsls r0, 2\n\ + adds r0, r1\n\ + ldr r5, [r0]\n\ + movs r0, 0x41\n\ + str r0, [sp]\n\ + str r7, [sp, 0x4]\n\ + str r6, [sp, 0x8]\n\ + movs r0, 0x1\n\ + movs r1, 0x7\n\ + adds r2, r5, 0\n\ + movs r3, 0\n\ + bl AddTextPrinterParameterized\n\ + movs r0, 0x1\n\ + movs r1, 0x2\n\ + bl CopyWindowToVram\n\ +_081D2BB8:\n\ + add sp, 0xC\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ + .syntax divided"); +#endif +} + +void MoveRelearnerCursorCallback(s32 itemIndex, bool8 onInit, struct ListMenu *list) +{ + if (onInit != TRUE) + PlaySE(SE_SELECT); + MoveRelearnerLoadBattleMoveDescription(itemIndex); + MoveRelearnerMenuLoadContestMoveDescription(itemIndex); +} + +void MoveRelearnerPrintText(u8 *text) +{ + u8 speed; + + FillWindowPixelBuffer(3, 0x11); + gTextFlags.canABSpeedUpPrint = TRUE; + speed = GetPlayerTextSpeedDelay(); + AddTextPrinterParameterized2(3, 1, text, speed, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, 3); +} + +bool16 MoveRelearnerRunTextPrinters(void) +{ + RunTextPrinters(); + return IsTextPrinterActive(3); +} + +void MoveRelearnerCreateYesNoMenu(void) +{ + CreateYesNoMenu(&gMoveRelearnerYesNoMenuTemplate, 1, 0xE, 0); } \ No newline at end of file diff --git a/src/move_relearner.c b/src/move_relearner.c index 1766476ccd..8576c5e688 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -12,10 +12,10 @@ #include "alloc.h" #include "menu.h" #include "menu_helpers.h" +#include "menu_unknown.h" #include "overworld.h" #include "palette.h" #include "pokemon_summary_screen.h" -#include "pokenav.h" #include "script.h" #include "sound.h" #include "sprite.h" diff --git a/src/strings.c b/src/strings.c index bed8f4b682..577d26f5c3 100644 --- a/src/strings.c +++ b/src/strings.c @@ -1751,14 +1751,14 @@ const u8 gText_MoveRelearnerPkmnForgotMoveAndLearnedNew[] = _("{STR_VAR_1} forgo const u8 gUnknown_085EF9C8[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}."); const u8 gText_MoveRelearnerGiveUp[] = _("Give up trying to teach a new\nmove to {STR_VAR_1}?"); const u8 gText_MoveRelearnerWhichMoveToForget[] = _("Which move should be\nforgotten?\p"); -const u8 gText_BattleMoves2[] = _("BATTLE MOVES"); -const u8 gText_ContestMoves2[] = _("CONTEST MOVES"); +const u8 gText_MoveRelearnerBattleMoves[] = _("BATTLE MOVES"); +const u8 gText_MoveRelearnerContestMovesTitle[] = _("CONTEST MOVES"); const u8 gUnknown_085EFA4C[] = _("TYPE/"); -const u8 gText_PPSlash[] = _("PP/"); -const u8 gText_PowerSlash[] = _("POWER/"); -const u8 gText_AccuracySlash[] = _("ACCURACY/"); -const u8 gText_Appeal2[] = _("APPEAL"); -const u8 gText_Jam2[] = _("JAM"); +const u8 gText_MoveRelearnerPP[] = _("PP/"); +const u8 gText_MoveRelearnerPower[] = _("POWER/"); +const u8 gText_MoveRelearnerAccuracy[] = _("ACCURACY/"); +const u8 gText_MoveRelearnerAppeal[] = _("APPEAL"); +const u8 gText_MoveRelearnerJam[] = _("JAM"); const u8 gText_Kira[] = _("KIRA"); const u8 gText_Amy[] = _("AMY"); const u8 gText_John[] = _("JOHN"); From af182d6f168afbb7c8c35fe9240ecf931099d06e Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 8 Mar 2019 02:10:44 -0500 Subject: [PATCH 194/217] Minor cleanup before pushing --- include/menu_unknown.h | 8 ++-- src/menu_unknown.c | 83 +++++++++++++++--------------------------- src/move_relearner.c | 2 +- 3 files changed, 34 insertions(+), 59 deletions(-) diff --git a/include/menu_unknown.h b/include/menu_unknown.h index a442ec3184..2eefb5971d 100644 --- a/include/menu_unknown.h +++ b/include/menu_unknown.h @@ -25,10 +25,10 @@ struct UnknownStruct_81D1ED4 u8 unk356[0x22]; }; -bool8 sub_81D1C44(u8 a0); +bool8 sub_81D1C44(u8 count); u8 sub_81D1C84(u8 a0); -u8 sub_81D1DC0(struct PlayerPCItemPageStruct *a0); -void sub_81D1E90(struct PlayerPCItemPageStruct *a0); +u8 sub_81D1DC0(struct PlayerPCItemPageStruct *page); +void sub_81D1E90(struct PlayerPCItemPageStruct *page); void sub_81D1EC0(void); void sub_81D1D04(u8 a0); void DrawLevelUpWindowPg1(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); @@ -42,7 +42,7 @@ void sub_81D3464(void *arg0); void sub_81D3480(void *arg0, u8 arg1); void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]); -void MoveRelearnerPrintText(u8 *text); +void MoveRelearnerPrintText(u8 *str); bool16 MoveRelearnerRunTextPrinters(void); void MoveRelearnerCreateYesNoMenu(void); u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices); diff --git a/src/menu_unknown.c b/src/menu_unknown.c index 78b2cc8d59..21e19caccf 100644 --- a/src/menu_unknown.c +++ b/src/menu_unknown.c @@ -21,22 +21,18 @@ #include "constants/songs.h" #include "gba/io_reg.h" -#define WINDOW_UNK_0 0 -#define WINDOW_UNK_1 1 -#define WINDOW_UNK_2 2 - EWRAM_DATA static u8 sUnknown_0203CF48[3] = {0}; EWRAM_DATA static struct ListMenuItem *sUnknown_0203CF4C = NULL; -void sub_81D1E7C(s32 itemIndex, bool8 onInit, struct ListMenu *list); -void sub_81D24A4(struct UnknownStruct_81D1ED4 *a0); -void sub_81D2634(struct UnknownStruct_81D1ED4 *a0); -void MoveRelearnerCursorCallback(s32 itemIndex, bool8 onInit, struct ListMenu *list); -extern void nullsub_79(void); +static void sub_81D1E7C(s32 itemIndex, bool8 onInit, struct ListMenu *list); +static void sub_81D24A4(struct UnknownStruct_81D1ED4 *a0); +static void sub_81D2634(struct UnknownStruct_81D1ED4 *a0); +static void MoveRelearnerCursorCallback(s32 itemIndex, bool8 onInit, struct ListMenu *list); +static void nullsub_79(void); static const struct WindowTemplate sUnknown_086253E8[] = { - [WINDOW_UNK_0] = { + { .bg = 0, .tilemapLeft = 1, .tilemapTop = 1, @@ -45,7 +41,7 @@ static const struct WindowTemplate sUnknown_086253E8[] = .paletteNum = 0xF, .baseBlock = 0x8 }, - [WINDOW_UNK_1] = { + { .bg = 0, .tilemapLeft = 21, .tilemapTop = 1, @@ -54,7 +50,7 @@ static const struct WindowTemplate sUnknown_086253E8[] = .paletteNum = 0xF, .baseBlock = 0x18 }, - [WINDOW_UNK_2] = { + { .bg = 0, .tilemapLeft = 1, .tilemapTop = 1, @@ -119,7 +115,7 @@ static const u8 sUnknown_08625410[] = }; -const struct WindowTemplate gMoveRelearnerWindowTemplates[] = +static const struct WindowTemplate sMoveRelearnerWindowTemplates[] = { { .bg = 1, @@ -169,7 +165,7 @@ const struct WindowTemplate gMoveRelearnerWindowTemplates[] = DUMMY_WIN_TEMPLATE }; -const struct WindowTemplate gMoveRelearnerYesNoMenuTemplate = +static const struct WindowTemplate sMoveRelearnerYesNoMenuTemplate = { .bg = 0, .tilemapLeft = 22, @@ -181,7 +177,7 @@ const struct WindowTemplate gMoveRelearnerYesNoMenuTemplate = }; -const struct ListMenuTemplate gMoveRelearnerMovesListTemplate = +static const struct ListMenuTemplate sMoveRelearnerMovesListTemplate = { .items = NULL, .moveCursorFunc = MoveRelearnerCursorCallback, @@ -228,16 +224,16 @@ u8 sub_81D1C84(u8 a0) u8 windowId = sUnknown_0203CF48[a0]; if (windowId == 0xFF) { - if (a0 == WINDOW_UNK_2) + if (a0 == 2) { u32 v1; u32 v2; s32 v3; - template = sUnknown_086253E8[WINDOW_UNK_2]; + template = sUnknown_086253E8[2]; v3 = GetMaxWidthInMenuTable(&gMailboxMailOptions[0], 4); template.width = v3; - sUnknown_0203CF48[WINDOW_UNK_2] = AddWindow(&template); + sUnknown_0203CF48[2] = AddWindow(&template); } else { @@ -256,12 +252,12 @@ void sub_81D1D04(u8 a0) sUnknown_0203CF48[a0] = 0xFF; } -u8 sub_81D1D34(u8 a0) +static u8 sub_81D1D34(u8 a0) { return sUnknown_0203CF48[a0]; } -void sub_81D1D44(u8 windowId, s32 itemId, u8 y) +static void sub_81D1D44(u8 windowId, s32 itemId, u8 y) { u8 buffer[30]; u16 length; @@ -310,7 +306,7 @@ u8 sub_81D1DC0(struct PlayerPCItemPageStruct *page) return ListMenuInit(&gMultiuseListMenuTemplate, page->itemsAbove, page->cursorPos); } -void sub_81D1E7C(s32 itemIndex, bool8 onInit, struct ListMenu *list) +static void sub_81D1E7C(s32 itemIndex, bool8 onInit, struct ListMenu *list) { if (onInit != TRUE) PlaySE(SE_SELECT); @@ -355,27 +351,6 @@ void sub_81D1ED4(struct UnknownStruct_81D1ED4 *a0) NAKED void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]) { - /* - u16 j; - u16 i; - s16 v1; - s16 v2; - for (j = 0; j < 5; j++) - { - v1 = arg1[0][j].unk0; - v2 = (arg2[0][j].unk0 - v1) / 10; - - for (i = 0; i < 9; i++) - { - arg0->unk64[i][j].unk0 = v1 + ((v1 << 1) & 1); - } - - for (i = 0; i < 9; i++) - { - - } - } - */ asm(".syntax unified\n\ push {r4-r7,lr}\n\ mov r7, r10\n\ @@ -723,7 +698,7 @@ void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0) } NAKED -void sub_81D2278(void *a0, void *a1, u16 *a2, u16 *a3, u8 a38, u32 a3C) +static void sub_81D2278(void *a0, void *a1, u16 *a2, u16 *a3, u8 a38, u32 a3C) { #ifdef NONMATCHING // a0 => sp0 @@ -1072,7 +1047,7 @@ _081D2494:\n\ } NAKED -void sub_81D24A4(struct UnknownStruct_81D1ED4 *a0) +static void sub_81D24A4(struct UnknownStruct_81D1ED4 *a0) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -1286,7 +1261,7 @@ _081D2620:\n\ } NAKED -void sub_81D2634(struct UnknownStruct_81D1ED4 *a0) +static void sub_81D2634(struct UnknownStruct_81D1ED4 *a0) { asm(".syntax unified\n\ push {r4-r6,lr}\n\ @@ -1599,7 +1574,7 @@ void InitMoveRelearnerWindows(bool8 useContextWindow) { u8 i; - InitWindows(gMoveRelearnerWindowTemplates); + InitWindows(sMoveRelearnerWindowTemplates); DeactivateAllTextPrinters(); LoadUserWindowBorderGfx(0, 1, 0xE0); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); @@ -1627,14 +1602,14 @@ void InitMoveRelearnerWindows(bool8 useContextWindow) schedule_bg_copy_tilemap_to_vram(1); } -void nullsub_79(void) +static void nullsub_79(void) { } u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices) { - gMultiuseListMenuTemplate = gMoveRelearnerMovesListTemplate; + gMultiuseListMenuTemplate = sMoveRelearnerMovesListTemplate; gMultiuseListMenuTemplate.totalItems = numChoices; gMultiuseListMenuTemplate.items = items; @@ -1650,7 +1625,7 @@ u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices) } NAKED -void MoveRelearnerLoadBattleMoveDescription(u32 chosenMove) +static void MoveRelearnerLoadBattleMoveDescription(u32 chosenMove) { // Two small issues, and a few renamed registers. #ifdef NONMATCHING @@ -1928,7 +1903,7 @@ _081D2AB6:\n\ } NAKED -void MoveRelearnerMenuLoadContestMoveDescription(u32 chosenMove) +static void MoveRelearnerMenuLoadContestMoveDescription(u32 chosenMove) { #ifdef NONMATCHING //u8 offset; @@ -2089,7 +2064,7 @@ _081D2BB8:\n\ #endif } -void MoveRelearnerCursorCallback(s32 itemIndex, bool8 onInit, struct ListMenu *list) +static void MoveRelearnerCursorCallback(s32 itemIndex, bool8 onInit, struct ListMenu *list) { if (onInit != TRUE) PlaySE(SE_SELECT); @@ -2097,14 +2072,14 @@ void MoveRelearnerCursorCallback(s32 itemIndex, bool8 onInit, struct ListMenu *l MoveRelearnerMenuLoadContestMoveDescription(itemIndex); } -void MoveRelearnerPrintText(u8 *text) +void MoveRelearnerPrintText(u8 *str) { u8 speed; FillWindowPixelBuffer(3, 0x11); gTextFlags.canABSpeedUpPrint = TRUE; speed = GetPlayerTextSpeedDelay(); - AddTextPrinterParameterized2(3, 1, text, speed, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, 3); + AddTextPrinterParameterized2(3, 1, str, speed, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, 3); } bool16 MoveRelearnerRunTextPrinters(void) @@ -2115,5 +2090,5 @@ bool16 MoveRelearnerRunTextPrinters(void) void MoveRelearnerCreateYesNoMenu(void) { - CreateYesNoMenu(&gMoveRelearnerYesNoMenuTemplate, 1, 0xE, 0); + CreateYesNoMenu(&sMoveRelearnerYesNoMenuTemplate, 1, 0xE, 0); } \ No newline at end of file diff --git a/src/move_relearner.c b/src/move_relearner.c index 8576c5e688..7d5b518992 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -37,7 +37,7 @@ * - Creates moveDisplayArrowTask to listen to right/left buttons. * - Creates moveListScrollArrowTask to listen to up/down buttons. * - Whenever the selected move changes (and once on init), the MoveRelearnerCursorCallback - * is called (see gMoveRelearnerMovesListTemplate). That callback will reload the contest + * is called (see sMoveRelearnerMovesListTemplate). That callback will reload the contest * display and battle display windows for the new move. Both are always loaded in * memory, but only the currently active one is copied to VRAM. The exception to this * is the appeal and jam hearts, which are sprites. MoveRelearnerShowHideHearts is called From eac70acab65dea005da2299e4bb209aff1ded60f Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 8 Mar 2019 02:17:01 -0500 Subject: [PATCH 195/217] Change filename to something more descriptive --- asm/{menu_unknown.s => menu_specialized.s} | 0 data/{menu_unknown.s => menu_specialized.s} | 0 include/{menu_unknown.h => menu_specialized.h} | 6 +++--- ld_script.txt | 8 ++++---- src/{menu_unknown.c => menu_specialized.c} | 2 +- src/move_relearner.c | 2 +- src/party_menu.c | 2 +- src/player_pc.c | 2 +- src/use_pokeblock.c | 2 +- sym_ewram.txt | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) rename asm/{menu_unknown.s => menu_specialized.s} (100%) rename data/{menu_unknown.s => menu_specialized.s} (100%) rename include/{menu_unknown.h => menu_specialized.h} (94%) rename src/{menu_unknown.c => menu_specialized.c} (99%) diff --git a/asm/menu_unknown.s b/asm/menu_specialized.s similarity index 100% rename from asm/menu_unknown.s rename to asm/menu_specialized.s diff --git a/data/menu_unknown.s b/data/menu_specialized.s similarity index 100% rename from data/menu_unknown.s rename to data/menu_specialized.s diff --git a/include/menu_unknown.h b/include/menu_specialized.h similarity index 94% rename from include/menu_unknown.h rename to include/menu_specialized.h index 2eefb5971d..3012ac90a4 100644 --- a/include/menu_unknown.h +++ b/include/menu_specialized.h @@ -1,5 +1,5 @@ -#ifndef GUARD_MENU_UNKNOWN_H -#define GUARD_MENU_UNKNOWN_H +#ifndef GUARD_MENU_SPECIALIZED_H +#define GUARD_MENU_SPECIALIZED_H #include "player_pc.h" #include "list_menu.h" @@ -48,4 +48,4 @@ void MoveRelearnerCreateYesNoMenu(void); u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices); void InitMoveRelearnerWindows(bool8 useContextWindow); -#endif // GUARD_MENU_UNKNOWN_H \ No newline at end of file +#endif // GUARD_MENU_SPECIALIZED_H \ No newline at end of file diff --git a/ld_script.txt b/ld_script.txt index 4c12291fe9..25ab0de58e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -291,8 +291,8 @@ SECTIONS { src/pokenav.o(.text); asm/pokenav.o(.text); src/pokenav_match_call.o(.text); - src/menu_unknown.o(.text); - asm/menu_unknown.o(.text); + src/menu_specialized.o(.text); + asm/menu_specialized.o(.text); asm/rom_81D1C44.o(.text); src/trainer_hill.o(.text); src/rayquaza_scene.o(.text); @@ -596,8 +596,8 @@ SECTIONS { src/pokenav.o(.rodata); data/pokenav.o(.rodata); src/pokenav_match_call.o(.rodata); - src/menu_unknown.o(.rodata); - data/menu_unknown.o(.rodata); + src/menu_specialized.o(.rodata); + data/menu_specialized.o(.rodata); data/rom_81D1C44.o(.rodata); src/trainer_hill.o(.rodata); src/rayquaza_scene.o(.rodata); diff --git a/src/menu_unknown.c b/src/menu_specialized.c similarity index 99% rename from src/menu_unknown.c rename to src/menu_specialized.c index 21e19caccf..d9b2270f45 100644 --- a/src/menu_unknown.c +++ b/src/menu_specialized.c @@ -6,7 +6,7 @@ #include "menu.h" #include "international_string_util.h" #include "menu.h" -#include "menu_unknown.h" +#include "menu_specialized.h" #include "move_relearner.h" #include "palette.h" #include "player_pc.h" diff --git a/src/move_relearner.c b/src/move_relearner.c index 7d5b518992..e148b9ace0 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -12,7 +12,7 @@ #include "alloc.h" #include "menu.h" #include "menu_helpers.h" -#include "menu_unknown.h" +#include "menu_specialized.h" #include "overworld.h" #include "palette.h" #include "pokemon_summary_screen.h" diff --git a/src/party_menu.c b/src/party_menu.c index 7e47cbf808..71609bf9ee 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -37,7 +37,7 @@ #include "main.h" #include "menu.h" #include "menu_helpers.h" -#include "menu_unknown.h" +#include "menu_specialized.h" #include "metatile_behavior.h" #include "overworld.h" #include "palette.h" diff --git a/src/player_pc.c b/src/player_pc.c index f167062cb4..38f556b28a 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -28,7 +28,7 @@ #include "strings.h" #include "task.h" #include "window.h" -#include "menu_unknown.h" +#include "menu_specialized.h" // structures struct Struct203BCC4 diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 75e8da3f87..b06d0cba96 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -4,7 +4,7 @@ #include "alloc.h" #include "palette.h" #include "pokenav.h" -#include "menu_unknown.h" +#include "menu_specialized.h" #include "scanline_effect.h" #include "text.h" #include "bg.h" diff --git a/sym_ewram.txt b/sym_ewram.txt index f6db45f6d9..215560111c 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -237,7 +237,7 @@ gUnknown_0203CF40: @ 203CF40 gUnknown_0203CF44: @ 203CF44 .space 0x4 - .include "src/menu_unknown.o" + .include "src/menu_specialized.o" gUnknown_0203CF50: @ 203CF50 .space 0x4 From eaddf396b2b19e342a03585f0527906aa7dcecd5 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 8 Mar 2019 02:35:19 -0500 Subject: [PATCH 196/217] I was dumb and forgot to add merge fixes --- src/menu_specialized.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/menu_specialized.c b/src/menu_specialized.c index d9b2270f45..bf5d2ec564 100644 --- a/src/menu_specialized.c +++ b/src/menu_specialized.c @@ -246,7 +246,7 @@ u8 sub_81D1C84(u8 a0) void sub_81D1D04(u8 a0) { - sub_8198070(sUnknown_0203CF48[a0], 0); + ClearStdWindowAndFrameToTransparent(sUnknown_0203CF48[a0], 0); ClearWindowTilemap(sUnknown_0203CF48[a0]); RemoveWindow(sUnknown_0203CF48[a0]); sUnknown_0203CF48[a0] = 0xFF; @@ -1587,17 +1587,17 @@ void InitMoveRelearnerWindows(bool8 useContextWindow) if (!useContextWindow) { PutWindowTilemap(0); - SetWindowBorderStyle(0, 0, 0x1, 0xE); + DrawStdFrameWithCustomTileAndPalette(0, 0, 0x1, 0xE); } else { PutWindowTilemap(1); - SetWindowBorderStyle(1, 0, 1, 0xE); + DrawStdFrameWithCustomTileAndPalette(1, 0, 1, 0xE); } PutWindowTilemap(2); PutWindowTilemap(3); - SetWindowBorderStyle(2, 0, 1, 0xE); - SetWindowBorderStyle(3, 0, 1, 0xE); + DrawStdFrameWithCustomTileAndPalette(2, 0, 1, 0xE); + DrawStdFrameWithCustomTileAndPalette(3, 0, 1, 0xE); nullsub_79(); schedule_bg_copy_tilemap_to_vram(1); } From 146c194b0c638693270d6e4eac490e33a9dbb8fd Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 8 Mar 2019 03:12:08 -0500 Subject: [PATCH 197/217] Actually change the variable name this time --- src/pokemon_summary_screen.c | 662 +++++++++++++++++------------------ 1 file changed, 331 insertions(+), 331 deletions(-) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 01cafb100e..3bbc832a07 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -160,7 +160,7 @@ static EWRAM_DATA struct PokemonSummaryScreenData bool8 unk40EF; s16 switchCounter; // Used for various switch statement cases that decompress/load graphics or pokemon data u8 unk_filler4[6]; -} *sMonSummaryScreenData = NULL; +} *sMonSummaryScreen = NULL; EWRAM_DATA u8 gLastViewedMonIndex = 0; static EWRAM_DATA u8 sUnknown_0203CF21 = 0; ALIGNED(4) static EWRAM_DATA u8 sUnknownTaskId = 0; @@ -1047,38 +1047,38 @@ static const u16 sSummaryMarkingsPalette[] = INCBIN_U16("graphics/interface/summ // code void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)) { - sMonSummaryScreenData = AllocZeroed(sizeof(*sMonSummaryScreenData)); - sMonSummaryScreenData->mode = mode; - sMonSummaryScreenData->monList.mons = mons; - sMonSummaryScreenData->curMonIndex = monIndex; - sMonSummaryScreenData->maxMonIndex = maxMonIndex; - sMonSummaryScreenData->callback = callback; + sMonSummaryScreen = AllocZeroed(sizeof(*sMonSummaryScreen)); + sMonSummaryScreen->mode = mode; + sMonSummaryScreen->monList.mons = mons; + sMonSummaryScreen->curMonIndex = monIndex; + sMonSummaryScreen->maxMonIndex = maxMonIndex; + sMonSummaryScreen->callback = callback; if (mode == PSS_MODE_BOX) - sMonSummaryScreenData->isBoxMon = TRUE; + sMonSummaryScreen->isBoxMon = TRUE; else - sMonSummaryScreenData->isBoxMon = FALSE; + sMonSummaryScreen->isBoxMon = FALSE; switch (mode) { case PSS_MODE_NORMAL: case PSS_MODE_BOX: - sMonSummaryScreenData->minPageIndex = 0; - sMonSummaryScreenData->maxPageIndex = 3; + sMonSummaryScreen->minPageIndex = 0; + sMonSummaryScreen->maxPageIndex = 3; break; case PSS_MODE_UNK1: - sMonSummaryScreenData->minPageIndex = 0; - sMonSummaryScreenData->maxPageIndex = 3; - sMonSummaryScreenData->unk40C8 = TRUE; + sMonSummaryScreen->minPageIndex = 0; + sMonSummaryScreen->maxPageIndex = 3; + sMonSummaryScreen->unk40C8 = TRUE; break; case PSS_MODE_SELECT_MOVE: - sMonSummaryScreenData->minPageIndex = 2; - sMonSummaryScreenData->maxPageIndex = 3; - sMonSummaryScreenData->lockMonFlag = TRUE; + sMonSummaryScreen->minPageIndex = 2; + sMonSummaryScreen->maxPageIndex = 3; + sMonSummaryScreen->lockMonFlag = TRUE; break; } - sMonSummaryScreenData->currPageIndex = sMonSummaryScreenData->minPageIndex; + sMonSummaryScreen->currPageIndex = sMonSummaryScreen->minPageIndex; SummaryScreen_SetUnknownTaskId(-1); if (gMonSpritesGfxPtr == 0) @@ -1090,13 +1090,13 @@ void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void ShowSelectMovePokemonSummaryScreen(struct Pokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void), u16 newMove) { ShowPokemonSummaryScreen(PSS_MODE_SELECT_MOVE, mons, monIndex, maxMonIndex, callback); - sMonSummaryScreenData->newMove = newMove; + sMonSummaryScreen->newMove = newMove; } void ShowPokemonSummaryScreenSet40EF(u8 mode, struct BoxPokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)) { ShowPokemonSummaryScreen(mode, mons, monIndex, maxMonIndex, callback); - sMonSummaryScreenData->unk40EF = TRUE; + sMonSummaryScreen->unk40EF = TRUE; } static void SummaryScreen_MainCB2(void) @@ -1149,7 +1149,7 @@ static bool8 SummaryScreen_LoadGraphics(void) break; case 5: InitBGs(); - sMonSummaryScreenData->switchCounter = 0; + sMonSummaryScreen->switchCounter = 0; gMain.state++; break; case 6: @@ -1165,12 +1165,12 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 9: - CopyMonToSummaryStruct(&sMonSummaryScreenData->currentMon); - sMonSummaryScreenData->switchCounter = 0; + CopyMonToSummaryStruct(&sMonSummaryScreen->currentMon); + sMonSummaryScreen->switchCounter = 0; gMain.state++; break; case 10: - if (ExtractMonDataToSummaryStruct(&sMonSummaryScreenData->currentMon) != 0) + if (ExtractMonDataToSummaryStruct(&sMonSummaryScreen->currentMon) != 0) gMain.state++; break; case 11: @@ -1182,7 +1182,7 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 13: - PrintPageSpecificText(sMonSummaryScreenData->currPageIndex); + PrintPageSpecificText(sMonSummaryScreen->currPageIndex); gMain.state++; break; case 14: @@ -1190,29 +1190,29 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 15: - CreatePageWindowTilemaps(sMonSummaryScreenData->currPageIndex); + CreatePageWindowTilemaps(sMonSummaryScreen->currPageIndex); gMain.state++; break; case 16: ResetSpriteIds(); CreateMoveTypeIcons(); - sMonSummaryScreenData->switchCounter = 0; + sMonSummaryScreen->switchCounter = 0; gMain.state++; break; case 17: - sMonSummaryScreenData->spriteIds[0] = CreatePokemonSprite(&sMonSummaryScreenData->currentMon, &sMonSummaryScreenData->switchCounter); - if (sMonSummaryScreenData->spriteIds[0] != 0xFF) + sMonSummaryScreen->spriteIds[0] = CreatePokemonSprite(&sMonSummaryScreen->currentMon, &sMonSummaryScreen->switchCounter); + if (sMonSummaryScreen->spriteIds[0] != 0xFF) { - sMonSummaryScreenData->switchCounter = 0; + sMonSummaryScreen->switchCounter = 0; gMain.state++; } break; case 18: - CreateMonMarkingsSprite(&sMonSummaryScreenData->currentMon); + CreateMonMarkingsSprite(&sMonSummaryScreen->currentMon); gMain.state++; break; case 19: - CreateCaughtBallSprite(&sMonSummaryScreenData->currentMon); + CreateCaughtBallSprite(&sMonSummaryScreen->currentMon); gMain.state++; break; case 20: @@ -1224,7 +1224,7 @@ static bool8 SummaryScreen_LoadGraphics(void) gMain.state++; break; case 22: - if (sMonSummaryScreenData->mode != PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreen->mode != PSS_MODE_SELECT_MOVE) CreateTask(HandleInput, 0); else CreateTask(sub_81C171C, 0); @@ -1251,9 +1251,9 @@ static void InitBGs(void) { ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sUnknown_0861CBB4, ARRAY_COUNT(sUnknown_0861CBB4)); - SetBgTilemapBuffer(1, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0]); - SetBgTilemapBuffer(2, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_SKILLS][0]); - SetBgTilemapBuffer(3, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][0]); + SetBgTilemapBuffer(1, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0]); + SetBgTilemapBuffer(2, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_SKILLS][0]); + SetBgTilemapBuffer(3, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0]); ResetAllBgsCoordinates(); schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(2); @@ -1268,64 +1268,64 @@ static void InitBGs(void) static bool8 SummaryScreen_DecompressGraphics(void) { - switch (sMonSummaryScreenData->switchCounter) + switch (sMonSummaryScreen->switchCounter) { case 0: reset_temp_tile_data_buffers(); decompress_and_copy_tile_data_to_vram(1, &gStatusScreenBitmap, 0, 0, 0); - sMonSummaryScreenData->switchCounter++; + sMonSummaryScreen->switchCounter++; break; case 1: if (free_temp_tile_data_buffers_if_possible() != 1) { - LZDecompressWram(gPageInfoTilemap, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][0]); - sMonSummaryScreenData->switchCounter++; + LZDecompressWram(gPageInfoTilemap, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0]); + sMonSummaryScreen->switchCounter++; } break; case 2: - LZDecompressWram(gUnknown_08D98CC8, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][1]); - sMonSummaryScreenData->switchCounter++; + LZDecompressWram(gUnknown_08D98CC8, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][1]); + sMonSummaryScreen->switchCounter++; break; case 3: - LZDecompressWram(gPageSkillsTilemap, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_SKILLS][1]); - sMonSummaryScreenData->switchCounter++; + LZDecompressWram(gPageSkillsTilemap, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_SKILLS][1]); + sMonSummaryScreen->switchCounter++; break; case 4: - LZDecompressWram(gPageBattleMovesTilemap, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][1]); - sMonSummaryScreenData->switchCounter++; + LZDecompressWram(gPageBattleMovesTilemap, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][1]); + sMonSummaryScreen->switchCounter++; break; case 5: - LZDecompressWram(gPageContestMovesTilemap, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1]); - sMonSummaryScreenData->switchCounter++; + LZDecompressWram(gPageContestMovesTilemap, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1]); + sMonSummaryScreen->switchCounter++; break; case 6: LoadCompressedPalette(gStatusScreenPalette, 0, 0x100); LoadPalette(&gUnknown_08D85620, 0x81, 0x1E); - sMonSummaryScreenData->switchCounter++; + sMonSummaryScreen->switchCounter++; break; case 7: LoadCompressedSpriteSheet(&sSpriteSheet_MoveTypes); - sMonSummaryScreenData->switchCounter++; + sMonSummaryScreen->switchCounter++; break; case 8: LoadCompressedSpriteSheet(&sMoveSelectorSpriteSheet); - sMonSummaryScreenData->switchCounter++; + sMonSummaryScreen->switchCounter++; break; case 9: LoadCompressedSpriteSheet(&sStatusIconsSpriteSheet); - sMonSummaryScreenData->switchCounter++; + sMonSummaryScreen->switchCounter++; break; case 10: LoadCompressedSpritePalette(&sStatusIconsSpritePalette); - sMonSummaryScreenData->switchCounter++; + sMonSummaryScreen->switchCounter++; break; case 11: LoadCompressedSpritePalette(&gUnknown_0861D07C); - sMonSummaryScreenData->switchCounter++; + sMonSummaryScreen->switchCounter++; break; case 12: LoadCompressedPalette(gMoveTypes_Pal, 0x1D0, 0x60); - sMonSummaryScreenData->switchCounter = 0; + sMonSummaryScreen->switchCounter = 0; return TRUE; } return FALSE; @@ -1333,24 +1333,24 @@ static bool8 SummaryScreen_DecompressGraphics(void) static void CopyMonToSummaryStruct(struct Pokemon *mon) { - if (!sMonSummaryScreenData->isBoxMon) + if (!sMonSummaryScreen->isBoxMon) { - struct Pokemon *partyMon = sMonSummaryScreenData->monList.mons; - *mon = partyMon[sMonSummaryScreenData->curMonIndex]; + struct Pokemon *partyMon = sMonSummaryScreen->monList.mons; + *mon = partyMon[sMonSummaryScreen->curMonIndex]; } else { - struct BoxPokemon *boxMon = sMonSummaryScreenData->monList.boxMons; - BoxMonToMon(&boxMon[sMonSummaryScreenData->curMonIndex], mon); + struct BoxPokemon *boxMon = sMonSummaryScreen->monList.boxMons; + BoxMonToMon(&boxMon[sMonSummaryScreen->curMonIndex], mon); } } static bool8 ExtractMonDataToSummaryStruct(struct Pokemon *mon) { u32 i; - struct PokeSummary *sum = &sMonSummaryScreenData->summary; + struct PokeSummary *sum = &sMonSummaryScreen->summary; // Spread the data extraction over multiple frames. - switch (sMonSummaryScreenData->switchCounter) + switch (sMonSummaryScreen->switchCounter) { case 0: sum->species = GetMonData(mon, MON_DATA_SPECIES); @@ -1377,7 +1377,7 @@ static bool8 ExtractMonDataToSummaryStruct(struct Pokemon *mon) sum->ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES); break; case 2: - if (sMonSummaryScreenData->monList.mons == gPlayerParty || sMonSummaryScreenData->mode == PSS_MODE_BOX || sMonSummaryScreenData->unk40EF == TRUE) + if (sMonSummaryScreen->monList.mons == gPlayerParty || sMonSummaryScreen->mode == PSS_MODE_BOX || sMonSummaryScreen->unk40EF == TRUE) { sum->nature = GetNature(mon); sum->currentHP = GetMonData(mon, MON_DATA_HP); @@ -1415,45 +1415,45 @@ static bool8 ExtractMonDataToSummaryStruct(struct Pokemon *mon) sum->ribbonCount = GetMonData(mon, MON_DATA_RIBBON_COUNT); return TRUE; } - sMonSummaryScreenData->switchCounter++; + sMonSummaryScreen->switchCounter++; return FALSE; } static void sub_81C0348(void) { - if (sMonSummaryScreenData->currPageIndex != PSS_PAGE_BATTLE_MOVES && sMonSummaryScreenData->currPageIndex != PSS_PAGE_CONTEST_MOVES) + if (sMonSummaryScreen->currPageIndex != PSS_PAGE_BATTLE_MOVES && sMonSummaryScreen->currPageIndex != PSS_PAGE_CONTEST_MOVES) { sub_81C1DA4(0, 255); sub_81C1EFC(0, 255, 0); } else { - DrawContestMoveHearts(sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]); - sub_81C2194(sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 0); - sub_81C2194(sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 0); - SetBgTilemapBuffer(1, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0]); - SetBgTilemapBuffer(2, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0]); + DrawContestMoveHearts(sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex]); + sub_81C2194(sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 0); + sub_81C2194(sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 0); + SetBgTilemapBuffer(1, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0]); + SetBgTilemapBuffer(2, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0]); ChangeBgX(2, 0x10000, 1); ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); } - if (sMonSummaryScreenData->summary.ailment == AILMENT_NONE) + if (sMonSummaryScreen->summary.ailment == AILMENT_NONE) { sub_81C2074(0, 0xFF); } else { - if (sMonSummaryScreenData->currPageIndex != PSS_PAGE_BATTLE_MOVES && sMonSummaryScreenData->currPageIndex != PSS_PAGE_CONTEST_MOVES) + if (sMonSummaryScreen->currPageIndex != PSS_PAGE_BATTLE_MOVES && sMonSummaryScreen->currPageIndex != PSS_PAGE_CONTEST_MOVES) PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); } LimitEggSummaryPageDisplay(); - DrawPokerusCuredSymbol(&sMonSummaryScreenData->currentMon); + DrawPokerusCuredSymbol(&sMonSummaryScreen->currentMon); } static void sub_81C0434(void) { FreeAllWindowBuffers(); - Free(sMonSummaryScreenData); + Free(sMonSummaryScreen); } static void BeginCloseSummaryScreen(u8 taskId) @@ -1466,8 +1466,8 @@ static void CloseSummaryScreen(u8 taskId) { if (sub_81221EC() != TRUE && !gPaletteFade.active) { - SetMainCallback2(sMonSummaryScreenData->callback); - gLastViewedMonIndex = sMonSummaryScreenData->curMonIndex; + SetMainCallback2(sMonSummaryScreen->callback); + gLastViewedMonIndex = sMonSummaryScreen->curMonIndex; SummaryScreen_DestroyUnknownTask(); ResetSpriteData(); FreeAllSpritePalettes(); @@ -1502,9 +1502,9 @@ static void HandleInput(u8 taskId) } else if (gMain.newKeys & A_BUTTON) { - if (sMonSummaryScreenData->currPageIndex != PSS_PAGE_SKILLS) + if (sMonSummaryScreen->currPageIndex != PSS_PAGE_SKILLS) { - if (sMonSummaryScreenData->currPageIndex == PSS_PAGE_INFO) + if (sMonSummaryScreen->currPageIndex == PSS_PAGE_INFO) { StopPokemonAnimations(); PlaySE(SE_SELECT); @@ -1531,12 +1531,12 @@ static void ChangeSummaryPokemon(u8 taskId, s8 delta) s8 v1; s8 v2; - if (!sMonSummaryScreenData->lockMonFlag) + if (!sMonSummaryScreen->lockMonFlag) { - if (sMonSummaryScreenData->isBoxMon == TRUE) + if (sMonSummaryScreen->isBoxMon == TRUE) { - if (sMonSummaryScreenData->currPageIndex != PSS_PAGE_INFO) + if (sMonSummaryScreen->currPageIndex != PSS_PAGE_INFO) { if (delta == 1) delta = 0; @@ -1550,7 +1550,7 @@ static void ChangeSummaryPokemon(u8 taskId, s8 delta) else delta = 3; } - v1 = sub_80D214C(sMonSummaryScreenData->monList.boxMons, sMonSummaryScreenData->curMonIndex, sMonSummaryScreenData->maxMonIndex, delta); + v1 = sub_80D214C(sMonSummaryScreen->monList.boxMons, sMonSummaryScreen->curMonIndex, sMonSummaryScreen->maxMonIndex, delta); } else if (IsMultiBattle() == TRUE) { @@ -1564,14 +1564,14 @@ static void ChangeSummaryPokemon(u8 taskId, s8 delta) if (v1 != -1) { PlaySE(SE_SELECT); - if (sMonSummaryScreenData->summary.ailment != AILMENT_NONE) + if (sMonSummaryScreen->summary.ailment != AILMENT_NONE) { SetSpriteInvisibility(2, 1); ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); schedule_bg_copy_tilemap_to_vram(0); sub_81C2074(0, 2); } - sMonSummaryScreenData->curMonIndex = v1; + sMonSummaryScreen->curMonIndex = v1; gTasks[taskId].data[0] = 0; gTasks[taskId].func = sub_81C0704; } @@ -1589,36 +1589,36 @@ static void sub_81C0704(u8 taskId) break; case 1: SummaryScreen_DestroyUnknownTask(); - DestroySpriteAndFreeResources(&gSprites[sMonSummaryScreenData->spriteIds[0]]); + DestroySpriteAndFreeResources(&gSprites[sMonSummaryScreen->spriteIds[0]]); break; case 2: - DestroySpriteAndFreeResources(&gSprites[sMonSummaryScreenData->spriteIds[1]]); + DestroySpriteAndFreeResources(&gSprites[sMonSummaryScreen->spriteIds[1]]); break; case 3: - CopyMonToSummaryStruct(&sMonSummaryScreenData->currentMon); - sMonSummaryScreenData->switchCounter = 0; + CopyMonToSummaryStruct(&sMonSummaryScreen->currentMon); + sMonSummaryScreen->switchCounter = 0; break; case 4: - if (ExtractMonDataToSummaryStruct(&sMonSummaryScreenData->currentMon) == FALSE) + if (ExtractMonDataToSummaryStruct(&sMonSummaryScreen->currentMon) == FALSE) return; break; case 5: - RemoveAndCreateMonMarkingsSprite(&sMonSummaryScreenData->currentMon); + RemoveAndCreateMonMarkingsSprite(&sMonSummaryScreen->currentMon); break; case 6: - CreateCaughtBallSprite(&sMonSummaryScreenData->currentMon); + CreateCaughtBallSprite(&sMonSummaryScreen->currentMon); break; case 7: - if (sMonSummaryScreenData->summary.ailment != AILMENT_NONE) + if (sMonSummaryScreen->summary.ailment != AILMENT_NONE) sub_81C2074(10, -2); - DrawPokerusCuredSymbol(&sMonSummaryScreenData->currentMon); + DrawPokerusCuredSymbol(&sMonSummaryScreen->currentMon); data[1] = 0; break; case 8: - sMonSummaryScreenData->spriteIds[0] = CreatePokemonSprite(&sMonSummaryScreenData->currentMon, &data[1]); - if (sMonSummaryScreenData->spriteIds[0] == 0xFF) + sMonSummaryScreen->spriteIds[0] = CreatePokemonSprite(&sMonSummaryScreen->currentMon, &data[1]); + if (sMonSummaryScreen->spriteIds[0] == 0xFF) return; - gSprites[sMonSummaryScreenData->spriteIds[0]].data[2] = 1; + gSprites[sMonSummaryScreen->spriteIds[0]].data[2] = 1; CheckExperienceProgressBar(); data[1] = 0; break; @@ -1629,11 +1629,11 @@ static void sub_81C0704(u8 taskId) sub_81C25E8(); break; case 11: - PrintPageSpecificText(sMonSummaryScreenData->currPageIndex); + PrintPageSpecificText(sMonSummaryScreen->currPageIndex); LimitEggSummaryPageDisplay(); break; case 12: - gSprites[sMonSummaryScreenData->spriteIds[0]].data[2] = 0; + gSprites[sMonSummaryScreen->spriteIds[0]].data[2] = 0; break; default: if (sub_81221EC() == 0 && FuncIsActiveTask(sub_81C20F0) == 0) @@ -1648,25 +1648,25 @@ static void sub_81C0704(u8 taskId) static s8 sub_81C08F8(s8 a) { - struct Pokemon *mon = sMonSummaryScreenData->monList.mons; + struct Pokemon *mon = sMonSummaryScreen->monList.mons; - if (sMonSummaryScreenData->currPageIndex == PSS_PAGE_INFO) + if (sMonSummaryScreen->currPageIndex == PSS_PAGE_INFO) { - if (a == -1 && sMonSummaryScreenData->curMonIndex == 0) + if (a == -1 && sMonSummaryScreen->curMonIndex == 0) return -1; - else if (a == 1 && sMonSummaryScreenData->curMonIndex >= sMonSummaryScreenData->maxMonIndex) + else if (a == 1 && sMonSummaryScreen->curMonIndex >= sMonSummaryScreen->maxMonIndex) return -1; else - return sMonSummaryScreenData->curMonIndex + a; + return sMonSummaryScreen->curMonIndex + a; } else { - s8 index = sMonSummaryScreenData->curMonIndex; + s8 index = sMonSummaryScreen->curMonIndex; do { index += a; - if (index < 0 || index > sMonSummaryScreenData->maxMonIndex) + if (index < 0 || index > sMonSummaryScreen->maxMonIndex) return -1; } while (GetMonData(&mon[index], MON_DATA_IS_EGG) != 0); return index; @@ -1675,13 +1675,13 @@ static s8 sub_81C08F8(s8 a) static s8 sub_81C09B4(s8 a) { - struct Pokemon *mon = sMonSummaryScreenData->monList.mons; + struct Pokemon *mon = sMonSummaryScreen->monList.mons; s8 r5 = 0; u8 i; for (i = 0; i < 6; i++) { - if (gUnknown_0861CC1C[i] == sMonSummaryScreenData->curMonIndex) + if (gUnknown_0861CC1C[i] == sMonSummaryScreen->curMonIndex) { r5 = i; break; @@ -1706,7 +1706,7 @@ static bool8 sub_81C0A50(struct Pokemon* mon) { if (GetMonData(mon, MON_DATA_SPECIES) == SPECIES_NONE) return FALSE; - else if (sMonSummaryScreenData->curMonIndex != 0 || GetMonData(mon, MON_DATA_IS_EGG) == 0) + else if (sMonSummaryScreen->curMonIndex != 0 || GetMonData(mon, MON_DATA_IS_EGG) == 0) return TRUE; else return FALSE; @@ -1714,25 +1714,25 @@ static bool8 sub_81C0A50(struct Pokemon* mon) static void ChangePage(u8 taskId, s8 delta) { - struct PokeSummary *summary = &sMonSummaryScreenData->summary; + struct PokeSummary *summary = &sMonSummaryScreen->summary; s16 *data = gTasks[taskId].data; if (summary->isEgg) return; - else if (delta == -1&& sMonSummaryScreenData->currPageIndex == sMonSummaryScreenData->minPageIndex) + else if (delta == -1 && sMonSummaryScreen->currPageIndex == sMonSummaryScreen->minPageIndex) return; - else if (delta == 1 && sMonSummaryScreenData->currPageIndex == sMonSummaryScreenData->maxPageIndex) + else if (delta == 1 && sMonSummaryScreen->currPageIndex == sMonSummaryScreen->maxPageIndex) return; PlaySE(SE_SELECT); - ClearPageWindowTilemaps(sMonSummaryScreenData->currPageIndex); - sMonSummaryScreenData->currPageIndex += delta; + ClearPageWindowTilemaps(sMonSummaryScreen->currPageIndex); + sMonSummaryScreen->currPageIndex += delta; data[0] = 0; if (delta == 1) SetTaskFuncWithFollowupFunc(taskId, PssScrollRight, gTasks[taskId].func); else SetTaskFuncWithFollowupFunc(taskId, PssScrollLeft, gTasks[taskId].func); - CreateTextPrinterTask(sMonSummaryScreenData->currPageIndex); + CreateTextPrinterTask(sMonSummaryScreen->currPageIndex); HidePageSpecificSprites(); } @@ -1741,7 +1741,7 @@ static void PssScrollRight(u8 taskId) // Scroll right s16 *data = gTasks[taskId].data; if (data[0] == 0) { - if (sMonSummaryScreenData->bgDisplayOrder == 0) + if (sMonSummaryScreen->bgDisplayOrder == 0) { data[1] = 1; SetBgAttribute(1, BG_ATTR_PRIORITY, 1); @@ -1756,7 +1756,7 @@ static void PssScrollRight(u8 taskId) // Scroll right schedule_bg_copy_tilemap_to_vram(2); } ChangeBgX(data[1], 0, 0); - SetBgTilemapBuffer(data[1], sMonSummaryScreenData->bgTilemapBuffers[sMonSummaryScreenData->currPageIndex][0]); + SetBgTilemapBuffer(data[1], sMonSummaryScreen->bgTilemapBuffers[sMonSummaryScreen->currPageIndex][0]); ShowBg(1); ShowBg(2); } @@ -1769,11 +1769,11 @@ static void PssScrollRight(u8 taskId) // Scroll right static void PssScrollRightEnd(u8 taskId) // display right { s16 *data = gTasks[taskId].data; - sMonSummaryScreenData->bgDisplayOrder ^= 1; + sMonSummaryScreen->bgDisplayOrder ^= 1; data[1] = 0; data[0] = 0; DrawPagination(); - CreatePageWindowTilemaps(sMonSummaryScreenData->currPageIndex); + CreatePageWindowTilemaps(sMonSummaryScreen->currPageIndex); SetTypeIcons(); CheckExperienceProgressBar(); SwitchTaskToFollowupFunc(taskId); @@ -1784,7 +1784,7 @@ static void PssScrollLeft(u8 taskId) // Scroll left s16 *data = gTasks[taskId].data; if (data[0] == 0) { - if (sMonSummaryScreenData->bgDisplayOrder == 0) + if (sMonSummaryScreen->bgDisplayOrder == 0) data[1] = 2; else data[1] = 1; @@ -1799,7 +1799,7 @@ static void PssScrollLeft(u8 taskId) // Scroll left static void PssScrollLeftEnd(u8 taskId) // display left { s16 *data = gTasks[taskId].data; - if (sMonSummaryScreenData->bgDisplayOrder == 0) + if (sMonSummaryScreen->bgDisplayOrder == 0) { SetBgAttribute(1, BG_ATTR_PRIORITY, 1); SetBgAttribute(2, BG_ATTR_PRIORITY, 2); @@ -1811,18 +1811,18 @@ static void PssScrollLeftEnd(u8 taskId) // display left SetBgAttribute(1, BG_ATTR_PRIORITY, 2); schedule_bg_copy_tilemap_to_vram(1); } - if (sMonSummaryScreenData->currPageIndex > 1) + if (sMonSummaryScreen->currPageIndex > 1) { - SetBgTilemapBuffer(data[1], (u8*)sMonSummaryScreenData + ((sMonSummaryScreenData->currPageIndex << 12) + 0xFFFFF0BC)); + SetBgTilemapBuffer(data[1], (u8*)sMonSummaryScreen + ((sMonSummaryScreen->currPageIndex << 12) + 0xFFFFF0BC)); ChangeBgX(data[1], 0x10000, 0); } ShowBg(1); ShowBg(2); - sMonSummaryScreenData->bgDisplayOrder ^= 1; + sMonSummaryScreen->bgDisplayOrder ^= 1; data[1] = 0; data[0] = 0; DrawPagination(); - CreatePageWindowTilemaps(sMonSummaryScreenData->currPageIndex); + CreatePageWindowTilemaps(sMonSummaryScreen->currPageIndex); SetTypeIcons(); CheckExperienceProgressBar(); SwitchTaskToFollowupFunc(taskId); @@ -1830,27 +1830,27 @@ static void PssScrollLeftEnd(u8 taskId) // display left static void CheckExperienceProgressBar(void) { - if (sMonSummaryScreenData->currPageIndex == 1) - DrawExperienceProgressBar(&sMonSummaryScreenData->currentMon); + if (sMonSummaryScreen->currPageIndex == 1) + DrawExperienceProgressBar(&sMonSummaryScreen->currentMon); } static void sub_81C0E48(u8 taskId) { u16 move; - sMonSummaryScreenData->firstMoveIndex = 0; - move = sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]; + sMonSummaryScreen->firstMoveIndex = 0; + move = sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex]; ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); - if (gSprites[sMonSummaryScreenData->spriteIds[2]].invisible == 0) + if (gSprites[sMonSummaryScreen->spriteIds[2]].invisible == 0) ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); sub_81C1DA4(9, -3); sub_81C1EFC(9, -3, move); - if (!sMonSummaryScreenData->unk40C8) + if (!sMonSummaryScreen->unk40C8) { ClearWindowTilemap(PSS_LABEL_WINDOW_PROMPT_INFO); PutWindowTilemap(PSS_LABEL_WINDOW_PROMPT_SWITCH); } - sub_81C2194(sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 0); - sub_81C2194(sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 0); + sub_81C2194(sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 0); + sub_81C2194(sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 0); PrintMoveDetails(move); PrintNewMoveDetailsOrCancelText(); SetNewMoveTypeIcon(); @@ -1871,17 +1871,17 @@ static void HandleInput_MoveSelect(u8 taskId) if (gMain.newKeys & DPAD_UP) { data[0] = 4; - sub_81C1070(data, -1, &sMonSummaryScreenData->firstMoveIndex); + sub_81C1070(data, -1, &sMonSummaryScreen->firstMoveIndex); } else if (gMain.newKeys & DPAD_DOWN) { data[0] = 4; - sub_81C1070(data, 1, &sMonSummaryScreenData->firstMoveIndex); + sub_81C1070(data, 1, &sMonSummaryScreen->firstMoveIndex); } else if (gMain.newKeys & A_BUTTON) { - if (sMonSummaryScreenData->unk40C8 == TRUE - || (sMonSummaryScreenData->newMove == MOVE_NONE && sMonSummaryScreenData->firstMoveIndex == MAX_MON_MOVES)) + if (sMonSummaryScreen->unk40C8 == TRUE + || (sMonSummaryScreen->newMove == MOVE_NONE && sMonSummaryScreen->firstMoveIndex == MAX_MON_MOVES)) { PlaySE(SE_SELECT); sub_81C11F4(taskId); @@ -1909,7 +1909,7 @@ static bool8 sub_81C1040(void) u8 i; for (i = 1; i < MAX_MON_MOVES; i++) { - if (sMonSummaryScreenData->summary.moves[i] != 0) + if (sMonSummaryScreen->summary.moves[i] != 0) return TRUE; } return FALSE; @@ -1932,10 +1932,10 @@ static void sub_81C1070(s16 *a, s8 b, u8 *c) moveIndex = a[0]; if (moveIndex == MAX_MON_MOVES) { - move = sMonSummaryScreenData->newMove; + move = sMonSummaryScreen->newMove; break; } - move = sMonSummaryScreenData->summary.moves[moveIndex]; + move = sMonSummaryScreen->summary.moves[moveIndex]; if (move != 0) break; } @@ -1943,16 +1943,16 @@ static void sub_81C1070(s16 *a, s8 b, u8 *c) schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(2); PrintMoveDetails(move); - if ((*c == 4 && sMonSummaryScreenData->newMove == MOVE_NONE) || a[1] == 1) + if ((*c == 4 && sMonSummaryScreen->newMove == MOVE_NONE) || a[1] == 1) { ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); - if (!gSprites[sMonSummaryScreenData->spriteIds[2]].invisible) + if (!gSprites[sMonSummaryScreen->spriteIds[2]].invisible) ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); schedule_bg_copy_tilemap_to_vram(0); sub_81C1DA4(9, -3); sub_81C1EFC(9, -3, move); } - if (*c != 4 && moveIndex == 4 && sMonSummaryScreenData->newMove == MOVE_NONE) + if (*c != 4 && moveIndex == 4 && sMonSummaryScreen->newMove == MOVE_NONE) { ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC); ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM); @@ -1961,7 +1961,7 @@ static void sub_81C1070(s16 *a, s8 b, u8 *c) sub_81C1EFC(0, 3, 0); } *c = moveIndex; - if (c == &sMonSummaryScreenData->firstMoveIndex) + if (c == &sMonSummaryScreen->firstMoveIndex) sub_81C4D18(8); else sub_81C4D18(18); @@ -1973,10 +1973,10 @@ static void sub_81C11F4(u8 taskId) ClearWindowTilemap(PSS_LABEL_WINDOW_PROMPT_SWITCH); PutWindowTilemap(PSS_LABEL_WINDOW_PROMPT_INFO); PrintMoveDetails(0); - sub_81C2194(sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 1); - sub_81C2194(sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 1); + sub_81C2194(sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 1); + sub_81C2194(sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 1); sub_81C4064(); - if (sMonSummaryScreenData->firstMoveIndex != MAX_MON_MOVES) + if (sMonSummaryScreen->firstMoveIndex != MAX_MON_MOVES) { ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC); ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM); @@ -1991,7 +1991,7 @@ static void sub_81C11F4(u8 taskId) static void sub_81C129C(u8 taskId) { - sMonSummaryScreenData->secondMoveIndex = sMonSummaryScreenData->firstMoveIndex; + sMonSummaryScreen->secondMoveIndex = sMonSummaryScreen->firstMoveIndex; sub_81C4C84(1); sub_81C4AF8(18); gTasks[taskId].func = sub_81C12E4; @@ -2006,16 +2006,16 @@ static void sub_81C12E4(u8 taskId) if (gMain.newKeys & DPAD_UP) { data[0] = 3; - sub_81C1070(&data[0], -1, &sMonSummaryScreenData->secondMoveIndex); + sub_81C1070(&data[0], -1, &sMonSummaryScreen->secondMoveIndex); } else if (gMain.newKeys & DPAD_DOWN) { data[0] = 3; - sub_81C1070(&data[0], 1, &sMonSummaryScreenData->secondMoveIndex); + sub_81C1070(&data[0], 1, &sMonSummaryScreen->secondMoveIndex); } else if (gMain.newKeys & A_BUTTON) { - if (sMonSummaryScreenData->firstMoveIndex == sMonSummaryScreenData->secondMoveIndex) + if (sMonSummaryScreen->firstMoveIndex == sMonSummaryScreen->secondMoveIndex) { sub_81C13B0(taskId, 0); } @@ -2041,23 +2041,23 @@ static void sub_81C13B0(u8 taskId, bool8 b) if (b == TRUE) { - if (!sMonSummaryScreenData->isBoxMon) + if (!sMonSummaryScreen->isBoxMon) { - struct Pokemon *why = sMonSummaryScreenData->monList.mons; - SwapMonMoves(&why[sMonSummaryScreenData->curMonIndex], sMonSummaryScreenData->firstMoveIndex, sMonSummaryScreenData->secondMoveIndex); + struct Pokemon *why = sMonSummaryScreen->monList.mons; + SwapMonMoves(&why[sMonSummaryScreen->curMonIndex], sMonSummaryScreen->firstMoveIndex, sMonSummaryScreen->secondMoveIndex); } else { - struct BoxPokemon *why = sMonSummaryScreenData->monList.boxMons; - SwapBoxMonMoves(&why[sMonSummaryScreenData->curMonIndex], sMonSummaryScreenData->firstMoveIndex, sMonSummaryScreenData->secondMoveIndex); + struct BoxPokemon *why = sMonSummaryScreen->monList.boxMons; + SwapBoxMonMoves(&why[sMonSummaryScreen->curMonIndex], sMonSummaryScreen->firstMoveIndex, sMonSummaryScreen->secondMoveIndex); } - CopyMonToSummaryStruct(&sMonSummaryScreenData->currentMon); - sub_81C40A0(sMonSummaryScreenData->firstMoveIndex, sMonSummaryScreenData->secondMoveIndex); - sub_81C4568(sMonSummaryScreenData->firstMoveIndex, sMonSummaryScreenData->secondMoveIndex); - sMonSummaryScreenData->firstMoveIndex = sMonSummaryScreenData->secondMoveIndex; + CopyMonToSummaryStruct(&sMonSummaryScreen->currentMon); + sub_81C40A0(sMonSummaryScreen->firstMoveIndex, sMonSummaryScreen->secondMoveIndex); + sub_81C4568(sMonSummaryScreen->firstMoveIndex, sMonSummaryScreen->secondMoveIndex); + sMonSummaryScreen->firstMoveIndex = sMonSummaryScreen->secondMoveIndex; } - move = sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]; + move = sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex]; PrintMoveDetails(move); DrawContestMoveHearts(move); schedule_bg_copy_tilemap_to_vram(1); @@ -2067,7 +2067,7 @@ static void sub_81C13B0(u8 taskId, bool8 b) static void SwapMonMoves(struct Pokemon *mon, u8 moveIndex1, u8 moveIndex2) { - struct PokeSummary* summary = &sMonSummaryScreenData->summary; + struct PokeSummary* summary = &sMonSummaryScreen->summary; u16 move1 = summary->moves[moveIndex1]; u16 move2 = summary->moves[moveIndex2]; @@ -2102,7 +2102,7 @@ static void SwapMonMoves(struct Pokemon *mon, u8 moveIndex1, u8 moveIndex2) static void SwapBoxMonMoves(struct BoxPokemon *mon, u8 moveIndex1, u8 moveIndex2) { - struct PokeSummary* summary = &sMonSummaryScreenData->summary; + struct PokeSummary* summary = &sMonSummaryScreen->summary; u16 move1 = summary->moves[moveIndex1]; u16 move2 = summary->moves[moveIndex2]; @@ -2153,12 +2153,12 @@ static void HandleReplaceMoveInput(u8 taskId) if (gMain.newKeys & DPAD_UP) { data[0] = 4; - sub_81C1070(data, -1, &sMonSummaryScreenData->firstMoveIndex); + sub_81C1070(data, -1, &sMonSummaryScreen->firstMoveIndex); } else if (gMain.newKeys & DPAD_DOWN) { data[0] = 4; - sub_81C1070(data, 1, &sMonSummaryScreenData->firstMoveIndex); + sub_81C1070(data, 1, &sMonSummaryScreen->firstMoveIndex); } else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1) { @@ -2174,7 +2174,7 @@ static void HandleReplaceMoveInput(u8 taskId) { StopPokemonAnimations(); PlaySE(SE_SELECT); - sUnknown_0203CF21 = sMonSummaryScreenData->firstMoveIndex; + sUnknown_0203CF21 = sMonSummaryScreen->firstMoveIndex; gSpecialVar_0x8005 = sUnknown_0203CF21; BeginCloseSummaryScreen(taskId); } @@ -2199,7 +2199,7 @@ static void HandleReplaceMoveInput(u8 taskId) static bool8 CanReplaceMove(void) { - if (sMonSummaryScreenData->firstMoveIndex == MAX_MON_MOVES || sMonSummaryScreenData->newMove == MOVE_NONE || IsMoveHm(sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]) != 1) + if (sMonSummaryScreen->firstMoveIndex == MAX_MON_MOVES || sMonSummaryScreen->newMove == MOVE_NONE || IsMoveHm(sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex]) != 1) return TRUE; else return FALSE; @@ -2227,7 +2227,7 @@ static void HandleHMMovesCantBeForgottenInput(u8 taskId) { data[1] = 1; data[0] = 4; - sub_81C1070(&data[0], -1, &sMonSummaryScreenData->firstMoveIndex); + sub_81C1070(&data[0], -1, &sMonSummaryScreen->firstMoveIndex); data[1] = 0; gTasks[taskId].func = HandleReplaceMoveInput; } @@ -2235,18 +2235,18 @@ static void HandleHMMovesCantBeForgottenInput(u8 taskId) { data[1] = 1; data[0] = 4; - sub_81C1070(&data[0], 1, &sMonSummaryScreenData->firstMoveIndex); + sub_81C1070(&data[0], 1, &sMonSummaryScreen->firstMoveIndex); data[1] = 0; gTasks[taskId].func = HandleReplaceMoveInput; } else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1) { - if (sMonSummaryScreenData->currPageIndex != 2) + if (sMonSummaryScreen->currPageIndex != 2) { ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); - if (!gSprites[sMonSummaryScreenData->spriteIds[2]].invisible) + if (!gSprites[sMonSummaryScreen->spriteIds[2]].invisible) ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); - move = sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]; + move = sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex]; gTasks[taskId].func = HandleReplaceMoveInput; ChangePage(taskId, -1); sub_81C1DA4(9, -2); @@ -2255,12 +2255,12 @@ static void HandleHMMovesCantBeForgottenInput(u8 taskId) } else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysState() == 2) { - if (sMonSummaryScreenData->currPageIndex != 3) + if (sMonSummaryScreen->currPageIndex != 3) { ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); - if (!gSprites[sMonSummaryScreenData->spriteIds[2]].invisible) + if (!gSprites[sMonSummaryScreen->spriteIds[2]].invisible) ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); - move = sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]; + move = sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex]; gTasks[taskId].func = HandleReplaceMoveInput; ChangePage(taskId, 1); sub_81C1DA4(9, -2); @@ -2270,9 +2270,9 @@ static void HandleHMMovesCantBeForgottenInput(u8 taskId) else if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); - if (!gSprites[sMonSummaryScreenData->spriteIds[2]].invisible) + if (!gSprites[sMonSummaryScreen->spriteIds[2]].invisible) ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); - move = sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]; + move = sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex]; PrintMoveDetails(move); schedule_bg_copy_tilemap_to_vram(0); sub_81C1DA4(9, -3); @@ -2296,30 +2296,30 @@ static void DrawPagination(void) // Updates the pagination dots at the top of th { u8 j = i * 2; - if (i < sMonSummaryScreenData->minPageIndex) + if (i < sMonSummaryScreen->minPageIndex) { alloced[j + 0] = 0x40; alloced[j + 1] = 0x40; alloced[j + 8] = 0x50; alloced[j + 9] = 0x50; } - else if (i > sMonSummaryScreenData->maxPageIndex) + else if (i > sMonSummaryScreen->maxPageIndex) { alloced[j + 0] = 0x4A; alloced[j + 1] = 0x4A; alloced[j + 8] = 0x5A; alloced[j + 9] = 0x5A; } - else if (i < sMonSummaryScreenData->currPageIndex) + else if (i < sMonSummaryScreen->currPageIndex) { alloced[j + 0] = 0x46; alloced[j + 1] = 0x47; alloced[j + 8] = 0x56; alloced[j + 9] = 0x57; } - else if (i == sMonSummaryScreenData->currPageIndex) + else if (i == sMonSummaryScreen->currPageIndex) { - if (i != sMonSummaryScreenData->maxPageIndex) + if (i != sMonSummaryScreen->maxPageIndex) { alloced[j + 0] = 0x41; alloced[j + 1] = 0x42; @@ -2334,7 +2334,7 @@ static void DrawPagination(void) // Updates the pagination dots at the top of th alloced[j + 9] = 0x5C; } } - else if (i != sMonSummaryScreenData->maxPageIndex) + else if (i != sMonSummaryScreen->maxPageIndex) { alloced[j + 0] = 0x43; alloced[j + 1] = 0x44; @@ -2389,7 +2389,7 @@ static void sub_81C1DA4(u16 a, s16 b) b = sUnknown_0861CC04.field_6; if (b == 0 || b == sUnknown_0861CC04.field_6) { - sub_81C1CB0(&sUnknown_0861CC04, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], b, 1); + sub_81C1CB0(&sUnknown_0861CC04, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], b, 1); } else { @@ -2415,17 +2415,17 @@ static void sub_81C1E20(u8 taskId) { data[1] = sUnknown_0861CC04.field_6; } - sub_81C1CB0(&sUnknown_0861CC04, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], data[1], 1); + sub_81C1CB0(&sUnknown_0861CC04, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], data[1], 1); if (data[1] <= 0 || data[1] >= sUnknown_0861CC04.field_6) { if (data[0] < 0) { - if (sMonSummaryScreenData->currPageIndex == 2) + if (sMonSummaryScreen->currPageIndex == 2) PutWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC); } else { - if (!gSprites[sMonSummaryScreenData->spriteIds[2]].invisible) + if (!gSprites[sMonSummaryScreen->spriteIds[2]].invisible) PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); } @@ -2441,7 +2441,7 @@ static void sub_81C1EFC(u16 a, s16 b, u16 move) if (b > sUnknown_0861CC10.field_6) b = sUnknown_0861CC10.field_6; if (b == 0 || b == sUnknown_0861CC10.field_6) - sub_81C1CB0(&sUnknown_0861CC10, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], b, 1); + sub_81C1CB0(&sUnknown_0861CC10, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], b, 1); else { u8 taskId = FindTaskIdByFunc(sub_81C1F80); @@ -2465,18 +2465,18 @@ static void sub_81C1F80(u8 taskId) { data[1] = sUnknown_0861CC10.field_6; } - sub_81C1CB0(&sUnknown_0861CC10, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], data[1], 1); + sub_81C1CB0(&sUnknown_0861CC10, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], data[1], 1); if (data[1] <= 0 || data[1] >= sUnknown_0861CC10.field_6) { if (data[0] < 0) { - if (sMonSummaryScreenData->currPageIndex == 3 && FuncIsActiveTask(PssScrollRight) == 0) + if (sMonSummaryScreen->currPageIndex == 3 && FuncIsActiveTask(PssScrollRight) == 0) PutWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM); DrawContestMoveHearts(data[2]); } else { - if (!gSprites[sMonSummaryScreenData->spriteIds[2]].invisible) + if (!gSprites[sMonSummaryScreen->spriteIds[2]].invisible) { PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); } @@ -2495,8 +2495,8 @@ static void sub_81C2074(u16 a, s16 b) b = sUnknown_0861CBEC.field_6; if (b == 0 || b == sUnknown_0861CBEC.field_6) { - sub_81C1CB0(&sUnknown_0861CBEC, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0); - sub_81C1CB0(&sUnknown_0861CBF8, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0); + sub_81C1CB0(&sUnknown_0861CBEC, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0); + sub_81C1CB0(&sUnknown_0861CBF8, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0); } else { @@ -2514,8 +2514,8 @@ static void sub_81C20F0(u8 taskId) data[1] = 0; else if (data[1] > sUnknown_0861CBEC.field_6) data[1] = sUnknown_0861CBEC.field_6; - sub_81C1CB0(&sUnknown_0861CBEC, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0); - sub_81C1CB0(&sUnknown_0861CBF8, sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0); + sub_81C1CB0(&sUnknown_0861CBEC, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0); + sub_81C1CB0(&sUnknown_0861CBF8, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0); schedule_bg_copy_tilemap_to_vram(3); if (data[1] <= 0 || data[1] >= sUnknown_0861CBEC.field_6) { @@ -2561,13 +2561,13 @@ static void DrawPokerusCuredSymbol(struct Pokemon *mon) // This checks if the mo { if (!CheckPartyPokerus(mon, 0) && CheckPartyHasHadPokerus(mon, 0)) // If yes it draws the cured symbol { - sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][0][0x223] = 0x2C; - sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][1][0x223] = 0x2C; + sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0][0x223] = 0x2C; + sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][1][0x223] = 0x2C; } else { - sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][0][0x223] = 0x81A; - sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_INFO][1][0x223] = 0x81A; + sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0][0x223] = 0x81A; + sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][1][0x223] = 0x81A; } schedule_bg_copy_tilemap_to_vram(3); } @@ -2584,7 +2584,7 @@ static void sub_81C228C(bool8 isMonShiny) static void DrawExperienceProgressBar(struct Pokemon *unused) { s64 numExpProgressBarTicks; - struct PokeSummary *summary = &sMonSummaryScreenData->summary; + struct PokeSummary *summary = &sMonSummaryScreen->summary; u16 *r9; u8 i; @@ -2605,7 +2605,7 @@ static void DrawExperienceProgressBar(struct Pokemon *unused) numExpProgressBarTicks = 0; } - r9 = &sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_SKILLS][1][0x255]; + r9 = &sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_SKILLS][1][0x255]; for (i = 0; i < 8; i++) { if (numExpProgressBarTicks > 7) @@ -2617,7 +2617,7 @@ static void DrawExperienceProgressBar(struct Pokemon *unused) numExpProgressBarTicks = 0; } - if (GetBgTilemapBuffer(1) == sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_SKILLS][0]) + if (GetBgTilemapBuffer(1) == sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_SKILLS][0]) schedule_bg_copy_tilemap_to_vram(1); else schedule_bg_copy_tilemap_to_vram(2); @@ -2625,7 +2625,7 @@ static void DrawExperienceProgressBar(struct Pokemon *unused) static void DrawContestMoveHearts(u16 move) { - u16 *tilemap = sMonSummaryScreenData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1]; + u16 *tilemap = sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1]; u8 i; u8 effectValue; @@ -2669,7 +2669,7 @@ static void DrawContestMoveHearts(u16 move) static void LimitEggSummaryPageDisplay(void) // If the pokemon is an egg, limit the number of pages displayed to 1 { - if (sMonSummaryScreenData->summary.isEgg) + if (sMonSummaryScreen->summary.isEgg) ChangeBgX(3, 0x10000, 0); else ChangeBgX(3, 0, 0); @@ -2685,9 +2685,9 @@ static void ResetWindows(void) { FillWindowPixelBuffer(i, PIXEL_FILL(0)); } - for (i = 0; i < ARRAY_COUNT(sMonSummaryScreenData->windowIds); i++) + for (i = 0; i < ARRAY_COUNT(sMonSummaryScreen->windowIds); i++) { - sMonSummaryScreenData->windowIds[i] = 0xFF; + sMonSummaryScreen->windowIds[i] = 0xFF; } } @@ -2701,7 +2701,7 @@ static void sub_81C25E8(void) FillWindowPixelBuffer(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER, PIXEL_FILL(0)); FillWindowPixelBuffer(PSS_LABEL_WINDOW_PORTRAIT_NICKNAME, PIXEL_FILL(0)); FillWindowPixelBuffer(PSS_LABEL_WINDOW_PORTRAIT_SPECIES, PIXEL_FILL(0)); - if (!sMonSummaryScreenData->summary.isEgg) + if (!sMonSummaryScreen->summary.isEgg) sub_81C2628(); else sub_81C2794(); @@ -2711,8 +2711,8 @@ static void sub_81C25E8(void) static void sub_81C2628(void) { u8 strArray[16]; - struct Pokemon *mon = &sMonSummaryScreenData->currentMon; - struct PokeSummary *summary = &sMonSummaryScreenData->summary; + struct Pokemon *mon = &sMonSummaryScreen->currentMon; + struct PokeSummary *summary = &sMonSummaryScreen->summary; u16 dexNum = SpeciesToPokedexNum(summary->species); if (dexNum != 0xFFFF) { @@ -2755,7 +2755,7 @@ static void sub_81C2628(void) static void sub_81C2794(void) { - GetMonNickname(&sMonSummaryScreenData->currentMon, gStringVar1); + GetMonNickname(&sMonSummaryScreen->currentMon, gStringVar1); SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_NICKNAME, gStringVar1, 0, 1, 0, 1); PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_NICKNAME); ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER); @@ -2866,9 +2866,9 @@ static void CreatePageWindowTilemaps(u8 page) break; case PSS_PAGE_BATTLE_MOVES: PutWindowTilemap(PSS_LABEL_WINDOW_BATTLE_MOVES_TITLE); - if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE) { - if (sMonSummaryScreenData->newMove != MOVE_NONE || sMonSummaryScreenData->firstMoveIndex != MAX_MON_MOVES) + if (sMonSummaryScreen->newMove != MOVE_NONE || sMonSummaryScreen->firstMoveIndex != MAX_MON_MOVES) PutWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC); } else @@ -2878,9 +2878,9 @@ static void CreatePageWindowTilemaps(u8 page) break; case PSS_PAGE_CONTEST_MOVES: PutWindowTilemap(PSS_LABEL_WINDOW_CONTEST_MOVES_TITLE); - if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE) { - if (sMonSummaryScreenData->newMove != MOVE_NONE || sMonSummaryScreenData->firstMoveIndex != MAX_MON_MOVES) + if (sMonSummaryScreen->newMove != MOVE_NONE || sMonSummaryScreen->firstMoveIndex != MAX_MON_MOVES) PutWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM); } else @@ -2890,9 +2890,9 @@ static void CreatePageWindowTilemaps(u8 page) break; } - for (i = 0; i < ARRAY_COUNT(sMonSummaryScreenData->windowIds); i++) + for (i = 0; i < ARRAY_COUNT(sMonSummaryScreen->windowIds); i++) { - PutWindowTilemap(sMonSummaryScreenData->windowIds[i]); + PutWindowTilemap(sMonSummaryScreen->windowIds[i]); } schedule_bg_copy_tilemap_to_vram(0); @@ -2915,9 +2915,9 @@ static void ClearPageWindowTilemaps(u8 page) ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_EXP); break; case PSS_PAGE_BATTLE_MOVES: - if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE) { - if (sMonSummaryScreenData->newMove != MOVE_NONE || sMonSummaryScreenData->firstMoveIndex != MAX_MON_MOVES) + if (sMonSummaryScreen->newMove != MOVE_NONE || sMonSummaryScreen->firstMoveIndex != MAX_MON_MOVES) ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC); } else @@ -2926,9 +2926,9 @@ static void ClearPageWindowTilemaps(u8 page) } break; case PSS_PAGE_CONTEST_MOVES: - if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE) { - if (sMonSummaryScreenData->newMove != MOVE_NONE || sMonSummaryScreenData->firstMoveIndex != MAX_MON_MOVES) + if (sMonSummaryScreen->newMove != MOVE_NONE || sMonSummaryScreen->firstMoveIndex != MAX_MON_MOVES) ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM); } else @@ -2938,7 +2938,7 @@ static void ClearPageWindowTilemaps(u8 page) break; } - for (i = 0; i < ARRAY_COUNT(sMonSummaryScreenData->windowIds); i++) + for (i = 0; i < ARRAY_COUNT(sMonSummaryScreen->windowIds); i++) { SummaryScreen_RemoveWindowByIndex(i); } @@ -2948,7 +2948,7 @@ static void ClearPageWindowTilemaps(u8 page) static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 templateId) { - u8 *windowIdPtr = &(sMonSummaryScreenData->windowIds[templateId]); + u8 *windowIdPtr = &(sMonSummaryScreen->windowIds[templateId]); if (*windowIdPtr == 0xFF) { *windowIdPtr = AddWindow(&template[templateId]); @@ -2959,7 +2959,7 @@ static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 te static void SummaryScreen_RemoveWindowByIndex(u8 windowIndex) { - u8 *windowIdPtr = &(sMonSummaryScreenData->windowIds[windowIndex]); + u8 *windowIdPtr = &(sMonSummaryScreen->windowIds[windowIndex]); if (*windowIdPtr != 0xFF) { ClearWindowTilemap(*windowIdPtr); @@ -2971,10 +2971,10 @@ static void SummaryScreen_RemoveWindowByIndex(u8 windowIndex) static void PrintPageSpecificText(u8 pageIndex) { u16 i; - for (i = 0; i < ARRAY_COUNT(sMonSummaryScreenData->windowIds); i++) + for (i = 0; i < ARRAY_COUNT(sMonSummaryScreen->windowIds); i++) { - if (sMonSummaryScreenData->windowIds[i] != 0xFF) - FillWindowPixelBuffer(sMonSummaryScreenData->windowIds[i], PIXEL_FILL(0)); + if (sMonSummaryScreen->windowIds[i] != 0xFF) + FillWindowPixelBuffer(sMonSummaryScreen->windowIds[i], PIXEL_FILL(0)); } sTextPrinterFunctions[pageIndex](); } @@ -2986,7 +2986,7 @@ static void CreateTextPrinterTask(u8 pageIndex) static void PrintInfoPageText(void) { - if (sMonSummaryScreenData->summary.isEgg) + if (sMonSummaryScreen->summary.isEgg) { PrintEggOTName(); PrintEggOTID(); @@ -3043,10 +3043,10 @@ static void PrintMonOTName(void) windowId = AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ORIGINAL_TRAINER); SummaryScreen_PrintTextOnWindow(windowId, gText_OTSlash, 0, 1, 0, 1); x = GetStringWidth(1, gText_OTSlash, 0); - if (sMonSummaryScreenData->summary.OTGender == 0) - SummaryScreen_PrintTextOnWindow(windowId, sMonSummaryScreenData->summary.OTName, x, 1, 0, 5); + if (sMonSummaryScreen->summary.OTGender == 0) + SummaryScreen_PrintTextOnWindow(windowId, sMonSummaryScreen->summary.OTName, x, 1, 0, 5); else - SummaryScreen_PrintTextOnWindow(windowId, sMonSummaryScreenData->summary.OTName, x, 1, 0, 6); + SummaryScreen_PrintTextOnWindow(windowId, sMonSummaryScreen->summary.OTName, x, 1, 0, 6); } } @@ -3055,7 +3055,7 @@ static void PrintMonOTID(void) int xPos; if (InBattleFactory() != TRUE && InSlateportBattleTent() != TRUE) { - ConvertIntToDecimalStringN(StringCopy(gStringVar1, gText_UnkCtrlF907F908), (u16)sMonSummaryScreenData->summary.OTID, 2, 5); + ConvertIntToDecimalStringN(StringCopy(gStringVar1, gText_UnkCtrlF907F908), (u16)sMonSummaryScreen->summary.OTID, 2, 5); xPos = GetStringRightAlignXOffset(1, gStringVar1, 56); SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ID), gStringVar1, xPos, 1, 0, 1); } @@ -3063,19 +3063,19 @@ static void PrintMonOTID(void) static void PrintMonAbilityName(void) { - u8 ability = GetAbilityBySpecies(sMonSummaryScreenData->summary.species, sMonSummaryScreenData->summary.altAbility); + u8 ability = GetAbilityBySpecies(sMonSummaryScreen->summary.species, sMonSummaryScreen->summary.altAbility); SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ABILITY), gAbilityNames[ability], 0, 1, 0, 1); } static void PrintMonAbilityDescription(void) { - u8 ability = GetAbilityBySpecies(sMonSummaryScreenData->summary.species, sMonSummaryScreenData->summary.altAbility); + u8 ability = GetAbilityBySpecies(sMonSummaryScreen->summary.species, sMonSummaryScreen->summary.altAbility); SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ABILITY), gAbilityDescriptionPointers[ability], 0, 17, 0, 0); } static void BufferMonTrainerMemo(void) { - struct PokeSummary *sum = &sMonSummaryScreenData->summary; + struct PokeSummary *sum = &sMonSummaryScreen->summary; const u8 *text; DynamicPlaceholderTextUtil_Reset(); @@ -3132,14 +3132,14 @@ static void PrintMonTrainerMemo(void) static void BufferNatureString(void) { - struct PokemonSummaryScreenData *sumStruct = sMonSummaryScreenData; + struct PokemonSummaryScreenData *sumStruct = sMonSummaryScreen; DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gNatureNamePointers[sumStruct->summary.nature]); DynamicPlaceholderTextUtil_SetPlaceholderPtr(5, gText_EmptyString5); } static void GetMetLevelString(u8 *output) { - u8 level = sMonSummaryScreenData->summary.metLevel; + u8 level = sMonSummaryScreen->summary.metLevel; if (level == 0) level = EGG_HATCH_LEVEL; ConvertIntToDecimalStringN(output, level, 0, 3); @@ -3148,11 +3148,11 @@ static void GetMetLevelString(u8 *output) static bool8 DoesMonOTMatchOwner(void) { - struct PokeSummary *sum = &sMonSummaryScreenData->summary; + struct PokeSummary *sum = &sMonSummaryScreen->summary; u32 trainerId; u8 gender; - if (sMonSummaryScreenData->monList.mons == gEnemyParty) + if (sMonSummaryScreen->monList.mons == gEnemyParty) { u8 multiID = GetMultiplayerId() ^ 1; trainerId = (u16)gLinkPlayers[multiID].trainerId; @@ -3174,7 +3174,7 @@ static bool8 DoesMonOTMatchOwner(void) static bool8 DidMonComeFromGBAGames(void) { - struct PokeSummary *sum = &sMonSummaryScreenData->summary; + struct PokeSummary *sum = &sMonSummaryScreen->summary; if (sum->metGame > 0 && sum->metGame <= VERSION_LEAF_GREEN) return TRUE; return FALSE; @@ -3182,7 +3182,7 @@ static bool8 DidMonComeFromGBAGames(void) bool8 DidMonComeFromRSE(void) { - struct PokeSummary *sum = &sMonSummaryScreenData->summary; + struct PokeSummary *sum = &sMonSummaryScreen->summary; if (sum->metGame > 0 && sum->metGame <= VERSION_EMERALD) return TRUE; return FALSE; @@ -3192,7 +3192,7 @@ static bool8 IsInGamePartnerMon(void) { if ((gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) && gMain.inBattle) { - if (sMonSummaryScreenData->curMonIndex == 1 || sMonSummaryScreenData->curMonIndex == 4 || sMonSummaryScreenData->curMonIndex == 5) + if (sMonSummaryScreen->curMonIndex == 1 || sMonSummaryScreen->curMonIndex == 4 || sMonSummaryScreen->curMonIndex == 5) return TRUE; } return FALSE; @@ -3218,9 +3218,9 @@ static void PrintEggOTID(void) static void PrintEggState(void) { const u8 *text; - struct PokeSummary *sum = &sMonSummaryScreenData->summary; + struct PokeSummary *sum = &sMonSummaryScreen->summary; - if (sMonSummaryScreenData->summary.sanity == TRUE) + if (sMonSummaryScreen->summary.sanity == TRUE) text = gText_EggWillTakeALongTime; else if (sum->friendship <= 5) text = gText_EggAboutToHatch; @@ -3237,9 +3237,9 @@ static void PrintEggState(void) static void PrintEggMemo(void) { const u8 *text; - struct PokeSummary *sum = &sMonSummaryScreenData->summary; + struct PokeSummary *sum = &sMonSummaryScreen->summary; - if (sMonSummaryScreenData->summary.sanity != 1) + if (sMonSummaryScreen->summary.sanity != 1) { if (sum->metLocation == METLOC_FATEFUL_ENCOUNTER) text = gText_PeculiarEggNicePlace; @@ -3308,17 +3308,17 @@ static void PrintHeldItemName(void) const u8 *text; int offset; - if (sMonSummaryScreenData->summary.item == ITEM_ENIGMA_BERRY && IsMultiBattle() == TRUE && (sMonSummaryScreenData->curMonIndex == 1 || sMonSummaryScreenData->curMonIndex == 4 || sMonSummaryScreenData->curMonIndex == 5)) + if (sMonSummaryScreen->summary.item == ITEM_ENIGMA_BERRY && IsMultiBattle() == TRUE && (sMonSummaryScreen->curMonIndex == 1 || sMonSummaryScreen->curMonIndex == 4 || sMonSummaryScreen->curMonIndex == 5)) { text = ItemId_GetName(ITEM_ENIGMA_BERRY); } - else if (sMonSummaryScreenData->summary.item == ITEM_NONE) + else if (sMonSummaryScreen->summary.item == ITEM_NONE) { text = gText_None; } else { - CopyItemName(sMonSummaryScreenData->summary.item, gStringVar1); + CopyItemName(sMonSummaryScreen->summary.item, gStringVar1); text = gStringVar1; } @@ -3331,13 +3331,13 @@ static void PrintRibbonCount(void) const u8 *text; int offset; - if (sMonSummaryScreenData->summary.ribbonCount == 0) + if (sMonSummaryScreen->summary.ribbonCount == 0) { text = gText_None; } else { - ConvertIntToDecimalStringN(gStringVar1, sMonSummaryScreenData->summary.ribbonCount, 1, 2); + ConvertIntToDecimalStringN(gStringVar1, sMonSummaryScreen->summary.ribbonCount, 1, 2); StringExpandPlaceholders(gStringVar4, gText_RibbonsVar1); text = gStringVar4; } @@ -3353,10 +3353,10 @@ static void BufferLeftColumnStats(void) u8 *attackString = Alloc(8); u8 *defenseString = Alloc(8); - ConvertIntToDecimalStringN(currentHPString, sMonSummaryScreenData->summary.currentHP, 1, 3); - ConvertIntToDecimalStringN(maxHPString, sMonSummaryScreenData->summary.maxHP, 1, 3); - ConvertIntToDecimalStringN(attackString, sMonSummaryScreenData->summary.atk, 1, 7); - ConvertIntToDecimalStringN(defenseString, sMonSummaryScreenData->summary.def, 1, 7); + ConvertIntToDecimalStringN(currentHPString, sMonSummaryScreen->summary.currentHP, 1, 3); + ConvertIntToDecimalStringN(maxHPString, sMonSummaryScreen->summary.maxHP, 1, 3); + ConvertIntToDecimalStringN(attackString, sMonSummaryScreen->summary.atk, 1, 7); + ConvertIntToDecimalStringN(defenseString, sMonSummaryScreen->summary.def, 1, 7); DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, currentHPString); @@ -3378,9 +3378,9 @@ static void PrintLeftColumnStats(void) static void BufferRightColumnStats(void) { - ConvertIntToDecimalStringN(gStringVar1, sMonSummaryScreenData->summary.spatk, 1, 3); - ConvertIntToDecimalStringN(gStringVar2, sMonSummaryScreenData->summary.spdef, 1, 3); - ConvertIntToDecimalStringN(gStringVar3, sMonSummaryScreenData->summary.speed, 1, 3); + ConvertIntToDecimalStringN(gStringVar1, sMonSummaryScreen->summary.spatk, 1, 3); + ConvertIntToDecimalStringN(gStringVar2, sMonSummaryScreen->summary.spdef, 1, 3); + ConvertIntToDecimalStringN(gStringVar3, sMonSummaryScreen->summary.speed, 1, 3); DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); @@ -3396,7 +3396,7 @@ static void PrintRightColumnStats(void) static void PrintExpPointsNextLevel(void) { - struct PokeSummary *sum = &sMonSummaryScreenData->summary; + struct PokeSummary *sum = &sMonSummaryScreen->summary; u8 windowId = AddWindowFromTemplateList(sPageSkillsTemplate, PSS_DATA_WINDOW_EXP); int offset; u32 expToNextLevel; @@ -3422,17 +3422,17 @@ static void PrintBattleMoves(void) PrintMoveNameAndPP(2); PrintMoveNameAndPP(3); - if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE) { PrintNewMoveDetailsOrCancelText(); - if (sMonSummaryScreenData->firstMoveIndex == MAX_MON_MOVES) + if (sMonSummaryScreen->firstMoveIndex == MAX_MON_MOVES) { - if (sMonSummaryScreenData->newMove != MOVE_NONE) - PrintMoveDetails(sMonSummaryScreenData->newMove); + if (sMonSummaryScreen->newMove != MOVE_NONE) + PrintMoveDetails(sMonSummaryScreen->newMove); } else { - PrintMoveDetails(sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]); + PrintMoveDetails(sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex]); } } } @@ -3456,22 +3456,22 @@ static void Task_PrintBattleMoves(u8 taskId) PrintMoveNameAndPP(3); break; case 5: - if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE) PrintNewMoveDetailsOrCancelText(); break; case 6: - if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE) { - if (sMonSummaryScreenData->firstMoveIndex == MAX_MON_MOVES) - data[1] = sMonSummaryScreenData->newMove; + if (sMonSummaryScreen->firstMoveIndex == MAX_MON_MOVES) + data[1] = sMonSummaryScreen->newMove; else - data[1] = sMonSummaryScreenData->summary.moves[sMonSummaryScreenData->firstMoveIndex]; + data[1] = sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex]; } break; case 7: - if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE) { - if (sMonSummaryScreenData->newMove != MOVE_NONE || sMonSummaryScreenData->firstMoveIndex != MAX_MON_MOVES) + if (sMonSummaryScreen->newMove != MOVE_NONE || sMonSummaryScreen->firstMoveIndex != MAX_MON_MOVES) PrintMoveDetails(data[1]); } break; @@ -3488,7 +3488,7 @@ static void PrintMoveNameAndPP(u8 moveIndex) u32 ppState; const u8 *text; u32 offset; - struct PokemonSummaryScreenData *summaryStruct = sMonSummaryScreenData; + struct PokemonSummaryScreenData *summaryStruct = sMonSummaryScreen; u8 moveNameWindowId = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_NAMES); u8 ppValueWindowId = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_PP); u16 move = summaryStruct->summary.moves[moveIndex]; @@ -3558,10 +3558,10 @@ static void PrintContestMoves(void) PrintMoveNameAndPP(2); PrintMoveNameAndPP(3); - if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE) { PrintNewMoveDetailsOrCancelText(); - PrintContestMoveDescription(sMonSummaryScreenData->firstMoveIndex); + PrintContestMoveDescription(sMonSummaryScreen->firstMoveIndex); } } @@ -3585,14 +3585,14 @@ static void Task_PrintContestMoves(u8 taskId) PrintMoveNameAndPP(3); break; case 4: - if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE) PrintNewMoveDetailsOrCancelText(); break; case 5: - if (sMonSummaryScreenData->mode == PSS_MODE_SELECT_MOVE) + if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE) { - if (sMonSummaryScreenData->newMove != MOVE_NONE || sMonSummaryScreenData->firstMoveIndex != MAX_MON_MOVES) - PrintContestMoveDescription(sMonSummaryScreenData->firstMoveIndex); + if (sMonSummaryScreen->newMove != MOVE_NONE || sMonSummaryScreen->firstMoveIndex != MAX_MON_MOVES) + PrintContestMoveDescription(sMonSummaryScreen->firstMoveIndex); } break; case 6: @@ -3607,9 +3607,9 @@ static void PrintContestMoveDescription(u8 moveSlot) u16 move; if (moveSlot == MAX_MON_MOVES) - move = sMonSummaryScreenData->newMove; + move = sMonSummaryScreen->newMove; else - move = sMonSummaryScreenData->summary.moves[moveSlot]; + move = sMonSummaryScreen->summary.moves[moveSlot]; if (move != MOVE_NONE) { @@ -3624,7 +3624,7 @@ static void PrintMoveDetails(u16 move) FillWindowPixelBuffer(windowId, PIXEL_FILL(0)); if (move != MOVE_NONE) { - if (sMonSummaryScreenData->currPageIndex == PSS_MODE_BOX) + if (sMonSummaryScreen->currPageIndex == PSS_MODE_BOX) { PrintMovePowerAndAccuracy(move); SummaryScreen_PrintTextOnWindow(windowId, gMoveDescriptionPointers[move - 1], 6, 1, 0, 0); @@ -3648,15 +3648,15 @@ static void PrintNewMoveDetailsOrCancelText(void) u8 windowId1 = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_NAMES); u8 windowId2 = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_PP); - if (sMonSummaryScreenData->newMove == MOVE_NONE) + if (sMonSummaryScreen->newMove == MOVE_NONE) { SummaryScreen_PrintTextOnWindow(windowId1, gText_Cancel, 0, 65, 0, 1); } else { - u16 move = sMonSummaryScreenData->newMove; + u16 move = sMonSummaryScreen->newMove; - if (sMonSummaryScreenData->currPageIndex == 2) + if (sMonSummaryScreen->currPageIndex == 2) SummaryScreen_PrintTextOnWindow(windowId1, gMoveNames[move], 0, 65, 0, 6); else SummaryScreen_PrintTextOnWindow(windowId1, gMoveNames[move], 0, 65, 0, 5); @@ -3703,24 +3703,24 @@ static void ResetSpriteIds(void) { u8 i; - for (i = 0; i < ARRAY_COUNT(sMonSummaryScreenData->spriteIds); i++) + for (i = 0; i < ARRAY_COUNT(sMonSummaryScreen->spriteIds); i++) { - sMonSummaryScreenData->spriteIds[i] = 0xFF; + sMonSummaryScreen->spriteIds[i] = 0xFF; } } static void DestroySpriteInArray(u8 spriteArrayId) { - if (sMonSummaryScreenData->spriteIds[spriteArrayId] != 0xFF) + if (sMonSummaryScreen->spriteIds[spriteArrayId] != 0xFF) { - DestroySprite(&gSprites[sMonSummaryScreenData->spriteIds[spriteArrayId]]); - sMonSummaryScreenData->spriteIds[spriteArrayId] = 0xFF; + DestroySprite(&gSprites[sMonSummaryScreen->spriteIds[spriteArrayId]]); + sMonSummaryScreen->spriteIds[spriteArrayId] = 0xFF; } } static void SetSpriteInvisibility(u8 spriteArrayId, bool8 invisible) { - gSprites[sMonSummaryScreenData->spriteIds[spriteArrayId]].invisible = invisible; + gSprites[sMonSummaryScreen->spriteIds[spriteArrayId]].invisible = invisible; } static void HidePageSpecificSprites(void) @@ -3728,16 +3728,16 @@ static void HidePageSpecificSprites(void) // Keeps Pokémon, caught ball and status sprites visible. u8 i; - for (i = 3; i < ARRAY_COUNT(sMonSummaryScreenData->spriteIds); i++) + for (i = 3; i < ARRAY_COUNT(sMonSummaryScreen->spriteIds); i++) { - if (sMonSummaryScreenData->spriteIds[i] != 0xFF) + if (sMonSummaryScreen->spriteIds[i] != 0xFF) SetSpriteInvisibility(i, TRUE); } } static void SetTypeIcons(void) { - switch (sMonSummaryScreenData->currPageIndex) + switch (sMonSummaryScreen->currPageIndex) { case PSS_PAGE_INFO: SetMonTypeIcons(); @@ -3759,8 +3759,8 @@ static void CreateMoveTypeIcons(void) for (i = 3; i < 8; i++) { - if (sMonSummaryScreenData->spriteIds[i] == 0xFF) - sMonSummaryScreenData->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2); + if (sMonSummaryScreen->spriteIds[i] == 0xFF) + sMonSummaryScreen->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2); SetSpriteInvisibility(i, TRUE); } @@ -3768,7 +3768,7 @@ static void CreateMoveTypeIcons(void) static void SetMoveTypeSpritePosAndType(u8 typeId, u8 x, u8 y, u8 spriteArrayId) { - struct Sprite *sprite = &gSprites[sMonSummaryScreenData->spriteIds[spriteArrayId]]; + struct Sprite *sprite = &gSprites[sMonSummaryScreen->spriteIds[spriteArrayId]]; StartSpriteAnim(sprite, typeId); sprite->oam.paletteNum = sMoveTypeToOamPaletteNum[typeId]; sprite->pos1.x = x + 16; @@ -3778,7 +3778,7 @@ static void SetMoveTypeSpritePosAndType(u8 typeId, u8 x, u8 y, u8 spriteArrayId) static void SetMonTypeIcons(void) { - struct PokeSummary *summary = &sMonSummaryScreenData->summary; + struct PokeSummary *summary = &sMonSummaryScreen->summary; if (summary->isEgg) { SetMoveTypeSpritePosAndType(TYPE_MYSTERY, 120, 48, 3); @@ -3802,7 +3802,7 @@ static void SetMonTypeIcons(void) static void SetMoveTypeIcons(void) { u8 i; - struct PokeSummary *summary = &sMonSummaryScreenData->summary; + struct PokeSummary *summary = &sMonSummaryScreen->summary; for (i = 0; i < MAX_MON_MOVES; i++) { if (summary->moves[i] != MOVE_NONE) @@ -3815,7 +3815,7 @@ static void SetMoveTypeIcons(void) static void SetContestMoveTypeIcons(void) { u8 i; - struct PokeSummary *summary = &sMonSummaryScreenData->summary; + struct PokeSummary *summary = &sMonSummaryScreen->summary; for (i = 0; i < MAX_MON_MOVES; i++) { if (summary->moves[i] != MOVE_NONE) @@ -3827,23 +3827,23 @@ static void SetContestMoveTypeIcons(void) static void SetNewMoveTypeIcon(void) { - if (sMonSummaryScreenData->newMove == MOVE_NONE) + if (sMonSummaryScreen->newMove == MOVE_NONE) { SetSpriteInvisibility(7, TRUE); } else { - if (sMonSummaryScreenData->currPageIndex == 2) - SetMoveTypeSpritePosAndType(gBattleMoves[sMonSummaryScreenData->newMove].type, 85, 96, 7); + if (sMonSummaryScreen->currPageIndex == 2) + SetMoveTypeSpritePosAndType(gBattleMoves[sMonSummaryScreen->newMove].type, 85, 96, 7); else - SetMoveTypeSpritePosAndType(NUMBER_OF_MON_TYPES + gContestMoves[sMonSummaryScreenData->newMove].contestCategory, 85, 96, 7); + SetMoveTypeSpritePosAndType(NUMBER_OF_MON_TYPES + gContestMoves[sMonSummaryScreen->newMove].contestCategory, 85, 96, 7); } } static void sub_81C4568(u8 a0, u8 a1) { - struct Sprite *sprite1 = &gSprites[sMonSummaryScreenData->spriteIds[a0 + 3]]; - struct Sprite *sprite2 = &gSprites[sMonSummaryScreenData->spriteIds[a1 + 3]]; + struct Sprite *sprite1 = &gSprites[sMonSummaryScreen->spriteIds[a0 + 3]]; + struct Sprite *sprite2 = &gSprites[sMonSummaryScreen->spriteIds[a1 + 3]]; u8 temp = sprite1->animNum; sprite1->animNum = sprite2->animNum; @@ -3862,7 +3862,7 @@ static void sub_81C4568(u8 a0, u8 a1) static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1) { const struct CompressedSpritePalette *pal; - struct PokeSummary *summary = &sMonSummaryScreenData->summary; + struct PokeSummary *summary = &sMonSummaryScreen->summary; switch (*a1) { @@ -3871,7 +3871,7 @@ static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1) case 0: if (gMain.inBattle) { - if (sub_80688F8(3, sMonSummaryScreenData->curMonIndex)) + if (sub_80688F8(3, sMonSummaryScreen->curMonIndex)) { HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[summary->species2], gMonSpritesGfxPtr->sprites[1], summary->species2, summary->pid); } @@ -3884,7 +3884,7 @@ static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1) { if (gMonSpritesGfxPtr != NULL) { - if (sMonSummaryScreenData->monList.mons == gPlayerParty || sMonSummaryScreenData->mode == PSS_MODE_BOX || sMonSummaryScreenData->unk40EF == TRUE) + if (sMonSummaryScreen->monList.mons == gPlayerParty || sMonSummaryScreen->mode == PSS_MODE_BOX || sMonSummaryScreen->unk40EF == TRUE) { HandleLoadSpecialPokePic_2(&gMonFrontPicTable[summary->species2], gMonSpritesGfxPtr->sprites[1], summary->species2, summary->pid); } @@ -3895,7 +3895,7 @@ static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1) } else { - if (sMonSummaryScreenData->monList.mons == gPlayerParty || sMonSummaryScreenData->mode == PSS_MODE_BOX || sMonSummaryScreenData->unk40EF == TRUE) + if (sMonSummaryScreen->monList.mons == gPlayerParty || sMonSummaryScreen->mode == PSS_MODE_BOX || sMonSummaryScreen->unk40EF == TRUE) { HandleLoadSpecialPokePic_2(&gMonFrontPicTable[summary->species2], sub_806F4F8(0, 1), summary->species2, summary->pid); } @@ -3918,10 +3918,10 @@ static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1) static void PlayMonCry(void) { - struct PokeSummary *summary = &sMonSummaryScreenData->summary; + struct PokeSummary *summary = &sMonSummaryScreen->summary; if (!summary->isEgg) { - if (ShouldPlayNormalMonCry(&sMonSummaryScreenData->currentMon) == TRUE) + if (ShouldPlayNormalMonCry(&sMonSummaryScreen->currentMon) == TRUE) { PlayCry3(summary->species2, 0, 0); } @@ -3934,7 +3934,7 @@ static void PlayMonCry(void) static u8 sub_81C47B4(struct Pokemon *unused) { - struct PokeSummary *summary = &sMonSummaryScreenData->summary; + struct PokeSummary *summary = &sMonSummaryScreen->summary; u8 spriteId = CreateSprite(&gMultiuseSpriteTemplate, 40, 64, 5); struct Sprite *sprite = &gSprites[spriteId]; @@ -3959,7 +3959,7 @@ static u8 sub_81C47B4(struct Pokemon *unused) static void SpriteCB_Pokemon(struct Sprite *sprite) { - struct PokeSummary *summary = &sMonSummaryScreenData->summary; + struct PokeSummary *summary = &sMonSummaryScreen->summary; if (!gPaletteFade.active && sprite->data[2] != 1) { @@ -3985,7 +3985,7 @@ void SummaryScreen_DestroyUnknownTask(void) static bool32 SummaryScreen_DoesSpriteHaveCallback(void) { - if (gSprites[sMonSummaryScreenData->spriteIds[0]].callback == SpriteCallbackDummy) + if (gSprites[sMonSummaryScreen->spriteIds[0]].callback == SpriteCallbackDummy) { return FALSE; } @@ -4000,11 +4000,11 @@ static void StopPokemonAnimations(void) // A subtle effect, this function stops u16 i; u16 paletteIndex; - gSprites[sMonSummaryScreenData->spriteIds[0]].animPaused = TRUE; - gSprites[sMonSummaryScreenData->spriteIds[0]].callback = SpriteCallbackDummy; + gSprites[sMonSummaryScreen->spriteIds[0]].animPaused = TRUE; + gSprites[sMonSummaryScreen->spriteIds[0]].callback = SpriteCallbackDummy; StopPokemonAnimationDelayTask(); - paletteIndex = (gSprites[sMonSummaryScreenData->spriteIds[0]].oam.paletteNum * 16) | 0x100; + paletteIndex = (gSprites[sMonSummaryScreen->spriteIds[0]].oam.paletteNum * 16) | 0x100; for (i = 0; i < 16; i++) { @@ -4016,20 +4016,20 @@ static void CreateMonMarkingsSprite(struct Pokemon *mon) { struct Sprite *sprite = sub_811FF94(30003, 30003, sSummaryMarkingsPalette); - sMonSummaryScreenData->markingsSprite = sprite; + sMonSummaryScreen->markingsSprite = sprite; if (sprite != NULL) { StartSpriteAnim(sprite, GetMonData(mon, MON_DATA_MARKINGS)); - sMonSummaryScreenData->markingsSprite->pos1.x = 60; - sMonSummaryScreenData->markingsSprite->pos1.y = 26; - sMonSummaryScreenData->markingsSprite->oam.priority = 1; + sMonSummaryScreen->markingsSprite->pos1.x = 60; + sMonSummaryScreen->markingsSprite->pos1.y = 26; + sMonSummaryScreen->markingsSprite->oam.priority = 1; } } static void RemoveAndCreateMonMarkingsSprite(struct Pokemon *mon) { - DestroySprite(sMonSummaryScreenData->markingsSprite); + DestroySprite(sMonSummaryScreen->markingsSprite); FreeSpriteTilesByTag(30003); CreateMonMarkingsSprite(mon); } @@ -4039,14 +4039,14 @@ static void CreateCaughtBallSprite(struct Pokemon *mon) u8 ball = ItemIdToBallId(GetMonData(mon, MON_DATA_POKEBALL)); LoadBallGfx(ball); - sMonSummaryScreenData->spriteIds[1] = CreateSprite(&gBallSpriteTemplates[ball], 16, 136, 0); - gSprites[sMonSummaryScreenData->spriteIds[1]].callback = SpriteCallbackDummy; - gSprites[sMonSummaryScreenData->spriteIds[1]].oam.priority = 3; + sMonSummaryScreen->spriteIds[1] = CreateSprite(&gBallSpriteTemplates[ball], 16, 136, 0); + gSprites[sMonSummaryScreen->spriteIds[1]].callback = SpriteCallbackDummy; + gSprites[sMonSummaryScreen->spriteIds[1]].oam.priority = 3; } static void CreateSetStatusSprite(void) { - u8 *spriteId = &sMonSummaryScreenData->spriteIds[2]; + u8 *spriteId = &sMonSummaryScreen->spriteIds[2]; u8 anim; if (*spriteId == 0xFF) @@ -4054,7 +4054,7 @@ static void CreateSetStatusSprite(void) *spriteId = CreateSprite(&sSpriteTemplate_StatusCondition, 64, 152, 0); } - anim = GetMonAilment(&sMonSummaryScreenData->currentMon); + anim = GetMonAilment(&sMonSummaryScreen->currentMon); if (anim != 0) { @@ -4070,9 +4070,9 @@ static void CreateSetStatusSprite(void) static void sub_81C4AF8(u8 a0) { u8 i; - u8 *spriteIds = &sMonSummaryScreenData->spriteIds[a0]; + u8 *spriteIds = &sMonSummaryScreen->spriteIds[a0]; - if (sMonSummaryScreenData->currPageIndex > 1) + if (sMonSummaryScreen->currPageIndex > 1) { u8 subsprite = 0; if (a0 == 8) @@ -4124,11 +4124,11 @@ static void sub_81C4BE4(struct Sprite *sprite) if (sprite->data[0] == 8) { - sprite->pos2.y = sMonSummaryScreenData->firstMoveIndex * 16; + sprite->pos2.y = sMonSummaryScreen->firstMoveIndex * 16; } else { - sprite->pos2.y = sMonSummaryScreenData->secondMoveIndex * 16; + sprite->pos2.y = sMonSummaryScreen->secondMoveIndex * 16; } } @@ -4144,7 +4144,7 @@ static void sub_81C4C60(u8 a0) static void sub_81C4C84(u8 a0) { u8 i; - u8 *spriteIds = &sMonSummaryScreenData->spriteIds[8]; + u8 *spriteIds = &sMonSummaryScreen->spriteIds[8]; a0 *= 3; for (i = 0; i < 10; i++) @@ -4167,7 +4167,7 @@ static void sub_81C4C84(u8 a0) static void sub_81C4D18(u8 firstSpriteId) { u8 i; - u8 *spriteIds = &sMonSummaryScreenData->spriteIds[firstSpriteId]; + u8 *spriteIds = &sMonSummaryScreen->spriteIds[firstSpriteId]; for (i = 0; i < 10; i++) { From 622096a9d3b5c7c94fc3db385904d36b01890edb Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 8 Mar 2019 04:00:11 -0500 Subject: [PATCH 198/217] spaces => tabs --- sym_ewram.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sym_ewram.txt b/sym_ewram.txt index 215560111c..e4b315c925 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -180,10 +180,10 @@ gPlayerFacingPosition: @ 203AB40 .include "src/pokeblock.o" .include "src/field_specials.o" - .include "src/battle_records.o" - .include "src/pokedex_area_screen.o" - .include "src/evolution_scene.o" - .include "src/roulette.o" + .include "src/battle_records.o" + .include "src/pokedex_area_screen.o" + .include "src/evolution_scene.o" + .include "src/roulette.o" .include "src/pokedex_cry_screen.o" .include "src/coins.o" .include "src/battle_transition.o" @@ -237,7 +237,7 @@ gUnknown_0203CF40: @ 203CF40 gUnknown_0203CF44: @ 203CF44 .space 0x4 - .include "src/menu_specialized.o" + .include "src/menu_specialized.o" gUnknown_0203CF50: @ 203CF50 .space 0x4 From c3feb9871f4d05cd9874dd8fc0c2016eaa072864 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 8 Mar 2019 04:02:05 -0500 Subject: [PATCH 199/217] Use PIXEL_FILL macro --- src/menu_specialized.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/menu_specialized.c b/src/menu_specialized.c index bf5d2ec564..8371c7a70a 100644 --- a/src/menu_specialized.c +++ b/src/menu_specialized.c @@ -1581,7 +1581,7 @@ void InitMoveRelearnerWindows(bool8 useContextWindow) for (i = 0; i < 5; i++) { - FillWindowPixelBuffer(i, 0x11); + FillWindowPixelBuffer(i, PIXEL_FILL(1)); } if (!useContextWindow) @@ -1635,7 +1635,7 @@ static void MoveRelearnerLoadBattleMoveDescription(u32 chosenMove) u8 buffer[0x20]; const u8 *labelStr; - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); labelStr = gText_MoveRelearnerBattleMoves; offset = GetStringCenterAlignXOffset(1, labelStr, 0x80); AddTextPrinterParameterized(0, 1, labelStr, offset, 1, TEXT_SPEED_FF, NULL); @@ -1913,7 +1913,7 @@ static void MoveRelearnerMenuLoadContestMoveDescription(u32 chosenMove) const u8 **temp; MoveRelearnerShowHideHearts(chosenMove); - FillWindowPixelBuffer(1, 0x11); + FillWindowPixelBuffer(1, PIXEL_FILL(1)); labelStr = gText_MoveRelearnerContestMovesTitle; // GCC compiles these as: // add r3, r0, 0 @@ -2076,7 +2076,7 @@ void MoveRelearnerPrintText(u8 *str) { u8 speed; - FillWindowPixelBuffer(3, 0x11); + FillWindowPixelBuffer(3, PIXEL_FILL(1)); gTextFlags.canABSpeedUpPrint = TRUE; speed = GetPlayerTextSpeedDelay(); AddTextPrinterParameterized2(3, 1, str, speed, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, 3); From 8e1537fb57dc7ed17079b30f7a3851132cf462bd Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 10 Mar 2019 08:10:59 -0400 Subject: [PATCH 200/217] Document map name popup flag --- data/event_scripts.s | 4 ++-- data/maps/InsideOfTruck/scripts.inc | 2 +- data/maps/LavaridgeTown/scripts.inc | 4 ++-- data/maps/LittlerootTown/scripts.inc | 6 +++--- data/maps/PetalburgCity/scripts.inc | 8 ++++---- data/maps/Route101/scripts.inc | 4 ++-- data/maps/Route128/scripts.inc | 2 +- data/maps/RustboroCity/scripts.inc | 4 ++-- data/maps/SeafloorCavern_Room9/scripts.inc | 2 +- data/maps/SkyPillar_Outside/scripts.inc | 4 ++-- data/maps/SlateportCity/scripts.inc | 4 ++-- data/maps/SootopolisCity/scripts.inc | 10 +++++----- include/constants/flags.h | 2 +- src/field_special_scene.c | 4 ++-- src/map_name_popup.c | 2 +- 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 1175c8d00a..67351d184f 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -3161,7 +3161,7 @@ Route118_EventScript_273D13:: @ 8273D13 Route125_EventScript_273D13:: @ 8273D13 Route127_EventScript_273D13:: @ 8273D13 Route129_EventScript_273D13:: @ 8273D13 - setflag FLAG_SPECIAL_FLAG_0x4000 + setflag FLAG_HIDE_MAP_NAME_POPUP return UnusualWeather_StartKyogreWeather:: @ 8273D17 @@ -3188,7 +3188,7 @@ UnusualWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31 special DrawWholeMapView setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 0 - clearflag FLAG_SPECIAL_FLAG_0x4000 + clearflag FLAG_HIDE_MAP_NAME_POPUP fadescreenswapbuffers 0 releaseall end diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 672b2003b8..0f7f5447d1 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -15,7 +15,7 @@ InsideOfTruck_MapScript1_23BF01: @ 823BF01 InsideOfTruck_EventScript_23BF04:: @ 823BF04 lockall - setflag FLAG_SPECIAL_FLAG_0x4000 + setflag FLAG_HIDE_MAP_NAME_POPUP checkplayergender compare VAR_RESULT, MALE goto_if_eq InsideOfTruck_EventScript_23BF20 diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 5c1612199b..acbb3fcd26 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -37,7 +37,7 @@ LavaridgeTown_EventScript_1EA53F:: @ 81EA53F return LavaridgeTown_EventScript_1EA543:: @ 81EA543 - setflag FLAG_SPECIAL_FLAG_0x4000 + setflag FLAG_HIDE_MAP_NAME_POPUP return LavaridgeTown_MapScript2_1EA547: @ 81EA547 @@ -95,7 +95,7 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF call_if_ne LavaridgeTown_EventScript_1EA6C9 removeobject 7 setvar VAR_LAVARIDGE_RIVAL_STATE, 2 - clearflag FLAG_SPECIAL_FLAG_0x4000 + clearflag FLAG_HIDE_MAP_NAME_POPUP savebgm MUS_DUMMY fadedefaultbgm releaseall diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index e133169bac..f347811f8f 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -31,7 +31,7 @@ LittlerootTown_EventScript_1E7E45:: @ 81E7E45 return LittlerootTown_EventScript_1E7E4B:: @ 81E7E4B - setflag FLAG_SPECIAL_FLAG_0x4000 + setflag FLAG_HIDE_MAP_NAME_POPUP return LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F @@ -141,7 +141,7 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN - clearflag FLAG_SPECIAL_FLAG_0x4000 + clearflag FLAG_HIDE_MAP_NAME_POPUP return LittlerootTown_Movement_1E7F98: @ 81E7F98 @@ -194,7 +194,7 @@ LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 clearflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH delay 20 - clearflag FLAG_SPECIAL_FLAG_0x4000 + clearflag FLAG_HIDE_MAP_NAME_POPUP warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate releaseall diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 5a652ab15f..c8b723383d 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -20,7 +20,7 @@ PetalburgCity_EventScript_1DC307:: @ 81DC307 return PetalburgCity_EventScript_1DC30F:: @ 81DC30F - setflag FLAG_SPECIAL_FLAG_0x4000 + setflag FLAG_HIDE_MAP_NAME_POPUP savebgm MUS_TSURETEK return @@ -48,7 +48,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E waitmovement 2, MAP_PETALBURG_CITY msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT closemessage - clearflag FLAG_SPECIAL_FLAG_0x4000 + clearflag FLAG_HIDE_MAP_NAME_POPUP setvar VAR_PETALBURG_STATE, 3 fadedefaultbgm clearflag FLAG_SPECIAL_FLAG_0x4001 @@ -61,7 +61,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E PetalburgCity_EventScript_1DC390:: @ 81DC390 lockall - setflag FLAG_SPECIAL_FLAG_0x4000 + setflag FLAG_HIDE_MAP_NAME_POPUP applymovement 5, PetalburgCity_Movement_1DC41B applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC406 waitmovement 0 @@ -76,7 +76,7 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim - clearflag FLAG_SPECIAL_FLAG_0x4000 + clearflag FLAG_HIDE_MAP_NAME_POPUP fadedefaultbgm clearflag FLAG_SPECIAL_FLAG_0x4001 warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4 diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index aa20ba2daf..47663e1ddf 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -12,7 +12,7 @@ Route101_MapScript2_1EBCCB: @ 81EBCCB .2byte 0 Route101_EventScript_1EBCD5:: @ 81EBCD5 - setflag FLAG_SPECIAL_FLAG_0x4000 + setflag FLAG_HIDE_MAP_NAME_POPUP setvar VAR_ROUTE101_STATE, 1 end @@ -236,7 +236,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16 setflag FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG setvar VAR_BIRCH_LAB_STATE, 2 setvar VAR_ROUTE101_STATE, 3 - clearflag FLAG_SPECIAL_FLAG_0x4000 + clearflag FLAG_HIDE_MAP_NAME_POPUP checkplayergender compare VAR_RESULT, MALE call_if_eq Route101_EventScript_1EBE85 diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 647d62b6a2..84091ac3ad 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -73,7 +73,7 @@ Route128_EventScript_1F6B57:: @ 81F6B57 delay 15 removeobject 3 waitfieldeffect 30 - clearflag FLAG_SPECIAL_FLAG_0x4000 + clearflag FLAG_HIDE_MAP_NAME_POPUP setvar VAR_ROUTE128_STATE, 2 releaseall end diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index f937113443..1ba63c9599 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -24,7 +24,7 @@ RustboroCity_EventScript_1E06FF:: @ 81E06FF end RustboroCity_EventScript_1E0707:: @ 81E0707 - setflag FLAG_SPECIAL_FLAG_0x4000 + setflag FLAG_HIDE_MAP_NAME_POPUP return RustboroCity_MapScript2_1E070B: @ 81E070B @@ -100,7 +100,7 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD removeobject 15 setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST setvar VAR_RUSTBORO_STATE, 7 - clearflag FLAG_SPECIAL_FLAG_0x4000 + clearflag FLAG_HIDE_MAP_NAME_POPUP releaseall end diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 38a10a0043..4c630a1d4a 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -140,7 +140,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 setflag FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS - setflag FLAG_SPECIAL_FLAG_0x4000 + setflag FLAG_HIDE_MAP_NAME_POPUP warp MAP_ROUTE128, 255, 38, 22 waitstate releaseall diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index 93d4e42c39..c4769c9901 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -12,7 +12,7 @@ SkyPillar_Outside_MapScript1_2392B8: @ 82392B8 end SkyPillar_Outside_EventScript_2392CF:: @ 82392CF - setflag FLAG_SPECIAL_FLAG_0x4000 + setflag FLAG_HIDE_MAP_NAME_POPUP return SkyPillar_Outside_EventScript_2392D3:: @ 82392D3 @@ -81,7 +81,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 closemessage playse SE_KAIDAN fadescreenswapbuffers 1 - clearflag FLAG_SPECIAL_FLAG_0x4000 + clearflag FLAG_HIDE_MAP_NAME_POPUP setvar VAR_RAYQUAZA_STATE, 4 removeobject 1 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index acf66d2bdb..1830c3f005 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -36,7 +36,7 @@ SlateportCity_EventScript_1DCC99:: @ 81DCC99 return SlateportCity_EventScript_1DCCE7:: @ 81DCCE7 - setflag FLAG_SPECIAL_FLAG_0x4000 + setflag FLAG_HIDE_MAP_NAME_POPUP getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 30 goto_if_eq SlateportCity_EventScript_1DCD06 @@ -83,7 +83,7 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C removeobject 35 setobjectxyperm 35, 10, 12 setobjectmovementtype 35, MOVEMENT_TYPE_FACE_DOWN - clearflag FLAG_SPECIAL_FLAG_0x4000 + clearflag FLAG_HIDE_MAP_NAME_POPUP setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 2 addvar VAR_SCOTT_STATE, 1 releaseall diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index dbfe923f03..ad72120f9c 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -62,7 +62,7 @@ SootopolisCity_MapScript1_1E56EF: @ 81E56EF end SootopolisCity_EventScript_1E5781:: @ 81E5781 - setflag FLAG_SPECIAL_FLAG_0x4000 + setflag FLAG_HIDE_MAP_NAME_POPUP return SootopolisCity_EventScript_1E5785:: @ 81E5785 @@ -272,7 +272,7 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 waitmovement 0 special RemoveCameraObject setvar VAR_RAYQUAZA_STATE, 2 - clearflag FLAG_SPECIAL_FLAG_0x4000 + clearflag FLAG_HIDE_MAP_NAME_POPUP releaseall end @@ -372,7 +372,7 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 waitmovement 0 special RemoveCameraObject setvar VAR_RAYQUAZA_STATE, 2 - clearflag FLAG_SPECIAL_FLAG_0x4000 + clearflag FLAG_HIDE_MAP_NAME_POPUP releaseall end @@ -544,7 +544,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS fadenewbgm MUS_RUNECITY delay 120 - clearflag FLAG_SPECIAL_FLAG_0x4000 + clearflag FLAG_HIDE_MAP_NAME_POPUP warp8 MAP_SOOTOPOLIS_CITY, 255, 43, 32 waitstate end @@ -597,7 +597,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS fadenewbgm MUS_NAMINORI delay 120 - clearflag FLAG_SPECIAL_FLAG_0x4000 + clearflag FLAG_HIDE_MAP_NAME_POPUP warp8 MAP_SOOTOPOLIS_CITY, 255, 29, 53 waitstate end diff --git a/include/constants/flags.h b/include/constants/flags.h index f0759389fd..230fbabaff 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1548,7 +1548,7 @@ // Special Flags (Unknown) #define SPECIAL_FLAGS_START 0x4000 -#define FLAG_SPECIAL_FLAG_0x4000 0x4000 +#define FLAG_HIDE_MAP_NAME_POPUP 0x4000 #define FLAG_SPECIAL_FLAG_0x4001 0x4001 #define FLAG_SPECIAL_FLAG_0x4002 0x4002 #define FLAG_SPECIAL_FLAG_0x4003 0x4003 diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 2b518808b0..e059e6ef8a 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -301,7 +301,7 @@ void Task_HandlePorthole(u8 taskId) break; case EXIT_PORTHOLE: // exit porthole. FlagClear(FLAG_SPECIAL_FLAG_0x4001); - FlagClear(FLAG_SPECIAL_FLAG_0x4000); + FlagClear(FLAG_HIDE_MAP_NAME_POPUP); SetWarpDestinationToDynamicWarp(0); DoDiveWarp(); DestroyTask(taskId); @@ -338,7 +338,7 @@ void sub_80FB7A4(void) { FlagSet(FLAG_SYS_CRUISE_MODE); FlagSet(FLAG_SPECIAL_FLAG_0x4001); - FlagSet(FLAG_SPECIAL_FLAG_0x4000); + FlagSet(FLAG_HIDE_MAP_NAME_POPUP); SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); sub_80FB59C(); sub_80AF8B8(); diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 8936198aeb..d95b808e92 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -207,7 +207,7 @@ bool8 sub_80D47D4(void) void ShowMapNamePopup(void) { - if (FlagGet(FLAG_SPECIAL_FLAG_0x4000) != TRUE) + if (FlagGet(FLAG_HIDE_MAP_NAME_POPUP) != TRUE) { if (!FuncIsActiveTask(Task_MapNamePopUpWindow)) { From 14211fb4953a25ada33b2aa1618b90cb46b211b7 Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 14 Mar 2019 16:19:54 -0400 Subject: [PATCH 201/217] fix incbin paths --- src/anim_mon_front_pics.c | 830 +++--- src/data/graphics/pokemon.h | 5560 +++++++++++++++++------------------ 2 files changed, 3195 insertions(+), 3195 deletions(-) diff --git a/src/anim_mon_front_pics.c b/src/anim_mon_front_pics.c index ba53ba1936..f2480ea20f 100644 --- a/src/anim_mon_front_pics.c +++ b/src/anim_mon_front_pics.c @@ -1,424 +1,424 @@ #include "global.h" -const u32 gMonFrontPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/anim_front_pics/circled_question_mark_front_pic.4bpp.lz"); +const u32 gMonFrontPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/anim_front_pics/bulbasaur_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ivysaur_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Venusaur[] = INCBIN_U32("graphics/pokemon/anim_front_pics/venusaur_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Charmander[] = INCBIN_U32("graphics/pokemon/anim_front_pics/charmander_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/charmeleon_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Charizard[] = INCBIN_U32("graphics/pokemon/anim_front_pics/charizard_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Squirtle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/squirtle_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Wartortle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wartortle_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Blastoise[] = INCBIN_U32("graphics/pokemon/anim_front_pics/blastoise_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Caterpie[] = INCBIN_U32("graphics/pokemon/anim_front_pics/caterpie_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Metapod[] = INCBIN_U32("graphics/pokemon/anim_front_pics/metapod_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Butterfree[] = INCBIN_U32("graphics/pokemon/anim_front_pics/butterfree_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Weedle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/weedle_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Kakuna[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kakuna_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Beedrill[] = INCBIN_U32("graphics/pokemon/anim_front_pics/beedrill_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Pidgey[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pidgey_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pidgeotto_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pidgeot_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Rattata[] = INCBIN_U32("graphics/pokemon/anim_front_pics/rattata_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Raticate[] = INCBIN_U32("graphics/pokemon/anim_front_pics/raticate_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Spearow[] = INCBIN_U32("graphics/pokemon/anim_front_pics/spearow_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Fearow[] = INCBIN_U32("graphics/pokemon/anim_front_pics/fearow_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Ekans[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ekans_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Arbok[] = INCBIN_U32("graphics/pokemon/anim_front_pics/arbok_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Pikachu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pikachu_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Raichu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/raichu_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sandshrew_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Sandslash[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sandslash_front_pic.4bpp.lz"); -const u32 gMonFrontPic_NidoranF[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nidoran_f_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Nidorina[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nidorina_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nidoqueen_front_pic.4bpp.lz"); -const u32 gMonFrontPic_NidoranM[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nidoran_m_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Nidorino[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nidorino_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Nidoking[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nidoking_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Clefairy[] = INCBIN_U32("graphics/pokemon/anim_front_pics/clefairy_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Clefable[] = INCBIN_U32("graphics/pokemon/anim_front_pics/clefable_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Vulpix[] = INCBIN_U32("graphics/pokemon/anim_front_pics/vulpix_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Ninetales[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ninetales_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/anim_front_pics/jigglypuff_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wigglytuff_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Zubat[] = INCBIN_U32("graphics/pokemon/anim_front_pics/zubat_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Golbat[] = INCBIN_U32("graphics/pokemon/anim_front_pics/golbat_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Oddish[] = INCBIN_U32("graphics/pokemon/anim_front_pics/oddish_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Gloom[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gloom_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Vileplume[] = INCBIN_U32("graphics/pokemon/anim_front_pics/vileplume_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Paras[] = INCBIN_U32("graphics/pokemon/anim_front_pics/paras_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Parasect[] = INCBIN_U32("graphics/pokemon/anim_front_pics/parasect_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Venonat[] = INCBIN_U32("graphics/pokemon/anim_front_pics/venonat_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Venomoth[] = INCBIN_U32("graphics/pokemon/anim_front_pics/venomoth_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Diglett[] = INCBIN_U32("graphics/pokemon/anim_front_pics/diglett_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dugtrio_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Meowth[] = INCBIN_U32("graphics/pokemon/anim_front_pics/meowth_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Persian[] = INCBIN_U32("graphics/pokemon/anim_front_pics/persian_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Psyduck[] = INCBIN_U32("graphics/pokemon/anim_front_pics/psyduck_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Golduck[] = INCBIN_U32("graphics/pokemon/anim_front_pics/golduck_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Mankey[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mankey_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Primeape[] = INCBIN_U32("graphics/pokemon/anim_front_pics/primeape_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Growlithe[] = INCBIN_U32("graphics/pokemon/anim_front_pics/growlithe_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Arcanine[] = INCBIN_U32("graphics/pokemon/anim_front_pics/arcanine_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Poliwag[] = INCBIN_U32("graphics/pokemon/anim_front_pics/poliwag_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/anim_front_pics/poliwhirl_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/anim_front_pics/poliwrath_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Abra[] = INCBIN_U32("graphics/pokemon/anim_front_pics/abra_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Kadabra[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kadabra_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Alakazam[] = INCBIN_U32("graphics/pokemon/anim_front_pics/alakazam_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Machop[] = INCBIN_U32("graphics/pokemon/anim_front_pics/machop_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Machoke[] = INCBIN_U32("graphics/pokemon/anim_front_pics/machoke_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Machamp[] = INCBIN_U32("graphics/pokemon/anim_front_pics/machamp_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/anim_front_pics/bellsprout_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/anim_front_pics/weepinbell_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Victreebel[] = INCBIN_U32("graphics/pokemon/anim_front_pics/victreebel_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Tentacool[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tentacool_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tentacruel_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Geodude[] = INCBIN_U32("graphics/pokemon/anim_front_pics/geodude_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Graveler[] = INCBIN_U32("graphics/pokemon/anim_front_pics/graveler_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Golem[] = INCBIN_U32("graphics/pokemon/anim_front_pics/golem_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Ponyta[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ponyta_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Rapidash[] = INCBIN_U32("graphics/pokemon/anim_front_pics/rapidash_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/anim_front_pics/slowpoke_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Slowbro[] = INCBIN_U32("graphics/pokemon/anim_front_pics/slowbro_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Magnemite[] = INCBIN_U32("graphics/pokemon/anim_front_pics/magnemite_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Magneton[] = INCBIN_U32("graphics/pokemon/anim_front_pics/magneton_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/anim_front_pics/farfetch_d_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Doduo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/doduo_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Dodrio[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dodrio_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Seel[] = INCBIN_U32("graphics/pokemon/anim_front_pics/seel_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Dewgong[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dewgong_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Grimer[] = INCBIN_U32("graphics/pokemon/anim_front_pics/grimer_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Muk[] = INCBIN_U32("graphics/pokemon/anim_front_pics/muk_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Shellder[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shellder_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Cloyster[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cloyster_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Gastly[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gastly_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Haunter[] = INCBIN_U32("graphics/pokemon/anim_front_pics/haunter_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Gengar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gengar_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Onix[] = INCBIN_U32("graphics/pokemon/anim_front_pics/onix_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Drowzee[] = INCBIN_U32("graphics/pokemon/anim_front_pics/drowzee_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Hypno[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hypno_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Krabby[] = INCBIN_U32("graphics/pokemon/anim_front_pics/krabby_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Kingler[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kingler_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Voltorb[] = INCBIN_U32("graphics/pokemon/anim_front_pics/voltorb_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Electrode[] = INCBIN_U32("graphics/pokemon/anim_front_pics/electrode_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/anim_front_pics/exeggcute_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/anim_front_pics/exeggutor_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Cubone[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cubone_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Marowak[] = INCBIN_U32("graphics/pokemon/anim_front_pics/marowak_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hitmonlee_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hitmonchan_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Lickitung[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lickitung_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Koffing[] = INCBIN_U32("graphics/pokemon/anim_front_pics/koffing_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Weezing[] = INCBIN_U32("graphics/pokemon/anim_front_pics/weezing_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/anim_front_pics/rhyhorn_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Rhydon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/rhydon_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Chansey[] = INCBIN_U32("graphics/pokemon/anim_front_pics/chansey_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Tangela[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tangela_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kangaskhan_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Horsea[] = INCBIN_U32("graphics/pokemon/anim_front_pics/horsea_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Seadra[] = INCBIN_U32("graphics/pokemon/anim_front_pics/seadra_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Goldeen[] = INCBIN_U32("graphics/pokemon/anim_front_pics/goldeen_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Seaking[] = INCBIN_U32("graphics/pokemon/anim_front_pics/seaking_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Staryu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/staryu_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Starmie[] = INCBIN_U32("graphics/pokemon/anim_front_pics/starmie_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Mrmime[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mr_mime_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Scyther[] = INCBIN_U32("graphics/pokemon/anim_front_pics/scyther_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/anim_front_pics/jynx_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/anim_front_pics/electabuzz_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Magmar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/magmar_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Pinsir[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pinsir_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Tauros[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tauros_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Magikarp[] = INCBIN_U32("graphics/pokemon/anim_front_pics/magikarp_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Gyarados[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gyarados_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Lapras[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lapras_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Ditto[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ditto_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Eevee[] = INCBIN_U32("graphics/pokemon/anim_front_pics/eevee_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/vaporeon_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Jolteon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/jolteon_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Flareon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/flareon_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Porygon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/porygon_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Omanyte[] = INCBIN_U32("graphics/pokemon/anim_front_pics/omanyte_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Omastar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/omastar_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Kabuto[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kabuto_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Kabutops[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kabutops_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/anim_front_pics/aerodactyl_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Snorlax[] = INCBIN_U32("graphics/pokemon/anim_front_pics/snorlax_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Articuno[] = INCBIN_U32("graphics/pokemon/anim_front_pics/articuno_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Zapdos[] = INCBIN_U32("graphics/pokemon/anim_front_pics/zapdos_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Moltres[] = INCBIN_U32("graphics/pokemon/anim_front_pics/moltres_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Dratini[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dratini_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Dragonair[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dragonair_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Dragonite[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dragonite_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mewtwo_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Mew[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mew_front_pic.4bpp.lz"); +const u32 gMonFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/anim_front.4bpp.lz"); +const u32 gMonFrontPic_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/anim_front.4bpp.lz"); +const u32 gMonFrontPic_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Paras[] = INCBIN_U32("graphics/pokemon/paras/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Persian[] = INCBIN_U32("graphics/pokemon/persian/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Abra[] = INCBIN_U32("graphics/pokemon/abra/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Machop[] = INCBIN_U32("graphics/pokemon/machop/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Golem[] = INCBIN_U32("graphics/pokemon/golem/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Seel[] = INCBIN_U32("graphics/pokemon/seel/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Muk[] = INCBIN_U32("graphics/pokemon/muk/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Onix[] = INCBIN_U32("graphics/pokemon/onix/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Mew[] = INCBIN_U32("graphics/pokemon/mew/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Chikorita[] = INCBIN_U32("graphics/pokemon/anim_front_pics/chikorita_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Bayleef[] = INCBIN_U32("graphics/pokemon/anim_front_pics/bayleef_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Meganium[] = INCBIN_U32("graphics/pokemon/anim_front_pics/meganium_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cyndaquil_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Quilava[] = INCBIN_U32("graphics/pokemon/anim_front_pics/quilava_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/anim_front_pics/typhlosion_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Totodile[] = INCBIN_U32("graphics/pokemon/anim_front_pics/totodile_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Croconaw[] = INCBIN_U32("graphics/pokemon/anim_front_pics/croconaw_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/anim_front_pics/feraligatr_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Sentret[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sentret_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Furret[] = INCBIN_U32("graphics/pokemon/anim_front_pics/furret_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hoothoot_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Noctowl[] = INCBIN_U32("graphics/pokemon/anim_front_pics/noctowl_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Ledyba[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ledyba_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Ledian[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ledian_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Spinarak[] = INCBIN_U32("graphics/pokemon/anim_front_pics/spinarak_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Ariados[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ariados_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Crobat[] = INCBIN_U32("graphics/pokemon/anim_front_pics/crobat_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Chinchou[] = INCBIN_U32("graphics/pokemon/anim_front_pics/chinchou_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Lanturn[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lanturn_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Pichu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pichu_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Cleffa[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cleffa_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/anim_front_pics/igglybuff_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Togepi[] = INCBIN_U32("graphics/pokemon/anim_front_pics/togepi_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Togetic[] = INCBIN_U32("graphics/pokemon/anim_front_pics/togetic_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Natu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/natu_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Xatu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/xatu_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Mareep[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mareep_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/anim_front_pics/flaaffy_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Ampharos[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ampharos_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Bellossom[] = INCBIN_U32("graphics/pokemon/anim_front_pics/bellossom_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Marill[] = INCBIN_U32("graphics/pokemon/anim_front_pics/marill_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Azumarill[] = INCBIN_U32("graphics/pokemon/anim_front_pics/azumarill_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sudowoodo_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Politoed[] = INCBIN_U32("graphics/pokemon/anim_front_pics/politoed_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Hoppip[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hoppip_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Skiploom[] = INCBIN_U32("graphics/pokemon/anim_front_pics/skiploom_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/anim_front_pics/jumpluff_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Aipom[] = INCBIN_U32("graphics/pokemon/anim_front_pics/aipom_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Sunkern[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sunkern_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Sunflora[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sunflora_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Yanma[] = INCBIN_U32("graphics/pokemon/anim_front_pics/yanma_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Wooper[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wooper_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Quagsire[] = INCBIN_U32("graphics/pokemon/anim_front_pics/quagsire_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Espeon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/espeon_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Umbreon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/umbreon_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Murkrow[] = INCBIN_U32("graphics/pokemon/anim_front_pics/murkrow_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Slowking[] = INCBIN_U32("graphics/pokemon/anim_front_pics/slowking_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/anim_front_pics/misdreavus_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownA[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_a_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wobbuffet_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Girafarig[] = INCBIN_U32("graphics/pokemon/anim_front_pics/girafarig_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Pineco[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pineco_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Forretress[] = INCBIN_U32("graphics/pokemon/anim_front_pics/forretress_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dunsparce_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Gligar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gligar_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Steelix[] = INCBIN_U32("graphics/pokemon/anim_front_pics/steelix_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Snubbull[] = INCBIN_U32("graphics/pokemon/anim_front_pics/snubbull_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Granbull[] = INCBIN_U32("graphics/pokemon/anim_front_pics/granbull_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/anim_front_pics/qwilfish_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Scizor[] = INCBIN_U32("graphics/pokemon/anim_front_pics/scizor_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Shuckle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shuckle_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Heracross[] = INCBIN_U32("graphics/pokemon/anim_front_pics/heracross_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Sneasel[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sneasel_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/anim_front_pics/teddiursa_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Ursaring[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ursaring_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Slugma[] = INCBIN_U32("graphics/pokemon/anim_front_pics/slugma_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Magcargo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/magcargo_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Swinub[] = INCBIN_U32("graphics/pokemon/anim_front_pics/swinub_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Piloswine[] = INCBIN_U32("graphics/pokemon/anim_front_pics/piloswine_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Corsola[] = INCBIN_U32("graphics/pokemon/anim_front_pics/corsola_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Remoraid[] = INCBIN_U32("graphics/pokemon/anim_front_pics/remoraid_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Octillery[] = INCBIN_U32("graphics/pokemon/anim_front_pics/octillery_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Delibird[] = INCBIN_U32("graphics/pokemon/anim_front_pics/delibird_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Mantine[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mantine_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Skarmory[] = INCBIN_U32("graphics/pokemon/anim_front_pics/skarmory_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Houndour[] = INCBIN_U32("graphics/pokemon/anim_front_pics/houndour_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Houndoom[] = INCBIN_U32("graphics/pokemon/anim_front_pics/houndoom_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Kingdra[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kingdra_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Phanpy[] = INCBIN_U32("graphics/pokemon/anim_front_pics/phanpy_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Donphan[] = INCBIN_U32("graphics/pokemon/anim_front_pics/donphan_front_pic.4bpp.lz"); +const u32 gMonFrontPic_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Furret[] = INCBIN_U32("graphics/pokemon/furret/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Natu[] = INCBIN_U32("graphics/pokemon/natu/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Marill[] = INCBIN_U32("graphics/pokemon/marill/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/anim_front.4bpp.lz"); +const u32 gMonFrontPic_UnownA[] = INCBIN_U32("graphics/pokemon/unown/anim_front_a.4bpp.lz"); +const u32 gMonFrontPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/anim_front.4bpp.lz"); const u32 gMonFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/anim_front_pics/porygon2_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Stantler[] = INCBIN_U32("graphics/pokemon/anim_front_pics/stantler_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Smeargle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/smeargle_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tyrogue_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hitmontop_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Smoochum[] = INCBIN_U32("graphics/pokemon/anim_front_pics/smoochum_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Elekid[] = INCBIN_U32("graphics/pokemon/anim_front_pics/elekid_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Magby[] = INCBIN_U32("graphics/pokemon/anim_front_pics/magby_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Miltank[] = INCBIN_U32("graphics/pokemon/anim_front_pics/miltank_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Blissey[] = INCBIN_U32("graphics/pokemon/anim_front_pics/blissey_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Raikou[] = INCBIN_U32("graphics/pokemon/anim_front_pics/raikou_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Entei[] = INCBIN_U32("graphics/pokemon/anim_front_pics/entei_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Suicune[] = INCBIN_U32("graphics/pokemon/anim_front_pics/suicune_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Larvitar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/larvitar_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Pupitar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pupitar_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tyranitar_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Lugia[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lugia_front_pic.4bpp.lz"); -const u32 gMonFrontPic_HoOh[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ho_oh_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Celebi[] = INCBIN_U32("graphics/pokemon/anim_front_pics/celebi_front_pic.4bpp.lz"); +const u32 gMonFrontPic_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Magby[] = INCBIN_U32("graphics/pokemon/magby/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Entei[] = INCBIN_U32("graphics/pokemon/entei/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/anim_front.4bpp.lz"); +const u32 gMonFrontPic_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/anim_front.4bpp.lz"); -const u32 gMonFrontPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/anim_front_pics/double_question_mark_front_pic.4bpp.lz"); +const u32 gMonFrontPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/double_question_mark/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Treecko[] = INCBIN_U32("graphics/pokemon/anim_front_pics/treecko_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Grovyle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/grovyle_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Sceptile[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sceptile_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Torchic[] = INCBIN_U32("graphics/pokemon/anim_front_pics/torchic_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Combusken[] = INCBIN_U32("graphics/pokemon/anim_front_pics/combusken_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Blaziken[] = INCBIN_U32("graphics/pokemon/anim_front_pics/blaziken_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Mudkip[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mudkip_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/anim_front_pics/marshtomp_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Swampert[] = INCBIN_U32("graphics/pokemon/anim_front_pics/swampert_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Poochyena[] = INCBIN_U32("graphics/pokemon/anim_front_pics/poochyena_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Mightyena[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mightyena_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/zigzagoon_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Linoone[] = INCBIN_U32("graphics/pokemon/anim_front_pics/linoone_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Wurmple[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wurmple_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Silcoon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/silcoon_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Beautifly[] = INCBIN_U32("graphics/pokemon/anim_front_pics/beautifly_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Cascoon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cascoon_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Dustox[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dustox_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Lotad[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lotad_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Lombre[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lombre_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ludicolo_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Seedot[] = INCBIN_U32("graphics/pokemon/anim_front_pics/seedot_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nuzleaf_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Shiftry[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shiftry_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Nincada[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nincada_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Ninjask[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ninjask_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Shedinja[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shedinja_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Taillow[] = INCBIN_U32("graphics/pokemon/anim_front_pics/taillow_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Swellow[] = INCBIN_U32("graphics/pokemon/anim_front_pics/swellow_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Shroomish[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shroomish_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Breloom[] = INCBIN_U32("graphics/pokemon/anim_front_pics/breloom_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Spinda[] = INCBIN_U32("graphics/pokemon/anim_front_pics/spinda_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Wingull[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wingull_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Pelipper[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pelipper_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Surskit[] = INCBIN_U32("graphics/pokemon/anim_front_pics/surskit_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Masquerain[] = INCBIN_U32("graphics/pokemon/anim_front_pics/masquerain_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Wailmer[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wailmer_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Wailord[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wailord_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Skitty[] = INCBIN_U32("graphics/pokemon/anim_front_pics/skitty_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Delcatty[] = INCBIN_U32("graphics/pokemon/anim_front_pics/delcatty_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Kecleon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kecleon_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Baltoy[] = INCBIN_U32("graphics/pokemon/anim_front_pics/baltoy_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Claydol[] = INCBIN_U32("graphics/pokemon/anim_front_pics/claydol_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Nosepass[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nosepass_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Torkoal[] = INCBIN_U32("graphics/pokemon/anim_front_pics/torkoal_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Sableye[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sableye_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Barboach[] = INCBIN_U32("graphics/pokemon/anim_front_pics/barboach_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Whiscash[] = INCBIN_U32("graphics/pokemon/anim_front_pics/whiscash_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/anim_front_pics/luvdisc_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Corphish[] = INCBIN_U32("graphics/pokemon/anim_front_pics/corphish_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/anim_front_pics/crawdaunt_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Feebas[] = INCBIN_U32("graphics/pokemon/anim_front_pics/feebas_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Milotic[] = INCBIN_U32("graphics/pokemon/anim_front_pics/milotic_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Carvanha[] = INCBIN_U32("graphics/pokemon/anim_front_pics/carvanha_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sharpedo_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Trapinch[] = INCBIN_U32("graphics/pokemon/anim_front_pics/trapinch_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Vibrava[] = INCBIN_U32("graphics/pokemon/anim_front_pics/vibrava_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Flygon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/flygon_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Makuhita[] = INCBIN_U32("graphics/pokemon/anim_front_pics/makuhita_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Hariyama[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hariyama_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Electrike[] = INCBIN_U32("graphics/pokemon/anim_front_pics/electrike_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Manectric[] = INCBIN_U32("graphics/pokemon/anim_front_pics/manectric_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Numel[] = INCBIN_U32("graphics/pokemon/anim_front_pics/numel_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Camerupt[] = INCBIN_U32("graphics/pokemon/anim_front_pics/camerupt_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Spheal[] = INCBIN_U32("graphics/pokemon/anim_front_pics/spheal_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Sealeo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sealeo_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Walrein[] = INCBIN_U32("graphics/pokemon/anim_front_pics/walrein_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Cacnea[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cacnea_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Cacturne[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cacturne_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Snorunt[] = INCBIN_U32("graphics/pokemon/anim_front_pics/snorunt_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Glalie[] = INCBIN_U32("graphics/pokemon/anim_front_pics/glalie_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Lunatone[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lunatone_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Solrock[] = INCBIN_U32("graphics/pokemon/anim_front_pics/solrock_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Azurill[] = INCBIN_U32("graphics/pokemon/anim_front_pics/azurill_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Spoink[] = INCBIN_U32("graphics/pokemon/anim_front_pics/spoink_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Grumpig[] = INCBIN_U32("graphics/pokemon/anim_front_pics/grumpig_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Plusle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/plusle_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Minun[] = INCBIN_U32("graphics/pokemon/anim_front_pics/minun_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Mawile[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mawile_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Meditite[] = INCBIN_U32("graphics/pokemon/anim_front_pics/meditite_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Medicham[] = INCBIN_U32("graphics/pokemon/anim_front_pics/medicham_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Swablu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/swablu_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Altaria[] = INCBIN_U32("graphics/pokemon/anim_front_pics/altaria_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Wynaut[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wynaut_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Duskull[] = INCBIN_U32("graphics/pokemon/anim_front_pics/duskull_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Dusclops[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dusclops_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Roselia[] = INCBIN_U32("graphics/pokemon/anim_front_pics/roselia_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Slakoth[] = INCBIN_U32("graphics/pokemon/anim_front_pics/slakoth_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/anim_front_pics/vigoroth_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Slaking[] = INCBIN_U32("graphics/pokemon/anim_front_pics/slaking_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Gulpin[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gulpin_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Swalot[] = INCBIN_U32("graphics/pokemon/anim_front_pics/swalot_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Tropius[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tropius_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Whismur[] = INCBIN_U32("graphics/pokemon/anim_front_pics/whismur_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Loudred[] = INCBIN_U32("graphics/pokemon/anim_front_pics/loudred_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Exploud[] = INCBIN_U32("graphics/pokemon/anim_front_pics/exploud_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Clamperl[] = INCBIN_U32("graphics/pokemon/anim_front_pics/clamperl_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Huntail[] = INCBIN_U32("graphics/pokemon/anim_front_pics/huntail_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gorebyss_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Absol[] = INCBIN_U32("graphics/pokemon/anim_front_pics/absol_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Shuppet[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shuppet_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Banette[] = INCBIN_U32("graphics/pokemon/anim_front_pics/banette_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Seviper[] = INCBIN_U32("graphics/pokemon/anim_front_pics/seviper_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Zangoose[] = INCBIN_U32("graphics/pokemon/anim_front_pics/zangoose_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Relicanth[] = INCBIN_U32("graphics/pokemon/anim_front_pics/relicanth_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Aron[] = INCBIN_U32("graphics/pokemon/anim_front_pics/aron_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Lairon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lairon_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Aggron[] = INCBIN_U32("graphics/pokemon/anim_front_pics/aggron_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Castform[] = INCBIN_U32("graphics/pokemon/anim_front_pics/castform_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Volbeat[] = INCBIN_U32("graphics/pokemon/anim_front_pics/volbeat_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Illumise[] = INCBIN_U32("graphics/pokemon/anim_front_pics/illumise_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Lileep[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lileep_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Cradily[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cradily_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Anorith[] = INCBIN_U32("graphics/pokemon/anim_front_pics/anorith_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Armaldo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/armaldo_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Ralts[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ralts_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Kirlia[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kirlia_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gardevoir_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Bagon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/bagon_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Shelgon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shelgon_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Salamence[] = INCBIN_U32("graphics/pokemon/anim_front_pics/salamence_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Beldum[] = INCBIN_U32("graphics/pokemon/anim_front_pics/beldum_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Metang[] = INCBIN_U32("graphics/pokemon/anim_front_pics/metang_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Metagross[] = INCBIN_U32("graphics/pokemon/anim_front_pics/metagross_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Regirock[] = INCBIN_U32("graphics/pokemon/anim_front_pics/regirock_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Regice[] = INCBIN_U32("graphics/pokemon/anim_front_pics/regice_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Registeel[] = INCBIN_U32("graphics/pokemon/anim_front_pics/registeel_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Kyogre[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kyogre_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Groudon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/groudon_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/anim_front_pics/rayquaza_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Latias[] = INCBIN_U32("graphics/pokemon/anim_front_pics/latias_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Latios[] = INCBIN_U32("graphics/pokemon/anim_front_pics/latios_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Jirachi[] = INCBIN_U32("graphics/pokemon/anim_front_pics/jirachi_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Deoxys[] = INCBIN_U32("graphics/pokemon/anim_front_pics/deoxys_front_pic.4bpp.lz"); -const u32 gMonFrontPic_Chimecho[] = INCBIN_U32("graphics/pokemon/anim_front_pics/chimecho_front_pic.4bpp.lz"); +const u32 gMonFrontPic_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Numel[] = INCBIN_U32("graphics/pokemon/numel/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Minun[] = INCBIN_U32("graphics/pokemon/minun/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Absol[] = INCBIN_U32("graphics/pokemon/absol/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Banette[] = INCBIN_U32("graphics/pokemon/banette/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Aron[] = INCBIN_U32("graphics/pokemon/aron/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Castform[] = INCBIN_U32("graphics/pokemon/castform/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Metang[] = INCBIN_U32("graphics/pokemon/metang/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Regice[] = INCBIN_U32("graphics/pokemon/regice/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Latias[] = INCBIN_U32("graphics/pokemon/latias/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Latios[] = INCBIN_U32("graphics/pokemon/latios/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/anim_front.4bpp.lz"); +const u32 gMonFrontPic_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/anim_front_pics/egg_front_pic.4bpp.lz"); +const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/anim_front.4bpp.lz"); -const u32 gMonFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_b_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_c_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_d_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownE[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_e_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownF[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_f_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownG[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_g_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownH[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_h_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownI[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_i_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownJ[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_j_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownK[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_k_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownL[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_l_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownM[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_m_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownN[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_n_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownO[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_o_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownP[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_p_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownQ[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_q_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownR[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_r_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownS[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_s_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownT[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_t_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownU[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_u_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownV[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_v_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownW[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_w_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownX[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_x_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownY[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_y_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownZ[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_z_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_exclamation_mark_front_pic.4bpp.lz"); -const u32 gMonFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_question_mark_front_pic.4bpp.lz"); +const u32 gMonFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/anim_front_b.4bpp.lz"); +const u32 gMonFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/anim_front_c.4bpp.lz"); +const u32 gMonFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/anim_front_d.4bpp.lz"); +const u32 gMonFrontPic_UnownE[] = INCBIN_U32("graphics/pokemon/unown/anim_front_e.4bpp.lz"); +const u32 gMonFrontPic_UnownF[] = INCBIN_U32("graphics/pokemon/unown/anim_front_f.4bpp.lz"); +const u32 gMonFrontPic_UnownG[] = INCBIN_U32("graphics/pokemon/unown/anim_front_g.4bpp.lz"); +const u32 gMonFrontPic_UnownH[] = INCBIN_U32("graphics/pokemon/unown/anim_front_h.4bpp.lz"); +const u32 gMonFrontPic_UnownI[] = INCBIN_U32("graphics/pokemon/unown/anim_front_i.4bpp.lz"); +const u32 gMonFrontPic_UnownJ[] = INCBIN_U32("graphics/pokemon/unown/anim_front_j.4bpp.lz"); +const u32 gMonFrontPic_UnownK[] = INCBIN_U32("graphics/pokemon/unown/anim_front_k.4bpp.lz"); +const u32 gMonFrontPic_UnownL[] = INCBIN_U32("graphics/pokemon/unown/anim_front_l.4bpp.lz"); +const u32 gMonFrontPic_UnownM[] = INCBIN_U32("graphics/pokemon/unown/anim_front_m.4bpp.lz"); +const u32 gMonFrontPic_UnownN[] = INCBIN_U32("graphics/pokemon/unown/anim_front_n.4bpp.lz"); +const u32 gMonFrontPic_UnownO[] = INCBIN_U32("graphics/pokemon/unown/anim_front_o.4bpp.lz"); +const u32 gMonFrontPic_UnownP[] = INCBIN_U32("graphics/pokemon/unown/anim_front_p.4bpp.lz"); +const u32 gMonFrontPic_UnownQ[] = INCBIN_U32("graphics/pokemon/unown/anim_front_q.4bpp.lz"); +const u32 gMonFrontPic_UnownR[] = INCBIN_U32("graphics/pokemon/unown/anim_front_r.4bpp.lz"); +const u32 gMonFrontPic_UnownS[] = INCBIN_U32("graphics/pokemon/unown/anim_front_s.4bpp.lz"); +const u32 gMonFrontPic_UnownT[] = INCBIN_U32("graphics/pokemon/unown/anim_front_t.4bpp.lz"); +const u32 gMonFrontPic_UnownU[] = INCBIN_U32("graphics/pokemon/unown/anim_front_u.4bpp.lz"); +const u32 gMonFrontPic_UnownV[] = INCBIN_U32("graphics/pokemon/unown/anim_front_v.4bpp.lz"); +const u32 gMonFrontPic_UnownW[] = INCBIN_U32("graphics/pokemon/unown/anim_front_w.4bpp.lz"); +const u32 gMonFrontPic_UnownX[] = INCBIN_U32("graphics/pokemon/unown/anim_front_x.4bpp.lz"); +const u32 gMonFrontPic_UnownY[] = INCBIN_U32("graphics/pokemon/unown/anim_front_y.4bpp.lz"); +const u32 gMonFrontPic_UnownZ[] = INCBIN_U32("graphics/pokemon/unown/anim_front_z.4bpp.lz"); +const u32 gMonFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/anim_front_exclamation_mark.4bpp.lz"); +const u32 gMonFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/anim_front_question_mark.4bpp.lz"); diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 40ebdf9e41..67d1fbd3f0 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -1,1625 +1,1625 @@ -const u32 gMonStillFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/front_pics/bulbasaur_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/palettes/bulbasaur_palette.gbapal.lz"); -const u32 gMonBackPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/back_pics/bulbasaur_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/palettes/bulbasaur_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Bulbasaur[] = INCBIN_U8("graphics/pokemon/icons/bulbasaur_icon.4bpp"); -const u8 gMonFootprint_Bulbasaur[] = INCBIN_U8("graphics/pokemon/footprints/bulbasaur_footprint.1bpp"); - -const u32 gMonStillFrontPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/front_pics/ivysaur_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/palettes/ivysaur_palette.gbapal.lz"); -const u32 gMonBackPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/back_pics/ivysaur_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/palettes/ivysaur_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Ivysaur[] = INCBIN_U8("graphics/pokemon/icons/ivysaur_icon.4bpp"); -const u8 gMonFootprint_Ivysaur[] = INCBIN_U8("graphics/pokemon/footprints/ivysaur_footprint.1bpp"); - -const u32 gMonStillFrontPic_Venusaur[] = INCBIN_U32("graphics/pokemon/front_pics/venusaur_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/palettes/venusaur_palette.gbapal.lz"); -const u32 gMonBackPic_Venusaur[] = INCBIN_U32("graphics/pokemon/back_pics/venusaur_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/palettes/venusaur_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Venusaur[] = INCBIN_U8("graphics/pokemon/icons/venusaur_icon.4bpp"); -const u8 gMonFootprint_Venusaur[] = INCBIN_U8("graphics/pokemon/footprints/venusaur_footprint.1bpp"); - -const u32 gMonStillFrontPic_Charmander[] = INCBIN_U32("graphics/pokemon/front_pics/charmander_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Charmander[] = INCBIN_U32("graphics/pokemon/palettes/charmander_palette.gbapal.lz"); -const u32 gMonBackPic_Charmander[] = INCBIN_U32("graphics/pokemon/back_pics/charmander_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Charmander[] = INCBIN_U32("graphics/pokemon/palettes/charmander_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Charmander[] = INCBIN_U8("graphics/pokemon/icons/charmander_icon.4bpp"); -const u8 gMonFootprint_Charmander[] = INCBIN_U8("graphics/pokemon/footprints/charmander_footprint.1bpp"); - -const u32 gMonStillFrontPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/front_pics/charmeleon_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/palettes/charmeleon_palette.gbapal.lz"); -const u32 gMonBackPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/back_pics/charmeleon_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/palettes/charmeleon_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Charmeleon[] = INCBIN_U8("graphics/pokemon/icons/charmeleon_icon.4bpp"); -const u8 gMonFootprint_Charmeleon[] = INCBIN_U8("graphics/pokemon/footprints/charmeleon_footprint.1bpp"); - -const u32 gMonStillFrontPic_Charizard[] = INCBIN_U32("graphics/pokemon/front_pics/charizard_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Charizard[] = INCBIN_U32("graphics/pokemon/palettes/charizard_palette.gbapal.lz"); -const u32 gMonBackPic_Charizard[] = INCBIN_U32("graphics/pokemon/back_pics/charizard_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Charizard[] = INCBIN_U32("graphics/pokemon/palettes/charizard_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Charizard[] = INCBIN_U8("graphics/pokemon/icons/charizard_icon.4bpp"); -const u8 gMonFootprint_Charizard[] = INCBIN_U8("graphics/pokemon/footprints/charizard_footprint.1bpp"); - -const u32 gMonStillFrontPic_Squirtle[] = INCBIN_U32("graphics/pokemon/front_pics/squirtle_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/palettes/squirtle_palette.gbapal.lz"); -const u32 gMonBackPic_Squirtle[] = INCBIN_U32("graphics/pokemon/back_pics/squirtle_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/palettes/squirtle_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Squirtle[] = INCBIN_U8("graphics/pokemon/icons/squirtle_icon.4bpp"); -const u8 gMonFootprint_Squirtle[] = INCBIN_U8("graphics/pokemon/footprints/squirtle_footprint.1bpp"); - -const u32 gMonStillFrontPic_Wartortle[] = INCBIN_U32("graphics/pokemon/front_pics/wartortle_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/palettes/wartortle_palette.gbapal.lz"); -const u32 gMonBackPic_Wartortle[] = INCBIN_U32("graphics/pokemon/back_pics/wartortle_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/palettes/wartortle_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Wartortle[] = INCBIN_U8("graphics/pokemon/icons/wartortle_icon.4bpp"); -const u8 gMonFootprint_Wartortle[] = INCBIN_U8("graphics/pokemon/footprints/wartortle_footprint.1bpp"); - -const u32 gMonStillFrontPic_Blastoise[] = INCBIN_U32("graphics/pokemon/front_pics/blastoise_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/palettes/blastoise_palette.gbapal.lz"); -const u32 gMonBackPic_Blastoise[] = INCBIN_U32("graphics/pokemon/back_pics/blastoise_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/palettes/blastoise_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Blastoise[] = INCBIN_U8("graphics/pokemon/icons/blastoise_icon.4bpp"); -const u8 gMonFootprint_Blastoise[] = INCBIN_U8("graphics/pokemon/footprints/blastoise_footprint.1bpp"); - -const u32 gMonStillFrontPic_Caterpie[] = INCBIN_U32("graphics/pokemon/front_pics/caterpie_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/palettes/caterpie_palette.gbapal.lz"); -const u32 gMonBackPic_Caterpie[] = INCBIN_U32("graphics/pokemon/back_pics/caterpie_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/palettes/caterpie_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Caterpie[] = INCBIN_U8("graphics/pokemon/icons/caterpie_icon.4bpp"); -const u8 gMonFootprint_Caterpie[] = INCBIN_U8("graphics/pokemon/footprints/caterpie_footprint.1bpp"); - -const u32 gMonStillFrontPic_Metapod[] = INCBIN_U32("graphics/pokemon/front_pics/metapod_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Metapod[] = INCBIN_U32("graphics/pokemon/palettes/metapod_palette.gbapal.lz"); -const u32 gMonBackPic_Metapod[] = INCBIN_U32("graphics/pokemon/back_pics/metapod_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Metapod[] = INCBIN_U32("graphics/pokemon/palettes/metapod_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Metapod[] = INCBIN_U8( "graphics/pokemon/icons/metapod_icon.4bpp"); -const u8 gMonFootprint_Metapod[] = INCBIN_U8("graphics/pokemon/footprints/metapod_footprint.1bpp"); - -const u32 gMonStillFrontPic_Butterfree[] = INCBIN_U32("graphics/pokemon/front_pics/butterfree_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/palettes/butterfree_palette.gbapal.lz"); -const u32 gMonBackPic_Butterfree[] = INCBIN_U32("graphics/pokemon/back_pics/butterfree_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/palettes/butterfree_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Butterfree[] = INCBIN_U8("graphics/pokemon/icons/butterfree_icon.4bpp"); -const u8 gMonFootprint_Butterfree[] = INCBIN_U8("graphics/pokemon/footprints/butterfree_footprint.1bpp"); - -const u32 gMonStillFrontPic_Weedle[] = INCBIN_U32("graphics/pokemon/front_pics/weedle_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Weedle[] = INCBIN_U32("graphics/pokemon/palettes/weedle_palette.gbapal.lz"); -const u32 gMonBackPic_Weedle[] = INCBIN_U32("graphics/pokemon/back_pics/weedle_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Weedle[] = INCBIN_U32("graphics/pokemon/palettes/weedle_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Weedle[] = INCBIN_U8("graphics/pokemon/icons/weedle_icon.4bpp"); -const u8 gMonFootprint_Weedle[] = INCBIN_U8("graphics/pokemon/footprints/weedle_footprint.1bpp"); - -const u32 gMonStillFrontPic_Kakuna[] = INCBIN_U32("graphics/pokemon/front_pics/kakuna_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/palettes/kakuna_palette.gbapal.lz"); -const u32 gMonBackPic_Kakuna[] = INCBIN_U32("graphics/pokemon/back_pics/kakuna_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/palettes/kakuna_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Kakuna[] = INCBIN_U8("graphics/pokemon/icons/kakuna_icon.4bpp"); -const u8 gMonFootprint_Kakuna[] = INCBIN_U8("graphics/pokemon/footprints/kakuna_footprint.1bpp"); - -const u32 gMonStillFrontPic_Beedrill[] = INCBIN_U32("graphics/pokemon/front_pics/beedrill_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/palettes/beedrill_palette.gbapal.lz"); -const u32 gMonBackPic_Beedrill[] = INCBIN_U32("graphics/pokemon/back_pics/beedrill_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/palettes/beedrill_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Beedrill[] = INCBIN_U8("graphics/pokemon/icons/beedrill_icon.4bpp"); -const u8 gMonFootprint_Beedrill[] = INCBIN_U8("graphics/pokemon/footprints/beedrill_footprint.1bpp"); - -const u32 gMonStillFrontPic_Pidgey[] = INCBIN_U32("graphics/pokemon/front_pics/pidgey_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/palettes/pidgey_palette.gbapal.lz"); -const u32 gMonBackPic_Pidgey[] = INCBIN_U32("graphics/pokemon/back_pics/pidgey_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/palettes/pidgey_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Pidgey[] = INCBIN_U8("graphics/pokemon/icons/pidgey_icon.4bpp"); -const u8 gMonFootprint_Pidgey[] = INCBIN_U8("graphics/pokemon/footprints/pidgey_footprint.1bpp"); - -const u32 gMonStillFrontPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/front_pics/pidgeotto_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/palettes/pidgeotto_palette.gbapal.lz"); -const u32 gMonBackPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/back_pics/pidgeotto_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/palettes/pidgeotto_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Pidgeotto[] = INCBIN_U8("graphics/pokemon/icons/pidgeotto_icon.4bpp"); -const u8 gMonFootprint_Pidgeotto[] = INCBIN_U8("graphics/pokemon/footprints/pidgeotto_footprint.1bpp"); - -const u32 gMonStillFrontPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/front_pics/pidgeot_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/palettes/pidgeot_palette.gbapal.lz"); -const u32 gMonBackPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/back_pics/pidgeot_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/palettes/pidgeot_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Pidgeot[] = INCBIN_U8("graphics/pokemon/icons/pidgeot_icon.4bpp"); -const u8 gMonFootprint_Pidgeot[] = INCBIN_U8("graphics/pokemon/footprints/pidgeot_footprint.1bpp"); - -const u32 gMonStillFrontPic_Rattata[] = INCBIN_U32("graphics/pokemon/front_pics/rattata_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Rattata[] = INCBIN_U32("graphics/pokemon/palettes/rattata_palette.gbapal.lz"); -const u32 gMonBackPic_Rattata[] = INCBIN_U32("graphics/pokemon/back_pics/rattata_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Rattata[] = INCBIN_U32("graphics/pokemon/palettes/rattata_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Rattata[] = INCBIN_U8("graphics/pokemon/icons/rattata_icon.4bpp"); -const u8 gMonFootprint_Rattata[] = INCBIN_U8("graphics/pokemon/footprints/rattata_footprint.1bpp"); - -const u32 gMonStillFrontPic_Raticate[] = INCBIN_U32("graphics/pokemon/front_pics/raticate_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Raticate[] = INCBIN_U32("graphics/pokemon/palettes/raticate_palette.gbapal.lz"); -const u32 gMonBackPic_Raticate[] = INCBIN_U32("graphics/pokemon/back_pics/raticate_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Raticate[] = INCBIN_U32("graphics/pokemon/palettes/raticate_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Raticate[] = INCBIN_U8("graphics/pokemon/icons/raticate_icon.4bpp"); -const u8 gMonFootprint_Raticate[] = INCBIN_U8("graphics/pokemon/footprints/raticate_footprint.1bpp"); - -const u32 gMonStillFrontPic_Spearow[] = INCBIN_U32("graphics/pokemon/front_pics/spearow_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Spearow[] = INCBIN_U32("graphics/pokemon/palettes/spearow_palette.gbapal.lz"); -const u32 gMonBackPic_Spearow[] = INCBIN_U32("graphics/pokemon/back_pics/spearow_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Spearow[] = INCBIN_U32("graphics/pokemon/palettes/spearow_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Spearow[] = INCBIN_U8("graphics/pokemon/icons/spearow_icon.4bpp"); -const u8 gMonFootprint_Spearow[] = INCBIN_U8("graphics/pokemon/footprints/spearow_footprint.1bpp"); - -const u32 gMonStillFrontPic_Fearow[] = INCBIN_U32("graphics/pokemon/front_pics/fearow_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Fearow[] = INCBIN_U32("graphics/pokemon/palettes/fearow_palette.gbapal.lz"); -const u32 gMonBackPic_Fearow[] = INCBIN_U32("graphics/pokemon/back_pics/fearow_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Fearow[] = INCBIN_U32("graphics/pokemon/palettes/fearow_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Fearow[] = INCBIN_U8("graphics/pokemon/icons/fearow_icon.4bpp"); -const u8 gMonFootprint_Fearow[] = INCBIN_U8("graphics/pokemon/footprints/fearow_footprint.1bpp"); - -const u32 gMonStillFrontPic_Ekans[] = INCBIN_U32("graphics/pokemon/front_pics/ekans_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Ekans[] = INCBIN_U32("graphics/pokemon/palettes/ekans_palette.gbapal.lz"); -const u32 gMonBackPic_Ekans[] = INCBIN_U32("graphics/pokemon/back_pics/ekans_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Ekans[] = INCBIN_U32("graphics/pokemon/palettes/ekans_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Ekans[] = INCBIN_U8("graphics/pokemon/icons/ekans_icon.4bpp"); -const u8 gMonFootprint_Ekans[] = INCBIN_U8("graphics/pokemon/footprints/ekans_footprint.1bpp"); - -const u32 gMonStillFrontPic_Arbok[] = INCBIN_U32("graphics/pokemon/front_pics/arbok_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Arbok[] = INCBIN_U32("graphics/pokemon/palettes/arbok_palette.gbapal.lz"); -const u32 gMonBackPic_Arbok[] = INCBIN_U32("graphics/pokemon/back_pics/arbok_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Arbok[] = INCBIN_U32("graphics/pokemon/palettes/arbok_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Arbok[] = INCBIN_U8("graphics/pokemon/icons/arbok_icon.4bpp"); -const u8 gMonFootprint_Arbok[] = INCBIN_U8("graphics/pokemon/footprints/arbok_footprint.1bpp"); - -const u32 gMonStillFrontPic_Pikachu[] = INCBIN_U32("graphics/pokemon/front_pics/pikachu_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/palettes/pikachu_palette.gbapal.lz"); -const u32 gMonBackPic_Pikachu[] = INCBIN_U32("graphics/pokemon/back_pics/pikachu_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/palettes/pikachu_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Pikachu[] = INCBIN_U8("graphics/pokemon/icons/pikachu_icon.4bpp"); -const u8 gMonFootprint_Pikachu[] = INCBIN_U8("graphics/pokemon/footprints/pikachu_footprint.1bpp"); - -const u32 gMonStillFrontPic_Raichu[] = INCBIN_U32("graphics/pokemon/front_pics/raichu_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Raichu[] = INCBIN_U32("graphics/pokemon/palettes/raichu_palette.gbapal.lz"); -const u32 gMonBackPic_Raichu[] = INCBIN_U32("graphics/pokemon/back_pics/raichu_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Raichu[] = INCBIN_U32("graphics/pokemon/palettes/raichu_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Raichu[] = INCBIN_U8("graphics/pokemon/icons/raichu_icon.4bpp"); -const u8 gMonFootprint_Raichu[] = INCBIN_U8("graphics/pokemon/footprints/raichu_footprint.1bpp"); - -const u32 gMonStillFrontPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/front_pics/sandshrew_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/palettes/sandshrew_palette.gbapal.lz"); -const u32 gMonBackPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/back_pics/sandshrew_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/palettes/sandshrew_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Sandshrew[] = INCBIN_U8("graphics/pokemon/icons/sandshrew_icon.4bpp"); -const u8 gMonFootprint_Sandshrew[] = INCBIN_U8("graphics/pokemon/footprints/sandshrew_footprint.1bpp"); - -const u32 gMonStillFrontPic_Sandslash[] = INCBIN_U32("graphics/pokemon/front_pics/sandslash_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/palettes/sandslash_palette.gbapal.lz"); -const u32 gMonBackPic_Sandslash[] = INCBIN_U32("graphics/pokemon/back_pics/sandslash_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/palettes/sandslash_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Sandslash[] = INCBIN_U8("graphics/pokemon/icons/sandslash_icon.4bpp"); -const u8 gMonFootprint_Sandslash[] = INCBIN_U8("graphics/pokemon/footprints/sandslash_footprint.1bpp"); - -const u32 gMonStillFrontPic_NidoranF[] = INCBIN_U32("graphics/pokemon/front_pics/nidoran_f_still_front_pic.4bpp.lz"); -const u32 gMonPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/palettes/nidoran_f_palette.gbapal.lz"); -const u32 gMonBackPic_NidoranF[] = INCBIN_U32("graphics/pokemon/back_pics/nidoran_f_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/palettes/nidoran_f_shiny_palette.gbapal.lz"); -const u8 gMonIcon_NidoranF[] = INCBIN_U8("graphics/pokemon/icons/nidoran_f_icon.4bpp"); -const u8 gMonFootprint_NidoranF[] = INCBIN_U8("graphics/pokemon/footprints/nidoran_f_footprint.1bpp"); - -const u32 gMonStillFrontPic_Nidorina[] = INCBIN_U32("graphics/pokemon/front_pics/nidorina_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/palettes/nidorina_palette.gbapal.lz"); -const u32 gMonBackPic_Nidorina[] = INCBIN_U32("graphics/pokemon/back_pics/nidorina_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/palettes/nidorina_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Nidorina[] = INCBIN_U8("graphics/pokemon/icons/nidorina_icon.4bpp"); -const u8 gMonFootprint_Nidorina[] = INCBIN_U8("graphics/pokemon/footprints/nidorina_footprint.1bpp"); - -const u32 gMonStillFrontPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/front_pics/nidoqueen_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/palettes/nidoqueen_palette.gbapal.lz"); -const u32 gMonBackPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/back_pics/nidoqueen_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/palettes/nidoqueen_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Nidoqueen[] = INCBIN_U8("graphics/pokemon/icons/nidoqueen_icon.4bpp"); -const u8 gMonFootprint_Nidoqueen[] = INCBIN_U8("graphics/pokemon/footprints/nidoqueen_footprint.1bpp"); - -const u32 gMonStillFrontPic_NidoranM[] = INCBIN_U32("graphics/pokemon/front_pics/nidoran_m_still_front_pic.4bpp.lz"); -const u32 gMonPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/palettes/nidoran_m_palette.gbapal.lz"); -const u32 gMonBackPic_NidoranM[] = INCBIN_U32("graphics/pokemon/back_pics/nidoran_m_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/palettes/nidoran_m_shiny_palette.gbapal.lz"); -const u8 gMonIcon_NidoranM[] = INCBIN_U8("graphics/pokemon/icons/nidoran_m_icon.4bpp"); -const u8 gMonFootprint_NidoranM[] = INCBIN_U8("graphics/pokemon/footprints/nidoran_m_footprint.1bpp"); - -const u32 gMonStillFrontPic_Nidorino[] = INCBIN_U32("graphics/pokemon/front_pics/nidorino_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/palettes/nidorino_palette.gbapal.lz"); -const u32 gMonBackPic_Nidorino[] = INCBIN_U32("graphics/pokemon/back_pics/nidorino_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/palettes/nidorino_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Nidorino[] = INCBIN_U8("graphics/pokemon/icons/nidorino_icon.4bpp"); -const u8 gMonFootprint_Nidorino[] = INCBIN_U8("graphics/pokemon/footprints/nidorino_footprint.1bpp"); - -const u32 gMonStillFrontPic_Nidoking[] = INCBIN_U32("graphics/pokemon/front_pics/nidoking_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/palettes/nidoking_palette.gbapal.lz"); -const u32 gMonBackPic_Nidoking[] = INCBIN_U32("graphics/pokemon/back_pics/nidoking_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/palettes/nidoking_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Nidoking[] = INCBIN_U8("graphics/pokemon/icons/nidoking_icon.4bpp"); -const u8 gMonFootprint_Nidoking[] = INCBIN_U8("graphics/pokemon/footprints/nidoking_footprint.1bpp"); - -const u32 gMonStillFrontPic_Clefairy[] = INCBIN_U32("graphics/pokemon/front_pics/clefairy_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/palettes/clefairy_palette.gbapal.lz"); -const u32 gMonBackPic_Clefairy[] = INCBIN_U32("graphics/pokemon/back_pics/clefairy_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/palettes/clefairy_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Clefairy[] = INCBIN_U8("graphics/pokemon/icons/clefairy_icon.4bpp"); -const u8 gMonFootprint_Clefairy[] = INCBIN_U8("graphics/pokemon/footprints/clefairy_footprint.1bpp"); - -const u32 gMonStillFrontPic_Clefable[] = INCBIN_U32("graphics/pokemon/front_pics/clefable_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Clefable[] = INCBIN_U32("graphics/pokemon/palettes/clefable_palette.gbapal.lz"); -const u32 gMonBackPic_Clefable[] = INCBIN_U32("graphics/pokemon/back_pics/clefable_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Clefable[] = INCBIN_U32("graphics/pokemon/palettes/clefable_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Clefable[] = INCBIN_U8("graphics/pokemon/icons/clefable_icon.4bpp"); -const u8 gMonFootprint_Clefable[] = INCBIN_U8("graphics/pokemon/footprints/clefable_footprint.1bpp"); - -const u32 gMonStillFrontPic_Vulpix[] = INCBIN_U32("graphics/pokemon/front_pics/vulpix_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/palettes/vulpix_palette.gbapal.lz"); -const u32 gMonBackPic_Vulpix[] = INCBIN_U32("graphics/pokemon/back_pics/vulpix_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/palettes/vulpix_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Vulpix[] = INCBIN_U8("graphics/pokemon/icons/vulpix_icon.4bpp"); -const u8 gMonFootprint_Vulpix[] = INCBIN_U8("graphics/pokemon/footprints/vulpix_footprint.1bpp"); - -const u32 gMonStillFrontPic_Ninetales[] = INCBIN_U32("graphics/pokemon/front_pics/ninetales_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/palettes/ninetales_palette.gbapal.lz"); -const u32 gMonBackPic_Ninetales[] = INCBIN_U32("graphics/pokemon/back_pics/ninetales_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/palettes/ninetales_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Ninetales[] = INCBIN_U8("graphics/pokemon/icons/ninetales_icon.4bpp"); -const u8 gMonFootprint_Ninetales[] = INCBIN_U8("graphics/pokemon/footprints/ninetales_footprint.1bpp"); - -const u32 gMonStillFrontPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/front_pics/jigglypuff_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/palettes/jigglypuff_palette.gbapal.lz"); -const u32 gMonBackPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/back_pics/jigglypuff_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/palettes/jigglypuff_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Jigglypuff[] = INCBIN_U8("graphics/pokemon/icons/jigglypuff_icon.4bpp"); -const u8 gMonFootprint_Jigglypuff[] = INCBIN_U8("graphics/pokemon/footprints/jigglypuff_footprint.1bpp"); - -const u32 gMonStillFrontPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/front_pics/wigglytuff_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/palettes/wigglytuff_palette.gbapal.lz"); -const u32 gMonBackPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/back_pics/wigglytuff_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/palettes/wigglytuff_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Wigglytuff[] = INCBIN_U8("graphics/pokemon/icons/wigglytuff_icon.4bpp"); -const u8 gMonFootprint_Wigglytuff[] = INCBIN_U8("graphics/pokemon/footprints/wigglytuff_footprint.1bpp"); - -const u32 gMonStillFrontPic_Zubat[] = INCBIN_U32("graphics/pokemon/front_pics/zubat_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Zubat[] = INCBIN_U32("graphics/pokemon/palettes/zubat_palette.gbapal.lz"); -const u32 gMonBackPic_Zubat[] = INCBIN_U32("graphics/pokemon/back_pics/zubat_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Zubat[] = INCBIN_U32("graphics/pokemon/palettes/zubat_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Zubat[] = INCBIN_U8("graphics/pokemon/icons/zubat_icon.4bpp"); -const u8 gMonFootprint_Zubat[] = INCBIN_U8("graphics/pokemon/footprints/zubat_footprint.1bpp"); - -const u32 gMonStillFrontPic_Golbat[] = INCBIN_U32("graphics/pokemon/front_pics/golbat_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Golbat[] = INCBIN_U32("graphics/pokemon/palettes/golbat_palette.gbapal.lz"); -const u32 gMonBackPic_Golbat[] = INCBIN_U32("graphics/pokemon/back_pics/golbat_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Golbat[] = INCBIN_U32("graphics/pokemon/palettes/golbat_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Golbat[] = INCBIN_U8("graphics/pokemon/icons/golbat_icon.4bpp"); -const u8 gMonFootprint_Golbat[] = INCBIN_U8("graphics/pokemon/footprints/golbat_footprint.1bpp"); - -const u32 gMonStillFrontPic_Oddish[] = INCBIN_U32("graphics/pokemon/front_pics/oddish_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Oddish[] = INCBIN_U32("graphics/pokemon/palettes/oddish_palette.gbapal.lz"); -const u32 gMonBackPic_Oddish[] = INCBIN_U32("graphics/pokemon/back_pics/oddish_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Oddish[] = INCBIN_U32("graphics/pokemon/palettes/oddish_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Oddish[] = INCBIN_U8("graphics/pokemon/icons/oddish_icon.4bpp"); -const u8 gMonFootprint_Oddish[] = INCBIN_U8("graphics/pokemon/footprints/oddish_footprint.1bpp"); - -const u32 gMonStillFrontPic_Gloom[] = INCBIN_U32("graphics/pokemon/front_pics/gloom_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Gloom[] = INCBIN_U32("graphics/pokemon/palettes/gloom_palette.gbapal.lz"); -const u32 gMonBackPic_Gloom[] = INCBIN_U32("graphics/pokemon/back_pics/gloom_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Gloom[] = INCBIN_U32("graphics/pokemon/palettes/gloom_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Gloom[] = INCBIN_U8("graphics/pokemon/icons/gloom_icon.4bpp"); -const u8 gMonFootprint_Gloom[] = INCBIN_U8("graphics/pokemon/footprints/gloom_footprint.1bpp"); - -const u32 gMonStillFrontPic_Vileplume[] = INCBIN_U32("graphics/pokemon/front_pics/vileplume_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/palettes/vileplume_palette.gbapal.lz"); -const u32 gMonBackPic_Vileplume[] = INCBIN_U32("graphics/pokemon/back_pics/vileplume_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/palettes/vileplume_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Vileplume[] = INCBIN_U8("graphics/pokemon/icons/vileplume_icon.4bpp"); -const u8 gMonFootprint_Vileplume[] = INCBIN_U8("graphics/pokemon/footprints/vileplume_footprint.1bpp"); - -const u32 gMonStillFrontPic_Paras[] = INCBIN_U32("graphics/pokemon/front_pics/paras_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Paras[] = INCBIN_U32("graphics/pokemon/palettes/paras_palette.gbapal.lz"); -const u32 gMonBackPic_Paras[] = INCBIN_U32("graphics/pokemon/back_pics/paras_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Paras[] = INCBIN_U32("graphics/pokemon/palettes/paras_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Paras[] = INCBIN_U8("graphics/pokemon/icons/paras_icon.4bpp"); -const u8 gMonFootprint_Paras[] = INCBIN_U8("graphics/pokemon/footprints/paras_footprint.1bpp"); - -const u32 gMonStillFrontPic_Parasect[] = INCBIN_U32("graphics/pokemon/front_pics/parasect_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Parasect[] = INCBIN_U32("graphics/pokemon/palettes/parasect_palette.gbapal.lz"); -const u32 gMonBackPic_Parasect[] = INCBIN_U32("graphics/pokemon/back_pics/parasect_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Parasect[] = INCBIN_U32("graphics/pokemon/palettes/parasect_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Parasect[] = INCBIN_U8("graphics/pokemon/icons/parasect_icon.4bpp"); -const u8 gMonFootprint_Parasect[] = INCBIN_U8("graphics/pokemon/footprints/parasect_footprint.1bpp"); - -const u32 gMonStillFrontPic_Venonat[] = INCBIN_U32("graphics/pokemon/front_pics/venonat_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Venonat[] = INCBIN_U32("graphics/pokemon/palettes/venonat_palette.gbapal.lz"); -const u32 gMonBackPic_Venonat[] = INCBIN_U32("graphics/pokemon/back_pics/venonat_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Venonat[] = INCBIN_U32("graphics/pokemon/palettes/venonat_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Venonat[] = INCBIN_U8("graphics/pokemon/icons/venonat_icon.4bpp"); -const u8 gMonFootprint_Venonat[] = INCBIN_U8("graphics/pokemon/footprints/venonat_footprint.1bpp"); - -const u32 gMonStillFrontPic_Venomoth[] = INCBIN_U32("graphics/pokemon/front_pics/venomoth_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/palettes/venomoth_palette.gbapal.lz"); -const u32 gMonBackPic_Venomoth[] = INCBIN_U32("graphics/pokemon/back_pics/venomoth_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/palettes/venomoth_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Venomoth[] = INCBIN_U8("graphics/pokemon/icons/venomoth_icon.4bpp"); -const u8 gMonFootprint_Venomoth[] = INCBIN_U8("graphics/pokemon/footprints/venomoth_footprint.1bpp"); - -const u32 gMonStillFrontPic_Diglett[] = INCBIN_U32("graphics/pokemon/front_pics/diglett_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Diglett[] = INCBIN_U32("graphics/pokemon/palettes/diglett_palette.gbapal.lz"); -const u32 gMonBackPic_Diglett[] = INCBIN_U32("graphics/pokemon/back_pics/diglett_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Diglett[] = INCBIN_U32("graphics/pokemon/palettes/diglett_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Diglett[] = INCBIN_U8("graphics/pokemon/icons/diglett_icon.4bpp"); -const u8 gMonFootprint_Diglett[] = INCBIN_U8("graphics/pokemon/footprints/diglett_footprint.1bpp"); - -const u32 gMonStillFrontPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/front_pics/dugtrio_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/palettes/dugtrio_palette.gbapal.lz"); -const u32 gMonBackPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/back_pics/dugtrio_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/palettes/dugtrio_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Dugtrio[] = INCBIN_U8("graphics/pokemon/icons/dugtrio_icon.4bpp"); -const u8 gMonFootprint_Dugtrio[] = INCBIN_U8("graphics/pokemon/footprints/dugtrio_footprint.1bpp"); - -const u32 gMonStillFrontPic_Meowth[] = INCBIN_U32("graphics/pokemon/front_pics/meowth_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Meowth[] = INCBIN_U32("graphics/pokemon/palettes/meowth_palette.gbapal.lz"); -const u32 gMonBackPic_Meowth[] = INCBIN_U32("graphics/pokemon/back_pics/meowth_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Meowth[] = INCBIN_U32("graphics/pokemon/palettes/meowth_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Meowth[] = INCBIN_U8("graphics/pokemon/icons/meowth_icon.4bpp"); -const u8 gMonFootprint_Meowth[] = INCBIN_U8("graphics/pokemon/footprints/meowth_footprint.1bpp"); - -const u32 gMonStillFrontPic_Persian[] = INCBIN_U32("graphics/pokemon/front_pics/persian_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Persian[] = INCBIN_U32("graphics/pokemon/palettes/persian_palette.gbapal.lz"); -const u32 gMonBackPic_Persian[] = INCBIN_U32("graphics/pokemon/back_pics/persian_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Persian[] = INCBIN_U32("graphics/pokemon/palettes/persian_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Persian[] = INCBIN_U8("graphics/pokemon/icons/persian_icon.4bpp"); -const u8 gMonFootprint_Persian[] = INCBIN_U8("graphics/pokemon/footprints/persian_footprint.1bpp"); - -const u32 gMonStillFrontPic_Psyduck[] = INCBIN_U32("graphics/pokemon/front_pics/psyduck_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/palettes/psyduck_palette.gbapal.lz"); -const u32 gMonBackPic_Psyduck[] = INCBIN_U32("graphics/pokemon/back_pics/psyduck_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/palettes/psyduck_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Psyduck[] = INCBIN_U8("graphics/pokemon/icons/psyduck_icon.4bpp"); -const u8 gMonFootprint_Psyduck[] = INCBIN_U8("graphics/pokemon/footprints/psyduck_footprint.1bpp"); - -const u32 gMonStillFrontPic_Golduck[] = INCBIN_U32("graphics/pokemon/front_pics/golduck_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Golduck[] = INCBIN_U32("graphics/pokemon/palettes/golduck_palette.gbapal.lz"); -const u32 gMonBackPic_Golduck[] = INCBIN_U32("graphics/pokemon/back_pics/golduck_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Golduck[] = INCBIN_U32("graphics/pokemon/palettes/golduck_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Golduck[] = INCBIN_U8("graphics/pokemon/icons/golduck_icon.4bpp"); -const u8 gMonFootprint_Golduck[] = INCBIN_U8("graphics/pokemon/footprints/golduck_footprint.1bpp"); - -const u32 gMonStillFrontPic_Mankey[] = INCBIN_U32("graphics/pokemon/front_pics/mankey_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Mankey[] = INCBIN_U32("graphics/pokemon/palettes/mankey_palette.gbapal.lz"); -const u32 gMonBackPic_Mankey[] = INCBIN_U32("graphics/pokemon/back_pics/mankey_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Mankey[] = INCBIN_U32("graphics/pokemon/palettes/mankey_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Mankey[] = INCBIN_U8("graphics/pokemon/icons/mankey_icon.4bpp"); -const u8 gMonFootprint_Mankey[] = INCBIN_U8("graphics/pokemon/footprints/mankey_footprint.1bpp"); - -const u32 gMonStillFrontPic_Primeape[] = INCBIN_U32("graphics/pokemon/front_pics/primeape_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Primeape[] = INCBIN_U32("graphics/pokemon/palettes/primeape_palette.gbapal.lz"); -const u32 gMonBackPic_Primeape[] = INCBIN_U32("graphics/pokemon/back_pics/primeape_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Primeape[] = INCBIN_U32("graphics/pokemon/palettes/primeape_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Primeape[] = INCBIN_U8("graphics/pokemon/icons/primeape_icon.4bpp"); -const u8 gMonFootprint_Primeape[] = INCBIN_U8("graphics/pokemon/footprints/primeape_footprint.1bpp"); - -const u32 gMonStillFrontPic_Growlithe[] = INCBIN_U32("graphics/pokemon/front_pics/growlithe_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/palettes/growlithe_palette.gbapal.lz"); -const u32 gMonBackPic_Growlithe[] = INCBIN_U32("graphics/pokemon/back_pics/growlithe_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/palettes/growlithe_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Growlithe[] = INCBIN_U8("graphics/pokemon/icons/growlithe_icon.4bpp"); -const u8 gMonFootprint_Growlithe[] = INCBIN_U8("graphics/pokemon/footprints/growlithe_footprint.1bpp"); - -const u32 gMonStillFrontPic_Arcanine[] = INCBIN_U32("graphics/pokemon/front_pics/arcanine_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/palettes/arcanine_palette.gbapal.lz"); -const u32 gMonBackPic_Arcanine[] = INCBIN_U32("graphics/pokemon/back_pics/arcanine_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/palettes/arcanine_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Arcanine[] = INCBIN_U8("graphics/pokemon/icons/arcanine_icon.4bpp"); -const u8 gMonFootprint_Arcanine[] = INCBIN_U8("graphics/pokemon/footprints/arcanine_footprint.1bpp"); - -const u32 gMonStillFrontPic_Poliwag[] = INCBIN_U32("graphics/pokemon/front_pics/poliwag_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/palettes/poliwag_palette.gbapal.lz"); -const u32 gMonBackPic_Poliwag[] = INCBIN_U32("graphics/pokemon/back_pics/poliwag_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/palettes/poliwag_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Poliwag[] = INCBIN_U8("graphics/pokemon/icons/poliwag_icon.4bpp"); -const u8 gMonFootprint_Poliwag[] = INCBIN_U8("graphics/pokemon/footprints/poliwag_footprint.1bpp"); - -const u32 gMonStillFrontPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/front_pics/poliwhirl_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/palettes/poliwhirl_palette.gbapal.lz"); -const u32 gMonBackPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/back_pics/poliwhirl_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/palettes/poliwhirl_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Poliwhirl[] = INCBIN_U8("graphics/pokemon/icons/poliwhirl_icon.4bpp"); -const u8 gMonFootprint_Poliwhirl[] = INCBIN_U8("graphics/pokemon/footprints/poliwhirl_footprint.1bpp"); - -const u32 gMonStillFrontPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/front_pics/poliwrath_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/palettes/poliwrath_palette.gbapal.lz"); -const u32 gMonBackPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/back_pics/poliwrath_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/palettes/poliwrath_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Poliwrath[] = INCBIN_U8("graphics/pokemon/icons/poliwrath_icon.4bpp"); -const u8 gMonFootprint_Poliwrath[] = INCBIN_U8("graphics/pokemon/footprints/poliwrath_footprint.1bpp"); - -const u32 gMonStillFrontPic_Abra[] = INCBIN_U32("graphics/pokemon/front_pics/abra_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Abra[] = INCBIN_U32("graphics/pokemon/palettes/abra_palette.gbapal.lz"); -const u32 gMonBackPic_Abra[] = INCBIN_U32("graphics/pokemon/back_pics/abra_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Abra[] = INCBIN_U32("graphics/pokemon/palettes/abra_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Abra[] = INCBIN_U8("graphics/pokemon/icons/abra_icon.4bpp"); -const u8 gMonFootprint_Abra[] = INCBIN_U8("graphics/pokemon/footprints/abra_footprint.1bpp"); - -const u32 gMonStillFrontPic_Kadabra[] = INCBIN_U32("graphics/pokemon/front_pics/kadabra_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/palettes/kadabra_palette.gbapal.lz"); -const u32 gMonBackPic_Kadabra[] = INCBIN_U32("graphics/pokemon/back_pics/kadabra_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/palettes/kadabra_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Kadabra[] = INCBIN_U8("graphics/pokemon/icons/kadabra_icon.4bpp"); -const u8 gMonFootprint_Kadabra[] = INCBIN_U8("graphics/pokemon/footprints/kadabra_footprint.1bpp"); - -const u32 gMonStillFrontPic_Alakazam[] = INCBIN_U32("graphics/pokemon/front_pics/alakazam_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/palettes/alakazam_palette.gbapal.lz"); -const u32 gMonBackPic_Alakazam[] = INCBIN_U32("graphics/pokemon/back_pics/alakazam_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/palettes/alakazam_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Alakazam[] = INCBIN_U8("graphics/pokemon/icons/alakazam_icon.4bpp"); -const u8 gMonFootprint_Alakazam[] = INCBIN_U8("graphics/pokemon/footprints/alakazam_footprint.1bpp"); - -const u32 gMonStillFrontPic_Machop[] = INCBIN_U32("graphics/pokemon/front_pics/machop_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Machop[] = INCBIN_U32("graphics/pokemon/palettes/machop_palette.gbapal.lz"); -const u32 gMonBackPic_Machop[] = INCBIN_U32("graphics/pokemon/back_pics/machop_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Machop[] = INCBIN_U32("graphics/pokemon/palettes/machop_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Machop[] = INCBIN_U8("graphics/pokemon/icons/machop_icon.4bpp"); -const u8 gMonFootprint_Machop[] = INCBIN_U8("graphics/pokemon/footprints/machop_footprint.1bpp"); - -const u32 gMonStillFrontPic_Machoke[] = INCBIN_U32("graphics/pokemon/front_pics/machoke_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Machoke[] = INCBIN_U32("graphics/pokemon/palettes/machoke_palette.gbapal.lz"); -const u32 gMonBackPic_Machoke[] = INCBIN_U32("graphics/pokemon/back_pics/machoke_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Machoke[] = INCBIN_U32("graphics/pokemon/palettes/machoke_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Machoke[] = INCBIN_U8("graphics/pokemon/icons/machoke_icon.4bpp"); -const u8 gMonFootprint_Machoke[] = INCBIN_U8("graphics/pokemon/footprints/machoke_footprint.1bpp"); - -const u32 gMonStillFrontPic_Machamp[] = INCBIN_U32("graphics/pokemon/front_pics/machamp_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Machamp[] = INCBIN_U32("graphics/pokemon/palettes/machamp_palette.gbapal.lz"); -const u32 gMonBackPic_Machamp[] = INCBIN_U32("graphics/pokemon/back_pics/machamp_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Machamp[] = INCBIN_U32("graphics/pokemon/palettes/machamp_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Machamp[] = INCBIN_U8("graphics/pokemon/icons/machamp_icon.4bpp"); -const u8 gMonFootprint_Machamp[] = INCBIN_U8("graphics/pokemon/footprints/machamp_footprint.1bpp"); - -const u32 gMonStillFrontPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/front_pics/bellsprout_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/palettes/bellsprout_palette.gbapal.lz"); -const u32 gMonBackPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/back_pics/bellsprout_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/palettes/bellsprout_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Bellsprout[] = INCBIN_U8("graphics/pokemon/icons/bellsprout_icon.4bpp"); -const u8 gMonFootprint_Bellsprout[] = INCBIN_U8("graphics/pokemon/footprints/bellsprout_footprint.1bpp"); - -const u32 gMonStillFrontPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/front_pics/weepinbell_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/palettes/weepinbell_palette.gbapal.lz"); -const u32 gMonBackPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/back_pics/weepinbell_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/palettes/weepinbell_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Weepinbell[] = INCBIN_U8("graphics/pokemon/icons/weepinbell_icon.4bpp"); -const u8 gMonFootprint_Weepinbell[] = INCBIN_U8("graphics/pokemon/footprints/weepinbell_footprint.1bpp"); - -const u32 gMonStillFrontPic_Victreebel[] = INCBIN_U32("graphics/pokemon/front_pics/victreebel_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/palettes/victreebel_palette.gbapal.lz"); -const u32 gMonBackPic_Victreebel[] = INCBIN_U32("graphics/pokemon/back_pics/victreebel_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/palettes/victreebel_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Victreebel[] = INCBIN_U8("graphics/pokemon/icons/victreebel_icon.4bpp"); -const u8 gMonFootprint_Victreebel[] = INCBIN_U8("graphics/pokemon/footprints/victreebel_footprint.1bpp"); - -const u32 gMonStillFrontPic_Tentacool[] = INCBIN_U32("graphics/pokemon/front_pics/tentacool_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/palettes/tentacool_palette.gbapal.lz"); -const u32 gMonBackPic_Tentacool[] = INCBIN_U32("graphics/pokemon/back_pics/tentacool_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/palettes/tentacool_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Tentacool[] = INCBIN_U8("graphics/pokemon/icons/tentacool_icon.4bpp"); -const u8 gMonFootprint_Tentacool[] = INCBIN_U8("graphics/pokemon/footprints/tentacool_footprint.1bpp"); - -const u32 gMonStillFrontPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/front_pics/tentacruel_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/palettes/tentacruel_palette.gbapal.lz"); -const u32 gMonBackPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/back_pics/tentacruel_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/palettes/tentacruel_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Tentacruel[] = INCBIN_U8("graphics/pokemon/icons/tentacruel_icon.4bpp"); -const u8 gMonFootprint_Tentacruel[] = INCBIN_U8("graphics/pokemon/footprints/tentacruel_footprint.1bpp"); - -const u32 gMonStillFrontPic_Geodude[] = INCBIN_U32("graphics/pokemon/front_pics/geodude_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Geodude[] = INCBIN_U32("graphics/pokemon/palettes/geodude_palette.gbapal.lz"); -const u32 gMonBackPic_Geodude[] = INCBIN_U32("graphics/pokemon/back_pics/geodude_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Geodude[] = INCBIN_U32("graphics/pokemon/palettes/geodude_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Geodude[] = INCBIN_U8("graphics/pokemon/icons/geodude_icon.4bpp"); -const u8 gMonFootprint_Geodude[] = INCBIN_U8("graphics/pokemon/footprints/geodude_footprint.1bpp"); - -const u32 gMonStillFrontPic_Graveler[] = INCBIN_U32("graphics/pokemon/front_pics/graveler_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Graveler[] = INCBIN_U32("graphics/pokemon/palettes/graveler_palette.gbapal.lz"); -const u32 gMonBackPic_Graveler[] = INCBIN_U32("graphics/pokemon/back_pics/graveler_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Graveler[] = INCBIN_U32("graphics/pokemon/palettes/graveler_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Graveler[] = INCBIN_U8("graphics/pokemon/icons/graveler_icon.4bpp"); -const u8 gMonFootprint_Graveler[] = INCBIN_U8("graphics/pokemon/footprints/graveler_footprint.1bpp"); - -const u32 gMonStillFrontPic_Golem[] = INCBIN_U32("graphics/pokemon/front_pics/golem_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Golem[] = INCBIN_U32("graphics/pokemon/palettes/golem_palette.gbapal.lz"); -const u32 gMonBackPic_Golem[] = INCBIN_U32("graphics/pokemon/back_pics/golem_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Golem[] = INCBIN_U32("graphics/pokemon/palettes/golem_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Golem[] = INCBIN_U8("graphics/pokemon/icons/golem_icon.4bpp"); -const u8 gMonFootprint_Golem[] = INCBIN_U8("graphics/pokemon/footprints/golem_footprint.1bpp"); - -const u32 gMonStillFrontPic_Ponyta[] = INCBIN_U32("graphics/pokemon/front_pics/ponyta_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/palettes/ponyta_palette.gbapal.lz"); -const u32 gMonBackPic_Ponyta[] = INCBIN_U32("graphics/pokemon/back_pics/ponyta_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/palettes/ponyta_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Ponyta[] = INCBIN_U8("graphics/pokemon/icons/ponyta_icon.4bpp"); -const u8 gMonFootprint_Ponyta[] = INCBIN_U8("graphics/pokemon/footprints/ponyta_footprint.1bpp"); - -const u32 gMonStillFrontPic_Rapidash[] = INCBIN_U32("graphics/pokemon/front_pics/rapidash_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/palettes/rapidash_palette.gbapal.lz"); -const u32 gMonBackPic_Rapidash[] = INCBIN_U32("graphics/pokemon/back_pics/rapidash_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/palettes/rapidash_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Rapidash[] = INCBIN_U8("graphics/pokemon/icons/rapidash_icon.4bpp"); -const u8 gMonFootprint_Rapidash[] = INCBIN_U8("graphics/pokemon/footprints/rapidash_footprint.1bpp"); - -const u32 gMonStillFrontPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/front_pics/slowpoke_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/palettes/slowpoke_palette.gbapal.lz"); -const u32 gMonBackPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/back_pics/slowpoke_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/palettes/slowpoke_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Slowpoke[] = INCBIN_U8("graphics/pokemon/icons/slowpoke_icon.4bpp"); -const u8 gMonFootprint_Slowpoke[] = INCBIN_U8("graphics/pokemon/footprints/slowpoke_footprint.1bpp"); - -const u32 gMonStillFrontPic_Slowbro[] = INCBIN_U32("graphics/pokemon/front_pics/slowbro_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/palettes/slowbro_palette.gbapal.lz"); -const u32 gMonBackPic_Slowbro[] = INCBIN_U32("graphics/pokemon/back_pics/slowbro_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/palettes/slowbro_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Slowbro[] = INCBIN_U8("graphics/pokemon/icons/slowbro_icon.4bpp"); -const u8 gMonFootprint_Slowbro[] = INCBIN_U8("graphics/pokemon/footprints/slowbro_footprint.1bpp"); - -const u32 gMonStillFrontPic_Magnemite[] = INCBIN_U32("graphics/pokemon/front_pics/magnemite_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/palettes/magnemite_palette.gbapal.lz"); -const u32 gMonBackPic_Magnemite[] = INCBIN_U32("graphics/pokemon/back_pics/magnemite_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/palettes/magnemite_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Magnemite[] = INCBIN_U8("graphics/pokemon/icons/magnemite_icon.4bpp"); -const u8 gMonFootprint_Magnemite[] = INCBIN_U8("graphics/pokemon/footprints/magnemite_footprint.1bpp"); - -const u32 gMonStillFrontPic_Magneton[] = INCBIN_U32("graphics/pokemon/front_pics/magneton_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Magneton[] = INCBIN_U32("graphics/pokemon/palettes/magneton_palette.gbapal.lz"); -const u32 gMonBackPic_Magneton[] = INCBIN_U32("graphics/pokemon/back_pics/magneton_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Magneton[] = INCBIN_U32("graphics/pokemon/palettes/magneton_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Magneton[] = INCBIN_U8("graphics/pokemon/icons/magneton_icon.4bpp"); -const u8 gMonFootprint_Magneton[] = INCBIN_U8("graphics/pokemon/footprints/magneton_footprint.1bpp"); - -const u32 gMonStillFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/front_pics/farfetch_d_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/palettes/farfetch_d_palette.gbapal.lz"); -const u32 gMonBackPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/back_pics/farfetch_d_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/palettes/farfetch_d_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Farfetchd[] = INCBIN_U8("graphics/pokemon/icons/farfetch_d_icon.4bpp"); -const u8 gMonFootprint_Farfetchd[] = INCBIN_U8("graphics/pokemon/footprints/farfetch_d_footprint.1bpp"); - -const u32 gMonStillFrontPic_Doduo[] = INCBIN_U32("graphics/pokemon/front_pics/doduo_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Doduo[] = INCBIN_U32("graphics/pokemon/palettes/doduo_palette.gbapal.lz"); -const u32 gMonBackPic_Doduo[] = INCBIN_U32("graphics/pokemon/back_pics/doduo_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Doduo[] = INCBIN_U32("graphics/pokemon/palettes/doduo_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Doduo[] = INCBIN_U8("graphics/pokemon/icons/doduo_icon.4bpp"); -const u8 gMonFootprint_Doduo[] = INCBIN_U8("graphics/pokemon/footprints/doduo_footprint.1bpp"); - -const u32 gMonStillFrontPic_Dodrio[] = INCBIN_U32("graphics/pokemon/front_pics/dodrio_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/palettes/dodrio_palette.gbapal.lz"); -const u32 gMonBackPic_Dodrio[] = INCBIN_U32("graphics/pokemon/back_pics/dodrio_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/palettes/dodrio_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Dodrio[] = INCBIN_U8("graphics/pokemon/icons/dodrio_icon.4bpp"); -const u8 gMonFootprint_Dodrio[] = INCBIN_U8("graphics/pokemon/footprints/dodrio_footprint.1bpp"); - -const u32 gMonStillFrontPic_Seel[] = INCBIN_U32("graphics/pokemon/front_pics/seel_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Seel[] = INCBIN_U32("graphics/pokemon/palettes/seel_palette.gbapal.lz"); -const u32 gMonBackPic_Seel[] = INCBIN_U32("graphics/pokemon/back_pics/seel_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Seel[] = INCBIN_U32("graphics/pokemon/palettes/seel_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Seel[] = INCBIN_U8("graphics/pokemon/icons/seel_icon.4bpp"); -const u8 gMonFootprint_Seel[] = INCBIN_U8("graphics/pokemon/footprints/seel_footprint.1bpp"); - -const u32 gMonStillFrontPic_Dewgong[] = INCBIN_U32("graphics/pokemon/front_pics/dewgong_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/palettes/dewgong_palette.gbapal.lz"); -const u32 gMonBackPic_Dewgong[] = INCBIN_U32("graphics/pokemon/back_pics/dewgong_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/palettes/dewgong_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Dewgong[] = INCBIN_U8("graphics/pokemon/icons/dewgong_icon.4bpp"); -const u8 gMonFootprint_Dewgong[] = INCBIN_U8("graphics/pokemon/footprints/dewgong_footprint.1bpp"); - -const u32 gMonStillFrontPic_Grimer[] = INCBIN_U32("graphics/pokemon/front_pics/grimer_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Grimer[] = INCBIN_U32("graphics/pokemon/palettes/grimer_palette.gbapal.lz"); -const u32 gMonBackPic_Grimer[] = INCBIN_U32("graphics/pokemon/back_pics/grimer_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Grimer[] = INCBIN_U32("graphics/pokemon/palettes/grimer_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Grimer[] = INCBIN_U8("graphics/pokemon/icons/grimer_icon.4bpp"); -const u8 gMonFootprint_Grimer[] = INCBIN_U8("graphics/pokemon/footprints/grimer_footprint.1bpp"); - -const u32 gMonStillFrontPic_Muk[] = INCBIN_U32("graphics/pokemon/front_pics/muk_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Muk[] = INCBIN_U32("graphics/pokemon/palettes/muk_palette.gbapal.lz"); -const u32 gMonBackPic_Muk[] = INCBIN_U32("graphics/pokemon/back_pics/muk_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Muk[] = INCBIN_U32("graphics/pokemon/palettes/muk_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Muk[] = INCBIN_U8("graphics/pokemon/icons/muk_icon.4bpp"); -const u8 gMonFootprint_Muk[] = INCBIN_U8("graphics/pokemon/footprints/muk_footprint.1bpp"); - -const u32 gMonStillFrontPic_Shellder[] = INCBIN_U32("graphics/pokemon/front_pics/shellder_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Shellder[] = INCBIN_U32("graphics/pokemon/palettes/shellder_palette.gbapal.lz"); -const u32 gMonBackPic_Shellder[] = INCBIN_U32("graphics/pokemon/back_pics/shellder_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Shellder[] = INCBIN_U32("graphics/pokemon/palettes/shellder_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Shellder[] = INCBIN_U8("graphics/pokemon/icons/shellder_icon.4bpp"); -const u8 gMonFootprint_Shellder[] = INCBIN_U8("graphics/pokemon/footprints/shellder_footprint.1bpp"); - -const u32 gMonStillFrontPic_Cloyster[] = INCBIN_U32("graphics/pokemon/front_pics/cloyster_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/palettes/cloyster_palette.gbapal.lz"); -const u32 gMonBackPic_Cloyster[] = INCBIN_U32("graphics/pokemon/back_pics/cloyster_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/palettes/cloyster_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Cloyster[] = INCBIN_U8("graphics/pokemon/icons/cloyster_icon.4bpp"); -const u8 gMonFootprint_Cloyster[] = INCBIN_U8("graphics/pokemon/footprints/cloyster_footprint.1bpp"); - -const u32 gMonStillFrontPic_Gastly[] = INCBIN_U32("graphics/pokemon/front_pics/gastly_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Gastly[] = INCBIN_U32("graphics/pokemon/palettes/gastly_palette.gbapal.lz"); -const u32 gMonBackPic_Gastly[] = INCBIN_U32("graphics/pokemon/back_pics/gastly_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Gastly[] = INCBIN_U32("graphics/pokemon/palettes/gastly_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Gastly[] = INCBIN_U8("graphics/pokemon/icons/gastly_icon.4bpp"); -const u8 gMonFootprint_Gastly[] = INCBIN_U8("graphics/pokemon/footprints/gastly_footprint.1bpp"); - -const u32 gMonStillFrontPic_Haunter[] = INCBIN_U32("graphics/pokemon/front_pics/haunter_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Haunter[] = INCBIN_U32("graphics/pokemon/palettes/haunter_palette.gbapal.lz"); -const u32 gMonBackPic_Haunter[] = INCBIN_U32("graphics/pokemon/back_pics/haunter_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Haunter[] = INCBIN_U32("graphics/pokemon/palettes/haunter_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Haunter[] = INCBIN_U8("graphics/pokemon/icons/haunter_icon.4bpp"); -const u8 gMonFootprint_Haunter[] = INCBIN_U8("graphics/pokemon/footprints/haunter_footprint.1bpp"); - -const u32 gMonStillFrontPic_Gengar[] = INCBIN_U32("graphics/pokemon/front_pics/gengar_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Gengar[] = INCBIN_U32("graphics/pokemon/palettes/gengar_palette.gbapal.lz"); -const u32 gMonBackPic_Gengar[] = INCBIN_U32("graphics/pokemon/back_pics/gengar_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Gengar[] = INCBIN_U32("graphics/pokemon/palettes/gengar_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Gengar[] = INCBIN_U8("graphics/pokemon/icons/gengar_icon.4bpp"); -const u8 gMonFootprint_Gengar[] = INCBIN_U8("graphics/pokemon/footprints/gengar_footprint.1bpp"); - -const u32 gMonStillFrontPic_Onix[] = INCBIN_U32("graphics/pokemon/front_pics/onix_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Onix[] = INCBIN_U32("graphics/pokemon/palettes/onix_palette.gbapal.lz"); -const u32 gMonBackPic_Onix[] = INCBIN_U32("graphics/pokemon/back_pics/onix_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Onix[] = INCBIN_U32("graphics/pokemon/palettes/onix_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Onix[] = INCBIN_U8("graphics/pokemon/icons/onix_icon.4bpp"); -const u8 gMonFootprint_Onix[] = INCBIN_U8("graphics/pokemon/footprints/onix_footprint.1bpp"); - -const u32 gMonStillFrontPic_Drowzee[] = INCBIN_U32("graphics/pokemon/front_pics/drowzee_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/palettes/drowzee_palette.gbapal.lz"); -const u32 gMonBackPic_Drowzee[] = INCBIN_U32("graphics/pokemon/back_pics/drowzee_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/palettes/drowzee_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Drowzee[] = INCBIN_U8("graphics/pokemon/icons/drowzee_icon.4bpp"); -const u8 gMonFootprint_Drowzee[] = INCBIN_U8("graphics/pokemon/footprints/drowzee_footprint.1bpp"); - -const u32 gMonStillFrontPic_Hypno[] = INCBIN_U32("graphics/pokemon/front_pics/hypno_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Hypno[] = INCBIN_U32("graphics/pokemon/palettes/hypno_palette.gbapal.lz"); -const u32 gMonBackPic_Hypno[] = INCBIN_U32("graphics/pokemon/back_pics/hypno_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Hypno[] = INCBIN_U32("graphics/pokemon/palettes/hypno_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Hypno[] = INCBIN_U8("graphics/pokemon/icons/hypno_icon.4bpp"); -const u8 gMonFootprint_Hypno[] = INCBIN_U8("graphics/pokemon/footprints/hypno_footprint.1bpp"); - -const u32 gMonStillFrontPic_Krabby[] = INCBIN_U32("graphics/pokemon/front_pics/krabby_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Krabby[] = INCBIN_U32("graphics/pokemon/palettes/krabby_palette.gbapal.lz"); -const u32 gMonBackPic_Krabby[] = INCBIN_U32("graphics/pokemon/back_pics/krabby_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Krabby[] = INCBIN_U32("graphics/pokemon/palettes/krabby_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Krabby[] = INCBIN_U8("graphics/pokemon/icons/krabby_icon.4bpp"); -const u8 gMonFootprint_Krabby[] = INCBIN_U8("graphics/pokemon/footprints/krabby_footprint.1bpp"); - -const u32 gMonStillFrontPic_Kingler[] = INCBIN_U32("graphics/pokemon/front_pics/kingler_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Kingler[] = INCBIN_U32("graphics/pokemon/palettes/kingler_palette.gbapal.lz"); -const u32 gMonBackPic_Kingler[] = INCBIN_U32("graphics/pokemon/back_pics/kingler_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Kingler[] = INCBIN_U32("graphics/pokemon/palettes/kingler_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Kingler[] = INCBIN_U8("graphics/pokemon/icons/kingler_icon.4bpp"); -const u8 gMonFootprint_Kingler[] = INCBIN_U8("graphics/pokemon/footprints/kingler_footprint.1bpp"); - -const u32 gMonStillFrontPic_Voltorb[] = INCBIN_U32("graphics/pokemon/front_pics/voltorb_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/palettes/voltorb_palette.gbapal.lz"); -const u32 gMonBackPic_Voltorb[] = INCBIN_U32("graphics/pokemon/back_pics/voltorb_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/palettes/voltorb_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Voltorb[] = INCBIN_U8("graphics/pokemon/icons/voltorb_icon.4bpp"); -const u8 gMonFootprint_Voltorb[] = INCBIN_U8("graphics/pokemon/footprints/voltorb_footprint.1bpp"); - -const u32 gMonStillFrontPic_Electrode[] = INCBIN_U32("graphics/pokemon/front_pics/electrode_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Electrode[] = INCBIN_U32("graphics/pokemon/palettes/electrode_palette.gbapal.lz"); -const u32 gMonBackPic_Electrode[] = INCBIN_U32("graphics/pokemon/back_pics/electrode_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Electrode[] = INCBIN_U32("graphics/pokemon/palettes/electrode_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Electrode[] = INCBIN_U8("graphics/pokemon/icons/electrode_icon.4bpp"); -const u8 gMonFootprint_Electrode[] = INCBIN_U8("graphics/pokemon/footprints/electrode_footprint.1bpp"); - -const u32 gMonStillFrontPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/front_pics/exeggcute_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/palettes/exeggcute_palette.gbapal.lz"); -const u32 gMonBackPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/back_pics/exeggcute_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/palettes/exeggcute_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Exeggcute[] = INCBIN_U8("graphics/pokemon/icons/exeggcute_icon.4bpp"); -const u8 gMonFootprint_Exeggcute[] = INCBIN_U8("graphics/pokemon/footprints/exeggcute_footprint.1bpp"); - -const u32 gMonStillFrontPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/front_pics/exeggutor_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/palettes/exeggutor_palette.gbapal.lz"); -const u32 gMonBackPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/back_pics/exeggutor_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/palettes/exeggutor_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Exeggutor[] = INCBIN_U8("graphics/pokemon/icons/exeggutor_icon.4bpp"); -const u8 gMonFootprint_Exeggutor[] = INCBIN_U8("graphics/pokemon/footprints/exeggutor_footprint.1bpp"); - -const u32 gMonStillFrontPic_Cubone[] = INCBIN_U32("graphics/pokemon/front_pics/cubone_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Cubone[] = INCBIN_U32("graphics/pokemon/palettes/cubone_palette.gbapal.lz"); -const u32 gMonBackPic_Cubone[] = INCBIN_U32("graphics/pokemon/back_pics/cubone_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Cubone[] = INCBIN_U32("graphics/pokemon/palettes/cubone_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Cubone[] = INCBIN_U8("graphics/pokemon/icons/cubone_icon.4bpp"); -const u8 gMonFootprint_Cubone[] = INCBIN_U8("graphics/pokemon/footprints/cubone_footprint.1bpp"); - -const u32 gMonStillFrontPic_Marowak[] = INCBIN_U32("graphics/pokemon/front_pics/marowak_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Marowak[] = INCBIN_U32("graphics/pokemon/palettes/marowak_palette.gbapal.lz"); -const u32 gMonBackPic_Marowak[] = INCBIN_U32("graphics/pokemon/back_pics/marowak_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Marowak[] = INCBIN_U32("graphics/pokemon/palettes/marowak_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Marowak[] = INCBIN_U8("graphics/pokemon/icons/marowak_icon.4bpp"); -const u8 gMonFootprint_Marowak[] = INCBIN_U8("graphics/pokemon/footprints/marowak_footprint.1bpp"); - -const u32 gMonStillFrontPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/front_pics/hitmonlee_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/palettes/hitmonlee_palette.gbapal.lz"); -const u32 gMonBackPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/back_pics/hitmonlee_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/palettes/hitmonlee_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Hitmonlee[] = INCBIN_U8("graphics/pokemon/icons/hitmonlee_icon.4bpp"); -const u8 gMonFootprint_Hitmonlee[] = INCBIN_U8("graphics/pokemon/footprints/hitmonlee_footprint.1bpp"); - -const u32 gMonStillFrontPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/front_pics/hitmonchan_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/palettes/hitmonchan_palette.gbapal.lz"); -const u32 gMonBackPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/back_pics/hitmonchan_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/palettes/hitmonchan_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Hitmonchan[] = INCBIN_U8("graphics/pokemon/icons/hitmonchan_icon.4bpp"); -const u8 gMonFootprint_Hitmonchan[] = INCBIN_U8("graphics/pokemon/footprints/hitmonchan_footprint.1bpp"); - -const u32 gMonStillFrontPic_Lickitung[] = INCBIN_U32("graphics/pokemon/front_pics/lickitung_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/palettes/lickitung_palette.gbapal.lz"); -const u32 gMonBackPic_Lickitung[] = INCBIN_U32("graphics/pokemon/back_pics/lickitung_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/palettes/lickitung_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Lickitung[] = INCBIN_U8("graphics/pokemon/icons/lickitung_icon.4bpp"); -const u8 gMonFootprint_Lickitung[] = INCBIN_U8("graphics/pokemon/footprints/lickitung_footprint.1bpp"); - -const u32 gMonStillFrontPic_Koffing[] = INCBIN_U32("graphics/pokemon/front_pics/koffing_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Koffing[] = INCBIN_U32("graphics/pokemon/palettes/koffing_palette.gbapal.lz"); -const u32 gMonBackPic_Koffing[] = INCBIN_U32("graphics/pokemon/back_pics/koffing_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Koffing[] = INCBIN_U32("graphics/pokemon/palettes/koffing_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Koffing[] = INCBIN_U8("graphics/pokemon/icons/koffing_icon.4bpp"); -const u8 gMonFootprint_Koffing[] = INCBIN_U8("graphics/pokemon/footprints/koffing_footprint.1bpp"); - -const u32 gMonStillFrontPic_Weezing[] = INCBIN_U32("graphics/pokemon/front_pics/weezing_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Weezing[] = INCBIN_U32("graphics/pokemon/palettes/weezing_palette.gbapal.lz"); -const u32 gMonBackPic_Weezing[] = INCBIN_U32("graphics/pokemon/back_pics/weezing_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Weezing[] = INCBIN_U32("graphics/pokemon/palettes/weezing_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Weezing[] = INCBIN_U8("graphics/pokemon/icons/weezing_icon.4bpp"); -const u8 gMonFootprint_Weezing[] = INCBIN_U8("graphics/pokemon/footprints/weezing_footprint.1bpp"); - -const u32 gMonStillFrontPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/front_pics/rhyhorn_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/palettes/rhyhorn_palette.gbapal.lz"); -const u32 gMonBackPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/back_pics/rhyhorn_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/palettes/rhyhorn_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Rhyhorn[] = INCBIN_U8("graphics/pokemon/icons/rhyhorn_icon.4bpp"); -const u8 gMonFootprint_Rhyhorn[] = INCBIN_U8("graphics/pokemon/footprints/rhyhorn_footprint.1bpp"); - -const u32 gMonStillFrontPic_Rhydon[] = INCBIN_U32("graphics/pokemon/front_pics/rhydon_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/palettes/rhydon_palette.gbapal.lz"); -const u32 gMonBackPic_Rhydon[] = INCBIN_U32("graphics/pokemon/back_pics/rhydon_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/palettes/rhydon_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Rhydon[] = INCBIN_U8("graphics/pokemon/icons/rhydon_icon.4bpp"); -const u8 gMonFootprint_Rhydon[] = INCBIN_U8("graphics/pokemon/footprints/rhydon_footprint.1bpp"); - -const u32 gMonStillFrontPic_Chansey[] = INCBIN_U32("graphics/pokemon/front_pics/chansey_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Chansey[] = INCBIN_U32("graphics/pokemon/palettes/chansey_palette.gbapal.lz"); -const u32 gMonBackPic_Chansey[] = INCBIN_U32("graphics/pokemon/back_pics/chansey_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Chansey[] = INCBIN_U32("graphics/pokemon/palettes/chansey_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Chansey[] = INCBIN_U8("graphics/pokemon/icons/chansey_icon.4bpp"); -const u8 gMonFootprint_Chansey[] = INCBIN_U8("graphics/pokemon/footprints/chansey_footprint.1bpp"); - -const u32 gMonStillFrontPic_Tangela[] = INCBIN_U32("graphics/pokemon/front_pics/tangela_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Tangela[] = INCBIN_U32("graphics/pokemon/palettes/tangela_palette.gbapal.lz"); -const u32 gMonBackPic_Tangela[] = INCBIN_U32("graphics/pokemon/back_pics/tangela_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Tangela[] = INCBIN_U32("graphics/pokemon/palettes/tangela_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Tangela[] = INCBIN_U8("graphics/pokemon/icons/tangela_icon.4bpp"); -const u8 gMonFootprint_Tangela[] = INCBIN_U8("graphics/pokemon/footprints/tangela_footprint.1bpp"); - -const u32 gMonStillFrontPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/front_pics/kangaskhan_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/palettes/kangaskhan_palette.gbapal.lz"); -const u32 gMonBackPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/back_pics/kangaskhan_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/palettes/kangaskhan_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Kangaskhan[] = INCBIN_U8("graphics/pokemon/icons/kangaskhan_icon.4bpp"); -const u8 gMonFootprint_Kangaskhan[] = INCBIN_U8("graphics/pokemon/footprints/kangaskhan_footprint.1bpp"); - -const u32 gMonStillFrontPic_Horsea[] = INCBIN_U32("graphics/pokemon/front_pics/horsea_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Horsea[] = INCBIN_U32("graphics/pokemon/palettes/horsea_palette.gbapal.lz"); -const u32 gMonBackPic_Horsea[] = INCBIN_U32("graphics/pokemon/back_pics/horsea_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Horsea[] = INCBIN_U32("graphics/pokemon/palettes/horsea_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Horsea[] = INCBIN_U8("graphics/pokemon/icons/horsea_icon.4bpp"); -const u8 gMonFootprint_Horsea[] = INCBIN_U8("graphics/pokemon/footprints/horsea_footprint.1bpp"); - -const u32 gMonStillFrontPic_Seadra[] = INCBIN_U32("graphics/pokemon/front_pics/seadra_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Seadra[] = INCBIN_U32("graphics/pokemon/palettes/seadra_palette.gbapal.lz"); -const u32 gMonBackPic_Seadra[] = INCBIN_U32("graphics/pokemon/back_pics/seadra_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Seadra[] = INCBIN_U32("graphics/pokemon/palettes/seadra_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Seadra[] = INCBIN_U8("graphics/pokemon/icons/seadra_icon.4bpp"); -const u8 gMonFootprint_Seadra[] = INCBIN_U8("graphics/pokemon/footprints/seadra_footprint.1bpp"); - -const u32 gMonStillFrontPic_Goldeen[] = INCBIN_U32("graphics/pokemon/front_pics/goldeen_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/palettes/goldeen_palette.gbapal.lz"); -const u32 gMonBackPic_Goldeen[] = INCBIN_U32("graphics/pokemon/back_pics/goldeen_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/palettes/goldeen_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Goldeen[] = INCBIN_U8("graphics/pokemon/icons/goldeen_icon.4bpp"); -const u8 gMonFootprint_Goldeen[] = INCBIN_U8("graphics/pokemon/footprints/goldeen_footprint.1bpp"); - -const u32 gMonStillFrontPic_Seaking[] = INCBIN_U32("graphics/pokemon/front_pics/seaking_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Seaking[] = INCBIN_U32("graphics/pokemon/palettes/seaking_palette.gbapal.lz"); -const u32 gMonBackPic_Seaking[] = INCBIN_U32("graphics/pokemon/back_pics/seaking_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Seaking[] = INCBIN_U32("graphics/pokemon/palettes/seaking_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Seaking[] = INCBIN_U8("graphics/pokemon/icons/seaking_icon.4bpp"); -const u8 gMonFootprint_Seaking[] = INCBIN_U8("graphics/pokemon/footprints/seaking_footprint.1bpp"); - -const u32 gMonStillFrontPic_Staryu[] = INCBIN_U32("graphics/pokemon/front_pics/staryu_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Staryu[] = INCBIN_U32("graphics/pokemon/palettes/staryu_palette.gbapal.lz"); -const u32 gMonBackPic_Staryu[] = INCBIN_U32("graphics/pokemon/back_pics/staryu_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Staryu[] = INCBIN_U32("graphics/pokemon/palettes/staryu_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Staryu[] = INCBIN_U8("graphics/pokemon/icons/staryu_icon.4bpp"); -const u8 gMonFootprint_Staryu[] = INCBIN_U8("graphics/pokemon/footprints/staryu_footprint.1bpp"); - -const u32 gMonStillFrontPic_Starmie[] = INCBIN_U32("graphics/pokemon/front_pics/starmie_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Starmie[] = INCBIN_U32("graphics/pokemon/palettes/starmie_palette.gbapal.lz"); -const u32 gMonBackPic_Starmie[] = INCBIN_U32("graphics/pokemon/back_pics/starmie_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Starmie[] = INCBIN_U32("graphics/pokemon/palettes/starmie_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Starmie[] = INCBIN_U8("graphics/pokemon/icons/starmie_icon.4bpp"); -const u8 gMonFootprint_Starmie[] = INCBIN_U8("graphics/pokemon/footprints/starmie_footprint.1bpp"); - -const u32 gMonStillFrontPic_Mrmime[] = INCBIN_U32("graphics/pokemon/front_pics/mr_mime_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Mrmime[] = INCBIN_U32("graphics/pokemon/palettes/mr_mime_palette.gbapal.lz"); -const u32 gMonBackPic_Mrmime[] = INCBIN_U32("graphics/pokemon/back_pics/mr_mime_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Mrmime[] = INCBIN_U32("graphics/pokemon/palettes/mr_mime_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Mrmime[] = INCBIN_U8("graphics/pokemon/icons/mr_mime_icon.4bpp"); -const u8 gMonFootprint_Mrmime[] = INCBIN_U8("graphics/pokemon/footprints/mr_mime_footprint.1bpp"); - -const u32 gMonStillFrontPic_Scyther[] = INCBIN_U32("graphics/pokemon/front_pics/scyther_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Scyther[] = INCBIN_U32("graphics/pokemon/palettes/scyther_palette.gbapal.lz"); -const u32 gMonBackPic_Scyther[] = INCBIN_U32("graphics/pokemon/back_pics/scyther_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Scyther[] = INCBIN_U32("graphics/pokemon/palettes/scyther_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Scyther[] = INCBIN_U8("graphics/pokemon/icons/scyther_icon.4bpp"); -const u8 gMonFootprint_Scyther[] = INCBIN_U8("graphics/pokemon/footprints/scyther_footprint.1bpp"); - -const u32 gMonStillFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/front_pics/jynx_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Jynx[] = INCBIN_U32("graphics/pokemon/palettes/jynx_palette.gbapal.lz"); -const u32 gMonBackPic_Jynx[] = INCBIN_U32("graphics/pokemon/back_pics/jynx_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Jynx[] = INCBIN_U32("graphics/pokemon/palettes/jynx_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Jynx[] = INCBIN_U8("graphics/pokemon/icons/jynx_icon.4bpp"); -const u8 gMonFootprint_Jynx[] = INCBIN_U8("graphics/pokemon/footprints/jynx_footprint.1bpp"); - -const u32 gMonStillFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/front_pics/electabuzz_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/palettes/electabuzz_palette.gbapal.lz"); -const u32 gMonBackPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/back_pics/electabuzz_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/palettes/electabuzz_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Electabuzz[] = INCBIN_U8("graphics/pokemon/icons/electabuzz_icon.4bpp"); -const u8 gMonFootprint_Electabuzz[] = INCBIN_U8("graphics/pokemon/footprints/electabuzz_footprint.1bpp"); - -const u32 gMonStillFrontPic_Magmar[] = INCBIN_U32("graphics/pokemon/front_pics/magmar_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Magmar[] = INCBIN_U32("graphics/pokemon/palettes/magmar_palette.gbapal.lz"); -const u32 gMonBackPic_Magmar[] = INCBIN_U32("graphics/pokemon/back_pics/magmar_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Magmar[] = INCBIN_U32("graphics/pokemon/palettes/magmar_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Magmar[] = INCBIN_U8("graphics/pokemon/icons/magmar_icon.4bpp"); -const u8 gMonFootprint_Magmar[] = INCBIN_U8("graphics/pokemon/footprints/magmar_footprint.1bpp"); - -const u32 gMonStillFrontPic_Pinsir[] = INCBIN_U32("graphics/pokemon/front_pics/pinsir_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/palettes/pinsir_palette.gbapal.lz"); -const u32 gMonBackPic_Pinsir[] = INCBIN_U32("graphics/pokemon/back_pics/pinsir_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/palettes/pinsir_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Pinsir[] = INCBIN_U8("graphics/pokemon/icons/pinsir_icon.4bpp"); -const u8 gMonFootprint_Pinsir[] = INCBIN_U8("graphics/pokemon/footprints/pinsir_footprint.1bpp"); - -const u32 gMonStillFrontPic_Tauros[] = INCBIN_U32("graphics/pokemon/front_pics/tauros_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Tauros[] = INCBIN_U32("graphics/pokemon/palettes/tauros_palette.gbapal.lz"); -const u32 gMonBackPic_Tauros[] = INCBIN_U32("graphics/pokemon/back_pics/tauros_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Tauros[] = INCBIN_U32("graphics/pokemon/palettes/tauros_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Tauros[] = INCBIN_U8("graphics/pokemon/icons/tauros_icon.4bpp"); -const u8 gMonFootprint_Tauros[] = INCBIN_U8("graphics/pokemon/footprints/tauros_footprint.1bpp"); - -const u32 gMonStillFrontPic_Magikarp[] = INCBIN_U32("graphics/pokemon/front_pics/magikarp_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/palettes/magikarp_palette.gbapal.lz"); -const u32 gMonBackPic_Magikarp[] = INCBIN_U32("graphics/pokemon/back_pics/magikarp_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/palettes/magikarp_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Magikarp[] = INCBIN_U8("graphics/pokemon/icons/magikarp_icon.4bpp"); -const u8 gMonFootprint_Magikarp[] = INCBIN_U8("graphics/pokemon/footprints/magikarp_footprint.1bpp"); - -const u32 gMonStillFrontPic_Gyarados[] = INCBIN_U32("graphics/pokemon/front_pics/gyarados_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/palettes/gyarados_palette.gbapal.lz"); -const u32 gMonBackPic_Gyarados[] = INCBIN_U32("graphics/pokemon/back_pics/gyarados_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/palettes/gyarados_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Gyarados[] = INCBIN_U8("graphics/pokemon/icons/gyarados_icon.4bpp"); -const u8 gMonFootprint_Gyarados[] = INCBIN_U8("graphics/pokemon/footprints/gyarados_footprint.1bpp"); - -const u32 gMonStillFrontPic_Lapras[] = INCBIN_U32("graphics/pokemon/front_pics/lapras_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Lapras[] = INCBIN_U32("graphics/pokemon/palettes/lapras_palette.gbapal.lz"); -const u32 gMonBackPic_Lapras[] = INCBIN_U32("graphics/pokemon/back_pics/lapras_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Lapras[] = INCBIN_U32("graphics/pokemon/palettes/lapras_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Lapras[] = INCBIN_U8("graphics/pokemon/icons/lapras_icon.4bpp"); -const u8 gMonFootprint_Lapras[] = INCBIN_U8("graphics/pokemon/footprints/lapras_footprint.1bpp"); - -const u32 gMonStillFrontPic_Ditto[] = INCBIN_U32("graphics/pokemon/front_pics/ditto_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Ditto[] = INCBIN_U32("graphics/pokemon/palettes/ditto_palette.gbapal.lz"); -const u32 gMonBackPic_Ditto[] = INCBIN_U32("graphics/pokemon/back_pics/ditto_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Ditto[] = INCBIN_U32("graphics/pokemon/palettes/ditto_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Ditto[] = INCBIN_U8("graphics/pokemon/icons/ditto_icon.4bpp"); -const u8 gMonFootprint_Ditto[] = INCBIN_U8("graphics/pokemon/footprints/ditto_footprint.1bpp"); - -const u32 gMonStillFrontPic_Eevee[] = INCBIN_U32("graphics/pokemon/front_pics/eevee_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Eevee[] = INCBIN_U32("graphics/pokemon/palettes/eevee_palette.gbapal.lz"); -const u32 gMonBackPic_Eevee[] = INCBIN_U32("graphics/pokemon/back_pics/eevee_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Eevee[] = INCBIN_U32("graphics/pokemon/palettes/eevee_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Eevee[] = INCBIN_U8("graphics/pokemon/icons/eevee_icon.4bpp"); -const u8 gMonFootprint_Eevee[] = INCBIN_U8("graphics/pokemon/footprints/eevee_footprint.1bpp"); - -const u32 gMonStillFrontPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/front_pics/vaporeon_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/palettes/vaporeon_palette.gbapal.lz"); -const u32 gMonBackPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/back_pics/vaporeon_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/palettes/vaporeon_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Vaporeon[] = INCBIN_U8("graphics/pokemon/icons/vaporeon_icon.4bpp"); -const u8 gMonFootprint_Vaporeon[] = INCBIN_U8("graphics/pokemon/footprints/vaporeon_footprint.1bpp"); - -const u32 gMonStillFrontPic_Jolteon[] = INCBIN_U32("graphics/pokemon/front_pics/jolteon_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/palettes/jolteon_palette.gbapal.lz"); -const u32 gMonBackPic_Jolteon[] = INCBIN_U32("graphics/pokemon/back_pics/jolteon_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/palettes/jolteon_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Jolteon[] = INCBIN_U8("graphics/pokemon/icons/jolteon_icon.4bpp"); -const u8 gMonFootprint_Jolteon[] = INCBIN_U8("graphics/pokemon/footprints/jolteon_footprint.1bpp"); - -const u32 gMonStillFrontPic_Flareon[] = INCBIN_U32("graphics/pokemon/front_pics/flareon_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Flareon[] = INCBIN_U32("graphics/pokemon/palettes/flareon_palette.gbapal.lz"); -const u32 gMonBackPic_Flareon[] = INCBIN_U32("graphics/pokemon/back_pics/flareon_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Flareon[] = INCBIN_U32("graphics/pokemon/palettes/flareon_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Flareon[] = INCBIN_U8("graphics/pokemon/icons/flareon_icon.4bpp"); -const u8 gMonFootprint_Flareon[] = INCBIN_U8("graphics/pokemon/footprints/flareon_footprint.1bpp"); - -const u32 gMonStillFrontPic_Porygon[] = INCBIN_U32("graphics/pokemon/front_pics/porygon_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Porygon[] = INCBIN_U32("graphics/pokemon/palettes/porygon_palette.gbapal.lz"); -const u32 gMonBackPic_Porygon[] = INCBIN_U32("graphics/pokemon/back_pics/porygon_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Porygon[] = INCBIN_U32("graphics/pokemon/palettes/porygon_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Porygon[] = INCBIN_U8("graphics/pokemon/icons/porygon_icon.4bpp"); -const u8 gMonFootprint_Porygon[] = INCBIN_U8("graphics/pokemon/footprints/porygon_footprint.1bpp"); - -const u32 gMonStillFrontPic_Omanyte[] = INCBIN_U32("graphics/pokemon/front_pics/omanyte_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/palettes/omanyte_palette.gbapal.lz"); -const u32 gMonBackPic_Omanyte[] = INCBIN_U32("graphics/pokemon/back_pics/omanyte_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/palettes/omanyte_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Omanyte[] = INCBIN_U8("graphics/pokemon/icons/omanyte_icon.4bpp"); -const u8 gMonFootprint_Omanyte[] = INCBIN_U8("graphics/pokemon/footprints/omanyte_footprint.1bpp"); - -const u32 gMonStillFrontPic_Omastar[] = INCBIN_U32("graphics/pokemon/front_pics/omastar_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Omastar[] = INCBIN_U32("graphics/pokemon/palettes/omastar_palette.gbapal.lz"); -const u32 gMonBackPic_Omastar[] = INCBIN_U32("graphics/pokemon/back_pics/omastar_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Omastar[] = INCBIN_U32("graphics/pokemon/palettes/omastar_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Omastar[] = INCBIN_U8("graphics/pokemon/icons/omastar_icon.4bpp"); -const u8 gMonFootprint_Omastar[] = INCBIN_U8("graphics/pokemon/footprints/omastar_footprint.1bpp"); - -const u32 gMonStillFrontPic_Kabuto[] = INCBIN_U32("graphics/pokemon/front_pics/kabuto_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/palettes/kabuto_palette.gbapal.lz"); -const u32 gMonBackPic_Kabuto[] = INCBIN_U32("graphics/pokemon/back_pics/kabuto_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/palettes/kabuto_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Kabuto[] = INCBIN_U8("graphics/pokemon/icons/kabuto_icon.4bpp"); -const u8 gMonFootprint_Kabuto[] = INCBIN_U8("graphics/pokemon/footprints/kabuto_footprint.1bpp"); - -const u32 gMonStillFrontPic_Kabutops[] = INCBIN_U32("graphics/pokemon/front_pics/kabutops_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/palettes/kabutops_palette.gbapal.lz"); -const u32 gMonBackPic_Kabutops[] = INCBIN_U32("graphics/pokemon/back_pics/kabutops_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/palettes/kabutops_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Kabutops[] = INCBIN_U8("graphics/pokemon/icons/kabutops_icon.4bpp"); -const u8 gMonFootprint_Kabutops[] = INCBIN_U8("graphics/pokemon/footprints/kabutops_footprint.1bpp"); - -const u32 gMonStillFrontPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/front_pics/aerodactyl_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/palettes/aerodactyl_palette.gbapal.lz"); -const u32 gMonBackPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/back_pics/aerodactyl_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/palettes/aerodactyl_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Aerodactyl[] = INCBIN_U8("graphics/pokemon/icons/aerodactyl_icon.4bpp"); -const u8 gMonFootprint_Aerodactyl[] = INCBIN_U8("graphics/pokemon/footprints/aerodactyl_footprint.1bpp"); - -const u32 gMonStillFrontPic_Snorlax[] = INCBIN_U32("graphics/pokemon/front_pics/snorlax_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/palettes/snorlax_palette.gbapal.lz"); -const u32 gMonBackPic_Snorlax[] = INCBIN_U32("graphics/pokemon/back_pics/snorlax_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/palettes/snorlax_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Snorlax[] = INCBIN_U8("graphics/pokemon/icons/snorlax_icon.4bpp"); -const u8 gMonFootprint_Snorlax[] = INCBIN_U8("graphics/pokemon/footprints/snorlax_footprint.1bpp"); - -const u32 gMonStillFrontPic_Articuno[] = INCBIN_U32("graphics/pokemon/front_pics/articuno_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Articuno[] = INCBIN_U32("graphics/pokemon/palettes/articuno_palette.gbapal.lz"); -const u32 gMonBackPic_Articuno[] = INCBIN_U32("graphics/pokemon/back_pics/articuno_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Articuno[] = INCBIN_U32("graphics/pokemon/palettes/articuno_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Articuno[] = INCBIN_U8("graphics/pokemon/icons/articuno_icon.4bpp"); -const u8 gMonFootprint_Articuno[] = INCBIN_U8("graphics/pokemon/footprints/articuno_footprint.1bpp"); - -const u32 gMonStillFrontPic_Zapdos[] = INCBIN_U32("graphics/pokemon/front_pics/zapdos_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/palettes/zapdos_palette.gbapal.lz"); -const u32 gMonBackPic_Zapdos[] = INCBIN_U32("graphics/pokemon/back_pics/zapdos_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/palettes/zapdos_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Zapdos[] = INCBIN_U8("graphics/pokemon/icons/zapdos_icon.4bpp"); -const u8 gMonFootprint_Zapdos[] = INCBIN_U8("graphics/pokemon/footprints/zapdos_footprint.1bpp"); - -const u32 gMonStillFrontPic_Moltres[] = INCBIN_U32("graphics/pokemon/front_pics/moltres_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Moltres[] = INCBIN_U32("graphics/pokemon/palettes/moltres_palette.gbapal.lz"); -const u32 gMonBackPic_Moltres[] = INCBIN_U32("graphics/pokemon/back_pics/moltres_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Moltres[] = INCBIN_U32("graphics/pokemon/palettes/moltres_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Moltres[] = INCBIN_U8("graphics/pokemon/icons/moltres_icon.4bpp"); -const u8 gMonFootprint_Moltres[] = INCBIN_U8("graphics/pokemon/footprints/moltres_footprint.1bpp"); - -const u32 gMonStillFrontPic_Dratini[] = INCBIN_U32("graphics/pokemon/front_pics/dratini_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Dratini[] = INCBIN_U32("graphics/pokemon/palettes/dratini_palette.gbapal.lz"); -const u32 gMonBackPic_Dratini[] = INCBIN_U32("graphics/pokemon/back_pics/dratini_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Dratini[] = INCBIN_U32("graphics/pokemon/palettes/dratini_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Dratini[] = INCBIN_U8("graphics/pokemon/icons/dratini_icon.4bpp"); -const u8 gMonFootprint_Dratini[] = INCBIN_U8("graphics/pokemon/footprints/dratini_footprint.1bpp"); - -const u32 gMonStillFrontPic_Dragonair[] = INCBIN_U32("graphics/pokemon/front_pics/dragonair_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/palettes/dragonair_palette.gbapal.lz"); -const u32 gMonBackPic_Dragonair[] = INCBIN_U32("graphics/pokemon/back_pics/dragonair_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/palettes/dragonair_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Dragonair[] = INCBIN_U8("graphics/pokemon/icons/dragonair_icon.4bpp"); -const u8 gMonFootprint_Dragonair[] = INCBIN_U8("graphics/pokemon/footprints/dragonair_footprint.1bpp"); - -const u32 gMonStillFrontPic_Dragonite[] = INCBIN_U32("graphics/pokemon/front_pics/dragonite_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/palettes/dragonite_palette.gbapal.lz"); -const u32 gMonBackPic_Dragonite[] = INCBIN_U32("graphics/pokemon/back_pics/dragonite_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/palettes/dragonite_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Dragonite[] = INCBIN_U8("graphics/pokemon/icons/dragonite_icon.4bpp"); -const u8 gMonFootprint_Dragonite[] = INCBIN_U8("graphics/pokemon/footprints/dragonite_footprint.1bpp"); - -const u32 gMonStillFrontPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/front_pics/mewtwo_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/palettes/mewtwo_palette.gbapal.lz"); -const u32 gMonBackPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/back_pics/mewtwo_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/palettes/mewtwo_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Mewtwo[] = INCBIN_U8("graphics/pokemon/icons/mewtwo_icon.4bpp"); -const u8 gMonFootprint_Mewtwo[] = INCBIN_U8("graphics/pokemon/footprints/mewtwo_footprint.1bpp"); - -const u32 gMonStillFrontPic_Mew[] = INCBIN_U32("graphics/pokemon/front_pics/mew_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Mew[] = INCBIN_U32("graphics/pokemon/palettes/mew_palette.gbapal.lz"); -const u32 gMonBackPic_Mew[] = INCBIN_U32("graphics/pokemon/back_pics/mew_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Mew[] = INCBIN_U32("graphics/pokemon/palettes/mew_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Mew[] = INCBIN_U8("graphics/pokemon/icons/mew_icon.4bpp"); -const u8 gMonFootprint_Mew[] = INCBIN_U8("graphics/pokemon/footprints/mew_footprint.1bpp"); - -const u32 gMonStillFrontPic_Chikorita[] = INCBIN_U32("graphics/pokemon/front_pics/chikorita_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/palettes/chikorita_palette.gbapal.lz"); -const u32 gMonBackPic_Chikorita[] = INCBIN_U32("graphics/pokemon/back_pics/chikorita_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/palettes/chikorita_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Chikorita[] = INCBIN_U8("graphics/pokemon/icons/chikorita_icon.4bpp"); -const u8 gMonFootprint_Chikorita[] = INCBIN_U8("graphics/pokemon/footprints/chikorita_footprint.1bpp"); - -const u32 gMonStillFrontPic_Bayleef[] = INCBIN_U32("graphics/pokemon/front_pics/bayleef_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/palettes/bayleef_palette.gbapal.lz"); -const u32 gMonBackPic_Bayleef[] = INCBIN_U32("graphics/pokemon/back_pics/bayleef_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/palettes/bayleef_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Bayleef[] = INCBIN_U8("graphics/pokemon/icons/bayleef_icon.4bpp"); -const u8 gMonFootprint_Bayleef[] = INCBIN_U8("graphics/pokemon/footprints/bayleef_footprint.1bpp"); - -const u32 gMonStillFrontPic_Meganium[] = INCBIN_U32("graphics/pokemon/front_pics/meganium_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Meganium[] = INCBIN_U32("graphics/pokemon/palettes/meganium_palette.gbapal.lz"); -const u32 gMonBackPic_Meganium[] = INCBIN_U32("graphics/pokemon/back_pics/meganium_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Meganium[] = INCBIN_U32("graphics/pokemon/palettes/meganium_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Meganium[] = INCBIN_U8("graphics/pokemon/icons/meganium_icon.4bpp"); -const u8 gMonFootprint_Meganium[] = INCBIN_U8("graphics/pokemon/footprints/meganium_footprint.1bpp"); - -const u32 gMonStillFrontPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/front_pics/cyndaquil_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/palettes/cyndaquil_palette.gbapal.lz"); -const u32 gMonBackPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/back_pics/cyndaquil_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/palettes/cyndaquil_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Cyndaquil[] = INCBIN_U8("graphics/pokemon/icons/cyndaquil_icon.4bpp"); -const u8 gMonFootprint_Cyndaquil[] = INCBIN_U8("graphics/pokemon/footprints/cyndaquil_footprint.1bpp"); - -const u32 gMonStillFrontPic_Quilava[] = INCBIN_U32("graphics/pokemon/front_pics/quilava_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Quilava[] = INCBIN_U32("graphics/pokemon/palettes/quilava_palette.gbapal.lz"); -const u32 gMonBackPic_Quilava[] = INCBIN_U32("graphics/pokemon/back_pics/quilava_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Quilava[] = INCBIN_U32("graphics/pokemon/palettes/quilava_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Quilava[] = INCBIN_U8("graphics/pokemon/icons/quilava_icon.4bpp"); -const u8 gMonFootprint_Quilava[] = INCBIN_U8("graphics/pokemon/footprints/quilava_footprint.1bpp"); - -const u32 gMonStillFrontPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/front_pics/typhlosion_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/palettes/typhlosion_palette.gbapal.lz"); -const u32 gMonBackPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/back_pics/typhlosion_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/palettes/typhlosion_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Typhlosion[] = INCBIN_U8("graphics/pokemon/icons/typhlosion_icon.4bpp"); -const u8 gMonFootprint_Typhlosion[] = INCBIN_U8("graphics/pokemon/footprints/typhlosion_footprint.1bpp"); - -const u32 gMonStillFrontPic_Totodile[] = INCBIN_U32("graphics/pokemon/front_pics/totodile_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Totodile[] = INCBIN_U32("graphics/pokemon/palettes/totodile_palette.gbapal.lz"); -const u32 gMonBackPic_Totodile[] = INCBIN_U32("graphics/pokemon/back_pics/totodile_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Totodile[] = INCBIN_U32("graphics/pokemon/palettes/totodile_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Totodile[] = INCBIN_U8("graphics/pokemon/icons/totodile_icon.4bpp"); -const u8 gMonFootprint_Totodile[] = INCBIN_U8("graphics/pokemon/footprints/totodile_footprint.1bpp"); - -const u32 gMonStillFrontPic_Croconaw[] = INCBIN_U32("graphics/pokemon/front_pics/croconaw_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/palettes/croconaw_palette.gbapal.lz"); -const u32 gMonBackPic_Croconaw[] = INCBIN_U32("graphics/pokemon/back_pics/croconaw_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/palettes/croconaw_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Croconaw[] = INCBIN_U8("graphics/pokemon/icons/croconaw_icon.4bpp"); -const u8 gMonFootprint_Croconaw[] = INCBIN_U8("graphics/pokemon/footprints/croconaw_footprint.1bpp"); - -const u32 gMonStillFrontPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/front_pics/feraligatr_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/palettes/feraligatr_palette.gbapal.lz"); -const u32 gMonBackPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/back_pics/feraligatr_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/palettes/feraligatr_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Feraligatr[] = INCBIN_U8("graphics/pokemon/icons/feraligatr_icon.4bpp"); -const u8 gMonFootprint_Feraligatr[] = INCBIN_U8("graphics/pokemon/footprints/feraligatr_footprint.1bpp"); - -const u32 gMonStillFrontPic_Sentret[] = INCBIN_U32("graphics/pokemon/front_pics/sentret_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Sentret[] = INCBIN_U32("graphics/pokemon/palettes/sentret_palette.gbapal.lz"); -const u32 gMonBackPic_Sentret[] = INCBIN_U32("graphics/pokemon/back_pics/sentret_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Sentret[] = INCBIN_U32("graphics/pokemon/palettes/sentret_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Sentret[] = INCBIN_U8("graphics/pokemon/icons/sentret_icon.4bpp"); -const u8 gMonFootprint_Sentret[] = INCBIN_U8("graphics/pokemon/footprints/sentret_footprint.1bpp"); - -const u32 gMonStillFrontPic_Furret[] = INCBIN_U32("graphics/pokemon/front_pics/furret_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Furret[] = INCBIN_U32("graphics/pokemon/palettes/furret_palette.gbapal.lz"); -const u32 gMonBackPic_Furret[] = INCBIN_U32("graphics/pokemon/back_pics/furret_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Furret[] = INCBIN_U32("graphics/pokemon/palettes/furret_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Furret[] = INCBIN_U8("graphics/pokemon/icons/furret_icon.4bpp"); -const u8 gMonFootprint_Furret[] = INCBIN_U8("graphics/pokemon/footprints/furret_footprint.1bpp"); - -const u32 gMonStillFrontPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/front_pics/hoothoot_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/palettes/hoothoot_palette.gbapal.lz"); -const u32 gMonBackPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/back_pics/hoothoot_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/palettes/hoothoot_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Hoothoot[] = INCBIN_U8("graphics/pokemon/icons/hoothoot_icon.4bpp"); -const u8 gMonFootprint_Hoothoot[] = INCBIN_U8("graphics/pokemon/footprints/hoothoot_footprint.1bpp"); - -const u32 gMonStillFrontPic_Noctowl[] = INCBIN_U32("graphics/pokemon/front_pics/noctowl_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/palettes/noctowl_palette.gbapal.lz"); -const u32 gMonBackPic_Noctowl[] = INCBIN_U32("graphics/pokemon/back_pics/noctowl_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/palettes/noctowl_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Noctowl[] = INCBIN_U8("graphics/pokemon/icons/noctowl_icon.4bpp"); -const u8 gMonFootprint_Noctowl[] = INCBIN_U8("graphics/pokemon/footprints/noctowl_footprint.1bpp"); - -const u32 gMonStillFrontPic_Ledyba[] = INCBIN_U32("graphics/pokemon/front_pics/ledyba_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/palettes/ledyba_palette.gbapal.lz"); -const u32 gMonBackPic_Ledyba[] = INCBIN_U32("graphics/pokemon/back_pics/ledyba_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/palettes/ledyba_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Ledyba[] = INCBIN_U8("graphics/pokemon/icons/ledyba_icon.4bpp"); -const u8 gMonFootprint_Ledyba[] = INCBIN_U8("graphics/pokemon/footprints/ledyba_footprint.1bpp"); - -const u32 gMonStillFrontPic_Ledian[] = INCBIN_U32("graphics/pokemon/front_pics/ledian_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Ledian[] = INCBIN_U32("graphics/pokemon/palettes/ledian_palette.gbapal.lz"); -const u32 gMonBackPic_Ledian[] = INCBIN_U32("graphics/pokemon/back_pics/ledian_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Ledian[] = INCBIN_U32("graphics/pokemon/palettes/ledian_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Ledian[] = INCBIN_U8("graphics/pokemon/icons/ledian_icon.4bpp"); -const u8 gMonFootprint_Ledian[] = INCBIN_U8("graphics/pokemon/footprints/ledian_footprint.1bpp"); - -const u32 gMonStillFrontPic_Spinarak[] = INCBIN_U32("graphics/pokemon/front_pics/spinarak_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/palettes/spinarak_palette.gbapal.lz"); -const u32 gMonBackPic_Spinarak[] = INCBIN_U32("graphics/pokemon/back_pics/spinarak_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/palettes/spinarak_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Spinarak[] = INCBIN_U8("graphics/pokemon/icons/spinarak_icon.4bpp"); -const u8 gMonFootprint_Spinarak[] = INCBIN_U8("graphics/pokemon/footprints/spinarak_footprint.1bpp"); - -const u32 gMonStillFrontPic_Ariados[] = INCBIN_U32("graphics/pokemon/front_pics/ariados_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Ariados[] = INCBIN_U32("graphics/pokemon/palettes/ariados_palette.gbapal.lz"); -const u32 gMonBackPic_Ariados[] = INCBIN_U32("graphics/pokemon/back_pics/ariados_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Ariados[] = INCBIN_U32("graphics/pokemon/palettes/ariados_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Ariados[] = INCBIN_U8("graphics/pokemon/icons/ariados_icon.4bpp"); -const u8 gMonFootprint_Ariados[] = INCBIN_U8("graphics/pokemon/footprints/ariados_footprint.1bpp"); - -const u32 gMonStillFrontPic_Crobat[] = INCBIN_U32("graphics/pokemon/front_pics/crobat_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Crobat[] = INCBIN_U32("graphics/pokemon/palettes/crobat_palette.gbapal.lz"); -const u32 gMonBackPic_Crobat[] = INCBIN_U32("graphics/pokemon/back_pics/crobat_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Crobat[] = INCBIN_U32("graphics/pokemon/palettes/crobat_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Crobat[] = INCBIN_U8("graphics/pokemon/icons/crobat_icon.4bpp"); -const u8 gMonFootprint_Crobat[] = INCBIN_U8("graphics/pokemon/footprints/crobat_footprint.1bpp"); - -const u32 gMonStillFrontPic_Chinchou[] = INCBIN_U32("graphics/pokemon/front_pics/chinchou_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/palettes/chinchou_palette.gbapal.lz"); -const u32 gMonBackPic_Chinchou[] = INCBIN_U32("graphics/pokemon/back_pics/chinchou_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/palettes/chinchou_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Chinchou[] = INCBIN_U8("graphics/pokemon/icons/chinchou_icon.4bpp"); -const u8 gMonFootprint_Chinchou[] = INCBIN_U8("graphics/pokemon/footprints/chinchou_footprint.1bpp"); - -const u32 gMonStillFrontPic_Lanturn[] = INCBIN_U32("graphics/pokemon/front_pics/lanturn_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/palettes/lanturn_palette.gbapal.lz"); -const u32 gMonBackPic_Lanturn[] = INCBIN_U32("graphics/pokemon/back_pics/lanturn_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/palettes/lanturn_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Lanturn[] = INCBIN_U8("graphics/pokemon/icons/lanturn_icon.4bpp"); -const u8 gMonFootprint_Lanturn[] = INCBIN_U8("graphics/pokemon/footprints/lanturn_footprint.1bpp"); - -const u32 gMonStillFrontPic_Pichu[] = INCBIN_U32("graphics/pokemon/front_pics/pichu_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Pichu[] = INCBIN_U32("graphics/pokemon/palettes/pichu_palette.gbapal.lz"); -const u32 gMonBackPic_Pichu[] = INCBIN_U32("graphics/pokemon/back_pics/pichu_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Pichu[] = INCBIN_U32("graphics/pokemon/palettes/pichu_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Pichu[] = INCBIN_U8("graphics/pokemon/icons/pichu_icon.4bpp"); -const u8 gMonFootprint_Pichu[] = INCBIN_U8("graphics/pokemon/footprints/pichu_footprint.1bpp"); - -const u32 gMonStillFrontPic_Cleffa[] = INCBIN_U32("graphics/pokemon/front_pics/cleffa_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/palettes/cleffa_palette.gbapal.lz"); -const u32 gMonBackPic_Cleffa[] = INCBIN_U32("graphics/pokemon/back_pics/cleffa_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/palettes/cleffa_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Cleffa[] = INCBIN_U8("graphics/pokemon/icons/cleffa_icon.4bpp"); -const u8 gMonFootprint_Cleffa[] = INCBIN_U8("graphics/pokemon/footprints/cleffa_footprint.1bpp"); - -const u32 gMonStillFrontPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/front_pics/igglybuff_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/palettes/igglybuff_palette.gbapal.lz"); -const u32 gMonBackPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/back_pics/igglybuff_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/palettes/igglybuff_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Igglybuff[] = INCBIN_U8("graphics/pokemon/icons/igglybuff_icon.4bpp"); -const u8 gMonFootprint_Igglybuff[] = INCBIN_U8("graphics/pokemon/footprints/igglybuff_footprint.1bpp"); - -const u32 gMonStillFrontPic_Togepi[] = INCBIN_U32("graphics/pokemon/front_pics/togepi_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Togepi[] = INCBIN_U32("graphics/pokemon/palettes/togepi_palette.gbapal.lz"); -const u32 gMonBackPic_Togepi[] = INCBIN_U32("graphics/pokemon/back_pics/togepi_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Togepi[] = INCBIN_U32("graphics/pokemon/palettes/togepi_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Togepi[] = INCBIN_U8("graphics/pokemon/icons/togepi_icon.4bpp"); -const u8 gMonFootprint_Togepi[] = INCBIN_U8("graphics/pokemon/footprints/togepi_footprint.1bpp"); - -const u32 gMonStillFrontPic_Togetic[] = INCBIN_U32("graphics/pokemon/front_pics/togetic_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Togetic[] = INCBIN_U32("graphics/pokemon/palettes/togetic_palette.gbapal.lz"); -const u32 gMonBackPic_Togetic[] = INCBIN_U32("graphics/pokemon/back_pics/togetic_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Togetic[] = INCBIN_U32("graphics/pokemon/palettes/togetic_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Togetic[] = INCBIN_U8("graphics/pokemon/icons/togetic_icon.4bpp"); -const u8 gMonFootprint_Togetic[] = INCBIN_U8("graphics/pokemon/footprints/togetic_footprint.1bpp"); - -const u32 gMonStillFrontPic_Natu[] = INCBIN_U32("graphics/pokemon/front_pics/natu_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Natu[] = INCBIN_U32("graphics/pokemon/palettes/natu_palette.gbapal.lz"); -const u32 gMonBackPic_Natu[] = INCBIN_U32("graphics/pokemon/back_pics/natu_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Natu[] = INCBIN_U32("graphics/pokemon/palettes/natu_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Natu[] = INCBIN_U8("graphics/pokemon/icons/natu_icon.4bpp"); -const u8 gMonFootprint_Natu[] = INCBIN_U8("graphics/pokemon/footprints/natu_footprint.1bpp"); - -const u32 gMonStillFrontPic_Xatu[] = INCBIN_U32("graphics/pokemon/front_pics/xatu_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Xatu[] = INCBIN_U32("graphics/pokemon/palettes/xatu_palette.gbapal.lz"); -const u32 gMonBackPic_Xatu[] = INCBIN_U32("graphics/pokemon/back_pics/xatu_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Xatu[] = INCBIN_U32("graphics/pokemon/palettes/xatu_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Xatu[] = INCBIN_U8("graphics/pokemon/icons/xatu_icon.4bpp"); -const u8 gMonFootprint_Xatu[] = INCBIN_U8("graphics/pokemon/footprints/xatu_footprint.1bpp"); - -const u32 gMonStillFrontPic_Mareep[] = INCBIN_U32("graphics/pokemon/front_pics/mareep_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Mareep[] = INCBIN_U32("graphics/pokemon/palettes/mareep_palette.gbapal.lz"); -const u32 gMonBackPic_Mareep[] = INCBIN_U32("graphics/pokemon/back_pics/mareep_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Mareep[] = INCBIN_U32("graphics/pokemon/palettes/mareep_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Mareep[] = INCBIN_U8("graphics/pokemon/icons/mareep_icon.4bpp"); -const u8 gMonFootprint_Mareep[] = INCBIN_U8("graphics/pokemon/footprints/mareep_footprint.1bpp"); - -const u32 gMonStillFrontPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/front_pics/flaaffy_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/palettes/flaaffy_palette.gbapal.lz"); -const u32 gMonBackPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/back_pics/flaaffy_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/palettes/flaaffy_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Flaaffy[] = INCBIN_U8("graphics/pokemon/icons/flaaffy_icon.4bpp"); -const u8 gMonFootprint_Flaaffy[] = INCBIN_U8("graphics/pokemon/footprints/flaaffy_footprint.1bpp"); - -const u32 gMonStillFrontPic_Ampharos[] = INCBIN_U32("graphics/pokemon/front_pics/ampharos_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/palettes/ampharos_palette.gbapal.lz"); -const u32 gMonBackPic_Ampharos[] = INCBIN_U32("graphics/pokemon/back_pics/ampharos_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/palettes/ampharos_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Ampharos[] = INCBIN_U8("graphics/pokemon/icons/ampharos_icon.4bpp"); -const u8 gMonFootprint_Ampharos[] = INCBIN_U8("graphics/pokemon/footprints/ampharos_footprint.1bpp"); - -const u32 gMonStillFrontPic_Bellossom[] = INCBIN_U32("graphics/pokemon/front_pics/bellossom_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/palettes/bellossom_palette.gbapal.lz"); -const u32 gMonBackPic_Bellossom[] = INCBIN_U32("graphics/pokemon/back_pics/bellossom_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/palettes/bellossom_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Bellossom[] = INCBIN_U8("graphics/pokemon/icons/bellossom_icon.4bpp"); -const u8 gMonFootprint_Bellossom[] = INCBIN_U8("graphics/pokemon/footprints/bellossom_footprint.1bpp"); - -const u32 gMonStillFrontPic_Marill[] = INCBIN_U32("graphics/pokemon/front_pics/marill_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Marill[] = INCBIN_U32("graphics/pokemon/palettes/marill_palette.gbapal.lz"); -const u32 gMonBackPic_Marill[] = INCBIN_U32("graphics/pokemon/back_pics/marill_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Marill[] = INCBIN_U32("graphics/pokemon/palettes/marill_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Marill[] = INCBIN_U8("graphics/pokemon/icons/marill_icon.4bpp"); -const u8 gMonFootprint_Marill[] = INCBIN_U8("graphics/pokemon/footprints/marill_footprint.1bpp"); - -const u32 gMonStillFrontPic_Azumarill[] = INCBIN_U32("graphics/pokemon/front_pics/azumarill_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/palettes/azumarill_palette.gbapal.lz"); -const u32 gMonBackPic_Azumarill[] = INCBIN_U32("graphics/pokemon/back_pics/azumarill_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/palettes/azumarill_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Azumarill[] = INCBIN_U8("graphics/pokemon/icons/azumarill_icon.4bpp"); -const u8 gMonFootprint_Azumarill[] = INCBIN_U8("graphics/pokemon/footprints/azumarill_footprint.1bpp"); - -const u32 gMonStillFrontPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/front_pics/sudowoodo_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/palettes/sudowoodo_palette.gbapal.lz"); -const u32 gMonBackPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/back_pics/sudowoodo_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/palettes/sudowoodo_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Sudowoodo[] = INCBIN_U8("graphics/pokemon/icons/sudowoodo_icon.4bpp"); -const u8 gMonFootprint_Sudowoodo[] = INCBIN_U8("graphics/pokemon/footprints/sudowoodo_footprint.1bpp"); - -const u32 gMonStillFrontPic_Politoed[] = INCBIN_U32("graphics/pokemon/front_pics/politoed_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Politoed[] = INCBIN_U32("graphics/pokemon/palettes/politoed_palette.gbapal.lz"); -const u32 gMonBackPic_Politoed[] = INCBIN_U32("graphics/pokemon/back_pics/politoed_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Politoed[] = INCBIN_U32("graphics/pokemon/palettes/politoed_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Politoed[] = INCBIN_U8("graphics/pokemon/icons/politoed_icon.4bpp"); -const u8 gMonFootprint_Politoed[] = INCBIN_U8("graphics/pokemon/footprints/politoed_footprint.1bpp"); - -const u32 gMonStillFrontPic_Hoppip[] = INCBIN_U32("graphics/pokemon/front_pics/hoppip_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/palettes/hoppip_palette.gbapal.lz"); -const u32 gMonBackPic_Hoppip[] = INCBIN_U32("graphics/pokemon/back_pics/hoppip_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/palettes/hoppip_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Hoppip[] = INCBIN_U8("graphics/pokemon/icons/hoppip_icon.4bpp"); -const u8 gMonFootprint_Hoppip[] = INCBIN_U8("graphics/pokemon/footprints/hoppip_footprint.1bpp"); - -const u32 gMonStillFrontPic_Skiploom[] = INCBIN_U32("graphics/pokemon/front_pics/skiploom_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/palettes/skiploom_palette.gbapal.lz"); -const u32 gMonBackPic_Skiploom[] = INCBIN_U32("graphics/pokemon/back_pics/skiploom_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/palettes/skiploom_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Skiploom[] = INCBIN_U8("graphics/pokemon/icons/skiploom_icon.4bpp"); -const u8 gMonFootprint_Skiploom[] = INCBIN_U8("graphics/pokemon/footprints/skiploom_footprint.1bpp"); - -const u32 gMonStillFrontPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/front_pics/jumpluff_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/palettes/jumpluff_palette.gbapal.lz"); -const u32 gMonBackPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/back_pics/jumpluff_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/palettes/jumpluff_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Jumpluff[] = INCBIN_U8("graphics/pokemon/icons/jumpluff_icon.4bpp"); -const u8 gMonFootprint_Jumpluff[] = INCBIN_U8("graphics/pokemon/footprints/jumpluff_footprint.1bpp"); - -const u32 gMonStillFrontPic_Aipom[] = INCBIN_U32("graphics/pokemon/front_pics/aipom_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Aipom[] = INCBIN_U32("graphics/pokemon/palettes/aipom_palette.gbapal.lz"); -const u32 gMonBackPic_Aipom[] = INCBIN_U32("graphics/pokemon/back_pics/aipom_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Aipom[] = INCBIN_U32("graphics/pokemon/palettes/aipom_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Aipom[] = INCBIN_U8("graphics/pokemon/icons/aipom_icon.4bpp"); -const u8 gMonFootprint_Aipom[] = INCBIN_U8("graphics/pokemon/footprints/aipom_footprint.1bpp"); - -const u32 gMonStillFrontPic_Sunkern[] = INCBIN_U32("graphics/pokemon/front_pics/sunkern_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/palettes/sunkern_palette.gbapal.lz"); -const u32 gMonBackPic_Sunkern[] = INCBIN_U32("graphics/pokemon/back_pics/sunkern_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/palettes/sunkern_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Sunkern[] = INCBIN_U8("graphics/pokemon/icons/sunkern_icon.4bpp"); -const u8 gMonFootprint_Sunkern[] = INCBIN_U8("graphics/pokemon/footprints/sunkern_footprint.1bpp"); - -const u32 gMonStillFrontPic_Sunflora[] = INCBIN_U32("graphics/pokemon/front_pics/sunflora_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/palettes/sunflora_palette.gbapal.lz"); -const u32 gMonBackPic_Sunflora[] = INCBIN_U32("graphics/pokemon/back_pics/sunflora_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/palettes/sunflora_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Sunflora[] = INCBIN_U8("graphics/pokemon/icons/sunflora_icon.4bpp"); -const u8 gMonFootprint_Sunflora[] = INCBIN_U8("graphics/pokemon/footprints/sunflora_footprint.1bpp"); - -const u32 gMonStillFrontPic_Yanma[] = INCBIN_U32("graphics/pokemon/front_pics/yanma_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Yanma[] = INCBIN_U32("graphics/pokemon/palettes/yanma_palette.gbapal.lz"); -const u32 gMonBackPic_Yanma[] = INCBIN_U32("graphics/pokemon/back_pics/yanma_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Yanma[] = INCBIN_U32("graphics/pokemon/palettes/yanma_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Yanma[] = INCBIN_U8("graphics/pokemon/icons/yanma_icon.4bpp"); -const u8 gMonFootprint_Yanma[] = INCBIN_U8("graphics/pokemon/footprints/yanma_footprint.1bpp"); - -const u32 gMonStillFrontPic_Wooper[] = INCBIN_U32("graphics/pokemon/front_pics/wooper_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Wooper[] = INCBIN_U32("graphics/pokemon/palettes/wooper_palette.gbapal.lz"); -const u32 gMonBackPic_Wooper[] = INCBIN_U32("graphics/pokemon/back_pics/wooper_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Wooper[] = INCBIN_U32("graphics/pokemon/palettes/wooper_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Wooper[] = INCBIN_U8("graphics/pokemon/icons/wooper_icon.4bpp"); -const u8 gMonFootprint_Wooper[] = INCBIN_U8("graphics/pokemon/footprints/wooper_footprint.1bpp"); - -const u32 gMonStillFrontPic_Quagsire[] = INCBIN_U32("graphics/pokemon/front_pics/quagsire_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/palettes/quagsire_palette.gbapal.lz"); -const u32 gMonBackPic_Quagsire[] = INCBIN_U32("graphics/pokemon/back_pics/quagsire_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/palettes/quagsire_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Quagsire[] = INCBIN_U8("graphics/pokemon/icons/quagsire_icon.4bpp"); -const u8 gMonFootprint_Quagsire[] = INCBIN_U8("graphics/pokemon/footprints/quagsire_footprint.1bpp"); - -const u32 gMonStillFrontPic_Espeon[] = INCBIN_U32("graphics/pokemon/front_pics/espeon_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Espeon[] = INCBIN_U32("graphics/pokemon/palettes/espeon_palette.gbapal.lz"); -const u32 gMonBackPic_Espeon[] = INCBIN_U32("graphics/pokemon/back_pics/espeon_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Espeon[] = INCBIN_U32("graphics/pokemon/palettes/espeon_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Espeon[] = INCBIN_U8("graphics/pokemon/icons/espeon_icon.4bpp"); -const u8 gMonFootprint_Espeon[] = INCBIN_U8("graphics/pokemon/footprints/espeon_footprint.1bpp"); - -const u32 gMonStillFrontPic_Umbreon[] = INCBIN_U32("graphics/pokemon/front_pics/umbreon_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/palettes/umbreon_palette.gbapal.lz"); -const u32 gMonBackPic_Umbreon[] = INCBIN_U32("graphics/pokemon/back_pics/umbreon_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/palettes/umbreon_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Umbreon[] = INCBIN_U8("graphics/pokemon/icons/umbreon_icon.4bpp"); -const u8 gMonFootprint_Umbreon[] = INCBIN_U8("graphics/pokemon/footprints/umbreon_footprint.1bpp"); - -const u32 gMonStillFrontPic_Murkrow[] = INCBIN_U32("graphics/pokemon/front_pics/murkrow_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/palettes/murkrow_palette.gbapal.lz"); -const u32 gMonBackPic_Murkrow[] = INCBIN_U32("graphics/pokemon/back_pics/murkrow_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/palettes/murkrow_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Murkrow[] = INCBIN_U8("graphics/pokemon/icons/murkrow_icon.4bpp"); -const u8 gMonFootprint_Murkrow[] = INCBIN_U8("graphics/pokemon/footprints/murkrow_footprint.1bpp"); - -const u32 gMonStillFrontPic_Slowking[] = INCBIN_U32("graphics/pokemon/front_pics/slowking_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Slowking[] = INCBIN_U32("graphics/pokemon/palettes/slowking_palette.gbapal.lz"); -const u32 gMonBackPic_Slowking[] = INCBIN_U32("graphics/pokemon/back_pics/slowking_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Slowking[] = INCBIN_U32("graphics/pokemon/palettes/slowking_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Slowking[] = INCBIN_U8("graphics/pokemon/icons/slowking_icon.4bpp"); -const u8 gMonFootprint_Slowking[] = INCBIN_U8("graphics/pokemon/footprints/slowking_footprint.1bpp"); - -const u32 gMonStillFrontPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/front_pics/misdreavus_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/palettes/misdreavus_palette.gbapal.lz"); -const u32 gMonBackPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/back_pics/misdreavus_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/palettes/misdreavus_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Misdreavus[] = INCBIN_U8("graphics/pokemon/icons/misdreavus_icon.4bpp"); -const u8 gMonFootprint_Misdreavus[] = INCBIN_U8("graphics/pokemon/footprints/misdreavus_footprint.1bpp"); - -const u32 gMonStillFrontPic_UnownA[] = INCBIN_U32("graphics/pokemon/front_pics/unown_a_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Unown[] = INCBIN_U32("graphics/pokemon/palettes/unown_palette.gbapal.lz"); -const u32 gMonBackPic_UnownA[] = INCBIN_U32("graphics/pokemon/back_pics/unown_a_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Unown[] = INCBIN_U32("graphics/pokemon/palettes/unown_shiny_palette.gbapal.lz"); -const u8 gMonIcon_UnownA[] = INCBIN_U8("graphics/pokemon/icons/unown_a_icon.4bpp"); -const u8 gMonFootprint_Unown[] = INCBIN_U8("graphics/pokemon/footprints/unown_footprint.1bpp"); - -const u32 gMonStillFrontPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/front_pics/wobbuffet_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/palettes/wobbuffet_palette.gbapal.lz"); -const u32 gMonBackPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/back_pics/wobbuffet_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/palettes/wobbuffet_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Wobbuffet[] = INCBIN_U8("graphics/pokemon/icons/wobbuffet_icon.4bpp"); -const u8 gMonFootprint_Wobbuffet[] = INCBIN_U8("graphics/pokemon/footprints/wobbuffet_footprint.1bpp"); - -const u32 gMonStillFrontPic_Girafarig[] = INCBIN_U32("graphics/pokemon/front_pics/girafarig_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/palettes/girafarig_palette.gbapal.lz"); -const u32 gMonBackPic_Girafarig[] = INCBIN_U32("graphics/pokemon/back_pics/girafarig_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/palettes/girafarig_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Girafarig[] = INCBIN_U8("graphics/pokemon/icons/girafarig_icon.4bpp"); -const u8 gMonFootprint_Girafarig[] = INCBIN_U8("graphics/pokemon/footprints/girafarig_footprint.1bpp"); - -const u32 gMonStillFrontPic_Pineco[] = INCBIN_U32("graphics/pokemon/front_pics/pineco_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Pineco[] = INCBIN_U32("graphics/pokemon/palettes/pineco_palette.gbapal.lz"); -const u32 gMonBackPic_Pineco[] = INCBIN_U32("graphics/pokemon/back_pics/pineco_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Pineco[] = INCBIN_U32("graphics/pokemon/palettes/pineco_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Pineco[] = INCBIN_U8("graphics/pokemon/icons/pineco_icon.4bpp"); -const u8 gMonFootprint_Pineco[] = INCBIN_U8("graphics/pokemon/footprints/pineco_footprint.1bpp"); - -const u32 gMonStillFrontPic_Forretress[] = INCBIN_U32("graphics/pokemon/front_pics/forretress_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Forretress[] = INCBIN_U32("graphics/pokemon/palettes/forretress_palette.gbapal.lz"); -const u32 gMonBackPic_Forretress[] = INCBIN_U32("graphics/pokemon/back_pics/forretress_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Forretress[] = INCBIN_U32("graphics/pokemon/palettes/forretress_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Forretress[] = INCBIN_U8("graphics/pokemon/icons/forretress_icon.4bpp"); -const u8 gMonFootprint_Forretress[] = INCBIN_U8("graphics/pokemon/footprints/forretress_footprint.1bpp"); - -const u32 gMonStillFrontPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/front_pics/dunsparce_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/palettes/dunsparce_palette.gbapal.lz"); -const u32 gMonBackPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/back_pics/dunsparce_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/palettes/dunsparce_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Dunsparce[] = INCBIN_U8("graphics/pokemon/icons/dunsparce_icon.4bpp"); -const u8 gMonFootprint_Dunsparce[] = INCBIN_U8("graphics/pokemon/footprints/dunsparce_footprint.1bpp"); - -const u32 gMonStillFrontPic_Gligar[] = INCBIN_U32("graphics/pokemon/front_pics/gligar_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Gligar[] = INCBIN_U32("graphics/pokemon/palettes/gligar_palette.gbapal.lz"); -const u32 gMonBackPic_Gligar[] = INCBIN_U32("graphics/pokemon/back_pics/gligar_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Gligar[] = INCBIN_U32("graphics/pokemon/palettes/gligar_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Gligar[] = INCBIN_U8("graphics/pokemon/icons/gligar_icon.4bpp"); -const u8 gMonFootprint_Gligar[] = INCBIN_U8("graphics/pokemon/footprints/gligar_footprint.1bpp"); - -const u32 gMonStillFrontPic_Steelix[] = INCBIN_U32("graphics/pokemon/front_pics/steelix_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Steelix[] = INCBIN_U32("graphics/pokemon/palettes/steelix_palette.gbapal.lz"); -const u32 gMonBackPic_Steelix[] = INCBIN_U32("graphics/pokemon/back_pics/steelix_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Steelix[] = INCBIN_U32("graphics/pokemon/palettes/steelix_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Steelix[] = INCBIN_U8("graphics/pokemon/icons/steelix_icon.4bpp"); -const u8 gMonFootprint_Steelix[] = INCBIN_U8("graphics/pokemon/footprints/steelix_footprint.1bpp"); - -const u32 gMonStillFrontPic_Snubbull[] = INCBIN_U32("graphics/pokemon/front_pics/snubbull_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/palettes/snubbull_palette.gbapal.lz"); -const u32 gMonBackPic_Snubbull[] = INCBIN_U32("graphics/pokemon/back_pics/snubbull_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/palettes/snubbull_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Snubbull[] = INCBIN_U8("graphics/pokemon/icons/snubbull_icon.4bpp"); -const u8 gMonFootprint_Snubbull[] = INCBIN_U8("graphics/pokemon/footprints/snubbull_footprint.1bpp"); - -const u32 gMonStillFrontPic_Granbull[] = INCBIN_U32("graphics/pokemon/front_pics/granbull_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Granbull[] = INCBIN_U32("graphics/pokemon/palettes/granbull_palette.gbapal.lz"); -const u32 gMonBackPic_Granbull[] = INCBIN_U32("graphics/pokemon/back_pics/granbull_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Granbull[] = INCBIN_U32("graphics/pokemon/palettes/granbull_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Granbull[] = INCBIN_U8("graphics/pokemon/icons/granbull_icon.4bpp"); -const u8 gMonFootprint_Granbull[] = INCBIN_U8("graphics/pokemon/footprints/granbull_footprint.1bpp"); - -const u32 gMonStillFrontPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/front_pics/qwilfish_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/palettes/qwilfish_palette.gbapal.lz"); -const u32 gMonBackPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/back_pics/qwilfish_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/palettes/qwilfish_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Qwilfish[] = INCBIN_U8("graphics/pokemon/icons/qwilfish_icon.4bpp"); -const u8 gMonFootprint_Qwilfish[] = INCBIN_U8("graphics/pokemon/footprints/qwilfish_footprint.1bpp"); - -const u32 gMonStillFrontPic_Scizor[] = INCBIN_U32("graphics/pokemon/front_pics/scizor_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Scizor[] = INCBIN_U32("graphics/pokemon/palettes/scizor_palette.gbapal.lz"); -const u32 gMonBackPic_Scizor[] = INCBIN_U32("graphics/pokemon/back_pics/scizor_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Scizor[] = INCBIN_U32("graphics/pokemon/palettes/scizor_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Scizor[] = INCBIN_U8("graphics/pokemon/icons/scizor_icon.4bpp"); -const u8 gMonFootprint_Scizor[] = INCBIN_U8("graphics/pokemon/footprints/scizor_footprint.1bpp"); - -const u32 gMonStillFrontPic_Shuckle[] = INCBIN_U32("graphics/pokemon/front_pics/shuckle_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/palettes/shuckle_palette.gbapal.lz"); -const u32 gMonBackPic_Shuckle[] = INCBIN_U32("graphics/pokemon/back_pics/shuckle_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/palettes/shuckle_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Shuckle[] = INCBIN_U8("graphics/pokemon/icons/shuckle_icon.4bpp"); -const u8 gMonFootprint_Shuckle[] = INCBIN_U8("graphics/pokemon/footprints/shuckle_footprint.1bpp"); - -const u32 gMonStillFrontPic_Heracross[] = INCBIN_U32("graphics/pokemon/front_pics/heracross_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Heracross[] = INCBIN_U32("graphics/pokemon/palettes/heracross_palette.gbapal.lz"); -const u32 gMonBackPic_Heracross[] = INCBIN_U32("graphics/pokemon/back_pics/heracross_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Heracross[] = INCBIN_U32("graphics/pokemon/palettes/heracross_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Heracross[] = INCBIN_U8("graphics/pokemon/icons/heracross_icon.4bpp"); -const u8 gMonFootprint_Heracross[] = INCBIN_U8("graphics/pokemon/footprints/heracross_footprint.1bpp"); - -const u32 gMonStillFrontPic_Sneasel[] = INCBIN_U32("graphics/pokemon/front_pics/sneasel_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/palettes/sneasel_palette.gbapal.lz"); -const u32 gMonBackPic_Sneasel[] = INCBIN_U32("graphics/pokemon/back_pics/sneasel_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/palettes/sneasel_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Sneasel[] = INCBIN_U8("graphics/pokemon/icons/sneasel_icon.4bpp"); -const u8 gMonFootprint_Sneasel[] = INCBIN_U8("graphics/pokemon/footprints/sneasel_footprint.1bpp"); - -const u32 gMonStillFrontPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/front_pics/teddiursa_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/palettes/teddiursa_palette.gbapal.lz"); -const u32 gMonBackPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/back_pics/teddiursa_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/palettes/teddiursa_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Teddiursa[] = INCBIN_U8("graphics/pokemon/icons/teddiursa_icon.4bpp"); -const u8 gMonFootprint_Teddiursa[] = INCBIN_U8("graphics/pokemon/footprints/teddiursa_footprint.1bpp"); -const u32 gMonStillFrontPic_Ursaring[] = INCBIN_U32("graphics/pokemon/front_pics/ursaring_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/palettes/ursaring_palette.gbapal.lz"); -const u32 gMonBackPic_Ursaring[] = INCBIN_U32("graphics/pokemon/back_pics/ursaring_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/palettes/ursaring_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Ursaring[] = INCBIN_U8("graphics/pokemon/icons/ursaring_icon.4bpp"); -const u8 gMonFootprint_Ursaring[] = INCBIN_U8("graphics/pokemon/footprints/ursaring_footprint.1bpp"); - -const u32 gMonStillFrontPic_Slugma[] = INCBIN_U32("graphics/pokemon/front_pics/slugma_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Slugma[] = INCBIN_U32("graphics/pokemon/palettes/slugma_palette.gbapal.lz"); -const u32 gMonBackPic_Slugma[] = INCBIN_U32("graphics/pokemon/back_pics/slugma_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Slugma[] = INCBIN_U32("graphics/pokemon/palettes/slugma_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Slugma[] = INCBIN_U8("graphics/pokemon/icons/slugma_icon.4bpp"); -const u8 gMonFootprint_Slugma[] = INCBIN_U8("graphics/pokemon/footprints/slugma_footprint.1bpp"); - -const u32 gMonStillFrontPic_Magcargo[] = INCBIN_U32("graphics/pokemon/front_pics/magcargo_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/palettes/magcargo_palette.gbapal.lz"); -const u32 gMonBackPic_Magcargo[] = INCBIN_U32("graphics/pokemon/back_pics/magcargo_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/palettes/magcargo_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Magcargo[] = INCBIN_U8("graphics/pokemon/icons/magcargo_icon.4bpp"); -const u8 gMonFootprint_Magcargo[] = INCBIN_U8("graphics/pokemon/footprints/magcargo_footprint.1bpp"); - -const u32 gMonStillFrontPic_Swinub[] = INCBIN_U32("graphics/pokemon/front_pics/swinub_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Swinub[] = INCBIN_U32("graphics/pokemon/palettes/swinub_palette.gbapal.lz"); -const u32 gMonBackPic_Swinub[] = INCBIN_U32("graphics/pokemon/back_pics/swinub_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Swinub[] = INCBIN_U32("graphics/pokemon/palettes/swinub_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Swinub[] = INCBIN_U8("graphics/pokemon/icons/swinub_icon.4bpp"); -const u8 gMonFootprint_Swinub[] = INCBIN_U8("graphics/pokemon/footprints/swinub_footprint.1bpp"); - -const u32 gMonStillFrontPic_Piloswine[] = INCBIN_U32("graphics/pokemon/front_pics/piloswine_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/palettes/piloswine_palette.gbapal.lz"); -const u32 gMonBackPic_Piloswine[] = INCBIN_U32("graphics/pokemon/back_pics/piloswine_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/palettes/piloswine_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Piloswine[] = INCBIN_U8("graphics/pokemon/icons/piloswine_icon.4bpp"); -const u8 gMonFootprint_Piloswine[] = INCBIN_U8("graphics/pokemon/footprints/piloswine_footprint.1bpp"); - -const u32 gMonStillFrontPic_Corsola[] = INCBIN_U32("graphics/pokemon/front_pics/corsola_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Corsola[] = INCBIN_U32("graphics/pokemon/palettes/corsola_palette.gbapal.lz"); -const u32 gMonBackPic_Corsola[] = INCBIN_U32("graphics/pokemon/back_pics/corsola_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Corsola[] = INCBIN_U32("graphics/pokemon/palettes/corsola_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Corsola[] = INCBIN_U8("graphics/pokemon/icons/corsola_icon.4bpp"); -const u8 gMonFootprint_Corsola[] = INCBIN_U8("graphics/pokemon/footprints/corsola_footprint.1bpp"); - -const u32 gMonStillFrontPic_Remoraid[] = INCBIN_U32("graphics/pokemon/front_pics/remoraid_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/palettes/remoraid_palette.gbapal.lz"); -const u32 gMonBackPic_Remoraid[] = INCBIN_U32("graphics/pokemon/back_pics/remoraid_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/palettes/remoraid_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Remoraid[] = INCBIN_U8("graphics/pokemon/icons/remoraid_icon.4bpp"); -const u8 gMonFootprint_Remoraid[] = INCBIN_U8("graphics/pokemon/footprints/remoraid_footprint.1bpp"); - -const u32 gMonStillFrontPic_Octillery[] = INCBIN_U32("graphics/pokemon/front_pics/octillery_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Octillery[] = INCBIN_U32("graphics/pokemon/palettes/octillery_palette.gbapal.lz"); -const u32 gMonBackPic_Octillery[] = INCBIN_U32("graphics/pokemon/back_pics/octillery_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Octillery[] = INCBIN_U32("graphics/pokemon/palettes/octillery_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Octillery[] = INCBIN_U8("graphics/pokemon/icons/octillery_icon.4bpp"); -const u8 gMonFootprint_Octillery[] = INCBIN_U8("graphics/pokemon/footprints/octillery_footprint.1bpp"); - -const u32 gMonStillFrontPic_Delibird[] = INCBIN_U32("graphics/pokemon/front_pics/delibird_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Delibird[] = INCBIN_U32("graphics/pokemon/palettes/delibird_palette.gbapal.lz"); -const u32 gMonBackPic_Delibird[] = INCBIN_U32("graphics/pokemon/back_pics/delibird_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Delibird[] = INCBIN_U32("graphics/pokemon/palettes/delibird_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Delibird[] = INCBIN_U8("graphics/pokemon/icons/delibird_icon.4bpp"); -const u8 gMonFootprint_Delibird[] = INCBIN_U8("graphics/pokemon/footprints/delibird_footprint.1bpp"); - -const u32 gMonStillFrontPic_Mantine[] = INCBIN_U32("graphics/pokemon/front_pics/mantine_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Mantine[] = INCBIN_U32("graphics/pokemon/palettes/mantine_palette.gbapal.lz"); -const u32 gMonBackPic_Mantine[] = INCBIN_U32("graphics/pokemon/back_pics/mantine_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Mantine[] = INCBIN_U32("graphics/pokemon/palettes/mantine_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Mantine[] = INCBIN_U8("graphics/pokemon/icons/mantine_icon.4bpp"); -const u8 gMonFootprint_Mantine[] = INCBIN_U8("graphics/pokemon/footprints/mantine_footprint.1bpp"); - -const u32 gMonStillFrontPic_Skarmory[] = INCBIN_U32("graphics/pokemon/front_pics/skarmory_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/palettes/skarmory_palette.gbapal.lz"); -const u32 gMonBackPic_Skarmory[] = INCBIN_U32("graphics/pokemon/back_pics/skarmory_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/palettes/skarmory_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Skarmory[] = INCBIN_U8("graphics/pokemon/icons/skarmory_icon.4bpp"); -const u8 gMonFootprint_Skarmory[] = INCBIN_U8("graphics/pokemon/footprints/skarmory_footprint.1bpp"); - -const u32 gMonStillFrontPic_Houndour[] = INCBIN_U32("graphics/pokemon/front_pics/houndour_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Houndour[] = INCBIN_U32("graphics/pokemon/palettes/houndour_palette.gbapal.lz"); -const u32 gMonBackPic_Houndour[] = INCBIN_U32("graphics/pokemon/back_pics/houndour_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Houndour[] = INCBIN_U32("graphics/pokemon/palettes/houndour_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Houndour[] = INCBIN_U8("graphics/pokemon/icons/houndour_icon.4bpp"); -const u8 gMonFootprint_Houndour[] = INCBIN_U8("graphics/pokemon/footprints/houndour_footprint.1bpp"); - -const u32 gMonStillFrontPic_Houndoom[] = INCBIN_U32("graphics/pokemon/front_pics/houndoom_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/palettes/houndoom_palette.gbapal.lz"); -const u32 gMonBackPic_Houndoom[] = INCBIN_U32("graphics/pokemon/back_pics/houndoom_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/palettes/houndoom_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Houndoom[] = INCBIN_U8("graphics/pokemon/icons/houndoom_icon.4bpp"); -const u8 gMonFootprint_Houndoom[] = INCBIN_U8("graphics/pokemon/footprints/houndoom_footprint.1bpp"); - -const u32 gMonStillFrontPic_Kingdra[] = INCBIN_U32("graphics/pokemon/front_pics/kingdra_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/palettes/kingdra_palette.gbapal.lz"); -const u32 gMonBackPic_Kingdra[] = INCBIN_U32("graphics/pokemon/back_pics/kingdra_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/palettes/kingdra_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Kingdra[] = INCBIN_U8("graphics/pokemon/icons/kingdra_icon.4bpp"); -const u8 gMonFootprint_Kingdra[] = INCBIN_U8("graphics/pokemon/footprints/kingdra_footprint.1bpp"); - -const u32 gMonStillFrontPic_Phanpy[] = INCBIN_U32("graphics/pokemon/front_pics/phanpy_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/palettes/phanpy_palette.gbapal.lz"); -const u32 gMonBackPic_Phanpy[] = INCBIN_U32("graphics/pokemon/back_pics/phanpy_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/palettes/phanpy_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Phanpy[] = INCBIN_U8("graphics/pokemon/icons/phanpy_icon.4bpp"); -const u8 gMonFootprint_Phanpy[] = INCBIN_U8("graphics/pokemon/footprints/phanpy_footprint.1bpp"); - -const u32 gMonStillFrontPic_Donphan[] = INCBIN_U32("graphics/pokemon/front_pics/donphan_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Donphan[] = INCBIN_U32("graphics/pokemon/palettes/donphan_palette.gbapal.lz"); -const u32 gMonBackPic_Donphan[] = INCBIN_U32("graphics/pokemon/back_pics/donphan_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Donphan[] = INCBIN_U32("graphics/pokemon/palettes/donphan_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Donphan[] = INCBIN_U8("graphics/pokemon/icons/donphan_icon.4bpp"); -const u8 gMonFootprint_Donphan[] = INCBIN_U8("graphics/pokemon/footprints/donphan_footprint.1bpp"); +const u32 gMonStillFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/front.4bpp.lz"); +const u32 gMonPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/normal.gbapal.lz"); +const u32 gMonBackPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/back.4bpp.lz"); +const u32 gMonShinyPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/shiny.gbapal.lz"); +const u8 gMonIcon_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/icon.4bpp"); +const u8 gMonFootprint_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/footprint.1bpp"); + +const u32 gMonStillFrontPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/front.4bpp.lz"); +const u32 gMonPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/normal.gbapal.lz"); +const u32 gMonBackPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/back.4bpp.lz"); +const u32 gMonShinyPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/shiny.gbapal.lz"); +const u8 gMonIcon_Ivysaur[] = INCBIN_U8("graphics/pokemon/ivysaur/icon.4bpp"); +const u8 gMonFootprint_Ivysaur[] = INCBIN_U8("graphics/pokemon/ivysaur/footprint.1bpp"); + +const u32 gMonStillFrontPic_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/front.4bpp.lz"); +const u32 gMonPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/normal.gbapal.lz"); +const u32 gMonBackPic_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/back.4bpp.lz"); +const u32 gMonShinyPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/shiny.gbapal.lz"); +const u8 gMonIcon_Venusaur[] = INCBIN_U8("graphics/pokemon/venusaur/icon.4bpp"); +const u8 gMonFootprint_Venusaur[] = INCBIN_U8("graphics/pokemon/venusaur/footprint.1bpp"); + +const u32 gMonStillFrontPic_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/front.4bpp.lz"); +const u32 gMonPalette_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/normal.gbapal.lz"); +const u32 gMonBackPic_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/back.4bpp.lz"); +const u32 gMonShinyPalette_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/shiny.gbapal.lz"); +const u8 gMonIcon_Charmander[] = INCBIN_U8("graphics/pokemon/charmander/icon.4bpp"); +const u8 gMonFootprint_Charmander[] = INCBIN_U8("graphics/pokemon/charmander/footprint.1bpp"); + +const u32 gMonStillFrontPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/front.4bpp.lz"); +const u32 gMonPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/normal.gbapal.lz"); +const u32 gMonBackPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/back.4bpp.lz"); +const u32 gMonShinyPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/shiny.gbapal.lz"); +const u8 gMonIcon_Charmeleon[] = INCBIN_U8("graphics/pokemon/charmeleon/icon.4bpp"); +const u8 gMonFootprint_Charmeleon[] = INCBIN_U8("graphics/pokemon/charmeleon/footprint.1bpp"); + +const u32 gMonStillFrontPic_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/front.4bpp.lz"); +const u32 gMonPalette_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/normal.gbapal.lz"); +const u32 gMonBackPic_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/back.4bpp.lz"); +const u32 gMonShinyPalette_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/shiny.gbapal.lz"); +const u8 gMonIcon_Charizard[] = INCBIN_U8("graphics/pokemon/charizard/icon.4bpp"); +const u8 gMonFootprint_Charizard[] = INCBIN_U8("graphics/pokemon/charizard/footprint.1bpp"); + +const u32 gMonStillFrontPic_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/front.4bpp.lz"); +const u32 gMonPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/normal.gbapal.lz"); +const u32 gMonBackPic_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/back.4bpp.lz"); +const u32 gMonShinyPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/shiny.gbapal.lz"); +const u8 gMonIcon_Squirtle[] = INCBIN_U8("graphics/pokemon/squirtle/icon.4bpp"); +const u8 gMonFootprint_Squirtle[] = INCBIN_U8("graphics/pokemon/squirtle/footprint.1bpp"); + +const u32 gMonStillFrontPic_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/front.4bpp.lz"); +const u32 gMonPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/normal.gbapal.lz"); +const u32 gMonBackPic_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/back.4bpp.lz"); +const u32 gMonShinyPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/shiny.gbapal.lz"); +const u8 gMonIcon_Wartortle[] = INCBIN_U8("graphics/pokemon/wartortle/icon.4bpp"); +const u8 gMonFootprint_Wartortle[] = INCBIN_U8("graphics/pokemon/wartortle/footprint.1bpp"); + +const u32 gMonStillFrontPic_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/front.4bpp.lz"); +const u32 gMonPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/normal.gbapal.lz"); +const u32 gMonBackPic_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/back.4bpp.lz"); +const u32 gMonShinyPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/shiny.gbapal.lz"); +const u8 gMonIcon_Blastoise[] = INCBIN_U8("graphics/pokemon/blastoise/icon.4bpp"); +const u8 gMonFootprint_Blastoise[] = INCBIN_U8("graphics/pokemon/blastoise/footprint.1bpp"); + +const u32 gMonStillFrontPic_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/front.4bpp.lz"); +const u32 gMonPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/normal.gbapal.lz"); +const u32 gMonBackPic_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/back.4bpp.lz"); +const u32 gMonShinyPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/shiny.gbapal.lz"); +const u8 gMonIcon_Caterpie[] = INCBIN_U8("graphics/pokemon/caterpie/icon.4bpp"); +const u8 gMonFootprint_Caterpie[] = INCBIN_U8("graphics/pokemon/caterpie/footprint.1bpp"); + +const u32 gMonStillFrontPic_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/front.4bpp.lz"); +const u32 gMonPalette_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/normal.gbapal.lz"); +const u32 gMonBackPic_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/back.4bpp.lz"); +const u32 gMonShinyPalette_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/shiny.gbapal.lz"); +const u8 gMonIcon_Metapod[] = INCBIN_U8( "graphics/pokemon/metapod/icon.4bpp"); +const u8 gMonFootprint_Metapod[] = INCBIN_U8("graphics/pokemon/metapod/footprint.1bpp"); + +const u32 gMonStillFrontPic_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/front.4bpp.lz"); +const u32 gMonPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/normal.gbapal.lz"); +const u32 gMonBackPic_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/back.4bpp.lz"); +const u32 gMonShinyPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/shiny.gbapal.lz"); +const u8 gMonIcon_Butterfree[] = INCBIN_U8("graphics/pokemon/butterfree/icon.4bpp"); +const u8 gMonFootprint_Butterfree[] = INCBIN_U8("graphics/pokemon/butterfree/footprint.1bpp"); + +const u32 gMonStillFrontPic_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/front.4bpp.lz"); +const u32 gMonPalette_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/normal.gbapal.lz"); +const u32 gMonBackPic_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/back.4bpp.lz"); +const u32 gMonShinyPalette_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/shiny.gbapal.lz"); +const u8 gMonIcon_Weedle[] = INCBIN_U8("graphics/pokemon/weedle/icon.4bpp"); +const u8 gMonFootprint_Weedle[] = INCBIN_U8("graphics/pokemon/weedle/footprint.1bpp"); + +const u32 gMonStillFrontPic_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/front.4bpp.lz"); +const u32 gMonPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/normal.gbapal.lz"); +const u32 gMonBackPic_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/back.4bpp.lz"); +const u32 gMonShinyPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/shiny.gbapal.lz"); +const u8 gMonIcon_Kakuna[] = INCBIN_U8("graphics/pokemon/kakuna/icon.4bpp"); +const u8 gMonFootprint_Kakuna[] = INCBIN_U8("graphics/pokemon/kakuna/footprint.1bpp"); + +const u32 gMonStillFrontPic_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/front.4bpp.lz"); +const u32 gMonPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/normal.gbapal.lz"); +const u32 gMonBackPic_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/back.4bpp.lz"); +const u32 gMonShinyPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/shiny.gbapal.lz"); +const u8 gMonIcon_Beedrill[] = INCBIN_U8("graphics/pokemon/beedrill/icon.4bpp"); +const u8 gMonFootprint_Beedrill[] = INCBIN_U8("graphics/pokemon/beedrill/footprint.1bpp"); + +const u32 gMonStillFrontPic_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/front.4bpp.lz"); +const u32 gMonPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/normal.gbapal.lz"); +const u32 gMonBackPic_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/back.4bpp.lz"); +const u32 gMonShinyPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/shiny.gbapal.lz"); +const u8 gMonIcon_Pidgey[] = INCBIN_U8("graphics/pokemon/pidgey/icon.4bpp"); +const u8 gMonFootprint_Pidgey[] = INCBIN_U8("graphics/pokemon/pidgey/footprint.1bpp"); + +const u32 gMonStillFrontPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/front.4bpp.lz"); +const u32 gMonPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/normal.gbapal.lz"); +const u32 gMonBackPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/back.4bpp.lz"); +const u32 gMonShinyPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/shiny.gbapal.lz"); +const u8 gMonIcon_Pidgeotto[] = INCBIN_U8("graphics/pokemon/pidgeotto/icon.4bpp"); +const u8 gMonFootprint_Pidgeotto[] = INCBIN_U8("graphics/pokemon/pidgeotto/footprint.1bpp"); + +const u32 gMonStillFrontPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/front.4bpp.lz"); +const u32 gMonPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/normal.gbapal.lz"); +const u32 gMonBackPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/back.4bpp.lz"); +const u32 gMonShinyPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/shiny.gbapal.lz"); +const u8 gMonIcon_Pidgeot[] = INCBIN_U8("graphics/pokemon/pidgeot/icon.4bpp"); +const u8 gMonFootprint_Pidgeot[] = INCBIN_U8("graphics/pokemon/pidgeot/footprint.1bpp"); + +const u32 gMonStillFrontPic_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/front.4bpp.lz"); +const u32 gMonPalette_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/normal.gbapal.lz"); +const u32 gMonBackPic_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/back.4bpp.lz"); +const u32 gMonShinyPalette_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/shiny.gbapal.lz"); +const u8 gMonIcon_Rattata[] = INCBIN_U8("graphics/pokemon/rattata/icon.4bpp"); +const u8 gMonFootprint_Rattata[] = INCBIN_U8("graphics/pokemon/rattata/footprint.1bpp"); + +const u32 gMonStillFrontPic_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/front.4bpp.lz"); +const u32 gMonPalette_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/normal.gbapal.lz"); +const u32 gMonBackPic_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/back.4bpp.lz"); +const u32 gMonShinyPalette_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/shiny.gbapal.lz"); +const u8 gMonIcon_Raticate[] = INCBIN_U8("graphics/pokemon/raticate/icon.4bpp"); +const u8 gMonFootprint_Raticate[] = INCBIN_U8("graphics/pokemon/raticate/footprint.1bpp"); + +const u32 gMonStillFrontPic_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/front.4bpp.lz"); +const u32 gMonPalette_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/normal.gbapal.lz"); +const u32 gMonBackPic_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/back.4bpp.lz"); +const u32 gMonShinyPalette_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/shiny.gbapal.lz"); +const u8 gMonIcon_Spearow[] = INCBIN_U8("graphics/pokemon/spearow/icon.4bpp"); +const u8 gMonFootprint_Spearow[] = INCBIN_U8("graphics/pokemon/spearow/footprint.1bpp"); + +const u32 gMonStillFrontPic_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/front.4bpp.lz"); +const u32 gMonPalette_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/normal.gbapal.lz"); +const u32 gMonBackPic_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/back.4bpp.lz"); +const u32 gMonShinyPalette_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/shiny.gbapal.lz"); +const u8 gMonIcon_Fearow[] = INCBIN_U8("graphics/pokemon/fearow/icon.4bpp"); +const u8 gMonFootprint_Fearow[] = INCBIN_U8("graphics/pokemon/fearow/footprint.1bpp"); + +const u32 gMonStillFrontPic_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/front.4bpp.lz"); +const u32 gMonPalette_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/normal.gbapal.lz"); +const u32 gMonBackPic_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/back.4bpp.lz"); +const u32 gMonShinyPalette_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/shiny.gbapal.lz"); +const u8 gMonIcon_Ekans[] = INCBIN_U8("graphics/pokemon/ekans/icon.4bpp"); +const u8 gMonFootprint_Ekans[] = INCBIN_U8("graphics/pokemon/ekans/footprint.1bpp"); + +const u32 gMonStillFrontPic_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/front.4bpp.lz"); +const u32 gMonPalette_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/normal.gbapal.lz"); +const u32 gMonBackPic_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/back.4bpp.lz"); +const u32 gMonShinyPalette_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/shiny.gbapal.lz"); +const u8 gMonIcon_Arbok[] = INCBIN_U8("graphics/pokemon/arbok/icon.4bpp"); +const u8 gMonFootprint_Arbok[] = INCBIN_U8("graphics/pokemon/arbok/footprint.1bpp"); + +const u32 gMonStillFrontPic_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/front.4bpp.lz"); +const u32 gMonPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/normal.gbapal.lz"); +const u32 gMonBackPic_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/back.4bpp.lz"); +const u32 gMonShinyPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/shiny.gbapal.lz"); +const u8 gMonIcon_Pikachu[] = INCBIN_U8("graphics/pokemon/pikachu/icon.4bpp"); +const u8 gMonFootprint_Pikachu[] = INCBIN_U8("graphics/pokemon/pikachu/footprint.1bpp"); + +const u32 gMonStillFrontPic_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/front.4bpp.lz"); +const u32 gMonPalette_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/normal.gbapal.lz"); +const u32 gMonBackPic_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/back.4bpp.lz"); +const u32 gMonShinyPalette_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/shiny.gbapal.lz"); +const u8 gMonIcon_Raichu[] = INCBIN_U8("graphics/pokemon/raichu/icon.4bpp"); +const u8 gMonFootprint_Raichu[] = INCBIN_U8("graphics/pokemon/raichu/footprint.1bpp"); + +const u32 gMonStillFrontPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/front.4bpp.lz"); +const u32 gMonPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/normal.gbapal.lz"); +const u32 gMonBackPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/back.4bpp.lz"); +const u32 gMonShinyPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/shiny.gbapal.lz"); +const u8 gMonIcon_Sandshrew[] = INCBIN_U8("graphics/pokemon/sandshrew/icon.4bpp"); +const u8 gMonFootprint_Sandshrew[] = INCBIN_U8("graphics/pokemon/sandshrew/footprint.1bpp"); + +const u32 gMonStillFrontPic_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/front.4bpp.lz"); +const u32 gMonPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/normal.gbapal.lz"); +const u32 gMonBackPic_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/back.4bpp.lz"); +const u32 gMonShinyPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/shiny.gbapal.lz"); +const u8 gMonIcon_Sandslash[] = INCBIN_U8("graphics/pokemon/sandslash/icon.4bpp"); +const u8 gMonFootprint_Sandslash[] = INCBIN_U8("graphics/pokemon/sandslash/footprint.1bpp"); + +const u32 gMonStillFrontPic_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/front.4bpp.lz"); +const u32 gMonPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/normal.gbapal.lz"); +const u32 gMonBackPic_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/back.4bpp.lz"); +const u32 gMonShinyPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/shiny.gbapal.lz"); +const u8 gMonIcon_NidoranF[] = INCBIN_U8("graphics/pokemon/nidoran_f/icon.4bpp"); +const u8 gMonFootprint_NidoranF[] = INCBIN_U8("graphics/pokemon/nidoran_f/footprint.1bpp"); + +const u32 gMonStillFrontPic_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/front.4bpp.lz"); +const u32 gMonPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/normal.gbapal.lz"); +const u32 gMonBackPic_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/back.4bpp.lz"); +const u32 gMonShinyPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/shiny.gbapal.lz"); +const u8 gMonIcon_Nidorina[] = INCBIN_U8("graphics/pokemon/nidorina/icon.4bpp"); +const u8 gMonFootprint_Nidorina[] = INCBIN_U8("graphics/pokemon/nidorina/footprint.1bpp"); + +const u32 gMonStillFrontPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/front.4bpp.lz"); +const u32 gMonPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/normal.gbapal.lz"); +const u32 gMonBackPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/back.4bpp.lz"); +const u32 gMonShinyPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/shiny.gbapal.lz"); +const u8 gMonIcon_Nidoqueen[] = INCBIN_U8("graphics/pokemon/nidoqueen/icon.4bpp"); +const u8 gMonFootprint_Nidoqueen[] = INCBIN_U8("graphics/pokemon/nidoqueen/footprint.1bpp"); + +const u32 gMonStillFrontPic_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/front.4bpp.lz"); +const u32 gMonPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/normal.gbapal.lz"); +const u32 gMonBackPic_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/back.4bpp.lz"); +const u32 gMonShinyPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/shiny.gbapal.lz"); +const u8 gMonIcon_NidoranM[] = INCBIN_U8("graphics/pokemon/nidoran_m/icon.4bpp"); +const u8 gMonFootprint_NidoranM[] = INCBIN_U8("graphics/pokemon/nidoran_m/footprint.1bpp"); + +const u32 gMonStillFrontPic_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/front.4bpp.lz"); +const u32 gMonPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/normal.gbapal.lz"); +const u32 gMonBackPic_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/back.4bpp.lz"); +const u32 gMonShinyPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/shiny.gbapal.lz"); +const u8 gMonIcon_Nidorino[] = INCBIN_U8("graphics/pokemon/nidorino/icon.4bpp"); +const u8 gMonFootprint_Nidorino[] = INCBIN_U8("graphics/pokemon/nidorino/footprint.1bpp"); + +const u32 gMonStillFrontPic_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/front.4bpp.lz"); +const u32 gMonPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/normal.gbapal.lz"); +const u32 gMonBackPic_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/back.4bpp.lz"); +const u32 gMonShinyPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/shiny.gbapal.lz"); +const u8 gMonIcon_Nidoking[] = INCBIN_U8("graphics/pokemon/nidoking/icon.4bpp"); +const u8 gMonFootprint_Nidoking[] = INCBIN_U8("graphics/pokemon/nidoking/footprint.1bpp"); + +const u32 gMonStillFrontPic_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/front.4bpp.lz"); +const u32 gMonPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/normal.gbapal.lz"); +const u32 gMonBackPic_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/back.4bpp.lz"); +const u32 gMonShinyPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/shiny.gbapal.lz"); +const u8 gMonIcon_Clefairy[] = INCBIN_U8("graphics/pokemon/clefairy/icon.4bpp"); +const u8 gMonFootprint_Clefairy[] = INCBIN_U8("graphics/pokemon/clefairy/footprint.1bpp"); + +const u32 gMonStillFrontPic_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/front.4bpp.lz"); +const u32 gMonPalette_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/normal.gbapal.lz"); +const u32 gMonBackPic_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/back.4bpp.lz"); +const u32 gMonShinyPalette_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/shiny.gbapal.lz"); +const u8 gMonIcon_Clefable[] = INCBIN_U8("graphics/pokemon/clefable/icon.4bpp"); +const u8 gMonFootprint_Clefable[] = INCBIN_U8("graphics/pokemon/clefable/footprint.1bpp"); + +const u32 gMonStillFrontPic_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/front.4bpp.lz"); +const u32 gMonPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/normal.gbapal.lz"); +const u32 gMonBackPic_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/back.4bpp.lz"); +const u32 gMonShinyPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/shiny.gbapal.lz"); +const u8 gMonIcon_Vulpix[] = INCBIN_U8("graphics/pokemon/vulpix/icon.4bpp"); +const u8 gMonFootprint_Vulpix[] = INCBIN_U8("graphics/pokemon/vulpix/footprint.1bpp"); + +const u32 gMonStillFrontPic_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/front.4bpp.lz"); +const u32 gMonPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/normal.gbapal.lz"); +const u32 gMonBackPic_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/back.4bpp.lz"); +const u32 gMonShinyPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/shiny.gbapal.lz"); +const u8 gMonIcon_Ninetales[] = INCBIN_U8("graphics/pokemon/ninetales/icon.4bpp"); +const u8 gMonFootprint_Ninetales[] = INCBIN_U8("graphics/pokemon/ninetales/footprint.1bpp"); + +const u32 gMonStillFrontPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/front.4bpp.lz"); +const u32 gMonPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/normal.gbapal.lz"); +const u32 gMonBackPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/back.4bpp.lz"); +const u32 gMonShinyPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/shiny.gbapal.lz"); +const u8 gMonIcon_Jigglypuff[] = INCBIN_U8("graphics/pokemon/jigglypuff/icon.4bpp"); +const u8 gMonFootprint_Jigglypuff[] = INCBIN_U8("graphics/pokemon/jigglypuff/footprint.1bpp"); + +const u32 gMonStillFrontPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/front.4bpp.lz"); +const u32 gMonPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/normal.gbapal.lz"); +const u32 gMonBackPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/back.4bpp.lz"); +const u32 gMonShinyPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/shiny.gbapal.lz"); +const u8 gMonIcon_Wigglytuff[] = INCBIN_U8("graphics/pokemon/wigglytuff/icon.4bpp"); +const u8 gMonFootprint_Wigglytuff[] = INCBIN_U8("graphics/pokemon/wigglytuff/footprint.1bpp"); + +const u32 gMonStillFrontPic_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/front.4bpp.lz"); +const u32 gMonPalette_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/normal.gbapal.lz"); +const u32 gMonBackPic_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/back.4bpp.lz"); +const u32 gMonShinyPalette_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/shiny.gbapal.lz"); +const u8 gMonIcon_Zubat[] = INCBIN_U8("graphics/pokemon/zubat/icon.4bpp"); +const u8 gMonFootprint_Zubat[] = INCBIN_U8("graphics/pokemon/zubat/footprint.1bpp"); + +const u32 gMonStillFrontPic_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/front.4bpp.lz"); +const u32 gMonPalette_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/normal.gbapal.lz"); +const u32 gMonBackPic_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/back.4bpp.lz"); +const u32 gMonShinyPalette_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/shiny.gbapal.lz"); +const u8 gMonIcon_Golbat[] = INCBIN_U8("graphics/pokemon/golbat/icon.4bpp"); +const u8 gMonFootprint_Golbat[] = INCBIN_U8("graphics/pokemon/golbat/footprint.1bpp"); + +const u32 gMonStillFrontPic_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/front.4bpp.lz"); +const u32 gMonPalette_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/normal.gbapal.lz"); +const u32 gMonBackPic_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/back.4bpp.lz"); +const u32 gMonShinyPalette_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/shiny.gbapal.lz"); +const u8 gMonIcon_Oddish[] = INCBIN_U8("graphics/pokemon/oddish/icon.4bpp"); +const u8 gMonFootprint_Oddish[] = INCBIN_U8("graphics/pokemon/oddish/footprint.1bpp"); + +const u32 gMonStillFrontPic_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/front.4bpp.lz"); +const u32 gMonPalette_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/normal.gbapal.lz"); +const u32 gMonBackPic_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/back.4bpp.lz"); +const u32 gMonShinyPalette_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/shiny.gbapal.lz"); +const u8 gMonIcon_Gloom[] = INCBIN_U8("graphics/pokemon/gloom/icon.4bpp"); +const u8 gMonFootprint_Gloom[] = INCBIN_U8("graphics/pokemon/gloom/footprint.1bpp"); + +const u32 gMonStillFrontPic_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/front.4bpp.lz"); +const u32 gMonPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/normal.gbapal.lz"); +const u32 gMonBackPic_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/back.4bpp.lz"); +const u32 gMonShinyPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/shiny.gbapal.lz"); +const u8 gMonIcon_Vileplume[] = INCBIN_U8("graphics/pokemon/vileplume/icon.4bpp"); +const u8 gMonFootprint_Vileplume[] = INCBIN_U8("graphics/pokemon/vileplume/footprint.1bpp"); + +const u32 gMonStillFrontPic_Paras[] = INCBIN_U32("graphics/pokemon/paras/front.4bpp.lz"); +const u32 gMonPalette_Paras[] = INCBIN_U32("graphics/pokemon/paras/normal.gbapal.lz"); +const u32 gMonBackPic_Paras[] = INCBIN_U32("graphics/pokemon/paras/back.4bpp.lz"); +const u32 gMonShinyPalette_Paras[] = INCBIN_U32("graphics/pokemon/paras/shiny.gbapal.lz"); +const u8 gMonIcon_Paras[] = INCBIN_U8("graphics/pokemon/paras/icon.4bpp"); +const u8 gMonFootprint_Paras[] = INCBIN_U8("graphics/pokemon/paras/footprint.1bpp"); + +const u32 gMonStillFrontPic_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/front.4bpp.lz"); +const u32 gMonPalette_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/normal.gbapal.lz"); +const u32 gMonBackPic_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/back.4bpp.lz"); +const u32 gMonShinyPalette_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/shiny.gbapal.lz"); +const u8 gMonIcon_Parasect[] = INCBIN_U8("graphics/pokemon/parasect/icon.4bpp"); +const u8 gMonFootprint_Parasect[] = INCBIN_U8("graphics/pokemon/parasect/footprint.1bpp"); + +const u32 gMonStillFrontPic_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/front.4bpp.lz"); +const u32 gMonPalette_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/normal.gbapal.lz"); +const u32 gMonBackPic_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/back.4bpp.lz"); +const u32 gMonShinyPalette_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/shiny.gbapal.lz"); +const u8 gMonIcon_Venonat[] = INCBIN_U8("graphics/pokemon/venonat/icon.4bpp"); +const u8 gMonFootprint_Venonat[] = INCBIN_U8("graphics/pokemon/venonat/footprint.1bpp"); + +const u32 gMonStillFrontPic_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/front.4bpp.lz"); +const u32 gMonPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/normal.gbapal.lz"); +const u32 gMonBackPic_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/back.4bpp.lz"); +const u32 gMonShinyPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/shiny.gbapal.lz"); +const u8 gMonIcon_Venomoth[] = INCBIN_U8("graphics/pokemon/venomoth/icon.4bpp"); +const u8 gMonFootprint_Venomoth[] = INCBIN_U8("graphics/pokemon/venomoth/footprint.1bpp"); + +const u32 gMonStillFrontPic_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/front.4bpp.lz"); +const u32 gMonPalette_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/normal.gbapal.lz"); +const u32 gMonBackPic_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/back.4bpp.lz"); +const u32 gMonShinyPalette_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/shiny.gbapal.lz"); +const u8 gMonIcon_Diglett[] = INCBIN_U8("graphics/pokemon/diglett/icon.4bpp"); +const u8 gMonFootprint_Diglett[] = INCBIN_U8("graphics/pokemon/diglett/footprint.1bpp"); + +const u32 gMonStillFrontPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/front.4bpp.lz"); +const u32 gMonPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/normal.gbapal.lz"); +const u32 gMonBackPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/back.4bpp.lz"); +const u32 gMonShinyPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/shiny.gbapal.lz"); +const u8 gMonIcon_Dugtrio[] = INCBIN_U8("graphics/pokemon/dugtrio/icon.4bpp"); +const u8 gMonFootprint_Dugtrio[] = INCBIN_U8("graphics/pokemon/dugtrio/footprint.1bpp"); + +const u32 gMonStillFrontPic_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/front.4bpp.lz"); +const u32 gMonPalette_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/normal.gbapal.lz"); +const u32 gMonBackPic_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/back.4bpp.lz"); +const u32 gMonShinyPalette_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/shiny.gbapal.lz"); +const u8 gMonIcon_Meowth[] = INCBIN_U8("graphics/pokemon/meowth/icon.4bpp"); +const u8 gMonFootprint_Meowth[] = INCBIN_U8("graphics/pokemon/meowth/footprint.1bpp"); + +const u32 gMonStillFrontPic_Persian[] = INCBIN_U32("graphics/pokemon/persian/front.4bpp.lz"); +const u32 gMonPalette_Persian[] = INCBIN_U32("graphics/pokemon/persian/normal.gbapal.lz"); +const u32 gMonBackPic_Persian[] = INCBIN_U32("graphics/pokemon/persian/back.4bpp.lz"); +const u32 gMonShinyPalette_Persian[] = INCBIN_U32("graphics/pokemon/persian/shiny.gbapal.lz"); +const u8 gMonIcon_Persian[] = INCBIN_U8("graphics/pokemon/persian/icon.4bpp"); +const u8 gMonFootprint_Persian[] = INCBIN_U8("graphics/pokemon/persian/footprint.1bpp"); + +const u32 gMonStillFrontPic_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/front.4bpp.lz"); +const u32 gMonPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/normal.gbapal.lz"); +const u32 gMonBackPic_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/back.4bpp.lz"); +const u32 gMonShinyPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/shiny.gbapal.lz"); +const u8 gMonIcon_Psyduck[] = INCBIN_U8("graphics/pokemon/psyduck/icon.4bpp"); +const u8 gMonFootprint_Psyduck[] = INCBIN_U8("graphics/pokemon/psyduck/footprint.1bpp"); + +const u32 gMonStillFrontPic_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/front.4bpp.lz"); +const u32 gMonPalette_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/normal.gbapal.lz"); +const u32 gMonBackPic_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/back.4bpp.lz"); +const u32 gMonShinyPalette_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/shiny.gbapal.lz"); +const u8 gMonIcon_Golduck[] = INCBIN_U8("graphics/pokemon/golduck/icon.4bpp"); +const u8 gMonFootprint_Golduck[] = INCBIN_U8("graphics/pokemon/golduck/footprint.1bpp"); + +const u32 gMonStillFrontPic_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/front.4bpp.lz"); +const u32 gMonPalette_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/normal.gbapal.lz"); +const u32 gMonBackPic_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/back.4bpp.lz"); +const u32 gMonShinyPalette_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/shiny.gbapal.lz"); +const u8 gMonIcon_Mankey[] = INCBIN_U8("graphics/pokemon/mankey/icon.4bpp"); +const u8 gMonFootprint_Mankey[] = INCBIN_U8("graphics/pokemon/mankey/footprint.1bpp"); + +const u32 gMonStillFrontPic_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/front.4bpp.lz"); +const u32 gMonPalette_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/normal.gbapal.lz"); +const u32 gMonBackPic_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/back.4bpp.lz"); +const u32 gMonShinyPalette_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/shiny.gbapal.lz"); +const u8 gMonIcon_Primeape[] = INCBIN_U8("graphics/pokemon/primeape/icon.4bpp"); +const u8 gMonFootprint_Primeape[] = INCBIN_U8("graphics/pokemon/primeape/footprint.1bpp"); + +const u32 gMonStillFrontPic_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/front.4bpp.lz"); +const u32 gMonPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/normal.gbapal.lz"); +const u32 gMonBackPic_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/back.4bpp.lz"); +const u32 gMonShinyPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/shiny.gbapal.lz"); +const u8 gMonIcon_Growlithe[] = INCBIN_U8("graphics/pokemon/growlithe/icon.4bpp"); +const u8 gMonFootprint_Growlithe[] = INCBIN_U8("graphics/pokemon/growlithe/footprint.1bpp"); + +const u32 gMonStillFrontPic_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/front.4bpp.lz"); +const u32 gMonPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/normal.gbapal.lz"); +const u32 gMonBackPic_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/back.4bpp.lz"); +const u32 gMonShinyPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/shiny.gbapal.lz"); +const u8 gMonIcon_Arcanine[] = INCBIN_U8("graphics/pokemon/arcanine/icon.4bpp"); +const u8 gMonFootprint_Arcanine[] = INCBIN_U8("graphics/pokemon/arcanine/footprint.1bpp"); + +const u32 gMonStillFrontPic_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/front.4bpp.lz"); +const u32 gMonPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/normal.gbapal.lz"); +const u32 gMonBackPic_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/back.4bpp.lz"); +const u32 gMonShinyPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/shiny.gbapal.lz"); +const u8 gMonIcon_Poliwag[] = INCBIN_U8("graphics/pokemon/poliwag/icon.4bpp"); +const u8 gMonFootprint_Poliwag[] = INCBIN_U8("graphics/pokemon/poliwag/footprint.1bpp"); + +const u32 gMonStillFrontPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/front.4bpp.lz"); +const u32 gMonPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/normal.gbapal.lz"); +const u32 gMonBackPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/back.4bpp.lz"); +const u32 gMonShinyPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/shiny.gbapal.lz"); +const u8 gMonIcon_Poliwhirl[] = INCBIN_U8("graphics/pokemon/poliwhirl/icon.4bpp"); +const u8 gMonFootprint_Poliwhirl[] = INCBIN_U8("graphics/pokemon/poliwhirl/footprint.1bpp"); + +const u32 gMonStillFrontPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/front.4bpp.lz"); +const u32 gMonPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/normal.gbapal.lz"); +const u32 gMonBackPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/back.4bpp.lz"); +const u32 gMonShinyPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/shiny.gbapal.lz"); +const u8 gMonIcon_Poliwrath[] = INCBIN_U8("graphics/pokemon/poliwrath/icon.4bpp"); +const u8 gMonFootprint_Poliwrath[] = INCBIN_U8("graphics/pokemon/poliwrath/footprint.1bpp"); + +const u32 gMonStillFrontPic_Abra[] = INCBIN_U32("graphics/pokemon/abra/front.4bpp.lz"); +const u32 gMonPalette_Abra[] = INCBIN_U32("graphics/pokemon/abra/normal.gbapal.lz"); +const u32 gMonBackPic_Abra[] = INCBIN_U32("graphics/pokemon/abra/back.4bpp.lz"); +const u32 gMonShinyPalette_Abra[] = INCBIN_U32("graphics/pokemon/abra/shiny.gbapal.lz"); +const u8 gMonIcon_Abra[] = INCBIN_U8("graphics/pokemon/abra/icon.4bpp"); +const u8 gMonFootprint_Abra[] = INCBIN_U8("graphics/pokemon/abra/footprint.1bpp"); + +const u32 gMonStillFrontPic_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/front.4bpp.lz"); +const u32 gMonPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/normal.gbapal.lz"); +const u32 gMonBackPic_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/back.4bpp.lz"); +const u32 gMonShinyPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/shiny.gbapal.lz"); +const u8 gMonIcon_Kadabra[] = INCBIN_U8("graphics/pokemon/kadabra/icon.4bpp"); +const u8 gMonFootprint_Kadabra[] = INCBIN_U8("graphics/pokemon/kadabra/footprint.1bpp"); + +const u32 gMonStillFrontPic_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/front.4bpp.lz"); +const u32 gMonPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/normal.gbapal.lz"); +const u32 gMonBackPic_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/back.4bpp.lz"); +const u32 gMonShinyPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/shiny.gbapal.lz"); +const u8 gMonIcon_Alakazam[] = INCBIN_U8("graphics/pokemon/alakazam/icon.4bpp"); +const u8 gMonFootprint_Alakazam[] = INCBIN_U8("graphics/pokemon/alakazam/footprint.1bpp"); + +const u32 gMonStillFrontPic_Machop[] = INCBIN_U32("graphics/pokemon/machop/front.4bpp.lz"); +const u32 gMonPalette_Machop[] = INCBIN_U32("graphics/pokemon/machop/normal.gbapal.lz"); +const u32 gMonBackPic_Machop[] = INCBIN_U32("graphics/pokemon/machop/back.4bpp.lz"); +const u32 gMonShinyPalette_Machop[] = INCBIN_U32("graphics/pokemon/machop/shiny.gbapal.lz"); +const u8 gMonIcon_Machop[] = INCBIN_U8("graphics/pokemon/machop/icon.4bpp"); +const u8 gMonFootprint_Machop[] = INCBIN_U8("graphics/pokemon/machop/footprint.1bpp"); + +const u32 gMonStillFrontPic_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/front.4bpp.lz"); +const u32 gMonPalette_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/normal.gbapal.lz"); +const u32 gMonBackPic_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/back.4bpp.lz"); +const u32 gMonShinyPalette_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/shiny.gbapal.lz"); +const u8 gMonIcon_Machoke[] = INCBIN_U8("graphics/pokemon/machoke/icon.4bpp"); +const u8 gMonFootprint_Machoke[] = INCBIN_U8("graphics/pokemon/machoke/footprint.1bpp"); + +const u32 gMonStillFrontPic_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/front.4bpp.lz"); +const u32 gMonPalette_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/normal.gbapal.lz"); +const u32 gMonBackPic_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/back.4bpp.lz"); +const u32 gMonShinyPalette_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/shiny.gbapal.lz"); +const u8 gMonIcon_Machamp[] = INCBIN_U8("graphics/pokemon/machamp/icon.4bpp"); +const u8 gMonFootprint_Machamp[] = INCBIN_U8("graphics/pokemon/machamp/footprint.1bpp"); + +const u32 gMonStillFrontPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/front.4bpp.lz"); +const u32 gMonPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/normal.gbapal.lz"); +const u32 gMonBackPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/back.4bpp.lz"); +const u32 gMonShinyPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/shiny.gbapal.lz"); +const u8 gMonIcon_Bellsprout[] = INCBIN_U8("graphics/pokemon/bellsprout/icon.4bpp"); +const u8 gMonFootprint_Bellsprout[] = INCBIN_U8("graphics/pokemon/bellsprout/footprint.1bpp"); + +const u32 gMonStillFrontPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/front.4bpp.lz"); +const u32 gMonPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/normal.gbapal.lz"); +const u32 gMonBackPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/back.4bpp.lz"); +const u32 gMonShinyPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/shiny.gbapal.lz"); +const u8 gMonIcon_Weepinbell[] = INCBIN_U8("graphics/pokemon/weepinbell/icon.4bpp"); +const u8 gMonFootprint_Weepinbell[] = INCBIN_U8("graphics/pokemon/weepinbell/footprint.1bpp"); + +const u32 gMonStillFrontPic_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/front.4bpp.lz"); +const u32 gMonPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/normal.gbapal.lz"); +const u32 gMonBackPic_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/back.4bpp.lz"); +const u32 gMonShinyPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/shiny.gbapal.lz"); +const u8 gMonIcon_Victreebel[] = INCBIN_U8("graphics/pokemon/victreebel/icon.4bpp"); +const u8 gMonFootprint_Victreebel[] = INCBIN_U8("graphics/pokemon/victreebel/footprint.1bpp"); + +const u32 gMonStillFrontPic_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/front.4bpp.lz"); +const u32 gMonPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/normal.gbapal.lz"); +const u32 gMonBackPic_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/back.4bpp.lz"); +const u32 gMonShinyPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/shiny.gbapal.lz"); +const u8 gMonIcon_Tentacool[] = INCBIN_U8("graphics/pokemon/tentacool/icon.4bpp"); +const u8 gMonFootprint_Tentacool[] = INCBIN_U8("graphics/pokemon/tentacool/footprint.1bpp"); + +const u32 gMonStillFrontPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/front.4bpp.lz"); +const u32 gMonPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/normal.gbapal.lz"); +const u32 gMonBackPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/back.4bpp.lz"); +const u32 gMonShinyPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/shiny.gbapal.lz"); +const u8 gMonIcon_Tentacruel[] = INCBIN_U8("graphics/pokemon/tentacruel/icon.4bpp"); +const u8 gMonFootprint_Tentacruel[] = INCBIN_U8("graphics/pokemon/tentacruel/footprint.1bpp"); + +const u32 gMonStillFrontPic_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/front.4bpp.lz"); +const u32 gMonPalette_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/normal.gbapal.lz"); +const u32 gMonBackPic_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/back.4bpp.lz"); +const u32 gMonShinyPalette_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/shiny.gbapal.lz"); +const u8 gMonIcon_Geodude[] = INCBIN_U8("graphics/pokemon/geodude/icon.4bpp"); +const u8 gMonFootprint_Geodude[] = INCBIN_U8("graphics/pokemon/geodude/footprint.1bpp"); + +const u32 gMonStillFrontPic_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/front.4bpp.lz"); +const u32 gMonPalette_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/normal.gbapal.lz"); +const u32 gMonBackPic_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/back.4bpp.lz"); +const u32 gMonShinyPalette_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/shiny.gbapal.lz"); +const u8 gMonIcon_Graveler[] = INCBIN_U8("graphics/pokemon/graveler/icon.4bpp"); +const u8 gMonFootprint_Graveler[] = INCBIN_U8("graphics/pokemon/graveler/footprint.1bpp"); + +const u32 gMonStillFrontPic_Golem[] = INCBIN_U32("graphics/pokemon/golem/front.4bpp.lz"); +const u32 gMonPalette_Golem[] = INCBIN_U32("graphics/pokemon/golem/normal.gbapal.lz"); +const u32 gMonBackPic_Golem[] = INCBIN_U32("graphics/pokemon/golem/back.4bpp.lz"); +const u32 gMonShinyPalette_Golem[] = INCBIN_U32("graphics/pokemon/golem/shiny.gbapal.lz"); +const u8 gMonIcon_Golem[] = INCBIN_U8("graphics/pokemon/golem/icon.4bpp"); +const u8 gMonFootprint_Golem[] = INCBIN_U8("graphics/pokemon/golem/footprint.1bpp"); + +const u32 gMonStillFrontPic_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/front.4bpp.lz"); +const u32 gMonPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/normal.gbapal.lz"); +const u32 gMonBackPic_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/back.4bpp.lz"); +const u32 gMonShinyPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/shiny.gbapal.lz"); +const u8 gMonIcon_Ponyta[] = INCBIN_U8("graphics/pokemon/ponyta/icon.4bpp"); +const u8 gMonFootprint_Ponyta[] = INCBIN_U8("graphics/pokemon/ponyta/footprint.1bpp"); + +const u32 gMonStillFrontPic_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/front.4bpp.lz"); +const u32 gMonPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/normal.gbapal.lz"); +const u32 gMonBackPic_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/back.4bpp.lz"); +const u32 gMonShinyPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/shiny.gbapal.lz"); +const u8 gMonIcon_Rapidash[] = INCBIN_U8("graphics/pokemon/rapidash/icon.4bpp"); +const u8 gMonFootprint_Rapidash[] = INCBIN_U8("graphics/pokemon/rapidash/footprint.1bpp"); + +const u32 gMonStillFrontPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/front.4bpp.lz"); +const u32 gMonPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/normal.gbapal.lz"); +const u32 gMonBackPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/back.4bpp.lz"); +const u32 gMonShinyPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/shiny.gbapal.lz"); +const u8 gMonIcon_Slowpoke[] = INCBIN_U8("graphics/pokemon/slowpoke/icon.4bpp"); +const u8 gMonFootprint_Slowpoke[] = INCBIN_U8("graphics/pokemon/slowpoke/footprint.1bpp"); + +const u32 gMonStillFrontPic_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/front.4bpp.lz"); +const u32 gMonPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/normal.gbapal.lz"); +const u32 gMonBackPic_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/back.4bpp.lz"); +const u32 gMonShinyPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/shiny.gbapal.lz"); +const u8 gMonIcon_Slowbro[] = INCBIN_U8("graphics/pokemon/slowbro/icon.4bpp"); +const u8 gMonFootprint_Slowbro[] = INCBIN_U8("graphics/pokemon/slowbro/footprint.1bpp"); + +const u32 gMonStillFrontPic_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/front.4bpp.lz"); +const u32 gMonPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/normal.gbapal.lz"); +const u32 gMonBackPic_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/back.4bpp.lz"); +const u32 gMonShinyPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/shiny.gbapal.lz"); +const u8 gMonIcon_Magnemite[] = INCBIN_U8("graphics/pokemon/magnemite/icon.4bpp"); +const u8 gMonFootprint_Magnemite[] = INCBIN_U8("graphics/pokemon/magnemite/footprint.1bpp"); + +const u32 gMonStillFrontPic_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/front.4bpp.lz"); +const u32 gMonPalette_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/normal.gbapal.lz"); +const u32 gMonBackPic_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/back.4bpp.lz"); +const u32 gMonShinyPalette_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/shiny.gbapal.lz"); +const u8 gMonIcon_Magneton[] = INCBIN_U8("graphics/pokemon/magneton/icon.4bpp"); +const u8 gMonFootprint_Magneton[] = INCBIN_U8("graphics/pokemon/magneton/footprint.1bpp"); + +const u32 gMonStillFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/front.4bpp.lz"); +const u32 gMonPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/normal.gbapal.lz"); +const u32 gMonBackPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/back.4bpp.lz"); +const u32 gMonShinyPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/shiny.gbapal.lz"); +const u8 gMonIcon_Farfetchd[] = INCBIN_U8("graphics/pokemon/farfetch_d/icon.4bpp"); +const u8 gMonFootprint_Farfetchd[] = INCBIN_U8("graphics/pokemon/farfetch_d/footprint.1bpp"); + +const u32 gMonStillFrontPic_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/front.4bpp.lz"); +const u32 gMonPalette_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/normal.gbapal.lz"); +const u32 gMonBackPic_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/back.4bpp.lz"); +const u32 gMonShinyPalette_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/shiny.gbapal.lz"); +const u8 gMonIcon_Doduo[] = INCBIN_U8("graphics/pokemon/doduo/icon.4bpp"); +const u8 gMonFootprint_Doduo[] = INCBIN_U8("graphics/pokemon/doduo/footprint.1bpp"); + +const u32 gMonStillFrontPic_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/front.4bpp.lz"); +const u32 gMonPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/normal.gbapal.lz"); +const u32 gMonBackPic_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/back.4bpp.lz"); +const u32 gMonShinyPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/shiny.gbapal.lz"); +const u8 gMonIcon_Dodrio[] = INCBIN_U8("graphics/pokemon/dodrio/icon.4bpp"); +const u8 gMonFootprint_Dodrio[] = INCBIN_U8("graphics/pokemon/dodrio/footprint.1bpp"); + +const u32 gMonStillFrontPic_Seel[] = INCBIN_U32("graphics/pokemon/seel/front.4bpp.lz"); +const u32 gMonPalette_Seel[] = INCBIN_U32("graphics/pokemon/seel/normal.gbapal.lz"); +const u32 gMonBackPic_Seel[] = INCBIN_U32("graphics/pokemon/seel/back.4bpp.lz"); +const u32 gMonShinyPalette_Seel[] = INCBIN_U32("graphics/pokemon/seel/shiny.gbapal.lz"); +const u8 gMonIcon_Seel[] = INCBIN_U8("graphics/pokemon/seel/icon.4bpp"); +const u8 gMonFootprint_Seel[] = INCBIN_U8("graphics/pokemon/seel/footprint.1bpp"); + +const u32 gMonStillFrontPic_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/front.4bpp.lz"); +const u32 gMonPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/normal.gbapal.lz"); +const u32 gMonBackPic_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/back.4bpp.lz"); +const u32 gMonShinyPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/shiny.gbapal.lz"); +const u8 gMonIcon_Dewgong[] = INCBIN_U8("graphics/pokemon/dewgong/icon.4bpp"); +const u8 gMonFootprint_Dewgong[] = INCBIN_U8("graphics/pokemon/dewgong/footprint.1bpp"); + +const u32 gMonStillFrontPic_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/front.4bpp.lz"); +const u32 gMonPalette_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/normal.gbapal.lz"); +const u32 gMonBackPic_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/back.4bpp.lz"); +const u32 gMonShinyPalette_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/shiny.gbapal.lz"); +const u8 gMonIcon_Grimer[] = INCBIN_U8("graphics/pokemon/grimer/icon.4bpp"); +const u8 gMonFootprint_Grimer[] = INCBIN_U8("graphics/pokemon/grimer/footprint.1bpp"); + +const u32 gMonStillFrontPic_Muk[] = INCBIN_U32("graphics/pokemon/muk/front.4bpp.lz"); +const u32 gMonPalette_Muk[] = INCBIN_U32("graphics/pokemon/muk/normal.gbapal.lz"); +const u32 gMonBackPic_Muk[] = INCBIN_U32("graphics/pokemon/muk/back.4bpp.lz"); +const u32 gMonShinyPalette_Muk[] = INCBIN_U32("graphics/pokemon/muk/shiny.gbapal.lz"); +const u8 gMonIcon_Muk[] = INCBIN_U8("graphics/pokemon/muk/icon.4bpp"); +const u8 gMonFootprint_Muk[] = INCBIN_U8("graphics/pokemon/muk/footprint.1bpp"); + +const u32 gMonStillFrontPic_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/front.4bpp.lz"); +const u32 gMonPalette_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/normal.gbapal.lz"); +const u32 gMonBackPic_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/back.4bpp.lz"); +const u32 gMonShinyPalette_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/shiny.gbapal.lz"); +const u8 gMonIcon_Shellder[] = INCBIN_U8("graphics/pokemon/shellder/icon.4bpp"); +const u8 gMonFootprint_Shellder[] = INCBIN_U8("graphics/pokemon/shellder/footprint.1bpp"); + +const u32 gMonStillFrontPic_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/front.4bpp.lz"); +const u32 gMonPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/normal.gbapal.lz"); +const u32 gMonBackPic_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/back.4bpp.lz"); +const u32 gMonShinyPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/shiny.gbapal.lz"); +const u8 gMonIcon_Cloyster[] = INCBIN_U8("graphics/pokemon/cloyster/icon.4bpp"); +const u8 gMonFootprint_Cloyster[] = INCBIN_U8("graphics/pokemon/cloyster/footprint.1bpp"); + +const u32 gMonStillFrontPic_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/front.4bpp.lz"); +const u32 gMonPalette_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/normal.gbapal.lz"); +const u32 gMonBackPic_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/back.4bpp.lz"); +const u32 gMonShinyPalette_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/shiny.gbapal.lz"); +const u8 gMonIcon_Gastly[] = INCBIN_U8("graphics/pokemon/gastly/icon.4bpp"); +const u8 gMonFootprint_Gastly[] = INCBIN_U8("graphics/pokemon/gastly/footprint.1bpp"); + +const u32 gMonStillFrontPic_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/front.4bpp.lz"); +const u32 gMonPalette_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/normal.gbapal.lz"); +const u32 gMonBackPic_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/back.4bpp.lz"); +const u32 gMonShinyPalette_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/shiny.gbapal.lz"); +const u8 gMonIcon_Haunter[] = INCBIN_U8("graphics/pokemon/haunter/icon.4bpp"); +const u8 gMonFootprint_Haunter[] = INCBIN_U8("graphics/pokemon/haunter/footprint.1bpp"); + +const u32 gMonStillFrontPic_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/front.4bpp.lz"); +const u32 gMonPalette_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/normal.gbapal.lz"); +const u32 gMonBackPic_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/back.4bpp.lz"); +const u32 gMonShinyPalette_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/shiny.gbapal.lz"); +const u8 gMonIcon_Gengar[] = INCBIN_U8("graphics/pokemon/gengar/icon.4bpp"); +const u8 gMonFootprint_Gengar[] = INCBIN_U8("graphics/pokemon/gengar/footprint.1bpp"); + +const u32 gMonStillFrontPic_Onix[] = INCBIN_U32("graphics/pokemon/onix/front.4bpp.lz"); +const u32 gMonPalette_Onix[] = INCBIN_U32("graphics/pokemon/onix/normal.gbapal.lz"); +const u32 gMonBackPic_Onix[] = INCBIN_U32("graphics/pokemon/onix/back.4bpp.lz"); +const u32 gMonShinyPalette_Onix[] = INCBIN_U32("graphics/pokemon/onix/shiny.gbapal.lz"); +const u8 gMonIcon_Onix[] = INCBIN_U8("graphics/pokemon/onix/icon.4bpp"); +const u8 gMonFootprint_Onix[] = INCBIN_U8("graphics/pokemon/onix/footprint.1bpp"); + +const u32 gMonStillFrontPic_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/front.4bpp.lz"); +const u32 gMonPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/normal.gbapal.lz"); +const u32 gMonBackPic_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/back.4bpp.lz"); +const u32 gMonShinyPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/shiny.gbapal.lz"); +const u8 gMonIcon_Drowzee[] = INCBIN_U8("graphics/pokemon/drowzee/icon.4bpp"); +const u8 gMonFootprint_Drowzee[] = INCBIN_U8("graphics/pokemon/drowzee/footprint.1bpp"); + +const u32 gMonStillFrontPic_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/front.4bpp.lz"); +const u32 gMonPalette_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/normal.gbapal.lz"); +const u32 gMonBackPic_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/back.4bpp.lz"); +const u32 gMonShinyPalette_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/shiny.gbapal.lz"); +const u8 gMonIcon_Hypno[] = INCBIN_U8("graphics/pokemon/hypno/icon.4bpp"); +const u8 gMonFootprint_Hypno[] = INCBIN_U8("graphics/pokemon/hypno/footprint.1bpp"); + +const u32 gMonStillFrontPic_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/front.4bpp.lz"); +const u32 gMonPalette_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/normal.gbapal.lz"); +const u32 gMonBackPic_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/back.4bpp.lz"); +const u32 gMonShinyPalette_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/shiny.gbapal.lz"); +const u8 gMonIcon_Krabby[] = INCBIN_U8("graphics/pokemon/krabby/icon.4bpp"); +const u8 gMonFootprint_Krabby[] = INCBIN_U8("graphics/pokemon/krabby/footprint.1bpp"); + +const u32 gMonStillFrontPic_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/front.4bpp.lz"); +const u32 gMonPalette_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/normal.gbapal.lz"); +const u32 gMonBackPic_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/back.4bpp.lz"); +const u32 gMonShinyPalette_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/shiny.gbapal.lz"); +const u8 gMonIcon_Kingler[] = INCBIN_U8("graphics/pokemon/kingler/icon.4bpp"); +const u8 gMonFootprint_Kingler[] = INCBIN_U8("graphics/pokemon/kingler/footprint.1bpp"); + +const u32 gMonStillFrontPic_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/front.4bpp.lz"); +const u32 gMonPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/normal.gbapal.lz"); +const u32 gMonBackPic_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/back.4bpp.lz"); +const u32 gMonShinyPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/shiny.gbapal.lz"); +const u8 gMonIcon_Voltorb[] = INCBIN_U8("graphics/pokemon/voltorb/icon.4bpp"); +const u8 gMonFootprint_Voltorb[] = INCBIN_U8("graphics/pokemon/voltorb/footprint.1bpp"); + +const u32 gMonStillFrontPic_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/front.4bpp.lz"); +const u32 gMonPalette_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/normal.gbapal.lz"); +const u32 gMonBackPic_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/back.4bpp.lz"); +const u32 gMonShinyPalette_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/shiny.gbapal.lz"); +const u8 gMonIcon_Electrode[] = INCBIN_U8("graphics/pokemon/electrode/icon.4bpp"); +const u8 gMonFootprint_Electrode[] = INCBIN_U8("graphics/pokemon/electrode/footprint.1bpp"); + +const u32 gMonStillFrontPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/front.4bpp.lz"); +const u32 gMonPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/normal.gbapal.lz"); +const u32 gMonBackPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/back.4bpp.lz"); +const u32 gMonShinyPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/shiny.gbapal.lz"); +const u8 gMonIcon_Exeggcute[] = INCBIN_U8("graphics/pokemon/exeggcute/icon.4bpp"); +const u8 gMonFootprint_Exeggcute[] = INCBIN_U8("graphics/pokemon/exeggcute/footprint.1bpp"); + +const u32 gMonStillFrontPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/front.4bpp.lz"); +const u32 gMonPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/normal.gbapal.lz"); +const u32 gMonBackPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/back.4bpp.lz"); +const u32 gMonShinyPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/shiny.gbapal.lz"); +const u8 gMonIcon_Exeggutor[] = INCBIN_U8("graphics/pokemon/exeggutor/icon.4bpp"); +const u8 gMonFootprint_Exeggutor[] = INCBIN_U8("graphics/pokemon/exeggutor/footprint.1bpp"); + +const u32 gMonStillFrontPic_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/front.4bpp.lz"); +const u32 gMonPalette_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/normal.gbapal.lz"); +const u32 gMonBackPic_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/back.4bpp.lz"); +const u32 gMonShinyPalette_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/shiny.gbapal.lz"); +const u8 gMonIcon_Cubone[] = INCBIN_U8("graphics/pokemon/cubone/icon.4bpp"); +const u8 gMonFootprint_Cubone[] = INCBIN_U8("graphics/pokemon/cubone/footprint.1bpp"); + +const u32 gMonStillFrontPic_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/front.4bpp.lz"); +const u32 gMonPalette_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/normal.gbapal.lz"); +const u32 gMonBackPic_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/back.4bpp.lz"); +const u32 gMonShinyPalette_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/shiny.gbapal.lz"); +const u8 gMonIcon_Marowak[] = INCBIN_U8("graphics/pokemon/marowak/icon.4bpp"); +const u8 gMonFootprint_Marowak[] = INCBIN_U8("graphics/pokemon/marowak/footprint.1bpp"); + +const u32 gMonStillFrontPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/front.4bpp.lz"); +const u32 gMonPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/normal.gbapal.lz"); +const u32 gMonBackPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/back.4bpp.lz"); +const u32 gMonShinyPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/shiny.gbapal.lz"); +const u8 gMonIcon_Hitmonlee[] = INCBIN_U8("graphics/pokemon/hitmonlee/icon.4bpp"); +const u8 gMonFootprint_Hitmonlee[] = INCBIN_U8("graphics/pokemon/hitmonlee/footprint.1bpp"); + +const u32 gMonStillFrontPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/front.4bpp.lz"); +const u32 gMonPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/normal.gbapal.lz"); +const u32 gMonBackPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/back.4bpp.lz"); +const u32 gMonShinyPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/shiny.gbapal.lz"); +const u8 gMonIcon_Hitmonchan[] = INCBIN_U8("graphics/pokemon/hitmonchan/icon.4bpp"); +const u8 gMonFootprint_Hitmonchan[] = INCBIN_U8("graphics/pokemon/hitmonchan/footprint.1bpp"); + +const u32 gMonStillFrontPic_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/front.4bpp.lz"); +const u32 gMonPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/normal.gbapal.lz"); +const u32 gMonBackPic_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/back.4bpp.lz"); +const u32 gMonShinyPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/shiny.gbapal.lz"); +const u8 gMonIcon_Lickitung[] = INCBIN_U8("graphics/pokemon/lickitung/icon.4bpp"); +const u8 gMonFootprint_Lickitung[] = INCBIN_U8("graphics/pokemon/lickitung/footprint.1bpp"); + +const u32 gMonStillFrontPic_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/front.4bpp.lz"); +const u32 gMonPalette_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/normal.gbapal.lz"); +const u32 gMonBackPic_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/back.4bpp.lz"); +const u32 gMonShinyPalette_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/shiny.gbapal.lz"); +const u8 gMonIcon_Koffing[] = INCBIN_U8("graphics/pokemon/koffing/icon.4bpp"); +const u8 gMonFootprint_Koffing[] = INCBIN_U8("graphics/pokemon/koffing/footprint.1bpp"); + +const u32 gMonStillFrontPic_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/front.4bpp.lz"); +const u32 gMonPalette_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/normal.gbapal.lz"); +const u32 gMonBackPic_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/back.4bpp.lz"); +const u32 gMonShinyPalette_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/shiny.gbapal.lz"); +const u8 gMonIcon_Weezing[] = INCBIN_U8("graphics/pokemon/weezing/icon.4bpp"); +const u8 gMonFootprint_Weezing[] = INCBIN_U8("graphics/pokemon/weezing/footprint.1bpp"); + +const u32 gMonStillFrontPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/front.4bpp.lz"); +const u32 gMonPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/normal.gbapal.lz"); +const u32 gMonBackPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/back.4bpp.lz"); +const u32 gMonShinyPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/shiny.gbapal.lz"); +const u8 gMonIcon_Rhyhorn[] = INCBIN_U8("graphics/pokemon/rhyhorn/icon.4bpp"); +const u8 gMonFootprint_Rhyhorn[] = INCBIN_U8("graphics/pokemon/rhyhorn/footprint.1bpp"); + +const u32 gMonStillFrontPic_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/front.4bpp.lz"); +const u32 gMonPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/normal.gbapal.lz"); +const u32 gMonBackPic_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/back.4bpp.lz"); +const u32 gMonShinyPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/shiny.gbapal.lz"); +const u8 gMonIcon_Rhydon[] = INCBIN_U8("graphics/pokemon/rhydon/icon.4bpp"); +const u8 gMonFootprint_Rhydon[] = INCBIN_U8("graphics/pokemon/rhydon/footprint.1bpp"); + +const u32 gMonStillFrontPic_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/front.4bpp.lz"); +const u32 gMonPalette_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/normal.gbapal.lz"); +const u32 gMonBackPic_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/back.4bpp.lz"); +const u32 gMonShinyPalette_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/shiny.gbapal.lz"); +const u8 gMonIcon_Chansey[] = INCBIN_U8("graphics/pokemon/chansey/icon.4bpp"); +const u8 gMonFootprint_Chansey[] = INCBIN_U8("graphics/pokemon/chansey/footprint.1bpp"); + +const u32 gMonStillFrontPic_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/front.4bpp.lz"); +const u32 gMonPalette_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/normal.gbapal.lz"); +const u32 gMonBackPic_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/back.4bpp.lz"); +const u32 gMonShinyPalette_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/shiny.gbapal.lz"); +const u8 gMonIcon_Tangela[] = INCBIN_U8("graphics/pokemon/tangela/icon.4bpp"); +const u8 gMonFootprint_Tangela[] = INCBIN_U8("graphics/pokemon/tangela/footprint.1bpp"); + +const u32 gMonStillFrontPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/front.4bpp.lz"); +const u32 gMonPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/normal.gbapal.lz"); +const u32 gMonBackPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/back.4bpp.lz"); +const u32 gMonShinyPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/shiny.gbapal.lz"); +const u8 gMonIcon_Kangaskhan[] = INCBIN_U8("graphics/pokemon/kangaskhan/icon.4bpp"); +const u8 gMonFootprint_Kangaskhan[] = INCBIN_U8("graphics/pokemon/kangaskhan/footprint.1bpp"); + +const u32 gMonStillFrontPic_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/front.4bpp.lz"); +const u32 gMonPalette_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/normal.gbapal.lz"); +const u32 gMonBackPic_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/back.4bpp.lz"); +const u32 gMonShinyPalette_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/shiny.gbapal.lz"); +const u8 gMonIcon_Horsea[] = INCBIN_U8("graphics/pokemon/horsea/icon.4bpp"); +const u8 gMonFootprint_Horsea[] = INCBIN_U8("graphics/pokemon/horsea/footprint.1bpp"); + +const u32 gMonStillFrontPic_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/front.4bpp.lz"); +const u32 gMonPalette_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/normal.gbapal.lz"); +const u32 gMonBackPic_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/back.4bpp.lz"); +const u32 gMonShinyPalette_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/shiny.gbapal.lz"); +const u8 gMonIcon_Seadra[] = INCBIN_U8("graphics/pokemon/seadra/icon.4bpp"); +const u8 gMonFootprint_Seadra[] = INCBIN_U8("graphics/pokemon/seadra/footprint.1bpp"); + +const u32 gMonStillFrontPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/front.4bpp.lz"); +const u32 gMonPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/normal.gbapal.lz"); +const u32 gMonBackPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/back.4bpp.lz"); +const u32 gMonShinyPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/shiny.gbapal.lz"); +const u8 gMonIcon_Goldeen[] = INCBIN_U8("graphics/pokemon/goldeen/icon.4bpp"); +const u8 gMonFootprint_Goldeen[] = INCBIN_U8("graphics/pokemon/goldeen/footprint.1bpp"); + +const u32 gMonStillFrontPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/front.4bpp.lz"); +const u32 gMonPalette_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/normal.gbapal.lz"); +const u32 gMonBackPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/back.4bpp.lz"); +const u32 gMonShinyPalette_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/shiny.gbapal.lz"); +const u8 gMonIcon_Seaking[] = INCBIN_U8("graphics/pokemon/seaking/icon.4bpp"); +const u8 gMonFootprint_Seaking[] = INCBIN_U8("graphics/pokemon/seaking/footprint.1bpp"); + +const u32 gMonStillFrontPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/front.4bpp.lz"); +const u32 gMonPalette_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/normal.gbapal.lz"); +const u32 gMonBackPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/back.4bpp.lz"); +const u32 gMonShinyPalette_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/shiny.gbapal.lz"); +const u8 gMonIcon_Staryu[] = INCBIN_U8("graphics/pokemon/staryu/icon.4bpp"); +const u8 gMonFootprint_Staryu[] = INCBIN_U8("graphics/pokemon/staryu/footprint.1bpp"); + +const u32 gMonStillFrontPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/front.4bpp.lz"); +const u32 gMonPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/normal.gbapal.lz"); +const u32 gMonBackPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/back.4bpp.lz"); +const u32 gMonShinyPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/shiny.gbapal.lz"); +const u8 gMonIcon_Starmie[] = INCBIN_U8("graphics/pokemon/starmie/icon.4bpp"); +const u8 gMonFootprint_Starmie[] = INCBIN_U8("graphics/pokemon/starmie/footprint.1bpp"); + +const u32 gMonStillFrontPic_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/front.4bpp.lz"); +const u32 gMonPalette_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/normal.gbapal.lz"); +const u32 gMonBackPic_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/back.4bpp.lz"); +const u32 gMonShinyPalette_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/shiny.gbapal.lz"); +const u8 gMonIcon_Mrmime[] = INCBIN_U8("graphics/pokemon/mr_mime/icon.4bpp"); +const u8 gMonFootprint_Mrmime[] = INCBIN_U8("graphics/pokemon/mr_mime/footprint.1bpp"); + +const u32 gMonStillFrontPic_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/front.4bpp.lz"); +const u32 gMonPalette_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/normal.gbapal.lz"); +const u32 gMonBackPic_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/back.4bpp.lz"); +const u32 gMonShinyPalette_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/shiny.gbapal.lz"); +const u8 gMonIcon_Scyther[] = INCBIN_U8("graphics/pokemon/scyther/icon.4bpp"); +const u8 gMonFootprint_Scyther[] = INCBIN_U8("graphics/pokemon/scyther/footprint.1bpp"); + +const u32 gMonStillFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/front.4bpp.lz"); +const u32 gMonPalette_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/normal.gbapal.lz"); +const u32 gMonBackPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/back.4bpp.lz"); +const u32 gMonShinyPalette_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/shiny.gbapal.lz"); +const u8 gMonIcon_Jynx[] = INCBIN_U8("graphics/pokemon/jynx/icon.4bpp"); +const u8 gMonFootprint_Jynx[] = INCBIN_U8("graphics/pokemon/jynx/footprint.1bpp"); + +const u32 gMonStillFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/front.4bpp.lz"); +const u32 gMonPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/normal.gbapal.lz"); +const u32 gMonBackPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/back.4bpp.lz"); +const u32 gMonShinyPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/shiny.gbapal.lz"); +const u8 gMonIcon_Electabuzz[] = INCBIN_U8("graphics/pokemon/electabuzz/icon.4bpp"); +const u8 gMonFootprint_Electabuzz[] = INCBIN_U8("graphics/pokemon/electabuzz/footprint.1bpp"); + +const u32 gMonStillFrontPic_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/front.4bpp.lz"); +const u32 gMonPalette_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/normal.gbapal.lz"); +const u32 gMonBackPic_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/back.4bpp.lz"); +const u32 gMonShinyPalette_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/shiny.gbapal.lz"); +const u8 gMonIcon_Magmar[] = INCBIN_U8("graphics/pokemon/magmar/icon.4bpp"); +const u8 gMonFootprint_Magmar[] = INCBIN_U8("graphics/pokemon/magmar/footprint.1bpp"); + +const u32 gMonStillFrontPic_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/front.4bpp.lz"); +const u32 gMonPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/normal.gbapal.lz"); +const u32 gMonBackPic_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/back.4bpp.lz"); +const u32 gMonShinyPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/shiny.gbapal.lz"); +const u8 gMonIcon_Pinsir[] = INCBIN_U8("graphics/pokemon/pinsir/icon.4bpp"); +const u8 gMonFootprint_Pinsir[] = INCBIN_U8("graphics/pokemon/pinsir/footprint.1bpp"); + +const u32 gMonStillFrontPic_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/front.4bpp.lz"); +const u32 gMonPalette_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/normal.gbapal.lz"); +const u32 gMonBackPic_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/back.4bpp.lz"); +const u32 gMonShinyPalette_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/shiny.gbapal.lz"); +const u8 gMonIcon_Tauros[] = INCBIN_U8("graphics/pokemon/tauros/icon.4bpp"); +const u8 gMonFootprint_Tauros[] = INCBIN_U8("graphics/pokemon/tauros/footprint.1bpp"); + +const u32 gMonStillFrontPic_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/front.4bpp.lz"); +const u32 gMonPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/normal.gbapal.lz"); +const u32 gMonBackPic_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/back.4bpp.lz"); +const u32 gMonShinyPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/shiny.gbapal.lz"); +const u8 gMonIcon_Magikarp[] = INCBIN_U8("graphics/pokemon/magikarp/icon.4bpp"); +const u8 gMonFootprint_Magikarp[] = INCBIN_U8("graphics/pokemon/magikarp/footprint.1bpp"); + +const u32 gMonStillFrontPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/front.4bpp.lz"); +const u32 gMonPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/normal.gbapal.lz"); +const u32 gMonBackPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/back.4bpp.lz"); +const u32 gMonShinyPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/shiny.gbapal.lz"); +const u8 gMonIcon_Gyarados[] = INCBIN_U8("graphics/pokemon/gyarados/icon.4bpp"); +const u8 gMonFootprint_Gyarados[] = INCBIN_U8("graphics/pokemon/gyarados/footprint.1bpp"); + +const u32 gMonStillFrontPic_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/front.4bpp.lz"); +const u32 gMonPalette_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/normal.gbapal.lz"); +const u32 gMonBackPic_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/back.4bpp.lz"); +const u32 gMonShinyPalette_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/shiny.gbapal.lz"); +const u8 gMonIcon_Lapras[] = INCBIN_U8("graphics/pokemon/lapras/icon.4bpp"); +const u8 gMonFootprint_Lapras[] = INCBIN_U8("graphics/pokemon/lapras/footprint.1bpp"); + +const u32 gMonStillFrontPic_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/front.4bpp.lz"); +const u32 gMonPalette_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/normal.gbapal.lz"); +const u32 gMonBackPic_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/back.4bpp.lz"); +const u32 gMonShinyPalette_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/shiny.gbapal.lz"); +const u8 gMonIcon_Ditto[] = INCBIN_U8("graphics/pokemon/ditto/icon.4bpp"); +const u8 gMonFootprint_Ditto[] = INCBIN_U8("graphics/pokemon/ditto/footprint.1bpp"); + +const u32 gMonStillFrontPic_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/front.4bpp.lz"); +const u32 gMonPalette_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/normal.gbapal.lz"); +const u32 gMonBackPic_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/back.4bpp.lz"); +const u32 gMonShinyPalette_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/shiny.gbapal.lz"); +const u8 gMonIcon_Eevee[] = INCBIN_U8("graphics/pokemon/eevee/icon.4bpp"); +const u8 gMonFootprint_Eevee[] = INCBIN_U8("graphics/pokemon/eevee/footprint.1bpp"); + +const u32 gMonStillFrontPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/front.4bpp.lz"); +const u32 gMonPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/normal.gbapal.lz"); +const u32 gMonBackPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/back.4bpp.lz"); +const u32 gMonShinyPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/shiny.gbapal.lz"); +const u8 gMonIcon_Vaporeon[] = INCBIN_U8("graphics/pokemon/vaporeon/icon.4bpp"); +const u8 gMonFootprint_Vaporeon[] = INCBIN_U8("graphics/pokemon/vaporeon/footprint.1bpp"); + +const u32 gMonStillFrontPic_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/front.4bpp.lz"); +const u32 gMonPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/normal.gbapal.lz"); +const u32 gMonBackPic_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/back.4bpp.lz"); +const u32 gMonShinyPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/shiny.gbapal.lz"); +const u8 gMonIcon_Jolteon[] = INCBIN_U8("graphics/pokemon/jolteon/icon.4bpp"); +const u8 gMonFootprint_Jolteon[] = INCBIN_U8("graphics/pokemon/jolteon/footprint.1bpp"); + +const u32 gMonStillFrontPic_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/front.4bpp.lz"); +const u32 gMonPalette_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/normal.gbapal.lz"); +const u32 gMonBackPic_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/back.4bpp.lz"); +const u32 gMonShinyPalette_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/shiny.gbapal.lz"); +const u8 gMonIcon_Flareon[] = INCBIN_U8("graphics/pokemon/flareon/icon.4bpp"); +const u8 gMonFootprint_Flareon[] = INCBIN_U8("graphics/pokemon/flareon/footprint.1bpp"); + +const u32 gMonStillFrontPic_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/front.4bpp.lz"); +const u32 gMonPalette_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/normal.gbapal.lz"); +const u32 gMonBackPic_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/back.4bpp.lz"); +const u32 gMonShinyPalette_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/shiny.gbapal.lz"); +const u8 gMonIcon_Porygon[] = INCBIN_U8("graphics/pokemon/porygon/icon.4bpp"); +const u8 gMonFootprint_Porygon[] = INCBIN_U8("graphics/pokemon/porygon/footprint.1bpp"); + +const u32 gMonStillFrontPic_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/front.4bpp.lz"); +const u32 gMonPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/normal.gbapal.lz"); +const u32 gMonBackPic_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/back.4bpp.lz"); +const u32 gMonShinyPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/shiny.gbapal.lz"); +const u8 gMonIcon_Omanyte[] = INCBIN_U8("graphics/pokemon/omanyte/icon.4bpp"); +const u8 gMonFootprint_Omanyte[] = INCBIN_U8("graphics/pokemon/omanyte/footprint.1bpp"); + +const u32 gMonStillFrontPic_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/front.4bpp.lz"); +const u32 gMonPalette_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/normal.gbapal.lz"); +const u32 gMonBackPic_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/back.4bpp.lz"); +const u32 gMonShinyPalette_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/shiny.gbapal.lz"); +const u8 gMonIcon_Omastar[] = INCBIN_U8("graphics/pokemon/omastar/icon.4bpp"); +const u8 gMonFootprint_Omastar[] = INCBIN_U8("graphics/pokemon/omastar/footprint.1bpp"); + +const u32 gMonStillFrontPic_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/front.4bpp.lz"); +const u32 gMonPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/normal.gbapal.lz"); +const u32 gMonBackPic_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/back.4bpp.lz"); +const u32 gMonShinyPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/shiny.gbapal.lz"); +const u8 gMonIcon_Kabuto[] = INCBIN_U8("graphics/pokemon/kabuto/icon.4bpp"); +const u8 gMonFootprint_Kabuto[] = INCBIN_U8("graphics/pokemon/kabuto/footprint.1bpp"); + +const u32 gMonStillFrontPic_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/front.4bpp.lz"); +const u32 gMonPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/normal.gbapal.lz"); +const u32 gMonBackPic_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/back.4bpp.lz"); +const u32 gMonShinyPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/shiny.gbapal.lz"); +const u8 gMonIcon_Kabutops[] = INCBIN_U8("graphics/pokemon/kabutops/icon.4bpp"); +const u8 gMonFootprint_Kabutops[] = INCBIN_U8("graphics/pokemon/kabutops/footprint.1bpp"); + +const u32 gMonStillFrontPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/front.4bpp.lz"); +const u32 gMonPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/normal.gbapal.lz"); +const u32 gMonBackPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/back.4bpp.lz"); +const u32 gMonShinyPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/shiny.gbapal.lz"); +const u8 gMonIcon_Aerodactyl[] = INCBIN_U8("graphics/pokemon/aerodactyl/icon.4bpp"); +const u8 gMonFootprint_Aerodactyl[] = INCBIN_U8("graphics/pokemon/aerodactyl/footprint.1bpp"); + +const u32 gMonStillFrontPic_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/front.4bpp.lz"); +const u32 gMonPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/normal.gbapal.lz"); +const u32 gMonBackPic_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/back.4bpp.lz"); +const u32 gMonShinyPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/shiny.gbapal.lz"); +const u8 gMonIcon_Snorlax[] = INCBIN_U8("graphics/pokemon/snorlax/icon.4bpp"); +const u8 gMonFootprint_Snorlax[] = INCBIN_U8("graphics/pokemon/snorlax/footprint.1bpp"); + +const u32 gMonStillFrontPic_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/front.4bpp.lz"); +const u32 gMonPalette_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/normal.gbapal.lz"); +const u32 gMonBackPic_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/back.4bpp.lz"); +const u32 gMonShinyPalette_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/shiny.gbapal.lz"); +const u8 gMonIcon_Articuno[] = INCBIN_U8("graphics/pokemon/articuno/icon.4bpp"); +const u8 gMonFootprint_Articuno[] = INCBIN_U8("graphics/pokemon/articuno/footprint.1bpp"); + +const u32 gMonStillFrontPic_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/front.4bpp.lz"); +const u32 gMonPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/normal.gbapal.lz"); +const u32 gMonBackPic_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/back.4bpp.lz"); +const u32 gMonShinyPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/shiny.gbapal.lz"); +const u8 gMonIcon_Zapdos[] = INCBIN_U8("graphics/pokemon/zapdos/icon.4bpp"); +const u8 gMonFootprint_Zapdos[] = INCBIN_U8("graphics/pokemon/zapdos/footprint.1bpp"); + +const u32 gMonStillFrontPic_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/front.4bpp.lz"); +const u32 gMonPalette_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/normal.gbapal.lz"); +const u32 gMonBackPic_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/back.4bpp.lz"); +const u32 gMonShinyPalette_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/shiny.gbapal.lz"); +const u8 gMonIcon_Moltres[] = INCBIN_U8("graphics/pokemon/moltres/icon.4bpp"); +const u8 gMonFootprint_Moltres[] = INCBIN_U8("graphics/pokemon/moltres/footprint.1bpp"); + +const u32 gMonStillFrontPic_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/front.4bpp.lz"); +const u32 gMonPalette_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/normal.gbapal.lz"); +const u32 gMonBackPic_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/back.4bpp.lz"); +const u32 gMonShinyPalette_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/shiny.gbapal.lz"); +const u8 gMonIcon_Dratini[] = INCBIN_U8("graphics/pokemon/dratini/icon.4bpp"); +const u8 gMonFootprint_Dratini[] = INCBIN_U8("graphics/pokemon/dratini/footprint.1bpp"); + +const u32 gMonStillFrontPic_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/front.4bpp.lz"); +const u32 gMonPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/normal.gbapal.lz"); +const u32 gMonBackPic_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/back.4bpp.lz"); +const u32 gMonShinyPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/shiny.gbapal.lz"); +const u8 gMonIcon_Dragonair[] = INCBIN_U8("graphics/pokemon/dragonair/icon.4bpp"); +const u8 gMonFootprint_Dragonair[] = INCBIN_U8("graphics/pokemon/dragonair/footprint.1bpp"); + +const u32 gMonStillFrontPic_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/front.4bpp.lz"); +const u32 gMonPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/normal.gbapal.lz"); +const u32 gMonBackPic_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/back.4bpp.lz"); +const u32 gMonShinyPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/shiny.gbapal.lz"); +const u8 gMonIcon_Dragonite[] = INCBIN_U8("graphics/pokemon/dragonite/icon.4bpp"); +const u8 gMonFootprint_Dragonite[] = INCBIN_U8("graphics/pokemon/dragonite/footprint.1bpp"); + +const u32 gMonStillFrontPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/front.4bpp.lz"); +const u32 gMonPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/normal.gbapal.lz"); +const u32 gMonBackPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/back.4bpp.lz"); +const u32 gMonShinyPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/shiny.gbapal.lz"); +const u8 gMonIcon_Mewtwo[] = INCBIN_U8("graphics/pokemon/mewtwo/icon.4bpp"); +const u8 gMonFootprint_Mewtwo[] = INCBIN_U8("graphics/pokemon/mewtwo/footprint.1bpp"); + +const u32 gMonStillFrontPic_Mew[] = INCBIN_U32("graphics/pokemon/mew/front.4bpp.lz"); +const u32 gMonPalette_Mew[] = INCBIN_U32("graphics/pokemon/mew/normal.gbapal.lz"); +const u32 gMonBackPic_Mew[] = INCBIN_U32("graphics/pokemon/mew/back.4bpp.lz"); +const u32 gMonShinyPalette_Mew[] = INCBIN_U32("graphics/pokemon/mew/shiny.gbapal.lz"); +const u8 gMonIcon_Mew[] = INCBIN_U8("graphics/pokemon/mew/icon.4bpp"); +const u8 gMonFootprint_Mew[] = INCBIN_U8("graphics/pokemon/mew/footprint.1bpp"); + +const u32 gMonStillFrontPic_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/front.4bpp.lz"); +const u32 gMonPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/normal.gbapal.lz"); +const u32 gMonBackPic_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/back.4bpp.lz"); +const u32 gMonShinyPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/shiny.gbapal.lz"); +const u8 gMonIcon_Chikorita[] = INCBIN_U8("graphics/pokemon/chikorita/icon.4bpp"); +const u8 gMonFootprint_Chikorita[] = INCBIN_U8("graphics/pokemon/chikorita/footprint.1bpp"); + +const u32 gMonStillFrontPic_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/front.4bpp.lz"); +const u32 gMonPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/normal.gbapal.lz"); +const u32 gMonBackPic_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/back.4bpp.lz"); +const u32 gMonShinyPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/shiny.gbapal.lz"); +const u8 gMonIcon_Bayleef[] = INCBIN_U8("graphics/pokemon/bayleef/icon.4bpp"); +const u8 gMonFootprint_Bayleef[] = INCBIN_U8("graphics/pokemon/bayleef/footprint.1bpp"); + +const u32 gMonStillFrontPic_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/front.4bpp.lz"); +const u32 gMonPalette_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/normal.gbapal.lz"); +const u32 gMonBackPic_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/back.4bpp.lz"); +const u32 gMonShinyPalette_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/shiny.gbapal.lz"); +const u8 gMonIcon_Meganium[] = INCBIN_U8("graphics/pokemon/meganium/icon.4bpp"); +const u8 gMonFootprint_Meganium[] = INCBIN_U8("graphics/pokemon/meganium/footprint.1bpp"); + +const u32 gMonStillFrontPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/front.4bpp.lz"); +const u32 gMonPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/normal.gbapal.lz"); +const u32 gMonBackPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/back.4bpp.lz"); +const u32 gMonShinyPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/shiny.gbapal.lz"); +const u8 gMonIcon_Cyndaquil[] = INCBIN_U8("graphics/pokemon/cyndaquil/icon.4bpp"); +const u8 gMonFootprint_Cyndaquil[] = INCBIN_U8("graphics/pokemon/cyndaquil/footprint.1bpp"); + +const u32 gMonStillFrontPic_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/front.4bpp.lz"); +const u32 gMonPalette_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/normal.gbapal.lz"); +const u32 gMonBackPic_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/back.4bpp.lz"); +const u32 gMonShinyPalette_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/shiny.gbapal.lz"); +const u8 gMonIcon_Quilava[] = INCBIN_U8("graphics/pokemon/quilava/icon.4bpp"); +const u8 gMonFootprint_Quilava[] = INCBIN_U8("graphics/pokemon/quilava/footprint.1bpp"); + +const u32 gMonStillFrontPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/front.4bpp.lz"); +const u32 gMonPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/normal.gbapal.lz"); +const u32 gMonBackPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/back.4bpp.lz"); +const u32 gMonShinyPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/shiny.gbapal.lz"); +const u8 gMonIcon_Typhlosion[] = INCBIN_U8("graphics/pokemon/typhlosion/icon.4bpp"); +const u8 gMonFootprint_Typhlosion[] = INCBIN_U8("graphics/pokemon/typhlosion/footprint.1bpp"); + +const u32 gMonStillFrontPic_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/front.4bpp.lz"); +const u32 gMonPalette_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/normal.gbapal.lz"); +const u32 gMonBackPic_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/back.4bpp.lz"); +const u32 gMonShinyPalette_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/shiny.gbapal.lz"); +const u8 gMonIcon_Totodile[] = INCBIN_U8("graphics/pokemon/totodile/icon.4bpp"); +const u8 gMonFootprint_Totodile[] = INCBIN_U8("graphics/pokemon/totodile/footprint.1bpp"); + +const u32 gMonStillFrontPic_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/front.4bpp.lz"); +const u32 gMonPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/normal.gbapal.lz"); +const u32 gMonBackPic_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/back.4bpp.lz"); +const u32 gMonShinyPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/shiny.gbapal.lz"); +const u8 gMonIcon_Croconaw[] = INCBIN_U8("graphics/pokemon/croconaw/icon.4bpp"); +const u8 gMonFootprint_Croconaw[] = INCBIN_U8("graphics/pokemon/croconaw/footprint.1bpp"); + +const u32 gMonStillFrontPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/front.4bpp.lz"); +const u32 gMonPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/normal.gbapal.lz"); +const u32 gMonBackPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/back.4bpp.lz"); +const u32 gMonShinyPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/shiny.gbapal.lz"); +const u8 gMonIcon_Feraligatr[] = INCBIN_U8("graphics/pokemon/feraligatr/icon.4bpp"); +const u8 gMonFootprint_Feraligatr[] = INCBIN_U8("graphics/pokemon/feraligatr/footprint.1bpp"); + +const u32 gMonStillFrontPic_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/front.4bpp.lz"); +const u32 gMonPalette_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/normal.gbapal.lz"); +const u32 gMonBackPic_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/back.4bpp.lz"); +const u32 gMonShinyPalette_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/shiny.gbapal.lz"); +const u8 gMonIcon_Sentret[] = INCBIN_U8("graphics/pokemon/sentret/icon.4bpp"); +const u8 gMonFootprint_Sentret[] = INCBIN_U8("graphics/pokemon/sentret/footprint.1bpp"); + +const u32 gMonStillFrontPic_Furret[] = INCBIN_U32("graphics/pokemon/furret/front.4bpp.lz"); +const u32 gMonPalette_Furret[] = INCBIN_U32("graphics/pokemon/furret/normal.gbapal.lz"); +const u32 gMonBackPic_Furret[] = INCBIN_U32("graphics/pokemon/furret/back.4bpp.lz"); +const u32 gMonShinyPalette_Furret[] = INCBIN_U32("graphics/pokemon/furret/shiny.gbapal.lz"); +const u8 gMonIcon_Furret[] = INCBIN_U8("graphics/pokemon/furret/icon.4bpp"); +const u8 gMonFootprint_Furret[] = INCBIN_U8("graphics/pokemon/furret/footprint.1bpp"); + +const u32 gMonStillFrontPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/front.4bpp.lz"); +const u32 gMonPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/normal.gbapal.lz"); +const u32 gMonBackPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/back.4bpp.lz"); +const u32 gMonShinyPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/shiny.gbapal.lz"); +const u8 gMonIcon_Hoothoot[] = INCBIN_U8("graphics/pokemon/hoothoot/icon.4bpp"); +const u8 gMonFootprint_Hoothoot[] = INCBIN_U8("graphics/pokemon/hoothoot/footprint.1bpp"); + +const u32 gMonStillFrontPic_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/front.4bpp.lz"); +const u32 gMonPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/normal.gbapal.lz"); +const u32 gMonBackPic_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/back.4bpp.lz"); +const u32 gMonShinyPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/shiny.gbapal.lz"); +const u8 gMonIcon_Noctowl[] = INCBIN_U8("graphics/pokemon/noctowl/icon.4bpp"); +const u8 gMonFootprint_Noctowl[] = INCBIN_U8("graphics/pokemon/noctowl/footprint.1bpp"); + +const u32 gMonStillFrontPic_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/front.4bpp.lz"); +const u32 gMonPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/normal.gbapal.lz"); +const u32 gMonBackPic_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/back.4bpp.lz"); +const u32 gMonShinyPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/shiny.gbapal.lz"); +const u8 gMonIcon_Ledyba[] = INCBIN_U8("graphics/pokemon/ledyba/icon.4bpp"); +const u8 gMonFootprint_Ledyba[] = INCBIN_U8("graphics/pokemon/ledyba/footprint.1bpp"); + +const u32 gMonStillFrontPic_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/front.4bpp.lz"); +const u32 gMonPalette_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/normal.gbapal.lz"); +const u32 gMonBackPic_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/back.4bpp.lz"); +const u32 gMonShinyPalette_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/shiny.gbapal.lz"); +const u8 gMonIcon_Ledian[] = INCBIN_U8("graphics/pokemon/ledian/icon.4bpp"); +const u8 gMonFootprint_Ledian[] = INCBIN_U8("graphics/pokemon/ledian/footprint.1bpp"); + +const u32 gMonStillFrontPic_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/front.4bpp.lz"); +const u32 gMonPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/normal.gbapal.lz"); +const u32 gMonBackPic_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/back.4bpp.lz"); +const u32 gMonShinyPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/shiny.gbapal.lz"); +const u8 gMonIcon_Spinarak[] = INCBIN_U8("graphics/pokemon/spinarak/icon.4bpp"); +const u8 gMonFootprint_Spinarak[] = INCBIN_U8("graphics/pokemon/spinarak/footprint.1bpp"); + +const u32 gMonStillFrontPic_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/front.4bpp.lz"); +const u32 gMonPalette_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/normal.gbapal.lz"); +const u32 gMonBackPic_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/back.4bpp.lz"); +const u32 gMonShinyPalette_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/shiny.gbapal.lz"); +const u8 gMonIcon_Ariados[] = INCBIN_U8("graphics/pokemon/ariados/icon.4bpp"); +const u8 gMonFootprint_Ariados[] = INCBIN_U8("graphics/pokemon/ariados/footprint.1bpp"); + +const u32 gMonStillFrontPic_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/front.4bpp.lz"); +const u32 gMonPalette_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/normal.gbapal.lz"); +const u32 gMonBackPic_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/back.4bpp.lz"); +const u32 gMonShinyPalette_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/shiny.gbapal.lz"); +const u8 gMonIcon_Crobat[] = INCBIN_U8("graphics/pokemon/crobat/icon.4bpp"); +const u8 gMonFootprint_Crobat[] = INCBIN_U8("graphics/pokemon/crobat/footprint.1bpp"); + +const u32 gMonStillFrontPic_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/front.4bpp.lz"); +const u32 gMonPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/normal.gbapal.lz"); +const u32 gMonBackPic_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/back.4bpp.lz"); +const u32 gMonShinyPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/shiny.gbapal.lz"); +const u8 gMonIcon_Chinchou[] = INCBIN_U8("graphics/pokemon/chinchou/icon.4bpp"); +const u8 gMonFootprint_Chinchou[] = INCBIN_U8("graphics/pokemon/chinchou/footprint.1bpp"); + +const u32 gMonStillFrontPic_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/front.4bpp.lz"); +const u32 gMonPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/normal.gbapal.lz"); +const u32 gMonBackPic_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/back.4bpp.lz"); +const u32 gMonShinyPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/shiny.gbapal.lz"); +const u8 gMonIcon_Lanturn[] = INCBIN_U8("graphics/pokemon/lanturn/icon.4bpp"); +const u8 gMonFootprint_Lanturn[] = INCBIN_U8("graphics/pokemon/lanturn/footprint.1bpp"); + +const u32 gMonStillFrontPic_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/front.4bpp.lz"); +const u32 gMonPalette_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/normal.gbapal.lz"); +const u32 gMonBackPic_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/back.4bpp.lz"); +const u32 gMonShinyPalette_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/shiny.gbapal.lz"); +const u8 gMonIcon_Pichu[] = INCBIN_U8("graphics/pokemon/pichu/icon.4bpp"); +const u8 gMonFootprint_Pichu[] = INCBIN_U8("graphics/pokemon/pichu/footprint.1bpp"); + +const u32 gMonStillFrontPic_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/front.4bpp.lz"); +const u32 gMonPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/normal.gbapal.lz"); +const u32 gMonBackPic_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/back.4bpp.lz"); +const u32 gMonShinyPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/shiny.gbapal.lz"); +const u8 gMonIcon_Cleffa[] = INCBIN_U8("graphics/pokemon/cleffa/icon.4bpp"); +const u8 gMonFootprint_Cleffa[] = INCBIN_U8("graphics/pokemon/cleffa/footprint.1bpp"); + +const u32 gMonStillFrontPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/front.4bpp.lz"); +const u32 gMonPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/normal.gbapal.lz"); +const u32 gMonBackPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/back.4bpp.lz"); +const u32 gMonShinyPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/shiny.gbapal.lz"); +const u8 gMonIcon_Igglybuff[] = INCBIN_U8("graphics/pokemon/igglybuff/icon.4bpp"); +const u8 gMonFootprint_Igglybuff[] = INCBIN_U8("graphics/pokemon/igglybuff/footprint.1bpp"); + +const u32 gMonStillFrontPic_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/front.4bpp.lz"); +const u32 gMonPalette_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/normal.gbapal.lz"); +const u32 gMonBackPic_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/back.4bpp.lz"); +const u32 gMonShinyPalette_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/shiny.gbapal.lz"); +const u8 gMonIcon_Togepi[] = INCBIN_U8("graphics/pokemon/togepi/icon.4bpp"); +const u8 gMonFootprint_Togepi[] = INCBIN_U8("graphics/pokemon/togepi/footprint.1bpp"); + +const u32 gMonStillFrontPic_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/front.4bpp.lz"); +const u32 gMonPalette_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/normal.gbapal.lz"); +const u32 gMonBackPic_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/back.4bpp.lz"); +const u32 gMonShinyPalette_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/shiny.gbapal.lz"); +const u8 gMonIcon_Togetic[] = INCBIN_U8("graphics/pokemon/togetic/icon.4bpp"); +const u8 gMonFootprint_Togetic[] = INCBIN_U8("graphics/pokemon/togetic/footprint.1bpp"); + +const u32 gMonStillFrontPic_Natu[] = INCBIN_U32("graphics/pokemon/natu/front.4bpp.lz"); +const u32 gMonPalette_Natu[] = INCBIN_U32("graphics/pokemon/natu/normal.gbapal.lz"); +const u32 gMonBackPic_Natu[] = INCBIN_U32("graphics/pokemon/natu/back.4bpp.lz"); +const u32 gMonShinyPalette_Natu[] = INCBIN_U32("graphics/pokemon/natu/shiny.gbapal.lz"); +const u8 gMonIcon_Natu[] = INCBIN_U8("graphics/pokemon/natu/icon.4bpp"); +const u8 gMonFootprint_Natu[] = INCBIN_U8("graphics/pokemon/natu/footprint.1bpp"); + +const u32 gMonStillFrontPic_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/front.4bpp.lz"); +const u32 gMonPalette_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/normal.gbapal.lz"); +const u32 gMonBackPic_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/back.4bpp.lz"); +const u32 gMonShinyPalette_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/shiny.gbapal.lz"); +const u8 gMonIcon_Xatu[] = INCBIN_U8("graphics/pokemon/xatu/icon.4bpp"); +const u8 gMonFootprint_Xatu[] = INCBIN_U8("graphics/pokemon/xatu/footprint.1bpp"); + +const u32 gMonStillFrontPic_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/front.4bpp.lz"); +const u32 gMonPalette_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/normal.gbapal.lz"); +const u32 gMonBackPic_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/back.4bpp.lz"); +const u32 gMonShinyPalette_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/shiny.gbapal.lz"); +const u8 gMonIcon_Mareep[] = INCBIN_U8("graphics/pokemon/mareep/icon.4bpp"); +const u8 gMonFootprint_Mareep[] = INCBIN_U8("graphics/pokemon/mareep/footprint.1bpp"); + +const u32 gMonStillFrontPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/front.4bpp.lz"); +const u32 gMonPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/normal.gbapal.lz"); +const u32 gMonBackPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/back.4bpp.lz"); +const u32 gMonShinyPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/shiny.gbapal.lz"); +const u8 gMonIcon_Flaaffy[] = INCBIN_U8("graphics/pokemon/flaaffy/icon.4bpp"); +const u8 gMonFootprint_Flaaffy[] = INCBIN_U8("graphics/pokemon/flaaffy/footprint.1bpp"); + +const u32 gMonStillFrontPic_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/front.4bpp.lz"); +const u32 gMonPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/normal.gbapal.lz"); +const u32 gMonBackPic_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/back.4bpp.lz"); +const u32 gMonShinyPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/shiny.gbapal.lz"); +const u8 gMonIcon_Ampharos[] = INCBIN_U8("graphics/pokemon/ampharos/icon.4bpp"); +const u8 gMonFootprint_Ampharos[] = INCBIN_U8("graphics/pokemon/ampharos/footprint.1bpp"); + +const u32 gMonStillFrontPic_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/front.4bpp.lz"); +const u32 gMonPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/normal.gbapal.lz"); +const u32 gMonBackPic_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/back.4bpp.lz"); +const u32 gMonShinyPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/shiny.gbapal.lz"); +const u8 gMonIcon_Bellossom[] = INCBIN_U8("graphics/pokemon/bellossom/icon.4bpp"); +const u8 gMonFootprint_Bellossom[] = INCBIN_U8("graphics/pokemon/bellossom/footprint.1bpp"); + +const u32 gMonStillFrontPic_Marill[] = INCBIN_U32("graphics/pokemon/marill/front.4bpp.lz"); +const u32 gMonPalette_Marill[] = INCBIN_U32("graphics/pokemon/marill/normal.gbapal.lz"); +const u32 gMonBackPic_Marill[] = INCBIN_U32("graphics/pokemon/marill/back.4bpp.lz"); +const u32 gMonShinyPalette_Marill[] = INCBIN_U32("graphics/pokemon/marill/shiny.gbapal.lz"); +const u8 gMonIcon_Marill[] = INCBIN_U8("graphics/pokemon/marill/icon.4bpp"); +const u8 gMonFootprint_Marill[] = INCBIN_U8("graphics/pokemon/marill/footprint.1bpp"); + +const u32 gMonStillFrontPic_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/front.4bpp.lz"); +const u32 gMonPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/normal.gbapal.lz"); +const u32 gMonBackPic_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/back.4bpp.lz"); +const u32 gMonShinyPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/shiny.gbapal.lz"); +const u8 gMonIcon_Azumarill[] = INCBIN_U8("graphics/pokemon/azumarill/icon.4bpp"); +const u8 gMonFootprint_Azumarill[] = INCBIN_U8("graphics/pokemon/azumarill/footprint.1bpp"); + +const u32 gMonStillFrontPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/front.4bpp.lz"); +const u32 gMonPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/normal.gbapal.lz"); +const u32 gMonBackPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/back.4bpp.lz"); +const u32 gMonShinyPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/shiny.gbapal.lz"); +const u8 gMonIcon_Sudowoodo[] = INCBIN_U8("graphics/pokemon/sudowoodo/icon.4bpp"); +const u8 gMonFootprint_Sudowoodo[] = INCBIN_U8("graphics/pokemon/sudowoodo/footprint.1bpp"); + +const u32 gMonStillFrontPic_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/front.4bpp.lz"); +const u32 gMonPalette_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/normal.gbapal.lz"); +const u32 gMonBackPic_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/back.4bpp.lz"); +const u32 gMonShinyPalette_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/shiny.gbapal.lz"); +const u8 gMonIcon_Politoed[] = INCBIN_U8("graphics/pokemon/politoed/icon.4bpp"); +const u8 gMonFootprint_Politoed[] = INCBIN_U8("graphics/pokemon/politoed/footprint.1bpp"); + +const u32 gMonStillFrontPic_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/front.4bpp.lz"); +const u32 gMonPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/normal.gbapal.lz"); +const u32 gMonBackPic_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/back.4bpp.lz"); +const u32 gMonShinyPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/shiny.gbapal.lz"); +const u8 gMonIcon_Hoppip[] = INCBIN_U8("graphics/pokemon/hoppip/icon.4bpp"); +const u8 gMonFootprint_Hoppip[] = INCBIN_U8("graphics/pokemon/hoppip/footprint.1bpp"); + +const u32 gMonStillFrontPic_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/front.4bpp.lz"); +const u32 gMonPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/normal.gbapal.lz"); +const u32 gMonBackPic_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/back.4bpp.lz"); +const u32 gMonShinyPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/shiny.gbapal.lz"); +const u8 gMonIcon_Skiploom[] = INCBIN_U8("graphics/pokemon/skiploom/icon.4bpp"); +const u8 gMonFootprint_Skiploom[] = INCBIN_U8("graphics/pokemon/skiploom/footprint.1bpp"); + +const u32 gMonStillFrontPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/front.4bpp.lz"); +const u32 gMonPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/normal.gbapal.lz"); +const u32 gMonBackPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/back.4bpp.lz"); +const u32 gMonShinyPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/shiny.gbapal.lz"); +const u8 gMonIcon_Jumpluff[] = INCBIN_U8("graphics/pokemon/jumpluff/icon.4bpp"); +const u8 gMonFootprint_Jumpluff[] = INCBIN_U8("graphics/pokemon/jumpluff/footprint.1bpp"); + +const u32 gMonStillFrontPic_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/front.4bpp.lz"); +const u32 gMonPalette_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/normal.gbapal.lz"); +const u32 gMonBackPic_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/back.4bpp.lz"); +const u32 gMonShinyPalette_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/shiny.gbapal.lz"); +const u8 gMonIcon_Aipom[] = INCBIN_U8("graphics/pokemon/aipom/icon.4bpp"); +const u8 gMonFootprint_Aipom[] = INCBIN_U8("graphics/pokemon/aipom/footprint.1bpp"); + +const u32 gMonStillFrontPic_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/front.4bpp.lz"); +const u32 gMonPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/normal.gbapal.lz"); +const u32 gMonBackPic_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/back.4bpp.lz"); +const u32 gMonShinyPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/shiny.gbapal.lz"); +const u8 gMonIcon_Sunkern[] = INCBIN_U8("graphics/pokemon/sunkern/icon.4bpp"); +const u8 gMonFootprint_Sunkern[] = INCBIN_U8("graphics/pokemon/sunkern/footprint.1bpp"); + +const u32 gMonStillFrontPic_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/front.4bpp.lz"); +const u32 gMonPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/normal.gbapal.lz"); +const u32 gMonBackPic_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/back.4bpp.lz"); +const u32 gMonShinyPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/shiny.gbapal.lz"); +const u8 gMonIcon_Sunflora[] = INCBIN_U8("graphics/pokemon/sunflora/icon.4bpp"); +const u8 gMonFootprint_Sunflora[] = INCBIN_U8("graphics/pokemon/sunflora/footprint.1bpp"); + +const u32 gMonStillFrontPic_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/front.4bpp.lz"); +const u32 gMonPalette_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/normal.gbapal.lz"); +const u32 gMonBackPic_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/back.4bpp.lz"); +const u32 gMonShinyPalette_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/shiny.gbapal.lz"); +const u8 gMonIcon_Yanma[] = INCBIN_U8("graphics/pokemon/yanma/icon.4bpp"); +const u8 gMonFootprint_Yanma[] = INCBIN_U8("graphics/pokemon/yanma/footprint.1bpp"); + +const u32 gMonStillFrontPic_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/front.4bpp.lz"); +const u32 gMonPalette_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/normal.gbapal.lz"); +const u32 gMonBackPic_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/back.4bpp.lz"); +const u32 gMonShinyPalette_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/shiny.gbapal.lz"); +const u8 gMonIcon_Wooper[] = INCBIN_U8("graphics/pokemon/wooper/icon.4bpp"); +const u8 gMonFootprint_Wooper[] = INCBIN_U8("graphics/pokemon/wooper/footprint.1bpp"); + +const u32 gMonStillFrontPic_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/front.4bpp.lz"); +const u32 gMonPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/normal.gbapal.lz"); +const u32 gMonBackPic_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/back.4bpp.lz"); +const u32 gMonShinyPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/shiny.gbapal.lz"); +const u8 gMonIcon_Quagsire[] = INCBIN_U8("graphics/pokemon/quagsire/icon.4bpp"); +const u8 gMonFootprint_Quagsire[] = INCBIN_U8("graphics/pokemon/quagsire/footprint.1bpp"); + +const u32 gMonStillFrontPic_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/front.4bpp.lz"); +const u32 gMonPalette_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/normal.gbapal.lz"); +const u32 gMonBackPic_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/back.4bpp.lz"); +const u32 gMonShinyPalette_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/shiny.gbapal.lz"); +const u8 gMonIcon_Espeon[] = INCBIN_U8("graphics/pokemon/espeon/icon.4bpp"); +const u8 gMonFootprint_Espeon[] = INCBIN_U8("graphics/pokemon/espeon/footprint.1bpp"); + +const u32 gMonStillFrontPic_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/front.4bpp.lz"); +const u32 gMonPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/normal.gbapal.lz"); +const u32 gMonBackPic_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/back.4bpp.lz"); +const u32 gMonShinyPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/shiny.gbapal.lz"); +const u8 gMonIcon_Umbreon[] = INCBIN_U8("graphics/pokemon/umbreon/icon.4bpp"); +const u8 gMonFootprint_Umbreon[] = INCBIN_U8("graphics/pokemon/umbreon/footprint.1bpp"); + +const u32 gMonStillFrontPic_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/front.4bpp.lz"); +const u32 gMonPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/normal.gbapal.lz"); +const u32 gMonBackPic_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/back.4bpp.lz"); +const u32 gMonShinyPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/shiny.gbapal.lz"); +const u8 gMonIcon_Murkrow[] = INCBIN_U8("graphics/pokemon/murkrow/icon.4bpp"); +const u8 gMonFootprint_Murkrow[] = INCBIN_U8("graphics/pokemon/murkrow/footprint.1bpp"); + +const u32 gMonStillFrontPic_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/front.4bpp.lz"); +const u32 gMonPalette_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/normal.gbapal.lz"); +const u32 gMonBackPic_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/back.4bpp.lz"); +const u32 gMonShinyPalette_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/shiny.gbapal.lz"); +const u8 gMonIcon_Slowking[] = INCBIN_U8("graphics/pokemon/slowking/icon.4bpp"); +const u8 gMonFootprint_Slowking[] = INCBIN_U8("graphics/pokemon/slowking/footprint.1bpp"); + +const u32 gMonStillFrontPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/front.4bpp.lz"); +const u32 gMonPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/normal.gbapal.lz"); +const u32 gMonBackPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/back.4bpp.lz"); +const u32 gMonShinyPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/shiny.gbapal.lz"); +const u8 gMonIcon_Misdreavus[] = INCBIN_U8("graphics/pokemon/misdreavus/icon.4bpp"); +const u8 gMonFootprint_Misdreavus[] = INCBIN_U8("graphics/pokemon/misdreavus/footprint.1bpp"); + +const u32 gMonStillFrontPic_UnownA[] = INCBIN_U32("graphics/pokemon/unown/front_a.4bpp.lz"); +const u32 gMonPalette_Unown[] = INCBIN_U32("graphics/pokemon/unown/normal.gbapal.lz"); +const u32 gMonBackPic_UnownA[] = INCBIN_U32("graphics/pokemon/unown/back_a.4bpp.lz"); +const u32 gMonShinyPalette_Unown[] = INCBIN_U32("graphics/pokemon/unown/shiny.gbapal.lz"); +const u8 gMonIcon_UnownA[] = INCBIN_U8("graphics/pokemon/unown/icon_a.4bpp"); +const u8 gMonFootprint_Unown[] = INCBIN_U8("graphics/pokemon/unown/footprint.1bpp"); + +const u32 gMonStillFrontPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/front.4bpp.lz"); +const u32 gMonPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/normal.gbapal.lz"); +const u32 gMonBackPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/back.4bpp.lz"); +const u32 gMonShinyPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/shiny.gbapal.lz"); +const u8 gMonIcon_Wobbuffet[] = INCBIN_U8("graphics/pokemon/wobbuffet/icon.4bpp"); +const u8 gMonFootprint_Wobbuffet[] = INCBIN_U8("graphics/pokemon/wobbuffet/footprint.1bpp"); + +const u32 gMonStillFrontPic_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/front.4bpp.lz"); +const u32 gMonPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/normal.gbapal.lz"); +const u32 gMonBackPic_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/back.4bpp.lz"); +const u32 gMonShinyPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/shiny.gbapal.lz"); +const u8 gMonIcon_Girafarig[] = INCBIN_U8("graphics/pokemon/girafarig/icon.4bpp"); +const u8 gMonFootprint_Girafarig[] = INCBIN_U8("graphics/pokemon/girafarig/footprint.1bpp"); + +const u32 gMonStillFrontPic_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/front.4bpp.lz"); +const u32 gMonPalette_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/normal.gbapal.lz"); +const u32 gMonBackPic_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/back.4bpp.lz"); +const u32 gMonShinyPalette_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/shiny.gbapal.lz"); +const u8 gMonIcon_Pineco[] = INCBIN_U8("graphics/pokemon/pineco/icon.4bpp"); +const u8 gMonFootprint_Pineco[] = INCBIN_U8("graphics/pokemon/pineco/footprint.1bpp"); + +const u32 gMonStillFrontPic_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/front.4bpp.lz"); +const u32 gMonPalette_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/normal.gbapal.lz"); +const u32 gMonBackPic_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/back.4bpp.lz"); +const u32 gMonShinyPalette_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/shiny.gbapal.lz"); +const u8 gMonIcon_Forretress[] = INCBIN_U8("graphics/pokemon/forretress/icon.4bpp"); +const u8 gMonFootprint_Forretress[] = INCBIN_U8("graphics/pokemon/forretress/footprint.1bpp"); + +const u32 gMonStillFrontPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/front.4bpp.lz"); +const u32 gMonPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/normal.gbapal.lz"); +const u32 gMonBackPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/back.4bpp.lz"); +const u32 gMonShinyPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/shiny.gbapal.lz"); +const u8 gMonIcon_Dunsparce[] = INCBIN_U8("graphics/pokemon/dunsparce/icon.4bpp"); +const u8 gMonFootprint_Dunsparce[] = INCBIN_U8("graphics/pokemon/dunsparce/footprint.1bpp"); + +const u32 gMonStillFrontPic_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/front.4bpp.lz"); +const u32 gMonPalette_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/normal.gbapal.lz"); +const u32 gMonBackPic_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/back.4bpp.lz"); +const u32 gMonShinyPalette_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/shiny.gbapal.lz"); +const u8 gMonIcon_Gligar[] = INCBIN_U8("graphics/pokemon/gligar/icon.4bpp"); +const u8 gMonFootprint_Gligar[] = INCBIN_U8("graphics/pokemon/gligar/footprint.1bpp"); + +const u32 gMonStillFrontPic_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/front.4bpp.lz"); +const u32 gMonPalette_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/normal.gbapal.lz"); +const u32 gMonBackPic_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/back.4bpp.lz"); +const u32 gMonShinyPalette_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/shiny.gbapal.lz"); +const u8 gMonIcon_Steelix[] = INCBIN_U8("graphics/pokemon/steelix/icon.4bpp"); +const u8 gMonFootprint_Steelix[] = INCBIN_U8("graphics/pokemon/steelix/footprint.1bpp"); + +const u32 gMonStillFrontPic_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/front.4bpp.lz"); +const u32 gMonPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/normal.gbapal.lz"); +const u32 gMonBackPic_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/back.4bpp.lz"); +const u32 gMonShinyPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/shiny.gbapal.lz"); +const u8 gMonIcon_Snubbull[] = INCBIN_U8("graphics/pokemon/snubbull/icon.4bpp"); +const u8 gMonFootprint_Snubbull[] = INCBIN_U8("graphics/pokemon/snubbull/footprint.1bpp"); + +const u32 gMonStillFrontPic_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/front.4bpp.lz"); +const u32 gMonPalette_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/normal.gbapal.lz"); +const u32 gMonBackPic_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/back.4bpp.lz"); +const u32 gMonShinyPalette_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/shiny.gbapal.lz"); +const u8 gMonIcon_Granbull[] = INCBIN_U8("graphics/pokemon/granbull/icon.4bpp"); +const u8 gMonFootprint_Granbull[] = INCBIN_U8("graphics/pokemon/granbull/footprint.1bpp"); + +const u32 gMonStillFrontPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/front.4bpp.lz"); +const u32 gMonPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/normal.gbapal.lz"); +const u32 gMonBackPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/back.4bpp.lz"); +const u32 gMonShinyPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/shiny.gbapal.lz"); +const u8 gMonIcon_Qwilfish[] = INCBIN_U8("graphics/pokemon/qwilfish/icon.4bpp"); +const u8 gMonFootprint_Qwilfish[] = INCBIN_U8("graphics/pokemon/qwilfish/footprint.1bpp"); + +const u32 gMonStillFrontPic_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/front.4bpp.lz"); +const u32 gMonPalette_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/normal.gbapal.lz"); +const u32 gMonBackPic_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/back.4bpp.lz"); +const u32 gMonShinyPalette_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/shiny.gbapal.lz"); +const u8 gMonIcon_Scizor[] = INCBIN_U8("graphics/pokemon/scizor/icon.4bpp"); +const u8 gMonFootprint_Scizor[] = INCBIN_U8("graphics/pokemon/scizor/footprint.1bpp"); + +const u32 gMonStillFrontPic_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/front.4bpp.lz"); +const u32 gMonPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/normal.gbapal.lz"); +const u32 gMonBackPic_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/back.4bpp.lz"); +const u32 gMonShinyPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/shiny.gbapal.lz"); +const u8 gMonIcon_Shuckle[] = INCBIN_U8("graphics/pokemon/shuckle/icon.4bpp"); +const u8 gMonFootprint_Shuckle[] = INCBIN_U8("graphics/pokemon/shuckle/footprint.1bpp"); + +const u32 gMonStillFrontPic_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/front.4bpp.lz"); +const u32 gMonPalette_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/normal.gbapal.lz"); +const u32 gMonBackPic_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/back.4bpp.lz"); +const u32 gMonShinyPalette_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/shiny.gbapal.lz"); +const u8 gMonIcon_Heracross[] = INCBIN_U8("graphics/pokemon/heracross/icon.4bpp"); +const u8 gMonFootprint_Heracross[] = INCBIN_U8("graphics/pokemon/heracross/footprint.1bpp"); + +const u32 gMonStillFrontPic_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/front.4bpp.lz"); +const u32 gMonPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/normal.gbapal.lz"); +const u32 gMonBackPic_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/back.4bpp.lz"); +const u32 gMonShinyPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/shiny.gbapal.lz"); +const u8 gMonIcon_Sneasel[] = INCBIN_U8("graphics/pokemon/sneasel/icon.4bpp"); +const u8 gMonFootprint_Sneasel[] = INCBIN_U8("graphics/pokemon/sneasel/footprint.1bpp"); + +const u32 gMonStillFrontPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/front.4bpp.lz"); +const u32 gMonPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/normal.gbapal.lz"); +const u32 gMonBackPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/back.4bpp.lz"); +const u32 gMonShinyPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/shiny.gbapal.lz"); +const u8 gMonIcon_Teddiursa[] = INCBIN_U8("graphics/pokemon/teddiursa/icon.4bpp"); +const u8 gMonFootprint_Teddiursa[] = INCBIN_U8("graphics/pokemon/teddiursa/footprint.1bpp"); +const u32 gMonStillFrontPic_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/front.4bpp.lz"); +const u32 gMonPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/normal.gbapal.lz"); +const u32 gMonBackPic_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/back.4bpp.lz"); +const u32 gMonShinyPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/shiny.gbapal.lz"); +const u8 gMonIcon_Ursaring[] = INCBIN_U8("graphics/pokemon/ursaring/icon.4bpp"); +const u8 gMonFootprint_Ursaring[] = INCBIN_U8("graphics/pokemon/ursaring/footprint.1bpp"); + +const u32 gMonStillFrontPic_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/front.4bpp.lz"); +const u32 gMonPalette_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/normal.gbapal.lz"); +const u32 gMonBackPic_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/back.4bpp.lz"); +const u32 gMonShinyPalette_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/shiny.gbapal.lz"); +const u8 gMonIcon_Slugma[] = INCBIN_U8("graphics/pokemon/slugma/icon.4bpp"); +const u8 gMonFootprint_Slugma[] = INCBIN_U8("graphics/pokemon/slugma/footprint.1bpp"); + +const u32 gMonStillFrontPic_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/front.4bpp.lz"); +const u32 gMonPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/normal.gbapal.lz"); +const u32 gMonBackPic_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/back.4bpp.lz"); +const u32 gMonShinyPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/shiny.gbapal.lz"); +const u8 gMonIcon_Magcargo[] = INCBIN_U8("graphics/pokemon/magcargo/icon.4bpp"); +const u8 gMonFootprint_Magcargo[] = INCBIN_U8("graphics/pokemon/magcargo/footprint.1bpp"); + +const u32 gMonStillFrontPic_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/front.4bpp.lz"); +const u32 gMonPalette_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/normal.gbapal.lz"); +const u32 gMonBackPic_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/back.4bpp.lz"); +const u32 gMonShinyPalette_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/shiny.gbapal.lz"); +const u8 gMonIcon_Swinub[] = INCBIN_U8("graphics/pokemon/swinub/icon.4bpp"); +const u8 gMonFootprint_Swinub[] = INCBIN_U8("graphics/pokemon/swinub/footprint.1bpp"); + +const u32 gMonStillFrontPic_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/front.4bpp.lz"); +const u32 gMonPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/normal.gbapal.lz"); +const u32 gMonBackPic_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/back.4bpp.lz"); +const u32 gMonShinyPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/shiny.gbapal.lz"); +const u8 gMonIcon_Piloswine[] = INCBIN_U8("graphics/pokemon/piloswine/icon.4bpp"); +const u8 gMonFootprint_Piloswine[] = INCBIN_U8("graphics/pokemon/piloswine/footprint.1bpp"); + +const u32 gMonStillFrontPic_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/front.4bpp.lz"); +const u32 gMonPalette_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/normal.gbapal.lz"); +const u32 gMonBackPic_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/back.4bpp.lz"); +const u32 gMonShinyPalette_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/shiny.gbapal.lz"); +const u8 gMonIcon_Corsola[] = INCBIN_U8("graphics/pokemon/corsola/icon.4bpp"); +const u8 gMonFootprint_Corsola[] = INCBIN_U8("graphics/pokemon/corsola/footprint.1bpp"); + +const u32 gMonStillFrontPic_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/front.4bpp.lz"); +const u32 gMonPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/normal.gbapal.lz"); +const u32 gMonBackPic_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/back.4bpp.lz"); +const u32 gMonShinyPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/shiny.gbapal.lz"); +const u8 gMonIcon_Remoraid[] = INCBIN_U8("graphics/pokemon/remoraid/icon.4bpp"); +const u8 gMonFootprint_Remoraid[] = INCBIN_U8("graphics/pokemon/remoraid/footprint.1bpp"); + +const u32 gMonStillFrontPic_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/front.4bpp.lz"); +const u32 gMonPalette_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/normal.gbapal.lz"); +const u32 gMonBackPic_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/back.4bpp.lz"); +const u32 gMonShinyPalette_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/shiny.gbapal.lz"); +const u8 gMonIcon_Octillery[] = INCBIN_U8("graphics/pokemon/octillery/icon.4bpp"); +const u8 gMonFootprint_Octillery[] = INCBIN_U8("graphics/pokemon/octillery/footprint.1bpp"); + +const u32 gMonStillFrontPic_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/front.4bpp.lz"); +const u32 gMonPalette_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/normal.gbapal.lz"); +const u32 gMonBackPic_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/back.4bpp.lz"); +const u32 gMonShinyPalette_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/shiny.gbapal.lz"); +const u8 gMonIcon_Delibird[] = INCBIN_U8("graphics/pokemon/delibird/icon.4bpp"); +const u8 gMonFootprint_Delibird[] = INCBIN_U8("graphics/pokemon/delibird/footprint.1bpp"); + +const u32 gMonStillFrontPic_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/front.4bpp.lz"); +const u32 gMonPalette_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/normal.gbapal.lz"); +const u32 gMonBackPic_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/back.4bpp.lz"); +const u32 gMonShinyPalette_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/shiny.gbapal.lz"); +const u8 gMonIcon_Mantine[] = INCBIN_U8("graphics/pokemon/mantine/icon.4bpp"); +const u8 gMonFootprint_Mantine[] = INCBIN_U8("graphics/pokemon/mantine/footprint.1bpp"); + +const u32 gMonStillFrontPic_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/front.4bpp.lz"); +const u32 gMonPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/normal.gbapal.lz"); +const u32 gMonBackPic_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/back.4bpp.lz"); +const u32 gMonShinyPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/shiny.gbapal.lz"); +const u8 gMonIcon_Skarmory[] = INCBIN_U8("graphics/pokemon/skarmory/icon.4bpp"); +const u8 gMonFootprint_Skarmory[] = INCBIN_U8("graphics/pokemon/skarmory/footprint.1bpp"); + +const u32 gMonStillFrontPic_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/front.4bpp.lz"); +const u32 gMonPalette_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/normal.gbapal.lz"); +const u32 gMonBackPic_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/back.4bpp.lz"); +const u32 gMonShinyPalette_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/shiny.gbapal.lz"); +const u8 gMonIcon_Houndour[] = INCBIN_U8("graphics/pokemon/houndour/icon.4bpp"); +const u8 gMonFootprint_Houndour[] = INCBIN_U8("graphics/pokemon/houndour/footprint.1bpp"); + +const u32 gMonStillFrontPic_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/front.4bpp.lz"); +const u32 gMonPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/normal.gbapal.lz"); +const u32 gMonBackPic_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/back.4bpp.lz"); +const u32 gMonShinyPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/shiny.gbapal.lz"); +const u8 gMonIcon_Houndoom[] = INCBIN_U8("graphics/pokemon/houndoom/icon.4bpp"); +const u8 gMonFootprint_Houndoom[] = INCBIN_U8("graphics/pokemon/houndoom/footprint.1bpp"); + +const u32 gMonStillFrontPic_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/front.4bpp.lz"); +const u32 gMonPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/normal.gbapal.lz"); +const u32 gMonBackPic_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/back.4bpp.lz"); +const u32 gMonShinyPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/shiny.gbapal.lz"); +const u8 gMonIcon_Kingdra[] = INCBIN_U8("graphics/pokemon/kingdra/icon.4bpp"); +const u8 gMonFootprint_Kingdra[] = INCBIN_U8("graphics/pokemon/kingdra/footprint.1bpp"); + +const u32 gMonStillFrontPic_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/front.4bpp.lz"); +const u32 gMonPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/normal.gbapal.lz"); +const u32 gMonBackPic_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/back.4bpp.lz"); +const u32 gMonShinyPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/shiny.gbapal.lz"); +const u8 gMonIcon_Phanpy[] = INCBIN_U8("graphics/pokemon/phanpy/icon.4bpp"); +const u8 gMonFootprint_Phanpy[] = INCBIN_U8("graphics/pokemon/phanpy/footprint.1bpp"); + +const u32 gMonStillFrontPic_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/front.4bpp.lz"); +const u32 gMonPalette_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/normal.gbapal.lz"); +const u32 gMonBackPic_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/back.4bpp.lz"); +const u32 gMonShinyPalette_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/shiny.gbapal.lz"); +const u8 gMonIcon_Donphan[] = INCBIN_U8("graphics/pokemon/donphan/icon.4bpp"); +const u8 gMonFootprint_Donphan[] = INCBIN_U8("graphics/pokemon/donphan/footprint.1bpp"); const u32 gMonStillFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/front_pics/porygon2_still_front_pic.4bpp.lz"); const u32 gMonPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/palettes/porygon2_palette.gbapal.lz"); @@ -1628,1196 +1628,1196 @@ const u32 gMonShinyPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/palettes/po const u8 gMonIcon_Porygon2[] = INCBIN_U8("graphics/pokemon/icons/porygon2_icon.4bpp"); const u8 gMonFootprint_Porygon2[] = INCBIN_U8("graphics/pokemon/footprints/porygon2_footprint.1bpp"); -const u32 gMonStillFrontPic_Stantler[] = INCBIN_U32("graphics/pokemon/front_pics/stantler_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Stantler[] = INCBIN_U32("graphics/pokemon/palettes/stantler_palette.gbapal.lz"); -const u32 gMonBackPic_Stantler[] = INCBIN_U32("graphics/pokemon/back_pics/stantler_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Stantler[] = INCBIN_U32("graphics/pokemon/palettes/stantler_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Stantler[] = INCBIN_U8("graphics/pokemon/icons/stantler_icon.4bpp"); -const u8 gMonFootprint_Stantler[] = INCBIN_U8("graphics/pokemon/footprints/stantler_footprint.1bpp"); - -const u32 gMonStillFrontPic_Smeargle[] = INCBIN_U32("graphics/pokemon/front_pics/smeargle_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/palettes/smeargle_palette.gbapal.lz"); -const u32 gMonBackPic_Smeargle[] = INCBIN_U32("graphics/pokemon/back_pics/smeargle_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/palettes/smeargle_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Smeargle[] = INCBIN_U8("graphics/pokemon/icons/smeargle_icon.4bpp"); -const u8 gMonFootprint_Smeargle[] = INCBIN_U8("graphics/pokemon/footprints/smeargle_footprint.1bpp"); - -const u32 gMonStillFrontPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/front_pics/tyrogue_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/palettes/tyrogue_palette.gbapal.lz"); -const u32 gMonBackPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/back_pics/tyrogue_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/palettes/tyrogue_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Tyrogue[] = INCBIN_U8("graphics/pokemon/icons/tyrogue_icon.4bpp"); -const u8 gMonFootprint_Tyrogue[] = INCBIN_U8("graphics/pokemon/footprints/tyrogue_footprint.1bpp"); - -const u32 gMonStillFrontPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/front_pics/hitmontop_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/palettes/hitmontop_palette.gbapal.lz"); -const u32 gMonBackPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/back_pics/hitmontop_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/palettes/hitmontop_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Hitmontop[] = INCBIN_U8("graphics/pokemon/icons/hitmontop_icon.4bpp"); -const u8 gMonFootprint_Hitmontop[] = INCBIN_U8("graphics/pokemon/footprints/hitmontop_footprint.1bpp"); - -const u32 gMonStillFrontPic_Smoochum[] = INCBIN_U32("graphics/pokemon/front_pics/smoochum_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/palettes/smoochum_palette.gbapal.lz"); -const u32 gMonBackPic_Smoochum[] = INCBIN_U32("graphics/pokemon/back_pics/smoochum_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/palettes/smoochum_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Smoochum[] = INCBIN_U8("graphics/pokemon/icons/smoochum_icon.4bpp"); -const u8 gMonFootprint_Smoochum[] = INCBIN_U8("graphics/pokemon/footprints/smoochum_footprint.1bpp"); - -const u32 gMonStillFrontPic_Elekid[] = INCBIN_U32("graphics/pokemon/front_pics/elekid_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Elekid[] = INCBIN_U32("graphics/pokemon/palettes/elekid_palette.gbapal.lz"); -const u32 gMonBackPic_Elekid[] = INCBIN_U32("graphics/pokemon/back_pics/elekid_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Elekid[] = INCBIN_U32("graphics/pokemon/palettes/elekid_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Elekid[] = INCBIN_U8("graphics/pokemon/icons/elekid_icon.4bpp"); -const u8 gMonFootprint_Elekid[] = INCBIN_U8("graphics/pokemon/footprints/elekid_footprint.1bpp"); - -const u32 gMonStillFrontPic_Magby[] = INCBIN_U32("graphics/pokemon/front_pics/magby_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Magby[] = INCBIN_U32("graphics/pokemon/palettes/magby_palette.gbapal.lz"); -const u32 gMonBackPic_Magby[] = INCBIN_U32("graphics/pokemon/back_pics/magby_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Magby[] = INCBIN_U32("graphics/pokemon/palettes/magby_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Magby[] = INCBIN_U8("graphics/pokemon/icons/magby_icon.4bpp"); -const u8 gMonFootprint_Magby[] = INCBIN_U8("graphics/pokemon/footprints/magby_footprint.1bpp"); - -const u32 gMonStillFrontPic_Miltank[] = INCBIN_U32("graphics/pokemon/front_pics/miltank_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Miltank[] = INCBIN_U32("graphics/pokemon/palettes/miltank_palette.gbapal.lz"); -const u32 gMonBackPic_Miltank[] = INCBIN_U32("graphics/pokemon/back_pics/miltank_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Miltank[] = INCBIN_U32("graphics/pokemon/palettes/miltank_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Miltank[] = INCBIN_U8("graphics/pokemon/icons/miltank_icon.4bpp"); -const u8 gMonFootprint_Miltank[] = INCBIN_U8("graphics/pokemon/footprints/miltank_footprint.1bpp"); - -const u32 gMonStillFrontPic_Blissey[] = INCBIN_U32("graphics/pokemon/front_pics/blissey_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Blissey[] = INCBIN_U32("graphics/pokemon/palettes/blissey_palette.gbapal.lz"); -const u32 gMonBackPic_Blissey[] = INCBIN_U32("graphics/pokemon/back_pics/blissey_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Blissey[] = INCBIN_U32("graphics/pokemon/palettes/blissey_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Blissey[] = INCBIN_U8("graphics/pokemon/icons/blissey_icon.4bpp"); -const u8 gMonFootprint_Blissey[] = INCBIN_U8("graphics/pokemon/footprints/blissey_footprint.1bpp"); - -const u32 gMonStillFrontPic_Raikou[] = INCBIN_U32("graphics/pokemon/front_pics/raikou_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Raikou[] = INCBIN_U32("graphics/pokemon/palettes/raikou_palette.gbapal.lz"); -const u32 gMonBackPic_Raikou[] = INCBIN_U32("graphics/pokemon/back_pics/raikou_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Raikou[] = INCBIN_U32("graphics/pokemon/palettes/raikou_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Raikou[] = INCBIN_U8("graphics/pokemon/icons/raikou_icon.4bpp"); -const u8 gMonFootprint_Raikou[] = INCBIN_U8("graphics/pokemon/footprints/raikou_footprint.1bpp"); - -const u32 gMonStillFrontPic_Entei[] = INCBIN_U32("graphics/pokemon/front_pics/entei_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Entei[] = INCBIN_U32("graphics/pokemon/palettes/entei_palette.gbapal.lz"); -const u32 gMonBackPic_Entei[] = INCBIN_U32("graphics/pokemon/back_pics/entei_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Entei[] = INCBIN_U32("graphics/pokemon/palettes/entei_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Entei[] = INCBIN_U8("graphics/pokemon/icons/entei_icon.4bpp"); -const u8 gMonFootprint_Entei[] = INCBIN_U8("graphics/pokemon/footprints/entei_footprint.1bpp"); - -const u32 gMonStillFrontPic_Suicune[] = INCBIN_U32("graphics/pokemon/front_pics/suicune_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Suicune[] = INCBIN_U32("graphics/pokemon/palettes/suicune_palette.gbapal.lz"); -const u32 gMonBackPic_Suicune[] = INCBIN_U32("graphics/pokemon/back_pics/suicune_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Suicune[] = INCBIN_U32("graphics/pokemon/palettes/suicune_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Suicune[] = INCBIN_U8("graphics/pokemon/icons/suicune_icon.4bpp"); -const u8 gMonFootprint_Suicune[] = INCBIN_U8("graphics/pokemon/footprints/suicune_footprint.1bpp"); - -const u32 gMonStillFrontPic_Larvitar[] = INCBIN_U32("graphics/pokemon/front_pics/larvitar_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/palettes/larvitar_palette.gbapal.lz"); -const u32 gMonBackPic_Larvitar[] = INCBIN_U32("graphics/pokemon/back_pics/larvitar_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/palettes/larvitar_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Larvitar[] = INCBIN_U8("graphics/pokemon/icons/larvitar_icon.4bpp"); -const u8 gMonFootprint_Larvitar[] = INCBIN_U8("graphics/pokemon/footprints/larvitar_footprint.1bpp"); - -const u32 gMonStillFrontPic_Pupitar[] = INCBIN_U32("graphics/pokemon/front_pics/pupitar_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/palettes/pupitar_palette.gbapal.lz"); -const u32 gMonBackPic_Pupitar[] = INCBIN_U32("graphics/pokemon/back_pics/pupitar_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/palettes/pupitar_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Pupitar[] = INCBIN_U8("graphics/pokemon/icons/pupitar_icon.4bpp"); -const u8 gMonFootprint_Pupitar[] = INCBIN_U8("graphics/pokemon/footprints/pupitar_footprint.1bpp"); - -const u32 gMonStillFrontPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/front_pics/tyranitar_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/palettes/tyranitar_palette.gbapal.lz"); -const u32 gMonBackPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/back_pics/tyranitar_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/palettes/tyranitar_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Tyranitar[] = INCBIN_U8("graphics/pokemon/icons/tyranitar_icon.4bpp"); -const u8 gMonFootprint_Tyranitar[] = INCBIN_U8("graphics/pokemon/footprints/tyranitar_footprint.1bpp"); - -const u32 gMonStillFrontPic_Lugia[] = INCBIN_U32("graphics/pokemon/front_pics/lugia_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Lugia[] = INCBIN_U32("graphics/pokemon/palettes/lugia_palette.gbapal.lz"); -const u32 gMonBackPic_Lugia[] = INCBIN_U32("graphics/pokemon/back_pics/lugia_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Lugia[] = INCBIN_U32("graphics/pokemon/palettes/lugia_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Lugia[] = INCBIN_U8("graphics/pokemon/icons/lugia_icon.4bpp"); -const u8 gMonFootprint_Lugia[] = INCBIN_U8("graphics/pokemon/footprints/lugia_footprint.1bpp"); - -const u32 gMonStillFrontPic_HoOh[] = INCBIN_U32("graphics/pokemon/front_pics/ho_oh_still_front_pic.4bpp.lz"); -const u32 gMonPalette_HoOh[] = INCBIN_U32("graphics/pokemon/palettes/ho_oh_palette.gbapal.lz"); -const u32 gMonBackPic_HoOh[] = INCBIN_U32("graphics/pokemon/back_pics/ho_oh_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_HoOh[] = INCBIN_U32("graphics/pokemon/palettes/ho_oh_shiny_palette.gbapal.lz"); -const u8 gMonIcon_HoOh[] = INCBIN_U8("graphics/pokemon/icons/ho_oh_icon.4bpp"); -const u8 gMonFootprint_HoOh[] = INCBIN_U8("graphics/pokemon/footprints/ho_oh_footprint.1bpp"); - -const u32 gMonStillFrontPic_Celebi[] = INCBIN_U32("graphics/pokemon/front_pics/celebi_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Celebi[] = INCBIN_U32("graphics/pokemon/palettes/celebi_palette.gbapal.lz"); -const u32 gMonBackPic_Celebi[] = INCBIN_U32("graphics/pokemon/back_pics/celebi_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Celebi[] = INCBIN_U32("graphics/pokemon/palettes/celebi_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Celebi[] = INCBIN_U8("graphics/pokemon/icons/celebi_icon.4bpp"); -const u8 gMonFootprint_Celebi[] = INCBIN_U8("graphics/pokemon/footprints/celebi_footprint.1bpp"); - -const u32 gMonStillFrontPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/front_pics/double_question_mark_still_front_pic.4bpp.lz"); -const u32 gMonPalette_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/palettes/double_question_mark_palette.gbapal.lz"); -const u32 gMonBackPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/back_pics/double_question_mark_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/palettes/double_question_mark_shiny_palette.gbapal.lz"); - -const u32 gMonStillFrontPic_Treecko[] = INCBIN_U32("graphics/pokemon/front_pics/treecko_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Treecko[] = INCBIN_U32("graphics/pokemon/palettes/treecko_palette.gbapal.lz"); -const u32 gMonBackPic_Treecko[] = INCBIN_U32("graphics/pokemon/back_pics/treecko_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Treecko[] = INCBIN_U32("graphics/pokemon/palettes/treecko_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Treecko[] = INCBIN_U8("graphics/pokemon/icons/treecko_icon.4bpp"); -const u8 gMonFootprint_Treecko[] = INCBIN_U8("graphics/pokemon/footprints/treecko_footprint.1bpp"); - -const u32 gMonStillFrontPic_Grovyle[] = INCBIN_U32("graphics/pokemon/front_pics/grovyle_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/palettes/grovyle_palette.gbapal.lz"); -const u32 gMonBackPic_Grovyle[] = INCBIN_U32("graphics/pokemon/back_pics/grovyle_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/palettes/grovyle_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Grovyle[] = INCBIN_U8("graphics/pokemon/icons/grovyle_icon.4bpp"); -const u8 gMonFootprint_Grovyle[] = INCBIN_U8("graphics/pokemon/footprints/grovyle_footprint.1bpp"); - -const u32 gMonStillFrontPic_Sceptile[] = INCBIN_U32("graphics/pokemon/front_pics/sceptile_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/palettes/sceptile_palette.gbapal.lz"); -const u32 gMonBackPic_Sceptile[] = INCBIN_U32("graphics/pokemon/back_pics/sceptile_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/palettes/sceptile_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Sceptile[] = INCBIN_U8("graphics/pokemon/icons/sceptile_icon.4bpp"); -const u8 gMonFootprint_Sceptile[] = INCBIN_U8("graphics/pokemon/footprints/sceptile_footprint.1bpp"); - -const u32 gMonStillFrontPic_Torchic[] = INCBIN_U32("graphics/pokemon/front_pics/torchic_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Torchic[] = INCBIN_U32("graphics/pokemon/palettes/torchic_palette.gbapal.lz"); -const u32 gMonBackPic_Torchic[] = INCBIN_U32("graphics/pokemon/back_pics/torchic_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Torchic[] = INCBIN_U32("graphics/pokemon/palettes/torchic_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Torchic[] = INCBIN_U8("graphics/pokemon/icons/torchic_icon.4bpp"); -const u8 gMonFootprint_Torchic[] = INCBIN_U8("graphics/pokemon/footprints/torchic_footprint.1bpp"); - -const u32 gMonStillFrontPic_Combusken[] = INCBIN_U32("graphics/pokemon/front_pics/combusken_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Combusken[] = INCBIN_U32("graphics/pokemon/palettes/combusken_palette.gbapal.lz"); -const u32 gMonBackPic_Combusken[] = INCBIN_U32("graphics/pokemon/back_pics/combusken_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Combusken[] = INCBIN_U32("graphics/pokemon/palettes/combusken_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Combusken[] = INCBIN_U8("graphics/pokemon/icons/combusken_icon.4bpp"); -const u8 gMonFootprint_Combusken[] = INCBIN_U8("graphics/pokemon/footprints/combusken_footprint.1bpp"); - -const u32 gMonStillFrontPic_Blaziken[] = INCBIN_U32("graphics/pokemon/front_pics/blaziken_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/palettes/blaziken_palette.gbapal.lz"); -const u32 gMonBackPic_Blaziken[] = INCBIN_U32("graphics/pokemon/back_pics/blaziken_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/palettes/blaziken_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Blaziken[] = INCBIN_U8("graphics/pokemon/icons/blaziken_icon.4bpp"); -const u8 gMonFootprint_Blaziken[] = INCBIN_U8("graphics/pokemon/footprints/blaziken_footprint.1bpp"); - -const u32 gMonStillFrontPic_Mudkip[] = INCBIN_U32("graphics/pokemon/front_pics/mudkip_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/palettes/mudkip_palette.gbapal.lz"); -const u32 gMonBackPic_Mudkip[] = INCBIN_U32("graphics/pokemon/back_pics/mudkip_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/palettes/mudkip_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Mudkip[] = INCBIN_U8("graphics/pokemon/icons/mudkip_icon.4bpp"); -const u8 gMonFootprint_Mudkip[] = INCBIN_U8("graphics/pokemon/footprints/mudkip_footprint.1bpp"); - -const u32 gMonStillFrontPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/front_pics/marshtomp_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/palettes/marshtomp_palette.gbapal.lz"); -const u32 gMonBackPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/back_pics/marshtomp_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/palettes/marshtomp_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Marshtomp[] = INCBIN_U8("graphics/pokemon/icons/marshtomp_icon.4bpp"); -const u8 gMonFootprint_Marshtomp[] = INCBIN_U8("graphics/pokemon/footprints/marshtomp_footprint.1bpp"); - -const u32 gMonStillFrontPic_Swampert[] = INCBIN_U32("graphics/pokemon/front_pics/swampert_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Swampert[] = INCBIN_U32("graphics/pokemon/palettes/swampert_palette.gbapal.lz"); -const u32 gMonBackPic_Swampert[] = INCBIN_U32("graphics/pokemon/back_pics/swampert_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Swampert[] = INCBIN_U32("graphics/pokemon/palettes/swampert_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Swampert[] = INCBIN_U8("graphics/pokemon/icons/swampert_icon.4bpp"); -const u8 gMonFootprint_Swampert[] = INCBIN_U8("graphics/pokemon/footprints/swampert_footprint.1bpp"); - -const u32 gMonStillFrontPic_Poochyena[] = INCBIN_U32("graphics/pokemon/front_pics/poochyena_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/palettes/poochyena_palette.gbapal.lz"); -const u32 gMonBackPic_Poochyena[] = INCBIN_U32("graphics/pokemon/back_pics/poochyena_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/palettes/poochyena_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Poochyena[] = INCBIN_U8("graphics/pokemon/icons/poochyena_icon.4bpp"); -const u8 gMonFootprint_Poochyena[] = INCBIN_U8("graphics/pokemon/footprints/poochyena_footprint.1bpp"); - -const u32 gMonStillFrontPic_Mightyena[] = INCBIN_U32("graphics/pokemon/front_pics/mightyena_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/palettes/mightyena_palette.gbapal.lz"); -const u32 gMonBackPic_Mightyena[] = INCBIN_U32("graphics/pokemon/back_pics/mightyena_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/palettes/mightyena_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Mightyena[] = INCBIN_U8("graphics/pokemon/icons/mightyena_icon.4bpp"); -const u8 gMonFootprint_Mightyena[] = INCBIN_U8("graphics/pokemon/footprints/mightyena_footprint.1bpp"); - -const u32 gMonStillFrontPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/front_pics/zigzagoon_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/palettes/zigzagoon_palette.gbapal.lz"); -const u32 gMonBackPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/back_pics/zigzagoon_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/palettes/zigzagoon_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Zigzagoon[] = INCBIN_U8("graphics/pokemon/icons/zigzagoon_icon.4bpp"); -const u8 gMonFootprint_Zigzagoon[] = INCBIN_U8("graphics/pokemon/footprints/zigzagoon_footprint.1bpp"); - -const u32 gMonStillFrontPic_Linoone[] = INCBIN_U32("graphics/pokemon/front_pics/linoone_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Linoone[] = INCBIN_U32("graphics/pokemon/palettes/linoone_palette.gbapal.lz"); -const u32 gMonBackPic_Linoone[] = INCBIN_U32("graphics/pokemon/back_pics/linoone_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Linoone[] = INCBIN_U32("graphics/pokemon/palettes/linoone_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Linoone[] = INCBIN_U8("graphics/pokemon/icons/linoone_icon.4bpp"); -const u8 gMonFootprint_Linoone[] = INCBIN_U8("graphics/pokemon/footprints/linoone_footprint.1bpp"); - -const u32 gMonStillFrontPic_Wurmple[] = INCBIN_U32("graphics/pokemon/front_pics/wurmple_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/palettes/wurmple_palette.gbapal.lz"); -const u32 gMonBackPic_Wurmple[] = INCBIN_U32("graphics/pokemon/back_pics/wurmple_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/palettes/wurmple_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Wurmple[] = INCBIN_U8("graphics/pokemon/icons/wurmple_icon.4bpp"); -const u8 gMonFootprint_Wurmple[] = INCBIN_U8("graphics/pokemon/footprints/wurmple_footprint.1bpp"); - -const u32 gMonStillFrontPic_Silcoon[] = INCBIN_U32("graphics/pokemon/front_pics/silcoon_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/palettes/silcoon_palette.gbapal.lz"); -const u32 gMonBackPic_Silcoon[] = INCBIN_U32("graphics/pokemon/back_pics/silcoon_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/palettes/silcoon_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Silcoon[] = INCBIN_U8("graphics/pokemon/icons/silcoon_icon.4bpp"); -const u8 gMonFootprint_Silcoon[] = INCBIN_U8("graphics/pokemon/footprints/silcoon_footprint.1bpp"); - -const u32 gMonStillFrontPic_Beautifly[] = INCBIN_U32("graphics/pokemon/front_pics/beautifly_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/palettes/beautifly_palette.gbapal.lz"); -const u32 gMonBackPic_Beautifly[] = INCBIN_U32("graphics/pokemon/back_pics/beautifly_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/palettes/beautifly_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Beautifly[] = INCBIN_U8("graphics/pokemon/icons/beautifly_icon.4bpp"); -const u8 gMonFootprint_Beautifly[] = INCBIN_U8("graphics/pokemon/footprints/beautifly_footprint.1bpp"); - -const u32 gMonStillFrontPic_Cascoon[] = INCBIN_U32("graphics/pokemon/front_pics/cascoon_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/palettes/cascoon_palette.gbapal.lz"); -const u32 gMonBackPic_Cascoon[] = INCBIN_U32("graphics/pokemon/back_pics/cascoon_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/palettes/cascoon_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Cascoon[] = INCBIN_U8("graphics/pokemon/icons/cascoon_icon.4bpp"); -const u8 gMonFootprint_Cascoon[] = INCBIN_U8("graphics/pokemon/footprints/cascoon_footprint.1bpp"); - -const u32 gMonStillFrontPic_Dustox[] = INCBIN_U32("graphics/pokemon/front_pics/dustox_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Dustox[] = INCBIN_U32("graphics/pokemon/palettes/dustox_palette.gbapal.lz"); -const u32 gMonBackPic_Dustox[] = INCBIN_U32("graphics/pokemon/back_pics/dustox_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Dustox[] = INCBIN_U32("graphics/pokemon/palettes/dustox_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Dustox[] = INCBIN_U8("graphics/pokemon/icons/dustox_icon.4bpp"); -const u8 gMonFootprint_Dustox[] = INCBIN_U8("graphics/pokemon/footprints/dustox_footprint.1bpp"); - -const u32 gMonStillFrontPic_Lotad[] = INCBIN_U32("graphics/pokemon/front_pics/lotad_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Lotad[] = INCBIN_U32("graphics/pokemon/palettes/lotad_palette.gbapal.lz"); -const u32 gMonBackPic_Lotad[] = INCBIN_U32("graphics/pokemon/back_pics/lotad_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Lotad[] = INCBIN_U32("graphics/pokemon/palettes/lotad_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Lotad[] = INCBIN_U8("graphics/pokemon/icons/lotad_icon.4bpp"); -const u8 gMonFootprint_Lotad[] = INCBIN_U8("graphics/pokemon/footprints/lotad_footprint.1bpp"); - -const u32 gMonStillFrontPic_Lombre[] = INCBIN_U32("graphics/pokemon/front_pics/lombre_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Lombre[] = INCBIN_U32("graphics/pokemon/palettes/lombre_palette.gbapal.lz"); -const u32 gMonBackPic_Lombre[] = INCBIN_U32("graphics/pokemon/back_pics/lombre_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Lombre[] = INCBIN_U32("graphics/pokemon/palettes/lombre_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Lombre[] = INCBIN_U8("graphics/pokemon/icons/lombre_icon.4bpp"); -const u8 gMonFootprint_Lombre[] = INCBIN_U8("graphics/pokemon/footprints/lombre_footprint.1bpp"); - -const u32 gMonStillFrontPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/front_pics/ludicolo_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/palettes/ludicolo_palette.gbapal.lz"); -const u32 gMonBackPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/back_pics/ludicolo_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/palettes/ludicolo_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Ludicolo[] = INCBIN_U8("graphics/pokemon/icons/ludicolo_icon.4bpp"); -const u8 gMonFootprint_Ludicolo[] = INCBIN_U8("graphics/pokemon/footprints/ludicolo_footprint.1bpp"); - -const u32 gMonStillFrontPic_Seedot[] = INCBIN_U32("graphics/pokemon/front_pics/seedot_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Seedot[] = INCBIN_U32("graphics/pokemon/palettes/seedot_palette.gbapal.lz"); -const u32 gMonBackPic_Seedot[] = INCBIN_U32("graphics/pokemon/back_pics/seedot_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Seedot[] = INCBIN_U32("graphics/pokemon/palettes/seedot_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Seedot[] = INCBIN_U8("graphics/pokemon/icons/seedot_icon.4bpp"); -const u8 gMonFootprint_Seedot[] = INCBIN_U8("graphics/pokemon/footprints/seedot_footprint.1bpp"); - -const u32 gMonStillFrontPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/front_pics/nuzleaf_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/palettes/nuzleaf_palette.gbapal.lz"); -const u32 gMonBackPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/back_pics/nuzleaf_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/palettes/nuzleaf_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Nuzleaf[] = INCBIN_U8("graphics/pokemon/icons/nuzleaf_icon.4bpp"); -const u8 gMonFootprint_Nuzleaf[] = INCBIN_U8("graphics/pokemon/footprints/nuzleaf_footprint.1bpp"); - -const u32 gMonStillFrontPic_Shiftry[] = INCBIN_U32("graphics/pokemon/front_pics/shiftry_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/palettes/shiftry_palette.gbapal.lz"); -const u32 gMonBackPic_Shiftry[] = INCBIN_U32("graphics/pokemon/back_pics/shiftry_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/palettes/shiftry_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Shiftry[] = INCBIN_U8("graphics/pokemon/icons/shiftry_icon.4bpp"); -const u8 gMonFootprint_Shiftry[] = INCBIN_U8("graphics/pokemon/footprints/shiftry_footprint.1bpp"); - -const u32 gMonStillFrontPic_Nincada[] = INCBIN_U32("graphics/pokemon/front_pics/nincada_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Nincada[] = INCBIN_U32("graphics/pokemon/palettes/nincada_palette.gbapal.lz"); -const u32 gMonBackPic_Nincada[] = INCBIN_U32("graphics/pokemon/back_pics/nincada_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Nincada[] = INCBIN_U32("graphics/pokemon/palettes/nincada_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Nincada[] = INCBIN_U8("graphics/pokemon/icons/nincada_icon.4bpp"); -const u8 gMonFootprint_Nincada[] = INCBIN_U8("graphics/pokemon/footprints/nincada_footprint.1bpp"); - -const u32 gMonStillFrontPic_Ninjask[] = INCBIN_U32("graphics/pokemon/front_pics/ninjask_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/palettes/ninjask_palette.gbapal.lz"); -const u32 gMonBackPic_Ninjask[] = INCBIN_U32("graphics/pokemon/back_pics/ninjask_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/palettes/ninjask_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Ninjask[] = INCBIN_U8("graphics/pokemon/icons/ninjask_icon.4bpp"); -const u8 gMonFootprint_Ninjask[] = INCBIN_U8("graphics/pokemon/footprints/ninjask_footprint.1bpp"); - -const u32 gMonStillFrontPic_Shedinja[] = INCBIN_U32("graphics/pokemon/front_pics/shedinja_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/palettes/shedinja_palette.gbapal.lz"); -const u32 gMonBackPic_Shedinja[] = INCBIN_U32("graphics/pokemon/back_pics/shedinja_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/palettes/shedinja_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Shedinja[] = INCBIN_U8("graphics/pokemon/icons/shedinja_icon.4bpp"); -const u8 gMonFootprint_Shedinja[] = INCBIN_U8("graphics/pokemon/footprints/shedinja_footprint.1bpp"); - -const u32 gMonStillFrontPic_Taillow[] = INCBIN_U32("graphics/pokemon/front_pics/taillow_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Taillow[] = INCBIN_U32("graphics/pokemon/palettes/taillow_palette.gbapal.lz"); -const u32 gMonBackPic_Taillow[] = INCBIN_U32("graphics/pokemon/back_pics/taillow_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Taillow[] = INCBIN_U32("graphics/pokemon/palettes/taillow_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Taillow[] = INCBIN_U8("graphics/pokemon/icons/taillow_icon.4bpp"); -const u8 gMonFootprint_Taillow[] = INCBIN_U8("graphics/pokemon/footprints/taillow_footprint.1bpp"); - -const u32 gMonStillFrontPic_Swellow[] = INCBIN_U32("graphics/pokemon/front_pics/swellow_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Swellow[] = INCBIN_U32("graphics/pokemon/palettes/swellow_palette.gbapal.lz"); -const u32 gMonBackPic_Swellow[] = INCBIN_U32("graphics/pokemon/back_pics/swellow_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Swellow[] = INCBIN_U32("graphics/pokemon/palettes/swellow_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Swellow[] = INCBIN_U8("graphics/pokemon/icons/swellow_icon.4bpp"); -const u8 gMonFootprint_Swellow[] = INCBIN_U8("graphics/pokemon/footprints/swellow_footprint.1bpp"); - -const u32 gMonStillFrontPic_Shroomish[] = INCBIN_U32("graphics/pokemon/front_pics/shroomish_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/palettes/shroomish_palette.gbapal.lz"); -const u32 gMonBackPic_Shroomish[] = INCBIN_U32("graphics/pokemon/back_pics/shroomish_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/palettes/shroomish_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Shroomish[] = INCBIN_U8("graphics/pokemon/icons/shroomish_icon.4bpp"); -const u8 gMonFootprint_Shroomish[] = INCBIN_U8("graphics/pokemon/footprints/shroomish_footprint.1bpp"); - -const u32 gMonStillFrontPic_Breloom[] = INCBIN_U32("graphics/pokemon/front_pics/breloom_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Breloom[] = INCBIN_U32("graphics/pokemon/palettes/breloom_palette.gbapal.lz"); -const u32 gMonBackPic_Breloom[] = INCBIN_U32("graphics/pokemon/back_pics/breloom_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Breloom[] = INCBIN_U32("graphics/pokemon/palettes/breloom_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Breloom[] = INCBIN_U8("graphics/pokemon/icons/breloom_icon.4bpp"); -const u8 gMonFootprint_Breloom[] = INCBIN_U8("graphics/pokemon/footprints/breloom_footprint.1bpp"); - -const u32 gMonStillFrontPic_Spinda[] = INCBIN_U32("graphics/pokemon/front_pics/spinda_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Spinda[] = INCBIN_U32("graphics/pokemon/palettes/spinda_palette.gbapal.lz"); -const u32 gMonBackPic_Spinda[] = INCBIN_U32("graphics/pokemon/back_pics/spinda_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Spinda[] = INCBIN_U32("graphics/pokemon/palettes/spinda_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Spinda[] = INCBIN_U8("graphics/pokemon/icons/spinda_icon.4bpp"); -const u8 gMonFootprint_Spinda[] = INCBIN_U8("graphics/pokemon/footprints/spinda_footprint.1bpp"); - -const u32 gMonStillFrontPic_Wingull[] = INCBIN_U32("graphics/pokemon/front_pics/wingull_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Wingull[] = INCBIN_U32("graphics/pokemon/palettes/wingull_palette.gbapal.lz"); -const u32 gMonBackPic_Wingull[] = INCBIN_U32("graphics/pokemon/back_pics/wingull_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Wingull[] = INCBIN_U32("graphics/pokemon/palettes/wingull_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Wingull[] = INCBIN_U8("graphics/pokemon/icons/wingull_icon.4bpp"); -const u8 gMonFootprint_Wingull[] = INCBIN_U8("graphics/pokemon/footprints/wingull_footprint.1bpp"); - -const u32 gMonStillFrontPic_Pelipper[] = INCBIN_U32("graphics/pokemon/front_pics/pelipper_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/palettes/pelipper_palette.gbapal.lz"); -const u32 gMonBackPic_Pelipper[] = INCBIN_U32("graphics/pokemon/back_pics/pelipper_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/palettes/pelipper_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Pelipper[] = INCBIN_U8("graphics/pokemon/icons/pelipper_icon.4bpp"); -const u8 gMonFootprint_Pelipper[] = INCBIN_U8("graphics/pokemon/footprints/pelipper_footprint.1bpp"); - -const u32 gMonStillFrontPic_Surskit[] = INCBIN_U32("graphics/pokemon/front_pics/surskit_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Surskit[] = INCBIN_U32("graphics/pokemon/palettes/surskit_palette.gbapal.lz"); -const u32 gMonBackPic_Surskit[] = INCBIN_U32("graphics/pokemon/back_pics/surskit_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Surskit[] = INCBIN_U32("graphics/pokemon/palettes/surskit_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Surskit[] = INCBIN_U8("graphics/pokemon/icons/surskit_icon.4bpp"); -const u8 gMonFootprint_Surskit[] = INCBIN_U8("graphics/pokemon/footprints/surskit_footprint.1bpp"); - -const u32 gMonStillFrontPic_Masquerain[] = INCBIN_U32("graphics/pokemon/front_pics/masquerain_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/palettes/masquerain_palette.gbapal.lz"); -const u32 gMonBackPic_Masquerain[] = INCBIN_U32("graphics/pokemon/back_pics/masquerain_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/palettes/masquerain_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Masquerain[] = INCBIN_U8("graphics/pokemon/icons/masquerain_icon.4bpp"); -const u8 gMonFootprint_Masquerain[] = INCBIN_U8("graphics/pokemon/footprints/masquerain_footprint.1bpp"); - -const u32 gMonStillFrontPic_Wailmer[] = INCBIN_U32("graphics/pokemon/front_pics/wailmer_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/palettes/wailmer_palette.gbapal.lz"); -const u32 gMonBackPic_Wailmer[] = INCBIN_U32("graphics/pokemon/back_pics/wailmer_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/palettes/wailmer_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Wailmer[] = INCBIN_U8("graphics/pokemon/icons/wailmer_icon.4bpp"); -const u8 gMonFootprint_Wailmer[] = INCBIN_U8("graphics/pokemon/footprints/wailmer_footprint.1bpp"); - -const u32 gMonStillFrontPic_Wailord[] = INCBIN_U32("graphics/pokemon/front_pics/wailord_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Wailord[] = INCBIN_U32("graphics/pokemon/palettes/wailord_palette.gbapal.lz"); -const u32 gMonBackPic_Wailord[] = INCBIN_U32("graphics/pokemon/back_pics/wailord_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Wailord[] = INCBIN_U32("graphics/pokemon/palettes/wailord_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Wailord[] = INCBIN_U8("graphics/pokemon/icons/wailord_icon.4bpp"); -const u8 gMonFootprint_Wailord[] = INCBIN_U8("graphics/pokemon/footprints/wailord_footprint.1bpp"); - -const u32 gMonStillFrontPic_Skitty[] = INCBIN_U32("graphics/pokemon/front_pics/skitty_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Skitty[] = INCBIN_U32("graphics/pokemon/palettes/skitty_palette.gbapal.lz"); -const u32 gMonBackPic_Skitty[] = INCBIN_U32("graphics/pokemon/back_pics/skitty_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Skitty[] = INCBIN_U32("graphics/pokemon/palettes/skitty_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Skitty[] = INCBIN_U8("graphics/pokemon/icons/skitty_icon.4bpp"); -const u8 gMonFootprint_Skitty[] = INCBIN_U8("graphics/pokemon/footprints/skitty_footprint.1bpp"); - -const u32 gMonStillFrontPic_Delcatty[] = INCBIN_U32("graphics/pokemon/front_pics/delcatty_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/palettes/delcatty_palette.gbapal.lz"); -const u32 gMonBackPic_Delcatty[] = INCBIN_U32("graphics/pokemon/back_pics/delcatty_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/palettes/delcatty_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Delcatty[] = INCBIN_U8("graphics/pokemon/icons/delcatty_icon.4bpp"); -const u8 gMonFootprint_Delcatty[] = INCBIN_U8("graphics/pokemon/footprints/delcatty_footprint.1bpp"); - -const u32 gMonStillFrontPic_Kecleon[] = INCBIN_U32("graphics/pokemon/front_pics/kecleon_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/palettes/kecleon_palette.gbapal.lz"); -const u32 gMonBackPic_Kecleon[] = INCBIN_U32("graphics/pokemon/back_pics/kecleon_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/palettes/kecleon_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Kecleon[] = INCBIN_U8("graphics/pokemon/icons/kecleon_icon.4bpp"); -const u8 gMonFootprint_Kecleon[] = INCBIN_U8("graphics/pokemon/footprints/kecleon_footprint.1bpp"); - -const u32 gMonStillFrontPic_Baltoy[] = INCBIN_U32("graphics/pokemon/front_pics/baltoy_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/palettes/baltoy_palette.gbapal.lz"); -const u32 gMonBackPic_Baltoy[] = INCBIN_U32("graphics/pokemon/back_pics/baltoy_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/palettes/baltoy_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Baltoy[] = INCBIN_U8("graphics/pokemon/icons/baltoy_icon.4bpp"); -const u8 gMonFootprint_Baltoy[] = INCBIN_U8("graphics/pokemon/footprints/baltoy_footprint.1bpp"); - -const u32 gMonStillFrontPic_Claydol[] = INCBIN_U32("graphics/pokemon/front_pics/claydol_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Claydol[] = INCBIN_U32("graphics/pokemon/palettes/claydol_palette.gbapal.lz"); -const u32 gMonBackPic_Claydol[] = INCBIN_U32("graphics/pokemon/back_pics/claydol_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Claydol[] = INCBIN_U32("graphics/pokemon/palettes/claydol_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Claydol[] = INCBIN_U8("graphics/pokemon/icons/claydol_icon.4bpp"); -const u8 gMonFootprint_Claydol[] = INCBIN_U8("graphics/pokemon/footprints/claydol_footprint.1bpp"); - -const u32 gMonStillFrontPic_Nosepass[] = INCBIN_U32("graphics/pokemon/front_pics/nosepass_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/palettes/nosepass_palette.gbapal.lz"); -const u32 gMonBackPic_Nosepass[] = INCBIN_U32("graphics/pokemon/back_pics/nosepass_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/palettes/nosepass_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Nosepass[] = INCBIN_U8("graphics/pokemon/icons/nosepass_icon.4bpp"); -const u8 gMonFootprint_Nosepass[] = INCBIN_U8("graphics/pokemon/footprints/nosepass_footprint.1bpp"); - -const u32 gMonStillFrontPic_Torkoal[] = INCBIN_U32("graphics/pokemon/front_pics/torkoal_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/palettes/torkoal_palette.gbapal.lz"); -const u32 gMonBackPic_Torkoal[] = INCBIN_U32("graphics/pokemon/back_pics/torkoal_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/palettes/torkoal_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Torkoal[] = INCBIN_U8("graphics/pokemon/icons/torkoal_icon.4bpp"); -const u8 gMonFootprint_Torkoal[] = INCBIN_U8("graphics/pokemon/footprints/torkoal_footprint.1bpp"); - -const u32 gMonStillFrontPic_Sableye[] = INCBIN_U32("graphics/pokemon/front_pics/sableye_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Sableye[] = INCBIN_U32("graphics/pokemon/palettes/sableye_palette.gbapal.lz"); -const u32 gMonBackPic_Sableye[] = INCBIN_U32("graphics/pokemon/back_pics/sableye_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Sableye[] = INCBIN_U32("graphics/pokemon/palettes/sableye_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Sableye[] = INCBIN_U8("graphics/pokemon/icons/sableye_icon.4bpp"); -const u8 gMonFootprint_Sableye[] = INCBIN_U8("graphics/pokemon/footprints/sableye_footprint.1bpp"); - -const u32 gMonStillFrontPic_Barboach[] = INCBIN_U32("graphics/pokemon/front_pics/barboach_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Barboach[] = INCBIN_U32("graphics/pokemon/palettes/barboach_palette.gbapal.lz"); -const u32 gMonBackPic_Barboach[] = INCBIN_U32("graphics/pokemon/back_pics/barboach_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Barboach[] = INCBIN_U32("graphics/pokemon/palettes/barboach_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Barboach[] = INCBIN_U8("graphics/pokemon/icons/barboach_icon.4bpp"); -const u8 gMonFootprint_Barboach[] = INCBIN_U8("graphics/pokemon/footprints/barboach_footprint.1bpp"); - -const u32 gMonStillFrontPic_Whiscash[] = INCBIN_U32("graphics/pokemon/front_pics/whiscash_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/palettes/whiscash_palette.gbapal.lz"); -const u32 gMonBackPic_Whiscash[] = INCBIN_U32("graphics/pokemon/back_pics/whiscash_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/palettes/whiscash_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Whiscash[] = INCBIN_U8("graphics/pokemon/icons/whiscash_icon.4bpp"); -const u8 gMonFootprint_Whiscash[] = INCBIN_U8("graphics/pokemon/footprints/whiscash_footprint.1bpp"); - -const u32 gMonStillFrontPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/front_pics/luvdisc_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/palettes/luvdisc_palette.gbapal.lz"); -const u32 gMonBackPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/back_pics/luvdisc_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/palettes/luvdisc_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Luvdisc[] = INCBIN_U8("graphics/pokemon/icons/luvdisc_icon.4bpp"); -const u8 gMonFootprint_Luvdisc[] = INCBIN_U8("graphics/pokemon/footprints/luvdisc_footprint.1bpp"); - -const u32 gMonStillFrontPic_Corphish[] = INCBIN_U32("graphics/pokemon/front_pics/corphish_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Corphish[] = INCBIN_U32("graphics/pokemon/palettes/corphish_palette.gbapal.lz"); -const u32 gMonBackPic_Corphish[] = INCBIN_U32("graphics/pokemon/back_pics/corphish_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Corphish[] = INCBIN_U32("graphics/pokemon/palettes/corphish_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Corphish[] = INCBIN_U8("graphics/pokemon/icons/corphish_icon.4bpp"); -const u8 gMonFootprint_Corphish[] = INCBIN_U8("graphics/pokemon/footprints/corphish_footprint.1bpp"); - -const u32 gMonStillFrontPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/front_pics/crawdaunt_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/palettes/crawdaunt_palette.gbapal.lz"); -const u32 gMonBackPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/back_pics/crawdaunt_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/palettes/crawdaunt_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Crawdaunt[] = INCBIN_U8("graphics/pokemon/icons/crawdaunt_icon.4bpp"); -const u8 gMonFootprint_Crawdaunt[] = INCBIN_U8("graphics/pokemon/footprints/crawdaunt_footprint.1bpp"); - -const u32 gMonStillFrontPic_Feebas[] = INCBIN_U32("graphics/pokemon/front_pics/feebas_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Feebas[] = INCBIN_U32("graphics/pokemon/palettes/feebas_palette.gbapal.lz"); -const u32 gMonBackPic_Feebas[] = INCBIN_U32("graphics/pokemon/back_pics/feebas_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Feebas[] = INCBIN_U32("graphics/pokemon/palettes/feebas_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Feebas[] = INCBIN_U8("graphics/pokemon/icons/feebas_icon.4bpp"); -const u8 gMonFootprint_Feebas[] = INCBIN_U8("graphics/pokemon/footprints/feebas_footprint.1bpp"); - -const u32 gMonStillFrontPic_Milotic[] = INCBIN_U32("graphics/pokemon/front_pics/milotic_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Milotic[] = INCBIN_U32("graphics/pokemon/palettes/milotic_palette.gbapal.lz"); -const u32 gMonBackPic_Milotic[] = INCBIN_U32("graphics/pokemon/back_pics/milotic_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Milotic[] = INCBIN_U32("graphics/pokemon/palettes/milotic_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Milotic[] = INCBIN_U8("graphics/pokemon/icons/milotic_icon.4bpp"); -const u8 gMonFootprint_Milotic[] = INCBIN_U8("graphics/pokemon/footprints/milotic_footprint.1bpp"); - -const u32 gMonStillFrontPic_Carvanha[] = INCBIN_U32("graphics/pokemon/front_pics/carvanha_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/palettes/carvanha_palette.gbapal.lz"); -const u32 gMonBackPic_Carvanha[] = INCBIN_U32("graphics/pokemon/back_pics/carvanha_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/palettes/carvanha_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Carvanha[] = INCBIN_U8("graphics/pokemon/icons/carvanha_icon.4bpp"); -const u8 gMonFootprint_Carvanha[] = INCBIN_U8("graphics/pokemon/footprints/carvanha_footprint.1bpp"); - -const u32 gMonStillFrontPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/front_pics/sharpedo_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/palettes/sharpedo_palette.gbapal.lz"); -const u32 gMonBackPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/back_pics/sharpedo_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/palettes/sharpedo_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Sharpedo[] = INCBIN_U8("graphics/pokemon/icons/sharpedo_icon.4bpp"); -const u8 gMonFootprint_Sharpedo[] = INCBIN_U8("graphics/pokemon/footprints/sharpedo_footprint.1bpp"); - -const u32 gMonStillFrontPic_Trapinch[] = INCBIN_U32("graphics/pokemon/front_pics/trapinch_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/palettes/trapinch_palette.gbapal.lz"); -const u32 gMonBackPic_Trapinch[] = INCBIN_U32("graphics/pokemon/back_pics/trapinch_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/palettes/trapinch_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Trapinch[] = INCBIN_U8("graphics/pokemon/icons/trapinch_icon.4bpp"); -const u8 gMonFootprint_Trapinch[] = INCBIN_U8("graphics/pokemon/footprints/trapinch_footprint.1bpp"); - -const u32 gMonStillFrontPic_Vibrava[] = INCBIN_U32("graphics/pokemon/front_pics/vibrava_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/palettes/vibrava_palette.gbapal.lz"); -const u32 gMonBackPic_Vibrava[] = INCBIN_U32("graphics/pokemon/back_pics/vibrava_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/palettes/vibrava_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Vibrava[] = INCBIN_U8("graphics/pokemon/icons/vibrava_icon.4bpp"); -const u8 gMonFootprint_Vibrava[] = INCBIN_U8("graphics/pokemon/footprints/vibrava_footprint.1bpp"); - -const u32 gMonStillFrontPic_Flygon[] = INCBIN_U32("graphics/pokemon/front_pics/flygon_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Flygon[] = INCBIN_U32("graphics/pokemon/palettes/flygon_palette.gbapal.lz"); -const u32 gMonBackPic_Flygon[] = INCBIN_U32("graphics/pokemon/back_pics/flygon_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Flygon[] = INCBIN_U32("graphics/pokemon/palettes/flygon_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Flygon[] = INCBIN_U8("graphics/pokemon/icons/flygon_icon.4bpp"); -const u8 gMonFootprint_Flygon[] = INCBIN_U8("graphics/pokemon/footprints/flygon_footprint.1bpp"); - -const u32 gMonStillFrontPic_Makuhita[] = INCBIN_U32("graphics/pokemon/front_pics/makuhita_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/palettes/makuhita_palette.gbapal.lz"); -const u32 gMonBackPic_Makuhita[] = INCBIN_U32("graphics/pokemon/back_pics/makuhita_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/palettes/makuhita_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Makuhita[] = INCBIN_U8("graphics/pokemon/icons/makuhita_icon.4bpp"); -const u8 gMonFootprint_Makuhita[] = INCBIN_U8("graphics/pokemon/footprints/makuhita_footprint.1bpp"); - -const u32 gMonStillFrontPic_Hariyama[] = INCBIN_U32("graphics/pokemon/front_pics/hariyama_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/palettes/hariyama_palette.gbapal.lz"); -const u32 gMonBackPic_Hariyama[] = INCBIN_U32("graphics/pokemon/back_pics/hariyama_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/palettes/hariyama_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Hariyama[] = INCBIN_U8("graphics/pokemon/icons/hariyama_icon.4bpp"); -const u8 gMonFootprint_Hariyama[] = INCBIN_U8("graphics/pokemon/footprints/hariyama_footprint.1bpp"); - -const u32 gMonStillFrontPic_Electrike[] = INCBIN_U32("graphics/pokemon/front_pics/electrike_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Electrike[] = INCBIN_U32("graphics/pokemon/palettes/electrike_palette.gbapal.lz"); -const u32 gMonBackPic_Electrike[] = INCBIN_U32("graphics/pokemon/back_pics/electrike_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Electrike[] = INCBIN_U32("graphics/pokemon/palettes/electrike_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Electrike[] = INCBIN_U8("graphics/pokemon/icons/electrike_icon.4bpp"); -const u8 gMonFootprint_Electrike[] = INCBIN_U8("graphics/pokemon/footprints/electrike_footprint.1bpp"); - -const u32 gMonStillFrontPic_Manectric[] = INCBIN_U32("graphics/pokemon/front_pics/manectric_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Manectric[] = INCBIN_U32("graphics/pokemon/palettes/manectric_palette.gbapal.lz"); -const u32 gMonBackPic_Manectric[] = INCBIN_U32("graphics/pokemon/back_pics/manectric_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Manectric[] = INCBIN_U32("graphics/pokemon/palettes/manectric_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Manectric[] = INCBIN_U8("graphics/pokemon/icons/manectric_icon.4bpp"); -const u8 gMonFootprint_Manectric[] = INCBIN_U8("graphics/pokemon/footprints/manectric_footprint.1bpp"); - -const u32 gMonStillFrontPic_Numel[] = INCBIN_U32("graphics/pokemon/front_pics/numel_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Numel[] = INCBIN_U32("graphics/pokemon/palettes/numel_palette.gbapal.lz"); -const u32 gMonBackPic_Numel[] = INCBIN_U32("graphics/pokemon/back_pics/numel_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Numel[] = INCBIN_U32("graphics/pokemon/palettes/numel_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Numel[] = INCBIN_U8("graphics/pokemon/icons/numel_icon.4bpp"); -const u8 gMonFootprint_Numel[] = INCBIN_U8("graphics/pokemon/footprints/numel_footprint.1bpp"); - -const u32 gMonStillFrontPic_Camerupt[] = INCBIN_U32("graphics/pokemon/front_pics/camerupt_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/palettes/camerupt_palette.gbapal.lz"); -const u32 gMonBackPic_Camerupt[] = INCBIN_U32("graphics/pokemon/back_pics/camerupt_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/palettes/camerupt_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Camerupt[] = INCBIN_U8("graphics/pokemon/icons/camerupt_icon.4bpp"); -const u8 gMonFootprint_Camerupt[] = INCBIN_U8("graphics/pokemon/footprints/camerupt_footprint.1bpp"); - -const u32 gMonStillFrontPic_Spheal[] = INCBIN_U32("graphics/pokemon/front_pics/spheal_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Spheal[] = INCBIN_U32("graphics/pokemon/palettes/spheal_palette.gbapal.lz"); -const u32 gMonBackPic_Spheal[] = INCBIN_U32("graphics/pokemon/back_pics/spheal_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Spheal[] = INCBIN_U32("graphics/pokemon/palettes/spheal_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Spheal[] = INCBIN_U8("graphics/pokemon/icons/spheal_icon.4bpp"); -const u8 gMonFootprint_Spheal[] = INCBIN_U8("graphics/pokemon/footprints/spheal_footprint.1bpp"); - -const u32 gMonStillFrontPic_Sealeo[] = INCBIN_U32("graphics/pokemon/front_pics/sealeo_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/palettes/sealeo_palette.gbapal.lz"); -const u32 gMonBackPic_Sealeo[] = INCBIN_U32("graphics/pokemon/back_pics/sealeo_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/palettes/sealeo_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Sealeo[] = INCBIN_U8("graphics/pokemon/icons/sealeo_icon.4bpp"); -const u8 gMonFootprint_Sealeo[] = INCBIN_U8("graphics/pokemon/footprints/sealeo_footprint.1bpp"); - -const u32 gMonStillFrontPic_Walrein[] = INCBIN_U32("graphics/pokemon/front_pics/walrein_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Walrein[] = INCBIN_U32("graphics/pokemon/palettes/walrein_palette.gbapal.lz"); -const u32 gMonBackPic_Walrein[] = INCBIN_U32("graphics/pokemon/back_pics/walrein_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Walrein[] = INCBIN_U32("graphics/pokemon/palettes/walrein_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Walrein[] = INCBIN_U8("graphics/pokemon/icons/walrein_icon.4bpp"); -const u8 gMonFootprint_Walrein[] = INCBIN_U8("graphics/pokemon/footprints/walrein_footprint.1bpp"); - -const u32 gMonStillFrontPic_Cacnea[] = INCBIN_U32("graphics/pokemon/front_pics/cacnea_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/palettes/cacnea_palette.gbapal.lz"); -const u32 gMonBackPic_Cacnea[] = INCBIN_U32("graphics/pokemon/back_pics/cacnea_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/palettes/cacnea_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Cacnea[] = INCBIN_U8("graphics/pokemon/icons/cacnea_icon.4bpp"); -const u8 gMonFootprint_Cacnea[] = INCBIN_U8("graphics/pokemon/footprints/cacnea_footprint.1bpp"); - -const u32 gMonStillFrontPic_Cacturne[] = INCBIN_U32("graphics/pokemon/front_pics/cacturne_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/palettes/cacturne_palette.gbapal.lz"); -const u32 gMonBackPic_Cacturne[] = INCBIN_U32("graphics/pokemon/back_pics/cacturne_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/palettes/cacturne_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Cacturne[] = INCBIN_U8("graphics/pokemon/icons/cacturne_icon.4bpp"); -const u8 gMonFootprint_Cacturne[] = INCBIN_U8("graphics/pokemon/footprints/cacturne_footprint.1bpp"); - -const u32 gMonStillFrontPic_Snorunt[] = INCBIN_U32("graphics/pokemon/front_pics/snorunt_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/palettes/snorunt_palette.gbapal.lz"); -const u32 gMonBackPic_Snorunt[] = INCBIN_U32("graphics/pokemon/back_pics/snorunt_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/palettes/snorunt_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Snorunt[] = INCBIN_U8("graphics/pokemon/icons/snorunt_icon.4bpp"); -const u8 gMonFootprint_Snorunt[] = INCBIN_U8("graphics/pokemon/footprints/snorunt_footprint.1bpp"); - -const u32 gMonStillFrontPic_Glalie[] = INCBIN_U32("graphics/pokemon/front_pics/glalie_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Glalie[] = INCBIN_U32("graphics/pokemon/palettes/glalie_palette.gbapal.lz"); -const u32 gMonBackPic_Glalie[] = INCBIN_U32("graphics/pokemon/back_pics/glalie_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Glalie[] = INCBIN_U32("graphics/pokemon/palettes/glalie_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Glalie[] = INCBIN_U8("graphics/pokemon/icons/glalie_icon.4bpp"); -const u8 gMonFootprint_Glalie[] = INCBIN_U8("graphics/pokemon/footprints/glalie_footprint.1bpp"); - -const u32 gMonStillFrontPic_Lunatone[] = INCBIN_U32("graphics/pokemon/front_pics/lunatone_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/palettes/lunatone_palette.gbapal.lz"); -const u32 gMonBackPic_Lunatone[] = INCBIN_U32("graphics/pokemon/back_pics/lunatone_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/palettes/lunatone_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Lunatone[] = INCBIN_U8("graphics/pokemon/icons/lunatone_icon.4bpp"); -const u8 gMonFootprint_Lunatone[] = INCBIN_U8("graphics/pokemon/footprints/lunatone_footprint.1bpp"); - -const u32 gMonStillFrontPic_Solrock[] = INCBIN_U32("graphics/pokemon/front_pics/solrock_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Solrock[] = INCBIN_U32("graphics/pokemon/palettes/solrock_palette.gbapal.lz"); -const u32 gMonBackPic_Solrock[] = INCBIN_U32("graphics/pokemon/back_pics/solrock_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Solrock[] = INCBIN_U32("graphics/pokemon/palettes/solrock_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Solrock[] = INCBIN_U8("graphics/pokemon/icons/solrock_icon.4bpp"); -const u8 gMonFootprint_Solrock[] = INCBIN_U8("graphics/pokemon/footprints/solrock_footprint.1bpp"); - -const u32 gMonStillFrontPic_Azurill[] = INCBIN_U32("graphics/pokemon/front_pics/azurill_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Azurill[] = INCBIN_U32("graphics/pokemon/palettes/azurill_palette.gbapal.lz"); -const u32 gMonBackPic_Azurill[] = INCBIN_U32("graphics/pokemon/back_pics/azurill_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Azurill[] = INCBIN_U32("graphics/pokemon/palettes/azurill_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Azurill[] = INCBIN_U8("graphics/pokemon/icons/azurill_icon.4bpp"); -const u8 gMonFootprint_Azurill[] = INCBIN_U8("graphics/pokemon/footprints/azurill_footprint.1bpp"); - -const u32 gMonStillFrontPic_Spoink[] = INCBIN_U32("graphics/pokemon/front_pics/spoink_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Spoink[] = INCBIN_U32("graphics/pokemon/palettes/spoink_palette.gbapal.lz"); -const u32 gMonBackPic_Spoink[] = INCBIN_U32("graphics/pokemon/back_pics/spoink_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Spoink[] = INCBIN_U32("graphics/pokemon/palettes/spoink_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Spoink[] = INCBIN_U8("graphics/pokemon/icons/spoink_icon.4bpp"); -const u8 gMonFootprint_Spoink[] = INCBIN_U8("graphics/pokemon/footprints/spoink_footprint.1bpp"); - -const u32 gMonStillFrontPic_Grumpig[] = INCBIN_U32("graphics/pokemon/front_pics/grumpig_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/palettes/grumpig_palette.gbapal.lz"); -const u32 gMonBackPic_Grumpig[] = INCBIN_U32("graphics/pokemon/back_pics/grumpig_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/palettes/grumpig_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Grumpig[] = INCBIN_U8("graphics/pokemon/icons/grumpig_icon.4bpp"); -const u8 gMonFootprint_Grumpig[] = INCBIN_U8("graphics/pokemon/footprints/grumpig_footprint.1bpp"); - -const u32 gMonStillFrontPic_Plusle[] = INCBIN_U32("graphics/pokemon/front_pics/plusle_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Plusle[] = INCBIN_U32("graphics/pokemon/palettes/plusle_palette.gbapal.lz"); -const u32 gMonBackPic_Plusle[] = INCBIN_U32("graphics/pokemon/back_pics/plusle_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Plusle[] = INCBIN_U32("graphics/pokemon/palettes/plusle_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Plusle[] = INCBIN_U8("graphics/pokemon/icons/plusle_icon.4bpp"); -const u8 gMonFootprint_Plusle[] = INCBIN_U8("graphics/pokemon/footprints/plusle_footprint.1bpp"); - -const u32 gMonStillFrontPic_Minun[] = INCBIN_U32("graphics/pokemon/front_pics/minun_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Minun[] = INCBIN_U32("graphics/pokemon/palettes/minun_palette.gbapal.lz"); -const u32 gMonBackPic_Minun[] = INCBIN_U32("graphics/pokemon/back_pics/minun_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Minun[] = INCBIN_U32("graphics/pokemon/palettes/minun_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Minun[] = INCBIN_U8("graphics/pokemon/icons/minun_icon.4bpp"); -const u8 gMonFootprint_Minun[] = INCBIN_U8("graphics/pokemon/footprints/minun_footprint.1bpp"); - -const u32 gMonStillFrontPic_Mawile[] = INCBIN_U32("graphics/pokemon/front_pics/mawile_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Mawile[] = INCBIN_U32("graphics/pokemon/palettes/mawile_palette.gbapal.lz"); -const u32 gMonBackPic_Mawile[] = INCBIN_U32("graphics/pokemon/back_pics/mawile_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Mawile[] = INCBIN_U32("graphics/pokemon/palettes/mawile_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Mawile[] = INCBIN_U8("graphics/pokemon/icons/mawile_icon.4bpp"); -const u8 gMonFootprint_Mawile[] = INCBIN_U8("graphics/pokemon/footprints/mawile_footprint.1bpp"); - -const u32 gMonStillFrontPic_Meditite[] = INCBIN_U32("graphics/pokemon/front_pics/meditite_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Meditite[] = INCBIN_U32("graphics/pokemon/palettes/meditite_palette.gbapal.lz"); -const u32 gMonBackPic_Meditite[] = INCBIN_U32("graphics/pokemon/back_pics/meditite_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Meditite[] = INCBIN_U32("graphics/pokemon/palettes/meditite_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Meditite[] = INCBIN_U8("graphics/pokemon/icons/meditite_icon.4bpp"); -const u8 gMonFootprint_Meditite[] = INCBIN_U8("graphics/pokemon/footprints/meditite_footprint.1bpp"); - -const u32 gMonStillFrontPic_Medicham[] = INCBIN_U32("graphics/pokemon/front_pics/medicham_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Medicham[] = INCBIN_U32("graphics/pokemon/palettes/medicham_palette.gbapal.lz"); -const u32 gMonBackPic_Medicham[] = INCBIN_U32("graphics/pokemon/back_pics/medicham_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Medicham[] = INCBIN_U32("graphics/pokemon/palettes/medicham_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Medicham[] = INCBIN_U8("graphics/pokemon/icons/medicham_icon.4bpp"); -const u8 gMonFootprint_Medicham[] = INCBIN_U8("graphics/pokemon/footprints/medicham_footprint.1bpp"); - -const u32 gMonStillFrontPic_Swablu[] = INCBIN_U32("graphics/pokemon/front_pics/swablu_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Swablu[] = INCBIN_U32("graphics/pokemon/palettes/swablu_palette.gbapal.lz"); -const u32 gMonBackPic_Swablu[] = INCBIN_U32("graphics/pokemon/back_pics/swablu_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Swablu[] = INCBIN_U32("graphics/pokemon/palettes/swablu_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Swablu[] = INCBIN_U8("graphics/pokemon/icons/swablu_icon.4bpp"); -const u8 gMonFootprint_Swablu[] = INCBIN_U8("graphics/pokemon/footprints/swablu_footprint.1bpp"); - -const u32 gMonStillFrontPic_Altaria[] = INCBIN_U32("graphics/pokemon/front_pics/altaria_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Altaria[] = INCBIN_U32("graphics/pokemon/palettes/altaria_palette.gbapal.lz"); -const u32 gMonBackPic_Altaria[] = INCBIN_U32("graphics/pokemon/back_pics/altaria_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Altaria[] = INCBIN_U32("graphics/pokemon/palettes/altaria_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Altaria[] = INCBIN_U8("graphics/pokemon/icons/altaria_icon.4bpp"); -const u8 gMonFootprint_Altaria[] = INCBIN_U8("graphics/pokemon/footprints/altaria_footprint.1bpp"); - -const u32 gMonStillFrontPic_Wynaut[] = INCBIN_U32("graphics/pokemon/front_pics/wynaut_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/palettes/wynaut_palette.gbapal.lz"); -const u32 gMonBackPic_Wynaut[] = INCBIN_U32("graphics/pokemon/back_pics/wynaut_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/palettes/wynaut_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Wynaut[] = INCBIN_U8("graphics/pokemon/icons/wynaut_icon.4bpp"); -const u8 gMonFootprint_Wynaut[] = INCBIN_U8("graphics/pokemon/footprints/wynaut_footprint.1bpp"); - -const u32 gMonStillFrontPic_Duskull[] = INCBIN_U32("graphics/pokemon/front_pics/duskull_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Duskull[] = INCBIN_U32("graphics/pokemon/palettes/duskull_palette.gbapal.lz"); -const u32 gMonBackPic_Duskull[] = INCBIN_U32("graphics/pokemon/back_pics/duskull_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Duskull[] = INCBIN_U32("graphics/pokemon/palettes/duskull_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Duskull[] = INCBIN_U8("graphics/pokemon/icons/duskull_icon.4bpp"); -const u8 gMonFootprint_Duskull[] = INCBIN_U8("graphics/pokemon/footprints/duskull_footprint.1bpp"); - -const u32 gMonStillFrontPic_Dusclops[] = INCBIN_U32("graphics/pokemon/front_pics/dusclops_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/palettes/dusclops_palette.gbapal.lz"); -const u32 gMonBackPic_Dusclops[] = INCBIN_U32("graphics/pokemon/back_pics/dusclops_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/palettes/dusclops_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Dusclops[] = INCBIN_U8("graphics/pokemon/icons/dusclops_icon.4bpp"); -const u8 gMonFootprint_Dusclops[] = INCBIN_U8("graphics/pokemon/footprints/dusclops_footprint.1bpp"); - -const u32 gMonStillFrontPic_Roselia[] = INCBIN_U32("graphics/pokemon/front_pics/roselia_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Roselia[] = INCBIN_U32("graphics/pokemon/palettes/roselia_palette.gbapal.lz"); -const u32 gMonBackPic_Roselia[] = INCBIN_U32("graphics/pokemon/back_pics/roselia_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Roselia[] = INCBIN_U32("graphics/pokemon/palettes/roselia_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Roselia[] = INCBIN_U8("graphics/pokemon/icons/roselia_icon.4bpp"); -const u8 gMonFootprint_Roselia[] = INCBIN_U8("graphics/pokemon/footprints/roselia_footprint.1bpp"); - -const u32 gMonStillFrontPic_Slakoth[] = INCBIN_U32("graphics/pokemon/front_pics/slakoth_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/palettes/slakoth_palette.gbapal.lz"); -const u32 gMonBackPic_Slakoth[] = INCBIN_U32("graphics/pokemon/back_pics/slakoth_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/palettes/slakoth_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Slakoth[] = INCBIN_U8("graphics/pokemon/icons/slakoth_icon.4bpp"); -const u8 gMonFootprint_Slakoth[] = INCBIN_U8("graphics/pokemon/footprints/slakoth_footprint.1bpp"); - -const u32 gMonStillFrontPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/front_pics/vigoroth_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/palettes/vigoroth_palette.gbapal.lz"); -const u32 gMonBackPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/back_pics/vigoroth_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/palettes/vigoroth_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Vigoroth[] = INCBIN_U8("graphics/pokemon/icons/vigoroth_icon.4bpp"); -const u8 gMonFootprint_Vigoroth[] = INCBIN_U8("graphics/pokemon/footprints/vigoroth_footprint.1bpp"); - -const u32 gMonStillFrontPic_Slaking[] = INCBIN_U32("graphics/pokemon/front_pics/slaking_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Slaking[] = INCBIN_U32("graphics/pokemon/palettes/slaking_palette.gbapal.lz"); -const u32 gMonBackPic_Slaking[] = INCBIN_U32("graphics/pokemon/back_pics/slaking_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Slaking[] = INCBIN_U32("graphics/pokemon/palettes/slaking_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Slaking[] = INCBIN_U8("graphics/pokemon/icons/slaking_icon.4bpp"); -const u8 gMonFootprint_Slaking[] = INCBIN_U8("graphics/pokemon/footprints/slaking_footprint.1bpp"); - -const u32 gMonStillFrontPic_Gulpin[] = INCBIN_U32("graphics/pokemon/front_pics/gulpin_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/palettes/gulpin_palette.gbapal.lz"); -const u32 gMonBackPic_Gulpin[] = INCBIN_U32("graphics/pokemon/back_pics/gulpin_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/palettes/gulpin_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Gulpin[] = INCBIN_U8("graphics/pokemon/icons/gulpin_icon.4bpp"); -const u8 gMonFootprint_Gulpin[] = INCBIN_U8("graphics/pokemon/footprints/gulpin_footprint.1bpp"); - -const u32 gMonStillFrontPic_Swalot[] = INCBIN_U32("graphics/pokemon/front_pics/swalot_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Swalot[] = INCBIN_U32("graphics/pokemon/palettes/swalot_palette.gbapal.lz"); -const u32 gMonBackPic_Swalot[] = INCBIN_U32("graphics/pokemon/back_pics/swalot_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Swalot[] = INCBIN_U32("graphics/pokemon/palettes/swalot_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Swalot[] = INCBIN_U8("graphics/pokemon/icons/swalot_icon.4bpp"); -const u8 gMonFootprint_Swalot[] = INCBIN_U8("graphics/pokemon/footprints/swalot_footprint.1bpp"); - -const u32 gMonStillFrontPic_Tropius[] = INCBIN_U32("graphics/pokemon/front_pics/tropius_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Tropius[] = INCBIN_U32("graphics/pokemon/palettes/tropius_palette.gbapal.lz"); -const u32 gMonBackPic_Tropius[] = INCBIN_U32("graphics/pokemon/back_pics/tropius_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Tropius[] = INCBIN_U32("graphics/pokemon/palettes/tropius_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Tropius[] = INCBIN_U8("graphics/pokemon/icons/tropius_icon.4bpp"); -const u8 gMonFootprint_Tropius[] = INCBIN_U8("graphics/pokemon/footprints/tropius_footprint.1bpp"); - -const u32 gMonStillFrontPic_Whismur[] = INCBIN_U32("graphics/pokemon/front_pics/whismur_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Whismur[] = INCBIN_U32("graphics/pokemon/palettes/whismur_palette.gbapal.lz"); -const u32 gMonBackPic_Whismur[] = INCBIN_U32("graphics/pokemon/back_pics/whismur_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Whismur[] = INCBIN_U32("graphics/pokemon/palettes/whismur_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Whismur[] = INCBIN_U8("graphics/pokemon/icons/whismur_icon.4bpp"); -const u8 gMonFootprint_Whismur[] = INCBIN_U8("graphics/pokemon/footprints/whismur_footprint.1bpp"); - -const u32 gMonStillFrontPic_Loudred[] = INCBIN_U32("graphics/pokemon/front_pics/loudred_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Loudred[] = INCBIN_U32("graphics/pokemon/palettes/loudred_palette.gbapal.lz"); -const u32 gMonBackPic_Loudred[] = INCBIN_U32("graphics/pokemon/back_pics/loudred_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Loudred[] = INCBIN_U32("graphics/pokemon/palettes/loudred_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Loudred[] = INCBIN_U8("graphics/pokemon/icons/loudred_icon.4bpp"); -const u8 gMonFootprint_Loudred[] = INCBIN_U8("graphics/pokemon/footprints/loudred_footprint.1bpp"); - -const u32 gMonStillFrontPic_Exploud[] = INCBIN_U32("graphics/pokemon/front_pics/exploud_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Exploud[] = INCBIN_U32("graphics/pokemon/palettes/exploud_palette.gbapal.lz"); -const u32 gMonBackPic_Exploud[] = INCBIN_U32("graphics/pokemon/back_pics/exploud_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Exploud[] = INCBIN_U32("graphics/pokemon/palettes/exploud_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Exploud[] = INCBIN_U8("graphics/pokemon/icons/exploud_icon.4bpp"); -const u8 gMonFootprint_Exploud[] = INCBIN_U8("graphics/pokemon/footprints/exploud_footprint.1bpp"); - -const u32 gMonStillFrontPic_Clamperl[] = INCBIN_U32("graphics/pokemon/front_pics/clamperl_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/palettes/clamperl_palette.gbapal.lz"); -const u32 gMonBackPic_Clamperl[] = INCBIN_U32("graphics/pokemon/back_pics/clamperl_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/palettes/clamperl_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Clamperl[] = INCBIN_U8("graphics/pokemon/icons/clamperl_icon.4bpp"); -const u8 gMonFootprint_Clamperl[] = INCBIN_U8("graphics/pokemon/footprints/clamperl_footprint.1bpp"); - -const u32 gMonStillFrontPic_Huntail[] = INCBIN_U32("graphics/pokemon/front_pics/huntail_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Huntail[] = INCBIN_U32("graphics/pokemon/palettes/huntail_palette.gbapal.lz"); -const u32 gMonBackPic_Huntail[] = INCBIN_U32("graphics/pokemon/back_pics/huntail_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Huntail[] = INCBIN_U32("graphics/pokemon/palettes/huntail_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Huntail[] = INCBIN_U8("graphics/pokemon/icons/huntail_icon.4bpp"); -const u8 gMonFootprint_Huntail[] = INCBIN_U8("graphics/pokemon/footprints/huntail_footprint.1bpp"); - -const u32 gMonStillFrontPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/front_pics/gorebyss_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/palettes/gorebyss_palette.gbapal.lz"); -const u32 gMonBackPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/back_pics/gorebyss_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/palettes/gorebyss_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Gorebyss[] = INCBIN_U8("graphics/pokemon/icons/gorebyss_icon.4bpp"); -const u8 gMonFootprint_Gorebyss[] = INCBIN_U8("graphics/pokemon/footprints/gorebyss_footprint.1bpp"); - -const u32 gMonStillFrontPic_Absol[] = INCBIN_U32("graphics/pokemon/front_pics/absol_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Absol[] = INCBIN_U32("graphics/pokemon/palettes/absol_palette.gbapal.lz"); -const u32 gMonBackPic_Absol[] = INCBIN_U32("graphics/pokemon/back_pics/absol_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Absol[] = INCBIN_U32("graphics/pokemon/palettes/absol_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Absol[] = INCBIN_U8("graphics/pokemon/icons/absol_icon.4bpp"); -const u8 gMonFootprint_Absol[] = INCBIN_U8("graphics/pokemon/footprints/absol_footprint.1bpp"); - -const u32 gMonStillFrontPic_Shuppet[] = INCBIN_U32("graphics/pokemon/front_pics/shuppet_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/palettes/shuppet_palette.gbapal.lz"); -const u32 gMonBackPic_Shuppet[] = INCBIN_U32("graphics/pokemon/back_pics/shuppet_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/palettes/shuppet_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Shuppet[] = INCBIN_U8("graphics/pokemon/icons/shuppet_icon.4bpp"); -const u8 gMonFootprint_Shuppet[] = INCBIN_U8("graphics/pokemon/footprints/shuppet_footprint.1bpp"); - -const u32 gMonStillFrontPic_Banette[] = INCBIN_U32("graphics/pokemon/front_pics/banette_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Banette[] = INCBIN_U32("graphics/pokemon/palettes/banette_palette.gbapal.lz"); -const u32 gMonBackPic_Banette[] = INCBIN_U32("graphics/pokemon/back_pics/banette_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Banette[] = INCBIN_U32("graphics/pokemon/palettes/banette_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Banette[] = INCBIN_U8("graphics/pokemon/icons/banette_icon.4bpp"); -const u8 gMonFootprint_Banette[] = INCBIN_U8("graphics/pokemon/footprints/banette_footprint.1bpp"); - -const u32 gMonStillFrontPic_Seviper[] = INCBIN_U32("graphics/pokemon/front_pics/seviper_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Seviper[] = INCBIN_U32("graphics/pokemon/palettes/seviper_palette.gbapal.lz"); -const u32 gMonBackPic_Seviper[] = INCBIN_U32("graphics/pokemon/back_pics/seviper_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Seviper[] = INCBIN_U32("graphics/pokemon/palettes/seviper_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Seviper[] = INCBIN_U8("graphics/pokemon/icons/seviper_icon.4bpp"); -const u8 gMonFootprint_Seviper[] = INCBIN_U8("graphics/pokemon/footprints/seviper_footprint.1bpp"); - -const u32 gMonStillFrontPic_Zangoose[] = INCBIN_U32("graphics/pokemon/front_pics/zangoose_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/palettes/zangoose_palette.gbapal.lz"); -const u32 gMonBackPic_Zangoose[] = INCBIN_U32("graphics/pokemon/back_pics/zangoose_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/palettes/zangoose_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Zangoose[] = INCBIN_U8("graphics/pokemon/icons/zangoose_icon.4bpp"); -const u8 gMonFootprint_Zangoose[] = INCBIN_U8("graphics/pokemon/footprints/zangoose_footprint.1bpp"); - -const u32 gMonStillFrontPic_Relicanth[] = INCBIN_U32("graphics/pokemon/front_pics/relicanth_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/palettes/relicanth_palette.gbapal.lz"); -const u32 gMonBackPic_Relicanth[] = INCBIN_U32("graphics/pokemon/back_pics/relicanth_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/palettes/relicanth_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Relicanth[] = INCBIN_U8("graphics/pokemon/icons/relicanth_icon.4bpp"); -const u8 gMonFootprint_Relicanth[] = INCBIN_U8("graphics/pokemon/footprints/relicanth_footprint.1bpp"); - -const u32 gMonStillFrontPic_Aron[] = INCBIN_U32("graphics/pokemon/front_pics/aron_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Aron[] = INCBIN_U32("graphics/pokemon/palettes/aron_palette.gbapal.lz"); -const u32 gMonBackPic_Aron[] = INCBIN_U32("graphics/pokemon/back_pics/aron_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Aron[] = INCBIN_U32("graphics/pokemon/palettes/aron_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Aron[] = INCBIN_U8("graphics/pokemon/icons/aron_icon.4bpp"); -const u8 gMonFootprint_Aron[] = INCBIN_U8("graphics/pokemon/footprints/aron_footprint.1bpp"); - -const u32 gMonStillFrontPic_Lairon[] = INCBIN_U32("graphics/pokemon/front_pics/lairon_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Lairon[] = INCBIN_U32("graphics/pokemon/palettes/lairon_palette.gbapal.lz"); -const u32 gMonBackPic_Lairon[] = INCBIN_U32("graphics/pokemon/back_pics/lairon_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Lairon[] = INCBIN_U32("graphics/pokemon/palettes/lairon_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Lairon[] = INCBIN_U8("graphics/pokemon/icons/lairon_icon.4bpp"); -const u8 gMonFootprint_Lairon[] = INCBIN_U8("graphics/pokemon/footprints/lairon_footprint.1bpp"); - -const u32 gMonStillFrontPic_Aggron[] = INCBIN_U32("graphics/pokemon/front_pics/aggron_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Aggron[] = INCBIN_U32("graphics/pokemon/palettes/aggron_palette.gbapal.lz"); -const u32 gMonBackPic_Aggron[] = INCBIN_U32("graphics/pokemon/back_pics/aggron_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Aggron[] = INCBIN_U32("graphics/pokemon/palettes/aggron_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Aggron[] = INCBIN_U8("graphics/pokemon/icons/aggron_icon.4bpp"); -const u8 gMonFootprint_Aggron[] = INCBIN_U8("graphics/pokemon/footprints/aggron_footprint.1bpp"); - -const u32 gMonStillFrontPic_Castform[] = INCBIN_U32("graphics/pokemon/front_pics/castform_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Castform[] = INCBIN_U32("graphics/pokemon/palettes/castform_palette.gbapal.lz"); -const u32 gMonBackPic_Castform[] = INCBIN_U32("graphics/pokemon/back_pics/castform_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Castform[] = INCBIN_U32("graphics/pokemon/palettes/castform_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Castform[] = INCBIN_U8("graphics/pokemon/icons/castform_icon.4bpp"); -const u8 gMonFootprint_Castform[] = INCBIN_U8("graphics/pokemon/footprints/castform_footprint.1bpp"); - -const u32 gMonStillFrontPic_Volbeat[] = INCBIN_U32("graphics/pokemon/front_pics/volbeat_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/palettes/volbeat_palette.gbapal.lz"); -const u32 gMonBackPic_Volbeat[] = INCBIN_U32("graphics/pokemon/back_pics/volbeat_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/palettes/volbeat_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Volbeat[] = INCBIN_U8("graphics/pokemon/icons/volbeat_icon.4bpp"); -const u8 gMonFootprint_Volbeat[] = INCBIN_U8("graphics/pokemon/footprints/volbeat_footprint.1bpp"); - -const u32 gMonStillFrontPic_Illumise[] = INCBIN_U32("graphics/pokemon/front_pics/illumise_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Illumise[] = INCBIN_U32("graphics/pokemon/palettes/illumise_palette.gbapal.lz"); -const u32 gMonBackPic_Illumise[] = INCBIN_U32("graphics/pokemon/back_pics/illumise_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Illumise[] = INCBIN_U32("graphics/pokemon/palettes/illumise_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Illumise[] = INCBIN_U8("graphics/pokemon/icons/illumise_icon.4bpp"); -const u8 gMonFootprint_Illumise[] = INCBIN_U8("graphics/pokemon/footprints/illumise_footprint.1bpp"); - -const u32 gMonStillFrontPic_Lileep[] = INCBIN_U32("graphics/pokemon/front_pics/lileep_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Lileep[] = INCBIN_U32("graphics/pokemon/palettes/lileep_palette.gbapal.lz"); -const u32 gMonBackPic_Lileep[] = INCBIN_U32("graphics/pokemon/back_pics/lileep_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Lileep[] = INCBIN_U32("graphics/pokemon/palettes/lileep_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Lileep[] = INCBIN_U8("graphics/pokemon/icons/lileep_icon.4bpp"); -const u8 gMonFootprint_Lileep[] = INCBIN_U8("graphics/pokemon/footprints/lileep_footprint.1bpp"); - -const u32 gMonStillFrontPic_Cradily[] = INCBIN_U32("graphics/pokemon/front_pics/cradily_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Cradily[] = INCBIN_U32("graphics/pokemon/palettes/cradily_palette.gbapal.lz"); -const u32 gMonBackPic_Cradily[] = INCBIN_U32("graphics/pokemon/back_pics/cradily_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Cradily[] = INCBIN_U32("graphics/pokemon/palettes/cradily_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Cradily[] = INCBIN_U8("graphics/pokemon/icons/cradily_icon.4bpp"); -const u8 gMonFootprint_Cradily[] = INCBIN_U8("graphics/pokemon/footprints/cradily_footprint.1bpp"); - -const u32 gMonStillFrontPic_Anorith[] = INCBIN_U32("graphics/pokemon/front_pics/anorith_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Anorith[] = INCBIN_U32("graphics/pokemon/palettes/anorith_palette.gbapal.lz"); -const u32 gMonBackPic_Anorith[] = INCBIN_U32("graphics/pokemon/back_pics/anorith_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Anorith[] = INCBIN_U32("graphics/pokemon/palettes/anorith_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Anorith[] = INCBIN_U8("graphics/pokemon/icons/anorith_icon.4bpp"); -const u8 gMonFootprint_Anorith[] = INCBIN_U8("graphics/pokemon/footprints/anorith_footprint.1bpp"); - -const u32 gMonStillFrontPic_Armaldo[] = INCBIN_U32("graphics/pokemon/front_pics/armaldo_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/palettes/armaldo_palette.gbapal.lz"); -const u32 gMonBackPic_Armaldo[] = INCBIN_U32("graphics/pokemon/back_pics/armaldo_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/palettes/armaldo_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Armaldo[] = INCBIN_U8("graphics/pokemon/icons/armaldo_icon.4bpp"); -const u8 gMonFootprint_Armaldo[] = INCBIN_U8("graphics/pokemon/footprints/armaldo_footprint.1bpp"); - -const u32 gMonStillFrontPic_Ralts[] = INCBIN_U32("graphics/pokemon/front_pics/ralts_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Ralts[] = INCBIN_U32("graphics/pokemon/palettes/ralts_palette.gbapal.lz"); -const u32 gMonBackPic_Ralts[] = INCBIN_U32("graphics/pokemon/back_pics/ralts_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Ralts[] = INCBIN_U32("graphics/pokemon/palettes/ralts_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Ralts[] = INCBIN_U8("graphics/pokemon/icons/ralts_icon.4bpp"); -const u8 gMonFootprint_Ralts[] = INCBIN_U8("graphics/pokemon/footprints/ralts_footprint.1bpp"); - -const u32 gMonStillFrontPic_Kirlia[] = INCBIN_U32("graphics/pokemon/front_pics/kirlia_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/palettes/kirlia_palette.gbapal.lz"); -const u32 gMonBackPic_Kirlia[] = INCBIN_U32("graphics/pokemon/back_pics/kirlia_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/palettes/kirlia_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Kirlia[] = INCBIN_U8("graphics/pokemon/icons/kirlia_icon.4bpp"); -const u8 gMonFootprint_Kirlia[] = INCBIN_U8("graphics/pokemon/footprints/kirlia_footprint.1bpp"); - -const u32 gMonStillFrontPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/front_pics/gardevoir_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/palettes/gardevoir_palette.gbapal.lz"); -const u32 gMonBackPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/back_pics/gardevoir_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/palettes/gardevoir_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Gardevoir[] = INCBIN_U8("graphics/pokemon/icons/gardevoir_icon.4bpp"); -const u8 gMonFootprint_Gardevoir[] = INCBIN_U8("graphics/pokemon/footprints/gardevoir_footprint.1bpp"); - -const u32 gMonStillFrontPic_Bagon[] = INCBIN_U32("graphics/pokemon/front_pics/bagon_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Bagon[] = INCBIN_U32("graphics/pokemon/palettes/bagon_palette.gbapal.lz"); -const u32 gMonBackPic_Bagon[] = INCBIN_U32("graphics/pokemon/back_pics/bagon_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Bagon[] = INCBIN_U32("graphics/pokemon/palettes/bagon_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Bagon[] = INCBIN_U8("graphics/pokemon/icons/bagon_icon.4bpp"); -const u8 gMonFootprint_Bagon[] = INCBIN_U8("graphics/pokemon/footprints/bagon_footprint.1bpp"); - -const u32 gMonStillFrontPic_Shelgon[] = INCBIN_U32("graphics/pokemon/front_pics/shelgon_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/palettes/shelgon_palette.gbapal.lz"); -const u32 gMonBackPic_Shelgon[] = INCBIN_U32("graphics/pokemon/back_pics/shelgon_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/palettes/shelgon_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Shelgon[] = INCBIN_U8("graphics/pokemon/icons/shelgon_icon.4bpp"); -const u8 gMonFootprint_Shelgon[] = INCBIN_U8("graphics/pokemon/footprints/shelgon_footprint.1bpp"); - -const u32 gMonStillFrontPic_Salamence[] = INCBIN_U32("graphics/pokemon/front_pics/salamence_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Salamence[] = INCBIN_U32("graphics/pokemon/palettes/salamence_palette.gbapal.lz"); -const u32 gMonBackPic_Salamence[] = INCBIN_U32("graphics/pokemon/back_pics/salamence_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Salamence[] = INCBIN_U32("graphics/pokemon/palettes/salamence_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Salamence[] = INCBIN_U8("graphics/pokemon/icons/salamence_icon.4bpp"); -const u8 gMonFootprint_Salamence[] = INCBIN_U8("graphics/pokemon/footprints/salamence_footprint.1bpp"); - -const u32 gMonStillFrontPic_Beldum[] = INCBIN_U32("graphics/pokemon/front_pics/beldum_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Beldum[] = INCBIN_U32("graphics/pokemon/palettes/beldum_palette.gbapal.lz"); -const u32 gMonBackPic_Beldum[] = INCBIN_U32("graphics/pokemon/back_pics/beldum_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Beldum[] = INCBIN_U32("graphics/pokemon/palettes/beldum_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Beldum[] = INCBIN_U8("graphics/pokemon/icons/beldum_icon.4bpp"); -const u8 gMonFootprint_Beldum[] = INCBIN_U8("graphics/pokemon/footprints/beldum_footprint.1bpp"); - -const u32 gMonStillFrontPic_Metang[] = INCBIN_U32("graphics/pokemon/front_pics/metang_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Metang[] = INCBIN_U32("graphics/pokemon/palettes/metang_palette.gbapal.lz"); -const u32 gMonBackPic_Metang[] = INCBIN_U32("graphics/pokemon/back_pics/metang_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Metang[] = INCBIN_U32("graphics/pokemon/palettes/metang_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Metang[] = INCBIN_U8("graphics/pokemon/icons/metang_icon.4bpp"); -const u8 gMonFootprint_Metang[] = INCBIN_U8("graphics/pokemon/footprints/metang_footprint.1bpp"); - -const u32 gMonStillFrontPic_Metagross[] = INCBIN_U32("graphics/pokemon/front_pics/metagross_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Metagross[] = INCBIN_U32("graphics/pokemon/palettes/metagross_palette.gbapal.lz"); -const u32 gMonBackPic_Metagross[] = INCBIN_U32("graphics/pokemon/back_pics/metagross_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Metagross[] = INCBIN_U32("graphics/pokemon/palettes/metagross_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Metagross[] = INCBIN_U8("graphics/pokemon/icons/metagross_icon.4bpp"); -const u8 gMonFootprint_Metagross[] = INCBIN_U8("graphics/pokemon/footprints/metagross_footprint.1bpp"); - -const u32 gMonStillFrontPic_Regirock[] = INCBIN_U32("graphics/pokemon/front_pics/regirock_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Regirock[] = INCBIN_U32("graphics/pokemon/palettes/regirock_palette.gbapal.lz"); -const u32 gMonBackPic_Regirock[] = INCBIN_U32("graphics/pokemon/back_pics/regirock_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Regirock[] = INCBIN_U32("graphics/pokemon/palettes/regirock_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Regirock[] = INCBIN_U8("graphics/pokemon/icons/regirock_icon.4bpp"); -const u8 gMonFootprint_Regirock[] = INCBIN_U8("graphics/pokemon/footprints/regirock_footprint.1bpp"); - -const u32 gMonStillFrontPic_Regice[] = INCBIN_U32("graphics/pokemon/front_pics/regice_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Regice[] = INCBIN_U32("graphics/pokemon/palettes/regice_palette.gbapal.lz"); -const u32 gMonBackPic_Regice[] = INCBIN_U32("graphics/pokemon/back_pics/regice_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Regice[] = INCBIN_U32("graphics/pokemon/palettes/regice_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Regice[] = INCBIN_U8("graphics/pokemon/icons/regice_icon.4bpp"); -const u8 gMonFootprint_Regice[] = INCBIN_U8("graphics/pokemon/footprints/regice_footprint.1bpp"); - -const u32 gMonStillFrontPic_Registeel[] = INCBIN_U32("graphics/pokemon/front_pics/registeel_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Registeel[] = INCBIN_U32("graphics/pokemon/palettes/registeel_palette.gbapal.lz"); -const u32 gMonBackPic_Registeel[] = INCBIN_U32("graphics/pokemon/back_pics/registeel_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Registeel[] = INCBIN_U32("graphics/pokemon/palettes/registeel_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Registeel[] = INCBIN_U8("graphics/pokemon/icons/registeel_icon.4bpp"); -const u8 gMonFootprint_Registeel[] = INCBIN_U8("graphics/pokemon/footprints/registeel_footprint.1bpp"); - -const u32 gMonStillFrontPic_Kyogre[] = INCBIN_U32("graphics/pokemon/front_pics/kyogre_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/palettes/kyogre_palette.gbapal.lz"); -const u32 gMonBackPic_Kyogre[] = INCBIN_U32("graphics/pokemon/back_pics/kyogre_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/palettes/kyogre_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Kyogre[] = INCBIN_U8("graphics/pokemon/icons/kyogre_icon.4bpp"); -const u8 gMonFootprint_Kyogre[] = INCBIN_U8("graphics/pokemon/footprints/kyogre_footprint.1bpp"); - -const u32 gMonStillFrontPic_Groudon[] = INCBIN_U32("graphics/pokemon/front_pics/groudon_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Groudon[] = INCBIN_U32("graphics/pokemon/palettes/groudon_palette.gbapal.lz"); -const u32 gMonBackPic_Groudon[] = INCBIN_U32("graphics/pokemon/back_pics/groudon_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Groudon[] = INCBIN_U32("graphics/pokemon/palettes/groudon_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Groudon[] = INCBIN_U8("graphics/pokemon/icons/groudon_icon.4bpp"); -const u8 gMonFootprint_Groudon[] = INCBIN_U8("graphics/pokemon/footprints/groudon_footprint.1bpp"); - -const u32 gMonStillFrontPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/front_pics/rayquaza_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/palettes/rayquaza_palette.gbapal.lz"); -const u32 gMonBackPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/back_pics/rayquaza_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/palettes/rayquaza_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Rayquaza[] = INCBIN_U8("graphics/pokemon/icons/rayquaza_icon.4bpp"); -const u8 gMonFootprint_Rayquaza[] = INCBIN_U8("graphics/pokemon/footprints/rayquaza_footprint.1bpp"); - -const u32 gMonStillFrontPic_Latias[] = INCBIN_U32("graphics/pokemon/front_pics/latias_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Latias[] = INCBIN_U32("graphics/pokemon/palettes/latias_palette.gbapal.lz"); -const u32 gMonBackPic_Latias[] = INCBIN_U32("graphics/pokemon/back_pics/latias_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Latias[] = INCBIN_U32("graphics/pokemon/palettes/latias_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Latias[] = INCBIN_U8("graphics/pokemon/icons/latias_icon.4bpp"); -const u8 gMonFootprint_Latias[] = INCBIN_U8("graphics/pokemon/footprints/latias_footprint.1bpp"); - -const u32 gMonStillFrontPic_Latios[] = INCBIN_U32("graphics/pokemon/front_pics/latios_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Latios[] = INCBIN_U32("graphics/pokemon/palettes/latios_palette.gbapal.lz"); -const u32 gMonBackPic_Latios[] = INCBIN_U32("graphics/pokemon/back_pics/latios_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Latios[] = INCBIN_U32("graphics/pokemon/palettes/latios_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Latios[] = INCBIN_U8("graphics/pokemon/icons/latios_icon.4bpp"); -const u8 gMonFootprint_Latios[] = INCBIN_U8("graphics/pokemon/footprints/latios_footprint.1bpp"); - -const u32 gMonStillFrontPic_Jirachi[] = INCBIN_U32("graphics/pokemon/front_pics/jirachi_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/palettes/jirachi_palette.gbapal.lz"); -const u32 gMonBackPic_Jirachi[] = INCBIN_U32("graphics/pokemon/back_pics/jirachi_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/palettes/jirachi_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Jirachi[] = INCBIN_U8("graphics/pokemon/icons/jirachi_icon.4bpp"); -const u8 gMonFootprint_Jirachi[] = INCBIN_U8("graphics/pokemon/footprints/jirachi_footprint.1bpp"); - -const u32 gMonStillFrontPic_Deoxys[] = INCBIN_U32("graphics/pokemon/front_pics/deoxys_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/palettes/deoxys_palette.gbapal.lz"); -const u32 gMonBackPic_Deoxys[] = INCBIN_U32("graphics/pokemon/back_pics/deoxys_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/palettes/deoxys_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Deoxys[] = INCBIN_U8("graphics/pokemon/icons/deoxys_icon.4bpp"); -const u8 gMonIcon_DeoxysSpeed[] = INCBIN_U8("graphics/pokemon/icons/deoxys_speed_icon.4bpp"); +const u32 gMonStillFrontPic_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/front.4bpp.lz"); +const u32 gMonPalette_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/normal.gbapal.lz"); +const u32 gMonBackPic_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/back.4bpp.lz"); +const u32 gMonShinyPalette_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/shiny.gbapal.lz"); +const u8 gMonIcon_Stantler[] = INCBIN_U8("graphics/pokemon/stantler/icon.4bpp"); +const u8 gMonFootprint_Stantler[] = INCBIN_U8("graphics/pokemon/stantler/footprint.1bpp"); + +const u32 gMonStillFrontPic_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/front.4bpp.lz"); +const u32 gMonPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/normal.gbapal.lz"); +const u32 gMonBackPic_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/back.4bpp.lz"); +const u32 gMonShinyPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/shiny.gbapal.lz"); +const u8 gMonIcon_Smeargle[] = INCBIN_U8("graphics/pokemon/smeargle/icon.4bpp"); +const u8 gMonFootprint_Smeargle[] = INCBIN_U8("graphics/pokemon/smeargle/footprint.1bpp"); + +const u32 gMonStillFrontPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/front.4bpp.lz"); +const u32 gMonPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/normal.gbapal.lz"); +const u32 gMonBackPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/back.4bpp.lz"); +const u32 gMonShinyPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/shiny.gbapal.lz"); +const u8 gMonIcon_Tyrogue[] = INCBIN_U8("graphics/pokemon/tyrogue/icon.4bpp"); +const u8 gMonFootprint_Tyrogue[] = INCBIN_U8("graphics/pokemon/tyrogue/footprint.1bpp"); + +const u32 gMonStillFrontPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/front.4bpp.lz"); +const u32 gMonPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/normal.gbapal.lz"); +const u32 gMonBackPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/back.4bpp.lz"); +const u32 gMonShinyPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/shiny.gbapal.lz"); +const u8 gMonIcon_Hitmontop[] = INCBIN_U8("graphics/pokemon/hitmontop/icon.4bpp"); +const u8 gMonFootprint_Hitmontop[] = INCBIN_U8("graphics/pokemon/hitmontop/footprint.1bpp"); + +const u32 gMonStillFrontPic_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/front.4bpp.lz"); +const u32 gMonPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/normal.gbapal.lz"); +const u32 gMonBackPic_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/back.4bpp.lz"); +const u32 gMonShinyPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/shiny.gbapal.lz"); +const u8 gMonIcon_Smoochum[] = INCBIN_U8("graphics/pokemon/smoochum/icon.4bpp"); +const u8 gMonFootprint_Smoochum[] = INCBIN_U8("graphics/pokemon/smoochum/footprint.1bpp"); + +const u32 gMonStillFrontPic_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/front.4bpp.lz"); +const u32 gMonPalette_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/normal.gbapal.lz"); +const u32 gMonBackPic_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/back.4bpp.lz"); +const u32 gMonShinyPalette_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/shiny.gbapal.lz"); +const u8 gMonIcon_Elekid[] = INCBIN_U8("graphics/pokemon/elekid/icon.4bpp"); +const u8 gMonFootprint_Elekid[] = INCBIN_U8("graphics/pokemon/elekid/footprint.1bpp"); + +const u32 gMonStillFrontPic_Magby[] = INCBIN_U32("graphics/pokemon/magby/front.4bpp.lz"); +const u32 gMonPalette_Magby[] = INCBIN_U32("graphics/pokemon/magby/normal.gbapal.lz"); +const u32 gMonBackPic_Magby[] = INCBIN_U32("graphics/pokemon/magby/back.4bpp.lz"); +const u32 gMonShinyPalette_Magby[] = INCBIN_U32("graphics/pokemon/magby/shiny.gbapal.lz"); +const u8 gMonIcon_Magby[] = INCBIN_U8("graphics/pokemon/magby/icon.4bpp"); +const u8 gMonFootprint_Magby[] = INCBIN_U8("graphics/pokemon/magby/footprint.1bpp"); + +const u32 gMonStillFrontPic_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/front.4bpp.lz"); +const u32 gMonPalette_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/normal.gbapal.lz"); +const u32 gMonBackPic_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/back.4bpp.lz"); +const u32 gMonShinyPalette_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/shiny.gbapal.lz"); +const u8 gMonIcon_Miltank[] = INCBIN_U8("graphics/pokemon/miltank/icon.4bpp"); +const u8 gMonFootprint_Miltank[] = INCBIN_U8("graphics/pokemon/miltank/footprint.1bpp"); + +const u32 gMonStillFrontPic_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/front.4bpp.lz"); +const u32 gMonPalette_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/normal.gbapal.lz"); +const u32 gMonBackPic_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/back.4bpp.lz"); +const u32 gMonShinyPalette_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/shiny.gbapal.lz"); +const u8 gMonIcon_Blissey[] = INCBIN_U8("graphics/pokemon/blissey/icon.4bpp"); +const u8 gMonFootprint_Blissey[] = INCBIN_U8("graphics/pokemon/blissey/footprint.1bpp"); + +const u32 gMonStillFrontPic_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/front.4bpp.lz"); +const u32 gMonPalette_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/normal.gbapal.lz"); +const u32 gMonBackPic_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/back.4bpp.lz"); +const u32 gMonShinyPalette_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/shiny.gbapal.lz"); +const u8 gMonIcon_Raikou[] = INCBIN_U8("graphics/pokemon/raikou/icon.4bpp"); +const u8 gMonFootprint_Raikou[] = INCBIN_U8("graphics/pokemon/raikou/footprint.1bpp"); + +const u32 gMonStillFrontPic_Entei[] = INCBIN_U32("graphics/pokemon/entei/front.4bpp.lz"); +const u32 gMonPalette_Entei[] = INCBIN_U32("graphics/pokemon/entei/normal.gbapal.lz"); +const u32 gMonBackPic_Entei[] = INCBIN_U32("graphics/pokemon/entei/back.4bpp.lz"); +const u32 gMonShinyPalette_Entei[] = INCBIN_U32("graphics/pokemon/entei/shiny.gbapal.lz"); +const u8 gMonIcon_Entei[] = INCBIN_U8("graphics/pokemon/entei/icon.4bpp"); +const u8 gMonFootprint_Entei[] = INCBIN_U8("graphics/pokemon/entei/footprint.1bpp"); + +const u32 gMonStillFrontPic_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/front.4bpp.lz"); +const u32 gMonPalette_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/normal.gbapal.lz"); +const u32 gMonBackPic_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/back.4bpp.lz"); +const u32 gMonShinyPalette_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/shiny.gbapal.lz"); +const u8 gMonIcon_Suicune[] = INCBIN_U8("graphics/pokemon/suicune/icon.4bpp"); +const u8 gMonFootprint_Suicune[] = INCBIN_U8("graphics/pokemon/suicune/footprint.1bpp"); + +const u32 gMonStillFrontPic_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/front.4bpp.lz"); +const u32 gMonPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/normal.gbapal.lz"); +const u32 gMonBackPic_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/back.4bpp.lz"); +const u32 gMonShinyPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/shiny.gbapal.lz"); +const u8 gMonIcon_Larvitar[] = INCBIN_U8("graphics/pokemon/larvitar/icon.4bpp"); +const u8 gMonFootprint_Larvitar[] = INCBIN_U8("graphics/pokemon/larvitar/footprint.1bpp"); + +const u32 gMonStillFrontPic_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/front.4bpp.lz"); +const u32 gMonPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/normal.gbapal.lz"); +const u32 gMonBackPic_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/back.4bpp.lz"); +const u32 gMonShinyPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/shiny.gbapal.lz"); +const u8 gMonIcon_Pupitar[] = INCBIN_U8("graphics/pokemon/pupitar/icon.4bpp"); +const u8 gMonFootprint_Pupitar[] = INCBIN_U8("graphics/pokemon/pupitar/footprint.1bpp"); + +const u32 gMonStillFrontPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/front.4bpp.lz"); +const u32 gMonPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/normal.gbapal.lz"); +const u32 gMonBackPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/back.4bpp.lz"); +const u32 gMonShinyPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/shiny.gbapal.lz"); +const u8 gMonIcon_Tyranitar[] = INCBIN_U8("graphics/pokemon/tyranitar/icon.4bpp"); +const u8 gMonFootprint_Tyranitar[] = INCBIN_U8("graphics/pokemon/tyranitar/footprint.1bpp"); + +const u32 gMonStillFrontPic_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/front.4bpp.lz"); +const u32 gMonPalette_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/normal.gbapal.lz"); +const u32 gMonBackPic_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/back.4bpp.lz"); +const u32 gMonShinyPalette_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/shiny.gbapal.lz"); +const u8 gMonIcon_Lugia[] = INCBIN_U8("graphics/pokemon/lugia/icon.4bpp"); +const u8 gMonFootprint_Lugia[] = INCBIN_U8("graphics/pokemon/lugia/footprint.1bpp"); + +const u32 gMonStillFrontPic_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/front.4bpp.lz"); +const u32 gMonPalette_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/normal.gbapal.lz"); +const u32 gMonBackPic_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/back.4bpp.lz"); +const u32 gMonShinyPalette_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/shiny.gbapal.lz"); +const u8 gMonIcon_HoOh[] = INCBIN_U8("graphics/pokemon/ho_oh/icon.4bpp"); +const u8 gMonFootprint_HoOh[] = INCBIN_U8("graphics/pokemon/ho_oh/footprint.1bpp"); + +const u32 gMonStillFrontPic_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/front.4bpp.lz"); +const u32 gMonPalette_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/normal.gbapal.lz"); +const u32 gMonBackPic_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/back.4bpp.lz"); +const u32 gMonShinyPalette_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/shiny.gbapal.lz"); +const u8 gMonIcon_Celebi[] = INCBIN_U8("graphics/pokemon/celebi/icon.4bpp"); +const u8 gMonFootprint_Celebi[] = INCBIN_U8("graphics/pokemon/celebi/footprint.1bpp"); + +const u32 gMonStillFrontPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/double_question_mark/front.4bpp.lz"); +const u32 gMonPalette_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/double_question_mark/normal.gbapal.lz"); +const u32 gMonBackPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/double_question_mark/back.4bpp.lz"); +const u32 gMonShinyPalette_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/double_question_mark/shiny.gbapal.lz"); + +const u32 gMonStillFrontPic_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/front.4bpp.lz"); +const u32 gMonPalette_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/normal.gbapal.lz"); +const u32 gMonBackPic_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/back.4bpp.lz"); +const u32 gMonShinyPalette_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/shiny.gbapal.lz"); +const u8 gMonIcon_Treecko[] = INCBIN_U8("graphics/pokemon/treecko/icon.4bpp"); +const u8 gMonFootprint_Treecko[] = INCBIN_U8("graphics/pokemon/treecko/footprint.1bpp"); + +const u32 gMonStillFrontPic_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/front.4bpp.lz"); +const u32 gMonPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/normal.gbapal.lz"); +const u32 gMonBackPic_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/back.4bpp.lz"); +const u32 gMonShinyPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/shiny.gbapal.lz"); +const u8 gMonIcon_Grovyle[] = INCBIN_U8("graphics/pokemon/grovyle/icon.4bpp"); +const u8 gMonFootprint_Grovyle[] = INCBIN_U8("graphics/pokemon/grovyle/footprint.1bpp"); + +const u32 gMonStillFrontPic_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/front.4bpp.lz"); +const u32 gMonPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/normal.gbapal.lz"); +const u32 gMonBackPic_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/back.4bpp.lz"); +const u32 gMonShinyPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/shiny.gbapal.lz"); +const u8 gMonIcon_Sceptile[] = INCBIN_U8("graphics/pokemon/sceptile/icon.4bpp"); +const u8 gMonFootprint_Sceptile[] = INCBIN_U8("graphics/pokemon/sceptile/footprint.1bpp"); + +const u32 gMonStillFrontPic_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/front.4bpp.lz"); +const u32 gMonPalette_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/normal.gbapal.lz"); +const u32 gMonBackPic_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/back.4bpp.lz"); +const u32 gMonShinyPalette_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/shiny.gbapal.lz"); +const u8 gMonIcon_Torchic[] = INCBIN_U8("graphics/pokemon/torchic/icon.4bpp"); +const u8 gMonFootprint_Torchic[] = INCBIN_U8("graphics/pokemon/torchic/footprint.1bpp"); + +const u32 gMonStillFrontPic_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/front.4bpp.lz"); +const u32 gMonPalette_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/normal.gbapal.lz"); +const u32 gMonBackPic_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/back.4bpp.lz"); +const u32 gMonShinyPalette_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/shiny.gbapal.lz"); +const u8 gMonIcon_Combusken[] = INCBIN_U8("graphics/pokemon/combusken/icon.4bpp"); +const u8 gMonFootprint_Combusken[] = INCBIN_U8("graphics/pokemon/combusken/footprint.1bpp"); + +const u32 gMonStillFrontPic_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/front.4bpp.lz"); +const u32 gMonPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/normal.gbapal.lz"); +const u32 gMonBackPic_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/back.4bpp.lz"); +const u32 gMonShinyPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/shiny.gbapal.lz"); +const u8 gMonIcon_Blaziken[] = INCBIN_U8("graphics/pokemon/blaziken/icon.4bpp"); +const u8 gMonFootprint_Blaziken[] = INCBIN_U8("graphics/pokemon/blaziken/footprint.1bpp"); + +const u32 gMonStillFrontPic_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/front.4bpp.lz"); +const u32 gMonPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/normal.gbapal.lz"); +const u32 gMonBackPic_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/back.4bpp.lz"); +const u32 gMonShinyPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/shiny.gbapal.lz"); +const u8 gMonIcon_Mudkip[] = INCBIN_U8("graphics/pokemon/mudkip/icon.4bpp"); +const u8 gMonFootprint_Mudkip[] = INCBIN_U8("graphics/pokemon/mudkip/footprint.1bpp"); + +const u32 gMonStillFrontPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/front.4bpp.lz"); +const u32 gMonPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/normal.gbapal.lz"); +const u32 gMonBackPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/back.4bpp.lz"); +const u32 gMonShinyPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/shiny.gbapal.lz"); +const u8 gMonIcon_Marshtomp[] = INCBIN_U8("graphics/pokemon/marshtomp/icon.4bpp"); +const u8 gMonFootprint_Marshtomp[] = INCBIN_U8("graphics/pokemon/marshtomp/footprint.1bpp"); + +const u32 gMonStillFrontPic_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/front.4bpp.lz"); +const u32 gMonPalette_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/normal.gbapal.lz"); +const u32 gMonBackPic_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/back.4bpp.lz"); +const u32 gMonShinyPalette_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/shiny.gbapal.lz"); +const u8 gMonIcon_Swampert[] = INCBIN_U8("graphics/pokemon/swampert/icon.4bpp"); +const u8 gMonFootprint_Swampert[] = INCBIN_U8("graphics/pokemon/swampert/footprint.1bpp"); + +const u32 gMonStillFrontPic_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/front.4bpp.lz"); +const u32 gMonPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/normal.gbapal.lz"); +const u32 gMonBackPic_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/back.4bpp.lz"); +const u32 gMonShinyPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/shiny.gbapal.lz"); +const u8 gMonIcon_Poochyena[] = INCBIN_U8("graphics/pokemon/poochyena/icon.4bpp"); +const u8 gMonFootprint_Poochyena[] = INCBIN_U8("graphics/pokemon/poochyena/footprint.1bpp"); + +const u32 gMonStillFrontPic_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/front.4bpp.lz"); +const u32 gMonPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/normal.gbapal.lz"); +const u32 gMonBackPic_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/back.4bpp.lz"); +const u32 gMonShinyPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/shiny.gbapal.lz"); +const u8 gMonIcon_Mightyena[] = INCBIN_U8("graphics/pokemon/mightyena/icon.4bpp"); +const u8 gMonFootprint_Mightyena[] = INCBIN_U8("graphics/pokemon/mightyena/footprint.1bpp"); + +const u32 gMonStillFrontPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/front.4bpp.lz"); +const u32 gMonPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/normal.gbapal.lz"); +const u32 gMonBackPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/back.4bpp.lz"); +const u32 gMonShinyPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/shiny.gbapal.lz"); +const u8 gMonIcon_Zigzagoon[] = INCBIN_U8("graphics/pokemon/zigzagoon/icon.4bpp"); +const u8 gMonFootprint_Zigzagoon[] = INCBIN_U8("graphics/pokemon/zigzagoon/footprint.1bpp"); + +const u32 gMonStillFrontPic_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/front.4bpp.lz"); +const u32 gMonPalette_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/normal.gbapal.lz"); +const u32 gMonBackPic_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/back.4bpp.lz"); +const u32 gMonShinyPalette_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/shiny.gbapal.lz"); +const u8 gMonIcon_Linoone[] = INCBIN_U8("graphics/pokemon/linoone/icon.4bpp"); +const u8 gMonFootprint_Linoone[] = INCBIN_U8("graphics/pokemon/linoone/footprint.1bpp"); + +const u32 gMonStillFrontPic_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/front.4bpp.lz"); +const u32 gMonPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/normal.gbapal.lz"); +const u32 gMonBackPic_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/back.4bpp.lz"); +const u32 gMonShinyPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/shiny.gbapal.lz"); +const u8 gMonIcon_Wurmple[] = INCBIN_U8("graphics/pokemon/wurmple/icon.4bpp"); +const u8 gMonFootprint_Wurmple[] = INCBIN_U8("graphics/pokemon/wurmple/footprint.1bpp"); + +const u32 gMonStillFrontPic_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/front.4bpp.lz"); +const u32 gMonPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/normal.gbapal.lz"); +const u32 gMonBackPic_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/back.4bpp.lz"); +const u32 gMonShinyPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/shiny.gbapal.lz"); +const u8 gMonIcon_Silcoon[] = INCBIN_U8("graphics/pokemon/silcoon/icon.4bpp"); +const u8 gMonFootprint_Silcoon[] = INCBIN_U8("graphics/pokemon/silcoon/footprint.1bpp"); + +const u32 gMonStillFrontPic_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/front.4bpp.lz"); +const u32 gMonPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/normal.gbapal.lz"); +const u32 gMonBackPic_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/back.4bpp.lz"); +const u32 gMonShinyPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/shiny.gbapal.lz"); +const u8 gMonIcon_Beautifly[] = INCBIN_U8("graphics/pokemon/beautifly/icon.4bpp"); +const u8 gMonFootprint_Beautifly[] = INCBIN_U8("graphics/pokemon/beautifly/footprint.1bpp"); + +const u32 gMonStillFrontPic_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/front.4bpp.lz"); +const u32 gMonPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/normal.gbapal.lz"); +const u32 gMonBackPic_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/back.4bpp.lz"); +const u32 gMonShinyPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/shiny.gbapal.lz"); +const u8 gMonIcon_Cascoon[] = INCBIN_U8("graphics/pokemon/cascoon/icon.4bpp"); +const u8 gMonFootprint_Cascoon[] = INCBIN_U8("graphics/pokemon/cascoon/footprint.1bpp"); + +const u32 gMonStillFrontPic_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/front.4bpp.lz"); +const u32 gMonPalette_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/normal.gbapal.lz"); +const u32 gMonBackPic_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/back.4bpp.lz"); +const u32 gMonShinyPalette_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/shiny.gbapal.lz"); +const u8 gMonIcon_Dustox[] = INCBIN_U8("graphics/pokemon/dustox/icon.4bpp"); +const u8 gMonFootprint_Dustox[] = INCBIN_U8("graphics/pokemon/dustox/footprint.1bpp"); + +const u32 gMonStillFrontPic_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/front.4bpp.lz"); +const u32 gMonPalette_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/normal.gbapal.lz"); +const u32 gMonBackPic_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/back.4bpp.lz"); +const u32 gMonShinyPalette_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/shiny.gbapal.lz"); +const u8 gMonIcon_Lotad[] = INCBIN_U8("graphics/pokemon/lotad/icon.4bpp"); +const u8 gMonFootprint_Lotad[] = INCBIN_U8("graphics/pokemon/lotad/footprint.1bpp"); + +const u32 gMonStillFrontPic_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/front.4bpp.lz"); +const u32 gMonPalette_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/normal.gbapal.lz"); +const u32 gMonBackPic_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/back.4bpp.lz"); +const u32 gMonShinyPalette_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/shiny.gbapal.lz"); +const u8 gMonIcon_Lombre[] = INCBIN_U8("graphics/pokemon/lombre/icon.4bpp"); +const u8 gMonFootprint_Lombre[] = INCBIN_U8("graphics/pokemon/lombre/footprint.1bpp"); + +const u32 gMonStillFrontPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/front.4bpp.lz"); +const u32 gMonPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/normal.gbapal.lz"); +const u32 gMonBackPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/back.4bpp.lz"); +const u32 gMonShinyPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/shiny.gbapal.lz"); +const u8 gMonIcon_Ludicolo[] = INCBIN_U8("graphics/pokemon/ludicolo/icon.4bpp"); +const u8 gMonFootprint_Ludicolo[] = INCBIN_U8("graphics/pokemon/ludicolo/footprint.1bpp"); + +const u32 gMonStillFrontPic_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/front.4bpp.lz"); +const u32 gMonPalette_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/normal.gbapal.lz"); +const u32 gMonBackPic_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/back.4bpp.lz"); +const u32 gMonShinyPalette_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/shiny.gbapal.lz"); +const u8 gMonIcon_Seedot[] = INCBIN_U8("graphics/pokemon/seedot/icon.4bpp"); +const u8 gMonFootprint_Seedot[] = INCBIN_U8("graphics/pokemon/seedot/footprint.1bpp"); + +const u32 gMonStillFrontPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/front.4bpp.lz"); +const u32 gMonPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/normal.gbapal.lz"); +const u32 gMonBackPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/back.4bpp.lz"); +const u32 gMonShinyPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/shiny.gbapal.lz"); +const u8 gMonIcon_Nuzleaf[] = INCBIN_U8("graphics/pokemon/nuzleaf/icon.4bpp"); +const u8 gMonFootprint_Nuzleaf[] = INCBIN_U8("graphics/pokemon/nuzleaf/footprint.1bpp"); + +const u32 gMonStillFrontPic_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/front.4bpp.lz"); +const u32 gMonPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/normal.gbapal.lz"); +const u32 gMonBackPic_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/back.4bpp.lz"); +const u32 gMonShinyPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/shiny.gbapal.lz"); +const u8 gMonIcon_Shiftry[] = INCBIN_U8("graphics/pokemon/shiftry/icon.4bpp"); +const u8 gMonFootprint_Shiftry[] = INCBIN_U8("graphics/pokemon/shiftry/footprint.1bpp"); + +const u32 gMonStillFrontPic_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/front.4bpp.lz"); +const u32 gMonPalette_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/normal.gbapal.lz"); +const u32 gMonBackPic_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/back.4bpp.lz"); +const u32 gMonShinyPalette_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/shiny.gbapal.lz"); +const u8 gMonIcon_Nincada[] = INCBIN_U8("graphics/pokemon/nincada/icon.4bpp"); +const u8 gMonFootprint_Nincada[] = INCBIN_U8("graphics/pokemon/nincada/footprint.1bpp"); + +const u32 gMonStillFrontPic_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/front.4bpp.lz"); +const u32 gMonPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/normal.gbapal.lz"); +const u32 gMonBackPic_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/back.4bpp.lz"); +const u32 gMonShinyPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/shiny.gbapal.lz"); +const u8 gMonIcon_Ninjask[] = INCBIN_U8("graphics/pokemon/ninjask/icon.4bpp"); +const u8 gMonFootprint_Ninjask[] = INCBIN_U8("graphics/pokemon/ninjask/footprint.1bpp"); + +const u32 gMonStillFrontPic_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/front.4bpp.lz"); +const u32 gMonPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/normal.gbapal.lz"); +const u32 gMonBackPic_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/back.4bpp.lz"); +const u32 gMonShinyPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/shiny.gbapal.lz"); +const u8 gMonIcon_Shedinja[] = INCBIN_U8("graphics/pokemon/shedinja/icon.4bpp"); +const u8 gMonFootprint_Shedinja[] = INCBIN_U8("graphics/pokemon/shedinja/footprint.1bpp"); + +const u32 gMonStillFrontPic_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/front.4bpp.lz"); +const u32 gMonPalette_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/normal.gbapal.lz"); +const u32 gMonBackPic_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/back.4bpp.lz"); +const u32 gMonShinyPalette_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/shiny.gbapal.lz"); +const u8 gMonIcon_Taillow[] = INCBIN_U8("graphics/pokemon/taillow/icon.4bpp"); +const u8 gMonFootprint_Taillow[] = INCBIN_U8("graphics/pokemon/taillow/footprint.1bpp"); + +const u32 gMonStillFrontPic_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/front.4bpp.lz"); +const u32 gMonPalette_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/normal.gbapal.lz"); +const u32 gMonBackPic_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/back.4bpp.lz"); +const u32 gMonShinyPalette_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/shiny.gbapal.lz"); +const u8 gMonIcon_Swellow[] = INCBIN_U8("graphics/pokemon/swellow/icon.4bpp"); +const u8 gMonFootprint_Swellow[] = INCBIN_U8("graphics/pokemon/swellow/footprint.1bpp"); + +const u32 gMonStillFrontPic_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/front.4bpp.lz"); +const u32 gMonPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/normal.gbapal.lz"); +const u32 gMonBackPic_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/back.4bpp.lz"); +const u32 gMonShinyPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/shiny.gbapal.lz"); +const u8 gMonIcon_Shroomish[] = INCBIN_U8("graphics/pokemon/shroomish/icon.4bpp"); +const u8 gMonFootprint_Shroomish[] = INCBIN_U8("graphics/pokemon/shroomish/footprint.1bpp"); + +const u32 gMonStillFrontPic_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/front.4bpp.lz"); +const u32 gMonPalette_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/normal.gbapal.lz"); +const u32 gMonBackPic_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/back.4bpp.lz"); +const u32 gMonShinyPalette_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/shiny.gbapal.lz"); +const u8 gMonIcon_Breloom[] = INCBIN_U8("graphics/pokemon/breloom/icon.4bpp"); +const u8 gMonFootprint_Breloom[] = INCBIN_U8("graphics/pokemon/breloom/footprint.1bpp"); + +const u32 gMonStillFrontPic_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/front.4bpp.lz"); +const u32 gMonPalette_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/normal.gbapal.lz"); +const u32 gMonBackPic_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/back.4bpp.lz"); +const u32 gMonShinyPalette_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/shiny.gbapal.lz"); +const u8 gMonIcon_Spinda[] = INCBIN_U8("graphics/pokemon/spinda/icon.4bpp"); +const u8 gMonFootprint_Spinda[] = INCBIN_U8("graphics/pokemon/spinda/footprint.1bpp"); + +const u32 gMonStillFrontPic_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/front.4bpp.lz"); +const u32 gMonPalette_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/normal.gbapal.lz"); +const u32 gMonBackPic_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/back.4bpp.lz"); +const u32 gMonShinyPalette_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/shiny.gbapal.lz"); +const u8 gMonIcon_Wingull[] = INCBIN_U8("graphics/pokemon/wingull/icon.4bpp"); +const u8 gMonFootprint_Wingull[] = INCBIN_U8("graphics/pokemon/wingull/footprint.1bpp"); + +const u32 gMonStillFrontPic_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/front.4bpp.lz"); +const u32 gMonPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/normal.gbapal.lz"); +const u32 gMonBackPic_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/back.4bpp.lz"); +const u32 gMonShinyPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/shiny.gbapal.lz"); +const u8 gMonIcon_Pelipper[] = INCBIN_U8("graphics/pokemon/pelipper/icon.4bpp"); +const u8 gMonFootprint_Pelipper[] = INCBIN_U8("graphics/pokemon/pelipper/footprint.1bpp"); + +const u32 gMonStillFrontPic_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/front.4bpp.lz"); +const u32 gMonPalette_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/normal.gbapal.lz"); +const u32 gMonBackPic_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/back.4bpp.lz"); +const u32 gMonShinyPalette_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/shiny.gbapal.lz"); +const u8 gMonIcon_Surskit[] = INCBIN_U8("graphics/pokemon/surskit/icon.4bpp"); +const u8 gMonFootprint_Surskit[] = INCBIN_U8("graphics/pokemon/surskit/footprint.1bpp"); + +const u32 gMonStillFrontPic_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/front.4bpp.lz"); +const u32 gMonPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/normal.gbapal.lz"); +const u32 gMonBackPic_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/back.4bpp.lz"); +const u32 gMonShinyPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/shiny.gbapal.lz"); +const u8 gMonIcon_Masquerain[] = INCBIN_U8("graphics/pokemon/masquerain/icon.4bpp"); +const u8 gMonFootprint_Masquerain[] = INCBIN_U8("graphics/pokemon/masquerain/footprint.1bpp"); + +const u32 gMonStillFrontPic_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/front.4bpp.lz"); +const u32 gMonPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/normal.gbapal.lz"); +const u32 gMonBackPic_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/back.4bpp.lz"); +const u32 gMonShinyPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/shiny.gbapal.lz"); +const u8 gMonIcon_Wailmer[] = INCBIN_U8("graphics/pokemon/wailmer/icon.4bpp"); +const u8 gMonFootprint_Wailmer[] = INCBIN_U8("graphics/pokemon/wailmer/footprint.1bpp"); + +const u32 gMonStillFrontPic_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/front.4bpp.lz"); +const u32 gMonPalette_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/normal.gbapal.lz"); +const u32 gMonBackPic_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/back.4bpp.lz"); +const u32 gMonShinyPalette_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/shiny.gbapal.lz"); +const u8 gMonIcon_Wailord[] = INCBIN_U8("graphics/pokemon/wailord/icon.4bpp"); +const u8 gMonFootprint_Wailord[] = INCBIN_U8("graphics/pokemon/wailord/footprint.1bpp"); + +const u32 gMonStillFrontPic_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/front.4bpp.lz"); +const u32 gMonPalette_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/normal.gbapal.lz"); +const u32 gMonBackPic_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/back.4bpp.lz"); +const u32 gMonShinyPalette_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/shiny.gbapal.lz"); +const u8 gMonIcon_Skitty[] = INCBIN_U8("graphics/pokemon/skitty/icon.4bpp"); +const u8 gMonFootprint_Skitty[] = INCBIN_U8("graphics/pokemon/skitty/footprint.1bpp"); + +const u32 gMonStillFrontPic_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/front.4bpp.lz"); +const u32 gMonPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/normal.gbapal.lz"); +const u32 gMonBackPic_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/back.4bpp.lz"); +const u32 gMonShinyPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/shiny.gbapal.lz"); +const u8 gMonIcon_Delcatty[] = INCBIN_U8("graphics/pokemon/delcatty/icon.4bpp"); +const u8 gMonFootprint_Delcatty[] = INCBIN_U8("graphics/pokemon/delcatty/footprint.1bpp"); + +const u32 gMonStillFrontPic_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/front.4bpp.lz"); +const u32 gMonPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/normal.gbapal.lz"); +const u32 gMonBackPic_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/back.4bpp.lz"); +const u32 gMonShinyPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/shiny.gbapal.lz"); +const u8 gMonIcon_Kecleon[] = INCBIN_U8("graphics/pokemon/kecleon/icon.4bpp"); +const u8 gMonFootprint_Kecleon[] = INCBIN_U8("graphics/pokemon/kecleon/footprint.1bpp"); + +const u32 gMonStillFrontPic_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/front.4bpp.lz"); +const u32 gMonPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/normal.gbapal.lz"); +const u32 gMonBackPic_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/back.4bpp.lz"); +const u32 gMonShinyPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/shiny.gbapal.lz"); +const u8 gMonIcon_Baltoy[] = INCBIN_U8("graphics/pokemon/baltoy/icon.4bpp"); +const u8 gMonFootprint_Baltoy[] = INCBIN_U8("graphics/pokemon/baltoy/footprint.1bpp"); + +const u32 gMonStillFrontPic_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/front.4bpp.lz"); +const u32 gMonPalette_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/normal.gbapal.lz"); +const u32 gMonBackPic_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/back.4bpp.lz"); +const u32 gMonShinyPalette_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/shiny.gbapal.lz"); +const u8 gMonIcon_Claydol[] = INCBIN_U8("graphics/pokemon/claydol/icon.4bpp"); +const u8 gMonFootprint_Claydol[] = INCBIN_U8("graphics/pokemon/claydol/footprint.1bpp"); + +const u32 gMonStillFrontPic_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/front.4bpp.lz"); +const u32 gMonPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/normal.gbapal.lz"); +const u32 gMonBackPic_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/back.4bpp.lz"); +const u32 gMonShinyPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/shiny.gbapal.lz"); +const u8 gMonIcon_Nosepass[] = INCBIN_U8("graphics/pokemon/nosepass/icon.4bpp"); +const u8 gMonFootprint_Nosepass[] = INCBIN_U8("graphics/pokemon/nosepass/footprint.1bpp"); + +const u32 gMonStillFrontPic_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/front.4bpp.lz"); +const u32 gMonPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/normal.gbapal.lz"); +const u32 gMonBackPic_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/back.4bpp.lz"); +const u32 gMonShinyPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/shiny.gbapal.lz"); +const u8 gMonIcon_Torkoal[] = INCBIN_U8("graphics/pokemon/torkoal/icon.4bpp"); +const u8 gMonFootprint_Torkoal[] = INCBIN_U8("graphics/pokemon/torkoal/footprint.1bpp"); + +const u32 gMonStillFrontPic_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/front.4bpp.lz"); +const u32 gMonPalette_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/normal.gbapal.lz"); +const u32 gMonBackPic_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/back.4bpp.lz"); +const u32 gMonShinyPalette_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/shiny.gbapal.lz"); +const u8 gMonIcon_Sableye[] = INCBIN_U8("graphics/pokemon/sableye/icon.4bpp"); +const u8 gMonFootprint_Sableye[] = INCBIN_U8("graphics/pokemon/sableye/footprint.1bpp"); + +const u32 gMonStillFrontPic_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/front.4bpp.lz"); +const u32 gMonPalette_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/normal.gbapal.lz"); +const u32 gMonBackPic_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/back.4bpp.lz"); +const u32 gMonShinyPalette_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/shiny.gbapal.lz"); +const u8 gMonIcon_Barboach[] = INCBIN_U8("graphics/pokemon/barboach/icon.4bpp"); +const u8 gMonFootprint_Barboach[] = INCBIN_U8("graphics/pokemon/barboach/footprint.1bpp"); + +const u32 gMonStillFrontPic_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/front.4bpp.lz"); +const u32 gMonPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/normal.gbapal.lz"); +const u32 gMonBackPic_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/back.4bpp.lz"); +const u32 gMonShinyPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/shiny.gbapal.lz"); +const u8 gMonIcon_Whiscash[] = INCBIN_U8("graphics/pokemon/whiscash/icon.4bpp"); +const u8 gMonFootprint_Whiscash[] = INCBIN_U8("graphics/pokemon/whiscash/footprint.1bpp"); + +const u32 gMonStillFrontPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/front.4bpp.lz"); +const u32 gMonPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/normal.gbapal.lz"); +const u32 gMonBackPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/back.4bpp.lz"); +const u32 gMonShinyPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/shiny.gbapal.lz"); +const u8 gMonIcon_Luvdisc[] = INCBIN_U8("graphics/pokemon/luvdisc/icon.4bpp"); +const u8 gMonFootprint_Luvdisc[] = INCBIN_U8("graphics/pokemon/luvdisc/footprint.1bpp"); + +const u32 gMonStillFrontPic_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/front.4bpp.lz"); +const u32 gMonPalette_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/normal.gbapal.lz"); +const u32 gMonBackPic_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/back.4bpp.lz"); +const u32 gMonShinyPalette_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/shiny.gbapal.lz"); +const u8 gMonIcon_Corphish[] = INCBIN_U8("graphics/pokemon/corphish/icon.4bpp"); +const u8 gMonFootprint_Corphish[] = INCBIN_U8("graphics/pokemon/corphish/footprint.1bpp"); + +const u32 gMonStillFrontPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/front.4bpp.lz"); +const u32 gMonPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/normal.gbapal.lz"); +const u32 gMonBackPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/back.4bpp.lz"); +const u32 gMonShinyPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/shiny.gbapal.lz"); +const u8 gMonIcon_Crawdaunt[] = INCBIN_U8("graphics/pokemon/crawdaunt/icon.4bpp"); +const u8 gMonFootprint_Crawdaunt[] = INCBIN_U8("graphics/pokemon/crawdaunt/footprint.1bpp"); + +const u32 gMonStillFrontPic_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/front.4bpp.lz"); +const u32 gMonPalette_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/normal.gbapal.lz"); +const u32 gMonBackPic_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/back.4bpp.lz"); +const u32 gMonShinyPalette_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/shiny.gbapal.lz"); +const u8 gMonIcon_Feebas[] = INCBIN_U8("graphics/pokemon/feebas/icon.4bpp"); +const u8 gMonFootprint_Feebas[] = INCBIN_U8("graphics/pokemon/feebas/footprint.1bpp"); + +const u32 gMonStillFrontPic_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/front.4bpp.lz"); +const u32 gMonPalette_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/normal.gbapal.lz"); +const u32 gMonBackPic_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/back.4bpp.lz"); +const u32 gMonShinyPalette_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/shiny.gbapal.lz"); +const u8 gMonIcon_Milotic[] = INCBIN_U8("graphics/pokemon/milotic/icon.4bpp"); +const u8 gMonFootprint_Milotic[] = INCBIN_U8("graphics/pokemon/milotic/footprint.1bpp"); + +const u32 gMonStillFrontPic_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/front.4bpp.lz"); +const u32 gMonPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/normal.gbapal.lz"); +const u32 gMonBackPic_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/back.4bpp.lz"); +const u32 gMonShinyPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/shiny.gbapal.lz"); +const u8 gMonIcon_Carvanha[] = INCBIN_U8("graphics/pokemon/carvanha/icon.4bpp"); +const u8 gMonFootprint_Carvanha[] = INCBIN_U8("graphics/pokemon/carvanha/footprint.1bpp"); + +const u32 gMonStillFrontPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/front.4bpp.lz"); +const u32 gMonPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/normal.gbapal.lz"); +const u32 gMonBackPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/back.4bpp.lz"); +const u32 gMonShinyPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/shiny.gbapal.lz"); +const u8 gMonIcon_Sharpedo[] = INCBIN_U8("graphics/pokemon/sharpedo/icon.4bpp"); +const u8 gMonFootprint_Sharpedo[] = INCBIN_U8("graphics/pokemon/sharpedo/footprint.1bpp"); + +const u32 gMonStillFrontPic_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/front.4bpp.lz"); +const u32 gMonPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/normal.gbapal.lz"); +const u32 gMonBackPic_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/back.4bpp.lz"); +const u32 gMonShinyPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/shiny.gbapal.lz"); +const u8 gMonIcon_Trapinch[] = INCBIN_U8("graphics/pokemon/trapinch/icon.4bpp"); +const u8 gMonFootprint_Trapinch[] = INCBIN_U8("graphics/pokemon/trapinch/footprint.1bpp"); + +const u32 gMonStillFrontPic_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/front.4bpp.lz"); +const u32 gMonPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/normal.gbapal.lz"); +const u32 gMonBackPic_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/back.4bpp.lz"); +const u32 gMonShinyPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/shiny.gbapal.lz"); +const u8 gMonIcon_Vibrava[] = INCBIN_U8("graphics/pokemon/vibrava/icon.4bpp"); +const u8 gMonFootprint_Vibrava[] = INCBIN_U8("graphics/pokemon/vibrava/footprint.1bpp"); + +const u32 gMonStillFrontPic_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/front.4bpp.lz"); +const u32 gMonPalette_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/normal.gbapal.lz"); +const u32 gMonBackPic_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/back.4bpp.lz"); +const u32 gMonShinyPalette_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/shiny.gbapal.lz"); +const u8 gMonIcon_Flygon[] = INCBIN_U8("graphics/pokemon/flygon/icon.4bpp"); +const u8 gMonFootprint_Flygon[] = INCBIN_U8("graphics/pokemon/flygon/footprint.1bpp"); + +const u32 gMonStillFrontPic_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/front.4bpp.lz"); +const u32 gMonPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/normal.gbapal.lz"); +const u32 gMonBackPic_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/back.4bpp.lz"); +const u32 gMonShinyPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/shiny.gbapal.lz"); +const u8 gMonIcon_Makuhita[] = INCBIN_U8("graphics/pokemon/makuhita/icon.4bpp"); +const u8 gMonFootprint_Makuhita[] = INCBIN_U8("graphics/pokemon/makuhita/footprint.1bpp"); + +const u32 gMonStillFrontPic_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/front.4bpp.lz"); +const u32 gMonPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/normal.gbapal.lz"); +const u32 gMonBackPic_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/back.4bpp.lz"); +const u32 gMonShinyPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/shiny.gbapal.lz"); +const u8 gMonIcon_Hariyama[] = INCBIN_U8("graphics/pokemon/hariyama/icon.4bpp"); +const u8 gMonFootprint_Hariyama[] = INCBIN_U8("graphics/pokemon/hariyama/footprint.1bpp"); + +const u32 gMonStillFrontPic_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/front.4bpp.lz"); +const u32 gMonPalette_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/normal.gbapal.lz"); +const u32 gMonBackPic_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/back.4bpp.lz"); +const u32 gMonShinyPalette_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/shiny.gbapal.lz"); +const u8 gMonIcon_Electrike[] = INCBIN_U8("graphics/pokemon/electrike/icon.4bpp"); +const u8 gMonFootprint_Electrike[] = INCBIN_U8("graphics/pokemon/electrike/footprint.1bpp"); + +const u32 gMonStillFrontPic_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/front.4bpp.lz"); +const u32 gMonPalette_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/normal.gbapal.lz"); +const u32 gMonBackPic_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/back.4bpp.lz"); +const u32 gMonShinyPalette_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/shiny.gbapal.lz"); +const u8 gMonIcon_Manectric[] = INCBIN_U8("graphics/pokemon/manectric/icon.4bpp"); +const u8 gMonFootprint_Manectric[] = INCBIN_U8("graphics/pokemon/manectric/footprint.1bpp"); + +const u32 gMonStillFrontPic_Numel[] = INCBIN_U32("graphics/pokemon/numel/front.4bpp.lz"); +const u32 gMonPalette_Numel[] = INCBIN_U32("graphics/pokemon/numel/normal.gbapal.lz"); +const u32 gMonBackPic_Numel[] = INCBIN_U32("graphics/pokemon/numel/back.4bpp.lz"); +const u32 gMonShinyPalette_Numel[] = INCBIN_U32("graphics/pokemon/numel/shiny.gbapal.lz"); +const u8 gMonIcon_Numel[] = INCBIN_U8("graphics/pokemon/numel/icon.4bpp"); +const u8 gMonFootprint_Numel[] = INCBIN_U8("graphics/pokemon/numel/footprint.1bpp"); + +const u32 gMonStillFrontPic_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/front.4bpp.lz"); +const u32 gMonPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/normal.gbapal.lz"); +const u32 gMonBackPic_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/back.4bpp.lz"); +const u32 gMonShinyPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/shiny.gbapal.lz"); +const u8 gMonIcon_Camerupt[] = INCBIN_U8("graphics/pokemon/camerupt/icon.4bpp"); +const u8 gMonFootprint_Camerupt[] = INCBIN_U8("graphics/pokemon/camerupt/footprint.1bpp"); + +const u32 gMonStillFrontPic_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/front.4bpp.lz"); +const u32 gMonPalette_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/normal.gbapal.lz"); +const u32 gMonBackPic_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/back.4bpp.lz"); +const u32 gMonShinyPalette_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/shiny.gbapal.lz"); +const u8 gMonIcon_Spheal[] = INCBIN_U8("graphics/pokemon/spheal/icon.4bpp"); +const u8 gMonFootprint_Spheal[] = INCBIN_U8("graphics/pokemon/spheal/footprint.1bpp"); + +const u32 gMonStillFrontPic_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/front.4bpp.lz"); +const u32 gMonPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/normal.gbapal.lz"); +const u32 gMonBackPic_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/back.4bpp.lz"); +const u32 gMonShinyPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/shiny.gbapal.lz"); +const u8 gMonIcon_Sealeo[] = INCBIN_U8("graphics/pokemon/sealeo/icon.4bpp"); +const u8 gMonFootprint_Sealeo[] = INCBIN_U8("graphics/pokemon/sealeo/footprint.1bpp"); + +const u32 gMonStillFrontPic_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/front.4bpp.lz"); +const u32 gMonPalette_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/normal.gbapal.lz"); +const u32 gMonBackPic_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/back.4bpp.lz"); +const u32 gMonShinyPalette_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/shiny.gbapal.lz"); +const u8 gMonIcon_Walrein[] = INCBIN_U8("graphics/pokemon/walrein/icon.4bpp"); +const u8 gMonFootprint_Walrein[] = INCBIN_U8("graphics/pokemon/walrein/footprint.1bpp"); + +const u32 gMonStillFrontPic_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/front.4bpp.lz"); +const u32 gMonPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/normal.gbapal.lz"); +const u32 gMonBackPic_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/back.4bpp.lz"); +const u32 gMonShinyPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/shiny.gbapal.lz"); +const u8 gMonIcon_Cacnea[] = INCBIN_U8("graphics/pokemon/cacnea/icon.4bpp"); +const u8 gMonFootprint_Cacnea[] = INCBIN_U8("graphics/pokemon/cacnea/footprint.1bpp"); + +const u32 gMonStillFrontPic_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/front.4bpp.lz"); +const u32 gMonPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/normal.gbapal.lz"); +const u32 gMonBackPic_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/back.4bpp.lz"); +const u32 gMonShinyPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/shiny.gbapal.lz"); +const u8 gMonIcon_Cacturne[] = INCBIN_U8("graphics/pokemon/cacturne/icon.4bpp"); +const u8 gMonFootprint_Cacturne[] = INCBIN_U8("graphics/pokemon/cacturne/footprint.1bpp"); + +const u32 gMonStillFrontPic_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/front.4bpp.lz"); +const u32 gMonPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/normal.gbapal.lz"); +const u32 gMonBackPic_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/back.4bpp.lz"); +const u32 gMonShinyPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/shiny.gbapal.lz"); +const u8 gMonIcon_Snorunt[] = INCBIN_U8("graphics/pokemon/snorunt/icon.4bpp"); +const u8 gMonFootprint_Snorunt[] = INCBIN_U8("graphics/pokemon/snorunt/footprint.1bpp"); + +const u32 gMonStillFrontPic_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/front.4bpp.lz"); +const u32 gMonPalette_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/normal.gbapal.lz"); +const u32 gMonBackPic_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/back.4bpp.lz"); +const u32 gMonShinyPalette_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/shiny.gbapal.lz"); +const u8 gMonIcon_Glalie[] = INCBIN_U8("graphics/pokemon/glalie/icon.4bpp"); +const u8 gMonFootprint_Glalie[] = INCBIN_U8("graphics/pokemon/glalie/footprint.1bpp"); + +const u32 gMonStillFrontPic_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/front.4bpp.lz"); +const u32 gMonPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/normal.gbapal.lz"); +const u32 gMonBackPic_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/back.4bpp.lz"); +const u32 gMonShinyPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/shiny.gbapal.lz"); +const u8 gMonIcon_Lunatone[] = INCBIN_U8("graphics/pokemon/lunatone/icon.4bpp"); +const u8 gMonFootprint_Lunatone[] = INCBIN_U8("graphics/pokemon/lunatone/footprint.1bpp"); + +const u32 gMonStillFrontPic_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/front.4bpp.lz"); +const u32 gMonPalette_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/normal.gbapal.lz"); +const u32 gMonBackPic_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/back.4bpp.lz"); +const u32 gMonShinyPalette_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/shiny.gbapal.lz"); +const u8 gMonIcon_Solrock[] = INCBIN_U8("graphics/pokemon/solrock/icon.4bpp"); +const u8 gMonFootprint_Solrock[] = INCBIN_U8("graphics/pokemon/solrock/footprint.1bpp"); + +const u32 gMonStillFrontPic_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/front.4bpp.lz"); +const u32 gMonPalette_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/normal.gbapal.lz"); +const u32 gMonBackPic_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/back.4bpp.lz"); +const u32 gMonShinyPalette_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/shiny.gbapal.lz"); +const u8 gMonIcon_Azurill[] = INCBIN_U8("graphics/pokemon/azurill/icon.4bpp"); +const u8 gMonFootprint_Azurill[] = INCBIN_U8("graphics/pokemon/azurill/footprint.1bpp"); + +const u32 gMonStillFrontPic_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/front.4bpp.lz"); +const u32 gMonPalette_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/normal.gbapal.lz"); +const u32 gMonBackPic_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/back.4bpp.lz"); +const u32 gMonShinyPalette_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/shiny.gbapal.lz"); +const u8 gMonIcon_Spoink[] = INCBIN_U8("graphics/pokemon/spoink/icon.4bpp"); +const u8 gMonFootprint_Spoink[] = INCBIN_U8("graphics/pokemon/spoink/footprint.1bpp"); + +const u32 gMonStillFrontPic_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/front.4bpp.lz"); +const u32 gMonPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/normal.gbapal.lz"); +const u32 gMonBackPic_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/back.4bpp.lz"); +const u32 gMonShinyPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/shiny.gbapal.lz"); +const u8 gMonIcon_Grumpig[] = INCBIN_U8("graphics/pokemon/grumpig/icon.4bpp"); +const u8 gMonFootprint_Grumpig[] = INCBIN_U8("graphics/pokemon/grumpig/footprint.1bpp"); + +const u32 gMonStillFrontPic_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/front.4bpp.lz"); +const u32 gMonPalette_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/normal.gbapal.lz"); +const u32 gMonBackPic_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/back.4bpp.lz"); +const u32 gMonShinyPalette_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/shiny.gbapal.lz"); +const u8 gMonIcon_Plusle[] = INCBIN_U8("graphics/pokemon/plusle/icon.4bpp"); +const u8 gMonFootprint_Plusle[] = INCBIN_U8("graphics/pokemon/plusle/footprint.1bpp"); + +const u32 gMonStillFrontPic_Minun[] = INCBIN_U32("graphics/pokemon/minun/front.4bpp.lz"); +const u32 gMonPalette_Minun[] = INCBIN_U32("graphics/pokemon/minun/normal.gbapal.lz"); +const u32 gMonBackPic_Minun[] = INCBIN_U32("graphics/pokemon/minun/back.4bpp.lz"); +const u32 gMonShinyPalette_Minun[] = INCBIN_U32("graphics/pokemon/minun/shiny.gbapal.lz"); +const u8 gMonIcon_Minun[] = INCBIN_U8("graphics/pokemon/minun/icon.4bpp"); +const u8 gMonFootprint_Minun[] = INCBIN_U8("graphics/pokemon/minun/footprint.1bpp"); + +const u32 gMonStillFrontPic_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/front.4bpp.lz"); +const u32 gMonPalette_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/normal.gbapal.lz"); +const u32 gMonBackPic_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/back.4bpp.lz"); +const u32 gMonShinyPalette_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/shiny.gbapal.lz"); +const u8 gMonIcon_Mawile[] = INCBIN_U8("graphics/pokemon/mawile/icon.4bpp"); +const u8 gMonFootprint_Mawile[] = INCBIN_U8("graphics/pokemon/mawile/footprint.1bpp"); + +const u32 gMonStillFrontPic_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/front.4bpp.lz"); +const u32 gMonPalette_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/normal.gbapal.lz"); +const u32 gMonBackPic_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/back.4bpp.lz"); +const u32 gMonShinyPalette_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/shiny.gbapal.lz"); +const u8 gMonIcon_Meditite[] = INCBIN_U8("graphics/pokemon/meditite/icon.4bpp"); +const u8 gMonFootprint_Meditite[] = INCBIN_U8("graphics/pokemon/meditite/footprint.1bpp"); + +const u32 gMonStillFrontPic_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/front.4bpp.lz"); +const u32 gMonPalette_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/normal.gbapal.lz"); +const u32 gMonBackPic_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/back.4bpp.lz"); +const u32 gMonShinyPalette_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/shiny.gbapal.lz"); +const u8 gMonIcon_Medicham[] = INCBIN_U8("graphics/pokemon/medicham/icon.4bpp"); +const u8 gMonFootprint_Medicham[] = INCBIN_U8("graphics/pokemon/medicham/footprint.1bpp"); + +const u32 gMonStillFrontPic_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/front.4bpp.lz"); +const u32 gMonPalette_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/normal.gbapal.lz"); +const u32 gMonBackPic_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/back.4bpp.lz"); +const u32 gMonShinyPalette_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/shiny.gbapal.lz"); +const u8 gMonIcon_Swablu[] = INCBIN_U8("graphics/pokemon/swablu/icon.4bpp"); +const u8 gMonFootprint_Swablu[] = INCBIN_U8("graphics/pokemon/swablu/footprint.1bpp"); + +const u32 gMonStillFrontPic_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/front.4bpp.lz"); +const u32 gMonPalette_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/normal.gbapal.lz"); +const u32 gMonBackPic_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/back.4bpp.lz"); +const u32 gMonShinyPalette_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/shiny.gbapal.lz"); +const u8 gMonIcon_Altaria[] = INCBIN_U8("graphics/pokemon/altaria/icon.4bpp"); +const u8 gMonFootprint_Altaria[] = INCBIN_U8("graphics/pokemon/altaria/footprint.1bpp"); + +const u32 gMonStillFrontPic_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/front.4bpp.lz"); +const u32 gMonPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/normal.gbapal.lz"); +const u32 gMonBackPic_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/back.4bpp.lz"); +const u32 gMonShinyPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/shiny.gbapal.lz"); +const u8 gMonIcon_Wynaut[] = INCBIN_U8("graphics/pokemon/wynaut/icon.4bpp"); +const u8 gMonFootprint_Wynaut[] = INCBIN_U8("graphics/pokemon/wynaut/footprint.1bpp"); + +const u32 gMonStillFrontPic_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/front.4bpp.lz"); +const u32 gMonPalette_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/normal.gbapal.lz"); +const u32 gMonBackPic_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/back.4bpp.lz"); +const u32 gMonShinyPalette_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/shiny.gbapal.lz"); +const u8 gMonIcon_Duskull[] = INCBIN_U8("graphics/pokemon/duskull/icon.4bpp"); +const u8 gMonFootprint_Duskull[] = INCBIN_U8("graphics/pokemon/duskull/footprint.1bpp"); + +const u32 gMonStillFrontPic_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/front.4bpp.lz"); +const u32 gMonPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/normal.gbapal.lz"); +const u32 gMonBackPic_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/back.4bpp.lz"); +const u32 gMonShinyPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/shiny.gbapal.lz"); +const u8 gMonIcon_Dusclops[] = INCBIN_U8("graphics/pokemon/dusclops/icon.4bpp"); +const u8 gMonFootprint_Dusclops[] = INCBIN_U8("graphics/pokemon/dusclops/footprint.1bpp"); + +const u32 gMonStillFrontPic_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/front.4bpp.lz"); +const u32 gMonPalette_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/normal.gbapal.lz"); +const u32 gMonBackPic_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/back.4bpp.lz"); +const u32 gMonShinyPalette_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/shiny.gbapal.lz"); +const u8 gMonIcon_Roselia[] = INCBIN_U8("graphics/pokemon/roselia/icon.4bpp"); +const u8 gMonFootprint_Roselia[] = INCBIN_U8("graphics/pokemon/roselia/footprint.1bpp"); + +const u32 gMonStillFrontPic_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/front.4bpp.lz"); +const u32 gMonPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/normal.gbapal.lz"); +const u32 gMonBackPic_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/back.4bpp.lz"); +const u32 gMonShinyPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/shiny.gbapal.lz"); +const u8 gMonIcon_Slakoth[] = INCBIN_U8("graphics/pokemon/slakoth/icon.4bpp"); +const u8 gMonFootprint_Slakoth[] = INCBIN_U8("graphics/pokemon/slakoth/footprint.1bpp"); + +const u32 gMonStillFrontPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/front.4bpp.lz"); +const u32 gMonPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/normal.gbapal.lz"); +const u32 gMonBackPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/back.4bpp.lz"); +const u32 gMonShinyPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/shiny.gbapal.lz"); +const u8 gMonIcon_Vigoroth[] = INCBIN_U8("graphics/pokemon/vigoroth/icon.4bpp"); +const u8 gMonFootprint_Vigoroth[] = INCBIN_U8("graphics/pokemon/vigoroth/footprint.1bpp"); + +const u32 gMonStillFrontPic_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/front.4bpp.lz"); +const u32 gMonPalette_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/normal.gbapal.lz"); +const u32 gMonBackPic_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/back.4bpp.lz"); +const u32 gMonShinyPalette_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/shiny.gbapal.lz"); +const u8 gMonIcon_Slaking[] = INCBIN_U8("graphics/pokemon/slaking/icon.4bpp"); +const u8 gMonFootprint_Slaking[] = INCBIN_U8("graphics/pokemon/slaking/footprint.1bpp"); + +const u32 gMonStillFrontPic_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/front.4bpp.lz"); +const u32 gMonPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/normal.gbapal.lz"); +const u32 gMonBackPic_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/back.4bpp.lz"); +const u32 gMonShinyPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/shiny.gbapal.lz"); +const u8 gMonIcon_Gulpin[] = INCBIN_U8("graphics/pokemon/gulpin/icon.4bpp"); +const u8 gMonFootprint_Gulpin[] = INCBIN_U8("graphics/pokemon/gulpin/footprint.1bpp"); + +const u32 gMonStillFrontPic_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/front.4bpp.lz"); +const u32 gMonPalette_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/normal.gbapal.lz"); +const u32 gMonBackPic_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/back.4bpp.lz"); +const u32 gMonShinyPalette_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/shiny.gbapal.lz"); +const u8 gMonIcon_Swalot[] = INCBIN_U8("graphics/pokemon/swalot/icon.4bpp"); +const u8 gMonFootprint_Swalot[] = INCBIN_U8("graphics/pokemon/swalot/footprint.1bpp"); + +const u32 gMonStillFrontPic_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/front.4bpp.lz"); +const u32 gMonPalette_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/normal.gbapal.lz"); +const u32 gMonBackPic_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/back.4bpp.lz"); +const u32 gMonShinyPalette_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/shiny.gbapal.lz"); +const u8 gMonIcon_Tropius[] = INCBIN_U8("graphics/pokemon/tropius/icon.4bpp"); +const u8 gMonFootprint_Tropius[] = INCBIN_U8("graphics/pokemon/tropius/footprint.1bpp"); + +const u32 gMonStillFrontPic_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/front.4bpp.lz"); +const u32 gMonPalette_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/normal.gbapal.lz"); +const u32 gMonBackPic_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/back.4bpp.lz"); +const u32 gMonShinyPalette_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/shiny.gbapal.lz"); +const u8 gMonIcon_Whismur[] = INCBIN_U8("graphics/pokemon/whismur/icon.4bpp"); +const u8 gMonFootprint_Whismur[] = INCBIN_U8("graphics/pokemon/whismur/footprint.1bpp"); + +const u32 gMonStillFrontPic_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/front.4bpp.lz"); +const u32 gMonPalette_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/normal.gbapal.lz"); +const u32 gMonBackPic_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/back.4bpp.lz"); +const u32 gMonShinyPalette_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/shiny.gbapal.lz"); +const u8 gMonIcon_Loudred[] = INCBIN_U8("graphics/pokemon/loudred/icon.4bpp"); +const u8 gMonFootprint_Loudred[] = INCBIN_U8("graphics/pokemon/loudred/footprint.1bpp"); + +const u32 gMonStillFrontPic_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/front.4bpp.lz"); +const u32 gMonPalette_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/normal.gbapal.lz"); +const u32 gMonBackPic_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/back.4bpp.lz"); +const u32 gMonShinyPalette_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/shiny.gbapal.lz"); +const u8 gMonIcon_Exploud[] = INCBIN_U8("graphics/pokemon/exploud/icon.4bpp"); +const u8 gMonFootprint_Exploud[] = INCBIN_U8("graphics/pokemon/exploud/footprint.1bpp"); + +const u32 gMonStillFrontPic_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/front.4bpp.lz"); +const u32 gMonPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/normal.gbapal.lz"); +const u32 gMonBackPic_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/back.4bpp.lz"); +const u32 gMonShinyPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/shiny.gbapal.lz"); +const u8 gMonIcon_Clamperl[] = INCBIN_U8("graphics/pokemon/clamperl/icon.4bpp"); +const u8 gMonFootprint_Clamperl[] = INCBIN_U8("graphics/pokemon/clamperl/footprint.1bpp"); + +const u32 gMonStillFrontPic_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/front.4bpp.lz"); +const u32 gMonPalette_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/normal.gbapal.lz"); +const u32 gMonBackPic_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/back.4bpp.lz"); +const u32 gMonShinyPalette_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/shiny.gbapal.lz"); +const u8 gMonIcon_Huntail[] = INCBIN_U8("graphics/pokemon/huntail/icon.4bpp"); +const u8 gMonFootprint_Huntail[] = INCBIN_U8("graphics/pokemon/huntail/footprint.1bpp"); + +const u32 gMonStillFrontPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/front.4bpp.lz"); +const u32 gMonPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/normal.gbapal.lz"); +const u32 gMonBackPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/back.4bpp.lz"); +const u32 gMonShinyPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/shiny.gbapal.lz"); +const u8 gMonIcon_Gorebyss[] = INCBIN_U8("graphics/pokemon/gorebyss/icon.4bpp"); +const u8 gMonFootprint_Gorebyss[] = INCBIN_U8("graphics/pokemon/gorebyss/footprint.1bpp"); + +const u32 gMonStillFrontPic_Absol[] = INCBIN_U32("graphics/pokemon/absol/front.4bpp.lz"); +const u32 gMonPalette_Absol[] = INCBIN_U32("graphics/pokemon/absol/normal.gbapal.lz"); +const u32 gMonBackPic_Absol[] = INCBIN_U32("graphics/pokemon/absol/back.4bpp.lz"); +const u32 gMonShinyPalette_Absol[] = INCBIN_U32("graphics/pokemon/absol/shiny.gbapal.lz"); +const u8 gMonIcon_Absol[] = INCBIN_U8("graphics/pokemon/absol/icon.4bpp"); +const u8 gMonFootprint_Absol[] = INCBIN_U8("graphics/pokemon/absol/footprint.1bpp"); + +const u32 gMonStillFrontPic_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/front.4bpp.lz"); +const u32 gMonPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/normal.gbapal.lz"); +const u32 gMonBackPic_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/back.4bpp.lz"); +const u32 gMonShinyPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/shiny.gbapal.lz"); +const u8 gMonIcon_Shuppet[] = INCBIN_U8("graphics/pokemon/shuppet/icon.4bpp"); +const u8 gMonFootprint_Shuppet[] = INCBIN_U8("graphics/pokemon/shuppet/footprint.1bpp"); + +const u32 gMonStillFrontPic_Banette[] = INCBIN_U32("graphics/pokemon/banette/front.4bpp.lz"); +const u32 gMonPalette_Banette[] = INCBIN_U32("graphics/pokemon/banette/normal.gbapal.lz"); +const u32 gMonBackPic_Banette[] = INCBIN_U32("graphics/pokemon/banette/back.4bpp.lz"); +const u32 gMonShinyPalette_Banette[] = INCBIN_U32("graphics/pokemon/banette/shiny.gbapal.lz"); +const u8 gMonIcon_Banette[] = INCBIN_U8("graphics/pokemon/banette/icon.4bpp"); +const u8 gMonFootprint_Banette[] = INCBIN_U8("graphics/pokemon/banette/footprint.1bpp"); + +const u32 gMonStillFrontPic_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/front.4bpp.lz"); +const u32 gMonPalette_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/normal.gbapal.lz"); +const u32 gMonBackPic_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/back.4bpp.lz"); +const u32 gMonShinyPalette_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/shiny.gbapal.lz"); +const u8 gMonIcon_Seviper[] = INCBIN_U8("graphics/pokemon/seviper/icon.4bpp"); +const u8 gMonFootprint_Seviper[] = INCBIN_U8("graphics/pokemon/seviper/footprint.1bpp"); + +const u32 gMonStillFrontPic_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/front.4bpp.lz"); +const u32 gMonPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/normal.gbapal.lz"); +const u32 gMonBackPic_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/back.4bpp.lz"); +const u32 gMonShinyPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/shiny.gbapal.lz"); +const u8 gMonIcon_Zangoose[] = INCBIN_U8("graphics/pokemon/zangoose/icon.4bpp"); +const u8 gMonFootprint_Zangoose[] = INCBIN_U8("graphics/pokemon/zangoose/footprint.1bpp"); + +const u32 gMonStillFrontPic_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/front.4bpp.lz"); +const u32 gMonPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/normal.gbapal.lz"); +const u32 gMonBackPic_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/back.4bpp.lz"); +const u32 gMonShinyPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/shiny.gbapal.lz"); +const u8 gMonIcon_Relicanth[] = INCBIN_U8("graphics/pokemon/relicanth/icon.4bpp"); +const u8 gMonFootprint_Relicanth[] = INCBIN_U8("graphics/pokemon/relicanth/footprint.1bpp"); + +const u32 gMonStillFrontPic_Aron[] = INCBIN_U32("graphics/pokemon/aron/front.4bpp.lz"); +const u32 gMonPalette_Aron[] = INCBIN_U32("graphics/pokemon/aron/normal.gbapal.lz"); +const u32 gMonBackPic_Aron[] = INCBIN_U32("graphics/pokemon/aron/back.4bpp.lz"); +const u32 gMonShinyPalette_Aron[] = INCBIN_U32("graphics/pokemon/aron/shiny.gbapal.lz"); +const u8 gMonIcon_Aron[] = INCBIN_U8("graphics/pokemon/aron/icon.4bpp"); +const u8 gMonFootprint_Aron[] = INCBIN_U8("graphics/pokemon/aron/footprint.1bpp"); + +const u32 gMonStillFrontPic_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/front.4bpp.lz"); +const u32 gMonPalette_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/normal.gbapal.lz"); +const u32 gMonBackPic_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/back.4bpp.lz"); +const u32 gMonShinyPalette_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/shiny.gbapal.lz"); +const u8 gMonIcon_Lairon[] = INCBIN_U8("graphics/pokemon/lairon/icon.4bpp"); +const u8 gMonFootprint_Lairon[] = INCBIN_U8("graphics/pokemon/lairon/footprint.1bpp"); + +const u32 gMonStillFrontPic_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/front.4bpp.lz"); +const u32 gMonPalette_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/normal.gbapal.lz"); +const u32 gMonBackPic_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/back.4bpp.lz"); +const u32 gMonShinyPalette_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/shiny.gbapal.lz"); +const u8 gMonIcon_Aggron[] = INCBIN_U8("graphics/pokemon/aggron/icon.4bpp"); +const u8 gMonFootprint_Aggron[] = INCBIN_U8("graphics/pokemon/aggron/footprint.1bpp"); + +const u32 gMonStillFrontPic_Castform[] = INCBIN_U32("graphics/pokemon/castform/front.4bpp.lz"); +const u32 gMonPalette_Castform[] = INCBIN_U32("graphics/pokemon/castform/normal.gbapal.lz"); +const u32 gMonBackPic_Castform[] = INCBIN_U32("graphics/pokemon/castform/back.4bpp.lz"); +const u32 gMonShinyPalette_Castform[] = INCBIN_U32("graphics/pokemon/castform/shiny.gbapal.lz"); +const u8 gMonIcon_Castform[] = INCBIN_U8("graphics/pokemon/castform/icon.4bpp"); +const u8 gMonFootprint_Castform[] = INCBIN_U8("graphics/pokemon/castform/footprint.1bpp"); + +const u32 gMonStillFrontPic_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/front.4bpp.lz"); +const u32 gMonPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/normal.gbapal.lz"); +const u32 gMonBackPic_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/back.4bpp.lz"); +const u32 gMonShinyPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/shiny.gbapal.lz"); +const u8 gMonIcon_Volbeat[] = INCBIN_U8("graphics/pokemon/volbeat/icon.4bpp"); +const u8 gMonFootprint_Volbeat[] = INCBIN_U8("graphics/pokemon/volbeat/footprint.1bpp"); + +const u32 gMonStillFrontPic_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/front.4bpp.lz"); +const u32 gMonPalette_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/normal.gbapal.lz"); +const u32 gMonBackPic_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/back.4bpp.lz"); +const u32 gMonShinyPalette_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/shiny.gbapal.lz"); +const u8 gMonIcon_Illumise[] = INCBIN_U8("graphics/pokemon/illumise/icon.4bpp"); +const u8 gMonFootprint_Illumise[] = INCBIN_U8("graphics/pokemon/illumise/footprint.1bpp"); + +const u32 gMonStillFrontPic_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/front.4bpp.lz"); +const u32 gMonPalette_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/normal.gbapal.lz"); +const u32 gMonBackPic_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/back.4bpp.lz"); +const u32 gMonShinyPalette_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/shiny.gbapal.lz"); +const u8 gMonIcon_Lileep[] = INCBIN_U8("graphics/pokemon/lileep/icon.4bpp"); +const u8 gMonFootprint_Lileep[] = INCBIN_U8("graphics/pokemon/lileep/footprint.1bpp"); + +const u32 gMonStillFrontPic_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/front.4bpp.lz"); +const u32 gMonPalette_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/normal.gbapal.lz"); +const u32 gMonBackPic_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/back.4bpp.lz"); +const u32 gMonShinyPalette_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/shiny.gbapal.lz"); +const u8 gMonIcon_Cradily[] = INCBIN_U8("graphics/pokemon/cradily/icon.4bpp"); +const u8 gMonFootprint_Cradily[] = INCBIN_U8("graphics/pokemon/cradily/footprint.1bpp"); + +const u32 gMonStillFrontPic_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/front.4bpp.lz"); +const u32 gMonPalette_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/normal.gbapal.lz"); +const u32 gMonBackPic_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/back.4bpp.lz"); +const u32 gMonShinyPalette_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/shiny.gbapal.lz"); +const u8 gMonIcon_Anorith[] = INCBIN_U8("graphics/pokemon/anorith/icon.4bpp"); +const u8 gMonFootprint_Anorith[] = INCBIN_U8("graphics/pokemon/anorith/footprint.1bpp"); + +const u32 gMonStillFrontPic_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/front.4bpp.lz"); +const u32 gMonPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/normal.gbapal.lz"); +const u32 gMonBackPic_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/back.4bpp.lz"); +const u32 gMonShinyPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/shiny.gbapal.lz"); +const u8 gMonIcon_Armaldo[] = INCBIN_U8("graphics/pokemon/armaldo/icon.4bpp"); +const u8 gMonFootprint_Armaldo[] = INCBIN_U8("graphics/pokemon/armaldo/footprint.1bpp"); + +const u32 gMonStillFrontPic_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/front.4bpp.lz"); +const u32 gMonPalette_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/normal.gbapal.lz"); +const u32 gMonBackPic_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/back.4bpp.lz"); +const u32 gMonShinyPalette_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/shiny.gbapal.lz"); +const u8 gMonIcon_Ralts[] = INCBIN_U8("graphics/pokemon/ralts/icon.4bpp"); +const u8 gMonFootprint_Ralts[] = INCBIN_U8("graphics/pokemon/ralts/footprint.1bpp"); + +const u32 gMonStillFrontPic_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/front.4bpp.lz"); +const u32 gMonPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/normal.gbapal.lz"); +const u32 gMonBackPic_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/back.4bpp.lz"); +const u32 gMonShinyPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/shiny.gbapal.lz"); +const u8 gMonIcon_Kirlia[] = INCBIN_U8("graphics/pokemon/kirlia/icon.4bpp"); +const u8 gMonFootprint_Kirlia[] = INCBIN_U8("graphics/pokemon/kirlia/footprint.1bpp"); + +const u32 gMonStillFrontPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/front.4bpp.lz"); +const u32 gMonPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/normal.gbapal.lz"); +const u32 gMonBackPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/back.4bpp.lz"); +const u32 gMonShinyPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/shiny.gbapal.lz"); +const u8 gMonIcon_Gardevoir[] = INCBIN_U8("graphics/pokemon/gardevoir/icon.4bpp"); +const u8 gMonFootprint_Gardevoir[] = INCBIN_U8("graphics/pokemon/gardevoir/footprint.1bpp"); + +const u32 gMonStillFrontPic_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/front.4bpp.lz"); +const u32 gMonPalette_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/normal.gbapal.lz"); +const u32 gMonBackPic_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/back.4bpp.lz"); +const u32 gMonShinyPalette_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/shiny.gbapal.lz"); +const u8 gMonIcon_Bagon[] = INCBIN_U8("graphics/pokemon/bagon/icon.4bpp"); +const u8 gMonFootprint_Bagon[] = INCBIN_U8("graphics/pokemon/bagon/footprint.1bpp"); + +const u32 gMonStillFrontPic_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/front.4bpp.lz"); +const u32 gMonPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/normal.gbapal.lz"); +const u32 gMonBackPic_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/back.4bpp.lz"); +const u32 gMonShinyPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/shiny.gbapal.lz"); +const u8 gMonIcon_Shelgon[] = INCBIN_U8("graphics/pokemon/shelgon/icon.4bpp"); +const u8 gMonFootprint_Shelgon[] = INCBIN_U8("graphics/pokemon/shelgon/footprint.1bpp"); + +const u32 gMonStillFrontPic_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/front.4bpp.lz"); +const u32 gMonPalette_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/normal.gbapal.lz"); +const u32 gMonBackPic_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/back.4bpp.lz"); +const u32 gMonShinyPalette_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/shiny.gbapal.lz"); +const u8 gMonIcon_Salamence[] = INCBIN_U8("graphics/pokemon/salamence/icon.4bpp"); +const u8 gMonFootprint_Salamence[] = INCBIN_U8("graphics/pokemon/salamence/footprint.1bpp"); + +const u32 gMonStillFrontPic_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/front.4bpp.lz"); +const u32 gMonPalette_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/normal.gbapal.lz"); +const u32 gMonBackPic_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/back.4bpp.lz"); +const u32 gMonShinyPalette_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/shiny.gbapal.lz"); +const u8 gMonIcon_Beldum[] = INCBIN_U8("graphics/pokemon/beldum/icon.4bpp"); +const u8 gMonFootprint_Beldum[] = INCBIN_U8("graphics/pokemon/beldum/footprint.1bpp"); + +const u32 gMonStillFrontPic_Metang[] = INCBIN_U32("graphics/pokemon/metang/front.4bpp.lz"); +const u32 gMonPalette_Metang[] = INCBIN_U32("graphics/pokemon/metang/normal.gbapal.lz"); +const u32 gMonBackPic_Metang[] = INCBIN_U32("graphics/pokemon/metang/back.4bpp.lz"); +const u32 gMonShinyPalette_Metang[] = INCBIN_U32("graphics/pokemon/metang/shiny.gbapal.lz"); +const u8 gMonIcon_Metang[] = INCBIN_U8("graphics/pokemon/metang/icon.4bpp"); +const u8 gMonFootprint_Metang[] = INCBIN_U8("graphics/pokemon/metang/footprint.1bpp"); + +const u32 gMonStillFrontPic_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/front.4bpp.lz"); +const u32 gMonPalette_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/normal.gbapal.lz"); +const u32 gMonBackPic_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/back.4bpp.lz"); +const u32 gMonShinyPalette_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/shiny.gbapal.lz"); +const u8 gMonIcon_Metagross[] = INCBIN_U8("graphics/pokemon/metagross/icon.4bpp"); +const u8 gMonFootprint_Metagross[] = INCBIN_U8("graphics/pokemon/metagross/footprint.1bpp"); + +const u32 gMonStillFrontPic_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/front.4bpp.lz"); +const u32 gMonPalette_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/normal.gbapal.lz"); +const u32 gMonBackPic_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/back.4bpp.lz"); +const u32 gMonShinyPalette_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/shiny.gbapal.lz"); +const u8 gMonIcon_Regirock[] = INCBIN_U8("graphics/pokemon/regirock/icon.4bpp"); +const u8 gMonFootprint_Regirock[] = INCBIN_U8("graphics/pokemon/regirock/footprint.1bpp"); + +const u32 gMonStillFrontPic_Regice[] = INCBIN_U32("graphics/pokemon/regice/front.4bpp.lz"); +const u32 gMonPalette_Regice[] = INCBIN_U32("graphics/pokemon/regice/normal.gbapal.lz"); +const u32 gMonBackPic_Regice[] = INCBIN_U32("graphics/pokemon/regice/back.4bpp.lz"); +const u32 gMonShinyPalette_Regice[] = INCBIN_U32("graphics/pokemon/regice/shiny.gbapal.lz"); +const u8 gMonIcon_Regice[] = INCBIN_U8("graphics/pokemon/regice/icon.4bpp"); +const u8 gMonFootprint_Regice[] = INCBIN_U8("graphics/pokemon/regice/footprint.1bpp"); + +const u32 gMonStillFrontPic_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/front.4bpp.lz"); +const u32 gMonPalette_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/normal.gbapal.lz"); +const u32 gMonBackPic_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/back.4bpp.lz"); +const u32 gMonShinyPalette_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/shiny.gbapal.lz"); +const u8 gMonIcon_Registeel[] = INCBIN_U8("graphics/pokemon/registeel/icon.4bpp"); +const u8 gMonFootprint_Registeel[] = INCBIN_U8("graphics/pokemon/registeel/footprint.1bpp"); + +const u32 gMonStillFrontPic_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/front.4bpp.lz"); +const u32 gMonPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/normal.gbapal.lz"); +const u32 gMonBackPic_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/back.4bpp.lz"); +const u32 gMonShinyPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/shiny.gbapal.lz"); +const u8 gMonIcon_Kyogre[] = INCBIN_U8("graphics/pokemon/kyogre/icon.4bpp"); +const u8 gMonFootprint_Kyogre[] = INCBIN_U8("graphics/pokemon/kyogre/footprint.1bpp"); + +const u32 gMonStillFrontPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/front.4bpp.lz"); +const u32 gMonPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/normal.gbapal.lz"); +const u32 gMonBackPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/back.4bpp.lz"); +const u32 gMonShinyPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/shiny.gbapal.lz"); +const u8 gMonIcon_Groudon[] = INCBIN_U8("graphics/pokemon/groudon/icon.4bpp"); +const u8 gMonFootprint_Groudon[] = INCBIN_U8("graphics/pokemon/groudon/footprint.1bpp"); + +const u32 gMonStillFrontPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/front.4bpp.lz"); +const u32 gMonPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/normal.gbapal.lz"); +const u32 gMonBackPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/back.4bpp.lz"); +const u32 gMonShinyPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/shiny.gbapal.lz"); +const u8 gMonIcon_Rayquaza[] = INCBIN_U8("graphics/pokemon/rayquaza/icon.4bpp"); +const u8 gMonFootprint_Rayquaza[] = INCBIN_U8("graphics/pokemon/rayquaza/footprint.1bpp"); + +const u32 gMonStillFrontPic_Latias[] = INCBIN_U32("graphics/pokemon/latias/front.4bpp.lz"); +const u32 gMonPalette_Latias[] = INCBIN_U32("graphics/pokemon/latias/normal.gbapal.lz"); +const u32 gMonBackPic_Latias[] = INCBIN_U32("graphics/pokemon/latias/back.4bpp.lz"); +const u32 gMonShinyPalette_Latias[] = INCBIN_U32("graphics/pokemon/latias/shiny.gbapal.lz"); +const u8 gMonIcon_Latias[] = INCBIN_U8("graphics/pokemon/latias/icon.4bpp"); +const u8 gMonFootprint_Latias[] = INCBIN_U8("graphics/pokemon/latias/footprint.1bpp"); + +const u32 gMonStillFrontPic_Latios[] = INCBIN_U32("graphics/pokemon/latios/front.4bpp.lz"); +const u32 gMonPalette_Latios[] = INCBIN_U32("graphics/pokemon/latios/normal.gbapal.lz"); +const u32 gMonBackPic_Latios[] = INCBIN_U32("graphics/pokemon/latios/back.4bpp.lz"); +const u32 gMonShinyPalette_Latios[] = INCBIN_U32("graphics/pokemon/latios/shiny.gbapal.lz"); +const u8 gMonIcon_Latios[] = INCBIN_U8("graphics/pokemon/latios/icon.4bpp"); +const u8 gMonFootprint_Latios[] = INCBIN_U8("graphics/pokemon/latios/footprint.1bpp"); + +const u32 gMonStillFrontPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/front.4bpp.lz"); +const u32 gMonPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/normal.gbapal.lz"); +const u32 gMonBackPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/back.4bpp.lz"); +const u32 gMonShinyPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/shiny.gbapal.lz"); +const u8 gMonIcon_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/icon.4bpp"); +const u8 gMonFootprint_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/footprint.1bpp"); + +const u32 gMonStillFrontPic_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/front.4bpp.lz"); +const u32 gMonPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/normal.gbapal.lz"); +const u32 gMonBackPic_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/back.4bpp.lz"); +const u32 gMonShinyPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/shiny.gbapal.lz"); +const u8 gMonIcon_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/icon.4bpp"); +const u8 gMonIcon_DeoxysSpeed[] = INCBIN_U8("graphics/pokemon/deoxys_speed/icon.4bpp"); const u8 gMonIcon_DeoxysSpeedWide[] = INCBIN_U8("graphics/unused/deoxys_speed_icon_wide.4bpp"); asm(".space 0x6800"); const u16 gUnknown_D437F8[] = INCBIN_U16("graphics/unknown/unknown_D437F8.bin"); -const u8 gMonFootprint_Deoxys[] = INCBIN_U8("graphics/pokemon/footprints/deoxys_footprint.1bpp"); +const u8 gMonFootprint_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/footprint.1bpp"); -const u32 gMonStillFrontPic_Chimecho[] = INCBIN_U32("graphics/pokemon/front_pics/chimecho_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/palettes/chimecho_palette.gbapal.lz"); -const u32 gMonBackPic_Chimecho[] = INCBIN_U32("graphics/pokemon/back_pics/chimecho_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/palettes/chimecho_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Chimecho[] = INCBIN_U8("graphics/pokemon/icons/chimecho_icon.4bpp"); -const u8 gMonFootprint_Chimecho[] = INCBIN_U8("graphics/pokemon/footprints/chimecho_footprint.1bpp"); +const u32 gMonStillFrontPic_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/front.4bpp.lz"); +const u32 gMonPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/normal.gbapal.lz"); +const u32 gMonBackPic_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/back.4bpp.lz"); +const u32 gMonShinyPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/shiny.gbapal.lz"); +const u8 gMonIcon_Chimecho[] = INCBIN_U8("graphics/pokemon/chimecho/icon.4bpp"); +const u8 gMonFootprint_Chimecho[] = INCBIN_U8("graphics/pokemon/chimecho/footprint.1bpp"); -const u32 gMonStillFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/front_pics/egg_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Egg[] = INCBIN_U32("graphics/pokemon/palettes/egg_palette.gbapal.lz"); +const u32 gMonStillFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/front.4bpp.lz"); +const u32 gMonPalette_Egg[] = INCBIN_U32("graphics/pokemon/egg/normal.gbapal.lz"); -const u32 gMonStillFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/front_pics/unown_b_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownB[] = INCBIN_U32("graphics/pokemon/back_pics/unown_b_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownB[] = INCBIN_U8("graphics/pokemon/icons/unown_B_icon.4bpp"); +const u32 gMonStillFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/front_b.4bpp.lz"); +const u32 gMonBackPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/back_b.4bpp.lz"); +const u8 gMonIcon_UnownB[] = INCBIN_U8("graphics/pokemon/unown/icon_b.4bpp"); -const u32 gMonStillFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/front_pics/unown_c_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownC[] = INCBIN_U32("graphics/pokemon/back_pics/unown_c_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownC[] = INCBIN_U8("graphics/pokemon/icons/unown_C_icon.4bpp"); +const u32 gMonStillFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/front_c.4bpp.lz"); +const u32 gMonBackPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/back_c.4bpp.lz"); +const u8 gMonIcon_UnownC[] = INCBIN_U8("graphics/pokemon/unown/icon_c.4bpp"); -const u32 gMonStillFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/front_pics/unown_d_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownD[] = INCBIN_U32("graphics/pokemon/back_pics/unown_d_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownD[] = INCBIN_U8("graphics/pokemon/icons/unown_D_icon.4bpp"); +const u32 gMonStillFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/front_d.4bpp.lz"); +const u32 gMonBackPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/back_d.4bpp.lz"); +const u8 gMonIcon_UnownD[] = INCBIN_U8("graphics/pokemon/unown/icon_d.4bpp"); -const u32 gMonStillFrontPic_UnownE[] = INCBIN_U32("graphics/pokemon/front_pics/unown_e_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownE[] = INCBIN_U32("graphics/pokemon/back_pics/unown_e_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownE[] = INCBIN_U8("graphics/pokemon/icons/unown_E_icon.4bpp"); +const u32 gMonStillFrontPic_UnownE[] = INCBIN_U32("graphics/pokemon/unown/front_e.4bpp.lz"); +const u32 gMonBackPic_UnownE[] = INCBIN_U32("graphics/pokemon/unown/back_e.4bpp.lz"); +const u8 gMonIcon_UnownE[] = INCBIN_U8("graphics/pokemon/unown/icon_e.4bpp"); -const u32 gMonStillFrontPic_UnownF[] = INCBIN_U32("graphics/pokemon/front_pics/unown_f_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownF[] = INCBIN_U32("graphics/pokemon/back_pics/unown_f_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownF[] = INCBIN_U8("graphics/pokemon/icons/unown_F_icon.4bpp"); +const u32 gMonStillFrontPic_UnownF[] = INCBIN_U32("graphics/pokemon/unown/front_f.4bpp.lz"); +const u32 gMonBackPic_UnownF[] = INCBIN_U32("graphics/pokemon/unown/back_f.4bpp.lz"); +const u8 gMonIcon_UnownF[] = INCBIN_U8("graphics/pokemon/unown/icon_f.4bpp"); -const u32 gMonStillFrontPic_UnownG[] = INCBIN_U32("graphics/pokemon/front_pics/unown_g_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownG[] = INCBIN_U32("graphics/pokemon/back_pics/unown_g_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownG[] = INCBIN_U8("graphics/pokemon/icons/unown_G_icon.4bpp"); +const u32 gMonStillFrontPic_UnownG[] = INCBIN_U32("graphics/pokemon/unown/front_g.4bpp.lz"); +const u32 gMonBackPic_UnownG[] = INCBIN_U32("graphics/pokemon/unown/back_g.4bpp.lz"); +const u8 gMonIcon_UnownG[] = INCBIN_U8("graphics/pokemon/unown/icon_g.4bpp"); -const u32 gMonStillFrontPic_UnownH[] = INCBIN_U32("graphics/pokemon/front_pics/unown_h_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownH[] = INCBIN_U32("graphics/pokemon/back_pics/unown_h_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownH[] = INCBIN_U8("graphics/pokemon/icons/unown_H_icon.4bpp"); +const u32 gMonStillFrontPic_UnownH[] = INCBIN_U32("graphics/pokemon/unown/front_h.4bpp.lz"); +const u32 gMonBackPic_UnownH[] = INCBIN_U32("graphics/pokemon/unown/back_h.4bpp.lz"); +const u8 gMonIcon_UnownH[] = INCBIN_U8("graphics/pokemon/unown/icon_h.4bpp"); -const u32 gMonStillFrontPic_UnownI[] = INCBIN_U32("graphics/pokemon/front_pics/unown_i_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownI[] = INCBIN_U32("graphics/pokemon/back_pics/unown_i_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownI[] = INCBIN_U8("graphics/pokemon/icons/unown_I_icon.4bpp"); +const u32 gMonStillFrontPic_UnownI[] = INCBIN_U32("graphics/pokemon/unown/front_i.4bpp.lz"); +const u32 gMonBackPic_UnownI[] = INCBIN_U32("graphics/pokemon/unown/back_i.4bpp.lz"); +const u8 gMonIcon_UnownI[] = INCBIN_U8("graphics/pokemon/unown/icon_i.4bpp"); -const u32 gMonStillFrontPic_UnownJ[] = INCBIN_U32("graphics/pokemon/front_pics/unown_j_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownJ[] = INCBIN_U32("graphics/pokemon/back_pics/unown_j_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownJ[] = INCBIN_U8("graphics/pokemon/icons/unown_J_icon.4bpp"); +const u32 gMonStillFrontPic_UnownJ[] = INCBIN_U32("graphics/pokemon/unown/front_j.4bpp.lz"); +const u32 gMonBackPic_UnownJ[] = INCBIN_U32("graphics/pokemon/unown/back_j.4bpp.lz"); +const u8 gMonIcon_UnownJ[] = INCBIN_U8("graphics/pokemon/unown/icon_j.4bpp"); -const u32 gMonStillFrontPic_UnownK[] = INCBIN_U32("graphics/pokemon/front_pics/unown_k_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownK[] = INCBIN_U32("graphics/pokemon/back_pics/unown_k_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownK[] = INCBIN_U8("graphics/pokemon/icons/unown_K_icon.4bpp"); +const u32 gMonStillFrontPic_UnownK[] = INCBIN_U32("graphics/pokemon/unown/front_k.4bpp.lz"); +const u32 gMonBackPic_UnownK[] = INCBIN_U32("graphics/pokemon/unown/back_k.4bpp.lz"); +const u8 gMonIcon_UnownK[] = INCBIN_U8("graphics/pokemon/unown/icon_k.4bpp"); -const u32 gMonStillFrontPic_UnownL[] = INCBIN_U32("graphics/pokemon/front_pics/unown_l_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownL[] = INCBIN_U32("graphics/pokemon/back_pics/unown_l_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownL[] = INCBIN_U8("graphics/pokemon/icons/unown_L_icon.4bpp"); +const u32 gMonStillFrontPic_UnownL[] = INCBIN_U32("graphics/pokemon/unown/front_l.4bpp.lz"); +const u32 gMonBackPic_UnownL[] = INCBIN_U32("graphics/pokemon/unown/back_l.4bpp.lz"); +const u8 gMonIcon_UnownL[] = INCBIN_U8("graphics/pokemon/unown/icon_l.4bpp"); -const u32 gMonStillFrontPic_UnownM[] = INCBIN_U32("graphics/pokemon/front_pics/unown_m_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownM[] = INCBIN_U32("graphics/pokemon/back_pics/unown_m_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownM[] = INCBIN_U8("graphics/pokemon/icons/unown_M_icon.4bpp"); +const u32 gMonStillFrontPic_UnownM[] = INCBIN_U32("graphics/pokemon/unown/front_m.4bpp.lz"); +const u32 gMonBackPic_UnownM[] = INCBIN_U32("graphics/pokemon/unown/back_m.4bpp.lz"); +const u8 gMonIcon_UnownM[] = INCBIN_U8("graphics/pokemon/unown/icon_m.4bpp"); -const u32 gMonStillFrontPic_UnownN[] = INCBIN_U32("graphics/pokemon/front_pics/unown_n_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownN[] = INCBIN_U32("graphics/pokemon/back_pics/unown_n_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownN[] = INCBIN_U8("graphics/pokemon/icons/unown_N_icon.4bpp"); +const u32 gMonStillFrontPic_UnownN[] = INCBIN_U32("graphics/pokemon/unown/front_n.4bpp.lz"); +const u32 gMonBackPic_UnownN[] = INCBIN_U32("graphics/pokemon/unown/back_n.4bpp.lz"); +const u8 gMonIcon_UnownN[] = INCBIN_U8("graphics/pokemon/unown/icon_n.4bpp"); -const u32 gMonStillFrontPic_UnownO[] = INCBIN_U32("graphics/pokemon/front_pics/unown_o_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownO[] = INCBIN_U32("graphics/pokemon/back_pics/unown_o_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownO[] = INCBIN_U8("graphics/pokemon/icons/unown_O_icon.4bpp"); +const u32 gMonStillFrontPic_UnownO[] = INCBIN_U32("graphics/pokemon/unown/front_o.4bpp.lz"); +const u32 gMonBackPic_UnownO[] = INCBIN_U32("graphics/pokemon/unown/back_o.4bpp.lz"); +const u8 gMonIcon_UnownO[] = INCBIN_U8("graphics/pokemon/unown/icon_o.4bpp"); -const u32 gMonStillFrontPic_UnownP[] = INCBIN_U32("graphics/pokemon/front_pics/unown_p_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownP[] = INCBIN_U32("graphics/pokemon/back_pics/unown_p_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownP[] = INCBIN_U8("graphics/pokemon/icons/unown_P_icon.4bpp"); +const u32 gMonStillFrontPic_UnownP[] = INCBIN_U32("graphics/pokemon/unown/front_p.4bpp.lz"); +const u32 gMonBackPic_UnownP[] = INCBIN_U32("graphics/pokemon/unown/back_p.4bpp.lz"); +const u8 gMonIcon_UnownP[] = INCBIN_U8("graphics/pokemon/unown/icon_p.4bpp"); -const u32 gMonStillFrontPic_UnownQ[] = INCBIN_U32("graphics/pokemon/front_pics/unown_q_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownQ[] = INCBIN_U32("graphics/pokemon/back_pics/unown_q_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownQ[] = INCBIN_U8("graphics/pokemon/icons/unown_Q_icon.4bpp"); +const u32 gMonStillFrontPic_UnownQ[] = INCBIN_U32("graphics/pokemon/unown/front_q.4bpp.lz"); +const u32 gMonBackPic_UnownQ[] = INCBIN_U32("graphics/pokemon/unown/back_q.4bpp.lz"); +const u8 gMonIcon_UnownQ[] = INCBIN_U8("graphics/pokemon/unown/icon_q.4bpp"); -const u32 gMonStillFrontPic_UnownR[] = INCBIN_U32("graphics/pokemon/front_pics/unown_r_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownR[] = INCBIN_U32("graphics/pokemon/back_pics/unown_r_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownR[] = INCBIN_U8("graphics/pokemon/icons/unown_R_icon.4bpp"); +const u32 gMonStillFrontPic_UnownR[] = INCBIN_U32("graphics/pokemon/unown/front_r.4bpp.lz"); +const u32 gMonBackPic_UnownR[] = INCBIN_U32("graphics/pokemon/unown/back_r.4bpp.lz"); +const u8 gMonIcon_UnownR[] = INCBIN_U8("graphics/pokemon/unown/icon_r.4bpp"); -const u32 gMonStillFrontPic_UnownS[] = INCBIN_U32("graphics/pokemon/front_pics/unown_s_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownS[] = INCBIN_U32("graphics/pokemon/back_pics/unown_s_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownS[] = INCBIN_U8("graphics/pokemon/icons/unown_S_icon.4bpp"); +const u32 gMonStillFrontPic_UnownS[] = INCBIN_U32("graphics/pokemon/unown/front_s.4bpp.lz"); +const u32 gMonBackPic_UnownS[] = INCBIN_U32("graphics/pokemon/unown/back_s.4bpp.lz"); +const u8 gMonIcon_UnownS[] = INCBIN_U8("graphics/pokemon/unown/icon_s.4bpp"); -const u32 gMonStillFrontPic_UnownT[] = INCBIN_U32("graphics/pokemon/front_pics/unown_t_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownT[] = INCBIN_U32("graphics/pokemon/back_pics/unown_t_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownT[] = INCBIN_U8("graphics/pokemon/icons/unown_T_icon.4bpp"); +const u32 gMonStillFrontPic_UnownT[] = INCBIN_U32("graphics/pokemon/unown/front_t.4bpp.lz"); +const u32 gMonBackPic_UnownT[] = INCBIN_U32("graphics/pokemon/unown/back_t.4bpp.lz"); +const u8 gMonIcon_UnownT[] = INCBIN_U8("graphics/pokemon/unown/icon_t.4bpp"); -const u32 gMonStillFrontPic_UnownU[] = INCBIN_U32("graphics/pokemon/front_pics/unown_u_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownU[] = INCBIN_U32("graphics/pokemon/back_pics/unown_u_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownU[] = INCBIN_U8("graphics/pokemon/icons/unown_U_icon.4bpp"); +const u32 gMonStillFrontPic_UnownU[] = INCBIN_U32("graphics/pokemon/unown/front_u.4bpp.lz"); +const u32 gMonBackPic_UnownU[] = INCBIN_U32("graphics/pokemon/unown/back_u.4bpp.lz"); +const u8 gMonIcon_UnownU[] = INCBIN_U8("graphics/pokemon/unown/icon_u.4bpp"); -const u32 gMonStillFrontPic_UnownV[] = INCBIN_U32("graphics/pokemon/front_pics/unown_v_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownV[] = INCBIN_U32("graphics/pokemon/back_pics/unown_v_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownV[] = INCBIN_U8("graphics/pokemon/icons/unown_V_icon.4bpp"); +const u32 gMonStillFrontPic_UnownV[] = INCBIN_U32("graphics/pokemon/unown/front_v.4bpp.lz"); +const u32 gMonBackPic_UnownV[] = INCBIN_U32("graphics/pokemon/unown/back_v.4bpp.lz"); +const u8 gMonIcon_UnownV[] = INCBIN_U8("graphics/pokemon/unown/icon_v.4bpp"); -const u32 gMonStillFrontPic_UnownW[] = INCBIN_U32("graphics/pokemon/front_pics/unown_w_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownW[] = INCBIN_U32("graphics/pokemon/back_pics/unown_w_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownW[] = INCBIN_U8("graphics/pokemon/icons/unown_W_icon.4bpp"); +const u32 gMonStillFrontPic_UnownW[] = INCBIN_U32("graphics/pokemon/unown/front_w.4bpp.lz"); +const u32 gMonBackPic_UnownW[] = INCBIN_U32("graphics/pokemon/unown/back_w.4bpp.lz"); +const u8 gMonIcon_UnownW[] = INCBIN_U8("graphics/pokemon/unown/icon_w.4bpp"); -const u32 gMonStillFrontPic_UnownX[] = INCBIN_U32("graphics/pokemon/front_pics/unown_x_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownX[] = INCBIN_U32("graphics/pokemon/back_pics/unown_x_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownX[] = INCBIN_U8("graphics/pokemon/icons/unown_X_icon.4bpp"); +const u32 gMonStillFrontPic_UnownX[] = INCBIN_U32("graphics/pokemon/unown/front_x.4bpp.lz"); +const u32 gMonBackPic_UnownX[] = INCBIN_U32("graphics/pokemon/unown/back_x.4bpp.lz"); +const u8 gMonIcon_UnownX[] = INCBIN_U8("graphics/pokemon/unown/icon_x.4bpp"); -const u32 gMonStillFrontPic_UnownY[] = INCBIN_U32("graphics/pokemon/front_pics/unown_y_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownY[] = INCBIN_U32("graphics/pokemon/back_pics/unown_y_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownY[] = INCBIN_U8("graphics/pokemon/icons/unown_Y_icon.4bpp"); +const u32 gMonStillFrontPic_UnownY[] = INCBIN_U32("graphics/pokemon/unown/front_y.4bpp.lz"); +const u32 gMonBackPic_UnownY[] = INCBIN_U32("graphics/pokemon/unown/back_y.4bpp.lz"); +const u8 gMonIcon_UnownY[] = INCBIN_U8("graphics/pokemon/unown/icon_y.4bpp"); -const u32 gMonStillFrontPic_UnownZ[] = INCBIN_U32("graphics/pokemon/front_pics/unown_z_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownZ[] = INCBIN_U32("graphics/pokemon/back_pics/unown_z_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownZ[] = INCBIN_U8("graphics/pokemon/icons/unown_Z_icon.4bpp"); +const u32 gMonStillFrontPic_UnownZ[] = INCBIN_U32("graphics/pokemon/unown/front_z.4bpp.lz"); +const u32 gMonBackPic_UnownZ[] = INCBIN_U32("graphics/pokemon/unown/back_z.4bpp.lz"); +const u8 gMonIcon_UnownZ[] = INCBIN_U8("graphics/pokemon/unown/icon_z.4bpp"); -const u32 gMonStillFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/front_pics/unown_exclamation_mark_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/back_pics/unown_exclamation_mark_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownExclamationMark[] = INCBIN_U8("graphics/pokemon/icons/unown_exclamation_mark_icon.4bpp"); +const u32 gMonStillFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/front_exclamation_mark.4bpp.lz"); +const u32 gMonBackPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/back_exclamation_mark.4bpp.lz"); +const u8 gMonIcon_UnownExclamationMark[] = INCBIN_U8("graphics/pokemon/unown/icon_exclamation_mark.4bpp"); -const u32 gMonStillFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/front_pics/unown_question_mark_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/back_pics/unown_question_mark_back_pic.4bpp.lz"); -const u8 gMonIcon_UnownQuestionMark[] = INCBIN_U8("graphics/pokemon/icons/unown_question_mark_icon.4bpp"); +const u32 gMonStillFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/front_question_mark.4bpp.lz"); +const u32 gMonBackPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/back_question_mark.4bpp.lz"); +const u8 gMonIcon_UnownQuestionMark[] = INCBIN_U8("graphics/pokemon/unown/icon_question_mark.4bpp"); From d0115db5656944bcb4f44323bbd01b9a30780abc Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 14 Mar 2019 19:09:56 -0400 Subject: [PATCH 202/217] move pokemon graphics to mon-specific directories --- .../anim_front.png} | Bin .../abra_back_pic.png => abra/back.png} | Bin .../abra_footprint.png => abra/footprint.png} | Bin .../front.png} | Bin .../{icons/abra_icon.png => abra/icon.png} | Bin .../abra_palette.pal => abra/normal.pal} | 0 .../abra_shiny_palette.pal => abra/shiny.pal} | 0 .../anim_front.png} | Bin .../absol_back_pic.png => absol/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/absol_icon.png => absol/icon.png} | Bin .../absol_palette.pal => absol/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../aggron_back_pic.png => aggron/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../aggron_icon.png => aggron/icon.png} | Bin .../aggron_palette.pal => aggron/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../aipom_back_pic.png => aipom/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/aipom_icon.png => aipom/icon.png} | Bin .../aipom_palette.pal => aipom/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../alakazam_icon.png => alakazam/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../altaria_back_pic.png => altaria/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../altaria_icon.png => altaria/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../ampharos_icon.png => ampharos/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../anorith_back_pic.png => anorith/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../anorith_icon.png => anorith/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../arbok_back_pic.png => arbok/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/arbok_icon.png => arbok/icon.png} | Bin .../arbok_palette.pal => arbok/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../arcanine_icon.png => arcanine/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../ariados_back_pic.png => ariados/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../ariados_icon.png => ariados/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../armaldo_back_pic.png => armaldo/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../armaldo_icon.png => armaldo/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../aron_back_pic.png => aron/back.png} | Bin .../aron_footprint.png => aron/footprint.png} | Bin .../front.png} | Bin .../{icons/aron_icon.png => aron/icon.png} | Bin .../aron_palette.pal => aron/normal.pal} | 0 .../aron_shiny_palette.pal => aron/shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../articuno_icon.png => articuno/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../azumarill_icon.png => azumarill/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../azurill_back_pic.png => azurill/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../azurill_icon.png => azurill/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../bagon_back_pic.png => bagon/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/bagon_icon.png => bagon/icon.png} | Bin .../bagon_palette.pal => bagon/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../baltoy_back_pic.png => baltoy/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../baltoy_icon.png => baltoy/icon.png} | Bin .../baltoy_palette.pal => baltoy/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../banette_back_pic.png => banette/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../banette_icon.png => banette/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../barboach_icon.png => barboach/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../bayleef_back_pic.png => bayleef/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../bayleef_icon.png => bayleef/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../beautifly_icon.png => beautifly/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../beedrill_icon.png => beedrill/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../beldum_back_pic.png => beldum/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../beldum_icon.png => beldum/icon.png} | Bin .../beldum_palette.pal => beldum/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../bellossom_icon.png => bellossom/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../blastoise_icon.png => blastoise/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../blaziken_icon.png => blaziken/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../blissey_back_pic.png => blissey/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../blissey_icon.png => blissey/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../breloom_back_pic.png => breloom/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../breloom_icon.png => breloom/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../bulbasaur_icon.png => bulbasaur/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../cacnea_back_pic.png => cacnea/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../cacnea_icon.png => cacnea/icon.png} | Bin .../cacnea_palette.pal => cacnea/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../cacturne_icon.png => cacturne/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../camerupt_icon.png => camerupt/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../carvanha_icon.png => carvanha/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../cascoon_back_pic.png => cascoon/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../cascoon_icon.png => cascoon/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front_normal_form.png} | Bin .../anim_front_rainy_form.png} | Bin .../anim_front_snowy_form.png} | Bin .../anim_front_sunny_form.png} | Bin .../back_normal_form.png} | Bin .../back_rainy_form.png} | Bin .../back_snowy_form.png} | Bin .../back_sunny_form.png} | Bin .../footprint.png} | Bin .../front_normal_form.png} | Bin .../front_rainy_form.png} | Bin .../front_snowy_form.png} | Bin .../front_sunny_form.png} | Bin .../castform_icon.png => castform/icon.png} | Bin .../normal_normal_form.pal} | 0 .../normal_rainy_form.pal} | 0 .../normal_snowy_form.pal} | 0 .../normal_sunny_form.pal} | 0 .../shiny_normal_form.pal} | 0 .../shiny_rainy_form.pal} | 0 .../shiny_snowy_form.pal} | 0 .../shiny_sunny_form.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../caterpie_icon.png => caterpie/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../celebi_back_pic.png => celebi/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../celebi_icon.png => celebi/icon.png} | Bin .../celebi_palette.pal => celebi/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../chansey_back_pic.png => chansey/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../chansey_icon.png => chansey/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../charizard_icon.png => charizard/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../chikorita_icon.png => chikorita/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../chimecho_icon.png => chimecho/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../chinchou_icon.png => chinchou/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../front.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../clamperl_icon.png => clamperl/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../claydol_back_pic.png => claydol/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../claydol_icon.png => claydol/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../clefable_icon.png => clefable/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../clefairy_icon.png => clefairy/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../cleffa_back_pic.png => cleffa/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../cleffa_icon.png => cleffa/icon.png} | Bin .../cleffa_palette.pal => cleffa/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../cloyster_icon.png => cloyster/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../combusken_icon.png => combusken/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../corphish_icon.png => corphish/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../corsola_back_pic.png => corsola/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../corsola_icon.png => corsola/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../cradily_back_pic.png => cradily/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../cradily_icon.png => cradily/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../crawdaunt_icon.png => crawdaunt/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../crobat_back_pic.png => crobat/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../crobat_icon.png => crobat/icon.png} | Bin .../crobat_palette.pal => crobat/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../croconaw_icon.png => croconaw/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../cubone_back_pic.png => cubone/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../cubone_icon.png => cubone/icon.png} | Bin .../cubone_palette.pal => cubone/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../cyndaquil_icon.png => cyndaquil/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../delcatty_icon.png => delcatty/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../delibird_icon.png => delibird/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../deoxys_back_pic.png => deoxys/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../deoxys_icon.png => deoxys/icon.png} | Bin .../icon_speed.png} | Bin .../deoxys_palette.pal => deoxys/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../dewgong_back_pic.png => dewgong/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../dewgong_icon.png => dewgong/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../diglett_back_pic.png => diglett/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../diglett_icon.png => diglett/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../ditto_back_pic.png => ditto/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/ditto_icon.png => ditto/icon.png} | Bin .../ditto_palette.pal => ditto/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../dodrio_back_pic.png => dodrio/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../dodrio_icon.png => dodrio/icon.png} | Bin .../dodrio_palette.pal => dodrio/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../doduo_back_pic.png => doduo/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/doduo_icon.png => doduo/icon.png} | Bin .../doduo_palette.pal => doduo/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../donphan_back_pic.png => donphan/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../donphan_icon.png => donphan/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../front.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../dragonair_icon.png => dragonair/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../dragonite_icon.png => dragonite/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../dratini_back_pic.png => dratini/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../dratini_icon.png => dratini/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../drowzee_back_pic.png => drowzee/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../drowzee_icon.png => drowzee/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../dugtrio_back_pic.png => dugtrio/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../dugtrio_icon.png => dugtrio/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../dunsparce_icon.png => dunsparce/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../dusclops_icon.png => dusclops/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../duskull_back_pic.png => duskull/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../duskull_icon.png => duskull/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../dustox_back_pic.png => dustox/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../dustox_icon.png => dustox/icon.png} | Bin .../dustox_palette.pal => dustox/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../eevee_back_pic.png => eevee/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/eevee_icon.png => eevee/icon.png} | Bin .../eevee_palette.pal => eevee/normal.pal} | 0 .../shiny.pal} | 0 .../egg_front_pic.png => egg/anim_front.png} | Bin .../egg_still_front_pic.png => egg/front.png} | Bin .../{icons/egg_icon.png => egg/icon.png} | Bin .../egg_palette.pal => egg/normal.pal} | 0 .../anim_front.png} | Bin .../ekans_back_pic.png => ekans/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/ekans_icon.png => ekans/icon.png} | Bin .../ekans_palette.pal => ekans/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../electrike_icon.png => electrike/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../electrode_icon.png => electrode/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../elekid_back_pic.png => elekid/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../elekid_icon.png => elekid/icon.png} | Bin .../elekid_palette.pal => elekid/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../entei_back_pic.png => entei/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/entei_icon.png => entei/icon.png} | Bin .../entei_palette.pal => entei/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../espeon_back_pic.png => espeon/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../espeon_icon.png => espeon/icon.png} | Bin .../espeon_palette.pal => espeon/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../exeggcute_icon.png => exeggcute/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../exeggutor_icon.png => exeggutor/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../exploud_back_pic.png => exploud/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../exploud_icon.png => exploud/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../fearow_back_pic.png => fearow/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../fearow_icon.png => fearow/icon.png} | Bin .../fearow_palette.pal => fearow/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../feebas_back_pic.png => feebas/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../feebas_icon.png => feebas/icon.png} | Bin .../feebas_palette.pal => feebas/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../flaaffy_back_pic.png => flaaffy/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../flaaffy_icon.png => flaaffy/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../flareon_back_pic.png => flareon/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../flareon_icon.png => flareon/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../flygon_back_pic.png => flygon/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../flygon_icon.png => flygon/icon.png} | Bin .../flygon_palette.pal => flygon/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../furret_back_pic.png => furret/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../furret_icon.png => furret/icon.png} | Bin .../furret_palette.pal => furret/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../gardevoir_icon.png => gardevoir/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../gastly_back_pic.png => gastly/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../gastly_icon.png => gastly/icon.png} | Bin .../gastly_palette.pal => gastly/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../gengar_back_pic.png => gengar/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../gengar_icon.png => gengar/icon.png} | Bin .../gengar_palette.pal => gengar/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../geodude_back_pic.png => geodude/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../geodude_icon.png => geodude/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../girafarig_icon.png => girafarig/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../glalie_back_pic.png => glalie/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../glalie_icon.png => glalie/icon.png} | Bin .../glalie_palette.pal => glalie/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../gligar_back_pic.png => gligar/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../gligar_icon.png => gligar/icon.png} | Bin .../gligar_palette.pal => gligar/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../gloom_back_pic.png => gloom/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/gloom_icon.png => gloom/icon.png} | Bin .../gloom_palette.pal => gloom/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../golbat_back_pic.png => golbat/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../golbat_icon.png => golbat/icon.png} | Bin .../golbat_palette.pal => golbat/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../goldeen_back_pic.png => goldeen/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../goldeen_icon.png => goldeen/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../golduck_back_pic.png => golduck/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../golduck_icon.png => golduck/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../golem_back_pic.png => golem/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/golem_icon.png => golem/icon.png} | Bin .../golem_palette.pal => golem/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../gorebyss_icon.png => gorebyss/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../granbull_icon.png => granbull/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../graveler_icon.png => graveler/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../grimer_back_pic.png => grimer/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../grimer_icon.png => grimer/icon.png} | Bin .../grimer_palette.pal => grimer/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../groudon_back_pic.png => groudon/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../groudon_icon.png => groudon/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../grovyle_back_pic.png => grovyle/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../grovyle_icon.png => grovyle/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../growlithe_icon.png => growlithe/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../grumpig_back_pic.png => grumpig/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../grumpig_icon.png => grumpig/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../gulpin_back_pic.png => gulpin/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../gulpin_icon.png => gulpin/icon.png} | Bin .../gulpin_palette.pal => gulpin/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../gyarados_icon.png => gyarados/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../hariyama_icon.png => hariyama/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../haunter_back_pic.png => haunter/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../haunter_icon.png => haunter/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../heracross_icon.png => heracross/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../hitmonlee_icon.png => hitmonlee/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../hitmontop_icon.png => hitmontop/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../ho_oh_back_pic.png => ho_oh/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/ho_oh_icon.png => ho_oh/icon.png} | Bin .../ho_oh_palette.pal => ho_oh/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../hoothoot_icon.png => hoothoot/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../hoppip_back_pic.png => hoppip/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../hoppip_icon.png => hoppip/icon.png} | Bin .../hoppip_palette.pal => hoppip/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../horsea_back_pic.png => horsea/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../horsea_icon.png => horsea/icon.png} | Bin .../horsea_palette.pal => horsea/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../houndoom_icon.png => houndoom/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../houndour_icon.png => houndour/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../huntail_back_pic.png => huntail/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../huntail_icon.png => huntail/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../hypno_back_pic.png => hypno/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/hypno_icon.png => hypno/icon.png} | Bin .../hypno_palette.pal => hypno/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../igglybuff_icon.png => igglybuff/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../illumise_icon.png => illumise/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../ivysaur_back_pic.png => ivysaur/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../ivysaur_icon.png => ivysaur/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../jirachi_back_pic.png => jirachi/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../jirachi_icon.png => jirachi/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../jolteon_back_pic.png => jolteon/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../jolteon_icon.png => jolteon/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../jumpluff_icon.png => jumpluff/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../jynx_back_pic.png => jynx/back.png} | Bin .../jynx_footprint.png => jynx/footprint.png} | Bin .../front.png} | Bin .../{icons/jynx_icon.png => jynx/icon.png} | Bin .../jynx_palette.pal => jynx/normal.pal} | 0 .../jynx_shiny_palette.pal => jynx/shiny.pal} | 0 .../anim_front.png} | Bin .../kabuto_back_pic.png => kabuto/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../kabuto_icon.png => kabuto/icon.png} | Bin .../kabuto_palette.pal => kabuto/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../kabutops_icon.png => kabutops/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../kadabra_back_pic.png => kadabra/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../kadabra_icon.png => kadabra/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../kakuna_back_pic.png => kakuna/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../kakuna_icon.png => kakuna/icon.png} | Bin .../kakuna_palette.pal => kakuna/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../kecleon_back_pic.png => kecleon/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../kecleon_icon.png => kecleon/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../kingdra_back_pic.png => kingdra/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../kingdra_icon.png => kingdra/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../kingler_back_pic.png => kingler/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../kingler_icon.png => kingler/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../kirlia_back_pic.png => kirlia/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../kirlia_icon.png => kirlia/icon.png} | Bin .../kirlia_palette.pal => kirlia/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../koffing_back_pic.png => koffing/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../koffing_icon.png => koffing/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../krabby_back_pic.png => krabby/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../krabby_icon.png => krabby/icon.png} | Bin .../krabby_palette.pal => krabby/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../kyogre_back_pic.png => kyogre/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../kyogre_icon.png => kyogre/icon.png} | Bin .../kyogre_palette.pal => kyogre/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../lairon_back_pic.png => lairon/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../lairon_icon.png => lairon/icon.png} | Bin .../lairon_palette.pal => lairon/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../lanturn_back_pic.png => lanturn/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../lanturn_icon.png => lanturn/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../lapras_back_pic.png => lapras/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../lapras_icon.png => lapras/icon.png} | Bin .../lapras_palette.pal => lapras/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../larvitar_icon.png => larvitar/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../latias_back_pic.png => latias/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../latias_icon.png => latias/icon.png} | Bin .../latias_palette.pal => latias/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../latios_back_pic.png => latios/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../latios_icon.png => latios/icon.png} | Bin .../latios_palette.pal => latios/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../ledian_back_pic.png => ledian/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../ledian_icon.png => ledian/icon.png} | Bin .../ledian_palette.pal => ledian/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../ledyba_back_pic.png => ledyba/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../ledyba_icon.png => ledyba/icon.png} | Bin .../ledyba_palette.pal => ledyba/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../lickitung_icon.png => lickitung/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../lileep_back_pic.png => lileep/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../lileep_icon.png => lileep/icon.png} | Bin .../lileep_palette.pal => lileep/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../linoone_back_pic.png => linoone/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../linoone_icon.png => linoone/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../lombre_back_pic.png => lombre/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../lombre_icon.png => lombre/icon.png} | Bin .../lombre_palette.pal => lombre/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../lotad_back_pic.png => lotad/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/lotad_icon.png => lotad/icon.png} | Bin .../lotad_palette.pal => lotad/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../loudred_back_pic.png => loudred/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../loudred_icon.png => loudred/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../ludicolo_icon.png => ludicolo/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../lugia_back_pic.png => lugia/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/lugia_icon.png => lugia/icon.png} | Bin .../lugia_palette.pal => lugia/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../lunatone_icon.png => lunatone/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../luvdisc_back_pic.png => luvdisc/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../luvdisc_icon.png => luvdisc/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../machamp_back_pic.png => machamp/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../machamp_icon.png => machamp/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../machoke_back_pic.png => machoke/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../machoke_icon.png => machoke/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../machop_back_pic.png => machop/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../machop_icon.png => machop/icon.png} | Bin .../machop_palette.pal => machop/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../magby_back_pic.png => magby/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/magby_icon.png => magby/icon.png} | Bin .../magby_palette.pal => magby/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../magcargo_icon.png => magcargo/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../magikarp_icon.png => magikarp/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../magmar_back_pic.png => magmar/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../magmar_icon.png => magmar/icon.png} | Bin .../magmar_palette.pal => magmar/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../magnemite_icon.png => magnemite/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../magneton_icon.png => magneton/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../makuhita_icon.png => makuhita/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../manectric_icon.png => manectric/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../mankey_back_pic.png => mankey/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../mankey_icon.png => mankey/icon.png} | Bin .../mankey_palette.pal => mankey/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../mantine_back_pic.png => mantine/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../mantine_icon.png => mantine/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../mareep_back_pic.png => mareep/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../mareep_icon.png => mareep/icon.png} | Bin .../mareep_palette.pal => mareep/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../marill_back_pic.png => marill/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../marill_icon.png => marill/icon.png} | Bin .../marill_palette.pal => marill/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../marowak_back_pic.png => marowak/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../marowak_icon.png => marowak/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../marshtomp_icon.png => marshtomp/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../mawile_back_pic.png => mawile/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../mawile_icon.png => mawile/icon.png} | Bin .../mawile_palette.pal => mawile/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../medicham_icon.png => medicham/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../meditite_icon.png => meditite/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../meganium_icon.png => meganium/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../meowth_back_pic.png => meowth/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../meowth_icon.png => meowth/icon.png} | Bin .../meowth_palette.pal => meowth/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../metagross_icon.png => metagross/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../metang_back_pic.png => metang/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../metang_icon.png => metang/icon.png} | Bin .../metang_palette.pal => metang/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../metapod_back_pic.png => metapod/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../metapod_icon.png => metapod/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../mew_front_pic.png => mew/anim_front.png} | Bin .../mew_back_pic.png => mew/back.png} | Bin .../mew_footprint.png => mew/footprint.png} | Bin .../mew_still_front_pic.png => mew/front.png} | Bin .../{icons/mew_icon.png => mew/icon.png} | Bin .../mew_palette.pal => mew/normal.pal} | 0 .../mew_shiny_palette.pal => mew/shiny.pal} | 0 .../anim_front.png} | Bin .../mewtwo_back_pic.png => mewtwo/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../mewtwo_icon.png => mewtwo/icon.png} | Bin .../mewtwo_palette.pal => mewtwo/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../mightyena_icon.png => mightyena/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../milotic_back_pic.png => milotic/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../milotic_icon.png => milotic/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../miltank_back_pic.png => miltank/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../miltank_icon.png => miltank/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../minun_back_pic.png => minun/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/minun_icon.png => minun/icon.png} | Bin .../minun_palette.pal => minun/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../moltres_back_pic.png => moltres/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../moltres_icon.png => moltres/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../mr_mime_back_pic.png => mr_mime/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../mr_mime_icon.png => mr_mime/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../mudkip_back_pic.png => mudkip/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../mudkip_icon.png => mudkip/icon.png} | Bin .../mudkip_palette.pal => mudkip/normal.pal} | 0 .../shiny.pal} | 0 .../muk_front_pic.png => muk/anim_front.png} | Bin .../muk_back_pic.png => muk/back.png} | Bin .../muk_footprint.png => muk/footprint.png} | Bin .../muk_still_front_pic.png => muk/front.png} | Bin .../{icons/muk_icon.png => muk/icon.png} | Bin .../muk_palette.pal => muk/normal.pal} | 0 .../muk_shiny_palette.pal => muk/shiny.pal} | 0 .../anim_front.png} | Bin .../murkrow_back_pic.png => murkrow/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../murkrow_icon.png => murkrow/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../natu_back_pic.png => natu/back.png} | Bin .../natu_footprint.png => natu/footprint.png} | Bin .../front.png} | Bin .../{icons/natu_icon.png => natu/icon.png} | Bin .../natu_palette.pal => natu/normal.pal} | 0 .../natu_shiny_palette.pal => natu/shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../nidoking_icon.png => nidoking/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../nidoqueen_icon.png => nidoqueen/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../nidoran_f_icon.png => nidoran_f/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../nidoran_m_icon.png => nidoran_m/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../nidorina_icon.png => nidorina/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../nidorino_icon.png => nidorino/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../nincada_back_pic.png => nincada/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../nincada_icon.png => nincada/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../ninetales_icon.png => ninetales/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../ninjask_back_pic.png => ninjask/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../ninjask_icon.png => ninjask/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../noctowl_back_pic.png => noctowl/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../noctowl_icon.png => noctowl/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../nosepass_icon.png => nosepass/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../numel_back_pic.png => numel/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/numel_icon.png => numel/icon.png} | Bin .../numel_palette.pal => numel/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../nuzleaf_back_pic.png => nuzleaf/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../nuzleaf_icon.png => nuzleaf/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../octillery_icon.png => octillery/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../oddish_back_pic.png => oddish/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../oddish_icon.png => oddish/icon.png} | Bin .../oddish_palette.pal => oddish/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../omanyte_back_pic.png => omanyte/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../omanyte_icon.png => omanyte/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../omastar_back_pic.png => omastar/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../omastar_icon.png => omastar/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../onix_back_pic.png => onix/back.png} | Bin .../onix_footprint.png => onix/footprint.png} | Bin .../front.png} | Bin .../{icons/onix_icon.png => onix/icon.png} | Bin .../onix_palette.pal => onix/normal.pal} | 0 .../onix_shiny_palette.pal => onix/shiny.pal} | 0 .../anim_front.png} | Bin .../paras_back_pic.png => paras/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/paras_icon.png => paras/icon.png} | Bin .../paras_palette.pal => paras/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../parasect_icon.png => parasect/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../pelipper_icon.png => pelipper/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../persian_back_pic.png => persian/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../persian_icon.png => persian/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../phanpy_back_pic.png => phanpy/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../phanpy_icon.png => phanpy/icon.png} | Bin .../phanpy_palette.pal => phanpy/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../pichu_back_pic.png => pichu/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/pichu_icon.png => pichu/icon.png} | Bin .../pichu_palette.pal => pichu/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../pidgeot_back_pic.png => pidgeot/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../pidgeot_icon.png => pidgeot/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../pidgeotto_icon.png => pidgeotto/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../pidgey_back_pic.png => pidgey/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../pidgey_icon.png => pidgey/icon.png} | Bin .../pidgey_palette.pal => pidgey/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../pikachu_back_pic.png => pikachu/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../pikachu_icon.png => pikachu/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../piloswine_icon.png => piloswine/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../pineco_back_pic.png => pineco/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../pineco_icon.png => pineco/icon.png} | Bin .../pineco_palette.pal => pineco/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../pinsir_back_pic.png => pinsir/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../pinsir_icon.png => pinsir/icon.png} | Bin .../pinsir_palette.pal => pinsir/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../plusle_back_pic.png => plusle/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../plusle_icon.png => plusle/icon.png} | Bin .../plusle_palette.pal => plusle/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../politoed_icon.png => politoed/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../poliwag_back_pic.png => poliwag/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../poliwag_icon.png => poliwag/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../poliwhirl_icon.png => poliwhirl/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../poliwrath_icon.png => poliwrath/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../ponyta_back_pic.png => ponyta/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../ponyta_icon.png => ponyta/icon.png} | Bin .../ponyta_palette.pal => ponyta/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../poochyena_icon.png => poochyena/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../porygon_back_pic.png => porygon/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../porygon_icon.png => porygon/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../porygon2_icon.png => porygon2/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../primeape_icon.png => primeape/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../psyduck_back_pic.png => psyduck/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../psyduck_icon.png => psyduck/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../pupitar_back_pic.png => pupitar/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../pupitar_icon.png => pupitar/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../quagsire_icon.png => quagsire/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../footprint.png} | Bin .../icon.png} | Bin .../anim_front.png} | Bin .../quilava_back_pic.png => quilava/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../quilava_icon.png => quilava/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../qwilfish_icon.png => qwilfish/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../raichu_back_pic.png => raichu/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../raichu_icon.png => raichu/icon.png} | Bin .../raichu_palette.pal => raichu/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../raikou_back_pic.png => raikou/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../raikou_icon.png => raikou/icon.png} | Bin .../raikou_palette.pal => raikou/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../ralts_back_pic.png => ralts/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/ralts_icon.png => ralts/icon.png} | Bin .../ralts_palette.pal => ralts/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../rapidash_icon.png => rapidash/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../raticate_icon.png => raticate/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../rattata_back_pic.png => rattata/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../rattata_icon.png => rattata/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../rayquaza_icon.png => rayquaza/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../regice_back_pic.png => regice/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../regice_icon.png => regice/icon.png} | Bin .../regice_palette.pal => regice/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../regirock_icon.png => regirock/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../registeel_icon.png => registeel/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../relicanth_icon.png => relicanth/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../remoraid_icon.png => remoraid/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../rhydon_back_pic.png => rhydon/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../rhydon_icon.png => rhydon/icon.png} | Bin .../rhydon_palette.pal => rhydon/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../rhyhorn_back_pic.png => rhyhorn/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../rhyhorn_icon.png => rhyhorn/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../roselia_back_pic.png => roselia/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../roselia_icon.png => roselia/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../sableye_back_pic.png => sableye/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../sableye_icon.png => sableye/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../salamence_icon.png => salamence/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../sandshrew_icon.png => sandshrew/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../sandslash_icon.png => sandslash/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../sceptile_icon.png => sceptile/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../scizor_back_pic.png => scizor/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../scizor_icon.png => scizor/icon.png} | Bin .../scizor_palette.pal => scizor/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../scyther_back_pic.png => scyther/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../scyther_icon.png => scyther/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../seadra_back_pic.png => seadra/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../seadra_icon.png => seadra/icon.png} | Bin .../seadra_palette.pal => seadra/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../seaking_back_pic.png => seaking/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../seaking_icon.png => seaking/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../sealeo_back_pic.png => sealeo/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../sealeo_icon.png => sealeo/icon.png} | Bin .../sealeo_palette.pal => sealeo/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../seedot_back_pic.png => seedot/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../seedot_icon.png => seedot/icon.png} | Bin .../seedot_palette.pal => seedot/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../seel_back_pic.png => seel/back.png} | Bin .../seel_footprint.png => seel/footprint.png} | Bin .../front.png} | Bin .../{icons/seel_icon.png => seel/icon.png} | Bin .../seel_palette.pal => seel/normal.pal} | 0 .../seel_shiny_palette.pal => seel/shiny.pal} | 0 .../anim_front.png} | Bin .../sentret_back_pic.png => sentret/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../sentret_icon.png => sentret/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../seviper_back_pic.png => seviper/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../seviper_icon.png => seviper/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../sharpedo_icon.png => sharpedo/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../shedinja_icon.png => shedinja/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../shelgon_back_pic.png => shelgon/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../shelgon_icon.png => shelgon/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../shellder_icon.png => shellder/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../shiftry_back_pic.png => shiftry/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../shiftry_icon.png => shiftry/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../shroomish_icon.png => shroomish/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../shuckle_back_pic.png => shuckle/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../shuckle_icon.png => shuckle/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../shuppet_back_pic.png => shuppet/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../shuppet_icon.png => shuppet/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../silcoon_back_pic.png => silcoon/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../silcoon_icon.png => silcoon/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../skarmory_icon.png => skarmory/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../skiploom_icon.png => skiploom/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../skitty_back_pic.png => skitty/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../skitty_icon.png => skitty/icon.png} | Bin .../skitty_palette.pal => skitty/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../slaking_back_pic.png => slaking/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../slaking_icon.png => slaking/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../slakoth_back_pic.png => slakoth/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../slakoth_icon.png => slakoth/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../slowbro_back_pic.png => slowbro/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../slowbro_icon.png => slowbro/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../slowking_icon.png => slowking/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../slowpoke_icon.png => slowpoke/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../slugma_back_pic.png => slugma/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../slugma_icon.png => slugma/icon.png} | Bin .../slugma_palette.pal => slugma/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../smeargle_icon.png => smeargle/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../smoochum_icon.png => smoochum/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../sneasel_back_pic.png => sneasel/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../sneasel_icon.png => sneasel/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../snorlax_back_pic.png => snorlax/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../snorlax_icon.png => snorlax/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../snorunt_back_pic.png => snorunt/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../snorunt_icon.png => snorunt/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../snubbull_icon.png => snubbull/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../solrock_back_pic.png => solrock/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../solrock_icon.png => solrock/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../spearow_back_pic.png => spearow/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../spearow_icon.png => spearow/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../spheal_back_pic.png => spheal/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../spheal_icon.png => spheal/icon.png} | Bin .../spheal_palette.pal => spheal/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../spinarak_icon.png => spinarak/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../spinda_back_pic.png => spinda/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../spinda_icon.png => spinda/icon.png} | Bin .../spinda_palette.pal => spinda/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../spoink_back_pic.png => spoink/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../spoink_icon.png => spoink/icon.png} | Bin .../spoink_palette.pal => spoink/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../squirtle_icon.png => squirtle/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../stantler_icon.png => stantler/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../starmie_back_pic.png => starmie/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../starmie_icon.png => starmie/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../staryu_back_pic.png => staryu/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../staryu_icon.png => staryu/icon.png} | Bin .../staryu_palette.pal => staryu/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../steelix_back_pic.png => steelix/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../steelix_icon.png => steelix/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../sudowoodo_icon.png => sudowoodo/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../suicune_back_pic.png => suicune/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../suicune_icon.png => suicune/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../sunflora_icon.png => sunflora/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../sunkern_back_pic.png => sunkern/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../sunkern_icon.png => sunkern/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../surskit_back_pic.png => surskit/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../surskit_icon.png => surskit/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../swablu_back_pic.png => swablu/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../swablu_icon.png => swablu/icon.png} | Bin .../swablu_palette.pal => swablu/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../swalot_back_pic.png => swalot/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../swalot_icon.png => swalot/icon.png} | Bin .../swalot_palette.pal => swalot/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../swampert_icon.png => swampert/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../swellow_back_pic.png => swellow/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../swellow_icon.png => swellow/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../swinub_back_pic.png => swinub/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../swinub_icon.png => swinub/icon.png} | Bin .../swinub_palette.pal => swinub/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../taillow_back_pic.png => taillow/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../taillow_icon.png => taillow/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../tangela_back_pic.png => tangela/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../tangela_icon.png => tangela/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../tauros_back_pic.png => tauros/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../tauros_icon.png => tauros/icon.png} | Bin .../tauros_palette.pal => tauros/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../teddiursa_icon.png => teddiursa/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../tentacool_icon.png => tentacool/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../togepi_back_pic.png => togepi/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../togepi_icon.png => togepi/icon.png} | Bin .../togepi_palette.pal => togepi/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../togetic_back_pic.png => togetic/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../togetic_icon.png => togetic/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../torchic_back_pic.png => torchic/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../torchic_icon.png => torchic/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../torkoal_back_pic.png => torkoal/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../torkoal_icon.png => torkoal/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../totodile_icon.png => totodile/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../trapinch_icon.png => trapinch/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../treecko_back_pic.png => treecko/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../treecko_icon.png => treecko/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../tropius_back_pic.png => tropius/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../tropius_icon.png => tropius/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../tyranitar_icon.png => tyranitar/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../tyrogue_back_pic.png => tyrogue/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../tyrogue_icon.png => tyrogue/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../umbreon_back_pic.png => umbreon/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../umbreon_icon.png => umbreon/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front_a.png} | Bin .../anim_front_b.png} | Bin .../anim_front_c.png} | Bin .../anim_front_d.png} | Bin .../anim_front_e.png} | Bin .../anim_front_exclamation_mark.png} | Bin .../anim_front_f.png} | Bin .../anim_front_g.png} | Bin .../anim_front_h.png} | Bin .../anim_front_i.png} | Bin .../anim_front_j.png} | Bin .../anim_front_k.png} | Bin .../anim_front_l.png} | Bin .../anim_front_m.png} | Bin .../anim_front_n.png} | Bin .../anim_front_o.png} | Bin .../anim_front_p.png} | Bin .../anim_front_q.png} | Bin .../anim_front_question_mark.png} | Bin .../anim_front_r.png} | Bin .../anim_front_s.png} | Bin .../anim_front_t.png} | Bin .../anim_front_u.png} | Bin .../anim_front_v.png} | Bin .../anim_front_w.png} | Bin .../anim_front_x.png} | Bin .../anim_front_y.png} | Bin .../anim_front_z.png} | Bin .../unown_a_back_pic.png => unown/back_a.png} | Bin .../unown_b_back_pic.png => unown/back_b.png} | Bin .../unown_c_back_pic.png => unown/back_c.png} | Bin .../unown_d_back_pic.png => unown/back_d.png} | Bin .../unown_e_back_pic.png => unown/back_e.png} | Bin .../back_exclamation_mark.png} | Bin .../unown_f_back_pic.png => unown/back_f.png} | Bin .../unown_g_back_pic.png => unown/back_g.png} | Bin .../unown_h_back_pic.png => unown/back_h.png} | Bin .../unown_i_back_pic.png => unown/back_i.png} | Bin .../unown_j_back_pic.png => unown/back_j.png} | Bin .../unown_k_back_pic.png => unown/back_k.png} | Bin .../unown_l_back_pic.png => unown/back_l.png} | Bin .../unown_m_back_pic.png => unown/back_m.png} | Bin .../unown_n_back_pic.png => unown/back_n.png} | Bin .../unown_o_back_pic.png => unown/back_o.png} | Bin .../unown_p_back_pic.png => unown/back_p.png} | Bin .../unown_q_back_pic.png => unown/back_q.png} | Bin .../back_question_mark.png} | Bin .../unown_r_back_pic.png => unown/back_r.png} | Bin .../unown_s_back_pic.png => unown/back_s.png} | Bin .../unown_t_back_pic.png => unown/back_t.png} | Bin .../unown_u_back_pic.png => unown/back_u.png} | Bin .../unown_v_back_pic.png => unown/back_v.png} | Bin .../unown_w_back_pic.png => unown/back_w.png} | Bin .../unown_x_back_pic.png => unown/back_x.png} | Bin .../unown_y_back_pic.png => unown/back_y.png} | Bin .../unown_z_back_pic.png => unown/back_z.png} | Bin .../footprint.png} | Bin .../front_a.png} | Bin .../front_b.png} | Bin .../front_c.png} | Bin .../front_d.png} | Bin .../front_e.png} | Bin .../front_exclamation_mark.png} | Bin .../front_f.png} | Bin .../front_g.png} | Bin .../front_h.png} | Bin .../front_i.png} | Bin .../front_j.png} | Bin .../front_k.png} | Bin .../front_l.png} | Bin .../front_m.png} | Bin .../front_n.png} | Bin .../front_o.png} | Bin .../front_p.png} | Bin .../front_q.png} | Bin .../front_question_mark.png} | Bin .../front_r.png} | Bin .../front_s.png} | Bin .../front_t.png} | Bin .../front_u.png} | Bin .../front_v.png} | Bin .../front_w.png} | Bin .../front_x.png} | Bin .../front_y.png} | Bin .../front_z.png} | Bin .../unown_a_icon.png => unown/icon_a.png} | Bin .../unown_B_icon.png => unown/icon_b.png} | Bin .../unown_C_icon.png => unown/icon_c.png} | Bin .../unown_D_icon.png => unown/icon_d.png} | Bin .../unown_E_icon.png => unown/icon_e.png} | Bin .../icon_exclamation_mark.png} | Bin .../unown_F_icon.png => unown/icon_f.png} | Bin .../unown_G_icon.png => unown/icon_g.png} | Bin .../unown_H_icon.png => unown/icon_h.png} | Bin .../unown_I_icon.png => unown/icon_i.png} | Bin .../unown_J_icon.png => unown/icon_j.png} | Bin .../unown_K_icon.png => unown/icon_k.png} | Bin .../unown_L_icon.png => unown/icon_l.png} | Bin .../unown_M_icon.png => unown/icon_m.png} | Bin .../unown_N_icon.png => unown/icon_n.png} | Bin .../unown_O_icon.png => unown/icon_o.png} | Bin .../unown_P_icon.png => unown/icon_p.png} | Bin .../unown_Q_icon.png => unown/icon_q.png} | Bin .../icon_question_mark.png} | Bin .../unown_R_icon.png => unown/icon_r.png} | Bin .../unown_S_icon.png => unown/icon_s.png} | Bin .../unown_T_icon.png => unown/icon_t.png} | Bin .../unown_U_icon.png => unown/icon_u.png} | Bin .../unown_V_icon.png => unown/icon_v.png} | Bin .../unown_W_icon.png => unown/icon_w.png} | Bin .../unown_X_icon.png => unown/icon_x.png} | Bin .../unown_Y_icon.png => unown/icon_y.png} | Bin .../unown_Z_icon.png => unown/icon_z.png} | Bin .../unown_palette.pal => unown/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../ursaring_icon.png => ursaring/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../vaporeon_icon.png => vaporeon/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../venomoth_icon.png => venomoth/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../venonat_back_pic.png => venonat/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../venonat_icon.png => venonat/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../venusaur_icon.png => venusaur/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../vibrava_back_pic.png => vibrava/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../vibrava_icon.png => vibrava/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../vigoroth_icon.png => vigoroth/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../vileplume_icon.png => vileplume/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../volbeat_back_pic.png => volbeat/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../volbeat_icon.png => volbeat/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../voltorb_back_pic.png => voltorb/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../voltorb_icon.png => voltorb/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../vulpix_back_pic.png => vulpix/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../vulpix_icon.png => vulpix/icon.png} | Bin .../vulpix_palette.pal => vulpix/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../wailmer_back_pic.png => wailmer/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../wailmer_icon.png => wailmer/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../wailord_back_pic.png => wailord/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../wailord_icon.png => wailord/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../walrein_back_pic.png => walrein/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../walrein_icon.png => walrein/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../wartortle_icon.png => wartortle/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../weedle_back_pic.png => weedle/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../weedle_icon.png => weedle/icon.png} | Bin .../weedle_palette.pal => weedle/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../weezing_back_pic.png => weezing/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../weezing_icon.png => weezing/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../whiscash_icon.png => whiscash/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../whismur_back_pic.png => whismur/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../whismur_icon.png => whismur/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../wingull_back_pic.png => wingull/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../wingull_icon.png => wingull/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../wobbuffet_icon.png => wobbuffet/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../wooper_back_pic.png => wooper/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../wooper_icon.png => wooper/icon.png} | Bin .../wooper_palette.pal => wooper/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../wurmple_back_pic.png => wurmple/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../wurmple_icon.png => wurmple/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../wynaut_back_pic.png => wynaut/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../wynaut_icon.png => wynaut/icon.png} | Bin .../wynaut_palette.pal => wynaut/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../xatu_back_pic.png => xatu/back.png} | Bin .../xatu_footprint.png => xatu/footprint.png} | Bin .../front.png} | Bin .../{icons/xatu_icon.png => xatu/icon.png} | Bin .../xatu_palette.pal => xatu/normal.pal} | 0 .../xatu_shiny_palette.pal => xatu/shiny.pal} | 0 .../anim_front.png} | Bin .../yanma_back_pic.png => yanma/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/yanma_icon.png => yanma/icon.png} | Bin .../yanma_palette.pal => yanma/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../zangoose_icon.png => zangoose/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../zapdos_back_pic.png => zapdos/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../zapdos_icon.png => zapdos/icon.png} | Bin .../zapdos_palette.pal => zapdos/normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../zigzagoon_icon.png => zigzagoon/icon.png} | Bin .../normal.pal} | 0 .../shiny.pal} | 0 .../anim_front.png} | Bin .../zubat_back_pic.png => zubat/back.png} | Bin .../footprint.png} | Bin .../front.png} | Bin .../{icons/zubat_icon.png => zubat/icon.png} | Bin .../zubat_palette.pal => zubat/normal.pal} | 0 .../shiny.pal} | 0 graphics_file_rules.mk | 82 +++++++++++------- src/anim_mon_front_pics.c | 2 +- src/data/graphics/pokemon.h | 14 +-- src/egg_hatch.c | 2 +- src/graphics.c | 14 +-- 2847 files changed, 67 insertions(+), 47 deletions(-) rename graphics/pokemon/{anim_front_pics/abra_front_pic.png => abra/anim_front.png} (100%) rename graphics/pokemon/{back_pics/abra_back_pic.png => abra/back.png} (100%) rename graphics/pokemon/{footprints/abra_footprint.png => abra/footprint.png} (100%) rename graphics/pokemon/{front_pics/abra_still_front_pic.png => abra/front.png} (100%) rename graphics/pokemon/{icons/abra_icon.png => abra/icon.png} (100%) rename graphics/pokemon/{palettes/abra_palette.pal => abra/normal.pal} (100%) rename graphics/pokemon/{palettes/abra_shiny_palette.pal => abra/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/absol_front_pic.png => absol/anim_front.png} (100%) rename graphics/pokemon/{back_pics/absol_back_pic.png => absol/back.png} (100%) rename graphics/pokemon/{footprints/absol_footprint.png => absol/footprint.png} (100%) rename graphics/pokemon/{front_pics/absol_still_front_pic.png => absol/front.png} (100%) rename graphics/pokemon/{icons/absol_icon.png => absol/icon.png} (100%) rename graphics/pokemon/{palettes/absol_palette.pal => absol/normal.pal} (100%) rename graphics/pokemon/{palettes/absol_shiny_palette.pal => absol/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/aerodactyl_front_pic.png => aerodactyl/anim_front.png} (100%) rename graphics/pokemon/{back_pics/aerodactyl_back_pic.png => aerodactyl/back.png} (100%) rename graphics/pokemon/{footprints/aerodactyl_footprint.png => aerodactyl/footprint.png} (100%) rename graphics/pokemon/{front_pics/aerodactyl_still_front_pic.png => aerodactyl/front.png} (100%) rename graphics/pokemon/{icons/aerodactyl_icon.png => aerodactyl/icon.png} (100%) rename graphics/pokemon/{palettes/aerodactyl_palette.pal => aerodactyl/normal.pal} (100%) rename graphics/pokemon/{palettes/aerodactyl_shiny_palette.pal => aerodactyl/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/aggron_front_pic.png => aggron/anim_front.png} (100%) rename graphics/pokemon/{back_pics/aggron_back_pic.png => aggron/back.png} (100%) rename graphics/pokemon/{footprints/aggron_footprint.png => aggron/footprint.png} (100%) rename graphics/pokemon/{front_pics/aggron_still_front_pic.png => aggron/front.png} (100%) rename graphics/pokemon/{icons/aggron_icon.png => aggron/icon.png} (100%) rename graphics/pokemon/{palettes/aggron_palette.pal => aggron/normal.pal} (100%) rename graphics/pokemon/{palettes/aggron_shiny_palette.pal => aggron/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/aipom_front_pic.png => aipom/anim_front.png} (100%) rename graphics/pokemon/{back_pics/aipom_back_pic.png => aipom/back.png} (100%) rename graphics/pokemon/{footprints/aipom_footprint.png => aipom/footprint.png} (100%) rename graphics/pokemon/{front_pics/aipom_still_front_pic.png => aipom/front.png} (100%) rename graphics/pokemon/{icons/aipom_icon.png => aipom/icon.png} (100%) rename graphics/pokemon/{palettes/aipom_palette.pal => aipom/normal.pal} (100%) rename graphics/pokemon/{palettes/aipom_shiny_palette.pal => aipom/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/alakazam_front_pic.png => alakazam/anim_front.png} (100%) rename graphics/pokemon/{back_pics/alakazam_back_pic.png => alakazam/back.png} (100%) rename graphics/pokemon/{footprints/alakazam_footprint.png => alakazam/footprint.png} (100%) rename graphics/pokemon/{front_pics/alakazam_still_front_pic.png => alakazam/front.png} (100%) rename graphics/pokemon/{icons/alakazam_icon.png => alakazam/icon.png} (100%) rename graphics/pokemon/{palettes/alakazam_palette.pal => alakazam/normal.pal} (100%) rename graphics/pokemon/{palettes/alakazam_shiny_palette.pal => alakazam/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/altaria_front_pic.png => altaria/anim_front.png} (100%) rename graphics/pokemon/{back_pics/altaria_back_pic.png => altaria/back.png} (100%) rename graphics/pokemon/{footprints/altaria_footprint.png => altaria/footprint.png} (100%) rename graphics/pokemon/{front_pics/altaria_still_front_pic.png => altaria/front.png} (100%) rename graphics/pokemon/{icons/altaria_icon.png => altaria/icon.png} (100%) rename graphics/pokemon/{palettes/altaria_palette.pal => altaria/normal.pal} (100%) rename graphics/pokemon/{palettes/altaria_shiny_palette.pal => altaria/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/ampharos_front_pic.png => ampharos/anim_front.png} (100%) rename graphics/pokemon/{back_pics/ampharos_back_pic.png => ampharos/back.png} (100%) rename graphics/pokemon/{footprints/ampharos_footprint.png => ampharos/footprint.png} (100%) rename graphics/pokemon/{front_pics/ampharos_still_front_pic.png => ampharos/front.png} (100%) rename graphics/pokemon/{icons/ampharos_icon.png => ampharos/icon.png} (100%) rename graphics/pokemon/{palettes/ampharos_palette.pal => ampharos/normal.pal} (100%) rename graphics/pokemon/{palettes/ampharos_shiny_palette.pal => ampharos/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/anorith_front_pic.png => anorith/anim_front.png} (100%) rename graphics/pokemon/{back_pics/anorith_back_pic.png => anorith/back.png} (100%) rename graphics/pokemon/{footprints/anorith_footprint.png => anorith/footprint.png} (100%) rename graphics/pokemon/{front_pics/anorith_still_front_pic.png => anorith/front.png} (100%) rename graphics/pokemon/{icons/anorith_icon.png => anorith/icon.png} (100%) rename graphics/pokemon/{palettes/anorith_palette.pal => anorith/normal.pal} (100%) rename graphics/pokemon/{palettes/anorith_shiny_palette.pal => anorith/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/arbok_front_pic.png => arbok/anim_front.png} (100%) rename graphics/pokemon/{back_pics/arbok_back_pic.png => arbok/back.png} (100%) rename graphics/pokemon/{footprints/arbok_footprint.png => arbok/footprint.png} (100%) rename graphics/pokemon/{front_pics/arbok_still_front_pic.png => arbok/front.png} (100%) rename graphics/pokemon/{icons/arbok_icon.png => arbok/icon.png} (100%) rename graphics/pokemon/{palettes/arbok_palette.pal => arbok/normal.pal} (100%) rename graphics/pokemon/{palettes/arbok_shiny_palette.pal => arbok/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/arcanine_front_pic.png => arcanine/anim_front.png} (100%) rename graphics/pokemon/{back_pics/arcanine_back_pic.png => arcanine/back.png} (100%) rename graphics/pokemon/{footprints/arcanine_footprint.png => arcanine/footprint.png} (100%) rename graphics/pokemon/{front_pics/arcanine_still_front_pic.png => arcanine/front.png} (100%) rename graphics/pokemon/{icons/arcanine_icon.png => arcanine/icon.png} (100%) rename graphics/pokemon/{palettes/arcanine_palette.pal => arcanine/normal.pal} (100%) rename graphics/pokemon/{palettes/arcanine_shiny_palette.pal => arcanine/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/ariados_front_pic.png => ariados/anim_front.png} (100%) rename graphics/pokemon/{back_pics/ariados_back_pic.png => ariados/back.png} (100%) rename graphics/pokemon/{footprints/ariados_footprint.png => ariados/footprint.png} (100%) rename graphics/pokemon/{front_pics/ariados_still_front_pic.png => ariados/front.png} (100%) rename graphics/pokemon/{icons/ariados_icon.png => ariados/icon.png} (100%) rename graphics/pokemon/{palettes/ariados_palette.pal => ariados/normal.pal} (100%) rename graphics/pokemon/{palettes/ariados_shiny_palette.pal => ariados/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/armaldo_front_pic.png => armaldo/anim_front.png} (100%) rename graphics/pokemon/{back_pics/armaldo_back_pic.png => armaldo/back.png} (100%) rename graphics/pokemon/{footprints/armaldo_footprint.png => armaldo/footprint.png} (100%) rename graphics/pokemon/{front_pics/armaldo_still_front_pic.png => armaldo/front.png} (100%) rename graphics/pokemon/{icons/armaldo_icon.png => armaldo/icon.png} (100%) rename graphics/pokemon/{palettes/armaldo_palette.pal => armaldo/normal.pal} (100%) rename graphics/pokemon/{palettes/armaldo_shiny_palette.pal => armaldo/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/aron_front_pic.png => aron/anim_front.png} (100%) rename graphics/pokemon/{back_pics/aron_back_pic.png => aron/back.png} (100%) rename graphics/pokemon/{footprints/aron_footprint.png => aron/footprint.png} (100%) rename graphics/pokemon/{front_pics/aron_still_front_pic.png => aron/front.png} (100%) rename graphics/pokemon/{icons/aron_icon.png => aron/icon.png} (100%) rename graphics/pokemon/{palettes/aron_palette.pal => aron/normal.pal} (100%) rename graphics/pokemon/{palettes/aron_shiny_palette.pal => aron/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/articuno_front_pic.png => articuno/anim_front.png} (100%) rename graphics/pokemon/{back_pics/articuno_back_pic.png => articuno/back.png} (100%) rename graphics/pokemon/{footprints/articuno_footprint.png => articuno/footprint.png} (100%) rename graphics/pokemon/{front_pics/articuno_still_front_pic.png => articuno/front.png} (100%) rename graphics/pokemon/{icons/articuno_icon.png => articuno/icon.png} (100%) rename graphics/pokemon/{palettes/articuno_palette.pal => articuno/normal.pal} (100%) rename graphics/pokemon/{palettes/articuno_shiny_palette.pal => articuno/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/azumarill_front_pic.png => azumarill/anim_front.png} (100%) rename graphics/pokemon/{back_pics/azumarill_back_pic.png => azumarill/back.png} (100%) rename graphics/pokemon/{footprints/azumarill_footprint.png => azumarill/footprint.png} (100%) rename graphics/pokemon/{front_pics/azumarill_still_front_pic.png => azumarill/front.png} (100%) rename graphics/pokemon/{icons/azumarill_icon.png => azumarill/icon.png} (100%) rename graphics/pokemon/{palettes/azumarill_palette.pal => azumarill/normal.pal} (100%) rename graphics/pokemon/{palettes/azumarill_shiny_palette.pal => azumarill/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/azurill_front_pic.png => azurill/anim_front.png} (100%) rename graphics/pokemon/{back_pics/azurill_back_pic.png => azurill/back.png} (100%) rename graphics/pokemon/{footprints/azurill_footprint.png => azurill/footprint.png} (100%) rename graphics/pokemon/{front_pics/azurill_still_front_pic.png => azurill/front.png} (100%) rename graphics/pokemon/{icons/azurill_icon.png => azurill/icon.png} (100%) rename graphics/pokemon/{palettes/azurill_palette.pal => azurill/normal.pal} (100%) rename graphics/pokemon/{palettes/azurill_shiny_palette.pal => azurill/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/bagon_front_pic.png => bagon/anim_front.png} (100%) rename graphics/pokemon/{back_pics/bagon_back_pic.png => bagon/back.png} (100%) rename graphics/pokemon/{footprints/bagon_footprint.png => bagon/footprint.png} (100%) rename graphics/pokemon/{front_pics/bagon_still_front_pic.png => bagon/front.png} (100%) rename graphics/pokemon/{icons/bagon_icon.png => bagon/icon.png} (100%) rename graphics/pokemon/{palettes/bagon_palette.pal => bagon/normal.pal} (100%) rename graphics/pokemon/{palettes/bagon_shiny_palette.pal => bagon/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/baltoy_front_pic.png => baltoy/anim_front.png} (100%) rename graphics/pokemon/{back_pics/baltoy_back_pic.png => baltoy/back.png} (100%) rename graphics/pokemon/{footprints/baltoy_footprint.png => baltoy/footprint.png} (100%) rename graphics/pokemon/{front_pics/baltoy_still_front_pic.png => baltoy/front.png} (100%) rename graphics/pokemon/{icons/baltoy_icon.png => baltoy/icon.png} (100%) rename graphics/pokemon/{palettes/baltoy_palette.pal => baltoy/normal.pal} (100%) rename graphics/pokemon/{palettes/baltoy_shiny_palette.pal => baltoy/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/banette_front_pic.png => banette/anim_front.png} (100%) rename graphics/pokemon/{back_pics/banette_back_pic.png => banette/back.png} (100%) rename graphics/pokemon/{footprints/banette_footprint.png => banette/footprint.png} (100%) rename graphics/pokemon/{front_pics/banette_still_front_pic.png => banette/front.png} (100%) rename graphics/pokemon/{icons/banette_icon.png => banette/icon.png} (100%) rename graphics/pokemon/{palettes/banette_palette.pal => banette/normal.pal} (100%) rename graphics/pokemon/{palettes/banette_shiny_palette.pal => banette/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/barboach_front_pic.png => barboach/anim_front.png} (100%) rename graphics/pokemon/{back_pics/barboach_back_pic.png => barboach/back.png} (100%) rename graphics/pokemon/{footprints/barboach_footprint.png => barboach/footprint.png} (100%) rename graphics/pokemon/{front_pics/barboach_still_front_pic.png => barboach/front.png} (100%) rename graphics/pokemon/{icons/barboach_icon.png => barboach/icon.png} (100%) rename graphics/pokemon/{palettes/barboach_palette.pal => barboach/normal.pal} (100%) rename graphics/pokemon/{palettes/barboach_shiny_palette.pal => barboach/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/bayleef_front_pic.png => bayleef/anim_front.png} (100%) rename graphics/pokemon/{back_pics/bayleef_back_pic.png => bayleef/back.png} (100%) rename graphics/pokemon/{footprints/bayleef_footprint.png => bayleef/footprint.png} (100%) rename graphics/pokemon/{front_pics/bayleef_still_front_pic.png => bayleef/front.png} (100%) rename graphics/pokemon/{icons/bayleef_icon.png => bayleef/icon.png} (100%) rename graphics/pokemon/{palettes/bayleef_palette.pal => bayleef/normal.pal} (100%) rename graphics/pokemon/{palettes/bayleef_shiny_palette.pal => bayleef/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/beautifly_front_pic.png => beautifly/anim_front.png} (100%) rename graphics/pokemon/{back_pics/beautifly_back_pic.png => beautifly/back.png} (100%) rename graphics/pokemon/{footprints/beautifly_footprint.png => beautifly/footprint.png} (100%) rename graphics/pokemon/{front_pics/beautifly_still_front_pic.png => beautifly/front.png} (100%) rename graphics/pokemon/{icons/beautifly_icon.png => beautifly/icon.png} (100%) rename graphics/pokemon/{palettes/beautifly_palette.pal => beautifly/normal.pal} (100%) rename graphics/pokemon/{palettes/beautifly_shiny_palette.pal => beautifly/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/beedrill_front_pic.png => beedrill/anim_front.png} (100%) rename graphics/pokemon/{back_pics/beedrill_back_pic.png => beedrill/back.png} (100%) rename graphics/pokemon/{footprints/beedrill_footprint.png => beedrill/footprint.png} (100%) rename graphics/pokemon/{front_pics/beedrill_still_front_pic.png => beedrill/front.png} (100%) rename graphics/pokemon/{icons/beedrill_icon.png => beedrill/icon.png} (100%) rename graphics/pokemon/{palettes/beedrill_palette.pal => beedrill/normal.pal} (100%) rename graphics/pokemon/{palettes/beedrill_shiny_palette.pal => beedrill/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/beldum_front_pic.png => beldum/anim_front.png} (100%) rename graphics/pokemon/{back_pics/beldum_back_pic.png => beldum/back.png} (100%) rename graphics/pokemon/{footprints/beldum_footprint.png => beldum/footprint.png} (100%) rename graphics/pokemon/{front_pics/beldum_still_front_pic.png => beldum/front.png} (100%) rename graphics/pokemon/{icons/beldum_icon.png => beldum/icon.png} (100%) rename graphics/pokemon/{palettes/beldum_palette.pal => beldum/normal.pal} (100%) rename graphics/pokemon/{palettes/beldum_shiny_palette.pal => beldum/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/bellossom_front_pic.png => bellossom/anim_front.png} (100%) rename graphics/pokemon/{back_pics/bellossom_back_pic.png => bellossom/back.png} (100%) rename graphics/pokemon/{footprints/bellossom_footprint.png => bellossom/footprint.png} (100%) rename graphics/pokemon/{front_pics/bellossom_still_front_pic.png => bellossom/front.png} (100%) rename graphics/pokemon/{icons/bellossom_icon.png => bellossom/icon.png} (100%) rename graphics/pokemon/{palettes/bellossom_palette.pal => bellossom/normal.pal} (100%) rename graphics/pokemon/{palettes/bellossom_shiny_palette.pal => bellossom/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/bellsprout_front_pic.png => bellsprout/anim_front.png} (100%) rename graphics/pokemon/{back_pics/bellsprout_back_pic.png => bellsprout/back.png} (100%) rename graphics/pokemon/{footprints/bellsprout_footprint.png => bellsprout/footprint.png} (100%) rename graphics/pokemon/{front_pics/bellsprout_still_front_pic.png => bellsprout/front.png} (100%) rename graphics/pokemon/{icons/bellsprout_icon.png => bellsprout/icon.png} (100%) rename graphics/pokemon/{palettes/bellsprout_palette.pal => bellsprout/normal.pal} (100%) rename graphics/pokemon/{palettes/bellsprout_shiny_palette.pal => bellsprout/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/blastoise_front_pic.png => blastoise/anim_front.png} (100%) rename graphics/pokemon/{back_pics/blastoise_back_pic.png => blastoise/back.png} (100%) rename graphics/pokemon/{footprints/blastoise_footprint.png => blastoise/footprint.png} (100%) rename graphics/pokemon/{front_pics/blastoise_still_front_pic.png => blastoise/front.png} (100%) rename graphics/pokemon/{icons/blastoise_icon.png => blastoise/icon.png} (100%) rename graphics/pokemon/{palettes/blastoise_palette.pal => blastoise/normal.pal} (100%) rename graphics/pokemon/{palettes/blastoise_shiny_palette.pal => blastoise/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/blaziken_front_pic.png => blaziken/anim_front.png} (100%) rename graphics/pokemon/{back_pics/blaziken_back_pic.png => blaziken/back.png} (100%) rename graphics/pokemon/{footprints/blaziken_footprint.png => blaziken/footprint.png} (100%) rename graphics/pokemon/{front_pics/blaziken_still_front_pic.png => blaziken/front.png} (100%) rename graphics/pokemon/{icons/blaziken_icon.png => blaziken/icon.png} (100%) rename graphics/pokemon/{palettes/blaziken_palette.pal => blaziken/normal.pal} (100%) rename graphics/pokemon/{palettes/blaziken_shiny_palette.pal => blaziken/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/blissey_front_pic.png => blissey/anim_front.png} (100%) rename graphics/pokemon/{back_pics/blissey_back_pic.png => blissey/back.png} (100%) rename graphics/pokemon/{footprints/blissey_footprint.png => blissey/footprint.png} (100%) rename graphics/pokemon/{front_pics/blissey_still_front_pic.png => blissey/front.png} (100%) rename graphics/pokemon/{icons/blissey_icon.png => blissey/icon.png} (100%) rename graphics/pokemon/{palettes/blissey_palette.pal => blissey/normal.pal} (100%) rename graphics/pokemon/{palettes/blissey_shiny_palette.pal => blissey/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/breloom_front_pic.png => breloom/anim_front.png} (100%) rename graphics/pokemon/{back_pics/breloom_back_pic.png => breloom/back.png} (100%) rename graphics/pokemon/{footprints/breloom_footprint.png => breloom/footprint.png} (100%) rename graphics/pokemon/{front_pics/breloom_still_front_pic.png => breloom/front.png} (100%) rename graphics/pokemon/{icons/breloom_icon.png => breloom/icon.png} (100%) rename graphics/pokemon/{palettes/breloom_palette.pal => breloom/normal.pal} (100%) rename graphics/pokemon/{palettes/breloom_shiny_palette.pal => breloom/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/bulbasaur_front_pic.png => bulbasaur/anim_front.png} (100%) rename graphics/pokemon/{back_pics/bulbasaur_back_pic.png => bulbasaur/back.png} (100%) rename graphics/pokemon/{footprints/bulbasaur_footprint.png => bulbasaur/footprint.png} (100%) rename graphics/pokemon/{front_pics/bulbasaur_still_front_pic.png => bulbasaur/front.png} (100%) rename graphics/pokemon/{icons/bulbasaur_icon.png => bulbasaur/icon.png} (100%) rename graphics/pokemon/{palettes/bulbasaur_palette.pal => bulbasaur/normal.pal} (100%) rename graphics/pokemon/{palettes/bulbasaur_shiny_palette.pal => bulbasaur/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/butterfree_front_pic.png => butterfree/anim_front.png} (100%) rename graphics/pokemon/{back_pics/butterfree_back_pic.png => butterfree/back.png} (100%) rename graphics/pokemon/{footprints/butterfree_footprint.png => butterfree/footprint.png} (100%) rename graphics/pokemon/{front_pics/butterfree_still_front_pic.png => butterfree/front.png} (100%) rename graphics/pokemon/{icons/butterfree_icon.png => butterfree/icon.png} (100%) rename graphics/pokemon/{palettes/butterfree_palette.pal => butterfree/normal.pal} (100%) rename graphics/pokemon/{palettes/butterfree_shiny_palette.pal => butterfree/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/cacnea_front_pic.png => cacnea/anim_front.png} (100%) rename graphics/pokemon/{back_pics/cacnea_back_pic.png => cacnea/back.png} (100%) rename graphics/pokemon/{footprints/cacnea_footprint.png => cacnea/footprint.png} (100%) rename graphics/pokemon/{front_pics/cacnea_still_front_pic.png => cacnea/front.png} (100%) rename graphics/pokemon/{icons/cacnea_icon.png => cacnea/icon.png} (100%) rename graphics/pokemon/{palettes/cacnea_palette.pal => cacnea/normal.pal} (100%) rename graphics/pokemon/{palettes/cacnea_shiny_palette.pal => cacnea/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/cacturne_front_pic.png => cacturne/anim_front.png} (100%) rename graphics/pokemon/{back_pics/cacturne_back_pic.png => cacturne/back.png} (100%) rename graphics/pokemon/{footprints/cacturne_footprint.png => cacturne/footprint.png} (100%) rename graphics/pokemon/{front_pics/cacturne_still_front_pic.png => cacturne/front.png} (100%) rename graphics/pokemon/{icons/cacturne_icon.png => cacturne/icon.png} (100%) rename graphics/pokemon/{palettes/cacturne_palette.pal => cacturne/normal.pal} (100%) rename graphics/pokemon/{palettes/cacturne_shiny_palette.pal => cacturne/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/camerupt_front_pic.png => camerupt/anim_front.png} (100%) rename graphics/pokemon/{back_pics/camerupt_back_pic.png => camerupt/back.png} (100%) rename graphics/pokemon/{footprints/camerupt_footprint.png => camerupt/footprint.png} (100%) rename graphics/pokemon/{front_pics/camerupt_still_front_pic.png => camerupt/front.png} (100%) rename graphics/pokemon/{icons/camerupt_icon.png => camerupt/icon.png} (100%) rename graphics/pokemon/{palettes/camerupt_palette.pal => camerupt/normal.pal} (100%) rename graphics/pokemon/{palettes/camerupt_shiny_palette.pal => camerupt/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/carvanha_front_pic.png => carvanha/anim_front.png} (100%) rename graphics/pokemon/{back_pics/carvanha_back_pic.png => carvanha/back.png} (100%) rename graphics/pokemon/{footprints/carvanha_footprint.png => carvanha/footprint.png} (100%) rename graphics/pokemon/{front_pics/carvanha_still_front_pic.png => carvanha/front.png} (100%) rename graphics/pokemon/{icons/carvanha_icon.png => carvanha/icon.png} (100%) rename graphics/pokemon/{palettes/carvanha_palette.pal => carvanha/normal.pal} (100%) rename graphics/pokemon/{palettes/carvanha_shiny_palette.pal => carvanha/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/cascoon_front_pic.png => cascoon/anim_front.png} (100%) rename graphics/pokemon/{back_pics/cascoon_back_pic.png => cascoon/back.png} (100%) rename graphics/pokemon/{footprints/cascoon_footprint.png => cascoon/footprint.png} (100%) rename graphics/pokemon/{front_pics/cascoon_still_front_pic.png => cascoon/front.png} (100%) rename graphics/pokemon/{icons/cascoon_icon.png => cascoon/icon.png} (100%) rename graphics/pokemon/{palettes/cascoon_palette.pal => cascoon/normal.pal} (100%) rename graphics/pokemon/{palettes/cascoon_shiny_palette.pal => cascoon/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/castform_normal_form_front_pic.png => castform/anim_front_normal_form.png} (100%) rename graphics/pokemon/{anim_front_pics/castform_rainy_form_front_pic.png => castform/anim_front_rainy_form.png} (100%) rename graphics/pokemon/{anim_front_pics/castform_snowy_form_front_pic.png => castform/anim_front_snowy_form.png} (100%) rename graphics/pokemon/{anim_front_pics/castform_sunny_form_front_pic.png => castform/anim_front_sunny_form.png} (100%) rename graphics/pokemon/{back_pics/castform_normal_form_back_pic.png => castform/back_normal_form.png} (100%) rename graphics/pokemon/{back_pics/castform_rainy_form_back_pic.png => castform/back_rainy_form.png} (100%) rename graphics/pokemon/{back_pics/castform_snowy_form_back_pic.png => castform/back_snowy_form.png} (100%) rename graphics/pokemon/{back_pics/castform_sunny_form_back_pic.png => castform/back_sunny_form.png} (100%) rename graphics/pokemon/{footprints/castform_footprint.png => castform/footprint.png} (100%) rename graphics/pokemon/{front_pics/castform_normal_form_still_front_pic.png => castform/front_normal_form.png} (100%) rename graphics/pokemon/{front_pics/castform_rainy_form_still_front_pic.png => castform/front_rainy_form.png} (100%) rename graphics/pokemon/{front_pics/castform_snowy_form_still_front_pic.png => castform/front_snowy_form.png} (100%) rename graphics/pokemon/{front_pics/castform_sunny_form_still_front_pic.png => castform/front_sunny_form.png} (100%) rename graphics/pokemon/{icons/castform_icon.png => castform/icon.png} (100%) rename graphics/pokemon/{palettes/castform_normal_form_palette.pal => castform/normal_normal_form.pal} (100%) rename graphics/pokemon/{palettes/castform_rainy_form_palette.pal => castform/normal_rainy_form.pal} (100%) rename graphics/pokemon/{palettes/castform_snowy_form_palette.pal => castform/normal_snowy_form.pal} (100%) rename graphics/pokemon/{palettes/castform_sunny_form_palette.pal => castform/normal_sunny_form.pal} (100%) rename graphics/pokemon/{palettes/castform_normal_form_shiny_palette.pal => castform/shiny_normal_form.pal} (100%) rename graphics/pokemon/{palettes/castform_rainy_form_shiny_palette.pal => castform/shiny_rainy_form.pal} (100%) rename graphics/pokemon/{palettes/castform_snowy_form_shiny_palette.pal => castform/shiny_snowy_form.pal} (100%) rename graphics/pokemon/{palettes/castform_sunny_form_shiny_palette.pal => castform/shiny_sunny_form.pal} (100%) rename graphics/pokemon/{anim_front_pics/caterpie_front_pic.png => caterpie/anim_front.png} (100%) rename graphics/pokemon/{back_pics/caterpie_back_pic.png => caterpie/back.png} (100%) rename graphics/pokemon/{footprints/caterpie_footprint.png => caterpie/footprint.png} (100%) rename graphics/pokemon/{front_pics/caterpie_still_front_pic.png => caterpie/front.png} (100%) rename graphics/pokemon/{icons/caterpie_icon.png => caterpie/icon.png} (100%) rename graphics/pokemon/{palettes/caterpie_palette.pal => caterpie/normal.pal} (100%) rename graphics/pokemon/{palettes/caterpie_shiny_palette.pal => caterpie/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/celebi_front_pic.png => celebi/anim_front.png} (100%) rename graphics/pokemon/{back_pics/celebi_back_pic.png => celebi/back.png} (100%) rename graphics/pokemon/{footprints/celebi_footprint.png => celebi/footprint.png} (100%) rename graphics/pokemon/{front_pics/celebi_still_front_pic.png => celebi/front.png} (100%) rename graphics/pokemon/{icons/celebi_icon.png => celebi/icon.png} (100%) rename graphics/pokemon/{palettes/celebi_palette.pal => celebi/normal.pal} (100%) rename graphics/pokemon/{palettes/celebi_shiny_palette.pal => celebi/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/chansey_front_pic.png => chansey/anim_front.png} (100%) rename graphics/pokemon/{back_pics/chansey_back_pic.png => chansey/back.png} (100%) rename graphics/pokemon/{footprints/chansey_footprint.png => chansey/footprint.png} (100%) rename graphics/pokemon/{front_pics/chansey_still_front_pic.png => chansey/front.png} (100%) rename graphics/pokemon/{icons/chansey_icon.png => chansey/icon.png} (100%) rename graphics/pokemon/{palettes/chansey_palette.pal => chansey/normal.pal} (100%) rename graphics/pokemon/{palettes/chansey_shiny_palette.pal => chansey/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/charizard_front_pic.png => charizard/anim_front.png} (100%) rename graphics/pokemon/{back_pics/charizard_back_pic.png => charizard/back.png} (100%) rename graphics/pokemon/{footprints/charizard_footprint.png => charizard/footprint.png} (100%) rename graphics/pokemon/{front_pics/charizard_still_front_pic.png => charizard/front.png} (100%) rename graphics/pokemon/{icons/charizard_icon.png => charizard/icon.png} (100%) rename graphics/pokemon/{palettes/charizard_palette.pal => charizard/normal.pal} (100%) rename graphics/pokemon/{palettes/charizard_shiny_palette.pal => charizard/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/charmander_front_pic.png => charmander/anim_front.png} (100%) rename graphics/pokemon/{back_pics/charmander_back_pic.png => charmander/back.png} (100%) rename graphics/pokemon/{footprints/charmander_footprint.png => charmander/footprint.png} (100%) rename graphics/pokemon/{front_pics/charmander_still_front_pic.png => charmander/front.png} (100%) rename graphics/pokemon/{icons/charmander_icon.png => charmander/icon.png} (100%) rename graphics/pokemon/{palettes/charmander_palette.pal => charmander/normal.pal} (100%) rename graphics/pokemon/{palettes/charmander_shiny_palette.pal => charmander/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/charmeleon_front_pic.png => charmeleon/anim_front.png} (100%) rename graphics/pokemon/{back_pics/charmeleon_back_pic.png => charmeleon/back.png} (100%) rename graphics/pokemon/{footprints/charmeleon_footprint.png => charmeleon/footprint.png} (100%) rename graphics/pokemon/{front_pics/charmeleon_still_front_pic.png => charmeleon/front.png} (100%) rename graphics/pokemon/{icons/charmeleon_icon.png => charmeleon/icon.png} (100%) rename graphics/pokemon/{palettes/charmeleon_palette.pal => charmeleon/normal.pal} (100%) rename graphics/pokemon/{palettes/charmeleon_shiny_palette.pal => charmeleon/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/chikorita_front_pic.png => chikorita/anim_front.png} (100%) rename graphics/pokemon/{back_pics/chikorita_back_pic.png => chikorita/back.png} (100%) rename graphics/pokemon/{footprints/chikorita_footprint.png => chikorita/footprint.png} (100%) rename graphics/pokemon/{front_pics/chikorita_still_front_pic.png => chikorita/front.png} (100%) rename graphics/pokemon/{icons/chikorita_icon.png => chikorita/icon.png} (100%) rename graphics/pokemon/{palettes/chikorita_palette.pal => chikorita/normal.pal} (100%) rename graphics/pokemon/{palettes/chikorita_shiny_palette.pal => chikorita/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/chimecho_front_pic.png => chimecho/anim_front.png} (100%) rename graphics/pokemon/{back_pics/chimecho_back_pic.png => chimecho/back.png} (100%) rename graphics/pokemon/{footprints/chimecho_footprint.png => chimecho/footprint.png} (100%) rename graphics/pokemon/{front_pics/chimecho_still_front_pic.png => chimecho/front.png} (100%) rename graphics/pokemon/{icons/chimecho_icon.png => chimecho/icon.png} (100%) rename graphics/pokemon/{palettes/chimecho_palette.pal => chimecho/normal.pal} (100%) rename graphics/pokemon/{palettes/chimecho_shiny_palette.pal => chimecho/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/chinchou_front_pic.png => chinchou/anim_front.png} (100%) rename graphics/pokemon/{back_pics/chinchou_back_pic.png => chinchou/back.png} (100%) rename graphics/pokemon/{footprints/chinchou_footprint.png => chinchou/footprint.png} (100%) rename graphics/pokemon/{front_pics/chinchou_still_front_pic.png => chinchou/front.png} (100%) rename graphics/pokemon/{icons/chinchou_icon.png => chinchou/icon.png} (100%) rename graphics/pokemon/{palettes/chinchou_palette.pal => chinchou/normal.pal} (100%) rename graphics/pokemon/{palettes/chinchou_shiny_palette.pal => chinchou/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/circled_question_mark_front_pic.png => circled_question_mark/anim_front.png} (100%) rename graphics/pokemon/{back_pics/circled_question_mark_back_pic.png => circled_question_mark/back.png} (100%) rename graphics/pokemon/{front_pics/circled_question_mark_still_front_pic.png => circled_question_mark/front.png} (100%) rename graphics/pokemon/{palettes/circled_question_mark_palette.pal => circled_question_mark/normal.pal} (100%) rename graphics/pokemon/{palettes/circled_question_mark_shiny_palette.pal => circled_question_mark/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/clamperl_front_pic.png => clamperl/anim_front.png} (100%) rename graphics/pokemon/{back_pics/clamperl_back_pic.png => clamperl/back.png} (100%) rename graphics/pokemon/{footprints/clamperl_footprint.png => clamperl/footprint.png} (100%) rename graphics/pokemon/{front_pics/clamperl_still_front_pic.png => clamperl/front.png} (100%) rename graphics/pokemon/{icons/clamperl_icon.png => clamperl/icon.png} (100%) rename graphics/pokemon/{palettes/clamperl_palette.pal => clamperl/normal.pal} (100%) rename graphics/pokemon/{palettes/clamperl_shiny_palette.pal => clamperl/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/claydol_front_pic.png => claydol/anim_front.png} (100%) rename graphics/pokemon/{back_pics/claydol_back_pic.png => claydol/back.png} (100%) rename graphics/pokemon/{footprints/claydol_footprint.png => claydol/footprint.png} (100%) rename graphics/pokemon/{front_pics/claydol_still_front_pic.png => claydol/front.png} (100%) rename graphics/pokemon/{icons/claydol_icon.png => claydol/icon.png} (100%) rename graphics/pokemon/{palettes/claydol_palette.pal => claydol/normal.pal} (100%) rename graphics/pokemon/{palettes/claydol_shiny_palette.pal => claydol/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/clefable_front_pic.png => clefable/anim_front.png} (100%) rename graphics/pokemon/{back_pics/clefable_back_pic.png => clefable/back.png} (100%) rename graphics/pokemon/{footprints/clefable_footprint.png => clefable/footprint.png} (100%) rename graphics/pokemon/{front_pics/clefable_still_front_pic.png => clefable/front.png} (100%) rename graphics/pokemon/{icons/clefable_icon.png => clefable/icon.png} (100%) rename graphics/pokemon/{palettes/clefable_palette.pal => clefable/normal.pal} (100%) rename graphics/pokemon/{palettes/clefable_shiny_palette.pal => clefable/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/clefairy_front_pic.png => clefairy/anim_front.png} (100%) rename graphics/pokemon/{back_pics/clefairy_back_pic.png => clefairy/back.png} (100%) rename graphics/pokemon/{footprints/clefairy_footprint.png => clefairy/footprint.png} (100%) rename graphics/pokemon/{front_pics/clefairy_still_front_pic.png => clefairy/front.png} (100%) rename graphics/pokemon/{icons/clefairy_icon.png => clefairy/icon.png} (100%) rename graphics/pokemon/{palettes/clefairy_palette.pal => clefairy/normal.pal} (100%) rename graphics/pokemon/{palettes/clefairy_shiny_palette.pal => clefairy/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/cleffa_front_pic.png => cleffa/anim_front.png} (100%) rename graphics/pokemon/{back_pics/cleffa_back_pic.png => cleffa/back.png} (100%) rename graphics/pokemon/{footprints/cleffa_footprint.png => cleffa/footprint.png} (100%) rename graphics/pokemon/{front_pics/cleffa_still_front_pic.png => cleffa/front.png} (100%) rename graphics/pokemon/{icons/cleffa_icon.png => cleffa/icon.png} (100%) rename graphics/pokemon/{palettes/cleffa_palette.pal => cleffa/normal.pal} (100%) rename graphics/pokemon/{palettes/cleffa_shiny_palette.pal => cleffa/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/cloyster_front_pic.png => cloyster/anim_front.png} (100%) rename graphics/pokemon/{back_pics/cloyster_back_pic.png => cloyster/back.png} (100%) rename graphics/pokemon/{footprints/cloyster_footprint.png => cloyster/footprint.png} (100%) rename graphics/pokemon/{front_pics/cloyster_still_front_pic.png => cloyster/front.png} (100%) rename graphics/pokemon/{icons/cloyster_icon.png => cloyster/icon.png} (100%) rename graphics/pokemon/{palettes/cloyster_palette.pal => cloyster/normal.pal} (100%) rename graphics/pokemon/{palettes/cloyster_shiny_palette.pal => cloyster/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/combusken_front_pic.png => combusken/anim_front.png} (100%) rename graphics/pokemon/{back_pics/combusken_back_pic.png => combusken/back.png} (100%) rename graphics/pokemon/{footprints/combusken_footprint.png => combusken/footprint.png} (100%) rename graphics/pokemon/{front_pics/combusken_still_front_pic.png => combusken/front.png} (100%) rename graphics/pokemon/{icons/combusken_icon.png => combusken/icon.png} (100%) rename graphics/pokemon/{palettes/combusken_palette.pal => combusken/normal.pal} (100%) rename graphics/pokemon/{palettes/combusken_shiny_palette.pal => combusken/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/corphish_front_pic.png => corphish/anim_front.png} (100%) rename graphics/pokemon/{back_pics/corphish_back_pic.png => corphish/back.png} (100%) rename graphics/pokemon/{footprints/corphish_footprint.png => corphish/footprint.png} (100%) rename graphics/pokemon/{front_pics/corphish_still_front_pic.png => corphish/front.png} (100%) rename graphics/pokemon/{icons/corphish_icon.png => corphish/icon.png} (100%) rename graphics/pokemon/{palettes/corphish_palette.pal => corphish/normal.pal} (100%) rename graphics/pokemon/{palettes/corphish_shiny_palette.pal => corphish/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/corsola_front_pic.png => corsola/anim_front.png} (100%) rename graphics/pokemon/{back_pics/corsola_back_pic.png => corsola/back.png} (100%) rename graphics/pokemon/{footprints/corsola_footprint.png => corsola/footprint.png} (100%) rename graphics/pokemon/{front_pics/corsola_still_front_pic.png => corsola/front.png} (100%) rename graphics/pokemon/{icons/corsola_icon.png => corsola/icon.png} (100%) rename graphics/pokemon/{palettes/corsola_palette.pal => corsola/normal.pal} (100%) rename graphics/pokemon/{palettes/corsola_shiny_palette.pal => corsola/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/cradily_front_pic.png => cradily/anim_front.png} (100%) rename graphics/pokemon/{back_pics/cradily_back_pic.png => cradily/back.png} (100%) rename graphics/pokemon/{footprints/cradily_footprint.png => cradily/footprint.png} (100%) rename graphics/pokemon/{front_pics/cradily_still_front_pic.png => cradily/front.png} (100%) rename graphics/pokemon/{icons/cradily_icon.png => cradily/icon.png} (100%) rename graphics/pokemon/{palettes/cradily_palette.pal => cradily/normal.pal} (100%) rename graphics/pokemon/{palettes/cradily_shiny_palette.pal => cradily/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/crawdaunt_front_pic.png => crawdaunt/anim_front.png} (100%) rename graphics/pokemon/{back_pics/crawdaunt_back_pic.png => crawdaunt/back.png} (100%) rename graphics/pokemon/{footprints/crawdaunt_footprint.png => crawdaunt/footprint.png} (100%) rename graphics/pokemon/{front_pics/crawdaunt_still_front_pic.png => crawdaunt/front.png} (100%) rename graphics/pokemon/{icons/crawdaunt_icon.png => crawdaunt/icon.png} (100%) rename graphics/pokemon/{palettes/crawdaunt_palette.pal => crawdaunt/normal.pal} (100%) rename graphics/pokemon/{palettes/crawdaunt_shiny_palette.pal => crawdaunt/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/crobat_front_pic.png => crobat/anim_front.png} (100%) rename graphics/pokemon/{back_pics/crobat_back_pic.png => crobat/back.png} (100%) rename graphics/pokemon/{footprints/crobat_footprint.png => crobat/footprint.png} (100%) rename graphics/pokemon/{front_pics/crobat_still_front_pic.png => crobat/front.png} (100%) rename graphics/pokemon/{icons/crobat_icon.png => crobat/icon.png} (100%) rename graphics/pokemon/{palettes/crobat_palette.pal => crobat/normal.pal} (100%) rename graphics/pokemon/{palettes/crobat_shiny_palette.pal => crobat/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/croconaw_front_pic.png => croconaw/anim_front.png} (100%) rename graphics/pokemon/{back_pics/croconaw_back_pic.png => croconaw/back.png} (100%) rename graphics/pokemon/{footprints/croconaw_footprint.png => croconaw/footprint.png} (100%) rename graphics/pokemon/{front_pics/croconaw_still_front_pic.png => croconaw/front.png} (100%) rename graphics/pokemon/{icons/croconaw_icon.png => croconaw/icon.png} (100%) rename graphics/pokemon/{palettes/croconaw_palette.pal => croconaw/normal.pal} (100%) rename graphics/pokemon/{palettes/croconaw_shiny_palette.pal => croconaw/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/cubone_front_pic.png => cubone/anim_front.png} (100%) rename graphics/pokemon/{back_pics/cubone_back_pic.png => cubone/back.png} (100%) rename graphics/pokemon/{footprints/cubone_footprint.png => cubone/footprint.png} (100%) rename graphics/pokemon/{front_pics/cubone_still_front_pic.png => cubone/front.png} (100%) rename graphics/pokemon/{icons/cubone_icon.png => cubone/icon.png} (100%) rename graphics/pokemon/{palettes/cubone_palette.pal => cubone/normal.pal} (100%) rename graphics/pokemon/{palettes/cubone_shiny_palette.pal => cubone/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/cyndaquil_front_pic.png => cyndaquil/anim_front.png} (100%) rename graphics/pokemon/{back_pics/cyndaquil_back_pic.png => cyndaquil/back.png} (100%) rename graphics/pokemon/{footprints/cyndaquil_footprint.png => cyndaquil/footprint.png} (100%) rename graphics/pokemon/{front_pics/cyndaquil_still_front_pic.png => cyndaquil/front.png} (100%) rename graphics/pokemon/{icons/cyndaquil_icon.png => cyndaquil/icon.png} (100%) rename graphics/pokemon/{palettes/cyndaquil_palette.pal => cyndaquil/normal.pal} (100%) rename graphics/pokemon/{palettes/cyndaquil_shiny_palette.pal => cyndaquil/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/delcatty_front_pic.png => delcatty/anim_front.png} (100%) rename graphics/pokemon/{back_pics/delcatty_back_pic.png => delcatty/back.png} (100%) rename graphics/pokemon/{footprints/delcatty_footprint.png => delcatty/footprint.png} (100%) rename graphics/pokemon/{front_pics/delcatty_still_front_pic.png => delcatty/front.png} (100%) rename graphics/pokemon/{icons/delcatty_icon.png => delcatty/icon.png} (100%) rename graphics/pokemon/{palettes/delcatty_palette.pal => delcatty/normal.pal} (100%) rename graphics/pokemon/{palettes/delcatty_shiny_palette.pal => delcatty/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/delibird_front_pic.png => delibird/anim_front.png} (100%) rename graphics/pokemon/{back_pics/delibird_back_pic.png => delibird/back.png} (100%) rename graphics/pokemon/{footprints/delibird_footprint.png => delibird/footprint.png} (100%) rename graphics/pokemon/{front_pics/delibird_still_front_pic.png => delibird/front.png} (100%) rename graphics/pokemon/{icons/delibird_icon.png => delibird/icon.png} (100%) rename graphics/pokemon/{palettes/delibird_palette.pal => delibird/normal.pal} (100%) rename graphics/pokemon/{palettes/delibird_shiny_palette.pal => delibird/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/deoxys_front_pic.png => deoxys/anim_front.png} (100%) rename graphics/pokemon/{back_pics/deoxys_back_pic.png => deoxys/back.png} (100%) rename graphics/pokemon/{footprints/deoxys_footprint.png => deoxys/footprint.png} (100%) rename graphics/pokemon/{front_pics/deoxys_still_front_pic.png => deoxys/front.png} (100%) rename graphics/pokemon/{icons/deoxys_icon.png => deoxys/icon.png} (100%) rename graphics/pokemon/{icons/deoxys_speed_icon.png => deoxys/icon_speed.png} (100%) rename graphics/pokemon/{palettes/deoxys_palette.pal => deoxys/normal.pal} (100%) rename graphics/pokemon/{palettes/deoxys_shiny_palette.pal => deoxys/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/dewgong_front_pic.png => dewgong/anim_front.png} (100%) rename graphics/pokemon/{back_pics/dewgong_back_pic.png => dewgong/back.png} (100%) rename graphics/pokemon/{footprints/dewgong_footprint.png => dewgong/footprint.png} (100%) rename graphics/pokemon/{front_pics/dewgong_still_front_pic.png => dewgong/front.png} (100%) rename graphics/pokemon/{icons/dewgong_icon.png => dewgong/icon.png} (100%) rename graphics/pokemon/{palettes/dewgong_palette.pal => dewgong/normal.pal} (100%) rename graphics/pokemon/{palettes/dewgong_shiny_palette.pal => dewgong/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/diglett_front_pic.png => diglett/anim_front.png} (100%) rename graphics/pokemon/{back_pics/diglett_back_pic.png => diglett/back.png} (100%) rename graphics/pokemon/{footprints/diglett_footprint.png => diglett/footprint.png} (100%) rename graphics/pokemon/{front_pics/diglett_still_front_pic.png => diglett/front.png} (100%) rename graphics/pokemon/{icons/diglett_icon.png => diglett/icon.png} (100%) rename graphics/pokemon/{palettes/diglett_palette.pal => diglett/normal.pal} (100%) rename graphics/pokemon/{palettes/diglett_shiny_palette.pal => diglett/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/ditto_front_pic.png => ditto/anim_front.png} (100%) rename graphics/pokemon/{back_pics/ditto_back_pic.png => ditto/back.png} (100%) rename graphics/pokemon/{footprints/ditto_footprint.png => ditto/footprint.png} (100%) rename graphics/pokemon/{front_pics/ditto_still_front_pic.png => ditto/front.png} (100%) rename graphics/pokemon/{icons/ditto_icon.png => ditto/icon.png} (100%) rename graphics/pokemon/{palettes/ditto_palette.pal => ditto/normal.pal} (100%) rename graphics/pokemon/{palettes/ditto_shiny_palette.pal => ditto/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/dodrio_front_pic.png => dodrio/anim_front.png} (100%) rename graphics/pokemon/{back_pics/dodrio_back_pic.png => dodrio/back.png} (100%) rename graphics/pokemon/{footprints/dodrio_footprint.png => dodrio/footprint.png} (100%) rename graphics/pokemon/{front_pics/dodrio_still_front_pic.png => dodrio/front.png} (100%) rename graphics/pokemon/{icons/dodrio_icon.png => dodrio/icon.png} (100%) rename graphics/pokemon/{palettes/dodrio_palette.pal => dodrio/normal.pal} (100%) rename graphics/pokemon/{palettes/dodrio_shiny_palette.pal => dodrio/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/doduo_front_pic.png => doduo/anim_front.png} (100%) rename graphics/pokemon/{back_pics/doduo_back_pic.png => doduo/back.png} (100%) rename graphics/pokemon/{footprints/doduo_footprint.png => doduo/footprint.png} (100%) rename graphics/pokemon/{front_pics/doduo_still_front_pic.png => doduo/front.png} (100%) rename graphics/pokemon/{icons/doduo_icon.png => doduo/icon.png} (100%) rename graphics/pokemon/{palettes/doduo_palette.pal => doduo/normal.pal} (100%) rename graphics/pokemon/{palettes/doduo_shiny_palette.pal => doduo/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/donphan_front_pic.png => donphan/anim_front.png} (100%) rename graphics/pokemon/{back_pics/donphan_back_pic.png => donphan/back.png} (100%) rename graphics/pokemon/{footprints/donphan_footprint.png => donphan/footprint.png} (100%) rename graphics/pokemon/{front_pics/donphan_still_front_pic.png => donphan/front.png} (100%) rename graphics/pokemon/{icons/donphan_icon.png => donphan/icon.png} (100%) rename graphics/pokemon/{palettes/donphan_palette.pal => donphan/normal.pal} (100%) rename graphics/pokemon/{palettes/donphan_shiny_palette.pal => donphan/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/double_question_mark_front_pic.png => double_question_mark/anim_front.png} (100%) rename graphics/pokemon/{back_pics/double_question_mark_back_pic.png => double_question_mark/back.png} (100%) rename graphics/pokemon/{front_pics/double_question_mark_still_front_pic.png => double_question_mark/front.png} (100%) rename graphics/pokemon/{palettes/double_question_mark_palette.pal => double_question_mark/normal.pal} (100%) rename graphics/pokemon/{palettes/double_question_mark_shiny_palette.pal => double_question_mark/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/dragonair_front_pic.png => dragonair/anim_front.png} (100%) rename graphics/pokemon/{back_pics/dragonair_back_pic.png => dragonair/back.png} (100%) rename graphics/pokemon/{footprints/dragonair_footprint.png => dragonair/footprint.png} (100%) rename graphics/pokemon/{front_pics/dragonair_still_front_pic.png => dragonair/front.png} (100%) rename graphics/pokemon/{icons/dragonair_icon.png => dragonair/icon.png} (100%) rename graphics/pokemon/{palettes/dragonair_palette.pal => dragonair/normal.pal} (100%) rename graphics/pokemon/{palettes/dragonair_shiny_palette.pal => dragonair/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/dragonite_front_pic.png => dragonite/anim_front.png} (100%) rename graphics/pokemon/{back_pics/dragonite_back_pic.png => dragonite/back.png} (100%) rename graphics/pokemon/{footprints/dragonite_footprint.png => dragonite/footprint.png} (100%) rename graphics/pokemon/{front_pics/dragonite_still_front_pic.png => dragonite/front.png} (100%) rename graphics/pokemon/{icons/dragonite_icon.png => dragonite/icon.png} (100%) rename graphics/pokemon/{palettes/dragonite_palette.pal => dragonite/normal.pal} (100%) rename graphics/pokemon/{palettes/dragonite_shiny_palette.pal => dragonite/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/dratini_front_pic.png => dratini/anim_front.png} (100%) rename graphics/pokemon/{back_pics/dratini_back_pic.png => dratini/back.png} (100%) rename graphics/pokemon/{footprints/dratini_footprint.png => dratini/footprint.png} (100%) rename graphics/pokemon/{front_pics/dratini_still_front_pic.png => dratini/front.png} (100%) rename graphics/pokemon/{icons/dratini_icon.png => dratini/icon.png} (100%) rename graphics/pokemon/{palettes/dratini_palette.pal => dratini/normal.pal} (100%) rename graphics/pokemon/{palettes/dratini_shiny_palette.pal => dratini/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/drowzee_front_pic.png => drowzee/anim_front.png} (100%) rename graphics/pokemon/{back_pics/drowzee_back_pic.png => drowzee/back.png} (100%) rename graphics/pokemon/{footprints/drowzee_footprint.png => drowzee/footprint.png} (100%) rename graphics/pokemon/{front_pics/drowzee_still_front_pic.png => drowzee/front.png} (100%) rename graphics/pokemon/{icons/drowzee_icon.png => drowzee/icon.png} (100%) rename graphics/pokemon/{palettes/drowzee_palette.pal => drowzee/normal.pal} (100%) rename graphics/pokemon/{palettes/drowzee_shiny_palette.pal => drowzee/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/dugtrio_front_pic.png => dugtrio/anim_front.png} (100%) rename graphics/pokemon/{back_pics/dugtrio_back_pic.png => dugtrio/back.png} (100%) rename graphics/pokemon/{footprints/dugtrio_footprint.png => dugtrio/footprint.png} (100%) rename graphics/pokemon/{front_pics/dugtrio_still_front_pic.png => dugtrio/front.png} (100%) rename graphics/pokemon/{icons/dugtrio_icon.png => dugtrio/icon.png} (100%) rename graphics/pokemon/{palettes/dugtrio_palette.pal => dugtrio/normal.pal} (100%) rename graphics/pokemon/{palettes/dugtrio_shiny_palette.pal => dugtrio/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/dunsparce_front_pic.png => dunsparce/anim_front.png} (100%) rename graphics/pokemon/{back_pics/dunsparce_back_pic.png => dunsparce/back.png} (100%) rename graphics/pokemon/{footprints/dunsparce_footprint.png => dunsparce/footprint.png} (100%) rename graphics/pokemon/{front_pics/dunsparce_still_front_pic.png => dunsparce/front.png} (100%) rename graphics/pokemon/{icons/dunsparce_icon.png => dunsparce/icon.png} (100%) rename graphics/pokemon/{palettes/dunsparce_palette.pal => dunsparce/normal.pal} (100%) rename graphics/pokemon/{palettes/dunsparce_shiny_palette.pal => dunsparce/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/dusclops_front_pic.png => dusclops/anim_front.png} (100%) rename graphics/pokemon/{back_pics/dusclops_back_pic.png => dusclops/back.png} (100%) rename graphics/pokemon/{footprints/dusclops_footprint.png => dusclops/footprint.png} (100%) rename graphics/pokemon/{front_pics/dusclops_still_front_pic.png => dusclops/front.png} (100%) rename graphics/pokemon/{icons/dusclops_icon.png => dusclops/icon.png} (100%) rename graphics/pokemon/{palettes/dusclops_palette.pal => dusclops/normal.pal} (100%) rename graphics/pokemon/{palettes/dusclops_shiny_palette.pal => dusclops/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/duskull_front_pic.png => duskull/anim_front.png} (100%) rename graphics/pokemon/{back_pics/duskull_back_pic.png => duskull/back.png} (100%) rename graphics/pokemon/{footprints/duskull_footprint.png => duskull/footprint.png} (100%) rename graphics/pokemon/{front_pics/duskull_still_front_pic.png => duskull/front.png} (100%) rename graphics/pokemon/{icons/duskull_icon.png => duskull/icon.png} (100%) rename graphics/pokemon/{palettes/duskull_palette.pal => duskull/normal.pal} (100%) rename graphics/pokemon/{palettes/duskull_shiny_palette.pal => duskull/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/dustox_front_pic.png => dustox/anim_front.png} (100%) rename graphics/pokemon/{back_pics/dustox_back_pic.png => dustox/back.png} (100%) rename graphics/pokemon/{footprints/dustox_footprint.png => dustox/footprint.png} (100%) rename graphics/pokemon/{front_pics/dustox_still_front_pic.png => dustox/front.png} (100%) rename graphics/pokemon/{icons/dustox_icon.png => dustox/icon.png} (100%) rename graphics/pokemon/{palettes/dustox_palette.pal => dustox/normal.pal} (100%) rename graphics/pokemon/{palettes/dustox_shiny_palette.pal => dustox/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/eevee_front_pic.png => eevee/anim_front.png} (100%) rename graphics/pokemon/{back_pics/eevee_back_pic.png => eevee/back.png} (100%) rename graphics/pokemon/{footprints/eevee_footprint.png => eevee/footprint.png} (100%) rename graphics/pokemon/{front_pics/eevee_still_front_pic.png => eevee/front.png} (100%) rename graphics/pokemon/{icons/eevee_icon.png => eevee/icon.png} (100%) rename graphics/pokemon/{palettes/eevee_palette.pal => eevee/normal.pal} (100%) rename graphics/pokemon/{palettes/eevee_shiny_palette.pal => eevee/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/egg_front_pic.png => egg/anim_front.png} (100%) rename graphics/pokemon/{front_pics/egg_still_front_pic.png => egg/front.png} (100%) rename graphics/pokemon/{icons/egg_icon.png => egg/icon.png} (100%) rename graphics/pokemon/{palettes/egg_palette.pal => egg/normal.pal} (100%) rename graphics/pokemon/{anim_front_pics/ekans_front_pic.png => ekans/anim_front.png} (100%) rename graphics/pokemon/{back_pics/ekans_back_pic.png => ekans/back.png} (100%) rename graphics/pokemon/{footprints/ekans_footprint.png => ekans/footprint.png} (100%) rename graphics/pokemon/{front_pics/ekans_still_front_pic.png => ekans/front.png} (100%) rename graphics/pokemon/{icons/ekans_icon.png => ekans/icon.png} (100%) rename graphics/pokemon/{palettes/ekans_palette.pal => ekans/normal.pal} (100%) rename graphics/pokemon/{palettes/ekans_shiny_palette.pal => ekans/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/electabuzz_front_pic.png => electabuzz/anim_front.png} (100%) rename graphics/pokemon/{back_pics/electabuzz_back_pic.png => electabuzz/back.png} (100%) rename graphics/pokemon/{footprints/electabuzz_footprint.png => electabuzz/footprint.png} (100%) rename graphics/pokemon/{front_pics/electabuzz_still_front_pic.png => electabuzz/front.png} (100%) rename graphics/pokemon/{icons/electabuzz_icon.png => electabuzz/icon.png} (100%) rename graphics/pokemon/{palettes/electabuzz_palette.pal => electabuzz/normal.pal} (100%) rename graphics/pokemon/{palettes/electabuzz_shiny_palette.pal => electabuzz/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/electrike_front_pic.png => electrike/anim_front.png} (100%) rename graphics/pokemon/{back_pics/electrike_back_pic.png => electrike/back.png} (100%) rename graphics/pokemon/{footprints/electrike_footprint.png => electrike/footprint.png} (100%) rename graphics/pokemon/{front_pics/electrike_still_front_pic.png => electrike/front.png} (100%) rename graphics/pokemon/{icons/electrike_icon.png => electrike/icon.png} (100%) rename graphics/pokemon/{palettes/electrike_palette.pal => electrike/normal.pal} (100%) rename graphics/pokemon/{palettes/electrike_shiny_palette.pal => electrike/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/electrode_front_pic.png => electrode/anim_front.png} (100%) rename graphics/pokemon/{back_pics/electrode_back_pic.png => electrode/back.png} (100%) rename graphics/pokemon/{footprints/electrode_footprint.png => electrode/footprint.png} (100%) rename graphics/pokemon/{front_pics/electrode_still_front_pic.png => electrode/front.png} (100%) rename graphics/pokemon/{icons/electrode_icon.png => electrode/icon.png} (100%) rename graphics/pokemon/{palettes/electrode_palette.pal => electrode/normal.pal} (100%) rename graphics/pokemon/{palettes/electrode_shiny_palette.pal => electrode/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/elekid_front_pic.png => elekid/anim_front.png} (100%) rename graphics/pokemon/{back_pics/elekid_back_pic.png => elekid/back.png} (100%) rename graphics/pokemon/{footprints/elekid_footprint.png => elekid/footprint.png} (100%) rename graphics/pokemon/{front_pics/elekid_still_front_pic.png => elekid/front.png} (100%) rename graphics/pokemon/{icons/elekid_icon.png => elekid/icon.png} (100%) rename graphics/pokemon/{palettes/elekid_palette.pal => elekid/normal.pal} (100%) rename graphics/pokemon/{palettes/elekid_shiny_palette.pal => elekid/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/entei_front_pic.png => entei/anim_front.png} (100%) rename graphics/pokemon/{back_pics/entei_back_pic.png => entei/back.png} (100%) rename graphics/pokemon/{footprints/entei_footprint.png => entei/footprint.png} (100%) rename graphics/pokemon/{front_pics/entei_still_front_pic.png => entei/front.png} (100%) rename graphics/pokemon/{icons/entei_icon.png => entei/icon.png} (100%) rename graphics/pokemon/{palettes/entei_palette.pal => entei/normal.pal} (100%) rename graphics/pokemon/{palettes/entei_shiny_palette.pal => entei/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/espeon_front_pic.png => espeon/anim_front.png} (100%) rename graphics/pokemon/{back_pics/espeon_back_pic.png => espeon/back.png} (100%) rename graphics/pokemon/{footprints/espeon_footprint.png => espeon/footprint.png} (100%) rename graphics/pokemon/{front_pics/espeon_still_front_pic.png => espeon/front.png} (100%) rename graphics/pokemon/{icons/espeon_icon.png => espeon/icon.png} (100%) rename graphics/pokemon/{palettes/espeon_palette.pal => espeon/normal.pal} (100%) rename graphics/pokemon/{palettes/espeon_shiny_palette.pal => espeon/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/exeggcute_front_pic.png => exeggcute/anim_front.png} (100%) rename graphics/pokemon/{back_pics/exeggcute_back_pic.png => exeggcute/back.png} (100%) rename graphics/pokemon/{footprints/exeggcute_footprint.png => exeggcute/footprint.png} (100%) rename graphics/pokemon/{front_pics/exeggcute_still_front_pic.png => exeggcute/front.png} (100%) rename graphics/pokemon/{icons/exeggcute_icon.png => exeggcute/icon.png} (100%) rename graphics/pokemon/{palettes/exeggcute_palette.pal => exeggcute/normal.pal} (100%) rename graphics/pokemon/{palettes/exeggcute_shiny_palette.pal => exeggcute/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/exeggutor_front_pic.png => exeggutor/anim_front.png} (100%) rename graphics/pokemon/{back_pics/exeggutor_back_pic.png => exeggutor/back.png} (100%) rename graphics/pokemon/{footprints/exeggutor_footprint.png => exeggutor/footprint.png} (100%) rename graphics/pokemon/{front_pics/exeggutor_still_front_pic.png => exeggutor/front.png} (100%) rename graphics/pokemon/{icons/exeggutor_icon.png => exeggutor/icon.png} (100%) rename graphics/pokemon/{palettes/exeggutor_palette.pal => exeggutor/normal.pal} (100%) rename graphics/pokemon/{palettes/exeggutor_shiny_palette.pal => exeggutor/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/exploud_front_pic.png => exploud/anim_front.png} (100%) rename graphics/pokemon/{back_pics/exploud_back_pic.png => exploud/back.png} (100%) rename graphics/pokemon/{footprints/exploud_footprint.png => exploud/footprint.png} (100%) rename graphics/pokemon/{front_pics/exploud_still_front_pic.png => exploud/front.png} (100%) rename graphics/pokemon/{icons/exploud_icon.png => exploud/icon.png} (100%) rename graphics/pokemon/{palettes/exploud_palette.pal => exploud/normal.pal} (100%) rename graphics/pokemon/{palettes/exploud_shiny_palette.pal => exploud/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/farfetch_d_front_pic.png => farfetch_d/anim_front.png} (100%) rename graphics/pokemon/{back_pics/farfetch_d_back_pic.png => farfetch_d/back.png} (100%) rename graphics/pokemon/{footprints/farfetch_d_footprint.png => farfetch_d/footprint.png} (100%) rename graphics/pokemon/{front_pics/farfetch_d_still_front_pic.png => farfetch_d/front.png} (100%) rename graphics/pokemon/{icons/farfetch_d_icon.png => farfetch_d/icon.png} (100%) rename graphics/pokemon/{palettes/farfetch_d_palette.pal => farfetch_d/normal.pal} (100%) rename graphics/pokemon/{palettes/farfetch_d_shiny_palette.pal => farfetch_d/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/fearow_front_pic.png => fearow/anim_front.png} (100%) rename graphics/pokemon/{back_pics/fearow_back_pic.png => fearow/back.png} (100%) rename graphics/pokemon/{footprints/fearow_footprint.png => fearow/footprint.png} (100%) rename graphics/pokemon/{front_pics/fearow_still_front_pic.png => fearow/front.png} (100%) rename graphics/pokemon/{icons/fearow_icon.png => fearow/icon.png} (100%) rename graphics/pokemon/{palettes/fearow_palette.pal => fearow/normal.pal} (100%) rename graphics/pokemon/{palettes/fearow_shiny_palette.pal => fearow/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/feebas_front_pic.png => feebas/anim_front.png} (100%) rename graphics/pokemon/{back_pics/feebas_back_pic.png => feebas/back.png} (100%) rename graphics/pokemon/{footprints/feebas_footprint.png => feebas/footprint.png} (100%) rename graphics/pokemon/{front_pics/feebas_still_front_pic.png => feebas/front.png} (100%) rename graphics/pokemon/{icons/feebas_icon.png => feebas/icon.png} (100%) rename graphics/pokemon/{palettes/feebas_palette.pal => feebas/normal.pal} (100%) rename graphics/pokemon/{palettes/feebas_shiny_palette.pal => feebas/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/feraligatr_front_pic.png => feraligatr/anim_front.png} (100%) rename graphics/pokemon/{back_pics/feraligatr_back_pic.png => feraligatr/back.png} (100%) rename graphics/pokemon/{footprints/feraligatr_footprint.png => feraligatr/footprint.png} (100%) rename graphics/pokemon/{front_pics/feraligatr_still_front_pic.png => feraligatr/front.png} (100%) rename graphics/pokemon/{icons/feraligatr_icon.png => feraligatr/icon.png} (100%) rename graphics/pokemon/{palettes/feraligatr_palette.pal => feraligatr/normal.pal} (100%) rename graphics/pokemon/{palettes/feraligatr_shiny_palette.pal => feraligatr/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/flaaffy_front_pic.png => flaaffy/anim_front.png} (100%) rename graphics/pokemon/{back_pics/flaaffy_back_pic.png => flaaffy/back.png} (100%) rename graphics/pokemon/{footprints/flaaffy_footprint.png => flaaffy/footprint.png} (100%) rename graphics/pokemon/{front_pics/flaaffy_still_front_pic.png => flaaffy/front.png} (100%) rename graphics/pokemon/{icons/flaaffy_icon.png => flaaffy/icon.png} (100%) rename graphics/pokemon/{palettes/flaaffy_palette.pal => flaaffy/normal.pal} (100%) rename graphics/pokemon/{palettes/flaaffy_shiny_palette.pal => flaaffy/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/flareon_front_pic.png => flareon/anim_front.png} (100%) rename graphics/pokemon/{back_pics/flareon_back_pic.png => flareon/back.png} (100%) rename graphics/pokemon/{footprints/flareon_footprint.png => flareon/footprint.png} (100%) rename graphics/pokemon/{front_pics/flareon_still_front_pic.png => flareon/front.png} (100%) rename graphics/pokemon/{icons/flareon_icon.png => flareon/icon.png} (100%) rename graphics/pokemon/{palettes/flareon_palette.pal => flareon/normal.pal} (100%) rename graphics/pokemon/{palettes/flareon_shiny_palette.pal => flareon/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/flygon_front_pic.png => flygon/anim_front.png} (100%) rename graphics/pokemon/{back_pics/flygon_back_pic.png => flygon/back.png} (100%) rename graphics/pokemon/{footprints/flygon_footprint.png => flygon/footprint.png} (100%) rename graphics/pokemon/{front_pics/flygon_still_front_pic.png => flygon/front.png} (100%) rename graphics/pokemon/{icons/flygon_icon.png => flygon/icon.png} (100%) rename graphics/pokemon/{palettes/flygon_palette.pal => flygon/normal.pal} (100%) rename graphics/pokemon/{palettes/flygon_shiny_palette.pal => flygon/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/forretress_front_pic.png => forretress/anim_front.png} (100%) rename graphics/pokemon/{back_pics/forretress_back_pic.png => forretress/back.png} (100%) rename graphics/pokemon/{footprints/forretress_footprint.png => forretress/footprint.png} (100%) rename graphics/pokemon/{front_pics/forretress_still_front_pic.png => forretress/front.png} (100%) rename graphics/pokemon/{icons/forretress_icon.png => forretress/icon.png} (100%) rename graphics/pokemon/{palettes/forretress_palette.pal => forretress/normal.pal} (100%) rename graphics/pokemon/{palettes/forretress_shiny_palette.pal => forretress/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/furret_front_pic.png => furret/anim_front.png} (100%) rename graphics/pokemon/{back_pics/furret_back_pic.png => furret/back.png} (100%) rename graphics/pokemon/{footprints/furret_footprint.png => furret/footprint.png} (100%) rename graphics/pokemon/{front_pics/furret_still_front_pic.png => furret/front.png} (100%) rename graphics/pokemon/{icons/furret_icon.png => furret/icon.png} (100%) rename graphics/pokemon/{palettes/furret_palette.pal => furret/normal.pal} (100%) rename graphics/pokemon/{palettes/furret_shiny_palette.pal => furret/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/gardevoir_front_pic.png => gardevoir/anim_front.png} (100%) rename graphics/pokemon/{back_pics/gardevoir_back_pic.png => gardevoir/back.png} (100%) rename graphics/pokemon/{footprints/gardevoir_footprint.png => gardevoir/footprint.png} (100%) rename graphics/pokemon/{front_pics/gardevoir_still_front_pic.png => gardevoir/front.png} (100%) rename graphics/pokemon/{icons/gardevoir_icon.png => gardevoir/icon.png} (100%) rename graphics/pokemon/{palettes/gardevoir_palette.pal => gardevoir/normal.pal} (100%) rename graphics/pokemon/{palettes/gardevoir_shiny_palette.pal => gardevoir/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/gastly_front_pic.png => gastly/anim_front.png} (100%) rename graphics/pokemon/{back_pics/gastly_back_pic.png => gastly/back.png} (100%) rename graphics/pokemon/{footprints/gastly_footprint.png => gastly/footprint.png} (100%) rename graphics/pokemon/{front_pics/gastly_still_front_pic.png => gastly/front.png} (100%) rename graphics/pokemon/{icons/gastly_icon.png => gastly/icon.png} (100%) rename graphics/pokemon/{palettes/gastly_palette.pal => gastly/normal.pal} (100%) rename graphics/pokemon/{palettes/gastly_shiny_palette.pal => gastly/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/gengar_front_pic.png => gengar/anim_front.png} (100%) rename graphics/pokemon/{back_pics/gengar_back_pic.png => gengar/back.png} (100%) rename graphics/pokemon/{footprints/gengar_footprint.png => gengar/footprint.png} (100%) rename graphics/pokemon/{front_pics/gengar_still_front_pic.png => gengar/front.png} (100%) rename graphics/pokemon/{icons/gengar_icon.png => gengar/icon.png} (100%) rename graphics/pokemon/{palettes/gengar_palette.pal => gengar/normal.pal} (100%) rename graphics/pokemon/{palettes/gengar_shiny_palette.pal => gengar/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/geodude_front_pic.png => geodude/anim_front.png} (100%) rename graphics/pokemon/{back_pics/geodude_back_pic.png => geodude/back.png} (100%) rename graphics/pokemon/{footprints/geodude_footprint.png => geodude/footprint.png} (100%) rename graphics/pokemon/{front_pics/geodude_still_front_pic.png => geodude/front.png} (100%) rename graphics/pokemon/{icons/geodude_icon.png => geodude/icon.png} (100%) rename graphics/pokemon/{palettes/geodude_palette.pal => geodude/normal.pal} (100%) rename graphics/pokemon/{palettes/geodude_shiny_palette.pal => geodude/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/girafarig_front_pic.png => girafarig/anim_front.png} (100%) rename graphics/pokemon/{back_pics/girafarig_back_pic.png => girafarig/back.png} (100%) rename graphics/pokemon/{footprints/girafarig_footprint.png => girafarig/footprint.png} (100%) rename graphics/pokemon/{front_pics/girafarig_still_front_pic.png => girafarig/front.png} (100%) rename graphics/pokemon/{icons/girafarig_icon.png => girafarig/icon.png} (100%) rename graphics/pokemon/{palettes/girafarig_palette.pal => girafarig/normal.pal} (100%) rename graphics/pokemon/{palettes/girafarig_shiny_palette.pal => girafarig/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/glalie_front_pic.png => glalie/anim_front.png} (100%) rename graphics/pokemon/{back_pics/glalie_back_pic.png => glalie/back.png} (100%) rename graphics/pokemon/{footprints/glalie_footprint.png => glalie/footprint.png} (100%) rename graphics/pokemon/{front_pics/glalie_still_front_pic.png => glalie/front.png} (100%) rename graphics/pokemon/{icons/glalie_icon.png => glalie/icon.png} (100%) rename graphics/pokemon/{palettes/glalie_palette.pal => glalie/normal.pal} (100%) rename graphics/pokemon/{palettes/glalie_shiny_palette.pal => glalie/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/gligar_front_pic.png => gligar/anim_front.png} (100%) rename graphics/pokemon/{back_pics/gligar_back_pic.png => gligar/back.png} (100%) rename graphics/pokemon/{footprints/gligar_footprint.png => gligar/footprint.png} (100%) rename graphics/pokemon/{front_pics/gligar_still_front_pic.png => gligar/front.png} (100%) rename graphics/pokemon/{icons/gligar_icon.png => gligar/icon.png} (100%) rename graphics/pokemon/{palettes/gligar_palette.pal => gligar/normal.pal} (100%) rename graphics/pokemon/{palettes/gligar_shiny_palette.pal => gligar/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/gloom_front_pic.png => gloom/anim_front.png} (100%) rename graphics/pokemon/{back_pics/gloom_back_pic.png => gloom/back.png} (100%) rename graphics/pokemon/{footprints/gloom_footprint.png => gloom/footprint.png} (100%) rename graphics/pokemon/{front_pics/gloom_still_front_pic.png => gloom/front.png} (100%) rename graphics/pokemon/{icons/gloom_icon.png => gloom/icon.png} (100%) rename graphics/pokemon/{palettes/gloom_palette.pal => gloom/normal.pal} (100%) rename graphics/pokemon/{palettes/gloom_shiny_palette.pal => gloom/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/golbat_front_pic.png => golbat/anim_front.png} (100%) rename graphics/pokemon/{back_pics/golbat_back_pic.png => golbat/back.png} (100%) rename graphics/pokemon/{footprints/golbat_footprint.png => golbat/footprint.png} (100%) rename graphics/pokemon/{front_pics/golbat_still_front_pic.png => golbat/front.png} (100%) rename graphics/pokemon/{icons/golbat_icon.png => golbat/icon.png} (100%) rename graphics/pokemon/{palettes/golbat_palette.pal => golbat/normal.pal} (100%) rename graphics/pokemon/{palettes/golbat_shiny_palette.pal => golbat/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/goldeen_front_pic.png => goldeen/anim_front.png} (100%) rename graphics/pokemon/{back_pics/goldeen_back_pic.png => goldeen/back.png} (100%) rename graphics/pokemon/{footprints/goldeen_footprint.png => goldeen/footprint.png} (100%) rename graphics/pokemon/{front_pics/goldeen_still_front_pic.png => goldeen/front.png} (100%) rename graphics/pokemon/{icons/goldeen_icon.png => goldeen/icon.png} (100%) rename graphics/pokemon/{palettes/goldeen_palette.pal => goldeen/normal.pal} (100%) rename graphics/pokemon/{palettes/goldeen_shiny_palette.pal => goldeen/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/golduck_front_pic.png => golduck/anim_front.png} (100%) rename graphics/pokemon/{back_pics/golduck_back_pic.png => golduck/back.png} (100%) rename graphics/pokemon/{footprints/golduck_footprint.png => golduck/footprint.png} (100%) rename graphics/pokemon/{front_pics/golduck_still_front_pic.png => golduck/front.png} (100%) rename graphics/pokemon/{icons/golduck_icon.png => golduck/icon.png} (100%) rename graphics/pokemon/{palettes/golduck_palette.pal => golduck/normal.pal} (100%) rename graphics/pokemon/{palettes/golduck_shiny_palette.pal => golduck/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/golem_front_pic.png => golem/anim_front.png} (100%) rename graphics/pokemon/{back_pics/golem_back_pic.png => golem/back.png} (100%) rename graphics/pokemon/{footprints/golem_footprint.png => golem/footprint.png} (100%) rename graphics/pokemon/{front_pics/golem_still_front_pic.png => golem/front.png} (100%) rename graphics/pokemon/{icons/golem_icon.png => golem/icon.png} (100%) rename graphics/pokemon/{palettes/golem_palette.pal => golem/normal.pal} (100%) rename graphics/pokemon/{palettes/golem_shiny_palette.pal => golem/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/gorebyss_front_pic.png => gorebyss/anim_front.png} (100%) rename graphics/pokemon/{back_pics/gorebyss_back_pic.png => gorebyss/back.png} (100%) rename graphics/pokemon/{footprints/gorebyss_footprint.png => gorebyss/footprint.png} (100%) rename graphics/pokemon/{front_pics/gorebyss_still_front_pic.png => gorebyss/front.png} (100%) rename graphics/pokemon/{icons/gorebyss_icon.png => gorebyss/icon.png} (100%) rename graphics/pokemon/{palettes/gorebyss_palette.pal => gorebyss/normal.pal} (100%) rename graphics/pokemon/{palettes/gorebyss_shiny_palette.pal => gorebyss/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/granbull_front_pic.png => granbull/anim_front.png} (100%) rename graphics/pokemon/{back_pics/granbull_back_pic.png => granbull/back.png} (100%) rename graphics/pokemon/{footprints/granbull_footprint.png => granbull/footprint.png} (100%) rename graphics/pokemon/{front_pics/granbull_still_front_pic.png => granbull/front.png} (100%) rename graphics/pokemon/{icons/granbull_icon.png => granbull/icon.png} (100%) rename graphics/pokemon/{palettes/granbull_palette.pal => granbull/normal.pal} (100%) rename graphics/pokemon/{palettes/granbull_shiny_palette.pal => granbull/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/graveler_front_pic.png => graveler/anim_front.png} (100%) rename graphics/pokemon/{back_pics/graveler_back_pic.png => graveler/back.png} (100%) rename graphics/pokemon/{footprints/graveler_footprint.png => graveler/footprint.png} (100%) rename graphics/pokemon/{front_pics/graveler_still_front_pic.png => graveler/front.png} (100%) rename graphics/pokemon/{icons/graveler_icon.png => graveler/icon.png} (100%) rename graphics/pokemon/{palettes/graveler_palette.pal => graveler/normal.pal} (100%) rename graphics/pokemon/{palettes/graveler_shiny_palette.pal => graveler/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/grimer_front_pic.png => grimer/anim_front.png} (100%) rename graphics/pokemon/{back_pics/grimer_back_pic.png => grimer/back.png} (100%) rename graphics/pokemon/{footprints/grimer_footprint.png => grimer/footprint.png} (100%) rename graphics/pokemon/{front_pics/grimer_still_front_pic.png => grimer/front.png} (100%) rename graphics/pokemon/{icons/grimer_icon.png => grimer/icon.png} (100%) rename graphics/pokemon/{palettes/grimer_palette.pal => grimer/normal.pal} (100%) rename graphics/pokemon/{palettes/grimer_shiny_palette.pal => grimer/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/groudon_front_pic.png => groudon/anim_front.png} (100%) rename graphics/pokemon/{back_pics/groudon_back_pic.png => groudon/back.png} (100%) rename graphics/pokemon/{footprints/groudon_footprint.png => groudon/footprint.png} (100%) rename graphics/pokemon/{front_pics/groudon_still_front_pic.png => groudon/front.png} (100%) rename graphics/pokemon/{icons/groudon_icon.png => groudon/icon.png} (100%) rename graphics/pokemon/{palettes/groudon_palette.pal => groudon/normal.pal} (100%) rename graphics/pokemon/{palettes/groudon_shiny_palette.pal => groudon/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/grovyle_front_pic.png => grovyle/anim_front.png} (100%) rename graphics/pokemon/{back_pics/grovyle_back_pic.png => grovyle/back.png} (100%) rename graphics/pokemon/{footprints/grovyle_footprint.png => grovyle/footprint.png} (100%) rename graphics/pokemon/{front_pics/grovyle_still_front_pic.png => grovyle/front.png} (100%) rename graphics/pokemon/{icons/grovyle_icon.png => grovyle/icon.png} (100%) rename graphics/pokemon/{palettes/grovyle_palette.pal => grovyle/normal.pal} (100%) rename graphics/pokemon/{palettes/grovyle_shiny_palette.pal => grovyle/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/growlithe_front_pic.png => growlithe/anim_front.png} (100%) rename graphics/pokemon/{back_pics/growlithe_back_pic.png => growlithe/back.png} (100%) rename graphics/pokemon/{footprints/growlithe_footprint.png => growlithe/footprint.png} (100%) rename graphics/pokemon/{front_pics/growlithe_still_front_pic.png => growlithe/front.png} (100%) rename graphics/pokemon/{icons/growlithe_icon.png => growlithe/icon.png} (100%) rename graphics/pokemon/{palettes/growlithe_palette.pal => growlithe/normal.pal} (100%) rename graphics/pokemon/{palettes/growlithe_shiny_palette.pal => growlithe/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/grumpig_front_pic.png => grumpig/anim_front.png} (100%) rename graphics/pokemon/{back_pics/grumpig_back_pic.png => grumpig/back.png} (100%) rename graphics/pokemon/{footprints/grumpig_footprint.png => grumpig/footprint.png} (100%) rename graphics/pokemon/{front_pics/grumpig_still_front_pic.png => grumpig/front.png} (100%) rename graphics/pokemon/{icons/grumpig_icon.png => grumpig/icon.png} (100%) rename graphics/pokemon/{palettes/grumpig_palette.pal => grumpig/normal.pal} (100%) rename graphics/pokemon/{palettes/grumpig_shiny_palette.pal => grumpig/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/gulpin_front_pic.png => gulpin/anim_front.png} (100%) rename graphics/pokemon/{back_pics/gulpin_back_pic.png => gulpin/back.png} (100%) rename graphics/pokemon/{footprints/gulpin_footprint.png => gulpin/footprint.png} (100%) rename graphics/pokemon/{front_pics/gulpin_still_front_pic.png => gulpin/front.png} (100%) rename graphics/pokemon/{icons/gulpin_icon.png => gulpin/icon.png} (100%) rename graphics/pokemon/{palettes/gulpin_palette.pal => gulpin/normal.pal} (100%) rename graphics/pokemon/{palettes/gulpin_shiny_palette.pal => gulpin/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/gyarados_front_pic.png => gyarados/anim_front.png} (100%) rename graphics/pokemon/{back_pics/gyarados_back_pic.png => gyarados/back.png} (100%) rename graphics/pokemon/{footprints/gyarados_footprint.png => gyarados/footprint.png} (100%) rename graphics/pokemon/{front_pics/gyarados_still_front_pic.png => gyarados/front.png} (100%) rename graphics/pokemon/{icons/gyarados_icon.png => gyarados/icon.png} (100%) rename graphics/pokemon/{palettes/gyarados_palette.pal => gyarados/normal.pal} (100%) rename graphics/pokemon/{palettes/gyarados_shiny_palette.pal => gyarados/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/hariyama_front_pic.png => hariyama/anim_front.png} (100%) rename graphics/pokemon/{back_pics/hariyama_back_pic.png => hariyama/back.png} (100%) rename graphics/pokemon/{footprints/hariyama_footprint.png => hariyama/footprint.png} (100%) rename graphics/pokemon/{front_pics/hariyama_still_front_pic.png => hariyama/front.png} (100%) rename graphics/pokemon/{icons/hariyama_icon.png => hariyama/icon.png} (100%) rename graphics/pokemon/{palettes/hariyama_palette.pal => hariyama/normal.pal} (100%) rename graphics/pokemon/{palettes/hariyama_shiny_palette.pal => hariyama/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/haunter_front_pic.png => haunter/anim_front.png} (100%) rename graphics/pokemon/{back_pics/haunter_back_pic.png => haunter/back.png} (100%) rename graphics/pokemon/{footprints/haunter_footprint.png => haunter/footprint.png} (100%) rename graphics/pokemon/{front_pics/haunter_still_front_pic.png => haunter/front.png} (100%) rename graphics/pokemon/{icons/haunter_icon.png => haunter/icon.png} (100%) rename graphics/pokemon/{palettes/haunter_palette.pal => haunter/normal.pal} (100%) rename graphics/pokemon/{palettes/haunter_shiny_palette.pal => haunter/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/heracross_front_pic.png => heracross/anim_front.png} (100%) rename graphics/pokemon/{back_pics/heracross_back_pic.png => heracross/back.png} (100%) rename graphics/pokemon/{footprints/heracross_footprint.png => heracross/footprint.png} (100%) rename graphics/pokemon/{front_pics/heracross_still_front_pic.png => heracross/front.png} (100%) rename graphics/pokemon/{icons/heracross_icon.png => heracross/icon.png} (100%) rename graphics/pokemon/{palettes/heracross_palette.pal => heracross/normal.pal} (100%) rename graphics/pokemon/{palettes/heracross_shiny_palette.pal => heracross/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/hitmonchan_front_pic.png => hitmonchan/anim_front.png} (100%) rename graphics/pokemon/{back_pics/hitmonchan_back_pic.png => hitmonchan/back.png} (100%) rename graphics/pokemon/{footprints/hitmonchan_footprint.png => hitmonchan/footprint.png} (100%) rename graphics/pokemon/{front_pics/hitmonchan_still_front_pic.png => hitmonchan/front.png} (100%) rename graphics/pokemon/{icons/hitmonchan_icon.png => hitmonchan/icon.png} (100%) rename graphics/pokemon/{palettes/hitmonchan_palette.pal => hitmonchan/normal.pal} (100%) rename graphics/pokemon/{palettes/hitmonchan_shiny_palette.pal => hitmonchan/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/hitmonlee_front_pic.png => hitmonlee/anim_front.png} (100%) rename graphics/pokemon/{back_pics/hitmonlee_back_pic.png => hitmonlee/back.png} (100%) rename graphics/pokemon/{footprints/hitmonlee_footprint.png => hitmonlee/footprint.png} (100%) rename graphics/pokemon/{front_pics/hitmonlee_still_front_pic.png => hitmonlee/front.png} (100%) rename graphics/pokemon/{icons/hitmonlee_icon.png => hitmonlee/icon.png} (100%) rename graphics/pokemon/{palettes/hitmonlee_palette.pal => hitmonlee/normal.pal} (100%) rename graphics/pokemon/{palettes/hitmonlee_shiny_palette.pal => hitmonlee/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/hitmontop_front_pic.png => hitmontop/anim_front.png} (100%) rename graphics/pokemon/{back_pics/hitmontop_back_pic.png => hitmontop/back.png} (100%) rename graphics/pokemon/{footprints/hitmontop_footprint.png => hitmontop/footprint.png} (100%) rename graphics/pokemon/{front_pics/hitmontop_still_front_pic.png => hitmontop/front.png} (100%) rename graphics/pokemon/{icons/hitmontop_icon.png => hitmontop/icon.png} (100%) rename graphics/pokemon/{palettes/hitmontop_palette.pal => hitmontop/normal.pal} (100%) rename graphics/pokemon/{palettes/hitmontop_shiny_palette.pal => hitmontop/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/ho_oh_front_pic.png => ho_oh/anim_front.png} (100%) rename graphics/pokemon/{back_pics/ho_oh_back_pic.png => ho_oh/back.png} (100%) rename graphics/pokemon/{footprints/ho_oh_footprint.png => ho_oh/footprint.png} (100%) rename graphics/pokemon/{front_pics/ho_oh_still_front_pic.png => ho_oh/front.png} (100%) rename graphics/pokemon/{icons/ho_oh_icon.png => ho_oh/icon.png} (100%) rename graphics/pokemon/{palettes/ho_oh_palette.pal => ho_oh/normal.pal} (100%) rename graphics/pokemon/{palettes/ho_oh_shiny_palette.pal => ho_oh/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/hoothoot_front_pic.png => hoothoot/anim_front.png} (100%) rename graphics/pokemon/{back_pics/hoothoot_back_pic.png => hoothoot/back.png} (100%) rename graphics/pokemon/{footprints/hoothoot_footprint.png => hoothoot/footprint.png} (100%) rename graphics/pokemon/{front_pics/hoothoot_still_front_pic.png => hoothoot/front.png} (100%) rename graphics/pokemon/{icons/hoothoot_icon.png => hoothoot/icon.png} (100%) rename graphics/pokemon/{palettes/hoothoot_palette.pal => hoothoot/normal.pal} (100%) rename graphics/pokemon/{palettes/hoothoot_shiny_palette.pal => hoothoot/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/hoppip_front_pic.png => hoppip/anim_front.png} (100%) rename graphics/pokemon/{back_pics/hoppip_back_pic.png => hoppip/back.png} (100%) rename graphics/pokemon/{footprints/hoppip_footprint.png => hoppip/footprint.png} (100%) rename graphics/pokemon/{front_pics/hoppip_still_front_pic.png => hoppip/front.png} (100%) rename graphics/pokemon/{icons/hoppip_icon.png => hoppip/icon.png} (100%) rename graphics/pokemon/{palettes/hoppip_palette.pal => hoppip/normal.pal} (100%) rename graphics/pokemon/{palettes/hoppip_shiny_palette.pal => hoppip/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/horsea_front_pic.png => horsea/anim_front.png} (100%) rename graphics/pokemon/{back_pics/horsea_back_pic.png => horsea/back.png} (100%) rename graphics/pokemon/{footprints/horsea_footprint.png => horsea/footprint.png} (100%) rename graphics/pokemon/{front_pics/horsea_still_front_pic.png => horsea/front.png} (100%) rename graphics/pokemon/{icons/horsea_icon.png => horsea/icon.png} (100%) rename graphics/pokemon/{palettes/horsea_palette.pal => horsea/normal.pal} (100%) rename graphics/pokemon/{palettes/horsea_shiny_palette.pal => horsea/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/houndoom_front_pic.png => houndoom/anim_front.png} (100%) rename graphics/pokemon/{back_pics/houndoom_back_pic.png => houndoom/back.png} (100%) rename graphics/pokemon/{footprints/houndoom_footprint.png => houndoom/footprint.png} (100%) rename graphics/pokemon/{front_pics/houndoom_still_front_pic.png => houndoom/front.png} (100%) rename graphics/pokemon/{icons/houndoom_icon.png => houndoom/icon.png} (100%) rename graphics/pokemon/{palettes/houndoom_palette.pal => houndoom/normal.pal} (100%) rename graphics/pokemon/{palettes/houndoom_shiny_palette.pal => houndoom/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/houndour_front_pic.png => houndour/anim_front.png} (100%) rename graphics/pokemon/{back_pics/houndour_back_pic.png => houndour/back.png} (100%) rename graphics/pokemon/{footprints/houndour_footprint.png => houndour/footprint.png} (100%) rename graphics/pokemon/{front_pics/houndour_still_front_pic.png => houndour/front.png} (100%) rename graphics/pokemon/{icons/houndour_icon.png => houndour/icon.png} (100%) rename graphics/pokemon/{palettes/houndour_palette.pal => houndour/normal.pal} (100%) rename graphics/pokemon/{palettes/houndour_shiny_palette.pal => houndour/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/huntail_front_pic.png => huntail/anim_front.png} (100%) rename graphics/pokemon/{back_pics/huntail_back_pic.png => huntail/back.png} (100%) rename graphics/pokemon/{footprints/huntail_footprint.png => huntail/footprint.png} (100%) rename graphics/pokemon/{front_pics/huntail_still_front_pic.png => huntail/front.png} (100%) rename graphics/pokemon/{icons/huntail_icon.png => huntail/icon.png} (100%) rename graphics/pokemon/{palettes/huntail_palette.pal => huntail/normal.pal} (100%) rename graphics/pokemon/{palettes/huntail_shiny_palette.pal => huntail/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/hypno_front_pic.png => hypno/anim_front.png} (100%) rename graphics/pokemon/{back_pics/hypno_back_pic.png => hypno/back.png} (100%) rename graphics/pokemon/{footprints/hypno_footprint.png => hypno/footprint.png} (100%) rename graphics/pokemon/{front_pics/hypno_still_front_pic.png => hypno/front.png} (100%) rename graphics/pokemon/{icons/hypno_icon.png => hypno/icon.png} (100%) rename graphics/pokemon/{palettes/hypno_palette.pal => hypno/normal.pal} (100%) rename graphics/pokemon/{palettes/hypno_shiny_palette.pal => hypno/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/igglybuff_front_pic.png => igglybuff/anim_front.png} (100%) rename graphics/pokemon/{back_pics/igglybuff_back_pic.png => igglybuff/back.png} (100%) rename graphics/pokemon/{footprints/igglybuff_footprint.png => igglybuff/footprint.png} (100%) rename graphics/pokemon/{front_pics/igglybuff_still_front_pic.png => igglybuff/front.png} (100%) rename graphics/pokemon/{icons/igglybuff_icon.png => igglybuff/icon.png} (100%) rename graphics/pokemon/{palettes/igglybuff_palette.pal => igglybuff/normal.pal} (100%) rename graphics/pokemon/{palettes/igglybuff_shiny_palette.pal => igglybuff/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/illumise_front_pic.png => illumise/anim_front.png} (100%) rename graphics/pokemon/{back_pics/illumise_back_pic.png => illumise/back.png} (100%) rename graphics/pokemon/{footprints/illumise_footprint.png => illumise/footprint.png} (100%) rename graphics/pokemon/{front_pics/illumise_still_front_pic.png => illumise/front.png} (100%) rename graphics/pokemon/{icons/illumise_icon.png => illumise/icon.png} (100%) rename graphics/pokemon/{palettes/illumise_palette.pal => illumise/normal.pal} (100%) rename graphics/pokemon/{palettes/illumise_shiny_palette.pal => illumise/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/ivysaur_front_pic.png => ivysaur/anim_front.png} (100%) rename graphics/pokemon/{back_pics/ivysaur_back_pic.png => ivysaur/back.png} (100%) rename graphics/pokemon/{footprints/ivysaur_footprint.png => ivysaur/footprint.png} (100%) rename graphics/pokemon/{front_pics/ivysaur_still_front_pic.png => ivysaur/front.png} (100%) rename graphics/pokemon/{icons/ivysaur_icon.png => ivysaur/icon.png} (100%) rename graphics/pokemon/{palettes/ivysaur_palette.pal => ivysaur/normal.pal} (100%) rename graphics/pokemon/{palettes/ivysaur_shiny_palette.pal => ivysaur/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/jigglypuff_front_pic.png => jigglypuff/anim_front.png} (100%) rename graphics/pokemon/{back_pics/jigglypuff_back_pic.png => jigglypuff/back.png} (100%) rename graphics/pokemon/{footprints/jigglypuff_footprint.png => jigglypuff/footprint.png} (100%) rename graphics/pokemon/{front_pics/jigglypuff_still_front_pic.png => jigglypuff/front.png} (100%) rename graphics/pokemon/{icons/jigglypuff_icon.png => jigglypuff/icon.png} (100%) rename graphics/pokemon/{palettes/jigglypuff_palette.pal => jigglypuff/normal.pal} (100%) rename graphics/pokemon/{palettes/jigglypuff_shiny_palette.pal => jigglypuff/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/jirachi_front_pic.png => jirachi/anim_front.png} (100%) rename graphics/pokemon/{back_pics/jirachi_back_pic.png => jirachi/back.png} (100%) rename graphics/pokemon/{footprints/jirachi_footprint.png => jirachi/footprint.png} (100%) rename graphics/pokemon/{front_pics/jirachi_still_front_pic.png => jirachi/front.png} (100%) rename graphics/pokemon/{icons/jirachi_icon.png => jirachi/icon.png} (100%) rename graphics/pokemon/{palettes/jirachi_palette.pal => jirachi/normal.pal} (100%) rename graphics/pokemon/{palettes/jirachi_shiny_palette.pal => jirachi/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/jolteon_front_pic.png => jolteon/anim_front.png} (100%) rename graphics/pokemon/{back_pics/jolteon_back_pic.png => jolteon/back.png} (100%) rename graphics/pokemon/{footprints/jolteon_footprint.png => jolteon/footprint.png} (100%) rename graphics/pokemon/{front_pics/jolteon_still_front_pic.png => jolteon/front.png} (100%) rename graphics/pokemon/{icons/jolteon_icon.png => jolteon/icon.png} (100%) rename graphics/pokemon/{palettes/jolteon_palette.pal => jolteon/normal.pal} (100%) rename graphics/pokemon/{palettes/jolteon_shiny_palette.pal => jolteon/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/jumpluff_front_pic.png => jumpluff/anim_front.png} (100%) rename graphics/pokemon/{back_pics/jumpluff_back_pic.png => jumpluff/back.png} (100%) rename graphics/pokemon/{footprints/jumpluff_footprint.png => jumpluff/footprint.png} (100%) rename graphics/pokemon/{front_pics/jumpluff_still_front_pic.png => jumpluff/front.png} (100%) rename graphics/pokemon/{icons/jumpluff_icon.png => jumpluff/icon.png} (100%) rename graphics/pokemon/{palettes/jumpluff_palette.pal => jumpluff/normal.pal} (100%) rename graphics/pokemon/{palettes/jumpluff_shiny_palette.pal => jumpluff/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/jynx_front_pic.png => jynx/anim_front.png} (100%) rename graphics/pokemon/{back_pics/jynx_back_pic.png => jynx/back.png} (100%) rename graphics/pokemon/{footprints/jynx_footprint.png => jynx/footprint.png} (100%) rename graphics/pokemon/{front_pics/jynx_still_front_pic.png => jynx/front.png} (100%) rename graphics/pokemon/{icons/jynx_icon.png => jynx/icon.png} (100%) rename graphics/pokemon/{palettes/jynx_palette.pal => jynx/normal.pal} (100%) rename graphics/pokemon/{palettes/jynx_shiny_palette.pal => jynx/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/kabuto_front_pic.png => kabuto/anim_front.png} (100%) rename graphics/pokemon/{back_pics/kabuto_back_pic.png => kabuto/back.png} (100%) rename graphics/pokemon/{footprints/kabuto_footprint.png => kabuto/footprint.png} (100%) rename graphics/pokemon/{front_pics/kabuto_still_front_pic.png => kabuto/front.png} (100%) rename graphics/pokemon/{icons/kabuto_icon.png => kabuto/icon.png} (100%) rename graphics/pokemon/{palettes/kabuto_palette.pal => kabuto/normal.pal} (100%) rename graphics/pokemon/{palettes/kabuto_shiny_palette.pal => kabuto/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/kabutops_front_pic.png => kabutops/anim_front.png} (100%) rename graphics/pokemon/{back_pics/kabutops_back_pic.png => kabutops/back.png} (100%) rename graphics/pokemon/{footprints/kabutops_footprint.png => kabutops/footprint.png} (100%) rename graphics/pokemon/{front_pics/kabutops_still_front_pic.png => kabutops/front.png} (100%) rename graphics/pokemon/{icons/kabutops_icon.png => kabutops/icon.png} (100%) rename graphics/pokemon/{palettes/kabutops_palette.pal => kabutops/normal.pal} (100%) rename graphics/pokemon/{palettes/kabutops_shiny_palette.pal => kabutops/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/kadabra_front_pic.png => kadabra/anim_front.png} (100%) rename graphics/pokemon/{back_pics/kadabra_back_pic.png => kadabra/back.png} (100%) rename graphics/pokemon/{footprints/kadabra_footprint.png => kadabra/footprint.png} (100%) rename graphics/pokemon/{front_pics/kadabra_still_front_pic.png => kadabra/front.png} (100%) rename graphics/pokemon/{icons/kadabra_icon.png => kadabra/icon.png} (100%) rename graphics/pokemon/{palettes/kadabra_palette.pal => kadabra/normal.pal} (100%) rename graphics/pokemon/{palettes/kadabra_shiny_palette.pal => kadabra/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/kakuna_front_pic.png => kakuna/anim_front.png} (100%) rename graphics/pokemon/{back_pics/kakuna_back_pic.png => kakuna/back.png} (100%) rename graphics/pokemon/{footprints/kakuna_footprint.png => kakuna/footprint.png} (100%) rename graphics/pokemon/{front_pics/kakuna_still_front_pic.png => kakuna/front.png} (100%) rename graphics/pokemon/{icons/kakuna_icon.png => kakuna/icon.png} (100%) rename graphics/pokemon/{palettes/kakuna_palette.pal => kakuna/normal.pal} (100%) rename graphics/pokemon/{palettes/kakuna_shiny_palette.pal => kakuna/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/kangaskhan_front_pic.png => kangaskhan/anim_front.png} (100%) rename graphics/pokemon/{back_pics/kangaskhan_back_pic.png => kangaskhan/back.png} (100%) rename graphics/pokemon/{footprints/kangaskhan_footprint.png => kangaskhan/footprint.png} (100%) rename graphics/pokemon/{front_pics/kangaskhan_still_front_pic.png => kangaskhan/front.png} (100%) rename graphics/pokemon/{icons/kangaskhan_icon.png => kangaskhan/icon.png} (100%) rename graphics/pokemon/{palettes/kangaskhan_palette.pal => kangaskhan/normal.pal} (100%) rename graphics/pokemon/{palettes/kangaskhan_shiny_palette.pal => kangaskhan/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/kecleon_front_pic.png => kecleon/anim_front.png} (100%) rename graphics/pokemon/{back_pics/kecleon_back_pic.png => kecleon/back.png} (100%) rename graphics/pokemon/{footprints/kecleon_footprint.png => kecleon/footprint.png} (100%) rename graphics/pokemon/{front_pics/kecleon_still_front_pic.png => kecleon/front.png} (100%) rename graphics/pokemon/{icons/kecleon_icon.png => kecleon/icon.png} (100%) rename graphics/pokemon/{palettes/kecleon_palette.pal => kecleon/normal.pal} (100%) rename graphics/pokemon/{palettes/kecleon_shiny_palette.pal => kecleon/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/kingdra_front_pic.png => kingdra/anim_front.png} (100%) rename graphics/pokemon/{back_pics/kingdra_back_pic.png => kingdra/back.png} (100%) rename graphics/pokemon/{footprints/kingdra_footprint.png => kingdra/footprint.png} (100%) rename graphics/pokemon/{front_pics/kingdra_still_front_pic.png => kingdra/front.png} (100%) rename graphics/pokemon/{icons/kingdra_icon.png => kingdra/icon.png} (100%) rename graphics/pokemon/{palettes/kingdra_palette.pal => kingdra/normal.pal} (100%) rename graphics/pokemon/{palettes/kingdra_shiny_palette.pal => kingdra/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/kingler_front_pic.png => kingler/anim_front.png} (100%) rename graphics/pokemon/{back_pics/kingler_back_pic.png => kingler/back.png} (100%) rename graphics/pokemon/{footprints/kingler_footprint.png => kingler/footprint.png} (100%) rename graphics/pokemon/{front_pics/kingler_still_front_pic.png => kingler/front.png} (100%) rename graphics/pokemon/{icons/kingler_icon.png => kingler/icon.png} (100%) rename graphics/pokemon/{palettes/kingler_palette.pal => kingler/normal.pal} (100%) rename graphics/pokemon/{palettes/kingler_shiny_palette.pal => kingler/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/kirlia_front_pic.png => kirlia/anim_front.png} (100%) rename graphics/pokemon/{back_pics/kirlia_back_pic.png => kirlia/back.png} (100%) rename graphics/pokemon/{footprints/kirlia_footprint.png => kirlia/footprint.png} (100%) rename graphics/pokemon/{front_pics/kirlia_still_front_pic.png => kirlia/front.png} (100%) rename graphics/pokemon/{icons/kirlia_icon.png => kirlia/icon.png} (100%) rename graphics/pokemon/{palettes/kirlia_palette.pal => kirlia/normal.pal} (100%) rename graphics/pokemon/{palettes/kirlia_shiny_palette.pal => kirlia/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/koffing_front_pic.png => koffing/anim_front.png} (100%) rename graphics/pokemon/{back_pics/koffing_back_pic.png => koffing/back.png} (100%) rename graphics/pokemon/{footprints/koffing_footprint.png => koffing/footprint.png} (100%) rename graphics/pokemon/{front_pics/koffing_still_front_pic.png => koffing/front.png} (100%) rename graphics/pokemon/{icons/koffing_icon.png => koffing/icon.png} (100%) rename graphics/pokemon/{palettes/koffing_palette.pal => koffing/normal.pal} (100%) rename graphics/pokemon/{palettes/koffing_shiny_palette.pal => koffing/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/krabby_front_pic.png => krabby/anim_front.png} (100%) rename graphics/pokemon/{back_pics/krabby_back_pic.png => krabby/back.png} (100%) rename graphics/pokemon/{footprints/krabby_footprint.png => krabby/footprint.png} (100%) rename graphics/pokemon/{front_pics/krabby_still_front_pic.png => krabby/front.png} (100%) rename graphics/pokemon/{icons/krabby_icon.png => krabby/icon.png} (100%) rename graphics/pokemon/{palettes/krabby_palette.pal => krabby/normal.pal} (100%) rename graphics/pokemon/{palettes/krabby_shiny_palette.pal => krabby/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/kyogre_front_pic.png => kyogre/anim_front.png} (100%) rename graphics/pokemon/{back_pics/kyogre_back_pic.png => kyogre/back.png} (100%) rename graphics/pokemon/{footprints/kyogre_footprint.png => kyogre/footprint.png} (100%) rename graphics/pokemon/{front_pics/kyogre_still_front_pic.png => kyogre/front.png} (100%) rename graphics/pokemon/{icons/kyogre_icon.png => kyogre/icon.png} (100%) rename graphics/pokemon/{palettes/kyogre_palette.pal => kyogre/normal.pal} (100%) rename graphics/pokemon/{palettes/kyogre_shiny_palette.pal => kyogre/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/lairon_front_pic.png => lairon/anim_front.png} (100%) rename graphics/pokemon/{back_pics/lairon_back_pic.png => lairon/back.png} (100%) rename graphics/pokemon/{footprints/lairon_footprint.png => lairon/footprint.png} (100%) rename graphics/pokemon/{front_pics/lairon_still_front_pic.png => lairon/front.png} (100%) rename graphics/pokemon/{icons/lairon_icon.png => lairon/icon.png} (100%) rename graphics/pokemon/{palettes/lairon_palette.pal => lairon/normal.pal} (100%) rename graphics/pokemon/{palettes/lairon_shiny_palette.pal => lairon/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/lanturn_front_pic.png => lanturn/anim_front.png} (100%) rename graphics/pokemon/{back_pics/lanturn_back_pic.png => lanturn/back.png} (100%) rename graphics/pokemon/{footprints/lanturn_footprint.png => lanturn/footprint.png} (100%) rename graphics/pokemon/{front_pics/lanturn_still_front_pic.png => lanturn/front.png} (100%) rename graphics/pokemon/{icons/lanturn_icon.png => lanturn/icon.png} (100%) rename graphics/pokemon/{palettes/lanturn_palette.pal => lanturn/normal.pal} (100%) rename graphics/pokemon/{palettes/lanturn_shiny_palette.pal => lanturn/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/lapras_front_pic.png => lapras/anim_front.png} (100%) rename graphics/pokemon/{back_pics/lapras_back_pic.png => lapras/back.png} (100%) rename graphics/pokemon/{footprints/lapras_footprint.png => lapras/footprint.png} (100%) rename graphics/pokemon/{front_pics/lapras_still_front_pic.png => lapras/front.png} (100%) rename graphics/pokemon/{icons/lapras_icon.png => lapras/icon.png} (100%) rename graphics/pokemon/{palettes/lapras_palette.pal => lapras/normal.pal} (100%) rename graphics/pokemon/{palettes/lapras_shiny_palette.pal => lapras/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/larvitar_front_pic.png => larvitar/anim_front.png} (100%) rename graphics/pokemon/{back_pics/larvitar_back_pic.png => larvitar/back.png} (100%) rename graphics/pokemon/{footprints/larvitar_footprint.png => larvitar/footprint.png} (100%) rename graphics/pokemon/{front_pics/larvitar_still_front_pic.png => larvitar/front.png} (100%) rename graphics/pokemon/{icons/larvitar_icon.png => larvitar/icon.png} (100%) rename graphics/pokemon/{palettes/larvitar_palette.pal => larvitar/normal.pal} (100%) rename graphics/pokemon/{palettes/larvitar_shiny_palette.pal => larvitar/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/latias_front_pic.png => latias/anim_front.png} (100%) rename graphics/pokemon/{back_pics/latias_back_pic.png => latias/back.png} (100%) rename graphics/pokemon/{footprints/latias_footprint.png => latias/footprint.png} (100%) rename graphics/pokemon/{front_pics/latias_still_front_pic.png => latias/front.png} (100%) rename graphics/pokemon/{icons/latias_icon.png => latias/icon.png} (100%) rename graphics/pokemon/{palettes/latias_palette.pal => latias/normal.pal} (100%) rename graphics/pokemon/{palettes/latias_shiny_palette.pal => latias/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/latios_front_pic.png => latios/anim_front.png} (100%) rename graphics/pokemon/{back_pics/latios_back_pic.png => latios/back.png} (100%) rename graphics/pokemon/{footprints/latios_footprint.png => latios/footprint.png} (100%) rename graphics/pokemon/{front_pics/latios_still_front_pic.png => latios/front.png} (100%) rename graphics/pokemon/{icons/latios_icon.png => latios/icon.png} (100%) rename graphics/pokemon/{palettes/latios_palette.pal => latios/normal.pal} (100%) rename graphics/pokemon/{palettes/latios_shiny_palette.pal => latios/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/ledian_front_pic.png => ledian/anim_front.png} (100%) rename graphics/pokemon/{back_pics/ledian_back_pic.png => ledian/back.png} (100%) rename graphics/pokemon/{footprints/ledian_footprint.png => ledian/footprint.png} (100%) rename graphics/pokemon/{front_pics/ledian_still_front_pic.png => ledian/front.png} (100%) rename graphics/pokemon/{icons/ledian_icon.png => ledian/icon.png} (100%) rename graphics/pokemon/{palettes/ledian_palette.pal => ledian/normal.pal} (100%) rename graphics/pokemon/{palettes/ledian_shiny_palette.pal => ledian/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/ledyba_front_pic.png => ledyba/anim_front.png} (100%) rename graphics/pokemon/{back_pics/ledyba_back_pic.png => ledyba/back.png} (100%) rename graphics/pokemon/{footprints/ledyba_footprint.png => ledyba/footprint.png} (100%) rename graphics/pokemon/{front_pics/ledyba_still_front_pic.png => ledyba/front.png} (100%) rename graphics/pokemon/{icons/ledyba_icon.png => ledyba/icon.png} (100%) rename graphics/pokemon/{palettes/ledyba_palette.pal => ledyba/normal.pal} (100%) rename graphics/pokemon/{palettes/ledyba_shiny_palette.pal => ledyba/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/lickitung_front_pic.png => lickitung/anim_front.png} (100%) rename graphics/pokemon/{back_pics/lickitung_back_pic.png => lickitung/back.png} (100%) rename graphics/pokemon/{footprints/lickitung_footprint.png => lickitung/footprint.png} (100%) rename graphics/pokemon/{front_pics/lickitung_still_front_pic.png => lickitung/front.png} (100%) rename graphics/pokemon/{icons/lickitung_icon.png => lickitung/icon.png} (100%) rename graphics/pokemon/{palettes/lickitung_palette.pal => lickitung/normal.pal} (100%) rename graphics/pokemon/{palettes/lickitung_shiny_palette.pal => lickitung/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/lileep_front_pic.png => lileep/anim_front.png} (100%) rename graphics/pokemon/{back_pics/lileep_back_pic.png => lileep/back.png} (100%) rename graphics/pokemon/{footprints/lileep_footprint.png => lileep/footprint.png} (100%) rename graphics/pokemon/{front_pics/lileep_still_front_pic.png => lileep/front.png} (100%) rename graphics/pokemon/{icons/lileep_icon.png => lileep/icon.png} (100%) rename graphics/pokemon/{palettes/lileep_palette.pal => lileep/normal.pal} (100%) rename graphics/pokemon/{palettes/lileep_shiny_palette.pal => lileep/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/linoone_front_pic.png => linoone/anim_front.png} (100%) rename graphics/pokemon/{back_pics/linoone_back_pic.png => linoone/back.png} (100%) rename graphics/pokemon/{footprints/linoone_footprint.png => linoone/footprint.png} (100%) rename graphics/pokemon/{front_pics/linoone_still_front_pic.png => linoone/front.png} (100%) rename graphics/pokemon/{icons/linoone_icon.png => linoone/icon.png} (100%) rename graphics/pokemon/{palettes/linoone_palette.pal => linoone/normal.pal} (100%) rename graphics/pokemon/{palettes/linoone_shiny_palette.pal => linoone/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/lombre_front_pic.png => lombre/anim_front.png} (100%) rename graphics/pokemon/{back_pics/lombre_back_pic.png => lombre/back.png} (100%) rename graphics/pokemon/{footprints/lombre_footprint.png => lombre/footprint.png} (100%) rename graphics/pokemon/{front_pics/lombre_still_front_pic.png => lombre/front.png} (100%) rename graphics/pokemon/{icons/lombre_icon.png => lombre/icon.png} (100%) rename graphics/pokemon/{palettes/lombre_palette.pal => lombre/normal.pal} (100%) rename graphics/pokemon/{palettes/lombre_shiny_palette.pal => lombre/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/lotad_front_pic.png => lotad/anim_front.png} (100%) rename graphics/pokemon/{back_pics/lotad_back_pic.png => lotad/back.png} (100%) rename graphics/pokemon/{footprints/lotad_footprint.png => lotad/footprint.png} (100%) rename graphics/pokemon/{front_pics/lotad_still_front_pic.png => lotad/front.png} (100%) rename graphics/pokemon/{icons/lotad_icon.png => lotad/icon.png} (100%) rename graphics/pokemon/{palettes/lotad_palette.pal => lotad/normal.pal} (100%) rename graphics/pokemon/{palettes/lotad_shiny_palette.pal => lotad/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/loudred_front_pic.png => loudred/anim_front.png} (100%) rename graphics/pokemon/{back_pics/loudred_back_pic.png => loudred/back.png} (100%) rename graphics/pokemon/{footprints/loudred_footprint.png => loudred/footprint.png} (100%) rename graphics/pokemon/{front_pics/loudred_still_front_pic.png => loudred/front.png} (100%) rename graphics/pokemon/{icons/loudred_icon.png => loudred/icon.png} (100%) rename graphics/pokemon/{palettes/loudred_palette.pal => loudred/normal.pal} (100%) rename graphics/pokemon/{palettes/loudred_shiny_palette.pal => loudred/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/ludicolo_front_pic.png => ludicolo/anim_front.png} (100%) rename graphics/pokemon/{back_pics/ludicolo_back_pic.png => ludicolo/back.png} (100%) rename graphics/pokemon/{footprints/ludicolo_footprint.png => ludicolo/footprint.png} (100%) rename graphics/pokemon/{front_pics/ludicolo_still_front_pic.png => ludicolo/front.png} (100%) rename graphics/pokemon/{icons/ludicolo_icon.png => ludicolo/icon.png} (100%) rename graphics/pokemon/{palettes/ludicolo_palette.pal => ludicolo/normal.pal} (100%) rename graphics/pokemon/{palettes/ludicolo_shiny_palette.pal => ludicolo/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/lugia_front_pic.png => lugia/anim_front.png} (100%) rename graphics/pokemon/{back_pics/lugia_back_pic.png => lugia/back.png} (100%) rename graphics/pokemon/{footprints/lugia_footprint.png => lugia/footprint.png} (100%) rename graphics/pokemon/{front_pics/lugia_still_front_pic.png => lugia/front.png} (100%) rename graphics/pokemon/{icons/lugia_icon.png => lugia/icon.png} (100%) rename graphics/pokemon/{palettes/lugia_palette.pal => lugia/normal.pal} (100%) rename graphics/pokemon/{palettes/lugia_shiny_palette.pal => lugia/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/lunatone_front_pic.png => lunatone/anim_front.png} (100%) rename graphics/pokemon/{back_pics/lunatone_back_pic.png => lunatone/back.png} (100%) rename graphics/pokemon/{footprints/lunatone_footprint.png => lunatone/footprint.png} (100%) rename graphics/pokemon/{front_pics/lunatone_still_front_pic.png => lunatone/front.png} (100%) rename graphics/pokemon/{icons/lunatone_icon.png => lunatone/icon.png} (100%) rename graphics/pokemon/{palettes/lunatone_palette.pal => lunatone/normal.pal} (100%) rename graphics/pokemon/{palettes/lunatone_shiny_palette.pal => lunatone/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/luvdisc_front_pic.png => luvdisc/anim_front.png} (100%) rename graphics/pokemon/{back_pics/luvdisc_back_pic.png => luvdisc/back.png} (100%) rename graphics/pokemon/{footprints/luvdisc_footprint.png => luvdisc/footprint.png} (100%) rename graphics/pokemon/{front_pics/luvdisc_still_front_pic.png => luvdisc/front.png} (100%) rename graphics/pokemon/{icons/luvdisc_icon.png => luvdisc/icon.png} (100%) rename graphics/pokemon/{palettes/luvdisc_palette.pal => luvdisc/normal.pal} (100%) rename graphics/pokemon/{palettes/luvdisc_shiny_palette.pal => luvdisc/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/machamp_front_pic.png => machamp/anim_front.png} (100%) rename graphics/pokemon/{back_pics/machamp_back_pic.png => machamp/back.png} (100%) rename graphics/pokemon/{footprints/machamp_footprint.png => machamp/footprint.png} (100%) rename graphics/pokemon/{front_pics/machamp_still_front_pic.png => machamp/front.png} (100%) rename graphics/pokemon/{icons/machamp_icon.png => machamp/icon.png} (100%) rename graphics/pokemon/{palettes/machamp_palette.pal => machamp/normal.pal} (100%) rename graphics/pokemon/{palettes/machamp_shiny_palette.pal => machamp/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/machoke_front_pic.png => machoke/anim_front.png} (100%) rename graphics/pokemon/{back_pics/machoke_back_pic.png => machoke/back.png} (100%) rename graphics/pokemon/{footprints/machoke_footprint.png => machoke/footprint.png} (100%) rename graphics/pokemon/{front_pics/machoke_still_front_pic.png => machoke/front.png} (100%) rename graphics/pokemon/{icons/machoke_icon.png => machoke/icon.png} (100%) rename graphics/pokemon/{palettes/machoke_palette.pal => machoke/normal.pal} (100%) rename graphics/pokemon/{palettes/machoke_shiny_palette.pal => machoke/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/machop_front_pic.png => machop/anim_front.png} (100%) rename graphics/pokemon/{back_pics/machop_back_pic.png => machop/back.png} (100%) rename graphics/pokemon/{footprints/machop_footprint.png => machop/footprint.png} (100%) rename graphics/pokemon/{front_pics/machop_still_front_pic.png => machop/front.png} (100%) rename graphics/pokemon/{icons/machop_icon.png => machop/icon.png} (100%) rename graphics/pokemon/{palettes/machop_palette.pal => machop/normal.pal} (100%) rename graphics/pokemon/{palettes/machop_shiny_palette.pal => machop/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/magby_front_pic.png => magby/anim_front.png} (100%) rename graphics/pokemon/{back_pics/magby_back_pic.png => magby/back.png} (100%) rename graphics/pokemon/{footprints/magby_footprint.png => magby/footprint.png} (100%) rename graphics/pokemon/{front_pics/magby_still_front_pic.png => magby/front.png} (100%) rename graphics/pokemon/{icons/magby_icon.png => magby/icon.png} (100%) rename graphics/pokemon/{palettes/magby_palette.pal => magby/normal.pal} (100%) rename graphics/pokemon/{palettes/magby_shiny_palette.pal => magby/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/magcargo_front_pic.png => magcargo/anim_front.png} (100%) rename graphics/pokemon/{back_pics/magcargo_back_pic.png => magcargo/back.png} (100%) rename graphics/pokemon/{footprints/magcargo_footprint.png => magcargo/footprint.png} (100%) rename graphics/pokemon/{front_pics/magcargo_still_front_pic.png => magcargo/front.png} (100%) rename graphics/pokemon/{icons/magcargo_icon.png => magcargo/icon.png} (100%) rename graphics/pokemon/{palettes/magcargo_palette.pal => magcargo/normal.pal} (100%) rename graphics/pokemon/{palettes/magcargo_shiny_palette.pal => magcargo/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/magikarp_front_pic.png => magikarp/anim_front.png} (100%) rename graphics/pokemon/{back_pics/magikarp_back_pic.png => magikarp/back.png} (100%) rename graphics/pokemon/{footprints/magikarp_footprint.png => magikarp/footprint.png} (100%) rename graphics/pokemon/{front_pics/magikarp_still_front_pic.png => magikarp/front.png} (100%) rename graphics/pokemon/{icons/magikarp_icon.png => magikarp/icon.png} (100%) rename graphics/pokemon/{palettes/magikarp_palette.pal => magikarp/normal.pal} (100%) rename graphics/pokemon/{palettes/magikarp_shiny_palette.pal => magikarp/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/magmar_front_pic.png => magmar/anim_front.png} (100%) rename graphics/pokemon/{back_pics/magmar_back_pic.png => magmar/back.png} (100%) rename graphics/pokemon/{footprints/magmar_footprint.png => magmar/footprint.png} (100%) rename graphics/pokemon/{front_pics/magmar_still_front_pic.png => magmar/front.png} (100%) rename graphics/pokemon/{icons/magmar_icon.png => magmar/icon.png} (100%) rename graphics/pokemon/{palettes/magmar_palette.pal => magmar/normal.pal} (100%) rename graphics/pokemon/{palettes/magmar_shiny_palette.pal => magmar/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/magnemite_front_pic.png => magnemite/anim_front.png} (100%) rename graphics/pokemon/{back_pics/magnemite_back_pic.png => magnemite/back.png} (100%) rename graphics/pokemon/{footprints/magnemite_footprint.png => magnemite/footprint.png} (100%) rename graphics/pokemon/{front_pics/magnemite_still_front_pic.png => magnemite/front.png} (100%) rename graphics/pokemon/{icons/magnemite_icon.png => magnemite/icon.png} (100%) rename graphics/pokemon/{palettes/magnemite_palette.pal => magnemite/normal.pal} (100%) rename graphics/pokemon/{palettes/magnemite_shiny_palette.pal => magnemite/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/magneton_front_pic.png => magneton/anim_front.png} (100%) rename graphics/pokemon/{back_pics/magneton_back_pic.png => magneton/back.png} (100%) rename graphics/pokemon/{footprints/magneton_footprint.png => magneton/footprint.png} (100%) rename graphics/pokemon/{front_pics/magneton_still_front_pic.png => magneton/front.png} (100%) rename graphics/pokemon/{icons/magneton_icon.png => magneton/icon.png} (100%) rename graphics/pokemon/{palettes/magneton_palette.pal => magneton/normal.pal} (100%) rename graphics/pokemon/{palettes/magneton_shiny_palette.pal => magneton/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/makuhita_front_pic.png => makuhita/anim_front.png} (100%) rename graphics/pokemon/{back_pics/makuhita_back_pic.png => makuhita/back.png} (100%) rename graphics/pokemon/{footprints/makuhita_footprint.png => makuhita/footprint.png} (100%) rename graphics/pokemon/{front_pics/makuhita_still_front_pic.png => makuhita/front.png} (100%) rename graphics/pokemon/{icons/makuhita_icon.png => makuhita/icon.png} (100%) rename graphics/pokemon/{palettes/makuhita_palette.pal => makuhita/normal.pal} (100%) rename graphics/pokemon/{palettes/makuhita_shiny_palette.pal => makuhita/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/manectric_front_pic.png => manectric/anim_front.png} (100%) rename graphics/pokemon/{back_pics/manectric_back_pic.png => manectric/back.png} (100%) rename graphics/pokemon/{footprints/manectric_footprint.png => manectric/footprint.png} (100%) rename graphics/pokemon/{front_pics/manectric_still_front_pic.png => manectric/front.png} (100%) rename graphics/pokemon/{icons/manectric_icon.png => manectric/icon.png} (100%) rename graphics/pokemon/{palettes/manectric_palette.pal => manectric/normal.pal} (100%) rename graphics/pokemon/{palettes/manectric_shiny_palette.pal => manectric/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/mankey_front_pic.png => mankey/anim_front.png} (100%) rename graphics/pokemon/{back_pics/mankey_back_pic.png => mankey/back.png} (100%) rename graphics/pokemon/{footprints/mankey_footprint.png => mankey/footprint.png} (100%) rename graphics/pokemon/{front_pics/mankey_still_front_pic.png => mankey/front.png} (100%) rename graphics/pokemon/{icons/mankey_icon.png => mankey/icon.png} (100%) rename graphics/pokemon/{palettes/mankey_palette.pal => mankey/normal.pal} (100%) rename graphics/pokemon/{palettes/mankey_shiny_palette.pal => mankey/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/mantine_front_pic.png => mantine/anim_front.png} (100%) rename graphics/pokemon/{back_pics/mantine_back_pic.png => mantine/back.png} (100%) rename graphics/pokemon/{footprints/mantine_footprint.png => mantine/footprint.png} (100%) rename graphics/pokemon/{front_pics/mantine_still_front_pic.png => mantine/front.png} (100%) rename graphics/pokemon/{icons/mantine_icon.png => mantine/icon.png} (100%) rename graphics/pokemon/{palettes/mantine_palette.pal => mantine/normal.pal} (100%) rename graphics/pokemon/{palettes/mantine_shiny_palette.pal => mantine/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/mareep_front_pic.png => mareep/anim_front.png} (100%) rename graphics/pokemon/{back_pics/mareep_back_pic.png => mareep/back.png} (100%) rename graphics/pokemon/{footprints/mareep_footprint.png => mareep/footprint.png} (100%) rename graphics/pokemon/{front_pics/mareep_still_front_pic.png => mareep/front.png} (100%) rename graphics/pokemon/{icons/mareep_icon.png => mareep/icon.png} (100%) rename graphics/pokemon/{palettes/mareep_palette.pal => mareep/normal.pal} (100%) rename graphics/pokemon/{palettes/mareep_shiny_palette.pal => mareep/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/marill_front_pic.png => marill/anim_front.png} (100%) rename graphics/pokemon/{back_pics/marill_back_pic.png => marill/back.png} (100%) rename graphics/pokemon/{footprints/marill_footprint.png => marill/footprint.png} (100%) rename graphics/pokemon/{front_pics/marill_still_front_pic.png => marill/front.png} (100%) rename graphics/pokemon/{icons/marill_icon.png => marill/icon.png} (100%) rename graphics/pokemon/{palettes/marill_palette.pal => marill/normal.pal} (100%) rename graphics/pokemon/{palettes/marill_shiny_palette.pal => marill/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/marowak_front_pic.png => marowak/anim_front.png} (100%) rename graphics/pokemon/{back_pics/marowak_back_pic.png => marowak/back.png} (100%) rename graphics/pokemon/{footprints/marowak_footprint.png => marowak/footprint.png} (100%) rename graphics/pokemon/{front_pics/marowak_still_front_pic.png => marowak/front.png} (100%) rename graphics/pokemon/{icons/marowak_icon.png => marowak/icon.png} (100%) rename graphics/pokemon/{palettes/marowak_palette.pal => marowak/normal.pal} (100%) rename graphics/pokemon/{palettes/marowak_shiny_palette.pal => marowak/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/marshtomp_front_pic.png => marshtomp/anim_front.png} (100%) rename graphics/pokemon/{back_pics/marshtomp_back_pic.png => marshtomp/back.png} (100%) rename graphics/pokemon/{footprints/marshtomp_footprint.png => marshtomp/footprint.png} (100%) rename graphics/pokemon/{front_pics/marshtomp_still_front_pic.png => marshtomp/front.png} (100%) rename graphics/pokemon/{icons/marshtomp_icon.png => marshtomp/icon.png} (100%) rename graphics/pokemon/{palettes/marshtomp_palette.pal => marshtomp/normal.pal} (100%) rename graphics/pokemon/{palettes/marshtomp_shiny_palette.pal => marshtomp/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/masquerain_front_pic.png => masquerain/anim_front.png} (100%) rename graphics/pokemon/{back_pics/masquerain_back_pic.png => masquerain/back.png} (100%) rename graphics/pokemon/{footprints/masquerain_footprint.png => masquerain/footprint.png} (100%) rename graphics/pokemon/{front_pics/masquerain_still_front_pic.png => masquerain/front.png} (100%) rename graphics/pokemon/{icons/masquerain_icon.png => masquerain/icon.png} (100%) rename graphics/pokemon/{palettes/masquerain_palette.pal => masquerain/normal.pal} (100%) rename graphics/pokemon/{palettes/masquerain_shiny_palette.pal => masquerain/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/mawile_front_pic.png => mawile/anim_front.png} (100%) rename graphics/pokemon/{back_pics/mawile_back_pic.png => mawile/back.png} (100%) rename graphics/pokemon/{footprints/mawile_footprint.png => mawile/footprint.png} (100%) rename graphics/pokemon/{front_pics/mawile_still_front_pic.png => mawile/front.png} (100%) rename graphics/pokemon/{icons/mawile_icon.png => mawile/icon.png} (100%) rename graphics/pokemon/{palettes/mawile_palette.pal => mawile/normal.pal} (100%) rename graphics/pokemon/{palettes/mawile_shiny_palette.pal => mawile/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/medicham_front_pic.png => medicham/anim_front.png} (100%) rename graphics/pokemon/{back_pics/medicham_back_pic.png => medicham/back.png} (100%) rename graphics/pokemon/{footprints/medicham_footprint.png => medicham/footprint.png} (100%) rename graphics/pokemon/{front_pics/medicham_still_front_pic.png => medicham/front.png} (100%) rename graphics/pokemon/{icons/medicham_icon.png => medicham/icon.png} (100%) rename graphics/pokemon/{palettes/medicham_palette.pal => medicham/normal.pal} (100%) rename graphics/pokemon/{palettes/medicham_shiny_palette.pal => medicham/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/meditite_front_pic.png => meditite/anim_front.png} (100%) rename graphics/pokemon/{back_pics/meditite_back_pic.png => meditite/back.png} (100%) rename graphics/pokemon/{footprints/meditite_footprint.png => meditite/footprint.png} (100%) rename graphics/pokemon/{front_pics/meditite_still_front_pic.png => meditite/front.png} (100%) rename graphics/pokemon/{icons/meditite_icon.png => meditite/icon.png} (100%) rename graphics/pokemon/{palettes/meditite_palette.pal => meditite/normal.pal} (100%) rename graphics/pokemon/{palettes/meditite_shiny_palette.pal => meditite/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/meganium_front_pic.png => meganium/anim_front.png} (100%) rename graphics/pokemon/{back_pics/meganium_back_pic.png => meganium/back.png} (100%) rename graphics/pokemon/{footprints/meganium_footprint.png => meganium/footprint.png} (100%) rename graphics/pokemon/{front_pics/meganium_still_front_pic.png => meganium/front.png} (100%) rename graphics/pokemon/{icons/meganium_icon.png => meganium/icon.png} (100%) rename graphics/pokemon/{palettes/meganium_palette.pal => meganium/normal.pal} (100%) rename graphics/pokemon/{palettes/meganium_shiny_palette.pal => meganium/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/meowth_front_pic.png => meowth/anim_front.png} (100%) rename graphics/pokemon/{back_pics/meowth_back_pic.png => meowth/back.png} (100%) rename graphics/pokemon/{footprints/meowth_footprint.png => meowth/footprint.png} (100%) rename graphics/pokemon/{front_pics/meowth_still_front_pic.png => meowth/front.png} (100%) rename graphics/pokemon/{icons/meowth_icon.png => meowth/icon.png} (100%) rename graphics/pokemon/{palettes/meowth_palette.pal => meowth/normal.pal} (100%) rename graphics/pokemon/{palettes/meowth_shiny_palette.pal => meowth/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/metagross_front_pic.png => metagross/anim_front.png} (100%) rename graphics/pokemon/{back_pics/metagross_back_pic.png => metagross/back.png} (100%) rename graphics/pokemon/{footprints/metagross_footprint.png => metagross/footprint.png} (100%) rename graphics/pokemon/{front_pics/metagross_still_front_pic.png => metagross/front.png} (100%) rename graphics/pokemon/{icons/metagross_icon.png => metagross/icon.png} (100%) rename graphics/pokemon/{palettes/metagross_palette.pal => metagross/normal.pal} (100%) rename graphics/pokemon/{palettes/metagross_shiny_palette.pal => metagross/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/metang_front_pic.png => metang/anim_front.png} (100%) rename graphics/pokemon/{back_pics/metang_back_pic.png => metang/back.png} (100%) rename graphics/pokemon/{footprints/metang_footprint.png => metang/footprint.png} (100%) rename graphics/pokemon/{front_pics/metang_still_front_pic.png => metang/front.png} (100%) rename graphics/pokemon/{icons/metang_icon.png => metang/icon.png} (100%) rename graphics/pokemon/{palettes/metang_palette.pal => metang/normal.pal} (100%) rename graphics/pokemon/{palettes/metang_shiny_palette.pal => metang/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/metapod_front_pic.png => metapod/anim_front.png} (100%) rename graphics/pokemon/{back_pics/metapod_back_pic.png => metapod/back.png} (100%) rename graphics/pokemon/{footprints/metapod_footprint.png => metapod/footprint.png} (100%) rename graphics/pokemon/{front_pics/metapod_still_front_pic.png => metapod/front.png} (100%) rename graphics/pokemon/{icons/metapod_icon.png => metapod/icon.png} (100%) rename graphics/pokemon/{palettes/metapod_palette.pal => metapod/normal.pal} (100%) rename graphics/pokemon/{palettes/metapod_shiny_palette.pal => metapod/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/mew_front_pic.png => mew/anim_front.png} (100%) rename graphics/pokemon/{back_pics/mew_back_pic.png => mew/back.png} (100%) rename graphics/pokemon/{footprints/mew_footprint.png => mew/footprint.png} (100%) rename graphics/pokemon/{front_pics/mew_still_front_pic.png => mew/front.png} (100%) rename graphics/pokemon/{icons/mew_icon.png => mew/icon.png} (100%) rename graphics/pokemon/{palettes/mew_palette.pal => mew/normal.pal} (100%) rename graphics/pokemon/{palettes/mew_shiny_palette.pal => mew/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/mewtwo_front_pic.png => mewtwo/anim_front.png} (100%) rename graphics/pokemon/{back_pics/mewtwo_back_pic.png => mewtwo/back.png} (100%) rename graphics/pokemon/{footprints/mewtwo_footprint.png => mewtwo/footprint.png} (100%) rename graphics/pokemon/{front_pics/mewtwo_still_front_pic.png => mewtwo/front.png} (100%) rename graphics/pokemon/{icons/mewtwo_icon.png => mewtwo/icon.png} (100%) rename graphics/pokemon/{palettes/mewtwo_palette.pal => mewtwo/normal.pal} (100%) rename graphics/pokemon/{palettes/mewtwo_shiny_palette.pal => mewtwo/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/mightyena_front_pic.png => mightyena/anim_front.png} (100%) rename graphics/pokemon/{back_pics/mightyena_back_pic.png => mightyena/back.png} (100%) rename graphics/pokemon/{footprints/mightyena_footprint.png => mightyena/footprint.png} (100%) rename graphics/pokemon/{front_pics/mightyena_still_front_pic.png => mightyena/front.png} (100%) rename graphics/pokemon/{icons/mightyena_icon.png => mightyena/icon.png} (100%) rename graphics/pokemon/{palettes/mightyena_palette.pal => mightyena/normal.pal} (100%) rename graphics/pokemon/{palettes/mightyena_shiny_palette.pal => mightyena/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/milotic_front_pic.png => milotic/anim_front.png} (100%) rename graphics/pokemon/{back_pics/milotic_back_pic.png => milotic/back.png} (100%) rename graphics/pokemon/{footprints/milotic_footprint.png => milotic/footprint.png} (100%) rename graphics/pokemon/{front_pics/milotic_still_front_pic.png => milotic/front.png} (100%) rename graphics/pokemon/{icons/milotic_icon.png => milotic/icon.png} (100%) rename graphics/pokemon/{palettes/milotic_palette.pal => milotic/normal.pal} (100%) rename graphics/pokemon/{palettes/milotic_shiny_palette.pal => milotic/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/miltank_front_pic.png => miltank/anim_front.png} (100%) rename graphics/pokemon/{back_pics/miltank_back_pic.png => miltank/back.png} (100%) rename graphics/pokemon/{footprints/miltank_footprint.png => miltank/footprint.png} (100%) rename graphics/pokemon/{front_pics/miltank_still_front_pic.png => miltank/front.png} (100%) rename graphics/pokemon/{icons/miltank_icon.png => miltank/icon.png} (100%) rename graphics/pokemon/{palettes/miltank_palette.pal => miltank/normal.pal} (100%) rename graphics/pokemon/{palettes/miltank_shiny_palette.pal => miltank/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/minun_front_pic.png => minun/anim_front.png} (100%) rename graphics/pokemon/{back_pics/minun_back_pic.png => minun/back.png} (100%) rename graphics/pokemon/{footprints/minun_footprint.png => minun/footprint.png} (100%) rename graphics/pokemon/{front_pics/minun_still_front_pic.png => minun/front.png} (100%) rename graphics/pokemon/{icons/minun_icon.png => minun/icon.png} (100%) rename graphics/pokemon/{palettes/minun_palette.pal => minun/normal.pal} (100%) rename graphics/pokemon/{palettes/minun_shiny_palette.pal => minun/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/misdreavus_front_pic.png => misdreavus/anim_front.png} (100%) rename graphics/pokemon/{back_pics/misdreavus_back_pic.png => misdreavus/back.png} (100%) rename graphics/pokemon/{footprints/misdreavus_footprint.png => misdreavus/footprint.png} (100%) rename graphics/pokemon/{front_pics/misdreavus_still_front_pic.png => misdreavus/front.png} (100%) rename graphics/pokemon/{icons/misdreavus_icon.png => misdreavus/icon.png} (100%) rename graphics/pokemon/{palettes/misdreavus_palette.pal => misdreavus/normal.pal} (100%) rename graphics/pokemon/{palettes/misdreavus_shiny_palette.pal => misdreavus/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/moltres_front_pic.png => moltres/anim_front.png} (100%) rename graphics/pokemon/{back_pics/moltres_back_pic.png => moltres/back.png} (100%) rename graphics/pokemon/{footprints/moltres_footprint.png => moltres/footprint.png} (100%) rename graphics/pokemon/{front_pics/moltres_still_front_pic.png => moltres/front.png} (100%) rename graphics/pokemon/{icons/moltres_icon.png => moltres/icon.png} (100%) rename graphics/pokemon/{palettes/moltres_palette.pal => moltres/normal.pal} (100%) rename graphics/pokemon/{palettes/moltres_shiny_palette.pal => moltres/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/mr_mime_front_pic.png => mr_mime/anim_front.png} (100%) rename graphics/pokemon/{back_pics/mr_mime_back_pic.png => mr_mime/back.png} (100%) rename graphics/pokemon/{footprints/mr_mime_footprint.png => mr_mime/footprint.png} (100%) rename graphics/pokemon/{front_pics/mr_mime_still_front_pic.png => mr_mime/front.png} (100%) rename graphics/pokemon/{icons/mr_mime_icon.png => mr_mime/icon.png} (100%) rename graphics/pokemon/{palettes/mr_mime_palette.pal => mr_mime/normal.pal} (100%) rename graphics/pokemon/{palettes/mr_mime_shiny_palette.pal => mr_mime/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/mudkip_front_pic.png => mudkip/anim_front.png} (100%) rename graphics/pokemon/{back_pics/mudkip_back_pic.png => mudkip/back.png} (100%) rename graphics/pokemon/{footprints/mudkip_footprint.png => mudkip/footprint.png} (100%) rename graphics/pokemon/{front_pics/mudkip_still_front_pic.png => mudkip/front.png} (100%) rename graphics/pokemon/{icons/mudkip_icon.png => mudkip/icon.png} (100%) rename graphics/pokemon/{palettes/mudkip_palette.pal => mudkip/normal.pal} (100%) rename graphics/pokemon/{palettes/mudkip_shiny_palette.pal => mudkip/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/muk_front_pic.png => muk/anim_front.png} (100%) rename graphics/pokemon/{back_pics/muk_back_pic.png => muk/back.png} (100%) rename graphics/pokemon/{footprints/muk_footprint.png => muk/footprint.png} (100%) rename graphics/pokemon/{front_pics/muk_still_front_pic.png => muk/front.png} (100%) rename graphics/pokemon/{icons/muk_icon.png => muk/icon.png} (100%) rename graphics/pokemon/{palettes/muk_palette.pal => muk/normal.pal} (100%) rename graphics/pokemon/{palettes/muk_shiny_palette.pal => muk/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/murkrow_front_pic.png => murkrow/anim_front.png} (100%) rename graphics/pokemon/{back_pics/murkrow_back_pic.png => murkrow/back.png} (100%) rename graphics/pokemon/{footprints/murkrow_footprint.png => murkrow/footprint.png} (100%) rename graphics/pokemon/{front_pics/murkrow_still_front_pic.png => murkrow/front.png} (100%) rename graphics/pokemon/{icons/murkrow_icon.png => murkrow/icon.png} (100%) rename graphics/pokemon/{palettes/murkrow_palette.pal => murkrow/normal.pal} (100%) rename graphics/pokemon/{palettes/murkrow_shiny_palette.pal => murkrow/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/natu_front_pic.png => natu/anim_front.png} (100%) rename graphics/pokemon/{back_pics/natu_back_pic.png => natu/back.png} (100%) rename graphics/pokemon/{footprints/natu_footprint.png => natu/footprint.png} (100%) rename graphics/pokemon/{front_pics/natu_still_front_pic.png => natu/front.png} (100%) rename graphics/pokemon/{icons/natu_icon.png => natu/icon.png} (100%) rename graphics/pokemon/{palettes/natu_palette.pal => natu/normal.pal} (100%) rename graphics/pokemon/{palettes/natu_shiny_palette.pal => natu/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/nidoking_front_pic.png => nidoking/anim_front.png} (100%) rename graphics/pokemon/{back_pics/nidoking_back_pic.png => nidoking/back.png} (100%) rename graphics/pokemon/{footprints/nidoking_footprint.png => nidoking/footprint.png} (100%) rename graphics/pokemon/{front_pics/nidoking_still_front_pic.png => nidoking/front.png} (100%) rename graphics/pokemon/{icons/nidoking_icon.png => nidoking/icon.png} (100%) rename graphics/pokemon/{palettes/nidoking_palette.pal => nidoking/normal.pal} (100%) rename graphics/pokemon/{palettes/nidoking_shiny_palette.pal => nidoking/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/nidoqueen_front_pic.png => nidoqueen/anim_front.png} (100%) rename graphics/pokemon/{back_pics/nidoqueen_back_pic.png => nidoqueen/back.png} (100%) rename graphics/pokemon/{footprints/nidoqueen_footprint.png => nidoqueen/footprint.png} (100%) rename graphics/pokemon/{front_pics/nidoqueen_still_front_pic.png => nidoqueen/front.png} (100%) rename graphics/pokemon/{icons/nidoqueen_icon.png => nidoqueen/icon.png} (100%) rename graphics/pokemon/{palettes/nidoqueen_palette.pal => nidoqueen/normal.pal} (100%) rename graphics/pokemon/{palettes/nidoqueen_shiny_palette.pal => nidoqueen/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/nidoran_f_front_pic.png => nidoran_f/anim_front.png} (100%) rename graphics/pokemon/{back_pics/nidoran_f_back_pic.png => nidoran_f/back.png} (100%) rename graphics/pokemon/{footprints/nidoran_f_footprint.png => nidoran_f/footprint.png} (100%) rename graphics/pokemon/{front_pics/nidoran_f_still_front_pic.png => nidoran_f/front.png} (100%) rename graphics/pokemon/{icons/nidoran_f_icon.png => nidoran_f/icon.png} (100%) rename graphics/pokemon/{palettes/nidoran_f_palette.pal => nidoran_f/normal.pal} (100%) rename graphics/pokemon/{palettes/nidoran_f_shiny_palette.pal => nidoran_f/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/nidoran_m_front_pic.png => nidoran_m/anim_front.png} (100%) rename graphics/pokemon/{back_pics/nidoran_m_back_pic.png => nidoran_m/back.png} (100%) rename graphics/pokemon/{footprints/nidoran_m_footprint.png => nidoran_m/footprint.png} (100%) rename graphics/pokemon/{front_pics/nidoran_m_still_front_pic.png => nidoran_m/front.png} (100%) rename graphics/pokemon/{icons/nidoran_m_icon.png => nidoran_m/icon.png} (100%) rename graphics/pokemon/{palettes/nidoran_m_palette.pal => nidoran_m/normal.pal} (100%) rename graphics/pokemon/{palettes/nidoran_m_shiny_palette.pal => nidoran_m/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/nidorina_front_pic.png => nidorina/anim_front.png} (100%) rename graphics/pokemon/{back_pics/nidorina_back_pic.png => nidorina/back.png} (100%) rename graphics/pokemon/{footprints/nidorina_footprint.png => nidorina/footprint.png} (100%) rename graphics/pokemon/{front_pics/nidorina_still_front_pic.png => nidorina/front.png} (100%) rename graphics/pokemon/{icons/nidorina_icon.png => nidorina/icon.png} (100%) rename graphics/pokemon/{palettes/nidorina_palette.pal => nidorina/normal.pal} (100%) rename graphics/pokemon/{palettes/nidorina_shiny_palette.pal => nidorina/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/nidorino_front_pic.png => nidorino/anim_front.png} (100%) rename graphics/pokemon/{back_pics/nidorino_back_pic.png => nidorino/back.png} (100%) rename graphics/pokemon/{footprints/nidorino_footprint.png => nidorino/footprint.png} (100%) rename graphics/pokemon/{front_pics/nidorino_still_front_pic.png => nidorino/front.png} (100%) rename graphics/pokemon/{icons/nidorino_icon.png => nidorino/icon.png} (100%) rename graphics/pokemon/{palettes/nidorino_palette.pal => nidorino/normal.pal} (100%) rename graphics/pokemon/{palettes/nidorino_shiny_palette.pal => nidorino/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/nincada_front_pic.png => nincada/anim_front.png} (100%) rename graphics/pokemon/{back_pics/nincada_back_pic.png => nincada/back.png} (100%) rename graphics/pokemon/{footprints/nincada_footprint.png => nincada/footprint.png} (100%) rename graphics/pokemon/{front_pics/nincada_still_front_pic.png => nincada/front.png} (100%) rename graphics/pokemon/{icons/nincada_icon.png => nincada/icon.png} (100%) rename graphics/pokemon/{palettes/nincada_palette.pal => nincada/normal.pal} (100%) rename graphics/pokemon/{palettes/nincada_shiny_palette.pal => nincada/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/ninetales_front_pic.png => ninetales/anim_front.png} (100%) rename graphics/pokemon/{back_pics/ninetales_back_pic.png => ninetales/back.png} (100%) rename graphics/pokemon/{footprints/ninetales_footprint.png => ninetales/footprint.png} (100%) rename graphics/pokemon/{front_pics/ninetales_still_front_pic.png => ninetales/front.png} (100%) rename graphics/pokemon/{icons/ninetales_icon.png => ninetales/icon.png} (100%) rename graphics/pokemon/{palettes/ninetales_palette.pal => ninetales/normal.pal} (100%) rename graphics/pokemon/{palettes/ninetales_shiny_palette.pal => ninetales/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/ninjask_front_pic.png => ninjask/anim_front.png} (100%) rename graphics/pokemon/{back_pics/ninjask_back_pic.png => ninjask/back.png} (100%) rename graphics/pokemon/{footprints/ninjask_footprint.png => ninjask/footprint.png} (100%) rename graphics/pokemon/{front_pics/ninjask_still_front_pic.png => ninjask/front.png} (100%) rename graphics/pokemon/{icons/ninjask_icon.png => ninjask/icon.png} (100%) rename graphics/pokemon/{palettes/ninjask_palette.pal => ninjask/normal.pal} (100%) rename graphics/pokemon/{palettes/ninjask_shiny_palette.pal => ninjask/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/noctowl_front_pic.png => noctowl/anim_front.png} (100%) rename graphics/pokemon/{back_pics/noctowl_back_pic.png => noctowl/back.png} (100%) rename graphics/pokemon/{footprints/noctowl_footprint.png => noctowl/footprint.png} (100%) rename graphics/pokemon/{front_pics/noctowl_still_front_pic.png => noctowl/front.png} (100%) rename graphics/pokemon/{icons/noctowl_icon.png => noctowl/icon.png} (100%) rename graphics/pokemon/{palettes/noctowl_palette.pal => noctowl/normal.pal} (100%) rename graphics/pokemon/{palettes/noctowl_shiny_palette.pal => noctowl/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/nosepass_front_pic.png => nosepass/anim_front.png} (100%) rename graphics/pokemon/{back_pics/nosepass_back_pic.png => nosepass/back.png} (100%) rename graphics/pokemon/{footprints/nosepass_footprint.png => nosepass/footprint.png} (100%) rename graphics/pokemon/{front_pics/nosepass_still_front_pic.png => nosepass/front.png} (100%) rename graphics/pokemon/{icons/nosepass_icon.png => nosepass/icon.png} (100%) rename graphics/pokemon/{palettes/nosepass_palette.pal => nosepass/normal.pal} (100%) rename graphics/pokemon/{palettes/nosepass_shiny_palette.pal => nosepass/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/numel_front_pic.png => numel/anim_front.png} (100%) rename graphics/pokemon/{back_pics/numel_back_pic.png => numel/back.png} (100%) rename graphics/pokemon/{footprints/numel_footprint.png => numel/footprint.png} (100%) rename graphics/pokemon/{front_pics/numel_still_front_pic.png => numel/front.png} (100%) rename graphics/pokemon/{icons/numel_icon.png => numel/icon.png} (100%) rename graphics/pokemon/{palettes/numel_palette.pal => numel/normal.pal} (100%) rename graphics/pokemon/{palettes/numel_shiny_palette.pal => numel/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/nuzleaf_front_pic.png => nuzleaf/anim_front.png} (100%) rename graphics/pokemon/{back_pics/nuzleaf_back_pic.png => nuzleaf/back.png} (100%) rename graphics/pokemon/{footprints/nuzleaf_footprint.png => nuzleaf/footprint.png} (100%) rename graphics/pokemon/{front_pics/nuzleaf_still_front_pic.png => nuzleaf/front.png} (100%) rename graphics/pokemon/{icons/nuzleaf_icon.png => nuzleaf/icon.png} (100%) rename graphics/pokemon/{palettes/nuzleaf_palette.pal => nuzleaf/normal.pal} (100%) rename graphics/pokemon/{palettes/nuzleaf_shiny_palette.pal => nuzleaf/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/octillery_front_pic.png => octillery/anim_front.png} (100%) rename graphics/pokemon/{back_pics/octillery_back_pic.png => octillery/back.png} (100%) rename graphics/pokemon/{footprints/octillery_footprint.png => octillery/footprint.png} (100%) rename graphics/pokemon/{front_pics/octillery_still_front_pic.png => octillery/front.png} (100%) rename graphics/pokemon/{icons/octillery_icon.png => octillery/icon.png} (100%) rename graphics/pokemon/{palettes/octillery_palette.pal => octillery/normal.pal} (100%) rename graphics/pokemon/{palettes/octillery_shiny_palette.pal => octillery/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/oddish_front_pic.png => oddish/anim_front.png} (100%) rename graphics/pokemon/{back_pics/oddish_back_pic.png => oddish/back.png} (100%) rename graphics/pokemon/{footprints/oddish_footprint.png => oddish/footprint.png} (100%) rename graphics/pokemon/{front_pics/oddish_still_front_pic.png => oddish/front.png} (100%) rename graphics/pokemon/{icons/oddish_icon.png => oddish/icon.png} (100%) rename graphics/pokemon/{palettes/oddish_palette.pal => oddish/normal.pal} (100%) rename graphics/pokemon/{palettes/oddish_shiny_palette.pal => oddish/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/omanyte_front_pic.png => omanyte/anim_front.png} (100%) rename graphics/pokemon/{back_pics/omanyte_back_pic.png => omanyte/back.png} (100%) rename graphics/pokemon/{footprints/omanyte_footprint.png => omanyte/footprint.png} (100%) rename graphics/pokemon/{front_pics/omanyte_still_front_pic.png => omanyte/front.png} (100%) rename graphics/pokemon/{icons/omanyte_icon.png => omanyte/icon.png} (100%) rename graphics/pokemon/{palettes/omanyte_palette.pal => omanyte/normal.pal} (100%) rename graphics/pokemon/{palettes/omanyte_shiny_palette.pal => omanyte/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/omastar_front_pic.png => omastar/anim_front.png} (100%) rename graphics/pokemon/{back_pics/omastar_back_pic.png => omastar/back.png} (100%) rename graphics/pokemon/{footprints/omastar_footprint.png => omastar/footprint.png} (100%) rename graphics/pokemon/{front_pics/omastar_still_front_pic.png => omastar/front.png} (100%) rename graphics/pokemon/{icons/omastar_icon.png => omastar/icon.png} (100%) rename graphics/pokemon/{palettes/omastar_palette.pal => omastar/normal.pal} (100%) rename graphics/pokemon/{palettes/omastar_shiny_palette.pal => omastar/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/onix_front_pic.png => onix/anim_front.png} (100%) rename graphics/pokemon/{back_pics/onix_back_pic.png => onix/back.png} (100%) rename graphics/pokemon/{footprints/onix_footprint.png => onix/footprint.png} (100%) rename graphics/pokemon/{front_pics/onix_still_front_pic.png => onix/front.png} (100%) rename graphics/pokemon/{icons/onix_icon.png => onix/icon.png} (100%) rename graphics/pokemon/{palettes/onix_palette.pal => onix/normal.pal} (100%) rename graphics/pokemon/{palettes/onix_shiny_palette.pal => onix/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/paras_front_pic.png => paras/anim_front.png} (100%) rename graphics/pokemon/{back_pics/paras_back_pic.png => paras/back.png} (100%) rename graphics/pokemon/{footprints/paras_footprint.png => paras/footprint.png} (100%) rename graphics/pokemon/{front_pics/paras_still_front_pic.png => paras/front.png} (100%) rename graphics/pokemon/{icons/paras_icon.png => paras/icon.png} (100%) rename graphics/pokemon/{palettes/paras_palette.pal => paras/normal.pal} (100%) rename graphics/pokemon/{palettes/paras_shiny_palette.pal => paras/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/parasect_front_pic.png => parasect/anim_front.png} (100%) rename graphics/pokemon/{back_pics/parasect_back_pic.png => parasect/back.png} (100%) rename graphics/pokemon/{footprints/parasect_footprint.png => parasect/footprint.png} (100%) rename graphics/pokemon/{front_pics/parasect_still_front_pic.png => parasect/front.png} (100%) rename graphics/pokemon/{icons/parasect_icon.png => parasect/icon.png} (100%) rename graphics/pokemon/{palettes/parasect_palette.pal => parasect/normal.pal} (100%) rename graphics/pokemon/{palettes/parasect_shiny_palette.pal => parasect/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/pelipper_front_pic.png => pelipper/anim_front.png} (100%) rename graphics/pokemon/{back_pics/pelipper_back_pic.png => pelipper/back.png} (100%) rename graphics/pokemon/{footprints/pelipper_footprint.png => pelipper/footprint.png} (100%) rename graphics/pokemon/{front_pics/pelipper_still_front_pic.png => pelipper/front.png} (100%) rename graphics/pokemon/{icons/pelipper_icon.png => pelipper/icon.png} (100%) rename graphics/pokemon/{palettes/pelipper_palette.pal => pelipper/normal.pal} (100%) rename graphics/pokemon/{palettes/pelipper_shiny_palette.pal => pelipper/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/persian_front_pic.png => persian/anim_front.png} (100%) rename graphics/pokemon/{back_pics/persian_back_pic.png => persian/back.png} (100%) rename graphics/pokemon/{footprints/persian_footprint.png => persian/footprint.png} (100%) rename graphics/pokemon/{front_pics/persian_still_front_pic.png => persian/front.png} (100%) rename graphics/pokemon/{icons/persian_icon.png => persian/icon.png} (100%) rename graphics/pokemon/{palettes/persian_palette.pal => persian/normal.pal} (100%) rename graphics/pokemon/{palettes/persian_shiny_palette.pal => persian/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/phanpy_front_pic.png => phanpy/anim_front.png} (100%) rename graphics/pokemon/{back_pics/phanpy_back_pic.png => phanpy/back.png} (100%) rename graphics/pokemon/{footprints/phanpy_footprint.png => phanpy/footprint.png} (100%) rename graphics/pokemon/{front_pics/phanpy_still_front_pic.png => phanpy/front.png} (100%) rename graphics/pokemon/{icons/phanpy_icon.png => phanpy/icon.png} (100%) rename graphics/pokemon/{palettes/phanpy_palette.pal => phanpy/normal.pal} (100%) rename graphics/pokemon/{palettes/phanpy_shiny_palette.pal => phanpy/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/pichu_front_pic.png => pichu/anim_front.png} (100%) rename graphics/pokemon/{back_pics/pichu_back_pic.png => pichu/back.png} (100%) rename graphics/pokemon/{footprints/pichu_footprint.png => pichu/footprint.png} (100%) rename graphics/pokemon/{front_pics/pichu_still_front_pic.png => pichu/front.png} (100%) rename graphics/pokemon/{icons/pichu_icon.png => pichu/icon.png} (100%) rename graphics/pokemon/{palettes/pichu_palette.pal => pichu/normal.pal} (100%) rename graphics/pokemon/{palettes/pichu_shiny_palette.pal => pichu/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/pidgeot_front_pic.png => pidgeot/anim_front.png} (100%) rename graphics/pokemon/{back_pics/pidgeot_back_pic.png => pidgeot/back.png} (100%) rename graphics/pokemon/{footprints/pidgeot_footprint.png => pidgeot/footprint.png} (100%) rename graphics/pokemon/{front_pics/pidgeot_still_front_pic.png => pidgeot/front.png} (100%) rename graphics/pokemon/{icons/pidgeot_icon.png => pidgeot/icon.png} (100%) rename graphics/pokemon/{palettes/pidgeot_palette.pal => pidgeot/normal.pal} (100%) rename graphics/pokemon/{palettes/pidgeot_shiny_palette.pal => pidgeot/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/pidgeotto_front_pic.png => pidgeotto/anim_front.png} (100%) rename graphics/pokemon/{back_pics/pidgeotto_back_pic.png => pidgeotto/back.png} (100%) rename graphics/pokemon/{footprints/pidgeotto_footprint.png => pidgeotto/footprint.png} (100%) rename graphics/pokemon/{front_pics/pidgeotto_still_front_pic.png => pidgeotto/front.png} (100%) rename graphics/pokemon/{icons/pidgeotto_icon.png => pidgeotto/icon.png} (100%) rename graphics/pokemon/{palettes/pidgeotto_palette.pal => pidgeotto/normal.pal} (100%) rename graphics/pokemon/{palettes/pidgeotto_shiny_palette.pal => pidgeotto/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/pidgey_front_pic.png => pidgey/anim_front.png} (100%) rename graphics/pokemon/{back_pics/pidgey_back_pic.png => pidgey/back.png} (100%) rename graphics/pokemon/{footprints/pidgey_footprint.png => pidgey/footprint.png} (100%) rename graphics/pokemon/{front_pics/pidgey_still_front_pic.png => pidgey/front.png} (100%) rename graphics/pokemon/{icons/pidgey_icon.png => pidgey/icon.png} (100%) rename graphics/pokemon/{palettes/pidgey_palette.pal => pidgey/normal.pal} (100%) rename graphics/pokemon/{palettes/pidgey_shiny_palette.pal => pidgey/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/pikachu_front_pic.png => pikachu/anim_front.png} (100%) rename graphics/pokemon/{back_pics/pikachu_back_pic.png => pikachu/back.png} (100%) rename graphics/pokemon/{footprints/pikachu_footprint.png => pikachu/footprint.png} (100%) rename graphics/pokemon/{front_pics/pikachu_still_front_pic.png => pikachu/front.png} (100%) rename graphics/pokemon/{icons/pikachu_icon.png => pikachu/icon.png} (100%) rename graphics/pokemon/{palettes/pikachu_palette.pal => pikachu/normal.pal} (100%) rename graphics/pokemon/{palettes/pikachu_shiny_palette.pal => pikachu/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/piloswine_front_pic.png => piloswine/anim_front.png} (100%) rename graphics/pokemon/{back_pics/piloswine_back_pic.png => piloswine/back.png} (100%) rename graphics/pokemon/{footprints/piloswine_footprint.png => piloswine/footprint.png} (100%) rename graphics/pokemon/{front_pics/piloswine_still_front_pic.png => piloswine/front.png} (100%) rename graphics/pokemon/{icons/piloswine_icon.png => piloswine/icon.png} (100%) rename graphics/pokemon/{palettes/piloswine_palette.pal => piloswine/normal.pal} (100%) rename graphics/pokemon/{palettes/piloswine_shiny_palette.pal => piloswine/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/pineco_front_pic.png => pineco/anim_front.png} (100%) rename graphics/pokemon/{back_pics/pineco_back_pic.png => pineco/back.png} (100%) rename graphics/pokemon/{footprints/pineco_footprint.png => pineco/footprint.png} (100%) rename graphics/pokemon/{front_pics/pineco_still_front_pic.png => pineco/front.png} (100%) rename graphics/pokemon/{icons/pineco_icon.png => pineco/icon.png} (100%) rename graphics/pokemon/{palettes/pineco_palette.pal => pineco/normal.pal} (100%) rename graphics/pokemon/{palettes/pineco_shiny_palette.pal => pineco/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/pinsir_front_pic.png => pinsir/anim_front.png} (100%) rename graphics/pokemon/{back_pics/pinsir_back_pic.png => pinsir/back.png} (100%) rename graphics/pokemon/{footprints/pinsir_footprint.png => pinsir/footprint.png} (100%) rename graphics/pokemon/{front_pics/pinsir_still_front_pic.png => pinsir/front.png} (100%) rename graphics/pokemon/{icons/pinsir_icon.png => pinsir/icon.png} (100%) rename graphics/pokemon/{palettes/pinsir_palette.pal => pinsir/normal.pal} (100%) rename graphics/pokemon/{palettes/pinsir_shiny_palette.pal => pinsir/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/plusle_front_pic.png => plusle/anim_front.png} (100%) rename graphics/pokemon/{back_pics/plusle_back_pic.png => plusle/back.png} (100%) rename graphics/pokemon/{footprints/plusle_footprint.png => plusle/footprint.png} (100%) rename graphics/pokemon/{front_pics/plusle_still_front_pic.png => plusle/front.png} (100%) rename graphics/pokemon/{icons/plusle_icon.png => plusle/icon.png} (100%) rename graphics/pokemon/{palettes/plusle_palette.pal => plusle/normal.pal} (100%) rename graphics/pokemon/{palettes/plusle_shiny_palette.pal => plusle/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/politoed_front_pic.png => politoed/anim_front.png} (100%) rename graphics/pokemon/{back_pics/politoed_back_pic.png => politoed/back.png} (100%) rename graphics/pokemon/{footprints/politoed_footprint.png => politoed/footprint.png} (100%) rename graphics/pokemon/{front_pics/politoed_still_front_pic.png => politoed/front.png} (100%) rename graphics/pokemon/{icons/politoed_icon.png => politoed/icon.png} (100%) rename graphics/pokemon/{palettes/politoed_palette.pal => politoed/normal.pal} (100%) rename graphics/pokemon/{palettes/politoed_shiny_palette.pal => politoed/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/poliwag_front_pic.png => poliwag/anim_front.png} (100%) rename graphics/pokemon/{back_pics/poliwag_back_pic.png => poliwag/back.png} (100%) rename graphics/pokemon/{footprints/poliwag_footprint.png => poliwag/footprint.png} (100%) rename graphics/pokemon/{front_pics/poliwag_still_front_pic.png => poliwag/front.png} (100%) rename graphics/pokemon/{icons/poliwag_icon.png => poliwag/icon.png} (100%) rename graphics/pokemon/{palettes/poliwag_palette.pal => poliwag/normal.pal} (100%) rename graphics/pokemon/{palettes/poliwag_shiny_palette.pal => poliwag/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/poliwhirl_front_pic.png => poliwhirl/anim_front.png} (100%) rename graphics/pokemon/{back_pics/poliwhirl_back_pic.png => poliwhirl/back.png} (100%) rename graphics/pokemon/{footprints/poliwhirl_footprint.png => poliwhirl/footprint.png} (100%) rename graphics/pokemon/{front_pics/poliwhirl_still_front_pic.png => poliwhirl/front.png} (100%) rename graphics/pokemon/{icons/poliwhirl_icon.png => poliwhirl/icon.png} (100%) rename graphics/pokemon/{palettes/poliwhirl_palette.pal => poliwhirl/normal.pal} (100%) rename graphics/pokemon/{palettes/poliwhirl_shiny_palette.pal => poliwhirl/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/poliwrath_front_pic.png => poliwrath/anim_front.png} (100%) rename graphics/pokemon/{back_pics/poliwrath_back_pic.png => poliwrath/back.png} (100%) rename graphics/pokemon/{footprints/poliwrath_footprint.png => poliwrath/footprint.png} (100%) rename graphics/pokemon/{front_pics/poliwrath_still_front_pic.png => poliwrath/front.png} (100%) rename graphics/pokemon/{icons/poliwrath_icon.png => poliwrath/icon.png} (100%) rename graphics/pokemon/{palettes/poliwrath_palette.pal => poliwrath/normal.pal} (100%) rename graphics/pokemon/{palettes/poliwrath_shiny_palette.pal => poliwrath/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/ponyta_front_pic.png => ponyta/anim_front.png} (100%) rename graphics/pokemon/{back_pics/ponyta_back_pic.png => ponyta/back.png} (100%) rename graphics/pokemon/{footprints/ponyta_footprint.png => ponyta/footprint.png} (100%) rename graphics/pokemon/{front_pics/ponyta_still_front_pic.png => ponyta/front.png} (100%) rename graphics/pokemon/{icons/ponyta_icon.png => ponyta/icon.png} (100%) rename graphics/pokemon/{palettes/ponyta_palette.pal => ponyta/normal.pal} (100%) rename graphics/pokemon/{palettes/ponyta_shiny_palette.pal => ponyta/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/poochyena_front_pic.png => poochyena/anim_front.png} (100%) rename graphics/pokemon/{back_pics/poochyena_back_pic.png => poochyena/back.png} (100%) rename graphics/pokemon/{footprints/poochyena_footprint.png => poochyena/footprint.png} (100%) rename graphics/pokemon/{front_pics/poochyena_still_front_pic.png => poochyena/front.png} (100%) rename graphics/pokemon/{icons/poochyena_icon.png => poochyena/icon.png} (100%) rename graphics/pokemon/{palettes/poochyena_palette.pal => poochyena/normal.pal} (100%) rename graphics/pokemon/{palettes/poochyena_shiny_palette.pal => poochyena/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/porygon_front_pic.png => porygon/anim_front.png} (100%) rename graphics/pokemon/{back_pics/porygon_back_pic.png => porygon/back.png} (100%) rename graphics/pokemon/{footprints/porygon_footprint.png => porygon/footprint.png} (100%) rename graphics/pokemon/{front_pics/porygon_still_front_pic.png => porygon/front.png} (100%) rename graphics/pokemon/{icons/porygon_icon.png => porygon/icon.png} (100%) rename graphics/pokemon/{palettes/porygon_palette.pal => porygon/normal.pal} (100%) rename graphics/pokemon/{palettes/porygon_shiny_palette.pal => porygon/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/porygon2_front_pic.png => porygon2/anim_front.png} (100%) rename graphics/pokemon/{back_pics/porygon2_back_pic.png => porygon2/back.png} (100%) rename graphics/pokemon/{footprints/porygon2_footprint.png => porygon2/footprint.png} (100%) rename graphics/pokemon/{front_pics/porygon2_still_front_pic.png => porygon2/front.png} (100%) rename graphics/pokemon/{icons/porygon2_icon.png => porygon2/icon.png} (100%) rename graphics/pokemon/{palettes/porygon2_palette.pal => porygon2/normal.pal} (100%) rename graphics/pokemon/{palettes/porygon2_shiny_palette.pal => porygon2/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/primeape_front_pic.png => primeape/anim_front.png} (100%) rename graphics/pokemon/{back_pics/primeape_back_pic.png => primeape/back.png} (100%) rename graphics/pokemon/{footprints/primeape_footprint.png => primeape/footprint.png} (100%) rename graphics/pokemon/{front_pics/primeape_still_front_pic.png => primeape/front.png} (100%) rename graphics/pokemon/{icons/primeape_icon.png => primeape/icon.png} (100%) rename graphics/pokemon/{palettes/primeape_palette.pal => primeape/normal.pal} (100%) rename graphics/pokemon/{palettes/primeape_shiny_palette.pal => primeape/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/psyduck_front_pic.png => psyduck/anim_front.png} (100%) rename graphics/pokemon/{back_pics/psyduck_back_pic.png => psyduck/back.png} (100%) rename graphics/pokemon/{footprints/psyduck_footprint.png => psyduck/footprint.png} (100%) rename graphics/pokemon/{front_pics/psyduck_still_front_pic.png => psyduck/front.png} (100%) rename graphics/pokemon/{icons/psyduck_icon.png => psyduck/icon.png} (100%) rename graphics/pokemon/{palettes/psyduck_palette.pal => psyduck/normal.pal} (100%) rename graphics/pokemon/{palettes/psyduck_shiny_palette.pal => psyduck/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/pupitar_front_pic.png => pupitar/anim_front.png} (100%) rename graphics/pokemon/{back_pics/pupitar_back_pic.png => pupitar/back.png} (100%) rename graphics/pokemon/{footprints/pupitar_footprint.png => pupitar/footprint.png} (100%) rename graphics/pokemon/{front_pics/pupitar_still_front_pic.png => pupitar/front.png} (100%) rename graphics/pokemon/{icons/pupitar_icon.png => pupitar/icon.png} (100%) rename graphics/pokemon/{palettes/pupitar_palette.pal => pupitar/normal.pal} (100%) rename graphics/pokemon/{palettes/pupitar_shiny_palette.pal => pupitar/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/quagsire_front_pic.png => quagsire/anim_front.png} (100%) rename graphics/pokemon/{back_pics/quagsire_back_pic.png => quagsire/back.png} (100%) rename graphics/pokemon/{footprints/quagsire_footprint.png => quagsire/footprint.png} (100%) rename graphics/pokemon/{front_pics/quagsire_still_front_pic.png => quagsire/front.png} (100%) rename graphics/pokemon/{icons/quagsire_icon.png => quagsire/icon.png} (100%) rename graphics/pokemon/{palettes/quagsire_palette.pal => quagsire/normal.pal} (100%) rename graphics/pokemon/{palettes/quagsire_shiny_palette.pal => quagsire/shiny.pal} (100%) rename graphics/pokemon/{footprints/question_mark_footprint.png => question_mark/footprint.png} (100%) rename graphics/pokemon/{icons/question_mark_icon.png => question_mark/icon.png} (100%) rename graphics/pokemon/{anim_front_pics/quilava_front_pic.png => quilava/anim_front.png} (100%) rename graphics/pokemon/{back_pics/quilava_back_pic.png => quilava/back.png} (100%) rename graphics/pokemon/{footprints/quilava_footprint.png => quilava/footprint.png} (100%) rename graphics/pokemon/{front_pics/quilava_still_front_pic.png => quilava/front.png} (100%) rename graphics/pokemon/{icons/quilava_icon.png => quilava/icon.png} (100%) rename graphics/pokemon/{palettes/quilava_palette.pal => quilava/normal.pal} (100%) rename graphics/pokemon/{palettes/quilava_shiny_palette.pal => quilava/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/qwilfish_front_pic.png => qwilfish/anim_front.png} (100%) rename graphics/pokemon/{back_pics/qwilfish_back_pic.png => qwilfish/back.png} (100%) rename graphics/pokemon/{footprints/qwilfish_footprint.png => qwilfish/footprint.png} (100%) rename graphics/pokemon/{front_pics/qwilfish_still_front_pic.png => qwilfish/front.png} (100%) rename graphics/pokemon/{icons/qwilfish_icon.png => qwilfish/icon.png} (100%) rename graphics/pokemon/{palettes/qwilfish_palette.pal => qwilfish/normal.pal} (100%) rename graphics/pokemon/{palettes/qwilfish_shiny_palette.pal => qwilfish/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/raichu_front_pic.png => raichu/anim_front.png} (100%) rename graphics/pokemon/{back_pics/raichu_back_pic.png => raichu/back.png} (100%) rename graphics/pokemon/{footprints/raichu_footprint.png => raichu/footprint.png} (100%) rename graphics/pokemon/{front_pics/raichu_still_front_pic.png => raichu/front.png} (100%) rename graphics/pokemon/{icons/raichu_icon.png => raichu/icon.png} (100%) rename graphics/pokemon/{palettes/raichu_palette.pal => raichu/normal.pal} (100%) rename graphics/pokemon/{palettes/raichu_shiny_palette.pal => raichu/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/raikou_front_pic.png => raikou/anim_front.png} (100%) rename graphics/pokemon/{back_pics/raikou_back_pic.png => raikou/back.png} (100%) rename graphics/pokemon/{footprints/raikou_footprint.png => raikou/footprint.png} (100%) rename graphics/pokemon/{front_pics/raikou_still_front_pic.png => raikou/front.png} (100%) rename graphics/pokemon/{icons/raikou_icon.png => raikou/icon.png} (100%) rename graphics/pokemon/{palettes/raikou_palette.pal => raikou/normal.pal} (100%) rename graphics/pokemon/{palettes/raikou_shiny_palette.pal => raikou/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/ralts_front_pic.png => ralts/anim_front.png} (100%) rename graphics/pokemon/{back_pics/ralts_back_pic.png => ralts/back.png} (100%) rename graphics/pokemon/{footprints/ralts_footprint.png => ralts/footprint.png} (100%) rename graphics/pokemon/{front_pics/ralts_still_front_pic.png => ralts/front.png} (100%) rename graphics/pokemon/{icons/ralts_icon.png => ralts/icon.png} (100%) rename graphics/pokemon/{palettes/ralts_palette.pal => ralts/normal.pal} (100%) rename graphics/pokemon/{palettes/ralts_shiny_palette.pal => ralts/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/rapidash_front_pic.png => rapidash/anim_front.png} (100%) rename graphics/pokemon/{back_pics/rapidash_back_pic.png => rapidash/back.png} (100%) rename graphics/pokemon/{footprints/rapidash_footprint.png => rapidash/footprint.png} (100%) rename graphics/pokemon/{front_pics/rapidash_still_front_pic.png => rapidash/front.png} (100%) rename graphics/pokemon/{icons/rapidash_icon.png => rapidash/icon.png} (100%) rename graphics/pokemon/{palettes/rapidash_palette.pal => rapidash/normal.pal} (100%) rename graphics/pokemon/{palettes/rapidash_shiny_palette.pal => rapidash/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/raticate_front_pic.png => raticate/anim_front.png} (100%) rename graphics/pokemon/{back_pics/raticate_back_pic.png => raticate/back.png} (100%) rename graphics/pokemon/{footprints/raticate_footprint.png => raticate/footprint.png} (100%) rename graphics/pokemon/{front_pics/raticate_still_front_pic.png => raticate/front.png} (100%) rename graphics/pokemon/{icons/raticate_icon.png => raticate/icon.png} (100%) rename graphics/pokemon/{palettes/raticate_palette.pal => raticate/normal.pal} (100%) rename graphics/pokemon/{palettes/raticate_shiny_palette.pal => raticate/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/rattata_front_pic.png => rattata/anim_front.png} (100%) rename graphics/pokemon/{back_pics/rattata_back_pic.png => rattata/back.png} (100%) rename graphics/pokemon/{footprints/rattata_footprint.png => rattata/footprint.png} (100%) rename graphics/pokemon/{front_pics/rattata_still_front_pic.png => rattata/front.png} (100%) rename graphics/pokemon/{icons/rattata_icon.png => rattata/icon.png} (100%) rename graphics/pokemon/{palettes/rattata_palette.pal => rattata/normal.pal} (100%) rename graphics/pokemon/{palettes/rattata_shiny_palette.pal => rattata/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/rayquaza_front_pic.png => rayquaza/anim_front.png} (100%) rename graphics/pokemon/{back_pics/rayquaza_back_pic.png => rayquaza/back.png} (100%) rename graphics/pokemon/{footprints/rayquaza_footprint.png => rayquaza/footprint.png} (100%) rename graphics/pokemon/{front_pics/rayquaza_still_front_pic.png => rayquaza/front.png} (100%) rename graphics/pokemon/{icons/rayquaza_icon.png => rayquaza/icon.png} (100%) rename graphics/pokemon/{palettes/rayquaza_palette.pal => rayquaza/normal.pal} (100%) rename graphics/pokemon/{palettes/rayquaza_shiny_palette.pal => rayquaza/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/regice_front_pic.png => regice/anim_front.png} (100%) rename graphics/pokemon/{back_pics/regice_back_pic.png => regice/back.png} (100%) rename graphics/pokemon/{footprints/regice_footprint.png => regice/footprint.png} (100%) rename graphics/pokemon/{front_pics/regice_still_front_pic.png => regice/front.png} (100%) rename graphics/pokemon/{icons/regice_icon.png => regice/icon.png} (100%) rename graphics/pokemon/{palettes/regice_palette.pal => regice/normal.pal} (100%) rename graphics/pokemon/{palettes/regice_shiny_palette.pal => regice/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/regirock_front_pic.png => regirock/anim_front.png} (100%) rename graphics/pokemon/{back_pics/regirock_back_pic.png => regirock/back.png} (100%) rename graphics/pokemon/{footprints/regirock_footprint.png => regirock/footprint.png} (100%) rename graphics/pokemon/{front_pics/regirock_still_front_pic.png => regirock/front.png} (100%) rename graphics/pokemon/{icons/regirock_icon.png => regirock/icon.png} (100%) rename graphics/pokemon/{palettes/regirock_palette.pal => regirock/normal.pal} (100%) rename graphics/pokemon/{palettes/regirock_shiny_palette.pal => regirock/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/registeel_front_pic.png => registeel/anim_front.png} (100%) rename graphics/pokemon/{back_pics/registeel_back_pic.png => registeel/back.png} (100%) rename graphics/pokemon/{footprints/registeel_footprint.png => registeel/footprint.png} (100%) rename graphics/pokemon/{front_pics/registeel_still_front_pic.png => registeel/front.png} (100%) rename graphics/pokemon/{icons/registeel_icon.png => registeel/icon.png} (100%) rename graphics/pokemon/{palettes/registeel_palette.pal => registeel/normal.pal} (100%) rename graphics/pokemon/{palettes/registeel_shiny_palette.pal => registeel/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/relicanth_front_pic.png => relicanth/anim_front.png} (100%) rename graphics/pokemon/{back_pics/relicanth_back_pic.png => relicanth/back.png} (100%) rename graphics/pokemon/{footprints/relicanth_footprint.png => relicanth/footprint.png} (100%) rename graphics/pokemon/{front_pics/relicanth_still_front_pic.png => relicanth/front.png} (100%) rename graphics/pokemon/{icons/relicanth_icon.png => relicanth/icon.png} (100%) rename graphics/pokemon/{palettes/relicanth_palette.pal => relicanth/normal.pal} (100%) rename graphics/pokemon/{palettes/relicanth_shiny_palette.pal => relicanth/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/remoraid_front_pic.png => remoraid/anim_front.png} (100%) rename graphics/pokemon/{back_pics/remoraid_back_pic.png => remoraid/back.png} (100%) rename graphics/pokemon/{footprints/remoraid_footprint.png => remoraid/footprint.png} (100%) rename graphics/pokemon/{front_pics/remoraid_still_front_pic.png => remoraid/front.png} (100%) rename graphics/pokemon/{icons/remoraid_icon.png => remoraid/icon.png} (100%) rename graphics/pokemon/{palettes/remoraid_palette.pal => remoraid/normal.pal} (100%) rename graphics/pokemon/{palettes/remoraid_shiny_palette.pal => remoraid/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/rhydon_front_pic.png => rhydon/anim_front.png} (100%) rename graphics/pokemon/{back_pics/rhydon_back_pic.png => rhydon/back.png} (100%) rename graphics/pokemon/{footprints/rhydon_footprint.png => rhydon/footprint.png} (100%) rename graphics/pokemon/{front_pics/rhydon_still_front_pic.png => rhydon/front.png} (100%) rename graphics/pokemon/{icons/rhydon_icon.png => rhydon/icon.png} (100%) rename graphics/pokemon/{palettes/rhydon_palette.pal => rhydon/normal.pal} (100%) rename graphics/pokemon/{palettes/rhydon_shiny_palette.pal => rhydon/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/rhyhorn_front_pic.png => rhyhorn/anim_front.png} (100%) rename graphics/pokemon/{back_pics/rhyhorn_back_pic.png => rhyhorn/back.png} (100%) rename graphics/pokemon/{footprints/rhyhorn_footprint.png => rhyhorn/footprint.png} (100%) rename graphics/pokemon/{front_pics/rhyhorn_still_front_pic.png => rhyhorn/front.png} (100%) rename graphics/pokemon/{icons/rhyhorn_icon.png => rhyhorn/icon.png} (100%) rename graphics/pokemon/{palettes/rhyhorn_palette.pal => rhyhorn/normal.pal} (100%) rename graphics/pokemon/{palettes/rhyhorn_shiny_palette.pal => rhyhorn/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/roselia_front_pic.png => roselia/anim_front.png} (100%) rename graphics/pokemon/{back_pics/roselia_back_pic.png => roselia/back.png} (100%) rename graphics/pokemon/{footprints/roselia_footprint.png => roselia/footprint.png} (100%) rename graphics/pokemon/{front_pics/roselia_still_front_pic.png => roselia/front.png} (100%) rename graphics/pokemon/{icons/roselia_icon.png => roselia/icon.png} (100%) rename graphics/pokemon/{palettes/roselia_palette.pal => roselia/normal.pal} (100%) rename graphics/pokemon/{palettes/roselia_shiny_palette.pal => roselia/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/sableye_front_pic.png => sableye/anim_front.png} (100%) rename graphics/pokemon/{back_pics/sableye_back_pic.png => sableye/back.png} (100%) rename graphics/pokemon/{footprints/sableye_footprint.png => sableye/footprint.png} (100%) rename graphics/pokemon/{front_pics/sableye_still_front_pic.png => sableye/front.png} (100%) rename graphics/pokemon/{icons/sableye_icon.png => sableye/icon.png} (100%) rename graphics/pokemon/{palettes/sableye_palette.pal => sableye/normal.pal} (100%) rename graphics/pokemon/{palettes/sableye_shiny_palette.pal => sableye/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/salamence_front_pic.png => salamence/anim_front.png} (100%) rename graphics/pokemon/{back_pics/salamence_back_pic.png => salamence/back.png} (100%) rename graphics/pokemon/{footprints/salamence_footprint.png => salamence/footprint.png} (100%) rename graphics/pokemon/{front_pics/salamence_still_front_pic.png => salamence/front.png} (100%) rename graphics/pokemon/{icons/salamence_icon.png => salamence/icon.png} (100%) rename graphics/pokemon/{palettes/salamence_palette.pal => salamence/normal.pal} (100%) rename graphics/pokemon/{palettes/salamence_shiny_palette.pal => salamence/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/sandshrew_front_pic.png => sandshrew/anim_front.png} (100%) rename graphics/pokemon/{back_pics/sandshrew_back_pic.png => sandshrew/back.png} (100%) rename graphics/pokemon/{footprints/sandshrew_footprint.png => sandshrew/footprint.png} (100%) rename graphics/pokemon/{front_pics/sandshrew_still_front_pic.png => sandshrew/front.png} (100%) rename graphics/pokemon/{icons/sandshrew_icon.png => sandshrew/icon.png} (100%) rename graphics/pokemon/{palettes/sandshrew_palette.pal => sandshrew/normal.pal} (100%) rename graphics/pokemon/{palettes/sandshrew_shiny_palette.pal => sandshrew/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/sandslash_front_pic.png => sandslash/anim_front.png} (100%) rename graphics/pokemon/{back_pics/sandslash_back_pic.png => sandslash/back.png} (100%) rename graphics/pokemon/{footprints/sandslash_footprint.png => sandslash/footprint.png} (100%) rename graphics/pokemon/{front_pics/sandslash_still_front_pic.png => sandslash/front.png} (100%) rename graphics/pokemon/{icons/sandslash_icon.png => sandslash/icon.png} (100%) rename graphics/pokemon/{palettes/sandslash_palette.pal => sandslash/normal.pal} (100%) rename graphics/pokemon/{palettes/sandslash_shiny_palette.pal => sandslash/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/sceptile_front_pic.png => sceptile/anim_front.png} (100%) rename graphics/pokemon/{back_pics/sceptile_back_pic.png => sceptile/back.png} (100%) rename graphics/pokemon/{footprints/sceptile_footprint.png => sceptile/footprint.png} (100%) rename graphics/pokemon/{front_pics/sceptile_still_front_pic.png => sceptile/front.png} (100%) rename graphics/pokemon/{icons/sceptile_icon.png => sceptile/icon.png} (100%) rename graphics/pokemon/{palettes/sceptile_palette.pal => sceptile/normal.pal} (100%) rename graphics/pokemon/{palettes/sceptile_shiny_palette.pal => sceptile/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/scizor_front_pic.png => scizor/anim_front.png} (100%) rename graphics/pokemon/{back_pics/scizor_back_pic.png => scizor/back.png} (100%) rename graphics/pokemon/{footprints/scizor_footprint.png => scizor/footprint.png} (100%) rename graphics/pokemon/{front_pics/scizor_still_front_pic.png => scizor/front.png} (100%) rename graphics/pokemon/{icons/scizor_icon.png => scizor/icon.png} (100%) rename graphics/pokemon/{palettes/scizor_palette.pal => scizor/normal.pal} (100%) rename graphics/pokemon/{palettes/scizor_shiny_palette.pal => scizor/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/scyther_front_pic.png => scyther/anim_front.png} (100%) rename graphics/pokemon/{back_pics/scyther_back_pic.png => scyther/back.png} (100%) rename graphics/pokemon/{footprints/scyther_footprint.png => scyther/footprint.png} (100%) rename graphics/pokemon/{front_pics/scyther_still_front_pic.png => scyther/front.png} (100%) rename graphics/pokemon/{icons/scyther_icon.png => scyther/icon.png} (100%) rename graphics/pokemon/{palettes/scyther_palette.pal => scyther/normal.pal} (100%) rename graphics/pokemon/{palettes/scyther_shiny_palette.pal => scyther/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/seadra_front_pic.png => seadra/anim_front.png} (100%) rename graphics/pokemon/{back_pics/seadra_back_pic.png => seadra/back.png} (100%) rename graphics/pokemon/{footprints/seadra_footprint.png => seadra/footprint.png} (100%) rename graphics/pokemon/{front_pics/seadra_still_front_pic.png => seadra/front.png} (100%) rename graphics/pokemon/{icons/seadra_icon.png => seadra/icon.png} (100%) rename graphics/pokemon/{palettes/seadra_palette.pal => seadra/normal.pal} (100%) rename graphics/pokemon/{palettes/seadra_shiny_palette.pal => seadra/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/seaking_front_pic.png => seaking/anim_front.png} (100%) rename graphics/pokemon/{back_pics/seaking_back_pic.png => seaking/back.png} (100%) rename graphics/pokemon/{footprints/seaking_footprint.png => seaking/footprint.png} (100%) rename graphics/pokemon/{front_pics/seaking_still_front_pic.png => seaking/front.png} (100%) rename graphics/pokemon/{icons/seaking_icon.png => seaking/icon.png} (100%) rename graphics/pokemon/{palettes/seaking_palette.pal => seaking/normal.pal} (100%) rename graphics/pokemon/{palettes/seaking_shiny_palette.pal => seaking/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/sealeo_front_pic.png => sealeo/anim_front.png} (100%) rename graphics/pokemon/{back_pics/sealeo_back_pic.png => sealeo/back.png} (100%) rename graphics/pokemon/{footprints/sealeo_footprint.png => sealeo/footprint.png} (100%) rename graphics/pokemon/{front_pics/sealeo_still_front_pic.png => sealeo/front.png} (100%) rename graphics/pokemon/{icons/sealeo_icon.png => sealeo/icon.png} (100%) rename graphics/pokemon/{palettes/sealeo_palette.pal => sealeo/normal.pal} (100%) rename graphics/pokemon/{palettes/sealeo_shiny_palette.pal => sealeo/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/seedot_front_pic.png => seedot/anim_front.png} (100%) rename graphics/pokemon/{back_pics/seedot_back_pic.png => seedot/back.png} (100%) rename graphics/pokemon/{footprints/seedot_footprint.png => seedot/footprint.png} (100%) rename graphics/pokemon/{front_pics/seedot_still_front_pic.png => seedot/front.png} (100%) rename graphics/pokemon/{icons/seedot_icon.png => seedot/icon.png} (100%) rename graphics/pokemon/{palettes/seedot_palette.pal => seedot/normal.pal} (100%) rename graphics/pokemon/{palettes/seedot_shiny_palette.pal => seedot/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/seel_front_pic.png => seel/anim_front.png} (100%) rename graphics/pokemon/{back_pics/seel_back_pic.png => seel/back.png} (100%) rename graphics/pokemon/{footprints/seel_footprint.png => seel/footprint.png} (100%) rename graphics/pokemon/{front_pics/seel_still_front_pic.png => seel/front.png} (100%) rename graphics/pokemon/{icons/seel_icon.png => seel/icon.png} (100%) rename graphics/pokemon/{palettes/seel_palette.pal => seel/normal.pal} (100%) rename graphics/pokemon/{palettes/seel_shiny_palette.pal => seel/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/sentret_front_pic.png => sentret/anim_front.png} (100%) rename graphics/pokemon/{back_pics/sentret_back_pic.png => sentret/back.png} (100%) rename graphics/pokemon/{footprints/sentret_footprint.png => sentret/footprint.png} (100%) rename graphics/pokemon/{front_pics/sentret_still_front_pic.png => sentret/front.png} (100%) rename graphics/pokemon/{icons/sentret_icon.png => sentret/icon.png} (100%) rename graphics/pokemon/{palettes/sentret_palette.pal => sentret/normal.pal} (100%) rename graphics/pokemon/{palettes/sentret_shiny_palette.pal => sentret/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/seviper_front_pic.png => seviper/anim_front.png} (100%) rename graphics/pokemon/{back_pics/seviper_back_pic.png => seviper/back.png} (100%) rename graphics/pokemon/{footprints/seviper_footprint.png => seviper/footprint.png} (100%) rename graphics/pokemon/{front_pics/seviper_still_front_pic.png => seviper/front.png} (100%) rename graphics/pokemon/{icons/seviper_icon.png => seviper/icon.png} (100%) rename graphics/pokemon/{palettes/seviper_palette.pal => seviper/normal.pal} (100%) rename graphics/pokemon/{palettes/seviper_shiny_palette.pal => seviper/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/sharpedo_front_pic.png => sharpedo/anim_front.png} (100%) rename graphics/pokemon/{back_pics/sharpedo_back_pic.png => sharpedo/back.png} (100%) rename graphics/pokemon/{footprints/sharpedo_footprint.png => sharpedo/footprint.png} (100%) rename graphics/pokemon/{front_pics/sharpedo_still_front_pic.png => sharpedo/front.png} (100%) rename graphics/pokemon/{icons/sharpedo_icon.png => sharpedo/icon.png} (100%) rename graphics/pokemon/{palettes/sharpedo_palette.pal => sharpedo/normal.pal} (100%) rename graphics/pokemon/{palettes/sharpedo_shiny_palette.pal => sharpedo/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/shedinja_front_pic.png => shedinja/anim_front.png} (100%) rename graphics/pokemon/{back_pics/shedinja_back_pic.png => shedinja/back.png} (100%) rename graphics/pokemon/{footprints/shedinja_footprint.png => shedinja/footprint.png} (100%) rename graphics/pokemon/{front_pics/shedinja_still_front_pic.png => shedinja/front.png} (100%) rename graphics/pokemon/{icons/shedinja_icon.png => shedinja/icon.png} (100%) rename graphics/pokemon/{palettes/shedinja_palette.pal => shedinja/normal.pal} (100%) rename graphics/pokemon/{palettes/shedinja_shiny_palette.pal => shedinja/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/shelgon_front_pic.png => shelgon/anim_front.png} (100%) rename graphics/pokemon/{back_pics/shelgon_back_pic.png => shelgon/back.png} (100%) rename graphics/pokemon/{footprints/shelgon_footprint.png => shelgon/footprint.png} (100%) rename graphics/pokemon/{front_pics/shelgon_still_front_pic.png => shelgon/front.png} (100%) rename graphics/pokemon/{icons/shelgon_icon.png => shelgon/icon.png} (100%) rename graphics/pokemon/{palettes/shelgon_palette.pal => shelgon/normal.pal} (100%) rename graphics/pokemon/{palettes/shelgon_shiny_palette.pal => shelgon/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/shellder_front_pic.png => shellder/anim_front.png} (100%) rename graphics/pokemon/{back_pics/shellder_back_pic.png => shellder/back.png} (100%) rename graphics/pokemon/{footprints/shellder_footprint.png => shellder/footprint.png} (100%) rename graphics/pokemon/{front_pics/shellder_still_front_pic.png => shellder/front.png} (100%) rename graphics/pokemon/{icons/shellder_icon.png => shellder/icon.png} (100%) rename graphics/pokemon/{palettes/shellder_palette.pal => shellder/normal.pal} (100%) rename graphics/pokemon/{palettes/shellder_shiny_palette.pal => shellder/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/shiftry_front_pic.png => shiftry/anim_front.png} (100%) rename graphics/pokemon/{back_pics/shiftry_back_pic.png => shiftry/back.png} (100%) rename graphics/pokemon/{footprints/shiftry_footprint.png => shiftry/footprint.png} (100%) rename graphics/pokemon/{front_pics/shiftry_still_front_pic.png => shiftry/front.png} (100%) rename graphics/pokemon/{icons/shiftry_icon.png => shiftry/icon.png} (100%) rename graphics/pokemon/{palettes/shiftry_palette.pal => shiftry/normal.pal} (100%) rename graphics/pokemon/{palettes/shiftry_shiny_palette.pal => shiftry/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/shroomish_front_pic.png => shroomish/anim_front.png} (100%) rename graphics/pokemon/{back_pics/shroomish_back_pic.png => shroomish/back.png} (100%) rename graphics/pokemon/{footprints/shroomish_footprint.png => shroomish/footprint.png} (100%) rename graphics/pokemon/{front_pics/shroomish_still_front_pic.png => shroomish/front.png} (100%) rename graphics/pokemon/{icons/shroomish_icon.png => shroomish/icon.png} (100%) rename graphics/pokemon/{palettes/shroomish_palette.pal => shroomish/normal.pal} (100%) rename graphics/pokemon/{palettes/shroomish_shiny_palette.pal => shroomish/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/shuckle_front_pic.png => shuckle/anim_front.png} (100%) rename graphics/pokemon/{back_pics/shuckle_back_pic.png => shuckle/back.png} (100%) rename graphics/pokemon/{footprints/shuckle_footprint.png => shuckle/footprint.png} (100%) rename graphics/pokemon/{front_pics/shuckle_still_front_pic.png => shuckle/front.png} (100%) rename graphics/pokemon/{icons/shuckle_icon.png => shuckle/icon.png} (100%) rename graphics/pokemon/{palettes/shuckle_palette.pal => shuckle/normal.pal} (100%) rename graphics/pokemon/{palettes/shuckle_shiny_palette.pal => shuckle/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/shuppet_front_pic.png => shuppet/anim_front.png} (100%) rename graphics/pokemon/{back_pics/shuppet_back_pic.png => shuppet/back.png} (100%) rename graphics/pokemon/{footprints/shuppet_footprint.png => shuppet/footprint.png} (100%) rename graphics/pokemon/{front_pics/shuppet_still_front_pic.png => shuppet/front.png} (100%) rename graphics/pokemon/{icons/shuppet_icon.png => shuppet/icon.png} (100%) rename graphics/pokemon/{palettes/shuppet_palette.pal => shuppet/normal.pal} (100%) rename graphics/pokemon/{palettes/shuppet_shiny_palette.pal => shuppet/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/silcoon_front_pic.png => silcoon/anim_front.png} (100%) rename graphics/pokemon/{back_pics/silcoon_back_pic.png => silcoon/back.png} (100%) rename graphics/pokemon/{footprints/silcoon_footprint.png => silcoon/footprint.png} (100%) rename graphics/pokemon/{front_pics/silcoon_still_front_pic.png => silcoon/front.png} (100%) rename graphics/pokemon/{icons/silcoon_icon.png => silcoon/icon.png} (100%) rename graphics/pokemon/{palettes/silcoon_palette.pal => silcoon/normal.pal} (100%) rename graphics/pokemon/{palettes/silcoon_shiny_palette.pal => silcoon/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/skarmory_front_pic.png => skarmory/anim_front.png} (100%) rename graphics/pokemon/{back_pics/skarmory_back_pic.png => skarmory/back.png} (100%) rename graphics/pokemon/{footprints/skarmory_footprint.png => skarmory/footprint.png} (100%) rename graphics/pokemon/{front_pics/skarmory_still_front_pic.png => skarmory/front.png} (100%) rename graphics/pokemon/{icons/skarmory_icon.png => skarmory/icon.png} (100%) rename graphics/pokemon/{palettes/skarmory_palette.pal => skarmory/normal.pal} (100%) rename graphics/pokemon/{palettes/skarmory_shiny_palette.pal => skarmory/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/skiploom_front_pic.png => skiploom/anim_front.png} (100%) rename graphics/pokemon/{back_pics/skiploom_back_pic.png => skiploom/back.png} (100%) rename graphics/pokemon/{footprints/skiploom_footprint.png => skiploom/footprint.png} (100%) rename graphics/pokemon/{front_pics/skiploom_still_front_pic.png => skiploom/front.png} (100%) rename graphics/pokemon/{icons/skiploom_icon.png => skiploom/icon.png} (100%) rename graphics/pokemon/{palettes/skiploom_palette.pal => skiploom/normal.pal} (100%) rename graphics/pokemon/{palettes/skiploom_shiny_palette.pal => skiploom/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/skitty_front_pic.png => skitty/anim_front.png} (100%) rename graphics/pokemon/{back_pics/skitty_back_pic.png => skitty/back.png} (100%) rename graphics/pokemon/{footprints/skitty_footprint.png => skitty/footprint.png} (100%) rename graphics/pokemon/{front_pics/skitty_still_front_pic.png => skitty/front.png} (100%) rename graphics/pokemon/{icons/skitty_icon.png => skitty/icon.png} (100%) rename graphics/pokemon/{palettes/skitty_palette.pal => skitty/normal.pal} (100%) rename graphics/pokemon/{palettes/skitty_shiny_palette.pal => skitty/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/slaking_front_pic.png => slaking/anim_front.png} (100%) rename graphics/pokemon/{back_pics/slaking_back_pic.png => slaking/back.png} (100%) rename graphics/pokemon/{footprints/slaking_footprint.png => slaking/footprint.png} (100%) rename graphics/pokemon/{front_pics/slaking_still_front_pic.png => slaking/front.png} (100%) rename graphics/pokemon/{icons/slaking_icon.png => slaking/icon.png} (100%) rename graphics/pokemon/{palettes/slaking_palette.pal => slaking/normal.pal} (100%) rename graphics/pokemon/{palettes/slaking_shiny_palette.pal => slaking/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/slakoth_front_pic.png => slakoth/anim_front.png} (100%) rename graphics/pokemon/{back_pics/slakoth_back_pic.png => slakoth/back.png} (100%) rename graphics/pokemon/{footprints/slakoth_footprint.png => slakoth/footprint.png} (100%) rename graphics/pokemon/{front_pics/slakoth_still_front_pic.png => slakoth/front.png} (100%) rename graphics/pokemon/{icons/slakoth_icon.png => slakoth/icon.png} (100%) rename graphics/pokemon/{palettes/slakoth_palette.pal => slakoth/normal.pal} (100%) rename graphics/pokemon/{palettes/slakoth_shiny_palette.pal => slakoth/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/slowbro_front_pic.png => slowbro/anim_front.png} (100%) rename graphics/pokemon/{back_pics/slowbro_back_pic.png => slowbro/back.png} (100%) rename graphics/pokemon/{footprints/slowbro_footprint.png => slowbro/footprint.png} (100%) rename graphics/pokemon/{front_pics/slowbro_still_front_pic.png => slowbro/front.png} (100%) rename graphics/pokemon/{icons/slowbro_icon.png => slowbro/icon.png} (100%) rename graphics/pokemon/{palettes/slowbro_palette.pal => slowbro/normal.pal} (100%) rename graphics/pokemon/{palettes/slowbro_shiny_palette.pal => slowbro/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/slowking_front_pic.png => slowking/anim_front.png} (100%) rename graphics/pokemon/{back_pics/slowking_back_pic.png => slowking/back.png} (100%) rename graphics/pokemon/{footprints/slowking_footprint.png => slowking/footprint.png} (100%) rename graphics/pokemon/{front_pics/slowking_still_front_pic.png => slowking/front.png} (100%) rename graphics/pokemon/{icons/slowking_icon.png => slowking/icon.png} (100%) rename graphics/pokemon/{palettes/slowking_palette.pal => slowking/normal.pal} (100%) rename graphics/pokemon/{palettes/slowking_shiny_palette.pal => slowking/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/slowpoke_front_pic.png => slowpoke/anim_front.png} (100%) rename graphics/pokemon/{back_pics/slowpoke_back_pic.png => slowpoke/back.png} (100%) rename graphics/pokemon/{footprints/slowpoke_footprint.png => slowpoke/footprint.png} (100%) rename graphics/pokemon/{front_pics/slowpoke_still_front_pic.png => slowpoke/front.png} (100%) rename graphics/pokemon/{icons/slowpoke_icon.png => slowpoke/icon.png} (100%) rename graphics/pokemon/{palettes/slowpoke_palette.pal => slowpoke/normal.pal} (100%) rename graphics/pokemon/{palettes/slowpoke_shiny_palette.pal => slowpoke/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/slugma_front_pic.png => slugma/anim_front.png} (100%) rename graphics/pokemon/{back_pics/slugma_back_pic.png => slugma/back.png} (100%) rename graphics/pokemon/{footprints/slugma_footprint.png => slugma/footprint.png} (100%) rename graphics/pokemon/{front_pics/slugma_still_front_pic.png => slugma/front.png} (100%) rename graphics/pokemon/{icons/slugma_icon.png => slugma/icon.png} (100%) rename graphics/pokemon/{palettes/slugma_palette.pal => slugma/normal.pal} (100%) rename graphics/pokemon/{palettes/slugma_shiny_palette.pal => slugma/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/smeargle_front_pic.png => smeargle/anim_front.png} (100%) rename graphics/pokemon/{back_pics/smeargle_back_pic.png => smeargle/back.png} (100%) rename graphics/pokemon/{footprints/smeargle_footprint.png => smeargle/footprint.png} (100%) rename graphics/pokemon/{front_pics/smeargle_still_front_pic.png => smeargle/front.png} (100%) rename graphics/pokemon/{icons/smeargle_icon.png => smeargle/icon.png} (100%) rename graphics/pokemon/{palettes/smeargle_palette.pal => smeargle/normal.pal} (100%) rename graphics/pokemon/{palettes/smeargle_shiny_palette.pal => smeargle/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/smoochum_front_pic.png => smoochum/anim_front.png} (100%) rename graphics/pokemon/{back_pics/smoochum_back_pic.png => smoochum/back.png} (100%) rename graphics/pokemon/{footprints/smoochum_footprint.png => smoochum/footprint.png} (100%) rename graphics/pokemon/{front_pics/smoochum_still_front_pic.png => smoochum/front.png} (100%) rename graphics/pokemon/{icons/smoochum_icon.png => smoochum/icon.png} (100%) rename graphics/pokemon/{palettes/smoochum_palette.pal => smoochum/normal.pal} (100%) rename graphics/pokemon/{palettes/smoochum_shiny_palette.pal => smoochum/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/sneasel_front_pic.png => sneasel/anim_front.png} (100%) rename graphics/pokemon/{back_pics/sneasel_back_pic.png => sneasel/back.png} (100%) rename graphics/pokemon/{footprints/sneasel_footprint.png => sneasel/footprint.png} (100%) rename graphics/pokemon/{front_pics/sneasel_still_front_pic.png => sneasel/front.png} (100%) rename graphics/pokemon/{icons/sneasel_icon.png => sneasel/icon.png} (100%) rename graphics/pokemon/{palettes/sneasel_palette.pal => sneasel/normal.pal} (100%) rename graphics/pokemon/{palettes/sneasel_shiny_palette.pal => sneasel/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/snorlax_front_pic.png => snorlax/anim_front.png} (100%) rename graphics/pokemon/{back_pics/snorlax_back_pic.png => snorlax/back.png} (100%) rename graphics/pokemon/{footprints/snorlax_footprint.png => snorlax/footprint.png} (100%) rename graphics/pokemon/{front_pics/snorlax_still_front_pic.png => snorlax/front.png} (100%) rename graphics/pokemon/{icons/snorlax_icon.png => snorlax/icon.png} (100%) rename graphics/pokemon/{palettes/snorlax_palette.pal => snorlax/normal.pal} (100%) rename graphics/pokemon/{palettes/snorlax_shiny_palette.pal => snorlax/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/snorunt_front_pic.png => snorunt/anim_front.png} (100%) rename graphics/pokemon/{back_pics/snorunt_back_pic.png => snorunt/back.png} (100%) rename graphics/pokemon/{footprints/snorunt_footprint.png => snorunt/footprint.png} (100%) rename graphics/pokemon/{front_pics/snorunt_still_front_pic.png => snorunt/front.png} (100%) rename graphics/pokemon/{icons/snorunt_icon.png => snorunt/icon.png} (100%) rename graphics/pokemon/{palettes/snorunt_palette.pal => snorunt/normal.pal} (100%) rename graphics/pokemon/{palettes/snorunt_shiny_palette.pal => snorunt/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/snubbull_front_pic.png => snubbull/anim_front.png} (100%) rename graphics/pokemon/{back_pics/snubbull_back_pic.png => snubbull/back.png} (100%) rename graphics/pokemon/{footprints/snubbull_footprint.png => snubbull/footprint.png} (100%) rename graphics/pokemon/{front_pics/snubbull_still_front_pic.png => snubbull/front.png} (100%) rename graphics/pokemon/{icons/snubbull_icon.png => snubbull/icon.png} (100%) rename graphics/pokemon/{palettes/snubbull_palette.pal => snubbull/normal.pal} (100%) rename graphics/pokemon/{palettes/snubbull_shiny_palette.pal => snubbull/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/solrock_front_pic.png => solrock/anim_front.png} (100%) rename graphics/pokemon/{back_pics/solrock_back_pic.png => solrock/back.png} (100%) rename graphics/pokemon/{footprints/solrock_footprint.png => solrock/footprint.png} (100%) rename graphics/pokemon/{front_pics/solrock_still_front_pic.png => solrock/front.png} (100%) rename graphics/pokemon/{icons/solrock_icon.png => solrock/icon.png} (100%) rename graphics/pokemon/{palettes/solrock_palette.pal => solrock/normal.pal} (100%) rename graphics/pokemon/{palettes/solrock_shiny_palette.pal => solrock/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/spearow_front_pic.png => spearow/anim_front.png} (100%) rename graphics/pokemon/{back_pics/spearow_back_pic.png => spearow/back.png} (100%) rename graphics/pokemon/{footprints/spearow_footprint.png => spearow/footprint.png} (100%) rename graphics/pokemon/{front_pics/spearow_still_front_pic.png => spearow/front.png} (100%) rename graphics/pokemon/{icons/spearow_icon.png => spearow/icon.png} (100%) rename graphics/pokemon/{palettes/spearow_palette.pal => spearow/normal.pal} (100%) rename graphics/pokemon/{palettes/spearow_shiny_palette.pal => spearow/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/spheal_front_pic.png => spheal/anim_front.png} (100%) rename graphics/pokemon/{back_pics/spheal_back_pic.png => spheal/back.png} (100%) rename graphics/pokemon/{footprints/spheal_footprint.png => spheal/footprint.png} (100%) rename graphics/pokemon/{front_pics/spheal_still_front_pic.png => spheal/front.png} (100%) rename graphics/pokemon/{icons/spheal_icon.png => spheal/icon.png} (100%) rename graphics/pokemon/{palettes/spheal_palette.pal => spheal/normal.pal} (100%) rename graphics/pokemon/{palettes/spheal_shiny_palette.pal => spheal/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/spinarak_front_pic.png => spinarak/anim_front.png} (100%) rename graphics/pokemon/{back_pics/spinarak_back_pic.png => spinarak/back.png} (100%) rename graphics/pokemon/{footprints/spinarak_footprint.png => spinarak/footprint.png} (100%) rename graphics/pokemon/{front_pics/spinarak_still_front_pic.png => spinarak/front.png} (100%) rename graphics/pokemon/{icons/spinarak_icon.png => spinarak/icon.png} (100%) rename graphics/pokemon/{palettes/spinarak_palette.pal => spinarak/normal.pal} (100%) rename graphics/pokemon/{palettes/spinarak_shiny_palette.pal => spinarak/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/spinda_front_pic.png => spinda/anim_front.png} (100%) rename graphics/pokemon/{back_pics/spinda_back_pic.png => spinda/back.png} (100%) rename graphics/pokemon/{footprints/spinda_footprint.png => spinda/footprint.png} (100%) rename graphics/pokemon/{front_pics/spinda_still_front_pic.png => spinda/front.png} (100%) rename graphics/pokemon/{icons/spinda_icon.png => spinda/icon.png} (100%) rename graphics/pokemon/{palettes/spinda_palette.pal => spinda/normal.pal} (100%) rename graphics/pokemon/{palettes/spinda_shiny_palette.pal => spinda/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/spoink_front_pic.png => spoink/anim_front.png} (100%) rename graphics/pokemon/{back_pics/spoink_back_pic.png => spoink/back.png} (100%) rename graphics/pokemon/{footprints/spoink_footprint.png => spoink/footprint.png} (100%) rename graphics/pokemon/{front_pics/spoink_still_front_pic.png => spoink/front.png} (100%) rename graphics/pokemon/{icons/spoink_icon.png => spoink/icon.png} (100%) rename graphics/pokemon/{palettes/spoink_palette.pal => spoink/normal.pal} (100%) rename graphics/pokemon/{palettes/spoink_shiny_palette.pal => spoink/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/squirtle_front_pic.png => squirtle/anim_front.png} (100%) rename graphics/pokemon/{back_pics/squirtle_back_pic.png => squirtle/back.png} (100%) rename graphics/pokemon/{footprints/squirtle_footprint.png => squirtle/footprint.png} (100%) rename graphics/pokemon/{front_pics/squirtle_still_front_pic.png => squirtle/front.png} (100%) rename graphics/pokemon/{icons/squirtle_icon.png => squirtle/icon.png} (100%) rename graphics/pokemon/{palettes/squirtle_palette.pal => squirtle/normal.pal} (100%) rename graphics/pokemon/{palettes/squirtle_shiny_palette.pal => squirtle/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/stantler_front_pic.png => stantler/anim_front.png} (100%) rename graphics/pokemon/{back_pics/stantler_back_pic.png => stantler/back.png} (100%) rename graphics/pokemon/{footprints/stantler_footprint.png => stantler/footprint.png} (100%) rename graphics/pokemon/{front_pics/stantler_still_front_pic.png => stantler/front.png} (100%) rename graphics/pokemon/{icons/stantler_icon.png => stantler/icon.png} (100%) rename graphics/pokemon/{palettes/stantler_palette.pal => stantler/normal.pal} (100%) rename graphics/pokemon/{palettes/stantler_shiny_palette.pal => stantler/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/starmie_front_pic.png => starmie/anim_front.png} (100%) rename graphics/pokemon/{back_pics/starmie_back_pic.png => starmie/back.png} (100%) rename graphics/pokemon/{footprints/starmie_footprint.png => starmie/footprint.png} (100%) rename graphics/pokemon/{front_pics/starmie_still_front_pic.png => starmie/front.png} (100%) rename graphics/pokemon/{icons/starmie_icon.png => starmie/icon.png} (100%) rename graphics/pokemon/{palettes/starmie_palette.pal => starmie/normal.pal} (100%) rename graphics/pokemon/{palettes/starmie_shiny_palette.pal => starmie/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/staryu_front_pic.png => staryu/anim_front.png} (100%) rename graphics/pokemon/{back_pics/staryu_back_pic.png => staryu/back.png} (100%) rename graphics/pokemon/{footprints/staryu_footprint.png => staryu/footprint.png} (100%) rename graphics/pokemon/{front_pics/staryu_still_front_pic.png => staryu/front.png} (100%) rename graphics/pokemon/{icons/staryu_icon.png => staryu/icon.png} (100%) rename graphics/pokemon/{palettes/staryu_palette.pal => staryu/normal.pal} (100%) rename graphics/pokemon/{palettes/staryu_shiny_palette.pal => staryu/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/steelix_front_pic.png => steelix/anim_front.png} (100%) rename graphics/pokemon/{back_pics/steelix_back_pic.png => steelix/back.png} (100%) rename graphics/pokemon/{footprints/steelix_footprint.png => steelix/footprint.png} (100%) rename graphics/pokemon/{front_pics/steelix_still_front_pic.png => steelix/front.png} (100%) rename graphics/pokemon/{icons/steelix_icon.png => steelix/icon.png} (100%) rename graphics/pokemon/{palettes/steelix_palette.pal => steelix/normal.pal} (100%) rename graphics/pokemon/{palettes/steelix_shiny_palette.pal => steelix/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/sudowoodo_front_pic.png => sudowoodo/anim_front.png} (100%) rename graphics/pokemon/{back_pics/sudowoodo_back_pic.png => sudowoodo/back.png} (100%) rename graphics/pokemon/{footprints/sudowoodo_footprint.png => sudowoodo/footprint.png} (100%) rename graphics/pokemon/{front_pics/sudowoodo_still_front_pic.png => sudowoodo/front.png} (100%) rename graphics/pokemon/{icons/sudowoodo_icon.png => sudowoodo/icon.png} (100%) rename graphics/pokemon/{palettes/sudowoodo_palette.pal => sudowoodo/normal.pal} (100%) rename graphics/pokemon/{palettes/sudowoodo_shiny_palette.pal => sudowoodo/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/suicune_front_pic.png => suicune/anim_front.png} (100%) rename graphics/pokemon/{back_pics/suicune_back_pic.png => suicune/back.png} (100%) rename graphics/pokemon/{footprints/suicune_footprint.png => suicune/footprint.png} (100%) rename graphics/pokemon/{front_pics/suicune_still_front_pic.png => suicune/front.png} (100%) rename graphics/pokemon/{icons/suicune_icon.png => suicune/icon.png} (100%) rename graphics/pokemon/{palettes/suicune_palette.pal => suicune/normal.pal} (100%) rename graphics/pokemon/{palettes/suicune_shiny_palette.pal => suicune/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/sunflora_front_pic.png => sunflora/anim_front.png} (100%) rename graphics/pokemon/{back_pics/sunflora_back_pic.png => sunflora/back.png} (100%) rename graphics/pokemon/{footprints/sunflora_footprint.png => sunflora/footprint.png} (100%) rename graphics/pokemon/{front_pics/sunflora_still_front_pic.png => sunflora/front.png} (100%) rename graphics/pokemon/{icons/sunflora_icon.png => sunflora/icon.png} (100%) rename graphics/pokemon/{palettes/sunflora_palette.pal => sunflora/normal.pal} (100%) rename graphics/pokemon/{palettes/sunflora_shiny_palette.pal => sunflora/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/sunkern_front_pic.png => sunkern/anim_front.png} (100%) rename graphics/pokemon/{back_pics/sunkern_back_pic.png => sunkern/back.png} (100%) rename graphics/pokemon/{footprints/sunkern_footprint.png => sunkern/footprint.png} (100%) rename graphics/pokemon/{front_pics/sunkern_still_front_pic.png => sunkern/front.png} (100%) rename graphics/pokemon/{icons/sunkern_icon.png => sunkern/icon.png} (100%) rename graphics/pokemon/{palettes/sunkern_palette.pal => sunkern/normal.pal} (100%) rename graphics/pokemon/{palettes/sunkern_shiny_palette.pal => sunkern/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/surskit_front_pic.png => surskit/anim_front.png} (100%) rename graphics/pokemon/{back_pics/surskit_back_pic.png => surskit/back.png} (100%) rename graphics/pokemon/{footprints/surskit_footprint.png => surskit/footprint.png} (100%) rename graphics/pokemon/{front_pics/surskit_still_front_pic.png => surskit/front.png} (100%) rename graphics/pokemon/{icons/surskit_icon.png => surskit/icon.png} (100%) rename graphics/pokemon/{palettes/surskit_palette.pal => surskit/normal.pal} (100%) rename graphics/pokemon/{palettes/surskit_shiny_palette.pal => surskit/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/swablu_front_pic.png => swablu/anim_front.png} (100%) rename graphics/pokemon/{back_pics/swablu_back_pic.png => swablu/back.png} (100%) rename graphics/pokemon/{footprints/swablu_footprint.png => swablu/footprint.png} (100%) rename graphics/pokemon/{front_pics/swablu_still_front_pic.png => swablu/front.png} (100%) rename graphics/pokemon/{icons/swablu_icon.png => swablu/icon.png} (100%) rename graphics/pokemon/{palettes/swablu_palette.pal => swablu/normal.pal} (100%) rename graphics/pokemon/{palettes/swablu_shiny_palette.pal => swablu/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/swalot_front_pic.png => swalot/anim_front.png} (100%) rename graphics/pokemon/{back_pics/swalot_back_pic.png => swalot/back.png} (100%) rename graphics/pokemon/{footprints/swalot_footprint.png => swalot/footprint.png} (100%) rename graphics/pokemon/{front_pics/swalot_still_front_pic.png => swalot/front.png} (100%) rename graphics/pokemon/{icons/swalot_icon.png => swalot/icon.png} (100%) rename graphics/pokemon/{palettes/swalot_palette.pal => swalot/normal.pal} (100%) rename graphics/pokemon/{palettes/swalot_shiny_palette.pal => swalot/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/swampert_front_pic.png => swampert/anim_front.png} (100%) rename graphics/pokemon/{back_pics/swampert_back_pic.png => swampert/back.png} (100%) rename graphics/pokemon/{footprints/swampert_footprint.png => swampert/footprint.png} (100%) rename graphics/pokemon/{front_pics/swampert_still_front_pic.png => swampert/front.png} (100%) rename graphics/pokemon/{icons/swampert_icon.png => swampert/icon.png} (100%) rename graphics/pokemon/{palettes/swampert_palette.pal => swampert/normal.pal} (100%) rename graphics/pokemon/{palettes/swampert_shiny_palette.pal => swampert/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/swellow_front_pic.png => swellow/anim_front.png} (100%) rename graphics/pokemon/{back_pics/swellow_back_pic.png => swellow/back.png} (100%) rename graphics/pokemon/{footprints/swellow_footprint.png => swellow/footprint.png} (100%) rename graphics/pokemon/{front_pics/swellow_still_front_pic.png => swellow/front.png} (100%) rename graphics/pokemon/{icons/swellow_icon.png => swellow/icon.png} (100%) rename graphics/pokemon/{palettes/swellow_palette.pal => swellow/normal.pal} (100%) rename graphics/pokemon/{palettes/swellow_shiny_palette.pal => swellow/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/swinub_front_pic.png => swinub/anim_front.png} (100%) rename graphics/pokemon/{back_pics/swinub_back_pic.png => swinub/back.png} (100%) rename graphics/pokemon/{footprints/swinub_footprint.png => swinub/footprint.png} (100%) rename graphics/pokemon/{front_pics/swinub_still_front_pic.png => swinub/front.png} (100%) rename graphics/pokemon/{icons/swinub_icon.png => swinub/icon.png} (100%) rename graphics/pokemon/{palettes/swinub_palette.pal => swinub/normal.pal} (100%) rename graphics/pokemon/{palettes/swinub_shiny_palette.pal => swinub/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/taillow_front_pic.png => taillow/anim_front.png} (100%) rename graphics/pokemon/{back_pics/taillow_back_pic.png => taillow/back.png} (100%) rename graphics/pokemon/{footprints/taillow_footprint.png => taillow/footprint.png} (100%) rename graphics/pokemon/{front_pics/taillow_still_front_pic.png => taillow/front.png} (100%) rename graphics/pokemon/{icons/taillow_icon.png => taillow/icon.png} (100%) rename graphics/pokemon/{palettes/taillow_palette.pal => taillow/normal.pal} (100%) rename graphics/pokemon/{palettes/taillow_shiny_palette.pal => taillow/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/tangela_front_pic.png => tangela/anim_front.png} (100%) rename graphics/pokemon/{back_pics/tangela_back_pic.png => tangela/back.png} (100%) rename graphics/pokemon/{footprints/tangela_footprint.png => tangela/footprint.png} (100%) rename graphics/pokemon/{front_pics/tangela_still_front_pic.png => tangela/front.png} (100%) rename graphics/pokemon/{icons/tangela_icon.png => tangela/icon.png} (100%) rename graphics/pokemon/{palettes/tangela_palette.pal => tangela/normal.pal} (100%) rename graphics/pokemon/{palettes/tangela_shiny_palette.pal => tangela/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/tauros_front_pic.png => tauros/anim_front.png} (100%) rename graphics/pokemon/{back_pics/tauros_back_pic.png => tauros/back.png} (100%) rename graphics/pokemon/{footprints/tauros_footprint.png => tauros/footprint.png} (100%) rename graphics/pokemon/{front_pics/tauros_still_front_pic.png => tauros/front.png} (100%) rename graphics/pokemon/{icons/tauros_icon.png => tauros/icon.png} (100%) rename graphics/pokemon/{palettes/tauros_palette.pal => tauros/normal.pal} (100%) rename graphics/pokemon/{palettes/tauros_shiny_palette.pal => tauros/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/teddiursa_front_pic.png => teddiursa/anim_front.png} (100%) rename graphics/pokemon/{back_pics/teddiursa_back_pic.png => teddiursa/back.png} (100%) rename graphics/pokemon/{footprints/teddiursa_footprint.png => teddiursa/footprint.png} (100%) rename graphics/pokemon/{front_pics/teddiursa_still_front_pic.png => teddiursa/front.png} (100%) rename graphics/pokemon/{icons/teddiursa_icon.png => teddiursa/icon.png} (100%) rename graphics/pokemon/{palettes/teddiursa_palette.pal => teddiursa/normal.pal} (100%) rename graphics/pokemon/{palettes/teddiursa_shiny_palette.pal => teddiursa/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/tentacool_front_pic.png => tentacool/anim_front.png} (100%) rename graphics/pokemon/{back_pics/tentacool_back_pic.png => tentacool/back.png} (100%) rename graphics/pokemon/{footprints/tentacool_footprint.png => tentacool/footprint.png} (100%) rename graphics/pokemon/{front_pics/tentacool_still_front_pic.png => tentacool/front.png} (100%) rename graphics/pokemon/{icons/tentacool_icon.png => tentacool/icon.png} (100%) rename graphics/pokemon/{palettes/tentacool_palette.pal => tentacool/normal.pal} (100%) rename graphics/pokemon/{palettes/tentacool_shiny_palette.pal => tentacool/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/tentacruel_front_pic.png => tentacruel/anim_front.png} (100%) rename graphics/pokemon/{back_pics/tentacruel_back_pic.png => tentacruel/back.png} (100%) rename graphics/pokemon/{footprints/tentacruel_footprint.png => tentacruel/footprint.png} (100%) rename graphics/pokemon/{front_pics/tentacruel_still_front_pic.png => tentacruel/front.png} (100%) rename graphics/pokemon/{icons/tentacruel_icon.png => tentacruel/icon.png} (100%) rename graphics/pokemon/{palettes/tentacruel_palette.pal => tentacruel/normal.pal} (100%) rename graphics/pokemon/{palettes/tentacruel_shiny_palette.pal => tentacruel/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/togepi_front_pic.png => togepi/anim_front.png} (100%) rename graphics/pokemon/{back_pics/togepi_back_pic.png => togepi/back.png} (100%) rename graphics/pokemon/{footprints/togepi_footprint.png => togepi/footprint.png} (100%) rename graphics/pokemon/{front_pics/togepi_still_front_pic.png => togepi/front.png} (100%) rename graphics/pokemon/{icons/togepi_icon.png => togepi/icon.png} (100%) rename graphics/pokemon/{palettes/togepi_palette.pal => togepi/normal.pal} (100%) rename graphics/pokemon/{palettes/togepi_shiny_palette.pal => togepi/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/togetic_front_pic.png => togetic/anim_front.png} (100%) rename graphics/pokemon/{back_pics/togetic_back_pic.png => togetic/back.png} (100%) rename graphics/pokemon/{footprints/togetic_footprint.png => togetic/footprint.png} (100%) rename graphics/pokemon/{front_pics/togetic_still_front_pic.png => togetic/front.png} (100%) rename graphics/pokemon/{icons/togetic_icon.png => togetic/icon.png} (100%) rename graphics/pokemon/{palettes/togetic_palette.pal => togetic/normal.pal} (100%) rename graphics/pokemon/{palettes/togetic_shiny_palette.pal => togetic/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/torchic_front_pic.png => torchic/anim_front.png} (100%) rename graphics/pokemon/{back_pics/torchic_back_pic.png => torchic/back.png} (100%) rename graphics/pokemon/{footprints/torchic_footprint.png => torchic/footprint.png} (100%) rename graphics/pokemon/{front_pics/torchic_still_front_pic.png => torchic/front.png} (100%) rename graphics/pokemon/{icons/torchic_icon.png => torchic/icon.png} (100%) rename graphics/pokemon/{palettes/torchic_palette.pal => torchic/normal.pal} (100%) rename graphics/pokemon/{palettes/torchic_shiny_palette.pal => torchic/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/torkoal_front_pic.png => torkoal/anim_front.png} (100%) rename graphics/pokemon/{back_pics/torkoal_back_pic.png => torkoal/back.png} (100%) rename graphics/pokemon/{footprints/torkoal_footprint.png => torkoal/footprint.png} (100%) rename graphics/pokemon/{front_pics/torkoal_still_front_pic.png => torkoal/front.png} (100%) rename graphics/pokemon/{icons/torkoal_icon.png => torkoal/icon.png} (100%) rename graphics/pokemon/{palettes/torkoal_palette.pal => torkoal/normal.pal} (100%) rename graphics/pokemon/{palettes/torkoal_shiny_palette.pal => torkoal/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/totodile_front_pic.png => totodile/anim_front.png} (100%) rename graphics/pokemon/{back_pics/totodile_back_pic.png => totodile/back.png} (100%) rename graphics/pokemon/{footprints/totodile_footprint.png => totodile/footprint.png} (100%) rename graphics/pokemon/{front_pics/totodile_still_front_pic.png => totodile/front.png} (100%) rename graphics/pokemon/{icons/totodile_icon.png => totodile/icon.png} (100%) rename graphics/pokemon/{palettes/totodile_palette.pal => totodile/normal.pal} (100%) rename graphics/pokemon/{palettes/totodile_shiny_palette.pal => totodile/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/trapinch_front_pic.png => trapinch/anim_front.png} (100%) rename graphics/pokemon/{back_pics/trapinch_back_pic.png => trapinch/back.png} (100%) rename graphics/pokemon/{footprints/trapinch_footprint.png => trapinch/footprint.png} (100%) rename graphics/pokemon/{front_pics/trapinch_still_front_pic.png => trapinch/front.png} (100%) rename graphics/pokemon/{icons/trapinch_icon.png => trapinch/icon.png} (100%) rename graphics/pokemon/{palettes/trapinch_palette.pal => trapinch/normal.pal} (100%) rename graphics/pokemon/{palettes/trapinch_shiny_palette.pal => trapinch/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/treecko_front_pic.png => treecko/anim_front.png} (100%) rename graphics/pokemon/{back_pics/treecko_back_pic.png => treecko/back.png} (100%) rename graphics/pokemon/{footprints/treecko_footprint.png => treecko/footprint.png} (100%) rename graphics/pokemon/{front_pics/treecko_still_front_pic.png => treecko/front.png} (100%) rename graphics/pokemon/{icons/treecko_icon.png => treecko/icon.png} (100%) rename graphics/pokemon/{palettes/treecko_palette.pal => treecko/normal.pal} (100%) rename graphics/pokemon/{palettes/treecko_shiny_palette.pal => treecko/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/tropius_front_pic.png => tropius/anim_front.png} (100%) rename graphics/pokemon/{back_pics/tropius_back_pic.png => tropius/back.png} (100%) rename graphics/pokemon/{footprints/tropius_footprint.png => tropius/footprint.png} (100%) rename graphics/pokemon/{front_pics/tropius_still_front_pic.png => tropius/front.png} (100%) rename graphics/pokemon/{icons/tropius_icon.png => tropius/icon.png} (100%) rename graphics/pokemon/{palettes/tropius_palette.pal => tropius/normal.pal} (100%) rename graphics/pokemon/{palettes/tropius_shiny_palette.pal => tropius/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/typhlosion_front_pic.png => typhlosion/anim_front.png} (100%) rename graphics/pokemon/{back_pics/typhlosion_back_pic.png => typhlosion/back.png} (100%) rename graphics/pokemon/{footprints/typhlosion_footprint.png => typhlosion/footprint.png} (100%) rename graphics/pokemon/{front_pics/typhlosion_still_front_pic.png => typhlosion/front.png} (100%) rename graphics/pokemon/{icons/typhlosion_icon.png => typhlosion/icon.png} (100%) rename graphics/pokemon/{palettes/typhlosion_palette.pal => typhlosion/normal.pal} (100%) rename graphics/pokemon/{palettes/typhlosion_shiny_palette.pal => typhlosion/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/tyranitar_front_pic.png => tyranitar/anim_front.png} (100%) rename graphics/pokemon/{back_pics/tyranitar_back_pic.png => tyranitar/back.png} (100%) rename graphics/pokemon/{footprints/tyranitar_footprint.png => tyranitar/footprint.png} (100%) rename graphics/pokemon/{front_pics/tyranitar_still_front_pic.png => tyranitar/front.png} (100%) rename graphics/pokemon/{icons/tyranitar_icon.png => tyranitar/icon.png} (100%) rename graphics/pokemon/{palettes/tyranitar_palette.pal => tyranitar/normal.pal} (100%) rename graphics/pokemon/{palettes/tyranitar_shiny_palette.pal => tyranitar/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/tyrogue_front_pic.png => tyrogue/anim_front.png} (100%) rename graphics/pokemon/{back_pics/tyrogue_back_pic.png => tyrogue/back.png} (100%) rename graphics/pokemon/{footprints/tyrogue_footprint.png => tyrogue/footprint.png} (100%) rename graphics/pokemon/{front_pics/tyrogue_still_front_pic.png => tyrogue/front.png} (100%) rename graphics/pokemon/{icons/tyrogue_icon.png => tyrogue/icon.png} (100%) rename graphics/pokemon/{palettes/tyrogue_palette.pal => tyrogue/normal.pal} (100%) rename graphics/pokemon/{palettes/tyrogue_shiny_palette.pal => tyrogue/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/umbreon_front_pic.png => umbreon/anim_front.png} (100%) rename graphics/pokemon/{back_pics/umbreon_back_pic.png => umbreon/back.png} (100%) rename graphics/pokemon/{footprints/umbreon_footprint.png => umbreon/footprint.png} (100%) rename graphics/pokemon/{front_pics/umbreon_still_front_pic.png => umbreon/front.png} (100%) rename graphics/pokemon/{icons/umbreon_icon.png => umbreon/icon.png} (100%) rename graphics/pokemon/{palettes/umbreon_palette.pal => umbreon/normal.pal} (100%) rename graphics/pokemon/{palettes/umbreon_shiny_palette.pal => umbreon/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/unown_a_front_pic.png => unown/anim_front_a.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_b_front_pic.png => unown/anim_front_b.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_c_front_pic.png => unown/anim_front_c.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_d_front_pic.png => unown/anim_front_d.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_e_front_pic.png => unown/anim_front_e.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_exclamation_mark_front_pic.png => unown/anim_front_exclamation_mark.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_f_front_pic.png => unown/anim_front_f.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_g_front_pic.png => unown/anim_front_g.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_h_front_pic.png => unown/anim_front_h.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_i_front_pic.png => unown/anim_front_i.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_j_front_pic.png => unown/anim_front_j.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_k_front_pic.png => unown/anim_front_k.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_l_front_pic.png => unown/anim_front_l.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_m_front_pic.png => unown/anim_front_m.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_n_front_pic.png => unown/anim_front_n.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_o_front_pic.png => unown/anim_front_o.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_p_front_pic.png => unown/anim_front_p.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_q_front_pic.png => unown/anim_front_q.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_question_mark_front_pic.png => unown/anim_front_question_mark.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_r_front_pic.png => unown/anim_front_r.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_s_front_pic.png => unown/anim_front_s.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_t_front_pic.png => unown/anim_front_t.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_u_front_pic.png => unown/anim_front_u.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_v_front_pic.png => unown/anim_front_v.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_w_front_pic.png => unown/anim_front_w.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_x_front_pic.png => unown/anim_front_x.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_y_front_pic.png => unown/anim_front_y.png} (100%) rename graphics/pokemon/{anim_front_pics/unown_z_front_pic.png => unown/anim_front_z.png} (100%) rename graphics/pokemon/{back_pics/unown_a_back_pic.png => unown/back_a.png} (100%) rename graphics/pokemon/{back_pics/unown_b_back_pic.png => unown/back_b.png} (100%) rename graphics/pokemon/{back_pics/unown_c_back_pic.png => unown/back_c.png} (100%) rename graphics/pokemon/{back_pics/unown_d_back_pic.png => unown/back_d.png} (100%) rename graphics/pokemon/{back_pics/unown_e_back_pic.png => unown/back_e.png} (100%) rename graphics/pokemon/{back_pics/unown_exclamation_mark_back_pic.png => unown/back_exclamation_mark.png} (100%) rename graphics/pokemon/{back_pics/unown_f_back_pic.png => unown/back_f.png} (100%) rename graphics/pokemon/{back_pics/unown_g_back_pic.png => unown/back_g.png} (100%) rename graphics/pokemon/{back_pics/unown_h_back_pic.png => unown/back_h.png} (100%) rename graphics/pokemon/{back_pics/unown_i_back_pic.png => unown/back_i.png} (100%) rename graphics/pokemon/{back_pics/unown_j_back_pic.png => unown/back_j.png} (100%) rename graphics/pokemon/{back_pics/unown_k_back_pic.png => unown/back_k.png} (100%) rename graphics/pokemon/{back_pics/unown_l_back_pic.png => unown/back_l.png} (100%) rename graphics/pokemon/{back_pics/unown_m_back_pic.png => unown/back_m.png} (100%) rename graphics/pokemon/{back_pics/unown_n_back_pic.png => unown/back_n.png} (100%) rename graphics/pokemon/{back_pics/unown_o_back_pic.png => unown/back_o.png} (100%) rename graphics/pokemon/{back_pics/unown_p_back_pic.png => unown/back_p.png} (100%) rename graphics/pokemon/{back_pics/unown_q_back_pic.png => unown/back_q.png} (100%) rename graphics/pokemon/{back_pics/unown_question_mark_back_pic.png => unown/back_question_mark.png} (100%) rename graphics/pokemon/{back_pics/unown_r_back_pic.png => unown/back_r.png} (100%) rename graphics/pokemon/{back_pics/unown_s_back_pic.png => unown/back_s.png} (100%) rename graphics/pokemon/{back_pics/unown_t_back_pic.png => unown/back_t.png} (100%) rename graphics/pokemon/{back_pics/unown_u_back_pic.png => unown/back_u.png} (100%) rename graphics/pokemon/{back_pics/unown_v_back_pic.png => unown/back_v.png} (100%) rename graphics/pokemon/{back_pics/unown_w_back_pic.png => unown/back_w.png} (100%) rename graphics/pokemon/{back_pics/unown_x_back_pic.png => unown/back_x.png} (100%) rename graphics/pokemon/{back_pics/unown_y_back_pic.png => unown/back_y.png} (100%) rename graphics/pokemon/{back_pics/unown_z_back_pic.png => unown/back_z.png} (100%) rename graphics/pokemon/{footprints/unown_footprint.png => unown/footprint.png} (100%) rename graphics/pokemon/{front_pics/unown_a_still_front_pic.png => unown/front_a.png} (100%) rename graphics/pokemon/{front_pics/unown_b_still_front_pic.png => unown/front_b.png} (100%) rename graphics/pokemon/{front_pics/unown_c_still_front_pic.png => unown/front_c.png} (100%) rename graphics/pokemon/{front_pics/unown_d_still_front_pic.png => unown/front_d.png} (100%) rename graphics/pokemon/{front_pics/unown_e_still_front_pic.png => unown/front_e.png} (100%) rename graphics/pokemon/{front_pics/unown_exclamation_mark_still_front_pic.png => unown/front_exclamation_mark.png} (100%) rename graphics/pokemon/{front_pics/unown_f_still_front_pic.png => unown/front_f.png} (100%) rename graphics/pokemon/{front_pics/unown_g_still_front_pic.png => unown/front_g.png} (100%) rename graphics/pokemon/{front_pics/unown_h_still_front_pic.png => unown/front_h.png} (100%) rename graphics/pokemon/{front_pics/unown_i_still_front_pic.png => unown/front_i.png} (100%) rename graphics/pokemon/{front_pics/unown_j_still_front_pic.png => unown/front_j.png} (100%) rename graphics/pokemon/{front_pics/unown_k_still_front_pic.png => unown/front_k.png} (100%) rename graphics/pokemon/{front_pics/unown_l_still_front_pic.png => unown/front_l.png} (100%) rename graphics/pokemon/{front_pics/unown_m_still_front_pic.png => unown/front_m.png} (100%) rename graphics/pokemon/{front_pics/unown_n_still_front_pic.png => unown/front_n.png} (100%) rename graphics/pokemon/{front_pics/unown_o_still_front_pic.png => unown/front_o.png} (100%) rename graphics/pokemon/{front_pics/unown_p_still_front_pic.png => unown/front_p.png} (100%) rename graphics/pokemon/{front_pics/unown_q_still_front_pic.png => unown/front_q.png} (100%) rename graphics/pokemon/{front_pics/unown_question_mark_still_front_pic.png => unown/front_question_mark.png} (100%) rename graphics/pokemon/{front_pics/unown_r_still_front_pic.png => unown/front_r.png} (100%) rename graphics/pokemon/{front_pics/unown_s_still_front_pic.png => unown/front_s.png} (100%) rename graphics/pokemon/{front_pics/unown_t_still_front_pic.png => unown/front_t.png} (100%) rename graphics/pokemon/{front_pics/unown_u_still_front_pic.png => unown/front_u.png} (100%) rename graphics/pokemon/{front_pics/unown_v_still_front_pic.png => unown/front_v.png} (100%) rename graphics/pokemon/{front_pics/unown_w_still_front_pic.png => unown/front_w.png} (100%) rename graphics/pokemon/{front_pics/unown_x_still_front_pic.png => unown/front_x.png} (100%) rename graphics/pokemon/{front_pics/unown_y_still_front_pic.png => unown/front_y.png} (100%) rename graphics/pokemon/{front_pics/unown_z_still_front_pic.png => unown/front_z.png} (100%) rename graphics/pokemon/{icons/unown_a_icon.png => unown/icon_a.png} (100%) rename graphics/pokemon/{icons/unown_B_icon.png => unown/icon_b.png} (100%) rename graphics/pokemon/{icons/unown_C_icon.png => unown/icon_c.png} (100%) rename graphics/pokemon/{icons/unown_D_icon.png => unown/icon_d.png} (100%) rename graphics/pokemon/{icons/unown_E_icon.png => unown/icon_e.png} (100%) rename graphics/pokemon/{icons/unown_exclamation_mark_icon.png => unown/icon_exclamation_mark.png} (100%) rename graphics/pokemon/{icons/unown_F_icon.png => unown/icon_f.png} (100%) rename graphics/pokemon/{icons/unown_G_icon.png => unown/icon_g.png} (100%) rename graphics/pokemon/{icons/unown_H_icon.png => unown/icon_h.png} (100%) rename graphics/pokemon/{icons/unown_I_icon.png => unown/icon_i.png} (100%) rename graphics/pokemon/{icons/unown_J_icon.png => unown/icon_j.png} (100%) rename graphics/pokemon/{icons/unown_K_icon.png => unown/icon_k.png} (100%) rename graphics/pokemon/{icons/unown_L_icon.png => unown/icon_l.png} (100%) rename graphics/pokemon/{icons/unown_M_icon.png => unown/icon_m.png} (100%) rename graphics/pokemon/{icons/unown_N_icon.png => unown/icon_n.png} (100%) rename graphics/pokemon/{icons/unown_O_icon.png => unown/icon_o.png} (100%) rename graphics/pokemon/{icons/unown_P_icon.png => unown/icon_p.png} (100%) rename graphics/pokemon/{icons/unown_Q_icon.png => unown/icon_q.png} (100%) rename graphics/pokemon/{icons/unown_question_mark_icon.png => unown/icon_question_mark.png} (100%) rename graphics/pokemon/{icons/unown_R_icon.png => unown/icon_r.png} (100%) rename graphics/pokemon/{icons/unown_S_icon.png => unown/icon_s.png} (100%) rename graphics/pokemon/{icons/unown_T_icon.png => unown/icon_t.png} (100%) rename graphics/pokemon/{icons/unown_U_icon.png => unown/icon_u.png} (100%) rename graphics/pokemon/{icons/unown_V_icon.png => unown/icon_v.png} (100%) rename graphics/pokemon/{icons/unown_W_icon.png => unown/icon_w.png} (100%) rename graphics/pokemon/{icons/unown_X_icon.png => unown/icon_x.png} (100%) rename graphics/pokemon/{icons/unown_Y_icon.png => unown/icon_y.png} (100%) rename graphics/pokemon/{icons/unown_Z_icon.png => unown/icon_z.png} (100%) rename graphics/pokemon/{palettes/unown_palette.pal => unown/normal.pal} (100%) rename graphics/pokemon/{palettes/unown_shiny_palette.pal => unown/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/ursaring_front_pic.png => ursaring/anim_front.png} (100%) rename graphics/pokemon/{back_pics/ursaring_back_pic.png => ursaring/back.png} (100%) rename graphics/pokemon/{footprints/ursaring_footprint.png => ursaring/footprint.png} (100%) rename graphics/pokemon/{front_pics/ursaring_still_front_pic.png => ursaring/front.png} (100%) rename graphics/pokemon/{icons/ursaring_icon.png => ursaring/icon.png} (100%) rename graphics/pokemon/{palettes/ursaring_palette.pal => ursaring/normal.pal} (100%) rename graphics/pokemon/{palettes/ursaring_shiny_palette.pal => ursaring/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/vaporeon_front_pic.png => vaporeon/anim_front.png} (100%) rename graphics/pokemon/{back_pics/vaporeon_back_pic.png => vaporeon/back.png} (100%) rename graphics/pokemon/{footprints/vaporeon_footprint.png => vaporeon/footprint.png} (100%) rename graphics/pokemon/{front_pics/vaporeon_still_front_pic.png => vaporeon/front.png} (100%) rename graphics/pokemon/{icons/vaporeon_icon.png => vaporeon/icon.png} (100%) rename graphics/pokemon/{palettes/vaporeon_palette.pal => vaporeon/normal.pal} (100%) rename graphics/pokemon/{palettes/vaporeon_shiny_palette.pal => vaporeon/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/venomoth_front_pic.png => venomoth/anim_front.png} (100%) rename graphics/pokemon/{back_pics/venomoth_back_pic.png => venomoth/back.png} (100%) rename graphics/pokemon/{footprints/venomoth_footprint.png => venomoth/footprint.png} (100%) rename graphics/pokemon/{front_pics/venomoth_still_front_pic.png => venomoth/front.png} (100%) rename graphics/pokemon/{icons/venomoth_icon.png => venomoth/icon.png} (100%) rename graphics/pokemon/{palettes/venomoth_palette.pal => venomoth/normal.pal} (100%) rename graphics/pokemon/{palettes/venomoth_shiny_palette.pal => venomoth/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/venonat_front_pic.png => venonat/anim_front.png} (100%) rename graphics/pokemon/{back_pics/venonat_back_pic.png => venonat/back.png} (100%) rename graphics/pokemon/{footprints/venonat_footprint.png => venonat/footprint.png} (100%) rename graphics/pokemon/{front_pics/venonat_still_front_pic.png => venonat/front.png} (100%) rename graphics/pokemon/{icons/venonat_icon.png => venonat/icon.png} (100%) rename graphics/pokemon/{palettes/venonat_palette.pal => venonat/normal.pal} (100%) rename graphics/pokemon/{palettes/venonat_shiny_palette.pal => venonat/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/venusaur_front_pic.png => venusaur/anim_front.png} (100%) rename graphics/pokemon/{back_pics/venusaur_back_pic.png => venusaur/back.png} (100%) rename graphics/pokemon/{footprints/venusaur_footprint.png => venusaur/footprint.png} (100%) rename graphics/pokemon/{front_pics/venusaur_still_front_pic.png => venusaur/front.png} (100%) rename graphics/pokemon/{icons/venusaur_icon.png => venusaur/icon.png} (100%) rename graphics/pokemon/{palettes/venusaur_palette.pal => venusaur/normal.pal} (100%) rename graphics/pokemon/{palettes/venusaur_shiny_palette.pal => venusaur/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/vibrava_front_pic.png => vibrava/anim_front.png} (100%) rename graphics/pokemon/{back_pics/vibrava_back_pic.png => vibrava/back.png} (100%) rename graphics/pokemon/{footprints/vibrava_footprint.png => vibrava/footprint.png} (100%) rename graphics/pokemon/{front_pics/vibrava_still_front_pic.png => vibrava/front.png} (100%) rename graphics/pokemon/{icons/vibrava_icon.png => vibrava/icon.png} (100%) rename graphics/pokemon/{palettes/vibrava_palette.pal => vibrava/normal.pal} (100%) rename graphics/pokemon/{palettes/vibrava_shiny_palette.pal => vibrava/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/victreebel_front_pic.png => victreebel/anim_front.png} (100%) rename graphics/pokemon/{back_pics/victreebel_back_pic.png => victreebel/back.png} (100%) rename graphics/pokemon/{footprints/victreebel_footprint.png => victreebel/footprint.png} (100%) rename graphics/pokemon/{front_pics/victreebel_still_front_pic.png => victreebel/front.png} (100%) rename graphics/pokemon/{icons/victreebel_icon.png => victreebel/icon.png} (100%) rename graphics/pokemon/{palettes/victreebel_palette.pal => victreebel/normal.pal} (100%) rename graphics/pokemon/{palettes/victreebel_shiny_palette.pal => victreebel/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/vigoroth_front_pic.png => vigoroth/anim_front.png} (100%) rename graphics/pokemon/{back_pics/vigoroth_back_pic.png => vigoroth/back.png} (100%) rename graphics/pokemon/{footprints/vigoroth_footprint.png => vigoroth/footprint.png} (100%) rename graphics/pokemon/{front_pics/vigoroth_still_front_pic.png => vigoroth/front.png} (100%) rename graphics/pokemon/{icons/vigoroth_icon.png => vigoroth/icon.png} (100%) rename graphics/pokemon/{palettes/vigoroth_palette.pal => vigoroth/normal.pal} (100%) rename graphics/pokemon/{palettes/vigoroth_shiny_palette.pal => vigoroth/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/vileplume_front_pic.png => vileplume/anim_front.png} (100%) rename graphics/pokemon/{back_pics/vileplume_back_pic.png => vileplume/back.png} (100%) rename graphics/pokemon/{footprints/vileplume_footprint.png => vileplume/footprint.png} (100%) rename graphics/pokemon/{front_pics/vileplume_still_front_pic.png => vileplume/front.png} (100%) rename graphics/pokemon/{icons/vileplume_icon.png => vileplume/icon.png} (100%) rename graphics/pokemon/{palettes/vileplume_palette.pal => vileplume/normal.pal} (100%) rename graphics/pokemon/{palettes/vileplume_shiny_palette.pal => vileplume/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/volbeat_front_pic.png => volbeat/anim_front.png} (100%) rename graphics/pokemon/{back_pics/volbeat_back_pic.png => volbeat/back.png} (100%) rename graphics/pokemon/{footprints/volbeat_footprint.png => volbeat/footprint.png} (100%) rename graphics/pokemon/{front_pics/volbeat_still_front_pic.png => volbeat/front.png} (100%) rename graphics/pokemon/{icons/volbeat_icon.png => volbeat/icon.png} (100%) rename graphics/pokemon/{palettes/volbeat_palette.pal => volbeat/normal.pal} (100%) rename graphics/pokemon/{palettes/volbeat_shiny_palette.pal => volbeat/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/voltorb_front_pic.png => voltorb/anim_front.png} (100%) rename graphics/pokemon/{back_pics/voltorb_back_pic.png => voltorb/back.png} (100%) rename graphics/pokemon/{footprints/voltorb_footprint.png => voltorb/footprint.png} (100%) rename graphics/pokemon/{front_pics/voltorb_still_front_pic.png => voltorb/front.png} (100%) rename graphics/pokemon/{icons/voltorb_icon.png => voltorb/icon.png} (100%) rename graphics/pokemon/{palettes/voltorb_palette.pal => voltorb/normal.pal} (100%) rename graphics/pokemon/{palettes/voltorb_shiny_palette.pal => voltorb/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/vulpix_front_pic.png => vulpix/anim_front.png} (100%) rename graphics/pokemon/{back_pics/vulpix_back_pic.png => vulpix/back.png} (100%) rename graphics/pokemon/{footprints/vulpix_footprint.png => vulpix/footprint.png} (100%) rename graphics/pokemon/{front_pics/vulpix_still_front_pic.png => vulpix/front.png} (100%) rename graphics/pokemon/{icons/vulpix_icon.png => vulpix/icon.png} (100%) rename graphics/pokemon/{palettes/vulpix_palette.pal => vulpix/normal.pal} (100%) rename graphics/pokemon/{palettes/vulpix_shiny_palette.pal => vulpix/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/wailmer_front_pic.png => wailmer/anim_front.png} (100%) rename graphics/pokemon/{back_pics/wailmer_back_pic.png => wailmer/back.png} (100%) rename graphics/pokemon/{footprints/wailmer_footprint.png => wailmer/footprint.png} (100%) rename graphics/pokemon/{front_pics/wailmer_still_front_pic.png => wailmer/front.png} (100%) rename graphics/pokemon/{icons/wailmer_icon.png => wailmer/icon.png} (100%) rename graphics/pokemon/{palettes/wailmer_palette.pal => wailmer/normal.pal} (100%) rename graphics/pokemon/{palettes/wailmer_shiny_palette.pal => wailmer/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/wailord_front_pic.png => wailord/anim_front.png} (100%) rename graphics/pokemon/{back_pics/wailord_back_pic.png => wailord/back.png} (100%) rename graphics/pokemon/{footprints/wailord_footprint.png => wailord/footprint.png} (100%) rename graphics/pokemon/{front_pics/wailord_still_front_pic.png => wailord/front.png} (100%) rename graphics/pokemon/{icons/wailord_icon.png => wailord/icon.png} (100%) rename graphics/pokemon/{palettes/wailord_palette.pal => wailord/normal.pal} (100%) rename graphics/pokemon/{palettes/wailord_shiny_palette.pal => wailord/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/walrein_front_pic.png => walrein/anim_front.png} (100%) rename graphics/pokemon/{back_pics/walrein_back_pic.png => walrein/back.png} (100%) rename graphics/pokemon/{footprints/walrein_footprint.png => walrein/footprint.png} (100%) rename graphics/pokemon/{front_pics/walrein_still_front_pic.png => walrein/front.png} (100%) rename graphics/pokemon/{icons/walrein_icon.png => walrein/icon.png} (100%) rename graphics/pokemon/{palettes/walrein_palette.pal => walrein/normal.pal} (100%) rename graphics/pokemon/{palettes/walrein_shiny_palette.pal => walrein/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/wartortle_front_pic.png => wartortle/anim_front.png} (100%) rename graphics/pokemon/{back_pics/wartortle_back_pic.png => wartortle/back.png} (100%) rename graphics/pokemon/{footprints/wartortle_footprint.png => wartortle/footprint.png} (100%) rename graphics/pokemon/{front_pics/wartortle_still_front_pic.png => wartortle/front.png} (100%) rename graphics/pokemon/{icons/wartortle_icon.png => wartortle/icon.png} (100%) rename graphics/pokemon/{palettes/wartortle_palette.pal => wartortle/normal.pal} (100%) rename graphics/pokemon/{palettes/wartortle_shiny_palette.pal => wartortle/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/weedle_front_pic.png => weedle/anim_front.png} (100%) rename graphics/pokemon/{back_pics/weedle_back_pic.png => weedle/back.png} (100%) rename graphics/pokemon/{footprints/weedle_footprint.png => weedle/footprint.png} (100%) rename graphics/pokemon/{front_pics/weedle_still_front_pic.png => weedle/front.png} (100%) rename graphics/pokemon/{icons/weedle_icon.png => weedle/icon.png} (100%) rename graphics/pokemon/{palettes/weedle_palette.pal => weedle/normal.pal} (100%) rename graphics/pokemon/{palettes/weedle_shiny_palette.pal => weedle/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/weepinbell_front_pic.png => weepinbell/anim_front.png} (100%) rename graphics/pokemon/{back_pics/weepinbell_back_pic.png => weepinbell/back.png} (100%) rename graphics/pokemon/{footprints/weepinbell_footprint.png => weepinbell/footprint.png} (100%) rename graphics/pokemon/{front_pics/weepinbell_still_front_pic.png => weepinbell/front.png} (100%) rename graphics/pokemon/{icons/weepinbell_icon.png => weepinbell/icon.png} (100%) rename graphics/pokemon/{palettes/weepinbell_palette.pal => weepinbell/normal.pal} (100%) rename graphics/pokemon/{palettes/weepinbell_shiny_palette.pal => weepinbell/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/weezing_front_pic.png => weezing/anim_front.png} (100%) rename graphics/pokemon/{back_pics/weezing_back_pic.png => weezing/back.png} (100%) rename graphics/pokemon/{footprints/weezing_footprint.png => weezing/footprint.png} (100%) rename graphics/pokemon/{front_pics/weezing_still_front_pic.png => weezing/front.png} (100%) rename graphics/pokemon/{icons/weezing_icon.png => weezing/icon.png} (100%) rename graphics/pokemon/{palettes/weezing_palette.pal => weezing/normal.pal} (100%) rename graphics/pokemon/{palettes/weezing_shiny_palette.pal => weezing/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/whiscash_front_pic.png => whiscash/anim_front.png} (100%) rename graphics/pokemon/{back_pics/whiscash_back_pic.png => whiscash/back.png} (100%) rename graphics/pokemon/{footprints/whiscash_footprint.png => whiscash/footprint.png} (100%) rename graphics/pokemon/{front_pics/whiscash_still_front_pic.png => whiscash/front.png} (100%) rename graphics/pokemon/{icons/whiscash_icon.png => whiscash/icon.png} (100%) rename graphics/pokemon/{palettes/whiscash_palette.pal => whiscash/normal.pal} (100%) rename graphics/pokemon/{palettes/whiscash_shiny_palette.pal => whiscash/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/whismur_front_pic.png => whismur/anim_front.png} (100%) rename graphics/pokemon/{back_pics/whismur_back_pic.png => whismur/back.png} (100%) rename graphics/pokemon/{footprints/whismur_footprint.png => whismur/footprint.png} (100%) rename graphics/pokemon/{front_pics/whismur_still_front_pic.png => whismur/front.png} (100%) rename graphics/pokemon/{icons/whismur_icon.png => whismur/icon.png} (100%) rename graphics/pokemon/{palettes/whismur_palette.pal => whismur/normal.pal} (100%) rename graphics/pokemon/{palettes/whismur_shiny_palette.pal => whismur/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/wigglytuff_front_pic.png => wigglytuff/anim_front.png} (100%) rename graphics/pokemon/{back_pics/wigglytuff_back_pic.png => wigglytuff/back.png} (100%) rename graphics/pokemon/{footprints/wigglytuff_footprint.png => wigglytuff/footprint.png} (100%) rename graphics/pokemon/{front_pics/wigglytuff_still_front_pic.png => wigglytuff/front.png} (100%) rename graphics/pokemon/{icons/wigglytuff_icon.png => wigglytuff/icon.png} (100%) rename graphics/pokemon/{palettes/wigglytuff_palette.pal => wigglytuff/normal.pal} (100%) rename graphics/pokemon/{palettes/wigglytuff_shiny_palette.pal => wigglytuff/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/wingull_front_pic.png => wingull/anim_front.png} (100%) rename graphics/pokemon/{back_pics/wingull_back_pic.png => wingull/back.png} (100%) rename graphics/pokemon/{footprints/wingull_footprint.png => wingull/footprint.png} (100%) rename graphics/pokemon/{front_pics/wingull_still_front_pic.png => wingull/front.png} (100%) rename graphics/pokemon/{icons/wingull_icon.png => wingull/icon.png} (100%) rename graphics/pokemon/{palettes/wingull_palette.pal => wingull/normal.pal} (100%) rename graphics/pokemon/{palettes/wingull_shiny_palette.pal => wingull/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/wobbuffet_front_pic.png => wobbuffet/anim_front.png} (100%) rename graphics/pokemon/{back_pics/wobbuffet_back_pic.png => wobbuffet/back.png} (100%) rename graphics/pokemon/{footprints/wobbuffet_footprint.png => wobbuffet/footprint.png} (100%) rename graphics/pokemon/{front_pics/wobbuffet_still_front_pic.png => wobbuffet/front.png} (100%) rename graphics/pokemon/{icons/wobbuffet_icon.png => wobbuffet/icon.png} (100%) rename graphics/pokemon/{palettes/wobbuffet_palette.pal => wobbuffet/normal.pal} (100%) rename graphics/pokemon/{palettes/wobbuffet_shiny_palette.pal => wobbuffet/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/wooper_front_pic.png => wooper/anim_front.png} (100%) rename graphics/pokemon/{back_pics/wooper_back_pic.png => wooper/back.png} (100%) rename graphics/pokemon/{footprints/wooper_footprint.png => wooper/footprint.png} (100%) rename graphics/pokemon/{front_pics/wooper_still_front_pic.png => wooper/front.png} (100%) rename graphics/pokemon/{icons/wooper_icon.png => wooper/icon.png} (100%) rename graphics/pokemon/{palettes/wooper_palette.pal => wooper/normal.pal} (100%) rename graphics/pokemon/{palettes/wooper_shiny_palette.pal => wooper/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/wurmple_front_pic.png => wurmple/anim_front.png} (100%) rename graphics/pokemon/{back_pics/wurmple_back_pic.png => wurmple/back.png} (100%) rename graphics/pokemon/{footprints/wurmple_footprint.png => wurmple/footprint.png} (100%) rename graphics/pokemon/{front_pics/wurmple_still_front_pic.png => wurmple/front.png} (100%) rename graphics/pokemon/{icons/wurmple_icon.png => wurmple/icon.png} (100%) rename graphics/pokemon/{palettes/wurmple_palette.pal => wurmple/normal.pal} (100%) rename graphics/pokemon/{palettes/wurmple_shiny_palette.pal => wurmple/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/wynaut_front_pic.png => wynaut/anim_front.png} (100%) rename graphics/pokemon/{back_pics/wynaut_back_pic.png => wynaut/back.png} (100%) rename graphics/pokemon/{footprints/wynaut_footprint.png => wynaut/footprint.png} (100%) rename graphics/pokemon/{front_pics/wynaut_still_front_pic.png => wynaut/front.png} (100%) rename graphics/pokemon/{icons/wynaut_icon.png => wynaut/icon.png} (100%) rename graphics/pokemon/{palettes/wynaut_palette.pal => wynaut/normal.pal} (100%) rename graphics/pokemon/{palettes/wynaut_shiny_palette.pal => wynaut/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/xatu_front_pic.png => xatu/anim_front.png} (100%) rename graphics/pokemon/{back_pics/xatu_back_pic.png => xatu/back.png} (100%) rename graphics/pokemon/{footprints/xatu_footprint.png => xatu/footprint.png} (100%) rename graphics/pokemon/{front_pics/xatu_still_front_pic.png => xatu/front.png} (100%) rename graphics/pokemon/{icons/xatu_icon.png => xatu/icon.png} (100%) rename graphics/pokemon/{palettes/xatu_palette.pal => xatu/normal.pal} (100%) rename graphics/pokemon/{palettes/xatu_shiny_palette.pal => xatu/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/yanma_front_pic.png => yanma/anim_front.png} (100%) rename graphics/pokemon/{back_pics/yanma_back_pic.png => yanma/back.png} (100%) rename graphics/pokemon/{footprints/yanma_footprint.png => yanma/footprint.png} (100%) rename graphics/pokemon/{front_pics/yanma_still_front_pic.png => yanma/front.png} (100%) rename graphics/pokemon/{icons/yanma_icon.png => yanma/icon.png} (100%) rename graphics/pokemon/{palettes/yanma_palette.pal => yanma/normal.pal} (100%) rename graphics/pokemon/{palettes/yanma_shiny_palette.pal => yanma/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/zangoose_front_pic.png => zangoose/anim_front.png} (100%) rename graphics/pokemon/{back_pics/zangoose_back_pic.png => zangoose/back.png} (100%) rename graphics/pokemon/{footprints/zangoose_footprint.png => zangoose/footprint.png} (100%) rename graphics/pokemon/{front_pics/zangoose_still_front_pic.png => zangoose/front.png} (100%) rename graphics/pokemon/{icons/zangoose_icon.png => zangoose/icon.png} (100%) rename graphics/pokemon/{palettes/zangoose_palette.pal => zangoose/normal.pal} (100%) rename graphics/pokemon/{palettes/zangoose_shiny_palette.pal => zangoose/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/zapdos_front_pic.png => zapdos/anim_front.png} (100%) rename graphics/pokemon/{back_pics/zapdos_back_pic.png => zapdos/back.png} (100%) rename graphics/pokemon/{footprints/zapdos_footprint.png => zapdos/footprint.png} (100%) rename graphics/pokemon/{front_pics/zapdos_still_front_pic.png => zapdos/front.png} (100%) rename graphics/pokemon/{icons/zapdos_icon.png => zapdos/icon.png} (100%) rename graphics/pokemon/{palettes/zapdos_palette.pal => zapdos/normal.pal} (100%) rename graphics/pokemon/{palettes/zapdos_shiny_palette.pal => zapdos/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/zigzagoon_front_pic.png => zigzagoon/anim_front.png} (100%) rename graphics/pokemon/{back_pics/zigzagoon_back_pic.png => zigzagoon/back.png} (100%) rename graphics/pokemon/{footprints/zigzagoon_footprint.png => zigzagoon/footprint.png} (100%) rename graphics/pokemon/{front_pics/zigzagoon_still_front_pic.png => zigzagoon/front.png} (100%) rename graphics/pokemon/{icons/zigzagoon_icon.png => zigzagoon/icon.png} (100%) rename graphics/pokemon/{palettes/zigzagoon_palette.pal => zigzagoon/normal.pal} (100%) rename graphics/pokemon/{palettes/zigzagoon_shiny_palette.pal => zigzagoon/shiny.pal} (100%) rename graphics/pokemon/{anim_front_pics/zubat_front_pic.png => zubat/anim_front.png} (100%) rename graphics/pokemon/{back_pics/zubat_back_pic.png => zubat/back.png} (100%) rename graphics/pokemon/{footprints/zubat_footprint.png => zubat/footprint.png} (100%) rename graphics/pokemon/{front_pics/zubat_still_front_pic.png => zubat/front.png} (100%) rename graphics/pokemon/{icons/zubat_icon.png => zubat/icon.png} (100%) rename graphics/pokemon/{palettes/zubat_palette.pal => zubat/normal.pal} (100%) rename graphics/pokemon/{palettes/zubat_shiny_palette.pal => zubat/shiny.pal} (100%) diff --git a/graphics/pokemon/anim_front_pics/abra_front_pic.png b/graphics/pokemon/abra/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/abra_front_pic.png rename to graphics/pokemon/abra/anim_front.png diff --git a/graphics/pokemon/back_pics/abra_back_pic.png b/graphics/pokemon/abra/back.png similarity index 100% rename from graphics/pokemon/back_pics/abra_back_pic.png rename to graphics/pokemon/abra/back.png diff --git a/graphics/pokemon/footprints/abra_footprint.png b/graphics/pokemon/abra/footprint.png similarity index 100% rename from graphics/pokemon/footprints/abra_footprint.png rename to graphics/pokemon/abra/footprint.png diff --git a/graphics/pokemon/front_pics/abra_still_front_pic.png b/graphics/pokemon/abra/front.png similarity index 100% rename from graphics/pokemon/front_pics/abra_still_front_pic.png rename to graphics/pokemon/abra/front.png diff --git a/graphics/pokemon/icons/abra_icon.png b/graphics/pokemon/abra/icon.png similarity index 100% rename from graphics/pokemon/icons/abra_icon.png rename to graphics/pokemon/abra/icon.png diff --git a/graphics/pokemon/palettes/abra_palette.pal b/graphics/pokemon/abra/normal.pal similarity index 100% rename from graphics/pokemon/palettes/abra_palette.pal rename to graphics/pokemon/abra/normal.pal diff --git a/graphics/pokemon/palettes/abra_shiny_palette.pal b/graphics/pokemon/abra/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/abra_shiny_palette.pal rename to graphics/pokemon/abra/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/absol_front_pic.png b/graphics/pokemon/absol/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/absol_front_pic.png rename to graphics/pokemon/absol/anim_front.png diff --git a/graphics/pokemon/back_pics/absol_back_pic.png b/graphics/pokemon/absol/back.png similarity index 100% rename from graphics/pokemon/back_pics/absol_back_pic.png rename to graphics/pokemon/absol/back.png diff --git a/graphics/pokemon/footprints/absol_footprint.png b/graphics/pokemon/absol/footprint.png similarity index 100% rename from graphics/pokemon/footprints/absol_footprint.png rename to graphics/pokemon/absol/footprint.png diff --git a/graphics/pokemon/front_pics/absol_still_front_pic.png b/graphics/pokemon/absol/front.png similarity index 100% rename from graphics/pokemon/front_pics/absol_still_front_pic.png rename to graphics/pokemon/absol/front.png diff --git a/graphics/pokemon/icons/absol_icon.png b/graphics/pokemon/absol/icon.png similarity index 100% rename from graphics/pokemon/icons/absol_icon.png rename to graphics/pokemon/absol/icon.png diff --git a/graphics/pokemon/palettes/absol_palette.pal b/graphics/pokemon/absol/normal.pal similarity index 100% rename from graphics/pokemon/palettes/absol_palette.pal rename to graphics/pokemon/absol/normal.pal diff --git a/graphics/pokemon/palettes/absol_shiny_palette.pal b/graphics/pokemon/absol/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/absol_shiny_palette.pal rename to graphics/pokemon/absol/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/aerodactyl_front_pic.png b/graphics/pokemon/aerodactyl/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/aerodactyl_front_pic.png rename to graphics/pokemon/aerodactyl/anim_front.png diff --git a/graphics/pokemon/back_pics/aerodactyl_back_pic.png b/graphics/pokemon/aerodactyl/back.png similarity index 100% rename from graphics/pokemon/back_pics/aerodactyl_back_pic.png rename to graphics/pokemon/aerodactyl/back.png diff --git a/graphics/pokemon/footprints/aerodactyl_footprint.png b/graphics/pokemon/aerodactyl/footprint.png similarity index 100% rename from graphics/pokemon/footprints/aerodactyl_footprint.png rename to graphics/pokemon/aerodactyl/footprint.png diff --git a/graphics/pokemon/front_pics/aerodactyl_still_front_pic.png b/graphics/pokemon/aerodactyl/front.png similarity index 100% rename from graphics/pokemon/front_pics/aerodactyl_still_front_pic.png rename to graphics/pokemon/aerodactyl/front.png diff --git a/graphics/pokemon/icons/aerodactyl_icon.png b/graphics/pokemon/aerodactyl/icon.png similarity index 100% rename from graphics/pokemon/icons/aerodactyl_icon.png rename to graphics/pokemon/aerodactyl/icon.png diff --git a/graphics/pokemon/palettes/aerodactyl_palette.pal b/graphics/pokemon/aerodactyl/normal.pal similarity index 100% rename from graphics/pokemon/palettes/aerodactyl_palette.pal rename to graphics/pokemon/aerodactyl/normal.pal diff --git a/graphics/pokemon/palettes/aerodactyl_shiny_palette.pal b/graphics/pokemon/aerodactyl/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/aerodactyl_shiny_palette.pal rename to graphics/pokemon/aerodactyl/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/aggron_front_pic.png b/graphics/pokemon/aggron/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/aggron_front_pic.png rename to graphics/pokemon/aggron/anim_front.png diff --git a/graphics/pokemon/back_pics/aggron_back_pic.png b/graphics/pokemon/aggron/back.png similarity index 100% rename from graphics/pokemon/back_pics/aggron_back_pic.png rename to graphics/pokemon/aggron/back.png diff --git a/graphics/pokemon/footprints/aggron_footprint.png b/graphics/pokemon/aggron/footprint.png similarity index 100% rename from graphics/pokemon/footprints/aggron_footprint.png rename to graphics/pokemon/aggron/footprint.png diff --git a/graphics/pokemon/front_pics/aggron_still_front_pic.png b/graphics/pokemon/aggron/front.png similarity index 100% rename from graphics/pokemon/front_pics/aggron_still_front_pic.png rename to graphics/pokemon/aggron/front.png diff --git a/graphics/pokemon/icons/aggron_icon.png b/graphics/pokemon/aggron/icon.png similarity index 100% rename from graphics/pokemon/icons/aggron_icon.png rename to graphics/pokemon/aggron/icon.png diff --git a/graphics/pokemon/palettes/aggron_palette.pal b/graphics/pokemon/aggron/normal.pal similarity index 100% rename from graphics/pokemon/palettes/aggron_palette.pal rename to graphics/pokemon/aggron/normal.pal diff --git a/graphics/pokemon/palettes/aggron_shiny_palette.pal b/graphics/pokemon/aggron/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/aggron_shiny_palette.pal rename to graphics/pokemon/aggron/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/aipom_front_pic.png b/graphics/pokemon/aipom/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/aipom_front_pic.png rename to graphics/pokemon/aipom/anim_front.png diff --git a/graphics/pokemon/back_pics/aipom_back_pic.png b/graphics/pokemon/aipom/back.png similarity index 100% rename from graphics/pokemon/back_pics/aipom_back_pic.png rename to graphics/pokemon/aipom/back.png diff --git a/graphics/pokemon/footprints/aipom_footprint.png b/graphics/pokemon/aipom/footprint.png similarity index 100% rename from graphics/pokemon/footprints/aipom_footprint.png rename to graphics/pokemon/aipom/footprint.png diff --git a/graphics/pokemon/front_pics/aipom_still_front_pic.png b/graphics/pokemon/aipom/front.png similarity index 100% rename from graphics/pokemon/front_pics/aipom_still_front_pic.png rename to graphics/pokemon/aipom/front.png diff --git a/graphics/pokemon/icons/aipom_icon.png b/graphics/pokemon/aipom/icon.png similarity index 100% rename from graphics/pokemon/icons/aipom_icon.png rename to graphics/pokemon/aipom/icon.png diff --git a/graphics/pokemon/palettes/aipom_palette.pal b/graphics/pokemon/aipom/normal.pal similarity index 100% rename from graphics/pokemon/palettes/aipom_palette.pal rename to graphics/pokemon/aipom/normal.pal diff --git a/graphics/pokemon/palettes/aipom_shiny_palette.pal b/graphics/pokemon/aipom/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/aipom_shiny_palette.pal rename to graphics/pokemon/aipom/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/alakazam_front_pic.png b/graphics/pokemon/alakazam/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/alakazam_front_pic.png rename to graphics/pokemon/alakazam/anim_front.png diff --git a/graphics/pokemon/back_pics/alakazam_back_pic.png b/graphics/pokemon/alakazam/back.png similarity index 100% rename from graphics/pokemon/back_pics/alakazam_back_pic.png rename to graphics/pokemon/alakazam/back.png diff --git a/graphics/pokemon/footprints/alakazam_footprint.png b/graphics/pokemon/alakazam/footprint.png similarity index 100% rename from graphics/pokemon/footprints/alakazam_footprint.png rename to graphics/pokemon/alakazam/footprint.png diff --git a/graphics/pokemon/front_pics/alakazam_still_front_pic.png b/graphics/pokemon/alakazam/front.png similarity index 100% rename from graphics/pokemon/front_pics/alakazam_still_front_pic.png rename to graphics/pokemon/alakazam/front.png diff --git a/graphics/pokemon/icons/alakazam_icon.png b/graphics/pokemon/alakazam/icon.png similarity index 100% rename from graphics/pokemon/icons/alakazam_icon.png rename to graphics/pokemon/alakazam/icon.png diff --git a/graphics/pokemon/palettes/alakazam_palette.pal b/graphics/pokemon/alakazam/normal.pal similarity index 100% rename from graphics/pokemon/palettes/alakazam_palette.pal rename to graphics/pokemon/alakazam/normal.pal diff --git a/graphics/pokemon/palettes/alakazam_shiny_palette.pal b/graphics/pokemon/alakazam/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/alakazam_shiny_palette.pal rename to graphics/pokemon/alakazam/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/altaria_front_pic.png b/graphics/pokemon/altaria/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/altaria_front_pic.png rename to graphics/pokemon/altaria/anim_front.png diff --git a/graphics/pokemon/back_pics/altaria_back_pic.png b/graphics/pokemon/altaria/back.png similarity index 100% rename from graphics/pokemon/back_pics/altaria_back_pic.png rename to graphics/pokemon/altaria/back.png diff --git a/graphics/pokemon/footprints/altaria_footprint.png b/graphics/pokemon/altaria/footprint.png similarity index 100% rename from graphics/pokemon/footprints/altaria_footprint.png rename to graphics/pokemon/altaria/footprint.png diff --git a/graphics/pokemon/front_pics/altaria_still_front_pic.png b/graphics/pokemon/altaria/front.png similarity index 100% rename from graphics/pokemon/front_pics/altaria_still_front_pic.png rename to graphics/pokemon/altaria/front.png diff --git a/graphics/pokemon/icons/altaria_icon.png b/graphics/pokemon/altaria/icon.png similarity index 100% rename from graphics/pokemon/icons/altaria_icon.png rename to graphics/pokemon/altaria/icon.png diff --git a/graphics/pokemon/palettes/altaria_palette.pal b/graphics/pokemon/altaria/normal.pal similarity index 100% rename from graphics/pokemon/palettes/altaria_palette.pal rename to graphics/pokemon/altaria/normal.pal diff --git a/graphics/pokemon/palettes/altaria_shiny_palette.pal b/graphics/pokemon/altaria/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/altaria_shiny_palette.pal rename to graphics/pokemon/altaria/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/ampharos_front_pic.png b/graphics/pokemon/ampharos/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/ampharos_front_pic.png rename to graphics/pokemon/ampharos/anim_front.png diff --git a/graphics/pokemon/back_pics/ampharos_back_pic.png b/graphics/pokemon/ampharos/back.png similarity index 100% rename from graphics/pokemon/back_pics/ampharos_back_pic.png rename to graphics/pokemon/ampharos/back.png diff --git a/graphics/pokemon/footprints/ampharos_footprint.png b/graphics/pokemon/ampharos/footprint.png similarity index 100% rename from graphics/pokemon/footprints/ampharos_footprint.png rename to graphics/pokemon/ampharos/footprint.png diff --git a/graphics/pokemon/front_pics/ampharos_still_front_pic.png b/graphics/pokemon/ampharos/front.png similarity index 100% rename from graphics/pokemon/front_pics/ampharos_still_front_pic.png rename to graphics/pokemon/ampharos/front.png diff --git a/graphics/pokemon/icons/ampharos_icon.png b/graphics/pokemon/ampharos/icon.png similarity index 100% rename from graphics/pokemon/icons/ampharos_icon.png rename to graphics/pokemon/ampharos/icon.png diff --git a/graphics/pokemon/palettes/ampharos_palette.pal b/graphics/pokemon/ampharos/normal.pal similarity index 100% rename from graphics/pokemon/palettes/ampharos_palette.pal rename to graphics/pokemon/ampharos/normal.pal diff --git a/graphics/pokemon/palettes/ampharos_shiny_palette.pal b/graphics/pokemon/ampharos/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/ampharos_shiny_palette.pal rename to graphics/pokemon/ampharos/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/anorith_front_pic.png b/graphics/pokemon/anorith/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/anorith_front_pic.png rename to graphics/pokemon/anorith/anim_front.png diff --git a/graphics/pokemon/back_pics/anorith_back_pic.png b/graphics/pokemon/anorith/back.png similarity index 100% rename from graphics/pokemon/back_pics/anorith_back_pic.png rename to graphics/pokemon/anorith/back.png diff --git a/graphics/pokemon/footprints/anorith_footprint.png b/graphics/pokemon/anorith/footprint.png similarity index 100% rename from graphics/pokemon/footprints/anorith_footprint.png rename to graphics/pokemon/anorith/footprint.png diff --git a/graphics/pokemon/front_pics/anorith_still_front_pic.png b/graphics/pokemon/anorith/front.png similarity index 100% rename from graphics/pokemon/front_pics/anorith_still_front_pic.png rename to graphics/pokemon/anorith/front.png diff --git a/graphics/pokemon/icons/anorith_icon.png b/graphics/pokemon/anorith/icon.png similarity index 100% rename from graphics/pokemon/icons/anorith_icon.png rename to graphics/pokemon/anorith/icon.png diff --git a/graphics/pokemon/palettes/anorith_palette.pal b/graphics/pokemon/anorith/normal.pal similarity index 100% rename from graphics/pokemon/palettes/anorith_palette.pal rename to graphics/pokemon/anorith/normal.pal diff --git a/graphics/pokemon/palettes/anorith_shiny_palette.pal b/graphics/pokemon/anorith/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/anorith_shiny_palette.pal rename to graphics/pokemon/anorith/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/arbok_front_pic.png b/graphics/pokemon/arbok/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/arbok_front_pic.png rename to graphics/pokemon/arbok/anim_front.png diff --git a/graphics/pokemon/back_pics/arbok_back_pic.png b/graphics/pokemon/arbok/back.png similarity index 100% rename from graphics/pokemon/back_pics/arbok_back_pic.png rename to graphics/pokemon/arbok/back.png diff --git a/graphics/pokemon/footprints/arbok_footprint.png b/graphics/pokemon/arbok/footprint.png similarity index 100% rename from graphics/pokemon/footprints/arbok_footprint.png rename to graphics/pokemon/arbok/footprint.png diff --git a/graphics/pokemon/front_pics/arbok_still_front_pic.png b/graphics/pokemon/arbok/front.png similarity index 100% rename from graphics/pokemon/front_pics/arbok_still_front_pic.png rename to graphics/pokemon/arbok/front.png diff --git a/graphics/pokemon/icons/arbok_icon.png b/graphics/pokemon/arbok/icon.png similarity index 100% rename from graphics/pokemon/icons/arbok_icon.png rename to graphics/pokemon/arbok/icon.png diff --git a/graphics/pokemon/palettes/arbok_palette.pal b/graphics/pokemon/arbok/normal.pal similarity index 100% rename from graphics/pokemon/palettes/arbok_palette.pal rename to graphics/pokemon/arbok/normal.pal diff --git a/graphics/pokemon/palettes/arbok_shiny_palette.pal b/graphics/pokemon/arbok/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/arbok_shiny_palette.pal rename to graphics/pokemon/arbok/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/arcanine_front_pic.png b/graphics/pokemon/arcanine/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/arcanine_front_pic.png rename to graphics/pokemon/arcanine/anim_front.png diff --git a/graphics/pokemon/back_pics/arcanine_back_pic.png b/graphics/pokemon/arcanine/back.png similarity index 100% rename from graphics/pokemon/back_pics/arcanine_back_pic.png rename to graphics/pokemon/arcanine/back.png diff --git a/graphics/pokemon/footprints/arcanine_footprint.png b/graphics/pokemon/arcanine/footprint.png similarity index 100% rename from graphics/pokemon/footprints/arcanine_footprint.png rename to graphics/pokemon/arcanine/footprint.png diff --git a/graphics/pokemon/front_pics/arcanine_still_front_pic.png b/graphics/pokemon/arcanine/front.png similarity index 100% rename from graphics/pokemon/front_pics/arcanine_still_front_pic.png rename to graphics/pokemon/arcanine/front.png diff --git a/graphics/pokemon/icons/arcanine_icon.png b/graphics/pokemon/arcanine/icon.png similarity index 100% rename from graphics/pokemon/icons/arcanine_icon.png rename to graphics/pokemon/arcanine/icon.png diff --git a/graphics/pokemon/palettes/arcanine_palette.pal b/graphics/pokemon/arcanine/normal.pal similarity index 100% rename from graphics/pokemon/palettes/arcanine_palette.pal rename to graphics/pokemon/arcanine/normal.pal diff --git a/graphics/pokemon/palettes/arcanine_shiny_palette.pal b/graphics/pokemon/arcanine/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/arcanine_shiny_palette.pal rename to graphics/pokemon/arcanine/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/ariados_front_pic.png b/graphics/pokemon/ariados/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/ariados_front_pic.png rename to graphics/pokemon/ariados/anim_front.png diff --git a/graphics/pokemon/back_pics/ariados_back_pic.png b/graphics/pokemon/ariados/back.png similarity index 100% rename from graphics/pokemon/back_pics/ariados_back_pic.png rename to graphics/pokemon/ariados/back.png diff --git a/graphics/pokemon/footprints/ariados_footprint.png b/graphics/pokemon/ariados/footprint.png similarity index 100% rename from graphics/pokemon/footprints/ariados_footprint.png rename to graphics/pokemon/ariados/footprint.png diff --git a/graphics/pokemon/front_pics/ariados_still_front_pic.png b/graphics/pokemon/ariados/front.png similarity index 100% rename from graphics/pokemon/front_pics/ariados_still_front_pic.png rename to graphics/pokemon/ariados/front.png diff --git a/graphics/pokemon/icons/ariados_icon.png b/graphics/pokemon/ariados/icon.png similarity index 100% rename from graphics/pokemon/icons/ariados_icon.png rename to graphics/pokemon/ariados/icon.png diff --git a/graphics/pokemon/palettes/ariados_palette.pal b/graphics/pokemon/ariados/normal.pal similarity index 100% rename from graphics/pokemon/palettes/ariados_palette.pal rename to graphics/pokemon/ariados/normal.pal diff --git a/graphics/pokemon/palettes/ariados_shiny_palette.pal b/graphics/pokemon/ariados/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/ariados_shiny_palette.pal rename to graphics/pokemon/ariados/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/armaldo_front_pic.png b/graphics/pokemon/armaldo/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/armaldo_front_pic.png rename to graphics/pokemon/armaldo/anim_front.png diff --git a/graphics/pokemon/back_pics/armaldo_back_pic.png b/graphics/pokemon/armaldo/back.png similarity index 100% rename from graphics/pokemon/back_pics/armaldo_back_pic.png rename to graphics/pokemon/armaldo/back.png diff --git a/graphics/pokemon/footprints/armaldo_footprint.png b/graphics/pokemon/armaldo/footprint.png similarity index 100% rename from graphics/pokemon/footprints/armaldo_footprint.png rename to graphics/pokemon/armaldo/footprint.png diff --git a/graphics/pokemon/front_pics/armaldo_still_front_pic.png b/graphics/pokemon/armaldo/front.png similarity index 100% rename from graphics/pokemon/front_pics/armaldo_still_front_pic.png rename to graphics/pokemon/armaldo/front.png diff --git a/graphics/pokemon/icons/armaldo_icon.png b/graphics/pokemon/armaldo/icon.png similarity index 100% rename from graphics/pokemon/icons/armaldo_icon.png rename to graphics/pokemon/armaldo/icon.png diff --git a/graphics/pokemon/palettes/armaldo_palette.pal b/graphics/pokemon/armaldo/normal.pal similarity index 100% rename from graphics/pokemon/palettes/armaldo_palette.pal rename to graphics/pokemon/armaldo/normal.pal diff --git a/graphics/pokemon/palettes/armaldo_shiny_palette.pal b/graphics/pokemon/armaldo/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/armaldo_shiny_palette.pal rename to graphics/pokemon/armaldo/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/aron_front_pic.png b/graphics/pokemon/aron/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/aron_front_pic.png rename to graphics/pokemon/aron/anim_front.png diff --git a/graphics/pokemon/back_pics/aron_back_pic.png b/graphics/pokemon/aron/back.png similarity index 100% rename from graphics/pokemon/back_pics/aron_back_pic.png rename to graphics/pokemon/aron/back.png diff --git a/graphics/pokemon/footprints/aron_footprint.png b/graphics/pokemon/aron/footprint.png similarity index 100% rename from graphics/pokemon/footprints/aron_footprint.png rename to graphics/pokemon/aron/footprint.png diff --git a/graphics/pokemon/front_pics/aron_still_front_pic.png b/graphics/pokemon/aron/front.png similarity index 100% rename from graphics/pokemon/front_pics/aron_still_front_pic.png rename to graphics/pokemon/aron/front.png diff --git a/graphics/pokemon/icons/aron_icon.png b/graphics/pokemon/aron/icon.png similarity index 100% rename from graphics/pokemon/icons/aron_icon.png rename to graphics/pokemon/aron/icon.png diff --git a/graphics/pokemon/palettes/aron_palette.pal b/graphics/pokemon/aron/normal.pal similarity index 100% rename from graphics/pokemon/palettes/aron_palette.pal rename to graphics/pokemon/aron/normal.pal diff --git a/graphics/pokemon/palettes/aron_shiny_palette.pal b/graphics/pokemon/aron/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/aron_shiny_palette.pal rename to graphics/pokemon/aron/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/articuno_front_pic.png b/graphics/pokemon/articuno/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/articuno_front_pic.png rename to graphics/pokemon/articuno/anim_front.png diff --git a/graphics/pokemon/back_pics/articuno_back_pic.png b/graphics/pokemon/articuno/back.png similarity index 100% rename from graphics/pokemon/back_pics/articuno_back_pic.png rename to graphics/pokemon/articuno/back.png diff --git a/graphics/pokemon/footprints/articuno_footprint.png b/graphics/pokemon/articuno/footprint.png similarity index 100% rename from graphics/pokemon/footprints/articuno_footprint.png rename to graphics/pokemon/articuno/footprint.png diff --git a/graphics/pokemon/front_pics/articuno_still_front_pic.png b/graphics/pokemon/articuno/front.png similarity index 100% rename from graphics/pokemon/front_pics/articuno_still_front_pic.png rename to graphics/pokemon/articuno/front.png diff --git a/graphics/pokemon/icons/articuno_icon.png b/graphics/pokemon/articuno/icon.png similarity index 100% rename from graphics/pokemon/icons/articuno_icon.png rename to graphics/pokemon/articuno/icon.png diff --git a/graphics/pokemon/palettes/articuno_palette.pal b/graphics/pokemon/articuno/normal.pal similarity index 100% rename from graphics/pokemon/palettes/articuno_palette.pal rename to graphics/pokemon/articuno/normal.pal diff --git a/graphics/pokemon/palettes/articuno_shiny_palette.pal b/graphics/pokemon/articuno/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/articuno_shiny_palette.pal rename to graphics/pokemon/articuno/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/azumarill_front_pic.png b/graphics/pokemon/azumarill/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/azumarill_front_pic.png rename to graphics/pokemon/azumarill/anim_front.png diff --git a/graphics/pokemon/back_pics/azumarill_back_pic.png b/graphics/pokemon/azumarill/back.png similarity index 100% rename from graphics/pokemon/back_pics/azumarill_back_pic.png rename to graphics/pokemon/azumarill/back.png diff --git a/graphics/pokemon/footprints/azumarill_footprint.png b/graphics/pokemon/azumarill/footprint.png similarity index 100% rename from graphics/pokemon/footprints/azumarill_footprint.png rename to graphics/pokemon/azumarill/footprint.png diff --git a/graphics/pokemon/front_pics/azumarill_still_front_pic.png b/graphics/pokemon/azumarill/front.png similarity index 100% rename from graphics/pokemon/front_pics/azumarill_still_front_pic.png rename to graphics/pokemon/azumarill/front.png diff --git a/graphics/pokemon/icons/azumarill_icon.png b/graphics/pokemon/azumarill/icon.png similarity index 100% rename from graphics/pokemon/icons/azumarill_icon.png rename to graphics/pokemon/azumarill/icon.png diff --git a/graphics/pokemon/palettes/azumarill_palette.pal b/graphics/pokemon/azumarill/normal.pal similarity index 100% rename from graphics/pokemon/palettes/azumarill_palette.pal rename to graphics/pokemon/azumarill/normal.pal diff --git a/graphics/pokemon/palettes/azumarill_shiny_palette.pal b/graphics/pokemon/azumarill/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/azumarill_shiny_palette.pal rename to graphics/pokemon/azumarill/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/azurill_front_pic.png b/graphics/pokemon/azurill/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/azurill_front_pic.png rename to graphics/pokemon/azurill/anim_front.png diff --git a/graphics/pokemon/back_pics/azurill_back_pic.png b/graphics/pokemon/azurill/back.png similarity index 100% rename from graphics/pokemon/back_pics/azurill_back_pic.png rename to graphics/pokemon/azurill/back.png diff --git a/graphics/pokemon/footprints/azurill_footprint.png b/graphics/pokemon/azurill/footprint.png similarity index 100% rename from graphics/pokemon/footprints/azurill_footprint.png rename to graphics/pokemon/azurill/footprint.png diff --git a/graphics/pokemon/front_pics/azurill_still_front_pic.png b/graphics/pokemon/azurill/front.png similarity index 100% rename from graphics/pokemon/front_pics/azurill_still_front_pic.png rename to graphics/pokemon/azurill/front.png diff --git a/graphics/pokemon/icons/azurill_icon.png b/graphics/pokemon/azurill/icon.png similarity index 100% rename from graphics/pokemon/icons/azurill_icon.png rename to graphics/pokemon/azurill/icon.png diff --git a/graphics/pokemon/palettes/azurill_palette.pal b/graphics/pokemon/azurill/normal.pal similarity index 100% rename from graphics/pokemon/palettes/azurill_palette.pal rename to graphics/pokemon/azurill/normal.pal diff --git a/graphics/pokemon/palettes/azurill_shiny_palette.pal b/graphics/pokemon/azurill/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/azurill_shiny_palette.pal rename to graphics/pokemon/azurill/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/bagon_front_pic.png b/graphics/pokemon/bagon/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/bagon_front_pic.png rename to graphics/pokemon/bagon/anim_front.png diff --git a/graphics/pokemon/back_pics/bagon_back_pic.png b/graphics/pokemon/bagon/back.png similarity index 100% rename from graphics/pokemon/back_pics/bagon_back_pic.png rename to graphics/pokemon/bagon/back.png diff --git a/graphics/pokemon/footprints/bagon_footprint.png b/graphics/pokemon/bagon/footprint.png similarity index 100% rename from graphics/pokemon/footprints/bagon_footprint.png rename to graphics/pokemon/bagon/footprint.png diff --git a/graphics/pokemon/front_pics/bagon_still_front_pic.png b/graphics/pokemon/bagon/front.png similarity index 100% rename from graphics/pokemon/front_pics/bagon_still_front_pic.png rename to graphics/pokemon/bagon/front.png diff --git a/graphics/pokemon/icons/bagon_icon.png b/graphics/pokemon/bagon/icon.png similarity index 100% rename from graphics/pokemon/icons/bagon_icon.png rename to graphics/pokemon/bagon/icon.png diff --git a/graphics/pokemon/palettes/bagon_palette.pal b/graphics/pokemon/bagon/normal.pal similarity index 100% rename from graphics/pokemon/palettes/bagon_palette.pal rename to graphics/pokemon/bagon/normal.pal diff --git a/graphics/pokemon/palettes/bagon_shiny_palette.pal b/graphics/pokemon/bagon/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/bagon_shiny_palette.pal rename to graphics/pokemon/bagon/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/baltoy_front_pic.png b/graphics/pokemon/baltoy/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/baltoy_front_pic.png rename to graphics/pokemon/baltoy/anim_front.png diff --git a/graphics/pokemon/back_pics/baltoy_back_pic.png b/graphics/pokemon/baltoy/back.png similarity index 100% rename from graphics/pokemon/back_pics/baltoy_back_pic.png rename to graphics/pokemon/baltoy/back.png diff --git a/graphics/pokemon/footprints/baltoy_footprint.png b/graphics/pokemon/baltoy/footprint.png similarity index 100% rename from graphics/pokemon/footprints/baltoy_footprint.png rename to graphics/pokemon/baltoy/footprint.png diff --git a/graphics/pokemon/front_pics/baltoy_still_front_pic.png b/graphics/pokemon/baltoy/front.png similarity index 100% rename from graphics/pokemon/front_pics/baltoy_still_front_pic.png rename to graphics/pokemon/baltoy/front.png diff --git a/graphics/pokemon/icons/baltoy_icon.png b/graphics/pokemon/baltoy/icon.png similarity index 100% rename from graphics/pokemon/icons/baltoy_icon.png rename to graphics/pokemon/baltoy/icon.png diff --git a/graphics/pokemon/palettes/baltoy_palette.pal b/graphics/pokemon/baltoy/normal.pal similarity index 100% rename from graphics/pokemon/palettes/baltoy_palette.pal rename to graphics/pokemon/baltoy/normal.pal diff --git a/graphics/pokemon/palettes/baltoy_shiny_palette.pal b/graphics/pokemon/baltoy/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/baltoy_shiny_palette.pal rename to graphics/pokemon/baltoy/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/banette_front_pic.png b/graphics/pokemon/banette/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/banette_front_pic.png rename to graphics/pokemon/banette/anim_front.png diff --git a/graphics/pokemon/back_pics/banette_back_pic.png b/graphics/pokemon/banette/back.png similarity index 100% rename from graphics/pokemon/back_pics/banette_back_pic.png rename to graphics/pokemon/banette/back.png diff --git a/graphics/pokemon/footprints/banette_footprint.png b/graphics/pokemon/banette/footprint.png similarity index 100% rename from graphics/pokemon/footprints/banette_footprint.png rename to graphics/pokemon/banette/footprint.png diff --git a/graphics/pokemon/front_pics/banette_still_front_pic.png b/graphics/pokemon/banette/front.png similarity index 100% rename from graphics/pokemon/front_pics/banette_still_front_pic.png rename to graphics/pokemon/banette/front.png diff --git a/graphics/pokemon/icons/banette_icon.png b/graphics/pokemon/banette/icon.png similarity index 100% rename from graphics/pokemon/icons/banette_icon.png rename to graphics/pokemon/banette/icon.png diff --git a/graphics/pokemon/palettes/banette_palette.pal b/graphics/pokemon/banette/normal.pal similarity index 100% rename from graphics/pokemon/palettes/banette_palette.pal rename to graphics/pokemon/banette/normal.pal diff --git a/graphics/pokemon/palettes/banette_shiny_palette.pal b/graphics/pokemon/banette/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/banette_shiny_palette.pal rename to graphics/pokemon/banette/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/barboach_front_pic.png b/graphics/pokemon/barboach/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/barboach_front_pic.png rename to graphics/pokemon/barboach/anim_front.png diff --git a/graphics/pokemon/back_pics/barboach_back_pic.png b/graphics/pokemon/barboach/back.png similarity index 100% rename from graphics/pokemon/back_pics/barboach_back_pic.png rename to graphics/pokemon/barboach/back.png diff --git a/graphics/pokemon/footprints/barboach_footprint.png b/graphics/pokemon/barboach/footprint.png similarity index 100% rename from graphics/pokemon/footprints/barboach_footprint.png rename to graphics/pokemon/barboach/footprint.png diff --git a/graphics/pokemon/front_pics/barboach_still_front_pic.png b/graphics/pokemon/barboach/front.png similarity index 100% rename from graphics/pokemon/front_pics/barboach_still_front_pic.png rename to graphics/pokemon/barboach/front.png diff --git a/graphics/pokemon/icons/barboach_icon.png b/graphics/pokemon/barboach/icon.png similarity index 100% rename from graphics/pokemon/icons/barboach_icon.png rename to graphics/pokemon/barboach/icon.png diff --git a/graphics/pokemon/palettes/barboach_palette.pal b/graphics/pokemon/barboach/normal.pal similarity index 100% rename from graphics/pokemon/palettes/barboach_palette.pal rename to graphics/pokemon/barboach/normal.pal diff --git a/graphics/pokemon/palettes/barboach_shiny_palette.pal b/graphics/pokemon/barboach/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/barboach_shiny_palette.pal rename to graphics/pokemon/barboach/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/bayleef_front_pic.png b/graphics/pokemon/bayleef/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/bayleef_front_pic.png rename to graphics/pokemon/bayleef/anim_front.png diff --git a/graphics/pokemon/back_pics/bayleef_back_pic.png b/graphics/pokemon/bayleef/back.png similarity index 100% rename from graphics/pokemon/back_pics/bayleef_back_pic.png rename to graphics/pokemon/bayleef/back.png diff --git a/graphics/pokemon/footprints/bayleef_footprint.png b/graphics/pokemon/bayleef/footprint.png similarity index 100% rename from graphics/pokemon/footprints/bayleef_footprint.png rename to graphics/pokemon/bayleef/footprint.png diff --git a/graphics/pokemon/front_pics/bayleef_still_front_pic.png b/graphics/pokemon/bayleef/front.png similarity index 100% rename from graphics/pokemon/front_pics/bayleef_still_front_pic.png rename to graphics/pokemon/bayleef/front.png diff --git a/graphics/pokemon/icons/bayleef_icon.png b/graphics/pokemon/bayleef/icon.png similarity index 100% rename from graphics/pokemon/icons/bayleef_icon.png rename to graphics/pokemon/bayleef/icon.png diff --git a/graphics/pokemon/palettes/bayleef_palette.pal b/graphics/pokemon/bayleef/normal.pal similarity index 100% rename from graphics/pokemon/palettes/bayleef_palette.pal rename to graphics/pokemon/bayleef/normal.pal diff --git a/graphics/pokemon/palettes/bayleef_shiny_palette.pal b/graphics/pokemon/bayleef/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/bayleef_shiny_palette.pal rename to graphics/pokemon/bayleef/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/beautifly_front_pic.png b/graphics/pokemon/beautifly/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/beautifly_front_pic.png rename to graphics/pokemon/beautifly/anim_front.png diff --git a/graphics/pokemon/back_pics/beautifly_back_pic.png b/graphics/pokemon/beautifly/back.png similarity index 100% rename from graphics/pokemon/back_pics/beautifly_back_pic.png rename to graphics/pokemon/beautifly/back.png diff --git a/graphics/pokemon/footprints/beautifly_footprint.png b/graphics/pokemon/beautifly/footprint.png similarity index 100% rename from graphics/pokemon/footprints/beautifly_footprint.png rename to graphics/pokemon/beautifly/footprint.png diff --git a/graphics/pokemon/front_pics/beautifly_still_front_pic.png b/graphics/pokemon/beautifly/front.png similarity index 100% rename from graphics/pokemon/front_pics/beautifly_still_front_pic.png rename to graphics/pokemon/beautifly/front.png diff --git a/graphics/pokemon/icons/beautifly_icon.png b/graphics/pokemon/beautifly/icon.png similarity index 100% rename from graphics/pokemon/icons/beautifly_icon.png rename to graphics/pokemon/beautifly/icon.png diff --git a/graphics/pokemon/palettes/beautifly_palette.pal b/graphics/pokemon/beautifly/normal.pal similarity index 100% rename from graphics/pokemon/palettes/beautifly_palette.pal rename to graphics/pokemon/beautifly/normal.pal diff --git a/graphics/pokemon/palettes/beautifly_shiny_palette.pal b/graphics/pokemon/beautifly/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/beautifly_shiny_palette.pal rename to graphics/pokemon/beautifly/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/beedrill_front_pic.png b/graphics/pokemon/beedrill/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/beedrill_front_pic.png rename to graphics/pokemon/beedrill/anim_front.png diff --git a/graphics/pokemon/back_pics/beedrill_back_pic.png b/graphics/pokemon/beedrill/back.png similarity index 100% rename from graphics/pokemon/back_pics/beedrill_back_pic.png rename to graphics/pokemon/beedrill/back.png diff --git a/graphics/pokemon/footprints/beedrill_footprint.png b/graphics/pokemon/beedrill/footprint.png similarity index 100% rename from graphics/pokemon/footprints/beedrill_footprint.png rename to graphics/pokemon/beedrill/footprint.png diff --git a/graphics/pokemon/front_pics/beedrill_still_front_pic.png b/graphics/pokemon/beedrill/front.png similarity index 100% rename from graphics/pokemon/front_pics/beedrill_still_front_pic.png rename to graphics/pokemon/beedrill/front.png diff --git a/graphics/pokemon/icons/beedrill_icon.png b/graphics/pokemon/beedrill/icon.png similarity index 100% rename from graphics/pokemon/icons/beedrill_icon.png rename to graphics/pokemon/beedrill/icon.png diff --git a/graphics/pokemon/palettes/beedrill_palette.pal b/graphics/pokemon/beedrill/normal.pal similarity index 100% rename from graphics/pokemon/palettes/beedrill_palette.pal rename to graphics/pokemon/beedrill/normal.pal diff --git a/graphics/pokemon/palettes/beedrill_shiny_palette.pal b/graphics/pokemon/beedrill/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/beedrill_shiny_palette.pal rename to graphics/pokemon/beedrill/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/beldum_front_pic.png b/graphics/pokemon/beldum/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/beldum_front_pic.png rename to graphics/pokemon/beldum/anim_front.png diff --git a/graphics/pokemon/back_pics/beldum_back_pic.png b/graphics/pokemon/beldum/back.png similarity index 100% rename from graphics/pokemon/back_pics/beldum_back_pic.png rename to graphics/pokemon/beldum/back.png diff --git a/graphics/pokemon/footprints/beldum_footprint.png b/graphics/pokemon/beldum/footprint.png similarity index 100% rename from graphics/pokemon/footprints/beldum_footprint.png rename to graphics/pokemon/beldum/footprint.png diff --git a/graphics/pokemon/front_pics/beldum_still_front_pic.png b/graphics/pokemon/beldum/front.png similarity index 100% rename from graphics/pokemon/front_pics/beldum_still_front_pic.png rename to graphics/pokemon/beldum/front.png diff --git a/graphics/pokemon/icons/beldum_icon.png b/graphics/pokemon/beldum/icon.png similarity index 100% rename from graphics/pokemon/icons/beldum_icon.png rename to graphics/pokemon/beldum/icon.png diff --git a/graphics/pokemon/palettes/beldum_palette.pal b/graphics/pokemon/beldum/normal.pal similarity index 100% rename from graphics/pokemon/palettes/beldum_palette.pal rename to graphics/pokemon/beldum/normal.pal diff --git a/graphics/pokemon/palettes/beldum_shiny_palette.pal b/graphics/pokemon/beldum/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/beldum_shiny_palette.pal rename to graphics/pokemon/beldum/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/bellossom_front_pic.png b/graphics/pokemon/bellossom/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/bellossom_front_pic.png rename to graphics/pokemon/bellossom/anim_front.png diff --git a/graphics/pokemon/back_pics/bellossom_back_pic.png b/graphics/pokemon/bellossom/back.png similarity index 100% rename from graphics/pokemon/back_pics/bellossom_back_pic.png rename to graphics/pokemon/bellossom/back.png diff --git a/graphics/pokemon/footprints/bellossom_footprint.png b/graphics/pokemon/bellossom/footprint.png similarity index 100% rename from graphics/pokemon/footprints/bellossom_footprint.png rename to graphics/pokemon/bellossom/footprint.png diff --git a/graphics/pokemon/front_pics/bellossom_still_front_pic.png b/graphics/pokemon/bellossom/front.png similarity index 100% rename from graphics/pokemon/front_pics/bellossom_still_front_pic.png rename to graphics/pokemon/bellossom/front.png diff --git a/graphics/pokemon/icons/bellossom_icon.png b/graphics/pokemon/bellossom/icon.png similarity index 100% rename from graphics/pokemon/icons/bellossom_icon.png rename to graphics/pokemon/bellossom/icon.png diff --git a/graphics/pokemon/palettes/bellossom_palette.pal b/graphics/pokemon/bellossom/normal.pal similarity index 100% rename from graphics/pokemon/palettes/bellossom_palette.pal rename to graphics/pokemon/bellossom/normal.pal diff --git a/graphics/pokemon/palettes/bellossom_shiny_palette.pal b/graphics/pokemon/bellossom/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/bellossom_shiny_palette.pal rename to graphics/pokemon/bellossom/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/bellsprout_front_pic.png b/graphics/pokemon/bellsprout/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/bellsprout_front_pic.png rename to graphics/pokemon/bellsprout/anim_front.png diff --git a/graphics/pokemon/back_pics/bellsprout_back_pic.png b/graphics/pokemon/bellsprout/back.png similarity index 100% rename from graphics/pokemon/back_pics/bellsprout_back_pic.png rename to graphics/pokemon/bellsprout/back.png diff --git a/graphics/pokemon/footprints/bellsprout_footprint.png b/graphics/pokemon/bellsprout/footprint.png similarity index 100% rename from graphics/pokemon/footprints/bellsprout_footprint.png rename to graphics/pokemon/bellsprout/footprint.png diff --git a/graphics/pokemon/front_pics/bellsprout_still_front_pic.png b/graphics/pokemon/bellsprout/front.png similarity index 100% rename from graphics/pokemon/front_pics/bellsprout_still_front_pic.png rename to graphics/pokemon/bellsprout/front.png diff --git a/graphics/pokemon/icons/bellsprout_icon.png b/graphics/pokemon/bellsprout/icon.png similarity index 100% rename from graphics/pokemon/icons/bellsprout_icon.png rename to graphics/pokemon/bellsprout/icon.png diff --git a/graphics/pokemon/palettes/bellsprout_palette.pal b/graphics/pokemon/bellsprout/normal.pal similarity index 100% rename from graphics/pokemon/palettes/bellsprout_palette.pal rename to graphics/pokemon/bellsprout/normal.pal diff --git a/graphics/pokemon/palettes/bellsprout_shiny_palette.pal b/graphics/pokemon/bellsprout/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/bellsprout_shiny_palette.pal rename to graphics/pokemon/bellsprout/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/blastoise_front_pic.png b/graphics/pokemon/blastoise/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/blastoise_front_pic.png rename to graphics/pokemon/blastoise/anim_front.png diff --git a/graphics/pokemon/back_pics/blastoise_back_pic.png b/graphics/pokemon/blastoise/back.png similarity index 100% rename from graphics/pokemon/back_pics/blastoise_back_pic.png rename to graphics/pokemon/blastoise/back.png diff --git a/graphics/pokemon/footprints/blastoise_footprint.png b/graphics/pokemon/blastoise/footprint.png similarity index 100% rename from graphics/pokemon/footprints/blastoise_footprint.png rename to graphics/pokemon/blastoise/footprint.png diff --git a/graphics/pokemon/front_pics/blastoise_still_front_pic.png b/graphics/pokemon/blastoise/front.png similarity index 100% rename from graphics/pokemon/front_pics/blastoise_still_front_pic.png rename to graphics/pokemon/blastoise/front.png diff --git a/graphics/pokemon/icons/blastoise_icon.png b/graphics/pokemon/blastoise/icon.png similarity index 100% rename from graphics/pokemon/icons/blastoise_icon.png rename to graphics/pokemon/blastoise/icon.png diff --git a/graphics/pokemon/palettes/blastoise_palette.pal b/graphics/pokemon/blastoise/normal.pal similarity index 100% rename from graphics/pokemon/palettes/blastoise_palette.pal rename to graphics/pokemon/blastoise/normal.pal diff --git a/graphics/pokemon/palettes/blastoise_shiny_palette.pal b/graphics/pokemon/blastoise/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/blastoise_shiny_palette.pal rename to graphics/pokemon/blastoise/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/blaziken_front_pic.png b/graphics/pokemon/blaziken/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/blaziken_front_pic.png rename to graphics/pokemon/blaziken/anim_front.png diff --git a/graphics/pokemon/back_pics/blaziken_back_pic.png b/graphics/pokemon/blaziken/back.png similarity index 100% rename from graphics/pokemon/back_pics/blaziken_back_pic.png rename to graphics/pokemon/blaziken/back.png diff --git a/graphics/pokemon/footprints/blaziken_footprint.png b/graphics/pokemon/blaziken/footprint.png similarity index 100% rename from graphics/pokemon/footprints/blaziken_footprint.png rename to graphics/pokemon/blaziken/footprint.png diff --git a/graphics/pokemon/front_pics/blaziken_still_front_pic.png b/graphics/pokemon/blaziken/front.png similarity index 100% rename from graphics/pokemon/front_pics/blaziken_still_front_pic.png rename to graphics/pokemon/blaziken/front.png diff --git a/graphics/pokemon/icons/blaziken_icon.png b/graphics/pokemon/blaziken/icon.png similarity index 100% rename from graphics/pokemon/icons/blaziken_icon.png rename to graphics/pokemon/blaziken/icon.png diff --git a/graphics/pokemon/palettes/blaziken_palette.pal b/graphics/pokemon/blaziken/normal.pal similarity index 100% rename from graphics/pokemon/palettes/blaziken_palette.pal rename to graphics/pokemon/blaziken/normal.pal diff --git a/graphics/pokemon/palettes/blaziken_shiny_palette.pal b/graphics/pokemon/blaziken/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/blaziken_shiny_palette.pal rename to graphics/pokemon/blaziken/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/blissey_front_pic.png b/graphics/pokemon/blissey/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/blissey_front_pic.png rename to graphics/pokemon/blissey/anim_front.png diff --git a/graphics/pokemon/back_pics/blissey_back_pic.png b/graphics/pokemon/blissey/back.png similarity index 100% rename from graphics/pokemon/back_pics/blissey_back_pic.png rename to graphics/pokemon/blissey/back.png diff --git a/graphics/pokemon/footprints/blissey_footprint.png b/graphics/pokemon/blissey/footprint.png similarity index 100% rename from graphics/pokemon/footprints/blissey_footprint.png rename to graphics/pokemon/blissey/footprint.png diff --git a/graphics/pokemon/front_pics/blissey_still_front_pic.png b/graphics/pokemon/blissey/front.png similarity index 100% rename from graphics/pokemon/front_pics/blissey_still_front_pic.png rename to graphics/pokemon/blissey/front.png diff --git a/graphics/pokemon/icons/blissey_icon.png b/graphics/pokemon/blissey/icon.png similarity index 100% rename from graphics/pokemon/icons/blissey_icon.png rename to graphics/pokemon/blissey/icon.png diff --git a/graphics/pokemon/palettes/blissey_palette.pal b/graphics/pokemon/blissey/normal.pal similarity index 100% rename from graphics/pokemon/palettes/blissey_palette.pal rename to graphics/pokemon/blissey/normal.pal diff --git a/graphics/pokemon/palettes/blissey_shiny_palette.pal b/graphics/pokemon/blissey/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/blissey_shiny_palette.pal rename to graphics/pokemon/blissey/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/breloom_front_pic.png b/graphics/pokemon/breloom/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/breloom_front_pic.png rename to graphics/pokemon/breloom/anim_front.png diff --git a/graphics/pokemon/back_pics/breloom_back_pic.png b/graphics/pokemon/breloom/back.png similarity index 100% rename from graphics/pokemon/back_pics/breloom_back_pic.png rename to graphics/pokemon/breloom/back.png diff --git a/graphics/pokemon/footprints/breloom_footprint.png b/graphics/pokemon/breloom/footprint.png similarity index 100% rename from graphics/pokemon/footprints/breloom_footprint.png rename to graphics/pokemon/breloom/footprint.png diff --git a/graphics/pokemon/front_pics/breloom_still_front_pic.png b/graphics/pokemon/breloom/front.png similarity index 100% rename from graphics/pokemon/front_pics/breloom_still_front_pic.png rename to graphics/pokemon/breloom/front.png diff --git a/graphics/pokemon/icons/breloom_icon.png b/graphics/pokemon/breloom/icon.png similarity index 100% rename from graphics/pokemon/icons/breloom_icon.png rename to graphics/pokemon/breloom/icon.png diff --git a/graphics/pokemon/palettes/breloom_palette.pal b/graphics/pokemon/breloom/normal.pal similarity index 100% rename from graphics/pokemon/palettes/breloom_palette.pal rename to graphics/pokemon/breloom/normal.pal diff --git a/graphics/pokemon/palettes/breloom_shiny_palette.pal b/graphics/pokemon/breloom/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/breloom_shiny_palette.pal rename to graphics/pokemon/breloom/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/bulbasaur_front_pic.png b/graphics/pokemon/bulbasaur/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/bulbasaur_front_pic.png rename to graphics/pokemon/bulbasaur/anim_front.png diff --git a/graphics/pokemon/back_pics/bulbasaur_back_pic.png b/graphics/pokemon/bulbasaur/back.png similarity index 100% rename from graphics/pokemon/back_pics/bulbasaur_back_pic.png rename to graphics/pokemon/bulbasaur/back.png diff --git a/graphics/pokemon/footprints/bulbasaur_footprint.png b/graphics/pokemon/bulbasaur/footprint.png similarity index 100% rename from graphics/pokemon/footprints/bulbasaur_footprint.png rename to graphics/pokemon/bulbasaur/footprint.png diff --git a/graphics/pokemon/front_pics/bulbasaur_still_front_pic.png b/graphics/pokemon/bulbasaur/front.png similarity index 100% rename from graphics/pokemon/front_pics/bulbasaur_still_front_pic.png rename to graphics/pokemon/bulbasaur/front.png diff --git a/graphics/pokemon/icons/bulbasaur_icon.png b/graphics/pokemon/bulbasaur/icon.png similarity index 100% rename from graphics/pokemon/icons/bulbasaur_icon.png rename to graphics/pokemon/bulbasaur/icon.png diff --git a/graphics/pokemon/palettes/bulbasaur_palette.pal b/graphics/pokemon/bulbasaur/normal.pal similarity index 100% rename from graphics/pokemon/palettes/bulbasaur_palette.pal rename to graphics/pokemon/bulbasaur/normal.pal diff --git a/graphics/pokemon/palettes/bulbasaur_shiny_palette.pal b/graphics/pokemon/bulbasaur/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/bulbasaur_shiny_palette.pal rename to graphics/pokemon/bulbasaur/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/butterfree_front_pic.png b/graphics/pokemon/butterfree/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/butterfree_front_pic.png rename to graphics/pokemon/butterfree/anim_front.png diff --git a/graphics/pokemon/back_pics/butterfree_back_pic.png b/graphics/pokemon/butterfree/back.png similarity index 100% rename from graphics/pokemon/back_pics/butterfree_back_pic.png rename to graphics/pokemon/butterfree/back.png diff --git a/graphics/pokemon/footprints/butterfree_footprint.png b/graphics/pokemon/butterfree/footprint.png similarity index 100% rename from graphics/pokemon/footprints/butterfree_footprint.png rename to graphics/pokemon/butterfree/footprint.png diff --git a/graphics/pokemon/front_pics/butterfree_still_front_pic.png b/graphics/pokemon/butterfree/front.png similarity index 100% rename from graphics/pokemon/front_pics/butterfree_still_front_pic.png rename to graphics/pokemon/butterfree/front.png diff --git a/graphics/pokemon/icons/butterfree_icon.png b/graphics/pokemon/butterfree/icon.png similarity index 100% rename from graphics/pokemon/icons/butterfree_icon.png rename to graphics/pokemon/butterfree/icon.png diff --git a/graphics/pokemon/palettes/butterfree_palette.pal b/graphics/pokemon/butterfree/normal.pal similarity index 100% rename from graphics/pokemon/palettes/butterfree_palette.pal rename to graphics/pokemon/butterfree/normal.pal diff --git a/graphics/pokemon/palettes/butterfree_shiny_palette.pal b/graphics/pokemon/butterfree/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/butterfree_shiny_palette.pal rename to graphics/pokemon/butterfree/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/cacnea_front_pic.png b/graphics/pokemon/cacnea/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/cacnea_front_pic.png rename to graphics/pokemon/cacnea/anim_front.png diff --git a/graphics/pokemon/back_pics/cacnea_back_pic.png b/graphics/pokemon/cacnea/back.png similarity index 100% rename from graphics/pokemon/back_pics/cacnea_back_pic.png rename to graphics/pokemon/cacnea/back.png diff --git a/graphics/pokemon/footprints/cacnea_footprint.png b/graphics/pokemon/cacnea/footprint.png similarity index 100% rename from graphics/pokemon/footprints/cacnea_footprint.png rename to graphics/pokemon/cacnea/footprint.png diff --git a/graphics/pokemon/front_pics/cacnea_still_front_pic.png b/graphics/pokemon/cacnea/front.png similarity index 100% rename from graphics/pokemon/front_pics/cacnea_still_front_pic.png rename to graphics/pokemon/cacnea/front.png diff --git a/graphics/pokemon/icons/cacnea_icon.png b/graphics/pokemon/cacnea/icon.png similarity index 100% rename from graphics/pokemon/icons/cacnea_icon.png rename to graphics/pokemon/cacnea/icon.png diff --git a/graphics/pokemon/palettes/cacnea_palette.pal b/graphics/pokemon/cacnea/normal.pal similarity index 100% rename from graphics/pokemon/palettes/cacnea_palette.pal rename to graphics/pokemon/cacnea/normal.pal diff --git a/graphics/pokemon/palettes/cacnea_shiny_palette.pal b/graphics/pokemon/cacnea/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/cacnea_shiny_palette.pal rename to graphics/pokemon/cacnea/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/cacturne_front_pic.png b/graphics/pokemon/cacturne/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/cacturne_front_pic.png rename to graphics/pokemon/cacturne/anim_front.png diff --git a/graphics/pokemon/back_pics/cacturne_back_pic.png b/graphics/pokemon/cacturne/back.png similarity index 100% rename from graphics/pokemon/back_pics/cacturne_back_pic.png rename to graphics/pokemon/cacturne/back.png diff --git a/graphics/pokemon/footprints/cacturne_footprint.png b/graphics/pokemon/cacturne/footprint.png similarity index 100% rename from graphics/pokemon/footprints/cacturne_footprint.png rename to graphics/pokemon/cacturne/footprint.png diff --git a/graphics/pokemon/front_pics/cacturne_still_front_pic.png b/graphics/pokemon/cacturne/front.png similarity index 100% rename from graphics/pokemon/front_pics/cacturne_still_front_pic.png rename to graphics/pokemon/cacturne/front.png diff --git a/graphics/pokemon/icons/cacturne_icon.png b/graphics/pokemon/cacturne/icon.png similarity index 100% rename from graphics/pokemon/icons/cacturne_icon.png rename to graphics/pokemon/cacturne/icon.png diff --git a/graphics/pokemon/palettes/cacturne_palette.pal b/graphics/pokemon/cacturne/normal.pal similarity index 100% rename from graphics/pokemon/palettes/cacturne_palette.pal rename to graphics/pokemon/cacturne/normal.pal diff --git a/graphics/pokemon/palettes/cacturne_shiny_palette.pal b/graphics/pokemon/cacturne/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/cacturne_shiny_palette.pal rename to graphics/pokemon/cacturne/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/camerupt_front_pic.png b/graphics/pokemon/camerupt/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/camerupt_front_pic.png rename to graphics/pokemon/camerupt/anim_front.png diff --git a/graphics/pokemon/back_pics/camerupt_back_pic.png b/graphics/pokemon/camerupt/back.png similarity index 100% rename from graphics/pokemon/back_pics/camerupt_back_pic.png rename to graphics/pokemon/camerupt/back.png diff --git a/graphics/pokemon/footprints/camerupt_footprint.png b/graphics/pokemon/camerupt/footprint.png similarity index 100% rename from graphics/pokemon/footprints/camerupt_footprint.png rename to graphics/pokemon/camerupt/footprint.png diff --git a/graphics/pokemon/front_pics/camerupt_still_front_pic.png b/graphics/pokemon/camerupt/front.png similarity index 100% rename from graphics/pokemon/front_pics/camerupt_still_front_pic.png rename to graphics/pokemon/camerupt/front.png diff --git a/graphics/pokemon/icons/camerupt_icon.png b/graphics/pokemon/camerupt/icon.png similarity index 100% rename from graphics/pokemon/icons/camerupt_icon.png rename to graphics/pokemon/camerupt/icon.png diff --git a/graphics/pokemon/palettes/camerupt_palette.pal b/graphics/pokemon/camerupt/normal.pal similarity index 100% rename from graphics/pokemon/palettes/camerupt_palette.pal rename to graphics/pokemon/camerupt/normal.pal diff --git a/graphics/pokemon/palettes/camerupt_shiny_palette.pal b/graphics/pokemon/camerupt/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/camerupt_shiny_palette.pal rename to graphics/pokemon/camerupt/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/carvanha_front_pic.png b/graphics/pokemon/carvanha/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/carvanha_front_pic.png rename to graphics/pokemon/carvanha/anim_front.png diff --git a/graphics/pokemon/back_pics/carvanha_back_pic.png b/graphics/pokemon/carvanha/back.png similarity index 100% rename from graphics/pokemon/back_pics/carvanha_back_pic.png rename to graphics/pokemon/carvanha/back.png diff --git a/graphics/pokemon/footprints/carvanha_footprint.png b/graphics/pokemon/carvanha/footprint.png similarity index 100% rename from graphics/pokemon/footprints/carvanha_footprint.png rename to graphics/pokemon/carvanha/footprint.png diff --git a/graphics/pokemon/front_pics/carvanha_still_front_pic.png b/graphics/pokemon/carvanha/front.png similarity index 100% rename from graphics/pokemon/front_pics/carvanha_still_front_pic.png rename to graphics/pokemon/carvanha/front.png diff --git a/graphics/pokemon/icons/carvanha_icon.png b/graphics/pokemon/carvanha/icon.png similarity index 100% rename from graphics/pokemon/icons/carvanha_icon.png rename to graphics/pokemon/carvanha/icon.png diff --git a/graphics/pokemon/palettes/carvanha_palette.pal b/graphics/pokemon/carvanha/normal.pal similarity index 100% rename from graphics/pokemon/palettes/carvanha_palette.pal rename to graphics/pokemon/carvanha/normal.pal diff --git a/graphics/pokemon/palettes/carvanha_shiny_palette.pal b/graphics/pokemon/carvanha/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/carvanha_shiny_palette.pal rename to graphics/pokemon/carvanha/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/cascoon_front_pic.png b/graphics/pokemon/cascoon/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/cascoon_front_pic.png rename to graphics/pokemon/cascoon/anim_front.png diff --git a/graphics/pokemon/back_pics/cascoon_back_pic.png b/graphics/pokemon/cascoon/back.png similarity index 100% rename from graphics/pokemon/back_pics/cascoon_back_pic.png rename to graphics/pokemon/cascoon/back.png diff --git a/graphics/pokemon/footprints/cascoon_footprint.png b/graphics/pokemon/cascoon/footprint.png similarity index 100% rename from graphics/pokemon/footprints/cascoon_footprint.png rename to graphics/pokemon/cascoon/footprint.png diff --git a/graphics/pokemon/front_pics/cascoon_still_front_pic.png b/graphics/pokemon/cascoon/front.png similarity index 100% rename from graphics/pokemon/front_pics/cascoon_still_front_pic.png rename to graphics/pokemon/cascoon/front.png diff --git a/graphics/pokemon/icons/cascoon_icon.png b/graphics/pokemon/cascoon/icon.png similarity index 100% rename from graphics/pokemon/icons/cascoon_icon.png rename to graphics/pokemon/cascoon/icon.png diff --git a/graphics/pokemon/palettes/cascoon_palette.pal b/graphics/pokemon/cascoon/normal.pal similarity index 100% rename from graphics/pokemon/palettes/cascoon_palette.pal rename to graphics/pokemon/cascoon/normal.pal diff --git a/graphics/pokemon/palettes/cascoon_shiny_palette.pal b/graphics/pokemon/cascoon/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/cascoon_shiny_palette.pal rename to graphics/pokemon/cascoon/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/castform_normal_form_front_pic.png b/graphics/pokemon/castform/anim_front_normal_form.png similarity index 100% rename from graphics/pokemon/anim_front_pics/castform_normal_form_front_pic.png rename to graphics/pokemon/castform/anim_front_normal_form.png diff --git a/graphics/pokemon/anim_front_pics/castform_rainy_form_front_pic.png b/graphics/pokemon/castform/anim_front_rainy_form.png similarity index 100% rename from graphics/pokemon/anim_front_pics/castform_rainy_form_front_pic.png rename to graphics/pokemon/castform/anim_front_rainy_form.png diff --git a/graphics/pokemon/anim_front_pics/castform_snowy_form_front_pic.png b/graphics/pokemon/castform/anim_front_snowy_form.png similarity index 100% rename from graphics/pokemon/anim_front_pics/castform_snowy_form_front_pic.png rename to graphics/pokemon/castform/anim_front_snowy_form.png diff --git a/graphics/pokemon/anim_front_pics/castform_sunny_form_front_pic.png b/graphics/pokemon/castform/anim_front_sunny_form.png similarity index 100% rename from graphics/pokemon/anim_front_pics/castform_sunny_form_front_pic.png rename to graphics/pokemon/castform/anim_front_sunny_form.png diff --git a/graphics/pokemon/back_pics/castform_normal_form_back_pic.png b/graphics/pokemon/castform/back_normal_form.png similarity index 100% rename from graphics/pokemon/back_pics/castform_normal_form_back_pic.png rename to graphics/pokemon/castform/back_normal_form.png diff --git a/graphics/pokemon/back_pics/castform_rainy_form_back_pic.png b/graphics/pokemon/castform/back_rainy_form.png similarity index 100% rename from graphics/pokemon/back_pics/castform_rainy_form_back_pic.png rename to graphics/pokemon/castform/back_rainy_form.png diff --git a/graphics/pokemon/back_pics/castform_snowy_form_back_pic.png b/graphics/pokemon/castform/back_snowy_form.png similarity index 100% rename from graphics/pokemon/back_pics/castform_snowy_form_back_pic.png rename to graphics/pokemon/castform/back_snowy_form.png diff --git a/graphics/pokemon/back_pics/castform_sunny_form_back_pic.png b/graphics/pokemon/castform/back_sunny_form.png similarity index 100% rename from graphics/pokemon/back_pics/castform_sunny_form_back_pic.png rename to graphics/pokemon/castform/back_sunny_form.png diff --git a/graphics/pokemon/footprints/castform_footprint.png b/graphics/pokemon/castform/footprint.png similarity index 100% rename from graphics/pokemon/footprints/castform_footprint.png rename to graphics/pokemon/castform/footprint.png diff --git a/graphics/pokemon/front_pics/castform_normal_form_still_front_pic.png b/graphics/pokemon/castform/front_normal_form.png similarity index 100% rename from graphics/pokemon/front_pics/castform_normal_form_still_front_pic.png rename to graphics/pokemon/castform/front_normal_form.png diff --git a/graphics/pokemon/front_pics/castform_rainy_form_still_front_pic.png b/graphics/pokemon/castform/front_rainy_form.png similarity index 100% rename from graphics/pokemon/front_pics/castform_rainy_form_still_front_pic.png rename to graphics/pokemon/castform/front_rainy_form.png diff --git a/graphics/pokemon/front_pics/castform_snowy_form_still_front_pic.png b/graphics/pokemon/castform/front_snowy_form.png similarity index 100% rename from graphics/pokemon/front_pics/castform_snowy_form_still_front_pic.png rename to graphics/pokemon/castform/front_snowy_form.png diff --git a/graphics/pokemon/front_pics/castform_sunny_form_still_front_pic.png b/graphics/pokemon/castform/front_sunny_form.png similarity index 100% rename from graphics/pokemon/front_pics/castform_sunny_form_still_front_pic.png rename to graphics/pokemon/castform/front_sunny_form.png diff --git a/graphics/pokemon/icons/castform_icon.png b/graphics/pokemon/castform/icon.png similarity index 100% rename from graphics/pokemon/icons/castform_icon.png rename to graphics/pokemon/castform/icon.png diff --git a/graphics/pokemon/palettes/castform_normal_form_palette.pal b/graphics/pokemon/castform/normal_normal_form.pal similarity index 100% rename from graphics/pokemon/palettes/castform_normal_form_palette.pal rename to graphics/pokemon/castform/normal_normal_form.pal diff --git a/graphics/pokemon/palettes/castform_rainy_form_palette.pal b/graphics/pokemon/castform/normal_rainy_form.pal similarity index 100% rename from graphics/pokemon/palettes/castform_rainy_form_palette.pal rename to graphics/pokemon/castform/normal_rainy_form.pal diff --git a/graphics/pokemon/palettes/castform_snowy_form_palette.pal b/graphics/pokemon/castform/normal_snowy_form.pal similarity index 100% rename from graphics/pokemon/palettes/castform_snowy_form_palette.pal rename to graphics/pokemon/castform/normal_snowy_form.pal diff --git a/graphics/pokemon/palettes/castform_sunny_form_palette.pal b/graphics/pokemon/castform/normal_sunny_form.pal similarity index 100% rename from graphics/pokemon/palettes/castform_sunny_form_palette.pal rename to graphics/pokemon/castform/normal_sunny_form.pal diff --git a/graphics/pokemon/palettes/castform_normal_form_shiny_palette.pal b/graphics/pokemon/castform/shiny_normal_form.pal similarity index 100% rename from graphics/pokemon/palettes/castform_normal_form_shiny_palette.pal rename to graphics/pokemon/castform/shiny_normal_form.pal diff --git a/graphics/pokemon/palettes/castform_rainy_form_shiny_palette.pal b/graphics/pokemon/castform/shiny_rainy_form.pal similarity index 100% rename from graphics/pokemon/palettes/castform_rainy_form_shiny_palette.pal rename to graphics/pokemon/castform/shiny_rainy_form.pal diff --git a/graphics/pokemon/palettes/castform_snowy_form_shiny_palette.pal b/graphics/pokemon/castform/shiny_snowy_form.pal similarity index 100% rename from graphics/pokemon/palettes/castform_snowy_form_shiny_palette.pal rename to graphics/pokemon/castform/shiny_snowy_form.pal diff --git a/graphics/pokemon/palettes/castform_sunny_form_shiny_palette.pal b/graphics/pokemon/castform/shiny_sunny_form.pal similarity index 100% rename from graphics/pokemon/palettes/castform_sunny_form_shiny_palette.pal rename to graphics/pokemon/castform/shiny_sunny_form.pal diff --git a/graphics/pokemon/anim_front_pics/caterpie_front_pic.png b/graphics/pokemon/caterpie/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/caterpie_front_pic.png rename to graphics/pokemon/caterpie/anim_front.png diff --git a/graphics/pokemon/back_pics/caterpie_back_pic.png b/graphics/pokemon/caterpie/back.png similarity index 100% rename from graphics/pokemon/back_pics/caterpie_back_pic.png rename to graphics/pokemon/caterpie/back.png diff --git a/graphics/pokemon/footprints/caterpie_footprint.png b/graphics/pokemon/caterpie/footprint.png similarity index 100% rename from graphics/pokemon/footprints/caterpie_footprint.png rename to graphics/pokemon/caterpie/footprint.png diff --git a/graphics/pokemon/front_pics/caterpie_still_front_pic.png b/graphics/pokemon/caterpie/front.png similarity index 100% rename from graphics/pokemon/front_pics/caterpie_still_front_pic.png rename to graphics/pokemon/caterpie/front.png diff --git a/graphics/pokemon/icons/caterpie_icon.png b/graphics/pokemon/caterpie/icon.png similarity index 100% rename from graphics/pokemon/icons/caterpie_icon.png rename to graphics/pokemon/caterpie/icon.png diff --git a/graphics/pokemon/palettes/caterpie_palette.pal b/graphics/pokemon/caterpie/normal.pal similarity index 100% rename from graphics/pokemon/palettes/caterpie_palette.pal rename to graphics/pokemon/caterpie/normal.pal diff --git a/graphics/pokemon/palettes/caterpie_shiny_palette.pal b/graphics/pokemon/caterpie/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/caterpie_shiny_palette.pal rename to graphics/pokemon/caterpie/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/celebi_front_pic.png b/graphics/pokemon/celebi/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/celebi_front_pic.png rename to graphics/pokemon/celebi/anim_front.png diff --git a/graphics/pokemon/back_pics/celebi_back_pic.png b/graphics/pokemon/celebi/back.png similarity index 100% rename from graphics/pokemon/back_pics/celebi_back_pic.png rename to graphics/pokemon/celebi/back.png diff --git a/graphics/pokemon/footprints/celebi_footprint.png b/graphics/pokemon/celebi/footprint.png similarity index 100% rename from graphics/pokemon/footprints/celebi_footprint.png rename to graphics/pokemon/celebi/footprint.png diff --git a/graphics/pokemon/front_pics/celebi_still_front_pic.png b/graphics/pokemon/celebi/front.png similarity index 100% rename from graphics/pokemon/front_pics/celebi_still_front_pic.png rename to graphics/pokemon/celebi/front.png diff --git a/graphics/pokemon/icons/celebi_icon.png b/graphics/pokemon/celebi/icon.png similarity index 100% rename from graphics/pokemon/icons/celebi_icon.png rename to graphics/pokemon/celebi/icon.png diff --git a/graphics/pokemon/palettes/celebi_palette.pal b/graphics/pokemon/celebi/normal.pal similarity index 100% rename from graphics/pokemon/palettes/celebi_palette.pal rename to graphics/pokemon/celebi/normal.pal diff --git a/graphics/pokemon/palettes/celebi_shiny_palette.pal b/graphics/pokemon/celebi/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/celebi_shiny_palette.pal rename to graphics/pokemon/celebi/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/chansey_front_pic.png b/graphics/pokemon/chansey/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/chansey_front_pic.png rename to graphics/pokemon/chansey/anim_front.png diff --git a/graphics/pokemon/back_pics/chansey_back_pic.png b/graphics/pokemon/chansey/back.png similarity index 100% rename from graphics/pokemon/back_pics/chansey_back_pic.png rename to graphics/pokemon/chansey/back.png diff --git a/graphics/pokemon/footprints/chansey_footprint.png b/graphics/pokemon/chansey/footprint.png similarity index 100% rename from graphics/pokemon/footprints/chansey_footprint.png rename to graphics/pokemon/chansey/footprint.png diff --git a/graphics/pokemon/front_pics/chansey_still_front_pic.png b/graphics/pokemon/chansey/front.png similarity index 100% rename from graphics/pokemon/front_pics/chansey_still_front_pic.png rename to graphics/pokemon/chansey/front.png diff --git a/graphics/pokemon/icons/chansey_icon.png b/graphics/pokemon/chansey/icon.png similarity index 100% rename from graphics/pokemon/icons/chansey_icon.png rename to graphics/pokemon/chansey/icon.png diff --git a/graphics/pokemon/palettes/chansey_palette.pal b/graphics/pokemon/chansey/normal.pal similarity index 100% rename from graphics/pokemon/palettes/chansey_palette.pal rename to graphics/pokemon/chansey/normal.pal diff --git a/graphics/pokemon/palettes/chansey_shiny_palette.pal b/graphics/pokemon/chansey/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/chansey_shiny_palette.pal rename to graphics/pokemon/chansey/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/charizard_front_pic.png b/graphics/pokemon/charizard/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/charizard_front_pic.png rename to graphics/pokemon/charizard/anim_front.png diff --git a/graphics/pokemon/back_pics/charizard_back_pic.png b/graphics/pokemon/charizard/back.png similarity index 100% rename from graphics/pokemon/back_pics/charizard_back_pic.png rename to graphics/pokemon/charizard/back.png diff --git a/graphics/pokemon/footprints/charizard_footprint.png b/graphics/pokemon/charizard/footprint.png similarity index 100% rename from graphics/pokemon/footprints/charizard_footprint.png rename to graphics/pokemon/charizard/footprint.png diff --git a/graphics/pokemon/front_pics/charizard_still_front_pic.png b/graphics/pokemon/charizard/front.png similarity index 100% rename from graphics/pokemon/front_pics/charizard_still_front_pic.png rename to graphics/pokemon/charizard/front.png diff --git a/graphics/pokemon/icons/charizard_icon.png b/graphics/pokemon/charizard/icon.png similarity index 100% rename from graphics/pokemon/icons/charizard_icon.png rename to graphics/pokemon/charizard/icon.png diff --git a/graphics/pokemon/palettes/charizard_palette.pal b/graphics/pokemon/charizard/normal.pal similarity index 100% rename from graphics/pokemon/palettes/charizard_palette.pal rename to graphics/pokemon/charizard/normal.pal diff --git a/graphics/pokemon/palettes/charizard_shiny_palette.pal b/graphics/pokemon/charizard/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/charizard_shiny_palette.pal rename to graphics/pokemon/charizard/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/charmander_front_pic.png b/graphics/pokemon/charmander/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/charmander_front_pic.png rename to graphics/pokemon/charmander/anim_front.png diff --git a/graphics/pokemon/back_pics/charmander_back_pic.png b/graphics/pokemon/charmander/back.png similarity index 100% rename from graphics/pokemon/back_pics/charmander_back_pic.png rename to graphics/pokemon/charmander/back.png diff --git a/graphics/pokemon/footprints/charmander_footprint.png b/graphics/pokemon/charmander/footprint.png similarity index 100% rename from graphics/pokemon/footprints/charmander_footprint.png rename to graphics/pokemon/charmander/footprint.png diff --git a/graphics/pokemon/front_pics/charmander_still_front_pic.png b/graphics/pokemon/charmander/front.png similarity index 100% rename from graphics/pokemon/front_pics/charmander_still_front_pic.png rename to graphics/pokemon/charmander/front.png diff --git a/graphics/pokemon/icons/charmander_icon.png b/graphics/pokemon/charmander/icon.png similarity index 100% rename from graphics/pokemon/icons/charmander_icon.png rename to graphics/pokemon/charmander/icon.png diff --git a/graphics/pokemon/palettes/charmander_palette.pal b/graphics/pokemon/charmander/normal.pal similarity index 100% rename from graphics/pokemon/palettes/charmander_palette.pal rename to graphics/pokemon/charmander/normal.pal diff --git a/graphics/pokemon/palettes/charmander_shiny_palette.pal b/graphics/pokemon/charmander/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/charmander_shiny_palette.pal rename to graphics/pokemon/charmander/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/charmeleon_front_pic.png b/graphics/pokemon/charmeleon/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/charmeleon_front_pic.png rename to graphics/pokemon/charmeleon/anim_front.png diff --git a/graphics/pokemon/back_pics/charmeleon_back_pic.png b/graphics/pokemon/charmeleon/back.png similarity index 100% rename from graphics/pokemon/back_pics/charmeleon_back_pic.png rename to graphics/pokemon/charmeleon/back.png diff --git a/graphics/pokemon/footprints/charmeleon_footprint.png b/graphics/pokemon/charmeleon/footprint.png similarity index 100% rename from graphics/pokemon/footprints/charmeleon_footprint.png rename to graphics/pokemon/charmeleon/footprint.png diff --git a/graphics/pokemon/front_pics/charmeleon_still_front_pic.png b/graphics/pokemon/charmeleon/front.png similarity index 100% rename from graphics/pokemon/front_pics/charmeleon_still_front_pic.png rename to graphics/pokemon/charmeleon/front.png diff --git a/graphics/pokemon/icons/charmeleon_icon.png b/graphics/pokemon/charmeleon/icon.png similarity index 100% rename from graphics/pokemon/icons/charmeleon_icon.png rename to graphics/pokemon/charmeleon/icon.png diff --git a/graphics/pokemon/palettes/charmeleon_palette.pal b/graphics/pokemon/charmeleon/normal.pal similarity index 100% rename from graphics/pokemon/palettes/charmeleon_palette.pal rename to graphics/pokemon/charmeleon/normal.pal diff --git a/graphics/pokemon/palettes/charmeleon_shiny_palette.pal b/graphics/pokemon/charmeleon/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/charmeleon_shiny_palette.pal rename to graphics/pokemon/charmeleon/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/chikorita_front_pic.png b/graphics/pokemon/chikorita/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/chikorita_front_pic.png rename to graphics/pokemon/chikorita/anim_front.png diff --git a/graphics/pokemon/back_pics/chikorita_back_pic.png b/graphics/pokemon/chikorita/back.png similarity index 100% rename from graphics/pokemon/back_pics/chikorita_back_pic.png rename to graphics/pokemon/chikorita/back.png diff --git a/graphics/pokemon/footprints/chikorita_footprint.png b/graphics/pokemon/chikorita/footprint.png similarity index 100% rename from graphics/pokemon/footprints/chikorita_footprint.png rename to graphics/pokemon/chikorita/footprint.png diff --git a/graphics/pokemon/front_pics/chikorita_still_front_pic.png b/graphics/pokemon/chikorita/front.png similarity index 100% rename from graphics/pokemon/front_pics/chikorita_still_front_pic.png rename to graphics/pokemon/chikorita/front.png diff --git a/graphics/pokemon/icons/chikorita_icon.png b/graphics/pokemon/chikorita/icon.png similarity index 100% rename from graphics/pokemon/icons/chikorita_icon.png rename to graphics/pokemon/chikorita/icon.png diff --git a/graphics/pokemon/palettes/chikorita_palette.pal b/graphics/pokemon/chikorita/normal.pal similarity index 100% rename from graphics/pokemon/palettes/chikorita_palette.pal rename to graphics/pokemon/chikorita/normal.pal diff --git a/graphics/pokemon/palettes/chikorita_shiny_palette.pal b/graphics/pokemon/chikorita/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/chikorita_shiny_palette.pal rename to graphics/pokemon/chikorita/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/chimecho_front_pic.png b/graphics/pokemon/chimecho/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/chimecho_front_pic.png rename to graphics/pokemon/chimecho/anim_front.png diff --git a/graphics/pokemon/back_pics/chimecho_back_pic.png b/graphics/pokemon/chimecho/back.png similarity index 100% rename from graphics/pokemon/back_pics/chimecho_back_pic.png rename to graphics/pokemon/chimecho/back.png diff --git a/graphics/pokemon/footprints/chimecho_footprint.png b/graphics/pokemon/chimecho/footprint.png similarity index 100% rename from graphics/pokemon/footprints/chimecho_footprint.png rename to graphics/pokemon/chimecho/footprint.png diff --git a/graphics/pokemon/front_pics/chimecho_still_front_pic.png b/graphics/pokemon/chimecho/front.png similarity index 100% rename from graphics/pokemon/front_pics/chimecho_still_front_pic.png rename to graphics/pokemon/chimecho/front.png diff --git a/graphics/pokemon/icons/chimecho_icon.png b/graphics/pokemon/chimecho/icon.png similarity index 100% rename from graphics/pokemon/icons/chimecho_icon.png rename to graphics/pokemon/chimecho/icon.png diff --git a/graphics/pokemon/palettes/chimecho_palette.pal b/graphics/pokemon/chimecho/normal.pal similarity index 100% rename from graphics/pokemon/palettes/chimecho_palette.pal rename to graphics/pokemon/chimecho/normal.pal diff --git a/graphics/pokemon/palettes/chimecho_shiny_palette.pal b/graphics/pokemon/chimecho/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/chimecho_shiny_palette.pal rename to graphics/pokemon/chimecho/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/chinchou_front_pic.png b/graphics/pokemon/chinchou/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/chinchou_front_pic.png rename to graphics/pokemon/chinchou/anim_front.png diff --git a/graphics/pokemon/back_pics/chinchou_back_pic.png b/graphics/pokemon/chinchou/back.png similarity index 100% rename from graphics/pokemon/back_pics/chinchou_back_pic.png rename to graphics/pokemon/chinchou/back.png diff --git a/graphics/pokemon/footprints/chinchou_footprint.png b/graphics/pokemon/chinchou/footprint.png similarity index 100% rename from graphics/pokemon/footprints/chinchou_footprint.png rename to graphics/pokemon/chinchou/footprint.png diff --git a/graphics/pokemon/front_pics/chinchou_still_front_pic.png b/graphics/pokemon/chinchou/front.png similarity index 100% rename from graphics/pokemon/front_pics/chinchou_still_front_pic.png rename to graphics/pokemon/chinchou/front.png diff --git a/graphics/pokemon/icons/chinchou_icon.png b/graphics/pokemon/chinchou/icon.png similarity index 100% rename from graphics/pokemon/icons/chinchou_icon.png rename to graphics/pokemon/chinchou/icon.png diff --git a/graphics/pokemon/palettes/chinchou_palette.pal b/graphics/pokemon/chinchou/normal.pal similarity index 100% rename from graphics/pokemon/palettes/chinchou_palette.pal rename to graphics/pokemon/chinchou/normal.pal diff --git a/graphics/pokemon/palettes/chinchou_shiny_palette.pal b/graphics/pokemon/chinchou/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/chinchou_shiny_palette.pal rename to graphics/pokemon/chinchou/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/circled_question_mark_front_pic.png b/graphics/pokemon/circled_question_mark/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/circled_question_mark_front_pic.png rename to graphics/pokemon/circled_question_mark/anim_front.png diff --git a/graphics/pokemon/back_pics/circled_question_mark_back_pic.png b/graphics/pokemon/circled_question_mark/back.png similarity index 100% rename from graphics/pokemon/back_pics/circled_question_mark_back_pic.png rename to graphics/pokemon/circled_question_mark/back.png diff --git a/graphics/pokemon/front_pics/circled_question_mark_still_front_pic.png b/graphics/pokemon/circled_question_mark/front.png similarity index 100% rename from graphics/pokemon/front_pics/circled_question_mark_still_front_pic.png rename to graphics/pokemon/circled_question_mark/front.png diff --git a/graphics/pokemon/palettes/circled_question_mark_palette.pal b/graphics/pokemon/circled_question_mark/normal.pal similarity index 100% rename from graphics/pokemon/palettes/circled_question_mark_palette.pal rename to graphics/pokemon/circled_question_mark/normal.pal diff --git a/graphics/pokemon/palettes/circled_question_mark_shiny_palette.pal b/graphics/pokemon/circled_question_mark/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/circled_question_mark_shiny_palette.pal rename to graphics/pokemon/circled_question_mark/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/clamperl_front_pic.png b/graphics/pokemon/clamperl/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/clamperl_front_pic.png rename to graphics/pokemon/clamperl/anim_front.png diff --git a/graphics/pokemon/back_pics/clamperl_back_pic.png b/graphics/pokemon/clamperl/back.png similarity index 100% rename from graphics/pokemon/back_pics/clamperl_back_pic.png rename to graphics/pokemon/clamperl/back.png diff --git a/graphics/pokemon/footprints/clamperl_footprint.png b/graphics/pokemon/clamperl/footprint.png similarity index 100% rename from graphics/pokemon/footprints/clamperl_footprint.png rename to graphics/pokemon/clamperl/footprint.png diff --git a/graphics/pokemon/front_pics/clamperl_still_front_pic.png b/graphics/pokemon/clamperl/front.png similarity index 100% rename from graphics/pokemon/front_pics/clamperl_still_front_pic.png rename to graphics/pokemon/clamperl/front.png diff --git a/graphics/pokemon/icons/clamperl_icon.png b/graphics/pokemon/clamperl/icon.png similarity index 100% rename from graphics/pokemon/icons/clamperl_icon.png rename to graphics/pokemon/clamperl/icon.png diff --git a/graphics/pokemon/palettes/clamperl_palette.pal b/graphics/pokemon/clamperl/normal.pal similarity index 100% rename from graphics/pokemon/palettes/clamperl_palette.pal rename to graphics/pokemon/clamperl/normal.pal diff --git a/graphics/pokemon/palettes/clamperl_shiny_palette.pal b/graphics/pokemon/clamperl/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/clamperl_shiny_palette.pal rename to graphics/pokemon/clamperl/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/claydol_front_pic.png b/graphics/pokemon/claydol/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/claydol_front_pic.png rename to graphics/pokemon/claydol/anim_front.png diff --git a/graphics/pokemon/back_pics/claydol_back_pic.png b/graphics/pokemon/claydol/back.png similarity index 100% rename from graphics/pokemon/back_pics/claydol_back_pic.png rename to graphics/pokemon/claydol/back.png diff --git a/graphics/pokemon/footprints/claydol_footprint.png b/graphics/pokemon/claydol/footprint.png similarity index 100% rename from graphics/pokemon/footprints/claydol_footprint.png rename to graphics/pokemon/claydol/footprint.png diff --git a/graphics/pokemon/front_pics/claydol_still_front_pic.png b/graphics/pokemon/claydol/front.png similarity index 100% rename from graphics/pokemon/front_pics/claydol_still_front_pic.png rename to graphics/pokemon/claydol/front.png diff --git a/graphics/pokemon/icons/claydol_icon.png b/graphics/pokemon/claydol/icon.png similarity index 100% rename from graphics/pokemon/icons/claydol_icon.png rename to graphics/pokemon/claydol/icon.png diff --git a/graphics/pokemon/palettes/claydol_palette.pal b/graphics/pokemon/claydol/normal.pal similarity index 100% rename from graphics/pokemon/palettes/claydol_palette.pal rename to graphics/pokemon/claydol/normal.pal diff --git a/graphics/pokemon/palettes/claydol_shiny_palette.pal b/graphics/pokemon/claydol/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/claydol_shiny_palette.pal rename to graphics/pokemon/claydol/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/clefable_front_pic.png b/graphics/pokemon/clefable/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/clefable_front_pic.png rename to graphics/pokemon/clefable/anim_front.png diff --git a/graphics/pokemon/back_pics/clefable_back_pic.png b/graphics/pokemon/clefable/back.png similarity index 100% rename from graphics/pokemon/back_pics/clefable_back_pic.png rename to graphics/pokemon/clefable/back.png diff --git a/graphics/pokemon/footprints/clefable_footprint.png b/graphics/pokemon/clefable/footprint.png similarity index 100% rename from graphics/pokemon/footprints/clefable_footprint.png rename to graphics/pokemon/clefable/footprint.png diff --git a/graphics/pokemon/front_pics/clefable_still_front_pic.png b/graphics/pokemon/clefable/front.png similarity index 100% rename from graphics/pokemon/front_pics/clefable_still_front_pic.png rename to graphics/pokemon/clefable/front.png diff --git a/graphics/pokemon/icons/clefable_icon.png b/graphics/pokemon/clefable/icon.png similarity index 100% rename from graphics/pokemon/icons/clefable_icon.png rename to graphics/pokemon/clefable/icon.png diff --git a/graphics/pokemon/palettes/clefable_palette.pal b/graphics/pokemon/clefable/normal.pal similarity index 100% rename from graphics/pokemon/palettes/clefable_palette.pal rename to graphics/pokemon/clefable/normal.pal diff --git a/graphics/pokemon/palettes/clefable_shiny_palette.pal b/graphics/pokemon/clefable/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/clefable_shiny_palette.pal rename to graphics/pokemon/clefable/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/clefairy_front_pic.png b/graphics/pokemon/clefairy/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/clefairy_front_pic.png rename to graphics/pokemon/clefairy/anim_front.png diff --git a/graphics/pokemon/back_pics/clefairy_back_pic.png b/graphics/pokemon/clefairy/back.png similarity index 100% rename from graphics/pokemon/back_pics/clefairy_back_pic.png rename to graphics/pokemon/clefairy/back.png diff --git a/graphics/pokemon/footprints/clefairy_footprint.png b/graphics/pokemon/clefairy/footprint.png similarity index 100% rename from graphics/pokemon/footprints/clefairy_footprint.png rename to graphics/pokemon/clefairy/footprint.png diff --git a/graphics/pokemon/front_pics/clefairy_still_front_pic.png b/graphics/pokemon/clefairy/front.png similarity index 100% rename from graphics/pokemon/front_pics/clefairy_still_front_pic.png rename to graphics/pokemon/clefairy/front.png diff --git a/graphics/pokemon/icons/clefairy_icon.png b/graphics/pokemon/clefairy/icon.png similarity index 100% rename from graphics/pokemon/icons/clefairy_icon.png rename to graphics/pokemon/clefairy/icon.png diff --git a/graphics/pokemon/palettes/clefairy_palette.pal b/graphics/pokemon/clefairy/normal.pal similarity index 100% rename from graphics/pokemon/palettes/clefairy_palette.pal rename to graphics/pokemon/clefairy/normal.pal diff --git a/graphics/pokemon/palettes/clefairy_shiny_palette.pal b/graphics/pokemon/clefairy/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/clefairy_shiny_palette.pal rename to graphics/pokemon/clefairy/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/cleffa_front_pic.png b/graphics/pokemon/cleffa/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/cleffa_front_pic.png rename to graphics/pokemon/cleffa/anim_front.png diff --git a/graphics/pokemon/back_pics/cleffa_back_pic.png b/graphics/pokemon/cleffa/back.png similarity index 100% rename from graphics/pokemon/back_pics/cleffa_back_pic.png rename to graphics/pokemon/cleffa/back.png diff --git a/graphics/pokemon/footprints/cleffa_footprint.png b/graphics/pokemon/cleffa/footprint.png similarity index 100% rename from graphics/pokemon/footprints/cleffa_footprint.png rename to graphics/pokemon/cleffa/footprint.png diff --git a/graphics/pokemon/front_pics/cleffa_still_front_pic.png b/graphics/pokemon/cleffa/front.png similarity index 100% rename from graphics/pokemon/front_pics/cleffa_still_front_pic.png rename to graphics/pokemon/cleffa/front.png diff --git a/graphics/pokemon/icons/cleffa_icon.png b/graphics/pokemon/cleffa/icon.png similarity index 100% rename from graphics/pokemon/icons/cleffa_icon.png rename to graphics/pokemon/cleffa/icon.png diff --git a/graphics/pokemon/palettes/cleffa_palette.pal b/graphics/pokemon/cleffa/normal.pal similarity index 100% rename from graphics/pokemon/palettes/cleffa_palette.pal rename to graphics/pokemon/cleffa/normal.pal diff --git a/graphics/pokemon/palettes/cleffa_shiny_palette.pal b/graphics/pokemon/cleffa/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/cleffa_shiny_palette.pal rename to graphics/pokemon/cleffa/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/cloyster_front_pic.png b/graphics/pokemon/cloyster/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/cloyster_front_pic.png rename to graphics/pokemon/cloyster/anim_front.png diff --git a/graphics/pokemon/back_pics/cloyster_back_pic.png b/graphics/pokemon/cloyster/back.png similarity index 100% rename from graphics/pokemon/back_pics/cloyster_back_pic.png rename to graphics/pokemon/cloyster/back.png diff --git a/graphics/pokemon/footprints/cloyster_footprint.png b/graphics/pokemon/cloyster/footprint.png similarity index 100% rename from graphics/pokemon/footprints/cloyster_footprint.png rename to graphics/pokemon/cloyster/footprint.png diff --git a/graphics/pokemon/front_pics/cloyster_still_front_pic.png b/graphics/pokemon/cloyster/front.png similarity index 100% rename from graphics/pokemon/front_pics/cloyster_still_front_pic.png rename to graphics/pokemon/cloyster/front.png diff --git a/graphics/pokemon/icons/cloyster_icon.png b/graphics/pokemon/cloyster/icon.png similarity index 100% rename from graphics/pokemon/icons/cloyster_icon.png rename to graphics/pokemon/cloyster/icon.png diff --git a/graphics/pokemon/palettes/cloyster_palette.pal b/graphics/pokemon/cloyster/normal.pal similarity index 100% rename from graphics/pokemon/palettes/cloyster_palette.pal rename to graphics/pokemon/cloyster/normal.pal diff --git a/graphics/pokemon/palettes/cloyster_shiny_palette.pal b/graphics/pokemon/cloyster/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/cloyster_shiny_palette.pal rename to graphics/pokemon/cloyster/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/combusken_front_pic.png b/graphics/pokemon/combusken/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/combusken_front_pic.png rename to graphics/pokemon/combusken/anim_front.png diff --git a/graphics/pokemon/back_pics/combusken_back_pic.png b/graphics/pokemon/combusken/back.png similarity index 100% rename from graphics/pokemon/back_pics/combusken_back_pic.png rename to graphics/pokemon/combusken/back.png diff --git a/graphics/pokemon/footprints/combusken_footprint.png b/graphics/pokemon/combusken/footprint.png similarity index 100% rename from graphics/pokemon/footprints/combusken_footprint.png rename to graphics/pokemon/combusken/footprint.png diff --git a/graphics/pokemon/front_pics/combusken_still_front_pic.png b/graphics/pokemon/combusken/front.png similarity index 100% rename from graphics/pokemon/front_pics/combusken_still_front_pic.png rename to graphics/pokemon/combusken/front.png diff --git a/graphics/pokemon/icons/combusken_icon.png b/graphics/pokemon/combusken/icon.png similarity index 100% rename from graphics/pokemon/icons/combusken_icon.png rename to graphics/pokemon/combusken/icon.png diff --git a/graphics/pokemon/palettes/combusken_palette.pal b/graphics/pokemon/combusken/normal.pal similarity index 100% rename from graphics/pokemon/palettes/combusken_palette.pal rename to graphics/pokemon/combusken/normal.pal diff --git a/graphics/pokemon/palettes/combusken_shiny_palette.pal b/graphics/pokemon/combusken/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/combusken_shiny_palette.pal rename to graphics/pokemon/combusken/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/corphish_front_pic.png b/graphics/pokemon/corphish/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/corphish_front_pic.png rename to graphics/pokemon/corphish/anim_front.png diff --git a/graphics/pokemon/back_pics/corphish_back_pic.png b/graphics/pokemon/corphish/back.png similarity index 100% rename from graphics/pokemon/back_pics/corphish_back_pic.png rename to graphics/pokemon/corphish/back.png diff --git a/graphics/pokemon/footprints/corphish_footprint.png b/graphics/pokemon/corphish/footprint.png similarity index 100% rename from graphics/pokemon/footprints/corphish_footprint.png rename to graphics/pokemon/corphish/footprint.png diff --git a/graphics/pokemon/front_pics/corphish_still_front_pic.png b/graphics/pokemon/corphish/front.png similarity index 100% rename from graphics/pokemon/front_pics/corphish_still_front_pic.png rename to graphics/pokemon/corphish/front.png diff --git a/graphics/pokemon/icons/corphish_icon.png b/graphics/pokemon/corphish/icon.png similarity index 100% rename from graphics/pokemon/icons/corphish_icon.png rename to graphics/pokemon/corphish/icon.png diff --git a/graphics/pokemon/palettes/corphish_palette.pal b/graphics/pokemon/corphish/normal.pal similarity index 100% rename from graphics/pokemon/palettes/corphish_palette.pal rename to graphics/pokemon/corphish/normal.pal diff --git a/graphics/pokemon/palettes/corphish_shiny_palette.pal b/graphics/pokemon/corphish/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/corphish_shiny_palette.pal rename to graphics/pokemon/corphish/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/corsola_front_pic.png b/graphics/pokemon/corsola/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/corsola_front_pic.png rename to graphics/pokemon/corsola/anim_front.png diff --git a/graphics/pokemon/back_pics/corsola_back_pic.png b/graphics/pokemon/corsola/back.png similarity index 100% rename from graphics/pokemon/back_pics/corsola_back_pic.png rename to graphics/pokemon/corsola/back.png diff --git a/graphics/pokemon/footprints/corsola_footprint.png b/graphics/pokemon/corsola/footprint.png similarity index 100% rename from graphics/pokemon/footprints/corsola_footprint.png rename to graphics/pokemon/corsola/footprint.png diff --git a/graphics/pokemon/front_pics/corsola_still_front_pic.png b/graphics/pokemon/corsola/front.png similarity index 100% rename from graphics/pokemon/front_pics/corsola_still_front_pic.png rename to graphics/pokemon/corsola/front.png diff --git a/graphics/pokemon/icons/corsola_icon.png b/graphics/pokemon/corsola/icon.png similarity index 100% rename from graphics/pokemon/icons/corsola_icon.png rename to graphics/pokemon/corsola/icon.png diff --git a/graphics/pokemon/palettes/corsola_palette.pal b/graphics/pokemon/corsola/normal.pal similarity index 100% rename from graphics/pokemon/palettes/corsola_palette.pal rename to graphics/pokemon/corsola/normal.pal diff --git a/graphics/pokemon/palettes/corsola_shiny_palette.pal b/graphics/pokemon/corsola/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/corsola_shiny_palette.pal rename to graphics/pokemon/corsola/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/cradily_front_pic.png b/graphics/pokemon/cradily/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/cradily_front_pic.png rename to graphics/pokemon/cradily/anim_front.png diff --git a/graphics/pokemon/back_pics/cradily_back_pic.png b/graphics/pokemon/cradily/back.png similarity index 100% rename from graphics/pokemon/back_pics/cradily_back_pic.png rename to graphics/pokemon/cradily/back.png diff --git a/graphics/pokemon/footprints/cradily_footprint.png b/graphics/pokemon/cradily/footprint.png similarity index 100% rename from graphics/pokemon/footprints/cradily_footprint.png rename to graphics/pokemon/cradily/footprint.png diff --git a/graphics/pokemon/front_pics/cradily_still_front_pic.png b/graphics/pokemon/cradily/front.png similarity index 100% rename from graphics/pokemon/front_pics/cradily_still_front_pic.png rename to graphics/pokemon/cradily/front.png diff --git a/graphics/pokemon/icons/cradily_icon.png b/graphics/pokemon/cradily/icon.png similarity index 100% rename from graphics/pokemon/icons/cradily_icon.png rename to graphics/pokemon/cradily/icon.png diff --git a/graphics/pokemon/palettes/cradily_palette.pal b/graphics/pokemon/cradily/normal.pal similarity index 100% rename from graphics/pokemon/palettes/cradily_palette.pal rename to graphics/pokemon/cradily/normal.pal diff --git a/graphics/pokemon/palettes/cradily_shiny_palette.pal b/graphics/pokemon/cradily/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/cradily_shiny_palette.pal rename to graphics/pokemon/cradily/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/crawdaunt_front_pic.png b/graphics/pokemon/crawdaunt/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/crawdaunt_front_pic.png rename to graphics/pokemon/crawdaunt/anim_front.png diff --git a/graphics/pokemon/back_pics/crawdaunt_back_pic.png b/graphics/pokemon/crawdaunt/back.png similarity index 100% rename from graphics/pokemon/back_pics/crawdaunt_back_pic.png rename to graphics/pokemon/crawdaunt/back.png diff --git a/graphics/pokemon/footprints/crawdaunt_footprint.png b/graphics/pokemon/crawdaunt/footprint.png similarity index 100% rename from graphics/pokemon/footprints/crawdaunt_footprint.png rename to graphics/pokemon/crawdaunt/footprint.png diff --git a/graphics/pokemon/front_pics/crawdaunt_still_front_pic.png b/graphics/pokemon/crawdaunt/front.png similarity index 100% rename from graphics/pokemon/front_pics/crawdaunt_still_front_pic.png rename to graphics/pokemon/crawdaunt/front.png diff --git a/graphics/pokemon/icons/crawdaunt_icon.png b/graphics/pokemon/crawdaunt/icon.png similarity index 100% rename from graphics/pokemon/icons/crawdaunt_icon.png rename to graphics/pokemon/crawdaunt/icon.png diff --git a/graphics/pokemon/palettes/crawdaunt_palette.pal b/graphics/pokemon/crawdaunt/normal.pal similarity index 100% rename from graphics/pokemon/palettes/crawdaunt_palette.pal rename to graphics/pokemon/crawdaunt/normal.pal diff --git a/graphics/pokemon/palettes/crawdaunt_shiny_palette.pal b/graphics/pokemon/crawdaunt/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/crawdaunt_shiny_palette.pal rename to graphics/pokemon/crawdaunt/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/crobat_front_pic.png b/graphics/pokemon/crobat/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/crobat_front_pic.png rename to graphics/pokemon/crobat/anim_front.png diff --git a/graphics/pokemon/back_pics/crobat_back_pic.png b/graphics/pokemon/crobat/back.png similarity index 100% rename from graphics/pokemon/back_pics/crobat_back_pic.png rename to graphics/pokemon/crobat/back.png diff --git a/graphics/pokemon/footprints/crobat_footprint.png b/graphics/pokemon/crobat/footprint.png similarity index 100% rename from graphics/pokemon/footprints/crobat_footprint.png rename to graphics/pokemon/crobat/footprint.png diff --git a/graphics/pokemon/front_pics/crobat_still_front_pic.png b/graphics/pokemon/crobat/front.png similarity index 100% rename from graphics/pokemon/front_pics/crobat_still_front_pic.png rename to graphics/pokemon/crobat/front.png diff --git a/graphics/pokemon/icons/crobat_icon.png b/graphics/pokemon/crobat/icon.png similarity index 100% rename from graphics/pokemon/icons/crobat_icon.png rename to graphics/pokemon/crobat/icon.png diff --git a/graphics/pokemon/palettes/crobat_palette.pal b/graphics/pokemon/crobat/normal.pal similarity index 100% rename from graphics/pokemon/palettes/crobat_palette.pal rename to graphics/pokemon/crobat/normal.pal diff --git a/graphics/pokemon/palettes/crobat_shiny_palette.pal b/graphics/pokemon/crobat/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/crobat_shiny_palette.pal rename to graphics/pokemon/crobat/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/croconaw_front_pic.png b/graphics/pokemon/croconaw/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/croconaw_front_pic.png rename to graphics/pokemon/croconaw/anim_front.png diff --git a/graphics/pokemon/back_pics/croconaw_back_pic.png b/graphics/pokemon/croconaw/back.png similarity index 100% rename from graphics/pokemon/back_pics/croconaw_back_pic.png rename to graphics/pokemon/croconaw/back.png diff --git a/graphics/pokemon/footprints/croconaw_footprint.png b/graphics/pokemon/croconaw/footprint.png similarity index 100% rename from graphics/pokemon/footprints/croconaw_footprint.png rename to graphics/pokemon/croconaw/footprint.png diff --git a/graphics/pokemon/front_pics/croconaw_still_front_pic.png b/graphics/pokemon/croconaw/front.png similarity index 100% rename from graphics/pokemon/front_pics/croconaw_still_front_pic.png rename to graphics/pokemon/croconaw/front.png diff --git a/graphics/pokemon/icons/croconaw_icon.png b/graphics/pokemon/croconaw/icon.png similarity index 100% rename from graphics/pokemon/icons/croconaw_icon.png rename to graphics/pokemon/croconaw/icon.png diff --git a/graphics/pokemon/palettes/croconaw_palette.pal b/graphics/pokemon/croconaw/normal.pal similarity index 100% rename from graphics/pokemon/palettes/croconaw_palette.pal rename to graphics/pokemon/croconaw/normal.pal diff --git a/graphics/pokemon/palettes/croconaw_shiny_palette.pal b/graphics/pokemon/croconaw/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/croconaw_shiny_palette.pal rename to graphics/pokemon/croconaw/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/cubone_front_pic.png b/graphics/pokemon/cubone/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/cubone_front_pic.png rename to graphics/pokemon/cubone/anim_front.png diff --git a/graphics/pokemon/back_pics/cubone_back_pic.png b/graphics/pokemon/cubone/back.png similarity index 100% rename from graphics/pokemon/back_pics/cubone_back_pic.png rename to graphics/pokemon/cubone/back.png diff --git a/graphics/pokemon/footprints/cubone_footprint.png b/graphics/pokemon/cubone/footprint.png similarity index 100% rename from graphics/pokemon/footprints/cubone_footprint.png rename to graphics/pokemon/cubone/footprint.png diff --git a/graphics/pokemon/front_pics/cubone_still_front_pic.png b/graphics/pokemon/cubone/front.png similarity index 100% rename from graphics/pokemon/front_pics/cubone_still_front_pic.png rename to graphics/pokemon/cubone/front.png diff --git a/graphics/pokemon/icons/cubone_icon.png b/graphics/pokemon/cubone/icon.png similarity index 100% rename from graphics/pokemon/icons/cubone_icon.png rename to graphics/pokemon/cubone/icon.png diff --git a/graphics/pokemon/palettes/cubone_palette.pal b/graphics/pokemon/cubone/normal.pal similarity index 100% rename from graphics/pokemon/palettes/cubone_palette.pal rename to graphics/pokemon/cubone/normal.pal diff --git a/graphics/pokemon/palettes/cubone_shiny_palette.pal b/graphics/pokemon/cubone/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/cubone_shiny_palette.pal rename to graphics/pokemon/cubone/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/cyndaquil_front_pic.png b/graphics/pokemon/cyndaquil/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/cyndaquil_front_pic.png rename to graphics/pokemon/cyndaquil/anim_front.png diff --git a/graphics/pokemon/back_pics/cyndaquil_back_pic.png b/graphics/pokemon/cyndaquil/back.png similarity index 100% rename from graphics/pokemon/back_pics/cyndaquil_back_pic.png rename to graphics/pokemon/cyndaquil/back.png diff --git a/graphics/pokemon/footprints/cyndaquil_footprint.png b/graphics/pokemon/cyndaquil/footprint.png similarity index 100% rename from graphics/pokemon/footprints/cyndaquil_footprint.png rename to graphics/pokemon/cyndaquil/footprint.png diff --git a/graphics/pokemon/front_pics/cyndaquil_still_front_pic.png b/graphics/pokemon/cyndaquil/front.png similarity index 100% rename from graphics/pokemon/front_pics/cyndaquil_still_front_pic.png rename to graphics/pokemon/cyndaquil/front.png diff --git a/graphics/pokemon/icons/cyndaquil_icon.png b/graphics/pokemon/cyndaquil/icon.png similarity index 100% rename from graphics/pokemon/icons/cyndaquil_icon.png rename to graphics/pokemon/cyndaquil/icon.png diff --git a/graphics/pokemon/palettes/cyndaquil_palette.pal b/graphics/pokemon/cyndaquil/normal.pal similarity index 100% rename from graphics/pokemon/palettes/cyndaquil_palette.pal rename to graphics/pokemon/cyndaquil/normal.pal diff --git a/graphics/pokemon/palettes/cyndaquil_shiny_palette.pal b/graphics/pokemon/cyndaquil/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/cyndaquil_shiny_palette.pal rename to graphics/pokemon/cyndaquil/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/delcatty_front_pic.png b/graphics/pokemon/delcatty/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/delcatty_front_pic.png rename to graphics/pokemon/delcatty/anim_front.png diff --git a/graphics/pokemon/back_pics/delcatty_back_pic.png b/graphics/pokemon/delcatty/back.png similarity index 100% rename from graphics/pokemon/back_pics/delcatty_back_pic.png rename to graphics/pokemon/delcatty/back.png diff --git a/graphics/pokemon/footprints/delcatty_footprint.png b/graphics/pokemon/delcatty/footprint.png similarity index 100% rename from graphics/pokemon/footprints/delcatty_footprint.png rename to graphics/pokemon/delcatty/footprint.png diff --git a/graphics/pokemon/front_pics/delcatty_still_front_pic.png b/graphics/pokemon/delcatty/front.png similarity index 100% rename from graphics/pokemon/front_pics/delcatty_still_front_pic.png rename to graphics/pokemon/delcatty/front.png diff --git a/graphics/pokemon/icons/delcatty_icon.png b/graphics/pokemon/delcatty/icon.png similarity index 100% rename from graphics/pokemon/icons/delcatty_icon.png rename to graphics/pokemon/delcatty/icon.png diff --git a/graphics/pokemon/palettes/delcatty_palette.pal b/graphics/pokemon/delcatty/normal.pal similarity index 100% rename from graphics/pokemon/palettes/delcatty_palette.pal rename to graphics/pokemon/delcatty/normal.pal diff --git a/graphics/pokemon/palettes/delcatty_shiny_palette.pal b/graphics/pokemon/delcatty/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/delcatty_shiny_palette.pal rename to graphics/pokemon/delcatty/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/delibird_front_pic.png b/graphics/pokemon/delibird/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/delibird_front_pic.png rename to graphics/pokemon/delibird/anim_front.png diff --git a/graphics/pokemon/back_pics/delibird_back_pic.png b/graphics/pokemon/delibird/back.png similarity index 100% rename from graphics/pokemon/back_pics/delibird_back_pic.png rename to graphics/pokemon/delibird/back.png diff --git a/graphics/pokemon/footprints/delibird_footprint.png b/graphics/pokemon/delibird/footprint.png similarity index 100% rename from graphics/pokemon/footprints/delibird_footprint.png rename to graphics/pokemon/delibird/footprint.png diff --git a/graphics/pokemon/front_pics/delibird_still_front_pic.png b/graphics/pokemon/delibird/front.png similarity index 100% rename from graphics/pokemon/front_pics/delibird_still_front_pic.png rename to graphics/pokemon/delibird/front.png diff --git a/graphics/pokemon/icons/delibird_icon.png b/graphics/pokemon/delibird/icon.png similarity index 100% rename from graphics/pokemon/icons/delibird_icon.png rename to graphics/pokemon/delibird/icon.png diff --git a/graphics/pokemon/palettes/delibird_palette.pal b/graphics/pokemon/delibird/normal.pal similarity index 100% rename from graphics/pokemon/palettes/delibird_palette.pal rename to graphics/pokemon/delibird/normal.pal diff --git a/graphics/pokemon/palettes/delibird_shiny_palette.pal b/graphics/pokemon/delibird/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/delibird_shiny_palette.pal rename to graphics/pokemon/delibird/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/deoxys_front_pic.png b/graphics/pokemon/deoxys/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/deoxys_front_pic.png rename to graphics/pokemon/deoxys/anim_front.png diff --git a/graphics/pokemon/back_pics/deoxys_back_pic.png b/graphics/pokemon/deoxys/back.png similarity index 100% rename from graphics/pokemon/back_pics/deoxys_back_pic.png rename to graphics/pokemon/deoxys/back.png diff --git a/graphics/pokemon/footprints/deoxys_footprint.png b/graphics/pokemon/deoxys/footprint.png similarity index 100% rename from graphics/pokemon/footprints/deoxys_footprint.png rename to graphics/pokemon/deoxys/footprint.png diff --git a/graphics/pokemon/front_pics/deoxys_still_front_pic.png b/graphics/pokemon/deoxys/front.png similarity index 100% rename from graphics/pokemon/front_pics/deoxys_still_front_pic.png rename to graphics/pokemon/deoxys/front.png diff --git a/graphics/pokemon/icons/deoxys_icon.png b/graphics/pokemon/deoxys/icon.png similarity index 100% rename from graphics/pokemon/icons/deoxys_icon.png rename to graphics/pokemon/deoxys/icon.png diff --git a/graphics/pokemon/icons/deoxys_speed_icon.png b/graphics/pokemon/deoxys/icon_speed.png similarity index 100% rename from graphics/pokemon/icons/deoxys_speed_icon.png rename to graphics/pokemon/deoxys/icon_speed.png diff --git a/graphics/pokemon/palettes/deoxys_palette.pal b/graphics/pokemon/deoxys/normal.pal similarity index 100% rename from graphics/pokemon/palettes/deoxys_palette.pal rename to graphics/pokemon/deoxys/normal.pal diff --git a/graphics/pokemon/palettes/deoxys_shiny_palette.pal b/graphics/pokemon/deoxys/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/deoxys_shiny_palette.pal rename to graphics/pokemon/deoxys/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/dewgong_front_pic.png b/graphics/pokemon/dewgong/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/dewgong_front_pic.png rename to graphics/pokemon/dewgong/anim_front.png diff --git a/graphics/pokemon/back_pics/dewgong_back_pic.png b/graphics/pokemon/dewgong/back.png similarity index 100% rename from graphics/pokemon/back_pics/dewgong_back_pic.png rename to graphics/pokemon/dewgong/back.png diff --git a/graphics/pokemon/footprints/dewgong_footprint.png b/graphics/pokemon/dewgong/footprint.png similarity index 100% rename from graphics/pokemon/footprints/dewgong_footprint.png rename to graphics/pokemon/dewgong/footprint.png diff --git a/graphics/pokemon/front_pics/dewgong_still_front_pic.png b/graphics/pokemon/dewgong/front.png similarity index 100% rename from graphics/pokemon/front_pics/dewgong_still_front_pic.png rename to graphics/pokemon/dewgong/front.png diff --git a/graphics/pokemon/icons/dewgong_icon.png b/graphics/pokemon/dewgong/icon.png similarity index 100% rename from graphics/pokemon/icons/dewgong_icon.png rename to graphics/pokemon/dewgong/icon.png diff --git a/graphics/pokemon/palettes/dewgong_palette.pal b/graphics/pokemon/dewgong/normal.pal similarity index 100% rename from graphics/pokemon/palettes/dewgong_palette.pal rename to graphics/pokemon/dewgong/normal.pal diff --git a/graphics/pokemon/palettes/dewgong_shiny_palette.pal b/graphics/pokemon/dewgong/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/dewgong_shiny_palette.pal rename to graphics/pokemon/dewgong/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/diglett_front_pic.png b/graphics/pokemon/diglett/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/diglett_front_pic.png rename to graphics/pokemon/diglett/anim_front.png diff --git a/graphics/pokemon/back_pics/diglett_back_pic.png b/graphics/pokemon/diglett/back.png similarity index 100% rename from graphics/pokemon/back_pics/diglett_back_pic.png rename to graphics/pokemon/diglett/back.png diff --git a/graphics/pokemon/footprints/diglett_footprint.png b/graphics/pokemon/diglett/footprint.png similarity index 100% rename from graphics/pokemon/footprints/diglett_footprint.png rename to graphics/pokemon/diglett/footprint.png diff --git a/graphics/pokemon/front_pics/diglett_still_front_pic.png b/graphics/pokemon/diglett/front.png similarity index 100% rename from graphics/pokemon/front_pics/diglett_still_front_pic.png rename to graphics/pokemon/diglett/front.png diff --git a/graphics/pokemon/icons/diglett_icon.png b/graphics/pokemon/diglett/icon.png similarity index 100% rename from graphics/pokemon/icons/diglett_icon.png rename to graphics/pokemon/diglett/icon.png diff --git a/graphics/pokemon/palettes/diglett_palette.pal b/graphics/pokemon/diglett/normal.pal similarity index 100% rename from graphics/pokemon/palettes/diglett_palette.pal rename to graphics/pokemon/diglett/normal.pal diff --git a/graphics/pokemon/palettes/diglett_shiny_palette.pal b/graphics/pokemon/diglett/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/diglett_shiny_palette.pal rename to graphics/pokemon/diglett/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/ditto_front_pic.png b/graphics/pokemon/ditto/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/ditto_front_pic.png rename to graphics/pokemon/ditto/anim_front.png diff --git a/graphics/pokemon/back_pics/ditto_back_pic.png b/graphics/pokemon/ditto/back.png similarity index 100% rename from graphics/pokemon/back_pics/ditto_back_pic.png rename to graphics/pokemon/ditto/back.png diff --git a/graphics/pokemon/footprints/ditto_footprint.png b/graphics/pokemon/ditto/footprint.png similarity index 100% rename from graphics/pokemon/footprints/ditto_footprint.png rename to graphics/pokemon/ditto/footprint.png diff --git a/graphics/pokemon/front_pics/ditto_still_front_pic.png b/graphics/pokemon/ditto/front.png similarity index 100% rename from graphics/pokemon/front_pics/ditto_still_front_pic.png rename to graphics/pokemon/ditto/front.png diff --git a/graphics/pokemon/icons/ditto_icon.png b/graphics/pokemon/ditto/icon.png similarity index 100% rename from graphics/pokemon/icons/ditto_icon.png rename to graphics/pokemon/ditto/icon.png diff --git a/graphics/pokemon/palettes/ditto_palette.pal b/graphics/pokemon/ditto/normal.pal similarity index 100% rename from graphics/pokemon/palettes/ditto_palette.pal rename to graphics/pokemon/ditto/normal.pal diff --git a/graphics/pokemon/palettes/ditto_shiny_palette.pal b/graphics/pokemon/ditto/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/ditto_shiny_palette.pal rename to graphics/pokemon/ditto/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/dodrio_front_pic.png b/graphics/pokemon/dodrio/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/dodrio_front_pic.png rename to graphics/pokemon/dodrio/anim_front.png diff --git a/graphics/pokemon/back_pics/dodrio_back_pic.png b/graphics/pokemon/dodrio/back.png similarity index 100% rename from graphics/pokemon/back_pics/dodrio_back_pic.png rename to graphics/pokemon/dodrio/back.png diff --git a/graphics/pokemon/footprints/dodrio_footprint.png b/graphics/pokemon/dodrio/footprint.png similarity index 100% rename from graphics/pokemon/footprints/dodrio_footprint.png rename to graphics/pokemon/dodrio/footprint.png diff --git a/graphics/pokemon/front_pics/dodrio_still_front_pic.png b/graphics/pokemon/dodrio/front.png similarity index 100% rename from graphics/pokemon/front_pics/dodrio_still_front_pic.png rename to graphics/pokemon/dodrio/front.png diff --git a/graphics/pokemon/icons/dodrio_icon.png b/graphics/pokemon/dodrio/icon.png similarity index 100% rename from graphics/pokemon/icons/dodrio_icon.png rename to graphics/pokemon/dodrio/icon.png diff --git a/graphics/pokemon/palettes/dodrio_palette.pal b/graphics/pokemon/dodrio/normal.pal similarity index 100% rename from graphics/pokemon/palettes/dodrio_palette.pal rename to graphics/pokemon/dodrio/normal.pal diff --git a/graphics/pokemon/palettes/dodrio_shiny_palette.pal b/graphics/pokemon/dodrio/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/dodrio_shiny_palette.pal rename to graphics/pokemon/dodrio/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/doduo_front_pic.png b/graphics/pokemon/doduo/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/doduo_front_pic.png rename to graphics/pokemon/doduo/anim_front.png diff --git a/graphics/pokemon/back_pics/doduo_back_pic.png b/graphics/pokemon/doduo/back.png similarity index 100% rename from graphics/pokemon/back_pics/doduo_back_pic.png rename to graphics/pokemon/doduo/back.png diff --git a/graphics/pokemon/footprints/doduo_footprint.png b/graphics/pokemon/doduo/footprint.png similarity index 100% rename from graphics/pokemon/footprints/doduo_footprint.png rename to graphics/pokemon/doduo/footprint.png diff --git a/graphics/pokemon/front_pics/doduo_still_front_pic.png b/graphics/pokemon/doduo/front.png similarity index 100% rename from graphics/pokemon/front_pics/doduo_still_front_pic.png rename to graphics/pokemon/doduo/front.png diff --git a/graphics/pokemon/icons/doduo_icon.png b/graphics/pokemon/doduo/icon.png similarity index 100% rename from graphics/pokemon/icons/doduo_icon.png rename to graphics/pokemon/doduo/icon.png diff --git a/graphics/pokemon/palettes/doduo_palette.pal b/graphics/pokemon/doduo/normal.pal similarity index 100% rename from graphics/pokemon/palettes/doduo_palette.pal rename to graphics/pokemon/doduo/normal.pal diff --git a/graphics/pokemon/palettes/doduo_shiny_palette.pal b/graphics/pokemon/doduo/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/doduo_shiny_palette.pal rename to graphics/pokemon/doduo/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/donphan_front_pic.png b/graphics/pokemon/donphan/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/donphan_front_pic.png rename to graphics/pokemon/donphan/anim_front.png diff --git a/graphics/pokemon/back_pics/donphan_back_pic.png b/graphics/pokemon/donphan/back.png similarity index 100% rename from graphics/pokemon/back_pics/donphan_back_pic.png rename to graphics/pokemon/donphan/back.png diff --git a/graphics/pokemon/footprints/donphan_footprint.png b/graphics/pokemon/donphan/footprint.png similarity index 100% rename from graphics/pokemon/footprints/donphan_footprint.png rename to graphics/pokemon/donphan/footprint.png diff --git a/graphics/pokemon/front_pics/donphan_still_front_pic.png b/graphics/pokemon/donphan/front.png similarity index 100% rename from graphics/pokemon/front_pics/donphan_still_front_pic.png rename to graphics/pokemon/donphan/front.png diff --git a/graphics/pokemon/icons/donphan_icon.png b/graphics/pokemon/donphan/icon.png similarity index 100% rename from graphics/pokemon/icons/donphan_icon.png rename to graphics/pokemon/donphan/icon.png diff --git a/graphics/pokemon/palettes/donphan_palette.pal b/graphics/pokemon/donphan/normal.pal similarity index 100% rename from graphics/pokemon/palettes/donphan_palette.pal rename to graphics/pokemon/donphan/normal.pal diff --git a/graphics/pokemon/palettes/donphan_shiny_palette.pal b/graphics/pokemon/donphan/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/donphan_shiny_palette.pal rename to graphics/pokemon/donphan/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/double_question_mark_front_pic.png b/graphics/pokemon/double_question_mark/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/double_question_mark_front_pic.png rename to graphics/pokemon/double_question_mark/anim_front.png diff --git a/graphics/pokemon/back_pics/double_question_mark_back_pic.png b/graphics/pokemon/double_question_mark/back.png similarity index 100% rename from graphics/pokemon/back_pics/double_question_mark_back_pic.png rename to graphics/pokemon/double_question_mark/back.png diff --git a/graphics/pokemon/front_pics/double_question_mark_still_front_pic.png b/graphics/pokemon/double_question_mark/front.png similarity index 100% rename from graphics/pokemon/front_pics/double_question_mark_still_front_pic.png rename to graphics/pokemon/double_question_mark/front.png diff --git a/graphics/pokemon/palettes/double_question_mark_palette.pal b/graphics/pokemon/double_question_mark/normal.pal similarity index 100% rename from graphics/pokemon/palettes/double_question_mark_palette.pal rename to graphics/pokemon/double_question_mark/normal.pal diff --git a/graphics/pokemon/palettes/double_question_mark_shiny_palette.pal b/graphics/pokemon/double_question_mark/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/double_question_mark_shiny_palette.pal rename to graphics/pokemon/double_question_mark/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/dragonair_front_pic.png b/graphics/pokemon/dragonair/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/dragonair_front_pic.png rename to graphics/pokemon/dragonair/anim_front.png diff --git a/graphics/pokemon/back_pics/dragonair_back_pic.png b/graphics/pokemon/dragonair/back.png similarity index 100% rename from graphics/pokemon/back_pics/dragonair_back_pic.png rename to graphics/pokemon/dragonair/back.png diff --git a/graphics/pokemon/footprints/dragonair_footprint.png b/graphics/pokemon/dragonair/footprint.png similarity index 100% rename from graphics/pokemon/footprints/dragonair_footprint.png rename to graphics/pokemon/dragonair/footprint.png diff --git a/graphics/pokemon/front_pics/dragonair_still_front_pic.png b/graphics/pokemon/dragonair/front.png similarity index 100% rename from graphics/pokemon/front_pics/dragonair_still_front_pic.png rename to graphics/pokemon/dragonair/front.png diff --git a/graphics/pokemon/icons/dragonair_icon.png b/graphics/pokemon/dragonair/icon.png similarity index 100% rename from graphics/pokemon/icons/dragonair_icon.png rename to graphics/pokemon/dragonair/icon.png diff --git a/graphics/pokemon/palettes/dragonair_palette.pal b/graphics/pokemon/dragonair/normal.pal similarity index 100% rename from graphics/pokemon/palettes/dragonair_palette.pal rename to graphics/pokemon/dragonair/normal.pal diff --git a/graphics/pokemon/palettes/dragonair_shiny_palette.pal b/graphics/pokemon/dragonair/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/dragonair_shiny_palette.pal rename to graphics/pokemon/dragonair/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/dragonite_front_pic.png b/graphics/pokemon/dragonite/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/dragonite_front_pic.png rename to graphics/pokemon/dragonite/anim_front.png diff --git a/graphics/pokemon/back_pics/dragonite_back_pic.png b/graphics/pokemon/dragonite/back.png similarity index 100% rename from graphics/pokemon/back_pics/dragonite_back_pic.png rename to graphics/pokemon/dragonite/back.png diff --git a/graphics/pokemon/footprints/dragonite_footprint.png b/graphics/pokemon/dragonite/footprint.png similarity index 100% rename from graphics/pokemon/footprints/dragonite_footprint.png rename to graphics/pokemon/dragonite/footprint.png diff --git a/graphics/pokemon/front_pics/dragonite_still_front_pic.png b/graphics/pokemon/dragonite/front.png similarity index 100% rename from graphics/pokemon/front_pics/dragonite_still_front_pic.png rename to graphics/pokemon/dragonite/front.png diff --git a/graphics/pokemon/icons/dragonite_icon.png b/graphics/pokemon/dragonite/icon.png similarity index 100% rename from graphics/pokemon/icons/dragonite_icon.png rename to graphics/pokemon/dragonite/icon.png diff --git a/graphics/pokemon/palettes/dragonite_palette.pal b/graphics/pokemon/dragonite/normal.pal similarity index 100% rename from graphics/pokemon/palettes/dragonite_palette.pal rename to graphics/pokemon/dragonite/normal.pal diff --git a/graphics/pokemon/palettes/dragonite_shiny_palette.pal b/graphics/pokemon/dragonite/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/dragonite_shiny_palette.pal rename to graphics/pokemon/dragonite/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/dratini_front_pic.png b/graphics/pokemon/dratini/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/dratini_front_pic.png rename to graphics/pokemon/dratini/anim_front.png diff --git a/graphics/pokemon/back_pics/dratini_back_pic.png b/graphics/pokemon/dratini/back.png similarity index 100% rename from graphics/pokemon/back_pics/dratini_back_pic.png rename to graphics/pokemon/dratini/back.png diff --git a/graphics/pokemon/footprints/dratini_footprint.png b/graphics/pokemon/dratini/footprint.png similarity index 100% rename from graphics/pokemon/footprints/dratini_footprint.png rename to graphics/pokemon/dratini/footprint.png diff --git a/graphics/pokemon/front_pics/dratini_still_front_pic.png b/graphics/pokemon/dratini/front.png similarity index 100% rename from graphics/pokemon/front_pics/dratini_still_front_pic.png rename to graphics/pokemon/dratini/front.png diff --git a/graphics/pokemon/icons/dratini_icon.png b/graphics/pokemon/dratini/icon.png similarity index 100% rename from graphics/pokemon/icons/dratini_icon.png rename to graphics/pokemon/dratini/icon.png diff --git a/graphics/pokemon/palettes/dratini_palette.pal b/graphics/pokemon/dratini/normal.pal similarity index 100% rename from graphics/pokemon/palettes/dratini_palette.pal rename to graphics/pokemon/dratini/normal.pal diff --git a/graphics/pokemon/palettes/dratini_shiny_palette.pal b/graphics/pokemon/dratini/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/dratini_shiny_palette.pal rename to graphics/pokemon/dratini/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/drowzee_front_pic.png b/graphics/pokemon/drowzee/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/drowzee_front_pic.png rename to graphics/pokemon/drowzee/anim_front.png diff --git a/graphics/pokemon/back_pics/drowzee_back_pic.png b/graphics/pokemon/drowzee/back.png similarity index 100% rename from graphics/pokemon/back_pics/drowzee_back_pic.png rename to graphics/pokemon/drowzee/back.png diff --git a/graphics/pokemon/footprints/drowzee_footprint.png b/graphics/pokemon/drowzee/footprint.png similarity index 100% rename from graphics/pokemon/footprints/drowzee_footprint.png rename to graphics/pokemon/drowzee/footprint.png diff --git a/graphics/pokemon/front_pics/drowzee_still_front_pic.png b/graphics/pokemon/drowzee/front.png similarity index 100% rename from graphics/pokemon/front_pics/drowzee_still_front_pic.png rename to graphics/pokemon/drowzee/front.png diff --git a/graphics/pokemon/icons/drowzee_icon.png b/graphics/pokemon/drowzee/icon.png similarity index 100% rename from graphics/pokemon/icons/drowzee_icon.png rename to graphics/pokemon/drowzee/icon.png diff --git a/graphics/pokemon/palettes/drowzee_palette.pal b/graphics/pokemon/drowzee/normal.pal similarity index 100% rename from graphics/pokemon/palettes/drowzee_palette.pal rename to graphics/pokemon/drowzee/normal.pal diff --git a/graphics/pokemon/palettes/drowzee_shiny_palette.pal b/graphics/pokemon/drowzee/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/drowzee_shiny_palette.pal rename to graphics/pokemon/drowzee/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/dugtrio_front_pic.png b/graphics/pokemon/dugtrio/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/dugtrio_front_pic.png rename to graphics/pokemon/dugtrio/anim_front.png diff --git a/graphics/pokemon/back_pics/dugtrio_back_pic.png b/graphics/pokemon/dugtrio/back.png similarity index 100% rename from graphics/pokemon/back_pics/dugtrio_back_pic.png rename to graphics/pokemon/dugtrio/back.png diff --git a/graphics/pokemon/footprints/dugtrio_footprint.png b/graphics/pokemon/dugtrio/footprint.png similarity index 100% rename from graphics/pokemon/footprints/dugtrio_footprint.png rename to graphics/pokemon/dugtrio/footprint.png diff --git a/graphics/pokemon/front_pics/dugtrio_still_front_pic.png b/graphics/pokemon/dugtrio/front.png similarity index 100% rename from graphics/pokemon/front_pics/dugtrio_still_front_pic.png rename to graphics/pokemon/dugtrio/front.png diff --git a/graphics/pokemon/icons/dugtrio_icon.png b/graphics/pokemon/dugtrio/icon.png similarity index 100% rename from graphics/pokemon/icons/dugtrio_icon.png rename to graphics/pokemon/dugtrio/icon.png diff --git a/graphics/pokemon/palettes/dugtrio_palette.pal b/graphics/pokemon/dugtrio/normal.pal similarity index 100% rename from graphics/pokemon/palettes/dugtrio_palette.pal rename to graphics/pokemon/dugtrio/normal.pal diff --git a/graphics/pokemon/palettes/dugtrio_shiny_palette.pal b/graphics/pokemon/dugtrio/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/dugtrio_shiny_palette.pal rename to graphics/pokemon/dugtrio/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/dunsparce_front_pic.png b/graphics/pokemon/dunsparce/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/dunsparce_front_pic.png rename to graphics/pokemon/dunsparce/anim_front.png diff --git a/graphics/pokemon/back_pics/dunsparce_back_pic.png b/graphics/pokemon/dunsparce/back.png similarity index 100% rename from graphics/pokemon/back_pics/dunsparce_back_pic.png rename to graphics/pokemon/dunsparce/back.png diff --git a/graphics/pokemon/footprints/dunsparce_footprint.png b/graphics/pokemon/dunsparce/footprint.png similarity index 100% rename from graphics/pokemon/footprints/dunsparce_footprint.png rename to graphics/pokemon/dunsparce/footprint.png diff --git a/graphics/pokemon/front_pics/dunsparce_still_front_pic.png b/graphics/pokemon/dunsparce/front.png similarity index 100% rename from graphics/pokemon/front_pics/dunsparce_still_front_pic.png rename to graphics/pokemon/dunsparce/front.png diff --git a/graphics/pokemon/icons/dunsparce_icon.png b/graphics/pokemon/dunsparce/icon.png similarity index 100% rename from graphics/pokemon/icons/dunsparce_icon.png rename to graphics/pokemon/dunsparce/icon.png diff --git a/graphics/pokemon/palettes/dunsparce_palette.pal b/graphics/pokemon/dunsparce/normal.pal similarity index 100% rename from graphics/pokemon/palettes/dunsparce_palette.pal rename to graphics/pokemon/dunsparce/normal.pal diff --git a/graphics/pokemon/palettes/dunsparce_shiny_palette.pal b/graphics/pokemon/dunsparce/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/dunsparce_shiny_palette.pal rename to graphics/pokemon/dunsparce/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/dusclops_front_pic.png b/graphics/pokemon/dusclops/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/dusclops_front_pic.png rename to graphics/pokemon/dusclops/anim_front.png diff --git a/graphics/pokemon/back_pics/dusclops_back_pic.png b/graphics/pokemon/dusclops/back.png similarity index 100% rename from graphics/pokemon/back_pics/dusclops_back_pic.png rename to graphics/pokemon/dusclops/back.png diff --git a/graphics/pokemon/footprints/dusclops_footprint.png b/graphics/pokemon/dusclops/footprint.png similarity index 100% rename from graphics/pokemon/footprints/dusclops_footprint.png rename to graphics/pokemon/dusclops/footprint.png diff --git a/graphics/pokemon/front_pics/dusclops_still_front_pic.png b/graphics/pokemon/dusclops/front.png similarity index 100% rename from graphics/pokemon/front_pics/dusclops_still_front_pic.png rename to graphics/pokemon/dusclops/front.png diff --git a/graphics/pokemon/icons/dusclops_icon.png b/graphics/pokemon/dusclops/icon.png similarity index 100% rename from graphics/pokemon/icons/dusclops_icon.png rename to graphics/pokemon/dusclops/icon.png diff --git a/graphics/pokemon/palettes/dusclops_palette.pal b/graphics/pokemon/dusclops/normal.pal similarity index 100% rename from graphics/pokemon/palettes/dusclops_palette.pal rename to graphics/pokemon/dusclops/normal.pal diff --git a/graphics/pokemon/palettes/dusclops_shiny_palette.pal b/graphics/pokemon/dusclops/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/dusclops_shiny_palette.pal rename to graphics/pokemon/dusclops/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/duskull_front_pic.png b/graphics/pokemon/duskull/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/duskull_front_pic.png rename to graphics/pokemon/duskull/anim_front.png diff --git a/graphics/pokemon/back_pics/duskull_back_pic.png b/graphics/pokemon/duskull/back.png similarity index 100% rename from graphics/pokemon/back_pics/duskull_back_pic.png rename to graphics/pokemon/duskull/back.png diff --git a/graphics/pokemon/footprints/duskull_footprint.png b/graphics/pokemon/duskull/footprint.png similarity index 100% rename from graphics/pokemon/footprints/duskull_footprint.png rename to graphics/pokemon/duskull/footprint.png diff --git a/graphics/pokemon/front_pics/duskull_still_front_pic.png b/graphics/pokemon/duskull/front.png similarity index 100% rename from graphics/pokemon/front_pics/duskull_still_front_pic.png rename to graphics/pokemon/duskull/front.png diff --git a/graphics/pokemon/icons/duskull_icon.png b/graphics/pokemon/duskull/icon.png similarity index 100% rename from graphics/pokemon/icons/duskull_icon.png rename to graphics/pokemon/duskull/icon.png diff --git a/graphics/pokemon/palettes/duskull_palette.pal b/graphics/pokemon/duskull/normal.pal similarity index 100% rename from graphics/pokemon/palettes/duskull_palette.pal rename to graphics/pokemon/duskull/normal.pal diff --git a/graphics/pokemon/palettes/duskull_shiny_palette.pal b/graphics/pokemon/duskull/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/duskull_shiny_palette.pal rename to graphics/pokemon/duskull/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/dustox_front_pic.png b/graphics/pokemon/dustox/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/dustox_front_pic.png rename to graphics/pokemon/dustox/anim_front.png diff --git a/graphics/pokemon/back_pics/dustox_back_pic.png b/graphics/pokemon/dustox/back.png similarity index 100% rename from graphics/pokemon/back_pics/dustox_back_pic.png rename to graphics/pokemon/dustox/back.png diff --git a/graphics/pokemon/footprints/dustox_footprint.png b/graphics/pokemon/dustox/footprint.png similarity index 100% rename from graphics/pokemon/footprints/dustox_footprint.png rename to graphics/pokemon/dustox/footprint.png diff --git a/graphics/pokemon/front_pics/dustox_still_front_pic.png b/graphics/pokemon/dustox/front.png similarity index 100% rename from graphics/pokemon/front_pics/dustox_still_front_pic.png rename to graphics/pokemon/dustox/front.png diff --git a/graphics/pokemon/icons/dustox_icon.png b/graphics/pokemon/dustox/icon.png similarity index 100% rename from graphics/pokemon/icons/dustox_icon.png rename to graphics/pokemon/dustox/icon.png diff --git a/graphics/pokemon/palettes/dustox_palette.pal b/graphics/pokemon/dustox/normal.pal similarity index 100% rename from graphics/pokemon/palettes/dustox_palette.pal rename to graphics/pokemon/dustox/normal.pal diff --git a/graphics/pokemon/palettes/dustox_shiny_palette.pal b/graphics/pokemon/dustox/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/dustox_shiny_palette.pal rename to graphics/pokemon/dustox/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/eevee_front_pic.png b/graphics/pokemon/eevee/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/eevee_front_pic.png rename to graphics/pokemon/eevee/anim_front.png diff --git a/graphics/pokemon/back_pics/eevee_back_pic.png b/graphics/pokemon/eevee/back.png similarity index 100% rename from graphics/pokemon/back_pics/eevee_back_pic.png rename to graphics/pokemon/eevee/back.png diff --git a/graphics/pokemon/footprints/eevee_footprint.png b/graphics/pokemon/eevee/footprint.png similarity index 100% rename from graphics/pokemon/footprints/eevee_footprint.png rename to graphics/pokemon/eevee/footprint.png diff --git a/graphics/pokemon/front_pics/eevee_still_front_pic.png b/graphics/pokemon/eevee/front.png similarity index 100% rename from graphics/pokemon/front_pics/eevee_still_front_pic.png rename to graphics/pokemon/eevee/front.png diff --git a/graphics/pokemon/icons/eevee_icon.png b/graphics/pokemon/eevee/icon.png similarity index 100% rename from graphics/pokemon/icons/eevee_icon.png rename to graphics/pokemon/eevee/icon.png diff --git a/graphics/pokemon/palettes/eevee_palette.pal b/graphics/pokemon/eevee/normal.pal similarity index 100% rename from graphics/pokemon/palettes/eevee_palette.pal rename to graphics/pokemon/eevee/normal.pal diff --git a/graphics/pokemon/palettes/eevee_shiny_palette.pal b/graphics/pokemon/eevee/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/eevee_shiny_palette.pal rename to graphics/pokemon/eevee/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/egg_front_pic.png b/graphics/pokemon/egg/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/egg_front_pic.png rename to graphics/pokemon/egg/anim_front.png diff --git a/graphics/pokemon/front_pics/egg_still_front_pic.png b/graphics/pokemon/egg/front.png similarity index 100% rename from graphics/pokemon/front_pics/egg_still_front_pic.png rename to graphics/pokemon/egg/front.png diff --git a/graphics/pokemon/icons/egg_icon.png b/graphics/pokemon/egg/icon.png similarity index 100% rename from graphics/pokemon/icons/egg_icon.png rename to graphics/pokemon/egg/icon.png diff --git a/graphics/pokemon/palettes/egg_palette.pal b/graphics/pokemon/egg/normal.pal similarity index 100% rename from graphics/pokemon/palettes/egg_palette.pal rename to graphics/pokemon/egg/normal.pal diff --git a/graphics/pokemon/anim_front_pics/ekans_front_pic.png b/graphics/pokemon/ekans/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/ekans_front_pic.png rename to graphics/pokemon/ekans/anim_front.png diff --git a/graphics/pokemon/back_pics/ekans_back_pic.png b/graphics/pokemon/ekans/back.png similarity index 100% rename from graphics/pokemon/back_pics/ekans_back_pic.png rename to graphics/pokemon/ekans/back.png diff --git a/graphics/pokemon/footprints/ekans_footprint.png b/graphics/pokemon/ekans/footprint.png similarity index 100% rename from graphics/pokemon/footprints/ekans_footprint.png rename to graphics/pokemon/ekans/footprint.png diff --git a/graphics/pokemon/front_pics/ekans_still_front_pic.png b/graphics/pokemon/ekans/front.png similarity index 100% rename from graphics/pokemon/front_pics/ekans_still_front_pic.png rename to graphics/pokemon/ekans/front.png diff --git a/graphics/pokemon/icons/ekans_icon.png b/graphics/pokemon/ekans/icon.png similarity index 100% rename from graphics/pokemon/icons/ekans_icon.png rename to graphics/pokemon/ekans/icon.png diff --git a/graphics/pokemon/palettes/ekans_palette.pal b/graphics/pokemon/ekans/normal.pal similarity index 100% rename from graphics/pokemon/palettes/ekans_palette.pal rename to graphics/pokemon/ekans/normal.pal diff --git a/graphics/pokemon/palettes/ekans_shiny_palette.pal b/graphics/pokemon/ekans/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/ekans_shiny_palette.pal rename to graphics/pokemon/ekans/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/electabuzz_front_pic.png b/graphics/pokemon/electabuzz/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/electabuzz_front_pic.png rename to graphics/pokemon/electabuzz/anim_front.png diff --git a/graphics/pokemon/back_pics/electabuzz_back_pic.png b/graphics/pokemon/electabuzz/back.png similarity index 100% rename from graphics/pokemon/back_pics/electabuzz_back_pic.png rename to graphics/pokemon/electabuzz/back.png diff --git a/graphics/pokemon/footprints/electabuzz_footprint.png b/graphics/pokemon/electabuzz/footprint.png similarity index 100% rename from graphics/pokemon/footprints/electabuzz_footprint.png rename to graphics/pokemon/electabuzz/footprint.png diff --git a/graphics/pokemon/front_pics/electabuzz_still_front_pic.png b/graphics/pokemon/electabuzz/front.png similarity index 100% rename from graphics/pokemon/front_pics/electabuzz_still_front_pic.png rename to graphics/pokemon/electabuzz/front.png diff --git a/graphics/pokemon/icons/electabuzz_icon.png b/graphics/pokemon/electabuzz/icon.png similarity index 100% rename from graphics/pokemon/icons/electabuzz_icon.png rename to graphics/pokemon/electabuzz/icon.png diff --git a/graphics/pokemon/palettes/electabuzz_palette.pal b/graphics/pokemon/electabuzz/normal.pal similarity index 100% rename from graphics/pokemon/palettes/electabuzz_palette.pal rename to graphics/pokemon/electabuzz/normal.pal diff --git a/graphics/pokemon/palettes/electabuzz_shiny_palette.pal b/graphics/pokemon/electabuzz/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/electabuzz_shiny_palette.pal rename to graphics/pokemon/electabuzz/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/electrike_front_pic.png b/graphics/pokemon/electrike/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/electrike_front_pic.png rename to graphics/pokemon/electrike/anim_front.png diff --git a/graphics/pokemon/back_pics/electrike_back_pic.png b/graphics/pokemon/electrike/back.png similarity index 100% rename from graphics/pokemon/back_pics/electrike_back_pic.png rename to graphics/pokemon/electrike/back.png diff --git a/graphics/pokemon/footprints/electrike_footprint.png b/graphics/pokemon/electrike/footprint.png similarity index 100% rename from graphics/pokemon/footprints/electrike_footprint.png rename to graphics/pokemon/electrike/footprint.png diff --git a/graphics/pokemon/front_pics/electrike_still_front_pic.png b/graphics/pokemon/electrike/front.png similarity index 100% rename from graphics/pokemon/front_pics/electrike_still_front_pic.png rename to graphics/pokemon/electrike/front.png diff --git a/graphics/pokemon/icons/electrike_icon.png b/graphics/pokemon/electrike/icon.png similarity index 100% rename from graphics/pokemon/icons/electrike_icon.png rename to graphics/pokemon/electrike/icon.png diff --git a/graphics/pokemon/palettes/electrike_palette.pal b/graphics/pokemon/electrike/normal.pal similarity index 100% rename from graphics/pokemon/palettes/electrike_palette.pal rename to graphics/pokemon/electrike/normal.pal diff --git a/graphics/pokemon/palettes/electrike_shiny_palette.pal b/graphics/pokemon/electrike/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/electrike_shiny_palette.pal rename to graphics/pokemon/electrike/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/electrode_front_pic.png b/graphics/pokemon/electrode/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/electrode_front_pic.png rename to graphics/pokemon/electrode/anim_front.png diff --git a/graphics/pokemon/back_pics/electrode_back_pic.png b/graphics/pokemon/electrode/back.png similarity index 100% rename from graphics/pokemon/back_pics/electrode_back_pic.png rename to graphics/pokemon/electrode/back.png diff --git a/graphics/pokemon/footprints/electrode_footprint.png b/graphics/pokemon/electrode/footprint.png similarity index 100% rename from graphics/pokemon/footprints/electrode_footprint.png rename to graphics/pokemon/electrode/footprint.png diff --git a/graphics/pokemon/front_pics/electrode_still_front_pic.png b/graphics/pokemon/electrode/front.png similarity index 100% rename from graphics/pokemon/front_pics/electrode_still_front_pic.png rename to graphics/pokemon/electrode/front.png diff --git a/graphics/pokemon/icons/electrode_icon.png b/graphics/pokemon/electrode/icon.png similarity index 100% rename from graphics/pokemon/icons/electrode_icon.png rename to graphics/pokemon/electrode/icon.png diff --git a/graphics/pokemon/palettes/electrode_palette.pal b/graphics/pokemon/electrode/normal.pal similarity index 100% rename from graphics/pokemon/palettes/electrode_palette.pal rename to graphics/pokemon/electrode/normal.pal diff --git a/graphics/pokemon/palettes/electrode_shiny_palette.pal b/graphics/pokemon/electrode/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/electrode_shiny_palette.pal rename to graphics/pokemon/electrode/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/elekid_front_pic.png b/graphics/pokemon/elekid/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/elekid_front_pic.png rename to graphics/pokemon/elekid/anim_front.png diff --git a/graphics/pokemon/back_pics/elekid_back_pic.png b/graphics/pokemon/elekid/back.png similarity index 100% rename from graphics/pokemon/back_pics/elekid_back_pic.png rename to graphics/pokemon/elekid/back.png diff --git a/graphics/pokemon/footprints/elekid_footprint.png b/graphics/pokemon/elekid/footprint.png similarity index 100% rename from graphics/pokemon/footprints/elekid_footprint.png rename to graphics/pokemon/elekid/footprint.png diff --git a/graphics/pokemon/front_pics/elekid_still_front_pic.png b/graphics/pokemon/elekid/front.png similarity index 100% rename from graphics/pokemon/front_pics/elekid_still_front_pic.png rename to graphics/pokemon/elekid/front.png diff --git a/graphics/pokemon/icons/elekid_icon.png b/graphics/pokemon/elekid/icon.png similarity index 100% rename from graphics/pokemon/icons/elekid_icon.png rename to graphics/pokemon/elekid/icon.png diff --git a/graphics/pokemon/palettes/elekid_palette.pal b/graphics/pokemon/elekid/normal.pal similarity index 100% rename from graphics/pokemon/palettes/elekid_palette.pal rename to graphics/pokemon/elekid/normal.pal diff --git a/graphics/pokemon/palettes/elekid_shiny_palette.pal b/graphics/pokemon/elekid/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/elekid_shiny_palette.pal rename to graphics/pokemon/elekid/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/entei_front_pic.png b/graphics/pokemon/entei/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/entei_front_pic.png rename to graphics/pokemon/entei/anim_front.png diff --git a/graphics/pokemon/back_pics/entei_back_pic.png b/graphics/pokemon/entei/back.png similarity index 100% rename from graphics/pokemon/back_pics/entei_back_pic.png rename to graphics/pokemon/entei/back.png diff --git a/graphics/pokemon/footprints/entei_footprint.png b/graphics/pokemon/entei/footprint.png similarity index 100% rename from graphics/pokemon/footprints/entei_footprint.png rename to graphics/pokemon/entei/footprint.png diff --git a/graphics/pokemon/front_pics/entei_still_front_pic.png b/graphics/pokemon/entei/front.png similarity index 100% rename from graphics/pokemon/front_pics/entei_still_front_pic.png rename to graphics/pokemon/entei/front.png diff --git a/graphics/pokemon/icons/entei_icon.png b/graphics/pokemon/entei/icon.png similarity index 100% rename from graphics/pokemon/icons/entei_icon.png rename to graphics/pokemon/entei/icon.png diff --git a/graphics/pokemon/palettes/entei_palette.pal b/graphics/pokemon/entei/normal.pal similarity index 100% rename from graphics/pokemon/palettes/entei_palette.pal rename to graphics/pokemon/entei/normal.pal diff --git a/graphics/pokemon/palettes/entei_shiny_palette.pal b/graphics/pokemon/entei/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/entei_shiny_palette.pal rename to graphics/pokemon/entei/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/espeon_front_pic.png b/graphics/pokemon/espeon/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/espeon_front_pic.png rename to graphics/pokemon/espeon/anim_front.png diff --git a/graphics/pokemon/back_pics/espeon_back_pic.png b/graphics/pokemon/espeon/back.png similarity index 100% rename from graphics/pokemon/back_pics/espeon_back_pic.png rename to graphics/pokemon/espeon/back.png diff --git a/graphics/pokemon/footprints/espeon_footprint.png b/graphics/pokemon/espeon/footprint.png similarity index 100% rename from graphics/pokemon/footprints/espeon_footprint.png rename to graphics/pokemon/espeon/footprint.png diff --git a/graphics/pokemon/front_pics/espeon_still_front_pic.png b/graphics/pokemon/espeon/front.png similarity index 100% rename from graphics/pokemon/front_pics/espeon_still_front_pic.png rename to graphics/pokemon/espeon/front.png diff --git a/graphics/pokemon/icons/espeon_icon.png b/graphics/pokemon/espeon/icon.png similarity index 100% rename from graphics/pokemon/icons/espeon_icon.png rename to graphics/pokemon/espeon/icon.png diff --git a/graphics/pokemon/palettes/espeon_palette.pal b/graphics/pokemon/espeon/normal.pal similarity index 100% rename from graphics/pokemon/palettes/espeon_palette.pal rename to graphics/pokemon/espeon/normal.pal diff --git a/graphics/pokemon/palettes/espeon_shiny_palette.pal b/graphics/pokemon/espeon/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/espeon_shiny_palette.pal rename to graphics/pokemon/espeon/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/exeggcute_front_pic.png b/graphics/pokemon/exeggcute/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/exeggcute_front_pic.png rename to graphics/pokemon/exeggcute/anim_front.png diff --git a/graphics/pokemon/back_pics/exeggcute_back_pic.png b/graphics/pokemon/exeggcute/back.png similarity index 100% rename from graphics/pokemon/back_pics/exeggcute_back_pic.png rename to graphics/pokemon/exeggcute/back.png diff --git a/graphics/pokemon/footprints/exeggcute_footprint.png b/graphics/pokemon/exeggcute/footprint.png similarity index 100% rename from graphics/pokemon/footprints/exeggcute_footprint.png rename to graphics/pokemon/exeggcute/footprint.png diff --git a/graphics/pokemon/front_pics/exeggcute_still_front_pic.png b/graphics/pokemon/exeggcute/front.png similarity index 100% rename from graphics/pokemon/front_pics/exeggcute_still_front_pic.png rename to graphics/pokemon/exeggcute/front.png diff --git a/graphics/pokemon/icons/exeggcute_icon.png b/graphics/pokemon/exeggcute/icon.png similarity index 100% rename from graphics/pokemon/icons/exeggcute_icon.png rename to graphics/pokemon/exeggcute/icon.png diff --git a/graphics/pokemon/palettes/exeggcute_palette.pal b/graphics/pokemon/exeggcute/normal.pal similarity index 100% rename from graphics/pokemon/palettes/exeggcute_palette.pal rename to graphics/pokemon/exeggcute/normal.pal diff --git a/graphics/pokemon/palettes/exeggcute_shiny_palette.pal b/graphics/pokemon/exeggcute/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/exeggcute_shiny_palette.pal rename to graphics/pokemon/exeggcute/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/exeggutor_front_pic.png b/graphics/pokemon/exeggutor/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/exeggutor_front_pic.png rename to graphics/pokemon/exeggutor/anim_front.png diff --git a/graphics/pokemon/back_pics/exeggutor_back_pic.png b/graphics/pokemon/exeggutor/back.png similarity index 100% rename from graphics/pokemon/back_pics/exeggutor_back_pic.png rename to graphics/pokemon/exeggutor/back.png diff --git a/graphics/pokemon/footprints/exeggutor_footprint.png b/graphics/pokemon/exeggutor/footprint.png similarity index 100% rename from graphics/pokemon/footprints/exeggutor_footprint.png rename to graphics/pokemon/exeggutor/footprint.png diff --git a/graphics/pokemon/front_pics/exeggutor_still_front_pic.png b/graphics/pokemon/exeggutor/front.png similarity index 100% rename from graphics/pokemon/front_pics/exeggutor_still_front_pic.png rename to graphics/pokemon/exeggutor/front.png diff --git a/graphics/pokemon/icons/exeggutor_icon.png b/graphics/pokemon/exeggutor/icon.png similarity index 100% rename from graphics/pokemon/icons/exeggutor_icon.png rename to graphics/pokemon/exeggutor/icon.png diff --git a/graphics/pokemon/palettes/exeggutor_palette.pal b/graphics/pokemon/exeggutor/normal.pal similarity index 100% rename from graphics/pokemon/palettes/exeggutor_palette.pal rename to graphics/pokemon/exeggutor/normal.pal diff --git a/graphics/pokemon/palettes/exeggutor_shiny_palette.pal b/graphics/pokemon/exeggutor/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/exeggutor_shiny_palette.pal rename to graphics/pokemon/exeggutor/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/exploud_front_pic.png b/graphics/pokemon/exploud/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/exploud_front_pic.png rename to graphics/pokemon/exploud/anim_front.png diff --git a/graphics/pokemon/back_pics/exploud_back_pic.png b/graphics/pokemon/exploud/back.png similarity index 100% rename from graphics/pokemon/back_pics/exploud_back_pic.png rename to graphics/pokemon/exploud/back.png diff --git a/graphics/pokemon/footprints/exploud_footprint.png b/graphics/pokemon/exploud/footprint.png similarity index 100% rename from graphics/pokemon/footprints/exploud_footprint.png rename to graphics/pokemon/exploud/footprint.png diff --git a/graphics/pokemon/front_pics/exploud_still_front_pic.png b/graphics/pokemon/exploud/front.png similarity index 100% rename from graphics/pokemon/front_pics/exploud_still_front_pic.png rename to graphics/pokemon/exploud/front.png diff --git a/graphics/pokemon/icons/exploud_icon.png b/graphics/pokemon/exploud/icon.png similarity index 100% rename from graphics/pokemon/icons/exploud_icon.png rename to graphics/pokemon/exploud/icon.png diff --git a/graphics/pokemon/palettes/exploud_palette.pal b/graphics/pokemon/exploud/normal.pal similarity index 100% rename from graphics/pokemon/palettes/exploud_palette.pal rename to graphics/pokemon/exploud/normal.pal diff --git a/graphics/pokemon/palettes/exploud_shiny_palette.pal b/graphics/pokemon/exploud/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/exploud_shiny_palette.pal rename to graphics/pokemon/exploud/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/farfetch_d_front_pic.png b/graphics/pokemon/farfetch_d/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/farfetch_d_front_pic.png rename to graphics/pokemon/farfetch_d/anim_front.png diff --git a/graphics/pokemon/back_pics/farfetch_d_back_pic.png b/graphics/pokemon/farfetch_d/back.png similarity index 100% rename from graphics/pokemon/back_pics/farfetch_d_back_pic.png rename to graphics/pokemon/farfetch_d/back.png diff --git a/graphics/pokemon/footprints/farfetch_d_footprint.png b/graphics/pokemon/farfetch_d/footprint.png similarity index 100% rename from graphics/pokemon/footprints/farfetch_d_footprint.png rename to graphics/pokemon/farfetch_d/footprint.png diff --git a/graphics/pokemon/front_pics/farfetch_d_still_front_pic.png b/graphics/pokemon/farfetch_d/front.png similarity index 100% rename from graphics/pokemon/front_pics/farfetch_d_still_front_pic.png rename to graphics/pokemon/farfetch_d/front.png diff --git a/graphics/pokemon/icons/farfetch_d_icon.png b/graphics/pokemon/farfetch_d/icon.png similarity index 100% rename from graphics/pokemon/icons/farfetch_d_icon.png rename to graphics/pokemon/farfetch_d/icon.png diff --git a/graphics/pokemon/palettes/farfetch_d_palette.pal b/graphics/pokemon/farfetch_d/normal.pal similarity index 100% rename from graphics/pokemon/palettes/farfetch_d_palette.pal rename to graphics/pokemon/farfetch_d/normal.pal diff --git a/graphics/pokemon/palettes/farfetch_d_shiny_palette.pal b/graphics/pokemon/farfetch_d/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/farfetch_d_shiny_palette.pal rename to graphics/pokemon/farfetch_d/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/fearow_front_pic.png b/graphics/pokemon/fearow/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/fearow_front_pic.png rename to graphics/pokemon/fearow/anim_front.png diff --git a/graphics/pokemon/back_pics/fearow_back_pic.png b/graphics/pokemon/fearow/back.png similarity index 100% rename from graphics/pokemon/back_pics/fearow_back_pic.png rename to graphics/pokemon/fearow/back.png diff --git a/graphics/pokemon/footprints/fearow_footprint.png b/graphics/pokemon/fearow/footprint.png similarity index 100% rename from graphics/pokemon/footprints/fearow_footprint.png rename to graphics/pokemon/fearow/footprint.png diff --git a/graphics/pokemon/front_pics/fearow_still_front_pic.png b/graphics/pokemon/fearow/front.png similarity index 100% rename from graphics/pokemon/front_pics/fearow_still_front_pic.png rename to graphics/pokemon/fearow/front.png diff --git a/graphics/pokemon/icons/fearow_icon.png b/graphics/pokemon/fearow/icon.png similarity index 100% rename from graphics/pokemon/icons/fearow_icon.png rename to graphics/pokemon/fearow/icon.png diff --git a/graphics/pokemon/palettes/fearow_palette.pal b/graphics/pokemon/fearow/normal.pal similarity index 100% rename from graphics/pokemon/palettes/fearow_palette.pal rename to graphics/pokemon/fearow/normal.pal diff --git a/graphics/pokemon/palettes/fearow_shiny_palette.pal b/graphics/pokemon/fearow/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/fearow_shiny_palette.pal rename to graphics/pokemon/fearow/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/feebas_front_pic.png b/graphics/pokemon/feebas/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/feebas_front_pic.png rename to graphics/pokemon/feebas/anim_front.png diff --git a/graphics/pokemon/back_pics/feebas_back_pic.png b/graphics/pokemon/feebas/back.png similarity index 100% rename from graphics/pokemon/back_pics/feebas_back_pic.png rename to graphics/pokemon/feebas/back.png diff --git a/graphics/pokemon/footprints/feebas_footprint.png b/graphics/pokemon/feebas/footprint.png similarity index 100% rename from graphics/pokemon/footprints/feebas_footprint.png rename to graphics/pokemon/feebas/footprint.png diff --git a/graphics/pokemon/front_pics/feebas_still_front_pic.png b/graphics/pokemon/feebas/front.png similarity index 100% rename from graphics/pokemon/front_pics/feebas_still_front_pic.png rename to graphics/pokemon/feebas/front.png diff --git a/graphics/pokemon/icons/feebas_icon.png b/graphics/pokemon/feebas/icon.png similarity index 100% rename from graphics/pokemon/icons/feebas_icon.png rename to graphics/pokemon/feebas/icon.png diff --git a/graphics/pokemon/palettes/feebas_palette.pal b/graphics/pokemon/feebas/normal.pal similarity index 100% rename from graphics/pokemon/palettes/feebas_palette.pal rename to graphics/pokemon/feebas/normal.pal diff --git a/graphics/pokemon/palettes/feebas_shiny_palette.pal b/graphics/pokemon/feebas/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/feebas_shiny_palette.pal rename to graphics/pokemon/feebas/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/feraligatr_front_pic.png b/graphics/pokemon/feraligatr/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/feraligatr_front_pic.png rename to graphics/pokemon/feraligatr/anim_front.png diff --git a/graphics/pokemon/back_pics/feraligatr_back_pic.png b/graphics/pokemon/feraligatr/back.png similarity index 100% rename from graphics/pokemon/back_pics/feraligatr_back_pic.png rename to graphics/pokemon/feraligatr/back.png diff --git a/graphics/pokemon/footprints/feraligatr_footprint.png b/graphics/pokemon/feraligatr/footprint.png similarity index 100% rename from graphics/pokemon/footprints/feraligatr_footprint.png rename to graphics/pokemon/feraligatr/footprint.png diff --git a/graphics/pokemon/front_pics/feraligatr_still_front_pic.png b/graphics/pokemon/feraligatr/front.png similarity index 100% rename from graphics/pokemon/front_pics/feraligatr_still_front_pic.png rename to graphics/pokemon/feraligatr/front.png diff --git a/graphics/pokemon/icons/feraligatr_icon.png b/graphics/pokemon/feraligatr/icon.png similarity index 100% rename from graphics/pokemon/icons/feraligatr_icon.png rename to graphics/pokemon/feraligatr/icon.png diff --git a/graphics/pokemon/palettes/feraligatr_palette.pal b/graphics/pokemon/feraligatr/normal.pal similarity index 100% rename from graphics/pokemon/palettes/feraligatr_palette.pal rename to graphics/pokemon/feraligatr/normal.pal diff --git a/graphics/pokemon/palettes/feraligatr_shiny_palette.pal b/graphics/pokemon/feraligatr/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/feraligatr_shiny_palette.pal rename to graphics/pokemon/feraligatr/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/flaaffy_front_pic.png b/graphics/pokemon/flaaffy/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/flaaffy_front_pic.png rename to graphics/pokemon/flaaffy/anim_front.png diff --git a/graphics/pokemon/back_pics/flaaffy_back_pic.png b/graphics/pokemon/flaaffy/back.png similarity index 100% rename from graphics/pokemon/back_pics/flaaffy_back_pic.png rename to graphics/pokemon/flaaffy/back.png diff --git a/graphics/pokemon/footprints/flaaffy_footprint.png b/graphics/pokemon/flaaffy/footprint.png similarity index 100% rename from graphics/pokemon/footprints/flaaffy_footprint.png rename to graphics/pokemon/flaaffy/footprint.png diff --git a/graphics/pokemon/front_pics/flaaffy_still_front_pic.png b/graphics/pokemon/flaaffy/front.png similarity index 100% rename from graphics/pokemon/front_pics/flaaffy_still_front_pic.png rename to graphics/pokemon/flaaffy/front.png diff --git a/graphics/pokemon/icons/flaaffy_icon.png b/graphics/pokemon/flaaffy/icon.png similarity index 100% rename from graphics/pokemon/icons/flaaffy_icon.png rename to graphics/pokemon/flaaffy/icon.png diff --git a/graphics/pokemon/palettes/flaaffy_palette.pal b/graphics/pokemon/flaaffy/normal.pal similarity index 100% rename from graphics/pokemon/palettes/flaaffy_palette.pal rename to graphics/pokemon/flaaffy/normal.pal diff --git a/graphics/pokemon/palettes/flaaffy_shiny_palette.pal b/graphics/pokemon/flaaffy/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/flaaffy_shiny_palette.pal rename to graphics/pokemon/flaaffy/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/flareon_front_pic.png b/graphics/pokemon/flareon/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/flareon_front_pic.png rename to graphics/pokemon/flareon/anim_front.png diff --git a/graphics/pokemon/back_pics/flareon_back_pic.png b/graphics/pokemon/flareon/back.png similarity index 100% rename from graphics/pokemon/back_pics/flareon_back_pic.png rename to graphics/pokemon/flareon/back.png diff --git a/graphics/pokemon/footprints/flareon_footprint.png b/graphics/pokemon/flareon/footprint.png similarity index 100% rename from graphics/pokemon/footprints/flareon_footprint.png rename to graphics/pokemon/flareon/footprint.png diff --git a/graphics/pokemon/front_pics/flareon_still_front_pic.png b/graphics/pokemon/flareon/front.png similarity index 100% rename from graphics/pokemon/front_pics/flareon_still_front_pic.png rename to graphics/pokemon/flareon/front.png diff --git a/graphics/pokemon/icons/flareon_icon.png b/graphics/pokemon/flareon/icon.png similarity index 100% rename from graphics/pokemon/icons/flareon_icon.png rename to graphics/pokemon/flareon/icon.png diff --git a/graphics/pokemon/palettes/flareon_palette.pal b/graphics/pokemon/flareon/normal.pal similarity index 100% rename from graphics/pokemon/palettes/flareon_palette.pal rename to graphics/pokemon/flareon/normal.pal diff --git a/graphics/pokemon/palettes/flareon_shiny_palette.pal b/graphics/pokemon/flareon/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/flareon_shiny_palette.pal rename to graphics/pokemon/flareon/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/flygon_front_pic.png b/graphics/pokemon/flygon/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/flygon_front_pic.png rename to graphics/pokemon/flygon/anim_front.png diff --git a/graphics/pokemon/back_pics/flygon_back_pic.png b/graphics/pokemon/flygon/back.png similarity index 100% rename from graphics/pokemon/back_pics/flygon_back_pic.png rename to graphics/pokemon/flygon/back.png diff --git a/graphics/pokemon/footprints/flygon_footprint.png b/graphics/pokemon/flygon/footprint.png similarity index 100% rename from graphics/pokemon/footprints/flygon_footprint.png rename to graphics/pokemon/flygon/footprint.png diff --git a/graphics/pokemon/front_pics/flygon_still_front_pic.png b/graphics/pokemon/flygon/front.png similarity index 100% rename from graphics/pokemon/front_pics/flygon_still_front_pic.png rename to graphics/pokemon/flygon/front.png diff --git a/graphics/pokemon/icons/flygon_icon.png b/graphics/pokemon/flygon/icon.png similarity index 100% rename from graphics/pokemon/icons/flygon_icon.png rename to graphics/pokemon/flygon/icon.png diff --git a/graphics/pokemon/palettes/flygon_palette.pal b/graphics/pokemon/flygon/normal.pal similarity index 100% rename from graphics/pokemon/palettes/flygon_palette.pal rename to graphics/pokemon/flygon/normal.pal diff --git a/graphics/pokemon/palettes/flygon_shiny_palette.pal b/graphics/pokemon/flygon/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/flygon_shiny_palette.pal rename to graphics/pokemon/flygon/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/forretress_front_pic.png b/graphics/pokemon/forretress/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/forretress_front_pic.png rename to graphics/pokemon/forretress/anim_front.png diff --git a/graphics/pokemon/back_pics/forretress_back_pic.png b/graphics/pokemon/forretress/back.png similarity index 100% rename from graphics/pokemon/back_pics/forretress_back_pic.png rename to graphics/pokemon/forretress/back.png diff --git a/graphics/pokemon/footprints/forretress_footprint.png b/graphics/pokemon/forretress/footprint.png similarity index 100% rename from graphics/pokemon/footprints/forretress_footprint.png rename to graphics/pokemon/forretress/footprint.png diff --git a/graphics/pokemon/front_pics/forretress_still_front_pic.png b/graphics/pokemon/forretress/front.png similarity index 100% rename from graphics/pokemon/front_pics/forretress_still_front_pic.png rename to graphics/pokemon/forretress/front.png diff --git a/graphics/pokemon/icons/forretress_icon.png b/graphics/pokemon/forretress/icon.png similarity index 100% rename from graphics/pokemon/icons/forretress_icon.png rename to graphics/pokemon/forretress/icon.png diff --git a/graphics/pokemon/palettes/forretress_palette.pal b/graphics/pokemon/forretress/normal.pal similarity index 100% rename from graphics/pokemon/palettes/forretress_palette.pal rename to graphics/pokemon/forretress/normal.pal diff --git a/graphics/pokemon/palettes/forretress_shiny_palette.pal b/graphics/pokemon/forretress/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/forretress_shiny_palette.pal rename to graphics/pokemon/forretress/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/furret_front_pic.png b/graphics/pokemon/furret/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/furret_front_pic.png rename to graphics/pokemon/furret/anim_front.png diff --git a/graphics/pokemon/back_pics/furret_back_pic.png b/graphics/pokemon/furret/back.png similarity index 100% rename from graphics/pokemon/back_pics/furret_back_pic.png rename to graphics/pokemon/furret/back.png diff --git a/graphics/pokemon/footprints/furret_footprint.png b/graphics/pokemon/furret/footprint.png similarity index 100% rename from graphics/pokemon/footprints/furret_footprint.png rename to graphics/pokemon/furret/footprint.png diff --git a/graphics/pokemon/front_pics/furret_still_front_pic.png b/graphics/pokemon/furret/front.png similarity index 100% rename from graphics/pokemon/front_pics/furret_still_front_pic.png rename to graphics/pokemon/furret/front.png diff --git a/graphics/pokemon/icons/furret_icon.png b/graphics/pokemon/furret/icon.png similarity index 100% rename from graphics/pokemon/icons/furret_icon.png rename to graphics/pokemon/furret/icon.png diff --git a/graphics/pokemon/palettes/furret_palette.pal b/graphics/pokemon/furret/normal.pal similarity index 100% rename from graphics/pokemon/palettes/furret_palette.pal rename to graphics/pokemon/furret/normal.pal diff --git a/graphics/pokemon/palettes/furret_shiny_palette.pal b/graphics/pokemon/furret/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/furret_shiny_palette.pal rename to graphics/pokemon/furret/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/gardevoir_front_pic.png b/graphics/pokemon/gardevoir/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/gardevoir_front_pic.png rename to graphics/pokemon/gardevoir/anim_front.png diff --git a/graphics/pokemon/back_pics/gardevoir_back_pic.png b/graphics/pokemon/gardevoir/back.png similarity index 100% rename from graphics/pokemon/back_pics/gardevoir_back_pic.png rename to graphics/pokemon/gardevoir/back.png diff --git a/graphics/pokemon/footprints/gardevoir_footprint.png b/graphics/pokemon/gardevoir/footprint.png similarity index 100% rename from graphics/pokemon/footprints/gardevoir_footprint.png rename to graphics/pokemon/gardevoir/footprint.png diff --git a/graphics/pokemon/front_pics/gardevoir_still_front_pic.png b/graphics/pokemon/gardevoir/front.png similarity index 100% rename from graphics/pokemon/front_pics/gardevoir_still_front_pic.png rename to graphics/pokemon/gardevoir/front.png diff --git a/graphics/pokemon/icons/gardevoir_icon.png b/graphics/pokemon/gardevoir/icon.png similarity index 100% rename from graphics/pokemon/icons/gardevoir_icon.png rename to graphics/pokemon/gardevoir/icon.png diff --git a/graphics/pokemon/palettes/gardevoir_palette.pal b/graphics/pokemon/gardevoir/normal.pal similarity index 100% rename from graphics/pokemon/palettes/gardevoir_palette.pal rename to graphics/pokemon/gardevoir/normal.pal diff --git a/graphics/pokemon/palettes/gardevoir_shiny_palette.pal b/graphics/pokemon/gardevoir/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/gardevoir_shiny_palette.pal rename to graphics/pokemon/gardevoir/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/gastly_front_pic.png b/graphics/pokemon/gastly/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/gastly_front_pic.png rename to graphics/pokemon/gastly/anim_front.png diff --git a/graphics/pokemon/back_pics/gastly_back_pic.png b/graphics/pokemon/gastly/back.png similarity index 100% rename from graphics/pokemon/back_pics/gastly_back_pic.png rename to graphics/pokemon/gastly/back.png diff --git a/graphics/pokemon/footprints/gastly_footprint.png b/graphics/pokemon/gastly/footprint.png similarity index 100% rename from graphics/pokemon/footprints/gastly_footprint.png rename to graphics/pokemon/gastly/footprint.png diff --git a/graphics/pokemon/front_pics/gastly_still_front_pic.png b/graphics/pokemon/gastly/front.png similarity index 100% rename from graphics/pokemon/front_pics/gastly_still_front_pic.png rename to graphics/pokemon/gastly/front.png diff --git a/graphics/pokemon/icons/gastly_icon.png b/graphics/pokemon/gastly/icon.png similarity index 100% rename from graphics/pokemon/icons/gastly_icon.png rename to graphics/pokemon/gastly/icon.png diff --git a/graphics/pokemon/palettes/gastly_palette.pal b/graphics/pokemon/gastly/normal.pal similarity index 100% rename from graphics/pokemon/palettes/gastly_palette.pal rename to graphics/pokemon/gastly/normal.pal diff --git a/graphics/pokemon/palettes/gastly_shiny_palette.pal b/graphics/pokemon/gastly/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/gastly_shiny_palette.pal rename to graphics/pokemon/gastly/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/gengar_front_pic.png b/graphics/pokemon/gengar/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/gengar_front_pic.png rename to graphics/pokemon/gengar/anim_front.png diff --git a/graphics/pokemon/back_pics/gengar_back_pic.png b/graphics/pokemon/gengar/back.png similarity index 100% rename from graphics/pokemon/back_pics/gengar_back_pic.png rename to graphics/pokemon/gengar/back.png diff --git a/graphics/pokemon/footprints/gengar_footprint.png b/graphics/pokemon/gengar/footprint.png similarity index 100% rename from graphics/pokemon/footprints/gengar_footprint.png rename to graphics/pokemon/gengar/footprint.png diff --git a/graphics/pokemon/front_pics/gengar_still_front_pic.png b/graphics/pokemon/gengar/front.png similarity index 100% rename from graphics/pokemon/front_pics/gengar_still_front_pic.png rename to graphics/pokemon/gengar/front.png diff --git a/graphics/pokemon/icons/gengar_icon.png b/graphics/pokemon/gengar/icon.png similarity index 100% rename from graphics/pokemon/icons/gengar_icon.png rename to graphics/pokemon/gengar/icon.png diff --git a/graphics/pokemon/palettes/gengar_palette.pal b/graphics/pokemon/gengar/normal.pal similarity index 100% rename from graphics/pokemon/palettes/gengar_palette.pal rename to graphics/pokemon/gengar/normal.pal diff --git a/graphics/pokemon/palettes/gengar_shiny_palette.pal b/graphics/pokemon/gengar/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/gengar_shiny_palette.pal rename to graphics/pokemon/gengar/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/geodude_front_pic.png b/graphics/pokemon/geodude/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/geodude_front_pic.png rename to graphics/pokemon/geodude/anim_front.png diff --git a/graphics/pokemon/back_pics/geodude_back_pic.png b/graphics/pokemon/geodude/back.png similarity index 100% rename from graphics/pokemon/back_pics/geodude_back_pic.png rename to graphics/pokemon/geodude/back.png diff --git a/graphics/pokemon/footprints/geodude_footprint.png b/graphics/pokemon/geodude/footprint.png similarity index 100% rename from graphics/pokemon/footprints/geodude_footprint.png rename to graphics/pokemon/geodude/footprint.png diff --git a/graphics/pokemon/front_pics/geodude_still_front_pic.png b/graphics/pokemon/geodude/front.png similarity index 100% rename from graphics/pokemon/front_pics/geodude_still_front_pic.png rename to graphics/pokemon/geodude/front.png diff --git a/graphics/pokemon/icons/geodude_icon.png b/graphics/pokemon/geodude/icon.png similarity index 100% rename from graphics/pokemon/icons/geodude_icon.png rename to graphics/pokemon/geodude/icon.png diff --git a/graphics/pokemon/palettes/geodude_palette.pal b/graphics/pokemon/geodude/normal.pal similarity index 100% rename from graphics/pokemon/palettes/geodude_palette.pal rename to graphics/pokemon/geodude/normal.pal diff --git a/graphics/pokemon/palettes/geodude_shiny_palette.pal b/graphics/pokemon/geodude/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/geodude_shiny_palette.pal rename to graphics/pokemon/geodude/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/girafarig_front_pic.png b/graphics/pokemon/girafarig/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/girafarig_front_pic.png rename to graphics/pokemon/girafarig/anim_front.png diff --git a/graphics/pokemon/back_pics/girafarig_back_pic.png b/graphics/pokemon/girafarig/back.png similarity index 100% rename from graphics/pokemon/back_pics/girafarig_back_pic.png rename to graphics/pokemon/girafarig/back.png diff --git a/graphics/pokemon/footprints/girafarig_footprint.png b/graphics/pokemon/girafarig/footprint.png similarity index 100% rename from graphics/pokemon/footprints/girafarig_footprint.png rename to graphics/pokemon/girafarig/footprint.png diff --git a/graphics/pokemon/front_pics/girafarig_still_front_pic.png b/graphics/pokemon/girafarig/front.png similarity index 100% rename from graphics/pokemon/front_pics/girafarig_still_front_pic.png rename to graphics/pokemon/girafarig/front.png diff --git a/graphics/pokemon/icons/girafarig_icon.png b/graphics/pokemon/girafarig/icon.png similarity index 100% rename from graphics/pokemon/icons/girafarig_icon.png rename to graphics/pokemon/girafarig/icon.png diff --git a/graphics/pokemon/palettes/girafarig_palette.pal b/graphics/pokemon/girafarig/normal.pal similarity index 100% rename from graphics/pokemon/palettes/girafarig_palette.pal rename to graphics/pokemon/girafarig/normal.pal diff --git a/graphics/pokemon/palettes/girafarig_shiny_palette.pal b/graphics/pokemon/girafarig/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/girafarig_shiny_palette.pal rename to graphics/pokemon/girafarig/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/glalie_front_pic.png b/graphics/pokemon/glalie/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/glalie_front_pic.png rename to graphics/pokemon/glalie/anim_front.png diff --git a/graphics/pokemon/back_pics/glalie_back_pic.png b/graphics/pokemon/glalie/back.png similarity index 100% rename from graphics/pokemon/back_pics/glalie_back_pic.png rename to graphics/pokemon/glalie/back.png diff --git a/graphics/pokemon/footprints/glalie_footprint.png b/graphics/pokemon/glalie/footprint.png similarity index 100% rename from graphics/pokemon/footprints/glalie_footprint.png rename to graphics/pokemon/glalie/footprint.png diff --git a/graphics/pokemon/front_pics/glalie_still_front_pic.png b/graphics/pokemon/glalie/front.png similarity index 100% rename from graphics/pokemon/front_pics/glalie_still_front_pic.png rename to graphics/pokemon/glalie/front.png diff --git a/graphics/pokemon/icons/glalie_icon.png b/graphics/pokemon/glalie/icon.png similarity index 100% rename from graphics/pokemon/icons/glalie_icon.png rename to graphics/pokemon/glalie/icon.png diff --git a/graphics/pokemon/palettes/glalie_palette.pal b/graphics/pokemon/glalie/normal.pal similarity index 100% rename from graphics/pokemon/palettes/glalie_palette.pal rename to graphics/pokemon/glalie/normal.pal diff --git a/graphics/pokemon/palettes/glalie_shiny_palette.pal b/graphics/pokemon/glalie/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/glalie_shiny_palette.pal rename to graphics/pokemon/glalie/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/gligar_front_pic.png b/graphics/pokemon/gligar/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/gligar_front_pic.png rename to graphics/pokemon/gligar/anim_front.png diff --git a/graphics/pokemon/back_pics/gligar_back_pic.png b/graphics/pokemon/gligar/back.png similarity index 100% rename from graphics/pokemon/back_pics/gligar_back_pic.png rename to graphics/pokemon/gligar/back.png diff --git a/graphics/pokemon/footprints/gligar_footprint.png b/graphics/pokemon/gligar/footprint.png similarity index 100% rename from graphics/pokemon/footprints/gligar_footprint.png rename to graphics/pokemon/gligar/footprint.png diff --git a/graphics/pokemon/front_pics/gligar_still_front_pic.png b/graphics/pokemon/gligar/front.png similarity index 100% rename from graphics/pokemon/front_pics/gligar_still_front_pic.png rename to graphics/pokemon/gligar/front.png diff --git a/graphics/pokemon/icons/gligar_icon.png b/graphics/pokemon/gligar/icon.png similarity index 100% rename from graphics/pokemon/icons/gligar_icon.png rename to graphics/pokemon/gligar/icon.png diff --git a/graphics/pokemon/palettes/gligar_palette.pal b/graphics/pokemon/gligar/normal.pal similarity index 100% rename from graphics/pokemon/palettes/gligar_palette.pal rename to graphics/pokemon/gligar/normal.pal diff --git a/graphics/pokemon/palettes/gligar_shiny_palette.pal b/graphics/pokemon/gligar/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/gligar_shiny_palette.pal rename to graphics/pokemon/gligar/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/gloom_front_pic.png b/graphics/pokemon/gloom/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/gloom_front_pic.png rename to graphics/pokemon/gloom/anim_front.png diff --git a/graphics/pokemon/back_pics/gloom_back_pic.png b/graphics/pokemon/gloom/back.png similarity index 100% rename from graphics/pokemon/back_pics/gloom_back_pic.png rename to graphics/pokemon/gloom/back.png diff --git a/graphics/pokemon/footprints/gloom_footprint.png b/graphics/pokemon/gloom/footprint.png similarity index 100% rename from graphics/pokemon/footprints/gloom_footprint.png rename to graphics/pokemon/gloom/footprint.png diff --git a/graphics/pokemon/front_pics/gloom_still_front_pic.png b/graphics/pokemon/gloom/front.png similarity index 100% rename from graphics/pokemon/front_pics/gloom_still_front_pic.png rename to graphics/pokemon/gloom/front.png diff --git a/graphics/pokemon/icons/gloom_icon.png b/graphics/pokemon/gloom/icon.png similarity index 100% rename from graphics/pokemon/icons/gloom_icon.png rename to graphics/pokemon/gloom/icon.png diff --git a/graphics/pokemon/palettes/gloom_palette.pal b/graphics/pokemon/gloom/normal.pal similarity index 100% rename from graphics/pokemon/palettes/gloom_palette.pal rename to graphics/pokemon/gloom/normal.pal diff --git a/graphics/pokemon/palettes/gloom_shiny_palette.pal b/graphics/pokemon/gloom/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/gloom_shiny_palette.pal rename to graphics/pokemon/gloom/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/golbat_front_pic.png b/graphics/pokemon/golbat/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/golbat_front_pic.png rename to graphics/pokemon/golbat/anim_front.png diff --git a/graphics/pokemon/back_pics/golbat_back_pic.png b/graphics/pokemon/golbat/back.png similarity index 100% rename from graphics/pokemon/back_pics/golbat_back_pic.png rename to graphics/pokemon/golbat/back.png diff --git a/graphics/pokemon/footprints/golbat_footprint.png b/graphics/pokemon/golbat/footprint.png similarity index 100% rename from graphics/pokemon/footprints/golbat_footprint.png rename to graphics/pokemon/golbat/footprint.png diff --git a/graphics/pokemon/front_pics/golbat_still_front_pic.png b/graphics/pokemon/golbat/front.png similarity index 100% rename from graphics/pokemon/front_pics/golbat_still_front_pic.png rename to graphics/pokemon/golbat/front.png diff --git a/graphics/pokemon/icons/golbat_icon.png b/graphics/pokemon/golbat/icon.png similarity index 100% rename from graphics/pokemon/icons/golbat_icon.png rename to graphics/pokemon/golbat/icon.png diff --git a/graphics/pokemon/palettes/golbat_palette.pal b/graphics/pokemon/golbat/normal.pal similarity index 100% rename from graphics/pokemon/palettes/golbat_palette.pal rename to graphics/pokemon/golbat/normal.pal diff --git a/graphics/pokemon/palettes/golbat_shiny_palette.pal b/graphics/pokemon/golbat/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/golbat_shiny_palette.pal rename to graphics/pokemon/golbat/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/goldeen_front_pic.png b/graphics/pokemon/goldeen/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/goldeen_front_pic.png rename to graphics/pokemon/goldeen/anim_front.png diff --git a/graphics/pokemon/back_pics/goldeen_back_pic.png b/graphics/pokemon/goldeen/back.png similarity index 100% rename from graphics/pokemon/back_pics/goldeen_back_pic.png rename to graphics/pokemon/goldeen/back.png diff --git a/graphics/pokemon/footprints/goldeen_footprint.png b/graphics/pokemon/goldeen/footprint.png similarity index 100% rename from graphics/pokemon/footprints/goldeen_footprint.png rename to graphics/pokemon/goldeen/footprint.png diff --git a/graphics/pokemon/front_pics/goldeen_still_front_pic.png b/graphics/pokemon/goldeen/front.png similarity index 100% rename from graphics/pokemon/front_pics/goldeen_still_front_pic.png rename to graphics/pokemon/goldeen/front.png diff --git a/graphics/pokemon/icons/goldeen_icon.png b/graphics/pokemon/goldeen/icon.png similarity index 100% rename from graphics/pokemon/icons/goldeen_icon.png rename to graphics/pokemon/goldeen/icon.png diff --git a/graphics/pokemon/palettes/goldeen_palette.pal b/graphics/pokemon/goldeen/normal.pal similarity index 100% rename from graphics/pokemon/palettes/goldeen_palette.pal rename to graphics/pokemon/goldeen/normal.pal diff --git a/graphics/pokemon/palettes/goldeen_shiny_palette.pal b/graphics/pokemon/goldeen/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/goldeen_shiny_palette.pal rename to graphics/pokemon/goldeen/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/golduck_front_pic.png b/graphics/pokemon/golduck/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/golduck_front_pic.png rename to graphics/pokemon/golduck/anim_front.png diff --git a/graphics/pokemon/back_pics/golduck_back_pic.png b/graphics/pokemon/golduck/back.png similarity index 100% rename from graphics/pokemon/back_pics/golduck_back_pic.png rename to graphics/pokemon/golduck/back.png diff --git a/graphics/pokemon/footprints/golduck_footprint.png b/graphics/pokemon/golduck/footprint.png similarity index 100% rename from graphics/pokemon/footprints/golduck_footprint.png rename to graphics/pokemon/golduck/footprint.png diff --git a/graphics/pokemon/front_pics/golduck_still_front_pic.png b/graphics/pokemon/golduck/front.png similarity index 100% rename from graphics/pokemon/front_pics/golduck_still_front_pic.png rename to graphics/pokemon/golduck/front.png diff --git a/graphics/pokemon/icons/golduck_icon.png b/graphics/pokemon/golduck/icon.png similarity index 100% rename from graphics/pokemon/icons/golduck_icon.png rename to graphics/pokemon/golduck/icon.png diff --git a/graphics/pokemon/palettes/golduck_palette.pal b/graphics/pokemon/golduck/normal.pal similarity index 100% rename from graphics/pokemon/palettes/golduck_palette.pal rename to graphics/pokemon/golduck/normal.pal diff --git a/graphics/pokemon/palettes/golduck_shiny_palette.pal b/graphics/pokemon/golduck/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/golduck_shiny_palette.pal rename to graphics/pokemon/golduck/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/golem_front_pic.png b/graphics/pokemon/golem/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/golem_front_pic.png rename to graphics/pokemon/golem/anim_front.png diff --git a/graphics/pokemon/back_pics/golem_back_pic.png b/graphics/pokemon/golem/back.png similarity index 100% rename from graphics/pokemon/back_pics/golem_back_pic.png rename to graphics/pokemon/golem/back.png diff --git a/graphics/pokemon/footprints/golem_footprint.png b/graphics/pokemon/golem/footprint.png similarity index 100% rename from graphics/pokemon/footprints/golem_footprint.png rename to graphics/pokemon/golem/footprint.png diff --git a/graphics/pokemon/front_pics/golem_still_front_pic.png b/graphics/pokemon/golem/front.png similarity index 100% rename from graphics/pokemon/front_pics/golem_still_front_pic.png rename to graphics/pokemon/golem/front.png diff --git a/graphics/pokemon/icons/golem_icon.png b/graphics/pokemon/golem/icon.png similarity index 100% rename from graphics/pokemon/icons/golem_icon.png rename to graphics/pokemon/golem/icon.png diff --git a/graphics/pokemon/palettes/golem_palette.pal b/graphics/pokemon/golem/normal.pal similarity index 100% rename from graphics/pokemon/palettes/golem_palette.pal rename to graphics/pokemon/golem/normal.pal diff --git a/graphics/pokemon/palettes/golem_shiny_palette.pal b/graphics/pokemon/golem/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/golem_shiny_palette.pal rename to graphics/pokemon/golem/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/gorebyss_front_pic.png b/graphics/pokemon/gorebyss/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/gorebyss_front_pic.png rename to graphics/pokemon/gorebyss/anim_front.png diff --git a/graphics/pokemon/back_pics/gorebyss_back_pic.png b/graphics/pokemon/gorebyss/back.png similarity index 100% rename from graphics/pokemon/back_pics/gorebyss_back_pic.png rename to graphics/pokemon/gorebyss/back.png diff --git a/graphics/pokemon/footprints/gorebyss_footprint.png b/graphics/pokemon/gorebyss/footprint.png similarity index 100% rename from graphics/pokemon/footprints/gorebyss_footprint.png rename to graphics/pokemon/gorebyss/footprint.png diff --git a/graphics/pokemon/front_pics/gorebyss_still_front_pic.png b/graphics/pokemon/gorebyss/front.png similarity index 100% rename from graphics/pokemon/front_pics/gorebyss_still_front_pic.png rename to graphics/pokemon/gorebyss/front.png diff --git a/graphics/pokemon/icons/gorebyss_icon.png b/graphics/pokemon/gorebyss/icon.png similarity index 100% rename from graphics/pokemon/icons/gorebyss_icon.png rename to graphics/pokemon/gorebyss/icon.png diff --git a/graphics/pokemon/palettes/gorebyss_palette.pal b/graphics/pokemon/gorebyss/normal.pal similarity index 100% rename from graphics/pokemon/palettes/gorebyss_palette.pal rename to graphics/pokemon/gorebyss/normal.pal diff --git a/graphics/pokemon/palettes/gorebyss_shiny_palette.pal b/graphics/pokemon/gorebyss/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/gorebyss_shiny_palette.pal rename to graphics/pokemon/gorebyss/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/granbull_front_pic.png b/graphics/pokemon/granbull/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/granbull_front_pic.png rename to graphics/pokemon/granbull/anim_front.png diff --git a/graphics/pokemon/back_pics/granbull_back_pic.png b/graphics/pokemon/granbull/back.png similarity index 100% rename from graphics/pokemon/back_pics/granbull_back_pic.png rename to graphics/pokemon/granbull/back.png diff --git a/graphics/pokemon/footprints/granbull_footprint.png b/graphics/pokemon/granbull/footprint.png similarity index 100% rename from graphics/pokemon/footprints/granbull_footprint.png rename to graphics/pokemon/granbull/footprint.png diff --git a/graphics/pokemon/front_pics/granbull_still_front_pic.png b/graphics/pokemon/granbull/front.png similarity index 100% rename from graphics/pokemon/front_pics/granbull_still_front_pic.png rename to graphics/pokemon/granbull/front.png diff --git a/graphics/pokemon/icons/granbull_icon.png b/graphics/pokemon/granbull/icon.png similarity index 100% rename from graphics/pokemon/icons/granbull_icon.png rename to graphics/pokemon/granbull/icon.png diff --git a/graphics/pokemon/palettes/granbull_palette.pal b/graphics/pokemon/granbull/normal.pal similarity index 100% rename from graphics/pokemon/palettes/granbull_palette.pal rename to graphics/pokemon/granbull/normal.pal diff --git a/graphics/pokemon/palettes/granbull_shiny_palette.pal b/graphics/pokemon/granbull/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/granbull_shiny_palette.pal rename to graphics/pokemon/granbull/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/graveler_front_pic.png b/graphics/pokemon/graveler/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/graveler_front_pic.png rename to graphics/pokemon/graveler/anim_front.png diff --git a/graphics/pokemon/back_pics/graveler_back_pic.png b/graphics/pokemon/graveler/back.png similarity index 100% rename from graphics/pokemon/back_pics/graveler_back_pic.png rename to graphics/pokemon/graveler/back.png diff --git a/graphics/pokemon/footprints/graveler_footprint.png b/graphics/pokemon/graveler/footprint.png similarity index 100% rename from graphics/pokemon/footprints/graveler_footprint.png rename to graphics/pokemon/graveler/footprint.png diff --git a/graphics/pokemon/front_pics/graveler_still_front_pic.png b/graphics/pokemon/graveler/front.png similarity index 100% rename from graphics/pokemon/front_pics/graveler_still_front_pic.png rename to graphics/pokemon/graveler/front.png diff --git a/graphics/pokemon/icons/graveler_icon.png b/graphics/pokemon/graveler/icon.png similarity index 100% rename from graphics/pokemon/icons/graveler_icon.png rename to graphics/pokemon/graveler/icon.png diff --git a/graphics/pokemon/palettes/graveler_palette.pal b/graphics/pokemon/graveler/normal.pal similarity index 100% rename from graphics/pokemon/palettes/graveler_palette.pal rename to graphics/pokemon/graveler/normal.pal diff --git a/graphics/pokemon/palettes/graveler_shiny_palette.pal b/graphics/pokemon/graveler/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/graveler_shiny_palette.pal rename to graphics/pokemon/graveler/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/grimer_front_pic.png b/graphics/pokemon/grimer/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/grimer_front_pic.png rename to graphics/pokemon/grimer/anim_front.png diff --git a/graphics/pokemon/back_pics/grimer_back_pic.png b/graphics/pokemon/grimer/back.png similarity index 100% rename from graphics/pokemon/back_pics/grimer_back_pic.png rename to graphics/pokemon/grimer/back.png diff --git a/graphics/pokemon/footprints/grimer_footprint.png b/graphics/pokemon/grimer/footprint.png similarity index 100% rename from graphics/pokemon/footprints/grimer_footprint.png rename to graphics/pokemon/grimer/footprint.png diff --git a/graphics/pokemon/front_pics/grimer_still_front_pic.png b/graphics/pokemon/grimer/front.png similarity index 100% rename from graphics/pokemon/front_pics/grimer_still_front_pic.png rename to graphics/pokemon/grimer/front.png diff --git a/graphics/pokemon/icons/grimer_icon.png b/graphics/pokemon/grimer/icon.png similarity index 100% rename from graphics/pokemon/icons/grimer_icon.png rename to graphics/pokemon/grimer/icon.png diff --git a/graphics/pokemon/palettes/grimer_palette.pal b/graphics/pokemon/grimer/normal.pal similarity index 100% rename from graphics/pokemon/palettes/grimer_palette.pal rename to graphics/pokemon/grimer/normal.pal diff --git a/graphics/pokemon/palettes/grimer_shiny_palette.pal b/graphics/pokemon/grimer/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/grimer_shiny_palette.pal rename to graphics/pokemon/grimer/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/groudon_front_pic.png b/graphics/pokemon/groudon/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/groudon_front_pic.png rename to graphics/pokemon/groudon/anim_front.png diff --git a/graphics/pokemon/back_pics/groudon_back_pic.png b/graphics/pokemon/groudon/back.png similarity index 100% rename from graphics/pokemon/back_pics/groudon_back_pic.png rename to graphics/pokemon/groudon/back.png diff --git a/graphics/pokemon/footprints/groudon_footprint.png b/graphics/pokemon/groudon/footprint.png similarity index 100% rename from graphics/pokemon/footprints/groudon_footprint.png rename to graphics/pokemon/groudon/footprint.png diff --git a/graphics/pokemon/front_pics/groudon_still_front_pic.png b/graphics/pokemon/groudon/front.png similarity index 100% rename from graphics/pokemon/front_pics/groudon_still_front_pic.png rename to graphics/pokemon/groudon/front.png diff --git a/graphics/pokemon/icons/groudon_icon.png b/graphics/pokemon/groudon/icon.png similarity index 100% rename from graphics/pokemon/icons/groudon_icon.png rename to graphics/pokemon/groudon/icon.png diff --git a/graphics/pokemon/palettes/groudon_palette.pal b/graphics/pokemon/groudon/normal.pal similarity index 100% rename from graphics/pokemon/palettes/groudon_palette.pal rename to graphics/pokemon/groudon/normal.pal diff --git a/graphics/pokemon/palettes/groudon_shiny_palette.pal b/graphics/pokemon/groudon/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/groudon_shiny_palette.pal rename to graphics/pokemon/groudon/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/grovyle_front_pic.png b/graphics/pokemon/grovyle/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/grovyle_front_pic.png rename to graphics/pokemon/grovyle/anim_front.png diff --git a/graphics/pokemon/back_pics/grovyle_back_pic.png b/graphics/pokemon/grovyle/back.png similarity index 100% rename from graphics/pokemon/back_pics/grovyle_back_pic.png rename to graphics/pokemon/grovyle/back.png diff --git a/graphics/pokemon/footprints/grovyle_footprint.png b/graphics/pokemon/grovyle/footprint.png similarity index 100% rename from graphics/pokemon/footprints/grovyle_footprint.png rename to graphics/pokemon/grovyle/footprint.png diff --git a/graphics/pokemon/front_pics/grovyle_still_front_pic.png b/graphics/pokemon/grovyle/front.png similarity index 100% rename from graphics/pokemon/front_pics/grovyle_still_front_pic.png rename to graphics/pokemon/grovyle/front.png diff --git a/graphics/pokemon/icons/grovyle_icon.png b/graphics/pokemon/grovyle/icon.png similarity index 100% rename from graphics/pokemon/icons/grovyle_icon.png rename to graphics/pokemon/grovyle/icon.png diff --git a/graphics/pokemon/palettes/grovyle_palette.pal b/graphics/pokemon/grovyle/normal.pal similarity index 100% rename from graphics/pokemon/palettes/grovyle_palette.pal rename to graphics/pokemon/grovyle/normal.pal diff --git a/graphics/pokemon/palettes/grovyle_shiny_palette.pal b/graphics/pokemon/grovyle/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/grovyle_shiny_palette.pal rename to graphics/pokemon/grovyle/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/growlithe_front_pic.png b/graphics/pokemon/growlithe/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/growlithe_front_pic.png rename to graphics/pokemon/growlithe/anim_front.png diff --git a/graphics/pokemon/back_pics/growlithe_back_pic.png b/graphics/pokemon/growlithe/back.png similarity index 100% rename from graphics/pokemon/back_pics/growlithe_back_pic.png rename to graphics/pokemon/growlithe/back.png diff --git a/graphics/pokemon/footprints/growlithe_footprint.png b/graphics/pokemon/growlithe/footprint.png similarity index 100% rename from graphics/pokemon/footprints/growlithe_footprint.png rename to graphics/pokemon/growlithe/footprint.png diff --git a/graphics/pokemon/front_pics/growlithe_still_front_pic.png b/graphics/pokemon/growlithe/front.png similarity index 100% rename from graphics/pokemon/front_pics/growlithe_still_front_pic.png rename to graphics/pokemon/growlithe/front.png diff --git a/graphics/pokemon/icons/growlithe_icon.png b/graphics/pokemon/growlithe/icon.png similarity index 100% rename from graphics/pokemon/icons/growlithe_icon.png rename to graphics/pokemon/growlithe/icon.png diff --git a/graphics/pokemon/palettes/growlithe_palette.pal b/graphics/pokemon/growlithe/normal.pal similarity index 100% rename from graphics/pokemon/palettes/growlithe_palette.pal rename to graphics/pokemon/growlithe/normal.pal diff --git a/graphics/pokemon/palettes/growlithe_shiny_palette.pal b/graphics/pokemon/growlithe/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/growlithe_shiny_palette.pal rename to graphics/pokemon/growlithe/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/grumpig_front_pic.png b/graphics/pokemon/grumpig/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/grumpig_front_pic.png rename to graphics/pokemon/grumpig/anim_front.png diff --git a/graphics/pokemon/back_pics/grumpig_back_pic.png b/graphics/pokemon/grumpig/back.png similarity index 100% rename from graphics/pokemon/back_pics/grumpig_back_pic.png rename to graphics/pokemon/grumpig/back.png diff --git a/graphics/pokemon/footprints/grumpig_footprint.png b/graphics/pokemon/grumpig/footprint.png similarity index 100% rename from graphics/pokemon/footprints/grumpig_footprint.png rename to graphics/pokemon/grumpig/footprint.png diff --git a/graphics/pokemon/front_pics/grumpig_still_front_pic.png b/graphics/pokemon/grumpig/front.png similarity index 100% rename from graphics/pokemon/front_pics/grumpig_still_front_pic.png rename to graphics/pokemon/grumpig/front.png diff --git a/graphics/pokemon/icons/grumpig_icon.png b/graphics/pokemon/grumpig/icon.png similarity index 100% rename from graphics/pokemon/icons/grumpig_icon.png rename to graphics/pokemon/grumpig/icon.png diff --git a/graphics/pokemon/palettes/grumpig_palette.pal b/graphics/pokemon/grumpig/normal.pal similarity index 100% rename from graphics/pokemon/palettes/grumpig_palette.pal rename to graphics/pokemon/grumpig/normal.pal diff --git a/graphics/pokemon/palettes/grumpig_shiny_palette.pal b/graphics/pokemon/grumpig/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/grumpig_shiny_palette.pal rename to graphics/pokemon/grumpig/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/gulpin_front_pic.png b/graphics/pokemon/gulpin/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/gulpin_front_pic.png rename to graphics/pokemon/gulpin/anim_front.png diff --git a/graphics/pokemon/back_pics/gulpin_back_pic.png b/graphics/pokemon/gulpin/back.png similarity index 100% rename from graphics/pokemon/back_pics/gulpin_back_pic.png rename to graphics/pokemon/gulpin/back.png diff --git a/graphics/pokemon/footprints/gulpin_footprint.png b/graphics/pokemon/gulpin/footprint.png similarity index 100% rename from graphics/pokemon/footprints/gulpin_footprint.png rename to graphics/pokemon/gulpin/footprint.png diff --git a/graphics/pokemon/front_pics/gulpin_still_front_pic.png b/graphics/pokemon/gulpin/front.png similarity index 100% rename from graphics/pokemon/front_pics/gulpin_still_front_pic.png rename to graphics/pokemon/gulpin/front.png diff --git a/graphics/pokemon/icons/gulpin_icon.png b/graphics/pokemon/gulpin/icon.png similarity index 100% rename from graphics/pokemon/icons/gulpin_icon.png rename to graphics/pokemon/gulpin/icon.png diff --git a/graphics/pokemon/palettes/gulpin_palette.pal b/graphics/pokemon/gulpin/normal.pal similarity index 100% rename from graphics/pokemon/palettes/gulpin_palette.pal rename to graphics/pokemon/gulpin/normal.pal diff --git a/graphics/pokemon/palettes/gulpin_shiny_palette.pal b/graphics/pokemon/gulpin/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/gulpin_shiny_palette.pal rename to graphics/pokemon/gulpin/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/gyarados_front_pic.png b/graphics/pokemon/gyarados/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/gyarados_front_pic.png rename to graphics/pokemon/gyarados/anim_front.png diff --git a/graphics/pokemon/back_pics/gyarados_back_pic.png b/graphics/pokemon/gyarados/back.png similarity index 100% rename from graphics/pokemon/back_pics/gyarados_back_pic.png rename to graphics/pokemon/gyarados/back.png diff --git a/graphics/pokemon/footprints/gyarados_footprint.png b/graphics/pokemon/gyarados/footprint.png similarity index 100% rename from graphics/pokemon/footprints/gyarados_footprint.png rename to graphics/pokemon/gyarados/footprint.png diff --git a/graphics/pokemon/front_pics/gyarados_still_front_pic.png b/graphics/pokemon/gyarados/front.png similarity index 100% rename from graphics/pokemon/front_pics/gyarados_still_front_pic.png rename to graphics/pokemon/gyarados/front.png diff --git a/graphics/pokemon/icons/gyarados_icon.png b/graphics/pokemon/gyarados/icon.png similarity index 100% rename from graphics/pokemon/icons/gyarados_icon.png rename to graphics/pokemon/gyarados/icon.png diff --git a/graphics/pokemon/palettes/gyarados_palette.pal b/graphics/pokemon/gyarados/normal.pal similarity index 100% rename from graphics/pokemon/palettes/gyarados_palette.pal rename to graphics/pokemon/gyarados/normal.pal diff --git a/graphics/pokemon/palettes/gyarados_shiny_palette.pal b/graphics/pokemon/gyarados/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/gyarados_shiny_palette.pal rename to graphics/pokemon/gyarados/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/hariyama_front_pic.png b/graphics/pokemon/hariyama/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/hariyama_front_pic.png rename to graphics/pokemon/hariyama/anim_front.png diff --git a/graphics/pokemon/back_pics/hariyama_back_pic.png b/graphics/pokemon/hariyama/back.png similarity index 100% rename from graphics/pokemon/back_pics/hariyama_back_pic.png rename to graphics/pokemon/hariyama/back.png diff --git a/graphics/pokemon/footprints/hariyama_footprint.png b/graphics/pokemon/hariyama/footprint.png similarity index 100% rename from graphics/pokemon/footprints/hariyama_footprint.png rename to graphics/pokemon/hariyama/footprint.png diff --git a/graphics/pokemon/front_pics/hariyama_still_front_pic.png b/graphics/pokemon/hariyama/front.png similarity index 100% rename from graphics/pokemon/front_pics/hariyama_still_front_pic.png rename to graphics/pokemon/hariyama/front.png diff --git a/graphics/pokemon/icons/hariyama_icon.png b/graphics/pokemon/hariyama/icon.png similarity index 100% rename from graphics/pokemon/icons/hariyama_icon.png rename to graphics/pokemon/hariyama/icon.png diff --git a/graphics/pokemon/palettes/hariyama_palette.pal b/graphics/pokemon/hariyama/normal.pal similarity index 100% rename from graphics/pokemon/palettes/hariyama_palette.pal rename to graphics/pokemon/hariyama/normal.pal diff --git a/graphics/pokemon/palettes/hariyama_shiny_palette.pal b/graphics/pokemon/hariyama/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/hariyama_shiny_palette.pal rename to graphics/pokemon/hariyama/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/haunter_front_pic.png b/graphics/pokemon/haunter/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/haunter_front_pic.png rename to graphics/pokemon/haunter/anim_front.png diff --git a/graphics/pokemon/back_pics/haunter_back_pic.png b/graphics/pokemon/haunter/back.png similarity index 100% rename from graphics/pokemon/back_pics/haunter_back_pic.png rename to graphics/pokemon/haunter/back.png diff --git a/graphics/pokemon/footprints/haunter_footprint.png b/graphics/pokemon/haunter/footprint.png similarity index 100% rename from graphics/pokemon/footprints/haunter_footprint.png rename to graphics/pokemon/haunter/footprint.png diff --git a/graphics/pokemon/front_pics/haunter_still_front_pic.png b/graphics/pokemon/haunter/front.png similarity index 100% rename from graphics/pokemon/front_pics/haunter_still_front_pic.png rename to graphics/pokemon/haunter/front.png diff --git a/graphics/pokemon/icons/haunter_icon.png b/graphics/pokemon/haunter/icon.png similarity index 100% rename from graphics/pokemon/icons/haunter_icon.png rename to graphics/pokemon/haunter/icon.png diff --git a/graphics/pokemon/palettes/haunter_palette.pal b/graphics/pokemon/haunter/normal.pal similarity index 100% rename from graphics/pokemon/palettes/haunter_palette.pal rename to graphics/pokemon/haunter/normal.pal diff --git a/graphics/pokemon/palettes/haunter_shiny_palette.pal b/graphics/pokemon/haunter/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/haunter_shiny_palette.pal rename to graphics/pokemon/haunter/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/heracross_front_pic.png b/graphics/pokemon/heracross/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/heracross_front_pic.png rename to graphics/pokemon/heracross/anim_front.png diff --git a/graphics/pokemon/back_pics/heracross_back_pic.png b/graphics/pokemon/heracross/back.png similarity index 100% rename from graphics/pokemon/back_pics/heracross_back_pic.png rename to graphics/pokemon/heracross/back.png diff --git a/graphics/pokemon/footprints/heracross_footprint.png b/graphics/pokemon/heracross/footprint.png similarity index 100% rename from graphics/pokemon/footprints/heracross_footprint.png rename to graphics/pokemon/heracross/footprint.png diff --git a/graphics/pokemon/front_pics/heracross_still_front_pic.png b/graphics/pokemon/heracross/front.png similarity index 100% rename from graphics/pokemon/front_pics/heracross_still_front_pic.png rename to graphics/pokemon/heracross/front.png diff --git a/graphics/pokemon/icons/heracross_icon.png b/graphics/pokemon/heracross/icon.png similarity index 100% rename from graphics/pokemon/icons/heracross_icon.png rename to graphics/pokemon/heracross/icon.png diff --git a/graphics/pokemon/palettes/heracross_palette.pal b/graphics/pokemon/heracross/normal.pal similarity index 100% rename from graphics/pokemon/palettes/heracross_palette.pal rename to graphics/pokemon/heracross/normal.pal diff --git a/graphics/pokemon/palettes/heracross_shiny_palette.pal b/graphics/pokemon/heracross/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/heracross_shiny_palette.pal rename to graphics/pokemon/heracross/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/hitmonchan_front_pic.png b/graphics/pokemon/hitmonchan/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/hitmonchan_front_pic.png rename to graphics/pokemon/hitmonchan/anim_front.png diff --git a/graphics/pokemon/back_pics/hitmonchan_back_pic.png b/graphics/pokemon/hitmonchan/back.png similarity index 100% rename from graphics/pokemon/back_pics/hitmonchan_back_pic.png rename to graphics/pokemon/hitmonchan/back.png diff --git a/graphics/pokemon/footprints/hitmonchan_footprint.png b/graphics/pokemon/hitmonchan/footprint.png similarity index 100% rename from graphics/pokemon/footprints/hitmonchan_footprint.png rename to graphics/pokemon/hitmonchan/footprint.png diff --git a/graphics/pokemon/front_pics/hitmonchan_still_front_pic.png b/graphics/pokemon/hitmonchan/front.png similarity index 100% rename from graphics/pokemon/front_pics/hitmonchan_still_front_pic.png rename to graphics/pokemon/hitmonchan/front.png diff --git a/graphics/pokemon/icons/hitmonchan_icon.png b/graphics/pokemon/hitmonchan/icon.png similarity index 100% rename from graphics/pokemon/icons/hitmonchan_icon.png rename to graphics/pokemon/hitmonchan/icon.png diff --git a/graphics/pokemon/palettes/hitmonchan_palette.pal b/graphics/pokemon/hitmonchan/normal.pal similarity index 100% rename from graphics/pokemon/palettes/hitmonchan_palette.pal rename to graphics/pokemon/hitmonchan/normal.pal diff --git a/graphics/pokemon/palettes/hitmonchan_shiny_palette.pal b/graphics/pokemon/hitmonchan/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/hitmonchan_shiny_palette.pal rename to graphics/pokemon/hitmonchan/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/hitmonlee_front_pic.png b/graphics/pokemon/hitmonlee/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/hitmonlee_front_pic.png rename to graphics/pokemon/hitmonlee/anim_front.png diff --git a/graphics/pokemon/back_pics/hitmonlee_back_pic.png b/graphics/pokemon/hitmonlee/back.png similarity index 100% rename from graphics/pokemon/back_pics/hitmonlee_back_pic.png rename to graphics/pokemon/hitmonlee/back.png diff --git a/graphics/pokemon/footprints/hitmonlee_footprint.png b/graphics/pokemon/hitmonlee/footprint.png similarity index 100% rename from graphics/pokemon/footprints/hitmonlee_footprint.png rename to graphics/pokemon/hitmonlee/footprint.png diff --git a/graphics/pokemon/front_pics/hitmonlee_still_front_pic.png b/graphics/pokemon/hitmonlee/front.png similarity index 100% rename from graphics/pokemon/front_pics/hitmonlee_still_front_pic.png rename to graphics/pokemon/hitmonlee/front.png diff --git a/graphics/pokemon/icons/hitmonlee_icon.png b/graphics/pokemon/hitmonlee/icon.png similarity index 100% rename from graphics/pokemon/icons/hitmonlee_icon.png rename to graphics/pokemon/hitmonlee/icon.png diff --git a/graphics/pokemon/palettes/hitmonlee_palette.pal b/graphics/pokemon/hitmonlee/normal.pal similarity index 100% rename from graphics/pokemon/palettes/hitmonlee_palette.pal rename to graphics/pokemon/hitmonlee/normal.pal diff --git a/graphics/pokemon/palettes/hitmonlee_shiny_palette.pal b/graphics/pokemon/hitmonlee/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/hitmonlee_shiny_palette.pal rename to graphics/pokemon/hitmonlee/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/hitmontop_front_pic.png b/graphics/pokemon/hitmontop/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/hitmontop_front_pic.png rename to graphics/pokemon/hitmontop/anim_front.png diff --git a/graphics/pokemon/back_pics/hitmontop_back_pic.png b/graphics/pokemon/hitmontop/back.png similarity index 100% rename from graphics/pokemon/back_pics/hitmontop_back_pic.png rename to graphics/pokemon/hitmontop/back.png diff --git a/graphics/pokemon/footprints/hitmontop_footprint.png b/graphics/pokemon/hitmontop/footprint.png similarity index 100% rename from graphics/pokemon/footprints/hitmontop_footprint.png rename to graphics/pokemon/hitmontop/footprint.png diff --git a/graphics/pokemon/front_pics/hitmontop_still_front_pic.png b/graphics/pokemon/hitmontop/front.png similarity index 100% rename from graphics/pokemon/front_pics/hitmontop_still_front_pic.png rename to graphics/pokemon/hitmontop/front.png diff --git a/graphics/pokemon/icons/hitmontop_icon.png b/graphics/pokemon/hitmontop/icon.png similarity index 100% rename from graphics/pokemon/icons/hitmontop_icon.png rename to graphics/pokemon/hitmontop/icon.png diff --git a/graphics/pokemon/palettes/hitmontop_palette.pal b/graphics/pokemon/hitmontop/normal.pal similarity index 100% rename from graphics/pokemon/palettes/hitmontop_palette.pal rename to graphics/pokemon/hitmontop/normal.pal diff --git a/graphics/pokemon/palettes/hitmontop_shiny_palette.pal b/graphics/pokemon/hitmontop/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/hitmontop_shiny_palette.pal rename to graphics/pokemon/hitmontop/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/ho_oh_front_pic.png b/graphics/pokemon/ho_oh/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/ho_oh_front_pic.png rename to graphics/pokemon/ho_oh/anim_front.png diff --git a/graphics/pokemon/back_pics/ho_oh_back_pic.png b/graphics/pokemon/ho_oh/back.png similarity index 100% rename from graphics/pokemon/back_pics/ho_oh_back_pic.png rename to graphics/pokemon/ho_oh/back.png diff --git a/graphics/pokemon/footprints/ho_oh_footprint.png b/graphics/pokemon/ho_oh/footprint.png similarity index 100% rename from graphics/pokemon/footprints/ho_oh_footprint.png rename to graphics/pokemon/ho_oh/footprint.png diff --git a/graphics/pokemon/front_pics/ho_oh_still_front_pic.png b/graphics/pokemon/ho_oh/front.png similarity index 100% rename from graphics/pokemon/front_pics/ho_oh_still_front_pic.png rename to graphics/pokemon/ho_oh/front.png diff --git a/graphics/pokemon/icons/ho_oh_icon.png b/graphics/pokemon/ho_oh/icon.png similarity index 100% rename from graphics/pokemon/icons/ho_oh_icon.png rename to graphics/pokemon/ho_oh/icon.png diff --git a/graphics/pokemon/palettes/ho_oh_palette.pal b/graphics/pokemon/ho_oh/normal.pal similarity index 100% rename from graphics/pokemon/palettes/ho_oh_palette.pal rename to graphics/pokemon/ho_oh/normal.pal diff --git a/graphics/pokemon/palettes/ho_oh_shiny_palette.pal b/graphics/pokemon/ho_oh/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/ho_oh_shiny_palette.pal rename to graphics/pokemon/ho_oh/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/hoothoot_front_pic.png b/graphics/pokemon/hoothoot/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/hoothoot_front_pic.png rename to graphics/pokemon/hoothoot/anim_front.png diff --git a/graphics/pokemon/back_pics/hoothoot_back_pic.png b/graphics/pokemon/hoothoot/back.png similarity index 100% rename from graphics/pokemon/back_pics/hoothoot_back_pic.png rename to graphics/pokemon/hoothoot/back.png diff --git a/graphics/pokemon/footprints/hoothoot_footprint.png b/graphics/pokemon/hoothoot/footprint.png similarity index 100% rename from graphics/pokemon/footprints/hoothoot_footprint.png rename to graphics/pokemon/hoothoot/footprint.png diff --git a/graphics/pokemon/front_pics/hoothoot_still_front_pic.png b/graphics/pokemon/hoothoot/front.png similarity index 100% rename from graphics/pokemon/front_pics/hoothoot_still_front_pic.png rename to graphics/pokemon/hoothoot/front.png diff --git a/graphics/pokemon/icons/hoothoot_icon.png b/graphics/pokemon/hoothoot/icon.png similarity index 100% rename from graphics/pokemon/icons/hoothoot_icon.png rename to graphics/pokemon/hoothoot/icon.png diff --git a/graphics/pokemon/palettes/hoothoot_palette.pal b/graphics/pokemon/hoothoot/normal.pal similarity index 100% rename from graphics/pokemon/palettes/hoothoot_palette.pal rename to graphics/pokemon/hoothoot/normal.pal diff --git a/graphics/pokemon/palettes/hoothoot_shiny_palette.pal b/graphics/pokemon/hoothoot/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/hoothoot_shiny_palette.pal rename to graphics/pokemon/hoothoot/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/hoppip_front_pic.png b/graphics/pokemon/hoppip/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/hoppip_front_pic.png rename to graphics/pokemon/hoppip/anim_front.png diff --git a/graphics/pokemon/back_pics/hoppip_back_pic.png b/graphics/pokemon/hoppip/back.png similarity index 100% rename from graphics/pokemon/back_pics/hoppip_back_pic.png rename to graphics/pokemon/hoppip/back.png diff --git a/graphics/pokemon/footprints/hoppip_footprint.png b/graphics/pokemon/hoppip/footprint.png similarity index 100% rename from graphics/pokemon/footprints/hoppip_footprint.png rename to graphics/pokemon/hoppip/footprint.png diff --git a/graphics/pokemon/front_pics/hoppip_still_front_pic.png b/graphics/pokemon/hoppip/front.png similarity index 100% rename from graphics/pokemon/front_pics/hoppip_still_front_pic.png rename to graphics/pokemon/hoppip/front.png diff --git a/graphics/pokemon/icons/hoppip_icon.png b/graphics/pokemon/hoppip/icon.png similarity index 100% rename from graphics/pokemon/icons/hoppip_icon.png rename to graphics/pokemon/hoppip/icon.png diff --git a/graphics/pokemon/palettes/hoppip_palette.pal b/graphics/pokemon/hoppip/normal.pal similarity index 100% rename from graphics/pokemon/palettes/hoppip_palette.pal rename to graphics/pokemon/hoppip/normal.pal diff --git a/graphics/pokemon/palettes/hoppip_shiny_palette.pal b/graphics/pokemon/hoppip/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/hoppip_shiny_palette.pal rename to graphics/pokemon/hoppip/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/horsea_front_pic.png b/graphics/pokemon/horsea/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/horsea_front_pic.png rename to graphics/pokemon/horsea/anim_front.png diff --git a/graphics/pokemon/back_pics/horsea_back_pic.png b/graphics/pokemon/horsea/back.png similarity index 100% rename from graphics/pokemon/back_pics/horsea_back_pic.png rename to graphics/pokemon/horsea/back.png diff --git a/graphics/pokemon/footprints/horsea_footprint.png b/graphics/pokemon/horsea/footprint.png similarity index 100% rename from graphics/pokemon/footprints/horsea_footprint.png rename to graphics/pokemon/horsea/footprint.png diff --git a/graphics/pokemon/front_pics/horsea_still_front_pic.png b/graphics/pokemon/horsea/front.png similarity index 100% rename from graphics/pokemon/front_pics/horsea_still_front_pic.png rename to graphics/pokemon/horsea/front.png diff --git a/graphics/pokemon/icons/horsea_icon.png b/graphics/pokemon/horsea/icon.png similarity index 100% rename from graphics/pokemon/icons/horsea_icon.png rename to graphics/pokemon/horsea/icon.png diff --git a/graphics/pokemon/palettes/horsea_palette.pal b/graphics/pokemon/horsea/normal.pal similarity index 100% rename from graphics/pokemon/palettes/horsea_palette.pal rename to graphics/pokemon/horsea/normal.pal diff --git a/graphics/pokemon/palettes/horsea_shiny_palette.pal b/graphics/pokemon/horsea/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/horsea_shiny_palette.pal rename to graphics/pokemon/horsea/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/houndoom_front_pic.png b/graphics/pokemon/houndoom/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/houndoom_front_pic.png rename to graphics/pokemon/houndoom/anim_front.png diff --git a/graphics/pokemon/back_pics/houndoom_back_pic.png b/graphics/pokemon/houndoom/back.png similarity index 100% rename from graphics/pokemon/back_pics/houndoom_back_pic.png rename to graphics/pokemon/houndoom/back.png diff --git a/graphics/pokemon/footprints/houndoom_footprint.png b/graphics/pokemon/houndoom/footprint.png similarity index 100% rename from graphics/pokemon/footprints/houndoom_footprint.png rename to graphics/pokemon/houndoom/footprint.png diff --git a/graphics/pokemon/front_pics/houndoom_still_front_pic.png b/graphics/pokemon/houndoom/front.png similarity index 100% rename from graphics/pokemon/front_pics/houndoom_still_front_pic.png rename to graphics/pokemon/houndoom/front.png diff --git a/graphics/pokemon/icons/houndoom_icon.png b/graphics/pokemon/houndoom/icon.png similarity index 100% rename from graphics/pokemon/icons/houndoom_icon.png rename to graphics/pokemon/houndoom/icon.png diff --git a/graphics/pokemon/palettes/houndoom_palette.pal b/graphics/pokemon/houndoom/normal.pal similarity index 100% rename from graphics/pokemon/palettes/houndoom_palette.pal rename to graphics/pokemon/houndoom/normal.pal diff --git a/graphics/pokemon/palettes/houndoom_shiny_palette.pal b/graphics/pokemon/houndoom/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/houndoom_shiny_palette.pal rename to graphics/pokemon/houndoom/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/houndour_front_pic.png b/graphics/pokemon/houndour/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/houndour_front_pic.png rename to graphics/pokemon/houndour/anim_front.png diff --git a/graphics/pokemon/back_pics/houndour_back_pic.png b/graphics/pokemon/houndour/back.png similarity index 100% rename from graphics/pokemon/back_pics/houndour_back_pic.png rename to graphics/pokemon/houndour/back.png diff --git a/graphics/pokemon/footprints/houndour_footprint.png b/graphics/pokemon/houndour/footprint.png similarity index 100% rename from graphics/pokemon/footprints/houndour_footprint.png rename to graphics/pokemon/houndour/footprint.png diff --git a/graphics/pokemon/front_pics/houndour_still_front_pic.png b/graphics/pokemon/houndour/front.png similarity index 100% rename from graphics/pokemon/front_pics/houndour_still_front_pic.png rename to graphics/pokemon/houndour/front.png diff --git a/graphics/pokemon/icons/houndour_icon.png b/graphics/pokemon/houndour/icon.png similarity index 100% rename from graphics/pokemon/icons/houndour_icon.png rename to graphics/pokemon/houndour/icon.png diff --git a/graphics/pokemon/palettes/houndour_palette.pal b/graphics/pokemon/houndour/normal.pal similarity index 100% rename from graphics/pokemon/palettes/houndour_palette.pal rename to graphics/pokemon/houndour/normal.pal diff --git a/graphics/pokemon/palettes/houndour_shiny_palette.pal b/graphics/pokemon/houndour/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/houndour_shiny_palette.pal rename to graphics/pokemon/houndour/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/huntail_front_pic.png b/graphics/pokemon/huntail/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/huntail_front_pic.png rename to graphics/pokemon/huntail/anim_front.png diff --git a/graphics/pokemon/back_pics/huntail_back_pic.png b/graphics/pokemon/huntail/back.png similarity index 100% rename from graphics/pokemon/back_pics/huntail_back_pic.png rename to graphics/pokemon/huntail/back.png diff --git a/graphics/pokemon/footprints/huntail_footprint.png b/graphics/pokemon/huntail/footprint.png similarity index 100% rename from graphics/pokemon/footprints/huntail_footprint.png rename to graphics/pokemon/huntail/footprint.png diff --git a/graphics/pokemon/front_pics/huntail_still_front_pic.png b/graphics/pokemon/huntail/front.png similarity index 100% rename from graphics/pokemon/front_pics/huntail_still_front_pic.png rename to graphics/pokemon/huntail/front.png diff --git a/graphics/pokemon/icons/huntail_icon.png b/graphics/pokemon/huntail/icon.png similarity index 100% rename from graphics/pokemon/icons/huntail_icon.png rename to graphics/pokemon/huntail/icon.png diff --git a/graphics/pokemon/palettes/huntail_palette.pal b/graphics/pokemon/huntail/normal.pal similarity index 100% rename from graphics/pokemon/palettes/huntail_palette.pal rename to graphics/pokemon/huntail/normal.pal diff --git a/graphics/pokemon/palettes/huntail_shiny_palette.pal b/graphics/pokemon/huntail/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/huntail_shiny_palette.pal rename to graphics/pokemon/huntail/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/hypno_front_pic.png b/graphics/pokemon/hypno/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/hypno_front_pic.png rename to graphics/pokemon/hypno/anim_front.png diff --git a/graphics/pokemon/back_pics/hypno_back_pic.png b/graphics/pokemon/hypno/back.png similarity index 100% rename from graphics/pokemon/back_pics/hypno_back_pic.png rename to graphics/pokemon/hypno/back.png diff --git a/graphics/pokemon/footprints/hypno_footprint.png b/graphics/pokemon/hypno/footprint.png similarity index 100% rename from graphics/pokemon/footprints/hypno_footprint.png rename to graphics/pokemon/hypno/footprint.png diff --git a/graphics/pokemon/front_pics/hypno_still_front_pic.png b/graphics/pokemon/hypno/front.png similarity index 100% rename from graphics/pokemon/front_pics/hypno_still_front_pic.png rename to graphics/pokemon/hypno/front.png diff --git a/graphics/pokemon/icons/hypno_icon.png b/graphics/pokemon/hypno/icon.png similarity index 100% rename from graphics/pokemon/icons/hypno_icon.png rename to graphics/pokemon/hypno/icon.png diff --git a/graphics/pokemon/palettes/hypno_palette.pal b/graphics/pokemon/hypno/normal.pal similarity index 100% rename from graphics/pokemon/palettes/hypno_palette.pal rename to graphics/pokemon/hypno/normal.pal diff --git a/graphics/pokemon/palettes/hypno_shiny_palette.pal b/graphics/pokemon/hypno/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/hypno_shiny_palette.pal rename to graphics/pokemon/hypno/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/igglybuff_front_pic.png b/graphics/pokemon/igglybuff/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/igglybuff_front_pic.png rename to graphics/pokemon/igglybuff/anim_front.png diff --git a/graphics/pokemon/back_pics/igglybuff_back_pic.png b/graphics/pokemon/igglybuff/back.png similarity index 100% rename from graphics/pokemon/back_pics/igglybuff_back_pic.png rename to graphics/pokemon/igglybuff/back.png diff --git a/graphics/pokemon/footprints/igglybuff_footprint.png b/graphics/pokemon/igglybuff/footprint.png similarity index 100% rename from graphics/pokemon/footprints/igglybuff_footprint.png rename to graphics/pokemon/igglybuff/footprint.png diff --git a/graphics/pokemon/front_pics/igglybuff_still_front_pic.png b/graphics/pokemon/igglybuff/front.png similarity index 100% rename from graphics/pokemon/front_pics/igglybuff_still_front_pic.png rename to graphics/pokemon/igglybuff/front.png diff --git a/graphics/pokemon/icons/igglybuff_icon.png b/graphics/pokemon/igglybuff/icon.png similarity index 100% rename from graphics/pokemon/icons/igglybuff_icon.png rename to graphics/pokemon/igglybuff/icon.png diff --git a/graphics/pokemon/palettes/igglybuff_palette.pal b/graphics/pokemon/igglybuff/normal.pal similarity index 100% rename from graphics/pokemon/palettes/igglybuff_palette.pal rename to graphics/pokemon/igglybuff/normal.pal diff --git a/graphics/pokemon/palettes/igglybuff_shiny_palette.pal b/graphics/pokemon/igglybuff/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/igglybuff_shiny_palette.pal rename to graphics/pokemon/igglybuff/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/illumise_front_pic.png b/graphics/pokemon/illumise/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/illumise_front_pic.png rename to graphics/pokemon/illumise/anim_front.png diff --git a/graphics/pokemon/back_pics/illumise_back_pic.png b/graphics/pokemon/illumise/back.png similarity index 100% rename from graphics/pokemon/back_pics/illumise_back_pic.png rename to graphics/pokemon/illumise/back.png diff --git a/graphics/pokemon/footprints/illumise_footprint.png b/graphics/pokemon/illumise/footprint.png similarity index 100% rename from graphics/pokemon/footprints/illumise_footprint.png rename to graphics/pokemon/illumise/footprint.png diff --git a/graphics/pokemon/front_pics/illumise_still_front_pic.png b/graphics/pokemon/illumise/front.png similarity index 100% rename from graphics/pokemon/front_pics/illumise_still_front_pic.png rename to graphics/pokemon/illumise/front.png diff --git a/graphics/pokemon/icons/illumise_icon.png b/graphics/pokemon/illumise/icon.png similarity index 100% rename from graphics/pokemon/icons/illumise_icon.png rename to graphics/pokemon/illumise/icon.png diff --git a/graphics/pokemon/palettes/illumise_palette.pal b/graphics/pokemon/illumise/normal.pal similarity index 100% rename from graphics/pokemon/palettes/illumise_palette.pal rename to graphics/pokemon/illumise/normal.pal diff --git a/graphics/pokemon/palettes/illumise_shiny_palette.pal b/graphics/pokemon/illumise/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/illumise_shiny_palette.pal rename to graphics/pokemon/illumise/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/ivysaur_front_pic.png b/graphics/pokemon/ivysaur/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/ivysaur_front_pic.png rename to graphics/pokemon/ivysaur/anim_front.png diff --git a/graphics/pokemon/back_pics/ivysaur_back_pic.png b/graphics/pokemon/ivysaur/back.png similarity index 100% rename from graphics/pokemon/back_pics/ivysaur_back_pic.png rename to graphics/pokemon/ivysaur/back.png diff --git a/graphics/pokemon/footprints/ivysaur_footprint.png b/graphics/pokemon/ivysaur/footprint.png similarity index 100% rename from graphics/pokemon/footprints/ivysaur_footprint.png rename to graphics/pokemon/ivysaur/footprint.png diff --git a/graphics/pokemon/front_pics/ivysaur_still_front_pic.png b/graphics/pokemon/ivysaur/front.png similarity index 100% rename from graphics/pokemon/front_pics/ivysaur_still_front_pic.png rename to graphics/pokemon/ivysaur/front.png diff --git a/graphics/pokemon/icons/ivysaur_icon.png b/graphics/pokemon/ivysaur/icon.png similarity index 100% rename from graphics/pokemon/icons/ivysaur_icon.png rename to graphics/pokemon/ivysaur/icon.png diff --git a/graphics/pokemon/palettes/ivysaur_palette.pal b/graphics/pokemon/ivysaur/normal.pal similarity index 100% rename from graphics/pokemon/palettes/ivysaur_palette.pal rename to graphics/pokemon/ivysaur/normal.pal diff --git a/graphics/pokemon/palettes/ivysaur_shiny_palette.pal b/graphics/pokemon/ivysaur/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/ivysaur_shiny_palette.pal rename to graphics/pokemon/ivysaur/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/jigglypuff_front_pic.png b/graphics/pokemon/jigglypuff/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/jigglypuff_front_pic.png rename to graphics/pokemon/jigglypuff/anim_front.png diff --git a/graphics/pokemon/back_pics/jigglypuff_back_pic.png b/graphics/pokemon/jigglypuff/back.png similarity index 100% rename from graphics/pokemon/back_pics/jigglypuff_back_pic.png rename to graphics/pokemon/jigglypuff/back.png diff --git a/graphics/pokemon/footprints/jigglypuff_footprint.png b/graphics/pokemon/jigglypuff/footprint.png similarity index 100% rename from graphics/pokemon/footprints/jigglypuff_footprint.png rename to graphics/pokemon/jigglypuff/footprint.png diff --git a/graphics/pokemon/front_pics/jigglypuff_still_front_pic.png b/graphics/pokemon/jigglypuff/front.png similarity index 100% rename from graphics/pokemon/front_pics/jigglypuff_still_front_pic.png rename to graphics/pokemon/jigglypuff/front.png diff --git a/graphics/pokemon/icons/jigglypuff_icon.png b/graphics/pokemon/jigglypuff/icon.png similarity index 100% rename from graphics/pokemon/icons/jigglypuff_icon.png rename to graphics/pokemon/jigglypuff/icon.png diff --git a/graphics/pokemon/palettes/jigglypuff_palette.pal b/graphics/pokemon/jigglypuff/normal.pal similarity index 100% rename from graphics/pokemon/palettes/jigglypuff_palette.pal rename to graphics/pokemon/jigglypuff/normal.pal diff --git a/graphics/pokemon/palettes/jigglypuff_shiny_palette.pal b/graphics/pokemon/jigglypuff/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/jigglypuff_shiny_palette.pal rename to graphics/pokemon/jigglypuff/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/jirachi_front_pic.png b/graphics/pokemon/jirachi/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/jirachi_front_pic.png rename to graphics/pokemon/jirachi/anim_front.png diff --git a/graphics/pokemon/back_pics/jirachi_back_pic.png b/graphics/pokemon/jirachi/back.png similarity index 100% rename from graphics/pokemon/back_pics/jirachi_back_pic.png rename to graphics/pokemon/jirachi/back.png diff --git a/graphics/pokemon/footprints/jirachi_footprint.png b/graphics/pokemon/jirachi/footprint.png similarity index 100% rename from graphics/pokemon/footprints/jirachi_footprint.png rename to graphics/pokemon/jirachi/footprint.png diff --git a/graphics/pokemon/front_pics/jirachi_still_front_pic.png b/graphics/pokemon/jirachi/front.png similarity index 100% rename from graphics/pokemon/front_pics/jirachi_still_front_pic.png rename to graphics/pokemon/jirachi/front.png diff --git a/graphics/pokemon/icons/jirachi_icon.png b/graphics/pokemon/jirachi/icon.png similarity index 100% rename from graphics/pokemon/icons/jirachi_icon.png rename to graphics/pokemon/jirachi/icon.png diff --git a/graphics/pokemon/palettes/jirachi_palette.pal b/graphics/pokemon/jirachi/normal.pal similarity index 100% rename from graphics/pokemon/palettes/jirachi_palette.pal rename to graphics/pokemon/jirachi/normal.pal diff --git a/graphics/pokemon/palettes/jirachi_shiny_palette.pal b/graphics/pokemon/jirachi/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/jirachi_shiny_palette.pal rename to graphics/pokemon/jirachi/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/jolteon_front_pic.png b/graphics/pokemon/jolteon/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/jolteon_front_pic.png rename to graphics/pokemon/jolteon/anim_front.png diff --git a/graphics/pokemon/back_pics/jolteon_back_pic.png b/graphics/pokemon/jolteon/back.png similarity index 100% rename from graphics/pokemon/back_pics/jolteon_back_pic.png rename to graphics/pokemon/jolteon/back.png diff --git a/graphics/pokemon/footprints/jolteon_footprint.png b/graphics/pokemon/jolteon/footprint.png similarity index 100% rename from graphics/pokemon/footprints/jolteon_footprint.png rename to graphics/pokemon/jolteon/footprint.png diff --git a/graphics/pokemon/front_pics/jolteon_still_front_pic.png b/graphics/pokemon/jolteon/front.png similarity index 100% rename from graphics/pokemon/front_pics/jolteon_still_front_pic.png rename to graphics/pokemon/jolteon/front.png diff --git a/graphics/pokemon/icons/jolteon_icon.png b/graphics/pokemon/jolteon/icon.png similarity index 100% rename from graphics/pokemon/icons/jolteon_icon.png rename to graphics/pokemon/jolteon/icon.png diff --git a/graphics/pokemon/palettes/jolteon_palette.pal b/graphics/pokemon/jolteon/normal.pal similarity index 100% rename from graphics/pokemon/palettes/jolteon_palette.pal rename to graphics/pokemon/jolteon/normal.pal diff --git a/graphics/pokemon/palettes/jolteon_shiny_palette.pal b/graphics/pokemon/jolteon/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/jolteon_shiny_palette.pal rename to graphics/pokemon/jolteon/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/jumpluff_front_pic.png b/graphics/pokemon/jumpluff/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/jumpluff_front_pic.png rename to graphics/pokemon/jumpluff/anim_front.png diff --git a/graphics/pokemon/back_pics/jumpluff_back_pic.png b/graphics/pokemon/jumpluff/back.png similarity index 100% rename from graphics/pokemon/back_pics/jumpluff_back_pic.png rename to graphics/pokemon/jumpluff/back.png diff --git a/graphics/pokemon/footprints/jumpluff_footprint.png b/graphics/pokemon/jumpluff/footprint.png similarity index 100% rename from graphics/pokemon/footprints/jumpluff_footprint.png rename to graphics/pokemon/jumpluff/footprint.png diff --git a/graphics/pokemon/front_pics/jumpluff_still_front_pic.png b/graphics/pokemon/jumpluff/front.png similarity index 100% rename from graphics/pokemon/front_pics/jumpluff_still_front_pic.png rename to graphics/pokemon/jumpluff/front.png diff --git a/graphics/pokemon/icons/jumpluff_icon.png b/graphics/pokemon/jumpluff/icon.png similarity index 100% rename from graphics/pokemon/icons/jumpluff_icon.png rename to graphics/pokemon/jumpluff/icon.png diff --git a/graphics/pokemon/palettes/jumpluff_palette.pal b/graphics/pokemon/jumpluff/normal.pal similarity index 100% rename from graphics/pokemon/palettes/jumpluff_palette.pal rename to graphics/pokemon/jumpluff/normal.pal diff --git a/graphics/pokemon/palettes/jumpluff_shiny_palette.pal b/graphics/pokemon/jumpluff/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/jumpluff_shiny_palette.pal rename to graphics/pokemon/jumpluff/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/jynx_front_pic.png b/graphics/pokemon/jynx/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/jynx_front_pic.png rename to graphics/pokemon/jynx/anim_front.png diff --git a/graphics/pokemon/back_pics/jynx_back_pic.png b/graphics/pokemon/jynx/back.png similarity index 100% rename from graphics/pokemon/back_pics/jynx_back_pic.png rename to graphics/pokemon/jynx/back.png diff --git a/graphics/pokemon/footprints/jynx_footprint.png b/graphics/pokemon/jynx/footprint.png similarity index 100% rename from graphics/pokemon/footprints/jynx_footprint.png rename to graphics/pokemon/jynx/footprint.png diff --git a/graphics/pokemon/front_pics/jynx_still_front_pic.png b/graphics/pokemon/jynx/front.png similarity index 100% rename from graphics/pokemon/front_pics/jynx_still_front_pic.png rename to graphics/pokemon/jynx/front.png diff --git a/graphics/pokemon/icons/jynx_icon.png b/graphics/pokemon/jynx/icon.png similarity index 100% rename from graphics/pokemon/icons/jynx_icon.png rename to graphics/pokemon/jynx/icon.png diff --git a/graphics/pokemon/palettes/jynx_palette.pal b/graphics/pokemon/jynx/normal.pal similarity index 100% rename from graphics/pokemon/palettes/jynx_palette.pal rename to graphics/pokemon/jynx/normal.pal diff --git a/graphics/pokemon/palettes/jynx_shiny_palette.pal b/graphics/pokemon/jynx/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/jynx_shiny_palette.pal rename to graphics/pokemon/jynx/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/kabuto_front_pic.png b/graphics/pokemon/kabuto/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/kabuto_front_pic.png rename to graphics/pokemon/kabuto/anim_front.png diff --git a/graphics/pokemon/back_pics/kabuto_back_pic.png b/graphics/pokemon/kabuto/back.png similarity index 100% rename from graphics/pokemon/back_pics/kabuto_back_pic.png rename to graphics/pokemon/kabuto/back.png diff --git a/graphics/pokemon/footprints/kabuto_footprint.png b/graphics/pokemon/kabuto/footprint.png similarity index 100% rename from graphics/pokemon/footprints/kabuto_footprint.png rename to graphics/pokemon/kabuto/footprint.png diff --git a/graphics/pokemon/front_pics/kabuto_still_front_pic.png b/graphics/pokemon/kabuto/front.png similarity index 100% rename from graphics/pokemon/front_pics/kabuto_still_front_pic.png rename to graphics/pokemon/kabuto/front.png diff --git a/graphics/pokemon/icons/kabuto_icon.png b/graphics/pokemon/kabuto/icon.png similarity index 100% rename from graphics/pokemon/icons/kabuto_icon.png rename to graphics/pokemon/kabuto/icon.png diff --git a/graphics/pokemon/palettes/kabuto_palette.pal b/graphics/pokemon/kabuto/normal.pal similarity index 100% rename from graphics/pokemon/palettes/kabuto_palette.pal rename to graphics/pokemon/kabuto/normal.pal diff --git a/graphics/pokemon/palettes/kabuto_shiny_palette.pal b/graphics/pokemon/kabuto/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/kabuto_shiny_palette.pal rename to graphics/pokemon/kabuto/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/kabutops_front_pic.png b/graphics/pokemon/kabutops/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/kabutops_front_pic.png rename to graphics/pokemon/kabutops/anim_front.png diff --git a/graphics/pokemon/back_pics/kabutops_back_pic.png b/graphics/pokemon/kabutops/back.png similarity index 100% rename from graphics/pokemon/back_pics/kabutops_back_pic.png rename to graphics/pokemon/kabutops/back.png diff --git a/graphics/pokemon/footprints/kabutops_footprint.png b/graphics/pokemon/kabutops/footprint.png similarity index 100% rename from graphics/pokemon/footprints/kabutops_footprint.png rename to graphics/pokemon/kabutops/footprint.png diff --git a/graphics/pokemon/front_pics/kabutops_still_front_pic.png b/graphics/pokemon/kabutops/front.png similarity index 100% rename from graphics/pokemon/front_pics/kabutops_still_front_pic.png rename to graphics/pokemon/kabutops/front.png diff --git a/graphics/pokemon/icons/kabutops_icon.png b/graphics/pokemon/kabutops/icon.png similarity index 100% rename from graphics/pokemon/icons/kabutops_icon.png rename to graphics/pokemon/kabutops/icon.png diff --git a/graphics/pokemon/palettes/kabutops_palette.pal b/graphics/pokemon/kabutops/normal.pal similarity index 100% rename from graphics/pokemon/palettes/kabutops_palette.pal rename to graphics/pokemon/kabutops/normal.pal diff --git a/graphics/pokemon/palettes/kabutops_shiny_palette.pal b/graphics/pokemon/kabutops/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/kabutops_shiny_palette.pal rename to graphics/pokemon/kabutops/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/kadabra_front_pic.png b/graphics/pokemon/kadabra/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/kadabra_front_pic.png rename to graphics/pokemon/kadabra/anim_front.png diff --git a/graphics/pokemon/back_pics/kadabra_back_pic.png b/graphics/pokemon/kadabra/back.png similarity index 100% rename from graphics/pokemon/back_pics/kadabra_back_pic.png rename to graphics/pokemon/kadabra/back.png diff --git a/graphics/pokemon/footprints/kadabra_footprint.png b/graphics/pokemon/kadabra/footprint.png similarity index 100% rename from graphics/pokemon/footprints/kadabra_footprint.png rename to graphics/pokemon/kadabra/footprint.png diff --git a/graphics/pokemon/front_pics/kadabra_still_front_pic.png b/graphics/pokemon/kadabra/front.png similarity index 100% rename from graphics/pokemon/front_pics/kadabra_still_front_pic.png rename to graphics/pokemon/kadabra/front.png diff --git a/graphics/pokemon/icons/kadabra_icon.png b/graphics/pokemon/kadabra/icon.png similarity index 100% rename from graphics/pokemon/icons/kadabra_icon.png rename to graphics/pokemon/kadabra/icon.png diff --git a/graphics/pokemon/palettes/kadabra_palette.pal b/graphics/pokemon/kadabra/normal.pal similarity index 100% rename from graphics/pokemon/palettes/kadabra_palette.pal rename to graphics/pokemon/kadabra/normal.pal diff --git a/graphics/pokemon/palettes/kadabra_shiny_palette.pal b/graphics/pokemon/kadabra/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/kadabra_shiny_palette.pal rename to graphics/pokemon/kadabra/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/kakuna_front_pic.png b/graphics/pokemon/kakuna/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/kakuna_front_pic.png rename to graphics/pokemon/kakuna/anim_front.png diff --git a/graphics/pokemon/back_pics/kakuna_back_pic.png b/graphics/pokemon/kakuna/back.png similarity index 100% rename from graphics/pokemon/back_pics/kakuna_back_pic.png rename to graphics/pokemon/kakuna/back.png diff --git a/graphics/pokemon/footprints/kakuna_footprint.png b/graphics/pokemon/kakuna/footprint.png similarity index 100% rename from graphics/pokemon/footprints/kakuna_footprint.png rename to graphics/pokemon/kakuna/footprint.png diff --git a/graphics/pokemon/front_pics/kakuna_still_front_pic.png b/graphics/pokemon/kakuna/front.png similarity index 100% rename from graphics/pokemon/front_pics/kakuna_still_front_pic.png rename to graphics/pokemon/kakuna/front.png diff --git a/graphics/pokemon/icons/kakuna_icon.png b/graphics/pokemon/kakuna/icon.png similarity index 100% rename from graphics/pokemon/icons/kakuna_icon.png rename to graphics/pokemon/kakuna/icon.png diff --git a/graphics/pokemon/palettes/kakuna_palette.pal b/graphics/pokemon/kakuna/normal.pal similarity index 100% rename from graphics/pokemon/palettes/kakuna_palette.pal rename to graphics/pokemon/kakuna/normal.pal diff --git a/graphics/pokemon/palettes/kakuna_shiny_palette.pal b/graphics/pokemon/kakuna/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/kakuna_shiny_palette.pal rename to graphics/pokemon/kakuna/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/kangaskhan_front_pic.png b/graphics/pokemon/kangaskhan/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/kangaskhan_front_pic.png rename to graphics/pokemon/kangaskhan/anim_front.png diff --git a/graphics/pokemon/back_pics/kangaskhan_back_pic.png b/graphics/pokemon/kangaskhan/back.png similarity index 100% rename from graphics/pokemon/back_pics/kangaskhan_back_pic.png rename to graphics/pokemon/kangaskhan/back.png diff --git a/graphics/pokemon/footprints/kangaskhan_footprint.png b/graphics/pokemon/kangaskhan/footprint.png similarity index 100% rename from graphics/pokemon/footprints/kangaskhan_footprint.png rename to graphics/pokemon/kangaskhan/footprint.png diff --git a/graphics/pokemon/front_pics/kangaskhan_still_front_pic.png b/graphics/pokemon/kangaskhan/front.png similarity index 100% rename from graphics/pokemon/front_pics/kangaskhan_still_front_pic.png rename to graphics/pokemon/kangaskhan/front.png diff --git a/graphics/pokemon/icons/kangaskhan_icon.png b/graphics/pokemon/kangaskhan/icon.png similarity index 100% rename from graphics/pokemon/icons/kangaskhan_icon.png rename to graphics/pokemon/kangaskhan/icon.png diff --git a/graphics/pokemon/palettes/kangaskhan_palette.pal b/graphics/pokemon/kangaskhan/normal.pal similarity index 100% rename from graphics/pokemon/palettes/kangaskhan_palette.pal rename to graphics/pokemon/kangaskhan/normal.pal diff --git a/graphics/pokemon/palettes/kangaskhan_shiny_palette.pal b/graphics/pokemon/kangaskhan/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/kangaskhan_shiny_palette.pal rename to graphics/pokemon/kangaskhan/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/kecleon_front_pic.png b/graphics/pokemon/kecleon/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/kecleon_front_pic.png rename to graphics/pokemon/kecleon/anim_front.png diff --git a/graphics/pokemon/back_pics/kecleon_back_pic.png b/graphics/pokemon/kecleon/back.png similarity index 100% rename from graphics/pokemon/back_pics/kecleon_back_pic.png rename to graphics/pokemon/kecleon/back.png diff --git a/graphics/pokemon/footprints/kecleon_footprint.png b/graphics/pokemon/kecleon/footprint.png similarity index 100% rename from graphics/pokemon/footprints/kecleon_footprint.png rename to graphics/pokemon/kecleon/footprint.png diff --git a/graphics/pokemon/front_pics/kecleon_still_front_pic.png b/graphics/pokemon/kecleon/front.png similarity index 100% rename from graphics/pokemon/front_pics/kecleon_still_front_pic.png rename to graphics/pokemon/kecleon/front.png diff --git a/graphics/pokemon/icons/kecleon_icon.png b/graphics/pokemon/kecleon/icon.png similarity index 100% rename from graphics/pokemon/icons/kecleon_icon.png rename to graphics/pokemon/kecleon/icon.png diff --git a/graphics/pokemon/palettes/kecleon_palette.pal b/graphics/pokemon/kecleon/normal.pal similarity index 100% rename from graphics/pokemon/palettes/kecleon_palette.pal rename to graphics/pokemon/kecleon/normal.pal diff --git a/graphics/pokemon/palettes/kecleon_shiny_palette.pal b/graphics/pokemon/kecleon/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/kecleon_shiny_palette.pal rename to graphics/pokemon/kecleon/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/kingdra_front_pic.png b/graphics/pokemon/kingdra/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/kingdra_front_pic.png rename to graphics/pokemon/kingdra/anim_front.png diff --git a/graphics/pokemon/back_pics/kingdra_back_pic.png b/graphics/pokemon/kingdra/back.png similarity index 100% rename from graphics/pokemon/back_pics/kingdra_back_pic.png rename to graphics/pokemon/kingdra/back.png diff --git a/graphics/pokemon/footprints/kingdra_footprint.png b/graphics/pokemon/kingdra/footprint.png similarity index 100% rename from graphics/pokemon/footprints/kingdra_footprint.png rename to graphics/pokemon/kingdra/footprint.png diff --git a/graphics/pokemon/front_pics/kingdra_still_front_pic.png b/graphics/pokemon/kingdra/front.png similarity index 100% rename from graphics/pokemon/front_pics/kingdra_still_front_pic.png rename to graphics/pokemon/kingdra/front.png diff --git a/graphics/pokemon/icons/kingdra_icon.png b/graphics/pokemon/kingdra/icon.png similarity index 100% rename from graphics/pokemon/icons/kingdra_icon.png rename to graphics/pokemon/kingdra/icon.png diff --git a/graphics/pokemon/palettes/kingdra_palette.pal b/graphics/pokemon/kingdra/normal.pal similarity index 100% rename from graphics/pokemon/palettes/kingdra_palette.pal rename to graphics/pokemon/kingdra/normal.pal diff --git a/graphics/pokemon/palettes/kingdra_shiny_palette.pal b/graphics/pokemon/kingdra/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/kingdra_shiny_palette.pal rename to graphics/pokemon/kingdra/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/kingler_front_pic.png b/graphics/pokemon/kingler/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/kingler_front_pic.png rename to graphics/pokemon/kingler/anim_front.png diff --git a/graphics/pokemon/back_pics/kingler_back_pic.png b/graphics/pokemon/kingler/back.png similarity index 100% rename from graphics/pokemon/back_pics/kingler_back_pic.png rename to graphics/pokemon/kingler/back.png diff --git a/graphics/pokemon/footprints/kingler_footprint.png b/graphics/pokemon/kingler/footprint.png similarity index 100% rename from graphics/pokemon/footprints/kingler_footprint.png rename to graphics/pokemon/kingler/footprint.png diff --git a/graphics/pokemon/front_pics/kingler_still_front_pic.png b/graphics/pokemon/kingler/front.png similarity index 100% rename from graphics/pokemon/front_pics/kingler_still_front_pic.png rename to graphics/pokemon/kingler/front.png diff --git a/graphics/pokemon/icons/kingler_icon.png b/graphics/pokemon/kingler/icon.png similarity index 100% rename from graphics/pokemon/icons/kingler_icon.png rename to graphics/pokemon/kingler/icon.png diff --git a/graphics/pokemon/palettes/kingler_palette.pal b/graphics/pokemon/kingler/normal.pal similarity index 100% rename from graphics/pokemon/palettes/kingler_palette.pal rename to graphics/pokemon/kingler/normal.pal diff --git a/graphics/pokemon/palettes/kingler_shiny_palette.pal b/graphics/pokemon/kingler/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/kingler_shiny_palette.pal rename to graphics/pokemon/kingler/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/kirlia_front_pic.png b/graphics/pokemon/kirlia/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/kirlia_front_pic.png rename to graphics/pokemon/kirlia/anim_front.png diff --git a/graphics/pokemon/back_pics/kirlia_back_pic.png b/graphics/pokemon/kirlia/back.png similarity index 100% rename from graphics/pokemon/back_pics/kirlia_back_pic.png rename to graphics/pokemon/kirlia/back.png diff --git a/graphics/pokemon/footprints/kirlia_footprint.png b/graphics/pokemon/kirlia/footprint.png similarity index 100% rename from graphics/pokemon/footprints/kirlia_footprint.png rename to graphics/pokemon/kirlia/footprint.png diff --git a/graphics/pokemon/front_pics/kirlia_still_front_pic.png b/graphics/pokemon/kirlia/front.png similarity index 100% rename from graphics/pokemon/front_pics/kirlia_still_front_pic.png rename to graphics/pokemon/kirlia/front.png diff --git a/graphics/pokemon/icons/kirlia_icon.png b/graphics/pokemon/kirlia/icon.png similarity index 100% rename from graphics/pokemon/icons/kirlia_icon.png rename to graphics/pokemon/kirlia/icon.png diff --git a/graphics/pokemon/palettes/kirlia_palette.pal b/graphics/pokemon/kirlia/normal.pal similarity index 100% rename from graphics/pokemon/palettes/kirlia_palette.pal rename to graphics/pokemon/kirlia/normal.pal diff --git a/graphics/pokemon/palettes/kirlia_shiny_palette.pal b/graphics/pokemon/kirlia/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/kirlia_shiny_palette.pal rename to graphics/pokemon/kirlia/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/koffing_front_pic.png b/graphics/pokemon/koffing/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/koffing_front_pic.png rename to graphics/pokemon/koffing/anim_front.png diff --git a/graphics/pokemon/back_pics/koffing_back_pic.png b/graphics/pokemon/koffing/back.png similarity index 100% rename from graphics/pokemon/back_pics/koffing_back_pic.png rename to graphics/pokemon/koffing/back.png diff --git a/graphics/pokemon/footprints/koffing_footprint.png b/graphics/pokemon/koffing/footprint.png similarity index 100% rename from graphics/pokemon/footprints/koffing_footprint.png rename to graphics/pokemon/koffing/footprint.png diff --git a/graphics/pokemon/front_pics/koffing_still_front_pic.png b/graphics/pokemon/koffing/front.png similarity index 100% rename from graphics/pokemon/front_pics/koffing_still_front_pic.png rename to graphics/pokemon/koffing/front.png diff --git a/graphics/pokemon/icons/koffing_icon.png b/graphics/pokemon/koffing/icon.png similarity index 100% rename from graphics/pokemon/icons/koffing_icon.png rename to graphics/pokemon/koffing/icon.png diff --git a/graphics/pokemon/palettes/koffing_palette.pal b/graphics/pokemon/koffing/normal.pal similarity index 100% rename from graphics/pokemon/palettes/koffing_palette.pal rename to graphics/pokemon/koffing/normal.pal diff --git a/graphics/pokemon/palettes/koffing_shiny_palette.pal b/graphics/pokemon/koffing/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/koffing_shiny_palette.pal rename to graphics/pokemon/koffing/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/krabby_front_pic.png b/graphics/pokemon/krabby/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/krabby_front_pic.png rename to graphics/pokemon/krabby/anim_front.png diff --git a/graphics/pokemon/back_pics/krabby_back_pic.png b/graphics/pokemon/krabby/back.png similarity index 100% rename from graphics/pokemon/back_pics/krabby_back_pic.png rename to graphics/pokemon/krabby/back.png diff --git a/graphics/pokemon/footprints/krabby_footprint.png b/graphics/pokemon/krabby/footprint.png similarity index 100% rename from graphics/pokemon/footprints/krabby_footprint.png rename to graphics/pokemon/krabby/footprint.png diff --git a/graphics/pokemon/front_pics/krabby_still_front_pic.png b/graphics/pokemon/krabby/front.png similarity index 100% rename from graphics/pokemon/front_pics/krabby_still_front_pic.png rename to graphics/pokemon/krabby/front.png diff --git a/graphics/pokemon/icons/krabby_icon.png b/graphics/pokemon/krabby/icon.png similarity index 100% rename from graphics/pokemon/icons/krabby_icon.png rename to graphics/pokemon/krabby/icon.png diff --git a/graphics/pokemon/palettes/krabby_palette.pal b/graphics/pokemon/krabby/normal.pal similarity index 100% rename from graphics/pokemon/palettes/krabby_palette.pal rename to graphics/pokemon/krabby/normal.pal diff --git a/graphics/pokemon/palettes/krabby_shiny_palette.pal b/graphics/pokemon/krabby/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/krabby_shiny_palette.pal rename to graphics/pokemon/krabby/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/kyogre_front_pic.png b/graphics/pokemon/kyogre/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/kyogre_front_pic.png rename to graphics/pokemon/kyogre/anim_front.png diff --git a/graphics/pokemon/back_pics/kyogre_back_pic.png b/graphics/pokemon/kyogre/back.png similarity index 100% rename from graphics/pokemon/back_pics/kyogre_back_pic.png rename to graphics/pokemon/kyogre/back.png diff --git a/graphics/pokemon/footprints/kyogre_footprint.png b/graphics/pokemon/kyogre/footprint.png similarity index 100% rename from graphics/pokemon/footprints/kyogre_footprint.png rename to graphics/pokemon/kyogre/footprint.png diff --git a/graphics/pokemon/front_pics/kyogre_still_front_pic.png b/graphics/pokemon/kyogre/front.png similarity index 100% rename from graphics/pokemon/front_pics/kyogre_still_front_pic.png rename to graphics/pokemon/kyogre/front.png diff --git a/graphics/pokemon/icons/kyogre_icon.png b/graphics/pokemon/kyogre/icon.png similarity index 100% rename from graphics/pokemon/icons/kyogre_icon.png rename to graphics/pokemon/kyogre/icon.png diff --git a/graphics/pokemon/palettes/kyogre_palette.pal b/graphics/pokemon/kyogre/normal.pal similarity index 100% rename from graphics/pokemon/palettes/kyogre_palette.pal rename to graphics/pokemon/kyogre/normal.pal diff --git a/graphics/pokemon/palettes/kyogre_shiny_palette.pal b/graphics/pokemon/kyogre/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/kyogre_shiny_palette.pal rename to graphics/pokemon/kyogre/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/lairon_front_pic.png b/graphics/pokemon/lairon/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/lairon_front_pic.png rename to graphics/pokemon/lairon/anim_front.png diff --git a/graphics/pokemon/back_pics/lairon_back_pic.png b/graphics/pokemon/lairon/back.png similarity index 100% rename from graphics/pokemon/back_pics/lairon_back_pic.png rename to graphics/pokemon/lairon/back.png diff --git a/graphics/pokemon/footprints/lairon_footprint.png b/graphics/pokemon/lairon/footprint.png similarity index 100% rename from graphics/pokemon/footprints/lairon_footprint.png rename to graphics/pokemon/lairon/footprint.png diff --git a/graphics/pokemon/front_pics/lairon_still_front_pic.png b/graphics/pokemon/lairon/front.png similarity index 100% rename from graphics/pokemon/front_pics/lairon_still_front_pic.png rename to graphics/pokemon/lairon/front.png diff --git a/graphics/pokemon/icons/lairon_icon.png b/graphics/pokemon/lairon/icon.png similarity index 100% rename from graphics/pokemon/icons/lairon_icon.png rename to graphics/pokemon/lairon/icon.png diff --git a/graphics/pokemon/palettes/lairon_palette.pal b/graphics/pokemon/lairon/normal.pal similarity index 100% rename from graphics/pokemon/palettes/lairon_palette.pal rename to graphics/pokemon/lairon/normal.pal diff --git a/graphics/pokemon/palettes/lairon_shiny_palette.pal b/graphics/pokemon/lairon/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/lairon_shiny_palette.pal rename to graphics/pokemon/lairon/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/lanturn_front_pic.png b/graphics/pokemon/lanturn/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/lanturn_front_pic.png rename to graphics/pokemon/lanturn/anim_front.png diff --git a/graphics/pokemon/back_pics/lanturn_back_pic.png b/graphics/pokemon/lanturn/back.png similarity index 100% rename from graphics/pokemon/back_pics/lanturn_back_pic.png rename to graphics/pokemon/lanturn/back.png diff --git a/graphics/pokemon/footprints/lanturn_footprint.png b/graphics/pokemon/lanturn/footprint.png similarity index 100% rename from graphics/pokemon/footprints/lanturn_footprint.png rename to graphics/pokemon/lanturn/footprint.png diff --git a/graphics/pokemon/front_pics/lanturn_still_front_pic.png b/graphics/pokemon/lanturn/front.png similarity index 100% rename from graphics/pokemon/front_pics/lanturn_still_front_pic.png rename to graphics/pokemon/lanturn/front.png diff --git a/graphics/pokemon/icons/lanturn_icon.png b/graphics/pokemon/lanturn/icon.png similarity index 100% rename from graphics/pokemon/icons/lanturn_icon.png rename to graphics/pokemon/lanturn/icon.png diff --git a/graphics/pokemon/palettes/lanturn_palette.pal b/graphics/pokemon/lanturn/normal.pal similarity index 100% rename from graphics/pokemon/palettes/lanturn_palette.pal rename to graphics/pokemon/lanturn/normal.pal diff --git a/graphics/pokemon/palettes/lanturn_shiny_palette.pal b/graphics/pokemon/lanturn/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/lanturn_shiny_palette.pal rename to graphics/pokemon/lanturn/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/lapras_front_pic.png b/graphics/pokemon/lapras/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/lapras_front_pic.png rename to graphics/pokemon/lapras/anim_front.png diff --git a/graphics/pokemon/back_pics/lapras_back_pic.png b/graphics/pokemon/lapras/back.png similarity index 100% rename from graphics/pokemon/back_pics/lapras_back_pic.png rename to graphics/pokemon/lapras/back.png diff --git a/graphics/pokemon/footprints/lapras_footprint.png b/graphics/pokemon/lapras/footprint.png similarity index 100% rename from graphics/pokemon/footprints/lapras_footprint.png rename to graphics/pokemon/lapras/footprint.png diff --git a/graphics/pokemon/front_pics/lapras_still_front_pic.png b/graphics/pokemon/lapras/front.png similarity index 100% rename from graphics/pokemon/front_pics/lapras_still_front_pic.png rename to graphics/pokemon/lapras/front.png diff --git a/graphics/pokemon/icons/lapras_icon.png b/graphics/pokemon/lapras/icon.png similarity index 100% rename from graphics/pokemon/icons/lapras_icon.png rename to graphics/pokemon/lapras/icon.png diff --git a/graphics/pokemon/palettes/lapras_palette.pal b/graphics/pokemon/lapras/normal.pal similarity index 100% rename from graphics/pokemon/palettes/lapras_palette.pal rename to graphics/pokemon/lapras/normal.pal diff --git a/graphics/pokemon/palettes/lapras_shiny_palette.pal b/graphics/pokemon/lapras/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/lapras_shiny_palette.pal rename to graphics/pokemon/lapras/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/larvitar_front_pic.png b/graphics/pokemon/larvitar/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/larvitar_front_pic.png rename to graphics/pokemon/larvitar/anim_front.png diff --git a/graphics/pokemon/back_pics/larvitar_back_pic.png b/graphics/pokemon/larvitar/back.png similarity index 100% rename from graphics/pokemon/back_pics/larvitar_back_pic.png rename to graphics/pokemon/larvitar/back.png diff --git a/graphics/pokemon/footprints/larvitar_footprint.png b/graphics/pokemon/larvitar/footprint.png similarity index 100% rename from graphics/pokemon/footprints/larvitar_footprint.png rename to graphics/pokemon/larvitar/footprint.png diff --git a/graphics/pokemon/front_pics/larvitar_still_front_pic.png b/graphics/pokemon/larvitar/front.png similarity index 100% rename from graphics/pokemon/front_pics/larvitar_still_front_pic.png rename to graphics/pokemon/larvitar/front.png diff --git a/graphics/pokemon/icons/larvitar_icon.png b/graphics/pokemon/larvitar/icon.png similarity index 100% rename from graphics/pokemon/icons/larvitar_icon.png rename to graphics/pokemon/larvitar/icon.png diff --git a/graphics/pokemon/palettes/larvitar_palette.pal b/graphics/pokemon/larvitar/normal.pal similarity index 100% rename from graphics/pokemon/palettes/larvitar_palette.pal rename to graphics/pokemon/larvitar/normal.pal diff --git a/graphics/pokemon/palettes/larvitar_shiny_palette.pal b/graphics/pokemon/larvitar/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/larvitar_shiny_palette.pal rename to graphics/pokemon/larvitar/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/latias_front_pic.png b/graphics/pokemon/latias/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/latias_front_pic.png rename to graphics/pokemon/latias/anim_front.png diff --git a/graphics/pokemon/back_pics/latias_back_pic.png b/graphics/pokemon/latias/back.png similarity index 100% rename from graphics/pokemon/back_pics/latias_back_pic.png rename to graphics/pokemon/latias/back.png diff --git a/graphics/pokemon/footprints/latias_footprint.png b/graphics/pokemon/latias/footprint.png similarity index 100% rename from graphics/pokemon/footprints/latias_footprint.png rename to graphics/pokemon/latias/footprint.png diff --git a/graphics/pokemon/front_pics/latias_still_front_pic.png b/graphics/pokemon/latias/front.png similarity index 100% rename from graphics/pokemon/front_pics/latias_still_front_pic.png rename to graphics/pokemon/latias/front.png diff --git a/graphics/pokemon/icons/latias_icon.png b/graphics/pokemon/latias/icon.png similarity index 100% rename from graphics/pokemon/icons/latias_icon.png rename to graphics/pokemon/latias/icon.png diff --git a/graphics/pokemon/palettes/latias_palette.pal b/graphics/pokemon/latias/normal.pal similarity index 100% rename from graphics/pokemon/palettes/latias_palette.pal rename to graphics/pokemon/latias/normal.pal diff --git a/graphics/pokemon/palettes/latias_shiny_palette.pal b/graphics/pokemon/latias/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/latias_shiny_palette.pal rename to graphics/pokemon/latias/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/latios_front_pic.png b/graphics/pokemon/latios/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/latios_front_pic.png rename to graphics/pokemon/latios/anim_front.png diff --git a/graphics/pokemon/back_pics/latios_back_pic.png b/graphics/pokemon/latios/back.png similarity index 100% rename from graphics/pokemon/back_pics/latios_back_pic.png rename to graphics/pokemon/latios/back.png diff --git a/graphics/pokemon/footprints/latios_footprint.png b/graphics/pokemon/latios/footprint.png similarity index 100% rename from graphics/pokemon/footprints/latios_footprint.png rename to graphics/pokemon/latios/footprint.png diff --git a/graphics/pokemon/front_pics/latios_still_front_pic.png b/graphics/pokemon/latios/front.png similarity index 100% rename from graphics/pokemon/front_pics/latios_still_front_pic.png rename to graphics/pokemon/latios/front.png diff --git a/graphics/pokemon/icons/latios_icon.png b/graphics/pokemon/latios/icon.png similarity index 100% rename from graphics/pokemon/icons/latios_icon.png rename to graphics/pokemon/latios/icon.png diff --git a/graphics/pokemon/palettes/latios_palette.pal b/graphics/pokemon/latios/normal.pal similarity index 100% rename from graphics/pokemon/palettes/latios_palette.pal rename to graphics/pokemon/latios/normal.pal diff --git a/graphics/pokemon/palettes/latios_shiny_palette.pal b/graphics/pokemon/latios/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/latios_shiny_palette.pal rename to graphics/pokemon/latios/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/ledian_front_pic.png b/graphics/pokemon/ledian/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/ledian_front_pic.png rename to graphics/pokemon/ledian/anim_front.png diff --git a/graphics/pokemon/back_pics/ledian_back_pic.png b/graphics/pokemon/ledian/back.png similarity index 100% rename from graphics/pokemon/back_pics/ledian_back_pic.png rename to graphics/pokemon/ledian/back.png diff --git a/graphics/pokemon/footprints/ledian_footprint.png b/graphics/pokemon/ledian/footprint.png similarity index 100% rename from graphics/pokemon/footprints/ledian_footprint.png rename to graphics/pokemon/ledian/footprint.png diff --git a/graphics/pokemon/front_pics/ledian_still_front_pic.png b/graphics/pokemon/ledian/front.png similarity index 100% rename from graphics/pokemon/front_pics/ledian_still_front_pic.png rename to graphics/pokemon/ledian/front.png diff --git a/graphics/pokemon/icons/ledian_icon.png b/graphics/pokemon/ledian/icon.png similarity index 100% rename from graphics/pokemon/icons/ledian_icon.png rename to graphics/pokemon/ledian/icon.png diff --git a/graphics/pokemon/palettes/ledian_palette.pal b/graphics/pokemon/ledian/normal.pal similarity index 100% rename from graphics/pokemon/palettes/ledian_palette.pal rename to graphics/pokemon/ledian/normal.pal diff --git a/graphics/pokemon/palettes/ledian_shiny_palette.pal b/graphics/pokemon/ledian/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/ledian_shiny_palette.pal rename to graphics/pokemon/ledian/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/ledyba_front_pic.png b/graphics/pokemon/ledyba/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/ledyba_front_pic.png rename to graphics/pokemon/ledyba/anim_front.png diff --git a/graphics/pokemon/back_pics/ledyba_back_pic.png b/graphics/pokemon/ledyba/back.png similarity index 100% rename from graphics/pokemon/back_pics/ledyba_back_pic.png rename to graphics/pokemon/ledyba/back.png diff --git a/graphics/pokemon/footprints/ledyba_footprint.png b/graphics/pokemon/ledyba/footprint.png similarity index 100% rename from graphics/pokemon/footprints/ledyba_footprint.png rename to graphics/pokemon/ledyba/footprint.png diff --git a/graphics/pokemon/front_pics/ledyba_still_front_pic.png b/graphics/pokemon/ledyba/front.png similarity index 100% rename from graphics/pokemon/front_pics/ledyba_still_front_pic.png rename to graphics/pokemon/ledyba/front.png diff --git a/graphics/pokemon/icons/ledyba_icon.png b/graphics/pokemon/ledyba/icon.png similarity index 100% rename from graphics/pokemon/icons/ledyba_icon.png rename to graphics/pokemon/ledyba/icon.png diff --git a/graphics/pokemon/palettes/ledyba_palette.pal b/graphics/pokemon/ledyba/normal.pal similarity index 100% rename from graphics/pokemon/palettes/ledyba_palette.pal rename to graphics/pokemon/ledyba/normal.pal diff --git a/graphics/pokemon/palettes/ledyba_shiny_palette.pal b/graphics/pokemon/ledyba/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/ledyba_shiny_palette.pal rename to graphics/pokemon/ledyba/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/lickitung_front_pic.png b/graphics/pokemon/lickitung/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/lickitung_front_pic.png rename to graphics/pokemon/lickitung/anim_front.png diff --git a/graphics/pokemon/back_pics/lickitung_back_pic.png b/graphics/pokemon/lickitung/back.png similarity index 100% rename from graphics/pokemon/back_pics/lickitung_back_pic.png rename to graphics/pokemon/lickitung/back.png diff --git a/graphics/pokemon/footprints/lickitung_footprint.png b/graphics/pokemon/lickitung/footprint.png similarity index 100% rename from graphics/pokemon/footprints/lickitung_footprint.png rename to graphics/pokemon/lickitung/footprint.png diff --git a/graphics/pokemon/front_pics/lickitung_still_front_pic.png b/graphics/pokemon/lickitung/front.png similarity index 100% rename from graphics/pokemon/front_pics/lickitung_still_front_pic.png rename to graphics/pokemon/lickitung/front.png diff --git a/graphics/pokemon/icons/lickitung_icon.png b/graphics/pokemon/lickitung/icon.png similarity index 100% rename from graphics/pokemon/icons/lickitung_icon.png rename to graphics/pokemon/lickitung/icon.png diff --git a/graphics/pokemon/palettes/lickitung_palette.pal b/graphics/pokemon/lickitung/normal.pal similarity index 100% rename from graphics/pokemon/palettes/lickitung_palette.pal rename to graphics/pokemon/lickitung/normal.pal diff --git a/graphics/pokemon/palettes/lickitung_shiny_palette.pal b/graphics/pokemon/lickitung/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/lickitung_shiny_palette.pal rename to graphics/pokemon/lickitung/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/lileep_front_pic.png b/graphics/pokemon/lileep/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/lileep_front_pic.png rename to graphics/pokemon/lileep/anim_front.png diff --git a/graphics/pokemon/back_pics/lileep_back_pic.png b/graphics/pokemon/lileep/back.png similarity index 100% rename from graphics/pokemon/back_pics/lileep_back_pic.png rename to graphics/pokemon/lileep/back.png diff --git a/graphics/pokemon/footprints/lileep_footprint.png b/graphics/pokemon/lileep/footprint.png similarity index 100% rename from graphics/pokemon/footprints/lileep_footprint.png rename to graphics/pokemon/lileep/footprint.png diff --git a/graphics/pokemon/front_pics/lileep_still_front_pic.png b/graphics/pokemon/lileep/front.png similarity index 100% rename from graphics/pokemon/front_pics/lileep_still_front_pic.png rename to graphics/pokemon/lileep/front.png diff --git a/graphics/pokemon/icons/lileep_icon.png b/graphics/pokemon/lileep/icon.png similarity index 100% rename from graphics/pokemon/icons/lileep_icon.png rename to graphics/pokemon/lileep/icon.png diff --git a/graphics/pokemon/palettes/lileep_palette.pal b/graphics/pokemon/lileep/normal.pal similarity index 100% rename from graphics/pokemon/palettes/lileep_palette.pal rename to graphics/pokemon/lileep/normal.pal diff --git a/graphics/pokemon/palettes/lileep_shiny_palette.pal b/graphics/pokemon/lileep/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/lileep_shiny_palette.pal rename to graphics/pokemon/lileep/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/linoone_front_pic.png b/graphics/pokemon/linoone/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/linoone_front_pic.png rename to graphics/pokemon/linoone/anim_front.png diff --git a/graphics/pokemon/back_pics/linoone_back_pic.png b/graphics/pokemon/linoone/back.png similarity index 100% rename from graphics/pokemon/back_pics/linoone_back_pic.png rename to graphics/pokemon/linoone/back.png diff --git a/graphics/pokemon/footprints/linoone_footprint.png b/graphics/pokemon/linoone/footprint.png similarity index 100% rename from graphics/pokemon/footprints/linoone_footprint.png rename to graphics/pokemon/linoone/footprint.png diff --git a/graphics/pokemon/front_pics/linoone_still_front_pic.png b/graphics/pokemon/linoone/front.png similarity index 100% rename from graphics/pokemon/front_pics/linoone_still_front_pic.png rename to graphics/pokemon/linoone/front.png diff --git a/graphics/pokemon/icons/linoone_icon.png b/graphics/pokemon/linoone/icon.png similarity index 100% rename from graphics/pokemon/icons/linoone_icon.png rename to graphics/pokemon/linoone/icon.png diff --git a/graphics/pokemon/palettes/linoone_palette.pal b/graphics/pokemon/linoone/normal.pal similarity index 100% rename from graphics/pokemon/palettes/linoone_palette.pal rename to graphics/pokemon/linoone/normal.pal diff --git a/graphics/pokemon/palettes/linoone_shiny_palette.pal b/graphics/pokemon/linoone/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/linoone_shiny_palette.pal rename to graphics/pokemon/linoone/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/lombre_front_pic.png b/graphics/pokemon/lombre/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/lombre_front_pic.png rename to graphics/pokemon/lombre/anim_front.png diff --git a/graphics/pokemon/back_pics/lombre_back_pic.png b/graphics/pokemon/lombre/back.png similarity index 100% rename from graphics/pokemon/back_pics/lombre_back_pic.png rename to graphics/pokemon/lombre/back.png diff --git a/graphics/pokemon/footprints/lombre_footprint.png b/graphics/pokemon/lombre/footprint.png similarity index 100% rename from graphics/pokemon/footprints/lombre_footprint.png rename to graphics/pokemon/lombre/footprint.png diff --git a/graphics/pokemon/front_pics/lombre_still_front_pic.png b/graphics/pokemon/lombre/front.png similarity index 100% rename from graphics/pokemon/front_pics/lombre_still_front_pic.png rename to graphics/pokemon/lombre/front.png diff --git a/graphics/pokemon/icons/lombre_icon.png b/graphics/pokemon/lombre/icon.png similarity index 100% rename from graphics/pokemon/icons/lombre_icon.png rename to graphics/pokemon/lombre/icon.png diff --git a/graphics/pokemon/palettes/lombre_palette.pal b/graphics/pokemon/lombre/normal.pal similarity index 100% rename from graphics/pokemon/palettes/lombre_palette.pal rename to graphics/pokemon/lombre/normal.pal diff --git a/graphics/pokemon/palettes/lombre_shiny_palette.pal b/graphics/pokemon/lombre/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/lombre_shiny_palette.pal rename to graphics/pokemon/lombre/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/lotad_front_pic.png b/graphics/pokemon/lotad/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/lotad_front_pic.png rename to graphics/pokemon/lotad/anim_front.png diff --git a/graphics/pokemon/back_pics/lotad_back_pic.png b/graphics/pokemon/lotad/back.png similarity index 100% rename from graphics/pokemon/back_pics/lotad_back_pic.png rename to graphics/pokemon/lotad/back.png diff --git a/graphics/pokemon/footprints/lotad_footprint.png b/graphics/pokemon/lotad/footprint.png similarity index 100% rename from graphics/pokemon/footprints/lotad_footprint.png rename to graphics/pokemon/lotad/footprint.png diff --git a/graphics/pokemon/front_pics/lotad_still_front_pic.png b/graphics/pokemon/lotad/front.png similarity index 100% rename from graphics/pokemon/front_pics/lotad_still_front_pic.png rename to graphics/pokemon/lotad/front.png diff --git a/graphics/pokemon/icons/lotad_icon.png b/graphics/pokemon/lotad/icon.png similarity index 100% rename from graphics/pokemon/icons/lotad_icon.png rename to graphics/pokemon/lotad/icon.png diff --git a/graphics/pokemon/palettes/lotad_palette.pal b/graphics/pokemon/lotad/normal.pal similarity index 100% rename from graphics/pokemon/palettes/lotad_palette.pal rename to graphics/pokemon/lotad/normal.pal diff --git a/graphics/pokemon/palettes/lotad_shiny_palette.pal b/graphics/pokemon/lotad/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/lotad_shiny_palette.pal rename to graphics/pokemon/lotad/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/loudred_front_pic.png b/graphics/pokemon/loudred/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/loudred_front_pic.png rename to graphics/pokemon/loudred/anim_front.png diff --git a/graphics/pokemon/back_pics/loudred_back_pic.png b/graphics/pokemon/loudred/back.png similarity index 100% rename from graphics/pokemon/back_pics/loudred_back_pic.png rename to graphics/pokemon/loudred/back.png diff --git a/graphics/pokemon/footprints/loudred_footprint.png b/graphics/pokemon/loudred/footprint.png similarity index 100% rename from graphics/pokemon/footprints/loudred_footprint.png rename to graphics/pokemon/loudred/footprint.png diff --git a/graphics/pokemon/front_pics/loudred_still_front_pic.png b/graphics/pokemon/loudred/front.png similarity index 100% rename from graphics/pokemon/front_pics/loudred_still_front_pic.png rename to graphics/pokemon/loudred/front.png diff --git a/graphics/pokemon/icons/loudred_icon.png b/graphics/pokemon/loudred/icon.png similarity index 100% rename from graphics/pokemon/icons/loudred_icon.png rename to graphics/pokemon/loudred/icon.png diff --git a/graphics/pokemon/palettes/loudred_palette.pal b/graphics/pokemon/loudred/normal.pal similarity index 100% rename from graphics/pokemon/palettes/loudred_palette.pal rename to graphics/pokemon/loudred/normal.pal diff --git a/graphics/pokemon/palettes/loudred_shiny_palette.pal b/graphics/pokemon/loudred/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/loudred_shiny_palette.pal rename to graphics/pokemon/loudred/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/ludicolo_front_pic.png b/graphics/pokemon/ludicolo/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/ludicolo_front_pic.png rename to graphics/pokemon/ludicolo/anim_front.png diff --git a/graphics/pokemon/back_pics/ludicolo_back_pic.png b/graphics/pokemon/ludicolo/back.png similarity index 100% rename from graphics/pokemon/back_pics/ludicolo_back_pic.png rename to graphics/pokemon/ludicolo/back.png diff --git a/graphics/pokemon/footprints/ludicolo_footprint.png b/graphics/pokemon/ludicolo/footprint.png similarity index 100% rename from graphics/pokemon/footprints/ludicolo_footprint.png rename to graphics/pokemon/ludicolo/footprint.png diff --git a/graphics/pokemon/front_pics/ludicolo_still_front_pic.png b/graphics/pokemon/ludicolo/front.png similarity index 100% rename from graphics/pokemon/front_pics/ludicolo_still_front_pic.png rename to graphics/pokemon/ludicolo/front.png diff --git a/graphics/pokemon/icons/ludicolo_icon.png b/graphics/pokemon/ludicolo/icon.png similarity index 100% rename from graphics/pokemon/icons/ludicolo_icon.png rename to graphics/pokemon/ludicolo/icon.png diff --git a/graphics/pokemon/palettes/ludicolo_palette.pal b/graphics/pokemon/ludicolo/normal.pal similarity index 100% rename from graphics/pokemon/palettes/ludicolo_palette.pal rename to graphics/pokemon/ludicolo/normal.pal diff --git a/graphics/pokemon/palettes/ludicolo_shiny_palette.pal b/graphics/pokemon/ludicolo/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/ludicolo_shiny_palette.pal rename to graphics/pokemon/ludicolo/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/lugia_front_pic.png b/graphics/pokemon/lugia/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/lugia_front_pic.png rename to graphics/pokemon/lugia/anim_front.png diff --git a/graphics/pokemon/back_pics/lugia_back_pic.png b/graphics/pokemon/lugia/back.png similarity index 100% rename from graphics/pokemon/back_pics/lugia_back_pic.png rename to graphics/pokemon/lugia/back.png diff --git a/graphics/pokemon/footprints/lugia_footprint.png b/graphics/pokemon/lugia/footprint.png similarity index 100% rename from graphics/pokemon/footprints/lugia_footprint.png rename to graphics/pokemon/lugia/footprint.png diff --git a/graphics/pokemon/front_pics/lugia_still_front_pic.png b/graphics/pokemon/lugia/front.png similarity index 100% rename from graphics/pokemon/front_pics/lugia_still_front_pic.png rename to graphics/pokemon/lugia/front.png diff --git a/graphics/pokemon/icons/lugia_icon.png b/graphics/pokemon/lugia/icon.png similarity index 100% rename from graphics/pokemon/icons/lugia_icon.png rename to graphics/pokemon/lugia/icon.png diff --git a/graphics/pokemon/palettes/lugia_palette.pal b/graphics/pokemon/lugia/normal.pal similarity index 100% rename from graphics/pokemon/palettes/lugia_palette.pal rename to graphics/pokemon/lugia/normal.pal diff --git a/graphics/pokemon/palettes/lugia_shiny_palette.pal b/graphics/pokemon/lugia/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/lugia_shiny_palette.pal rename to graphics/pokemon/lugia/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/lunatone_front_pic.png b/graphics/pokemon/lunatone/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/lunatone_front_pic.png rename to graphics/pokemon/lunatone/anim_front.png diff --git a/graphics/pokemon/back_pics/lunatone_back_pic.png b/graphics/pokemon/lunatone/back.png similarity index 100% rename from graphics/pokemon/back_pics/lunatone_back_pic.png rename to graphics/pokemon/lunatone/back.png diff --git a/graphics/pokemon/footprints/lunatone_footprint.png b/graphics/pokemon/lunatone/footprint.png similarity index 100% rename from graphics/pokemon/footprints/lunatone_footprint.png rename to graphics/pokemon/lunatone/footprint.png diff --git a/graphics/pokemon/front_pics/lunatone_still_front_pic.png b/graphics/pokemon/lunatone/front.png similarity index 100% rename from graphics/pokemon/front_pics/lunatone_still_front_pic.png rename to graphics/pokemon/lunatone/front.png diff --git a/graphics/pokemon/icons/lunatone_icon.png b/graphics/pokemon/lunatone/icon.png similarity index 100% rename from graphics/pokemon/icons/lunatone_icon.png rename to graphics/pokemon/lunatone/icon.png diff --git a/graphics/pokemon/palettes/lunatone_palette.pal b/graphics/pokemon/lunatone/normal.pal similarity index 100% rename from graphics/pokemon/palettes/lunatone_palette.pal rename to graphics/pokemon/lunatone/normal.pal diff --git a/graphics/pokemon/palettes/lunatone_shiny_palette.pal b/graphics/pokemon/lunatone/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/lunatone_shiny_palette.pal rename to graphics/pokemon/lunatone/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/luvdisc_front_pic.png b/graphics/pokemon/luvdisc/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/luvdisc_front_pic.png rename to graphics/pokemon/luvdisc/anim_front.png diff --git a/graphics/pokemon/back_pics/luvdisc_back_pic.png b/graphics/pokemon/luvdisc/back.png similarity index 100% rename from graphics/pokemon/back_pics/luvdisc_back_pic.png rename to graphics/pokemon/luvdisc/back.png diff --git a/graphics/pokemon/footprints/luvdisc_footprint.png b/graphics/pokemon/luvdisc/footprint.png similarity index 100% rename from graphics/pokemon/footprints/luvdisc_footprint.png rename to graphics/pokemon/luvdisc/footprint.png diff --git a/graphics/pokemon/front_pics/luvdisc_still_front_pic.png b/graphics/pokemon/luvdisc/front.png similarity index 100% rename from graphics/pokemon/front_pics/luvdisc_still_front_pic.png rename to graphics/pokemon/luvdisc/front.png diff --git a/graphics/pokemon/icons/luvdisc_icon.png b/graphics/pokemon/luvdisc/icon.png similarity index 100% rename from graphics/pokemon/icons/luvdisc_icon.png rename to graphics/pokemon/luvdisc/icon.png diff --git a/graphics/pokemon/palettes/luvdisc_palette.pal b/graphics/pokemon/luvdisc/normal.pal similarity index 100% rename from graphics/pokemon/palettes/luvdisc_palette.pal rename to graphics/pokemon/luvdisc/normal.pal diff --git a/graphics/pokemon/palettes/luvdisc_shiny_palette.pal b/graphics/pokemon/luvdisc/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/luvdisc_shiny_palette.pal rename to graphics/pokemon/luvdisc/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/machamp_front_pic.png b/graphics/pokemon/machamp/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/machamp_front_pic.png rename to graphics/pokemon/machamp/anim_front.png diff --git a/graphics/pokemon/back_pics/machamp_back_pic.png b/graphics/pokemon/machamp/back.png similarity index 100% rename from graphics/pokemon/back_pics/machamp_back_pic.png rename to graphics/pokemon/machamp/back.png diff --git a/graphics/pokemon/footprints/machamp_footprint.png b/graphics/pokemon/machamp/footprint.png similarity index 100% rename from graphics/pokemon/footprints/machamp_footprint.png rename to graphics/pokemon/machamp/footprint.png diff --git a/graphics/pokemon/front_pics/machamp_still_front_pic.png b/graphics/pokemon/machamp/front.png similarity index 100% rename from graphics/pokemon/front_pics/machamp_still_front_pic.png rename to graphics/pokemon/machamp/front.png diff --git a/graphics/pokemon/icons/machamp_icon.png b/graphics/pokemon/machamp/icon.png similarity index 100% rename from graphics/pokemon/icons/machamp_icon.png rename to graphics/pokemon/machamp/icon.png diff --git a/graphics/pokemon/palettes/machamp_palette.pal b/graphics/pokemon/machamp/normal.pal similarity index 100% rename from graphics/pokemon/palettes/machamp_palette.pal rename to graphics/pokemon/machamp/normal.pal diff --git a/graphics/pokemon/palettes/machamp_shiny_palette.pal b/graphics/pokemon/machamp/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/machamp_shiny_palette.pal rename to graphics/pokemon/machamp/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/machoke_front_pic.png b/graphics/pokemon/machoke/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/machoke_front_pic.png rename to graphics/pokemon/machoke/anim_front.png diff --git a/graphics/pokemon/back_pics/machoke_back_pic.png b/graphics/pokemon/machoke/back.png similarity index 100% rename from graphics/pokemon/back_pics/machoke_back_pic.png rename to graphics/pokemon/machoke/back.png diff --git a/graphics/pokemon/footprints/machoke_footprint.png b/graphics/pokemon/machoke/footprint.png similarity index 100% rename from graphics/pokemon/footprints/machoke_footprint.png rename to graphics/pokemon/machoke/footprint.png diff --git a/graphics/pokemon/front_pics/machoke_still_front_pic.png b/graphics/pokemon/machoke/front.png similarity index 100% rename from graphics/pokemon/front_pics/machoke_still_front_pic.png rename to graphics/pokemon/machoke/front.png diff --git a/graphics/pokemon/icons/machoke_icon.png b/graphics/pokemon/machoke/icon.png similarity index 100% rename from graphics/pokemon/icons/machoke_icon.png rename to graphics/pokemon/machoke/icon.png diff --git a/graphics/pokemon/palettes/machoke_palette.pal b/graphics/pokemon/machoke/normal.pal similarity index 100% rename from graphics/pokemon/palettes/machoke_palette.pal rename to graphics/pokemon/machoke/normal.pal diff --git a/graphics/pokemon/palettes/machoke_shiny_palette.pal b/graphics/pokemon/machoke/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/machoke_shiny_palette.pal rename to graphics/pokemon/machoke/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/machop_front_pic.png b/graphics/pokemon/machop/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/machop_front_pic.png rename to graphics/pokemon/machop/anim_front.png diff --git a/graphics/pokemon/back_pics/machop_back_pic.png b/graphics/pokemon/machop/back.png similarity index 100% rename from graphics/pokemon/back_pics/machop_back_pic.png rename to graphics/pokemon/machop/back.png diff --git a/graphics/pokemon/footprints/machop_footprint.png b/graphics/pokemon/machop/footprint.png similarity index 100% rename from graphics/pokemon/footprints/machop_footprint.png rename to graphics/pokemon/machop/footprint.png diff --git a/graphics/pokemon/front_pics/machop_still_front_pic.png b/graphics/pokemon/machop/front.png similarity index 100% rename from graphics/pokemon/front_pics/machop_still_front_pic.png rename to graphics/pokemon/machop/front.png diff --git a/graphics/pokemon/icons/machop_icon.png b/graphics/pokemon/machop/icon.png similarity index 100% rename from graphics/pokemon/icons/machop_icon.png rename to graphics/pokemon/machop/icon.png diff --git a/graphics/pokemon/palettes/machop_palette.pal b/graphics/pokemon/machop/normal.pal similarity index 100% rename from graphics/pokemon/palettes/machop_palette.pal rename to graphics/pokemon/machop/normal.pal diff --git a/graphics/pokemon/palettes/machop_shiny_palette.pal b/graphics/pokemon/machop/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/machop_shiny_palette.pal rename to graphics/pokemon/machop/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/magby_front_pic.png b/graphics/pokemon/magby/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/magby_front_pic.png rename to graphics/pokemon/magby/anim_front.png diff --git a/graphics/pokemon/back_pics/magby_back_pic.png b/graphics/pokemon/magby/back.png similarity index 100% rename from graphics/pokemon/back_pics/magby_back_pic.png rename to graphics/pokemon/magby/back.png diff --git a/graphics/pokemon/footprints/magby_footprint.png b/graphics/pokemon/magby/footprint.png similarity index 100% rename from graphics/pokemon/footprints/magby_footprint.png rename to graphics/pokemon/magby/footprint.png diff --git a/graphics/pokemon/front_pics/magby_still_front_pic.png b/graphics/pokemon/magby/front.png similarity index 100% rename from graphics/pokemon/front_pics/magby_still_front_pic.png rename to graphics/pokemon/magby/front.png diff --git a/graphics/pokemon/icons/magby_icon.png b/graphics/pokemon/magby/icon.png similarity index 100% rename from graphics/pokemon/icons/magby_icon.png rename to graphics/pokemon/magby/icon.png diff --git a/graphics/pokemon/palettes/magby_palette.pal b/graphics/pokemon/magby/normal.pal similarity index 100% rename from graphics/pokemon/palettes/magby_palette.pal rename to graphics/pokemon/magby/normal.pal diff --git a/graphics/pokemon/palettes/magby_shiny_palette.pal b/graphics/pokemon/magby/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/magby_shiny_palette.pal rename to graphics/pokemon/magby/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/magcargo_front_pic.png b/graphics/pokemon/magcargo/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/magcargo_front_pic.png rename to graphics/pokemon/magcargo/anim_front.png diff --git a/graphics/pokemon/back_pics/magcargo_back_pic.png b/graphics/pokemon/magcargo/back.png similarity index 100% rename from graphics/pokemon/back_pics/magcargo_back_pic.png rename to graphics/pokemon/magcargo/back.png diff --git a/graphics/pokemon/footprints/magcargo_footprint.png b/graphics/pokemon/magcargo/footprint.png similarity index 100% rename from graphics/pokemon/footprints/magcargo_footprint.png rename to graphics/pokemon/magcargo/footprint.png diff --git a/graphics/pokemon/front_pics/magcargo_still_front_pic.png b/graphics/pokemon/magcargo/front.png similarity index 100% rename from graphics/pokemon/front_pics/magcargo_still_front_pic.png rename to graphics/pokemon/magcargo/front.png diff --git a/graphics/pokemon/icons/magcargo_icon.png b/graphics/pokemon/magcargo/icon.png similarity index 100% rename from graphics/pokemon/icons/magcargo_icon.png rename to graphics/pokemon/magcargo/icon.png diff --git a/graphics/pokemon/palettes/magcargo_palette.pal b/graphics/pokemon/magcargo/normal.pal similarity index 100% rename from graphics/pokemon/palettes/magcargo_palette.pal rename to graphics/pokemon/magcargo/normal.pal diff --git a/graphics/pokemon/palettes/magcargo_shiny_palette.pal b/graphics/pokemon/magcargo/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/magcargo_shiny_palette.pal rename to graphics/pokemon/magcargo/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/magikarp_front_pic.png b/graphics/pokemon/magikarp/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/magikarp_front_pic.png rename to graphics/pokemon/magikarp/anim_front.png diff --git a/graphics/pokemon/back_pics/magikarp_back_pic.png b/graphics/pokemon/magikarp/back.png similarity index 100% rename from graphics/pokemon/back_pics/magikarp_back_pic.png rename to graphics/pokemon/magikarp/back.png diff --git a/graphics/pokemon/footprints/magikarp_footprint.png b/graphics/pokemon/magikarp/footprint.png similarity index 100% rename from graphics/pokemon/footprints/magikarp_footprint.png rename to graphics/pokemon/magikarp/footprint.png diff --git a/graphics/pokemon/front_pics/magikarp_still_front_pic.png b/graphics/pokemon/magikarp/front.png similarity index 100% rename from graphics/pokemon/front_pics/magikarp_still_front_pic.png rename to graphics/pokemon/magikarp/front.png diff --git a/graphics/pokemon/icons/magikarp_icon.png b/graphics/pokemon/magikarp/icon.png similarity index 100% rename from graphics/pokemon/icons/magikarp_icon.png rename to graphics/pokemon/magikarp/icon.png diff --git a/graphics/pokemon/palettes/magikarp_palette.pal b/graphics/pokemon/magikarp/normal.pal similarity index 100% rename from graphics/pokemon/palettes/magikarp_palette.pal rename to graphics/pokemon/magikarp/normal.pal diff --git a/graphics/pokemon/palettes/magikarp_shiny_palette.pal b/graphics/pokemon/magikarp/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/magikarp_shiny_palette.pal rename to graphics/pokemon/magikarp/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/magmar_front_pic.png b/graphics/pokemon/magmar/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/magmar_front_pic.png rename to graphics/pokemon/magmar/anim_front.png diff --git a/graphics/pokemon/back_pics/magmar_back_pic.png b/graphics/pokemon/magmar/back.png similarity index 100% rename from graphics/pokemon/back_pics/magmar_back_pic.png rename to graphics/pokemon/magmar/back.png diff --git a/graphics/pokemon/footprints/magmar_footprint.png b/graphics/pokemon/magmar/footprint.png similarity index 100% rename from graphics/pokemon/footprints/magmar_footprint.png rename to graphics/pokemon/magmar/footprint.png diff --git a/graphics/pokemon/front_pics/magmar_still_front_pic.png b/graphics/pokemon/magmar/front.png similarity index 100% rename from graphics/pokemon/front_pics/magmar_still_front_pic.png rename to graphics/pokemon/magmar/front.png diff --git a/graphics/pokemon/icons/magmar_icon.png b/graphics/pokemon/magmar/icon.png similarity index 100% rename from graphics/pokemon/icons/magmar_icon.png rename to graphics/pokemon/magmar/icon.png diff --git a/graphics/pokemon/palettes/magmar_palette.pal b/graphics/pokemon/magmar/normal.pal similarity index 100% rename from graphics/pokemon/palettes/magmar_palette.pal rename to graphics/pokemon/magmar/normal.pal diff --git a/graphics/pokemon/palettes/magmar_shiny_palette.pal b/graphics/pokemon/magmar/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/magmar_shiny_palette.pal rename to graphics/pokemon/magmar/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/magnemite_front_pic.png b/graphics/pokemon/magnemite/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/magnemite_front_pic.png rename to graphics/pokemon/magnemite/anim_front.png diff --git a/graphics/pokemon/back_pics/magnemite_back_pic.png b/graphics/pokemon/magnemite/back.png similarity index 100% rename from graphics/pokemon/back_pics/magnemite_back_pic.png rename to graphics/pokemon/magnemite/back.png diff --git a/graphics/pokemon/footprints/magnemite_footprint.png b/graphics/pokemon/magnemite/footprint.png similarity index 100% rename from graphics/pokemon/footprints/magnemite_footprint.png rename to graphics/pokemon/magnemite/footprint.png diff --git a/graphics/pokemon/front_pics/magnemite_still_front_pic.png b/graphics/pokemon/magnemite/front.png similarity index 100% rename from graphics/pokemon/front_pics/magnemite_still_front_pic.png rename to graphics/pokemon/magnemite/front.png diff --git a/graphics/pokemon/icons/magnemite_icon.png b/graphics/pokemon/magnemite/icon.png similarity index 100% rename from graphics/pokemon/icons/magnemite_icon.png rename to graphics/pokemon/magnemite/icon.png diff --git a/graphics/pokemon/palettes/magnemite_palette.pal b/graphics/pokemon/magnemite/normal.pal similarity index 100% rename from graphics/pokemon/palettes/magnemite_palette.pal rename to graphics/pokemon/magnemite/normal.pal diff --git a/graphics/pokemon/palettes/magnemite_shiny_palette.pal b/graphics/pokemon/magnemite/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/magnemite_shiny_palette.pal rename to graphics/pokemon/magnemite/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/magneton_front_pic.png b/graphics/pokemon/magneton/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/magneton_front_pic.png rename to graphics/pokemon/magneton/anim_front.png diff --git a/graphics/pokemon/back_pics/magneton_back_pic.png b/graphics/pokemon/magneton/back.png similarity index 100% rename from graphics/pokemon/back_pics/magneton_back_pic.png rename to graphics/pokemon/magneton/back.png diff --git a/graphics/pokemon/footprints/magneton_footprint.png b/graphics/pokemon/magneton/footprint.png similarity index 100% rename from graphics/pokemon/footprints/magneton_footprint.png rename to graphics/pokemon/magneton/footprint.png diff --git a/graphics/pokemon/front_pics/magneton_still_front_pic.png b/graphics/pokemon/magneton/front.png similarity index 100% rename from graphics/pokemon/front_pics/magneton_still_front_pic.png rename to graphics/pokemon/magneton/front.png diff --git a/graphics/pokemon/icons/magneton_icon.png b/graphics/pokemon/magneton/icon.png similarity index 100% rename from graphics/pokemon/icons/magneton_icon.png rename to graphics/pokemon/magneton/icon.png diff --git a/graphics/pokemon/palettes/magneton_palette.pal b/graphics/pokemon/magneton/normal.pal similarity index 100% rename from graphics/pokemon/palettes/magneton_palette.pal rename to graphics/pokemon/magneton/normal.pal diff --git a/graphics/pokemon/palettes/magneton_shiny_palette.pal b/graphics/pokemon/magneton/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/magneton_shiny_palette.pal rename to graphics/pokemon/magneton/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/makuhita_front_pic.png b/graphics/pokemon/makuhita/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/makuhita_front_pic.png rename to graphics/pokemon/makuhita/anim_front.png diff --git a/graphics/pokemon/back_pics/makuhita_back_pic.png b/graphics/pokemon/makuhita/back.png similarity index 100% rename from graphics/pokemon/back_pics/makuhita_back_pic.png rename to graphics/pokemon/makuhita/back.png diff --git a/graphics/pokemon/footprints/makuhita_footprint.png b/graphics/pokemon/makuhita/footprint.png similarity index 100% rename from graphics/pokemon/footprints/makuhita_footprint.png rename to graphics/pokemon/makuhita/footprint.png diff --git a/graphics/pokemon/front_pics/makuhita_still_front_pic.png b/graphics/pokemon/makuhita/front.png similarity index 100% rename from graphics/pokemon/front_pics/makuhita_still_front_pic.png rename to graphics/pokemon/makuhita/front.png diff --git a/graphics/pokemon/icons/makuhita_icon.png b/graphics/pokemon/makuhita/icon.png similarity index 100% rename from graphics/pokemon/icons/makuhita_icon.png rename to graphics/pokemon/makuhita/icon.png diff --git a/graphics/pokemon/palettes/makuhita_palette.pal b/graphics/pokemon/makuhita/normal.pal similarity index 100% rename from graphics/pokemon/palettes/makuhita_palette.pal rename to graphics/pokemon/makuhita/normal.pal diff --git a/graphics/pokemon/palettes/makuhita_shiny_palette.pal b/graphics/pokemon/makuhita/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/makuhita_shiny_palette.pal rename to graphics/pokemon/makuhita/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/manectric_front_pic.png b/graphics/pokemon/manectric/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/manectric_front_pic.png rename to graphics/pokemon/manectric/anim_front.png diff --git a/graphics/pokemon/back_pics/manectric_back_pic.png b/graphics/pokemon/manectric/back.png similarity index 100% rename from graphics/pokemon/back_pics/manectric_back_pic.png rename to graphics/pokemon/manectric/back.png diff --git a/graphics/pokemon/footprints/manectric_footprint.png b/graphics/pokemon/manectric/footprint.png similarity index 100% rename from graphics/pokemon/footprints/manectric_footprint.png rename to graphics/pokemon/manectric/footprint.png diff --git a/graphics/pokemon/front_pics/manectric_still_front_pic.png b/graphics/pokemon/manectric/front.png similarity index 100% rename from graphics/pokemon/front_pics/manectric_still_front_pic.png rename to graphics/pokemon/manectric/front.png diff --git a/graphics/pokemon/icons/manectric_icon.png b/graphics/pokemon/manectric/icon.png similarity index 100% rename from graphics/pokemon/icons/manectric_icon.png rename to graphics/pokemon/manectric/icon.png diff --git a/graphics/pokemon/palettes/manectric_palette.pal b/graphics/pokemon/manectric/normal.pal similarity index 100% rename from graphics/pokemon/palettes/manectric_palette.pal rename to graphics/pokemon/manectric/normal.pal diff --git a/graphics/pokemon/palettes/manectric_shiny_palette.pal b/graphics/pokemon/manectric/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/manectric_shiny_palette.pal rename to graphics/pokemon/manectric/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/mankey_front_pic.png b/graphics/pokemon/mankey/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/mankey_front_pic.png rename to graphics/pokemon/mankey/anim_front.png diff --git a/graphics/pokemon/back_pics/mankey_back_pic.png b/graphics/pokemon/mankey/back.png similarity index 100% rename from graphics/pokemon/back_pics/mankey_back_pic.png rename to graphics/pokemon/mankey/back.png diff --git a/graphics/pokemon/footprints/mankey_footprint.png b/graphics/pokemon/mankey/footprint.png similarity index 100% rename from graphics/pokemon/footprints/mankey_footprint.png rename to graphics/pokemon/mankey/footprint.png diff --git a/graphics/pokemon/front_pics/mankey_still_front_pic.png b/graphics/pokemon/mankey/front.png similarity index 100% rename from graphics/pokemon/front_pics/mankey_still_front_pic.png rename to graphics/pokemon/mankey/front.png diff --git a/graphics/pokemon/icons/mankey_icon.png b/graphics/pokemon/mankey/icon.png similarity index 100% rename from graphics/pokemon/icons/mankey_icon.png rename to graphics/pokemon/mankey/icon.png diff --git a/graphics/pokemon/palettes/mankey_palette.pal b/graphics/pokemon/mankey/normal.pal similarity index 100% rename from graphics/pokemon/palettes/mankey_palette.pal rename to graphics/pokemon/mankey/normal.pal diff --git a/graphics/pokemon/palettes/mankey_shiny_palette.pal b/graphics/pokemon/mankey/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/mankey_shiny_palette.pal rename to graphics/pokemon/mankey/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/mantine_front_pic.png b/graphics/pokemon/mantine/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/mantine_front_pic.png rename to graphics/pokemon/mantine/anim_front.png diff --git a/graphics/pokemon/back_pics/mantine_back_pic.png b/graphics/pokemon/mantine/back.png similarity index 100% rename from graphics/pokemon/back_pics/mantine_back_pic.png rename to graphics/pokemon/mantine/back.png diff --git a/graphics/pokemon/footprints/mantine_footprint.png b/graphics/pokemon/mantine/footprint.png similarity index 100% rename from graphics/pokemon/footprints/mantine_footprint.png rename to graphics/pokemon/mantine/footprint.png diff --git a/graphics/pokemon/front_pics/mantine_still_front_pic.png b/graphics/pokemon/mantine/front.png similarity index 100% rename from graphics/pokemon/front_pics/mantine_still_front_pic.png rename to graphics/pokemon/mantine/front.png diff --git a/graphics/pokemon/icons/mantine_icon.png b/graphics/pokemon/mantine/icon.png similarity index 100% rename from graphics/pokemon/icons/mantine_icon.png rename to graphics/pokemon/mantine/icon.png diff --git a/graphics/pokemon/palettes/mantine_palette.pal b/graphics/pokemon/mantine/normal.pal similarity index 100% rename from graphics/pokemon/palettes/mantine_palette.pal rename to graphics/pokemon/mantine/normal.pal diff --git a/graphics/pokemon/palettes/mantine_shiny_palette.pal b/graphics/pokemon/mantine/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/mantine_shiny_palette.pal rename to graphics/pokemon/mantine/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/mareep_front_pic.png b/graphics/pokemon/mareep/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/mareep_front_pic.png rename to graphics/pokemon/mareep/anim_front.png diff --git a/graphics/pokemon/back_pics/mareep_back_pic.png b/graphics/pokemon/mareep/back.png similarity index 100% rename from graphics/pokemon/back_pics/mareep_back_pic.png rename to graphics/pokemon/mareep/back.png diff --git a/graphics/pokemon/footprints/mareep_footprint.png b/graphics/pokemon/mareep/footprint.png similarity index 100% rename from graphics/pokemon/footprints/mareep_footprint.png rename to graphics/pokemon/mareep/footprint.png diff --git a/graphics/pokemon/front_pics/mareep_still_front_pic.png b/graphics/pokemon/mareep/front.png similarity index 100% rename from graphics/pokemon/front_pics/mareep_still_front_pic.png rename to graphics/pokemon/mareep/front.png diff --git a/graphics/pokemon/icons/mareep_icon.png b/graphics/pokemon/mareep/icon.png similarity index 100% rename from graphics/pokemon/icons/mareep_icon.png rename to graphics/pokemon/mareep/icon.png diff --git a/graphics/pokemon/palettes/mareep_palette.pal b/graphics/pokemon/mareep/normal.pal similarity index 100% rename from graphics/pokemon/palettes/mareep_palette.pal rename to graphics/pokemon/mareep/normal.pal diff --git a/graphics/pokemon/palettes/mareep_shiny_palette.pal b/graphics/pokemon/mareep/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/mareep_shiny_palette.pal rename to graphics/pokemon/mareep/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/marill_front_pic.png b/graphics/pokemon/marill/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/marill_front_pic.png rename to graphics/pokemon/marill/anim_front.png diff --git a/graphics/pokemon/back_pics/marill_back_pic.png b/graphics/pokemon/marill/back.png similarity index 100% rename from graphics/pokemon/back_pics/marill_back_pic.png rename to graphics/pokemon/marill/back.png diff --git a/graphics/pokemon/footprints/marill_footprint.png b/graphics/pokemon/marill/footprint.png similarity index 100% rename from graphics/pokemon/footprints/marill_footprint.png rename to graphics/pokemon/marill/footprint.png diff --git a/graphics/pokemon/front_pics/marill_still_front_pic.png b/graphics/pokemon/marill/front.png similarity index 100% rename from graphics/pokemon/front_pics/marill_still_front_pic.png rename to graphics/pokemon/marill/front.png diff --git a/graphics/pokemon/icons/marill_icon.png b/graphics/pokemon/marill/icon.png similarity index 100% rename from graphics/pokemon/icons/marill_icon.png rename to graphics/pokemon/marill/icon.png diff --git a/graphics/pokemon/palettes/marill_palette.pal b/graphics/pokemon/marill/normal.pal similarity index 100% rename from graphics/pokemon/palettes/marill_palette.pal rename to graphics/pokemon/marill/normal.pal diff --git a/graphics/pokemon/palettes/marill_shiny_palette.pal b/graphics/pokemon/marill/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/marill_shiny_palette.pal rename to graphics/pokemon/marill/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/marowak_front_pic.png b/graphics/pokemon/marowak/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/marowak_front_pic.png rename to graphics/pokemon/marowak/anim_front.png diff --git a/graphics/pokemon/back_pics/marowak_back_pic.png b/graphics/pokemon/marowak/back.png similarity index 100% rename from graphics/pokemon/back_pics/marowak_back_pic.png rename to graphics/pokemon/marowak/back.png diff --git a/graphics/pokemon/footprints/marowak_footprint.png b/graphics/pokemon/marowak/footprint.png similarity index 100% rename from graphics/pokemon/footprints/marowak_footprint.png rename to graphics/pokemon/marowak/footprint.png diff --git a/graphics/pokemon/front_pics/marowak_still_front_pic.png b/graphics/pokemon/marowak/front.png similarity index 100% rename from graphics/pokemon/front_pics/marowak_still_front_pic.png rename to graphics/pokemon/marowak/front.png diff --git a/graphics/pokemon/icons/marowak_icon.png b/graphics/pokemon/marowak/icon.png similarity index 100% rename from graphics/pokemon/icons/marowak_icon.png rename to graphics/pokemon/marowak/icon.png diff --git a/graphics/pokemon/palettes/marowak_palette.pal b/graphics/pokemon/marowak/normal.pal similarity index 100% rename from graphics/pokemon/palettes/marowak_palette.pal rename to graphics/pokemon/marowak/normal.pal diff --git a/graphics/pokemon/palettes/marowak_shiny_palette.pal b/graphics/pokemon/marowak/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/marowak_shiny_palette.pal rename to graphics/pokemon/marowak/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/marshtomp_front_pic.png b/graphics/pokemon/marshtomp/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/marshtomp_front_pic.png rename to graphics/pokemon/marshtomp/anim_front.png diff --git a/graphics/pokemon/back_pics/marshtomp_back_pic.png b/graphics/pokemon/marshtomp/back.png similarity index 100% rename from graphics/pokemon/back_pics/marshtomp_back_pic.png rename to graphics/pokemon/marshtomp/back.png diff --git a/graphics/pokemon/footprints/marshtomp_footprint.png b/graphics/pokemon/marshtomp/footprint.png similarity index 100% rename from graphics/pokemon/footprints/marshtomp_footprint.png rename to graphics/pokemon/marshtomp/footprint.png diff --git a/graphics/pokemon/front_pics/marshtomp_still_front_pic.png b/graphics/pokemon/marshtomp/front.png similarity index 100% rename from graphics/pokemon/front_pics/marshtomp_still_front_pic.png rename to graphics/pokemon/marshtomp/front.png diff --git a/graphics/pokemon/icons/marshtomp_icon.png b/graphics/pokemon/marshtomp/icon.png similarity index 100% rename from graphics/pokemon/icons/marshtomp_icon.png rename to graphics/pokemon/marshtomp/icon.png diff --git a/graphics/pokemon/palettes/marshtomp_palette.pal b/graphics/pokemon/marshtomp/normal.pal similarity index 100% rename from graphics/pokemon/palettes/marshtomp_palette.pal rename to graphics/pokemon/marshtomp/normal.pal diff --git a/graphics/pokemon/palettes/marshtomp_shiny_palette.pal b/graphics/pokemon/marshtomp/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/marshtomp_shiny_palette.pal rename to graphics/pokemon/marshtomp/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/masquerain_front_pic.png b/graphics/pokemon/masquerain/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/masquerain_front_pic.png rename to graphics/pokemon/masquerain/anim_front.png diff --git a/graphics/pokemon/back_pics/masquerain_back_pic.png b/graphics/pokemon/masquerain/back.png similarity index 100% rename from graphics/pokemon/back_pics/masquerain_back_pic.png rename to graphics/pokemon/masquerain/back.png diff --git a/graphics/pokemon/footprints/masquerain_footprint.png b/graphics/pokemon/masquerain/footprint.png similarity index 100% rename from graphics/pokemon/footprints/masquerain_footprint.png rename to graphics/pokemon/masquerain/footprint.png diff --git a/graphics/pokemon/front_pics/masquerain_still_front_pic.png b/graphics/pokemon/masquerain/front.png similarity index 100% rename from graphics/pokemon/front_pics/masquerain_still_front_pic.png rename to graphics/pokemon/masquerain/front.png diff --git a/graphics/pokemon/icons/masquerain_icon.png b/graphics/pokemon/masquerain/icon.png similarity index 100% rename from graphics/pokemon/icons/masquerain_icon.png rename to graphics/pokemon/masquerain/icon.png diff --git a/graphics/pokemon/palettes/masquerain_palette.pal b/graphics/pokemon/masquerain/normal.pal similarity index 100% rename from graphics/pokemon/palettes/masquerain_palette.pal rename to graphics/pokemon/masquerain/normal.pal diff --git a/graphics/pokemon/palettes/masquerain_shiny_palette.pal b/graphics/pokemon/masquerain/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/masquerain_shiny_palette.pal rename to graphics/pokemon/masquerain/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/mawile_front_pic.png b/graphics/pokemon/mawile/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/mawile_front_pic.png rename to graphics/pokemon/mawile/anim_front.png diff --git a/graphics/pokemon/back_pics/mawile_back_pic.png b/graphics/pokemon/mawile/back.png similarity index 100% rename from graphics/pokemon/back_pics/mawile_back_pic.png rename to graphics/pokemon/mawile/back.png diff --git a/graphics/pokemon/footprints/mawile_footprint.png b/graphics/pokemon/mawile/footprint.png similarity index 100% rename from graphics/pokemon/footprints/mawile_footprint.png rename to graphics/pokemon/mawile/footprint.png diff --git a/graphics/pokemon/front_pics/mawile_still_front_pic.png b/graphics/pokemon/mawile/front.png similarity index 100% rename from graphics/pokemon/front_pics/mawile_still_front_pic.png rename to graphics/pokemon/mawile/front.png diff --git a/graphics/pokemon/icons/mawile_icon.png b/graphics/pokemon/mawile/icon.png similarity index 100% rename from graphics/pokemon/icons/mawile_icon.png rename to graphics/pokemon/mawile/icon.png diff --git a/graphics/pokemon/palettes/mawile_palette.pal b/graphics/pokemon/mawile/normal.pal similarity index 100% rename from graphics/pokemon/palettes/mawile_palette.pal rename to graphics/pokemon/mawile/normal.pal diff --git a/graphics/pokemon/palettes/mawile_shiny_palette.pal b/graphics/pokemon/mawile/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/mawile_shiny_palette.pal rename to graphics/pokemon/mawile/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/medicham_front_pic.png b/graphics/pokemon/medicham/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/medicham_front_pic.png rename to graphics/pokemon/medicham/anim_front.png diff --git a/graphics/pokemon/back_pics/medicham_back_pic.png b/graphics/pokemon/medicham/back.png similarity index 100% rename from graphics/pokemon/back_pics/medicham_back_pic.png rename to graphics/pokemon/medicham/back.png diff --git a/graphics/pokemon/footprints/medicham_footprint.png b/graphics/pokemon/medicham/footprint.png similarity index 100% rename from graphics/pokemon/footprints/medicham_footprint.png rename to graphics/pokemon/medicham/footprint.png diff --git a/graphics/pokemon/front_pics/medicham_still_front_pic.png b/graphics/pokemon/medicham/front.png similarity index 100% rename from graphics/pokemon/front_pics/medicham_still_front_pic.png rename to graphics/pokemon/medicham/front.png diff --git a/graphics/pokemon/icons/medicham_icon.png b/graphics/pokemon/medicham/icon.png similarity index 100% rename from graphics/pokemon/icons/medicham_icon.png rename to graphics/pokemon/medicham/icon.png diff --git a/graphics/pokemon/palettes/medicham_palette.pal b/graphics/pokemon/medicham/normal.pal similarity index 100% rename from graphics/pokemon/palettes/medicham_palette.pal rename to graphics/pokemon/medicham/normal.pal diff --git a/graphics/pokemon/palettes/medicham_shiny_palette.pal b/graphics/pokemon/medicham/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/medicham_shiny_palette.pal rename to graphics/pokemon/medicham/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/meditite_front_pic.png b/graphics/pokemon/meditite/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/meditite_front_pic.png rename to graphics/pokemon/meditite/anim_front.png diff --git a/graphics/pokemon/back_pics/meditite_back_pic.png b/graphics/pokemon/meditite/back.png similarity index 100% rename from graphics/pokemon/back_pics/meditite_back_pic.png rename to graphics/pokemon/meditite/back.png diff --git a/graphics/pokemon/footprints/meditite_footprint.png b/graphics/pokemon/meditite/footprint.png similarity index 100% rename from graphics/pokemon/footprints/meditite_footprint.png rename to graphics/pokemon/meditite/footprint.png diff --git a/graphics/pokemon/front_pics/meditite_still_front_pic.png b/graphics/pokemon/meditite/front.png similarity index 100% rename from graphics/pokemon/front_pics/meditite_still_front_pic.png rename to graphics/pokemon/meditite/front.png diff --git a/graphics/pokemon/icons/meditite_icon.png b/graphics/pokemon/meditite/icon.png similarity index 100% rename from graphics/pokemon/icons/meditite_icon.png rename to graphics/pokemon/meditite/icon.png diff --git a/graphics/pokemon/palettes/meditite_palette.pal b/graphics/pokemon/meditite/normal.pal similarity index 100% rename from graphics/pokemon/palettes/meditite_palette.pal rename to graphics/pokemon/meditite/normal.pal diff --git a/graphics/pokemon/palettes/meditite_shiny_palette.pal b/graphics/pokemon/meditite/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/meditite_shiny_palette.pal rename to graphics/pokemon/meditite/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/meganium_front_pic.png b/graphics/pokemon/meganium/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/meganium_front_pic.png rename to graphics/pokemon/meganium/anim_front.png diff --git a/graphics/pokemon/back_pics/meganium_back_pic.png b/graphics/pokemon/meganium/back.png similarity index 100% rename from graphics/pokemon/back_pics/meganium_back_pic.png rename to graphics/pokemon/meganium/back.png diff --git a/graphics/pokemon/footprints/meganium_footprint.png b/graphics/pokemon/meganium/footprint.png similarity index 100% rename from graphics/pokemon/footprints/meganium_footprint.png rename to graphics/pokemon/meganium/footprint.png diff --git a/graphics/pokemon/front_pics/meganium_still_front_pic.png b/graphics/pokemon/meganium/front.png similarity index 100% rename from graphics/pokemon/front_pics/meganium_still_front_pic.png rename to graphics/pokemon/meganium/front.png diff --git a/graphics/pokemon/icons/meganium_icon.png b/graphics/pokemon/meganium/icon.png similarity index 100% rename from graphics/pokemon/icons/meganium_icon.png rename to graphics/pokemon/meganium/icon.png diff --git a/graphics/pokemon/palettes/meganium_palette.pal b/graphics/pokemon/meganium/normal.pal similarity index 100% rename from graphics/pokemon/palettes/meganium_palette.pal rename to graphics/pokemon/meganium/normal.pal diff --git a/graphics/pokemon/palettes/meganium_shiny_palette.pal b/graphics/pokemon/meganium/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/meganium_shiny_palette.pal rename to graphics/pokemon/meganium/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/meowth_front_pic.png b/graphics/pokemon/meowth/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/meowth_front_pic.png rename to graphics/pokemon/meowth/anim_front.png diff --git a/graphics/pokemon/back_pics/meowth_back_pic.png b/graphics/pokemon/meowth/back.png similarity index 100% rename from graphics/pokemon/back_pics/meowth_back_pic.png rename to graphics/pokemon/meowth/back.png diff --git a/graphics/pokemon/footprints/meowth_footprint.png b/graphics/pokemon/meowth/footprint.png similarity index 100% rename from graphics/pokemon/footprints/meowth_footprint.png rename to graphics/pokemon/meowth/footprint.png diff --git a/graphics/pokemon/front_pics/meowth_still_front_pic.png b/graphics/pokemon/meowth/front.png similarity index 100% rename from graphics/pokemon/front_pics/meowth_still_front_pic.png rename to graphics/pokemon/meowth/front.png diff --git a/graphics/pokemon/icons/meowth_icon.png b/graphics/pokemon/meowth/icon.png similarity index 100% rename from graphics/pokemon/icons/meowth_icon.png rename to graphics/pokemon/meowth/icon.png diff --git a/graphics/pokemon/palettes/meowth_palette.pal b/graphics/pokemon/meowth/normal.pal similarity index 100% rename from graphics/pokemon/palettes/meowth_palette.pal rename to graphics/pokemon/meowth/normal.pal diff --git a/graphics/pokemon/palettes/meowth_shiny_palette.pal b/graphics/pokemon/meowth/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/meowth_shiny_palette.pal rename to graphics/pokemon/meowth/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/metagross_front_pic.png b/graphics/pokemon/metagross/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/metagross_front_pic.png rename to graphics/pokemon/metagross/anim_front.png diff --git a/graphics/pokemon/back_pics/metagross_back_pic.png b/graphics/pokemon/metagross/back.png similarity index 100% rename from graphics/pokemon/back_pics/metagross_back_pic.png rename to graphics/pokemon/metagross/back.png diff --git a/graphics/pokemon/footprints/metagross_footprint.png b/graphics/pokemon/metagross/footprint.png similarity index 100% rename from graphics/pokemon/footprints/metagross_footprint.png rename to graphics/pokemon/metagross/footprint.png diff --git a/graphics/pokemon/front_pics/metagross_still_front_pic.png b/graphics/pokemon/metagross/front.png similarity index 100% rename from graphics/pokemon/front_pics/metagross_still_front_pic.png rename to graphics/pokemon/metagross/front.png diff --git a/graphics/pokemon/icons/metagross_icon.png b/graphics/pokemon/metagross/icon.png similarity index 100% rename from graphics/pokemon/icons/metagross_icon.png rename to graphics/pokemon/metagross/icon.png diff --git a/graphics/pokemon/palettes/metagross_palette.pal b/graphics/pokemon/metagross/normal.pal similarity index 100% rename from graphics/pokemon/palettes/metagross_palette.pal rename to graphics/pokemon/metagross/normal.pal diff --git a/graphics/pokemon/palettes/metagross_shiny_palette.pal b/graphics/pokemon/metagross/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/metagross_shiny_palette.pal rename to graphics/pokemon/metagross/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/metang_front_pic.png b/graphics/pokemon/metang/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/metang_front_pic.png rename to graphics/pokemon/metang/anim_front.png diff --git a/graphics/pokemon/back_pics/metang_back_pic.png b/graphics/pokemon/metang/back.png similarity index 100% rename from graphics/pokemon/back_pics/metang_back_pic.png rename to graphics/pokemon/metang/back.png diff --git a/graphics/pokemon/footprints/metang_footprint.png b/graphics/pokemon/metang/footprint.png similarity index 100% rename from graphics/pokemon/footprints/metang_footprint.png rename to graphics/pokemon/metang/footprint.png diff --git a/graphics/pokemon/front_pics/metang_still_front_pic.png b/graphics/pokemon/metang/front.png similarity index 100% rename from graphics/pokemon/front_pics/metang_still_front_pic.png rename to graphics/pokemon/metang/front.png diff --git a/graphics/pokemon/icons/metang_icon.png b/graphics/pokemon/metang/icon.png similarity index 100% rename from graphics/pokemon/icons/metang_icon.png rename to graphics/pokemon/metang/icon.png diff --git a/graphics/pokemon/palettes/metang_palette.pal b/graphics/pokemon/metang/normal.pal similarity index 100% rename from graphics/pokemon/palettes/metang_palette.pal rename to graphics/pokemon/metang/normal.pal diff --git a/graphics/pokemon/palettes/metang_shiny_palette.pal b/graphics/pokemon/metang/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/metang_shiny_palette.pal rename to graphics/pokemon/metang/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/metapod_front_pic.png b/graphics/pokemon/metapod/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/metapod_front_pic.png rename to graphics/pokemon/metapod/anim_front.png diff --git a/graphics/pokemon/back_pics/metapod_back_pic.png b/graphics/pokemon/metapod/back.png similarity index 100% rename from graphics/pokemon/back_pics/metapod_back_pic.png rename to graphics/pokemon/metapod/back.png diff --git a/graphics/pokemon/footprints/metapod_footprint.png b/graphics/pokemon/metapod/footprint.png similarity index 100% rename from graphics/pokemon/footprints/metapod_footprint.png rename to graphics/pokemon/metapod/footprint.png diff --git a/graphics/pokemon/front_pics/metapod_still_front_pic.png b/graphics/pokemon/metapod/front.png similarity index 100% rename from graphics/pokemon/front_pics/metapod_still_front_pic.png rename to graphics/pokemon/metapod/front.png diff --git a/graphics/pokemon/icons/metapod_icon.png b/graphics/pokemon/metapod/icon.png similarity index 100% rename from graphics/pokemon/icons/metapod_icon.png rename to graphics/pokemon/metapod/icon.png diff --git a/graphics/pokemon/palettes/metapod_palette.pal b/graphics/pokemon/metapod/normal.pal similarity index 100% rename from graphics/pokemon/palettes/metapod_palette.pal rename to graphics/pokemon/metapod/normal.pal diff --git a/graphics/pokemon/palettes/metapod_shiny_palette.pal b/graphics/pokemon/metapod/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/metapod_shiny_palette.pal rename to graphics/pokemon/metapod/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/mew_front_pic.png b/graphics/pokemon/mew/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/mew_front_pic.png rename to graphics/pokemon/mew/anim_front.png diff --git a/graphics/pokemon/back_pics/mew_back_pic.png b/graphics/pokemon/mew/back.png similarity index 100% rename from graphics/pokemon/back_pics/mew_back_pic.png rename to graphics/pokemon/mew/back.png diff --git a/graphics/pokemon/footprints/mew_footprint.png b/graphics/pokemon/mew/footprint.png similarity index 100% rename from graphics/pokemon/footprints/mew_footprint.png rename to graphics/pokemon/mew/footprint.png diff --git a/graphics/pokemon/front_pics/mew_still_front_pic.png b/graphics/pokemon/mew/front.png similarity index 100% rename from graphics/pokemon/front_pics/mew_still_front_pic.png rename to graphics/pokemon/mew/front.png diff --git a/graphics/pokemon/icons/mew_icon.png b/graphics/pokemon/mew/icon.png similarity index 100% rename from graphics/pokemon/icons/mew_icon.png rename to graphics/pokemon/mew/icon.png diff --git a/graphics/pokemon/palettes/mew_palette.pal b/graphics/pokemon/mew/normal.pal similarity index 100% rename from graphics/pokemon/palettes/mew_palette.pal rename to graphics/pokemon/mew/normal.pal diff --git a/graphics/pokemon/palettes/mew_shiny_palette.pal b/graphics/pokemon/mew/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/mew_shiny_palette.pal rename to graphics/pokemon/mew/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/mewtwo_front_pic.png b/graphics/pokemon/mewtwo/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/mewtwo_front_pic.png rename to graphics/pokemon/mewtwo/anim_front.png diff --git a/graphics/pokemon/back_pics/mewtwo_back_pic.png b/graphics/pokemon/mewtwo/back.png similarity index 100% rename from graphics/pokemon/back_pics/mewtwo_back_pic.png rename to graphics/pokemon/mewtwo/back.png diff --git a/graphics/pokemon/footprints/mewtwo_footprint.png b/graphics/pokemon/mewtwo/footprint.png similarity index 100% rename from graphics/pokemon/footprints/mewtwo_footprint.png rename to graphics/pokemon/mewtwo/footprint.png diff --git a/graphics/pokemon/front_pics/mewtwo_still_front_pic.png b/graphics/pokemon/mewtwo/front.png similarity index 100% rename from graphics/pokemon/front_pics/mewtwo_still_front_pic.png rename to graphics/pokemon/mewtwo/front.png diff --git a/graphics/pokemon/icons/mewtwo_icon.png b/graphics/pokemon/mewtwo/icon.png similarity index 100% rename from graphics/pokemon/icons/mewtwo_icon.png rename to graphics/pokemon/mewtwo/icon.png diff --git a/graphics/pokemon/palettes/mewtwo_palette.pal b/graphics/pokemon/mewtwo/normal.pal similarity index 100% rename from graphics/pokemon/palettes/mewtwo_palette.pal rename to graphics/pokemon/mewtwo/normal.pal diff --git a/graphics/pokemon/palettes/mewtwo_shiny_palette.pal b/graphics/pokemon/mewtwo/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/mewtwo_shiny_palette.pal rename to graphics/pokemon/mewtwo/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/mightyena_front_pic.png b/graphics/pokemon/mightyena/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/mightyena_front_pic.png rename to graphics/pokemon/mightyena/anim_front.png diff --git a/graphics/pokemon/back_pics/mightyena_back_pic.png b/graphics/pokemon/mightyena/back.png similarity index 100% rename from graphics/pokemon/back_pics/mightyena_back_pic.png rename to graphics/pokemon/mightyena/back.png diff --git a/graphics/pokemon/footprints/mightyena_footprint.png b/graphics/pokemon/mightyena/footprint.png similarity index 100% rename from graphics/pokemon/footprints/mightyena_footprint.png rename to graphics/pokemon/mightyena/footprint.png diff --git a/graphics/pokemon/front_pics/mightyena_still_front_pic.png b/graphics/pokemon/mightyena/front.png similarity index 100% rename from graphics/pokemon/front_pics/mightyena_still_front_pic.png rename to graphics/pokemon/mightyena/front.png diff --git a/graphics/pokemon/icons/mightyena_icon.png b/graphics/pokemon/mightyena/icon.png similarity index 100% rename from graphics/pokemon/icons/mightyena_icon.png rename to graphics/pokemon/mightyena/icon.png diff --git a/graphics/pokemon/palettes/mightyena_palette.pal b/graphics/pokemon/mightyena/normal.pal similarity index 100% rename from graphics/pokemon/palettes/mightyena_palette.pal rename to graphics/pokemon/mightyena/normal.pal diff --git a/graphics/pokemon/palettes/mightyena_shiny_palette.pal b/graphics/pokemon/mightyena/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/mightyena_shiny_palette.pal rename to graphics/pokemon/mightyena/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/milotic_front_pic.png b/graphics/pokemon/milotic/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/milotic_front_pic.png rename to graphics/pokemon/milotic/anim_front.png diff --git a/graphics/pokemon/back_pics/milotic_back_pic.png b/graphics/pokemon/milotic/back.png similarity index 100% rename from graphics/pokemon/back_pics/milotic_back_pic.png rename to graphics/pokemon/milotic/back.png diff --git a/graphics/pokemon/footprints/milotic_footprint.png b/graphics/pokemon/milotic/footprint.png similarity index 100% rename from graphics/pokemon/footprints/milotic_footprint.png rename to graphics/pokemon/milotic/footprint.png diff --git a/graphics/pokemon/front_pics/milotic_still_front_pic.png b/graphics/pokemon/milotic/front.png similarity index 100% rename from graphics/pokemon/front_pics/milotic_still_front_pic.png rename to graphics/pokemon/milotic/front.png diff --git a/graphics/pokemon/icons/milotic_icon.png b/graphics/pokemon/milotic/icon.png similarity index 100% rename from graphics/pokemon/icons/milotic_icon.png rename to graphics/pokemon/milotic/icon.png diff --git a/graphics/pokemon/palettes/milotic_palette.pal b/graphics/pokemon/milotic/normal.pal similarity index 100% rename from graphics/pokemon/palettes/milotic_palette.pal rename to graphics/pokemon/milotic/normal.pal diff --git a/graphics/pokemon/palettes/milotic_shiny_palette.pal b/graphics/pokemon/milotic/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/milotic_shiny_palette.pal rename to graphics/pokemon/milotic/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/miltank_front_pic.png b/graphics/pokemon/miltank/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/miltank_front_pic.png rename to graphics/pokemon/miltank/anim_front.png diff --git a/graphics/pokemon/back_pics/miltank_back_pic.png b/graphics/pokemon/miltank/back.png similarity index 100% rename from graphics/pokemon/back_pics/miltank_back_pic.png rename to graphics/pokemon/miltank/back.png diff --git a/graphics/pokemon/footprints/miltank_footprint.png b/graphics/pokemon/miltank/footprint.png similarity index 100% rename from graphics/pokemon/footprints/miltank_footprint.png rename to graphics/pokemon/miltank/footprint.png diff --git a/graphics/pokemon/front_pics/miltank_still_front_pic.png b/graphics/pokemon/miltank/front.png similarity index 100% rename from graphics/pokemon/front_pics/miltank_still_front_pic.png rename to graphics/pokemon/miltank/front.png diff --git a/graphics/pokemon/icons/miltank_icon.png b/graphics/pokemon/miltank/icon.png similarity index 100% rename from graphics/pokemon/icons/miltank_icon.png rename to graphics/pokemon/miltank/icon.png diff --git a/graphics/pokemon/palettes/miltank_palette.pal b/graphics/pokemon/miltank/normal.pal similarity index 100% rename from graphics/pokemon/palettes/miltank_palette.pal rename to graphics/pokemon/miltank/normal.pal diff --git a/graphics/pokemon/palettes/miltank_shiny_palette.pal b/graphics/pokemon/miltank/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/miltank_shiny_palette.pal rename to graphics/pokemon/miltank/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/minun_front_pic.png b/graphics/pokemon/minun/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/minun_front_pic.png rename to graphics/pokemon/minun/anim_front.png diff --git a/graphics/pokemon/back_pics/minun_back_pic.png b/graphics/pokemon/minun/back.png similarity index 100% rename from graphics/pokemon/back_pics/minun_back_pic.png rename to graphics/pokemon/minun/back.png diff --git a/graphics/pokemon/footprints/minun_footprint.png b/graphics/pokemon/minun/footprint.png similarity index 100% rename from graphics/pokemon/footprints/minun_footprint.png rename to graphics/pokemon/minun/footprint.png diff --git a/graphics/pokemon/front_pics/minun_still_front_pic.png b/graphics/pokemon/minun/front.png similarity index 100% rename from graphics/pokemon/front_pics/minun_still_front_pic.png rename to graphics/pokemon/minun/front.png diff --git a/graphics/pokemon/icons/minun_icon.png b/graphics/pokemon/minun/icon.png similarity index 100% rename from graphics/pokemon/icons/minun_icon.png rename to graphics/pokemon/minun/icon.png diff --git a/graphics/pokemon/palettes/minun_palette.pal b/graphics/pokemon/minun/normal.pal similarity index 100% rename from graphics/pokemon/palettes/minun_palette.pal rename to graphics/pokemon/minun/normal.pal diff --git a/graphics/pokemon/palettes/minun_shiny_palette.pal b/graphics/pokemon/minun/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/minun_shiny_palette.pal rename to graphics/pokemon/minun/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/misdreavus_front_pic.png b/graphics/pokemon/misdreavus/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/misdreavus_front_pic.png rename to graphics/pokemon/misdreavus/anim_front.png diff --git a/graphics/pokemon/back_pics/misdreavus_back_pic.png b/graphics/pokemon/misdreavus/back.png similarity index 100% rename from graphics/pokemon/back_pics/misdreavus_back_pic.png rename to graphics/pokemon/misdreavus/back.png diff --git a/graphics/pokemon/footprints/misdreavus_footprint.png b/graphics/pokemon/misdreavus/footprint.png similarity index 100% rename from graphics/pokemon/footprints/misdreavus_footprint.png rename to graphics/pokemon/misdreavus/footprint.png diff --git a/graphics/pokemon/front_pics/misdreavus_still_front_pic.png b/graphics/pokemon/misdreavus/front.png similarity index 100% rename from graphics/pokemon/front_pics/misdreavus_still_front_pic.png rename to graphics/pokemon/misdreavus/front.png diff --git a/graphics/pokemon/icons/misdreavus_icon.png b/graphics/pokemon/misdreavus/icon.png similarity index 100% rename from graphics/pokemon/icons/misdreavus_icon.png rename to graphics/pokemon/misdreavus/icon.png diff --git a/graphics/pokemon/palettes/misdreavus_palette.pal b/graphics/pokemon/misdreavus/normal.pal similarity index 100% rename from graphics/pokemon/palettes/misdreavus_palette.pal rename to graphics/pokemon/misdreavus/normal.pal diff --git a/graphics/pokemon/palettes/misdreavus_shiny_palette.pal b/graphics/pokemon/misdreavus/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/misdreavus_shiny_palette.pal rename to graphics/pokemon/misdreavus/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/moltres_front_pic.png b/graphics/pokemon/moltres/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/moltres_front_pic.png rename to graphics/pokemon/moltres/anim_front.png diff --git a/graphics/pokemon/back_pics/moltres_back_pic.png b/graphics/pokemon/moltres/back.png similarity index 100% rename from graphics/pokemon/back_pics/moltres_back_pic.png rename to graphics/pokemon/moltres/back.png diff --git a/graphics/pokemon/footprints/moltres_footprint.png b/graphics/pokemon/moltres/footprint.png similarity index 100% rename from graphics/pokemon/footprints/moltres_footprint.png rename to graphics/pokemon/moltres/footprint.png diff --git a/graphics/pokemon/front_pics/moltres_still_front_pic.png b/graphics/pokemon/moltres/front.png similarity index 100% rename from graphics/pokemon/front_pics/moltres_still_front_pic.png rename to graphics/pokemon/moltres/front.png diff --git a/graphics/pokemon/icons/moltres_icon.png b/graphics/pokemon/moltres/icon.png similarity index 100% rename from graphics/pokemon/icons/moltres_icon.png rename to graphics/pokemon/moltres/icon.png diff --git a/graphics/pokemon/palettes/moltres_palette.pal b/graphics/pokemon/moltres/normal.pal similarity index 100% rename from graphics/pokemon/palettes/moltres_palette.pal rename to graphics/pokemon/moltres/normal.pal diff --git a/graphics/pokemon/palettes/moltres_shiny_palette.pal b/graphics/pokemon/moltres/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/moltres_shiny_palette.pal rename to graphics/pokemon/moltres/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/mr_mime_front_pic.png b/graphics/pokemon/mr_mime/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/mr_mime_front_pic.png rename to graphics/pokemon/mr_mime/anim_front.png diff --git a/graphics/pokemon/back_pics/mr_mime_back_pic.png b/graphics/pokemon/mr_mime/back.png similarity index 100% rename from graphics/pokemon/back_pics/mr_mime_back_pic.png rename to graphics/pokemon/mr_mime/back.png diff --git a/graphics/pokemon/footprints/mr_mime_footprint.png b/graphics/pokemon/mr_mime/footprint.png similarity index 100% rename from graphics/pokemon/footprints/mr_mime_footprint.png rename to graphics/pokemon/mr_mime/footprint.png diff --git a/graphics/pokemon/front_pics/mr_mime_still_front_pic.png b/graphics/pokemon/mr_mime/front.png similarity index 100% rename from graphics/pokemon/front_pics/mr_mime_still_front_pic.png rename to graphics/pokemon/mr_mime/front.png diff --git a/graphics/pokemon/icons/mr_mime_icon.png b/graphics/pokemon/mr_mime/icon.png similarity index 100% rename from graphics/pokemon/icons/mr_mime_icon.png rename to graphics/pokemon/mr_mime/icon.png diff --git a/graphics/pokemon/palettes/mr_mime_palette.pal b/graphics/pokemon/mr_mime/normal.pal similarity index 100% rename from graphics/pokemon/palettes/mr_mime_palette.pal rename to graphics/pokemon/mr_mime/normal.pal diff --git a/graphics/pokemon/palettes/mr_mime_shiny_palette.pal b/graphics/pokemon/mr_mime/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/mr_mime_shiny_palette.pal rename to graphics/pokemon/mr_mime/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/mudkip_front_pic.png b/graphics/pokemon/mudkip/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/mudkip_front_pic.png rename to graphics/pokemon/mudkip/anim_front.png diff --git a/graphics/pokemon/back_pics/mudkip_back_pic.png b/graphics/pokemon/mudkip/back.png similarity index 100% rename from graphics/pokemon/back_pics/mudkip_back_pic.png rename to graphics/pokemon/mudkip/back.png diff --git a/graphics/pokemon/footprints/mudkip_footprint.png b/graphics/pokemon/mudkip/footprint.png similarity index 100% rename from graphics/pokemon/footprints/mudkip_footprint.png rename to graphics/pokemon/mudkip/footprint.png diff --git a/graphics/pokemon/front_pics/mudkip_still_front_pic.png b/graphics/pokemon/mudkip/front.png similarity index 100% rename from graphics/pokemon/front_pics/mudkip_still_front_pic.png rename to graphics/pokemon/mudkip/front.png diff --git a/graphics/pokemon/icons/mudkip_icon.png b/graphics/pokemon/mudkip/icon.png similarity index 100% rename from graphics/pokemon/icons/mudkip_icon.png rename to graphics/pokemon/mudkip/icon.png diff --git a/graphics/pokemon/palettes/mudkip_palette.pal b/graphics/pokemon/mudkip/normal.pal similarity index 100% rename from graphics/pokemon/palettes/mudkip_palette.pal rename to graphics/pokemon/mudkip/normal.pal diff --git a/graphics/pokemon/palettes/mudkip_shiny_palette.pal b/graphics/pokemon/mudkip/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/mudkip_shiny_palette.pal rename to graphics/pokemon/mudkip/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/muk_front_pic.png b/graphics/pokemon/muk/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/muk_front_pic.png rename to graphics/pokemon/muk/anim_front.png diff --git a/graphics/pokemon/back_pics/muk_back_pic.png b/graphics/pokemon/muk/back.png similarity index 100% rename from graphics/pokemon/back_pics/muk_back_pic.png rename to graphics/pokemon/muk/back.png diff --git a/graphics/pokemon/footprints/muk_footprint.png b/graphics/pokemon/muk/footprint.png similarity index 100% rename from graphics/pokemon/footprints/muk_footprint.png rename to graphics/pokemon/muk/footprint.png diff --git a/graphics/pokemon/front_pics/muk_still_front_pic.png b/graphics/pokemon/muk/front.png similarity index 100% rename from graphics/pokemon/front_pics/muk_still_front_pic.png rename to graphics/pokemon/muk/front.png diff --git a/graphics/pokemon/icons/muk_icon.png b/graphics/pokemon/muk/icon.png similarity index 100% rename from graphics/pokemon/icons/muk_icon.png rename to graphics/pokemon/muk/icon.png diff --git a/graphics/pokemon/palettes/muk_palette.pal b/graphics/pokemon/muk/normal.pal similarity index 100% rename from graphics/pokemon/palettes/muk_palette.pal rename to graphics/pokemon/muk/normal.pal diff --git a/graphics/pokemon/palettes/muk_shiny_palette.pal b/graphics/pokemon/muk/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/muk_shiny_palette.pal rename to graphics/pokemon/muk/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/murkrow_front_pic.png b/graphics/pokemon/murkrow/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/murkrow_front_pic.png rename to graphics/pokemon/murkrow/anim_front.png diff --git a/graphics/pokemon/back_pics/murkrow_back_pic.png b/graphics/pokemon/murkrow/back.png similarity index 100% rename from graphics/pokemon/back_pics/murkrow_back_pic.png rename to graphics/pokemon/murkrow/back.png diff --git a/graphics/pokemon/footprints/murkrow_footprint.png b/graphics/pokemon/murkrow/footprint.png similarity index 100% rename from graphics/pokemon/footprints/murkrow_footprint.png rename to graphics/pokemon/murkrow/footprint.png diff --git a/graphics/pokemon/front_pics/murkrow_still_front_pic.png b/graphics/pokemon/murkrow/front.png similarity index 100% rename from graphics/pokemon/front_pics/murkrow_still_front_pic.png rename to graphics/pokemon/murkrow/front.png diff --git a/graphics/pokemon/icons/murkrow_icon.png b/graphics/pokemon/murkrow/icon.png similarity index 100% rename from graphics/pokemon/icons/murkrow_icon.png rename to graphics/pokemon/murkrow/icon.png diff --git a/graphics/pokemon/palettes/murkrow_palette.pal b/graphics/pokemon/murkrow/normal.pal similarity index 100% rename from graphics/pokemon/palettes/murkrow_palette.pal rename to graphics/pokemon/murkrow/normal.pal diff --git a/graphics/pokemon/palettes/murkrow_shiny_palette.pal b/graphics/pokemon/murkrow/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/murkrow_shiny_palette.pal rename to graphics/pokemon/murkrow/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/natu_front_pic.png b/graphics/pokemon/natu/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/natu_front_pic.png rename to graphics/pokemon/natu/anim_front.png diff --git a/graphics/pokemon/back_pics/natu_back_pic.png b/graphics/pokemon/natu/back.png similarity index 100% rename from graphics/pokemon/back_pics/natu_back_pic.png rename to graphics/pokemon/natu/back.png diff --git a/graphics/pokemon/footprints/natu_footprint.png b/graphics/pokemon/natu/footprint.png similarity index 100% rename from graphics/pokemon/footprints/natu_footprint.png rename to graphics/pokemon/natu/footprint.png diff --git a/graphics/pokemon/front_pics/natu_still_front_pic.png b/graphics/pokemon/natu/front.png similarity index 100% rename from graphics/pokemon/front_pics/natu_still_front_pic.png rename to graphics/pokemon/natu/front.png diff --git a/graphics/pokemon/icons/natu_icon.png b/graphics/pokemon/natu/icon.png similarity index 100% rename from graphics/pokemon/icons/natu_icon.png rename to graphics/pokemon/natu/icon.png diff --git a/graphics/pokemon/palettes/natu_palette.pal b/graphics/pokemon/natu/normal.pal similarity index 100% rename from graphics/pokemon/palettes/natu_palette.pal rename to graphics/pokemon/natu/normal.pal diff --git a/graphics/pokemon/palettes/natu_shiny_palette.pal b/graphics/pokemon/natu/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/natu_shiny_palette.pal rename to graphics/pokemon/natu/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/nidoking_front_pic.png b/graphics/pokemon/nidoking/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/nidoking_front_pic.png rename to graphics/pokemon/nidoking/anim_front.png diff --git a/graphics/pokemon/back_pics/nidoking_back_pic.png b/graphics/pokemon/nidoking/back.png similarity index 100% rename from graphics/pokemon/back_pics/nidoking_back_pic.png rename to graphics/pokemon/nidoking/back.png diff --git a/graphics/pokemon/footprints/nidoking_footprint.png b/graphics/pokemon/nidoking/footprint.png similarity index 100% rename from graphics/pokemon/footprints/nidoking_footprint.png rename to graphics/pokemon/nidoking/footprint.png diff --git a/graphics/pokemon/front_pics/nidoking_still_front_pic.png b/graphics/pokemon/nidoking/front.png similarity index 100% rename from graphics/pokemon/front_pics/nidoking_still_front_pic.png rename to graphics/pokemon/nidoking/front.png diff --git a/graphics/pokemon/icons/nidoking_icon.png b/graphics/pokemon/nidoking/icon.png similarity index 100% rename from graphics/pokemon/icons/nidoking_icon.png rename to graphics/pokemon/nidoking/icon.png diff --git a/graphics/pokemon/palettes/nidoking_palette.pal b/graphics/pokemon/nidoking/normal.pal similarity index 100% rename from graphics/pokemon/palettes/nidoking_palette.pal rename to graphics/pokemon/nidoking/normal.pal diff --git a/graphics/pokemon/palettes/nidoking_shiny_palette.pal b/graphics/pokemon/nidoking/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/nidoking_shiny_palette.pal rename to graphics/pokemon/nidoking/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/nidoqueen_front_pic.png b/graphics/pokemon/nidoqueen/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/nidoqueen_front_pic.png rename to graphics/pokemon/nidoqueen/anim_front.png diff --git a/graphics/pokemon/back_pics/nidoqueen_back_pic.png b/graphics/pokemon/nidoqueen/back.png similarity index 100% rename from graphics/pokemon/back_pics/nidoqueen_back_pic.png rename to graphics/pokemon/nidoqueen/back.png diff --git a/graphics/pokemon/footprints/nidoqueen_footprint.png b/graphics/pokemon/nidoqueen/footprint.png similarity index 100% rename from graphics/pokemon/footprints/nidoqueen_footprint.png rename to graphics/pokemon/nidoqueen/footprint.png diff --git a/graphics/pokemon/front_pics/nidoqueen_still_front_pic.png b/graphics/pokemon/nidoqueen/front.png similarity index 100% rename from graphics/pokemon/front_pics/nidoqueen_still_front_pic.png rename to graphics/pokemon/nidoqueen/front.png diff --git a/graphics/pokemon/icons/nidoqueen_icon.png b/graphics/pokemon/nidoqueen/icon.png similarity index 100% rename from graphics/pokemon/icons/nidoqueen_icon.png rename to graphics/pokemon/nidoqueen/icon.png diff --git a/graphics/pokemon/palettes/nidoqueen_palette.pal b/graphics/pokemon/nidoqueen/normal.pal similarity index 100% rename from graphics/pokemon/palettes/nidoqueen_palette.pal rename to graphics/pokemon/nidoqueen/normal.pal diff --git a/graphics/pokemon/palettes/nidoqueen_shiny_palette.pal b/graphics/pokemon/nidoqueen/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/nidoqueen_shiny_palette.pal rename to graphics/pokemon/nidoqueen/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/nidoran_f_front_pic.png b/graphics/pokemon/nidoran_f/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/nidoran_f_front_pic.png rename to graphics/pokemon/nidoran_f/anim_front.png diff --git a/graphics/pokemon/back_pics/nidoran_f_back_pic.png b/graphics/pokemon/nidoran_f/back.png similarity index 100% rename from graphics/pokemon/back_pics/nidoran_f_back_pic.png rename to graphics/pokemon/nidoran_f/back.png diff --git a/graphics/pokemon/footprints/nidoran_f_footprint.png b/graphics/pokemon/nidoran_f/footprint.png similarity index 100% rename from graphics/pokemon/footprints/nidoran_f_footprint.png rename to graphics/pokemon/nidoran_f/footprint.png diff --git a/graphics/pokemon/front_pics/nidoran_f_still_front_pic.png b/graphics/pokemon/nidoran_f/front.png similarity index 100% rename from graphics/pokemon/front_pics/nidoran_f_still_front_pic.png rename to graphics/pokemon/nidoran_f/front.png diff --git a/graphics/pokemon/icons/nidoran_f_icon.png b/graphics/pokemon/nidoran_f/icon.png similarity index 100% rename from graphics/pokemon/icons/nidoran_f_icon.png rename to graphics/pokemon/nidoran_f/icon.png diff --git a/graphics/pokemon/palettes/nidoran_f_palette.pal b/graphics/pokemon/nidoran_f/normal.pal similarity index 100% rename from graphics/pokemon/palettes/nidoran_f_palette.pal rename to graphics/pokemon/nidoran_f/normal.pal diff --git a/graphics/pokemon/palettes/nidoran_f_shiny_palette.pal b/graphics/pokemon/nidoran_f/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/nidoran_f_shiny_palette.pal rename to graphics/pokemon/nidoran_f/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/nidoran_m_front_pic.png b/graphics/pokemon/nidoran_m/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/nidoran_m_front_pic.png rename to graphics/pokemon/nidoran_m/anim_front.png diff --git a/graphics/pokemon/back_pics/nidoran_m_back_pic.png b/graphics/pokemon/nidoran_m/back.png similarity index 100% rename from graphics/pokemon/back_pics/nidoran_m_back_pic.png rename to graphics/pokemon/nidoran_m/back.png diff --git a/graphics/pokemon/footprints/nidoran_m_footprint.png b/graphics/pokemon/nidoran_m/footprint.png similarity index 100% rename from graphics/pokemon/footprints/nidoran_m_footprint.png rename to graphics/pokemon/nidoran_m/footprint.png diff --git a/graphics/pokemon/front_pics/nidoran_m_still_front_pic.png b/graphics/pokemon/nidoran_m/front.png similarity index 100% rename from graphics/pokemon/front_pics/nidoran_m_still_front_pic.png rename to graphics/pokemon/nidoran_m/front.png diff --git a/graphics/pokemon/icons/nidoran_m_icon.png b/graphics/pokemon/nidoran_m/icon.png similarity index 100% rename from graphics/pokemon/icons/nidoran_m_icon.png rename to graphics/pokemon/nidoran_m/icon.png diff --git a/graphics/pokemon/palettes/nidoran_m_palette.pal b/graphics/pokemon/nidoran_m/normal.pal similarity index 100% rename from graphics/pokemon/palettes/nidoran_m_palette.pal rename to graphics/pokemon/nidoran_m/normal.pal diff --git a/graphics/pokemon/palettes/nidoran_m_shiny_palette.pal b/graphics/pokemon/nidoran_m/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/nidoran_m_shiny_palette.pal rename to graphics/pokemon/nidoran_m/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/nidorina_front_pic.png b/graphics/pokemon/nidorina/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/nidorina_front_pic.png rename to graphics/pokemon/nidorina/anim_front.png diff --git a/graphics/pokemon/back_pics/nidorina_back_pic.png b/graphics/pokemon/nidorina/back.png similarity index 100% rename from graphics/pokemon/back_pics/nidorina_back_pic.png rename to graphics/pokemon/nidorina/back.png diff --git a/graphics/pokemon/footprints/nidorina_footprint.png b/graphics/pokemon/nidorina/footprint.png similarity index 100% rename from graphics/pokemon/footprints/nidorina_footprint.png rename to graphics/pokemon/nidorina/footprint.png diff --git a/graphics/pokemon/front_pics/nidorina_still_front_pic.png b/graphics/pokemon/nidorina/front.png similarity index 100% rename from graphics/pokemon/front_pics/nidorina_still_front_pic.png rename to graphics/pokemon/nidorina/front.png diff --git a/graphics/pokemon/icons/nidorina_icon.png b/graphics/pokemon/nidorina/icon.png similarity index 100% rename from graphics/pokemon/icons/nidorina_icon.png rename to graphics/pokemon/nidorina/icon.png diff --git a/graphics/pokemon/palettes/nidorina_palette.pal b/graphics/pokemon/nidorina/normal.pal similarity index 100% rename from graphics/pokemon/palettes/nidorina_palette.pal rename to graphics/pokemon/nidorina/normal.pal diff --git a/graphics/pokemon/palettes/nidorina_shiny_palette.pal b/graphics/pokemon/nidorina/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/nidorina_shiny_palette.pal rename to graphics/pokemon/nidorina/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/nidorino_front_pic.png b/graphics/pokemon/nidorino/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/nidorino_front_pic.png rename to graphics/pokemon/nidorino/anim_front.png diff --git a/graphics/pokemon/back_pics/nidorino_back_pic.png b/graphics/pokemon/nidorino/back.png similarity index 100% rename from graphics/pokemon/back_pics/nidorino_back_pic.png rename to graphics/pokemon/nidorino/back.png diff --git a/graphics/pokemon/footprints/nidorino_footprint.png b/graphics/pokemon/nidorino/footprint.png similarity index 100% rename from graphics/pokemon/footprints/nidorino_footprint.png rename to graphics/pokemon/nidorino/footprint.png diff --git a/graphics/pokemon/front_pics/nidorino_still_front_pic.png b/graphics/pokemon/nidorino/front.png similarity index 100% rename from graphics/pokemon/front_pics/nidorino_still_front_pic.png rename to graphics/pokemon/nidorino/front.png diff --git a/graphics/pokemon/icons/nidorino_icon.png b/graphics/pokemon/nidorino/icon.png similarity index 100% rename from graphics/pokemon/icons/nidorino_icon.png rename to graphics/pokemon/nidorino/icon.png diff --git a/graphics/pokemon/palettes/nidorino_palette.pal b/graphics/pokemon/nidorino/normal.pal similarity index 100% rename from graphics/pokemon/palettes/nidorino_palette.pal rename to graphics/pokemon/nidorino/normal.pal diff --git a/graphics/pokemon/palettes/nidorino_shiny_palette.pal b/graphics/pokemon/nidorino/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/nidorino_shiny_palette.pal rename to graphics/pokemon/nidorino/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/nincada_front_pic.png b/graphics/pokemon/nincada/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/nincada_front_pic.png rename to graphics/pokemon/nincada/anim_front.png diff --git a/graphics/pokemon/back_pics/nincada_back_pic.png b/graphics/pokemon/nincada/back.png similarity index 100% rename from graphics/pokemon/back_pics/nincada_back_pic.png rename to graphics/pokemon/nincada/back.png diff --git a/graphics/pokemon/footprints/nincada_footprint.png b/graphics/pokemon/nincada/footprint.png similarity index 100% rename from graphics/pokemon/footprints/nincada_footprint.png rename to graphics/pokemon/nincada/footprint.png diff --git a/graphics/pokemon/front_pics/nincada_still_front_pic.png b/graphics/pokemon/nincada/front.png similarity index 100% rename from graphics/pokemon/front_pics/nincada_still_front_pic.png rename to graphics/pokemon/nincada/front.png diff --git a/graphics/pokemon/icons/nincada_icon.png b/graphics/pokemon/nincada/icon.png similarity index 100% rename from graphics/pokemon/icons/nincada_icon.png rename to graphics/pokemon/nincada/icon.png diff --git a/graphics/pokemon/palettes/nincada_palette.pal b/graphics/pokemon/nincada/normal.pal similarity index 100% rename from graphics/pokemon/palettes/nincada_palette.pal rename to graphics/pokemon/nincada/normal.pal diff --git a/graphics/pokemon/palettes/nincada_shiny_palette.pal b/graphics/pokemon/nincada/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/nincada_shiny_palette.pal rename to graphics/pokemon/nincada/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/ninetales_front_pic.png b/graphics/pokemon/ninetales/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/ninetales_front_pic.png rename to graphics/pokemon/ninetales/anim_front.png diff --git a/graphics/pokemon/back_pics/ninetales_back_pic.png b/graphics/pokemon/ninetales/back.png similarity index 100% rename from graphics/pokemon/back_pics/ninetales_back_pic.png rename to graphics/pokemon/ninetales/back.png diff --git a/graphics/pokemon/footprints/ninetales_footprint.png b/graphics/pokemon/ninetales/footprint.png similarity index 100% rename from graphics/pokemon/footprints/ninetales_footprint.png rename to graphics/pokemon/ninetales/footprint.png diff --git a/graphics/pokemon/front_pics/ninetales_still_front_pic.png b/graphics/pokemon/ninetales/front.png similarity index 100% rename from graphics/pokemon/front_pics/ninetales_still_front_pic.png rename to graphics/pokemon/ninetales/front.png diff --git a/graphics/pokemon/icons/ninetales_icon.png b/graphics/pokemon/ninetales/icon.png similarity index 100% rename from graphics/pokemon/icons/ninetales_icon.png rename to graphics/pokemon/ninetales/icon.png diff --git a/graphics/pokemon/palettes/ninetales_palette.pal b/graphics/pokemon/ninetales/normal.pal similarity index 100% rename from graphics/pokemon/palettes/ninetales_palette.pal rename to graphics/pokemon/ninetales/normal.pal diff --git a/graphics/pokemon/palettes/ninetales_shiny_palette.pal b/graphics/pokemon/ninetales/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/ninetales_shiny_palette.pal rename to graphics/pokemon/ninetales/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/ninjask_front_pic.png b/graphics/pokemon/ninjask/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/ninjask_front_pic.png rename to graphics/pokemon/ninjask/anim_front.png diff --git a/graphics/pokemon/back_pics/ninjask_back_pic.png b/graphics/pokemon/ninjask/back.png similarity index 100% rename from graphics/pokemon/back_pics/ninjask_back_pic.png rename to graphics/pokemon/ninjask/back.png diff --git a/graphics/pokemon/footprints/ninjask_footprint.png b/graphics/pokemon/ninjask/footprint.png similarity index 100% rename from graphics/pokemon/footprints/ninjask_footprint.png rename to graphics/pokemon/ninjask/footprint.png diff --git a/graphics/pokemon/front_pics/ninjask_still_front_pic.png b/graphics/pokemon/ninjask/front.png similarity index 100% rename from graphics/pokemon/front_pics/ninjask_still_front_pic.png rename to graphics/pokemon/ninjask/front.png diff --git a/graphics/pokemon/icons/ninjask_icon.png b/graphics/pokemon/ninjask/icon.png similarity index 100% rename from graphics/pokemon/icons/ninjask_icon.png rename to graphics/pokemon/ninjask/icon.png diff --git a/graphics/pokemon/palettes/ninjask_palette.pal b/graphics/pokemon/ninjask/normal.pal similarity index 100% rename from graphics/pokemon/palettes/ninjask_palette.pal rename to graphics/pokemon/ninjask/normal.pal diff --git a/graphics/pokemon/palettes/ninjask_shiny_palette.pal b/graphics/pokemon/ninjask/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/ninjask_shiny_palette.pal rename to graphics/pokemon/ninjask/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/noctowl_front_pic.png b/graphics/pokemon/noctowl/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/noctowl_front_pic.png rename to graphics/pokemon/noctowl/anim_front.png diff --git a/graphics/pokemon/back_pics/noctowl_back_pic.png b/graphics/pokemon/noctowl/back.png similarity index 100% rename from graphics/pokemon/back_pics/noctowl_back_pic.png rename to graphics/pokemon/noctowl/back.png diff --git a/graphics/pokemon/footprints/noctowl_footprint.png b/graphics/pokemon/noctowl/footprint.png similarity index 100% rename from graphics/pokemon/footprints/noctowl_footprint.png rename to graphics/pokemon/noctowl/footprint.png diff --git a/graphics/pokemon/front_pics/noctowl_still_front_pic.png b/graphics/pokemon/noctowl/front.png similarity index 100% rename from graphics/pokemon/front_pics/noctowl_still_front_pic.png rename to graphics/pokemon/noctowl/front.png diff --git a/graphics/pokemon/icons/noctowl_icon.png b/graphics/pokemon/noctowl/icon.png similarity index 100% rename from graphics/pokemon/icons/noctowl_icon.png rename to graphics/pokemon/noctowl/icon.png diff --git a/graphics/pokemon/palettes/noctowl_palette.pal b/graphics/pokemon/noctowl/normal.pal similarity index 100% rename from graphics/pokemon/palettes/noctowl_palette.pal rename to graphics/pokemon/noctowl/normal.pal diff --git a/graphics/pokemon/palettes/noctowl_shiny_palette.pal b/graphics/pokemon/noctowl/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/noctowl_shiny_palette.pal rename to graphics/pokemon/noctowl/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/nosepass_front_pic.png b/graphics/pokemon/nosepass/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/nosepass_front_pic.png rename to graphics/pokemon/nosepass/anim_front.png diff --git a/graphics/pokemon/back_pics/nosepass_back_pic.png b/graphics/pokemon/nosepass/back.png similarity index 100% rename from graphics/pokemon/back_pics/nosepass_back_pic.png rename to graphics/pokemon/nosepass/back.png diff --git a/graphics/pokemon/footprints/nosepass_footprint.png b/graphics/pokemon/nosepass/footprint.png similarity index 100% rename from graphics/pokemon/footprints/nosepass_footprint.png rename to graphics/pokemon/nosepass/footprint.png diff --git a/graphics/pokemon/front_pics/nosepass_still_front_pic.png b/graphics/pokemon/nosepass/front.png similarity index 100% rename from graphics/pokemon/front_pics/nosepass_still_front_pic.png rename to graphics/pokemon/nosepass/front.png diff --git a/graphics/pokemon/icons/nosepass_icon.png b/graphics/pokemon/nosepass/icon.png similarity index 100% rename from graphics/pokemon/icons/nosepass_icon.png rename to graphics/pokemon/nosepass/icon.png diff --git a/graphics/pokemon/palettes/nosepass_palette.pal b/graphics/pokemon/nosepass/normal.pal similarity index 100% rename from graphics/pokemon/palettes/nosepass_palette.pal rename to graphics/pokemon/nosepass/normal.pal diff --git a/graphics/pokemon/palettes/nosepass_shiny_palette.pal b/graphics/pokemon/nosepass/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/nosepass_shiny_palette.pal rename to graphics/pokemon/nosepass/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/numel_front_pic.png b/graphics/pokemon/numel/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/numel_front_pic.png rename to graphics/pokemon/numel/anim_front.png diff --git a/graphics/pokemon/back_pics/numel_back_pic.png b/graphics/pokemon/numel/back.png similarity index 100% rename from graphics/pokemon/back_pics/numel_back_pic.png rename to graphics/pokemon/numel/back.png diff --git a/graphics/pokemon/footprints/numel_footprint.png b/graphics/pokemon/numel/footprint.png similarity index 100% rename from graphics/pokemon/footprints/numel_footprint.png rename to graphics/pokemon/numel/footprint.png diff --git a/graphics/pokemon/front_pics/numel_still_front_pic.png b/graphics/pokemon/numel/front.png similarity index 100% rename from graphics/pokemon/front_pics/numel_still_front_pic.png rename to graphics/pokemon/numel/front.png diff --git a/graphics/pokemon/icons/numel_icon.png b/graphics/pokemon/numel/icon.png similarity index 100% rename from graphics/pokemon/icons/numel_icon.png rename to graphics/pokemon/numel/icon.png diff --git a/graphics/pokemon/palettes/numel_palette.pal b/graphics/pokemon/numel/normal.pal similarity index 100% rename from graphics/pokemon/palettes/numel_palette.pal rename to graphics/pokemon/numel/normal.pal diff --git a/graphics/pokemon/palettes/numel_shiny_palette.pal b/graphics/pokemon/numel/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/numel_shiny_palette.pal rename to graphics/pokemon/numel/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/nuzleaf_front_pic.png b/graphics/pokemon/nuzleaf/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/nuzleaf_front_pic.png rename to graphics/pokemon/nuzleaf/anim_front.png diff --git a/graphics/pokemon/back_pics/nuzleaf_back_pic.png b/graphics/pokemon/nuzleaf/back.png similarity index 100% rename from graphics/pokemon/back_pics/nuzleaf_back_pic.png rename to graphics/pokemon/nuzleaf/back.png diff --git a/graphics/pokemon/footprints/nuzleaf_footprint.png b/graphics/pokemon/nuzleaf/footprint.png similarity index 100% rename from graphics/pokemon/footprints/nuzleaf_footprint.png rename to graphics/pokemon/nuzleaf/footprint.png diff --git a/graphics/pokemon/front_pics/nuzleaf_still_front_pic.png b/graphics/pokemon/nuzleaf/front.png similarity index 100% rename from graphics/pokemon/front_pics/nuzleaf_still_front_pic.png rename to graphics/pokemon/nuzleaf/front.png diff --git a/graphics/pokemon/icons/nuzleaf_icon.png b/graphics/pokemon/nuzleaf/icon.png similarity index 100% rename from graphics/pokemon/icons/nuzleaf_icon.png rename to graphics/pokemon/nuzleaf/icon.png diff --git a/graphics/pokemon/palettes/nuzleaf_palette.pal b/graphics/pokemon/nuzleaf/normal.pal similarity index 100% rename from graphics/pokemon/palettes/nuzleaf_palette.pal rename to graphics/pokemon/nuzleaf/normal.pal diff --git a/graphics/pokemon/palettes/nuzleaf_shiny_palette.pal b/graphics/pokemon/nuzleaf/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/nuzleaf_shiny_palette.pal rename to graphics/pokemon/nuzleaf/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/octillery_front_pic.png b/graphics/pokemon/octillery/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/octillery_front_pic.png rename to graphics/pokemon/octillery/anim_front.png diff --git a/graphics/pokemon/back_pics/octillery_back_pic.png b/graphics/pokemon/octillery/back.png similarity index 100% rename from graphics/pokemon/back_pics/octillery_back_pic.png rename to graphics/pokemon/octillery/back.png diff --git a/graphics/pokemon/footprints/octillery_footprint.png b/graphics/pokemon/octillery/footprint.png similarity index 100% rename from graphics/pokemon/footprints/octillery_footprint.png rename to graphics/pokemon/octillery/footprint.png diff --git a/graphics/pokemon/front_pics/octillery_still_front_pic.png b/graphics/pokemon/octillery/front.png similarity index 100% rename from graphics/pokemon/front_pics/octillery_still_front_pic.png rename to graphics/pokemon/octillery/front.png diff --git a/graphics/pokemon/icons/octillery_icon.png b/graphics/pokemon/octillery/icon.png similarity index 100% rename from graphics/pokemon/icons/octillery_icon.png rename to graphics/pokemon/octillery/icon.png diff --git a/graphics/pokemon/palettes/octillery_palette.pal b/graphics/pokemon/octillery/normal.pal similarity index 100% rename from graphics/pokemon/palettes/octillery_palette.pal rename to graphics/pokemon/octillery/normal.pal diff --git a/graphics/pokemon/palettes/octillery_shiny_palette.pal b/graphics/pokemon/octillery/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/octillery_shiny_palette.pal rename to graphics/pokemon/octillery/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/oddish_front_pic.png b/graphics/pokemon/oddish/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/oddish_front_pic.png rename to graphics/pokemon/oddish/anim_front.png diff --git a/graphics/pokemon/back_pics/oddish_back_pic.png b/graphics/pokemon/oddish/back.png similarity index 100% rename from graphics/pokemon/back_pics/oddish_back_pic.png rename to graphics/pokemon/oddish/back.png diff --git a/graphics/pokemon/footprints/oddish_footprint.png b/graphics/pokemon/oddish/footprint.png similarity index 100% rename from graphics/pokemon/footprints/oddish_footprint.png rename to graphics/pokemon/oddish/footprint.png diff --git a/graphics/pokemon/front_pics/oddish_still_front_pic.png b/graphics/pokemon/oddish/front.png similarity index 100% rename from graphics/pokemon/front_pics/oddish_still_front_pic.png rename to graphics/pokemon/oddish/front.png diff --git a/graphics/pokemon/icons/oddish_icon.png b/graphics/pokemon/oddish/icon.png similarity index 100% rename from graphics/pokemon/icons/oddish_icon.png rename to graphics/pokemon/oddish/icon.png diff --git a/graphics/pokemon/palettes/oddish_palette.pal b/graphics/pokemon/oddish/normal.pal similarity index 100% rename from graphics/pokemon/palettes/oddish_palette.pal rename to graphics/pokemon/oddish/normal.pal diff --git a/graphics/pokemon/palettes/oddish_shiny_palette.pal b/graphics/pokemon/oddish/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/oddish_shiny_palette.pal rename to graphics/pokemon/oddish/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/omanyte_front_pic.png b/graphics/pokemon/omanyte/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/omanyte_front_pic.png rename to graphics/pokemon/omanyte/anim_front.png diff --git a/graphics/pokemon/back_pics/omanyte_back_pic.png b/graphics/pokemon/omanyte/back.png similarity index 100% rename from graphics/pokemon/back_pics/omanyte_back_pic.png rename to graphics/pokemon/omanyte/back.png diff --git a/graphics/pokemon/footprints/omanyte_footprint.png b/graphics/pokemon/omanyte/footprint.png similarity index 100% rename from graphics/pokemon/footprints/omanyte_footprint.png rename to graphics/pokemon/omanyte/footprint.png diff --git a/graphics/pokemon/front_pics/omanyte_still_front_pic.png b/graphics/pokemon/omanyte/front.png similarity index 100% rename from graphics/pokemon/front_pics/omanyte_still_front_pic.png rename to graphics/pokemon/omanyte/front.png diff --git a/graphics/pokemon/icons/omanyte_icon.png b/graphics/pokemon/omanyte/icon.png similarity index 100% rename from graphics/pokemon/icons/omanyte_icon.png rename to graphics/pokemon/omanyte/icon.png diff --git a/graphics/pokemon/palettes/omanyte_palette.pal b/graphics/pokemon/omanyte/normal.pal similarity index 100% rename from graphics/pokemon/palettes/omanyte_palette.pal rename to graphics/pokemon/omanyte/normal.pal diff --git a/graphics/pokemon/palettes/omanyte_shiny_palette.pal b/graphics/pokemon/omanyte/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/omanyte_shiny_palette.pal rename to graphics/pokemon/omanyte/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/omastar_front_pic.png b/graphics/pokemon/omastar/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/omastar_front_pic.png rename to graphics/pokemon/omastar/anim_front.png diff --git a/graphics/pokemon/back_pics/omastar_back_pic.png b/graphics/pokemon/omastar/back.png similarity index 100% rename from graphics/pokemon/back_pics/omastar_back_pic.png rename to graphics/pokemon/omastar/back.png diff --git a/graphics/pokemon/footprints/omastar_footprint.png b/graphics/pokemon/omastar/footprint.png similarity index 100% rename from graphics/pokemon/footprints/omastar_footprint.png rename to graphics/pokemon/omastar/footprint.png diff --git a/graphics/pokemon/front_pics/omastar_still_front_pic.png b/graphics/pokemon/omastar/front.png similarity index 100% rename from graphics/pokemon/front_pics/omastar_still_front_pic.png rename to graphics/pokemon/omastar/front.png diff --git a/graphics/pokemon/icons/omastar_icon.png b/graphics/pokemon/omastar/icon.png similarity index 100% rename from graphics/pokemon/icons/omastar_icon.png rename to graphics/pokemon/omastar/icon.png diff --git a/graphics/pokemon/palettes/omastar_palette.pal b/graphics/pokemon/omastar/normal.pal similarity index 100% rename from graphics/pokemon/palettes/omastar_palette.pal rename to graphics/pokemon/omastar/normal.pal diff --git a/graphics/pokemon/palettes/omastar_shiny_palette.pal b/graphics/pokemon/omastar/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/omastar_shiny_palette.pal rename to graphics/pokemon/omastar/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/onix_front_pic.png b/graphics/pokemon/onix/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/onix_front_pic.png rename to graphics/pokemon/onix/anim_front.png diff --git a/graphics/pokemon/back_pics/onix_back_pic.png b/graphics/pokemon/onix/back.png similarity index 100% rename from graphics/pokemon/back_pics/onix_back_pic.png rename to graphics/pokemon/onix/back.png diff --git a/graphics/pokemon/footprints/onix_footprint.png b/graphics/pokemon/onix/footprint.png similarity index 100% rename from graphics/pokemon/footprints/onix_footprint.png rename to graphics/pokemon/onix/footprint.png diff --git a/graphics/pokemon/front_pics/onix_still_front_pic.png b/graphics/pokemon/onix/front.png similarity index 100% rename from graphics/pokemon/front_pics/onix_still_front_pic.png rename to graphics/pokemon/onix/front.png diff --git a/graphics/pokemon/icons/onix_icon.png b/graphics/pokemon/onix/icon.png similarity index 100% rename from graphics/pokemon/icons/onix_icon.png rename to graphics/pokemon/onix/icon.png diff --git a/graphics/pokemon/palettes/onix_palette.pal b/graphics/pokemon/onix/normal.pal similarity index 100% rename from graphics/pokemon/palettes/onix_palette.pal rename to graphics/pokemon/onix/normal.pal diff --git a/graphics/pokemon/palettes/onix_shiny_palette.pal b/graphics/pokemon/onix/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/onix_shiny_palette.pal rename to graphics/pokemon/onix/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/paras_front_pic.png b/graphics/pokemon/paras/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/paras_front_pic.png rename to graphics/pokemon/paras/anim_front.png diff --git a/graphics/pokemon/back_pics/paras_back_pic.png b/graphics/pokemon/paras/back.png similarity index 100% rename from graphics/pokemon/back_pics/paras_back_pic.png rename to graphics/pokemon/paras/back.png diff --git a/graphics/pokemon/footprints/paras_footprint.png b/graphics/pokemon/paras/footprint.png similarity index 100% rename from graphics/pokemon/footprints/paras_footprint.png rename to graphics/pokemon/paras/footprint.png diff --git a/graphics/pokemon/front_pics/paras_still_front_pic.png b/graphics/pokemon/paras/front.png similarity index 100% rename from graphics/pokemon/front_pics/paras_still_front_pic.png rename to graphics/pokemon/paras/front.png diff --git a/graphics/pokemon/icons/paras_icon.png b/graphics/pokemon/paras/icon.png similarity index 100% rename from graphics/pokemon/icons/paras_icon.png rename to graphics/pokemon/paras/icon.png diff --git a/graphics/pokemon/palettes/paras_palette.pal b/graphics/pokemon/paras/normal.pal similarity index 100% rename from graphics/pokemon/palettes/paras_palette.pal rename to graphics/pokemon/paras/normal.pal diff --git a/graphics/pokemon/palettes/paras_shiny_palette.pal b/graphics/pokemon/paras/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/paras_shiny_palette.pal rename to graphics/pokemon/paras/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/parasect_front_pic.png b/graphics/pokemon/parasect/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/parasect_front_pic.png rename to graphics/pokemon/parasect/anim_front.png diff --git a/graphics/pokemon/back_pics/parasect_back_pic.png b/graphics/pokemon/parasect/back.png similarity index 100% rename from graphics/pokemon/back_pics/parasect_back_pic.png rename to graphics/pokemon/parasect/back.png diff --git a/graphics/pokemon/footprints/parasect_footprint.png b/graphics/pokemon/parasect/footprint.png similarity index 100% rename from graphics/pokemon/footprints/parasect_footprint.png rename to graphics/pokemon/parasect/footprint.png diff --git a/graphics/pokemon/front_pics/parasect_still_front_pic.png b/graphics/pokemon/parasect/front.png similarity index 100% rename from graphics/pokemon/front_pics/parasect_still_front_pic.png rename to graphics/pokemon/parasect/front.png diff --git a/graphics/pokemon/icons/parasect_icon.png b/graphics/pokemon/parasect/icon.png similarity index 100% rename from graphics/pokemon/icons/parasect_icon.png rename to graphics/pokemon/parasect/icon.png diff --git a/graphics/pokemon/palettes/parasect_palette.pal b/graphics/pokemon/parasect/normal.pal similarity index 100% rename from graphics/pokemon/palettes/parasect_palette.pal rename to graphics/pokemon/parasect/normal.pal diff --git a/graphics/pokemon/palettes/parasect_shiny_palette.pal b/graphics/pokemon/parasect/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/parasect_shiny_palette.pal rename to graphics/pokemon/parasect/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/pelipper_front_pic.png b/graphics/pokemon/pelipper/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/pelipper_front_pic.png rename to graphics/pokemon/pelipper/anim_front.png diff --git a/graphics/pokemon/back_pics/pelipper_back_pic.png b/graphics/pokemon/pelipper/back.png similarity index 100% rename from graphics/pokemon/back_pics/pelipper_back_pic.png rename to graphics/pokemon/pelipper/back.png diff --git a/graphics/pokemon/footprints/pelipper_footprint.png b/graphics/pokemon/pelipper/footprint.png similarity index 100% rename from graphics/pokemon/footprints/pelipper_footprint.png rename to graphics/pokemon/pelipper/footprint.png diff --git a/graphics/pokemon/front_pics/pelipper_still_front_pic.png b/graphics/pokemon/pelipper/front.png similarity index 100% rename from graphics/pokemon/front_pics/pelipper_still_front_pic.png rename to graphics/pokemon/pelipper/front.png diff --git a/graphics/pokemon/icons/pelipper_icon.png b/graphics/pokemon/pelipper/icon.png similarity index 100% rename from graphics/pokemon/icons/pelipper_icon.png rename to graphics/pokemon/pelipper/icon.png diff --git a/graphics/pokemon/palettes/pelipper_palette.pal b/graphics/pokemon/pelipper/normal.pal similarity index 100% rename from graphics/pokemon/palettes/pelipper_palette.pal rename to graphics/pokemon/pelipper/normal.pal diff --git a/graphics/pokemon/palettes/pelipper_shiny_palette.pal b/graphics/pokemon/pelipper/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/pelipper_shiny_palette.pal rename to graphics/pokemon/pelipper/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/persian_front_pic.png b/graphics/pokemon/persian/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/persian_front_pic.png rename to graphics/pokemon/persian/anim_front.png diff --git a/graphics/pokemon/back_pics/persian_back_pic.png b/graphics/pokemon/persian/back.png similarity index 100% rename from graphics/pokemon/back_pics/persian_back_pic.png rename to graphics/pokemon/persian/back.png diff --git a/graphics/pokemon/footprints/persian_footprint.png b/graphics/pokemon/persian/footprint.png similarity index 100% rename from graphics/pokemon/footprints/persian_footprint.png rename to graphics/pokemon/persian/footprint.png diff --git a/graphics/pokemon/front_pics/persian_still_front_pic.png b/graphics/pokemon/persian/front.png similarity index 100% rename from graphics/pokemon/front_pics/persian_still_front_pic.png rename to graphics/pokemon/persian/front.png diff --git a/graphics/pokemon/icons/persian_icon.png b/graphics/pokemon/persian/icon.png similarity index 100% rename from graphics/pokemon/icons/persian_icon.png rename to graphics/pokemon/persian/icon.png diff --git a/graphics/pokemon/palettes/persian_palette.pal b/graphics/pokemon/persian/normal.pal similarity index 100% rename from graphics/pokemon/palettes/persian_palette.pal rename to graphics/pokemon/persian/normal.pal diff --git a/graphics/pokemon/palettes/persian_shiny_palette.pal b/graphics/pokemon/persian/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/persian_shiny_palette.pal rename to graphics/pokemon/persian/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/phanpy_front_pic.png b/graphics/pokemon/phanpy/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/phanpy_front_pic.png rename to graphics/pokemon/phanpy/anim_front.png diff --git a/graphics/pokemon/back_pics/phanpy_back_pic.png b/graphics/pokemon/phanpy/back.png similarity index 100% rename from graphics/pokemon/back_pics/phanpy_back_pic.png rename to graphics/pokemon/phanpy/back.png diff --git a/graphics/pokemon/footprints/phanpy_footprint.png b/graphics/pokemon/phanpy/footprint.png similarity index 100% rename from graphics/pokemon/footprints/phanpy_footprint.png rename to graphics/pokemon/phanpy/footprint.png diff --git a/graphics/pokemon/front_pics/phanpy_still_front_pic.png b/graphics/pokemon/phanpy/front.png similarity index 100% rename from graphics/pokemon/front_pics/phanpy_still_front_pic.png rename to graphics/pokemon/phanpy/front.png diff --git a/graphics/pokemon/icons/phanpy_icon.png b/graphics/pokemon/phanpy/icon.png similarity index 100% rename from graphics/pokemon/icons/phanpy_icon.png rename to graphics/pokemon/phanpy/icon.png diff --git a/graphics/pokemon/palettes/phanpy_palette.pal b/graphics/pokemon/phanpy/normal.pal similarity index 100% rename from graphics/pokemon/palettes/phanpy_palette.pal rename to graphics/pokemon/phanpy/normal.pal diff --git a/graphics/pokemon/palettes/phanpy_shiny_palette.pal b/graphics/pokemon/phanpy/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/phanpy_shiny_palette.pal rename to graphics/pokemon/phanpy/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/pichu_front_pic.png b/graphics/pokemon/pichu/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/pichu_front_pic.png rename to graphics/pokemon/pichu/anim_front.png diff --git a/graphics/pokemon/back_pics/pichu_back_pic.png b/graphics/pokemon/pichu/back.png similarity index 100% rename from graphics/pokemon/back_pics/pichu_back_pic.png rename to graphics/pokemon/pichu/back.png diff --git a/graphics/pokemon/footprints/pichu_footprint.png b/graphics/pokemon/pichu/footprint.png similarity index 100% rename from graphics/pokemon/footprints/pichu_footprint.png rename to graphics/pokemon/pichu/footprint.png diff --git a/graphics/pokemon/front_pics/pichu_still_front_pic.png b/graphics/pokemon/pichu/front.png similarity index 100% rename from graphics/pokemon/front_pics/pichu_still_front_pic.png rename to graphics/pokemon/pichu/front.png diff --git a/graphics/pokemon/icons/pichu_icon.png b/graphics/pokemon/pichu/icon.png similarity index 100% rename from graphics/pokemon/icons/pichu_icon.png rename to graphics/pokemon/pichu/icon.png diff --git a/graphics/pokemon/palettes/pichu_palette.pal b/graphics/pokemon/pichu/normal.pal similarity index 100% rename from graphics/pokemon/palettes/pichu_palette.pal rename to graphics/pokemon/pichu/normal.pal diff --git a/graphics/pokemon/palettes/pichu_shiny_palette.pal b/graphics/pokemon/pichu/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/pichu_shiny_palette.pal rename to graphics/pokemon/pichu/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/pidgeot_front_pic.png b/graphics/pokemon/pidgeot/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/pidgeot_front_pic.png rename to graphics/pokemon/pidgeot/anim_front.png diff --git a/graphics/pokemon/back_pics/pidgeot_back_pic.png b/graphics/pokemon/pidgeot/back.png similarity index 100% rename from graphics/pokemon/back_pics/pidgeot_back_pic.png rename to graphics/pokemon/pidgeot/back.png diff --git a/graphics/pokemon/footprints/pidgeot_footprint.png b/graphics/pokemon/pidgeot/footprint.png similarity index 100% rename from graphics/pokemon/footprints/pidgeot_footprint.png rename to graphics/pokemon/pidgeot/footprint.png diff --git a/graphics/pokemon/front_pics/pidgeot_still_front_pic.png b/graphics/pokemon/pidgeot/front.png similarity index 100% rename from graphics/pokemon/front_pics/pidgeot_still_front_pic.png rename to graphics/pokemon/pidgeot/front.png diff --git a/graphics/pokemon/icons/pidgeot_icon.png b/graphics/pokemon/pidgeot/icon.png similarity index 100% rename from graphics/pokemon/icons/pidgeot_icon.png rename to graphics/pokemon/pidgeot/icon.png diff --git a/graphics/pokemon/palettes/pidgeot_palette.pal b/graphics/pokemon/pidgeot/normal.pal similarity index 100% rename from graphics/pokemon/palettes/pidgeot_palette.pal rename to graphics/pokemon/pidgeot/normal.pal diff --git a/graphics/pokemon/palettes/pidgeot_shiny_palette.pal b/graphics/pokemon/pidgeot/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/pidgeot_shiny_palette.pal rename to graphics/pokemon/pidgeot/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/pidgeotto_front_pic.png b/graphics/pokemon/pidgeotto/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/pidgeotto_front_pic.png rename to graphics/pokemon/pidgeotto/anim_front.png diff --git a/graphics/pokemon/back_pics/pidgeotto_back_pic.png b/graphics/pokemon/pidgeotto/back.png similarity index 100% rename from graphics/pokemon/back_pics/pidgeotto_back_pic.png rename to graphics/pokemon/pidgeotto/back.png diff --git a/graphics/pokemon/footprints/pidgeotto_footprint.png b/graphics/pokemon/pidgeotto/footprint.png similarity index 100% rename from graphics/pokemon/footprints/pidgeotto_footprint.png rename to graphics/pokemon/pidgeotto/footprint.png diff --git a/graphics/pokemon/front_pics/pidgeotto_still_front_pic.png b/graphics/pokemon/pidgeotto/front.png similarity index 100% rename from graphics/pokemon/front_pics/pidgeotto_still_front_pic.png rename to graphics/pokemon/pidgeotto/front.png diff --git a/graphics/pokemon/icons/pidgeotto_icon.png b/graphics/pokemon/pidgeotto/icon.png similarity index 100% rename from graphics/pokemon/icons/pidgeotto_icon.png rename to graphics/pokemon/pidgeotto/icon.png diff --git a/graphics/pokemon/palettes/pidgeotto_palette.pal b/graphics/pokemon/pidgeotto/normal.pal similarity index 100% rename from graphics/pokemon/palettes/pidgeotto_palette.pal rename to graphics/pokemon/pidgeotto/normal.pal diff --git a/graphics/pokemon/palettes/pidgeotto_shiny_palette.pal b/graphics/pokemon/pidgeotto/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/pidgeotto_shiny_palette.pal rename to graphics/pokemon/pidgeotto/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/pidgey_front_pic.png b/graphics/pokemon/pidgey/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/pidgey_front_pic.png rename to graphics/pokemon/pidgey/anim_front.png diff --git a/graphics/pokemon/back_pics/pidgey_back_pic.png b/graphics/pokemon/pidgey/back.png similarity index 100% rename from graphics/pokemon/back_pics/pidgey_back_pic.png rename to graphics/pokemon/pidgey/back.png diff --git a/graphics/pokemon/footprints/pidgey_footprint.png b/graphics/pokemon/pidgey/footprint.png similarity index 100% rename from graphics/pokemon/footprints/pidgey_footprint.png rename to graphics/pokemon/pidgey/footprint.png diff --git a/graphics/pokemon/front_pics/pidgey_still_front_pic.png b/graphics/pokemon/pidgey/front.png similarity index 100% rename from graphics/pokemon/front_pics/pidgey_still_front_pic.png rename to graphics/pokemon/pidgey/front.png diff --git a/graphics/pokemon/icons/pidgey_icon.png b/graphics/pokemon/pidgey/icon.png similarity index 100% rename from graphics/pokemon/icons/pidgey_icon.png rename to graphics/pokemon/pidgey/icon.png diff --git a/graphics/pokemon/palettes/pidgey_palette.pal b/graphics/pokemon/pidgey/normal.pal similarity index 100% rename from graphics/pokemon/palettes/pidgey_palette.pal rename to graphics/pokemon/pidgey/normal.pal diff --git a/graphics/pokemon/palettes/pidgey_shiny_palette.pal b/graphics/pokemon/pidgey/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/pidgey_shiny_palette.pal rename to graphics/pokemon/pidgey/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/pikachu_front_pic.png b/graphics/pokemon/pikachu/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/pikachu_front_pic.png rename to graphics/pokemon/pikachu/anim_front.png diff --git a/graphics/pokemon/back_pics/pikachu_back_pic.png b/graphics/pokemon/pikachu/back.png similarity index 100% rename from graphics/pokemon/back_pics/pikachu_back_pic.png rename to graphics/pokemon/pikachu/back.png diff --git a/graphics/pokemon/footprints/pikachu_footprint.png b/graphics/pokemon/pikachu/footprint.png similarity index 100% rename from graphics/pokemon/footprints/pikachu_footprint.png rename to graphics/pokemon/pikachu/footprint.png diff --git a/graphics/pokemon/front_pics/pikachu_still_front_pic.png b/graphics/pokemon/pikachu/front.png similarity index 100% rename from graphics/pokemon/front_pics/pikachu_still_front_pic.png rename to graphics/pokemon/pikachu/front.png diff --git a/graphics/pokemon/icons/pikachu_icon.png b/graphics/pokemon/pikachu/icon.png similarity index 100% rename from graphics/pokemon/icons/pikachu_icon.png rename to graphics/pokemon/pikachu/icon.png diff --git a/graphics/pokemon/palettes/pikachu_palette.pal b/graphics/pokemon/pikachu/normal.pal similarity index 100% rename from graphics/pokemon/palettes/pikachu_palette.pal rename to graphics/pokemon/pikachu/normal.pal diff --git a/graphics/pokemon/palettes/pikachu_shiny_palette.pal b/graphics/pokemon/pikachu/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/pikachu_shiny_palette.pal rename to graphics/pokemon/pikachu/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/piloswine_front_pic.png b/graphics/pokemon/piloswine/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/piloswine_front_pic.png rename to graphics/pokemon/piloswine/anim_front.png diff --git a/graphics/pokemon/back_pics/piloswine_back_pic.png b/graphics/pokemon/piloswine/back.png similarity index 100% rename from graphics/pokemon/back_pics/piloswine_back_pic.png rename to graphics/pokemon/piloswine/back.png diff --git a/graphics/pokemon/footprints/piloswine_footprint.png b/graphics/pokemon/piloswine/footprint.png similarity index 100% rename from graphics/pokemon/footprints/piloswine_footprint.png rename to graphics/pokemon/piloswine/footprint.png diff --git a/graphics/pokemon/front_pics/piloswine_still_front_pic.png b/graphics/pokemon/piloswine/front.png similarity index 100% rename from graphics/pokemon/front_pics/piloswine_still_front_pic.png rename to graphics/pokemon/piloswine/front.png diff --git a/graphics/pokemon/icons/piloswine_icon.png b/graphics/pokemon/piloswine/icon.png similarity index 100% rename from graphics/pokemon/icons/piloswine_icon.png rename to graphics/pokemon/piloswine/icon.png diff --git a/graphics/pokemon/palettes/piloswine_palette.pal b/graphics/pokemon/piloswine/normal.pal similarity index 100% rename from graphics/pokemon/palettes/piloswine_palette.pal rename to graphics/pokemon/piloswine/normal.pal diff --git a/graphics/pokemon/palettes/piloswine_shiny_palette.pal b/graphics/pokemon/piloswine/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/piloswine_shiny_palette.pal rename to graphics/pokemon/piloswine/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/pineco_front_pic.png b/graphics/pokemon/pineco/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/pineco_front_pic.png rename to graphics/pokemon/pineco/anim_front.png diff --git a/graphics/pokemon/back_pics/pineco_back_pic.png b/graphics/pokemon/pineco/back.png similarity index 100% rename from graphics/pokemon/back_pics/pineco_back_pic.png rename to graphics/pokemon/pineco/back.png diff --git a/graphics/pokemon/footprints/pineco_footprint.png b/graphics/pokemon/pineco/footprint.png similarity index 100% rename from graphics/pokemon/footprints/pineco_footprint.png rename to graphics/pokemon/pineco/footprint.png diff --git a/graphics/pokemon/front_pics/pineco_still_front_pic.png b/graphics/pokemon/pineco/front.png similarity index 100% rename from graphics/pokemon/front_pics/pineco_still_front_pic.png rename to graphics/pokemon/pineco/front.png diff --git a/graphics/pokemon/icons/pineco_icon.png b/graphics/pokemon/pineco/icon.png similarity index 100% rename from graphics/pokemon/icons/pineco_icon.png rename to graphics/pokemon/pineco/icon.png diff --git a/graphics/pokemon/palettes/pineco_palette.pal b/graphics/pokemon/pineco/normal.pal similarity index 100% rename from graphics/pokemon/palettes/pineco_palette.pal rename to graphics/pokemon/pineco/normal.pal diff --git a/graphics/pokemon/palettes/pineco_shiny_palette.pal b/graphics/pokemon/pineco/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/pineco_shiny_palette.pal rename to graphics/pokemon/pineco/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/pinsir_front_pic.png b/graphics/pokemon/pinsir/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/pinsir_front_pic.png rename to graphics/pokemon/pinsir/anim_front.png diff --git a/graphics/pokemon/back_pics/pinsir_back_pic.png b/graphics/pokemon/pinsir/back.png similarity index 100% rename from graphics/pokemon/back_pics/pinsir_back_pic.png rename to graphics/pokemon/pinsir/back.png diff --git a/graphics/pokemon/footprints/pinsir_footprint.png b/graphics/pokemon/pinsir/footprint.png similarity index 100% rename from graphics/pokemon/footprints/pinsir_footprint.png rename to graphics/pokemon/pinsir/footprint.png diff --git a/graphics/pokemon/front_pics/pinsir_still_front_pic.png b/graphics/pokemon/pinsir/front.png similarity index 100% rename from graphics/pokemon/front_pics/pinsir_still_front_pic.png rename to graphics/pokemon/pinsir/front.png diff --git a/graphics/pokemon/icons/pinsir_icon.png b/graphics/pokemon/pinsir/icon.png similarity index 100% rename from graphics/pokemon/icons/pinsir_icon.png rename to graphics/pokemon/pinsir/icon.png diff --git a/graphics/pokemon/palettes/pinsir_palette.pal b/graphics/pokemon/pinsir/normal.pal similarity index 100% rename from graphics/pokemon/palettes/pinsir_palette.pal rename to graphics/pokemon/pinsir/normal.pal diff --git a/graphics/pokemon/palettes/pinsir_shiny_palette.pal b/graphics/pokemon/pinsir/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/pinsir_shiny_palette.pal rename to graphics/pokemon/pinsir/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/plusle_front_pic.png b/graphics/pokemon/plusle/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/plusle_front_pic.png rename to graphics/pokemon/plusle/anim_front.png diff --git a/graphics/pokemon/back_pics/plusle_back_pic.png b/graphics/pokemon/plusle/back.png similarity index 100% rename from graphics/pokemon/back_pics/plusle_back_pic.png rename to graphics/pokemon/plusle/back.png diff --git a/graphics/pokemon/footprints/plusle_footprint.png b/graphics/pokemon/plusle/footprint.png similarity index 100% rename from graphics/pokemon/footprints/plusle_footprint.png rename to graphics/pokemon/plusle/footprint.png diff --git a/graphics/pokemon/front_pics/plusle_still_front_pic.png b/graphics/pokemon/plusle/front.png similarity index 100% rename from graphics/pokemon/front_pics/plusle_still_front_pic.png rename to graphics/pokemon/plusle/front.png diff --git a/graphics/pokemon/icons/plusle_icon.png b/graphics/pokemon/plusle/icon.png similarity index 100% rename from graphics/pokemon/icons/plusle_icon.png rename to graphics/pokemon/plusle/icon.png diff --git a/graphics/pokemon/palettes/plusle_palette.pal b/graphics/pokemon/plusle/normal.pal similarity index 100% rename from graphics/pokemon/palettes/plusle_palette.pal rename to graphics/pokemon/plusle/normal.pal diff --git a/graphics/pokemon/palettes/plusle_shiny_palette.pal b/graphics/pokemon/plusle/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/plusle_shiny_palette.pal rename to graphics/pokemon/plusle/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/politoed_front_pic.png b/graphics/pokemon/politoed/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/politoed_front_pic.png rename to graphics/pokemon/politoed/anim_front.png diff --git a/graphics/pokemon/back_pics/politoed_back_pic.png b/graphics/pokemon/politoed/back.png similarity index 100% rename from graphics/pokemon/back_pics/politoed_back_pic.png rename to graphics/pokemon/politoed/back.png diff --git a/graphics/pokemon/footprints/politoed_footprint.png b/graphics/pokemon/politoed/footprint.png similarity index 100% rename from graphics/pokemon/footprints/politoed_footprint.png rename to graphics/pokemon/politoed/footprint.png diff --git a/graphics/pokemon/front_pics/politoed_still_front_pic.png b/graphics/pokemon/politoed/front.png similarity index 100% rename from graphics/pokemon/front_pics/politoed_still_front_pic.png rename to graphics/pokemon/politoed/front.png diff --git a/graphics/pokemon/icons/politoed_icon.png b/graphics/pokemon/politoed/icon.png similarity index 100% rename from graphics/pokemon/icons/politoed_icon.png rename to graphics/pokemon/politoed/icon.png diff --git a/graphics/pokemon/palettes/politoed_palette.pal b/graphics/pokemon/politoed/normal.pal similarity index 100% rename from graphics/pokemon/palettes/politoed_palette.pal rename to graphics/pokemon/politoed/normal.pal diff --git a/graphics/pokemon/palettes/politoed_shiny_palette.pal b/graphics/pokemon/politoed/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/politoed_shiny_palette.pal rename to graphics/pokemon/politoed/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/poliwag_front_pic.png b/graphics/pokemon/poliwag/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/poliwag_front_pic.png rename to graphics/pokemon/poliwag/anim_front.png diff --git a/graphics/pokemon/back_pics/poliwag_back_pic.png b/graphics/pokemon/poliwag/back.png similarity index 100% rename from graphics/pokemon/back_pics/poliwag_back_pic.png rename to graphics/pokemon/poliwag/back.png diff --git a/graphics/pokemon/footprints/poliwag_footprint.png b/graphics/pokemon/poliwag/footprint.png similarity index 100% rename from graphics/pokemon/footprints/poliwag_footprint.png rename to graphics/pokemon/poliwag/footprint.png diff --git a/graphics/pokemon/front_pics/poliwag_still_front_pic.png b/graphics/pokemon/poliwag/front.png similarity index 100% rename from graphics/pokemon/front_pics/poliwag_still_front_pic.png rename to graphics/pokemon/poliwag/front.png diff --git a/graphics/pokemon/icons/poliwag_icon.png b/graphics/pokemon/poliwag/icon.png similarity index 100% rename from graphics/pokemon/icons/poliwag_icon.png rename to graphics/pokemon/poliwag/icon.png diff --git a/graphics/pokemon/palettes/poliwag_palette.pal b/graphics/pokemon/poliwag/normal.pal similarity index 100% rename from graphics/pokemon/palettes/poliwag_palette.pal rename to graphics/pokemon/poliwag/normal.pal diff --git a/graphics/pokemon/palettes/poliwag_shiny_palette.pal b/graphics/pokemon/poliwag/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/poliwag_shiny_palette.pal rename to graphics/pokemon/poliwag/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/poliwhirl_front_pic.png b/graphics/pokemon/poliwhirl/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/poliwhirl_front_pic.png rename to graphics/pokemon/poliwhirl/anim_front.png diff --git a/graphics/pokemon/back_pics/poliwhirl_back_pic.png b/graphics/pokemon/poliwhirl/back.png similarity index 100% rename from graphics/pokemon/back_pics/poliwhirl_back_pic.png rename to graphics/pokemon/poliwhirl/back.png diff --git a/graphics/pokemon/footprints/poliwhirl_footprint.png b/graphics/pokemon/poliwhirl/footprint.png similarity index 100% rename from graphics/pokemon/footprints/poliwhirl_footprint.png rename to graphics/pokemon/poliwhirl/footprint.png diff --git a/graphics/pokemon/front_pics/poliwhirl_still_front_pic.png b/graphics/pokemon/poliwhirl/front.png similarity index 100% rename from graphics/pokemon/front_pics/poliwhirl_still_front_pic.png rename to graphics/pokemon/poliwhirl/front.png diff --git a/graphics/pokemon/icons/poliwhirl_icon.png b/graphics/pokemon/poliwhirl/icon.png similarity index 100% rename from graphics/pokemon/icons/poliwhirl_icon.png rename to graphics/pokemon/poliwhirl/icon.png diff --git a/graphics/pokemon/palettes/poliwhirl_palette.pal b/graphics/pokemon/poliwhirl/normal.pal similarity index 100% rename from graphics/pokemon/palettes/poliwhirl_palette.pal rename to graphics/pokemon/poliwhirl/normal.pal diff --git a/graphics/pokemon/palettes/poliwhirl_shiny_palette.pal b/graphics/pokemon/poliwhirl/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/poliwhirl_shiny_palette.pal rename to graphics/pokemon/poliwhirl/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/poliwrath_front_pic.png b/graphics/pokemon/poliwrath/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/poliwrath_front_pic.png rename to graphics/pokemon/poliwrath/anim_front.png diff --git a/graphics/pokemon/back_pics/poliwrath_back_pic.png b/graphics/pokemon/poliwrath/back.png similarity index 100% rename from graphics/pokemon/back_pics/poliwrath_back_pic.png rename to graphics/pokemon/poliwrath/back.png diff --git a/graphics/pokemon/footprints/poliwrath_footprint.png b/graphics/pokemon/poliwrath/footprint.png similarity index 100% rename from graphics/pokemon/footprints/poliwrath_footprint.png rename to graphics/pokemon/poliwrath/footprint.png diff --git a/graphics/pokemon/front_pics/poliwrath_still_front_pic.png b/graphics/pokemon/poliwrath/front.png similarity index 100% rename from graphics/pokemon/front_pics/poliwrath_still_front_pic.png rename to graphics/pokemon/poliwrath/front.png diff --git a/graphics/pokemon/icons/poliwrath_icon.png b/graphics/pokemon/poliwrath/icon.png similarity index 100% rename from graphics/pokemon/icons/poliwrath_icon.png rename to graphics/pokemon/poliwrath/icon.png diff --git a/graphics/pokemon/palettes/poliwrath_palette.pal b/graphics/pokemon/poliwrath/normal.pal similarity index 100% rename from graphics/pokemon/palettes/poliwrath_palette.pal rename to graphics/pokemon/poliwrath/normal.pal diff --git a/graphics/pokemon/palettes/poliwrath_shiny_palette.pal b/graphics/pokemon/poliwrath/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/poliwrath_shiny_palette.pal rename to graphics/pokemon/poliwrath/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/ponyta_front_pic.png b/graphics/pokemon/ponyta/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/ponyta_front_pic.png rename to graphics/pokemon/ponyta/anim_front.png diff --git a/graphics/pokemon/back_pics/ponyta_back_pic.png b/graphics/pokemon/ponyta/back.png similarity index 100% rename from graphics/pokemon/back_pics/ponyta_back_pic.png rename to graphics/pokemon/ponyta/back.png diff --git a/graphics/pokemon/footprints/ponyta_footprint.png b/graphics/pokemon/ponyta/footprint.png similarity index 100% rename from graphics/pokemon/footprints/ponyta_footprint.png rename to graphics/pokemon/ponyta/footprint.png diff --git a/graphics/pokemon/front_pics/ponyta_still_front_pic.png b/graphics/pokemon/ponyta/front.png similarity index 100% rename from graphics/pokemon/front_pics/ponyta_still_front_pic.png rename to graphics/pokemon/ponyta/front.png diff --git a/graphics/pokemon/icons/ponyta_icon.png b/graphics/pokemon/ponyta/icon.png similarity index 100% rename from graphics/pokemon/icons/ponyta_icon.png rename to graphics/pokemon/ponyta/icon.png diff --git a/graphics/pokemon/palettes/ponyta_palette.pal b/graphics/pokemon/ponyta/normal.pal similarity index 100% rename from graphics/pokemon/palettes/ponyta_palette.pal rename to graphics/pokemon/ponyta/normal.pal diff --git a/graphics/pokemon/palettes/ponyta_shiny_palette.pal b/graphics/pokemon/ponyta/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/ponyta_shiny_palette.pal rename to graphics/pokemon/ponyta/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/poochyena_front_pic.png b/graphics/pokemon/poochyena/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/poochyena_front_pic.png rename to graphics/pokemon/poochyena/anim_front.png diff --git a/graphics/pokemon/back_pics/poochyena_back_pic.png b/graphics/pokemon/poochyena/back.png similarity index 100% rename from graphics/pokemon/back_pics/poochyena_back_pic.png rename to graphics/pokemon/poochyena/back.png diff --git a/graphics/pokemon/footprints/poochyena_footprint.png b/graphics/pokemon/poochyena/footprint.png similarity index 100% rename from graphics/pokemon/footprints/poochyena_footprint.png rename to graphics/pokemon/poochyena/footprint.png diff --git a/graphics/pokemon/front_pics/poochyena_still_front_pic.png b/graphics/pokemon/poochyena/front.png similarity index 100% rename from graphics/pokemon/front_pics/poochyena_still_front_pic.png rename to graphics/pokemon/poochyena/front.png diff --git a/graphics/pokemon/icons/poochyena_icon.png b/graphics/pokemon/poochyena/icon.png similarity index 100% rename from graphics/pokemon/icons/poochyena_icon.png rename to graphics/pokemon/poochyena/icon.png diff --git a/graphics/pokemon/palettes/poochyena_palette.pal b/graphics/pokemon/poochyena/normal.pal similarity index 100% rename from graphics/pokemon/palettes/poochyena_palette.pal rename to graphics/pokemon/poochyena/normal.pal diff --git a/graphics/pokemon/palettes/poochyena_shiny_palette.pal b/graphics/pokemon/poochyena/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/poochyena_shiny_palette.pal rename to graphics/pokemon/poochyena/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/porygon_front_pic.png b/graphics/pokemon/porygon/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/porygon_front_pic.png rename to graphics/pokemon/porygon/anim_front.png diff --git a/graphics/pokemon/back_pics/porygon_back_pic.png b/graphics/pokemon/porygon/back.png similarity index 100% rename from graphics/pokemon/back_pics/porygon_back_pic.png rename to graphics/pokemon/porygon/back.png diff --git a/graphics/pokemon/footprints/porygon_footprint.png b/graphics/pokemon/porygon/footprint.png similarity index 100% rename from graphics/pokemon/footprints/porygon_footprint.png rename to graphics/pokemon/porygon/footprint.png diff --git a/graphics/pokemon/front_pics/porygon_still_front_pic.png b/graphics/pokemon/porygon/front.png similarity index 100% rename from graphics/pokemon/front_pics/porygon_still_front_pic.png rename to graphics/pokemon/porygon/front.png diff --git a/graphics/pokemon/icons/porygon_icon.png b/graphics/pokemon/porygon/icon.png similarity index 100% rename from graphics/pokemon/icons/porygon_icon.png rename to graphics/pokemon/porygon/icon.png diff --git a/graphics/pokemon/palettes/porygon_palette.pal b/graphics/pokemon/porygon/normal.pal similarity index 100% rename from graphics/pokemon/palettes/porygon_palette.pal rename to graphics/pokemon/porygon/normal.pal diff --git a/graphics/pokemon/palettes/porygon_shiny_palette.pal b/graphics/pokemon/porygon/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/porygon_shiny_palette.pal rename to graphics/pokemon/porygon/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/porygon2_front_pic.png b/graphics/pokemon/porygon2/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/porygon2_front_pic.png rename to graphics/pokemon/porygon2/anim_front.png diff --git a/graphics/pokemon/back_pics/porygon2_back_pic.png b/graphics/pokemon/porygon2/back.png similarity index 100% rename from graphics/pokemon/back_pics/porygon2_back_pic.png rename to graphics/pokemon/porygon2/back.png diff --git a/graphics/pokemon/footprints/porygon2_footprint.png b/graphics/pokemon/porygon2/footprint.png similarity index 100% rename from graphics/pokemon/footprints/porygon2_footprint.png rename to graphics/pokemon/porygon2/footprint.png diff --git a/graphics/pokemon/front_pics/porygon2_still_front_pic.png b/graphics/pokemon/porygon2/front.png similarity index 100% rename from graphics/pokemon/front_pics/porygon2_still_front_pic.png rename to graphics/pokemon/porygon2/front.png diff --git a/graphics/pokemon/icons/porygon2_icon.png b/graphics/pokemon/porygon2/icon.png similarity index 100% rename from graphics/pokemon/icons/porygon2_icon.png rename to graphics/pokemon/porygon2/icon.png diff --git a/graphics/pokemon/palettes/porygon2_palette.pal b/graphics/pokemon/porygon2/normal.pal similarity index 100% rename from graphics/pokemon/palettes/porygon2_palette.pal rename to graphics/pokemon/porygon2/normal.pal diff --git a/graphics/pokemon/palettes/porygon2_shiny_palette.pal b/graphics/pokemon/porygon2/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/porygon2_shiny_palette.pal rename to graphics/pokemon/porygon2/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/primeape_front_pic.png b/graphics/pokemon/primeape/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/primeape_front_pic.png rename to graphics/pokemon/primeape/anim_front.png diff --git a/graphics/pokemon/back_pics/primeape_back_pic.png b/graphics/pokemon/primeape/back.png similarity index 100% rename from graphics/pokemon/back_pics/primeape_back_pic.png rename to graphics/pokemon/primeape/back.png diff --git a/graphics/pokemon/footprints/primeape_footprint.png b/graphics/pokemon/primeape/footprint.png similarity index 100% rename from graphics/pokemon/footprints/primeape_footprint.png rename to graphics/pokemon/primeape/footprint.png diff --git a/graphics/pokemon/front_pics/primeape_still_front_pic.png b/graphics/pokemon/primeape/front.png similarity index 100% rename from graphics/pokemon/front_pics/primeape_still_front_pic.png rename to graphics/pokemon/primeape/front.png diff --git a/graphics/pokemon/icons/primeape_icon.png b/graphics/pokemon/primeape/icon.png similarity index 100% rename from graphics/pokemon/icons/primeape_icon.png rename to graphics/pokemon/primeape/icon.png diff --git a/graphics/pokemon/palettes/primeape_palette.pal b/graphics/pokemon/primeape/normal.pal similarity index 100% rename from graphics/pokemon/palettes/primeape_palette.pal rename to graphics/pokemon/primeape/normal.pal diff --git a/graphics/pokemon/palettes/primeape_shiny_palette.pal b/graphics/pokemon/primeape/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/primeape_shiny_palette.pal rename to graphics/pokemon/primeape/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/psyduck_front_pic.png b/graphics/pokemon/psyduck/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/psyduck_front_pic.png rename to graphics/pokemon/psyduck/anim_front.png diff --git a/graphics/pokemon/back_pics/psyduck_back_pic.png b/graphics/pokemon/psyduck/back.png similarity index 100% rename from graphics/pokemon/back_pics/psyduck_back_pic.png rename to graphics/pokemon/psyduck/back.png diff --git a/graphics/pokemon/footprints/psyduck_footprint.png b/graphics/pokemon/psyduck/footprint.png similarity index 100% rename from graphics/pokemon/footprints/psyduck_footprint.png rename to graphics/pokemon/psyduck/footprint.png diff --git a/graphics/pokemon/front_pics/psyduck_still_front_pic.png b/graphics/pokemon/psyduck/front.png similarity index 100% rename from graphics/pokemon/front_pics/psyduck_still_front_pic.png rename to graphics/pokemon/psyduck/front.png diff --git a/graphics/pokemon/icons/psyduck_icon.png b/graphics/pokemon/psyduck/icon.png similarity index 100% rename from graphics/pokemon/icons/psyduck_icon.png rename to graphics/pokemon/psyduck/icon.png diff --git a/graphics/pokemon/palettes/psyduck_palette.pal b/graphics/pokemon/psyduck/normal.pal similarity index 100% rename from graphics/pokemon/palettes/psyduck_palette.pal rename to graphics/pokemon/psyduck/normal.pal diff --git a/graphics/pokemon/palettes/psyduck_shiny_palette.pal b/graphics/pokemon/psyduck/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/psyduck_shiny_palette.pal rename to graphics/pokemon/psyduck/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/pupitar_front_pic.png b/graphics/pokemon/pupitar/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/pupitar_front_pic.png rename to graphics/pokemon/pupitar/anim_front.png diff --git a/graphics/pokemon/back_pics/pupitar_back_pic.png b/graphics/pokemon/pupitar/back.png similarity index 100% rename from graphics/pokemon/back_pics/pupitar_back_pic.png rename to graphics/pokemon/pupitar/back.png diff --git a/graphics/pokemon/footprints/pupitar_footprint.png b/graphics/pokemon/pupitar/footprint.png similarity index 100% rename from graphics/pokemon/footprints/pupitar_footprint.png rename to graphics/pokemon/pupitar/footprint.png diff --git a/graphics/pokemon/front_pics/pupitar_still_front_pic.png b/graphics/pokemon/pupitar/front.png similarity index 100% rename from graphics/pokemon/front_pics/pupitar_still_front_pic.png rename to graphics/pokemon/pupitar/front.png diff --git a/graphics/pokemon/icons/pupitar_icon.png b/graphics/pokemon/pupitar/icon.png similarity index 100% rename from graphics/pokemon/icons/pupitar_icon.png rename to graphics/pokemon/pupitar/icon.png diff --git a/graphics/pokemon/palettes/pupitar_palette.pal b/graphics/pokemon/pupitar/normal.pal similarity index 100% rename from graphics/pokemon/palettes/pupitar_palette.pal rename to graphics/pokemon/pupitar/normal.pal diff --git a/graphics/pokemon/palettes/pupitar_shiny_palette.pal b/graphics/pokemon/pupitar/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/pupitar_shiny_palette.pal rename to graphics/pokemon/pupitar/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/quagsire_front_pic.png b/graphics/pokemon/quagsire/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/quagsire_front_pic.png rename to graphics/pokemon/quagsire/anim_front.png diff --git a/graphics/pokemon/back_pics/quagsire_back_pic.png b/graphics/pokemon/quagsire/back.png similarity index 100% rename from graphics/pokemon/back_pics/quagsire_back_pic.png rename to graphics/pokemon/quagsire/back.png diff --git a/graphics/pokemon/footprints/quagsire_footprint.png b/graphics/pokemon/quagsire/footprint.png similarity index 100% rename from graphics/pokemon/footprints/quagsire_footprint.png rename to graphics/pokemon/quagsire/footprint.png diff --git a/graphics/pokemon/front_pics/quagsire_still_front_pic.png b/graphics/pokemon/quagsire/front.png similarity index 100% rename from graphics/pokemon/front_pics/quagsire_still_front_pic.png rename to graphics/pokemon/quagsire/front.png diff --git a/graphics/pokemon/icons/quagsire_icon.png b/graphics/pokemon/quagsire/icon.png similarity index 100% rename from graphics/pokemon/icons/quagsire_icon.png rename to graphics/pokemon/quagsire/icon.png diff --git a/graphics/pokemon/palettes/quagsire_palette.pal b/graphics/pokemon/quagsire/normal.pal similarity index 100% rename from graphics/pokemon/palettes/quagsire_palette.pal rename to graphics/pokemon/quagsire/normal.pal diff --git a/graphics/pokemon/palettes/quagsire_shiny_palette.pal b/graphics/pokemon/quagsire/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/quagsire_shiny_palette.pal rename to graphics/pokemon/quagsire/shiny.pal diff --git a/graphics/pokemon/footprints/question_mark_footprint.png b/graphics/pokemon/question_mark/footprint.png similarity index 100% rename from graphics/pokemon/footprints/question_mark_footprint.png rename to graphics/pokemon/question_mark/footprint.png diff --git a/graphics/pokemon/icons/question_mark_icon.png b/graphics/pokemon/question_mark/icon.png similarity index 100% rename from graphics/pokemon/icons/question_mark_icon.png rename to graphics/pokemon/question_mark/icon.png diff --git a/graphics/pokemon/anim_front_pics/quilava_front_pic.png b/graphics/pokemon/quilava/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/quilava_front_pic.png rename to graphics/pokemon/quilava/anim_front.png diff --git a/graphics/pokemon/back_pics/quilava_back_pic.png b/graphics/pokemon/quilava/back.png similarity index 100% rename from graphics/pokemon/back_pics/quilava_back_pic.png rename to graphics/pokemon/quilava/back.png diff --git a/graphics/pokemon/footprints/quilava_footprint.png b/graphics/pokemon/quilava/footprint.png similarity index 100% rename from graphics/pokemon/footprints/quilava_footprint.png rename to graphics/pokemon/quilava/footprint.png diff --git a/graphics/pokemon/front_pics/quilava_still_front_pic.png b/graphics/pokemon/quilava/front.png similarity index 100% rename from graphics/pokemon/front_pics/quilava_still_front_pic.png rename to graphics/pokemon/quilava/front.png diff --git a/graphics/pokemon/icons/quilava_icon.png b/graphics/pokemon/quilava/icon.png similarity index 100% rename from graphics/pokemon/icons/quilava_icon.png rename to graphics/pokemon/quilava/icon.png diff --git a/graphics/pokemon/palettes/quilava_palette.pal b/graphics/pokemon/quilava/normal.pal similarity index 100% rename from graphics/pokemon/palettes/quilava_palette.pal rename to graphics/pokemon/quilava/normal.pal diff --git a/graphics/pokemon/palettes/quilava_shiny_palette.pal b/graphics/pokemon/quilava/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/quilava_shiny_palette.pal rename to graphics/pokemon/quilava/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/qwilfish_front_pic.png b/graphics/pokemon/qwilfish/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/qwilfish_front_pic.png rename to graphics/pokemon/qwilfish/anim_front.png diff --git a/graphics/pokemon/back_pics/qwilfish_back_pic.png b/graphics/pokemon/qwilfish/back.png similarity index 100% rename from graphics/pokemon/back_pics/qwilfish_back_pic.png rename to graphics/pokemon/qwilfish/back.png diff --git a/graphics/pokemon/footprints/qwilfish_footprint.png b/graphics/pokemon/qwilfish/footprint.png similarity index 100% rename from graphics/pokemon/footprints/qwilfish_footprint.png rename to graphics/pokemon/qwilfish/footprint.png diff --git a/graphics/pokemon/front_pics/qwilfish_still_front_pic.png b/graphics/pokemon/qwilfish/front.png similarity index 100% rename from graphics/pokemon/front_pics/qwilfish_still_front_pic.png rename to graphics/pokemon/qwilfish/front.png diff --git a/graphics/pokemon/icons/qwilfish_icon.png b/graphics/pokemon/qwilfish/icon.png similarity index 100% rename from graphics/pokemon/icons/qwilfish_icon.png rename to graphics/pokemon/qwilfish/icon.png diff --git a/graphics/pokemon/palettes/qwilfish_palette.pal b/graphics/pokemon/qwilfish/normal.pal similarity index 100% rename from graphics/pokemon/palettes/qwilfish_palette.pal rename to graphics/pokemon/qwilfish/normal.pal diff --git a/graphics/pokemon/palettes/qwilfish_shiny_palette.pal b/graphics/pokemon/qwilfish/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/qwilfish_shiny_palette.pal rename to graphics/pokemon/qwilfish/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/raichu_front_pic.png b/graphics/pokemon/raichu/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/raichu_front_pic.png rename to graphics/pokemon/raichu/anim_front.png diff --git a/graphics/pokemon/back_pics/raichu_back_pic.png b/graphics/pokemon/raichu/back.png similarity index 100% rename from graphics/pokemon/back_pics/raichu_back_pic.png rename to graphics/pokemon/raichu/back.png diff --git a/graphics/pokemon/footprints/raichu_footprint.png b/graphics/pokemon/raichu/footprint.png similarity index 100% rename from graphics/pokemon/footprints/raichu_footprint.png rename to graphics/pokemon/raichu/footprint.png diff --git a/graphics/pokemon/front_pics/raichu_still_front_pic.png b/graphics/pokemon/raichu/front.png similarity index 100% rename from graphics/pokemon/front_pics/raichu_still_front_pic.png rename to graphics/pokemon/raichu/front.png diff --git a/graphics/pokemon/icons/raichu_icon.png b/graphics/pokemon/raichu/icon.png similarity index 100% rename from graphics/pokemon/icons/raichu_icon.png rename to graphics/pokemon/raichu/icon.png diff --git a/graphics/pokemon/palettes/raichu_palette.pal b/graphics/pokemon/raichu/normal.pal similarity index 100% rename from graphics/pokemon/palettes/raichu_palette.pal rename to graphics/pokemon/raichu/normal.pal diff --git a/graphics/pokemon/palettes/raichu_shiny_palette.pal b/graphics/pokemon/raichu/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/raichu_shiny_palette.pal rename to graphics/pokemon/raichu/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/raikou_front_pic.png b/graphics/pokemon/raikou/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/raikou_front_pic.png rename to graphics/pokemon/raikou/anim_front.png diff --git a/graphics/pokemon/back_pics/raikou_back_pic.png b/graphics/pokemon/raikou/back.png similarity index 100% rename from graphics/pokemon/back_pics/raikou_back_pic.png rename to graphics/pokemon/raikou/back.png diff --git a/graphics/pokemon/footprints/raikou_footprint.png b/graphics/pokemon/raikou/footprint.png similarity index 100% rename from graphics/pokemon/footprints/raikou_footprint.png rename to graphics/pokemon/raikou/footprint.png diff --git a/graphics/pokemon/front_pics/raikou_still_front_pic.png b/graphics/pokemon/raikou/front.png similarity index 100% rename from graphics/pokemon/front_pics/raikou_still_front_pic.png rename to graphics/pokemon/raikou/front.png diff --git a/graphics/pokemon/icons/raikou_icon.png b/graphics/pokemon/raikou/icon.png similarity index 100% rename from graphics/pokemon/icons/raikou_icon.png rename to graphics/pokemon/raikou/icon.png diff --git a/graphics/pokemon/palettes/raikou_palette.pal b/graphics/pokemon/raikou/normal.pal similarity index 100% rename from graphics/pokemon/palettes/raikou_palette.pal rename to graphics/pokemon/raikou/normal.pal diff --git a/graphics/pokemon/palettes/raikou_shiny_palette.pal b/graphics/pokemon/raikou/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/raikou_shiny_palette.pal rename to graphics/pokemon/raikou/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/ralts_front_pic.png b/graphics/pokemon/ralts/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/ralts_front_pic.png rename to graphics/pokemon/ralts/anim_front.png diff --git a/graphics/pokemon/back_pics/ralts_back_pic.png b/graphics/pokemon/ralts/back.png similarity index 100% rename from graphics/pokemon/back_pics/ralts_back_pic.png rename to graphics/pokemon/ralts/back.png diff --git a/graphics/pokemon/footprints/ralts_footprint.png b/graphics/pokemon/ralts/footprint.png similarity index 100% rename from graphics/pokemon/footprints/ralts_footprint.png rename to graphics/pokemon/ralts/footprint.png diff --git a/graphics/pokemon/front_pics/ralts_still_front_pic.png b/graphics/pokemon/ralts/front.png similarity index 100% rename from graphics/pokemon/front_pics/ralts_still_front_pic.png rename to graphics/pokemon/ralts/front.png diff --git a/graphics/pokemon/icons/ralts_icon.png b/graphics/pokemon/ralts/icon.png similarity index 100% rename from graphics/pokemon/icons/ralts_icon.png rename to graphics/pokemon/ralts/icon.png diff --git a/graphics/pokemon/palettes/ralts_palette.pal b/graphics/pokemon/ralts/normal.pal similarity index 100% rename from graphics/pokemon/palettes/ralts_palette.pal rename to graphics/pokemon/ralts/normal.pal diff --git a/graphics/pokemon/palettes/ralts_shiny_palette.pal b/graphics/pokemon/ralts/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/ralts_shiny_palette.pal rename to graphics/pokemon/ralts/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/rapidash_front_pic.png b/graphics/pokemon/rapidash/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/rapidash_front_pic.png rename to graphics/pokemon/rapidash/anim_front.png diff --git a/graphics/pokemon/back_pics/rapidash_back_pic.png b/graphics/pokemon/rapidash/back.png similarity index 100% rename from graphics/pokemon/back_pics/rapidash_back_pic.png rename to graphics/pokemon/rapidash/back.png diff --git a/graphics/pokemon/footprints/rapidash_footprint.png b/graphics/pokemon/rapidash/footprint.png similarity index 100% rename from graphics/pokemon/footprints/rapidash_footprint.png rename to graphics/pokemon/rapidash/footprint.png diff --git a/graphics/pokemon/front_pics/rapidash_still_front_pic.png b/graphics/pokemon/rapidash/front.png similarity index 100% rename from graphics/pokemon/front_pics/rapidash_still_front_pic.png rename to graphics/pokemon/rapidash/front.png diff --git a/graphics/pokemon/icons/rapidash_icon.png b/graphics/pokemon/rapidash/icon.png similarity index 100% rename from graphics/pokemon/icons/rapidash_icon.png rename to graphics/pokemon/rapidash/icon.png diff --git a/graphics/pokemon/palettes/rapidash_palette.pal b/graphics/pokemon/rapidash/normal.pal similarity index 100% rename from graphics/pokemon/palettes/rapidash_palette.pal rename to graphics/pokemon/rapidash/normal.pal diff --git a/graphics/pokemon/palettes/rapidash_shiny_palette.pal b/graphics/pokemon/rapidash/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/rapidash_shiny_palette.pal rename to graphics/pokemon/rapidash/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/raticate_front_pic.png b/graphics/pokemon/raticate/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/raticate_front_pic.png rename to graphics/pokemon/raticate/anim_front.png diff --git a/graphics/pokemon/back_pics/raticate_back_pic.png b/graphics/pokemon/raticate/back.png similarity index 100% rename from graphics/pokemon/back_pics/raticate_back_pic.png rename to graphics/pokemon/raticate/back.png diff --git a/graphics/pokemon/footprints/raticate_footprint.png b/graphics/pokemon/raticate/footprint.png similarity index 100% rename from graphics/pokemon/footprints/raticate_footprint.png rename to graphics/pokemon/raticate/footprint.png diff --git a/graphics/pokemon/front_pics/raticate_still_front_pic.png b/graphics/pokemon/raticate/front.png similarity index 100% rename from graphics/pokemon/front_pics/raticate_still_front_pic.png rename to graphics/pokemon/raticate/front.png diff --git a/graphics/pokemon/icons/raticate_icon.png b/graphics/pokemon/raticate/icon.png similarity index 100% rename from graphics/pokemon/icons/raticate_icon.png rename to graphics/pokemon/raticate/icon.png diff --git a/graphics/pokemon/palettes/raticate_palette.pal b/graphics/pokemon/raticate/normal.pal similarity index 100% rename from graphics/pokemon/palettes/raticate_palette.pal rename to graphics/pokemon/raticate/normal.pal diff --git a/graphics/pokemon/palettes/raticate_shiny_palette.pal b/graphics/pokemon/raticate/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/raticate_shiny_palette.pal rename to graphics/pokemon/raticate/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/rattata_front_pic.png b/graphics/pokemon/rattata/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/rattata_front_pic.png rename to graphics/pokemon/rattata/anim_front.png diff --git a/graphics/pokemon/back_pics/rattata_back_pic.png b/graphics/pokemon/rattata/back.png similarity index 100% rename from graphics/pokemon/back_pics/rattata_back_pic.png rename to graphics/pokemon/rattata/back.png diff --git a/graphics/pokemon/footprints/rattata_footprint.png b/graphics/pokemon/rattata/footprint.png similarity index 100% rename from graphics/pokemon/footprints/rattata_footprint.png rename to graphics/pokemon/rattata/footprint.png diff --git a/graphics/pokemon/front_pics/rattata_still_front_pic.png b/graphics/pokemon/rattata/front.png similarity index 100% rename from graphics/pokemon/front_pics/rattata_still_front_pic.png rename to graphics/pokemon/rattata/front.png diff --git a/graphics/pokemon/icons/rattata_icon.png b/graphics/pokemon/rattata/icon.png similarity index 100% rename from graphics/pokemon/icons/rattata_icon.png rename to graphics/pokemon/rattata/icon.png diff --git a/graphics/pokemon/palettes/rattata_palette.pal b/graphics/pokemon/rattata/normal.pal similarity index 100% rename from graphics/pokemon/palettes/rattata_palette.pal rename to graphics/pokemon/rattata/normal.pal diff --git a/graphics/pokemon/palettes/rattata_shiny_palette.pal b/graphics/pokemon/rattata/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/rattata_shiny_palette.pal rename to graphics/pokemon/rattata/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/rayquaza_front_pic.png b/graphics/pokemon/rayquaza/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/rayquaza_front_pic.png rename to graphics/pokemon/rayquaza/anim_front.png diff --git a/graphics/pokemon/back_pics/rayquaza_back_pic.png b/graphics/pokemon/rayquaza/back.png similarity index 100% rename from graphics/pokemon/back_pics/rayquaza_back_pic.png rename to graphics/pokemon/rayquaza/back.png diff --git a/graphics/pokemon/footprints/rayquaza_footprint.png b/graphics/pokemon/rayquaza/footprint.png similarity index 100% rename from graphics/pokemon/footprints/rayquaza_footprint.png rename to graphics/pokemon/rayquaza/footprint.png diff --git a/graphics/pokemon/front_pics/rayquaza_still_front_pic.png b/graphics/pokemon/rayquaza/front.png similarity index 100% rename from graphics/pokemon/front_pics/rayquaza_still_front_pic.png rename to graphics/pokemon/rayquaza/front.png diff --git a/graphics/pokemon/icons/rayquaza_icon.png b/graphics/pokemon/rayquaza/icon.png similarity index 100% rename from graphics/pokemon/icons/rayquaza_icon.png rename to graphics/pokemon/rayquaza/icon.png diff --git a/graphics/pokemon/palettes/rayquaza_palette.pal b/graphics/pokemon/rayquaza/normal.pal similarity index 100% rename from graphics/pokemon/palettes/rayquaza_palette.pal rename to graphics/pokemon/rayquaza/normal.pal diff --git a/graphics/pokemon/palettes/rayquaza_shiny_palette.pal b/graphics/pokemon/rayquaza/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/rayquaza_shiny_palette.pal rename to graphics/pokemon/rayquaza/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/regice_front_pic.png b/graphics/pokemon/regice/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/regice_front_pic.png rename to graphics/pokemon/regice/anim_front.png diff --git a/graphics/pokemon/back_pics/regice_back_pic.png b/graphics/pokemon/regice/back.png similarity index 100% rename from graphics/pokemon/back_pics/regice_back_pic.png rename to graphics/pokemon/regice/back.png diff --git a/graphics/pokemon/footprints/regice_footprint.png b/graphics/pokemon/regice/footprint.png similarity index 100% rename from graphics/pokemon/footprints/regice_footprint.png rename to graphics/pokemon/regice/footprint.png diff --git a/graphics/pokemon/front_pics/regice_still_front_pic.png b/graphics/pokemon/regice/front.png similarity index 100% rename from graphics/pokemon/front_pics/regice_still_front_pic.png rename to graphics/pokemon/regice/front.png diff --git a/graphics/pokemon/icons/regice_icon.png b/graphics/pokemon/regice/icon.png similarity index 100% rename from graphics/pokemon/icons/regice_icon.png rename to graphics/pokemon/regice/icon.png diff --git a/graphics/pokemon/palettes/regice_palette.pal b/graphics/pokemon/regice/normal.pal similarity index 100% rename from graphics/pokemon/palettes/regice_palette.pal rename to graphics/pokemon/regice/normal.pal diff --git a/graphics/pokemon/palettes/regice_shiny_palette.pal b/graphics/pokemon/regice/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/regice_shiny_palette.pal rename to graphics/pokemon/regice/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/regirock_front_pic.png b/graphics/pokemon/regirock/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/regirock_front_pic.png rename to graphics/pokemon/regirock/anim_front.png diff --git a/graphics/pokemon/back_pics/regirock_back_pic.png b/graphics/pokemon/regirock/back.png similarity index 100% rename from graphics/pokemon/back_pics/regirock_back_pic.png rename to graphics/pokemon/regirock/back.png diff --git a/graphics/pokemon/footprints/regirock_footprint.png b/graphics/pokemon/regirock/footprint.png similarity index 100% rename from graphics/pokemon/footprints/regirock_footprint.png rename to graphics/pokemon/regirock/footprint.png diff --git a/graphics/pokemon/front_pics/regirock_still_front_pic.png b/graphics/pokemon/regirock/front.png similarity index 100% rename from graphics/pokemon/front_pics/regirock_still_front_pic.png rename to graphics/pokemon/regirock/front.png diff --git a/graphics/pokemon/icons/regirock_icon.png b/graphics/pokemon/regirock/icon.png similarity index 100% rename from graphics/pokemon/icons/regirock_icon.png rename to graphics/pokemon/regirock/icon.png diff --git a/graphics/pokemon/palettes/regirock_palette.pal b/graphics/pokemon/regirock/normal.pal similarity index 100% rename from graphics/pokemon/palettes/regirock_palette.pal rename to graphics/pokemon/regirock/normal.pal diff --git a/graphics/pokemon/palettes/regirock_shiny_palette.pal b/graphics/pokemon/regirock/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/regirock_shiny_palette.pal rename to graphics/pokemon/regirock/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/registeel_front_pic.png b/graphics/pokemon/registeel/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/registeel_front_pic.png rename to graphics/pokemon/registeel/anim_front.png diff --git a/graphics/pokemon/back_pics/registeel_back_pic.png b/graphics/pokemon/registeel/back.png similarity index 100% rename from graphics/pokemon/back_pics/registeel_back_pic.png rename to graphics/pokemon/registeel/back.png diff --git a/graphics/pokemon/footprints/registeel_footprint.png b/graphics/pokemon/registeel/footprint.png similarity index 100% rename from graphics/pokemon/footprints/registeel_footprint.png rename to graphics/pokemon/registeel/footprint.png diff --git a/graphics/pokemon/front_pics/registeel_still_front_pic.png b/graphics/pokemon/registeel/front.png similarity index 100% rename from graphics/pokemon/front_pics/registeel_still_front_pic.png rename to graphics/pokemon/registeel/front.png diff --git a/graphics/pokemon/icons/registeel_icon.png b/graphics/pokemon/registeel/icon.png similarity index 100% rename from graphics/pokemon/icons/registeel_icon.png rename to graphics/pokemon/registeel/icon.png diff --git a/graphics/pokemon/palettes/registeel_palette.pal b/graphics/pokemon/registeel/normal.pal similarity index 100% rename from graphics/pokemon/palettes/registeel_palette.pal rename to graphics/pokemon/registeel/normal.pal diff --git a/graphics/pokemon/palettes/registeel_shiny_palette.pal b/graphics/pokemon/registeel/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/registeel_shiny_palette.pal rename to graphics/pokemon/registeel/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/relicanth_front_pic.png b/graphics/pokemon/relicanth/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/relicanth_front_pic.png rename to graphics/pokemon/relicanth/anim_front.png diff --git a/graphics/pokemon/back_pics/relicanth_back_pic.png b/graphics/pokemon/relicanth/back.png similarity index 100% rename from graphics/pokemon/back_pics/relicanth_back_pic.png rename to graphics/pokemon/relicanth/back.png diff --git a/graphics/pokemon/footprints/relicanth_footprint.png b/graphics/pokemon/relicanth/footprint.png similarity index 100% rename from graphics/pokemon/footprints/relicanth_footprint.png rename to graphics/pokemon/relicanth/footprint.png diff --git a/graphics/pokemon/front_pics/relicanth_still_front_pic.png b/graphics/pokemon/relicanth/front.png similarity index 100% rename from graphics/pokemon/front_pics/relicanth_still_front_pic.png rename to graphics/pokemon/relicanth/front.png diff --git a/graphics/pokemon/icons/relicanth_icon.png b/graphics/pokemon/relicanth/icon.png similarity index 100% rename from graphics/pokemon/icons/relicanth_icon.png rename to graphics/pokemon/relicanth/icon.png diff --git a/graphics/pokemon/palettes/relicanth_palette.pal b/graphics/pokemon/relicanth/normal.pal similarity index 100% rename from graphics/pokemon/palettes/relicanth_palette.pal rename to graphics/pokemon/relicanth/normal.pal diff --git a/graphics/pokemon/palettes/relicanth_shiny_palette.pal b/graphics/pokemon/relicanth/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/relicanth_shiny_palette.pal rename to graphics/pokemon/relicanth/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/remoraid_front_pic.png b/graphics/pokemon/remoraid/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/remoraid_front_pic.png rename to graphics/pokemon/remoraid/anim_front.png diff --git a/graphics/pokemon/back_pics/remoraid_back_pic.png b/graphics/pokemon/remoraid/back.png similarity index 100% rename from graphics/pokemon/back_pics/remoraid_back_pic.png rename to graphics/pokemon/remoraid/back.png diff --git a/graphics/pokemon/footprints/remoraid_footprint.png b/graphics/pokemon/remoraid/footprint.png similarity index 100% rename from graphics/pokemon/footprints/remoraid_footprint.png rename to graphics/pokemon/remoraid/footprint.png diff --git a/graphics/pokemon/front_pics/remoraid_still_front_pic.png b/graphics/pokemon/remoraid/front.png similarity index 100% rename from graphics/pokemon/front_pics/remoraid_still_front_pic.png rename to graphics/pokemon/remoraid/front.png diff --git a/graphics/pokemon/icons/remoraid_icon.png b/graphics/pokemon/remoraid/icon.png similarity index 100% rename from graphics/pokemon/icons/remoraid_icon.png rename to graphics/pokemon/remoraid/icon.png diff --git a/graphics/pokemon/palettes/remoraid_palette.pal b/graphics/pokemon/remoraid/normal.pal similarity index 100% rename from graphics/pokemon/palettes/remoraid_palette.pal rename to graphics/pokemon/remoraid/normal.pal diff --git a/graphics/pokemon/palettes/remoraid_shiny_palette.pal b/graphics/pokemon/remoraid/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/remoraid_shiny_palette.pal rename to graphics/pokemon/remoraid/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/rhydon_front_pic.png b/graphics/pokemon/rhydon/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/rhydon_front_pic.png rename to graphics/pokemon/rhydon/anim_front.png diff --git a/graphics/pokemon/back_pics/rhydon_back_pic.png b/graphics/pokemon/rhydon/back.png similarity index 100% rename from graphics/pokemon/back_pics/rhydon_back_pic.png rename to graphics/pokemon/rhydon/back.png diff --git a/graphics/pokemon/footprints/rhydon_footprint.png b/graphics/pokemon/rhydon/footprint.png similarity index 100% rename from graphics/pokemon/footprints/rhydon_footprint.png rename to graphics/pokemon/rhydon/footprint.png diff --git a/graphics/pokemon/front_pics/rhydon_still_front_pic.png b/graphics/pokemon/rhydon/front.png similarity index 100% rename from graphics/pokemon/front_pics/rhydon_still_front_pic.png rename to graphics/pokemon/rhydon/front.png diff --git a/graphics/pokemon/icons/rhydon_icon.png b/graphics/pokemon/rhydon/icon.png similarity index 100% rename from graphics/pokemon/icons/rhydon_icon.png rename to graphics/pokemon/rhydon/icon.png diff --git a/graphics/pokemon/palettes/rhydon_palette.pal b/graphics/pokemon/rhydon/normal.pal similarity index 100% rename from graphics/pokemon/palettes/rhydon_palette.pal rename to graphics/pokemon/rhydon/normal.pal diff --git a/graphics/pokemon/palettes/rhydon_shiny_palette.pal b/graphics/pokemon/rhydon/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/rhydon_shiny_palette.pal rename to graphics/pokemon/rhydon/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/rhyhorn_front_pic.png b/graphics/pokemon/rhyhorn/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/rhyhorn_front_pic.png rename to graphics/pokemon/rhyhorn/anim_front.png diff --git a/graphics/pokemon/back_pics/rhyhorn_back_pic.png b/graphics/pokemon/rhyhorn/back.png similarity index 100% rename from graphics/pokemon/back_pics/rhyhorn_back_pic.png rename to graphics/pokemon/rhyhorn/back.png diff --git a/graphics/pokemon/footprints/rhyhorn_footprint.png b/graphics/pokemon/rhyhorn/footprint.png similarity index 100% rename from graphics/pokemon/footprints/rhyhorn_footprint.png rename to graphics/pokemon/rhyhorn/footprint.png diff --git a/graphics/pokemon/front_pics/rhyhorn_still_front_pic.png b/graphics/pokemon/rhyhorn/front.png similarity index 100% rename from graphics/pokemon/front_pics/rhyhorn_still_front_pic.png rename to graphics/pokemon/rhyhorn/front.png diff --git a/graphics/pokemon/icons/rhyhorn_icon.png b/graphics/pokemon/rhyhorn/icon.png similarity index 100% rename from graphics/pokemon/icons/rhyhorn_icon.png rename to graphics/pokemon/rhyhorn/icon.png diff --git a/graphics/pokemon/palettes/rhyhorn_palette.pal b/graphics/pokemon/rhyhorn/normal.pal similarity index 100% rename from graphics/pokemon/palettes/rhyhorn_palette.pal rename to graphics/pokemon/rhyhorn/normal.pal diff --git a/graphics/pokemon/palettes/rhyhorn_shiny_palette.pal b/graphics/pokemon/rhyhorn/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/rhyhorn_shiny_palette.pal rename to graphics/pokemon/rhyhorn/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/roselia_front_pic.png b/graphics/pokemon/roselia/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/roselia_front_pic.png rename to graphics/pokemon/roselia/anim_front.png diff --git a/graphics/pokemon/back_pics/roselia_back_pic.png b/graphics/pokemon/roselia/back.png similarity index 100% rename from graphics/pokemon/back_pics/roselia_back_pic.png rename to graphics/pokemon/roselia/back.png diff --git a/graphics/pokemon/footprints/roselia_footprint.png b/graphics/pokemon/roselia/footprint.png similarity index 100% rename from graphics/pokemon/footprints/roselia_footprint.png rename to graphics/pokemon/roselia/footprint.png diff --git a/graphics/pokemon/front_pics/roselia_still_front_pic.png b/graphics/pokemon/roselia/front.png similarity index 100% rename from graphics/pokemon/front_pics/roselia_still_front_pic.png rename to graphics/pokemon/roselia/front.png diff --git a/graphics/pokemon/icons/roselia_icon.png b/graphics/pokemon/roselia/icon.png similarity index 100% rename from graphics/pokemon/icons/roselia_icon.png rename to graphics/pokemon/roselia/icon.png diff --git a/graphics/pokemon/palettes/roselia_palette.pal b/graphics/pokemon/roselia/normal.pal similarity index 100% rename from graphics/pokemon/palettes/roselia_palette.pal rename to graphics/pokemon/roselia/normal.pal diff --git a/graphics/pokemon/palettes/roselia_shiny_palette.pal b/graphics/pokemon/roselia/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/roselia_shiny_palette.pal rename to graphics/pokemon/roselia/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/sableye_front_pic.png b/graphics/pokemon/sableye/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/sableye_front_pic.png rename to graphics/pokemon/sableye/anim_front.png diff --git a/graphics/pokemon/back_pics/sableye_back_pic.png b/graphics/pokemon/sableye/back.png similarity index 100% rename from graphics/pokemon/back_pics/sableye_back_pic.png rename to graphics/pokemon/sableye/back.png diff --git a/graphics/pokemon/footprints/sableye_footprint.png b/graphics/pokemon/sableye/footprint.png similarity index 100% rename from graphics/pokemon/footprints/sableye_footprint.png rename to graphics/pokemon/sableye/footprint.png diff --git a/graphics/pokemon/front_pics/sableye_still_front_pic.png b/graphics/pokemon/sableye/front.png similarity index 100% rename from graphics/pokemon/front_pics/sableye_still_front_pic.png rename to graphics/pokemon/sableye/front.png diff --git a/graphics/pokemon/icons/sableye_icon.png b/graphics/pokemon/sableye/icon.png similarity index 100% rename from graphics/pokemon/icons/sableye_icon.png rename to graphics/pokemon/sableye/icon.png diff --git a/graphics/pokemon/palettes/sableye_palette.pal b/graphics/pokemon/sableye/normal.pal similarity index 100% rename from graphics/pokemon/palettes/sableye_palette.pal rename to graphics/pokemon/sableye/normal.pal diff --git a/graphics/pokemon/palettes/sableye_shiny_palette.pal b/graphics/pokemon/sableye/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/sableye_shiny_palette.pal rename to graphics/pokemon/sableye/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/salamence_front_pic.png b/graphics/pokemon/salamence/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/salamence_front_pic.png rename to graphics/pokemon/salamence/anim_front.png diff --git a/graphics/pokemon/back_pics/salamence_back_pic.png b/graphics/pokemon/salamence/back.png similarity index 100% rename from graphics/pokemon/back_pics/salamence_back_pic.png rename to graphics/pokemon/salamence/back.png diff --git a/graphics/pokemon/footprints/salamence_footprint.png b/graphics/pokemon/salamence/footprint.png similarity index 100% rename from graphics/pokemon/footprints/salamence_footprint.png rename to graphics/pokemon/salamence/footprint.png diff --git a/graphics/pokemon/front_pics/salamence_still_front_pic.png b/graphics/pokemon/salamence/front.png similarity index 100% rename from graphics/pokemon/front_pics/salamence_still_front_pic.png rename to graphics/pokemon/salamence/front.png diff --git a/graphics/pokemon/icons/salamence_icon.png b/graphics/pokemon/salamence/icon.png similarity index 100% rename from graphics/pokemon/icons/salamence_icon.png rename to graphics/pokemon/salamence/icon.png diff --git a/graphics/pokemon/palettes/salamence_palette.pal b/graphics/pokemon/salamence/normal.pal similarity index 100% rename from graphics/pokemon/palettes/salamence_palette.pal rename to graphics/pokemon/salamence/normal.pal diff --git a/graphics/pokemon/palettes/salamence_shiny_palette.pal b/graphics/pokemon/salamence/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/salamence_shiny_palette.pal rename to graphics/pokemon/salamence/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/sandshrew_front_pic.png b/graphics/pokemon/sandshrew/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/sandshrew_front_pic.png rename to graphics/pokemon/sandshrew/anim_front.png diff --git a/graphics/pokemon/back_pics/sandshrew_back_pic.png b/graphics/pokemon/sandshrew/back.png similarity index 100% rename from graphics/pokemon/back_pics/sandshrew_back_pic.png rename to graphics/pokemon/sandshrew/back.png diff --git a/graphics/pokemon/footprints/sandshrew_footprint.png b/graphics/pokemon/sandshrew/footprint.png similarity index 100% rename from graphics/pokemon/footprints/sandshrew_footprint.png rename to graphics/pokemon/sandshrew/footprint.png diff --git a/graphics/pokemon/front_pics/sandshrew_still_front_pic.png b/graphics/pokemon/sandshrew/front.png similarity index 100% rename from graphics/pokemon/front_pics/sandshrew_still_front_pic.png rename to graphics/pokemon/sandshrew/front.png diff --git a/graphics/pokemon/icons/sandshrew_icon.png b/graphics/pokemon/sandshrew/icon.png similarity index 100% rename from graphics/pokemon/icons/sandshrew_icon.png rename to graphics/pokemon/sandshrew/icon.png diff --git a/graphics/pokemon/palettes/sandshrew_palette.pal b/graphics/pokemon/sandshrew/normal.pal similarity index 100% rename from graphics/pokemon/palettes/sandshrew_palette.pal rename to graphics/pokemon/sandshrew/normal.pal diff --git a/graphics/pokemon/palettes/sandshrew_shiny_palette.pal b/graphics/pokemon/sandshrew/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/sandshrew_shiny_palette.pal rename to graphics/pokemon/sandshrew/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/sandslash_front_pic.png b/graphics/pokemon/sandslash/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/sandslash_front_pic.png rename to graphics/pokemon/sandslash/anim_front.png diff --git a/graphics/pokemon/back_pics/sandslash_back_pic.png b/graphics/pokemon/sandslash/back.png similarity index 100% rename from graphics/pokemon/back_pics/sandslash_back_pic.png rename to graphics/pokemon/sandslash/back.png diff --git a/graphics/pokemon/footprints/sandslash_footprint.png b/graphics/pokemon/sandslash/footprint.png similarity index 100% rename from graphics/pokemon/footprints/sandslash_footprint.png rename to graphics/pokemon/sandslash/footprint.png diff --git a/graphics/pokemon/front_pics/sandslash_still_front_pic.png b/graphics/pokemon/sandslash/front.png similarity index 100% rename from graphics/pokemon/front_pics/sandslash_still_front_pic.png rename to graphics/pokemon/sandslash/front.png diff --git a/graphics/pokemon/icons/sandslash_icon.png b/graphics/pokemon/sandslash/icon.png similarity index 100% rename from graphics/pokemon/icons/sandslash_icon.png rename to graphics/pokemon/sandslash/icon.png diff --git a/graphics/pokemon/palettes/sandslash_palette.pal b/graphics/pokemon/sandslash/normal.pal similarity index 100% rename from graphics/pokemon/palettes/sandslash_palette.pal rename to graphics/pokemon/sandslash/normal.pal diff --git a/graphics/pokemon/palettes/sandslash_shiny_palette.pal b/graphics/pokemon/sandslash/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/sandslash_shiny_palette.pal rename to graphics/pokemon/sandslash/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/sceptile_front_pic.png b/graphics/pokemon/sceptile/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/sceptile_front_pic.png rename to graphics/pokemon/sceptile/anim_front.png diff --git a/graphics/pokemon/back_pics/sceptile_back_pic.png b/graphics/pokemon/sceptile/back.png similarity index 100% rename from graphics/pokemon/back_pics/sceptile_back_pic.png rename to graphics/pokemon/sceptile/back.png diff --git a/graphics/pokemon/footprints/sceptile_footprint.png b/graphics/pokemon/sceptile/footprint.png similarity index 100% rename from graphics/pokemon/footprints/sceptile_footprint.png rename to graphics/pokemon/sceptile/footprint.png diff --git a/graphics/pokemon/front_pics/sceptile_still_front_pic.png b/graphics/pokemon/sceptile/front.png similarity index 100% rename from graphics/pokemon/front_pics/sceptile_still_front_pic.png rename to graphics/pokemon/sceptile/front.png diff --git a/graphics/pokemon/icons/sceptile_icon.png b/graphics/pokemon/sceptile/icon.png similarity index 100% rename from graphics/pokemon/icons/sceptile_icon.png rename to graphics/pokemon/sceptile/icon.png diff --git a/graphics/pokemon/palettes/sceptile_palette.pal b/graphics/pokemon/sceptile/normal.pal similarity index 100% rename from graphics/pokemon/palettes/sceptile_palette.pal rename to graphics/pokemon/sceptile/normal.pal diff --git a/graphics/pokemon/palettes/sceptile_shiny_palette.pal b/graphics/pokemon/sceptile/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/sceptile_shiny_palette.pal rename to graphics/pokemon/sceptile/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/scizor_front_pic.png b/graphics/pokemon/scizor/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/scizor_front_pic.png rename to graphics/pokemon/scizor/anim_front.png diff --git a/graphics/pokemon/back_pics/scizor_back_pic.png b/graphics/pokemon/scizor/back.png similarity index 100% rename from graphics/pokemon/back_pics/scizor_back_pic.png rename to graphics/pokemon/scizor/back.png diff --git a/graphics/pokemon/footprints/scizor_footprint.png b/graphics/pokemon/scizor/footprint.png similarity index 100% rename from graphics/pokemon/footprints/scizor_footprint.png rename to graphics/pokemon/scizor/footprint.png diff --git a/graphics/pokemon/front_pics/scizor_still_front_pic.png b/graphics/pokemon/scizor/front.png similarity index 100% rename from graphics/pokemon/front_pics/scizor_still_front_pic.png rename to graphics/pokemon/scizor/front.png diff --git a/graphics/pokemon/icons/scizor_icon.png b/graphics/pokemon/scizor/icon.png similarity index 100% rename from graphics/pokemon/icons/scizor_icon.png rename to graphics/pokemon/scizor/icon.png diff --git a/graphics/pokemon/palettes/scizor_palette.pal b/graphics/pokemon/scizor/normal.pal similarity index 100% rename from graphics/pokemon/palettes/scizor_palette.pal rename to graphics/pokemon/scizor/normal.pal diff --git a/graphics/pokemon/palettes/scizor_shiny_palette.pal b/graphics/pokemon/scizor/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/scizor_shiny_palette.pal rename to graphics/pokemon/scizor/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/scyther_front_pic.png b/graphics/pokemon/scyther/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/scyther_front_pic.png rename to graphics/pokemon/scyther/anim_front.png diff --git a/graphics/pokemon/back_pics/scyther_back_pic.png b/graphics/pokemon/scyther/back.png similarity index 100% rename from graphics/pokemon/back_pics/scyther_back_pic.png rename to graphics/pokemon/scyther/back.png diff --git a/graphics/pokemon/footprints/scyther_footprint.png b/graphics/pokemon/scyther/footprint.png similarity index 100% rename from graphics/pokemon/footprints/scyther_footprint.png rename to graphics/pokemon/scyther/footprint.png diff --git a/graphics/pokemon/front_pics/scyther_still_front_pic.png b/graphics/pokemon/scyther/front.png similarity index 100% rename from graphics/pokemon/front_pics/scyther_still_front_pic.png rename to graphics/pokemon/scyther/front.png diff --git a/graphics/pokemon/icons/scyther_icon.png b/graphics/pokemon/scyther/icon.png similarity index 100% rename from graphics/pokemon/icons/scyther_icon.png rename to graphics/pokemon/scyther/icon.png diff --git a/graphics/pokemon/palettes/scyther_palette.pal b/graphics/pokemon/scyther/normal.pal similarity index 100% rename from graphics/pokemon/palettes/scyther_palette.pal rename to graphics/pokemon/scyther/normal.pal diff --git a/graphics/pokemon/palettes/scyther_shiny_palette.pal b/graphics/pokemon/scyther/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/scyther_shiny_palette.pal rename to graphics/pokemon/scyther/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/seadra_front_pic.png b/graphics/pokemon/seadra/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/seadra_front_pic.png rename to graphics/pokemon/seadra/anim_front.png diff --git a/graphics/pokemon/back_pics/seadra_back_pic.png b/graphics/pokemon/seadra/back.png similarity index 100% rename from graphics/pokemon/back_pics/seadra_back_pic.png rename to graphics/pokemon/seadra/back.png diff --git a/graphics/pokemon/footprints/seadra_footprint.png b/graphics/pokemon/seadra/footprint.png similarity index 100% rename from graphics/pokemon/footprints/seadra_footprint.png rename to graphics/pokemon/seadra/footprint.png diff --git a/graphics/pokemon/front_pics/seadra_still_front_pic.png b/graphics/pokemon/seadra/front.png similarity index 100% rename from graphics/pokemon/front_pics/seadra_still_front_pic.png rename to graphics/pokemon/seadra/front.png diff --git a/graphics/pokemon/icons/seadra_icon.png b/graphics/pokemon/seadra/icon.png similarity index 100% rename from graphics/pokemon/icons/seadra_icon.png rename to graphics/pokemon/seadra/icon.png diff --git a/graphics/pokemon/palettes/seadra_palette.pal b/graphics/pokemon/seadra/normal.pal similarity index 100% rename from graphics/pokemon/palettes/seadra_palette.pal rename to graphics/pokemon/seadra/normal.pal diff --git a/graphics/pokemon/palettes/seadra_shiny_palette.pal b/graphics/pokemon/seadra/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/seadra_shiny_palette.pal rename to graphics/pokemon/seadra/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/seaking_front_pic.png b/graphics/pokemon/seaking/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/seaking_front_pic.png rename to graphics/pokemon/seaking/anim_front.png diff --git a/graphics/pokemon/back_pics/seaking_back_pic.png b/graphics/pokemon/seaking/back.png similarity index 100% rename from graphics/pokemon/back_pics/seaking_back_pic.png rename to graphics/pokemon/seaking/back.png diff --git a/graphics/pokemon/footprints/seaking_footprint.png b/graphics/pokemon/seaking/footprint.png similarity index 100% rename from graphics/pokemon/footprints/seaking_footprint.png rename to graphics/pokemon/seaking/footprint.png diff --git a/graphics/pokemon/front_pics/seaking_still_front_pic.png b/graphics/pokemon/seaking/front.png similarity index 100% rename from graphics/pokemon/front_pics/seaking_still_front_pic.png rename to graphics/pokemon/seaking/front.png diff --git a/graphics/pokemon/icons/seaking_icon.png b/graphics/pokemon/seaking/icon.png similarity index 100% rename from graphics/pokemon/icons/seaking_icon.png rename to graphics/pokemon/seaking/icon.png diff --git a/graphics/pokemon/palettes/seaking_palette.pal b/graphics/pokemon/seaking/normal.pal similarity index 100% rename from graphics/pokemon/palettes/seaking_palette.pal rename to graphics/pokemon/seaking/normal.pal diff --git a/graphics/pokemon/palettes/seaking_shiny_palette.pal b/graphics/pokemon/seaking/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/seaking_shiny_palette.pal rename to graphics/pokemon/seaking/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/sealeo_front_pic.png b/graphics/pokemon/sealeo/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/sealeo_front_pic.png rename to graphics/pokemon/sealeo/anim_front.png diff --git a/graphics/pokemon/back_pics/sealeo_back_pic.png b/graphics/pokemon/sealeo/back.png similarity index 100% rename from graphics/pokemon/back_pics/sealeo_back_pic.png rename to graphics/pokemon/sealeo/back.png diff --git a/graphics/pokemon/footprints/sealeo_footprint.png b/graphics/pokemon/sealeo/footprint.png similarity index 100% rename from graphics/pokemon/footprints/sealeo_footprint.png rename to graphics/pokemon/sealeo/footprint.png diff --git a/graphics/pokemon/front_pics/sealeo_still_front_pic.png b/graphics/pokemon/sealeo/front.png similarity index 100% rename from graphics/pokemon/front_pics/sealeo_still_front_pic.png rename to graphics/pokemon/sealeo/front.png diff --git a/graphics/pokemon/icons/sealeo_icon.png b/graphics/pokemon/sealeo/icon.png similarity index 100% rename from graphics/pokemon/icons/sealeo_icon.png rename to graphics/pokemon/sealeo/icon.png diff --git a/graphics/pokemon/palettes/sealeo_palette.pal b/graphics/pokemon/sealeo/normal.pal similarity index 100% rename from graphics/pokemon/palettes/sealeo_palette.pal rename to graphics/pokemon/sealeo/normal.pal diff --git a/graphics/pokemon/palettes/sealeo_shiny_palette.pal b/graphics/pokemon/sealeo/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/sealeo_shiny_palette.pal rename to graphics/pokemon/sealeo/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/seedot_front_pic.png b/graphics/pokemon/seedot/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/seedot_front_pic.png rename to graphics/pokemon/seedot/anim_front.png diff --git a/graphics/pokemon/back_pics/seedot_back_pic.png b/graphics/pokemon/seedot/back.png similarity index 100% rename from graphics/pokemon/back_pics/seedot_back_pic.png rename to graphics/pokemon/seedot/back.png diff --git a/graphics/pokemon/footprints/seedot_footprint.png b/graphics/pokemon/seedot/footprint.png similarity index 100% rename from graphics/pokemon/footprints/seedot_footprint.png rename to graphics/pokemon/seedot/footprint.png diff --git a/graphics/pokemon/front_pics/seedot_still_front_pic.png b/graphics/pokemon/seedot/front.png similarity index 100% rename from graphics/pokemon/front_pics/seedot_still_front_pic.png rename to graphics/pokemon/seedot/front.png diff --git a/graphics/pokemon/icons/seedot_icon.png b/graphics/pokemon/seedot/icon.png similarity index 100% rename from graphics/pokemon/icons/seedot_icon.png rename to graphics/pokemon/seedot/icon.png diff --git a/graphics/pokemon/palettes/seedot_palette.pal b/graphics/pokemon/seedot/normal.pal similarity index 100% rename from graphics/pokemon/palettes/seedot_palette.pal rename to graphics/pokemon/seedot/normal.pal diff --git a/graphics/pokemon/palettes/seedot_shiny_palette.pal b/graphics/pokemon/seedot/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/seedot_shiny_palette.pal rename to graphics/pokemon/seedot/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/seel_front_pic.png b/graphics/pokemon/seel/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/seel_front_pic.png rename to graphics/pokemon/seel/anim_front.png diff --git a/graphics/pokemon/back_pics/seel_back_pic.png b/graphics/pokemon/seel/back.png similarity index 100% rename from graphics/pokemon/back_pics/seel_back_pic.png rename to graphics/pokemon/seel/back.png diff --git a/graphics/pokemon/footprints/seel_footprint.png b/graphics/pokemon/seel/footprint.png similarity index 100% rename from graphics/pokemon/footprints/seel_footprint.png rename to graphics/pokemon/seel/footprint.png diff --git a/graphics/pokemon/front_pics/seel_still_front_pic.png b/graphics/pokemon/seel/front.png similarity index 100% rename from graphics/pokemon/front_pics/seel_still_front_pic.png rename to graphics/pokemon/seel/front.png diff --git a/graphics/pokemon/icons/seel_icon.png b/graphics/pokemon/seel/icon.png similarity index 100% rename from graphics/pokemon/icons/seel_icon.png rename to graphics/pokemon/seel/icon.png diff --git a/graphics/pokemon/palettes/seel_palette.pal b/graphics/pokemon/seel/normal.pal similarity index 100% rename from graphics/pokemon/palettes/seel_palette.pal rename to graphics/pokemon/seel/normal.pal diff --git a/graphics/pokemon/palettes/seel_shiny_palette.pal b/graphics/pokemon/seel/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/seel_shiny_palette.pal rename to graphics/pokemon/seel/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/sentret_front_pic.png b/graphics/pokemon/sentret/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/sentret_front_pic.png rename to graphics/pokemon/sentret/anim_front.png diff --git a/graphics/pokemon/back_pics/sentret_back_pic.png b/graphics/pokemon/sentret/back.png similarity index 100% rename from graphics/pokemon/back_pics/sentret_back_pic.png rename to graphics/pokemon/sentret/back.png diff --git a/graphics/pokemon/footprints/sentret_footprint.png b/graphics/pokemon/sentret/footprint.png similarity index 100% rename from graphics/pokemon/footprints/sentret_footprint.png rename to graphics/pokemon/sentret/footprint.png diff --git a/graphics/pokemon/front_pics/sentret_still_front_pic.png b/graphics/pokemon/sentret/front.png similarity index 100% rename from graphics/pokemon/front_pics/sentret_still_front_pic.png rename to graphics/pokemon/sentret/front.png diff --git a/graphics/pokemon/icons/sentret_icon.png b/graphics/pokemon/sentret/icon.png similarity index 100% rename from graphics/pokemon/icons/sentret_icon.png rename to graphics/pokemon/sentret/icon.png diff --git a/graphics/pokemon/palettes/sentret_palette.pal b/graphics/pokemon/sentret/normal.pal similarity index 100% rename from graphics/pokemon/palettes/sentret_palette.pal rename to graphics/pokemon/sentret/normal.pal diff --git a/graphics/pokemon/palettes/sentret_shiny_palette.pal b/graphics/pokemon/sentret/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/sentret_shiny_palette.pal rename to graphics/pokemon/sentret/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/seviper_front_pic.png b/graphics/pokemon/seviper/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/seviper_front_pic.png rename to graphics/pokemon/seviper/anim_front.png diff --git a/graphics/pokemon/back_pics/seviper_back_pic.png b/graphics/pokemon/seviper/back.png similarity index 100% rename from graphics/pokemon/back_pics/seviper_back_pic.png rename to graphics/pokemon/seviper/back.png diff --git a/graphics/pokemon/footprints/seviper_footprint.png b/graphics/pokemon/seviper/footprint.png similarity index 100% rename from graphics/pokemon/footprints/seviper_footprint.png rename to graphics/pokemon/seviper/footprint.png diff --git a/graphics/pokemon/front_pics/seviper_still_front_pic.png b/graphics/pokemon/seviper/front.png similarity index 100% rename from graphics/pokemon/front_pics/seviper_still_front_pic.png rename to graphics/pokemon/seviper/front.png diff --git a/graphics/pokemon/icons/seviper_icon.png b/graphics/pokemon/seviper/icon.png similarity index 100% rename from graphics/pokemon/icons/seviper_icon.png rename to graphics/pokemon/seviper/icon.png diff --git a/graphics/pokemon/palettes/seviper_palette.pal b/graphics/pokemon/seviper/normal.pal similarity index 100% rename from graphics/pokemon/palettes/seviper_palette.pal rename to graphics/pokemon/seviper/normal.pal diff --git a/graphics/pokemon/palettes/seviper_shiny_palette.pal b/graphics/pokemon/seviper/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/seviper_shiny_palette.pal rename to graphics/pokemon/seviper/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/sharpedo_front_pic.png b/graphics/pokemon/sharpedo/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/sharpedo_front_pic.png rename to graphics/pokemon/sharpedo/anim_front.png diff --git a/graphics/pokemon/back_pics/sharpedo_back_pic.png b/graphics/pokemon/sharpedo/back.png similarity index 100% rename from graphics/pokemon/back_pics/sharpedo_back_pic.png rename to graphics/pokemon/sharpedo/back.png diff --git a/graphics/pokemon/footprints/sharpedo_footprint.png b/graphics/pokemon/sharpedo/footprint.png similarity index 100% rename from graphics/pokemon/footprints/sharpedo_footprint.png rename to graphics/pokemon/sharpedo/footprint.png diff --git a/graphics/pokemon/front_pics/sharpedo_still_front_pic.png b/graphics/pokemon/sharpedo/front.png similarity index 100% rename from graphics/pokemon/front_pics/sharpedo_still_front_pic.png rename to graphics/pokemon/sharpedo/front.png diff --git a/graphics/pokemon/icons/sharpedo_icon.png b/graphics/pokemon/sharpedo/icon.png similarity index 100% rename from graphics/pokemon/icons/sharpedo_icon.png rename to graphics/pokemon/sharpedo/icon.png diff --git a/graphics/pokemon/palettes/sharpedo_palette.pal b/graphics/pokemon/sharpedo/normal.pal similarity index 100% rename from graphics/pokemon/palettes/sharpedo_palette.pal rename to graphics/pokemon/sharpedo/normal.pal diff --git a/graphics/pokemon/palettes/sharpedo_shiny_palette.pal b/graphics/pokemon/sharpedo/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/sharpedo_shiny_palette.pal rename to graphics/pokemon/sharpedo/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/shedinja_front_pic.png b/graphics/pokemon/shedinja/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/shedinja_front_pic.png rename to graphics/pokemon/shedinja/anim_front.png diff --git a/graphics/pokemon/back_pics/shedinja_back_pic.png b/graphics/pokemon/shedinja/back.png similarity index 100% rename from graphics/pokemon/back_pics/shedinja_back_pic.png rename to graphics/pokemon/shedinja/back.png diff --git a/graphics/pokemon/footprints/shedinja_footprint.png b/graphics/pokemon/shedinja/footprint.png similarity index 100% rename from graphics/pokemon/footprints/shedinja_footprint.png rename to graphics/pokemon/shedinja/footprint.png diff --git a/graphics/pokemon/front_pics/shedinja_still_front_pic.png b/graphics/pokemon/shedinja/front.png similarity index 100% rename from graphics/pokemon/front_pics/shedinja_still_front_pic.png rename to graphics/pokemon/shedinja/front.png diff --git a/graphics/pokemon/icons/shedinja_icon.png b/graphics/pokemon/shedinja/icon.png similarity index 100% rename from graphics/pokemon/icons/shedinja_icon.png rename to graphics/pokemon/shedinja/icon.png diff --git a/graphics/pokemon/palettes/shedinja_palette.pal b/graphics/pokemon/shedinja/normal.pal similarity index 100% rename from graphics/pokemon/palettes/shedinja_palette.pal rename to graphics/pokemon/shedinja/normal.pal diff --git a/graphics/pokemon/palettes/shedinja_shiny_palette.pal b/graphics/pokemon/shedinja/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/shedinja_shiny_palette.pal rename to graphics/pokemon/shedinja/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/shelgon_front_pic.png b/graphics/pokemon/shelgon/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/shelgon_front_pic.png rename to graphics/pokemon/shelgon/anim_front.png diff --git a/graphics/pokemon/back_pics/shelgon_back_pic.png b/graphics/pokemon/shelgon/back.png similarity index 100% rename from graphics/pokemon/back_pics/shelgon_back_pic.png rename to graphics/pokemon/shelgon/back.png diff --git a/graphics/pokemon/footprints/shelgon_footprint.png b/graphics/pokemon/shelgon/footprint.png similarity index 100% rename from graphics/pokemon/footprints/shelgon_footprint.png rename to graphics/pokemon/shelgon/footprint.png diff --git a/graphics/pokemon/front_pics/shelgon_still_front_pic.png b/graphics/pokemon/shelgon/front.png similarity index 100% rename from graphics/pokemon/front_pics/shelgon_still_front_pic.png rename to graphics/pokemon/shelgon/front.png diff --git a/graphics/pokemon/icons/shelgon_icon.png b/graphics/pokemon/shelgon/icon.png similarity index 100% rename from graphics/pokemon/icons/shelgon_icon.png rename to graphics/pokemon/shelgon/icon.png diff --git a/graphics/pokemon/palettes/shelgon_palette.pal b/graphics/pokemon/shelgon/normal.pal similarity index 100% rename from graphics/pokemon/palettes/shelgon_palette.pal rename to graphics/pokemon/shelgon/normal.pal diff --git a/graphics/pokemon/palettes/shelgon_shiny_palette.pal b/graphics/pokemon/shelgon/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/shelgon_shiny_palette.pal rename to graphics/pokemon/shelgon/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/shellder_front_pic.png b/graphics/pokemon/shellder/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/shellder_front_pic.png rename to graphics/pokemon/shellder/anim_front.png diff --git a/graphics/pokemon/back_pics/shellder_back_pic.png b/graphics/pokemon/shellder/back.png similarity index 100% rename from graphics/pokemon/back_pics/shellder_back_pic.png rename to graphics/pokemon/shellder/back.png diff --git a/graphics/pokemon/footprints/shellder_footprint.png b/graphics/pokemon/shellder/footprint.png similarity index 100% rename from graphics/pokemon/footprints/shellder_footprint.png rename to graphics/pokemon/shellder/footprint.png diff --git a/graphics/pokemon/front_pics/shellder_still_front_pic.png b/graphics/pokemon/shellder/front.png similarity index 100% rename from graphics/pokemon/front_pics/shellder_still_front_pic.png rename to graphics/pokemon/shellder/front.png diff --git a/graphics/pokemon/icons/shellder_icon.png b/graphics/pokemon/shellder/icon.png similarity index 100% rename from graphics/pokemon/icons/shellder_icon.png rename to graphics/pokemon/shellder/icon.png diff --git a/graphics/pokemon/palettes/shellder_palette.pal b/graphics/pokemon/shellder/normal.pal similarity index 100% rename from graphics/pokemon/palettes/shellder_palette.pal rename to graphics/pokemon/shellder/normal.pal diff --git a/graphics/pokemon/palettes/shellder_shiny_palette.pal b/graphics/pokemon/shellder/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/shellder_shiny_palette.pal rename to graphics/pokemon/shellder/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/shiftry_front_pic.png b/graphics/pokemon/shiftry/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/shiftry_front_pic.png rename to graphics/pokemon/shiftry/anim_front.png diff --git a/graphics/pokemon/back_pics/shiftry_back_pic.png b/graphics/pokemon/shiftry/back.png similarity index 100% rename from graphics/pokemon/back_pics/shiftry_back_pic.png rename to graphics/pokemon/shiftry/back.png diff --git a/graphics/pokemon/footprints/shiftry_footprint.png b/graphics/pokemon/shiftry/footprint.png similarity index 100% rename from graphics/pokemon/footprints/shiftry_footprint.png rename to graphics/pokemon/shiftry/footprint.png diff --git a/graphics/pokemon/front_pics/shiftry_still_front_pic.png b/graphics/pokemon/shiftry/front.png similarity index 100% rename from graphics/pokemon/front_pics/shiftry_still_front_pic.png rename to graphics/pokemon/shiftry/front.png diff --git a/graphics/pokemon/icons/shiftry_icon.png b/graphics/pokemon/shiftry/icon.png similarity index 100% rename from graphics/pokemon/icons/shiftry_icon.png rename to graphics/pokemon/shiftry/icon.png diff --git a/graphics/pokemon/palettes/shiftry_palette.pal b/graphics/pokemon/shiftry/normal.pal similarity index 100% rename from graphics/pokemon/palettes/shiftry_palette.pal rename to graphics/pokemon/shiftry/normal.pal diff --git a/graphics/pokemon/palettes/shiftry_shiny_palette.pal b/graphics/pokemon/shiftry/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/shiftry_shiny_palette.pal rename to graphics/pokemon/shiftry/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/shroomish_front_pic.png b/graphics/pokemon/shroomish/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/shroomish_front_pic.png rename to graphics/pokemon/shroomish/anim_front.png diff --git a/graphics/pokemon/back_pics/shroomish_back_pic.png b/graphics/pokemon/shroomish/back.png similarity index 100% rename from graphics/pokemon/back_pics/shroomish_back_pic.png rename to graphics/pokemon/shroomish/back.png diff --git a/graphics/pokemon/footprints/shroomish_footprint.png b/graphics/pokemon/shroomish/footprint.png similarity index 100% rename from graphics/pokemon/footprints/shroomish_footprint.png rename to graphics/pokemon/shroomish/footprint.png diff --git a/graphics/pokemon/front_pics/shroomish_still_front_pic.png b/graphics/pokemon/shroomish/front.png similarity index 100% rename from graphics/pokemon/front_pics/shroomish_still_front_pic.png rename to graphics/pokemon/shroomish/front.png diff --git a/graphics/pokemon/icons/shroomish_icon.png b/graphics/pokemon/shroomish/icon.png similarity index 100% rename from graphics/pokemon/icons/shroomish_icon.png rename to graphics/pokemon/shroomish/icon.png diff --git a/graphics/pokemon/palettes/shroomish_palette.pal b/graphics/pokemon/shroomish/normal.pal similarity index 100% rename from graphics/pokemon/palettes/shroomish_palette.pal rename to graphics/pokemon/shroomish/normal.pal diff --git a/graphics/pokemon/palettes/shroomish_shiny_palette.pal b/graphics/pokemon/shroomish/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/shroomish_shiny_palette.pal rename to graphics/pokemon/shroomish/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/shuckle_front_pic.png b/graphics/pokemon/shuckle/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/shuckle_front_pic.png rename to graphics/pokemon/shuckle/anim_front.png diff --git a/graphics/pokemon/back_pics/shuckle_back_pic.png b/graphics/pokemon/shuckle/back.png similarity index 100% rename from graphics/pokemon/back_pics/shuckle_back_pic.png rename to graphics/pokemon/shuckle/back.png diff --git a/graphics/pokemon/footprints/shuckle_footprint.png b/graphics/pokemon/shuckle/footprint.png similarity index 100% rename from graphics/pokemon/footprints/shuckle_footprint.png rename to graphics/pokemon/shuckle/footprint.png diff --git a/graphics/pokemon/front_pics/shuckle_still_front_pic.png b/graphics/pokemon/shuckle/front.png similarity index 100% rename from graphics/pokemon/front_pics/shuckle_still_front_pic.png rename to graphics/pokemon/shuckle/front.png diff --git a/graphics/pokemon/icons/shuckle_icon.png b/graphics/pokemon/shuckle/icon.png similarity index 100% rename from graphics/pokemon/icons/shuckle_icon.png rename to graphics/pokemon/shuckle/icon.png diff --git a/graphics/pokemon/palettes/shuckle_palette.pal b/graphics/pokemon/shuckle/normal.pal similarity index 100% rename from graphics/pokemon/palettes/shuckle_palette.pal rename to graphics/pokemon/shuckle/normal.pal diff --git a/graphics/pokemon/palettes/shuckle_shiny_palette.pal b/graphics/pokemon/shuckle/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/shuckle_shiny_palette.pal rename to graphics/pokemon/shuckle/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/shuppet_front_pic.png b/graphics/pokemon/shuppet/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/shuppet_front_pic.png rename to graphics/pokemon/shuppet/anim_front.png diff --git a/graphics/pokemon/back_pics/shuppet_back_pic.png b/graphics/pokemon/shuppet/back.png similarity index 100% rename from graphics/pokemon/back_pics/shuppet_back_pic.png rename to graphics/pokemon/shuppet/back.png diff --git a/graphics/pokemon/footprints/shuppet_footprint.png b/graphics/pokemon/shuppet/footprint.png similarity index 100% rename from graphics/pokemon/footprints/shuppet_footprint.png rename to graphics/pokemon/shuppet/footprint.png diff --git a/graphics/pokemon/front_pics/shuppet_still_front_pic.png b/graphics/pokemon/shuppet/front.png similarity index 100% rename from graphics/pokemon/front_pics/shuppet_still_front_pic.png rename to graphics/pokemon/shuppet/front.png diff --git a/graphics/pokemon/icons/shuppet_icon.png b/graphics/pokemon/shuppet/icon.png similarity index 100% rename from graphics/pokemon/icons/shuppet_icon.png rename to graphics/pokemon/shuppet/icon.png diff --git a/graphics/pokemon/palettes/shuppet_palette.pal b/graphics/pokemon/shuppet/normal.pal similarity index 100% rename from graphics/pokemon/palettes/shuppet_palette.pal rename to graphics/pokemon/shuppet/normal.pal diff --git a/graphics/pokemon/palettes/shuppet_shiny_palette.pal b/graphics/pokemon/shuppet/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/shuppet_shiny_palette.pal rename to graphics/pokemon/shuppet/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/silcoon_front_pic.png b/graphics/pokemon/silcoon/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/silcoon_front_pic.png rename to graphics/pokemon/silcoon/anim_front.png diff --git a/graphics/pokemon/back_pics/silcoon_back_pic.png b/graphics/pokemon/silcoon/back.png similarity index 100% rename from graphics/pokemon/back_pics/silcoon_back_pic.png rename to graphics/pokemon/silcoon/back.png diff --git a/graphics/pokemon/footprints/silcoon_footprint.png b/graphics/pokemon/silcoon/footprint.png similarity index 100% rename from graphics/pokemon/footprints/silcoon_footprint.png rename to graphics/pokemon/silcoon/footprint.png diff --git a/graphics/pokemon/front_pics/silcoon_still_front_pic.png b/graphics/pokemon/silcoon/front.png similarity index 100% rename from graphics/pokemon/front_pics/silcoon_still_front_pic.png rename to graphics/pokemon/silcoon/front.png diff --git a/graphics/pokemon/icons/silcoon_icon.png b/graphics/pokemon/silcoon/icon.png similarity index 100% rename from graphics/pokemon/icons/silcoon_icon.png rename to graphics/pokemon/silcoon/icon.png diff --git a/graphics/pokemon/palettes/silcoon_palette.pal b/graphics/pokemon/silcoon/normal.pal similarity index 100% rename from graphics/pokemon/palettes/silcoon_palette.pal rename to graphics/pokemon/silcoon/normal.pal diff --git a/graphics/pokemon/palettes/silcoon_shiny_palette.pal b/graphics/pokemon/silcoon/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/silcoon_shiny_palette.pal rename to graphics/pokemon/silcoon/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/skarmory_front_pic.png b/graphics/pokemon/skarmory/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/skarmory_front_pic.png rename to graphics/pokemon/skarmory/anim_front.png diff --git a/graphics/pokemon/back_pics/skarmory_back_pic.png b/graphics/pokemon/skarmory/back.png similarity index 100% rename from graphics/pokemon/back_pics/skarmory_back_pic.png rename to graphics/pokemon/skarmory/back.png diff --git a/graphics/pokemon/footprints/skarmory_footprint.png b/graphics/pokemon/skarmory/footprint.png similarity index 100% rename from graphics/pokemon/footprints/skarmory_footprint.png rename to graphics/pokemon/skarmory/footprint.png diff --git a/graphics/pokemon/front_pics/skarmory_still_front_pic.png b/graphics/pokemon/skarmory/front.png similarity index 100% rename from graphics/pokemon/front_pics/skarmory_still_front_pic.png rename to graphics/pokemon/skarmory/front.png diff --git a/graphics/pokemon/icons/skarmory_icon.png b/graphics/pokemon/skarmory/icon.png similarity index 100% rename from graphics/pokemon/icons/skarmory_icon.png rename to graphics/pokemon/skarmory/icon.png diff --git a/graphics/pokemon/palettes/skarmory_palette.pal b/graphics/pokemon/skarmory/normal.pal similarity index 100% rename from graphics/pokemon/palettes/skarmory_palette.pal rename to graphics/pokemon/skarmory/normal.pal diff --git a/graphics/pokemon/palettes/skarmory_shiny_palette.pal b/graphics/pokemon/skarmory/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/skarmory_shiny_palette.pal rename to graphics/pokemon/skarmory/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/skiploom_front_pic.png b/graphics/pokemon/skiploom/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/skiploom_front_pic.png rename to graphics/pokemon/skiploom/anim_front.png diff --git a/graphics/pokemon/back_pics/skiploom_back_pic.png b/graphics/pokemon/skiploom/back.png similarity index 100% rename from graphics/pokemon/back_pics/skiploom_back_pic.png rename to graphics/pokemon/skiploom/back.png diff --git a/graphics/pokemon/footprints/skiploom_footprint.png b/graphics/pokemon/skiploom/footprint.png similarity index 100% rename from graphics/pokemon/footprints/skiploom_footprint.png rename to graphics/pokemon/skiploom/footprint.png diff --git a/graphics/pokemon/front_pics/skiploom_still_front_pic.png b/graphics/pokemon/skiploom/front.png similarity index 100% rename from graphics/pokemon/front_pics/skiploom_still_front_pic.png rename to graphics/pokemon/skiploom/front.png diff --git a/graphics/pokemon/icons/skiploom_icon.png b/graphics/pokemon/skiploom/icon.png similarity index 100% rename from graphics/pokemon/icons/skiploom_icon.png rename to graphics/pokemon/skiploom/icon.png diff --git a/graphics/pokemon/palettes/skiploom_palette.pal b/graphics/pokemon/skiploom/normal.pal similarity index 100% rename from graphics/pokemon/palettes/skiploom_palette.pal rename to graphics/pokemon/skiploom/normal.pal diff --git a/graphics/pokemon/palettes/skiploom_shiny_palette.pal b/graphics/pokemon/skiploom/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/skiploom_shiny_palette.pal rename to graphics/pokemon/skiploom/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/skitty_front_pic.png b/graphics/pokemon/skitty/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/skitty_front_pic.png rename to graphics/pokemon/skitty/anim_front.png diff --git a/graphics/pokemon/back_pics/skitty_back_pic.png b/graphics/pokemon/skitty/back.png similarity index 100% rename from graphics/pokemon/back_pics/skitty_back_pic.png rename to graphics/pokemon/skitty/back.png diff --git a/graphics/pokemon/footprints/skitty_footprint.png b/graphics/pokemon/skitty/footprint.png similarity index 100% rename from graphics/pokemon/footprints/skitty_footprint.png rename to graphics/pokemon/skitty/footprint.png diff --git a/graphics/pokemon/front_pics/skitty_still_front_pic.png b/graphics/pokemon/skitty/front.png similarity index 100% rename from graphics/pokemon/front_pics/skitty_still_front_pic.png rename to graphics/pokemon/skitty/front.png diff --git a/graphics/pokemon/icons/skitty_icon.png b/graphics/pokemon/skitty/icon.png similarity index 100% rename from graphics/pokemon/icons/skitty_icon.png rename to graphics/pokemon/skitty/icon.png diff --git a/graphics/pokemon/palettes/skitty_palette.pal b/graphics/pokemon/skitty/normal.pal similarity index 100% rename from graphics/pokemon/palettes/skitty_palette.pal rename to graphics/pokemon/skitty/normal.pal diff --git a/graphics/pokemon/palettes/skitty_shiny_palette.pal b/graphics/pokemon/skitty/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/skitty_shiny_palette.pal rename to graphics/pokemon/skitty/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/slaking_front_pic.png b/graphics/pokemon/slaking/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/slaking_front_pic.png rename to graphics/pokemon/slaking/anim_front.png diff --git a/graphics/pokemon/back_pics/slaking_back_pic.png b/graphics/pokemon/slaking/back.png similarity index 100% rename from graphics/pokemon/back_pics/slaking_back_pic.png rename to graphics/pokemon/slaking/back.png diff --git a/graphics/pokemon/footprints/slaking_footprint.png b/graphics/pokemon/slaking/footprint.png similarity index 100% rename from graphics/pokemon/footprints/slaking_footprint.png rename to graphics/pokemon/slaking/footprint.png diff --git a/graphics/pokemon/front_pics/slaking_still_front_pic.png b/graphics/pokemon/slaking/front.png similarity index 100% rename from graphics/pokemon/front_pics/slaking_still_front_pic.png rename to graphics/pokemon/slaking/front.png diff --git a/graphics/pokemon/icons/slaking_icon.png b/graphics/pokemon/slaking/icon.png similarity index 100% rename from graphics/pokemon/icons/slaking_icon.png rename to graphics/pokemon/slaking/icon.png diff --git a/graphics/pokemon/palettes/slaking_palette.pal b/graphics/pokemon/slaking/normal.pal similarity index 100% rename from graphics/pokemon/palettes/slaking_palette.pal rename to graphics/pokemon/slaking/normal.pal diff --git a/graphics/pokemon/palettes/slaking_shiny_palette.pal b/graphics/pokemon/slaking/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/slaking_shiny_palette.pal rename to graphics/pokemon/slaking/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/slakoth_front_pic.png b/graphics/pokemon/slakoth/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/slakoth_front_pic.png rename to graphics/pokemon/slakoth/anim_front.png diff --git a/graphics/pokemon/back_pics/slakoth_back_pic.png b/graphics/pokemon/slakoth/back.png similarity index 100% rename from graphics/pokemon/back_pics/slakoth_back_pic.png rename to graphics/pokemon/slakoth/back.png diff --git a/graphics/pokemon/footprints/slakoth_footprint.png b/graphics/pokemon/slakoth/footprint.png similarity index 100% rename from graphics/pokemon/footprints/slakoth_footprint.png rename to graphics/pokemon/slakoth/footprint.png diff --git a/graphics/pokemon/front_pics/slakoth_still_front_pic.png b/graphics/pokemon/slakoth/front.png similarity index 100% rename from graphics/pokemon/front_pics/slakoth_still_front_pic.png rename to graphics/pokemon/slakoth/front.png diff --git a/graphics/pokemon/icons/slakoth_icon.png b/graphics/pokemon/slakoth/icon.png similarity index 100% rename from graphics/pokemon/icons/slakoth_icon.png rename to graphics/pokemon/slakoth/icon.png diff --git a/graphics/pokemon/palettes/slakoth_palette.pal b/graphics/pokemon/slakoth/normal.pal similarity index 100% rename from graphics/pokemon/palettes/slakoth_palette.pal rename to graphics/pokemon/slakoth/normal.pal diff --git a/graphics/pokemon/palettes/slakoth_shiny_palette.pal b/graphics/pokemon/slakoth/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/slakoth_shiny_palette.pal rename to graphics/pokemon/slakoth/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/slowbro_front_pic.png b/graphics/pokemon/slowbro/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/slowbro_front_pic.png rename to graphics/pokemon/slowbro/anim_front.png diff --git a/graphics/pokemon/back_pics/slowbro_back_pic.png b/graphics/pokemon/slowbro/back.png similarity index 100% rename from graphics/pokemon/back_pics/slowbro_back_pic.png rename to graphics/pokemon/slowbro/back.png diff --git a/graphics/pokemon/footprints/slowbro_footprint.png b/graphics/pokemon/slowbro/footprint.png similarity index 100% rename from graphics/pokemon/footprints/slowbro_footprint.png rename to graphics/pokemon/slowbro/footprint.png diff --git a/graphics/pokemon/front_pics/slowbro_still_front_pic.png b/graphics/pokemon/slowbro/front.png similarity index 100% rename from graphics/pokemon/front_pics/slowbro_still_front_pic.png rename to graphics/pokemon/slowbro/front.png diff --git a/graphics/pokemon/icons/slowbro_icon.png b/graphics/pokemon/slowbro/icon.png similarity index 100% rename from graphics/pokemon/icons/slowbro_icon.png rename to graphics/pokemon/slowbro/icon.png diff --git a/graphics/pokemon/palettes/slowbro_palette.pal b/graphics/pokemon/slowbro/normal.pal similarity index 100% rename from graphics/pokemon/palettes/slowbro_palette.pal rename to graphics/pokemon/slowbro/normal.pal diff --git a/graphics/pokemon/palettes/slowbro_shiny_palette.pal b/graphics/pokemon/slowbro/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/slowbro_shiny_palette.pal rename to graphics/pokemon/slowbro/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/slowking_front_pic.png b/graphics/pokemon/slowking/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/slowking_front_pic.png rename to graphics/pokemon/slowking/anim_front.png diff --git a/graphics/pokemon/back_pics/slowking_back_pic.png b/graphics/pokemon/slowking/back.png similarity index 100% rename from graphics/pokemon/back_pics/slowking_back_pic.png rename to graphics/pokemon/slowking/back.png diff --git a/graphics/pokemon/footprints/slowking_footprint.png b/graphics/pokemon/slowking/footprint.png similarity index 100% rename from graphics/pokemon/footprints/slowking_footprint.png rename to graphics/pokemon/slowking/footprint.png diff --git a/graphics/pokemon/front_pics/slowking_still_front_pic.png b/graphics/pokemon/slowking/front.png similarity index 100% rename from graphics/pokemon/front_pics/slowking_still_front_pic.png rename to graphics/pokemon/slowking/front.png diff --git a/graphics/pokemon/icons/slowking_icon.png b/graphics/pokemon/slowking/icon.png similarity index 100% rename from graphics/pokemon/icons/slowking_icon.png rename to graphics/pokemon/slowking/icon.png diff --git a/graphics/pokemon/palettes/slowking_palette.pal b/graphics/pokemon/slowking/normal.pal similarity index 100% rename from graphics/pokemon/palettes/slowking_palette.pal rename to graphics/pokemon/slowking/normal.pal diff --git a/graphics/pokemon/palettes/slowking_shiny_palette.pal b/graphics/pokemon/slowking/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/slowking_shiny_palette.pal rename to graphics/pokemon/slowking/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/slowpoke_front_pic.png b/graphics/pokemon/slowpoke/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/slowpoke_front_pic.png rename to graphics/pokemon/slowpoke/anim_front.png diff --git a/graphics/pokemon/back_pics/slowpoke_back_pic.png b/graphics/pokemon/slowpoke/back.png similarity index 100% rename from graphics/pokemon/back_pics/slowpoke_back_pic.png rename to graphics/pokemon/slowpoke/back.png diff --git a/graphics/pokemon/footprints/slowpoke_footprint.png b/graphics/pokemon/slowpoke/footprint.png similarity index 100% rename from graphics/pokemon/footprints/slowpoke_footprint.png rename to graphics/pokemon/slowpoke/footprint.png diff --git a/graphics/pokemon/front_pics/slowpoke_still_front_pic.png b/graphics/pokemon/slowpoke/front.png similarity index 100% rename from graphics/pokemon/front_pics/slowpoke_still_front_pic.png rename to graphics/pokemon/slowpoke/front.png diff --git a/graphics/pokemon/icons/slowpoke_icon.png b/graphics/pokemon/slowpoke/icon.png similarity index 100% rename from graphics/pokemon/icons/slowpoke_icon.png rename to graphics/pokemon/slowpoke/icon.png diff --git a/graphics/pokemon/palettes/slowpoke_palette.pal b/graphics/pokemon/slowpoke/normal.pal similarity index 100% rename from graphics/pokemon/palettes/slowpoke_palette.pal rename to graphics/pokemon/slowpoke/normal.pal diff --git a/graphics/pokemon/palettes/slowpoke_shiny_palette.pal b/graphics/pokemon/slowpoke/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/slowpoke_shiny_palette.pal rename to graphics/pokemon/slowpoke/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/slugma_front_pic.png b/graphics/pokemon/slugma/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/slugma_front_pic.png rename to graphics/pokemon/slugma/anim_front.png diff --git a/graphics/pokemon/back_pics/slugma_back_pic.png b/graphics/pokemon/slugma/back.png similarity index 100% rename from graphics/pokemon/back_pics/slugma_back_pic.png rename to graphics/pokemon/slugma/back.png diff --git a/graphics/pokemon/footprints/slugma_footprint.png b/graphics/pokemon/slugma/footprint.png similarity index 100% rename from graphics/pokemon/footprints/slugma_footprint.png rename to graphics/pokemon/slugma/footprint.png diff --git a/graphics/pokemon/front_pics/slugma_still_front_pic.png b/graphics/pokemon/slugma/front.png similarity index 100% rename from graphics/pokemon/front_pics/slugma_still_front_pic.png rename to graphics/pokemon/slugma/front.png diff --git a/graphics/pokemon/icons/slugma_icon.png b/graphics/pokemon/slugma/icon.png similarity index 100% rename from graphics/pokemon/icons/slugma_icon.png rename to graphics/pokemon/slugma/icon.png diff --git a/graphics/pokemon/palettes/slugma_palette.pal b/graphics/pokemon/slugma/normal.pal similarity index 100% rename from graphics/pokemon/palettes/slugma_palette.pal rename to graphics/pokemon/slugma/normal.pal diff --git a/graphics/pokemon/palettes/slugma_shiny_palette.pal b/graphics/pokemon/slugma/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/slugma_shiny_palette.pal rename to graphics/pokemon/slugma/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/smeargle_front_pic.png b/graphics/pokemon/smeargle/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/smeargle_front_pic.png rename to graphics/pokemon/smeargle/anim_front.png diff --git a/graphics/pokemon/back_pics/smeargle_back_pic.png b/graphics/pokemon/smeargle/back.png similarity index 100% rename from graphics/pokemon/back_pics/smeargle_back_pic.png rename to graphics/pokemon/smeargle/back.png diff --git a/graphics/pokemon/footprints/smeargle_footprint.png b/graphics/pokemon/smeargle/footprint.png similarity index 100% rename from graphics/pokemon/footprints/smeargle_footprint.png rename to graphics/pokemon/smeargle/footprint.png diff --git a/graphics/pokemon/front_pics/smeargle_still_front_pic.png b/graphics/pokemon/smeargle/front.png similarity index 100% rename from graphics/pokemon/front_pics/smeargle_still_front_pic.png rename to graphics/pokemon/smeargle/front.png diff --git a/graphics/pokemon/icons/smeargle_icon.png b/graphics/pokemon/smeargle/icon.png similarity index 100% rename from graphics/pokemon/icons/smeargle_icon.png rename to graphics/pokemon/smeargle/icon.png diff --git a/graphics/pokemon/palettes/smeargle_palette.pal b/graphics/pokemon/smeargle/normal.pal similarity index 100% rename from graphics/pokemon/palettes/smeargle_palette.pal rename to graphics/pokemon/smeargle/normal.pal diff --git a/graphics/pokemon/palettes/smeargle_shiny_palette.pal b/graphics/pokemon/smeargle/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/smeargle_shiny_palette.pal rename to graphics/pokemon/smeargle/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/smoochum_front_pic.png b/graphics/pokemon/smoochum/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/smoochum_front_pic.png rename to graphics/pokemon/smoochum/anim_front.png diff --git a/graphics/pokemon/back_pics/smoochum_back_pic.png b/graphics/pokemon/smoochum/back.png similarity index 100% rename from graphics/pokemon/back_pics/smoochum_back_pic.png rename to graphics/pokemon/smoochum/back.png diff --git a/graphics/pokemon/footprints/smoochum_footprint.png b/graphics/pokemon/smoochum/footprint.png similarity index 100% rename from graphics/pokemon/footprints/smoochum_footprint.png rename to graphics/pokemon/smoochum/footprint.png diff --git a/graphics/pokemon/front_pics/smoochum_still_front_pic.png b/graphics/pokemon/smoochum/front.png similarity index 100% rename from graphics/pokemon/front_pics/smoochum_still_front_pic.png rename to graphics/pokemon/smoochum/front.png diff --git a/graphics/pokemon/icons/smoochum_icon.png b/graphics/pokemon/smoochum/icon.png similarity index 100% rename from graphics/pokemon/icons/smoochum_icon.png rename to graphics/pokemon/smoochum/icon.png diff --git a/graphics/pokemon/palettes/smoochum_palette.pal b/graphics/pokemon/smoochum/normal.pal similarity index 100% rename from graphics/pokemon/palettes/smoochum_palette.pal rename to graphics/pokemon/smoochum/normal.pal diff --git a/graphics/pokemon/palettes/smoochum_shiny_palette.pal b/graphics/pokemon/smoochum/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/smoochum_shiny_palette.pal rename to graphics/pokemon/smoochum/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/sneasel_front_pic.png b/graphics/pokemon/sneasel/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/sneasel_front_pic.png rename to graphics/pokemon/sneasel/anim_front.png diff --git a/graphics/pokemon/back_pics/sneasel_back_pic.png b/graphics/pokemon/sneasel/back.png similarity index 100% rename from graphics/pokemon/back_pics/sneasel_back_pic.png rename to graphics/pokemon/sneasel/back.png diff --git a/graphics/pokemon/footprints/sneasel_footprint.png b/graphics/pokemon/sneasel/footprint.png similarity index 100% rename from graphics/pokemon/footprints/sneasel_footprint.png rename to graphics/pokemon/sneasel/footprint.png diff --git a/graphics/pokemon/front_pics/sneasel_still_front_pic.png b/graphics/pokemon/sneasel/front.png similarity index 100% rename from graphics/pokemon/front_pics/sneasel_still_front_pic.png rename to graphics/pokemon/sneasel/front.png diff --git a/graphics/pokemon/icons/sneasel_icon.png b/graphics/pokemon/sneasel/icon.png similarity index 100% rename from graphics/pokemon/icons/sneasel_icon.png rename to graphics/pokemon/sneasel/icon.png diff --git a/graphics/pokemon/palettes/sneasel_palette.pal b/graphics/pokemon/sneasel/normal.pal similarity index 100% rename from graphics/pokemon/palettes/sneasel_palette.pal rename to graphics/pokemon/sneasel/normal.pal diff --git a/graphics/pokemon/palettes/sneasel_shiny_palette.pal b/graphics/pokemon/sneasel/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/sneasel_shiny_palette.pal rename to graphics/pokemon/sneasel/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/snorlax_front_pic.png b/graphics/pokemon/snorlax/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/snorlax_front_pic.png rename to graphics/pokemon/snorlax/anim_front.png diff --git a/graphics/pokemon/back_pics/snorlax_back_pic.png b/graphics/pokemon/snorlax/back.png similarity index 100% rename from graphics/pokemon/back_pics/snorlax_back_pic.png rename to graphics/pokemon/snorlax/back.png diff --git a/graphics/pokemon/footprints/snorlax_footprint.png b/graphics/pokemon/snorlax/footprint.png similarity index 100% rename from graphics/pokemon/footprints/snorlax_footprint.png rename to graphics/pokemon/snorlax/footprint.png diff --git a/graphics/pokemon/front_pics/snorlax_still_front_pic.png b/graphics/pokemon/snorlax/front.png similarity index 100% rename from graphics/pokemon/front_pics/snorlax_still_front_pic.png rename to graphics/pokemon/snorlax/front.png diff --git a/graphics/pokemon/icons/snorlax_icon.png b/graphics/pokemon/snorlax/icon.png similarity index 100% rename from graphics/pokemon/icons/snorlax_icon.png rename to graphics/pokemon/snorlax/icon.png diff --git a/graphics/pokemon/palettes/snorlax_palette.pal b/graphics/pokemon/snorlax/normal.pal similarity index 100% rename from graphics/pokemon/palettes/snorlax_palette.pal rename to graphics/pokemon/snorlax/normal.pal diff --git a/graphics/pokemon/palettes/snorlax_shiny_palette.pal b/graphics/pokemon/snorlax/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/snorlax_shiny_palette.pal rename to graphics/pokemon/snorlax/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/snorunt_front_pic.png b/graphics/pokemon/snorunt/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/snorunt_front_pic.png rename to graphics/pokemon/snorunt/anim_front.png diff --git a/graphics/pokemon/back_pics/snorunt_back_pic.png b/graphics/pokemon/snorunt/back.png similarity index 100% rename from graphics/pokemon/back_pics/snorunt_back_pic.png rename to graphics/pokemon/snorunt/back.png diff --git a/graphics/pokemon/footprints/snorunt_footprint.png b/graphics/pokemon/snorunt/footprint.png similarity index 100% rename from graphics/pokemon/footprints/snorunt_footprint.png rename to graphics/pokemon/snorunt/footprint.png diff --git a/graphics/pokemon/front_pics/snorunt_still_front_pic.png b/graphics/pokemon/snorunt/front.png similarity index 100% rename from graphics/pokemon/front_pics/snorunt_still_front_pic.png rename to graphics/pokemon/snorunt/front.png diff --git a/graphics/pokemon/icons/snorunt_icon.png b/graphics/pokemon/snorunt/icon.png similarity index 100% rename from graphics/pokemon/icons/snorunt_icon.png rename to graphics/pokemon/snorunt/icon.png diff --git a/graphics/pokemon/palettes/snorunt_palette.pal b/graphics/pokemon/snorunt/normal.pal similarity index 100% rename from graphics/pokemon/palettes/snorunt_palette.pal rename to graphics/pokemon/snorunt/normal.pal diff --git a/graphics/pokemon/palettes/snorunt_shiny_palette.pal b/graphics/pokemon/snorunt/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/snorunt_shiny_palette.pal rename to graphics/pokemon/snorunt/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/snubbull_front_pic.png b/graphics/pokemon/snubbull/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/snubbull_front_pic.png rename to graphics/pokemon/snubbull/anim_front.png diff --git a/graphics/pokemon/back_pics/snubbull_back_pic.png b/graphics/pokemon/snubbull/back.png similarity index 100% rename from graphics/pokemon/back_pics/snubbull_back_pic.png rename to graphics/pokemon/snubbull/back.png diff --git a/graphics/pokemon/footprints/snubbull_footprint.png b/graphics/pokemon/snubbull/footprint.png similarity index 100% rename from graphics/pokemon/footprints/snubbull_footprint.png rename to graphics/pokemon/snubbull/footprint.png diff --git a/graphics/pokemon/front_pics/snubbull_still_front_pic.png b/graphics/pokemon/snubbull/front.png similarity index 100% rename from graphics/pokemon/front_pics/snubbull_still_front_pic.png rename to graphics/pokemon/snubbull/front.png diff --git a/graphics/pokemon/icons/snubbull_icon.png b/graphics/pokemon/snubbull/icon.png similarity index 100% rename from graphics/pokemon/icons/snubbull_icon.png rename to graphics/pokemon/snubbull/icon.png diff --git a/graphics/pokemon/palettes/snubbull_palette.pal b/graphics/pokemon/snubbull/normal.pal similarity index 100% rename from graphics/pokemon/palettes/snubbull_palette.pal rename to graphics/pokemon/snubbull/normal.pal diff --git a/graphics/pokemon/palettes/snubbull_shiny_palette.pal b/graphics/pokemon/snubbull/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/snubbull_shiny_palette.pal rename to graphics/pokemon/snubbull/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/solrock_front_pic.png b/graphics/pokemon/solrock/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/solrock_front_pic.png rename to graphics/pokemon/solrock/anim_front.png diff --git a/graphics/pokemon/back_pics/solrock_back_pic.png b/graphics/pokemon/solrock/back.png similarity index 100% rename from graphics/pokemon/back_pics/solrock_back_pic.png rename to graphics/pokemon/solrock/back.png diff --git a/graphics/pokemon/footprints/solrock_footprint.png b/graphics/pokemon/solrock/footprint.png similarity index 100% rename from graphics/pokemon/footprints/solrock_footprint.png rename to graphics/pokemon/solrock/footprint.png diff --git a/graphics/pokemon/front_pics/solrock_still_front_pic.png b/graphics/pokemon/solrock/front.png similarity index 100% rename from graphics/pokemon/front_pics/solrock_still_front_pic.png rename to graphics/pokemon/solrock/front.png diff --git a/graphics/pokemon/icons/solrock_icon.png b/graphics/pokemon/solrock/icon.png similarity index 100% rename from graphics/pokemon/icons/solrock_icon.png rename to graphics/pokemon/solrock/icon.png diff --git a/graphics/pokemon/palettes/solrock_palette.pal b/graphics/pokemon/solrock/normal.pal similarity index 100% rename from graphics/pokemon/palettes/solrock_palette.pal rename to graphics/pokemon/solrock/normal.pal diff --git a/graphics/pokemon/palettes/solrock_shiny_palette.pal b/graphics/pokemon/solrock/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/solrock_shiny_palette.pal rename to graphics/pokemon/solrock/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/spearow_front_pic.png b/graphics/pokemon/spearow/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/spearow_front_pic.png rename to graphics/pokemon/spearow/anim_front.png diff --git a/graphics/pokemon/back_pics/spearow_back_pic.png b/graphics/pokemon/spearow/back.png similarity index 100% rename from graphics/pokemon/back_pics/spearow_back_pic.png rename to graphics/pokemon/spearow/back.png diff --git a/graphics/pokemon/footprints/spearow_footprint.png b/graphics/pokemon/spearow/footprint.png similarity index 100% rename from graphics/pokemon/footprints/spearow_footprint.png rename to graphics/pokemon/spearow/footprint.png diff --git a/graphics/pokemon/front_pics/spearow_still_front_pic.png b/graphics/pokemon/spearow/front.png similarity index 100% rename from graphics/pokemon/front_pics/spearow_still_front_pic.png rename to graphics/pokemon/spearow/front.png diff --git a/graphics/pokemon/icons/spearow_icon.png b/graphics/pokemon/spearow/icon.png similarity index 100% rename from graphics/pokemon/icons/spearow_icon.png rename to graphics/pokemon/spearow/icon.png diff --git a/graphics/pokemon/palettes/spearow_palette.pal b/graphics/pokemon/spearow/normal.pal similarity index 100% rename from graphics/pokemon/palettes/spearow_palette.pal rename to graphics/pokemon/spearow/normal.pal diff --git a/graphics/pokemon/palettes/spearow_shiny_palette.pal b/graphics/pokemon/spearow/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/spearow_shiny_palette.pal rename to graphics/pokemon/spearow/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/spheal_front_pic.png b/graphics/pokemon/spheal/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/spheal_front_pic.png rename to graphics/pokemon/spheal/anim_front.png diff --git a/graphics/pokemon/back_pics/spheal_back_pic.png b/graphics/pokemon/spheal/back.png similarity index 100% rename from graphics/pokemon/back_pics/spheal_back_pic.png rename to graphics/pokemon/spheal/back.png diff --git a/graphics/pokemon/footprints/spheal_footprint.png b/graphics/pokemon/spheal/footprint.png similarity index 100% rename from graphics/pokemon/footprints/spheal_footprint.png rename to graphics/pokemon/spheal/footprint.png diff --git a/graphics/pokemon/front_pics/spheal_still_front_pic.png b/graphics/pokemon/spheal/front.png similarity index 100% rename from graphics/pokemon/front_pics/spheal_still_front_pic.png rename to graphics/pokemon/spheal/front.png diff --git a/graphics/pokemon/icons/spheal_icon.png b/graphics/pokemon/spheal/icon.png similarity index 100% rename from graphics/pokemon/icons/spheal_icon.png rename to graphics/pokemon/spheal/icon.png diff --git a/graphics/pokemon/palettes/spheal_palette.pal b/graphics/pokemon/spheal/normal.pal similarity index 100% rename from graphics/pokemon/palettes/spheal_palette.pal rename to graphics/pokemon/spheal/normal.pal diff --git a/graphics/pokemon/palettes/spheal_shiny_palette.pal b/graphics/pokemon/spheal/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/spheal_shiny_palette.pal rename to graphics/pokemon/spheal/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/spinarak_front_pic.png b/graphics/pokemon/spinarak/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/spinarak_front_pic.png rename to graphics/pokemon/spinarak/anim_front.png diff --git a/graphics/pokemon/back_pics/spinarak_back_pic.png b/graphics/pokemon/spinarak/back.png similarity index 100% rename from graphics/pokemon/back_pics/spinarak_back_pic.png rename to graphics/pokemon/spinarak/back.png diff --git a/graphics/pokemon/footprints/spinarak_footprint.png b/graphics/pokemon/spinarak/footprint.png similarity index 100% rename from graphics/pokemon/footprints/spinarak_footprint.png rename to graphics/pokemon/spinarak/footprint.png diff --git a/graphics/pokemon/front_pics/spinarak_still_front_pic.png b/graphics/pokemon/spinarak/front.png similarity index 100% rename from graphics/pokemon/front_pics/spinarak_still_front_pic.png rename to graphics/pokemon/spinarak/front.png diff --git a/graphics/pokemon/icons/spinarak_icon.png b/graphics/pokemon/spinarak/icon.png similarity index 100% rename from graphics/pokemon/icons/spinarak_icon.png rename to graphics/pokemon/spinarak/icon.png diff --git a/graphics/pokemon/palettes/spinarak_palette.pal b/graphics/pokemon/spinarak/normal.pal similarity index 100% rename from graphics/pokemon/palettes/spinarak_palette.pal rename to graphics/pokemon/spinarak/normal.pal diff --git a/graphics/pokemon/palettes/spinarak_shiny_palette.pal b/graphics/pokemon/spinarak/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/spinarak_shiny_palette.pal rename to graphics/pokemon/spinarak/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/spinda_front_pic.png b/graphics/pokemon/spinda/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/spinda_front_pic.png rename to graphics/pokemon/spinda/anim_front.png diff --git a/graphics/pokemon/back_pics/spinda_back_pic.png b/graphics/pokemon/spinda/back.png similarity index 100% rename from graphics/pokemon/back_pics/spinda_back_pic.png rename to graphics/pokemon/spinda/back.png diff --git a/graphics/pokemon/footprints/spinda_footprint.png b/graphics/pokemon/spinda/footprint.png similarity index 100% rename from graphics/pokemon/footprints/spinda_footprint.png rename to graphics/pokemon/spinda/footprint.png diff --git a/graphics/pokemon/front_pics/spinda_still_front_pic.png b/graphics/pokemon/spinda/front.png similarity index 100% rename from graphics/pokemon/front_pics/spinda_still_front_pic.png rename to graphics/pokemon/spinda/front.png diff --git a/graphics/pokemon/icons/spinda_icon.png b/graphics/pokemon/spinda/icon.png similarity index 100% rename from graphics/pokemon/icons/spinda_icon.png rename to graphics/pokemon/spinda/icon.png diff --git a/graphics/pokemon/palettes/spinda_palette.pal b/graphics/pokemon/spinda/normal.pal similarity index 100% rename from graphics/pokemon/palettes/spinda_palette.pal rename to graphics/pokemon/spinda/normal.pal diff --git a/graphics/pokemon/palettes/spinda_shiny_palette.pal b/graphics/pokemon/spinda/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/spinda_shiny_palette.pal rename to graphics/pokemon/spinda/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/spoink_front_pic.png b/graphics/pokemon/spoink/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/spoink_front_pic.png rename to graphics/pokemon/spoink/anim_front.png diff --git a/graphics/pokemon/back_pics/spoink_back_pic.png b/graphics/pokemon/spoink/back.png similarity index 100% rename from graphics/pokemon/back_pics/spoink_back_pic.png rename to graphics/pokemon/spoink/back.png diff --git a/graphics/pokemon/footprints/spoink_footprint.png b/graphics/pokemon/spoink/footprint.png similarity index 100% rename from graphics/pokemon/footprints/spoink_footprint.png rename to graphics/pokemon/spoink/footprint.png diff --git a/graphics/pokemon/front_pics/spoink_still_front_pic.png b/graphics/pokemon/spoink/front.png similarity index 100% rename from graphics/pokemon/front_pics/spoink_still_front_pic.png rename to graphics/pokemon/spoink/front.png diff --git a/graphics/pokemon/icons/spoink_icon.png b/graphics/pokemon/spoink/icon.png similarity index 100% rename from graphics/pokemon/icons/spoink_icon.png rename to graphics/pokemon/spoink/icon.png diff --git a/graphics/pokemon/palettes/spoink_palette.pal b/graphics/pokemon/spoink/normal.pal similarity index 100% rename from graphics/pokemon/palettes/spoink_palette.pal rename to graphics/pokemon/spoink/normal.pal diff --git a/graphics/pokemon/palettes/spoink_shiny_palette.pal b/graphics/pokemon/spoink/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/spoink_shiny_palette.pal rename to graphics/pokemon/spoink/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/squirtle_front_pic.png b/graphics/pokemon/squirtle/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/squirtle_front_pic.png rename to graphics/pokemon/squirtle/anim_front.png diff --git a/graphics/pokemon/back_pics/squirtle_back_pic.png b/graphics/pokemon/squirtle/back.png similarity index 100% rename from graphics/pokemon/back_pics/squirtle_back_pic.png rename to graphics/pokemon/squirtle/back.png diff --git a/graphics/pokemon/footprints/squirtle_footprint.png b/graphics/pokemon/squirtle/footprint.png similarity index 100% rename from graphics/pokemon/footprints/squirtle_footprint.png rename to graphics/pokemon/squirtle/footprint.png diff --git a/graphics/pokemon/front_pics/squirtle_still_front_pic.png b/graphics/pokemon/squirtle/front.png similarity index 100% rename from graphics/pokemon/front_pics/squirtle_still_front_pic.png rename to graphics/pokemon/squirtle/front.png diff --git a/graphics/pokemon/icons/squirtle_icon.png b/graphics/pokemon/squirtle/icon.png similarity index 100% rename from graphics/pokemon/icons/squirtle_icon.png rename to graphics/pokemon/squirtle/icon.png diff --git a/graphics/pokemon/palettes/squirtle_palette.pal b/graphics/pokemon/squirtle/normal.pal similarity index 100% rename from graphics/pokemon/palettes/squirtle_palette.pal rename to graphics/pokemon/squirtle/normal.pal diff --git a/graphics/pokemon/palettes/squirtle_shiny_palette.pal b/graphics/pokemon/squirtle/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/squirtle_shiny_palette.pal rename to graphics/pokemon/squirtle/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/stantler_front_pic.png b/graphics/pokemon/stantler/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/stantler_front_pic.png rename to graphics/pokemon/stantler/anim_front.png diff --git a/graphics/pokemon/back_pics/stantler_back_pic.png b/graphics/pokemon/stantler/back.png similarity index 100% rename from graphics/pokemon/back_pics/stantler_back_pic.png rename to graphics/pokemon/stantler/back.png diff --git a/graphics/pokemon/footprints/stantler_footprint.png b/graphics/pokemon/stantler/footprint.png similarity index 100% rename from graphics/pokemon/footprints/stantler_footprint.png rename to graphics/pokemon/stantler/footprint.png diff --git a/graphics/pokemon/front_pics/stantler_still_front_pic.png b/graphics/pokemon/stantler/front.png similarity index 100% rename from graphics/pokemon/front_pics/stantler_still_front_pic.png rename to graphics/pokemon/stantler/front.png diff --git a/graphics/pokemon/icons/stantler_icon.png b/graphics/pokemon/stantler/icon.png similarity index 100% rename from graphics/pokemon/icons/stantler_icon.png rename to graphics/pokemon/stantler/icon.png diff --git a/graphics/pokemon/palettes/stantler_palette.pal b/graphics/pokemon/stantler/normal.pal similarity index 100% rename from graphics/pokemon/palettes/stantler_palette.pal rename to graphics/pokemon/stantler/normal.pal diff --git a/graphics/pokemon/palettes/stantler_shiny_palette.pal b/graphics/pokemon/stantler/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/stantler_shiny_palette.pal rename to graphics/pokemon/stantler/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/starmie_front_pic.png b/graphics/pokemon/starmie/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/starmie_front_pic.png rename to graphics/pokemon/starmie/anim_front.png diff --git a/graphics/pokemon/back_pics/starmie_back_pic.png b/graphics/pokemon/starmie/back.png similarity index 100% rename from graphics/pokemon/back_pics/starmie_back_pic.png rename to graphics/pokemon/starmie/back.png diff --git a/graphics/pokemon/footprints/starmie_footprint.png b/graphics/pokemon/starmie/footprint.png similarity index 100% rename from graphics/pokemon/footprints/starmie_footprint.png rename to graphics/pokemon/starmie/footprint.png diff --git a/graphics/pokemon/front_pics/starmie_still_front_pic.png b/graphics/pokemon/starmie/front.png similarity index 100% rename from graphics/pokemon/front_pics/starmie_still_front_pic.png rename to graphics/pokemon/starmie/front.png diff --git a/graphics/pokemon/icons/starmie_icon.png b/graphics/pokemon/starmie/icon.png similarity index 100% rename from graphics/pokemon/icons/starmie_icon.png rename to graphics/pokemon/starmie/icon.png diff --git a/graphics/pokemon/palettes/starmie_palette.pal b/graphics/pokemon/starmie/normal.pal similarity index 100% rename from graphics/pokemon/palettes/starmie_palette.pal rename to graphics/pokemon/starmie/normal.pal diff --git a/graphics/pokemon/palettes/starmie_shiny_palette.pal b/graphics/pokemon/starmie/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/starmie_shiny_palette.pal rename to graphics/pokemon/starmie/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/staryu_front_pic.png b/graphics/pokemon/staryu/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/staryu_front_pic.png rename to graphics/pokemon/staryu/anim_front.png diff --git a/graphics/pokemon/back_pics/staryu_back_pic.png b/graphics/pokemon/staryu/back.png similarity index 100% rename from graphics/pokemon/back_pics/staryu_back_pic.png rename to graphics/pokemon/staryu/back.png diff --git a/graphics/pokemon/footprints/staryu_footprint.png b/graphics/pokemon/staryu/footprint.png similarity index 100% rename from graphics/pokemon/footprints/staryu_footprint.png rename to graphics/pokemon/staryu/footprint.png diff --git a/graphics/pokemon/front_pics/staryu_still_front_pic.png b/graphics/pokemon/staryu/front.png similarity index 100% rename from graphics/pokemon/front_pics/staryu_still_front_pic.png rename to graphics/pokemon/staryu/front.png diff --git a/graphics/pokemon/icons/staryu_icon.png b/graphics/pokemon/staryu/icon.png similarity index 100% rename from graphics/pokemon/icons/staryu_icon.png rename to graphics/pokemon/staryu/icon.png diff --git a/graphics/pokemon/palettes/staryu_palette.pal b/graphics/pokemon/staryu/normal.pal similarity index 100% rename from graphics/pokemon/palettes/staryu_palette.pal rename to graphics/pokemon/staryu/normal.pal diff --git a/graphics/pokemon/palettes/staryu_shiny_palette.pal b/graphics/pokemon/staryu/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/staryu_shiny_palette.pal rename to graphics/pokemon/staryu/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/steelix_front_pic.png b/graphics/pokemon/steelix/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/steelix_front_pic.png rename to graphics/pokemon/steelix/anim_front.png diff --git a/graphics/pokemon/back_pics/steelix_back_pic.png b/graphics/pokemon/steelix/back.png similarity index 100% rename from graphics/pokemon/back_pics/steelix_back_pic.png rename to graphics/pokemon/steelix/back.png diff --git a/graphics/pokemon/footprints/steelix_footprint.png b/graphics/pokemon/steelix/footprint.png similarity index 100% rename from graphics/pokemon/footprints/steelix_footprint.png rename to graphics/pokemon/steelix/footprint.png diff --git a/graphics/pokemon/front_pics/steelix_still_front_pic.png b/graphics/pokemon/steelix/front.png similarity index 100% rename from graphics/pokemon/front_pics/steelix_still_front_pic.png rename to graphics/pokemon/steelix/front.png diff --git a/graphics/pokemon/icons/steelix_icon.png b/graphics/pokemon/steelix/icon.png similarity index 100% rename from graphics/pokemon/icons/steelix_icon.png rename to graphics/pokemon/steelix/icon.png diff --git a/graphics/pokemon/palettes/steelix_palette.pal b/graphics/pokemon/steelix/normal.pal similarity index 100% rename from graphics/pokemon/palettes/steelix_palette.pal rename to graphics/pokemon/steelix/normal.pal diff --git a/graphics/pokemon/palettes/steelix_shiny_palette.pal b/graphics/pokemon/steelix/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/steelix_shiny_palette.pal rename to graphics/pokemon/steelix/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/sudowoodo_front_pic.png b/graphics/pokemon/sudowoodo/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/sudowoodo_front_pic.png rename to graphics/pokemon/sudowoodo/anim_front.png diff --git a/graphics/pokemon/back_pics/sudowoodo_back_pic.png b/graphics/pokemon/sudowoodo/back.png similarity index 100% rename from graphics/pokemon/back_pics/sudowoodo_back_pic.png rename to graphics/pokemon/sudowoodo/back.png diff --git a/graphics/pokemon/footprints/sudowoodo_footprint.png b/graphics/pokemon/sudowoodo/footprint.png similarity index 100% rename from graphics/pokemon/footprints/sudowoodo_footprint.png rename to graphics/pokemon/sudowoodo/footprint.png diff --git a/graphics/pokemon/front_pics/sudowoodo_still_front_pic.png b/graphics/pokemon/sudowoodo/front.png similarity index 100% rename from graphics/pokemon/front_pics/sudowoodo_still_front_pic.png rename to graphics/pokemon/sudowoodo/front.png diff --git a/graphics/pokemon/icons/sudowoodo_icon.png b/graphics/pokemon/sudowoodo/icon.png similarity index 100% rename from graphics/pokemon/icons/sudowoodo_icon.png rename to graphics/pokemon/sudowoodo/icon.png diff --git a/graphics/pokemon/palettes/sudowoodo_palette.pal b/graphics/pokemon/sudowoodo/normal.pal similarity index 100% rename from graphics/pokemon/palettes/sudowoodo_palette.pal rename to graphics/pokemon/sudowoodo/normal.pal diff --git a/graphics/pokemon/palettes/sudowoodo_shiny_palette.pal b/graphics/pokemon/sudowoodo/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/sudowoodo_shiny_palette.pal rename to graphics/pokemon/sudowoodo/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/suicune_front_pic.png b/graphics/pokemon/suicune/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/suicune_front_pic.png rename to graphics/pokemon/suicune/anim_front.png diff --git a/graphics/pokemon/back_pics/suicune_back_pic.png b/graphics/pokemon/suicune/back.png similarity index 100% rename from graphics/pokemon/back_pics/suicune_back_pic.png rename to graphics/pokemon/suicune/back.png diff --git a/graphics/pokemon/footprints/suicune_footprint.png b/graphics/pokemon/suicune/footprint.png similarity index 100% rename from graphics/pokemon/footprints/suicune_footprint.png rename to graphics/pokemon/suicune/footprint.png diff --git a/graphics/pokemon/front_pics/suicune_still_front_pic.png b/graphics/pokemon/suicune/front.png similarity index 100% rename from graphics/pokemon/front_pics/suicune_still_front_pic.png rename to graphics/pokemon/suicune/front.png diff --git a/graphics/pokemon/icons/suicune_icon.png b/graphics/pokemon/suicune/icon.png similarity index 100% rename from graphics/pokemon/icons/suicune_icon.png rename to graphics/pokemon/suicune/icon.png diff --git a/graphics/pokemon/palettes/suicune_palette.pal b/graphics/pokemon/suicune/normal.pal similarity index 100% rename from graphics/pokemon/palettes/suicune_palette.pal rename to graphics/pokemon/suicune/normal.pal diff --git a/graphics/pokemon/palettes/suicune_shiny_palette.pal b/graphics/pokemon/suicune/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/suicune_shiny_palette.pal rename to graphics/pokemon/suicune/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/sunflora_front_pic.png b/graphics/pokemon/sunflora/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/sunflora_front_pic.png rename to graphics/pokemon/sunflora/anim_front.png diff --git a/graphics/pokemon/back_pics/sunflora_back_pic.png b/graphics/pokemon/sunflora/back.png similarity index 100% rename from graphics/pokemon/back_pics/sunflora_back_pic.png rename to graphics/pokemon/sunflora/back.png diff --git a/graphics/pokemon/footprints/sunflora_footprint.png b/graphics/pokemon/sunflora/footprint.png similarity index 100% rename from graphics/pokemon/footprints/sunflora_footprint.png rename to graphics/pokemon/sunflora/footprint.png diff --git a/graphics/pokemon/front_pics/sunflora_still_front_pic.png b/graphics/pokemon/sunflora/front.png similarity index 100% rename from graphics/pokemon/front_pics/sunflora_still_front_pic.png rename to graphics/pokemon/sunflora/front.png diff --git a/graphics/pokemon/icons/sunflora_icon.png b/graphics/pokemon/sunflora/icon.png similarity index 100% rename from graphics/pokemon/icons/sunflora_icon.png rename to graphics/pokemon/sunflora/icon.png diff --git a/graphics/pokemon/palettes/sunflora_palette.pal b/graphics/pokemon/sunflora/normal.pal similarity index 100% rename from graphics/pokemon/palettes/sunflora_palette.pal rename to graphics/pokemon/sunflora/normal.pal diff --git a/graphics/pokemon/palettes/sunflora_shiny_palette.pal b/graphics/pokemon/sunflora/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/sunflora_shiny_palette.pal rename to graphics/pokemon/sunflora/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/sunkern_front_pic.png b/graphics/pokemon/sunkern/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/sunkern_front_pic.png rename to graphics/pokemon/sunkern/anim_front.png diff --git a/graphics/pokemon/back_pics/sunkern_back_pic.png b/graphics/pokemon/sunkern/back.png similarity index 100% rename from graphics/pokemon/back_pics/sunkern_back_pic.png rename to graphics/pokemon/sunkern/back.png diff --git a/graphics/pokemon/footprints/sunkern_footprint.png b/graphics/pokemon/sunkern/footprint.png similarity index 100% rename from graphics/pokemon/footprints/sunkern_footprint.png rename to graphics/pokemon/sunkern/footprint.png diff --git a/graphics/pokemon/front_pics/sunkern_still_front_pic.png b/graphics/pokemon/sunkern/front.png similarity index 100% rename from graphics/pokemon/front_pics/sunkern_still_front_pic.png rename to graphics/pokemon/sunkern/front.png diff --git a/graphics/pokemon/icons/sunkern_icon.png b/graphics/pokemon/sunkern/icon.png similarity index 100% rename from graphics/pokemon/icons/sunkern_icon.png rename to graphics/pokemon/sunkern/icon.png diff --git a/graphics/pokemon/palettes/sunkern_palette.pal b/graphics/pokemon/sunkern/normal.pal similarity index 100% rename from graphics/pokemon/palettes/sunkern_palette.pal rename to graphics/pokemon/sunkern/normal.pal diff --git a/graphics/pokemon/palettes/sunkern_shiny_palette.pal b/graphics/pokemon/sunkern/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/sunkern_shiny_palette.pal rename to graphics/pokemon/sunkern/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/surskit_front_pic.png b/graphics/pokemon/surskit/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/surskit_front_pic.png rename to graphics/pokemon/surskit/anim_front.png diff --git a/graphics/pokemon/back_pics/surskit_back_pic.png b/graphics/pokemon/surskit/back.png similarity index 100% rename from graphics/pokemon/back_pics/surskit_back_pic.png rename to graphics/pokemon/surskit/back.png diff --git a/graphics/pokemon/footprints/surskit_footprint.png b/graphics/pokemon/surskit/footprint.png similarity index 100% rename from graphics/pokemon/footprints/surskit_footprint.png rename to graphics/pokemon/surskit/footprint.png diff --git a/graphics/pokemon/front_pics/surskit_still_front_pic.png b/graphics/pokemon/surskit/front.png similarity index 100% rename from graphics/pokemon/front_pics/surskit_still_front_pic.png rename to graphics/pokemon/surskit/front.png diff --git a/graphics/pokemon/icons/surskit_icon.png b/graphics/pokemon/surskit/icon.png similarity index 100% rename from graphics/pokemon/icons/surskit_icon.png rename to graphics/pokemon/surskit/icon.png diff --git a/graphics/pokemon/palettes/surskit_palette.pal b/graphics/pokemon/surskit/normal.pal similarity index 100% rename from graphics/pokemon/palettes/surskit_palette.pal rename to graphics/pokemon/surskit/normal.pal diff --git a/graphics/pokemon/palettes/surskit_shiny_palette.pal b/graphics/pokemon/surskit/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/surskit_shiny_palette.pal rename to graphics/pokemon/surskit/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/swablu_front_pic.png b/graphics/pokemon/swablu/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/swablu_front_pic.png rename to graphics/pokemon/swablu/anim_front.png diff --git a/graphics/pokemon/back_pics/swablu_back_pic.png b/graphics/pokemon/swablu/back.png similarity index 100% rename from graphics/pokemon/back_pics/swablu_back_pic.png rename to graphics/pokemon/swablu/back.png diff --git a/graphics/pokemon/footprints/swablu_footprint.png b/graphics/pokemon/swablu/footprint.png similarity index 100% rename from graphics/pokemon/footprints/swablu_footprint.png rename to graphics/pokemon/swablu/footprint.png diff --git a/graphics/pokemon/front_pics/swablu_still_front_pic.png b/graphics/pokemon/swablu/front.png similarity index 100% rename from graphics/pokemon/front_pics/swablu_still_front_pic.png rename to graphics/pokemon/swablu/front.png diff --git a/graphics/pokemon/icons/swablu_icon.png b/graphics/pokemon/swablu/icon.png similarity index 100% rename from graphics/pokemon/icons/swablu_icon.png rename to graphics/pokemon/swablu/icon.png diff --git a/graphics/pokemon/palettes/swablu_palette.pal b/graphics/pokemon/swablu/normal.pal similarity index 100% rename from graphics/pokemon/palettes/swablu_palette.pal rename to graphics/pokemon/swablu/normal.pal diff --git a/graphics/pokemon/palettes/swablu_shiny_palette.pal b/graphics/pokemon/swablu/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/swablu_shiny_palette.pal rename to graphics/pokemon/swablu/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/swalot_front_pic.png b/graphics/pokemon/swalot/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/swalot_front_pic.png rename to graphics/pokemon/swalot/anim_front.png diff --git a/graphics/pokemon/back_pics/swalot_back_pic.png b/graphics/pokemon/swalot/back.png similarity index 100% rename from graphics/pokemon/back_pics/swalot_back_pic.png rename to graphics/pokemon/swalot/back.png diff --git a/graphics/pokemon/footprints/swalot_footprint.png b/graphics/pokemon/swalot/footprint.png similarity index 100% rename from graphics/pokemon/footprints/swalot_footprint.png rename to graphics/pokemon/swalot/footprint.png diff --git a/graphics/pokemon/front_pics/swalot_still_front_pic.png b/graphics/pokemon/swalot/front.png similarity index 100% rename from graphics/pokemon/front_pics/swalot_still_front_pic.png rename to graphics/pokemon/swalot/front.png diff --git a/graphics/pokemon/icons/swalot_icon.png b/graphics/pokemon/swalot/icon.png similarity index 100% rename from graphics/pokemon/icons/swalot_icon.png rename to graphics/pokemon/swalot/icon.png diff --git a/graphics/pokemon/palettes/swalot_palette.pal b/graphics/pokemon/swalot/normal.pal similarity index 100% rename from graphics/pokemon/palettes/swalot_palette.pal rename to graphics/pokemon/swalot/normal.pal diff --git a/graphics/pokemon/palettes/swalot_shiny_palette.pal b/graphics/pokemon/swalot/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/swalot_shiny_palette.pal rename to graphics/pokemon/swalot/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/swampert_front_pic.png b/graphics/pokemon/swampert/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/swampert_front_pic.png rename to graphics/pokemon/swampert/anim_front.png diff --git a/graphics/pokemon/back_pics/swampert_back_pic.png b/graphics/pokemon/swampert/back.png similarity index 100% rename from graphics/pokemon/back_pics/swampert_back_pic.png rename to graphics/pokemon/swampert/back.png diff --git a/graphics/pokemon/footprints/swampert_footprint.png b/graphics/pokemon/swampert/footprint.png similarity index 100% rename from graphics/pokemon/footprints/swampert_footprint.png rename to graphics/pokemon/swampert/footprint.png diff --git a/graphics/pokemon/front_pics/swampert_still_front_pic.png b/graphics/pokemon/swampert/front.png similarity index 100% rename from graphics/pokemon/front_pics/swampert_still_front_pic.png rename to graphics/pokemon/swampert/front.png diff --git a/graphics/pokemon/icons/swampert_icon.png b/graphics/pokemon/swampert/icon.png similarity index 100% rename from graphics/pokemon/icons/swampert_icon.png rename to graphics/pokemon/swampert/icon.png diff --git a/graphics/pokemon/palettes/swampert_palette.pal b/graphics/pokemon/swampert/normal.pal similarity index 100% rename from graphics/pokemon/palettes/swampert_palette.pal rename to graphics/pokemon/swampert/normal.pal diff --git a/graphics/pokemon/palettes/swampert_shiny_palette.pal b/graphics/pokemon/swampert/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/swampert_shiny_palette.pal rename to graphics/pokemon/swampert/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/swellow_front_pic.png b/graphics/pokemon/swellow/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/swellow_front_pic.png rename to graphics/pokemon/swellow/anim_front.png diff --git a/graphics/pokemon/back_pics/swellow_back_pic.png b/graphics/pokemon/swellow/back.png similarity index 100% rename from graphics/pokemon/back_pics/swellow_back_pic.png rename to graphics/pokemon/swellow/back.png diff --git a/graphics/pokemon/footprints/swellow_footprint.png b/graphics/pokemon/swellow/footprint.png similarity index 100% rename from graphics/pokemon/footprints/swellow_footprint.png rename to graphics/pokemon/swellow/footprint.png diff --git a/graphics/pokemon/front_pics/swellow_still_front_pic.png b/graphics/pokemon/swellow/front.png similarity index 100% rename from graphics/pokemon/front_pics/swellow_still_front_pic.png rename to graphics/pokemon/swellow/front.png diff --git a/graphics/pokemon/icons/swellow_icon.png b/graphics/pokemon/swellow/icon.png similarity index 100% rename from graphics/pokemon/icons/swellow_icon.png rename to graphics/pokemon/swellow/icon.png diff --git a/graphics/pokemon/palettes/swellow_palette.pal b/graphics/pokemon/swellow/normal.pal similarity index 100% rename from graphics/pokemon/palettes/swellow_palette.pal rename to graphics/pokemon/swellow/normal.pal diff --git a/graphics/pokemon/palettes/swellow_shiny_palette.pal b/graphics/pokemon/swellow/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/swellow_shiny_palette.pal rename to graphics/pokemon/swellow/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/swinub_front_pic.png b/graphics/pokemon/swinub/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/swinub_front_pic.png rename to graphics/pokemon/swinub/anim_front.png diff --git a/graphics/pokemon/back_pics/swinub_back_pic.png b/graphics/pokemon/swinub/back.png similarity index 100% rename from graphics/pokemon/back_pics/swinub_back_pic.png rename to graphics/pokemon/swinub/back.png diff --git a/graphics/pokemon/footprints/swinub_footprint.png b/graphics/pokemon/swinub/footprint.png similarity index 100% rename from graphics/pokemon/footprints/swinub_footprint.png rename to graphics/pokemon/swinub/footprint.png diff --git a/graphics/pokemon/front_pics/swinub_still_front_pic.png b/graphics/pokemon/swinub/front.png similarity index 100% rename from graphics/pokemon/front_pics/swinub_still_front_pic.png rename to graphics/pokemon/swinub/front.png diff --git a/graphics/pokemon/icons/swinub_icon.png b/graphics/pokemon/swinub/icon.png similarity index 100% rename from graphics/pokemon/icons/swinub_icon.png rename to graphics/pokemon/swinub/icon.png diff --git a/graphics/pokemon/palettes/swinub_palette.pal b/graphics/pokemon/swinub/normal.pal similarity index 100% rename from graphics/pokemon/palettes/swinub_palette.pal rename to graphics/pokemon/swinub/normal.pal diff --git a/graphics/pokemon/palettes/swinub_shiny_palette.pal b/graphics/pokemon/swinub/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/swinub_shiny_palette.pal rename to graphics/pokemon/swinub/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/taillow_front_pic.png b/graphics/pokemon/taillow/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/taillow_front_pic.png rename to graphics/pokemon/taillow/anim_front.png diff --git a/graphics/pokemon/back_pics/taillow_back_pic.png b/graphics/pokemon/taillow/back.png similarity index 100% rename from graphics/pokemon/back_pics/taillow_back_pic.png rename to graphics/pokemon/taillow/back.png diff --git a/graphics/pokemon/footprints/taillow_footprint.png b/graphics/pokemon/taillow/footprint.png similarity index 100% rename from graphics/pokemon/footprints/taillow_footprint.png rename to graphics/pokemon/taillow/footprint.png diff --git a/graphics/pokemon/front_pics/taillow_still_front_pic.png b/graphics/pokemon/taillow/front.png similarity index 100% rename from graphics/pokemon/front_pics/taillow_still_front_pic.png rename to graphics/pokemon/taillow/front.png diff --git a/graphics/pokemon/icons/taillow_icon.png b/graphics/pokemon/taillow/icon.png similarity index 100% rename from graphics/pokemon/icons/taillow_icon.png rename to graphics/pokemon/taillow/icon.png diff --git a/graphics/pokemon/palettes/taillow_palette.pal b/graphics/pokemon/taillow/normal.pal similarity index 100% rename from graphics/pokemon/palettes/taillow_palette.pal rename to graphics/pokemon/taillow/normal.pal diff --git a/graphics/pokemon/palettes/taillow_shiny_palette.pal b/graphics/pokemon/taillow/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/taillow_shiny_palette.pal rename to graphics/pokemon/taillow/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/tangela_front_pic.png b/graphics/pokemon/tangela/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/tangela_front_pic.png rename to graphics/pokemon/tangela/anim_front.png diff --git a/graphics/pokemon/back_pics/tangela_back_pic.png b/graphics/pokemon/tangela/back.png similarity index 100% rename from graphics/pokemon/back_pics/tangela_back_pic.png rename to graphics/pokemon/tangela/back.png diff --git a/graphics/pokemon/footprints/tangela_footprint.png b/graphics/pokemon/tangela/footprint.png similarity index 100% rename from graphics/pokemon/footprints/tangela_footprint.png rename to graphics/pokemon/tangela/footprint.png diff --git a/graphics/pokemon/front_pics/tangela_still_front_pic.png b/graphics/pokemon/tangela/front.png similarity index 100% rename from graphics/pokemon/front_pics/tangela_still_front_pic.png rename to graphics/pokemon/tangela/front.png diff --git a/graphics/pokemon/icons/tangela_icon.png b/graphics/pokemon/tangela/icon.png similarity index 100% rename from graphics/pokemon/icons/tangela_icon.png rename to graphics/pokemon/tangela/icon.png diff --git a/graphics/pokemon/palettes/tangela_palette.pal b/graphics/pokemon/tangela/normal.pal similarity index 100% rename from graphics/pokemon/palettes/tangela_palette.pal rename to graphics/pokemon/tangela/normal.pal diff --git a/graphics/pokemon/palettes/tangela_shiny_palette.pal b/graphics/pokemon/tangela/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/tangela_shiny_palette.pal rename to graphics/pokemon/tangela/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/tauros_front_pic.png b/graphics/pokemon/tauros/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/tauros_front_pic.png rename to graphics/pokemon/tauros/anim_front.png diff --git a/graphics/pokemon/back_pics/tauros_back_pic.png b/graphics/pokemon/tauros/back.png similarity index 100% rename from graphics/pokemon/back_pics/tauros_back_pic.png rename to graphics/pokemon/tauros/back.png diff --git a/graphics/pokemon/footprints/tauros_footprint.png b/graphics/pokemon/tauros/footprint.png similarity index 100% rename from graphics/pokemon/footprints/tauros_footprint.png rename to graphics/pokemon/tauros/footprint.png diff --git a/graphics/pokemon/front_pics/tauros_still_front_pic.png b/graphics/pokemon/tauros/front.png similarity index 100% rename from graphics/pokemon/front_pics/tauros_still_front_pic.png rename to graphics/pokemon/tauros/front.png diff --git a/graphics/pokemon/icons/tauros_icon.png b/graphics/pokemon/tauros/icon.png similarity index 100% rename from graphics/pokemon/icons/tauros_icon.png rename to graphics/pokemon/tauros/icon.png diff --git a/graphics/pokemon/palettes/tauros_palette.pal b/graphics/pokemon/tauros/normal.pal similarity index 100% rename from graphics/pokemon/palettes/tauros_palette.pal rename to graphics/pokemon/tauros/normal.pal diff --git a/graphics/pokemon/palettes/tauros_shiny_palette.pal b/graphics/pokemon/tauros/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/tauros_shiny_palette.pal rename to graphics/pokemon/tauros/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/teddiursa_front_pic.png b/graphics/pokemon/teddiursa/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/teddiursa_front_pic.png rename to graphics/pokemon/teddiursa/anim_front.png diff --git a/graphics/pokemon/back_pics/teddiursa_back_pic.png b/graphics/pokemon/teddiursa/back.png similarity index 100% rename from graphics/pokemon/back_pics/teddiursa_back_pic.png rename to graphics/pokemon/teddiursa/back.png diff --git a/graphics/pokemon/footprints/teddiursa_footprint.png b/graphics/pokemon/teddiursa/footprint.png similarity index 100% rename from graphics/pokemon/footprints/teddiursa_footprint.png rename to graphics/pokemon/teddiursa/footprint.png diff --git a/graphics/pokemon/front_pics/teddiursa_still_front_pic.png b/graphics/pokemon/teddiursa/front.png similarity index 100% rename from graphics/pokemon/front_pics/teddiursa_still_front_pic.png rename to graphics/pokemon/teddiursa/front.png diff --git a/graphics/pokemon/icons/teddiursa_icon.png b/graphics/pokemon/teddiursa/icon.png similarity index 100% rename from graphics/pokemon/icons/teddiursa_icon.png rename to graphics/pokemon/teddiursa/icon.png diff --git a/graphics/pokemon/palettes/teddiursa_palette.pal b/graphics/pokemon/teddiursa/normal.pal similarity index 100% rename from graphics/pokemon/palettes/teddiursa_palette.pal rename to graphics/pokemon/teddiursa/normal.pal diff --git a/graphics/pokemon/palettes/teddiursa_shiny_palette.pal b/graphics/pokemon/teddiursa/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/teddiursa_shiny_palette.pal rename to graphics/pokemon/teddiursa/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/tentacool_front_pic.png b/graphics/pokemon/tentacool/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/tentacool_front_pic.png rename to graphics/pokemon/tentacool/anim_front.png diff --git a/graphics/pokemon/back_pics/tentacool_back_pic.png b/graphics/pokemon/tentacool/back.png similarity index 100% rename from graphics/pokemon/back_pics/tentacool_back_pic.png rename to graphics/pokemon/tentacool/back.png diff --git a/graphics/pokemon/footprints/tentacool_footprint.png b/graphics/pokemon/tentacool/footprint.png similarity index 100% rename from graphics/pokemon/footprints/tentacool_footprint.png rename to graphics/pokemon/tentacool/footprint.png diff --git a/graphics/pokemon/front_pics/tentacool_still_front_pic.png b/graphics/pokemon/tentacool/front.png similarity index 100% rename from graphics/pokemon/front_pics/tentacool_still_front_pic.png rename to graphics/pokemon/tentacool/front.png diff --git a/graphics/pokemon/icons/tentacool_icon.png b/graphics/pokemon/tentacool/icon.png similarity index 100% rename from graphics/pokemon/icons/tentacool_icon.png rename to graphics/pokemon/tentacool/icon.png diff --git a/graphics/pokemon/palettes/tentacool_palette.pal b/graphics/pokemon/tentacool/normal.pal similarity index 100% rename from graphics/pokemon/palettes/tentacool_palette.pal rename to graphics/pokemon/tentacool/normal.pal diff --git a/graphics/pokemon/palettes/tentacool_shiny_palette.pal b/graphics/pokemon/tentacool/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/tentacool_shiny_palette.pal rename to graphics/pokemon/tentacool/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/tentacruel_front_pic.png b/graphics/pokemon/tentacruel/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/tentacruel_front_pic.png rename to graphics/pokemon/tentacruel/anim_front.png diff --git a/graphics/pokemon/back_pics/tentacruel_back_pic.png b/graphics/pokemon/tentacruel/back.png similarity index 100% rename from graphics/pokemon/back_pics/tentacruel_back_pic.png rename to graphics/pokemon/tentacruel/back.png diff --git a/graphics/pokemon/footprints/tentacruel_footprint.png b/graphics/pokemon/tentacruel/footprint.png similarity index 100% rename from graphics/pokemon/footprints/tentacruel_footprint.png rename to graphics/pokemon/tentacruel/footprint.png diff --git a/graphics/pokemon/front_pics/tentacruel_still_front_pic.png b/graphics/pokemon/tentacruel/front.png similarity index 100% rename from graphics/pokemon/front_pics/tentacruel_still_front_pic.png rename to graphics/pokemon/tentacruel/front.png diff --git a/graphics/pokemon/icons/tentacruel_icon.png b/graphics/pokemon/tentacruel/icon.png similarity index 100% rename from graphics/pokemon/icons/tentacruel_icon.png rename to graphics/pokemon/tentacruel/icon.png diff --git a/graphics/pokemon/palettes/tentacruel_palette.pal b/graphics/pokemon/tentacruel/normal.pal similarity index 100% rename from graphics/pokemon/palettes/tentacruel_palette.pal rename to graphics/pokemon/tentacruel/normal.pal diff --git a/graphics/pokemon/palettes/tentacruel_shiny_palette.pal b/graphics/pokemon/tentacruel/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/tentacruel_shiny_palette.pal rename to graphics/pokemon/tentacruel/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/togepi_front_pic.png b/graphics/pokemon/togepi/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/togepi_front_pic.png rename to graphics/pokemon/togepi/anim_front.png diff --git a/graphics/pokemon/back_pics/togepi_back_pic.png b/graphics/pokemon/togepi/back.png similarity index 100% rename from graphics/pokemon/back_pics/togepi_back_pic.png rename to graphics/pokemon/togepi/back.png diff --git a/graphics/pokemon/footprints/togepi_footprint.png b/graphics/pokemon/togepi/footprint.png similarity index 100% rename from graphics/pokemon/footprints/togepi_footprint.png rename to graphics/pokemon/togepi/footprint.png diff --git a/graphics/pokemon/front_pics/togepi_still_front_pic.png b/graphics/pokemon/togepi/front.png similarity index 100% rename from graphics/pokemon/front_pics/togepi_still_front_pic.png rename to graphics/pokemon/togepi/front.png diff --git a/graphics/pokemon/icons/togepi_icon.png b/graphics/pokemon/togepi/icon.png similarity index 100% rename from graphics/pokemon/icons/togepi_icon.png rename to graphics/pokemon/togepi/icon.png diff --git a/graphics/pokemon/palettes/togepi_palette.pal b/graphics/pokemon/togepi/normal.pal similarity index 100% rename from graphics/pokemon/palettes/togepi_palette.pal rename to graphics/pokemon/togepi/normal.pal diff --git a/graphics/pokemon/palettes/togepi_shiny_palette.pal b/graphics/pokemon/togepi/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/togepi_shiny_palette.pal rename to graphics/pokemon/togepi/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/togetic_front_pic.png b/graphics/pokemon/togetic/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/togetic_front_pic.png rename to graphics/pokemon/togetic/anim_front.png diff --git a/graphics/pokemon/back_pics/togetic_back_pic.png b/graphics/pokemon/togetic/back.png similarity index 100% rename from graphics/pokemon/back_pics/togetic_back_pic.png rename to graphics/pokemon/togetic/back.png diff --git a/graphics/pokemon/footprints/togetic_footprint.png b/graphics/pokemon/togetic/footprint.png similarity index 100% rename from graphics/pokemon/footprints/togetic_footprint.png rename to graphics/pokemon/togetic/footprint.png diff --git a/graphics/pokemon/front_pics/togetic_still_front_pic.png b/graphics/pokemon/togetic/front.png similarity index 100% rename from graphics/pokemon/front_pics/togetic_still_front_pic.png rename to graphics/pokemon/togetic/front.png diff --git a/graphics/pokemon/icons/togetic_icon.png b/graphics/pokemon/togetic/icon.png similarity index 100% rename from graphics/pokemon/icons/togetic_icon.png rename to graphics/pokemon/togetic/icon.png diff --git a/graphics/pokemon/palettes/togetic_palette.pal b/graphics/pokemon/togetic/normal.pal similarity index 100% rename from graphics/pokemon/palettes/togetic_palette.pal rename to graphics/pokemon/togetic/normal.pal diff --git a/graphics/pokemon/palettes/togetic_shiny_palette.pal b/graphics/pokemon/togetic/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/togetic_shiny_palette.pal rename to graphics/pokemon/togetic/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/torchic_front_pic.png b/graphics/pokemon/torchic/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/torchic_front_pic.png rename to graphics/pokemon/torchic/anim_front.png diff --git a/graphics/pokemon/back_pics/torchic_back_pic.png b/graphics/pokemon/torchic/back.png similarity index 100% rename from graphics/pokemon/back_pics/torchic_back_pic.png rename to graphics/pokemon/torchic/back.png diff --git a/graphics/pokemon/footprints/torchic_footprint.png b/graphics/pokemon/torchic/footprint.png similarity index 100% rename from graphics/pokemon/footprints/torchic_footprint.png rename to graphics/pokemon/torchic/footprint.png diff --git a/graphics/pokemon/front_pics/torchic_still_front_pic.png b/graphics/pokemon/torchic/front.png similarity index 100% rename from graphics/pokemon/front_pics/torchic_still_front_pic.png rename to graphics/pokemon/torchic/front.png diff --git a/graphics/pokemon/icons/torchic_icon.png b/graphics/pokemon/torchic/icon.png similarity index 100% rename from graphics/pokemon/icons/torchic_icon.png rename to graphics/pokemon/torchic/icon.png diff --git a/graphics/pokemon/palettes/torchic_palette.pal b/graphics/pokemon/torchic/normal.pal similarity index 100% rename from graphics/pokemon/palettes/torchic_palette.pal rename to graphics/pokemon/torchic/normal.pal diff --git a/graphics/pokemon/palettes/torchic_shiny_palette.pal b/graphics/pokemon/torchic/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/torchic_shiny_palette.pal rename to graphics/pokemon/torchic/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/torkoal_front_pic.png b/graphics/pokemon/torkoal/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/torkoal_front_pic.png rename to graphics/pokemon/torkoal/anim_front.png diff --git a/graphics/pokemon/back_pics/torkoal_back_pic.png b/graphics/pokemon/torkoal/back.png similarity index 100% rename from graphics/pokemon/back_pics/torkoal_back_pic.png rename to graphics/pokemon/torkoal/back.png diff --git a/graphics/pokemon/footprints/torkoal_footprint.png b/graphics/pokemon/torkoal/footprint.png similarity index 100% rename from graphics/pokemon/footprints/torkoal_footprint.png rename to graphics/pokemon/torkoal/footprint.png diff --git a/graphics/pokemon/front_pics/torkoal_still_front_pic.png b/graphics/pokemon/torkoal/front.png similarity index 100% rename from graphics/pokemon/front_pics/torkoal_still_front_pic.png rename to graphics/pokemon/torkoal/front.png diff --git a/graphics/pokemon/icons/torkoal_icon.png b/graphics/pokemon/torkoal/icon.png similarity index 100% rename from graphics/pokemon/icons/torkoal_icon.png rename to graphics/pokemon/torkoal/icon.png diff --git a/graphics/pokemon/palettes/torkoal_palette.pal b/graphics/pokemon/torkoal/normal.pal similarity index 100% rename from graphics/pokemon/palettes/torkoal_palette.pal rename to graphics/pokemon/torkoal/normal.pal diff --git a/graphics/pokemon/palettes/torkoal_shiny_palette.pal b/graphics/pokemon/torkoal/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/torkoal_shiny_palette.pal rename to graphics/pokemon/torkoal/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/totodile_front_pic.png b/graphics/pokemon/totodile/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/totodile_front_pic.png rename to graphics/pokemon/totodile/anim_front.png diff --git a/graphics/pokemon/back_pics/totodile_back_pic.png b/graphics/pokemon/totodile/back.png similarity index 100% rename from graphics/pokemon/back_pics/totodile_back_pic.png rename to graphics/pokemon/totodile/back.png diff --git a/graphics/pokemon/footprints/totodile_footprint.png b/graphics/pokemon/totodile/footprint.png similarity index 100% rename from graphics/pokemon/footprints/totodile_footprint.png rename to graphics/pokemon/totodile/footprint.png diff --git a/graphics/pokemon/front_pics/totodile_still_front_pic.png b/graphics/pokemon/totodile/front.png similarity index 100% rename from graphics/pokemon/front_pics/totodile_still_front_pic.png rename to graphics/pokemon/totodile/front.png diff --git a/graphics/pokemon/icons/totodile_icon.png b/graphics/pokemon/totodile/icon.png similarity index 100% rename from graphics/pokemon/icons/totodile_icon.png rename to graphics/pokemon/totodile/icon.png diff --git a/graphics/pokemon/palettes/totodile_palette.pal b/graphics/pokemon/totodile/normal.pal similarity index 100% rename from graphics/pokemon/palettes/totodile_palette.pal rename to graphics/pokemon/totodile/normal.pal diff --git a/graphics/pokemon/palettes/totodile_shiny_palette.pal b/graphics/pokemon/totodile/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/totodile_shiny_palette.pal rename to graphics/pokemon/totodile/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/trapinch_front_pic.png b/graphics/pokemon/trapinch/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/trapinch_front_pic.png rename to graphics/pokemon/trapinch/anim_front.png diff --git a/graphics/pokemon/back_pics/trapinch_back_pic.png b/graphics/pokemon/trapinch/back.png similarity index 100% rename from graphics/pokemon/back_pics/trapinch_back_pic.png rename to graphics/pokemon/trapinch/back.png diff --git a/graphics/pokemon/footprints/trapinch_footprint.png b/graphics/pokemon/trapinch/footprint.png similarity index 100% rename from graphics/pokemon/footprints/trapinch_footprint.png rename to graphics/pokemon/trapinch/footprint.png diff --git a/graphics/pokemon/front_pics/trapinch_still_front_pic.png b/graphics/pokemon/trapinch/front.png similarity index 100% rename from graphics/pokemon/front_pics/trapinch_still_front_pic.png rename to graphics/pokemon/trapinch/front.png diff --git a/graphics/pokemon/icons/trapinch_icon.png b/graphics/pokemon/trapinch/icon.png similarity index 100% rename from graphics/pokemon/icons/trapinch_icon.png rename to graphics/pokemon/trapinch/icon.png diff --git a/graphics/pokemon/palettes/trapinch_palette.pal b/graphics/pokemon/trapinch/normal.pal similarity index 100% rename from graphics/pokemon/palettes/trapinch_palette.pal rename to graphics/pokemon/trapinch/normal.pal diff --git a/graphics/pokemon/palettes/trapinch_shiny_palette.pal b/graphics/pokemon/trapinch/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/trapinch_shiny_palette.pal rename to graphics/pokemon/trapinch/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/treecko_front_pic.png b/graphics/pokemon/treecko/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/treecko_front_pic.png rename to graphics/pokemon/treecko/anim_front.png diff --git a/graphics/pokemon/back_pics/treecko_back_pic.png b/graphics/pokemon/treecko/back.png similarity index 100% rename from graphics/pokemon/back_pics/treecko_back_pic.png rename to graphics/pokemon/treecko/back.png diff --git a/graphics/pokemon/footprints/treecko_footprint.png b/graphics/pokemon/treecko/footprint.png similarity index 100% rename from graphics/pokemon/footprints/treecko_footprint.png rename to graphics/pokemon/treecko/footprint.png diff --git a/graphics/pokemon/front_pics/treecko_still_front_pic.png b/graphics/pokemon/treecko/front.png similarity index 100% rename from graphics/pokemon/front_pics/treecko_still_front_pic.png rename to graphics/pokemon/treecko/front.png diff --git a/graphics/pokemon/icons/treecko_icon.png b/graphics/pokemon/treecko/icon.png similarity index 100% rename from graphics/pokemon/icons/treecko_icon.png rename to graphics/pokemon/treecko/icon.png diff --git a/graphics/pokemon/palettes/treecko_palette.pal b/graphics/pokemon/treecko/normal.pal similarity index 100% rename from graphics/pokemon/palettes/treecko_palette.pal rename to graphics/pokemon/treecko/normal.pal diff --git a/graphics/pokemon/palettes/treecko_shiny_palette.pal b/graphics/pokemon/treecko/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/treecko_shiny_palette.pal rename to graphics/pokemon/treecko/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/tropius_front_pic.png b/graphics/pokemon/tropius/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/tropius_front_pic.png rename to graphics/pokemon/tropius/anim_front.png diff --git a/graphics/pokemon/back_pics/tropius_back_pic.png b/graphics/pokemon/tropius/back.png similarity index 100% rename from graphics/pokemon/back_pics/tropius_back_pic.png rename to graphics/pokemon/tropius/back.png diff --git a/graphics/pokemon/footprints/tropius_footprint.png b/graphics/pokemon/tropius/footprint.png similarity index 100% rename from graphics/pokemon/footprints/tropius_footprint.png rename to graphics/pokemon/tropius/footprint.png diff --git a/graphics/pokemon/front_pics/tropius_still_front_pic.png b/graphics/pokemon/tropius/front.png similarity index 100% rename from graphics/pokemon/front_pics/tropius_still_front_pic.png rename to graphics/pokemon/tropius/front.png diff --git a/graphics/pokemon/icons/tropius_icon.png b/graphics/pokemon/tropius/icon.png similarity index 100% rename from graphics/pokemon/icons/tropius_icon.png rename to graphics/pokemon/tropius/icon.png diff --git a/graphics/pokemon/palettes/tropius_palette.pal b/graphics/pokemon/tropius/normal.pal similarity index 100% rename from graphics/pokemon/palettes/tropius_palette.pal rename to graphics/pokemon/tropius/normal.pal diff --git a/graphics/pokemon/palettes/tropius_shiny_palette.pal b/graphics/pokemon/tropius/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/tropius_shiny_palette.pal rename to graphics/pokemon/tropius/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/typhlosion_front_pic.png b/graphics/pokemon/typhlosion/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/typhlosion_front_pic.png rename to graphics/pokemon/typhlosion/anim_front.png diff --git a/graphics/pokemon/back_pics/typhlosion_back_pic.png b/graphics/pokemon/typhlosion/back.png similarity index 100% rename from graphics/pokemon/back_pics/typhlosion_back_pic.png rename to graphics/pokemon/typhlosion/back.png diff --git a/graphics/pokemon/footprints/typhlosion_footprint.png b/graphics/pokemon/typhlosion/footprint.png similarity index 100% rename from graphics/pokemon/footprints/typhlosion_footprint.png rename to graphics/pokemon/typhlosion/footprint.png diff --git a/graphics/pokemon/front_pics/typhlosion_still_front_pic.png b/graphics/pokemon/typhlosion/front.png similarity index 100% rename from graphics/pokemon/front_pics/typhlosion_still_front_pic.png rename to graphics/pokemon/typhlosion/front.png diff --git a/graphics/pokemon/icons/typhlosion_icon.png b/graphics/pokemon/typhlosion/icon.png similarity index 100% rename from graphics/pokemon/icons/typhlosion_icon.png rename to graphics/pokemon/typhlosion/icon.png diff --git a/graphics/pokemon/palettes/typhlosion_palette.pal b/graphics/pokemon/typhlosion/normal.pal similarity index 100% rename from graphics/pokemon/palettes/typhlosion_palette.pal rename to graphics/pokemon/typhlosion/normal.pal diff --git a/graphics/pokemon/palettes/typhlosion_shiny_palette.pal b/graphics/pokemon/typhlosion/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/typhlosion_shiny_palette.pal rename to graphics/pokemon/typhlosion/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/tyranitar_front_pic.png b/graphics/pokemon/tyranitar/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/tyranitar_front_pic.png rename to graphics/pokemon/tyranitar/anim_front.png diff --git a/graphics/pokemon/back_pics/tyranitar_back_pic.png b/graphics/pokemon/tyranitar/back.png similarity index 100% rename from graphics/pokemon/back_pics/tyranitar_back_pic.png rename to graphics/pokemon/tyranitar/back.png diff --git a/graphics/pokemon/footprints/tyranitar_footprint.png b/graphics/pokemon/tyranitar/footprint.png similarity index 100% rename from graphics/pokemon/footprints/tyranitar_footprint.png rename to graphics/pokemon/tyranitar/footprint.png diff --git a/graphics/pokemon/front_pics/tyranitar_still_front_pic.png b/graphics/pokemon/tyranitar/front.png similarity index 100% rename from graphics/pokemon/front_pics/tyranitar_still_front_pic.png rename to graphics/pokemon/tyranitar/front.png diff --git a/graphics/pokemon/icons/tyranitar_icon.png b/graphics/pokemon/tyranitar/icon.png similarity index 100% rename from graphics/pokemon/icons/tyranitar_icon.png rename to graphics/pokemon/tyranitar/icon.png diff --git a/graphics/pokemon/palettes/tyranitar_palette.pal b/graphics/pokemon/tyranitar/normal.pal similarity index 100% rename from graphics/pokemon/palettes/tyranitar_palette.pal rename to graphics/pokemon/tyranitar/normal.pal diff --git a/graphics/pokemon/palettes/tyranitar_shiny_palette.pal b/graphics/pokemon/tyranitar/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/tyranitar_shiny_palette.pal rename to graphics/pokemon/tyranitar/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/tyrogue_front_pic.png b/graphics/pokemon/tyrogue/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/tyrogue_front_pic.png rename to graphics/pokemon/tyrogue/anim_front.png diff --git a/graphics/pokemon/back_pics/tyrogue_back_pic.png b/graphics/pokemon/tyrogue/back.png similarity index 100% rename from graphics/pokemon/back_pics/tyrogue_back_pic.png rename to graphics/pokemon/tyrogue/back.png diff --git a/graphics/pokemon/footprints/tyrogue_footprint.png b/graphics/pokemon/tyrogue/footprint.png similarity index 100% rename from graphics/pokemon/footprints/tyrogue_footprint.png rename to graphics/pokemon/tyrogue/footprint.png diff --git a/graphics/pokemon/front_pics/tyrogue_still_front_pic.png b/graphics/pokemon/tyrogue/front.png similarity index 100% rename from graphics/pokemon/front_pics/tyrogue_still_front_pic.png rename to graphics/pokemon/tyrogue/front.png diff --git a/graphics/pokemon/icons/tyrogue_icon.png b/graphics/pokemon/tyrogue/icon.png similarity index 100% rename from graphics/pokemon/icons/tyrogue_icon.png rename to graphics/pokemon/tyrogue/icon.png diff --git a/graphics/pokemon/palettes/tyrogue_palette.pal b/graphics/pokemon/tyrogue/normal.pal similarity index 100% rename from graphics/pokemon/palettes/tyrogue_palette.pal rename to graphics/pokemon/tyrogue/normal.pal diff --git a/graphics/pokemon/palettes/tyrogue_shiny_palette.pal b/graphics/pokemon/tyrogue/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/tyrogue_shiny_palette.pal rename to graphics/pokemon/tyrogue/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/umbreon_front_pic.png b/graphics/pokemon/umbreon/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/umbreon_front_pic.png rename to graphics/pokemon/umbreon/anim_front.png diff --git a/graphics/pokemon/back_pics/umbreon_back_pic.png b/graphics/pokemon/umbreon/back.png similarity index 100% rename from graphics/pokemon/back_pics/umbreon_back_pic.png rename to graphics/pokemon/umbreon/back.png diff --git a/graphics/pokemon/footprints/umbreon_footprint.png b/graphics/pokemon/umbreon/footprint.png similarity index 100% rename from graphics/pokemon/footprints/umbreon_footprint.png rename to graphics/pokemon/umbreon/footprint.png diff --git a/graphics/pokemon/front_pics/umbreon_still_front_pic.png b/graphics/pokemon/umbreon/front.png similarity index 100% rename from graphics/pokemon/front_pics/umbreon_still_front_pic.png rename to graphics/pokemon/umbreon/front.png diff --git a/graphics/pokemon/icons/umbreon_icon.png b/graphics/pokemon/umbreon/icon.png similarity index 100% rename from graphics/pokemon/icons/umbreon_icon.png rename to graphics/pokemon/umbreon/icon.png diff --git a/graphics/pokemon/palettes/umbreon_palette.pal b/graphics/pokemon/umbreon/normal.pal similarity index 100% rename from graphics/pokemon/palettes/umbreon_palette.pal rename to graphics/pokemon/umbreon/normal.pal diff --git a/graphics/pokemon/palettes/umbreon_shiny_palette.pal b/graphics/pokemon/umbreon/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/umbreon_shiny_palette.pal rename to graphics/pokemon/umbreon/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/unown_a_front_pic.png b/graphics/pokemon/unown/anim_front_a.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_a_front_pic.png rename to graphics/pokemon/unown/anim_front_a.png diff --git a/graphics/pokemon/anim_front_pics/unown_b_front_pic.png b/graphics/pokemon/unown/anim_front_b.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_b_front_pic.png rename to graphics/pokemon/unown/anim_front_b.png diff --git a/graphics/pokemon/anim_front_pics/unown_c_front_pic.png b/graphics/pokemon/unown/anim_front_c.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_c_front_pic.png rename to graphics/pokemon/unown/anim_front_c.png diff --git a/graphics/pokemon/anim_front_pics/unown_d_front_pic.png b/graphics/pokemon/unown/anim_front_d.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_d_front_pic.png rename to graphics/pokemon/unown/anim_front_d.png diff --git a/graphics/pokemon/anim_front_pics/unown_e_front_pic.png b/graphics/pokemon/unown/anim_front_e.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_e_front_pic.png rename to graphics/pokemon/unown/anim_front_e.png diff --git a/graphics/pokemon/anim_front_pics/unown_exclamation_mark_front_pic.png b/graphics/pokemon/unown/anim_front_exclamation_mark.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_exclamation_mark_front_pic.png rename to graphics/pokemon/unown/anim_front_exclamation_mark.png diff --git a/graphics/pokemon/anim_front_pics/unown_f_front_pic.png b/graphics/pokemon/unown/anim_front_f.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_f_front_pic.png rename to graphics/pokemon/unown/anim_front_f.png diff --git a/graphics/pokemon/anim_front_pics/unown_g_front_pic.png b/graphics/pokemon/unown/anim_front_g.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_g_front_pic.png rename to graphics/pokemon/unown/anim_front_g.png diff --git a/graphics/pokemon/anim_front_pics/unown_h_front_pic.png b/graphics/pokemon/unown/anim_front_h.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_h_front_pic.png rename to graphics/pokemon/unown/anim_front_h.png diff --git a/graphics/pokemon/anim_front_pics/unown_i_front_pic.png b/graphics/pokemon/unown/anim_front_i.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_i_front_pic.png rename to graphics/pokemon/unown/anim_front_i.png diff --git a/graphics/pokemon/anim_front_pics/unown_j_front_pic.png b/graphics/pokemon/unown/anim_front_j.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_j_front_pic.png rename to graphics/pokemon/unown/anim_front_j.png diff --git a/graphics/pokemon/anim_front_pics/unown_k_front_pic.png b/graphics/pokemon/unown/anim_front_k.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_k_front_pic.png rename to graphics/pokemon/unown/anim_front_k.png diff --git a/graphics/pokemon/anim_front_pics/unown_l_front_pic.png b/graphics/pokemon/unown/anim_front_l.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_l_front_pic.png rename to graphics/pokemon/unown/anim_front_l.png diff --git a/graphics/pokemon/anim_front_pics/unown_m_front_pic.png b/graphics/pokemon/unown/anim_front_m.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_m_front_pic.png rename to graphics/pokemon/unown/anim_front_m.png diff --git a/graphics/pokemon/anim_front_pics/unown_n_front_pic.png b/graphics/pokemon/unown/anim_front_n.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_n_front_pic.png rename to graphics/pokemon/unown/anim_front_n.png diff --git a/graphics/pokemon/anim_front_pics/unown_o_front_pic.png b/graphics/pokemon/unown/anim_front_o.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_o_front_pic.png rename to graphics/pokemon/unown/anim_front_o.png diff --git a/graphics/pokemon/anim_front_pics/unown_p_front_pic.png b/graphics/pokemon/unown/anim_front_p.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_p_front_pic.png rename to graphics/pokemon/unown/anim_front_p.png diff --git a/graphics/pokemon/anim_front_pics/unown_q_front_pic.png b/graphics/pokemon/unown/anim_front_q.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_q_front_pic.png rename to graphics/pokemon/unown/anim_front_q.png diff --git a/graphics/pokemon/anim_front_pics/unown_question_mark_front_pic.png b/graphics/pokemon/unown/anim_front_question_mark.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_question_mark_front_pic.png rename to graphics/pokemon/unown/anim_front_question_mark.png diff --git a/graphics/pokemon/anim_front_pics/unown_r_front_pic.png b/graphics/pokemon/unown/anim_front_r.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_r_front_pic.png rename to graphics/pokemon/unown/anim_front_r.png diff --git a/graphics/pokemon/anim_front_pics/unown_s_front_pic.png b/graphics/pokemon/unown/anim_front_s.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_s_front_pic.png rename to graphics/pokemon/unown/anim_front_s.png diff --git a/graphics/pokemon/anim_front_pics/unown_t_front_pic.png b/graphics/pokemon/unown/anim_front_t.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_t_front_pic.png rename to graphics/pokemon/unown/anim_front_t.png diff --git a/graphics/pokemon/anim_front_pics/unown_u_front_pic.png b/graphics/pokemon/unown/anim_front_u.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_u_front_pic.png rename to graphics/pokemon/unown/anim_front_u.png diff --git a/graphics/pokemon/anim_front_pics/unown_v_front_pic.png b/graphics/pokemon/unown/anim_front_v.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_v_front_pic.png rename to graphics/pokemon/unown/anim_front_v.png diff --git a/graphics/pokemon/anim_front_pics/unown_w_front_pic.png b/graphics/pokemon/unown/anim_front_w.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_w_front_pic.png rename to graphics/pokemon/unown/anim_front_w.png diff --git a/graphics/pokemon/anim_front_pics/unown_x_front_pic.png b/graphics/pokemon/unown/anim_front_x.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_x_front_pic.png rename to graphics/pokemon/unown/anim_front_x.png diff --git a/graphics/pokemon/anim_front_pics/unown_y_front_pic.png b/graphics/pokemon/unown/anim_front_y.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_y_front_pic.png rename to graphics/pokemon/unown/anim_front_y.png diff --git a/graphics/pokemon/anim_front_pics/unown_z_front_pic.png b/graphics/pokemon/unown/anim_front_z.png similarity index 100% rename from graphics/pokemon/anim_front_pics/unown_z_front_pic.png rename to graphics/pokemon/unown/anim_front_z.png diff --git a/graphics/pokemon/back_pics/unown_a_back_pic.png b/graphics/pokemon/unown/back_a.png similarity index 100% rename from graphics/pokemon/back_pics/unown_a_back_pic.png rename to graphics/pokemon/unown/back_a.png diff --git a/graphics/pokemon/back_pics/unown_b_back_pic.png b/graphics/pokemon/unown/back_b.png similarity index 100% rename from graphics/pokemon/back_pics/unown_b_back_pic.png rename to graphics/pokemon/unown/back_b.png diff --git a/graphics/pokemon/back_pics/unown_c_back_pic.png b/graphics/pokemon/unown/back_c.png similarity index 100% rename from graphics/pokemon/back_pics/unown_c_back_pic.png rename to graphics/pokemon/unown/back_c.png diff --git a/graphics/pokemon/back_pics/unown_d_back_pic.png b/graphics/pokemon/unown/back_d.png similarity index 100% rename from graphics/pokemon/back_pics/unown_d_back_pic.png rename to graphics/pokemon/unown/back_d.png diff --git a/graphics/pokemon/back_pics/unown_e_back_pic.png b/graphics/pokemon/unown/back_e.png similarity index 100% rename from graphics/pokemon/back_pics/unown_e_back_pic.png rename to graphics/pokemon/unown/back_e.png diff --git a/graphics/pokemon/back_pics/unown_exclamation_mark_back_pic.png b/graphics/pokemon/unown/back_exclamation_mark.png similarity index 100% rename from graphics/pokemon/back_pics/unown_exclamation_mark_back_pic.png rename to graphics/pokemon/unown/back_exclamation_mark.png diff --git a/graphics/pokemon/back_pics/unown_f_back_pic.png b/graphics/pokemon/unown/back_f.png similarity index 100% rename from graphics/pokemon/back_pics/unown_f_back_pic.png rename to graphics/pokemon/unown/back_f.png diff --git a/graphics/pokemon/back_pics/unown_g_back_pic.png b/graphics/pokemon/unown/back_g.png similarity index 100% rename from graphics/pokemon/back_pics/unown_g_back_pic.png rename to graphics/pokemon/unown/back_g.png diff --git a/graphics/pokemon/back_pics/unown_h_back_pic.png b/graphics/pokemon/unown/back_h.png similarity index 100% rename from graphics/pokemon/back_pics/unown_h_back_pic.png rename to graphics/pokemon/unown/back_h.png diff --git a/graphics/pokemon/back_pics/unown_i_back_pic.png b/graphics/pokemon/unown/back_i.png similarity index 100% rename from graphics/pokemon/back_pics/unown_i_back_pic.png rename to graphics/pokemon/unown/back_i.png diff --git a/graphics/pokemon/back_pics/unown_j_back_pic.png b/graphics/pokemon/unown/back_j.png similarity index 100% rename from graphics/pokemon/back_pics/unown_j_back_pic.png rename to graphics/pokemon/unown/back_j.png diff --git a/graphics/pokemon/back_pics/unown_k_back_pic.png b/graphics/pokemon/unown/back_k.png similarity index 100% rename from graphics/pokemon/back_pics/unown_k_back_pic.png rename to graphics/pokemon/unown/back_k.png diff --git a/graphics/pokemon/back_pics/unown_l_back_pic.png b/graphics/pokemon/unown/back_l.png similarity index 100% rename from graphics/pokemon/back_pics/unown_l_back_pic.png rename to graphics/pokemon/unown/back_l.png diff --git a/graphics/pokemon/back_pics/unown_m_back_pic.png b/graphics/pokemon/unown/back_m.png similarity index 100% rename from graphics/pokemon/back_pics/unown_m_back_pic.png rename to graphics/pokemon/unown/back_m.png diff --git a/graphics/pokemon/back_pics/unown_n_back_pic.png b/graphics/pokemon/unown/back_n.png similarity index 100% rename from graphics/pokemon/back_pics/unown_n_back_pic.png rename to graphics/pokemon/unown/back_n.png diff --git a/graphics/pokemon/back_pics/unown_o_back_pic.png b/graphics/pokemon/unown/back_o.png similarity index 100% rename from graphics/pokemon/back_pics/unown_o_back_pic.png rename to graphics/pokemon/unown/back_o.png diff --git a/graphics/pokemon/back_pics/unown_p_back_pic.png b/graphics/pokemon/unown/back_p.png similarity index 100% rename from graphics/pokemon/back_pics/unown_p_back_pic.png rename to graphics/pokemon/unown/back_p.png diff --git a/graphics/pokemon/back_pics/unown_q_back_pic.png b/graphics/pokemon/unown/back_q.png similarity index 100% rename from graphics/pokemon/back_pics/unown_q_back_pic.png rename to graphics/pokemon/unown/back_q.png diff --git a/graphics/pokemon/back_pics/unown_question_mark_back_pic.png b/graphics/pokemon/unown/back_question_mark.png similarity index 100% rename from graphics/pokemon/back_pics/unown_question_mark_back_pic.png rename to graphics/pokemon/unown/back_question_mark.png diff --git a/graphics/pokemon/back_pics/unown_r_back_pic.png b/graphics/pokemon/unown/back_r.png similarity index 100% rename from graphics/pokemon/back_pics/unown_r_back_pic.png rename to graphics/pokemon/unown/back_r.png diff --git a/graphics/pokemon/back_pics/unown_s_back_pic.png b/graphics/pokemon/unown/back_s.png similarity index 100% rename from graphics/pokemon/back_pics/unown_s_back_pic.png rename to graphics/pokemon/unown/back_s.png diff --git a/graphics/pokemon/back_pics/unown_t_back_pic.png b/graphics/pokemon/unown/back_t.png similarity index 100% rename from graphics/pokemon/back_pics/unown_t_back_pic.png rename to graphics/pokemon/unown/back_t.png diff --git a/graphics/pokemon/back_pics/unown_u_back_pic.png b/graphics/pokemon/unown/back_u.png similarity index 100% rename from graphics/pokemon/back_pics/unown_u_back_pic.png rename to graphics/pokemon/unown/back_u.png diff --git a/graphics/pokemon/back_pics/unown_v_back_pic.png b/graphics/pokemon/unown/back_v.png similarity index 100% rename from graphics/pokemon/back_pics/unown_v_back_pic.png rename to graphics/pokemon/unown/back_v.png diff --git a/graphics/pokemon/back_pics/unown_w_back_pic.png b/graphics/pokemon/unown/back_w.png similarity index 100% rename from graphics/pokemon/back_pics/unown_w_back_pic.png rename to graphics/pokemon/unown/back_w.png diff --git a/graphics/pokemon/back_pics/unown_x_back_pic.png b/graphics/pokemon/unown/back_x.png similarity index 100% rename from graphics/pokemon/back_pics/unown_x_back_pic.png rename to graphics/pokemon/unown/back_x.png diff --git a/graphics/pokemon/back_pics/unown_y_back_pic.png b/graphics/pokemon/unown/back_y.png similarity index 100% rename from graphics/pokemon/back_pics/unown_y_back_pic.png rename to graphics/pokemon/unown/back_y.png diff --git a/graphics/pokemon/back_pics/unown_z_back_pic.png b/graphics/pokemon/unown/back_z.png similarity index 100% rename from graphics/pokemon/back_pics/unown_z_back_pic.png rename to graphics/pokemon/unown/back_z.png diff --git a/graphics/pokemon/footprints/unown_footprint.png b/graphics/pokemon/unown/footprint.png similarity index 100% rename from graphics/pokemon/footprints/unown_footprint.png rename to graphics/pokemon/unown/footprint.png diff --git a/graphics/pokemon/front_pics/unown_a_still_front_pic.png b/graphics/pokemon/unown/front_a.png similarity index 100% rename from graphics/pokemon/front_pics/unown_a_still_front_pic.png rename to graphics/pokemon/unown/front_a.png diff --git a/graphics/pokemon/front_pics/unown_b_still_front_pic.png b/graphics/pokemon/unown/front_b.png similarity index 100% rename from graphics/pokemon/front_pics/unown_b_still_front_pic.png rename to graphics/pokemon/unown/front_b.png diff --git a/graphics/pokemon/front_pics/unown_c_still_front_pic.png b/graphics/pokemon/unown/front_c.png similarity index 100% rename from graphics/pokemon/front_pics/unown_c_still_front_pic.png rename to graphics/pokemon/unown/front_c.png diff --git a/graphics/pokemon/front_pics/unown_d_still_front_pic.png b/graphics/pokemon/unown/front_d.png similarity index 100% rename from graphics/pokemon/front_pics/unown_d_still_front_pic.png rename to graphics/pokemon/unown/front_d.png diff --git a/graphics/pokemon/front_pics/unown_e_still_front_pic.png b/graphics/pokemon/unown/front_e.png similarity index 100% rename from graphics/pokemon/front_pics/unown_e_still_front_pic.png rename to graphics/pokemon/unown/front_e.png diff --git a/graphics/pokemon/front_pics/unown_exclamation_mark_still_front_pic.png b/graphics/pokemon/unown/front_exclamation_mark.png similarity index 100% rename from graphics/pokemon/front_pics/unown_exclamation_mark_still_front_pic.png rename to graphics/pokemon/unown/front_exclamation_mark.png diff --git a/graphics/pokemon/front_pics/unown_f_still_front_pic.png b/graphics/pokemon/unown/front_f.png similarity index 100% rename from graphics/pokemon/front_pics/unown_f_still_front_pic.png rename to graphics/pokemon/unown/front_f.png diff --git a/graphics/pokemon/front_pics/unown_g_still_front_pic.png b/graphics/pokemon/unown/front_g.png similarity index 100% rename from graphics/pokemon/front_pics/unown_g_still_front_pic.png rename to graphics/pokemon/unown/front_g.png diff --git a/graphics/pokemon/front_pics/unown_h_still_front_pic.png b/graphics/pokemon/unown/front_h.png similarity index 100% rename from graphics/pokemon/front_pics/unown_h_still_front_pic.png rename to graphics/pokemon/unown/front_h.png diff --git a/graphics/pokemon/front_pics/unown_i_still_front_pic.png b/graphics/pokemon/unown/front_i.png similarity index 100% rename from graphics/pokemon/front_pics/unown_i_still_front_pic.png rename to graphics/pokemon/unown/front_i.png diff --git a/graphics/pokemon/front_pics/unown_j_still_front_pic.png b/graphics/pokemon/unown/front_j.png similarity index 100% rename from graphics/pokemon/front_pics/unown_j_still_front_pic.png rename to graphics/pokemon/unown/front_j.png diff --git a/graphics/pokemon/front_pics/unown_k_still_front_pic.png b/graphics/pokemon/unown/front_k.png similarity index 100% rename from graphics/pokemon/front_pics/unown_k_still_front_pic.png rename to graphics/pokemon/unown/front_k.png diff --git a/graphics/pokemon/front_pics/unown_l_still_front_pic.png b/graphics/pokemon/unown/front_l.png similarity index 100% rename from graphics/pokemon/front_pics/unown_l_still_front_pic.png rename to graphics/pokemon/unown/front_l.png diff --git a/graphics/pokemon/front_pics/unown_m_still_front_pic.png b/graphics/pokemon/unown/front_m.png similarity index 100% rename from graphics/pokemon/front_pics/unown_m_still_front_pic.png rename to graphics/pokemon/unown/front_m.png diff --git a/graphics/pokemon/front_pics/unown_n_still_front_pic.png b/graphics/pokemon/unown/front_n.png similarity index 100% rename from graphics/pokemon/front_pics/unown_n_still_front_pic.png rename to graphics/pokemon/unown/front_n.png diff --git a/graphics/pokemon/front_pics/unown_o_still_front_pic.png b/graphics/pokemon/unown/front_o.png similarity index 100% rename from graphics/pokemon/front_pics/unown_o_still_front_pic.png rename to graphics/pokemon/unown/front_o.png diff --git a/graphics/pokemon/front_pics/unown_p_still_front_pic.png b/graphics/pokemon/unown/front_p.png similarity index 100% rename from graphics/pokemon/front_pics/unown_p_still_front_pic.png rename to graphics/pokemon/unown/front_p.png diff --git a/graphics/pokemon/front_pics/unown_q_still_front_pic.png b/graphics/pokemon/unown/front_q.png similarity index 100% rename from graphics/pokemon/front_pics/unown_q_still_front_pic.png rename to graphics/pokemon/unown/front_q.png diff --git a/graphics/pokemon/front_pics/unown_question_mark_still_front_pic.png b/graphics/pokemon/unown/front_question_mark.png similarity index 100% rename from graphics/pokemon/front_pics/unown_question_mark_still_front_pic.png rename to graphics/pokemon/unown/front_question_mark.png diff --git a/graphics/pokemon/front_pics/unown_r_still_front_pic.png b/graphics/pokemon/unown/front_r.png similarity index 100% rename from graphics/pokemon/front_pics/unown_r_still_front_pic.png rename to graphics/pokemon/unown/front_r.png diff --git a/graphics/pokemon/front_pics/unown_s_still_front_pic.png b/graphics/pokemon/unown/front_s.png similarity index 100% rename from graphics/pokemon/front_pics/unown_s_still_front_pic.png rename to graphics/pokemon/unown/front_s.png diff --git a/graphics/pokemon/front_pics/unown_t_still_front_pic.png b/graphics/pokemon/unown/front_t.png similarity index 100% rename from graphics/pokemon/front_pics/unown_t_still_front_pic.png rename to graphics/pokemon/unown/front_t.png diff --git a/graphics/pokemon/front_pics/unown_u_still_front_pic.png b/graphics/pokemon/unown/front_u.png similarity index 100% rename from graphics/pokemon/front_pics/unown_u_still_front_pic.png rename to graphics/pokemon/unown/front_u.png diff --git a/graphics/pokemon/front_pics/unown_v_still_front_pic.png b/graphics/pokemon/unown/front_v.png similarity index 100% rename from graphics/pokemon/front_pics/unown_v_still_front_pic.png rename to graphics/pokemon/unown/front_v.png diff --git a/graphics/pokemon/front_pics/unown_w_still_front_pic.png b/graphics/pokemon/unown/front_w.png similarity index 100% rename from graphics/pokemon/front_pics/unown_w_still_front_pic.png rename to graphics/pokemon/unown/front_w.png diff --git a/graphics/pokemon/front_pics/unown_x_still_front_pic.png b/graphics/pokemon/unown/front_x.png similarity index 100% rename from graphics/pokemon/front_pics/unown_x_still_front_pic.png rename to graphics/pokemon/unown/front_x.png diff --git a/graphics/pokemon/front_pics/unown_y_still_front_pic.png b/graphics/pokemon/unown/front_y.png similarity index 100% rename from graphics/pokemon/front_pics/unown_y_still_front_pic.png rename to graphics/pokemon/unown/front_y.png diff --git a/graphics/pokemon/front_pics/unown_z_still_front_pic.png b/graphics/pokemon/unown/front_z.png similarity index 100% rename from graphics/pokemon/front_pics/unown_z_still_front_pic.png rename to graphics/pokemon/unown/front_z.png diff --git a/graphics/pokemon/icons/unown_a_icon.png b/graphics/pokemon/unown/icon_a.png similarity index 100% rename from graphics/pokemon/icons/unown_a_icon.png rename to graphics/pokemon/unown/icon_a.png diff --git a/graphics/pokemon/icons/unown_B_icon.png b/graphics/pokemon/unown/icon_b.png similarity index 100% rename from graphics/pokemon/icons/unown_B_icon.png rename to graphics/pokemon/unown/icon_b.png diff --git a/graphics/pokemon/icons/unown_C_icon.png b/graphics/pokemon/unown/icon_c.png similarity index 100% rename from graphics/pokemon/icons/unown_C_icon.png rename to graphics/pokemon/unown/icon_c.png diff --git a/graphics/pokemon/icons/unown_D_icon.png b/graphics/pokemon/unown/icon_d.png similarity index 100% rename from graphics/pokemon/icons/unown_D_icon.png rename to graphics/pokemon/unown/icon_d.png diff --git a/graphics/pokemon/icons/unown_E_icon.png b/graphics/pokemon/unown/icon_e.png similarity index 100% rename from graphics/pokemon/icons/unown_E_icon.png rename to graphics/pokemon/unown/icon_e.png diff --git a/graphics/pokemon/icons/unown_exclamation_mark_icon.png b/graphics/pokemon/unown/icon_exclamation_mark.png similarity index 100% rename from graphics/pokemon/icons/unown_exclamation_mark_icon.png rename to graphics/pokemon/unown/icon_exclamation_mark.png diff --git a/graphics/pokemon/icons/unown_F_icon.png b/graphics/pokemon/unown/icon_f.png similarity index 100% rename from graphics/pokemon/icons/unown_F_icon.png rename to graphics/pokemon/unown/icon_f.png diff --git a/graphics/pokemon/icons/unown_G_icon.png b/graphics/pokemon/unown/icon_g.png similarity index 100% rename from graphics/pokemon/icons/unown_G_icon.png rename to graphics/pokemon/unown/icon_g.png diff --git a/graphics/pokemon/icons/unown_H_icon.png b/graphics/pokemon/unown/icon_h.png similarity index 100% rename from graphics/pokemon/icons/unown_H_icon.png rename to graphics/pokemon/unown/icon_h.png diff --git a/graphics/pokemon/icons/unown_I_icon.png b/graphics/pokemon/unown/icon_i.png similarity index 100% rename from graphics/pokemon/icons/unown_I_icon.png rename to graphics/pokemon/unown/icon_i.png diff --git a/graphics/pokemon/icons/unown_J_icon.png b/graphics/pokemon/unown/icon_j.png similarity index 100% rename from graphics/pokemon/icons/unown_J_icon.png rename to graphics/pokemon/unown/icon_j.png diff --git a/graphics/pokemon/icons/unown_K_icon.png b/graphics/pokemon/unown/icon_k.png similarity index 100% rename from graphics/pokemon/icons/unown_K_icon.png rename to graphics/pokemon/unown/icon_k.png diff --git a/graphics/pokemon/icons/unown_L_icon.png b/graphics/pokemon/unown/icon_l.png similarity index 100% rename from graphics/pokemon/icons/unown_L_icon.png rename to graphics/pokemon/unown/icon_l.png diff --git a/graphics/pokemon/icons/unown_M_icon.png b/graphics/pokemon/unown/icon_m.png similarity index 100% rename from graphics/pokemon/icons/unown_M_icon.png rename to graphics/pokemon/unown/icon_m.png diff --git a/graphics/pokemon/icons/unown_N_icon.png b/graphics/pokemon/unown/icon_n.png similarity index 100% rename from graphics/pokemon/icons/unown_N_icon.png rename to graphics/pokemon/unown/icon_n.png diff --git a/graphics/pokemon/icons/unown_O_icon.png b/graphics/pokemon/unown/icon_o.png similarity index 100% rename from graphics/pokemon/icons/unown_O_icon.png rename to graphics/pokemon/unown/icon_o.png diff --git a/graphics/pokemon/icons/unown_P_icon.png b/graphics/pokemon/unown/icon_p.png similarity index 100% rename from graphics/pokemon/icons/unown_P_icon.png rename to graphics/pokemon/unown/icon_p.png diff --git a/graphics/pokemon/icons/unown_Q_icon.png b/graphics/pokemon/unown/icon_q.png similarity index 100% rename from graphics/pokemon/icons/unown_Q_icon.png rename to graphics/pokemon/unown/icon_q.png diff --git a/graphics/pokemon/icons/unown_question_mark_icon.png b/graphics/pokemon/unown/icon_question_mark.png similarity index 100% rename from graphics/pokemon/icons/unown_question_mark_icon.png rename to graphics/pokemon/unown/icon_question_mark.png diff --git a/graphics/pokemon/icons/unown_R_icon.png b/graphics/pokemon/unown/icon_r.png similarity index 100% rename from graphics/pokemon/icons/unown_R_icon.png rename to graphics/pokemon/unown/icon_r.png diff --git a/graphics/pokemon/icons/unown_S_icon.png b/graphics/pokemon/unown/icon_s.png similarity index 100% rename from graphics/pokemon/icons/unown_S_icon.png rename to graphics/pokemon/unown/icon_s.png diff --git a/graphics/pokemon/icons/unown_T_icon.png b/graphics/pokemon/unown/icon_t.png similarity index 100% rename from graphics/pokemon/icons/unown_T_icon.png rename to graphics/pokemon/unown/icon_t.png diff --git a/graphics/pokemon/icons/unown_U_icon.png b/graphics/pokemon/unown/icon_u.png similarity index 100% rename from graphics/pokemon/icons/unown_U_icon.png rename to graphics/pokemon/unown/icon_u.png diff --git a/graphics/pokemon/icons/unown_V_icon.png b/graphics/pokemon/unown/icon_v.png similarity index 100% rename from graphics/pokemon/icons/unown_V_icon.png rename to graphics/pokemon/unown/icon_v.png diff --git a/graphics/pokemon/icons/unown_W_icon.png b/graphics/pokemon/unown/icon_w.png similarity index 100% rename from graphics/pokemon/icons/unown_W_icon.png rename to graphics/pokemon/unown/icon_w.png diff --git a/graphics/pokemon/icons/unown_X_icon.png b/graphics/pokemon/unown/icon_x.png similarity index 100% rename from graphics/pokemon/icons/unown_X_icon.png rename to graphics/pokemon/unown/icon_x.png diff --git a/graphics/pokemon/icons/unown_Y_icon.png b/graphics/pokemon/unown/icon_y.png similarity index 100% rename from graphics/pokemon/icons/unown_Y_icon.png rename to graphics/pokemon/unown/icon_y.png diff --git a/graphics/pokemon/icons/unown_Z_icon.png b/graphics/pokemon/unown/icon_z.png similarity index 100% rename from graphics/pokemon/icons/unown_Z_icon.png rename to graphics/pokemon/unown/icon_z.png diff --git a/graphics/pokemon/palettes/unown_palette.pal b/graphics/pokemon/unown/normal.pal similarity index 100% rename from graphics/pokemon/palettes/unown_palette.pal rename to graphics/pokemon/unown/normal.pal diff --git a/graphics/pokemon/palettes/unown_shiny_palette.pal b/graphics/pokemon/unown/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/unown_shiny_palette.pal rename to graphics/pokemon/unown/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/ursaring_front_pic.png b/graphics/pokemon/ursaring/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/ursaring_front_pic.png rename to graphics/pokemon/ursaring/anim_front.png diff --git a/graphics/pokemon/back_pics/ursaring_back_pic.png b/graphics/pokemon/ursaring/back.png similarity index 100% rename from graphics/pokemon/back_pics/ursaring_back_pic.png rename to graphics/pokemon/ursaring/back.png diff --git a/graphics/pokemon/footprints/ursaring_footprint.png b/graphics/pokemon/ursaring/footprint.png similarity index 100% rename from graphics/pokemon/footprints/ursaring_footprint.png rename to graphics/pokemon/ursaring/footprint.png diff --git a/graphics/pokemon/front_pics/ursaring_still_front_pic.png b/graphics/pokemon/ursaring/front.png similarity index 100% rename from graphics/pokemon/front_pics/ursaring_still_front_pic.png rename to graphics/pokemon/ursaring/front.png diff --git a/graphics/pokemon/icons/ursaring_icon.png b/graphics/pokemon/ursaring/icon.png similarity index 100% rename from graphics/pokemon/icons/ursaring_icon.png rename to graphics/pokemon/ursaring/icon.png diff --git a/graphics/pokemon/palettes/ursaring_palette.pal b/graphics/pokemon/ursaring/normal.pal similarity index 100% rename from graphics/pokemon/palettes/ursaring_palette.pal rename to graphics/pokemon/ursaring/normal.pal diff --git a/graphics/pokemon/palettes/ursaring_shiny_palette.pal b/graphics/pokemon/ursaring/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/ursaring_shiny_palette.pal rename to graphics/pokemon/ursaring/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/vaporeon_front_pic.png b/graphics/pokemon/vaporeon/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/vaporeon_front_pic.png rename to graphics/pokemon/vaporeon/anim_front.png diff --git a/graphics/pokemon/back_pics/vaporeon_back_pic.png b/graphics/pokemon/vaporeon/back.png similarity index 100% rename from graphics/pokemon/back_pics/vaporeon_back_pic.png rename to graphics/pokemon/vaporeon/back.png diff --git a/graphics/pokemon/footprints/vaporeon_footprint.png b/graphics/pokemon/vaporeon/footprint.png similarity index 100% rename from graphics/pokemon/footprints/vaporeon_footprint.png rename to graphics/pokemon/vaporeon/footprint.png diff --git a/graphics/pokemon/front_pics/vaporeon_still_front_pic.png b/graphics/pokemon/vaporeon/front.png similarity index 100% rename from graphics/pokemon/front_pics/vaporeon_still_front_pic.png rename to graphics/pokemon/vaporeon/front.png diff --git a/graphics/pokemon/icons/vaporeon_icon.png b/graphics/pokemon/vaporeon/icon.png similarity index 100% rename from graphics/pokemon/icons/vaporeon_icon.png rename to graphics/pokemon/vaporeon/icon.png diff --git a/graphics/pokemon/palettes/vaporeon_palette.pal b/graphics/pokemon/vaporeon/normal.pal similarity index 100% rename from graphics/pokemon/palettes/vaporeon_palette.pal rename to graphics/pokemon/vaporeon/normal.pal diff --git a/graphics/pokemon/palettes/vaporeon_shiny_palette.pal b/graphics/pokemon/vaporeon/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/vaporeon_shiny_palette.pal rename to graphics/pokemon/vaporeon/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/venomoth_front_pic.png b/graphics/pokemon/venomoth/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/venomoth_front_pic.png rename to graphics/pokemon/venomoth/anim_front.png diff --git a/graphics/pokemon/back_pics/venomoth_back_pic.png b/graphics/pokemon/venomoth/back.png similarity index 100% rename from graphics/pokemon/back_pics/venomoth_back_pic.png rename to graphics/pokemon/venomoth/back.png diff --git a/graphics/pokemon/footprints/venomoth_footprint.png b/graphics/pokemon/venomoth/footprint.png similarity index 100% rename from graphics/pokemon/footprints/venomoth_footprint.png rename to graphics/pokemon/venomoth/footprint.png diff --git a/graphics/pokemon/front_pics/venomoth_still_front_pic.png b/graphics/pokemon/venomoth/front.png similarity index 100% rename from graphics/pokemon/front_pics/venomoth_still_front_pic.png rename to graphics/pokemon/venomoth/front.png diff --git a/graphics/pokemon/icons/venomoth_icon.png b/graphics/pokemon/venomoth/icon.png similarity index 100% rename from graphics/pokemon/icons/venomoth_icon.png rename to graphics/pokemon/venomoth/icon.png diff --git a/graphics/pokemon/palettes/venomoth_palette.pal b/graphics/pokemon/venomoth/normal.pal similarity index 100% rename from graphics/pokemon/palettes/venomoth_palette.pal rename to graphics/pokemon/venomoth/normal.pal diff --git a/graphics/pokemon/palettes/venomoth_shiny_palette.pal b/graphics/pokemon/venomoth/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/venomoth_shiny_palette.pal rename to graphics/pokemon/venomoth/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/venonat_front_pic.png b/graphics/pokemon/venonat/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/venonat_front_pic.png rename to graphics/pokemon/venonat/anim_front.png diff --git a/graphics/pokemon/back_pics/venonat_back_pic.png b/graphics/pokemon/venonat/back.png similarity index 100% rename from graphics/pokemon/back_pics/venonat_back_pic.png rename to graphics/pokemon/venonat/back.png diff --git a/graphics/pokemon/footprints/venonat_footprint.png b/graphics/pokemon/venonat/footprint.png similarity index 100% rename from graphics/pokemon/footprints/venonat_footprint.png rename to graphics/pokemon/venonat/footprint.png diff --git a/graphics/pokemon/front_pics/venonat_still_front_pic.png b/graphics/pokemon/venonat/front.png similarity index 100% rename from graphics/pokemon/front_pics/venonat_still_front_pic.png rename to graphics/pokemon/venonat/front.png diff --git a/graphics/pokemon/icons/venonat_icon.png b/graphics/pokemon/venonat/icon.png similarity index 100% rename from graphics/pokemon/icons/venonat_icon.png rename to graphics/pokemon/venonat/icon.png diff --git a/graphics/pokemon/palettes/venonat_palette.pal b/graphics/pokemon/venonat/normal.pal similarity index 100% rename from graphics/pokemon/palettes/venonat_palette.pal rename to graphics/pokemon/venonat/normal.pal diff --git a/graphics/pokemon/palettes/venonat_shiny_palette.pal b/graphics/pokemon/venonat/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/venonat_shiny_palette.pal rename to graphics/pokemon/venonat/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/venusaur_front_pic.png b/graphics/pokemon/venusaur/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/venusaur_front_pic.png rename to graphics/pokemon/venusaur/anim_front.png diff --git a/graphics/pokemon/back_pics/venusaur_back_pic.png b/graphics/pokemon/venusaur/back.png similarity index 100% rename from graphics/pokemon/back_pics/venusaur_back_pic.png rename to graphics/pokemon/venusaur/back.png diff --git a/graphics/pokemon/footprints/venusaur_footprint.png b/graphics/pokemon/venusaur/footprint.png similarity index 100% rename from graphics/pokemon/footprints/venusaur_footprint.png rename to graphics/pokemon/venusaur/footprint.png diff --git a/graphics/pokemon/front_pics/venusaur_still_front_pic.png b/graphics/pokemon/venusaur/front.png similarity index 100% rename from graphics/pokemon/front_pics/venusaur_still_front_pic.png rename to graphics/pokemon/venusaur/front.png diff --git a/graphics/pokemon/icons/venusaur_icon.png b/graphics/pokemon/venusaur/icon.png similarity index 100% rename from graphics/pokemon/icons/venusaur_icon.png rename to graphics/pokemon/venusaur/icon.png diff --git a/graphics/pokemon/palettes/venusaur_palette.pal b/graphics/pokemon/venusaur/normal.pal similarity index 100% rename from graphics/pokemon/palettes/venusaur_palette.pal rename to graphics/pokemon/venusaur/normal.pal diff --git a/graphics/pokemon/palettes/venusaur_shiny_palette.pal b/graphics/pokemon/venusaur/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/venusaur_shiny_palette.pal rename to graphics/pokemon/venusaur/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/vibrava_front_pic.png b/graphics/pokemon/vibrava/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/vibrava_front_pic.png rename to graphics/pokemon/vibrava/anim_front.png diff --git a/graphics/pokemon/back_pics/vibrava_back_pic.png b/graphics/pokemon/vibrava/back.png similarity index 100% rename from graphics/pokemon/back_pics/vibrava_back_pic.png rename to graphics/pokemon/vibrava/back.png diff --git a/graphics/pokemon/footprints/vibrava_footprint.png b/graphics/pokemon/vibrava/footprint.png similarity index 100% rename from graphics/pokemon/footprints/vibrava_footprint.png rename to graphics/pokemon/vibrava/footprint.png diff --git a/graphics/pokemon/front_pics/vibrava_still_front_pic.png b/graphics/pokemon/vibrava/front.png similarity index 100% rename from graphics/pokemon/front_pics/vibrava_still_front_pic.png rename to graphics/pokemon/vibrava/front.png diff --git a/graphics/pokemon/icons/vibrava_icon.png b/graphics/pokemon/vibrava/icon.png similarity index 100% rename from graphics/pokemon/icons/vibrava_icon.png rename to graphics/pokemon/vibrava/icon.png diff --git a/graphics/pokemon/palettes/vibrava_palette.pal b/graphics/pokemon/vibrava/normal.pal similarity index 100% rename from graphics/pokemon/palettes/vibrava_palette.pal rename to graphics/pokemon/vibrava/normal.pal diff --git a/graphics/pokemon/palettes/vibrava_shiny_palette.pal b/graphics/pokemon/vibrava/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/vibrava_shiny_palette.pal rename to graphics/pokemon/vibrava/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/victreebel_front_pic.png b/graphics/pokemon/victreebel/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/victreebel_front_pic.png rename to graphics/pokemon/victreebel/anim_front.png diff --git a/graphics/pokemon/back_pics/victreebel_back_pic.png b/graphics/pokemon/victreebel/back.png similarity index 100% rename from graphics/pokemon/back_pics/victreebel_back_pic.png rename to graphics/pokemon/victreebel/back.png diff --git a/graphics/pokemon/footprints/victreebel_footprint.png b/graphics/pokemon/victreebel/footprint.png similarity index 100% rename from graphics/pokemon/footprints/victreebel_footprint.png rename to graphics/pokemon/victreebel/footprint.png diff --git a/graphics/pokemon/front_pics/victreebel_still_front_pic.png b/graphics/pokemon/victreebel/front.png similarity index 100% rename from graphics/pokemon/front_pics/victreebel_still_front_pic.png rename to graphics/pokemon/victreebel/front.png diff --git a/graphics/pokemon/icons/victreebel_icon.png b/graphics/pokemon/victreebel/icon.png similarity index 100% rename from graphics/pokemon/icons/victreebel_icon.png rename to graphics/pokemon/victreebel/icon.png diff --git a/graphics/pokemon/palettes/victreebel_palette.pal b/graphics/pokemon/victreebel/normal.pal similarity index 100% rename from graphics/pokemon/palettes/victreebel_palette.pal rename to graphics/pokemon/victreebel/normal.pal diff --git a/graphics/pokemon/palettes/victreebel_shiny_palette.pal b/graphics/pokemon/victreebel/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/victreebel_shiny_palette.pal rename to graphics/pokemon/victreebel/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/vigoroth_front_pic.png b/graphics/pokemon/vigoroth/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/vigoroth_front_pic.png rename to graphics/pokemon/vigoroth/anim_front.png diff --git a/graphics/pokemon/back_pics/vigoroth_back_pic.png b/graphics/pokemon/vigoroth/back.png similarity index 100% rename from graphics/pokemon/back_pics/vigoroth_back_pic.png rename to graphics/pokemon/vigoroth/back.png diff --git a/graphics/pokemon/footprints/vigoroth_footprint.png b/graphics/pokemon/vigoroth/footprint.png similarity index 100% rename from graphics/pokemon/footprints/vigoroth_footprint.png rename to graphics/pokemon/vigoroth/footprint.png diff --git a/graphics/pokemon/front_pics/vigoroth_still_front_pic.png b/graphics/pokemon/vigoroth/front.png similarity index 100% rename from graphics/pokemon/front_pics/vigoroth_still_front_pic.png rename to graphics/pokemon/vigoroth/front.png diff --git a/graphics/pokemon/icons/vigoroth_icon.png b/graphics/pokemon/vigoroth/icon.png similarity index 100% rename from graphics/pokemon/icons/vigoroth_icon.png rename to graphics/pokemon/vigoroth/icon.png diff --git a/graphics/pokemon/palettes/vigoroth_palette.pal b/graphics/pokemon/vigoroth/normal.pal similarity index 100% rename from graphics/pokemon/palettes/vigoroth_palette.pal rename to graphics/pokemon/vigoroth/normal.pal diff --git a/graphics/pokemon/palettes/vigoroth_shiny_palette.pal b/graphics/pokemon/vigoroth/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/vigoroth_shiny_palette.pal rename to graphics/pokemon/vigoroth/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/vileplume_front_pic.png b/graphics/pokemon/vileplume/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/vileplume_front_pic.png rename to graphics/pokemon/vileplume/anim_front.png diff --git a/graphics/pokemon/back_pics/vileplume_back_pic.png b/graphics/pokemon/vileplume/back.png similarity index 100% rename from graphics/pokemon/back_pics/vileplume_back_pic.png rename to graphics/pokemon/vileplume/back.png diff --git a/graphics/pokemon/footprints/vileplume_footprint.png b/graphics/pokemon/vileplume/footprint.png similarity index 100% rename from graphics/pokemon/footprints/vileplume_footprint.png rename to graphics/pokemon/vileplume/footprint.png diff --git a/graphics/pokemon/front_pics/vileplume_still_front_pic.png b/graphics/pokemon/vileplume/front.png similarity index 100% rename from graphics/pokemon/front_pics/vileplume_still_front_pic.png rename to graphics/pokemon/vileplume/front.png diff --git a/graphics/pokemon/icons/vileplume_icon.png b/graphics/pokemon/vileplume/icon.png similarity index 100% rename from graphics/pokemon/icons/vileplume_icon.png rename to graphics/pokemon/vileplume/icon.png diff --git a/graphics/pokemon/palettes/vileplume_palette.pal b/graphics/pokemon/vileplume/normal.pal similarity index 100% rename from graphics/pokemon/palettes/vileplume_palette.pal rename to graphics/pokemon/vileplume/normal.pal diff --git a/graphics/pokemon/palettes/vileplume_shiny_palette.pal b/graphics/pokemon/vileplume/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/vileplume_shiny_palette.pal rename to graphics/pokemon/vileplume/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/volbeat_front_pic.png b/graphics/pokemon/volbeat/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/volbeat_front_pic.png rename to graphics/pokemon/volbeat/anim_front.png diff --git a/graphics/pokemon/back_pics/volbeat_back_pic.png b/graphics/pokemon/volbeat/back.png similarity index 100% rename from graphics/pokemon/back_pics/volbeat_back_pic.png rename to graphics/pokemon/volbeat/back.png diff --git a/graphics/pokemon/footprints/volbeat_footprint.png b/graphics/pokemon/volbeat/footprint.png similarity index 100% rename from graphics/pokemon/footprints/volbeat_footprint.png rename to graphics/pokemon/volbeat/footprint.png diff --git a/graphics/pokemon/front_pics/volbeat_still_front_pic.png b/graphics/pokemon/volbeat/front.png similarity index 100% rename from graphics/pokemon/front_pics/volbeat_still_front_pic.png rename to graphics/pokemon/volbeat/front.png diff --git a/graphics/pokemon/icons/volbeat_icon.png b/graphics/pokemon/volbeat/icon.png similarity index 100% rename from graphics/pokemon/icons/volbeat_icon.png rename to graphics/pokemon/volbeat/icon.png diff --git a/graphics/pokemon/palettes/volbeat_palette.pal b/graphics/pokemon/volbeat/normal.pal similarity index 100% rename from graphics/pokemon/palettes/volbeat_palette.pal rename to graphics/pokemon/volbeat/normal.pal diff --git a/graphics/pokemon/palettes/volbeat_shiny_palette.pal b/graphics/pokemon/volbeat/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/volbeat_shiny_palette.pal rename to graphics/pokemon/volbeat/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/voltorb_front_pic.png b/graphics/pokemon/voltorb/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/voltorb_front_pic.png rename to graphics/pokemon/voltorb/anim_front.png diff --git a/graphics/pokemon/back_pics/voltorb_back_pic.png b/graphics/pokemon/voltorb/back.png similarity index 100% rename from graphics/pokemon/back_pics/voltorb_back_pic.png rename to graphics/pokemon/voltorb/back.png diff --git a/graphics/pokemon/footprints/voltorb_footprint.png b/graphics/pokemon/voltorb/footprint.png similarity index 100% rename from graphics/pokemon/footprints/voltorb_footprint.png rename to graphics/pokemon/voltorb/footprint.png diff --git a/graphics/pokemon/front_pics/voltorb_still_front_pic.png b/graphics/pokemon/voltorb/front.png similarity index 100% rename from graphics/pokemon/front_pics/voltorb_still_front_pic.png rename to graphics/pokemon/voltorb/front.png diff --git a/graphics/pokemon/icons/voltorb_icon.png b/graphics/pokemon/voltorb/icon.png similarity index 100% rename from graphics/pokemon/icons/voltorb_icon.png rename to graphics/pokemon/voltorb/icon.png diff --git a/graphics/pokemon/palettes/voltorb_palette.pal b/graphics/pokemon/voltorb/normal.pal similarity index 100% rename from graphics/pokemon/palettes/voltorb_palette.pal rename to graphics/pokemon/voltorb/normal.pal diff --git a/graphics/pokemon/palettes/voltorb_shiny_palette.pal b/graphics/pokemon/voltorb/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/voltorb_shiny_palette.pal rename to graphics/pokemon/voltorb/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/vulpix_front_pic.png b/graphics/pokemon/vulpix/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/vulpix_front_pic.png rename to graphics/pokemon/vulpix/anim_front.png diff --git a/graphics/pokemon/back_pics/vulpix_back_pic.png b/graphics/pokemon/vulpix/back.png similarity index 100% rename from graphics/pokemon/back_pics/vulpix_back_pic.png rename to graphics/pokemon/vulpix/back.png diff --git a/graphics/pokemon/footprints/vulpix_footprint.png b/graphics/pokemon/vulpix/footprint.png similarity index 100% rename from graphics/pokemon/footprints/vulpix_footprint.png rename to graphics/pokemon/vulpix/footprint.png diff --git a/graphics/pokemon/front_pics/vulpix_still_front_pic.png b/graphics/pokemon/vulpix/front.png similarity index 100% rename from graphics/pokemon/front_pics/vulpix_still_front_pic.png rename to graphics/pokemon/vulpix/front.png diff --git a/graphics/pokemon/icons/vulpix_icon.png b/graphics/pokemon/vulpix/icon.png similarity index 100% rename from graphics/pokemon/icons/vulpix_icon.png rename to graphics/pokemon/vulpix/icon.png diff --git a/graphics/pokemon/palettes/vulpix_palette.pal b/graphics/pokemon/vulpix/normal.pal similarity index 100% rename from graphics/pokemon/palettes/vulpix_palette.pal rename to graphics/pokemon/vulpix/normal.pal diff --git a/graphics/pokemon/palettes/vulpix_shiny_palette.pal b/graphics/pokemon/vulpix/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/vulpix_shiny_palette.pal rename to graphics/pokemon/vulpix/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/wailmer_front_pic.png b/graphics/pokemon/wailmer/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/wailmer_front_pic.png rename to graphics/pokemon/wailmer/anim_front.png diff --git a/graphics/pokemon/back_pics/wailmer_back_pic.png b/graphics/pokemon/wailmer/back.png similarity index 100% rename from graphics/pokemon/back_pics/wailmer_back_pic.png rename to graphics/pokemon/wailmer/back.png diff --git a/graphics/pokemon/footprints/wailmer_footprint.png b/graphics/pokemon/wailmer/footprint.png similarity index 100% rename from graphics/pokemon/footprints/wailmer_footprint.png rename to graphics/pokemon/wailmer/footprint.png diff --git a/graphics/pokemon/front_pics/wailmer_still_front_pic.png b/graphics/pokemon/wailmer/front.png similarity index 100% rename from graphics/pokemon/front_pics/wailmer_still_front_pic.png rename to graphics/pokemon/wailmer/front.png diff --git a/graphics/pokemon/icons/wailmer_icon.png b/graphics/pokemon/wailmer/icon.png similarity index 100% rename from graphics/pokemon/icons/wailmer_icon.png rename to graphics/pokemon/wailmer/icon.png diff --git a/graphics/pokemon/palettes/wailmer_palette.pal b/graphics/pokemon/wailmer/normal.pal similarity index 100% rename from graphics/pokemon/palettes/wailmer_palette.pal rename to graphics/pokemon/wailmer/normal.pal diff --git a/graphics/pokemon/palettes/wailmer_shiny_palette.pal b/graphics/pokemon/wailmer/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/wailmer_shiny_palette.pal rename to graphics/pokemon/wailmer/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/wailord_front_pic.png b/graphics/pokemon/wailord/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/wailord_front_pic.png rename to graphics/pokemon/wailord/anim_front.png diff --git a/graphics/pokemon/back_pics/wailord_back_pic.png b/graphics/pokemon/wailord/back.png similarity index 100% rename from graphics/pokemon/back_pics/wailord_back_pic.png rename to graphics/pokemon/wailord/back.png diff --git a/graphics/pokemon/footprints/wailord_footprint.png b/graphics/pokemon/wailord/footprint.png similarity index 100% rename from graphics/pokemon/footprints/wailord_footprint.png rename to graphics/pokemon/wailord/footprint.png diff --git a/graphics/pokemon/front_pics/wailord_still_front_pic.png b/graphics/pokemon/wailord/front.png similarity index 100% rename from graphics/pokemon/front_pics/wailord_still_front_pic.png rename to graphics/pokemon/wailord/front.png diff --git a/graphics/pokemon/icons/wailord_icon.png b/graphics/pokemon/wailord/icon.png similarity index 100% rename from graphics/pokemon/icons/wailord_icon.png rename to graphics/pokemon/wailord/icon.png diff --git a/graphics/pokemon/palettes/wailord_palette.pal b/graphics/pokemon/wailord/normal.pal similarity index 100% rename from graphics/pokemon/palettes/wailord_palette.pal rename to graphics/pokemon/wailord/normal.pal diff --git a/graphics/pokemon/palettes/wailord_shiny_palette.pal b/graphics/pokemon/wailord/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/wailord_shiny_palette.pal rename to graphics/pokemon/wailord/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/walrein_front_pic.png b/graphics/pokemon/walrein/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/walrein_front_pic.png rename to graphics/pokemon/walrein/anim_front.png diff --git a/graphics/pokemon/back_pics/walrein_back_pic.png b/graphics/pokemon/walrein/back.png similarity index 100% rename from graphics/pokemon/back_pics/walrein_back_pic.png rename to graphics/pokemon/walrein/back.png diff --git a/graphics/pokemon/footprints/walrein_footprint.png b/graphics/pokemon/walrein/footprint.png similarity index 100% rename from graphics/pokemon/footprints/walrein_footprint.png rename to graphics/pokemon/walrein/footprint.png diff --git a/graphics/pokemon/front_pics/walrein_still_front_pic.png b/graphics/pokemon/walrein/front.png similarity index 100% rename from graphics/pokemon/front_pics/walrein_still_front_pic.png rename to graphics/pokemon/walrein/front.png diff --git a/graphics/pokemon/icons/walrein_icon.png b/graphics/pokemon/walrein/icon.png similarity index 100% rename from graphics/pokemon/icons/walrein_icon.png rename to graphics/pokemon/walrein/icon.png diff --git a/graphics/pokemon/palettes/walrein_palette.pal b/graphics/pokemon/walrein/normal.pal similarity index 100% rename from graphics/pokemon/palettes/walrein_palette.pal rename to graphics/pokemon/walrein/normal.pal diff --git a/graphics/pokemon/palettes/walrein_shiny_palette.pal b/graphics/pokemon/walrein/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/walrein_shiny_palette.pal rename to graphics/pokemon/walrein/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/wartortle_front_pic.png b/graphics/pokemon/wartortle/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/wartortle_front_pic.png rename to graphics/pokemon/wartortle/anim_front.png diff --git a/graphics/pokemon/back_pics/wartortle_back_pic.png b/graphics/pokemon/wartortle/back.png similarity index 100% rename from graphics/pokemon/back_pics/wartortle_back_pic.png rename to graphics/pokemon/wartortle/back.png diff --git a/graphics/pokemon/footprints/wartortle_footprint.png b/graphics/pokemon/wartortle/footprint.png similarity index 100% rename from graphics/pokemon/footprints/wartortle_footprint.png rename to graphics/pokemon/wartortle/footprint.png diff --git a/graphics/pokemon/front_pics/wartortle_still_front_pic.png b/graphics/pokemon/wartortle/front.png similarity index 100% rename from graphics/pokemon/front_pics/wartortle_still_front_pic.png rename to graphics/pokemon/wartortle/front.png diff --git a/graphics/pokemon/icons/wartortle_icon.png b/graphics/pokemon/wartortle/icon.png similarity index 100% rename from graphics/pokemon/icons/wartortle_icon.png rename to graphics/pokemon/wartortle/icon.png diff --git a/graphics/pokemon/palettes/wartortle_palette.pal b/graphics/pokemon/wartortle/normal.pal similarity index 100% rename from graphics/pokemon/palettes/wartortle_palette.pal rename to graphics/pokemon/wartortle/normal.pal diff --git a/graphics/pokemon/palettes/wartortle_shiny_palette.pal b/graphics/pokemon/wartortle/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/wartortle_shiny_palette.pal rename to graphics/pokemon/wartortle/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/weedle_front_pic.png b/graphics/pokemon/weedle/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/weedle_front_pic.png rename to graphics/pokemon/weedle/anim_front.png diff --git a/graphics/pokemon/back_pics/weedle_back_pic.png b/graphics/pokemon/weedle/back.png similarity index 100% rename from graphics/pokemon/back_pics/weedle_back_pic.png rename to graphics/pokemon/weedle/back.png diff --git a/graphics/pokemon/footprints/weedle_footprint.png b/graphics/pokemon/weedle/footprint.png similarity index 100% rename from graphics/pokemon/footprints/weedle_footprint.png rename to graphics/pokemon/weedle/footprint.png diff --git a/graphics/pokemon/front_pics/weedle_still_front_pic.png b/graphics/pokemon/weedle/front.png similarity index 100% rename from graphics/pokemon/front_pics/weedle_still_front_pic.png rename to graphics/pokemon/weedle/front.png diff --git a/graphics/pokemon/icons/weedle_icon.png b/graphics/pokemon/weedle/icon.png similarity index 100% rename from graphics/pokemon/icons/weedle_icon.png rename to graphics/pokemon/weedle/icon.png diff --git a/graphics/pokemon/palettes/weedle_palette.pal b/graphics/pokemon/weedle/normal.pal similarity index 100% rename from graphics/pokemon/palettes/weedle_palette.pal rename to graphics/pokemon/weedle/normal.pal diff --git a/graphics/pokemon/palettes/weedle_shiny_palette.pal b/graphics/pokemon/weedle/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/weedle_shiny_palette.pal rename to graphics/pokemon/weedle/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/weepinbell_front_pic.png b/graphics/pokemon/weepinbell/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/weepinbell_front_pic.png rename to graphics/pokemon/weepinbell/anim_front.png diff --git a/graphics/pokemon/back_pics/weepinbell_back_pic.png b/graphics/pokemon/weepinbell/back.png similarity index 100% rename from graphics/pokemon/back_pics/weepinbell_back_pic.png rename to graphics/pokemon/weepinbell/back.png diff --git a/graphics/pokemon/footprints/weepinbell_footprint.png b/graphics/pokemon/weepinbell/footprint.png similarity index 100% rename from graphics/pokemon/footprints/weepinbell_footprint.png rename to graphics/pokemon/weepinbell/footprint.png diff --git a/graphics/pokemon/front_pics/weepinbell_still_front_pic.png b/graphics/pokemon/weepinbell/front.png similarity index 100% rename from graphics/pokemon/front_pics/weepinbell_still_front_pic.png rename to graphics/pokemon/weepinbell/front.png diff --git a/graphics/pokemon/icons/weepinbell_icon.png b/graphics/pokemon/weepinbell/icon.png similarity index 100% rename from graphics/pokemon/icons/weepinbell_icon.png rename to graphics/pokemon/weepinbell/icon.png diff --git a/graphics/pokemon/palettes/weepinbell_palette.pal b/graphics/pokemon/weepinbell/normal.pal similarity index 100% rename from graphics/pokemon/palettes/weepinbell_palette.pal rename to graphics/pokemon/weepinbell/normal.pal diff --git a/graphics/pokemon/palettes/weepinbell_shiny_palette.pal b/graphics/pokemon/weepinbell/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/weepinbell_shiny_palette.pal rename to graphics/pokemon/weepinbell/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/weezing_front_pic.png b/graphics/pokemon/weezing/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/weezing_front_pic.png rename to graphics/pokemon/weezing/anim_front.png diff --git a/graphics/pokemon/back_pics/weezing_back_pic.png b/graphics/pokemon/weezing/back.png similarity index 100% rename from graphics/pokemon/back_pics/weezing_back_pic.png rename to graphics/pokemon/weezing/back.png diff --git a/graphics/pokemon/footprints/weezing_footprint.png b/graphics/pokemon/weezing/footprint.png similarity index 100% rename from graphics/pokemon/footprints/weezing_footprint.png rename to graphics/pokemon/weezing/footprint.png diff --git a/graphics/pokemon/front_pics/weezing_still_front_pic.png b/graphics/pokemon/weezing/front.png similarity index 100% rename from graphics/pokemon/front_pics/weezing_still_front_pic.png rename to graphics/pokemon/weezing/front.png diff --git a/graphics/pokemon/icons/weezing_icon.png b/graphics/pokemon/weezing/icon.png similarity index 100% rename from graphics/pokemon/icons/weezing_icon.png rename to graphics/pokemon/weezing/icon.png diff --git a/graphics/pokemon/palettes/weezing_palette.pal b/graphics/pokemon/weezing/normal.pal similarity index 100% rename from graphics/pokemon/palettes/weezing_palette.pal rename to graphics/pokemon/weezing/normal.pal diff --git a/graphics/pokemon/palettes/weezing_shiny_palette.pal b/graphics/pokemon/weezing/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/weezing_shiny_palette.pal rename to graphics/pokemon/weezing/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/whiscash_front_pic.png b/graphics/pokemon/whiscash/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/whiscash_front_pic.png rename to graphics/pokemon/whiscash/anim_front.png diff --git a/graphics/pokemon/back_pics/whiscash_back_pic.png b/graphics/pokemon/whiscash/back.png similarity index 100% rename from graphics/pokemon/back_pics/whiscash_back_pic.png rename to graphics/pokemon/whiscash/back.png diff --git a/graphics/pokemon/footprints/whiscash_footprint.png b/graphics/pokemon/whiscash/footprint.png similarity index 100% rename from graphics/pokemon/footprints/whiscash_footprint.png rename to graphics/pokemon/whiscash/footprint.png diff --git a/graphics/pokemon/front_pics/whiscash_still_front_pic.png b/graphics/pokemon/whiscash/front.png similarity index 100% rename from graphics/pokemon/front_pics/whiscash_still_front_pic.png rename to graphics/pokemon/whiscash/front.png diff --git a/graphics/pokemon/icons/whiscash_icon.png b/graphics/pokemon/whiscash/icon.png similarity index 100% rename from graphics/pokemon/icons/whiscash_icon.png rename to graphics/pokemon/whiscash/icon.png diff --git a/graphics/pokemon/palettes/whiscash_palette.pal b/graphics/pokemon/whiscash/normal.pal similarity index 100% rename from graphics/pokemon/palettes/whiscash_palette.pal rename to graphics/pokemon/whiscash/normal.pal diff --git a/graphics/pokemon/palettes/whiscash_shiny_palette.pal b/graphics/pokemon/whiscash/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/whiscash_shiny_palette.pal rename to graphics/pokemon/whiscash/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/whismur_front_pic.png b/graphics/pokemon/whismur/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/whismur_front_pic.png rename to graphics/pokemon/whismur/anim_front.png diff --git a/graphics/pokemon/back_pics/whismur_back_pic.png b/graphics/pokemon/whismur/back.png similarity index 100% rename from graphics/pokemon/back_pics/whismur_back_pic.png rename to graphics/pokemon/whismur/back.png diff --git a/graphics/pokemon/footprints/whismur_footprint.png b/graphics/pokemon/whismur/footprint.png similarity index 100% rename from graphics/pokemon/footprints/whismur_footprint.png rename to graphics/pokemon/whismur/footprint.png diff --git a/graphics/pokemon/front_pics/whismur_still_front_pic.png b/graphics/pokemon/whismur/front.png similarity index 100% rename from graphics/pokemon/front_pics/whismur_still_front_pic.png rename to graphics/pokemon/whismur/front.png diff --git a/graphics/pokemon/icons/whismur_icon.png b/graphics/pokemon/whismur/icon.png similarity index 100% rename from graphics/pokemon/icons/whismur_icon.png rename to graphics/pokemon/whismur/icon.png diff --git a/graphics/pokemon/palettes/whismur_palette.pal b/graphics/pokemon/whismur/normal.pal similarity index 100% rename from graphics/pokemon/palettes/whismur_palette.pal rename to graphics/pokemon/whismur/normal.pal diff --git a/graphics/pokemon/palettes/whismur_shiny_palette.pal b/graphics/pokemon/whismur/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/whismur_shiny_palette.pal rename to graphics/pokemon/whismur/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/wigglytuff_front_pic.png b/graphics/pokemon/wigglytuff/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/wigglytuff_front_pic.png rename to graphics/pokemon/wigglytuff/anim_front.png diff --git a/graphics/pokemon/back_pics/wigglytuff_back_pic.png b/graphics/pokemon/wigglytuff/back.png similarity index 100% rename from graphics/pokemon/back_pics/wigglytuff_back_pic.png rename to graphics/pokemon/wigglytuff/back.png diff --git a/graphics/pokemon/footprints/wigglytuff_footprint.png b/graphics/pokemon/wigglytuff/footprint.png similarity index 100% rename from graphics/pokemon/footprints/wigglytuff_footprint.png rename to graphics/pokemon/wigglytuff/footprint.png diff --git a/graphics/pokemon/front_pics/wigglytuff_still_front_pic.png b/graphics/pokemon/wigglytuff/front.png similarity index 100% rename from graphics/pokemon/front_pics/wigglytuff_still_front_pic.png rename to graphics/pokemon/wigglytuff/front.png diff --git a/graphics/pokemon/icons/wigglytuff_icon.png b/graphics/pokemon/wigglytuff/icon.png similarity index 100% rename from graphics/pokemon/icons/wigglytuff_icon.png rename to graphics/pokemon/wigglytuff/icon.png diff --git a/graphics/pokemon/palettes/wigglytuff_palette.pal b/graphics/pokemon/wigglytuff/normal.pal similarity index 100% rename from graphics/pokemon/palettes/wigglytuff_palette.pal rename to graphics/pokemon/wigglytuff/normal.pal diff --git a/graphics/pokemon/palettes/wigglytuff_shiny_palette.pal b/graphics/pokemon/wigglytuff/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/wigglytuff_shiny_palette.pal rename to graphics/pokemon/wigglytuff/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/wingull_front_pic.png b/graphics/pokemon/wingull/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/wingull_front_pic.png rename to graphics/pokemon/wingull/anim_front.png diff --git a/graphics/pokemon/back_pics/wingull_back_pic.png b/graphics/pokemon/wingull/back.png similarity index 100% rename from graphics/pokemon/back_pics/wingull_back_pic.png rename to graphics/pokemon/wingull/back.png diff --git a/graphics/pokemon/footprints/wingull_footprint.png b/graphics/pokemon/wingull/footprint.png similarity index 100% rename from graphics/pokemon/footprints/wingull_footprint.png rename to graphics/pokemon/wingull/footprint.png diff --git a/graphics/pokemon/front_pics/wingull_still_front_pic.png b/graphics/pokemon/wingull/front.png similarity index 100% rename from graphics/pokemon/front_pics/wingull_still_front_pic.png rename to graphics/pokemon/wingull/front.png diff --git a/graphics/pokemon/icons/wingull_icon.png b/graphics/pokemon/wingull/icon.png similarity index 100% rename from graphics/pokemon/icons/wingull_icon.png rename to graphics/pokemon/wingull/icon.png diff --git a/graphics/pokemon/palettes/wingull_palette.pal b/graphics/pokemon/wingull/normal.pal similarity index 100% rename from graphics/pokemon/palettes/wingull_palette.pal rename to graphics/pokemon/wingull/normal.pal diff --git a/graphics/pokemon/palettes/wingull_shiny_palette.pal b/graphics/pokemon/wingull/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/wingull_shiny_palette.pal rename to graphics/pokemon/wingull/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/wobbuffet_front_pic.png b/graphics/pokemon/wobbuffet/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/wobbuffet_front_pic.png rename to graphics/pokemon/wobbuffet/anim_front.png diff --git a/graphics/pokemon/back_pics/wobbuffet_back_pic.png b/graphics/pokemon/wobbuffet/back.png similarity index 100% rename from graphics/pokemon/back_pics/wobbuffet_back_pic.png rename to graphics/pokemon/wobbuffet/back.png diff --git a/graphics/pokemon/footprints/wobbuffet_footprint.png b/graphics/pokemon/wobbuffet/footprint.png similarity index 100% rename from graphics/pokemon/footprints/wobbuffet_footprint.png rename to graphics/pokemon/wobbuffet/footprint.png diff --git a/graphics/pokemon/front_pics/wobbuffet_still_front_pic.png b/graphics/pokemon/wobbuffet/front.png similarity index 100% rename from graphics/pokemon/front_pics/wobbuffet_still_front_pic.png rename to graphics/pokemon/wobbuffet/front.png diff --git a/graphics/pokemon/icons/wobbuffet_icon.png b/graphics/pokemon/wobbuffet/icon.png similarity index 100% rename from graphics/pokemon/icons/wobbuffet_icon.png rename to graphics/pokemon/wobbuffet/icon.png diff --git a/graphics/pokemon/palettes/wobbuffet_palette.pal b/graphics/pokemon/wobbuffet/normal.pal similarity index 100% rename from graphics/pokemon/palettes/wobbuffet_palette.pal rename to graphics/pokemon/wobbuffet/normal.pal diff --git a/graphics/pokemon/palettes/wobbuffet_shiny_palette.pal b/graphics/pokemon/wobbuffet/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/wobbuffet_shiny_palette.pal rename to graphics/pokemon/wobbuffet/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/wooper_front_pic.png b/graphics/pokemon/wooper/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/wooper_front_pic.png rename to graphics/pokemon/wooper/anim_front.png diff --git a/graphics/pokemon/back_pics/wooper_back_pic.png b/graphics/pokemon/wooper/back.png similarity index 100% rename from graphics/pokemon/back_pics/wooper_back_pic.png rename to graphics/pokemon/wooper/back.png diff --git a/graphics/pokemon/footprints/wooper_footprint.png b/graphics/pokemon/wooper/footprint.png similarity index 100% rename from graphics/pokemon/footprints/wooper_footprint.png rename to graphics/pokemon/wooper/footprint.png diff --git a/graphics/pokemon/front_pics/wooper_still_front_pic.png b/graphics/pokemon/wooper/front.png similarity index 100% rename from graphics/pokemon/front_pics/wooper_still_front_pic.png rename to graphics/pokemon/wooper/front.png diff --git a/graphics/pokemon/icons/wooper_icon.png b/graphics/pokemon/wooper/icon.png similarity index 100% rename from graphics/pokemon/icons/wooper_icon.png rename to graphics/pokemon/wooper/icon.png diff --git a/graphics/pokemon/palettes/wooper_palette.pal b/graphics/pokemon/wooper/normal.pal similarity index 100% rename from graphics/pokemon/palettes/wooper_palette.pal rename to graphics/pokemon/wooper/normal.pal diff --git a/graphics/pokemon/palettes/wooper_shiny_palette.pal b/graphics/pokemon/wooper/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/wooper_shiny_palette.pal rename to graphics/pokemon/wooper/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/wurmple_front_pic.png b/graphics/pokemon/wurmple/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/wurmple_front_pic.png rename to graphics/pokemon/wurmple/anim_front.png diff --git a/graphics/pokemon/back_pics/wurmple_back_pic.png b/graphics/pokemon/wurmple/back.png similarity index 100% rename from graphics/pokemon/back_pics/wurmple_back_pic.png rename to graphics/pokemon/wurmple/back.png diff --git a/graphics/pokemon/footprints/wurmple_footprint.png b/graphics/pokemon/wurmple/footprint.png similarity index 100% rename from graphics/pokemon/footprints/wurmple_footprint.png rename to graphics/pokemon/wurmple/footprint.png diff --git a/graphics/pokemon/front_pics/wurmple_still_front_pic.png b/graphics/pokemon/wurmple/front.png similarity index 100% rename from graphics/pokemon/front_pics/wurmple_still_front_pic.png rename to graphics/pokemon/wurmple/front.png diff --git a/graphics/pokemon/icons/wurmple_icon.png b/graphics/pokemon/wurmple/icon.png similarity index 100% rename from graphics/pokemon/icons/wurmple_icon.png rename to graphics/pokemon/wurmple/icon.png diff --git a/graphics/pokemon/palettes/wurmple_palette.pal b/graphics/pokemon/wurmple/normal.pal similarity index 100% rename from graphics/pokemon/palettes/wurmple_palette.pal rename to graphics/pokemon/wurmple/normal.pal diff --git a/graphics/pokemon/palettes/wurmple_shiny_palette.pal b/graphics/pokemon/wurmple/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/wurmple_shiny_palette.pal rename to graphics/pokemon/wurmple/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/wynaut_front_pic.png b/graphics/pokemon/wynaut/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/wynaut_front_pic.png rename to graphics/pokemon/wynaut/anim_front.png diff --git a/graphics/pokemon/back_pics/wynaut_back_pic.png b/graphics/pokemon/wynaut/back.png similarity index 100% rename from graphics/pokemon/back_pics/wynaut_back_pic.png rename to graphics/pokemon/wynaut/back.png diff --git a/graphics/pokemon/footprints/wynaut_footprint.png b/graphics/pokemon/wynaut/footprint.png similarity index 100% rename from graphics/pokemon/footprints/wynaut_footprint.png rename to graphics/pokemon/wynaut/footprint.png diff --git a/graphics/pokemon/front_pics/wynaut_still_front_pic.png b/graphics/pokemon/wynaut/front.png similarity index 100% rename from graphics/pokemon/front_pics/wynaut_still_front_pic.png rename to graphics/pokemon/wynaut/front.png diff --git a/graphics/pokemon/icons/wynaut_icon.png b/graphics/pokemon/wynaut/icon.png similarity index 100% rename from graphics/pokemon/icons/wynaut_icon.png rename to graphics/pokemon/wynaut/icon.png diff --git a/graphics/pokemon/palettes/wynaut_palette.pal b/graphics/pokemon/wynaut/normal.pal similarity index 100% rename from graphics/pokemon/palettes/wynaut_palette.pal rename to graphics/pokemon/wynaut/normal.pal diff --git a/graphics/pokemon/palettes/wynaut_shiny_palette.pal b/graphics/pokemon/wynaut/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/wynaut_shiny_palette.pal rename to graphics/pokemon/wynaut/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/xatu_front_pic.png b/graphics/pokemon/xatu/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/xatu_front_pic.png rename to graphics/pokemon/xatu/anim_front.png diff --git a/graphics/pokemon/back_pics/xatu_back_pic.png b/graphics/pokemon/xatu/back.png similarity index 100% rename from graphics/pokemon/back_pics/xatu_back_pic.png rename to graphics/pokemon/xatu/back.png diff --git a/graphics/pokemon/footprints/xatu_footprint.png b/graphics/pokemon/xatu/footprint.png similarity index 100% rename from graphics/pokemon/footprints/xatu_footprint.png rename to graphics/pokemon/xatu/footprint.png diff --git a/graphics/pokemon/front_pics/xatu_still_front_pic.png b/graphics/pokemon/xatu/front.png similarity index 100% rename from graphics/pokemon/front_pics/xatu_still_front_pic.png rename to graphics/pokemon/xatu/front.png diff --git a/graphics/pokemon/icons/xatu_icon.png b/graphics/pokemon/xatu/icon.png similarity index 100% rename from graphics/pokemon/icons/xatu_icon.png rename to graphics/pokemon/xatu/icon.png diff --git a/graphics/pokemon/palettes/xatu_palette.pal b/graphics/pokemon/xatu/normal.pal similarity index 100% rename from graphics/pokemon/palettes/xatu_palette.pal rename to graphics/pokemon/xatu/normal.pal diff --git a/graphics/pokemon/palettes/xatu_shiny_palette.pal b/graphics/pokemon/xatu/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/xatu_shiny_palette.pal rename to graphics/pokemon/xatu/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/yanma_front_pic.png b/graphics/pokemon/yanma/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/yanma_front_pic.png rename to graphics/pokemon/yanma/anim_front.png diff --git a/graphics/pokemon/back_pics/yanma_back_pic.png b/graphics/pokemon/yanma/back.png similarity index 100% rename from graphics/pokemon/back_pics/yanma_back_pic.png rename to graphics/pokemon/yanma/back.png diff --git a/graphics/pokemon/footprints/yanma_footprint.png b/graphics/pokemon/yanma/footprint.png similarity index 100% rename from graphics/pokemon/footprints/yanma_footprint.png rename to graphics/pokemon/yanma/footprint.png diff --git a/graphics/pokemon/front_pics/yanma_still_front_pic.png b/graphics/pokemon/yanma/front.png similarity index 100% rename from graphics/pokemon/front_pics/yanma_still_front_pic.png rename to graphics/pokemon/yanma/front.png diff --git a/graphics/pokemon/icons/yanma_icon.png b/graphics/pokemon/yanma/icon.png similarity index 100% rename from graphics/pokemon/icons/yanma_icon.png rename to graphics/pokemon/yanma/icon.png diff --git a/graphics/pokemon/palettes/yanma_palette.pal b/graphics/pokemon/yanma/normal.pal similarity index 100% rename from graphics/pokemon/palettes/yanma_palette.pal rename to graphics/pokemon/yanma/normal.pal diff --git a/graphics/pokemon/palettes/yanma_shiny_palette.pal b/graphics/pokemon/yanma/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/yanma_shiny_palette.pal rename to graphics/pokemon/yanma/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/zangoose_front_pic.png b/graphics/pokemon/zangoose/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/zangoose_front_pic.png rename to graphics/pokemon/zangoose/anim_front.png diff --git a/graphics/pokemon/back_pics/zangoose_back_pic.png b/graphics/pokemon/zangoose/back.png similarity index 100% rename from graphics/pokemon/back_pics/zangoose_back_pic.png rename to graphics/pokemon/zangoose/back.png diff --git a/graphics/pokemon/footprints/zangoose_footprint.png b/graphics/pokemon/zangoose/footprint.png similarity index 100% rename from graphics/pokemon/footprints/zangoose_footprint.png rename to graphics/pokemon/zangoose/footprint.png diff --git a/graphics/pokemon/front_pics/zangoose_still_front_pic.png b/graphics/pokemon/zangoose/front.png similarity index 100% rename from graphics/pokemon/front_pics/zangoose_still_front_pic.png rename to graphics/pokemon/zangoose/front.png diff --git a/graphics/pokemon/icons/zangoose_icon.png b/graphics/pokemon/zangoose/icon.png similarity index 100% rename from graphics/pokemon/icons/zangoose_icon.png rename to graphics/pokemon/zangoose/icon.png diff --git a/graphics/pokemon/palettes/zangoose_palette.pal b/graphics/pokemon/zangoose/normal.pal similarity index 100% rename from graphics/pokemon/palettes/zangoose_palette.pal rename to graphics/pokemon/zangoose/normal.pal diff --git a/graphics/pokemon/palettes/zangoose_shiny_palette.pal b/graphics/pokemon/zangoose/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/zangoose_shiny_palette.pal rename to graphics/pokemon/zangoose/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/zapdos_front_pic.png b/graphics/pokemon/zapdos/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/zapdos_front_pic.png rename to graphics/pokemon/zapdos/anim_front.png diff --git a/graphics/pokemon/back_pics/zapdos_back_pic.png b/graphics/pokemon/zapdos/back.png similarity index 100% rename from graphics/pokemon/back_pics/zapdos_back_pic.png rename to graphics/pokemon/zapdos/back.png diff --git a/graphics/pokemon/footprints/zapdos_footprint.png b/graphics/pokemon/zapdos/footprint.png similarity index 100% rename from graphics/pokemon/footprints/zapdos_footprint.png rename to graphics/pokemon/zapdos/footprint.png diff --git a/graphics/pokemon/front_pics/zapdos_still_front_pic.png b/graphics/pokemon/zapdos/front.png similarity index 100% rename from graphics/pokemon/front_pics/zapdos_still_front_pic.png rename to graphics/pokemon/zapdos/front.png diff --git a/graphics/pokemon/icons/zapdos_icon.png b/graphics/pokemon/zapdos/icon.png similarity index 100% rename from graphics/pokemon/icons/zapdos_icon.png rename to graphics/pokemon/zapdos/icon.png diff --git a/graphics/pokemon/palettes/zapdos_palette.pal b/graphics/pokemon/zapdos/normal.pal similarity index 100% rename from graphics/pokemon/palettes/zapdos_palette.pal rename to graphics/pokemon/zapdos/normal.pal diff --git a/graphics/pokemon/palettes/zapdos_shiny_palette.pal b/graphics/pokemon/zapdos/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/zapdos_shiny_palette.pal rename to graphics/pokemon/zapdos/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/zigzagoon_front_pic.png b/graphics/pokemon/zigzagoon/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/zigzagoon_front_pic.png rename to graphics/pokemon/zigzagoon/anim_front.png diff --git a/graphics/pokemon/back_pics/zigzagoon_back_pic.png b/graphics/pokemon/zigzagoon/back.png similarity index 100% rename from graphics/pokemon/back_pics/zigzagoon_back_pic.png rename to graphics/pokemon/zigzagoon/back.png diff --git a/graphics/pokemon/footprints/zigzagoon_footprint.png b/graphics/pokemon/zigzagoon/footprint.png similarity index 100% rename from graphics/pokemon/footprints/zigzagoon_footprint.png rename to graphics/pokemon/zigzagoon/footprint.png diff --git a/graphics/pokemon/front_pics/zigzagoon_still_front_pic.png b/graphics/pokemon/zigzagoon/front.png similarity index 100% rename from graphics/pokemon/front_pics/zigzagoon_still_front_pic.png rename to graphics/pokemon/zigzagoon/front.png diff --git a/graphics/pokemon/icons/zigzagoon_icon.png b/graphics/pokemon/zigzagoon/icon.png similarity index 100% rename from graphics/pokemon/icons/zigzagoon_icon.png rename to graphics/pokemon/zigzagoon/icon.png diff --git a/graphics/pokemon/palettes/zigzagoon_palette.pal b/graphics/pokemon/zigzagoon/normal.pal similarity index 100% rename from graphics/pokemon/palettes/zigzagoon_palette.pal rename to graphics/pokemon/zigzagoon/normal.pal diff --git a/graphics/pokemon/palettes/zigzagoon_shiny_palette.pal b/graphics/pokemon/zigzagoon/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/zigzagoon_shiny_palette.pal rename to graphics/pokemon/zigzagoon/shiny.pal diff --git a/graphics/pokemon/anim_front_pics/zubat_front_pic.png b/graphics/pokemon/zubat/anim_front.png similarity index 100% rename from graphics/pokemon/anim_front_pics/zubat_front_pic.png rename to graphics/pokemon/zubat/anim_front.png diff --git a/graphics/pokemon/back_pics/zubat_back_pic.png b/graphics/pokemon/zubat/back.png similarity index 100% rename from graphics/pokemon/back_pics/zubat_back_pic.png rename to graphics/pokemon/zubat/back.png diff --git a/graphics/pokemon/footprints/zubat_footprint.png b/graphics/pokemon/zubat/footprint.png similarity index 100% rename from graphics/pokemon/footprints/zubat_footprint.png rename to graphics/pokemon/zubat/footprint.png diff --git a/graphics/pokemon/front_pics/zubat_still_front_pic.png b/graphics/pokemon/zubat/front.png similarity index 100% rename from graphics/pokemon/front_pics/zubat_still_front_pic.png rename to graphics/pokemon/zubat/front.png diff --git a/graphics/pokemon/icons/zubat_icon.png b/graphics/pokemon/zubat/icon.png similarity index 100% rename from graphics/pokemon/icons/zubat_icon.png rename to graphics/pokemon/zubat/icon.png diff --git a/graphics/pokemon/palettes/zubat_palette.pal b/graphics/pokemon/zubat/normal.pal similarity index 100% rename from graphics/pokemon/palettes/zubat_palette.pal rename to graphics/pokemon/zubat/normal.pal diff --git a/graphics/pokemon/palettes/zubat_shiny_palette.pal b/graphics/pokemon/zubat/shiny.pal similarity index 100% rename from graphics/pokemon/palettes/zubat_shiny_palette.pal rename to graphics/pokemon/zubat/shiny.pal diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 0a22a711c6..0516a8a4dc 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -1,7 +1,4 @@ -MONSTILLFRONTGFXDIR := graphics/pokemon/front_pics -MONBACKGFXDIR := graphics/pokemon/back_pics -MONFRONTGFXDIR := graphics/pokemon/anim_front_pics -MONPALDIR := graphics/pokemon/palettes +CASTFORMGFXDIR := graphics/pokemon/castform TILESETGFXDIR := data/tilesets FONTGFXDIR := data/graphics/fonts INTERFACEGFXDIR := graphics/interface @@ -24,36 +21,44 @@ MISCGFXDIR := graphics/misc types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough -$(MONSTILLFRONTGFXDIR)/castform_still_front_pic.4bpp: $(MONSTILLFRONTGFXDIR)/castform_normal_form_still_front_pic.4bpp \ - $(MONSTILLFRONTGFXDIR)/castform_sunny_form_still_front_pic.4bpp \ - $(MONSTILLFRONTGFXDIR)/castform_rainy_form_still_front_pic.4bpp \ - $(MONSTILLFRONTGFXDIR)/castform_snowy_form_still_front_pic.4bpp + + +### Castform ### + +$(CASTFORMGFXDIR)/front.4bpp: $(CASTFORMGFXDIR)/front_normal_form.4bpp \ + $(CASTFORMGFXDIR)/front_sunny_form.4bpp \ + $(CASTFORMGFXDIR)/front_rainy_form.4bpp \ + $(CASTFORMGFXDIR)/front_snowy_form.4bpp @cat $^ >$@ -$(MONBACKGFXDIR)/castform_back_pic.4bpp: $(MONBACKGFXDIR)/castform_normal_form_back_pic.4bpp \ - $(MONBACKGFXDIR)/castform_sunny_form_back_pic.4bpp \ - $(MONBACKGFXDIR)/castform_rainy_form_back_pic.4bpp \ - $(MONBACKGFXDIR)/castform_snowy_form_back_pic.4bpp +$(CASTFORMGFXDIR)/back.4bpp: $(CASTFORMGFXDIR)/back_normal_form.4bpp \ + $(CASTFORMGFXDIR)/back_sunny_form.4bpp \ + $(CASTFORMGFXDIR)/back_rainy_form.4bpp \ + $(CASTFORMGFXDIR)/back_snowy_form.4bpp @cat $^ >$@ -$(MONFRONTGFXDIR)/castform_front_pic.4bpp: $(MONFRONTGFXDIR)/castform_normal_form_front_pic.4bpp \ - $(MONFRONTGFXDIR)/castform_sunny_form_front_pic.4bpp \ - $(MONFRONTGFXDIR)/castform_rainy_form_front_pic.4bpp \ - $(MONFRONTGFXDIR)/castform_snowy_form_front_pic.4bpp +$(CASTFORMGFXDIR)/anim_front.4bpp: $(CASTFORMGFXDIR)/anim_front_normal_form.4bpp \ + $(CASTFORMGFXDIR)/anim_front_sunny_form.4bpp \ + $(CASTFORMGFXDIR)/anim_front_rainy_form.4bpp \ + $(CASTFORMGFXDIR)/anim_front_snowy_form.4bpp @cat $^ >$@ -$(MONPALDIR)/castform_palette.gbapal: $(MONPALDIR)/castform_normal_form_palette.gbapal \ - $(MONPALDIR)/castform_sunny_form_palette.gbapal \ - $(MONPALDIR)/castform_rainy_form_palette.gbapal \ - $(MONPALDIR)/castform_snowy_form_palette.gbapal +$(CASTFORMGFXDIR)/normal.gbapal: $(CASTFORMGFXDIR)/normal_normal_form.gbapal \ + $(CASTFORMGFXDIR)/normal_sunny_form.gbapal \ + $(CASTFORMGFXDIR)/normal_rainy_form.gbapal \ + $(CASTFORMGFXDIR)/normal_snowy_form.gbapal @cat $^ >$@ -$(MONPALDIR)/castform_shiny_palette.gbapal: $(MONPALDIR)/castform_normal_form_shiny_palette.gbapal \ - $(MONPALDIR)/castform_sunny_form_shiny_palette.gbapal \ - $(MONPALDIR)/castform_rainy_form_shiny_palette.gbapal \ - $(MONPALDIR)/castform_snowy_form_shiny_palette.gbapal +$(CASTFORMGFXDIR)/shiny.gbapal: $(CASTFORMGFXDIR)/shiny_normal_form.gbapal \ + $(CASTFORMGFXDIR)/shiny_sunny_form.gbapal \ + $(CASTFORMGFXDIR)/shiny_rainy_form.gbapal \ + $(CASTFORMGFXDIR)/shiny_snowy_form.gbapal @cat $^ >$@ + + +### Tilesets ### + $(TILESETGFXDIR)/secondary/petalburg/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 159 @@ -246,6 +251,10 @@ $(TILESETGFXDIR)/secondary/battle_frontier_ranking_hall/tiles.4bpp: %.4bpp: %.pn $(TILESETGFXDIR)/secondary/mystery_events_house/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 509 + + +### Fonts ### + $(FONTGFXDIR)/font0.latfont: $(FONTGFXDIR)/font0_latin.png $(GFX) $< $@ @@ -297,6 +306,9 @@ $(FONTGFXDIR)/unused_frlg_down_arrow.4bpp: %.4bpp: %.png $(FONTGFXDIR)/keypad_icons.4bpp: %.4bpp: %.png $(GFX) $< $@ + + +### Miscellaneous ### graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal $(GFX) $< $@ -num_colors 224 @@ -310,13 +322,13 @@ $(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 29 $(BATINTGFXDIR)/textbox.gbapal: $(BATINTGFXDIR)/textbox_0.gbapal \ - $(BATINTGFXDIR)/textbox_1.gbapal + $(BATINTGFXDIR)/textbox_1.gbapal @cat $^ >$@ $(BTLANMSPRGFXDIR)/010.4bpp: $(BTLANMSPRGFXDIR)/010_0.4bpp \ - $(BTLANMSPRGFXDIR)/010_1.4bpp \ - $(BTLANMSPRGFXDIR)/010_2.4bpp \ - $(BTLANMSPRGFXDIR)/010_3.4bpp + $(BTLANMSPRGFXDIR)/010_1.4bpp \ + $(BTLANMSPRGFXDIR)/010_2.4bpp \ + $(BTLANMSPRGFXDIR)/010_3.4bpp @cat $^ >$@ $(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/old_pal1.gbapal \ @@ -340,8 +352,8 @@ $(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp \ @cat $^ >$@ $(INTERFACEGFXDIR)/hp_numbers.4bpp: $(INTERFACEGFXDIR)/hpbar_anim.4bpp \ - $(INTERFACEGFXDIR)/numbers1.4bpp \ - $(INTERFACEGFXDIR)/numbers2.4bpp + $(INTERFACEGFXDIR)/numbers1.4bpp \ + $(INTERFACEGFXDIR)/numbers2.4bpp @cat $^ >$@ $(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \ @@ -472,6 +484,10 @@ $(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu. $(UNUSEDGFXDIR)/intro_birch_beauty.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 822 + + +### PSS ### + $(PSSGFXDIR)/forest_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 55 @@ -636,7 +652,11 @@ $(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png $(BATTRANSGFXDIR)/frontier_transition.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 43 - + + + +### Pokenav ### + $(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \ $(PKNAVOPTIONSGFXDIR)/condition.4bpp \ $(PKNAVOPTIONSGFXDIR)/match_call.4bpp \ diff --git a/src/anim_mon_front_pics.c b/src/anim_mon_front_pics.c index f2480ea20f..b566b77604 100644 --- a/src/anim_mon_front_pics.c +++ b/src/anim_mon_front_pics.c @@ -235,7 +235,7 @@ const u32 gMonFrontPic_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/anim_f const u32 gMonFrontPic_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/anim_front.4bpp.lz"); const u32 gMonFrontPic_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/anim_front.4bpp.lz"); const u32 gMonFrontPic_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/anim_front_pics/porygon2_front_pic.4bpp.lz"); +const u32 gMonFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/anim_front.4bpp.lz"); const u32 gMonFrontPic_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/anim_front.4bpp.lz"); const u32 gMonFrontPic_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/anim_front.4bpp.lz"); const u32 gMonFrontPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/anim_front.4bpp.lz"); diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 67d1fbd3f0..07415949d9 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -1621,12 +1621,12 @@ const u32 gMonShinyPalette_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/shin const u8 gMonIcon_Donphan[] = INCBIN_U8("graphics/pokemon/donphan/icon.4bpp"); const u8 gMonFootprint_Donphan[] = INCBIN_U8("graphics/pokemon/donphan/footprint.1bpp"); -const u32 gMonStillFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/front_pics/porygon2_still_front_pic.4bpp.lz"); -const u32 gMonPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/palettes/porygon2_palette.gbapal.lz"); -const u32 gMonBackPic_Porygon2[] = INCBIN_U32("graphics/pokemon/back_pics/porygon2_back_pic.4bpp.lz"); -const u32 gMonShinyPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/palettes/porygon2_shiny_palette.gbapal.lz"); -const u8 gMonIcon_Porygon2[] = INCBIN_U8("graphics/pokemon/icons/porygon2_icon.4bpp"); -const u8 gMonFootprint_Porygon2[] = INCBIN_U8("graphics/pokemon/footprints/porygon2_footprint.1bpp"); +const u32 gMonStillFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/front.4bpp.lz"); +const u32 gMonPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/normal.gbapal.lz"); +const u32 gMonBackPic_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/back.4bpp.lz"); +const u32 gMonShinyPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/shiny.gbapal.lz"); +const u8 gMonIcon_Porygon2[] = INCBIN_U8("graphics/pokemon/porygon2/icon.4bpp"); +const u8 gMonFootprint_Porygon2[] = INCBIN_U8("graphics/pokemon/porygon2/footprint.1bpp"); const u32 gMonStillFrontPic_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/front.4bpp.lz"); const u32 gMonPalette_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/normal.gbapal.lz"); @@ -2695,7 +2695,7 @@ const u32 gMonPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/normal.gbap const u32 gMonBackPic_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/back.4bpp.lz"); const u32 gMonShinyPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/shiny.gbapal.lz"); const u8 gMonIcon_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/icon.4bpp"); -const u8 gMonIcon_DeoxysSpeed[] = INCBIN_U8("graphics/pokemon/deoxys_speed/icon.4bpp"); +const u8 gMonIcon_DeoxysSpeed[] = INCBIN_U8("graphics/pokemon/deoxys/icon_speed.4bpp"); const u8 gMonIcon_DeoxysSpeedWide[] = INCBIN_U8("graphics/unused/deoxys_speed_icon_wide.4bpp"); asm(".space 0x6800"); diff --git a/src/egg_hatch.c b/src/egg_hatch.c index a9b6001ec7..68728f818d 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -75,7 +75,7 @@ static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8 static IWRAM_DATA struct EggHatchData *sEggHatchData; // rom data -static const u16 sEggPalette[] = INCBIN_U16("graphics/pokemon/palettes/egg_palette.gbapal"); +static const u16 sEggPalette[] = INCBIN_U16("graphics/pokemon/egg/normal.gbapal"); static const u8 sEggHatchTiles[] = INCBIN_U8("graphics/misc/egg_hatch.4bpp"); static const u8 sEggShardTiles[] = INCBIN_U8("graphics/misc/egg_shard.4bpp"); diff --git a/src/graphics.c b/src/graphics.c index a3b9eb9131..c243c64a54 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -4,10 +4,10 @@ const u32 gBattleTextboxTiles[] = INCBIN_U32("graphics/battle_interface/textbox. const u32 gBattleTextboxPalette[] = INCBIN_U32("graphics/battle_interface/textbox.gbapal.lz"); const u32 gBattleTextboxTilemap[] = INCBIN_U32("graphics/battle_interface/textbox_map.bin.lz"); -const u32 gMonStillFrontPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/front_pics/circled_question_mark_still_front_pic.4bpp.lz"); -const u32 gMonBackPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/back_pics/circled_question_mark_back_pic.4bpp.lz"); -const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/palettes/circled_question_mark_palette.gbapal.lz"); -const u32 gMonShinyPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/palettes/circled_question_mark_shiny_palette.gbapal.lz"); +const u32 gMonStillFrontPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/front.4bpp.lz"); +const u32 gMonBackPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/back.4bpp.lz"); +const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/normal.gbapal.lz"); +const u32 gMonShinyPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/shiny.gbapal.lz"); const u32 gUnusedGfx_OldCharmap[] = INCBIN_U32("graphics/unused/old_charmap.4bpp.lz"); // japanese table and bunch of stuff const u32 gUnusedTimemap_OldCharmap[] = INCBIN_U32("graphics/unused/old_charmap.bin.lz"); @@ -953,8 +953,8 @@ const u32 gUnknownPal_C2F9E0[] = INCBIN_U32("graphics/unknown/unknown_C2F9E0.gba #include "data/graphics/pokemon.h" #include "data/graphics/trainers.h" -const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/icons/question_mark_icon.4bpp"); -const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/footprints/question_mark_footprint.1bpp"); +const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp"); +const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp"); const u32 gUnknown_08D778F0[] = INCBIN_U32("graphics/battle_transitions/vs_frame.4bpp.lz"); const u32 gUnknown_08D779D8[] = INCBIN_U32("graphics/battle_transitions/vs_frame.bin.lz"); @@ -1064,7 +1064,7 @@ const u32 gEnemyMonShadow_Gfx[] = INCBIN_U32("graphics/battle_interface/enemy_mo const u32 gBattleInterface_BallStatusBarGfx[] = INCBIN_U32("graphics/battle_interface/ball_status_bar.4bpp.lz"); -const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/icons/egg_icon.4bpp"); +const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp"); const u32 gBattleAnimBackgroundImage_02[] = INCBIN_U32("graphics/battle_anims/backgrounds/02.4bpp.lz"); const u32 gBattleAnimBackgroundPalette_02[] = INCBIN_U32("graphics/battle_anims/backgrounds/02.gbapal.lz"); From 61344a4fee6500cd61a0bc2c2d3346db361134c4 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Mar 2019 22:56:53 -0400 Subject: [PATCH 203/217] Document the water droplet data. --- include/title_screen.h | 2 +- src/intro.c | 12 ++++++------ src/title_screen.c | 19 +++++++++++++++++-- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/include/title_screen.h b/include/title_screen.h index ad0809ed24..b7100f124b 100644 --- a/include/title_screen.h +++ b/include/title_screen.h @@ -1,7 +1,7 @@ #ifndef GUARD_TITLE_SCREEN_H #define GUARD_TITLE_SCREEN_H -extern const u16 gIntroWaterDropData[]; +extern const u16 gIntroWaterDropAlphaBlend[]; void CB2_InitTitleScreen(void); diff --git a/src/intro.c b/src/intro.c index 23457f3707..84127cf64c 100644 --- a/src/intro.c +++ b/src/intro.c @@ -2427,7 +2427,7 @@ static void Task_IntroWaterDrops_1(u8 taskId) | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD); - SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[31]); + SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[31]); SetGpuReg(REG_OFFSET_BLDY, 0); gTasks[taskId].data[1] = 0x40; gTasks[taskId].data[0]++; @@ -2439,11 +2439,11 @@ static void Task_IntroWaterDrops_1(u8 taskId) gTasks[taskId].data[1]--; tmp = gTasks[taskId].data[1] / 2; - SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[tmp]); + SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[tmp]); } else { - SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[0]); + SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[0]); gTasks[taskId].data[1] = 0x10; gTasks[taskId].data[0]++; } @@ -2470,7 +2470,7 @@ static void Task_IntroWaterDrops_2(u8 taskId) | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD); - SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[0]); + SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[0]); SetGpuReg(REG_OFFSET_BLDY, 0); gTasks[taskId].data[1] = 0; gTasks[taskId].data[0]++; @@ -2482,11 +2482,11 @@ static void Task_IntroWaterDrops_2(u8 taskId) gTasks[taskId].data[1]++; tmp = gTasks[taskId].data[1] / 2; - SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[tmp]); + SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[tmp]); } else { - SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[31]); + SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[31]); gTasks[taskId].data[1] = 0x10; gTasks[taskId].data[0]++; } diff --git a/src/title_screen.c b/src/title_screen.c index ca34f90f85..23b0772bda 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -64,7 +64,22 @@ static const u32 sTitleScreenRayquazaTilemap[] = INCBIN_U32("graphics/title_scre static const u32 sTitleScreenLogoShineGfx[] = INCBIN_U32("graphics/title_screen/logo_shine.4bpp.lz"); static const u32 sTitleScreenCloudsGfx[] = INCBIN_U32("graphics/title_screen/clouds.4bpp.lz"); -const u16 gIntroWaterDropData[] = +// This is BLDALPHA data. It's equivalent to: +// +// BLDALPHA_BLEND(0, 16) +// BLDALPHA_BLEND(1, 16) +// ... +// BLDALPHA_BLEND(14, 16) +// BLDALPHA_BLEND(15, 16) +// BLDALPHA_BLEND(16, 15) +// BLDALPHA_BLEND(16, 14) +// ... +// BLDALPHA_BLEND(16, 1) +// BLDALPHA_BLEND(16, 0) +// BLDALPHA_BLEND(16, 0) +// BLDALPHA_BLEND(16, 0) +// ... (repeated until array has 32 entries) +const u16 gIntroWaterDropAlphaBlend[] = { 0x0010, 0x0110, 0x0210, 0x0310, 0x0410, 0x0510, 0x0610, 0x0710, 0x0810, 0x0910, 0x0a10, 0x0b10, 0x0c10, 0x0d10, 0x0e10, 0x0f10, @@ -324,7 +339,7 @@ static void SpriteCB_VersionBannerLeft(struct Sprite *sprite) sprite->pos1.y++; if (sprite->data[0] != 0) sprite->data[0]--; - SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[sprite->data[0]]); + SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[sprite->data[0]]); } } From 703554c4df08d8650dc9bb8bae72eb022783a617 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 13 Mar 2019 01:26:55 -0400 Subject: [PATCH 204/217] Ranges are magic --- src/title_screen.c | 56 +++++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/src/title_screen.c b/src/title_screen.c index 23b0772bda..80d5464faf 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -64,31 +64,41 @@ static const u32 sTitleScreenRayquazaTilemap[] = INCBIN_U32("graphics/title_scre static const u32 sTitleScreenLogoShineGfx[] = INCBIN_U32("graphics/title_screen/logo_shine.4bpp.lz"); static const u32 sTitleScreenCloudsGfx[] = INCBIN_U32("graphics/title_screen/clouds.4bpp.lz"); -// This is BLDALPHA data. It's equivalent to: -// -// BLDALPHA_BLEND(0, 16) -// BLDALPHA_BLEND(1, 16) -// ... -// BLDALPHA_BLEND(14, 16) -// BLDALPHA_BLEND(15, 16) -// BLDALPHA_BLEND(16, 15) -// BLDALPHA_BLEND(16, 14) -// ... -// BLDALPHA_BLEND(16, 1) -// BLDALPHA_BLEND(16, 0) -// BLDALPHA_BLEND(16, 0) -// BLDALPHA_BLEND(16, 0) -// ... (repeated until array has 32 entries) const u16 gIntroWaterDropAlphaBlend[] = { - 0x0010, 0x0110, 0x0210, 0x0310, 0x0410, 0x0510, 0x0610, 0x0710, - 0x0810, 0x0910, 0x0a10, 0x0b10, 0x0c10, 0x0d10, 0x0e10, 0x0f10, - 0x100f, 0x100e, 0x100d, 0x100c, 0x100b, 0x100a, 0x1009, 0x1008, - 0x1007, 0x1006, 0x1005, 0x1004, 0x1003, 0x1002, 0x1001, 0x1000, - 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, - 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, - 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, - 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, + BLDALPHA_BLEND(16, 0), + BLDALPHA_BLEND(16, 1), + BLDALPHA_BLEND(16, 2), + BLDALPHA_BLEND(16, 3), + BLDALPHA_BLEND(16, 4), + BLDALPHA_BLEND(16, 5), + BLDALPHA_BLEND(16, 6), + BLDALPHA_BLEND(16, 7), + BLDALPHA_BLEND(16, 8), + BLDALPHA_BLEND(16, 9), + BLDALPHA_BLEND(16, 10), + BLDALPHA_BLEND(16, 11), + BLDALPHA_BLEND(16, 12), + BLDALPHA_BLEND(16, 13), + BLDALPHA_BLEND(16, 14), + BLDALPHA_BLEND(16, 15), + BLDALPHA_BLEND(15, 16), + BLDALPHA_BLEND(14, 16), + BLDALPHA_BLEND(13, 16), + BLDALPHA_BLEND(12, 16), + BLDALPHA_BLEND(11, 16), + BLDALPHA_BLEND(10, 16), + BLDALPHA_BLEND(9, 16), + BLDALPHA_BLEND(8, 16), + BLDALPHA_BLEND(7, 16), + BLDALPHA_BLEND(6, 16), + BLDALPHA_BLEND(5, 16), + BLDALPHA_BLEND(4, 16), + BLDALPHA_BLEND(3, 16), + BLDALPHA_BLEND(2, 16), + BLDALPHA_BLEND(1, 16), + BLDALPHA_BLEND(0, 16), + [32 ... 63] = BLDALPHA_BLEND(0, 16) }; static const struct OamData sVersionBannerLeftOamData = From 61fa4cf2bae6616ac0b6bce42f9e9de9191540d2 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 13 Mar 2019 01:10:27 -0400 Subject: [PATCH 205/217] Make a powershell version of asmdiff.sh This version can be used with VSCode's built-in diff, and has better error detection for new contributors. --- asmdiff.ps1 | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 asmdiff.ps1 diff --git a/asmdiff.ps1 b/asmdiff.ps1 new file mode 100644 index 0000000000..169f14776b --- /dev/null +++ b/asmdiff.ps1 @@ -0,0 +1,114 @@ +Param +( + [Parameter(Position = 0)] + [string]$Start, + + [Parameter(Position = 1)] + [string]$Offset, + + [Parameter()] + [string[]]$DiffTool +) + +$ErrorActionPreference = "Stop" + +$offset_default_value = "0x100" +$diff_tool_default_value = "diff" + +$help = " +$($args[0]) [OPTIONS] Start [Offset] + +Performs a diff on the assembly of a function in a rom. 'Start' is the start +location of the function, and 'Offset' is the number of bytes to disassemble. +The assembly is saved to *.dump files. + +'Offset' is optional, and defaults to $offset_default_value. If this value is +very large (0x10000+), objdump may hang / freeze. + +Requirements: + - A clean copy of the rom named 'baserom.gba'. + - $$ENV:DEVKITARM to point to the installation of devkitpro. By default, it is + installed to 'C:\devkitpro\devkitARM'. + +Options: + -DiffTool The tool to use for diffing. Defaults to '$diff_tool_default_value'. For VSCode, + you can use -DiffTool 'code --diff'. (Quotes are necessary around 'code --diff') +" + +if ((-not (Test-Path variable:Start)) -or [string]::IsNullOrWhiteSpace($Start)) +{ + Write-Host $help + exit +} + +if (-not (Test-Path variable:DiffTool) -or [string]::IsNullOrWhiteSpace($DiffTool)) +{ + $DiffTool = $diff_tool_default_value +} + +if (-not (Test-Path variable:Offset) -or [string]::IsNullOrWhiteSpace($Offset)) +{ + $Offset = $offset_default_value +} + +if (-Not (Test-Path env:DEVKITARM)) +{ + Write-Host "ENV:DEVKITARM variable not set." + Write-Host $help + exit +} + +if (-Not (Test-Path $env:DEVKITARM)) +{ + Write-Host "DEVKITARM path '$env:DEVKITARM' does not exist." + Write-Host $help + exit +} + +if (-Not (Test-Path ".\pokeemerald.gba")) +{ + Write-Host "File 'pokeemerald.gba' not found." + Write-Host $help + exit +} + +if (-Not (Test-Path ".\baserom.gba")) +{ + Write-Host "File 'baserom.gba' not found." +} + +try +{ + $start_num = [System.Convert]::ToUInt64($Start, 16) +} +catch +{ + Write-Host "Error parsing '$start_num' as a hex number." + Write-Host $help + exit +} + +try +{ + $offset_num = [System.Convert]::ToUInt64($Offset, 16) +} +catch +{ + Write-Host "Error parsing '$offset_num' as a hex number." + Write-Host $help + exit +} + +if ($start_num -gt 0x1000000) +{ + Write-Host "Warning: Start address is larger than the ROM file. Hint: ignore the leading number in the address." +} + +$end_str = [System.Convert]::ToString($start_num + $offset_num, 16) +$end_str = "0x$end_str" + +Write-Host "$Start - $end_str" +$objdump = Join-Path -Path $env:DEVKITARM -ChildPath "arm-none-eabi\bin\objdump.exe" +&$objdump -D -bbinary -marmv4t -Mforce-thumb --start-address="$Start" --stop-address="$end_str" .\baserom.gba > .\baserom.dump +&$objdump -D -bbinary -marmv4t -Mforce-thumb --start-address="$Start" --stop-address="$end_str" .\pokeemerald.gba > .\pokeemerald.dump +Invoke-Expression "$DiffTool .\baserom.dump .\pokeemerald.dump" From b67c0698c2533aabdae1ae9679fffbee16e45fac Mon Sep 17 00:00:00 2001 From: aueuaio Date: Thu, 14 Mar 2019 14:17:43 +0100 Subject: [PATCH 206/217] add troubleshooting line in INSTALL.md While following the instructions for macos (i have sierra) in INSTALL.md, agbcc/build.sh failed, complaining it couldn't find the /opt/devkitpro/devkitARM/base_tools file. After a bit of research, i found out this file is in the devkitarm-rules package (in the devkitpro repos for pacman). Since installing this package fixes the problem, i added some troubleshooting instructions for it in INSTALL.md. --- INSTALL.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/INSTALL.md b/INSTALL.md index 041f6b8e99..fcdd8b655e 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -66,6 +66,14 @@ cd ../pokeemerald And build the ROM with `make`. +If the step `./build.sh` in the above list of commands fails with the error `Makefile:1: /opt/devkitpro/devkitARM/base_tools: No such file or directory`, then try installing the pacman package `devkitarm-rules` by executing the command + +``` +sudo dkp-pacman -S devkitarm-rules +``` + +Executing `./build.sh` again should now succeed. + # Faster builds After the first build, subsequent builds are faster. You can further speed up the build: From 092608aef6495fdd9b9d2d8cae00e1bd940f9b27 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 10 Mar 2019 01:12:41 -0500 Subject: [PATCH 207/217] Add a constant for "no music" on maps. --- data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json | 2 +- data/maps/BattleFrontier_BattlePyramidTop/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_B1F/map.json | 2 +- data/maps/InsideOfTruck/map.json | 2 +- include/constants/songs.h | 2 ++ 23 files changed, 24 insertions(+), 22 deletions(-) diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json index 14a2e7d237..3f4739b26b 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", "name": "BattleFrontier_BattlePyramidEmptySquare", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.json b/data/maps/BattleFrontier_BattlePyramidTop/map.json index fcb4594267..d73dc16923 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/map.json +++ b/data/maps/BattleFrontier_BattlePyramidTop/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP", "name": "BattleFrontier_BattlePyramidTop", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare01/map.json b/data/maps/BattlePyramidSquare01/map.json index 2b0d26de03..d4cbfd71d9 100644 --- a/data/maps/BattlePyramidSquare01/map.json +++ b/data/maps/BattlePyramidSquare01/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE01", "name": "BattlePyramidSquare01", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE01", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare02/map.json b/data/maps/BattlePyramidSquare02/map.json index 32b0ad7ec3..e68b71284f 100644 --- a/data/maps/BattlePyramidSquare02/map.json +++ b/data/maps/BattlePyramidSquare02/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE02", "name": "BattlePyramidSquare02", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE02", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare03/map.json b/data/maps/BattlePyramidSquare03/map.json index bbec7daa4d..8a495158e7 100644 --- a/data/maps/BattlePyramidSquare03/map.json +++ b/data/maps/BattlePyramidSquare03/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE03", "name": "BattlePyramidSquare03", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE03", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare04/map.json b/data/maps/BattlePyramidSquare04/map.json index 8f63efd06f..e413a7e5fc 100644 --- a/data/maps/BattlePyramidSquare04/map.json +++ b/data/maps/BattlePyramidSquare04/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE04", "name": "BattlePyramidSquare04", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE04", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare05/map.json b/data/maps/BattlePyramidSquare05/map.json index 7e26a9ee36..d16a87646e 100644 --- a/data/maps/BattlePyramidSquare05/map.json +++ b/data/maps/BattlePyramidSquare05/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE05", "name": "BattlePyramidSquare05", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE05", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare06/map.json b/data/maps/BattlePyramidSquare06/map.json index 289a1e5c2e..ddf011814a 100644 --- a/data/maps/BattlePyramidSquare06/map.json +++ b/data/maps/BattlePyramidSquare06/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE06", "name": "BattlePyramidSquare06", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE06", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare07/map.json b/data/maps/BattlePyramidSquare07/map.json index 7452345476..8719c6d25c 100644 --- a/data/maps/BattlePyramidSquare07/map.json +++ b/data/maps/BattlePyramidSquare07/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE07", "name": "BattlePyramidSquare07", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE07", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare08/map.json b/data/maps/BattlePyramidSquare08/map.json index cac7ed96e2..54cfa4fe80 100644 --- a/data/maps/BattlePyramidSquare08/map.json +++ b/data/maps/BattlePyramidSquare08/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE08", "name": "BattlePyramidSquare08", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE08", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare09/map.json b/data/maps/BattlePyramidSquare09/map.json index b5a1113346..67b9ceb1fe 100644 --- a/data/maps/BattlePyramidSquare09/map.json +++ b/data/maps/BattlePyramidSquare09/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE09", "name": "BattlePyramidSquare09", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE09", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare10/map.json b/data/maps/BattlePyramidSquare10/map.json index 5171d112e4..0a5e88bf7f 100644 --- a/data/maps/BattlePyramidSquare10/map.json +++ b/data/maps/BattlePyramidSquare10/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE10", "name": "BattlePyramidSquare10", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE10", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare11/map.json b/data/maps/BattlePyramidSquare11/map.json index 58ac0476f3..5dc7736a3a 100644 --- a/data/maps/BattlePyramidSquare11/map.json +++ b/data/maps/BattlePyramidSquare11/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE11", "name": "BattlePyramidSquare11", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE11", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare12/map.json b/data/maps/BattlePyramidSquare12/map.json index 648c3e3a65..dcb57812d9 100644 --- a/data/maps/BattlePyramidSquare12/map.json +++ b/data/maps/BattlePyramidSquare12/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE12", "name": "BattlePyramidSquare12", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE12", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare13/map.json b/data/maps/BattlePyramidSquare13/map.json index c9342b3b9e..d277c5b1bc 100644 --- a/data/maps/BattlePyramidSquare13/map.json +++ b/data/maps/BattlePyramidSquare13/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE13", "name": "BattlePyramidSquare13", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE13", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare14/map.json b/data/maps/BattlePyramidSquare14/map.json index 6f94619676..5727356edb 100644 --- a/data/maps/BattlePyramidSquare14/map.json +++ b/data/maps/BattlePyramidSquare14/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE14", "name": "BattlePyramidSquare14", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE14", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare15/map.json b/data/maps/BattlePyramidSquare15/map.json index 3aa2571f66..62c7e34f33 100644 --- a/data/maps/BattlePyramidSquare15/map.json +++ b/data/maps/BattlePyramidSquare15/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE15", "name": "BattlePyramidSquare15", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE15", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare16/map.json b/data/maps/BattlePyramidSquare16/map.json index 70b677c34f..a69a0ed5a3 100644 --- a/data/maps/BattlePyramidSquare16/map.json +++ b/data/maps/BattlePyramidSquare16/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE16", "name": "BattlePyramidSquare16", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE16", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index c87f39fb8c..c3e5ddddf6 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_BIRTH_ISLAND_EXTERIOR", "name": "BirthIsland_Exterior", "layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_BIRTH_ISLAND_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index b212247bb1..48937d4824 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_BIRTH_ISLAND_HARBOR", "name": "BirthIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_BIRTH_ISLAND_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json index 2a764c677d..ac3baeaf87 100644 --- a/data/maps/CaveOfOrigin_B1F/map.json +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_B1F", "name": "CaveOfOrigin_B1F", "layout": "LAYOUT_CAVE_OF_ORIGIN_B1F", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index eefeed3654..ff76eb7748 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -2,7 +2,7 @@ "id": "MAP_INSIDE_OF_TRUCK", "name": "InsideOfTruck", "layout": "LAYOUT_INSIDE_OF_TRUCK", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_INSIDE_OF_TRUCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/include/constants/songs.h b/include/constants/songs.h index a459edd241..14b766965d 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -538,4 +538,6 @@ #define MUS_ROUTE_118 0x7FFF // map is split into 2 music sections. controlled by GetCurrLocationDefaultMusic(). +#define MUS_NONE 0xFFFF + #endif // GUARD_CONSTANTS_SONGS_H From 291df27dcbc9b1d1ea4bdf2f7363d58409fbd81d Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Mar 2019 02:21:00 -0400 Subject: [PATCH 208/217] Use new MUS_NONE constant in sound.c --- src/sound.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sound.c b/src/sound.c index ebb4fad75d..16f024858f 100644 --- a/src/sound.c +++ b/src/sound.c @@ -264,7 +264,7 @@ void FadeInNewBGM(u16 songNum, u8 speed) { if (gDisableMusic) songNum = 0; - if (songNum == 0xFFFF) + if (songNum == MUS_NONE) songNum = 0; m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlayInfo_BGM); @@ -561,7 +561,7 @@ void PlayBGM(u16 songNum) { if (gDisableMusic) songNum = 0; - if (songNum == 0xFFFF) + if (songNum == MUS_NONE) songNum = 0; m4aSongNumStart(songNum); } From 9848f84b9ec2d5950cb5dc4600b7651486ff986a Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 11 Mar 2019 03:12:15 -0400 Subject: [PATCH 209/217] Use constants for Oam .shape and .size fields Also some general formatting fixes for constants. --- include/gba/types.h | 23 ++ src/battle_anim.c | 288 ++++++++++++------------ src/battle_arena.c | 4 +- src/battle_bg.c | 8 +- src/battle_dome.c | 16 +- src/battle_factory_screen.c | 16 +- src/battle_interface.c | 16 +- src/battle_main.c | 8 +- src/battle_pyramid_bag.c | 4 +- src/battle_script_commands.c | 4 +- src/battle_transition.c | 4 +- src/berry_blender.c | 20 +- src/cable_car.c | 9 +- src/contest_painting.c | 4 +- src/credits.c | 4 +- src/data/field_event_obj/base_oam.h | 32 +-- src/decoration.c | 4 +- src/easy_chat.c | 24 +- src/egg_hatch.c | 8 +- src/evolution_graphics.c | 4 +- src/field_effect.c | 144 ++++++++---- src/field_weather_effect.c | 28 +-- src/fldeff_cut.c | 4 +- src/fldeff_misc.c | 8 +- src/hall_of_fame.c | 4 +- src/intro.c | 48 ++-- src/intro_credits_graphics.c | 159 ++++++++----- src/item_icon.c | 4 +- src/item_menu_icons.c | 20 +- src/link_rfu.c | 3 +- src/list_menu.c | 40 ++-- src/menu_helpers.c | 4 +- src/mirage_tower.c | 12 +- src/mon_markings.c | 12 +- src/money.c | 4 +- src/naming_screen.c | 12 +- src/party_menu.c | 16 +- src/pokeball.c | 4 +- src/pokeblock.c | 4 +- src/pokeblock_feed.c | 4 +- src/pokedex.c | 24 +- src/pokedex_area_screen.c | 46 ++-- src/pokedex_cry_screen.c | 27 ++- src/pokemon.c | 4 +- src/pokemon_icon.c | 4 +- src/pokemon_storage_system.c | 35 +-- src/pokemon_summary_screen.c | 12 +- src/rayquaza_scene.c | 32 +-- src/region_map.c | 213 +++++++++++++----- src/reset_rtc_screen.c | 4 +- src/rotating_gate.c | 8 +- src/roulette.c | 290 +++++++++++++++--------- src/save_failed_screen.c | 26 +-- src/sprite.c | 30 +-- src/starter_choose.c | 40 ++-- src/title_screen.c | 49 ++-- src/trade.c | 336 +++++++++++++++++----------- src/trainer_pokemon_sprites.c | 9 +- src/trainer_see.c | 19 +- src/unk_transition.c | 13 +- src/wallclock.c | 80 +++++-- 61 files changed, 1422 insertions(+), 913 deletions(-) diff --git a/include/gba/types.h b/include/gba/types.h index 3d78b5b5ee..cb370c7854 100644 --- a/include/gba/types.h +++ b/include/gba/types.h @@ -87,6 +87,29 @@ struct OamData #define ST_OAM_H_RECTANGLE 1 #define ST_OAM_V_RECTANGLE 2 +#define ST_OAM_SIZE_0 0 +#define ST_OAM_SIZE_1 1 +#define ST_OAM_SIZE_2 2 +#define ST_OAM_SIZE_3 3 + +#define SPRITE_SIZE_8x8 ((ST_OAM_SIZE_0 << 2) | (ST_OAM_SQUARE)) +#define SPRITE_SIZE_16x16 ((ST_OAM_SIZE_1 << 2) | (ST_OAM_SQUARE)) +#define SPRITE_SIZE_32x32 ((ST_OAM_SIZE_2 << 2) | (ST_OAM_SQUARE)) +#define SPRITE_SIZE_64x64 ((ST_OAM_SIZE_3 << 2) | (ST_OAM_SQUARE)) + +#define SPRITE_SIZE_16x8 ((ST_OAM_SIZE_0 << 2) | (ST_OAM_H_RECTANGLE)) +#define SPRITE_SIZE_32x8 ((ST_OAM_SIZE_1 << 2) | (ST_OAM_H_RECTANGLE)) +#define SPRITE_SIZE_32x16 ((ST_OAM_SIZE_2 << 2) | (ST_OAM_H_RECTANGLE)) +#define SPRITE_SIZE_64x32 ((ST_OAM_SIZE_3 << 2) | (ST_OAM_H_RECTANGLE)) + +#define SPRITE_SIZE_8x16 ((ST_OAM_SIZE_0 << 2) | (ST_OAM_V_RECTANGLE)) +#define SPRITE_SIZE_8x32 ((ST_OAM_SIZE_1 << 2) | (ST_OAM_V_RECTANGLE)) +#define SPRITE_SIZE_16x32 ((ST_OAM_SIZE_2 << 2) | (ST_OAM_V_RECTANGLE)) +#define SPRITE_SIZE_32x64 ((ST_OAM_SIZE_3 << 2) | (ST_OAM_V_RECTANGLE)) + +#define SPRITE_SIZE(dim) (SPRITE_SIZE_##dim >> 2) +#define SPRITE_SHAPE(dim) (SPRITE_SIZE_##dim & 0xFF) + struct BgAffineSrcData { s32 texX; diff --git a/src/battle_anim.c b/src/battle_anim.c index f1cff1de2a..31ff11ee8e 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -119,8 +119,8 @@ const struct OamData gUnknown_08524904 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_SQUARE, - .size = 0, + .shape = SPRITE_SHAPE(8x8), + .size = SPRITE_SIZE(8x8), .priority = 2, }; @@ -129,8 +129,8 @@ const struct OamData gUnknown_0852490C = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_SQUARE, - .size = 1, + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), .priority = 2, }; @@ -138,8 +138,8 @@ const struct OamData gUnknown_08524914 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_SQUARE, - .size = 2, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), .priority = 2, }; @@ -147,8 +147,8 @@ const struct OamData gUnknown_0852491C = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_SQUARE, - .size = 3, + .shape = SPRITE_SHAPE(64x64), + .size = SPRITE_SIZE(64x64), .priority = 2, }; @@ -156,8 +156,8 @@ const struct OamData gUnknown_08524924 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_H_RECTANGLE, - .size = 0, + .shape = SPRITE_SHAPE(16x8), + .size = SPRITE_SIZE(16x8), .priority = 2, }; @@ -165,8 +165,8 @@ const struct OamData gUnknown_0852492C = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_H_RECTANGLE, - .size = 1, + .shape = SPRITE_SHAPE(32x8), + .size = SPRITE_SIZE(32x8), .priority = 2, }; @@ -174,8 +174,8 @@ const struct OamData gUnknown_08524934 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_H_RECTANGLE, - .size = 2, + .shape = SPRITE_SHAPE(32x16), + .size = SPRITE_SIZE(32x16), .priority = 2, }; @@ -183,8 +183,8 @@ const struct OamData gUnknown_0852493C = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_H_RECTANGLE, - .size = 3, + .shape = SPRITE_SHAPE(64x32), + .size = SPRITE_SIZE(64x32), .priority = 2, }; @@ -192,8 +192,8 @@ const struct OamData gUnknown_08524944 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_V_RECTANGLE, - .size = 0, + .shape = SPRITE_SHAPE(8x16), + .size = SPRITE_SIZE(8x16), .priority = 2, }; @@ -201,8 +201,8 @@ const struct OamData gUnknown_0852494C = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_V_RECTANGLE, - .size = 1, + .shape = SPRITE_SHAPE(8x32), + .size = SPRITE_SIZE(8x32), .priority = 2, }; @@ -210,8 +210,8 @@ const struct OamData gUnknown_08524954 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_V_RECTANGLE, - .size = 2, + .shape = SPRITE_SHAPE(16x32), + .size = SPRITE_SIZE(16x32), .priority = 2, }; @@ -219,8 +219,8 @@ const struct OamData gUnknown_0852495C = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_V_RECTANGLE, - .size = 3, + .shape = SPRITE_SHAPE(32x64), + .size = SPRITE_SIZE(32x64), .priority = 2, }; @@ -228,8 +228,8 @@ const struct OamData gUnknown_08524964 = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_SQUARE, - .size = 0, + .shape = SPRITE_SHAPE(8x8), + .size = SPRITE_SIZE(8x8), .priority = 2, }; @@ -237,8 +237,8 @@ const struct OamData gUnknown_0852496C = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_SQUARE, - .size = 1, + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), .priority = 2, }; @@ -246,8 +246,8 @@ const struct OamData gUnknown_08524974 = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_SQUARE, - .size = 2, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), .priority = 2, }; @@ -255,8 +255,8 @@ const struct OamData gUnknown_0852497C = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_SQUARE, - .size = 3, + .shape = SPRITE_SHAPE(64x64), + .size = SPRITE_SIZE(64x64), .priority = 2, }; @@ -264,8 +264,8 @@ const struct OamData gUnknown_08524984 = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_H_RECTANGLE, - .size = 0, + .shape = SPRITE_SHAPE(16x8), + .size = SPRITE_SIZE(16x8), .priority = 2, }; @@ -273,8 +273,8 @@ const struct OamData gUnknown_0852498C = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_H_RECTANGLE, - .size = 1, + .shape = SPRITE_SHAPE(32x8), + .size = SPRITE_SIZE(32x8), .priority = 2, }; @@ -282,8 +282,8 @@ const struct OamData gUnknown_08524994 = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_H_RECTANGLE, - .size = 2, + .shape = SPRITE_SHAPE(32x16), + .size = SPRITE_SIZE(32x16), .priority = 2, }; @@ -291,8 +291,8 @@ const struct OamData gUnknown_0852499C = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_H_RECTANGLE, - .size = 3, + .shape = SPRITE_SHAPE(64x32), + .size = SPRITE_SIZE(64x32), .priority = 2, }; @@ -300,8 +300,8 @@ const struct OamData gUnknown_085249A4 = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_V_RECTANGLE, - .size = 0, + .shape = SPRITE_SHAPE(8x16), + .size = SPRITE_SIZE(8x16), .priority = 2, }; @@ -309,8 +309,8 @@ const struct OamData gUnknown_085249AC = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_V_RECTANGLE, - .size = 1, + .shape = SPRITE_SHAPE(8x32), + .size = SPRITE_SIZE(8x32), .priority = 2, }; @@ -318,8 +318,8 @@ const struct OamData gUnknown_085249B4 = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_V_RECTANGLE, - .size = 2, + .shape = SPRITE_SHAPE(16x32), + .size = SPRITE_SIZE(16x32), .priority = 2, }; @@ -327,8 +327,8 @@ const struct OamData gUnknown_085249BC = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_V_RECTANGLE, - .size = 3, + .shape = SPRITE_SHAPE(32x64), + .size = SPRITE_SIZE(32x64), .priority = 2, }; @@ -336,8 +336,8 @@ const struct OamData gUnknown_085249C4 = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_SQUARE, - .size = 0, + .shape = SPRITE_SHAPE(8x8), + .size = SPRITE_SIZE(8x8), .priority = 2, }; @@ -345,8 +345,8 @@ const struct OamData gUnknown_085249CC = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_SQUARE, - .size = 1, + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), .priority = 2, }; @@ -354,8 +354,8 @@ const struct OamData gUnknown_085249D4 = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_SQUARE, - .size = 2, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), .priority = 2, }; @@ -363,8 +363,8 @@ const struct OamData gUnknown_085249DC = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_SQUARE, - .size = 3, + .shape = SPRITE_SHAPE(64x64), + .size = SPRITE_SIZE(64x64), .priority = 2, }; @@ -372,8 +372,8 @@ const struct OamData gUnknown_085249E4 = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_H_RECTANGLE, - .size = 0, + .shape = SPRITE_SHAPE(16x8), + .size = SPRITE_SIZE(16x8), .priority = 2, }; @@ -381,8 +381,8 @@ const struct OamData gUnknown_085249EC = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_H_RECTANGLE, - .size = 1, + .shape = SPRITE_SHAPE(32x8), + .size = SPRITE_SIZE(32x8), .priority = 2, }; @@ -390,8 +390,8 @@ const struct OamData gUnknown_085249F4 = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_H_RECTANGLE, - .size = 2, + .shape = SPRITE_SHAPE(32x16), + .size = SPRITE_SIZE(32x16), .priority = 2, }; @@ -399,8 +399,8 @@ const struct OamData gUnknown_085249FC = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_H_RECTANGLE, - .size = 3, + .shape = SPRITE_SHAPE(64x32), + .size = SPRITE_SIZE(64x32), .priority = 2, }; @@ -408,8 +408,8 @@ const struct OamData gUnknown_08524A04 = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_V_RECTANGLE, - .size = 0, + .shape = SPRITE_SHAPE(8x16), + .size = SPRITE_SIZE(8x16), .priority = 2, }; @@ -417,8 +417,8 @@ const struct OamData gUnknown_08524A0C = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_V_RECTANGLE, - .size = 1, + .shape = SPRITE_SHAPE(8x32), + .size = SPRITE_SIZE(8x32), .priority = 2, }; @@ -426,8 +426,8 @@ const struct OamData gUnknown_08524A14 = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_V_RECTANGLE, - .size = 2, + .shape = SPRITE_SHAPE(16x32), + .size = SPRITE_SIZE(16x32), .priority = 2, }; @@ -435,8 +435,8 @@ const struct OamData gUnknown_08524A1C = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_V_RECTANGLE, - .size = 3, + .shape = SPRITE_SHAPE(32x64), + .size = SPRITE_SIZE(32x64), .priority = 2, }; @@ -444,8 +444,8 @@ const struct OamData gUnknown_08524A24 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_SQUARE, - .size = 0, + .shape = SPRITE_SHAPE(8x8), + .size = SPRITE_SIZE(8x8), .priority = 2, }; @@ -453,8 +453,8 @@ const struct OamData gUnknown_08524A2C = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_SQUARE, - .size = 1, + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), .priority = 2, }; @@ -462,8 +462,8 @@ const struct OamData gUnknown_08524A34 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_SQUARE, - .size = 2, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), .priority = 2, }; @@ -471,8 +471,8 @@ const struct OamData gUnknown_08524A3C = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_SQUARE, - .size = 3, + .shape = SPRITE_SHAPE(64x64), + .size = SPRITE_SIZE(64x64), .priority = 2, }; @@ -480,8 +480,8 @@ const struct OamData gUnknown_08524A44 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_H_RECTANGLE, - .size = 0, + .shape = SPRITE_SHAPE(16x8), + .size = SPRITE_SIZE(16x8), .priority = 2, }; @@ -489,8 +489,8 @@ const struct OamData gUnknown_08524A4C = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_H_RECTANGLE, - .size = 1, + .shape = SPRITE_SHAPE(32x8), + .size = SPRITE_SIZE(32x8), .priority = 2, }; @@ -498,8 +498,8 @@ const struct OamData gUnknown_08524A54 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_H_RECTANGLE, - .size = 2, + .shape = SPRITE_SHAPE(32x16), + .size = SPRITE_SIZE(32x16), .priority = 2, }; @@ -507,8 +507,8 @@ const struct OamData gUnknown_08524A5C = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_H_RECTANGLE, - .size = 3, + .shape = SPRITE_SHAPE(64x32), + .size = SPRITE_SIZE(64x32), .priority = 2, }; @@ -516,8 +516,8 @@ const struct OamData gUnknown_08524A64 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_V_RECTANGLE, - .size = 0, + .shape = SPRITE_SHAPE(8x16), + .size = SPRITE_SIZE(8x16), .priority = 2, }; @@ -525,8 +525,8 @@ const struct OamData gUnknown_08524A6C = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_V_RECTANGLE, - .size = 1, + .shape = SPRITE_SHAPE(8x32), + .size = SPRITE_SIZE(8x32), .priority = 2, }; @@ -534,8 +534,8 @@ const struct OamData gUnknown_08524A74 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_V_RECTANGLE, - .size = 2, + .shape = SPRITE_SHAPE(16x32), + .size = SPRITE_SIZE(16x32), .priority = 2, }; @@ -543,8 +543,8 @@ const struct OamData gUnknown_08524A7C = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_V_RECTANGLE, - .size = 3, + .shape = SPRITE_SHAPE(32x64), + .size = SPRITE_SIZE(32x64), .priority = 2, }; @@ -552,8 +552,8 @@ const struct OamData gUnknown_08524A84 = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_SQUARE, - .size = 0, + .shape = SPRITE_SHAPE(8x8), + .size = SPRITE_SIZE(8x8), .priority = 2, }; @@ -561,8 +561,8 @@ const struct OamData gUnknown_08524A8C = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_SQUARE, - .size = 1, + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), .priority = 2, }; @@ -570,8 +570,8 @@ const struct OamData gUnknown_08524A94 = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_SQUARE, - .size = 2, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), .priority = 2, }; @@ -579,8 +579,8 @@ const struct OamData gUnknown_08524A9C = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_SQUARE, - .size = 3, + .shape = SPRITE_SHAPE(64x64), + .size = SPRITE_SIZE(64x64), .priority = 2, }; @@ -588,8 +588,8 @@ const struct OamData gUnknown_08524AA4 = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_H_RECTANGLE, - .size = 0, + .shape = SPRITE_SHAPE(16x8), + .size = SPRITE_SIZE(16x8), .priority = 2, }; @@ -597,8 +597,8 @@ const struct OamData gUnknown_08524AAC = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_H_RECTANGLE, - .size = 1, + .shape = SPRITE_SHAPE(32x8), + .size = SPRITE_SIZE(32x8), .priority = 2, }; @@ -606,8 +606,8 @@ const struct OamData gUnknown_08524AB4 = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_H_RECTANGLE, - .size = 2, + .shape = SPRITE_SHAPE(32x16), + .size = SPRITE_SIZE(32x16), .priority = 2, }; @@ -615,8 +615,8 @@ const struct OamData gUnknown_08524ABC = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_H_RECTANGLE, - .size = 3, + .shape = SPRITE_SHAPE(64x32), + .size = SPRITE_SIZE(64x32), .priority = 2, }; @@ -624,8 +624,8 @@ const struct OamData gUnknown_08524AC4 = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_V_RECTANGLE, - .size = 0, + .shape = SPRITE_SHAPE(8x16), + .size = SPRITE_SIZE(8x16), .priority = 2, }; @@ -633,8 +633,8 @@ const struct OamData gUnknown_08524ACC = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_V_RECTANGLE, - .size = 1, + .shape = SPRITE_SHAPE(8x32), + .size = SPRITE_SIZE(8x32), .priority = 2, }; @@ -642,8 +642,8 @@ const struct OamData gUnknown_08524AD4 = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_V_RECTANGLE, - .size = 2, + .shape = SPRITE_SHAPE(16x32), + .size = SPRITE_SIZE(16x32), .priority = 2, }; @@ -651,8 +651,8 @@ const struct OamData gUnknown_08524ADC = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_V_RECTANGLE, - .size = 3, + .shape = SPRITE_SHAPE(32x64), + .size = SPRITE_SIZE(32x64), .priority = 2, }; @@ -660,8 +660,8 @@ const struct OamData gUnknown_08524AE4 = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_SQUARE, - .size = 0, + .shape = SPRITE_SHAPE(8x8), + .size = SPRITE_SIZE(8x8), .priority = 2, }; @@ -669,8 +669,8 @@ const struct OamData gUnknown_08524AEC = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_SQUARE, - .size = 1, + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), .priority = 2, }; @@ -678,8 +678,8 @@ const struct OamData gUnknown_08524AF4 = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_SQUARE, - .size = 2, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), .priority = 2, }; @@ -687,8 +687,8 @@ const struct OamData gUnknown_08524AFC = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_SQUARE, - .size = 3, + .shape = SPRITE_SHAPE(64x64), + .size = SPRITE_SIZE(64x64), .priority = 2, }; @@ -696,8 +696,8 @@ const struct OamData gUnknown_08524B04 = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_H_RECTANGLE, - .size = 0, + .shape = SPRITE_SHAPE(16x8), + .size = SPRITE_SIZE(16x8), .priority = 2, }; @@ -705,8 +705,8 @@ const struct OamData gUnknown_08524B0C = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_H_RECTANGLE, - .size = 1, + .shape = SPRITE_SHAPE(32x8), + .size = SPRITE_SIZE(32x8), .priority = 2, }; @@ -714,8 +714,8 @@ const struct OamData gUnknown_08524B14 = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_H_RECTANGLE, - .size = 2, + .shape = SPRITE_SHAPE(32x16), + .size = SPRITE_SIZE(32x16), .priority = 2, }; @@ -723,8 +723,8 @@ const struct OamData gUnknown_08524B1C = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_H_RECTANGLE, - .size = 3, + .shape = SPRITE_SHAPE(64x32), + .size = SPRITE_SIZE(64x32), .priority = 2, }; @@ -732,8 +732,8 @@ const struct OamData gUnknown_08524B24 = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_V_RECTANGLE, - .size = 0, + .shape = SPRITE_SHAPE(8x16), + .size = SPRITE_SIZE(8x16), .priority = 2, }; @@ -741,8 +741,8 @@ const struct OamData gUnknown_08524B2C = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_V_RECTANGLE, - .size = 1, + .shape = SPRITE_SHAPE(8x32), + .size = SPRITE_SIZE(8x32), .priority = 2, }; @@ -750,8 +750,8 @@ const struct OamData gUnknown_08524B34 = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_V_RECTANGLE, - .size = 2, + .shape = SPRITE_SHAPE(16x32), + .size = SPRITE_SIZE(16x32), .priority = 2, }; @@ -759,8 +759,8 @@ const struct OamData gUnknown_08524B3C = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_BLEND, - .shape = ST_OAM_V_RECTANGLE, - .size = 3, + .shape = SPRITE_SHAPE(32x64), + .size = SPRITE_SIZE(32x64), .priority = 2, }; diff --git a/src/battle_arena.c b/src/battle_arena.c index 8146f5b389..f785fa7c3d 100644 --- a/src/battle_arena.c +++ b/src/battle_arena.c @@ -406,10 +406,10 @@ static const struct OamData sJudgementIconOamData = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 0, .paletteNum = 15, diff --git a/src/battle_bg.c b/src/battle_bg.c index 9ca0f8b846..524f73abf7 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -42,10 +42,10 @@ static const struct OamData gUnknown_0831A988 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -59,10 +59,10 @@ static const struct OamData gUnknown_0831A990 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 64, .priority = 0, .paletteNum = 0, diff --git a/src/battle_dome.c b/src/battle_dome.c index f86faeffb4..1b79531804 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -872,10 +872,10 @@ static const struct OamData gUnknown_0860CF70 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -889,10 +889,10 @@ static const struct OamData gUnknown_0860CF78 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(32x16), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x16), .tileNum = 0, .priority = 0, .paletteNum = 1, @@ -906,10 +906,10 @@ static const struct OamData gUnknown_0860CF80 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(16x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(16x8), .tileNum = 0, .priority = 0, .paletteNum = 2, @@ -923,10 +923,10 @@ static const struct OamData gUnknown_0860CF88 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 2, + .shape = SPRITE_SHAPE(8x16), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x16), .tileNum = 0, .priority = 0, .paletteNum = 2, diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 85c0b28089..367c1401fc 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -385,10 +385,10 @@ static const struct OamData gUnknown_0861047C = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 3, .paletteNum = 0, @@ -402,10 +402,10 @@ static const struct OamData gUnknown_08610484 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 3, .paletteNum = 0, @@ -419,10 +419,10 @@ static const struct OamData gUnknown_0861048C = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(32x16), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x16), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -436,10 +436,10 @@ static const struct OamData gUnknown_08610494 = .objMode = 1, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 0, .paletteNum = 0, diff --git a/src/battle_interface.c b/src/battle_interface.c index f2916012e1..a8651f6cf6 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -207,10 +207,10 @@ static const struct OamData sUnknown_0832C138 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(64x32), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x32), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -279,10 +279,10 @@ static const struct OamData sOamData_Healthbar = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(32x8), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(32x8), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -446,10 +446,10 @@ static const struct OamData sUnknown_0832C354 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(64x32), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x32), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -463,10 +463,10 @@ static const struct OamData sOamData_StatusSummaryBalls = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x8), .tileNum = 0, .priority = 1, .paletteNum = 0, diff --git a/src/battle_main.c b/src/battle_main.c index 2b0c5980ed..0f593fef6f 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -296,10 +296,10 @@ const struct OamData gOamData_831ACA8 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -313,10 +313,10 @@ const struct OamData gOamData_831ACB0 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 2, .paletteNum = 2, diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index 2e13ea08ba..3b8cac14f5 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -282,10 +282,10 @@ static const struct OamData gOamData_861F378 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 1, .paletteNum = 0, diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index ac9fb3073a..025d694e4b 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -733,10 +733,10 @@ static const struct OamData sOamData_MonIconOnLvlUpBox = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 0, .paletteNum = 0, diff --git a/src/battle_transition.c b/src/battle_transition.c index 786d5e8693..df6180d19b 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -763,10 +763,10 @@ static const struct OamData gOamData_85C8E80 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 0, .paletteNum = 0, diff --git a/src/berry_blender.c b/src/berry_blender.c index 450bcae420..c792b9b40e 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -404,10 +404,10 @@ static const struct OamData sOamData_8216314 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -547,10 +547,10 @@ static const struct OamData sOamData_821640C = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -616,10 +616,10 @@ static const struct OamData sOamData_8216474 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x8), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -703,10 +703,10 @@ static const struct OamData sOamData_8216514 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -761,10 +761,10 @@ static const struct OamData sOamData_8216560 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(64x32), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x32), .tileNum = 0, .priority = 1, .paletteNum = 0, diff --git a/src/cable_car.c b/src/cable_car.c index 420bdd30f6..ab7b5726a1 100755 --- a/src/cable_car.c +++ b/src/cable_car.c @@ -153,19 +153,22 @@ const struct SpritePalette gUnknown_085CDB74[] = { const struct OamData gOamData_85CDB84 = { .affineMode = ST_OAM_AFFINE_DOUBLE, - .size = 3, + .shape = SPRITE_SHAPE(64x64), + .size = SPRITE_SIZE(64x64), .priority = 2 }; const struct OamData gOamData_85CDB8C = { .affineMode = ST_OAM_AFFINE_DOUBLE, - .shape = ST_OAM_H_RECTANGLE, + .shape = SPRITE_SHAPE(16x8), + .size = SPRITE_SIZE(16x8), .priority = 2 }; const struct OamData gOamData_85CDB94 = { .affineMode = ST_OAM_AFFINE_DOUBLE, - .size = 1, + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), .priority = 2 }; diff --git a/src/contest_painting.c b/src/contest_painting.c index 931deb01bf..29f3c871d6 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -154,10 +154,10 @@ const struct OamData gUnknown_085B0830 = .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 1, .bpp = ST_OAM_8BPP, - .shape = ST_OAM_SQUARE, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 0, .paletteNum = 0, diff --git a/src/credits.c b/src/credits.c index 4483e3160f..1e96514b17 100644 --- a/src/credits.c +++ b/src/credits.c @@ -1056,10 +1056,10 @@ static const struct OamData gUnknown_085E703C = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 1, .paletteNum = 0, diff --git a/src/data/field_event_obj/base_oam.h b/src/data/field_event_obj/base_oam.h index 543382d434..af961f492f 100755 --- a/src/data/field_event_obj/base_oam.h +++ b/src/data/field_event_obj/base_oam.h @@ -1,47 +1,47 @@ const struct OamData gEventObjectBaseOam_8x8 = { - .shape = 0, - .size = 0, + .shape = SPRITE_SHAPE(8x8), + .size = SPRITE_SIZE(8x8), .priority = 2 }; const struct OamData gEventObjectBaseOam_16x8 = { - .shape = 1, - .size = 0, + .shape = SPRITE_SHAPE(16x8), + .size = SPRITE_SIZE(16x8), .priority = 2 }; const struct OamData gEventObjectBaseOam_16x16 = { - .shape = 0, - .size = 1, + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), .priority = 2 }; const struct OamData gEventObjectBaseOam_32x8 = { - .shape = 1, - .size = 1, + .shape = SPRITE_SHAPE(32x8), + .size = SPRITE_SIZE(32x8), .priority = 2 }; const struct OamData gEventObjectBaseOam_64x32 = { - .shape = 1, - .size = 3, + .shape = SPRITE_SHAPE(64x32), + .size = SPRITE_SIZE(64x32), .priority = 2 }; const struct OamData gEventObjectBaseOam_16x32 = { - .shape = 2, - .size = 2, + .shape = SPRITE_SHAPE(16x32), + .size = SPRITE_SIZE(16x32), .priority = 2 }; const struct OamData gEventObjectBaseOam_32x32 = { - .shape = 0, - .size = 2, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), .priority = 2 }; const struct OamData gEventObjectBaseOam_64x64 = { - .shape = 0, - .size = 3, + .shape = SPRITE_SHAPE(64x64), + .size = SPRITE_SIZE(64x64), .priority = 2 }; diff --git a/src/decoration.c b/src/decoration.c index 0712b5d326..47e3ae18ce 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -392,7 +392,9 @@ const struct SpritePalette gUnknown_085A73E0 = { }; const struct OamData Unknown_085A73E8 = { - .size = 1, .priority = 1 + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), + .priority = 1 }; const union AnimCmd Unknown_085A73F0[] = { diff --git a/src/easy_chat.c b/src/easy_chat.c index b03058eb96..4cc8b9c5b2 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -772,10 +772,10 @@ static const struct OamData sOamData_8597D10 = { .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = ST_OAM_SQUARE, + .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x8), .tileNum = 0, .priority = 3, .paletteNum = 0, @@ -798,10 +798,10 @@ static const struct OamData sUnknown_08597D30 = { .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = ST_OAM_H_RECTANGLE, + .shape = SPRITE_SHAPE(64x32), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x32), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -851,10 +851,10 @@ static const struct OamData sUnknown_08597D80 = { .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = ST_OAM_H_RECTANGLE, + .shape = SPRITE_SHAPE(64x32), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x32), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -913,10 +913,10 @@ static const struct OamData sUnknown_08597DE8 = { .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = ST_OAM_SQUARE, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 3, .paletteNum = 0, @@ -939,10 +939,10 @@ static const struct OamData sUnknown_08597E08 = { .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = ST_OAM_H_RECTANGLE, + .shape = SPRITE_SHAPE(32x8), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(32x8), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -955,10 +955,10 @@ static const struct OamData gUnknown_08597E10 = { .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = ST_OAM_SQUARE, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 1, .paletteNum = 0, diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 68728f818d..00b67a5d97 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -86,10 +86,10 @@ static const struct OamData sOamData_EggHatch = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -166,10 +166,10 @@ static const struct OamData sOamData_EggShard = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x8), .tileNum = 0, .priority = 2, .paletteNum = 0, diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c index bfd46978ca..e36d47c2bb 100644 --- a/src/evolution_graphics.c +++ b/src/evolution_graphics.c @@ -53,10 +53,10 @@ static const struct OamData sOamData_EvoSparkle = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x8), .tileNum = 0, .priority = 1, .paletteNum = 0, diff --git a/src/field_effect.c b/src/field_effect.c index ee9dcb987a..825efc3803 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -270,7 +270,8 @@ const u8 gUnknown_0855C190[] = INCBIN_U8("graphics/unknown/unknown_55C190.4bpp") const u8 gUnknown_0855C1B0[] = INCBIN_U8("graphics/unknown/unknown_55C1B0.4bpp"); const u8 gUnknown_0855C1D0[] = INCBIN_U8("graphics/unknown/unknown_55C1D0.4bpp"); -bool8 (*const gFieldEffectScriptFuncs[])(u8 **, u32 *) = { +bool8 (*const gFieldEffectScriptFuncs[])(u8 **, u32 *) = +{ FieldEffectCmd_loadtiles, FieldEffectCmd_loadfadedpal, FieldEffectCmd_loadpal, @@ -281,25 +282,48 @@ bool8 (*const gFieldEffectScriptFuncs[])(u8 **, u32 *) = { FieldEffectCmd_loadfadedpal_callnative, }; -const struct OamData gNewGameBirchOamAttributes = {.size = 3}; -const struct OamData gOamData_855C218 = {.size = 0}; -const struct OamData gOamData_855C220 = {.size = 1}; +const struct OamData gNewGameBirchOamAttributes = +{ + .shape = SPRITE_SHAPE(64x64), + .size = SPRITE_SIZE(64x64) +}; -const struct SpriteFrameImage gNewGameBirchPicTable[] = { +const struct OamData gOamData_855C218 = +{ + .shape = SPRITE_SHAPE(8x8), + .size = SPRITE_SIZE(8x8) +}; + +const struct OamData gOamData_855C220 = +{ + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16) +}; + +const struct SpriteFrameImage gNewGameBirchPicTable[] = +{ obj_frame_tiles(gNewGameBirchPic) }; -const struct SpritePalette gNewGameBirchObjectPaletteInfo = {.data = gNewGameBirchPalette, .tag = 0x1006}; -const union AnimCmd gNewGameBirchImageAnim[] = { +const struct SpritePalette gNewGameBirchObjectPaletteInfo = +{ + .data = gNewGameBirchPalette, + .tag = 0x1006 +}; + +const union AnimCmd gNewGameBirchImageAnim[] = +{ ANIMCMD_FRAME(.imageValue = 0, .duration = 1), ANIMCMD_END }; -const union AnimCmd *const gNewGameBirchImageAnimTable[] = { +const union AnimCmd *const gNewGameBirchImageAnimTable[] = +{ gNewGameBirchImageAnim }; -const struct SpriteTemplate gNewGameBirchObjectTemplate = { +const struct SpriteTemplate gNewGameBirchObjectTemplate = +{ .tileTag = 0xFFFF, .paletteTag = 4102, .oam = &gNewGameBirchOamAttributes, @@ -309,31 +333,47 @@ const struct SpriteTemplate gNewGameBirchObjectTemplate = { .callback = SpriteCallbackDummy }; -const struct SpritePalette gFieldEffectObjectPaletteInfo4 = {.data = gFieldEffectObjectPalette4, .tag = 0x1007}; -const struct SpritePalette gFieldEffectObjectPaletteInfo5 = {.data = gFieldEffectObjectPalette5, .tag = 0x1010}; -const struct OamData gOamData_855C26C = { - .shape = 1, - .size = 2 +const struct SpritePalette gFieldEffectObjectPaletteInfo4 = +{ + .data = gFieldEffectObjectPalette4, + .tag = 0x1007 }; -const struct SpriteFrameImage gSpriteImageTable_855C274[] = { +const struct SpritePalette gFieldEffectObjectPaletteInfo5 = +{ + .data = gFieldEffectObjectPalette5, + .tag = 0x1010 +}; + +const struct OamData gOamData_855C26C = +{ + .shape = SPRITE_SHAPE(32x16), + .size = SPRITE_SIZE(32x16) +}; + +const struct SpriteFrameImage gSpriteImageTable_855C274[] = +{ obj_frame_tiles(gSpriteImage_855A970) }; -const struct SpriteFrameImage gSpriteImageTable_855C27C[] = { +const struct SpriteFrameImage gSpriteImageTable_855C27C[] = +{ obj_frame_tiles(gSpriteImage_855A9B0), obj_frame_tiles(gSpriteImage_855AA70) }; -const struct SpriteFrameImage gSpriteImageTable_855C28C[] = { +const struct SpriteFrameImage gSpriteImageTable_855C28C[] = +{ obj_frame_tiles(gSpriteImage_855AB30) }; -const struct SpriteFrameImage gSpriteImageTable_855C294[] = { +const struct SpriteFrameImage gSpriteImageTable_855C294[] = +{ {.data = gSpriteImage_855AD30, .size = 0x200} // the macro breaks down here }; -const struct Subsprite gSubspriteTable_855C29C[] = { +const struct Subsprite gSubspriteTable_855C29C[] = +{ {.x = -12, .y = -8, .priority = 2, .tileOffset = 0, .shape = 1, .size = 0}, {.x = 4, .y = -8, .priority = 2, .tileOffset = 2, .shape = 0, .size = 0}, {.x = -12, .y = 0, .priority = 2, .tileOffset = 3, .shape = 1, .size = 0}, @@ -342,7 +382,8 @@ const struct Subsprite gSubspriteTable_855C29C[] = { const struct SubspriteTable gUnknown_0855C2AC = subsprite_table(gSubspriteTable_855C29C); -const struct Subsprite gSubspriteTable_855C2B4[] = { +const struct Subsprite gSubspriteTable_855C2B4[] = +{ {.x = -32, .y = -8, .priority = 2, .tileOffset = 0, .shape = 1, .size = 1}, {.x = 0, .y = -8, .priority = 2, .tileOffset = 4, .shape = 1, .size = 1}, {.x = -32, .y = 0, .priority = 2, .tileOffset = 8, .shape = 1, .size = 1}, @@ -351,12 +392,14 @@ const struct Subsprite gSubspriteTable_855C2B4[] = { const struct SubspriteTable gUnknown_0855C2C4 = subsprite_table(gSubspriteTable_855C2B4); -const union AnimCmd gSpriteAnim_855C2CC[] = { +const union AnimCmd gSpriteAnim_855C2CC[] = +{ ANIMCMD_FRAME(.imageValue = 0, .duration = 1), ANIMCMD_JUMP(0) }; -const union AnimCmd gSpriteAnim_855C2D4[] = { +const union AnimCmd gSpriteAnim_855C2D4[] = +{ ANIMCMD_FRAME(.imageValue = 0, .duration = 16), ANIMCMD_FRAME(.imageValue = 1, .duration = 16), ANIMCMD_FRAME(.imageValue = 0, .duration = 16), @@ -368,16 +411,19 @@ const union AnimCmd gSpriteAnim_855C2D4[] = { ANIMCMD_END }; -const union AnimCmd *const gSpriteAnimTable_855C2F8[] = { +const union AnimCmd *const gSpriteAnimTable_855C2F8[] = +{ gSpriteAnim_855C2CC, gSpriteAnim_855C2D4 }; -const union AnimCmd *const gSpriteAnimTable_855C300[] = { +const union AnimCmd *const gSpriteAnimTable_855C300[] = +{ gSpriteAnim_855C2CC }; -const struct SpriteTemplate gSpriteTemplate_855C304 = { +const struct SpriteTemplate gSpriteTemplate_855C304 = +{ .tileTag = 0xFFFF, .paletteTag = 4103, .oam = &gOamData_855C218, @@ -387,7 +433,8 @@ const struct SpriteTemplate gSpriteTemplate_855C304 = { .callback = SpriteCB_PokeballGlow }; -const struct SpriteTemplate gSpriteTemplate_855C31C = { +const struct SpriteTemplate gSpriteTemplate_855C31C = +{ .tileTag = 0xFFFF, .paletteTag = 4100, .oam = &gOamData_855C220, @@ -397,7 +444,8 @@ const struct SpriteTemplate gSpriteTemplate_855C31C = { .callback = SpriteCB_PokecenterMonitor }; -const struct SpriteTemplate gSpriteTemplate_855C334 = { +const struct SpriteTemplate gSpriteTemplate_855C334 = +{ .tileTag = 0xFFFF, .paletteTag = 4112, .oam = &gOamData_855C220, @@ -407,7 +455,8 @@ const struct SpriteTemplate gSpriteTemplate_855C334 = { .callback = SpriteCB_HallOfFameMonitor }; -const struct SpriteTemplate gSpriteTemplate_855C34C = { +const struct SpriteTemplate gSpriteTemplate_855C34C = +{ .tileTag = 0xFFFF, .paletteTag = 4112, .oam = &gOamData_855C26C, @@ -417,21 +466,24 @@ const struct SpriteTemplate gSpriteTemplate_855C34C = { .callback = SpriteCB_HallOfFameMonitor }; -void (*const gUnknown_0855C364[])(struct Task *) = { +void (*const gUnknown_0855C364[])(struct Task *) = +{ PokecenterHealEffect_0, PokecenterHealEffect_1, PokecenterHealEffect_2, PokecenterHealEffect_3 }; -void (*const gUnknown_0855C374[])(struct Task *) = { +void (*const gUnknown_0855C374[])(struct Task *) = +{ HallOfFameRecordEffect_0, HallOfFameRecordEffect_1, HallOfFameRecordEffect_2, HallOfFameRecordEffect_3 }; -void (*const gUnknown_0855C384[])(struct Sprite *) = { +void (*const gUnknown_0855C384[])(struct Sprite *) = +{ PokeballGlowEffect_0, PokeballGlowEffect_1, PokeballGlowEffect_2, @@ -442,7 +494,8 @@ void (*const gUnknown_0855C384[])(struct Sprite *) = { PokeballGlowEffect_7 }; -const struct Coords16 gUnknown_0855C3A4[] = { +const struct Coords16 gUnknown_0855C3A4[] = +{ {.x = 0, .y = 0}, {.x = 6, .y = 0}, {.x = 0, .y = 4}, @@ -455,7 +508,8 @@ const u8 gUnknown_0855C3BC[] = {16, 12, 8, 0}; const u8 gUnknown_0855C3C0[] = {16, 12, 8, 0}; const u8 gUnknown_0855C3C4[] = { 0, 0, 0, 0}; -bool8 (*const gUnknown_0855C3C8[])(struct Task *) = { +bool8 (*const gUnknown_0855C3C8[])(struct Task *) = +{ sub_80B6BCC, sub_80B6C74, sub_80B6C90, @@ -465,7 +519,8 @@ bool8 (*const gUnknown_0855C3C8[])(struct Task *) = { sub_80B6E18, }; -bool8 (*const gUnknown_0855C3E4[])(struct Task *) = { +bool8 (*const gUnknown_0855C3E4[])(struct Task *) = +{ sub_80B6EC0, sub_80B6EE0, sub_80B6F50, @@ -474,7 +529,8 @@ bool8 (*const gUnknown_0855C3E4[])(struct Task *) = { sub_80B6FA8, }; -bool8 (*const gUnknown_0855C3FC[])(struct Task *) = { +bool8 (*const gUnknown_0855C3FC[])(struct Task *) = +{ sub_80B7114, sub_80B7190, sub_80B71D0, @@ -484,7 +540,8 @@ bool8 (*const gUnknown_0855C3FC[])(struct Task *) = { sub_80B72F4, }; -bool8 (*const gUnknown_0855C418[])(struct Task *, struct EventObject *) = { +bool8 (*const gUnknown_0855C418[])(struct Task *, struct EventObject *) = +{ sub_80B73D0, waterfall_1_do_anim_probably, waterfall_2_wait_anim_finish_probably, @@ -492,13 +549,15 @@ bool8 (*const gUnknown_0855C418[])(struct Task *, struct EventObject *) = { sub_80B7478, }; -bool8 (*const gUnknown_0855C42C[])(struct Task *) = { +bool8 (*const gUnknown_0855C42C[])(struct Task *) = +{ dive_1_lock, dive_2_unknown, dive_3_unknown, }; -bool8 (*const gUnknown_0855C438[])(struct Task *, struct EventObject *, struct Sprite *) = { +bool8 (*const gUnknown_0855C438[])(struct Task *, struct EventObject *, struct Sprite *) = +{ sub_80B764C, sub_80B7684, sub_80B76B8, @@ -507,14 +566,16 @@ 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 EventObject *, struct Sprite *) = +{ sub_80B78EC, sub_80B791C, sub_80B7968, sub_80B79BC, }; -bool8 (*const gUnknown_0855C460[])(struct Task *, struct EventObject *, struct Sprite *) = { +bool8 (*const gUnknown_0855C460[])(struct Task *, struct EventObject *, struct Sprite *) = +{ sub_80B7AE8, sub_80B7B18, sub_80B7B94, @@ -522,7 +583,8 @@ bool8 (*const gUnknown_0855C460[])(struct Task *, struct EventObject *, struct S sub_80B7BF4, }; -void (*const gEscapeRopeFieldEffectFuncs[])(struct Task *) = { +void (*const gEscapeRopeFieldEffectFuncs[])(struct Task *) = +{ EscapeRopeFieldEffect_Step0, EscapeRopeFieldEffect_Step1, }; diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c index be8fdc6cb2..6ec83f1a0d 100644 --- a/src/field_weather_effect.c +++ b/src/field_weather_effect.c @@ -48,10 +48,10 @@ static const struct OamData gOamData_839A9DC = .objMode = 1, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 3, .paletteNum = 0, @@ -577,10 +577,10 @@ static const struct OamData gOamData_839AA68 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 2, + .shape = SPRITE_SHAPE(16x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(16x32), .tileNum = 0, .priority = 1, .paletteNum = 2, @@ -648,10 +648,10 @@ static const struct OamData gOamData_839AAD4 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x8), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -704,10 +704,10 @@ static const struct OamData gOamData_839AB2C = .objMode = 1, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -1517,10 +1517,10 @@ const struct OamData gOamData_839ABB8 = .objMode = 1, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 1, .paletteNum = 15, @@ -1754,10 +1754,10 @@ const struct OamData gOamData_839ABF0 = .objMode = 1, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -1953,10 +1953,10 @@ const struct OamData gOamData_839AC1C = .objMode = 1, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 1, .paletteNum = 0, diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index a715608c5c..b1f4a63689 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -132,10 +132,10 @@ static const struct OamData sOamData_CutGrass = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x8), .tileNum = 1, .priority = 1, .paletteNum = 1, diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c index d4d6075f3d..5d1920aac1 100644 --- a/src/fldeff_misc.c +++ b/src/fldeff_misc.c @@ -93,8 +93,8 @@ static const struct OamData gOamData_858E4D8 = .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, .bpp = ST_OAM_4BPP, - .shape = ST_OAM_SQUARE, - .size = 1, + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), .priority = 2, }; @@ -246,8 +246,8 @@ static const struct OamData gOamData_858E658 = .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, .bpp = ST_OAM_4BPP, - .shape = ST_OAM_V_RECTANGLE, - .size = 2, + .shape = SPRITE_SHAPE(16x32), + .size = SPRITE_SIZE(16x32), .priority = 2, }; diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 2c31dba017..8eba90d962 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -178,10 +178,10 @@ static const struct OamData sOamData_85E53FC = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x8), .tileNum = 0, .priority = 0, .paletteNum = 0, diff --git a/src/intro.c b/src/intro.c index 84127cf64c..e97fbedb0a 100644 --- a/src/intro.c +++ b/src/intro.c @@ -145,10 +145,10 @@ static const struct OamData gUnknown_085E4A94 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -214,10 +214,10 @@ static const struct OamData gUnknown_085E4B28 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -251,10 +251,10 @@ static const struct OamData gUnknown_085E4B58 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -307,10 +307,10 @@ static const struct OamData gUnknown_085E4BBC = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -356,10 +356,10 @@ static const struct OamData gUnknown_085E4C14 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -441,10 +441,10 @@ static const struct OamData gUnknown_085E4CF0 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 2, + .shape = SPRITE_SHAPE(16x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(16x32), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -481,10 +481,10 @@ static const struct OamData gUnknown_085E4D2C = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -572,10 +572,10 @@ static const struct OamData gUnknown_085E4DD4 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -588,10 +588,10 @@ static const struct OamData gUnknown_085E4DDC = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x8), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -604,10 +604,10 @@ static const struct OamData gUnknown_085E4DE4 = .objMode = 1, .mosaic = 0, .bpp = 0, - .shape = 2, + .shape = SPRITE_SHAPE(32x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(32x64), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -804,10 +804,10 @@ static const struct OamData gUnknown_085E4FB0 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(64x32), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x32), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -857,10 +857,10 @@ static const struct OamData gUnknown_085E501C = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 0, .paletteNum = 0, diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index b98708324c..29ee2067fa 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -57,43 +57,51 @@ static void nullsub_65(struct Sprite *sprite); static void sub_817B7C4(struct Sprite *sprite); static void nullsub_66(struct Sprite *sprite); -static const struct SpriteTemplate gUnknown_085F504C = { +static const struct SpriteTemplate gUnknown_085F504C = +{ 2000, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817B62C }; -static const struct CompressedSpriteSheet gUnknown_085F5064[] = { +static const struct CompressedSpriteSheet gUnknown_085F5064[] = +{ { gUnknown_085F16A8, 0x400, 2000 }, { NULL } }; -static const union AnimCmd gUnknown_085F5074[] = { +static const union AnimCmd gUnknown_085F5074[] = +{ ANIMCMD_FRAME( 0, 30), ANIMCMD_END }; -static const union AnimCmd gUnknown_085F507C[] = { +static const union AnimCmd gUnknown_085F507C[] = +{ ANIMCMD_FRAME(16, 30), ANIMCMD_END }; -static const union AnimCmd gUnknown_085F5084[] = { +static const union AnimCmd gUnknown_085F5084[] = +{ ANIMCMD_FRAME(20, 30), ANIMCMD_END }; -static const union AnimCmd gUnknown_085F508C[] = { +static const union AnimCmd gUnknown_085F508C[] = +{ ANIMCMD_FRAME(22, 30), ANIMCMD_END }; -static const union AnimCmd *const gUnknown_085F5094[] = { +static const union AnimCmd *const gUnknown_085F5094[] = +{ gUnknown_085F5074, gUnknown_085F507C, gUnknown_085F5084, gUnknown_085F508C }; -static const struct IntroCreditsSpriteMetadata gUnknown_085F50A4[] = { +static const struct IntroCreditsSpriteMetadata gUnknown_085F50A4[] = +{ { 0, ST_OAM_SQUARE, 2, 72, 32, 100, 0xc00 }, { 0, ST_OAM_SQUARE, 2, 158, 32, 100, 0xc00 }, { 1, ST_OAM_SQUARE, 1, 192, 40, 101, 0x800 }, @@ -105,33 +113,39 @@ static const struct IntroCreditsSpriteMetadata gUnknown_085F50A4[] = { { 3, ST_OAM_H_RECTANGLE, 0, 240, 46, 103, 0x100 }, }; -static const struct CompressedSpriteSheet gUnknown_085F50EC[] = { +static const struct CompressedSpriteSheet gUnknown_085F50EC[] = +{ { gIntro2TreeTiles, 0x400, 2000 }, { NULL } }; -static const union AnimCmd gUnknown_085F50FC[] = { +static const union AnimCmd gUnknown_085F50FC[] = +{ ANIMCMD_FRAME( 0, 30), ANIMCMD_END }; -static const union AnimCmd gUnknown_085F5104[] = { +static const union AnimCmd gUnknown_085F5104[] = +{ ANIMCMD_FRAME(16, 30), ANIMCMD_END }; -static const union AnimCmd gUnknown_085F510C[] = { +static const union AnimCmd gUnknown_085F510C[] = +{ ANIMCMD_FRAME(24, 30), ANIMCMD_END }; -static const union AnimCmd *const gUnknown_085F5114[] = { +static const union AnimCmd *const gUnknown_085F5114[] = +{ gUnknown_085F50FC, gUnknown_085F5104, gUnknown_085F510C }; -static const struct IntroCreditsSpriteMetadata gUnknown_085F5120[] = { +static const struct IntroCreditsSpriteMetadata gUnknown_085F5120[] = +{ { 0, ST_OAM_SQUARE, 2, 16, 88, 100, 0x2000 }, { 0, ST_OAM_SQUARE, 2, 80, 88, 100, 0x2000 }, { 0, ST_OAM_SQUARE, 2, 144, 88, 100, 0x2000 }, @@ -146,21 +160,25 @@ static const struct IntroCreditsSpriteMetadata gUnknown_085F5120[] = { { 2, ST_OAM_V_RECTANGLE, 2, 248, 88, 102, 0x800 }, }; -static const struct CompressedSpriteSheet gUnknown_085F5180[] = { +static const struct CompressedSpriteSheet gUnknown_085F5180[] = +{ { gIntro2NightTiles, 0x400, 2000 }, { NULL } }; -static const union AnimCmd gUnknown_085F5190[] = { +static const union AnimCmd gUnknown_085F5190[] = +{ ANIMCMD_FRAME(0, 30), ANIMCMD_END }; -static const union AnimCmd *const gUnknown_085F5198[] = { +static const union AnimCmd *const gUnknown_085F5198[] = +{ gUnknown_085F5190 }; -static const struct IntroCreditsSpriteMetadata gUnknown_085F519C[] = { +static const struct IntroCreditsSpriteMetadata gUnknown_085F519C[] = +{ { 0, ST_OAM_SQUARE, 2, 24, 88, 100, 0x1000 }, { 0, ST_OAM_SQUARE, 2, 64, 88, 100, 0x1000 }, { 0, ST_OAM_SQUARE, 2, 104, 88, 100, 0x1000 }, @@ -169,11 +187,16 @@ static const struct IntroCreditsSpriteMetadata gUnknown_085F519C[] = { { 0, ST_OAM_SQUARE, 2, 224, 88, 100, 0x1000 }, }; -static const struct OamData gOamData_85F51CC = { - .y = 160, .shape = ST_OAM_SQUARE, .size = 3, .priority = 1 +static const struct OamData gOamData_85F51CC = +{ + .y = 160, + .shape = SPRITE_SHAPE(64x64), + .size = SPRITE_SIZE(64x64), + .priority = 1 }; -static const union AnimCmd gUnknown_085F51D4[] = { +static const union AnimCmd gUnknown_085F51D4[] = +{ ANIMCMD_FRAME( 0, 8), ANIMCMD_FRAME( 64, 8), ANIMCMD_FRAME(128, 8), @@ -181,23 +204,31 @@ static const union AnimCmd gUnknown_085F51D4[] = { ANIMCMD_JUMP(0) }; -static const union AnimCmd *const gUnknown_085F51E8[] = { +static const union AnimCmd *const gUnknown_085F51E8[] = +{ gUnknown_085F51D4 }; -static const struct SpriteTemplate gUnknown_085F51EC = { +static const struct SpriteTemplate gUnknown_085F51EC = +{ 1002, 1002, &gOamData_85F51CC, gUnknown_085F51E8, NULL, gDummySpriteAffineAnimTable, nullsub_65 }; -static const struct SpriteTemplate gUnknown_085F5204 = { +static const struct SpriteTemplate gUnknown_085F5204 = +{ 1003, 1003, &gOamData_85F51CC, gUnknown_085F51E8, NULL, gDummySpriteAffineAnimTable, nullsub_65 }; -static const struct OamData gUnknown_085F521C = { - .y = 160, .shape = ST_OAM_H_RECTANGLE, .size = 3, .priority = 1 +static const struct OamData gUnknown_085F521C = +{ + .y = 160, + .shape = SPRITE_SHAPE(64x32), + .size = SPRITE_SIZE(64x32), + .priority = 1 }; -static const union AnimCmd gUnknown_085F5224[] = { +static const union AnimCmd gUnknown_085F5224[] = +{ ANIMCMD_FRAME( 0, 8), ANIMCMD_FRAME( 32, 8), ANIMCMD_FRAME( 64, 8), @@ -205,71 +236,89 @@ static const union AnimCmd gUnknown_085F5224[] = { ANIMCMD_JUMP(0) }; -static const union AnimCmd *const gUnknown_085F5238[] = { +static const union AnimCmd *const gUnknown_085F5238[] = +{ gUnknown_085F5224 }; -static const struct SpriteTemplate gUnknown_085F523C = { +static const struct SpriteTemplate gUnknown_085F523C = +{ 1001, 1002, &gUnknown_085F521C, gUnknown_085F5238, NULL, gDummySpriteAffineAnimTable, sub_817B7C4 }; -static const struct SpriteTemplate gUnknown_085F5254 = { +static const struct SpriteTemplate gUnknown_085F5254 = +{ 1001, 1003, &gUnknown_085F521C, gUnknown_085F5238, NULL, gDummySpriteAffineAnimTable, sub_817B7C4 }; -static const struct OamData gUnknown_085F526C = { - .y = 160, .shape = ST_OAM_SQUARE, .size = 3, .priority = 1 +static const struct OamData gUnknown_085F526C = +{ + .y = 160, + .shape = SPRITE_SHAPE(64x64), + .size = SPRITE_SIZE(64x64), + .priority = 1 }; -static const union AnimCmd gUnknown_085F5274[] = { +static const union AnimCmd gUnknown_085F5274[] = +{ ANIMCMD_FRAME( 0, 16), ANIMCMD_END }; -static const union AnimCmd gUnknown_085F527C[] = { +static const union AnimCmd gUnknown_085F527C[] = +{ ANIMCMD_FRAME( 64, 16), ANIMCMD_END }; -static const union AnimCmd *const gUnknown_085F5284[] = { +static const union AnimCmd *const gUnknown_085F5284[] = +{ gUnknown_085F5274, gUnknown_085F527C }; -static const struct SpriteTemplate gUnknown_085F528C = { +static const struct SpriteTemplate gUnknown_085F528C = +{ 1004, 1004, &gUnknown_085F526C, gUnknown_085F5284, NULL, gDummySpriteAffineAnimTable, nullsub_66 }; -static const struct SpriteTemplate gUnknown_085F52A4 = { +static const struct SpriteTemplate gUnknown_085F52A4 = +{ 1005, 1005, &gUnknown_085F526C, gUnknown_085F5284, NULL, gDummySpriteAffineAnimTable, nullsub_66 }; -const struct CompressedSpriteSheet gIntro2BrendanSpriteSheet[] = { +const struct CompressedSpriteSheet gIntro2BrendanSpriteSheet[] = +{ { gIntro2BrendanNoTurnGfx, 0x2000, 1002 }, { NULL } }; -const struct CompressedSpriteSheet gIntro2MaySpriteSheet[] = { +const struct CompressedSpriteSheet gIntro2MaySpriteSheet[] = +{ { gIntro2MayNoTurnGfx, 0x2000, 1003 }, { NULL } }; -const struct CompressedSpriteSheet gIntro2BicycleSpriteSheet[] = { +const struct CompressedSpriteSheet gIntro2BicycleSpriteSheet[] = +{ { gIntro2BicycleTiles, 0x1000, 1001 }, { NULL } }; -static const struct CompressedSpriteSheet gUnknown_085F52EC[] = { +static const struct CompressedSpriteSheet gUnknown_085F52EC[] = +{ { gIntro2FlygonGfx, 0x1000, 1004 }, { NULL } }; -const struct CompressedSpriteSheet gIntro2FlygonSpriteSheet[] = { +const struct CompressedSpriteSheet gIntro2FlygonSpriteSheet[] = +{ { gIntro2FlygonGfx, 0x1000, 1005 }, { NULL } }; -const struct SpritePalette gIntroBikeAndFlygonPalette[] = { +const struct SpritePalette gIntroBikeAndFlygonPalette[] = +{ { gIntro2BrendanNoTurnPal, 1002 }, { gIntro2BrendanNoTurnPal, 1003 }, { gIntro2FlygonPal, 1004 }, @@ -277,32 +326,38 @@ const struct SpritePalette gIntroBikeAndFlygonPalette[] = { { NULL } }; -const struct CompressedSpriteSheet gUnknown_085F5334[] = { +const struct CompressedSpriteSheet gUnknown_085F5334[] = +{ { gIntro2BrendanTiles, 0x3800, 1002 }, { NULL } }; -const struct CompressedSpriteSheet gUnknown_085F5344[] = { +const struct CompressedSpriteSheet gUnknown_085F5344[] = +{ { gIntro2MayTiles, 0x3800, 1003 }, { NULL } }; -const struct CompressedSpriteSheet gUnknown_085F5354[] = { +const struct CompressedSpriteSheet gUnknown_085F5354[] = +{ { gIntro2BicycleTiles, 0x1000, 1001 }, { NULL } }; -static const struct CompressedSpriteSheet gUnknown_085F5364[] = { +static const struct CompressedSpriteSheet gUnknown_085F5364[] = +{ { gIntro2LatiosTiles, 0x1000, 1004 }, { NULL } }; -static const struct CompressedSpriteSheet gUnknown_085F5374[] = { +static const struct CompressedSpriteSheet gUnknown_085F5374[] = +{ { gIntro2LatiasTiles, 0x1000, 1005 }, { NULL } }; -const struct SpritePalette gUnknown_085F5384[] = { +const struct SpritePalette gUnknown_085F5384[] = +{ { gIntro2BrendanPalette, 1002 }, { gIntro2MayPalette, 1003 }, { gIntro2LatiosPalette, 1004 }, @@ -310,12 +365,14 @@ const struct SpritePalette gUnknown_085F5384[] = { { NULL } }; -const struct CompressedSpriteSheet gUnknown_085F53AC[] = { +const struct CompressedSpriteSheet gUnknown_085F53AC[] = +{ { gIntro2BrendanTiles, 0x2000, 1002}, { NULL } }; -const struct CompressedSpriteSheet gUnknown_085F53BC[] = { +const struct CompressedSpriteSheet gUnknown_085F53BC[] = +{ { gIntro2MayTiles, 0x2000, 1003}, { NULL } }; diff --git a/src/item_icon.c b/src/item_icon.c index e9379dbba9..7bf1a29ca8 100644 --- a/src/item_icon.c +++ b/src/item_icon.c @@ -20,10 +20,10 @@ static const struct OamData sOamData_ItemIcon = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 1, .paletteNum = 2, diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index 669195b33b..83ed3abfe4 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -36,10 +36,10 @@ static const struct OamData sOamData_857FAA4 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -146,10 +146,10 @@ static const struct OamData sOamData_857FB64 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 4, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -217,10 +217,10 @@ static const struct OamData sOamData_857FBC8 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 1, .paletteNum = 7, @@ -234,10 +234,10 @@ static const struct OamData sOamData_857FBD0 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 0, .paletteNum = 7, @@ -374,10 +374,10 @@ static const struct OamData sOamData_857FDFC = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 1, .paletteNum = 0, diff --git a/src/link_rfu.c b/src/link_rfu.c index d80ff2ae91..a557397f07 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -155,7 +155,8 @@ const u8 sWireless_RSEtoASCIITable[] = { 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00 }; const struct OamData sWirelessStatusIndicatorOamData = { - .size = 1 + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16) }; static const union AnimCmd sWirelessStatusIndicatorAnim0[] = { // 3 bars diff --git a/src/list_menu.c b/src/list_menu.c index 51d7dcb15a..a5786754c9 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -129,10 +129,10 @@ static const struct OamData sOamData_ScrollArrowIndicator = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -186,8 +186,8 @@ static const struct Subsprite sSubsprite_RedOutline1 = { .x = 0, .y = 0, - .shape = 0, - .size = 0, + .shape = SPRITE_SHAPE(8x8), + .size = SPRITE_SIZE(8x8), .tileOffset = 0, .priority = 0, }; @@ -196,8 +196,8 @@ static const struct Subsprite sSubsprite_RedOutline2 = { .x = 0, .y = 0, - .shape = 0, - .size = 0, + .shape = SPRITE_SHAPE(8x8), + .size = SPRITE_SIZE(8x8), .tileOffset = 1, .priority = 0, }; @@ -206,8 +206,8 @@ static const struct Subsprite sSubsprite_RedOutline3 = { .x = 0, .y = 0, - .shape = 0, - .size = 0, + .shape = SPRITE_SHAPE(8x8), + .size = SPRITE_SIZE(8x8), .tileOffset = 2, .priority = 0, }; @@ -216,8 +216,8 @@ static const struct Subsprite sSubsprite_RedOutline4 = { .x = 0, .y = 0, - .shape = 0, - .size = 0, + .shape = SPRITE_SHAPE(8x8), + .size = SPRITE_SIZE(8x8), .tileOffset = 3, .priority = 0, }; @@ -226,8 +226,8 @@ static const struct Subsprite sSubsprite_RedOutline5 = { .x = 0, .y = 0, - .shape = 0, - .size = 0, + .shape = SPRITE_SHAPE(8x8), + .size = SPRITE_SIZE(8x8), .tileOffset = 4, .priority = 0, }; @@ -236,8 +236,8 @@ static const struct Subsprite sSubsprite_RedOutline6 = { .x = 0, .y = 0, - .shape = 0, - .size = 0, + .shape = SPRITE_SHAPE(8x8), + .size = SPRITE_SIZE(8x8), .tileOffset = 5, .priority = 0, }; @@ -246,8 +246,8 @@ static const struct Subsprite sSubsprite_RedOutline7 = { .x = 0, .y = 0, - .shape = 0, - .size = 0, + .shape = SPRITE_SHAPE(8x8), + .size = SPRITE_SIZE(8x8), .tileOffset = 6, .priority = 0, }; @@ -256,8 +256,8 @@ static const struct Subsprite sSubsprite_RedOutline8 = { .x = 0, .y = 0, - .shape = 0, - .size = 0, + .shape = SPRITE_SHAPE(8x8), + .size = SPRITE_SIZE(8x8), .tileOffset = 7, .priority = 0, }; @@ -269,10 +269,10 @@ static const struct OamData sOamData_RedArrowCursor = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 0, .paletteNum = 0, diff --git a/src/menu_helpers.c b/src/menu_helpers.c index 3fb5ca40db..b5745d812d 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -37,10 +37,10 @@ static const struct OamData sOamData_859F4E8 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 0, .paletteNum = 0, diff --git a/src/mirage_tower.c b/src/mirage_tower.c index 4f5834db1e..898180df47 100644 --- a/src/mirage_tower.c +++ b/src/mirage_tower.c @@ -142,10 +142,10 @@ static const struct OamData gOamData_8617DF4 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 0, .paletteNum = 3, @@ -192,10 +192,10 @@ static const struct OamData sCeilingCrumble2OamData = .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = ST_OAM_SQUARE, + .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x8), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -230,10 +230,10 @@ static const struct OamData sCeilingCrumble1OamData = .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = ST_OAM_SQUARE, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 0, .paletteNum = 0, diff --git a/src/mon_markings.c b/src/mon_markings.c index 48f0f5ecb6..f8b1280455 100644 --- a/src/mon_markings.c +++ b/src/mon_markings.c @@ -30,10 +30,10 @@ static const struct OamData gUnknown_0859EE7C = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -47,10 +47,10 @@ static const struct OamData gUnknown_0859EE84 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x8), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -156,10 +156,10 @@ static const struct OamData gUnknown_0859EF1C = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(32x8), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(32x8), .tileNum = 0, .priority = 0, .paletteNum = 0, diff --git a/src/money.c b/src/money.c index 4ff8086ead..7b95a75aba 100644 --- a/src/money.c +++ b/src/money.c @@ -24,10 +24,10 @@ static const struct OamData sOamData_MoneyLabel = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(32x16), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x16), .tileNum = 0, .priority = 0, .paletteNum = 0, diff --git a/src/naming_screen.c b/src/naming_screen.c index 22bbb84d71..75b7c85661 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1910,10 +1910,10 @@ const struct OamData gOamData_858BFEC = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x8), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -1927,10 +1927,10 @@ const struct OamData gOamData_858BFF4 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -1944,10 +1944,10 @@ const struct OamData gOamData_858BFFC = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(32x16), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x16), .tileNum = 0, .priority = 0, .paletteNum = 0, diff --git a/src/party_menu.c b/src/party_menu.c index ec35fc068f..bedd0ce57f 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -1175,10 +1175,10 @@ static const struct OamData gOamData_83765EC = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x8), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -1231,10 +1231,10 @@ static const struct OamData sOamData_8615ED8 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -1287,10 +1287,10 @@ static const struct OamData sOamData_8615F20 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -1366,10 +1366,10 @@ static const struct OamData sOamData_8615F90 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(32x8), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(32x8), .tileNum = 0, .priority = 1, .paletteNum = 0, diff --git a/src/pokeball.c b/src/pokeball.c index d4605ccd83..793609ec28 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -99,10 +99,10 @@ static const struct OamData sBallOamData = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 2, .paletteNum = 0, diff --git a/src/pokeblock.c b/src/pokeblock.c index 2682754aa2..ee18d02512 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -222,10 +222,10 @@ static const struct OamData sOamData_PokeblockCase = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 2, .paletteNum = 0, diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index da803f4549..59ba1b4dcb 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -463,10 +463,10 @@ static const struct OamData sThrownPokeblockOamData = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x8), .tileNum = 0, .priority = 1, .paletteNum = 0, diff --git a/src/pokedex.c b/src/pokedex.c index 4bf8dff6db..cceb50ba13 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -248,10 +248,10 @@ static const struct OamData sOamData_855CFE4 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = ST_OAM_SQUARE, + .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x8), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -265,10 +265,10 @@ static const struct OamData sOamData_855CFEC = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = ST_OAM_H_RECTANGLE, + .shape = SPRITE_SHAPE(16x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(16x8), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -282,10 +282,10 @@ static const struct OamData sOamData_855CFF4 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = ST_OAM_H_RECTANGLE, + .shape = SPRITE_SHAPE(32x16), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x16), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -299,10 +299,10 @@ static const struct OamData sOamData_855CFFC = .objMode = 2, .mosaic = 0, .bpp = 0, - .shape = ST_OAM_SQUARE, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -316,10 +316,10 @@ static const struct OamData sOamData_855D004 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = ST_OAM_H_RECTANGLE, + .shape = SPRITE_SHAPE(64x32), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x32), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -333,10 +333,10 @@ static const struct OamData sOamData_855D00C = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = ST_OAM_V_RECTANGLE, + .shape = SPRITE_SHAPE(8x16), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x16), .tileNum = 0, .priority = 0, .paletteNum = 0, diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c index eeea3c2100..00fe9ab823 100755 --- a/src/pokedex_area_screen.c +++ b/src/pokedex_area_screen.c @@ -83,14 +83,21 @@ static const u32 sAreaGlow_Gfx[] = INCBIN_U32("graphics/pokedex/area_glow.4bpp.l static const u16 sSpeciesHiddenFromAreaScreen[] = { SPECIES_WYNAUT }; -static const u16 sMovingRegionMapSections[3] = { MAPSEC_MARINE_CAVE, MAPSEC_UNDERWATER_MARINE_CAVE, MAPSEC_TERRA_CAVE }; +static const u16 sMovingRegionMapSections[3] = +{ + MAPSEC_MARINE_CAVE, + MAPSEC_UNDERWATER_MARINE_CAVE, + MAPSEC_TERRA_CAVE +}; -static const u16 sFeebasData[][3] = { +static const u16 sFeebasData[][3] = +{ {SPECIES_FEEBAS, MAP_GROUP(ROUTE119), MAP_NUM(ROUTE119)}, {NUM_SPECIES} }; -static const u16 sLandmarkData[][2] = { +static const u16 sLandmarkData[][2] = +{ {MAPSEC_SKY_PILLAR, FLAG_LANDMARK_SKY_PILLAR}, {MAPSEC_SEAFLOOR_CAVERN, FLAG_LANDMARK_SEAFLOOR_CAVERN}, {MAPSEC_ALTERING_CAVE_2, FLAG_LANDMARK_ALTERING_CAVE}, @@ -100,7 +107,8 @@ static const u16 sLandmarkData[][2] = { {MAPSEC_NONE} }; -static const u8 sAreaGlowTilemapMapping[] = { +static const u8 sAreaGlowTilemapMapping[] = +{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x11, 0x20, 0x02, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x12, 0x21, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, @@ -119,7 +127,8 @@ static const u8 sAreaGlowTilemapMapping[] = { 0x1f, 0x22, 0x25, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, }; -static const struct UnkStruct_1C4D70 sUnknown_085B4018 = { +static const struct UnkStruct_1C4D70 sUnknown_085B4018 = +{ .bg = 3, .unk2 = 0, .unk10 = 0, @@ -127,21 +136,26 @@ static const struct UnkStruct_1C4D70 sUnknown_085B4018 = { }; static const u8 sAreaMarkerTiles[]; -static const struct SpriteSheet sAreaMarkerSpriteSheet = { +static const struct SpriteSheet sAreaMarkerSpriteSheet = +{ sAreaMarkerTiles, 0x80, 2 }; static const u16 sAreaMarkerPalette[]; -static const struct SpritePalette sAreaMarkerSpritePalette = { +static const struct SpritePalette sAreaMarkerSpritePalette = +{ sAreaMarkerPalette, 2 }; -static const struct OamData sAreaMarkerOamData = { - .size = 1, +static const struct OamData sAreaMarkerOamData = +{ + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), .priority = 1 }; -static const struct SpriteTemplate sAreaMarkerSpriteTemplate = { +static const struct SpriteTemplate sAreaMarkerSpriteTemplate = +{ 2, 2, &sAreaMarkerOamData, @@ -154,16 +168,20 @@ static const struct SpriteTemplate sAreaMarkerSpriteTemplate = { static const u16 sAreaMarkerPalette[] = INCBIN_U16("graphics/pokedex/area_marker.gbapal"); static const u8 sAreaMarkerTiles[] = INCBIN_U8("graphics/pokedex/area_marker.4bpp"); -static const struct SpritePalette sAreaUnknownSpritePalette = { +static const struct SpritePalette sAreaUnknownSpritePalette = +{ gPokedexAreaScreenAreaUnknown_Pal, 3 }; -static const struct OamData sAreaUnknownOamData = { - .size = 2, +static const struct OamData sAreaUnknownOamData = +{ + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), .priority = 1 }; -static const struct SpriteTemplate sAreaUnknownSpriteTemplate = { +static const struct SpriteTemplate sAreaUnknownSpriteTemplate = +{ 3, 3, &sAreaUnknownOamData, diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c index c385141d53..8ca0c8d6e7 100755 --- a/src/pokedex_cry_screen.c +++ b/src/pokedex_cry_screen.c @@ -54,7 +54,8 @@ const u16 gUnknown_085B8378[] = INCBIN_U16("graphics/pokedex/cry_meter_map.bin") const u16 gUnknown_085B8418[] = INCBIN_U16("graphics/pokedex/cry_meter.gbapal"); const u8 gUnknown_085B8438[] = INCBIN_U8("graphics/pokedex/cry_meter.4bpp.lz"); -const u16 gUnknown_085B8770[][72] = { +const u16 gUnknown_085B8770[][72] = +{ { 0x0000, 0x0004, 0x0008, 0x000C, 0x0010, 0x0014, 0x0018, 0x001C, 0x0400, 0x0404, 0x0408, 0x040C, 0x0410, 0x0414, 0x0418, 0x041C, @@ -142,7 +143,8 @@ const u16 gUnknown_085B8BF0[] = INCBIN_U16("graphics/pokedex/85B8C10.gbapal"); const u8 gUnknown_085B8C10[] = INCBIN_U8("graphics/pokedex/85B8C10.4bpp"); const u8 gUnknown_085B8C30[] = {0xF0, 0x0F}; -const u8 gUnknown_085B8C32[][16] = { +const u8 gUnknown_085B8C32[][16] = +{ { 0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F @@ -152,23 +154,28 @@ const u8 gUnknown_085B8C32[][16] = { } }; -const union AnimCmd gSpriteAnim_85B8C54[] = { +const union AnimCmd gSpriteAnim_85B8C54[] = +{ ANIMCMD_FRAME(0, 30), ANIMCMD_END }; -const union AnimCmd *const gSpriteAnimTable_85B8C5C[] = { +const union AnimCmd *const gSpriteAnimTable_85B8C5C[] = +{ gSpriteAnim_85B8C54 }; -const struct OamData gOamData_85B8C60 = { +const struct OamData gOamData_85B8C60 = +{ .y = 160, .affineMode = ST_OAM_AFFINE_NORMAL, - .size = 3, + .shape = SPRITE_SHAPE(64x64), + .size = SPRITE_SIZE(64x64), .priority = 1 }; -const struct SpriteTemplate gUnknown_085B8C68 = { +const struct SpriteTemplate gUnknown_085B8C68 = +{ 0x2000, 0x2000, &gOamData_85B8C60, @@ -178,12 +185,14 @@ const struct SpriteTemplate gUnknown_085B8C68 = { sub_814596C }; -const struct SpriteSheet gCryMeterNeedleSpriteSheets[] = { +const struct SpriteSheet gCryMeterNeedleSpriteSheets[] = +{ {CryMeterNeedleTiles, 0x800, 0x2000}, {} }; -const struct SpritePalette gCryMeterNeedleSpritePalettes[] = { +const struct SpritePalette gCryMeterNeedleSpritePalettes[] = +{ {CryMeterNeedlePalette, 0x2000}, {} }; diff --git a/src/pokemon.c b/src/pokemon.c index a984abbb98..1ee9c4cffd 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2462,10 +2462,10 @@ static const struct OamData sOamData_8329F20 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 0, .paletteNum = 0, diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index ecb8f4950f..4ff182a0ec 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -931,10 +931,10 @@ const struct OamData sMonIconOamData = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 1, .paletteNum = 0, diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index c5d40877b3..30f5af14cf 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -969,10 +969,10 @@ static const struct OamData sOamData_857286C = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -986,10 +986,10 @@ static const struct OamData sOamData_8572874 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(16x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(16x8), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -1062,10 +1062,10 @@ static const struct OamData sOamData_85728EC = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -1467,8 +1467,8 @@ static const struct SpriteSheet gUnknown_0857B080 = {gPCGfx_Arrow, 0x80, 6}; static const struct OamData gOamData_83BB298 = { - .shape = ST_OAM_H_RECTANGLE, - .size = 2, + .shape = SPRITE_SHAPE(32x16), + .size = SPRITE_SIZE(32x16), .priority = 2 }; @@ -1503,7 +1503,8 @@ static const struct SpriteTemplate gSpriteTemplate_857B0A8 = static const struct OamData gOamData_83BB2D0 = { - .shape = ST_OAM_V_RECTANGLE, + .shape = SPRITE_SHAPE(8x16), + .size = SPRITE_SIZE(8x16), .priority = 2 }; @@ -2004,7 +2005,7 @@ static void sub_80C7958(u8 curBox) u8 spriteId; struct SpriteTemplate template; struct OamData oamData = {}; - oamData.size = 3; + oamData.size = SPRITE_SIZE(64x64); oamData.paletteNum = 1; template = (struct SpriteTemplate){ 0, 0, &oamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy @@ -2017,8 +2018,8 @@ static void sub_80C7958(u8 curBox) spriteId = CreateSprite(&template, 160, 96, 0); gUnknown_02039D04->unk_0000 = gSprites + spriteId; - oamData.shape = ST_OAM_V_RECTANGLE; - oamData.size = 1; + oamData.shape = SPRITE_SHAPE(8x32); + oamData.size = SPRITE_SIZE(8x32); template.tileTag = gUnknown_02039D04->unk_0240 + 1; template.anims = sSpriteAnimTable_8571710; for (i = 0; i < 4; i++) @@ -8490,12 +8491,14 @@ static void sub_80CFC14(void) static const struct OamData sOamData_857BA0C = { - .size = 2, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), .priority = 1, }; static const struct OamData sOamData_857BA14 = { - .size = 1, + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), .priority = 1, }; @@ -9358,10 +9361,10 @@ static const struct OamData sOamData_857BBA4 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 1, .paletteNum = 0, diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 3bbc832a07..3a5b06d45f 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -710,10 +710,10 @@ static const struct OamData sOamData_MoveTypes = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(32x16), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x16), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -886,10 +886,10 @@ static const struct OamData gOamData_861CFF4 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -975,10 +975,10 @@ static const struct OamData sOamData_StatusCondition = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(32x8), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(32x8), .tileNum = 0, .priority = 3, .paletteNum = 0, diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c index 00a73a0a20..e2497a8dcd 100644 --- a/src/rayquaza_scene.c +++ b/src/rayquaza_scene.c @@ -105,10 +105,10 @@ static const struct OamData sOamData_862A6BC = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -122,10 +122,10 @@ static const struct OamData sOamData_862A6C4 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -139,10 +139,10 @@ static const struct OamData sOamData_862A6CC = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(64x32), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x32), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -156,10 +156,10 @@ static const struct OamData sOamData_862A6D4 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(32x16), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x16), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -173,10 +173,10 @@ static const struct OamData sOamData_862A6DC = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(16x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(16x8), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -190,10 +190,10 @@ static const struct OamData sOamData_862A6E4 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 2, + .shape = SPRITE_SHAPE(16x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(16x32), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -207,10 +207,10 @@ static const struct OamData sOamData_862A6EC = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -224,10 +224,10 @@ static const struct OamData sOamData_862A6F4 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(32x8), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(32x8), .tileNum = 0, .priority = 2, .paletteNum = 0, diff --git a/src/region_map.c b/src/region_map.c index 8dadc78a77..a8b3fc3b2e 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -106,7 +106,8 @@ static const u8 sRegionMap_MapSectionLayout[] = INCBIN_U8("graphics/pokenav/regi #include "data/region_map/region_map_entries.h" -static const u16 sRegionMap_SpecialPlaceLocations[][2] = { +static const u16 sRegionMap_SpecialPlaceLocations[][2] = +{ {MAPSEC_UNDERWATER_TERRA_CAVE, MAPSEC_ROUTE_105}, {MAPSEC_UNDERWATER_124, MAPSEC_ROUTE_124}, {MAPSEC_UNDERWATER_UNK1, MAPSEC_ROUTE_129}, @@ -133,13 +134,15 @@ static const u16 sRegionMap_SpecialPlaceLocations[][2] = { {MAPSEC_NONE, MAPSEC_NONE} }; -static const u16 sRegionMap_MarineCaveMapSecIds[] = { +static const u16 sRegionMap_MarineCaveMapSecIds[] = +{ MAPSEC_MARINE_CAVE, MAPSEC_UNDERWATER_MARINE_CAVE, MAPSEC_UNDERWATER_MARINE_CAVE }; -static const u16 sTerraCaveMapSectionIds[] = { +static const u16 sTerraCaveMapSectionIds[] = +{ MAPSEC_ROUTE_114, MAPSEC_ROUTE_114, MAPSEC_ROUTE_115, @@ -158,7 +161,8 @@ static const u16 sTerraCaveMapSectionIds[] = { MAPSEC_ROUTE_129 }; -static const struct UCoords16 sTerraCaveLocationCoords[] = { +static const struct UCoords16 sTerraCaveLocationCoords[] = +{ {0x00, 0x0a}, {0x00, 0x0c}, {0x18, 0x03}, @@ -169,21 +173,27 @@ static const struct UCoords16 sTerraCaveLocationCoords[] = { {0x18, 0x0a} }; -static const u8 sRegionMap_MapSecAquaHideoutOld[] = { +static const u8 sRegionMap_MapSecAquaHideoutOld[] = +{ MAPSEC_AQUA_HIDEOUT_OLD }; -static const struct OamData sRegionMapCursorOam = { - .size = 1, .priority = 1 +static const struct OamData sRegionMapCursorOam = +{ + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), + .priority = 1 }; -static const union AnimCmd sRegionMapCursorAnim1[] = { +static const union AnimCmd sRegionMapCursorAnim1[] = +{ ANIMCMD_FRAME(0, 20), ANIMCMD_FRAME(4, 20), ANIMCMD_JUMP(0) }; -static const union AnimCmd sRegionMapCursorAnim2[] = { +static const union AnimCmd sRegionMapCursorAnim2[] = +{ ANIMCMD_FRAME( 0, 10), ANIMCMD_FRAME(16, 10), ANIMCMD_FRAME(32, 10), @@ -191,37 +201,49 @@ static const union AnimCmd sRegionMapCursorAnim2[] = { ANIMCMD_JUMP(0) }; -static const union AnimCmd *const sRegionMapCursorAnimTable[] = { +static const union AnimCmd *const sRegionMapCursorAnimTable[] = +{ sRegionMapCursorAnim1, sRegionMapCursorAnim2 }; -static const struct SpritePalette sRegionMapCursorSpritePalette = { sRegionMapCursorPal, 0 }; - -static const struct SpriteTemplate sRegionMapCursorSpriteTemplate = { - 0, - 0, - &sRegionMapCursorOam, - sRegionMapCursorAnimTable, - NULL, - gDummySpriteAffineAnimTable, - SpriteCallback_CursorFull +static const struct SpritePalette sRegionMapCursorSpritePalette = +{ + .data = sRegionMapCursorPal, + .tag = 0 }; -static const struct OamData sRegionMapPlayerIconOam = { - .size = 1, .priority = 2 +static const struct SpriteTemplate sRegionMapCursorSpriteTemplate = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &sRegionMapCursorOam, + .anims = sRegionMapCursorAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallback_CursorFull }; -static const union AnimCmd sRegionMapPlayerIconAnim1[] = { +static const struct OamData sRegionMapPlayerIconOam = +{ + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), + .priority = 2 +}; + +static const union AnimCmd sRegionMapPlayerIconAnim1[] = +{ ANIMCMD_FRAME(0, 5), ANIMCMD_END }; -static const union AnimCmd *const sRegionMapPlayerIconAnimTable[] = { +static const union AnimCmd *const sRegionMapPlayerIconAnimTable[] = +{ sRegionMapPlayerIconAnim1 }; -static const u8 sRegionMapEventSectionIds[] = { +static const u8 sRegionMapEventSectionIds[] = +{ MAPSEC_BIRTH_ISLAND_2, MAPSEC_FARAWAY_ISLAND, MAPSEC_NAVEL_ROCK2 @@ -237,7 +259,8 @@ static const u16 Unknown_085A1D48[] = INCBIN_U16("graphics/pokenav/fly_target_ic static const u32 sUnknown_085A1D68[] = INCBIN_U32("graphics/pokenav/fly_target_icons.4bpp.lz"); -static const u8 sMapHealLocations[][3] = { +static const u8 sMapHealLocations[][3] = +{ {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F}, {MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), HEAL_LOCATION_OLDALE_TOWN}, {MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), HEAL_LOCATION_DEWFORD_TOWN}, @@ -290,83 +313,154 @@ static const u8 sMapHealLocations[][3] = { {MAP_GROUP(ROUTE134), MAP_NUM(ROUTE134), 0} }; -static const u8 *const gUnknown_085A1ED4[] = { +static const u8 *const gUnknown_085A1ED4[] = +{ gText_PokemonLeague, gText_PokemonCenter }; -static const struct { +static const struct +{ const u8 *const *name; u16 mapSecId; u16 flag; -} gUnknown_085A1EDC[] = { +} +gUnknown_085A1EDC[] = +{ gUnknown_085A1ED4, MAPSEC_EVER_GRANDE_CITY, FLAG_LANDMARK_POKEMON_LEAGUE }; -static const struct BgTemplate gUnknown_085A1EE4[] = { - { .bg = 0, .charBaseIndex = 0, .mapBaseIndex = 31, .screenSize = 0, .paletteMode = 0, .priority = 0 }, - { .bg = 1, .charBaseIndex = 3, .mapBaseIndex = 30, .screenSize = 0, .paletteMode = 0, .priority = 1 }, - { .bg = 2, .charBaseIndex = 2, .mapBaseIndex = 28, .screenSize = 2, .paletteMode = 1, .priority = 2 } +static const struct BgTemplate gUnknown_085A1EE4[] = +{ + { + .bg = 0, + .charBaseIndex = 0, + .mapBaseIndex = 31, + .screenSize = 0, + .paletteMode = 0, + .priority = 0 + }, + { + .bg = 1, + .charBaseIndex = 3, + .mapBaseIndex = 30, + .screenSize = 0, + .paletteMode = 0, + .priority = 1 + }, + { + .bg = 2, + .charBaseIndex = 2, + .mapBaseIndex = 28, + .screenSize = 2, + .paletteMode = 1, + .priority = 2 + } }; -static const struct WindowTemplate gUnknown_085A1EF0[] = { - { 0, 17, 17, 12, 2, 15, 0x01 }, - { 0, 17, 15, 12, 4, 15, 0x19 }, - { 0, 1, 18, 14, 2, 15, 0x49 }, +static const struct WindowTemplate gUnknown_085A1EF0[] = +{ + { + .bg = 0, + .tilemapLeft = 17, + .tilemapTop = 17, + .width = 12, + .height = 2, + .paletteNum = 15, + .baseBlock = 0x01 + }, + { + .bg = 0, + .tilemapLeft = 17, + .tilemapTop = 15, + .width = 12, + .height = 4, + .paletteNum = 15, + .baseBlock = 0x19 + }, + { + .bg = 0, + .tilemapLeft = 1, + .tilemapTop = 18, + .width = 14, + .height = 2, + .paletteNum = 15, + .baseBlock = 0x49 + }, DUMMY_WIN_TEMPLATE }; -static const struct SpritePalette gUnknown_085A1F10 = { - Unknown_085A1D48, 2 +static const struct SpritePalette gUnknown_085A1F10 = +{ + .data = Unknown_085A1D48, + .tag = 2 }; -static const u16 sUnknown_085A1F18[][2] = { - {FLAG_LANDMARK_BATTLE_FRONTIER, MAPSEC_BATTLE_FRONTIER}, - {-1, MAPSEC_NONE} +static const u16 sUnknown_085A1F18[][2] = +{ + { + FLAG_LANDMARK_BATTLE_FRONTIER, + MAPSEC_BATTLE_FRONTIER + }, + { + -1, + MAPSEC_NONE + } }; -static const struct OamData gOamData_085A1F20 = { +static const struct OamData gOamData_085A1F20 = +{ + .shape = SPRITE_SHAPE(8x8), + .size = SPRITE_SIZE(8x8), .priority = 2 }; -static const union AnimCmd gUnknown_085A1F28[] = { +static const union AnimCmd gUnknown_085A1F28[] = +{ ANIMCMD_FRAME( 0, 5), ANIMCMD_END }; -static const union AnimCmd gUnknown_085A1F30[] = { +static const union AnimCmd gUnknown_085A1F30[] = +{ ANIMCMD_FRAME( 1, 5), ANIMCMD_END }; -static const union AnimCmd gUnknown_085A1F38[] = { +static const union AnimCmd gUnknown_085A1F38[] = +{ ANIMCMD_FRAME( 3, 5), ANIMCMD_END }; -static const union AnimCmd gUnknown_085A1F40[] = { +static const union AnimCmd gUnknown_085A1F40[] = +{ ANIMCMD_FRAME( 5, 5), ANIMCMD_END }; -static const union AnimCmd gUnknown_085A1F48[] = { +static const union AnimCmd gUnknown_085A1F48[] = +{ ANIMCMD_FRAME( 6, 5), ANIMCMD_END }; -static const union AnimCmd gUnknown_085A1F50[] = { +static const union AnimCmd gUnknown_085A1F50[] = +{ ANIMCMD_FRAME( 8, 5), ANIMCMD_END }; -static const union AnimCmd gUnknown_085A1F58[] = { +static const union AnimCmd gUnknown_085A1F58[] = +{ ANIMCMD_FRAME(10, 5), ANIMCMD_END }; -static const union AnimCmd *const gUnknown_085A1F60[] = { +static const union AnimCmd *const gUnknown_085A1F60[] = +{ gUnknown_085A1F28, gUnknown_085A1F30, gUnknown_085A1F38, @@ -376,14 +470,15 @@ static const union AnimCmd *const gUnknown_085A1F60[] = { gUnknown_085A1F58 }; -static const struct SpriteTemplate gUnknown_085A1F7C = { - 2, - 2, - &gOamData_085A1F20, - gUnknown_085A1F60, - NULL, - gDummySpriteAffineAnimTable, - SpriteCallbackDummy +static const struct SpriteTemplate gUnknown_085A1F7C = +{ + .tileTag = 2, + .paletteTag = 2, + .oam = &gOamData_085A1F20, + .anims = gUnknown_085A1F60, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy }; // .text diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index ce9f5b98b3..6ee757607b 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -108,10 +108,10 @@ static const struct OamData sOamData_08510464 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x8), .tileNum = 0, .priority = 0, .paletteNum = 0, diff --git a/src/rotating_gate.c b/src/rotating_gate.c index 3513f092e1..44d291dc4c 100644 --- a/src/rotating_gate.c +++ b/src/rotating_gate.c @@ -236,10 +236,10 @@ static const struct OamData sOamData_RotatingGateLarge = .objMode = 0, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = ST_OAM_SQUARE, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 2, .paletteNum = 2, @@ -253,10 +253,10 @@ static const struct OamData sOamData_RotatingGateRegular = .objMode = 0, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = ST_OAM_SQUARE, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 2, .paletteNum = 2, diff --git a/src/roulette.c b/src/roulette.c index 05d5006f0e..5c08c99a08 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -2311,18 +2311,18 @@ static const u32 RouletteCursorTiles[] = INCBIN_U32("graphics/roulette/cursor.4b static const struct SpritePalette gUnknown_085B7384[] = { - { RouletteSpritePalette_01, 1 }, - { RouletteSpritePalette_02, 2 }, - { RouletteSpritePalette_03, 3 }, - { RouletteSpritePalette_04, 4 }, - { RouletteSpritePalette_05, 5 }, - { RouletteSpritePalette_06, 6 }, - { RouletteSpritePalette_07, 7 }, - { RouletteSpritePalette_08, 8 }, - { RouletteSpritePalette_09, 9 }, - { RouletteSpritePalette_10, 10 }, - { RouletteSpritePalette_11, 11 }, - { RouletteSpritePalette_12, 12 }, + { .data = RouletteSpritePalette_01, .tag = 1 }, + { .data = RouletteSpritePalette_02, .tag = 2 }, + { .data = RouletteSpritePalette_03, .tag = 3 }, + { .data = RouletteSpritePalette_04, .tag = 4 }, + { .data = RouletteSpritePalette_05, .tag = 5 }, + { .data = RouletteSpritePalette_06, .tag = 6 }, + { .data = RouletteSpritePalette_07, .tag = 7 }, + { .data = RouletteSpritePalette_08, .tag = 8 }, + { .data = RouletteSpritePalette_09, .tag = 9 }, + { .data = RouletteSpritePalette_10, .tag = 10 }, + { .data = RouletteSpritePalette_11, .tag = 11 }, + { .data = RouletteSpritePalette_12, .tag = 12 }, {} }; @@ -2330,8 +2330,8 @@ static const struct OamData gOamData_85B73EC = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_SQUARE, - .size = 2, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), .priority = 1, }; @@ -2339,8 +2339,8 @@ static const struct OamData gOamData_85B73F4 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_SQUARE, - .size = 1, + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), .priority = 1, }; @@ -2349,35 +2349,41 @@ static const struct OamData gOamData_85B73FC = .y = 60, .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_V_RECTANGLE, - .size = 2, + .shape = SPRITE_SHAPE(16x32), + .size = SPRITE_SIZE(16x32), .priority = 2, }; -static const union AnimCmd gSpriteAnim_85B7404[] = { +static const union AnimCmd gSpriteAnim_85B7404[] = +{ ANIMCMD_FRAME(0, 0), ANIMCMD_END }; -static const union AnimCmd *const gSpriteAnimTable_85B740C[] = { +static const union AnimCmd *const gSpriteAnimTable_85B740C[] = +{ gSpriteAnim_85B7404 }; -static const union AffineAnimCmd gSpriteAffineAnim_85B7410[] = { +static const union AffineAnimCmd gSpriteAffineAnim_85B7410[] = +{ AFFINEANIMCMD_END }; -static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7418[] = { +static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7418[] = +{ gSpriteAffineAnim_85B7410 }; -static const struct CompressedSpriteSheet gUnknown_085B741C = { +static const struct CompressedSpriteSheet gUnknown_085B741C = +{ .data = RoulettePokeIcons2Tiles, .size = 0xC00, .tag = 0 }; -static const union AnimCmd gSpriteAnim_85B7420[] = { +static const union AnimCmd gSpriteAnim_85B7420[] = +{ ANIMCMD_FRAME(0, 0), ANIMCMD_FRAME(32, 0), ANIMCMD_FRAME(64, 0), @@ -2393,67 +2399,82 @@ static const union AnimCmd gSpriteAnim_85B7420[] = { ANIMCMD_END }; -static const union AnimCmd *const gSpriteAnimTable_85B7458[] = { +static const union AnimCmd *const gSpriteAnimTable_85B7458[] = +{ &gSpriteAnim_85B7420[0] }; -static const union AnimCmd *const gSpriteAnimTable_85B745C[] = { +static const union AnimCmd *const gSpriteAnimTable_85B745C[] = +{ &gSpriteAnim_85B7420[1] }; -static const union AnimCmd *const gSpriteAnimTable_85B7460[] = { +static const union AnimCmd *const gSpriteAnimTable_85B7460[] = +{ &gSpriteAnim_85B7420[2] }; -static const union AnimCmd *const gSpriteAnimTable_85B7464[] = { +static const union AnimCmd *const gSpriteAnimTable_85B7464[] = +{ &gSpriteAnim_85B7420[3] }; -static const union AnimCmd *const gSpriteAnimTable_85B7468[] = { +static const union AnimCmd *const gSpriteAnimTable_85B7468[] = +{ &gSpriteAnim_85B7420[4] }; -static const union AnimCmd *const gSpriteAnimTable_85B746C[] = { +static const union AnimCmd *const gSpriteAnimTable_85B746C[] = +{ &gSpriteAnim_85B7420[5] }; -static const union AnimCmd *const gSpriteAnimTable_85B7470[] = { +static const union AnimCmd *const gSpriteAnimTable_85B7470[] = +{ &gSpriteAnim_85B7420[6] }; -static const union AnimCmd *const gSpriteAnimTable_85B7474[] = { +static const union AnimCmd *const gSpriteAnimTable_85B7474[] = +{ &gSpriteAnim_85B7420[7] }; -static const union AnimCmd *const gSpriteAnimTable_85B7478[] = { +static const union AnimCmd *const gSpriteAnimTable_85B7478[] = +{ &gSpriteAnim_85B7420[8] }; -static const union AnimCmd *const gSpriteAnimTable_85B747C[] = { +static const union AnimCmd *const gSpriteAnimTable_85B747C[] = +{ &gSpriteAnim_85B7420[9] }; -static const union AnimCmd *const gSpriteAnimTable_85B7480[] = { +static const union AnimCmd *const gSpriteAnimTable_85B7480[] = +{ &gSpriteAnim_85B7420[10] }; -static const union AnimCmd *const gSpriteAnimTable_85B7484[] = { +static const union AnimCmd *const gSpriteAnimTable_85B7484[] = +{ &gSpriteAnim_85B7420[11] }; -static const struct CompressedSpriteSheet gUnknown_085B7488 = { +static const struct CompressedSpriteSheet gUnknown_085B7488 = +{ .data = gRouletteHeadersTiles, .size = 0x1600, .tag = 4 }; -static const struct CompressedSpriteSheet gUnknown_085B7490 = { +static const struct CompressedSpriteSheet gUnknown_085B7490 = +{ .data = RoulettePokeIconsTiles, .size = 0x400, .tag = 5 }; -static const union AnimCmd gSpriteAnim_85B7498[] = { +static const union AnimCmd gSpriteAnim_85B7498[] = +{ ANIMCMD_FRAME(0, 0), ANIMCMD_FRAME(16, 0), ANIMCMD_FRAME(32, 0), @@ -2468,7 +2489,8 @@ static const union AnimCmd gSpriteAnim_85B7498[] = { ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_85B74C8[] = { +static const union AnimCmd gSpriteAnim_85B74C8[] = +{ ANIMCMD_FRAME(0, 0), ANIMCMD_FRAME(4, 0), ANIMCMD_FRAME(8, 0), @@ -2476,47 +2498,58 @@ static const union AnimCmd gSpriteAnim_85B74C8[] = { ANIMCMD_END }; -static const union AnimCmd *const gSpriteAnimTable_85B74DC[] = { +static const union AnimCmd *const gSpriteAnimTable_85B74DC[] = +{ &gSpriteAnim_85B7498[0] }; -static const union AnimCmd *const gSpriteAnimTable_85B74E0[] = { +static const union AnimCmd *const gSpriteAnimTable_85B74E0[] = +{ &gSpriteAnim_85B7498[2] }; -static const union AnimCmd *const gSpriteAnimTable_85B74E4[] = { +static const union AnimCmd *const gSpriteAnimTable_85B74E4[] = +{ &gSpriteAnim_85B7498[4] }; -static const union AnimCmd *const gSpriteAnimTable_85B74E8[] = { +static const union AnimCmd *const gSpriteAnimTable_85B74E8[] = +{ &gSpriteAnim_85B7498[6] }; -static const union AnimCmd *const gSpriteAnimTable_85B74EC[] = { +static const union AnimCmd *const gSpriteAnimTable_85B74EC[] = +{ &gSpriteAnim_85B7498[8] }; -static const union AnimCmd *const gSpriteAnimTable_85B74F0[] = { +static const union AnimCmd *const gSpriteAnimTable_85B74F0[] = +{ &gSpriteAnim_85B7498[9] }; -static const union AnimCmd *const gSpriteAnimTable_85B74F4[] = { +static const union AnimCmd *const gSpriteAnimTable_85B74F4[] = +{ &gSpriteAnim_85B7498[10] }; -static const union AnimCmd *const gSpriteAnimTable_85B74F8[] = { +static const union AnimCmd *const gSpriteAnimTable_85B74F8[] = +{ &gSpriteAnim_85B74C8[0] }; -static const union AnimCmd *const gSpriteAnimTable_85B74FC[] = { +static const union AnimCmd *const gSpriteAnimTable_85B74FC[] = +{ &gSpriteAnim_85B74C8[1] }; -static const union AnimCmd *const gSpriteAnimTable_85B7500[] = { +static const union AnimCmd *const gSpriteAnimTable_85B7500[] = +{ &gSpriteAnim_85B74C8[2] }; -static const union AnimCmd *const gSpriteAnimTable_85B7504[] = { +static const union AnimCmd *const gSpriteAnimTable_85B7504[] = +{ &gSpriteAnim_85B74C8[3] }; @@ -2747,8 +2780,8 @@ static const struct OamData gOamData_85B7730 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_H_RECTANGLE, - .size = 3, + .shape = SPRITE_SHAPE(64x32), + .size = SPRITE_SIZE(64x32), .priority = 1, }; @@ -2756,8 +2789,8 @@ static const struct OamData gOamData_85B7738 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_V_RECTANGLE, - .size = 0, + .shape = SPRITE_SHAPE(8x16), + .size = SPRITE_SIZE(8x16), .priority = 1, }; @@ -2765,8 +2798,8 @@ static const struct OamData gOamData_85B7740 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_H_RECTANGLE, - .size = 2, + .shape = SPRITE_SHAPE(32x16), + .size = SPRITE_SIZE(32x16), .priority = 1, }; @@ -2774,8 +2807,8 @@ static const struct OamData gOamData_85B7748 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_H_RECTANGLE, - .size = 0, + .shape = SPRITE_SHAPE(16x8), + .size = SPRITE_SIZE(16x8), .priority = 1, }; @@ -2809,7 +2842,8 @@ static const struct CompressedSpriteSheet gUnknown_085B7750[] = {} }; -static const union AnimCmd gSpriteAnim_85B7780[] = { +static const union AnimCmd gSpriteAnim_85B7780[] = +{ ANIMCMD_FRAME(0, 0), ANIMCMD_FRAME(2, 0), ANIMCMD_FRAME(4, 0), @@ -2824,11 +2858,13 @@ static const union AnimCmd gSpriteAnim_85B7780[] = { //ANIMCMD_END }; -static const union AnimCmd *const gSpriteAnimTable_85B77A8[] = { +static const union AnimCmd *const gSpriteAnimTable_85B77A8[] = +{ gSpriteAnim_85B7780 }; -static const union AnimCmd gSpriteAnim_85B77AC[] = { +static const union AnimCmd gSpriteAnim_85B77AC[] = +{ ANIMCMD_FRAME(0, 0), ANIMCMD_FRAME(8, 0), ANIMCMD_FRAME(16, 0), @@ -2837,11 +2873,13 @@ static const union AnimCmd gSpriteAnim_85B77AC[] = { ANIMCMD_END }; -static const union AnimCmd *const gSpriteAnimTable_85B77C4[] = { +static const union AnimCmd *const gSpriteAnimTable_85B77C4[] = +{ gSpriteAnim_85B77AC }; -static const union AnimCmd gSpriteAnim_85B77C8[] = { +static const union AnimCmd gSpriteAnim_85B77C8[] = +{ ANIMCMD_FRAME(0, 0), ANIMCMD_FRAME(2, 0), ANIMCMD_FRAME(4, 0), @@ -2850,7 +2888,8 @@ static const union AnimCmd gSpriteAnim_85B77C8[] = { ANIMCMD_END }; -static const union AnimCmd *const gSpriteAnimTable_85B77E0[] = { +static const union AnimCmd *const gSpriteAnimTable_85B77E0[] = +{ gSpriteAnim_85B77C8 }; @@ -2913,8 +2952,8 @@ static const struct OamData gOamData_85B785C = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_SQUARE, - .size = 1, + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), .priority = 2, }; @@ -2924,7 +2963,8 @@ static const struct CompressedSpriteSheet gUnknown_085B7864 = { .tag = 12 }; -static const union AnimCmd gSpriteAnim_85B786C[] = { +static const union AnimCmd gSpriteAnim_85B786C[] = +{ ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(4, 5), ANIMCMD_FRAME(8, 5), @@ -2932,7 +2972,8 @@ static const union AnimCmd gSpriteAnim_85B786C[] = { ANIMCMD_JUMP(0) }; -static const union AnimCmd gSpriteAnim_85B7880[] = { +static const union AnimCmd gSpriteAnim_85B7880[] = +{ ANIMCMD_FRAME(0, 10), ANIMCMD_FRAME(4, 10), ANIMCMD_FRAME(8, 10), @@ -2940,7 +2981,8 @@ static const union AnimCmd gSpriteAnim_85B7880[] = { ANIMCMD_JUMP(0) }; -static const union AnimCmd gSpriteAnim_85B7894[] = { +static const union AnimCmd gSpriteAnim_85B7894[] = +{ ANIMCMD_FRAME(0, 15), ANIMCMD_FRAME(4, 15), ANIMCMD_FRAME(8, 15), @@ -2948,7 +2990,8 @@ static const union AnimCmd gSpriteAnim_85B7894[] = { ANIMCMD_JUMP(0) }; -static const union AnimCmd gSpriteAnim_85B78A8[] = { +static const union AnimCmd gSpriteAnim_85B78A8[] = +{ ANIMCMD_FRAME(4, 2), ANIMCMD_FRAME(8, 5), ANIMCMD_FRAME(4, 5), @@ -2956,7 +2999,8 @@ static const union AnimCmd gSpriteAnim_85B78A8[] = { ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_85B78BC[] = { +static const union AnimCmd gSpriteAnim_85B78BC[] = +{ ANIMCMD_FRAME(4, 2), ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(4, 4), @@ -2965,7 +3009,8 @@ static const union AnimCmd gSpriteAnim_85B78BC[] = { ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_85B78D4[] = { +static const union AnimCmd gSpriteAnim_85B78D4[] = +{ ANIMCMD_FRAME(0, 2), ANIMCMD_FRAME(4, 5), ANIMCMD_FRAME(8, 5), @@ -2973,12 +3018,14 @@ static const union AnimCmd gSpriteAnim_85B78D4[] = { ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_85B78E8[] = { +static const union AnimCmd gSpriteAnim_85B78E8[] = +{ ANIMCMD_FRAME(12, 0), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_85B78F0[] = { +static const union AnimCmd gSpriteAnim_85B78F0[] = +{ ANIMCMD_FRAME(8, 2), ANIMCMD_FRAME(4, 5), ANIMCMD_FRAME(0, 5), @@ -2986,7 +3033,8 @@ static const union AnimCmd gSpriteAnim_85B78F0[] = { ANIMCMD_END }; -static const union AnimCmd *const gSpriteAnimTable_85B7904[] = { +static const union AnimCmd *const gSpriteAnimTable_85B7904[] = +{ gSpriteAnim_85B786C, gSpriteAnim_85B7880, gSpriteAnim_85B7894, @@ -3014,12 +3062,13 @@ static const struct OamData gOamData_85B7940 = .y = 81, .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_SQUARE, - .size = 3, + .shape = SPRITE_SHAPE(64x64), + .size = SPRITE_SIZE(64x64), .priority = 2, }; -static const struct CompressedSpriteSheet gUnknown_085B7948 = { +static const struct CompressedSpriteSheet gUnknown_085B7948 = +{ .data = gRouletteCenter_Gfx, .size = 0x800, .tag = 6 @@ -3040,8 +3089,8 @@ static const struct OamData gOamData_85B7968 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_SQUARE, - .size = 2, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), .priority = 2, }; @@ -3049,18 +3098,20 @@ static const struct OamData gOamData_85B7970 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_SQUARE, - .size = 2, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), .priority = 2, }; -static const struct CompressedSpriteSheet gUnknown_085B7978 = { +static const struct CompressedSpriteSheet gUnknown_085B7978 = +{ .data = gUnknown_085B67FC, .size = 0xE00, .tag = 13 }; -static const union AnimCmd gSpriteAnim_85B7980[] = { +static const union AnimCmd gSpriteAnim_85B7980[] = +{ ANIMCMD_FRAME(0, 6), ANIMCMD_FRAME(16, 6), ANIMCMD_FRAME(32, 6), @@ -3070,45 +3121,53 @@ static const union AnimCmd gSpriteAnim_85B7980[] = { ANIMCMD_JUMP(2) }; -static const union AnimCmd gSpriteAnim_85B799C[] = { +static const union AnimCmd gSpriteAnim_85B799C[] = +{ ANIMCMD_FRAME(80, 10), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_85B79A4[] = { +static const union AnimCmd gSpriteAnim_85B79A4[] = +{ ANIMCMD_FRAME(80, 10, .hFlip = TRUE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_85B79AC[] = { +static const union AnimCmd gSpriteAnim_85B79AC[] = +{ ANIMCMD_FRAME(80, 20), ANIMCMD_FRAME(96, 20), ANIMCMD_JUMP(0) }; -static const union AnimCmd gSpriteAnim_85B79B8[] = { +static const union AnimCmd gSpriteAnim_85B79B8[] = +{ ANIMCMD_FRAME(80, 20, .hFlip = TRUE), ANIMCMD_FRAME(96, 20, .hFlip = TRUE), ANIMCMD_JUMP(0) }; -static const union AnimCmd gSpriteAnim_85B79C4[] = { +static const union AnimCmd gSpriteAnim_85B79C4[] = +{ ANIMCMD_FRAME(80, 10), ANIMCMD_FRAME(96, 10), ANIMCMD_JUMP(0) }; -static const union AnimCmd gSpriteAnim_85B79D0[] = { +static const union AnimCmd gSpriteAnim_85B79D0[] = +{ ANIMCMD_FRAME(80, 10, .hFlip = TRUE), ANIMCMD_FRAME(96, 10, .hFlip = TRUE), ANIMCMD_JUMP(0) }; -static const union AnimCmd *const gSpriteAnimTable_85B79DC[] = { +static const union AnimCmd *const gSpriteAnimTable_85B79DC[] = +{ gSpriteAnim_85B7980 }; -static const union AnimCmd *const gSpriteAnimTable_85B79E0[] = { +static const union AnimCmd *const gSpriteAnimTable_85B79E0[] = +{ gSpriteAnim_85B799C, gSpriteAnim_85B79A4, gSpriteAnim_85B79AC, @@ -3143,8 +3202,8 @@ static const struct OamData gOamData_85B7A28 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_SQUARE, - .size = 1, + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), .priority = 2, }; @@ -3152,8 +3211,8 @@ static const struct OamData gOamData_85B7A30 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_H_RECTANGLE, - .size = 2, + .shape = SPRITE_SHAPE(32x16), + .size = SPRITE_SIZE(32x16), .priority = 2, }; @@ -3161,24 +3220,27 @@ static const struct OamData gOamData_85B7A38 = { .affineMode = ST_OAM_AFFINE_NORMAL, .objMode = ST_OAM_OBJ_NORMAL, - .shape = ST_OAM_H_RECTANGLE, - .size = 2, + .shape = SPRITE_SHAPE(32x16), + .size = SPRITE_SIZE(32x16), .priority = 2, }; -static const struct CompressedSpriteSheet gUnknown_085B7A40 = { +static const struct CompressedSpriteSheet gUnknown_085B7A40 = +{ .data = gUnknown_085B7290, .size = 0x180, .tag = 14 }; -static const union AffineAnimCmd gSpriteAffineAnim_85B7A48[] = { +static const union AffineAnimCmd gSpriteAffineAnim_85B7A48[] = +{ AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0), AFFINEANIMCMD_FRAME(2, 2, 0, 60), AFFINEANIMCMD_END }; -static const union AffineAnimCmd gSpriteAffineAnim_85B7A60[] = { +static const union AffineAnimCmd gSpriteAffineAnim_85B7A60[] = +{ AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(-2, 0x0, 0, 15), AFFINEANIMCMD_FRAME(-1, -2, 0, 15), @@ -3186,38 +3248,46 @@ static const union AffineAnimCmd gSpriteAffineAnim_85B7A60[] = { AFFINEANIMCMD_END }; -static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7A88[] = { +static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7A88[] = +{ gSpriteAffineAnim_85B7A48 }; -static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7A8C[] = { +static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7A8C[] = +{ gSpriteAffineAnim_85B7A60 }; -static const union AffineAnimCmd gSpriteAffineAnim_85B7A90[] = { +static const union AffineAnimCmd gSpriteAffineAnim_85B7A90[] = +{ AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_END }; -static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7AA0[] = { +static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7AA0[] = +{ gSpriteAffineAnim_85B7A90 }; -static const union AnimCmd gSpriteAnim_85B7AA4[] = { +static const union AnimCmd gSpriteAnim_85B7AA4[] = +{ ANIMCMD_FRAME(0, 0), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_85B7AAC[] = { +static const union AnimCmd gSpriteAnim_85B7AAC[] = +{ ANIMCMD_FRAME(4, 0), ANIMCMD_END }; -static const union AnimCmd *const gSpriteAnimTable_85B7AB4[] = { +static const union AnimCmd *const gSpriteAnimTable_85B7AB4[] = +{ gSpriteAnim_85B7AA4 }; -static const union AnimCmd *const gSpriteAnimTable_85B7AB8[] = { +static const union AnimCmd *const gSpriteAnimTable_85B7AB8[] = +{ gSpriteAnim_85B7AAC }; diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 08f1938904..415907585a 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -47,19 +47,19 @@ EWRAM_DATA u8 gSaveFailedUnused2[4] = {0}; static const struct OamData sClockOamData = { - 160, // Y - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0 + .y = 160, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = SPRITE_SHAPE(16x16), + .x = 0, + .matrixNum = 0, + .size = SPRITE_SIZE(16x16), + .tileNum = 0, + .priority = 0, + .paletteNum = 0, + .affineParam = 0 }; static const struct BgTemplate gUnknown_085EFD88[3] = diff --git a/src/sprite.c b/src/sprite.c index 4087dd8c41..d2ea7889c1 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -91,21 +91,21 @@ typedef void (*AnimFunc)(struct Sprite *); typedef void (*AnimCmdFunc)(struct Sprite *); typedef void (*AffineAnimCmdFunc)(u8 matrixNum, struct Sprite *); -#define DUMMY_OAM_DATA \ -{ \ - 160, /* Y (off-screen) */ \ - 0, \ - 0, \ - 0, \ - 0, \ - 0, \ - 304, /* X */ \ - 0, \ - 0, \ - 0, \ - 3, /* lowest priority */ \ - 0, \ - 0 \ +#define DUMMY_OAM_DATA \ +{ \ + .y = 160, \ + .affineMode = 0, \ + .objMode = 0, \ + .mosaic = 0, \ + .bpp = 0, \ + .shape = SPRITE_SHAPE(8x8), \ + .x = 304, \ + .matrixNum = 0, \ + .size = SPRITE_SIZE(8x8), \ + .tileNum = 0, \ + .priority = 3, /* lowest priority */ \ + .paletteNum = 0, \ + .affineParam = 0 \ } #define ANIM_END 0xFFFF diff --git a/src/starter_choose.c b/src/starter_choose.c index 4ed53539fe..c3d6361758 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -170,10 +170,10 @@ static const struct OamData gOamData_85B1E10 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -187,10 +187,10 @@ static const struct OamData gOamData_85B1E18 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -204,10 +204,10 @@ static const struct OamData gOamData_85B1E20 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -296,21 +296,35 @@ static const union AffineAnimCmd * const gSpriteAffineAnimTable_85B1ED4[] = {gSp static const struct CompressedSpriteSheet gUnknown_085B1ED8[] = { - gUnknown_085B18AC, 0x0800, 0x1000, - NULL, + { + .data = gUnknown_085B18AC, + .size = 0x0800, + .tag = 0x1000 + }, + {} }; static const struct CompressedSpriteSheet gUnknown_085B1EE8[] = { - gUnknown_085B1BCC, 0x0800, 0x1001, - NULL, + { + .data = gUnknown_085B1BCC, + .size = 0x0800, + .tag = 0x1001 + }, + {} }; static const struct SpritePalette gUnknown_085B1EF8[] = { - gBirchBallarrow_Pal, 0x1000, - gBirchCircle_Pal, 0x1001, - NULL, + { + .data = gBirchBallarrow_Pal, + .tag = 0x1000 + }, + { + .data = gBirchCircle_Pal, + .tag = 0x1001 + }, + {}, }; static const struct SpriteTemplate sSpriteTemplate_Hand = diff --git a/src/title_screen.c b/src/title_screen.c index 80d5464faf..b9ef530004 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -23,9 +23,7 @@ #include "constants/rgb.h" #include "constants/songs.h" -#define VERSION_BANNER_SHAPE 1 #define VERSION_BANNER_RIGHT_TILEOFFSET 64 -#define VERSION_BANNER_BYTES 0x1000 #define VERSION_BANNER_LEFT_X 98 #define VERSION_BANNER_RIGHT_X 162 #define VERSION_BANNER_Y 2 @@ -108,10 +106,10 @@ static const struct OamData sVersionBannerLeftOamData = .objMode = 0, .mosaic = 0, .bpp = 1, - .shape = VERSION_BANNER_SHAPE, + .shape = SPRITE_SHAPE(64x32), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x32), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -125,10 +123,10 @@ static const struct OamData sVersionBannerRightOamData = .objMode = 0, .mosaic = 0, .bpp = 1, - .shape = VERSION_BANNER_SHAPE, + .shape = SPRITE_SHAPE(64x32), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x32), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -181,8 +179,12 @@ static const struct SpriteTemplate sVersionBannerRightSpriteTemplate = static const struct CompressedSpriteSheet sSpriteSheet_EmeraldVersion[] = { - {gTitleScreenEmeraldVersionGfx, VERSION_BANNER_BYTES, 1000}, - {NULL}, + { + .data = gTitleScreenEmeraldVersionGfx, + .size = 0x1000, + .tag = 1000 + }, + {}, }; static const struct OamData sOamData_CopyrightBanner = @@ -192,10 +194,10 @@ static const struct OamData sOamData_CopyrightBanner = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = SPRITE_SHAPE(32x8), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(32x8), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -280,14 +282,21 @@ static const struct SpriteTemplate sStartCopyrightBannerSpriteTemplate = static const struct CompressedSpriteSheet sSpriteSheet_PressStart[] = { - {gTitleScreenPressStartGfx, 0x520, 1001}, - {NULL}, + { + .data = gTitleScreenPressStartGfx, + .size = 0x520, + .tag = 1001 + }, + {}, }; static const struct SpritePalette sSpritePalette_PressStart[] = { - {gTitleScreenPressStartPal, 1001}, - {NULL}, + { + .data = gTitleScreenPressStartPal, + .tag = 1001 + }, + {}, }; static const struct OamData sPokemonLogoShineOamData = @@ -297,10 +306,10 @@ static const struct OamData sPokemonLogoShineOamData = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -331,8 +340,12 @@ static const struct SpriteTemplate sPokemonLogoShineSpriteTemplate = static const struct CompressedSpriteSheet sPokemonLogoShineSpriteSheet[] = { - {sTitleScreenLogoShineGfx, 0x800, 1002}, - {NULL}, + { + .data = sTitleScreenLogoShineGfx, + .size = 0x800, + .tag = 1002 + }, + {}, }; // code diff --git a/src/trade.c b/src/trade.c index 9a9828f347..be6768fe37 100644 --- a/src/trade.c +++ b/src/trade.c @@ -256,72 +256,89 @@ static const u8 gText_YourOnlyPkmnForBattle[] = _("That's your only\nPOKéMON fo static const u8 gText_WaitingForYourFriend[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Waiting for your friend\nto finish…"); static const u8 gText_YourFriendWantsToTrade[] = _("Your friend wants\nto trade POKéMON."); -static const struct OamData gOamData_832DC14 = { - .shape = ST_OAM_H_RECTANGLE, - .size = 2, +static const struct OamData gOamData_832DC14 = +{ + .shape = SPRITE_SHAPE(32x16), + .size = SPRITE_SIZE(32x16), .priority = 1 }; -static const struct OamData gOamData_832DC1C = { - .shape = ST_OAM_H_RECTANGLE, - .size = 3, +static const struct OamData gOamData_832DC1C = +{ + .shape = SPRITE_SHAPE(64x32), + .size = SPRITE_SIZE(64x32), .priority = 1 }; -static const union AnimCmd gSpriteAnim_832DC24[] = { +static const union AnimCmd gSpriteAnim_832DC24[] = +{ ANIMCMD_FRAME(0, 5), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_832DC2C[] = { +static const union AnimCmd gSpriteAnim_832DC2C[] = +{ ANIMCMD_FRAME(32, 5), ANIMCMD_END }; -static const union AnimCmd *const gSpriteAnimTable_832DC34[] = { +static const union AnimCmd *const gSpriteAnimTable_832DC34[] = +{ gSpriteAnim_832DC24, gSpriteAnim_832DC2C }; -static const struct SpriteSheet gUnknown_0832DC3C = { - gUnknown_08DDC6E4, 0x800, 300 +static const struct SpriteSheet gUnknown_0832DC3C = +{ + .data = gUnknown_08DDC6E4, + .size = 0x800, + .tag = 300 }; -static const struct SpritePalette gUnknown_0832DC44 = { - gUnknown_08DDB444, 2345 +static const struct SpritePalette gUnknown_0832DC44 = +{ + .data = gUnknown_08DDB444, + .tag = 2345 }; -static const union AnimCmd gSpriteAnim_832DC4C[] = { +static const union AnimCmd gSpriteAnim_832DC4C[] = +{ ANIMCMD_FRAME(0, 5), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_832DC54[] = { +static const union AnimCmd gSpriteAnim_832DC54[] = +{ ANIMCMD_FRAME(8, 5), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_832DC5C[] = { +static const union AnimCmd gSpriteAnim_832DC5C[] = +{ ANIMCMD_FRAME(16, 5), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_832DC64[] = { +static const union AnimCmd gSpriteAnim_832DC64[] = +{ ANIMCMD_FRAME(24, 5), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_832DC6C[] = { +static const union AnimCmd gSpriteAnim_832DC6C[] = +{ ANIMCMD_FRAME(32, 5), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_832DC74[] = { +static const union AnimCmd gSpriteAnim_832DC74[] = +{ ANIMCMD_FRAME(40, 5), ANIMCMD_END }; -static const union AnimCmd *const gSpriteAnimTable_832DC7C[] = { +static const union AnimCmd *const gSpriteAnimTable_832DC7C[] = +{ gSpriteAnim_832DC4C, gSpriteAnim_832DC54, gSpriteAnim_832DC5C, @@ -355,7 +372,8 @@ static const struct SpriteTemplate gSpriteTemplate_832DCAC = static const u16 TradeScreenTextPalette[] = INCBIN_U16("graphics/trade/text.gbapal"); static const struct SpritePalette gSpritePalette_TradeScreenText = { - TradeScreenTextPalette, 4925 + .data = TradeScreenTextPalette, + .tag = 4925 }; // This is used to determine the next mon to select when the D-Pad is @@ -367,7 +385,6 @@ static const struct SpritePalette gSpritePalette_TradeScreenText = // 2 3 8 9 // 4 5 10 11 // 12 - static const u8 gTradeNextSelectedMonTable[][4][6] = { { @@ -471,7 +488,8 @@ static const u8 gTradeMonSpriteCoords[][2] = {23, 18} // CANCEL }; -static const u8 gTradeLevelDisplayCoords[][6][2] = { +static const u8 gTradeLevelDisplayCoords[][6][2] = +{ { // Your party {5, 4}, @@ -492,7 +510,8 @@ static const u8 gTradeLevelDisplayCoords[][6][2] = { } }; -static const u8 gTradeMonBoxCoords[][6][2] = { +static const u8 gTradeMonBoxCoords[][6][2] = +{ { // Your party {1, 3}, @@ -513,7 +532,8 @@ static const u8 gTradeMonBoxCoords[][6][2] = { } }; -static const u8 sUnref_0832DE6E[] = { +static const u8 sUnref_0832DE6E[] = +{ 0x00, 0x0e, 0x0f, 0x1d, 0x03, 0x05, @@ -544,7 +564,8 @@ static const u8 *const gUnknown_0832DE94[] = gJPText_832DB2E }; -static const struct MenuAction gUnknown_0832DEAC[] = { +static const struct MenuAction gUnknown_0832DEAC[] = +{ {gText_Summary4, sub_807A000}, {gText_Trade3, sub_807A024} }; @@ -817,12 +838,15 @@ static const u16 gUnknown_08337EA0[] = INCBIN_U16("graphics/trade/black.gbapal") static const u32 gUnknown_08337EC0[] = INCBIN_U32("graphics/trade/wireless_signal.4bpp.lz"); static const u32 gUnknown_08338550[] = INCBIN_U32("graphics/trade/wireless_signal.bin.lz"); -static const struct OamData gOamData_8338C44 = { +static const struct OamData gOamData_8338C44 = +{ .affineMode = 1, - .size = 1 + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16) }; -static const union AnimCmd gSpriteAnim_8338C4C[] = { +static const union AnimCmd gSpriteAnim_8338C4C[] = +{ ANIMCMD_FRAME( 0, 3), ANIMCMD_FRAME( 4, 3), ANIMCMD_FRAME( 8, 3), @@ -840,7 +864,8 @@ static const union AnimCmd gSpriteAnim_8338C4C[] = { ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_8338C88[] = { +static const union AnimCmd gSpriteAnim_8338C88[] = +{ ANIMCMD_FRAME( 0, 3), ANIMCMD_FRAME( 4, 3), ANIMCMD_FRAME( 8, 3), @@ -858,171 +883,213 @@ static const union AnimCmd gSpriteAnim_8338C88[] = { ANIMCMD_END }; -static const union AnimCmd *const gSpriteAnimTable_8338C88[] = { +static const union AnimCmd *const gSpriteAnimTable_8338C88[] = +{ gSpriteAnim_8338C4C, gSpriteAnim_8338C88 }; -static const union AffineAnimCmd gSpriteAffineAnim_8338CCC[] = { +static const union AffineAnimCmd gSpriteAffineAnim_8338CCC[] = +{ AFFINEANIMCMD_FRAME(0, 0, 0, 1), AFFINEANIMCMD_END }; -static const union AffineAnimCmd gSpriteAffineAnim_8338CDC[] = { +static const union AffineAnimCmd gSpriteAffineAnim_8338CDC[] = +{ AFFINEANIMCMD_FRAME(-8, 0, 0, 20), AFFINEANIMCMD_END }; -static const union AffineAnimCmd gSpriteAffineAnim_8338CEC[] = { +static const union AffineAnimCmd gSpriteAffineAnim_8338CEC[] = +{ AFFINEANIMCMD_FRAME(0x60, 0x100, 0, 0), AFFINEANIMCMD_FRAME( 0, 0, 0, 5), AFFINEANIMCMD_FRAME( 8, 0, 0, 20), AFFINEANIMCMD_END }; -static const union AffineAnimCmd *const gSpriteAffineAnimTable_8338D0C[] = { +static const union AffineAnimCmd *const gSpriteAffineAnimTable_8338D0C[] = +{ gSpriteAffineAnim_8338CCC, gSpriteAffineAnim_8338CDC, gSpriteAffineAnim_8338CEC }; -static const struct SpriteSheet gUnknown_08338D18 = { - gTradeBallTiles, 0x600, 5557 +static const struct SpriteSheet gUnknown_08338D18 = +{ + .data = gTradeBallTiles, + .size = 0x600, + .tag = 5557 }; -static const struct SpritePalette gUnknown_08338D20 = { - gTradeBallPalette, 5558 +static const struct SpritePalette gUnknown_08338D20 = +{ + .data = gTradeBallPalette, + .tag = 5558 }; -static const struct SpriteTemplate gSpriteTemplate_8338D28 = { - 5557, - 5558, - &gOamData_8338C44, - gSpriteAnimTable_8338C88, - NULL, - gSpriteAffineAnimTable_8338D0C, - sub_807E55C +static const struct SpriteTemplate gSpriteTemplate_8338D28 = +{ + .tileTag = 5557, + .paletteTag = 5558, + .oam = &gOamData_8338C44, + .anims = gSpriteAnimTable_8338C88, + .images = NULL, + .affineAnims = gSpriteAffineAnimTable_8338D0C, + .callback = sub_807E55C }; -static const struct OamData gOamData_8338D40 = { +static const struct OamData gOamData_8338D40 = +{ .affineMode = 1, .objMode = 1, - .size = 2, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), .priority = 1 }; -static const union AnimCmd gSpriteAnim_8338D48[] = { +static const union AnimCmd gSpriteAnim_8338D48[] = +{ ANIMCMD_FRAME(0, 5, .hFlip = TRUE, .vFlip = TRUE), ANIMCMD_END }; -static const union AnimCmd *const gSpriteAnimTable_8338D50[] = { +static const union AnimCmd *const gSpriteAnimTable_8338D50[] = +{ gSpriteAnim_8338D48 }; -static const union AffineAnimCmd gSpriteAffineAnim_8338D54[] = { +static const union AffineAnimCmd gSpriteAffineAnim_8338D54[] = +{ AFFINEANIMCMD_FRAME(-10, -10, 0, 5), AFFINEANIMCMD_FRAME(10, 10, 0, 5), AFFINEANIMCMD_JUMP(0) }; -static const union AffineAnimCmd *const gSpriteAffineAnimTable_8338D6C[] = { +static const union AffineAnimCmd *const gSpriteAffineAnimTable_8338D6C[] = +{ gSpriteAffineAnim_8338D54 }; -static const struct SpriteSheet gUnknown_08338D70 = { - gTradeGlow1Tiles, 0x200, 5550 +static const struct SpriteSheet gUnknown_08338D70 = +{ + .data = gTradeGlow1Tiles, + .size = 0x200, + .tag = 5550 }; -static const struct SpritePalette gUnknown_08338D78 = { - gUnknown_08330940, 5551 +static const struct SpritePalette gUnknown_08338D78 = +{ + .data = gUnknown_08330940, + .tag = 5551 }; -static const struct SpritePalette gUnknown_08338D80 = { - gUnknown_083308E0, 5555 +static const struct SpritePalette gUnknown_08338D80 = +{ + .data = gUnknown_083308E0, + .tag = 5555 }; -static const struct SpriteTemplate gUnknown_08338D88 = { - 5550, - 5551, - &gOamData_8338D40, - gSpriteAnimTable_8338D50, - NULL, - gSpriteAffineAnimTable_8338D6C, - sub_807AA28 +static const struct SpriteTemplate gUnknown_08338D88 = +{ + .tileTag = 5550, + .paletteTag = 5551, + .oam = &gOamData_8338D40, + .anims = gSpriteAnimTable_8338D50, + .images = NULL, + .affineAnims = gSpriteAffineAnimTable_8338D6C, + .callback = sub_807AA28 }; -static const struct OamData gOamData_8338DA0 = { - .shape = ST_OAM_V_RECTANGLE, - .size = 2, +static const struct OamData gOamData_8338DA0 = +{ + .shape = SPRITE_SHAPE(16x32), + .size = SPRITE_SIZE(16x32), .priority = 1 }; -static const union AnimCmd gSpriteAnim_8338DA8[] = { +static const union AnimCmd gSpriteAnim_8338DA8[] = +{ ANIMCMD_FRAME(0, 5, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_8338DB0[] = { +static const union AnimCmd gSpriteAnim_8338DB0[] = +{ ANIMCMD_FRAME(8, 5, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_END }; -static const union AnimCmd *const gSpriteAnimTable_8338DB8[] = { +static const union AnimCmd *const gSpriteAnimTable_8338DB8[] = +{ gSpriteAnim_8338DA8, gSpriteAnim_8338DB0 }; -static const struct SpriteSheet gUnknown_08338DC0 = { - gTradeGlow2Tiles, 0x300, 5552 +static const struct SpriteSheet gUnknown_08338DC0 = +{ + .data = gTradeGlow2Tiles, + .size = 0x300, + .tag = 5552 }; -static const struct SpriteTemplate gSpriteTemplate_8338DC8 = { - 5552, - 5551, - &gOamData_8338DA0, - gSpriteAnimTable_8338DB8, - NULL, - gDummySpriteAffineAnimTable, - sub_807AA7C +static const struct SpriteTemplate gSpriteTemplate_8338DC8 = +{ + .tileTag = 5552, + .paletteTag = 5551, + .oam = &gOamData_8338DA0, + .anims = gSpriteAnimTable_8338DB8, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_807AA7C }; -static const struct OamData gOamData_8338DE0 = { - .shape = ST_OAM_V_RECTANGLE, - .size = 2, +static const struct OamData gOamData_8338DE0 = +{ + .shape = SPRITE_SHAPE(16x32), + .size = SPRITE_SIZE(16x32), .priority = 1 }; -static const union AnimCmd gSpriteAnim_8338DE8[] = { +static const union AnimCmd gSpriteAnim_8338DE8[] = +{ ANIMCMD_FRAME(0, 10), ANIMCMD_END }; -static const union AnimCmd *const gSpriteAnimTable_8338DF0[] = { +static const union AnimCmd *const gSpriteAnimTable_8338DF0[] = +{ gSpriteAnim_8338DE8 }; -static const struct SpriteSheet gUnknown_08338DF4 = { - gTradeCableEndTiles, 0x100, 5554 +static const struct SpriteSheet gUnknown_08338DF4 = +{ + .data = gTradeCableEndTiles, + .size = 0x100, + .tag = 5554 }; -static const struct SpriteTemplate gSpriteTemplate_8338DFC = { - 5554, - 5555, - &gOamData_8338DE0, - gSpriteAnimTable_8338DF0, - NULL, - gDummySpriteAffineAnimTable, - sub_807AABC +static const struct SpriteTemplate gSpriteTemplate_8338DFC = +{ + .tileTag = 5554, + .paletteTag = 5555, + .oam = &gOamData_8338DE0, + .anims = gSpriteAnimTable_8338DF0, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_807AABC }; -static const struct OamData gOamData_8338E14 = { - .shape = ST_OAM_H_RECTANGLE, - .size = 3, +static const struct OamData gOamData_8338E14 = +{ + .shape = SPRITE_SHAPE(64x32), + .size = SPRITE_SIZE(64x32), .priority = 1 }; -static const union AnimCmd gSpriteAnim_8338E1C[] = { +static const union AnimCmd gSpriteAnim_8338E1C[] = +{ ANIMCMD_FRAME( 0, 2, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(32, 2, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(64, 2, .vFlip = TRUE, .hFlip = TRUE), @@ -1034,7 +1101,8 @@ static const union AnimCmd gSpriteAnim_8338E1C[] = { ANIMCMD_END }; -static const union AnimCmd gSpriteAnim_8338E40[] = { +static const union AnimCmd gSpriteAnim_8338E40[] = +{ ANIMCMD_FRAME( 0, 2, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(32, 2, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(64, 2, .vFlip = TRUE, .hFlip = TRUE), @@ -1046,50 +1114,60 @@ static const union AnimCmd gSpriteAnim_8338E40[] = { ANIMCMD_END }; -static const union AnimCmd *const gSpriteAnimTable_8338E64[] = { +static const union AnimCmd *const gSpriteAnimTable_8338E64[] = +{ gSpriteAnim_8338E1C }; -static const union AnimCmd *const gSpriteAnimTable_8338E68[] = { +static const union AnimCmd *const gSpriteAnimTable_8338E68[] = +{ gSpriteAnim_8338E40 }; -static const struct SpriteSheet gUnknown_08338E6C = { - gTradeGBAScreenTiles, 0x1000, 5556 +static const struct SpriteSheet gUnknown_08338E6C = +{ + .data = gTradeGBAScreenTiles, + .size = 0x1000, + .tag = 5556 }; -static const struct SpriteTemplate gSpriteTemplate_8338E74 = { - 5556, - 5555, - &gOamData_8338E14, - gSpriteAnimTable_8338E64, - NULL, - gDummySpriteAffineAnimTable, - sub_807AB04 +static const struct SpriteTemplate gSpriteTemplate_8338E74 = +{ + .tileTag = 5556, + .paletteTag = 5555, + .oam = &gOamData_8338E14, + .anims = gSpriteAnimTable_8338E64, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_807AB04 }; -static const struct SpriteTemplate gSpriteTemplate_8338E8C = { - 5556, - 5555, - &gOamData_8338E14, - gSpriteAnimTable_8338E68, - NULL, - gDummySpriteAffineAnimTable, - sub_807AB04 +static const struct SpriteTemplate gSpriteTemplate_8338E8C = +{ + .tileTag = 5556, + .paletteTag = 5555, + .oam = &gOamData_8338E14, + .anims = gSpriteAnimTable_8338E68, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_807AB04 }; static const u16 gUnknown_08338EA4[] = INCBIN_U16("graphics/trade/unknown_338EA4.gbapal"); -static const union AffineAnimCmd gSpriteAffineAnim_8338EBC[] = { +static const union AffineAnimCmd gSpriteAffineAnim_8338EBC[] = +{ AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0), AFFINEANIMCMD_JUMP(0) }; -static const union AffineAnimCmd *const gSpriteAffineAnimTable_8338ECC[] = { +static const union AffineAnimCmd *const gSpriteAffineAnimTable_8338ECC[] = +{ gSpriteAffineAnim_8338EBC }; -static const struct InGameTrade gIngameTrades[] = { +static const struct InGameTrade gIngameTrades[] = +{ { _("DOTS"), SPECIES_SEEDOT, 5, 4, 5, 4, 4, 4, @@ -1131,7 +1209,8 @@ static const struct InGameTrade gIngameTrades[] = { } }; -static const u16 gIngameTradeMail[][10] = { +static const u16 gIngameTradeMail[][10] = +{ { EC_WORD_BE, EC_WORD_NICE, @@ -1233,7 +1312,8 @@ static const struct BgTemplate gUnknown_08339014[] = }, }; -static const s8 gTradeBallVerticalVelocityTable[] = { +static const s8 gTradeBallVerticalVelocityTable[] = +{ 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 2, 2, diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c index d576854233..8172f09e6c 100644 --- a/src/trainer_pokemon_sprites.c +++ b/src/trainer_pokemon_sprites.c @@ -43,13 +43,18 @@ static EWRAM_DATA struct PicData sSpritePics[PICS_COUNT] = {}; // .rodata static const struct PicData sDummyPicData = {}; + static const struct OamData gUnknown_0860B064 = { - .size = 3 + .shape = SPRITE_SHAPE(64x64), + .size = SPRITE_SIZE(64x64) }; + static const struct OamData gUnknown_0860B06C = { - .affineMode = 1, .size = 3 + .affineMode = 1, + .shape = SPRITE_SHAPE(64x64), + .size = SPRITE_SIZE(64x64) }; // .text diff --git a/src/trainer_see.c b/src/trainer_see.c index 16ea88a455..9925aa6bc8 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -100,10 +100,10 @@ static const struct OamData sOamData_Icons = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -112,13 +112,22 @@ static const struct OamData sOamData_Icons = static const struct SpriteFrameImage sSpriteImageTable_ExclamationQuestionMark[] = { - {sEmotion_ExclamationMarkGfx, 0x80}, - {sEmotion_QuestionMarkGfx, 0x80} + { + .data = sEmotion_ExclamationMarkGfx, + .size = 0x80 + }, + { + .data = sEmotion_QuestionMarkGfx, + .size = 0x80 + } }; static const struct SpriteFrameImage sSpriteImageTable_HeartIcon[] = { - {sEmotion_HeartGfx, 0x80} + { + .data = sEmotion_HeartGfx, + .size = 0x80 + } }; static const union AnimCmd sSpriteAnim_Icons1[] = diff --git a/src/unk_transition.c b/src/unk_transition.c index d56998b5bb..99479c8660 100644 --- a/src/unk_transition.c +++ b/src/unk_transition.c @@ -40,7 +40,7 @@ static const u32 gUnknown_0862AF30[] = INCBIN_U32("graphics/battle_transitions/f static const u32 gUnknown_0862B0DC[] = INCBIN_U32("graphics/battle_transitions/frontier_transition_circles.4bpp.lz"); static const u16 gUnknown_0862B53C[] = INCBIN_U16("graphics/battle_transitions/frontier_transition.gbapal"); -// Unused Empty data. Feel free to delete. +// Unused Empty data. static const u8 sFiller[0x1C0] = {0}; static const struct OamData sOamData_862B71C = @@ -50,10 +50,10 @@ static const struct OamData sOamData_862B71C = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -62,12 +62,15 @@ static const struct OamData sOamData_862B71C = static const struct CompressedSpriteSheet sUnknown_0862B724 = { - gUnknown_0862B0DC, 0x1800, 11920 + .data = gUnknown_0862B0DC, + .size = 0x1800, + .tag = 11920 }; static const struct SpritePalette sUnknown_0862B72C = { - gUnknown_0862B53C, 11920 + .data = gUnknown_0862B53C, + .tag = 11920 }; static const union AnimCmd sSpriteAnim_862B734[] = diff --git a/src/wallclock.c b/src/wallclock.c index d3bbcf7a20..810abb1d13 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -93,6 +93,7 @@ static const struct WindowTemplate gUnknown_085B21DC[] = }, DUMMY_WIN_TEMPLATE }; + static const struct WindowTemplate gUnknown_085B21F4 = { .bg = 0, @@ -103,7 +104,9 @@ static const struct WindowTemplate gUnknown_085B21F4 = .paletteNum = 14, .baseBlock = 572 }; -static const struct BgTemplate gUnknown_085B21FC[] = { + +static const struct BgTemplate gUnknown_085B21FC[] = +{ { .bg = 0, .charBaseIndex = 2, @@ -123,34 +126,57 @@ static const struct BgTemplate gUnknown_085B21FC[] = { .priority = 2 } }; -static const struct CompressedSpriteSheet gUnknown_085B2208 = { + +static const struct CompressedSpriteSheet gUnknown_085B2208 = +{ sUnknown_085B1F58, 0x2000, TAG_GFX_WALL_CLOCK_HAND }; -static const u32 filler_85B2210[2] = {}; -static const struct SpritePalette gUnknown_085B2218[] = { - { gWallclockMale_Pal, TAG_PAL_WALL_CLOCK_HAND }, - { gWallclockFemale_Pal, 0x1001 }, + +static const u8 filler_85B2210[8] = {0}; + +static const struct SpritePalette gUnknown_085B2218[] = +{ + { + .data = gWallclockMale_Pal, + .tag = TAG_PAL_WALL_CLOCK_HAND + }, + { + .data = gWallclockFemale_Pal, + .tag = 0x1001 + }, {} }; -static const struct OamData Unknown_085B2230 = { + +static const struct OamData Unknown_085B2230 = +{ .y = 160, - .size = 3, + .shape = SPRITE_SHAPE(64x64), + .size = SPRITE_SIZE(64x64), .priority = 1, }; -static const union AnimCmd Unknown_085B2238[] = { + +static const union AnimCmd Unknown_085B2238[] = +{ ANIMCMD_FRAME(0, 30), ANIMCMD_END, }; -static const union AnimCmd Unknown_085B2240[] = { + +static const union AnimCmd Unknown_085B2240[] = +{ ANIMCMD_FRAME(64, 30), ANIMCMD_END, }; -static const union AnimCmd *const gUnknown_085B2248[] = { + +static const union AnimCmd *const gUnknown_085B2248[] = +{ Unknown_085B2238 }; -static const union AnimCmd *const gUnknown_085B224C[] = { + +static const union AnimCmd *const gUnknown_085B224C[] = +{ Unknown_085B2240 }; + static const struct SpriteTemplate gUnknown_085B2250 = { .tileTag = TAG_GFX_WALL_CLOCK_HAND, @@ -161,6 +187,7 @@ static const struct SpriteTemplate gUnknown_085B2250 = .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCB_MinuteHand, }; + static const struct SpriteTemplate gUnknown_085B2268 = { .tileTag = TAG_GFX_WALL_CLOCK_HAND, @@ -171,25 +198,37 @@ static const struct SpriteTemplate gUnknown_085B2268 = .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCB_HourHand, }; -static const struct OamData Unknown_085B2280 = { + +static const struct OamData Unknown_085B2280 = +{ .y = 160, - .size = 1, + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), .priority = 3, }; -static const union AnimCmd Unknown_085B2288[] = { + +static const union AnimCmd Unknown_085B2288[] = +{ ANIMCMD_FRAME(132, 30), ANIMCMD_END, }; -static const union AnimCmd Unknown_085B2290[] = { + +static const union AnimCmd Unknown_085B2290[] = +{ ANIMCMD_FRAME(128, 30), ANIMCMD_END, }; -static const union AnimCmd *const gUnknown_085B2298[] = { + +static const union AnimCmd *const gUnknown_085B2298[] = +{ Unknown_085B2288 }; -static const union AnimCmd *const gUnknown_085B229C[] = { + +static const union AnimCmd *const gUnknown_085B229C[] = +{ Unknown_085B2290 }; + static const struct SpriteTemplate gUnknown_085B22A0 = { .tileTag = TAG_GFX_WALL_CLOCK_HAND, @@ -200,6 +239,7 @@ static const struct SpriteTemplate gUnknown_085B22A0 = .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCB_AMIndicator }; + static const struct SpriteTemplate gUnknown_085B22B8 = { .tileTag = TAG_GFX_WALL_CLOCK_HAND, @@ -210,7 +250,9 @@ static const struct SpriteTemplate gUnknown_085B22B8 = .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCB_PMIndicator }; -static const s8 sClockHandCoords[][2] = { + +static const s8 sClockHandCoords[][2] = +{ { 0x00, -0x18}, { 0x01, -0x19}, { 0x01, -0x19}, From eeb329909c7caab645445849a2f75257a3c72be5 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 11 Mar 2019 03:21:23 -0400 Subject: [PATCH 210/217] Fix anonymous struct --- src/region_map.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/region_map.c b/src/region_map.c index a8b3fc3b2e..25b47479d6 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -36,6 +36,13 @@ // Static type declarations +struct FlagControlledFlyDest +{ + const u8 *const *name; + u16 mapSecId; + u16 flag; +}; + // Static RAM declarations static EWRAM_DATA struct RegionMap *gRegionMap = NULL; @@ -319,17 +326,13 @@ static const u8 *const gUnknown_085A1ED4[] = gText_PokemonCenter }; -static const struct +static const struct FlagControlledFlyDest gUnknown_085A1EDC[] = { - const u8 *const *name; - u16 mapSecId; - u16 flag; -} -gUnknown_085A1EDC[] = -{ - gUnknown_085A1ED4, - MAPSEC_EVER_GRANDE_CITY, - FLAG_LANDMARK_POKEMON_LEAGUE + { + .name = gUnknown_085A1ED4, + .mapSecId = MAPSEC_EVER_GRANDE_CITY, + .flag = FLAG_LANDMARK_POKEMON_LEAGUE + } }; static const struct BgTemplate gUnknown_085A1EE4[] = @@ -1774,7 +1777,7 @@ static void sub_8124904(void) if (sFlyMap->regionMap.iconDrawType > MAPSECTYPE_NONE && sFlyMap->regionMap.iconDrawType <= MAPSECTYPE_BATTLE_FRONTIER) { flag = FALSE; - for (i = 0; i < 1; i++) + for (i = 0; i < ARRAY_COUNT(gUnknown_085A1EDC); i++) { if (sFlyMap->regionMap.mapSecId == gUnknown_085A1EDC[i].mapSecId) { From a029254faa152ae652eb35f6b9e1e80ddc33463a Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 11 Mar 2019 04:15:44 -0400 Subject: [PATCH 211/217] Apply new macros to intro graphics struct --- src/intro_credits_graphics.c | 270 +++++++++++++++++++++++++++++++---- 1 file changed, 243 insertions(+), 27 deletions(-) diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index 29ee2067fa..7ac11e1e03 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -102,15 +102,87 @@ static const union AnimCmd *const gUnknown_085F5094[] = static const struct IntroCreditsSpriteMetadata gUnknown_085F50A4[] = { - { 0, ST_OAM_SQUARE, 2, 72, 32, 100, 0xc00 }, - { 0, ST_OAM_SQUARE, 2, 158, 32, 100, 0xc00 }, - { 1, ST_OAM_SQUARE, 1, 192, 40, 101, 0x800 }, - { 1, ST_OAM_SQUARE, 1, 56, 40, 101, 0x800 }, - { 2, ST_OAM_H_RECTANGLE, 0, 100, 44, 102, 0x400 }, - { 2, ST_OAM_H_RECTANGLE, 0, 152, 44, 102, 0x400 }, - { 3, ST_OAM_H_RECTANGLE, 0, 8, 46, 103, 0x100 }, - { 3, ST_OAM_H_RECTANGLE, 0, 56, 46, 103, 0x100 }, - { 3, ST_OAM_H_RECTANGLE, 0, 240, 46, 103, 0x100 }, + { + .animNum = 0, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), + .x = 72, + .y = 32, + .subpriority = 100, + .xOff = 0xc00 + }, + { + .animNum = 0, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), + .x = 158, + .y = 32, + .subpriority = 100, + .xOff = 0xc00 + }, + { + .animNum = 1, + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), + .x = 192, + .y = 40, + .subpriority = 101, + .xOff = 0x800 + }, + { + .animNum = 1, + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), + .x = 56, + .y = 40, + .subpriority = 101, + .xOff = 0x800 + }, + { + .animNum = 2, + .shape = SPRITE_SHAPE(16x8), + .size = SPRITE_SIZE(16x8), + .x = 100, + .y = 44, + .subpriority = 102, + .xOff = 0x400 + }, + { + .animNum = 2, + .shape = SPRITE_SHAPE(16x8), + .size = SPRITE_SIZE(16x8), + .x = 152, + .y = 44, + .subpriority = 102, + .xOff = 0x400 + }, + { + .animNum = 3, + .shape = SPRITE_SHAPE(16x8), + .size = SPRITE_SIZE(16x8), + .x = 8, + .y = 46, + .subpriority = 103, + .xOff = 0x100 + }, + { + .animNum = 3, + .shape = SPRITE_SHAPE(16x8), + .size = SPRITE_SIZE(16x8), + .x = 56, + .y = 46, + .subpriority = 103, + .xOff = 0x100 + }, + { + .animNum = 3, + .shape = SPRITE_SHAPE(16x8), + .size = SPRITE_SIZE(16x8), + .x = 240, + .y = 46, + .subpriority = 103, + .xOff = 0x100 + }, }; static const struct CompressedSpriteSheet gUnknown_085F50EC[] = @@ -146,18 +218,114 @@ static const union AnimCmd *const gUnknown_085F5114[] = static const struct IntroCreditsSpriteMetadata gUnknown_085F5120[] = { - { 0, ST_OAM_SQUARE, 2, 16, 88, 100, 0x2000 }, - { 0, ST_OAM_SQUARE, 2, 80, 88, 100, 0x2000 }, - { 0, ST_OAM_SQUARE, 2, 144, 88, 100, 0x2000 }, - { 0, ST_OAM_SQUARE, 2, 208, 88, 100, 0x2000 }, - { 1, ST_OAM_V_RECTANGLE, 2, 40, 88, 101, 0x1000 }, - { 1, ST_OAM_V_RECTANGLE, 2, 104, 88, 101, 0x1000 }, - { 1, ST_OAM_V_RECTANGLE, 2, 168, 88, 101, 0x1000 }, - { 1, ST_OAM_V_RECTANGLE, 2, 232, 88, 101, 0x1000 }, - { 2, ST_OAM_V_RECTANGLE, 2, 56, 88, 102, 0x800 }, - { 2, ST_OAM_V_RECTANGLE, 2, 120, 88, 102, 0x800 }, - { 2, ST_OAM_V_RECTANGLE, 2, 184, 88, 102, 0x800 }, - { 2, ST_OAM_V_RECTANGLE, 2, 248, 88, 102, 0x800 }, + { + .animNum = 0, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), + .x = 16, + .y = 88, + .subpriority = 100, + .xOff = 0x2000, + }, + { + .animNum = 0, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), + .x = 80, + .y = 88, + .subpriority = 100, + .xOff = 0x2000, + }, + { + .animNum = 0, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), + .x = 144, + .y = 88, + .subpriority = 100, + .xOff = 0x2000, + }, + { + .animNum = 0, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), + .x = 208, + .y = 88, + .subpriority = 100, + .xOff = 0x2000, + }, + { + .animNum = 1, + .shape = SPRITE_SHAPE(16x32), + .size = SPRITE_SIZE(16x32), + .x = 40, + .y = 88, + .subpriority = 101, + .xOff = 0x1000, + }, + { + .animNum = 1, + .shape = SPRITE_SHAPE(16x32), + .size = SPRITE_SIZE(16x32), + .x = 104, + .y = 88, + .subpriority = 101, + .xOff = 0x1000, + }, + { + .animNum = 1, + .shape = SPRITE_SHAPE(16x32), + .size = SPRITE_SIZE(16x32), + .x = 168, + .y = 88, + .subpriority = 101, + .xOff = 0x1000, + }, + { + .animNum = 1, + .shape = SPRITE_SHAPE(16x32), + .size = SPRITE_SIZE(16x32), + .x = 232, + .y = 88, + .subpriority = 101, + .xOff = 0x1000, + }, + { + .animNum = 2, + .shape = SPRITE_SHAPE(16x32), + .size = SPRITE_SIZE(16x32), + .x = 56, + .y = 88, + .subpriority = 102, + .xOff = 0x800, + }, + { + .animNum = 2, + .shape = SPRITE_SHAPE(16x32), + .size = SPRITE_SIZE(16x32), + .x = 120, + .y = 88, + .subpriority = 102, + .xOff = 0x800, + }, + { + .animNum = 2, + .shape = SPRITE_SHAPE(16x32), + .size = SPRITE_SIZE(16x32), + .x = 184, + .y = 88, + .subpriority = 102, + .xOff = 0x800, + }, + { + .animNum = 2, + .shape = SPRITE_SHAPE(16x32), + .size = SPRITE_SIZE(16x32), + .x = 248, + .y = 88, + .subpriority = 102, + .xOff = 0x800, + } }; static const struct CompressedSpriteSheet gUnknown_085F5180[] = @@ -179,12 +347,60 @@ static const union AnimCmd *const gUnknown_085F5198[] = static const struct IntroCreditsSpriteMetadata gUnknown_085F519C[] = { - { 0, ST_OAM_SQUARE, 2, 24, 88, 100, 0x1000 }, - { 0, ST_OAM_SQUARE, 2, 64, 88, 100, 0x1000 }, - { 0, ST_OAM_SQUARE, 2, 104, 88, 100, 0x1000 }, - { 0, ST_OAM_SQUARE, 2, 144, 88, 100, 0x1000 }, - { 0, ST_OAM_SQUARE, 2, 184, 88, 100, 0x1000 }, - { 0, ST_OAM_SQUARE, 2, 224, 88, 100, 0x1000 }, + { + .animNum = 0, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), + .x = 24, + .y = 88, + .subpriority = 100, + .xOff = 0x1000, + }, + { + .animNum = 0, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), + .x = 64, + .y = 88, + .subpriority = 100, + .xOff = 0x1000, + }, + { + .animNum = 0, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), + .x = 104, + .y = 88, + .subpriority = 100, + .xOff = 0x1000, + }, + { + .animNum = 0, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), + .x = 144, + .y = 88, + .subpriority = 100, + .xOff = 0x1000, + }, + { + .animNum = 0, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), + .x = 184, + .y = 88, + .subpriority = 100, + .xOff = 0x1000, + }, + { + .animNum = 0, + .shape = SPRITE_SHAPE(32x32), + .size = SPRITE_SIZE(32x32), + .x = 224, + .y = 88, + .subpriority = 100, + .xOff = 0x1000, + } }; static const struct OamData gOamData_85F51CC = From 691392fd5ddbeae70e1daa9eee48085189667c39 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 11 Mar 2019 04:28:43 -0400 Subject: [PATCH 212/217] Clean up intro_credits_graphics constants --- src/intro_credits_graphics.c | 196 ++++++++++++++++++++++++++--------- 1 file changed, 149 insertions(+), 47 deletions(-) diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index 7ac11e1e03..059c1079ec 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -59,13 +59,23 @@ static void nullsub_66(struct Sprite *sprite); static const struct SpriteTemplate gUnknown_085F504C = { - 2000, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817B62C + .tileTag = 2000, + .paletteTag = 0xFFFF, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_817B62C }; static const struct CompressedSpriteSheet gUnknown_085F5064[] = { - { gUnknown_085F16A8, 0x400, 2000 }, - { NULL } + { + .data = gUnknown_085F16A8, + .size = 0x400, + .tag = 2000 + }, + {} }; static const union AnimCmd gUnknown_085F5074[] = @@ -187,8 +197,12 @@ static const struct IntroCreditsSpriteMetadata gUnknown_085F50A4[] = static const struct CompressedSpriteSheet gUnknown_085F50EC[] = { - { gIntro2TreeTiles, 0x400, 2000 }, - { NULL } + { + .data = gIntro2TreeTiles, + .size = 0x400, + .tag = 2000 + }, + {} }; static const union AnimCmd gUnknown_085F50FC[] = @@ -330,8 +344,12 @@ static const struct IntroCreditsSpriteMetadata gUnknown_085F5120[] = static const struct CompressedSpriteSheet gUnknown_085F5180[] = { - { gIntro2NightTiles, 0x400, 2000 }, - { NULL } + { + .data = gIntro2NightTiles, + .size = 0x400, + .tag = 2000 + }, + {} }; static const union AnimCmd gUnknown_085F5190[] = @@ -427,12 +445,24 @@ static const union AnimCmd *const gUnknown_085F51E8[] = static const struct SpriteTemplate gUnknown_085F51EC = { - 1002, 1002, &gOamData_85F51CC, gUnknown_085F51E8, NULL, gDummySpriteAffineAnimTable, nullsub_65 + .tileTag = 1002, + .paletteTag = 1002, + .oam = &gOamData_85F51CC, + .anims = gUnknown_085F51E8, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = nullsub_65 }; static const struct SpriteTemplate gUnknown_085F5204 = { - 1003, 1003, &gOamData_85F51CC, gUnknown_085F51E8, NULL, gDummySpriteAffineAnimTable, nullsub_65 + .tileTag = 1003, + .paletteTag = 1003, + .oam = &gOamData_85F51CC, + .anims = gUnknown_085F51E8, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = nullsub_65 }; static const struct OamData gUnknown_085F521C = @@ -459,12 +489,24 @@ static const union AnimCmd *const gUnknown_085F5238[] = static const struct SpriteTemplate gUnknown_085F523C = { - 1001, 1002, &gUnknown_085F521C, gUnknown_085F5238, NULL, gDummySpriteAffineAnimTable, sub_817B7C4 + .tileTag = 1001, + .paletteTag = 1002, + .oam = &gUnknown_085F521C, + .anims = gUnknown_085F5238, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_817B7C4 }; static const struct SpriteTemplate gUnknown_085F5254 = { - 1001, 1003, &gUnknown_085F521C, gUnknown_085F5238, NULL, gDummySpriteAffineAnimTable, sub_817B7C4 + .tileTag = 1001, + .paletteTag = 1003, + .oam = &gUnknown_085F521C, + .anims = gUnknown_085F5238, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_817B7C4 }; static const struct OamData gUnknown_085F526C = @@ -495,102 +537,162 @@ static const union AnimCmd *const gUnknown_085F5284[] = static const struct SpriteTemplate gUnknown_085F528C = { - 1004, 1004, &gUnknown_085F526C, gUnknown_085F5284, NULL, gDummySpriteAffineAnimTable, nullsub_66 + .tileTag = 1004, + .paletteTag = 1004, + .oam = &gUnknown_085F526C, + .anims = gUnknown_085F5284, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = nullsub_66 }; static const struct SpriteTemplate gUnknown_085F52A4 = { - 1005, 1005, &gUnknown_085F526C, gUnknown_085F5284, NULL, gDummySpriteAffineAnimTable, nullsub_66 + .tileTag = 1005, + .paletteTag = 1005, + .oam = &gUnknown_085F526C, + .anims = gUnknown_085F5284, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = nullsub_66 }; const struct CompressedSpriteSheet gIntro2BrendanSpriteSheet[] = { - { gIntro2BrendanNoTurnGfx, 0x2000, 1002 }, - { NULL } + { + .data = gIntro2BrendanNoTurnGfx, + .size = 0x2000, + .tag = 1002 + }, + {} }; const struct CompressedSpriteSheet gIntro2MaySpriteSheet[] = { - { gIntro2MayNoTurnGfx, 0x2000, 1003 }, - { NULL } + { + .data = gIntro2MayNoTurnGfx, + .size = 0x2000, + .tag = 1003 + }, + {} }; const struct CompressedSpriteSheet gIntro2BicycleSpriteSheet[] = { - { gIntro2BicycleTiles, 0x1000, 1001 }, - { NULL } + { + .data = gIntro2BicycleTiles, + .size = 0x1000, + .tag = 1001 + }, + {} }; static const struct CompressedSpriteSheet gUnknown_085F52EC[] = { - { gIntro2FlygonGfx, 0x1000, 1004 }, - { NULL } + { + .data = gIntro2FlygonGfx, + .size = 0x1000, + .tag = 1004 + }, + {} }; const struct CompressedSpriteSheet gIntro2FlygonSpriteSheet[] = { - { gIntro2FlygonGfx, 0x1000, 1005 }, - { NULL } + { + .data = gIntro2FlygonGfx, + .size = 0x1000, + .tag = 1005 + }, + {} }; const struct SpritePalette gIntroBikeAndFlygonPalette[] = { - { gIntro2BrendanNoTurnPal, 1002 }, - { gIntro2BrendanNoTurnPal, 1003 }, - { gIntro2FlygonPal, 1004 }, - { gIntro2FlygonPal, 1005 }, - { NULL } + { .data = gIntro2BrendanNoTurnPal, .tag = 1002 }, + { .data = gIntro2BrendanNoTurnPal, .tag = 1003 }, + { .data = gIntro2FlygonPal, .tag = 1004 }, + { .data = gIntro2FlygonPal, .tag = 1005 }, + {} }; const struct CompressedSpriteSheet gUnknown_085F5334[] = { - { gIntro2BrendanTiles, 0x3800, 1002 }, - { NULL } + { + .data = gIntro2BrendanTiles, + .size = 0x3800, + .tag = 1002 + }, + {} }; const struct CompressedSpriteSheet gUnknown_085F5344[] = { - { gIntro2MayTiles, 0x3800, 1003 }, - { NULL } + { + .data = gIntro2MayTiles, + .size = 0x3800, + .tag = 1003 + }, + {} }; const struct CompressedSpriteSheet gUnknown_085F5354[] = { - { gIntro2BicycleTiles, 0x1000, 1001 }, - { NULL } + { + .data = gIntro2BicycleTiles, + .size = 0x1000, + .tag = 1001 + }, + {} }; static const struct CompressedSpriteSheet gUnknown_085F5364[] = { - { gIntro2LatiosTiles, 0x1000, 1004 }, - { NULL } + { + .data = gIntro2LatiosTiles, + .size = 0x1000, + .tag = 1004 + }, + {} }; static const struct CompressedSpriteSheet gUnknown_085F5374[] = { - { gIntro2LatiasTiles, 0x1000, 1005 }, - { NULL } + { + .data = gIntro2LatiasTiles, + .size = 0x1000, + .tag = 1005 + }, + {} }; const struct SpritePalette gUnknown_085F5384[] = { - { gIntro2BrendanPalette, 1002 }, - { gIntro2MayPalette, 1003 }, - { gIntro2LatiosPalette, 1004 }, - { gIntro2LatiasPalette, 1005 }, - { NULL } + { .data = gIntro2BrendanPalette, .tag = 1002 }, + { .data = gIntro2MayPalette, .tag = 1003 }, + { .data = gIntro2LatiosPalette, .tag = 1004 }, + { .data = gIntro2LatiasPalette, .tag = 1005 }, + {} }; const struct CompressedSpriteSheet gUnknown_085F53AC[] = { - { gIntro2BrendanTiles, 0x2000, 1002}, - { NULL } + { + .data = gIntro2BrendanTiles, + .size = 0x2000, + .tag = 1002 + }, + {} }; const struct CompressedSpriteSheet gUnknown_085F53BC[] = { - { gIntro2MayTiles, 0x2000, 1003}, - { NULL } + { + .data = gIntro2MayTiles, + .size = 0x2000, + .tag = 1003 + }, + {} }; EWRAM_DATA u16 gUnknown_0203BD24 = 0; From 4ae8a52473a0e4842cf140bf0c59f0276125a896 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 17 Mar 2019 16:19:42 -0500 Subject: [PATCH 213/217] Finish decompiling contest_painting_effects.c --- asm/contest_painting_effects.s | 1152 -------------------------------- ld_script.txt | 1 - src/contest_painting_effects.c | 701 +++++++++++++++++-- 3 files changed, 646 insertions(+), 1208 deletions(-) delete mode 100644 asm/contest_painting_effects.s diff --git a/asm/contest_painting_effects.s b/asm/contest_painting_effects.s deleted file mode 100644 index 801e840b9a..0000000000 --- a/asm/contest_painting_effects.s +++ /dev/null @@ -1,1152 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - - - - - thumb_func_start sub_8126058 -sub_8126058: @ 8126058 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - ldrb r1, [r0, 0x1D] - lsrs r5, r1, 3 - ldrb r1, [r0, 0x1E] - lsrs r1, 3 - str r1, [sp, 0x8] - ldr r1, [r0, 0x4] - str r1, [sp] - ldr r2, [r0, 0x10] - str r2, [sp, 0x4] - ldrh r0, [r0, 0x16] - cmp r0, 0x2 - bne _08126108 - movs r1, 0 - ldr r0, [sp, 0x8] - cmp r1, r0 - bcc _08126086 - b _08126194 -_08126086: - movs r0, 0 - adds r2, r1, 0x1 - mov r10, r2 - cmp r0, r5 - bcs _081260FA - adds r2, r1, 0 - muls r2, r5 - mov r9, r2 - lsls r1, 3 - mov r8, r1 -_0812609A: - movs r4, 0 - lsls r6, r0, 4 - adds r7, r0, 0x1 - add r0, r9 - lsls r0, 6 - ldr r1, [sp, 0x4] - adds r1, r0 - mov r12, r1 -_081260AA: - lsls r0, r4, 3 - mov r2, r12 - adds r3, r2, r0 - mov r1, r8 - adds r0, r1, r4 - lsls r0, 3 - muls r0, r5 - lsls r0, 1 - ldr r2, [sp] - adds r0, r2, r0 - adds r2, r0, r6 - ldrh r0, [r2, 0x2] - lsls r0, 8 - ldrh r1, [r2] - orrs r0, r1 - strh r0, [r3] - ldrh r0, [r2, 0x6] - lsls r0, 8 - ldrh r1, [r2, 0x4] - orrs r0, r1 - strh r0, [r3, 0x2] - ldrh r0, [r2, 0xA] - lsls r0, 8 - ldrh r1, [r2, 0x8] - orrs r0, r1 - strh r0, [r3, 0x4] - ldrh r0, [r2, 0xE] - lsls r0, 8 - ldrh r1, [r2, 0xC] - orrs r0, r1 - strh r0, [r3, 0x6] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x7 - bls _081260AA - lsls r0, r7, 16 - lsrs r0, 16 - cmp r0, r5 - bcc _0812609A -_081260FA: - mov r1, r10 - lsls r0, r1, 16 - lsrs r1, r0, 16 - ldr r2, [sp, 0x8] - cmp r1, r2 - bcc _08126086 - b _08126194 -_08126108: - movs r1, 0 - ldr r0, [sp, 0x8] - cmp r1, r0 - bcs _08126194 -_08126110: - movs r0, 0 - adds r2, r1, 0x1 - mov r10, r2 - cmp r0, r5 - bcs _08126188 - adds r2, r1, 0 - muls r2, r5 - mov r9, r2 - lsls r1, 3 - mov r8, r1 -_08126124: - movs r4, 0 - lsls r6, r0, 4 - adds r7, r0, 0x1 - add r0, r9 - lsls r0, 5 - ldr r1, [sp, 0x4] - adds r1, r0 - mov r12, r1 -_08126134: - lsls r0, r4, 2 - mov r2, r12 - adds r3, r2, r0 - mov r1, r8 - adds r0, r1, r4 - lsls r0, 3 - muls r0, r5 - lsls r0, 1 - ldr r2, [sp] - adds r0, r2, r0 - adds r2, r0, r6 - ldrh r1, [r2, 0x2] - lsls r1, 4 - ldrh r0, [r2] - orrs r1, r0 - ldrh r0, [r2, 0x4] - lsls r0, 8 - orrs r1, r0 - ldrh r0, [r2, 0x6] - lsls r0, 12 - orrs r1, r0 - strh r1, [r3] - ldrh r1, [r2, 0xA] - lsls r1, 4 - ldrh r0, [r2, 0x8] - orrs r1, r0 - ldrh r0, [r2, 0xC] - lsls r0, 8 - orrs r1, r0 - ldrh r0, [r2, 0xE] - lsls r0, 12 - orrs r1, r0 - strh r1, [r3, 0x2] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x7 - bls _08126134 - lsls r0, r7, 16 - lsrs r0, 16 - cmp r0, r5 - bcc _08126124 -_08126188: - mov r1, r10 - lsls r0, r1, 16 - lsrs r1, r0, 16 - ldr r2, [sp, 0x8] - cmp r1, r2 - bcc _08126110 -_08126194: - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8126058 - - thumb_func_start sub_81261A4 -sub_81261A4: @ 81261A4 - push {lr} - ldr r2, =gUnknown_03006188 - ldrb r1, [r0, 0x18] - lsls r1, 4 - strh r1, [r2] - ldr r3, =gUnknown_03006184 - ldrh r2, [r2] - lsls r2, 1 - ldr r1, [r0, 0x8] - adds r1, r2 - str r1, [r3] - ldr r2, =gUnknown_03006168 - ldr r1, [r0, 0x4] - str r1, [r2] - ldr r2, =gUnknown_03006164 - ldrb r1, [r0, 0x19] - strb r1, [r2] - ldr r2, =gUnknown_03006178 - ldrb r1, [r0, 0x1A] - strb r1, [r2] - ldr r2, =gUnknown_03006174 - ldrb r1, [r0, 0x1B] - strb r1, [r2] - ldr r2, =gUnknown_0300616C - ldrb r1, [r0, 0x1C] - strb r1, [r2] - ldr r2, =gUnknown_03006180 - ldrb r1, [r0, 0x1D] - strb r1, [r2] - ldr r2, =gUnknown_03006170 - ldrb r1, [r0, 0x1E] - strb r1, [r2] - ldrh r0, [r0, 0x14] - cmp r0, 0x5 - bhi _0812626A - lsls r0, 2 - ldr r1, =_0812621C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0812621C: - .4byte _08126234 - .4byte _0812623C - .4byte _08126244 - .4byte _0812624E - .4byte _08126258 - .4byte _08126262 -_08126234: - movs r0, 0 - bl sub_81263A4 - b _0812626A -_0812623C: - movs r0, 0x1 - bl sub_81263A4 - b _0812626A -_08126244: - bl sub_8126270 - bl sub_8126714 - b _0812626A -_0812624E: - bl sub_8126370 - bl sub_8126664 - b _0812626A -_08126258: - bl sub_8126334 - bl sub_81265B4 - b _0812626A -_08126262: - bl sub_8126318 - bl sub_81264FC -_0812626A: - pop {r0} - bx r0 - thumb_func_end sub_81261A4 - - thumb_func_start sub_8126270 -sub_8126270: @ 8126270 - ldr r2, =gUnknown_03006184 - ldr r1, [r2] - movs r0, 0 - strh r0, [r1] - ldr r0, [r2] - ldr r2, =0x000018c6 - adds r1, r2, 0 - strh r1, [r0, 0x2] - ldr r2, =0x000077bd - adds r1, r2, 0 - strh r1, [r0, 0x4] - ldr r2, =0x00002d6b - adds r1, r2, 0 - strh r1, [r0, 0x6] - ldr r2, =0x000018dd - adds r1, r2, 0 - strh r1, [r0, 0x8] - ldr r2, =0x00001ba6 - adds r1, r2, 0 - strh r1, [r0, 0xA] - ldr r2, =0x000074c6 - adds r1, r2, 0 - strh r1, [r0, 0xC] - ldr r2, =0x00001bbd - adds r1, r2, 0 - strh r1, [r0, 0xE] - ldr r2, =0x000074dd - adds r1, r2, 0 - strh r1, [r0, 0x10] - ldr r2, =0x000077a6 - adds r1, r2, 0 - strh r1, [r0, 0x12] - ldr r2, =0x0000197d - adds r1, r2, 0 - strh r1, [r0, 0x14] - ldr r2, =0x00001bab - adds r1, r2, 0 - strh r1, [r0, 0x16] - ldr r2, =0x00007566 - adds r1, r2, 0 - strh r1, [r0, 0x18] - ldr r2, =0x00002cdd - adds r1, r2, 0 - strh r1, [r0, 0x1A] - ldr r2, =0x00002fa6 - adds r1, r2, 0 - strh r1, [r0, 0x1C] - ldr r2, =0x000074cb - adds r1, r2, 0 - strh r1, [r0, 0x1E] - bx lr - .pool - thumb_func_end sub_8126270 - - thumb_func_start sub_8126318 -sub_8126318: @ 8126318 - ldr r2, =gUnknown_03006184 - ldr r0, [r2] - movs r1, 0 - strh r1, [r0] - ldr r2, [r2] - strh r1, [r2, 0x2] - ldr r1, =0x00007fff - adds r0, r1, 0 - strh r0, [r2, 0x4] - bx lr - .pool - thumb_func_end sub_8126318 - - thumb_func_start sub_8126334 -sub_8126334: @ 8126334 - push {r4,r5,lr} - ldr r1, =gUnknown_03006184 - ldr r0, [r1] - movs r2, 0 - strh r2, [r0] - ldr r0, [r1] - strh r2, [r0, 0x2] - movs r4, 0 - adds r5, r1, 0 -_08126346: - ldr r0, [r5] - lsls r2, r4, 1 - adds r2, r0 - adds r0, r4, 0x2 - lsls r3, r0, 1 - lsls r1, r0, 11 - lsls r0, 6 - orrs r1, r0 - orrs r1, r3 - strh r1, [r2, 0x4] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xD - bls _08126346 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8126334 - - thumb_func_start sub_8126370 -sub_8126370: @ 8126370 - push {r4,lr} - ldr r2, =gUnknown_03006184 - ldr r1, [r2] - movs r0, 0 - strh r0, [r1] - movs r3, 0 - adds r4, r2, 0 -_0812637E: - ldr r0, [r4] - lsls r2, r3, 1 - adds r2, r0 - lsls r0, r3, 10 - lsls r1, r3, 5 - orrs r0, r1 - orrs r0, r3 - strh r0, [r2, 0x2] - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x1F - bls _0812637E - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8126370 - - thumb_func_start sub_81263A4 -sub_81263A4: @ 81263A4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - movs r1, 0xDF - mov r9, r1 - cmp r0, 0 - bne _081263BC - movs r2, 0xFF - mov r9, r2 -_081263BC: - movs r6, 0 - ldr r3, =gUnknown_03006184 - mov r12, r3 - mov r0, r9 - lsls r4, r0, 1 - ldr r5, =gUnknown_0300616C - cmp r6, r9 - bcs _081263E0 - movs r2, 0 -_081263CE: - ldr r0, [r3] - lsls r1, r6, 1 - adds r1, r0 - strh r2, [r1] - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, r9 - bcc _081263CE -_081263E0: - mov r1, r12 - ldr r0, [r1] - adds r0, r4, r0 - ldr r2, =0x00003def - adds r1, r2, 0 - strh r1, [r0] - movs r3, 0 - ldrb r5, [r5] - cmp r3, r5 - bcs _081264E4 -_081263F4: - ldr r2, =gUnknown_03006168 - ldr r0, =gUnknown_03006178 - ldrb r1, [r0] - adds r1, r3 - ldr r0, =gUnknown_03006180 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - ldr r1, [r2] - adds r1, r0 - ldr r0, =gUnknown_03006164 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r6, 0 - ldr r0, =gUnknown_03006174 - adds r2, r0, 0 - adds r3, 0x1 - mov r10, r3 - ldrb r3, [r2] - cmp r6, r3 - bcs _081264D6 - ldr r0, =gUnknown_03006188 - mov r8, r0 -_08126424: - ldrh r0, [r4] - movs r3, 0x80 - lsls r3, 8 - adds r1, r3, 0 - ands r0, r1 - cmp r0, 0 - beq _08126464 - mov r1, r8 - ldrh r0, [r1] - strh r0, [r4] - adds r6, 0x1 - adds r7, r4, 0x2 - b _081264CA - .pool -_08126464: - adds r0, r4, 0 - bl sub_81267C4 - lsls r0, 16 - lsrs r5, r0, 16 - movs r3, 0x1 - adds r6, 0x1 - adds r7, r4, 0x2 - cmp r3, r9 - bcs _081264C0 - ldr r0, =gUnknown_03006184 - ldr r2, [r0] - ldrh r1, [r2, 0x2] - mov r12, r0 - cmp r1, 0 - bne _08126494 - strh r5, [r2, 0x2] - mov r2, r8 - ldrh r0, [r2] - adds r0, 0x1 - b _081264BE - .pool -_08126494: - mov r2, r12 - ldr r1, [r2] - lsls r0, r3, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r0, r5 - beq _081264B8 - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, r9 - bcs _081264C0 - lsls r0, r3, 1 - adds r1, r0, r1 - ldrh r0, [r1] - cmp r0, 0 - bne _08126494 - strh r5, [r1] -_081264B8: - mov r1, r8 - ldrh r0, [r1] - adds r0, r3 -_081264BE: - strh r0, [r4] -_081264C0: - ldr r2, =gUnknown_03006174 - cmp r3, r9 - bne _081264CA - mov r3, r9 - strh r3, [r4] -_081264CA: - lsls r0, r6, 24 - lsrs r6, r0, 24 - adds r4, r7, 0 - ldrb r0, [r2] - cmp r6, r0 - bcc _08126424 -_081264D6: - mov r1, r10 - lsls r0, r1, 24 - lsrs r3, r0, 24 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r3, r0 - bcc _081263F4 -_081264E4: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81263A4 - - thumb_func_start sub_81264FC -sub_81264FC: @ 81264FC - push {r4-r7,lr} - mov r7, r8 - push {r7} - movs r2, 0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcs _081265A0 - ldr r0, =gUnknown_03006168 - mov r8, r0 -_08126510: - ldr r0, =gUnknown_03006178 - ldrb r1, [r0] - adds r1, r2 - ldr r0, =gUnknown_03006180 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r3, r8 - ldr r1, [r3] - adds r1, r0 - ldr r0, =gUnknown_03006164 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r6, 0 - ldr r0, =gUnknown_03006174 - adds r3, r0, 0 - adds r7, r2, 0x1 - ldrb r0, [r3] - cmp r6, r0 - bcs _08126594 - ldr r5, =gUnknown_03006188 -_0812653C: - ldrh r0, [r4] - movs r2, 0x80 - lsls r2, 8 - adds r1, r2, 0 - ands r0, r1 - cmp r0, 0 - beq _0812656C - ldrh r0, [r5] - strh r0, [r4] - b _08126586 - .pool -_0812656C: - adds r0, r4, 0 - bl ConvertToBlackOrWhite - lsls r0, 16 - cmp r0, 0 - bne _0812657E - ldrh r0, [r5] - adds r0, 0x1 - b _08126582 -_0812657E: - ldrh r0, [r5] - adds r0, 0x2 -_08126582: - strh r0, [r4] - ldr r3, =gUnknown_03006174 -_08126586: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - adds r4, 0x2 - ldrb r0, [r3] - cmp r6, r0 - bcc _0812653C -_08126594: - lsls r0, r7, 24 - lsrs r2, r0, 24 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcc _08126510 -_081265A0: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81264FC - - thumb_func_start sub_81265B4 -sub_81265B4: @ 81265B4 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - movs r2, 0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcs _08126650 - ldr r0, =gUnknown_03006168 - mov r8, r0 -_081265CA: - ldr r0, =gUnknown_03006178 - ldrb r1, [r0] - adds r1, r2 - ldr r0, =gUnknown_03006180 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r3, r8 - ldr r1, [r3] - adds r1, r0 - ldr r0, =gUnknown_03006164 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r5, 0 - ldr r0, =gUnknown_03006174 - adds r7, r2, 0x1 - ldrb r0, [r0] - cmp r5, r0 - bcs _08126644 - ldr r6, =gUnknown_03006188 - movs r0, 0x80 - lsls r0, 8 - adds r2, r0, 0 -_081265FA: - ldrh r0, [r4] - ands r0, r2 - cmp r0, 0 - beq _08126624 - ldrh r0, [r6] - strh r0, [r4] - b _08126634 - .pool -_08126624: - adds r0, r4, 0 - str r2, [sp] - bl sub_8126908 - ldrh r1, [r6] - adds r0, r1 - strh r0, [r4] - ldr r2, [sp] -_08126634: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r4, 0x2 - ldr r0, =gUnknown_03006174 - ldrb r0, [r0] - cmp r5, r0 - bcc _081265FA -_08126644: - lsls r0, r7, 24 - lsrs r2, r0, 24 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcc _081265CA -_08126650: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81265B4 - - thumb_func_start sub_8126664 -sub_8126664: @ 8126664 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - movs r2, 0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcs _08126700 - ldr r0, =gUnknown_03006168 - mov r8, r0 -_0812667A: - ldr r0, =gUnknown_03006178 - ldrb r1, [r0] - adds r1, r2 - ldr r0, =gUnknown_03006180 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r3, r8 - ldr r1, [r3] - adds r1, r0 - ldr r0, =gUnknown_03006164 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r5, 0 - ldr r0, =gUnknown_03006174 - adds r7, r2, 0x1 - ldrb r0, [r0] - cmp r5, r0 - bcs _081266F4 - ldr r6, =gUnknown_03006188 - movs r0, 0x80 - lsls r0, 8 - adds r2, r0, 0 -_081266AA: - ldrh r0, [r4] - ands r0, r2 - cmp r0, 0 - beq _081266D4 - ldrh r0, [r6] - strh r0, [r4] - b _081266E4 - .pool -_081266D4: - adds r0, r4, 0 - str r2, [sp] - bl sub_812693C - ldrh r1, [r6] - adds r0, r1 - strh r0, [r4] - ldr r2, [sp] -_081266E4: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r4, 0x2 - ldr r0, =gUnknown_03006174 - ldrb r0, [r0] - cmp r5, r0 - bcc _081266AA -_081266F4: - lsls r0, r7, 24 - lsrs r2, r0, 24 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcc _0812667A -_08126700: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8126664 - - thumb_func_start sub_8126714 -sub_8126714: @ 8126714 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - movs r2, 0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcs _081267B0 - ldr r0, =gUnknown_03006168 - mov r8, r0 -_0812672A: - ldr r0, =gUnknown_03006178 - ldrb r1, [r0] - adds r1, r2 - ldr r0, =gUnknown_03006180 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r3, r8 - ldr r1, [r3] - adds r1, r0 - ldr r0, =gUnknown_03006164 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r5, 0 - ldr r0, =gUnknown_03006174 - adds r7, r2, 0x1 - ldrb r0, [r0] - cmp r5, r0 - bcs _081267A4 - ldr r6, =gUnknown_03006188 - movs r0, 0x80 - lsls r0, 8 - adds r2, r0, 0 -_0812675A: - ldrh r0, [r4] - ands r0, r2 - cmp r0, 0 - beq _08126784 - ldrh r0, [r6] - strh r0, [r4] - b _08126794 - .pool -_08126784: - adds r0, r4, 0 - str r2, [sp] - bl sub_8126838 - ldrh r1, [r6] - adds r0, r1 - strh r0, [r4] - ldr r2, [sp] -_08126794: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r4, 0x2 - ldr r0, =gUnknown_03006174 - ldrb r0, [r0] - cmp r5, r0 - bcc _0812675A -_081267A4: - lsls r0, r7, 24 - lsrs r2, r0, 24 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcc _0812672A -_081267B0: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8126714 - - thumb_func_start sub_81267C4 -sub_81267C4: @ 81267C4 - push {r4,lr} - ldrh r0, [r0] - movs r1, 0x1F - movs r4, 0x1F - ands r4, r0 - lsls r0, 16 - lsrs r3, r0, 21 - ands r3, r1 - lsrs r2, r0, 26 - ands r2, r1 - movs r1, 0x3 - adds r0, r4, 0 - ands r0, r1 - cmp r0, 0 - beq _081267E8 - movs r0, 0x1C - ands r0, r4 - adds r4, r0, 0x4 -_081267E8: - adds r0, r3, 0 - ands r0, r1 - cmp r0, 0 - beq _081267F6 - movs r0, 0x1C - ands r0, r3 - adds r3, r0, 0x4 -_081267F6: - adds r0, r2, 0 - ands r0, r1 - cmp r0, 0 - beq _08126804 - movs r0, 0x1C - ands r0, r2 - adds r2, r0, 0x4 -_08126804: - cmp r4, 0x5 - bhi _0812680A - movs r4, 0x6 -_0812680A: - cmp r4, 0x1E - bls _08126810 - movs r4, 0x1E -_08126810: - cmp r3, 0x5 - bhi _08126816 - movs r3, 0x6 -_08126816: - cmp r3, 0x1E - bls _0812681C - movs r3, 0x1E -_0812681C: - cmp r2, 0x5 - bhi _08126822 - movs r2, 0x6 -_08126822: - cmp r2, 0x1E - bls _08126828 - movs r2, 0x1E -_08126828: - lsls r0, r2, 10 - lsls r1, r3, 5 - orrs r0, r1 - orrs r4, r0 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81267C4 - - thumb_func_start sub_8126838 -sub_8126838: @ 8126838 - push {lr} - ldrh r0, [r0] - movs r1, 0x1F - movs r3, 0x1F - ands r3, r0 - lsls r0, 16 - lsrs r2, r0, 21 - ands r2, r1 - lsrs r0, 26 - ands r0, r1 - cmp r3, 0xB - bhi _0812685C - cmp r2, 0xA - bhi _0812685C - cmp r0, 0xA - bhi _0812685C - movs r0, 0x1 - b _08126902 -_0812685C: - cmp r3, 0x13 - bls _08126880 - cmp r2, 0x13 - bls _08126868 - cmp r0, 0x13 - bhi _0812688C -_08126868: - cmp r3, 0x13 - bls _08126880 - cmp r2, 0x13 - bls _08126876 - cmp r0, 0xE - bhi _0812688C - b _081268C4 -_08126876: - cmp r0, 0x13 - bls _08126880 - cmp r2, 0xE - bhi _0812688C - b _081268A0 -_08126880: - cmp r2, 0x13 - bls _08126890 - cmp r0, 0x13 - bls _08126890 - cmp r3, 0xE - bls _081268E8 -_0812688C: - movs r0, 0x2 - b _08126902 -_08126890: - cmp r3, 0x13 - bls _081268B4 - cmp r2, 0xB - bls _081268A8 - cmp r0, 0xB - bls _081268A4 - cmp r2, r0 - bcs _081268C4 -_081268A0: - movs r0, 0x8 - b _08126902 -_081268A4: - movs r0, 0xA - b _08126902 -_081268A8: - cmp r0, 0xB - bls _081268B0 - movs r0, 0xD - b _08126902 -_081268B0: - movs r0, 0x4 - b _08126902 -_081268B4: - cmp r2, 0x13 - bls _081268D8 - cmp r3, 0xB - bls _081268CC - cmp r0, 0xB - bls _081268C8 - cmp r3, r0 - bcc _081268E8 -_081268C4: - movs r0, 0x7 - b _08126902 -_081268C8: - movs r0, 0xB - b _08126902 -_081268CC: - cmp r0, 0xB - bls _081268D4 - movs r0, 0xE - b _08126902 -_081268D4: - movs r0, 0x5 - b _08126902 -_081268D8: - cmp r0, 0x13 - bls _08126900 - cmp r3, 0xB - bls _081268EC - cmp r2, 0xB - bls _081268F4 - cmp r3, r2 - bcs _081268A0 -_081268E8: - movs r0, 0x9 - b _08126902 -_081268EC: - cmp r2, 0xB - bls _081268F4 - movs r0, 0xC - b _08126902 -_081268F4: - cmp r0, 0xB - bls _081268FC - movs r0, 0xF - b _08126902 -_081268FC: - movs r0, 0x6 - b _08126902 -_08126900: - movs r0, 0x3 -_08126902: - pop {r1} - bx r1 - thumb_func_end sub_8126838 - - thumb_func_start sub_8126908 -sub_8126908: @ 8126908 - push {lr} - ldrh r1, [r0] - movs r3, 0x1F - movs r0, 0x1F - ands r0, r1 - lsls r1, 16 - lsrs r2, r1, 21 - ands r2, r3 - lsrs r1, 26 - ands r1, r3 - adds r0, r2 - adds r0, r1 - movs r1, 0x3 - bl __divsi3 - movs r1, 0x1E - ands r0, r1 - lsls r0, 16 - cmp r0, 0 - beq _08126934 - lsrs r0, 17 - b _08126936 -_08126934: - movs r0, 0x1 -_08126936: - pop {r1} - bx r1 - thumb_func_end sub_8126908 - - thumb_func_start sub_812693C -sub_812693C: @ 812693C - push {lr} - ldrh r1, [r0] - movs r3, 0x1F - movs r0, 0x1F - ands r0, r1 - lsls r1, 16 - lsrs r2, r1, 21 - ands r2, r3 - lsrs r1, 26 - ands r1, r3 - adds r0, r2 - adds r0, r1 - movs r1, 0x3 - bl __divsi3 - lsls r0, 16 - movs r1, 0x80 - lsls r1, 9 - adds r0, r1 - lsrs r0, 16 - pop {r1} - bx r1 - thumb_func_end sub_812693C - - .align 2, 0 @ Don't pad with nop. diff --git a/ld_script.txt b/ld_script.txt index e60badcc20..263bcbd200 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -185,7 +185,6 @@ SECTIONS { src/heal_location.o(.text); src/region_map.o(.text); src/contest_painting_effects.o(.text); - asm/contest_painting_effects.o(.text); src/decoration.o(.text); src/slot_machine.o(.text); src/contest_painting.o(.text); diff --git a/src/contest_painting_effects.c b/src/contest_painting_effects.c index 142ad7bc91..a791df65c6 100644 --- a/src/contest_painting_effects.c +++ b/src/contest_painting_effects.c @@ -3,6 +3,13 @@ #include "contest_painting.h" #include "constants/rgb.h" +struct Unk8125954 +{ + u8 unk0; + u8 unk1; + u16 unk2; +}; + // IWRAM common u8 gUnknown_03006164; u16 (*gUnknown_03006168)[][32]; @@ -12,32 +19,46 @@ u8 gUnknown_03006174; u8 gUnknown_03006178; u8 gUnknown_0300617C; u8 gUnknown_03006180; -u16 gUnknown_03006184; +u16 *gUnknown_03006184; u16 gUnknown_03006188; -// this file's functions -void sub_8125230(void); -void sub_81252E8(void); -void sub_81254E0(void); -void sub_8125630(void); -void sub_8125448(void); -void sub_81257F8(void); -void sub_81258A0(void); -void sub_81256C8(void); -void sub_8125250(void); -void sub_81253A4(u8); -void sub_81250B8(u8); -void sub_8125170(u8); -void sub_8125954(u16); -u16 ConvertColorToGrayscale(u16*); -u16 sub_8125E18(u16*, u16*, u16*); -u16 ConvertCoolColor(u16*, u8); -u16 ConvertToBlackOrWhite(u16*); -u16 sub_8125C98(u16*, u16*); -u16 InvertColor(u16*); -u16 sub_8125F38(u16*, u16*, u16*); -u16 sub_8125CF4(u16*, u16*); -u16 GetCoolColorFromPersonality(u8); +static void sub_8125230(void); +static void sub_81252E8(void); +static void sub_81254E0(void); +static void sub_8125630(void); +static void sub_8125448(void); +static void sub_81257F8(void); +static void sub_81258A0(void); +static void sub_81256C8(void); +static void sub_8125250(void); +static void sub_81253A4(u8); +static void sub_81250B8(u8); +static void sub_8125170(u8); +static void sub_8125954(u16); +static u16 ConvertColorToGrayscale(u16*); +static u16 sub_8125E18(u16*, u16*, u16*); +static u16 ConvertCoolColor(u16*, u8); +static u16 ConvertToBlackOrWhite(u16*); +static u16 sub_8125C98(u16*, u16*); +static u16 InvertColor(u16*); +static u16 sub_8125F38(u16*, u16*, u16*); +static u16 sub_8125CF4(u16*, u16*); +static u16 GetCoolColorFromPersonality(u8); +static void sub_81263A4(bool8); +static void sub_8126270(void); +static void sub_8126714(void); +static void sub_8126370(void); +static void sub_8126664(void); +static void sub_8126334(void); +static void sub_81265B4(void); +static void sub_8126318(void); +static void sub_81264FC(void); +static u16 sub_81267C4(u16*); +static u16 sub_8126908(u16*); +static u16 sub_812693C(u16*); +static u16 sub_8126838(u16*); + +extern const u8 gUnknown_085A1F94[][3]; void sub_8124F2C(struct Unk030061A0 *info) { @@ -104,7 +125,7 @@ void sub_8124F2C(struct Unk030061A0 *info) } } -void sub_81250B8(u8 a0) // it changes palette someway somehow... .__. +static void sub_81250B8(u8 a0) // it changes palette someway somehow... .__. { u8 i, j; @@ -127,7 +148,7 @@ void sub_81250B8(u8 a0) // it changes palette someway somehow... .__. } } -void sub_8125170(u8 a0) +static void sub_8125170(u8 a0) { u8 i, j; @@ -149,14 +170,14 @@ void sub_8125170(u8 a0) } } -void sub_8125230(void) +static void sub_8125230(void) { u32 i; for (i = 0; i < 3200; i++) sub_8125954(i); } -void sub_8125250(void) +static void sub_8125250(void) { u8 i, j; @@ -174,7 +195,7 @@ void sub_8125250(void) } } -void sub_81252E8(void) +static void sub_81252E8(void) { u8 i, j; @@ -200,7 +221,7 @@ void sub_81252E8(void) } } -void sub_81253A4(u8 arg0) +static void sub_81253A4(u8 arg0) { u8 i, j; @@ -218,7 +239,7 @@ void sub_81253A4(u8 arg0) } } -void sub_8125448(void) +static void sub_8125448(void) { u8 i, j; @@ -236,7 +257,7 @@ void sub_8125448(void) } } -void sub_81254E0(void) +static void sub_81254E0(void) { u8 i, j; u16 *palette; @@ -270,7 +291,7 @@ void sub_81254E0(void) } } -void sub_8125630(void) +static void sub_8125630(void) { u8 i, j; @@ -288,7 +309,7 @@ void sub_8125630(void) } } -void sub_81256C8(void) +static void sub_81256C8(void) { u8 i, j; u16 *palette; @@ -349,7 +370,7 @@ void sub_81256C8(void) } } -void sub_81257F8(void) +static void sub_81257F8(void) { u8 i, j; @@ -369,7 +390,7 @@ void sub_81257F8(void) } } -void sub_81258A0(void) +static void sub_81258A0(void) { u8 i, j; @@ -389,16 +410,7 @@ void sub_81258A0(void) } } -struct Unk8125954 -{ - u8 unk0; - u8 unk1; - u16 unk2; -}; - -extern const u8 gUnknown_085A1F94[][3]; - -void sub_8125954(u16 arg0) +static void sub_8125954(u16 arg0) { u8 i; u8 r5, r9; @@ -487,7 +499,7 @@ void sub_8125954(u16 arg0) } } -u16 ConvertColorToGrayscale(u16 *color) +static u16 ConvertColorToGrayscale(u16 *color) { s32 clr = *color; s32 r = clr & 0x1F; @@ -499,7 +511,7 @@ u16 ConvertColorToGrayscale(u16 *color) // The dark colors are the colored edges of the Cool painting effect. // Everything else is white. -u16 ConvertCoolColor(u16 *color, u8 personality) +static u16 ConvertCoolColor(u16 *color, u8 personality) { u16 red = *color & 0x1F; u16 green = (*color >> 5) & 0x1F; @@ -513,7 +525,7 @@ u16 ConvertCoolColor(u16 *color, u8 personality) // Based on the given value, which comes from the first 8 bits of // the mon's personality value, return a color. -u16 GetCoolColorFromPersonality(u8 personality) +static u16 GetCoolColorFromPersonality(u8 personality) { u16 red = 0; u16 green = 0; @@ -564,7 +576,7 @@ u16 GetCoolColorFromPersonality(u8 personality) return RGB2(red, green, blue); } -u16 ConvertToBlackOrWhite(u16 *color) +static u16 ConvertToBlackOrWhite(u16 *color) { u16 red = *color & 0x1F; u16 green = (*color >> 5) & 0x1F; @@ -576,7 +588,7 @@ u16 ConvertToBlackOrWhite(u16 *color) return RGB_WHITE; } -u16 sub_8125C98(u16 *colorA, u16 *colorB) +static u16 sub_8125C98(u16 *colorA, u16 *colorB) { if (*colorA) { @@ -591,7 +603,7 @@ u16 sub_8125C98(u16 *colorA, u16 *colorB) return RGB_BLACK; } -u16 InvertColor(u16 *color) +static u16 InvertColor(u16 *color) { u16 red = *color & 0x1F; u16 green = (*color >> 5) & 0x1F; @@ -604,7 +616,7 @@ u16 InvertColor(u16 *color) return RGB2(red, green, blue); } -u16 sub_8125CF4(u16 *a0, u16 *a1) +static u16 sub_8125CF4(u16 *a0, u16 *a1) { u16 sp0[2][3]; u16 spC[3]; @@ -660,7 +672,7 @@ u16 sub_8125CF4(u16 *a0, u16 *a1) return RGB2(r, g, b); } -u16 sub_8125E18(u16 * a0, u16 * a1, u16 * a2) +static u16 sub_8125E18(u16 * a0, u16 * a1, u16 * a2) { u16 red, green, blue; u16 avg0, avg1, avg2; @@ -704,7 +716,7 @@ u16 sub_8125E18(u16 * a0, u16 * a1, u16 * a2) return RGB2(red, green, blue); } -u16 sub_8125F38(u16 *a0, u16 *a1, u16 *a2) +static u16 sub_8125F38(u16 *a0, u16 *a1, u16 *a2) { u16 red, green, blue; u16 avg0, avg1, avg2; @@ -772,3 +784,582 @@ void sub_8126058(struct Unk030061A0 *arg0) } } */ + +NAKED +void sub_8126058(struct Unk030061A0 *arg0) +{ + asm_unified("\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0xC\n\ + ldrb r1, [r0, 0x1D]\n\ + lsrs r5, r1, 3\n\ + ldrb r1, [r0, 0x1E]\n\ + lsrs r1, 3\n\ + str r1, [sp, 0x8]\n\ + ldr r1, [r0, 0x4]\n\ + str r1, [sp]\n\ + ldr r2, [r0, 0x10]\n\ + str r2, [sp, 0x4]\n\ + ldrh r0, [r0, 0x16]\n\ + cmp r0, 0x2\n\ + bne _08126108\n\ + movs r1, 0\n\ + ldr r0, [sp, 0x8]\n\ + cmp r1, r0\n\ + bcc _08126086\n\ + b _08126194\n\ +_08126086:\n\ + movs r0, 0\n\ + adds r2, r1, 0x1\n\ + mov r10, r2\n\ + cmp r0, r5\n\ + bcs _081260FA\n\ + adds r2, r1, 0\n\ + muls r2, r5\n\ + mov r9, r2\n\ + lsls r1, 3\n\ + mov r8, r1\n\ +_0812609A:\n\ + movs r4, 0\n\ + lsls r6, r0, 4\n\ + adds r7, r0, 0x1\n\ + add r0, r9\n\ + lsls r0, 6\n\ + ldr r1, [sp, 0x4]\n\ + adds r1, r0\n\ + mov r12, r1\n\ +_081260AA:\n\ + lsls r0, r4, 3\n\ + mov r2, r12\n\ + adds r3, r2, r0\n\ + mov r1, r8\n\ + adds r0, r1, r4\n\ + lsls r0, 3\n\ + muls r0, r5\n\ + lsls r0, 1\n\ + ldr r2, [sp]\n\ + adds r0, r2, r0\n\ + adds r2, r0, r6\n\ + ldrh r0, [r2, 0x2]\n\ + lsls r0, 8\n\ + ldrh r1, [r2]\n\ + orrs r0, r1\n\ + strh r0, [r3]\n\ + ldrh r0, [r2, 0x6]\n\ + lsls r0, 8\n\ + ldrh r1, [r2, 0x4]\n\ + orrs r0, r1\n\ + strh r0, [r3, 0x2]\n\ + ldrh r0, [r2, 0xA]\n\ + lsls r0, 8\n\ + ldrh r1, [r2, 0x8]\n\ + orrs r0, r1\n\ + strh r0, [r3, 0x4]\n\ + ldrh r0, [r2, 0xE]\n\ + lsls r0, 8\n\ + ldrh r1, [r2, 0xC]\n\ + orrs r0, r1\n\ + strh r0, [r3, 0x6]\n\ + adds r0, r4, 0x1\n\ + lsls r0, 16\n\ + lsrs r4, r0, 16\n\ + cmp r4, 0x7\n\ + bls _081260AA\n\ + lsls r0, r7, 16\n\ + lsrs r0, 16\n\ + cmp r0, r5\n\ + bcc _0812609A\n\ +_081260FA:\n\ + mov r1, r10\n\ + lsls r0, r1, 16\n\ + lsrs r1, r0, 16\n\ + ldr r2, [sp, 0x8]\n\ + cmp r1, r2\n\ + bcc _08126086\n\ + b _08126194\n\ +_08126108:\n\ + movs r1, 0\n\ + ldr r0, [sp, 0x8]\n\ + cmp r1, r0\n\ + bcs _08126194\n\ +_08126110:\n\ + movs r0, 0\n\ + adds r2, r1, 0x1\n\ + mov r10, r2\n\ + cmp r0, r5\n\ + bcs _08126188\n\ + adds r2, r1, 0\n\ + muls r2, r5\n\ + mov r9, r2\n\ + lsls r1, 3\n\ + mov r8, r1\n\ +_08126124:\n\ + movs r4, 0\n\ + lsls r6, r0, 4\n\ + adds r7, r0, 0x1\n\ + add r0, r9\n\ + lsls r0, 5\n\ + ldr r1, [sp, 0x4]\n\ + adds r1, r0\n\ + mov r12, r1\n\ +_08126134:\n\ + lsls r0, r4, 2\n\ + mov r2, r12\n\ + adds r3, r2, r0\n\ + mov r1, r8\n\ + adds r0, r1, r4\n\ + lsls r0, 3\n\ + muls r0, r5\n\ + lsls r0, 1\n\ + ldr r2, [sp]\n\ + adds r0, r2, r0\n\ + adds r2, r0, r6\n\ + ldrh r1, [r2, 0x2]\n\ + lsls r1, 4\n\ + ldrh r0, [r2]\n\ + orrs r1, r0\n\ + ldrh r0, [r2, 0x4]\n\ + lsls r0, 8\n\ + orrs r1, r0\n\ + ldrh r0, [r2, 0x6]\n\ + lsls r0, 12\n\ + orrs r1, r0\n\ + strh r1, [r3]\n\ + ldrh r1, [r2, 0xA]\n\ + lsls r1, 4\n\ + ldrh r0, [r2, 0x8]\n\ + orrs r1, r0\n\ + ldrh r0, [r2, 0xC]\n\ + lsls r0, 8\n\ + orrs r1, r0\n\ + ldrh r0, [r2, 0xE]\n\ + lsls r0, 12\n\ + orrs r1, r0\n\ + strh r1, [r3, 0x2]\n\ + adds r0, r4, 0x1\n\ + lsls r0, 16\n\ + lsrs r4, r0, 16\n\ + cmp r4, 0x7\n\ + bls _08126134\n\ + lsls r0, r7, 16\n\ + lsrs r0, 16\n\ + cmp r0, r5\n\ + bcc _08126124\n\ +_08126188:\n\ + mov r1, r10\n\ + lsls r0, r1, 16\n\ + lsrs r1, r0, 16\n\ + ldr r2, [sp, 0x8]\n\ + cmp r1, r2\n\ + bcc _08126110\n\ +_08126194:\n\ + add sp, 0xC\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0"); +} + +void sub_81261A4(struct Unk030061A0 *arg0) +{ + gUnknown_03006188 = arg0->var_18 * 16; + gUnknown_03006184 = &arg0->var_8[gUnknown_03006188]; + gUnknown_03006168 = arg0->var_4; + gUnknown_03006164 = arg0->var_19; + gUnknown_03006178 = arg0->var_1A; + gUnknown_03006174 = arg0->var_1B; + gUnknown_0300616C = arg0->var_1C; + gUnknown_03006180 = arg0->var_1D; + gUnknown_03006170 = arg0->var_1E; + + switch (arg0->var_14) + { + case 0: + sub_81263A4(FALSE); + break; + case 1: + sub_81263A4(TRUE); + break; + case 2: + sub_8126270(); + sub_8126714(); + break; + case 3: + sub_8126370(); + sub_8126664(); + break; + case 4: + sub_8126334(); + sub_81265B4(); + break; + case 5: + sub_8126318(); + sub_81264FC(); + break; + } +} + +static void sub_8126270(void) +{ + gUnknown_03006184[0] = RGB2(0, 0, 0); + gUnknown_03006184[1] = RGB2(6, 6, 6); + gUnknown_03006184[2] = RGB2(29, 29, 29); + gUnknown_03006184[3] = RGB2(11, 11, 11); + gUnknown_03006184[4] = RGB2(29, 6, 6); + gUnknown_03006184[5] = RGB2(6, 29, 6); + gUnknown_03006184[6] = RGB2(6, 6, 29); + gUnknown_03006184[7] = RGB2(29, 29, 6); + gUnknown_03006184[8] = RGB2(29, 6, 29); + gUnknown_03006184[9] = RGB2(6, 29, 29); + gUnknown_03006184[10] = RGB2(29, 11, 6); + gUnknown_03006184[11] = RGB2(11, 29, 6); + gUnknown_03006184[12] = RGB2(6, 11, 29); + gUnknown_03006184[13] = RGB2(29, 6, 11); + gUnknown_03006184[14] = RGB2(6, 29, 11); + gUnknown_03006184[15] = RGB2(11, 6, 29); +} + +static void sub_8126318(void) +{ + gUnknown_03006184[0] = RGB2(0, 0, 0); + gUnknown_03006184[1] = RGB2(0, 0, 0); + gUnknown_03006184[2] = RGB2(31, 31, 31); +} + +static void sub_8126334(void) +{ + u8 i; + + gUnknown_03006184[0] = RGB2(0, 0, 0); + gUnknown_03006184[1] = RGB2(0, 0, 0); + for (i = 0; i < 14; i++) + gUnknown_03006184[i + 2] = RGB2(2 * (i + 2), 2 * (i + 2), 2 * (i + 2)); +} + +static void sub_8126370(void) +{ + u8 i; + + gUnknown_03006184[0] = RGB2(0, 0, 0); + for (i = 0; i < 32; i++) + gUnknown_03006184[i + 1] = RGB2(i, i, i); +} + +static void sub_81263A4(bool8 arg0) +{ + u8 i, j; + u16 maxIndex; + + maxIndex = 0xDF; + if (!arg0) + maxIndex = 0xFF; + + for (j = 0; j < maxIndex; j++) + gUnknown_03006184[j] = 0; + + gUnknown_03006184[maxIndex] = RGB2(15, 15, 15); + for (i = 0; i < gUnknown_0300616C; i++) + { + u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180]; + u16* pal = &var2[gUnknown_03006164]; + for (j = 0; j < gUnknown_03006174; j++, pal++) + { + if (*pal & 0x8000) + { + *pal = gUnknown_03006188; + } + else + { + u16 color = sub_81267C4(pal); + u8 curIndex = 1; + if (curIndex < maxIndex) + { + if (gUnknown_03006184[curIndex] == RGB_BLACK) + { + gUnknown_03006184[curIndex] = color; + *pal = gUnknown_03006188 + curIndex; + } + else + { + while (curIndex < maxIndex) + { + if (gUnknown_03006184[curIndex] == RGB_BLACK) + { + gUnknown_03006184[curIndex] = color; + *pal = gUnknown_03006188 + curIndex; + break; + } + + if (gUnknown_03006184[curIndex] == color) + { + *pal = gUnknown_03006188 + curIndex; + break; + } + + curIndex++; + } + } + } + + if (curIndex == maxIndex) + { + curIndex = maxIndex; + *pal = curIndex; + } + } + } + } +} + +static void sub_81264FC(void) +{ + u8 i, j; + + for (i = 0; i < gUnknown_0300616C; i++) + { + u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180]; + u16* pal = &var2[gUnknown_03006164]; + for (j = 0; j < gUnknown_03006174; j++, pal++) + { + if (*pal & 0x8000) + { + *pal = gUnknown_03006188; + } + else + { + if (ConvertToBlackOrWhite(pal) == RGB_BLACK) + *pal = gUnknown_03006188 + 1; + else + *pal = gUnknown_03006188 + 2; + } + } + } +} + +static void sub_81265B4(void) +{ + u8 i, j; + + for (i = 0; i < gUnknown_0300616C; i++) + { + u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180]; + u16* pal = &var2[gUnknown_03006164]; + for (j = 0; j < gUnknown_03006174; j++, pal++) + { + if (*pal & 0x8000) + *pal = gUnknown_03006188; + else + *pal = sub_8126908(pal) + gUnknown_03006188; + } + } +} + +static void sub_8126664(void) +{ + u8 i, j; + + for (i = 0; i < gUnknown_0300616C; i++) + { + u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180]; + u16* pal = &var2[gUnknown_03006164]; + for (j = 0; j < gUnknown_03006174; j++, pal++) + { + if (*pal & 0x8000) + *pal = gUnknown_03006188; + else + *pal = sub_812693C(pal) + gUnknown_03006188; + } + } +} + +static void sub_8126714(void) +{ + u8 i, j; + + for (i = 0; i < gUnknown_0300616C; i++) + { + u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180]; + u16* pal = &var2[gUnknown_03006164]; + for (j = 0; j < gUnknown_03006174; j++, pal++) + { + if (*pal & 0x8000) + *pal = gUnknown_03006188; + else + *pal = sub_8126838(pal) + gUnknown_03006188; + } + } +} + +static u16 sub_81267C4(u16 *color) +{ + u16 red = *color & 0x1F; + u16 green = (*color >> 5) & 0x1F; + u16 blue = (*color >> 10) & 0x1F; + + if (red & 3) + red = (red & 0x1C) + 4; + if (green & 3) + green = (green & 0x1C) + 4; + if (blue & 3) + blue = (blue & 0x1C) + 4; + + if (red < 6) + red = 6; + if (red > 30) + red = 30; + + if (green < 6) + green = 6; + if (green > 30) + green = 30; + + if (blue < 6) + blue = 6; + if (blue > 30) + blue = 30; + + return RGB2(red, green, blue); +} + +static u16 sub_8126838(u16* color) +{ + u16 red = *color & 0x1F; + u16 green = (*color >> 5) & 0x1F; + u16 blue = (*color >> 10) & 0x1F; + + if (red < 12 && green < 11 && blue < 11) + return 1; + + if (red > 19 && green > 19 && blue > 19) + return 2; + + if (red > 19) + { + if (green > 19) + { + if (blue > 14) + return 2; + else + return 7; + } + else if (blue > 19) + { + if (green > 14) + return 2; + else + return 8; + } + } + + if (green > 19 && blue > 19) + { + if (red > 14) + return 2; + else + return 9; + } + + if (red > 19) + { + if (green > 11) + { + if (blue > 11) + { + if (green < blue) + return 8; + else + return 7; + } + else + { + return 10; + } + } + else if (blue > 11) + { + return 13; + } + else + { + return 4; + } + } + + if (green > 19) + { + if (red > 11) + { + if (blue > 11) + { + if (red < blue) + return 9; + else + return 7; + } + else + { + return 11; + } + } + else + { + if (blue > 11) + return 14; + else + return 5; + } + } + + if (blue > 19) + { + if (red > 11) + { + if (green > 11) + { + if (red < green) + return 9; + else + return 8; + } + } + else if (green > 11) + { + return 12; + } + + if (blue > 11) + return 15; + else + return 6; + } + + return 3; +} + +static u16 sub_8126908(u16 *color) +{ + u16 red = *color & 0x1F; + u16 green = (*color >> 5) & 0x1F; + u16 blue = (*color >> 10) & 0x1F; + u16 average = ((red + green + blue) / 3) & 0x1E; + if (average == 0) + return 1; + else + return average / 2; +} + +static u16 sub_812693C(u16 *color) +{ + u16 red = *color & 0x1F; + u16 green = (*color >> 5) & 0x1F; + u16 blue = (*color >> 10) & 0x1F; + u16 average = (red + green + blue) / 3; + return average + 1; +} From 7118462b9f58e4b9756c41fe1d464be70e9ac2b4 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 21 Mar 2019 18:15:47 -0500 Subject: [PATCH 214/217] Decompile ereader.c up to faraway island code --- asm/{rom_81D1C44.s => ereader.s} | 1177 ----------------------------- data/{rom_81D1C44.s => ereader.s} | 0 include/ereader.h | 9 + include/pokenav.h | 3 - ld_script.txt | 5 +- src/ereader.c | 564 ++++++++++++++ src/event_object_movement.c | 2 +- src/trainer_hill.c | 3 +- 8 files changed, 578 insertions(+), 1185 deletions(-) rename asm/{rom_81D1C44.s => ereader.s} (64%) rename data/{rom_81D1C44.s => ereader.s} (100%) create mode 100755 include/ereader.h create mode 100755 src/ereader.c diff --git a/asm/rom_81D1C44.s b/asm/ereader.s similarity index 64% rename from asm/rom_81D1C44.s rename to asm/ereader.s index 001ac1b68f..81264aca2e 100644 --- a/asm/rom_81D1C44.s +++ b/asm/ereader.s @@ -6,1183 +6,6 @@ .text - thumb_func_start sub_81D38D4 -sub_81D38D4: @ 81D38D4 - push {lr} - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003d6d - adds r0, r1 - ldrb r1, [r0] - adds r2, r1, 0x1 - adds r0, r2, 0 - asrs r0, 8 - lsls r0, 8 - subs r0, r2, r0 - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D38D4 - - thumb_func_start sub_81D38FC -sub_81D38FC: @ 81D38FC - push {r4,r5,lr} - adds r4, r0, 0 - movs r5, 0x9C - lsls r5, 2 - adds r1, r5, 0 - bl CalcByteArraySum - adds r4, r5 - ldr r1, [r4] - cmp r0, r1 - bne _081D3916 - movs r0, 0x1 - b _081D3918 -_081D3916: - movs r0, 0 -_081D3918: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81D38FC - - thumb_func_start sub_81D3920 -sub_81D3920: @ 81D3920 - push {r4-r7,lr} - adds r7, r0, 0 - ldrb r6, [r7] - subs r0, r6, 0x1 - cmp r0, 0x7 - bhi _081D3964 - movs r5, 0 - cmp r5, r6 - bcs _081D394C - adds r4, r7, 0 - adds r4, 0x8 -_081D3936: - adds r0, r4, 0 - bl sub_81D38FC - cmp r0, 0 - beq _081D3964 - movs r0, 0x9D - lsls r0, 2 - adds r4, r0 - adds r5, 0x1 - cmp r5, r6 - bcc _081D3936 -_081D394C: - adds r0, r7, 0 - adds r0, 0x8 - movs r1, 0x9D - lsls r1, 2 - muls r1, r6 - bl CalcByteArraySum - ldr r1, [r7, 0x4] - cmp r0, r1 - bne _081D3964 - movs r0, 0x1 - b _081D3966 -_081D3964: - movs r0, 0 -_081D3966: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_81D3920 - - thumb_func_start sub_81D396C -sub_81D396C: @ 81D396C - push {r4,lr} - adds r4, r0, 0 - ldrb r0, [r4] - subs r0, 0x1 - cmp r0, 0x7 - bhi _081D398E - adds r0, r4, 0 - adds r0, 0x8 - movs r1, 0xEE - lsls r1, 4 - bl CalcByteArraySum - ldr r1, [r4, 0x4] - cmp r0, r1 - bne _081D398E - movs r0, 0x1 - b _081D3990 -_081D398E: - movs r0, 0 -_081D3990: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81D396C - - thumb_func_start sub_81D3998 -sub_81D3998: @ 81D3998 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r7, r0, 0 - mov r8, r1 - movs r2, 0x80 - lsls r2, 5 - mov r0, r8 - movs r1, 0 - bl memset - ldrb r0, [r7] - mov r1, r8 - strb r0, [r1] - bl sub_81D38D4 - mov r2, r8 - strb r0, [r2, 0x1] - ldrb r0, [r7] - adds r0, 0x1 - asrs r0, 1 - strb r0, [r2, 0x2] - movs r6, 0 - b _081D3A42 -_081D39C8: - movs r0, 0x1 - ands r0, r6 - cmp r0, 0 - bne _081D3A14 - lsrs r0, r6, 31 - adds r0, r6, r0 - asrs r0, 1 - lsls r4, r0, 4 - subs r4, r0 - lsls r4, 3 - subs r4, r0 - lsls r4, 3 - add r4, r8 - movs r0, 0x9D - lsls r0, 2 - adds r5, r6, 0 - muls r5, r0 - adds r5, r7, r5 - ldrb r0, [r5, 0x8] - strb r0, [r4, 0x8] - movs r1, 0xA7 - lsls r1, 2 - adds r0, r4, r1 - movs r2, 0xAA - lsls r2, 1 - adds r1, r5, r2 - subs r2, 0x30 - bl memcpy - adds r4, 0xC - adds r5, 0xC - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0xA4 - lsls r2, 1 - bl memcpy - b _081D3A40 -_081D3A14: - lsrs r1, r6, 31 - adds r1, r6, r1 - asrs r1, 1 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 3 - subs r0, r1 - lsls r0, 3 - add r0, r8 - movs r1, 0x9D - lsls r1, 2 - muls r1, r6 - adds r1, r7, r1 - ldrb r2, [r1, 0x8] - strb r2, [r0, 0x9] - movs r2, 0xAA - lsls r2, 1 - adds r0, r2 - adds r1, 0xC - subs r2, 0xC - bl memcpy -_081D3A40: - adds r6, 0x1 -_081D3A42: - ldrb r0, [r7] - cmp r6, r0 - blt _081D39C8 - movs r0, 0x1 - ands r0, r6 - cmp r0, 0 - beq _081D3A7E - lsrs r2, r6, 31 - adds r2, r6, r2 - asrs r2, 1 - lsls r0, r2, 4 - subs r0, r2 - lsls r0, 3 - subs r0, r2 - lsls r0, 3 - add r0, r8 - movs r1, 0xAA - lsls r1, 1 - adds r0, r1 - ldr r3, =gUnknown_08625B6C - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r1, r2 - lsls r1, 3 - adds r1, r3 - movs r2, 0xA4 - lsls r2, 1 - bl memcpy -_081D3A7E: - mov r0, r8 - adds r0, 0x8 - movs r1, 0xEE - lsls r1, 4 - bl CalcByteArraySum - mov r2, r8 - str r0, [r2, 0x4] - movs r0, 0x1E - mov r1, r8 - bl sub_8153634 - cmp r0, 0x1 - bne _081D3AA4 - movs r0, 0x1 - b _081D3AA6 - .pool -_081D3AA4: - movs r0, 0 -_081D3AA6: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_81D3998 - - thumb_func_start sub_81D3AB0 -sub_81D3AB0: @ 81D3AB0 - push {r4,r5,lr} - adds r4, r0, 0 - movs r0, 0x80 - lsls r0, 5 - bl AllocZeroed - adds r5, r0, 0 - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_81D3998 - adds r4, r0, 0 - adds r0, r5, 0 - bl Free - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81D3AB0 - - thumb_func_start sub_81D3AD8 -sub_81D3AD8: @ 81D3AD8 - push {r4,r5,lr} - adds r5, r0, 0 - adds r4, r1, 0 - movs r0, 0x1E - bl TryCopySpecialSaveSection - cmp r0, 0x1 - bne _081D3B04 - ldr r2, =0x00000ee8 - adds r0, r5, 0 - adds r1, r4, 0 - bl memcpy - adds r0, r5, 0 - bl sub_81D396C - cmp r0, 0 - beq _081D3B04 - movs r0, 0x1 - b _081D3B06 - .pool -_081D3B04: - movs r0, 0 -_081D3B06: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81D3AD8 - - thumb_func_start sub_81D3B0C -sub_81D3B0C: @ 81D3B0C - push {r4,r5,lr} - adds r4, r0, 0 - movs r0, 0x80 - lsls r0, 5 - bl AllocZeroed - adds r5, r0, 0 - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_81D3AD8 - adds r4, r0, 0 - adds r0, r5, 0 - bl Free - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81D3B0C - - thumb_func_start sub_81D3B34 -sub_81D3B34: @ 81D3B34 - push {r4,r5,lr} - movs r0, 0x80 - lsls r0, 5 - bl AllocZeroed - adds r4, r0, 0 - bl sub_81D3B0C - adds r5, r0, 0 - adds r0, r4, 0 - bl Free - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81D3B34 - - thumb_func_start sub_81D3B54 -sub_81D3B54: @ 81D3B54 - push {r4-r7,lr} - sub sp, 0x4 - adds r6, r0, 0 - adds r5, r1, 0 - bl sub_81D41A0 - movs r7, 0x2 - ldr r4, =gShouldAdvanceLinkState -_081D3B64: - bl sub_81D4170 - ldr r0, =gUnknown_030012E2 - ldrh r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _081D3B76 - strb r7, [r4] -_081D3B76: - movs r0, 0x1 - adds r1, r6, 0 - adds r2, r5, 0 - movs r3, 0 - bl sub_81D3D70 - adds r1, r0, 0 - ldr r0, =gUnknown_030012E4 - strh r1, [r0] - movs r0, 0x13 - ands r0, r1 - cmp r0, 0x10 - bne _081D3BA0 - movs r4, 0 - b _081D3BC2 - .pool -_081D3BA0: - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _081D3BAC - movs r4, 0x1 - b _081D3BC2 -_081D3BAC: - movs r0, 0x4 - ands r0, r1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0 - bne _081D3BC0 - strb r0, [r4] - bl VBlankIntrWait - b _081D3B64 -_081D3BC0: - movs r4, 0x2 -_081D3BC2: - movs r0, 0 - str r0, [sp] - ldr r1, =gUnknown_030012C8 - ldr r2, =0x05000006 - mov r0, sp - bl CpuSet - bl sub_81D41F4 - adds r0, r4, 0 - add sp, 0x4 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D3B54 - - thumb_func_start sub_81D3BE8 -sub_81D3BE8: @ 81D3BE8 - push {r4-r6,lr} - sub sp, 0x4 - adds r5, r0, 0 - bl sub_81D41A0 - movs r6, 0x2 - ldr r4, =gShouldAdvanceLinkState -_081D3BF6: - bl sub_81D4170 - ldr r0, =gUnknown_030012E2 - ldrh r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _081D3C08 - strb r6, [r4] -_081D3C08: - movs r0, 0 - movs r1, 0 - movs r2, 0 - adds r3, r5, 0 - bl sub_81D3D70 - adds r1, r0, 0 - ldr r0, =gUnknown_030012E4 - strh r1, [r0] - movs r0, 0x13 - ands r0, r1 - cmp r0, 0x10 - bne _081D3C34 - movs r4, 0 - b _081D3C56 - .pool -_081D3C34: - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _081D3C40 - movs r4, 0x1 - b _081D3C56 -_081D3C40: - movs r0, 0x4 - ands r0, r1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0 - bne _081D3C54 - strb r0, [r4] - bl VBlankIntrWait - b _081D3BF6 -_081D3C54: - movs r4, 0x2 -_081D3C56: - movs r0, 0 - str r0, [sp] - ldr r1, =gUnknown_030012C8 - ldr r2, =0x05000006 - mov r0, sp - bl CpuSet - bl sub_81D41F4 - adds r0, r4, 0 - add sp, 0x4 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D3BE8 - - thumb_func_start sub_81D3C7C -sub_81D3C7C: @ 81D3C7C - push {r4,lr} - ldr r4, =0x04000208 - movs r3, 0 - strh r3, [r4] - ldr r2, =0x04000200 - ldrh r1, [r2] - ldr r0, =0x0000ff3f - ands r0, r1 - strh r0, [r2] - movs r0, 0x1 - strh r0, [r4] - ldr r0, =0x04000128 - strh r3, [r0] - subs r0, 0x1A - strh r3, [r0] - ldr r1, =0x04000202 - movs r0, 0xC0 - strh r0, [r1] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D3C7C - - thumb_func_start sub_81D3CBC -sub_81D3CBC: @ 81D3CBC - push {r4-r7,lr} - sub sp, 0x4 - ldr r5, =0x04000208 - movs r4, 0 - strh r4, [r5] - ldr r3, =0x04000200 - ldrh r1, [r3] - ldr r0, =0x0000ff3f - ands r0, r1 - strh r0, [r3] - movs r6, 0x1 - strh r6, [r5] - ldr r0, =0x04000134 - strh r4, [r0] - ldr r2, =0x04000128 - movs r1, 0x80 - lsls r1, 6 - adds r0, r1, 0 - strh r0, [r2] - ldrh r0, [r2] - ldr r7, =0x00004003 - adds r1, r7, 0 - orrs r0, r1 - strh r0, [r2] - strh r4, [r5] - ldrh r0, [r3] - movs r1, 0x80 - orrs r0, r1 - strh r0, [r3] - strh r6, [r5] - ldr r1, =gUnknown_030012C8 - ldrb r0, [r1, 0x1] - cmp r0, 0 - bne _081D3D0A - str r0, [sp] - ldr r2, =0x05000006 - mov r0, sp - bl CpuSet -_081D3D0A: - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D3CBC - - thumb_func_start sub_81D3D34 -sub_81D3D34: @ 81D3D34 - ldr r0, =0x04000134 - movs r3, 0 - strh r3, [r0] - ldr r2, =0x04000128 - movs r1, 0xA0 - lsls r1, 7 - adds r0, r1, 0 - strh r0, [r2] - ldrh r0, [r2] - movs r1, 0x8 - orrs r0, r1 - strh r0, [r2] - ldr r0, =gShouldAdvanceLinkState - strb r3, [r0] - ldr r0, =gUnknown_030012E6 - strh r3, [r0] - ldr r1, =gUnknown_030012E8 - movs r0, 0 - str r0, [r1] - bx lr - .pool - thumb_func_end sub_81D3D34 - - thumb_func_start sub_81D3D70 -sub_81D3D70: @ 81D3D70 - push {r4-r6,lr} - adds r4, r1, 0 - adds r5, r2, 0 - adds r6, r3, 0 - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =gUnknown_030012C8 - ldrb r0, [r0, 0x1] - cmp r0, 0x6 - bls _081D3D86 - b _081D3ECC -_081D3D86: - lsls r0, 2 - ldr r1, =_081D3D98 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_081D3D98: - .4byte _081D3DB4 - .4byte _081D3DC8 - .4byte _081D3DE8 - .4byte _081D3DFC - .4byte _081D3E74 - .4byte _081D3E84 - .4byte _081D3EBC -_081D3DB4: - bl sub_81D3CBC - ldr r1, =gUnknown_030012C8 - movs r0, 0x1 - strb r0, [r1, 0x2] - strb r0, [r1, 0x1] - b _081D3ECC - .pool -_081D3DC8: - adds r0, r2, 0 - bl sub_81D3EE8 - lsls r0, 16 - cmp r0, 0 - beq _081D3DD8 - bl sub_81D413C -_081D3DD8: - ldr r0, =gShouldAdvanceLinkState - ldrb r0, [r0] - cmp r0, 0x2 - beq _081D3DE2 - b _081D3ECC -_081D3DE2: - b _081D3E04 - .pool -_081D3DE8: - bl sub_81D3D34 - adds r0, r4, 0 - adds r1, r5, 0 - adds r2, r6, 0 - bl sub_81D3F1C - ldr r1, =gUnknown_030012C8 - movs r0, 0x3 - strb r0, [r1, 0x1] -_081D3DFC: - ldr r0, =gShouldAdvanceLinkState - ldrb r0, [r0] - cmp r0, 0x2 - bne _081D3E18 -_081D3E04: - ldr r1, =gUnknown_030012C8 - strb r0, [r1, 0x4] - movs r0, 0x6 - strb r0, [r1, 0x1] - b _081D3ECC - .pool -_081D3E18: - ldr r2, =gUnknown_030012E6 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - ldr r1, =gUnknown_030012E8 - ldr r0, [r1] - adds r3, r0, 0x1 - str r3, [r1] - ldr r1, =gUnknown_030012C8 - ldrb r0, [r1] - cmp r0, 0 - bne _081D3E3C - cmp r3, 0x3C - bls _081D3E3C - movs r0, 0x1 - strb r0, [r1, 0x4] - movs r0, 0x6 - strb r0, [r1, 0x1] -_081D3E3C: - ldr r4, =gUnknown_030012C8 - ldrb r0, [r4, 0x2] - cmp r0, 0x2 - beq _081D3ECC - ldrb r0, [r4] - cmp r0, 0 - beq _081D3E64 - ldrh r0, [r2] - cmp r0, 0x2 - bls _081D3E64 - bl sub_81D413C - movs r0, 0x2 - b _081D3ECA - .pool -_081D3E64: - bl sub_81D413C - ldr r1, =gUnknown_030012C8 - movs r0, 0x2 - strb r0, [r1, 0x2] - b _081D3ECC - .pool -_081D3E74: - bl sub_81D3CBC - ldr r1, =gUnknown_030012C8 - movs r0, 0x5 - strb r0, [r1, 0x1] - b _081D3ECC - .pool -_081D3E84: - ldr r0, =gUnknown_030012C8 - ldrb r0, [r0] - cmp r0, 0x1 - bne _081D3E98 - ldr r0, =gUnknown_030012E6 - ldrh r0, [r0] - cmp r0, 0x2 - bls _081D3E98 - bl sub_81D413C -_081D3E98: - ldr r1, =gUnknown_030012E6 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x3C - bls _081D3ECC - ldr r0, =gUnknown_030012C8 - movs r1, 0x1 - strb r1, [r0, 0x4] - movs r1, 0x6 - strb r1, [r0, 0x1] - b _081D3ECC - .pool -_081D3EBC: - ldr r4, =gUnknown_030012C8 - ldrb r0, [r4, 0x2] - cmp r0, 0 - beq _081D3ECC - bl sub_81D3C7C - movs r0, 0 -_081D3ECA: - strb r0, [r4, 0x2] -_081D3ECC: - ldr r2, =gUnknown_030012C8 - ldrb r0, [r2, 0x2] - ldrb r1, [r2, 0x4] - lsls r1, 2 - orrs r0, r1 - ldrb r1, [r2, 0x3] - lsls r1, 4 - orrs r0, r1 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D3D70 - - thumb_func_start sub_81D3EE8 -sub_81D3EE8: @ 81D3EE8 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =0x04000128 - ldr r0, [r0] - movs r1, 0xC - ands r0, r1 - cmp r0, 0x8 - bne _081D3F0C - cmp r2, 0 - beq _081D3F0C - ldr r1, =gUnknown_030012C8 - movs r0, 0x1 - b _081D3F10 - .pool -_081D3F0C: - ldr r1, =gUnknown_030012C8 - movs r0, 0 -_081D3F10: - strb r0, [r1] - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D3EE8 - - thumb_func_start sub_81D3F1C -sub_81D3F1C: @ 81D3F1C - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldr r3, =gUnknown_030012C8 - ldrb r0, [r3] - cmp r0, 0 - beq _081D3F54 - ldr r2, =0x04000128 - ldrh r0, [r2] - movs r1, 0x1 - orrs r0, r1 - strh r0, [r2] - str r5, [r3, 0x8] - ldr r0, =0x04000120 - str r4, [r0] - lsrs r0, r4, 2 - adds r0, 0x1 - str r0, [r3, 0x10] - bl sub_81D3F68 - b _081D3F5C - .pool -_081D3F54: - ldr r1, =0x04000128 - ldrh r0, [r1] - strh r0, [r1] - str r2, [r3, 0x8] -_081D3F5C: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D3F1C - - thumb_func_start sub_81D3F68 -sub_81D3F68: @ 81D3F68 - ldr r1, =0x0400010c - ldr r2, =0x0000fda7 - adds r0, r2, 0 - strh r0, [r1] - ldr r0, =0x0400010e - movs r2, 0x40 - strh r2, [r0] - ldr r3, =0x04000208 - movs r0, 0 - strh r0, [r3] - adds r1, 0xF4 - ldrh r0, [r1] - orrs r0, r2 - strh r0, [r1] - movs r0, 0x1 - strh r0, [r3] - bx lr - .pool - thumb_func_end sub_81D3F68 - - thumb_func_start sub_81D3F9C -sub_81D3F9C: @ 81D3F9C - push {lr} - bl sub_81D414C - bl sub_81D413C - pop {r0} - bx r0 - thumb_func_end sub_81D3F9C - - thumb_func_start sub_81D3FAC -sub_81D3FAC: @ 81D3FAC - push {r4-r6,lr} - sub sp, 0x8 - ldr r2, =gUnknown_030012C8 - ldrb r0, [r2, 0x1] - adds r3, r2, 0 - cmp r0, 0x3 - beq _081D4034 - cmp r0, 0x3 - bgt _081D3FC8 - cmp r0, 0x1 - beq _081D3FD0 - b _081D412A - .pool -_081D3FC8: - cmp r0, 0x5 - bne _081D3FCE - b _081D40FC -_081D3FCE: - b _081D412A -_081D3FD0: - ldr r1, =0x0400012a - ldr r2, =0x0000ccd0 - adds r0, r2, 0 - strh r0, [r1] - ldr r0, =0x04000120 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp] - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r4, 0 - ldr r6, =0x0000ccd0 - ldr r5, =0x0000ffff -_081D3FEC: - lsls r0, r1, 1 - add r0, sp - ldrh r0, [r0] - cmp r0, r6 - bne _081D4010 - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - b _081D401A - .pool -_081D4010: - cmp r0, r5 - beq _081D401A - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 -_081D401A: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0x3 - bls _081D3FEC - cmp r2, 0x2 - beq _081D402A - b _081D412A -_081D402A: - cmp r4, 0 - beq _081D4030 - b _081D412A -_081D4030: - strb r2, [r3, 0x1] - b _081D412A -_081D4034: - ldr r0, =0x04000120 - ldr r4, [r0] - ldr r0, [r2, 0xC] - cmp r0, 0 - bne _081D404A - ldrb r0, [r2] - cmp r0, 0 - bne _081D404A - lsrs r0, r4, 2 - adds r0, 0x1 - str r0, [r2, 0x10] -_081D404A: - ldrb r0, [r3] - cmp r0, 0x1 - bne _081D4080 - ldr r1, [r3, 0xC] - ldr r0, [r3, 0x10] - cmp r1, r0 - bge _081D4074 - ldr r2, =0x04000120 - ldr r0, [r3, 0x8] - lsls r1, 2 - adds r1, r0 - ldr r0, [r1] - str r0, [r2] - ldr r0, [r3, 0x14] - ldr r1, [r1] - adds r0, r1 - str r0, [r3, 0x14] - b _081D40BA - .pool -_081D4074: - ldr r1, =0x04000120 - ldr r0, [r3, 0x14] - b _081D40B8 - .pool -_081D4080: - ldr r1, [r3, 0xC] - cmp r1, 0 - ble _081D40A0 - ldr r0, [r3, 0x10] - adds r0, 0x1 - cmp r1, r0 - bge _081D40A0 - ldr r0, [r3, 0x8] - lsls r1, 2 - adds r1, r0 - subs r1, 0x4 - str r4, [r1] - ldr r0, [r3, 0x14] - adds r0, r4 - str r0, [r3, 0x14] - b _081D40B4 -_081D40A0: - ldr r0, [r3, 0xC] - cmp r0, 0 - beq _081D40B4 - ldr r0, [r3, 0x14] - cmp r0, r4 - bne _081D40B0 - movs r0, 0x1 - b _081D40B2 -_081D40B0: - movs r0, 0x2 -_081D40B2: - strb r0, [r3, 0x3] -_081D40B4: - ldr r1, =gUnknown_030012E8 - movs r0, 0 -_081D40B8: - str r0, [r1] -_081D40BA: - ldr r1, [r3, 0xC] - adds r1, 0x1 - str r1, [r3, 0xC] - ldr r0, [r3, 0x10] - adds r0, 0x2 - cmp r1, r0 - bge _081D40EA - ldrb r0, [r3] - cmp r0, 0 - beq _081D40E4 - ldr r0, =0x0400010e - ldrh r1, [r0] - movs r2, 0x80 - orrs r1, r2 - strh r1, [r0] - b _081D412A - .pool -_081D40E4: - bl sub_81D413C - b _081D412A -_081D40EA: - movs r0, 0 - movs r1, 0x4 - strb r1, [r3, 0x1] - ldr r1, =gUnknown_030012E6 - strh r0, [r1] - b _081D412A - .pool -_081D40FC: - ldrb r3, [r2] - cmp r3, 0 - bne _081D4108 - ldr r1, =0x0400012a - ldrb r0, [r2, 0x3] - strh r0, [r1] -_081D4108: - ldr r0, =0x04000120 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp] - str r1, [sp, 0x4] - mov r0, sp - ldrh r1, [r0, 0x2] - subs r0, r1, 0x1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bhi _081D412A - cmp r3, 0x1 - bne _081D4126 - strb r1, [r2, 0x3] -_081D4126: - movs r0, 0x6 - strb r0, [r2, 0x1] -_081D412A: - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D3FAC - - thumb_func_start sub_81D413C -sub_81D413C: @ 81D413C - ldr r0, =0x04000128 - ldrh r1, [r0] - movs r2, 0x80 - orrs r1, r2 - strh r1, [r0] - bx lr - .pool - thumb_func_end sub_81D413C - - thumb_func_start sub_81D414C -sub_81D414C: @ 81D414C - ldr r2, =0x0400010e - ldrh r1, [r2] - ldr r0, =0x0000ff7f - ands r0, r1 - strh r0, [r2] - ldr r1, =0x0400010c - ldr r2, =0x0000fda7 - adds r0, r2, 0 - strh r0, [r1] - bx lr - .pool - thumb_func_end sub_81D414C - - thumb_func_start sub_81D4170 -sub_81D4170: @ 81D4170 - push {r4,lr} - ldr r0, =0x04000130 - ldrh r0, [r0] - ldr r2, =0x000003ff - adds r1, r2, 0 - eors r1, r0 - ldr r4, =gUnknown_030012E2 - ldr r3, =gUnknown_030012E0 - ldrh r2, [r3] - adds r0, r1, 0 - bics r0, r2 - strh r0, [r4] - strh r1, [r3] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D4170 - - thumb_func_start sub_81D41A0 -sub_81D41A0: @ 81D41A0 - ldr r1, =gUnknown_030012EC - ldr r0, =0x04000208 - ldrh r0, [r0] - strh r0, [r1] - ldr r1, =gUnknown_030012EE - ldr r0, =0x04000200 - ldrh r0, [r0] - strh r0, [r1] - ldr r1, =gUnknown_030012F0 - ldr r0, =0x0400010e - ldrh r0, [r0] - strh r0, [r1] - ldr r1, =gUnknown_030012F2 - ldr r0, =0x04000128 - ldrh r0, [r0] - strh r0, [r1] - ldr r1, =gUnknown_030012F4 - ldr r0, =0x04000134 - ldrh r0, [r0] - strh r0, [r1] - bx lr - .pool - thumb_func_end sub_81D41A0 - - thumb_func_start sub_81D41F4 -sub_81D41F4: @ 81D41F4 - ldr r1, =0x04000208 - ldr r0, =gUnknown_030012EC - ldrh r0, [r0] - strh r0, [r1] - subs r1, 0x8 - ldr r0, =gUnknown_030012EE - ldrh r0, [r0] - strh r0, [r1] - subs r1, 0xF2 - ldr r0, =gUnknown_030012F0 - ldrh r0, [r0] - strh r0, [r1] - adds r1, 0x1A - ldr r0, =gUnknown_030012F2 - ldrh r0, [r0] - strh r0, [r1] - adds r1, 0xC - ldr r0, =gUnknown_030012F4 - ldrh r0, [r0] - strh r0, [r1] - bx lr - .pool - thumb_func_end sub_81D41F4 - - thumb_func_start sub_81D4238 -sub_81D4238: @ 81D4238 - push {lr} - sub sp, 0x4 - movs r0, 0 - str r0, [sp] - ldr r1, =gUnknown_030012C8 - ldr r2, =0x05000006 - mov r0, sp - bl CpuSet - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D4238 - - thumb_func_start sub_81D4258 -sub_81D4258: @ 81D4258 - push {lr} - sub sp, 0x4 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrb r1, [r0, 0x5] - ldrb r2, [r0, 0x4] - movs r0, 0x1 - mov r3, sp - bl TryGetEventObjectIdByLocalIdAndMap - mov r0, sp - ldrb r0, [r0] - add sp, 0x4 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D4258 - thumb_func_start sub_81D427C sub_81D427C: @ 81D427C push {r4-r7,lr} diff --git a/data/rom_81D1C44.s b/data/ereader.s similarity index 100% rename from data/rom_81D1C44.s rename to data/ereader.s diff --git a/include/ereader.h b/include/ereader.h new file mode 100755 index 0000000000..da31c82127 --- /dev/null +++ b/include/ereader.h @@ -0,0 +1,9 @@ +#ifndef GUARD_EREADER_H +#define GUARD_EREADER_H + +bool32 sub_81D3B34(void); +u32 sub_81D427C(void); +bool8 sub_81D4A58(struct EventObject*); +bool8 EventObjectIsFarawayIslandMew(struct EventObject *); + +#endif // GUARD_EREADER_H diff --git a/include/pokenav.h b/include/pokenav.h index 55bfb366c1..4e02461fe9 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -3,9 +3,6 @@ #include "list_menu.h" bool8 sub_81D312C(void *arg0); -bool8 sub_81D4A58(struct EventObject*); -bool8 EventObjectIsFarawayIslandMew(struct EventObject *); -u32 sub_81D427C(void); void sub_81D4998(void); void CB2_InitPokeNav(void); diff --git a/ld_script.txt b/ld_script.txt index bd0bb7661a..5a1442fa85 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -291,7 +291,8 @@ SECTIONS { src/pokenav_match_call.o(.text); src/menu_specialized.o(.text); asm/menu_specialized.o(.text); - asm/rom_81D1C44.o(.text); + src/ereader.o(.text); + asm/ereader.o(.text); src/trainer_hill.o(.text); src/rayquaza_scene.o(.text); src/walda_phrase.o(.text); @@ -596,7 +597,7 @@ SECTIONS { src/pokenav_match_call.o(.rodata); src/menu_specialized.o(.rodata); data/menu_specialized.o(.rodata); - data/rom_81D1C44.o(.rodata); + data/ereader.o(.rodata); src/trainer_hill.o(.rodata); src/rayquaza_scene.o(.rodata); src/walda_phrase.o(.rodata); diff --git a/src/ereader.c b/src/ereader.c new file mode 100755 index 0000000000..053f82381b --- /dev/null +++ b/src/ereader.c @@ -0,0 +1,564 @@ +#include "global.h" +#include "alloc.h" +#include "event_object_movement.h" +#include "link.h" +#include "save.h" +#include "util.h" + +struct Unk81D38FC +{ + u8 unk0[0x270]; + int checksum; +}; + +struct Unknown030012C8 +{ + u8 unk0[8]; + u32 *unk8; + int unkC; + int unk10; + int unk14; +}; + +void sub_81D41A0(void); +static void sub_81D4170(void); +int sub_81D3D70(u8, u32, u32*, u32*); +void sub_81D41F4(void); +static u16 sub_81D3EE8(u8); +static void sub_81D413C(void); +static void sub_81D414C(void); +static void sub_81D3F1C(u32, u32*, u32*); +static void sub_81D3F68(void); + +extern struct Unknown030012C8 gUnknown_030012C8; +extern u16 gUnknown_030012E0; +extern u16 gUnknown_030012E2; +extern u16 gUnknown_030012E4; +extern u16 gUnknown_030012E6; +extern u32 gUnknown_030012E8; +extern u16 gUnknown_030012EC; +extern u16 gUnknown_030012EE; +extern u16 gUnknown_030012F0; +extern u16 gUnknown_030012F2; +extern u16 gUnknown_030012F4; + +extern const u8 gUnknown_08625B6C[]; + +static u8 sub_81D38D4(void) +{ + return (gSaveBlock1Ptr->trainerHill.unused + 1) % 256; +} + +static bool32 sub_81D38FC(struct Unk81D38FC *arg0) +{ + int checksum = CalcByteArraySum(arg0->unk0, 0x270); + if (checksum != arg0->checksum) + return FALSE; + + return TRUE; +} + +bool8 sub_81D3920(u8 *buffer) +{ + u32 i; + u32 checksum; + int var0 = buffer[0]; + if (var0 < 1 || var0 > 8) + return FALSE; + + for (i = 0; i < var0; i++) + { + struct Unk81D38FC *var1 = (struct Unk81D38FC *)(&buffer[i * (sizeof(struct Unk81D38FC)) + 8]); + if (!sub_81D38FC(var1)) + return FALSE; + } + + checksum = CalcByteArraySum(buffer + 8, var0 * 0x274); + if (checksum != ((int *)buffer)[1]) + return FALSE; + + return TRUE; +} + +static bool32 sub_81D396C(u8 *buffer) +{ + u32 checksum; + int var0 = buffer[0]; + if (var0 < 1 || var0 > 8) + return FALSE; + + checksum = CalcByteArraySum(buffer + 8, 0xEE0); + if (checksum != ((int *)buffer)[1]) + return FALSE; + + return TRUE; +} + +static bool32 sub_81D3998(struct Unk81D38FC *arg0, u8 *buffer2) +{ + int i; + const u8 *ereaderVals; + + memset(buffer2, 0, 0x1000); + buffer2[0] = arg0->unk0[0]; + buffer2[1] = sub_81D38D4(); + buffer2[2] = (arg0->unk0[0] + 1) / 2; + + for (i = 0; i < arg0->unk0[0]; i++) + { + if (!(i & 1)) + { + u8 *var0 = &buffer2[(i / 2) * 0x3B8]; + u8 *var1 = arg0[i].unk0; + var0[8] = var1[8]; + memcpy(&var0[0x29C], &var1[0x154], 0x124); + var0 += 0xC; + var1 += 0xC; + memcpy(var0, var1, 0x148); + } + else + { + u8 *var0 = &buffer2[(i / 2) * 0x3B8]; + u8 *var1 = arg0[i].unk0; + var0[9] = var1[8]; + memcpy(&var0[0x154], &var1[0xC], 0x148); + } + } + + if (i & 1) + { + u8 *var0 = &buffer2[(i / 2) * 0x3B8]; + var0 += 0x154; + + ereaderVals = gUnknown_08625B6C; + memcpy(var0, &ereaderVals[(i / 2) * 0x148], 0x148); + } + + ((int *)buffer2)[1] = CalcByteArraySum(buffer2 + 8, 0xEE0); + if (sub_8153634(SECTOR_ID_TRAINER_HILL, buffer2) != 1) + return FALSE; + + return TRUE; +} + +bool32 sub_81D3AB0(struct Unk81D38FC *arg0) +{ + u8 *var0 = AllocZeroed(0x1000); + bool32 result = sub_81D3998(arg0, var0); + Free(var0); + return result; +} + +static bool32 sub_81D3AD8(u8 *arg0, u8 *arg1) +{ + if (TryCopySpecialSaveSection(SECTOR_ID_TRAINER_HILL, arg1) != 1) + return FALSE; + + memcpy(arg0, arg1, 0xEE8); + if (!sub_81D396C(arg0)) + return FALSE; + + return TRUE; +} + +static bool32 sub_81D3B0C(u8 *arg0) +{ + u8 *var0 = AllocZeroed(0x1000); + bool32 result = sub_81D3AD8(arg0, var0); + Free(var0); + return result; +} + +bool32 sub_81D3B34(void) +{ + u8 *var0 = AllocZeroed(0x1000); + bool32 result = sub_81D3B0C(var0); + Free(var0); + return result; +} + +static int unref_sub_81D3B54(int arg0, u32 *arg1) +{ + int result; + u16 var0; + int var1; + + sub_81D41A0(); + while (1) + { + sub_81D4170(); + if (gUnknown_030012E2 & 2) + gShouldAdvanceLinkState = 2; + + var1 = sub_81D3D70(1, arg0, arg1, NULL); + gUnknown_030012E4 = var1; + if ((gUnknown_030012E4 & 0x13) == 0x10) + { + result = 0; + break; + } + + if (gUnknown_030012E4 & 0x8) + { + result = 1; + break; + } + + var0 = gUnknown_030012E4 & 0x4; + if (var0) + { + result = 2; + break; + } + + gShouldAdvanceLinkState = var0; + VBlankIntrWait(); + } + + CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8)); + sub_81D41F4(); + return result; +} + +static int unref_sub_81D3BE8(u32 *arg0) +{ + int result; + u16 var0; + int var1; + + sub_81D41A0(); + while (1) + { + sub_81D4170(); + if (gUnknown_030012E2 & 2) + gShouldAdvanceLinkState = 2; + + var1 = sub_81D3D70(0, 0, NULL, arg0); + gUnknown_030012E4 = var1; + if ((gUnknown_030012E4 & 0x13) == 0x10) + { + result = 0; + break; + } + + if (gUnknown_030012E4 & 0x8) + { + result = 1; + break; + } + + var0 = gUnknown_030012E4 & 0x4; + if (var0) + { + result = 2; + break; + } + + gShouldAdvanceLinkState = var0; + VBlankIntrWait(); + } + + CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8)); + sub_81D41F4(); + return result; +} + +static void sub_81D3C7C(void) +{ + REG_IME = 0; + REG_IE &= ~(INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL); + REG_IME = 1; + REG_SIOCNT = 0; + REG_TM3CNT_H = 0; + REG_IF = INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL; +} + +static void sub_81D3CBC(void) +{ + REG_IME = 0; + REG_IE &= ~(INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL); + REG_IME = 1; + REG_RCNT = 0; + REG_SIOCNT = SIO_MULTI_MODE; + REG_SIOCNT |= SIO_INTR_ENABLE | SIO_115200_BPS; + REG_IME = 0; + REG_IE |= INTR_FLAG_SERIAL; + REG_IME = 1; + + if (!gUnknown_030012C8.unk0[1]) + CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8)); +} + +static void sub_81D3D34(void) +{ + REG_RCNT = 0; + REG_SIOCNT = SIO_32BIT_MODE | SIO_INTR_ENABLE; + REG_SIOCNT |= SIO_MULTI_SD; + gShouldAdvanceLinkState = 0; + gUnknown_030012E6 = 0; + gUnknown_030012E8 = 0; +} + +int sub_81D3D70(u8 arg0, u32 arg1, u32 *arg2, u32 *arg3) +{ + switch (gUnknown_030012C8.unk0[1]) + { + case 0: + sub_81D3CBC(); + gUnknown_030012C8.unk0[2] = 1; + gUnknown_030012C8.unk0[1] = 1; + break; + case 1: + if (sub_81D3EE8(arg0)) + sub_81D413C(); + + if (gShouldAdvanceLinkState == 2) + { + gUnknown_030012C8.unk0[4] = 2; + gUnknown_030012C8.unk0[1] = 6; + } + break; + case 2: + sub_81D3D34(); + sub_81D3F1C(arg1, arg2, arg3); + gUnknown_030012C8.unk0[1] = 3; + // fall through + case 3: + if (gShouldAdvanceLinkState == 2) + { + gUnknown_030012C8.unk0[4] = 2; + gUnknown_030012C8.unk0[1] = 6; + } + else + { + gUnknown_030012E6++; + gUnknown_030012E8++; + if (!gUnknown_030012C8.unk0[0] && gUnknown_030012E8 > 60) + { + gUnknown_030012C8.unk0[4] = 1; + gUnknown_030012C8.unk0[1] = 6; + } + + if (gUnknown_030012C8.unk0[2] != 2) + { + if (gUnknown_030012C8.unk0[0] && gUnknown_030012E6 > 2) + { + sub_81D413C(); + gUnknown_030012C8.unk0[2] = 2; + } + else + { + sub_81D413C(); + gUnknown_030012C8.unk0[2] = 2; + } + } + } + break; + case 4: + sub_81D3CBC(); + gUnknown_030012C8.unk0[1] = 5; + break; + case 5: + if (gUnknown_030012C8.unk0[0] == 1 && gUnknown_030012E6 > 2) + sub_81D413C(); + + if (++gUnknown_030012E6 > 60) + { + gUnknown_030012C8.unk0[4] = 1; + gUnknown_030012C8.unk0[1] = 6; + } + break; + case 6: + if (gUnknown_030012C8.unk0[2]) + { + sub_81D3C7C(); + gUnknown_030012C8.unk0[2] = 0; + } + break; + } + + return gUnknown_030012C8.unk0[2] | (gUnknown_030012C8.unk0[4] << 2) | (gUnknown_030012C8.unk0[3] << 4); +} + +static u16 sub_81D3EE8(u8 arg0) +{ + u16 terminal = (*(vu32 *)REG_ADDR_SIOCNT) & (SIO_MULTI_SI | SIO_MULTI_SD); + if (terminal == SIO_MULTI_SD && arg0) + { + gUnknown_030012C8.unk0[0] = 1; + return 1; + } + else + { + gUnknown_030012C8.unk0[0] = 0; + return 0; + } +} + +static void sub_81D3F1C(u32 arg0, u32 *arg1, u32 *arg2) +{ + if (gUnknown_030012C8.unk0[0]) + { + REG_SIOCNT |= SIO_38400_BPS; + gUnknown_030012C8.unk8 = arg1; + REG_SIODATA32 = arg0; + gUnknown_030012C8.unk10 = arg0 / 4 + 1; + sub_81D3F68(); + } + else + { + REG_SIOCNT = REG_SIOCNT; + gUnknown_030012C8.unk8 = arg2; + } +} + +static void sub_81D3F68(void) +{ + REG_TM3CNT_L = 0xFDA7; + REG_TM3CNT_H = TIMER_INTR_ENABLE; + REG_IME = 0; + REG_IE |= INTR_FLAG_TIMER3; + REG_IME = 1; +} + +void sub_81D3F9C(void) +{ + sub_81D414C(); + sub_81D413C(); +} + +void sub_81D3FAC(void) +{ + u16 i, playerCount, k; + u32 value; + u16 var0; + u16 recvBuffer[4]; + + switch (gUnknown_030012C8.unk0[1]) + { + case 1: + REG_SIOMLT_SEND = 0xCCD0; // Handshake id + *(u64 *)recvBuffer = REG_SIOMLT_RECV; + for (i = 0, playerCount = 0, k = 0; i < 4; i++) + { + if (recvBuffer[i] == 0xCCD0) + playerCount++; + else if (recvBuffer[i] != 0xFFFF) + k++; + } + + if (playerCount == 2 && k == 0) + gUnknown_030012C8.unk0[1] = 2; + break; + case 3: + value = REG_SIODATA32; + if (!gUnknown_030012C8.unkC && !gUnknown_030012C8.unk0[0]) + gUnknown_030012C8.unk10 = value / 4 + 1; + + if (gUnknown_030012C8.unk0[0] == 1) + { + if (gUnknown_030012C8.unkC < gUnknown_030012C8.unk10) + { + REG_SIODATA32 = gUnknown_030012C8.unk8[gUnknown_030012C8.unkC]; + gUnknown_030012C8.unk14 += gUnknown_030012C8.unk8[gUnknown_030012C8.unkC]; + } + else + { + REG_SIODATA32 = gUnknown_030012C8.unk14; + } + } + else + { + if (gUnknown_030012C8.unkC > 0 && gUnknown_030012C8.unkC < gUnknown_030012C8.unk10 + 1) + { + gUnknown_030012C8.unk8[gUnknown_030012C8.unkC - 1] = value; + gUnknown_030012C8.unk14 += value; + } + else if (gUnknown_030012C8.unkC) + { + if (gUnknown_030012C8.unk14 == value) + gUnknown_030012C8.unk0[3] = 1; + else + gUnknown_030012C8.unk0[3] = 2; + } + + gUnknown_030012E8 = 0; + } + + if (++gUnknown_030012C8.unkC < gUnknown_030012C8.unk10 + 2) + { + if (gUnknown_030012C8.unk0[0]) + REG_TM3CNT_H |= TIMER_ENABLE; + else + sub_81D413C(); + } + else + { + gUnknown_030012C8.unk0[1] = 4; + gUnknown_030012E6 = 0; + } + break; + case 5: + if (!gUnknown_030012C8.unk0[0]) + REG_SIOMLT_SEND = gUnknown_030012C8.unk0[3]; + + *(u64 *)recvBuffer = REG_SIOMLT_RECV; + var0 = recvBuffer[1] - 1; + if (var0 < 2) + { + if (gUnknown_030012C8.unk0[0] == 1) + gUnknown_030012C8.unk0[3] = recvBuffer[1]; + + gUnknown_030012C8.unk0[1] = 6; + } + break; + } +} + +static void sub_81D413C(void) +{ + REG_SIOCNT |= SIO_ENABLE; +} + +static void sub_81D414C(void) +{ + REG_TM3CNT_H &= ~TIMER_ENABLE; + REG_TM3CNT_L = 0xFDA7; +} + +static void sub_81D4170(void) +{ + int keysMask = REG_KEYINPUT ^ KEYS_MASK; + gUnknown_030012E2 = keysMask & ~gUnknown_030012E0; + gUnknown_030012E0 = keysMask; +} + +void sub_81D41A0(void) +{ + gUnknown_030012EC = REG_IME; + gUnknown_030012EE = REG_IE; + gUnknown_030012F0 = REG_TM3CNT_H; + gUnknown_030012F2 = REG_SIOCNT; + gUnknown_030012F4 = REG_RCNT; +} + +void sub_81D41F4(void) +{ + REG_IME = gUnknown_030012EC; + REG_IE = gUnknown_030012EE; + REG_TM3CNT_H = gUnknown_030012F0; + REG_SIOCNT = gUnknown_030012F2; + REG_RCNT = gUnknown_030012F4; +} + +void sub_81D4238(void) +{ + CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8)); +} + +u8 sub_81D4258(void) +{ + u8 eventObjectId; + TryGetEventObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId); + return eventObjectId; +} diff --git a/src/event_object_movement.c b/src/event_object_movement.c index ba62db10da..8ebdd883f5 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -3,6 +3,7 @@ #include "battle_pyramid.h" #include "berry.h" #include "decoration.h" +#include "ereader.h" #include "event_data.h" #include "event_object_movement.h" #include "event_scripts.h" @@ -15,7 +16,6 @@ #include "metatile_behavior.h" #include "overworld.h" #include "palette.h" -#include "pokenav.h" #include "random.h" #include "sprite.h" #include "task.h" diff --git a/src/trainer_hill.c b/src/trainer_hill.c index 43b29e26e3..7bb1b997a2 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -3,6 +3,7 @@ #include "battle.h" #include "battle_tower.h" #include "battle_setup.h" +#include "ereader.h" #include "event_data.h" #include "event_scripts.h" #include "fieldmap.h" @@ -32,8 +33,6 @@ #include "constants/easy_chat.h" #include "constants/trainer_hill.h" -extern bool32 sub_81D3B34(void); - #define HILL_TAG_NORMAL 0 #define HILL_TAG_VARIETY 1 #define HILL_TAG_UNIQUE 2 From 768a68d3e8d09b0f244047c2b75cf47a3a713ff9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 21 Mar 2019 18:15:47 -0500 Subject: [PATCH 215/217] Decompile ereader.c up to faraway island code --- asm/{rom_81D1C44.s => ereader.s} | 1177 ----------------------------- data/{rom_81D1C44.s => ereader.s} | 0 include/ereader.h | 9 + include/pokenav.h | 3 - ld_script.txt | 5 +- src/ereader.c | 564 ++++++++++++++ src/event_object_movement.c | 2 +- src/trainer_hill.c | 3 +- 8 files changed, 578 insertions(+), 1185 deletions(-) rename asm/{rom_81D1C44.s => ereader.s} (64%) rename data/{rom_81D1C44.s => ereader.s} (100%) create mode 100755 include/ereader.h create mode 100755 src/ereader.c diff --git a/asm/rom_81D1C44.s b/asm/ereader.s similarity index 64% rename from asm/rom_81D1C44.s rename to asm/ereader.s index 001ac1b68f..81264aca2e 100644 --- a/asm/rom_81D1C44.s +++ b/asm/ereader.s @@ -6,1183 +6,6 @@ .text - thumb_func_start sub_81D38D4 -sub_81D38D4: @ 81D38D4 - push {lr} - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003d6d - adds r0, r1 - ldrb r1, [r0] - adds r2, r1, 0x1 - adds r0, r2, 0 - asrs r0, 8 - lsls r0, 8 - subs r0, r2, r0 - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D38D4 - - thumb_func_start sub_81D38FC -sub_81D38FC: @ 81D38FC - push {r4,r5,lr} - adds r4, r0, 0 - movs r5, 0x9C - lsls r5, 2 - adds r1, r5, 0 - bl CalcByteArraySum - adds r4, r5 - ldr r1, [r4] - cmp r0, r1 - bne _081D3916 - movs r0, 0x1 - b _081D3918 -_081D3916: - movs r0, 0 -_081D3918: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81D38FC - - thumb_func_start sub_81D3920 -sub_81D3920: @ 81D3920 - push {r4-r7,lr} - adds r7, r0, 0 - ldrb r6, [r7] - subs r0, r6, 0x1 - cmp r0, 0x7 - bhi _081D3964 - movs r5, 0 - cmp r5, r6 - bcs _081D394C - adds r4, r7, 0 - adds r4, 0x8 -_081D3936: - adds r0, r4, 0 - bl sub_81D38FC - cmp r0, 0 - beq _081D3964 - movs r0, 0x9D - lsls r0, 2 - adds r4, r0 - adds r5, 0x1 - cmp r5, r6 - bcc _081D3936 -_081D394C: - adds r0, r7, 0 - adds r0, 0x8 - movs r1, 0x9D - lsls r1, 2 - muls r1, r6 - bl CalcByteArraySum - ldr r1, [r7, 0x4] - cmp r0, r1 - bne _081D3964 - movs r0, 0x1 - b _081D3966 -_081D3964: - movs r0, 0 -_081D3966: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_81D3920 - - thumb_func_start sub_81D396C -sub_81D396C: @ 81D396C - push {r4,lr} - adds r4, r0, 0 - ldrb r0, [r4] - subs r0, 0x1 - cmp r0, 0x7 - bhi _081D398E - adds r0, r4, 0 - adds r0, 0x8 - movs r1, 0xEE - lsls r1, 4 - bl CalcByteArraySum - ldr r1, [r4, 0x4] - cmp r0, r1 - bne _081D398E - movs r0, 0x1 - b _081D3990 -_081D398E: - movs r0, 0 -_081D3990: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81D396C - - thumb_func_start sub_81D3998 -sub_81D3998: @ 81D3998 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r7, r0, 0 - mov r8, r1 - movs r2, 0x80 - lsls r2, 5 - mov r0, r8 - movs r1, 0 - bl memset - ldrb r0, [r7] - mov r1, r8 - strb r0, [r1] - bl sub_81D38D4 - mov r2, r8 - strb r0, [r2, 0x1] - ldrb r0, [r7] - adds r0, 0x1 - asrs r0, 1 - strb r0, [r2, 0x2] - movs r6, 0 - b _081D3A42 -_081D39C8: - movs r0, 0x1 - ands r0, r6 - cmp r0, 0 - bne _081D3A14 - lsrs r0, r6, 31 - adds r0, r6, r0 - asrs r0, 1 - lsls r4, r0, 4 - subs r4, r0 - lsls r4, 3 - subs r4, r0 - lsls r4, 3 - add r4, r8 - movs r0, 0x9D - lsls r0, 2 - adds r5, r6, 0 - muls r5, r0 - adds r5, r7, r5 - ldrb r0, [r5, 0x8] - strb r0, [r4, 0x8] - movs r1, 0xA7 - lsls r1, 2 - adds r0, r4, r1 - movs r2, 0xAA - lsls r2, 1 - adds r1, r5, r2 - subs r2, 0x30 - bl memcpy - adds r4, 0xC - adds r5, 0xC - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0xA4 - lsls r2, 1 - bl memcpy - b _081D3A40 -_081D3A14: - lsrs r1, r6, 31 - adds r1, r6, r1 - asrs r1, 1 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 3 - subs r0, r1 - lsls r0, 3 - add r0, r8 - movs r1, 0x9D - lsls r1, 2 - muls r1, r6 - adds r1, r7, r1 - ldrb r2, [r1, 0x8] - strb r2, [r0, 0x9] - movs r2, 0xAA - lsls r2, 1 - adds r0, r2 - adds r1, 0xC - subs r2, 0xC - bl memcpy -_081D3A40: - adds r6, 0x1 -_081D3A42: - ldrb r0, [r7] - cmp r6, r0 - blt _081D39C8 - movs r0, 0x1 - ands r0, r6 - cmp r0, 0 - beq _081D3A7E - lsrs r2, r6, 31 - adds r2, r6, r2 - asrs r2, 1 - lsls r0, r2, 4 - subs r0, r2 - lsls r0, 3 - subs r0, r2 - lsls r0, 3 - add r0, r8 - movs r1, 0xAA - lsls r1, 1 - adds r0, r1 - ldr r3, =gUnknown_08625B6C - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r1, r2 - lsls r1, 3 - adds r1, r3 - movs r2, 0xA4 - lsls r2, 1 - bl memcpy -_081D3A7E: - mov r0, r8 - adds r0, 0x8 - movs r1, 0xEE - lsls r1, 4 - bl CalcByteArraySum - mov r2, r8 - str r0, [r2, 0x4] - movs r0, 0x1E - mov r1, r8 - bl sub_8153634 - cmp r0, 0x1 - bne _081D3AA4 - movs r0, 0x1 - b _081D3AA6 - .pool -_081D3AA4: - movs r0, 0 -_081D3AA6: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_81D3998 - - thumb_func_start sub_81D3AB0 -sub_81D3AB0: @ 81D3AB0 - push {r4,r5,lr} - adds r4, r0, 0 - movs r0, 0x80 - lsls r0, 5 - bl AllocZeroed - adds r5, r0, 0 - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_81D3998 - adds r4, r0, 0 - adds r0, r5, 0 - bl Free - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81D3AB0 - - thumb_func_start sub_81D3AD8 -sub_81D3AD8: @ 81D3AD8 - push {r4,r5,lr} - adds r5, r0, 0 - adds r4, r1, 0 - movs r0, 0x1E - bl TryCopySpecialSaveSection - cmp r0, 0x1 - bne _081D3B04 - ldr r2, =0x00000ee8 - adds r0, r5, 0 - adds r1, r4, 0 - bl memcpy - adds r0, r5, 0 - bl sub_81D396C - cmp r0, 0 - beq _081D3B04 - movs r0, 0x1 - b _081D3B06 - .pool -_081D3B04: - movs r0, 0 -_081D3B06: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81D3AD8 - - thumb_func_start sub_81D3B0C -sub_81D3B0C: @ 81D3B0C - push {r4,r5,lr} - adds r4, r0, 0 - movs r0, 0x80 - lsls r0, 5 - bl AllocZeroed - adds r5, r0, 0 - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_81D3AD8 - adds r4, r0, 0 - adds r0, r5, 0 - bl Free - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81D3B0C - - thumb_func_start sub_81D3B34 -sub_81D3B34: @ 81D3B34 - push {r4,r5,lr} - movs r0, 0x80 - lsls r0, 5 - bl AllocZeroed - adds r4, r0, 0 - bl sub_81D3B0C - adds r5, r0, 0 - adds r0, r4, 0 - bl Free - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81D3B34 - - thumb_func_start sub_81D3B54 -sub_81D3B54: @ 81D3B54 - push {r4-r7,lr} - sub sp, 0x4 - adds r6, r0, 0 - adds r5, r1, 0 - bl sub_81D41A0 - movs r7, 0x2 - ldr r4, =gShouldAdvanceLinkState -_081D3B64: - bl sub_81D4170 - ldr r0, =gUnknown_030012E2 - ldrh r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _081D3B76 - strb r7, [r4] -_081D3B76: - movs r0, 0x1 - adds r1, r6, 0 - adds r2, r5, 0 - movs r3, 0 - bl sub_81D3D70 - adds r1, r0, 0 - ldr r0, =gUnknown_030012E4 - strh r1, [r0] - movs r0, 0x13 - ands r0, r1 - cmp r0, 0x10 - bne _081D3BA0 - movs r4, 0 - b _081D3BC2 - .pool -_081D3BA0: - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _081D3BAC - movs r4, 0x1 - b _081D3BC2 -_081D3BAC: - movs r0, 0x4 - ands r0, r1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0 - bne _081D3BC0 - strb r0, [r4] - bl VBlankIntrWait - b _081D3B64 -_081D3BC0: - movs r4, 0x2 -_081D3BC2: - movs r0, 0 - str r0, [sp] - ldr r1, =gUnknown_030012C8 - ldr r2, =0x05000006 - mov r0, sp - bl CpuSet - bl sub_81D41F4 - adds r0, r4, 0 - add sp, 0x4 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D3B54 - - thumb_func_start sub_81D3BE8 -sub_81D3BE8: @ 81D3BE8 - push {r4-r6,lr} - sub sp, 0x4 - adds r5, r0, 0 - bl sub_81D41A0 - movs r6, 0x2 - ldr r4, =gShouldAdvanceLinkState -_081D3BF6: - bl sub_81D4170 - ldr r0, =gUnknown_030012E2 - ldrh r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _081D3C08 - strb r6, [r4] -_081D3C08: - movs r0, 0 - movs r1, 0 - movs r2, 0 - adds r3, r5, 0 - bl sub_81D3D70 - adds r1, r0, 0 - ldr r0, =gUnknown_030012E4 - strh r1, [r0] - movs r0, 0x13 - ands r0, r1 - cmp r0, 0x10 - bne _081D3C34 - movs r4, 0 - b _081D3C56 - .pool -_081D3C34: - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _081D3C40 - movs r4, 0x1 - b _081D3C56 -_081D3C40: - movs r0, 0x4 - ands r0, r1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0 - bne _081D3C54 - strb r0, [r4] - bl VBlankIntrWait - b _081D3BF6 -_081D3C54: - movs r4, 0x2 -_081D3C56: - movs r0, 0 - str r0, [sp] - ldr r1, =gUnknown_030012C8 - ldr r2, =0x05000006 - mov r0, sp - bl CpuSet - bl sub_81D41F4 - adds r0, r4, 0 - add sp, 0x4 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D3BE8 - - thumb_func_start sub_81D3C7C -sub_81D3C7C: @ 81D3C7C - push {r4,lr} - ldr r4, =0x04000208 - movs r3, 0 - strh r3, [r4] - ldr r2, =0x04000200 - ldrh r1, [r2] - ldr r0, =0x0000ff3f - ands r0, r1 - strh r0, [r2] - movs r0, 0x1 - strh r0, [r4] - ldr r0, =0x04000128 - strh r3, [r0] - subs r0, 0x1A - strh r3, [r0] - ldr r1, =0x04000202 - movs r0, 0xC0 - strh r0, [r1] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D3C7C - - thumb_func_start sub_81D3CBC -sub_81D3CBC: @ 81D3CBC - push {r4-r7,lr} - sub sp, 0x4 - ldr r5, =0x04000208 - movs r4, 0 - strh r4, [r5] - ldr r3, =0x04000200 - ldrh r1, [r3] - ldr r0, =0x0000ff3f - ands r0, r1 - strh r0, [r3] - movs r6, 0x1 - strh r6, [r5] - ldr r0, =0x04000134 - strh r4, [r0] - ldr r2, =0x04000128 - movs r1, 0x80 - lsls r1, 6 - adds r0, r1, 0 - strh r0, [r2] - ldrh r0, [r2] - ldr r7, =0x00004003 - adds r1, r7, 0 - orrs r0, r1 - strh r0, [r2] - strh r4, [r5] - ldrh r0, [r3] - movs r1, 0x80 - orrs r0, r1 - strh r0, [r3] - strh r6, [r5] - ldr r1, =gUnknown_030012C8 - ldrb r0, [r1, 0x1] - cmp r0, 0 - bne _081D3D0A - str r0, [sp] - ldr r2, =0x05000006 - mov r0, sp - bl CpuSet -_081D3D0A: - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D3CBC - - thumb_func_start sub_81D3D34 -sub_81D3D34: @ 81D3D34 - ldr r0, =0x04000134 - movs r3, 0 - strh r3, [r0] - ldr r2, =0x04000128 - movs r1, 0xA0 - lsls r1, 7 - adds r0, r1, 0 - strh r0, [r2] - ldrh r0, [r2] - movs r1, 0x8 - orrs r0, r1 - strh r0, [r2] - ldr r0, =gShouldAdvanceLinkState - strb r3, [r0] - ldr r0, =gUnknown_030012E6 - strh r3, [r0] - ldr r1, =gUnknown_030012E8 - movs r0, 0 - str r0, [r1] - bx lr - .pool - thumb_func_end sub_81D3D34 - - thumb_func_start sub_81D3D70 -sub_81D3D70: @ 81D3D70 - push {r4-r6,lr} - adds r4, r1, 0 - adds r5, r2, 0 - adds r6, r3, 0 - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =gUnknown_030012C8 - ldrb r0, [r0, 0x1] - cmp r0, 0x6 - bls _081D3D86 - b _081D3ECC -_081D3D86: - lsls r0, 2 - ldr r1, =_081D3D98 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_081D3D98: - .4byte _081D3DB4 - .4byte _081D3DC8 - .4byte _081D3DE8 - .4byte _081D3DFC - .4byte _081D3E74 - .4byte _081D3E84 - .4byte _081D3EBC -_081D3DB4: - bl sub_81D3CBC - ldr r1, =gUnknown_030012C8 - movs r0, 0x1 - strb r0, [r1, 0x2] - strb r0, [r1, 0x1] - b _081D3ECC - .pool -_081D3DC8: - adds r0, r2, 0 - bl sub_81D3EE8 - lsls r0, 16 - cmp r0, 0 - beq _081D3DD8 - bl sub_81D413C -_081D3DD8: - ldr r0, =gShouldAdvanceLinkState - ldrb r0, [r0] - cmp r0, 0x2 - beq _081D3DE2 - b _081D3ECC -_081D3DE2: - b _081D3E04 - .pool -_081D3DE8: - bl sub_81D3D34 - adds r0, r4, 0 - adds r1, r5, 0 - adds r2, r6, 0 - bl sub_81D3F1C - ldr r1, =gUnknown_030012C8 - movs r0, 0x3 - strb r0, [r1, 0x1] -_081D3DFC: - ldr r0, =gShouldAdvanceLinkState - ldrb r0, [r0] - cmp r0, 0x2 - bne _081D3E18 -_081D3E04: - ldr r1, =gUnknown_030012C8 - strb r0, [r1, 0x4] - movs r0, 0x6 - strb r0, [r1, 0x1] - b _081D3ECC - .pool -_081D3E18: - ldr r2, =gUnknown_030012E6 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - ldr r1, =gUnknown_030012E8 - ldr r0, [r1] - adds r3, r0, 0x1 - str r3, [r1] - ldr r1, =gUnknown_030012C8 - ldrb r0, [r1] - cmp r0, 0 - bne _081D3E3C - cmp r3, 0x3C - bls _081D3E3C - movs r0, 0x1 - strb r0, [r1, 0x4] - movs r0, 0x6 - strb r0, [r1, 0x1] -_081D3E3C: - ldr r4, =gUnknown_030012C8 - ldrb r0, [r4, 0x2] - cmp r0, 0x2 - beq _081D3ECC - ldrb r0, [r4] - cmp r0, 0 - beq _081D3E64 - ldrh r0, [r2] - cmp r0, 0x2 - bls _081D3E64 - bl sub_81D413C - movs r0, 0x2 - b _081D3ECA - .pool -_081D3E64: - bl sub_81D413C - ldr r1, =gUnknown_030012C8 - movs r0, 0x2 - strb r0, [r1, 0x2] - b _081D3ECC - .pool -_081D3E74: - bl sub_81D3CBC - ldr r1, =gUnknown_030012C8 - movs r0, 0x5 - strb r0, [r1, 0x1] - b _081D3ECC - .pool -_081D3E84: - ldr r0, =gUnknown_030012C8 - ldrb r0, [r0] - cmp r0, 0x1 - bne _081D3E98 - ldr r0, =gUnknown_030012E6 - ldrh r0, [r0] - cmp r0, 0x2 - bls _081D3E98 - bl sub_81D413C -_081D3E98: - ldr r1, =gUnknown_030012E6 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x3C - bls _081D3ECC - ldr r0, =gUnknown_030012C8 - movs r1, 0x1 - strb r1, [r0, 0x4] - movs r1, 0x6 - strb r1, [r0, 0x1] - b _081D3ECC - .pool -_081D3EBC: - ldr r4, =gUnknown_030012C8 - ldrb r0, [r4, 0x2] - cmp r0, 0 - beq _081D3ECC - bl sub_81D3C7C - movs r0, 0 -_081D3ECA: - strb r0, [r4, 0x2] -_081D3ECC: - ldr r2, =gUnknown_030012C8 - ldrb r0, [r2, 0x2] - ldrb r1, [r2, 0x4] - lsls r1, 2 - orrs r0, r1 - ldrb r1, [r2, 0x3] - lsls r1, 4 - orrs r0, r1 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D3D70 - - thumb_func_start sub_81D3EE8 -sub_81D3EE8: @ 81D3EE8 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =0x04000128 - ldr r0, [r0] - movs r1, 0xC - ands r0, r1 - cmp r0, 0x8 - bne _081D3F0C - cmp r2, 0 - beq _081D3F0C - ldr r1, =gUnknown_030012C8 - movs r0, 0x1 - b _081D3F10 - .pool -_081D3F0C: - ldr r1, =gUnknown_030012C8 - movs r0, 0 -_081D3F10: - strb r0, [r1] - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D3EE8 - - thumb_func_start sub_81D3F1C -sub_81D3F1C: @ 81D3F1C - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldr r3, =gUnknown_030012C8 - ldrb r0, [r3] - cmp r0, 0 - beq _081D3F54 - ldr r2, =0x04000128 - ldrh r0, [r2] - movs r1, 0x1 - orrs r0, r1 - strh r0, [r2] - str r5, [r3, 0x8] - ldr r0, =0x04000120 - str r4, [r0] - lsrs r0, r4, 2 - adds r0, 0x1 - str r0, [r3, 0x10] - bl sub_81D3F68 - b _081D3F5C - .pool -_081D3F54: - ldr r1, =0x04000128 - ldrh r0, [r1] - strh r0, [r1] - str r2, [r3, 0x8] -_081D3F5C: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D3F1C - - thumb_func_start sub_81D3F68 -sub_81D3F68: @ 81D3F68 - ldr r1, =0x0400010c - ldr r2, =0x0000fda7 - adds r0, r2, 0 - strh r0, [r1] - ldr r0, =0x0400010e - movs r2, 0x40 - strh r2, [r0] - ldr r3, =0x04000208 - movs r0, 0 - strh r0, [r3] - adds r1, 0xF4 - ldrh r0, [r1] - orrs r0, r2 - strh r0, [r1] - movs r0, 0x1 - strh r0, [r3] - bx lr - .pool - thumb_func_end sub_81D3F68 - - thumb_func_start sub_81D3F9C -sub_81D3F9C: @ 81D3F9C - push {lr} - bl sub_81D414C - bl sub_81D413C - pop {r0} - bx r0 - thumb_func_end sub_81D3F9C - - thumb_func_start sub_81D3FAC -sub_81D3FAC: @ 81D3FAC - push {r4-r6,lr} - sub sp, 0x8 - ldr r2, =gUnknown_030012C8 - ldrb r0, [r2, 0x1] - adds r3, r2, 0 - cmp r0, 0x3 - beq _081D4034 - cmp r0, 0x3 - bgt _081D3FC8 - cmp r0, 0x1 - beq _081D3FD0 - b _081D412A - .pool -_081D3FC8: - cmp r0, 0x5 - bne _081D3FCE - b _081D40FC -_081D3FCE: - b _081D412A -_081D3FD0: - ldr r1, =0x0400012a - ldr r2, =0x0000ccd0 - adds r0, r2, 0 - strh r0, [r1] - ldr r0, =0x04000120 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp] - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r4, 0 - ldr r6, =0x0000ccd0 - ldr r5, =0x0000ffff -_081D3FEC: - lsls r0, r1, 1 - add r0, sp - ldrh r0, [r0] - cmp r0, r6 - bne _081D4010 - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - b _081D401A - .pool -_081D4010: - cmp r0, r5 - beq _081D401A - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 -_081D401A: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0x3 - bls _081D3FEC - cmp r2, 0x2 - beq _081D402A - b _081D412A -_081D402A: - cmp r4, 0 - beq _081D4030 - b _081D412A -_081D4030: - strb r2, [r3, 0x1] - b _081D412A -_081D4034: - ldr r0, =0x04000120 - ldr r4, [r0] - ldr r0, [r2, 0xC] - cmp r0, 0 - bne _081D404A - ldrb r0, [r2] - cmp r0, 0 - bne _081D404A - lsrs r0, r4, 2 - adds r0, 0x1 - str r0, [r2, 0x10] -_081D404A: - ldrb r0, [r3] - cmp r0, 0x1 - bne _081D4080 - ldr r1, [r3, 0xC] - ldr r0, [r3, 0x10] - cmp r1, r0 - bge _081D4074 - ldr r2, =0x04000120 - ldr r0, [r3, 0x8] - lsls r1, 2 - adds r1, r0 - ldr r0, [r1] - str r0, [r2] - ldr r0, [r3, 0x14] - ldr r1, [r1] - adds r0, r1 - str r0, [r3, 0x14] - b _081D40BA - .pool -_081D4074: - ldr r1, =0x04000120 - ldr r0, [r3, 0x14] - b _081D40B8 - .pool -_081D4080: - ldr r1, [r3, 0xC] - cmp r1, 0 - ble _081D40A0 - ldr r0, [r3, 0x10] - adds r0, 0x1 - cmp r1, r0 - bge _081D40A0 - ldr r0, [r3, 0x8] - lsls r1, 2 - adds r1, r0 - subs r1, 0x4 - str r4, [r1] - ldr r0, [r3, 0x14] - adds r0, r4 - str r0, [r3, 0x14] - b _081D40B4 -_081D40A0: - ldr r0, [r3, 0xC] - cmp r0, 0 - beq _081D40B4 - ldr r0, [r3, 0x14] - cmp r0, r4 - bne _081D40B0 - movs r0, 0x1 - b _081D40B2 -_081D40B0: - movs r0, 0x2 -_081D40B2: - strb r0, [r3, 0x3] -_081D40B4: - ldr r1, =gUnknown_030012E8 - movs r0, 0 -_081D40B8: - str r0, [r1] -_081D40BA: - ldr r1, [r3, 0xC] - adds r1, 0x1 - str r1, [r3, 0xC] - ldr r0, [r3, 0x10] - adds r0, 0x2 - cmp r1, r0 - bge _081D40EA - ldrb r0, [r3] - cmp r0, 0 - beq _081D40E4 - ldr r0, =0x0400010e - ldrh r1, [r0] - movs r2, 0x80 - orrs r1, r2 - strh r1, [r0] - b _081D412A - .pool -_081D40E4: - bl sub_81D413C - b _081D412A -_081D40EA: - movs r0, 0 - movs r1, 0x4 - strb r1, [r3, 0x1] - ldr r1, =gUnknown_030012E6 - strh r0, [r1] - b _081D412A - .pool -_081D40FC: - ldrb r3, [r2] - cmp r3, 0 - bne _081D4108 - ldr r1, =0x0400012a - ldrb r0, [r2, 0x3] - strh r0, [r1] -_081D4108: - ldr r0, =0x04000120 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp] - str r1, [sp, 0x4] - mov r0, sp - ldrh r1, [r0, 0x2] - subs r0, r1, 0x1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bhi _081D412A - cmp r3, 0x1 - bne _081D4126 - strb r1, [r2, 0x3] -_081D4126: - movs r0, 0x6 - strb r0, [r2, 0x1] -_081D412A: - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D3FAC - - thumb_func_start sub_81D413C -sub_81D413C: @ 81D413C - ldr r0, =0x04000128 - ldrh r1, [r0] - movs r2, 0x80 - orrs r1, r2 - strh r1, [r0] - bx lr - .pool - thumb_func_end sub_81D413C - - thumb_func_start sub_81D414C -sub_81D414C: @ 81D414C - ldr r2, =0x0400010e - ldrh r1, [r2] - ldr r0, =0x0000ff7f - ands r0, r1 - strh r0, [r2] - ldr r1, =0x0400010c - ldr r2, =0x0000fda7 - adds r0, r2, 0 - strh r0, [r1] - bx lr - .pool - thumb_func_end sub_81D414C - - thumb_func_start sub_81D4170 -sub_81D4170: @ 81D4170 - push {r4,lr} - ldr r0, =0x04000130 - ldrh r0, [r0] - ldr r2, =0x000003ff - adds r1, r2, 0 - eors r1, r0 - ldr r4, =gUnknown_030012E2 - ldr r3, =gUnknown_030012E0 - ldrh r2, [r3] - adds r0, r1, 0 - bics r0, r2 - strh r0, [r4] - strh r1, [r3] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D4170 - - thumb_func_start sub_81D41A0 -sub_81D41A0: @ 81D41A0 - ldr r1, =gUnknown_030012EC - ldr r0, =0x04000208 - ldrh r0, [r0] - strh r0, [r1] - ldr r1, =gUnknown_030012EE - ldr r0, =0x04000200 - ldrh r0, [r0] - strh r0, [r1] - ldr r1, =gUnknown_030012F0 - ldr r0, =0x0400010e - ldrh r0, [r0] - strh r0, [r1] - ldr r1, =gUnknown_030012F2 - ldr r0, =0x04000128 - ldrh r0, [r0] - strh r0, [r1] - ldr r1, =gUnknown_030012F4 - ldr r0, =0x04000134 - ldrh r0, [r0] - strh r0, [r1] - bx lr - .pool - thumb_func_end sub_81D41A0 - - thumb_func_start sub_81D41F4 -sub_81D41F4: @ 81D41F4 - ldr r1, =0x04000208 - ldr r0, =gUnknown_030012EC - ldrh r0, [r0] - strh r0, [r1] - subs r1, 0x8 - ldr r0, =gUnknown_030012EE - ldrh r0, [r0] - strh r0, [r1] - subs r1, 0xF2 - ldr r0, =gUnknown_030012F0 - ldrh r0, [r0] - strh r0, [r1] - adds r1, 0x1A - ldr r0, =gUnknown_030012F2 - ldrh r0, [r0] - strh r0, [r1] - adds r1, 0xC - ldr r0, =gUnknown_030012F4 - ldrh r0, [r0] - strh r0, [r1] - bx lr - .pool - thumb_func_end sub_81D41F4 - - thumb_func_start sub_81D4238 -sub_81D4238: @ 81D4238 - push {lr} - sub sp, 0x4 - movs r0, 0 - str r0, [sp] - ldr r1, =gUnknown_030012C8 - ldr r2, =0x05000006 - mov r0, sp - bl CpuSet - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D4238 - - thumb_func_start sub_81D4258 -sub_81D4258: @ 81D4258 - push {lr} - sub sp, 0x4 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrb r1, [r0, 0x5] - ldrb r2, [r0, 0x4] - movs r0, 0x1 - mov r3, sp - bl TryGetEventObjectIdByLocalIdAndMap - mov r0, sp - ldrb r0, [r0] - add sp, 0x4 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D4258 - thumb_func_start sub_81D427C sub_81D427C: @ 81D427C push {r4-r7,lr} diff --git a/data/rom_81D1C44.s b/data/ereader.s similarity index 100% rename from data/rom_81D1C44.s rename to data/ereader.s diff --git a/include/ereader.h b/include/ereader.h new file mode 100755 index 0000000000..da31c82127 --- /dev/null +++ b/include/ereader.h @@ -0,0 +1,9 @@ +#ifndef GUARD_EREADER_H +#define GUARD_EREADER_H + +bool32 sub_81D3B34(void); +u32 sub_81D427C(void); +bool8 sub_81D4A58(struct EventObject*); +bool8 EventObjectIsFarawayIslandMew(struct EventObject *); + +#endif // GUARD_EREADER_H diff --git a/include/pokenav.h b/include/pokenav.h index 55bfb366c1..4e02461fe9 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -3,9 +3,6 @@ #include "list_menu.h" bool8 sub_81D312C(void *arg0); -bool8 sub_81D4A58(struct EventObject*); -bool8 EventObjectIsFarawayIslandMew(struct EventObject *); -u32 sub_81D427C(void); void sub_81D4998(void); void CB2_InitPokeNav(void); diff --git a/ld_script.txt b/ld_script.txt index bd0bb7661a..5a1442fa85 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -291,7 +291,8 @@ SECTIONS { src/pokenav_match_call.o(.text); src/menu_specialized.o(.text); asm/menu_specialized.o(.text); - asm/rom_81D1C44.o(.text); + src/ereader.o(.text); + asm/ereader.o(.text); src/trainer_hill.o(.text); src/rayquaza_scene.o(.text); src/walda_phrase.o(.text); @@ -596,7 +597,7 @@ SECTIONS { src/pokenav_match_call.o(.rodata); src/menu_specialized.o(.rodata); data/menu_specialized.o(.rodata); - data/rom_81D1C44.o(.rodata); + data/ereader.o(.rodata); src/trainer_hill.o(.rodata); src/rayquaza_scene.o(.rodata); src/walda_phrase.o(.rodata); diff --git a/src/ereader.c b/src/ereader.c new file mode 100755 index 0000000000..053f82381b --- /dev/null +++ b/src/ereader.c @@ -0,0 +1,564 @@ +#include "global.h" +#include "alloc.h" +#include "event_object_movement.h" +#include "link.h" +#include "save.h" +#include "util.h" + +struct Unk81D38FC +{ + u8 unk0[0x270]; + int checksum; +}; + +struct Unknown030012C8 +{ + u8 unk0[8]; + u32 *unk8; + int unkC; + int unk10; + int unk14; +}; + +void sub_81D41A0(void); +static void sub_81D4170(void); +int sub_81D3D70(u8, u32, u32*, u32*); +void sub_81D41F4(void); +static u16 sub_81D3EE8(u8); +static void sub_81D413C(void); +static void sub_81D414C(void); +static void sub_81D3F1C(u32, u32*, u32*); +static void sub_81D3F68(void); + +extern struct Unknown030012C8 gUnknown_030012C8; +extern u16 gUnknown_030012E0; +extern u16 gUnknown_030012E2; +extern u16 gUnknown_030012E4; +extern u16 gUnknown_030012E6; +extern u32 gUnknown_030012E8; +extern u16 gUnknown_030012EC; +extern u16 gUnknown_030012EE; +extern u16 gUnknown_030012F0; +extern u16 gUnknown_030012F2; +extern u16 gUnknown_030012F4; + +extern const u8 gUnknown_08625B6C[]; + +static u8 sub_81D38D4(void) +{ + return (gSaveBlock1Ptr->trainerHill.unused + 1) % 256; +} + +static bool32 sub_81D38FC(struct Unk81D38FC *arg0) +{ + int checksum = CalcByteArraySum(arg0->unk0, 0x270); + if (checksum != arg0->checksum) + return FALSE; + + return TRUE; +} + +bool8 sub_81D3920(u8 *buffer) +{ + u32 i; + u32 checksum; + int var0 = buffer[0]; + if (var0 < 1 || var0 > 8) + return FALSE; + + for (i = 0; i < var0; i++) + { + struct Unk81D38FC *var1 = (struct Unk81D38FC *)(&buffer[i * (sizeof(struct Unk81D38FC)) + 8]); + if (!sub_81D38FC(var1)) + return FALSE; + } + + checksum = CalcByteArraySum(buffer + 8, var0 * 0x274); + if (checksum != ((int *)buffer)[1]) + return FALSE; + + return TRUE; +} + +static bool32 sub_81D396C(u8 *buffer) +{ + u32 checksum; + int var0 = buffer[0]; + if (var0 < 1 || var0 > 8) + return FALSE; + + checksum = CalcByteArraySum(buffer + 8, 0xEE0); + if (checksum != ((int *)buffer)[1]) + return FALSE; + + return TRUE; +} + +static bool32 sub_81D3998(struct Unk81D38FC *arg0, u8 *buffer2) +{ + int i; + const u8 *ereaderVals; + + memset(buffer2, 0, 0x1000); + buffer2[0] = arg0->unk0[0]; + buffer2[1] = sub_81D38D4(); + buffer2[2] = (arg0->unk0[0] + 1) / 2; + + for (i = 0; i < arg0->unk0[0]; i++) + { + if (!(i & 1)) + { + u8 *var0 = &buffer2[(i / 2) * 0x3B8]; + u8 *var1 = arg0[i].unk0; + var0[8] = var1[8]; + memcpy(&var0[0x29C], &var1[0x154], 0x124); + var0 += 0xC; + var1 += 0xC; + memcpy(var0, var1, 0x148); + } + else + { + u8 *var0 = &buffer2[(i / 2) * 0x3B8]; + u8 *var1 = arg0[i].unk0; + var0[9] = var1[8]; + memcpy(&var0[0x154], &var1[0xC], 0x148); + } + } + + if (i & 1) + { + u8 *var0 = &buffer2[(i / 2) * 0x3B8]; + var0 += 0x154; + + ereaderVals = gUnknown_08625B6C; + memcpy(var0, &ereaderVals[(i / 2) * 0x148], 0x148); + } + + ((int *)buffer2)[1] = CalcByteArraySum(buffer2 + 8, 0xEE0); + if (sub_8153634(SECTOR_ID_TRAINER_HILL, buffer2) != 1) + return FALSE; + + return TRUE; +} + +bool32 sub_81D3AB0(struct Unk81D38FC *arg0) +{ + u8 *var0 = AllocZeroed(0x1000); + bool32 result = sub_81D3998(arg0, var0); + Free(var0); + return result; +} + +static bool32 sub_81D3AD8(u8 *arg0, u8 *arg1) +{ + if (TryCopySpecialSaveSection(SECTOR_ID_TRAINER_HILL, arg1) != 1) + return FALSE; + + memcpy(arg0, arg1, 0xEE8); + if (!sub_81D396C(arg0)) + return FALSE; + + return TRUE; +} + +static bool32 sub_81D3B0C(u8 *arg0) +{ + u8 *var0 = AllocZeroed(0x1000); + bool32 result = sub_81D3AD8(arg0, var0); + Free(var0); + return result; +} + +bool32 sub_81D3B34(void) +{ + u8 *var0 = AllocZeroed(0x1000); + bool32 result = sub_81D3B0C(var0); + Free(var0); + return result; +} + +static int unref_sub_81D3B54(int arg0, u32 *arg1) +{ + int result; + u16 var0; + int var1; + + sub_81D41A0(); + while (1) + { + sub_81D4170(); + if (gUnknown_030012E2 & 2) + gShouldAdvanceLinkState = 2; + + var1 = sub_81D3D70(1, arg0, arg1, NULL); + gUnknown_030012E4 = var1; + if ((gUnknown_030012E4 & 0x13) == 0x10) + { + result = 0; + break; + } + + if (gUnknown_030012E4 & 0x8) + { + result = 1; + break; + } + + var0 = gUnknown_030012E4 & 0x4; + if (var0) + { + result = 2; + break; + } + + gShouldAdvanceLinkState = var0; + VBlankIntrWait(); + } + + CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8)); + sub_81D41F4(); + return result; +} + +static int unref_sub_81D3BE8(u32 *arg0) +{ + int result; + u16 var0; + int var1; + + sub_81D41A0(); + while (1) + { + sub_81D4170(); + if (gUnknown_030012E2 & 2) + gShouldAdvanceLinkState = 2; + + var1 = sub_81D3D70(0, 0, NULL, arg0); + gUnknown_030012E4 = var1; + if ((gUnknown_030012E4 & 0x13) == 0x10) + { + result = 0; + break; + } + + if (gUnknown_030012E4 & 0x8) + { + result = 1; + break; + } + + var0 = gUnknown_030012E4 & 0x4; + if (var0) + { + result = 2; + break; + } + + gShouldAdvanceLinkState = var0; + VBlankIntrWait(); + } + + CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8)); + sub_81D41F4(); + return result; +} + +static void sub_81D3C7C(void) +{ + REG_IME = 0; + REG_IE &= ~(INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL); + REG_IME = 1; + REG_SIOCNT = 0; + REG_TM3CNT_H = 0; + REG_IF = INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL; +} + +static void sub_81D3CBC(void) +{ + REG_IME = 0; + REG_IE &= ~(INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL); + REG_IME = 1; + REG_RCNT = 0; + REG_SIOCNT = SIO_MULTI_MODE; + REG_SIOCNT |= SIO_INTR_ENABLE | SIO_115200_BPS; + REG_IME = 0; + REG_IE |= INTR_FLAG_SERIAL; + REG_IME = 1; + + if (!gUnknown_030012C8.unk0[1]) + CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8)); +} + +static void sub_81D3D34(void) +{ + REG_RCNT = 0; + REG_SIOCNT = SIO_32BIT_MODE | SIO_INTR_ENABLE; + REG_SIOCNT |= SIO_MULTI_SD; + gShouldAdvanceLinkState = 0; + gUnknown_030012E6 = 0; + gUnknown_030012E8 = 0; +} + +int sub_81D3D70(u8 arg0, u32 arg1, u32 *arg2, u32 *arg3) +{ + switch (gUnknown_030012C8.unk0[1]) + { + case 0: + sub_81D3CBC(); + gUnknown_030012C8.unk0[2] = 1; + gUnknown_030012C8.unk0[1] = 1; + break; + case 1: + if (sub_81D3EE8(arg0)) + sub_81D413C(); + + if (gShouldAdvanceLinkState == 2) + { + gUnknown_030012C8.unk0[4] = 2; + gUnknown_030012C8.unk0[1] = 6; + } + break; + case 2: + sub_81D3D34(); + sub_81D3F1C(arg1, arg2, arg3); + gUnknown_030012C8.unk0[1] = 3; + // fall through + case 3: + if (gShouldAdvanceLinkState == 2) + { + gUnknown_030012C8.unk0[4] = 2; + gUnknown_030012C8.unk0[1] = 6; + } + else + { + gUnknown_030012E6++; + gUnknown_030012E8++; + if (!gUnknown_030012C8.unk0[0] && gUnknown_030012E8 > 60) + { + gUnknown_030012C8.unk0[4] = 1; + gUnknown_030012C8.unk0[1] = 6; + } + + if (gUnknown_030012C8.unk0[2] != 2) + { + if (gUnknown_030012C8.unk0[0] && gUnknown_030012E6 > 2) + { + sub_81D413C(); + gUnknown_030012C8.unk0[2] = 2; + } + else + { + sub_81D413C(); + gUnknown_030012C8.unk0[2] = 2; + } + } + } + break; + case 4: + sub_81D3CBC(); + gUnknown_030012C8.unk0[1] = 5; + break; + case 5: + if (gUnknown_030012C8.unk0[0] == 1 && gUnknown_030012E6 > 2) + sub_81D413C(); + + if (++gUnknown_030012E6 > 60) + { + gUnknown_030012C8.unk0[4] = 1; + gUnknown_030012C8.unk0[1] = 6; + } + break; + case 6: + if (gUnknown_030012C8.unk0[2]) + { + sub_81D3C7C(); + gUnknown_030012C8.unk0[2] = 0; + } + break; + } + + return gUnknown_030012C8.unk0[2] | (gUnknown_030012C8.unk0[4] << 2) | (gUnknown_030012C8.unk0[3] << 4); +} + +static u16 sub_81D3EE8(u8 arg0) +{ + u16 terminal = (*(vu32 *)REG_ADDR_SIOCNT) & (SIO_MULTI_SI | SIO_MULTI_SD); + if (terminal == SIO_MULTI_SD && arg0) + { + gUnknown_030012C8.unk0[0] = 1; + return 1; + } + else + { + gUnknown_030012C8.unk0[0] = 0; + return 0; + } +} + +static void sub_81D3F1C(u32 arg0, u32 *arg1, u32 *arg2) +{ + if (gUnknown_030012C8.unk0[0]) + { + REG_SIOCNT |= SIO_38400_BPS; + gUnknown_030012C8.unk8 = arg1; + REG_SIODATA32 = arg0; + gUnknown_030012C8.unk10 = arg0 / 4 + 1; + sub_81D3F68(); + } + else + { + REG_SIOCNT = REG_SIOCNT; + gUnknown_030012C8.unk8 = arg2; + } +} + +static void sub_81D3F68(void) +{ + REG_TM3CNT_L = 0xFDA7; + REG_TM3CNT_H = TIMER_INTR_ENABLE; + REG_IME = 0; + REG_IE |= INTR_FLAG_TIMER3; + REG_IME = 1; +} + +void sub_81D3F9C(void) +{ + sub_81D414C(); + sub_81D413C(); +} + +void sub_81D3FAC(void) +{ + u16 i, playerCount, k; + u32 value; + u16 var0; + u16 recvBuffer[4]; + + switch (gUnknown_030012C8.unk0[1]) + { + case 1: + REG_SIOMLT_SEND = 0xCCD0; // Handshake id + *(u64 *)recvBuffer = REG_SIOMLT_RECV; + for (i = 0, playerCount = 0, k = 0; i < 4; i++) + { + if (recvBuffer[i] == 0xCCD0) + playerCount++; + else if (recvBuffer[i] != 0xFFFF) + k++; + } + + if (playerCount == 2 && k == 0) + gUnknown_030012C8.unk0[1] = 2; + break; + case 3: + value = REG_SIODATA32; + if (!gUnknown_030012C8.unkC && !gUnknown_030012C8.unk0[0]) + gUnknown_030012C8.unk10 = value / 4 + 1; + + if (gUnknown_030012C8.unk0[0] == 1) + { + if (gUnknown_030012C8.unkC < gUnknown_030012C8.unk10) + { + REG_SIODATA32 = gUnknown_030012C8.unk8[gUnknown_030012C8.unkC]; + gUnknown_030012C8.unk14 += gUnknown_030012C8.unk8[gUnknown_030012C8.unkC]; + } + else + { + REG_SIODATA32 = gUnknown_030012C8.unk14; + } + } + else + { + if (gUnknown_030012C8.unkC > 0 && gUnknown_030012C8.unkC < gUnknown_030012C8.unk10 + 1) + { + gUnknown_030012C8.unk8[gUnknown_030012C8.unkC - 1] = value; + gUnknown_030012C8.unk14 += value; + } + else if (gUnknown_030012C8.unkC) + { + if (gUnknown_030012C8.unk14 == value) + gUnknown_030012C8.unk0[3] = 1; + else + gUnknown_030012C8.unk0[3] = 2; + } + + gUnknown_030012E8 = 0; + } + + if (++gUnknown_030012C8.unkC < gUnknown_030012C8.unk10 + 2) + { + if (gUnknown_030012C8.unk0[0]) + REG_TM3CNT_H |= TIMER_ENABLE; + else + sub_81D413C(); + } + else + { + gUnknown_030012C8.unk0[1] = 4; + gUnknown_030012E6 = 0; + } + break; + case 5: + if (!gUnknown_030012C8.unk0[0]) + REG_SIOMLT_SEND = gUnknown_030012C8.unk0[3]; + + *(u64 *)recvBuffer = REG_SIOMLT_RECV; + var0 = recvBuffer[1] - 1; + if (var0 < 2) + { + if (gUnknown_030012C8.unk0[0] == 1) + gUnknown_030012C8.unk0[3] = recvBuffer[1]; + + gUnknown_030012C8.unk0[1] = 6; + } + break; + } +} + +static void sub_81D413C(void) +{ + REG_SIOCNT |= SIO_ENABLE; +} + +static void sub_81D414C(void) +{ + REG_TM3CNT_H &= ~TIMER_ENABLE; + REG_TM3CNT_L = 0xFDA7; +} + +static void sub_81D4170(void) +{ + int keysMask = REG_KEYINPUT ^ KEYS_MASK; + gUnknown_030012E2 = keysMask & ~gUnknown_030012E0; + gUnknown_030012E0 = keysMask; +} + +void sub_81D41A0(void) +{ + gUnknown_030012EC = REG_IME; + gUnknown_030012EE = REG_IE; + gUnknown_030012F0 = REG_TM3CNT_H; + gUnknown_030012F2 = REG_SIOCNT; + gUnknown_030012F4 = REG_RCNT; +} + +void sub_81D41F4(void) +{ + REG_IME = gUnknown_030012EC; + REG_IE = gUnknown_030012EE; + REG_TM3CNT_H = gUnknown_030012F0; + REG_SIOCNT = gUnknown_030012F2; + REG_RCNT = gUnknown_030012F4; +} + +void sub_81D4238(void) +{ + CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8)); +} + +u8 sub_81D4258(void) +{ + u8 eventObjectId; + TryGetEventObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId); + return eventObjectId; +} diff --git a/src/event_object_movement.c b/src/event_object_movement.c index ba62db10da..8ebdd883f5 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -3,6 +3,7 @@ #include "battle_pyramid.h" #include "berry.h" #include "decoration.h" +#include "ereader.h" #include "event_data.h" #include "event_object_movement.h" #include "event_scripts.h" @@ -15,7 +16,6 @@ #include "metatile_behavior.h" #include "overworld.h" #include "palette.h" -#include "pokenav.h" #include "random.h" #include "sprite.h" #include "task.h" diff --git a/src/trainer_hill.c b/src/trainer_hill.c index 43b29e26e3..7bb1b997a2 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -3,6 +3,7 @@ #include "battle.h" #include "battle_tower.h" #include "battle_setup.h" +#include "ereader.h" #include "event_data.h" #include "event_scripts.h" #include "fieldmap.h" @@ -32,8 +33,6 @@ #include "constants/easy_chat.h" #include "constants/trainer_hill.h" -extern bool32 sub_81D3B34(void); - #define HILL_TAG_NORMAL 0 #define HILL_TAG_VARIETY 1 #define HILL_TAG_UNIQUE 2 From f4f666f5af6586203692427860a474fe020abd42 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 22 Mar 2019 13:36:06 -0500 Subject: [PATCH 216/217] Finish decompiling ereader.c --- asm/ereader.s | 2192 ------------------ data/ereader.s | 2 +- data/maps/FarawayIsland_Interior/scripts.inc | 2 +- include/constants/vars.h | 2 +- include/ereader.h | 2 + include/link.h | 1 - include/pokenav.h | 1 - include/rom_8011DC0.h | 4 + include/strings.h | 20 + ld_script.txt | 1 - porymap.project.cfg | 1 + src/ereader.c | 881 +++++++ src/field_control_avatar.c | 4 +- src/fldeff_cut.c | 3 +- 14 files changed, 914 insertions(+), 2202 deletions(-) delete mode 100644 asm/ereader.s create mode 100755 porymap.project.cfg diff --git a/asm/ereader.s b/asm/ereader.s deleted file mode 100644 index 81264aca2e..0000000000 --- a/asm/ereader.s +++ /dev/null @@ -1,2192 +0,0 @@ - - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_81D427C -sub_81D427C: @ 81D427C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - bl sub_81D4258 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 3 - adds r1, r0 - lsls r1, 2 - ldr r2, =gEventObjects - adds r5, r1, r2 - ldr r4, =gUnknown_030012F8 - ldr r3, =gPlayerAvatar - ldrb r1, [r3, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r0, [r0, 0x14] - ldrh r1, [r5, 0x10] - subs r0, r1 - strh r0, [r4] - ldr r4, =gUnknown_030012FA - ldrb r1, [r3, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r0, [r0, 0x16] - ldrh r1, [r5, 0x12] - subs r0, r1 - strh r0, [r4] - movs r0, 0 - mov r8, r0 - ldr r2, =gUnknown_030012FC - movs r1, 0 -_081D42CA: - mov r3, r8 - adds r0, r3, r2 - strb r1, [r0] - mov r0, r8 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - cmp r0, 0x3 - bls _081D42CA - ldr r2, =gEventObjects - ldr r0, =gPlayerAvatar - ldrb r1, [r0, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - adds r2, r0, r2 - movs r4, 0x14 - ldrsh r1, [r2, r4] - movs r6, 0x10 - ldrsh r0, [r2, r6] - cmp r1, r0 - bne _081D4304 - movs r0, 0x16 - ldrsh r1, [r2, r0] - movs r3, 0x12 - ldrsh r0, [r2, r3] - cmp r1, r0 - beq _081D4356 -_081D4304: - ldr r0, =0x0000403a - bl VarGet - lsls r0, 16 - movs r1, 0xE0 - lsls r1, 11 - ands r1, r0 - cmp r1, 0 - bne _081D4338 - ldrb r1, [r5, 0x1] - movs r0, 0x21 - negs r0, r0 - ands r0, r1 - b _081D433E - .pool -_081D4338: - ldrb r0, [r5, 0x1] - movs r1, 0x20 - orrs r0, r1 -_081D433E: - strb r0, [r5, 0x1] - ldr r0, =0x0000403a - bl VarGet - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x9 - bl __umodsi3 - lsls r0, 16 - cmp r0, 0 - bne _081D4360 -_081D4356: - movs r0, 0 - b _081D4816 - .pool -_081D4360: - movs r4, 0 - mov r8, r4 - ldr r6, =gEventObjects - mov r10, r6 -_081D4368: - ldr r3, =gPlayerAvatar - ldrb r1, [r3, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - mov r1, r10 - adds r4, r0, r1 - mov r2, r8 - lsls r1, r2, 2 - ldr r6, =gUnknown_0862608C - adds r0, r1, r6 - movs r6, 0x14 - ldrsh r2, [r4, r6] - movs r6, 0 - ldrsh r0, [r0, r6] - ldr r6, =gEventObjects - mov r9, r6 - mov r12, r3 - adds r7, r1, 0 - cmp r2, r0 - beq _081D4394 - b _081D449E -_081D4394: - movs r3, 0 - ldr r1, =gUnknown_0862608C + 2 - adds r0, r7, r1 - movs r2, 0x16 - ldrsh r1, [r4, r2] - movs r4, 0 - ldrsh r2, [r0, r4] - cmp r1, r2 - bge _081D43C0 - movs r6, 0x12 - ldrsh r0, [r5, r6] - cmp r0, r2 - bgt _081D43CA - b _081D449E - .pool -_081D43C0: - movs r1, 0x12 - ldrsh r0, [r5, r1] - cmp r0, r2 - blt _081D43CA - movs r3, 0x1 -_081D43CA: - cmp r3, 0 - bne _081D449E - ldr r0, =gUnknown_030012F8 - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r0, 0 - ble _081D4410 - movs r3, 0x10 - ldrsh r2, [r5, r3] - adds r2, 0x1 - mov r4, r12 - ldrb r1, [r4, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - add r0, r9 - movs r6, 0x14 - ldrsh r0, [r0, r6] - cmp r2, r0 - bne _081D4446 - ldrh r0, [r5, 0x10] - adds r0, 0x1 - lsls r0, 16 - asrs r0, 16 - movs r2, 0x12 - ldrsh r1, [r5, r2] - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - beq _081D4446 -_081D4408: - movs r0, 0x4 - b _081D4816 - .pool -_081D4410: - cmp r0, 0 - bge _081D4446 - movs r3, 0x10 - ldrsh r2, [r5, r3] - subs r2, 0x1 - mov r4, r12 - ldrb r1, [r4, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - add r0, r9 - movs r6, 0x14 - ldrsh r0, [r0, r6] - cmp r2, r0 - bne _081D4446 - ldrh r0, [r5, 0x10] - subs r0, 0x1 - lsls r0, 16 - asrs r0, 16 - movs r2, 0x12 - ldrsh r1, [r5, r2] - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - beq _081D4446 - b _081D45AA -_081D4446: - ldr r0, =gPlayerAvatar - ldrb r1, [r0, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - add r0, r10 - movs r3, 0x10 - ldrsh r1, [r5, r3] - movs r4, 0x14 - ldrsh r0, [r0, r4] - cmp r1, r0 - bne _081D449E - ldr r0, =gUnknown_030012FA - movs r6, 0 - ldrsh r0, [r0, r6] - cmp r0, 0 - ble _081D4488 - adds r0, r1, 0 - ldrh r1, [r5, 0x12] - subs r1, 0x1 - lsls r1, 16 - asrs r1, 16 - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - beq _081D449E -_081D447C: - movs r0, 0x2 - b _081D4816 - .pool -_081D4488: - movs r2, 0x10 - ldrsh r0, [r5, r2] - ldrh r1, [r5, 0x12] - adds r1, 0x1 - lsls r1, 16 - asrs r1, 16 - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - bne _081D4538 -_081D449E: - ldr r2, =gPlayerAvatar - ldrb r1, [r2, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - mov r3, r10 - adds r4, r0, r3 - ldr r6, =gUnknown_0862608C - ldr r1, =gUnknown_0862608C + 2 - adds r0, r7, r1 - movs r3, 0x16 - ldrsh r1, [r4, r3] - movs r3, 0 - ldrsh r0, [r0, r3] - ldr r3, =gEventObjects - mov r9, r3 - mov r12, r2 - cmp r1, r0 - beq _081D44C6 - b _081D45D0 -_081D44C6: - movs r3, 0 - adds r0, r7, r6 - movs r6, 0x14 - ldrsh r1, [r4, r6] - movs r4, 0 - ldrsh r2, [r0, r4] - cmp r1, r2 - bge _081D44F0 - movs r6, 0x10 - ldrsh r0, [r5, r6] - cmp r0, r2 - bgt _081D44FA - b _081D45D0 - .pool -_081D44F0: - movs r1, 0x10 - ldrsh r0, [r5, r1] - cmp r0, r2 - blt _081D44FA - movs r3, 0x1 -_081D44FA: - cmp r3, 0 - bne _081D45D0 - ldr r0, =gUnknown_030012FA - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r0, 0 - ble _081D4540 - movs r3, 0x12 - ldrsh r2, [r5, r3] - adds r2, 0x1 - mov r4, r12 - ldrb r1, [r4, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - add r0, r9 - movs r6, 0x16 - ldrsh r0, [r0, r6] - cmp r2, r0 - bne _081D4576 - movs r1, 0x10 - ldrsh r0, [r5, r1] - ldrh r1, [r5, 0x12] - adds r1, 0x1 - lsls r1, 16 - asrs r1, 16 - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - beq _081D4576 -_081D4538: - movs r0, 0x1 - b _081D4816 - .pool -_081D4540: - cmp r0, 0 - bge _081D4576 - movs r3, 0x12 - ldrsh r2, [r5, r3] - subs r2, 0x1 - mov r4, r12 - ldrb r1, [r4, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - add r0, r9 - movs r6, 0x16 - ldrsh r0, [r0, r6] - cmp r2, r0 - bne _081D4576 - movs r1, 0x10 - ldrsh r0, [r5, r1] - ldrh r1, [r5, 0x12] - subs r1, 0x1 - lsls r1, 16 - asrs r1, 16 - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - beq _081D4576 - b _081D447C -_081D4576: - ldr r0, =gPlayerAvatar - ldrb r1, [r0, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - add r0, r10 - movs r2, 0x12 - ldrsh r1, [r5, r2] - movs r3, 0x16 - ldrsh r0, [r0, r3] - cmp r1, r0 - bne _081D45D0 - ldr r0, =gUnknown_030012F8 - movs r4, 0 - ldrsh r0, [r0, r4] - cmp r0, 0 - ble _081D45B8 - ldrh r0, [r5, 0x10] - subs r0, 0x1 - lsls r0, 16 - asrs r0, 16 - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - beq _081D45D0 -_081D45AA: - movs r0, 0x3 - b _081D4816 - .pool -_081D45B8: - ldrh r0, [r5, 0x10] - adds r0, 0x1 - lsls r0, 16 - asrs r0, 16 - movs r2, 0x12 - ldrsh r1, [r5, r2] - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - beq _081D45D0 - b _081D4408 -_081D45D0: - mov r0, r8 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - cmp r0, 0x3 - bhi _081D45E0 - b _081D4368 -_081D45E0: - adds r0, r5, 0 - movs r1, 0 - bl sub_81D4C14 - lsls r0, 24 - cmp r0, 0 - beq _081D461C - adds r0, r5, 0 - movs r1, 0x1 - bl sub_81D4C58 - lsls r0, 24 - cmp r0, 0 - beq _081D4604 - movs r0, 0x2 - bl sub_81D4D24 - b _081D4812 -_081D4604: - adds r0, r5, 0 - movs r1, 0x1 - bl sub_81D4CE0 - lsls r0, 24 - cmp r0, 0 - bne _081D4614 - b _081D447C -_081D4614: - movs r0, 0x2 - bl sub_81D4D24 - b _081D4812 -_081D461C: - adds r0, r5, 0 - movs r1, 0 - bl sub_81D4C9C - lsls r0, 24 - cmp r0, 0 - beq _081D4658 - adds r0, r5, 0 - movs r1, 0x1 - bl sub_81D4C58 - lsls r0, 24 - cmp r0, 0 - beq _081D4640 - movs r0, 0x2 - bl sub_81D4D24 - b _081D4812 -_081D4640: - adds r0, r5, 0 - movs r1, 0x1 - bl sub_81D4CE0 - lsls r0, 24 - cmp r0, 0 - bne _081D4650 - b _081D4538 -_081D4650: - movs r0, 0x2 - bl sub_81D4D24 - b _081D4812 -_081D4658: - adds r0, r5, 0 - movs r1, 0 - bl sub_81D4C58 - lsls r0, 24 - cmp r0, 0 - beq _081D4694 - adds r0, r5, 0 - movs r1, 0x1 - bl sub_81D4C14 - lsls r0, 24 - cmp r0, 0 - beq _081D467C - movs r0, 0x2 - bl sub_81D4D24 - b _081D4812 -_081D467C: - adds r0, r5, 0 - movs r1, 0x1 - bl sub_81D4C9C - lsls r0, 24 - cmp r0, 0 - bne _081D468C - b _081D4408 -_081D468C: - movs r0, 0x2 - bl sub_81D4D24 - b _081D4812 -_081D4694: - adds r0, r5, 0 - movs r1, 0 - bl sub_81D4CE0 - lsls r0, 24 - cmp r0, 0 - beq _081D46D0 - adds r0, r5, 0 - movs r1, 0x1 - bl sub_81D4C14 - lsls r0, 24 - cmp r0, 0 - beq _081D46B8 - movs r0, 0x2 - bl sub_81D4D24 - b _081D4812 -_081D46B8: - adds r0, r5, 0 - movs r1, 0x1 - bl sub_81D4C9C - lsls r0, 24 - cmp r0, 0 - bne _081D46C8 - b _081D45AA -_081D46C8: - movs r0, 0x2 - bl sub_81D4D24 - b _081D4812 -_081D46D0: - ldr r0, =gUnknown_030012FA - movs r3, 0 - ldrsh r0, [r0, r3] - cmp r0, 0 - bne _081D476E - ldr r2, =gEventObjects - ldr r0, =gPlayerAvatar - ldrb r1, [r0, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - movs r4, 0x12 - ldrsh r1, [r0, r4] - ldrh r2, [r5, 0x12] - movs r6, 0x12 - ldrsh r0, [r5, r6] - cmp r1, r0 - ble _081D470C - movs r1, 0x10 - ldrsh r0, [r5, r1] - subs r1, r2, 0x1 - lsls r1, 16 - asrs r1, 16 - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - beq _081D470C - b _081D447C -_081D470C: - ldr r2, =gEventObjects - ldr r0, =gPlayerAvatar - ldrb r1, [r0, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - movs r2, 0x12 - ldrsh r1, [r0, r2] - ldrh r2, [r5, 0x12] - movs r3, 0x12 - ldrsh r0, [r5, r3] - cmp r1, r0 - bge _081D473E - movs r4, 0x10 - ldrsh r0, [r5, r4] - adds r1, r2, 0x1 - lsls r1, 16 - asrs r1, 16 - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - beq _081D473E - b _081D4538 -_081D473E: - movs r6, 0x10 - ldrsh r0, [r5, r6] - ldrh r1, [r5, 0x12] - subs r1, 0x1 - lsls r1, 16 - asrs r1, 16 - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - beq _081D4756 - b _081D447C -_081D4756: - movs r1, 0x10 - ldrsh r0, [r5, r1] - ldrh r1, [r5, 0x12] - adds r1, 0x1 - lsls r1, 16 - asrs r1, 16 - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - beq _081D476E - b _081D4538 -_081D476E: - ldr r0, =gUnknown_030012F8 - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r0, 0 - bne _081D480C - ldr r2, =gEventObjects - ldr r0, =gPlayerAvatar - ldrb r1, [r0, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - movs r3, 0x10 - ldrsh r1, [r0, r3] - ldrh r2, [r5, 0x10] - movs r4, 0x10 - ldrsh r0, [r5, r4] - cmp r1, r0 - ble _081D47AA - subs r0, r2, 0x1 - lsls r0, 16 - asrs r0, 16 - movs r6, 0x12 - ldrsh r1, [r5, r6] - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - beq _081D47AA - b _081D45AA -_081D47AA: - ldr r2, =gEventObjects - ldr r0, =gPlayerAvatar - ldrb r1, [r0, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - movs r2, 0x10 - ldrsh r1, [r0, r2] - ldrh r2, [r5, 0x10] - movs r3, 0x10 - ldrsh r0, [r5, r3] - cmp r1, r0 - bge _081D47DC - adds r0, r2, 0x1 - lsls r0, 16 - asrs r0, 16 - movs r4, 0x12 - ldrsh r1, [r5, r4] - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - beq _081D47DC - b _081D4408 -_081D47DC: - ldrh r0, [r5, 0x10] - adds r0, 0x1 - lsls r0, 16 - asrs r0, 16 - movs r6, 0x12 - ldrsh r1, [r5, r6] - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - beq _081D47F4 - b _081D4408 -_081D47F4: - ldrh r0, [r5, 0x10] - subs r0, 0x1 - lsls r0, 16 - asrs r0, 16 - movs r2, 0x12 - ldrsh r1, [r5, r2] - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - beq _081D480C - b _081D45AA -_081D480C: - movs r0, 0 - bl sub_81D4890 -_081D4812: - lsls r0, 24 - lsrs r0, 24 -_081D4816: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D427C - - thumb_func_start sub_81D4834 -sub_81D4834: @ 81D4834 - push {r4,lr} - lsls r0, 16 - lsls r1, 16 - lsrs r4, r1, 16 - ldr r3, =gEventObjects - ldr r1, =gPlayerAvatar - ldrb r2, [r1, 0x5] - lsls r1, r2, 3 - adds r1, r2 - lsls r1, 2 - adds r2, r1, r3 - movs r3, 0x10 - ldrsh r1, [r2, r3] - lsrs r3, r0, 16 - asrs r0, 16 - cmp r1, r0 - bne _081D4870 - movs r0, 0x12 - ldrsh r1, [r2, r0] - lsls r0, r4, 16 - asrs r0, 16 - cmp r1, r0 - bne _081D4870 - movs r0, 0 - b _081D4888 - .pool -_081D4870: - lsls r0, r3, 16 - asrs r0, 16 - lsls r1, r4, 16 - asrs r1, 16 - bl MapGridGetMetatileBehaviorAt - lsls r0, 24 - lsrs r0, 24 - bl MetatileBehavior_IsPokeGrass - lsls r0, 24 - lsrs r0, 24 -_081D4888: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81D4834 - - thumb_func_start sub_81D4890 -sub_81D4890: @ 81D4890 - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - movs r5, 0 - bl sub_81D4258 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 3 - adds r1, r0 - lsls r1, 2 - ldr r0, =gEventObjects - adds r4, r1, r0 - movs r1, 0 - ldr r3, =gUnknown_030012FC - movs r2, 0 -_081D48B0: - adds r0, r1, r3 - strb r2, [r0] - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x3 - bls _081D48B0 - movs r1, 0x10 - ldrsh r0, [r4, r1] - ldrh r1, [r4, 0x12] - subs r1, 0x1 - lsls r1, 16 - asrs r1, 16 - bl sub_81D4834 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _081D48E8 - cmp r6, 0x2 - beq _081D48E8 - ldr r0, =gUnknown_030012FC - adds r0, r5, r0 - movs r1, 0x2 - strb r1, [r0] - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 -_081D48E8: - ldrh r0, [r4, 0x10] - adds r0, 0x1 - lsls r0, 16 - asrs r0, 16 - movs r2, 0x12 - ldrsh r1, [r4, r2] - bl sub_81D4834 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _081D4912 - cmp r6, 0x4 - beq _081D4912 - ldr r0, =gUnknown_030012FC - adds r0, r5, r0 - movs r1, 0x4 - strb r1, [r0] - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 -_081D4912: - movs r1, 0x10 - ldrsh r0, [r4, r1] - ldrh r1, [r4, 0x12] - adds r1, 0x1 - lsls r1, 16 - asrs r1, 16 - bl sub_81D4834 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x1 - bne _081D493A - cmp r6, 0x1 - beq _081D493A - ldr r0, =gUnknown_030012FC - adds r0, r5, r0 - strb r1, [r0] - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 -_081D493A: - ldrh r0, [r4, 0x10] - subs r0, 0x1 - lsls r0, 16 - asrs r0, 16 - movs r2, 0x12 - ldrsh r1, [r4, r2] - bl sub_81D4834 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _081D4964 - cmp r6, 0x3 - beq _081D4964 - ldr r0, =gUnknown_030012FC - adds r0, r5, r0 - movs r1, 0x3 - strb r1, [r0] - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 -_081D4964: - cmp r5, 0x1 - bhi _081D4974 - ldr r0, =gUnknown_030012FC - b _081D4988 - .pool -_081D4974: - ldr r4, =gUnknown_030012FC - ldr r0, =0x0000403a - bl VarGet - lsls r0, 16 - lsrs r0, 16 - adds r1, r5, 0 - bl __modsi3 - adds r0, r4 -_081D4988: - ldrb r0, [r0] - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D4890 - - thumb_func_start sub_81D4998 -sub_81D4998: @ 81D4998 - push {r4,lr} - ldr r4, =0x0000403a - adds r0, r4, 0 - bl VarGet - lsls r0, 16 - lsrs r2, r0, 16 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrh r1, [r0, 0x4] - ldr r0, =0x0000391a - cmp r1, r0 - bne _081D49E0 - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - ldr r0, =0x0000270e - cmp r2, r0 - bls _081D49D8 - adds r0, r4, 0 - movs r1, 0 - bl VarSet - b _081D49E0 - .pool -_081D49D8: - adds r0, r4, 0 - adds r1, r2, 0 - bl VarSet -_081D49E0: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81D4998 - - thumb_func_start EventObjectIsFarawayIslandMew -@ bool8 EventObjectIsFarawayIslandMew(struct npc_state *eventObject) -EventObjectIsFarawayIslandMew: @ 81D49E8 - push {lr} - adds r2, r0, 0 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrh r1, [r0, 0x4] - ldr r0, =0x0000391a - cmp r1, r0 - bne _081D4A0C - ldrb r0, [r2, 0x5] - cmp r0, 0xE5 - bne _081D4A0C - movs r0, 0x1 - b _081D4A0E - .pool -_081D4A0C: - movs r0, 0 -_081D4A0E: - pop {r1} - bx r1 - thumb_func_end EventObjectIsFarawayIslandMew - - thumb_func_start IsMewPlayingHideAndSeek -IsMewPlayingHideAndSeek: @ 81D4A14 - push {lr} - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrh r1, [r0, 0x4] - ldr r0, =0x0000391a - cmp r1, r0 - bne _081D4A50 - movs r0, 0xE5 - lsls r0, 1 - bl FlagGet - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _081D4A50 - ldr r0, =0x000002ce - bl FlagGet - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _081D4A50 - movs r0, 0x1 - b _081D4A52 - .pool -_081D4A50: - movs r0, 0 -_081D4A52: - pop {r1} - bx r1 - thumb_func_end IsMewPlayingHideAndSeek - - thumb_func_start sub_81D4A58 -sub_81D4A58: @ 81D4A58 - push {r4,lr} - ldr r4, =0x0000403a - adds r0, r4, 0 - bl VarGet - lsls r0, 16 - ldr r1, =0xffff0000 - cmp r0, r1 - beq _081D4A88 - adds r0, r4, 0 - bl VarGet - lsls r0, 16 - movs r1, 0xC0 - lsls r1, 10 - ands r1, r0 - cmp r1, 0 - bne _081D4A88 - movs r0, 0x1 - b _081D4A8A - .pool -_081D4A88: - movs r0, 0 -_081D4A8A: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81D4A58 - - thumb_func_start sub_81D4A90 -sub_81D4A90: @ 81D4A90 - push {r4-r6,lr} - sub sp, 0x4 - bl sub_81D4258 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 3 - adds r1, r0 - lsls r1, 2 - ldr r0, =gEventObjects - adds r5, r1, r0 - ldrb r1, [r5, 0x1] - movs r0, 0x21 - negs r0, r0 - ands r0, r1 - strb r0, [r5, 0x1] - ldr r0, =gSpecialVar_0x8004 - ldrh r4, [r0] - cmp r4, 0x1 - bne _081D4AF8 - ldrb r0, [r5, 0x3] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r5, 0x3] - ldr r3, =gSprites - ldrb r1, [r5, 0x4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - adds r0, 0x42 - ldrb r2, [r0] - movs r1, 0x3F - ands r1, r2 - movs r2, 0x80 - orrs r1, r2 - strb r1, [r0] - ldrb r1, [r5, 0x4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - adds r0, 0x43 - strb r4, [r0] - b _081D4BC4 - .pool -_081D4AF8: - ldr r0, =0x0000403a - ldr r1, =0x0000ffff - bl VarSet - ldrb r0, [r5, 0x3] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r5, 0x3] - ldr r6, =gSprites - ldrb r1, [r5, 0x4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - adds r0, 0x42 - ldrb r2, [r0] - movs r1, 0x3F - ands r1, r2 - movs r2, 0x80 - orrs r1, r2 - strb r1, [r0] - ldr r0, =gSpecialVar_Facing - ldrh r0, [r0] - cmp r0, 0x2 - beq _081D4B3A - ldrb r0, [r5, 0x4] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r6 - adds r1, 0x43 - movs r0, 0x1 - strb r0, [r1] -_081D4B3A: - ldr r4, =gFieldEffectObjectPaletteInfo1 - adds r0, r4, 0 - bl LoadSpritePalette - ldrh r0, [r4, 0x4] - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 24 - bl UpdateSpritePaletteWithWeather - ldrh r1, [r5, 0x10] - mov r0, sp - strh r1, [r0] - ldrh r0, [r5, 0x12] - mov r4, sp - adds r4, 0x2 - strh r0, [r4] - mov r0, sp - adds r1, r4, 0 - movs r2, 0x8 - movs r3, 0x8 - bl sub_80930E0 - ldr r0, =gFieldEffectObjectTemplatePointers - ldr r0, [r0, 0x3C] - mov r1, sp - movs r2, 0 - ldrsh r1, [r1, r2] - movs r3, 0 - ldrsh r2, [r4, r3] - ldrb r4, [r5, 0x4] - lsls r3, r4, 4 - adds r3, r4 - lsls r3, 2 - adds r3, r6 - adds r3, 0x43 - ldrb r3, [r3] - subs r3, 0x1 - lsls r3, 24 - lsrs r3, 24 - bl CreateSpriteAtEnd - ldr r1, =gUnknown_0203CF50 - strb r0, [r1] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x40 - beq _081D4BC4 - ldrb r0, [r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r6 - adds r3, r1, 0 - adds r3, 0x3E - ldrb r0, [r3] - movs r2, 0x2 - orrs r0, r2 - strb r0, [r3] - ldrb r2, [r1, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - movs r2, 0x8 - orrs r0, r2 - strb r0, [r1, 0x5] - ldr r0, =SpriteCallbackDummy - str r0, [r1, 0x1C] -_081D4BC4: - add sp, 0x4 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D4A90 - - thumb_func_start sub_81D4BEC -sub_81D4BEC: @ 81D4BEC - push {lr} - ldr r1, =gUnknown_0203CF50 - ldrb r0, [r1] - cmp r0, 0x40 - beq _081D4C06 - adds r1, r0, 0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - bl DestroySprite -_081D4C06: - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D4BEC - - thumb_func_start sub_81D4C14 -sub_81D4C14: @ 81D4C14 - push {r4,lr} - adds r2, r0, 0 - lsls r1, 24 - lsrs r4, r1, 24 - ldr r0, =gUnknown_030012FA - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - ble _081D4C50 - movs r1, 0x10 - ldrsh r0, [r2, r1] - ldrh r1, [r2, 0x12] - subs r1, 0x1 - lsls r1, 16 - asrs r1, 16 - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - beq _081D4C50 - ldr r0, =gUnknown_030012FC - adds r0, r4, r0 - movs r1, 0x2 - strb r1, [r0] - movs r0, 0x1 - b _081D4C52 - .pool -_081D4C50: - movs r0, 0 -_081D4C52: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81D4C14 - - thumb_func_start sub_81D4C58 -sub_81D4C58: @ 81D4C58 - push {r4,lr} - adds r2, r0, 0 - lsls r1, 24 - lsrs r4, r1, 24 - ldr r0, =gUnknown_030012F8 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bge _081D4C94 - ldrh r0, [r2, 0x10] - adds r0, 0x1 - lsls r0, 16 - asrs r0, 16 - movs r3, 0x12 - ldrsh r1, [r2, r3] - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - beq _081D4C94 - ldr r0, =gUnknown_030012FC - adds r0, r4, r0 - movs r1, 0x4 - strb r1, [r0] - movs r0, 0x1 - b _081D4C96 - .pool -_081D4C94: - movs r0, 0 -_081D4C96: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81D4C58 - - thumb_func_start sub_81D4C9C -sub_81D4C9C: @ 81D4C9C - push {r4,lr} - adds r2, r0, 0 - lsls r1, 24 - lsrs r4, r1, 24 - ldr r0, =gUnknown_030012FA - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bge _081D4CD8 - movs r1, 0x10 - ldrsh r0, [r2, r1] - ldrh r1, [r2, 0x12] - adds r1, 0x1 - lsls r1, 16 - asrs r1, 16 - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - beq _081D4CD8 - ldr r0, =gUnknown_030012FC - adds r0, r4, r0 - movs r1, 0x1 - strb r1, [r0] - movs r0, 0x1 - b _081D4CDA - .pool -_081D4CD8: - movs r0, 0 -_081D4CDA: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81D4C9C - - thumb_func_start sub_81D4CE0 -sub_81D4CE0: @ 81D4CE0 - push {r4,lr} - adds r2, r0, 0 - lsls r1, 24 - lsrs r4, r1, 24 - ldr r0, =gUnknown_030012F8 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - ble _081D4D1C - ldrh r0, [r2, 0x10] - subs r0, 0x1 - lsls r0, 16 - asrs r0, 16 - movs r3, 0x12 - ldrsh r1, [r2, r3] - bl sub_81D4834 - lsls r0, 24 - cmp r0, 0 - beq _081D4D1C - ldr r0, =gUnknown_030012FC - adds r0, r4, r0 - movs r1, 0x3 - strb r1, [r0] - movs r0, 0x1 - b _081D4D1E - .pool -_081D4D1C: - movs r0, 0 -_081D4D1E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81D4CE0 - - thumb_func_start sub_81D4D24 -sub_81D4D24: @ 81D4D24 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r5, =gUnknown_030012FC - ldr r0, =0x0000403a - bl VarGet - lsls r0, 16 - lsrs r0, 16 - adds r1, r4, 0 - bl __modsi3 - adds r0, r5 - ldrb r0, [r0] - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D4D24 - - thumb_func_start sub_81D4D50 -sub_81D4D50: @ 81D4D50 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0x4 - adds r5, r0, 0 - adds r6, r1, 0 - mov r8, r2 - mov r1, sp - ldr r4, =0x04000208 - ldrh r0, [r4] - strh r0, [r1] - movs r0, 0 - strh r0, [r4] - ldr r1, =gIntrTable - ldr r0, =sub_81D3FAC - str r0, [r1, 0x4] - ldr r0, =sub_81D3F9C - str r0, [r1, 0x8] - bl sub_81D41A0 - bl sub_81D4238 - ldr r2, =0x04000200 - ldrh r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strh r0, [r2] - mov r0, sp - ldrh r0, [r0] - strh r0, [r4] - movs r0, 0 - strh r0, [r5] - str r6, [r5, 0x4] - mov r0, r8 - str r0, [r5, 0x8] - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D4D50 - - thumb_func_start sub_81D4DB8 -sub_81D4DB8: @ 81D4DB8 - push {r4,lr} - sub sp, 0x4 - mov r1, sp - ldr r4, =0x04000208 - ldrh r0, [r4] - strh r0, [r1] - movs r0, 0 - strh r0, [r4] - bl sub_81D4238 - bl sub_81D41F4 - bl RestoreSerialTimer3IntrHandlers - mov r0, sp - ldrh r0, [r0] - strh r0, [r4] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D4DB8 - - thumb_func_start sub_81D4DE8 -sub_81D4DE8: @ 81D4DE8 - push {r4,r5,lr} - adds r4, r0, 0 - movs r5, 0 - ldr r1, [r4, 0x4] - ldr r2, [r4, 0x8] - movs r0, 0x1 - movs r3, 0 - bl sub_81D3D70 - adds r1, r0, 0 - strh r1, [r4] - movs r0, 0x13 - ands r0, r1 - cmp r0, 0x10 - bne _081D4E08 - movs r5, 0x1 -_081D4E08: - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _081D4E12 - movs r5, 0x2 -_081D4E12: - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _081D4E1C - movs r5, 0x3 -_081D4E1C: - ldr r1, =gShouldAdvanceLinkState - movs r0, 0 - strb r0, [r1] - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81D4DE8 - - thumb_func_start sub_81D4E30 -sub_81D4E30: @ 81D4E30 - push {lr} - ldr r0, =gDecompressionBuffer - movs r2, 0x80 - lsls r2, 6 - movs r1, 0 - bl memset - ldr r1, =gLinkType - ldr r2, =0x00005503 - adds r0, r2, 0 - strh r0, [r1] - bl OpenLink - movs r0, 0x1 - bl SetSuppressLinkErrorMessage - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D4E30 - - thumb_func_start sub_81D4E60 -sub_81D4E60: @ 81D4E60 - push {lr} - sub sp, 0xC - mov r1, sp - ldr r2, =0x04000208 - ldrh r0, [r2] - strh r0, [r1] - movs r0, 0 - strh r0, [r2] - ldr r0, =gLink+0x4 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp, 0x4] - str r1, [sp, 0x8] - mov r0, sp - ldrh r0, [r0] - strh r0, [r2] - add r2, sp, 0x4 - ldrh r1, [r2] - ldr r0, =0x0000b9a0 - cmp r1, r0 - bne _081D4EB8 - ldrh r1, [r2, 0x2] - ldr r0, =0x0000ccd0 - cmp r1, r0 - bne _081D4EB8 - ldrh r1, [r2, 0x4] - ldr r0, =0x0000ffff - cmp r1, r0 - bne _081D4EB8 - ldrh r0, [r2, 0x6] - cmp r0, r1 - bne _081D4EB8 - movs r0, 0x1 - b _081D4EBA - .pool -_081D4EB8: - movs r0, 0 -_081D4EBA: - add sp, 0xC - pop {r1} - bx r1 - thumb_func_end sub_81D4E60 - - thumb_func_start sub_81D4EC0 -sub_81D4EC0: @ 81D4EC0 - push {lr} - bl IsLinkMaster - lsls r0, 24 - cmp r0, 0 - beq _081D4EDC - bl GetLinkPlayerCount_2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - bne _081D4EDC - movs r0, 0x1 - b _081D4EDE -_081D4EDC: - movs r0, 0 -_081D4EDE: - pop {r1} - bx r1 - thumb_func_end sub_81D4EC0 - - thumb_func_start sub_81D4EE4 -sub_81D4EE4: @ 81D4EE4 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldrb r0, [r4] - subs r0, 0x3 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - bhi _081D4F08 - bl HasLinkErrorOccurred - lsls r0, 24 - cmp r0, 0 - beq _081D4F08 - movs r0, 0 - strb r0, [r4] - movs r0, 0x3 - b _081D500E -_081D4F08: - ldrb r0, [r4] - cmp r0, 0x5 - bls _081D4F10 - b _081D500C -_081D4F10: - lsls r0, 2 - ldr r1, =_081D4F20 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_081D4F20: - .4byte _081D4F38 - .4byte _081D4F54 - .4byte _081D4F6C - .4byte _081D4FA0 - .4byte _081D4FEC - .4byte _081D4FF8 -_081D4F38: - bl IsLinkMaster - lsls r0, 24 - cmp r0, 0 - beq _081D4F88 - bl GetLinkPlayerCount_2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bls _081D4F88 - movs r0, 0x1 - strb r0, [r4] - b _081D500C -_081D4F54: - ldrh r0, [r5] - adds r0, 0x1 - strh r0, [r5] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x5 - bls _081D500C - movs r0, 0 - strh r0, [r5] - movs r0, 0x2 - strb r0, [r4] - b _081D500C -_081D4F6C: - bl GetLinkPlayerCount_2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - bne _081D4F88 - movs r0, 0x49 - bl PlaySE - bl CheckShouldAdvanceLinkState - movs r0, 0 - strh r0, [r5] - b _081D4FE6 -_081D4F88: - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _081D500C - movs r0, 0 - strb r0, [r4] - movs r0, 0x1 - b _081D500E - .pool -_081D4FA0: - ldrh r0, [r5] - adds r0, 0x1 - strh r0, [r5] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1E - bls _081D4FB6 - movs r0, 0 - strb r0, [r4] - movs r0, 0x5 - b _081D500E -_081D4FB6: - bl IsLinkConnectionEstablished - lsls r0, 24 - cmp r0, 0 - beq _081D500C - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - beq _081D4FE6 - bl IsLinkPlayerDataExchangeComplete - lsls r0, 24 - cmp r0, 0 - beq _081D4FE0 - movs r0, 0 - strb r0, [r4] - movs r0, 0x2 - b _081D500E - .pool -_081D4FE0: - movs r0, 0x4 - strb r0, [r4] - b _081D500C -_081D4FE6: - movs r0, 0x3 - strb r0, [r4] - b _081D500C -_081D4FEC: - movs r0, 0 - bl sub_800ABF4 - movs r0, 0x5 - strb r0, [r4] - b _081D500C -_081D4FF8: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _081D500C - strb r0, [r4] - movs r0, 0x4 - b _081D500E - .pool -_081D500C: - movs r0, 0 -_081D500E: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81D4EE4 - - thumb_func_start sub_81D5014 -sub_81D5014: @ 81D5014 - push {r4,lr} - ldr r0, =sub_81D5084 - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - ldr r0, =gTasks + 0x8 - adds r4, r0 - movs r0, 0 - strb r0, [r4, 0x8] - strb r0, [r4, 0x9] - strb r0, [r4, 0xA] - strb r0, [r4, 0xB] - strb r0, [r4, 0xC] - strb r0, [r4, 0xD] - movs r1, 0 - strh r0, [r4] - strh r0, [r4, 0x2] - strh r0, [r4, 0x4] - strh r0, [r4, 0x6] - strb r1, [r4, 0xE] - movs r0, 0x40 - bl AllocZeroed - str r0, [r4, 0x10] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D5014 - - thumb_func_start sub_81D505C -sub_81D505C: @ 81D505C - movs r1, 0 - strh r1, [r0] - bx lr - thumb_func_end sub_81D505C - - thumb_func_start sub_81D5064 -sub_81D5064: @ 81D5064 - push {lr} - adds r2, r0, 0 - lsls r1, 16 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - lsls r0, 16 - cmp r0, r1 - bhi _081D507A - movs r0, 0 - b _081D5080 -_081D507A: - movs r0, 0 - strh r0, [r2] - movs r0, 0x1 -_081D5080: - pop {r1} - bx r1 - thumb_func_end sub_81D5064 - - thumb_func_start sub_81D5084 -sub_81D5084: @ 81D5084 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r4, r0, r1 - ldrb r0, [r4, 0x8] - cmp r0, 0x1A - bls _081D509C - b _081D548A -_081D509C: - lsls r0, 2 - ldr r1, =_081D50B0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_081D50B0: - .4byte _081D511C - .4byte _081D5138 - .4byte _081D5148 - .4byte _081D515C - .4byte _081D516C - .4byte _081D5198 - .4byte _081D51D0 - .4byte _081D524C - .4byte _081D5268 - .4byte _081D5290 - .4byte _081D52AC - .4byte _081D52DC - .4byte _081D52F2 - .4byte _081D5308 - .4byte _081D536A - .4byte _081D5390 - .4byte _081D53A8 - .4byte _081D53C6 - .4byte _081D53F2 - .4byte _081D5418 - .4byte _081D5448 - .4byte _081D5454 - .4byte _081D5460 - .4byte _081D5430 - .4byte _081D548A - .4byte _081D548A - .4byte _081D5478 -_081D511C: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, =gUnknown_085EDFD6 - bl mevent_0814257C - cmp r0, 0 - bne _081D512C - b _081D548A -_081D512C: - movs r0, 0x1 - strb r0, [r4, 0x8] - b _081D548A - .pool -_081D5138: - bl sub_81D4E30 - adds r0, r4, 0 - bl sub_81D505C - movs r0, 0x2 - strb r0, [r4, 0x8] - b _081D548A -_081D5148: - adds r0, r4, 0 - movs r1, 0xA - bl sub_81D5064 - cmp r0, 0 - bne _081D5156 - b _081D548A -_081D5156: - movs r0, 0x3 - strb r0, [r4, 0x8] - b _081D548A -_081D515C: - bl sub_81D4EC0 - cmp r0, 0 - beq _081D5166 - b _081D52FC -_081D5166: - bl CloseLink - b _081D525C -_081D516C: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, =gUnknown_085EDFF5 - bl mevent_0814257C - cmp r0, 0 - bne _081D517C - b _081D548A -_081D517C: - ldr r0, =gUnknown_085EE014 - bl sub_8018884 - adds r0, r4, 0 - bl sub_81D505C - movs r0, 0x5 - strb r0, [r4, 0x8] - b _081D548A - .pool -_081D5198: - adds r0, r4, 0 - movs r1, 0x5A - bl sub_81D5064 - cmp r0, 0 - beq _081D51AE - bl sub_81D4E30 - movs r0, 0x6 - strb r0, [r4, 0x8] - b _081D548A -_081D51AE: - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _081D51BC - b _081D548A -_081D51BC: - adds r0, r4, 0 - bl sub_81D505C - movs r0, 0x5 - bl PlaySE - b _081D535A - .pool -_081D51D0: - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _081D51F4 - movs r0, 0x5 - bl PlaySE - bl CloseLink - adds r0, r4, 0 - bl sub_81D505C - b _081D535A - .pool -_081D51F4: - bl GetLinkPlayerCount_2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bls _081D5210 - adds r0, r4, 0 - bl sub_81D505C - bl CloseLink - movs r0, 0x7 - strb r0, [r4, 0x8] - b _081D548A -_081D5210: - bl sub_81D4E60 - cmp r0, 0 - beq _081D522E - movs r0, 0x5 - bl PlaySE - bl CloseLink - adds r0, r4, 0 - bl sub_81D505C - movs r0, 0x8 - strb r0, [r4, 0x8] - b _081D548A -_081D522E: - adds r0, r4, 0 - movs r1, 0xA - bl sub_81D5064 - cmp r0, 0 - bne _081D523C - b _081D548A -_081D523C: - bl CloseLink - bl sub_81D4E30 - adds r0, r4, 0 - bl sub_81D505C - b _081D548A -_081D524C: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, =gUnknown_085EE05C - bl mevent_0814257C - cmp r0, 0 - bne _081D525C - b _081D548A -_081D525C: - movs r0, 0x4 - strb r0, [r4, 0x8] - b _081D548A - .pool -_081D5268: - ldr r0, =gUnknown_085EE097 - bl sub_8018884 - ldr r0, =gUnknown_03006370 - ldr r1, =gMultiBootProgram_BerryGlitchFix_Start - ldr r2, =gUnknown_089A3470 - subs r1, r2 - bl sub_81D4D50 - movs r0, 0x9 - strb r0, [r4, 0x8] - b _081D548A - .pool -_081D5290: - ldr r0, =gUnknown_03006370 - bl sub_81D4DE8 - strb r0, [r4, 0xE] - lsls r0, 24 - cmp r0, 0 - bne _081D52A0 - b _081D548A -_081D52A0: - movs r0, 0xA - strb r0, [r4, 0x8] - b _081D548A - .pool -_081D52AC: - ldr r0, =gUnknown_03006370 - bl sub_81D4DB8 - ldrb r0, [r4, 0xE] - cmp r0, 0x3 - bne _081D52BA - b _081D53C0 -_081D52BA: - cmp r0, 0x1 - beq _081D52C0 - b _081D546E -_081D52C0: - adds r0, r4, 0 - bl sub_81D505C - ldr r0, =gUnknown_085EE120 - bl sub_8018884 - movs r0, 0xB - strb r0, [r4, 0x8] - b _081D548A - .pool -_081D52DC: - movs r1, 0xD2 - lsls r1, 2 - adds r0, r4, 0 - bl sub_81D5064 - cmp r0, 0 - bne _081D52EC - b _081D548A -_081D52EC: - movs r0, 0xC - strb r0, [r4, 0x8] - b _081D548A -_081D52F2: - bl sub_81D4E30 - ldr r0, =gUnknown_085EE0DC - bl sub_8018884 -_081D52FC: - movs r0, 0xD - strb r0, [r4, 0x8] - b _081D548A - .pool -_081D5308: - adds r0, r4, 0 - adds r0, 0x9 - adds r1, r4, 0 - bl sub_81D4EE4 - cmp r0, 0x5 - bls _081D5318 - b _081D548A -_081D5318: - lsls r0, 2 - ldr r1, =_081D5328 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_081D5328: - .4byte _081D548A - .4byte _081D5350 - .4byte _081D5340 - .4byte _081D5374 - .4byte _081D5374 - .4byte _081D5360 -_081D5340: - ldr r0, =gUnknown_085EE097 - bl sub_8018884 - movs r0, 0xE - strb r0, [r4, 0x8] - b _081D548A - .pool -_081D5350: - movs r0, 0x5 - bl PlaySE - bl CloseLink -_081D535A: - movs r0, 0x17 - strb r0, [r4, 0x8] - b _081D548A -_081D5360: - bl CloseLink - movs r0, 0x15 - strb r0, [r4, 0x8] - b _081D548A -_081D536A: - bl HasLinkErrorOccurred - lsls r0, 24 - cmp r0, 0 - beq _081D537A -_081D5374: - bl CloseLink - b _081D53C0 -_081D537A: - bl GetBlockReceivedStatus - lsls r0, 24 - cmp r0, 0 - bne _081D5386 - b _081D548A -_081D5386: - bl ResetBlockReceivedFlags - movs r0, 0xF - strb r0, [r4, 0x8] - b _081D548A -_081D5390: - ldr r0, =gDecompressionBuffer - bl sub_81D3920 - strb r0, [r4, 0xE] - ldrb r0, [r4, 0xE] - bl sub_800ABF4 - movs r0, 0x10 - strb r0, [r4, 0x8] - b _081D548A - .pool -_081D53A8: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _081D548A - ldrb r0, [r4, 0xE] - cmp r0, 0x1 - bne _081D53C0 - movs r0, 0x11 - strb r0, [r4, 0x8] - b _081D548A - .pool -_081D53C0: - movs r0, 0x14 - strb r0, [r4, 0x8] - b _081D548A -_081D53C6: - ldr r0, =gDecompressionBuffer - bl sub_81D3AB0 - cmp r0, 0 - beq _081D53EC - ldr r0, =gUnknown_085EE0FA - bl sub_8018884 - adds r0, r4, 0 - bl sub_81D505C - movs r0, 0x12 - strb r0, [r4, 0x8] - b _081D548A - .pool -_081D53EC: - movs r0, 0x16 - strb r0, [r4, 0x8] - b _081D548A -_081D53F2: - adds r0, r4, 0 - movs r1, 0x78 - bl sub_81D5064 - cmp r0, 0 - beq _081D548A - ldr r0, =gUnknown_085EE107 - bl sub_8018884 - movs r0, 0xB9 - lsls r0, 1 - bl PlayFanfare - movs r0, 0x13 - strb r0, [r4, 0x8] - b _081D548A - .pool -_081D5418: - bl IsFanfareTaskInactive - lsls r0, 24 - cmp r0, 0 - beq _081D548A - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - b _081D543A - .pool -_081D5430: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, =gUnknown_085EE06B - bl mevent_0814257C -_081D543A: - cmp r0, 0 - beq _081D548A - movs r0, 0x1A - strb r0, [r4, 0x8] - b _081D548A - .pool -_081D5448: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, =gUnknown_085EE0A3 - b _081D5466 - .pool -_081D5454: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, =gUnknown_085EE0BF - b _081D5466 - .pool -_081D5460: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, =gUnknown_085EE12D -_081D5466: - bl mevent_0814257C - cmp r0, 0 - beq _081D548A -_081D546E: - movs r0, 0 - strb r0, [r4, 0x8] - b _081D548A - .pool -_081D5478: - ldr r0, [r4, 0x10] - bl Free - adds r0, r5, 0 - bl DestroyTask - ldr r0, =sub_80186A4 - bl SetMainCallback2 -_081D548A: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81D5084 - - .align 2, 0 @ Don't pad with nop. diff --git a/data/ereader.s b/data/ereader.s index 5fbab5c3a4..7ef4c851eb 100644 --- a/data/ereader.s +++ b/data/ereader.s @@ -47,7 +47,7 @@ gUnknown_08625B6C:: @ 8625B6C .byte 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x5b, 0x72, 0x6a, 0x91, 0xae, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7a, 0x01, 0x8d, 0x00, 0x5e, 0x00, 0xf7, 0x00, 0x55, 0x00, 0x05, 0x01 .byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x8d, 0x85, 0x9e, 0xa0, 0x60, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff -gUnknown_0862608C:: @ 862608C +gFarawayIslandRockCoords:: @ 862608C .2byte 21, 16 .2byte 25, 16 .2byte 16, 17 diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index bee33ae079..fe180184b4 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -38,7 +38,7 @@ FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E return FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 - setvar VAR_NEVER_READ_0x403A, 0 + setvar VAR_FARAWAY_ISLAND_STEP_COUNTER, 0 setvar VAR_TEMP_1, 1 call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_267D86 end diff --git a/include/constants/vars.h b/include/constants/vars.h index c025d62fc5..67a9e6cbdb 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -74,7 +74,7 @@ #define VAR_UNUSUAL_WEATHER_LOCATION 0x4037 #define VAR_UNUSUAL_WEATHER_STEP_COUNTER 0x4038 #define VAR_SHOULD_END_UNUSUAL_WEATHER 0x4039 -#define VAR_NEVER_READ_0x403A 0x403A // Var is written to, but never checked +#define VAR_FARAWAY_ISLAND_STEP_COUNTER 0x403A #define VAR_REGICE_STEPS_1 0x403B #define VAR_REGICE_STEPS_2 0x403C #define VAR_REGICE_STEPS_3 0x403D diff --git a/include/ereader.h b/include/ereader.h index da31c82127..348affe818 100755 --- a/include/ereader.h +++ b/include/ereader.h @@ -4,6 +4,8 @@ bool32 sub_81D3B34(void); u32 sub_81D427C(void); bool8 sub_81D4A58(struct EventObject*); +void UpdateFarawayIslandStepCounter(void); bool8 EventObjectIsFarawayIslandMew(struct EventObject *); +bool8 IsMewPlayingHideAndSeek(void); #endif // GUARD_EREADER_H diff --git a/include/link.h b/include/link.h index 24a834c686..1e865e72bd 100644 --- a/include/link.h +++ b/include/link.h @@ -230,7 +230,6 @@ bool8 IsLinkMaster(void); void CB2_LinkError(void); u8 GetSioMultiSI(void); bool8 IsLinkConnectionEstablished(void); -void SetSuppressLinkErrorMessage(bool8); bool8 HasLinkErrorOccurred(void); void ResetSerial(void); u32 LinkMain1(u8 *shouldAdvanceLinkState, u16 *sendCmd, u16 (*recvCmds)[CMD_LENGTH]); diff --git a/include/pokenav.h b/include/pokenav.h index 4e02461fe9..13cb0babfc 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -3,7 +3,6 @@ #include "list_menu.h" bool8 sub_81D312C(void *arg0); -void sub_81D4998(void); void CB2_InitPokeNav(void); #endif //GUARD_POKENAV_H diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h index ac9bbb5c30..0f13718e5e 100644 --- a/include/rom_8011DC0.h +++ b/include/rom_8011DC0.h @@ -20,4 +20,8 @@ bool32 sub_802C908(u16); void nullsub_89(u8 taskId); void var_800D_set_xB(void); +bool32 mevent_0814257C(u8 *textState, const u8 *str); +void sub_8018884(const u8 *src); +void sub_80186A4(void); + #endif //GUARD_rom_8011DC0_H diff --git a/include/strings.h b/include/strings.h index 9e464562d2..1e4c789dfb 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2563,4 +2563,24 @@ extern const u8 gUnknown_0862BAC4[]; extern const u8 gUnknown_0862BACF[]; extern const u8 gUnknown_0862BADA[]; +// E-Reader +extern const u8 gUnknown_085EDFD6[]; +extern const u8 gUnknown_085EDFF5[]; +extern const u8 gUnknown_085EE014[]; +extern const u8 gUnknown_085EE035[]; +extern const u8 gUnknown_085EE05C[]; +extern const u8 gUnknown_085EE06B[]; +extern const u8 gUnknown_085EE080[]; +extern const u8 gUnknown_085EE097[]; +extern const u8 gUnknown_085EE0A3[]; +extern const u8 gUnknown_085EE0BF[]; +extern const u8 gUnknown_085EE0DC[]; +extern const u8 gUnknown_085EE0FA[]; +extern const u8 gUnknown_085EE107[]; +extern const u8 gUnknown_085EE120[]; +extern const u8 gUnknown_085EE12D[]; +extern const u8 gUnknown_085EE14B[]; +extern const u8 gUnknown_085EE14F[]; +extern const u8 gUnknown_085EE154[]; + #endif // GUARD_STRINGS_H diff --git a/ld_script.txt b/ld_script.txt index 5a1442fa85..4f13b8225c 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -292,7 +292,6 @@ SECTIONS { src/menu_specialized.o(.text); asm/menu_specialized.o(.text); src/ereader.o(.text); - asm/ereader.o(.text); src/trainer_hill.o(.text); src/rayquaza_scene.o(.text); src/walda_phrase.o(.text); diff --git a/porymap.project.cfg b/porymap.project.cfg new file mode 100755 index 0000000000..c6ba8781eb --- /dev/null +++ b/porymap.project.cfg @@ -0,0 +1 @@ +base_game_version=pokeemerald diff --git a/src/ereader.c b/src/ereader.c index 053f82381b..9941994ed7 100755 --- a/src/ereader.c +++ b/src/ereader.c @@ -1,9 +1,26 @@ #include "global.h" #include "alloc.h" +#include "decompress.h" +#include "event_data.h" #include "event_object_movement.h" +#include "field_weather.h" +#include "fieldmap.h" #include "link.h" +#include "main.h" +#include "metatile_behavior.h" +#include "rom_8011DC0.h" #include "save.h" +#include "sound.h" +#include "sprite.h" +#include "task.h" +#include "strings.h" #include "util.h" +#include "constants/event_objects.h" +#include "constants/flags.h" +#include "constants/maps.h" +#include "constants/metatile_behaviors.h" +#include "constants/songs.h" +#include "constants/vars.h" struct Unk81D38FC { @@ -20,6 +37,29 @@ struct Unknown030012C8 int unk14; }; +struct Unk03006370 +{ + u16 unk0; + u32 unk4; + u32 *unk8; +}; + +struct Unk81D5014 +{ + u16 unk0; + u16 unk2; + u16 unk4; + u16 unk6; + u8 unk8; + u8 unk9; + u8 unkA; + u8 unkB; + u8 unkC; + u8 unkD; + u8 unkE; + u8 *unk10; +}; + void sub_81D41A0(void); static void sub_81D4170(void); int sub_81D3D70(u8, u32, u32*, u32*); @@ -29,6 +69,14 @@ static void sub_81D413C(void); static void sub_81D414C(void); static void sub_81D3F1C(u32, u32*, u32*); static void sub_81D3F68(void); +bool8 sub_81D4834(s16, s16); +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 u8 sub_81D4D24(u8); +static u8 sub_81D4890(u8); +void sub_81D5084(u8); extern struct Unknown030012C8 gUnknown_030012C8; extern u16 gUnknown_030012E0; @@ -41,8 +89,19 @@ extern u16 gUnknown_030012EE; extern u16 gUnknown_030012F0; extern u16 gUnknown_030012F2; extern u16 gUnknown_030012F4; +extern s16 gUnknown_030012F8; +extern s16 gUnknown_030012FA; +extern u8 gUnknown_030012FC[4]; +extern u8 gUnknown_0203CF50; +extern struct Unk03006370 gUnknown_03006370; extern const u8 gUnknown_08625B6C[]; +extern const u8 gUnknown_089A3470[]; +extern const u8 gMultiBootProgram_BerryGlitchFix_Start[]; +extern const s16 gFarawayIslandRockCoords[4][2]; + +extern const struct SpritePalette gFieldEffectObjectPaletteInfo1; +extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; static u8 sub_81D38D4(void) { @@ -562,3 +621,825 @@ u8 sub_81D4258(void) TryGetEventObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId); return eventObjectId; } + +u32 sub_81D427C(void) +{ + u8 i; + int skip; + struct EventObject *mew = &gEventObjects[sub_81D4258()]; + + gUnknown_030012F8 = gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x - mew->currentCoords.x; + gUnknown_030012FA = gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y - mew->currentCoords.y; + for (i = 0; i < ARRAY_COUNT(gUnknown_030012FC); i++) + gUnknown_030012FC[i] = DIR_NONE; + + if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x == gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x + && gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y == gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y) + { + return DIR_NONE; + } + + if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 8 == 0) + mew->invisible = 0; + else + mew->invisible = 1; + + if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 9 == 0) + return DIR_NONE; + + for (i = 0; i < ARRAY_COUNT(gFarawayIslandRockCoords); i++) + { + if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x == gFarawayIslandRockCoords[i][0]) + { + skip = 0; + if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y < gFarawayIslandRockCoords[i][1]) + { + if (mew->currentCoords.y <= gFarawayIslandRockCoords[i][1]) + skip = 1; + } + else + { + if (mew->currentCoords.y >= gFarawayIslandRockCoords[i][1]) + skip = 1; + } + + if (!skip) + { + if (gUnknown_030012F8 > 0) + { + if (mew->currentCoords.x + 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) + { + if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y)) + return DIR_EAST; + } + } + else if (gUnknown_030012F8 < 0) + { + if (mew->currentCoords.x - 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) + { + if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y)) + return DIR_WEST; + } + } + + if (mew->currentCoords.x == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) + { + if (gUnknown_030012FA > 0) + { + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1)) + return DIR_NORTH; + } + else + { + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1)) + return DIR_SOUTH; + } + } + } + } + + if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y == gFarawayIslandRockCoords[i][1]) + { + skip = 0; + if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x < gFarawayIslandRockCoords[i][0]) + { + if (mew->currentCoords.x <= gFarawayIslandRockCoords[i][0]) + skip = 1; + } + else + { + if (mew->currentCoords.x >= gFarawayIslandRockCoords[i][0]) + skip = 1; + } + + if (!skip) + { + if (gUnknown_030012FA > 0) + { + if (mew->currentCoords.y + 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) + { + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1)) + return DIR_SOUTH; + } + } + else if (gUnknown_030012FA < 0) + { + if (mew->currentCoords.y - 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) + { + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1)) + return DIR_NORTH; + } + } + + if (mew->currentCoords.y == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) + { + if (gUnknown_030012F8 > 0) + { + if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y)) + return DIR_WEST; + } + else + { + if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y)) + return DIR_EAST; + } + } + } + } + } + + if (sub_81D4C14(mew, 0)) + { + if (sub_81D4C58(mew, 1)) + return sub_81D4D24(2); + else if (sub_81D4CE0(mew, 1)) + return sub_81D4D24(2); + else + return DIR_NORTH; + } + + if (sub_81D4C9C(mew, 0)) + { + if (sub_81D4C58(mew, 1)) + return sub_81D4D24(2); + else if (sub_81D4CE0(mew, 1)) + return sub_81D4D24(2); + else + return DIR_SOUTH; + } + + if (sub_81D4C58(mew, 0)) + { + if (sub_81D4C14(mew, 1)) + return sub_81D4D24(2); + else if (sub_81D4C9C(mew, 1)) + return sub_81D4D24(2); + else + return DIR_EAST; + } + + if (sub_81D4CE0(mew, 0)) + { + if (sub_81D4C14(mew, 1)) + return sub_81D4D24(2); + else if (sub_81D4C9C(mew, 1)) + return sub_81D4D24(2); + else + return DIR_WEST; + } + + if (gUnknown_030012FA == 0) + { + if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y > mew->currentCoords.y) + { + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1)) + return DIR_NORTH; + } + + if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y < mew->currentCoords.y) + { + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1)) + return DIR_SOUTH; + } + + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1)) + return DIR_NORTH; + + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1)) + return DIR_SOUTH; + } + + if (gUnknown_030012F8 == 0) + { + if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x > mew->currentCoords.x) + { + if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y)) + return DIR_WEST; + } + + if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x < mew->currentCoords.x) + { + if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y)) + return DIR_EAST; + } + + if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y)) + return DIR_EAST; + + if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y)) + return DIR_WEST; + } + + return sub_81D4890(DIR_NONE); +} + +bool8 sub_81D4834(s16 x, s16 y) +{ + if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x == x + && gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y == y) + { + return FALSE; + } + + return MetatileBehavior_IsPokeGrass(MapGridGetMetatileBehaviorAt(x, y)); +} + +static u8 sub_81D4890(u8 ignoredDir) +{ + u8 i; + u8 count = 0; + struct EventObject *mew = &gEventObjects[sub_81D4258()]; + + for (i = 0; i < ARRAY_COUNT(gUnknown_030012FC); i++) + gUnknown_030012FC[i] = DIR_NONE; + + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1) == TRUE && ignoredDir != DIR_NORTH) + { + gUnknown_030012FC[count] = DIR_NORTH; + count++; + } + + if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y) == TRUE && ignoredDir != DIR_EAST) + { + gUnknown_030012FC[count] = DIR_EAST; + count++; + } + + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1) == TRUE && ignoredDir != DIR_SOUTH) + { + gUnknown_030012FC[count] = DIR_SOUTH; + count++; + } + + if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y) == TRUE && ignoredDir != DIR_WEST) + { + gUnknown_030012FC[count] = DIR_WEST; + count++; + } + + if (count > 1) + return gUnknown_030012FC[VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % count]; + else + return gUnknown_030012FC[0]; +} + +void UpdateFarawayIslandStepCounter(void) +{ + u16 steps = VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER); + if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(FARAWAY_ISLAND_INTERIOR) + && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(FARAWAY_ISLAND_INTERIOR)) + { + steps++; + if (steps >= 9999) + VarSet(VAR_FARAWAY_ISLAND_STEP_COUNTER, 0); + else + VarSet(VAR_FARAWAY_ISLAND_STEP_COUNTER, steps); + } +} + +bool8 EventObjectIsFarawayIslandMew(struct EventObject *eventObject) +{ + if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(FARAWAY_ISLAND_INTERIOR) + && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(FARAWAY_ISLAND_INTERIOR)) + { + if (eventObject->graphicsId == EVENT_OBJ_GFX_MEW) + return TRUE; + } + + return FALSE; +} + +bool8 IsMewPlayingHideAndSeek(void) +{ + if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(FARAWAY_ISLAND_INTERIOR) + && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(FARAWAY_ISLAND_INTERIOR)) + { + if (FlagGet(FLAG_CAUGHT_MEW) != TRUE && FlagGet(FLAG_HIDE_MEW) != TRUE) + return TRUE; + } + + return FALSE; +} + +bool8 sub_81D4A58(struct EventObject *eventObject) +{ + if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) != 0xFFFF + && VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 4 == 0) + return TRUE; + + return FALSE; +} + +void sub_81D4A90(void) +{ + s16 x; + s16 y; + u8 spriteId; + struct EventObject *mew = &gEventObjects[sub_81D4258()]; + + mew->invisible = 0; + if (gSpecialVar_0x8004 == 1) + { + mew->fixedPriority = 1; + gSprites[mew->spriteId].subspriteMode = SUBSPRITES_IGNORE_PRIORITY; + gSprites[mew->spriteId].subpriority = 1; + } + else + { + VarSet(VAR_FARAWAY_ISLAND_STEP_COUNTER, 0xFFFF); + mew->fixedPriority = 1; + gSprites[mew->spriteId].subspriteMode = SUBSPRITES_IGNORE_PRIORITY; + if (gSpecialVar_Facing != DIR_NORTH) + gSprites[mew->spriteId].subpriority = 1; + + LoadSpritePalette(&gFieldEffectObjectPaletteInfo1); + UpdateSpritePaletteWithWeather(IndexOfSpritePaletteTag(gFieldEffectObjectPaletteInfo1.tag)); + + x = mew->currentCoords.x; + y = mew->currentCoords.y; + sub_80930E0(&x, &y, 8, 8); + gUnknown_0203CF50 = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[15], x, y, gSprites[mew->spriteId].subpriority - 1); + if (gUnknown_0203CF50 != MAX_SPRITES) + { + struct Sprite *sprite = &gSprites[gUnknown_0203CF50]; + sprite->coordOffsetEnabled = 1; + sprite->oam.priority = 2; + sprite->callback = SpriteCallbackDummy; + } + } +} + +void sub_81D4BEC(void) +{ + if (gUnknown_0203CF50 != MAX_SPRITES) + DestroySprite(&gSprites[gUnknown_0203CF50]); +} + +static bool8 sub_81D4C14(struct EventObject *mew, u8 index) +{ + if (gUnknown_030012FA > 0 && sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1)) + { + gUnknown_030012FC[index] = DIR_NORTH; + return TRUE; + } + + return FALSE; +} + +static u8 sub_81D4C58(struct EventObject *mew, u8 index) +{ + if (gUnknown_030012F8 < 0 && sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y)) + { + gUnknown_030012FC[index] = DIR_EAST; + return TRUE; + } + + return FALSE; +} + +static u8 sub_81D4C9C(struct EventObject *mew, u8 index) +{ + if (gUnknown_030012FA < 0 && sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1)) + { + gUnknown_030012FC[index] = DIR_SOUTH; + return TRUE; + } + + return FALSE; +} + +static u8 sub_81D4CE0(struct EventObject *mew, u8 index) +{ + if (gUnknown_030012F8 > 0 && sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y)) + { + gUnknown_030012FC[index] = DIR_WEST; + return TRUE; + } + + return FALSE; +} + +static u8 sub_81D4D24(u8 mod) +{ + return gUnknown_030012FC[VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % mod]; +} + +void sub_81D4D50(struct Unk03006370 *arg0, int arg1, u32 *arg2) +{ + volatile u16 backupIME = REG_IME; + REG_IME = 0; + gIntrTable[1] = sub_81D3FAC; + gIntrTable[2] = sub_81D3F9C; + sub_81D41A0(); + sub_81D4238(); + REG_IE |= INTR_FLAG_VCOUNT; + REG_IME = backupIME; + arg0->unk0 = 0; + arg0->unk4 = arg1; + arg0->unk8 = arg2; +} + +void sub_81D4DB8(struct Unk03006370 *arg0) +{ + volatile u16 backupIME = REG_IME; + REG_IME = 0; + sub_81D4238(); + sub_81D41F4(); + RestoreSerialTimer3IntrHandlers(); + REG_IME = backupIME; +} + +u8 sub_81D4DE8(struct Unk03006370 *arg0) +{ + u8 var0 = 0; + arg0->unk0 = sub_81D3D70(1, arg0->unk4, arg0->unk8, NULL); + if ((arg0->unk0 & 0x13) == 0x10) + var0 = 1; + + if (arg0->unk0 & 0x8) + var0 = 2; + + if (arg0->unk0 & 0x4) + var0 = 3; + + gShouldAdvanceLinkState = 0; + return var0; +} + +void sub_81D4E30(void) +{ + memset(gDecompressionBuffer, 0, 0x2000); + gLinkType = 0x5503; + OpenLink(); + SetSuppressLinkErrorMessage(TRUE); +} + +bool32 sub_81D4E60(void) +{ + volatile u16 backupIME; + u16 sp4[4]; + + backupIME = REG_IME; + REG_IME = 0; + *(u64 *)sp4 = *(u64 *)gLink.tempRecvBuffer; + REG_IME = backupIME; + if (sp4[0] == 0xB9A0 && sp4[1] == 0xCCD0 + && sp4[2] == 0xFFFF && sp4[3] == 0xFFFF) + { + return TRUE; + } + + return FALSE; +} + +bool32 sub_81D4EC0(void) +{ + if (IsLinkMaster() && GetLinkPlayerCount_2() == 2) + return TRUE; + + return FALSE; +} + +u32 sub_81D4EE4(u8 *arg0, u16 *arg1) +{ + u8 var0; + + var0 = *arg0 - 3; + if (var0 < 3 && HasLinkErrorOccurred()) + { + *arg0 = 0; + return 3; + } + + switch (*arg0) + { + case 0: + if (IsLinkMaster() && GetLinkPlayerCount_2() > 1) + { + *arg0 = 1; + } + else if (gMain.newKeys & B_BUTTON) + { + *arg0 = 0; + return 1; + } + break; + case 1: + if (++(*arg1) > 5) + { + *arg1 = 0; + *arg0 = 2; + } + break; + case 2: + if (GetLinkPlayerCount_2() == 2) + { + PlaySE(SE_PINPON); + CheckShouldAdvanceLinkState(); + *arg1 = 0; + *arg0 = 3; + } + else if (gMain.newKeys & B_BUTTON) + { + *arg0 = 0; + return 1; + } + break; + case 3: + if (++(*arg1) > 30) + { + *arg0 = 0; + return 5; + } + + if (IsLinkConnectionEstablished()) + { + if (gReceivedRemoteLinkPlayers) + { + if (IsLinkPlayerDataExchangeComplete()) + { + *arg0 = 0; + return 2; + } + else + { + *arg0 = 4; + } + } + else + { + *arg0 = 3; + } + } + break; + case 4: + sub_800ABF4(0); + *arg0 = 5; + break; + case 5: + if (!gReceivedRemoteLinkPlayers) + { + *arg0 = 0; + return 4; + } + break; + default: + return 0; + } + + return 0; +} + +void sub_81D5014(void) +{ + int value; + struct Unk81D5014 *data; + u8 taskId = CreateTask(sub_81D5084, 0); + data = (struct Unk81D5014 *)gTasks[taskId].data; + data->unk8 = 0; + data->unk9 = 0; + data->unkA = 0; + data->unkB = 0; + data->unkC = 0; + data->unkD = 0; + data->unk0 = 0; + data->unk2 = 0; + data->unk4 = 0; + data->unk6 = 0; + data->unkE = 0; + data->unk10 = AllocZeroed(0x40); +} + +void sub_81D505C(u16 *arg0) +{ + *arg0 = 0; +} + +bool32 sub_81D5064(u16 *arg0, u16 arg1) +{ + if (++(*arg0) > arg1) + { + *arg0 = 0; + return TRUE; + } + + return FALSE; +} + +void sub_81D5084(u8 taskId) +{ + struct Unk81D5014 *data = (struct Unk81D5014 *)gTasks[taskId].data; + switch (data->unk8) + { + case 0: + if (mevent_0814257C(&data->unk9, gUnknown_085EDFD6)) + data->unk8 = 1; + break; + case 1: + sub_81D4E30(); + sub_81D505C(&data->unk0); + data->unk8 = 2; + break; + case 2: + if (sub_81D5064(&data->unk0, 10)) + data->unk8 = 3; + break; + case 3: + if (!sub_81D4EC0()) + { + CloseLink(); + data->unk8 = 4; + } + else + { + data->unk8 = 13; + } + break; + case 4: + if (mevent_0814257C(&data->unk9, gUnknown_085EDFF5)) + { + sub_8018884(gUnknown_085EE014); + sub_81D505C(&data->unk0); + data->unk8 = 5; + } + break; + case 5: + if (sub_81D5064(&data->unk0, 90)) + { + sub_81D4E30(); + data->unk8 = 6; + } + else if (gMain.newKeys & B_BUTTON) + { + sub_81D505C(&data->unk0); + PlaySE(SE_SELECT); + data->unk8 = 23; + } + break; + case 6: + if (gMain.newKeys & B_BUTTON) + { + PlaySE(SE_SELECT); + CloseLink(); + sub_81D505C(&data->unk0); + data->unk8 = 23; + } + else if (GetLinkPlayerCount_2() > 1) + { + sub_81D505C(&data->unk0); + CloseLink(); + data->unk8 = 7; + } + else if (sub_81D4E60()) + { + PlaySE(SE_SELECT); + CloseLink(); + sub_81D505C(&data->unk0); + data->unk8 = 8; + } + else if (sub_81D5064(&data->unk0, 10)) + { + CloseLink(); + sub_81D4E30(); + sub_81D505C(&data->unk0); + } + break; + case 7: + if (mevent_0814257C(&data->unk9, gUnknown_085EE05C)) + data->unk8 = 4; + break; + case 8: + sub_8018884(gUnknown_085EE097); + // XXX: This (u32*) cast is discarding the const qualifier from gUnknown_089A3470 + sub_81D4D50(&gUnknown_03006370, gMultiBootProgram_BerryGlitchFix_Start - gUnknown_089A3470, (u32*)gUnknown_089A3470); + data->unk8 = 9; + break; + case 9: + data->unkE = sub_81D4DE8(&gUnknown_03006370); + if (data->unkE) + data->unk8 = 10; + break; + case 10: + sub_81D4DB8(&gUnknown_03006370); + if (data->unkE == 3) + { + data->unk8 = 20; + } + else if (data->unkE == 1) + { + sub_81D505C(&data->unk0); + sub_8018884(gUnknown_085EE120); + data->unk8 = 11; + } + else + { + data->unk8 = 0; + } + break; + case 11: + if (sub_81D5064(&data->unk0, 840)) + data->unk8 = 12; + break; + case 12: + sub_81D4E30(); + sub_8018884(gUnknown_085EE0DC); + data->unk8 = 13; + break; + case 13: + switch (sub_81D4EE4(&data->unk9, &data->unk0)) + { + case 0: + break; + case 2: + sub_8018884(gUnknown_085EE097); + data->unk8 = 14; + break; + case 1: + PlaySE(SE_SELECT); + CloseLink(); + data->unk8 = 23; + break; + case 5: + CloseLink(); + data->unk8 = 21; + break; + case 3: + case 4: + CloseLink(); + data->unk8 = 20; + break; + } + break; + case 14: + if (HasLinkErrorOccurred()) + { + CloseLink(); + data->unk8 = 20; + } + else if (GetBlockReceivedStatus()) + { + ResetBlockReceivedFlags(); + data->unk8 = 15; + } + break; + case 15: + data->unkE = sub_81D3920(gDecompressionBuffer); + sub_800ABF4(data->unkE); + data->unk8 = 16; + break; + case 16: + if (!gReceivedRemoteLinkPlayers) + { + if (data->unkE == 1) + data->unk8 = 17; + else + data->unk8 = 20; + } + break; + case 17: + if (sub_81D3AB0((struct Unk81D38FC *)&gDecompressionBuffer)) + { + sub_8018884(gUnknown_085EE0FA); + sub_81D505C(&data->unk0); + data->unk8 = 18; + } + else + { + data->unk8 = 22; + } + break; + case 18: + if (sub_81D5064(&data->unk0, 120)) + { + sub_8018884(gUnknown_085EE107); + PlayFanfare(MUS_FANFA4); + data->unk8 = 19; + } + break; + case 19: + if (IsFanfareTaskInactive() && (gMain.newKeys & (A_BUTTON | B_BUTTON))) + data->unk8 = 26; + break; + case 23: + if (mevent_0814257C(&data->unk9,gUnknown_085EE06B)) + data->unk8 = 26; + break; + case 20: + if (mevent_0814257C(&data->unk9, gUnknown_085EE0A3)) + data->unk8 = 0; + break; + case 21: + if (mevent_0814257C(&data->unk9, gUnknown_085EE0BF)) + data->unk8 = 0; + break; + case 22: + if (mevent_0814257C(&data->unk9, gUnknown_085EE12D)) + data->unk8 = 0; + break; + case 26: + Free(data->unk10); + DestroyTask(taskId); + SetMainCallback2(sub_80186A4); + break; + } +} diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 680191bb3f..b28052ee2f 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -3,6 +3,7 @@ #include "bike.h" #include "coord_event_weather.h" #include "daycare.h" +#include "ereader.h" #include "event_data.h" #include "event_object_movement.h" #include "event_scripts.h" @@ -18,7 +19,6 @@ #include "metatile_behavior.h" #include "overworld.h" #include "pokemon.h" -#include "pokenav.h" #include "safari_zone.h" #include "script.h" #include "secret_base.h" @@ -541,7 +541,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) IncrementRematchStepCounter(); UpdateHappinessStepCounter(); - sub_81D4998(); + UpdateFarawayIslandStepCounter(); if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_6) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior)) { diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index b1f4a63689..f1a65cf8c8 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -1,4 +1,5 @@ #include "global.h" +#include "ereader.h" #include "event_obj_lock.h" #include "event_object_movement.h" #include "field_camera.h" @@ -20,8 +21,6 @@ #include "constants/field_effects.h" #include "constants/songs.h" -extern bool8 IsMewPlayingHideAndSeek(void); - extern struct MapPosition gPlayerFacingPosition; extern const u8 Route103_EventScript_290705[]; From a7d5f032b17bf95d879a856d801731a7ae7f5b9b Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 22 Mar 2019 14:16:26 -0500 Subject: [PATCH 217/217] Split into ereader_helpers.c, faraway_island.c, and ereader_screen.c --- data/{ereader.s => ereader_helpers.s} | 9 - data/ereader_screen.s | 7 + include/ereader_helpers.h | 20 + include/ereader_screen.h | 6 + include/{ereader.h => faraway_island.h} | 7 +- ld_script.txt | 8 +- src/ereader.c | 1445 ----------------------- src/ereader_helpers.c | 553 +++++++++ src/ereader_screen.c | 464 ++++++++ src/event_object_movement.c | 2 +- src/faraway_island.c | 445 +++++++ src/field_control_avatar.c | 2 +- src/fldeff_cut.c | 2 +- src/trainer_hill.c | 2 +- 14 files changed, 1508 insertions(+), 1464 deletions(-) rename data/{ereader.s => ereader_helpers.s} (97%) create mode 100755 data/ereader_screen.s create mode 100755 include/ereader_helpers.h create mode 100755 include/ereader_screen.h rename include/{ereader.h => faraway_island.h} (67%) delete mode 100755 src/ereader.c create mode 100755 src/ereader_helpers.c create mode 100755 src/ereader_screen.c create mode 100755 src/faraway_island.c diff --git a/data/ereader.s b/data/ereader_helpers.s similarity index 97% rename from data/ereader.s rename to data/ereader_helpers.s index 7ef4c851eb..0ddddbc08a 100644 --- a/data/ereader.s +++ b/data/ereader_helpers.s @@ -46,12 +46,3 @@ gUnknown_08625B6C:: @ 8625B6C .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x4b, 0x01, 0xc6, 0x00, 0x39, 0x00, 0xf2, 0x00, 0x26, 0x00, 0x59, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10 .byte 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x5b, 0x72, 0x6a, 0x91, 0xae, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7a, 0x01, 0x8d, 0x00, 0x5e, 0x00, 0xf7, 0x00, 0x55, 0x00, 0x05, 0x01 .byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x8d, 0x85, 0x9e, 0xa0, 0x60, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff - -gFarawayIslandRockCoords:: @ 862608C - .2byte 21, 16 - .2byte 25, 16 - .2byte 16, 17 - .2byte 20, 20 - -gUnknown_0862609C:: @ 862609C - .incbin "data/unknown_jp_62609C.bin" diff --git a/data/ereader_screen.s b/data/ereader_screen.s new file mode 100755 index 0000000000..3d6572a499 --- /dev/null +++ b/data/ereader_screen.s @@ -0,0 +1,7 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +gUnknown_0862609C:: @ 862609C + .incbin "data/unknown_jp_62609C.bin" diff --git a/include/ereader_helpers.h b/include/ereader_helpers.h new file mode 100755 index 0000000000..54b36ef0f3 --- /dev/null +++ b/include/ereader_helpers.h @@ -0,0 +1,20 @@ +#ifndef GUARD_EREADER_HELPERS_H +#define GUARD_EREADER_HELPERS_H + +struct Unk81D38FC +{ + u8 unk0[0x270]; + int checksum; +}; + +bool8 sub_81D3920(u8 *buffer); +bool32 sub_81D3AB0(struct Unk81D38FC *arg0); +bool32 sub_81D3B34(void); +int sub_81D3D70(u8, u32, u32*, u32*); +void sub_81D3F9C(void); +void sub_81D3FAC(void); +void sub_81D41A0(void); +void sub_81D41F4(void); +void sub_81D4238(void); + +#endif // GUARD_EREADER_HELPERS_H diff --git a/include/ereader_screen.h b/include/ereader_screen.h new file mode 100755 index 0000000000..0e3e51c76d --- /dev/null +++ b/include/ereader_screen.h @@ -0,0 +1,6 @@ +#ifndef GUARD_EREADER_SCREEN_H +#define GUARD_EREADER_SCREEN_H + +void sub_81D5014(void); + +#endif // GUARD_EREADER_SCREEN_H diff --git a/include/ereader.h b/include/faraway_island.h similarity index 67% rename from include/ereader.h rename to include/faraway_island.h index 348affe818..89b4bcd085 100755 --- a/include/ereader.h +++ b/include/faraway_island.h @@ -1,11 +1,10 @@ -#ifndef GUARD_EREADER_H -#define GUARD_EREADER_H +#ifndef GUARD_FARAWAY_ISLAND_H +#define GUARD_FARAWAY_ISLAND_H -bool32 sub_81D3B34(void); u32 sub_81D427C(void); bool8 sub_81D4A58(struct EventObject*); void UpdateFarawayIslandStepCounter(void); bool8 EventObjectIsFarawayIslandMew(struct EventObject *); bool8 IsMewPlayingHideAndSeek(void); -#endif // GUARD_EREADER_H +#endif // GUARD_FARAWAY_ISLAND_H diff --git a/ld_script.txt b/ld_script.txt index 4f13b8225c..28798c261c 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -291,7 +291,9 @@ SECTIONS { src/pokenav_match_call.o(.text); src/menu_specialized.o(.text); asm/menu_specialized.o(.text); - src/ereader.o(.text); + src/ereader_helpers.o(.text); + src/faraway_island.o(.text); + src/ereader_screen.o(.text); src/trainer_hill.o(.text); src/rayquaza_scene.o(.text); src/walda_phrase.o(.text); @@ -596,7 +598,9 @@ SECTIONS { src/pokenav_match_call.o(.rodata); src/menu_specialized.o(.rodata); data/menu_specialized.o(.rodata); - data/ereader.o(.rodata); + data/ereader_helpers.o(.rodata); + src/faraway_island.o(.rodata); + data/ereader_screen.o(.rodata); src/trainer_hill.o(.rodata); src/rayquaza_scene.o(.rodata); src/walda_phrase.o(.rodata); diff --git a/src/ereader.c b/src/ereader.c deleted file mode 100755 index 9941994ed7..0000000000 --- a/src/ereader.c +++ /dev/null @@ -1,1445 +0,0 @@ -#include "global.h" -#include "alloc.h" -#include "decompress.h" -#include "event_data.h" -#include "event_object_movement.h" -#include "field_weather.h" -#include "fieldmap.h" -#include "link.h" -#include "main.h" -#include "metatile_behavior.h" -#include "rom_8011DC0.h" -#include "save.h" -#include "sound.h" -#include "sprite.h" -#include "task.h" -#include "strings.h" -#include "util.h" -#include "constants/event_objects.h" -#include "constants/flags.h" -#include "constants/maps.h" -#include "constants/metatile_behaviors.h" -#include "constants/songs.h" -#include "constants/vars.h" - -struct Unk81D38FC -{ - u8 unk0[0x270]; - int checksum; -}; - -struct Unknown030012C8 -{ - u8 unk0[8]; - u32 *unk8; - int unkC; - int unk10; - int unk14; -}; - -struct Unk03006370 -{ - u16 unk0; - u32 unk4; - u32 *unk8; -}; - -struct Unk81D5014 -{ - u16 unk0; - u16 unk2; - u16 unk4; - u16 unk6; - u8 unk8; - u8 unk9; - u8 unkA; - u8 unkB; - u8 unkC; - u8 unkD; - u8 unkE; - u8 *unk10; -}; - -void sub_81D41A0(void); -static void sub_81D4170(void); -int sub_81D3D70(u8, u32, u32*, u32*); -void sub_81D41F4(void); -static u16 sub_81D3EE8(u8); -static void sub_81D413C(void); -static void sub_81D414C(void); -static void sub_81D3F1C(u32, u32*, u32*); -static void sub_81D3F68(void); -bool8 sub_81D4834(s16, s16); -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 u8 sub_81D4D24(u8); -static u8 sub_81D4890(u8); -void sub_81D5084(u8); - -extern struct Unknown030012C8 gUnknown_030012C8; -extern u16 gUnknown_030012E0; -extern u16 gUnknown_030012E2; -extern u16 gUnknown_030012E4; -extern u16 gUnknown_030012E6; -extern u32 gUnknown_030012E8; -extern u16 gUnknown_030012EC; -extern u16 gUnknown_030012EE; -extern u16 gUnknown_030012F0; -extern u16 gUnknown_030012F2; -extern u16 gUnknown_030012F4; -extern s16 gUnknown_030012F8; -extern s16 gUnknown_030012FA; -extern u8 gUnknown_030012FC[4]; -extern u8 gUnknown_0203CF50; -extern struct Unk03006370 gUnknown_03006370; - -extern const u8 gUnknown_08625B6C[]; -extern const u8 gUnknown_089A3470[]; -extern const u8 gMultiBootProgram_BerryGlitchFix_Start[]; -extern const s16 gFarawayIslandRockCoords[4][2]; - -extern const struct SpritePalette gFieldEffectObjectPaletteInfo1; -extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; - -static u8 sub_81D38D4(void) -{ - return (gSaveBlock1Ptr->trainerHill.unused + 1) % 256; -} - -static bool32 sub_81D38FC(struct Unk81D38FC *arg0) -{ - int checksum = CalcByteArraySum(arg0->unk0, 0x270); - if (checksum != arg0->checksum) - return FALSE; - - return TRUE; -} - -bool8 sub_81D3920(u8 *buffer) -{ - u32 i; - u32 checksum; - int var0 = buffer[0]; - if (var0 < 1 || var0 > 8) - return FALSE; - - for (i = 0; i < var0; i++) - { - struct Unk81D38FC *var1 = (struct Unk81D38FC *)(&buffer[i * (sizeof(struct Unk81D38FC)) + 8]); - if (!sub_81D38FC(var1)) - return FALSE; - } - - checksum = CalcByteArraySum(buffer + 8, var0 * 0x274); - if (checksum != ((int *)buffer)[1]) - return FALSE; - - return TRUE; -} - -static bool32 sub_81D396C(u8 *buffer) -{ - u32 checksum; - int var0 = buffer[0]; - if (var0 < 1 || var0 > 8) - return FALSE; - - checksum = CalcByteArraySum(buffer + 8, 0xEE0); - if (checksum != ((int *)buffer)[1]) - return FALSE; - - return TRUE; -} - -static bool32 sub_81D3998(struct Unk81D38FC *arg0, u8 *buffer2) -{ - int i; - const u8 *ereaderVals; - - memset(buffer2, 0, 0x1000); - buffer2[0] = arg0->unk0[0]; - buffer2[1] = sub_81D38D4(); - buffer2[2] = (arg0->unk0[0] + 1) / 2; - - for (i = 0; i < arg0->unk0[0]; i++) - { - if (!(i & 1)) - { - u8 *var0 = &buffer2[(i / 2) * 0x3B8]; - u8 *var1 = arg0[i].unk0; - var0[8] = var1[8]; - memcpy(&var0[0x29C], &var1[0x154], 0x124); - var0 += 0xC; - var1 += 0xC; - memcpy(var0, var1, 0x148); - } - else - { - u8 *var0 = &buffer2[(i / 2) * 0x3B8]; - u8 *var1 = arg0[i].unk0; - var0[9] = var1[8]; - memcpy(&var0[0x154], &var1[0xC], 0x148); - } - } - - if (i & 1) - { - u8 *var0 = &buffer2[(i / 2) * 0x3B8]; - var0 += 0x154; - - ereaderVals = gUnknown_08625B6C; - memcpy(var0, &ereaderVals[(i / 2) * 0x148], 0x148); - } - - ((int *)buffer2)[1] = CalcByteArraySum(buffer2 + 8, 0xEE0); - if (sub_8153634(SECTOR_ID_TRAINER_HILL, buffer2) != 1) - return FALSE; - - return TRUE; -} - -bool32 sub_81D3AB0(struct Unk81D38FC *arg0) -{ - u8 *var0 = AllocZeroed(0x1000); - bool32 result = sub_81D3998(arg0, var0); - Free(var0); - return result; -} - -static bool32 sub_81D3AD8(u8 *arg0, u8 *arg1) -{ - if (TryCopySpecialSaveSection(SECTOR_ID_TRAINER_HILL, arg1) != 1) - return FALSE; - - memcpy(arg0, arg1, 0xEE8); - if (!sub_81D396C(arg0)) - return FALSE; - - return TRUE; -} - -static bool32 sub_81D3B0C(u8 *arg0) -{ - u8 *var0 = AllocZeroed(0x1000); - bool32 result = sub_81D3AD8(arg0, var0); - Free(var0); - return result; -} - -bool32 sub_81D3B34(void) -{ - u8 *var0 = AllocZeroed(0x1000); - bool32 result = sub_81D3B0C(var0); - Free(var0); - return result; -} - -static int unref_sub_81D3B54(int arg0, u32 *arg1) -{ - int result; - u16 var0; - int var1; - - sub_81D41A0(); - while (1) - { - sub_81D4170(); - if (gUnknown_030012E2 & 2) - gShouldAdvanceLinkState = 2; - - var1 = sub_81D3D70(1, arg0, arg1, NULL); - gUnknown_030012E4 = var1; - if ((gUnknown_030012E4 & 0x13) == 0x10) - { - result = 0; - break; - } - - if (gUnknown_030012E4 & 0x8) - { - result = 1; - break; - } - - var0 = gUnknown_030012E4 & 0x4; - if (var0) - { - result = 2; - break; - } - - gShouldAdvanceLinkState = var0; - VBlankIntrWait(); - } - - CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8)); - sub_81D41F4(); - return result; -} - -static int unref_sub_81D3BE8(u32 *arg0) -{ - int result; - u16 var0; - int var1; - - sub_81D41A0(); - while (1) - { - sub_81D4170(); - if (gUnknown_030012E2 & 2) - gShouldAdvanceLinkState = 2; - - var1 = sub_81D3D70(0, 0, NULL, arg0); - gUnknown_030012E4 = var1; - if ((gUnknown_030012E4 & 0x13) == 0x10) - { - result = 0; - break; - } - - if (gUnknown_030012E4 & 0x8) - { - result = 1; - break; - } - - var0 = gUnknown_030012E4 & 0x4; - if (var0) - { - result = 2; - break; - } - - gShouldAdvanceLinkState = var0; - VBlankIntrWait(); - } - - CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8)); - sub_81D41F4(); - return result; -} - -static void sub_81D3C7C(void) -{ - REG_IME = 0; - REG_IE &= ~(INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL); - REG_IME = 1; - REG_SIOCNT = 0; - REG_TM3CNT_H = 0; - REG_IF = INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL; -} - -static void sub_81D3CBC(void) -{ - REG_IME = 0; - REG_IE &= ~(INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL); - REG_IME = 1; - REG_RCNT = 0; - REG_SIOCNT = SIO_MULTI_MODE; - REG_SIOCNT |= SIO_INTR_ENABLE | SIO_115200_BPS; - REG_IME = 0; - REG_IE |= INTR_FLAG_SERIAL; - REG_IME = 1; - - if (!gUnknown_030012C8.unk0[1]) - CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8)); -} - -static void sub_81D3D34(void) -{ - REG_RCNT = 0; - REG_SIOCNT = SIO_32BIT_MODE | SIO_INTR_ENABLE; - REG_SIOCNT |= SIO_MULTI_SD; - gShouldAdvanceLinkState = 0; - gUnknown_030012E6 = 0; - gUnknown_030012E8 = 0; -} - -int sub_81D3D70(u8 arg0, u32 arg1, u32 *arg2, u32 *arg3) -{ - switch (gUnknown_030012C8.unk0[1]) - { - case 0: - sub_81D3CBC(); - gUnknown_030012C8.unk0[2] = 1; - gUnknown_030012C8.unk0[1] = 1; - break; - case 1: - if (sub_81D3EE8(arg0)) - sub_81D413C(); - - if (gShouldAdvanceLinkState == 2) - { - gUnknown_030012C8.unk0[4] = 2; - gUnknown_030012C8.unk0[1] = 6; - } - break; - case 2: - sub_81D3D34(); - sub_81D3F1C(arg1, arg2, arg3); - gUnknown_030012C8.unk0[1] = 3; - // fall through - case 3: - if (gShouldAdvanceLinkState == 2) - { - gUnknown_030012C8.unk0[4] = 2; - gUnknown_030012C8.unk0[1] = 6; - } - else - { - gUnknown_030012E6++; - gUnknown_030012E8++; - if (!gUnknown_030012C8.unk0[0] && gUnknown_030012E8 > 60) - { - gUnknown_030012C8.unk0[4] = 1; - gUnknown_030012C8.unk0[1] = 6; - } - - if (gUnknown_030012C8.unk0[2] != 2) - { - if (gUnknown_030012C8.unk0[0] && gUnknown_030012E6 > 2) - { - sub_81D413C(); - gUnknown_030012C8.unk0[2] = 2; - } - else - { - sub_81D413C(); - gUnknown_030012C8.unk0[2] = 2; - } - } - } - break; - case 4: - sub_81D3CBC(); - gUnknown_030012C8.unk0[1] = 5; - break; - case 5: - if (gUnknown_030012C8.unk0[0] == 1 && gUnknown_030012E6 > 2) - sub_81D413C(); - - if (++gUnknown_030012E6 > 60) - { - gUnknown_030012C8.unk0[4] = 1; - gUnknown_030012C8.unk0[1] = 6; - } - break; - case 6: - if (gUnknown_030012C8.unk0[2]) - { - sub_81D3C7C(); - gUnknown_030012C8.unk0[2] = 0; - } - break; - } - - return gUnknown_030012C8.unk0[2] | (gUnknown_030012C8.unk0[4] << 2) | (gUnknown_030012C8.unk0[3] << 4); -} - -static u16 sub_81D3EE8(u8 arg0) -{ - u16 terminal = (*(vu32 *)REG_ADDR_SIOCNT) & (SIO_MULTI_SI | SIO_MULTI_SD); - if (terminal == SIO_MULTI_SD && arg0) - { - gUnknown_030012C8.unk0[0] = 1; - return 1; - } - else - { - gUnknown_030012C8.unk0[0] = 0; - return 0; - } -} - -static void sub_81D3F1C(u32 arg0, u32 *arg1, u32 *arg2) -{ - if (gUnknown_030012C8.unk0[0]) - { - REG_SIOCNT |= SIO_38400_BPS; - gUnknown_030012C8.unk8 = arg1; - REG_SIODATA32 = arg0; - gUnknown_030012C8.unk10 = arg0 / 4 + 1; - sub_81D3F68(); - } - else - { - REG_SIOCNT = REG_SIOCNT; - gUnknown_030012C8.unk8 = arg2; - } -} - -static void sub_81D3F68(void) -{ - REG_TM3CNT_L = 0xFDA7; - REG_TM3CNT_H = TIMER_INTR_ENABLE; - REG_IME = 0; - REG_IE |= INTR_FLAG_TIMER3; - REG_IME = 1; -} - -void sub_81D3F9C(void) -{ - sub_81D414C(); - sub_81D413C(); -} - -void sub_81D3FAC(void) -{ - u16 i, playerCount, k; - u32 value; - u16 var0; - u16 recvBuffer[4]; - - switch (gUnknown_030012C8.unk0[1]) - { - case 1: - REG_SIOMLT_SEND = 0xCCD0; // Handshake id - *(u64 *)recvBuffer = REG_SIOMLT_RECV; - for (i = 0, playerCount = 0, k = 0; i < 4; i++) - { - if (recvBuffer[i] == 0xCCD0) - playerCount++; - else if (recvBuffer[i] != 0xFFFF) - k++; - } - - if (playerCount == 2 && k == 0) - gUnknown_030012C8.unk0[1] = 2; - break; - case 3: - value = REG_SIODATA32; - if (!gUnknown_030012C8.unkC && !gUnknown_030012C8.unk0[0]) - gUnknown_030012C8.unk10 = value / 4 + 1; - - if (gUnknown_030012C8.unk0[0] == 1) - { - if (gUnknown_030012C8.unkC < gUnknown_030012C8.unk10) - { - REG_SIODATA32 = gUnknown_030012C8.unk8[gUnknown_030012C8.unkC]; - gUnknown_030012C8.unk14 += gUnknown_030012C8.unk8[gUnknown_030012C8.unkC]; - } - else - { - REG_SIODATA32 = gUnknown_030012C8.unk14; - } - } - else - { - if (gUnknown_030012C8.unkC > 0 && gUnknown_030012C8.unkC < gUnknown_030012C8.unk10 + 1) - { - gUnknown_030012C8.unk8[gUnknown_030012C8.unkC - 1] = value; - gUnknown_030012C8.unk14 += value; - } - else if (gUnknown_030012C8.unkC) - { - if (gUnknown_030012C8.unk14 == value) - gUnknown_030012C8.unk0[3] = 1; - else - gUnknown_030012C8.unk0[3] = 2; - } - - gUnknown_030012E8 = 0; - } - - if (++gUnknown_030012C8.unkC < gUnknown_030012C8.unk10 + 2) - { - if (gUnknown_030012C8.unk0[0]) - REG_TM3CNT_H |= TIMER_ENABLE; - else - sub_81D413C(); - } - else - { - gUnknown_030012C8.unk0[1] = 4; - gUnknown_030012E6 = 0; - } - break; - case 5: - if (!gUnknown_030012C8.unk0[0]) - REG_SIOMLT_SEND = gUnknown_030012C8.unk0[3]; - - *(u64 *)recvBuffer = REG_SIOMLT_RECV; - var0 = recvBuffer[1] - 1; - if (var0 < 2) - { - if (gUnknown_030012C8.unk0[0] == 1) - gUnknown_030012C8.unk0[3] = recvBuffer[1]; - - gUnknown_030012C8.unk0[1] = 6; - } - break; - } -} - -static void sub_81D413C(void) -{ - REG_SIOCNT |= SIO_ENABLE; -} - -static void sub_81D414C(void) -{ - REG_TM3CNT_H &= ~TIMER_ENABLE; - REG_TM3CNT_L = 0xFDA7; -} - -static void sub_81D4170(void) -{ - int keysMask = REG_KEYINPUT ^ KEYS_MASK; - gUnknown_030012E2 = keysMask & ~gUnknown_030012E0; - gUnknown_030012E0 = keysMask; -} - -void sub_81D41A0(void) -{ - gUnknown_030012EC = REG_IME; - gUnknown_030012EE = REG_IE; - gUnknown_030012F0 = REG_TM3CNT_H; - gUnknown_030012F2 = REG_SIOCNT; - gUnknown_030012F4 = REG_RCNT; -} - -void sub_81D41F4(void) -{ - REG_IME = gUnknown_030012EC; - REG_IE = gUnknown_030012EE; - REG_TM3CNT_H = gUnknown_030012F0; - REG_SIOCNT = gUnknown_030012F2; - REG_RCNT = gUnknown_030012F4; -} - -void sub_81D4238(void) -{ - CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8)); -} - -u8 sub_81D4258(void) -{ - u8 eventObjectId; - TryGetEventObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId); - return eventObjectId; -} - -u32 sub_81D427C(void) -{ - u8 i; - int skip; - struct EventObject *mew = &gEventObjects[sub_81D4258()]; - - gUnknown_030012F8 = gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x - mew->currentCoords.x; - gUnknown_030012FA = gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y - mew->currentCoords.y; - for (i = 0; i < ARRAY_COUNT(gUnknown_030012FC); i++) - gUnknown_030012FC[i] = DIR_NONE; - - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x == gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x - && gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y == gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y) - { - return DIR_NONE; - } - - if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 8 == 0) - mew->invisible = 0; - else - mew->invisible = 1; - - if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 9 == 0) - return DIR_NONE; - - for (i = 0; i < ARRAY_COUNT(gFarawayIslandRockCoords); i++) - { - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x == gFarawayIslandRockCoords[i][0]) - { - skip = 0; - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y < gFarawayIslandRockCoords[i][1]) - { - if (mew->currentCoords.y <= gFarawayIslandRockCoords[i][1]) - skip = 1; - } - else - { - if (mew->currentCoords.y >= gFarawayIslandRockCoords[i][1]) - skip = 1; - } - - if (!skip) - { - if (gUnknown_030012F8 > 0) - { - if (mew->currentCoords.x + 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) - { - if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y)) - return DIR_EAST; - } - } - else if (gUnknown_030012F8 < 0) - { - if (mew->currentCoords.x - 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) - { - if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y)) - return DIR_WEST; - } - } - - if (mew->currentCoords.x == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) - { - if (gUnknown_030012FA > 0) - { - if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1)) - return DIR_NORTH; - } - else - { - if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1)) - return DIR_SOUTH; - } - } - } - } - - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y == gFarawayIslandRockCoords[i][1]) - { - skip = 0; - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x < gFarawayIslandRockCoords[i][0]) - { - if (mew->currentCoords.x <= gFarawayIslandRockCoords[i][0]) - skip = 1; - } - else - { - if (mew->currentCoords.x >= gFarawayIslandRockCoords[i][0]) - skip = 1; - } - - if (!skip) - { - if (gUnknown_030012FA > 0) - { - if (mew->currentCoords.y + 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) - { - if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1)) - return DIR_SOUTH; - } - } - else if (gUnknown_030012FA < 0) - { - if (mew->currentCoords.y - 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) - { - if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1)) - return DIR_NORTH; - } - } - - if (mew->currentCoords.y == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) - { - if (gUnknown_030012F8 > 0) - { - if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y)) - return DIR_WEST; - } - else - { - if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y)) - return DIR_EAST; - } - } - } - } - } - - if (sub_81D4C14(mew, 0)) - { - if (sub_81D4C58(mew, 1)) - return sub_81D4D24(2); - else if (sub_81D4CE0(mew, 1)) - return sub_81D4D24(2); - else - return DIR_NORTH; - } - - if (sub_81D4C9C(mew, 0)) - { - if (sub_81D4C58(mew, 1)) - return sub_81D4D24(2); - else if (sub_81D4CE0(mew, 1)) - return sub_81D4D24(2); - else - return DIR_SOUTH; - } - - if (sub_81D4C58(mew, 0)) - { - if (sub_81D4C14(mew, 1)) - return sub_81D4D24(2); - else if (sub_81D4C9C(mew, 1)) - return sub_81D4D24(2); - else - return DIR_EAST; - } - - if (sub_81D4CE0(mew, 0)) - { - if (sub_81D4C14(mew, 1)) - return sub_81D4D24(2); - else if (sub_81D4C9C(mew, 1)) - return sub_81D4D24(2); - else - return DIR_WEST; - } - - if (gUnknown_030012FA == 0) - { - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y > mew->currentCoords.y) - { - if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1)) - return DIR_NORTH; - } - - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y < mew->currentCoords.y) - { - if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1)) - return DIR_SOUTH; - } - - if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1)) - return DIR_NORTH; - - if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1)) - return DIR_SOUTH; - } - - if (gUnknown_030012F8 == 0) - { - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x > mew->currentCoords.x) - { - if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y)) - return DIR_WEST; - } - - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x < mew->currentCoords.x) - { - if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y)) - return DIR_EAST; - } - - if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y)) - return DIR_EAST; - - if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y)) - return DIR_WEST; - } - - return sub_81D4890(DIR_NONE); -} - -bool8 sub_81D4834(s16 x, s16 y) -{ - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x == x - && gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y == y) - { - return FALSE; - } - - return MetatileBehavior_IsPokeGrass(MapGridGetMetatileBehaviorAt(x, y)); -} - -static u8 sub_81D4890(u8 ignoredDir) -{ - u8 i; - u8 count = 0; - struct EventObject *mew = &gEventObjects[sub_81D4258()]; - - for (i = 0; i < ARRAY_COUNT(gUnknown_030012FC); i++) - gUnknown_030012FC[i] = DIR_NONE; - - if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1) == TRUE && ignoredDir != DIR_NORTH) - { - gUnknown_030012FC[count] = DIR_NORTH; - count++; - } - - if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y) == TRUE && ignoredDir != DIR_EAST) - { - gUnknown_030012FC[count] = DIR_EAST; - count++; - } - - if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1) == TRUE && ignoredDir != DIR_SOUTH) - { - gUnknown_030012FC[count] = DIR_SOUTH; - count++; - } - - if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y) == TRUE && ignoredDir != DIR_WEST) - { - gUnknown_030012FC[count] = DIR_WEST; - count++; - } - - if (count > 1) - return gUnknown_030012FC[VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % count]; - else - return gUnknown_030012FC[0]; -} - -void UpdateFarawayIslandStepCounter(void) -{ - u16 steps = VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER); - if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(FARAWAY_ISLAND_INTERIOR) - && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(FARAWAY_ISLAND_INTERIOR)) - { - steps++; - if (steps >= 9999) - VarSet(VAR_FARAWAY_ISLAND_STEP_COUNTER, 0); - else - VarSet(VAR_FARAWAY_ISLAND_STEP_COUNTER, steps); - } -} - -bool8 EventObjectIsFarawayIslandMew(struct EventObject *eventObject) -{ - if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(FARAWAY_ISLAND_INTERIOR) - && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(FARAWAY_ISLAND_INTERIOR)) - { - if (eventObject->graphicsId == EVENT_OBJ_GFX_MEW) - return TRUE; - } - - return FALSE; -} - -bool8 IsMewPlayingHideAndSeek(void) -{ - if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(FARAWAY_ISLAND_INTERIOR) - && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(FARAWAY_ISLAND_INTERIOR)) - { - if (FlagGet(FLAG_CAUGHT_MEW) != TRUE && FlagGet(FLAG_HIDE_MEW) != TRUE) - return TRUE; - } - - return FALSE; -} - -bool8 sub_81D4A58(struct EventObject *eventObject) -{ - if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) != 0xFFFF - && VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 4 == 0) - return TRUE; - - return FALSE; -} - -void sub_81D4A90(void) -{ - s16 x; - s16 y; - u8 spriteId; - struct EventObject *mew = &gEventObjects[sub_81D4258()]; - - mew->invisible = 0; - if (gSpecialVar_0x8004 == 1) - { - mew->fixedPriority = 1; - gSprites[mew->spriteId].subspriteMode = SUBSPRITES_IGNORE_PRIORITY; - gSprites[mew->spriteId].subpriority = 1; - } - else - { - VarSet(VAR_FARAWAY_ISLAND_STEP_COUNTER, 0xFFFF); - mew->fixedPriority = 1; - gSprites[mew->spriteId].subspriteMode = SUBSPRITES_IGNORE_PRIORITY; - if (gSpecialVar_Facing != DIR_NORTH) - gSprites[mew->spriteId].subpriority = 1; - - LoadSpritePalette(&gFieldEffectObjectPaletteInfo1); - UpdateSpritePaletteWithWeather(IndexOfSpritePaletteTag(gFieldEffectObjectPaletteInfo1.tag)); - - x = mew->currentCoords.x; - y = mew->currentCoords.y; - sub_80930E0(&x, &y, 8, 8); - gUnknown_0203CF50 = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[15], x, y, gSprites[mew->spriteId].subpriority - 1); - if (gUnknown_0203CF50 != MAX_SPRITES) - { - struct Sprite *sprite = &gSprites[gUnknown_0203CF50]; - sprite->coordOffsetEnabled = 1; - sprite->oam.priority = 2; - sprite->callback = SpriteCallbackDummy; - } - } -} - -void sub_81D4BEC(void) -{ - if (gUnknown_0203CF50 != MAX_SPRITES) - DestroySprite(&gSprites[gUnknown_0203CF50]); -} - -static bool8 sub_81D4C14(struct EventObject *mew, u8 index) -{ - if (gUnknown_030012FA > 0 && sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1)) - { - gUnknown_030012FC[index] = DIR_NORTH; - return TRUE; - } - - return FALSE; -} - -static u8 sub_81D4C58(struct EventObject *mew, u8 index) -{ - if (gUnknown_030012F8 < 0 && sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y)) - { - gUnknown_030012FC[index] = DIR_EAST; - return TRUE; - } - - return FALSE; -} - -static u8 sub_81D4C9C(struct EventObject *mew, u8 index) -{ - if (gUnknown_030012FA < 0 && sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1)) - { - gUnknown_030012FC[index] = DIR_SOUTH; - return TRUE; - } - - return FALSE; -} - -static u8 sub_81D4CE0(struct EventObject *mew, u8 index) -{ - if (gUnknown_030012F8 > 0 && sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y)) - { - gUnknown_030012FC[index] = DIR_WEST; - return TRUE; - } - - return FALSE; -} - -static u8 sub_81D4D24(u8 mod) -{ - return gUnknown_030012FC[VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % mod]; -} - -void sub_81D4D50(struct Unk03006370 *arg0, int arg1, u32 *arg2) -{ - volatile u16 backupIME = REG_IME; - REG_IME = 0; - gIntrTable[1] = sub_81D3FAC; - gIntrTable[2] = sub_81D3F9C; - sub_81D41A0(); - sub_81D4238(); - REG_IE |= INTR_FLAG_VCOUNT; - REG_IME = backupIME; - arg0->unk0 = 0; - arg0->unk4 = arg1; - arg0->unk8 = arg2; -} - -void sub_81D4DB8(struct Unk03006370 *arg0) -{ - volatile u16 backupIME = REG_IME; - REG_IME = 0; - sub_81D4238(); - sub_81D41F4(); - RestoreSerialTimer3IntrHandlers(); - REG_IME = backupIME; -} - -u8 sub_81D4DE8(struct Unk03006370 *arg0) -{ - u8 var0 = 0; - arg0->unk0 = sub_81D3D70(1, arg0->unk4, arg0->unk8, NULL); - if ((arg0->unk0 & 0x13) == 0x10) - var0 = 1; - - if (arg0->unk0 & 0x8) - var0 = 2; - - if (arg0->unk0 & 0x4) - var0 = 3; - - gShouldAdvanceLinkState = 0; - return var0; -} - -void sub_81D4E30(void) -{ - memset(gDecompressionBuffer, 0, 0x2000); - gLinkType = 0x5503; - OpenLink(); - SetSuppressLinkErrorMessage(TRUE); -} - -bool32 sub_81D4E60(void) -{ - volatile u16 backupIME; - u16 sp4[4]; - - backupIME = REG_IME; - REG_IME = 0; - *(u64 *)sp4 = *(u64 *)gLink.tempRecvBuffer; - REG_IME = backupIME; - if (sp4[0] == 0xB9A0 && sp4[1] == 0xCCD0 - && sp4[2] == 0xFFFF && sp4[3] == 0xFFFF) - { - return TRUE; - } - - return FALSE; -} - -bool32 sub_81D4EC0(void) -{ - if (IsLinkMaster() && GetLinkPlayerCount_2() == 2) - return TRUE; - - return FALSE; -} - -u32 sub_81D4EE4(u8 *arg0, u16 *arg1) -{ - u8 var0; - - var0 = *arg0 - 3; - if (var0 < 3 && HasLinkErrorOccurred()) - { - *arg0 = 0; - return 3; - } - - switch (*arg0) - { - case 0: - if (IsLinkMaster() && GetLinkPlayerCount_2() > 1) - { - *arg0 = 1; - } - else if (gMain.newKeys & B_BUTTON) - { - *arg0 = 0; - return 1; - } - break; - case 1: - if (++(*arg1) > 5) - { - *arg1 = 0; - *arg0 = 2; - } - break; - case 2: - if (GetLinkPlayerCount_2() == 2) - { - PlaySE(SE_PINPON); - CheckShouldAdvanceLinkState(); - *arg1 = 0; - *arg0 = 3; - } - else if (gMain.newKeys & B_BUTTON) - { - *arg0 = 0; - return 1; - } - break; - case 3: - if (++(*arg1) > 30) - { - *arg0 = 0; - return 5; - } - - if (IsLinkConnectionEstablished()) - { - if (gReceivedRemoteLinkPlayers) - { - if (IsLinkPlayerDataExchangeComplete()) - { - *arg0 = 0; - return 2; - } - else - { - *arg0 = 4; - } - } - else - { - *arg0 = 3; - } - } - break; - case 4: - sub_800ABF4(0); - *arg0 = 5; - break; - case 5: - if (!gReceivedRemoteLinkPlayers) - { - *arg0 = 0; - return 4; - } - break; - default: - return 0; - } - - return 0; -} - -void sub_81D5014(void) -{ - int value; - struct Unk81D5014 *data; - u8 taskId = CreateTask(sub_81D5084, 0); - data = (struct Unk81D5014 *)gTasks[taskId].data; - data->unk8 = 0; - data->unk9 = 0; - data->unkA = 0; - data->unkB = 0; - data->unkC = 0; - data->unkD = 0; - data->unk0 = 0; - data->unk2 = 0; - data->unk4 = 0; - data->unk6 = 0; - data->unkE = 0; - data->unk10 = AllocZeroed(0x40); -} - -void sub_81D505C(u16 *arg0) -{ - *arg0 = 0; -} - -bool32 sub_81D5064(u16 *arg0, u16 arg1) -{ - if (++(*arg0) > arg1) - { - *arg0 = 0; - return TRUE; - } - - return FALSE; -} - -void sub_81D5084(u8 taskId) -{ - struct Unk81D5014 *data = (struct Unk81D5014 *)gTasks[taskId].data; - switch (data->unk8) - { - case 0: - if (mevent_0814257C(&data->unk9, gUnknown_085EDFD6)) - data->unk8 = 1; - break; - case 1: - sub_81D4E30(); - sub_81D505C(&data->unk0); - data->unk8 = 2; - break; - case 2: - if (sub_81D5064(&data->unk0, 10)) - data->unk8 = 3; - break; - case 3: - if (!sub_81D4EC0()) - { - CloseLink(); - data->unk8 = 4; - } - else - { - data->unk8 = 13; - } - break; - case 4: - if (mevent_0814257C(&data->unk9, gUnknown_085EDFF5)) - { - sub_8018884(gUnknown_085EE014); - sub_81D505C(&data->unk0); - data->unk8 = 5; - } - break; - case 5: - if (sub_81D5064(&data->unk0, 90)) - { - sub_81D4E30(); - data->unk8 = 6; - } - else if (gMain.newKeys & B_BUTTON) - { - sub_81D505C(&data->unk0); - PlaySE(SE_SELECT); - data->unk8 = 23; - } - break; - case 6: - if (gMain.newKeys & B_BUTTON) - { - PlaySE(SE_SELECT); - CloseLink(); - sub_81D505C(&data->unk0); - data->unk8 = 23; - } - else if (GetLinkPlayerCount_2() > 1) - { - sub_81D505C(&data->unk0); - CloseLink(); - data->unk8 = 7; - } - else if (sub_81D4E60()) - { - PlaySE(SE_SELECT); - CloseLink(); - sub_81D505C(&data->unk0); - data->unk8 = 8; - } - else if (sub_81D5064(&data->unk0, 10)) - { - CloseLink(); - sub_81D4E30(); - sub_81D505C(&data->unk0); - } - break; - case 7: - if (mevent_0814257C(&data->unk9, gUnknown_085EE05C)) - data->unk8 = 4; - break; - case 8: - sub_8018884(gUnknown_085EE097); - // XXX: This (u32*) cast is discarding the const qualifier from gUnknown_089A3470 - sub_81D4D50(&gUnknown_03006370, gMultiBootProgram_BerryGlitchFix_Start - gUnknown_089A3470, (u32*)gUnknown_089A3470); - data->unk8 = 9; - break; - case 9: - data->unkE = sub_81D4DE8(&gUnknown_03006370); - if (data->unkE) - data->unk8 = 10; - break; - case 10: - sub_81D4DB8(&gUnknown_03006370); - if (data->unkE == 3) - { - data->unk8 = 20; - } - else if (data->unkE == 1) - { - sub_81D505C(&data->unk0); - sub_8018884(gUnknown_085EE120); - data->unk8 = 11; - } - else - { - data->unk8 = 0; - } - break; - case 11: - if (sub_81D5064(&data->unk0, 840)) - data->unk8 = 12; - break; - case 12: - sub_81D4E30(); - sub_8018884(gUnknown_085EE0DC); - data->unk8 = 13; - break; - case 13: - switch (sub_81D4EE4(&data->unk9, &data->unk0)) - { - case 0: - break; - case 2: - sub_8018884(gUnknown_085EE097); - data->unk8 = 14; - break; - case 1: - PlaySE(SE_SELECT); - CloseLink(); - data->unk8 = 23; - break; - case 5: - CloseLink(); - data->unk8 = 21; - break; - case 3: - case 4: - CloseLink(); - data->unk8 = 20; - break; - } - break; - case 14: - if (HasLinkErrorOccurred()) - { - CloseLink(); - data->unk8 = 20; - } - else if (GetBlockReceivedStatus()) - { - ResetBlockReceivedFlags(); - data->unk8 = 15; - } - break; - case 15: - data->unkE = sub_81D3920(gDecompressionBuffer); - sub_800ABF4(data->unkE); - data->unk8 = 16; - break; - case 16: - if (!gReceivedRemoteLinkPlayers) - { - if (data->unkE == 1) - data->unk8 = 17; - else - data->unk8 = 20; - } - break; - case 17: - if (sub_81D3AB0((struct Unk81D38FC *)&gDecompressionBuffer)) - { - sub_8018884(gUnknown_085EE0FA); - sub_81D505C(&data->unk0); - data->unk8 = 18; - } - else - { - data->unk8 = 22; - } - break; - case 18: - if (sub_81D5064(&data->unk0, 120)) - { - sub_8018884(gUnknown_085EE107); - PlayFanfare(MUS_FANFA4); - data->unk8 = 19; - } - break; - case 19: - if (IsFanfareTaskInactive() && (gMain.newKeys & (A_BUTTON | B_BUTTON))) - data->unk8 = 26; - break; - case 23: - if (mevent_0814257C(&data->unk9,gUnknown_085EE06B)) - data->unk8 = 26; - break; - case 20: - if (mevent_0814257C(&data->unk9, gUnknown_085EE0A3)) - data->unk8 = 0; - break; - case 21: - if (mevent_0814257C(&data->unk9, gUnknown_085EE0BF)) - data->unk8 = 0; - break; - case 22: - if (mevent_0814257C(&data->unk9, gUnknown_085EE12D)) - data->unk8 = 0; - break; - case 26: - Free(data->unk10); - DestroyTask(taskId); - SetMainCallback2(sub_80186A4); - break; - } -} diff --git a/src/ereader_helpers.c b/src/ereader_helpers.c new file mode 100755 index 0000000000..6c92b676ff --- /dev/null +++ b/src/ereader_helpers.c @@ -0,0 +1,553 @@ +#include "global.h" +#include "alloc.h" +#include "decompress.h" +#include "ereader_helpers.h" +#include "link.h" +#include "main.h" +#include "rom_8011DC0.h" +#include "save.h" +#include "sprite.h" +#include "task.h" +#include "util.h" + +struct Unknown030012C8 +{ + u8 unk0[8]; + u32 *unk8; + int unkC; + int unk10; + int unk14; +}; + +static void sub_81D4170(void); +static u16 sub_81D3EE8(u8); +static void sub_81D413C(void); +static void sub_81D414C(void); +static void sub_81D3F1C(u32, u32*, u32*); +static void sub_81D3F68(void); + +extern struct Unknown030012C8 gUnknown_030012C8; +extern u16 gUnknown_030012E0; +extern u16 gUnknown_030012E2; +extern u16 gUnknown_030012E4; +extern u16 gUnknown_030012E6; +extern u32 gUnknown_030012E8; +extern u16 gUnknown_030012EC; +extern u16 gUnknown_030012EE; +extern u16 gUnknown_030012F0; +extern u16 gUnknown_030012F2; +extern u16 gUnknown_030012F4; + +extern const u8 gUnknown_08625B6C[]; + +static u8 sub_81D38D4(void) +{ + return (gSaveBlock1Ptr->trainerHill.unused + 1) % 256; +} + +static bool32 sub_81D38FC(struct Unk81D38FC *arg0) +{ + int checksum = CalcByteArraySum(arg0->unk0, 0x270); + if (checksum != arg0->checksum) + return FALSE; + + return TRUE; +} + +bool8 sub_81D3920(u8 *buffer) +{ + u32 i; + u32 checksum; + int var0 = buffer[0]; + if (var0 < 1 || var0 > 8) + return FALSE; + + for (i = 0; i < var0; i++) + { + struct Unk81D38FC *var1 = (struct Unk81D38FC *)(&buffer[i * (sizeof(struct Unk81D38FC)) + 8]); + if (!sub_81D38FC(var1)) + return FALSE; + } + + checksum = CalcByteArraySum(buffer + 8, var0 * 0x274); + if (checksum != ((int *)buffer)[1]) + return FALSE; + + return TRUE; +} + +static bool32 sub_81D396C(u8 *buffer) +{ + u32 checksum; + int var0 = buffer[0]; + if (var0 < 1 || var0 > 8) + return FALSE; + + checksum = CalcByteArraySum(buffer + 8, 0xEE0); + if (checksum != ((int *)buffer)[1]) + return FALSE; + + return TRUE; +} + +static bool32 sub_81D3998(struct Unk81D38FC *arg0, u8 *buffer2) +{ + int i; + const u8 *ereaderVals; + + memset(buffer2, 0, 0x1000); + buffer2[0] = arg0->unk0[0]; + buffer2[1] = sub_81D38D4(); + buffer2[2] = (arg0->unk0[0] + 1) / 2; + + for (i = 0; i < arg0->unk0[0]; i++) + { + if (!(i & 1)) + { + u8 *var0 = &buffer2[(i / 2) * 0x3B8]; + u8 *var1 = arg0[i].unk0; + var0[8] = var1[8]; + memcpy(&var0[0x29C], &var1[0x154], 0x124); + var0 += 0xC; + var1 += 0xC; + memcpy(var0, var1, 0x148); + } + else + { + u8 *var0 = &buffer2[(i / 2) * 0x3B8]; + u8 *var1 = arg0[i].unk0; + var0[9] = var1[8]; + memcpy(&var0[0x154], &var1[0xC], 0x148); + } + } + + if (i & 1) + { + u8 *var0 = &buffer2[(i / 2) * 0x3B8]; + var0 += 0x154; + + ereaderVals = gUnknown_08625B6C; + memcpy(var0, &ereaderVals[(i / 2) * 0x148], 0x148); + } + + ((int *)buffer2)[1] = CalcByteArraySum(buffer2 + 8, 0xEE0); + if (sub_8153634(SECTOR_ID_TRAINER_HILL, buffer2) != 1) + return FALSE; + + return TRUE; +} + +bool32 sub_81D3AB0(struct Unk81D38FC *arg0) +{ + u8 *var0 = AllocZeroed(0x1000); + bool32 result = sub_81D3998(arg0, var0); + Free(var0); + return result; +} + +static bool32 sub_81D3AD8(u8 *arg0, u8 *arg1) +{ + if (TryCopySpecialSaveSection(SECTOR_ID_TRAINER_HILL, arg1) != 1) + return FALSE; + + memcpy(arg0, arg1, 0xEE8); + if (!sub_81D396C(arg0)) + return FALSE; + + return TRUE; +} + +static bool32 sub_81D3B0C(u8 *arg0) +{ + u8 *var0 = AllocZeroed(0x1000); + bool32 result = sub_81D3AD8(arg0, var0); + Free(var0); + return result; +} + +bool32 sub_81D3B34(void) +{ + u8 *var0 = AllocZeroed(0x1000); + bool32 result = sub_81D3B0C(var0); + Free(var0); + return result; +} + +static int unref_sub_81D3B54(int arg0, u32 *arg1) +{ + int result; + u16 var0; + int var1; + + sub_81D41A0(); + while (1) + { + sub_81D4170(); + if (gUnknown_030012E2 & 2) + gShouldAdvanceLinkState = 2; + + var1 = sub_81D3D70(1, arg0, arg1, NULL); + gUnknown_030012E4 = var1; + if ((gUnknown_030012E4 & 0x13) == 0x10) + { + result = 0; + break; + } + + if (gUnknown_030012E4 & 0x8) + { + result = 1; + break; + } + + var0 = gUnknown_030012E4 & 0x4; + if (var0) + { + result = 2; + break; + } + + gShouldAdvanceLinkState = var0; + VBlankIntrWait(); + } + + CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8)); + sub_81D41F4(); + return result; +} + +static int unref_sub_81D3BE8(u32 *arg0) +{ + int result; + u16 var0; + int var1; + + sub_81D41A0(); + while (1) + { + sub_81D4170(); + if (gUnknown_030012E2 & 2) + gShouldAdvanceLinkState = 2; + + var1 = sub_81D3D70(0, 0, NULL, arg0); + gUnknown_030012E4 = var1; + if ((gUnknown_030012E4 & 0x13) == 0x10) + { + result = 0; + break; + } + + if (gUnknown_030012E4 & 0x8) + { + result = 1; + break; + } + + var0 = gUnknown_030012E4 & 0x4; + if (var0) + { + result = 2; + break; + } + + gShouldAdvanceLinkState = var0; + VBlankIntrWait(); + } + + CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8)); + sub_81D41F4(); + return result; +} + +static void sub_81D3C7C(void) +{ + REG_IME = 0; + REG_IE &= ~(INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL); + REG_IME = 1; + REG_SIOCNT = 0; + REG_TM3CNT_H = 0; + REG_IF = INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL; +} + +static void sub_81D3CBC(void) +{ + REG_IME = 0; + REG_IE &= ~(INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL); + REG_IME = 1; + REG_RCNT = 0; + REG_SIOCNT = SIO_MULTI_MODE; + REG_SIOCNT |= SIO_INTR_ENABLE | SIO_115200_BPS; + REG_IME = 0; + REG_IE |= INTR_FLAG_SERIAL; + REG_IME = 1; + + if (!gUnknown_030012C8.unk0[1]) + CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8)); +} + +static void sub_81D3D34(void) +{ + REG_RCNT = 0; + REG_SIOCNT = SIO_32BIT_MODE | SIO_INTR_ENABLE; + REG_SIOCNT |= SIO_MULTI_SD; + gShouldAdvanceLinkState = 0; + gUnknown_030012E6 = 0; + gUnknown_030012E8 = 0; +} + +int sub_81D3D70(u8 arg0, u32 arg1, u32 *arg2, u32 *arg3) +{ + switch (gUnknown_030012C8.unk0[1]) + { + case 0: + sub_81D3CBC(); + gUnknown_030012C8.unk0[2] = 1; + gUnknown_030012C8.unk0[1] = 1; + break; + case 1: + if (sub_81D3EE8(arg0)) + sub_81D413C(); + + if (gShouldAdvanceLinkState == 2) + { + gUnknown_030012C8.unk0[4] = 2; + gUnknown_030012C8.unk0[1] = 6; + } + break; + case 2: + sub_81D3D34(); + sub_81D3F1C(arg1, arg2, arg3); + gUnknown_030012C8.unk0[1] = 3; + // fall through + case 3: + if (gShouldAdvanceLinkState == 2) + { + gUnknown_030012C8.unk0[4] = 2; + gUnknown_030012C8.unk0[1] = 6; + } + else + { + gUnknown_030012E6++; + gUnknown_030012E8++; + if (!gUnknown_030012C8.unk0[0] && gUnknown_030012E8 > 60) + { + gUnknown_030012C8.unk0[4] = 1; + gUnknown_030012C8.unk0[1] = 6; + } + + if (gUnknown_030012C8.unk0[2] != 2) + { + if (gUnknown_030012C8.unk0[0] && gUnknown_030012E6 > 2) + { + sub_81D413C(); + gUnknown_030012C8.unk0[2] = 2; + } + else + { + sub_81D413C(); + gUnknown_030012C8.unk0[2] = 2; + } + } + } + break; + case 4: + sub_81D3CBC(); + gUnknown_030012C8.unk0[1] = 5; + break; + case 5: + if (gUnknown_030012C8.unk0[0] == 1 && gUnknown_030012E6 > 2) + sub_81D413C(); + + if (++gUnknown_030012E6 > 60) + { + gUnknown_030012C8.unk0[4] = 1; + gUnknown_030012C8.unk0[1] = 6; + } + break; + case 6: + if (gUnknown_030012C8.unk0[2]) + { + sub_81D3C7C(); + gUnknown_030012C8.unk0[2] = 0; + } + break; + } + + return gUnknown_030012C8.unk0[2] | (gUnknown_030012C8.unk0[4] << 2) | (gUnknown_030012C8.unk0[3] << 4); +} + +static u16 sub_81D3EE8(u8 arg0) +{ + u16 terminal = (*(vu32 *)REG_ADDR_SIOCNT) & (SIO_MULTI_SI | SIO_MULTI_SD); + if (terminal == SIO_MULTI_SD && arg0) + { + gUnknown_030012C8.unk0[0] = 1; + return 1; + } + else + { + gUnknown_030012C8.unk0[0] = 0; + return 0; + } +} + +static void sub_81D3F1C(u32 arg0, u32 *arg1, u32 *arg2) +{ + if (gUnknown_030012C8.unk0[0]) + { + REG_SIOCNT |= SIO_38400_BPS; + gUnknown_030012C8.unk8 = arg1; + REG_SIODATA32 = arg0; + gUnknown_030012C8.unk10 = arg0 / 4 + 1; + sub_81D3F68(); + } + else + { + REG_SIOCNT = REG_SIOCNT; + gUnknown_030012C8.unk8 = arg2; + } +} + +static void sub_81D3F68(void) +{ + REG_TM3CNT_L = 0xFDA7; + REG_TM3CNT_H = TIMER_INTR_ENABLE; + REG_IME = 0; + REG_IE |= INTR_FLAG_TIMER3; + REG_IME = 1; +} + +void sub_81D3F9C(void) +{ + sub_81D414C(); + sub_81D413C(); +} + +void sub_81D3FAC(void) +{ + u16 i, playerCount, k; + u32 value; + u16 var0; + u16 recvBuffer[4]; + + switch (gUnknown_030012C8.unk0[1]) + { + case 1: + REG_SIOMLT_SEND = 0xCCD0; // Handshake id + *(u64 *)recvBuffer = REG_SIOMLT_RECV; + for (i = 0, playerCount = 0, k = 0; i < 4; i++) + { + if (recvBuffer[i] == 0xCCD0) + playerCount++; + else if (recvBuffer[i] != 0xFFFF) + k++; + } + + if (playerCount == 2 && k == 0) + gUnknown_030012C8.unk0[1] = 2; + break; + case 3: + value = REG_SIODATA32; + if (!gUnknown_030012C8.unkC && !gUnknown_030012C8.unk0[0]) + gUnknown_030012C8.unk10 = value / 4 + 1; + + if (gUnknown_030012C8.unk0[0] == 1) + { + if (gUnknown_030012C8.unkC < gUnknown_030012C8.unk10) + { + REG_SIODATA32 = gUnknown_030012C8.unk8[gUnknown_030012C8.unkC]; + gUnknown_030012C8.unk14 += gUnknown_030012C8.unk8[gUnknown_030012C8.unkC]; + } + else + { + REG_SIODATA32 = gUnknown_030012C8.unk14; + } + } + else + { + if (gUnknown_030012C8.unkC > 0 && gUnknown_030012C8.unkC < gUnknown_030012C8.unk10 + 1) + { + gUnknown_030012C8.unk8[gUnknown_030012C8.unkC - 1] = value; + gUnknown_030012C8.unk14 += value; + } + else if (gUnknown_030012C8.unkC) + { + if (gUnknown_030012C8.unk14 == value) + gUnknown_030012C8.unk0[3] = 1; + else + gUnknown_030012C8.unk0[3] = 2; + } + + gUnknown_030012E8 = 0; + } + + if (++gUnknown_030012C8.unkC < gUnknown_030012C8.unk10 + 2) + { + if (gUnknown_030012C8.unk0[0]) + REG_TM3CNT_H |= TIMER_ENABLE; + else + sub_81D413C(); + } + else + { + gUnknown_030012C8.unk0[1] = 4; + gUnknown_030012E6 = 0; + } + break; + case 5: + if (!gUnknown_030012C8.unk0[0]) + REG_SIOMLT_SEND = gUnknown_030012C8.unk0[3]; + + *(u64 *)recvBuffer = REG_SIOMLT_RECV; + var0 = recvBuffer[1] - 1; + if (var0 < 2) + { + if (gUnknown_030012C8.unk0[0] == 1) + gUnknown_030012C8.unk0[3] = recvBuffer[1]; + + gUnknown_030012C8.unk0[1] = 6; + } + break; + } +} + +static void sub_81D413C(void) +{ + REG_SIOCNT |= SIO_ENABLE; +} + +static void sub_81D414C(void) +{ + REG_TM3CNT_H &= ~TIMER_ENABLE; + REG_TM3CNT_L = 0xFDA7; +} + +static void sub_81D4170(void) +{ + int keysMask = REG_KEYINPUT ^ KEYS_MASK; + gUnknown_030012E2 = keysMask & ~gUnknown_030012E0; + gUnknown_030012E0 = keysMask; +} + +void sub_81D41A0(void) +{ + gUnknown_030012EC = REG_IME; + gUnknown_030012EE = REG_IE; + gUnknown_030012F0 = REG_TM3CNT_H; + gUnknown_030012F2 = REG_SIOCNT; + gUnknown_030012F4 = REG_RCNT; +} + +void sub_81D41F4(void) +{ + REG_IME = gUnknown_030012EC; + REG_IE = gUnknown_030012EE; + REG_TM3CNT_H = gUnknown_030012F0; + REG_SIOCNT = gUnknown_030012F2; + REG_RCNT = gUnknown_030012F4; +} + +void sub_81D4238(void) +{ + CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8)); +} diff --git a/src/ereader_screen.c b/src/ereader_screen.c new file mode 100755 index 0000000000..b15c1fd0cf --- /dev/null +++ b/src/ereader_screen.c @@ -0,0 +1,464 @@ +#include "global.h" +#include "alloc.h" +#include "decompress.h" +#include "ereader_helpers.h" +#include "link.h" +#include "main.h" +#include "rom_8011DC0.h" +#include "save.h" +#include "sound.h" +#include "sprite.h" +#include "task.h" +#include "strings.h" +#include "util.h" +#include "constants/songs.h" + +struct Unk81D5014 +{ + u16 unk0; + u16 unk2; + u16 unk4; + u16 unk6; + u8 unk8; + u8 unk9; + u8 unkA; + u8 unkB; + u8 unkC; + u8 unkD; + u8 unkE; + u8 *unk10; +}; + +struct Unk03006370 +{ + u16 unk0; + u32 unk4; + u32 *unk8; +}; + +static void sub_81D5084(u8); + +extern struct Unk03006370 gUnknown_03006370; + +extern const u8 gUnknown_089A3470[]; +extern const u8 gMultiBootProgram_BerryGlitchFix_Start[]; + +static void sub_81D4D50(struct Unk03006370 *arg0, int arg1, u32 *arg2) +{ + volatile u16 backupIME = REG_IME; + REG_IME = 0; + gIntrTable[1] = sub_81D3FAC; + gIntrTable[2] = sub_81D3F9C; + sub_81D41A0(); + sub_81D4238(); + REG_IE |= INTR_FLAG_VCOUNT; + REG_IME = backupIME; + arg0->unk0 = 0; + arg0->unk4 = arg1; + arg0->unk8 = arg2; +} + +static void sub_81D4DB8(struct Unk03006370 *arg0) +{ + volatile u16 backupIME = REG_IME; + REG_IME = 0; + sub_81D4238(); + sub_81D41F4(); + RestoreSerialTimer3IntrHandlers(); + REG_IME = backupIME; +} + +static u8 sub_81D4DE8(struct Unk03006370 *arg0) +{ + u8 var0 = 0; + arg0->unk0 = sub_81D3D70(1, arg0->unk4, arg0->unk8, NULL); + if ((arg0->unk0 & 0x13) == 0x10) + var0 = 1; + + if (arg0->unk0 & 0x8) + var0 = 2; + + if (arg0->unk0 & 0x4) + var0 = 3; + + gShouldAdvanceLinkState = 0; + return var0; +} + +static void sub_81D4E30(void) +{ + memset(gDecompressionBuffer, 0, 0x2000); + gLinkType = 0x5503; + OpenLink(); + SetSuppressLinkErrorMessage(TRUE); +} + +static bool32 sub_81D4E60(void) +{ + volatile u16 backupIME; + u16 sp4[4]; + + backupIME = REG_IME; + REG_IME = 0; + *(u64 *)sp4 = *(u64 *)gLink.tempRecvBuffer; + REG_IME = backupIME; + if (sp4[0] == 0xB9A0 && sp4[1] == 0xCCD0 + && sp4[2] == 0xFFFF && sp4[3] == 0xFFFF) + { + return TRUE; + } + + return FALSE; +} + +static bool32 sub_81D4EC0(void) +{ + if (IsLinkMaster() && GetLinkPlayerCount_2() == 2) + return TRUE; + + return FALSE; +} + +static u32 sub_81D4EE4(u8 *arg0, u16 *arg1) +{ + u8 var0; + + var0 = *arg0 - 3; + if (var0 < 3 && HasLinkErrorOccurred()) + { + *arg0 = 0; + return 3; + } + + switch (*arg0) + { + case 0: + if (IsLinkMaster() && GetLinkPlayerCount_2() > 1) + { + *arg0 = 1; + } + else if (gMain.newKeys & B_BUTTON) + { + *arg0 = 0; + return 1; + } + break; + case 1: + if (++(*arg1) > 5) + { + *arg1 = 0; + *arg0 = 2; + } + break; + case 2: + if (GetLinkPlayerCount_2() == 2) + { + PlaySE(SE_PINPON); + CheckShouldAdvanceLinkState(); + *arg1 = 0; + *arg0 = 3; + } + else if (gMain.newKeys & B_BUTTON) + { + *arg0 = 0; + return 1; + } + break; + case 3: + if (++(*arg1) > 30) + { + *arg0 = 0; + return 5; + } + + if (IsLinkConnectionEstablished()) + { + if (gReceivedRemoteLinkPlayers) + { + if (IsLinkPlayerDataExchangeComplete()) + { + *arg0 = 0; + return 2; + } + else + { + *arg0 = 4; + } + } + else + { + *arg0 = 3; + } + } + break; + case 4: + sub_800ABF4(0); + *arg0 = 5; + break; + case 5: + if (!gReceivedRemoteLinkPlayers) + { + *arg0 = 0; + return 4; + } + break; + default: + return 0; + } + + return 0; +} + +void sub_81D5014(void) +{ + int value; + struct Unk81D5014 *data; + u8 taskId = CreateTask(sub_81D5084, 0); + data = (struct Unk81D5014 *)gTasks[taskId].data; + data->unk8 = 0; + data->unk9 = 0; + data->unkA = 0; + data->unkB = 0; + data->unkC = 0; + data->unkD = 0; + data->unk0 = 0; + data->unk2 = 0; + data->unk4 = 0; + data->unk6 = 0; + data->unkE = 0; + data->unk10 = AllocZeroed(0x40); +} + +static void sub_81D505C(u16 *arg0) +{ + *arg0 = 0; +} + +static bool32 sub_81D5064(u16 *arg0, u16 arg1) +{ + if (++(*arg0) > arg1) + { + *arg0 = 0; + return TRUE; + } + + return FALSE; +} + +static void sub_81D5084(u8 taskId) +{ + struct Unk81D5014 *data = (struct Unk81D5014 *)gTasks[taskId].data; + switch (data->unk8) + { + case 0: + if (mevent_0814257C(&data->unk9, gUnknown_085EDFD6)) + data->unk8 = 1; + break; + case 1: + sub_81D4E30(); + sub_81D505C(&data->unk0); + data->unk8 = 2; + break; + case 2: + if (sub_81D5064(&data->unk0, 10)) + data->unk8 = 3; + break; + case 3: + if (!sub_81D4EC0()) + { + CloseLink(); + data->unk8 = 4; + } + else + { + data->unk8 = 13; + } + break; + case 4: + if (mevent_0814257C(&data->unk9, gUnknown_085EDFF5)) + { + sub_8018884(gUnknown_085EE014); + sub_81D505C(&data->unk0); + data->unk8 = 5; + } + break; + case 5: + if (sub_81D5064(&data->unk0, 90)) + { + sub_81D4E30(); + data->unk8 = 6; + } + else if (gMain.newKeys & B_BUTTON) + { + sub_81D505C(&data->unk0); + PlaySE(SE_SELECT); + data->unk8 = 23; + } + break; + case 6: + if (gMain.newKeys & B_BUTTON) + { + PlaySE(SE_SELECT); + CloseLink(); + sub_81D505C(&data->unk0); + data->unk8 = 23; + } + else if (GetLinkPlayerCount_2() > 1) + { + sub_81D505C(&data->unk0); + CloseLink(); + data->unk8 = 7; + } + else if (sub_81D4E60()) + { + PlaySE(SE_SELECT); + CloseLink(); + sub_81D505C(&data->unk0); + data->unk8 = 8; + } + else if (sub_81D5064(&data->unk0, 10)) + { + CloseLink(); + sub_81D4E30(); + sub_81D505C(&data->unk0); + } + break; + case 7: + if (mevent_0814257C(&data->unk9, gUnknown_085EE05C)) + data->unk8 = 4; + break; + case 8: + sub_8018884(gUnknown_085EE097); + // XXX: This (u32*) cast is discarding the const qualifier from gUnknown_089A3470 + sub_81D4D50(&gUnknown_03006370, gMultiBootProgram_BerryGlitchFix_Start - gUnknown_089A3470, (u32*)gUnknown_089A3470); + data->unk8 = 9; + break; + case 9: + data->unkE = sub_81D4DE8(&gUnknown_03006370); + if (data->unkE) + data->unk8 = 10; + break; + case 10: + sub_81D4DB8(&gUnknown_03006370); + if (data->unkE == 3) + { + data->unk8 = 20; + } + else if (data->unkE == 1) + { + sub_81D505C(&data->unk0); + sub_8018884(gUnknown_085EE120); + data->unk8 = 11; + } + else + { + data->unk8 = 0; + } + break; + case 11: + if (sub_81D5064(&data->unk0, 840)) + data->unk8 = 12; + break; + case 12: + sub_81D4E30(); + sub_8018884(gUnknown_085EE0DC); + data->unk8 = 13; + break; + case 13: + switch (sub_81D4EE4(&data->unk9, &data->unk0)) + { + case 0: + break; + case 2: + sub_8018884(gUnknown_085EE097); + data->unk8 = 14; + break; + case 1: + PlaySE(SE_SELECT); + CloseLink(); + data->unk8 = 23; + break; + case 5: + CloseLink(); + data->unk8 = 21; + break; + case 3: + case 4: + CloseLink(); + data->unk8 = 20; + break; + } + break; + case 14: + if (HasLinkErrorOccurred()) + { + CloseLink(); + data->unk8 = 20; + } + else if (GetBlockReceivedStatus()) + { + ResetBlockReceivedFlags(); + data->unk8 = 15; + } + break; + case 15: + data->unkE = sub_81D3920(gDecompressionBuffer); + sub_800ABF4(data->unkE); + data->unk8 = 16; + break; + case 16: + if (!gReceivedRemoteLinkPlayers) + { + if (data->unkE == 1) + data->unk8 = 17; + else + data->unk8 = 20; + } + break; + case 17: + if (sub_81D3AB0((struct Unk81D38FC *)&gDecompressionBuffer)) + { + sub_8018884(gUnknown_085EE0FA); + sub_81D505C(&data->unk0); + data->unk8 = 18; + } + else + { + data->unk8 = 22; + } + break; + case 18: + if (sub_81D5064(&data->unk0, 120)) + { + sub_8018884(gUnknown_085EE107); + PlayFanfare(MUS_FANFA4); + data->unk8 = 19; + } + break; + case 19: + if (IsFanfareTaskInactive() && (gMain.newKeys & (A_BUTTON | B_BUTTON))) + data->unk8 = 26; + break; + case 23: + if (mevent_0814257C(&data->unk9,gUnknown_085EE06B)) + data->unk8 = 26; + break; + case 20: + if (mevent_0814257C(&data->unk9, gUnknown_085EE0A3)) + data->unk8 = 0; + break; + case 21: + if (mevent_0814257C(&data->unk9, gUnknown_085EE0BF)) + data->unk8 = 0; + break; + case 22: + if (mevent_0814257C(&data->unk9, gUnknown_085EE12D)) + data->unk8 = 0; + break; + case 26: + Free(data->unk10); + DestroyTask(taskId); + SetMainCallback2(sub_80186A4); + break; + } +} diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 8ebdd883f5..30dffd8d7f 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -3,10 +3,10 @@ #include "battle_pyramid.h" #include "berry.h" #include "decoration.h" -#include "ereader.h" #include "event_data.h" #include "event_object_movement.h" #include "event_scripts.h" +#include "faraway_island.h" #include "field_camera.h" #include "field_effect.h" #include "field_effect_helpers.h" diff --git a/src/faraway_island.c b/src/faraway_island.c new file mode 100755 index 0000000000..1c8dff14e7 --- /dev/null +++ b/src/faraway_island.c @@ -0,0 +1,445 @@ +#include "global.h" +#include "event_data.h" +#include "event_object_movement.h" +#include "field_weather.h" +#include "fieldmap.h" +#include "metatile_behavior.h" +#include "sprite.h" +#include "constants/event_objects.h" +#include "constants/flags.h" +#include "constants/maps.h" +#include "constants/metatile_behaviors.h" +#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 u8 sub_81D4D24(u8); +static bool8 sub_81D4834(s16, s16); + +extern u8 gUnknown_0203CF50; +extern s16 gUnknown_030012F8; +extern s16 gUnknown_030012FA; +extern u8 gUnknown_030012FC[4]; + +extern const struct SpritePalette gFieldEffectObjectPaletteInfo1; +extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; + +static const s16 sFarawayIslandRockCoords[4][2] = +{ + {21, 16}, + {25, 16}, + {16, 17}, + {20, 20}, +}; + +static u8 sub_81D4258(void) +{ + u8 eventObjectId; + TryGetEventObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId); + return eventObjectId; +} + +u32 sub_81D427C(void) +{ + u8 i; + int skip; + struct EventObject *mew = &gEventObjects[sub_81D4258()]; + + gUnknown_030012F8 = gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x - mew->currentCoords.x; + gUnknown_030012FA = gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y - mew->currentCoords.y; + for (i = 0; i < ARRAY_COUNT(gUnknown_030012FC); i++) + gUnknown_030012FC[i] = DIR_NONE; + + if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x == gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x + && gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y == gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y) + { + return DIR_NONE; + } + + if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 8 == 0) + mew->invisible = 0; + else + mew->invisible = 1; + + if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 9 == 0) + return DIR_NONE; + + for (i = 0; i < ARRAY_COUNT(sFarawayIslandRockCoords); i++) + { + if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x == sFarawayIslandRockCoords[i][0]) + { + skip = 0; + if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y < sFarawayIslandRockCoords[i][1]) + { + if (mew->currentCoords.y <= sFarawayIslandRockCoords[i][1]) + skip = 1; + } + else + { + if (mew->currentCoords.y >= sFarawayIslandRockCoords[i][1]) + skip = 1; + } + + if (!skip) + { + if (gUnknown_030012F8 > 0) + { + if (mew->currentCoords.x + 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) + { + if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y)) + return DIR_EAST; + } + } + else if (gUnknown_030012F8 < 0) + { + if (mew->currentCoords.x - 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) + { + if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y)) + return DIR_WEST; + } + } + + if (mew->currentCoords.x == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) + { + if (gUnknown_030012FA > 0) + { + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1)) + return DIR_NORTH; + } + else + { + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1)) + return DIR_SOUTH; + } + } + } + } + + if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y == sFarawayIslandRockCoords[i][1]) + { + skip = 0; + if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x < sFarawayIslandRockCoords[i][0]) + { + if (mew->currentCoords.x <= sFarawayIslandRockCoords[i][0]) + skip = 1; + } + else + { + if (mew->currentCoords.x >= sFarawayIslandRockCoords[i][0]) + skip = 1; + } + + if (!skip) + { + if (gUnknown_030012FA > 0) + { + if (mew->currentCoords.y + 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) + { + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1)) + return DIR_SOUTH; + } + } + else if (gUnknown_030012FA < 0) + { + if (mew->currentCoords.y - 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) + { + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1)) + return DIR_NORTH; + } + } + + if (mew->currentCoords.y == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) + { + if (gUnknown_030012F8 > 0) + { + if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y)) + return DIR_WEST; + } + else + { + if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y)) + return DIR_EAST; + } + } + } + } + } + + if (sub_81D4C14(mew, 0)) + { + if (sub_81D4C58(mew, 1)) + return sub_81D4D24(2); + else if (sub_81D4CE0(mew, 1)) + return sub_81D4D24(2); + else + return DIR_NORTH; + } + + if (sub_81D4C9C(mew, 0)) + { + if (sub_81D4C58(mew, 1)) + return sub_81D4D24(2); + else if (sub_81D4CE0(mew, 1)) + return sub_81D4D24(2); + else + return DIR_SOUTH; + } + + if (sub_81D4C58(mew, 0)) + { + if (sub_81D4C14(mew, 1)) + return sub_81D4D24(2); + else if (sub_81D4C9C(mew, 1)) + return sub_81D4D24(2); + else + return DIR_EAST; + } + + if (sub_81D4CE0(mew, 0)) + { + if (sub_81D4C14(mew, 1)) + return sub_81D4D24(2); + else if (sub_81D4C9C(mew, 1)) + return sub_81D4D24(2); + else + return DIR_WEST; + } + + if (gUnknown_030012FA == 0) + { + if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y > mew->currentCoords.y) + { + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1)) + return DIR_NORTH; + } + + if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y < mew->currentCoords.y) + { + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1)) + return DIR_SOUTH; + } + + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1)) + return DIR_NORTH; + + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1)) + return DIR_SOUTH; + } + + if (gUnknown_030012F8 == 0) + { + if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x > mew->currentCoords.x) + { + if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y)) + return DIR_WEST; + } + + if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x < mew->currentCoords.x) + { + if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y)) + return DIR_EAST; + } + + if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y)) + return DIR_EAST; + + if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y)) + return DIR_WEST; + } + + return sub_81D4890(DIR_NONE); +} + +static bool8 sub_81D4834(s16 x, s16 y) +{ + if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x == x + && gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y == y) + { + return FALSE; + } + + return MetatileBehavior_IsPokeGrass(MapGridGetMetatileBehaviorAt(x, y)); +} + +static u8 sub_81D4890(u8 ignoredDir) +{ + u8 i; + u8 count = 0; + struct EventObject *mew = &gEventObjects[sub_81D4258()]; + + for (i = 0; i < ARRAY_COUNT(gUnknown_030012FC); i++) + gUnknown_030012FC[i] = DIR_NONE; + + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1) == TRUE && ignoredDir != DIR_NORTH) + { + gUnknown_030012FC[count] = DIR_NORTH; + count++; + } + + if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y) == TRUE && ignoredDir != DIR_EAST) + { + gUnknown_030012FC[count] = DIR_EAST; + count++; + } + + if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1) == TRUE && ignoredDir != DIR_SOUTH) + { + gUnknown_030012FC[count] = DIR_SOUTH; + count++; + } + + if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y) == TRUE && ignoredDir != DIR_WEST) + { + gUnknown_030012FC[count] = DIR_WEST; + count++; + } + + if (count > 1) + return gUnknown_030012FC[VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % count]; + else + return gUnknown_030012FC[0]; +} + +void UpdateFarawayIslandStepCounter(void) +{ + u16 steps = VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER); + if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(FARAWAY_ISLAND_INTERIOR) + && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(FARAWAY_ISLAND_INTERIOR)) + { + steps++; + if (steps >= 9999) + VarSet(VAR_FARAWAY_ISLAND_STEP_COUNTER, 0); + else + VarSet(VAR_FARAWAY_ISLAND_STEP_COUNTER, steps); + } +} + +bool8 EventObjectIsFarawayIslandMew(struct EventObject *eventObject) +{ + if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(FARAWAY_ISLAND_INTERIOR) + && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(FARAWAY_ISLAND_INTERIOR)) + { + if (eventObject->graphicsId == EVENT_OBJ_GFX_MEW) + return TRUE; + } + + return FALSE; +} + +bool8 IsMewPlayingHideAndSeek(void) +{ + if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(FARAWAY_ISLAND_INTERIOR) + && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(FARAWAY_ISLAND_INTERIOR)) + { + if (FlagGet(FLAG_CAUGHT_MEW) != TRUE && FlagGet(FLAG_HIDE_MEW) != TRUE) + return TRUE; + } + + return FALSE; +} + +bool8 sub_81D4A58(struct EventObject *eventObject) +{ + if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) != 0xFFFF + && VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 4 == 0) + return TRUE; + + return FALSE; +} + +void sub_81D4A90(void) +{ + s16 x; + s16 y; + u8 spriteId; + struct EventObject *mew = &gEventObjects[sub_81D4258()]; + + mew->invisible = 0; + if (gSpecialVar_0x8004 == 1) + { + mew->fixedPriority = 1; + gSprites[mew->spriteId].subspriteMode = SUBSPRITES_IGNORE_PRIORITY; + gSprites[mew->spriteId].subpriority = 1; + } + else + { + VarSet(VAR_FARAWAY_ISLAND_STEP_COUNTER, 0xFFFF); + mew->fixedPriority = 1; + gSprites[mew->spriteId].subspriteMode = SUBSPRITES_IGNORE_PRIORITY; + if (gSpecialVar_Facing != DIR_NORTH) + gSprites[mew->spriteId].subpriority = 1; + + LoadSpritePalette(&gFieldEffectObjectPaletteInfo1); + UpdateSpritePaletteWithWeather(IndexOfSpritePaletteTag(gFieldEffectObjectPaletteInfo1.tag)); + + x = mew->currentCoords.x; + y = mew->currentCoords.y; + sub_80930E0(&x, &y, 8, 8); + gUnknown_0203CF50 = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[15], x, y, gSprites[mew->spriteId].subpriority - 1); + if (gUnknown_0203CF50 != MAX_SPRITES) + { + struct Sprite *sprite = &gSprites[gUnknown_0203CF50]; + sprite->coordOffsetEnabled = 1; + sprite->oam.priority = 2; + sprite->callback = SpriteCallbackDummy; + } + } +} + +void sub_81D4BEC(void) +{ + if (gUnknown_0203CF50 != MAX_SPRITES) + DestroySprite(&gSprites[gUnknown_0203CF50]); +} + +static bool8 sub_81D4C14(struct EventObject *mew, u8 index) +{ + if (gUnknown_030012FA > 0 && sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1)) + { + gUnknown_030012FC[index] = DIR_NORTH; + return TRUE; + } + + return FALSE; +} + +static u8 sub_81D4C58(struct EventObject *mew, u8 index) +{ + if (gUnknown_030012F8 < 0 && sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y)) + { + gUnknown_030012FC[index] = DIR_EAST; + return TRUE; + } + + return FALSE; +} + +static u8 sub_81D4C9C(struct EventObject *mew, u8 index) +{ + if (gUnknown_030012FA < 0 && sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1)) + { + gUnknown_030012FC[index] = DIR_SOUTH; + return TRUE; + } + + return FALSE; +} + +static u8 sub_81D4CE0(struct EventObject *mew, u8 index) +{ + if (gUnknown_030012F8 > 0 && sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y)) + { + gUnknown_030012FC[index] = DIR_WEST; + return TRUE; + } + + return FALSE; +} + +static u8 sub_81D4D24(u8 mod) +{ + return gUnknown_030012FC[VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % mod]; +} diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index b28052ee2f..6735df3a03 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -3,7 +3,7 @@ #include "bike.h" #include "coord_event_weather.h" #include "daycare.h" -#include "ereader.h" +#include "faraway_island.h" #include "event_data.h" #include "event_object_movement.h" #include "event_scripts.h" diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index f1a65cf8c8..3da1a9217a 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -1,7 +1,7 @@ #include "global.h" -#include "ereader.h" #include "event_obj_lock.h" #include "event_object_movement.h" +#include "faraway_island.h" #include "field_camera.h" #include "field_effect.h" #include "field_player_avatar.h" diff --git a/src/trainer_hill.c b/src/trainer_hill.c index 7bb1b997a2..eafd1eb3d2 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -3,7 +3,7 @@ #include "battle.h" #include "battle_tower.h" #include "battle_setup.h" -#include "ereader.h" +#include "ereader_helpers.h" #include "event_data.h" #include "event_scripts.h" #include "fieldmap.h"